8262 files changed, 216975 insertions, 183818 deletions

diff --git a/acct-group/gvm/metadata.xml b/acct-group/gvm/metadata.xml
index 4004f5da1467..7530d08266f4 100644
--- a/acct-group/gvm/metadata.xml
+++ b/acct-group/gvm/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
+		<email>foti.giuseppe@gmail.com</email>
+		<name>Giuseppe Foti</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
-		</maintainer>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-group/monkeyd/metadata.xml b/acct-group/monkeyd/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-group/monkeyd/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/acct-group/monkeyd/monkeyd-0-r2.ebuild b/acct-group/monkeyd/monkeyd-0-r2.ebuild
deleted file mode 100644
index 6a354f9e11e3..000000000000
--- a/acct-group/monkeyd/monkeyd-0-r2.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
-
-inherit acct-group
-
-DESCRIPTION="A group for www-servers/monkeyd"
-
-ACCT_GROUP_ID="149"
diff --git a/acct-user/gvm/metadata.xml b/acct-user/gvm/metadata.xml
index de76f9c0db93..7530d08266f4 100644
--- a/acct-user/gvm/metadata.xml
+++ b/acct-user/gvm/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="person" proxied="yes">
-                <email>jonas.licht@gmail.com</email>
-                <name>Jonas Licht</name>
-        </maintainer>
-        <maintainer type="project" proxied="proxy">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>foti.giuseppe@gmail.com</email>
+		<name>Giuseppe Foti</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/monkeyd/metadata.xml b/acct-user/monkeyd/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/monkeyd/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/acct-user/monkeyd/monkeyd-0-r2.ebuild b/acct-user/monkeyd/monkeyd-0-r2.ebuild
deleted file mode 100644
index f6b295037f36..000000000000
--- a/acct-user/monkeyd/monkeyd-0-r2.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
-
-inherit acct-user
-
-DESCRIPTION="A user for www-servers/monkeyd"
-
-ACCT_USER_GROUPS=( "monkeyd" )
-ACCT_USER_HOME="/var/tmp/monkeyd"
-ACCT_USER_HOME_PERMS="0770"
-ACCT_USER_ID="149"
-
-acct-user_add_deps
diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
deleted file mode 100644
index 5b1848f15f7c..000000000000
--- a/app-accessibility/epos/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef
diff --git a/app-accessibility/epos/epos-2.5.37-r4.ebuild b/app-accessibility/epos/epos-2.5.37-r4.ebuild
deleted file mode 100644
index 33aedd1f8897..000000000000
--- a/app-accessibility/epos/epos-2.5.37-r4.ebuild
+++ /dev/null
@@ -1,53 +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
-
-DESCRIPTION="Language independent text-to-speech system"
-HOMEPAGE="http://epos.ufe.cz/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86"
-RESTRICT="test" # needs running eposd
-
-BDEPEND="dev-util/byacc"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.37-gcc43.patch
-	"${FILESDIR}"/${PN}-2.5.37-gcc45.patch
-	"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
-	"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
-	"${FILESDIR}"/${PN}-2.5.37-gcc7.patch
-	"${FILESDIR}"/${PN}-2.5.37-gcc-11.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s/CCC/#CCC/" configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug #649858
-	append-flags -fno-delete-null-pointer-checks
-
-	# Uses removed 'register' keyword, bug #894178
-	append-cxxflags -std=c++03
-
-	econf \
-		--enable-charsets \
-		--disable-portaudio \
-		YACC=byacc
-}
-
-src_install() {
-	default
-
-	doinitd "${FILESDIR}/eposd"
-	dodoc WELCOME THANKS Changes "${FILESDIR}/README.gentoo"
-}
diff --git a/app-accessibility/epos/files/README.gentoo b/app-accessibility/epos/files/README.gentoo
deleted file mode 100644
index a058564ea278..000000000000
--- a/app-accessibility/epos/files/README.gentoo
+++ /dev/null
@@ -1,2 +0,0 @@
-Due to /usr/bin/say conflicting with the speech-dispatcher ebuild, it has
-beenn moved to /usr/bin/epos_say.
diff --git a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
deleted file mode 100644
index 7556e7995a15..000000000000
--- a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/tests/Makefile.am
-+++ b/src/tests/Makefile.am
-@@ -1,11 +1,9 @@
- ##	Process this file with automake run in the top directory to yield Makefile.in
- 
- TESTS=hard_zero_data_test				\
--	intr_test					\
--	legal_data_test long_data_test long_strm_test	\
-+	legal_data_test long_data_test 	\
- 	random_data_test				\
- 	soft_zero_data_test				\
--	syn2_test 					\
- 	vogon_test 					\
- 	shutdown_test
- 
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch
deleted file mode 100644
index a14488b7d34a..000000000000
--- a/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Avoid `container` namespace clash with gcc-11's libstdc++ headers.
-
-https://bugs.gentoo.org/786264
---- a/src/nnet/xmltempl.cc
-+++ b/src/nnet/xmltempl.cc
-@@ -22,10 +22,10 @@ CXml * x ::print () const { \
- #define RP(x) x
- 
- #define child(x,tag) retval->AddChild (*xml_print (x,tag));
--#define container(x,tag) retval->AddChild (*xml_print_container (x,tag));
-+#define epos_container(x,tag) retval->AddChild (*xml_print_container (x,tag));
- #define child_opt(x,tag) if(x) child(x,tag)
- #define child_enum(x,tag,enumS) retval->AddChild (*xml_print (enumS[x],tag));
--#define container_opt(x,tag) if(x.size()) container(x,tag)
-+#define container_opt(x,tag) if(x.size()) epos_container(x,tag)
- #define structure(x,tag) retval->AddChild (*xml_print_str (x,tag));
- #define structure_opt(x,tag,write_cond) if (write_cond) structure(x,tag)
- 
-@@ -40,7 +40,7 @@ CXml * x ::print () const { \
- #define CHILD(x)		child(x,#x)
- #define CHILD_OPT(x)		child_opt(x,#x)
- #define CHILD_ENUM(x,enumS)	child_enum(x,#x,enumS)
--#define CONTAINER(x)		container(x,#x)
-+#define CONTAINER(x)		epos_container(x,#x)
- #define CONTAINER_OPT(x)	container_opt (x,#x)
- #define STRUCTURE(x)		structure(x,#x)
- #define STRUCTURE_OPT(x,cond)	structure_opt(x,#x,cond)
-@@ -60,7 +60,7 @@ return retval; }
- #undef child
- #undef child_opt
- #undef child_enum
--#undef container
-+#undef epos_container
- #undef container_opt
- #undef structure
- #undef structure_opt
-@@ -82,7 +82,7 @@ CString x ::read (CRox *xml) { \
- #define child(x,tag) err += xml_read (xml,x,tag);
- #define child_opt(x,tag) err += xml_read(xml,x,tag,false);
- #define child_enum(x,tag,enumS) err += xml_read_enum(xml,x,enumS,tag);
--#define container(x,tag) err += xml_read_container (xml,x,tag);
-+#define epos_container(x,tag) err += xml_read_container (xml,x,tag);
- #define container_opt(x,tag) err += xml_read_container (xml,x,tag,false);
- #define structure(x,tag) err += xml_read_str (xml,x,tag);
- #define structure_opt(x,tag,write_cond) err += xml_read_str (xml,x,tag,false);
-@@ -105,7 +105,7 @@ else return ""; }
- #undef child
- #undef child_opt
- #undef child_enum
--#undef container
-+#undef epos_container
- #undef container_opt
- #undef structure
- #undef structure_opt
-@@ -119,7 +119,7 @@ else return ""; }
- 
- #define XMLIZE(x,tag) x tmp##tag; retval->AddChild (*tmp##tag.printTemplate ());
- #define child(x,tag) 
--#define container(x,tag) 
-+#define epos_container(x,tag) 
- #define child_opt(x,tag) 
- #define child_enum(x,tag,enumS) 
- #define container_opt(x,tag) 
-@@ -145,7 +145,7 @@ CRox *xmltempl ()
- #undef child
- #undef child_opt
- #undef child_enum
--#undef container
-+#undef epos_container
- #undef container_opt
- #undef structure
- #undef structure_opt
-@@ -171,7 +171,7 @@ CXml * x ::printTemplate () const { \
- 	CXml *retval = new CXml (#tag,1,0,"comment","structure " #x); \
- 	retval->SetFF(DODELETE);
- #define child(x,tag) retval->AddChild (*(new CXml(tag,1,0,"comment",#x))->SetFF(DODELETE));
--#define container(x,tag) 
-+#define epos_container(x,tag) 
- #define child_opt(x,tag) 
- #define child_enum(x,tag,enumS) 
- #define container_opt(x,tag) 
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
deleted file mode 100644
index c8b1dee857ad..000000000000
--- a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/nnet/neural.cc
-+++ b/src/nnet/neural.cc
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <time.h>
- 
- /*
---- a/arch/win/service/install.cpp
-+++ b/arch/win/service/install.cpp
-@@ -23,7 +23,7 @@
- #include <winsvc.h>
- #include "service.h"
- #include <stdio.h>		//sprintf & fopen
--#include <iostream.h>
-+#include <iostream>
- #include "Shlwapi.h"
- 
- SC_HANDLE	scm;
-
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
deleted file mode 100644
index cbc056dded9f..000000000000
--- a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing build with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318585
-
---- a/src/nnet/neural_parse.yy
-+++ b/src/nnet/neural_parse.yy
-@@ -255,7 +255,7 @@
- 
- int yyerror (char *s)
- {
--	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf, s));
-+	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf.c_str(), s));
- 	return -1;
- }
-  
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc47.patch b/app-accessibility/epos/files/epos-2.5.37-gcc47.patch
deleted file mode 100644
index 6e795e3548a9..000000000000
--- a/app-accessibility/epos/files/epos-2.5.37-gcc47.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- https://bugs.gentoo.org/440354
- 
- src/nnet/map.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/nnet/map.h
-+++ b/src/nnet/map.h
-@@ -25,7 +25,7 @@ T2 & TMap<T1,T2>::operator [] (const T1 &key) {
- 	else {
- 		TData x;
- 		x.first() = key;
--		return insert (x)->second();
-+		return this->insert (x)->second();
- 	}
- }
- 
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
deleted file mode 100644
index 6c889a662c2a..000000000000
--- a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/638596
-
---- a/src/nnet/matrix.cc
-+++ b/src/nnet/matrix.cc
-@@ -63,7 +63,7 @@
- template<class T> void CMatrix<T>::multiplyByTransponed (const CMatrix &y, CMatrix &retval)
- {
- 	int i,j,k;
--	assert (cols == y.cols);
-+	this->assert (cols == y.cols);
- 	if (cols != y.cols) { retval.Realloc (0,0); return; }
- 
- 	T sum;
-@@ -80,7 +80,7 @@
- template<class T> void CMatrix<T>::transponedMultiply (const CMatrix &y, CMatrix &retval)
- {
- 	int i,j,k;
--	assert (rows == y.rows);
-+	this->assert (rows == y.rows);
- 	if (rows != y.rows) { retval.Realloc (0,0); return; }
- 
- 	T sum;
diff --git a/app-accessibility/epos/files/eposd b/app-accessibility/epos/files/eposd
deleted file mode 100644
index 75aca32ca8ba..000000000000
--- a/app-accessibility/epos/files/eposd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use alsasound esound
-}
-
-start() {
-	ebegin "Starting eposd"
-	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/eposd.pid \
-		--exec /usr/bin/eposd -- -f
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping eposd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/eposd.pid
-	eend $?
-}
diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml
deleted file mode 100644
index 234f6ef87e9d..000000000000
--- a/app-accessibility/epos/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">epos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index ea82c4b7044c..e23a8638af39 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,2 +1,2 @@
-DIST kontrast-23.08.5.tar.xz 211984 BLAKE2B f1c50f90031615bc9a3ddd00155f40fed2244994de309385e386fae7e21dddb7bd1dfa5a722050dcf67c7ad3def6d1979efc8623a18bcc21b6438178d15fc116 SHA512 e70d5bdc5a7363358f8d09c6a2bafda9645bcb5f9acc0fa4e51ed836e87baa92b3f9e6c4a81bd3d1050de152100426e714c6dd8d46459aa0d81949776880f9ae
 DIST kontrast-24.05.2.tar.xz 214620 BLAKE2B ad61b0902fd1b95b4bef1eb5c7671a1ee8a3e1808e87bdfa39ac7f9a02f3ebd8d133522b0335b001e0713e0b1497aa0db5c3b239af1b2a9184d4ed2c4c48282a SHA512 aa2681b1b8a84852aaa180fb787ace87f9469731f7018a2e445b331f8598f8b1dd9d9b6ce9747a98518dd9286897c0521fb2a7951d8d56c1414012c4cfa0fffa
+DIST kontrast-24.08.0.tar.xz 214448 BLAKE2B 62c05c6e8f788e960ed6e4491180744f81888c9397b2916923ded6b65a5e192601a29dfe183de382c4a987e767ef75713bcc3df40668ef434c7a0ca373644aae SHA512 427d7bf02dd7ff81a98147610c73663a86fe357ab144015c7bfcd51e1995ce8709490d150b9f3fd7a3706f05ae4117249648c67ac7ef2ad87afedc96eb092122
diff --git a/app-accessibility/kontrast/kontrast-23.08.5.ebuild b/app-accessibility/kontrast/kontrast-23.08.5.ebuild
deleted file mode 100644
index 1d879fc0f11f..000000000000
--- a/app-accessibility/kontrast/kontrast-23.08.5.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"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-db/futuresql5
-	dev-libs/qcoro5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	kde-plasma/xdg-desktop-portal-kde
-"
diff --git a/app-accessibility/kontrast/kontrast-24.05.2.ebuild b/app-accessibility/kontrast/kontrast-24.05.2.ebuild
index 5a6e34dbb1ed..140836d58295 100644
--- a/app-accessibility/kontrast/kontrast-24.05.2.ebuild
+++ b/app-accessibility/kontrast/kontrast-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-accessibility/kontrast/kontrast-24.08.0.ebuild b/app-accessibility/kontrast/kontrast-24.08.0.ebuild
new file mode 100644
index 000000000000..77336f0615d8
--- /dev/null
+++ b/app-accessibility/kontrast/kontrast-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	kde-plasma/xdg-desktop-portal-kde:*
+"
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.5.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.5.ebuild
index 60fd9d36a48e..983458d7373d 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.5.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="alsa ao +espeak flite nas pulseaudio +python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 60760ae14846..5cb1caa369b2 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,2 +1 @@
-DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
 DIST apachetop-0.23.2.tar.gz 169381 BLAKE2B fd524e8b313c8536bf016ab481f93d73ff32f256634b9fcc28c035207fda6821298087c240227508c1ab6fb7f80a0879945cc931125204bf81c3897b3d33408e SHA512 c278b6fc286eacb69746547e562c40eec50e7ff55df22a32e9387af057c25801e331c6c4b286726aa1bcee6ebcd3578747aca25be3dfec1745b876e95696d7fc
diff --git a/app-admin/apachetop/apachetop-0.19.7.ebuild b/app-admin/apachetop/apachetop-0.19.7.ebuild
deleted file mode 100644
index aaf86e4822f9..000000000000
--- a/app-admin/apachetop/apachetop-0.19.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19.7-c++17.patch
-)
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}
diff --git a/app-admin/apachetop/files/apachetop-0.19.7-c++17.patch b/app-admin/apachetop/files/apachetop-0.19.7-c++17.patch
deleted file mode 100644
index 8ec6508b9e08..000000000000
--- a/app-admin/apachetop/files/apachetop-0.19.7-c++17.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://github.com/tessus/apachetop/pull/13
-
-From f89ae55bb09eb1a67fc73555d149fb85f82bfbd6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 14 Feb 2023 03:34:36 +0000
-Subject: [PATCH] Fix C++17 compatibility (drop register keyword)
-
-register doesn't do anything in any reasonable C++ compiler anyway, but
-it was deprecated in C++14 and removed in C++17. Without this, apachetop
-will fail to compile with Clang 16 which defaults to -std=c++17.
-
-Bug: https://bugs.gentoo.org/894186
---- a/src/inlines.cc
-+++ b/src/inlines.cc
-@@ -4,10 +4,10 @@
- #define ONE_EIGHTH      4
- #define HIGH_BITS       (~((unsigned int)(~0) >> ONE_EIGHTH))
- 
--inline unsigned int StringHash(register const char *str)
-+inline unsigned int StringHash(const char *str)
- {
--	register unsigned int val;
--	register unsigned int i;
-+	unsigned int val;
-+	unsigned int i;
- 
- 	for (val = 0; *str; str++)
- 	{
-@@ -19,9 +19,9 @@ inline unsigned int StringHash(register const char *str)
- 	return val;
- }
- 
--inline unsigned int QuickHash(register const char *str)
-+inline unsigned int QuickHash(const char *str)
- {
--	register unsigned int val, tmp;
-+	unsigned int val, tmp;
- 
- 	for(val = 0 ; *str ; str++)
- 	{
-@@ -32,7 +32,7 @@ inline unsigned int QuickHash(register const char *str)
- 	return val;
- }
- 
--inline unsigned long TTHash(register const char *str)
-+inline unsigned long TTHash(const char *str)
- {
- 	unsigned long hash = 5381;
- 	int c;
---- a/src/ohtbl.cc
-+++ b/src/ohtbl.cc
-@@ -13,7 +13,7 @@ static int primes[] = {101, 241, 499, 1009, 2003, 3001, 4001, 5003,
- 
- int OAHash::getNextPrime(int size)
- {
--	register int *prime;
-+	int *prime;
- 	for (prime = &primes[0] ; *prime ; prime++)
- 		if (*prime > size)
- 			return *prime;
-@@ -51,7 +51,7 @@ void OAHash::destroy(void)
- 
- void *OAHash::insert(char *key, void *data)
- {
--	register unsigned int p, i;
-+	unsigned int p, i;
- 	void *d;
-  
- 	// Do not exceed the number of positions in the table.
-@@ -81,7 +81,7 @@ void *OAHash::insert(char *key, void *data)
- 
- int OAHash::remove(char *key)
- {
--	register unsigned int p, i;
-+	unsigned int p, i;
- 
- 	for (i = 0; i < positions; ++i)
- 	{
-@@ -108,7 +108,7 @@ int OAHash::remove(char *key)
- 
- void *OAHash::lookup(char *key)
- {
--	register unsigned int p, i;
-+	unsigned int p, i;
- 
- 	for (i = 0; i < positions; ++i)
- 	{
--- 
-2.39.1
-
diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
index 6009e546afb6..1bb68a5650d9 100644
--- a/app-admin/authbind/Manifest
+++ b/app-admin/authbind/Manifest
@@ -1,2 +1 @@
-DIST authbind_2.1.2.tar.gz 15279 BLAKE2B 5f9a31c9f51c307e9ad85bf14b436e1780d0c7dc5655ad3882e9596927862be0684d0a4a43c7d2e98a0d6a0d4c2552aaaf954ce32d3e9202bf5593ce501b5962 SHA512 85020af9703f8f39194a7719c50a51d75344db9ea99ecbc83c3c6bff0852ab1ea1cbd0b9bff6a2345e08a7bef9732e36890f33af08929e36dae8215dd070cc4d
 DIST authbind_2.1.3.tar.gz 15215 BLAKE2B c74b7caf27b6a26cf924084fe79dff1ccf429d2a0e9773690407b5f40b07589841b857fe8fda50c1251825fbabf9054c54ab79dea38026bbae770a47a774610b SHA512 357c8f5c5ad446e75a597d5bc5bb5af7db17de771643a39976b5ac1425f03bf44f322c8dd07b0e1b04a0bf78d5000841b4866e0d0945584689e99291156dfac1
diff --git a/app-admin/authbind/authbind-2.1.2.ebuild b/app-admin/authbind/authbind-2.1.2.ebuild
deleted file mode 100644
index 3d27d3e0f343..000000000000
--- a/app-admin/authbind/authbind-2.1.2.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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bind sockets to privileged ports without root"
-HOMEPAGE="https://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="app-alternatives/awk"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.2-respect-flags.patch"
-)
-
-src_configure() {
-	tc-export CC LD
-
-	sed -i \
-		-e "s|^prefix=.*|prefix=/usr|" \
-		-e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \
-		-e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \
-		-e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \
-		Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|/usr/lib|/usr/libexec|' \
-		authbind-helper.8 || die "sed failed"
-}
-
-src_install() {
-	dobin authbind
-	doman authbind.1 authbind-helper.8
-
-	local major=$(awk -F= '/MAJOR=/ { print $2 }' Makefile || die)
-	ln -s libauthbind.so.* libauthbind.so.${major} || die
-	dolib.so libauthbind.so*
-
-	exeinto /usr/libexec/authbind
-	exeopts -m4755
-	doexe helper
-
-	keepdir /etc/authbind/by{addr,port,uid}
-
-	dodoc debian/changelog
-}
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index a1b53a91f770..54672662d5ea 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,6 +1,8 @@
 DIST awscli-exe-linux-aarch64-2.11.17.zip 56500418 BLAKE2B ced68deac081666c71d73bea7d48f19aa27c8a78835ad13acaa06dac65db8569e9cf446900c0a8ede169bf177168e47ad3bebd06ad295a5626d926d59e4ed57b SHA512 6424cfcd079007cf1519f0018555c589a154639c1f28596d51d227c9078abbcd16660488d9c7984468bd223a7e4a89296c42c8fbdb8b6d085e32163e71d1f641
 DIST awscli-exe-linux-aarch64-2.12.0.zip 56282131 BLAKE2B 147d200a134dc3f4ca3b6dff285b447d98eedb52207f923354cd748102ed0bf8e9bd4e883d59536f8bbe3a249de99102c8b5f239271cdef66d73df069add1491 SHA512 e0e72d951b0d3136b99b15d8abcc0b38492ef0c92a915e4f92a902318895ff580fface1ee202a5c06cf99a9f4ab935b2393e7318d1efc3df90152c18ed745b7f
 DIST awscli-exe-linux-aarch64-2.13.11.zip 56601642 BLAKE2B 27c7914d3aeb157188e071c8add664ea6d95784a86d271035e3e618fcc2a07973dc271cbecdca3b8e4e802fdd92f72d33cd4c00d78fa7b11ee434ebf1e74107c SHA512 72515f5cd33fa3d18a9001b4789cfc881146d0f25fb60791fbb8e39df1b4d25ffa2bcf1db4bbbf313601c7244b247cffeefee1b4b5791647265e960a8d709ae3
+DIST awscli-exe-linux-aarch64-2.17.35.zip 59330408 BLAKE2B 0e0abb8170fb1d0bd8ed02b65d96e819ab140c5c00cfa879842a1ceb3b45730d9855b5e37b8ee7c866e24d9f73360066d831f3b4dec5fa397cc33dcce29ec9be SHA512 eef425ff0919fbd221002e8d37b311f762d4f921119772a25766ca9442de07e0b477979f6f6641d6edde35b60c0190f82b8e0e5cd5e6450a73be7609f34f321a
 DIST awscli-exe-linux-x86_64-2.11.17.zip 57614965 BLAKE2B 0a711bc968b53dd08810ef857c9d51d332b016fd969491850f9dd8fc84e912f815e2b0a6e38223fe29c321ee784ad2ee41644b7027af3439742d3c2141f10098 SHA512 c05ada15a4e896850adbe04cc159141d84fabc955f3baf6d053200c6595cc77c8a75886ce5f1bd18370fe34a2c1c3d294312aa471a028104266fa45fa5aa4334
 DIST awscli-exe-linux-x86_64-2.12.0.zip 57965257 BLAKE2B 9c8fec1d30795af94807d60c62b28eeb84e682d99cbacc0c8ad5b022c569e310fe781d00a6e9bd0cc0222c0104d9e0d2521bf3fb2102f60fe76de75bfec90cf8 SHA512 c4688e09fa17ed89495c807ebb1826e0517c1a7e7e4e62981e17e86a11227434eb1c59b9e7fffbd8e9e7ff6cc05846bf6cf7cc1769e099c9c146d9d11c400ab5
 DIST awscli-exe-linux-x86_64-2.13.11.zip 58360364 BLAKE2B 46cbc0136a19f198f9ec7ef16e49dba72edf03365d96e79d9dc81d04f57f82de031138b36096091160f304e1662c9231bfd7f618ccbf3aed37e84f9f83cbdef0 SHA512 7ae315275947d60654613c24b52997976e70f1cbb94df65ed9a2937f3cd834a83c8567b8aafa946a08b83ef7b4b72d666ba400eee1550e8dbd6e1acd36121d53
+DIST awscli-exe-linux-x86_64-2.17.35.zip 60760139 BLAKE2B 0906d5c68d78aab9a39e54b92632f26f64ef8cb221621eac149df986f7f11a0ec014cc3c0b1db6726f74b39a69fd66839e729d57a43027f120dd6883fa7e71b4 SHA512 47e0eff09d30acf72fb0d270abad070c7b605848132f65e824d634e4937551efabc5adc165c67d21828b875a156eeed44f9ceb117eddef3c25be4be663e367c6
diff --git a/app-admin/awscli-bin/awscli-bin-2.17.35.ebuild b/app-admin/awscli-bin/awscli-bin-2.17.35.ebuild
new file mode 100644
index 000000000000..c039d58d5af9
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.17.35.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+	sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 27b3ef024336..8c02a8fb16cd 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,3 +1,6 @@
-DIST aws-cli-1.33.35.gh.tar.gz 2768498 BLAKE2B d925c1a63a73bda27711d2f930d0832ea17e012d62d634330cef16f1962cbcbeb9149a5ef14765af04bfbc4b49c6160a319e02a3eab475473a2fe46ab27da305 SHA512 5804947acc002cd9f53b94865542d4f4708116a3a31dafd6a217e84d2222ff973b6c6af0237272d52d9d15e0eaf7f243ef577c1a1b3c2f18e845857886d9f2c1
-DIST aws-cli-1.33.40.gh.tar.gz 2769444 BLAKE2B a26e26cb4694460e36fe2d9730092db33aff74e436642f3de5f94dc2fcbb594bb1ef2db425584359f50d0ae37be8be6034a0e722968a0ea4179e888b2f23be7c SHA512 d19d762a1ca0b02f3076d9241be19755f74c2b228cdb258f873d73dc91f25730b40e4a82bed3cb77e94b30ba34e1260629a3af6e7a7b7df108522d21103f34bb
-DIST aws-cli-1.34.0.gh.tar.gz 2773056 BLAKE2B c6c9d89fe719116faad47417dd1aa9a98125b65efaf61476582cf7fec16e7ab5bd9823b6973bde51891a8bdad8ec9bfade305abfcee2eb70f6cf2679ef815d1b SHA512 914efb62ec94825529e981c934f617b0c1ae3c367b7215bff7160b8bef7c3ea73d0400d3e04ff237546731e3586077c83ed918c0747f75ff4079e8b5e1159809
+DIST aws-cli-1.34.10.gh.tar.gz 2788517 BLAKE2B 8b110119087836435f3e0ef29a6cfe35dd3a387bff4051cc94b9beb4e8a2d929460ac14c659ef0c3a37cb6378e7910eca7c92975f04ac2d1b2140e2aedd0eb60 SHA512 46844c919a3998040897ccdf48cf4ed616a9debc125d03386f53bce66597a8cc077f9be7735b133085c3225c9402acd94da85fffbd1205e732ad5cd5b56bf9a2
+DIST aws-cli-1.34.14.gh.tar.gz 2790437 BLAKE2B df3355ac11561ac7f6e2a7c707d08de0b3335b4321ef3f5730a9abd6a23dfa909e0ba27367e705c56ce7223bbb7d1d436759457f0f92a0d7b4da21e6392a0c6b SHA512 be707816a1f6a53ab32870eaed498bfd47782b07c146af79d6f5cc1153e0b180788be1cc48cbf21f8850d04a79b3255bcfa2456079c57585e4779083bc5353e1
+DIST aws-cli-1.34.15.gh.tar.gz 2790865 BLAKE2B e9c89028942df21d880997c61ee261110271402223869b740bbb51bd8b787c26b2b7aa4b335968665260549bde8571c97350ccaf0c32df1c28267ae454b99001 SHA512 f7628e664b515f46b85978d5662165a889db5db004aa6d32be9fa0ee6b9b9a4fd46281df5c8f3e6218a9adc81d365e4251d0e5ce3601c2b6da9dd4ac567c24d9
+DIST aws-cli-1.34.16.gh.tar.gz 2790321 BLAKE2B 31e51d95ed3479f5c4a768d98dbd0190fe1a9f55bfdc116a9778140a10c44e14cc4684f11a3480fc05c26606ea8239f4bf7e2266b02b47ac456d25249e992c53 SHA512 4898e32d328c5dd1f80655696ec1225538ce58e5958dbb3a156dad4c865ed1e560c1a5823903a9fa9caf44af8bd618a6a6f1868a3b1fde8ee5daa4f0bdf94875
+DIST aws-cli-1.34.17.gh.tar.gz 2791693 BLAKE2B 25ea69e1bfa09d69502ded0aa37c639b209a94ade70dcef6edc4dd3470dc180c5f3bf105a712eab69cc38560461cdcfdc50b9c6c0a26bcea4907d6180e95d4bf SHA512 c59c0a5d20212a64eabdd22ec9071f4e5d8aa4c4dc172f89123f5b2ccc6868c10486171aa489b2002bccb9b1014ffdbf2f642bd5514c971a010c40b077a7e1ef
+DIST aws-cli-1.34.5.gh.tar.gz 2774000 BLAKE2B 34368cc257a99a9c7212972bcff91c46352db8659c5fe98101c9192cb674663b9090b3608d88875875d24488869fcb571e8602532219cf0a25bc3159f3bf285c SHA512 4dc305e4e659fbbd17a265b6c9589e20c63eec671114a67687c225081f8095a8627499441f78d76e6fa0da59b03ae078833227db0434c97572a7f5f7c4a43e5a
diff --git a/app-admin/awscli/awscli-1.33.35.ebuild b/app-admin/awscli/awscli-1.33.35.ebuild
deleted file mode 100644
index 350b274749f3..000000000000
--- a/app-admin/awscli/awscli-1.33.35.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
-
-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+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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[@]}" )
-	# 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.33.40.ebuild b/app-admin/awscli/awscli-1.33.40.ebuild
deleted file mode 100644
index c212ce9cac21..000000000000
--- a/app-admin/awscli/awscli-1.33.40.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
-
-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+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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[@]}" )
-	# 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.34.0.ebuild b/app-admin/awscli/awscli-1.34.10.ebuild
index 599b9bd389b9..599b9bd389b9 100644
--- a/app-admin/awscli/awscli-1.34.0.ebuild
+++ b/app-admin/awscli/awscli-1.34.10.ebuild
diff --git a/app-admin/awscli/awscli-1.34.14.ebuild b/app-admin/awscli/awscli-1.34.14.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.14.ebuild
@@ -0,0 +1,90 @@
+# 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
+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.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[@]}" )
+	# 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.34.15.ebuild b/app-admin/awscli/awscli-1.34.15.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.15.ebuild
@@ -0,0 +1,90 @@
+# 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
+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.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[@]}" )
+	# 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.34.16.ebuild b/app-admin/awscli/awscli-1.34.16.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.16.ebuild
@@ -0,0 +1,90 @@
+# 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
+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.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[@]}" )
+	# 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.34.17.ebuild b/app-admin/awscli/awscli-1.34.17.ebuild
new file mode 100644
index 000000000000..599b9bd389b9
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.17.ebuild
@@ -0,0 +1,90 @@
+# 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
+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.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[@]}" )
+	# 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.34.5.ebuild b/app-admin/awscli/awscli-1.34.5.ebuild
new file mode 100644
index 000000000000..96357b5055a1
--- /dev/null
+++ b/app-admin/awscli/awscli-1.34.5.ebuild
@@ -0,0 +1,90 @@
+# 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
+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.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[@]}" )
+	# 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/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 8055cc848382..addfe461cdbb 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,2 +1,3 @@
-DIST Bitwarden-2024.6.4-amd64.deb 79772094 BLAKE2B 4cb5b0f0e96f27176327b531cc259518216e7ded24d7294df58c045544f4421713791db2dbb50a49679fb6ec2d56450f830bdf1bece0ec9972e4fb0af39d3236 SHA512 0d118caa5940ec2c970bf814f879dc997750278c0b3d4b369c2b3439798447d3c8ea5c6312d97ed4efc427167eedae866837b8f96ddd89b173a22b9073d0b4a5
 DIST Bitwarden-2024.7.1-amd64.deb 81805416 BLAKE2B 8d3a02e0fb86ecf42f47815c39dd4510fea535694f8764e91bdbe260123e2e39600ff70a45b741069bed8fbf497270b74c13c6996309d1dfa72c10d1f0a70614 SHA512 bfdf9574ee3b3ab56592fb8b20d39991315eff096b875e8d077ec7a08b54a67b3539936c1ed64df2e5ee5aa99942916073038795407f69d563734a01dca3cc87
+DIST Bitwarden-2024.8.1-amd64.deb 82435858 BLAKE2B 72a10049ceeabcf8607d204cece7fa22634e1091d9ca4ddbefb8780901e358ff9f609e1b0fcd5e864caf616defbf040b4f3c5e16cd1a72daf612b4a7aa6da94d SHA512 9d28a39414aef4dcbf989d9b36d997f44df2caaa2ced10e9c72266b3100855127ba1b841b6766949ab7a177ba46cfbd92bad37d4ee2cdcd5afdad0f9118a1ef0
+DIST Bitwarden-2024.8.2-amd64.deb 82798736 BLAKE2B b9c39f689a394ed8ab24e600c47670f10e89de3c318ccf00de3001ba64c4bb5d9a0bfe43549cc5af824138bd676d63a71a1266a9a7d86d20ef0779095e23de4d SHA512 6dc90c0ccdaa14bf8d2724289ee100cd11a6fd21048a15859e3e91c4cea698d87e549c7d1992be08e863da174bfd0b3e620f044f56e7a9e9bc0852d7ed747655
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.4.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.4.ebuild
deleted file mode 100644
index a98f129ada65..000000000000
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.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
-
-inherit desktop unpacker xdg-utils
-
-MY_PN="Bitwarden"
-
-DESCRIPTION="Bitwarden password manager desktop client"
-HOMEPAGE="https://bitwarden.com/"
-SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	media-libs/alsa-lib
-	media-libs/mesa
-	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
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-"
-IDEPEND="
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-"
-
-QA_PREBUILT="
-	opt/Bitwarden/*.so*
-	opt/Bitwarden/bitwarden
-	opt/Bitwarden/chrome-sandbox
-	opt/Bitwarden/chrome_crashpad_handler
-"
-
-src_install() {
-	insinto /opt
-	doins -r opt/${MY_PN}
-	fperms 755 /opt/Bitwarden/bitwarden
-	fperms 4755 /opt/Bitwarden/chrome-sandbox
-
-	domenu usr/share/applications/bitwarden.desktop
-
-	local x
-	for x in 16 32 64 128 256 512; do
-		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
-	done
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.8.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.8.1.ebuild
new file mode 100644
index 000000000000..483c1697ab39
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.8.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg-utils
+
+MY_PN="Bitwarden"
+
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/mesa
+	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
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+"
+IDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so*
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/bitwarden-app
+	opt/Bitwarden/chrome-sandbox
+	opt/Bitwarden/chrome_crashpad_handler
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden \
+		/opt/Bitwarden/bitwarden-app
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	domenu usr/share/applications/bitwarden.desktop
+
+	local x
+	for x in 16 32 64 128 256 512; do
+		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
+	done
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.8.2.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.8.2.ebuild
new file mode 100644
index 000000000000..483c1697ab39
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.8.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg-utils
+
+MY_PN="Bitwarden"
+
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/mesa
+	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
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+"
+IDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so*
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/bitwarden-app
+	opt/Bitwarden/chrome-sandbox
+	opt/Bitwarden/chrome_crashpad_handler
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden \
+		/opt/Bitwarden/bitwarden-app
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	domenu usr/share/applications/bitwarden.desktop
+
+	local x
+	for x in 16 32 64 128 256 512; do
+		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
+	done
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 66fea02d53c4..0afd81546d68 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6
diff --git a/app-admin/calamares/calamares-3.2.60-r5.ebuild b/app-admin/calamares/calamares-3.2.60-r5.ebuild
deleted file mode 100644
index 592c5af31d92..000000000000
--- a/app-admin/calamares/calamares-3.2.60-r5.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
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/kpackage:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-4.0.0:5=
-	virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| (
-		sys-boot/grub:2
-		sys-apps/systemd[gnuefi(-)]
-		sys-apps/systemd[boot(-)]
-		sys-apps/systemd-utils[boot]
-	)
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	sys-libs/timezone-data
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-			PYTHON_LIBS="$(python_get_LIBS)"
-
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-		calamares.desktop || die
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-		calamares.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CONFIG=ON
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=OFF
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Skipped tests:
-		# load-dracut: tries and fails to find Dracut config
-		# libcalamaresnetworktest: needs network
-		# libcalamaresutilstest: inspects /tmp (expects namespace?)
-		#
-		# Need investigation:
-		# test_libcalamaresuipaste
-		# validate-netinstall
-		# validate-services-systemd
-		# localetest
-		# machineidtest
-		# packagechoosertest
-		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	ecm_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.3.6-r1.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild
deleted file mode 100644
index 2036bb2bfb26..000000000000
--- a/app-admin/calamares/calamares-3.3.6-r1.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
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager qt6 +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-QT5_MIN="5.15.0"
-KF_QT5_MIN="5.78"
-QT6_MIN="6.5.0"
-KF_QT6_MIN="5.240"
-
-BDEPEND="
-	qt6? (
-		>=dev-qt/qttools-${QT6_MIN}:6[linguist]
-		>=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
-	)
-	!qt6? (
-		>=dev-qt/linguist-tools-${QT5_MIN}:5
-		>=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_USEDEP}]
-	')
-	qt6? (
-		>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
-		>=dev-qt/qtdeclarative-${QT6_MIN}:6
-		>=dev-qt/qtsvg-${QT6_MIN}:6
-		>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
-		>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
-		>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
-		>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
-		>=kde-frameworks/ki18n-${KF_QT6_MIN}:6
-		>=kde-frameworks/kpackage-${KF_QT6_MIN}:6
-		>=kde-frameworks/kparts-${KF_QT6_MIN}:6
-		>=kde-frameworks/kservice-${KF_QT6_MIN}:6
-		>=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
-		sys-auth/polkit-qt[qt6(-)]
-		>=sys-libs/kpmcore-24.01.75:6=
-	)
-	!qt6? (
-		>=dev-qt/qtconcurrent-${QT5_MIN}:5
-		>=dev-qt/qtdbus-${QT5_MIN}:5
-		>=dev-qt/qtdeclarative-${QT5_MIN}:5
-		>=dev-qt/qtgui-${QT5_MIN}:5
-		>=dev-qt/qtnetwork-${QT5_MIN}:5
-		>=dev-qt/qtsvg-${QT5_MIN}:5
-		>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
-		>=dev-qt/qtwidgets-${QT5_MIN}:5
-		>=dev-qt/qtxml-${QT5_MIN}:5
-		>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
-		>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
-		>=kde-frameworks/kcrash-${KF_QT5_MIN}:5
-		>=kde-frameworks/ki18n-${KF_QT5_MIN}:5
-		>=kde-frameworks/kpackage-${KF_QT5_MIN}:5
-		>=kde-frameworks/kparts-${KF_QT5_MIN}:5
-		>=kde-frameworks/kservice-${KF_QT5_MIN}:5
-		>=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
-		sys-auth/polkit-qt[qt5(+)]
-		>=sys-libs/kpmcore-20.04.0:5=
-	)
-	sys-apps/dbus
-	sys-apps/dmidecode
-	virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		!qt6? ( dev-qt/qttest:5 )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| (
-		sys-boot/grub:2
-		sys-apps/systemd[boot(-)]
-		sys-apps/systemd-utils[boot]
-	)
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	sys-libs/timezone-data
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-			PYTHON_LIBS="$(python_get_LIBS)"
-
-	cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CONFIG=ON
-		-DINSTALL_COMPLETION=ON
-		-DINSTALL_POLKIT=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHON=ON
-		# Use system instead
-		-DWITH_PYBIND11=OFF
-		-DBUILD_APPDATA=ON
-		-DWITH_QT6="$(usex qt6)"
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Skipped tests:
-		# load-dracut: tries and fails to find Dracut config
-		# libcalamaresnetworktest: needs network
-		# libcalamaresutilstest: inspects /tmp (expects namespace?)
-		#
-		# Need investigation:
-		# test_libcalamaresuipaste
-		# validate-netinstall
-		# validate-services-systemd
-		# localetest
-		# machineidtest
-		# packagechoosertest
-		#
-		# Requires removed dev-python/toml
-		# lint-displaymanager
-		#
-		# E1101
-		# lint-dummypython
-		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)"
-	)
-
-	cmake_src_test
-}
diff --git a/app-admin/calamares/calamares-3.3.6-r2.ebuild b/app-admin/calamares/calamares-3.3.6-r2.ebuild
new file mode 100644
index 000000000000..633a53a5ce26
--- /dev/null
+++ b/app-admin/calamares/calamares-3.3.6-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..12} )
+
+QTMIN="6.7.1"
+KFMIN="6.0.0"
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_USEDEP}]
+	')
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	sys-auth/polkit-qt[qt6(-)]
+	>=sys-libs/kpmcore-24.01.75:6=
+	sys-apps/dbus
+	sys-apps/dmidecode
+	virtual/libcrypt:=
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	|| (
+		sys-boot/grub:2
+		sys-apps/systemd[boot(-)]
+		sys-apps/systemd-utils[boot]
+	)
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_prepare() {
+	ecm_src_prepare
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+		PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+		PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+		PYTHON_LIBS="$(python_get_LIBS)"
+
+	cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CONFIG=ON
+		-DINSTALL_COMPLETION=ON
+		-DINSTALL_POLKIT=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHON=ON
+		# Use system instead
+		-DWITH_PYBIND11=OFF
+		-DBUILD_APPDATA=ON
+		-DWITH_QT6=ON
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Skipped tests:
+		# load-dracut: tries and fails to find Dracut config
+		# libcalamaresnetworktest: needs network
+		# libcalamaresutilstest: inspects /tmp (expects namespace?)
+		#
+		# Need investigation:
+		# test_libcalamaresuipaste
+		# validate-netinstall
+		# validate-services-systemd
+		# localetest
+		# machineidtest
+		# packagechoosertest
+		#
+		# Requires removed dev-python/toml
+		# lint-displaymanager
+		#
+		# E1101
+		# lint-dummypython
+		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)"
+	)
+
+	cmake_src_test
+}
diff --git a/app-admin/calamares/files/calamares-3.2.60-ldflags.patch b/app-admin/calamares/files/calamares-3.2.60-ldflags.patch
deleted file mode 100644
index f81c49b50641..000000000000
--- a/app-admin/calamares/files/calamares-3.2.60-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Bug: https://bugs.gentoo.org/865281
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -203,7 +203,7 @@ set( CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG" )
- set( CMAKE_C_FLAGS_RELEASE          "-O4 -DNDEBUG" )
- set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" )
- 
--set( CMAKE_SHARED_LINKER_FLAGS      "-Wl,--no-undefined -Wl,--fatal-warnings" )
-+set( CMAKE_SHARED_LINKER_FLAGS      "-Wl,--no-undefined -Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}" )
- 
- if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
-     message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
deleted file mode 100644
index 3300d3b70c61..000000000000
--- a/app-admin/calamares/files/calamares-pkexec
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-pkexec "/usr/bin/calamares" "$@"
diff --git a/app-admin/ccze/ccze-0.2.1-r5.ebuild b/app-admin/ccze/ccze-0.2.1-r5.ebuild
index ee9d43a6124f..dd2cbe565456 100644
--- a/app-admin/ccze/ccze-0.2.1-r5.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 x86"
 
 RESTRICT="test" # bug 913965
 
diff --git a/app-admin/clustershell/clustershell-1.9.2.ebuild b/app-admin/clustershell/clustershell-1.9.2.ebuild
index 30dcc094b0f4..400bd86ba4d3 100644
--- a/app-admin/clustershell/clustershell-1.9.2.ebuild
+++ b/app-admin/clustershell/clustershell-1.9.2.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="amd64 ~x86"
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
+		!!>=dev-libs/expat-2.6.0
 		app-shells/pdsh
 		virtual/openssh
 		app-alternatives/bc
diff --git a/app-admin/cronolog/cronolog-1.6.2-r6.ebuild b/app-admin/cronolog/cronolog-1.6.2-r6.ebuild
deleted file mode 100644
index 913f65fbd788..000000000000
--- a/app-admin/cronolog/cronolog-1.6.2-r6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Log rotation software"
-HOMEPAGE="https://github.com/fordmason/cronolog"
-SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-patches
-	# rename and move into ${PV}-patches after -r3 removal
-	"${FILESDIR}"/${P}-umask.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index d4da756c9c16..93f35d0f1a72 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.78.5.gh.tar.gz 11128614 BLAKE2B 8d22212708b961a1f40028d19487b81a5208276a08b97d70553341af1fd9dbe9e483bfc09404671536d8b56ee0b8332470faa59a0d0636e0a861572a2647d5ee SHA512 1e007920ffbd5e9df7af2bd4d679cd7bf75712f5a506ab78d9a9d61ee5790e2e01840101e40382df4212667a6e05c5564ee20b640c883ea1ff45c37dbae7a3e1
+DIST exo-1.79.0.gh.tar.gz 11129715 BLAKE2B b3f529429d448cb01b921ed1a192dfab04b396be7a0cc62152d9789369550b8aa65c1477192752a8a0943fa8e5d51518226e76a149cecd81c688633208e7f13b SHA512 e67236dde1c485578eeec50d439e6dc967bac444c4b9b84c390c6ce3546d18c65cafa3dc9b12e2bd0ca32714ddc5d0a2398dd9bf75777d302558778994d12b68
diff --git a/app-admin/exo/exo-1.78.5.ebuild b/app-admin/exo/exo-1.79.0.ebuild
index 43fbacd8aa32..43fbacd8aa32 100644
--- a/app-admin/exo/exo-1.78.5.ebuild
+++ b/app-admin/exo/exo-1.79.0.ebuild
diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
index d9fc74121773..da32b94f70ba 100644
--- a/app-admin/fsvs/Manifest
+++ b/app-admin/fsvs/Manifest
@@ -1,2 +1 @@
-DIST fsvs-1.2.11.tar.gz 498514 BLAKE2B 8683fe3c22a0ea0d4762d631e520596dc02d69059f4ff5d8719bd44405134e5b5100c594a260d1b55a9dd7c6d240a84a0c5e05a18006a7a5f193ce76178d934c SHA512 72f883dfef85cb8aeb4d3baf3a2de5bfb6b5479273027f86b52edfdd2ea6dac4b2271b83a9879add3d7c9008f80a2fef13671b9e5ed61958c72ff144d9fad086
 DIST fsvs-1.2.12.tar.gz 526284 BLAKE2B db0a9f7cd60db7544ca44e4404c2ca844e035a8bb6db61d1880b19b26114f5c1c545b7d74e2e407d4a5961225d700851aaa95f3a6e395a5d9e92d21ade9ba0be SHA512 a06e6d6de242dfe117d3e2b1f18d117b77350ed2d398370d198110fc074dd352bac956acc2870586477cc6d2db404fefc5a5bcca3884cdd1477020f4297c1a81
diff --git a/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch
deleted file mode 100644
index 93daf9521d3e..000000000000
--- a/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@
- 	@echo ''
- 	@false
- 
--configure:	configure.in
-+configure:	configure.ac
- 	@echo Generating configure.
- 	autoconf
- 
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -11,10 +11,11 @@
- ################################ Definitions ################################
- DIR	:= /usr/share/doc
- 
--VERSION	:= $(shell git describe --tags --always)
-+VERSION	:= 1.2.11
- 
-+CC		:= @CC@
- CFLAGS	:= @CFLAGS@
--CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'  -Wno-deprecated-declarations
-+CFLAGS	+= -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"'  -Wno-deprecated-declarations
- LDFLAGS	:= @LDFLAGS@
- FSVS_LDFLAGS = $(LDFLAGS)
- BASELIBS := -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre2-8 -lgdbm -ldl
-@@ -48,11 +49,7 @@
- 
- 
- ################################ Targets ###################################
--ifeq (@CHROOTER_JAIL@, )
--all:	deps tags check-version check-dox $(DEST) lsDEST
--else
--all:	tools/fsvs-chrooter
--endif
-+all:	fsvs
- 
- 
- check-version: config.h fsvs.c
-@@ -145,18 +142,11 @@
- 
- 
- ################################ Rules ######################################
--%.o:	%.c
--	@echo "     CC $<"
--	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
- 
- # if the Makefile has changed, the output will (at least sometimes)
- # change, too.
- $(DEST): $(C_FILES:%.c=%.o)
--	@echo "     Link $@"
--	@$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) 
--ifeq (@ENABLE_RELEASE@, 1)
--	-strip $@
--endif
-+	$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) 
- 
- 
- # For debugging: generate preprocessed, generate assembler
-@@ -171,7 +161,6 @@
- .%.d:	%.c
- 	@echo "     deps for $<"
- 	@$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
--include $(D_FILES)
- 
- tools/fsvs-chrooter: tools/fsvs-chrooter.c
- tools/fsvs-chrooter: interface.h config.h
diff --git a/app-admin/fsvs/fsvs-1.2.11.ebuild b/app-admin/fsvs/fsvs-1.2.11.ebuild
deleted file mode 100644
index 20acd526eda7..000000000000
--- a/app-admin/fsvs/fsvs-1.2.11.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
-
-inherit autotools
-
-DESCRIPTION="Backup/restore for subversion backends"
-HOMEPAGE="https://github.com/phmarek/fsvs"
-SRC_URI="https://github.com/phmarek/fsvs/archive/refs/tags/${P}.tar.gz"
-S="${WORKDIR}/fsvs-${P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/apr-util
-	dev-libs/libpcre
-	dev-util/ctags
-	dev-vcs/subversion
-	sys-libs/db:*
-	sys-libs/gdbm"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	dobin src/fsvs
-	dodir /etc/fsvs
-	keepdir /var/spool/fsvs
-	doman doc/*5 doc/*1
-	dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
-}
-
-pkg_postinst() {
-	elog "Remember, this system works best when you're connecting to a remote"
-	elog "svn server."
-	elog
-	elog "Go to the base path for versioning:"
-	elog "    cd /"
-	elog "Tell fsvs which URL it should use:"
-	elog "    fsvs url svn+ssh://username@machine/path/to/repos"
-	elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
-	elog "and (assuming that you're in / currently) the temporary files in /tmp:"
-	elog "    fsvs ignore DEVICE:0 ./tmp/*"
-	elog "And you're ready to play!"
-	elog "Check your data in:"
-	elog "    fsvs commit -m \"First import\""
-}
diff --git a/app-admin/git-credential-gopass/Manifest b/app-admin/git-credential-gopass/Manifest
index 3366a7842e2a..2c364eeb6c01 100644
--- a/app-admin/git-credential-gopass/Manifest
+++ b/app-admin/git-credential-gopass/Manifest
@@ -1,4 +1,4 @@
-DIST git-credential-gopass-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b
-DIST git-credential-gopass-1.15.11.tar.gz 24602 BLAKE2B 3f479403071af80a08f9d28e9cce3fa492829fb7d6eb230f73ff1d84eaf3c4435fc82f3bfb2a7b29aa96c9a6c1c446d3160df5e0d3e3ff89b9e873e344b9afcf SHA512 50f5496a0ae6f60b9074d9c1a29d6dbcddeb6a0976859b6071ccf1fdb2b6796038d2f6dd5f8a3ce4644c5c31ad5f3447037bc87e9276287172174058ef75adfa
 DIST git-credential-gopass-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938
 DIST git-credential-gopass-1.15.13.tar.gz 19323 BLAKE2B 6889fbb0f22b5a9ca882893bf0860bb41319e0f3ed01ea6c542caf8c94d4762116f5b84f907380dd723ffe1c57a7359a20cc1e05e7d3958d9f3a3debbd39c659 SHA512 f95d9ce853c5f9b46148d53504cad5992f701c776c3c4a2d53b10b7e94717651231ef5ab7cec7ab572c2badb75a0972c129ba09576598cf067bc4140f6c42196
+DIST git-credential-gopass-1.15.14-deps.tar.xz 14646676 BLAKE2B 2423b090fa1a292dafa577a0070dcb66e01daa5971ce07b3c9d47a879a9c990485d86330b97324b35606e2ee7257f6b72fd452a52fc0186741987699890b5bab SHA512 872d0772c61b71a729368c45587c88c5056a0fed1ddf6516936ae41884cfd2f971a05925582f89cc8ab0499b27f6599d28b093bf335ab4a6c7e115af157d8c66
+DIST git-credential-gopass-1.15.14.tar.gz 19535 BLAKE2B 5b878bb9381b1c2684fc56e76dcec58ad11a9fda65b5c8be30f719eae2ed019279bfa832d837e6e7cdb03fa4f37d4271ebd12f02a92a737c4fe3853613cc24df SHA512 7f251ecc6a47944a6c5170eefaca61cbad9d65b386f2f23690faef6ee0ae2dbcfaf57c7c4b29f12c0350d48ff342b6eac92534de22adcea80bc300d68da70c51
diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.11.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.11.ebuild
deleted file mode 100644
index 974e33be5d96..000000000000
--- a/app-admin/git-credential-gopass/git-credential-gopass-1.15.11.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 go-module
-
-DESCRIPTION="Gopass git-credentials helper"
-HOMEPAGE="https://github.com/gopasspw/git-credential-gopass"
-SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/go-1.16"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.14.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.14.ebuild
new file mode 100644
index 000000000000..50939531c011
--- /dev/null
+++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass git-credentials helper"
+HOMEPAGE="https://github.com/gopasspw/git-credential-gopass"
+SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest
index 2c3e36606a58..fac44e412f35 100644
--- a/app-admin/gopass-hibp/Manifest
+++ b/app-admin/gopass-hibp/Manifest
@@ -1,4 +1,4 @@
-DIST gopass-hibp-1.15.11-deps.tar.xz 288522100 BLAKE2B 623d425a5bbeea5c5746e18d0dd44d198fa4b54fd5112fc870a5e95f092324e4a477565260ee68bccf903601997561429ab5546c6b7aaa3cec6de816076fcbff SHA512 db7f26676aeb2c67ae0b8645e9feed57540adefc04bed4dba0072c6766cd020921def0a8dae8c26a29c10e26ad27d84983b76350d885118f8d6393e25fddaf3f
-DIST gopass-hibp-1.15.11.tar.gz 28709 BLAKE2B 0ec749f89896067f1a1b444f1dbf4508e67129cd012ea565edadcb87779c9f6ea1b62d4ea5fe1bef37f5fde7615e8254c003dd36ad9f1be488f8679b10211383 SHA512 781393893567c7f0a8089a0a61e9bf794661a00ae01d7505dd7a851093d6f3d2b75bf5c494aaf6c9696f400b95debd737f3f4719cd974dc94c3bfc1eb7db91ea
 DIST gopass-hibp-1.15.13-deps.tar.xz 29737100 BLAKE2B 25cce3936716dda6fd1c760d055a6df6e412f50678295f139724eb84291f6a4447f6cfc05f57b636e67316fab29e94b164615d1ac86dd8738f46e8ddde9b5e71 SHA512 21afb52268e527d4b58bebdab62af8b812a0b2977532c0a99ea092d8e549221169c3f7260b75949d5abc689a9fb1ca6bdcb1e7235f1f2d6360a915c170059ba2
 DIST gopass-hibp-1.15.13.tar.gz 24047 BLAKE2B 79da4ca110585b6b928a27c7fdbf9094ce8110ac4d4bd99e645ae192caf816ab2f9f89d988bff60d84469853d3d08ffdda8eb51de9ccdf53474cedd3017b9687 SHA512 eb2eff7ffd16c166ee9ebfaa52273893b4f349fddba900ea966d0b39bf5f6f22b37cb76de8e0a327002138f1013d227bb066afcb9ff785b9afded97ebba17030
+DIST gopass-hibp-1.15.14-deps.tar.xz 14656156 BLAKE2B 2aabc11371eaa3199c85b186d033f9a64d69ef07c91aa0e0f1a39694d8b84542cb95e65954b7627a6123b49a570f805ede3478cdbd203f1e3379039ed1f35773 SHA512 2325052e3b1077e98a7f21fde1e82ba90d114bba94d1e033f32bbdf5cbe7beef1ea3a613d82e1b7e379c0c87d6bb49afd7d9de33f8ea9b206a54982ce9d93985
+DIST gopass-hibp-1.15.14.tar.gz 24232 BLAKE2B b5906237339805bc57069254346db49040056a2dce4b9ebd33d678772fb9eab286413127e269111317e548a40f8ba071974e461b05dc76a180e86d90fd54c26c SHA512 efbecfc631faed28edda088c80f5919e3cc665b66c5fd999b99469a9a810bf25fe119863accef3d9b68d05b7994dd91efce0c2652a84b1001c85d7b29ab425d5
diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.11.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.11.ebuild
deleted file mode 100644
index e30950cff996..000000000000
--- a/app-admin/gopass-hibp/gopass-hibp-1.15.11.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 go-module
-
-DESCRIPTION="Gopass haveibeenpwnd.com integration"
-HOMEPAGE="https://github.com/gopasspw/gopass-hibp"
-SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/go-1.16"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.14.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.14.ebuild
new file mode 100644
index 000000000000..dcc9f7b6470b
--- /dev/null
+++ b/app-admin/gopass-hibp/gopass-hibp-1.15.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass haveibeenpwnd.com integration"
+HOMEPAGE="https://github.com/gopasspw/gopass-hibp"
+SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
diff --git a/app-admin/gopass-jsonapi/Manifest b/app-admin/gopass-jsonapi/Manifest
index 502172becc97..9b7ba1687ee1 100644
--- a/app-admin/gopass-jsonapi/Manifest
+++ b/app-admin/gopass-jsonapi/Manifest
@@ -1,4 +1,4 @@
-DIST gopass-jsonapi-1.15.11-deps.tar.xz 288583480 BLAKE2B f914d07a5b00f82bb1baa3114736fdde720a8bfb4b2378c60015501c281a14b595fff96c40b06c0f9f8d867e5b2004a43aa9eed4e3cf4016bdfb2a8acb221a78 SHA512 220f31aae7db0a268b4658f1464c8b1256958f2d220ebc028701db1ab2eda998b92d493e0facf741fc4d83135cf53d3fda5ac24f84365cd567da3d825623b0f6
-DIST gopass-jsonapi-1.15.11.tar.gz 36121 BLAKE2B cc9832c9473d1ed0095ff10f6fbbe763d0b4a3a76fb891089f75a0cd0eb677e1c1c87598ff8beb1494d5790870c39d78df0c52ce9be68a127e0d8d725a9dcdc0 SHA512 7231edc6bf6a529761a193fda40fdf254ffdaab6853d9a265d4d7ff3fcdc08fb418f9c4f1a05f32180eccde5add1a5276fa01133fc90a61c57c4c9793a9abc3a
 DIST gopass-jsonapi-1.15.13-deps.tar.xz 149388536 BLAKE2B 2b5068a830edef67e330f918081bbdf218a2a0e80dc6c26e3d7b9d1d3779919dd869f57af32b0580f5be4787dc6df1325b5b1aba864c0bf0c2fd9d3e1c65364f SHA512 b6034103e0df9897cb95db3b8c9dc2895d7680385de14afcf7ab20db1d7eb537fa86ec56447267623b8493788802b1a1d6a9abff5c9d76f171847b79994cfa16
 DIST gopass-jsonapi-1.15.13.tar.gz 32433 BLAKE2B 6e16c2b060f2a380ede13840bea419b76b5e00cbc0dd29bbf72fc41900acfdeb6bb63908d09bfecbdc89c8c7266274a722fbb6d4b5848ee42fd986d36c3e30ca SHA512 e4b92558d17b27f4f4aada045ccfae4237e2021310ce1c64f3c29406c17f9f73ff61891ede96baebd741b4af15c0584ba8fe9fcb9693e288d17947e606d837b3
+DIST gopass-jsonapi-1.15.14-deps.tar.xz 70627032 BLAKE2B 129b78c19b20dc1d2a51786c0747bed0528edca0b149c490cc76cf5213e599e9271d11b79b0c198759117a5ca03c2bc7568464f77ef463b1680e7a3dce0b5d99 SHA512 f8447d650bf680e7ff93e1d6eb08634a02e7082af5a45f06302b929e7c5ecb8779d56a92f0080be99a89ef98a07295380592603c85f671441b6d57c12b3e9124
+DIST gopass-jsonapi-1.15.14.tar.gz 32520 BLAKE2B 6c7c8a960244f22d0cf239c43ec63c1a1b985e18335c090e16ae9e983fb64118266f8cfc1b70f3f42b8f8a92159d89509b81ab4300bd086e6c313789e986e9cc SHA512 8d2409919c43ef34ac4c3909815d9ac63325fda8bb30a696e31db60db50452b05cf59fbae9d733d40ff52183deea0d98a732089b4e2e50f587ca0984c291dfea
diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.11.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.11.ebuild
deleted file mode 100644
index 828cd8d04aa5..000000000000
--- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Gopass Browser Bindings"
-HOMEPAGE="https://github.com/gopasspw/gopass-jsonapi"
-SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/go-1.16"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.15.3-skip-test.patch"
-)
diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.14.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.14.ebuild
new file mode 100644
index 000000000000..699540bb5843
--- /dev/null
+++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass Browser Bindings"
+HOMEPAGE="https://github.com/gopasspw/gopass-jsonapi"
+SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15.3-skip-test.patch"
+)
diff --git a/app-admin/gopass-summon-provider/Manifest b/app-admin/gopass-summon-provider/Manifest
index e41c0b45e045..51f2bc351e8e 100644
--- a/app-admin/gopass-summon-provider/Manifest
+++ b/app-admin/gopass-summon-provider/Manifest
@@ -1,4 +1,4 @@
-DIST gopass-summon-provider-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b
-DIST gopass-summon-provider-1.15.11.tar.gz 21218 BLAKE2B e042b2a003fa63fd79eaa24f3c50f1864238b7ae5c8d879c88c74c3795b6a9f97208c0b8ab51f3cde07a6a66155841a13517f49d900fd8fd49518775691e3926 SHA512 ae80aabe2216f37e1ac59509b3f7b2d785c0c0e20e7cc9fd42c170f7924be900e2b827daf117e174c69257595650ab287489017981c2988e6a5c1e4007ab1720
 DIST gopass-summon-provider-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938
 DIST gopass-summon-provider-1.15.13.tar.gz 16086 BLAKE2B b3b7656daf1189454c77772915120ab77615cf953ca1434919c901c5c0b708f0b1e124cfa63e9d8fa847d1aa12e403b630ccd023e16d6d3ef4d4cb507c7b36b9 SHA512 74809663c6b754894dc2f86c2153325b49bac862dbd29794b1997a11de34fd2bec4ddc583fefc19d4b920df64deedd7d9c508798d90426051d73648c3b545b7e
+DIST gopass-summon-provider-1.15.14-deps.tar.xz 14646676 BLAKE2B 2423b090fa1a292dafa577a0070dcb66e01daa5971ce07b3c9d47a879a9c990485d86330b97324b35606e2ee7257f6b72fd452a52fc0186741987699890b5bab SHA512 872d0772c61b71a729368c45587c88c5056a0fed1ddf6516936ae41884cfd2f971a05925582f89cc8ab0499b27f6599d28b093bf335ab4a6c7e115af157d8c66
+DIST gopass-summon-provider-1.15.14.tar.gz 16307 BLAKE2B cfe83ea69a20a71017c0ecb32ebe5c83ef3f6eaf2b0215f10885ccbb38f8b98aa6e677d751cbd558ae421113b0513a2571392c1ddd2779224ddc2f6f3279a21a SHA512 ae9f65dcd1982230d3495e00c927266c70c1a5fd924b74c435c32a1956f25beaee717ef42493f769b8cf0327ac1bc7703479778706a67a09a941fdc92cc9ec79
diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.11.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.11.ebuild
deleted file mode 100644
index 3dd1d2e881c7..000000000000
--- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.11.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 go-module
-
-DESCRIPTION="Gopass Summon Provider"
-HOMEPAGE="https://github.com/gopasspw/gopass-summon-provider"
-SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/go-1.16"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.14.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.14.ebuild
new file mode 100644
index 000000000000..44e42f854afe
--- /dev/null
+++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass Summon Provider"
+HOMEPAGE="https://github.com/gopasspw/gopass-summon-provider"
+SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index e65f6f8ffda2..1245f7dd8d15 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,4 +1,4 @@
-DIST gopass-1.15.11-deps.tar.xz 288006888 BLAKE2B 527cef72eb493425111c6fd0a872bb31c63381226c823143e5d722cb59172a08901a50fce7042d329370bc83dd66205833e85608d68ce9b2037db89eb1a1b8a7 SHA512 978c5a915d382b8fe6360744c45c696f8c3c571df1341496537be73896d100eda78be1630b2f4a3ccd73d828d566a483bc057a302683aa4ddf92f46b8fa49e03
-DIST gopass-1.15.11.tar.gz 2319860 BLAKE2B 923be5effa8ca5a77a12bcd2692d2a07b68c6d068a579022e359a5f6e485813c37dc7e34acfeb1f0deec4e1075a54dd75b408ef0e07713cf7ffc2cfde2e9ac38 SHA512 ec3231f6cf903ba3a70f4721f04613ddf0e28e820c98a708c861ae68c993162a1346f62332132c00abd218f82f0ed0da0f8b86297427e813b0688a8eee5128be
 DIST gopass-1.15.13-deps.tar.xz 284979668 BLAKE2B 12e42b897dfc613de810cc4c42e2318b5cad013e14b007daba454b800092f6e408e5ca10731b14d895673cd9426b322d94615a45954e3a0871b0b46533b6f6c9 SHA512 5e4a2f564d0140d77cdaf52a3784d75984db8b68152bf7137d3fbd727238e9509d56d280ceb1106fa47198bb8bc52980637652c10bd95524063bf1e3e962fdfb
 DIST gopass-1.15.13.tar.gz 2328529 BLAKE2B 276ea675c7978ac1627cb313b595d9f252cc3aae29245eca758aed3b6632ddcdfa0da93cdc06f4c0767a2d5f58ded41fcccfac774b5001351bb4b743e976c595 SHA512 b7fcc7814ccad0cf0e3116eac848df080338e313ddcbb0cc8413cb353a1596b250aed427c97e791326e04c6c4241dbb529e112398218f2a905fc0fb48bc49963
+DIST gopass-1.15.14-deps.tar.xz 129535712 BLAKE2B efb790782a25d6f22b3b5f8b747bd72ea8f487bac18e7da746ebefd159a1ae6e36930d6bfe9b000c5d4096d9bbf277f9e263e922a57094d0d337bdd3add65a97 SHA512 88c27326563a3b3d35e05a31fde3d563a6d5c3ee67eb36580b4723c3b2646cc2662b2c8c77e1e2db9edaa8c25e73fa390fc08d98524a66f6b99a0fa8a84303b3
+DIST gopass-1.15.14.tar.gz 2328921 BLAKE2B 76d58f43cd0d95743a3160ec1eae372a4e26e58483a4685b41fa8b8845a1b2adbb3f0be61e23523558eb96a9d10af4b43f5610ba7f44cb5736b944d97a4f7b6e SHA512 874ea69816df46bc03113cbc3f1fae5b9c08a9c0b09a566097163f2f03f97e5d256351432f0f0eb1f89c5643b5866b4800e986d344f6fe06c5c3d4b3721c0521
diff --git a/app-admin/gopass/gopass-1.15.11.ebuild b/app-admin/gopass/gopass-1.15.11.ebuild
deleted file mode 100644
index b0173b8ad5a6..000000000000
--- a/app-admin/gopass/gopass-1.15.11.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
-
-inherit go-module optfeature
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
-
-DEPEND=">=dev-lang/go-1.18"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.15.3-skip-tests.patch"
-)
-
-src_test() {
-	# https://github.com/gopasspw/gopass/blob/v1.15.3/.github/workflows/build.yml#L38
-	git config --global user.name nobody || die
-	git config --global user.email foo.bar@example.org || die
-
-	default
-}
-
-src_install() {
-	emake install DESTDIR="${ED}/usr"
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "browser integration" app-admin/gopass-jsonapi
-	optfeature "git credentials helper" app-admin/git-credential-gopass
-	optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
-	optfeature "summon secrets helper" app-admin/gopass-summon-provider
-}
diff --git a/app-admin/gopass/gopass-1.15.14.ebuild b/app-admin/gopass/gopass-1.15.14.ebuild
new file mode 100644
index 000000000000..bac64dde98cc
--- /dev/null
+++ b/app-admin/gopass/gopass-1.15.14.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND=">=dev-lang/go-1.18"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15.3-skip-tests.patch"
+)
+
+src_test() {
+	# https://github.com/gopasspw/gopass/blob/v1.15.3/.github/workflows/build.yml#L38
+	git config --global user.name nobody || die
+	git config --global user.email foo.bar@example.org || die
+
+	default
+}
+
+src_install() {
+	emake install DESTDIR="${ED}/usr"
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "browser integration" app-admin/gopass-jsonapi
+	optfeature "git credentials helper" app-admin/git-credential-gopass
+	optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
+	optfeature "summon secrets helper" app-admin/gopass-summon-provider
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 3f1ceea43aff..feaa5e5655f8 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,2 +1,2 @@
 DIST hcloud-1.43.1.tar.xz 1889004 BLAKE2B 563cde962cf1fd180bbef60127b714419c09da198afeb4923f8fc1cd48850131b3b91de243de43e269497f36d14757a1e71941d30dfbee98baebb533f20e6cdd SHA512 c8fa46e9d3e2c73cc2d86e597bebf6e1dbf28b7145dbc272c403607807251ac27eee14b9ad267fdf2aa730da16ce52be4d2b0d94653612b4f375f1779c95d90b
-DIST hcloud-1.46.0.tar.xz 2197572 BLAKE2B 35920aae5ebd1a7efe88e159717e6a494810ac5ffae6bc4f6eba1e01685d29630ebefabe48a1d7d68fc8fea0d7ca5e647fb17ce07914d3cffad3e160c81228a8 SHA512 8ba06efc60a8e4cfd4ac84105c190c3749a4f5f53ba5c416880a9eb9f6e139da46ff935ef3de560e4a39703b92f710d3ced8d0fe2d7c939b77c3b6bbff288a8d
+DIST hcloud-1.47.0.tar.xz 2199764 BLAKE2B 02c06449ab62904b3f21ddaadc6182a965488e72f453b8d03d73b4be8a585ae42a7f1db4012588b8983e77cb181fa1aeff1a778205fc23731bc12565cdea1d7b SHA512 ca5999ef59a3b11e589a6c199f87ff2487b1384dfb6244adf286b84ee7de9dc6cbc4879dc72b6a5196c0f067efa7d3202110471debc4fe020114bf97ea10f9c8
diff --git a/app-admin/hcloud/hcloud-1.46.0.ebuild b/app-admin/hcloud/hcloud-1.47.0.ebuild
index c4449b25b091..c4449b25b091 100644
--- a/app-admin/hcloud/hcloud-1.46.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.47.0.ebuild
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 28b068d7b138..bddf4bb8fc02 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,4 +1,6 @@
 DIST helm-3.13.2-deps.tar.xz 148836588 BLAKE2B 517f09305f68ef0c5ee34aecf2c5cd846a455a2fde725b4ef7befbb04bb731f8ba4c675b95d8d00be591ab02a60c707345ac4517bf235025fc3a5383ecd390cc SHA512 6785d15244fd94f884177db702436255dcee91e8d866ba5258d25d5a3d21d91c3de7b1644bf43a139d353005708c0ff615da1b09b3a18b3547efc05441d27ae2
 DIST helm-3.15.2-deps.tar.xz 69934404 BLAKE2B 2a27c63c52f88e8b02e3db44d3ab8e0d5a0c4d46aa6ac0b97255cae475f4bea1c7f9223e9a53b1196c78d1ed093fe110c39e1cd96e31e7a3b5bf69470dec29c9 SHA512 5d6890ff3208cd0075128a44419f3652f17bbf6c84975c6dd54cba0d444dee05bf71254832f4cac0a9292e1918ad5c3372f4df14cf4dc5cadb532f5da2bf672a
+DIST helm-3.15.4-deps.tar.xz 69993204 BLAKE2B 5d27687e6594b0d0031be386a25a51a3bb98acb89f49b779f419dba7a0b529bd93b90c15f1ff54ecd018bfb4d007b21889132e28ccfaf882612d9318cea2b80f SHA512 775de69e086c9dcc5bb6bcabf42bb93f9b720e3df53a1ff5d1b0a8cd9d774dd07efbb18ca3d588a2c77894f784ab14fd9b48a27c89d943573916bcc9c39c5377
 DIST k8s-helm-3.13.2.tar.gz 718707 BLAKE2B 10fa4c7212eeb9bfd3bbe1f3881c67ae0de83ec8931c20cb2fb5e35b5a10207fc9960d21e81c0796e6e37353fd4a2e5afe325bbaadd6d28afaff6d7b68b7f1ae SHA512 989bdc7f3a0ab5c460a8882c2bbd07c0736dee506e3247c0cc0bd9830a321d187f26ef51954c7b81307bd1064754f805be3e5980c5be7eefe4a954f254722902
 DIST k8s-helm-3.15.2.tar.gz 732780 BLAKE2B b62a9064393378ec459fc9b1b81795c21af98d272388b831a07cb38254aafbd378149733916a6985ff816c4c2da67036fe81adca41be32cb96b16d348e797a3e SHA512 bf37ac419d3a8b98e8c7ca81e6e6e9fd1dab0a3b1c4824e3e98040859790ebb2bf4d1a972333a5d28e56d3f3d64590a34acc6af44bb56b7ac1fbfdcba3a5c0c5
+DIST k8s-helm-3.15.4.tar.gz 732823 BLAKE2B da043a58e21a5e7fee61daaa8e38b908e916a5efbc95b7b25ef423056e7ec70d71481987ec15a27efa745a54eb055e2250e2c3c83df0c952ba4e773e47a44fc1 SHA512 eb4baca40f36bbbb92d721776e42d297386fcf9507889bdcb2936efa7c18eb262b6dea12ccade2d23bb87a8da561b2e99922d60f4fc68c12d6f53c262740c234
diff --git a/app-admin/helm/helm-3.15.4.ebuild b/app-admin/helm/helm-3.15.4.ebuild
new file mode 100644
index 000000000000..4cdab0cd1bb2
--- /dev/null
+++ b/app-admin/helm/helm-3.15.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module shell-completion
+GIT_COMMIT=fa9efb07d9d8debbb4306d72af76a383895aa8c4
+GIT_SHA=fa9efb07
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+
+RESTRICT=" test"
+
+src_compile() {
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		LDFLAGS="" \
+		GIT_COMMIT=${GIT_COMMIT} \
+		GIT_SHA=${GIT_SHA} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	newzshcomp ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index ed8e18a27c30..1fc275a8970b 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,4 +1 @@
-DIST KeePass-2.49-Source.zip 5135190 BLAKE2B bf5a9aab0065a97545bd1b81a74b5ab113e4c4802873445719ce2a571745b04c69ab5d8be9a67dc59a713947f0955cbcccc782b6628f722a0d564283b943eee6 SHA512 7a25de6acb2637bd8820fb70866ab4ced4ece4b3e64172f616c2fb59d2a4e7a2f340435db10731ed3d7e66db7761487925cf1c7941b0bac12e72c5fcd9e8b7d3
-DIST KeePass-2.53-Source.zip 5201820 BLAKE2B a87918278915f1a54d8f6d6b8ef05d5a86f41a58887a1c80a8217112061fd40d59393012ae7b69d6c2110a7b0b36c57ecce4292a68e9161e99e1762b1622192e SHA512 8d35ec83ada7142e91be6a5889eabb98f1d8fe32140a3b904db76d64f42bed0ce1cc0378f38560b7f1307df545f00a398da599ef9fc44474e8c16722433d4e4e
-DIST KeePass-2.56-Source.zip 5231868 BLAKE2B d7ed0baf6db6a0398ce9bceb9a61088ef7cc14ba0c5b13a01123f9c7fca37e52bf352c438c3100ba32d59cfcfa90de790a07649684a971224bba6eb554cbed34 SHA512 cee9d8569e59a29044760dc94c4ab3ee6f1eb26aaa12d18a36d9e1b87e421291b49a3747fdb340a7af06494d65fe4d37579f16a577b0af2c053504b80e8a1c60
 DIST KeePass-2.57-Source.zip 5238885 BLAKE2B d7015eda056109aa0dc575a21a8ad720db4503a0cbf3124e6e0d0e0cf3d856a5a6509e605b3c1aafe984befa85646d716cdbe74fda936a967fd3da2778e7c455 SHA512 c553d2fa67d6c32b8122959bf222d6edadd79a9784802ac8f391ba0e89163172f431a24140d9dce775130d02374880e432c6958dfa19808f20f617e2f8067a30
diff --git a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
deleted file mode 100644
index c17b654d3f35..000000000000
--- a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-KeePass looks for some resources (XSL files) in the executable directory,
-however under UNIX system this not a good idea, so we look into the
-CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
-So the final search path should be "/usr/share/KeePass/XSL/".
-
---- a/KeePass/forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
-@@ -31,9 +31,11 @@
- using KeePass.Resources;

- using KeePass.UI;

- using KeePass.Util;

-+using KeePass.Native;

- 

- using KeePassLib;

- using KeePassLib.Utility;

-+using KeePassLib.Native;

- 

- namespace KeePass.Forms

- {

-@@ -98,8 +100,21 @@
- 			m_lvComponents.Items.Add(lvi);

- 

- 			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);

--			string strPath = WinUtil.GetExecutable();

--			strPath = UrlUtil.GetFileDirectory(strPath, true, false);

-+

-+			string strPath;

-+			if (NativeLib.IsUnix())

-+			{

-+				strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);

-+				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

-+				strPath += PwDefs.ShortProductName.ToLower();

-+				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

-+			}

-+			else

-+			{

-+				strPath = WinUtil.GetExecutable();

-+				strPath = UrlUtil.GetFileDirectory(strPath, true, false);

-+			}

-+

- 			strPath += AppDefs.XslFilesDir;

- 			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

- 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);

diff --git a/app-admin/keepass/keepass-2.49.ebuild b/app-admin/keepass/keepass-2.49.ebuild
deleted file mode 100644
index 218b7363d31b..000000000000
--- a/app-admin/keepass/keepass-2.49.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 desktop optfeature wrapper xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="aot"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-lang/mono"
-RDEPEND="
-	${DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# bug 704358
-	export LANG=C LC_ALL=C
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	optfeature "enables autotype/autofill" x11-misc/xdotool
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.53.ebuild b/app-admin/keepass/keepass-2.53.ebuild
deleted file mode 100644
index d5f8f014254f..000000000000
--- a/app-admin/keepass/keepass-2.53.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 desktop optfeature wrapper xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="aot"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-lang/mono"
-RDEPEND="
-	${DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# bug 704358
-	export LANG=C LC_ALL=C
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	optfeature "enables autotype/autofill" x11-misc/xdotool
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.56.ebuild b/app-admin/keepass/keepass-2.56.ebuild
deleted file mode 100644
index 6cde0c268a1d..000000000000
--- a/app-admin/keepass/keepass-2.56.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 desktop optfeature wrapper xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="aot"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-lang/mono"
-RDEPEND="
-	${DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# bug 704358
-	export LANG=C LC_ALL=C
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	optfeature "enables autotype/autofill" x11-misc/xdotool
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.57.ebuild b/app-admin/keepass/keepass-2.57.ebuild
index 6cde0c268a1d..d5f8f014254f 100644
--- a/app-admin/keepass/keepass-2.57.ebuild
+++ b/app-admin/keepass/keepass-2.57.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="aot"
 
 BDEPEND="app-arch/unzip"
diff --git a/app-admin/kernel-hardening-checker/Manifest b/app-admin/kernel-hardening-checker/Manifest
index dced1798de98..1204fb7880ab 100644
--- a/app-admin/kernel-hardening-checker/Manifest
+++ b/app-admin/kernel-hardening-checker/Manifest
@@ -1 +1 @@
-DIST kernel-hardening-checker-0.6.6.gh.tar.gz 3262987 BLAKE2B b3dd5ab4732755b4ea56a65a89d923e8a70eb7c9446231b30f5ca27753883602dbda2ec64e5cabb00f074e3edad584d7819454d0ad5cd214b5ac0d6856979588 SHA512 1c8b71fe5c3befe3e4a76b3a840fe0c057ff334a74c82648134189d95e54c7b5b36fdfef9689d8fa9d1d5afe6c0e296472d244295f3dd18124d815f8dcd75ef8
+DIST kernel-hardening-checker-0.6.10.gh.tar.gz 3438466 BLAKE2B 5a31b7ca1de56e7c3297559486b53b4bf071d53800c9f405840fa002c583162b2b4ff4e1c9188d19e12145d6b7480fb3e8183958b2027827cc2349aea6a2acf4 SHA512 d006234c3d4eaea4440276fc18f3eb5eaf131dfdddec301063491b00562bdabe7b2528487eb5f5110c235a6b9a752a5896b7f5e71d2476358b207fd7da7e4426
diff --git a/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.6.ebuild b/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.10.ebuild
index 059355f21457..059355f21457 100644
--- a/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.6.ebuild
+++ b/app-admin/kernel-hardening-checker/kernel-hardening-checker-0.6.10.ebuild
diff --git a/app-admin/logrotate/logrotate-3.22.0.ebuild b/app-admin/logrotate/logrotate-3.22.0.ebuild
index 9426d975db21..a9b70e508b32 100644
--- a/app-admin/logrotate/logrotate-3.22.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.22.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND="
diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest
index 8886610352bc..d97b5d8dbcc3 100644
--- a/app-admin/mkosi/Manifest
+++ b/app-admin/mkosi/Manifest
@@ -1 +1,2 @@
 DIST mkosi-20.2.tar.gz 198966 BLAKE2B 1ab2332427d205871adea24ddd50c41e716801dd320f17167dc2e990d449084d59fc58efb20de01a80d438ce85b900f9752f9acc2372a5d5e8ccead0d371b9ed SHA512 62095d81f21d18a1b7f25c73ea2989f9f5b8fe1e335185b3ce6774af2739df9124ca8f5860514a8f570d565ffbf07edf3abc53a0622059127f5c35ed23bd8f65
+DIST mkosi-24.3.tar.gz 349900 BLAKE2B 98685e19b7891f409ccffe4223e588c3777649b817228e0590d6603f96fb779cd1c0d092acd595ed4226f5405fb34f08d767c21b1590be3a5493bded683675af SHA512 b74f3614574926338b610d8301b583f81765207ffd2b3bb0598557a72108a8d1fbd8922be5de51c12a5864d040ecf8af9750b4220718cc300d7ab83d034906e6
diff --git a/app-admin/mkosi/mkosi-24.3.ebuild b/app-admin/mkosi/mkosi-24.3.ebuild
new file mode 100644
index 000000000000..aca2c7b1052c
--- /dev/null
+++ b/app-admin/mkosi/mkosi-24.3.ebuild
@@ -0,0 +1,41 @@
+# 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_{11..13} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Build Bespoke OS Images"
+HOMEPAGE="https://github.com/systemd/mkosi"
+SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+RDEPEND="
+	app-emulation/qemu
+	sys-apps/bubblewrap
+	sys-apps/systemd
+	|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2-ovmf )"
+BDEPEND="virtual/pandoc"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	distutils-r1_src_compile
+
+	./tools/make-man-page.sh || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman mkosi/resources/mkosi.1
+}
+
+pkg_postinst() {
+	optfeature "debian support" dev-util/debootstrap
+}
diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest
index c76804d9e981..85fbeba6afcf 100644
--- a/app-admin/opentofu/Manifest
+++ b/app-admin/opentofu/Manifest
@@ -8,3 +8,5 @@ DIST opentofu-1.7.1-deps.tar.xz 107794272 BLAKE2B cf06be88cdfe1e2b12d9f5b6c3576b
 DIST opentofu-1.7.1.tar.gz 3890267 BLAKE2B c82bd4a99eb904a2dddc1c38c7a67680b3a51eb9a4a23ff618d038c4b467c7666a9801c7fb205d2f93b60ec8137a28b193347c0be43357a7397a0d98b8e1cf06 SHA512 11573449cf73e44352124463bb2dfe890688fc0bb1a232fb57a16872612c562e0fe08ed926635fc21063118d83a120febd156073c23d8dc3294e00035c660ad6
 DIST opentofu-1.7.2-deps.tar.xz 107787580 BLAKE2B 10d7f8e114ca43964de34f4ecc7d8ada24f5ac069a7568a7b843e6c6d194e767deb254af00ce722ab82ed30eb80b34689c4e004b775edbbb07c34666f1436680 SHA512 7530197f99a1dc4d0a779edff466715039bd7d5fcaa70a5158cbde33256b0d90e9f2a1f47411c13f62a257f5baf6816fec5692b9e0ec01d2704c04d5935b59b9
 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
diff --git a/app-admin/opentofu/opentofu-1.8.1.ebuild b/app-admin/opentofu/opentofu-1.8.1.ebuild
new file mode 100644
index 000000000000..544c2e0b5f16
--- /dev/null
+++ b/app-admin/opentofu/opentofu-1.8.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="The open source infrastructure as code tool"
+HOMEPAGE="https://www.opentofu.org/"
+SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/tofu \
+		-verbose \
+		./cmd/tofu || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    tofu -install-autocomplete"
+}
diff --git a/app-admin/pprocm/Manifest b/app-admin/pprocm/Manifest
index 74e5dccbdc34..adf0ed5e648c 100644
--- a/app-admin/pprocm/Manifest
+++ b/app-admin/pprocm/Manifest
@@ -1,2 +1 @@
-DIST PProcM-1.0.tar.gz 29007 BLAKE2B 511934eedb0f2269d505affbe15d9ba151ba4e6647885787caf045bdb52080ca26072f5a8986e8fdbd12fc8a0516d9c35f0d0dfd1d42ec268777c1288c55b00f SHA512 d592455719babb9dd55c0d63ea097fb110747eb481e81b237779543f7bc90c8fcc0a4e7ecb94e3287afe9ac9f707e1e90c28ab634dd8d0e2bd7708aee8e79277
 DIST pprocm-1.0.tar.gz 13388 BLAKE2B 9ef3ce2965108397ad8de25d0f3f447edb32584a7767841ee14782904f124a69e492543f36ee809f19795ef3a3393ce02ac8491267a0e3d32729b9d8161a5f34 SHA512 72d816e2bf210b8724da12e360cd637cb7ed130ae36e0435900b3561bfdcad7a1b0656e2fb55c6778141193e0717308c726d1099dfbe677d93f1bbf8d1f4723f
diff --git a/app-admin/pprocm/pprocm-1.0-r3.ebuild b/app-admin/pprocm/pprocm-1.0-r3.ebuild
deleted file mode 100644
index ce36cdee03d4..000000000000
--- a/app-admin/pprocm/pprocm-1.0-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="PProcM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ncurses-based program to monitor CPU, disk, network and memory usage"
-HOMEPAGE="https://github.com/ZachGoldberg/Perl-Proc-Monitor-PProcM"
-SRC_URI="http://www.fusedcreations.com/PProcM/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/IO-Pipely
-	dev-perl/POE
-	dev-perl/Sys-Statistics-Linux
-"
-
-src_install() {
-	newbin "${MY_PN}" "${PN}"
-	einstalldocs
-}
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 0f77c15a2e52..79fc6c165dbc 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1 +1,2 @@
 DIST pwman3-0.12.2.tar.gz 76744 BLAKE2B 5223169a267f0c35bcb26499138c9b768c6e29c4ce39d4fb89c56eb72d24a9729159bed93af24e12f1e0e6c1569586772eb36954afd51afc7c97c9de898346e5 SHA512 587839e7d532ef3c53e2c429b086eb6bd59290ce43687034400f8e0772cc4e97c9296694ad83c5fa3fdde37b8d8fef5bc150e9f81fcb9fe8712ffafb4be8b400
+DIST pwman3-0.13.1.tar.gz 81775 BLAKE2B d470735a8d514b335f2cf0c0ca84db2f362324262fd22617a98084d2e34b3b37447c2519204525a582a2bb5365f82452819270ad26195537fb776dedcf432bd2 SHA512 8b729968b7817a82692a8f9424f81882e4568cf8ecf5de52037a176ca028aaa58cf238f1d92dab02fbbe547fb872f74440d6eb0bc7a4b0a30649b6d9e3008ee4
diff --git a/app-admin/pwman3/pwman3-0.13.1.ebuild b/app-admin/pwman3/pwman3-0.13.1.ebuild
new file mode 100644
index 000000000000..678acd2e3e0b
--- /dev/null
+++ b/app-admin/pwman3/pwman3-0.13.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A lightweight password-manager with multiple database backends"
+HOMEPAGE="https://pwman3.github.io/pwman3/"
+SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m tests.test_pwman || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Support for mongodb" dev-python/pymongo
+	optfeature "Support for postgresql" dev-python/psycopg:2
+	optfeature "Support for mysql" dev-python/pymysql
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 8a0de37a0042..994768f9ee6c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,4 +1,6 @@
 DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1
 DIST rsyslog-8.2406.0.tar.gz 3412827 BLAKE2B c75bfba02cd9d28effb2dd64b6b665b71b46fe6e47a9e12dbe5a6735fdb59373585d655334da64e89c11cbeb0f36a1563562a9c65ead3c2747f876fd0664d800 SHA512 e7c930f9b35b73591c1655afa25408c325c967114550996caa5840331c8f089563536c8efe52588c1b727db7f27bdae9b5ba619222e050d618a3f067de1bcbd0
+DIST rsyslog-8.2408.0.tar.gz 3436647 BLAKE2B b19b25bb9a3e97038b51c049dc7ba52ccd68ec552bf12369fb16d0ec030b8335848ca7ecfe925af4873bc1390264c9b6a05b25ec3ed011389beaa2844ef7a786 SHA512 86901f76290aa451dfc8dc3d2c7eb2ea82bdbf39875fe2872169a3aa44933aff064dd5ea9b80964881fd07c34c17da25ec6a0efc1c5b7f4d6884435639fa0338
 DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264
 DIST rsyslog-doc-8.2406.0.tar.gz 6568856 BLAKE2B c8e1dc2bf9eac465dfebd73539b4b81ec57a5a25723673f2b00477b2e60203f10614206d39a496981adcd348c44c6f455f83e56455902892719617ff136038ff SHA512 8c48bf109e105b2e92e076436e8771f55a1c6a595e525c7fce8720fc675aba4a8897eda076ff9b9369eacc8583e76ea05d056899dee1b6d97f918ff2fd55aced
+DIST rsyslog-doc-8.2408.0.tar.gz 6573562 BLAKE2B 85be04a48c6be5dce477f89227908df8695d7be844968c3d232202dc6907874058f0fa9ef07d16d9b66272b34849917f2b79b8f7ca35d5912156c90df5b0a73a SHA512 9982688880b8362ca2ecd5f076f12aaf31b966144bd9b291761e660307e4c31e8c3ccc17b6b2b0cb2ccf2e30ba81927126991f9539562c2f02966a59fd1624aa
diff --git a/app-admin/rsyslog/rsyslog-8.2408.0.ebuild b/app-admin/rsyslog/rsyslog-8.2408.0.ebuild
new file mode 100644
index 000000000000..514cb65782b2
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2408.0.ebuild
@@ -0,0 +1,509 @@
+# 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 linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/
+	https://github.com/rsyslog/rsyslog/"
+
+if [[ "${PV}" == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? (
+			https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz
+		)
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=dev-build/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads(+)]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=app-alternatives/lex-2.5.39-r1"
+	BDEPEND+=" >=app-alternatives/yacc-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack "${P}.tar.gz"
+	fi
+
+	if use doc; then
+		if [[ "${PV}" == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH="${EGIT_BRANCH}"
+
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+
+			unpack "${PN}-doc-${PV}.tar.gz"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Bug: https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disable known test failure mmkubernetes-cache-expir*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/omprog-close-unresponsive*.sh \
+		|| die "Failed to disable test omprog-close-unresponsive*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/uxsock_simple.sh \
+		|| die "Failed to disable test uxsock_simple.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis ; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local -a myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local -a DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo-r1
+	)
+
+	use doc && local -a HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r2.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index e2718884de8b..b61095541f1d 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,5 +1,6 @@
 DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32
 DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
 DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d
+DIST salt-3006.9.tar.gz 19691113 BLAKE2B f08dfef58273cef809e4aa954d348b282967affa85e4b2814bb539c41bfcecde29e5a903ed14786b353262e31212c3d581550ac031b5c4866453bec398d5ae88 SHA512 96385f505363645d958c3a05f3d50b240f6c750b28e4a11b419c08ec152fc9a66930e555beeba282ef463986f4b570f6dda1ad944aefd14d4cce586a9f1741e1
 DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b
 DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211ba9a71195d6308a86df16229fc77baa2ec837f043ebad36d9d7a6673fefa3a1a826472d900925e657e2152718 SHA512 732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b
diff --git a/app-admin/salt/files/salt-3006.9-pam-module.patch b/app-admin/salt/files/salt-3006.9-pam-module.patch
new file mode 100644
index 000000000000..c0af2ee5210f
--- /dev/null
+++ b/app-admin/salt/files/salt-3006.9-pam-module.patch
@@ -0,0 +1,13 @@
+diff --git a/salt/auth/pam.py b/salt/auth/pam.py
+index 6e179deb7c..935c523606 100644
+--- a/salt/auth/pam.py
++++ b/salt/auth/pam.py
+@@ -228,7 +228,7 @@ def authenticate(username, password):
+     env["SALT_PAM_PASSWORD"] = password
+     env["SALT_PAM_SERVICE"] = __opts__.get("auth.pam.service", "login")
+     env["SALT_PAM_ENCODING"] = __salt_system_encoding__
+-    pyexe = pathlib.Path(__opts__.get("auth.pam.python", "/usr/bin/python3")).resolve()
++    pyexe = pathlib.Path(__opts__.get("auth.pam.python", f"/usr/bin/{os.environ['EPYTHON']}")).resolve()
+     pyfile = pathlib.Path(__file__).resolve()
+     if not pyexe.exists():
+         log.error("Error 'auth.pam.python' config value does not exist: %s", pyexe)
diff --git a/app-admin/salt/salt-3006.9-r2.ebuild b/app-admin/salt/salt-3006.9-r2.ebuild
new file mode 100644
index 000000000000..f81dd7ade71d
--- /dev/null
+++ b/app-admin/salt/salt-3006.9-r2.ebuild
@@ -0,0 +1,414 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_1{0..2} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax
+"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.4[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	dev-python/looseversion[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.32.3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-3.0.3[${PYTHON_USEDEP}]
+	libcloud? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] )
+	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	amd64? (
+		nova? (
+			$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_1{0..1})
+		)
+		neutron? (
+			$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_1{0..1})
+		)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		app-arch/zip
+		dev-python/apache-libcloud[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/moto-5[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+		<=dev-python/pytest-8.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc28[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="
+	|| ( raet zeromq )
+	test? ( cheetah genshi )
+	!amd64? ( !nova !neutron )
+"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+	"${FILESDIR}/salt-3006.9-pam-module.patch"
+)
+
+python_prepare_all() {
+	local -a remove_test_files=(
+		# remove tests with external dependencies that may not be available, and
+		# tests that don't work in sandbox
+		tests/pytests/functional/modules/file/test_readlink.py
+		tests/pytests/functional/modules/file/test_symlink.py
+		tests/pytests/functional/modules/state/test_jinja_filters.py
+		tests/pytests/functional/modules/state/test_jinja_renderer.py
+		tests/pytests/functional/modules/state/test_mako_renderer.py
+		tests/pytests/functional/modules/state/test_pyobjects_renderer.py
+		tests/pytests/functional/pillar/test_gpg.py
+		tests/pytests/functional/runners/test_winrepo.py
+		tests/pytests/functional/states/file/test_keyvalue.py
+		tests/pytests/functional/states/file/test_patch.py
+		tests/pytests/functional/transport/server/test_req_channel.py
+		tests/pytests/functional/utils/test_async_event_publisher.py
+		tests/pytests/integration/master/test_clear_funcs.py
+		tests/pytests/integration/minion/test_reauth.py
+		tests/pytests/integration/modules/test_cmdmod.py
+		tests/pytests/integration/modules/test_jinja.py
+		tests/pytests/integration/returners/test_noop_return.py
+		tests/pytests/integration/runners/test_manage.py
+		tests/pytests/integration/ssh/test_pillar_compilation.py
+		tests/pytests/integration/ssh/test_slsutil.py
+		tests/pytests/integration/states/test_ini_manage.py
+		tests/pytests/integration/states/test_state_test.py
+		tests/pytests/integration/utils/test_templates.py
+		tests/pytests/pkg/integration/test_check_imports.py
+		tests/pytests/pkg/integration/test_clean_zmq_teardown.py
+		tests/pytests/pkg/integration/test_enabled_disabled.py
+		tests/pytests/pkg/integration/test_help.py
+		tests/pytests/pkg/integration/test_logrotate_config.py
+		tests/pytests/pkg/integration/test_pkg.py
+		tests/pytests/pkg/integration/test_python.py
+		tests/pytests/unit/fileserver/gitfs/test_gitfs.py
+		tests/pytests/unit/loader/test_lazy.py
+		tests/pytests/unit/modules/test_yaml.py
+		tests/pytests/unit/pillar/test_pillar.py
+		tests/pytests/unit/renderers/test_yamlex.py
+		tests/pytests/unit/roster/test_dir.py
+		tests/pytests/unit/states/file/test_keyvalue.py
+		tests/pytests/unit/utils/jinja/test_get_template.py
+		tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
+		tests/pytests/unit/utils/test_cache.py
+		tests/pytests/unit/utils/test_versions.py
+		tests/unit/modules/test_boto_{vpc,secgroup,elb}.py
+		tests/unit/modules/test_saltcheck.py
+		tests/unit/netapi/rest_tornado/test_saltnado.py
+		tests/unit/states/test_boto_vpc.py
+		tests/unit/states/test_module.py
+		tests/unit/utils/test_schema.py
+		tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py
+
+		# tests that require network access
+		tests/integration/cloud
+		tests/integration/modules/test_cmdmod.py
+		tests/integration/modules/test_cp.py
+		tests/integration/modules/test_disk.py
+		tests/integration/modules/test_file.py
+		tests/integration/modules/test_gentoolkitmod.py
+		tests/integration/modules/test_linux_acl.py
+		tests/integration/modules/test_localemod.py
+		tests/integration/modules/test_sysctl.py
+		tests/integration/modules/test_timezone.py
+		tests/integration/modules/test_tls.py
+		tests/integration/output/test_output.py
+		tests/integration/returners/test_appoptics_return.py
+		tests/integration/returners/test_librato_return.py
+		tests/integration/shell/test_enabled.py
+		tests/integration/states/test_archive.py
+		tests/integration/states/test_cmd.py
+		tests/integration/states/test_compiler.py
+		tests/integration/states/test_handle_iorder.py
+		tests/pytests/functional/cli/test_salt_cloud.py
+		tests/pytests/functional/cli/test_salt_run_.py
+		tests/pytests/functional/modules/test_http.py
+		tests/pytests/functional/modules/test_pip.py
+		tests/pytests/functional/states/test_pip_state.py
+		tests/pytests/integration/cli/test_salt_proxy.py
+		tests/pytests/integration/minion/test_job_return.py
+		tests/pytests/integration/modules/state/test_state.py
+		tests/pytests/integration/modules/state/test_state_state_events.py
+		tests/pytests/integration/pillar/cache/test_pillar_cache.py
+		tests/pytests/integration/pillar/test_fileclient.py
+		tests/pytests/integration/pillar/test_pillar_include.py
+		tests/pytests/integration/proxy/test_simple.py
+		tests/pytests/integration/runners/state/orchestrate/test_events.py
+		tests/pytests/integration/wheel/test_pillar_roots.py
+		tests/pytests/pkg/downgrade/test_salt_downgrade.py
+		tests/pytests/pkg/integration/test_pip.py
+		tests/pytests/pkg/integration/test_pip_upgrade.py
+		tests/pytests/pkg/integration/test_salt_api.py
+		tests/pytests/pkg/integration/test_salt_call.py
+		tests/pytests/pkg/integration/test_salt_exec.py
+		tests/pytests/pkg/integration/test_salt_grains.py
+		tests/pytests/pkg/integration/test_salt_key.py
+		tests/pytests/pkg/integration/test_salt_minion.py
+		tests/pytests/pkg/integration/test_salt_output.py
+		tests/pytests/pkg/integration/test_salt_pillar.py
+		tests/pytests/pkg/integration/test_salt_state_file.py
+		tests/pytests/pkg/integration/test_salt_ufw.py
+		tests/pytests/pkg/integration/test_salt_user.py
+		tests/pytests/pkg/integration/test_systemd_config.py
+		tests/pytests/pkg/integration/test_version.py
+		tests/pytests/pkg/upgrade/test_salt_upgrade.py
+		tests/pytests/scenarios/dns/multimaster/test_dns.py
+		tests/pytests/scenarios/dns/test_dns.py
+		tests/pytests/unit/client/ssh/test_ssh.py
+		tests/pytests/unit/loader/test_loading_modules.py
+		tests/pytests/unit/modules/test_tls.py
+		tests/pytests/unit/test_client.py
+		tests/pytests/unit/utils/test_aws.py
+		tests/pytests/unit/utils/test_gitfs.py
+		tests/pytests/unit/utils/test_http.py
+		tests/pytests/{integration,functional}/netapi tests/integration/netapi
+		tests/unit/modules/test_boto3_elasticsearch.py
+		tests/unit/modules/test_boto3_route53.py
+		tests/unit/modules/test_network.py
+		tests/unit/{states,modules}/test_zcbuildout.py
+
+		# tests require root access
+		tests/integration/pillar/test_git_pillar.py
+		tests/integration/states/test_supervisord.py
+		tests/pytests/functional/cli/test_salt.py
+		tests/pytests/functional/states/file/test_accumulated.py
+		tests/pytests/scenarios/performance/test_performance.py
+		tests/pytests/unit/cloud/test_map.py
+		tests/pytests/unit/modules/state/test_state.py
+		tests/pytests/unit/modules/state/test_top_file_merge.py
+		tests/pytests/unit/proxy/test_netmiko_px.py
+		tests/pytests/unit/proxy/test_ssh_sample.py
+		tests/pytests/unit/roster/test_sshknownhosts.py
+	)
+
+	rm -r "${remove_test_files[@]}" || die
+
+	# axe the boto dep (bug #888235)
+	find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+
+	# called_once should be assert_called_once_with
+	find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# doesn't like the distutils warning
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+
+		# hangs indefinitely
+		tests/pytests/unit/test_minion.py::test_master_type_disable
+
+		# needs root
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+
+		# don't like sandbox
+		tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
+		tests/pytests/functional/modules/test_defaults.py::test_defaults_get
+		tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
+		tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
+		tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
+		tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+		tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
+		tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+		tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
+		tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
+		tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
+		tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
+		tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
+		tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
+		tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
+		tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
+		tests/pytests/unit/grains/test_core.py::test_get_machine_id
+		tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
+		tests/pytests/unit/loader/test_loader.py::test_return_named_context_from_loaded_func
+		tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+		tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+		tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
+		tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
+		tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
+		tests/pytests/unit/utils/test_x509.py::"test_parse_general_names[inpt27-CommandExecutionError-Joiner U\\\\+200C not allowed at position 9 in '.*']"
+		tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
+
+		# tests that need network access
+		tests/integration/master/test_event_return.py::TestEventReturn::test_master_startup
+		tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
+		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
+		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
+		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
+		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
+		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
+		tests/pytests/unit/utils/test_http.py::test_query_proxy
+		tests/pytests/unit/utils/test_network.py::test_isportopen
+	)
+	[[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
+		tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
+		tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
+	)
+	[[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
+		tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host
+		tests/integration/minion/test_minion_cache.py::BasePillarTest::test_minion_cache_should_cache_files
+		tests/pytests/functional/channel/test_server.py::"test_pub_server_channel[transport(zeromq)]"
+		tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel
+		tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel_filtering
+		tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel_filtering_topic
+		tests/pytests/functional/transport/zeromq/test_request_client.py::test_request_channel_issue_64627
+		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
+		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
+		tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
+		tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
+	)
+
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			epytest
+	)
+}
diff --git a/app-admin/salt/salt-3007.1-r1.ebuild b/app-admin/salt/salt-3007.1-r1.ebuild
new file mode 100644
index 000000000000..8ff966a32715
--- /dev/null
+++ b/app-admin/salt/salt-3007.1-r1.ebuild
@@ -0,0 +1,612 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_1{0..2} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova portage profile redis selinux test raet
+	+zeromq vim-syntax
+"
+
+RDEPEND="
+	sys-apps/pciutils
+	dev-libs/openssl:0=[-bindist(-)]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	>=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	dev-python/looseversion[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	dev-python/python-gnupg[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? (
+		>=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	sys-apps/findutils
+	dev-python/build[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		app-arch/zip
+		dev-python/apache-libcloud[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/moto-5[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pygit2[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="
+	|| ( raet zeromq )
+	test? ( cheetah genshi )
+	nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+	neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+"
+RESTRICT="
+	!test? ( test )
+	x86? ( test )
+"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3006.9-pam-module.patch"
+)
+
+python_prepare_all() {
+	local -a remove_test_files=(
+		# remove tests with external dependencies that may not be available, and
+		# tests that don't work in sandbox
+		tests/integration/externalapi/test_venafiapi.py
+		tests/integration/modules/test_rabbitmq.py
+		tests/integration/modules/test_supervisord.py
+		tests/integration/states/test_match.py
+		tests/pytests/functional/fileserver/hgfs/test_hgfs.py
+		tests/pytests/functional/loader/test_loader.py
+		tests/pytests/functional/modules/file/test_readlink.py
+		tests/pytests/functional/modules/file/test_symlink.py
+		tests/pytests/functional/modules/state/test_jinja_filters.py
+		tests/pytests/functional/modules/state/test_jinja_renderer.py
+		tests/pytests/functional/modules/state/test_mako_renderer.py
+		tests/pytests/functional/modules/state/test_pyobjects_renderer.py
+		tests/pytests/functional/modules/test_aptpkg.py
+		tests/pytests/functional/modules/test_dockermod.py
+		tests/pytests/functional/modules/test_etcd_mod.py
+		tests/pytests/functional/modules/test_grains.py
+		tests/pytests/functional/modules/test_mac_service.py
+		tests/pytests/functional/modules/test_saltcheck.py
+		tests/pytests/functional/modules/test_saltutil.py
+		tests/pytests/functional/modules/test_test.py
+		tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py
+		tests/pytests/functional/pillar/test_git_pillar.py
+		tests/pytests/functional/pillar/test_gpg.py
+		tests/pytests/functional/returners/test_etcd_return.py
+		tests/pytests/functional/runners/test_winrepo.py
+		tests/pytests/functional/sdb/test_etcd_db.py
+		tests/pytests/functional/state/test_masterless_tops.py
+		tests/pytests/functional/states/file/test_keyvalue.py
+		tests/pytests/functional/states/file/test_patch.py
+		tests/pytests/functional/states/file/test_rename.py
+		tests/pytests/functional/states/rabbitmq
+		tests/pytests/functional/states/test_docker_container.py
+		tests/pytests/functional/states/test_docker_network.py
+		tests/pytests/functional/states/test_etcd_mod.py
+		tests/pytests/functional/states/test_module.py
+		tests/pytests/functional/states/test_mysql.py
+		tests/pytests/functional/states/test_svn.py
+		tests/pytests/functional/states/test_virtualenv_mod.py
+		tests/pytests/functional/test_version.py
+		tests/pytests/functional/utils/gitfs
+		tests/pytests/functional/utils/test_vault.py
+		tests/pytests/integration/cli/test_syndic_eauth.py
+		tests/pytests/integration/daemons/test_memory_leak.py
+		tests/pytests/integration/grains/test_grains.py
+		tests/pytests/integration/master/test_clear_funcs.py
+		tests/pytests/integration/minion/test_reauth.py
+		tests/pytests/integration/modules/grains/test_append.py
+		tests/pytests/integration/modules/grains/test_module.py
+		tests/pytests/integration/modules/saltutil/test_grains.py
+		tests/pytests/integration/modules/saltutil/test_modules.py
+		tests/pytests/integration/modules/saltutil/test_wheel.py
+		tests/pytests/integration/modules/state/test_state_pillar_errors.py
+		tests/pytests/integration/modules/state/test_state_test.py
+		tests/pytests/integration/modules/test_cmdmod.py
+		tests/pytests/integration/modules/test_event.py
+		tests/pytests/integration/modules/test_file.py
+		tests/pytests/integration/modules/test_jinja.py
+		tests/pytests/integration/modules/test_pillar.py
+		tests/pytests/integration/modules/test_vault.py
+		tests/pytests/integration/modules/test_virt.py
+		tests/pytests/integration/modules/test_x509_v2.py
+		tests/pytests/integration/proxy/test_deltaproxy.py
+		tests/pytests/integration/proxy/test_shell.py
+		tests/pytests/integration/reactor/test_reactor.py
+		tests/pytests/integration/returners/test_noop_return.py
+		tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py
+		tests/pytests/integration/runners/test_cache.py
+		tests/pytests/integration/runners/test_jobs.py
+		tests/pytests/integration/runners/test_manage.py
+		tests/pytests/integration/runners/test_saltutil.py
+		tests/pytests/integration/runners/test_vault.py
+		tests/pytests/integration/sdb/test_vault.py
+		tests/pytests/integration/ssh/state/test_pillar_override.py
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py
+		tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py
+		tests/pytests/integration/ssh/state/test_retcode_render_exception.py
+		tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py
+		tests/pytests/integration/ssh/state/test_retcode_run_fail.py
+		tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py
+		tests/pytests/integration/ssh/state/test_state.py
+		tests/pytests/integration/ssh/state/test_with_import_dir.py
+		tests/pytests/integration/ssh/test_cmdmod.py
+		tests/pytests/integration/ssh/test_config.py
+		tests/pytests/integration/ssh/test_cp.py
+		tests/pytests/integration/ssh/test_deploy.py
+		tests/pytests/integration/ssh/test_grains.py
+		tests/pytests/integration/ssh/test_jinja_mods.py
+		tests/pytests/integration/ssh/test_master.py
+		tests/pytests/integration/ssh/test_mine.py
+		tests/pytests/integration/ssh/test_pillar.py
+		tests/pytests/integration/ssh/test_pillar_compilation.py
+		tests/pytests/integration/ssh/test_pre_flight.py
+		tests/pytests/integration/ssh/test_publish.py
+		tests/pytests/integration/ssh/test_py_versions.py
+		tests/pytests/integration/ssh/test_raw.py
+		tests/pytests/integration/ssh/test_saltcheck.py
+		tests/pytests/integration/ssh/test_slsutil.py
+		tests/pytests/integration/states/test_beacon.py
+		tests/pytests/integration/states/test_file.py
+		tests/pytests/integration/states/test_include.py
+		tests/pytests/integration/states/test_ini_manage.py
+		tests/pytests/integration/states/test_state_test.py
+		tests/pytests/integration/states/test_x509_v2.py
+		tests/pytests/integration/utils/test_templates.py
+		tests/pytests/integration/wheel/test_key.py
+		tests/pytests/pkg/integration/test_check_imports.py
+		tests/pytests/pkg/integration/test_clean_zmq_teardown.py
+		tests/pytests/pkg/integration/test_enabled_disabled.py
+		tests/pytests/pkg/integration/test_help.py
+		tests/pytests/pkg/integration/test_logrotate_config.py
+		tests/pytests/pkg/integration/test_pip.py
+		tests/pytests/pkg/integration/test_pkg.py
+		tests/pytests/pkg/integration/test_python.py
+		tests/pytests/scenarios/compat/test_with_versions.py
+		tests/pytests/unit/loader/test_lazy.py
+		tests/pytests/unit/modules/test_mongodb.py
+		tests/pytests/unit/modules/test_mysql.py
+		tests/pytests/unit/modules/test_schedule.py
+		tests/pytests/unit/modules/test_yaml.py
+		tests/pytests/unit/pillar/test_consul_pillar.py
+		tests/pytests/unit/pillar/test_mysql.py
+		tests/pytests/unit/pillar/test_pillar.py
+		tests/pytests/unit/renderers/test_yamlex.py
+		tests/pytests/unit/roster/test_ansible.py
+		tests/pytests/unit/roster/test_dir.py
+		tests/pytests/unit/runners/test_reactor.py
+		tests/pytests/unit/states/file/test_keyvalue.py
+		tests/pytests/unit/utils/jinja/test_get_template.py
+		tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
+		tests/pytests/unit/utils/test_cache.py
+		tests/pytests/unit/utils/test_etcd_util.py
+		tests/pytests/unit/utils/test_package.py
+		tests/pytests/unit/utils/test_versions.py
+		tests/pytests/unit/utils/test_x509.py
+		tests/unit/ext/test_ipaddress.py
+		tests/unit/modules/test_boto_elb.py
+		tests/unit/modules/test_boto_secgroup.py
+		tests/unit/modules/test_boto_vpc.py
+		tests/unit/modules/test_elasticsearch.py
+		tests/unit/modules/test_k8s.py
+		tests/unit/modules/test_kubernetesmod.py
+		tests/unit/modules/test_vsphere.py
+		tests/unit/netapi/rest_tornado/test_saltnado.py
+		tests/unit/states/test_boto_vpc.py
+		tests/unit/states/test_module.py
+		tests/unit/test_module_names.py
+		tests/unit/test_zypp_plugins.py
+		tests/unit/utils/test_extend.py
+		tests/unit/utils/test_pbm.py
+		tests/unit/utils/test_schema.py
+		tests/unit/utils/test_vmware.py
+		tests/unit/utils/test_vsan.py
+
+		# tests that require network access
+		tests/integration/cloud
+		tests/integration/netapi
+		tests/pytests/functional/cli/test_salt_cloud.py
+		tests/pytests/functional/cli/test_salt_run_.py
+		tests/pytests/functional/modules/test_ansiblegate.py
+		tests/pytests/functional/modules/test_http.py
+		tests/pytests/functional/netapi
+		tests/pytests/functional/states/test_pip_state.py
+		tests/pytests/functional/utils/test_etcd_util.py
+		tests/pytests/functional/utils/test_http.py
+		tests/pytests/integration/cli/test_salt_proxy.py
+		tests/pytests/integration/daemons/test_masterapi.py
+		tests/pytests/integration/modules/state/test_state.py
+		tests/pytests/integration/modules/state/test_state_state_events.py
+		tests/pytests/integration/netapi
+		tests/pytests/integration/pillar/cache/test_pillar_cache.py
+		tests/pytests/integration/pillar/test_fileclient.py
+		tests/pytests/integration/pillar/test_pillar_include.py
+		tests/pytests/integration/proxy/test_simple.py
+		tests/pytests/integration/runners/state/orchestrate/test_events.py
+		tests/pytests/integration/wheel/test_pillar_roots.py
+		tests/pytests/pkg/downgrade/test_salt_downgrade.py
+		tests/pytests/pkg/integration/test_pip_upgrade.py
+		tests/pytests/pkg/integration/test_salt_api.py
+		tests/pytests/pkg/integration/test_salt_call.py
+		tests/pytests/pkg/integration/test_salt_exec.py
+		tests/pytests/pkg/integration/test_salt_grains.py
+		tests/pytests/pkg/integration/test_salt_key.py
+		tests/pytests/pkg/integration/test_salt_minion.py
+		tests/pytests/pkg/integration/test_salt_output.py
+		tests/pytests/pkg/integration/test_salt_pillar.py
+		tests/pytests/pkg/integration/test_salt_state_file.py
+		tests/pytests/pkg/integration/test_salt_ufw.py
+		tests/pytests/pkg/integration/test_salt_user.py
+		tests/pytests/pkg/integration/test_systemd_config.py
+		tests/pytests/pkg/integration/test_version.py
+		tests/pytests/pkg/upgrade/test_salt_upgrade.py
+		tests/pytests/scenarios/cluster/test_cluster.py
+		tests/pytests/scenarios/dns/multimaster/test_dns.py
+		tests/pytests/scenarios/dns/test_dns.py
+		tests/pytests/unit/client/ssh/test_ssh.py
+		tests/pytests/unit/cloud/clouds/vmware
+		tests/pytests/unit/loader/test_loading_modules.py
+		tests/pytests/unit/runners/test_net.py
+		tests/pytests/unit/states/file/test_mod_beacon.py
+		tests/pytests/unit/test_client.py
+		tests/pytests/unit/utils/test_aws.py
+		tests/pytests/unit/utils/test_http.py
+		tests/unit/modules/test_boto3_elasticsearch.py
+		tests/unit/modules/test_boto3_route53.py
+		tests/unit/modules/test_network.py
+		tests/unit/modules/test_zcbuildout.py
+		tests/unit/states/test_zcbuildout.py
+
+		# tests require root access
+		tests/integration/pillar/test_git_pillar.py
+		tests/integration/states/test_lxd_container.py
+		tests/integration/states/test_lxd_image.py
+		tests/integration/states/test_lxd_profile.py
+		tests/integration/states/test_supervisord.py
+		tests/pytests/functional/cache/test_mysql.py
+		tests/pytests/functional/cli/test_salt.py
+		tests/pytests/functional/modules/test_mysql.py
+		tests/pytests/functional/modules/test_vault.py
+		tests/pytests/functional/states/file/test_accumulated.py
+		tests/pytests/scenarios/performance/test_performance.py
+		tests/pytests/unit/cloud/test_map.py
+		tests/pytests/unit/engines/test_slack_bolt_engine.py
+		tests/pytests/unit/modules/state/test_state.py
+		tests/pytests/unit/modules/state/test_top_file_merge.py
+		tests/pytests/unit/proxy/test_netmiko_px.py
+		tests/pytests/unit/proxy/test_ssh_sample.py
+		tests/pytests/unit/roster/test_sshknownhosts.py
+
+		# tests that require boto
+		tests/pytests/unit/engines/test_sqs_events.py
+
+		# first test always fails
+		tests/pytests/unit/utils/parsers/test_log_parsers.py
+	)
+
+	rm -r "${remove_test_files[@]}" || die
+
+	# axe the boto dep (bug #888235)
+	find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+
+	# called_once should be assert_called_once_with
+	find "${S}/tests" -name '*.py' -print0 \
+		| xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local -x USE_SETUPTOOLS=1
+	distutils-r1_python_install_all
+
+	local svc
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# doesn't like the distutils warning
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+
+		# hangs indefinitely
+		tests/pytests/unit/test_minion.py::test_master_type_disable
+
+		# needs root
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert
+		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure
+
+		# don't like sandbox
+		tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https
+		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp
+		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https
+		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty
+		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest
+		tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward
+		tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
+		tests/pytests/functional/modules/test_defaults.py::test_defaults_get
+		tests/pytests/functional/modules/test_system.py::test_get_system_date_time
+		tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc
+		tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
+		tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
+		tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source
+		tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
+		tests/pytests/functional/states/file/test_comment.py::test_issue_62121
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
+		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
+		tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+		tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
+		tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+		tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
+		tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
+		tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
+		tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
+		tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings
+		tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state
+		tests/pytests/functional/states/test_pip_state.py::test_issue_54755
+		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors
+		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed
+		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv
+		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env
+		tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]"
+		tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
+		tests/pytests/functional/utils/test_pillar.py::test_gitpython_env
+		tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request
+		tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos
+		tests/pytests/functional/utils/test_pillar.py::test_pygit2_env
+		tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos
+		tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple
+		tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple
+		tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout
+		tests/pytests/integration/minion/test_return_retries.py::test_publish_retry
+		tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]"
+		tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]"
+		tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
+		tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
+		tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call
+		tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt
+		tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]"
+		tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]"
+		tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]"
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]"
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]"
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]"
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]"
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]"
+		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]"
+		tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime
+		tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster
+		tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
+		tests/pytests/unit/grains/test_core.py::test_get_machine_id
+		tests/pytests/unit/grains/test_package.py::test_grain_package_type
+		tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
+		tests/pytests/unit/modules/test_beacons.py::test_add
+		tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module
+		tests/pytests/unit/modules/test_beacons.py::test_delete
+		tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module
+		tests/pytests/unit/modules/test_beacons.py::test_disable
+		tests/pytests/unit/modules/test_beacons.py::test_enable
+		tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module
+		tests/pytests/unit/modules/test_beacons.py::test_save
+		tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar
+		tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase
+		tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+		tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+		tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
+		tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
+		tests/pytests/unit/states/test_pkg.py::test_mod_beacon
+		tests/pytests/unit/states/test_service.py::test_mod_beacon
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
+		tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
+		tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
+		tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir
+		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
+		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
+		tests/unit/utils/test_vt.py::VTTestCase::test_vt_size
+
+		# tests that need network access
+		tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
+		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
+		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
+		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
+		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
+		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
+		tests/pytests/unit/utils/test_http.py::test_query_proxy
+		tests/pytests/unit/utils/test_network.py::test_isportopen
+
+		# tests that need root access
+		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command
+		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2
+		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1
+	)
+	[[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
+		tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
+		tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
+	)
+	[[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
+		tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt
+		tests/integration/modules/test_mine.py::MineTest::test_mine_delete
+		tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt
+		tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound
+		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall
+		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv
+		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run
+		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv
+		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_json
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_nested
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_raw
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_txt
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml
+		tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper
+		tests/integration/output/test_output.py::OutputReturnTest::test_static_simple
+		tests/integration/runners/test_manage.py::ManageTest::test_down
+		tests/integration/runners/test_manage.py::ManageTest::test_up
+		tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized
+		tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false
+		tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
+		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
+		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
+		tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]"
+		tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
+		tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
+	)
+
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
+	(
+		test_exports=(
+			TMPDIR
+			SHELL="/bin/bash"
+			USE_SETUPTOOLS=1
+			NO_INTERNET=1
+			PYTHONDONTWRITEBYTECODE=1
+		)
+		export "${test_exports[@]}"
+
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		epytest --run-slow
+	)
+}
diff --git a/app-admin/salt/salt-3007.1.ebuild b/app-admin/salt/salt-3007.1.ebuild
deleted file mode 100644
index d8b9533aac5e..000000000000
--- a/app-admin/salt/salt-3007.1.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
-PYTHON_COMPAT=( python3_1{0..2} )
-
-DISTUTILS_USE_PEP517=setuptools
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	inherit pypi
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="
-	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
-	mongodb neutron	nova portage profile redis selinux test raet
-	+zeromq vim-syntax
-"
-
-RDEPEND="
-	sys-apps/pciutils
-	dev-libs/openssl:0=[-bindist(-)]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	dev-python/looseversion[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	libcloud? (
-		>=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
-		dev-python/aiosignal[${PYTHON_USEDEP}]
-		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
-		dev-python/async-timeout[${PYTHON_USEDEP}]
-	)
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? (
-		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
-	)
-	neutron? (
-		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
-	)
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	sys-apps/findutils
-	dev-python/build[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		app-arch/zip
-		dev-python/apache-libcloud[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/moto-5[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pygit2[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-factories-1.0.0_rc29[${PYTHON_USEDEP}]
-		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-		dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		net-dns/bind-tools
-		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
-		dev-util/yamllint[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
-	)
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="
-	|| ( raet zeromq )
-	test? ( cheetah genshi )
-	nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
-	neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
-"
-RESTRICT="
-	!test? ( test )
-	x86? ( test )
-"
-
-PATCHES=(
-	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
-)
-
-python_prepare_all() {
-	local -a remove_test_files=(
-		# remove tests with external dependencies that may not be available, and
-		# tests that don't work in sandbox
-		tests/integration/externalapi/test_venafiapi.py
-		tests/integration/modules/test_rabbitmq.py
-		tests/integration/modules/test_supervisord.py
-		tests/integration/states/test_match.py
-		tests/pytests/functional/fileserver/hgfs/test_hgfs.py
-		tests/pytests/functional/loader/test_loader.py
-		tests/pytests/functional/modules/file/test_readlink.py
-		tests/pytests/functional/modules/file/test_symlink.py
-		tests/pytests/functional/modules/state/test_jinja_filters.py
-		tests/pytests/functional/modules/state/test_jinja_renderer.py
-		tests/pytests/functional/modules/state/test_mako_renderer.py
-		tests/pytests/functional/modules/state/test_pyobjects_renderer.py
-		tests/pytests/functional/modules/test_aptpkg.py
-		tests/pytests/functional/modules/test_dockermod.py
-		tests/pytests/functional/modules/test_etcd_mod.py
-		tests/pytests/functional/modules/test_grains.py
-		tests/pytests/functional/modules/test_mac_service.py
-		tests/pytests/functional/modules/test_saltcheck.py
-		tests/pytests/functional/modules/test_saltutil.py
-		tests/pytests/functional/modules/test_test.py
-		tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py
-		tests/pytests/functional/pillar/test_git_pillar.py
-		tests/pytests/functional/pillar/test_gpg.py
-		tests/pytests/functional/returners/test_etcd_return.py
-		tests/pytests/functional/runners/test_winrepo.py
-		tests/pytests/functional/sdb/test_etcd_db.py
-		tests/pytests/functional/state/test_masterless_tops.py
-		tests/pytests/functional/states/file/test_keyvalue.py
-		tests/pytests/functional/states/file/test_patch.py
-		tests/pytests/functional/states/file/test_rename.py
-		tests/pytests/functional/states/rabbitmq
-		tests/pytests/functional/states/test_docker_container.py
-		tests/pytests/functional/states/test_docker_network.py
-		tests/pytests/functional/states/test_etcd_mod.py
-		tests/pytests/functional/states/test_module.py
-		tests/pytests/functional/states/test_mysql.py
-		tests/pytests/functional/states/test_svn.py
-		tests/pytests/functional/states/test_virtualenv_mod.py
-		tests/pytests/functional/test_version.py
-		tests/pytests/functional/utils/gitfs
-		tests/pytests/functional/utils/test_vault.py
-		tests/pytests/integration/cli/test_syndic_eauth.py
-		tests/pytests/integration/daemons/test_memory_leak.py
-		tests/pytests/integration/grains/test_grains.py
-		tests/pytests/integration/master/test_clear_funcs.py
-		tests/pytests/integration/minion/test_reauth.py
-		tests/pytests/integration/modules/grains/test_append.py
-		tests/pytests/integration/modules/grains/test_module.py
-		tests/pytests/integration/modules/saltutil/test_grains.py
-		tests/pytests/integration/modules/saltutil/test_modules.py
-		tests/pytests/integration/modules/saltutil/test_wheel.py
-		tests/pytests/integration/modules/state/test_state_pillar_errors.py
-		tests/pytests/integration/modules/state/test_state_test.py
-		tests/pytests/integration/modules/test_cmdmod.py
-		tests/pytests/integration/modules/test_event.py
-		tests/pytests/integration/modules/test_file.py
-		tests/pytests/integration/modules/test_jinja.py
-		tests/pytests/integration/modules/test_pillar.py
-		tests/pytests/integration/modules/test_vault.py
-		tests/pytests/integration/modules/test_virt.py
-		tests/pytests/integration/modules/test_x509_v2.py
-		tests/pytests/integration/proxy/test_deltaproxy.py
-		tests/pytests/integration/proxy/test_shell.py
-		tests/pytests/integration/reactor/test_reactor.py
-		tests/pytests/integration/returners/test_noop_return.py
-		tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py
-		tests/pytests/integration/runners/test_cache.py
-		tests/pytests/integration/runners/test_jobs.py
-		tests/pytests/integration/runners/test_manage.py
-		tests/pytests/integration/runners/test_saltutil.py
-		tests/pytests/integration/runners/test_vault.py
-		tests/pytests/integration/sdb/test_vault.py
-		tests/pytests/integration/ssh/state/test_pillar_override.py
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py
-		tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py
-		tests/pytests/integration/ssh/state/test_retcode_render_exception.py
-		tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py
-		tests/pytests/integration/ssh/state/test_retcode_run_fail.py
-		tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py
-		tests/pytests/integration/ssh/state/test_state.py
-		tests/pytests/integration/ssh/state/test_with_import_dir.py
-		tests/pytests/integration/ssh/test_cmdmod.py
-		tests/pytests/integration/ssh/test_config.py
-		tests/pytests/integration/ssh/test_cp.py
-		tests/pytests/integration/ssh/test_deploy.py
-		tests/pytests/integration/ssh/test_grains.py
-		tests/pytests/integration/ssh/test_jinja_mods.py
-		tests/pytests/integration/ssh/test_master.py
-		tests/pytests/integration/ssh/test_mine.py
-		tests/pytests/integration/ssh/test_pillar.py
-		tests/pytests/integration/ssh/test_pillar_compilation.py
-		tests/pytests/integration/ssh/test_pre_flight.py
-		tests/pytests/integration/ssh/test_publish.py
-		tests/pytests/integration/ssh/test_py_versions.py
-		tests/pytests/integration/ssh/test_raw.py
-		tests/pytests/integration/ssh/test_saltcheck.py
-		tests/pytests/integration/ssh/test_slsutil.py
-		tests/pytests/integration/states/test_beacon.py
-		tests/pytests/integration/states/test_file.py
-		tests/pytests/integration/states/test_include.py
-		tests/pytests/integration/states/test_ini_manage.py
-		tests/pytests/integration/states/test_state_test.py
-		tests/pytests/integration/states/test_x509_v2.py
-		tests/pytests/integration/utils/test_templates.py
-		tests/pytests/integration/wheel/test_key.py
-		tests/pytests/pkg/integration/test_check_imports.py
-		tests/pytests/pkg/integration/test_clean_zmq_teardown.py
-		tests/pytests/pkg/integration/test_enabled_disabled.py
-		tests/pytests/pkg/integration/test_help.py
-		tests/pytests/pkg/integration/test_logrotate_config.py
-		tests/pytests/pkg/integration/test_pip.py
-		tests/pytests/pkg/integration/test_pkg.py
-		tests/pytests/pkg/integration/test_python.py
-		tests/pytests/scenarios/compat/test_with_versions.py
-		tests/pytests/unit/loader/test_lazy.py
-		tests/pytests/unit/modules/test_mongodb.py
-		tests/pytests/unit/modules/test_mysql.py
-		tests/pytests/unit/modules/test_schedule.py
-		tests/pytests/unit/modules/test_yaml.py
-		tests/pytests/unit/pillar/test_consul_pillar.py
-		tests/pytests/unit/pillar/test_mysql.py
-		tests/pytests/unit/pillar/test_pillar.py
-		tests/pytests/unit/renderers/test_yamlex.py
-		tests/pytests/unit/roster/test_ansible.py
-		tests/pytests/unit/roster/test_dir.py
-		tests/pytests/unit/runners/test_reactor.py
-		tests/pytests/unit/states/file/test_keyvalue.py
-		tests/pytests/unit/utils/jinja/test_get_template.py
-		tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
-		tests/pytests/unit/utils/test_cache.py
-		tests/pytests/unit/utils/test_etcd_util.py
-		tests/pytests/unit/utils/test_package.py
-		tests/pytests/unit/utils/test_versions.py
-		tests/pytests/unit/utils/test_x509.py
-		tests/unit/ext/test_ipaddress.py
-		tests/unit/modules/test_boto_elb.py
-		tests/unit/modules/test_boto_secgroup.py
-		tests/unit/modules/test_boto_vpc.py
-		tests/unit/modules/test_elasticsearch.py
-		tests/unit/modules/test_k8s.py
-		tests/unit/modules/test_kubernetesmod.py
-		tests/unit/modules/test_vsphere.py
-		tests/unit/netapi/rest_tornado/test_saltnado.py
-		tests/unit/states/test_boto_vpc.py
-		tests/unit/states/test_module.py
-		tests/unit/test_module_names.py
-		tests/unit/test_zypp_plugins.py
-		tests/unit/utils/test_extend.py
-		tests/unit/utils/test_pbm.py
-		tests/unit/utils/test_schema.py
-		tests/unit/utils/test_vmware.py
-		tests/unit/utils/test_vsan.py
-
-		# tests that require network access
-		tests/integration/cloud
-		tests/integration/netapi
-		tests/pytests/functional/cli/test_salt_cloud.py
-		tests/pytests/functional/cli/test_salt_run_.py
-		tests/pytests/functional/modules/test_ansiblegate.py
-		tests/pytests/functional/modules/test_http.py
-		tests/pytests/functional/netapi
-		tests/pytests/functional/states/test_pip_state.py
-		tests/pytests/functional/utils/test_etcd_util.py
-		tests/pytests/functional/utils/test_http.py
-		tests/pytests/integration/cli/test_salt_proxy.py
-		tests/pytests/integration/daemons/test_masterapi.py
-		tests/pytests/integration/modules/state/test_state.py
-		tests/pytests/integration/modules/state/test_state_state_events.py
-		tests/pytests/integration/netapi
-		tests/pytests/integration/pillar/cache/test_pillar_cache.py
-		tests/pytests/integration/pillar/test_fileclient.py
-		tests/pytests/integration/pillar/test_pillar_include.py
-		tests/pytests/integration/proxy/test_simple.py
-		tests/pytests/integration/runners/state/orchestrate/test_events.py
-		tests/pytests/integration/wheel/test_pillar_roots.py
-		tests/pytests/pkg/downgrade/test_salt_downgrade.py
-		tests/pytests/pkg/integration/test_pip_upgrade.py
-		tests/pytests/pkg/integration/test_salt_api.py
-		tests/pytests/pkg/integration/test_salt_call.py
-		tests/pytests/pkg/integration/test_salt_exec.py
-		tests/pytests/pkg/integration/test_salt_grains.py
-		tests/pytests/pkg/integration/test_salt_key.py
-		tests/pytests/pkg/integration/test_salt_minion.py
-		tests/pytests/pkg/integration/test_salt_output.py
-		tests/pytests/pkg/integration/test_salt_pillar.py
-		tests/pytests/pkg/integration/test_salt_state_file.py
-		tests/pytests/pkg/integration/test_salt_ufw.py
-		tests/pytests/pkg/integration/test_salt_user.py
-		tests/pytests/pkg/integration/test_systemd_config.py
-		tests/pytests/pkg/integration/test_version.py
-		tests/pytests/pkg/upgrade/test_salt_upgrade.py
-		tests/pytests/scenarios/cluster/test_cluster.py
-		tests/pytests/scenarios/dns/multimaster/test_dns.py
-		tests/pytests/scenarios/dns/test_dns.py
-		tests/pytests/unit/client/ssh/test_ssh.py
-		tests/pytests/unit/cloud/clouds/vmware
-		tests/pytests/unit/loader/test_loading_modules.py
-		tests/pytests/unit/runners/test_net.py
-		tests/pytests/unit/states/file/test_mod_beacon.py
-		tests/pytests/unit/test_client.py
-		tests/pytests/unit/utils/test_aws.py
-		tests/pytests/unit/utils/test_http.py
-		tests/unit/modules/test_boto3_elasticsearch.py
-		tests/unit/modules/test_boto3_route53.py
-		tests/unit/modules/test_network.py
-		tests/unit/modules/test_zcbuildout.py
-		tests/unit/states/test_zcbuildout.py
-
-		# tests require root access
-		tests/integration/pillar/test_git_pillar.py
-		tests/integration/states/test_lxd_container.py
-		tests/integration/states/test_lxd_image.py
-		tests/integration/states/test_lxd_profile.py
-		tests/integration/states/test_supervisord.py
-		tests/pytests/functional/cache/test_mysql.py
-		tests/pytests/functional/cli/test_salt.py
-		tests/pytests/functional/modules/test_mysql.py
-		tests/pytests/functional/modules/test_vault.py
-		tests/pytests/functional/states/file/test_accumulated.py
-		tests/pytests/scenarios/performance/test_performance.py
-		tests/pytests/unit/cloud/test_map.py
-		tests/pytests/unit/engines/test_slack_bolt_engine.py
-		tests/pytests/unit/modules/state/test_state.py
-		tests/pytests/unit/modules/state/test_top_file_merge.py
-		tests/pytests/unit/proxy/test_netmiko_px.py
-		tests/pytests/unit/proxy/test_ssh_sample.py
-		tests/pytests/unit/roster/test_sshknownhosts.py
-
-		# tests that require boto
-		tests/pytests/unit/engines/test_sqs_events.py
-
-		# first test always fails
-		tests/pytests/unit/utils/parsers/test_log_parsers.py
-	)
-
-	rm -r "${remove_test_files[@]}" || die
-
-	# axe the boto dep (bug #888235)
-	find "${S}/tests" -name 'test_boto_*.py' -delete || die
-
-	# removes contextvars, see bug: https://bugs.gentoo.org/799431
-	sed -i '/^contextvars/d' requirements/base.txt || die
-
-	# called_once should be assert_called_once_with
-	find "${S}/tests" -name '*.py' -print0 \
-		| xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local -x USE_SETUPTOOLS=1
-	distutils-r1_python_install_all
-
-	local svc
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local -a EPYTEST_DESELECT=(
-		# doesn't like the distutils warning
-		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
-		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
-
-		# hangs indefinitely
-		tests/pytests/unit/test_minion.py::test_master_type_disable
-
-		# needs root
-		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
-		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
-		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert
-		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure
-
-		# don't like sandbox
-		tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https
-		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp
-		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https
-		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty
-		tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest
-		tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward
-		tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
-		tests/pytests/functional/modules/test_defaults.py::test_defaults_get
-		tests/pytests/functional/modules/test_system.py::test_get_system_date_time
-		tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc
-		tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
-		tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
-		tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source
-		tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
-		tests/pytests/functional/states/file/test_comment.py::test_issue_62121
-		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
-		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
-		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
-		tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
-		tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
-		tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
-		tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
-		tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
-		tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
-		tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
-		tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
-		tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
-		tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
-		tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
-		tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings
-		tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state
-		tests/pytests/functional/states/test_pip_state.py::test_issue_54755
-		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors
-		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed
-		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv
-		tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env
-		tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]"
-		tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
-		tests/pytests/functional/utils/test_pillar.py::test_gitpython_env
-		tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request
-		tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos
-		tests/pytests/functional/utils/test_pillar.py::test_pygit2_env
-		tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos
-		tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple
-		tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple
-		tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout
-		tests/pytests/integration/minion/test_return_retries.py::test_publish_retry
-		tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]"
-		tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]"
-		tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
-		tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
-		tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call
-		tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt
-		tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]"
-		tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]"
-		tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]"
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]"
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]"
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]"
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]"
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]"
-		tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]"
-		tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime
-		tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster
-		tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
-		tests/pytests/unit/grains/test_core.py::test_get_machine_id
-		tests/pytests/unit/grains/test_package.py::test_grain_package_type
-		tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
-		tests/pytests/unit/modules/test_beacons.py::test_add
-		tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module
-		tests/pytests/unit/modules/test_beacons.py::test_delete
-		tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module
-		tests/pytests/unit/modules/test_beacons.py::test_disable
-		tests/pytests/unit/modules/test_beacons.py::test_enable
-		tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module
-		tests/pytests/unit/modules/test_beacons.py::test_save
-		tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar
-		tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase
-		tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
-		tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
-		tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
-		tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
-		tests/pytests/unit/states/test_pkg.py::test_mod_beacon
-		tests/pytests/unit/states/test_service.py::test_mod_beacon
-		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-		tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
-		tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
-		tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
-		tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir
-		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
-		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
-		tests/unit/utils/test_vt.py::VTTestCase::test_vt_size
-
-		# tests that need network access
-		tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
-		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
-		tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
-		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
-		tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
-		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
-		tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
-		tests/pytests/unit/utils/test_http.py::test_query_proxy
-		tests/pytests/unit/utils/test_network.py::test_isportopen
-
-		# tests that need root access
-		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command
-		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2
-		tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1
-	)
-	[[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
-		tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
-		tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
-	)
-	[[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
-		tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt
-		tests/integration/modules/test_mine.py::MineTest::test_mine_delete
-		tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt
-		tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound
-		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall
-		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv
-		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run
-		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv
-		tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_json
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_nested
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_raw
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_txt
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml
-		tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper
-		tests/integration/output/test_output.py::OutputReturnTest::test_static_simple
-		tests/integration/runners/test_manage.py::ManageTest::test_down
-		tests/integration/runners/test_manage.py::ManageTest::test_up
-		tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized
-		tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false
-		tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip
-		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
-		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
-		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
-		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
-		tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
-		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
-		tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
-		tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]"
-		tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
-		tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
-	)
-
-	# testsuite likes lots of files
-	ulimit -n 4096 || die
-
-	# ${T} is too long a path for the tests to work
-	local TMPDIR
-	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
-	(
-		test_exports=(
-			TMPDIR
-			SHELL="/bin/bash"
-			USE_SETUPTOOLS=1
-			NO_INTERNET=1
-			PYTHONDONTWRITEBYTECODE=1
-		)
-		export "${test_exports[@]}"
-
-		cleanup() { rm -rf "${TMPDIR}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${TMPDIR}"
-
-		epytest --run-slow
-	)
-}
diff --git a/app-admin/socklog/socklog-2.1.0-r1.ebuild b/app-admin/socklog/socklog-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..06c852d19bc3
--- /dev/null
+++ b/app-admin/socklog/socklog-2.1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small secure replacement for syslogd with automatic log rotation"
+HOMEPAGE="http://smarden.org/socklog/"
+SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-headers.patch
+	"${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch
+)
+
+src_configure() {
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+	tc-export AR RANLIB
+}
+
+src_install() {
+	dobin tryto uncat socklog-check
+	dosbin socklog socklog-conf
+
+	cd .. || die
+	dodoc package/CHANGES
+	docinto html
+	dodoc doc/*.html
+
+	doman man/*
+}
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
deleted file mode 100644
index 367d62460e7e..000000000000
--- a/app-admin/socklog/socklog-2.1.0.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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Small secure replacement for syslogd with automatic log rotation"
-HOMEPAGE="http://smarden.org/socklog/"
-SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
-S="${WORKDIR}/admin/${P}/src"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-RDEPEND=">=sys-process/runit-1.4.0"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-headers.patch
-	"${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
-	tc-export AR RANLIB
-}
-
-src_install() {
-	dobin tryto uncat socklog-check
-	dosbin socklog socklog-conf
-
-	cd .. || die
-	dodoc package/CHANGES
-	docinto html
-	dodoc doc/*.html
-
-	doman man/*
-}
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index 4e36e59a93ad..fc36f5e5550f 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -1 +1,2 @@
 DIST tenshi-0.17.tar.gz 24597 BLAKE2B 846128e65b1a2d2a3bc5edecc9356069f44d9c13757771ec7fc5c31063d8aeb9403d447dbb088d2aa7d05d3b086ac6c569cd24a05c336225540b3baa10e79bb7 SHA512 2ca93ceaab0843c321fa69d8ba1c7b31eaf809cac4348c98327ddd9ab72df4d5ff00d6b4edeb19a9f02e154161988e0c2284248fd0e84d2b42dd82fdbaac1a78
+DIST tenshi-0.18.tar.gz 25299 BLAKE2B a8aa6b1c88c85a38dacf27755da82b4a5cb8305faaf9c39b3bc877e6e13474987d32043145e2e14ec8fbb5f6450c7b8c9abae6762c2dcb31c107960d353a5de9 SHA512 a9f08600efb5c36630d73b0ae5c596948a7cdaec43b967b7c7d4f04fba8f2a698b71faea240391f45f1fc86f168722103f3b0be198b3853e2487256cbad2aac0
diff --git a/app-admin/tenshi/tenshi-0.18.ebuild b/app-admin/tenshi/tenshi-0.18.ebuild
new file mode 100644
index 000000000000..d5975a92a7ff
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="https://inversepath.com/tenshi.html https://github.com/f-secure-foundry/tenshi"
+SRC_URI="https://github.com/f-secure-foundry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	acct-group/tenshi
+	acct-user/tenshi
+	dev-lang/perl
+	dev-perl/IO-BufferedSelect
+	sys-apps/coreutils
+"
+
+src_prepare() {
+	default
+
+	# Fix for bug #241254
+	sed 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' -i Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+	default
+
+	doman tenshi.8
+	keepdir /var/lib/tenshi
+	newinitd tenshi.openrc-init tenshi
+}
+
+pkg_postinst() {
+	ewarn "The sample config installed to ${ROOT}/etc/tenshi/tenshi.conf"
+	ewarn "monitors /var/log/messages which, by default, can not be read"
+	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
+	ewarn "permission on all the files that you want tenshi to monitor."
+}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index d6803b0b86ce..2c53dad972c4 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -2,3 +2,5 @@ DIST terraform-1.8.4-deps.tar.xz 107840308 BLAKE2B 414f8e4bb6c72aa8bb0d5ed040c49
 DIST terraform-1.8.4.tar.gz 6307332 BLAKE2B d26d62e4e99bf0e0b23277c7343e6da0281bb3b9bdfbe6b74277bc6a2ef9b8cb2e374b204ecdd933819a5576bde44115998ac030d7b801d8dd40a390d9df40dd SHA512 0babc6400a8e49ebcc734cf7ff4377ae91fb90f1e77b56e8fdc288203e1708b8f7c5c16e4aa64a720ab4b4c191959d0cfdfda1aa3514c36e806c8d5b7f65b663
 DIST terraform-1.9.1-deps.tar.xz 108273656 BLAKE2B 6bad479e0217eeafcb5f7c75926d1dcdc50873f34d194d4829a1277a06ab81a4ff4f5945ab8ba628f40475fc93e9375a165e08f99b4bc685f3d150cfbddc0a71 SHA512 0016d5bd19a34032daf58cbb8d42ba3a2209cb295f6e20c484f45b70daf3283dd2de213446ec7cc088df24ce1d825b4ab8c064b2162739356f815cab7b61cbb2
 DIST terraform-1.9.1.tar.gz 6563160 BLAKE2B 3f9d8992ca15ddd0fe225fbdb6dc194dcc42dd1700edf739f80b4fe1aef5dcdbbb560a525f0f5564562d0e299cbabbf542c54d49160fb1c8ff674421200f39de SHA512 bbc4d03807f714902300e0a461653c137cebdcaadca879da8834fc232955d2f700711541641f05337946c755e9963010034998bff76a84aa1ac65fa6ae6871ec
+DIST terraform-1.9.5-deps.tar.xz 108369816 BLAKE2B 8476a09ad400818ec95bf1457003aeab1f76cd85b9ffa07e27be58eb63469a2bd1f7c0ddaa3903ec8e1641541d091367b333772bf37026611743aea82c1cfcf2 SHA512 b2c477180aeab5c3c51acb6960a3fea1f793a22fa9529b474d9b1ebc82bc62aed5ff2ab4567838666bb1ee4cbfe4ff0dd528d8f55853dadcc2a96a2a889fc996
+DIST terraform-1.9.5.tar.gz 6568796 BLAKE2B 7dde80aef2c189942c6e23e2162a7e1f97d56ee78e7106c247600fe9437bcd63cce28003d2ac7dcb474fc91b9953d4bf953ed0e4bad68cc60ed8e1cd2d641e48 SHA512 422b7f288306d76cc82875e8514df37aa36c6cd97860f3f9a5e3770ec56f395cf1ffcc65e3211044c01d0f75b4331960720f8672efff7821a9d7f63f65999a6a
diff --git a/app-admin/terraform/terraform-1.9.5.ebuild b/app-admin/terraform/terraform-1.9.5.ebuild
new file mode 100644
index 000000000000..6366b8f6f5db
--- /dev/null
+++ b/app-admin/terraform/terraform-1.9.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="BUSL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+BDEPEND="dev-go/gox
+	>=dev-lang/go-1.21.5"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/terraform \
+		-verbose \
+		. || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/ttyplot/Manifest b/app-admin/ttyplot/Manifest
index 57ac35fac801..16cd7035f85a 100644
--- a/app-admin/ttyplot/Manifest
+++ b/app-admin/ttyplot/Manifest
@@ -1,3 +1,4 @@
 DIST ttyplot-1.6.2.gh.tar.gz 56277 BLAKE2B c7a818a69774fc7c5f6b498e5bf2f9c3ec644dc23d54daf59adaf13962f614c23918ca1d84614e27c60e75d1b98b3eb3c548dc14b59b539acceb3327dafabe0c SHA512 7ede447667a0a8f4b164a2a409e1264c36c95c22eeeda348c894678cb8d7209e742bb90f48a8a5260dd457ae7ff0a090a7d8b7eb25b20e20ada575e00cc4eb0b
 DIST ttyplot-1.6.4.gh.tar.gz 56541 BLAKE2B b05fffd2a7903ec94d516c7e970db4dd2dd90ac2568c6c3e3b6608e40ab65a18ac6a9a9693e189328bfebdd120fb50efd8bedcb260329d5ad28d0c7a81c390dd SHA512 51d8cc7dfa281f66e92b0f508f9db413869bb559aa6d1f4a54eb658f3564e2552b622e8667587bbe9e7c85063b03704a03e8eb004b979c68bf874453b5c3cbb5
 DIST ttyplot-1.6.5.gh.tar.gz 56538 BLAKE2B 1119012b170cde84b904f34c3bcf7d7c3e1adbf1ae5a465dffb74be11ad073251c40c508d4ced7f36db6a3e96336e04c61e0f402bb5f0d7ee6c5ca8e9451d900 SHA512 93512777f0371857cadb43a836538cb9e946b7110157534c9c76c090852ea5c9ee6085742f9c6d501f8c7a62f05967309e24e1a3bad96eac4b726f946053b0ab
+DIST ttyplot-1.7.0.gh.tar.gz 56787 BLAKE2B 6a805855203fabc0528aebcf1c833f38386f1d54f2ec0f4189531ef387666a13d5a7413dde279d315795d80c6b3aa11ec7b748eb0370b121beb9499a18b19a2a SHA512 9f2a089cfa19898ca051b6b72c433c5b5d4b9d3ff19cf432c4ce4f91e34ef3bb2c6b380e01f36d9a1c4aedd1a0ea77651e67afdea1711c8c59431852b7024355
diff --git a/app-admin/ttyplot/ttyplot-1.7.0.ebuild b/app-admin/ttyplot/ttyplot-1.7.0.ebuild
new file mode 100644
index 000000000000..a0e31d253379
--- /dev/null
+++ b/app-admin/ttyplot/ttyplot-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Realtime plotting utility with data input from stdin"
+HOMEPAGE="https://github.com/tenox7/ttyplot"
+SRC_URI="https://github.com/tenox7/ttyplot/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses[tinfo]"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	local args=(
+		PREFIX=/usr
+		MANPREFIX=/usr/share/man
+		DESTDIR="${D}"
+	)
+	emake "${args[@]}" install
+}
diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild
index c62843c07c16..0c27f5c1566a 100644
--- a/app-alternatives/sh/sh-0.ebuild
+++ b/app-alternatives/sh/sh-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/sh (POSIX shell) symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-sh
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 6c086625a0d5..0ad425ffd34c 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,59 +1,84 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aho-corasick-1.0.5.crate 172064 BLAKE2B bab7767070b959e8e4c054bf505b9423d7fc8b02dc682b559f54db986abe72ddf83a069b4bb585d71b47de92d2fce66a1c151a0d29c4aae99378ca05c3d5eb50 SHA512 6b0a64dbfe0c166341a34cd169bc46d28e40f72db4d599a1aff5327a6e891408f39e8e92e983cf9396a8e8135f93e41550237ff3e5c8c05a5325688746fd814b
 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 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 autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST base64-0.21.3.crate 76898 BLAKE2B 09dc56f20321ea9e4af6a9bbbb83aec13b78e52d9f0007630b0ea21bd4ba24d7dd604a50001488656f2e18fedf6ba76328c673ae986fc8e8516d546cd167cf8e SHA512 75745fe54f321d21fb94d6481aa35f8fac29c8fa514a36043d10eb1a08f5566ee0ad0cdc7358a20b8086babd2afe043efad6720df1289495b5df4a788dbe920c
 DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16
+DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
 DIST bindgen-0.65.1.crate 213479 BLAKE2B 91f143d6d3ca37990ff01a9f11ba43fc7808210f47143419abd2de1d4b38a4855a806476b5607aa140de77b83db1649e318f6f904338c621cb300a53a00b1b01 SHA512 f3fab122b02abe8eca4438edb220eae0066a43f6ff4459aedca6c6261e769bdbdd6c820e5b29ddbc5b5cdf8ec0bdac1a4bc374fae2772117958e7c40bc22e8f2
 DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5fd1610e7e28731bd5cc44c9513f2c7eb52fa1be0b4eed65bffe130ddc98c95dfeba2f9de28ada4091396e5695d SHA512 4848d7ec592642913c7bd06cd3a0da49d3bb14291866cd22ead8e9a6b2939a787035d5cded87be3d2d3491283e31ea2cfb105885df4114720da98beb82990ee6
 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.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
 DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
+DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 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 bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
 DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytemuck-1.13.0.crate 41703 BLAKE2B f24b786d2209921f2de16209d3b397fa1d62f637efd8f0a92c6d7d3734fa447ae3f1c5499e85a16e30e39bd132c00c59517ae0886d1fab8da4aaf2150a3fc0d2 SHA512 e2e8164c9b14d8ec44879f3efb91f3ac3918e092d22d73152166b926c8b85e854c7b925b53feb173b572e9260100d9c584dbb80a377944b2415d485dd1d20876
 DIST bytemuck-1.14.0.crate 44933 BLAKE2B afd34f2becc41484e7bf71fb4a9f0925870a4f2d9d59daff9e91bada000462baeced4314e469a508d4413a8f2442d83a5f3082193653403fbee1340ab5c3f6c5 SHA512 f072a97e5de93228435bb362363ac1af0738b7927832b02a837f44eb21b0b089589b61e73004a06c5e4d4601e66bb42e67b9f707bbf13429a40b6250a0f05ae5
+DIST bytemuck-1.15.0.crate 47672 BLAKE2B 49f2d92cfd5abfbe3fd94e7e4c9a3d4ac22c67b58e73947f461cf8e5022738b7d38c790de2a1717b731d658f1646066bee2f936a1575e2995e6de39d20f918b2 SHA512 5b6886f252945449c4546c181bbb6c95597e498aba6b1faf81c5a4af69bcb9e3e024d7d6e849d347682e8ca72ecaa9a70d13fb06c174e17846f0c85bb4810433
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
+DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8
+DIST bzip2-rs-0.1.2.crate 253906 BLAKE2B 75a60bd49deaa8df0a91e291c619a392f55aa56ed8fe8e6f0a1dbd79c14266baf058e4e904cfb64762511f4a9c16c60af3c919a1943a2783907e8eac86f7f0d9 SHA512 00683e16f06a3c5589fbb6cb215ecccba4a8619916de80024a917f98f10bab4c663036fa3f922783ca19bb04a1653ec2ab593c1f36f587e931bd80cb11a79765
 DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02
 DIST cbindgen-0.25.0.crate 200141 BLAKE2B 9af26f1696e483db0869b36eb4a4bfca5e59bdcaf21166973933b9d8c6cfbfe5a61a3d883c24d2bca823a9d7c1e6f68d9638e414d36292247385304ddf72ad12 SHA512 2a4bfcb41384a82dc1fea6f124187ee9f79a6795fcd68c74706d500d0c266cab962d1807627ceff58ded123939ff868ca329f9aa85fd5969556294a3e4ed5eed
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cc-1.0.97.crate 76951 BLAKE2B ec2e65797dfe13223b64f28bf6d143e00362f8bdd14e4df3d16ec2c5b68b8c603968f8cf6e7ede95b527ef16a748775bf247e8bf11010a326bbac4b296d72eb5 SHA512 119d1769530ec2fcc643b9b4a0f2a45db6f0772e4df882b832f961824bbb41d101d4a507573b4e05b4627d647fa823e81bc66dafdde40146878616af96b24143
 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.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST clamav-0.103.11.tar.gz 16550978 BLAKE2B 9fba6d5b41ef07b017be26b7ebd832ca03146a68545f794924332c67429ba27603745e2ad7fc0f58c341c6d9267e5b5265c37525dba9cbb15ab616915ec2d605 SHA512 86241ee8058d9a3ccc13b89bb41aa16cfbeb65717fbcfeea6117b7885e8854f5673c22475e7d33ee4210a15d583e806f252657c07933f072455027f1531427b8
+DIST clamav-0.103.12.tar.gz 16507685 BLAKE2B bc31787625f85867bf21c4555aa2fd2998514986fb571fa4e6cb9fa3fedf61b493c517291b662054edc0bbe8d45649d9c244d943df01950e204baa9e537e3e32 SHA512 0e870a5fd035fbf090359ef7634b1b36e346ff3066b896ff17c2c6ace04f4c17e16181a21fead8b8b2f397de9ea47b928515b717a41996bac4c8efed4d16ec4e
 DIST clamav-1.0.5.tar.gz 10344955 BLAKE2B 1deceff859c9eec6185f6c83833333d1a030edd1c9dcc6788f669259b4922f332b564a7c6f3fa7f03ebe2051524132becb35cbd67526aac43e95ca3978793517 SHA512 7d46cf5555107d2856430a5f09f5dfd011b597d3dc7e691db3c956867b1314b50fd23008bf45b377d31493a12716c527159d163748d6ae759e97a041780da0d9
 DIST clamav-1.0.6.tar.gz 10345779 BLAKE2B fbbef034a7bf6e2b323007a3de2464b60cc0a564551ddd4169a72af0328cfc2485c14395626e8d0258dfbb3bb41bc895d26622ff2dfb5fcd1181e6595da6489b SHA512 907cf51f8e6776a81ec5501026c240266b0eb8f7631fcbbcd0f8514446925dc731d819ae758217f9ed9414ca385b64e67f6de0e5133c04ba7590bd1e4445e09e
 DIST clamav-1.2.2.tar.gz 10372690 BLAKE2B 47940236e38296ac908be4c5d1c5ce8bbc9ec5c69fa87b2472c941d2de9642e0ab6a59c63038aa706079e8efeb161083db69ad03eaaf27a6d05f4f1a5bb70aff SHA512 32562230f367a230f70dfca5ed5000ee8829a0da7452b0113e9dbaa47ef6b21901001f741b0e52ce52c02fe8f834bd559bcbdf1ea20495bead9c4976c3a4cc92
 DIST clamav-1.2.3.tar.gz 10376162 BLAKE2B f881ca93143fc418a475bfd8bcfe26bc964fedc9f50267e60e36b92932232aa219ee61091f23b53882776d1de7faf111faf8b123058d7b0f8feee01d1884133c SHA512 1298107f7d567bfdb151c452acb33edfa99e13f26a711f2c8cb6149fa144a0b164c92f10c7fb592ac4ae3787600b4996e295c2dd31dfac11a8c2ef8c00c61161
 DIST clamav-1.3.1.tar.gz 12938351 BLAKE2B d8fe1be274bcc8091ed4193967120201457d9a4eaaa27e8b5cdde279f25405882bd0cd5de80e7da041db28d3688f4270febda5ca70d69c7d36d1e099d03ddb3e SHA512 0693006c0f283862bf7f4eaeb39b409b92ac017a3d604df1340045c26dc47070d6f23dfb180dcb7753156d02c5e99cec23c53f6c56b007ed737be7060a4131f2
+DIST clamav-1.4.0.tar.gz 13429652 BLAKE2B 42ed9fa8d1597f6f3d2a2f2115f75e6f117dde3cd7eb4f5b224976161b5640df8090a8f13b8cf70cde2d1b5179bbbafa7949d8e35ccf79ad0ef981d4d9590be6 SHA512 1778371fd6e3d8d6478d14af9d57cac1af6315bae7670d27250f87fe7ce1c1fc2343011805d1da0347b1bcc62cfd5d49694879b85e6fb8642881e02b7afa518a
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d SHA512 062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
 DIST clang-sys-1.6.1.crate 41346 BLAKE2B b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b SHA512 a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c
+DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
+DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
 DIST cpufeatures-0.2.11.crate 12727 BLAKE2B 5b91dffb779e437606db9b75d2b05c2de19069575a8272112e9a0389f5bd8de0f753cd90330b5a5bb6a3f84c9e794e96328664557db31c43853ba43097229efc SHA512 af179e269a4d5f48b50134a5e98ac541a9a0d6aa34f13fb8fd9ce8d5092352e1b322437254449ecb1bce608d8558b1cca2c79232ac1327efd887193bd1d36031
+DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
 DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
 DIST crossbeam-deque-0.8.4.crate 21752 BLAKE2B 1813e2c0916ac990c5ce54aadd13f309dc4d2cb651995261cf591900a5c820712de7dd730116e8b4cf78bcef19626889fc0658d7f1020cb2c1d7fab41718a31a SHA512 cc036613727a3aa8933bec419ba8a5fd2f506770ad2cf874ff757b048e0d29ea3f1b0e2b72d2d5352ed4b62c6764c7bbb10d0d4e217176da26bf5ae4bca0b68b
+DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 DIST crossbeam-epoch-0.9.13.crate 48313 BLAKE2B 6e548cd39fb400732dc179c5b7185555bdb8a367b5d3a27dcabe9ad36db6e9858604dee210fe487de8f9127fd6d0db1ef1fd04a1cc8cdcf34bedcf980c048555 SHA512 a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf
 DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
 DIST crossbeam-epoch-0.9.16.crate 47037 BLAKE2B ca8d326fad43bfb172158686e394ac986388cf1cfac6a80bb062e350f30e3733760d6de5ec6e1a73886c35881402be61e2e7724f25aaaacc64d1fe2d78e0921c SHA512 716276d9ecb4d8f630eb28cd5fd299a25ccec80e1f84255fe548935b48b5bd7e003c8e160edc0e6c5ef0b1e508f09ba6021b122b54973cc417146305dbc59524
+DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
 DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393
 DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
 DIST crossbeam-utils-0.8.17.crate 42324 BLAKE2B 971cdfc2a0e259e40c1e990d33688801ffa67e12392a56507f7e76f10b1b200dcca514fcdd4199910074615cbeb8c0cc0a250dffc1126a25ae8b8df8c818c079 SHA512 d3f9cbee56991c9435de1947743dd7f0c5456e4c56991b73fc9fa984f03416abb42da78c3cd907bcb3af0fa2122612e0fcf76bb2dc8f2b56c2745ab9842c648b
+DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
+DIST delharc-0.6.1.crate 45625 BLAKE2B 10fe8ff98de56a2da88669a3a31d41d1e5745f013f99b69daa69d181a3f0f97c92486f21efe3845bc39c2089018f5c342b8ab9ff06aefa5ecceb33b1b4a78947 SHA512 33652b33c26880a4a5613fc9adad92364f15ed8d13d19f60b0eb92bd8163d36ae9329894b90f43ad5e76daa685882ec52ca01dd23b95e8bf4fb7d04955836939
 DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
 DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
 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 enum-primitive-derive-0.2.2.crate 4618 BLAKE2B aed3121e39f9aec3ce5bdfd0b096829d8c121c7662cd8875afe99405f8b884e4a298e99db3396881979e751b5342596f2729bbca2b15c126950824f94c82f532 SHA512 a9867cd412fa64825ff58de416b67742fedf9f7cdb8b1fafabeaba770d7fd47d87b77ef8305e1db13fba480ff345038c622341fa5062f6dc1cee953617d0f871
 DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
@@ -61,14 +86,17 @@ DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac
 DIST exr-1.5.3.crate 241996 BLAKE2B eedc489004e751e4f4aff1be42f2875c132526a5734f1050ebb91638c85b6970bc07af5f1cbe6cfe1e69d0d8b8b96a0cbbcfd8f4ab01486c60686e79bc5ffdb4 SHA512 f43766506fe13067217eeb52375d4779a726de5168d3cdd082b793b8e44d1e5ded333ad5e03f44d2a9daab494e2ccea62a102e56107eeb24997ac87ca7789225
 DIST exr-1.7.0.crate 245602 BLAKE2B ad71e47ce3fc177950a8285d38a1d1daf0e077ef93650d5193e5d239085c28fb1041a3c51ae7c91644b792aae56bc07be8eae5816de9e686995217fbea1389f5 SHA512 3975ffc7bf4005364d1bd35042fee8b86af6cef1eba35f9431b11fadf2104289b63a3e4d04b6f61686a7cdcd0092b0e957c6a737b30e99158756ed816c61f3e2
 DIST exr-1.71.0.crate 244198 BLAKE2B de680483a7b12fb227e50854007b10e58cd158b8db4eb6ae75d9740424aeca0a37cec9530120af2bd14fab44088474140c9df4db972dad91173bd005bf8fdbea SHA512 cca6c22dca69fcae9dd71e5712cf0a93ff746689240e7a59bf9fa4231ddf540234508aed5d90d27d216f7121a9b1a49d8d1009cb9cc109f9d867541b93a98e47
+DIST exr-1.72.0.crate 243996 BLAKE2B 53797775fef4e8cd520f4a98d390453b36f9500dbe999a631a54d906476f82a7a975bde0a369116a997db5e383c846de9a7bf4330c68ea7ec2c9e44e4856aaf0 SHA512 eeab15189ca6801d3b3748c88395de9d2a3fd970f182f70bd39ff7dbc960bd27d06191a42d1a5cb895a334787f18dd3ff31af74d223419e1845396a5f696dd1c
 DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
 DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
+DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST fdeflate-0.3.0.crate 21790 BLAKE2B 3c96f6395fc42f66e436fbf6b747c2f3c2dfd8c38729bd0eb88be872ad55e5d964ba322b703fae122907d51892619687ac9b7a5e7546f8fe6eb7d80a91c1f398 SHA512 1a1862460745780407892c835b4e3431267044285fdd718dc6b316dbce9520d2955bf36e5e28257f2f758ba7bc3051b446e786d11ace83deec492e4c161664bc
 DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
 DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
 DIST flate2-1.0.27.crate 73460 BLAKE2B 5603848098ac02c9c83893df79ea9d9ad3df5b7e02ffa155ac74602bda7e28e14e6b7de2ff321b38d24fa3741ccea8a4c811abb47690cc295f90d4cf2bdd0bbf SHA512 e76e76444686433acabd16513e6e5860d4d6fa53a810f37266f36900f154acacac6dcd77b0373599a6d33a09175f5f02146d84726b982c59a78926950e19ff09
 DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
+DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
 DIST flume-0.10.14.crate 65389 BLAKE2B c88deea78a5713728a6b6a94a4aaef570f6eee1af85fc489534d7b336a9ec9cfdd76890929a456a689ac196bef24cee68efadb30e06ad585063c5bb77fb2699f SHA512 ad31351031683453b77d85a89812304d63a12cce8bbd31dfaa508091cec52bc511739d4d13a085aa8bf9f2438fc1876a99f2e4ab2602bdbfe0d2ebb1df4eab0f
 DIST flume-0.11.0.crate 67502 BLAKE2B aadebeda44f899b6290df4ccddfc0fc49c4e55709243e9b1eb26b6a232aee042d2260c9b504d554551be54ad4e4ae1b1dc6ee861fee0cbb6eb92fbebb5a7d9ad SHA512 29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd
 DIST futures-core-0.3.26.crate 14708 BLAKE2B d9bbd208b274efd44add6b49a3dd5344d9462e4340e646586d59adc5c33949f9d7582fb8fbb609a79546bc66258718b26615e94555f3534ed787c2f0151b6362 SHA512 0362f98019f745d2eb3bc19e504813b262342a511c403d4bfc89ff750d7488d48da476a49183c2ddc9862850c5bedcd29ff82ffdd2033d971ece68984cededcb
@@ -81,8 +109,10 @@ DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f4
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST gif-0.11.4.crate 634244 BLAKE2B 537a21ed947889acde0c9b8a42a7d0308f2d9017e59145924e735aa046cc494b60b97cdf3b24d62d24159a47bd4b6bd2aa009f2871c0b4f6fecec020f8041398 SHA512 3de0534b35bd783b54715e7f8a92f2d8a22934949627716cc3ade3c8036489d2b9604292eeeeced820b149865bc44a5de9d05700ebace073b48737759b5296b9
 DIST gif-0.12.0.crate 634734 BLAKE2B 067baacc4a10ad1d992aadecb578034bc820ff2470eb2fe1b63212584ae1f73fb6febe3652a309a3931fc6fc6823533af2c3d567414925118c5086970a09bdf3 SHA512 9cee5c4f68b02252f6214fccabda29087c89cadd8408df4fb6b9479da7958a9759dfc4b13ad2bc7e1447be9050cea6d3757d891b774a7e6fe8c6fd25bca3b74a
+DIST gif-0.13.1.crate 36408 BLAKE2B f2544552c177a4e33440b05a949f6b205d3dda1afcb7e6574c92ed9d31cdb3bf536e1914186730bd8777e1c10d86466dffbee34d975884f0125a1dfcce937bda SHA512 7e76ee111c6a94763c4dfe01faf4cb0b5272d5041e2b2b8f4db666debf647e192b963c6fb3228cdde28e1d112830c2aa31eaf0551d712ea9963e41e47e26fb26
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST half-2.2.1.crate 47021 BLAKE2B b7e4890c3db85f5adbc79241aab8a5501a66cc4c1856d883cab771192b42173623abe670b85e092111f31e118d7316cb29733efe5b9cb09e2594909059c5ad2f SHA512 6a2aa43a2a2f5c981305cbac46fe9dbfd3644912f6a8ae17e0ccd09aad5bbcceaf095b91d51d12c55963c88c208510f9bd94b472446d23752e3c0d3b41531a48
+DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
@@ -92,37 +122,51 @@ DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba551
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6
 DIST home-0.5.5.crate 8557 BLAKE2B b14225f6e967ccd37fa734f50991a50065047f3814c4e526f3b4605ceb9206d4d12e189b4033ab85792ffea34a30f2b0267b10b9b0ed88df52c37f6ae1ecea4d SHA512 4ba97149d8f70e9b6eefc930292c7e62fab6ad03d5e4e6bf93d40209d3a65e40932c6f3d14ca579ed19ba33195977c60fc52b3d3788629fc760f41ce90fa1e58
+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-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
 DIST image-0.24.5.crate 270381 BLAKE2B 239022ae8f5cb6ae187fa886f531b3eda2134f3ca31501902a13aec104efa86dfc717aeaaad329a22ccfdd2d8ff3eb222d2acd83f01854333199611aa95c77a0 SHA512 710647226e060cc75550e6bf852a5d78f94628b44bfc5a9d20fcf60dbe10efb1b28d192e91d5a9ac8aa57e975ecc88b0f9b19d08e732694f1037d8c235b48fc9
 DIST image-0.24.7.crate 290618 BLAKE2B b8c914f80415208ba0685c96d2bd8346a6f935f654f51e6f9fee3f3babf866b8327897ac571aad2700387196dc20f5b966007ee71e0b4dbb1c99a30dd9657996 SHA512 8c08bb61645a369b5f5713cc296b7de3f245d9b7079801d3cec3d95bd3556d636937898f1bbd1ec18bcba57d4c49f52cf042cbb0244342d030a6dff98c290f6b
+DIST image-0.24.9.crate 9261055 BLAKE2B b4d95a88fa2fdca01e5d89ba9975be22269e3a5d90d24bc31d5f1168007508a0337d0acc5347be012c2b98de02e4f481a573f012f47a1f1e365d26d89df236d8 SHA512 3f858efceeed54e21543eee065ca6008f40c568e1ece1016b38040eff5625c9fb6de77c7e950c08c9e82b9fcbd4c4ec2f8c4c1157ed5d232bc8e35b4850420d2
 DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
+DIST inflate-0.4.5.crate 17715 BLAKE2B c46dd3e4d064c135921670b940a3cd3ae152c5cadc67e00f6e4a350e7d22efc66807dc64b6e5943af30f1b985b2cea2dc42e7d923a05bcc268deec22a0a7de17 SHA512 1392402f72a8463dc5cdaf815d8933e8dfcc914fb3a91e69c38e54deb7d55b5211e157b640b7cfa999400fb4d2e233a4a1a678147594dfa0be300894126d17f2
 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.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 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.5.crate 10622 BLAKE2B 0d08db487ee791a252389e40e08e47a649d9eb90faad16bfbdfdfde46366082d2e3561fb8a62da80b122e7771052c50a0483e9618260d094820e20748d99882e SHA512 b90841e3a016a9a68cb090e4bf78959bbadecb3391cba71e0deeb5ac2723379ccd3251ec18a0bd055fba7cb6e71608ab1d7db990ad4d03cf2fd1289bd5834540
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
 DIST jpeg-decoder-0.3.0.crate 742671 BLAKE2B ea2226b1475a488c9c1d767145d021de87feabe993eef5b6534c91ec35176eda74881af667b2833d0610db04f4bed0456d803af92d4fab6d472db606633e3f2c SHA512 68611f52ce1b9999736711daf17d9fac8286179e5f937f04f90d79f1a4d9f7cfd9cfbba9ba2bc52b107392939d57f4a37e8ebc409878d7e9838d5fbddd8bf5bd
+DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
 DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
+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 lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST lebe-0.5.2.crate 8422 BLAKE2B afa49a1945d623b34139e31406f4780a5ab7b3d34648caf5f73b1504dbec4c4c02fc3aad3fdcdf85509eb8ba733a131a96478d6b9494cc9f69048f9ae28eb880 SHA512 ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libloading-0.7.4.crate 27580 BLAKE2B 491faef2659270b10bb88ac46e0453f747f35e78d7f28b7d6d9151177b4c7a7aec0a1efdf702eda0988c31e9dafff2990eba4e6a9b0b695c535ea9086ccf36e7 SHA512 34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1
+DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
 DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
 DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
+DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST linux-raw-sys-0.4.5.crate 1274380 BLAKE2B e15ca5b63cb994e86a8161e3b6e4bd20da8f574d1a470128f9a209a729ff22c86470f4c2b2a8ccbc1e37d6284b026e0805902645ea4b742425fe34491e519638 SHA512 13c36e03cb5bdb2e9f17622e21eda608057fc9d908bc55a829fdeeb77785094769d4f4b4daf376c5509ceb3abfdb3936f668bd6d5b2fd48e21c5c28b6e597e78
 DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
 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 lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
 DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
+DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
@@ -133,11 +177,14 @@ DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST num-complex-0.4.3.crate 29523 BLAKE2B 7f6af07ca78b00ba21f04931c473b2b725c61c78bb74b3bcef7b10a0fb00353c06283da02c056fa8cd4f9949476392054dda56ddacd330abc2d1aea3317e9ebe SHA512 64f1e6ee49f162a190b9aaccdebdf5d4f1712645eebda7877437f58859c5d8d4cfd10b67a39098dc964f9c842909b10e222aa8a2159575a7bb19352f753d3d99
 DIST num-complex-0.4.4.crate 29564 BLAKE2B 8ae65e8f2d87de96ec0a3d0e6d580584aff8cfbd0ebe56272dcf7cc5eea1b545fb9d597cbe4b1e25562b99a217a03ceef60e6cbda47c1e8cbd29b38d16cbe428 SHA512 632f9486df426d9254d2b6484c560b31e4ac0270de85878b9c4d14339a05ab318a90019f0724d2fac4d8496b03680650f899cedb1741c58eb7536cf3732db600
+DIST num-complex-0.4.5.crate 29614 BLAKE2B 32277724d5336443768a299c835cba63906ac91b85c57ff0e57338902e32731a0e67a93c647e6a57ae53a1b4a961c8b9ca2f6937a275e51a58089378a9646e8a SHA512 7b607f240773e4f4ff1954f46b2ee85be1a4f012e2d290343f6178543d10b69c0e9e1a93b0df8efa013c3914ad48321e1d96a4578092ae4d359acdc239ce1ebf
 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-rational-0.4.1.crate 27889 BLAKE2B c6db5b2165eb341268cc8b81df44caf25a18242d0ff1cc0959444ed9a51ba9985c1238d6d79433c3927267ceb181da6d491bf282560db6bafd7768b79ec65842 SHA512 a7547ca663543e9da9e18dd079762cde371b85d55874a54d6b343ba775a9373392c85cebad511c53b5af5db298bd5d57ccef6161c1c28587a6c9fa2c5962a0bd
 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 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.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
@@ -154,50 +201,64 @@ DIST png-0.17.10.crate 89384 BLAKE2B 4202db161bd974cc9b08ef01adf3ed4cbcaf00a5b8c
 DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
 DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270
 DIST prettyplease-0.2.15.crate 57034 BLAKE2B 251f4b19f2580c5503c7c1d1c47bb9fc125f5c9b8d41c960430c953ae83484049df0fcb1bed11693389c1fe48b9a41a5be35701c4f19cec90ee1cdee592f4e4c SHA512 789f9e381964f2da75e9def9f2474bc8a15adb598faae5044088543c9cd53f6f2fb70875263adaa7504e73a9fe1890949bdb9930dad199638c00196b24da6929
+DIST prettyplease-0.2.19.crate 57713 BLAKE2B 244d4fbb94102b0516efd656c0ce0d5ab3188bf9135157c797bcf3db5c417825c9ad92378082a6f682c6096c3f76b26dbc39cfa379ea7e642fa786cc4b08cd87 SHA512 c156eb23076560466ee1001d1d6ccf74fc7afe754518b2a21e16b5d05acb4a829da473dcbe43cd3499efbf03e09ca2dbcf2bf475c8260fae5550315ac09e93e6
 DIST prettyplease-0.2.4.crate 53478 BLAKE2B d83d392c7e7e0a4fa082d5c84615b012cf1988ec0a475be99313f95bcee47a11eb8c710fb992a18c0c6627b39e27b39fa767c4fa4c1c48f54cc4698f14577697 SHA512 68ea70cdbccad0e91c251bb66b317e126bda3c34fbd2d50f95549f7ee3e48566a7eafb77f58e40e3f298bc2a34f2a5b0d900067c717b117602dc57284d789480
 DIST primal-check-0.3.3.crate 8720 BLAKE2B 9c7b5273a5df414c57b4104b9bf795b853b433da3a5d91a1b878ef9b7cdb6a810572dfb8fae11543a106760e449b886f6e10a12347f043171f5d7947b30f2b20 SHA512 d56fcee65802b1ca272515589574786dfd066099c55a536cb1076193242859074918651c4fa3c1a7dab4fd13ba91c8f6a2a5b0789a6cd24faffc092edf27d75e
 DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
+DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
 DIST qoi-0.4.1.crate 71135 BLAKE2B 8b4e2ebfdd6df425efb1326912e8db02258e570320fdeef465aa8b03f3248cd811bedaa17c15902f851083cc1db06a2b500aeddf734345eb25af0d835300b2f0 SHA512 884cde33bfb2d02716daa5f309890093bdb7b3f53eb06aca0b6eff0b7a66fd67cb8b9acd510d19e3ae7718930add971e871532a1605e4989639bf72f59329377
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
+DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-1.6.1.crate 166330 BLAKE2B 5bbc439e0c88780b8d80cb36d4b4164e698a1189bd140e8c84d9f6a466023de0cd69a1f24c4217d595ae9af1f61aca6829461648152116c6bebeef0f0e686e50 SHA512 2e03585170e59f4388359817d67a43cd10a2244382615ae39bf84210db03a6dfec3b75d8a23800b8faaa31f45e8df4c44fbc343f02e18dd3dc0572c207791e73
 DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
 DIST rayon-1.8.0.crate 170172 BLAKE2B e2df52c64435926a13f4f275c4f25a9694316aeb02b73856c600a1a813686ceb20828676d8272393d1aec18eac4f05bfcdc5ef02ff1e19245c547c0313a2a03c SHA512 ab1cef238530d81c255b6631ecfed9cc4f3f8d7cb6a74701d29c1dcb022cc5b859db1d246cf8247d47702fdadcedfe64a6749e24cf6c7258e8c9411af7e4524a
 DIST rayon-core-1.10.2.crate 70599 BLAKE2B 3ef458725d2df280b259da4cef179f795dd8c29fc1b9fef06c9f405e3818508f2abe3d0eef206c14c6e1222f9271033cd3f534c3a11d2815e06abae31ce36874 SHA512 2b94669689b3c354fb65d2530c7da88d9d8d8a31cb7ad100e526018864f23091ffc976f0239e2614a521d58df3dece355b636ca06d0484ab4f0c3afca660dd24
 DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
 DIST rayon-core-1.12.0.crate 70081 BLAKE2B ef1bb1d430776b0ad49aa523cfe83bb0aa3a381b2e571db74cb8de04bbff884b8c269de31d7afbfd609118c445bf079afd2d4920842c8a8b312d329e4675cfc0 SHA512 588fa479c499e1620e25c5818996f0376d3bf526272af6c50a17ca0ccf0f8f67b03a3a665938575a86a8edc1f101a37ab01133b27f904eb5c291bbfc581135b2
+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.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
+DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 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-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8
+DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
 DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustdct-0.7.1.crate 41849 BLAKE2B ee952bade816e4bd1fb44f8b95288b5b7c34efe8b2006905ce62f1dfc1d6f6f33d2d9da45d1b32d9ac2cdcf0c3011a0588c56fa84ead89f3c5f0ed582a3ae849 SHA512 6679df13888c1517fd8c8bf458e201b49e1607343f04a8eef1ccb39a1cdda673bd7835452a6eb06c83d4b3ef1e831acf24561721477985d3d52be931ae4f6493
 DIST rustfft-6.1.0.crate 293068 BLAKE2B 6f086f82a9d65d4987bd109952ca3c81de7a7f6a6f6372b8fa48706f648101c45e2139435a1d079662fb64458b26097a9e27e07a73314552ed2fd46442234de1 SHA512 7ca5a3c388ce17f0c05b1454d7f2ffeeaa626272fa7af202e75c2cf5a0b89f46d25447c3d04b5700c447050ac8e12f2bd575b5cc53c38ff5294326317c8bc2c6
+DIST rustfft-6.2.0.crate 363170 BLAKE2B fb77c741b16d7dd833901914e91e5fdfc297639a91f97e47746a19b678bf12bd408327635f0ae3008113cbdb89b4b5ad606f55f67e835535837f560ea1642bd5 SHA512 c8f4bbf66f3c7c990af36bacd65240bca2c6334cb7139a3f92790e66ffcb5ea62757a469a7aff56ef602a79ebf2f860dc017a1ef8bd5a896f8383183f3b179ec
 DIST rustix-0.36.15.crate 294690 BLAKE2B cd13d14ae72d21831f5a4aebdb4a43040e3d0ab826883c2b85126ac2ec814b3d65676cb82c9f20ab9cf2fcd5229ba3ff33bdf6f69800f602faf28be42839a3b5 SHA512 3c6b5baeb365326e33ca2f5c07d7fa572ee6c705b157b414dc7772ac55b7b7818fd26f5c62c96f348b2af93e54c28e7ca38897ff2902a2dcb23030f7be40b24a
 DIST rustix-0.38.11.crate 342416 BLAKE2B 19cfa275f9621b5cbe200414567a345b3119bcc40eddcac453301dc9f53a5a7b3a25d51c69520ed4a0cb5c0bc9b177fd8b9d63e7bc9ebbb7060a177d22108c90 SHA512 23b19d1defd973fd2f6d62e6fa591040052a9322e88fabb4b8a8f574443c39795842ca3a431aabc7470be262a3054a02a881d7ffaf0afd0d89d2eefef70829b5
 DIST rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6cdc49963277bd7a58ebdccaa59c33710ee625bc0a07fe2102f370e39143adca0651d123a0dfeb562d32e7a537 SHA512 a48c959c0fbc9700294b1ab0fb71a303bcef89a01b4407c2d7dc7c83b35dfbdb69bb6ac9a364ba7d68b4e561445e6c227af586cab15d9799de9e6622e89ada12
+DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST ryu-1.0.12.crate 47070 BLAKE2B 02b0eec6bf266b7c482aea15ff83de4bf3cd6f607f8cd6f17f1c3ffc60cc64b62b15738907b4069f5816dd81669ed4f5b00c4bbc8705abaebe3a0846f56e8e29 SHA512 070f0b2b52e47cc9a6d8f003439d257c27aec15ffb030a92481ac22d5052436156e25127ea3ea7986cc514d2a7a924f9328710d743c216d7b1379beacae79829
 DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
 DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
+DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
 DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506
+DIST serde-1.0.200.crate 77611 BLAKE2B 57f4a76cf534ffda009a5441e694b0ac87b30e470c97d77bfd572eb54f039c3cec56f9bf5e035e4b3b257ddb341cb4b7fdb85ca3c4684167220dbb98d1e6a762 SHA512 d4d01d62e7338b147f83bdbe358813e70b7ac218ddbdeab534926d205d46f86e2086f73a01f453c9d4a3bfed07e10d57ebd1f86bdafd4fe96c6298f1e527b8eb
 DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
 DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41
+DIST serde_derive-1.0.200.crate 55785 BLAKE2B 45eca5504aff6bd099a42dfc794cf732c7e76e5ed362d16082ac069d29e1e6c22bb3e13dede4bc498df8f008bdba15479de618380f37c9742a34d97c9ca12efe SHA512 e70f0e092d81542a96b33610da8ddbf04023d8ecc1fa4a4f31978699c118f096e8534f9e3e4e479ee74280efb86d752dd1fce038ef2def329fdcc10c1aa50942
 DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452
 DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6
+DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
 DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
 DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
@@ -212,6 +273,7 @@ DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad5
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
 DIST strength_reduce-0.2.4.crate 17859 BLAKE2B 63ad1af9698ed3ced72f7c0e6d8c62ec35fd564d179286d6cde8975280dbc901303a3be5664b1902c135924dde8a03447a8e837ff0cc8037db50b053ad3c2c9b SHA512 2d44e54e4cf78f718faf482ade6c33fd42e73187a7e4fbbe41fa0905e6bf1ad5f5241c3d8ddfd7b18d9bbfa3f331c54ef2d817b254e1200b50b146f04327f157
 DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
@@ -219,18 +281,24 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e
 DIST syn-2.0.15.crate 240785 BLAKE2B ee2a2250e7083770f8fcb5ac0b387a28bab041e56dc9a835bdc366d39830cbd464aec156b47947331864220d78856f74e94c24061bd0c4fc908584efd355bce6 SHA512 19520d13b417ad2cabaf7e31f45271d41f26158607d0ab21e76a04e824133c64f4acba0f8c044c675028832563ed7cc73fd88d519520ef3834008dbb3d04663b
 DIST syn-2.0.31.crate 242369 BLAKE2B 5bdd346c0dcc8eea96b3c10dcf6e713e7fb3508a21d1d98f3e0cbecd01558c91d54c816bd0f75725cc8b3f071bed105583bba57ce0abf4fea2d05d8029f19393 SHA512 0bee1285083c5eb97eac82d170924d95e782d4a7fef1381160b449f66c9513b7ba434ea6f77fd67068c6b6a2810ebd44ad03506f0f0692f43237d7eebac34efd
 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
+DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d
+DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST tempfile-3.4.0.crate 30591 BLAKE2B 5dd7c2e28e9713751e2816e4264100b98795b26aca3d8619cbaed79de7de8af180aa3bba888babed1a1a644161a5a8ef08b4ecdc898e7c583070387cbc3fa357 SHA512 4c7f8b517282f7db295d649d038f0dbd065397abbf9546ed2d9ad19a6eccbc2a189d4601a7a93299cb412e7aa1c2d5bb409f11fe94162889a715303779ee42fc
 DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f
 DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a
 DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
 DIST thiserror-1.0.48.crate 18862 BLAKE2B b98d63646526e1ed0baf27a17faacee3d8be34421f6fb211d4e1909965a3a327440c0b97c4aba423f416c5a849a47a1d42623a6e64ae27d2236706dc9a30a783 SHA512 078427d19a28f59aaca27f508795cfb06c024b5a34dfc83360c3bec2b8f7abe474706a41fb68732998f154507921beb03dd033f0a6d1dcfcee03b1f2adb8a0b2
 DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46
+DIST thiserror-1.0.59.crate 21040 BLAKE2B d9ae0b1d810e7631edf072a41267a871c1cd88d71c882c8fb47d65b3dc563ca2addef0ebf9a9cb122fbfdccff5b92815b8f2e0f7c3382963828cb69d21ec8531 SHA512 254b0ad6c4b135234f89db8bd5674fb8c6b633495810140abf93cf06c58e911ad2ebcfdc002e7ce29739e95ea066eeed3fbd7c831e2858822dff620598dd147a
 DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
 DIST thiserror-impl-1.0.48.crate 15096 BLAKE2B 6b5eed1102256f2c809c21201cf319cc8eed11ab1dd04e6b6bf9759c8eb32e58f0c88407e7c515ac801cea69abfa3bba0c4ee98b034459129f322f6918e9e168 SHA512 6826e242445fba8beb16325fe2e0ad0423b84aae6c1a035dca85e6e07d2b62be8879cb1a0a2b307602d330ad83530260a2480123c9ac5cde59157f74ffd665b7
 DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9
+DIST thiserror-impl-1.0.59.crate 15726 BLAKE2B 0e524c851f999f4592e5450d7d8ad45a922c9cc5d2229f4dd106144238c8a0ceaeff5a4d1c7e27cdc53a7eb44e60f890fabe1f43ba3d5b950da9c63e6ddcc9d1 SHA512 75543ad39d1243dab23a4b50075bec337c39045f0271337a1ccc144f25dc1e7fc23b0163f16958ded9a1f44ff359378bd22f4c0f5e095c1823e928fc929457e8
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST tiff-0.8.1.crate 1417977 BLAKE2B 4beeb5c46cb598311cfbe486d54a99d99ee2bef5aeb040796c30663dc724e9ba2df82530004e933d82564bc8b1ae89af60799725d8df2647003b9618f5537943 SHA512 8a71882990b07d77ba81a4aef6c8614659ba3a37de845123fe4f4c3c5840a1d2929b4d79133b32e641cd23a856251bec46cdf6eb5e0be72a568761fc4f8ea77d
 DIST tiff-0.9.0.crate 1418215 BLAKE2B 4e472ecc8629e714b97ca492851b615c1b700f71de13f0b6efd94c621da5996698da062465a5933ad2f1ba2c0882a02f4d4cffc256db4699f275e4139989874d SHA512 cd13530a976cc8cb24e649568b1833ec7eed1709a41b02c298b68e406b78b6de622d3ce32123fbbbbf0e5fcfab9a6c319a356db352fa83fec819dd318cb1e6ff
+DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
 DIST transpose-0.2.2.crate 10816 BLAKE2B 87c6e1152858048fa188406a3683781b5af1f036c8236db2b4548a452327ba221a0c6ce71a6a191b2fe854a3292119cfe548a9b57266f4857fa0e517c331a6d4 SHA512 a08347773fba17586fd42f8e6ccd17c30f6d6c22faf391c6ff57ece99147754366b4273b41186a206f54b2be0bd3b29b2ef49182d23f0cfd11137cb49368338f
 DIST transpose-0.2.3.crate 10913 BLAKE2B 5af25c7e404121acf68caaa5b4109f4f3cd56093575139ce54a68dc14bd2238ef1d3cd2c7626a1a9e860433b15d517b57af264dea1f16cd59827bfa3cc4e93f2 SHA512 1a624e7baf2c74da48489558f9327d935bde67812eec50e205a4060180612d7e6d7d18f18c1b118bd7b08650cd089d8c1574db3fbd504a6915c9cd3b4ec09b59
@@ -240,26 +308,36 @@ DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
 DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
+DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
 DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55
+DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
 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.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d
 DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705
+DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
 DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058
 DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
+DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
 DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43
 DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6
+DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
 DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5
 DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33
+DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
 DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
 DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008
+DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
 DIST weezl-0.1.7.crate 42166 BLAKE2B a3a2a48dbb444b2bd910e1470507209f3d0acc75d88e22bcb42b5ca7ab8edbc41fc9e49cb6a2e18cf5e470d7bd26f4e4d9e30ea01c3eb543f171289a86927fdf SHA512 3fd8cb01dde494371df57001c97be90418b642ba88b0945cd98f973a4498743b83d383bcdfc8884db1da75271aeef4ce3b418e425f23690f12a5cc645c418e90
+DIST weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
 DIST which-4.4.0.crate 10889 BLAKE2B 3118f923319f260d6574ee0fd28d641f858a1885c3082090f079ca64acd2a3dd996aafd84803f0f2ae2e58b87d5cadf63059d75e72ff836dbf3ebcf4cee82602 SHA512 8380e5ea79f7768c8b1479c2fbb6e6c8b232f3a8d43b6554b78a370f302fb396d53842678d760ce9fc720fe607cfb9da3e0da4180e4a6ecfef48119105555fd7
 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
 DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b
+DIST widestring-1.1.0.crate 85046 BLAKE2B 591f8ba6c3c45721d342fd4668805c19915d500b2b46b8e1e75a485ebc772db187acec791205415e5cbf288ee70299a5813a3185d933443d426eb61d7fc6003f SHA512 a4feb959e19d5238e89b0973f040b26849f896e7e9fd567d0e74fbb4972958a4dd76e74de5ea8d407b74cff28f20f9c80446488da6abdbee38aa87a94d683435
 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.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
@@ -267,26 +345,35 @@ DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d
 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.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
 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.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
 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.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
 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.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+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.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.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
 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.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
 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.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
 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.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
+DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST zune-inflate-0.2.42.crate 37288 BLAKE2B 2d60c589607583826570c2877e1deae1a4dcf2c76ef705efc792cbf0f8bef2a1f4c4e75380efa890479b2cf168c34c7054b520aa799ccb20d43ae94526752458 SHA512 ea2c070a3df93c519f4360ee17fd1c51d8c6e194c61b391ab8c40d81c86bc7d2021bf08f97a106710806cdb16797d710b7722197edc9cce25de3c3752549bf09
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
diff --git a/app-antivirus/clamav/clamav-0.103.12.ebuild b/app-antivirus/clamav/clamav-0.103.12.ebuild
new file mode 100644
index 000000000000..8a29edbb6daa
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.103.12.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2 unRAR"
+SLOT="0/lts"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/tomsfastmath
+	>=sys-libs/zlib-1.2.2:=
+	bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	iconv? ( virtual/libiconv )
+	!libclamav-only? ( net-misc/curl )
+	dev-libs/openssl:0=
+	milter? ( mail-filter/libmilter:= )
+	xml? ( dev-libs/libxml2 )"
+
+# We need at least autoconf-2.69-r5 because that's the first (patched)
+# version of it in Gentoo that supports ./configure --runstatedir.
+BDEPEND=">=dev-build/autoconf-2.69-r5
+	virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	metadata-analysis-api? ( dev-libs/json-c:* )
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
+	"${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394
+	"${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch"
+	"${FILESDIR}/${PN}-0.103.12-missing-const.patch"
+)
+
+src_prepare() {
+	default
+
+	# Be extra sure that we're using the system copy of tomsfastmath
+	einfo "removing bundled copy of dev-libs/tomsfastmath"
+	rm -r libclamav/tomsfastmath || \
+		die "failed to remove bundled tomsfastmath"
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+
+	# according to configure help it should be
+	# $(use_enable xml)
+	# but that does not work
+	# do not add this, since --disable-xml seems to override
+	# --without-xml
+	JSONUSE="--without-libjson"
+
+	if use clamsubmit || use metadata-analysis-api; then
+		# either of those 2 requires libjson.
+		# clamsubmit will be built as soon as libjson and curl are found
+		# but we only install the binary if requested
+		JSONUSE="--with-libjson=${EPREFIX}/usr"
+	fi
+
+	local myeconfargs=(
+		$(use_enable bzip2)
+		$(use_enable clamonacc)
+		$(use_enable clamdtop)
+		$(use_enable milter)
+		$(use_enable test check)
+		$(use_with xml)
+		$(use_with iconv)
+		${JSONUSE}
+		$(use_enable libclamav-only)
+		$(use_with !libclamav-only libcurl)
+		--enable-ipv6
+		--with-system-libmspack
+		--cache-file="${S}"/config.cache
+		--disable-experimental
+		--disable-static
+		--disable-zlib-vcheck
+		--enable-id-check
+		--with-dbdir="${EPREFIX}"/var/lib/clamav
+		# Don't call --with-zlib=/usr (see bug #699296)
+		--with-zlib
+		--disable-llvm
+		--enable-openrc
+		--runstatedir=/run
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# OpenRC service scripts should (and do) ensure that the
+			# directories they need exist and have the correct
+			# permissions without the help of tmpfiles.
+			newtmpfiles "${FILESDIR}/tmpfiles.d/clamav-r1.conf" clamav.conf
+			systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/clamd.logrotate" clamd
+		newins "${FILESDIR}/freshclam.logrotate" freshclam
+		use milter && \
+			newins "${FILESDIR}/clamav-milter.logrotate-r1" clamav-milter
+
+		# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s/^#\(PidFile .*\)/\1/" \
+			-e "s/^#\(LocalSocket .*\)/\1/" \
+			-e "s/^#\(User .*\)/\1/" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+			-e "s:^\#\(LogTime\).*:\1 yes:" \
+			-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+			"${ED}"/etc/clamd.conf.sample || die
+
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s/^#\(PidFile .*\)/\1/" \
+			-e "s/^#\(DatabaseOwner .*\)/\1/" \
+			-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+			-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+			-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+			-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+			"${ED}"/etc/freshclam.conf.sample || die
+
+		if use milter ; then
+			# Note: only keep the "unix" ClamdSocket and MilterSocket!
+			sed -i -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+				"${ED}"/etc/clamav-milter.conf.sample || die
+
+			cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+				MILTER_NICELEVEL=19
+				START_MILTER=no
+			EOF
+
+			systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+		fi
+
+		local i
+		for i in clamd freshclam clamav-milter
+		do
+			if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
+				mv "${ED}"/etc/"${i}".conf{.sample,} || die
+			fi
+		done
+
+		# These both need to be writable by the clamav user.
+		# TODO: use syslog by default; that's what it's for.
+		diropts -o clamav -g clamav
+		keepdir /var/lib/clamav
+		keepdir /var/log/clamav
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+
+		if ! use libclamav-only ; then
+			doman docs/man/*.[1-8]
+		fi
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	if use libclamav-only ; then
+		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
+		return 0
+	fi
+
+	emake quick-check
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	ewarn "This version of ClamAV provides separate OpenRC services"
+	ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+	ewarn "clamd service now starts only the clamd daemon itself. You"
+	ewarn "should add freshclam (and perhaps clamav-milter) to any"
+	ewarn "runlevels that previously contained clamd."
+}
diff --git a/app-antivirus/clamav/clamav-1.4.0.ebuild b/app-antivirus/clamav/clamav-1.4.0.ebuild
new file mode 100644
index 000000000000..83d6af40f1e5
--- /dev/null
+++ b/app-antivirus/clamav/clamav-1.4.0.ebuild
@@ -0,0 +1,414 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+# Upstream are working on updating clamav's LLVM bytecode interpreter to work
+# with later versions of LLVM, but it's not ready yet. See:
+# https://github.com/Cisco-Talos/clamav/issues/581
+# This does not impact the ability of the package to build with llvm/clang otherwise.
+LLVM_MAX_SLOT=13
+PYTHON_COMPAT=( python3_{11..13} )
+
+# Autogenerated by pycargoebuild 0.13.2
+CRATES="
+		adler32@1.2.0
+		adler@1.0.2
+		aho-corasick@1.1.3
+		android-tzdata@0.1.1
+		android_system_properties@0.1.5
+		autocfg@1.3.0
+		base64@0.21.7
+		bindgen@0.65.1
+		bit_field@0.10.2
+		bitflags@1.3.2
+		bitflags@2.5.0
+		block-buffer@0.10.4
+		bumpalo@3.16.0
+		bytemuck@1.15.0
+		byteorder@1.5.0
+		bytes@1.6.0
+		bzip2-rs@0.1.2
+		cbindgen@0.25.0
+		cc@1.0.97
+		cexpr@0.6.0
+		cfg-if@1.0.0
+		chrono@0.4.38
+		clang-sys@1.7.0
+		color_quant@1.1.0
+		core-foundation-sys@0.8.6
+		cpufeatures@0.2.12
+		crc32fast@1.4.0
+		crossbeam-deque@0.8.5
+		crossbeam-epoch@0.9.18
+		crossbeam-utils@0.8.19
+		crunchy@0.2.2
+		crypto-common@0.1.6
+		delharc@0.6.1
+		digest@0.10.7
+		either@1.11.0
+		encoding_rs@0.8.34
+		enum-primitive-derive@0.2.2
+		errno@0.3.8
+		exr@1.72.0
+		fastrand@2.1.0
+		fdeflate@0.3.4
+		flate2@1.0.30
+		flume@0.11.0
+		generic-array@0.14.7
+		gif@0.13.1
+		glob@0.3.1
+		half@2.4.1
+		hashbrown@0.12.3
+		heck@0.4.1
+		hex-literal@0.4.1
+		hex@0.4.3
+		home@0.5.9
+		iana-time-zone-haiku@0.1.2
+		iana-time-zone@0.1.60
+		image@0.24.9
+		indexmap@1.9.3
+		inflate@0.4.5
+		itertools@0.10.5
+		itoa@1.0.11
+		jpeg-decoder@0.3.1
+		js-sys@0.3.69
+		lazy_static@1.4.0
+		lazycell@1.3.0
+		lebe@0.5.2
+		libc@0.2.155
+		libloading@0.8.3
+		linux-raw-sys@0.4.13
+		lock_api@0.4.12
+		log@0.4.21
+		memchr@2.7.2
+		minimal-lexical@0.2.1
+		miniz_oxide@0.7.2
+		nom@7.1.3
+		num-complex@0.4.5
+		num-integer@0.1.46
+		num-traits@0.2.19
+		once_cell@1.19.0
+		paste@1.0.14
+		peeking_take_while@0.1.2
+		png@0.17.13
+		prettyplease@0.2.19
+		primal-check@0.3.3
+		proc-macro2@1.0.81
+		qoi@0.4.1
+		quote@1.0.36
+		rayon-core@1.12.1
+		rayon@1.10.0
+		regex-automata@0.4.6
+		regex-syntax@0.8.3
+		regex@1.10.4
+		rustc-hash@1.1.0
+		rustdct@0.7.1
+		rustfft@6.2.0
+		rustix@0.38.34
+		ryu@1.0.17
+		scopeguard@1.2.0
+		serde@1.0.200
+		serde_derive@1.0.200
+		serde_json@1.0.116
+		sha1@0.10.6
+		sha2@0.10.8
+		shlex@1.3.0
+		simd-adler32@0.3.7
+		smallvec@1.13.2
+		spin@0.9.8
+		strength_reduce@0.2.4
+		syn@1.0.109
+		syn@2.0.60
+		tempfile@3.10.1
+		thiserror-impl@1.0.59
+		thiserror@1.0.59
+		tiff@0.9.1
+		tinyvec@1.6.0
+		toml@0.5.11
+		transpose@0.2.3
+		typenum@1.17.0
+		unicode-ident@1.0.12
+		unicode-segmentation@1.11.0
+		uuid@1.8.0
+		version_check@0.9.4
+		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
+		weezl@0.1.8
+		which@4.4.2
+		widestring@1.1.0
+		windows-core@0.52.0
+		windows-sys@0.52.0
+		windows-targets@0.52.5
+		windows_aarch64_gnullvm@0.52.5
+		windows_aarch64_msvc@0.52.5
+		windows_i686_gnu@0.52.5
+		windows_i686_gnullvm@0.52.5
+		windows_i686_msvc@0.52.5
+		windows_x86_64_gnu@0.52.5
+		windows_x86_64_gnullvm@0.52.5
+		windows_x86_64_msvc@0.52.5
+		zune-inflate@0.2.54
+"
+
+# Get the commit from the CLAM-2329-new-from-slice branch
+declare -A GIT_CRATES=(
+	[onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;8b450447e58143004b68dd21c11b710fdb79be92;onenote.rs-%commit%"
+)
+
+inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
+
+MY_P=${P//_/-}
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz
+	${CARGO_CRATE_URIS}"
+S=${WORKDIR}/clamav-${MY_P}
+
+LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
+# 0/sts (short term support) if not an LTS release
+SLOT="0/sts"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
+	clamonacc? ( clamapp )
+	milter? ( clamapp )
+	test? ( !libclamav-only )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+COMMON_DEPEND="
+	acct-group/clamav
+	acct-user/clamav
+	app-arch/bzip2
+	dev-libs/json-c:=
+	dev-libs/libltdl
+	dev-libs/libpcre2:=
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	>=sys-libs/zlib-1.2.2:=
+	virtual/libiconv
+	!libclamav-only? ( net-misc/curl )
+	clamapp? ( sys-libs/ncurses:= net-misc/curl )
+	elibc_musl? ( sys-libs/fts-standalone )
+	jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
+	milter? ( mail-filter/libmilter:= )
+	rar? ( app-arch/unrar )
+	system-mspack? ( dev-libs/libmspack )
+	test? ( dev-python/pytest )
+"
+# rust-bin < 1.71 has an executable stack
+# which is not supported on selinux #911589
+BDEPEND="
+	virtual/pkgconfig
+	>=virtual/rust-1.71
+	doc? ( app-text/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+python_check_deps() {
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use jit && llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply --dir="${WORKDIR}/onenote.rs-8b450447e58143004b68dd21c11b710fdb79be92" \
+		"${FILESDIR}/${PN}-1.3.1-onenote-rs.patch"
+	cmake_src_prepare
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
+		-DBYTECODE_RUNTIME=$(usex jit llvm interpreter)
+		-DCLAMAV_GROUP="clamav"
+		-DCLAMAV_USER="clamav"
+		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
+		-DENABLE_APP=$(usex clamapp ON OFF)
+		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
+		-DENABLE_EXTERNAL_MSPACK=$(usex system-mspack ON OFF)
+		-DENABLE_JSON_SHARED=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MILTER=$(usex milter ON OFF)
+		-DENABLE_SHARED_LIB=ON
+		-DENABLE_STATIC_LIB=OFF
+		-DENABLE_SYSTEMD=$(usex systemd ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_UNRAR=$(usex rar ON OFF)
+		-DOPTIMIZE=ON
+	)
+
+	if use test ; then
+		# https://bugs.gentoo.org/818673
+		# Used to enable some more tests but doesn't behave well in
+		# sandbox necessarily(?) + needs certain debug symbols present
+		# in e.g. glibc.
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON
+			-DPYTHON_FIND_VERSION="${EPYTHON#python}"
+		)
+	fi
+
+	if use jit ; then
+		# Suppress CMake warnings that variables aren't consumed if we aren't using LLVM
+		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section
+		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime
+		mycmakeargs+=(
+			-DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
+			-DLLVM_FIND_VERSION="$(best_version sys-devel/llvm:${LLVM_MAX_SLOT} | cut -c 16-)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# init scripts
+	newinitd "${FILESDIR}/clamd.initd" clamd
+	newinitd "${FILESDIR}/freshclam.initd" freshclam
+	use clamonacc && \
+		newinitd "${FILESDIR}/clamonacc.initd" clamonacc
+	use milter && \
+		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
+
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			# OpenRC services ensure their own permissions, so we can avoid
+			# a dependency on sys-apps/systemd-utils[tmpfiles] here, though
+			# we can change our minds and use it if we want to.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav-r1.conf"
+		fi
+
+		if use clamapp ; then
+			# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s:^#\(PidFile\) .*:\1 ${EPREFIX}/run/clamd.pid:" \
+				-e "s/^#\(LocalSocket .*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+				-e "s:^\#\(LogTime\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/clamd.conf.sample > \
+				"${ED}"/etc/clamav/clamd.conf || die
+
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s:^#\(PidFile\) .*:\1 ${EPREFIX}/run/freshclam.pid:" \
+				-e "s/^#\(DatabaseOwner .*\)/\1/" \
+				-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+				-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \
+				-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/freshclam.conf.sample > \
+				"${ED}"/etc/clamav/freshclam.conf || die
+
+			if use milter ; then
+				# Note: only keep the "unix" ClamdSocket and MilterSocket!
+				sed -e "s:^\(Example\):\# \1:" \
+					-e "s:^\#\(PidFile\) .*:\1 ${EPREFIX}/run/clamav-milter.pid:" \
+					-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+					-e "s/^#\(User .*\)/\1/" \
+					-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+					"${ED}"/etc/clamav/clamav-milter.conf.sample > \
+					"${ED}"/etc/clamav/clamav-milter.conf || die
+
+				systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service
+			fi
+
+			local i
+			for i in clamd freshclam clamav-milter
+			do
+				if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
+					mv "${ED}"/etc/"${i}".conf{.sample,} || die
+				fi
+			done
+
+			# These both need to be writable by the clamav user
+			# TODO: use syslog by default; that's what it's for.
+			diropts -o clamav -g clamav
+			keepdir /var/lib/clamav
+			keepdir /var/log/clamav
+		fi
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+	fi
+
+	# Don't install man pages for utilities we didn't install
+	if use libclamav-only ; then
+		rm -r "${ED}"/usr/share/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav-r1.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	 if ! systemd_is_booted ; then
+		ewarn "This version of ClamAV provides separate OpenRC services"
+		ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+		ewarn "clamd service now starts only the clamd daemon itself. You"
+		ewarn "should add freshclam (and perhaps clamav-milter) to any"
+		ewarn "runlevels that previously contained clamd."
+	else
+		if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -le 1.3.1; then
+			ewarn "From 1.3.1-r1 the Gentoo-provided systemd services have been"
+			ewarn "Retired in favour of using the units shipped by upstream."
+			ewarn "Ensure that any required services are configured and started."
+			ewarn "clamd@.service has been retired as part of this transition."
+		fi
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] && use clamonacc; then
+		einfo "'clamonacc' requires additional configuration before it"
+		einfo "can be enabled, and may not produce any output if not properly"
+		einfo "configured. Read the appropriate man page if clamonacc is desired."
+	fi
+
+}
diff --git a/app-antivirus/clamav/files/clamav-0.103.12-missing-const.patch b/app-antivirus/clamav/files/clamav-0.103.12-missing-const.patch
new file mode 100644
index 000000000000..39b98b7f4732
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.103.12-missing-const.patch
@@ -0,0 +1,13 @@
+diff --git a/libclamav/regex/engine.c b/libclamav/regex/engine.c
+index ed359c3..3c25398 100644
+--- a/libclamav/regex/engine.c
++++ b/libclamav/regex/engine.c
+@@ -223,7 +223,7 @@ matcher(struct re_guts *g, const char *string, size_t nmatch,
+ 			dp = dissect(m, m->coldp, endp, gf, gl);
+ 		} else {
+ 			if (g->nplus > 0 && m->lastpos == NULL)
+-				m->lastpos = (char **)cli_malloc((g->nplus+1) *
++				m->lastpos = (const char **)cli_malloc((g->nplus+1) *
+ 							sizeof(char *));
+ 			if (g->nplus > 0 && m->lastpos == NULL) {
+ 				free(m->pmatch);
diff --git a/app-antivirus/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest
index f4f50ec94210..cb9faeee9ff4 100644
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@@ -1,2 +1 @@
-DIST fangfrisch-1.6.1.gh.tar.gz 113497 BLAKE2B a37b5b29b31a1d0166112b8939e691acc1721a91bda9e364a90c0c8d4ea7b7d3e1a24b8849c9ef4f0632996ed7bbdfc7985ab04c44c8ca4d57df21294867fd32 SHA512 a16b39b6520d80f69c561bc2d56fef28acaca35a9da214be920cdd907f76d3d6674ed4aa1290ad11a9364ede11472594d7e331ecd21924fe23e005ef9501d4ac
 DIST fangfrisch-1.9.0.gh.tar.gz 127572 BLAKE2B c05c68f904a6e7c7d9f9c5b82bb63366f86653cd13a94276108f52e9c523280320c8aa55ba94ecf079ba938a77e11ca7dc557f4c8fd1b1c7f37179c087dd8605 SHA512 08cc36f20884fedb553de905b8faafce99fcef80e3bce7c0b264691b1a8d83b91a582c095b684f6f7a6af77fd4ed0405fa771a74bbeee3f1b255ff74a161d37e
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.6.1.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.6.1.ebuild
deleted file mode 100644
index fae2bf0d0915..000000000000
--- a/app-antivirus/fangfrisch/fangfrisch-1.6.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 readme.gentoo-r1 systemd
-
-DESCRIPTION="Update and verify unofficial Clam Anti-Virus signatures"
-HOMEPAGE="https://github.com/rseichter/fangfrisch https://pypi.org/project/fangfrisch/"
-SRC_URI="https://github.com/rseichter/fangfrisch/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-MY_CONF="/etc/${PN}.conf"
-MY_DBDIR="/var/lib/${PN}"
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="See https://rseichter.github.io/fangfrisch/ for the official
-documentation.
-
-### Fresh installations:
-
-Modify ${MY_CONF} according to your preferences.
-Assuming you place the database into ${MY_DBDIR}
-(recommended), execute the following commands in a root shell:
-
-mkdir -m 0770 ${MY_DBDIR}
-chgrp clamav ${MY_DBDIR}
-sudo -u clamav -- fangfrisch -c ${MY_CONF} initdb
-
-You can now enable /etc/cron.d/${PN} for periodic updates.
-
-### Alternative: Updating from release 1.0.1:
-
-Either create a fresh database or manually delete all existing
-database tables, then run the initdb command as shown above."
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Due to the nature of Fangfrisch, most tests require network
-# connectivity and/or access keys to download signature files.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-DEPEND="
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -i -e '/SQLAlchemy/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-
-	insinto /etc/cron.d
-	newins "${FILESDIR}/${PN}.cron" ${PN}
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dounit "${FILESDIR}/${PN}.timer"
-
-	distutils-r1_python_install_all
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
-}
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.9.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.9.0.ebuild
index 195bbaa8f563..c4f3d95cacff 100644
--- a/app-antivirus/fangfrisch/fangfrisch-1.9.0.ebuild
+++ b/app-antivirus/fangfrisch/fangfrisch-1.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 readme.gentoo-r1 systemd
 
diff --git a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
deleted file mode 100644
index a5871db9159c..000000000000
--- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Respect build environment settings
-
-Bug: https://bugs.gentoo.org/913186
-Bug: https://bugs.gentoo.org/913188
-Bug: https://bugs.gentoo.org/913189
-
-
---- a/CPP/7zip/7zip_gcc.mak
-+++ b/CPP/7zip/7zip_gcc.mak
-@@ -87,14 +87,14 @@ SHARED_EXT=.dll
- LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC)
- else
- SHARED_EXT=.so
--LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)
-+LDFLAGS = -shared -fPIC $(G_LDFLAGS) $(LDFLAGS_STATIC)
- CC_SHARED=-fPIC
- endif
-
-
- else
-
--LDFLAGS = $(LDFLAGS_STATIC)
-+LDFLAGS = $(LDFLAGS_STATIC) $(G_LDFLAGS)
- # -s is not required for clang, do we need it for GCC ???
-
- #-static -static-libgcc -static-libstdc++
-@@ -149,7 +149,7 @@ endif
-
-
-
--CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
-+CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) $(G_CFLAGS) -o $@
-
-
- ifdef IS_MINGW
-@@ -190,7 +190,7 @@ CXX_WARN_FLAGS =
- #-Wno-invalid-offsetof
- #-Wno-reorder
-
--CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
-+CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(G_CXXFLAGS) -o $@
-
- STATIC_TARGET=
- ifdef COMPL_STATIC
-@@ -208,7 +208,7 @@ $(O):
- # -Wl,--print-gc-sections
-
- ifneq ($(CC), $(CROSS_COMPILE)clang)
--LFLAGS_STRIP = -s
-+
- endif
-
- LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
diff --git a/app-arch/libdeflate/Manifest b/app-arch/libdeflate/Manifest
index 280c6644dba1..70cf4bec244d 100644
--- a/app-arch/libdeflate/Manifest
+++ b/app-arch/libdeflate/Manifest
@@ -1,2 +1,3 @@
 DIST libdeflate-1.19.tar.gz 187684 BLAKE2B 6d3c58b4095f91f64c25e09a062f1d7e68cd43b4dffc2de6484cd941ede4bffd8a82dd3af08eda6c94ad4120d40809c1d6a1814c28bad5387dfbaad418b93070 SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613
 DIST libdeflate-1.20.tar.gz 194212 BLAKE2B b3633f1068f36bf346e1f435c67259612ad5ed1571e83f1bbc4a58c6a67b3eadca85e0abb2d2d47f180dd2ff01c5891c8b3958a63ddbcc2447106f2e5cb3c0fe SHA512 5ebe6af9ce81872cba508d1f0aa087ddeb0e0f0c8e6360da66b8a9db2a76203dafbf3d3f6b3b791618ea9c6d0231fab5b4a55badb31a4480fb4174b9445c658b
+DIST libdeflate-1.21.tar.gz 195361 BLAKE2B 8d1f2a71cb6a0823ab93631720f9807a6907f1d92490bb258b9bfcf9daf08b517eab3bdee064326a4274d7b193cffbafa24037e2be2503c17fa8daddef5cfff5 SHA512 7cd9bc91992ef824a0fdf175b0da081b8381decc325013477a3fbfcfe6cf240f66cedbeec830a51343fedb8c27c76fba8782c1aed3fc538e3afd6c9f8cdc90fb
diff --git a/app-arch/libdeflate/libdeflate-1.19-r1.ebuild b/app-arch/libdeflate/libdeflate-1.19-r1.ebuild
new file mode 100644
index 000000000000..24ed22232694
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.19-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
+HOMEPAGE="https://github.com/ebiggers/libdeflate"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
+else
+	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+# the zlib USE-flag enables support for zlib
+# the test USE-flag programs depend on sys-libs/zlib for comparison tests
+IUSE="+utils test"
+
+RESTRICT="
+	!test? ( test )
+"
+
+DEPEND="
+	test? ( sys-libs/zlib )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDEFLATE_BUILD_SHARED_LIB="yes"
+		-DLIBDEFLATE_BUILD_STATIC_LIB="no"
+		-DLIBDEFLATE_USE_SHARED_LIB="yes"
+
+		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
+		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
+
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
diff --git a/app-arch/libdeflate/libdeflate-1.19.ebuild b/app-arch/libdeflate/libdeflate-1.19.ebuild
deleted file mode 100644
index b637d83a6dfe..000000000000
--- a/app-arch/libdeflate/libdeflate-1.19.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 cmake
-
-DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
-HOMEPAGE="https://github.com/ebiggers/libdeflate"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
-else
-	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-# the zlib USE-flag enables support for zlib
-# the test USE-flag programs depend on sys-libs/zlib for comparison tests
-IUSE="+gzip +utils +zlib test"
-
-RESTRICT="
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	utils? ( gzip )
-"
-
-DEPEND="
-	test? ( sys-libs/zlib )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDEFLATE_BUILD_SHARED_LIB="yes"
-		-DLIBDEFLATE_BUILD_STATIC_LIB="no"
-		-DLIBDEFLATE_USE_SHARED_LIB="yes"
-
-		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
-		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
-
-		-DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )"
-		-DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)"
-
-		-DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)"
-
-		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
diff --git a/app-arch/libdeflate/libdeflate-1.20-r1.ebuild b/app-arch/libdeflate/libdeflate-1.20-r1.ebuild
new file mode 100644
index 000000000000..12a547db272d
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.20-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
+HOMEPAGE="https://github.com/ebiggers/libdeflate"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
+else
+	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+# the zlib USE-flag enables support for zlib
+# the test USE-flag programs depend on sys-libs/zlib for comparison tests
+IUSE="+utils test"
+
+RESTRICT="
+	!test? ( test )
+"
+
+DEPEND="
+	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDEFLATE_BUILD_SHARED_LIB="yes"
+		-DLIBDEFLATE_BUILD_STATIC_LIB="no"
+		-DLIBDEFLATE_USE_SHARED_LIB="yes"
+
+		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
+		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
+
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/app-arch/libdeflate/libdeflate-1.20.ebuild b/app-arch/libdeflate/libdeflate-1.20.ebuild
deleted file mode 100644
index 395b2234ceea..000000000000
--- a/app-arch/libdeflate/libdeflate-1.20.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 cmake-multilib
-
-DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
-HOMEPAGE="https://github.com/ebiggers/libdeflate"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
-else
-	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-# the zlib USE-flag enables support for zlib
-# the test USE-flag programs depend on sys-libs/zlib for comparison tests
-IUSE="+gzip +utils +zlib test"
-
-RESTRICT="
-	!test? ( test )
-"
-
-REQUIRED_USE="
-	utils? ( gzip )
-"
-
-DEPEND="
-	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDEFLATE_BUILD_SHARED_LIB="yes"
-		-DLIBDEFLATE_BUILD_STATIC_LIB="no"
-		-DLIBDEFLATE_USE_SHARED_LIB="yes"
-
-		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
-		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
-
-		-DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )"
-		-DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)"
-
-		-DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)"
-
-		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/app-arch/libdeflate/libdeflate-1.21.ebuild b/app-arch/libdeflate/libdeflate-1.21.ebuild
new file mode 100644
index 000000000000..25d0028af6cd
--- /dev/null
+++ b/app-arch/libdeflate/libdeflate-1.21.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Heavily optimized DEFLATE/zlib/gzip (de)compression"
+HOMEPAGE="https://github.com/ebiggers/libdeflate"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
+else
+	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+# the zlib USE-flag enables support for zlib
+# the test USE-flag programs depend on sys-libs/zlib for comparison tests
+IUSE="+utils test"
+
+RESTRICT="
+	!test? ( test )
+"
+
+DEPEND="
+	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.19-make-gzip-tests-conditional.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDEFLATE_BUILD_SHARED_LIB="yes"
+		-DLIBDEFLATE_BUILD_STATIC_LIB="no"
+		-DLIBDEFLATE_USE_SHARED_LIB="yes"
+
+		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
+		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
+
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
+
+		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/app-arch/libdeflate/libdeflate-9999.ebuild b/app-arch/libdeflate/libdeflate-9999.ebuild
index 395b2234ceea..12a547db272d 100644
--- a/app-arch/libdeflate/libdeflate-9999.ebuild
+++ b/app-arch/libdeflate/libdeflate-9999.ebuild
@@ -20,16 +20,12 @@ LICENSE="MIT"
 SLOT="0"
 # the zlib USE-flag enables support for zlib
 # the test USE-flag programs depend on sys-libs/zlib for comparison tests
-IUSE="+gzip +utils +zlib test"
+IUSE="+utils test"
 
 RESTRICT="
 	!test? ( test )
 "
 
-REQUIRED_USE="
-	utils? ( gzip )
-"
-
 DEPEND="
 	test? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
@@ -47,10 +43,10 @@ src_configure() {
 		-DLIBDEFLATE_COMPRESSION_SUPPORT="yes"
 		-DLIBDEFLATE_DECOMPRESSION_SUPPORT="yes"
 
-		-DLIBDEFLATE_BUILD_GZIP="$(usex gzip "$(usex utils)" )"
-		-DLIBDEFLATE_GZIP_SUPPORT="$(usex gzip)"
+		-DLIBDEFLATE_BUILD_GZIP="$(usex utils)"
+		-DLIBDEFLATE_GZIP_SUPPORT="yes"
 
-		-DLIBDEFLATE_ZLIB_SUPPORT="$(usex zlib)"
+		-DLIBDEFLATE_ZLIB_SUPPORT="yes"
 
 		-DLIBDEFLATE_BUILD_TESTS="$(usex test)"
 	)
diff --git a/app-arch/libdeflate/metadata.xml b/app-arch/libdeflate/metadata.xml
index 17956aa98f85..a55b0a6392fb 100644
--- a/app-arch/libdeflate/metadata.xml
+++ b/app-arch/libdeflate/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-wanted -->
-		<maintainer type="person" proxied="yes">
+	<maintainer type="person" proxied="yes">
 		<email>negril.nx+gentoo@gmail.com</email>
 		<name>Paul Zander</name>
 	</maintainer>
@@ -11,10 +11,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="gzip">Support the gzip format</flag>
 		<flag name="test">Build the test programs (requires <pkg>sys-libs/zlib</pkg>)</flag>
 		<flag name="utils">Build the libdeflate-gzip program</flag>
-		<flag name="zlib">Support the zlib format</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ebiggers/libdeflate</remote-id>
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild
index 1601cd9dbd43..3788c812c20a 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-1.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/lzma/lzma-19.00.ebuild b/app-arch/lzma/lzma-19.00.ebuild
index 80e70487d38b..3cf7659031ef 100644
--- a/app-arch/lzma/lzma-19.00.ebuild
+++ b/app-arch/lzma/lzma-19.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/sevenzip/${MY_P}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/p7zip"
diff --git a/app-arch/mt-st/mt-st-1.4.ebuild b/app-arch/mt-st/mt-st-1.4.ebuild
index 55b614c829d6..8c8f4d2f2a29 100644
--- a/app-arch/mt-st/mt-st-1.4.ebuild
+++ b/app-arch/mt-st/mt-st-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/iustin/mt-st/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 src_configure() {
 	tc-export CC
diff --git a/app-arch/mt-st/mt-st-1.7.ebuild b/app-arch/mt-st/mt-st-1.7.ebuild
index a49f93912a95..604544a235ec 100644
--- a/app-arch/mt-st/mt-st-1.7.ebuild
+++ b/app-arch/mt-st/mt-st-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/iustin/mt-st/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 44ff82c4f1c9..881fdd5c03d2 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,2 +1,2 @@
-DIST patool-2.2.0.tar.gz 1995287 BLAKE2B ec7a188abfbfc2198e0171568324cb0e372a5629363aaeabfa404767f08062669028d6a9771e80370eb096677f3668da75923f7def7fbb4525f5ce7418cdf68a SHA512 eae774e7da2be13c7644038dc47457105caff7a51a9d3b99e38962dd26c0ace0129f1c0151c27766708ee9754049aec283873fd4a2e8647015a1a07acd48de60
 DIST patool-2.3.0.tar.gz 1996107 BLAKE2B 8fdb13eee3f60f136a93fad538d9f45b94a7aabe243e33fcd37da27d973a74dd8df8ac7f3daae8d0e8d70da4abb30889c9ea5d60f0de2953d539c316b1107b53 SHA512 0d6cad4b449706f2f5c012a40adf0dda3cbb654c4a7444cff31a755bb3bed8a5221fa4467879d97244922cbdc9789a7a0923d020bfb2e46bdd1345a9fb2f14c3
+DIST patool-2.4.0.tar.gz 1996705 BLAKE2B b84fd4c469741de76ceeee90974cec71ba5bc123d31f6a1dd60cf3c336dcfd7da1def7fec2bbec27ce181d97c5dff96f15c1d4714b722718a1439749f7cee077 SHA512 bf6d680613fb996b3c0b12075a85acec1edd468b8cb58cafd233b31847a2b9c490d21c6d906e737218ca68f08d1cdce4a18a3e57e353a970be58da4e2ff0d794
diff --git a/app-arch/patool/patool-2.2.0.ebuild b/app-arch/patool/patool-2.2.0.ebuild
deleted file mode 100644
index 278760c4129c..000000000000
--- a/app-arch/patool/patool-2.2.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Portable archive file manager"
-HOMEPAGE="https://wummel.github.io/patool/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		app-arch/arj
-		app-arch/bzip2
-		app-arch/bzip3
-		app-arch/cabextract
-		app-alternatives/cpio
-		app-arch/dpkg
-		app-arch/gzip
-		app-arch/lbzip2
-		app-arch/lcab
-		app-arch/lha
-		app-arch/libarchive
-		app-arch/lz4
-		app-arch/lzip
-		app-arch/lzop
-		app-arch/ncompress
-		app-arch/p7zip[rar]
-		app-arch/pbzip2
-		app-arch/pdlzip
-		app-arch/pigz
-		app-arch/plzip
-		app-arch/rpm
-		app-arch/rzip
-		app-arch/sharutils
-		app-arch/tar
-		app-arch/unace
-		app-arch/unadf
-		app-arch/unzip
-		app-arch/xdms
-		app-arch/xz-utils
-		app-arch/zip
-		app-arch/zopfli
-		app-arch/zpaq
-		app-arch/zstd
-		app-cdr/cdrtools
-		dev-libs/chmlib
-		media-libs/flac
-		media-sound/shorten
-		sys-apps/diffutils
-		sys-apps/file
-		sys-apps/grep
-		!elibc_musl? ( app-arch/rar )
-		!x86? (
-			app-arch/clzip
-			app-arch/lrzip
-			app-arch/unar
-		)
-	)
-"
-# Test dependencies which are packaged but can't be tested for various reasons.
-# app-arch/arc
-# app-arch/zoo
-# media-sound/mac
-
-# app-arch/rar is masked on musl
-# app-arch/clzip is unkeyworded on x86
-# app-arch/lrzip bug #916317 on x86
-# app-arch/unar is unkeyworded on x86
-
-# Unpackaged testable dependencies
-# archmage
-# genisoimage
-# lhasa
-# nomarch
-# pdzip2
-# py_{bz2,echo,gzip,tarfile,zipfile}
-# rpm2cpio
-# rzip
-# star
-# unalz
-# uncompress.real
-# 7zz ( app-arch/7zip:guru )
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	newdoc doc/README.txt README.md
-	doman doc/patool.1
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# zoo emits a non-zero exit status on a possibly false consistency check
-		# Zoo:  WARNING:  Archive header failed consistency check.
-		"tests/archives/test_zoo.py"
-		# Doesn't accept long arguments, such as those that files in ${S} would have.
-		# Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo
-		"tests/archives/test_arc.py"
-		# Error: 1002 (invalid input file)
-		"tests/archives/test_mac.py"
-	)
-
-	if use elibc_musl; then
-		EPYTEST_IGNORE+=(
-			"tests/archives/test_rar.py"
-		)
-	fi
-
-	if use x86; then
-		EPYTEST_IGNORE+=(
-			"tests/archives/test_clzip.py"
-			# bug #916317
-			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
-		)
-	fi
-
-	epytest
-}
diff --git a/app-arch/patool/patool-2.3.0.ebuild b/app-arch/patool/patool-2.3.0.ebuild
index 9fcc78d0b714..4b7faf77c031 100644
--- a/app-arch/patool/patool-2.3.0.ebuild
+++ b/app-arch/patool/patool-2.3.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wummel.github.io/patool/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/app-arch/patool/patool-2.4.0.ebuild b/app-arch/patool/patool-2.4.0.ebuild
new file mode 100644
index 000000000000..9fcc78d0b714
--- /dev/null
+++ b/app-arch/patool/patool-2.4.0.ebuild
@@ -0,0 +1,128 @@
+# 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="Portable archive file manager"
+HOMEPAGE="https://wummel.github.io/patool/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-arch/arj
+		app-arch/bzip2
+		app-arch/bzip3
+		app-arch/cabextract
+		app-alternatives/cpio
+		app-arch/dpkg
+		app-arch/gzip
+		app-arch/lbzip2
+		app-arch/lcab
+		app-arch/lha
+		app-arch/libarchive
+		app-arch/lz4
+		app-arch/lzip
+		app-arch/lzop
+		app-arch/ncompress
+		app-arch/p7zip[rar]
+		app-arch/pbzip2
+		app-arch/pdlzip
+		app-arch/pigz
+		app-arch/plzip
+		app-arch/rpm
+		app-arch/rzip
+		app-arch/sharutils
+		app-arch/tar
+		app-arch/unace
+		app-arch/unadf
+		app-arch/unzip
+		app-arch/xdms
+		app-arch/xz-utils
+		app-arch/zip
+		app-arch/zopfli
+		app-arch/zpaq
+		app-arch/zstd
+		app-cdr/cdrtools
+		dev-libs/chmlib
+		media-libs/flac
+		media-sound/shorten
+		sys-apps/diffutils
+		sys-apps/file
+		sys-apps/grep
+		!elibc_musl? ( app-arch/rar )
+		!x86? (
+			app-arch/clzip
+			app-arch/lrzip
+			app-arch/unar
+		)
+	)
+"
+# Test dependencies which are packaged but can't be tested for various reasons.
+# app-arch/arc
+# app-arch/zoo
+# media-sound/mac
+
+# app-arch/rar is masked on musl
+# app-arch/clzip is unkeyworded on x86
+# app-arch/lrzip bug #916317 on x86
+# app-arch/unar is unkeyworded on x86
+
+# Unpackaged testable dependencies
+# archmage
+# genisoimage
+# lhasa
+# nomarch
+# pdzip2
+# py_{bz2,echo,gzip,tarfile,zipfile}
+# rpm2cpio
+# rzip
+# star
+# unalz
+# uncompress.real
+# 7zz ( app-arch/7zip:guru )
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	einstalldocs
+	doman doc/patool.1
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# zoo emits a non-zero exit status on a possibly false consistency check
+		# Zoo:  WARNING:  Archive header failed consistency check.
+		"tests/archives/test_zoo.py"
+		# Doesn't accept long arguments, such as those that files in ${S} would have.
+		# Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo
+		"tests/archives/test_arc.py"
+		# Error: 1002 (invalid input file)
+		"tests/archives/test_mac.py"
+	)
+
+	if use elibc_musl; then
+		EPYTEST_IGNORE+=(
+			"tests/archives/test_rar.py"
+		)
+	fi
+
+	if use x86; then
+		EPYTEST_IGNORE+=(
+			"tests/archives/test_clzip.py"
+			# bug #916317
+			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
+		)
+	fi
+
+	epytest
+}
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 99b8f0e2dd90..3b7ac2729277 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -5,10 +5,10 @@ DIST upx-4.1.0-i386_linux.tar.xz 620220 BLAKE2B db56d61ae8abe1e0a776f994bcd855f9
 DIST upx-4.1.0-mipsel_linux.tar.xz 678296 BLAKE2B 6c7601405b66c25ea7d5a902d137a737ea9f88c92ab152cd322db03fff2f4166802d41321aedac33ef31f903362ef7f6896998916a417a97a5fd539250fb1914 SHA512 23c0fc515bfd1cad35ad1241ecedfc938b8061e63311abeee3eb0c01f9dc502ce9d4be68e0f19354893b0936c1bd9e6795e40c458255e18df63edf0f42424157
 DIST upx-4.1.0-powerpc64le_linux.tar.xz 674196 BLAKE2B cf6dfeea30f5054d8c9f69d88b8ff8c3d6f5e50e0ceab8fef8b51b403b96e571f2d73411d214743baedd7c12711047e0595349ca466373871a433035ca6cde30 SHA512 0f19ea1e04e7e226d2cd864e556170c7324f15bd3163458be1316ff9366b670eafe8a2d781220308efdb930941cb841a9a33702db7df61fec4b0521835a54bc7
 DIST upx-4.1.0-powerpc_linux.tar.xz 675776 BLAKE2B 1ba5df26208c5781c33b18b7a1036a83bd9409a49fb30e54c64f04f16ec7a99bb83bbbc89dfdd9aff42acc866976803cc81706d077cab8275887999462ed44d0 SHA512 91584f0b3d257bc4b29631bf45313f9d226cd53e8629b0655bbb7d2b4c7a5450cfbf2b52c108bb7c727a17ffdb4afcb4baa9cb029c30dae057bf2d717d8ffea6
-DIST upx-4.2.3-amd64_linux.tar.xz 589416 BLAKE2B 88eb4f85477c589e7682b13faee4f9df8cb2021782e88cdde7f82c49dd77cfede269bef8f476e994749fcbadae459de8192a38aa0e17928a33156c54c032f8ae SHA512 0ec084ba2049cd283e5a14124bc130b69b55d1cafb19bb342516cf0a45ace4f247a0f11aaf0c302224998372222853768fcd8a50fd1c7828cdf9f1b0edfd47f9
-DIST upx-4.2.3-arm64_linux.tar.xz 600184 BLAKE2B 7d80b0eba5cef383af1cf8b31b22cd7e51002292f250f84313609338a2878b5a88c9caea8e8df4936bbd00ffc326b806e6dff897651f2219305e7abb56702a15 SHA512 1c7ac30057b564a9ae5ee4835f0662b203e1915931d82dad9369dd4d80565959f32afff07898b7a59630ec883cb215b6f41356abf35e5b400dde7ab4e9f88541
-DIST upx-4.2.3-armeb_linux.tar.xz 601892 BLAKE2B 5770139392ca379be96a7181420557d964ece2766e0dad0a315d0629b3e49b543cc8fbb3387e17cc92d26fdad65ff628341ef53e256c8ae910a744409d47d492 SHA512 bed641247a73b78cddb22940655691f60d87d7bcf3050d5ad14b3abc569c83f824433697a6790e3dd5fe029d6df2aad6878da13bb6fc8979d8a5e224d04a5504
-DIST upx-4.2.3-i386_linux.tar.xz 640800 BLAKE2B 995b9814ac25acbb10559f1b7594352cf80c104b554f0033391b7972b741cf35eed89cba6208f09298e08b861f4be17f567151793e504a7b8310da663faf7670 SHA512 bba0ca8f8438e01259ed2a3a30127777ea7cce3674b03eb5d7a96c32ed0028d3b06ab199973644d70e09aa405dec303434b4e318d99e1aa8d9db1c12c1deeb81
-DIST upx-4.2.3-mipsel_linux.tar.xz 684724 BLAKE2B e540b8b0ee7365a8b64ace9370f4f8c182995218eb1b4230ae094baddb75178e7eab06bd693f663c5e1f38f96ce66aa036f6792fcc6cedd9c8554a85b23a9027 SHA512 70e5fd35d36a6118afe10594ec17076ea0f4ba954edf7a15dd91a7dad1ca3ee9ed717fd31865fcd5611cb551d4f53b946daa14ce84d7a33f74b4d3ee85f7512b
-DIST upx-4.2.3-powerpc64le_linux.tar.xz 673892 BLAKE2B cb48edf50219d1abe2524661dae7f0d3e5adbcf84db5d913c13a392b0ce6dc9d6c3c5589a2898d1d192d596ade52aa32d612849de21edba46eb807e2d01b76c0 SHA512 016ef2ed437bedd8c3c7d26be268d5a183a32b0290968bbf84318d32d0bc7187171d14d2be717c18b00bdefcfd4d068257780d1fd34dbcd300c9d4f759f05e34
-DIST upx-4.2.3-powerpc_linux.tar.xz 677584 BLAKE2B cb3a835fccf7e233e7dc8bbd4bee226901bbd8c82c5210199ce713cab1c03fa2ab6ada5825f7052d01688db571e1466acee963b4e09787cc65ec07791981f33c SHA512 deb0a6f088a62642142b02f2fc73790dc7c5b60cf6189fe9cde2aa259b9ec777ac5007c9168c4e5d71beb24d268d18b04c4c3e326a693edcb80d487dc3915145
+DIST upx-4.2.4-amd64_linux.tar.xz 590272 BLAKE2B cbf0353ff2bc67739b6246e7c4be80bafecc538fcc5ce0b18bccc72da98fd3148ef38473b1511c429ca91cf6e563b6507b76321b7f7b4781e9aca77db110e187 SHA512 7d4e465d578bdb06395d797d863aa85dea8f694cc80a0b0f99e1f3cba6670643a2a2769ae01f966f07106f6b919edad949bd96696a2ccf19c6904aa480dfac97
+DIST upx-4.2.4-arm64_linux.tar.xz 600608 BLAKE2B ce0fb227c7c1ebdc4ad4978fcbd7fda84d7dddd9f6cf6c423120a6e46e776b9b526913e27dca8316f80dc821a45c7bbcd11e38bbe205eb6330ff850789125e13 SHA512 5db4feb7589d1782fcfad6fda94b267343d359493bf70fa0b27d70c186835150a31226d659dd2353fc3f80423c6fb69aa6cbed2d4a69fc3a2947f129824173ec
+DIST upx-4.2.4-armeb_linux.tar.xz 602328 BLAKE2B 0f8ec01fadcecc458a448c5267f26d1c4d9130443e5b536ea39b0e013a06badab9594d7a8af6729159986e6c48ca0ed4fe52661bf8f076d09f95ab6449f54244 SHA512 25d6347f6d3747fa299c27689311a2a2e0f1e1c5cac6be8b43ff1dbbff23c2392095c9a5b4976ff25af093cf6431cebda5ee537bc0403819395b60b56a8fe06a
+DIST upx-4.2.4-i386_linux.tar.xz 640892 BLAKE2B ab333e1e99e43d7ec67ecbed1674e88565884e6f68e1a11b4245851c151b76251f43cfeb00a278196ca9316ccefa2808b0b62c9a121b42a6e59109a7c923b3c5 SHA512 9488193c0b9fabfc1df73c08387d07fb8507a94e275d4d757a42423a6892cb0023726a0258128f1b0816837eac7b24f049a9b48e37dc525e3c41a784243f90ed
+DIST upx-4.2.4-mipsel_linux.tar.xz 685744 BLAKE2B 51b3c0f0b8bed9a2b0bfa4b2c9b2116aa735efd681101cb2f264ad3668ff049298bd61808976ea0f4cc48146118a8a3937519c0a458258bc6294940a398fe2dd SHA512 c84dd38c0e2cd0c926d2365de0264e57ac1c3ec4f1b4cc47b8501e1a9324642fe6f4e461bd220ceab99be6a01a154af3c2dc5fd07a2b47bc31ce55d9f3a9b78b
+DIST upx-4.2.4-powerpc64le_linux.tar.xz 674812 BLAKE2B 01eb19065df2b44416ab937f2ef9c94ffbabd04f2ecfd2635165088ef10cf291e6b088e387a3b5ecc13a1d70ad4a4547c0139e38448ec01abcbdc8961402b405 SHA512 4a6efd4524c14a91cd9d1c02b5f046aeb02902b573b52454dfe2e6fc481799185e91d0527caffb1502fba887aa779c9e907ec2f1af1c8278929ae23954dd3901
+DIST upx-4.2.4-powerpc_linux.tar.xz 678212 BLAKE2B 007aa006dd8e2fa98c8e24d5846acba5086df1a983ef22a33626140906d4e67153e02181ef65ae078de0c03fa3c1bbdc0283ac2bcd319d6e82bf1256c482ac7e SHA512 eca87a6c270c60e749ae0b0e2c677c764ed2c87cfc4188512f03714aa6d8aef2ef4f72fdc1c881528853ef572f901cb1e6b48224ff6e475977372ccd28bc3d67
diff --git a/app-arch/upx-bin/upx-bin-4.2.3.ebuild b/app-arch/upx-bin/upx-bin-4.2.4.ebuild
index 98a09baa5225..98a09baa5225 100644
--- a/app-arch/upx-bin/upx-bin-4.2.3.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.2.4.ebuild
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 58606ce802e6..304b78eeae25 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,2 +1,2 @@
 DIST upx-4.1.0-src.tar.xz 1267708 BLAKE2B ef7884028a97b1d7e542fc27756b705582786a22d193b1eef40d0db16580958baddc3baa44429b5ba2c0f7b5d4d0f4f79fdeb777af016b962b07c7639a319090 SHA512 de8306e833198d7f470c050b05c6111a50ea94f2e757c1006433742871ccd93fd7412f942cd776e9eac6c91e379545d72f070f3fe928e75e5d5092b766474f8c
-DIST upx-4.2.3-src.tar.xz 1283824 BLAKE2B 2b53bf68196c35c05eb930760ad20446fbcde9b15e1e9261e2eb7553dc1c8ede48db952cd7c5bc6de5861ac98f9f62bb1d348806731fea7dad1e532fc7e1e636 SHA512 b9ebda5d3372132bb861e0dd035829b16e4c06900f68af182895f17975493707d78cbabc63060e581de1ce149bb5129d883f6e6abcde0413c0bf474db919f5fd
+DIST upx-4.2.4-src.tar.xz 1284804 BLAKE2B 510155b7c44fe71ecbee6479e41f61e849cd1575a74499076099f8fe4dae4cc11bb75151bbcac605762c61a4ef586a20c8db2674eafbd8cef12a511c44ff287b SHA512 fc833dea010cb65a9a7b6fbf80021c98d8c112b55fa54101f3d39f09d049d75d89024206a28262996c08f253130917811736f7f546fa8743703bc86a2dbd33a5
diff --git a/app-arch/upx/upx-4.2.3.ebuild b/app-arch/upx/upx-4.2.4.ebuild
index b8b1c533287c..b8b1c533287c 100644
--- a/app-arch/upx/upx-4.2.3.ebuild
+++ b/app-arch/upx/upx-4.2.4.ebuild
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index f36c7aa4dd3c..27bd111626c6 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,3 +1 @@
-DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
-DIST wimlib-1.14.1.tar.gz 1046078 BLAKE2B 56e44928229c9c4fda662fa64fc4021bd361c2c959f0786764b84fa4cc9d7f7b0d5440edb4d4079657cc7bf450ac9c755f554c7da7a8b2b7e96d69ddbeb4f22f SHA512 9f92a8ce2d386918d66a1a3e52d4fbffeeb9f8b9345b25012fd0bd07039a00be84fd83d83a9bb25bcefab09597a81e9392522be835dd6693dd00050f8624af00
 DIST wimlib-1.14.4.tar.gz 1045888 BLAKE2B fa3d8568e777783034d426ff97d542e9db9679486e282667b6f44137a00c658697c0cff2ff065b86e782e9720f36ed050f75bd60aea9ae0bedf71355997b6b27 SHA512 f3c25ee14fe849f452f004ce8137ef040410ea048555ae71180086f010858b6ed593c8881b805bac65f9ee878bf11661a7f17677c6c24e2c77149c35ee0cd853
diff --git a/app-arch/wimlib/wimlib-1.13.4-r1.ebuild b/app-arch/wimlib/wimlib-1.13.4-r1.ebuild
deleted file mode 100644
index 13d1b0f2922b..000000000000
--- a/app-arch/wimlib/wimlib-1.13.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pax-utils
-
-DESCRIPTION="The open source Windows Imaging (WIM) library"
-HOMEPAGE="https://wimlib.net"
-SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	cpu_flags_x86_ssse3? (
-		yasm? ( dev-lang/yasm )
-		!yasm? ( dev-lang/nasm )
-	)
-"
-RDEPEND="
-	dev-libs/libxml2:2
-	fuse? ( sys-fs/fuse:0 )
-	iso? (
-		app-arch/cabextract
-		app-cdr/cdrtools
-	)
-	ntfs? ( sys-fs/ntfs3g:= )
-	ssl? ( dev-libs/openssl:= )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ntfs ntfs-3g)
-		$(use_with fuse)
-		$(use_with ssl libcrypto)
-		$(use_enable threads multithreaded-compression)
-		$(use_enable test test-support)
-		--disable-static
-	)
-
-	if use cpu_flags_x86_ssse3; then
-		if ! use ssl; then
-			myeconfargs+=( --enable-ssse3-sha1 )
-		else
-			elog "cpu_flags_x86_ssse3 and ssl can't be enabled together, "
-			elog "enabling ssl and disabling cpu_flags_x86_ssse3 for you."
-			myeconfargs+=( --disable-ssse3-sha1 )
-		fi
-	fi
-
-	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
-		econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	pax-mark m "${S}"/.libs/wimlib-imagex
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/wimlib/wimlib-1.14.1.ebuild b/app-arch/wimlib/wimlib-1.14.1.ebuild
deleted file mode 100644
index 14ba614885b5..000000000000
--- a/app-arch/wimlib/wimlib-1.14.1.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
-
-inherit autotools pax-utils
-
-DESCRIPTION="The open source Windows Imaging (WIM) library"
-HOMEPAGE="https://wimlib.net"
-SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3+ LGPL-3+ ) MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="fuse iso ntfs test yasm"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:3 )
-	iso? (
-		app-arch/cabextract
-		app-cdr/cdrtools
-	)
-	ntfs? ( sys-fs/ntfs3g:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ntfs ntfs-3g)
-		$(use_with fuse)
-		$(use_enable test test-support)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	pax-mark m "${S}"/.libs/wimlib-imagex
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/wimlib/wimlib-1.14.4.ebuild b/app-arch/wimlib/wimlib-1.14.4.ebuild
index a1cfeeaa73b3..f5594c125796 100644
--- a/app-arch/wimlib/wimlib-1.14.4.ebuild
+++ b/app-arch/wimlib/wimlib-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3+ LGPL-3+ ) MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="fuse iso ntfs test yasm"
 RESTRICT="!test? ( test )"
 
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 5a183208a2a7..86173507645f 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,6 +1,6 @@
 DIST bareos-21.1.10.tar.gz 11671111 BLAKE2B 047901ee6de2f2ba086d7c0406b623d36514177dace7a9de324cc747a9587a80f4a88a033a5c0685998986b96c4d87779ed81950ecba5bf4b21078c8b031d1fd SHA512 8cccbf46d1149f5ea9820bfa15369777a29b41f2d15eb35a500a8637898c0ca374504bcced41962f345058f78e4d79bfcd94f47e4d5598a95e04a6911978843b
-DIST bareos-21.1.9.tar.gz 11670286 BLAKE2B 22486fdf2b80296fed4265afa8ea4f5c0708f7836172da6a0f081c3328eea84c2eaf7de62884c82aeb61ead38f5a872edc6718fce730c16d6e4e96ef520eff0e SHA512 337702bf5b38bdf6f96720748ec0ab154f698389d6ff535b59f0a9432783f021287b98ac446467a1da51614c6fd740b45b8a5363f56cb5bd855bfe333fc6cfac
-DIST bareos-22.1.4.tar.gz 14747141 BLAKE2B 1b155c35f22120b07151a54ef314c6f8f42ea14c3f194d787a58ece41f8de148f0b34d0cc6a54f578b1bb5c4d3ae2a7736829f6d2cd642d8e001f1797a18052a SHA512 4285f0f524c6f30ae8f7dd67e2a732cf983663f56b053968a7f10d753e38bc2ee1e2673d1fb6a9b516994b51b45215fac153e301b893c9cb31a164ebff0d4c85
+DIST bareos-21.1.11.tar.gz 11669843 BLAKE2B 17dfb0b667e6d5e932ff464ecc9f6f5fdf23c694e71fe81848aca38629095b44a8ebee6ad117dd5090e803d3a8a0f6ea9dff47d7760b90a65e11a92b705523e9 SHA512 34ca24352529639b9608fa1bd68bc593b52d9f03d3f6e95ab7be67983bc28fc5a1807a94ea7cc23b4119dfb27ad2c38aedb2899a425edf62afb89884bb8fe644
 DIST bareos-22.1.5.tar.gz 14747894 BLAKE2B 560bc1ceb34fccfb370e8643d24917e24b2440158dd267532c2cb7e4a543d29b81b033e7a34c46eda4c6d71165e48da9332605c3bcd073fbafa38f3ba8be69a2 SHA512 8138f2142f705e2448f8bc2e00f39fe4f734ce8fe687e3cf00c9ff9bda9a3df73ebd7fb86d850ba755588cdaca324e1ba9034987ecb975ce47dd279395ee03b4
-DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
+DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
 DIST bareos-23.0.3.tar.gz 14744648 BLAKE2B be31a4284ff2ff97ace51f895637cfafac666d4e9d95524e5e03d22798427ff551419422fb41783d3fda7288a0cd982c8dde751a15428346c61e3fa64bfa80c0 SHA512 42ede6976c894f89836ae272598edce8b3dadbdceb3b429724ea4c01a980470c161f03e54b58b17bd3fa3a7f750b4a79e5f96070fee5aae4b4fe73e79b2d8b61
+DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
diff --git a/app-backup/bareos/bareos-21.1.11.ebuild b/app-backup/bareos/bareos-21.1.11.ebuild
new file mode 100644
index 000000000000..41839361e109
--- /dev/null
+++ b/app-backup/bareos/bareos-21.1.11.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-Release-${PV}
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto split-usr
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#	mirror
+#	!test? ( test )
+#"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads(+)]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		dev-cpp/gtest
+		dev-db/postgresql:*[server,threads(+)]
+		dev-db/mariadb:*[server]
+	)
+"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_test() {
+	# initialze catalog test database
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createuser -h "${T}" bareos || die
+	createdb -h "${T}" --owner bareos bareos || die
+	export PGHOST="${T}"
+
+	# initiale mariadb database for backup tests
+	# $USER must be set and != root
+	export USER=portage
+
+	default
+	cmake_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+	rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+	# fix gentoo platform support
+	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+	eapply "${FILESDIR}/${PN}-21.1.8-gcc14-fixes.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	cmake_comment_add_subdirectory webui
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# remove duplicate binaries being installed in /usr/sbin and replace
+	# them by symlinks to not break systems that still use split-usr
+	if use split-usr; then
+		for f in bwild bregex bsmtp bconsole; do
+			rm -f "${D}/usr/sbin/$f" || die
+			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+		done
+	fi
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# install init script and config
+		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
+		newconfd "${FILESDIR}/${script}-21".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	# set log directory ownership
+	if ! use clientonly; then
+		diropts -m0755 -o bareos -g bareos
+	fi
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
+		einfo
+		einfo "or run"
+		einfo
+		einfo " emerge --config app-backup/bareos"
+		einfo
+		einfo "to do this"
+	fi
+}
+
+pkg_config() {
+	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
+	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
+	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
+}
diff --git a/app-backup/bareos/bareos-21.1.9.ebuild b/app-backup/bareos/bareos-21.1.9.ebuild
deleted file mode 100644
index ae6b1efd9be1..000000000000
--- a/app-backup/bareos/bareos-21.1.9.ebuild
+++ /dev/null
@@ -1,414 +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} )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake tmpfiles
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-
-# some tests still fail propably due to missing bits in src_test -> TODO
-RESTRICT="mirror test"
-#RESTRICT="
-#	mirror
-#	!test? ( test )
-#"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
-	logwatch ndmp readline scsi-crypto split-usr
-	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		dev-db/postgresql:*[threads(+)]
-		director? (
-			virtual/mta
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	ndmp? ( net-libs/rpcsvc-proto )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		dev-libs/jansson:=[static-libs]
-		dev-libs/lzo[static-libs]
-		dev-libs/openssl:0=[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/jansson:=
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		dev-cpp/gtest
-		dev-db/postgresql:*[server,threads(+)]
-		dev-db/mariadb:*[server]
-	)
-"
-
-REQUIRED_USE="
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-pkg_pretend() {
-	local active_removed_backend=""
-	if has_version "<app-backup/bareos-21[director,mysql]"; then
-		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
-			active_removed_backend=MySQL
-		fi
-	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
-		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
-			active_removed_backend=SQLite
-		fi
-	fi
-	if [[ -n $active_removed_backend ]]; then
-		ewarn
-		ewarn "You are currently using bareos with the $active_removed_backend"
-		ewarn "catalog backend."
-		ewarn
-		ewarn "THIS IS NOT SUPPORTED ANYMORE"
-		ewarn
-		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
-		ewarn "MySQL and SQLite catalog backends."
-		ewarn
-		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
-		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
-		ewarn "installation first."
-		ewarn
-		die "current catalog backend not supported anymore"
-	fi
-}
-
-src_test() {
-	# initialze catalog test database
-	initdb -D "${T}"/pgsql || die
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createuser -h "${T}" bareos || die
-	createdb -h "${T}" --owner bareos bareos || die
-	export PGHOST="${T}"
-
-	# initiale mariadb database for backup tests
-	# $USER must be set and != root
-	export USER=portage
-
-	default
-	cmake_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-	rm -rvf "${T}"/pgsql
-}
-
-src_prepare() {
-	# fix gentoo platform support
-	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
-	eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-	eapply "${FILESDIR}/${PN}-21.1.8-gcc14-fixes.patch"
-
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	cmake_comment_add_subdirectory webui
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=no
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		# disable droplet support for now as it does not build with gcc 10
-		# ... and this is a bundled lib, which should have its own package
-		cd core && cmake_comment_add_subdirectory "src/droplet"
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# remove misc stuff we do not need in production
-	rm -f "${D}"/etc/bareos/bareos-regress.conf
-	rm -f "${D}"/etc/logrotate.d/bareos-dir
-
-	# remove duplicate binaries being installed in /usr/sbin and replace
-	# them by symlinks to not break systems that still use split-usr
-	if use split-usr; then
-		for f in bwild bregex bsmtp bconsole; do
-			rm -f "${D}/usr/sbin/$f" || die
-			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
-		done
-	fi
-
-	# get rid of py2 stuff
-	rm -rf "$D"/usr/lib64/python2.7 || die
-	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
-	if ! use vmware; then
-		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
-	fi
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# install init script and config
-		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
-		newconfd "${FILESDIR}/${script}-21".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	# set log directory ownership
-	if ! use clientonly; then
-		diropts -m0755 -o bareos -g bareos
-	fi
-	keepdir /var/log/bareos
-
-	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	tmpfiles_process bareos.conf
-
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		einfo
-		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
-		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
-		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
-		einfo
-		einfo "or run"
-		einfo
-		einfo " emerge --config app-backup/bareos"
-		einfo
-		einfo "to do this"
-	fi
-}
-
-pkg_config() {
-	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
-	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
-	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
-}
diff --git a/app-backup/bareos/bareos-22.1.4.ebuild b/app-backup/bareos/bareos-22.1.4.ebuild
deleted file mode 100644
index d0de880031c4..000000000000
--- a/app-backup/bareos/bareos-22.1.4.ebuild
+++ /dev/null
@@ -1,434 +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} )
-CMAKE_WARN_UNUSED_CLI=no
-
-inherit python-any-r1 systemd cmake tmpfiles
-
-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/Release/${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${PN}-Release-${PV}
-fi
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-
-# some tests still fail propably due to missing bits in src_test -> TODO
-RESTRICT="mirror test"
-#RESTRICT="
-#	mirror
-#	!test? ( test )
-#"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
-	logwatch ndmp readline scsi-crypto split-usr
-	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		dev-db/postgresql:*[threads(+)]
-		director? (
-			virtual/mta
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	ndmp? ( net-libs/rpcsvc-proto )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		dev-libs/jansson:=[static-libs]
-		dev-libs/lzo[static-libs]
-		dev-libs/openssl:0=[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/jansson:=
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	X? (
-		dev-qt/qtwidgets:5=
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		dev-cpp/gtest
-		dev-db/postgresql:*[server,threads(+)]
-		dev-db/mariadb:*[server]
-	)
-"
-
-REQUIRED_USE="
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-PATCHES=(
-	# fix gentoo platform support
-	"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-	"${FILESDIR}/${PN}-22.0.2-werror.patch"
-	"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-)
-
-pkg_pretend() {
-	local active_removed_backend=""
-	if has_version "<app-backup/bareos-21[director,mysql]"; then
-		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
-			active_removed_backend=MySQL
-		fi
-	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
-		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
-			active_removed_backend=SQLite
-		fi
-	fi
-	if [[ -n $active_removed_backend ]]; then
-		ewarn
-		ewarn "You are currently using bareos with the $active_removed_backend"
-		ewarn "catalog backend."
-		ewarn
-		ewarn "THIS IS NOT SUPPORTED ANYMORE"
-		ewarn
-		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
-		ewarn "MySQL and SQLite catalog backends."
-		ewarn
-		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
-		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
-		ewarn "installation first."
-		ewarn
-		die "current catalog backend not supported anymore"
-	fi
-}
-
-src_test() {
-	# initialze catalog test database
-	initdb -D "${T}"/pgsql || die
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createuser -h "${T}" bareos || die
-	createdb -h "${T}" --owner bareos bareos || die
-	export PGHOST="${T}"
-
-	# initiale mariadb database for backup tests
-	# $USER must be set and != root
-	export USER=portage
-
-	default
-	cmake_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-	rm -rvf "${T}"/pgsql
-}
-
-src_prepare() {
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	cmake_comment_add_subdirectory webui
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-	if use X; then
-		mycmakeargs+=( -Dtraymonitor=yes )
-	fi
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=no
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		# disable droplet support for now as it does not build with gcc 10
-		# ... and this is a bundled lib, which should have its own package
-		cd core && cmake_comment_add_subdirectory "src/droplet"
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# remove misc stuff we do not need in production
-	rm -f "${D}"/etc/bareos/bareos-regress.conf
-	rm -f "${D}"/etc/logrotate.d/bareos-dir
-
-	# remove duplicate binaries being installed in /usr/sbin and replace
-	# them by symlinks to not break systems that still use split-usr
-	if use split-usr; then
-		for f in bwild bregex bsmtp bconsole; do
-			rm -f "${D}/usr/sbin/$f" || die
-			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
-		done
-	fi
-
-	# get rid of py2 stuff
-	rm -rf "$D"/usr/lib64/python2.7 || die
-	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
-	if ! use vmware; then
-		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
-	fi
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# install init script and config
-		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
-		newconfd "${FILESDIR}/${script}-21".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	# set log directory ownership
-	if ! use clientonly; then
-		diropts -m0755 -o bareos -g bareos
-	fi
-	keepdir /var/log/bareos
-
-	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	tmpfiles_process bareos.conf
-
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		einfo
-		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
-		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
-		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
-		einfo
-		einfo "or run"
-		einfo
-		einfo " emerge --config app-backup/bareos"
-		einfo
-		einfo "to do this"
-		einfo
-		einfo "For major upgrades you may need to run:"
-		einfo
-		einfo "  su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
-		einfo
-		einfo "Please see release notes for details."
-		einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
-		einfo
-	fi
-}
-
-pkg_config() {
-	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
-	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
-	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
-}
diff --git a/app-backup/bareos/bareos-22.1.6.ebuild b/app-backup/bareos/bareos-22.1.6.ebuild
new file mode 100644
index 000000000000..2fd5f5097e09
--- /dev/null
+++ b/app-backup/bareos/bareos-22.1.6.ebuild
@@ -0,0 +1,434 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+CMAKE_WARN_UNUSED_CLI=no
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+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/Release/${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto split-usr
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#	mirror
+#	!test? ( test )
+#"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads(+)]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	X? (
+		dev-qt/qtwidgets:5=
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		dev-cpp/gtest
+		dev-db/postgresql:*[server,threads(+)]
+		dev-db/mariadb:*[server]
+	)
+"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+PATCHES=(
+	# fix gentoo platform support
+	"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	"${FILESDIR}/${PN}-22.0.2-werror.patch"
+	"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+)
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_test() {
+	# initialze catalog test database
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createuser -h "${T}" bareos || die
+	createdb -h "${T}" --owner bareos bareos || die
+	export PGHOST="${T}"
+
+	# initiale mariadb database for backup tests
+	# $USER must be set and != root
+	export USER=portage
+
+	default
+	cmake_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+	rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	cmake_comment_add_subdirectory webui
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+	if use X; then
+		mycmakeargs+=( -Dtraymonitor=yes )
+	fi
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# remove duplicate binaries being installed in /usr/sbin and replace
+	# them by symlinks to not break systems that still use split-usr
+	if use split-usr; then
+		for f in bwild bregex bsmtp bconsole; do
+			rm -f "${D}/usr/sbin/$f" || die
+			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+		done
+	fi
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# install init script and config
+		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
+		newconfd "${FILESDIR}/${script}-21".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	# set log directory ownership
+	if ! use clientonly; then
+		diropts -m0755 -o bareos -g bareos
+	fi
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
+		einfo
+		einfo "or run"
+		einfo
+		einfo " emerge --config app-backup/bareos"
+		einfo
+		einfo "to do this"
+		einfo
+		einfo "For major upgrades you may need to run:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
+		einfo
+		einfo "Please see release notes for details."
+		einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
+		einfo
+	fi
+}
+
+pkg_config() {
+	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
+	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
+	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
+}
diff --git a/app-backup/bareos/bareos-23.0.2.ebuild b/app-backup/bareos/bareos-23.0.2.ebuild
deleted file mode 100644
index f88f46187fe6..000000000000
--- a/app-backup/bareos/bareos-23.0.2.ebuild
+++ /dev/null
@@ -1,435 +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} )
-CMAKE_WARN_UNUSED_CLI=no
-
-inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
-
-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/Release/${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${PN}-Release-${PV}
-fi
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-
-# some tests still fail propably due to missing bits in src_test -> TODO
-RESTRICT="mirror test"
-#RESTRICT="
-#	mirror
-#	!test? ( test )
-#"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
-	logwatch ndmp readline scsi-crypto split-usr
-	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		dev-db/postgresql:*[threads(+)]
-		director? (
-			virtual/mta
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	ndmp? ( net-libs/rpcsvc-proto )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		dev-libs/jansson:=[static-libs]
-		dev-libs/lzo[static-libs]
-		dev-libs/openssl:0=[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/jansson:=
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	X? (
-		dev-qt/qtwidgets:5=
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		dev-cpp/gtest
-		dev-db/postgresql:*[server,threads(+)]
-		dev-db/mariadb:*[server]
-	)
-"
-
-REQUIRED_USE="
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-	"${FILESDIR}/${PN}-22.0.2-werror.patch"
-	"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-)
-
-pkg_pretend() {
-	local active_removed_backend=""
-	if has_version "<app-backup/bareos-21[director,mysql]"; then
-		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
-			active_removed_backend=MySQL
-		fi
-	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
-		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
-			active_removed_backend=SQLite
-		fi
-	fi
-	if [[ -n $active_removed_backend ]]; then
-		ewarn
-		ewarn "You are currently using bareos with the $active_removed_backend"
-		ewarn "catalog backend."
-		ewarn
-		ewarn "THIS IS NOT SUPPORTED ANYMORE"
-		ewarn
-		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
-		ewarn "MySQL and SQLite catalog backends."
-		ewarn
-		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
-		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
-		ewarn "installation first."
-		ewarn
-		die "current catalog backend not supported anymore"
-	fi
-}
-
-src_test() {
-	# initialze catalog test database
-	initdb -D "${T}"/pgsql || die
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createuser -h "${T}" bareos || die
-	createdb -h "${T}" --owner bareos bareos || die
-	export PGHOST="${T}"
-
-	# initiale mariadb database for backup tests
-	# $USER must be set and != root
-	export USER=portage
-
-	default
-	cmake_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-	rm -rvf "${T}"/pgsql
-}
-
-src_prepare() {
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	cmake_comment_add_subdirectory webui
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-	if use X; then
-		mycmakeargs+=( -Dtraymonitor=yes )
-	fi
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=no
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX"
-
-		# disable droplet support for now as it does not build with gcc 10
-		# ... and this is a bundled lib, which should have its own package
-		cd core && cmake_comment_add_subdirectory "src/droplet"
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# remove misc stuff we do not need in production
-	rm -f "${D}"/etc/bareos/bareos-regress.conf
-	rm -f "${D}"/etc/logrotate.d/bareos-dir
-
-	# remove duplicate binaries being installed in /usr/sbin and replace
-	# them by symlinks to not break systems that still use split-usr
-	if use split-usr; then
-		for f in bwild bregex bsmtp bconsole; do
-			rm -f "${D}/usr/sbin/$f" || die
-			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
-		done
-	fi
-
-	# get rid of py2 stuff
-	rm -rf "$D"/usr/lib64/python2.7 || die
-	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
-	if ! use vmware; then
-		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
-	fi
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# install init script and config
-		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
-		newconfd "${FILESDIR}/${script}-21".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	# set log directory ownership
-	if ! use clientonly; then
-		diropts -m0755 -o bareos -g bareos
-	fi
-	keepdir /var/log/bareos
-
-	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	tmpfiles_process bareos.conf
-
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		einfo
-		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
-		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
-		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
-		einfo
-		einfo "or run"
-		einfo
-		einfo " emerge --config app-backup/bareos"
-		einfo
-		einfo "to do this"
-		einfo
-		einfo "For major upgrades you may need to run:"
-		einfo
-		einfo "  su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
-		einfo
-		einfo "Please see release notes for details."
-		einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
-		einfo
-	fi
-}
-
-pkg_config() {
-	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
-	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
-	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
-}
diff --git a/app-backup/bareos/bareos-23.0.4.ebuild b/app-backup/bareos/bareos-23.0.4.ebuild
new file mode 100644
index 000000000000..7764737d6d5a
--- /dev/null
+++ b/app-backup/bareos/bareos-23.0.4.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+CMAKE_WARN_UNUSED_CLI=no
+
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
+
+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/Release/${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto split-usr
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#	mirror
+#	!test? ( test )
+#"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads(+)]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	X? (
+		dev-qt/qtwidgets:5=
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		dev-cpp/gtest
+		dev-db/postgresql:*[server,threads(+)]
+		dev-db/mariadb:*[server]
+	)
+"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	"${FILESDIR}/${PN}-22.0.2-werror.patch"
+	"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+)
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_test() {
+	# initialze catalog test database
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createuser -h "${T}" bareos || die
+	createdb -h "${T}" --owner bareos bareos || die
+	export PGHOST="${T}"
+
+	# initiale mariadb database for backup tests
+	# $USER must be set and != root
+	export USER=portage
+
+	default
+	cmake_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+	rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	cmake_comment_add_subdirectory webui
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+	if use X; then
+		mycmakeargs+=( -Dtraymonitor=yes )
+	fi
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		use cpu_flags_x86_avx && append-flags "-DXXH_X86DISPATCH_ALLOW_AVX"
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# remove duplicate binaries being installed in /usr/sbin and replace
+	# them by symlinks to not break systems that still use split-usr
+	if use split-usr; then
+		for f in bwild bregex bsmtp bconsole; do
+			rm -f "${D}/usr/sbin/$f" || die
+			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+		done
+	fi
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# install init script and config
+		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
+		newconfd "${FILESDIR}/${script}-21".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	# set log directory ownership
+	if ! use clientonly; then
+		diropts -m0755 -o bareos -g bareos
+	fi
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
+		einfo
+		einfo "or run"
+		einfo
+		einfo " emerge --config app-backup/bareos"
+		einfo
+		einfo "to do this"
+		einfo
+		einfo "For major upgrades you may need to run:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
+		einfo
+		einfo "Please see release notes for details."
+		einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
+		einfo
+	fi
+}
+
+pkg_config() {
+	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
+	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
+	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
+}
diff --git a/app-backup/borgbackup/borgbackup-1.4.0.ebuild b/app-backup/borgbackup/borgbackup-1.4.0.ebuild
index 8b663ddc3aab..b8f31efb9d68 100644
--- a/app-backup/borgbackup/borgbackup-1.4.0.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://borgbackup.readthedocs.io/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	app-arch/lz4
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 40352b279987..59a8cdd514c4 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1,3 @@
 DIST borgmatic-1.8.12.tar.gz 602369 BLAKE2B 79589e1510be9065d70b48ac5b8ce83a8d82776040cfe0ec833e7c9cbc33e4d285a2292870e2237902900ebb03204c6aafd702a2729b8860aec234429ec00921 SHA512 9cb91a4e7047da4effff69dfaea2358bd0d0897197d306775a3e9e260a2da6cc183c7675e02885fcd3d853c185171372371638b482b3e8b2f1bfcbcb2a14e4b7
 DIST borgmatic-1.8.13.tar.gz 621942 BLAKE2B abea4779d6b8dc2e7885c4e5ff4e6e4a472ecdba8b248f28b137ab25df5c12ce31e71489485966a0df27c8ff388476049ed8f58fcd53d16d09f01e9fa215ac0e SHA512 0057ba195c493c47ecb4eaaca1987b68c332632ebe5015ac20cd5f59f3f8f8b00a06749d828f003866986b3f70c3794a945577f4f49bf775153aa0f75fdfcf49
+DIST borgmatic-1.8.14.tar.gz 623966 BLAKE2B fd52bc5be4f63e1207a0bedcf654af075082d31af76ddc65ea30a3259f1ec093c826612e114fd9f9fa46668f80eed3b2b6a88262fbb9e4db49c36ba31efa70c5 SHA512 74daecbf02f957b21121dff073c2e114c87b1afdf6b3408b8fc2bf465102425cca60e4bdc8bc8d0e2d0a9c20b1f514eb7c9a2e136e71cb61969e07a38841235a
diff --git a/app-backup/borgmatic/borgmatic-1.8.13.ebuild b/app-backup/borgmatic/borgmatic-1.8.13.ebuild
index de16568a999b..3654974c5dd9 100644
--- a/app-backup/borgmatic/borgmatic-1.8.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.13.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://torsion.org/borgmatic/"
 
 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.8.14.ebuild b/app-backup/borgmatic/borgmatic-1.8.14.ebuild
new file mode 100644
index 000000000000..de16568a999b
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.8.14.ebuild
@@ -0,0 +1,78 @@
+# 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/ccollect/ccollect-0.8-r1.ebuild b/app-backup/ccollect/ccollect-0.8-r1.ebuild
deleted file mode 100644
index 442fc37d3d95..000000000000
--- a/app-backup/ccollect/ccollect-0.8-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync"
-HOMEPAGE="https://www.nico.schottelius.org/software/ccollect/"
-SRC_URI="https://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~sparc x86"
-IUSE="doc examples"
-# tests need ssh-access
-RESTRICT="test"
-
-RDEPEND="net-misc/rsync"
-BDEPEND="
-	doc? (
-		>=app-text/asciidoc-8.1.0
-		app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd:4.2
-		dev-libs/libxslt
-	)"
-
-src_compile() {
-	use doc && emake XSL="${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation
-}
-
-src_install() {
-	dobin ccollect.sh
-	dosym ccollect.sh /usr/bin/ccollect
-
-	local i
-	for i in add_source analyse_logs archive_config check_config \
-	delete_source list_intervals logwrapper stats; do
-		newbin tools/ccollect_${i}.sh ccollect_${i}
-	done
-
-	insinto /usr/share/${PN}/tools
-	doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh
-
-	pushd doc/changes >/dev/null || die
-		for i in * ; do
-			newdoc ${i} NEWS-${i}
-		done
-	popd >/dev/null || die
-
-	if use doc; then
-		doman doc/man/*.1
-
-		find doc/ \( -iname '*.1' -o -iname '*.text' \) -delete || die
-		HTML_DOCS=( doc/{*.htm{,l},man} )
-	fi
-	einstalldocs
-
-	if use examples ; then
-		docinto examples
-		dodoc -r conf/.
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you're upgrading from 0.6.x or less, you'll have to"
-	ewarn "upgrade your existing configuration as follows:"
-	ewarn "1. Make the scripts in ${EROOT}/usr/share/ccollect/scripts executable"
-	ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in ${EROOT}/usr/share/ccollect/scripts"
-	ewarn "   ascending order, where \$VER is greater or equal than the version"
-	ewarn "   you upgraded from."
-	ewarn "Example:"
-	ewarn "  You upgraded from 0.5, thus you have to run:"
-	ewarn "  ${EROOT}/usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh"
-	ewarn "  ${EROOT}/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh"
-
-	elog "Please note that many tools are now installed directly to ${EROOT}/usr/bin"
-	elog "as recommended by upstream."
-}
diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest
index d9c2621faadb..5d909b48d246 100644
--- a/app-backup/kup/Manifest
+++ b/app-backup/kup/Manifest
@@ -1,2 +1 @@
 DIST kup-0.10.0.tar.xz 243176 BLAKE2B 081be05c54d9dcfc4f7a4f692efac3531d2d871c72d0ac71b514cd1d07b8ed78cde133ca2c27169113ad9986699bbc6613e118eab84d840c704dc7cd9a09be27 SHA512 3ee5241b4e918488cd4e6d2d54474bafa23749c9bf7132639ca3683ec0723eabb0626df7233f898f97bc0403fca36c7431386b37e1e3d4389d4ef614f5c916c9
-DIST kup-0.9.1.tar.xz 205740 BLAKE2B a3200f69e1cd4500b3d74b0ba4bfaa53d63e00c8de73155075c579c7665663fd9285ca4c31e1b8abec62981b6e2d93b93a5db68820727567de77ebcf3d32fda1 SHA512 8906c33ce489fb049ce6223180693e1f5fa97762ff0a45eb68dbd8bad0b816b7ef500f13f1299a4ae75785a48825fc442b39fc0af1a5ef64b5f854d9fac9cc33
diff --git a/app-backup/kup/kup-0.9.1.ebuild b/app-backup/kup/kup-0.9.1.ebuild
deleted file mode 100644
index 9227fd533cf8..000000000000
--- a/app-backup/kup/kup-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-inherit ecm kde.org
-
-DESCRIPTION="Backup scheduler for the Plasma desktop"
-HOMEPAGE="https://apps.kde.org/kup/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgit2:=
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kdbusaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kidletime:5
-	kde-frameworks/kinit:5
-	kde-frameworks/kio:5
-	kde-frameworks/kjobwidgets:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kxmlgui:5
-	kde-frameworks/solid:5
-	kde-plasma/libplasma:5
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtdeclarative:5
-	dev-qt/qtsvg:5
-	net-misc/rsync
-"
diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest
deleted file mode 100644
index 1d734204de8c..000000000000
--- a/app-backup/mkstage4/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mkstage4-0.4.2.tar.gz 19860 BLAKE2B d5ab8c0bfd79796ec0f5310a52ed3ba6290b6cc11272a3d69408617f84758981b912628c5f796c1db5129a23db26049e14bf289e6f63f95e2877ab983e568c87 SHA512 2b481950f443e8f62ba837fe3d4238db79299776f3a115696e999a484ff6bb664bc54c74e61d31ff8d827c8c9c1174225d613d39ab5d93e0106725889990bd6d
-DIST mkstage4-0.4.3.tar.gz 20529 BLAKE2B 4d75765c0d8308443e26ab9f565e6e463a9e89dd820b659f18d596d1af428837cbc30fe7067979ab0340f5370e490c6c487b579ab5ece72b3b9b2f4f2eea818d SHA512 baf6b3d8a67020984805aa7b7d7d948e2b075cd258bb84c08e48c133e274fe2f4e26154e186f351163b188bbd1f89ee4476603f92035ba40dda0acdfafa962fd
-DIST mkstage4-0.4.tar.gz 19769 BLAKE2B 833b343f8d8deba2914c24aad07b802f551102f598fa6b149ad2aa8df3b96d189b8a29be8904e510cc4200609b4a2a19d83c510c58745b734898a119ae259313 SHA512 13f867c45fe9891754e62f2204e35260ce9c6a756eddea807800cce5cb5d9e7a1b21c27dd0d5142a13bc8b88c441cf618ba5ce6827a0644f6468759062a9e34c
diff --git a/app-backup/mkstage4/metadata.xml b/app-backup/mkstage4/metadata.xml
deleted file mode 100644
index d09e2f28fd89..000000000000
--- a/app-backup/mkstage4/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-needed -->
-	<longdescription lang="en">
-		This is a bash script which can create stage 4 tarballs either
-		for the running system, or a system at a specified mount point.
-		It is highly parameterized allowing among other things the
-		exclusion of sensitive user data.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">TheChymera/mkstage4</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-backup/mkstage4/mkstage4-0.4.2.ebuild b/app-backup/mkstage4/mkstage4-0.4.2.ebuild
deleted file mode 100644
index 5430aad023b7..000000000000
--- a/app-backup/mkstage4/mkstage4-0.4.2.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
-
-DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
-HOMEPAGE="https://github.com/TheChymera/mkstage4"
-SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-util/bats )"
-RDEPEND="
-	app-shells/bash
-	app-arch/tar
-"
-
-src_install() {
-	newbin mkstage4.sh mkstage4
-	newbin exstage4.sh exstage4
-	einstalldocs
-}
-
-src_test() {
-	bats -r tests/* || die
-}
diff --git a/app-backup/mkstage4/mkstage4-0.4.3.ebuild b/app-backup/mkstage4/mkstage4-0.4.3.ebuild
deleted file mode 100644
index 690249b6cff2..000000000000
--- a/app-backup/mkstage4/mkstage4-0.4.3.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
-
-DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
-HOMEPAGE="https://github.com/TheChymera/mkstage4"
-SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-util/bats )"
-RDEPEND="
-	app-shells/bash
-	app-arch/tar
-"
-
-src_install() {
-	newbin cpstage4.sh cpstage4
-	newbin exstage4.sh exstage4
-	newbin mkstage4.sh mkstage4
-	einstalldocs
-}
-
-src_test() {
-	bats -r tests/* || die
-}
diff --git a/app-backup/mkstage4/mkstage4-0.4.ebuild b/app-backup/mkstage4/mkstage4-0.4.ebuild
deleted file mode 100644
index 5430aad023b7..000000000000
--- a/app-backup/mkstage4/mkstage4-0.4.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
-
-DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
-HOMEPAGE="https://github.com/TheChymera/mkstage4"
-SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-util/bats )"
-RDEPEND="
-	app-shells/bash
-	app-arch/tar
-"
-
-src_install() {
-	newbin mkstage4.sh mkstage4
-	newbin exstage4.sh exstage4
-	einstalldocs
-}
-
-src_test() {
-	bats -r tests/* || die
-}
diff --git a/app-backup/mkstage4/mkstage4-9999.ebuild b/app-backup/mkstage4/mkstage4-9999.ebuild
deleted file mode 100644
index d22f71fe4e1b..000000000000
--- a/app-backup/mkstage4/mkstage4-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit git-r3
-
-DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
-HOMEPAGE="https://github.com/TheChymera/mkstage4"
-EGIT_REPO_URI="https://github.com/TheChymera/${PN}.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	app-arch/tar
-"
-
-src_install() {
-	newbin cpstage4.sh cpstage4
-	newbin exstage4.sh exstage4
-	newbin mkstage4.sh mkstage4
-	einstalldocs
-}
-
-src_test() {
-	bats -r tests/* || die
-}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index c5c6d1b9a6be..b23781488932 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,2 +1,3 @@
 DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40
 DIST snapper-0.11.1.tar.gz 450693 BLAKE2B 06c90cfdca71550e8dc8a246008a94bceb582f98dc4d56546592ae70ec69bd21f1f73ff1e41776f7eb5a02c42c382e05b771afa3fe583eb63486f640dc1d23d4 SHA512 0d7f6d9a012892c3ea0916cc92da5a6a435aa0a90067941f03b6e5a08adff54a7f3c52cc500cd28e7a7b496fb436c88db4399307cdd5518cfa54f2287e285993
+DIST snapper-0.11.2.tar.gz 451240 BLAKE2B 08afbdb7808d16555ca476e2a4336b9ee7da7e368a8bba1f131b7413d60ce0c61cb8e6ebc14cfebf5184d426b39c2d042f450494dcd65de30627870407ec8652 SHA512 b418ff91c6ba655edebd600691e2a7c0bc277eb6e327d5c57d0e5b2e008ee859e82a7dc49f2b25003001f0e6e5fc69e611c843231160bbb4626867cfc4cf95e2
diff --git a/app-backup/snapper/snapper-0.11.2.ebuild b/app-backup/snapper/snapper-0.11.2.ebuild
new file mode 100644
index 000000000000..92c569f5b215
--- /dev/null
+++ b/app-backup/snapper/snapper-0.11.2.ebuild
@@ -0,0 +1,90 @@
+# 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/tarsnap/Manifest b/app-backup/tarsnap/Manifest
index ea0b05c8f381..cf89de912705 100644
--- a/app-backup/tarsnap/Manifest
+++ b/app-backup/tarsnap/Manifest
@@ -1,2 +1 @@
-DIST tarsnap-autoconf-1.0.39.tgz 641089 BLAKE2B 4da7fa75c2a6df3186fac4f39a511532ae866c287a2bdc8dcc22049b53fcc903305f84fae9258793bc0c7a47b208d0bf2995143ee7b4296a35b4ca41d65d9a09 SHA512 dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4
 DIST tarsnap-autoconf-1.0.40.tgz 723380 BLAKE2B a794bb9bae3637c36841ad4bb0fa1c0e1c39a78ac2dc92f18cbe7dfe1036aa861f5421751dd8a85948dcb101ecb81f2177e844609b289238abd9a8448ba1655a SHA512 a4910c5cbea4a71218638703ba3140e5536a2c9bb7f35007115a7ae4a87fcd07b1be91d88e49240ee8db39be326bac049c0893c1406f215123d55a13b7b57941
diff --git a/app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild b/app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild
deleted file mode 100644
index 1945b8ea081f..000000000000
--- a/app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Online backups for the truly paranoid"
-HOMEPAGE="https://www.tarsnap.com/"
-SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
-
-LICENSE="tarsnap"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="acl bzip2 lzma xattr"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-fs/e2fsprogs
-	sys-libs/zlib
-	acl? ( sys-apps/acl )
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	virtual/os-headers" # Required for "magic.h"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.39-respect-AR.patch )
-
-S=${WORKDIR}/${PN}-autoconf-${PV}
-
-src_configure() {
-	econf \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
-		$(use_with lzma)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	dobashcomp misc/bash_completion.d/*
-}
diff --git a/app-backup/tarsnap/tarsnap-1.0.40.ebuild b/app-backup/tarsnap/tarsnap-1.0.40.ebuild
deleted file mode 100644
index ebf35c72ced2..000000000000
--- a/app-backup/tarsnap/tarsnap-1.0.40.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Online backups for the truly paranoid"
-HOMEPAGE="https://www.tarsnap.com/"
-SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
-S="${WORKDIR}"/${PN}-autoconf-${PV}
-
-LICENSE="tarsnap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl bzip2 lzma xattr"
-
-RDEPEND="
-	dev-libs/openssl:=
-	sys-fs/e2fsprogs
-	sys-libs/zlib
-	acl? ( sys-apps/acl )
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	xattr? ( sys-apps/attr )
-"
-# Required for "magic.h"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.39-respect-AR.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable xattr)
-		$(use_enable acl)
-		$(use_with bzip2 bz2lib)
-		--without-lzmadec
-		$(use_with lzma)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	dobashcomp misc/bash_completion.d/*
-}
diff --git a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
deleted file mode 100644
index 6d15d1fa612f..000000000000
--- a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Measures the speed of stdin/stdout communication"
-HOMEPAGE="https://www.habets.pp.se/synscan/programs_pipebench.html"
-SRC_URI="https://www.habets.pp.se/synscan/files/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86 ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.40-fix-build-system.patch )
-
-src_configure() {
-	append-cflags -Wall -w -pedantic
-	tc-export CC
-}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 56038a7c6472..7f228b900871 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,2 +1 @@
-DIST siege-4.1.0.tar.gz 541331 BLAKE2B c3e8e0f101e27a0902de80478e7c6595f44b4d129cfb265d66c48fcacef4129f587f9ca9ddd0c4d5016513ba19d7635135add1cb02290c4d2bbed5cea501a816 SHA512 15b3b82877153f044524cedc96750a6dab4d21ccbef1be53c0069adade6c3b4204287852a30a57275eea0f51c702857dff59648bd885c28ce65feae141cf6593
 DIST siege-4.1.6.tar.gz 527103 BLAKE2B aea71c93d0243113f8d9087ab4ea02ad1c64e10d8a10918139473ba865230a8e945d5371f19234bce22c95f8a412f68e94792ea0ea00eb451f208a17a37467f4 SHA512 cc674c9dc33aac35988708cd73b5061343cb1939e8a10b4dc50ceab42e65647b58557b6f3b48a03f5c992109bcac233425bf363e1f899135cfd9333d2517cfb2
diff --git a/app-benchmarks/siege/siege-4.1.0.ebuild b/app-benchmarks/siege/siege-4.1.0.ebuild
deleted file mode 100644
index 372978606f01..000000000000
--- a/app-benchmarks/siege/siege-4.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="sys-libs/zlib
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-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
-	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/siege/siege-4.1.6-r1.ebuild b/app-benchmarks/siege/siege-4.1.6-r1.ebuild
index 41bb48b2bedf..e7c273c9b416 100644
--- a/app-benchmarks/siege/siege-4.1.6-r1.ebuild
+++ b/app-benchmarks/siege/siege-4.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,8 +10,8 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos"
 IUSE="ssl"
 
 RDEPEND="
diff --git a/app-benchmarks/siege/siege-4.1.6.ebuild b/app-benchmarks/siege/siege-4.1.6.ebuild
deleted file mode 100644
index 3afa0f47ca99..000000000000
--- a/app-benchmarks/siege/siege-4.1.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-
-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-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 52a6b241660f..898ae5b27d25 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,2 +1 @@
-DIST cdemu-daemon-3.2.6.tar.xz 85976 BLAKE2B 33d03324fbc222674967f1d6b93c2bf1793528948cfce1089dbdfe799d3b40eaabae2e3f62b4696eba020f04c192e9d458a91e8bdd85465e00ec5a84194982e0 SHA512 cead8e4f7e0eec6e1284924cfe88cdfb78ec9f0769ffa423cd1801261540b3806a9704b6abbddc175e9e7d1aeef2acb9889b36ed13d89fd4b9dcda91fe1a08ca
 DIST cdemu-daemon-3.2.7.tar.xz 86140 BLAKE2B 09e968636bb95b0cb205a94769e2ba278f66199bb23c6db0f2860fa621f33bb37b6e55028dabec98a6fc7cf6aded42a1bb8d153381110bf38b678a74a2b5c8db SHA512 c09ae0e32526c85b6bb001a5cf8c11ed3662390e16fad8c07e5cded7febe4c586e8c677c85340fb20e321dfc3621e15b4a4220606147adc14ab969d6924778aa
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild
deleted file mode 100644
index 931b086d6aa4..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="https://cdemu.sourceforge.io"
-SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-libs/glib-2.38:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/modules-load.d
-	newins - vhba.conf <<<"vhba"
-	systemd_douserunit service-example/cdemu-daemon.service
-	insinto /usr/share/dbus-1/services
-	doins service-example/net.sf.cdemu.CDEmuDaemon.service
-}
-
-pkg_postinst() {
-	elog "As of 3.2.5, cdemu-daemon no longer supports autoloading"
-	elog "on non-systemd systems.  OpenRC users have to start it manually."
-	elog
-	elog "We install /etc/modules-load.d/vhba.conf to load the module"
-	elog "automatically, and D-BUS autolaunch will start cdemu-daemon user"
-	elog "service."
-}
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.7.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.7.ebuild
index 225e87f3eea2..58f19040bde6 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.7.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild
deleted file mode 100644
index a1ac3c577040..000000000000
--- a/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
-HOMEPAGE="https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html"
-SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-BDEPEND="dev-lang/perl"
-RDEPEND="${BDEPEND}
-	dev-perl/Audio-CD-disc-cover
-	virtual/latex-base"
-
-src_compile() {
-	pod2man disc-cover > disc-cover.1 || die
-}
-
-src_install() {
-	dobin disc-cover
-
-	einstalldocs
-	doman disc-cover.1
-
-	insinto /usr/share/disc-cover/templates
-	doins -r templates/.
-}
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index eeed864e73f8..d6ec315950e3 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
 DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.04.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.04.3.ebuild
deleted file mode 100644
index ac722e6d0916..000000000000
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.04.3.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_HANDBOOK="false"
-KDE_ORG_CATEGORY="sdk"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="mountiso"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_qt_module Network
-	ecm_punt_kf_module XmlGui
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.05.2.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.05.2.ebuild
index e1f596f98413..c212a08393dc 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.05.2.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.05.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.08.0.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.08.0.ebuild
new file mode 100644
index 000000000000..69481f3fa6cc
--- /dev/null
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.08.0.ebuild
@@ -0,0 +1,58 @@
+# 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 ~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/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
index 51902767d327..23b169be6b11 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.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
 inherit toolchain-funcs
 
 DESCRIPTION="A set of tools for DVD+RW/-RW drives"
@@ -11,7 +11,6 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="app-cdr/cdrtools"
 DEPEND="${RDEPEND}
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
index b22a815172dd..115e9d64a669 100644
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ b/app-cdr/dvd+rw-tools/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ceamac@gentoo.org</email>
-		<name>Viorel Munteanu</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index 3b088415387e..29702a4c0b7e 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,2 +1,3 @@
 DIST isoimagewriter-1.0.0.tar.xz 451924 BLAKE2B cec34345811faa2d43f376ada085867856f7ab2473c070ed35db713fb627241a1c30c3b842c9b9329592f9f1f061e2f01db0dc63a381ad50c6b95b2b0c1b2733 SHA512 d50e8146cfde12d940ccfc1ed8ad71a69d203054e470d52e274589aa38d6fbdb018a79db4b63725c7b37acfedfa36b211cc79437e3f12668b8499d9ece3ee562
 DIST isoimagewriter-24.05.2.tar.xz 466924 BLAKE2B da4632e39f25c1d3ca07d35b454d8e23837332f991716ef0b914a1b21e4bded8ed44c718812942738349d7dfb264868427b321c8c31d92cdfd621ccfbd289fe6 SHA512 bff4d1bc5a425bb0709b9d64c4a460412d7ed9d844980b0b0b385960941a3e7bd3c42ce3230d75a743ff77f815ccae304a675eed273e56d5a47d5aa58810c695
+DIST isoimagewriter-24.08.0.tar.xz 468424 BLAKE2B d13c8e70452b55d7658b63608de7cf56f800ddc708be990709ee956169797bba68357deb03d6bea8955f8b6adf0f2fea1b831eab067578b8114b179cd8e59592 SHA512 3436aac6cb6b18acd541d8e0abbe4262aba62957767e1522f0fa616508cb6e978881bf1f9565e738a7c5a3502cc90f9acd4f6ab3a0dd70f6b37c92480278bbe9
diff --git a/app-cdr/isoimagewriter/isoimagewriter-24.05.2.ebuild b/app-cdr/isoimagewriter/isoimagewriter-24.05.2.ebuild
index ccf1e4823570..15d172b48fd5 100644
--- a/app-cdr/isoimagewriter/isoimagewriter-24.05.2.ebuild
+++ b/app-cdr/isoimagewriter/isoimagewriter-24.05.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/ISOImageWriter"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-cdr/isoimagewriter/isoimagewriter-24.08.0.ebuild b/app-cdr/isoimagewriter/isoimagewriter-24.08.0.ebuild
new file mode 100644
index 000000000000..ccce32557bf4
--- /dev/null
+++ b/app-cdr/isoimagewriter/isoimagewriter-24.08.0.ebuild
@@ -0,0 +1,30 @@
+# 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/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 6242cb3d0736..febdbef8ce07 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,2 +1 @@
-DIST xfburn-0.7.1.tar.bz2 1250935 BLAKE2B 1b93b9ff89612e6a15c4990b6b0020e7353d46120a00da72ab9b1a6b30234a2baadfa9a1a2a074c5ebdbc5f140533ba21f5ef80fbdf0ebf4ba3c0a51f715a195 SHA512 ff5548655986a2dd4f21a0eebc971713c8ed463c8826899f37546af6255506c5b8b619c1667fd82eca6bc22355714bc7c3af269de071b3ce071dd6738207764a
 DIST xfburn-0.7.2.tar.bz2 1305071 BLAKE2B 4b083ce28b2223b64e324908159181384ebc63cf891e9f847b316cf888b126a3dca727a94fde0130555324140d883a4a5e8a924990cdc3daa50c315bf3774193 SHA512 7966fc32a71b029f3e511565bcb751b06a9b87c2b434c9d546cccc1ba43479b1d1b17c9afe743babd08192e39907e4967e755a7b5fd72df3906645cce50db9a9
diff --git a/app-cdr/xfburn/xfburn-0.7.1.ebuild b/app-cdr/xfburn/xfburn-0.7.1.ebuild
deleted file mode 100644
index 76176da4dcd2..000000000000
--- a/app-cdr/xfburn/xfburn-0.7.1.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 xdg-utils
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfburn/start
-	https://gitlab.xfce.org/apps/xfburn/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="gstreamer +udev"
-
-DEPEND="
-	>=dev-libs/glib-2.38
-	>=dev-libs/libburn-0.4.2:=
-	>=dev-libs/libisofs-0.6.2:=
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/exo-0.11.0:=
-	>=xfce-base/libxfce4ui-4.12.0:=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	udev? ( dev-libs/libgudev:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable udev gudev)
-		$(use_enable gstreamer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/xfburn/xfburn-0.7.2.ebuild b/app-cdr/xfburn/xfburn-0.7.2.ebuild
index 8efae6d1b16d..76176da4dcd2 100644
--- a/app-cdr/xfburn/xfburn-0.7.2.ebuild
+++ b/app-cdr/xfburn/xfburn-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="gstreamer +udev"
 
 DEPEND="
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
index 3f6fb3a7a9f2..ff2bd6fba837 100644
--- a/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
@@ -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 ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
index 1e5d082427fe..6eb7550f45c2 100644
--- a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
@@ -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 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/catatonit/catatonit-0.2.0.ebuild b/app-containers/catatonit/catatonit-0.2.0.ebuild
index d456e8839984..e87fb8dd631d 100644
--- a/app-containers/catatonit/catatonit-0.2.0.ebuild
+++ b/app-containers/catatonit/catatonit-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/openSUSE/catatonit.git"
 else
 	SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-containers/catatonit/catatonit-9999.ebuild b/app-containers/catatonit/catatonit-9999.ebuild
index 74469d9d4d19..a15fe9fe0ace 100644
--- a/app-containers/catatonit/catatonit-9999.ebuild
+++ b/app-containers/catatonit/catatonit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/openSUSE/catatonit.git"
 else
 	SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-containers/conmon/conmon-2.1.11.ebuild b/app-containers/conmon/conmon-2.1.11.ebuild
index 13d3d6c215c3..bfc4da4cc9d6 100644
--- a/app-containers/conmon/conmon-2.1.11.ebuild
+++ b/app-containers/conmon/conmon-2.1.11.ebuild
@@ -18,7 +18,7 @@ else
 		https://github.com/Flowdalic/conmon/commit/ff8794c5bc0805cc430229728befde16da47b68c.patch
 			-> ${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch
 	"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/conmon/conmon-9999.ebuild b/app-containers/conmon/conmon-9999.ebuild
index bed057cb8f10..c2141f095e2c 100644
--- a/app-containers/conmon/conmon-9999.ebuild
+++ b/app-containers/conmon/conmon-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/conmon.git"
 else
 	SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 4407a20214b3..c14f1695c07c 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/app-containers/containerd/containerd-1.7.21.ebuild b/app-containers/containerd/containerd-1.7.21.ebuild
new file mode 100644
index 000000000000..f558099e86a6
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.21.ebuild
@@ -0,0 +1,90 @@
+# 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/containers-common/containers-common-0.59.1.ebuild b/app-containers/containers-common/containers-common-0.59.1.ebuild
index c5755460275a..abc1bd846c5c 100644
--- a/app-containers/containers-common/containers-common-0.59.1.ebuild
+++ b/app-containers/containers-common/containers-common-0.59.1.ebuild
@@ -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 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index 4a0427e20df7..deb362fc0d3b 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -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 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild b/app-containers/containers-image/containers-image-5.30.0.ebuild
index de66edc71622..317689821ec3 100644
--- a/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.30.0.ebuild
@@ -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 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index 9d755c4cf4ad..40770f7a7d7d 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -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 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild b/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild
index bf48bb1f16f0..2baab9c7d15a 100644
--- a/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild
+++ b/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/shortnames/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-shortnames/containers-shortnames-9999.ebuild b/app-containers/containers-shortnames/containers-shortnames-9999.ebuild
index fc6e0837c92f..8c33114ebd8f 100644
--- a/app-containers/containers-shortnames/containers-shortnames-9999.ebuild
+++ b/app-containers/containers-shortnames/containers-shortnames-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/shortnames/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~loong"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-storage/containers-storage-1.54.0.ebuild b/app-containers/containers-storage/containers-storage-1.54.0.ebuild
index 7161e2aa1c52..be92b5c954ce 100644
--- a/app-containers/containers-storage/containers-storage-1.54.0.ebuild
+++ b/app-containers/containers-storage/containers-storage-1.54.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-storage/containers-storage-9999.ebuild b/app-containers/containers-storage/containers-storage-9999.ebuild
index 7161e2aa1c52..be92b5c954ce 100644
--- a/app-containers/containers-storage/containers-storage-9999.ebuild
+++ b/app-containers/containers-storage/containers-storage-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index df934f1cd5af..9a0c2416a615 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -1,12 +1,4 @@
-DIST cosign-2.0.0-deps.tar.xz 446730048 BLAKE2B f59c698ef5c4b908d09af10d0f254c9e03c3e109451d3e2ba2a7d5df007735651e1e28a089f07120155ee2d11648224afc2b126779ca344f0bdd8cd5f155d205 SHA512 29454a7710e18967879010f19c72ffebb75a867d495c48623fa7c61b20d770eb5868e96f0350fba275030438b309a4d1cf7a63212b208725fd5513de3693370b
-DIST cosign-2.0.0.tar.gz 6654819 BLAKE2B eee1f7f86a12173baa8d6bac2441646b61c1ce205bbd695018bcf4f068e266c245f2cbd131a40017bb8d88bc8d1960b91c49782c9cdf65e2e47ce356ffe2a92c SHA512 b64fd9bc806d72aaada007d8e0bedcd73ba42cb35fbf4c0ee589c92d5460c90e5604f0ddb6a1f12ba45ce588098803ef026a309332a78613284265e95af4354f
-DIST cosign-2.0.1-deps.tar.xz 409822612 BLAKE2B dba99cb2e5b9c3668b1d0c80ae7acc77d1a12ec5afe535178a8b5bc7cb5f06139d4196c31de9399c100a9bb964fde4881691ad7ff27f94ac1975a2ff742fa384 SHA512 ce81c672f1a1e793f11a5614d1c1f8f516208f844213ddbf173f8bf724b824240578be604212bdc66b3ea01737c6ec57f2713d8134c8063682abfb355c9884cb
-DIST cosign-2.0.1.tar.gz 6656038 BLAKE2B eb552f0160473cd98d4c876c126f1bbacb53deeddaa9b475f12c3baa5b076fdc06ac3e9783f785059a96baf3643d010617efb695fb6a10f28f5d40023fa6602d SHA512 2d8ce3c495818091e8077503fd2266bd0f3d8ee8a76f2a9b27ab1ab1cf1e2a01fee3ce6138f54d634015010d80e8193f79a8029dd3eb7a09c4b457be16ee4e50
-DIST cosign-2.2.0-deps.tar.xz 474893012 BLAKE2B 75b8a9ccdb117c9eb147a5efd2a167164e5ff5d4dc18483777f0afc1a8c0fc378323003ca58bac92cea4c09a3c4b73d692a81bb45b13bce31553f0e0af2e76e9 SHA512 8b3288ad01ca0d5e789d782f7ba479314396a8848785e4b8fc62b60e1f96b442937d7f2d955370b82b825da62ba1d316169e1ccdff9ce1204663402d680910cb
-DIST cosign-2.2.0.tar.gz 850421 BLAKE2B 182bb28cf2b17a04e20d61d4d039e9106fb54a773a9669ad27ff1f3f081a5739dbba7b949688d71a882a4cefceda057ce2636af50e99795194e9656c05928e08 SHA512 379c8544744afb36c143113d6cd3af63cdc28249a34e4c81ab4fe547e97868ae28e0796d9fe77108b7fa2ba30e6379be612650a4f37dc34c08de3fb88fbc5e1d
-DIST cosign-2.2.1-deps.tar.xz 487130076 BLAKE2B a0adbfc4d6230f4ba1013dfc28638752e1732eff92b72993aa386073d255a2629c9abb36bca24cacdcd7edff11b4f34cd54356cb3af82b2c3a781a19c12c168e SHA512 27d09d16abbf1ee3d4d1e186dca9cd0836a6da8e36eeb6cce861c85c2a1ec594a4b37dfbd3ada0970fe469aebcf188a0bbe9f8903871bca0e3b81fb718acda09
-DIST cosign-2.2.1.tar.gz 853562 BLAKE2B 40894d00d6071206221010337cb517ee9559518764a0d991df3363cb4dc381a0af4cd31e60c0c1fc6cffce6086af08c908ccf503893356f224f95b1d4085b195 SHA512 84f2308bbb1968eaf6d0d95e2dcb8efa2c42cd2599298b37d576e5e87f0cf6c1153c330b034908c0c7557953e0a7d964eaa4a8768f7dc35900f5f427d8fe7713
-DIST cosign-2.2.3-deps.tar.xz 429760040 BLAKE2B 47ee9a4f6305a670e1818ce74a9da351fc763d4196334d738ab48b9dcba06f4be43ce2ba77dc879aae59ada2fa2ea66168a223c9da1029e02e140590dd1733a5 SHA512 481f8593b80d91996f2b2d4de10acad8bf1c5db3cf099a9683fd7da307c1142c870166a9222e58f9449a060248c94fecf35343dccc07d5cbf2acbdc00c0aef29
-DIST cosign-2.2.3.tar.gz 845096 BLAKE2B 2017cc1716899640cbfc10ce093280a1ee4789eb1e8a8077978ebe4efe38075efa73ccb1abecb41eaa64dc16e652dbb709be7f195a6542284d86b2d9fb5128f3 SHA512 fc488c80dab3d05e0eca714c6107fada01dfddc2b68747676665d20a3f229224bbe36bfc60625c581c2e80dd10ad1421e142cf7ef6e24eba0894a708f2d10f06
 DIST cosign-2.2.4-deps.tar.xz 153098164 BLAKE2B 6e900386c307fc5bc19057ab62d87eb6ff597916d3cabf14372ce8cd4b39c0fd11ec787fcb96d3db297c7907584617307ab3a87b2e797de56ef6dee4cff3f50b SHA512 d0873fd15819c9c580a8f70a01859ac8e166ba79f9702fe757d95b482ee92914c66b13b9abe3093f79b9657612d9c7da8ce662aca7bc680ff533c7fcb1848e30
 DIST cosign-2.2.4.tar.gz 840586 BLAKE2B 22522fc70ff6b01957af2e294b7fdad740d55cc9710f9023246855dd9383be0688934f27e5b32cde3383cdfe3c02cd2de5547a515a14c1442ac85afc9e566b8f SHA512 3a2e2e7ea3964428bc7c4adb9475fbb730cbe2b7dfa7a5eb5cf350d88a4f3a9aef64f00574c7f38bf0074cb3e386cd26e6cfe4558ce5989ea557b654aa82ef71
+DIST cosign-2.4.0-deps.tar.xz 153232112 BLAKE2B 9aa2da10bb063a554c4722ed3523ab1ec332209eec3d1adffa53d22ddec4296b834a2c9194323684ef27d738439818ba9e6e8539ca10e17eb40a835178eaf7fb SHA512 ff3a16420d2e0291bb67f856cd21ad519fcdbd08489cfd9dfe29aa816d077f6fc32ec1d314291f4811ae717270448b92c000e1a0d115a9b5f1346f17567e78a5
+DIST cosign-2.4.0.tar.gz 864498 BLAKE2B 7154e8b1b171e2491f68a000925b9ad2e59dd8eae8fa5431e482dfdb1b9e04dd42b59c988d765eae615dedc95b35d34d82b3adb9ae7a0bf4bd0a5fefde7a39c5 SHA512 35a57a0cd627d470c957da972e9acbc415a4b7ab0d9ead7e3d3499ecac5a167d93026f886d1c686882a97daac75944d326b06b292cb614ce8e727c81be04fdcb
diff --git a/app-containers/cosign/cosign-2.0.0.ebuild b/app-containers/cosign/cosign-2.0.0.ebuild
deleted file mode 100644
index 62b7d9662254..000000000000
--- a/app-containers/cosign/cosign-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_HASH=d6b9001f8e6ed745fb845849d623274c897d55f2
-inherit go-module
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/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"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-dodoc CHANGELOG.md
-}
diff --git a/app-containers/cosign/cosign-2.0.1.ebuild b/app-containers/cosign/cosign-2.0.1.ebuild
deleted file mode 100644
index 5a36c4c478a2..000000000000
--- a/app-containers/cosign/cosign-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_HASH=8faaee4d2b5f65678eb0831a8a3d5990a0271d3a
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/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"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-dodoc CHANGELOG.md
-}
diff --git a/app-containers/cosign/cosign-2.2.0.ebuild b/app-containers/cosign/cosign-2.2.0.ebuild
deleted file mode 100644
index 54a6b816281f..000000000000
--- a/app-containers/cosign/cosign-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_HASH=546f1c5b91ef58d6b034a402d0211d980184a0e5
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/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"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-dodoc CHANGELOG.md
-}
diff --git a/app-containers/cosign/cosign-2.2.1.ebuild b/app-containers/cosign/cosign-2.2.1.ebuild
deleted file mode 100644
index 8324e0f4ed2e..000000000000
--- a/app-containers/cosign/cosign-2.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_HASH=12cbf9ea177d22bbf5cf028bcb4712b5f174ebc6
-SOURCE_DATE_EPOCH=1699360786
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/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"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean \
-		SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-dodoc CHANGELOG.md
-}
diff --git a/app-containers/cosign/cosign-2.2.3.ebuild b/app-containers/cosign/cosign-2.2.3.ebuild
deleted file mode 100644
index a1421c9276eb..000000000000
--- a/app-containers/cosign/cosign-2.2.3.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 go-module
-GIT_HASH=493e6e29e2ac830aaf05ec210b36d0a5a60c3b32
-SOURCE_DATE_EPOCH=1706723680
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/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"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean \
-		SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-dodoc CHANGELOG.md
-}
diff --git a/app-containers/cosign/cosign-2.2.4.ebuild b/app-containers/cosign/cosign-2.2.4.ebuild
index 97ef9d95434b..73237dbaa1e5 100644
--- a/app-containers/cosign/cosign-2.2.4.ebuild
+++ b/app-containers/cosign/cosign-2.2.4.ebuild
@@ -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/cosign-2.4.0.ebuild b/app-containers/cosign/cosign-2.4.0.ebuild
new file mode 100644
index 000000000000..de622f965ee3
--- /dev/null
+++ b/app-containers/cosign/cosign-2.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_HASH=b5e7dc123a272080f4af4554054797296271e902
+SOURCE_DATE_EPOCH=1722980393
+
+DESCRIPTION="container signing utility"
+HOMEPAGE="https://sigstore.dev"
+SRC_URI="https://github.com/sigstore/cosign/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"
+
+RESTRICT="test"
+
+src_compile() {
+	emake \
+		GIT_HASH=${GIT_HASH} \
+		GIT_VERSION=v${PV} \
+		GIT_TREESTATE=clean \
+		SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
+}
+
+src_install() {
+	dobin cosign
+	einstalldocs
+dodoc CHANGELOG.md
+}
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index a67abf87f207..f6b768507883 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/app-containers/cri-tools/cri-tools-1.31.1.ebuild b/app-containers/cri-tools/cri-tools-1.31.1.ebuild
new file mode 100644
index 000000000000..21381a7af4bb
--- /dev/null
+++ b/app-containers/cri-tools/cri-tools-1.31.1.ebuild
@@ -0,0 +1,33 @@
+# 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/crun/Manifest b/app-containers/crun/Manifest
index 3e403e47f1cf..53569abf7193 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,3 +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.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
diff --git a/app-containers/crun/crun-1.16.ebuild b/app-containers/crun/crun-1.16.ebuild
new file mode 100644
index 000000000000..c2730e40b57e
--- /dev/null
+++ b/app-containers/crun/crun-1.16.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019-2024 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=(
+		$(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_install() {
+	emake "DESTDIR=${D}" install-exec
+	doman crun.1
+	einstalldocs
+
+	einfo "Cleaning up .la files"
+	find "${ED}" -name '*.la' -delete || die
+}
+
+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[*]}"
+}
diff --git a/app-containers/devcontainer/Manifest b/app-containers/devcontainer/Manifest
index 4b4e87eb9bfe..e37ba75f03e2 100644
--- a/app-containers/devcontainer/Manifest
+++ b/app-containers/devcontainer/Manifest
@@ -1,4 +1,5 @@
-DIST devcontainer-0.65.0.tgz 620002 BLAKE2B 4b48365c5d717c0d675256822864677678cd6260e7e8875cbec996f9fa1186d6085e0c394a39fa5c098787245008b5f438adead4eedf81ba3c93b01e6ee3b9c6 SHA512 ed73dc870df518c29d67dd25d15b1aa7e328b83e1fcb40daee3c96f7b036a410e75e7a4e0319bb963dacff68af6d8ccef49d4555e70f6837bd665a2b8a589373
-DIST devcontainer-0.66.0.tgz 620063 BLAKE2B f63fdd8dc5aa9de094e0e31e345fadfd9f4f9cd720c11c597aa0ac0ec7b28b0663bbecfe43b374d1c163a7a61d92865d8285663a8ff0e517c01946608574c3ab SHA512 fac309084ea6d5456150827a4120e8c20a14b82619d56f1f8c1750c917cccc1065f12a7e3b804cab8f7685d21a10a4aa59ef765764c0620dac40fc0d1a519904
 DIST devcontainer-0.67.0.tgz 620141 BLAKE2B e6c8718a21e29c6f921968cb42c55e3d57147579c0f42b57846893dac899cdd88520b2ffcfe675fd5427047fdcd5f1eb1636c10eb05c5509e62dcb8d2a8942f8 SHA512 91af4cba268ce23fce4cffec2fdb12902fe4349e84065710caf66a8987b4745e0a948ded3e2a191dd9dff52c4cf9789b41306601567e6081085ca6250c5b8705
 DIST devcontainer-0.68.0.tgz 620875 BLAKE2B ef8a395b5c34466032edf9157f8b5eeb95d349f8ad72220f1e05e8b31b7cae823fa15272f7e9898dc953414587fc3ccc2688e38e3028200a1b6064bb6a068963 SHA512 d2e84b514ad0a51e5dfbacbc6ede64727df40417a60fe589d682d0c88e9150da5491e76b94cc80ccddc9d7d3c4971ee36d8e78c7c59046ee39d098832ee9989b
+DIST devcontainer-0.69.0.tgz 621256 BLAKE2B 2afc8edee15ad9cafd8b2fb6150154e4b759de656d999f200d9529c15c77822fd8fb9dbf711c67bad3b2801746540e575e1e5cf6ce599e06d09cfdd64f73439f SHA512 095de76f69279b6200a38d46a7d1bd9e0c528a3e1cabe72b0f151cd840a45509e886dfdacee29afde476e77bef2c6e2eb71cdc20f16d85ea63e605224e2e0f0e
+DIST devcontainer-0.70.0.tgz 621528 BLAKE2B ede937273928b8d37e64555cd8e600ff33792942d85c1a99d5489909bfe62f10587a09633ebb18e7d3ca8ee902bb43af03243984f3004446d62c1850b4986399 SHA512 1ead34033ce65a6e8967bd1bb35f631869a75cb44b682dc48fc4dec26046f4466f3b1c5f83eb0140653926364b8e40aa13f6f787eb8a80267834c68418a4c685
+DIST devcontainer-0.71.0.tgz 621743 BLAKE2B 6605d9c48d0041534f2982dd870b77e0453560be7652bbdac13a00e01fadbe0cd1c59048e70c7019bf2dab85ea9de2963bdcc03b7462e8c9a88cad8341ba7d0b SHA512 332d77983402672e3316c2285362d57679b7836a12bf1024a7e67580efdc601606dd851db5e2041a6e378a0abaed63c4a5d26a1372e32a420aa7823a7c907311
diff --git a/app-containers/devcontainer/devcontainer-0.65.0.ebuild b/app-containers/devcontainer/devcontainer-0.65.0.ebuild
deleted file mode 100644
index 10d7f50fc167..000000000000
--- a/app-containers/devcontainer/devcontainer-0.65.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
-
-DESCRIPTION="Reference implementation of the Development Containers specification"
-HOMEPAGE="https://containers.dev/
-	https://github.com/devcontainers/cli/"
-SRC_URI="https://registry.npmjs.org/@devcontainers/cli/-/cli-${PV}.tgz
-	-> ${P}.tgz"
-S="${WORKDIR}/package"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	net-libs/nodejs
-"
-BDEPEND="
-	>=net-libs/nodejs-16[npm]
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_compile() {
-	# Skip, nothing to compile here.
-	:
-}
-
-src_install() {
-	local -a my_npm_opts=(
-		--audit false
-		--color false
-		--foreground-scripts
-		--global
-		--offline
-		--omit dev
-		--prefix "${ED}/usr"
-		--progress false
-		--verbose
-	)
-	npm "${my_npm_opts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
-
-	einstalldocs
-}
diff --git a/app-containers/devcontainer/devcontainer-0.66.0.ebuild b/app-containers/devcontainer/devcontainer-0.66.0.ebuild
deleted file mode 100644
index 10d7f50fc167..000000000000
--- a/app-containers/devcontainer/devcontainer-0.66.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
-
-DESCRIPTION="Reference implementation of the Development Containers specification"
-HOMEPAGE="https://containers.dev/
-	https://github.com/devcontainers/cli/"
-SRC_URI="https://registry.npmjs.org/@devcontainers/cli/-/cli-${PV}.tgz
-	-> ${P}.tgz"
-S="${WORKDIR}/package"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	net-libs/nodejs
-"
-BDEPEND="
-	>=net-libs/nodejs-16[npm]
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_compile() {
-	# Skip, nothing to compile here.
-	:
-}
-
-src_install() {
-	local -a my_npm_opts=(
-		--audit false
-		--color false
-		--foreground-scripts
-		--global
-		--offline
-		--omit dev
-		--prefix "${ED}/usr"
-		--progress false
-		--verbose
-	)
-	npm "${my_npm_opts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
-
-	einstalldocs
-}
diff --git a/app-containers/devcontainer/devcontainer-0.67.0.ebuild b/app-containers/devcontainer/devcontainer-0.67.0.ebuild
index 991cd956e37b..10d7f50fc167 100644
--- a/app-containers/devcontainer/devcontainer-0.67.0.ebuild
+++ b/app-containers/devcontainer/devcontainer-0.67.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/package"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	net-libs/nodejs
diff --git a/app-containers/devcontainer/devcontainer-0.69.0.ebuild b/app-containers/devcontainer/devcontainer-0.69.0.ebuild
new file mode 100644
index 000000000000..991cd956e37b
--- /dev/null
+++ b/app-containers/devcontainer/devcontainer-0.69.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Reference implementation of the Development Containers specification"
+HOMEPAGE="https://containers.dev/
+	https://github.com/devcontainers/cli/"
+SRC_URI="https://registry.npmjs.org/@devcontainers/cli/-/cli-${PV}.tgz
+	-> ${P}.tgz"
+S="${WORKDIR}/package"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	net-libs/nodejs
+"
+BDEPEND="
+	>=net-libs/nodejs-16[npm]
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+	# Skip, nothing to compile here.
+	:
+}
+
+src_install() {
+	local -a my_npm_opts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}/usr"
+		--progress false
+		--verbose
+	)
+	npm "${my_npm_opts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
+
+	einstalldocs
+}
diff --git a/app-containers/devcontainer/devcontainer-0.70.0.ebuild b/app-containers/devcontainer/devcontainer-0.70.0.ebuild
new file mode 100644
index 000000000000..991cd956e37b
--- /dev/null
+++ b/app-containers/devcontainer/devcontainer-0.70.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Reference implementation of the Development Containers specification"
+HOMEPAGE="https://containers.dev/
+	https://github.com/devcontainers/cli/"
+SRC_URI="https://registry.npmjs.org/@devcontainers/cli/-/cli-${PV}.tgz
+	-> ${P}.tgz"
+S="${WORKDIR}/package"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	net-libs/nodejs
+"
+BDEPEND="
+	>=net-libs/nodejs-16[npm]
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+	# Skip, nothing to compile here.
+	:
+}
+
+src_install() {
+	local -a my_npm_opts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}/usr"
+		--progress false
+		--verbose
+	)
+	npm "${my_npm_opts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
+
+	einstalldocs
+}
diff --git a/app-containers/devcontainer/devcontainer-0.71.0.ebuild b/app-containers/devcontainer/devcontainer-0.71.0.ebuild
new file mode 100644
index 000000000000..991cd956e37b
--- /dev/null
+++ b/app-containers/devcontainer/devcontainer-0.71.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Reference implementation of the Development Containers specification"
+HOMEPAGE="https://containers.dev/
+	https://github.com/devcontainers/cli/"
+SRC_URI="https://registry.npmjs.org/@devcontainers/cli/-/cli-${PV}.tgz
+	-> ${P}.tgz"
+S="${WORKDIR}/package"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	net-libs/nodejs
+"
+BDEPEND="
+	>=net-libs/nodejs-16[npm]
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+	# Skip, nothing to compile here.
+	:
+}
+
+src_install() {
+	local -a my_npm_opts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}/usr"
+		--progress false
+		--verbose
+	)
+	npm "${my_npm_opts[@]}" install "${DISTDIR}/${P}.tgz" || die "npm install failed"
+
+	einstalldocs
+}
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 437b422f3d07..36bc548f97e8 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,4 +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.0.3-man.tar.xz 79132 BLAKE2B e2c9082c964333ebd221056308f01dd64437a46abdf2be6e4e6dba798a89d04a1dfcc15378f5730140edad8e4235f0c3cc735a0be2efc73b9743174f1cf0d6ae SHA512 966764bfbba457dfed10caebd6509ff3aa452c3b3b9382a321d0dacba62fa13ba494c1561bf95651f92c59084f79cd4b300e10b4d2185edcaaaae1e1e914d5b2
-DIST docker-cli-27.0.3.tar.gz 7107193 BLAKE2B cb00392d5afac1503ed07a9462f3d311fc3f3a5ef6d51c7c49995d8cb234a3b7a3c838fc486cc1fa0b1406774f82c2c1ef7c7b041e398be555c7e030e40f490c SHA512 0f7b0ae0f92f8f91b8141292ee8a86a40f4da18d96772c9107d295a30fe06be08b1673da3a49e9c2d3fd67d55f41696b732451b44aecc863fdd4c55578c201db
+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
diff --git a/app-containers/docker-cli/docker-cli-27.0.3.ebuild b/app-containers/docker-cli/docker-cli-27.0.3.ebuild
deleted file mode 100644
index 22062e03bf72..000000000000
--- a/app-containers/docker-cli/docker-cli-27.0.3.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=7d4bcd863a4c863e650eed02a550dfeb98560b83
-
-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
new file mode 100644
index 000000000000..704097070ac4
--- /dev/null
+++ b/app-containers/docker-cli/docker-cli-27.2.0.ebuild
@@ -0,0 +1,72 @@
+# 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/Manifest b/app-containers/docker/Manifest
index b3bdda45985a..aa42e30ebba6 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,2 +1,2 @@
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-DIST docker-27.0.3.tar.gz 16523895 BLAKE2B a86b2bf7ed85216f6a033a2fdb6cb0d545822570463b6b5f218052bf8e9ca3dde0e15ba4872da6370502a985e84ce704f810386b806e7dfb9d40d6d7b497d629 SHA512 bff7084f1bbe7fd6e4241d7172d3445b8ea36ef68ec5ee429a8ee27e1dfa81c1810d8ce07cb4c77f78037725c53d1de565e587d7f96994a653a09ce33e9bc344
+DIST docker-27.2.0.tar.gz 16689537 BLAKE2B faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55 SHA512 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65
diff --git a/app-containers/docker/docker-27.0.3.ebuild b/app-containers/docker/docker-27.0.3.ebuild
deleted file mode 100644
index 14960218fa63..000000000000
--- a/app-containers/docker/docker-27.0.3.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=662f78c0b1bb5114172427cfcb40491d73159be2
-
-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
new file mode 100644
index 000000000000..4f5f1df2aba3
--- /dev/null
+++ b/app-containers/docker/docker-27.2.0.ebuild
@@ -0,0 +1,323 @@
+# 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/metadata.xml b/app-containers/docker/metadata.xml
index 63036f19e3e5..dfe556527506 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -25,6 +25,10 @@
 			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.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">moby/moby</remote-id>
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index a05d51f3cf5f..f13173f5e89f 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -1,6 +1,6 @@
 DIST incus-6.0.1.tar.xz 11653056 BLAKE2B d026f9fb99d7393d286006cfe759681b58b980b7a2432a98ba8a6862e17099ef6ee8d1ec1766d00fac1a6d1e748a7d10d3d5ad14b31c542618044f77a27fe255 SHA512 8218c121cf1afd307f748c0f1c0b1ba34a05fa0c43a515aab03d9f92c66becaa6bff245e93842e7b0746ce6019d66f1a5e4c317ec05e0ab088b539e5378d78dc
 DIST incus-6.0.1.tar.xz.asc 833 BLAKE2B c5c9d3d4796e97ef745102c13e52d691e7f087a5a0cc8e0a069ec7c94686e6e8de04d3dd247157e16eb3deea2b877453e3462ec829ced2ba9cb1928af9a3aa1b SHA512 c47df95afa7c9ef7041fb29497567ab3b1ed30c3c175b4be84bc75a6a2c47072cc291e43fa738a5a58d753b04aef87334780f9d45184a9543a49fad263859aa0
-DIST incus-6.3.tar.xz 11717996 BLAKE2B 25a4f13e860c4d60e24b32f8ce1db0c4cf81f2595169c105d2e1a3b38563232b141f08039c243d903c5b81ddde0eb1a8008ae24cef955ed9d001241edc1336f2 SHA512 e9da3e2c3ef9c7e8b0ae77bef7fe674e427d63cc97a397c61eca3eb3f31e5e4ee8670543d7cf05b7efcfc08645ee7339c44aab87c5a4aa4578566dec3a512048
-DIST incus-6.3.tar.xz.asc 833 BLAKE2B 1b204199cda642dbe2b89167a4ac210ab43c1798ecf5079d24f585dc9e559e9216ba8dce8c39ae2de8ec298cb157d8926dd8a545c4a21464e88babe54e585c9c SHA512 e3318a8037f488b5ce0b551a485c568cba7137c70ad170f963d4cad3bb1fc8b12a9da564b03d754f82f354b1a59c37fd3857d3804e75d14428e52ee6121411a4
 DIST incus-6.4.tar.xz 11745236 BLAKE2B 14e9980238f1eb55b0ca8c1a9fe72e5335aa92193ba5805525bde7fa6d417b46cc193ce43e9ef6c85b86d2fc500021bfb6f30535e69722a93e395be55de64358 SHA512 a9d32526cc7ccf93fe0579f95cbd87f72cecf13c5ebe9d0ee4a61a8f921737f1842ea35d452bdf58ca3d2c5529198e8d80dfee41ce6c92a6213f1994f421c1f6
 DIST incus-6.4.tar.xz.asc 833 BLAKE2B 8a6753f0b92f58095ff27d7ffdac9e70a408a1466dd224cabb47d482fe0b9b0747a03635a5bc419b26897e2ae073f9f0c0d81bd5ed3dff09a5e844ee9dd02f6d SHA512 c6d69941f4ecca2c0020001c5fe848f4bf14edf99b471ace57e38bed48b74862bf13eae1b973e0783ca5ab16bc33887ab9b98b42ff6d1a387ff5670af7666d6a
+DIST incus-6.5.tar.xz 11233032 BLAKE2B 667bf93a55dc58f8426765d3b536fee0e3b3f521fa64ba51948874a04dbf4549d856170f50723aaad18690169e41913507bdac4cf426c65cf89df06ae883b1e8 SHA512 e5e9d0b7458052214813201c771c24e878c0682d749bb150fd477f5319a4dc1b641c963646ee5c16981d5698e941b62a4c5cc7a5f29e9f45eebf6a443dc029ec
+DIST incus-6.5.tar.xz.asc 833 BLAKE2B f2c468c86f5d4524bc0590bbd6b2c3e6bb69e2173cc63eb3f0b1d75a5ecd0ceb3e906c77a31011f82ced4407a00562e066494ff2ae4e82144e9eb0e28d88d4e7 SHA512 f31aceb2972dac43f7dfca5968224961b2666eccacb1a31cc9de1baf5415e85f32f41e23f4b6eb4411e66f59260b7a847457827b641e02e7221ec6b12331d911
diff --git a/app-containers/incus/incus-6.3-r1.ebuild b/app-containers/incus/incus-6.3-r1.ebuild
deleted file mode 100644
index 78cdff9ea0ef..000000000000
--- a/app-containers/incus/incus-6.3-r1.ebuild
+++ /dev/null
@@ -1,219 +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 optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		doc/environment.md \
-		internal/server/apparmor/instance.go \
-		internal/server/apparmor/instance_qemu.go \
-		internal/server/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-6.0.confd incus
-	newinitd "${FILESDIR}"/incus-6.0.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
diff --git a/app-containers/incus/incus-6.5-r1.ebuild b/app-containers/incus/incus-6.5-r1.ebuild
new file mode 100644
index 000000000000..a703537528cf
--- /dev/null
+++ b/app-containers/incus/incus-6.5-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
+
+DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
+HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
+SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
+	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64"
+IUSE="apparmor fuidshift nls"
+
+DEPEND="acct-group/incus
+	acct-group/incus-admin
+	app-arch/xz-utils
+	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
+	dev-db/sqlite:3
+	>=dev-libs/cowsql-1.15.6
+	dev-libs/lzo
+	>=dev-libs/raft-0.22.1:=[lz4]
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp]
+	sys-libs/libcap
+	virtual/udev"
+RDEPEND="${DEPEND}
+	fuidshift? ( !app-containers/lxd )
+	net-firewall/ebtables
+	net-firewall/iptables
+	sys-apps/iproute2
+	sys-fs/fuse:*
+	>=sys-fs/lxcfs-5.0.0
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND=">=dev-lang/go-1.21
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+	~CGROUPS
+	~IPC_NS
+	~NET_NS
+	~PID_NS
+
+	~SECCOMP
+	~USER_NS
+	~UTS_NS
+
+	~KVM
+	~MACVTAP
+	~VHOST_VSOCK
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
+WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
+WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/incus
+	/usr/bin/incus-agent
+	/usr/bin/incus-benchmark
+	/usr/bin/incus-migrate
+	/usr/bin/lxc-to-incus
+	/usr/sbin/fuidshift
+	/usr/sbin/incusd
+	/usr/sbin/lxd-to-incus"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+# The testsuite must be run as root.
+# make: *** [Makefile:156: check] Error 1
+RESTRICT="test"
+
+GOPATH="${S}/_dist"
+
+src_unpack() {
+	verify-sig_src_unpack
+	go-module_src_unpack
+}
+
+src_prepare() {
+	export GOPATH="${S}/_dist"
+
+	default
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	sed -i \
+		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
+		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
+
+	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+	sed -i \
+		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
+
+	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
+	if use apparmor; then
+		sed -i \
+			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
+			"${T}"/incus.service || die
+	fi
+
+	# Disable -Werror's from go modules.
+	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
+}
+
+src_configure() { :; }
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
+
+	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
+		ego install -v -x "${S}/cmd/${k}"
+	done
+
+	if use fuidshift ; then
+		ego install -v -x "${S}/cmd/fuidshift"
+	fi
+
+	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
+
+	# Needs to be built statically
+	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
+	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	export GOPATH="${S}/_dist"
+
+	if tc-is-cross-compiler ; then
+		local bindir="_dist/bin/linux_${GOARCH}"
+	else
+		local bindir="_dist/bin"
+	fi
+
+	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
+
+	# Admin tools
+	for l in incusd incus-user lxd-to-incus ; do
+		dosbin ${bindir}/${l}
+	done
+
+	# User tools
+	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
+		dobin ${bindir}/${m}
+	done
+
+	# fuidshift, should be moved under admin tools at some point
+	if use fuidshift ; then
+		dosbin ${bindir}/fuidshift
+	fi
+
+	newconfd "${FILESDIR}"/incus-6.0.confd incus
+	newinitd "${FILESDIR}"/incus-6.0.initd incus
+	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
+
+	systemd_dounit "${T}"/incus.service
+	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
+	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
+	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
+	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
+
+	if ! tc-is-cross-compiler; then
+		# Generate and install shell completion files.
+		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
+		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
+		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
+		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
+	else
+		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
+	fi
+
+	dodoc AUTHORS
+	dodoc -r doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Please see"
+	elog "  https://wiki.gentoo.org/wiki/Incus"
+	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
+	elog
+	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full incus-migrate support" net-misc/rsync
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the incus group."
+	elog
+}
diff --git a/app-containers/netavark/netavark-1.11.0.ebuild b/app-containers/netavark/netavark-1.11.0.ebuild
index 42ba29c8332d..81168b09df45 100644
--- a/app-containers/netavark/netavark-1.11.0.ebuild
+++ b/app-containers/netavark/netavark-1.11.0.ebuild
@@ -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 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/netavark/netavark-9999.ebuild b/app-containers/netavark/netavark-9999.ebuild
index 42ba29c8332d..81168b09df45 100644
--- a/app-containers/netavark/netavark-9999.ebuild
+++ b/app-containers/netavark/netavark-9999.ebuild
@@ -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 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/podman/podman-5.1.1.ebuild b/app-containers/podman/podman-5.1.1.ebuild
index 95b806ea578e..fd1d527b4b94 100644
--- a/app-containers/podman/podman-5.1.1.ebuild
+++ b/app-containers/podman/podman-5.1.1.ebuild
@@ -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 ~riscv"
+		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 # main pkg
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index 95b806ea578e..fd1d527b4b94 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -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 ~riscv"
+		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 # main pkg
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index b75e3dd1293c..0f211bfd2b8c 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,2 +1 @@
-DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
 DIST aescrypt-3.16.tgz 39167 BLAKE2B 622976f55e33e98ede6488ee874d2f3371f928a8827d7973d967ddf253112eeb96036d2a7d4f8df7c1c9013e104d39fa5df9c28a7fce121cd11590a98e960c3a SHA512 b6d4fda92bb465c36a9930de0d86777111d2da67f2aa274fb98fcd99629c7ff2d88d8faffdbeeae25c44dc99f0f29b2872867128b7e3a384deada744ce21cdd0
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
deleted file mode 100644
index 51a5d8403d18..000000000000
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic desktop xdg
-
-DESCRIPTION="Advanced file encryption using AES"
-HOMEPAGE="https://www.aescrypt.com/"
-SRC_URI="https://www.aescrypt.com/download/v$(ver_cut 1)/linux/${P}.tgz"
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="static X"
-RDEPEND="X? (
-		|| ( gnome-extra/zenity kde-apps/kdialog )
-		dev-lang/perl
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-iconv.patch"
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i \
-		-e 's:Icon=/usr/share/aescrypt/SmallLock.png:Icon=SmallLock:' \
-		-e 's|Categories=Application;Utility;TextEditor;|Categories=Utility;TextEditor;|' \
-		gui/AESCrypt.desktop || die
-}
-
-src_compile() {
-	if use static; then
-		append-cflags "-DDISABLE_ICONV"
-		append-ldflags "-static"
-	fi
-	cd src || die
-	emake \
-		CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-src_test() {
-	cd src || die
-	emake -j1 test \
-		CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin src/{aescrypt,aescrypt_keygen}
-	doman man/*
-	doicon gui/SmallLock.png
-	domenu gui/AESCrypt.desktop
-	dobin gui/aescrypt-gui
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use X; then
-		einfo 'The .desktop file for aescrypt is only supposed to be used with "Open With"'
-		einfo 'to encrypt and decrypt files.'
-		einfo 'See:'
-		einfo '	https://www.aescrypt.com/linux_aes_crypt.html'
-		einfo 'for more information'
-	fi
-}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
deleted file mode 100644
index 8232f80aebbc..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:18:08 +0200
-Subject: [PATCH 2/2] build: support disable iconv for static build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- password.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/password.c b/password.c
-index 9a2c1f8..dee79da 100644
---- a/src/password.c
-+++ b/src/password.c
-@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
-     size_t ic_inbytesleft,
-            ic_outbytesleft;
- 
-+#ifdef DISABLE_ICONV
-+    /* support only latin */
-+    int i;
-+    for (i=0;i<length+1;i++) {
-+    	out_passwd[i*2] = in_passwd[i];
-+	out_passwd[i*2+1] = 0;
-+    }
-+    return length*2;
-+#else
-     /* Max length is specified in character, but this function deals
-      * with bytes.  So, multiply by two since we are going to create a
-      * UTF-16 string.
-@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
-     }
-     iconv_close(condesc);
-     return (max_length - ic_outbytesleft);
-+#endif
- }
- 
--- 
-1.7.12.4
-
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
deleted file mode 100644
index 757f0e4e7fcb..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naru a/src/Makefile b/src/Makefile
---- a/src/Makefile	2021-07-14 09:25:15.509797042 +0200
-+++ b/src/Makefile	2021-07-14 09:25:46.689797121 +0200
-@@ -27,13 +27,13 @@
- all: aescrypt aescrypt_keygen
- 
- aescrypt: $(AESCRYPT_OBJS)
--	$(CC) $(CFLAGS) $(LIBS) -o $@ $(AESCRYPT_OBJS)
-+	$(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(AESCRYPT_OBJS)
- 
- aescrypt_keygen: $(KEYGEN_OBJS)
--	$(CC) $(CFLAGS) $(LIBS) -o $@ $(KEYGEN_OBJS)
-+	$(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(KEYGEN_OBJS)
- 
- %.o: %.c %.h
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c $*.c
- 
- install: aescrypt
- 	install -o root -g root -m 755 aescrypt /usr/bin
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
deleted file mode 100644
index a6c2a097c9bc..000000000000
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="ASEKey USB SIM Card Reader"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-crypt/asekey/${P}.tar.bz2"
-LICENSE="BSD LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="sys-apps/pcsc-lite[udev]
-	virtual/libusb:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bundle.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/GROUP="pcscd"/ENV{PCSCD}="1"/' "92_pcscd_${PN}.rules" || die
-}
-
-src_configure() {
-	econf --with-udev-rules-dir="$(get_udevdir)/rules.d"
-}
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index 2a93cd938d41..3b993f14bc5e 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,2 +1 @@
 DIST gnupg-pkcs11-scd-0.10.0.tar.bz2 149036 BLAKE2B 7282850ddb953a32114a3b28e9f1992dd73cc64d065c00308479276750bdfd52533c3347361d86fb6ddc8ae01fcfabe5b375501280c9bd93e6a6d4e209c63e98 SHA512 47b9afdc3552fc9a741a725c6732cd31cd2643d7483a50d26222d68d0557b700addff37d8598ee1076575b8bc1e1134a52e06b67d4f94dda7c90141a57ca4182
-DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
deleted file mode 100644
index 96b4bdf1f3fe..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PKCS#11 support for GnuPG"
-HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
-SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy"
-
-DEPEND="
-	dev-libs/openssl:0=
-	dev-libs/libassuan:=
-	dev-libs/libgcrypt:=
-	dev-libs/libgpg-error:=
-	dev-libs/pkcs11-helper:=
-"
-RDEPEND="
-	${DEPEND}
-	proxy? (
-		acct-group/gnupg-pkcs11
-		acct-group/gnupg-pkcs11-scd-proxy
-		acct-user/gnupg-pkcs11-scd-proxy
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable proxy)
-		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use proxy; then
-		newinitd "${FILESDIR}/gnupg-pkcs11-scd-proxy.initd" gnupg-pkcs11-scd-proxy
-		newconfd "${FILESDIR}/gnupg-pkcs11-scd-proxy.confd" gnupg-pkcs11-scd-proxy
-	fi
-}
diff --git a/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch b/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch
new file mode 100644
index 000000000000..5e7a37d9ff01
--- /dev/null
+++ b/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch
@@ -0,0 +1,40 @@
+From ecd0c86d62351d267bdc9566286c532a394c711b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Mon, 2 Sep 2024 15:33:25 +0200
+Subject: [PATCH] build,python: Fix build with setuptools 72.2.0+
+
+* lang/python/setup.py.in (BuildExtFirstHack.run): Extend members of the
+extension instead of lists that were passed to the extension.
+--
+
+setuptools 72.2.0 integrated changes in distutils which included
+"Support for Pathlike objects in data files and extensions". With this
+change the extensions now take a copy of the sources list passed to the
+constructor instead of keeping a reference to the passed list. Hence,
+modifying the sources list that was passed to the extension didn't
+change the sources list of the extension anymore. This is fixed by
+modifying the sources list of the extension directly. For consistency
+we do the same for the swig_opts list.
+
+GnuPG-bug-id: 7281
+---
+ lang/python/setup.py.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 7b64ba7b..d6f537e0 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
+@@ -217,9 +217,9 @@ class BuildExtFirstHack(build):
+     def run(self):
+         self._generate()
+ 
+-        swig_sources.extend((self._in_build_base('gpgme.i'),
+-                             self._in_build_base('helpers.c')))
+-        swig_opts.extend([
++        swige.sources.extend((self._in_build_base('gpgme.i'),
++                              self._in_build_base('helpers.c')))
++        swige.swig_opts.extend([
+             '-I' + self.build_base, '-outdir',
+             os.path.join(self.build_lib, 'gpg')
+         ])
diff --git a/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild b/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
new file mode 100644
index 000000000000..043a8992cf5c
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+
+# in-source builds are not supported:
+# * https://dev.gnupg.org/T6313#166339
+# * https://dev.gnupg.org/T6673#174545
+inherit distutils-r1 libtool flag-o-matic multibuild qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="
+	mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# 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 ~ia64 ~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="
+	qt5? ( cxx )
+	qt6? ( cxx )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# - On each bump, update dep bounds on each version from configure.ac!
+RDEPEND="
+	>=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.46-r1:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? ( dev-qt/qtbase:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+#doc? ( app-text/doxygen[dot] )
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
+	python? ( dev-lang/swig )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+	"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+	# backport fix for setuptools 72.2 breakage
+	"${FILESDIR}"/ecd0c86d62351d267bdc9566286c532a394c711b.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+
+	# Qt 5 and Qt 6 are mutually exclusive in the gpgme build. We don't have
+	# to do three builds (normal, qt5, qt6), and we can instead just
+	# do normal+qt5 or normal+qt6. For now, we pessimise qt6 by making it
+	# be a separate build, but in time, we can swap it so qt5 has to be
+	# the separate one so some build time gets saved in the common case.
+	MULTIBUILD_VARIANTS=(
+		base
+		$(usev qt6 qt6)
+	)
+
+	gpgme_create_builddir() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+
+	multibuild_foreach_variant gpgme_create_builddir
+}
+
+src_configure() {
+	multibuild_foreach_variant gpgme_src_configure
+}
+
+gpgme_src_configure() {
+	# bug #847955
+	append-lfs-flags
+
+	cd "${BUILD_DIR}" || die
+
+	local languages=()
+
+	case ${MULTIBUILD_VARIANT} in
+		base)
+			languages=(
+				$(usev common-lisp 'cl')
+				$(usev cxx 'cpp')
+				$(usev qt5 'qt5')
+			)
+
+			if use qt5; then
+				#use doc ||
+				export DOXYGEN=true
+				export MOC="$(qt5_get_bindir)/moc"
+			fi
+
+			;;
+		*)
+			# Sanity check for refactoring, the non-base variant is only for Qt 6
+			use qt6 || die "Non-base variant shouldn't be built without Qt 6! Please report at bugs.gentoo.org."
+
+			languages=(
+				cpp
+				qt6
+			)
+
+			export MOC="$(qt6_get_libdir)/qt6/libexec/moc"
+
+			;;
+	esac
+
+	local myeconfargs=(
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
+		--enable-languages="${languages[*]}"
+		$(use_enable static-libs static)
+		GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		emake -C lang/python prepare
+
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	multibuild_foreach_variant gpgme_src_compile
+}
+
+gpgme_src_compile() {
+	cd "${BUILD_DIR}" || die
+
+	emake
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	multibuild_foreach_variant gpgme_src_test
+}
+
+gpgme_src_test() {
+	cd "${BUILD_DIR}" || die
+
+	emake check
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+	einstalldocs
+	multibuild_foreach_variant gpgme_src_install
+}
+
+gpgme_src_install() {
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym -r /usr/include/gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild b/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
new file mode 100644
index 000000000000..fc5ec165c014
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+
+# in-source builds are not supported:
+# * https://dev.gnupg.org/T6313#166339
+# * https://dev.gnupg.org/T6673#174545
+inherit distutils-r1 libtool flag-o-matic multibuild qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="
+	mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# 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 ~ia64 ~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="
+	qt5? ( cxx )
+	qt6? ( cxx )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# - On each bump, update dep bounds on each version from configure.ac!
+RDEPEND="
+	>=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.46-r1:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? ( dev-qt/qtbase:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+#doc? ( app-text/doxygen[dot] )
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-lang/swig
+	)
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+	"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+	# backport fix for setuptools 72.2 breakage
+	"${FILESDIR}"/ecd0c86d62351d267bdc9566286c532a394c711b.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+
+	# Qt 5 and Qt 6 are mutually exclusive in the gpgme build. We don't have
+	# to do three builds (normal, qt5, qt6), and we can instead just
+	# do normal+qt5 or normal+qt6. For now, we pessimise qt6 by making it
+	# be a separate build, but in time, we can swap it so qt5 has to be
+	# the separate one so some build time gets saved in the common case.
+	MULTIBUILD_VARIANTS=(
+		base
+		$(usev qt6 qt6)
+	)
+
+	gpgme_create_builddir() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+
+	multibuild_foreach_variant gpgme_create_builddir
+}
+
+src_configure() {
+	multibuild_foreach_variant gpgme_src_configure
+}
+
+gpgme_src_configure() {
+	# bug #847955
+	append-lfs-flags
+
+	cd "${BUILD_DIR}" || die
+
+	local languages=()
+
+	case ${MULTIBUILD_VARIANT} in
+		base)
+			languages=(
+				$(usev common-lisp 'cl')
+				$(usev cxx 'cpp')
+				$(usev qt5 'qt5')
+			)
+
+			if use qt5; then
+				#use doc ||
+				export DOXYGEN=true
+				export MOC="$(qt5_get_bindir)/moc"
+			fi
+
+			;;
+		*)
+			# Sanity check for refactoring, the non-base variant is only for Qt 6
+			use qt6 || die "Non-base variant shouldn't be built without Qt 6! Please report at bugs.gentoo.org."
+
+			languages=(
+				cpp
+				qt6
+			)
+
+			export MOC="$(qt6_get_libdir)/qt6/libexec/moc"
+
+			;;
+	esac
+
+	local myeconfargs=(
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
+		--enable-languages="${languages[*]}"
+		$(use_enable static-libs static)
+		GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		emake -C lang/python prepare
+
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	multibuild_foreach_variant gpgme_src_compile
+}
+
+gpgme_src_compile() {
+	cd "${BUILD_DIR}" || die
+
+	emake
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	multibuild_foreach_variant gpgme_src_test
+}
+
+gpgme_src_test() {
+	cd "${BUILD_DIR}" || die
+
+	emake check
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+	einstalldocs
+	multibuild_foreach_variant gpgme_src_install
+}
+
+gpgme_src_install() {
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+		pushd lang/python > /dev/null || die
+		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym -r /usr/include/gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/gpgme-1.23.2.ebuild b/app-crypt/gpgme/gpgme-1.23.2.ebuild
deleted file mode 100644
index 729e18d1df98..000000000000
--- a/app-crypt/gpgme/gpgme-1.23.2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-DISTUTILS_EXT=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-
-# in-source builds are not supported:
-# * https://dev.gnupg.org/T6313#166339
-# * https://dev.gnupg.org/T6673#174545
-inherit distutils-r1 libtool flag-o-matic multibuild qmake-utils toolchain-funcs verify-sig
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
-SRC_URI="
-	mirror://gnupg/gpgme/${P}.tar.bz2
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )
-"
-
-LICENSE="GPL-2 LGPL-2.1"
-# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
-# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
-# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
-# 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 ~ia64 ~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="
-	qt5? ( cxx )
-	qt6? ( cxx )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# - On each bump, update dep bounds on each version from configure.ac!
-RDEPEND="
-	>=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.46-r1:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )
-	qt6? ( dev-qt/qtbase:6 )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-#doc? ( app-text/doxygen[dot] )
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' python3_12)
-	python? ( dev-lang/swig )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
-	"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	# bug #697456
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
-		die "Could not run tests as requested with too-long WORKDIR."
-	fi
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b" || die
-	S="${WORKDIR}/b"
-
-	# Qt 5 and Qt 6 are mutually exclusive in the gpgme build. We don't have
-	# to do three builds (normal, qt5, qt6), and we can instead just
-	# do normal+qt5 or normal+qt6. For now, we pessimise qt6 by making it
-	# be a separate build, but in time, we can swap it so qt5 has to be
-	# the separate one so some build time gets saved in the common case.
-	MULTIBUILD_VARIANTS=(
-		base
-		$(usev qt6 qt6)
-	)
-
-	gpgme_create_builddir() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-
-	multibuild_foreach_variant gpgme_create_builddir
-}
-
-src_configure() {
-	multibuild_foreach_variant gpgme_src_configure
-}
-
-gpgme_src_configure() {
-	# bug #847955
-	append-lfs-flags
-
-	cd "${BUILD_DIR}" || die
-
-	local languages=()
-
-	case ${MULTIBUILD_VARIANT} in
-		base)
-			languages=(
-				$(usev common-lisp 'cl')
-				$(usev cxx 'cpp')
-				$(usev qt5 'qt5')
-			)
-
-			if use qt5; then
-				#use doc ||
-				export DOXYGEN=true
-				export MOC="$(qt5_get_bindir)/moc"
-			fi
-
-			;;
-		*)
-			# Sanity check for refactoring, the non-base variant is only for Qt 6
-			use qt6 || die "Non-base variant shouldn't be built without Qt 6! Please report at bugs.gentoo.org."
-
-			languages=(
-				cpp
-				qt6
-			)
-
-			export MOC="$(qt6_get_libdir)/qt6/libexec/moc"
-
-			;;
-	esac
-
-	local myeconfargs=(
-		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
-		--enable-languages="${languages[*]}"
-		$(use_enable static-libs static)
-		GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
-		emake -C lang/python prepare
-
-		pushd lang/python > /dev/null || die
-		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	multibuild_foreach_variant gpgme_src_compile
-}
-
-gpgme_src_compile() {
-	cd "${BUILD_DIR}" || die
-
-	emake
-
-	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
-		pushd lang/python > /dev/null || die
-		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	multibuild_foreach_variant gpgme_src_test
-}
-
-gpgme_src_test() {
-	cd "${BUILD_DIR}" || die
-
-	emake check
-
-	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	emake -C lang/python/tests check \
-		PYTHON=${EPYTHON} \
-		PYTHONS=${EPYTHON} \
-		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-}
-
-src_install() {
-	einstalldocs
-	multibuild_foreach_variant gpgme_src_install
-}
-
-gpgme_src_install() {
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
-		pushd lang/python > /dev/null || die
-		top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# Backward compatibility for gentoo
-	# (in the past, we had slots)
-	dodir /usr/include/gpgme
-	dosym -r /usr/include/gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
deleted file mode 100644
index 2db7d36fe6fe..000000000000
--- a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
+++ /dev/null
@@ -1,190 +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} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="https://www.heimdal.software/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-# 717740
-REQUIRED_USE="otp? ( berkdb )"
-
-CDEPEND="
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	ssl? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb:= )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	dev-perl/JSON
-	virtual/pkgconfig
-	sys-apps/texinfo
-	>=dev-build/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-PATCHES=(
-	"${FILESDIR}/heimdal_disable-check-iprop.patch"
-	"${FILESDIR}/heimdal_tinfo.patch"
-	"${FILESDIR}/heimdal_build-headers-before-use.patch"
-	"${FILESDIR}/heimdal_fix-db60.patch"
-	"${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-kcm
-		--disable-osfc2
-		--enable-shared
-		--with-libintl="${EPREFIX}"/usr
-		--with-readline="${EPREFIX}"/usr
-		--with-sqlite3="${EPREFIX}"/usr
-		--libexecdir="${EPREFIX}"/usr/sbin
-		--enable-pthread-support
-		--enable-kx509
-		--enable-pk-init
-		--with-ipv6
-		$(use_enable afs afs-support)
-		$(use_enable gdbm ndbm-db)
-		$(use_enable lmdb mdb-db)
-		$(use_enable otp)
-		$(use_enable static-libs static)
-		$(multilib_native_use_with caps capng)
-		$(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(multilib_native_use_with X x)
-	)
-	if use berkdb; then
-		myeconfargs+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myeconfargs+=(
-			--without-berkeley-db
-		)
-	fi
-
-	CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C include
-		emake -C lib
-		emake -C kdc
-		emake -C tools
-		emake -C tests/plugin
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${ED}"/usr/share/man/man1/{,k}su.1
-	mv "${ED}"/usr/bin/{,k}su
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r2.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r2.ebuild
deleted file mode 100644
index 8645dd099c0d..000000000000
--- a/app-crypt/heimdal/heimdal-7.8.0-r2.ebuild
+++ /dev/null
@@ -1,191 +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} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="https://www.heimdal.software/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-# 717740
-REQUIRED_USE="otp? ( berkdb )"
-
-CDEPEND="
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	ssl? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb:= )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	dev-perl/JSON
-	virtual/pkgconfig
-	sys-apps/texinfo
-	>=dev-build/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-PATCHES=(
-	"${FILESDIR}/heimdal_disable-check-iprop.patch"
-	"${FILESDIR}/heimdal_tinfo.patch"
-	"${FILESDIR}/heimdal_build-headers-before-use.patch"
-	"${FILESDIR}/heimdal_fix-db60.patch"
-	"${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
-	"${FILESDIR}/heimdal-7.8.0-configure-clang16.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-kcm
-		--disable-osfc2
-		--enable-shared
-		--with-libintl="${EPREFIX}"/usr
-		--with-readline="${EPREFIX}"/usr
-		--with-sqlite3="${EPREFIX}"/usr
-		--libexecdir="${EPREFIX}"/usr/sbin
-		--enable-pthread-support
-		--enable-kx509
-		--enable-pk-init
-		--with-ipv6
-		$(use_enable afs afs-support)
-		$(use_enable gdbm ndbm-db)
-		$(use_enable lmdb mdb-db)
-		$(use_enable otp)
-		$(use_enable static-libs static)
-		$(multilib_native_use_with caps capng)
-		$(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(multilib_native_use_with X x)
-	)
-	if use berkdb; then
-		myeconfargs+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myeconfargs+=(
-			--without-berkeley-db
-		)
-	fi
-
-	CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C include
-		emake -C lib
-		emake -C kdc
-		emake -C tools
-		emake -C tests/plugin
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${ED}"/usr/share/man/man1/{,k}su.1
-	mv "${ED}"/usr/bin/{,k}su
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index 74c99ee7cd19..dd4573cb71cf 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1,2 +1 @@
-DIST jitterentropy-rngd-1.2.7.tar.gz 46546 BLAKE2B 82f0610ab5e2dd4ac42b5c2a72a59cc9c78dd65f82327302d4699b129280d45bf61a7197d44d3d141b6ccd3b512b984b0f95f1594c97a8c54f10c0d58906089c SHA512 4d89110cb7456b360f4c268121b61c2141b9d592877728eb94de0c8679928689b3b039a99579af4ee1299a1eb538c9a2d4527d9a4e98f85022c590a0d01f4811
 DIST jitterentropy-rngd-1.2.8.tar.gz 46950 BLAKE2B 67e6a590bf5d535a6f8cf465b8c6f59ccc101e699979573e117432545800e42393e2232f5a3404f03f7806eb79c4a3148a14eb35f660233926ac874ad5207779 SHA512 9cc2c66388f592e2e4df89e0e9950dc83af168658dd456c9b1af9883cce7ce5f6ece37089d7dbfb0bb61433a52bf596d129819b3328551f2ec29a5d74f94ea47
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild
deleted file mode 100644
index 37d72d52b963..000000000000
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info systemd
-
-DESCRIPTION="Jitter RNG daemon"
-HOMEPAGE="https://www.chronox.de/jent.html"
-SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
-)
-
-src_configure() {
-	filter-flags '*'
-	append-cflags '-O0'
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
-		UNITDIR="$(systemd_get_systemunitdir)" install
-	newinitd "${FILESDIR}"/jitterentropy-rngd-initd jitterentropy-rngd
-}
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
index a4b7ead3be06..f30f4e698c65 100644
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
index 368d59abb709..c5012306a202 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
index d4b9287e610c..1b05f5211215 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
@@ -16,7 +16,7 @@ else
 	HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index d4b9287e610c..1b05f5211215 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -16,7 +16,7 @@ else
 	HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index b6d5aa94e987..6bacce7460a3 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,2 +1,3 @@
 DIST keysmith-23.08.5.tar.xz 163456 BLAKE2B b7338decbf1ccfe9f07d208decdcc1ea5133df9d7f53ff4e543c46782e5218e146e35f8d8348f8300021f7223d4edc8cf85a36ca777b00c52a5c13590c9ce12c SHA512 4c53ac7a217cd2f82cb0e270df1e4e7382d6fe3f7a7ff5008e392ae50418b6bf505f596d17c009921532bfbccba3d33f81cc934433ea63d9ba65c1187b4cba69
 DIST keysmith-24.05.2.tar.xz 171756 BLAKE2B 5059579e9529f834814a3f586dbab5aad1a5235759c0fa76a7c7cf5588bb3b2fd64ca381d0d749d88cf74446ca5a380cb6f49eebe005e34a6f184e3f8fbcf7dd SHA512 fd2964b4fc754ac71d5fc2b273e2e70671f4b8a4cdf95e340ade20a234d7ddbfc81e0a6bfbde3178b49ba94b3219a2e1169903eac4d707b1f130df7ed7478f77
+DIST keysmith-24.08.0.tar.xz 171440 BLAKE2B 6aff612d21b66f9a7d2170cc6fde009c447c0686d3aeee8a4fb043b500452cd831f45dd943da3f44965d326a373cbf220b7a6cc46285d74e4d56db4d5d1017be SHA512 10016b4d3268e5b7caa52765602ffbc2c4b7d66f2c1ff6053110781b64981f304198fc8351889251c4c32b3647648af67389d440ed625d592ada80080d0070d8
diff --git a/app-crypt/keysmith/keysmith-24.05.2.ebuild b/app-crypt/keysmith/keysmith-24.05.2.ebuild
index fdb339d18339..bb6b9b405e71 100644
--- a/app-crypt/keysmith/keysmith-24.05.2.ebuild
+++ b/app-crypt/keysmith/keysmith-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/app-crypt/keysmith/keysmith-24.08.0.ebuild b/app-crypt/keysmith/keysmith-24.08.0.ebuild
new file mode 100644
index 000000000000..592cdbe13527
--- /dev/null
+++ b/app-crypt/keysmith/keysmith-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/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/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 185c64f6f211..655ded545df1 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,2 +1 @@
-DIST krb5-1.21.2.tar.gz 8622513 BLAKE2B 2afb3ff962a343bc07182fdab0c0ffb221632ff38baab74278cfc721ae72deacc260221470de36e420584f00b780e13221d2e511d4831bca8e1270b7f3d9e824 SHA512 4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49
 DIST krb5-1.21.3.tar.gz 9136145 BLAKE2B e909a55eaedab68e5c829bb7bbd26cec5db2d7b8d97f3b034de94d8f957003f16977ac619afee3b862f288e59f05c5e44f41e65b8883961c8b22a26e2f4733bc SHA512 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild
deleted file mode 100644
index 8f94ab10df74..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild
+++ /dev/null
@@ -1,152 +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 systemd toolchain-funcs multilib-minimal
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}/src
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb:= )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-alternatives/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? ( dev-util/cmocka )
-	"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}_dont_create_rundir.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# lto-type-mismatch (bug #854225)
-	filter-lto
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	AR="$(tc-getAR)" \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
index 9c5de12c588a..72ab88e121a9 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}/src
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux test xinetd"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index c685ec090a50..2b5d54ee6558 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,6 +1,2 @@
-DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
 DIST osslsigncode-2.8.tar.gz 747274 BLAKE2B 62472d0830b53b2d182b37585a225f0699600bcc2bad5915a64a52b5b7c3fab6f7e936ba82e41907e41c9b0cc1f8ff5f47aa79feb8c5742b16d1fe101baf3db0 SHA512 dd7349e3a64c1d6f63379a14450c8e643c006d2824dc41ce9ecde64ba276466772c440e577aca4a805a49c7ba88aa0dcf5ea73c323abcc4945491407b20e8e96
-DIST osslsigncode-test-unsigned.cat 394 BLAKE2B 77a9ebd80feb7ec4f26c0899a760b6463f88ed2301fd3c65c4d72417f7d7d61f0e51c0ca87870500bec51f900aafe05216f4cec888db6c76b292760862da7d00 SHA512 3f4212a4a0822079ba46a90aa80f725d0068bc30e8be057019b2c500633d502f6d879c4ba332c54e1194c148a1fd4d7551a2ba7cb143f2fe53cef5fe94d9364c
-DIST osslsigncode-test-unsigned.ex_ 120 BLAKE2B 7036b07cfa8f7d1bcdfc1293671aaa01780bffee0339aa5b63b8db77dd2d77a75ffa51363385c2d40d62d057adf4627afa47f099f8e1206c4eeda67af01bd8fc SHA512 373592e6bffe1da907cfa464fa70d1b64c177beb7fd76325553afb0d721263d35b40508e3ede0a64bd016abb2ce97e104417fa472cd2bb0d92f5d14d5001349c
-DIST osslsigncode-test-unsigned.exe 96150 BLAKE2B fd0da9e64473fed792572606f38de8c71e285a557883ac29201b113abc533a32c80ed17330860dd30b9913302ea44433c41d21ba236789ed6d25083f5909960b SHA512 afed867e6a680d7bdfe27e537ccf6496572d79b8b8a90e1886a83d9b8a67c815a54b7bd929819a0cab7b3243c276dd676e51b267a918ace448689d4b424d948b
-DIST osslsigncode-test-unsigned.msi 9728 BLAKE2B eb253cce75c5419d1815682c10f1b10357af90317b1dfa71d3b888e5b158017b8f2b3154ae2073bed1fd5f9fd515c2006a0cb0692a70d1876221f3fe5b048f33 SHA512 3c3afa76d5a76dd7eff35b5d8e8b5a5bbcccd23f213591d3a8d0b4e5e97a8dbabb97345b7a93bb459fded5269f5ce1d7afa66baf623c8b8573f95b68fb4a93c1
+DIST osslsigncode-2.9.tar.gz 1033420 BLAKE2B 63897907102f7e3ee241d4a0436ac2c217351cbdf330c302344ad648cc5d7962ea9936b1c1ccfe6072c3188f6e49f892b323eecc0c87476071effb6d02f9e0e0 SHA512 c88d3050b0f4af5cf4ec899ac1935cd04833ed8c7690298ab1bf0c00c4e53bf5a4f9ee31940d63e29350a6babf43f212e56aa480a67745b6d715a30a8093e3a6
diff --git a/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
new file mode 100644
index 000000000000..4385aba12b46
--- /dev/null
+++ b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
@@ -0,0 +1,27 @@
+From a8c1bf9838610bbb8362b1d425cdd3e2ecfecc8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Sun, 1 Sep 2024 14:59:49 +0200
+Subject: [PATCH] tests: add import for python-cryptography >= 43.0.0
+
+write_pkcs12_container method raises following error message with
+python-cryptography-43.0.0:
+
+  Error: module 'cryptography.hazmat.primitives.serialization' has no attribute 'pkcs12'
+
+Explicit import of the pkcs12 module resolves the issue.
+
+Upstream-PR: https://github.com/mtrojnar/osslsigncode/pull/407
+
+diff --git a/tests/make_certificates.py b/tests/make_certificates.py
+index 6fb03ac2..ea14a7ed 100644
+--- a/tests/make_certificates.py
++++ b/tests/make_certificates.py
+@@ -10,6 +10,8 @@
+ from cryptography.hazmat.primitives import serialization
+ from cryptography.hazmat.primitives.asymmetric import rsa
+ 
++import cryptography.hazmat.primitives.serialization.pkcs12
++
+ RESULT_PATH = os.getcwd()
+ CERTS_PATH = os.path.join(RESULT_PATH, "./Testing/certs/")
+ 
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 7c529bd10048..efa2c3eb8359 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="sourceforge">osslsigncode</remote-id>
 		<remote-id type="github">mtrojnar/osslsigncode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
deleted file mode 100644
index c0d1773bcf38..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-2.5.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/releases/download/${PV}/${P}.tar.gz"
-
-for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
-	SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
-done
-unset test_file
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	curl? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test ; then
-		local test_file
-		for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
-			cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
-		done
-		unset test_file
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package curl CURL)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test -j1
-}
diff --git a/app-crypt/osslsigncode/osslsigncode-2.9.ebuild b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
new file mode 100644
index 000000000000..7974b492fea1
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 cmake python-any-r1
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
+SRC_URI="
+	https://github.com/mtrojnar/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/openssl-3:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-import.patch"
+)
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_test() {
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	mv "${D}$(get_bashcompdir)/${PN}"{.bash,} || die #927196
+}
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index 6fe6dfea742c..7208c1695cbd 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -1,2 +1 @@
-DIST pgpdump-0.35.tar.gz 77580 BLAKE2B 2c0b8d69bccf37a0d9a192273f901c52d74fa2423f32084a9ddda9c70c2055a0b594113b486cb9bcd8e9566cef781938186400dc139e9e00439db067b38307cb SHA512 03579d7d89d98f19f50c9722c063f059904887f7ca7da3eb99a4aadc6c5361b5161c891767a93087bfb42641aa2e24a9ad6560b1e4396370217afec61a988015
 DIST pgpdump-0.36.tar.gz 77084 BLAKE2B 35fb10acd70ca4e2408bc8fdc2cbebe37d2b1ecbd96fdb847688fe1c15ef78e993bddb30015da42847ab50d2dea6ba44d97d958f395095725947120119c10aaf SHA512 0e8917893ff824b4fcb1656727f3bb120b1772259047f50f56931750ac74548eddb89a75baeaa2da4e39db8045af0db3c4f5ccbcda7e129ca4949c0abf7d4dd2
diff --git a/app-crypt/pgpdump/pgpdump-0.35.ebuild b/app-crypt/pgpdump/pgpdump-0.35.ebuild
deleted file mode 100644
index 82da34560146..000000000000
--- a/app-crypt/pgpdump/pgpdump-0.35.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A PGP packet visualizer"
-HOMEPAGE="https://www.mew.org/~kazu/proj/pgpdump/"
-SRC_URI="https://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc sparc x86"
-
-DEPEND="app-arch/bzip2
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
-)
-
-src_install() {
-	dobin pgpdump
-	doman pgpdump.1
-	dodoc CHANGES README.md
-}
diff --git a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
index 93734b1fa10d..f99a2bbf652d 100644
--- a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X"
 
 DEPEND="
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 702fa93f9162..996495923376 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/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>nickaristocrates@gmail.com</email>
-		<name>Nicholas Meyer</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The PGP Individual UID Signer (PIUS) is a tool for individually
 		signing all of the UIDs on a set of keys and encrypt-emailing each
diff --git a/app-crypt/pius/pius-3.0.0-r1.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild
deleted file mode 100644
index cf60ccbe13a5..000000000000
--- a/app-crypt/pius/pius-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
-SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=app-crypt/gnupg-2.0.0"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Fix-typos-132.patch"
-	"${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch"
-	"${FILESDIR}/${P}-Fix-typo-in-readme-135.patch"
-	"${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch"
-)
-
-python_test() {
-	${EPYTHON} -m unittest discover -s test/* -v || die
-}
diff --git a/app-crypt/pius/pius-3.0.0-r2.ebuild b/app-crypt/pius/pius-3.0.0-r2.ebuild
index 184aaf851b53..c6f48e76ca35 100644
--- a/app-crypt/pius/pius-3.0.0-r2.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
 DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
+HOMEPAGE="https://github.com/jaymzh/pius"
 SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
deleted file mode 100644
index 202b59ce9a9f..000000000000
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PkZip cipher breaker"
-HOMEPAGE="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
-SRC_URI="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/${P}.tar.gz"
-
-LICENSE="pkcrack"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!<app-text/html-xml-utils-5.3"
-BDEPEND="test? ( app-arch/zip[crypt] )"
-
-DOCS=(
-	doc/KNOWN_BUGS
-	doc/appnote.iz.txt
-	doc/README.W32
-	doc/pkzip.ps.gz
-	doc/CHANGES
-	doc/LIESMICH
-	doc/README.html
-	doc/README
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_compile() {
-	cd src
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
-}
-
-src_test() {
-	cd test
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
-}
-
-src_install() {
-	einstalldocs
-	cd src
-	dobin pkcrack zipdecrypt findkey makekey
-	newbin extract "${PN}-extract"
-}
-
-pkg_postinst() {
-	ewarn "Due to file collision, extract utility was renamed to ${PN}-extract,"
-	ewarn "see bug#247394"
-}
diff --git a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch b/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
deleted file mode 100644
index e16fa76f6c57..000000000000
--- a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 123123453bd4f3ac87ca6dd641a9028e6e7a29f0 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Mon, 24 Jul 2023 13:32:30 +0000
-Subject: [PATCH] Sign self-signed certs with SHA256
-
----
- plugins/qca-ossl/qca-ossl.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index 893631c9..f340ee2f 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -3470,10 +3470,8 @@ public:
-         X509_EXTENSION *ex;
- 
-         const EVP_MD *md;
--        if (priv.key()->type() == PKey::RSA)
--            md = EVP_sha1();
--        else if (priv.key()->type() == PKey::DSA)
--            md = EVP_sha1();
-+        if (priv.key()->type() == PKey::RSA || priv.key()->type() == PKey::DSA)
-+            md = EVP_sha256();
-         else
-             return false;
- 
--- 
-GitLab
-
diff --git a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
deleted file mode 100644
index ab23372e768f..000000000000
--- a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rotix-0.83/Makefile
-===================================================================
---- rotix-0.83.orig/Makefile
-+++ rotix-0.83/Makefile
-@@ -22,12 +22,6 @@
- 
- include Makefile.settings
- 
--ifdef DEBUG
--CFLAGS += -g3
--else
--CFLAGS += -O3
--endif
--
- ifdef I18N
- CFLAGS += -DPACKAGE=\"${PACKAGE}\" -D LOCALEDIR=\"${LOCALE}\"
- endif
-@@ -39,12 +33,7 @@ endif
- all : rotix po
- 
- rotix : rot.o help.o rotix.o
--	$(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o
--ifdef STRIP
--ifndef DEBUG
--	$(STRIP) rotix
--endif
--endif
-+	$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o rotix rot.o help.o rotix.o
- 
- ifdef I18N
- CFLAGS += -D I18N=1
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
deleted file mode 100644
index 31d10f900b4b..000000000000
--- a/app-crypt/rotix/rotix-0.83-r1.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
-inherit flag-o-matic
-
-DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://github.com/shemminga/rotix"
-SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/0.83-respect-CFLAGS-and-dont-strip.patch
-	"${FILESDIR}"/rotix-0.83-locale.patch
-	"${FILESDIR}"/rotix-0.83-interix.patch
-)
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	use elibc_glibc || append-flags -lintl
-	econf --i18n=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index a96d507722c3..f5c9b71057cb 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -4,3 +4,6 @@ DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714
 DIST sbctl-0.14-deps.tar.xz 114919252 BLAKE2B a2baa7cca501d924c1353404725999fb8372b52e88a3e2bd7760cf04da4900c676a326c3687adb58169acfb032e4009bb35be66cef3547cf888767325a0baecb SHA512 75122f835dc4f2bd41a8dbdd2b5ed6ad4c9c2f2f802f989245d08c55620d4eb992d23c78812bc761b96fb6b44b6eb6b6ae702b32d8b8f60ad23ac8a76f7e70bd
 DIST sbctl-0.14.tar.gz 17809255 BLAKE2B a59eb3c5a32cb73cb2993c785d16798cbc83b70186eda8c8ce064a17fc338d3e70b93b277ad55c20991952e8d807c77f2a23ae4467c045019ba717ba342d5442 SHA512 a541324ec0b42503f5b5837b18e5f3076aa6fbe3c32041c3362945be52c281c6d057a856512cd134df37bf133106061af34d2b4fbfc377852ae4a86078e65fd8
 DIST sbctl-0.14.tar.gz.sig 566 BLAKE2B a5ec700d7ebf42393114c7b193483218df285977622f8ca6c2fb50b622478889647083b34c008fe8618244232416b374f099dd0ca7fce0f961949ef8b9cddbd8 SHA512 8508cc4a77e8bd08d77b2119d59c65d8724ace4576e1d233d0801c0b470afaac96981915c86a185ad0a29e94b7ad6aae1c6c3d52574f353d75d20d11cd503b0f
+DIST sbctl-0.15.4-deps.tar.xz 123785076 BLAKE2B c54b60e89b4ea0bf6ce414198a74465b5e176a5a200f070e092fa536f81d48945a2c2ac88fdcaadfd4d7bc6511c32cbfe9e8c8a4c30c7ea8ea9947af9fdf9545 SHA512 7c5ca431e8832e576cef662d5ba806b4be07a23567d86f7b8e8cb16c57167aaeafe8bafa8875806db2ba7aced9979d5999b837dccd1d90ade60c029de244b242
+DIST sbctl-0.15.4.tar.gz 17822565 BLAKE2B a2c7f1c49ac3052a30af9245b015c730cdc0cc9d9bca011e52de967da5d733f0de0bee2da8ba28da00418553ce4d86cfd3859a5f029f44ae8cfec6f18da50102 SHA512 98278b816c14f61191d3aadeb7bcf22b5482315b36b201764ce88d3287420f488b7c9cb2cc1468800bfa2351cb0e8c8dbc32ecabbe4f6ab275f375859379fc03
+DIST sbctl-0.15.4.tar.gz.sig 566 BLAKE2B 678351ba31138e2b1bb90e2dbfe20f0af333b47c6f1cfb5caf5d473efa716d5ac00d407f858ab6510130430a0f54fc61edb8e261f2c11faa49763a97395850d5 SHA512 3cc14391c4d2446a64bd9f34b29816f05e1e2ff2db2c65228b536298bca0035eb991322264f03f5c68e7b488af0df09fb77276d942b265e43f831e5d9777fcfe
diff --git a/app-crypt/sbctl/sbctl-0.15.4.ebuild b/app-crypt/sbctl/sbctl-0.15.4.ebuild
new file mode 100644
index 000000000000..26ab1494e604
--- /dev/null
+++ b/app-crypt/sbctl/sbctl-0.15.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature verify-sig
+
+DESCRIPTION="Secure Boot key manager"
+HOMEPAGE="https://github.com/Foxboron/sbctl"
+SRC_URI="https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz.sig )"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-text/asciidoc
+	verify-sig? ( sec-keys/openpgp-keys-foxboron )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+	fi
+
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+}
+
+pkg_postinst() {
+	optfeature "automatically signing installed kernels with sbctl keys on each kernel installation" \
+		"sys-kernel/installkernel[systemd]"
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "Newer versions of sbctl move configuration from"
+		elog "/usr/share/secureboot to /var/lib/sbctl. sbctl will emit a"
+		elog "warning to run 'sbctl setup --migrate' upon invocation"
+		elog "until the migration is performed."
+	fi
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 5a4928531739..3fb99d8bf3fc 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,2 +1,3 @@
 DIST xca-2.5.0.tar.gz 1850445 BLAKE2B e12666fc0513cd04bd61d4e182851c055c120425ad8d2fb2698396429b7afb4cc57c77be6d6cc3f63f9d49d5a179123b336d43dde57ef4a3274e7ba1a06f22f7 SHA512 8b283509849c9ac34d5250c780dc0c7a6319eb3201ae892fc2c38e5257d7db4e565e88167a687ffc1ca436068a41cd48fad59d3ecc8235678d46cf026280bd5e
 DIST xca-2.6.0.tar.gz 1874590 BLAKE2B a6a83df88209d6c929bfd5781f6d56b01498d3b9d296a66f4e513f279fc3c14749e1af1f765e863b26e49807a00f5c11e40f8e16f965e23025d835b58eaf4dfc SHA512 4797445e818545c92ded8f611e53f36cab85b527772a531d7a3fae5c5fdb87e1be34139ffeb906239bc3a02221807e2d7c286990ce68f92c1964545cb8fd7986
+DIST xca-2.7.0.tar.gz 1893082 BLAKE2B e37f622864ea20dcf9796640ab7628205823ed2bc8cfeba54fe5dc815be60fba318e9b180d880258ad3d9d2b58b98fd688ee87969da0e2cc8017d98c0cce5680 SHA512 ac441a88c3a4548d78256509ba47cdcb438113e021d76367cbbb91f2a6f6ade2f6ee50c9132d2e89f3843263a7fbd4af73fcada0c32573c819781c0228939f62
diff --git a/app-crypt/xca/xca-2.6.0.ebuild b/app-crypt/xca/xca-2.6.0.ebuild
index c9e4d8aa423b..366990d5e502 100644
--- a/app-crypt/xca/xca-2.6.0.ebuild
+++ b/app-crypt/xca/xca-2.6.0.ebuild
@@ -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-crypt/xca/xca-2.7.0.ebuild b/app-crypt/xca/xca-2.7.0.ebuild
new file mode 100644
index 000000000000..b0d629e4d5b1
--- /dev/null
+++ b/app-crypt/xca/xca-2.7.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake virtualx xdg-utils
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="https://hohnstaedt.de/xca/"
+SRC_URI="https://github.com/chris2511/xca/archive/refs/tags/RELEASE.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-RELEASE.${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc qt5 qt6"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	!qt6? ( dev-qt/qthelp:5 dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 )
+	qt6? ( dev-qt/qtbase:6[sqlite,widgets] dev-qt/qttools:6[assistant] )
+	dev-libs/openssl:*
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools:5 dev-qt/qttest:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+	doc? ( dev-python/sphinx dev-python/sphinxcontrib-htmlhelp dev-python/sphinxcontrib-qthelp )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${PN}-2.4.0-man-page.patch"
+)
+
+src_configure() {
+	local qt_version=Qt5
+
+	if use qt6; then
+		qt_version=Qt6
+	fi
+
+	local mycmakeargs=(
+		-DQTFIXEDVERSION=$qt_version
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	dosym xca /usr/bin/xca-console
+}
+
+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-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 728d3a63804b..c27f3efe94e5 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,6 +1,2 @@
-DIST yubikey_manager-5.2.0.tar.gz 184873 BLAKE2B 09041c23e23ff01cad2d126face63006d1648dfe8d2e7a47b7113deed990143c83a36b6c60458dc9cbf55a71ddf286b8259c97ee982044dbc554231655fb82e2 SHA512 988c25f378e0ce5b53ba5a47aac5fd5a136653f1592af5e9c7440eef7336903cf459a567b4be02119262dba70c3058f5d9f26049dc21c1d934dcf8897eedc03d
-DIST yubikey_manager-5.2.0.tar.gz.sig 309 BLAKE2B bb1a012832c99aaa94404717560e72fb93352b82dd3c0091cb492cde65706c39b9e2411e38a36150d77e72f6397d98cef643d0b392c1751e9c109de3468c9a39 SHA512 926a7a7c40d38bcc0a48e3b44f3eb673c16f7bed73701f5cb6f9ac4418c9f2a242b8d2af9459093ec10e8c188410412a8ba8c05a0fd4774a738629a4b0f874d4
-DIST yubikey_manager-5.4.0.tar.gz 188859 BLAKE2B e83d74b0d512b7a1076bf6de0860c3a29259e337ccf508e81572e5802b1b1dced4c098ea21b4a3d63294b51a042780bf875536c30f65d46ce76b7a80c0bc1fce SHA512 c773895957d17ceac8e944958435071fbb3a80469016a22aa13785a5bc009406870366e5b65d3d2ddbd2ed1722f84b377a49101f4db67f0d3c04daee852301b3
-DIST yubikey_manager-5.4.0.tar.gz.sig 310 BLAKE2B 933a6638b754a8d3f23486f8adeb03e1b9c54d313370675f3e9e517751b495a5f3afae048b9740360459c86bef754618d9b8308cc30d8ae027421ee6f972fef1 SHA512 825d3e455b9cb9263a1336ac2d601fc2e25146ca45f143c16e559c5374c2aa0fc27f0330f5114e58186e02784e1ebda5e864726fea009dfb47377dcf5a3a32f4
 DIST yubikey_manager-5.5.1.tar.gz 215683 BLAKE2B c7c16d4eaaeff5894c4913a0da69675491434f0f48555addbb8778e0f9781c6872c4392ec81f4a142f2e1eb63bea837e394b5d33e07f497c948ead92ee89059a SHA512 67e2e5a5833f746441d91684a5b0889bd9b9b46aeaee0da875c7e6dac46db619a8436e12bd77c38e525121db8fc52736071bc141ac80c6d79e64919e100510f9
 DIST yubikey_manager-5.5.1.tar.gz.sig 310 BLAKE2B 9d5f3d18ccdde1a03a6433223677706164d559af2b270d636adb4074377deb774869d9c6d12af083388f7e907fa4b8e7b881ccd58981d2696ef017d8ec492dfe SHA512 0c436a608fe64236045019ba7db175a65f1e1d1d125049b968c484963abe138573fa31d1b8c942d9cdcaa06099029bd3c1d9057ae622e5c6358427188c454efd
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild
deleted file mode 100644
index 278c8aa54fe4..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	<dev-python/cryptography-44[${PYTHON_USEDEP}]
-	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-23.4[${PYTHON_USEDEP}]
-	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
-	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
deleted file mode 100644
index d9c5c0279a7d..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	<dev-python/cryptography-45[${PYTHON_USEDEP}]
-	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
-	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild
deleted file mode 100644
index a3f8053a2c6a..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.4.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
-	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
-	app-crypt/ccid
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	<dev-python/cryptography-45[${PYTHON_USEDEP}]
-	dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
-	<dev-python/keyring-25[${PYTHON_USEDEP}]
-	>=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
-	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? ( dev-python/makefun[${PYTHON_USEDEP}] )
-	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/ykman.1
-}
diff --git a/app-dicts/eblook/eblook-1.6.1_p16.ebuild b/app-dicts/eblook/eblook-1.6.1_p16.ebuild
deleted file mode 100644
index f71ec794fa08..000000000000
--- a/app-dicts/eblook/eblook-1.6.1_p16.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Interactive search utility for electronic dictionaries"
-HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/"
-SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${PN}-$(ver_cut 1-3).tar.gz"
-SRC_URI+=" mirror://debian/pool/main/e/eblook/eblook_$(ver_cut 1-3)-$(ver_cut 5).debian.tar.xz"
-S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~riscv x86"
-
-DEPEND=">=dev-libs/eb-3.3.4"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-eb-conf="${EPREFIX}"/etc/eb.conf
-}
diff --git a/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild b/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
index 437aa6981d42..c80bb90550b8 100644
--- a/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
+++ b/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit freedict
 
diff --git a/app-dicts/freedict-deu-eng/metadata.xml b/app-dicts/freedict-deu-eng/metadata.xml
index 62d807ca8b11..dbfd4a46a8e5 100644
--- a/app-dicts/freedict-deu-eng/metadata.xml
+++ b/app-dicts/freedict-deu-eng/metadata.xml
@@ -4,5 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
+		<remote-id type="github">freedict/fd-dictionaries</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild b/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
index bd84eb263cc2..8141f4eb1e07 100644
--- a/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
+++ b/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit freedict
 
diff --git a/app-dicts/freedict-eng-fra/metadata.xml b/app-dicts/freedict-eng-fra/metadata.xml
index 62d807ca8b11..dbfd4a46a8e5 100644
--- a/app-dicts/freedict-eng-fra/metadata.xml
+++ b/app-dicts/freedict-eng-fra/metadata.xml
@@ -4,5 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
+		<remote-id type="github">freedict/fd-dictionaries</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild b/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
index 1e01ed37f071..11df97141efd 100644
--- a/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
+++ b/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit freedict
 
diff --git a/app-dicts/freedict-eng-ita/metadata.xml b/app-dicts/freedict-eng-ita/metadata.xml
index 62d807ca8b11..dbfd4a46a8e5 100644
--- a/app-dicts/freedict-eng-ita/metadata.xml
+++ b/app-dicts/freedict-eng-ita/metadata.xml
@@ -4,5 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
+		<remote-id type="github">freedict/fd-dictionaries</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild b/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
index ae8fc476af7e..90c0c464a78d 100644
--- a/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
+++ b/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit freedict
 
diff --git a/app-dicts/freedict-eng-swe/metadata.xml b/app-dicts/freedict-eng-swe/metadata.xml
index 62d807ca8b11..dbfd4a46a8e5 100644
--- a/app-dicts/freedict-eng-swe/metadata.xml
+++ b/app-dicts/freedict-eng-swe/metadata.xml
@@ -4,5 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
+		<remote-id type="github">freedict/fd-dictionaries</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild b/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
index 014849f38504..39fd617589b6 100644
--- a/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
+++ b/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit freedict
 
diff --git a/app-dicts/freedict-fra-eng/metadata.xml b/app-dicts/freedict-fra-eng/metadata.xml
index 62d807ca8b11..dbfd4a46a8e5 100644
--- a/app-dicts/freedict-fra-eng/metadata.xml
+++ b/app-dicts/freedict-fra-eng/metadata.xml
@@ -4,5 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
+		<remote-id type="github">freedict/fd-dictionaries</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild b/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
index d7d5bf10c829..1d50956cf095 100644
--- a/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
+++ b/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit freedict
 
diff --git a/app-dicts/freedict-ita-eng/metadata.xml b/app-dicts/freedict-ita-eng/metadata.xml
index 62d807ca8b11..dbfd4a46a8e5 100644
--- a/app-dicts/freedict-ita-eng/metadata.xml
+++ b/app-dicts/freedict-ita-eng/metadata.xml
@@ -4,5 +4,7 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
+		<remote-id type="github">freedict/fd-dictionaries</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
index 7afd5ea099fd..49b1e5856b1e 100644
--- a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
+++ b/app-dicts/myspell-he/myspell-he-2012.08.15.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
 
 MYSPELL_DICT=(
 	"he_IL.aff"
diff --git a/app-dicts/myspell-hu/myspell-hu-7.1.3.2.ebuild b/app-dicts/myspell-hu/myspell-hu-7.1.3.2.ebuild
index c647995cbaaf..4bfe586b960a 100644
--- a/app-dicts/myspell-hu/myspell-hu-7.1.3.2.ebuild
+++ b/app-dicts/myspell-hu/myspell-hu-7.1.3.2.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
 
 MYSPELL_DICT=(
 	"opt/libreoffice7.1/share/extensions/dict-hu/hu_HU.aff"
diff --git a/app-dicts/myspell-id/myspell-id-2.0.ebuild b/app-dicts/myspell-id/myspell-id-2.0.ebuild
index 54db3dfbf707..f647bf42cc31 100644
--- a/app-dicts/myspell-id/myspell-id-2.0.ebuild
+++ b/app-dicts/myspell-id/myspell-id-2.0.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
 
 MYSPELL_DICT=(
 	"id_ID.aff"
diff --git a/app-dicts/myspell-mi/myspell-mi-20190630.ebuild b/app-dicts/myspell-mi/myspell-mi-20190630.ebuild
index 02d22d275b7e..4ebb5094e3d0 100644
--- a/app-dicts/myspell-mi/myspell-mi-20190630.ebuild
+++ b/app-dicts/myspell-mi/myspell-mi-20190630.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,4 +16,4 @@ HOMEPAGE="https://www.openoffice.org/lingucomponent/"
 SRC_URI="https://github.com/scardracs/gentoo-packages/releases/download/mi-${PV}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-dicts/myspell-pl/Manifest b/app-dicts/myspell-pl/Manifest
index 5b4938d4bc93..25894c0b6e04 100644
--- a/app-dicts/myspell-pl/Manifest
+++ b/app-dicts/myspell-pl/Manifest
@@ -1 +1,2 @@
 DIST myspell-pl-20230101.zip 1275977 BLAKE2B d272c2f42f63a8622f72a05674a76a6d9191e53a8b9a057b595cbed7892c739b070b447b00c5c5b4c1aad8a1b41645923de9dcdcc8b56f8edea9895ea637aebd SHA512 1e5212413b9b1481664dd04ad5d436b5780bc457f771e4221d8a878709894fee71e894f870d95538729586e6f6745f8bbda49db3a4c960321049898a739e5e88
+DIST myspell-pl-20240801.zip 1287237 BLAKE2B 2404a8c0fd3f4608c38bb6b184b4f0b56674e85aa8c416e5678e10a00b69949843e942102feec10d13d9fb5fe14f4a9399851291d4b2488abce9c8e1545c3ed3 SHA512 2f681ba0a8c67a5405f557339e0711974d4aaf186bd3692f3540e51db8fad6d02c34317becabe07f13e154dd1a9660452f6e789e6e1d0f1900085da673413418
diff --git a/app-dicts/myspell-pl/metadata.xml b/app-dicts/myspell-pl/metadata.xml
index 265e713913b2..2d279c1825a1 100644
--- a/app-dicts/myspell-pl/metadata.xml
+++ b/app-dicts/myspell-pl/metadata.xml
@@ -1,9 +1,13 @@
 <?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">
+		<name>Filip Kobierski</name>
+		<email>fkobi@pm.me</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="sourceforge">synonimy</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/myspell-pl/myspell-pl-20240801.ebuild b/app-dicts/myspell-pl/myspell-pl-20240801.ebuild
new file mode 100644
index 000000000000..c468567b70af
--- /dev/null
+++ b/app-dicts/myspell-pl/myspell-pl-20240801.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYSPELL_DICT=( "pl_PL.aff" "pl_PL.dic" )
+
+inherit myspell-r2 unpacker
+
+DESCRIPTION="Polish dictionaries for myspell/hunspell"
+HOMEPAGE="https://sjp.pl/sl/en/"
+SRC_URI="https://sjp.pl/sl/ort/sjp-${P}.zip -> ${P}.zip"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 Apache-2.0 CC-BY-4.0" # upstream's order
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+src_prepare() {
+	default
+	unpack_zip pl_PL.zip
+}
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 870a59947529..bd77626682ee 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,3 +1,4 @@
 DIST eclass-manpages-20240512.tar.xz 452732 BLAKE2B e39fe919e90d24247ff1a5153359d4bc9dae8d4d8a47c0d2231a6364e64b046f813d507aa95cf5b7fca9de862678d7d584381fa94d6a4019cc07d5474d73f8e3 SHA512 a798cd71eb33a63bc8ceeaf1103f130425e4b82d379d413ce09605f4c9648447d01f97875cfe2efdd09a2dace7a73bf3a74f223168da8035ef13f1a52dd58677
 DIST eclass-manpages-20240614.tar.xz 450756 BLAKE2B 50435ab646a238f47cc96573af3d8ed53e14b700c9284253a2a9efbda40fc058f475a9900e56c3d6575ceafa4385eec89d9d1df87dd5ec94425c69daf258ab0e SHA512 80c0ba3eac7affc670f10d2eca58293bb79de94cc3b9d2349dd9b2227efd02b08d7e8a095161b484f87b3e23042afea73fadbd0cff867006bfbbb748a5051c55
 DIST eclass-manpages-20240811.tar.xz 455124 BLAKE2B dde9ffe7baa7fcb6904af47a5fb7bf05103c2646b682e27fd3454eaf2ee4708d059c666eddbd39571899d23bcc8ef411e75f16c905048a103f818f396e390794 SHA512 d62979614e1301bba51798280f21baa46a55c594f4345f07b1c21b772bb22cc0be2db55a2d3b190bf2a5921c727329266743a2f2b0ad0ef2a14f1a967c779e55
+DIST eclass-manpages-20240901.tar.xz 460224 BLAKE2B 96743842457d552079bed954839f05c71f36f9618d5fff5a20df2383e3615053ef93cb748756727e9131c1896106ccae4013dc9888cddbea60cc1d330b8f7cc3 SHA512 8b3128f5cc7626410e9988cf42a2448566f0859aa02388b1dd888d47714dafe7cac1c607d32e48331b4697f80bc9e4b806e9f21257e5ce3883216649e9fcafcd
diff --git a/app-doc/eclass-manpages/eclass-manpages-20240901.ebuild b/app-doc/eclass-manpages/eclass-manpages-20240901.ebuild
new file mode 100644
index 000000000000..83b196078ae7
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20240901.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 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 ~ia64 ~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/execline-man-pages/Manifest b/app-doc/execline-man-pages/Manifest
index b9d4fbe4a50e..75bfe01535ed 100644
--- a/app-doc/execline-man-pages/Manifest
+++ b/app-doc/execline-man-pages/Manifest
@@ -1,2 +1 @@
-DIST execline-man-pages-2.9.5.1.1.tar.gz 44500 BLAKE2B 27564198852f9a7b4a3772447a71528be5f0f29bb27f31facf4ae6eb1912f56a6e82402a33b9284337687c00e3cc5eb634c99a28ceb0dc340f1e9603913b635b SHA512 12cb50944afc4b23260f67fc968d96b2837cd7d077e4b05c9d99f470066ba6d11941114e19eb021ff6a479a07fc8bc5edb5275694b98a1ea1a1d572503595813
 DIST execline-man-pages-2.9.6.0.1.tar.gz 44771 BLAKE2B 43a78f4335f0381b967ba10c06453caece21e156fb4f3867e1e758985874538a5fc12c603b46d720f73cbb31dbbccb54de1296ad11f66a35b4e3e1ee958f944f SHA512 c996b90cbc8c6faa1cfd93f8772eca51ce4d445fa70c5f2f8208532c609c0a4444d01f4adc5c215e5f1da790731ee8d115d8979efa86bff929fd80a84cbfbd04
diff --git a/app-doc/execline-man-pages/execline-man-pages-2.9.5.1.1.ebuild b/app-doc/execline-man-pages/execline-man-pages-2.9.5.1.1.ebuild
deleted file mode 100644
index 67fe98e7bc4b..000000000000
--- a/app-doc/execline-man-pages/execline-man-pages-2.9.5.1.1.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
-
-DESCRIPTION="mdoc port of the HTML documentation for the execline suite"
-HOMEPAGE="https://git.sr.ht/~flexibeast/execline-man-pages"
-SRC_URI="
-	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index adc2b18bcfcb..2686351c9434 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,3 +1,4 @@
 DIST kicad-doc-7.0.10.tar.bz2 107407186 BLAKE2B 5b55745beb57b713e646dbcfbbc5ee1a030c2e819b95018c869b87091a8cca2eadcc92f6b431736167b59780ef906730df5868a4f56952914c0cede9f830582a SHA512 d7bfa2fcdfc936713f9c47125f3b6bd8cd413d1c26b97a34b68ef4a9e8621082326880b84cc6f3f6163b39c13945616232a51d9af74d5dd000a600e95ccb2ee2
 DIST kicad-doc-7.0.11.tar.bz2 107407245 BLAKE2B 4746972ffa4b51ec465ad12e79699fb16fd0884c4e916d5d2a7c0655fcf39999abc0f90357bd202f0f8ece884034f8b076656e09390f8370107c2f8cf6353ae5 SHA512 a11bbfe4716da2922eb839800b2b4949c09cfe35834cabb66d6b3be299ce1ba4cece0e5082c12047591b18919dd590976c23e7542580a1abfd5917246163b6e3
 DIST kicad-doc-8.0.3.tar.bz2 90958460 BLAKE2B f378aa629c4235801434dc1a0c4d96a20fa8674fd5e21e8b68817b69031f340c03837c47168947b6aaf234962803f5f3ff095d3a586a3630b817c148c19b2695 SHA512 cba8b25b7163c3a6f61a63f601a65fc6c345bead671453bd5bc73cb72ed711840d79253fe09a4f7b2c6799297373cdc36a54a173f9e10a66f6f950408a58347c
+DIST kicad-doc-8.0.4.tar.bz2 91098101 BLAKE2B 26f971e1766780f2213c234683a2e9c99df6b80ff21b34039b26fc6618d5d3c0ab3b75adb63afb578cb763aad403ef4b0cabb14628622f28336046fe49d28685 SHA512 9998e6a7c9d4511803454f5d6f509c447250dcbc64b49164d75d6000eabce7d5870b30ee487f0faaf44e0f4fea6ced9bc678902191116949b696d7de73a23add
diff --git a/app-doc/kicad-doc/kicad-doc-8.0.3.ebuild b/app-doc/kicad-doc/kicad-doc-8.0.3.ebuild
index 64da42dd5988..3b79672a7b4a 100644
--- a/app-doc/kicad-doc/kicad-doc-8.0.3.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-8.0.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
diff --git a/app-doc/kicad-doc/kicad-doc-8.0.4.ebuild b/app-doc/kicad-doc/kicad-doc-8.0.4.ebuild
new file mode 100644
index 000000000000..64da42dd5988
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-8.0.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +pdf once asciidoctor-pdf is packaged?
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=dev-ruby/asciidoctor-2.0.12
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPDF_GENERATOR="DBLATEX"
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${P}/help
+	)
+	cmake_src_configure
+}
diff --git a/app-doc/python-docs/Manifest b/app-doc/python-docs/Manifest
index a5eb0cc8a53e..f464ddb8c9e1 100644
--- a/app-doc/python-docs/Manifest
+++ b/app-doc/python-docs/Manifest
@@ -1,7 +1,12 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.10.14-docs-html.tar.bz2 7441459 BLAKE2B 484508fc2610fdffe6bd7370afe27a0a4d7672fd4d528a726ec5b03ca7084e88d057326ccb3e41d79b6ab105211314d3b3e4c11acab40d4ce8dab725b80be5d7 SHA512 4232cca2c31a87362d3c0bde27f029eb4f475be0eab4eeeaeffa70825f2d40c91d80e88feb44408c2014ee5e012554442f0c1d394f110b9e49209e7534cce600
+DIST python-3.10.15-docs-html.tar.bz2 7452520 BLAKE2B e9003e2a839bc934d3ba5903e1b730239e48d06686b5472660d49c51333b77ec1b0c3c48c307007e4f5d27901764d29203de475e60e97d8d8004e0b2436d168d SHA512 7056b2e9d3672b79aee26f994fd1e5168860452ec783f37cdc604dc25d3df297a9c43bda43add03a36aec85dbd1875d0c9b8eaec0fd75b809fd3811a977b69a0
+DIST python-3.11.10-docs-html.tar.bz2 7988162 BLAKE2B bc0d47ca235c8c14c4f62b554578068bf3e8460211e358cec586511be35b0aa2011075ace0602385dca2b4c2667d6bd3cb8ce4e6e6be1ed52d84b877cf3a7f6a SHA512 a14e18d3641d4379144ead7341536c781a94e9f15c9b53b2647a7c7c4cd15211963564fb2519e756b79db9234f555ede2442a678d6b4f27de6f7fb0b2993c266
 DIST python-3.11.9-docs-html.tar.bz2 7996912 BLAKE2B 5140cc58986ff062e4425e4635fa1e92b089b805d47f7f9f8c92cd96474101e63125116ee000817a29e1878417577e7f0a279cff88bd74a76bea6c8428b21807 SHA512 d60c8811bb1099b56737b6807552f2f503d6c4cb0fe7adb3ba584796bed1da64ec514865580c07bcafdfd906118987d6ea0433eb2fb19a2a68f30880c28f4889
 DIST python-3.12.3-docs-html.tar.bz2 8304437 BLAKE2B 51e60030941ea26c9531357bfdd5746cf4ff03d59fbca705d146188c612d3e77cafeabe49ecc96b3531ced9cd88ef74a2ad87fdd064fd4c3d836065132e20c98 SHA512 2b4cc99d1e22a77959e82c910303d4247efa6579060cb3c69b0d9dd1b868dc1637eb1443552fd89d5314c6d7d01c579e2113539491ebc0fa5ec4a6f2ab0b4d98
 DIST python-3.12.4-docs-html.tar.bz2 8455506 BLAKE2B 2e842cc14a832e34e8648cdb2ff8664cb5b6c7a735a08af4555b4cbd25a985996b5576f16ac060148571fb5e3dd0bd3ae32cc44658576251351574a525474a1a SHA512 7b44626434d9b0eb486e4ffd7ea4377c0a79519c9c8d0c54341358ee3d1d7c100c01a8935c74d783e05e557c6c13372347c3e8da7ab564926a3a95b907c1510e
+DIST python-3.12.6-docs-html.tar.bz2 8360479 BLAKE2B 09294f5ba1ca8f53c0261e0db626aeb62ac3d66115b87feb212987ca181a2d6324a24eda97b374e6ea56e93623e487da23c50613335af4166ecba845837ae582 SHA512 5f5d37ea047810c0ae3a99585008ee02a3d4dd1b3eb573dc96eaf590c542267034fafdefd1aeb2b3e59a5b5019e4dc2562ed27d1699013c7a0609b557e5ce27c
 DIST python-3.8.19-docs-html.tar.bz2 6717842 BLAKE2B f5236daff937a03cffe6224610f4ebdf05516538b5cf38090de6d46d8a9626bf33ec1cd8408bcaaf2ad24591f48e9a5b3da831990b0706fb66321f09c2c05ed5 SHA512 188e41b681c0ec823de89ad0d408473bd7baff80c8ab4d691e2c8b1308a89af63c1973b8a3dac676b8b3880786e741355f653e67150e8170c27798b43a3462df
+DIST python-3.8.20-docs-html.tar.bz2 6727651 BLAKE2B ec11857b5bdfb4646a2762353db877a558cfc543563a7a9b0db100f675511c31450d16c30a986d39226a9b16be3ffd132863e396ef05165047ab73bf037bf2a6 SHA512 0a77f0240d6d495a5099d4a95e151f38517730815e6f3d9b82964cf60be95b8bdc960916d317e19bb8e14a9604217cd1fa85703996aec972004a6a93d4ffa6d0
 DIST python-3.9.19-docs-html.tar.bz2 6983522 BLAKE2B 4d70d134ff96aaed4c6d5c9ab7c59907cfb63b66c27be69c31324b49cf65c797aa160d7bfaf5f4e512391f8ba49fb88c7f470b7ef16d6f1e800c5073d5304a2f SHA512 5812613745d169caba35b234aeed77edcc1cd26d95a1cd32b0692bb7e27dc2acd9b94a45f349485856b9e4388b73f7b05d07b8626960f7127ba110f7094c5a48
+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
new file mode 100644
index 000000000000..8483ad559ab4
--- /dev/null
+++ b/app-doc/python-docs/python-docs-3.10.15.ebuild
@@ -0,0 +1,23 @@
+# 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 ~ia64 ~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.10.ebuild b/app-doc/python-docs/python-docs-3.11.10.ebuild
new file mode 100644
index 000000000000..8483ad559ab4
--- /dev/null
+++ b/app-doc/python-docs/python-docs-3.11.10.ebuild
@@ -0,0 +1,23 @@
+# 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 ~ia64 ~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.4.ebuild b/app-doc/python-docs/python-docs-3.12.4.ebuild
index 4447e52e1e62..8b89b3b1e21b 100644
--- a/app-doc/python-docs/python-docs-3.12.4.ebuild
+++ b/app-doc/python-docs/python-docs-3.12.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~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
new file mode 100644
index 000000000000..8483ad559ab4
--- /dev/null
+++ b/app-doc/python-docs/python-docs-3.12.6.ebuild
@@ -0,0 +1,23 @@
+# 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 ~ia64 ~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.8.20.ebuild b/app-doc/python-docs/python-docs-3.8.20.ebuild
new file mode 100644
index 000000000000..57e62d8e99f9
--- /dev/null
+++ b/app-doc/python-docs/python-docs-3.8.20.ebuild
@@ -0,0 +1,23 @@
+# 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 ~ia64 ~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.9.20.ebuild b/app-doc/python-docs/python-docs-3.9.20.ebuild
new file mode 100644
index 000000000000..57e62d8e99f9
--- /dev/null
+++ b/app-doc/python-docs/python-docs-3.9.20.ebuild
@@ -0,0 +1,23 @@
+# 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 ~ia64 ~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/s6-man-pages/Manifest b/app-doc/s6-man-pages/Manifest
index 8ba34c8a0c8c..2c61707c5208 100644
--- a/app-doc/s6-man-pages/Manifest
+++ b/app-doc/s6-man-pages/Manifest
@@ -1,2 +1 @@
-DIST s6-man-pages-2.12.0.4.1.tar.gz 123799 BLAKE2B 0fc4e341a9be8b209bd71e8e7980149fec449cf2c271ee10d6c2f943048163d162c26e5af7c96ffea1cfbd1026ab47e9396d6a65377389dc7e366b113c783fe8 SHA512 33eedd1c6f7184e8336e194baab865ea55beade7bc3bbaf6e99862d65a512a4dc88ac03fbf46ff5466878354ea099c611ca9daa0895cd5a6214c0bcbe865ac90
 DIST s6-man-pages-2.13.0.0.1.tar.gz 124099 BLAKE2B 97013c8ef853c4492f0be99e2412549bc30a481b61a7b3b04f4133f2be13e8a6e9d7114d0c582acd7e6f93cf3fab839d7cd153fc8a8a32f47bd597e6b7c6a5bd SHA512 d1982daead0b9c56421d421339c14f1fc9f7c32137f3c19f2fc9bab9225df8b5e220e2a807b26647c5639a3950543703c2eca5cd6afda1b81381709d703b206a
diff --git a/app-doc/s6-man-pages/s6-man-pages-2.12.0.4.1.ebuild b/app-doc/s6-man-pages/s6-man-pages-2.12.0.4.1.ebuild
deleted file mode 100644
index 2364454ad9d1..000000000000
--- a/app-doc/s6-man-pages/s6-man-pages-2.12.0.4.1.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
-
-DESCRIPTION="mdoc port of the HTML documentation for the s6 suite"
-HOMEPAGE="https://git.sr.ht/~flexibeast/s6-man-pages"
-SRC_URI="
-	https://git.sr.ht/~flexibeast/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 517d870648d3..825981e03a07 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -1 +1,2 @@
 DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
+DIST dav-text-0.9.0.tar.gz 23882 BLAKE2B 6845b40bbb74d57438625c2736758c52fbe4cff3e020fd451dee540f06fb893d71e11469f828845c193e9fbbd8a8e0b31dcb9a6fa29383053b61dd9a9d7b0ce4 SHA512 8bb9d111c25e7e41c7d75ee559aeae47494ff68f19f40d2ba3e2ebca23577538b94ba72b58ccf4e64ef92d9e740ee843fa249ef0e4148971b3037259b4f280c5
diff --git a/app-editors/dav/dav-0.9.0.ebuild b/app-editors/dav/dav-0.9.0.ebuild
new file mode 100644
index 000000000000..132aba699103
--- /dev/null
+++ b/app-editors/dav/dav-0.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Minimal console text editor"
+HOMEPAGE="https://github.com/atsb/dav-text"
+SRC_URI="https://github.com/atsb/dav-text/archive/refs/tags/dav-text-${PV}.tar.gz"
+S="${WORKDIR}/dav-text-dav-text-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8.5-fno-common.patch )
+
+DOCS=( README.md )
+
+src_prepare() {
+	unpack ./dav.1.gz
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin dav
+	doman dav.1
+	einstalldocs
+}
diff --git a/app-editors/dav/metadata.xml b/app-editors/dav/metadata.xml
index 3e5986cf560b..283d15ae53cd 100644
--- a/app-editors/dav/metadata.xml
+++ b/app-editors/dav/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="sourceforge">dav-text</remote-id>
+		<remote-id type="github">atsb/dav-text</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index bc8cc4c2915c..237abe0c7d19 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,5 +12,5 @@ DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd93
 DIST emacs-29.3-patches-2.tar.xz 2304 BLAKE2B 1005194bc2ed6d9be0cadcf449f4f82c1bcda178e6126f27f8ea0c359344bcf6a9368226a6eaf9d4b655a0c59ed6beecc3130b4409c84bb3ed19911ba22d9e80 SHA512 67250b08cf0b1d4f8279987cea19da0838f520c98ae91b16200c8bf5b5e2a171ffdb7c06a266c6f220ec8466a9264af55529dc150b002588937597e328a581d2
 DIST emacs-29.3-patches-4.tar.xz 3376 BLAKE2B 966aef4036b48d11cbd0e901f78afb5c1d6eb0e12dc88c0b3e18cc093f19d268b15d760d281719f12e106daaa82f61b4bb32e23d4041d9636f0832653b914506 SHA512 22cf97583c659c0bde0a6f9beb9b5ea783eb3cfe777e0c84d0784ae2f1652e7de284d77f240a832902d12f6d73a309e55c34552e0de449595212e59afde39088
 DIST emacs-29.3.tar.xz 52203168 BLAKE2B 73651c52e508d5341f66659bbaf98e839040239198cb66f62239f489a961794adf837d9a14e9b605f059b7b612803e0ce5998ec47100ba545db642baacdb55ec SHA512 efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b
-DIST emacs-29.4-patches-2.tar.xz 2196 BLAKE2B d2e8363209761531a08f9daf6372d2c667a54c4edf9dc809d56f4c1761e2192d1f116d081ad93a2cfd98428d2ace183ad4a282bad7cbe10402026a88f0966aeb SHA512 f0106763cdb52e5c4583ab624cb55bcc7a3761be04de45f1c65e8be2bfe449352d454888bf24f77eef881babc06a92f8202755dd5aed41f115a808edcdb59023
+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-28.2-r13.ebuild b/app-editors/emacs/emacs-28.2-r13.ebuild
index ee81b045c11c..572faff49f66 100644
--- a/app-editors/emacs/emacs-28.2-r13.ebuild
+++ b/app-editors/emacs/emacs-28.2-r13.ebuild
@@ -404,6 +404,7 @@ src_test() {
 	emake \
 		EMACS_TEST_VERBOSE=1 \
 		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
 		TEST_BACKTRACE_LINE_LENGTH=nil \
 		check
 }
diff --git a/app-editors/emacs/emacs-29.4.ebuild b/app-editors/emacs/emacs-29.4.ebuild
index bfa2f2353259..16b48758e251 100644
--- a/app-editors/emacs/emacs-29.4.ebuild
+++ b/app-editors/emacs/emacs-29.4.ebuild
@@ -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-2.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
@@ -477,6 +477,7 @@ src_test() {
 	emake \
 		EMACS_TEST_VERBOSE=1 \
 		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
 		TEST_BACKTRACE_LINE_LENGTH=nil \
 		check
 }
diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
index 3270adf173f8..c50027d6889b 100644
--- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
@@ -464,6 +464,7 @@ src_test() {
 	emake \
 		EMACS_TEST_VERBOSE=1 \
 		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
 		TEST_BACKTRACE_LINE_LENGTH=nil \
 		check
 }
diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild
index 886e2dbf4f7f..b115a6712229 100644
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.9999.ebuild
@@ -464,6 +464,7 @@ src_test() {
 	emake \
 		EMACS_TEST_VERBOSE=1 \
 		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
 		TEST_BACKTRACE_LINE_LENGTH=nil \
 		check
 }
diff --git a/app-editors/focuswriter/focuswriter-1.8.8.ebuild b/app-editors/focuswriter/focuswriter-1.8.8.ebuild
index d48e4a770d50..92703729bd78 100644
--- a/app-editors/focuswriter/focuswriter-1.8.8.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="Fullscreen and distraction-free word processor"
 HOMEPAGE="https://gottcode.org/focuswriter/
@@ -12,7 +12,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+ LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-qt/qttools:6[linguist]
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 47734e55ea56..71a5a3224970 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,2 +1,2 @@
-DIST ghostwriter-24.02.2.tar.xz 3629096 BLAKE2B f167301849348ee59d45fea07286d3e0c1cacd4eeb84769d4bb6182fc508aaa0f8b749f2553054a6054ffc48706ec53f05ec164b1a913b0f926395134e72ac7a SHA512 ebe605f82710ced4fecf4effd5c257e5d6bc274bbbc6cb36138423ef05b14504dd5d39d698eb23640838df53bc55f9ba3523280731482b1eb1b1ad6d46178381
 DIST ghostwriter-24.05.2.tar.xz 3634856 BLAKE2B 3a57c5487c09fc4e425f39826eeef343e71c2e064518c4c5ea71526aa30ad753a87a744c7c55aff109e03a8df86a1c941bd3877c1655ad1047382656e17effeb SHA512 0769bf857c7ab8a67eedaf48029ee0586e8d4394fc77c7bfe21a4d39b58579938371178bbe32c743e0b38305ca1602d824ce5cda18b5be49a28c258f52f10ce3
+DIST ghostwriter-24.08.0.tar.xz 2706744 BLAKE2B bb9a7613b28a69eda75acd5d433871d3186ec3d2daf5e1c05442be0f9526959e6d294e8c2c4b38c63d849ba4ab5aa71483cd709b04451665dfaa75ec204c7422 SHA512 e9ee147ad5b43de4e662c004f99148e8c3d082472ae59344b522682027c8db65816874502991959dba93d852b58287b934dd192064801f7cb0a28e246a845248
diff --git a/app-editors/ghostwriter/ghostwriter-24.02.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.02.2.ebuild
deleted file mode 100644
index a0799e9e4acb..000000000000
--- a/app-editors/ghostwriter/ghostwriter-24.02.2.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
-
-KDE_ORG_CATEGORY="office"
-ECM_HANDBOOK="optional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-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 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/hunspell:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebchannel-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	virtual/pkgconfig
-"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
index d19e37530fd0..dbf9b31d630f 100644
--- a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://ghostwriter.kde.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/ghostwriter/ghostwriter-24.08.0.ebuild b/app-editors/ghostwriter/ghostwriter-24.08.0.ebuild
new file mode 100644
index 000000000000..cde0cc6ee4db
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-24.08.0.ebuild
@@ -0,0 +1,40 @@
+# 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/gvim/gvim-9.0.2167.ebuild b/app-editors/gvim/gvim-9.0.2167.ebuild
index 20fcedbb1b9e..9bd4c0338102 100644
--- a/app-editors/gvim/gvim-9.0.2167.ebuild
+++ b/app-editors/gvim/gvim-9.0.2167.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -228,15 +225,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
diff --git a/app-editors/gvim/gvim-9.1.0366.ebuild b/app-editors/gvim/gvim-9.1.0366.ebuild
index c4bccf290862..d5fb42570e67 100644
--- a/app-editors/gvim/gvim-9.1.0366.ebuild
+++ b/app-editors/gvim/gvim-9.1.0366.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -228,15 +225,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
diff --git a/app-editors/gvim/gvim-9.1.0470.ebuild b/app-editors/gvim/gvim-9.1.0470.ebuild
index 826999e81017..b27e70d458de 100644
--- a/app-editors/gvim/gvim-9.1.0470.ebuild
+++ b/app-editors/gvim/gvim-9.1.0470.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -228,15 +225,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 826999e81017..b9e03f4a2866 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -71,7 +68,8 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 # configure runs the Lua interpreter
 BDEPEND="
 	dev-build/autoconf
@@ -91,7 +89,7 @@ fi
 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
 
-# platform-specific checks (bug #898450):
+# platform-specific checks (bug #898450 #898452):
 # - acl()     -- Solaris
 # - statacl() -- AIX
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -100,7 +98,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 )
 
 pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
+	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 
@@ -124,7 +122,7 @@ src_prepare() {
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
 	sed -i -e \
 		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
@@ -145,7 +143,7 @@ src_prepare() {
 	if [[ -d "${S}"/src/po ]]; then
 		sed -i -e \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
+			"${S}"/src/po/Makefile || die "sed failed"
 	fi
 
 	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
@@ -157,7 +155,7 @@ src_prepare() {
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i -e \
 		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
+	rm src/auto/configure || die "rm failed"
 
 	# --with-features=huge forces on cscope even if we --disable it. We need
 	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
@@ -174,8 +172,8 @@ src_prepare() {
 
 src_configure() {
 
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
 	filter-flags -funroll-all-loops
 
 	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
@@ -185,18 +183,24 @@ src_configure() {
 
 	emake -j1 -C src autoconf
 
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
 	local file
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
 		if [[ -e ${file} ]]; then
-			addwrite $file
+			addwrite ${file}
 		fi
 	done
 
+	local myconf=(
+		--with-modified-by="Gentoo-${PVR} (RIP Bram)"
+		--with-vim-name=gvim
+		--with-x
+	)
+
 	use debug && append-flags "-DDEBUG"
 
-	local myconf=(
+	myconf+=(
 		--with-features=huge
 		--disable-gpm
 		--with-gnome=no
@@ -228,15 +232,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
@@ -260,11 +258,7 @@ src_configure() {
 			   vim_cv_toupper_broken=no
 	fi
 
-	econf \
-		--with-modified-by="Gentoo-${PVR} (RIP Bram)" \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -299,7 +293,7 @@ src_test() {
 }
 
 # Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
+# to respect user's choice (bug #187449)
 eselect_vi_update() {
 	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
@@ -340,7 +334,7 @@ pkg_postinst() {
 	# update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# update fdo mime stuff, bug #78394
+	# update desktop file mime cache
 	xdg_desktop_database_update
 
 	# update icon cache
@@ -354,7 +348,7 @@ pkg_postrm() {
 	# update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# update fdo mime stuff, bug #78394
+	# update desktop file mime cache
 	xdg_desktop_database_update
 
 	# update icon cache
diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch b/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch
deleted file mode 100644
index b1789a9df944..000000000000
--- a/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 394998798ef15175455a29cc239999e61ff78e6f Mon Sep 17 00:00:00 2001
-From: Michal Rostecki <vadorovsky@protonmail.com>
-Date: Wed, 6 Dec 2023 15:24:34 +0000
-Bug: https://bugs.gentoo.org/912050
-Subject: [PATCH] chore: Update tree-sitter-d
-
-One of the included changes is gdamore/tree-sitter-d#22 which
-fixes the build of Helix when using clang as `CC`.
----
- languages.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/languages.toml b/languages.toml
-index 66b43472f5a3..7f1c6b769fad 100644
---- a/languages.toml
-+++ b/languages.toml
-@@ -2220,7 +2220,7 @@ formatter = { command = "dfmt" }
- 
- [[grammar]]
- name = "d"
--source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" }
-+source = { git = "https://github.com/gdamore/tree-sitter-d", rev = "5566f8ce8fc24186fad06170bbb3c8d97c935d74" }
- 
- [[language]]
- name = "vhs"
-diff --git a/runtime/grammars/sources/d/src/scanner.c b/runtime/grammars/sources/d/src/scanner.c
-index 6753ba0..2061b02 100644
---- a/runtime/grammars/sources/d/src/scanner.c
-+++ b/runtime/grammars/sources/d/src/scanner.c
-@@ -67,7 +67,7 @@ match_escape(TSLexer *lexer)
- 	case 'x':
- 		for (int i = 0; i < 2; i++) { // expect two hex digits
- 			lexer->advance(lexer, false);
--			if (!isascii(lexer->lookahead) ||
-+			if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- 			    !isxdigit(lexer->lookahead)) {
- 				return (false);
- 			}
-@@ -78,7 +78,7 @@ match_escape(TSLexer *lexer)
- 	case 'u':
- 		for (int i = 0; i < 4; i++) {
- 			lexer->advance(lexer, false);
--			if (!isascii(lexer->lookahead) ||
-+			if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- 			    !isxdigit(lexer->lookahead)) {
- 				return (false);
- 			}
-@@ -89,7 +89,7 @@ match_escape(TSLexer *lexer)
- 	case 'U':
- 		for (int i = 0; i < 8; i++) {
- 			lexer->advance(lexer, false);
--			if (!isascii(lexer->lookahead) ||
-+			if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- 			    !isxdigit(lexer->lookahead)) {
- 				return (false);
- 			}
-@@ -123,7 +123,7 @@ match_escape(TSLexer *lexer)
- 				}
- 				break;
- 			}
--			if (!isascii(lexer->lookahead) ||
-+			if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- 			    !isalnum(lexer->lookahead)) {
- 				return (false);
- 			}
diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch b/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch
deleted file mode 100644
index bb108f000b2f..000000000000
--- a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 41eca94bb6bf3642b1cdb80e89845813a9d03edc Mon Sep 17 00:00:00 2001
-From: Nimrod <ndh42@cornell.edu>
-Date: Mon, 27 Nov 2023 20:31:20 -0500
-Subject: [PATCH] Update git source of Gemini grammar
-
-The author's username changed from "sfr" to "nbsp"
----
- languages.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/languages.toml b/languages.toml
-index ef4687af8a71..33b27626e720 100644
---- a/languages.toml
-+++ b/languages.toml
-@@ -2916,7 +2916,7 @@ file-types = ["gmi"]
- 
- [[grammar]]
- name = "gemini"
--source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
-+source = { git = "https://git.sr.ht/~nbsp/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
- 
- [[language]]
- name = "templ"
diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch b/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch
deleted file mode 100644
index fd7ef56d2799..000000000000
--- a/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 17918a99bcf1bf39b08c09e0690d2ecccda8088d Mon Sep 17 00:00:00 2001
-From: Nan Zhong <me@nanzho.ng>
-Date: Thu, 30 Nov 2023 22:35:49 -0500
-Bug: https://bugs.gentoo.org/912050
-Bug: https://bugs.gentoo.org/918941
-Subject: [PATCH] languages: update rescript grammar
-
-This bump fixes a build failure of the grammer with clang.
----
- languages.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/languages.toml b/languages.toml
-index 10ed167b028d..f4ff483b2b11 100644
---- a/languages.toml
-+++ b/languages.toml
-@@ -1523,7 +1523,7 @@ indent = { tab-width = 2, unit = "  " }
- 
- [[grammar]]
- name = "rescript"
--source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "65609807c628477f3b94052e7ef895885ac51c3c" }
-+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "467dcf99f68c47823d7b378779a6b282d7ef9782" }
- 
- [[language]]
- name = "erlang"
-diff --git a/runtime/grammars/sources/rescript/src/scanner.c b/runtime/grammars/sources/rescript/src/scanner.c
-index 9bf9fa4..113ca35 100644
---- a/runtime/grammars/sources/rescript/src/scanner.c
-+++ b/runtime/grammars/sources/rescript/src/scanner.c
-@@ -131,7 +131,7 @@ bool tree_sitter_rescript_external_scanner_scan(
-     const bool* valid_symbols
-     ) {
-   ScannerState* state = (ScannerState*)payload;
--  const in_string = state->in_quotes || state->in_backticks;
-+  const bool in_string = state->in_quotes || state->in_backticks;
- 
-   if (valid_symbols[TEMPLATE_CHARS]) {
-     lexer->result_symbol = TEMPLATE_CHARS;
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 6b54e8a4c12d..7117f02b8323 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,2 +1 @@
-DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
 DIST kile-2.9.94.tar.bz2 7505095 BLAKE2B b42d7237f612f2d6017bdde3cfea29a74b4756b96cc707b178217e0ab5b599d86b2ffc8e0283fcd6e351746151738bcbff65183b93a347c6fb11250233b7fe5a SHA512 4638e81374243a8b2716183bf28cec02bcb455f2b1a9295e7e04f20833b77c962bddfeb81e527606209c338862af48a38d9f6009a9f7b96aac37f874ae3f725c
diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch
deleted file mode 100644
index 7a66dfcc4f80..000000000000
--- a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6cf4549217e95659c8dfd14f9166fb8b80bad333 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 15 Mar 2024 12:45:51 +0100
-Subject: [PATCH] Switch okular headers to okular5
-
-Otherwise it will be using okular6's.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/configtester.cpp    | 2 +-
- src/kileviewmanager.cpp | 2 +-
- src/kileviewmanager.h   | 2 +-
- src/livepreview.cpp     | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/configtester.cpp b/src/configtester.cpp
-index 35ce3e71..cd7ed588 100644
---- a/src/configtester.cpp
-+++ b/src/configtester.cpp
-@@ -14,7 +14,7 @@
- 
- #include "configtester.h"
- 
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
- 
- #include <QTimer>
- 
-diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
-index 34f84397..f5ac0cdc 100644
---- a/src/kileviewmanager.cpp
-+++ b/src/kileviewmanager.cpp
-@@ -15,7 +15,7 @@
- #include "kileviewmanager.h"
- #include <config.h>
- 
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
- 
- #include <KAcceleratorManager>
- #include <KActionCollection>
-diff --git a/src/kileviewmanager.h b/src/kileviewmanager.h
-index 42367291..e0b3ca09 100644
---- a/src/kileviewmanager.h
-+++ b/src/kileviewmanager.h
-@@ -15,7 +15,7 @@
- #ifndef KILEVIEWKILEVIEWMANAGER_H
- #define KILEVIEWKILEVIEWMANAGER_H
- 
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
- 
- #include <KTextEditor/Cursor>
- #include <KTextEditor/ModificationInterface>
-diff --git a/src/livepreview.cpp b/src/livepreview.cpp
-index dbd7ff13..fcfa2a6d 100644
---- a/src/livepreview.cpp
-+++ b/src/livepreview.cpp
-@@ -40,7 +40,7 @@
- #include <KParts/MainWindow>
- #include <KXMLGUIFactory>
- 
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
- 
- #include "errorhandler.h"
- #include "kiledebug.h"
--- 
-2.44.0
-
diff --git a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild
deleted file mode 100644
index 3c11cf77aae7..000000000000
--- a/app-editors/kile/kile-2.9.93_p20221123-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="forceoptional"
-KDE_ORG_CATEGORY="office"
-KDE_ORG_COMMIT="1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
-
-LICENSE="FDL-1.2 GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+pdf +png"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	|| (
-		media-gfx/okularpart:5[pdf?]
-		kde-apps/okular:5[pdf?]
-	)
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
-	|| (
-		kde-apps/konsolepart:5
-		kde-apps/konsole:5
-	)
-	virtual/latex-base
-	virtual/tex-base
-	pdf? (
-		app-text/ghostscript-gpl
-		app-text/texlive-core
-	)
-	png? (
-		app-text/dvipng
-		virtual/imagemagick-tools[png?]
-	)
-"
-
-DOCS=( kile-remote-control.txt )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_prepare() {
-	if has_version "media-gfx/okularpart:5"; then
-		eapply "${FILESDIR}/${P}-okularpart.patch"
-	fi
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
diff --git a/app-editors/kile/kile-2.9.94.ebuild b/app-editors/kile/kile-2.9.94.ebuild
index 55d1733e52ff..b3a442b3cbcb 100644
--- a/app-editors/kile/kile-2.9.94.ebuild
+++ b/app-editors/kile/kile-2.9.94.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="FDL-1.2 GPL-2"
diff --git a/app-editors/nano/nano-8.1.ebuild b/app-editors/nano/nano-8.1.ebuild
index d76080e27a1b..e220a0fdd257 100644
--- a/app-editors/nano/nano-8.1.ebuild
+++ b/app-editors/nano/nano-8.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 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 ~ia64 ~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 ~ia64 ~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"
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 2b9232daa17f..ae082ac4e361 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,3 +1 @@
-DIST ne-3.3.1.tar.gz 1138072 BLAKE2B 8494ff955b456bbac2e82823ee155980f8fab5a1071d0bfd6a987f1ed0724129ab2ecb70737547836b592369b45daf5e499d50d7230b04c5eabfd1536a56271f SHA512 d8c1d8cd9bbafcc7c8c485ca4454d6979be3d33ae918139865ce5f76e428f165043707c95c2e440bd9bccd00c67ce81a41f87f94b85cae3518c4749233718123
-DIST ne-3.3.2.tar.gz 1154326 BLAKE2B 8c11abac9a960a41de2faed9b2e948cca9ca7f8345757796fb7daa112e62d565096b1cd3a4ca2e76cfb1616ee8c0dad01bb2fe5306bac6f0aadca0644b91eb6d SHA512 6c4fabb0ecade31322d5f96203f3bba3316264d8f98a46188796ce88f4b7fd17af8569832ae2638770f8ceb59138b0395b0e03817db961bfe94c917fa390ebf3
 DIST ne-3.3.3.tar.gz 1162423 BLAKE2B 72db1088757eb752e94480e0d0f02a85edc2df8b45bb6de732c43a6b6bfbcf0d54038462f8730ef3772a81f13ce0ca6154cced5aa10f1a0aa96ddc8697a0aaff SHA512 13bf4fae6977230cd7f3b46d12a25a605d2e83e363cf54202dc4b9e8fb19cc51bac5f30611166839bc1f717c5367db272c8d215b8006f7aa9eec312a817d35c7
diff --git a/app-editors/ne/files/ne-3.3.1-respect-CFLAGS.patch b/app-editors/ne/files/ne-3.3.1-respect-CFLAGS.patch
deleted file mode 100644
index 13e47b9be2b1..000000000000
--- a/app-editors/ne/files/ne-3.3.1-respect-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/makefile b/src/makefile
-index ae358fe..76bfe1d 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -96,8 +96,7 @@ endif
- 
- # Test for GCC
- ifneq (,$(findstring gcc,$(shell $(CC) 2>&1)))
--GCCFLAGS=-std=c99 -Wall -Wno-parentheses -fno-strict-aliasing -flto=auto -ffat-lto-objects -Wp,-D_FORTIFY_SOURCE=2
--LDFLAGS=-flto=auto
-+GCCFLAGS=-std=c99 -Wall -Wno-parentheses -fno-strict-aliasing -Wp,-D_FORTIFY_SOURCE=2
- endif
- 
- CFLAGS=$(GCCFLAGS) \
diff --git a/app-editors/ne/ne-3.3.1.ebuild b/app-editors/ne/ne-3.3.1.ebuild
deleted file mode 100644
index a0ce06a3a43c..000000000000
--- a/app-editors/ne/ne-3.3.1.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 toolchain-funcs
-
-DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="https://ne.di.unimi.it/"
-SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="sys-libs/ncurses:="
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1-respect-CFLAGS.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	# bug #776799
-	sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin src/${PN}
-
-	insinto /usr/share/${PN}/syntax
-	doins syntax/*.jsf
-
-	doman doc/${PN}.1
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/ne/ne-3.3.2.ebuild b/app-editors/ne/ne-3.3.2.ebuild
deleted file mode 100644
index 4743055eb679..000000000000
--- a/app-editors/ne/ne-3.3.2.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
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="https://ne.di.unimi.it/"
-SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS=( doc/html/. )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1-respect-CFLAGS.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's/-O3//' \
-		-e 's/-Wp,-D_FORTIFY_SOURCE=2//' \
-		src/makefile || die
-}
-
-src_configure() {
-	# bug #776799
-	sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin src/${PN}
-
-	insinto /usr/share/${PN}/syntax
-	doins syntax/*.jsf
-
-	doman doc/${PN}.1
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 4ef1294dd32e..a4a46f388c4e 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,3 +1 @@
-DIST neovim-0.10.0.tar.gz 12792034 BLAKE2B b9bf44d2f0ae1075196f5f96b2fb5e974907406fa6e5bf09593d1f9f36135dab466b6a063d1d03e3716dce435df296ec6d00a2f015e85d0edd231fb9fd4c9385 SHA512 878cb58729a18179b38303bd9cf79e38997c87946665ac4e7b76d87e15f5d001028fd1454ce30b20773b20a4fe929dfa399fc2ec7f6db0774a4e864c9e8586c1
 DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392f707deddef4640b6953ad574f9a455897217c2431c6c2fadb56568b55ac18ed06bbfcc7bbe1c6ab013991e99ee6 SHA512 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908
-DIST neovim-0.9.5.tar.gz 11590180 BLAKE2B a982ea5704a8e5810c42475198157c3d2255c033f47cba940f9f6414c649167ecafe08c7fe9aeb3154a15566fdf8f5db8d535fa752e467e36ff5d552a7aa2179 SHA512 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775
diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
deleted file mode 100644
index b6026437f7bf..000000000000
--- a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 521ef93..a637866 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,12 +114,6 @@ set(NVIM_API_LEVEL 11)         # Bump this after any API change.
- set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
- set(NVIM_API_PRERELEASE false)
- 
--# Default to -O2 on release builds.
--if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
--  message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
--  string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
--endif()
--
- # Build-type: RelWithDebInfo
- 
- # /Og means something different in MSVC
diff --git a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch
deleted file mode 100644
index 1488148298bd..000000000000
--- a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -415,11 +415,7 @@ foreach(gen_include ${prop})
-     list(APPEND gen_cflags "-I${gen_include}")
-   endforeach()
- endforeach()
-
--if(APPLE AND CMAKE_OSX_SYSROOT)
--  list(APPEND gen_cflags "-isysroot")
--  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
--endif()
- set(gen_cflags ${gen_cflags} -O2)
-
- set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h)
diff --git a/app-editors/neovim/files/sysinit.vim b/app-editors/neovim/files/sysinit.vim
index 92b802f345cf..de47eef7299e 100644
--- a/app-editors/neovim/files/sysinit.vim
+++ b/app-editors/neovim/files/sysinit.vim
@@ -55,13 +55,6 @@ augroup gentoo
   " filetype and indent settings for all things Gentoo.
   au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
 
-  " In text files, limit the width of text to 78 characters, but be careful
-  " that we don't override the user's setting.
-  autocmd BufNewFile,BufRead *.txt
-        \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
-        \   setlocal textwidth=78 |
-        \ endif
-
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
         \ if ! exists("g:leave_my_cursor_position_alone") |
diff --git a/app-editors/neovim/files/sysinit.vim-r1 b/app-editors/neovim/files/sysinit.vim-r1
deleted file mode 100644
index de47eef7299e..000000000000
--- a/app-editors/neovim/files/sysinit.vim-r1
+++ /dev/null
@@ -1,97 +0,0 @@
-" Default Gentoo configuration file for neovim
-" Based on the default vimrc shipped by Gentoo with app-editors/vim-core
-
-" You can override any of these settings on a global basis via the
-" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
-" You may need to create these.
-
-" Neovim comes with sensible defaults, see:
-" https://github.com/neovim/neovim/issues/2676
-" Most of the general settings from Gentoo's vimrc have been dropped here.
-" We add only some necessary fixes and a few Gentoo specific settings.
-
-" {{{ Locale settings
-" If we have a BOM, always honour that rather than trying to guess.
-if &fileencodings !~? "ucs-bom"
-  set fileencodings^=ucs-bom
-endif
-
-" Always check for UTF-8 when trying to determine encodings.
-if &fileencodings !~? "utf-8"
-  " If we have to add this, the default encoding is not Unicode.
-  let g:added_fenc_utf8 = 1
-  set fileencodings+=utf-8
-endif
-" }}}
-
-" {{{ Fix &shell, see bug #101665.
-if "" == &shell
-  if executable("/bin/bash")
-    set shell=/bin/bash
-  elseif executable("/bin/sh")
-    set shell=/bin/sh
-  endif
-endif
-"}}}
-
-" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
-" files should default to bash. See :help sh-syntax and bug #101819.
-if has("eval")
-  let is_bash=1
-endif
-" }}}
-
-" {{{ Autocommands
-if has("autocmd")
-
-augroup gentoo
-  au!
-
-  " Gentoo-specific settings for ebuilds.  These are the federally-mandated
-  " required tab settings.  See the following for more information:
-  " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
-  " Note that the rules below are very minimal and don't cover everything.
-  " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
-  " filetype and indent settings for all things Gentoo.
-  au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
-
-  " When editing a file, always jump to the last cursor position
-  autocmd BufReadPost *
-        \ if ! exists("g:leave_my_cursor_position_alone") |
-        \   if line("'\"") > 0 && line ("'\"") <= line("$") |
-        \     exe "normal g'\"" |
-        \   endif |
-        \ endif
-
-  " When editing a crontab file, set backupcopy to yes rather than auto. See
-  " :help crontab and bug #53437.
-  autocmd FileType crontab set backupcopy=yes
-
-  " If we previously detected that the default encoding is not UTF-8
-  " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no
-  " characters at all) isn't a Unicode file, but is in the default encoding.
-  " Except of course if a byte-order mark is in effect.
-  autocmd BufReadPost *
-        \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
-        \   ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
-        \     set fileencoding= |
-        \ endif
-
-  " Strip trailing spaces on write
-  autocmd BufWritePre *.e{build,class}
-        \ if ! exists("g:leave_my_trailing_space_alone") |
-        \   :%s/\s\+$//e |
-        \ endif
-
-augroup END
-
-endif " has("autocmd")
-" }}}
-
-" {{{ nvimrc.local
-if filereadable("/etc/vim/nvimrc.local")
-  source /etc/vim/nvimrc.local
-endif
-" }}}
-
-" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :
diff --git a/app-editors/neovim/neovim-0.10.0-r1.ebuild b/app-editors/neovim/neovim-0.10.0-r1.ebuild
deleted file mode 100644
index cae241418746..000000000000
--- a/app-editors/neovim/neovim-0.10.0-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
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.9:=
-	=dev-libs/tree-sitter-bash-0.21*
-	=dev-libs/tree-sitter-c-0.21*
-	=dev-libs/tree-sitter-lua-0.1*
-	=dev-libs/tree-sitter-markdown-0.2*
-	=dev-libs/tree-sitter-python-0.21*
-	=dev-libs/tree-sitter-query-0.3*
-	=dev-libs/tree-sitter-vim-0.4*
-	=dev-libs/tree-sitter-vimdoc-2*
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		# appends -flto
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${LUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# symlink tree-sitter parsers
-	dodir /usr/share/nvim/runtime
-	for parser in bash c lua markdown python query vim vimdoc; do
-		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
-	done
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.10.0.ebuild b/app-editors/neovim/neovim-0.10.0.ebuild
deleted file mode 100644
index 8c1e075d2ee6..000000000000
--- a/app-editors/neovim/neovim-0.10.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.9:=
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		# appends -flto
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${LUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.10.1-r1.ebuild b/app-editors/neovim/neovim-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..b73b16f4c014
--- /dev/null
+++ b/app-editors/neovim/neovim-0.10.1-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
+LUA_COMPAT=( lua5-{1..2} luajit )
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager test"
+
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	>=dev-util/gperf-3.1
+	>=sys-devel/gettext-0.20.1
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
+# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
+# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	>=dev-libs/libutf8proc-2.9.0:=
+	>=dev-libs/libuv-1.46.0:=
+	>=dev-libs/libvterm-0.3.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.22.6:=
+	=dev-libs/tree-sitter-bash-0.21*
+	=dev-libs/tree-sitter-c-0.21*
+	=dev-libs/tree-sitter-lua-0.1*
+	=dev-libs/tree-sitter-markdown-0.2*
+	=dev-libs/tree-sitter-python-0.21*
+	=dev-libs/tree-sitter-query-0.4*
+	=dev-libs/tree-sitter-vim-0.4*
+	=dev-libs/tree-sitter-vimdoc-3*
+	>=dev-libs/unibilium-2.0.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+BDEPEND+="
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+)
+
+src_prepare() {
+	# Use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	# https://forums.gentoo.org/viewtopic-p-8750050.html
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		# appends -flto
+		-DENABLE_LTO=OFF
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${LUA}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# symlink tree-sitter parsers
+	dodir /usr/share/nvim/runtime
+	for parser in bash c lua markdown python query vim vimdoc; do
+		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
+	done
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/neovim/neovim-0.10.1.ebuild b/app-editors/neovim/neovim-0.10.1.ebuild
deleted file mode 100644
index 58654ba90fea..000000000000
--- a/app-editors/neovim/neovim-0.10.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libutf8proc-2.9.0:=
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.22.6:=
-	=dev-libs/tree-sitter-bash-0.21*
-	=dev-libs/tree-sitter-c-0.21*
-	=dev-libs/tree-sitter-lua-0.1*
-	=dev-libs/tree-sitter-markdown-0.2*
-	=dev-libs/tree-sitter-python-0.21*
-	=dev-libs/tree-sitter-query-0.4*
-	=dev-libs/tree-sitter-vim-0.4*
-	=dev-libs/tree-sitter-vimdoc-3*
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		# appends -flto
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${LUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# symlink tree-sitter parsers
-	dodir /usr/share/nvim/runtime
-	for parser in bash c lua markdown python query vim vimdoc; do
-		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
-	done
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.9.5-r1.ebuild b/app-editors/neovim/neovim-0.9.5-r1.ebuild
deleted file mode 100644
index 539c462636df..000000000000
--- a/app-editors/neovim/neovim-0.9.5-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
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.8:=
-	>=dev-libs/libtermkey-0.22
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
-	"${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		# appends -flto
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.9.5.ebuild b/app-editors/neovim/neovim-0.9.5.ebuild
deleted file mode 100644
index 59f60e257bdd..000000000000
--- a/app-editors/neovim/neovim-0.9.5.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
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.8:=
-	>=dev-libs/libtermkey-0.22
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
-	"${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		# appends -flto
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index a322637e75c8..edf16933b50b 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -105,7 +105,7 @@ src_install() {
 
 	# install a default configuration file
 	insinto /etc/vim
-	newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim
+	doins "${FILESDIR}"/sysinit.vim
 
 	# symlink tree-sitter parsers
 	dodir /usr/share/nvim/runtime
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 22e9f44d2b80..22215586e9d0 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,2 +1,2 @@
 DIST okteta-0.26.15.tar.xz 1090764 BLAKE2B 3e96aca3bc1ec1aceb22de23f7aa954c7a41b1b074207bf59acb3be27ababb7a368044b231f587604c42dba16c002fd8f0df488b1828f564b0eb79cd64622fec SHA512 8e63b20ad3e1d238a6006fca834b355825015088a3dff82866e1197c2802e4a3cc57644d50b44407203bea2c2d4a132c89d402e52e4525d257de9a8cde87f1db
-DIST okteta-0.26.16.tar.xz 1090268 BLAKE2B 73834ded6d286611cfd06d4851c655b943a3ff796d08ee43a0dc864f73a0d7ef0b60301054faa59732afccc5272742855989598f5ac6eaa60888afabbba98da8 SHA512 e18f54b4c0ce665dcf91b6a338d3abae4c062fe07bfea6ca14a03b8f2ba91207bdb67e03faa2fd90eaa49ed844b2549046612b75ecb9462cb6dfac71f0c0b141
+DIST okteta-0.26.17.tar.xz 1090720 BLAKE2B f062e2fe2be54d4895fdc27e545885621e6e31932e23f8f098e88bb4b1dc01d08e2376621bfbed7e729e0b264a2a46ded8819ce0041e86e0f17e150ac875137f SHA512 0ef8c43802596e124dfeaff1edfc1f77d239fbbe6daaa70eda6f48e77ae3d09ea730da8757a9a52986efc822d8e9692587636fd9ecbf1ce7689362a48079d6b9
diff --git a/app-editors/okteta/okteta-0.26.16.ebuild b/app-editors/okteta/okteta-0.26.17.ebuild
index efad0b46cf69..efad0b46cf69 100644
--- a/app-editors/okteta/okteta-0.26.16.ebuild
+++ b/app-editors/okteta/okteta-0.26.17.ebuild
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index dcf32d3b6f56..aa28b799619e 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,2 +1 @@
-DIST qxmledit-0.9.12-src.tgz 22582822 BLAKE2B 66cf57e8cd1cbf712c28e55ee39685ea907216ff397b9f6ad5307e768bbd22a16b1f32dbbd309ae186479c35bd57d0aa1a1d5b4e174d1230c3b52f844be7e9f7 SHA512 996f1a656c6191950eb18bd3df13574f6bd85ad58132b5662cce5b6538fe81597359d3a7f69cff5c252c2efceb749ee079bed7165b3c142d33e0c4cb500231cc
 DIST qxmledit-0.9.18-src.tgz 19725693 BLAKE2B f895a0981efcbf5071a38b7b02ad0063f0aa55b31c8329ad9b39167b853cc5d1ab4c2f0e75a48c4354a1808a96e7987c55063fc4b7c3f1012173d28d8e301eb2 SHA512 1122021d27561309c70946862a67ea2ba1045038b1ec8469ae61c7c9a67b13689179078ae3a0dd6222d30e3c30cd35a15ba6f4ef27273bbe87d26ec5a215c65c
diff --git a/app-editors/qxmledit/qxmledit-0.9.12.ebuild b/app-editors/qxmledit/qxmledit-0.9.12.ebuild
deleted file mode 100644
index 12c0932af921..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="https://qxmledit.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscxml:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	media-libs/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	# avoid internal compiler errors
-	use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index fed0cbb5a98e..6b85cd89e39a 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,4 +1 @@
-DIST tea-47.0.0.tar.bz2 437273 BLAKE2B 8ed36526dedc6df4af74ef0e400c2ee2e19bb533cf2a4fa51df83f21ad78abb0e8e90bce3469e2e8db5f780ba8a900aedf2737c736945431b836ba0a76574b26 SHA512 7136d59383bf43c6a024a31aa29860a3e89893ff091a42f44f9e7088fb318920ab886cd1fdabc8ff6e3c30f8eb3d46d707228d2d45fb085ed7c822a4ffd89d13
-DIST tea-qt-62.1.1.tar.gz 675996 BLAKE2B 2219a7f61fe54426b0216e5612b05048ee6f1451084d4aa66c0744110ce6151c2ba46acf1c7e7b5916ae6194516391fa1c23cb797ecd7ac423e3005a88da85f4 SHA512 1d81b83a6f25f385959a507342f4a79c24be5af20c2841d851f0d233cbd77142c672c9f147a185e3088000172d5d943bd290497dfcbec87c1a3e0b96a40a5217
-DIST tea-qt-62.2.1.tar.gz 676570 BLAKE2B f4fa2756d6016d84c0c20c572dc2e03013d8f5b12d726d6d0aa4edbdcb5784552c8330c52f4016dcb85c0d8e1923bfdc90d39dd4dee4f378ac8c07182f1e7eee SHA512 0e2adf21023867466b7a4228c56ac1d05533b27f4abee672529c1f506f8d5e2880216bae35e1ff5ad0e0dc64c22c7536144c54c347c9d8f1d569fb74261101d0
 DIST tea-qt-62.4.0.tar.gz 676565 BLAKE2B 2dbeeb37142bcc6d5a8434e21380e316f49f614e3c602799088848994eac0b57bff54ca07f8ac411a76a480a0079fccf6d648bebc1c10a9c8790228f7c2efd87 SHA512 57af069d0afd25319cede65c9dcf08860267d22f4aebbe9b068e28739fd74d8b1da960f09ce41fc1cb88c68e29c96ec2e2a6e167777ac32cd7bd9d543b05dd42
diff --git a/app-editors/tea/files/tea-62.1.1-qt-option.patch b/app-editors/tea/files/tea-62.1.1-qt-option.patch
deleted file mode 100644
index e4f2a580c6e9..000000000000
--- a/app-editors/tea/files/tea-62.1.1-qt-option.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2ca1a29e67c9cee591dbab5a323764e435d46b2c Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Sun, 19 Nov 2023 12:53:11 +0200
-Subject: [PATCH] Make qt6 a cmake option instead of letting automagic
- handle it
-
-* qt_standard_project_setup() is >=qt-6.3 only, so put it under
-  Qt6_Found.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,8 +11,11 @@ set(CMAKE_AUTORCC ON)
- enable_language(CXX)
- enable_language(C)
- 
--find_package(Qt6 COMPONENTS Core Widgets)
--if (NOT Qt6_FOUND)
-+option(USE_QT6 "Build against QT6" ON)
-+
-+if (USE_QT6)
-+    find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
-+else()
-     find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets)
- endif()
- 
-@@ -22,10 +25,8 @@ message("+ Qt6 found")
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
--endif()
--
--
- qt_standard_project_setup()
-+endif()
- 
- 
- set(PROJECT "tea-qt")
--- 
-2.42.1
-
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
index b5d7b51471d8..2b4986d719ab 100644
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/metadata.xml
@@ -12,7 +12,5 @@
 	</upstream>
 	<use>
 		<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
-		<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
-		<flag name="qml">Enable support for plugins using QML</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-editors/tea/tea-47.0.0.ebuild b/app-editors/tea/tea-47.0.0.ebuild
deleted file mode 100644
index 16f6139622f0..000000000000
--- a/app-editors/tea/tea-47.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="https://tea.ourproject.org/"
-SRC_URI="https://tea.ourproject.org/dloads/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="aspell djvu hunspell pdf +qml"
-
-BDEPEND="
-	hunspell? ( virtual/pkgconfig )
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	aspell? ( app-text/aspell )
-	djvu? ( app-text/djvu )
-	hunspell? ( app-text/hunspell:= )
-	pdf? ( app-text/poppler[qt5] )
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO )
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX=/usr
-		$(usex aspell '' CONFIG+=noaspell)
-		$(usex djvu CONFIG+=usedjvu '')
-		$(usex hunspell '' CONFIG+=nohunspell)
-		$(usex pdf CONFIG+=usepoppler '')
-		$(usex qml '' CONFIG+=noqml)
-	)
-	eqmake5 tea-qmake.pro "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	docinto html
-	dodoc manuals/*.html
-
-	insinto /usr/share/qt5/translations
-	doins translations/${PN}_*.qm
-}
diff --git a/app-editors/tea/tea-62.1.1.ebuild b/app-editors/tea/tea-62.1.1.ebuild
deleted file mode 100644
index 98ca7bb80309..000000000000
--- a/app-editors/tea/tea-62.1.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-MY_P="tea-qt-${PV}"
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="https://tea.ourproject.org/"
-SRC_URI="https://github.com/psemiletov/tea-qt/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="aspell djvu pdf"
-
-# qt6 blocked by poppler[qt6]
-DEPEND="
-	app-text/hunspell:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	aspell? ( app-text/aspell )
-	djvu? ( app-text/djvu )
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO )
-
-PATCHES=(
-	"${FILESDIR}/tea-62.1.1-qt-option.patch"
-	"${FILESDIR}/tea-62.1.1-fix-desktop.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Replace AUR link with p.g.o link
-	sed -i \
-		-e 's,AUR: aur.archlinux.org/packages/tea-qt-git,Gentoo: https://packages.gentoo.org/packages/app-editors/tea,' \
-		tea.cpp translations/{de,es,fr,pl,ru}.ts || die
-
-	# Rename tea to tea-qt to avoid file conflict with dev-util/tea
-	# bug #917587
-	# https://github.com/psemiletov/tea-qt/issues/50
-	sed -i -e '/set_target_properties(tea PROPERTIES$/ a\
-		OUTPUT_NAME \"tea-qt\"' \
-		CMakeLists.txt || die
-	sed -i -e '/Exec/ { s/tea/tea-qt/ }' desktop/tea.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_ASPELL=$(usex aspell)
-		-DUSE_PDF=$(usex pdf)
-		-DUSE_DJVU=$(usex djvu)
-		-DUSE_QT6=OFF # blocked by poppler-qt6
-		-DUSE_PRINTER=OFF # only for qt6
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ "${REPLACING_VERSIONS}" == "47.0.0" ]]; then
-		elog "Executable 'tea' has been renamed to 'tea-qt'"
-	fi
-}
diff --git a/app-editors/tea/tea-62.2.1.ebuild b/app-editors/tea/tea-62.2.1.ebuild
deleted file mode 100644
index d966ed1501ae..000000000000
--- a/app-editors/tea/tea-62.2.1.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 xdg
-
-MY_P="tea-qt-${PV}"
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="https://tea.ourproject.org/"
-SRC_URI="https://github.com/psemiletov/tea-qt/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="aspell djvu qt6 pdf"
-
-RESTRICT="test" # no tests
-
-DEPEND="
-	app-text/hunspell:=
-	sys-libs/zlib
-	aspell? ( app-text/aspell )
-	djvu? ( app-text/djvu )
-	qt6? (
-		dev-qt/qtbase:6[widgets]
-		dev-qt/qt5compat:6
-		pdf? ( app-text/poppler:=[qt6(-)] )
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		pdf? ( app-text/poppler:=[qt5] )
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO )
-
-PATCHES=(
-	"${FILESDIR}/tea-62.1.1-fix-desktop.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Replace AUR link with p.g.o link
-	sed -i \
-		-e 's,AUR: aur.archlinux.org/packages/tea-qt-git,Gentoo: https://packages.gentoo.org/packages/app-editors/tea,' \
-		tea.cpp translations/{de,es,fr,pl,ru}.ts || die
-
-	# Rename tea to tea-qt to avoid file conflict with dev-util/tea
-	# bug #917587
-	# https://github.com/psemiletov/tea-qt/issues/50
-	sed -i -e '/set_target_properties(tea PROPERTIES$/ a\
-		OUTPUT_NAME \"tea-qt\"' \
-		CMakeLists.txt || die
-	sed -i -e '/Exec/ { s/tea/tea-qt/ }' desktop/tea.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_ASPELL=$(usex aspell)
-		-DUSE_PDF=$(usex pdf)
-		-DUSE_DJVU=$(usex djvu)
-		-DUSE_PRINTER=OFF # appears to be setup wrong
-		$(cmake_use_find_package qt6 Qt6)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ "${REPLACING_VERSIONS}" == "47.0.0" ]]; then
-		elog "Executable 'tea' has been renamed to 'tea-qt'"
-	fi
-}
diff --git a/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
index 3acccba1fa94..4595011bb15c 100644
--- a/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 S="${WORKDIR}/vim-${PV}"
 
diff --git a/app-editors/vim/vim-9.1.0366.ebuild b/app-editors/vim/vim-9.1.0366.ebuild
index 7caafb9755e3..55e806a92483 100644
--- a/app-editors/vim/vim-9.1.0366.ebuild
+++ b/app-editors/vim/vim-9.1.0366.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 91f87fbcb9a3..6c3b91054c81 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -13,9 +13,9 @@ PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby31 ruby32"
 
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
+inherit bash-completion-r1 flag-o-matic lua-single desktop python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
 
-if [[ ${PV} == 9999* ]] ; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+IUSE="acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager X"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -37,18 +37,18 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+	~app-editors/vim-core-${PV}
 	>=app-eselect/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? ( ${LUA_DEPS}
+	lua? (
+		${LUA_DEPS}
 		$(lua_gen_impl_dep 'deprecated' lua5-1)
 	)
-	~app-editors/vim-core-${PV}
-	vim-pager? ( app-editors/vim-core[-minimal] )
+	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
@@ -56,6 +56,7 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )
 	sound? ( media-libs/libcanberra )
 	tcl? ( dev-lang/tcl:0= )
+	vim-pager? ( app-editors/vim-core[-minimal] )
 	X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
@@ -76,7 +77,7 @@ if [[ ${PV} != 9999* ]]; then
 	)
 fi
 
-# platform-specific checks (bug #898452):
+# platform-specific checks (bug #898450 #898452):
 # - acl()     -- Solaris
 # - statacl() -- AIX
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -153,9 +154,17 @@ src_prepare() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm src/auto/configure || die "rm failed"
 
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
 	# bug 908961
 	if use elibc_musl ; then
 		sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
@@ -177,22 +186,26 @@ src_configure() {
 
 	# This should fix a sandbox violation (see bug #24447). The hvc
 	# things are for ppc64, see bug #86433.
+	local file
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
+		if [[ -e ${file} ]]; then
 			addwrite ${file}
 		fi
 	done
 
-	local myconf=()
+	local myconf=(
+		--with-modified-by="Gentoo-${PVR} (RIP Bram)"
+		--enable-gui=no
+		--disable-darwin
+	)
+
 	if use minimal; then
-		myconf=(
+		myconf+=(
 			--with-features=tiny
 			--disable-nls
 			--disable-canberra
 			--disable-acl
-			--enable-gui=no
 			--without-x
-			--disable-darwin
 			--disable-luainterp
 			--disable-perlinterp
 			--disable-pythoninterp
@@ -205,7 +218,7 @@ src_configure() {
 	else
 		use debug && append-flags "-DDEBUG"
 
-		myconf=(
+		myconf+=(
 			--with-features=huge
 			$(use_enable sound canberra)
 			$(use_enable acl)
@@ -223,13 +236,6 @@ src_configure() {
 			$(use_enable terminal)
 		)
 
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
 		if use lua; then
 			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
 			# deprecated (in 5.1) luaL_openlib API (#874690)
@@ -245,8 +251,6 @@ src_configure() {
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
 		myconf+=(
-			--enable-gui=no
-			--disable-darwin
 			$(use_with X x)
 		)
 	fi
@@ -265,9 +269,7 @@ src_configure() {
 			   vim_cv_toupper_broken=no
 	fi
 
-	econf \
-		--with-modified-by="Gentoo-${PVR} (RIP Bram)" \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -316,6 +318,7 @@ src_test() {
 	# Hangs.
 	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'
 
+	# Don't do additional GUI tests.
 	emake -j1 -C src/testdir nongui
 }
 
@@ -355,23 +358,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
+	# update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Call eselect vi update
-	eselect_vi_update
-
 	# update desktop file mime cache
 	xdg_desktop_database_update
+
+	# call eselect vi update
+	eselect_vi_update
 }
 
 pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
+	# update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Call eselect vi update
-	eselect_vi_update
-
 	# update desktop file mime cache
 	xdg_desktop_database_update
+
+	# call eselect vi update
+	eselect_vi_update
 }
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 33bec2886281..a0d25c0c81db 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,6 +1,6 @@
-DIST vscode-1.92.1-amd64.tar.gz 144733912 BLAKE2B 5e764da6e3f6cbe4e386c847e7b42a2dc25b94dc7cd04132dddd846a9b3cebb70bb2a4e1addc3b27d736f813689bf994c1f2d39800ecf5ce1662f98704c69c3c SHA512 a53a074cc7d90efeec1830b17620cb738e5de7c0d494f1f8a9420f02178b371845c12bdf149ea94a2c9b40b8e464087799860715338e112f72e3814df5952879
-DIST vscode-1.92.1-arm.tar.gz 129681373 BLAKE2B 41cfbc5394aafe236df9259940f5839e11ee6d9286e2d0ab79e4dd5b91a458587fbfea4430b7c544035116a1ded2c703eb09f3e02b8357cb29af588300f126c5 SHA512 5bd878e78f24c4d073b0bec827be0be43761539df27fdc6b20036a0e2a5adf5d839bc07e82e31e82177709e3282c92b6229136d561fd338506033aaf4364caa9
-DIST vscode-1.92.1-arm64.tar.gz 141616445 BLAKE2B d29357ac474ee418d438947f421bf1aa21a65b9707d559d8d735a08804f4df2cd98cd2ea7ea28787a5c54f483fd2e60fb569bd94a2224dd8504eb752f7ac61c2 SHA512 79a5a42147dd60c3d7f3105dc874d45c3f414088fb01c798209437aca2edf522be8257f47a24e86713e4aa264d0012989739cb2fdbe5160d89a0f5263bb693df
 DIST vscode-1.92.2-amd64.tar.gz 144730709 BLAKE2B acde98f31d5469ffc271c84e12ab8232af8c523a439f89d247e9f68d472650f8ee6425ad1be014632cb9d8622647cbe6c1c15ee6cfc58fac52f5eada716a9c88 SHA512 59e63815c260a412b757e692ea081e2029439120e877b0a436e692617ee57bb5aa3aea488c4a2363ae2a98bc76485fdfe477ac8314ac974a0f215ed594649694
 DIST vscode-1.92.2-arm.tar.gz 129669472 BLAKE2B 34050c923c45b0b5b25d579a36f449895df640fbcfb16b759e1c209e82b42805640b85adb1d736f89835a487fbfbc2ac905fc0c17969ec7c6cd8c9838c02e6fd SHA512 746a87f744fb51f679f3efd2385c6a3f6107632cc640967d4465e84e68e29dc12e6c42223c457bb2ab8d0e10a83bf42fd132f91466d40795971ad6348b5d04d8
 DIST vscode-1.92.2-arm64.tar.gz 141604400 BLAKE2B fa117d2e3dff1fd81c917347a060b4e276b26303ca8b6e93c035f4b4e9d7b72bad354e99ce3c482ad3fcb98cc83df12065b366ee33b934f3af0e9733648e88b3 SHA512 b0defdf1c0f368819538177070d8134bfabb3ef013845632c2a464f60bfae2bde34b237aa2ea97520bd3b841560e98c2f29a3627e962af8b288dbf4144ce4de6
+DIST vscode-1.93.0-amd64.tar.gz 145343718 BLAKE2B 27bbb1e3d8a0007e5e207c082af1ae78acdfc322735d3cd99c61ab4865a8d24b059d0a60c13a4320bd6587a4217d39812356707b471f320ca87e2b15d96f0ea8 SHA512 57735dcacbafeaa2362382ea078056a2f451bd38bab4ac321b8fad81a07bbe6bfa1e1bdd1d8daceee57abf43711138f32f7ca8d67918ce0007f0ac2ac5fd7aa0
+DIST vscode-1.93.0-arm.tar.gz 130284214 BLAKE2B e3b109765a8c8d89de9f2b676f321b66765e622b37358d64380697d80668718ebcb7cdcf0d616becd5e31bc2db6e032ebdf4bd6a873cd4e0980b6b8e9f390730 SHA512 ec5f09023592eaf00b1597e9638eb248378c0fb2fca0dfb688cab2546a8296baffc49ac25aa0509550289ca5c3e56dc5d6ae03a6e92e4a760b6ce57876d22bdc
+DIST vscode-1.93.0-arm64.tar.gz 142237085 BLAKE2B 517d4cc79cab13e6feed478c65b0feabf43e6b871c820e923c9124d3e9a2fe91db795d133e01a896bc635e7b47a0f6f1dabb9b63552d01801ec24c1e9f6d5eb8 SHA512 bdd8aa2e359e4ba17ab0e162d79b1da40d21ca488d123b08698e182631139d23168d5160ea4b128d17860cf32f76ae403267daabcced5c6c7a5d68e84681caa9
diff --git a/app-editors/vscode/files/code.desktop b/app-editors/vscode/files/code.desktop
index ec697eca68b6..3d3766982e2c 100644
--- a/app-editors/vscode/files/code.desktop
+++ b/app-editors/vscode/files/code.desktop
@@ -2,7 +2,7 @@
 Name=VSCode
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode @exec_extra_flags@ --unity-launch %F
+Exec=/usr/bin/vscode @exec_extra_flags@ %F
 Icon=vscode
 Type=Application
 StartupNotify=false
diff --git a/app-editors/vscode/vscode-1.92.1.ebuild b/app-editors/vscode/vscode-1.92.1.ebuild
deleted file mode 100644
index 7eebb15e925a..000000000000
--- a/app-editors/vscode/vscode-1.92.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
-
-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.asar.unpacked/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
-
-	domenu "${T}/code.desktop"
-	domenu "${T}/code-url-handler.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"
-}
diff --git a/app-editors/vscode/vscode-1.93.0.ebuild b/app-editors/vscode/vscode-1.93.0.ebuild
new file mode 100644
index 000000000000..c06246461b83
--- /dev/null
+++ b/app-editors/vscode/vscode-1.93.0.ebuild
@@ -0,0 +1,131 @@
+# 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.asar.unpacked/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
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.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"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 30c6a69ae893..32999bafe331 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,6 +1,3 @@
-DIST vscodium-1.92.1.24225-amd64.tar.gz 130846082 BLAKE2B c16bfb6c359d4a31ea016e0e545747e1f288db984592995d032db0a143b1b1c1db43ddcd0ca8cd977cebd467c7408467cb87e26288be6b0db46bd891657580bc SHA512 84c1722f98ccda8e729bfd9e7663ed0aeff7f65d2ff034ebfbb8d6eb38c9901737bb2e0c411d471982451fa8c5bd6b8f4b3f99e52b8c4ce2dec2efc499bc86c3
-DIST vscodium-1.92.1.24225-arm.tar.gz 119303418 BLAKE2B 9a804be292104e4f65c0e75eade99bd9c4924f389fcabc4ab26eac500103a391e199133c1317b8b222bb63e6172d2009abbf0d2d8d83faadc8efff800a199db9 SHA512 1152be3718b488a4787a8efa3bece3e96c3d7e24f336e70aa453d40c584d5a76021a78c112c2f54948f0480fc523426d661c56f8c0b03dab7c7ec282c73fccc4
-DIST vscodium-1.92.1.24225-arm64.tar.gz 130894367 BLAKE2B ff18c7c13f17ebdc1bca0037c68a68820b9ee2c46c67357a7967e431924ee8578fa3b4a657cc7916dd163de9460dbafece478f5f414ff43f54863888fa4a265d SHA512 688fed5cc2e1123e7e4a03442e6cdfdc4777233cab53838123186b32ac48ba86b9e5d39921628aaec2825443050fa681d599e9310de67b799f7afbd8d9adcf60
 DIST vscodium-1.92.2.24228-amd64.tar.gz 130843357 BLAKE2B 3510141a3b86163a5d0fafbc3dd4d68f03d81c3d8bb2f7a6341bffdafe8690baeecd136c177561832356d1fab44bc1b173edb9b48fea2e486ae13ffa440e3dde SHA512 fe21d65de84e5b2e99fa463c198fe47bc10e254ebac6f5e24c42c0de0e5e5e086c83541cddc295a5bcc3b1698afb8d1e06cb96bcc3c7d555cda8e84cfbca1f26
 DIST vscodium-1.92.2.24228-arm.tar.gz 119300483 BLAKE2B ab542195ac209dc68dc5fe9b63b9892495df146675268bb2e3c559ffb9ada1bd05f97b6907be50ca356358c72906cdfd6449ae86ebf5a4ce391aae165260ef51 SHA512 0930206931dfdd38c4ce53699b395d2bfb439e9a8579b5429c6c9594910aafe82a35d1fcfcecaf0132325a179b96abf9d73c88866789978da24325a1cd0bb31b
 DIST vscodium-1.92.2.24228-arm64.tar.gz 130895581 BLAKE2B a6b205ba449a34c7ba695a12dbbc8ef3a4b1f6dfe2dd6dc0c2285af549cc7750de7d7aa044ea1354c325deae995d49e808e02a0d2a4001b7764c233d49245d09 SHA512 fe0b6c5a3269fc12f91251035a5c8162861e2301e67bbf49895a2a58ecc542b376ac95e673dadb04b1f7e1849f18e8d8821f95e819e7fb7d9c66674be460de73
diff --git a/app-editors/vscodium/vscodium-1.92.1.24225.ebuild b/app-editors/vscodium/vscodium-1.92.1.24225.ebuild
deleted file mode 100644
index 4bf914823a45..000000000000
--- a/app-editors/vscodium/vscodium-1.92.1.24225.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 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)
-"
-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"
-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}/vscodium-url-handler.desktop" \
-		> "${T}/vscodium-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscodium.desktop" \
-		> "${T}/vscodium.desktop" || die
-
-	domenu "${T}/vscodium.desktop"
-	domenu "${T}/vscodium-url-handler.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/yudit/Manifest b/app-editors/yudit/Manifest
index 93e80c06ad1c..992a158155bf 100644
--- a/app-editors/yudit/Manifest
+++ b/app-editors/yudit/Manifest
@@ -1,2 +1 @@
-DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b
 DIST yudit-3.1.0.tar.gz 4317815 BLAKE2B fdcec8402bd87f800b0e2712f74d5d546d7ba0733b36fec720e46ef0c5efc0be340ec8db7ffe101c5596d054cc10e1364bf2d5a70f25b234e57165b5116edd80 SHA512 07b89cdea29971fe49a7e61e2919261d6a39a6420c2587fad160a78885513460cb210b63dbfc1320f993d38e56e4104f77911530b9b7da210bfb7390e37ed352
diff --git a/app-editors/yudit/yudit-2.9.6.ebuild b/app-editors/yudit/yudit-2.9.6.ebuild
deleted file mode 100644
index e9bbd2b8ef67..000000000000
--- a/app-editors/yudit/yudit-2.9.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Free (Y)unicode text editor for all unices"
-HOMEPAGE="http://www.yudit.org/"
-SRC_URI="http://yudit.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	default
-	#Don't strip binaries, let portage do that.
-	sed -i "/^INSTALL_PROGRAM/s: -s::" Makefile.conf.in || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc {BUGS,CHANGELOG,NEWS,TODO,XBUGS}.TXT
-}
diff --git a/app-editors/yudit/yudit-3.1.0-r1.ebuild b/app-editors/yudit/yudit-3.1.0-r1.ebuild
deleted file mode 100644
index faaae1391bc4..000000000000
--- a/app-editors/yudit/yudit-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Free (Y)unicode text editor for all unices"
-HOMEPAGE="https://www.yudit.org/"
-SRC_URI="https://yudit.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-DOCS=( {BUGS,CHANGELOG,NEWS,TODO}.TXT )
-
-src_prepare() {
-	default
-	# Don't strip binaries, let portage do that.
-	# Don't call ar / ranlib directly
-	sed -i \
-		-e "/^INSTALL_PROGRAM/s| -s||" \
-		-e "s|ar cr|$(tc-getAR) cr|g" \
-		-e "s|ranlib|$(tc-getRANLIB)|g" \
-		Makefile.conf.in || die "sed failed"
-}
diff --git a/app-editors/zed/Manifest b/app-editors/zed/Manifest
new file mode 100644
index 000000000000..26ecf5a1a30f
--- /dev/null
+++ b/app-editors/zed/Manifest
@@ -0,0 +1,1046 @@
+DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST aes-0.8.4.crate 124812 BLAKE2B c4a9cadbbfd9d24a758bd5d18b851fb86bd74f5b1f0f6f5706275329d92396a00dc2c35fa0aa2af5b55fd336934d35df413a31f85ba886e85a037296f9df25bd SHA512 96243337546acf64f89bf9ba23011eea1a205d82d96707f9c45bf28cc62ef00cdac5cdfacb8d6013155ee1522ad73dd1b7f166c74ed18159bf23c3c48ec77d79
+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 alacritty-cacdb5bb3b72bad2c729227537979d95af75978f.gh.tar.gz 1639729 BLAKE2B 0ec01e77b2683c43fbb8fd4dcc7cf9587c2c7865a10fce489291f9f7f2d0ecec668993db5fd3d2dc5a26d228da2de35aefa17cb2d8af91d718cbe252ce3b3b14 SHA512 591c658290c514124cd3e9fee892cb4820eb23b46e93d13c61158f50a56692666c8bff0cf3c3f2ede6b2b9308acc7a24b96225a08ba56b526983cd2ce6e78b24
+DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca SHA512 a60e4280335638b36a72e51514843229fdd0cc89cb670fcf159f882a687c04ecbddcc52a1dcc3cbe8647e5308af3939037934a157facdddcc4834dcd3cb16dc8
+DIST aligned-vec-0.5.0.crate 8921 BLAKE2B 64909a9a58c787dd975c65f8a34cbceac39b72044cf43cc545ea4025f82c3de620e8dc21d7b1bee054fc82d3adf74c4bb4a65b19ba072885ea66f091aae22695 SHA512 aa091f85a361f512e18453a55c847825f43ae672e5b11e47cf9b8b413df9fc37732653d89c076309ec567a6136274aeac5ae1339fe441ebb0e98339dcec524f9
+DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
+DIST alsa-0.9.0.crate 72602 BLAKE2B f65921c4d37204f9f8bfbb95cb3cf64952240b516600d9d48d3125c491ba12d476d5717db6cbb1ab58e0d85373a5d4347d5fb64405d5af0639d282de9632b7f9 SHA512 85dba28d451a8fed3b6131dddaedbe8de0fbcbc39dd9c58a9a9d56f132663f8f42f6e647ca26bc25c2558cc4db806894b8062f5f2bea619dc70f2dca32a2cc02
+DIST alsa-sys-0.3.1.crate 32748 BLAKE2B 0c4da9c343d622ddd521fe9332acf97c1ee4a202a909c7a0014a507148ab6ff82d5098660dcba847d938b296adde416ae420d454d6982c33a0456f37840d716b SHA512 6523d909c500fee433f934eedfdc200cfc52e1b55be09434665210c16bb9af3593d8b1346ace184b171c7135a7aa65fdac5ca8c68e64f9d20436e1d8fac961fe
+DIST ambient-authority-0.0.2.crate 14867 BLAKE2B 91004ac0727ea18cafd405ece5e402a9edbf6b625219b9a4e927ade4dfecdb9e89c43b742484a8a29d7b75f3ad9c04ca11d6456fd1ec691025203da89a3a357c SHA512 9e3c7e92e0c932bf8105558f9f73f9e2afb4bdf6f864a07113eb75096f0e39bc436faa9295abc30a298d51364b6b57a4a74c25b0dc7da6019d94fc1624b3ee41
+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 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 any_vec-0.14.0.crate 38300 BLAKE2B 63fbd26d67f04238a11ed0ef091eb889bce107e85ef3ce388ae6b499e49e8311522039825c16a58d66d7575ae0c9a02ad6fd5fbc6d287a64543276a0091ee8aa SHA512 6800923ac2fda0040772b267757fa4626670b54e9d3d204de50dd178ccf11ddafa9e2e382a151e3b66e29e88ea261fb123a7903b8e52beeb19eba4b2444e2c97
+DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
+DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
+DIST arbitrary-1.3.2.crate 32037 BLAKE2B f8f6a10a8f42f14eefaad4348b6ff200d0c2fb22faa7a2876247228046359e39c555f3170a1975f64f8537319b97c7ce2030dcab3614229c8334b5d6f9248114 SHA512 faab26c44f25d2c7298add2a657e4010d9fe24b3a61e2270bc6feac05cf2a82895fe225d2fb1c6b63e6c7da54e061955503f39322b96dbdbc4916601bd5e5ccf
+DIST arg_enum_proc_macro-0.3.4.crate 5102 BLAKE2B 13979c48ec4f01f6c365d4937768c0f7c123c46b6b9c85786b3ad4054f6c7315cdd4ee74d460d36cbfe2d4789b94b079677a3336956d2db748d5c16d21cc6856 SHA512 d9d48c48eea230cb0d246857e0ba60316a76c0e214ba8fabdd42573559ff574b6867bab67880f1b8b7107ae9980fc026410020c3d3265309950c671b4faef582
+DIST arrayref-0.3.8.crate 10279 BLAKE2B f77ff13afd788ce0f30c2959ac03079e8cb5a225f55ce647fc14604b5775d4d3aa70324cb3a0fe3ca35e6c43a8c64282dfd9869a497fbf4ddbad16b606db275b SHA512 27a1b5688327a45358cc62df868835e7da7276c73e853130c41c9f6d9f95822780f159c6e7d1fa10848ba30fed8e173a1d8949630f18a828c3009de342be21dc
+DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
+DIST as-raw-xcb-connection-1.0.1.crate 6460 BLAKE2B 678c4c28852bddfb8ec9660742370e480df6cc379bd7d653e12fa00aa99b598d9e5519e15c33e59fbbf43d260fd01856129ad4e9e8dab28af6e043e3ea651fa0 SHA512 79afaab72e5a5af2e70b1b66deed1dcec5b40a4a47516bee4845684c0cb8afcb2f141af0bd4034e7fb76e57a0c7e7778c3deed2e73ab780915e04e3604fb9a98
+DIST ascii-1.1.0.crate 36075 BLAKE2B 7e68e7b3d5e6aef132c52db8c078fdf2e70462d9238b637015d7964312737fc09b35719143ce1fbd3e5b8072c21717f33e5061adf4da1913a9b9f11ac9c453ec SHA512 d74982ad87796f0d745bfd654450dc74174fdc6aa2a0047e5d250f76dd6079189dc0f05d02a73a85b1d3a86c163524d1f43f5d014de0153cd69fad4de26cf0ec
+DIST ash-0.38.0+1.3.281.crate 457775 BLAKE2B c9216b068ef8a76e303881f1b42ca5cabd5f0b8a1297cd4ccd665e84a276f352e6155644eee28e7ce6637dcee347c54e447b452581673f1ab859aedb051e1454 SHA512 9f6ca2bf4fc5df43091c2d41b9c54d26d9b1682ba618895d82106c61e3ea3281065d3f0f50675f95d2db7846277144c57b3c4aab8e4d84b9536ef44ee89b5984
+DIST ash-window-0.13.0.crate 20250 BLAKE2B b1773308e0d706388e131b173022d3e38667debbfa1c5df583bc3fb11ee54ef811ad080187cdeef8bfdd3bd2f85b902c219f9b02ec0c86cde21e563d75d8f6d7 SHA512 645b797b7d348ec1d921db205b659553f707d701e32d152b0f355f68798ded5197a32bbfe0ce81d26934557e5c00faf27e85f88d6ef8c836de7e1f0799edea8c
+DIST ashpd-0.9.1.crate 79458 BLAKE2B f2305f97342defa4adc37107e1f462749c5a4b125d99f74390cb51088c92a0888ed3456b5ff319444eb5e02da0308e21820b52991ac02718c5b54f870d8d9803 SHA512 158eb492de3c58a5eb3297ab1ac3c214b983bf76a141716f93c945ad5b69fa2259385c2c9caa455d3a41572516ac067d6029b24bb53afe787f6a9cd9f3c9ead6
+DIST async-attributes-1.1.2.crate 11431 BLAKE2B 24f4879d3de54250fd230437a1f9bf76bf16476995cd9578144d920d81b82eb32e52cef34bbcbe0a246b74edd823fd68706555e6270ceffa176dfdd5ab66d0b4 SHA512 7a86fb431ad7da82db514e99c8384e9a8267d781a3c0911834529d7d4975e9d6e973065e9a14506632e4e7646f9708bef1c8834981f4af84879251eaffc6abea
+DIST async-broadcast-0.7.1.crate 21867 BLAKE2B 9c430a70bbd2b15ecc88afee064bcb04a665c0421d6c239de611d86ff3fe56fafc083ebc172c5d41c9f72a40080d87a75dae8e9b1e85249202dd844b8360735b SHA512 82b90a41ade624631dd5a03226921ed58835ddf1bcde271ff0c0e14905fb069847bbacee5592978c5389cbf366d77a7cab244ca92871949f3f4872d6da10755c
+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-compat-0.2.4.crate 11279 BLAKE2B f410f51a374d34ccabf4b7b3b6e51cf56be5640bdc64bd34f181855466f98e85690f97308388b912ff76644ca396313d77fac22b3df0b1c7eae6e0189a010ac5 SHA512 8ca849f69d9f6659bc056dd931d60c992483ca1b965486b90d1a187a2ccd36fe5faabeb23504a54e3f98da74f184532ef8e3cf2951202514724a56b18a950d83
+DIST async-compression-0.4.12.crate 109647 BLAKE2B ba52f08d34d618dd44c33b61b6b13e653da84a9890adefd9966b41ef97b899743f55c3392c81847e1812dc8dc0c6228781e9ade06b36866499fd7af43d3ef3fc SHA512 5185b8583050a293a93f2bdb15e062a9769af230937c333aff1047e1fc6be867ed11545767e2129e22bea89044128d38fb843564344d91a0c43b63df49e518ea
+DIST async-dispatcher-0.1.2.crate 7068 BLAKE2B 888d7423aacd1f6c8f38b59f13c76040935386805ea04f3ff138fac3a0fde3bd71488a7671a18128f1549515c603f14300b7d8a09f90eba82a9ee560c3780faa SHA512 8717e36fdccef5a7177a45edf9581a5b32747dc88eaa11b6f4f310c4e9dc6a5d93183e1e45444dc602e560dd52458870ef58eb85720ef21dd39e8dab5d430103
+DIST async-executor-1.13.0.crate 27974 BLAKE2B f12f77471a843fa44dbe5281159d47c0e41b53672dbb1f91519e9e6f302024b905e8415027c0d740bc33db43267db94da907251af8ebbe677ce6ded59078e92f SHA512 618d771243c1ec31496cc228f3e6bdd3d5cdd479eb94e30810c87241e38a5fa652b59d61ec55cefbd120f0ea1d557a683c8a42a3e82344b7813d172d25b6ddec
+DIST async-fs-1.6.0.crate 16506 BLAKE2B ddb7a86d6e294a07f0d494448d0bbea31df320e5d5734222ce3949753fb686b15ba5811c5dc7fa5e77d1be62154447e2cd096c7b7f7021450c5c75c59d45a8b2 SHA512 18d226cc21e5c8c96c269c883b6d5784bbaa45be5b883908d7f2cc61ae8797441a9b3786a02ce9664013d406beb679c5a8e89e6ab82d11bc2b981b600b3d6830
+DIST async-fs-2.1.2.crate 17071 BLAKE2B 7b8a67fdab5d9d964af7d45a03a3ef405f9590b556249a35897f14a231f2b781d90df48c8296965e941f8c259c4c13a57691c81f09c20ce81406d5d2e7962731 SHA512 a671374a59c7804d26bf22d9617fc329cfa0cb38413ac05cb2f6ff192c5275a8ba41f1a088fb1978e61a66693c85f9c6b08486d44e30b7fa158568e41dc005a1
+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.3.crate 49746 BLAKE2B 312d71f8670f720947ae5e78e6bd0251534d5a872164845f8606951ef88009e54684019831f55f27322e6e5d7d3f6f4a8157032fb6387ae6859be0d0dab74689 SHA512 5709064176812556a567cd558161a5e1a014b989e6835de5b77f387bcda8f148d03e5ac79a5dde56977bd3f2d38644593aa99ed28a4d646d3535332eae4b09c9
+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-net-1.8.0.crate 17763 BLAKE2B bc4e2a727115d54546989acc423760611d9659e1908b0637f4c2db36f7f736592499d6e926b4809629714dfd9c74b81d7b0bd36a221edb2ce0c680ced4aeda5c SHA512 4b700876bdf73080518c2c0af4f4dd391510c4202e74ed7ed9f60eb6101ad264a97064d4b1dada8f0d6d11a7c5b6b3ada0a451586af59b30bbf2dc6c03b2b396
+DIST async-net-2.0.0.crate 17787 BLAKE2B 04685e1ffd4c363b3b29bbc4819c7a79ca45a212c1c3094835f2ca8ffe000b8061a4b28de84497d5daaa70139a8d0c036fa4385ba20ea4bdef73b52102cfc349 SHA512 e12163eb7fb526d434c257d82ad0bcc64d3a1fb868b899fc5666c1307f821654f7afff9bf5dd3ca6c8cceac31df29a5027542f6e5901c8801ce2a696ab737479
+DIST async-pipe-rs-82d00a04211cf4e1236029aa03e6b6ce2a74c553.gh.tar.gz 5575 BLAKE2B bbad7d35213afb7dc3eda1f72555cb5a61bc61acfa1b91771a528773c468629831f62bd26f9bdb345bcf94950892a294ce71cecc8552660cda5c28de6906764a SHA512 86b13e6acbc1d04fd386b10be1e8f1f917f0ad12a702e9709526f798ef45ee389f4e14bb4ff16d0f1b14b278c76b75b5bf925581af402b350dc933a96b019460
+DIST async-process-1.8.1.crate 22758 BLAKE2B ec395b0b2041c44a8d7b15433447d044d53944a71bd4912e052f59eea1dc7cc5b1555aede4778c773f6241cdc27cab058499143fa65f23348b43549e91beab5c SHA512 ce0dbcd0f893d93ed83915d7ed9661c0d5ef867115c051df2a298cd07e531a2b0f63fe58cbcd25820cd810d81759a6f467635201659d34994c04edfba8a8187c
+DIST async-process-2.2.3.crate 28954 BLAKE2B da54aed4f017c9b8ee499a6813ac861ea2cc41b73d3aeede3528885bf0a010926926d23a6c6dd0429b563fffbeb63d3f0c8e625cd04faabfed92059052323e24 SHA512 201f87823617f1126f8dfb230c95aa248986258ccf95e5d0e9f475f160a9e64ec1642897fb2f8ffde3d748b29ed7185349b10ad5cc0f504cf45c302dc0de52a7
+DIST async-recursion-0.3.2.crate 10774 BLAKE2B 7b0305a794839f78acfa4abe2da3d3101f645463e5904e7fc6c15b4fca2ddc5ac94214ec998295230e904a5ca23a21bf2d63eb9d2ac586996fe9e3f2a9c97358 SHA512 cf87ee53655f496d604771732109d64ad10a9b2366351130db9e378ace941d03a7cbe770519703058a429f7893151cea4537302adf1bee6465ea2019f8a6f3bc
+DIST async-recursion-1.1.1.crate 14874 BLAKE2B 6260dffdfa9fe00cc1a63c8cb103a3f210611627bbc75c2658e7cd732c504791c6577d7033af3c5afa875f90cb370b7f216979e0bdb62dab4acd61786cb5239e SHA512 e3acd07a35be546ead68c7792963c7bf1876b3e5d6a20c2be73d2f030d26d68e2a318999937d4fe253e39d8254e12e42c66314f40a3b230c5d258f34dc0d9027
+DIST async-signal-0.2.9.crate 16796 BLAKE2B 2f2215ae925053868b0e5e85cb8481880d3eb69ff140cac7fd3c4e8d2b828f7e0d75bdb0690aec88068659febb56bd057479489b1b4544e5db4a87b71b53a582 SHA512 b522953ba98960fe1074a673b6b89c794e72d26c4c11f3c0155520edf1dffce3a2324a418147177e87342c6590b8dfa89606f77e9bbb88f866f967e8c79e5a13
+DIST async-std-1.12.0.crate 215080 BLAKE2B 1d9c56e03971f742b6e78a7a8ae097a6b1b622f64ebe378fa54511187e7c9c7ed5840ed6282633ac6636d3130d0ed4cc7985eb1a5c32718f07b57bc7172f3eaa SHA512 aaeef7f474fc700bba7beb6725d4eb778a9a05ebccfecdd81789b5d039c49508860d953f231c7b8fbce4c5b237d063a43eb03b83410490fc14eca572884f57e2
+DIST async-stream-0.3.5.crate 11916 BLAKE2B d79804d7310d1f47d7848007518e0b0e0f0724f2589a20478eda3ab1a1db8775c5aea494688c69437046accd10eaec789b244451e84a19e489f071519b50d2fa SHA512 d34ab46a9e18bdf35fe0e58808fadf422dd50246cedf48110b3273be17939678d2cb5b61fae9da176bc2c2b373933821e912fc395627f7a6fed1d2c43bc66c9d
+DIST async-stream-impl-0.3.5.crate 4173 BLAKE2B e7c0d2371299af6fe9983adf4f8cbb6402ceaa5f9d286f124362332a4016404069c362176dd3b71061027b0768ac1f772b3e5e38809b870411f4590126a74ca6 SHA512 3725216119cf4cc78d433e2f8a8df9bfb7a3f046e4a8346bbe76e91b23686dfcbdb7cd182765e12d606ed0e3391477c43652a025597de9120170fd0b1151d204
+DIST async-stripe-0.38.1.crate 1017006 BLAKE2B 06c7d57e76df5a8f0507ec309fc8c289125305ae3d96dc395389b126d0ab076e18007af0d349c1a9750141a189877d232bf24e4c8706c42af9719fdafa9fe40d SHA512 cf86e1dc543dd1530b2b50115de89eda36ce6252eb90fd31effa9f68c96f0bb41df1bbb1b3ed6358458fcf77cca8e018b404fe0990aaf645b9292877bfbc84eb
+DIST async-tar-0.4.2.crate 51221 BLAKE2B fee45bef7227acafd4bc92ec58c770449a02886937ae18ce0b6a6f789af32ae68bb6b74e970f418cdb7d563fde2d36e634f3d916ac0453bc2e65ff4d466e0d49 SHA512 b5b6df2d886a0f242bfd8f15d962a5a4c3b6dc0996bf0f1070e2f87d44c5fbf54d97e4f6b0f191a48522b6ff05bc273b80ebe5d859b01da2a26f6b7bd74baacf
+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-tungstenite-0.23.0.crate 39510 BLAKE2B 37b223ba72bdad3300507cc1284a1167908862fe250655a2d204769c4c33c531974038d81c95fff1b545503b256f715d5a22557974636d3be52b685323075785 SHA512 83c209f43722a9bcd101e436e48d99887490c87fb4f79927e87df38f168783973b600ee5a5bd75f03fac34035c6bb6849a69ca5380be1d3472dfbb9525e7c258
+DIST async-watch-0.3.1.crate 11368 BLAKE2B 4e5adb3128082e8340a07995b4d238a996a6d6f840a90480b127f73fb52abf635d85baa2c8e9dfb77f7863f7a4b2fadb443a2a03bc612b89a8dc293ee5df3258 SHA512 0cc3ae2c02a2752d1c3715eec0a7c8e3999460ff4a919e4c2b560194c9d3d5460982f929f10acd12a78d511394bcde2a210fc6e9112e8c772dc09fec347ced88
+DIST async_zip-0.0.17.crate 109081 BLAKE2B a51af6cc731d398052b92ef93225b009ca289e1d548af0160fd56ffaf0e37bb3cf816c4f00bf0a7b09859a8407c9ffed7e836e1dfcf4ad20ea5a625dbb4ade3d SHA512 84a14244c3a3f9d2220747d8f76764dce60e14293e88461ea493701e7ebed8f98c001f8d3aae30c2c17e81e9e3af7914302a174f10e0aee5dcb236171d35e0f7
+DIST asynchronous-codec-0.7.0.crate 14271 BLAKE2B d2887e4aa1043b5f8172afb39f0895851c440dbe98a832a099de7bad889e61a0b93c067e4d1d5b93f838e77b7c7de73d8de1863991ff1d1855805b4a32a11532 SHA512 259065048fd63311101e7ecd5633c6ff3d3ea01ffc0b37f24f40755f27a9a53010174688609b4c5208c8a6a08bad929a235f25cd798bfc01f9103f43af1f740c
+DIST atoi-2.0.0.crate 7785 BLAKE2B 406b5d14541bbd1428171874c549cfbfa1b80b8317a03b1b0e2795da7d2d54e94b30fbac05fcced9b1ecdb6e15709985cf84490af9e57fc16697bd581fe48554 SHA512 089959e903a17c5550f90fa1be67fb937120f693a924800d4443c49caee6516f2537c57b29ecd9136020d7644281457f75654315e9c5a211b2e4b57e77076024
+DIST atomic-0.5.3.crate 12801 BLAKE2B 0839f1d26840f33f865248ba8f8e275f8168d5dc07a7e424717ef48db014da3c2fe8877eb7a08230669d2b585775145efb69bfc43da7062ac9076b037a9f1bf5 SHA512 de1be4302b4d8f50ef5a808ef09881726e56fbdd72bd1b2a118724295a48128bae57316805ed92e991b82b06e7bf229efac4deff9a9ce84fdb839726a2ae8064
+DIST atomic-waker-1.1.2.crate 12422 BLAKE2B fc6632f3c9d719b1d24a1c8e05947d94028909d1c629b80576e176e567636dd4cca699c7e91cae2df63541da574146b3ce766374e93f0ee429bb5bc89a4d3cae SHA512 e07e58db7955791259d0ec00fc4d53318aefb4506e062914819c4220c6dc75fa11a7af0289b4653aa1f9041eb975a025635190de68b4800a0e91e33cdb0ba11c
+DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
+DIST av1-grain-0.2.3.crate 34703 BLAKE2B af8cec3e381634b38280bdc49d514d73817f2d088873829fe09d67e8e4b75e03ebed88c08b9f57adbe17ede54a702b65eee456bb1061daa22a73e07ca5ad51f8 SHA512 61c0dfe3e6e26210ac9c44616111f4200cdd473c68bb2424de6654637cb09a7089e958076efa69b35b351e5ee0fc7d45e580ce7ab51d5953b924cf208439ddb6
+DIST avif-serialize-0.8.1.crate 11150 BLAKE2B 7c63dd09bf9a6537963eab135d52219cb29743b0bce57c11ef69088e8d0413f43ced9d1ae70bd70d108be5d63401ac342949909b8c2d73d2adf69dfecc8616ad SHA512 baf7c88c5de8fae4d6066baa43684ad7bab684baec7125f850c4f668ee232eedbc0a9c4d802fcba23be3aa735a6dcafb8e6954e6f753d1b3b2482f80cf990d2e
+DIST aws-config-1.5.5.crate 123818 BLAKE2B 7b6681a5cbce1dd61bd61b2bb7b78ed6aaf5ab143e4e4ab7531e9c88dbc3436b7f471adf5677bbd3f7f145cc54cba1c9db7a19355abc28753b3a0805df0da054 SHA512 f3fcdc89e37b056f377f0746ae8451982f9a2eb858479021f56ae127451824a2552d44e2a8568ea538f31b6e46e25e1fe981083c6bf8ed3634dd096eb5ea5143
+DIST aws-credential-types-1.2.0.crate 14028 BLAKE2B f3d73e7eaf6e993b33c79e1cae05802183533310cb0e160637f144030aa30fbcba88db3d3260df35f2bc41b8f755dedfd66e90a3fd6287af2f6dc721bb036b30 SHA512 3b35348777228953ef8aaafc49c33e7063bc29e10dbf13c41fcd27b290d0ecd9d0368baca27447fbad26b5bfe74e181a9554acd15c9ee37bf5b30ae04b96dc36
+DIST aws-runtime-1.4.0.crate 57356 BLAKE2B 8276ed937a37f40f055df47db93a681aa578e67eafa9eaceb49e964896c3c3d365798b2123d0cc3d77b509850a6f0e2705aa39c80b3216c1a3bd069961e052aa SHA512 0159b3ced2e764cea89ad3d22f61bd2a151ba6a9223041ca4e311b37dbef7c89f310a2bd0707176d97cd208b44d53c8cf56a40907b9fe7d223355989eef62d36
+DIST aws-sdk-s3-1.43.0.crate 1316586 BLAKE2B 1033b02474af6de2fa64aef4d00e5535f44f225004996f68a1cd4326548673876f147430ff2f98c6a8c82040756245f238ad443d2157baf81583f64b2d72cc08 SHA512 c5b9614839f645ea63f07257a521458acf75f904044f5661b230ae925b564cfa94bc1d2928708b7b91ec4791cc9c480e0a386a0a5a9f28518e0bf05772c392a8
+DIST aws-sdk-sso-1.37.0.crate 70038 BLAKE2B c93ffb362b09d6943795d7f46992a0e943acdf0e12071387ac8f747f4ff0bd83cc38284843aee1eabf44dd73827b8e2adb43d6ae4d5fa7a2fbde1eb454517065 SHA512 ce9ca5e430dcaea5ca7d673f8187eb8e1f4a1fb4735172af6fce80f1e3f0bfbba04ec6b15b357ceb87e21f012e98330135a99b6fe9c4b0032ea9bbfe8b7ca929
+DIST aws-sdk-ssooidc-1.38.0.crate 85103 BLAKE2B d45796d75ba7703f860731a10bd81fc72b9ef58e89d845792f6822c71bc51f444e0a6f4ee4815357501db706b586f3fa16730f6ab87c23a72c474fb5a8a66fa8 SHA512 e92adc053e420a1a88a9d9f7e38b4af1e0453f35725953794b0bb4bb77bd2753826b5992518300229cbe0556f3be04594a860ba04677d4ac8bbd4e31848de579
+DIST aws-sdk-sts-1.37.0.crate 144702 BLAKE2B a2a76afdaf36d987093762114a20ab6a499feb6b82cc76df06aeee31c1608d2bf299f97fc3629dd349a6a14841a68fc0c96346d9d79919517156f6d5dcb81210 SHA512 9f487f669abd732c68bcad6a09a9e550ae913b0e793762880a05c56c0b87f0b120943c64b2e57b2155c812eaaeb83e0d2faf0a7179fb7bd6b2326f57a64f2a2e
+DIST aws-sigv4-1.2.3.crate 45981 BLAKE2B d941ec13555231fa508dbc810e52d813ba5d9ba881fc5a5fd2e35becf88889661bc2f42f1521988d190463147c523ff61fdaae626850e802f2484ea87bf95ffd SHA512 62e8bd26eb2911d8098f71fb83d331bce1712085b6ffefef9354e770f487e1ae72cdc8cfdb326d50d07946eb2e03c99519cea1991d2175f0a88be39f5a9e0555
+DIST aws-smithy-async-1.2.1.crate 20779 BLAKE2B 8160fbcff6810a2c1df921bc517322f201dd17b00b679a72b713159e6d6638589eb603de442a953e278ac0b7f5aab7e6192f08f146175a407195104ea9dc4781 SHA512 305f3c8d363343919c15ca69c7f993a80209757cd25a79bd17fc75cb85b201777d3ad1a476a22dcc05110a7b97dcf97888af0a0c0e745298d7bd42cface5addc
+DIST aws-smithy-checksums-0.60.12.crate 11785 BLAKE2B 4f2f9e7304f2769203a7ec05673674e6eacd33b7c77732c33e44bd3ddc8f585520cd4d6d30fd0797964fead4b34759ec467d770b4faf12ead9ff32bdfe0a5c22 SHA512 21cfa95d00ad086e11f84b8a8985a7a49724016198db92784b02a479e2675dca0b3c784fb3a3e7ea234940ba4014549f1e3a4c018804e1fb1ca3be3e238d8d71
+DIST aws-smithy-eventstream-0.60.4.crate 17166 BLAKE2B a82e524d8c6aa09850cfe5d4c17f77628978242fe719204a2ef279f0d0e5d83e0a01b727115648e3b01d739981691a49e1f7d39e4c2860c78a436e738a51c30d SHA512 edcdc2748f4993059b7a911e21b08cb7f21c02409a39f11afe418739aa2e7c452ab65b4c81a7e07d9ea76994e1aa87355471da3ff10c8f6ea5caa2bd95551281
+DIST aws-smithy-http-0.60.9.crate 23678 BLAKE2B 8ce580c8e78a0f64a76d11f03b821528d90181aea04e621777aa51ba7e2c6dd69c125d02e6f88f3327e9787223dedb3eb348bcc0a9df29674f32fe89dc5b421e SHA512 7100eb204615055f5f0e8f7d7861be69b8fd0fea3dd7588d1aae496b80eefb5f4689b916e6779c9856ec060a8666bb0bcedc32d3880e7299d55dbaf7b773b01e
+DIST aws-smithy-json-0.60.7.crate 23035 BLAKE2B 5f1f5c48ec5db99a4338b5a60314df6380568789c1199b374ba6e227cd2e04bf0258b0b2755b75484744b004f8efddad6f797d3e9f694a1df89cb383a463c66a SHA512 53fbc6c4c92587d23bf6820126945ef92fd35f0a315494524eb95afee823d7e640eb54fab4501918af0aa160a2ab6679c516d89a1cd2125099ff8595d7833a21
+DIST aws-smithy-query-0.60.7.crate 7409 BLAKE2B f9dc341f95ecdaa3e2785845df662dcfe6f33dbb638579788e9c4260a2b0ca4fb0354e898f67bcf276a9f85bf735f0ab28986d80c0eea5b7c495c9108a40ce0c SHA512 9320f92c9955205e33292793ba2014d5f6c678bf1a7e7f47ba7780a99bf902e831d7a63b60455eb3b7d4f0de93148b515716bda40b1917ce35846dbd04ba55b9
+DIST aws-smithy-runtime-1.6.2.crate 116792 BLAKE2B eb975aeb37eaf2690889dd67e4b3e0549bbae32d91426657fdeb213f448ee2b00ac55526a26db084b26fce67aa6361e871bf0fd0cc6f9af05eea2edded072278 SHA512 60d94edbe049d70652879109e8f35bdf88884e7fe33a6e6cf5b5b4468fb4df48719ee56df3d1a755b3fbea7ae24cf4ad614f82e3f601d91b40e5c732035a9c26
+DIST aws-smithy-runtime-api-1.7.2.crate 68443 BLAKE2B f6c84c17336a908e888b6f603716969b3c381cf6a8b8f2f5773e7a1bcd200c77f5b20aa2e8322e66d120ed49882c2c4a42b785e37c9caa4ad00bd1c3d5538846 SHA512 8a93321343d5cb6c9fbac6b58ae030bc2480d6d815282a23be6f70a39c8a6bcf9be481fe3cd1574db07159d4aab84d8bd87852cad52c26a5bfeec7702824e5dc
+DIST aws-smithy-types-1.2.0.crate 80692 BLAKE2B fba01ea10887a9f27499a53f86ef6fb533fe6b0c1748a0b28d840ad18e6c6bff77e9aa8ac7c6545f47e213624fc779019a7cff95bc625b714c2dcf5c4bc55502 SHA512 6e9cf0835d6ba108c39d23fffdf630e948aa3b59e18946bf9e1b5c46345f9f3e6dd017271796518454f6a41e890ffd86bdbf1ee309c6819f3dc320563542d53d
+DIST aws-smithy-xml-0.60.8.crate 15755 BLAKE2B 88152919a1b40df987a6b2c666e61ccc4bda3b03ccccc73c2db0708ad0deebc1a77458923ba2da4b4822284e6c41a318a81823241fbf8e640a93dcc15b3f2661 SHA512 ef0aba23ee7655f99ad83fc204ead97371639c674abe33367d78b7878d4ffd36f8f1ca4475f488b0e2a248dea6fd1801ed281e67cd056341ecd4a676851075d3
+DIST aws-types-1.3.3.crate 21186 BLAKE2B cff9b50615fd95f06e8c124dcdf4efc7cf3d30bd27c4d45812f14651959fc3a15c354791eafcbda9fe3ba4ca01e1c5aa02a941b0ade302383adc6e4c3bcb0fd5 SHA512 da549c4f930f1846a6d5880d41182323eb41ff9238462f50bf7e6bfb9013914c5cf431460f3c6425c9cc7937ac60168fb6c6fd8e6d69b8d45fa6cad691b2166e
+DIST axum-0.6.20.crate 146227 BLAKE2B 24592e684de9b7c0b06b9871028dd6ed14b9a2ed259076b50b12a2376e93b8fc028831a94bc748eb6c66dce49978987d3655fc30313daccb0ddf92919fa9da00 SHA512 e0ef6bab62d465a607a49c799823133d634d93d7a389fddd2e165fc3895eeb4c544f35e044e3c8f52a21c8421e4e4880982fc0be62de613f98ee571186f55646
+DIST axum-core-0.3.4.crate 21088 BLAKE2B 323888f8dd90f27f6f14a9ca0c1b9f1d81e04336c52eab887ada22d8ff2dfaaeab191635f45706c4246c73cdb32078b3c01481a5df888db402c29279fafb0434 SHA512 e09e65e478db742c26115b417970cbcff81bbdf75b37ac3c7b5b0b99e953d21de05884a50377238ab788ae3afea40388c59daea45fd03cce8fcb861c7cabb0ef
+DIST axum-extra-0.4.2.crate 31254 BLAKE2B da97ad95b4a1369808586da66c755fb309d4af6eafc110b286e1348e3e111b7ab6315854cf19e39d97c2f5ef5db90f318bc9375728aff271fd5e5432ed83f6f5 SHA512 0db8055128b0b609d8547dc7aa74eda7608d721b698580ddf10185a53544a6d425d7b373469f7094599832597de44e30037e08c74be1f6d633568edc3f09b10d
+DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
+DIST base16ct-0.1.1.crate 10186 BLAKE2B 4ce6384e22c3e78b96792e892a46163ea7525b2c6bd7b69e84747cb7bc521033a41acb3839bbafcb0a9aaf6d98c7ae711a1094931a7515e03e656b33cece6541 SHA512 c7ca3ccfa6cf30e74c34e255c5b58ad0e32bfc914b0568faffac9d288d0f00dcdc3e969e4cfbb25708c71e9581e6cd8af66f33bbc5d3b08786d9927eb384e579
+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 base64-simd-0.8.0.crate 12531 BLAKE2B f2c8eb2f13919bfcedd6e2d15df11bfc80a85a5917b52f0776b6537a36a230370af688c15bf7196c1463907a7fc0a31233387dac788ab3d257e074afde16fa57 SHA512 9f5bb9b28ab502e52b5f755a5ffe213bb4ed392313ba2e43d3ff5bc193eff87e348f651eeb46599308d650348534e79081ab183ad7bb1636a7db6722f8ee96b2
+DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
+DIST bigdecimal-0.3.1.crate 28858 BLAKE2B 2e2ce7d4f012d7a0af41aed3cb738c4409f320c18a632149b55b9e4daa9cd393d3dc28498a9863f817e2bc5d038fdbb24e03d51bd46e5b3bab2b1e6dfb566faa SHA512 7163077cb22d7e931b1e6fe1afc650e67e69ed2ff17c6f646fcccf3b91f7e8bcf1138cd71d38a49d173050460bb1a2ae46586f95752e7570cc3638b6318f29b6
+DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
+DIST bindgen-0.65.1.crate 213479 BLAKE2B 91f143d6d3ca37990ff01a9f11ba43fc7808210f47143419abd2de1d4b38a4855a806476b5607aa140de77b83db1649e318f6f904338c621cb300a53a00b1b01 SHA512 f3fab122b02abe8eca4438edb220eae0066a43f6ff4459aedca6c6261e769bdbdd6c820e5b29ddbc5b5cdf8ec0bdac1a4bc374fae2772117958e7c40bc22e8f2
+DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
+DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
+DIST bit-set-0.6.0.crate 15557 BLAKE2B e337309dd28a982f1ef7a8772f737ca09991c0579ab1cfd16a14314061c92c38dc8c97942092f7cbd56fc5b21e758c0b4462529aad66045da3685cd063668c0e SHA512 46bd2c5a28b253a1e0f6c1b6f2bdca7442a0c4cc7f980f1e5bda7cc8880a39f27c461b3dbaeb9e5ee22950b4ba36c9d6496c72ae0669ee6bec17350ec03abaf7
+DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
+DIST bit-vec-0.7.0.crate 23206 BLAKE2B 6f4f22b4bade33cf4db740d0012ad501d23d5e3a609095ed74371defc4e24208956bdb3834e36bb4569ef39eda8cc5a36a48ae72449b0a9f830af0aa34b6eae0 SHA512 22bcfb93c2e38034d1ac22c2586640811691f181f9966b27dffbc7fa06eef66fa8b8be028543e77c0d061930abaff1f8f76d18a81d45a322fcc38bd8e4fcea1d
+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 bitstream-io-2.5.0.crate 37723 BLAKE2B b9841766c4cfb1a669a8f180d9e2a0ed110a60f535fb69046859d740b672f78ee12fb805c2323164868a2dcfe6b55f8a6ee5e59003088a7533a5e537b02158e1 SHA512 8db74c147412c2ea335455d740cb2ef33be8ec0c3ffba08fdfd3983515abd8b47621d178bf1290a7830a9f15bd32912d17b3df7d39e9ac786970a868b8ed76d3
+DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
+DIST blade-ac25c77ed8d86c386a541c935ffe0a0f6024e701.gh.tar.gz 3303568 BLAKE2B 8b9a08cf0d9fac77ae4b3ace7ec765a760bc9433059adb08df5d0ec75a6459ed7a6fff0acfef09439e180abfbecf45c964549dd585542fdf006bbaeba16022d1 SHA512 b27e6bf7478ae301074ad8e5bdbeb109d8efce31a7aa3293b2781dc8bc39e1874dfe207a33d3d02334fb485a92abc3089d288779c9501f4b492b7c92aa3583b7
+DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
+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 blocking-1.6.1.crate 17788 BLAKE2B d07246809d8b80f1fdbdc678b2877f349b748f2dd0f8543e91fde4aec7aea0b45e145a44f07cdbf26934d20269af01844e1cf7d9dd8b9588d129da7f929d9c95 SHA512 1879bf31c18d5cc4653f794dd4109769ae32071564d3a0d63896162fe160bb5ed3d7d8de59ab34363f8192871122099bb8564ffa93de5a5b75ffd93c0d424ed6
+DIST borsh-1.5.1.crate 60666 BLAKE2B a0791c455e4ba288b5c31b5cbf1048ea5b97fe7641b76bca8e95c713cd399dfe94d8f5b68dff27484bd8295ed7e160f274c6393a5c50ab814bdf7edc7d838db6 SHA512 5e5399176012f8be0f49009a43b644e6ce4c89c3777f9d5bbb299a9fbf2b497e68c52097d299886643a8d38a43698e731dd2426b64b94a21d37749187ed497ff
+DIST borsh-derive-1.5.1.crate 29193 BLAKE2B f489392356344118c8bc915e5a960fb141b414fa647f95d1b6f2b4020b4d94d6047c98d7f7c5ff4548f9c00b51041e97a3ac869064d4adef48a005a66e84e33d SHA512 1499bd17589ff84fe6594cc06f5152eaf49282bd0adef74996053cf7d008c7239c71c32b5a2d778e5f6d712a0c132e12ed513abba9c3f3ae709b8e6a4775c837
+DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
+DIST built-0.7.4.crate 22242 BLAKE2B a1478a76fd88afde4397070d481ff730d29742813a50718822fa3930f352b59fe1322bd9c154e9a3dc92af8e3a0fa22abaa693265156cc496694ffdac8155423 SHA512 1750be63ddcc297615bcc076fd5ce73d5ef5d72128e301c86efb8d3671eec07a535c7827bc451b18fd1833e07039fae478ff09e22a43dc5f56935636694171d1
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
+DIST by_address-1.2.1.crate 8437 BLAKE2B c1dfdb111a7c9815bb084fc44f1216d45da6ab401b5b646a6eb93b2f7cd77843ac5559f0f390e006ef77645ac2fd814ba86b10e586798b96b02d928d0526ac3b SHA512 f19b8397386913892241cefb1ad71c152280a71e63d2b42e05579e10e3a54ac7a3fc4b706fc1e5e571da7b77b8d483057c9d76f91c88975a970d48f62d718ef0
+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.16.3.crate 49539 BLAKE2B 5e9a4c9e5bb1ec5398670edad455fa54b08955b48390d784c29c7ba153db4d0fb25c4d14f445ed28c443379a761354b1d9eb8c9c6e2a2930f5fb3f9085ad45b2 SHA512 17bf35d082c8009ce6ae24ae681715d8fd303f728f9bb2a0702096fd8635b5e7294eeea5375217a8276ba6136a16f94eb670c5d5baba9020674dc958173342f8
+DIST bytemuck_derive-1.7.0.crate 21687 BLAKE2B c6097b1dff75e55a61f4ede5912d7e63baf81b05452be9cebeaddd09ac62b8925c921e8040b9c3a116f5bf718ed40f1e7cb4e8eb8c265c18c68dff729fc3d5e0 SHA512 9e3b098c15294ffd3d37cc553bacaae13add3469acfc3387d9006dfc12586e1a18568ce246c587e17c476fa995fc46be1a7fdc7c51fa650b688081e9796519c7
+DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
+DIST byteorder-lite-0.1.0.crate 15909 BLAKE2B 751735c5fd618d548c0dddc2c6a4a1bfb41a2eb30ee2860b9e7b5bb75d591a9787aa36940acd9ab14242636e37aca6d568f39df07f7cbb771cc475234c696e3d SHA512 d38837acc5926fe98ddf4336a603412f678b5f46d53a7eb926a8885d28aa24d51e3968f0eb2e6d2d7711e5ba30b8006a27076ea596b0699e93ad3d9e05483c4c
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
+DIST bytes-utils-0.1.4.crate 20703 BLAKE2B 486f3e10f041df553aed60640c082e99db38f7b3a7a8c34082ae0d8c33415a1663387ad25061f922f7825287de59232578ebd3258a6b1693bfd81714827182f0 SHA512 f6f865c6429b5643b54f46ddc4aad22fce30ba14f45af67fffbed454353eea8deaf20dcae84c874429586dc435a449c6a37173b196aece1ea0716f8e405f2e91
+DIST calloop-0.13.0.crate 69698 BLAKE2B 8aea51f40fb2af897975e4d596cd33071e0e163cd846e564ccfc20f2a997d377269f1dc67a47ae653b70f21cb807da7bd32dffc10e8e17ec1876c661d19ce6ac SHA512 f3c4aca6eb6eab8fd95901af245df907de6fd32aeff9dfc323166b60067b0d4d56647274db91908f30171ab06cdca865bd27033d8a42bc4f334391b846e8cce2
+DIST calloop-wayland-source-0.3.0.crate 11300 BLAKE2B af213882cc57aab71deeb239a71c46c0c61e0ef440982d0164a32f7e0a809c0959483ea8c758ca765cc6bf94bba34711cd7dec529a1b30adfe8078917fa59b6a SHA512 e52f98969b7cc0be68fd0960f5852aa25ef54cc1ce026d98c031047c5c39d4e6397cc1185f8d5596d099b01a10bddf6065fe4290f90632a9e696dd6b89880238
+DIST camino-1.1.7.crate 36204 BLAKE2B ea87922e77401a23f25d66af303f39c568f37377e4f0cd6d206cb7b175a51528680bf67897e3b9830d276acb1b156b7c66e149b75370be202cb99fbbcea54233 SHA512 b82c809bd52549d16e286d514b5dbb1d640633b7ff05412ce3539e543de9c69d99bc3f62597b94fc0cedd7c8034ebf73663a6f647e46409b778baa4877928c45
+DIST cap-fs-ext-3.2.0.crate 15675 BLAKE2B a6152cd7e37eff583de068cd11cbac7b2d0e8cc33f0e478924a431e4dc342794f8dd3643bc719c3543b6efbeff25e8d822175e2acc392a22bc8092ae50af428d SHA512 53564ff05329f9349a29ef3c375eb88ffe9a20e5ca290697ef7c190ad238cf8e8eba97b9232cb201ed94f84883c32752710d549cfb1d7beb57deffc5d562a499
+DIST cap-net-ext-3.2.0.crate 12204 BLAKE2B 9cf1f1fea2ce41da0ef214cac29461b2b0885ba00c3998fc8690d2883c37126b75e6c35dae307c606ecd01f88ded69312e3f657a465d35cb7bf7cb5112aca361 SHA512 2648972913525560d4b60b719183b6087de70b623176929dcddab78b4d81fb694c061c7d370c5510d24cf616225c5ea78b8a950adfd06bfd81e19c56f7e4eec3
+DIST cap-primitives-3.2.0.crate 89271 BLAKE2B 81612a19c2cdee1222486fb7c897ca208c76a8ad195e96d84e4f28aecb361e16ee6dc11ab765b6be97ea2ab26b5414e9de7f5affa62284804c218a4c31a6e2db SHA512 aaf1e162a300ef5cebf9c9c4aa6be1cfac639879cb9eb1308bf450424be3458f2578321d406b39ff0595ef05f4dbdeeccf33cd20944c26d95c38490b5bf18c9e
+DIST cap-rand-3.2.0.crate 8426 BLAKE2B 8cb3adb9d60fc20b4c661dda0c283b450e2bf7dff81387a4cf80b14196aea6a2ea751582fd9c395793d058cbeea5606f18597be393876af85316888ad096126c SHA512 936ba4713d4f76d8d8d6f6b1661b2775afe9483948a61365b767ee7ae70e54267fa3391cc0ed1ddef597e8ba40bb135427b7cbff554821ad89b4bd7c6760a26e
+DIST cap-std-3.2.0.crate 33902 BLAKE2B 1d212eeac041b7efefebe4168dfc5497886dd03ec2ac9a05597ead2b1f958429858c3ed28c9fda36c53f23f3063984f0f6d9e6be70ca9bdab1f6b96c019d00f3 SHA512 211d226bfdea3be10a727f57c5640b03a255712d4102a96f3be8061757693cb7a570acc424347c7af5afcf97a02168f5951d24a7462f5036b5972baf09cf564a
+DIST cap-time-ext-3.2.0.crate 8575 BLAKE2B 0254430d045cae50f94837ab9ed69e685e55f415121b70c0df64fb38fc2ae47febc63365d368b734cf849914557d2d7e927edba1f9e310402920a4500b5d1d24 SHA512 809cc23ed71ede072df9392e84c6f0812ceadc2b57312377825fb14822695cc7774bcd63459162377c9de79251bd66f992c9a3b334abc72d23a44f2199e783c3
+DIST cargo-platform-0.1.8.crate 11813 BLAKE2B b074b49e08b2b93e93e08276f2a79546fe1f9ba0a52b3b4ef0ecdd28fa3fe5e842c0291fed158a1a12b90804e0172d5419b7603fd0d5f87f062f44dcaf3428f6 SHA512 187acf1b8cc81078ede3353997bec9010df32aba82f56f9479d4c8eaa13436590a16f3ab6ea11ed2b31d1d1d2299d824d9ad10f04bf5281c92372cc8334b0dd2
+DIST cargo_metadata-0.18.1.crate 24535 BLAKE2B 9d0018e28a3941e269dbd30291054a882a960905a43d4818c874250356a6c203bf08ed77a8041f08607390b2a382864701c519d71a0b88818ee59c6322c74e86 SHA512 43f87d2b84597ec9a27e9fccf06ec5f2630a0147a9c85779622c25493bd61268c266643f8206a17d76a16329af85f0cc563a9af7e17ca77024c0eaf788555f7d
+DIST cargo_toml-0.20.4.crate 31875 BLAKE2B 97fa1a21e7213dd038c20a76f45e85b5565504206bf32f519fa7bc435f033e7e1688e723864eadd3c6e3c16edb46553ec139e8c2fc0c4079cadf6a520b21269e SHA512 7c06b9422306e46b0b76ab1915c47f6bda51a1550fbc5a09b2d4e29c65dd8accad680f3d4fa69ad62c2c90712d11445603f1c1f30e865b2a44257c80a940796c
+DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
+DIST castaway-0.1.2.crate 7124 BLAKE2B 43b5cc2106028b9d69a79235e9b1431fb76de1c2c881a26c158be66f79dadbe67b03c4718a439bd0b48d9de70424872c890956bd6774dd7af88375b0807137be SHA512 548c192c8e746107e4aee4b1e392425a024ea6dac53468cfd399c7dfba01e26a1c2e4a6bb824846d57cd940b6b72e26b66525ddbb14a6e3fcf5fea8659ba88a5
+DIST cbc-0.1.2.crate 23501 BLAKE2B c0d537af0323a92cd01a9ec197bbe46507835348e16dcec7360072226647abe2eaa4823023930da93885347fe1429acc2f9c079b7bcac686c1293ef73b91bf0a SHA512 d3b33deff64d839ad25141f1c3b5fbeaa21f71aee7b58dbed91e7d257f93e68073c8d4a63d4c4eb9775c20f00bb0ceeee714a8218e85a231f30cd7423022f820
+DIST cbindgen-0.26.0.crate 206157 BLAKE2B 4c435ccf9d5ab3cc036691cc51c55334e27a0348002b6303b11974c0aa4908b9f902577ca6e50bf241ca75816775e7bb33901f1f81e3d5293ddd2128b458204b SHA512 2de81f46c9c68c985241a349f13125876667d1460d3658ead8c4ee9788cd139c30dbc08bebddc172cf0bd4644f3f17c02cf66f2a3ef706c52366fdaf0f9d8059
+DIST cc-1.1.7.crate 81694 BLAKE2B 95f2a266cf4c42cd4212cd07c0fc436400affbacf66c4a089359fcef4ec5c51c727ac6f3876515ea3460076898a0e03da6647ed0d2e67bee5d151194dd47da19 SHA512 2c3b3d99b292ba44b4805f4a77daebeae054267755a08b1a2d5583f89ba1cf01b42e9393279c8f37f64998fd14c9648dcdb41fa5b2390c3c4442afb484f624ef
+DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
+DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
+DIST cfg-expr-0.15.8.crate 42108 BLAKE2B 846a67059fc30e8c1f70d8b5495443ca0ed373a333d394b92d79981b415888a2f5c745a028e702464bcf68765667c35513e51931b84d9d081873146a0a4edbd0 SHA512 1077d113dfe080e0e78e25c40f32c9f14988d2dbb76bb783ed3e8ce13c58e5dc0dd549362d2f197b69cfbffcfa3ebed385a0247f5928dcff8be7d0b055be1041
+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 chunked_transfer-1.5.0.crate 9779 BLAKE2B 5a26e784e9de06b8026edd56685d9767cab5cbd25e787f642c308be944194d78de5a38ca061b815e234952008c4981d68f591780ae9dcc0d76693857dffda3fe SHA512 e4888b19e7e650889a531e0e07f4d724826f5fb78c9c05966f066ff7898ef8bb1280f89e9e7951914b7b52fc0e831bf205b7a4813bb204989f2f72adc5868975
+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 clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
+DIST clap-4.5.15.crate 56612 BLAKE2B f5f34a6d3e84731de7dc1b54d8576e8e9e573fa1381e9bbcba8e2b66f8cc693ce51c7a876c34705ed705de7a793bfd2f4922fb86f8764adb7a4dacd03af06ff7 SHA512 a0bd102065cb29eb565e65408ce5bf37e3404b7496959614d10ff2f9bb2e29c1abf8f5a3716aa85994a49bce4ac12d63586c8ec8187c0d3a6f696a4804fb446b
+DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
+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 clickhouse-0.11.6.crate 59604 BLAKE2B 7a9884ffa7c95db0b1ad4b18ea3f5b1c29b7e2208c01d3132aa8726532ba3466bab252b0520990f443ceac7992752fbbabf258d29184260ab7eeee498567a535 SHA512 5bf710f3a35cee1d7aafd4f318d38b27d09d246c05909d609773f22e40d9b7d8005d1a8c8055c3cc06305da79c118d430e3b7339f858f45757ba5f90ff9dbde5
+DIST clickhouse-derive-0.1.1.crate 1984 BLAKE2B 1c297903bf9758c38408063f1520157d968eea60d0787cb85f13304be1b06c0b24addafb665a87226c0ebeb98655f8a0ee74b6cbcf99aea03027cbd11f4798e3 SHA512 3cc9e0d7b658e2be7eb812bf7ab34827c989376152a2a9411b20ade17713ac7e7dd6a8649f9c6e8cb775d799aaaae16de45b7e7d0162bed8a2412be84d4610cb
+DIST clickhouse-rs-cityhash-sys-0.1.2.crate 8298 BLAKE2B 18aadfc7c16437833cc6f5f8a4bf0dbe431a0374743e0ba1864ba7e7d1735581fe641c4868111784778c6e0483318950d7c2fcc8efd5980c9c6796dcac8f3f70 SHA512 ed2c956d7925267be5ae1a254b87e2f5e442f7f6891c95e8029d52414cb215ad9e29207bfbb89d1fb4df49ce24f764a94858bb23634f3c1472ede692fc62c07b
+DIST cobs-0.2.3.crate 12576 BLAKE2B 063a618689b5d51ea9e32b7b8bd377daebe61da21010ac9eae5ff4318d6b397be0c48f6ce6ff5b5a10269407c07957eb85deb28a80d67037d788ee45bc9f83d6 SHA512 9432c28515f0972b88da4f132658ef535df131825febeed62c6b0314d49852d1de4efe1c54566f314976000f91160f8bc9e21969963b85288ad79b1cafbecf55
+DIST cocoa-0.25.0.crate 42163 BLAKE2B 95316b0df34951b0fd7affa999533f0b470dc9165807f3c22340ed47a5c6956670d613c96099a1f00ff7eb2023aaffd4262746d936370a4a3d040d7cbc1e26fd SHA512 c45ca5f567eacd77504265a88ef22e496fa7eebd814403864648af9a75432794acb77a11b60dcb06a2a722bbade0b8e68b05c7b069873714592643b546525f30
+DIST cocoa-foundation-0.1.2.crate 15028 BLAKE2B 170dabad57dc131636faa3d5d406fb6d7788540cc3ef71db17fdf451d947cdea56b3aa1af8ca0d65c869d9c2034caa096f647fdaf7388019fdd79b9a55d17d00 SHA512 5e9387ccce5cfd7fb6738d402d84cf825c3c9ea2ed5a5485af887f5dbd5bae7ae62ea884242673fcc23d7964febeb6d0b12bca636f79a9cb58649f774c269072
+DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
+DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
+DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
+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.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 convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
+DIST convert_case-0.6.0.crate 18675 BLAKE2B 5e5ab159a61e68b801f1c95dc5336f3af7ffe6fee212c8ffb9905af1121f0b272b234b4e70a30f29f5ed24f4825ccfb59722057b69549fec0fc3472857ee1ce9 SHA512 3b17449195a9a36e3965db89eeb967979c192ad7743217ea08e8c8b91ecae1ac1674362d05dc6f32f1f361fface3f783398285bb78060403f65a777a9d29adf2
+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 core-graphics-0.23.2.crate 30763 BLAKE2B 6cf9d7d1e933bf06175699eae7ee1e7dae993e390cf9b509a756123cdff78a42d7aa9a59ae2f48d251d6dbeea5479e95694c38700f4ca93751dfc664d4c7af34 SHA512 40ac912fd8bbf25488f665091e974d9b5c40a2a20aa1abe0393c9f39a77b6f3b13761719cbfde067e5e078fe8ec55dca51777ff3ffdff4aeecca6e4789069d1b
+DIST core-graphics-types-0.1.3.crate 7063 BLAKE2B a2bb17838745a28a59e85d884ea60069c33f548d41f98548956eaca4178409c74556039a5a731a9c1e9f26de8c69d45f458a90a3f7b358065202b660c62431eb SHA512 e56b96662fcb892b73bae3292478a9ba4c7e92f5967b6438546f229fce115b09f997734c40f8f776be6ede2c6512e837632eacc8ec15b5c3311f9f24fd22a397
+DIST core-services-0.2.1.crate 5422 BLAKE2B 1879b9adaf01b97bdffba9069889e02aa59cdea3551cc6e49a4728a76708e2659785be020151a6fcc4678a0cfcb56a068d2683775d9f81c8d8858449124aad2b SHA512 9967243b927aabd02749d3e0e7397d82192e846a424ffccbd0f3e4fe9e61a272dbbe4df0bebf66518104820650f6cf383c4ca0991ed8043534d37fc5496f2b1f
+DIST core-text-20.1.0.crate 20836 BLAKE2B 8987aa9c14935afb5f6d587e91818855047420ffef8815da5887749d1dce0b3c35b99cbf53b308b7654ae027376c8db748ed01cf9e0380599fb37402282bdc9e SHA512 3fd68fc80bfc670f3a1f3dff444484d403b3aad8eb91e78305c7a37ed2cc48a45a7111e5d5e371541a4c0e01e73d1e88200569f048ac9db0884ea09953d88685
+DIST coreaudio-rs-0.11.3.crate 42844 BLAKE2B bae10c9b7670651e78f24426378708a2c14b6b1a7da9d4e359611a8bb4df8354af5b409eb20bdf1e9b05a6117c59b6cd7d3a79851682a217732986602c8cf3ed SHA512 41b3ade3b6e157be533bd25352ad76a01de28cb3c8d60d7789a3f3b5aa868d6a7dd71456b90d6453684d2022e0f0a94b3e830b3920918c18a4693c2de0258a1e
+DIST coreaudio-sys-0.2.15.crate 5532 BLAKE2B c7c3f67a6db3b9d9b604989812b45d75b02a04565d1dfcca4698abdf540d1deef1c93b6a9b02a3689a32f033495411a5dc11efe4871e907f8bc0fec6b5fc4f25 SHA512 060379c57ee110ac413fbd24b48edef283ffba17692672f9ea3f6f0a627cad8f827ae2d375c341b0180bd4de7b3b5d55a06ed7b171fcf3cc20264826f2489436
+DIST cosmic-text-542b20ca4376a3b5de5fa629db1a4ace44e18e0c.gh.tar.gz 180043 BLAKE2B 44f4429467d7e54c5348d564ae565c8e8759ccc482045ecc9fe4e3ca6c03c45f6537902e7d8867b557e0b0d1017f03b4e24f63e48a51b774e576da42439c7bb1 SHA512 7a31d1816debbbc892fd16b7b84994569fb046dfcf7f68a1be47885d4a01194f4a849d6d2e91dd534be7c39a0339108711b7017eebc15cd64b63014b5a5b57f0
+DIST cpal-0.15.3.crate 100083 BLAKE2B eeca832ced49c8b4913125b948a4c5996783361105d106ec7bac263c2a81ab87e5e2485229c3742f1d600037993abfedabed10ddc175ac507234d720e8f7f18b SHA512 c4461e740dbc8528b753074f3e53fa863ac6318b11a786250c520aaf32f33af98e830016ec92711dc5ebd631068275dae66d3d9c1d452191869c8a0b5879feea
+DIST cpp_demangle-0.4.3.crate 78861 BLAKE2B f6bfb98fdfa4dc8dfbb15c6ae1e33e9497d3ccba991e8f8beff709197644fbd0957716376e3559aa43fab140aef2341e1cbefcceb740b86f9741487ce9f09803 SHA512 d00dba6d709c09082b41ce74b9a15ab73dcb8680bcbb38c60e9ab494957541515cf1ec6e974d6b0870f6c9ed272135fe6554d14e60999442a6a12d5090d67565
+DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
+DIST cranelift-bforest-0.108.1.crate 30527 BLAKE2B 001e2c84094c288e2b2865f6022bfd638999ee89bba558eae05691a9ad51aa430a78cc37090ccf4b81bef820540d0601882fdd9d4f13edf3f2e5ab1e446e786e SHA512 7f7e706fdfeb4914eced4069edfebb7c391d99e001b0492ac8665c7d6199f350e2efb17a1b4d4212f9f8aa0f2b142040631240adc4d2f9febaaf6c7d05a480b8
+DIST cranelift-codegen-0.108.1.crate 972370 BLAKE2B a2fdd26eee903e0e2007c05357ca3e6c967001fd791f9b64f884e20a40a970c9e3eb422fdf42c42830fdfdae117931f3e0d371af63a3403fbd1827e22eaf5ecb SHA512 53deed75816c4b0d505a64bf868802b1895c9b45a7d56fc324d59caf4bbdc73a74a90522252c603b493b00ab8ee72b2b2f385920cca9ca728289dcc7ad341567
+DIST cranelift-codegen-meta-0.108.1.crate 75186 BLAKE2B 95e23e7b4e68c20c508d8e83b42221d69c05d6d0ecde99acc82663ece1469e74f0e5eb3c73e02ec49562818f21e57d3d4c4dd85965a7bd01752289750a9b21a8 SHA512 9dacad3dfb5fc91b82f8a22b7a8adb86c20225fe2b62bbc709ac782d7bbc78184c6b310fe64e3c6fc5340a368991dc55a97dda78c8105f29a0173455fb375431
+DIST cranelift-codegen-shared-0.108.1.crate 5996 BLAKE2B 23134053d3faa21310f4e85944abba60e138c32dcb3e6714d9cd431f4571030df74429a88853a4afc11e15d893876110e7009fa51d51fbfb060c39ef6a05b3b4 SHA512 25f6da0881095768c3fe89e916d22eb0f8ae0d059190eaccf93152e37c4541b1630ce5cf0f9bf10952b51b6e75ed6c9fdbc54a1c72e2117810a9d2eb7a90d87b
+DIST cranelift-control-0.108.1.crate 7686 BLAKE2B 7b6abefe983cb72669bffbb7d78e834e3b197c7ba0791b0329392039e43275e1f0ec4ec26d28e1f511052f21b03436f1a5f7666de8d03ea31bf2ceedf0c6fdba SHA512 f4547ae4b7e6b5ad55ff91ff8d7f3e6a8cc46fe93951f93a37e213b78d0e927d285e5ef06c9962ee8036da9aeb54ebc71fe92abbd34bfab4a1afa37067ac2d93
+DIST cranelift-entity-0.108.1.crate 28355 BLAKE2B 7885475e4264f1d4bab35cd58cec9be816c687609e10c03c2f62b95cd7f781bbe01b759af783727a5600c07f77b707fa6e1d998b069f8fc5f5fda442e1713ec7 SHA512 3264023393a274b71b86a67454007ba68474b89e3c2bcfe57be019f789d98ce19bd0e02690102876e313239de027d13a7ec677928c990be8e442f0e1783f169f
+DIST cranelift-frontend-0.108.1.crate 35948 BLAKE2B a6035f386bdc57fbd7052b39f33441cf1f3e49732586b41873f8a0a5c95cf0136448d5f86905756fa2541e5eb6b2b3c14680639dceac5b05de8cacbf8d57232b SHA512 5bcfc6c7d626613c92dcfd631a3c80dc1deb8ed275d4ebb7f9a16dfd0ef954e6f9df9f72a0b030e52678afdc37f55988146bd8700d2412765eef254507c4124c
+DIST cranelift-isle-0.108.1.crate 65858 BLAKE2B 4e6f37829240b1c798b2b33980d7f3f87c4e3ede97bbfb3d04a64dc6cfeb59398bb9f60ebd038418ab028986e504df8664e6b0a513186718cd39862328240914 SHA512 c043e1d0c5c7c755a276022a2aae7e70a927b7f9237dd20a3d6f83b94f117832dacbeca84b83231bdaf15d2d8631f3e4064a9712b001499d2ad55a016549ba8c
+DIST cranelift-native-0.108.1.crate 8504 BLAKE2B a5e76ffc6cf9425d1960c9cc7a038278550f0007319c9d0a74d2673ec9f878964ab6a961aa15e2e01603c2ed5362c69bd5b2fe26ae0c129605cf2c700fc38847 SHA512 9ae4bc4ef3ff021f69272b1d8139349efaf8244c7bc5908dbdbf409540c9774f957a8edce5b86bed9b62f86ab001e9af2de62503ae43b9a81f3a570efec8520c
+DIST cranelift-wasm-0.108.1.crate 63855 BLAKE2B 5ea0930a72d253e0707b7525e43e8f273f29bde1df1baa8f6f85bb0b130dee9bd353e47452259291370dad7e8af7024ca5ab0e4affc0e5ae58b34667575b9399 SHA512 e18083a9c7cadaa224303903635e8c1c79a61fdae8723a1349cccebafad50f8c24be48984fe75e96172e30d44729b3a988d50c854a6771bf95de04444f05ec98
+DIST crc-3.2.1.crate 15070 BLAKE2B 9d5f488b57bc232528cfb8d9ef33a88d25d904395dfac8dc10e864dc0d6c89e576585195a20db585fe358859ec50afa998562ad6becf6fd2e505f3969eb36ed8 SHA512 64b7272d8cf55efe9768f9f3218f83302ccb59458a56fe3b7b2de1a53eb5a3b57fbf268647fdba5b230cccdd4058462ba583d76870ba12cb1057ac2787f181db
+DIST crc-catalog-2.4.0.crate 10155 BLAKE2B a9c3ef81871d72635addf1ded611fa6e963b9b128dda198eaa3a256512c8759608bae95df95524704aeb38f81e2fb6c2da2e29e306a8ed3dea595e63cdf05638 SHA512 25536456fe71c44fd8ec527299339c1d186f6e12f1f90142de60eabce337d836c2497ddd6307473b57a6cc720cfc8e29b059f378c70b8165bc171420ccb40a29
+DIST crc32c-0.6.8.crate 9647 BLAKE2B 91f007df201128e3f0470d3b681322ffa7dce1ef99323fd830d20a8e863562878e77d66acb65d576dba536d3be56fbe9ac99d22cf84bf9bdf4c441d66d068037 SHA512 928319ea908ca28ef4039e7fbde86dce2ed870887e0cd1116a7d016aa7e533f5f36d11a89fd78cccf1f50c4f1ff20b8f6fd5e3711bbb84c2146686a9d351fad8
+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-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-bigint-0.4.9.crate 46826 BLAKE2B 5c19f2fb96ed998bb70a4243c33573260df38550cdad9191faf2039a254e3da2837b33bafaaaedea0fde152641c8f800a3390e9c3e7947d511e7f8deb9a6e56d SHA512 072bdbfceea537d3d7fcc8dca50b6579320981fb9c9bdf7a46dfa394b3a9a85ac48b2320004af2f2557ec661aff7a15192ca237fc22966cd5c1184d6e021838b
+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.8.crate 11053 BLAKE2B 6451c50f78bbfd0f9661f17a9a5fbd99b16cfe9e33af7ff2458f72a65d76541fdfdea9dc780bdf711b308d0ff264ba50d8866d664e68b90a432e00bd82112cd1 SHA512 576700ff278039c37105697e67812ab451fd9439c890342bcb2d7dffe167a45561d867b2a60a9b730477d7754a74b2db7ea552d72e70fe5aa28afb411ba67d1a
+DIST ctrlc-3.4.5.crate 14592 BLAKE2B 189b026f4061b68848851dc694c71c6ecf87d6c6cdb4518a3aa215ac3d77739db43aa68e3c628e51dad99d7ad089ae6c66a6d03bd912ab9748a0793d09c2333b SHA512 3fca36deead46f3ca586f0a07ace804251d3c3e49a9a63e8c34546e2305d08158770304ebd0c9ad6ed499f811cbbee0b76ffee1858aae60852a61a19024db3e6
+DIST curl-0.4.46.crate 94864 BLAKE2B bcfc97c19ce299abd3e8a9769a30c0ec5dc6692b5c1d81423f47aeea39066d1840ca7ec1d4713132519f3bea94d43aebd8d733a19028280e2e6c2a8e91eb1948 SHA512 c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336
+DIST curl-sys-0.4.74+curl-8.9.0.crate 1786932 BLAKE2B 47244310d60a9e8ed51ce7acddfa6f3895e199277a3400211b77088382804255a7858b4a4b3d30dc3c54622f514cdff76b539f11dd07d26fbbc8829c1a279266 SHA512 125e01702a85f33a9157d67930c92cd8af619d098c5ca98d820ed308d7931f851c395a278f54f57a243b8ae33305292c15ce9d6397b7e3726c6eefe90d3577f6
+DIST cursor-icon-1.1.0.crate 11453 BLAKE2B 964bae7d3fe138e00c51e52ad187ddf5b71a86d9b1bc9bb394fd27869d714cafdcbd539e2c62eca9b0912593d08187d550f5507e73754a00112560acb83912d7 SHA512 4e3b74cb17773ec2b89312fd4fe60330b785cff850102e9643bd06e99b5d96c11cce14a9350f295c6063c4133dc0179cbca13fefd7ab816e57c915f75d066d2e
+DIST dashmap-5.5.3.crate 24061 BLAKE2B 2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71 SHA512 15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a
+DIST dashmap-6.0.1.crate 24364 BLAKE2B c09f6ff97414c369dad458de6e415cd980c9be6df1869fdc5ef2e9f494110121a42ae8e1f8dead569dcf748c07f8a739218da8351268e026a764761601645fe6 SHA512 8ed876bf014a55d495f960e92012219b75c61b93c37f510ab4dd2b66eeda417a19fded1dd583188b3052799a9848dc704b663ef4cd7030b93ca828279f355f55
+DIST dasp_sample-0.11.0.crate 11617 BLAKE2B 30bad992ba12c78769ff2f72e187f5ba0775a45f0af9d346d3e56271f414d3deb607415e73d40eb09023149c261ab02240f112386c0acec26e99d666cf8cb959 SHA512 438a2ed44fa3cc97edff6c6b6c2869dd06a5df790457e339a36ebcff024c152ade36740d889cdbedddb5dd7bd706dcd61778e68f5f42aa100eeb76213f5fefbe
+DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
+DIST data-url-0.3.1.crate 21109 BLAKE2B 70c8616c6b3cf16da70a8fe3e8c6752bff3dc7d9e1aaf593617ddf191f31b1187b41ba6491581488b4dc9db1e2fc944035af9fb1acb6320de0ccb2ae7f13373f SHA512 cd13b3da27b20d5b16dff797b67323bb09f12f8582724ce9dbe18dc668a5c77b429ac9d9563be2112368f7067e7694653cbb2aae1c3aa897892c404822a079bb
+DIST deflate64-0.1.9.crate 15104 BLAKE2B e0b221fb309a56d5172738a09d83e3bc51fc5629db9a4a7977f4c05bd3ed67ddbc246141df8edb65fba7cfee3da2e931f35fc18cc6039b67a9b016bec94c473e SHA512 7b91cb3c9f37e80dcb7fb86ce29e29b2b803e18d6e5b44d0dce907978f439ce9547807b3d19f8172053ca501b71e701e356a889756b84c4c158c3c596c46508d
+DIST der-0.6.1.crate 74205 BLAKE2B bb00060680a47649e2105c4bb714135ea3669a08948ab81eb5e93f1b4f2c12b54722af9d1c1a12a277268e98f2bff936bb4cbb099d1f1a1371b892f2f4d8bc87 SHA512 3869c974bb64f03ca5bd9b60e719e02160ad7177fae888304b9fff74f72da0b96dced17610896ec661a97f61a15a9b51947943e7818aa26dc885940465837664
+DIST der-0.7.9.crate 85173 BLAKE2B f2dcf402e3d8b6a7ca818a8f260e0996290c77517b06bba8b22849c4d0e0c8f3dd57d664a06d9a7bfb1da6a39abd0740cd7d9776e75669aa970cc3ef63f924d4 SHA512 6de996346365647ac0da23d3fa9c72100d665c9225dc2f0bf1f553c4f0e7eb5c6acf3f1e36a11a7cc20e8b1c44752997e6f592c1d142755df145c5e302800f5b
+DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
+DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
+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 digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+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 dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980d8af1c050d6096d45fb748f0acee7f7de2f9433f97ec19faec9e028f57c8149229eecb1827a1ef8eb60 SHA512 4a8f1c09007ecce1d7c829899aafb90081fe4fd89cfac3550638018760e24f63985e3060c4056b55bf58cf4622b1b31595e1c524a75b1b4354b8f3c35fc267ae
+DIST dotenvy-0.15.7.crate 20293 BLAKE2B 89a205ca637c31678fdc7249212a6a71a10bea47607279087f719a4929ca30e27f5cf74d4560390ddbb825a58bebc8851a82c3c6ed525922a74206a85bbde6f2 SHA512 208eba7f7d012b71dbdd19d27fad4fa1d2982507d3362167fab72ce819f44972ac0dab6a10f3842f3f8b44d979cf8517240fa4249ee066f4806ef4e38e343bfc
+DIST downcast-rs-1.2.1.crate 11821 BLAKE2B e8a78afcd8d2f17c9505973359e2151d59b233e1757b4c7019047f148b1c8a4f28dc3a0d6eff6cc7f4a7ed986bf592ccf0481dc112768a9751475e1b0dbe27f2 SHA512 f37804c1b1e2cb0ecf2460fd6ab274c843c43e94aa7dfbf4e3c53529cca9b5624c4ea5ab5ceaafd72481165c7335f3cd1f846ae43deaabd18f363572825a5f86
+DIST doxygen-rs-0.4.2.crate 15907 BLAKE2B 3ee421c973b70d0dd4179bdd3d1e385dd2fa7abe0522660a57aae3764bd9b4d2eb0408079615e606ba65d623bccacc658ef180611d4a73e56d27b89f10632076 SHA512 3b45ff20cb7966c6632f86d3412e749aa80dcf8be57eff4d7718746945d43c22241ed5c949d901ea74a76f00db8746dd9a19f7dfafe5e347bf866412d41454b2
+DIST dwrote-0.11.0.crate 21715 BLAKE2B 8ef802f393939f95ba750e941fb5b6f908a2cdca41d3eba5a405214ab56b2fdba148106c0537034316d1d594fcd86a13774de1853c2dad2f27d0ef87ba21bf86 SHA512 b319820cffacbd55f27d74d4d8e7ae3f15d758f718611c354551ba526614f5221357269734840706170e26446efb8d504035859f47c68eb0a7a89444d08ffecc
+DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6
+DIST ecdsa-0.14.8.crate 24720 BLAKE2B 0a98d1cd01b6c50384b8e8237dd999b53925684f78c9bd069c52a527e6c0b950b8832b755db4c593870b67ec5cffeea1230e6529666789e4b3c44e529b3524f1 SHA512 7a1f167ba099541dfbfa74be45d61c4e72307baf8b13e645ba443923eee6b717b4497ba392a6212dfc93868ec3a25d1982b7835e3e71e61593ec5ef1909edb1b
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
+DIST elliptic-curve-0.12.3.crate 58374 BLAKE2B 36c7564551f14e0d2ef4a64b3d564bb53a83ae99a91e34f9b1392ff1d4b03b929c57523fec854685aa918802bfb1f4d52c6940cc0e4ccafbb5cdcf0a11e069e9 SHA512 9d2e129f56c70ed7fea582a8daeefd7b03ce19d5afb8dddd520ea1b8d98eed2aa9dabeb49b0738c091b0c1d36c3409edcccfe174313bbca665febe8c97db481f
+DIST embed-resource-2.4.3.crate 16620 BLAKE2B 69964ada562ea8602072ee953c1e4b37c3efcec9d8e62d7f152c767b8fa83cfdbe5c37d3e29504ae6183e422fa384ebaa0391a7bdffb7114073c032f76d26c5f SHA512 c492af8f7d57ce56c4f8dbaab2f20908e79436c9cf31fc541ddb77a9c44f9930dd8851c1edc6ce09f7c656e02d039d2f6318f9df57f1df1c1132a2b544d7d4b2
+DIST embedded-io-0.4.0.crate 12901 BLAKE2B fa4a4483d29bc2d7072bd769de45f37ec90cbc24d42b15d6311f391fee2fadb0a26908b8b7f4985c8d35a25817aa9576235bfda59dc603e363d1db558d422212 SHA512 b8713deb0541eb881c17190c2215e960fc52e8f8bbf4c306df365601cbce1faa56f16598e113854a8e9ae1b10a6e6ccba5aff3225dc15274263ccbe954d69894
+DIST emojis-0.6.3.crate 119844 BLAKE2B ffb2244c99a72aa0bdfdc5f765e1007fe3fc2f773363acc03dc8abb1f64fcda6a2e77ff890d216b09269e236adef469c9961678270fced0c029ff7fbe346f5d1 SHA512 61b3831a2dc635964017284a4020c4812ceba5560f1e33cde39b8a6c18ac954d460e62389e5efe2d4538039eee21346dd0e9c8b09549baa7526fb0466e8724c5
+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 endi-1.1.0.crate 4872 BLAKE2B 8bbffc45ceb70777c6606714a7bb8f9b26ff33a295fd722958a5e9c556d5bb1e97a34e216514e5acaea51811d78fb4aac927c1f8315fcfd8000fda3741c53b4e SHA512 1a4b65cf77f530a2d15cfe968aecfcc9120957d23d2b442cd3d8f23d7039e832e7d6ab29aa5ad8570468421095650e26fa07f29bf75ae361416072241726c61a
+DIST enumflags2-0.7.10.crate 16622 BLAKE2B 5130fc27294e25ff3fca4bfae3895c79ef3f78d20c64378854375ef859eba0e0b00dc6b2e662129bc41997751537c40e058674f43323e11d463f2e8be34ef593 SHA512 03baa542e83b15d0e2e36205a0ea7a6694bd959b315918302324d50ecf30efcd915af79441c9c8c15670c16776442d5fdce51080fa7404662e2756607fee1668
+DIST enumflags2_derive-0.7.10.crate 8104 BLAKE2B 7332ce1236a62a02c3441192e1bb9ec3944dbb7e74e91bec0f488f5b7c382c3879196b1608bebbe04015cfc2a9ed0bb5a399f889ef94b43176d28df8f1c16598 SHA512 3dad49b91c9724504121ed1b1efe7167fcb61c956d7925523e1edef14bbd92187d82e60dcebc8ac0c22d50c801ab2868460b8b3e298f31a730a7000f80080509
+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 envy-0.4.2.crate 10985 BLAKE2B 8a6f25fd3cdfcc17cfced55bdebbd9641eee3cb7a0d227f1c08837ed41e31fee8575875dc165139d83cd7e124a8998ce77d7d1d0f7ed230ee2e07cb7179b5798 SHA512 3188120adf5dcd72a3329561e8cb864865927df1d24dd7eae6f21df4156c2d8e6bc73351eeefd6c1ac62857bb6d3e154f682b7815a86b77c8047ae6afb88b74e
+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.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
+DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
+DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
+DIST etagere-0.2.13.crate 19593 BLAKE2B a3b5db0571309513c90a9a995fbedc9e600d1583826d9921693d202bbe4debff2c7ed7540c2b1b6d736e0a3862b7e013200b4c3c20ba4216e4855341a0399b1c SHA512 f02d73a473fbb59db8f5bf656b10ce78c0d79cba1a91d87cdcf6afab1a3c6aa84be5478de55d2fa5bc5ac9cd5571cfb48f4be4bd17629c03291fec3ff4c1ab74
+DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a
+DIST euclid-0.22.10.crate 78701 BLAKE2B a56cecd7f2670a15ee23f69e607ebe8175123a627d3b53d650b009c29d1f799d08ed05720d8b4bff7283e8379a3f400bbf8df28b6f22b71cbe91235ae006c2af SHA512 618008ea3120adde78f239c7fbb55ad14d10bdd233f2175b7868e65ba95b6ebebd3ca3218be9c857821dab2dfa8e80b18c9d881ee62842a1d132e70fa49e110d
+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 exec-0.3.1.crate 8748 BLAKE2B 8ac31f052d1e8cc5a1dd1b199cca78c998e812b600d37944790f4747eb3111d3968978d9d9c9bc0ad89a675126f0faefa8ef4c3fd6c06f148f1109e5f28d4719 SHA512 e787373ebd04aaedee88c7f05160bbe3ef59566f9a91f3fa0a7aeaca0cf63bc8f85c43373c32860147342014e0d003311eb366b3faf3bf4c3eee032c484b783a
+DIST exr-1.72.0.crate 243996 BLAKE2B 53797775fef4e8cd520f4a98d390453b36f9500dbe999a631a54d906476f82a7a975bde0a369116a997db5e383c846de9a7bf4330c68ea7ec2c9e44e4856aaf0 SHA512 eeab15189ca6801d3b3748c88395de9d2a3fd970f182f70bd39ff7dbc960bd27d06191a42d1a5cb895a334787f18dd3ff31af74d223419e1845396a5f696dd1c
+DIST fallible-iterator-0.3.0.crate 19639 BLAKE2B 58b8fe842fd6514fa4327eacc81b157a4a9bec4ad9b8e69248c0f0aa5610dbddb9c8a72e6e6ef9fb8216e8f79e6aab439e90d4d527e35634ab222347cbe39974 SHA512 c655918fcda5deb8ce792708509e4959139f113c1006dd41b94d7073ffc204512a22cdeeee05c87534db9c414da3f4eb716e1a26970646fcb1c139a14eb8a2fa
+DIST fancy-regex-0.12.0.crate 84888 BLAKE2B 67a791d9d9fec659a9060352ccc99769955649de7f7a45ac7b31df2a8ae143b5dbaf47161185b24cd82fec8dd743594dad3f8a4e0795867ac5262501e4c45936 SHA512 aec451ecdb44d87ded77890cb5c5ec7ec50d23bd4b43d97a68d5645e40f1ed54b5c3e38d6e7d7bd49883485c5e905da00d6c57fa0690c301d53f25aa72792f1d
+DIST fast-srgb8-1.0.0.crate 17214 BLAKE2B c5d2e04bf43fccdcd31d6f81cdcde3d89bf0ce94bbc506c2bc09c62b4e83469a2b72db0bb09f4cc2495ace7510834e7fe49df6aa7864092452d9f7865f35cc14 SHA512 834edef5eb4ec23b9e627b5e879a1649af19a17a1af0bae97c040869dbd14751ff3b29a606c52e5fe07b60f07fb695f328409c39788a4e74af0ab7b716688a0b
+DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
+DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
+DIST fd-lock-4.0.2.crate 13675 BLAKE2B 055e7254c6ea0185a099cba229c15a1044a6c0826eb6151e990134c816be4dd26bb8ab41631be8650340bacc16324a706656d2901c3969354a854216ad3cb306 SHA512 acc5aaf6e89169062c1c59d5258b590d4bde21a35f0acb7da2e3167d0668fa678d1febc305e32d95329a7e5bdb784fadb9b85417a5e4e5deea53d59f05bea74e
+DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
+DIST ff-0.12.1.crate 12956 BLAKE2B d8890ed23c6a6bfe5b51a9c243f9e361b055ebc35ce7f19e229b702522e3d6c91a370d5977523a811b6f4a60b9bff38d139ab2f2c958816f7ce427880798c651 SHA512 881de6b828e68a80fb8608a815d41de30d25e8d4b9ca072b6502cd820b2cb29e760ca02e21fafec1b63f2f2983c23954287ff04515afa854209f91a085a2e161
+DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
+DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
+DIST flate2-1.0.31.crate 108176 BLAKE2B 2b0afbeec9ef08e54bfc572d7a386052d519d5bdeb220a316b67409403d229425580e33991f0a98536e6468f0e59ca87b59ff2d00425749336d4e68906d5d787 SHA512 b211254e15b38663f080552598d61d6766d6e7abc45cbac8fbdb5af65b833d2d3fbc00b5748ee12d4fc71726ab84dda9da20b6916121735c7b1c6c9d7a09fa61
+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 flume-0.11.0.crate 67502 BLAKE2B aadebeda44f899b6290df4ccddfc0fc49c4e55709243e9b1eb26b6a232aee042d2260c9b504d554551be54ad4e4ae1b1dc6ee861fee0cbb6eb92fbebb5a7d9ad SHA512 29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST font-kit-40391b7c0041d8a8572af2afa3de32ae088f0120.gh.tar.gz 1289463 BLAKE2B f35f28341ad40c77434f2765fa6ab546a3b1eeb950dd3f92ac90676f0005167aa84772d62852c45e2c24511f5e79cc8eff7844e5382bb21212c8f08cedd890fd SHA512 c6848000f0ba629b9b001618f06511882832f0334095606c7d6d4929f56a9d78fbe2db04411732619aafbc128cdaf44e7a6d32d351d0577b439cf2e0fa343682
+DIST font-types-0.6.0.crate 23047 BLAKE2B 9e95396d294a25362a3d031674d8f1bbbe719d94afeece3a81a27c2cbae937d15d867f04cf5594442eaaeb6f8749eed1edd2df2e1821d3e58cbb316bced4a1d0 SHA512 b50d0035fd77d9048875e0e10014afacba8622d891defaeec51311a96c54ed82100e374da1bc08798598ade49dfdc39d212a8055045eabcee09a01850107d9f7
+DIST fontconfig-parser-0.5.7.crate 39564 BLAKE2B 315be3d94b4c46bab60fb40b9b48d1bda134ba4018e5392eb9937896ea8f79098f771942988d4157fbbf5cb4af8f5739abab96b79c67389f14142f24ae3061dc SHA512 0e4ee78ecd12d891492d2132778649460c3a1e553ae67245581677e28b2b813f4303599b64461c2a7a47957591e577ec863fa4365e3f277b8a7f6753332583e0
+DIST fontdb-0.18.0.crate 107583 BLAKE2B 1a6e2f389d06247d656b13e30d822ee892c11617663663c61b00e53985c84eb8c79270e5ce2e142e0224a99cddec57ca65ee70405feb0ad25374edcb0c29c92c SHA512 611a9b5105d9d841632633043c9900d188e3d9c7b449e3fb5f9badc4564ea18eab418e82930961174f9c39bf3eb0a3c0f11125b79c43042965a6ff53206699e7
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82
+DIST foreign-types-macros-0.2.3.crate 7635 BLAKE2B ee89f576f2d892209c0f344dcab9dd85a671c976c8034b33dc984b93a5c872ff0353311657fa1dafc499243e55d3293a7bfc532ba55894a719a50ddaa6957589 SHA512 c3965e058d15159f789a8ab1597770ff6325e8ac9e6914c98450225ce27af849698646d53326e07b13eb3a9730452d926b73fd76e5a1fbd8ae4a6083bdce3367
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST foreign-types-shared-0.3.1.crate 6006 BLAKE2B 27c26518e0de0a298df2996da4959727dcc6a21bb4efa6c28869a9affe7ee3b427d1bae25ed6928477d07959bd143d5d4fa27325f8f5a5cb0ddd3cdb9e5314df SHA512 c68da34b55230941d6655f6a52d5dcb8ee02149f25c25a5ef782402f9a18b33047905f28b70183a5f45b45977c011a5320cf7283b7901c76ede4d82082ca4c9e
+DIST fork-0.1.23.crate 5592 BLAKE2B eb21e1d24a85cec1ba99a0cabac4ea82153f7cf8f3f952e103485c66da63886272cb1617aaa12d206e052d792af8d6f3f64060b1d6726cf43a6ec015afc73c5b SHA512 0547d87b7f974ec0d54c514d6cccaae8d811b7c79619d28aeaf7f01dc07f1a4ff9ba352ee5fee5b5978d043b438c956b2c99f7ce6026e01575e9672cc13c68ba
+DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
+DIST freetype-sys-0.20.1.crate 3877697 BLAKE2B c97b9bd5f5339e97db5d7033d892a53491472b3bc0176d1a860a6396e03e2a74ddd22e9c36c25cb34dd544a11a9f8af67b397b4f1e1c3c45c683998df8603547 SHA512 03b6ad3d9339ecfb75f2b0207281e84325405347d3d6256215db4fc42e4cd5edbf25a6505a12a71d27d43f4ae5f5e35785f7120726232cebbc6738cb94fb0763
+DIST fs-set-times-0.20.1.crate 14607 BLAKE2B 90f1583b320f89cc6d3571c0b258e91d56a197aa80ddd805ad3d8e698d1a8e1beed86ba2522a8c7c734579979fdf1ff795ef1af93757b77767b56a44b34bb3ed SHA512 c5ae52e4e1b71097400e84ef9adc468afc3ca5fcfefa8c3e84020433cd930e3dab978e559c460fd1dc6c273637c8da5ca7b6df5edfeb64adf50aa5bd502962e0
+DIST fsevent-sys-3.1.0.crate 4251 BLAKE2B da57e382073de010257d1e870922c313d5aee567cf6db51ceecdbd57d127460c26406e77ac6ab1a5b6dead4cb930f12069d30432a3bc38b48e6ff423c6707641 SHA512 2cb87ae6a154dfd71ad0261a96686b47404d97e57eaf14dfbc0eb923a0bb2209a51c3681d93be65edde0be1e45ea0b3c7f3a1f8c23de1a37fa81f15bf9642116
+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.1.31.crate 157731 BLAKE2B bd1c51f7b5c6018547d1aee3ec550fa55ca955b48c04c8e9e91e5aa944540fa69fe590d2296085d7e772c7aaac37dce00624323bd6e31f92af269dcdbf30d511 SHA512 4be7199261201ef4dcdac5a5a237a70eee33d8fad9a81f76d739f4fc7ad39c87fb2f4719ed7e7a7bc5773c5b51196e4aa4ced5375292198c8d89a03f1692b341
+DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
+DIST futures-batch-0.6.1.crate 9230 BLAKE2B b357030a9f457ec65eedc29fd311e837b83724138662f6c5bfc8129d73fbcf5885763ee68e951459617a79608c2a5fd4f578ee2e459164e1f33c3436b18b83cf SHA512 e5510177f30d11831845f0f82607e3436d6bb1ad56507b43bb4643f9b0c983eeda57d5466cf118708079acf1a28c9f139daf4f47d94b092f086d27b7edcc1513
+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-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f
+DIST futures-intrusive-0.5.0.crate 85563 BLAKE2B 058acd06282f1e23f678abe5b71c26ce1f15926a411f3e5863c156636c45a893949cc3ec0768ac6976f3102538ebf18b2c9101a6332b2d21814d712ac1e64b37 SHA512 8924054a1e33c4f819b47b0a01877d87b9e6caadb4e3b0742bc04165de9de257e7c70d3837069e44ffffcac2d810fdef376aa4457f042aeb3a287beb11f40fc8
+DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2
+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-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc
+DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
+DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
+DIST futures-timer-3.0.3.crate 19739 BLAKE2B b7af71c761197056a6a4db03caa30f31c104de0049c09f52b18b80718ad20c95e0e64bc7a3618c29d1c9a5ef0309379044fdd9c1fee8465930d28b2c58927733 SHA512 c50388e38b45dce2a65a8d7ce56bcd9c3544ae677158c4c10c532136e861c16f0f52df5222a14c0f40ad8e4faf93fde8223affa7fd84d24e95aa6994177e7e76
+DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
+DIST fuzzy-matcher-0.3.7.crate 18047 BLAKE2B 934b90a74826393ceccc3e433df7cbc056a10744077e7a2178df9d9edc9db5d4cbc86d006c0ef1f7d82f4fb8ea0d52df71be1c7cc9ee39b433207d7f2126404e SHA512 ebcb6de06dd66da952183c75e4a44988bc60df17f035fe541c134f1c4e3c33d18a7385a9867fc23a99c07cef2b2737edd6128dea6546e243985da2f3a55dd8e3
+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.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
+DIST gif-0.13.1.crate 36408 BLAKE2B f2544552c177a4e33440b05a949f6b205d3dda1afcb7e6574c92ed9d31cdb3bf536e1914186730bd8777e1c10d86466dffbee34d975884f0125a1dfcce937bda SHA512 7e76ee111c6a94763c4dfe01faf4cb0b5272d5041e2b2b8f4db666debf647e192b963c6fb3228cdde28e1d112830c2aa31eaf0551d712ea9963e41e47e26fb26
+DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
+DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
+DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
+DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
+DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
+DIST gloo-timers-0.2.6.crate 5516 BLAKE2B 1c06b6a7f7ebcae8145c8aa4675d2d4d56d04c37a3b8e25ede6dce7b8a144fee30ff5b4b04103408f1866b70b02607237161913d250ed6d34af2b6f4c54cb57c SHA512 1e3ea8351528e8e73add2f48482019fb9737533bb128170834bd27541e9d53c35c6bbe18c28bd0f70fc218ed22731c7a3f01891c6977fcbcf839fe932c3c792d
+DIST glow-0.13.1.crate 150940 BLAKE2B 30916c62bf166cc5aa07cf2bf7f91b80d3580f0e7d16d43d77e185dd1fab17c96d1a20e7a018725e6822c2910776d27e57bd52677886461cd22b5083b9a605ec SHA512 2a7975f049fa7292dcb15a6f7d6141aac59a316f97a21c4ee65a6cf91594f8340b74a3e3135903be4dae51e6ec73892270531f0f76140dcc1534a93bfc46c49f
+DIST gpu-alloc-0.6.0.crate 19649 BLAKE2B 47fbe3b604b4ffdd2e44d2298e969117688378ef5ed32aaf698106cc06f9973caefbad0cf7ee7a4e75a5602bae9ac0eb3b0661ceaaa82ec1c0d08184d0880ea8 SHA512 b0d19c68c3d122b89dde988d2df53798ba7f3cc9475698eddb0bd116a55509610a9e4edeea81ffd501b3e0a3d50a656161b6f3eabadc7a14e46578f9f5230314
+DIST gpu-alloc-ash-0.7.0.crate 5034 BLAKE2B 72d49ae205f7b0470f1dc5c91be8ae0d463386e9ccb094255c6c2631b080f20a60ba0a36887587b2454e804c91cafcba8c30d187ae5af10cd0c3a79bcabf376d SHA512 05f4762ec1fe999c0e5ad8d920ecb8deb63e015cccab3695e98efb1014a6dd2c61cc651195277d7ddd3327a7c757230828f8743c8890e96152c1dcccae5bb252
+DIST gpu-alloc-types-0.3.0.crate 4128 BLAKE2B 3f14d804b0d02cd8b2a3532412085db3b6e78a500c9629e3908ab1ac7787d8b807cfc88c8b98bba8b9aea0635787e3d6cdc65d2f565047c6ec74a90ed74002e3 SHA512 9b9f7e81269070269c592c3ded750e0507bf56e1062708ae0f3784fdffa86786f15fd647b07a5d9a4d8c83d5bc277f4062711a5af99e88604e0a0b5d708534e4
+DIST grid-0.13.0.crate 18163 BLAKE2B 13db57d1335a611245b812b16694afaadcc43ee5e149b1d3c6f447c5167c852bdaf3567f924943355892b7deabcdbdbcac63cc84cf9237f9ac5bc2edd9817374 SHA512 e384b12e62e91266093457f5d62c146e0cfd36070d4da6eec3d33c0f8d868bfba1b4022c772120b9f9e6f48217d537bf044a02d439c90e8430953b94c6d0a683
+DIST group-0.12.1.crate 16516 BLAKE2B 67a6f86ca5362fddadd66bc76ce8bf7d6037fd8f62dac45e340c31416c7914985f77865a3b3a78d273a7b19f0e51670517ecc3457b8350913d95bd21c02ec79b SHA512 ee8b296a823f95fafe0572ea077499b9025daf55b9652ecf2bc4766c01e3242ba62669d88d6002d6b4e96e9caeab26927e868d04245d2ed878aa8f0ffe2e04fc
+DIST h2-0.3.26.crate 168315 BLAKE2B 81c65e519bacc8570a28b82808828044d1c94f8cf9111ae432b1684f216ce51c1b583b87a2bda3c36cf206dd508084b8f0877e93d58c8d511f87eb143bc77ca9 SHA512 3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163
+DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
+DIST handlebars-4.5.0.crate 95074 BLAKE2B 7fc115c014eb9d304a37c608821852b197be491869d951b8e2863a04ae250cb578383009d58263ab08776ceb641fa27372bbd76e88b0789095e93bf35302c035 SHA512 639c33111ce7a1ed6084dcd40f466cdd6b45fd06dfe1d6e8c37b0e09da003cca96f1afd1d42e806cbdd08d3a397e7a1d515330f74843903ee9f853f59442ab80
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70
+DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
+DIST hashlink-0.8.4.crate 26514 BLAKE2B b4f0e4c964a7a3f7bb31f5b04c34598372fa867fca4550c3e170a1eb31d58cff44314448a467d4b8d6748aa7a7bea4ed422bff76e9e0a5018f29b85a6c51f3f0 SHA512 4b21564c26673458668da18fd95246514e90cad603ada7875466bb056fe461ab31c1db77fc2ebfe207a1bcff06df2b0b29c258f7fa9e5c19cb4e4b2388d53ff7
+DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
+DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
+DIST heed-0.20.5.crate 56242 BLAKE2B 323fa7feca0c7b1eaaea7a06d3c7457b69b6f06da6d3a5b1c0e00162c3905c80966ed631d2c9bb4ef35897b7a07931ad66f10115594e0338264e500844587b3e SHA512 c9cfcb0abca77a09c314833f5cf3d34e4a1e7f0fcf93c1a9bdf7f330b72c7aa9d3249b6e81cc5e7e6da05dc0eb3a2b0d9d39700efb90cda846ecb56b54c4a949
+DIST heed-traits-0.20.0.crate 3108 BLAKE2B 9f2678c968048ca3968aa4ea1fe8fcbc7057a971dd2ded6aec76d2b4570db8698b496db2c324719f27218bd59b2d51c32e6078b86710c5b80a60b60142af3416 SHA512 a63bb0d5a5b1b3e6c7c9b8d622ee806208f06f642beefdc238c887a67bb4356d3742b5a6029c8c56741d83a2ed58213db32840d0fd5f17c0d312fa8c1f70c653
+DIST heed-types-0.20.1.crate 4568 BLAKE2B 24bccea3a27733654f5151b41069c7a14a29d99ced1bf102c826bd8dae9d97a1c2450053ce6819bd9910fc31ddb098eba6742c40b4eeb27d7cbbeb51352d2165 SHA512 78d436680277f597f9091158ef02219f525dc93986cc0dabdb2a18287a28d1df9d4b1d864b524c28f062b67fb84ee6daf36f161d4e494aecb1be6547061616dc
+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 hexf-parse-0.2.1.crate 4662 BLAKE2B e1b6bfef243b07305d7a8f08c8dbdafb67dc50c284ae70ee7032ee8bdc4e72928b6f45344613db63bbaea49d883f0f54e1c09235fb951c1a65755946c557ff55 SHA512 76e64d95121b0c3cd534a0005df0933bf6430f50969ba7a72f6a8261c9b7830c00a65b9286315cf78dca4a23c02bddf75488004630ca9839cc371c43efc8cade
+DIST hidden-trait-0.1.2.crate 3846 BLAKE2B 855900caeadb17265638a793f11b3108730426dfc7b0b1ae5620a68fb7429de8e8d071f2e343443666bb2cba89b12a28567342070f34646f15a5ca46ad14fecb SHA512 f335613da95d41ba79b21d19527ee65a3d1f4b5c57bf24d02421e49d5db24aefb6c869877124ecbf3f6c880c1e46335329420aed1ca12ef7c6a6d484b32d7421
+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.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
+DIST hound-3.5.1.crate 39446 BLAKE2B 9f1bce1007e28d72d3e48bc8db7631efd83f196548f7c3f08461303b1f1af330565606ed5669fcb85d4ac0d4c38db1f948d5bd2ad2ed118b464ca7c2345046c6 SHA512 ba16c71acbcfd44cddfd009e2851a06cfef87ad483420c6bd6717436b5156884931ac2cc44c0d782004efdc6547151c137406d0a3f32ba26ae454c33f193550b
+DIST html5ever-0.27.0.crate 72913 BLAKE2B 0a3dc8b19ec74ac5b5c1728f9112ed7513285ec47f4e3a3623b995eb9ed0aaf2c83899126268cd2b3e7388a3209952213d4fe0ea0d297e3c0f7b16aa1b5b9d4f SHA512 8d736fc122da78e9ba8b546868d0770837ea0b4951ff027f1b5593dedeb9831c082dad1868659422fab5527711ffed18d4428d519a830a3434d4594a1af6c868
+DIST html_to_markdown-0.1.0.crate 9666 BLAKE2B f23397cfd76fa8e3aec7d62d487461c291f9488b62b071a8522321a05c60fef55fb92ba514a3e6f767ae943d40e31a3387e340d4e60e1bce21d3fe0e896e856c SHA512 8976cf70f6199de0d7bf44393b8f2a710298b000cd7d2f4d8c54932a2909ecc6004772a39fe80f1b999ad92b86a0ce038c169e8eb651b8a4f8aa840fccd38c67
+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 http-range-header-0.3.1.crate 7712 BLAKE2B cea67b446ea8938d605b2aee9616e5abbd30d7424e6cbe1f4b5f3978163a2d4d787ba340f3609fede94a930689b988f251d60ee6a3985f6f4dab9853b6d41484 SHA512 fd1c63c9fa2f9c1637d313f111a26d309cb6c8f9abaa7e1fe2c001a579e8b3bf03a28d1154a53d3b5a21b9b92605b5cbccabfb1e28f2d88c2d32bbafed1e44c5
+DIST http-types-2.12.0.crate 1193808 BLAKE2B 0095b13617a9eed2da3c64f23450bc8d40f4d77a98e78760ff00b95878ea3755c8eb9eba03b3012268310e9ac65264706a677586c7ae4b252124a901066d7c27 SHA512 9b7d1caa1452a2ea2b9acdaca160d2fcca6fd78de65724393d3df79e9e25bead24048f1bf35a4b602d0157529c07452209a20c5ca221a060bc9cc3059fa4e372
+DIST httparse-1.9.4.crate 38555 BLAKE2B 24949d12a08fad7c90f57de628fed1cf9d0a726ddf1b1f66def1d7037f509406911e6a54067eb299436d865881fcb5b4dcd54bc9a7fd166f9ab6f562ca29a3c7 SHA512 7a6c34cd0e60aea6a4e747b1e0711c7227f0cb6f332ed34b8b5424ab2d21772a77e60295e4df6421e921f6f9afe1e9955db1be5bf1dbc065200d4aa7d23a4aef
+DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
+DIST human_bytes-0.4.3.crate 5654 BLAKE2B 5054137704a827ad43bae10253706010a7a44d335ac925800a149fb1f788ea14ea049b63e38651f1dffc744e32e3dd8dcac7ec58c336d07a0df95aaace593338 SHA512 329586e679f1322d90a034ae4f3038bce0e422342bf7414fbfac3449c3672589e7a9dc509464c4eafdd90ea45ea263ddaa64c0e476d9ef3abbe77c7560065070
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+DIST hyper-0.14.30.crate 198175 BLAKE2B 9aa000132bc5db1cf566df48d243484b52a099d47d68aa2fc02d11455f3eece99f6a954bcc9900c0173cb39f145d371cf97b024517aefee4c7bea7746f800dfd SHA512 037f19ad0ee461dede269acc634955b087cc021abe52053de74805243621e35037b4968e20fa0ce7fcfd83ae05bf485c8003cf1df55dc30bc4cd64e62fcde633
+DIST hyper-rustls-0.24.2.crate 30195 BLAKE2B 79d5c6512877c98f3040a6ed26027e5345d42cd55ee9e9bb6e020cb7bdd4345556d910c338ec759a6a9a2907e645aa841d5666879ba8254ac6506a980811a7d9 SHA512 f30e83408376b985ee9df26728f8183a7048d4586c5fa3d797cc837931e13300018929583a087767bd19d4bd60d85ea1c2696601c236fb65be9a6805ef6fc193
+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
+DIST id-arena-2.2.1.crate 12203 BLAKE2B d5cf0da97a7d95e57f2281f7ca64bc1f58578e4796af6cb9d4239dbc60ebed6f6ef0f5d2fb93f9563bab68fb4139672acbbb23ac6c48fabdc835e08def5a9956 SHA512 c07f748b4f1d15f0e84a9c1c3e8c5b1fc95ef34d81751f6830cb57cd1ba445635da0ef50ddb6959e29eafad65865951e14f4655f6bf4cc79608c00fc032db0a2
+DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
+DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
+DIST image-0.25.2.crate 225656 BLAKE2B 15adcf01daa3bfa1b18e1ec0f9d0c5f525c9f1d8dc58f1c09c724d9a4c2421c5281805f9a627da804b3273a81e1b536d8a558f3a8a31bd4ced4a6b254a019396 SHA512 229375af5cbdfd1f11defa5e261481159b1d64a62d421676b831c1db9fb69b5877f78bdf675999f721e6f71cc4884af6c63ee561415c2548eb9d23469ac4e8da
+DIST image-webp-0.1.3.crate 50444 BLAKE2B fdce6198f16c979cf91678addda39d3647587ca000644b73dc267f9924611a9519c5f4a6059ed3165bbde53f15f0327d904da935ef6f385d352ec033fd384567 SHA512 e74b197ce3fda4ae7de41992ce8243cc1759900d025718691a4664f6abb3283371238c22c24e985f3432e5edec6605b838fb881555b453afbda09c164adb092e
+DIST imagesize-0.12.0.crate 15747 BLAKE2B 062e1d4687d7dc4cac719c7ed1b341452e2134e06ba457e0032eb61c30d47393912fcb115421ff5edcce39b05118df522da2f2cfd5ee0adb9c158ca5fbd337b5 SHA512 192bd4820e7fcc78ad906c4d9edeb392701206b8e7043e78d7bb90458f2187e1f746e37adcdbebee90c08e58cafc0f48eed7ab055699c65da0578e6dbc36433d
+DIST imgref-1.10.1.crate 61797 BLAKE2B 3f5297279392369f1d6a9eaa6ced3799838e90aa40ebab175a2032012a54ff664e892e8d3baab094aea1f95b43d8b9b9c076135bb5f7820e1e5c8fc4420a2385 SHA512 cb58823cd0357c4cfc6daf3052b59e7de105acd85a1f8bdc49bee65f4d8b88ecd8a59ebaa7d157d91f643449f6c071a113d998f50a2ae9bc04dcb7b635c805b8
+DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
+DIST indexmap-2.3.0.crate 83027 BLAKE2B c42cd83845923e68f9035de2d0645dfd5f37edab8b5f076c5d578867e721403b71cc48c5a68166e03688be96995c73cb81d0f2583aae8e24eb554a432854cf84 SHA512 035f76873c8f94dc0ebf8e2cd29c157135a1a6b5fe042997bd30a928227f6257a19dfbc43ea9b50cee425fabdfbe0ef6704627126ae5cc937855d6c91fca0958
+DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
+DIST infer-0.2.3.crate 12401 BLAKE2B 8db9c350ab57e2b17ff4a698827f25b100c75e881d6dd9f82264e304cf4065f34169d3d1b558ce760937d92d27174dda4dd2514df06058c72f5e002b7b3cd057 SHA512 ac349efe070df8a0e6ff50d233882124402cacccf60a1279ac3b0a43289297ddbcc964346f7bb60ab8e8022a6aaedb42d9f0d9cb69ace0d112a31bce4ec381d9
+DIST inherent-1.0.11.crate 10316 BLAKE2B 8b1dc07540a3217d2e5b7068609b4963962a3e2275ffc349d7a9f302eed083847ce6de8ae05e1dd09cbb7eb97d8a4583f5ed4381219e1b4c893da26c2c1c49c5 SHA512 b4e72967e718b9211315bb8b66bac91099c7ace299a2c120cc34e99e39f10dcc1362f1a31fbe2bd6ca1cab4c0c990ea6685fac777d4c9e3fe228811787caa37e
+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 interpolate_name-0.2.4.crate 4027 BLAKE2B c497f1912ba5c39db3d57b3e0fcaf1df8e45f9f99c6d6abc2e375531a7fbe3d55e6af34ab29fcb1c9618fc65147e7c4659531441a23d586d50ae3ffcedb6fd1b SHA512 87d2b732a9104d1a094a15ba6fa642641690aec10bec065d02aff5830f54a0fed02ff5de4bd5c237a91d34cd81da0ef11cc37ded3d4ac640de9dcb96fb73fe11
+DIST io-extras-0.18.2.crate 36030 BLAKE2B 4912dc81221b605fad766a8783f71cffaf6c62d3924f2579bcd60ae4f763aec54b5a8e1fe756b190beb04ff61bed627c2f34c27f5dc431ba0e522e79da8074c1 SHA512 bd8f046c2678f8cbae5f0419f3d1c3dd8964161479a019163e911ef2400efb5c1840e1a282252726e2c7634d0765c9d4dff6da5a2a8d4e1df057a097e97c3c2c
+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 iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST ipc-channel-0.18.2.crate 144146 BLAKE2B 240382f9e795a629bcc389e41b0d5b9c0166458a4a44d372090e35d18d9f555a73d1046f9179bea7584d3d72162e00bc3ea7e92be8f1f382ab36c87ca7edbb8b SHA512 28af04d55fb3fa6ed4fbde6dd13e05c59d29a0b7907e4ac74f4497f761e8b0bce0f19ec85107b6f2e2dde35599151eb266bdab43e28cd08d5dcf000f9f375a3b
+DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
+DIST is-docker-0.2.0.crate 2664 BLAKE2B 6c3b10a805bb077b9d0c54155fb9e72a15304fb3d6f0ebfc3efea8b42e02b99737d22c16a5352ee0c1f820699f765673bf0ca8f46c6a49b45796796c01015b84 SHA512 759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06
+DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
+DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049
+DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1
+DIST isahc-1.7.2.crate 203314 BLAKE2B 60b4b7112581740cad3321a647b71e1ff10c1a7386ae8e9c95012c0a77bb05115f9f09d451db87ad2a19820e0e985748e42898c3e856b47739103d93178ce163 SHA512 c58dac9bf57f6019a215b0d38ba97eb3042933dc327e260c007531a7afe64cb778c27b5f0fbb761ef0794833f8ad049564c3f2268850f949e9697ded61477c7b
+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.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
+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.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
+DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
+DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
+DIST jsonwebtoken-9.3.0.crate 48987 BLAKE2B fb0b2e2087975edd31388ee61e3e03ca9190a2f8903b6ef26c4bbaddd1d6df99cc9ff484acbf7ee1ecab865f69f6437e3d1b09230426c834f383daf4f242ebdd SHA512 d9d0c9552cae69f3db1bb95ef91685f12a52ae430109f20cc9bb8273f667c2534a6818a525a8e14e662f08cff77d2e9d605e24365aec6984f7e4d247bc989f2f
+DIST khronos-egl-5.0.0.crate 28482 BLAKE2B 3bb4a0b3fbd7fca40d0b829138885624074c23f2123828d517e1be3263a7bfc6596b2d3c46685d4ddeebbf3bb31a06f7ed5316cad84abd36f5923c24ad245af1 SHA512 d21fb550d2423ed124edab993fb61dd0c1a8be32c18aa439a02a8fc3c49a13d2496c0ef5249b7e72f215744d6c4e20ecc1b92279427f0647a3d298e542b054a9
+DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3
+DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
+DIST kurbo-0.11.0.crate 122524 BLAKE2B 09a23ccbd7a216e1983b0d58e7d554bc0fdab75c871567023bd5081da6fc96c23bb92a79423b830016625a5f73df43587d2f48aa5bd10db06ad2d9c615b957cb SHA512 c25be5a1eb37fb8cfe284f0d0e742ee4993db63b38e063d1742bc4eee46e2137168f2deffe326ecac6fb2e7a346d5f847dbad4444a261b290914471d1514a638
+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 lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST leb128-0.2.5.crate 11843 BLAKE2B e1e298486eaa14ee39b574adf8b628500d07239d32ea69830dceb0b08e43cda39a6704dcc69478c4c92eb3469582f97a051854d6fd9bfddd1059d5a718951974 SHA512 ef07318c1da0e130e601595256abc964e8fc9c5733cd93ca09203bd4869daaca0d92b5103481376723b20da57ef320723250125da59f9b39f8533a01bce93780
+DIST lebe-0.5.2.crate 8422 BLAKE2B afa49a1945d623b34139e31406f4780a5ab7b3d34648caf5f73b1504dbec4c4c02fc3aad3fdcdf85509eb8ba733a131a96478d6b9494cc9f69048f9ae28eb880 SHA512 ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST libfuzzer-sys-0.4.7.crate 128332 BLAKE2B 7e1edd039edccd759a9b188ad4e6a670fefd2ed494694e4af857a97327fc73437e513c00f269cb95873536c78353509d50be0e47f820dc3a1df15eac9156bbcf SHA512 8c1e4d8897edce34020ee3e507fde3da357324c15e5288c6e4fd553ce876d2f9b7b5cc3de39d03aea89faa5fa75bbab52f671ff1777054739a888aefa3651c57
+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 libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
+DIST libmimalloc-sys-0.1.39.crate 198523 BLAKE2B 371751d8eabd682d879a4d85b163d3c2f3dc3968232241cd2d7b573a5b78164efa6cd90c2b81d350c69354fee5676edb3e37f75f676731fccc913a83878c7358 SHA512 db578da8722b82eafac3b587b2db24cbf95fbd85a25b7ce30286deb9eda6820b5d452ece7c3126a2d8c96400941dc3946b4cb2f46172241861405aa09a3a2451
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
+DIST libsqlite3-sys-0.26.0.crate 4840390 BLAKE2B 2b6ec9f110afaa17cfeb787f1d99a5bf5e6f062502ce80d31d212dffebde3be5cc9f4bdaeebb9e0ce0f363b0df5e86e5115a2c6e528710b1babb628cc1bc39fa SHA512 8c1cbadad1b14979555121423cc8245ebb6cb4bd72ef93202c5188c4d799cfb35f7ed8e9d7ac420a86cd1a3da7f15426aaa928b6c16510592d8739b54ab324dc
+DIST libz-sys-1.1.18.crate 817891 BLAKE2B c05a758eeeb1063fb369c0e9de6956d398ea4755a59bb9be889a672676510ae9a8cb5f1cd5c07b45d50397bd392704f4486930433247771eed6232464ca30db1 SHA512 af7f037a4fed00ef58d49db444e4bb3dcc8e979deadd0fce8ec2120aa2da74f3ea1fff5a372fd771b037e3814fd73ea2f193606d3fb37afa9087edac5a3c1237
+DIST linkify-0.10.0.crate 22010 BLAKE2B a5ba37568184bff9bcd6c7f76643a2eda12d458387adc90d2788be1359e64343d8a5bf63bf122a78531e2c1663d9e80e3574cfa9e0514289811ee206ae28fea9 SHA512 2770a06cf4d57dfe506866f2ca83002f3c43b95884b6cfa0f6132fe851ff74627af35d731294964b7d8770f36bd64713ec83368763701d846ea74cdd72e1af44
+DIST linkme-0.3.28.crate 14136 BLAKE2B dec1c43668cc6a6f59234a5957a9278c7a2c85896aed1e15414dc303a1b44ab45416b00c25922f5786b3bb5d2b779c937ccb316b022d1af2622b137fbc122bc3 SHA512 2b72cb3ffb9b0ca3d52add5a3326ef483960f20e44ddb18b0da811fbb78ff0fdef06916343852b3353260b7e5b7812e7222b1070367ae967d203120dbfb18a90
+DIST linkme-impl-0.3.28.crate 7002 BLAKE2B 883253f648dd2ac7c939e6e6cab31abb985a62589bb9cd5826926518ecd9d3b10dea06cef1d90241622a928ff5adf22244f52322f8e86eb5f4a2dfb75959f08e SHA512 25ce8dc92b84c24bcc7c1da9f87527efd4bc01027afe9507fd740e05488b0a2d196af0cbcd970e1cf3b4a6fcf0b19fcb5d21c3f3c3c7804cbbb64ed4acc359d3
+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
+DIST lmdb-master-sys-0.2.4.crate 175557 BLAKE2B c0afb3a061db4b775762742c932e3df3aa32209aa2da6f2f5c64d005e64be1884a375340f52ce1d27789b15f28ac8af8e4858c19abfb823b1b7ae11f9bfb9df2 SHA512 733e21278867e47c12e1b87427a6a99461f9dc0c3ed3dbe02b0aee0b1a6af60e934afdb9287946a88a9a3950eb61bb0c57c80616570dcd0f3cdcef08d7a197fc
+DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
+DIST loop9-0.1.5.crate 3406 BLAKE2B 629f398d74e13dd2f567e6528eee3f0a9b69e7256b34814a5418722728781bdd31aeb97d2cb226339e05880b5f731cb2892e83b47b5643b2f85aa48748690cc9 SHA512 0a04d4e2561963671f5aa1c9af09470d0a8d30bb02299ab08c7dcec70b1dd3f9380244a59a4da1b8b269967313d6645a154a3dbe92fbae0e43cba6e009e6b7b9
+DIST lru-0.12.4.crate 16032 BLAKE2B 7255bf86fcc001ef8f94c9d7578993e67517145d0e83adecfb1b5095faca200493a22361bfc8b9827bee07a4e5e150958d4a54ca3fde0f06bf733dd4749d861f SHA512 1d5becbb538f90414d320fe14d0d6fa8bb14bdce69b2e1855b360287e3dfefabc1f62685190730d11a4ddb843c2180dca964ea4a79606950f087c404cc3798f8
+DIST lsp-types-72357d6f6d212bdffba3b5ef4b31d8ca856058e7.gh.tar.gz 70057 BLAKE2B 56e987fb62ee832ce6049a58a9caec08293d8a104aec43cbd4800e19f11a0b01980b231b54b7b3845b265caf7c35fb987844f6dcdbf3370a8bfe64869d25a6f6 SHA512 3df8105950ca1d0b04e02b78aae90849937691e5d5edd00d24dcdb2dd06a53cb97e6fee09611d28289d53dde9f556ca722e4dc804ab398c095b1e144c7227300
+DIST lz4-1.26.0.crate 13582 BLAKE2B fcd08f9c45d28b74b133ea75e401002d0293607097301b4c1904563d32fd28809ac8b897d541412b24ad5047fdb46a4d2058946595976cee97bae8c9eaf69fc5 SHA512 d7df36012fb69198c80bd914fd6bfd7469e35cded512efbc0406361a427b3f107cc5bda830f68f5a9d7ef8d1026017b55723f9f5644cdd3170227d4e8463eb9d
+DIST lz4-sys-1.10.0.crate 355645 BLAKE2B 1921d745a93b0f5236fbf5d6bf6da3aae9874fa33a2e5f3020560fba3a5490c33ba1a81bf59902b1e52b26d1d5a1c3032a849b5bf1fdc7ecb45ebdf782cca365 SHA512 9e65fa47b8740dcdc3956f92f8056997a1e37a4bd80a50e60a9d33883a910d31d7e31c7c43e50e09bc191f6f669a0dfe621dc5866d8cf93cbd4d88a2ee23f0ca
+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_rcdom-0.3.0.crate 18284 BLAKE2B 7eed0326ec2eb1f0834841279b90a1c9f84cc95fcde5cf9ff22e08621a0bb8dd7323bbbc2a7e2979f0ae2c6f459447c5468e18595c55efc060bcaacc72fe0207 SHA512 2fc20392a4e3f7ab59826d0a03536fbad5507d3a31aaac42dd11646053acc6d3789aff43b63b9d4f3b535898640f5f10489d31fbe20b875efe68b3f08431a9a4
+DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
+DIST matchit-0.7.3.crate 30372 BLAKE2B fe41094d3de61e12e2612f90bb25ab21a56aed1658766b23e963b7ef1e47a8ec7d3b4804936eb919ee87ed38e8b822a8381417c93330aef51082d89f1843a001 SHA512 c9f22846a23bd208e54015142b4a3aa6f2275c982d667216598b8712616b7178742da6a870c954d3340c075274818919931fc9f06f090a7d6688066629f36bbc
+DIST maybe-owned-0.3.4.crate 14308 BLAKE2B ccdc346011033bf474d199e540ba1b1a0efff1ce62bd2f316f045f6ce6a53101f5a721d0084ac87d5b661d691d37bf74a05825fc5d43b7e64ebab8bb5eb34979 SHA512 f81f195fea63cac6bbc0ec16e02dc450143eece534f7267fab04605a7630c248a4ef39eb2db07ad4acec3c1327d35d2c16e258f3e5ac8fb04ad6bf670f21d981
+DIST maybe-rayon-0.1.1.crate 2901 BLAKE2B dca587f95e7766a0050b320cac7adb31d3fe9b84688c241c004824da684df0ce5f8c04053cc120d70e4325fac7bddc5d0dfc5aaf29c791b67503e7588bb81182 SHA512 6f4e0e2a342fc86b5d0626a08779075c68911ffd3f837ac6ab2c15c821ba96e50617cfc9df9d16bf96ae57fa1802c5549e21d67f79e4e1c3f10bce04b88115e9
+DIST md-5-0.10.6.crate 16161 BLAKE2B bdd43889aed114cfa97ed0c70bc97b89fda28b14033a0a26bc7309ed744ee907d59151ab92e9cb95f0ff0ca1cfe2af360c48f1b99fc8a246a25c803a4b444a0f SHA512 024a9e14aaf860e748f64dddbb8aec01bb9f40d702d8de31497fde1d66a663e97ca1b06b600d8a818a0c707d1ef02eb0f210befaeacada458acba69ccbf476ca
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
+DIST memfd-0.6.4.crate 12820 BLAKE2B 37d0de856475391aaf71cd52328fe39d2809a0b2cbf8adc4e8f2fdcff3996670a70d914b93e23fc34d87fb8e9245109891add7ec3c53f6f5b896b2ea60682f10 SHA512 aba1d2313d21b05763cce3cf83133a0b4cc61daf66637ae2df8494236fe1ff43e2c41081bc06a6ea9869384b59ea4dd52f6fa0c1d5ef973ece1adf45ede68985
+DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
+DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
+DIST metal-0.29.0.crate 3033188 BLAKE2B 05339d5a3d3c33103e9bef8e5d7dac1cfdee8dfcf1114af684e09da0c703db42c9e194c65513550bea26563a269168a28a1ec0ce191e48d6e5cec3de320ced3e SHA512 8e402d921d1472a738d54b885c6d38c8e93fa04372af115ca1aab697862a2ddda0d20ee1c9c6b6e2d30773ef66956ad28f4ff42b008ecd6b70b0de04f95ee39d
+DIST mimalloc-0.1.43.crate 4075 BLAKE2B f22e0d10c34319125ffbac904894e0e9623d56a1fe488c95d76a706bab047aadd8c511419ebb20136ede67bf6297019b3ec7f263a324f1dabb45aa4f257a6cca SHA512 f018df422932d5eb0bcc4c0bd91318a86ea09d6e3de51e76d8a65eb833f9f5185c759c1d734e78d3f46d9043d3642882ed3398354fe4b79a5fef05d346c002b9
+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 mint-0.5.9.crate 8399 BLAKE2B 5161188d3a455e5e479fd00468863fb649bc3093f5a25678e6872cc6ae05ef44280905b6e4b357d5b3f76b20fba9349d76ec191e71a784ba888fbc7e0210a8ef SHA512 c9677d1a22d410f7efa373a5dd60ee82cf78f1950c364ae88fdcf53d99def551182afec9bda7169a5c10d44a22e70357902d8f6311fcad4addedc2a8d5723e9a
+DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
+DIST mio-1.0.1.crate 102654 BLAKE2B 85e2fccd36ad7b9a986d308a5911c7209246d7fe035dbcf6f0dd8f89c0a3c925046271378aaa7b240e84249c009c75e55c32ae18aba0d91e432fc2ef34e51e4a SHA512 e3b98cf7d33f42198a57be4490732132c7b8dd3fba64c99e3874f3f52dfc926298ace992c0fccc5029f47fafa0eeccb460c77fa2f8485f116ba0f353321fcae2
+DIST miow-0.6.0.crate 27801 BLAKE2B 60156e9f143da8a1a120b79dfba48c2e3a51e3ff3f98f12ccd8c16aef6366431b9c9b3cbd69e8e745518497128b55a975c51d42c2b915c1717d3b7f9f9d14cc5 SHA512 b2fd13947f786b2d54a4c2055ed7f375234fccb5a66306793c819b78b0ee226b9a361570aca903dc97c6d8ab548132d511d91a8408887f625a1d2aa5538e1d8b
+DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd
+DIST naga-22.1.0.crate 592289 BLAKE2B faee39558c7c1362df4543b60ed728fd63175b8332205b89779a2c73543fcbc4f8d0f3faabcacdff1e84b8d786283af39a09c29fe2ada9b94b3242d45864581e SHA512 55cfadec3258a79995864ca0a9235600b2f99282ea4b3e8ff987ba9e992c6b434378354baded1853f5dfdf02aa038f80f8a2e72422873b7b01d264013c342e0a
+DIST nanoid-0.4.0.crate 6196 BLAKE2B 1b4aa0b33afa2f13094a54633767936c2d2e24f330dd01e711c20042c9580a764840c87bec7fc3079cb8c1dad413fdbb4404a7270a342a1f20502d50266b7b8e SHA512 448bdff00a39bb319aa498f5cd277ae2d884d313f8c70010da0fda2c65650e3df4962b6b899845e60532e14a84bdf8f0ce21c9f838cc3f3137cf4a532947b397
+DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55ca5662031204b999293d417e0ab2726eacff084dc6681ea5e46ce01335a1a5cfaa5e8bc6e602aacb1fd25252 SHA512 3ac650451d629852236eeb45dfee808acbea616036025676b47310100982d7e8317df647fe8649e7753dd0f57c501dcb3f7401c3d804af52ff2a2f50ace8cc69
+DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723
+DIST ndk-0.8.0.crate 79770 BLAKE2B 82ad3258f730bc26f91cfe231b3bb811de466ef30244b963c7b78f215cb396a50528129773a986121069d058f5b1d79e7aa8a18f4217e371428520f95c934301 SHA512 bf666942469ebac77eb2ddffed6a276098ac291d459d4b544920fa6644e9fe71a41e556d7d46ae2c23b46865d2825b08d0e2eab3bc3dce2e6f9b2d5786f1d9ec
+DIST ndk-context-0.1.1.crate 2205 BLAKE2B 6c1013410459ee13357877654303a04c2ee674eae77911d8c35dc7ebf3df2e8632440c26273f994f90f083fe20b4923240e3b9eaa2ae90faccc7e2f0021b6e0a SHA512 3e15db351492b3f1935424a4c119d878f5d771d6ca0cb6161e4105b263178e96e41cdf1e927e5f3c81a281f55dee25929a9cee911eeb4ff307dcd31fc400398b
+DIST ndk-sys-0.5.0+25.2.9519653.crate 307233 BLAKE2B 884f73ab15acf81b238d0ef06b66942949222506ff0f6deeb009348ac8870b0a8e74b4015ceceb2bf0611609ec4acd0923c2724b1240f314d0b56a42213e0b44 SHA512 380a6c0124df4bc2a835465506c1837ced58f1174ddfd89891c1784ea27508023543dfd229a5440ec1e593461e0e96b07557da72eff4b90032deb8cdf9db9be5
+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 noop_proc_macro-0.3.0.crate 2157 BLAKE2B 0be977f9820fe4cab4035e866d6ebc77a07cf634ee6889dc91581a9eb43f308b0fc60b87c8bcf200742bcea4af14a94c69c5b9dfbb32b95454219a4197fd5228 SHA512 a5ad22e815b8c574b42f7b70486a3fac319c24334ade74726ec07b976a838954d1de2d3632fc55ce6c8de2673e62b987fb4607a49c576f60959b1609e47b3771
+DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69
+DIST ntapi-0.4.1.crate 126552 BLAKE2B ef5291a32f5edab4b29648fcc73df30f993558e45ed862a62a4d7e85f963f195f0a74c9e61eecf928c8966799da45a23694d0c6a1ad5f7d9ab3a8bce86d6d2eb SHA512 8e32d45a508d20f0d3537e056f363270120980dc23564713306e36acbc12a6d379eb3857026fecc16ca75080431e06742e3806801d3e0a848a01f64a8dd4f2d7
+DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
+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-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
+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-derive-0.4.2.crate 14709 BLAKE2B be4abc3c51647f2d4ebe0c0619948cdc994c6ef808d768dd2b9274410716f524ec73c75440f7a780e4871f33055c81f800b0171e4b7a4e2214da5a3007393dab SHA512 55b951470a07dbce489ee43e1540056123d3eb7b5240903cd348951b81ef5aa5b2b1db311d1219bec8ad191373d0079bf40861e3f45380f8d8132f39d33b4f4c
+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_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
+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.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa078265e22d5d7200eca4f96702aad8b537ba772e5d4e680a6e90fa6919fecfcf37a060668b2a618bb01bbabf2a SHA512 60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda
+DIST nvim-rs-69500bae73b8b3f02a05b7bee621a0d0e633da6c.gh.tar.gz 47933 BLAKE2B 4fbb0f1bd14fcbc708a52357c03574e7fe864f4a33fd7202f13bdbc1527ecc4f14377994c2d1bab9806ca921cab9a6287abd91e70802bfba4526f12b71587238 SHA512 ff75686616e5e2fc2a8629c5a03922f5a97963da42054bfe2c1c8f54edccf7b2a0f1d624460e4f51a04ee6c228b174c7308a68ff504ea5efe10df0edacbb53de
+DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
+DIST object-0.33.0.crate 310775 BLAKE2B d994264d1c47a98f501192996a4d7fa8d2d33a0e3ac54e39bbfcbd105f869a62a7d4eb6c25501ad0d83581f40fa585f5faa05681cf27c987c07d53ad42ed1ed8 SHA512 68469449ad874447ba5e5a87854cdae602196dc19ece80cd0fdc81c5a67131fb8d9dcd0627b2edb1d62d4a602fe66a21139ab801f84d711ee3b1d6b4f8ba4d24
+DIST object-0.36.2.crate 324577 BLAKE2B 8e2c07215088639aa2727ea2ed0833bc6634186fcb4b6accf725059a20fde4394789b88c314b19483fe240b73fdcefedaccd7afcae529c658724083b035536dd SHA512 f5adb662c0e6e184a75c14181d70f3c9d8d6f4002fcb9082863c9c7a28f36d35464168c7447e63316c0227d38d92eec73240665afdecfa574eb625b040854ef9
+DIST oboe-0.6.1.crate 24588 BLAKE2B caaac8795247ee9c14f02e4c572605f590930686487d7f5f3195b4f1adaa837a024d8fe2043f90b97af7832f9b8624750dbe7def8111536a2cf1f154ac6b43ae SHA512 62b7573b685ff2e64d28337c3c08c556dc6355a11ad31cfb2bf3423ef1eb6a73ff38201dd5c116580b0a540b3f76dbd4a5347758ff40accc1bbd50a893cfdbf7
+DIST oboe-sys-0.6.1.crate 169091 BLAKE2B bd2ff90400c1a2602cdce23ae7a85528a4913523416a7a2cbd1baf91a07b067f0761a59753dd35dda622b1748415cab8c9b597404a738e6d5684b1efd1635714 SHA512 48378bbc6ad3d9cff907500bc72042a2063ea5a4a0493a577539dc7fd3280cb4e32b13785a793d8a3350656b7b898b46e61ecd20116b753a54cfadfee2c545a9
+DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST oo7-0.3.3.crate 48134 BLAKE2B 005b16858c152251f156681d2d52106aa0016de6988e369cb8463d3bf7f7bbeb5c5b0aaf6dcd8469d56961a623dd56ffc88583b9859d8d0604b804d670c44a63 SHA512 864893cd4e0772cc428781a9c42d4e199c506aee97cbef1a484411d10da6b84f7243edc90fa0829faf6185325af067e3c0db60786861d633915d04bf8db76900
+DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562
+DIST open-5.3.0.crate 24718 BLAKE2B d6e72d020cb8fdc6c81cd37548723f46bcb411733d4873cbd6735f9c18c52bb262439bb8d329b9534e99716e66b0a5c352c8be192f24e7b54b19053b5ed3f25c SHA512 00d149ae8b56e5f03c16099ec3b663afb64187b1f81840324e02d46ccdf25736415c3da9759996c06afe420f26dca78606eb193ff31797d950e7cca505753a8e
+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-src-300.3.1+3.3.1.crate 9783559 BLAKE2B d6717a6d1b09cc277138eb9b9d035cbbe584ef1c6f51c488063ed73f9d8bc20fc15eeab2ed5d5713c6d040f2e2d6f5c31f233b56259ef3b7c4d15b446cc5af32 SHA512 4f90b906dca08664bcf5784c8e4d7111e9f61029f7b9ffc512f3904900d4a29918d14cb6f57845f0c7029ee31e551bd58048c3cdfc8ae5b4c0f2c637075bdc40
+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 ordered-float-2.10.1.crate 16029 BLAKE2B 7c6920160e52e377ba44ff63ac679208dcb3782c1ffb802707c54fd285ec22bebf80edd036753ee13ac3e577b0b7114241dbd9ce5f018d0d6d31ae21df1cde48 SHA512 bc659ff02660a12c4340889ca7ad99d569d8e7b9043d8e8ffae912da0a5049c1a837c7e4eb0a39e5ee3bbba9fdb498af6236e56af6da841c97c2bd4ca4c39090
+DIST ordered-float-3.9.2.crate 19788 BLAKE2B b5e7326078501f7bd685e9363669714d413c9fe148d81ac2608cc2a01103fd726d6073717bfe80974c648040d169d80cc7685836c3a2d69cba71b8e71370bdcf SHA512 0da6c3e3cea03b1b5b26ed85b19ba1340f8c062160b17af0aee299d8ca38fc68d84743e146006e757943d2b66bda6d02e1abf104f1c7133ed70446a6cacbe24f
+DIST ordered-stream-0.2.0.crate 19077 BLAKE2B 581285d32136bb9c2134f405c5a2d67c952a36eb3613912be029f2826b847919188e1b479506b46f20e0b63d371f476b99d9e7e1ee8d47ddef7b4f48451b0e3e SHA512 99976f90637f0daedeae05d4270d33bc03fad1c06a85bcf2cd7140b149f76c7560d5e60becf05a633a62dc82f7f65900eb8f510c62aea4e630b78c45dc76d83e
+DIST ouroboros-0.17.2.crate 11288 BLAKE2B 5c5929f2d9fc438dde6db4a5e5ce277cb0ef9de9b079f374c10e2bf768f9a8c7c2fe5e6772d8549bc73ec0ddff0fdc7985a793b38dec09c318b08d3fd42d27a8 SHA512 977a062c621dceb5633fbd40f650bedf0239eb1b787f86e9a5fc1e5820643b06b4a8f85c1350afa4612371885ec6f79625afab47cd4e24f779ec74168a5d866d
+DIST ouroboros_macro-0.17.2.crate 21532 BLAKE2B 90097d28dbc774ff354cb9695dbfc053d2185f60d8518256fe2b783ac9fc86025d65501e5d43078b7416c633fa62f1f4bdd9cf84cddaa064f9e399f9c27f880d SHA512 f00573553b01aeb89bc461fe09d726979a301fe039cadebeeedf99ae478f91ae63284dbf5a0669379806b28c6d04ecca3de04dc049428c3d03158fb96bc5da3b
+DIST outref-0.5.1.crate 3957 BLAKE2B 0a0141e8126e509357a2b6fe20ab745afd9b44cb529e51ddc8c3f3c6620865014d7d898e9e0159724a3b04d26b032310025bce24b7e551d152d47495def1c86f SHA512 1ddfbca9dbf701674c4c274e0b06f0dc8a844e0c544279a21ad2163746052b5dd7f96df698084bb32869a99aaa841f761e56de74feded16a56c3476967b2b392
+DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
+DIST p256-0.11.1.crate 67282 BLAKE2B 9a0373d78c1ca44c03bf6ad415f61da76e2de3de1605b0dd0eea6f30166e563b3b9b8cf8decb79d8c8d263857eadebde7f99685025e0c682614164ee091f3ae9 SHA512 a8281c3ea6ac66e8d12c872c76b2c9ca9805e9546dc3dbf46e1cf16b62ca7ed69ea72cf6c68584b2d3ac1ec576dd7d2f7cfafd0b7b170154196348bb3ba66bce
+DIST page_size-0.6.0.crate 8479 BLAKE2B c90699135f158a0dea1acf80acfab002a4f4971188dac853af03c0bb79c2ad5b67f4decf7df5157f390cc3fa5b62a265c6e7948ce9ca9e7f2dc3595c60f07ac1 SHA512 204faf102760e9f3edc480302a7d7e6b995b7a40850372ebb332cab82b9c8301e761351c7abce93bde9473ad9e944bb07e6c4447d4ee1891f5ae2c261b74b8e5
+DIST palette-0.7.6.crate 230913 BLAKE2B 688eec3839b9fadf6e226a01ed063cbce1d6af9176e20d565b908351d3135a92852e76de17411238e60534895bf43cc585fb9ba1aa76a0683293b4ba6482558f SHA512 c43e39992e796799fc2044e39a8461eb528140438e40ecf64af8ee2f4854a520594be001f8aaa0f4bb8731fadb77b60b07c16592e87924b8af6c6583b0a344b5
+DIST palette_derive-0.7.6.crate 17073 BLAKE2B 6b225a8f93765a11e4a70c97783b6088c376cacf9c9e237996de4b123dd42dd3a8368519d5ede00323aeed5dd99142bef52c58be3907333963c7012176286ed8 SHA512 29efe90cdd53532015b4f957ed3c1018ee06f55574d4a7f871b868f77b0d9e74ef48da030c4981327abe9876a4664ad78466177fdb49034306e325d4e80baec7
+DIST parity-tokio-ipc-0.9.0.crate 15905 BLAKE2B d701d30d2bf8debe92ea8130b94f4f419e899ea0443eb9a77bf8f93c4a940a923550f28612ff773b9d05f0d7052f919567a0875022448b58da836d3c51d920d4 SHA512 56fa078ff1cff7e1c0c30a11c46c11acdc1172c52e5532f72e79cbc5048865fa34a76cff7a38276c6c0cc891a60bf8dfac6dbb920876258430b9e32bc5f1b8d5
+DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
+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 password-hash-0.5.0.crate 26884 BLAKE2B fb6ba67cc28ec5d568fb264cf419e5514fa178a7e7c6ec8d041c880ae1b6ba02ffb116c8f31f71a0140789d4c895e57e8c92fd19009b4258b1e62e840bc1e72b SHA512 4393d9b2ba9158e8dc5192f2f88ff8a26e02b2b18268aa28b7456c7622c06a005fc2230883b89c1dbc1cebc06570d4f569801ab6275cbd14ec4a073c2c63763e
+DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
+DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
+DIST pathfinder_geometry-0.5.1.crate 11583 BLAKE2B 36a32f42dd39577a006e750450088b3126f359cd47b0f32111a70ea4b0efe157858a672fa62e9d5c59124895ef98e0d7ac4d21596006fa0ebcf8e17bae550a9e SHA512 e53f658ce9764a96dcc55868b51e63dea3030378ee0b76686f0cbb8f12bdf311c394e9db96bf1187b2dd6e7f4bedac1ce2babfa2a0352c1d56093ac059299272
+DIST pathfinder_simd-0.5.4.crate 29951 BLAKE2B 28d19f5ad8a2852a7b3fcf4aefc7ba8dd79ffa27edb72b67c29ead3cdb154640a5197699d9da2de8ae0179688a81d38ef46e8227e558072aeb98e492af8186f3 SHA512 9b50742cde733170f62898273177852bd5d86aa5c7e1a0abe2d2b952a593213a793bb5cc4a36719f44ec70d9bea2bf0c8bcb3dc0ce14fb8c40905fa1d4406fa2
+DIST pbkdf2-0.12.2.crate 13906 BLAKE2B 062731ec8623719543e497dbfc23b909c8cc62a521ba927f5cb628290c1b3898a0b6ca7677d733b2eb0c563d7af4018981f4ae533b5b3a23c312ce98119eae6c SHA512 5360a661db8ef11586badfa2623dc409e34f3e2f79254cebcb5fb68bfb20c3be47def7bbb16f7779facb42a92bb789cf0e71947d1c4c6f5b1ecb8d358f6b41ef
+DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST pem-3.0.4.crate 13040 BLAKE2B 33126cd0feeeeb8b57691c50f6535c43e853b9835308d69a5afb426c7a738d260a67d5c46f091ad73e934f0347d976c6f65f88b2f7b1058eca542296191bcb9a SHA512 be743157e11ed76e5a9a60f5e58f50277910ecbf12df492b114b4211f1f1d69555702d955337ec41d368566ae1697f550e3705a195105068c617b9392c43f56d
+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.11.crate 123779 BLAKE2B 23bb1f3453d5d839dba7b3292806eb2d327ccafb1b1472fd970262a44c0abbabfbf3316ca16dd5526177bcb67a701cf79fa86b68fd1e57a3d875cb4b7ff89ad9 SHA512 daf92b28d8757d0c41e347668e54b90522d654a451ba03d01d9aff9b22d6c57b6a264237c5c8b1340e45605626fe848dad84672ae2e83604ce22b2c89cbd08ac
+DIST pest_derive-2.7.11.crate 36320 BLAKE2B e81ed8b60492da9612d2208c6cfa712ebf8c6ed7993642bfc4fadeaba10a0bc16700bce012d34d955104041ed8bbf659d16d9b86eab52342875d4c6148e7f60d SHA512 96f6b44ac09785ce5981f082ddf283a178c676a0b436f9b0cf7afddc8be38583f0512adce83363f0ee8ec4f26bbfba01e30dcb17d9420adc00b0a82c10349b86
+DIST pest_generator-2.7.11.crate 18415 BLAKE2B dd65c69d8d0ff343d36e31e6a4f4e11aeb01b1fd23d0db06d90f506ec2f2bb2c50422f6a73b48780e16e07c8d0addb374dd09cfabaf6230d5b2ba409dd3fa6cd SHA512 14fb3bcc44ea6253cca86c78166f3f424a312e864294d0f1aa12029641c5255c106d69b1712aae37cab443ab32077b1033b97c0d7650a7496c191748d28707eb
+DIST pest_meta-2.7.11.crate 41551 BLAKE2B 9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e SHA512 a9edfaf3fbaa8cab0615b16c631895f1442d3e64561bb9b356b5a2150c1dc3db269375740a898d986fea399d8f7c8f50d01325ead8d976d6d165d6a104e281b6
+DIST petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
+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.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 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-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
+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 pkcs1-0.7.5.crate 35790 BLAKE2B 0cee88bc3406b60d225593b4b01a4eca11d14a916bd589843300f6130729e7926d2af32b9b7d03e98b6934775e30e5627754e7e32e1785f59c8ede36c28ea40d SHA512 a3584ce492116d6e617a733a0d3d5696404aa7b10ae95070313b4a41dbc21d0940850870b711e375ac8b54fdd179b4083d61c48e902e6efd8a3a11cb630076a3
+DIST pkcs8-0.10.2.crate 26360 BLAKE2B a62b5b7386eedba6fcbc4cff2b103b899dbf6179101445283f9076080489129543561af1ad6f09061564f68c28954262e49d0bb3e182f2ce7495e19d6f34bd5e SHA512 87127d51f0e1fe085d46b30394f2a580e857cd64f5c6fe4a3ac3b8871230aa426598dbb007e8bdfd5d729b99a9c0b4d84116f0768886605342d2ed112c51dfa8
+DIST pkcs8-0.9.0.crate 26214 BLAKE2B 257654e1460a58266ae2bca49dc3cd2ac5d795e81f613a22e8b5276cd99ab5067a5669b809a8bfdc289be325b675eef75b9163aa638079561826799f05f337b6 SHA512 8e7a239a8876b61eb0969fb65f4fa825b031c6d82997a8abaf7024427071d9ee3ab72381b72d80faf13d1a679c5e16a6cb0489bbab7fc39e716b02be8b805af8
+DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
+DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
+DIST plotters-0.3.6.crate 147577 BLAKE2B 835e4bb81728d0c8199d33269d36e534064c8a7c2ba21cbc6d13ecee644b5dd6f4e8f743920770978133b70a168dfeeacc7979609f6904bbeb217c0361a17c70 SHA512 373a0ff61df8feeaaa0c32001a5354c7e1c2dee235aa76d1e8d3f98dd92479da07260f9e09f76ffd9467893eb6209dfcf751206e0603ccd21041f56d434560e6
+DIST plotters-backend-0.3.6.crate 13669 BLAKE2B 33c8feb8589ea4c3a9bf02a28b4d841d5e716e79db33bdb923caa21448039283dc7d926d10fcc6058bd7ae503d71b2fec5b5682d0265f899f9f9ddcd9f4b125e SHA512 d25418e21560b9020cdbf687900d306c2fd03c4517ebf61c5992441674f4be70ec0b36ec40d065e934e0f148a2348cdcee4508bae3fba8166fbb3769312b66bf
+DIST plotters-svg-0.3.6.crate 6944 BLAKE2B e74d2bb5053b698f2a07270000249157ac1e5721e8b290cd60c2c840385e4f41d110be407597ca02633bdc5bfc3a2f3ea5c0f0fe0f800005a04741bace3a4e54 SHA512 62dbae4e7b95c01843c2470776a6a5c45df332846970c688b089cd2dd85dde146cec4cd57e42f9dbe8e994be5fb8906a47a0f8d3cb4a29ac3703ae668d374997
+DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
+DIST polling-2.8.0.crate 43554 BLAKE2B 8fc5986db7c34989954bbe84bd69d1f61c59b890d4e5fd21a20f3861bad750aafe2d1a89b3181df97f3659f1a6c980a92e43dcb9ef9e1de3881518024caa6f58 SHA512 c22dc35f39f374f21483c987d43108472dbfc291508e3f5e1d76e2c466f40b396b1ba7c222db5e5a2c0e670e83b4c34e0fbb5c3e93d86435b8a2ebb0890471a2
+DIST polling-3.7.2.crate 57988 BLAKE2B 4a957ac93d2d4b1d1cda0525b42b6f5b9a3a93b115fd107339e7cdadeb7344833749467ee99cd7c77de0a065378faf89dbf85520fa1a71b67f71e7f9dd5eaa53 SHA512 d98ead0c929458f65ff75b9712ef9665878ad2656c729333eaea4340a236f67876b1c665eb683f695c9f12a89420401e1461c39ae8297081f4789dd5d2a7562b
+DIST pollster-0.2.5.crate 8817 BLAKE2B 182ae9b7ee43ebdaa4de886ad72335fd504ffe6d15d3d2286950da0f5bff1e16e79c60f6885c7b457c3ad81683ca26389631bd8fcb9a5bd98c10c833c0d1adc8 SHA512 67b1750c5a0e5f09f2b70f1de0bd29009bf43568bebe814714e9903a3afbe341d78edbf3210c37ad8b4c9196a0b0af2334a0795dbe6c1cc8cad18bd35f48a83e
+DIST postage-0.5.0.crate 431521 BLAKE2B 641efa40f8edfa53e9764f8f89fabf150588e293d62d054b2ed3739e30af409ba4f40b6011aa1f8140db9d651133b2613145a0aaa099e11d6918d506f4ed06da SHA512 f30825d5326830047f9d1dad63c63cc8655a0bfe92ab65ebb2338145688dbb9250ca0c53923b038d4ba04b687898eb4accc1040f3d2f1d158c666e192a528c89
+DIST postcard-1.0.8.crate 53813 BLAKE2B 166477a96ae4f76589ce4cf2929c39244db9c1bd907d2f4158710a99008683b6579bb9b25a8e3671ba2547b692bde0aae991f0dee71123bd31eb2cd27d2094e3 SHA512 7f6eee1ac5148b66411391e4c9436de0696aa878358b5185590f7d77b1f7aa114124e4683e118491a0ef36640e498ed751005c49e17eb79729a1f2293a47017c
+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 pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
+DIST prettyplease-0.2.20.crate 57809 BLAKE2B 7c0b96177508fb61f76e45cb1df901f09a48611494d807acde17fede4c62f79053a09737ab6d31562bb60edfb2edc43028e62a2c4136ed799ab247086531db46 SHA512 fd6aa2cfbbb953227653eb5cc9f48d8ae6a7120026144578a9250397511416af461fff9b3f4a0fcf565d9ae589d4c0ed7523951ef36c491270d740efb61427ec
+DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
+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 profiling-1.0.15.crate 14255 BLAKE2B fb2281d4a8f09896278f4aabd91f054daee0bf30c58ff03c740daccaded75c79c2ffa838d5058f5fafc8d21d12c2b18470a5018b67fee931f4fca2f9319f0036 SHA512 3f944c6e219e2410be4b555c4421fa26cb4b6ebdde3058c8c191c12290ba1009ad28f2e021d1d86feb71d29bbd717050a6567a2ef8b40a5d431fb8ca1b03925d
+DIST profiling-procmacros-1.0.15.crate 5956 BLAKE2B 780c37868837e782cbe2ea4ec7f81c2ed04c947f1260d6917bb6f61a64a8fc15456743f38164874e6196dfb8dbc1044ef55671fe7ca2213df619716d6018ed9b SHA512 3cbe321aac42213ff4edae0847d0a5b18cd6c4ff1fac651f0e750ff189f615121cbfba8a0fe5ed58984933b9a671fd0a55120dada664b77efdf4c9d945ad5cfd
+DIST prometheus-0.13.4.crate 84650 BLAKE2B 5923e6e6fa6923d15d6c5bafdc1f1efbac6d7f1646d7a098a6cb14294490e7d9219a024383e96df0684ac5d3f57137960ae680ac19932ed8d63aa89a3dc91e97 SHA512 3ca6f9e29cc40371c08651b3cb178beaaba222594781bb2355db3631040c218a72ad05917048fe5dc712b0c6e2dfc61c1bc4b857a0ff043a0258357b2015c6dd
+DIST prost-0.9.0.crate 25584 BLAKE2B 8d49bc8f80c372697195c10e88befe9ca3e8134f480f94e1f165a537c4fa60284dd91250157056da7d965b16f0573e7b3fae342164711685a82ecfe66821bc8e SHA512 5ab2bfee3bf1687a809c44d78069aca32e426450a28b00adedabb0cdb486ba9dbd3dfff0bce466e47b73e3a5ca9aa3f6a6f55d7e9e8a1653809bdcaca9164200
+DIST prost-build-0.9.0.crate 9947797 BLAKE2B 4b0e9f411a236b265481811421e4db601791752e604f803743873fc06adfc96080ab1ae07e63617aaad5b09bdbc19e64345c8367f87b53507082c94d7b19bfc6 SHA512 2c48cbdfde95a3626c4dbd1d7b308051b2bce931448a746aa1e1ec9b981844f2b90ea6f3b7383d8b358ed6ad225cc280bb18c4346bd0d7810c206d620a03ce78
+DIST prost-derive-0.9.0.crate 15266 BLAKE2B a52f1c8066c081f3717fc5824305d57636c9c55e7a67975f701108fe52c0949ee92a1b24602012eea4e79692e17253c9051d9f210a2abf123664a367d4441e74 SHA512 cc7ee85e5884c6c4319bc4347decf22ddf357eccb2424f6898449255cc80545ac62448d859bcc63e2d48d54b8b78130fe8084a43fd7cf31df1b03f823360902b
+DIST prost-types-0.9.0.crate 27403 BLAKE2B 792f4b9ae632e50f38bc423c5d19240b0aa4e6a5b417599ab30a4b09c3e79fc9d93840cf5404383eddc41535b12c8994c57832c880dd0dcfb8993c0c189fac55 SHA512 246ea50245bd44591bb64ff39fbbeab38737564fa974c037fc511cf72d786190e22559fb9bc905e39a99067c4d4db0b7180e484fb8bc79d6849d44281496dfdb
+DIST protobuf-2.28.0.crate 167541 BLAKE2B 3db5e11d458f54fe0e121fda6ed4c1949f8fb0488148c48e512e05cdb3ca3e2fea4a0a0e4f22b312eefb75d3bdf0ef30fcf3d865ab5c06caa8d11a8b96f44b32 SHA512 14e87f5e4039eb98d473055634102e7d8f79d294de0e04e0c0423dba6e34abbb28b1f94bc2d96ab16d3e02e770fe876b4c8c3af8835a43a8448514efd0b02312
+DIST protols-tree-sitter-proto-0.2.0.crate 33181 BLAKE2B 392480b2ab4714deee0bd71823972760a5ed33781036c547e629f59f2418a31fb96462fe3d4311395429e2743650ada1a2c2db46c5963aa47f33521bc15afda6 SHA512 645bd1e2030f521d266fb1f4d2d9f85bf98ddc3f4be17baaad5fa3c01dc7bb2276405c431b27e4c281d424a62c6775ae69cffaf663049c45236f7c329cd00a6b
+DIST psm-0.1.21.crate 23126 BLAKE2B 5972b4bad729d3c8842d4d616b1a469fd59ac7cecac5dc5754f084b7f2c623f715f302a9132cd146f48f323982c837a63cddbabfdc97c73ba88ee60df3d036da SHA512 33e34bb30efa5ec700c135e11fe03447d56e6f0dbca5536fa8bf9ca2c605c65e2dfe0a2a79a0bbe08eb2d2a37e569e31def340e1187bc25060c2f0e6537e3e5b
+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 pulldown-cmark-0.10.3.crate 141746 BLAKE2B 46a980082576ffbccfee77ea66dd55fdbc4729e6931f553108a0675aba20072f8fb342749bfdfbfb283f72e9aba6a8002c347de75f05ef4b89ed35a23844a3ba SHA512 ffa5d116bce2b480f495a0aeac106961c9c79a2127aaca9f75b759e2f2823d253d2bca0dcd5c1f095c16c8e952bdf421fa04a26af53d80095923a5804a274cb2
+DIST qoi-0.4.1.crate 71135 BLAKE2B 8b4e2ebfdd6df425efb1326912e8db02258e570320fdeef465aa8b03f3248cd811bedaa17c15902f851083cc1db06a2b500aeddf734345eb25af0d835300b2f0 SHA512 884cde33bfb2d02716daa5f309890093bdb7b3f53eb06aca0b6eff0b7a66fd67cb8b9acd510d19e3ae7718930add971e871532a1605e4989639bf72f59329377
+DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
+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 quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rangemap-1.5.1.crate 57091 BLAKE2B 2fde0bcf53cad7c90bd39f6bc85f9d0913f9d772b93259b563ccff7cf08ff22df6050e7838122c8ce1ffbd87185f2613bcc1d175dcec4439835095133c8bbef7 SHA512 a78cc008bee3468604df91e18e1a03a6d1701c1ed96f4dca5995a97474f3d335bd6208f0ab2e6c616f501d39da86bc30a3f3913ffbf4796be45a7a9ad1b1f160
+DIST rav1e-0.7.1.crate 1472522 BLAKE2B 9492de4c9e050fba359918e2bc79958295b38cddfcab501ba080740b9608009f131f0b79949d5877740058b4238f481dfcdc06d60dec8a677252f668a35f39c0 SHA512 23b0f5827945bae8b3d2109e46d67fbdc85e961a5d3c6a0e0322ee8c568d7b807f62b0b2abe199bc4eca00dd5eb5bca0bd9d509b2b9ff1975b38092224850ee0
+DIST ravif-0.11.9.crate 11324 BLAKE2B dd29ab62b1c1c938031b7e9422c8093277db6f221c0c6fde84cf088297f33cd3af235eafb1efe87c61b38a7a2cf55e92f58a5101e746bb9e38454427832c0237 SHA512 fb125bc5422d361b957b25835d3750e01e98eb2275ed58eb5d0dc3f7a7176fab4a61ab2e71a321725452367de7f025d46488156f51ed774c3ad362c2443a04da
+DIST raw-window-handle-0.6.2.crate 20234 BLAKE2B 9bc9b1188cd3ee8d799d45908de10f98a4069850e7855c1f7db86ffdcf49661f8ff1294da2f542fe9c09a3e8551bb34e2702f6a88f85306bcf8a36e03bfb738c SHA512 41020ee56615607aa0cd75a3f09348f3255abbf8705d68f001b3f2d7ecdc6c4f5ee060e97c4a2ca08607892e49d2ef009ea4f3b4f3c6256e593c6b66f52ffb1b
+DIST raw-window-metal-0.4.0.crate 7629 BLAKE2B 2438c7ab600784a0b53ba981662868a27aee1987948495165553011883e225d9b90632c906e2701b0ee8161183b990b6a8edf7f1428bb0fac9a1ca72a0ec8aa3 SHA512 4828120239c1d596f757e49926dfb253ab188890b343958c5cd43afa97b8ef16d4c8e401393cbf482694200fc4383394c19d606650e74b8946fb7cac3a568e05
+DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
+DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
+DIST read-fonts-0.20.0.crate 300848 BLAKE2B 43b44d9046effd5e612465d1133a44621c0343af2f154ac5aa22e84622897941af07ccd0a9b92b2a5a380e28fecbdd55e0c167a9c4b79eddb03b0730fc670718 SHA512 7b4ef29b85bb5ccc51f51467eff479a159bbae31768d3278ff45c88f26e540089ff9495f80198724ce58f2870b4c9d0a1cf135bc3d35867d4a5e3e115ff450f3
+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_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
+DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
+DIST regalloc2-0.9.3.crate 120867 BLAKE2B 4991ce48a1ccea5864674c65fe22c6557c8c4965cba7ee03071c439bd2a2f16a4d8323b6605d7954a7d14a08b5755978d97ea6622eef95f3304db4947d39d2d9 SHA512 b1fb43273bd9d6bb1357fa0c0d427d4a2c207a46cfd6d187f782df53d5e9111bcf27d57dfa63af9cad317ef2aba766523a8de957c8b107879f04b2c18f0bd06b
+DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
+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-lite-0.1.6.crate 95278 BLAKE2B 02b9cf7758e6eda37384cf8d0ca2560bc0ee595015c17cc8a230f7dfa365305eed8d5a99218aa53ef49fc62ce1158014ab81a7c8497beea5a3729867e984eaf3 SHA512 98b5224ae530c78ce9f1981f31d8d9ab5ffceaa2e391ee33d74e7fd21650bc5f40eaa8e627c596772cedf084f37f0463c57c9bb1b7180473c6d0c5f95906aa9d
+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 rend-0.4.2.crate 9324 BLAKE2B f62ec0741ea1de92fe9a92afb9a8ac348a92663ec1d8fb165b7eb60b8f5ed9e58c5f1c8c789ef5e37ad03c473b3452e75a56118516e9cacef13743789664077b SHA512 2df17191ce710e09927f6d17fa5e3432a154d605cf3b58bdd6a3037d69cc0b017007e23c16526a8879a89cc49e3a47d38ae5f6aca8b42cd05624fd15c9dc3529
+DIST reqwest-0.11.27.crate 163155 BLAKE2B 0135a99a42400d601a19299d379e28f2df7454dc85864bf3905a8148c908fb1b0f363cecd3fc2ed0c4ba0c108739eb3ec5116d511bcb73530bbff6acb10c691e SHA512 95e5c2e375e345a3ac9d4f4b4fa9aec28f45a457c1615d303d4b4dddb639749995ef2834a6f8659f5f0cbb49e0876e89c9925bb2b2ba62207e393c9b12e58ad3
+DIST resvg-0.41.0.crate 79394 BLAKE2B 2575fdd552aae0d33ed8cc695500a0206a1d82c01254473fdb6b033450096a1a107fb2f7f6fa7f8521db31044c1aa15776b13a613eedc06a8a9d3ecf48ee552e SHA512 35e968ec5d3f0339b136b3fc15517433ae7a1820fc4d66440925e1a42737b2c0150080949f3b9534a00d510890021cc8c5789a950e138205c469a386408231e2
+DIST rfc6979-0.3.1.crate 8460 BLAKE2B d030f99cc345d2a468e83bfbbe66c703a1d8f3653ab83b21894b7e40232667e3ef914b8ef73d7c4afe5297bb3804a625cb2d61f3a1d7a0339520ea061433f531 SHA512 66f7b0ab4217213b2b109b88fcca4e800f43d8388be876bb1f1c61fdd2ac2c765011af49d3be4304e1635379ba3106d441edb853760fd05b48e49afcefaba66b
+DIST rgb-0.8.47.crate 21314 BLAKE2B fdc63b42274830771a00ee9ffe120d0b5ed82045c4de01476394065fec68d40dd3851e6c6220a988138c881a83e5c5c7f98adab503857bddbb8060875d9c2bbb SHA512 a38b146fb32fcac6b722ac992b173db22b1f05aec3c6afcd5f4c7ae7a940083c2e17f25b2f8593f9b118b5ed56feaddf208a457ca99251108e55c6fe60b28d10
+DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
+DIST rkyv-0.7.44.crate 115686 BLAKE2B 40ac889cf2df6e5a6a10dc87e965b00c9ee0ae70a638c58ee950854daf47c96b089287488197f0ae9934e7e8f18360d4485345b6f7cc4b37741f2483c09aaa33 SHA512 8401efd3bd442862b6c4c62f22289191ca9cddab8d67dd6361c9f5722e4265c1a3941be20108822480fae8d567e7b2b0ce1d66200fbc5931d775225e9d6735b6
+DIST rkyv_derive-0.7.44.crate 18912 BLAKE2B 25051c68fbcf778ea432139f05b80a4b0adc9618cb16af50c0cdc5ac9a18899b2cdcaa55bb20fb67ca4f7343fe92111bd30d2f197839c887da0c903f2018f842 SHA512 f4b56d92b529a4b5915799a5de6b4e3ef8d006237b43ac78323fe2ea774a9c14581c09d504dbf31c58494ab2a56039b01ce646e9f6a9798cddfe5b23a400e663
+DIST rmp-0.8.14.crate 29687 BLAKE2B 8467f30a5c015798bcd984297c9af33b5cea52b775e21d79322021c1232efadf3fcf9db86310a66a22cc84dcec2450da410d7308be6e723279279df98e922a4b SHA512 f83634cf6a9eb9a905b55039b59efea72b0f5fb88aa92fa008d9a867812d06d9dfeab8b4ced5047eec66568742e3d873ea35e57e66da36f67cd266be6b64e00e
+DIST rmpv-1.3.0.crate 28514 BLAKE2B 9ece520b44e80272ff2057bd5cd9b679159502da94f2d108bb811bb159afc3de8f1ffe8bce1d211f6a5dff60744ca6871e858aa500f73aac52387d8a5f77df7f SHA512 fafa1f11d47076f35a5bcb9508ffb07ac20545f9f5e81bff4edc0f34a000e84b09be2a41e5e2d8705bee78f7b869347cb5a283e977b0129eed55611eeb38531f
+DIST rodio-0.17.3.crate 59247 BLAKE2B 93b3ec6ba9fe882b82d90a91b932aea77491902074d8ce3e16cb4a1f0e78e8b1e14bdb9ef8cb0612b65c07b43f241c0af31e1fbb05fc739748b224f1434ad4a6 SHA512 4bca84164e2ad9c5f6b50152be436be8b2d0842c75b4ea50270047fd98b802f6b435a30c28841617c516237325c1021136662d57a92975b408b8d1c4d520a457
+DIST roxmltree-0.19.0.crate 53547 BLAKE2B 0bf23bb050dec29cdfcd66bb231ea81caab40aa54b015c5480fde7dac899128438ecfb10d818dde456db8ec4cbeebc7f32f3c8ff17594b6a78c0f04f0361555f SHA512 c8eeb974d797316a8dc332c4068b2850eee124a13b0792cdc8acaefe521d8b40161f9159bbfee2866ab2c4f6133ceaaa1b5ed704a5f0db5ae3819d76042cbf36
+DIST roxmltree-0.20.0.crate 54594 BLAKE2B 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603 SHA512 f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
+DIST rsa-0.9.6.crate 80048 BLAKE2B 0021065c262a351c3c3e9e63984442e9ff8e739f0f60c79f0eec031fc3ecf928756a0da656a0eeb4bcb94cd6f10ced2326a83666efba3b85b8a518b0aaec3d18 SHA512 0af7737181236f0e5544a83eb41d7e780df1a488b7b782b2c97eb4eab3dd599b86d18adcdc69bb56f9aac548a24dc88806e7bdc32fbc43c33b4d7a9817cfab9c
+DIST runtimelib-0.14.0.crate 26325 BLAKE2B 2cd0a9313e146fdc25ae770c0887a2cd2a924bbab3a25233781bb0966837790ee5ee39dffd1dc7694721fa49ce1cb4814a91412c0389f5e38fcfb06d01e8819e SHA512 0f7a11b7483600cc945f5f6acb7b1cd5b0fa820c9fa64f3d49a85cde89424c8b093bb41ab22201d493dad3703966a5c1415bb04ede734cf5a42c36465fa8ff9f
+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_decimal-1.35.0.crate 128340 BLAKE2B de57ffa9901ebf325dc3ae80226b20780fe6611c3a317419667940f55eaab01c4099abbc484af67b0d050880f03922de1861b7d624467f52d4529b9a1aeee7e6 SHA512 17ffd08f67305e428820d0e64ee06a381eb026f1ef1903da48f26c079505365c122d3159ebbd7566261ba3abb5360b8e80b51efc6ca5d182a8d68646aeaa9dcd
+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.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
+DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
+DIST rustix-openpty-0.1.1.crate 11478 BLAKE2B aa0a3d7bc32106abd32c63ac079cc8a875d9bd24c7ead610d05d8ab42670a7336dee3799a53734578d3220bfb30446135f277dd70ce7e0a1b61960c227f79b1d SHA512 8703471173aa17ba82ecc6f231c88f13dd9a5486e7a5931071920418fc8f5e2c1dfea1e17f2b2fb95fd6cec0a4896d823c00b7986048caec8b20c8f9a7c1b708
+DIST rustls-0.21.12.crate 285674 BLAKE2B 44977600effb314aa3c89609059c61337905f0380464ce05b4e91783f1a1c9076a016c8957afb3d184a7a6d076cdbc59e4703be22fc15c540e46a057527ac1ca SHA512 7e48a990ee69fc298df45d9a0de9b5a33a56261ec3f79ff16065cbae7368705c1f3432b77e3262a6141df68b19cbedcccf16eb271a54202049435c63454186e5
+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-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
+DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
+DIST rustybuzz-0.14.1.crate 254743 BLAKE2B bf4d32bddfc9e99c80a97cbf2729f6bbb37d162bbbda1ed648d0000ccce3c2b0525b3f2ccb950bb3a7fc35285a1e02f943db49ec34079083d48d078de955a96e SHA512 59d9f5365af6650b15c34eee3041f39979f9e737704f97807bf27bcf52cf43a54182460d509ef8c7cbe255985ad00e6a6747533cbce9806accad5b7083c6d3c2
+DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
+DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84
+DIST schemars-0.8.21.crate 58475 BLAKE2B dc3e96140728a9aa2a4ec5a4a46e12f016635d818dbd78865dc0281b6f0fc05174fe7dc0ddf085f0ed5fe26d4a4e6b1bfecd6909236cfcd83c9471b876d2d01a SHA512 23a794ec52d83ce045c8b2d633913b3b29e4cfc9d0a29f76aca8cd5b31a9c707ffc04c94390ab719b3c8109f37c11a00dae73ec1719087dfe7b3c4007beb066d
+DIST schemars_derive-0.8.21.crate 18703 BLAKE2B 62cca4add2d8282e0461d52026a3d7b58cf6a8b34819179336648300b8618056c6a1eba49b6bbac098a101d73ddf577bf9e6e8afab225ba67cf519126c6f9d06 SHA512 2e24af9e86aa1c04921608a7ff8a62ac1c3e7971591db9c8488b6e701f289fe56931ad208bd73f2542fc1d95863fdda2cef9561585b7e760eb99e187661ee102
+DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
+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 sea-bae-0.2.0.crate 4515 BLAKE2B d538bddee2d73071f550ea9e0bc7158da6cca434496e3162e91a7e44269cfec6e50fe760b3d0d290ff5b25459ebaf455206a4a2c0feb430bf108235752e463c2 SHA512 43625b937b80c2d05bee113d3face1d7e57815488509bc4b7b15553291b690502a06a3ff1c1c63ba4c1e4508aa8143a55f1cfcc97a4987e0941899f7f3f83b5f
+DIST sea-orm-0.12.15.crate 765254 BLAKE2B ae4d0cffc03f2ad2e2317b8b60e1ecb09d718cf6d926c4028648e78df1d280b9cea0137b3b58ad842e12d82fee978c027ee8d840378d0ce32c15fd179006c91a SHA512 85f9ff52585099a71a3a613e0ed708892bb3ea766bcc62ab98a89f93faf963621dccbc45b45b6dbdc6ef8733c90b05ba9cb6b2f77d1e138e91f5b795936881e0
+DIST sea-orm-macros-0.12.15.crate 31956 BLAKE2B 7b8f6b6c27de8bba9ba2beafbfad4cb55a74df4b5707cb8c876a54f869520dca0df454a81a3a96f37ad070f79f8bac57488929fd0e9b7ff31887943d85330ee1 SHA512 a2e3b609c79b70b922a0803cbeb25ebaddc07e800af42dbdf49a952c7a202c5552badc0f9f33845f96ce07d1f28c25709f9c83db92aec856444711e959f1c4df
+DIST sea-query-0.30.7.crate 231932 BLAKE2B cd09c2de4ee54ce96708a7a8941548a09b325adca2bf38c5b46ec98e8d27a6c518f79a8b7df48f53181286813113daaead4c424ac52bc6717d1ce18f95cbb598 SHA512 acef548dc59d34cf90e7e1f8de42324cdd4a857a49f40ef5f05ed08bba46c4ba29f66966243f95fcd7139e5083732cad65f976cf0493b1a2c7812e7c242823f1
+DIST sea-query-binder-0.5.0.crate 4370 BLAKE2B 4f679f0b6082608e3eca893b145f0e5c1d3d26b4708e3950b7a5868ca692162aa55edc46cd8c2f0be192806128e3eed86471f54e6074ff7696f4098b81c652bd SHA512 3aa26f5ac9aaa6282e946cf37e02d5b57dfab334fec87d6fc4c25e68d8a354ead6c64b68d4444acef959b9d19259d4f768356746013a6be25036b3b67453d27e
+DIST seahash-4.1.0.crate 31976 BLAKE2B f553bcff7af9da9b024efd8db4ec8cbe4100dcf4ccd8f627c724fe4a34b678ef0be8da44e92ea55c4622b9f9f37228792a22c8bcdd54e652ca926eb3c7d37655 SHA512 4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b
+DIST sealed-0.4.0.crate 13446 BLAKE2B 276fe1188cd0a135107da5cdcdb1f15000a6ee89e2d7314a4de7240c9d0323ae197c46771272b6c03a1b76efb414da2635de0a1fa9d0cfc76f0ea5d389a5c3d0 SHA512 781a390a750ce35e1c937dcf4f12053900b3a94762034271b0ea10d5bf0fe51221d97b95927b7dece4abed6c24bc3fa352bc9963379daa9a8931e55c1cdaf548
+DIST sec1-0.3.0.crate 17615 BLAKE2B 83d6f896ac2e90b83c081d2d761af05ccef9eccd918a300a4d6478ee71b36f0b091fbf34e8156cd3bccdc805b2090ad8ed29197a948666a9122ddb22de2441ca SHA512 227b13caf63d37fb012fff1d44bab293e36b03936bdb87e1cbe90ac2d83696dbe48c89eaf82039ab16eabb741987f07b685ea784fff5266c6c73a3dd80450237
+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 self_cell-1.0.4.crate 15220 BLAKE2B 9a617058652ab2a2e92434b6eef58a813ce0be5afed9525c4d4c819c25c7cd87aaa12d129c8c4ca9d74c3ea33d81e9dd295f121887070364185b9ab33021544c SHA512 042467e5f3ac0305e2a634df0b9a9379e92b54813e05c3a7652d5327a4a9a784f49e897c968c5c7a87017284d42a889b5420ad18e97ea84183e0283a46dc907a
+DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
+DIST serde-1.0.207.crate 78247 BLAKE2B 98b69e4baa27b1cad22d5dc831de715bff10a3e8ef864f14bc6acbd5436ed49f9d85e6f7eb952c5db9eb4d03cf921dd70d3c606f9531eb48939ddf75135fcb35 SHA512 e9ccf2b2b6ac61712cefb8d9eacd39606572363046000eef26b9af79e15978e70c2374764d1908876ecf1b6435c4040fc1bb6a941d1aade7f1d697bfcf67ec3e
+DIST serde_derive-1.0.207.crate 56016 BLAKE2B e0e33058c74925a506422860a9cf3b154188fd90d52679adc53a03da0ff0dbc1db96a7ee1584379b971838598c8f5d13b836c8080d5f2eb36ab8089362318c62 SHA512 24c67bf5972c2bc254a359e2a1884b0a3f8b79f8da6aa29edcdca7a66c58bb2b3b0646317c13fc73dcd32fe4e3b8774fe07840b67bc238c0ac7e9a0a3ba7c9b8
+DIST serde_derive_internals-0.26.0.crate 25382 BLAKE2B 7829d9f7efe64b057efea96d60e4a53623757a58fe7fdd53c1225c0a1f1c80338aec9e2a8c4033a1e90f9e18940796601a2ef62f9a423fc39adc00a8b9b6e065 SHA512 acf635d10b41400e2c10d326fc7ca60dbe9094c2d1d94f4f34905e6978b155e014aebe29e0cc2b00587c97751360ab0dfa71b5c6901629bda9322754e2f07890
+DIST serde_derive_internals-0.29.1.crate 26189 BLAKE2B 09d2fd10c73ab114efe244749678c166afcc3e6217f2a4c08c01a44e546471c5f7cbb7e79ef908fb306975852fe1ae32b7988e04df3741ca82db1e3a3d6979f8 SHA512 ee7c8a35094b8ee1d8958f4aa177e5c536c6c7706d446e875f1ae1b5249738ecee053a0239e1508114b747797fcd080ee33ed88929ff1f4903988f64f038b771
+DIST serde_fmt-1.0.3.crate 8677 BLAKE2B db89ed0207d5336b3c135d41763979f878300381ca9a3ed19a8e9e509a57a747903f8c2e919c9f8b5fe446deaf1d6f22a9414ac42a5d9b946180441c2e209853 SHA512 d0f1a35b0a3c910bc6393597cd0564101179e17f9be7c332f35e8de56257a4ee1b87cf23b45791056c7546282af79044750a14b0dab2b0bc00d493c28dc7576f
+DIST serde_json-1.0.125.crate 148919 BLAKE2B 551b29a79dd35e20e7432b434a163b62ffcadcb40a7755946e25ea29f59a39c55a85d589f6b90d449847023d0021b6ab189e41b52922468df5c46ed663a012fd SHA512 45cc034bed4ad15a6698ed2b723b3540db255c7ba8014c103d3b7782f10a3a8e2f6d5fe5d0dc47b54286f01f20c21818a5dda670a942182a07dcd1d71bea67a1
+DIST serde_json_lenient-0.1.8.crate 115975 BLAKE2B 15ef19e75bbf43cb2dc25b01526b951fc0dd367382d2dc54a39e73248baa7be4fda3df37bd16bc2addec30edd33fac59ec6fea7172833852a89afbfc4097704b SHA512 6850e9493d8ff70ba6d99a5746516d0fec1dedd3d774bee16690d4d3977ca12fad859818c30f5024a4722e2a8d2b112f529bd6741ea117b664e6ec9ae531fc6e
+DIST serde_path_to_error-0.1.16.crate 16657 BLAKE2B c9064b28677201ead32eaa91f20444251b75e7fc7f512075cd53079fcad54006f531ab4fada27ad7414f57a385441de65def5702d592143916d0106fa8e70182 SHA512 d937e2ef7eb6f58e741f0b1805431fd8cfc583d558fd5b58aa04aefcfc61694503afeca33ad62f6a09b4039555e3199c18d5912b7d5d928120ff631949cfc30e
+DIST serde_qs-0.10.1.crate 51109 BLAKE2B 92f83f469987fc6565f05662a08c7a1ae17fb40bfe8df11ef704c4929d0a677a8132a07195fdc3bc47a54630f4ec815acbc1b630945259980294e2b2ef7ba5ba SHA512 a606e099683339753eb5f31141da6d82de4f9bd53149bf8409862b3e2ab26506232a0b88b5c62bab733f8daf0136421b1b4f260ca6f898f03a38e281edf4f823
+DIST serde_qs-0.8.5.crate 44854 BLAKE2B 85beaf2fb1c5918cc4cebd536b351e34e0fdee08659ce1db4c7776a8793c3765f0f9c525f33db239b7a52d9e6f997e2b2fb14b1531a5205dba4bac4fab79ded9 SHA512 c9c94a791c5dbd6c87a6c4f487c98f1be44f7206ae0de1ff836fa43b2c867d45b5019f4b91d3d9dfc764b3043ed4f6df63e8de208b6a9288a2e283588b970274
+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_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
+DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
+DIST sha1_smol-1.0.1.crate 9809 BLAKE2B 954039c19b4c9faad6cd9f3f83edce220afb6970cb6628e69a1dd914a945a7b9466a8d46c41a650d505a3c01f406210ad59ed56504db18aa45125df3f2369cce SHA512 d0a67ca75b0617a39d28fdd73ae9aae3d3bf01ba24f6cc579b26da6f06125a304be90d446d17775959ab96ab165145657a54173679e6c0f42562a61c0e932b79
+DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
+DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
+DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
+DIST shellexpand-2.1.2.crate 16884 BLAKE2B bd00e39b6b86a21bdbd47a74645ee53ab82c6a340668f3b2f7bda5a811088629bf8365635168be57ea95270ed27b19e7b08e2d40dd033d00c566ea0ac707e09d SHA512 80242e9f39140b3406c604ddc771f6df93b98f34a67f8f7a1c08f78b463bf46dfde365759a0e8082b1da2704b96c71cb9341c4b789a238195cbb2db1cdcc7581
+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-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
+DIST signal-hook-registry-1.4.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
+DIST signature-1.6.4.crate 16012 BLAKE2B 5c003942d28fed88cc0bf1ec6c69011cc514de935004f6d24d1bbb7da1cd5c9c719cccb63013f71c1bb5ccd47351585b1422fec423d43dfcf56ff1b371191e8a SHA512 7409b4c26c6f569d486ceeb4648af2bfb9854cd9f35fde11ef0e17ae31cecc4293418e2d86e8101c79737a6d5cf9a8098bfbd64477ff4d2f537aed98eb3424bf
+DIST signature-2.2.0.crate 15531 BLAKE2B c584d9ad52a1ab3cdc129c36cb2ed6dedc40a8d49f7294352a7df8121dc57de78268f15d9ff9ce076abf1dd3c56773daa26ed5ec39c83a600b6a377b51d4db37 SHA512 673a8f6229c795cc8f640fbfe02cd912b41c6359ca23c5ddeb1679f49784b84f109c6c45e6210201c9ca05e441c1be64ce6537e81ccd3589b37be6d0bf50dca7
+DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
+DIST simd_helpers-0.1.0.crate 1527 BLAKE2B dc556646a3fc94548f1e16e837e94fa2e28b78b650260aa50535a45e92fdcd952bf0eebddfc2fcb9e653871447e9b9db82f3f8c1090fe09442b7916c65ade3e7 SHA512 20577ab7615f955ee3a88c617630fc6c88703d455629d5b3838a551baebbeae8c64a2587871ec5a4fb6bc203945cace50593a238e4765b5fa2313bac30237ca7
+DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
+DIST similar-1.3.0.crate 50316 BLAKE2B 52093295fe68eb8770234917eba595b29a8cd70d031810240b686311186770bc84693393a3a758af88ecad431a03afae8f7626992e71deea62da8e503b212c86 SHA512 b1dac43732b05955af980df887e77f3b9429e8890f8bb85ea1ae91853f109c0e02ce5fba73d33219030e153da22cfa597aa96240cbb6cc543ba57881b9fa7948
+DIST simple_asn1-0.6.2.crate 15992 BLAKE2B 3abf422412f51d0f8d3440c245792b817eb3333d58f27146109f11278b8eac4b49898264e266de3d00816319aaa822eeb0d1115e46f96f2c9a971b41a3edce0c SHA512 b2ad0042a4492f8cfdbf475b52c87431dccb91444ba3ed026adc488c844d1182a6ec88fc833b5dc0c2ebfdd6194c5b49289af71c151822228b8ecf89251ee9ae
+DIST simplecss-0.2.1.crate 19418 BLAKE2B 1cb0f9d0279bbb3756a6cd66505ca5be7df3c1a9ee4099c421c93991ace676cf5292db91ebdca9555b6b16859cd6786a9d1757d078c29e2141e482d193a76203 SHA512 4a7de5e332d88447b418b5eeb9fd87a2ab7ba819c2af4b84988330631a02ec42ec868cf5c6f5f43f8e5d5e78fb9b5d3b6ecbae254fe65ccd9345bb5da01ee6fd
+DIST simplelog-0.12.2.crate 21548 BLAKE2B 34f2221981fb5148e9f2b87e3f0c7d2d81c9bbab65f19a952a14d055aee9a6361308e953a8a21a190a10429354b44fef1205f095aae42ea7c1f7da9257fd9ef6 SHA512 d1ac5ae3df161ad76a71d5c56b9e0d4a36ea2be5889fb1a3e457cbc587ea87e742ab7ad4b315305227296fb63a897c675a5f3cb8c8fee96ef1e387fda2e0d715
+DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST siphasher-1.0.1.crate 10351 BLAKE2B 6653898cf0eb071fe83b7c317f93ffb73bd26ed601961173875b26ec8851632599891ec178b7e14318abb9eb98d522db8022deb852af9ad9f6bf38a5a5708e82 SHA512 d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28
+DIST skrifa-0.20.0.crate 198126 BLAKE2B 087441b9e98e0cdc7f2b1bd2454d1ea4ea1ee376f807b0b791976a081b4f05d2d3c80de903f30227d26189942fd97cf1d7271ba733d43114c69785ca71778767 SHA512 fb3dbf31c8213e559da8e3ff2a8b6e6de8af5659b117f357c1b38cc99b25a64b1c1e1860fd9e18ce53d98c76a60a4d2071ad5341a85ea7563a7f4c90c6f37bdd
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
+DIST slice-group-by-0.3.1.crate 14640 BLAKE2B 8ad01bf9784ae6e16ae385bc2394ed99b029175852916fb6370222f372d8c5c5804ab1163815827284dcfa29e148bde628bd40045500d29c9a992cff024e9994 SHA512 747bc7aaab7a8f0c9d6c3a8bb2dbbbef81fa80ef3fab3043618ace86f966980487612967879b0de1436bdffce7e0f968fba540e38a3dcedab36c8261ac4008de
+DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080
+DIST sluice-0.5.5.crate 6960 BLAKE2B 0a1ed02c2e0f3f8a90afa1e851cbd6e352881ba00fd4ef824b0768b6ec19a9eca959fa7c215ad4d6ebc8f103f5508766648004bbd897706bb44b98884627af4a SHA512 d0a85db370a921f0591d63a5a78fffedc4c97e5a68915c86753dfb7798cf120542b1fc3193e093655442b34502ce6cadc799b25e39e26c122683e26ebd0383b3
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
+DIST smart-default-0.6.0.crate 8169 BLAKE2B d4b19bf0a96d9eddb05b7530545a5b138464c8a23448abe60ad21a2dc6d1f335bfbd97b76a48b1f801d078e9bf84879c736b64b9d8d932478fa93e57d77590d3 SHA512 66ecfadb3c7a7a8c6ee48b62146a058595e87efc18f4962a7bcf04120067440a83fcb4489c7831986eba06450279546b019c111e2a2a01e7f2d52fb82e98914d
+DIST smol-1.3.0.crate 43211 BLAKE2B 4d3c72fd47915bd20d69fd7b210879a4d4cd460b2f2f69f9c7dac9d8409254248cbf77b5ac79d557e1868107ca1147eebad0a3f2490582a562df4279705457b5 SHA512 79586f8ef55ad4aef5281ee8a68bfff55bb30ea44639f9970d3b20ce5e5c6153d83f5301d2fe960c34cf323825da3289070fb32c37b0113b8d0e4b95d974abcc
+DIST smol_str-0.1.24.crate 13351 BLAKE2B 19ea2c1c34eecfb8d2b761a25db4a87c62be619f109e1797ffeab8417606955a6285386558ad2e603532019e4d4f38e1d9c813bba3529e9790325e2ebf56d1ea SHA512 db5f468e15d7c19f751f626b8b91f56532c9fca833f5c8686e778bee5ba85087684521c6d68522ab76caa4eede931065d25fed05ae8ff1dba3608947eecd0391
+DIST socket2-0.4.10.crate 45697 BLAKE2B 1af475724e47f0d7889ee092c4bb5ed34cd3a34885bb3d65a7c11428ad224174be94c617f5215ed1a1656973e112e40bc56ed50666543743371a65d61bf3257b SHA512 eeb0bdb86ad969f3cce4735c99aa812a867b11a5ec88a53fc7f5e399c510b47ab14d06bbfba63398fec0a0f65835edaedb7eca7fe36aeaf4805843aa9f0dd5ce
+DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd
+DIST spdx-0.10.6.crate 1019846 BLAKE2B 54b3c55a0212906c19512e799a46fceedb9ee92cab839daee054b6c44d48fe1cc11aa63af5c5c4140291f91157769aef42b7cd144ddce6f2ed5945d28887d834 SHA512 3d9d237db2d69d37fdaa1307319c308a5e65aac603949dfdf825d277322e5585ce52b59aea6f34d19cb74be875e40a352ce6ed9a1480bf1f01cacaa74f6f00b6
+DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
+DIST spirv-0.3.0+sdk-1.3.268.0.crate 30802 BLAKE2B 8608a8613b02bb5c9e5258bb604db55c81d289664383606686c70f314e5bd31d5b4b0cd1e0b77c8431c363e023861c18a08f642b690a9ce01ce485d069bb6a25 SHA512 82187b94f32ee784eca112408e61e3c3ca8c825207b4c817b2b87900b252c514d137e6ea5e9384a2e241d5352ebad0e153a72d5b3db2b0dc938aaa472d3c261d
+DIST spki-0.6.0.crate 14791 BLAKE2B d246ec21f44dcd638b2c43f0a55ba033e180ec6c6503add7e06ef9d0de27bad6358648bd5802ccb282705b5c726bd2f575d8185d04c0dab77f02db95d326718b SHA512 87803e492e1965ef398680a310e9e5a174586fdcb4bdd308880d7b9dcc24359af37e253fb6ad945e5f51aebb23862745bea2f917d14f0fde38a71a8e0a99601f
+DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9
+DIST sptr-0.3.2.crate 14598 BLAKE2B 0ede8a60dee9925fcb39377c2e41b2fe5ec760a2c9e3166f4f8dae35c34721848d328522897403fd60808135b11661d373b7fd89c7127367a806cefa8b914d8d SHA512 cc26ba96f808c57d6aa5efe5985ea3e83b65827a7d163837c81a06fdd4f178fd5bd86e4c08d7383a10d94e63bb97a0f6c151b55cd79c9c26f3a8b7a0c6e5b530
+DIST sqlformat-0.2.4.crate 21923 BLAKE2B ee4dd0fd804acc9b3bb634bf5f40969461b43e1c1861e1d0121edff4e314b13a5d275fbd920c0c2c51612f32834658a631f9615d40273568c78a1a36e47d2889 SHA512 b2d75d92556073a8b2d9965a0aef9748cb6135ffb13ba65004368f0dbe6d733411dc9b00ccb27616cf7d94ffbdefa9670ff8b3d6c6f8a2ec35615364df0b783f
+DIST sqlx-0.7.2.crate 148808 BLAKE2B 4344903ff985721c52b239fe4cd013ac3055d35ea91a3d8a0a99d5b8629a119857025c90bc3b5902bb21f25a7a92a4d6878412914924c1c3f63841a3fe99ecda SHA512 61554aaff02d351ac2321bd673da47e497b23c72dcdc0be9222e09d03a78e142bd85ca1db24f9dd6c9676aa2f6c4efff6c41f2f317e58bee543bd602f43890c1
+DIST sqlx-core-0.7.2.crate 95098 BLAKE2B 7fafcc8287e9a077c10d79121fd30383ed35a9866d2c0ba473a32292f4d6665f1c432e7df1b04310d6904eaedc107810ef4a18d65daf1573de182df9d85fe1ee SHA512 0d21b77f5a6850812a29cd7fb2f1a818b469e4b6f4ae604f8183a67a85e5b0b6706b4f7ac54f17dca6fcff75c57dcf2948184bdef16ab58b33e2f9930627e353
+DIST sqlx-macros-0.7.2.crate 1861 BLAKE2B 9ceffb529e6046253fc64d94c1294368d3a1daab0808a21365b6ba4c0fbd098148bf506f39f6c8c0b67660db3c854f7123d064d9150cae18c856090dd7941c4b SHA512 6bc043bc886909ab3c28bd81d95f8af96ac47d0d21158e7e8f5bb87cf6251d2749d217ae8a87554010551e318de88219c75b18fdf3486571e6042235dab9aab2
+DIST sqlx-macros-core-0.7.2.crate 25901 BLAKE2B f141e5a02977c23a4396fbb34827b0ed6096c24a0727e8e943081cf0640914096df35efd8d4eb0e49b04a05f67750583e015a8e7185cd4864c4023d3c6d51526 SHA512 cebec1808ceb70b3af55bea7a5c6a16fd3dc2fd645d8999583fc4de70ade3b111d401bfee961023ed5d034a39700bd02776f6b7db6165f38552fb62d9d06c25b
+DIST sqlx-mysql-0.7.2.crate 52335 BLAKE2B 0d3f146067cd7d2da7b741865a26f32d215338d1513c08866230d61fbde791f4c314c2069648574c318ae3a25a9c7662746001964cf9a9dcc40160d51c1a47ea SHA512 e527d075c2716e7e6b9483d7fce1a08d02d3834c63ff975bd23c9d91358d2b4c46b8ffbe058c6fef1695c10b5729989606319ffc9fe25beb607177aa7982aaf6
+DIST sqlx-postgres-0.7.2.crate 102920 BLAKE2B 95ae38d42f724a27d54e05d418ca9706b5ddf3b58acf283d6be3ad218dd44ab0580a9643bc95a6fae3692e8ff433888eb19c9a17236588b5c066388a38fb97e5 SHA512 ec253606547ab06ef000ffae4ceaa4e217aee97b582a747a20fe2b61752a629f272e918f7adc37a63b5fcba0256c8ab71edd92680771670486565354cc13a721
+DIST sqlx-sqlite-0.7.2.crate 59396 BLAKE2B a105a44d81c6cd8ee31ca217453655b90d316dc2adf750556b6ff3dd5cb4293912add30fdf98470452e2b2502b2426d14504f25380c0532137f88be8908fc6f6 SHA512 0508d4ccc552cc4f037c9816d7ebfaa51289af9eee0c1c7f33c6aec227c4dc903dc8892d0bb3c4bfec46cc9501b4a6f49acc3a709e7ea63b365dd1f43e5535cf
+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 strict-num-0.1.1.crate 5104 BLAKE2B ca255ac7afce45b8e2dec87cbe080730959315f753c69bacf1c941617d5c3513e57532494409bec29acc73928291baf98413cff6d0686ced10804ada2a26d361 SHA512 27ced0b3110094b3d8a22b60c67980b7416debe5a22b0416a025dcfc8264fbc1ada1ff73362383ec605c36d682245b2dface093cb6152852f4d4b28705f8a197
+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 stringprep-0.1.5.crate 23573 BLAKE2B 8b5ae2f278603553761e0b98a3f0a02c6a81fd117fee57a8186a015a58ce5ec8d91d9f3decb393f53e07d8df05963f399e63afa46bca937b99f609204582aa50 SHA512 f5dd6ee410e42f285b4da85e76d514ef697cd995c601b5ed23e25f702d920dcc76f15fad41610b6554b692ca0f939f329845535fe4ea167df3ea0e628b1da447
+DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
+DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a
+DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62
+DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
+DIST sval-2.13.0.crate 26127 BLAKE2B 65e5322e5d158624bcab675c92045f9f41a1612654f2f0c4378580c72af04871dfd546f4b8c173a03a0e091f274b3e159e3350d9091ba751e5b8d4bec103e0cc SHA512 d18cf6db7840b6253b73dc4135b068462bd8ec27aac4857973d5fbd01e0055ebb8cdbd2890d83147c92eff9bfaf335e9afe07b13f3aeddefcfe2b3dd24e85daa
+DIST sval_buffer-2.13.0.crate 18041 BLAKE2B b9a757f5da1b1a1419a7bde31f846f84432d52dad808f722b37bb55d5731f9fb2d6aeffb76ce84c61eed05652d33d289d7e8e3305b92ed28937f82c0664452eb SHA512 a8c234d42d6796798777849af4695ec1a5746d2564b8f316f48bfcb9e124a93a14279ba2f7ac4fa9aec6d41db2355d7995b3ec28730ddbca249006d026aa3d74
+DIST sval_dynamic-2.13.0.crate 8175 BLAKE2B cc6f66c0d3919882a88c48cf240e39da79f8fc89ca3aa0f40fe433a6d48b883cce2e430176801223aefd558c7f47c3642f83178630c3900e474be8f061a96f4a SHA512 f628b8dfa02ddea6033ea28161aa8483603ae5e6d849b67f1b00fce0201938a2bb74f22a1e1f4fe9577dae0859ab870544e0334bcceedc26d3378337d128e6eb
+DIST sval_fmt-2.13.0.crate 10508 BLAKE2B bec6ac83cb0d9009a4cceb2b814c744012de507b6197e1efaff3aad26e15c5267e0b78941d525f0bd4f1a176edc560e47fd977b5be03734e705f2d233c800e65 SHA512 f5ff25f3094cddd6f5ca74852c9982ce429f5266aca890bf0f67abf63d33d11dcce5543a400acf567897b1b9c1197d5582a4215da7dce49212a9222a2bbc504f
+DIST sval_json-2.13.0.crate 11037 BLAKE2B 62f273574dc5952b018eb22dd445ced21f56dcccf031953de31b9ac18f03f7eb895848de465504cb7f9bf930d45a00761dec35e6560369245059b9220fb8e138 SHA512 fb7daebcfbb1dbaa045c88104a339bacc655e175619a89d99c8d68dd64a6c3aef305cf911d9f84c5cf7318358bedde015b3427c7c3e7ec8e29ba48e7304efa14
+DIST sval_nested-2.13.0.crate 16598 BLAKE2B 4a4a836ac7d7d0ee7887830456429aea7a8d94b0e3039e82e734408264e1c8dae814ec3da4a3a8cd47d138a0fd3db4a64dd36cdc3a07c08859edf70f5476c04d SHA512 40c97dcb3fddb6dc94345c45e2711477e6d367cc57ead42b7a7c5881162cbc0cbd7aec05d2c0408ec362ba5f41b5419f88e7026b21b39db597fbeb7f801ed0d6
+DIST sval_ref-2.13.0.crate 7888 BLAKE2B b2a7fe2595b34f7ed693afc086748d6078a1d73330c22f661c2d4953326de2fc4b660054ddbef3c34ea838cd3a09e7b999991de0225be125c4a14bf329f4dab7 SHA512 2950dc286c8ad8bfce9fba5a562ba6e66b87e352a11087049272b8e773688bc636fe985bb2a02cec05642eefc48b5a6424e4fb7cfcb648374e387d005cff401e
+DIST sval_serde-2.13.0.crate 10130 BLAKE2B ef7100ddc5ccb3d866477b65ae2a87f890e16ebe1ff476eaeef8ff2b66470e032af501b8109f46430940de2c58300b4c8914d4ee2a6c1cad3c681fca13a15f67 SHA512 2af2425b53c4a32e36b74035866491684a37847976dc8d4c0089d7cb5f234fd1d381e8af585539fbcc143d706e9a23416089e6d0397369cf0ae01e7b2dfd40ff
+DIST svg_fmt-0.4.3.crate 4206 BLAKE2B ff05a12ccf6d7abb00a46277f28f6ba8946a2c11c277759a09cdf45180f657149678ceafee83dbabda22f0e659d26bdbe44b04d82d356ea1db0b09cf865d8903 SHA512 7929fa2760b19a92bac7f8793f6a380dc51958a231cdd6256a0ff78e26ada3c93fa6fcf395a63b3a0438e116237dfa21f5ebfcf0387d24607eb29d509dcf53a1
+DIST svgtypes-0.15.1.crate 41744 BLAKE2B df13311910e2dd0a01e3d46c5e03ce4b811c975c26c257d9e9facefd631c341ad81c21ea80f3b4be1f689385b01481bbdf09e9034b561ee0b0972764a00cb98e SHA512 c9589d88c919ef55b35c5335de0d679d45bf0b5e32e0af852690b49b9ad86b300b8a14c56e43beb61315a630018fd6de57679a4f0ed1889fa2aff117f4f373bd
+DIST swash-0.1.18.crate 235648 BLAKE2B fdd9142c88f1b2512ec815da9e324d1785e093f0ba161768115a75bed68240716efbcb7a36e5d823c22772a423eb7baba9dfbc74a492d62040c2d8a75a2a3757 SHA512 43a3325400746d13c25d583e6c225c5cf00174b355333a938e713042b6828a5a3ef5135d8f7ad2b07580964217ee50c7b3ed364269b1abf44793d6373f441770
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
+DIST syn_derive-0.1.8.crate 5173 BLAKE2B f02ea2a6fcecd4132fe3495c6d63c05f0da94297c8a68ba631d19c503fb7383d7ef52d3f5c2bab1f30c43e461e15cd957cb9e1d689486d886fffe0bfa6f23b53 SHA512 180aacee10370b6e0c8f581a74dde2c05204cdf8a4d9423a23afae0d3b803d55fe01ea32d2e9bdef4cf6c4af7b096182cff060ae2d28723b966f4e4b3cb37c2e
+DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
+DIST synchronoise-1.0.1.crate 15084 BLAKE2B 5236b18c9d9579f51a2f3ffbdd9866c5ddb125fb6d075f25acf4eb9e840ec83c89773729baf4caef3f934befabf0279b8ec4c4b7061e97c39d6fe790b938fbad SHA512 34617eb67db0fda70d04d1e9e644a06d45e013431b321e09f106e44f99f7be2d2fdfd6438ae2462c3c7beec6bab358db222e7a579dc22062478dda12def2fb2d
+DIST sys-locale-0.3.1.crate 15681 BLAKE2B c60d11812280b8e0c1e5a753c7867351deaa43d26bb3ce0b381f56c2f375ec8db2755636131a13fadd79aa6d90b75c5834dbf52848b9ca50c1ecc5b627fc640a SHA512 c06ff352d5beb9d214f08e82b8d49acd8b83114e6b88c9685f0694d42bba079215e6afd1c5c75a8e8bfbcc72d99cb01de7a3d8f160196adb6db9c34bcf1a1ebd
+DIST sysinfo-0.30.13.crate 173400 BLAKE2B da65e5f5d2aa20e1effa45a77ae97bf47790d10ffb54315c6327813657c1d28f47d745c5c34e966795d4d1ad10431659ed079ae893d96aa20a18c68220cd6ec8 SHA512 44d64b162ca0a02289b615322c8faaa3f2ca9fc052d89224a245938d075373f801f2346d514f52cdf2da439f0f1fb0e526a0856c6a4509bc83f4e108d319c538
+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-interface-0.27.2.crate 32251 BLAKE2B fb3f9b998e02dcc9707ad6a6f25aebdea482ec4a430994f643a2287852a7c59ee3c9e4389da1814b3156d2306a9859e224af0677ae3cfb07b59eaec772429c8e SHA512 b9fa810c5c1a51c7e5664bb2fcadc7e9a789089dcbd867fa6b494a29cbf9255b6a4b4d7b8837f5b564c8df7718bf305d13c95e0e54c5aadebf8f1111420a95cf
+DIST taffy-0.4.4.crate 125321 BLAKE2B fb267e5eb616f7e5466705d5cf439f2f97875466a549ac8df2292ed927326d0bed67405e6ee02a52aa42dd3ca9b5b7ebed750a4b44f75ffce8717af457325f5f SHA512 ee405d37125226edb143ff3bd57a04693bda2be62d1c9eb703a11dc663ed558a5fd4ae50fc78b04e7b773bbfcf9af31cbe5bae1e870ed9629d34056676b897f4
+DIST take-until-0.2.0.crate 3427 BLAKE2B f20f5bb863c879563deaf1f1488fa722b354e4e7eb0cb73c7b2344d2c49ff5aacdf70884296cf76791ec808af794e54b131f103d693ac987821607cfb61eac77 SHA512 625905e3b2ea5643e23cf1b737fe5c1b5b3679a50ac76ba3058776e3bf3bcf6d614512ba92cf632ee1ab2eab59b2105eea23782dc6cc255e77dfc6322ba5b8bc
+DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
+DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
+DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
+DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
+DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
+DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
+DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
+DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
+DIST tiktoken-rs-0.5.9.crate 3790922 BLAKE2B 705978e1c1ac095d449249778860dcd7753b0635ec365d55c7700c470df167651a9191a283a42d27518530453f6ba2669e7c7a2ecb63c781b52ad211d7222fa6 SHA512 6ba46dc3a8176301186fcc20603493ffb23732ed27adc0236030f266ee8b7ae354b9cf6fa89a914f9d55ce4104ca9ef0f031f66bab32c76b9aef33fb40f0fa1c
+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 tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
+DIST tiny-skia-0.11.4.crate 201082 BLAKE2B fe350137665e6229ea707bedbb535b8d5c3fd24752ec9c97e2a6c43b28ce7fb9107935a6f91074e0613dd2a156a45dde695343cde7ca78f3f9079636c5e1f9d9 SHA512 1371fa11934c1223169fb4494accf3b47958003e19a603e8fde446216e2c1253a6ef80da5d7bf3c9c73038f5282e3c47cc5f8eb87f8456cc5706392b28b4ecac
+DIST tiny-skia-path-0.11.4.crate 47764 BLAKE2B 55b76adc467fb4c063ac2136271c353b92254f20a68e5205395081582c624481687bc319845e217868e5f2c54ef320728d0b2ddefe32fab1a17b90882168c2dd SHA512 723557dcb08cbdbc4d442ccfbba38481b922e367cec07fa23957f9271a96d1c656fd46bb0e0b5609686e5c830d1a988b0e209f57d0765d0afa738e5b2b0d8dc8
+DIST tiny_http-0.8.2.crate 43921 BLAKE2B 3097e86353d26ff4ee7952a3fa9aadb9566e4015452dd255cb0fc7b46212c38df141d22dd2fa9c95ee1ca6f2724e79aa7475ffaab2516753b501d83e36206e78 SHA512 c2eda767b95d9f84ce4a71f2007009aa5268c0e78f20746b21840714917c7e206987892ecea29548270d08de72baaa8486a28783845c3f3fe4f6621893d551b1
+DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
+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.39.2.crate 780859 BLAKE2B c7841e36893ce676cde3431fb8d90ffad8774c9886af1a6809aba823ff4cab48a5706670e2ea60c9aafe03ead8828a3c8eb10c21d7c5e7fd8eab7795752a769c SHA512 f16ce6d7585efb151d9668b0b5e86dea7c227c490bd31d9589ab98aacfd220532d0efbf7d7f866ca1074fde6bfee0df6b95930b4ce4ab494b2f4ce7030b2678d
+DIST tokio-io-0.1.13.crate 33665 BLAKE2B 4e9c6bda0d391ae685dfc89cc0137fc44b31a4a788f730ab632b73d92ab55dad871d68b03ae0899cba9f96e402f88a60d4b8be5d484947b8982a39e473e5b8ae SHA512 608341311f4bda9617634a2623033900bde1d6b9fc89ae52131838f033bdbdf8704114193d8409ea0e10bd53d6f7ab63d47e17b7abb41d3f8865ab36fd0532ef
+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-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
+DIST tokio-tungstenite-0.20.1.crate 28569 BLAKE2B 3f0534f6ff68c53383dc70c244264373d324d88431c7c4e0e837a3c2dd20047731f58f085f5d7339d7e7bd56a4952da60848b796af1f47817e435c3649d84c52 SHA512 eb4d3ca0f8beca4c835ab174590c6e023ad2e0e19daae36d4296061886a306569bd1a18ac23bb28359179e1d29f93723244cba42905be814b133185b2ef6eeec
+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-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 tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
+DIST tower-http-0.3.5.crate 107116 BLAKE2B 949d3af681b33f1c8de93075c603d14cf6db80600b4cfbeff425856ab06d684228b4660b809a301bef57e66b304175450a7c7d5c9dbfec5fef52116fa230b256 SHA512 9dc84734881997d8bffefb6268dfa1607423e996ed70582d2c44e3c3c07758caf650c14c7323dd0644ce653ca0b51ca1f01d12d6075f4b94b505e2c69c0c2117
+DIST tower-http-0.4.4.crate 115612 BLAKE2B 91f82af5fa172837a0cf6e48c5b9071a13a7de5c6eb768240397711d6b4e106a935de8bd1afa96bfc4fe75d4def8fd86861914c5dd9ab022a3620ad61ba246d5 SHA512 00663390dc7ed0b2f197256619a4091368ffbe068f29e1959dbf194fe7d9b601fdf8cfb44ea0ad76b3241f66b77ca4ba1fdaa86d869951b189b6194d6cb61bfb
+DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e
+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-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
+DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
+DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
+DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285
+DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
+DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1
+DIST tree-sitter-7f4a57817d58a2f134fe863674acad6bbf007228.gh.tar.gz 2977680 BLAKE2B da0b7192277670638e3dd848e974a776a591845dc2157a90f015e6cf3405f98a995188961526c1fa52b7fff54e2111285babbac7f0f8799bd4e42bc420cfed3b SHA512 3a4d15b6e386dab65b75a0516763cc0e3f354ae9c9f9c1e60016ddb26b0f48e081ce580a4766de1f3d40cfd61fbdac94162fecdf7795fb496f1d3aebbc319ed5
+DIST tree-sitter-bash-0.21.0.crate 443067 BLAKE2B 8514d1ec00f68ae9f987992fbe32c77a0fd5e6124f7915ae269439917adb68301367078e1ea6ccb4c921ecf88f564b7059b4c5a576f6efd6e187c82be3d86c2c SHA512 4702287b0b4a8d8a565758fa8eeedc3ccc357e369063623b27bd124d107f64611c8e684767470b208ae8f9bf26d7f1367b3346550eaccf26856fba573d32f7ac
+DIST tree-sitter-c-0.21.4.crate 234539 BLAKE2B 841b64eee5fa2aaf0a95f77b3273801b8d970dcc1964201993d43dbdd3a10818c220ea0c4592c466404bf1569f928d973d358a4f640aa5701e1d225fcd106cd7 SHA512 c5bf8a34211670f8fff5c94531a64c36b7b2221dfba1e48d43d822d1f886ef7b21f3dee86e26fc67aa4710ffa6dfb7392c4e84d552ca0afa8d9631c9ccdf0fb7
+DIST tree-sitter-cpp-0.22.3.crate 907252 BLAKE2B 48e49822166a6a21fd87e21b367aecad93ba199c2b098724504e29ecc9e95ad4a691718ad50223942637443a6a9b52d960064e12f8532d3fb5d696f4e93634f1 SHA512 88d97fc40f0d1ed04ed0d30528b3f31a655dca3595266b7c846d606d61c53058ae19c177e5f7fa2afc6d95d8aa835b3b5f3c30f0a3819e3bf32d629856be6800
+DIST tree-sitter-css-0.21.0.crate 39814 BLAKE2B 466eadfe3cecfbc032df3e27babfb54bf040143bcb9e111f935f68f4a7775dba93de1ade058beb45f3023d81eaed7e10e7a858a793b3304f5f0f4735ae205ccd SHA512 6985894d5a091067ced3fd462e276be22370cecdfe6d86e994ede37da9f190aa8bfa55973170a1f1fe880ad8a4279d2d5345e4ee71b515dcca5a82cb423a8b41
+DIST tree-sitter-elixir-0.2.0.crate 503935 BLAKE2B e9c75d7052dd9a178647ebed9c782b54de432cba40b3b9b12ac91a5d23435bb76bdc3ad2d249e64977ad6a7414a3dacf13e28abeddf5e5b4dae4f494be7e28ff SHA512 44d632faa71f5043862650ee0173990576e685c5a0eca56ee4e0863965338861f042e403a75fa6f3affa13ced27c1c12b365a2edef7dafb8f52b068e03c05062
+DIST tree-sitter-embedded-template-0.20.0.crate 8475 BLAKE2B 4953a0ff12b14659dcec1b8ff1aa40f578601ca2ad32eebc56801c11ae149f4ef1dcd08495a76220dd80b695327d5164735a9da45d275d87739ed65b7c63d027 SHA512 181941ed3cab1a05c703dfef762d1680a8e4dc926b8290b7d455ee728c74d9548871ce6c2db16235959eba6c1da106701bcdd6f65abe54d3903622e9edef19a9
+DIST tree-sitter-go-0.21.0.crate 112581 BLAKE2B c0f873616d4fd934622b65bcf35a821fecf3b67c53315c73e0c8c07eb5689a5be00e9c9aac5cab43ad8d03587945df5f9243cc63200dab3325fd4a96ed0e6960 SHA512 ad9cb05b22f3fc32dc4bfcb5e3c3e1273c50ec7399a595489ad755a435cfee75b0b4de292bc6e60b7f8f193d186acbbd9a5de4864491cde79aee7e2851a90df6
+DIST tree-sitter-go-mod-1f55029bacd0a6a11f6eb894c4312d429dcf735c.gh.tar.gz 20557 BLAKE2B b422b5f3583b333b280f776bd1f3a9d32fa9d5062eb3ba6a8dfb28332abe8dfee1cb69b968c79da79db96108ce3ac29ca030bbc43f15c7c86041d98502fcd4d4 SHA512 77ccfcba510810316ea56400b6847c869c5d0e61ebfab1b6763b19bb0682edd16c7208abce0bca68fd6205f522fed22ed95ed6a3835c3621b2e1916b97eb9368
+DIST tree-sitter-go-work-dcbabff454703c3a4bc98a23cf8778d4be46fd22.gh.tar.gz 15281 BLAKE2B f24f97b8f4a819d9ebd738c3053e7c174206a6c7d7c892c0e966776a416f3d7d36b1f7e27cd28ad867bc0510d1e8ad4106214e350ebf22da502d53665962c6e5 SHA512 abcf64ac781ee50c727522432f71f4d25c278559176f6e2d748ee6c30e277e06c208bdf61a90ea4f0f38ec2d187b23831625a7b54a85406bd7f68c4a9fb99440
+DIST tree-sitter-heex-6dd0303acf7138dd2b9b432a229e16539581c701.gh.tar.gz 25625 BLAKE2B 249cb74483a439cef117fde1fdcee018a8839d96c7b060bf376ed0c4a75de0822a2b631f96c6700f3ad90ddda8e609bb8a2e95f4d541b361ae6abfcac98ab12d SHA512 7be5bdc4e04a4240fb0eabcbfad3798549d8b1e31b464d4a93c0064e622b712b4a41d5a01b750aa7c6e6b7471c382ffb7cd84d252fdfe9dc673e2cdd3666dae6
+DIST tree-sitter-html-0.20.3.crate 20827 BLAKE2B c9c4bf65e15bc84c36938c3b5ad16854e103efa064664dc11dcabe881db5d4e192ba998c80a599dd88ef11296e730f83f7c7a8e8c34475325a99285b38e89340 SHA512 9587794af57bb9fdcf152deb7f21b50435ad333479a4e423524596578325374e2996e04fcf3dcc26b1962fbf380d26458005a36582b1766c1e088972c4b081bb
+DIST tree-sitter-jsdoc-0.21.0.crate 15624 BLAKE2B bce4b50c86380fa47480b2af9784eabac04572d4fbf2938229eb7f9b6d1122db6a93583c632a006292a05836d9a33208dfc0b83523ea2aead537c89c8c6a13c8 SHA512 465d4ed74cce61a5549301ccc07b4ceec1943119dce2ee6e75f53a465a88194f68405dd30d15f767104c2590e6a8385e0919a13eff13fe95736f0d918446d221
+DIST tree-sitter-json-0.21.0.crate 12497 BLAKE2B 8864267e6d6e1f6fade11e7d4c61831cda1a6bf784e9d9ea9eab4cf423148ef554bbf4396816a0fbf74f56ec1dadd0fb7fe84d873450897d76c8ffce0eb87093 SHA512 f5fd1ec69264b39e314f3377e857e94650ec432a71f344464399e6cd269df84f4d42a90e46d19174b1a4e463b251679671514839939feae16277325c2b4efa16
+DIST tree-sitter-markdown-e3855e37f8f2c71aa7513c18a9c95fb7461b1b10.gh.tar.gz 417998 BLAKE2B 8e8fa45adf4d672bae7d7925e662bc133b98991f3d42809dd045acd12960865a0574f92f9d077648f0379ed79fa14564bc4510f8201523fa08d02c0035ad5000 SHA512 5773f36d40876ee017dbbe6b1b72c9c1ba13ee3b74bf36a974b3886297eac0940d4d79777dcf1e9b4b58ebea0261868c7826125974c3a4e4c8f84c9a43eb10c9
+DIST tree-sitter-python-0.21.0.crate 181729 BLAKE2B eb996d5de9f1e000c3ccf90b830681e034f93781332cf4c73fe35a3863322ef16bc54777d696d799f651ac9776c5d7c6f706e5fa2010c4ba9b8cd9749f32f2bf SHA512 9b58613f8c6c59e94654bb9b924a6f53a59620b0c9c31f849aed2e9e2b383f0d4a4bd47ea90f58f8f11f6f45f5a98c778fb1064a60d260c7f7776900e49eb188
+DIST tree-sitter-regex-0.21.0.crate 18863 BLAKE2B 7f67cbfffe0e15c938201dee8ae307a1907fa65637cc0cde7195651b04e19cabbab217198b60a0ce3d33c17b6a3b47783701654ea69baa736e45bfca665174e9 SHA512 37eed455e9638d12116c9b611a5d24b8d67e072ee300d060787d514ccab40be2fb40b9aa04561f077c991dff64b6e0dad378ee9bc3b13aa1340a0ab12b169771
+DIST tree-sitter-ruby-0.21.0.crate 506613 BLAKE2B f113d218fbd443d7626a5b14ab2c6b21557549f343a258e06576c92104ea82db2d163bdd2fa7fe207e8e1ce1d4c0cc6baa94c704bba89f336bb0abbda096a60b SHA512 69843b101466aad59b6b3cb612ced148f03c426de85b43f73d31845992b9479256d62a412a3445b7174eed9b69b3f2cddd36dcd01c3cb07c7a6b920d9384f2c1
+DIST tree-sitter-rust-0.21.2.crate 339433 BLAKE2B 8b789015be394cb7a296c8d0ca645eae7eb40ca33f2c552ac00887e85805a4025c9c386391425669c9b465f4275ec2af30c00caa40757ae30d488931ae52f7d8 SHA512 68fa6faa380ab06ccdf616e2e02842e3fb9ff6bec61744d54819c2c3c587221451a089381e7eaeed86e2562eef36c5db9aeb6b60b47c2c8b906666d14669cdf9
+DIST tree-sitter-typescript-0.21.2.crate 854662 BLAKE2B 5dc35a046ab2582aa41e633f3ce19914b200075c56e848903cd841903b67ff5883b3a2e0d94be066cd18d7470b789cd8c84152c99aeacdb8db99d2f1bb20c5c6 SHA512 01fd529e8a9914474ba9643778510ff0765bbfd8c31105422793948f0e158a4fb989a820c34c323e1fd87d4f7c3df8c6203ccd3c0cb845453076e358fcfa54db
+DIST tree-sitter-yaml-0.6.1.crate 100932 BLAKE2B f5281dc3e3cb5ebde56f8de8336c7bfbfd73feeb104ebb59f8c9f69f0dc344974ed62f21b74eb814daebf906a4beff8c88b6f33d78fcc0e55f86cf5fc52fa89c SHA512 729f5cd8ee285f33cb40fc44d0c12f51f4a45e0ff34d1200a44839ef51855bec97ad001e248cc0b4ccca885cfbfc763df87ea9e94c83ef8bced25c73181c2800
+DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
+DIST ttf-parser-0.21.1.crate 194876 BLAKE2B 8bf9f7528fdf091b656ad92ec55a5f0347428a12f75275f171be4f847fda6894f570345e7f8605db4557e8e3305f027263c59f203c5092ae70ecb250e4fe09eb SHA512 171b69853e131ae9bd9470e88f6a340def67246dcbb71a121121490fe91e4fdaa5ba0bdfc4a10da234d15c352fb6150dac945ec0eddbb5e6f1684293c917c991
+DIST tungstenite-0.20.1.crate 60095 BLAKE2B 9a9cc88aefe4f30d4e11673d2e3f757861dc5b082c026a6da54728b4a29dff1e88ca20e2641ef35ba95f01f8525b628b6d6e5410fdbd8d02954d626190e52a40 SHA512 e6a9311e521a7f882497ee7756d39de3ef963937f64ac09c20d28af4c49e9f0d14fe95fee3538c930d18ee1f9ad8e93c6faca1c4ddcbc5f444100dc02261c729
+DIST typeid-1.0.0.crate 7549 BLAKE2B f0d61e26f706a52bf7ef0e0967f0fd1181e70bef58d7d48f478b40883f9d38a0258149233876230fe936d94c8ad9335785bc3329f1ed61645d91a6ba1b4b303c SHA512 d26eb5cdf10eb3d429ac28a842aaa0393de7c949f8ba1bc134e428ffc7327f4bbe054792c7eb333720b17ac507992a8c703154d6217cd5430a8d90f8dfccb734
+DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
+DIST ucd-trie-0.1.6.crate 45790 BLAKE2B a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823 SHA512 00d9732797029c16d84fe518b2d90de841b87b5ed6c3628b9f097f5340f1e50778749db18f22e4ecc513f53624806ddc3484e5cc9ebffdbb6c0c800bef817e95
+DIST uds_windows-1.1.0.crate 17040 BLAKE2B c77914e150d2f0afc5c55680e28ba242238f4f1291948ae492fe63c16791e443ef33bafa6686cb753e53361ce452f2df27d2bf4088fb1ae203a47df3c55856bf SHA512 092c41f6fac2aacd5b83009b4aabe2cfc487cc1ad5ebc8237d9804aff0c5c823d3c079d99748e9ec3bb1c02b8a51f6a22e41441ec9a72c50600c08b1efdeb0ca
+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-mirroring-0.2.0.crate 8166 BLAKE2B 58ab3a4df79799c0bb379c90c9811e8731a4aeade9f56a2c6e64c300278522ca8482279c8a53ff6951e17c758bdfff56e807bfcdb54cc2a30709a0ae86069035 SHA512 2a3860277e7f791e0794a70759fb649acc750b75900e7aba06805d27ea9f91f4bbbd0d4a7c081492b541c6ddfda62c182b6e89aa7eb8e7ab6bd8a826a7448c2b
+DIST unicode-ccc-0.2.0.crate 8872 BLAKE2B 8f561aea18c3b4a90ddd611822fb93c10c0a2bf87e760994ef0d31c2d0f220aabdc9cb244ba6b0587f7dd425bc917b8e48c07fd402b2bb9a4fc03377e7bd9dde SHA512 e46a529acd6233fda1f726f8a5492b09ae2c276d965c78edc3c60f6d9699a2e3f7a06206059e31144520103ce841e7c65827df88c0938ed2601f8e867eaceeaa
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+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-properties-0.1.1.crate 41088 BLAKE2B 1cbe1df6b2d17ede3b83a65fcd09948637428d1ea17a051ea9da62b97a5564d34a39d3105e3d49362d52ad637656210cf03cfaae4b7b759a483a346e05c0db89 SHA512 377ce59a78cb7a0b5f040c90cd80ca800e9e48867df69ed3a5476618613c3520a3fb9306b212dcefc927e44db52f2cca99839b5ff762446dc190019f3ae0a039
+DIST unicode-script-0.5.6.crate 43993 BLAKE2B 37d7e1566a9b1810a4c4593de6ec5d82b05aad0dd9093e843894ce65eecfb631242a975958a9c6e795d623e1c415a8494d40a82af939c7b22065d2805505391f SHA512 624104995e164b0c9115d04d9e40a5331b224b321664520d396963a26ba2d153cecc79c3701da4f7b4cd4b65913d933c1712b5a73d7db707fcf045b2dd42b858
+DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
+DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
+DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
+DIST unicode_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b0547610f3417616603c4e837fbec0a41a6a715de19f88432f4c15ddb6b2ba55ee75a472fb7e2c888accfc77e1ef1d85fee SHA512 2d15499ee9318ee54910d657339820acfa88183e4f9aa146ac655129d2c4d76d3fd0550b601702ad2ccac4c8647dd2f26528d8003f39181e09b8ef480351a3cb
+DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
+DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
+DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
+DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
+DIST usvg-0.41.0.crate 128629 BLAKE2B d9854847b00b31a29caf7e73c582bca33f6670205ebb139e4d34cdc8f50aaff845a170926c6f149c1332d98a8b1e897452acc720ee484f9ef9bfc04897558973 SHA512 427d0412f3296058b048831c222a5fde4dad30fada279cc1a03da40697f2377f5a0883a1db4be7a0dd35574d919dd3299e832d9255fd15d2bd21551698999fc2
+DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
+DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
+DIST uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
+DIST v_frame-0.3.8.crate 14967 BLAKE2B 55c7463be72a6d2056710fb5ab695ef3eb309e2673dc683b2ec214331b99e6ad95f4bc7abcd39fb486669f907be2e3db098478889add30377be52583475424ff SHA512 4b42945193b5fda130bb54fe36abc6ced6b408a15d80352af21b01cb0881408d4f5127f68ad1b1dbb513358743ca8655545b55f45a2299de01f51071569f13cb
+DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
+DIST value-bag-1.9.0.crate 39936 BLAKE2B 78bd900226b9032f2016ae087f92e5f47ec282fba37dcbb204faa83ff4bcddca8f47a14f899d36dabe0df0a684c8f1874d26206edbb5fdbb30b883c09afb37cc SHA512 37b121feb957f81f9900cd5754bc3e5bbb5ac53e4f5626ee1aaacaf70d5c3d1c0128b26f585b8bcaf555970a0f023ee977fac836861a3f928b70b2b79ac5bac5
+DIST value-bag-serde1-1.9.0.crate 5504 BLAKE2B 6085853379ae1312ac64d57244f7d3f0f5f9376691504ccbe75efd47d73c34fc43ea491840e16f432f236ead7f45603b7a3fcaa3009ad7b88e42ef0bc5fe3e13 SHA512 0091fe78798924ae4cd7045647d8c1ec0f283114ec2b66d41dbfaa8da233acffe675b1e8a7ecc9fa96efd340a31383fdec35e2cda3ef80ef2684e8800d871945
+DIST value-bag-sval2-1.9.0.crate 5570 BLAKE2B 67edab53a16eb650259c464dcc5734d90c98637f0ebd273d72452a4300f7cbaa1acc60ff8170aabb63c5b710c44b4b1dbf7eb72467e5a70a07cd3c05db8f9537 SHA512 9132125c9acbed1d2bfff48c5dd72e3aa614f1370c6692e22b5cc3246176336acfdfc943a5c01f4ab61b94e56e913b45af7238b9ce13d6a1aba0cbac9a9d2f24
+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.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
+DIST vscode_theme-0.2.0.crate 20107 BLAKE2B 152f03b11b17ab5246f824db11dcc33064c27ef4239d02ff0bb57880de6eec7a1157cffb41633fb11f01e7e755fd39ba89d44833ba4437c8d61ea3b85cd75f08 SHA512 18fb72293a5ea95ef709d6b13492cab9089d90ef3cc1b347bb9cf81e272abc40b35240ace0999db146fa818f27f0c8a32d8641302c448a348eb1536dc3aa222d
+DIST vsimd-0.8.0.crate 21377 BLAKE2B 106c933a8755f9dff4e2a07e3ffb9d14dce6428177982bd1d38c95446cc11b7f8ce4a5c70d85d61f3cf089cda12d2b9745368cbee33b91d0e03b14d6c154010e SHA512 2c9c186369161dcedb6e1a5d95310a2886287d400a03ed507cdf1cccad02f2024fb727037aac0848d26a50a6ff1fe17d3902d60b876e9ca3a73b41482b536e54
+DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
+DIST vswhom-sys-0.1.2.crate 15852 BLAKE2B b21fbc0af440d3feac8ffb769f951f504e01f630d6f806d78a8f218eeb09ff8940328d6a9289e195deae9fdc43fdd55cfd037ae9c57b366ae57906b80d2f4785 SHA512 cd7e7b9e1953c70470d2f17210e83d28cd2c5ab8fc34ef0c9e06390e928853e375ed7bc2bda343b2f15820e989b5adc5bd33d9cea078716bc31545ff019435c8
+DIST vte-0.13.0.crate 55338 BLAKE2B 24a891db19d37980a3c920fdc3b0f8336d8ef8bd389e50f5900a5284593208bc6c92110b6035bef12ee01b527c62544f37ec45f9b55a43c54045e4a15fda6879 SHA512 833dc2f1c42cc0537f0185c00eca2ec76cd07cdd96a066a23366ffc2d7b8ae6903167d53002497265962954974e734cdd9bc06080030761cc1f7fd87c29d3bca
+DIST vte_generate_state_changes-0.1.2.crate 6503 BLAKE2B c7ebe8ce8014bd9dfe6f2daa61ef7913c60fdbf7f3e3c205c0543894e5d56117d4536b13a931555043355cd043d279776e820c481337f71edf6f62a8c75723af SHA512 343f639b9393569378fa9353f1a37c7a355cfd56948568ed49828308a1100dc3a6cc0a8253f8f8a82d6246eaed31bfdc206762a62a6ab9a862e4ed11a9e3bd14
+DIST waker-fn-1.2.0.crate 6685 BLAKE2B 26a5cb7941edfa50157bdee87142b734203110993224cb7d1b74fe0ea4cf5649c5c5c0ae8f10e9cd10662c3a0ee9e6c5a2a104fcf64beb3e3730f2266d307c04 SHA512 5f75c51a82081d0e3cc7a1d8473cd0e07ac17771b024401024a3324c12fd3f8dffae4661f669235ec96a50b70dc653ab46cd170b00b9f3b75b27f887eaa21b4d
+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 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.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 wasm-encoder-0.201.0.crate 50174 BLAKE2B d2f7fb0c288b84a2437b5e6243bb3247a4bfb5112bd6e66abc6a1dfc0635f611c803117e6554b153b8e0db3187155cc8746ca95cb4f2ec015707807a4c9821ad SHA512 4fd4af3ab8f47cbeea9a7e4ab4134cf8f4d39fc25d633c647fe93415378dd952202e2a8d8aedfd9e50b0be855f1e1ffefdf24c5d726c21f95a805f89fe80ce0c
+DIST wasm-encoder-0.207.0.crate 51033 BLAKE2B a445efe2b617845e0142053ede397c385ae721cc9a5be0a49250897bc5e566f60fde689f7626b55e8ae87ebc9ca3cf2f4d09729a7fd0a1d21f970bf319022144 SHA512 96d9fe62f500f81caefd8f45d3e091cb1cde7eb1d9fd90ad7b35350175cbe848fd10b06c1cd64e5171a3aab002d5647587491f9f64c1b277624ce4de7d721dff
+DIST wasm-metadata-0.201.0.crate 9851 BLAKE2B 834819f04610f8f892f670f7f865e418ecc7e543d7b287f07c718f1f2d11291792ebef02a4d0e73f0ccdd14ec1d50f5dba80a1173e55311d48456e6f2ec76e41 SHA512 b8f94a5a82e0d1693d8dc2ec7af4570cf561d956c6849a3e102ea94b9d1c2bdd54c32f02537352960375174e064487d4fe450be8b89276c8c87c6dbf684ec207
+DIST wasmparser-0.201.0.crate 193177 BLAKE2B f43af9591f5f8094198a00e0a89d3a25f0c79d94cffe4214f7f77e6a5aa726e3155e613130f635a0c07420f033d553170325a8558837b31c8e95718b3a082c72 SHA512 672e2255132717bee1535b1000b76a7906854d239fb67a8a1138bee1ce897e9320feb7479a789800ba18929ee4e8651006fd7db40e778bb2d9c918e32ee20ea7
+DIST wasmparser-0.207.0.crate 197388 BLAKE2B 275577722701006079473f4db63500890ef539091362357dded46d16dc2fdc281bd1e4cb7de3c94c53e6a5914419ccb80947c1786dadcdb6abb5cd18968d228b SHA512 45c7d42c248e4d2bb130b09bd5cffdeec95d3a25c66516df5981e203fb8ee27f3ee9d3b32428f8f5cab0282aba11dbc77a3eb0246ea9052ec6db1bae281ee900
+DIST wasmprinter-0.207.0.crate 37089 BLAKE2B b0d850c15896d6b2c4ba99187d2eb6a98b83a339ef0db7ba64de38fede39001051ef0895c3f9ce6548146eab2ef9fd5050d42a23185af34d6e5e2c0f8d8ec32a SHA512 60c3829b1caa22556d5ad6aef56177c1bd1f1a0ad91dc47360ffe5761c3ff52bacde5e3ee50731a6be23e8691e71e4258b6680381646db54546ea584e351f303
+DIST wasmtime-21.0.1.crate 578108 BLAKE2B 92e4b8e779ef8d68442c760bac0e33798bfffd6afd8af105374b79378c9f9820235be6fd27ac0dbe962794d21a27650f6148cd818909125fdd76057f7e9f50f3 SHA512 eb5e12cde4e704d3c54c2c05c4b66b8ea2a7a27c3afb3cc3395f3f2317e4bbf29a756a0a8e0e316adb146e53123083ed5406a97576fdc692688e1274277f8f3e
+DIST wasmtime-asm-macros-21.0.1.crate 1608 BLAKE2B 8e5772aecece7c790eef7aa0c1135d182cf780ca49733d0887bfd59091223859250aac72a3f2b684078c604ce5c8ad19e176bdab50e0c94272eaddd96c8da6a1 SHA512 8ceee892afb21262ef5235f55c369a4d731611c58e6e5d2a4731cf5c8bc5dd3d3ff6ee04eb70842c3865c8c803b83541c9a2aae487d8658567daccd99edb9832
+DIST wasmtime-c-api-impl-21.0.1.crate 82900 BLAKE2B 20b41efa346585bc81f32b4d0f36f666a0f708e02f6971fa5ccb4f1ef31b7c01f912c00df4cb1579d88b99aa5654417c7d32888cd8dab505e0587673169adc3f SHA512 ea526274b54775f2a7fb320a3cf4be43e2de2d6c40cdf99eb0f1e1a3c262ffb3fa55908e906b6cbb2cbc369b86fce8eb6335a6835dde279b0656d47959245351
+DIST wasmtime-c-api-macros-21.0.1.crate 1812 BLAKE2B d8cd9c09392637c822ac5c7cdc433129c6da87487529c8e444dd613f7b1ab26293fbc053e2ec94aefcef30ed6f02281e00a82f891711ba4b9ffc361c0fa39acf SHA512 7be515367e5670bf4687ac99629b467e0d9afa41cb0d7890c3fc5661b189d38642bc17e93c3bf24ca787b301b78771901d3645c83902428f1a67120e3ea99c77
+DIST wasmtime-component-macro-21.0.1.crate 19179 BLAKE2B ea21c27de53af25c6def49adae8ab4a96055ea500462df313f87cc2fa7c3a41cb8ec2415acd4a19929f2d82fa0f034ec6919a1e285ef725b104e87a7bdf8d9f9 SHA512 2489aea3c8968740e6daab7110fff991f354fdde32ac095b7cec4d33ece1d22a8b661b0058cd390bfb56b9085a87af446fc9ff67f1a8d9a614d0f3a3a855d7f2
+DIST wasmtime-component-util-21.0.1.crate 2430 BLAKE2B 0809d17595f44cbccdd184e85fdd35230906882e10195c8b57e4cdd1f536f1e8701090d87ccd69b51e22a510e2bfc74fe9eed3f98493c506f9acb32dbdae561b SHA512 e3f9620973e4347fe0b7304c268a1dc33d6ed4196f6a996532ec59563a3baf4b7a9a22486791e9333a55ed467695a6ac4741f7abe062754df66356dce9e4bf99
+DIST wasmtime-cranelift-21.0.1.crate 103170 BLAKE2B 2efdf2c2e524f84f89520c78dd9043d010b6bfac188bf559a7cdae52c264ec1d7856880aae083d79a13633b35e0e62c3e47ef9a02a7a58302ee6ded7aa94140b SHA512 5bc67215be88f5bca1034e25c86b3c2c1a69cd199f5a392925cc8c784be5eb9902310389afd9cbbfb58a4278d6de1dd15f118d4945699680bd216e412736fd15
+DIST wasmtime-environ-21.0.1.crate 169482 BLAKE2B 59ca2ed09b9af43a21a8bfe29712c86f522780ec003621d56fadc87e62503830c0b2106631eddf636b670701c060fc9d440b1d49a6e3c8a7bf0cfb4fef919f2f SHA512 bf3d364054343433fd37d04c5dfc59fe5d35331aa836c0ff6d28755d3e30c2883ec8e4a20edcad56c8d239a9bce7d43791e4b9776ff83954ac78e38c33954270
+DIST wasmtime-fiber-21.0.1.crate 22107 BLAKE2B 8ee7e0420f3e49825e3e74ad8f0b3649e53437af401d818d5ab79229be11743fecefce2b091fe0b234f91dfdf00b98360dae4899e153f5bdc4311e83177bfe6c SHA512 3fd25eb9fc4e78c62cb07f2bcf983d6c5fedef2c5f798a85c24ba2e4abf6b2409563348e9e9a7b99867a6d888a171e822bfc9cf1cc89dcdc54ae051dc36fffe8
+DIST wasmtime-jit-icache-coherence-21.0.1.crate 5664 BLAKE2B 97c325d4000674e1cf3e0bec5db12c72b7643addef549c1fb3cb8acf7b866027bf09a556a390e8414059ea3fa63f52ddb1ce03a15cb270d8d76ee9c341383286 SHA512 8ff26f9f93ca682e0f61ef6136de3387c6f94e6eb1425c31a604142ed77788424151affba253c2f31a757e9fe2ef74a156432a8797d39cb4eb11824cf7b60266
+DIST wasmtime-slab-21.0.1.crate 5071 BLAKE2B bcd86d09d39255cea50c69159f5eb83e36db2d45f6864c32f754777ff7269f65a921130ca0b9188a02fc8fdec5e8fff614d05ef8879a06c54434ab6b70f9c532 SHA512 8ee74d374562c89af1c94d3aa980684b16b8f5145648d79fb3b37690d845c943b58c9d98ef37d50b07cc79e5e74cdfa7f30e0003c68b626e9e6c5a2ea7195a80
+DIST wasmtime-types-21.0.1.crate 15271 BLAKE2B ef5ffd9fd63d457f46e93f85c66b7296df9392a8c293977691f2c8ad16f596b99699fb8198fd92cc58f836777290c19a7d0814fb589d97cba44602f044969da3 SHA512 0775d761d9d22bc0b080050676fb0eca14744507218f0c6fb35744b27b473b37b0a8e52ecde8296fa3a6277a6cb59d5a057d4ab6e44f4d9d71049bd16754f083
+DIST wasmtime-versioned-export-macros-21.0.1.crate 1567 BLAKE2B f470519deb26d8602dc561c401609efaaaf7f7b154e9becd2e289bd1d6e02b16f5a3701ef3751cd6ae576561ab4e3391c8792be59288c0cd9050e5e24a9cf032 SHA512 56bac09d5ccb53a8517c29c765f0fe9d530b09853d5ec3b92e4ac5c1b1324876c4bfe7dd6e143a9c0883f40baba409acbaa33d22f6ea6a9b049bd9d95d265647
+DIST wasmtime-wasi-21.0.1.crate 148008 BLAKE2B 7a1a1d25075cba6100317dd41ec35c94303929661972e3e639696f2a752262569c7e734f6aa8ba127d9fc429a37aa4dc4a8958fc1ef696968d0fb24a6b8ab299 SHA512 a77175d898684f2ad956cad22cc7664d5bbd44de5af4cfbdf77689e01378f70d3f4dd30c90314e1e841e5438f6fc886b0372dddbce8840617d19e69c15108647
+DIST wasmtime-winch-21.0.1.crate 8534 BLAKE2B 238e08659ed27c3f66ed2fd004a69c4481b20ea585659b87628f95d5a5fcb088d1f7ced1f5c1892889e52180d679511f3af8aaa9da6e251610da2363bb19148d SHA512 1fa2a7c8eee80d3913acbf8b50a9a3ca201346fabcad005594621e97ece5dc1d7bcc72caf12cbee0924b7f90527829bfacfe1c9093330446cb52c9ce5214d12d
+DIST wasmtime-wit-bindgen-21.0.1.crate 24100 BLAKE2B e280ba4be62433b691188809d815dedf0f61caafd656edc7b9f12c02ee985562c71cad1da413f8863cb64ce718f479d3e78d43176088b32f5f2b1383f480491f SHA512 5cc794fbe0c92916627814dc276da0490a362dfbf74e531f0240abde61a569dfe1e4ac0130265b78f7f0daaa16dcf160546b290884ccce5c39a2f4ae0985fc62
+DIST wast-35.0.2.crate 90940 BLAKE2B 96e7e855e20f9bce264d24705f53303b56990052aa572b9a366986ee13db9fe41ed8d8fd9652ab1a4129b09ad492346cc2695e68f511a71207d86fe227d11071 SHA512 0076bc3d5950d9026915b4271fc2e1b4d117913e0ebd459cec2acc78ab11a8e98b7bc98bd333c3924f8130ab0dffcb9b640475f38a53721ccc73ea54b73f0855
+DIST wayland-backend-0.3.6.crate 71562 BLAKE2B 33a91c4fdab42e7fc18100ba124905172c1cc3fc4aafa250c3b55b69dfe230eb39015c64d9ea8461cb57ac6b1665dfdab1c61db5186eaaa0be0988879e8ab2a1 SHA512 afe17c8855eeef89afc91b52ce1c0b0a4a7f6e3ebc72892693601033626038b1ebabdbae883336ae30ef9ac49b9e444831c6a5c2249fd167f45772d127395476
+DIST wayland-client-0.31.5.crate 63042 BLAKE2B 9efa3be373b5bd938eef796faa0c7647844f7e222e8e1c8e8f69cd0100122a2c4191ba70baff4a17f78e3d99c7270e523b3030327cc670f820afd4a7341ff586 SHA512 bc49d4c9d4f923ecb4416afb279f45da88742d372e716aa7299fb7b8778268e81e43298fbca122148ddc995fc7350a9bc80c27672603c2bcea834535c6827037
+DIST wayland-cursor-0.31.5.crate 7521 BLAKE2B 24194606485dfa406d87e5e49c2ece63e91370c8fa757da736ac28dd2b75b10d927aab84c3677b4bbea8fd4e8ad922a689b7f6fde25fb621e1eb361628b4836f SHA512 d8fda4c393954aa7b99432dfb405aed7dff76e6c3efb329bdf39ea677290953ee580dbd9c27772439a20b71c42b864301b4405bad2d8a2dc1bf93bb267f0237c
+DIST wayland-protocols-0.31.2.crate 147062 BLAKE2B 62d5ea52833d9edc661d405c83159f97c5bdbc41bdefbc9418a08971236cb74d317efe11e2e23ed6d96f0be27e4a830b4d47bf27d5b269e30e5a4cb97c469c8b SHA512 8f295413b20f308fbf337d8d6e2b6905061d32baa0aeea2aac55edeceadc754a121c56b8b96ca218aa902cfb26fa168c84334ef5033f8cc72e1505f1cfba06fa
+DIST wayland-protocols-plasma-0.2.0.crate 59992 BLAKE2B e43993c207db0ab01c09ca2ad523adaefa1b07978fe2bf67c1e16a8d7e24f443e181a4ebaab2555bc45119d0c66a26ac4f91de932d13b3fe1c881d9bcf0a211a SHA512 d72a03ae0c34b9102567b584971714734aa97e0bd85a3447663a0f88b05bc06a295b1aabc46b6c92701e620c2af87ad6a321a5daddab0df08e7e09f1337f3cb6
+DIST wayland-scanner-0.31.4.crate 35691 BLAKE2B e9c2cbf97719e7729892a777c37e865f22d22a6e1138d189a512c938e24ac710b6f431f7808c656facfb189a47a27564ccb6b687dcf3dc794b1ea87dfc8a6fc4 SHA512 44c41437a20e2f895e3330b4fe72eb6b7846a2287ce5f7e1f2aec1407cc324dc43549cbfc82aeaa23c69709e2c5c339b32aaf298b63ee675b8dded175ec7d0cc
+DIST wayland-sys-0.31.4.crate 8571 BLAKE2B 4a29e3250be6e9058e6c8a50b7146b37a77addbf434a926bda422f269d353cc0b97d33b8dbe39ed88a626374ee2346ae04693df9aee1142f22a6035abbbcb1e6 SHA512 fc33c5364501aed5145c95b095955fc71599fb626d30a3e33b58750e67cff7d3a9a765124e5c45e436ac0fdfcd416c825a63af6fb6500627fe28fab14cc1401d
+DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
+DIST webpki-roots-0.24.0.crate 245632 BLAKE2B e808ab5c6a271f7a778231e8476ad9226c7be26a7e8c19cef2da1266d7cc513b13ecba2486567509f940482322ffdaf51a9fe90a16abf1530d4fa96f54eb4c72 SHA512 a45aa3dabec67bfc10c025d1f480f61d0e549eef6976131c82d2d280c93d72f2efee202e6fa99356156a83deb71b5a80ce0ac351282bb3bf5eb9771a00dc4e1b
+DIST weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
+DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
+DIST which-6.0.2.crate 16608 BLAKE2B ef2250d0673fcbfffc07139f80dd4ef4eafa6333477b7c453cc35809bc74134448f9998a3cbb7788056f53ea05804526da7b67c416b839bc40a2657c3e091849 SHA512 7e1908c11b2f55c0dfceb1ab773a9269b6eb80ea0eb895ab9b58f4851cb15a46cbdb0635ec67439b17b11c5abb077b4c09f83cdaab5b3b3f077e1c1e20497bde
+DIST whoami-1.5.1.crate 24026 BLAKE2B 50a438f171c220aa19a4db7bb1a2ba6871f02bd47fe98e3d66bdf7662ea096a6bb612459b47178bc3aae85d1b58457a1ce5143a1176b23433b6cc4fa1da1c2c2 SHA512 b2cf3e2b8d1a12590055c3bb69c4a11448c846b837e44fb0041f030c31d6faa9ee55830a3fb07915adb8767936c06c7447718a4de46f3eda7ecc0f53a8140804
+DIST wiggle-21.0.1.crate 21856 BLAKE2B a96d40938988cb3308aa50e879d1a77e247b9b2e01ee57f3086f3be5feeb02fcc8e2627285038750ee2e3ce64c6d006d580d4b16ed47c4b0fee395a6b2f6ea80 SHA512 bad939e4fd65e917045584e18cb1c93b1a17fe1f19e5596e3719e03ee082feff67e938d208098794efaa44c763b171f7e97cb8a521182f44f9720c272536bc9f
+DIST wiggle-generate-21.0.1.crate 23472 BLAKE2B 15f47a223ce40770340895984a16bfa79f0f0714244ffea31dc10364f7c2bab0e662b6993c98e74bfaecc82c482a6cb9880ea0534aa7d735554ab471b249de03 SHA512 b81cdcfae839090a0ea0ccc4b3bc7c1b0694e95a341ca6e2cc54a7349155645177849bd0f57b9c2712c85f7268e0a5b6d1327cf5605fc6e724f9fb87db3e9660
+DIST wiggle-macro-21.0.1.crate 8181 BLAKE2B 1262c2481eb0e59c0b4cd0e9e01c17ff2e7a01f4cb37ae81d1ef8bb6537be0cccd75cccab6a76f55e504b4b96e4f2fb1ad5fb510a9a726e3bbab2322af40087e SHA512 d3a5d55e6064103e0ff13309de92c569cae9282b246ddd35df9e0a1456c7b454dc3ceb8cb1e2d817261c825fe8826956d6925a8ba34d5b8e74ce0d53ee567ff0
+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 winch-codegen-0.19.1.crate 100551 BLAKE2B 4b6a3b6498a07146255cc6f1b42336bc24c0efc55f7493afa794fd934b18bcafb66e022a87512778c64c0283a224dabde7ff65f424b9ae2727e6204563c30cbd SHA512 b2dfcc2b949c3d45f3db22d4414401fa87141c027772991184373f8f35ae8a5957d911e28bb9ab5b215858c72d56314e2fa530ca16eb5d741730b76d57754f82
+DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
+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.58.0.crate 9744521 BLAKE2B ad865c866cbc2825e35def7bd21c0a9015a87b8b9f1c01aa7b6a4ed49db8c8806e1fabdef9f729860d1501e79a4ed4872b19cfc347f5cd4c71d34baa3e14d052 SHA512 c4c6e4af6f6c4527325262189ef0106df5a1a0159c3cdab8d2364a0d7f060c197f109d2d021303779c8b3ff3295d13701e6fdeedcd67c8b09e9092d3279d2d8d
+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.58.0.crate 41022 BLAKE2B fcc1113ea97fd4fb889a8ce1a03f6cebf340c2e6c26136a4185860a98eac3585caba7269cea351c832e388c9c25974c7807fe1929691ab39a14f1cf56d9d869d SHA512 d864e373a3d04edce84ec133b98496ffdd0cba2fb547ed6e5bb7f717648f4fddda8fe4af73ed24a9bac1e3a44f1031de4ad145ae662dd26531ed875317d4526d
+DIST windows-implement-0.58.0.crate 10491 BLAKE2B ca5ed4a45179924feb41b319c39121a22bfeaab36f93c8b9d6a26e399b188019179b4e1a0079cbb8fba80f88b8e174d3ec036751915cc3d258ba58c0b6ece332 SHA512 34c57da756632272276c051d3d67ff3c00ea7bfda787313f0487d629135a18dea52ce4d7f887d7e6d56e004a6efd0da6b00496ce05e413eabf69970ed64065a5
+DIST windows-interface-0.58.0.crate 11246 BLAKE2B 347c0f50e8bf0f93a1cd82aa194591b982902cffe178e84ae14e2e77fcc97867f80c6f84fd93be885d241da734fb428c82f12d5b6c77c55096f91508f5c2ea45 SHA512 242ae57290b011330bd9d9bad4f982209a94781cd3831f0991168b70c763c50945a67dc80d02fda0c8149d22090124e44c0fb3f20ff7264d0f4adfd1d692cef7
+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.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.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.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.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.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.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.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 winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
+DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
+DIST winresource-0.1.17.crate 94561 BLAKE2B 153968ab26cbc5f0de8de4bab0f94f0096d24038145988b9f9d421c2e170307dfb9da59e4dd0a73e519c8cf38934a89ccdb2792f765b9adf9a7bf99de5ff961a SHA512 e0fad3351939bc1734490ee11f25014a831110d810e83faf815e6ab2bfdb9a1317e0a0e486f19c3607e20b4cfd9e09e5a9f2941080c61a37b61ec74d7fb837d8
+DIST winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21
+DIST winx-0.36.3.crate 13696 BLAKE2B 0fa67c6fbc362c740de041673216b4c91281d27e45688d0254b0a0f3881d261a0a1a02c4e69186a04723b64b6f98f76459d0d8f1e7a60bc29444cc49441ec5ff SHA512 076fe008a341e3499717ffeb0a547c25f8a4844c177638fd5c56a2e42d0892500e8bad9fbb45cd827a658eda1989e86184e42fe6b95547eede7f436b7d632702
+DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
+DIST wit-bindgen-0.22.0.crate 18348 BLAKE2B 996e2124fd254bfea80083b48dae8fbba8f8b90f0207fe8ea80d2257ae47a4da9a49d89e604f39e19adcb70197fb745a5c6efed5862c8393998b4f15f801daff SHA512 f965159461dcab0ac7908b21269badeddff45a936cd1c21d7f9dcb750bd219e89250787ea767418f91e60b6508aba3b197ba4cec09fe0931ba73517c162c1303
+DIST wit-bindgen-core-0.22.0.crate 19503 BLAKE2B b5330e678eae032b5dba789a9e210fad1dc7a1d582e93c4fcb418b5dcc19f8735da5d4618390baa0565083e035c5c77f701a83dfe066ee6c66348babb1261e15 SHA512 f4356a5abaad84cfddc777dbb355473aa99919d699fc5a5c5e7244f4e8331c368568978228240b5dfaca84111867555efda2f9903422174daded472a0040d20a
+DIST wit-bindgen-rt-0.22.0.crate 2615 BLAKE2B 4da5d26b2e4de7622413845277af9f4e690b218923cf966e8051e4024f9ba86f8edf000bcd0e6f9bc4b76d0225b44b184de05f3798e286892f1babbcf7a2d0c7 SHA512 d8ab09d8a65369b8d0deb2da08b90d255902e337bc1838f20542b91db6266d5731485c91fc37d149df38509f705bc5cb36778eb8e427cc746311c9d8769b64a7
+DIST wit-bindgen-rust-0.22.0.crate 38841 BLAKE2B de688e46cc7df1822881f283002c5b14092e717c7fe00497b9d067cb77843289f9de12a59a950682e538560cc1215d2b4811256c71d444db21d277b6da2f60ec SHA512 5c77c5387916e8adaa3fb09d796504dd7eecc0f66e09464a29978a0774b1adb633ed98fcb90f060aa473680efc84c872b1afa5567b51b431aab67bcb3331ab20
+DIST wit-bindgen-rust-macro-0.22.0.crate 5104 BLAKE2B 5481bb14fe832b1c77a6de17b47a7f21c163632172084116c83a58133a36107f634e62851506b5e57554ae8ab0f87a16779cc976c6da6f277d099f379c790d39 SHA512 0dd15a15feef76f978b577d29cdd1fe19a16f3e1dd2e55431a38d6362b1d3bcd57b603f9be5361bb383c6d4e03c85c187b3324d28429204928257339a24ce850
+DIST wit-component-0.201.0.crate 173541 BLAKE2B 99c825f903587a6c41bd4e2d7a1503c361e312a8b2d4acb85cc046192dac0c4f3a3d19fcd5a08ba528b1acd7e2b91b20bc179e547557481569d02e25a1fb18ae SHA512 1aeb4f8f17b139c21043350d68452ba2251b1763a063b189a23fbad258f44c15ac219ccfff9b75cc753d916ebb3fd66f16b605c632dd0c5904daab162013a9c1
+DIST wit-parser-0.201.0.crate 101526 BLAKE2B fd475366cd98766ab0e8539c52b25b700b33e6a99a5b53da76a615d3db46f073ef829f5d513101277febe923904f14f8526026f1c4738e960fdcdd7925d61b0f SHA512 a885a8a2ed50ec7c24747f539429d8bc73b6b207273b4ec1ec0bf3e6f08d6debb781127c012575fa36b585d78f1b33d4b36916e4b65dc13a704da71f3fa9d212
+DIST wit-parser-0.207.0.crate 103443 BLAKE2B fe49b8d7c8647fd2a7c05823c98ffc8c258fad36d5e29920a0bf654b5c68ef2e369fea362e2e18f806628f04d5b2f0f950f79fee8502b08d49dca5a3f97ff31e SHA512 eb6c3ccd8ec6cd8116eeb04b8244f38a03b0f1042ad18cbbd1da60d87e45d5c24e98882746313b27bb373b19458b079e75a27b1655243f542fa0ecbfd55770b7
+DIST witx-0.9.1.crate 45928 BLAKE2B 0c0ab76548f01e6bf2119d7de24fc94fc601d0d981c94c7b869945e00d405de9ad150ed4c0b25950f459f27018c5499e4cf3400a99db595f133eafdaa530deb0 SHA512 bd88171e5304e5249fb1429d918b6678dbb3da40eec0fd7fd1111adc097c43412c195bb4adc1ab85e112e53550a918fdcd4bb71e33ad2db028d030e7afe6d62a
+DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
+DIST x11-clipboard-0.9.2.crate 10334 BLAKE2B 03a8be7f27bb67638f798447c8b63d1cd81379dca5cdb7ac01b01f782383e39f07bef2cfecde21d8885b4bbeaba57713855e63c725d7f82e8a9cb3130ac66adc SHA512 e37658220cef7af41be576f2525bf51fb88a9a67b639ee73e23b4ca8e29cd6fdd787aeab31275cc5ea8f4e40e99f68b5cab14d04ff787518a463391c8965e38e
+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-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
+DIST xcursor-0.3.6.crate 6405 BLAKE2B ffd3c7b0a48c80eda2c2ee0257be2c4114930b558b877efce8dbd3da7ede7d253a3971259aa305edb31ace1a4449939252f2de0ecf56a47d163e2626a462e0e1 SHA512 edf14e470d7e99a6de0394736c180844ae8f73682a924a497fc6bff30120a614e7f79dc67fe791479a1c71294549a1c043f00f8994e6856910dd9d49a2cf755b
+DIST xdg-home-1.2.0.crate 3881 BLAKE2B 97e8869b2c2c72e8613a09049c7ad55dcd48ab124a713747d76c2106932152ce254ae19ab64a1d44959899334359ba1fd0f5b03ba3b9a7c797bd7158eaba55a1 SHA512 50b4ebf67b56e6880bb1340e6268aeac65f0ea38fcd3669becb77d356758434ef569c81844b9bfd17245f9d19f77cd7670388211ed5209052974c023d6151eab
+DIST xim-rs-27132caffc5b9bc9c432ca4afad184ab6e7c16af.gh.tar.gz 47343 BLAKE2B 89ef33e418ef41bd13b05152ebe3224c87aa6544d133d10d14d4dff7d373ad078cab6ee03f02aa3c2091a29e79fe197e0ccff58813c0139ffe92359027cc5414 SHA512 af8301e4e99c3f40ed36fd7b4a33a769193cb7f4fd3e0cd2b2c236b0eb62aa24dc578da977252f12dbdf1f1a4e7bc464aae53c49dea275fc830789e9eba5a37f
+DIST xkbcommon-rs-fcbb4612185cc129ceeff51d22f7fb51810a03b2.gh.tar.gz 58121 BLAKE2B f45a05820f40039f57c341d2c6cf3f375bfa4356e5f679a9f6fc6fdd764f1214375356ca3c7216e762735049f37b39d520c778732639365975a90369b38edb94 SHA512 513edf39326231f938747f3d5f195df89540cdf0e37867c2346378fb2bb7f0030bb83ea0422e4ca44a026a8eafa94ef6c4c07af3974e56a2c77b18e0ef9197fe
+DIST xkeysym-0.2.1.crate 103129 BLAKE2B ece5c6af4230b6a0397621a5b2b2bcc9bc0465beee89ea397660ff3800a8a7cdfd7752c4cb73b14596cbe20333479febdc5859bd484bbe5b07d62461934079a7 SHA512 47ff2d219c097f2e3c6d74f1ed4bfdb919c449a055b204154af4fe4b39cf5aba41d53a9f073833a75ee441b90171bdbbb528b765d68745d2b95d24ef81045834
+DIST xml5ever-0.18.1.crate 40190 BLAKE2B e8ec128f4a3593c74ab6004922aeaab47be88338c445315b83f2e77f32a5a8a391b3081aef9012d201b6d304bdc6ca8a5496ace1d7cebb7eee840f67a4007433 SHA512 e577ea667e782df0280919e9fe970e5f1808aa58db8aed6fc814cae22a7b9d74caa95fc5326e28e6d7a946c33991fccc61e9a7b6ff9f3d6bc5b4a2140b2c41ca
+DIST xmlparser-0.13.6.crate 26718 BLAKE2B 40796a610755a10de4f435c36e251093719321d9ddaa2f994640e37a48ab8a61742f3b5e031b6ef08de3327fb6acf1b19c2afd0ea80edb66ea5963a41e03b47b SHA512 25a42844c015aed196bdb35c99008d656137c6eab2194f274840e8f93ad382e5291768f138ffbe809bd07900e80f939b5755517cd51340ab8142b9b5b4d72db1
+DIST xmlwriter-0.1.0.crate 6261 BLAKE2B daaeac50ff4f0ec71dfe5e6292a895f8f33ae8dfcb40f6df46a47a5b866c4d69f4aee5c48a1a84d3c7ccafe768a438d177bc9b4bb4b5b0d5194e67b106575615 SHA512 a0d8bfe6e3d220358e8523212cddb84541e9d8208b2aea64a89037e4e9f4de62a7b549c9f1bacbd71e14de16707f061e547d89ba459843be45fa802db297fd58
+DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
+DIST yazi-0.1.6.crate 28835 BLAKE2B 31b13de2026d144b182b1f61f8221c68653c7bd5c779626743ca14930cc74aa5ba6e58bcaa514ed68bdd26a212b6b2b235e539e98f89a8dabe215ab21a924283 SHA512 026b506d2cea8770c8d2a426db6bc4fa263e82c4095162e176a3602db2cd305b4485fe9c64dd5dd619cb68e1a7ace7e97653eb351a8f0068c07099acafb526f9
+DIST yeslogic-fontconfig-sys-6.0.0.crate 6677 BLAKE2B 6f8cd2b5de9a397546641b6ce29530af6de5df78293d61f02b359ec4bbe4258ff76f396b4df984dd700f4a104d8b3a89d2ded47f0b0a16adb8b3ca89815da3ab SHA512 9cd38d8cd2a69d5a884a751664e07ac9f6e2e7caaa51f4933dd08c3e3eeb66f20d51574fa88b009a01ac750ffca03187de9e913f5eb4a65ad4baecd8190dd93d
+DIST zbus-4.4.0.crate 158301 BLAKE2B 7a9a3f8712d99285955020ec60c128289578824061964ae0c26d7f6b284f0ea393087dcf40ae15d13bf87977ba61acab71460120256a5f16b9e5f713fe0a9cad SHA512 2522cf51b6eeeb06b350a0fcacd7cb768459a55a524c8c379da8d0c6f1b7b946f352fe95f993b0af8297de4eb9e63e2f009888465a2b554cfd904d4ca3717699
+DIST zbus_macros-4.4.0.crate 31183 BLAKE2B 9448845e1cfa58d51688b74ddf0aa3e65d1621db3c636809426e67433074dcbce36cbe595dbdaca895650775e7971d9e1fd1e9feb7cad42ba6521839459b6780 SHA512 7fa5d4baa95f440be12d74d4c855f16f60803690020a6af1d28d1ba04d792ff763df3c2c3e4d275e0753a6effeaf597ad8cdedd4a34d4b93f8e69a34b31fa1dd
+DIST zbus_names-3.0.0.crate 10650 BLAKE2B 0c8a0ee67c9236ef51a1add3038d5ac5a9f00dccd9df059b16454754db44e7c5ac66b74f3f98c317ee73a1c982b8439d6a92995d984b9b9d744c3c9203edbed3 SHA512 e0ebd468f152ef8063faa547f60b58d2d87948e24741d1cec0e97eef1817653d524ce5519795db64a3a7d9101ee2c6b67f0bf2bade894c57b5c37aee19fc82ab
+DIST zed-0.150.4.tar.gz 12598599 BLAKE2B d732e97c1121fd9615625b5998714984e02f03cf3c6eac41cdbd316cb437797388ea328789c2b6e19e003b67cef5a324b18d6f906e594bd7fd404823b0d730da SHA512 e7198fea765805b5cd607e898b5676f2f76bc0b85e056f70fac60e5bf19e3ac1d0d73c16d6591acb6aa05ae7761410edf6c58758a2709b93bcad98cad3b46fe7
+DIST zed_extension_api-0.0.6.crate 11028 BLAKE2B 028a37613c6a496c21ea927778fd817293cb224b2f5ba3d2f9bf33028b6ca71a4cf9a95455f9a76e6a0c813913df889c021ef9f74e1e6da4291f13742406201d SHA512 4e55fb3ca868e704ecea7fba46a433d28a932f537daee8b9376809615983eded1fa7aff24c0ed92bdd54e0962ca1b30e8df8804f453e333900b5bdafed2b7688
+DIST zed_extension_api-0.1.0.crate 13650 BLAKE2B 53b7a6eddebbc634d9ca9874d414c643c4a02ffc9f3654b26c935a36b12b6b84a284fd65bf323b419156617efc42f52ca7bdb6c26df7fd3a6456cc6f4665fbdb SHA512 73259eebc17ac20969a7a05b9a44c4aea322f50b65e7b19893d33ee3339e20592561f3f2adca9221000cdd7a5407a17ef6d27aedb6123423c210f34df71d731f
+DIST zeno-0.2.3.crate 40164 BLAKE2B edbd5ff628adac05f8e4a8ac9ae31f45d6c202b425ff42172e87555a8fedee78caa4375de680dc3b09a8596c92f339579d051d3316b9ac40942038a7257ea14a SHA512 2faba002d8886b73172b187e6ee011cc19fb3209d0672cb86376595277161fa30f9dcbff950f5c5722482f7f8027af95373b6dec1f1054a9f1f8dcefc10a6f23
+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
+DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
+DIST zeromq-0.4.0.crate 55853 BLAKE2B 0d07ffac543a87d4d1df73eb7271e8b88a7b581f276c544afe0e5bb8bfb62305949aaba872e4a4d9b6b9b2c33d93f079b07bb38e1a17b870e3eb7fa60b020c27 SHA512 c0b7b39039605daf24048e8576b3c00b809cd1e06adcbc4c76f9e6b3d5b56048dad075313b87636927035a98d75bfdd2ee2f111752705ec38ce5ffa202d192c8
+DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c207922c38447459aa291961d3512d7c30016c51ddf49a8dadac0b7b2bf677b6a89d22670ec1e214607b476584a7e1b2dbf36d SHA512 d3f053c4acbdb45f3dadc9590db56095c761f0ff8899d22461f664701de766dde2fac2960a4477cd05d0a9c7ec200caa02ff891eb1f04630734996e0c38d10dd
+DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014
+DIST zstd-sys-2.0.13+zstd.1.5.6.crate 749090 BLAKE2B b5714217ca68255d0881adcaf282a6309de322c481fe4cf8c10d9b68748008a9ca0287e8323f5a118d3b052b7dfb257182555718599da843e09068a1e8df8c5f SHA512 c1f0176ebd0914879d0060796776c7fe376293ce9bc9f8f07ee3b809932a75aa033881d59a1bc99b6cd9af85b8e225fc09bcfc96013e556d7c11f155b759ecbf
+DIST zune-core-0.4.12.crate 17355 BLAKE2B d191a3fb225fae462dd71e082ca3a4356f165f630209947a65e861cd73993e2562aa8230db127d2c508ca6ed55dd1a5d3f7934fcfc8d0812ec9a81b958ddb333 SHA512 1106ec19018c7db15ef5c1db97883f8125e647336aab1579f02123b83452e97c9f2b53ebea72f4845e5b79f048e5802917a2d9fa215c9cac3892c3a1b14074eb
+DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
+DIST zune-jpeg-0.4.13.crate 62999 BLAKE2B 15938aa5539bdcdb7327dd8774cfd4600ac38bd18f72799abe6023dde338b6100287ff4af40d92d3d2f826fdcb7579096543b245d0f2d3062c9b43a5cc775b0d SHA512 ebd349cfee5756fff64cbfc9a59bfd1cf262453ec74c6225e058d4c09398e9c7086f340d6e5215dd72fa32d29bf0fc86e64cf42038ea1b0c1baa67097a214875
+DIST zvariant-4.2.0.crate 82180 BLAKE2B 6d8309a223c32eae3c1ba4291d69bab395a3ef0f65da1e380552d27ccc547a31cf32f9dcf2feecce34276c065d044d0c897c9468b6df4c16efa94a0668dd19eb SHA512 ae7329db133ff8c262443bfe6fc10698606501ecdde8295367f3876e9c590730778ad2d4977c27e26288c92737055897686e7a0d30210723279c33da7467af80
+DIST zvariant_derive-4.2.0.crate 11057 BLAKE2B 891c141bfa0db95a5ac62ab2c31bef1215ef658a787d855c09c9b0e42485cd8aa52683c82a07394042615ec51b42ae5efcde81e7dbd2a35f7670888b28477df2 SHA512 8a50d143b38d57a757b3a6b6293c43d7db1a563ccf25002ad6b6a69b7c157765c604329659318a0cb64df1ecf78b3f0dbe88d6650740c016da9161719427f9c2
+DIST zvariant_utils-2.1.0.crate 7043 BLAKE2B b891c5fc2b5afb5eba01b9068b454a965b4f07548c1a080fd5b598165994a5177a7df5f39cf7263ea8bcc5d054c7d87012ca1588737d630d96f24f0d00dee6cf SHA512 345b70d1106b37df41426efdb1ba49bf270e00898381c2a8021b5761c59efdea55def45cb2e2598b130b6cba8733503f3997a55578bca90867ab3e8f2346f80e
diff --git a/app-editors/zed/metadata.xml b/app-editors/zed/metadata.xml
new file mode 100644
index 000000000000..f60fa3e1bad4
--- /dev/null
+++ b/app-editors/zed/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>gentoo.2019@r123.de</email>
+		<name>Robert Siebeck</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zed-industries/zed</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-editors/zed/zed-0.150.4.ebuild b/app-editors/zed/zed-0.150.4.ebuild
new file mode 100644
index 000000000000..7279a02c1e9e
--- /dev/null
+++ b/app-editors/zed/zed-0.150.4.ebuild
@@ -0,0 +1,1161 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+	addr2line@0.22.0
+	adler@1.0.2
+	aes@0.8.4
+	ahash@0.7.8
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	aliasable@0.1.3
+	aligned-vec@0.5.0
+	allocator-api2@0.2.18
+	alsa-sys@0.3.1
+	alsa@0.9.0
+	ambient-authority@0.0.2
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	anstream@0.6.15
+	anstyle-parse@0.2.5
+	anstyle-query@1.1.1
+	anstyle-wincon@3.0.4
+	anstyle@1.0.8
+	any_vec@0.14.0
+	anyhow@1.0.86
+	approx@0.5.1
+	arbitrary@1.3.2
+	arg_enum_proc_macro@0.3.4
+	arrayref@0.3.8
+	arrayvec@0.7.4
+	as-raw-xcb-connection@1.0.1
+	ascii@1.1.0
+	ash-window@0.13.0
+	ash@0.38.0+1.3.281
+	ashpd@0.9.1
+	async-attributes@1.1.2
+	async-broadcast@0.7.1
+	async-channel@1.9.0
+	async-channel@2.3.1
+	async-compat@0.2.4
+	async-compression@0.4.12
+	async-dispatcher@0.1.2
+	async-executor@1.13.0
+	async-fs@1.6.0
+	async-fs@2.1.2
+	async-global-executor@2.4.1
+	async-io@1.13.0
+	async-io@2.3.3
+	async-lock@2.8.0
+	async-lock@3.4.0
+	async-native-tls@0.5.0
+	async-net@1.8.0
+	async-net@2.0.0
+	async-process@1.8.1
+	async-process@2.2.3
+	async-recursion@0.3.2
+	async-recursion@1.1.1
+	async-signal@0.2.9
+	async-std@1.12.0
+	async-stream-impl@0.3.5
+	async-stream@0.3.5
+	async-stripe@0.38.1
+	async-tar@0.4.2
+	async-task@4.7.1
+	async-trait@0.1.81
+	async-tungstenite@0.23.0
+	async-watch@0.3.1
+	async_zip@0.0.17
+	asynchronous-codec@0.7.0
+	atoi@2.0.0
+	atomic-waker@1.1.2
+	atomic@0.5.3
+	autocfg@1.3.0
+	av1-grain@0.2.3
+	avif-serialize@0.8.1
+	aws-config@1.5.5
+	aws-credential-types@1.2.0
+	aws-runtime@1.4.0
+	aws-sdk-s3@1.43.0
+	aws-sdk-sso@1.37.0
+	aws-sdk-ssooidc@1.38.0
+	aws-sdk-sts@1.37.0
+	aws-sigv4@1.2.3
+	aws-smithy-async@1.2.1
+	aws-smithy-checksums@0.60.12
+	aws-smithy-eventstream@0.60.4
+	aws-smithy-http@0.60.9
+	aws-smithy-json@0.60.7
+	aws-smithy-query@0.60.7
+	aws-smithy-runtime-api@1.7.2
+	aws-smithy-runtime@1.6.2
+	aws-smithy-types@1.2.0
+	aws-smithy-xml@0.60.8
+	aws-types@1.3.3
+	axum-core@0.3.4
+	axum-extra@0.4.2
+	axum@0.6.20
+	backtrace@0.3.73
+	base16ct@0.1.1
+	base64-simd@0.8.0
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bigdecimal@0.3.1
+	bincode@1.3.3
+	bindgen@0.65.1
+	bindgen@0.69.4
+	bit-set@0.5.3
+	bit-set@0.6.0
+	bit-vec@0.6.3
+	bit-vec@0.7.0
+	bit_field@0.10.2
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitstream-io@2.5.0
+	bitvec@1.0.1
+	block-buffer@0.10.4
+	block-padding@0.3.3
+	block@0.1.6
+	blocking@1.6.1
+	borsh-derive@1.5.1
+	borsh@1.5.1
+	bstr@1.10.0
+	built@0.7.4
+	bumpalo@3.16.0
+	by_address@1.2.1
+	bytecheck@0.6.12
+	bytecheck_derive@0.6.12
+	bytemuck@1.16.3
+	bytemuck_derive@1.7.0
+	byteorder-lite@0.1.0
+	byteorder@1.5.0
+	bytes-utils@0.1.4
+	bytes@0.4.12
+	bytes@1.7.1
+	calloop-wayland-source@0.3.0
+	calloop@0.13.0
+	camino@1.1.7
+	cap-fs-ext@3.2.0
+	cap-net-ext@3.2.0
+	cap-primitives@3.2.0
+	cap-rand@3.2.0
+	cap-std@3.2.0
+	cap-time-ext@3.2.0
+	cargo-platform@0.1.8
+	cargo_metadata@0.18.1
+	cargo_toml@0.20.4
+	cast@0.3.0
+	castaway@0.1.2
+	cbc@0.1.2
+	cbindgen@0.26.0
+	cc@1.1.7
+	cesu8@1.1.0
+	cexpr@0.6.0
+	cfg-expr@0.15.8
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chrono@0.4.38
+	chunked_transfer@1.5.0
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	cipher@0.4.4
+	clang-sys@1.8.1
+	clap@4.5.15
+	clap_builder@4.5.15
+	clap_derive@4.5.13
+	clap_lex@0.7.2
+	clickhouse-derive@0.1.1
+	clickhouse-rs-cityhash-sys@0.1.2
+	clickhouse@0.11.6
+	cobs@0.2.3
+	cocoa-foundation@0.1.2
+	cocoa@0.25.0
+	codespan-reporting@0.11.1
+	color_quant@1.1.0
+	colorchoice@1.0.2
+	combine@4.6.7
+	concurrent-queue@2.5.0
+	console@0.15.8
+	const-oid@0.9.6
+	const-random-macro@0.1.16
+	const-random@0.1.18
+	convert_case@0.4.0
+	convert_case@0.6.0
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	core-graphics@0.23.2
+	core-services@0.2.1
+	core-text@20.1.0
+	coreaudio-rs@0.11.3
+	coreaudio-sys@0.2.15
+	cpal@0.15.3
+	cpp_demangle@0.4.3
+	cpufeatures@0.2.12
+	cranelift-bforest@0.108.1
+	cranelift-codegen-meta@0.108.1
+	cranelift-codegen-shared@0.108.1
+	cranelift-codegen@0.108.1
+	cranelift-control@0.108.1
+	cranelift-entity@0.108.1
+	cranelift-frontend@0.108.1
+	cranelift-isle@0.108.1
+	cranelift-native@0.108.1
+	cranelift-wasm@0.108.1
+	crc-catalog@2.4.0
+	crc32c@0.6.8
+	crc32fast@1.4.2
+	crc@3.2.1
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	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.4.9
+	crypto-bigint@0.5.5
+	crypto-common@0.1.6
+	ctor@0.2.8
+	ctrlc@3.4.5
+	curl-sys@0.4.74+curl-8.9.0
+	curl@0.4.46
+	cursor-icon@1.1.0
+	dashmap@5.5.3
+	dashmap@6.0.1
+	dasp_sample@0.11.0
+	data-encoding@2.6.0
+	data-url@0.3.1
+	deflate64@0.1.9
+	der@0.6.1
+	der@0.7.9
+	deranged@0.3.11
+	derivative@2.2.0
+	derive_more@0.99.18
+	dialoguer@0.11.0
+	diff@0.1.13
+	digest@0.10.7
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	dlib@0.5.2
+	dotenvy@0.15.7
+	downcast-rs@1.2.1
+	doxygen-rs@0.4.2
+	dwrote@0.11.0
+	dyn-clone@1.0.17
+	ecdsa@0.14.8
+	either@1.13.0
+	elliptic-curve@0.12.3
+	embed-resource@2.4.3
+	embedded-io@0.4.0
+	emojis@0.6.3
+	encode_unicode@0.3.6
+	encoding_rs@0.8.34
+	endi@1.1.0
+	enumflags2@0.7.10
+	enumflags2_derive@0.7.10
+	env_filter@0.1.2
+	env_logger@0.11.5
+	envy@0.4.2
+	equivalent@1.0.1
+	erased-serde@0.4.5
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	errno@0.3.9
+	etagere@0.2.13
+	etcetera@0.8.0
+	euclid@0.22.10
+	event-listener-strategy@0.5.2
+	event-listener@2.5.3
+	event-listener@3.1.0
+	event-listener@5.3.1
+	exec@0.3.1
+	exr@1.72.0
+	fallible-iterator@0.3.0
+	fancy-regex@0.12.0
+	fast-srgb8@1.0.0
+	fastrand@1.9.0
+	fastrand@2.1.0
+	fd-lock@4.0.2
+	fdeflate@0.3.4
+	ff@0.12.1
+	filedescriptor@0.8.2
+	filetime@0.2.23
+	fixedbitset@0.4.2
+	flate2@1.0.31
+	float-cmp@0.9.0
+	float-ord@0.3.2
+	flume@0.11.0
+	fnv@1.0.7
+	font-types@0.6.0
+	fontconfig-parser@0.5.7
+	fontdb@0.18.0
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.1.1
+	foreign-types-shared@0.3.1
+	foreign-types@0.3.2
+	foreign-types@0.5.0
+	fork@0.1.23
+	form_urlencoded@1.2.1
+	freetype-sys@0.20.1
+	fs-set-times@0.20.1
+	fsevent-sys@3.1.0
+	fsevent-sys@4.1.0
+	funty@2.0.0
+	futf@0.1.5
+	futures-batch@0.6.1
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-intrusive@0.5.0
+	futures-io@0.3.30
+	futures-lite@1.13.0
+	futures-lite@2.3.0
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-timer@3.0.3
+	futures-util@0.3.30
+	futures@0.1.31
+	futures@0.3.30
+	fuzzy-matcher@0.3.7
+	generic-array@0.14.7
+	gethostname@0.4.3
+	getrandom@0.1.16
+	getrandom@0.2.15
+	gif@0.13.1
+	gimli@0.28.1
+	gimli@0.29.0
+	git2@0.19.0
+	glob@0.3.1
+	globset@0.4.14
+	gloo-timers@0.2.6
+	glow@0.13.1
+	gpu-alloc-ash@0.7.0
+	gpu-alloc-types@0.3.0
+	gpu-alloc@0.6.0
+	grid@0.13.0
+	group@0.12.1
+	h2@0.3.26
+	half@2.4.1
+	handlebars@4.5.0
+	hashbrown@0.12.3
+	hashbrown@0.13.2
+	hashbrown@0.14.5
+	hashlink@0.8.4
+	headers-core@0.2.0
+	headers@0.3.9
+	heck@0.3.3
+	heck@0.4.1
+	heck@0.5.0
+	heed-traits@0.20.0
+	heed-types@0.20.1
+	heed@0.20.5
+	hermit-abi@0.3.9
+	hermit-abi@0.4.0
+	hex@0.4.3
+	hexf-parse@0.2.1
+	hidden-trait@0.1.2
+	hkdf@0.12.4
+	hmac@0.12.1
+	home@0.5.9
+	hound@3.5.1
+	html5ever@0.27.0
+	html_to_markdown@0.1.0
+	http-body-util@0.1.2
+	http-body@0.4.6
+	http-body@1.0.1
+	http-range-header@0.3.1
+	http-types@2.12.0
+	http@0.2.12
+	http@1.1.0
+	httparse@1.9.4
+	httpdate@1.0.3
+	human_bytes@0.4.3
+	humantime@2.1.0
+	hyper-rustls@0.24.2
+	hyper-tls@0.5.0
+	hyper@0.14.30
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	id-arena@2.2.1
+	idna@0.5.0
+	ignore@0.4.22
+	image-webp@0.1.3
+	image@0.25.2
+	imagesize@0.12.0
+	imgref@1.10.1
+	indexmap@1.9.3
+	indexmap@2.3.0
+	indoc@2.0.5
+	infer@0.2.3
+	inherent@1.0.11
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	inout@0.1.3
+	instant@0.1.13
+	interpolate_name@0.2.4
+	io-extras@0.18.2
+	io-lifetimes@1.0.11
+	io-lifetimes@2.0.3
+	iovec@0.1.4
+	ipc-channel@0.18.2
+	ipnet@2.9.0
+	is-docker@0.2.0
+	is-terminal@0.4.12
+	is-wsl@0.4.0
+	is_terminal_polyfill@1.70.1
+	isahc@1.7.2
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.12.1
+	itoa@1.0.11
+	jni-sys@0.3.0
+	jni@0.21.1
+	jobserver@0.1.32
+	jpeg-decoder@0.3.1
+	js-sys@0.3.69
+	jsonwebtoken@9.3.0
+	khronos-egl@5.0.0
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	kurbo@0.11.0
+	kv-log-macro@1.0.7
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	leb128@0.2.5
+	lebe@0.5.2
+	libc@0.2.155
+	libfuzzer-sys@0.4.7
+	libgit2-sys@0.17.0+1.8.1
+	libloading@0.8.5
+	libm@0.2.8
+	libmimalloc-sys@0.1.39
+	libredox@0.1.3
+	libsqlite3-sys@0.26.0
+	libz-sys@1.1.18
+	linkify@0.10.0
+	linkme-impl@0.3.28
+	linkme@0.3.28
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.14
+	lmdb-master-sys@0.2.4
+	lock_api@0.4.12
+	log@0.4.22
+	loop9@0.1.5
+	lru@0.12.4
+	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
+	matchers@0.1.0
+	matchit@0.7.3
+	maybe-owned@0.3.4
+	maybe-rayon@0.1.1
+	md-5@0.10.6
+	memchr@2.7.4
+	memfd@0.6.4
+	memmap2@0.9.4
+	memoffset@0.9.1
+	metal@0.29.0
+	mimalloc@0.1.43
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.4
+	mint@0.5.9
+	mio@0.8.11
+	mio@1.0.1
+	miow@0.6.0
+	multimap@0.8.3
+	naga@22.1.0
+	nanoid@0.4.0
+	nanorand@0.7.0
+	native-tls@0.2.12
+	ndk-context@0.1.1
+	ndk-sys@0.5.0+25.2.9519653
+	ndk@0.8.0
+	new_debug_unreachable@1.0.6
+	nix@0.28.0
+	nix@0.29.0
+	nom@7.1.3
+	noop_proc_macro@0.3.0
+	notify@6.1.1
+	ntapi@0.4.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-derive@0.4.2
+	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_cpus@1.16.0
+	num_enum@0.7.3
+	num_enum_derive@0.7.3
+	num_threads@0.1.7
+	objc@0.2.7
+	object@0.33.0
+	object@0.36.2
+	oboe-sys@0.6.1
+	oboe@0.6.1
+	once_cell@1.19.0
+	oo7@0.3.3
+	oorandom@11.1.4
+	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-float@2.10.1
+	ordered-float@3.9.2
+	ordered-stream@0.2.0
+	ouroboros@0.17.2
+	ouroboros_macro@0.17.2
+	outref@0.5.1
+	overload@0.1.1
+	p256@0.11.1
+	page_size@0.6.0
+	palette@0.7.6
+	palette_derive@0.7.6
+	parity-tokio-ipc@0.9.0
+	parking@2.2.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	password-hash@0.5.0
+	paste@1.0.15
+	pathdiff@0.2.1
+	pathfinder_geometry@0.5.1
+	pathfinder_simd@0.5.4
+	pbkdf2@0.12.2
+	peeking_take_while@0.1.2
+	pem-rfc7468@0.7.0
+	pem@3.0.4
+	percent-encoding@2.3.1
+	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
+	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.3
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkcs8@0.9.0
+	pkg-config@0.3.30
+	plist@1.7.0
+	plotters-backend@0.3.6
+	plotters-svg@0.3.6
+	plotters@0.3.6
+	png@0.17.13
+	polling@2.8.0
+	polling@3.7.2
+	pollster@0.2.5
+	postage@0.5.0
+	postcard@1.0.8
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	precomputed-hash@0.1.1
+	pretty_assertions@1.4.0
+	prettyplease@0.2.20
+	proc-macro-crate@3.1.0
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.86
+	profiling-procmacros@1.0.15
+	profiling@1.0.15
+	prometheus@0.13.4
+	prost-build@0.9.0
+	prost-derive@0.9.0
+	prost-types@0.9.0
+	prost@0.9.0
+	protobuf@2.28.0
+	protols-tree-sitter-proto@0.2.0
+	psm@0.1.21
+	ptr_meta@0.1.4
+	ptr_meta_derive@0.1.4
+	pulldown-cmark@0.10.3
+	qoi@0.4.1
+	quick-error@2.0.1
+	quick-xml@0.32.0
+	quick-xml@0.34.0
+	quote@1.0.36
+	radium@0.7.0
+	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
+	rangemap@1.5.1
+	rav1e@0.7.1
+	ravif@0.11.9
+	raw-window-handle@0.6.2
+	raw-window-metal@0.4.0
+	rayon-core@1.12.1
+	rayon@1.10.0
+	read-fonts@0.20.0
+	redox_syscall@0.2.16
+	redox_syscall@0.4.1
+	redox_syscall@0.5.3
+	redox_users@0.4.5
+	regalloc2@0.9.3
+	regex-automata@0.1.10
+	regex-automata@0.4.7
+	regex-lite@0.1.6
+	regex-syntax@0.6.29
+	regex-syntax@0.8.4
+	regex@1.10.6
+	rend@0.4.2
+	reqwest@0.11.27
+	resvg@0.41.0
+	rfc6979@0.3.1
+	rgb@0.8.47
+	ring@0.17.8
+	rkyv@0.7.44
+	rkyv_derive@0.7.44
+	rmp@0.8.14
+	rmpv@1.3.0
+	rodio@0.17.3
+	roxmltree@0.19.0
+	roxmltree@0.20.0
+	rsa@0.9.6
+	runtimelib@0.14.0
+	rust-embed-impl@8.5.0
+	rust-embed-utils@8.5.0
+	rust-embed@8.5.0
+	rust_decimal@1.35.0
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix-openpty@0.1.1
+	rustix@0.37.27
+	rustix@0.38.34
+	rustls-native-certs@0.6.3
+	rustls-pemfile@1.0.4
+	rustls-webpki@0.101.7
+	rustls@0.21.12
+	rustversion@1.0.17
+	rustybuzz@0.14.1
+	ryu@1.0.18
+	salsa20@0.10.2
+	same-file@1.0.6
+	schannel@0.1.23
+	schemars@0.8.21
+	schemars_derive@0.8.21
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	scrypt@0.11.0
+	sct@0.7.1
+	sea-bae@0.2.0
+	sea-orm-macros@0.12.15
+	sea-orm@0.12.15
+	sea-query-binder@0.5.0
+	sea-query@0.30.7
+	seahash@4.1.0
+	sealed@0.4.0
+	sec1@0.3.0
+	security-framework-sys@2.11.1
+	security-framework@2.11.1
+	self_cell@1.0.4
+	semver@1.0.23
+	serde@1.0.207
+	serde_derive@1.0.207
+	serde_derive_internals@0.26.0
+	serde_derive_internals@0.29.1
+	serde_fmt@1.0.3
+	serde_json@1.0.125
+	serde_json_lenient@0.1.8
+	serde_path_to_error@0.1.16
+	serde_qs@0.10.1
+	serde_qs@0.8.5
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	serde_urlencoded@0.7.1
+	sha1@0.10.6
+	sha1_smol@1.0.1
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shell-words@1.1.0
+	shellexpand@2.1.2
+	shellexpand@3.1.0
+	shlex@1.3.0
+	signal-hook-registry@1.4.2
+	signal-hook@0.3.17
+	signature@1.6.4
+	signature@2.2.0
+	simd-adler32@0.3.7
+	simd_helpers@0.1.0
+	simdutf8@0.1.4
+	similar@1.3.0
+	simple_asn1@0.6.2
+	simplecss@0.2.1
+	simplelog@0.12.2
+	siphasher@0.3.11
+	siphasher@1.0.1
+	skrifa@0.20.0
+	slab@0.4.9
+	slice-group-by@0.3.1
+	slotmap@1.0.7
+	sluice@0.5.5
+	smallvec@1.13.2
+	smart-default@0.6.0
+	smol@1.3.0
+	smol_str@0.1.24
+	socket2@0.4.10
+	socket2@0.5.7
+	spdx@0.10.6
+	spin@0.9.8
+	spirv@0.3.0+sdk-1.3.268.0
+	spki@0.6.0
+	spki@0.7.3
+	sptr@0.3.2
+	sqlformat@0.2.4
+	sqlx-core@0.7.2
+	sqlx-macros-core@0.7.2
+	sqlx-macros@0.7.2
+	sqlx-mysql@0.7.2
+	sqlx-postgres@0.7.2
+	sqlx-sqlite@0.7.2
+	sqlx@0.7.2
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strict-num@0.1.1
+	string_cache@0.8.7
+	string_cache_codegen@0.5.2
+	stringprep@0.1.5
+	strsim@0.11.1
+	strum@0.25.0
+	strum_macros@0.25.3
+	subtle@2.6.1
+	sval@2.13.0
+	sval_buffer@2.13.0
+	sval_dynamic@2.13.0
+	sval_fmt@2.13.0
+	sval_json@2.13.0
+	sval_nested@2.13.0
+	sval_ref@2.13.0
+	sval_serde@2.13.0
+	svg_fmt@0.4.3
+	svgtypes@0.15.1
+	swash@0.1.18
+	syn@1.0.109
+	syn@2.0.72
+	syn_derive@0.1.8
+	sync_wrapper@0.1.2
+	synchronoise@1.0.1
+	sys-locale@0.3.1
+	sysinfo@0.30.13
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	system-deps@6.2.2
+	system-interface@0.27.2
+	taffy@0.4.4
+	take-until@0.2.0
+	tap@1.0.1
+	target-lexicon@0.12.16
+	tempfile@3.12.0
+	tendril@0.4.3
+	termcolor@1.4.1
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tiff@0.9.1
+	tiktoken-rs@0.5.9
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tiny-keccak@2.0.2
+	tiny-skia-path@0.11.4
+	tiny-skia@0.11.4
+	tiny_http@0.8.2
+	tinytemplate@1.2.1
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	tokio-io@0.1.13
+	tokio-macros@2.4.0
+	tokio-native-tls@0.3.1
+	tokio-rustls@0.24.1
+	tokio-stream@0.1.15
+	tokio-tungstenite@0.20.1
+	tokio-util@0.7.11
+	tokio@1.39.2
+	toml@0.5.11
+	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
+	tower-http@0.3.5
+	tower-http@0.4.4
+	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-futures@0.2.5
+	tracing-log@0.2.0
+	tracing-serde@0.1.3
+	tracing-subscriber@0.3.18
+	tracing@0.1.40
+	tree-sitter-bash@0.21.0
+	tree-sitter-c@0.21.4
+	tree-sitter-cpp@0.22.3
+	tree-sitter-css@0.21.0
+	tree-sitter-elixir@0.2.0
+	tree-sitter-embedded-template@0.20.0
+	tree-sitter-go@0.21.0
+	tree-sitter-html@0.20.3
+	tree-sitter-jsdoc@0.21.0
+	tree-sitter-json@0.21.0
+	tree-sitter-python@0.21.0
+	tree-sitter-regex@0.21.0
+	tree-sitter-ruby@0.21.0
+	tree-sitter-rust@0.21.2
+	tree-sitter-typescript@0.21.2
+	tree-sitter-yaml@0.6.1
+	try-lock@0.2.5
+	ttf-parser@0.21.1
+	tungstenite@0.20.1
+	typeid@1.0.0
+	typenum@1.17.0
+	ucd-trie@0.1.6
+	uds_windows@1.1.0
+	unicase@2.7.0
+	unicode-bidi-mirroring@0.2.0
+	unicode-bidi@0.3.15
+	unicode-ccc@0.2.0
+	unicode-ident@1.0.12
+	unicode-linebreak@0.1.5
+	unicode-normalization@0.1.23
+	unicode-properties@0.1.1
+	unicode-script@0.5.6
+	unicode-segmentation@1.11.0
+	unicode-width@0.1.13
+	unicode-xid@0.2.4
+	unicode_categories@0.1.1
+	unindent@0.1.11
+	untrusted@0.9.0
+	url@2.5.2
+	urlencoding@2.1.3
+	usvg@0.41.0
+	utf-8@0.7.6
+	utf8parse@0.2.2
+	uuid@1.10.0
+	v_frame@0.3.8
+	valuable@0.1.0
+	value-bag-serde1@1.9.0
+	value-bag-sval2@1.9.0
+	value-bag@1.9.0
+	vcpkg@0.2.15
+	version-compare@0.2.0
+	version_check@0.9.5
+	vscode_theme@0.2.0
+	vsimd@0.8.0
+	vswhom-sys@0.1.2
+	vswhom@0.1.0
+	vte@0.13.0
+	vte_generate_state_changes@0.1.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.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
+	wasm-encoder@0.201.0
+	wasm-encoder@0.207.0
+	wasm-metadata@0.201.0
+	wasmparser@0.201.0
+	wasmparser@0.207.0
+	wasmprinter@0.207.0
+	wasmtime-asm-macros@21.0.1
+	wasmtime-c-api-impl@21.0.1
+	wasmtime-c-api-macros@21.0.1
+	wasmtime-component-macro@21.0.1
+	wasmtime-component-util@21.0.1
+	wasmtime-cranelift@21.0.1
+	wasmtime-environ@21.0.1
+	wasmtime-fiber@21.0.1
+	wasmtime-jit-icache-coherence@21.0.1
+	wasmtime-slab@21.0.1
+	wasmtime-types@21.0.1
+	wasmtime-versioned-export-macros@21.0.1
+	wasmtime-wasi@21.0.1
+	wasmtime-winch@21.0.1
+	wasmtime-wit-bindgen@21.0.1
+	wasmtime@21.0.1
+	wast@35.0.2
+	wayland-backend@0.3.6
+	wayland-client@0.31.5
+	wayland-cursor@0.31.5
+	wayland-protocols-plasma@0.2.0
+	wayland-protocols@0.31.2
+	wayland-scanner@0.31.4
+	wayland-sys@0.31.4
+	web-sys@0.3.69
+	webpki-roots@0.24.0
+	weezl@0.1.8
+	which@4.4.2
+	which@6.0.2
+	whoami@1.5.1
+	wiggle-generate@21.0.1
+	wiggle-macro@21.0.1
+	wiggle@21.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
+	winch-codegen@0.19.1
+	windows-core@0.52.0
+	windows-core@0.54.0
+	windows-core@0.58.0
+	windows-implement@0.58.0
+	windows-interface@0.58.0
+	windows-result@0.1.2
+	windows-result@0.2.0
+	windows-strings@0.1.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.48.0
+	windows@0.52.0
+	windows@0.54.0
+	windows@0.58.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.5.40
+	winnow@0.6.18
+	winreg@0.50.0
+	winreg@0.52.0
+	winresource@0.1.17
+	winsafe@0.0.19
+	winx@0.36.3
+	wio@0.2.2
+	wit-bindgen-core@0.22.0
+	wit-bindgen-rt@0.22.0
+	wit-bindgen-rust-macro@0.22.0
+	wit-bindgen-rust@0.22.0
+	wit-bindgen@0.22.0
+	wit-component@0.201.0
+	wit-parser@0.201.0
+	wit-parser@0.207.0
+	witx@0.9.1
+	wyz@0.5.1
+	x11-clipboard@0.9.2
+	x11rb-protocol@0.13.1
+	x11rb@0.13.1
+	xattr@0.2.3
+	xcursor@0.3.6
+	xdg-home@1.2.0
+	xkeysym@0.2.1
+	xml5ever@0.18.1
+	xmlparser@0.13.6
+	xmlwriter@0.1.0
+	yansi@0.5.1
+	yazi@0.1.6
+	yeslogic-fontconfig-sys@6.0.0
+	zbus@4.4.0
+	zbus_macros@4.4.0
+	zbus_names@3.0.0
+	zed_extension_api@0.0.6
+	zed_extension_api@0.1.0
+	zeno@0.2.3
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+	zeromq@0.4.0
+	zstd-safe@5.0.2+zstd.1.5.2
+	zstd-sys@2.0.13+zstd.1.5.6
+	zstd@0.11.2+zstd.1.5.2
+	zune-core@0.4.12
+	zune-inflate@0.2.54
+	zune-jpeg@0.4.13
+	zvariant@4.2.0
+	zvariant_derive@4.2.0
+	zvariant_utils@2.1.0
+"
+
+declare -A GIT_CRATES=(
+	[alacritty_terminal]='https://github.com/alacritty/alacritty;cacdb5bb3b72bad2c729227537979d95af75978f;alacritty-%commit%/alacritty_terminal'
+	[async-pipe]='https://github.com/zed-industries/async-pipe-rs;82d00a04211cf4e1236029aa03e6b6ce2a74c553;async-pipe-rs-%commit%'
+	[blade-graphics]='https://github.com/kvark/blade;ac25c77ed8d86c386a541c935ffe0a0f6024e701;blade-%commit%/blade-graphics'
+	[blade-macros]='https://github.com/kvark/blade;ac25c77ed8d86c386a541c935ffe0a0f6024e701;blade-%commit%/blade-macros'
+	[blade-util]='https://github.com/kvark/blade;ac25c77ed8d86c386a541c935ffe0a0f6024e701;blade-%commit%/blade-util'
+	[cosmic-text]='https://github.com/pop-os/cosmic-text;542b20ca4376a3b5de5fa629db1a4ace44e18e0c;cosmic-text-%commit%'
+	[font-kit]='https://github.com/zed-industries/font-kit;40391b7c0041d8a8572af2afa3de32ae088f0120;font-kit-%commit%'
+	[lsp-types]='https://github.com/zed-industries/lsp-types;72357d6f6d212bdffba3b5ef4b31d8ca856058e7;lsp-types-%commit%'
+	[nvim-rs]='https://github.com/KillTheMule/nvim-rs;69500bae73b8b3f02a05b7bee621a0d0e633da6c;nvim-rs-%commit%'
+	[tree-sitter-gomod]='https://github.com/camdencheek/tree-sitter-go-mod;1f55029bacd0a6a11f6eb894c4312d429dcf735c;tree-sitter-go-mod-%commit%'
+	[tree-sitter-gowork]='https://github.com/d1y/tree-sitter-go-work;dcbabff454703c3a4bc98a23cf8778d4be46fd22;tree-sitter-go-work-%commit%'
+	[tree-sitter-heex]='https://github.com/phoenixframework/tree-sitter-heex;6dd0303acf7138dd2b9b432a229e16539581c701;tree-sitter-heex-%commit%'
+	[tree-sitter-language]='https://github.com/tree-sitter/tree-sitter;7f4a57817d58a2f134fe863674acad6bbf007228;tree-sitter-%commit%/lib/language'
+	[tree-sitter-md]='https://github.com/zed-industries/tree-sitter-markdown;e3855e37f8f2c71aa7513c18a9c95fb7461b1b10;tree-sitter-markdown-%commit%'
+	[tree-sitter]='https://github.com/tree-sitter/tree-sitter;7f4a57817d58a2f134fe863674acad6bbf007228;tree-sitter-%commit%/lib'
+	[xim-ctext]='https://github.com/npmania/xim-rs;27132caffc5b9bc9c432ca4afad184ab6e7c16af;xim-rs-%commit%/xim-ctext'
+	[xim-parser]='https://github.com/npmania/xim-rs;27132caffc5b9bc9c432ca4afad184ab6e7c16af;xim-rs-%commit%/xim-parser'
+	[xim]='https://github.com/npmania/xim-rs;27132caffc5b9bc9c432ca4afad184ab6e7c16af;xim-rs-%commit%'
+	[xkbcommon]='https://github.com/ConradIrwin/xkbcommon-rs;fcbb4612185cc129ceeff51d22f7fb51810a03b2;xkbcommon-rs-%commit%'
+)
+
+LLVM_COMPAT=( 18 )
+
+inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
+
+DESCRIPTION="The fast, collaborative code editor"
+HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
+SRC_URI="
+	https://github.com/zed-industries/zed/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}"
+
+LICENSE="0BSD AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 GPL-3+ ISC LGPL-3 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+CHECKREQS_DISK_BUILD="8G"
+
+DEPEND="
+	app-arch/zstd:=
+	dev-db/sqlite:3
+	dev-libs/libgit2:=
+	dev-libs/mimalloc
+	dev-libs/openssl:0/3
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	dev-util/vulkan-tools
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/vulkan-loader[X]
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon[X]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=virtual/rust-1.80.0
+	dev-util/vulkan-headers
+	sys-devel/gettext
+	sys-devel/mold
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+"
+
+QA_FLAGS_IGNORED="usr/bin/zed"
+
+pkg_setup() {
+	if tc-is-gcc; then
+		export CARGO_PROFILE_RELEASE_LTO="true"
+	elif tc-is-clang; then
+		export CARGO_PROFILE_RELEASE_LTO="thin"
+	fi
+	strip-unsupported-flags
+	# flags from upstream
+	export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-arg=-fuse-ld=mold -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
+	# linking error with llvm-18
+	export RUSTFLAGS="${RUSTFLAGS} -C link-args=-Wl,-z,nostart-stop-gc"
+}
+
+src_prepare() {
+	default
+
+	# Cargo offline fetch workaround
+	local TS_COMMIT="7f4a57817d58a2f134fe863674acad6bbf007228"
+	local TS_GIT="git = \"https://github.com/tree-sitter/tree-sitter\", rev = \"${TS_COMMIT}\""
+	local TS_PATH="path = \"${WORKDIR}/tree-sitter-${TS_COMMIT}/lib\""
+
+	sed -e "s#${TS_GIT}#${TS_PATH}#" \
+		-i "${S}/Cargo.toml" || die "Cargo fetch workaround failed"
+}
+
+src_configure() {
+	cargo_src_configure --all-features
+}
+
+src_compile() {
+	export RELEASE_VERSION="${PV}"
+	export ZED_UPDATE_EXPLANATION='Updates are handled by portage'
+	cargo_src_compile --package zed --package cli
+}
+
+src_install() {
+	newbin $(cargo_target_dir)/cli zed
+	exeinto "/usr/libexec"
+	newexe $(cargo_target_dir)/zed zed-editor
+
+	newicon -s 512 crates/zed/resources/app-icon.png zed.png
+	newicon -s 1024 crates/zed/resources/app-icon@2x.png zed.png
+	make_desktop_entry /usr/bin/zed Zed zed.png "TextEditor;Development;IDE"
+}
+
+src_test () {
+	mkdir -p "${HOME}/.config/zed" || die
+	mkdir -p "${HOME}/.local/share/zed/logs/" || die
+
+	cargo_src_test
+}
diff --git a/app-emacs/apheleia/apheleia-4.2.ebuild b/app-emacs/apheleia/apheleia-4.2.ebuild
index cca10275eb7b..2ac3b20c3310 100644
--- a/app-emacs/apheleia/apheleia-4.2.ebuild
+++ b/app-emacs/apheleia/apheleia-4.2.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/radian-software/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-emacs/async/Manifest b/app-emacs/async/Manifest
index 5c875af3bfcf..5d16310c1957 100644
--- a/app-emacs/async/Manifest
+++ b/app-emacs/async/Manifest
@@ -1 +1,2 @@
 DIST emacs-async-1.9.8.tar.gz 33508 BLAKE2B 2e22c67c5bebe3c821d010a0f379aab9728fedb7a6345b81bcb7b093ffc54dbba1c7fa79d41eb5878b24024056607fff7d532b4702a7dc52163837af93c83f41 SHA512 c4c5406ce28dbfea0130b43a7f85d0a47626cf630c73318280896bd28f29bf5a8949077c242cd9c6162fecabbc619b2a270d532df341c4e286f1f7bb499da5f3
+DIST emacs-async-1.9.9.tar.gz 35182 BLAKE2B 80e981289d768d9c69922c7c439ba7bcfe5d803ebf211ebc64d7428b88d3a7a90e9f824a5bb06d21aa90cfe998ce1915be32a9ddd28eafe177162b104f67081a SHA512 ddf4e6bdc3a305f987396a34d80cc957040bc726106ac0f28bb288ce5eb77d4e35d78214834757c90a7bf85f896a5d095493673117ef2a0eeacf3e366ee64714
diff --git a/app-emacs/async/async-1.9.9.ebuild b/app-emacs/async/async-1.9.9.ebuild
new file mode 100644
index 000000000000..842a0084c79e
--- /dev/null
+++ b/app-emacs/async/async-1.9.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ "${PV}" == 1.9.9 ]] && COMMIT="f317b0c9c3e60a959f45d035ed5e31a78f1263ac"
+
+REAL_PN="emacs-async"
+REAL_P="${REAL_PN}-${PV}"
+
+inherit elisp
+
+DESCRIPTION="Simple library for asynchronous processing in Emacs"
+HOMEPAGE="https://github.com/jwiegley/emacs-async/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/jwiegley/${REAL_PN}.git"
+else
+	SRC_URI="https://github.com/jwiegley/${REAL_PN}/archive/${COMMIT}.tar.gz
+		-> ${REAL_P}.tar.gz"
+	S="${WORKDIR}/${REAL_PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests buttercup
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/async/async-9999.ebuild b/app-emacs/async/async-9999.ebuild
new file mode 100644
index 000000000000..090af108d29c
--- /dev/null
+++ b/app-emacs/async/async-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+REAL_PN="emacs-async"
+REAL_P="${REAL_PN}-${PV}"
+
+inherit elisp
+
+DESCRIPTION="Simple library for asynchronous processing in Emacs"
+HOMEPAGE="https://github.com/jwiegley/emacs-async/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/jwiegley/${REAL_PN}.git"
+else
+	SRC_URI="https://github.com/jwiegley/${REAL_PN}/archive/v${PV}.tar.gz
+		-> ${REAL_P}.tar.gz"
+	S="${WORKDIR}/${REAL_PN}-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests buttercup
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/auctex/auctex-14.0.5.ebuild b/app-emacs/auctex/auctex-14.0.5.ebuild
index 35047df54168..110d2d7bf3a9 100644
--- a/app-emacs/auctex/auctex-14.0.5.ebuild
+++ b/app-emacs/auctex/auctex-14.0.5.ebuild
@@ -20,7 +20,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
 
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-3+ FDL-1.3+"
@@ -36,6 +36,7 @@ RDEPEND="
 "
 BDEPEND="
 	${RDEPEND}
+	preview-latex? ( dev-texlive/texlive-latexextra )
 "
 
 TEXMF="/usr/share/texmf-site"
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index 214237e1cd99..f01fb4dab902 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1 +1,2 @@
 DIST buttercup-1.35.tar.gz 93375 BLAKE2B 7bedd4a8576f900934e3a39cdb5a58e85e6b9ec682cc1030495d50d686880ef14d73afbd49340856c3b3279548babf7297ba787f1a17bfd3dee81bd8a72f2f4a SHA512 416edb974999e2eac38040ce72c241ab961cc63f40068711b0436e4f3ca49025955d5ee2d93168770da0f251269652e36c1c9c0436f6ee6133c6ca859dbfe487
+DIST buttercup-1.36.tar.gz 94614 BLAKE2B 1c76424188eb09df0b5f46f5c97b8633d11bd324a587cf968de2314f8639b66fc06cb2cee727f4cbc91b3fabeca41f2cfdb5f3ff87d6d2318fffaa3fabfc9280 SHA512 bc7d8d90537687b8d97927f14ac7c401ac9b538b315da6ae418c7af801d1f9461f4b2d9185102e6621240189dda4a8b547cd84332e38bc56458889dab6ec0f66
diff --git a/app-emacs/buttercup/buttercup-1.36.ebuild b/app-emacs/buttercup/buttercup-1.36.ebuild
new file mode 100644
index 000000000000..c3c99dc78c46
--- /dev/null
+++ b/app-emacs/buttercup/buttercup-1.36.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp edo
+
+DESCRIPTION="Behaviour-driven Elisp testing"
+HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/jorgenschaefer/emacs-${PN}.git"
+else
+	SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-${P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( docs/{running,writing}-tests.md  )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	edo ${EMACS} ${EMACSFLAGS} -L . -l buttercup -f buttercup-run-discover
+}
+
+src_install() {
+	elisp_src_install
+
+	exeinto /usr/bin
+	doexe "bin/${PN}"
+}
diff --git a/app-emacs/cape/Manifest b/app-emacs/cape/Manifest
index c8527d3d788a..403317a69fd6 100644
--- a/app-emacs/cape/Manifest
+++ b/app-emacs/cape/Manifest
@@ -1,2 +1,3 @@
 DIST cape-1.5.tar.gz 41327 BLAKE2B 5bf499786483161e485764b64dfe70f8aaf21e176e72f9a755fe0d681d107e690b28bc0c7d841b62154616e1dc38bf475577e7357719ce4e82a1184ac849e198 SHA512 d47e9c8b78a51e93e6dbd6c41440021eb117cb5c865a27cebeaf25a00891b7d315593e542f416c2b47c38f768b3fa663361f31798523534d60168dd68f2714b3
 DIST cape-1.6.tar.gz 41526 BLAKE2B 740c2bedaefa2cd05f01a010bcf5358aa97a14cd51242183113073be0a9504f00bd882971d9e88cc8b5d4c61c482536ea79c1b330b07dd8f0636751f1612d065 SHA512 33157f48acd7e14a14c6ecff125dfcdf68536a8e47965adaa4ebd2d5d1a4cde1928f65458c3a4d6ddc7c02bd4aa5054185e4a5342936972cb44e9df0aabe5606
+DIST cape-1.7.tar.gz 41760 BLAKE2B 7291e8203d6c7f4fd0e4a8ac92b3bda350a99f120fdcc0b6f802e85f70c2736fd680882bf7374d3f17dd50473070072df019675b42aa557545533294e79c49ec SHA512 24c7e11ed2d9daf25254fb8e65d2df3c34468eaba4ac5062798978ab8e43684c476c05809fff4dc6a9fa1ac56eb04d72d28ed58992cc771a5f8c6d4c1eeba28c
diff --git a/app-emacs/cape/cape-1.6.ebuild b/app-emacs/cape/cape-1.6.ebuild
index 99068b9ad304..397234d7eb8d 100644
--- a/app-emacs/cape/cape-1.6.ebuild
+++ b/app-emacs/cape/cape-1.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/cape/cape-1.7.ebuild b/app-emacs/cape/cape-1.7.ebuild
new file mode 100644
index 000000000000..99068b9ad304
--- /dev/null
+++ b/app-emacs/cape/cape-1.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Completion At Point Extensions"
+HOMEPAGE="https://github.com/minad/cape/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/minad/${PN}.git"
+else
+	SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-29.1.4.0
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=( CHANGELOG.org README.org )
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-org-export-to texinfo README.org
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/compat/compat-30.0.0.0.ebuild b/app-emacs/compat/compat-30.0.0.0.ebuild
index 0de9f6e50e90..f9891ce90b16 100644
--- a/app-emacs/compat/compat-30.0.0.0.ebuild
+++ b/app-emacs/compat/compat-30.0.0.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/emacs-compat/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/consult/consult-1.8.ebuild b/app-emacs/consult/consult-1.8.ebuild
index 7f3ed9bf0123..91fc4479473f 100644
--- a/app-emacs/consult/consult-1.8.ebuild
+++ b/app-emacs/consult/consult-1.8.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/corfu/corfu-1.5.ebuild b/app-emacs/corfu/corfu-1.5.ebuild
index d8351fe993cc..6daec23d6251 100644
--- a/app-emacs/corfu/corfu-1.5.ebuild
+++ b/app-emacs/corfu/corfu-1.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/denote/Manifest b/app-emacs/denote/Manifest
index b453b2bfe34c..66779d7109d5 100644
--- a/app-emacs/denote/Manifest
+++ b/app-emacs/denote/Manifest
@@ -1,2 +1,2 @@
-DIST denote-3.0.7.tar.gz 243763 BLAKE2B ed65226f77e50428cc35faccb0f51caa406f46de2aeeb9fddb6513912e68296a1edf41a7ea40f529bc15ec020118934d31cc2aeb905462b0fbe9295c56621c0f SHA512 ec8abb9b751c16abb4d48fc5d1531badba1e2d5a08534c2f31236fd86b03c89d68dcf05085aaa998724d09a809efef8ee580ddb58e043b256ad6040070c08f77
 DIST denote-3.0.8.tar.gz 244541 BLAKE2B bbabd44e0a4f1dada6988fc40bca17df801e888c78585111db4e8366a2f26218dc6a161d822b4e58d38be3495e2b3f96e0a3e90544e0419080d9848aa33d9aff SHA512 93b46c6a9b582c7e2d571bbb56f48c67a173a448d59346161a0b7f11cd3c9f51ab4ec4e7dbc56860e1130454a29538e7802cc5ff9bcc5d0c1888e15ee153ac6a
+DIST denote-3.1.0.tar.gz 261197 BLAKE2B f729aba152456f579bf1c5548390be906a326df7210672b6bf5072f4bd8b25273e791f627d22ebf9ba70a0ef78635ea91abca6cf7752c84e0ae8b27be436f078 SHA512 44b089c3fb9bc66646670134f5909512c21c7eb429553e0b5d16cec72fdd7825cdf94d3d96b70e0c06ab739eb4bd905ba0315bf639d0951e96487e69b8d033f3
diff --git a/app-emacs/denote/denote-3.0.7.ebuild b/app-emacs/denote/denote-3.0.7.ebuild
deleted file mode 100644
index f665dafb38c0..000000000000
--- a/app-emacs/denote/denote-3.0.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
-
-NEED_EMACS=28.1
-
-inherit elisp
-
-DESCRIPTION="Simple notes for Emacs with an efficient file-naming scheme"
-HOMEPAGE="https://protesilaos.com/emacs/denote/
-	https://github.com/protesilaos/denote/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
-else
-	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-RESTRICT="test"                                              # Some tests fail.
-
-DOCS=( CHANGELOG.org README.md )
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo.el"
-
-elisp-enable-tests ert tests
-
-src_compile() {
-	elisp-org-export-to texinfo README.org
-	elisp_src_compile
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/denote/denote-3.1.0.ebuild b/app-emacs/denote/denote-3.1.0.ebuild
new file mode 100644
index 000000000000..d68a28164d3f
--- /dev/null
+++ b/app-emacs/denote/denote-3.1.0.ebuild
@@ -0,0 +1,53 @@
+# 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="Simple notes for Emacs with an efficient file-naming scheme"
+HOMEPAGE="https://protesilaos.com/emacs/denote/
+	https://github.com/protesilaos/denote/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
+else
+	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( CHANGELOG.org README.md )
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert tests
+
+src_prepare() {
+	default
+
+	# Skip failing test. Tests are marked as "WORK IN PROGRESS" at the
+	# top of the file.
+	local -a skip_tests=(
+		denote-test--denote-get-identifier
+		denote-test--denote-journal-extras-daily--title-format
+	)
+	local skip_test=""
+	for skip_test in "${skip_tests[@]}"; do
+		sed -i "/${skip_test}/a (ert-skip nil)" tests/denote-test.el || die
+	done
+}
+
+src_compile() {
+	elisp-org-export-to texinfo README.org
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/diff-hl/diff-hl-1.10.0.ebuild b/app-emacs/diff-hl/diff-hl-1.10.0.ebuild
index 841fee81ceca..bb4b0457b3fb 100644
--- a/app-emacs/diff-hl/diff-hl-1.10.0.ebuild
+++ b/app-emacs/diff-hl/diff-hl-1.10.0.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/dgutov/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/ebib/Manifest b/app-emacs/ebib/Manifest
index 4443dd818749..9df8f6e4670f 100644
--- a/app-emacs/ebib/Manifest
+++ b/app-emacs/ebib/Manifest
@@ -1,3 +1,2 @@
-DIST ebib-2.41.1.tar.gz 1048824 BLAKE2B 1746f782f3445e0d2bfb9cd9b62273b95afd4dc0e940943ba57f7e3b7855c4e1e174d9255d41a2829ad8f43bbbd04142da3c70a9afeb4ad467ecb7542215bcd9 SHA512 2b948b2381680779b68ab7015b1a840ac8437b63ae9a74a157d7b9beb37105eb1a12d170302e8000879233aaedb103006d4b31967f9b923d8879ff03c3f1c97b
 DIST ebib-2.42.2.tar.gz 1051145 BLAKE2B 5df8b1a50a6538be2632876ac32f077f88c638b3a3312283856c11262c8e80be169806bd81e03af2e45fd13bad39ab124f49a78f88ee345a438007be634290b4 SHA512 b562c9046ae0cf2f02deb08a8bc2b6e58322ee7d8e59e59ddc680779dae0e8182fbe790407369fe6e5db39aaf2bb974b387da63447234716d972f5ef98be920b
-DIST ebib-2.42.tar.gz 1051129 BLAKE2B 2ae2b523c271b1bc8d6376d48519dcf3dfd0c5df1673625c90728ceeeaf148d39e779142733ce3d390087907c51ecc9fe50bb2399111ac8dcf6de7b6a9b6ccd2 SHA512 1c937cada22f5c59ea8e5f26ce88a084a3824b153ac5f78e34c0702f72628f6e96dc5672b1f0cf307413880e578744a07591907de468f6992813205d50ad61ed
+DIST ebib-2.43.tar.gz 1052384 BLAKE2B c1a0ace0c754ed6b157d85eaa735a3f367a2dddc5ad30f2406fb23d960fddd7db5b6224a5037d233796b4fe2935f90703ce890c12d908a18e1b63256f2692ba2 SHA512 3857eaeaded544390118d384aefc0b67d1f123fb8f024a157e4ee3643bf2948489699f759456745fbf51d3259f0fa41cd0fa763f59caea43b571b1d0d30ad7ee
diff --git a/app-emacs/ebib/ebib-2.41.1.ebuild b/app-emacs/ebib/ebib-2.41.1.ebuild
deleted file mode 100644
index b7bcc581be0e..000000000000
--- a/app-emacs/ebib/ebib-2.41.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
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-DESCRIPTION="BibTeX database manager for Emacs"
-HOMEPAGE="https://joostkremers.github.io/ebib/
-	https://github.com/joostkremers/ebib/"
-
-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}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	>=app-emacs/compat-29.1.4.4
-	app-emacs/parsebib
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		app-emacs/with-simulated-input
-	)
-"
-
-DOCS=( README.md docs )
-SITEFILE="50${PN}-gentoo.el"
-
-elisp-enable-tests ert-runner test
-
-src_install() {
-	elisp_src_install
-
-	doinfo "${PN}.info"
-}
diff --git a/app-emacs/ebib/ebib-2.42.ebuild b/app-emacs/ebib/ebib-2.42.ebuild
deleted file mode 100644
index b7bcc581be0e..000000000000
--- a/app-emacs/ebib/ebib-2.42.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
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-DESCRIPTION="BibTeX database manager for Emacs"
-HOMEPAGE="https://joostkremers.github.io/ebib/
-	https://github.com/joostkremers/ebib/"
-
-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}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	>=app-emacs/compat-29.1.4.4
-	app-emacs/parsebib
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		app-emacs/with-simulated-input
-	)
-"
-
-DOCS=( README.md docs )
-SITEFILE="50${PN}-gentoo.el"
-
-elisp-enable-tests ert-runner test
-
-src_install() {
-	elisp_src_install
-
-	doinfo "${PN}.info"
-}
diff --git a/app-emacs/ebib/ebib-2.43.ebuild b/app-emacs/ebib/ebib-2.43.ebuild
new file mode 100644
index 000000000000..688763487ce1
--- /dev/null
+++ b/app-emacs/ebib/ebib-2.43.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/ebib/
+	https://github.com/joostkremers/ebib/"
+
+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}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-29.1.4.4
+	app-emacs/parsebib
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/with-simulated-input
+	)
+"
+
+DOCS=( README.md docs )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert-runner test
+
+src_install() {
+	elisp_src_install
+
+	doinfo "${PN}.info"
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 9925c457e4e4..0cdc1d18fecc 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1,2 @@
 DIST ebuild-mode-1.72.tar.xz 41968 BLAKE2B 24170aa6f23022f47707445eebbb7272c898fa8ca922d0a1ee57962ccc9feed6ea608661998e3f812a0b5fcc8ce8d8ff0baa890505dad846e0dc4b5c9e0b4236 SHA512 7f2234f9f5053f9588fb25d673dbce10a9d6e5c056ea7dabf04ffe5a0f8da7064b81829229339c5d98ee7ce840eb6c8b9ec24fcfd3dee2d5b798b5e6adb81e10
-DIST ebuild-mode-1.73.tar.xz 45264 BLAKE2B 115f67f9bfbf80ce5ddda1cc1dfee62aec15cb66c694b634361762c47c8c5afa6cdf0bc6c374440e939accbe9b13df0a84a7957b8c8c72a13324d2544388124a SHA512 855fdd0c94da77bae8f948fbc02782d47a0982e4a3d8ccff5d77a9c6b1f55b80a78144b493e5949e04b196cf8ee95e1fcc0b84c6ecace1a7d687ed6733d25820
+DIST ebuild-mode-1.75.tar.xz 48592 BLAKE2B 2273357c2736e0952637bb00754f0eff8379b5bd27793dac43d4d17e12affb8e88925ef321bd74709bc1054953f3fe3263b676c9faab93434558f45f55a70b28 SHA512 c00835513db517f07361ffa9fc86e8b268c89126fb1a0c88950e8566fcae296f115e29e6fa371bd93be34d6938e2a828e3382ea0b489a3e72af972b4f7b22e2e
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.73.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.75.ebuild
index bda04074ec46..bda04074ec46 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.73.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.75.ebuild
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
deleted file mode 100644
index 262206f99709..000000000000
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
+++ /dev/null
@@ -1,30 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'ebuild-mode "ebuild-mode"
-  "Major mode for Gentoo .ebuild and .eclass files." t)
-(autoload 'ebuild-repo-mode "ebuild-mode"
-  "Minor mode for files in an ebuild repository." t)
-(autoload 'ebuild-repo-mode-maybe-enable "ebuild-mode")
-(autoload 'devbook-mode "devbook-mode"
-  "Major mode for editing the Gentoo Devmanual." t)
-(autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
-  "Major mode for Gentoo GLEP 42 news items." t)
-(autoload 'glep-mode "glep-mode"
-  "Major mode for Gentoo Linux Enhancement Proposals." t)
-
-(add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode))
-(add-to-list 'auto-mode-alist '("/devmanual.*\\.xml\\'" . devbook-mode))
-(add-to-list 'auto-mode-alist
-	     '("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'"
-	       . gentoo-newsitem-mode))
-(add-to-list 'auto-mode-alist '("/glep.*\\.rst\\'" . glep-mode))
-(add-to-list 'auto-mode-alist
-	     '("/\\(package\\.\\(mask\\|unmask\\|use\\|env\
-\\|license\\|properties\\|accept_\\(keywords\\|restrict\\)\\)\
-\\|\\(package\\.\\)?use.\\(stable\\.\\)?\\(force\\|mask\\)\\)\\'"
-	       . conf-space-mode))
-(add-to-list 'auto-mode-alist
-			 '("/make\\.\\(conf\\|defaults\\)\\'" . conf-unix-mode))
-(add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode))
-(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
-(add-hook 'find-file-hook #'ebuild-repo-mode-maybe-enable)
-(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
diff --git a/app-emacs/ef-themes/Manifest b/app-emacs/ef-themes/Manifest
index 67f73da4e8d6..5b5077f4b868 100644
--- a/app-emacs/ef-themes/Manifest
+++ b/app-emacs/ef-themes/Manifest
@@ -1,2 +1,2 @@
-DIST ef-themes-1.4.0.tar.gz 163456 BLAKE2B b3939d467ebf8c57c3975b5bd449bd419fa334febc2d792323b2b14c967e98a34537a766b350c668ff4e893eddd23a55104f7a7af4f437a21bf8e0006dc9fd17 SHA512 ddbad5f6829911cc8806b865ae0f7ef8741224a37b1f8c82bdc66ed0cc8475d1b76707b57bbf34a98bb71d3c9e8ea25d065a79efc1a5803a901f8e08968c83f9
 DIST ef-themes-1.7.0.tar.gz 180301 BLAKE2B f9e0c152cc19c60ccfe27036d33e274d50deee016d56f154ca1cce5350bd3c23bcf73005ea890226e9e665cc284fb1e4e1328a0a66d79f0abb2b725c4d2780f4 SHA512 07cce282ea87af53349195b0fe35d1c89156f3456f09ababe3dbacdb2a00bc90f505d935504d6cd5f5fd6ef4f997102269e854ec4cea4c35441e3b5118f2b7d1
+DIST ef-themes-1.8.0.tar.gz 185303 BLAKE2B 6f5e76ed70e08a42abfead6109b62d4c463166238c9f0a531be4c826109d359008348d38bab09a9d343ae4b8302526d64ccedefb8d58bafa39177d12f66e0e73 SHA512 60a7fe6bb6846f10bf5cbc1a4ae55e212d77f551f619bf3f99e06ac2c789e9f854098e2c841c544d22b82509a175ee52c05f5365ff665a723f64d0b8c788b11a
diff --git a/app-emacs/ef-themes/ef-themes-1.4.0.ebuild b/app-emacs/ef-themes/ef-themes-1.4.0.ebuild
deleted file mode 100644
index e12280ff911b..000000000000
--- a/app-emacs/ef-themes/ef-themes-1.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Colourful and legible themes for GNU Emacs"
-HOMEPAGE="https://github.com/protesilaos/ef-themes/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
-else
-	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-DOCS=( CHANGELOG.org README.md README.org contrast-ratios.org )
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-org-export-to texinfo README.org
-
-	elisp_src_compile
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/ef-themes/ef-themes-1.8.0.ebuild b/app-emacs/ef-themes/ef-themes-1.8.0.ebuild
new file mode 100644
index 000000000000..80527024d575
--- /dev/null
+++ b/app-emacs/ef-themes/ef-themes-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# 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="Colourful and legible themes for GNU Emacs"
+HOMEPAGE="https://github.com/protesilaos/ef-themes/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
+else
+	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( CHANGELOG.org README.md README.org contrast-ratios.org )
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-org-export-to texinfo README.org
+
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/ef-themes/ef-themes-9999.ebuild b/app-emacs/ef-themes/ef-themes-9999.ebuild
index e12280ff911b..80527024d575 100644
--- a/app-emacs/ef-themes/ef-themes-9999.ebuild
+++ b/app-emacs/ef-themes/ef-themes-9999.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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="Colourful and legible themes for GNU Emacs"
 HOMEPAGE="https://github.com/protesilaos/ef-themes/"
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
 else
 	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-emacs/elfeed/elfeed-3.4.2.ebuild b/app-emacs/elfeed/elfeed-3.4.2.ebuild
index f80e50607eb2..defe11bca4f3 100644
--- a/app-emacs/elfeed/elfeed-3.4.2.ebuild
+++ b/app-emacs/elfeed/elfeed-3.4.2.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/app-emacs/emacsql/Manifest b/app-emacs/emacsql/Manifest
index e355feb1fcf3..768407f97421 100644
--- a/app-emacs/emacsql/Manifest
+++ b/app-emacs/emacsql/Manifest
@@ -1,2 +1,3 @@
 DIST emacsql-3.1.1.tar.gz 2392710 BLAKE2B 7281c9630c26363d9e88463a3ead8b241a3fc1a5e87cbf855eb233ef6b295ca6ba4ea4a79b5137b27f9eed33012dfaa183dab7be8e76b240305ee921edebe874 SHA512 0ec3890cfa014a0afef23e2e38bcd844527b0a497bbfe6f89cbbb090811d43996074e642f83f7f49b27659fc51a901645a54aac600e9988dcb40fffe86a06fbf
 DIST emacsql-4.0.0.tar.gz 2398791 BLAKE2B 55a67c5da79e290ba1024a8704113276d6db9d05e539eba79bded01d4092c3565a50c48608cb0932ad0e06d0b1a378e61cceffc8bb910c03da717c6f0a70e62b SHA512 040d8fc9a28505102791ea203d8cb58520ea871b2abc937a128e7d26eba62e89886094874c69806a3e6e5e01cafff5d9caf699438693b03ccd383aa5f94ae949
+DIST emacsql-4.0.1.tar.gz 2398167 BLAKE2B a88470cf561f50e64e4efc1a291cd55b192a4b8c414cf928f81dc8003aefe3b651cd21ea69a5a11de1c07f9e30edeb000a6e95d760eba44f15381a04f5c96b32 SHA512 3b1d6ced510e4bf0cf71da35279ca962584a1d54ab648795249aa77df7ce230e6ccd849dad498a36901de12827d6a633e5015a00b6e96533e77cdfe001c16e7b
diff --git a/app-emacs/emacsql/emacsql-4.0.1.ebuild b/app-emacs/emacsql/emacsql-4.0.1.ebuild
new file mode 100644
index 000000000000..d95717bb989e
--- /dev/null
+++ b/app-emacs/emacsql/emacsql-4.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit edo elisp toolchain-funcs
+
+DESCRIPTION="A high-level Emacs Lisp RDBMS front-end"
+HOMEPAGE="https://github.com/magit/emacsql"
+
+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/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+# TODO(arsen): postgres-pg using app-emacs/pg (unpackaged as of yet)
+IUSE="+sqlite postgres mysql"
+
+DEPEND="
+	sqlite? (
+		dev-db/sqlite:3
+	)
+"
+RDEPEND="
+	${DEPEND}
+	postgres? (
+		dev-db/postgresql
+	)
+	mysql? (
+		virtual/mysql
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Not packaged.
+	rm emacsql-pg.el || die
+
+	local -A backends=(
+		[sqlite]=sqlite
+		[postgres]=psql
+		[mysql]=mysql
+	)
+
+	for useflag in "${!backends[@]}"; do
+		if ! use "${useflag}"; then
+			rm emacsql-"${backends[${useflag}]}".el || die
+		fi
+	done
+}
+
+src_compile() {
+	if use sqlite; then
+		edo $(tc-getCC) -fPIC -Wall -Wextra \
+			$($(tc-getPKG_CONFIG) --cflags --libs sqlite3) \
+			${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o emacsql-sqlite \
+			sqlite/emacsql.c
+	fi
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+
+	if use sqlite; then
+		exeinto "${SITELISP}"/emacsql/sqlite
+		doexe emacsql-sqlite
+	fi
+}
diff --git a/app-emacs/exwm/Manifest b/app-emacs/exwm/Manifest
index a53c22d1d11e..d6a9b058da8b 100644
--- a/app-emacs/exwm/Manifest
+++ b/app-emacs/exwm/Manifest
@@ -1 +1,2 @@
 DIST exwm-0.28.tar.gz 93246 BLAKE2B ec6afeeaf7609d68561c9ec87316c0135bc5e0341c3dba91964221e15edc75442097f4c5c0730d7eaf8e00010b6f88e4deb1f283ada61bd8e7333f21088dbf8b SHA512 5b5db21de7ac6c0c9f38ce6fdc66f5fb366fa50c52ba7d5fd76c9764cbda6b19f3c01213c7af2dba7605f66e7527367204fe1b5c10c1dda6d2ed7aae87312749
+DIST exwm-0.31.tar.gz 97908 BLAKE2B 4e6d49f273296696c2b9c77d5a38409feddf3bbda395f8255068138962a7561c23a2b6943b74a87d8ac6bbd4153b7bd30bdb5ea4f799be325c5160b54db0f2e6 SHA512 7ada593f8197ca959ce40e440f411029f1ea49fde60ddd27e799c84ecc0dc4559fbed16d8265833c14b3df332ea630e9fe56c6b160bb2faaadefe37582b8c2a5
diff --git a/app-emacs/exwm/exwm-0.31-r1.ebuild b/app-emacs/exwm/exwm-0.31-r1.ebuild
new file mode 100644
index 000000000000..8fb5d13de099
--- /dev/null
+++ b/app-emacs/exwm/exwm-0.31-r1.ebuild
@@ -0,0 +1,44 @@
+# 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 X Window Manager"
+HOMEPAGE="https://github.com/emacs-exwm/exwm/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-exwm/${PN}.git"
+else
+	SRC_URI="https://github.com/emacs-exwm/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	app-emacs/xelb
+"
+RDEPEND="
+	${BDEPEND}
+	x11-apps/xrandr
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}/examples"
+	doins xinitrc
+}
diff --git a/app-emacs/flycheck-clang-tidy/flycheck-clang-tidy-0.3.0_p20201116.ebuild b/app-emacs/flycheck-clang-tidy/flycheck-clang-tidy-0.3.0_p20201116.ebuild
index 42b072a67dc3..c2e2191d6c4f 100644
--- a/app-emacs/flycheck-clang-tidy/flycheck-clang-tidy-0.3.0_p20201116.ebuild
+++ b/app-emacs/flycheck-clang-tidy/flycheck-clang-tidy-0.3.0_p20201116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	>=app-emacs/flycheck-0.30
diff --git a/app-emacs/geiser/Manifest b/app-emacs/geiser/Manifest
index 06b297ccd3c0..f44e30d80250 100644
--- a/app-emacs/geiser/Manifest
+++ b/app-emacs/geiser/Manifest
@@ -1,2 +1,2 @@
-DIST geiser-0.30.tar.bz2 656851 BLAKE2B c0a6ce7d2643e83cc049fa812c601217f52f8814efeebc60405ba591739c887ea0aa874e4ea0a6a72bb5f2282281d9883f2a77735d787a442e560ee2083bab54 SHA512 c66e168bfd8ccdd9c8c0bd3b29ded78ba1b25eeef062e164926c6ce15ec60410e944b2c58a9cb85a248f953b7fc66322626df108f1d9fe521a7331381bcd86a2
+DIST geiser-0.31.1.tar.bz2 657175 BLAKE2B 1297609da647efacc92b9b19d1c5d2df0afe6584a3ed49aa8243d77b8457de1ee32dc8d6cc02100a24938928a09fef003ae19f901d6f3b4be2660d5d2d3f7e5c SHA512 bf3900c3ca13780547e96c3b5d1912686f360087c19632e2f0b41d8aa2f0bd409233d7cbf3e5d22c90bcff9be2867ef11cb8c0610b285b6c97b314fb92e45bb7
 DIST geiser-0.31.tar.bz2 657293 BLAKE2B 10d40b43f914a5483bb18dca79272fd97c9bd091a18b159b9d3a297c51a06e7176eb1cbb0f547719b7e3ff397311db987a235f737254e4b07a3be81a42ee6ed5 SHA512 4595711925c725c423f02bfd1994d0c4266167d4616ccbbcd1c4c6394452c8061aa3d5af1528d9300a06eed7f39a2ae089175c1c653b782d994485da774515c7
diff --git a/app-emacs/geiser/geiser-0.30.ebuild b/app-emacs/geiser/geiser-0.30.ebuild
deleted file mode 100644
index 855f4f661e67..000000000000
--- a/app-emacs/geiser/geiser-0.30.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 elisp
-
-DESCRIPTION="Generic interaction mode between Emacs and different Scheme implementations"
-HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/"
-SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="app-emacs/transient"
-BDEPEND="
-	${RDEPEND}
-	app-text/texi2html
-	sys-apps/texinfo
-"
-
-DOCS=( readme.org news.org doc/html )
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	BYTECOMPFLAGS="-L elisp" elisp-compile elisp/*.el
-
-	emake -C doc info web
-}
-
-src_install() {
-	elisp-install ${PN} elisp/*.el{,c}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	doinfo doc/*.info
-	einstalldocs
-}
diff --git a/app-emacs/geiser/geiser-0.31.1.ebuild b/app-emacs/geiser/geiser-0.31.1.ebuild
new file mode 100644
index 000000000000..34cb94b620eb
--- /dev/null
+++ b/app-emacs/geiser/geiser-0.31.1.ebuild
@@ -0,0 +1,49 @@
+# 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="Generic interaction mode between Emacs and different Scheme implementations"
+HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/emacs-${PN}/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/emacs-${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/transient
+"
+BDEPEND="
+	${RDEPEND}
+	app-text/texi2html
+	sys-apps/texinfo
+"
+
+DOCS=( readme.org news.org doc/html )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	BYTECOMPFLAGS="-L ./elisp" elisp-compile ./elisp/*.el
+	emake -C ./doc info web
+}
+
+src_install() {
+	elisp-install "${PN}" ./elisp/*.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo ./doc/*.info
+	einstalldocs
+}
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 11174ef162f1..d0fda479fcb7 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,2 +1,3 @@
 DIST ghub-3.6.0.tar.gz 62572 BLAKE2B 5693177be9ac22d18b7b6f5cdc230eea4340a5bfd007fa4b18f3503fe796fd8b104753be51c8579de6e693cfc620c4524dae195627af4c542bd2fe94aad1d0dd SHA512 e54752f70c462ce4fed3a1fc3ca60f22107e2acaefb06ebf42d35c6b65f9091bba07ff72436310782d9be7fbf35aef473dbbe39ef7a4ac3de1ebd82a417c6b0a
 DIST ghub-4.0.0.tar.gz 63020 BLAKE2B e01df9e093573933e24c39ef9a252d31dda4c9b0304ad5ab1f5ba55b6869224bb708dbdc0994c316c35ac0bb8df08d7238da0469a7e0ff84f3f769d35b55d89e SHA512 61825bd5230bc4a80c4a0a40cb717fd4a603ac351a3cdae2bc93fa0e8ca6d4ba51647d8cb151e436a8b19def7a389629dddebb1454172588a472bf0eb2c21b8e
+DIST ghub-4.1.0.tar.gz 63324 BLAKE2B 9abc543f23e92ed6971817ae141c3a393900d6bd3254a4d3dec66f5ede65f7d69cdcd4bced0a0394fb46d1ed7d9c3ae81613a00e0870dd7e58752bc3b4ab0512 SHA512 3abe39cdcbe5728bc4a0387ae70ae85b5a81498a2cfb12267127e43ad02613492109ad25bb97c8a8a0d5e7283f12cc5b20f40744e30053c698d75d6ce8940cd4
diff --git a/app-emacs/ghub/ghub-4.0.0.ebuild b/app-emacs/ghub/ghub-4.0.0.ebuild
index 4a4eeabd3d10..5667640b5b27 100644
--- a/app-emacs/ghub/ghub-4.0.0.ebuild
+++ b/app-emacs/ghub/ghub-4.0.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/ghub/ghub-4.1.0.ebuild b/app-emacs/ghub/ghub-4.1.0.ebuild
new file mode 100644
index 000000000000..137580e04d5e
--- /dev/null
+++ b/app-emacs/ghub/ghub-4.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Minuscule client library for the Git forge APIs"
+HOMEPAGE="https://magit.vc/manual/ghub/
+	https://github.com/magit/ghub/"
+
+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 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( README.org )
+ELISP_TEXINFO="docs/ghub.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/treepy-0.1.2
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+src_prepare() {
+	mv lisp/*.el . || die
+
+	elisp_src_prepare
+}
diff --git a/app-emacs/git-modes/git-modes-1.4.4.ebuild b/app-emacs/git-modes/git-modes-1.4.4.ebuild
index cbe21880ac81..554e06786cd4 100644
--- a/app-emacs/git-modes/git-modes-1.4.4.ebuild
+++ b/app-emacs/git-modes/git-modes-1.4.4.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index cd7f24d66b1d..94bcf035dfb8 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -1,2 +1,2 @@
-DIST helm-3.9.8.tar.gz 2383635 BLAKE2B a6f1efd23ecb6b8156e46b936008de41fbc05e78fd5559a182a703cdfbec590a0409042f33e5d86f77ae969954057b4f2da7720e81db308cd3f3f301826cd9dd SHA512 ce574bb4e1534edc3442adb8b2257fe4e072db9736cc4e265f34e0b6aebd08cf4c599058755a4c453ba14dfa48499c423e549d1189f708b7fa2f048a229ada8f
 DIST helm-3.9.9.tar.gz 2384860 BLAKE2B 19ee0114beb2e27c99da5c5df361f01de3a24a106f9c36205e72fd0d7c22bcaecd3399a84f4803b1d0df315977b06ef7a04a0c45860d64f541014aaf229437a5 SHA512 114b25d8c223a11bef327612760e388f49c876e10683f8fed9cc58f380047f932b2782fcb99de1d37cc352fd168c3fc8ba9e358321aca46bbcd130a17e7d37ec
+DIST helm-4.0.tar.gz 2391038 BLAKE2B b3bd0c3736bb20218ed88afda39cebed4853a43915dd9e857d57f459f5531f565435aba19e71a196b808db58d56f54dda1ae9916697f7025055c4b9471df19a1 SHA512 70563293cdd9212ed46bcb13a2dcdb2c669a66314676a34d99102ca517c5e27c6937926c2c063fa1826d7eca4c0c9f61146067d684ca34ac1dacd3d977a0bd77
diff --git a/app-emacs/helm/helm-3.9.8.ebuild b/app-emacs/helm/helm-3.9.8.ebuild
deleted file mode 100644
index dfb54b311758..000000000000
--- a/app-emacs/helm/helm-3.9.8.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
-
-inherit elisp
-
-DESCRIPTION="Emacs incremental completion and selection narrowing framework"
-HOMEPAGE="https://emacs-helm.github.io/helm/
-	https://github.com/emacs-helm/helm/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/emacs-helm/${PN}.git"
-else
-	SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	app-emacs/async
-	app-emacs/popup
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.8.8-no-autoload-check.patch" )
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
-
-src_install() {
-	elisp_src_install
-
-	exeinto /usr/bin/
-	doexe emacs-helm.sh
-}
diff --git a/app-emacs/helm/helm-4.0.ebuild b/app-emacs/helm/helm-4.0.ebuild
new file mode 100644
index 000000000000..9c74ab45f838
--- /dev/null
+++ b/app-emacs/helm/helm-4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs incremental completion and selection narrowing framework"
+HOMEPAGE="https://emacs-helm.github.io/helm/
+	https://github.com/emacs-helm/helm/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-helm/${PN}.git"
+else
+	SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/async-1.9.9
+	app-emacs/async
+	app-emacs/popup
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.8.8-no-autoload-check.patch" )
+
+DOCS=( NEWS.org README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_install() {
+	elisp_src_install
+
+	exeinto /usr/bin/
+	doexe emacs-helm.sh
+}
diff --git a/app-emacs/jinx/jinx-1.10.ebuild b/app-emacs/jinx/jinx-1.10.ebuild
index 4faa877e1994..900d7311aaef 100644
--- a/app-emacs/jinx/jinx-1.10.ebuild
+++ b/app-emacs/jinx/jinx-1.10.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 93f7dc3e5b0e..203825827f89 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,2 +1,3 @@
 DIST magit-3.3.0.50_p20240520.tar.gz 673945 BLAKE2B d61fb8c566de2bc6a2c4109d787808be76fa33d994adeb97b3d472c9c2da929aa55cf6b81f9cc2055e46d5860aa0d9ddc37080a1b2be06984b3831382031b12b SHA512 53203cdc8bc291302ee35aabe6e4d32e0c0de5bb411ab013d112bcd3d934a221c34f42d6ebccea9d33335d53415f75588468c23668cbbf57851dc61de505fffb
 DIST magit-4.0.0.tar.gz 676167 BLAKE2B 2adc7388cddc5230615344b3340ae181feaea1e6c174970e11a5d6f6795ecb32581dc12448c1bdfa6ec4144cc4118ace70049ff264a2c29f084cf90aa3f56d69 SHA512 c42dfe78f1f1c5f6cc732a566b820362993763ada7186d1a76ba0deedf7bd91415d502984e4afd6e958ea237b3f351c718a9e588f9734d7afc186793432229f0
+DIST magit-4.1.0.tar.gz 673317 BLAKE2B 6457c77f08605e3665b3fadcb4d6bc48d21498e370261d9709305e774de579be4647afb6e598a446a3ddf06e47baef6561a48706609812991a24e3ab2b22d416 SHA512 063c23a7f1a9099d7ec020980be936b30b85756b30bded48264939c5ae7f742820efc3eadc8ba480ad328ca7276a9d35bb168e6b7a42ea8dfa6a2c1e13b8cc90
diff --git a/app-emacs/magit/magit-4.0.0.ebuild b/app-emacs/magit/magit-4.0.0.ebuild
index 19d51447f288..f824cd1a5bbc 100644
--- a/app-emacs/magit/magit-4.0.0.ebuild
+++ b/app-emacs/magit/magit-4.0.0.ebuild
@@ -17,7 +17,7 @@ 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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/magit/magit-4.1.0.ebuild b/app-emacs/magit/magit-4.1.0.ebuild
new file mode 100644
index 000000000000..19d51447f288
--- /dev/null
+++ b/app-emacs/magit/magit-4.1.0.ebuild
@@ -0,0 +1,50 @@
+# 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.4
+	>=app-emacs/with-editor-3.4.1
+"
+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/marginalia/marginalia-1.7.ebuild b/app-emacs/marginalia/marginalia-1.7.ebuild
index 9ec4e409b6c6..f838144dbeea 100644
--- a/app-emacs/marginalia/marginalia-1.7.ebuild
+++ b/app-emacs/marginalia/marginalia-1.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/modus-themes/Manifest b/app-emacs/modus-themes/Manifest
index 39765f51c6c2..0557d8aaffc5 100644
--- a/app-emacs/modus-themes/Manifest
+++ b/app-emacs/modus-themes/Manifest
@@ -1,2 +1,2 @@
-DIST modus-themes-4.3.0.tar.gz 329115 BLAKE2B 343070beb66fece35000abe4ae2d4b38c4e06f40a79ed6b12586ed37d39d4c9b67f930869ea8dab51bba84936ed55a8280ea838c4f3be235f95b28d9ec89ffc2 SHA512 3fd24e1b94ec6f3391568f3b92c9224372729494d7edd3ca51167f1a410038f046aaa7fcc8bda8a46ac0a1da5f0509fa9c8dbe49ddfb1aa26b64dcc11ee7ee77
 DIST modus-themes-4.4.0.tar.gz 337719 BLAKE2B 32e189aae2c031a8f0588d241d42c4420120ee45d7a409e4019917f1bb268433d44362305150cba49c7f24a9620ad7208c85d355a383ed684b737e52518e164e SHA512 cf20de778f43225a9412aead302ed373ac078695ec06494a39046bb9ae9e1104408dc282e34582463cc8ea7a5ad389b1ed12b176561271292cc3b50528d71a0e
+DIST modus-themes-4.5.0.tar.gz 342760 BLAKE2B 2d9c37646d8c9b2374b6d8eaed9f34e586d43f54059974a9f79c29694a3ac1d8404560b8a05baab88e56cee6a561b7cd9e7fd8f333f9c6614eab50dfb9bba41f SHA512 063f4f9a0ef32130adc8551b6c278d804942f7288af2276a83ce959b0e12be7bb96b83c2e8a2c76598b27c4ea9b38651ce1d0600e852160b2569201e0d2b3028
diff --git a/app-emacs/modus-themes/modus-themes-4.3.0.ebuild b/app-emacs/modus-themes/modus-themes-4.3.0.ebuild
deleted file mode 100644
index e3ecfc9b2f8f..000000000000
--- a/app-emacs/modus-themes/modus-themes-4.3.0.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
-
-inherit elisp
-
-DESCRIPTION="Highly accessible themes for GNU Emacs"
-HOMEPAGE="https://github.com/protesilaos/modus-themes/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
-else
-	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-DOCS=( CHANGELOG.org README.md )
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/modus-themes/modus-themes-4.5.0.ebuild b/app-emacs/modus-themes/modus-themes-4.5.0.ebuild
new file mode 100644
index 000000000000..8388a1ab7603
--- /dev/null
+++ b/app-emacs/modus-themes/modus-themes-4.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Highly accessible themes for GNU Emacs"
+HOMEPAGE="https://github.com/protesilaos/modus-themes/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/protesilaos/${PN}.git"
+else
+	SRC_URI="https://github.com/protesilaos/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( CHANGELOG.org README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/no-littering/Manifest b/app-emacs/no-littering/Manifest
index 5a82bf3e2afd..62dcf20df3ea 100644
--- a/app-emacs/no-littering/Manifest
+++ b/app-emacs/no-littering/Manifest
@@ -1,2 +1,2 @@
-DIST no-littering-1.7.0.tar.gz 25944 BLAKE2B 45a979b7fc49fb09d50465ce523f3b9d40ce77833507a3ae1c786b0a80157f99f12baedf40ef4412f5c40158270da2f244900a4b4058313d29a40354378878d6 SHA512 016a3848e012086a500ac0b32f86edb7e939fadb36bd0561bb0332d75326fbb5d595a6ed8648746cb0aa7e34b425c8d850f8d4af770d2db3dc2251ec6fe84a10
 DIST no-littering-1.7.1.tar.gz 25972 BLAKE2B 076c0509911ab83849401827460e22f8e04fc131bb2e94a4b69259616bcc49ea13b5fc4adf0fbac72bc6f510fbc2e5ec7c127e5961027d38019861124b9b0fb5 SHA512 056b79d68a5af243c068d6a86bfb03cd7fef8240510f2756864424a6059aa47e592ef25f2b20e1acce89b12093c39847d4fa83fa954304b2f6342a42f4cd8135
+DIST no-littering-1.7.2.tar.gz 26005 BLAKE2B faa5dba2142dee5a91d586c96916c8e9458a5114edd630d6744ca98577c4c8e6d9bd34b4d6abdf0eb5c21c36e088c796b0842c018f51276741c510511c668b94 SHA512 48c58672788f09a54737254f00572235ec331e1eb82767b1247aadbc4f552d1f81f2912bec364e008a621595abb9ed9be66848a9feb9b16f2d877194482c8a22
diff --git a/app-emacs/no-littering/no-littering-1.7.0.ebuild b/app-emacs/no-littering/no-littering-1.7.0.ebuild
deleted file mode 100644
index 604af65ad8d7..000000000000
--- a/app-emacs/no-littering/no-littering-1.7.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="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
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-DOCS=( README.org migrate.org )
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/no-littering/no-littering-1.7.2.ebuild b/app-emacs/no-littering/no-littering-1.7.2.ebuild
new file mode 100644
index 000000000000..265b8c212a37
--- /dev/null
+++ b/app-emacs/no-littering/no-littering-1.7.2.ebuild
@@ -0,0 +1,33 @@
+# 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/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index d4a55fa0948b..32d6a2db6e4c 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -3,5 +3,6 @@ DIST libvirt-10.1.0.tar.xz 9444244 BLAKE2B bfdce9d067e3a319b81d867d27f1a6b4e724a
 DIST libvirt-10.2.0.tar.xz 9466588 BLAKE2B 7ee6f4bdbb6a22f1b3c5c0326d41e269e8a5a07e41bc4f9a17fd023f3e33e46735066656dffa3004e1f36d46324270351593c89f60106933042e8a19a2aa64e6 SHA512 65faf2346e66bdba606ba99b9e4da2be8bd94ef42ac49c2801f9e9253ceea10f5fe772d5c7ada59f48aa34ff528726719b690c3acfd3e63a5c3580db17b023ae
 DIST libvirt-10.3.0.tar.xz 9476852 BLAKE2B 8c47840113904d72aeb1e9bf900a99a8b0e3d41391c9a8fee4277f2793f18fefc50d113e8cbea52dedfd03b93f430416bcd25fe90ee6820c95ac6f468b84212f SHA512 dd2b151a19877e57e11b582b1c11542319f8b7b7cd3d7d51304442aa7d5eb1a8490d2887d340191c3ecc561320ea453773763083364579de0a40ada9c244fc59
 DIST libvirt-10.5.0.tar.xz 9530296 BLAKE2B 59b6b114e6d4c4752839775ec22b17f530ac86f0252647b312b7f98e9ba856d949727eed5cb47b6b92589e2ce2587fe02505d6653a4e7ba3a3685b5c81a8ebc0 SHA512 e4976849cff7bdae0b7fda0644490f0ca743efc11c35a2fae45bb0f6f467b85644c1d04d1f3d1b10affdc6d9b8dcc0a3c255e527e0bdd73cdd4d1c81d5c418e7
+DIST libvirt-10.6.0.tar.xz 9481992 BLAKE2B 68d88ba7f6d5f74d6ad8753a7716902596338811e9c02b09ba6fbdcc60936abf9509bf5cc300446240fa5dd5d2f779c319bca0a22eadea32b49a758b71524857 SHA512 edec79e89669d5e9a46be35e0d6334a6ed3bbf32426679549bd998bde24cba52b0378843f41a3abb5d781ad53e2a6a54619a0bad3f168c11fb41736cc6af6568
 DIST libvirt-9.8.0.tar.xz 9307064 BLAKE2B aae47e8d4eeaf97532a0356de23ed5a9eea71b369d025eda95b5fd74576779eb4b843d05df6c87b79a14f218c341953749e319ee7244846a2db410a74a746880 SHA512 0118725073de33eec3fa3e4616d3154707f9828fdb9ec973f503fe68f18eab72b9704da660f281152630ddc95e605c786673af9d23dc9bdfc0108422e0efbd41
 DIST libvirt-9.9.0.tar.xz 9321556 BLAKE2B 21eae5a95feaf7f5c6ba8dd48732c08212904882a11c48eccfa827d85ddc3df7e064503f21710dbe1b678670e02f003674de915a43a7403fbf85685c4832e21d SHA512 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-10.6.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-10.6.0.ebuild
new file mode 100644
index 000000000000..16945cb9e2ff
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-10.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="https://www.libvirt.org/"
+SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake -f - <<'EOF'
+all: $(patsubst %.rng,%.rnc,$(wildcard *.rng))
+%.rnc: %.rng
+	trang -I rng -O rnc $< $@
+EOF
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/oauth2/Manifest b/app-emacs/oauth2/Manifest
index 3f4fcbe3e32a..5d505dd090ec 100644
--- a/app-emacs/oauth2/Manifest
+++ b/app-emacs/oauth2/Manifest
@@ -1 +1,2 @@
 DIST oauth2-0.16.tar.gz 3527 BLAKE2B af5ea470267ada0efe7bb28c383576bdd737da1352fff1047f0a26ca133efbb96e2dcb9dd53ad6793b7a73a6fa42c002955ab751389a30f2200f6a00e6de646e SHA512 525408581c146e369df2e2a79c76bc06f631a55c0f42ed537bc05fdeb7d399e6308b3e99135b49e66366941722710340cd18c184c09d510444c765ad19b0eb6f
+DIST oauth2-0.17.tar.gz 4265 BLAKE2B cd18b67e296eec227d12fa75c197fef800b74360efc99cd3357022d1663768c5a4b7063d5cd8342dd25532edfa65331d4f184059ebfb1961d15bc800530ab491 SHA512 a5a0daafeeb2ce9eb336eeaf169800c68db9493cd83b50950bffc81903f7fe854c52a6162785e30068239b4a10c5f14cae2a668f9a1991d87188a761cb4d30bc
diff --git a/app-emacs/oauth2/oauth2-0.17.ebuild b/app-emacs/oauth2/oauth2-0.17.ebuild
new file mode 100644
index 000000000000..d3b908b2fc09
--- /dev/null
+++ b/app-emacs/oauth2/oauth2-0.17.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ "${PV}" == 0.17 ]] && COMMIT="0147cabd8e82e46af27aef07aeed402b0bb9a0fb"
+
+inherit elisp
+
+DESCRIPTION="OAuth 2.0 authorization protocol"
+HOMEPAGE="https://elpa.gnu.org/packages/oauth2.html"
+SRC_URI="https://git.savannah.gnu.org/gitweb/?p=emacs/elpa.git;a=snapshot;h=${COMMIT};sf=tgz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/elpa-${COMMIT:0:7}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DOCS=( NEWS )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-appear/org-appear-0.3.1.ebuild b/app-emacs/org-appear/org-appear-0.3.1.ebuild
index 8f36d1af24b4..49a69a7d788b 100644
--- a/app-emacs/org-appear/org-appear-0.3.1.ebuild
+++ b/app-emacs/org-appear/org-appear-0.3.1.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/awth13/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index a7241ce3ed02..ca20cef04336 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,4 +1,5 @@
-DIST org-mode-release_9.7.5.tar.gz 2361692 BLAKE2B a0daba9d843286a5e7e43066337b2c49257f72d6e6c8282d3ded9c15a2c1d0ca20cee439b9fad252513d87b9cbbd97240f8b012f11a3a1067d271ea1c3ed22eb SHA512 3a80ca7f8728ba58df0ef881ead9f25c59a439532ab1af20b95e2e9764d01b2b4ee192f31f6fa9eca39d4e0038d3ac152f09111038dfafa5b44313aac32eb340
+DIST org-mode-release_9.7.10.tar.gz 2362896 BLAKE2B 1f95c6195c1607236daddc1a7724560e8e029c6f2dbabfc5d80bb426bccd6df2c10852c242545f90ccb0e3765b2ad021d8bd601e93a87002189dcb0ecc7d8087 SHA512 4f6a39938290a581ec798010ebc23f22c5d4e5a96bad4a84f002c0693b7cbeed689212bd9b8c68efd1769bd50315ea0e1c82449640a7ab9b7fdc2484d50bb498
+DIST org-mode-release_9.7.11.tar.gz 2363004 BLAKE2B 7438d67b834818d06185753fbe9e712c6f7b2381815de86c6f9e2e00715e8e235446c811440971c39ddb6f3f93839d6ab768b6e8b1ad023e94b7cd6f221baf3f SHA512 f2f7a4e2eae6ba2e6f2b85c4bbebae75dc48822b3a2080c3f9ec774e149799f4c97551bb0fc64dd156a34a015cb62f64d6f1697bd3f7fd0b6277d8c2a6f7665a
 DIST org-mode-release_9.7.6.tar.gz 2361944 BLAKE2B 238928a0a8b57772d6d6b0a1a28dc8073a72e5783730b171f1751b47a49d2c59578e7ca51187ebb4feedc0afdcd40452d62df7323bdafc1b6a8690815f609f8c SHA512 2c9f8ed35281bf909fe53b85bb5db9f14864d3b82a9f96fe29ae87db163f2c071772568674a0b618842259524864167808f26b32a4a8826cd4f2746ea68f95d1
 DIST org-mode-release_9.7.7.tar.gz 2362578 BLAKE2B 7cdd44198410b638a242d5538ae6eeaa0f4f1b6922a465483ddae793bbc2deefc4493042f9495d56ade908e16e788c4151f6e93676ae5c1ccd30173723b41c52 SHA512 7519fbc2b40471654e686a915dedb464c31869c65a63ab5ebfabb984c99ae26f0ad3bad531453d245937d628c27d282d0fe4f7a24547835100b3779f9b2f4ed0
 DIST org-mode-release_9.7.8.tar.gz 2362527 BLAKE2B 4cbd744cf5507b338d6809655c13314b0f777599782929470a3b4df1149c27bb86866784df33e3e303ba736387824142ba881be4959a9ee71cce89f4d4a43d82 SHA512 55979377cc45a790bb8a50ecc123f240e8a957f62459b8aed00333401da87bc0cc66239a66e53fcdc9539023cc0703076133457e751c78638571ce6402323369
diff --git a/app-emacs/org-mode/org-mode-9.7.10.ebuild b/app-emacs/org-mode/org-mode-9.7.10.ebuild
new file mode 100644
index 000000000000..86c9f98ba96b
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.7.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 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_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-mode/org-mode-9.7.11.ebuild b/app-emacs/org-mode/org-mode-9.7.11.ebuild
new file mode 100644
index 000000000000..86c9f98ba96b
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.7.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 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_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-mode/org-mode-9.7.5.ebuild b/app-emacs/org-mode/org-mode-9.7.5.ebuild
deleted file mode 100644
index e8bc540e6484..000000000000
--- a/app-emacs/org-mode/org-mode-9.7.5.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 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_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-mode/org-mode-9.7.9.ebuild b/app-emacs/org-mode/org-mode-9.7.9.ebuild
index 86c9f98ba96b..2e6d3986022b 100644
--- a/app-emacs/org-mode/org-mode-9.7.9.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.9.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
diff --git a/app-emacs/org-modern/org-modern-1.4.ebuild b/app-emacs/org-modern/org-modern-1.4.ebuild
index b7d30e300fee..5f67c08e6dce 100644
--- a/app-emacs/org-modern/org-modern-1.4.ebuild
+++ b/app-emacs/org-modern/org-modern-1.4.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/org-modern/org-modern-1.5.ebuild b/app-emacs/org-modern/org-modern-1.5.ebuild
index 5091d68a3b9b..9166bf983409 100644
--- a/app-emacs/org-modern/org-modern-1.5.ebuild
+++ b/app-emacs/org-modern/org-modern-1.5.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/osm/osm-1.4.ebuild b/app-emacs/osm/osm-1.4.ebuild
index 144330f58794..3d5b8694df32 100644
--- a/app-emacs/osm/osm-1.4.ebuild
+++ b/app-emacs/osm/osm-1.4.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/posframe/Manifest b/app-emacs/posframe/Manifest
index 3f6a079f64fe..eabca171a3c7 100644
--- a/app-emacs/posframe/Manifest
+++ b/app-emacs/posframe/Manifest
@@ -1 +1,2 @@
 DIST posframe-1.4.2.tar.gz 79173 BLAKE2B 3f1d4d414e1677118676a4ad3b5739602ccd49a9233027b9bbeebfbeab9ef23e30370a43891f57902b9212245c6415aa238245860f46e84f79fc7d7ec250ace2 SHA512 e11109d3a85ccaca53995473940aa0a4bd80d333b3001865ba2c9d2b4af647d71b279a70e3e086c14c853896a8c2d74eb54cbc4e129a1face9f186c126c41f7f
+DIST posframe-1.4.3.tar.gz 79433 BLAKE2B c2a362b306d3d3fbe07b7cc4b7ac47d988fd5ddd05b026aacbebde83009513cd91f262deffb533ecefe0fbca00e1399c2bca73fc52a2b7b87f532321bd874879 SHA512 7377ca341f3ba9abed957d392b7971332cd14418c08e1477ca72616bb8996bd3cdfe76d8941310dc4ad77cc8d6a0d24b4148a2b7cdef563ab2232aa18b2f884d
diff --git a/app-emacs/posframe/posframe-1.4.3.ebuild b/app-emacs/posframe/posframe-1.4.3.ebuild
new file mode 100644
index 000000000000..bc02dc745818
--- /dev/null
+++ b/app-emacs/posframe/posframe-1.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ "${PV}" = 1.4.3 ]] && COMMIT="468ac1ab50d7e0feae2c06f12596bbc169f2abe4"
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Pop up a frame at point"
+HOMEPAGE="https://github.com/tumashu/posframe/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tumashu/${PN}.git"
+else
+	SRC_URI="https://github.com/tumashu/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( README.org snapshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/racket-mode/racket-mode-1_p20240718.ebuild b/app-emacs/racket-mode/racket-mode-1_p20240718.ebuild
index 78b2b7339958..5a4a7a78a1df 100644
--- a/app-emacs/racket-mode/racket-mode-1_p20240718.ebuild
+++ b/app-emacs/racket-mode/racket-mode-1_p20240718.ebuild
@@ -20,7 +20,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
index bcb4cf28b0b1..1e5e8428f533 100644
--- a/app-emacs/rust-mode/Manifest
+++ b/app-emacs/rust-mode/Manifest
@@ -1 +1,2 @@
 DIST rust-mode-1.0.5.tar.gz 52665 BLAKE2B 3b61372223637b7950ec7a15a80abd3b74972ecda0677f730f3ebc8e574b50985a7427b4531766b1dfd20225f7b718497aa4437dadfa041c5a9cde9413d3cb5c SHA512 7b76384adf7281866fbef0ab507098084a96fe562d1dbd5dd99e03fda2a91c23392c8667c21aa5800b188cd09f5349a7394b0a7215826b9bc668cc36ac902999
+DIST rust-mode-1.0.6.tar.gz 55124 BLAKE2B 3d15f94a522b656b3459ac32698137ecaf70d5a10e152a7f8b36595ab8943339f4a58bd40c3f33be261a910963050505a3ee8413c17804beaf2053f145d9f582 SHA512 4ed9c8f06d50f5757417bcdfe40f0c5dda3a2536b018ca10c7ac0f8c597bb759a2cbf7b4aeb53801e4bc663fbf7c20a7236be9c3e482322ca0d8340bf36d5538
diff --git a/app-emacs/rust-mode/rust-mode-1.0.6.ebuild b/app-emacs/rust-mode/rust-mode-1.0.6.ebuild
new file mode 100644
index 000000000000..241932bddf3d
--- /dev/null
+++ b/app-emacs/rust-mode/rust-mode-1.0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A major emacs mode for editing Rust source code"
+HOMEPAGE="https://github.com/rust-lang/rust-mode/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert "${S}" -l "${PN}-tests.el"
diff --git a/app-emacs/scala-ts-mode/Manifest b/app-emacs/scala-ts-mode/Manifest
index 18839f6bc4b7..9ede4bb3744d 100644
--- a/app-emacs/scala-ts-mode/Manifest
+++ b/app-emacs/scala-ts-mode/Manifest
@@ -1,2 +1,2 @@
-DIST scala-ts-mode-1.0.0_p20240316.tar.gz 18330 BLAKE2B aedcfa91563421673435def9dc2679d5c9f1feb1dde6214e8e7650ca8d72e6165253140bc506ba67cbc00b4e54d9edbb34db47089438b6de2e42699bf15ebfa7 SHA512 544622840cfefbab79ddae06d48cc5a9a6fb1802fd18f7c2b425b921713392e6d84b287dcdb3fa65d08d59f5af28ec2b23711685764affaf854238d3583b0cd3
 DIST scala-ts-mode-1.0.0_p20240630.tar.gz 18354 BLAKE2B c46f349d90f51f3e5b90f1f852f03c56f5b6f7ccf2efe72d272e82d348aca3d0abeda7402ecc420efcef1fd349987c16633564d8d5cfed05bb4aadeedcee5653 SHA512 a7595e2cb5742048a8174b38d28d0d07ebaf8a74ff8f5f695261874c86faf51e7ed3664701b4b7c9e20c03f5c73d706070bbe6ec09d73364ea9a9f3000524f18
+DIST scala-ts-mode-1.0.0_p20240820.tar.gz 19204 BLAKE2B 65ec1c13f79b7509a6b7481ebea93958b39453739b27554e7b4c7f58e0791c892c3ad05d755ec8455c081137d27a6b8f95980ca5119ca15811b4128eb328966d SHA512 c67d4b0a16a81a20eabd3571658e8190510c019f52ff086d2a93fa7a6becf10063a9fafad960e3343909eece3887e39f3ba1be880abb000298ac8165d09464c1
diff --git a/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240316.ebuild b/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240316.ebuild
deleted file mode 100644
index f7cfef4ef361..000000000000
--- a/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240316.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
-
-MY_COMMIT="11a01d726ac4fafb8a6688459ac79b41333bd6c8"
-DESCRIPTION="Emacs Scala Mode via Tree-Sitter"
-HOMEPAGE="https://github.com/KaranAhlawat/scala-ts-mode"
-SRC_URI="
-	https://codeload.github.com/KaranAhlawat/scala-ts-mode/tar.gz/${MY_COMMIT}
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=app-editors/emacs-29[tree-sitter]
-	dev-libs/tree-sitter-scala
-"
-
-DOCS="README.org"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240820.ebuild b/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240820.ebuild
new file mode 100644
index 000000000000..6ece242f164c
--- /dev/null
+++ b/app-emacs/scala-ts-mode/scala-ts-mode-1.0.0_p20240820.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+MY_COMMIT="2701021abd6d65b1f53dd6b1592ec5683dd1365c"
+DESCRIPTION="Emacs Scala Mode via Tree-Sitter"
+HOMEPAGE="https://github.com/KaranAhlawat/scala-ts-mode"
+SRC_URI="
+	https://codeload.github.com/KaranAhlawat/scala-ts-mode/tar.gz/${MY_COMMIT}
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-editors/emacs-29[tree-sitter]
+	dev-libs/tree-sitter-scala
+"
+
+DOCS="README.org"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/tempel/tempel-1.2.ebuild b/app-emacs/tempel/tempel-1.2.ebuild
index dacac7f268ac..3ab41fd90bf0 100644
--- a/app-emacs/tempel/tempel-1.2.ebuild
+++ b/app-emacs/tempel/tempel-1.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index 46be633b0373..ce11ea43472a 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -1,3 +1,4 @@
 DIST transient-0.7.2.tar.gz 138256 BLAKE2B c3b425a9b6089b54eb7377d47c7763fda87d9800246de866330dd2ca6ac8561fad5d7429b0b1f0c5f10072e836825d025b08676bd973a793d93e9b32616bcf07 SHA512 2863701146ecf4ac5f4a8025f47737667bc3ee0ca1de70e747a3299c9bb7831c0d9a3853553d79790c929ca9e5fe9f534e2c7499bc37a22ca2fb8d1d28b269fd
 DIST transient-0.7.3.tar.gz 139105 BLAKE2B 7ab629632e90b009cb1a306e99c86b997ddf49573188f6923109abfd1be8b32ea857644d807f33b240139150f57e267c8ed674cb15d2888cb82694b653466227 SHA512 d219b821a2cae2529044c390436a28a1213e0d649113ac1f761888298f76ef518e820ff933aa4471ec830f0690c6d0c75e5344aee8c5693677f36d3a3458df2b
 DIST transient-0.7.4.tar.gz 139828 BLAKE2B 6ac959237be5f46d4ba381b8c8855ac0b6387405101024e1807af83c98ed7419cbd463fb7c8874b2196d0f5879610903940df34260a70487f3505495d5e47343 SHA512 711bed7c75417778894035fb8fd1006ac78e73c4e545785b94b4f0f8aa1f1903a1426ff5175310e1ab665e29ad4756ffd4ec4b897c1720e33531ec2ce3faf82a
+DIST transient-0.7.5.tar.gz 141189 BLAKE2B 55535f6121467a1f380ec8d6a4afbb810556f914dc30a7c2fb913f2238bd47809f3d8aadfe35cfdae087525048e83beb14380cd3fdf6cae59643191147df4789 SHA512 18d051235b15e95312fcd60ddfa0f0ba85351d6102117717c81f621528a46a6d0f03d918002a7af2702135ebcf53c498f079a12d99ffc68711e20b196045e032
diff --git a/app-emacs/transient/transient-0.7.3.ebuild b/app-emacs/transient/transient-0.7.3.ebuild
index 02944ca13d21..f479cee08744 100644
--- a/app-emacs/transient/transient-0.7.3.ebuild
+++ b/app-emacs/transient/transient-0.7.3.ebuild
@@ -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
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/transient/transient-0.7.5.ebuild b/app-emacs/transient/transient-0.7.5.ebuild
new file mode 100644
index 000000000000..403da9665b6a
--- /dev/null
+++ b/app-emacs/transient/transient-0.7.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 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"
+
+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
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+src_prepare() {
+	mv lisp/*.el . || die
+
+	elisp_src_prepare
+}
diff --git a/app-emacs/treesit-auto/treesit-auto-1.0.5.ebuild b/app-emacs/treesit-auto/treesit-auto-1.0.5.ebuild
index f60b9db41667..a4d2f11bd215 100644
--- a/app-emacs/treesit-auto/treesit-auto-1.0.5.ebuild
+++ b/app-emacs/treesit-auto/treesit-auto-1.0.5.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/renzmann/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/vertico/vertico-1.9.ebuild b/app-emacs/vertico/vertico-1.9.ebuild
index edab4e05ba9a..236531c02166 100644
--- a/app-emacs/vertico/vertico-1.9.ebuild
+++ b/app-emacs/vertico/vertico-1.9.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index d690bd9f7b0e..d9606ede66cd 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,3 +1,4 @@
 DIST with-editor-3.3.4.tar.gz 33288 BLAKE2B 59e2b1c94be967cafbe112aad34a51aef6355d2f734ee2ce6160d3de2357fef226ef7bb0666f3c419b9e1bdce0ab8e3468ab0ab9bc259152014ede7ed1b4b453 SHA512 700f6e5a884e4664b2450f7dd3ea879f45934abdbc09eb9569a58233d57ad7411a47d977341231b5c23a2ae5710ce490b2ee3960aee150e912a3ec0017665942
 DIST with-editor-3.4.0.tar.gz 33396 BLAKE2B bc5956e658e77fcc4bdc2099374299fe38696d200ad201f9be1a63039874f7e33b035b91cd54a7a7abbbf9855bc47d775db85713bea003fb4d780e0c2266129a SHA512 c1ad247d1cc90fe5f5ace0ca257f33751d1e8eee7cd7b11bdfba6ead7a82a47be59b1cc8f3bcb28b77b5a386ee1604ef27ca72d5ced3d8a2262b298f85a8b1ee
 DIST with-editor-3.4.1.tar.gz 33395 BLAKE2B 5d71328f455b87bd6af60ce1a6f07c39b16619fd4d8232e6a38761b60daa40786999e36a3a3c46687e59a84e2f23ac89b51bcf43e45da7bdc1c61aac12480ddf SHA512 1cca1803355461fac83107d40661edb8e6ee4fd6e5f925b80ffd28dfb6ee97387f1d18336b58c467f19b5e5d8b55ef162274840d0daaedb728594966cbc86120
+DIST with-editor-3.4.2.tar.gz 33973 BLAKE2B b4792a7c3f3553ba1bb8d904e38e01141e40902868b74fc3f0b8e3d6e9925837764ba049fbf9e2684535dbe34f07385fe36d24f39655fea289dd827008b36f16 SHA512 7cc9dd1985d368657ba0d6095ec99fd46a60d3c01ff2f65fc15d4d7e9551078f5b612dbc4486ca07dc1001afe9dd311f8473542bca9f0780da6b19435747640c
diff --git a/app-emacs/with-editor/with-editor-3.4.0.ebuild b/app-emacs/with-editor/with-editor-3.4.0.ebuild
index af93991140f7..450104f0273e 100644
--- a/app-emacs/with-editor/with-editor-3.4.0.ebuild
+++ b/app-emacs/with-editor/with-editor-3.4.0.ebuild
@@ -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-emacs/with-editor/with-editor-3.4.2.ebuild b/app-emacs/with-editor/with-editor-3.4.2.ebuild
new file mode 100644
index 000000000000..0b352ac30107
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-3.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor/
+	https://github.com/magit/with-editor/"
+
+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
+
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( ../README.org ../docs/${PN}.org )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/xelb/Manifest b/app-emacs/xelb/Manifest
index e5397299d61f..0c34ec0207d1 100644
--- a/app-emacs/xelb/Manifest
+++ b/app-emacs/xelb/Manifest
@@ -1 +1,2 @@
-DIST xelb-0.18.tar.gz 127797 BLAKE2B d438bea5142dc233d272959e9ca683d55cf1b61a97b002bf6864425a83c9238fca37aa7387f38dac3c3c8064b9ca8c5a64f934ef60360273df1453a152778785 SHA512 72048e12028811b5beb206102bef27b519bf0524e801f2eec5b3eac8dee785a99dc165e6ecafe14680a5fc0025d7d720db76df5fbbcb9a65070402a29de6ad0b
+DIST xelb-0.19.tar.gz 143448 BLAKE2B b0bf8fdb36406120cce6e274e7af6577cdc899a8a84e33bdd60a5c26b13ff9f07a03a55b3a079efec578d12f6aecc1317f8638826e8ec33cb25e60f051263a8c SHA512 60ce0cdfd27bfea331ddf92a5c32b318b47ff38d91b5caa26287ace60cd7f7d2199f2553fe36963af1e4395e53432e9a76e83d12bdf6767b48f118a1e414280c
+DIST xelb-0.20.tar.gz 143475 BLAKE2B d72e4c6634065b4900b7f1259ab362576c5f9ec7781ca379564809f32796cc2cd872501c80411d4f90ecda6058b9308ddb747407097bca2dbf662383fc3cad35 SHA512 15eae53bafbb677e53e2b8fa43f2672868c49eb3f294b27ccf03a9e72fe3dc958b46874d15092fc1e57dd0dcb7b969e53104df0c868bfbb18c313a96b9b42528
diff --git a/app-emacs/xelb/xelb-0.18.ebuild b/app-emacs/xelb/xelb-0.18.ebuild
deleted file mode 100644
index d946fbd5ac6a..000000000000
--- a/app-emacs/xelb/xelb-0.18.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="X protocol Emacs Lisp Binding"
-HOMEPAGE="https://github.com/ch11ng/xelb/"
-SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-editors/emacs[gui]
-	x11-apps/xauth
-"
-
-DOCS=( README.md )
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/xelb/xelb-0.19.ebuild b/app-emacs/xelb/xelb-0.19.ebuild
new file mode 100644
index 000000000000..ee22f549a253
--- /dev/null
+++ b/app-emacs/xelb/xelb-0.19.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="X protocol Emacs Lisp Binding"
+HOMEPAGE="https://github.com/emacs-exwm/xelb/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-exwm/${PN}.git"
+else
+	SRC_URI="https://github.com/emacs-exwm/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	app-editors/emacs[gui]
+	x11-apps/xauth
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/xelb/xelb-0.20-r1.ebuild b/app-emacs/xelb/xelb-0.20-r1.ebuild
new file mode 100644
index 000000000000..db6232402bda
--- /dev/null
+++ b/app-emacs/xelb/xelb-0.20-r1.ebuild
@@ -0,0 +1,34 @@
+# 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="X protocol Emacs Lisp Binding"
+HOMEPAGE="https://github.com/emacs-exwm/xelb/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-exwm/${PN}.git"
+else
+	SRC_URI="https://github.com/emacs-exwm/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	app-editors/emacs[gui]
+	x11-apps/xauth
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/zenburn-theme/Manifest b/app-emacs/zenburn-theme/Manifest
index 2a38b0f0c4ef..b133dcd85ca6 100644
--- a/app-emacs/zenburn-theme/Manifest
+++ b/app-emacs/zenburn-theme/Manifest
@@ -1 +1 @@
-DIST zenburn-emacs-2.7.0.tar.gz 122812 BLAKE2B 2c5698de664dfbd1623f6f8358214cc4458323784e94cdd9c2d7ea47231466c984bf4b0399db4705be8acab53fb2ee1c30f7ae9f2b53f9a2bc825a9f19bb9a95 SHA512 4c125e19c2c223b7eb678be261d2e1240d9269c155ad5adc432e268c12b82c4610b09fd896c9d45361def8f132dcb45c0e46728f6ffb1f0181267b44fb5927e8
+DIST zenburn-emacs-2.8.0.tar.gz 123540 BLAKE2B ddc41b6b32a5b3864b400d0c2b2193515f60fc78b876df3eb28efa537d72ee0640c040935a13151385b6b9c4e9e45b9f8abe865d30c622a7e5297281c219deb0 SHA512 8d8729a2bbb7f829916def7d1c7178d0278ad1cbc883c7598dfca65277649f9eaac02974e9051672aad4cb3923a8f2726a86feced7cdc1aba487248332ca0a96
diff --git a/app-emacs/zenburn-theme/zenburn-theme-2.7.0-r1.ebuild b/app-emacs/zenburn-theme/zenburn-theme-2.8.0.ebuild
index c84c101ecdcc..c84c101ecdcc 100644
--- a/app-emacs/zenburn-theme/zenburn-theme-2.7.0-r1.ebuild
+++ b/app-emacs/zenburn-theme/zenburn-theme-2.8.0.ebuild
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 6d2f7d256e5a..6bc40f431538 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1 +1,2 @@
 DIST diskimage-builder-3.32.0.tar.gz 532942 BLAKE2B e436e5268b649dc5e050f66b098e527b79f172df00da93f23c115e3d88692c3f6546774c2046c8d4722cdd4139af4d05701725496f283b60e08ce0885b70de66 SHA512 6f5c2e0df428bf85b847fdc0ceebfdb66823b92b5b903de247d0e83ff2588c36e6f9786ea91f252c838cedeec22913f491d79643e77d83ad1fb690da7566af47
+DIST diskimage-builder-3.33.0.tar.gz 536798 BLAKE2B ac6dcc67bb336e98e1a1b822dbfb03effa47d67b96a95bf6ec3dc44cc3329315d5ce7808a42358f55b58a436dd140b21cb63ae7455f1cc8a8f136515f49457e8 SHA512 aeb287a7fcbd3b2fe022c1e7535df9bc67f224b8558a6685f29182ea64d926078385d924a452503b4fb00bb915ffdce1116034b182281fcb531931303d53892b
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
new file mode 100644
index 000000000000..f7a78be342e9
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.33.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder"
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/networkx-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.2[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
index f94dda84287d..46480f9df68c 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -26,13 +26,11 @@ CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/networkx-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.2[${PYTHON_USEDEP}]
 	app-emulation/qemu
 	sys-block/parted
 	sys-fs/multipath-tools
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 51a56fe42159..c3365517b856 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,3 +1 @@
-DIST faudio-24.06.tar.gz 1125079 BLAKE2B 2664181d1fbed594b3f7af93877cb9f3ae1a9c34ed2e69d6307997e8b360045698d460912a1b689e060d9742fd002ce0370a6133dd944fa0b6e296949e679103 SHA512 d8fb3c2303c81163a26f437edce5ae428f4769a28107eb21f1fdb637421480928fc6f0031fc053caa762db901d659336a6e2ffad78ece9ab03ba4f312b00deb6
-DIST faudio-24.07.tar.gz 1125108 BLAKE2B 4ff38ed79c3692f73850c31a0380df6cbafc156eff074e1384c3ef86af459769ba0c742a05b1ebd619b5d24e69bad761f1f7d01cebf526d4568d19e470f02e5a SHA512 bfb265d496c10e1e9fa032506c6de507ba04d5a1384f23cd07b7550b0fd427e78db8a66eede3717b4287ecb6d6695a13c888477d2686350bb7c936cbc6b74c7b
 DIST faudio-24.08.tar.gz 1125131 BLAKE2B a76da292ec74662413aa287147b83978f422d68077b62e3c8d5ad8a324ac1838d130d46ba8e7d32551221e55e73970ddc47ec06e20de905a6dc7cedacafc34fb SHA512 29777408b65ddc77e31d284730a0f3a08a973e29f6a492a7a9af5208b78279d40967ca593a55542aa3de7dd41deb82a31a6291a6bdffd56f04a91674276f95c6
diff --git a/app-emulation/faudio/faudio-24.06.ebuild b/app-emulation/faudio/faudio-24.06.ebuild
deleted file mode 100644
index 4a59a9b201a5..000000000000
--- a/app-emulation/faudio/faudio-24.06.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
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
-HOMEPAGE="https://fna-xna.github.io/"
-SRC_URI="https://github.com/FNA-XNA/FAudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FAudio-${PV}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug dumpvoices test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libsdl2[sound]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-cppflags -D_DEFAULT_SOURCE # usleep() in tests
-	use debug || append-cppflags -DFAUDIO_DISABLE_DEBUGCONFIGURATION
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDUMP_VOICES=$(usex dumpvoices)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	einfo "Running faudio_tests, this may take some time without output..."
-	SDL_AUDIODRIVER=dummy "${BUILD_DIR}"/faudio_tests || die
-}
diff --git a/app-emulation/faudio/faudio-24.07.ebuild b/app-emulation/faudio/faudio-24.07.ebuild
deleted file mode 100644
index e372ae484496..000000000000
--- a/app-emulation/faudio/faudio-24.07.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
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
-HOMEPAGE="https://fna-xna.github.io/"
-SRC_URI="https://github.com/FNA-XNA/FAudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/FAudio-${PV}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dumpvoices test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libsdl2[sound]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	append-cppflags -D_DEFAULT_SOURCE # usleep() in tests
-	use debug || append-cppflags -DFAUDIO_DISABLE_DEBUGCONFIGURATION
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDUMP_VOICES=$(usex dumpvoices)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	einfo "Running faudio_tests, this may take some time without output..."
-	SDL_AUDIODRIVER=dummy "${BUILD_DIR}"/faudio_tests || die
-}
diff --git a/app-emulation/faudio/faudio-24.08.ebuild b/app-emulation/faudio/faudio-24.08.ebuild
index e372ae484496..4a59a9b201a5 100644
--- a/app-emulation/faudio/faudio-24.08.ebuild
+++ b/app-emulation/faudio/faudio-24.08.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/FAudio-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug dumpvoices test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 93087295c05e..477a393a9707 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -8,6 +8,8 @@ DIST libvirt-10.3.0.tar.xz 9476852 BLAKE2B 8c47840113904d72aeb1e9bf900a99a8b0e3d
 DIST libvirt-10.3.0.tar.xz.asc 833 BLAKE2B 4d54a3701a15383464e1be5155344f783cd2fe297f2a7cfd4ef9ead7cef9267122e91e16d08329e2448ffe77f10625a3fa3443bbeab97ba8fc83ec6e4ec250dd SHA512 d32bbc2a36b03eccfc931c3e5accae2d4ed5a59e4d40fc44f8fb269684201097ea03e0afcf6eae124efac7b8c43d32e4e79d276c13ea81809acd40b97ef3ceb9
 DIST libvirt-10.5.0.tar.xz 9530296 BLAKE2B 59b6b114e6d4c4752839775ec22b17f530ac86f0252647b312b7f98e9ba856d949727eed5cb47b6b92589e2ce2587fe02505d6653a4e7ba3a3685b5c81a8ebc0 SHA512 e4976849cff7bdae0b7fda0644490f0ca743efc11c35a2fae45bb0f6f467b85644c1d04d1f3d1b10affdc6d9b8dcc0a3c255e527e0bdd73cdd4d1c81d5c418e7
 DIST libvirt-10.5.0.tar.xz.asc 833 BLAKE2B 38b1138de7585e85b7d0a7a93d487e39552b9db989063c3d354f608e005640aaf27c82e99bdaca0448c9a325349c16e3850ceedec380d3d73de4402cdbaad260 SHA512 f764b5cb9cd520b2a73ada3f2438524792c8c8477727fceb5a56ab7fdae8586308998f2fea21071d2e2dae7d168c6dddb5468f302d9f3bac804d6c8e153b760c
+DIST libvirt-10.6.0.tar.xz 9481992 BLAKE2B 68d88ba7f6d5f74d6ad8753a7716902596338811e9c02b09ba6fbdcc60936abf9509bf5cc300446240fa5dd5d2f779c319bca0a22eadea32b49a758b71524857 SHA512 edec79e89669d5e9a46be35e0d6334a6ed3bbf32426679549bd998bde24cba52b0378843f41a3abb5d781ad53e2a6a54619a0bad3f168c11fb41736cc6af6568
+DIST libvirt-10.6.0.tar.xz.asc 833 BLAKE2B 29c5217b665e8ba697adf39920baf6f824bb5d9fdfe96b68f7d4c4f5849c94e44b14b76435fdb98e033b30de73a79b45502a9ba6e7da76ba139c9ebe0bd183b2 SHA512 da50a4760afc094805f087c01646bf6c8165c54e5bad0569a375a1d0791374c27d35fa3780b7104ab248444ed6f8a8a45c20013e57d5129557d6622a9f2a0721
 DIST libvirt-9.8.0.tar.xz 9307064 BLAKE2B aae47e8d4eeaf97532a0356de23ed5a9eea71b369d025eda95b5fd74576779eb4b843d05df6c87b79a14f218c341953749e319ee7244846a2db410a74a746880 SHA512 0118725073de33eec3fa3e4616d3154707f9828fdb9ec973f503fe68f18eab72b9704da660f281152630ddc95e605c786673af9d23dc9bdfc0108422e0efbd41
 DIST libvirt-9.8.0.tar.xz.asc 833 BLAKE2B 3ecd0a925992eeadd50675f7ad8e815bde532c0f66e331ea766fff8e613b6a60b002bedee82fd03684e703057bc13d4e92191268dcd5efe2611ce9bd3cf6b505 SHA512 e041db13281eae9323c22189b7a258caf8d0e2a350cbd31b6cbed7054ccaf09d05c155c3c09daea07940affdf15e8d42bb2339945480cd141a6e8cb417a78536
 DIST libvirt-9.9.0.tar.xz 9321556 BLAKE2B 21eae5a95feaf7f5c6ba8dd48732c08212904882a11c48eccfa827d85ddc3df7e064503f21710dbe1b678670e02f003674de915a43a7403fbf85685c4832e21d SHA512 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7
diff --git a/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild
deleted file mode 100644
index e1f5b32c94f2..000000000000
--- a/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nbd? ( sys-block/nbdkit )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtiofsd? ( app-emulation/virtiofsd )
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
-	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
-	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nbd nbdkit)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
new file mode 100644
index 000000000000..b7393540d081
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
+	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
+	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild
deleted file mode 100644
index 4b7123665d73..000000000000
--- a/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nbd? ( sys-block/nbdkit )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtiofsd? ( app-emulation/virtiofsd )
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
-	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nbd nbdkit)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
new file mode 100644
index 000000000000..01a4a6d58b3a
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild
@@ -0,0 +1,391 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
+	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild
deleted file mode 100644
index f888ab84e3c8..000000000000
--- a/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nbd? ( sys-block/nbdkit )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtiofsd? ( app-emulation/virtiofsd )
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nbd nbdkit)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
new file mode 100644
index 000000000000..4ae9193487c2
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild
deleted file mode 100644
index 1bdfb61feab9..000000000000
--- a/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nbd? ( sys-block/nbdkit )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtiofsd? ( app-emulation/virtiofsd )
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-10.3.0-vsh-Don-t-init-history-in-cmdComplete.patch
-	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nbd nbdkit)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
new file mode 100644
index 000000000000..daa64a693d6f
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild
@@ -0,0 +1,391 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-10.3.0-vsh-Don-t-init-history-in-cmdComplete.patch
+	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
new file mode 100644
index 000000000000..75e4b0092212
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		|| (
+			>=net-firewall/iptables-1.4.10[ipv6(+)]
+			net-firewall/nftables
+		)
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-10.5.0.ebuild b/app-emulation/libvirt/libvirt-10.5.0.ebuild
deleted file mode 100644
index 6c1f35a42d3e..000000000000
--- a/app-emulation/libvirt/libvirt-10.5.0.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
-	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nbd? ( sys-block/nbdkit )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		|| (
-			>=net-firewall/iptables-1.4.10[ipv6(+)]
-			net-firewall/nftables
-		)
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtiofsd? ( app-emulation/virtiofsd )
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nbd nbdkit)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-10.6.0.ebuild b/app-emulation/libvirt/libvirt-10.6.0.ebuild
new file mode 100644
index 000000000000..75e4b0092212
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-10.6.0.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtiofsd virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		|| (
+			>=net-firewall/iptables-1.4.10[ipv6(+)]
+			net-firewall/nftables
+		)
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -d "dev-python/pytest[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9.8.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r3.ebuild
deleted file mode 100644
index 2da56ec3143d..000000000000
--- a/app-emulation/libvirt/libvirt-9.8.0-r3.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch
-	"${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
-	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
-	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
new file mode 100644
index 000000000000..c033816d45a2
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	net-libs/rpcsvc-proto
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch
+	"${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
+	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
+	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd libnbd)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild
deleted file mode 100644
index 18388bf95abe..000000000000
--- a/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-debug/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		app-crypt/swtpm
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtiofsd? ( app-emulation/virtiofsd )
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch
-	"${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
-	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
-	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature test tests)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/systemd"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
new file mode 100644
index 000000000000..6bd378226463
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa
+	openvz parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	net-libs/rpcsvc-proto
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-debug/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtiofsd? ( app-emulation/virtiofsd )
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-9.10.0-virxml-include-libxml-xmlsave.h-for-xmlIndentTreeOut.patch
+	"${FILESDIR}"/${PN}-10.1.0-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
+	"${FILESDIR}"/${PN}-10.2.0-remote-check-for-negative-array-lengths-before-alloc.patch
+	"${FILESDIR}"/${PN}-10.5.0-virt-aa-helper-Allow-RO-access-to-usr-share-edk2-ovm.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nbd nbdkit)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature test tests)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+		-Dopenwsman=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 6c1f35a42d3e..75e4b0092212 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -90,7 +90,10 @@ RDEPEND="
 	libssh2? ( >=net-libs/libssh2-1.3 )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
 	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nbd? ( sys-block/nbdkit )
+	nbd? (
+		sys-block/nbdkit
+		sys-libs/libnbd
+	)
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
@@ -324,6 +327,16 @@ src_configure() {
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
+	# Workaround for bug #938302
+	if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/app-emulation/protontricks/protontricks-1.10.5-r1.ebuild b/app-emulation/protontricks/protontricks-1.10.5-r1.ebuild
new file mode 100644
index 000000000000..70c4324ac6e7
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.10.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+gui"
+
+RDEPEND="
+	app-emulation/winetricks[gui?]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/vdf[${PYTHON_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity )"
+BDEPEND="$(python_gen_cond_dep '
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+')"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/protontricks/protontricks-1.10.5.ebuild b/app-emulation/protontricks/protontricks-1.10.5.ebuild
deleted file mode 100644
index 4c4ddf7953ad..000000000000
--- a/app-emulation/protontricks/protontricks-1.10.5.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
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-BDEPEND="$(python_gen_cond_dep '
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-')"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/protontricks/protontricks-1.11.1-r1.ebuild b/app-emulation/protontricks/protontricks-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..f936c815408b
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.11.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="
+	app-emulation/winetricks[gui?]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/vdf[${PYTHON_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity )"
+BDEPEND="$(python_gen_cond_dep '
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+')"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/protontricks/protontricks-1.11.1.ebuild b/app-emulation/protontricks/protontricks-1.11.1.ebuild
deleted file mode 100644
index fc9689a51050..000000000000
--- a/app-emulation/protontricks/protontricks-1.11.1.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
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-BDEPEND="$(python_gen_cond_dep '
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-')"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/punes/files/punes-0.111-qt6.7_Q_OBJECT.patch b/app-emulation/punes/files/punes-0.111-qt6.7_Q_OBJECT.patch
new file mode 100644
index 000000000000..4b368c980112
--- /dev/null
+++ b/app-emulation/punes/files/punes-0.111-qt6.7_Q_OBJECT.patch
@@ -0,0 +1,17 @@
+https://github.com/punesemu/puNES/commit/6e51b1a6107ad3de97edd40ae4ec2d41b32d804f.patch
+From: Cosima Neidahl <opna2608@protonmail.com>
+Date: Fri, 31 May 2024 14:48:50 +0200
+Subject: [PATCH] Fix compatibility with Qt 6.7.1 (#403)
+
+Upstream QTBUG-105023 fix made it mandatory that arguments to QObject::findChild[ren] calls must be Q_OBJECTs.
+--- a/src/gui/dlgStdPad.hpp
++++ b/src/gui/dlgStdPad.hpp
+@@ -47,6 +47,8 @@ typedef struct _joy_list {
+ extern _joy_list joy_list;
+ 
+ class pixmapButton: public QPushButton {
++	Q_OBJECT
++
+ 	private:
+ 		QPixmap pixmap;
+ 
diff --git a/app-emulation/punes/punes-0.111-r1.ebuild b/app-emulation/punes/punes-0.111-r1.ebuild
new file mode 100644
index 000000000000..8396e9844c88
--- /dev/null
+++ b/app-emulation/punes/punes-0.111-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Nintendo Entertainment System (NES) emulator"
+HOMEPAGE="https://github.com/punesemu/puNES"
+SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/puNES-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X cg ffmpeg"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,network,opengl,widgets]
+	dev-qt/qtsvg:6
+	media-libs/alsa-lib
+	media-libs/libglvnd[X?]
+	virtual/glu
+	virtual/udev
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	ffmpeg? ( media-video/ffmpeg:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	dev-qt/qttools[linguist]
+"
+
+PATCHES=(
+	"${FILESDIR}/punes-0.111-FULLSCREEN_RESFREQ-fix.patch"
+	"${FILESDIR}/punes-0.111-qt6.7_Q_OBJECT.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIT_INFO=OFF
+		-DENABLE_QT6_LIBS=ON
+		-DDISABLE_PORTABLE_MODE=OFF
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FULLSCREEN_RESFREQ=$(usex X)
+		-DENABLE_OPENGL_CG=$(usex cg)
+	)
+	cmake_src_configure
+}
diff --git a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
deleted file mode 100644
index 2a58ca1ad735..000000000000
--- a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-https://bugs.gentoo.org/895662
-https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a
-https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e
-
-From 9f0246539ae84a5e21efd1cc4516fc343f08115a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 10 Jan 2023 12:49:00 -0500
-Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
-
-glibc has fixed (in 2.36.9000-40-g774058d729) the problem
-that caused a clash when both sys/mount.h annd linux/mount.h
-are included, and backported this to the 2.36 stable release
-too:
-
-  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-It is saner for QEMU to remove the workaround it applied for
-glibc 2.36 and expect distros to ship the 2.36 maint release
-with the fix. This avoids needing to add a further workaround
-to QEMU to deal with the fact that linux/brtfs.h now also pulls
-in linux/mount.h via linux/fs.h since Linux 6.1
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Message-Id: <20230110174901.2580297-2-berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -111,31 +111,6 @@
- #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
- #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
- #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
--
--#define BLKGETSIZE64 _IOR(0x12,114,size_t)
--#define BLKDISCARD _IO(0x12,119)
--#define BLKIOMIN _IO(0x12,120)
--#define BLKIOOPT _IO(0x12,121)
--#define BLKALIGNOFF _IO(0x12,122)
--#define BLKPBSZGET _IO(0x12,123)
--#define BLKDISCARDZEROES _IO(0x12,124)
--#define BLKSECDISCARD _IO(0x12,125)
--#define BLKROTATIONAL _IO(0x12,126)
--#define BLKZEROOUT _IO(0x12,127)
--
--#define FIBMAP     _IO(0x00,1)
--#define FIGETBSZ   _IO(0x00,2)
--
--struct file_clone_range {
--        __s64 src_fd;
--        __u64 src_offset;
--        __u64 src_length;
--        __u64 dest_offset;
--};
--
--#define FICLONE         _IOW(0x94, 9, int)
--#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
--
- #else
- #include <linux/fs.h>
- #endif
--- 
-GitLab
-
-From 6003159ce18faad4e1bc7bf9c85669019cd4950e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 10 Jan 2023 12:49:01 -0500
-Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36
- sys/mount.h"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
-
-glibc has fixed (in 2.36.9000-40-g774058d729) the problem
-that caused a clash when both sys/mount.h annd linux/mount.h
-are included, and backported this to the 2.36 stable release
-too:
-
-  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-It is saner for QEMU to remove the workaround it applied for
-glibc 2.36 and expect distros to ship the 2.36 maint release
-with the fix. This avoids needing to add a further workaround
-to QEMU to deal with the fact that linux/brtfs.h now also pulls
-in linux/mount.h via linux/fs.h since Linux 6.1
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Message-Id: <20230110174901.2580297-3-berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,25 +95,7 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
--
--#ifdef HAVE_SYS_MOUNT_FSCONFIG
--/*
-- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-- * which in turn prevents use of linux/fs.h. So we have to
-- * define the constants ourselves for now.
-- */
--#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
--#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
--#define FS_IOC_GETVERSION              _IOR('v', 1, long)
--#define FS_IOC_SETVERSION              _IOW('v', 2, long)
--#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
--#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
--#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
--#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
--#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
--#else
- #include <linux/fs.h>
--#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
---- a/meson.build
-+++ b/meson.build
-@@ -2046,8 +2046,6 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
--config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
--                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
--- 
-GitLab
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index adb556795249..6ebf4f397db5 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -47,7 +47,7 @@
 		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="static-user">Build the User targets as static binaries</flag>
 		<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 		<flag name="jemalloc">Enable jemalloc allocator support</flag>
 		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
 		<flag name="png">Enable png image support for the VNC console server</flag>
diff --git a/app-emulation/qemu/qemu-7.2.11.ebuild b/app-emulation/qemu/qemu-7.2.11.ebuild
index e59ab048ded1..e928b05fcd7d 100644
--- a/app-emulation/qemu/qemu-7.2.11.ebuild
+++ b/app-emulation/qemu/qemu-7.2.11.ebuild
@@ -451,6 +451,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -660,7 +668,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-7.2.12.ebuild b/app-emulation/qemu/qemu-7.2.12.ebuild
index ac517632fb22..f36330d37cf1 100644
--- a/app-emulation/qemu/qemu-7.2.12.ebuild
+++ b/app-emulation/qemu/qemu-7.2.12.ebuild
@@ -451,6 +451,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -660,7 +668,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-7.2.13.ebuild b/app-emulation/qemu/qemu-7.2.13.ebuild
index ac517632fb22..f36330d37cf1 100644
--- a/app-emulation/qemu/qemu-7.2.13.ebuild
+++ b/app-emulation/qemu/qemu-7.2.13.ebuild
@@ -451,6 +451,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -660,7 +668,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild b/app-emulation/qemu/qemu-8.0.5.ebuild
index 32cb18d7115d..9db811fb45c2 100644
--- a/app-emulation/qemu/qemu-8.0.5.ebuild
+++ b/app-emulation/qemu/qemu-8.0.5.ebuild
@@ -454,6 +454,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -661,7 +669,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild b/app-emulation/qemu/qemu-8.1.5.ebuild
index 05d55122f855..5aacea78586a 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -455,6 +455,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -661,7 +669,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild b/app-emulation/qemu/qemu-8.2.3.ebuild
index 1c6bab186548..570039efaff5 100644
--- a/app-emulation/qemu/qemu-8.2.3.ebuild
+++ b/app-emulation/qemu/qemu-8.2.3.ebuild
@@ -475,6 +475,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -681,7 +689,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.2.5-r1.ebuild b/app-emulation/qemu/qemu-8.2.5-r1.ebuild
new file mode 100644
index 000000000000..97bf795e95b8
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.2.5-r1.ebuild
@@ -0,0 +1,1000 @@
+# Copyright 1999-2024 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-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+		pax-utils xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	QEMU_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	SRC_URI=""
+	declare -A SUBPROJECTS=(
+		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+		[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
+	)
+
+	for proj in "${!SUBPROJECTS[@]}"; do
+		c=${SUBPROJECTS[${proj}]}
+		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
+	done
+else
+	MY_P="${PN}-${PV/_rc/-rc}"
+	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
+
+	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg keyutils
+	lzo multipath
+	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static-user systemtap test udev usb
+	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+	zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	loongarch64
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	rx
+	tricore
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	qemu_softmmu_targets_x86_64? ( fdt )
+	sdl-image? ( sdl )
+	static-user? ( !plugins )
+	virgl? ( opengl )
+	virtfs? ( xattr )
+	vnc? ( gnutls )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static-user )
+"
+for smname in ${IUSE_SOFTMMU_TARGETS} ; do
+	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
+done
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	dev-libs/glib:2[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-debug/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:=[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+		dev-libs/nettle:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
+	keyutils? ( sys-apps/keyutils[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl(+),gbm(+)]
+	)
+	pam? ( sys-libs/pam )
+	pipewire? ( >=media-video/pipewire-0.3.60 )
+	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
+	pulseaudio? ( media-libs/libpulse )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.14.0
+		>=app-emulation/spice-0.14.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev:= )
+	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202202"
+SEABIOS_VERSION="1.16.3"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		)
+		sys-firmware/ipxe[qemu]
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+		sys-firmware/sgabios
+	)
+"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+	)
+"
+
+# See bug #913084 for pip dep
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
+	dev-python/pip[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		app-alternatives/bc
+	)
+"
+CDEPEND="
+	${ALL_DEPEND//\[static-libs(+)]}
+	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="
+	${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static-user? ( ${ALL_DEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/kvm
+	selinux? (
+		sec-policy/selinux-qemu
+		sys-libs/libselinux
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
+	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		for file in ${A}; do
+			unpack "${file}"
+		done
+		cd "${WORKDIR}" || die
+		for proj in "${!SUBPROJECTS[@]}"; do
+			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
+		done
+		cd "${S}" || die
+		meson subprojects packagefiles --apply || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled modules
+	rm -r roms/*/ || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}" || die
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+		--disable-download
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--objcc="$(tc-getCC)"
+		--host-cc="$(tc-getBUILD_CC)"
+
+		$(use_enable alsa)
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable jack)
+		$(use_enable nls gettext)
+		$(use_enable oss)
+		$(use_enable pipewire)
+		$(use_enable plugins)
+		$(use_enable pulseaudio pa)
+		$(use_enable selinux)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Special case for the malloc flag, because the --disable flag does
+	# not exist and trying like above will break configuring.
+	conf_malloc() {
+		if [[ ! ${buildtype} == "user" ]] ; then
+			usex "${1}" "--enable-malloc=${1}" ""
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser curl)
+		$(conf_tools doc docs)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_malloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser keyutils libkeyutils)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser pam auth-pam)
+		$(conf_notuser png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev pipewire)
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
+		)
+		local static_flag="none"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--enable-tools
+			--enable-cap-ng
+		)
+		local static_flag="none"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTap
+	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build" || die
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		default
+	fi
+
+	cd "${S}/tools-build" || die
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build" || die
+	emake DESTDIR="${ED}" install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null || die
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null || die
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}" || die
+	dodoc MAINTAINERS
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+
+		if has_version 'sys-firmware/edk2-ovmf-bin'; then
+			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
+		else
+			ewarn " $(best_version sys-firmware/edk2-ovmf)"
+		fi
+
+		if has_version 'sys-firmware/seabios-bin'; then
+			ewarn "	$(best_version sys-firmware/seabios-bin)"
+		else
+			ewarn " $(best_version sys-firmware/seabios)"
+		fi
+
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+
+	if has_version 'sys-firmware/edk2-ovmf-bin'; then
+		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
+	else
+		echo "  $(best_version sys-firmware/edk2-ovmf)"
+	fi
+
+	if has_version 'sys-firmware/seabios-bin'; then
+		echo "  $(best_version sys-firmware/seabios-bin)"
+	else
+		echo "  $(best_version sys-firmware/seabios)"
+	fi
+
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
diff --git a/app-emulation/qemu/qemu-8.2.5.ebuild b/app-emulation/qemu/qemu-8.2.5.ebuild
deleted file mode 100644
index b62207759882..000000000000
--- a/app-emulation/qemu/qemu-8.2.5.ebuild
+++ /dev/null
@@ -1,992 +0,0 @@
-# Copyright 1999-2024 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-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-2).0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-		pax-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	QEMU_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-	SRC_URI=""
-	declare -A SUBPROJECTS=(
-		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
-		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
-		[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
-	)
-
-	for proj in "${!SUBPROJECTS[@]}"; do
-		c=${SUBPROJECTS[${proj}]}
-		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
-	done
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
-
-	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
-	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg keyutils
-	lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static-user systemtap test udev usb
-	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
-	zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	loongarch64
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	rx
-	tricore
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	qemu_softmmu_targets_x86_64? ( fdt )
-	sdl-image? ( sdl )
-	static-user? ( !plugins )
-	virgl? ( opengl )
-	virtfs? ( xattr )
-	vnc? ( gnutls )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static-user )
-"
-for smname in ${IUSE_SOFTMMU_TARGETS} ; do
-	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
-done
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	dev-libs/glib:2[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-debug/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bpf? ( dev-libs/libbpf:= )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:=[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-		dev-libs/nettle:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
-	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
-	keyutils? ( sys-apps/keyutils[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)]
-		sys-libs/ncurses:=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl(+),gbm(+)]
-	)
-	pam? ( sys-libs/pam )
-	pipewire? ( >=media-video/pipewire-0.3.60 )
-	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
-	pulseaudio? ( media-libs/libpulse )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.14.0
-		>=app-emulation/spice-0.14.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202202"
-SEABIOS_VERSION="1.16.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		)
-		sys-firmware/ipxe[qemu]
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-		sys-firmware/sgabios
-	)
-"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-	)
-"
-
-# See bug #913084 for pip dep
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	>=dev-build/meson-0.63.0
-	app-alternatives/ninja
-	dev-python/pip[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		app-alternatives/bc
-	)
-"
-CDEPEND="
-	${ALL_DEPEND//\[static-libs(+)]}
-	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="
-	${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-user? ( ${ALL_DEPEND} )
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/kvm
-	selinux? (
-		sec-policy/selinux-qemu
-		sys-libs/libselinux
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
-	"${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
-	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		for file in ${A}; do
-			unpack "${file}"
-		done
-		cd "${WORKDIR}" || die
-		for proj in "${!SUBPROJECTS[@]}"; do
-			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
-		done
-		cd "${S}" || die
-		meson subprojects packagefiles --apply || die
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled modules
-	rm -r roms/*/ || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}" || die
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-		--disable-download
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--objcc="$(tc-getCC)"
-		--host-cc="$(tc-getBUILD_CC)"
-
-		$(use_enable alsa)
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable jack)
-		$(use_enable nls gettext)
-		$(use_enable oss)
-		$(use_enable pipewire)
-		$(use_enable plugins)
-		$(use_enable pulseaudio pa)
-		$(use_enable selinux)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Special case for the malloc flag, because the --disable flag does
-	# not exist and trying like above will break configuring.
-	conf_malloc() {
-		if [[ ! ${buildtype} == "user" ]] ; then
-			usex "${1}" "--enable-malloc=${1}" ""
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_softmmu bpf)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser curl)
-		$(conf_tools doc docs)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_malloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser keyutils libkeyutils)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser pam auth-pam)
-		$(conf_notuser png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev pipewire)
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-tools
-			--disable-cap-ng
-			--disable-seccomp
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-			--enable-cap-ng
-			--enable-seccomp
-		)
-		local static_flag="none"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--enable-tools
-			--enable-cap-ng
-		)
-		local static_flag="none"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build" || die
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		default
-	fi
-
-	cd "${S}/tools-build" || die
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build" || die
-	emake DESTDIR="${ED}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
-	fi
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null || die
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null || die
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}" || die
-	dodoc MAINTAINERS
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-
-		if has_version 'sys-firmware/edk2-ovmf-bin'; then
-			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
-		else
-			ewarn " $(best_version sys-firmware/edk2-ovmf)"
-		fi
-
-		if has_version 'sys-firmware/seabios-bin'; then
-			ewarn "	$(best_version sys-firmware/seabios-bin)"
-		else
-			ewarn " $(best_version sys-firmware/seabios)"
-		fi
-
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-
-	if has_version 'sys-firmware/edk2-ovmf-bin'; then
-		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
-	else
-		echo "  $(best_version sys-firmware/edk2-ovmf)"
-	fi
-
-	if has_version 'sys-firmware/seabios-bin'; then
-		echo "  $(best_version sys-firmware/seabios-bin)"
-	else
-		echo "  $(best_version sys-firmware/seabios)"
-	fi
-
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	udev_reload
-}
diff --git a/app-emulation/qemu/qemu-8.2.6-r1.ebuild b/app-emulation/qemu/qemu-8.2.6-r1.ebuild
new file mode 100644
index 000000000000..97bf795e95b8
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.2.6-r1.ebuild
@@ -0,0 +1,1000 @@
+# Copyright 1999-2024 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-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+		pax-utils xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	QEMU_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	SRC_URI=""
+	declare -A SUBPROJECTS=(
+		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+		[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
+	)
+
+	for proj in "${!SUBPROJECTS[@]}"; do
+		c=${SUBPROJECTS[${proj}]}
+		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
+	done
+else
+	MY_P="${PN}-${PV/_rc/-rc}"
+	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
+
+	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg keyutils
+	lzo multipath
+	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static-user systemtap test udev usb
+	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+	zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	loongarch64
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	rx
+	tricore
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	qemu_softmmu_targets_x86_64? ( fdt )
+	sdl-image? ( sdl )
+	static-user? ( !plugins )
+	virgl? ( opengl )
+	virtfs? ( xattr )
+	vnc? ( gnutls )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static-user )
+"
+for smname in ${IUSE_SOFTMMU_TARGETS} ; do
+	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
+done
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	dev-libs/glib:2[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-debug/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:=[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+		dev-libs/nettle:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
+	keyutils? ( sys-apps/keyutils[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl(+),gbm(+)]
+	)
+	pam? ( sys-libs/pam )
+	pipewire? ( >=media-video/pipewire-0.3.60 )
+	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
+	pulseaudio? ( media-libs/libpulse )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.14.0
+		>=app-emulation/spice-0.14.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev:= )
+	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202202"
+SEABIOS_VERSION="1.16.3"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		)
+		sys-firmware/ipxe[qemu]
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+		sys-firmware/sgabios
+	)
+"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+	)
+"
+
+# See bug #913084 for pip dep
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
+	dev-python/pip[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		app-alternatives/bc
+	)
+"
+CDEPEND="
+	${ALL_DEPEND//\[static-libs(+)]}
+	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="
+	${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static-user? ( ${ALL_DEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/kvm
+	selinux? (
+		sec-policy/selinux-qemu
+		sys-libs/libselinux
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
+	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		for file in ${A}; do
+			unpack "${file}"
+		done
+		cd "${WORKDIR}" || die
+		for proj in "${!SUBPROJECTS[@]}"; do
+			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
+		done
+		cd "${S}" || die
+		meson subprojects packagefiles --apply || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled modules
+	rm -r roms/*/ || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}" || die
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+		--disable-download
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--objcc="$(tc-getCC)"
+		--host-cc="$(tc-getBUILD_CC)"
+
+		$(use_enable alsa)
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable jack)
+		$(use_enable nls gettext)
+		$(use_enable oss)
+		$(use_enable pipewire)
+		$(use_enable plugins)
+		$(use_enable pulseaudio pa)
+		$(use_enable selinux)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Special case for the malloc flag, because the --disable flag does
+	# not exist and trying like above will break configuring.
+	conf_malloc() {
+		if [[ ! ${buildtype} == "user" ]] ; then
+			usex "${1}" "--enable-malloc=${1}" ""
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser curl)
+		$(conf_tools doc docs)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_malloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser keyutils libkeyutils)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser pam auth-pam)
+		$(conf_notuser png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev pipewire)
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
+		)
+		local static_flag="none"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--enable-tools
+			--enable-cap-ng
+		)
+		local static_flag="none"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTap
+	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build" || die
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		default
+	fi
+
+	cd "${S}/tools-build" || die
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build" || die
+	emake DESTDIR="${ED}" install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null || die
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null || die
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}" || die
+	dodoc MAINTAINERS
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+
+		if has_version 'sys-firmware/edk2-ovmf-bin'; then
+			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
+		else
+			ewarn " $(best_version sys-firmware/edk2-ovmf)"
+		fi
+
+		if has_version 'sys-firmware/seabios-bin'; then
+			ewarn "	$(best_version sys-firmware/seabios-bin)"
+		else
+			ewarn " $(best_version sys-firmware/seabios)"
+		fi
+
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+
+	if has_version 'sys-firmware/edk2-ovmf-bin'; then
+		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
+	else
+		echo "  $(best_version sys-firmware/edk2-ovmf)"
+	fi
+
+	if has_version 'sys-firmware/seabios-bin'; then
+		echo "  $(best_version sys-firmware/seabios-bin)"
+	else
+		echo "  $(best_version sys-firmware/seabios)"
+	fi
+
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
diff --git a/app-emulation/qemu/qemu-8.2.6.ebuild b/app-emulation/qemu/qemu-8.2.6.ebuild
deleted file mode 100644
index b62207759882..000000000000
--- a/app-emulation/qemu/qemu-8.2.6.ebuild
+++ /dev/null
@@ -1,992 +0,0 @@
-# Copyright 1999-2024 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-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-2).0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-		pax-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	QEMU_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-	SRC_URI=""
-	declare -A SUBPROJECTS=(
-		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
-		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
-		[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
-	)
-
-	for proj in "${!SUBPROJECTS[@]}"; do
-		c=${SUBPROJECTS[${proj}]}
-		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
-	done
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
-
-	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
-	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg keyutils
-	lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static-user systemtap test udev usb
-	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
-	zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	loongarch64
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	rx
-	tricore
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	qemu_softmmu_targets_x86_64? ( fdt )
-	sdl-image? ( sdl )
-	static-user? ( !plugins )
-	virgl? ( opengl )
-	virtfs? ( xattr )
-	vnc? ( gnutls )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static-user )
-"
-for smname in ${IUSE_SOFTMMU_TARGETS} ; do
-	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
-done
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	dev-libs/glib:2[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-debug/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bpf? ( dev-libs/libbpf:= )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:=[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-		dev-libs/nettle:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
-	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
-	keyutils? ( sys-apps/keyutils[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)]
-		sys-libs/ncurses:=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl(+),gbm(+)]
-	)
-	pam? ( sys-libs/pam )
-	pipewire? ( >=media-video/pipewire-0.3.60 )
-	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
-	pulseaudio? ( media-libs/libpulse )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.14.0
-		>=app-emulation/spice-0.14.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202202"
-SEABIOS_VERSION="1.16.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		)
-		sys-firmware/ipxe[qemu]
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-		sys-firmware/sgabios
-	)
-"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-	)
-"
-
-# See bug #913084 for pip dep
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	>=dev-build/meson-0.63.0
-	app-alternatives/ninja
-	dev-python/pip[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		app-alternatives/bc
-	)
-"
-CDEPEND="
-	${ALL_DEPEND//\[static-libs(+)]}
-	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="
-	${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-user? ( ${ALL_DEPEND} )
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/kvm
-	selinux? (
-		sec-policy/selinux-qemu
-		sys-libs/libselinux
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
-	"${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
-	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		for file in ${A}; do
-			unpack "${file}"
-		done
-		cd "${WORKDIR}" || die
-		for proj in "${!SUBPROJECTS[@]}"; do
-			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
-		done
-		cd "${S}" || die
-		meson subprojects packagefiles --apply || die
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled modules
-	rm -r roms/*/ || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}" || die
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-		--disable-download
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--objcc="$(tc-getCC)"
-		--host-cc="$(tc-getBUILD_CC)"
-
-		$(use_enable alsa)
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable jack)
-		$(use_enable nls gettext)
-		$(use_enable oss)
-		$(use_enable pipewire)
-		$(use_enable plugins)
-		$(use_enable pulseaudio pa)
-		$(use_enable selinux)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Special case for the malloc flag, because the --disable flag does
-	# not exist and trying like above will break configuring.
-	conf_malloc() {
-		if [[ ! ${buildtype} == "user" ]] ; then
-			usex "${1}" "--enable-malloc=${1}" ""
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_softmmu bpf)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser curl)
-		$(conf_tools doc docs)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_malloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser keyutils libkeyutils)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser pam auth-pam)
-		$(conf_notuser png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev pipewire)
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-tools
-			--disable-cap-ng
-			--disable-seccomp
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-			--enable-cap-ng
-			--enable-seccomp
-		)
-		local static_flag="none"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--enable-tools
-			--enable-cap-ng
-		)
-		local static_flag="none"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build" || die
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		default
-	fi
-
-	cd "${S}/tools-build" || die
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build" || die
-	emake DESTDIR="${ED}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
-	fi
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null || die
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null || die
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}" || die
-	dodoc MAINTAINERS
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-
-		if has_version 'sys-firmware/edk2-ovmf-bin'; then
-			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
-		else
-			ewarn " $(best_version sys-firmware/edk2-ovmf)"
-		fi
-
-		if has_version 'sys-firmware/seabios-bin'; then
-			ewarn "	$(best_version sys-firmware/seabios-bin)"
-		else
-			ewarn " $(best_version sys-firmware/seabios)"
-		fi
-
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-
-	if has_version 'sys-firmware/edk2-ovmf-bin'; then
-		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
-	else
-		echo "  $(best_version sys-firmware/edk2-ovmf)"
-	fi
-
-	if has_version 'sys-firmware/seabios-bin'; then
-		echo "  $(best_version sys-firmware/seabios-bin)"
-	else
-		echo "  $(best_version sys-firmware/seabios)"
-	fi
-
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	udev_reload
-}
diff --git a/app-emulation/qemu/qemu-9.0.1-r1.ebuild b/app-emulation/qemu/qemu-9.0.1-r1.ebuild
new file mode 100644
index 000000000000..2fe9ba5dd5f1
--- /dev/null
+++ b/app-emulation/qemu/qemu-9.0.1-r1.ebuild
@@ -0,0 +1,1004 @@
+# Copyright 1999-2024 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-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+		pax-utils xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	QEMU_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	SRC_URI=""
+	declare -A SUBPROJECTS=(
+		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+		[berkeley-testfloat-3]="e7af9751d9f9fd3b47911f51a5cfd08af256a9ab"
+	)
+
+	for proj in "${!SUBPROJECTS[@]}"; do
+		c=${SUBPROJECTS[${proj}]}
+		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
+	done
+else
+	MY_P="${PN}-${PV/_rc/-rc}"
+	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
+
+	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg keyutils
+	lzo multipath
+	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static-user systemtap test udev usb
+	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+	zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	loongarch64
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	rx
+	tricore
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	qemu_softmmu_targets_x86_64? ( fdt )
+	sdl-image? ( sdl )
+	static-user? ( !plugins )
+	virgl? ( opengl )
+	virtfs? ( xattr )
+	vnc? ( gnutls )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static-user )
+"
+for smname in ${IUSE_SOFTMMU_TARGETS} ; do
+	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
+done
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	dev-libs/glib:2[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-debug/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:=[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+		dev-libs/nettle:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
+	keyutils? ( sys-apps/keyutils[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl(+),gbm(+)]
+	)
+	pam? ( sys-libs/pam )
+	pipewire? ( >=media-video/pipewire-0.3.60 )
+	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
+	pulseaudio? ( media-libs/libpulse )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.14.0
+		>=app-emulation/spice-0.14.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev:= )
+	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202202"
+SEABIOS_VERSION="1.16.3"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		)
+		sys-firmware/ipxe[qemu]
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+		sys-firmware/sgabios
+	)
+"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+	)
+"
+
+# See bug #913084 for pip dep
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
+	dev-python/pip[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		app-alternatives/bc
+	)
+"
+CDEPEND="
+	${ALL_DEPEND//\[static-libs(+)]}
+	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="
+	${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static-user? ( ${ALL_DEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/kvm
+	selinux? (
+		sec-policy/selinux-qemu
+		sys-libs/libselinux
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-9.0.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-9.0.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
+	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
+
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/hppa-firmware64.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+			use test && CONFIG_CHECK+=" IP_MULTICAST"
+			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		for file in ${A}; do
+			unpack "${file}"
+		done
+		cd "${WORKDIR}" || die
+		for proj in "${!SUBPROJECTS[@]}"; do
+			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
+		done
+		cd "${S}" || die
+		meson subprojects packagefiles --apply || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled modules
+	rm -r roms/*/ || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}" || die
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+		--disable-download
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--objcc="$(tc-getCC)"
+		--host-cc="$(tc-getBUILD_CC)"
+
+		$(use_enable alsa)
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable jack)
+		$(use_enable nls gettext)
+		$(use_enable oss)
+		$(use_enable pipewire)
+		$(use_enable plugins)
+		$(use_enable pulseaudio pa)
+		$(use_enable selinux)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Special case for the malloc flag, because the --disable flag does
+	# not exist and trying like above will break configuring.
+	conf_malloc() {
+		if [[ ! ${buildtype} == "user" ]] ; then
+			usex "${1}" "--enable-malloc=${1}" ""
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser curl)
+		$(conf_tools doc docs)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_malloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser keyutils libkeyutils)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser pam auth-pam)
+		$(conf_notuser png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev pipewire)
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
+		)
+		local static_flag="none"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--enable-tools
+			--enable-cap-ng
+		)
+		local static_flag="none"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTap
+	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build" || die
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		default
+	fi
+
+	cd "${S}/tools-build" || die
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build" || die
+	emake DESTDIR="${ED}" install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null || die
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null || die
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}" || die
+	dodoc MAINTAINERS
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+
+		if has_version 'sys-firmware/edk2-ovmf-bin'; then
+			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
+		else
+			ewarn " $(best_version sys-firmware/edk2-ovmf)"
+		fi
+
+		if has_version 'sys-firmware/seabios-bin'; then
+			ewarn "	$(best_version sys-firmware/seabios-bin)"
+		else
+			ewarn " $(best_version sys-firmware/seabios)"
+		fi
+
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+
+	if has_version 'sys-firmware/edk2-ovmf-bin'; then
+		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
+	else
+		echo "  $(best_version sys-firmware/edk2-ovmf)"
+	fi
+
+	if has_version 'sys-firmware/seabios-bin'; then
+		echo "  $(best_version sys-firmware/seabios-bin)"
+	else
+		echo "  $(best_version sys-firmware/seabios)"
+	fi
+
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
diff --git a/app-emulation/qemu/qemu-9.0.1.ebuild b/app-emulation/qemu/qemu-9.0.1.ebuild
deleted file mode 100644
index 6d9b868ae64c..000000000000
--- a/app-emulation/qemu/qemu-9.0.1.ebuild
+++ /dev/null
@@ -1,996 +0,0 @@
-# Copyright 1999-2024 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-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-2).0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-		pax-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	QEMU_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-	SRC_URI=""
-	declare -A SUBPROJECTS=(
-		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
-		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
-		[berkeley-testfloat-3]="e7af9751d9f9fd3b47911f51a5cfd08af256a9ab"
-	)
-
-	for proj in "${!SUBPROJECTS[@]}"; do
-		c=${SUBPROJECTS[${proj}]}
-		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
-	done
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
-
-	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
-	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg keyutils
-	lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static-user systemtap test udev usb
-	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
-	zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	loongarch64
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	rx
-	tricore
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	qemu_softmmu_targets_x86_64? ( fdt )
-	sdl-image? ( sdl )
-	static-user? ( !plugins )
-	virgl? ( opengl )
-	virtfs? ( xattr )
-	vnc? ( gnutls )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static-user )
-"
-for smname in ${IUSE_SOFTMMU_TARGETS} ; do
-	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
-done
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	dev-libs/glib:2[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-debug/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bpf? ( dev-libs/libbpf:= )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:=[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-		dev-libs/nettle:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
-	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
-	keyutils? ( sys-apps/keyutils[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)]
-		sys-libs/ncurses:=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl(+),gbm(+)]
-	)
-	pam? ( sys-libs/pam )
-	pipewire? ( >=media-video/pipewire-0.3.60 )
-	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
-	pulseaudio? ( media-libs/libpulse )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.14.0
-		>=app-emulation/spice-0.14.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202202"
-SEABIOS_VERSION="1.16.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		)
-		sys-firmware/ipxe[qemu]
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-		sys-firmware/sgabios
-	)
-"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-	)
-"
-
-# See bug #913084 for pip dep
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	>=dev-build/meson-0.63.0
-	app-alternatives/ninja
-	dev-python/pip[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		app-alternatives/bc
-	)
-"
-CDEPEND="
-	${ALL_DEPEND//\[static-libs(+)]}
-	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="
-	${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-user? ( ${ALL_DEPEND} )
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/kvm
-	selinux? (
-		sec-policy/selinux-qemu
-		sys-libs/libselinux
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-9.0.0-capstone-include-path.patch
-	"${FILESDIR}"/${PN}-9.0.0-also-build-virtfs-proxy-helper.patch
-	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
-
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/hppa-firmware64.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-			use test && CONFIG_CHECK+=" IP_MULTICAST"
-			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		for file in ${A}; do
-			unpack "${file}"
-		done
-		cd "${WORKDIR}" || die
-		for proj in "${!SUBPROJECTS[@]}"; do
-			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
-		done
-		cd "${S}" || die
-		meson subprojects packagefiles --apply || die
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled modules
-	rm -r roms/*/ || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}" || die
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-		--disable-download
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--objcc="$(tc-getCC)"
-		--host-cc="$(tc-getBUILD_CC)"
-
-		$(use_enable alsa)
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable jack)
-		$(use_enable nls gettext)
-		$(use_enable oss)
-		$(use_enable pipewire)
-		$(use_enable plugins)
-		$(use_enable pulseaudio pa)
-		$(use_enable selinux)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Special case for the malloc flag, because the --disable flag does
-	# not exist and trying like above will break configuring.
-	conf_malloc() {
-		if [[ ! ${buildtype} == "user" ]] ; then
-			usex "${1}" "--enable-malloc=${1}" ""
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_softmmu bpf)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser curl)
-		$(conf_tools doc docs)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_malloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser keyutils libkeyutils)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser pam auth-pam)
-		$(conf_notuser png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev pipewire)
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-tools
-			--disable-cap-ng
-			--disable-seccomp
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-			--enable-cap-ng
-			--enable-seccomp
-		)
-		local static_flag="none"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--enable-tools
-			--enable-cap-ng
-		)
-		local static_flag="none"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build" || die
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		default
-	fi
-
-	cd "${S}/tools-build" || die
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build" || die
-	emake DESTDIR="${ED}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
-	fi
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null || die
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null || die
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}" || die
-	dodoc MAINTAINERS
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-
-		if has_version 'sys-firmware/edk2-ovmf-bin'; then
-			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
-		else
-			ewarn " $(best_version sys-firmware/edk2-ovmf)"
-		fi
-
-		if has_version 'sys-firmware/seabios-bin'; then
-			ewarn "	$(best_version sys-firmware/seabios-bin)"
-		else
-			ewarn " $(best_version sys-firmware/seabios)"
-		fi
-
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-
-	if has_version 'sys-firmware/edk2-ovmf-bin'; then
-		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
-	else
-		echo "  $(best_version sys-firmware/edk2-ovmf)"
-	fi
-
-	if has_version 'sys-firmware/seabios-bin'; then
-		echo "  $(best_version sys-firmware/seabios-bin)"
-	else
-		echo "  $(best_version sys-firmware/seabios)"
-	fi
-
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	udev_reload
-}
diff --git a/app-emulation/qemu/qemu-9.0.2-r1.ebuild b/app-emulation/qemu/qemu-9.0.2-r1.ebuild
new file mode 100644
index 000000000000..2fe9ba5dd5f1
--- /dev/null
+++ b/app-emulation/qemu/qemu-9.0.2-r1.ebuild
@@ -0,0 +1,1004 @@
+# Copyright 1999-2024 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-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+		pax-utils xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	QEMU_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	SRC_URI=""
+	declare -A SUBPROJECTS=(
+		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+		[berkeley-testfloat-3]="e7af9751d9f9fd3b47911f51a5cfd08af256a9ab"
+	)
+
+	for proj in "${!SUBPROJECTS[@]}"; do
+		c=${SUBPROJECTS[${proj}]}
+		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
+	done
+else
+	MY_P="${PN}-${PV/_rc/-rc}"
+	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
+
+	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg keyutils
+	lzo multipath
+	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static-user systemtap test udev usb
+	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+	zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	loongarch64
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	rx
+	tricore
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	qemu_softmmu_targets_x86_64? ( fdt )
+	sdl-image? ( sdl )
+	static-user? ( !plugins )
+	virgl? ( opengl )
+	virtfs? ( xattr )
+	vnc? ( gnutls )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static-user )
+"
+for smname in ${IUSE_SOFTMMU_TARGETS} ; do
+	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
+done
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	dev-libs/glib:2[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-debug/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:=[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+		dev-libs/nettle:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
+	keyutils? ( sys-apps/keyutils[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl(+),gbm(+)]
+	)
+	pam? ( sys-libs/pam )
+	pipewire? ( >=media-video/pipewire-0.3.60 )
+	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
+	pulseaudio? ( media-libs/libpulse )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.14.0
+		>=app-emulation/spice-0.14.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev:= )
+	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202202"
+SEABIOS_VERSION="1.16.3"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		)
+		sys-firmware/ipxe[qemu]
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+		sys-firmware/sgabios
+	)
+"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+	)
+"
+
+# See bug #913084 for pip dep
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	>=dev-build/meson-0.63.0
+	app-alternatives/ninja
+	dev-python/pip[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		app-alternatives/bc
+	)
+"
+CDEPEND="
+	${ALL_DEPEND//\[static-libs(+)]}
+	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="
+	${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static-user? ( ${ALL_DEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/kvm
+	selinux? (
+		sec-policy/selinux-qemu
+		sys-libs/libselinux
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-9.0.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-9.0.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
+	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
+
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/hppa-firmware64.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+			use test && CONFIG_CHECK+=" IP_MULTICAST"
+			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		for file in ${A}; do
+			unpack "${file}"
+		done
+		cd "${WORKDIR}" || die
+		for proj in "${!SUBPROJECTS[@]}"; do
+			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
+		done
+		cd "${S}" || die
+		meson subprojects packagefiles --apply || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled modules
+	rm -r roms/*/ || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}" || die
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+		--disable-download
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--objcc="$(tc-getCC)"
+		--host-cc="$(tc-getBUILD_CC)"
+
+		$(use_enable alsa)
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable jack)
+		$(use_enable nls gettext)
+		$(use_enable oss)
+		$(use_enable pipewire)
+		$(use_enable plugins)
+		$(use_enable pulseaudio pa)
+		$(use_enable selinux)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Special case for the malloc flag, because the --disable flag does
+	# not exist and trying like above will break configuring.
+	conf_malloc() {
+		if [[ ! ${buildtype} == "user" ]] ; then
+			usex "${1}" "--enable-malloc=${1}" ""
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser curl)
+		$(conf_tools doc docs)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_malloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser keyutils libkeyutils)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser pam auth-pam)
+		$(conf_notuser png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev pipewire)
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
+		)
+		local static_flag="none"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--enable-tools
+			--enable-cap-ng
+		)
+		local static_flag="none"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTap
+	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build" || die
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		default
+	fi
+
+	cd "${S}/tools-build" || die
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build" || die
+	emake DESTDIR="${ED}" install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null || die
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null || die
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}" || die
+	dodoc MAINTAINERS
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+
+		if has_version 'sys-firmware/edk2-ovmf-bin'; then
+			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
+		else
+			ewarn " $(best_version sys-firmware/edk2-ovmf)"
+		fi
+
+		if has_version 'sys-firmware/seabios-bin'; then
+			ewarn "	$(best_version sys-firmware/seabios-bin)"
+		else
+			ewarn " $(best_version sys-firmware/seabios)"
+		fi
+
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+
+	if has_version 'sys-firmware/edk2-ovmf-bin'; then
+		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
+	else
+		echo "  $(best_version sys-firmware/edk2-ovmf)"
+	fi
+
+	if has_version 'sys-firmware/seabios-bin'; then
+		echo "  $(best_version sys-firmware/seabios-bin)"
+	else
+		echo "  $(best_version sys-firmware/seabios)"
+	fi
+
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
diff --git a/app-emulation/qemu/qemu-9.0.2.ebuild b/app-emulation/qemu/qemu-9.0.2.ebuild
deleted file mode 100644
index 6d9b868ae64c..000000000000
--- a/app-emulation/qemu/qemu-9.0.2.ebuild
+++ /dev/null
@@ -1,996 +0,0 @@
-# Copyright 1999-2024 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-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-2).0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-		pax-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	QEMU_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-	SRC_URI=""
-	declare -A SUBPROJECTS=(
-		[keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
-		[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
-		[berkeley-testfloat-3]="e7af9751d9f9fd3b47911f51a5cfd08af256a9ab"
-	)
-
-	for proj in "${!SUBPROJECTS[@]}"; do
-		c=${SUBPROJECTS[${proj}]}
-		SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2"
-	done
-else
-	MY_P="${PN}-${PV/_rc/-rc}"
-	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
-
-	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
-	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg keyutils
-	lzo multipath
-	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static-user systemtap test udev usb
-	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
-	zstd"
-
-COMMON_TARGETS="
-	aarch64
-	alpha
-	arm
-	cris
-	hppa
-	i386
-	loongarch64
-	m68k
-	microblaze
-	microblazeel
-	mips
-	mips64
-	mips64el
-	mipsel
-	nios2
-	or1k
-	ppc
-	ppc64
-	riscv32
-	riscv64
-	s390x
-	sh4
-	sh4eb
-	sparc
-	sparc64
-	x86_64
-	xtensa
-	xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-	${COMMON_TARGETS}
-	avr
-	rx
-	tricore
-"
-IUSE_USER_TARGETS="
-	${COMMON_TARGETS}
-	aarch64_be
-	armeb
-	hexagon
-	mipsn32
-	mipsn32el
-	ppc64le
-	sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	qemu_softmmu_targets_x86_64? ( fdt )
-	sdl-image? ( sdl )
-	static-user? ( !plugins )
-	virgl? ( opengl )
-	virtfs? ( xattr )
-	vnc? ( gnutls )
-	vte? ( gtk )
-	multipath? ( udev )
-	plugins? ( !static-user )
-"
-for smname in ${IUSE_SOFTMMU_TARGETS} ; do
-	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )"
-done
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	dev-libs/glib:2[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-debug/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bpf? ( dev-libs/libbpf:= )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:=[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
-	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-		dev-libs/nettle:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
-	kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
-	keyutils? ( sys-apps/keyutils[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)]
-		sys-libs/ncurses:=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl(+),gbm(+)]
-	)
-	pam? ( sys-libs/pam )
-	pipewire? ( >=media-video/pipewire-0.3.60 )
-	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
-	pulseaudio? ( media-libs/libpulse )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.14.0
-		>=app-emulation/spice-0.14.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202202"
-SEABIOS_VERSION="1.16.0"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		~sys-firmware/ipxe-1.21.1[binary,qemu]
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		~sys-firmware/sgabios-0.1_pre10[binary]
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-		)
-		sys-firmware/ipxe[qemu]
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-		sys-firmware/sgabios
-	)
-"
-PPC_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
-	)
-	!pin-upstream-blobs? (
-		|| (
-			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
-		)
-	)
-"
-
-# See bug #913084 for pip dep
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	>=dev-build/meson-0.63.0
-	app-alternatives/ninja
-	dev-python/pip[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		app-alternatives/bc
-	)
-"
-CDEPEND="
-	${ALL_DEPEND//\[static-libs(+)]}
-	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="
-	${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-user? ( ${ALL_DEPEND} )
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/kvm
-	selinux? (
-		sec-policy/selinux-qemu
-		sys-libs/libselinux
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-9.0.0-capstone-include-path.patch
-	"${FILESDIR}"/${PN}-9.0.0-also-build-virtfs-proxy-helper.patch
-	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
-
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/hppa-firmware64.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-			use test && CONFIG_CHECK+=" IP_MULTICAST"
-			ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/configs/targets/ >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		for file in ${A}; do
-			unpack "${file}"
-		done
-		cd "${WORKDIR}" || die
-		for proj in "${!SUBPROJECTS[@]}"; do
-			mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die
-		done
-		cd "${S}" || die
-		meson subprojects packagefiles --apply || die
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Remove bundled modules
-	rm -r roms/*/ || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}" || die
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-		--disable-download
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--objcc="$(tc-getCC)"
-		--host-cc="$(tc-getBUILD_CC)"
-
-		$(use_enable alsa)
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable jack)
-		$(use_enable nls gettext)
-		$(use_enable oss)
-		$(use_enable pipewire)
-		$(use_enable plugins)
-		$(use_enable pulseaudio pa)
-		$(use_enable selinux)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	# Enable option only for softmmu build, but not 'user' or 'tools'
-	conf_softmmu() {
-		if [[ ${buildtype} == "softmmu" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Enable option only for tools build, but not 'user' or 'softmmu'
-	conf_tools() {
-		if [[ ${buildtype} == "tools" ]] ; then
-			use_enable "$@"
-		else
-			echo "--disable-${2:-$1}"
-		fi
-	}
-	# Special case for the malloc flag, because the --disable flag does
-	# not exist and trying like above will break configuring.
-	conf_malloc() {
-		if [[ ! ${buildtype} == "user" ]] ; then
-			usex "${1}" "--enable-malloc=${1}" ""
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_softmmu bpf)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser curl)
-		$(conf_tools doc docs)
-		$(conf_notuser fdt)
-		$(conf_notuser fuse)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_malloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser keyutils libkeyutils)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser pam auth-pam)
-		$(conf_notuser png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser udev libudev)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_softmmu virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		# use prebuilt keymaps, bug #759604
-		--disable-xkbcommon
-		$(conf_notuser zstd)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev pipewire)
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-tools
-			--disable-cap-ng
-			--disable-seccomp
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-			--enable-cap-ng
-			--enable-seccomp
-		)
-		local static_flag="none"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--enable-tools
-			--enable-cap-ng
-		)
-		local static_flag="none"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Meson will not use a cross-file unless cross_prefix is set.
-	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build" || die
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		default
-	fi
-
-	cd "${S}/tools-build" || die
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build" || die
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build" || die
-	emake DESTDIR="${ED}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
-	fi
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null || die
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null || die
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}" || die
-	dodoc MAINTAINERS
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-
-		# PPC/PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-
-		if has_version 'sys-firmware/edk2-ovmf-bin'; then
-			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
-		else
-			ewarn " $(best_version sys-firmware/edk2-ovmf)"
-		fi
-
-		if has_version 'sys-firmware/seabios-bin'; then
-			ewarn "	$(best_version sys-firmware/seabios-bin)"
-		else
-			ewarn " $(best_version sys-firmware/seabios)"
-		fi
-
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-
-	if has_version 'sys-firmware/edk2-ovmf-bin'; then
-		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
-	else
-		echo "  $(best_version sys-firmware/edk2-ovmf)"
-	fi
-
-	if has_version 'sys-firmware/seabios-bin'; then
-		echo "  $(best_version sys-firmware/seabios-bin)"
-	else
-		echo "  $(best_version sys-firmware/seabios)"
-	fi
-
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	udev_reload
-}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 02a65ccd518a..978471403537 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -240,7 +240,7 @@ SOFTMMU_TOOLS_DEPEND="
 "
 
 EDK2_OVMF_VERSION="202202"
-SEABIOS_VERSION="1.16.0"
+SEABIOS_VERSION="1.16.3"
 
 X86_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
@@ -478,6 +478,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -684,7 +692,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qtrvsim/qtrvsim-0.9.7-r1.ebuild b/app-emulation/qtrvsim/qtrvsim-0.9.7-r1.ebuild
index a50f1b567a64..efe69a56f390 100644
--- a/app-emulation/qtrvsim/qtrvsim-0.9.7-r1.ebuild
+++ b/app-emulation/qtrvsim/qtrvsim-0.9.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cvut/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-qt/qtbase:6[gui,widgets]
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index 926fcc97a3bb..43c7ffb84882 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -1,97 +1,122 @@
-DIST ab_glyph-0.2.26.crate 19078 BLAKE2B 3b5f367cac98a4f5d724ac33cea2879f34973e567e137e7a75878ee84b6467470041556f9ae0b9ac9bf9f7f396941a71a6cae714918d90cde08b8d0a26dad93b SHA512 63d6c4ec942d3dd9c74913a6c697821f57a4a97caaba2c039cdf49ee15f4d7968a5f0f6dda52b354a8c001abe7a28405b873609dc4a56854f8a804d1352264fa
 DIST ab_glyph-0.2.28.crate 19965 BLAKE2B 3cebcf213bd99da72e59dcd7b23611a9472065f2da5bdece92540977888b8dfadb8ea7b1cc341dc37b05171512a60e102a0b46e6597914b168349509bf463cd6 SHA512 ab2e4c2ddbb5a93bc049892e2703086a66eced9bfd267f4ea161ca68b5906d41c1cff1c9d75e4beb8f5cd8674f8e6bcec7eb0278f37285a1beef24015444a3f5
 DIST ab_glyph_rasterizer-0.1.8.crate 11010 BLAKE2B 2a20fd3ff646559d704e214ae7c4e5b8297e20be0909c403c140edb67002665447a6a796e5ca5d71f5c8c55000489a14a101ec43dd90101be9c246d1a0138dc4 SHA512 6fd5ff2d068da84c4ac2e6e2c5ad6ab2f4926f1664afb8ba701b60a35c3bd7bf00b200b22c455ca15dfc7d4303c8caa0bb150c18dcce01ce107deaf323cde17f
 DIST addr2line-0.22.0.crate 39156 BLAKE2B 3fbb55f6cacbb177d06359bcd39885247a9eeef96d95ffac0dfd1d45ed394dcd1e9e069c02c71a9ffca0b69e3a974e4d96bc3385470ee39c87d7a30ea7914303 SHA512 b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
+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 alsa-0.9.0.crate 72602 BLAKE2B f65921c4d37204f9f8bfbb95cb3cf64952240b516600d9d48d3125c491ba12d476d5717db6cbb1ab58e0d85373a5d4347d5fb64405d5af0639d282de9632b7f9 SHA512 85dba28d451a8fed3b6131dddaedbe8de0fbcbc39dd9c58a9a9d56f132663f8f42f6e647ca26bc25c2558cc4db806894b8062f5f2bea619dc70f2dca32a2cc02
+DIST alsa-0.9.1.crate 72824 BLAKE2B 6ca18c6a0c62dc3588f19deaa64aca9c4dac5490d6f4fbc41ae4ca66cbaed04526a90a91c7787815df74e8333d25f9da58fb4bdee24a3a66af211dc15ca6e84d SHA512 c65316e0dbdbd368faaa5985049b119dfaf3f8a8ec867bd69bacdde99395d257227819fb92970685c86b0002408b7e99026e3ca914ec237d20b585d23e16fc4f
 DIST alsa-sys-0.3.1.crate 32748 BLAKE2B 0c4da9c343d622ddd521fe9332acf97c1ee4a202a909c7a0014a507148ab6ff82d5098660dcba847d938b296adde416ae420d454d6982c33a0456f37840d716b SHA512 6523d909c500fee433f934eedfdc200cfc52e1b55be09434665210c16bb9af3593d8b1346ace184b171c7135a7aa65fdac5ca8c68e64f9d20436e1d8fac961fe
 DIST android-activity-0.5.2.crate 258406 BLAKE2B bebcddb062921b10915959704d1339c0d200843b887be4588010a359f8b46fba6dce94d4f87a37e006c01e66e6ec061f33f4aaaf32ff616fdd2f52d2d0287b2b SHA512 281f2c3afaaa80d71f5aa6b531aae8e551897bb10c70da40787ee03ff194129da0df79f2e14d5432c9eb4a92c6227a1f9e1a3bd12e7060bbcae85fef177c009f
 DIST android-properties-0.2.2.crate 4563 BLAKE2B 00634bbee4d6dcd3254ee37dd7e5560963b35700aa95c47c84c129f0774cbac436347f0abdaa4ec33216358d9f079559552bd5a95de5026b7dba4e04d9cd674b SHA512 dae9a12ffa7d5fbabc28d3ddcc32f1b5300884cf2b3ef2e123f2dea596b3a796b9c3cb6c5381bf8f6caf04a633c5f2f0b56804fed8fb2a6f06c36d6c76539431
 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 approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
 DIST arbitrary-1.3.2.crate 32037 BLAKE2B f8f6a10a8f42f14eefaad4348b6ff200d0c2fb22faa7a2876247228046359e39c555f3170a1975f64f8537319b97c7ce2030dcab3614229c8334b5d6f9248114 SHA512 faab26c44f25d2c7298add2a657e4010d9fe24b3a61e2270bc6feac05cf2a82895fe225d2fb1c6b63e6c7da54e061955503f39322b96dbdbc4916601bd5e5ccf
 DIST arboard-3.4.0.crate 46785 BLAKE2B e866343f8d7d40ece483dac28600d931d76b0c138772c0f39e9a9eb65fecb72f24e3898f0af3082d8a71162950c905c23a55ad21bb112e8de923d5d4cadb6fbe SHA512 1950b99a90f6b7447aec97d395b221bc0a68613df87087aa3f9c59a2d97a38be24270f4c10bbbd98407eb66508055203f9988984a90e739305049653324e0576
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST arrayref-0.3.7.crate 9620 BLAKE2B 69d25ca9c15c188ca954a862f320869a448a5d8ed5765a6fc26309abb030e1d846d12800d960c8a97aa3ab422e8d2b883bd154781ed219a858e02b20cc803613 SHA512 dcf1c7de6d1d4b921e26a39cd70070bd460cd27f0a38be9099e41fc8b05fb60ba4f9aa91f92401cdcd0847bad08bffa7db4dca8d7cc84a3c8a1416d1758838ce
+DIST arrayref-0.3.8.crate 10279 BLAKE2B f77ff13afd788ce0f30c2959ac03079e8cb5a225f55ce647fc14604b5775d4d3aa70324cb3a0fe3ca35e6c43a8c64282dfd9869a497fbf4ddbad16b606db275b SHA512 27a1b5688327a45358cc62df868835e7da7276c73e853130c41c9f6d9f95822780f159c6e7d1fa10848ba30fed8e173a1d8949630f18a828c3009de342be21dc
 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 ash-0.37.3+1.3.251.crate 449524 BLAKE2B 0f21db7c1e8290b3cf5ae8ee064dc6905fe75d9f6075edf2255451a3cb9c1e7973c6555be6e06a3abe7d29a64e159cf9b6cc9c9ff9808a6fea82216dee41fee4 SHA512 7967df0dbe734d5ed7b60fbaad7a844e0c0c39792828f4764580fdadc3b38d631d4f1a62ea2cf4b08e3a6c0c0f89d771ed9aa97241d6f86031a9d9cb1ef140cc
+DIST ash-0.38.0+1.3.281.crate 457775 BLAKE2B c9216b068ef8a76e303881f1b42ca5cabd5f0b8a1297cd4ccd665e84a276f352e6155644eee28e7ce6637dcee347c54e447b452581673f1ab859aedb051e1454 SHA512 9f6ca2bf4fc5df43091c2d41b9c54d26d9b1682ba618895d82106c61e3ea3281065d3f0f50675f95d2db7846277144c57b3c4aab8e4d84b9536ef44ee89b5984
 DIST ashpd-0.8.1.crate 74342 BLAKE2B 853b77be49af0797804c2d2303a21ca2026b99fcff210797e28db6c09bd0142eadbbf85771a3fd2029d44b2a51167d3ccb231179b8ddc92c3a8d0b0fdfa9fcb5 SHA512 287febcd2fb246435092a8c376d628a6fa833ff288dc0b31d0534da95c91385b06c5428a19d490079b4b32c72ed9e4fe56f3c6040e687d30e2ffd41d6669acf1
 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.12.0.crate 28529 BLAKE2B 8bc6ca73d4ed9fea222e0960a3a3dbd3b67eb2b85d0b61014d5ccce4454fbe9c499e9ed33a9749e82d4afb04b1fc38327371ec6c5372a321cc53e4f4f4cfdec6 SHA512 1d0c967f310e360ee156aad85af273cb8c89735e846f82ac56846063db23ca435cafa917a5b146c7bd26fc3111cfa320f2b43def3a00419b93c7d75dd230664c
+DIST async-executor-1.13.0.crate 27974 BLAKE2B f12f77471a843fa44dbe5281159d47c0e41b53672dbb1f91519e9e6f302024b905e8415027c0d740bc33db43267db94da907251af8ebbe677ce6ded59078e92f SHA512 618d771243c1ec31496cc228f3e6bdd3d5cdd479eb94e30810c87241e38a5fa652b59d61ec55cefbd120f0ea1d557a683c8a42a3e82344b7813d172d25b6ddec
 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-net-2.0.0.crate 17787 BLAKE2B 04685e1ffd4c363b3b29bbc4819c7a79ca45a212c1c3094835f2ca8ffe000b8061a4b28de84497d5daaa70139a8d0c036fa4385ba20ea4bdef73b52102cfc349 SHA512 e12163eb7fb526d434c257d82ad0bcc64d3a1fb868b899fc5666c1307f821654f7afff9bf5dd3ca6c8cceac31df29a5027542f6e5901c8801ce2a696ab737479
 DIST async-process-2.2.3.crate 28954 BLAKE2B da54aed4f017c9b8ee499a6813ac861ea2cc41b73d3aeede3528885bf0a010926926d23a6c6dd0429b563fffbeb63d3f0c8e625cd04faabfed92059052323e24 SHA512 201f87823617f1126f8dfb230c95aa248986258ccf95e5d0e9f475f160a9e64ec1642897fb2f8ffde3d748b29ed7185349b10ad5cc0f504cf45c302dc0de52a7
+DIST async-process-2.2.4.crate 27145 BLAKE2B 23f90d88b5fc0938d93b79ae1618b8729958e3016a38a803b816250ba690a753e23b867e1997779f378f2d8ff190276f8c125340d61301a639483cb20e8d1a89 SHA512 add194306985920e9520a95a82ecd6a3f90c8fff3030107094f361a90b43c5535e6c5cc7793435b7f5817f4e80a52070828cf43bbc13745318887a6da4bf3af2
 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.8.crate 17497 BLAKE2B 1ad10800c45aa02c3b644b6e21cee88939cda4e5b4d0b40b2c1304c4c61a5dfd6d01a99608e8faf3ca678bf68fa368dc6ec2b8cab3574a49d8efefb2bb9e3c74 SHA512 f109f470628c99f514ecdc86fbe31c983dd7e1a35de2b7bd81d05d47f10d89aa318ba90642123b917e7da69e7a24d0934e936d212fb55e23051d2d8dacb7b3fb
 DIST async-task-4.7.1.crate 38077 BLAKE2B 200f3c2eff92afeffb34404bd9b02af39226024d309137c3835342ab6631c09f14f47abc5d25d77e73cbd133274e731fc88e7e94d8456f690b0f1056bae8dd95 SHA512 8495436d0739a2ce83b372ae13ff24ca1487c92e032948d5830af19c3ba411d7cd004634fa10bc2f748f8a82de27c12cbfacaac92cd0012e1fae024eca9e78ca
 DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
+DIST async-trait-0.1.81.crate 28896 BLAKE2B 154e6b8da082193832bca7bbc097eb5ee25ed8365d1cb8dedf27f62fbffc710cfbfd0094a200a10399e942014083b74f521dae01cc4601e0f6b9d7364761fce0 SHA512 1fabbaa813ba320012c0bad54d27232eebca4d3fff1cc5ed771df9f90d9e9bfaca4f7b018358dc599fd30c5974d00b34ffc05ce6e9151a57ba572543bff83fd0
 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 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
 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
+DIST bit-set-0.6.0.crate 15557 BLAKE2B e337309dd28a982f1ef7a8772f737ca09991c0579ab1cfd16a14314061c92c38dc8c97942092f7cbd56fc5b21e758c0b4462529aad66045da3685cd063668c0e SHA512 46bd2c5a28b253a1e0f6c1b6f2bdca7442a0c4cc7f980f1e5bda7cc8880a39f27c461b3dbaeb9e5ee22950b4ba36c9d6496c72ae0669ee6bec17350ec03abaf7
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
+DIST bit-vec-0.7.0.crate 23206 BLAKE2B 6f4f22b4bade33cf4db740d0012ad501d23d5e3a609095ed74371defc4e24208956bdb3834e36bb4569ef39eda8cc5a36a48ae72449b0a9f830af0aa34b6eae0 SHA512 22bcfb93c2e38034d1ac22c2586640811691f181f9966b27dffbc7fa06eef66fa8b8be028543e77c0d061930abaff1f8f76d18a81d45a322fcc38bd8e4fcea1d
 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 bitstream-io-2.3.0.crate 34464 BLAKE2B c80ba60aadc22cb1086238e7cc40b9c04903df09743dd1c56a468a42979171122000ce849c1c114b795e4e058d14eb48d5aabb19f62fef5ff09d16af46914817 SHA512 5daf6fe13105a503749ad0e7949630402bc71686020a2b14b06073330dea69f065c3494cadb5fa83b7bc92c196ed2776b87006a2f913c80386f27c03a66e4bad
 DIST bitstream-io-2.5.0.crate 37723 BLAKE2B b9841766c4cfb1a669a8f180d9e2a0ed110a60f535fb69046859d740b672f78ee12fb805c2323164868a2dcfe6b55f8a6ee5e59003088a7533a5e537b02158e1 SHA512 8db74c147412c2ea335455d740cb2ef33be8ec0c3ffba08fdfd3983515abd8b47621d178bf1290a7830a9f15bd32912d17b3df7d39e9ac786970a868b8ed76d3
+DIST bitstream-io-2.5.3.crate 38245 BLAKE2B 3bea60601925ec02e0674216a5b0fbd486c90608e8bf6a5ba1723708f953e2a3ec178fcf07c47409fa7d0a14ba5f0145bd4cc3c35675382b8d544b48a4074ec8 SHA512 b69582f76b6d23e26e05b018e2b7d50f81f2e18fd010c67a3589322ce9cdad5a5495c58157e39a8c1ab8caf8268f13d390b968bc91aa73e0675549e933e4801d
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST block-sys-0.2.1.crate 9320 BLAKE2B ef7eac006fa851fa18b4efb3795b960e2111128c9a2671757ce281a585bba948ad2cb39e6dfb2426aee52b517e2e53d494f6975a62ef3ff57a8c8122693f70b8 SHA512 51f66e673f08e4ae28dad971ac795aba0eafca4380307cfb0967435768dc7abf172c2d6df06318c9b18aca5f710438acb94645d3ffec3327c7d55db6a9e2667c
 DIST block2-0.3.0.crate 10924 BLAKE2B 039f6b38831ad8aa45ba6845031a17af52b172f3f68d98c9ee648fa300ce1c8fb6766736e33813fe9916596ae4388210b7d0d33c9dd44346b551bcd2c15a1645 SHA512 8f1be7f0e147b6689fe999389246dfa57bec002304d4452f668724591b117bc9a5b3d1a4bd9fd5f72e81799d13a7c2893a4fdca5b5131cf6ee275bd396291688
 DIST block2-0.5.1.crate 24191 BLAKE2B 6fb5505091c5f06524f20250d3c649bec46a93e96ea08227ed91163bcfd0c64fdfebbe86e77a4e64d0d049036e14d5d28ff1c85c4707d4791651616cd6c7ed6a SHA512 084b15f06d005c9d4b78b20a85ed804ca10143e3bfc6b52c4c90f72b4b3455fd27bb02577a01f7c21e58a60d174c1b5d29b662da05b9e35688dcd266a988e045
 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 bytemuck-1.16.0.crate 48015 BLAKE2B 6fad179a74906d72f3a5523fd2562b92f9c5d51595b6e8de320d5ccc77e7ba7bab80380f112c2731ddcf92d1e594d527e4b5abf736dc0f009e8077a1b619c7f9 SHA512 09677bedb7c480a8abd345cdb710765ddc332fe675e64591cca05d73adc281a29475feff954e4c5eaa9fc55f2508ac44b44007c34593c71b255d6c4b4d92781a
 DIST bytemuck-1.16.1.crate 48321 BLAKE2B ae8525a829a2c981200dfbc17de7f2a4e14fc6df71328c1a62b27dfa7488fdf634b4a6f45e65104bc45b828a91d3d0a70d06e9dd4c61dcba18db09204a22a6f2 SHA512 ba9e5eaae4d4d5ffd654da0359cdb5e85ad2d111b26a3b5147bae69519963ae3118ebe2afd34e92305cad3b3e573cd5aaf175c3bf81e94126f65ca3c9320b9dd
+DIST bytemuck-1.17.0.crate 49872 BLAKE2B 69a108d2c43cc127fb614ae27a25f9bb93b77b68eaff59ceca7f8c702e6165b3226bbdbe677b6e379f52ebf82fb5a05fa7b0ba918e0ad20a6bb3fe92ce1327e0 SHA512 89e280a6498850cd60c1585d3e41fd390d6592f0b06596caadefd87f3fee484e8c121021afa822adbae9e40fab2e949e1842bb3b2438f240339bdc5f70e559a1
 DIST bytemuck_derive-1.7.0.crate 21687 BLAKE2B c6097b1dff75e55a61f4ede5912d7e63baf81b05452be9cebeaddd09ac62b8925c921e8040b9c3a116f5bf718ed40f1e7cb4e8eb8c265c18c68dff729fc3d5e0 SHA512 9e3b098c15294ffd3d37cc553bacaae13add3469acfc3387d9006dfc12586e1a18568ce246c587e17c476fa995fc46be1a7fdc7c51fa650b688081e9796519c7
+DIST bytemuck_derive-1.7.1.crate 21712 BLAKE2B 25d23aaabbdc5eb40ba2593c8a90e61e4a2377ceb93cda0fbb7d9a3e034db59a446e6c6a7e841187c895181d6f14ed24f512bce79a0a80996e92c1825602ff34 SHA512 82f1c61cffbffb1d270cd395572d3cb216f71e2bf03c08aac1e4f9a0059367d0a234843c0ade0fe276fc9e4f6153564501bb38ac4315983b4c2c02f8e687d488
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
+DIST byteorder-lite-0.1.0.crate 15909 BLAKE2B 751735c5fd618d548c0dddc2c6a4a1bfb41a2eb30ee2860b9e7b5bb75d591a9787aa36940acd9ab14242636e37aca6d568f39df07f7cbb771cc475234c696e3d SHA512 d38837acc5926fe98ddf4336a603412f678b5f46d53a7eb926a8885d28aa24d51e3968f0eb2e6d2d7711e5ba30b8006a27076ea596b0699e93ad3d9e05483c4c
 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 calloop-0.12.4.crate 69583 BLAKE2B 5cfab752477b0e08af797268b1b4cb1a4cbd866ea789da25b5b42b8579889da8b589d2e843c774cf98f29c78d40749c60a14fb972812216eced717002a92d731 SHA512 657c6a17ca47f633e3bc3e3b6e98160bbae6ec51e496c720c35f2fffd2b9c1c5fa175b69cdd567f6bcef0088fc5af35c2a142c3b9a14ad9720a9ff7dbff2f53d
 DIST calloop-wayland-source-0.2.0.crate 11304 BLAKE2B 27ff9165921be61db363be0c93f2250d8d9532cf67af2f3c00ea4f2e2e3575d7698c1669e418e065dd1ead91f473cdda0f681b1dd989a3f5b75ff606377c73ff SHA512 53bd9b57c10fdd0c94d2c6dcc634d6f7b2e64aa9625d15163b76cef5a3bafa6bd8643401bef0b66d6fd42148f6014bec1339baefdc61d6c79334243bf797f6b8
 DIST camino-1.1.7.crate 36204 BLAKE2B ea87922e77401a23f25d66af303f39c568f37377e4f0cd6d206cb7b175a51528680bf67897e3b9830d276acb1b156b7c66e149b75370be202cb99fbbcea54233 SHA512 b82c809bd52549d16e286d514b5dbb1d640633b7ff05412ce3539e543de9c69d99bc3f62597b94fc0cedd7c8034ebf73663a6f647e46409b778baa4877928c45
+DIST camino-1.1.9.crate 37552 BLAKE2B 28b21517730db408598f83e269ee8aa4dc5388c4b491779ebb6e76c478d407f929bda6906d88d429828d7f01be1762c72ecbb6d8c7aa4a1d1906109a17b45df1 SHA512 27a6a3cf72c46f15a6017aea44a048f2a8eb577aa9d2a088141b1cb7479106152ef0bc00a6cea9332c4df4d0c54aa6bd3dc21159f15640e347407c15a1bbf7ea
 DIST cargo-platform-0.1.8.crate 11813 BLAKE2B b074b49e08b2b93e93e08276f2a79546fe1f9ba0a52b3b4ef0ecdd28fa3fe5e842c0291fed158a1a12b90804e0172d5419b7603fd0d5f87f062f44dcaf3428f6 SHA512 187acf1b8cc81078ede3353997bec9010df32aba82f56f9479d4c8eaa13436590a16f3ab6ea11ed2b31d1d1d2299d824d9ad10f04bf5281c92372cc8334b0dd2
 DIST cargo_metadata-0.18.1.crate 24535 BLAKE2B 9d0018e28a3941e269dbd30291054a882a960905a43d4818c874250356a6c203bf08ed77a8041f08607390b2a382864701c519d71a0b88818ee59c6322c74e86 SHA512 43f87d2b84597ec9a27e9fccf06ec5f2630a0147a9c85779622c25493bd61268c266643f8206a17d76a16329af85f0cc563a9af7e17ca77024c0eaf788555f7d
 DIST cc-1.0.99.crate 76961 BLAKE2B d615f647bc5e4f7f580f878fc41baee172e9513f1157d421c491c36af2ca330dde2a6ddd4238c03aae27feed5e8cc042f4b790d7b145952a8676ac553f72e356 SHA512 2f6c9a0869b3b636b011390efade0085ed5fe616ecb33ff586c948779b9c9bea9169cb1c31441b0aeb63dbaa35cdb76b6e67ace38d561e2c150e06853a2b1757
+DIST cc-1.1.15.crate 83085 BLAKE2B 14077692d5fc47afc59b44227353aa24d91708fecd316b058e553940e6a9b6c8f148115cde2b7d6cb2a3462f487aa3b45bd670a2beab03f677e4bf63a06fc3f7 SHA512 2f1e4f3a4dad3638f680448520e218e3c984a7c13c3984d620949a9d3c4f13d68b3a0749997dace1e43faffe3477ea15394bd4e32a959bd56e3c35c27a4aa4de
 DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
 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 chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
-DIST clap-4.5.7.crate 56343 BLAKE2B e2392ddd11213c8410344c474d84bf40d2d5a0663d25ce8126940ce59085a84334223e92ebd59fc387b4d1334b8f8cd7b76eb15f916adc5ef59b9858929c5787 SHA512 f126132811696d5fcac0242264121a08c1f7c59b4830d73b6b95b8c5b31a2c11928b0d7026151a5d1a0108aa912d7c6157652193ea1ef5a980669bdf388d5bfb
+DIST clap-4.5.16.crate 56627 BLAKE2B 83a6a9ad12b826affa68df179dc1cb534f58b6ae505f4794ca6dfaa8f8a9e33d93b9babd7931bf48bc13da31cb3078b442c4a2a2e84a8f2e675b5d620100c50d SHA512 d13bfda2c3f77cf194acd87763d5f2fea83ec2135504b173af2941547a7d3dcf75c3757532c60b53c57600bf4859395ddc94a7dd92b17f44c60d3e781741f928
 DIST clap-4.5.9.crate 56348 BLAKE2B e2c60cc6dacc6d6c7d3718ae3748ed5f681722ef060c6b2c4ec1262da4ff4c3b235df3127946816ad61aa03d3b98c55739877dd14d1182a7d4c37daf6e1e349b SHA512 6eae38d69f99fdcc7e2a1f799b4ae770a00dc8556def97a10d578426f6770e0d86fc32816aac2dc5a59c147dbd7501eb9f7b94953a2342cf74b1034459705e88
-DIST clap_builder-4.5.7.crate 163957 BLAKE2B a1d6e728f05b7f7eab8fd9fc8dd0e25f8a066e0ba72ccd6084e747f5833ef90e98b63f4bb0b3af54b74c193df3ceb4eac63a45c9f3222570ef7ec85562346a01 SHA512 df0ef9adabb61538619d94ead0768fb8291cdef48c0cf47b323aa366fa2564d89ddf65cd0ef0b7162ef5e590be26a357cc775ae5278abf8048c05a5fbf58b5cc
+DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
 DIST clap_builder-4.5.9.crate 164088 BLAKE2B 47021738e0d3e946360ddbc144923daadf7151129e8548607ea3688b75f9a71ba676a31dc543a7258981fd3e561359fc0c5ed5fb6a921420a679e5d7f072c5d1 SHA512 5f9e297036a86bc33daeb76a8d906e14c58899c460ab66c934b7db0309ed5a7f63bb10d644f84e692fbb84081c20102ae97e33cb39e9ed71bea920d4e5e6aac7
-DIST clap_derive-4.5.5.crate 30017 BLAKE2B 8525d8adba25ec0165936f72f78dec3cdffedc9de8e537b078944b1830640222013e335e86a2337ae9ea3b07dd655275705eeeb8c2155224dc0950ed00e47f7f SHA512 90c2110445c832d81cf66287ebe32155c6bd72a0a75cdbceef4e411d4b9d83268af244adab6755379b6970b5d40b39a9f89df9ef8786429fe73d95a3eee1c134
+DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_derive-4.5.8.crate 30024 BLAKE2B 3d2d7e3652c6e16329a0897b985288d8beb6c68051d3f6216e75c6aa98a773d2cf609c1df82df7ab2b5f43c62c8a028da29ff1e314cbde096376bd43ff6b3b70 SHA512 587b63b99ad47b6902094d40ee4cea6c4e1d547e11fa50095b007a8495b11b25b3b6ef37583526938a56103982aac7d2addda833d2323545b753a852fc830b43
 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 clipboard-win-5.3.1.crate 19921 BLAKE2B b0b3b9e30bf4bd897fe6db78cb68a906e8dcaf79f0f4218428f5707f89aa60450d3aed272de10e81ef708e2ddf4737393380593cbd34fae5b1abf87a9119d85d SHA512 bea2c0858d6d4d7e5e49bedb83d032fd7b23b62e042e173f4acafa262b4946dbf4b8026f47befa1484c7d478db6a818e6cb0f549ce29a7f027f75828e9ba35f8
+DIST clipboard-win-5.4.0.crate 20559 BLAKE2B b4c795cf707500b429322dfd0c593188b63f9330c916f2559953e5bb4192599fbc2337280940ff287b9691683ebc421ed56aa5adf64fd09fe1c560fa88df2d45 SHA512 1e5bb8dcc860f989a46183a748a47fb18aa66a164df1fe366081fd620ffba9a858f8e87ca19783c37b93cdaafa11029170d149ee30422b1c9b98020784055503
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
 DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
+DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST com-0.6.0.crate 24855 BLAKE2B 3cb2eaae6864f05a6d47819d58c83c9be2ecff8e382ed84dec93763f605d1392947dc5025198ccff4b28be5b37287725ee4cc7d7f8e057f1804351b82ed0bd2c SHA512 3ca186fdfb130863ab62fabb2c266f2258ee45482fa9b925dc0d5d7ff492a49fde5c75f8850b18895a27f804aea16fe7bd4c53011e8badfc5114a9740b5b52d9
 DIST com_macros-0.6.0.crate 1075 BLAKE2B e271f5e11a62d666bfcb530879b0f41dbb2d81b94b6cbea15a306a72c97cde9eb77360cd8b5b169f861dd1d5c422c3de07442f016ae169287f243b0e9ebbe7df SHA512 737df65d1281fcb0b636ec1dd908ac48dfc020681022d64de1e327605604cecf9100c6ed629a991716693cd251563e259c4ff5611410117a6e585c94de03faff
 DIST com_macros_support-0.6.0.crate 17334 BLAKE2B a786a331c0080b0803684d1447efbe2f6903ce5139242b6c81773727fa61c7721cb198050119f3cefdaed32753f756f9862debf5e8f91d49e39804291080d572 SHA512 e4ec9f58d8ee25b0447854db8f528fe4e989d8944b3fc2b74ef8ea899d3bf6e082e8b516a51a7f77a09073f18c1ad7efdc62d6da8c82e52bbfee02cd7a552cb3
@@ -101,18 +126,18 @@ DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba
 DIST console_error_panic_hook-0.1.7.crate 507196 BLAKE2B 90f2855b54c78258f9e4983849a0c0b41f842990d622bef0ea16ae5e3a93914919022d21b1437bb2ce644333d4e0c6e7b55d960452c4fa437e23bcd0da83a4dd SHA512 49f4fb2175c0068981678f291422ace3737dab7033b1a49d78fd821512c92fdd023c3fe28c7daed88c8f338c30a9c7f82f18bb4583c3fe7839ad8dcd0addd6b9
 DIST convert_case-0.6.0.crate 18675 BLAKE2B 5e5ab159a61e68b801f1c95dc5336f3af7ffe6fee212c8ffb9905af1121f0b272b234b4e70a30f29f5ed24f4825ccfb59722057b69549fec0fc3472857ee1ce9 SHA512 3b17449195a9a36e3965db89eeb967979c192ad7743217ea08e8c8b91ecae1ac1674362d05dc6f32f1f361fface3f783398285bb78060403f65a777a9d29adf2
 DIST cookie-0.18.1.crate 43551 BLAKE2B 64a0ae8a2cbcec4c75558ed7244b82212078dd4e6fe672d30f71532e8d9193cfb0725352aba19b49d3b64cd175dd53b542c8e8f627c5eb3f594af957efec06b6 SHA512 be7c4a6919db8521a548950ce593427b9aafff0e53ae659f7e73f523d8c38bb18a142ec7ca17e6278c2073a90145f7553ae91d5cd1695d51644418f1554a185e
-DIST cookie-factory-0.3.3.crate 19084 BLAKE2B 795a6f0cd4e93fe8ee257ddaf1f76852499137bcfe47d25e3188f3822f3d92b191cb9f3894163de39386584fcb899ec01d0cabe5757f534dfcee9fa28aef8132 SHA512 25f79e74be133b780373c1277a00538d9faa19b77868d62b16d60037d4890b57aeba2eeaf52d78d3f8523285b033e88b680195a67ba5bb8ffa7c0ffb2070831c
 DIST cookie_store-0.21.0.crate 31495 BLAKE2B 243287485b8f527f40d8303031ca4392e032a9e7a65cc9e038076794458756106ca73280c861457cf42357735b4d6892aa2aa23f7b5f743eb6867ed47426f6b2 SHA512 169b413b78e47da093046b3c3e2d1c72be02ba161f8c5a24296d85cadbdeb4d544615d61d9db329a081b24339171dc2d9d87e33a24fcb4e800ca0b5c04f0e203
 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 core-graphics-0.23.2.crate 30763 BLAKE2B 6cf9d7d1e933bf06175699eae7ee1e7dae993e390cf9b509a756123cdff78a42d7aa9a59ae2f48d251d6dbeea5479e95694c38700f4ca93751dfc664d4c7af34 SHA512 40ac912fd8bbf25488f665091e974d9b5c40a2a20aa1abe0393c9f39a77b6f3b13761719cbfde067e5e078fe8ec55dca51777ff3ffdff4aeecca6e4789069d1b
 DIST core-graphics-types-0.1.3.crate 7063 BLAKE2B a2bb17838745a28a59e85d884ea60069c33f548d41f98548956eaca4178409c74556039a5a731a9c1e9f26de8c69d45f458a90a3f7b358065202b660c62431eb SHA512 e56b96662fcb892b73bae3292478a9ba4c7e92f5967b6438546f229fce115b09f997734c40f8f776be6ede2c6512e837632eacc8ec15b5c3311f9f24fd22a397
-DIST core2-0.4.0.crate 37075 BLAKE2B 89ad26bf5eb5ee48dff32d3b6b11e0a84b68e4f29c39fb9db79c64f3c445fde248b33b1ba9d1410673c3fe823ecca25dea637237c384b7cb419de9bceab8a570 SHA512 53c9d2599d87c37d8b6fc8b2293fc16928a97754240e35af770f7e969e4d91ffffe3afbb4e04312de828d1d43ca6c9b734e0725ac5ac9d74f252449ce296ab7b
 DIST core_maths-0.1.0.crate 5807 BLAKE2B ae6308342e1d90ed2924c6a92dcfffb0284825c0de95061402294ec052f4cacaca6033d27370557c2620ddd6aa7907f492ea2e5aee95cfeee542ca9f4fd6aa9d SHA512 48eb120f4e48721100215cebe703a71ab0ab543206c5f9b806c3727a2dedeb4df0d5d9bc733eb5cf6c556833b23b8280190deaf6ee0d583e697f02d9f23da35c
 DIST coreaudio-rs-0.11.3.crate 42844 BLAKE2B bae10c9b7670651e78f24426378708a2c14b6b1a7da9d4e359611a8bb4df8354af5b409eb20bdf1e9b05a6117c59b6cd7d3a79851682a217732986602c8cf3ed SHA512 41b3ade3b6e157be533bd25352ad76a01de28cb3c8d60d7789a3f3b5aa868d6a7dd71456b90d6453684d2022e0f0a94b3e830b3920918c18a4693c2de0258a1e
 DIST coreaudio-sys-0.2.15.crate 5532 BLAKE2B c7c3f67a6db3b9d9b604989812b45d75b02a04565d1dfcca4698abdf540d1deef1c93b6a9b02a3689a32f033495411a5dc11efe4871e907f8bc0fec6b5fc4f25 SHA512 060379c57ee110ac413fbd24b48edef283ffba17692672f9ea3f6f0a627cad8f827ae2d375c341b0180bd4de7b3b5d55a06ed7b171fcf3cc20264826f2489436
 DIST cpal-0.15.3.crate 100083 BLAKE2B eeca832ced49c8b4913125b948a4c5996783361105d106ec7bac263c2a81ab87e5e2485229c3742f1d600037993abfedabed10ddc175ac507234d720e8f7f18b SHA512 c4461e740dbc8528b753074f3e53fa863ac6318b11a786250c520aaf32f33af98e830016ec92711dc5ebd631068275dae66d3d9c1d452191869c8a0b5879feea
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
+DIST cpufeatures-0.2.13.crate 12999 BLAKE2B 4c49e01e91fff33c61bfae48a07a9d76a69565840f5a12399a3515f6e6808743dda0d4c6877feabfd276bdeb05c285daa3bce6062a87cc3da50bbe3b6c0fe1e3 SHA512 e961ccd9fc001cce661b6360b18abc4ce2daa4080eb5fd84dc5704d8d5ddb6ce6cc66b5d42440bffdda03137af9c5ba20b6793130692168e7e28729841c3f352
 DIST crc-3.2.1.crate 15070 BLAKE2B 9d5f488b57bc232528cfb8d9ef33a88d25d904395dfac8dc10e864dc0d6c89e576585195a20db585fe358859ec50afa998562ad6becf6fd2e505f3969eb36ed8 SHA512 64b7272d8cf55efe9768f9f3218f83302ccb59458a56fe3b7b2de1a53eb5a3b57fbf268647fdba5b230cccdd4058462ba583d76870ba12cb1057ac2787f181db
 DIST crc-catalog-2.4.0.crate 10155 BLAKE2B a9c3ef81871d72635addf1ded611fa6e963b9b128dda198eaa3a256512c8759608bae95df95524704aeb38f81e2fb6c2da2e29e306a8ed3dea595e63cdf05638 SHA512 25536456fe71c44fd8ec527299339c1d186f6e12f1f90142de60eabce337d836c2497ddd6307473b57a6cc720cfc8e29b059f378c70b8165bc171420ccb40a29
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
@@ -125,10 +150,13 @@ DIST csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a88
 DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee
 DIST cursor-icon-1.1.0.crate 11453 BLAKE2B 964bae7d3fe138e00c51e52ad187ddf5b71a86d9b1bc9bb394fd27869d714cafdcbd539e2c62eca9b0912593d08187d550f5507e73754a00112560acb83912d7 SHA512 4e3b74cb17773ec2b89312fd4fe60330b785cff850102e9643bd06e99b5d96c11cce14a9350f295c6063c4133dc0179cbca13fefd7ab816e57c915f75d066d2e
 DIST d3d12-0.20.0.crate 16723 BLAKE2B 6b404c64a7679f509896ee7e9d5cb1770d3619aeae2cd436be8e93ce21c6d74a25ba2fadd0b20f72f509b5978c53f4d8d442a216f50ae71d54c67d7186900b18 SHA512 eec8c7084e3888d26db85cefede50ba1766ca703b72f29df4c47c662735a781d69477e729a11f4af5a9a38fb4814dd194b4fc4115909739ad221b251731fee6a
+DIST d3d12-22.0.0.crate 16716 BLAKE2B 1f2c5958d5547b9e8df6cd8cbb040aca81163b63940ddbbf992907cf5524eef3f7032488aced35124b98d941335856929d3f474430022ebda78cda686dd41b51 SHA512 13cec935438a477dd22ef2bbd4fc8de1125f8e7c4d7175982036717fdba487253d5206a832730d7b42a9d2f1c573d4b37edf6abba39469ee63cca80130fb0641
+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.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
 DIST darling_core-0.20.9.crate 65014 BLAKE2B 27422074f55ebc413ec893c27bcefec2cb4bd26156d272e637a1530ff63694a43929f55bd87baa517dba683ad6f24f97e097dd69e0407e24f656cf673c2ba07e SHA512 2c24469b2836139566713da59a3c2e3cf9cc7c1a01baa571cd59ae8a25b9c0a42bd9bd8ab7a9dae95cee2a46c344aef2c36792c05c799f195afb1925d82b81f1
+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 dary_heap-0.3.6.crate 23683 BLAKE2B dad2fc57dc12fb6e8c7f15fe4b1c6ed292c1057274423d9985149a843e82040dedbbe6f76a74888735fd294de9af5af80969593213521b7ade19320f2f027be6 SHA512 76ab17e04f79f8d52f88db3bbb7cb6b6dab1191f1363ebdd6487407e68d716446d043a9e8f43dbc06ed91e1e9d3e0d077f3fb246bb2cc83e831a1553c09cff65
 DIST dasp-0.11.0.crate 3212 BLAKE2B 2c24091fabf4f0bfbe7067a7a244e988d59e5dea3b588235c6abba8a5c4458691786300226824dc1f9c69057f60480ce8a66a44a436025d26efd1b7eee6f8941 SHA512 35e4c90abfb965a5810e1245ee64e030c47f5b6c3ba4b27577647a9a8a9eb7b0dd5a2d4db75067c6344bc117e5081bb47fbe053d5b151932ff39927bce2da2eb
 DIST dasp_envelope-0.11.0.crate 3331 BLAKE2B 44606b58f13ae3e9483d8aea7b3dad77b5ce3b597306a9825ff305ea8d7358f11dddc919ba294ed0e9e8cbacf8482fe87c2f36c7d08ae8f2d95a5df654737897 SHA512 e7a13a00b4ad8462f74ae1f87a66a21c548d963cd11070cc7c49a2846a41e33a4d52673d32a6567db3562f3a7f922dc15dcf838bd7782f9b3ae79676a981110b
 DIST dasp_frame-0.11.0.crate 4910 BLAKE2B 124cc78a826ff5926a7a9dcd9ae35ff23834640ec18ff4b64a7b1c1ba7d73c15e15515b6bade82849cc3b352ebe1707339f1f1c90d3c77daad649e939f12e871 SHA512 aec23bafef3d7aa4c0f1c1c9c4bed1cbf5e57731bb904c8ccf66ce908ccbb374b58e662654af5e940800de30cfb9726881bb2ddc155b80fe1d2d3e0351a57d47
@@ -148,19 +176,21 @@ DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c362
 DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
 DIST dispatch-0.2.0.crate 10229 BLAKE2B 3a3f011bbd994f6620619d5bd26d95eda7ba21f1a4874b69e3a654e04611ec7af7257300a669ee95ae04ce35a91e033dddddb4a14da48036a5d19c4bad721386 SHA512 cf2b4c624f92808e43a0a4828ee1085e115540d5df5a0ad6a3593c9e5109951b26e8afbabcfb0a1fde41207d5c060566bf9260bf4c2a95907e3a822d84364b3d
 DIST displaydoc-0.2.4.crate 23200 BLAKE2B 91b0ae7018109d407095060b6bbd6aed1cc21120bc30348e8b16b5121f7c35ab72b65e80bf97dbea6cb4ee6b4d5215e8e5c4374f92a569697bc9c862348620cd SHA512 a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592
+DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
 DIST dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980d8af1c050d6096d45fb748f0acee7f7de2f9433f97ec19faec9e028f57c8149229eecb1827a1ef8eb60 SHA512 4a8f1c09007ecce1d7c829899aafb90081fe4fd89cfac3550638018760e24f63985e3060c4056b55bf58cf4622b1b31595e1c524a75b1b4354b8f3c35fc267ae
+DIST document-features-0.2.10.crate 14005 BLAKE2B 5427dfbd89155ff8ecda259641c769841bb1a5a9be036ce49a2dc866eb26dfb847bd287a0d3ae703d65a8655204358aae2ca9945c5068e0d1f8e030e257199a3 SHA512 f6e6e23da44941b4585ee88fcdcb9f91d99705cf6a8e43ed55098217f5eb9e21dddfe9d6817b30dd43d4ed5ebc276292262d589c4a8c3ce9ae3a6f668fd6cad6
 DIST document-features-0.2.8.crate 12979 BLAKE2B 6387136adc2f2d82dcf58a5c4b4f30ab8f918649b5fda02b31b0a412c516c1c4344f4a5cbdc9be777000252f32db6826aa588ce260021b16538afb01d873b754 SHA512 7d564698eca8d20ae66f533071b8ac27243889eb41fc419e929280aa54f508398924456e6f63cc174aef9f2df294b56d6ffdb3064ae7b68583ff1f3790dd03f6
 DIST downcast-rs-1.2.1.crate 11821 BLAKE2B e8a78afcd8d2f17c9505973359e2151d59b233e1757b4c7019047f148b1c8a4f28dc3a0d6eff6cc7f4a7ed986bf592ccf0481dc112768a9751475e1b0dbe27f2 SHA512 f37804c1b1e2cb0ecf2460fd6ab274c843c43e94aa7dfbf4e3c53529cca9b5624c4ea5ab5ceaafd72481165c7335f3cd1f846ae43deaabd18f363572825a5f86
 DIST ecolor-0.28.1.crate 11757 BLAKE2B 8da2d4f6a8e469b9c4e0fcf38724414729368060d649e46fcdf676295659dc1089100c7e6436d86d564fa26a9cadb0863fd66336965395d4e31b0ba74ca432cb SHA512 358ed5b6657dfa44174e37ef5a6b204755d630ba16b698c6d795ebe0ce584deb98051f65e0a9bd4d3c70e132e904cdbd99633972a9a97bce4fa2cec9e225bf2e
 DIST egui-0.28.1.crate 322406 BLAKE2B e3d0da89ac03649d2b5aa9e750a1979d28b6e9cc9c7789c70318b83539a4126a52839a545b8fac504386c0d28a564f12dc0c0abedc10aad5c94aa2c580ab9d5b SHA512 150876fd60882270f6af142375afe37283338c5ff62c237f758c16eb4795ad63bb5065b30574b90a4dc42fee6833faf380bab22e5d15853f23b27a1d9b4e97bf
-DIST egui-413843dd7ca7c177aaac233cd24b547d2b904d19.gh.tar.gz 10345048 BLAKE2B 20aab163c96d0d698b75028d650d899ef4bf4c2ce76a455a81c7e45e6075857aee2321ccc8ec5d618437937bedf7258e31862a4ef3fc8a5844291ca8624c3e5e SHA512 31f449173b81a3849ad71bcee6e9e58cd1d0442e8ae16e1ea5f8cc59a9771e5a64f26666dd31a42c0c7d117209b38669eee21f33e23f2eba7ba83b401d00177a
+DIST egui-37b1e1504db14697c39ce1c3bb5e58f4f2b819bf.gh.tar.gz 10743348 BLAKE2B 8201a8576f4bbcad887ae919a1e21ea828232334b6a9e071b344e1cb223d256e77a74aeae930d3a2de5c45b1db4c5d7b438e0993ea413138b0ac9da8e3a9f8d5 SHA512 576eea6763dae7d5a85c05b3fa7d7fc43a5a1835b2808cc19b1528c6ff75092372d039fa9c4260765ce3b935a0704784b92e5e3cf5561cf7ab630b16c8936359
 DIST egui-wgpu-0.28.1.crate 22799 BLAKE2B 0fd078affa8c2f7fca14958810ed57ef33c7401516b031a8de26c753d73ffd234f3f75f193490a0c2406535b7bf4cb89a65511963b8458976a963ef546ada2e1 SHA512 e49014facb977e37abed36c0dd20c0f1a3b5f4261f5695ee5daa31dad55e5ac506be50c796c072237f65ae823501a0dab2062c3ca7f490afcfa551ad37c851a7
 DIST egui-winit-0.28.1.crate 21683 BLAKE2B da2fe8a8fed543c96be8f3631812d30e3e17b0bf52501c2008af7701325597f67e997bd2c704950f44412d28c3de0dba1535e57406a1cf1c3d74fd7f6023e46b SHA512 f173cf7c9aa4a6ed75a182343990b252b4e6fc2968a28f157f8f2541d651aa0006f75013163b517b6be28591abb90cf0435d615475563f6bf595d604e706961a
 DIST egui_extras-0.28.1.crate 35668 BLAKE2B a465835b5d47be4651f4ee82060fb9d878f03252449fe979494cfb6e1d191dba89b83a4b70338b008673381b4120fe75719bf8cd217ec19b5ef96dd405e1dff2 SHA512 42f26368506f1b04304f1e1973c740bf103e5f23a40ac5a8778725feb866f135fd2cfafbadab7641f09d39b097ae5518498877ad9a0c3712a016fd355da092f9
-DIST either-1.12.0.crate 18974 BLAKE2B 9db82a8eb351dbc1643ccbe304796610f6090b263d9a991b4d7308a699bdc67d25096ed1e923f521fe3dbfe9195569c1297b46a4b1d0b74bcea4c11bc0a2c388 SHA512 88e1ac4053c39740cf643a8fd445f2d939a8398e952b4b66ab38bb48bd54bc7a976967c4bebab36fed66c4f5fb76082e9c6d40e146914283fca28f31af0e0138
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST emath-0.28.1.crate 25954 BLAKE2B 9e5c91143bf658e2f2b70e6e14518019acd106b657640c1f1763edb69ef10debd28ba08898cc5a4bf92ffba8e4b18e57cbd8e271ce6edd086fa1ff399d68adcd SHA512 3d0120cfae419164f259d716401cf569027cc97efbd089c87b972e92e8b915d1b16bdfa16a1d8e7ff4a6be624777f069cdf59029676f65f289deb3702b3de6d9
 DIST embed-resource-2.4.2.crate 16553 BLAKE2B 8a69faacabda9ba6560e352229f91121348ae40358156bacb560ad135364d82059f503f46aaa323e327c5f7a39886d779e1a77a8bed5c2f24d150f07b30af33e SHA512 22e821ff36fcc39638358946972295b20020c4851f39a66329405d39ba1916453f3c0b11bd9d31f94b787d8fd8fe7800ef13a7b0207edd00934e747cf50fb0bf
+DIST embed-resource-2.4.3.crate 16620 BLAKE2B 69964ada562ea8602072ee953c1e4b37c3efcec9d8e62d7f152c767b8fa83cfdbe5c37d3e29504ae6183e422fa384ebaa0391a7bdffb7114073c032f76d26c5f SHA512 c492af8f7d57ce56c4f8dbaab2f20908e79436c9cf31fc541ddb77a9c44f9930dd8851c1edc6ce09f7c656e02d039d2f6318f9df57f1df1c1132a2b544d7d4b2
 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 endi-1.1.0.crate 4872 BLAKE2B 8bbffc45ceb70777c6606714a7bb8f9b26ff33a295fd722958a5e9c556d5bb1e97a34e216514e5acaea51811d78fb4aac927c1f8315fcfd8000fda3741c53b4e SHA512 1a4b65cf77f530a2d15cfe968aecfcc9120957d23d2b442cd3d8f23d7039e832e7d6ab29aa5ad8570468421095650e26fa07f29bf75ae361416072241726c61a
@@ -169,9 +199,13 @@ DIST enum-map-derive-0.17.0.crate 10781 BLAKE2B df77d362cfee0cfbcd9354f65530424a
 DIST enumflags2-0.7.10.crate 16622 BLAKE2B 5130fc27294e25ff3fca4bfae3895c79ef3f78d20c64378854375ef859eba0e0b00dc6b2e662129bc41997751537c40e058674f43323e11d463f2e8be34ef593 SHA512 03baa542e83b15d0e2e36205a0ea7a6694bd959b315918302324d50ecf30efcd915af79441c9c8c15670c16776442d5fdce51080fa7404662e2756607fee1668
 DIST enumflags2_derive-0.7.10.crate 8104 BLAKE2B 7332ce1236a62a02c3441192e1bb9ec3944dbb7e74e91bec0f488f5b7c382c3879196b1608bebbe04015cfc2a9ed0bb5a399f889ef94b43176d28df8f1c16598 SHA512 3dad49b91c9724504121ed1b1efe7167fcb61c956d7925523e1edef14bbd92187d82e60dcebc8ac0c22d50c801ab2868460b8b3e298f31a730a7000f80080509
 DIST enumset-1.1.3.crate 26976 BLAKE2B 4e40cec8a6db10a04b598eed3aa7b9a81235ed95e433571ee4c92a699c4687a004dffb94721aafceadc4a6c68dcf08fd622385a802ad330208d55f7c0cea0436 SHA512 1fcc39050a75d73febf9f1976913872269f41916fbfe936b7ab67d7d61bd67de9ffc71a1cbf34eef92b2fdb0313b5c77ce9dc7adafae5992fbeb6fcf7b31c180
+DIST enumset-1.1.5.crate 26442 BLAKE2B 8d5dd9fd49d27c7bc1ec02b9e1e8d96573d49528940e5fd69c4beb2c50918d0e0099dd47f1ec46f9c9cc8c1359e139c4e8daed83508b338358c970171845e07d SHA512 bd3ff7dfcf3b4364b01cdd72e5afb4251fd965f1bbebbc59026e8a5bb097c036dcba7919041a2a659c5e9a4746a3f3fbe6207dd3a34e854d0c43ffb18015a91d
+DIST enumset_derive-0.10.0.crate 13211 BLAKE2B 9334673aae88c621be9fe5580369b02f812061e961df720cf63e64a7837bc1deec0cae107433fa666b7882b6892ce20f03e145a02297abc9f21fd148fd15d109 SHA512 614f117894761550be7984b8136542624d9862589e9edeaa7768f187f3be918d857dccea0d40c308f7905c7fe540e42b3e0bbbf9cff97d661526d472da4cfa0a
 DIST enumset_derive-0.8.1.crate 12711 BLAKE2B 752eeac1d1215a041962e3386ac95c1b8673921b76bc4ecb14acd98895f01ed3be24a95b5ac127af9f4fbacf65bb5035e60b989e3cc7d732db6015d92106ef38 SHA512 9ff87a0a5dbee945b58987f9d26200efa5e8d5c085ceda6e44ff9cc1b05bd903cdda632e459b26415e7e2195af79aa51b8e95fb9ee7917fc74a6102f220e5148
 DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1
+DIST env_filter-0.1.2.crate 13327 BLAKE2B 96f888b30ec8b40032e588f8ac73e9fe23340af71d5ec69cd8b4dc2bcc272ecd64d1d3ab54bc57e7a71a44cbac497ee7ad3df52930dfe3c7ba7dd129df290b73 SHA512 b1f21a5d4aadfd940bde3e53935c04da48e48cd4f825cedaa83968a08244722aa4e92afb9fd2fdd228412754f040f7bb68f24e05c0bf9bf57783aec042808606
 DIST env_logger-0.11.3.crate 29704 BLAKE2B fd23d377d258ead87e820dd89e4175c0596b284d629563b7d04be10f80bf859d84a6e71a21d1c333a94779262608554e95bf7b44c35b3336cbedf545184ea6d1 SHA512 50df911455429a83088c87d30137fda6fc73971ffd32eb66f21e0d006bce92580c519d4a3a3fddadb7bdcce5d6dc33df853dff6373fe66f128cfd60ca26f9f02
+DIST env_logger-0.11.5.crate 30683 BLAKE2B 9dd2b461be5c5cb3411ebba8bcdb53a78fff28c54fafd21a0f8c3fe578ebc3882ed5df63a5ef9adf62bce00fb6360de895457baf75fd2ed1a6730429478c32cc SHA512 e2ab1f117227ebf8840daaff971c2533830c0e481797cdcaa055a4506ffef78fc0830bfa13295275c604273d494278d43440b987132f97ed6bc1cf705e05cd8a
 DIST epaint-0.28.1.crate 863307 BLAKE2B fafcd0d153142b846d05a7a6f08ca3943cb591d05690ec36595170a24472ea32eb43d74c0bb7b64bdf1f652d422d3607f40eb90e8fa3c4a07002aff5fe17696d SHA512 927c48dbcb9b1e7b01062622ea5667b42d819de1c385a91ede7d0f4ba8b761ae3fb34e94bf34a45d1084f06cb75b82ae3b8340118415abbb308bfb11c709e21d
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
@@ -181,22 +215,28 @@ DIST euclid-0.22.10.crate 78701 BLAKE2B a56cecd7f2670a15ee23f69e607ebe8175123a62
 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 fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
+DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
 DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
+DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a574c7d28e11d15e6c3c4686c42ba98b5769a08c21f3b9c6ffe7140196c3e7001153ff5a046ee7af40f7f6d965 SHA512 59a871137518586f1d66810528595acad5ca763ec5acc100098a372194f55f33b48e59c0806fd237c644a6d797b5deb26c541fa871a1194ee3ac725da3b6d134
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST float_next_after-1.0.0.crate 6965 BLAKE2B f13aea22ad07b4f7518e5802ed84838ba8250eaf73354b3144d69c41fd7a2ff378e182139a36e73d6b4a9228aff8a9b720f72d078278ba472f6abba0b1690c1d SHA512 72e5b919c60a66450625603ee739aa17dede02eea34aa75e0ccf4ac07c1f4f3388c28ad7652627b70e0366b046ac3d09ae7611d8c5225527abb952fe5c59f546
 DIST fluent-0.16.1.crate 8323 BLAKE2B c37c910d0fb23031564c99a34d71d0c5537606380b5125115c1f4c3535b1cd633a0652f43022486b8ea54ba731507d20a348141894de481c6ebc67546e9b3e54 SHA512 7b9209a824067e7cc1cab9958f44a436c779871da5d9362b69f6ce7d3101c3d409f5a6a11a83c4982e6a9cfec90668b2e208c3ef572678d20b410ab97cc4b573
 DIST fluent-bundle-0.15.3.crate 34507 BLAKE2B ccee0575acdb8ddabc18872c5a6a23ca7a4df0e65160fcd65256f69de7a7faf25bae3107f346b18a7dad42c9ba3e8b64a00706f2fbc1eb3285651c209b3451c8 SHA512 4c8e721fcb24939ddcaf5d23937cc58ca6492be73f90058eaf5ca91fe41a3a339ae0d4835c9bcf6a0e4d917dbfba488d2af3494b3838761faf392b446c19f84d
 DIST fluent-langneg-0.13.0.crate 11723 BLAKE2B bfa4ec1a3a11360d28b5291e8eed2628ca6007b8afca726ded87d630394773835b3c8aaf818376a93a60de10feab25d7784c8d2b1e34e63b660d581a37d9626d SHA512 397d0a4f3508c7f58105dbb9ef7a32c5c4ebe4a73d80d2a19930479bee325839485c8002b49fb8c55d686ec9f3ed1d26493b56825b65d60ef7fba78a1442f9d5
 DIST fluent-syntax-0.11.1.crate 32297 BLAKE2B 680071fa182ddbd12f24173b8e2d460024c9a381f11862a477746904c2308790564ca6969629a26149f57749af4bbdcc053c1a470fb7698164026b345098b9b1 SHA512 8a469771a9c6d5594bc969b0d66ce5d820a58ed81e661404b9c0f544d16e04322ad22a6c39fde06d27e0268b735a9255881f4fd40db7480fd6fd87ff019e799e
+DIST fluent-template-macros-0.10.1.crate 4851 BLAKE2B 505a8d9579be9880dcc8f6d154823c8102056b3fdae2d7b9ae4fd0a6a317a17899d5c35828f1128aa9ed13a5fad497bb20bb8799d2e9c72c1f408ad29263d33e SHA512 1b387df3b2f87040070aad06187da2e61575a47e9a75446a43de6c1560f977b2a8dd44e09553293b85aebee9ca6a2f58a2d1a24ad4b5d892337f51e4730f1f07
 DIST fluent-template-macros-0.9.4.crate 4639 BLAKE2B 1f569d858f7fdc574910968130a820f634419ba69b85ca148d45e4999af8676c2e8e4a3005f350b49311921185a2a4231acb217ca90aa01edc3a873b50f0ac34 SHA512 c603e9770f372acb8a5c79549eb36cc30e6bf339f915d576618fbe6528632cb7a4f27afedd8c385d255fcac8a17224e8a2c88b082f8a56441537057c187cbdbd
+DIST fluent-templates-0.10.1.crate 24001 BLAKE2B 855e6bd3bae9f8df49774b2ed2455b401885b9f7843fc29e0c4a413e2d35e1a38cd29b3f203f0ed44784994cd9fa6d9b5b9ccdcf9592ca180e766e91b5620f5b SHA512 42f6987c0b74a9b1732fbf971881028044bd3b2dfb7897fd3bf36406625b619737931ccbb0f7812f04afbf5a2be5d70eb95df9c9e1d9d9a1f7f6359cf15b21b1
 DIST fluent-templates-0.9.4.crate 23293 BLAKE2B c26d3173969d54568619b019513ded3ef718b4057edf1a2063729d77453594ca725ec1db18cbc8f43eada87daefafd5e22d6fd0e96ddf8c25f886a82053e2c4c SHA512 db174d15640561b926a19952caf65ff4d8a9375dd64279c39dfdd313cae7fead06ac96a0592fac60525ec80d92ee2204f38a9d763c53d5d6f9ea2a58588155c2
 DIST flume-0.11.0.crate 67502 BLAKE2B aadebeda44f899b6290df4ccddfc0fc49c4e55709243e9b1eb26b6a232aee042d2260c9b504d554551be54ad4e4ae1b1dc6ee861fee0cbb6eb92fbebb5a7d9ad SHA512 29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fontconfig-parser-0.5.6.crate 39300 BLAKE2B d919f290d09bcfd37b790c03b301dead637543082952339394504b6de9eec2baa27fb79d08cd782b318bd8662df100e40284e929940aec94be551de332d886b4 SHA512 8d58fa2db0d6444025841d460ef3703ed1ff4bab9a7399df9830b8c13155633932e90684530ceb85a6d0803bf8a15f1647650158e5b8aa6288e4300b5201319d
-DIST fontdb-0.18.0.crate 107583 BLAKE2B 1a6e2f389d06247d656b13e30d822ee892c11617663663c61b00e53985c84eb8c79270e5ce2e142e0224a99cddec57ca65ee70405feb0ad25374edcb0c29c92c SHA512 611a9b5105d9d841632633043c9900d188e3d9c7b449e3fb5f9badc4564ea18eab418e82930961174f9c39bf3eb0a3c0f11125b79c43042965a6ff53206699e7
+DIST fontconfig-parser-0.5.7.crate 39564 BLAKE2B 315be3d94b4c46bab60fb40b9b48d1bda134ba4018e5392eb9937896ea8f79098f771942988d4157fbbf5cb4af8f5739abab96b79c67389f14142f24ae3061dc SHA512 0e4ee78ecd12d891492d2132778649460c3a1e553ae67245581677e28b2b813f4303599b64461c2a7a47957591e577ec863fa4365e3f277b8a7f6753332583e0
 DIST fontdb-0.20.0.crate 107743 BLAKE2B 5da951203ac236fbed627c40be6bf62df17ee892ef2c37465f8ec3004e4cf0d26096354af6fcb3d612cd06733ef441d6a2825f7f95138f67f8a39c42b369b7ea SHA512 633c38cea0e8d7202f2ba7abd59002c7e4c64722fefbaa72e7def37caec0c73fde393d9a96ae324f5ddaaf9a2369929df474cabe09f51b4c049687409d1c4581
+DIST fontdb-0.21.0.crate 108167 BLAKE2B f5d2b4ffb9a82552368f49f5761d5eb31e82df03a2c122679ce69eddaed5d233c612aea3710ec416c8e8941703e90c43e5dd6b816309fd9feb9d411ceff93a82 SHA512 08e9539d1b9441c80dea61992d7d5569b9e430462f65d3be34130ea6e69d751f42bf07e8f4fe27a27832bb89af37b0a25da11978c2464e9a5654cddd7c2aceae
 DIST foreign-types-0.5.0.crate 7824 BLAKE2B 01a5111a11e48462914f9877d3228008590093633e957883fdafd3a7017e144c14fbbe713bb8b0061ebae78d20a49978191ce416a4e28317b67ec69e38acb879 SHA512 d07c92cf99c99419a3ebe05ba9154e396ab88116f46af736ffdd958c8e47741bca5d9f478f6719d5361360e844375968c1cbf6ac40995d47128a5e5fda3f6c82
 DIST foreign-types-macros-0.2.3.crate 7635 BLAKE2B ee89f576f2d892209c0f344dcab9dd85a671c976c8034b33dc984b93a5c872ff0353311657fa1dafc499243e55d3293a7bfc532ba55894a719a50ddaa6957589 SHA512 c3965e058d15159f789a8ab1597770ff6325e8ac9e6914c98450225ce27af849698646d53326e07b13eb3a9730452d926b73fd76e5a1fbd8ae4a6083bdce3367
 DIST foreign-types-shared-0.3.1.crate 6006 BLAKE2B 27c26518e0de0a298df2996da4959727dcc6a21bb4efa6c28869a9affe7ee3b427d1bae25ed6928477d07959bd143d5d4fa27325f8f5a5cb0ddd3cdb9e5314df SHA512 c68da34b55230941d6655f6a52d5dcb8ee02149f25c25a5ef782402f9a18b33047905f28b70183a5f45b45977c011a5320cf7283b7901c76ede4d82082ca4c9e
@@ -218,23 +258,28 @@ DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281e
 DIST gethostname-0.4.3.crate 9336 BLAKE2B 12be5fdca0b6e3788cf3d67a4a80f283d240611b4fd37b6d1c37eb2503e4a7025b17bbb70adf421ac840d8f952434bdedf4691f31362780a267e21e8c4d3a006 SHA512 8c5dc404132f2ecf9bf82d8b89cbd698b4cb6d43141c47a60b95401da2e8c314347ab0a0ad5fba50cf98f01a621faa68293cb78f48977d3ddfe6e6f21926abf7
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST gif-0.13.1.crate 36408 BLAKE2B f2544552c177a4e33440b05a949f6b205d3dda1afcb7e6574c92ed9d31cdb3bf536e1914186730bd8777e1c10d86466dffbee34d975884f0125a1dfcce937bda SHA512 7e76ee111c6a94763c4dfe01faf4cb0b5272d5041e2b2b8f4db666debf647e192b963c6fb3228cdde28e1d112830c2aa31eaf0551d712ea9963e41e47e26fb26
-DIST gilrs-0.10.7.crate 127948 BLAKE2B d375c880d4346350305463ceb756408bcfcbfcecbd9f43952ae64f39c48b66e4d82a7b695bdb11d04f37304cabeaa68fd98d3a99e5f79edbd4186262d171e4e5 SHA512 4a49eeb2339ae9d05e679b9bc63d96988dbcecff49997bf8dd476447f0c3a27c7521affa0a6fc69e3b34d39c53c0053e4333c5386126add439ab70bac01e276d
 DIST gilrs-0.10.8.crate 129584 BLAKE2B 3e0ac8b146558240130d77bd91051bf7574aae252c919b8962ff0474166c2379bb4af450f13ee312a646ec848e723014b8e311f64c9f0bd58e3b979261c47eeb SHA512 9581d4ad4d87700d1dd5a15fa265275c726df5bf1018b0dfe7bbbc1aea9a762d368612afce4dde7b7bfbe49a0b0f9ae607729112865ae6dd8aae1fd1ba66ada5
+DIST gilrs-0.10.9.crate 129616 BLAKE2B 3198c9dee2812d245d235d39b2ce59f2f21c18f92a5ac95fe16df80753b0d0137ac415ab95a8b03ea7736ebd3b2e26c89733180db0a766456a02a73a196aa0d7 SHA512 b2932e16cf4b3daaa3aece7d6ef4df893dd71fb0c81f5ab58ec897e102593bf4ee6bba8a604828cf9c9f261012c792a080d01bd73da53f46fd582e60aebc673e
 DIST gilrs-core-0.5.11.crate 47123 BLAKE2B 55cc7668cea1cfe5f0a558ed5a9524dff2ba23099c48b05b7f02e8f20af9b2d4776c33debeae75cd7bd747404db6aaa40120778bda161aae9c0532997944b10a SHA512 cc5c96270e246e1b4e94a7b1d613d263607d02638fc7baebcccc990000a35fe52901b3c348c9ff657b97ae5c74b8ff744f64ac93abe1697ab869506f05aead95
+DIST gilrs-core-0.5.15.crate 47642 BLAKE2B f793830fe99b4d6364c54b52b9715d18a8a44d60bb18cafbe16698a963d168600d28ac6c150af49c0eeff760f127df341bd27819de9b21ddcb182fa5af109c8d SHA512 251fa2948d3288c48fa4fc1b2ac2d48e6adb10ea257b8a116cf6f8ebee1ebec256d42000065f2874148d110dd49fbb67112b329e09142550c5c4d04128c04927
 DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
 DIST gl_generator-0.14.0.crate 22330 BLAKE2B d2e84bf81e7c4e2869c3e23872bd86466ede80d6fdbdadaddafb1ae9ab45672613cfda319b15720c35fc26ab103ba106a997ea6f5d4654bc9db19fb86f20d765 SHA512 98779d525a042b47ac373340c6fd2e019a670a5bce643128ae2cde2021c0bc8b2253064819c2b0ff444e62bfb3679dc70f11f268c660050cc891063ed6b45fd0
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
 DIST gloo-net-0.5.0.crate 18586 BLAKE2B 8fb6ee702f468cbfb77ba40437f99f2a4c992f4d9787e79db463eee4d3810282569ad3ac0672a04ebefea012cfaf52c93b57220207a1af5b86c287d8de89a1b0 SHA512 9f00e686b0ba473b264752591cdc7bbc609fd998b36e98fd7ecfb09f4c3910050112cf7e2758b4d1dfd990ec2950076e5984ce0ac9d011b7852882b0ac42b557
+DIST gloo-net-0.6.0.crate 18515 BLAKE2B edd2823385748a5a4ac85f3e71e510ddf977de25601f85bfe0f9f5fcbef5f69c270dbc18a69b4ce7f4bb9675d9fe9a13d13c0d38d3484d7cb0fe8abaa5667563 SHA512 5f003eb621b6c18553e2bcbc9f8ce60b8aaad703c3d7dfbdb63b96901c9ca285c3e54f3a4653a890050dace4ff57ce4f6a1ee16bca568b2e2c9432a200d21a1a
 DIST gloo-utils-0.2.0.crate 5103 BLAKE2B 2ade2182cc7abd8bff18584a6a22efd185dc3d687461e9ecae86d669e21c007833a2b71320bf71b41d950ebfa23c433792ec140b6f373dab61c236c5f884abf0 SHA512 ffab533a4d05c62ac8096e500608a0e2c28760672afd69cb990b17c978f83db890e7db1175c13fd7ccba365b9363eb704c0b9387d04b8e2522e6f97dbf1cccac
 DIST glow-0.13.1.crate 150940 BLAKE2B 30916c62bf166cc5aa07cf2bf7f91b80d3580f0e7d16d43d77e185dd1fab17c96d1a20e7a018725e6822c2910776d27e57bd52677886461cd22b5083b9a605ec SHA512 2a7975f049fa7292dcb15a6f7d6141aac59a316f97a21c4ee65a6cf91594f8340b74a3e3135903be4dae51e6ec73892270531f0f76140dcc1534a93bfc46c49f
 DIST glutin_wgl_sys-0.5.0.crate 5469 BLAKE2B 853aeadd1e7a775deb075116d08efc0b17e7032e6a41bcfbc4ea87cd3c466596f083042e3b213f1e33afa4bb106ade7a64f346311c0c1cf6d228820859887a5d SHA512 a8f44456b66a95627f7d0fe3b8a79270368b11343a9f34feeae5675af0e0fc1629b5ccb00e8cddae21ae8e71f61028567d806796595fb94e02b31dc1db03d521
+DIST glutin_wgl_sys-0.6.0.crate 5472 BLAKE2B cceb466cd3d4649ad7b495c9008a78a0108639028a9935f31871c4282584d0d527b0b2c8b4c4582bffa97a84a7f59d469ccf380fd9f7eb037eb93972d094fe3d SHA512 ac4db8d5d420e446bffad8ef06c30acfb2be079fa1f47167e0f6f5712416ed5c28aa781386d1bafdaaac090b4d3b52897e1a269e536c744fdf48f932a5f1b95e
 DIST gpu-alloc-0.6.0.crate 19649 BLAKE2B 47fbe3b604b4ffdd2e44d2298e969117688378ef5ed32aaf698106cc06f9973caefbad0cf7ee7a4e75a5602bae9ac0eb3b0661ceaaa82ec1c0d08184d0880ea8 SHA512 b0d19c68c3d122b89dde988d2df53798ba7f3cc9475698eddb0bd116a55509610a9e4edeea81ffd501b3e0a3d50a656161b6f3eabadc7a14e46578f9f5230314
 DIST gpu-alloc-types-0.3.0.crate 4128 BLAKE2B 3f14d804b0d02cd8b2a3532412085db3b6e78a500c9629e3908ab1ac7787d8b807cfc88c8b98bba8b9aea0635787e3d6cdc65d2f565047c6ec74a90ed74002e3 SHA512 9b9f7e81269070269c592c3ded750e0507bf56e1062708ae0f3784fdffa86786f15fd647b07a5d9a4d8c83d5bc277f4062711a5af99e88604e0a0b5d708534e4
 DIST gpu-allocator-0.25.0.crate 44341 BLAKE2B ebc71ad9ce8178c07dd86c5b0db68177809b60d63d8c7094b23a0bbdbbd0c43b50c85a967ff6ba8802e87dfc11d8b2a526c096454dab34931d2135ce9578205a SHA512 b311f10c39cf01afa6d196b3557f3d1193c110ec3d4d8195b55c84eadd9e34a75c1b2fb72e79106d19b3399bb917b5d46dedf73ce3be049db918de4db9fe9f7d
+DIST gpu-allocator-0.26.0.crate 49005 BLAKE2B 2c637038df9dcde7c0e394c2927173268ff6f622b105f21ababd70407ef58cd33a47e85f751e3ac49093cc2019899b73a9fb429c6412be6aa6431ed1428bbb47 SHA512 e116e4b2236ff81ea18cb7dc60396cd7b8e97fb2caa1755ed6c6cb3d6758209901d0ea1ee7dfad3c132f43d82842dd107a48e8af37b55eb291826897fa49b39d
 DIST gpu-descriptor-0.3.0.crate 6727 BLAKE2B e4be0fdeb1ba34e1efe22733f25061269d1badec2d5f0e2abe06c60c9fcb24852eefe2c648b07e7d2ddf86111b569bf224c3840f36d913edc1f3f973294e4e51 SHA512 772a5be99697782973a840157c1a1aebcd68bbc715aa9d70468b6b238acd782cb00b141c8ccf36bdc4264b094121ed7cda4f1a7e131c5f3e5ebc2c8d7ca5e168
 DIST gpu-descriptor-types-0.2.0.crate 2169 BLAKE2B 4180fff08f52ced71b85926d9806a28eb71c25d6d16a1649ec2e02c1f87e8bb36a2a0d664d7c46e2b57b1934fc3b319e74109f87f5c7d22184646d7e137ee75a SHA512 10161c1495a6ae0c0942a3a28120b7d0e572e0226b639f473816d642139a72141851bfded267298f6bfde99391ee355066bb3af7dd5b013428c7b5376ce19b11
 DIST h2-0.4.5.crate 174166 BLAKE2B 17344c381a45c525dc701236a3e0a0015818f36c6c09507da4c340be35ca1544240a035df789854a6c24e3cfc0e57d08d33a925d4907634d7b82df793102cee1 SHA512 3241dd8dbabb12e09ebd4acc05d9868395b51b4514262d4caa9f7af8b4219a8bffb3589398d3dfd86949783b8b2ac968b9ddc9644ac741da5d516b68402f0eef
+DIST h2-0.4.6.crate 173912 BLAKE2B b6d7c0d9f52ef65c779b5c17c0f7ede4ea8f20bb31aec3b7d4c95297db4e642286f5e5dc7c463c36876ca75e6b855e683688b0c299750baad68bbe981c2b9e4d SHA512 d583b9bc2ddd3599cdf8d9ccfebc4c433bedbdbc39c562207946f04947ebcec0df075706b31ab903ddbbf3b8199d84abcc143ce8823c68643271078177abdbdf
 DIST h263-rs-f0fa94c366a1d0383df99aa835add175658d6bad.gh.tar.gz 89857 BLAKE2B ac0d69b93793513a78142606fca25f236d23ee930fa0800ce7d99cf5f9c5aa02d281aa8a0d238fb4ac10372d0a890b20468e80ae16364a702ffb46028135daf1 SHA512 60724882265e499f59188b43d2a9b596f59af7bd28d67e6e6f89486561f9efb8b95db8377cf2b0be849c4589aadf36183935eea692366dcca7b504daa3e15df1
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST hassle-rs-0.11.0.crate 27178 BLAKE2B 5af929f5989f5522fc04aa27631b24dc53aac842a238d2c7e3a5f45221ab56a0725578cf3bde1b070b88a3d151ee6522e914318fcaeb0317c0da9d2cd74d082f SHA512 b4eeed4e47236cfb88087b1b6e4d2ad7c93acd90e55ef4c1b039d3798b3a7c6f81238200c15948e42be69010a7bfc24bc20f309dedd90625160a5a50f35e0930
@@ -246,24 +291,27 @@ DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17
 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-1.0.0.crate 5411 BLAKE2B f560b45bfb1525fbdb209982740dc2da5688034912377b88a1f0e069a003bd3fba3d3f248bae98dde043e6f797f256a219228611e9b8035e6181f4c84381f823 SHA512 b351df7a2ec991787a57232229f80a29a648433de25efc1db2c9453d5a09b75c2e8b0101268b6753251c686a2af9ce346e08bd016f4e93891534f428c1d80183
+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.2.crate 38105 BLAKE2B 23ff17183e1d8875f4e7ffaac72aa7267f4607bed46dc4d8764f4f758150cc228269987bc8a211fd2acb149ee8a5b5b808a8515236a105cf70095750838a65ce SHA512 a72eabbe0122c37393bbe93522e8484f996a38fbd11952dbbd02b098aecef8690121fb63d91302a428457c6b63eb33fded796970214d176356deedf36d9fcf31
 DIST httparse-1.9.4.crate 38555 BLAKE2B 24949d12a08fad7c90f57de628fed1cf9d0a726ddf1b1f66def1d7037f509406911e6a54067eb299436d865881fcb5b4dcd54bc9a7fd166f9ab6f562ca29a3c7 SHA512 7a6c34cd0e60aea6a4e747b1e0711c7227f0cb6f332ed34b8b5424ab2d21772a77e60295e4df6421e921f6f9afe1e9955db1be5bf1dbc065200d4aa7d23a4aef
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST hyper-1.3.1.crate 148763 BLAKE2B 50727f12dc4fc3ac605b19f92c30815a059364674b57dc0d8fee1aac548ba9474a9c0f23c32c537ef1b814a6eef10608dd442c579e37b102c249356c715f3cb7 SHA512 a7158d887593e29885c0d62a482916d50e14b69d7a4136be6c29e262d739d742d551446507bed27f7e6d7b142faac9907ed7b590e6f84175092c52f176598806
+DIST hyper-1.4.1.crate 151849 BLAKE2B aa5f48c38ed54de8d1b8ca0236acbae6bc30d530156c3f4f429f89e48148dcfd0580478041549a3f43faf38b30f36bc41276a272463c42c80c1b45a7b24a236b SHA512 0fcaaabfbb606020534aaf0cf68c9f1be3480f2d1b126deec30ba2879cdc3c7c7a24bdc5a2ed81aabe8be4df36b146ac1585ed8d07181dcb743852ff3fc0878b
 DIST hyper-rustls-0.27.2.crate 34421 BLAKE2B efaf493a8c50141ff9cfa93b8045a21488f61178d33e080bd81d92d8c0974df8d3714edeef678e1163c3ea08cef76aa9c3448b406d3811394bf282b0814204bd SHA512 c7f5134ce6e07a28e2499ef7ca4e6c1c817b4592e4cfd16967188390dc920dc8813d1935e5466554dc3e6b388cca685b26fbc94e702e6aa7ddf12ede5645e446
 DIST hyper-util-0.1.5.crate 69740 BLAKE2B 725513188d076a2f8cd48e969e82fced47fb0109c84574dec56b94208750aae54a573797dd03feaac30c45742e7abcf90286d368b30eb3516fdcb730bc851c32 SHA512 44b1ec55849a93f9faab391eb6b99f205ba19f8b4d83966a04562dfa86e936222b79a5c8b2d6204870a4038103ff99b0a07feaee314e6c7c38b000732a68eb69
+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 icrate-0.0.4.crate 1040120 BLAKE2B bf09a1f5e4dcb6b119f158a6d7c93124d7f8a2434fbdfa19e356c282a3bcd2c191fe028f7c45becbeb313d163339106f8999c159b33920f90d70f7e09123d58c SHA512 2aeb124d3b303311500c163a33b033b8cecabefe53f50da360178c320d884e3b11d064da11c52d7ec87e97d4bdf6e6f47f71d1b7609e226fa3910eb9b7e270fb
-DIST id3-1.13.1.crate 61018 BLAKE2B bc7bac0c91cb81d5f0e1920efe02c6b14196e80b0bab3bbc29dce23af2b27efdfc94bbbc2db863a551443e2043b3e36d6cb8963e01eb76aad4b0c93a5882b160 SHA512 a5848324df95bf0d9e693c89d24620b3b235d05ebd2dcbbd699eca2a3d6850f31aa65f0ba9e8416473d30e3b9c10204027ab4f6bb08ec5fda5d4ff48d11fc62d
 DIST id3-1.14.0.crate 62535 BLAKE2B bb09ba112c8c3441996e26745abe080dd3d8c6f15bf7e3a323606c31a9e39bc11205385cd81e5026bd7e628f55e17bae0f5c41b797c1ee60347d1a3b0881d057 SHA512 664411f4e8d40bdc0a15be56547cb5defceebde2fc35ebaaf7b47b23fa25286ae511f3f931cb504dc5e4137e872bc1a974de27b3d4a1951f11dcb63161583d60
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
 DIST image-0.25.1.crate 9176733 BLAKE2B f7daa1982ec510de79c925157f2e1a861c89a92f1cc043617469f3c95cc9158f1ffcf274513556993bbc4bd5ee5f86bcccd406cfec06d98b0330bfc10687acac SHA512 4252672cb5b5fde61e9c7fce1712997ea082e3e7d5350970d597c0a1421b21078e1b4c3088474c4b500f396bce604d0749085fe4cdfe1c3b5f3d1ffcd39c1b04
+DIST image-0.25.2.crate 225656 BLAKE2B 15adcf01daa3bfa1b18e1ec0f9d0c5f525c9f1d8dc58f1c09c724d9a4c2421c5281805f9a627da804b3273a81e1b536d8a558f3a8a31bd4ced4a6b254a019396 SHA512 229375af5cbdfd1f11defa5e261481159b1d64a62d421676b831c1db9fb69b5877f78bdf675999f721e6f71cc4884af6c63ee561415c2548eb9d23469ac4e8da
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
 DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf
 DIST inotify-0.10.2.crate 26200 BLAKE2B 8080cace302b0e5aca8ed4188126992fed5b5b4f3624d0e5de70dfb426583428890513faae2fa32c31afbe1051aea03acb7a7f22d0720a24569f020a2a5ec940 SHA512 79692a043787daa67284f9b94892a09a2bebb12feaa5be2e1bcfa213b710af5499a4fb62b837d45793efdc19ed1eee00a014a7a620b5bfc9a594fe0571e96929
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
@@ -274,25 +322,28 @@ DIST intl_pluralrules-7.0.2.crate 9201 BLAKE2B e80c46d863296008c85dd8738cb1140cd
 DIST io-kit-sys-0.4.1.crate 39052 BLAKE2B 4e5ef7c37b27cd9fa2f53beb2618ce3fb1fbb7c94ae5fdf4d53992b5671da55d2893b84456a622e2a96c6a0cf01aae1492ebdfd4820bb52c0e93ebeb0d93de2d SHA512 fc9bb9b47483c3dce0adb233faa2b47ac9303786771d97e3ff5836c81c04754406cf9ebe5fef32cb879dee5ff3f10d6a81a21a423dd34f3ae1178d94fb151163
 DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
 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.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 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.31.crate 27306 BLAKE2B 08ed4a90dfdad5bd7d67b8e15cf61bccb4a9669dfe4a479680c481e7066c70d833cd199b56a4ce7d1180cc9fef565d0afe722a13a436b86326cdfc8c10fb0424 SHA512 0488e5eafc5a99583d4626ae8900d49082aa09228b35a8992d8e715b5a39aade47f51562dc4db8ac41305e069988c4c63e1c78e92d65561e3e8a09d4dfa5fe25
+DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
 DIST jpegxr-db88651220688d2883a90d5477048071507b0493.gh.tar.gz 9321643 BLAKE2B aceea4a702561c9a90f82914095873643b18fe56448e6156d3ebb2e663830bfe82e593c99caf04a4f96627ba8d56af219dd5441affa13f7f13906701f13d5366 SHA512 732044474f7b1f8ee29e5e6b2701f27f646e7b8fbeff976880737976cab3efba6a10c09f1ee489c808e9016d4d20b1e536b3106bac94e59c614bea35c754cda3
 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 khronos-egl-6.0.0.crate 29315 BLAKE2B 929d825923bce022ce13595a0ad183a3437581af6cdb19ece34af853c793dddf0a63bf8dd9a160ef253bc4e97c38d4973f667340a809455136b07dd248d2fe46 SHA512 be57e604f577ec526f3f2ea81767a5fbef0b609e0c1aff7c14e2fe658e47bbbcf65b5ac9d6dafb83d2b4fe25039550e21a165fb1d503ea08f167b039bd72cdbb
 DIST khronos_api-3.1.0.crate 599718 BLAKE2B 945600455c85874c37c7c395162a3e56531b417a1e6ce414386ecf31f8951fb40049604c27d719014b5379028e5da25fb9977c7487433cebcee4ccc49e00c7d5 SHA512 f9ed9e1bac648a82bc608bc7df339d3ef1db868c8ce8bda9598926839b3de9e3c11c2b45886b9a7dfe5ad6900770fd59c690bfe9a87f7c5b479945ffb8dfd292
 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.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libflate-2.1.0.crate 43366 BLAKE2B 3635565c152893ab958c491d1dcd1f5826abed77f6f41e38b64566c27a81664c1573cb054cfe069392519437e403138b14ec4daca8b8af22e6432136e94bf957 SHA512 00cba931f92f50ba527aab2303533e72d183ba1ff7b61d396b50d0a1fc0f31dd348a506cc87ad417879108c03f0b500d05c1b7abf48e92473e0d472594d4151c
-DIST libflate_lz77-2.1.0.crate 5918 BLAKE2B f931e7d96baf91903ffb73100996f11df1fcf3d67f4d06f2dfcf08bb4ebcc0f24e9da7ddd8b886f6a4f5a4d138beebeea54fa8247594ec5f5fddd94c9cae4b83 SHA512 5e521a46a6ef2976deab481d2410db0797fbf5a78e6ac4d406bc0ac4464b01836938a528990657328b29698a19a631d641dd1e3093cfddc91be62fcb4b646ba7
+DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libloading-0.7.4.crate 27580 BLAKE2B 491faef2659270b10bb88ac46e0453f747f35e78d7f28b7d6d9151177b4c7a7aec0a1efdf702eda0988c31e9dafff2990eba4e6a9b0b695c535ea9086ccf36e7 SHA512 34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1
-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.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libredox-0.0.2.crate 4538 BLAKE2B 3b160b1ed9a476b1d51fb6a107ce2a5955495cd862d01854c79ac4f1cc1aacaff57f83e03be9b14f3c8fbb67c4124946aae19046620eb968fe97745d8cf46fce SHA512 4c321f6072bc4d6c32f9a2a8bc3ea64443e1b1b770e9d2626be86b3506cfb804c3cbafe376c7300efb09788510a57a626ffa65c9eecd447a2ad29532c307dc9f
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
@@ -300,15 +351,17 @@ DIST libtest-mimic-0.7.3.crate 27276 BLAKE2B e14f671e12f3a22a90bc459dcb4100c7acf
 DIST libudev-sys-0.1.4.crate 6177 BLAKE2B c513b5cd68fc60a7a33ba281e4fc4f9a5896946aeb1fe31abb8af22d279c39c3d781fd34109f98fd010fe8aa817b9d91726887f0ee8bf0f66a3bf313b01c9ff3 SHA512 185bd84a729a5dda6fb274584c7a731652418da9435d844870a9d09662918c9230287f4ad002273599d0a3e9709a36ae06d59a6686dfba978fb7cd1c51bbc2c7
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST linkme-0.3.27.crate 14139 BLAKE2B f7a849717f233a706dce43d86944c67bd8d22c68e95f1102d34a1fef76b50db104a8654ac04bdf742a777f453719dbf2de76961307f124801968ba4a8557b31b SHA512 6f1a333a6d3f32e61e7a9a71e89779ffd8db4eb1efd46c576aba69622b22b014201847d10867e5deac51c8431a963942c49a08f4e3e60ee683e85d274f5139d9
+DIST linkme-0.3.28.crate 14136 BLAKE2B dec1c43668cc6a6f59234a5957a9278c7a2c85896aed1e15414dc303a1b44ab45416b00c25922f5786b3bb5d2b779c937ccb316b022d1af2622b137fbc122bc3 SHA512 2b72cb3ffb9b0ca3d52add5a3326ef483960f20e44ddb18b0da811fbb78ff0fdef06916343852b3353260b7e5b7812e7222b1070367ae967d203120dbfb18a90
 DIST linkme-impl-0.3.27.crate 7003 BLAKE2B 5e7fa50de84796aaad62c34c98eb650b4e39d6ade532273c41c70a5cf693cfebb94210c949329457fd2aa6bee73d0fc57ff9adb185d4ddb08ed5d87361a0455e SHA512 0f7729050b8ead333aabfdb47799bfbe01baa191d3deb597840b8b05dc3fad4ec5b1ac1e239adbbcce2a8ce26e86631b97962fc8a9ed5ceca274d263c595d861
+DIST linkme-impl-0.3.28.crate 7002 BLAKE2B 883253f648dd2ac7c939e6e6cab31abb985a62589bb9cd5826926518ecd9d3b10dea06cef1d90241622a928ff5adf22244f52322f8e86eb5f4a2dfb75959f08e SHA512 25ce8dc92b84c24bcc7c1da9f87527efd4bc01027afe9507fd740e05488b0a2d196af0cbcd970e1cf3b4a6fcf0b19fcb5d21c3f3c3c7804cbbb64ed4acc359d3
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
 DIST litrs-0.4.1.crate 42603 BLAKE2B bb5c471204b982708e4a9848aaa8ce3699cf929a16d1beb554ff422fc36ca7037c84cd7fa83a19f6c2278b9626e43a4a0524842027b6a079e604147162e6e9ab SHA512 49e03d5307d9cc31d1e7940e7931f062780728530c3de0db92ebb636b7d22581bbd9900c8994e545a8fde5d3d5564500af8fa367f54040ed01d1f18d2e48a22a
 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.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST loom-0.7.2.crate 73989 BLAKE2B 9100d748f2720d11c8b06f55265988e35e23efc6534c676ce0ff02e36681a084aabf90c68b3911a95cd4c90c4a3e19dde4ef1bde870d890305d86f8c21db0153 SHA512 e17b7fb50e785972aed6bdeb2e9003b679c463bd538fa0b8d25309506166cabe04a885d1d5ffa79f5bbd4db2696aa3835f07a8cb933031b62195e3d7d441b742
 DIST lru-0.12.3.crate 15009 BLAKE2B 2b2587a602409113a7ed61d0dbc44b8b1740e44897bf9273011e6196db64a51e6973436d6bf34df7a1e534cfc0490e0bec4d83c0dcb0f53f640c80b88713974b SHA512 1768ff09e294ad7b0631a4c7cfc1773be57568329901e9c2034b1cffadaca9963180b3bf8194554bad2f9f42f6c5e67d52dc90ba7d75d929cadf31642f4a688a
+DIST lru-0.12.4.crate 16032 BLAKE2B 7255bf86fcc001ef8f94c9d7578993e67517145d0e83adecfb1b5095faca200493a22361bfc8b9827bee07a4e5e150958d4a54ca3fde0f06bf733dd4749d861f SHA512 1d5becbb538f90414d320fe14d0d6fa8bb14bdce69b2e1855b360287e3dfefabc1f62685190730d11a4ddb843c2180dca964ea4a79606950f087c404cc3798f8
 DIST lyon-1.0.1.crate 3837 BLAKE2B b7a5a2be4e96ddd974974495a61e50e782f7d3c08d8b5e14b86a2e02c55a6a3848e332405ab61d2f7523eee2291e42869814f208d41efa28050f2ed79e2c8e95 SHA512 f9dbad320ccbcd33d692af4c8d7998745ab8d86d307058ce132432eacc9215c8cfe3c42a6d5edffa7942ef892199625be5a55bbfd13ce383c3e9f1465ae81ae5
 DIST lyon_algorithms-1.0.4.crate 31806 BLAKE2B 4eb255b1c1ded57b7bfd947a503afa6fa4b7a2c6240c2442c28e0bc41797150786510daf741eb518ea7a572b2ad05db95423d5e83fcc4369448c08a73183758b SHA512 cae8b9ea4618304f0025ab8d0fe8eda47ee16fa715e279ad698cc06e8ae7f9799be2b2a786fae0133c7f2e8c6c40ede9b9e06f7a5c20cc7965d4648ddfd01921
 DIST lyon_geom-1.0.5.crate 52658 BLAKE2B 9dc405aff5616913358ee97f57de77ab8876837908640996c732a2e86f048c4a99e01fa7bb54b8f1334be008d0a7365770abc8dc1b7d85e65e0884bbee905626 SHA512 9dd99cafe99596dab3d5b35456383338d6967f6879c4f32a4a64ed9c54486a1b2765e29343799efd6a76de118a23c42399e7c009e2924a78c542e35db966bd74
@@ -322,25 +375,30 @@ DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad9
 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 memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST metal-0.28.0.crate 3029412 BLAKE2B 74decbafa4b0394f0031c5c6e1ddcd73348a3238a53e871f91d2fddb310c25d1863833a0c077496968f7d72b92e6555b941a563e1d02f789a041d81dd72e7be7 SHA512 1b45914ae59a352da12e92e6fd15636e8ba1eeedadf878fc3fb452c0bde37a3a47701b516f5ef0d51b0f5612353da0f742b51d0ea794fce49a451738e24c42bc
+DIST metal-0.29.0.crate 3033188 BLAKE2B 05339d5a3d3c33103e9bef8e5d7dac1cfdee8dfcf1114af684e09da0c703db42c9e194c65513550bea26563a269168a28a1ec0ce191e48d6e5cec3de320ced3e SHA512 8e402d921d1472a738d54b885c6d38c8e93fa04372af115ca1aab697862a2ddda0d20ee1c9c6b6e2d30773ef66956ad28f4ff42b008ecd6b70b0de04f95ee39d
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
-DIST mime_guess2-2.0.5.crate 26304 BLAKE2B 9428bf658fc2f5b98450a9a39898762fbfdb9108519f7dcf67d97093073a5ecfa06b2ef6210c42946f516d49a3bf65b5e99cf247581e276344aef91a2bad3c44 SHA512 c54e4b401cf994aa18249040f32e5d258073fb10af705c5c052acbb02cf03f0f50ebeb5cff96be91a298840def5895f9b6ffa056f3d78b748113b5374079c4c1
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 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 mio-1.0.2.crate 102777 BLAKE2B 9b87abd99269c62e48c6be4fa197d2b12527b672c435d5f1f623f986c60ed391597dbde7d5b73a624a4df0eeaf9c9cedcd56cfd7ce4239757d59e67e9892c59f SHA512 77eae1170a318d4a53550dda3462ae070d25656cda51db4cb2dbcb28210802f9b7e279900e6d6eba68314a0c814c90eb4af7acc561f611535cb364f75ad4e317
 DIST naga-0.20.0.crate 572578 BLAKE2B 51a9905e176c6620f337ecf8dd706bc462c98e88048aab250d5cd79cdedbe299d0fc20435be296dd7fcc75f18b4c524c6f182590b3306907e29bc5fe94c2c1fa SHA512 06ebf7db5627a341d4a73ca277f534bccb1116f1ee5c286d4e2dad92b0d45120af3e5c7cd9562e1a58c1e60e38ec7303c5a1cdc3aea899b280a238c1e25f7db0
+DIST naga-22.1.0.crate 592289 BLAKE2B faee39558c7c1362df4543b60ed728fd63175b8332205b89779a2c73543fcbc4f8d0f3faabcacdff1e84b8d786283af39a09c29fe2ada9b94b3242d45864581e SHA512 55cfadec3258a79995864ca0a9235600b2f99282ea4b3e8ff987ba9e992c6b434378354baded1853f5dfdf02aa038f80f8a2e72422873b7b01d264013c342e0a
 DIST ndk-0.8.0.crate 79770 BLAKE2B 82ad3258f730bc26f91cfe231b3bb811de466ef30244b963c7b78f215cb396a50528129773a986121069d058f5b1d79e7aa8a18f4217e371428520f95c934301 SHA512 bf666942469ebac77eb2ddffed6a276098ac291d459d4b544920fa6644e9fe71a41e556d7d46ae2c23b46865d2825b08d0e2eab3bc3dce2e6f9b2d5786f1d9ec
 DIST ndk-context-0.1.1.crate 2205 BLAKE2B 6c1013410459ee13357877654303a04c2ee674eae77911d8c35dc7ebf3df2e8632440c26273f994f90f083fe20b4923240e3b9eaa2ae90faccc7e2f0021b6e0a SHA512 3e15db351492b3f1935424a4c119d878f5d771d6ca0cb6161e4105b263178e96e41cdf1e927e5f3c81a281f55dee25929a9cee911eeb4ff307dcd31fc400398b
 DIST ndk-sys-0.5.0+25.2.9519653.crate 307233 BLAKE2B 884f73ab15acf81b238d0ef06b66942949222506ff0f6deeb009348ac8870b0a8e74b4015ceceb2bf0611609ec4acd0923c2724b1240f314d0b56a42213e0b44 SHA512 380a6c0124df4bc2a835465506c1837ced58f1174ddfd89891c1784ea27508023543dfd229a5440ec1e593461e0e96b07557da72eff4b90032deb8cdf9db9be5
 DIST nellymoser-754b1184037aa9952a907107284fb73897e26adc.gh.tar.gz 5972 BLAKE2B dd4604ca10d26a1d7def7d6321a1164a6011b48d44f322128f98baccd6b76bb1220515d7f73a1ef31497a6ee030387e31ef03d30b241fdea0a6b74149e20f3d6 SHA512 e031364892d61f973131ee76b7014a90a36bf5ad14ea6d481cbd2ac5c41266a1f195eb71b6cb860ccdd5912edc166e73b420d15a5dd49d450be8ff7f70b3d93a
 DIST nihav-vp6-83c7e1094d603d9fc1212d39d99abb17f3a3226b.gh.tar.gz 37669 BLAKE2B b0f2c3598d6946e44406c59da1b74d5f862a1a0403b96009e9b8dbcfdb911c242f036898d60316fc767d1c7ad6d5f098447e1711556dccb7c6164f507a576377 SHA512 97a122659407815aa563120846eae98395f08eb4eb300b0ca1ff59526af2ee002e3932b8ca03c28945eb9394271516fbba43526d230d41c08a3d33bb0d6ca4c1
 DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
+DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST nohash-hasher-0.2.0.crate 8051 BLAKE2B 5f307e2bd15580f398d53d499b9013a6c62becd4ef0d3edb76f9fdf83a59c8fd86ee4bcf42ba3a8d67bbea522db65828fe7fe324ffc8d5008428570d7b2203a5 SHA512 b1b754262471ac1fb074559c264321f8f08c46c55752187f51a93cdc73509551b43008751ff9db4aa5b47fbfdda783904f5492349546ad14856fe485ccec55d8
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
-DIST num-bigint-0.4.5.crate 102281 BLAKE2B a25880f907caeb948d0a8619180be7e1e66d0644819a842fd1413a1ecc8d7cd873b4a55a684e8a98f6bc1b74612e20d3d01389c6753389cd9f4cf7f754125fdd SHA512 0d3b1da7f37a441cae0bc276b5b9b8aaad2f5a7ddc3a1c9b6c6e09be70147f7430604c74c57a79dce12d32c242393c8031ec7bbe9b1cc6fb6e496d6fd151474e
 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
@@ -349,7 +407,9 @@ DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e33
 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_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.7.2.crate 17090 BLAKE2B 708f474f6be67cf1f3a63d989b6e84ff33a165f0fce98a2d82d99eee71970f2bcc2c9b58395049d0b6e7e089446a9155ae6b7d6621895326c48049416b5817f9 SHA512 f3d825aad4a04bddaa42d07ef4dbc69c793cc53999cc2b32ef49fb28499cd812896e0c5b89b9118d9def495de0caa05e473109a0937876da4c1a628964a8ba6b
+DIST num_enum_derive-0.7.3.crate 17092 BLAKE2B 79b4e4f1def44702347a2291e7c2b3f97a902b4768031795d9fea53c624f31acce9f5ee68316d08af149681afd8374e39b596c3d63e3547445cfcd28d3b5314e SHA512 d670d60cf9a547232190d663d92a288b06953ccc5989c2fd9d4101db35be9e3e7386c42878c15bd820817aa703ba06af3a9641898f4a204fe9d7fbc32c3bd786
 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 objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
@@ -367,6 +427,7 @@ DIST objc2-metal-0.2.2.crate 75276 BLAKE2B 018445d05ee53871b998a7870cd9ee48bc5d8
 DIST objc2-quartz-core-0.2.2.crate 21306 BLAKE2B fbbe6388d29766895e2037fc82ae4dc3ce40ef9fbef635b73b5b8931e624ee706ecf296102ab9c68cd88c0add354c884d15adc4cd479924f6f902ed407463689 SHA512 bf8b8e9dd17081162d048fefee3200c58041a31319f8e5516bec218e09e7221bdb3f8c3f9cc95e322772dc030e5f3d64be84f129e657eced4e037a00ef63275e
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST object-0.35.0.crate 317792 BLAKE2B 0f18cf2fe8ae4eac322e03708a2e3e9b5cb8a788aaef47ea8776a406fe4df10c5dc6a46d86fe6d5aeaf520ebd3d8333b99163e1e5b824d145f374b5f1d620d63 SHA512 4230b083bca1f7954c3c50f6fbd12e03d7e4a5ea47aa55c08d0df94bbe0e2e61187413bf59eabfb39ef680c35e11577408ecf58d460e4b97e5ad58f376cbfab7
+DIST object-0.36.3.crate 325288 BLAKE2B 0701822a51a82a1674514d7572c5f91bb40834e23d40b0fb440d933221e8256b7eb36711e8b8870d866384774c7c1e36b89363d7f6bb94af92f9f567f7aca211 SHA512 2f8175d757a66658bf91234d6a58905ef9a410bb19973e81bdd8b28322f6865e32f5b9cfd0ad38195cb07b2721ababf240876270f39a6c7ab8a36a127dc18f0e
 DIST oboe-0.6.1.crate 24588 BLAKE2B caaac8795247ee9c14f02e4c572605f590930686487d7f5f3195b4f1adaa837a024d8fe2043f90b97af7832f9b8624750dbe7def8111536a2cf1f154ac6b43ae SHA512 62b7573b685ff2e64d28337c3c08c556dc6355a11ad31cfb2bf3423ef1eb6a73ff38201dd5c116580b0a540b3f76dbd4a5347758ff40accc1bbd50a893cfdbf7
 DIST oboe-sys-0.6.1.crate 169091 BLAKE2B bd2ff90400c1a2602cdce23ae7a85528a4913523416a7a2cbd1baf91a07b067f0761a59753dd35dda622b1748415cab8c9b597404a738e6d5684b1efd1635714 SHA512 48378bbc6ad3d9cff907500bc72042a2063ea5a4a0493a577539dc7fd3280cb4e32b13785a793d8a3350656b7b898b46e61ecd20116b753a54cfadfee2c545a9
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
@@ -375,7 +436,6 @@ DIST orbclient-0.3.47.crate 1324509 BLAKE2B 6596cba24e840b64db31ad9791cbfb60d82d
 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 overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
-DIST owned_ttf_parser-0.21.0.crate 150905 BLAKE2B bba92f6d3132cde819effb6113bff62cbff995d31022c25459c03bf540542b05223fce80ac0190666ae6fad97d30c0d4d78a29dc963223407dbc6dac40e84583 SHA512 008e6fdac983be66909358bd2b44b540e9c13002cd1b062a6e0d93f04d9dc059dff8b5904d93c9ae83dd08cea01238d4431c9542ae6ccbd7c19105610ebeb6e8
 DIST owned_ttf_parser-0.24.0.crate 151052 BLAKE2B 4c2b83750a2ecdbb2431a18d44b6aab9043068abadb58c5d210258c99ad7bbb2a7792619a83757fd3ea5b310aa01d67a8622c6edcb1a93c32960f1c85b45ff20 SHA512 d2f57c7e5d99ad1ce08068759d0076dbb4e27247cdb07638e5e02f34c395f0ec6fe655148f59902be07512b6faf2f4a5968933daf8d44d65e8c3b432079c82ce
 DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
@@ -388,31 +448,38 @@ DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772
 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 png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
 DIST polling-3.7.1.crate 57979 BLAKE2B 7b2d5ce0b6a5e20037186c76813857a94c8162f78ee8a0378892df5ba7acfc8b4f1a842eb744ff096956091719462e7a0bd26cd48f05d54e08b7c16db4f39972 SHA512 0bb5e9f51fda85cf3e93b6d190127fec3f0df31d77062f38a23e3788ae604e0e3d6662b74d019041df8a8ea114ebb6c5c165efd9fed1f598a34ad54287cdb566
 DIST pollster-0.3.0.crate 9436 BLAKE2B 5d61b6eeca2bb5eb58728f644cdca2e2090d2b2b719534f55c3c22648c2f9e95ef4b0c42cd0b99aac600f953de49c4001579e4f67edec38530e298a2e3717d80 SHA512 f528a948a912af3d296adbd87fb7f207754fb1464fbad145c906572e205cda82c70c356cd47dc57edc5920e1e4383a2b1fcdae471ba9e35b1733f506e3692038
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
+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.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST presser-0.3.1.crate 20946 BLAKE2B 270c86e5b21e660c68fc5c4f6780371041dcb161bc2c3044e80f16bf9ee09bdfca900d2b7813679bf44ad00147df457f73687dd822e8a2af3a707f63bda553a6 SHA512 d21b42169dd0769b2910b04059aa9b920a98fb6487184d61de6e94e1891e49bcf75dd89012554bf2a5fb748d2322a87b24d8a733c34f6294b07b00fd76cf397c
 DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
 DIST prettyplease-0.2.20.crate 57809 BLAKE2B 7c0b96177508fb61f76e45cb1df901f09a48611494d807acde17fede4c62f79053a09737ab6d31562bb60edfb2edc43028e62a2c4136ed799ab247086531db46 SHA512 fd6aa2cfbbb953227653eb5cc9f48d8ae6a7120026144578a9250397511416af461fff9b3f4a0fcf565d9ae589d4c0ed7523951ef36c491270d740efb61427ec
+DIST prettyplease-0.2.22.crate 58169 BLAKE2B 74b78f69b167d253643780b007726afde3a272c68b334b2b610d14bca1a2b02ece1b92f793341990a401b71357a858c4c9bf6c0bf965c61bc22a0a2cce84903e SHA512 bd3a3ed1395fb1e2eaff6231a9c54ce68ddd4be2cc30a6a871e32c943f7201b5c0956b16b3c478872daa521b92424060012d90be9bb45199e19e0b65860e7c18
 DIST primal-check-0.3.4.crate 8743 BLAKE2B 0458690ae314e1635ae66a4b35f8967d364950b83b29ecc6a826d7fd3fca95cf434995db02cd84e459f754c0a101a6abe20b6b6cd7311703200817a8e3e53a0e SHA512 8dfd2c5847fc23250f9a96c3c7d8a4d250f7b61781218829b71bef0f2779b2e56b93284bfd5ea3666c78681560326fa00982590aaaf8b96dfb5f402a24a52489
 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-hack-0.5.20+deprecated.crate 15045 BLAKE2B fb7b9fa57ad64f2920e801482bfccc762bb7b2c8c1db7da32f393c7b47414fab37234c8a408a4ca9d7072a541df22b07775fc509f76f352fb6be9fe822f84dfd SHA512 278e786f8e0c93e346de900666b3d55d366324167a2e5e553565870c4444bfe661cf8c151a29cbd3176a4905ec49d69cffb81ae1e4a129f30404f930972c4b43
-DIST proc-macro2-1.0.85.crate 48988 BLAKE2B 236f2a07c758d0d8628f003b70d4b25d5f0d2bd8cbd3955fc4262d7d9b271c6571eb0fc45c95fd816b426a84ed5ec5dfeb81d8041d4de955cce6f3b9fceda1f1 SHA512 54c61dd0581bb5802e077a58fa41f113aa1fab59026478268ece293f2643921b7649844c1675a21a3a21674cdb3ccf94928e5bd069a02bf6813ccc1114d37262
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST profiling-1.0.14.crate 14259 BLAKE2B 2bfbcfe1f90135fe032ddff58c172bdff156674a1de94b286f37ac30a293b10e818d45c0516223a33d428f2886dff414f8e58f56cc8c2da436cc6afbc584ed63 SHA512 a25f8ec03c784126be2106cf478284002cec48b4969e1b959418262c0e2d594764b98aefe0d25d1244ad9c27080e15e3633d6eebfe3342994199964678f24db3
 DIST profiling-procmacros-1.0.14.crate 5958 BLAKE2B 510fe173c8b7c553af20b6eaae0454b3a8a01f1657bf15082f24271295dff157db1f7008debe234bbbafef9b6727651d0e9234bd7b10b91b1c1442a2801d5c4d SHA512 1fd6fd545b5f1e7cabd59cde635595d60335ef2e558bd286296e57747f347d9340196c88cc5eb71748f8510b2afcf4120bc81a01bc2937bcd52e4b7d632bf9bb
 DIST psl-types-2.0.11.crate 7959 BLAKE2B 287a71add0c75af1266fa1e4089da8f82c8b64e3ae1e880b3a71ebef5fe43bce3bf50f6378a228e131cf857a4cc29f3ff37c2b08b62896196a3e86ef82b1128c SHA512 c609f6a414bc1f5f98c22f9ca73e3908ddaf10e33ef43f408ab8ae2f8c544c0f70cc1a73b1fcfa20ea53f2225f60922f6d28d2e5d31a9877550c2ef3520ee2b7
 DIST publicsuffix-2.2.3.crate 87807 BLAKE2B d2ce617f07f34e5d01cd3257c53c77441dfa537d827a00992cb9e2c46531a0523b506350f85401bd50fbaa7a2af9afd2dd290671dff4ae407bcd6d8dc725185c SHA512 b6455e8d657df9f9f6fcf8a26a26b8753450b53f1ba92bef637886b6ff2c1e0273aff96f53e7fd0c6a9a495518be00f6d8f05dab0c1d76ae7e1d8481b9bbb8a4
 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.0.crate 183905 BLAKE2B 645e89e714ac5058fbd19b4b2ed75aa02688dfaf220befb8828a25776833d4e40f5f546161a46f38196341cfa68ad1cefeec81d0653ab9cf5e163dee5eb0a365 SHA512 7b9548f9baa5aee3323c34ef539400fbc4b2b95433ec5aba2d1b0a488615cd80c1a9bfc2b32ca4b320518a4cc9093bdde1c3bcece3fb5debd0d80ee682a47eb0
+DIST quick-xml-0.36.1.crate 185352 BLAKE2B 0ad31fb7210bb9c71ee480d400d10c01e02fdc509ccc275305cdabe29aa7d3816ffc7854371e493d3b4b28d43452bf7ef393f7ba4ca556d311cc83f7887ee802 SHA512 21233a50b5ec45db623d4043e03962a19f10cae36fcf3074c32eec3c007a59310ab884352b6c880632535164745fbbf2985d27cd549d50b509f97395a0d48248
 DIST quinn-0.11.2.crate 73920 BLAKE2B 47e02fccd1a6cf85cf88767335dfd1236235652acc2136723175daca0c210a8ab31da90fddcc8cdd150adcb9768592ef8e7f1f0ae0f6273b6f24ce709224b045 SHA512 b6aa9effa35da2d595fb7fb7a91c61d2048a7ba54dd0449c20602c1986b49c80945dd6fda6d84a2a68c1d3be5ebd10c6594192c42976c4994c1c86405cb20063
 DIST quinn-proto-0.11.3.crate 202348 BLAKE2B 57f3c2121d21b592c90094d1e5bed6a53b7d62af32c6422b9edecd3252fddb03a354cb6879e8036b937494c53c0a7626d1da8a715ed16af76d797cbb038aa6f0 SHA512 9e8665eabb27dc3aa06008f3436fd837bf854a45b5852336a6c8a7dc447207c08bb94f4710bd1ce99dbc35aae876d467079547fca2fe79abbd0542c1e2d8e5d6
 DIST quinn-udp-0.5.2.crate 21918 BLAKE2B 980c98cd0104864b44093adb653d5e01d5e32b2aa1187fc502a73b1c002637251cfce2d21ccd9f1127e695197509c74d1de30a959d4d92c34b584744dd24d425 SHA512 6d0ee17a65175174f6ee542f7dbbfe6dcd80a43a27be4213ec500fb95f59ffb571904f6f3179f67474faac3c1118841df9f42fe769bfbb119363f4707473cb20
 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
@@ -426,6 +493,7 @@ DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea7
 DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
 DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
+DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 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-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
@@ -434,14 +502,15 @@ DIST regress-0.10.0.crate 329828 BLAKE2B 1de91933e041737579edfbe9471fee10dd3cc95
 DIST renderdoc-0.12.1.crate 42334 BLAKE2B a964705c16d7cf30ba15740b5cbffb85be8511279890c8a19304e55d832be1a50a7fe3a0d39eb08794fc1f3f51ffe034ffecb717cf0307861f8e47f04666f61e SHA512 e6be1af1828e06a8413b9b485000e93b89d1002dee7b43df4baa7bfbc80b2ead98178b8418311d00f565d1a3412f3f8026a4415f94ba3483c8623f458964b252
 DIST renderdoc-sys-1.1.0.crate 10366 BLAKE2B b8a45b84ed2d258c684b8056eee7f699bbf2381034aefcf77df0481c3f07a0705b46ab89d462d515bec752f22de689ede3535be5e826a75b84adba54ade51abe SHA512 a9535ffe9fb0a7c38133a834419f5b1f9b866e116569e0f31f2238145a63e1392d4f24186504cbf40bc67521842c1a977c0dcc53f5a12f45366b6c44484a64c9
 DIST reqwest-0.12.5.crate 177108 BLAKE2B 57d8af4b528339f05fda286cfdfff4463ddce2ca206c2bb01316fa7f12201ccd1eca8d8c4af0297a3d6547d94912d2dfad2193b633737f35022d438ebe21d8d8 SHA512 19ded1f2251ab7308533b670ed57f33f2f8ad59fd937267e55ff92a15d72efa3c091c4cd2eb1b8d2e8be3a7cb652dcdbd9f6954cfcf218c834107693557a3824
+DIST reqwest-0.12.7.crate 176918 BLAKE2B 9e74056a0b317cc6dcebc8200994ca7f843cbf7b15b09ae897aab757e28a6afda97960abdac027fa343d4401b8737368e4ed71387244dc533c3f89aeba141f48 SHA512 49c513cb272e2f7f1065455f8497f792a57fe66efdd1a7400107232befb0e31a4088574080987ce9f0b2bc8ac757db89a0c5988fa5178ca6eac5c85f647192f4
 DIST rfd-0.14.1.crate 50342 BLAKE2B 605a73c7419bdfbf67fe05307ed9e7105c5861640e9adec59cb0b71606df94953eea8c2d96d4a3813af9b4a750566ffa558199ff8bb1203e579ad9e226dd9bae SHA512 ea2b7182a44097161a5d6d99f1b770d38539c8d7b34c2c4064a8da2e5d8440a242c6f658dc0de82b82f60c4b43a52c6b7d72ad5d930248f7871715a46686a8c2
+DIST rfd-42dcc7d61fc5e278b4ed76bb9720ba4d89266f01.gh.tar.gz 65500 BLAKE2B 2cc5bc0a26ce25b28f8d699ea3686c62c162cc88b396aa571409b19218b11a3bc3fd50c9200c34858f4a73d634a59900a575017074511b14f1692a1edbdbcc9a SHA512 3a9071e06381a0f311d31282aad02efbb4571330cc047033d09e0606dc7c36a366419ffa9130176aad58d3c6139e2c2d938e1f2d056ada3752f6e4d0821d5efa
 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
-DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST ron-0.8.1.crate 63251 BLAKE2B 9d9724cff8df112c1590c0e66e897a277a7bf8a180849db4e8834151fb53639d424e19124cc9f3a5c4f977d49c824686c73f337e9ef0f0355acae2b1b43a4d14 SHA512 d0d9eb18632c2458dd3e8fa8ff365a818e5214c88a19c11421c208c31ebd75236bb20fd74ea84942f8e71bfbb02d660f965dd1447318b5372bd16d45d11fb920
 DIST roxmltree-0.19.0.crate 53547 BLAKE2B 0bf23bb050dec29cdfcd66bb231ea81caab40aa54b015c5480fde7dac899128438ecfb10d818dde456db8ec4cbeebc7f32f3c8ff17594b6a78c0f04f0361555f SHA512 c8eeb974d797316a8dc332c4068b2850eee124a13b0792cdc8acaefe521d8b40161f9159bbfee2866ab2c4f6133ceaaa1b5ed704a5f0db5ae3819d76042cbf36
-DIST ruffle-nightly-2024-06-22.tar.gz 92034697 BLAKE2B 29950da8ca4317a3b8cd61b6a6ce07ae08794a372dd59e540579ee6a8ad76c3eb2ae496bbe5c0b34b319e7a90a059247e570598ea71d6163854664b0cafe8d51 SHA512 12583c014eb58e3f3f1fb54db26e3528d4a6f22e6f3e3c0de90a88a1cc1142b9276919b1a25c33afa314005ae631810d64cb36c36bea5d8df11c64a990519f81
+DIST roxmltree-0.20.0.crate 54594 BLAKE2B 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603 SHA512 f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
 DIST ruffle-nightly-2024-07-22.tar.gz 92822247 BLAKE2B 8065a470b8d20794bf2ace2442c73dc6fbf11350db2b227ef57224387b06c8fc6506e0af8a64f261359a2541606bcce6259ec3a264fa52c9606164434c16cb5d SHA512 1dfbbf5e26e1d69088ccd29f8e4cd009f49c47ecc650a808820d208035815b06e3da10f837caa538c0c66a6fe5de1c6e80db40934dae0b64a8d375ea174f4465
-DIST rust-flash-lso-2f770555ea49c6db49c57c1dd46c7cc686e8dacc.gh.tar.gz 688059 BLAKE2B ddb791fa4c455a21d0de0c7e27a61658517f52b672d850a9da08498bfebba4ae054663b9171722617051b61e7a962a2b90be04ef168f53512a35f58ae9e84104 SHA512 6c231443267464760fab0a534c7dfc5cb8bc45cc722201133bd178eb40785ef126341b8a61b80813f6532142290ae8f7033994834f933a3fd0fabb6d02ad2a74
+DIST ruffle-nightly-2024-09-02.tar.gz 93417248 BLAKE2B 6ff7e15bfed5cae43b92d709db4da8af3f212f2dd040f3d9c24268e1c11e154887e44a762101501029c5f59039a432eaf5062ef2011581b0660b94571cb65080 SHA512 ec5dfe5092f8c14d3b6fc8fff53bd7f445bfe2b9f05162f3f1189b1864f35e2e86caa6ca7869d1f75be4a4d89c207d8a75ec53d3eaa027faa7686b527b8f8c94
 DIST rust-flash-lso-f9e3de59a86df1c954fecba6b4b752df61cad73a.gh.tar.gz 686089 BLAKE2B 7cc3dffbb9e57b39611649bfd034bb23dee8a6bd113bd871017966e81c4ddab876c89bf7f129e90b7e7dbd58190e71e72a602fa5d43dffb4f55b3ff2d53a7e88 SHA512 8f60c3c68f40d1138c0342819515ce29f8d2d9171b1aa19ce26b2233be97e336bf2743f55bf72f0284e2635b1fa42f7de9a940b11e50a06970224ddc9d730705
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
@@ -450,12 +519,17 @@ DIST rustdct-0.7.1.crate 41849 BLAKE2B ee952bade816e4bd1fb44f8b95288b5b7c34efe8b
 DIST rustfft-6.2.0.crate 363170 BLAKE2B fb77c741b16d7dd833901914e91e5fdfc297639a91f97e47746a19b678bf12bd408327635f0ae3008113cbdb89b4b5ad606f55f67e835535837f560ea1642bd5 SHA512 c8f4bbf66f3c7c990af36bacd65240bca2c6334cb7139a3f92790e66ffcb5ea62757a469a7aff56ef602a79ebf2f860dc017a1ef8bd5a896f8383183f3b179ec
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustls-0.23.10.crate 424689 BLAKE2B 9258b0cb14b7f10b583e3a1cae5b3a645c2f79cc6aec445432a52ef75b35607760977089ccbf62d62a60d18f5908400d9960484aba8864e634d52c2b7372cbe5 SHA512 eeabefd525abeb1b87024494bc0691832eececf8a39a6207efef096f1d061aa99403bf09568a2de95d1cf11b51a67834e418f4d761d64eedc9da73ffab67e278
+DIST rustls-0.23.12.crate 438443 BLAKE2B 638ed38c62f807d1a28cd880a8664e09e0ef25ef038f93c6b8f5512e1864d60f2bc8a83e00907f9ee36e543bbbd9e5b6f5a0ff7fb57770619864298d32c31bd7 SHA512 49b7fb3dc02e9ded96718d064a121629dffeded6affbe8dd8a41283be62c99244b23208205a1821d83b557200b017d26589d4f42a0048b2cbd70156dcbbb8b94
 DIST rustls-pemfile-2.1.2.crate 25928 BLAKE2B 790545dd6347badda8f67bbe67b8d4d7de9f24c134857840d7ba2335f2755cf03c05b26c16c8b1e397b3257cd39a6d3a333103c2c3ea32ccf4118bc3d42995c2 SHA512 35127c68250c31f2fd6924355ec37d5318d8a86ad38da48e68b3ea6e241deeb019eb967c510e95230be6d6c3357b0a85aa022942d21a50423632f8e2496177cb
+DIST rustls-pemfile-2.1.3.crate 26757 BLAKE2B 421c0e829d28d94fed3356195ad0628f7f79cf8c25a56a5699df6c385d437dbfff2abf6bbf8b63af28658819f225d2728805ea0c7111e572fb2bff0523d31e42 SHA512 94b98d05783ed0920c9ef89259e740ca77f8fecb4ce4ee894b7ba30acb0fe82f41cb2681b5eddedf8e3ba7c68d1dd740132a39028a99ce2e1070d7d88d99d641
 DIST rustls-pki-types-1.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83edf487a6a940e1bc8937c3ed7900cac590674bf2c5a5edac6055a2bdf763b132d4624a8c51caf0250d5055ce5e8f4bc5eb SHA512 5502795aebd7058084d0e30d6c09befc4182493113207f539a8d42006d4189158e9028245aa627d6943a88514b6292fbd56b5ea1abef8c83a429bf6d641f6f11
+DIST rustls-pki-types-1.8.0.crate 29562 BLAKE2B 933e281d6f4725717c09699cbc73368b7212745df7900e9242dfb872edbf6908faf417b5684c843af8b37a198dc4104de279bec0d72d2c43581f837a62f67683 SHA512 f8a223b904c224e4aae9f06046280f3f9daacb50d1456f8ea2911cc7174a4b8317f86e4ea5431a29c0ad8dcef44bae53c20bc88ffd9dd72bf83161289bb65e04
 DIST rustls-webpki-0.102.4.crate 200657 BLAKE2B 7d6c27ee182e5b92fef74504d9331c476861b1ef6f67df44b31382d3bebe3c2c1ed666fa535b2a213ad602449fdd23d0ad1a7b89332efeb950686ab6065278a7 SHA512 f5fd01401b74ce3bd3fee6228fa01c29f0ad005eff0314ec19ca9cafe401b056270545b239050cbd72fd22b64a5376bb1d1c3cc5e29303c7d502d5983513d8f6
+DIST rustls-webpki-0.102.6.crate 201331 BLAKE2B 9802401ac0134a4c6b2ae7d72ad73126dfb271458a9ced5128c4fe7919ec64b5d68be13b5abf9ca9f666052c462bac112c321cca3b54c1b615224fcabb1bca3a SHA512 83ed70c4ca8e0714b363bf76c04281fafac08788bb5f283b87c21eb6d5b3bbb9ebd21a62dd9e1eea89d41f1557f953486e1160c5e7eb02b693bec3745a9603c5
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST safe_arch-0.7.1.crate 76930 BLAKE2B 7083fbf6b390dd238f22c499b725cdeb21fd07fe1b17a6fda183ae2cccaec22659dc6c154f4b0dbb902648588a77e0c457c79dfbe3f3fc4029a912e2fb1249bc SHA512 99c9c076c046a29bd8c6430b41ff37e3604490b9cd83ce69edd289ea22b511f1e70ed477164d5edae650fb933a7fb01713ca7a5b3dace5df793a4e80c3154ece
+DIST safe_arch-0.7.2.crate 74949 BLAKE2B 93051082e7c3d1c80aa0f7ecff17d80470baadec310a54bebc45680da726bd2f17f362337458413f1f8a15d4adda03d68b499cfea413b328e5b8e8dcc134913b SHA512 4baa60bf3888b7d7efca8e62288bd62a15668b3a74b07ae79557ad518ceacc87d5bedfa87637f0a384064374aa8ae63aa95edc56c04f083ffba7d0b880194ddc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
@@ -463,15 +537,16 @@ DIST sctk-adwaita-0.8.1.crate 53712 BLAKE2B 2d54470cc5b8f3c6bbca1cec1760c5e64797
 DIST self_cell-0.10.3.crate 7308 BLAKE2B a7297b9926d4351d4235e5fcc4084929751a0bed37598729ac519f23150464b6369ac055d3218f3ef101c9ebcd7b1b74e03581051d773493e7ff5f11e369f06d SHA512 4806034b1d28cfbdc1d47f32ca0bf9c5a87903d186bfdcab7d79664a1604ebaf8f709ac9e618af81323b247d0eede1e7dd8b113cfaf7a602250aa689bd2b2b6c
 DIST self_cell-1.0.4.crate 15220 BLAKE2B 9a617058652ab2a2e92434b6eef58a813ce0be5afed9525c4d4c819c25c7cd87aaa12d129c8c4ca9d74c3ea33d81e9dd295f121887070364185b9ab33021544c SHA512 042467e5f3ac0305e2a634df0b9a9379e92b54813e05c3a7652d5327a4a9a784f49e897c968c5c7a87017284d42a889b5420ad18e97ea84183e0283a46dc907a
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde-wasm-bindgen-0.6.5.crate 21098 BLAKE2B 34b7a66752422c21031fb21202c8405c43a1e6758eb067b4fafeb24f812280e70bf16c27bbcfa4b4b5723e369bca81e42020677787a79277f32f71eaab6822fd SHA512 c457b1e8c83760d94eaf8eb49169cd620cc1fd8246af8953503c2bea9c4ae916f3de3b9070bfd4102a713f8d843b6ee96404e27b21a48c589b444aae0f9303b1
-DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-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.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
+DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
 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 serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
@@ -480,6 +555,7 @@ DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997
 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 similar-2.5.0.crate 51648 BLAKE2B 43515b3014ff75e2a94debb0e40a081d60dfa371bc3bc3b3a7944cfbf2e326a8a56c6aa26ca2b6f9ab6f32929a89da673ec2fd4f037c07f8ff91ca95a77b1fe1 SHA512 7206380b6e4eb496b1dddc4501ac03d716bd6b5228971a35ca71f507940e799410dffad7e50e52c6f8fcd43c570ecef23220962fb057100665343498a5ce118f
+DIST similar-2.6.0.crate 51659 BLAKE2B cfd3fd530a1bb99d63a071f34b7db55210edc3a4568b45a39ad67a0f9c1ba7fe7619a5c78f452732f698cc2f4df8e2e90d174c469e103338a70af016c030499d SHA512 cad3a5fafe3ab0c8eb08d87f982d7d93b9e65a714e3a313db92eb4e3b2c539657bdb7df4bb71597300b690248f45013401ab83f949fa8410606648e2ccb87e0e
 DIST simple_asn1-0.6.2.crate 15992 BLAKE2B 3abf422412f51d0f8d3440c245792b817eb3333d58f27146109f11278b8eac4b49898264e266de3d00816319aaa822eeb0d1115e46f96f2c9a971b41a3edce0c SHA512 b2ad0042a4492f8cfdbf475b52c87431dccb91444ba3ed026adc488c844d1182a6ec88fc833b5dc0c2ebfdd6194c5b49289af71c151822228b8ecf89251ee9ae
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080
@@ -496,24 +572,28 @@ DIST strength_reduce-0.2.4.crate 17859 BLAKE2B 63ad1af9698ed3ced72f7c0e6d8c62ec3
 DIST strict-num-0.1.1.crate 5104 BLAKE2B ca255ac7afce45b8e2dec87cbe080730959315f753c69bacf1c941617d5c3513e57532494409bec29acc73928291baf98413cff6d0686ced10804ada2a26d361 SHA512 27ced0b3110094b3d8a22b60c67980b7416debe5a22b0416a025dcfc8264fbc1ada1ff73362383ec605c36d682245b2dface093cb6152852f4d4b28705f8a197
 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 symphonia-0.5.4.crate 12039 BLAKE2B 9bd9230cad0011a014471ed2e01160a2ac7e31383345e7befdb7e7d44197e12d8de86e9c399743760f79245d85214b6ac99a1209c06e899d1e1044e6e32f6c60 SHA512 fba7aee862ea3225790d6e527f7253a08c3d735e4d3eed8812c551b2fe180bec116bceb1f4718ffd1af53e48156b4f4cbdefe75657ca1487481757f7e8cb9d13
 DIST symphonia-bundle-mp3-0.5.4.crate 60104 BLAKE2B 1d7a86ee6092c706be3b622326615d161a48aebf16dea96768cf986fc9f7b295a59fdf85b47495d3444e05667d619940220df8c73f7f5a114897fb4257ff2c61 SHA512 19b2132af39be9ae7d74ef0141a637db0a0f3d4df6405331bc928a6bdffefd783e16fb75f60adc08e0235034a9862228355871b30d2adbf4d412a539e7843d56
 DIST symphonia-core-0.5.4.crate 98029 BLAKE2B f65a92cbde4b91865d088c7a7727fedffda325450281ab98f8ec93b1866d88e2ae6ec8bb25ced31a716537d664298f82658914d02c729af9f9bcad0bfa8bd160 SHA512 3f2265b9eecf405d699779d66014017f6654452607e62462bdf7914fee51d812c63773d0d22f78fa099df67a11aef375bf1859258ce1ecfb07a45c175c686888
 DIST symphonia-metadata-0.5.4.crate 23343 BLAKE2B 2861b684047bddd0f4a524be213fc15b1287d9301563ee862a1fa69f50eaf6df07357616c33ace46066373c55868ed7b40655630051e0215ed230a11e2e34d20 SHA512 b1c0f37008d7ef5d21f7da5a93fc68920c0606d9745e79a7f0b9120b3d92e5fcc75a67bb5c0528c9647730fa4212b6a589e3ac299ce3bfa5e9641c1de0bef18f
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
 DIST syn-2.0.71.crate 266398 BLAKE2B 78760c9965b59e14ab5d97e83c4dabdba99cd1933b66350c7d5c5f9e55f34fe68207597b51aeb023b211a065d986889655ab701b94347397ca6856a4fcbcdc85 SHA512 cf6264bc148ec550d943d7d146c7360a7d753e37ef553e6d0c6dc265bf516084530a5617f6826069275cc6f71d9f820014f7d92f04356ae964df8b79edaf7bbe
+DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36c2f595747edc65c0d2a05e9d8e4e9fb6dbb30da8264c7db36b1cea14110201bb06e40bca69b25c3f79f1c SHA512 c633b9f68e67b3cbf2432d3648e42f8d92403877a0128becd22cb108c0cfab9f1bc6b941b9cde225d8b727890e9f86457fad05b544fd07be4c01c2e60a2cdeaa
 DIST sync_wrapper-1.0.1.crate 6939 BLAKE2B 5ba3017c80445090b5d1d4c4deb5a639df89a9f58069e136963e52799f8327cd65f9191911d3243e760936c06bdd29884381c375054e1ed3a07ab44b86d7b89e SHA512 9b83ff2f3d379ab955c16279227c7bc4f5c00d3f1541e5a525e8f89cb14499a02c0e8e9ccfbfc16bc59213385f837ea206d4c09116d231d143b6f8b3d769002c
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST sys-locale-0.3.1.crate 15681 BLAKE2B c60d11812280b8e0c1e5a753c7867351deaa43d26bb3ce0b381f56c2f375ec8db2755636131a13fadd79aa6d90b75c5834dbf52848b9ca50c1ecc5b627fc640a SHA512 c06ff352d5beb9d214f08e82b8d49acd8b83114e6b88c9685f0694d42bba079215e6afd1c5c75a8e8bfbcc72d99cb01de7a3d8f160196adb6db9c34bcf1a1ebd
 DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f
+DIST system-configuration-0.6.1.crate 17935 BLAKE2B 9f4d8f60b3b000995b39f9c3a2ab56e6587293dd64c26558763203bde641adf57ce1dc5107b4f73b392daf3997038309e02b3da8c6bb0e4beccc0732becd0333 SHA512 ba7eddeba87d22206c250908f0158120b4984750cf7b2b8d57a50a32b323d3346321c8f2bab726c1d7ad97fc5da0b19d663c0e2db27ff74e3889463639a4ec89
 DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34
+DIST system-configuration-sys-0.6.0.crate 11090 BLAKE2B 2bc38fa55070e33e762cba4baa7e1f5a637e625c150a821bfdf99c60d08343e83cc26a302f4f70a44cee967bd8b4784caacc15436df82d10e05751831b46c1e6 SHA512 02b1693b8c18ae3484e366a7f7395a31902a026e0864a8ffc7643c7b4a856f912f58f2ec19ba52a50d0d1dc09a806888fa1f3222e1af1f65b8a16eedcc966234
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
+DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
-DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
 DIST thiserror-1.0.62.crate 21323 BLAKE2B fd2061bc5e7ea7ba43ed59c355c8cdbbcf416b189d0b2a3c33f725c270c1d0a8c6ca18ae538bc7d4634166ba747172c32be98b8139bd333a7522aa35730bed7b SHA512 29efa072b31e63e78a3e31fe84758fabbe7337d3e7338be4e4bfd35c8b083b53dc3cb68be78aaddf80eebabe301de00e2ee1908c7b00dd5a2168b0b66d8edffc
-DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.62.crate 16047 BLAKE2B 63a1fe66d3dadec304b9ecc241cfd71a6b278081336f4377fd435c9f959997bd0e0b0de2b5c318ad60d747f1fcf27df0f03932ba63f1288491f9935d3ebba735 SHA512 5f852f4b37af396336a941ec9f0340d93c8c70bc39f0a2cdfae3c20f180e06e51b4590a7535ddbcb87a792eba7e52ef9274019a98ee870f1eaf1b3b7cadf3303
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
@@ -524,19 +604,26 @@ DIST tiny-skia-0.11.4.crate 201082 BLAKE2B fe350137665e6229ea707bedbb535b8d5c3fd
 DIST tiny-skia-path-0.11.4.crate 47764 BLAKE2B 55b76adc467fb4c063ac2136271c353b92254f20a68e5205395081582c624481687bc319845e217868e5f2c54ef320728d0b2ddefe32fab1a17b90882168c2dd SHA512 723557dcb08cbdbc4d442ccfbba38481b922e367cec07fa23957f9271a96d1c656fd46bb0e0b5609686e5c830d1a988b0e209f57d0765d0afa738e5b2b0d8dc8
 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.38.0.crate 774094 BLAKE2B c7d85234ed0de32526246d2ecb52b70b1c4b81681c6b26aeec256090b4aafb41a9173dbe754a5716baecf2c45d9e3cc02fa375fbb343da09e728890b0194b9ff SHA512 4bc16fe979f2261cb17f007ce8ebb05b915be79c1000c5c429744cab01755b933908aadba0005c84faba6bf5d486ae6e3aae6c8f9bf0d6a5dc0ab6d0390ebae9
+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-rustls-0.26.0.crate 34253 BLAKE2B faec8cf5b55c5b68549659e82e656d63181b8384d170690b8a22e00b9b7bf4f63cf3f2a0c7a78ed7adc9122253765cf8aa0adebfe620f642f08268ba66ba610e SHA512 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
 DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
 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.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.14.crate 103761 BLAKE2B 54acbfda77cb071d280790bdf167a9a7a3fc6c8297ef96c5a82d55c93fb036c0ed167fcfd380d558fba3602bfad26080947e6477a6011819795d2debb74e8d14 SHA512 fef6ca35315482f635bfe35c2c6753d09f9bd33681d8f032f448fb9c6f494d30fc5789d96f99657879be9fdd7b35a640d52fce7722fc6ca05d8b9d5ed91903c4
 DIST toml_edit-0.22.15.crate 104053 BLAKE2B 7a7be39a9691f555824ba7b009082cd5058fd0e73b9d79bfe0bdc0a90571e396f00c0075064587e21c14fa82b124b273129ea992e566182316e7bcb0918f9bc8 SHA512 94d2ad3007ae64afff8f2ccd5452c2404e44e522daae699c98b0144473e7493fcd6e57c9d649b20065a056ea567138a8a516366ec3f19f6d47fa5b42cbb32047
+DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
 DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
 DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e
+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 tower-service-0.3.3.crate 6950 BLAKE2B 32ca66bff783eeb015af982b539acb63c9d426b931832b27aa45088382712df3894132a9e6e96fe1ed9d0f9e582b7a25b33e0ab73711acb06b4e134e69158452 SHA512 770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
 DIST tracing-appender-0.2.3.crate 21964 BLAKE2B 7e2e9b759d876731984dd6c7b802fce18b8f233f6d659a220e5f1b338abe928b8f869d1479278eecac2899985d578db0f60dfeb80a1b8eb774265f21fff960d8 SHA512 c00f22d85a29209ec59377dd2f8c9bdfba84a5153ac84e1551266837e30fb931e76d93239a09bd4a27fabaf822bcbfd88d27787d923bc809493b7030b5cdfc02
 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
@@ -549,8 +636,8 @@ DIST tracy-client-0.16.5.crate 20125 BLAKE2B 5627a92881ab34ebe5a493a809260039bee
 DIST tracy-client-sys-0.22.2.crate 308267 BLAKE2B a2f5b6250ed37dbeb526165ac365679d53e5800c8dbfb2780fefc517071f85ed139b5c92ff19ae7bd330d6c6662f3c19aa2d19b2a79d83156974357e458df8d4 SHA512 33fa9f8cfe02594b18dee50629f93f688eaa84fb136a2e526b5ae89ad287038a838726bca5d975197c22473a246fc0dfc7b29d7b2c7c385b78d2211cc8965633
 DIST transpose-0.2.3.crate 10913 BLAKE2B 5af25c7e404121acf68caaa5b4109f4f3cd56093575139ce54a68dc14bd2238ef1d3cd2c7626a1a9e860433b15d517b57af264dea1f16cd59827bfa3cc4e93f2 SHA512 1a624e7baf2c74da48489558f9327d935bde67812eec50e205a4060180612d7e6d7d18f18c1b118bd7b08650cd089d8c1574db3fbd504a6915c9cd3b4ec09b59
 DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
-DIST ttf-parser-0.21.1.crate 194876 BLAKE2B 8bf9f7528fdf091b656ad92ec55a5f0347428a12f75275f171be4f847fda6894f570345e7f8605db4557e8e3305f027263c59f203c5092ae70ecb250e4fe09eb SHA512 171b69853e131ae9bd9470e88f6a340def67246dcbb71a121121490fe91e4fdaa5ba0bdfc4a10da234d15c352fb6150dac945ec0eddbb5e6f1684293c917c991
 DIST ttf-parser-0.24.0.crate 197152 BLAKE2B 94ec3a575da2afe9ad309f2cc29f5c7e7860074e6b99b87d4f524d20e7667097974011591907c4a8e440523a21583e61fd3143a59b1a7fd6982902ff148ff49a SHA512 b9f1f3c9de6d3053e0d35dae303cb47dc2a10cbc2247f1f0231594793f7d281f5a920bbda4b62aeb6542ffb5ce63893fada26046f3bf47fef3fb55c6d9c60b7a
+DIST ttf-parser-0.24.1.crate 197588 BLAKE2B 35f3810eedc5beba64b2a2caeebf9bfe0a9c64612c2bf8d7b8fe2ef39bfeb1b487b65f20c1ca6441a6b706fa6a5ec34289e0d495673385350259d0da6fb81758 SHA512 af0ba0a48a48a4673a89ffe10a8e33c98f3ba30ae3021c2b2adcf3c78061abcc096a4c8a68b58baf7a14d33cad6f57b981c89716c1c14f766c487923246544c3
 DIST type-map-0.5.0.crate 3464 BLAKE2B 02eb7aec3b683842cbc2daecc5e778719a353c3f9fd24c76262c980acdac2a303b9156718bf7fc15e0ac66345bf1c04befbc218a358f55a97ae0d172390b5367 SHA512 9d35158412917abfd56833a365c32d06df1ce1b2de3411993a43a675833321d9b3120ae4432a4618a887cf087cffc3470b82786a1f67db29a90ebb7b2555012e
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST uds_windows-1.1.0.crate 17040 BLAKE2B c77914e150d2f0afc5c55680e28ba242238f4f1291948ae492fe63c16791e443ef33bafa6686cb753e53361ce452f2df27d2bf4088fb1ae203a47df3c55856bf SHA512 092c41f6fac2aacd5b83009b4aabe2cfc487cc1ad5ebc8237d9804aff0c5c823d3c079d99748e9ec3bb1c02b8a51f6a22e41441ec9a72c50600c08b1efdeb0ca
@@ -564,23 +651,24 @@ DIST unic-langid-macros-impl-0.9.5.crate 6238 BLAKE2B 0d5c78179689b4b9f4178f894a
 DIST unic-segment-0.9.0.crate 34848 BLAKE2B cf04b1d875ebc835758b17f8fa0937da8e47b5c3aa3d2389b9ee35160805b1a0696c3a654d68b60a515fd31dba0571b0a087e97f6815ebd075e1bfeefd0a623a SHA512 cc2a27459dca554a78ce24fee42f0e4d0fbac37c42b4c5a1275f9e3b412cd1c813a4b4864857ddc33b549d99f10c9ce9c277b00f9fa7d93f130f5e47106d8fb3
 DIST unic-ucd-segment-0.9.0.crate 39262 BLAKE2B 73a2f0bfeb17ee731c17e7eb4b7188a800fcd3745c5c6480916240d087df5a856e4f51556e1aaee1e6668b216377acdaf4879beee6b285da040f6871f0c04e6b SHA512 04aab71f97785453dce7f561acfb2382a23d60a68735f3664577015a256191463dd6b1f90694e4440c4889eb9b6380c16c7a0ec2dfc2d49fc44a284eeca43c09
 DIST unic-ucd-version-0.9.0.crate 2246 BLAKE2B c546ee182387db997e6cd699a25bc201fc943306d8e87f96edc1a3dc1cd5ab8ad96f34e8275721a5604765aa6fb6f81e3d8d9eae690d04e5ba71325a769b065b SHA512 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b
-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-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 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.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
 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 untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
 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 uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
 DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST vergen-8.3.1.crate 44665 BLAKE2B be409f3e469592d90fa1b839721b23c7d0bf6f23d04ad74ecb0ae275e44f2b7ad7ddf747180d0009ff6621830b26259f379abc85e89797a015a0d00e25eca26c SHA512 63da805fbe324eb7032d98d3c09e1f71b9f9cb4f9a69f2a7e4560442e7a83be37c7f558b7d3bdb4719b4350decb3a562bbbd8f2e8dfc180f8dc58907411df7c7
 DIST vergen-8.3.2.crate 44740 BLAKE2B ccc28c96d4f83884a6e8d06a1dce28dcc966f1af7b5bf039b535821a1fed2361bb52d1d03daf8f722efd43808cf39da4761ecd8a0038f2a192a93791a2615075 SHA512 4f20c80f74b9d8b8b7e706173573d5d017c4c76164c8895b5e11f8452e103fd550d98de4458df18c2f83aac614c56e097636345837509345e8cc4465260a8906
 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 vfs-0.12.0.crate 47059 BLAKE2B d830cb157cb9b4421b05ad1e59b90c27b33a6c8c0b4d9606ee403feeaa3042c5c2dd19b09ced94000618ed1431ba01e140780709fcf7543ffc621db3ac8feb7a SHA512 1f807681adf20357e4b944bbb1f42790b7134f136bd6b016a434141e7586864da964476486683be38915c35cd6b68ac870ab3decb97e4986381f729f82ee049a
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.2.crate 15852 BLAKE2B b21fbc0af440d3feac8ffb769f951f504e01f630d6f806d78a8f218eeb09ff8940328d6a9289e195deae9fdc43fdd55cfd037ae9c57b366ae57906b80d2f4785 SHA512 cd7e7b9e1953c70470d2f17210e83d28cd2c5ab8fc34ef0c9e06390e928853e375ed7bc2bda343b2f15820e989b5adc5bd33d9cea078716bc31545ff019435c8
@@ -588,11 +676,17 @@ 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 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 wasm-streams-0.4.0.crate 34328 BLAKE2B a29fc66c00b9fab42ba1691ddbc251bebba429837875989874073427cfcd2ed1874597d7f7a9f1097e0bab74a3cef04ba6d312ee9138a5cd973d71837a545d6c SHA512 9a729b183999bd5cd6a31e69014381371d7c750bd0ff5c3ef0b08682fa4563ad8de1a2db0901bfc53f6721269c937cfdc4742b34388829513dfee1337d30d60d
 DIST wayland-backend-0.3.4.crate 70797 BLAKE2B 6a2c10b13d60a4190ecd10d42f68d8fa57619b8417116ef75d5a8cd3cdb565ce5feb999508e5c00761ebb0bd7f93f91d2a0bdf7f007cf4d796d465e9ccf288d9 SHA512 576490d0e6c72927064c9a7bbaff06ff21271c11e1f6d5c408f7eaa8930d94ddba024dd55c377f482acb3a8a3335496d93fcdcdf7a51900fc885051153e68798
 DIST wayland-client-0.31.3.crate 63081 BLAKE2B e2a83874ebaf88dce2838d8427ee6beda8338cb5e3fee0e74c56887c7f67b6edd3b5e7e685570a9f5fec662d81cc811af355b031d93da0f81c28950f9522e895 SHA512 ae8d0a62a73e098bd54f681f5bb4ca24472baabcc1bca28c25f3e03d9e61c45c68fd4b3e60bea6b0a9d8e50f8d0dca45dacce9b7e58c48cc474366bf37ead565
@@ -602,22 +696,28 @@ DIST wayland-protocols-0.31.2.crate 147062 BLAKE2B 62d5ea52833d9edc661d405c83159
 DIST wayland-protocols-plasma-0.2.0.crate 59992 BLAKE2B e43993c207db0ab01c09ca2ad523adaefa1b07978fe2bf67c1e16a8d7e24f443e181a4ebaab2555bc45119d0c66a26ac4f91de932d13b3fe1c881d9bcf0a211a SHA512 d72a03ae0c34b9102567b584971714734aa97e0bd85a3447663a0f88b05bc06a295b1aabc46b6c92701e620c2af87ad6a321a5daddab0df08e7e09f1337f3cb6
 DIST wayland-protocols-wlr-0.2.0.crate 25804 BLAKE2B 226af653146d7eef2ee0a7b6d1484048c5f8b1d2618d3bb9d33eca7e019579c9868d42e5488ba8dc830457ca186a0aa07599accef22902b982d653e381b2f4ef SHA512 b1e5025dbe50a9b90bfd7a38d7564ea8a02c84c8c802d2200864dc604847a4b0979f8a0e05d8d76c2b7c1e198c7847e4d59ad49311b00ab2d4d36eceb776a16a
 DIST wayland-scanner-0.31.2.crate 35644 BLAKE2B ad2b169c790712a1eeea1662b4b520a4a216e267a20efcd1b193114b2c33fb081c5cf9c3141ed59f7f2f10f65bda4843865f5ce35731957814ee4522e1c737e5 SHA512 1cb46932758570a846dde02f88647cc0455a9919e6b3e50afe841891c598e587cbffdb25657be15341faac03df8883aced74d69f5c7e32e3916d6527e8b322a3
+DIST wayland-scanner-0.31.4.crate 35691 BLAKE2B e9c2cbf97719e7729892a777c37e865f22d22a6e1138d189a512c938e24ac710b6f431f7808c656facfb189a47a27564ccb6b687dcf3dc794b1ea87dfc8a6fc4 SHA512 44c41437a20e2f895e3330b4fe72eb6b7846a2287ce5f7e1f2aec1407cc324dc43549cbfc82aeaa23c69709e2c5c339b32aaf298b63ee675b8dded175ec7d0cc
 DIST wayland-sys-0.31.2.crate 8571 BLAKE2B caeda0bf863ae3313951daf8522e713469ebec7cb9c3db23a75eca2af17bad89ce9bd3dbf7f1ea634d88c57e780386e57ce46b54890e510a2fff6a7985d036a5 SHA512 d41d60cf38f376d4c96c1ac048958ec26a91172f6195638a6ac4209d757ea37ca4272614c7838341573ffd9f61007be8952b4b31654c84abca1032d2a10eaed6
 DIST weak-table-0.3.2.crate 23989 BLAKE2B f5b12d62704a86f77fabaac918d084a4f7471b52994307da20376d48264b811eaeffe2cae2f28ebeeefa4338c758516bcdba5d138cd7ac12ebfccc697009e167 SHA512 78936f2afca36575d3faa823ef4e621d7dea9e3eb4c8c3e1d66af296951fc25476dc8cbadae184322f6e1e8166410df617fe74794b2d3696d599bb2406499562
 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 web-time-0.2.4.crate 15743 BLAKE2B b0255c2d8742c736a2900e32422c439c90878b3bf883943bb6772b91ab13411fbe6617b7801434062b1529843c57d7debfc454cc7a67553c6247047e4def4413 SHA512 d52025a11a11e3286aa0fcd20639eac6cb93ac189b368419adc0ccd2045b288bee9df8c0042a65744a78700e4576f3055478fd52c5a5381088f9a6e28ca3e3c3
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST webbrowser-1.0.1.crate 39971 BLAKE2B e1760e23bf142af7548a071dda1347fe6e0432971973a2b28dee52970393a66efc81fd3971b5360719c0410012fb0e2638c04a2c475a991df23e5e8fe101efdf SHA512 21498156b080bc4e978f6cfb5df6dc07ab8b24c920d465b72c4777bfc4cde51deb3582aa48b5fd80f4cca75de8405020f077b65e851b9162123684302b171015
 DIST webpki-roots-0.26.2.crate 250806 BLAKE2B 7b236f9131044d53eeaa1b3b3cb8937c52ec9bb60b18a49500cd5a7a5b093a30dc8b7a92a697fe60a1bdba9c11fa59b7f593ada683ab32c0a0de28a2a0132ec1 SHA512 393869b21ed8afbd17a5764395c803dc896c696419c06cb2de4ccb2480ebbaa3219a00cd98b714e123b53497338b01698c956bcfe5c22a833ba5f889d384f467
+DIST webpki-roots-0.26.3.crate 248438 BLAKE2B a296c399ea8c03791a8026ff8df0e59d601fbad251468cfe054fd513f8e855e754dc7bd15a461000e42fd8ed2a02802721b843ed3613b600b92ff4b9af67db71 SHA512 339aecf2c4f1d88283db73988649834011564d82dd5eba0da2e2c6764d21908a94ff78ca8fc463c96b9cebd471aecda3cbbcf274b3beb640b5915a3ab2626f53
 DIST weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
 DIST wgpu-0.20.1.crate 145840 BLAKE2B a1ac06db64b59e9db9b02f39fe2f9d17396267e6e8fd09ec4b862cec7598608afab3a4c8aaea687be027e6e0aec40993bb964befc1976105c4aecac3fe98b666 SHA512 e38970af792c20cbe6fa417aa617faf474df5a99d163b1f90924f6988adf09f3263452f96d4472e71928b7f2d44297911bb30d19eafa497eaec49cf5493827a3
-DIST wgpu-core-0.21.0.crate 254674 BLAKE2B a2b6302cad63364bbad044c25e935d01b34653087b76655d49bf6fad9076910228be458cb7f074db63a3892647bbde9a7c85b4f53499efb151d8cffa8fc90156 SHA512 9b8d1261edb4c06abc1c891e0cc32bb35d3a03dec84fa8b0d97dabcb62c3c99695bff1c84ed105531418ccc71143985743eb5fedffe4836df1b9e08a83a22590
+DIST wgpu-22.1.0.crate 155280 BLAKE2B 1f3349fba3f4e744b68878f3c3babb19dc10841c40743ea331df10a8fda248a1982b00de605e1cda10dc188b9bc8bac660bbe663fa070e7aaeec64998baeb173 SHA512 4a98855f730fad4b29f370b6091eb31922e5c8ab03d725f3151eaff996952f32eb2c3396b7a6fb36088dd70c96408efefa25c27dda044889e44f585f7c60d866
 DIST wgpu-core-0.21.1.crate 252920 BLAKE2B 6e6f765142e7e5d65939591d35a3f863aef96e62bb19f06d614d6a38d557e2c36d04c338aa4e14b85552e28a5fdf60000c610a590b7b1d31a9e09331c378715d SHA512 08bc0bc1c938e1d9b8447419443f70a7d8b91b321fd4641246fcbbaecbe69e9b5660ce76a54ed65265e65ce1cfba7ec4c62491bc56dbc66e75cc86fa7e9e26a5
-DIST wgpu-hal-0.21.0.crate 312833 BLAKE2B e231de5055b869bf0afe6ea62f3ffa643ff0439e39f8c2a48eef5c34b09dce9d8f3eb40fb5d3c7b82b31892f2bf8f890e8a70abcd86397e6325040972fbebf30 SHA512 a6215a55a566144fd2322e8217eda58b4c08fb1a32b48efcf5cb673b3d1923bc1285dd5c2c4b664caaf3bb8c5afd39876928cd6843f34b7e814d71b0dfdb7c81
+DIST wgpu-core-22.1.0.crate 253755 BLAKE2B b88dbadfea3edf8d37c87c0d948dad3b752e39ec8deee98e7d1e70dd09b456bd8c8f4adb728592db40d90bc5a23c8d15cc857c2e7c9ae40fc164e790e3959537 SHA512 fb776fb83f798a41914b917da0e0eff6fd82f376d8d5a954288e96585e4458d86a727fdc53b86ddc75ee221f3ef27ca7d32acf31746a8022e13e7f91cca80402
 DIST wgpu-hal-0.21.1.crate 310971 BLAKE2B 8849617590fc30808c8ba312eb48bbe7ae37282308349ad96acb6db770d19e5a7d588a6cb7987b09c03159164286a2757c6174ced3bf30166012ff2022349a9e SHA512 e38eb475bd4edddf19cb24ec3128419fb3d49b8b974c595341dcf5e690aa713a1983b09f002c15deb4da87fdca692f56619bad0914a2b3c2801d495e4000e921
+DIST wgpu-hal-22.0.0.crate 317984 BLAKE2B cde25b9d84989e9392e14de50fd32e0ee684f761519eb6321190ec2c57163ebcb76dfd4587aa0b2b2d0475b6929635da0f3786c64ed77905d3503b2b5cb06e12 SHA512 0ff8765eebc8639e983b64bb2ea202e5a982776feec8df882ac09afa2c5f7d8195b6053acfef647435002f6876d213bfb531d072a623ed63276ad342531ecfbf
 DIST wgpu-types-0.20.0.crate 60828 BLAKE2B ae8b1dad28073b8fffb9df84ab23580cb6389fd4ff628fcac3496d42d495acab7aca356f01e4a87030bbec9c5f9107eb34e9e3cdb1f3cb62a406c5c71eac17ca SHA512 aa50bb23383c6e87622e7cb816216c51b893a9176683cb40075802f076c9fb66439809be47fa6843a2a3091f02dfc793e9c56361b1403e872eea7b19b98bc0c7
+DIST wgpu-types-22.0.0.crate 62297 BLAKE2B cfbdbee7dd8c474c94614f5334d1c7340d32b8103ce34be71fd677bb4bb8d94e7fea53a4d982e33cafad6022eff6b34a24e2417a0e267a188c74e313e57f9b1d SHA512 0648a125eb4add3cf083f8e1a9bc689c0bd1c38e4f89905b50b214280484d6328e1389fd049351ab2a19a759c4413e55bc96bd5a0c8b5c66e615683c55502dfe
 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
 DIST wide-0.7.24.crate 90130 BLAKE2B 06d836eb7fdb1e9e0b524508e5e93ff7907bb1e5ee8a29f0a952ab43aa89d1a60040ce10d93d32bbe615c22279995c00db908a6dea1fff6e16c66daf9e83f775 SHA512 e9699731af74bed33a627e7569c6b06cc77804560fee9efebb27e3ef69104377096ce9c9cb9dc9391e1c09be92151525ef8c29886ef260d50ad4d68ea1e3f01f
+DIST wide-0.7.28.crate 94236 BLAKE2B 1a8c496f488ea2d333dac5c3103f1512aa383d62d67f4d820c5384186cb356a804407a4facd38fbf6c66fd2719e4ab11f24a471a0957efc11043b1ebf7132672 SHA512 4bd4d6fd79c408deea64a97b7384ec51e63119c605434778d5a841fbf292df69f651e5fac58439cbb3960c8920767277fc2ee546a25d894041faed2a02c87a33
 DIST widestring-1.1.0.crate 85046 BLAKE2B 591f8ba6c3c45721d342fd4668805c19915d500b2b46b8e1e75a485ebc772db187acec791205415e5cbf288ee70299a5813a3185d933443d426eb61d7fc6003f SHA512 a4feb959e19d5238e89b0973f040b26849f896e7e9fd567d0e74fbb4972958a4dd76e74de5ea8d407b74cff28f20f9c80446488da6abdbee38aa87a94d683435
 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
@@ -627,57 +727,82 @@ DIST windows-0.52.0.crate 11843715 BLAKE2B 0d35225f5d61f71b0cb768f03825031101e05
 DIST windows-0.54.0.crate 11096265 BLAKE2B d9e2741577ef5a8cdd66ff0dc3de16d92b5005a43c4d521f9c9670ec15fdf0ef5f9656219695d80e2f9bc2ed51e31b5e3b867c484a00dae1a388b647f2eca6b9 SHA512 703d9de3d8624b9179e3b4aae24c8ba384c823d54e9f55133c9ae8bec8090019280674aa6c8e47872d91fb0f194c692ef5cbaff710714bddef12cf3fe98552db
 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-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.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.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
 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.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.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.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.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.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.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.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.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.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.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.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.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.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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST winit-0.29.15.crate 588797 BLAKE2B a22d11d2f6a733624ff093df348e0b4fb2dfb01b40d2e6483a4c72ed93a964df9af6a15d624f99a54c0e0e4cf9a751036be4bd8c3f3bbfd7a3fb8eb41118d9f7 SHA512 eb1ffc450eb4254b45e44d0291e6574247254eea39e0703379c81a14a4ac77429710f5b8e2f25b84c44ad0fa080318cbff12012bcf28b892f56321aa8eb13160
 DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST winnow-0.6.13.crate 162649 BLAKE2B f088396ccdc6e96e56b822c20ea483eaead57794e101bff3df6ea35fe039fa2dcf2eac98dabebc3decb4129c200490633f05ba5dd4325cec29d28c78887c3de1 SHA512 a8a94c26afc4cc4db6ec2e65e7bff325fbe6816d4a80fb97e2014e202af0f549a77518f0435157985822aa9fd8642b95258b6cf87a9e695f4b9a11b5fe514d86
+DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
 DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
 DIST x11-dl-2.21.0.crate 66823 BLAKE2B 83305b44ec89e765ecb2dc48fc3aa93bc67d30f12e9782348bca822ca636207e9a9c2b707ab33b6dfc7fadd2b2cdaa599480470eef7a29a15332e923413a7cce SHA512 b864b0865720a9b2afc6d986fb7ebe19734671433449897d7f00488e019f3781f417f8e3763f09fa0db100a1d0c7e709ea9ac43c6dd48775f3daf803ebaebee5
 DIST x11rb-0.13.1.crate 223916 BLAKE2B 1663b0d4eb059924f9c2dbfa2fff01ee9c7a90bb6652d6e6a1519676e36ef7cca5fd079e39f45137350f595bca592ae9098b93877cdad9540131063379fad2ed SHA512 652f499857aff45053e2ffe1a2e3463323bcf3cf546482dcef4d2805e90a898a12f647da9181fcf02d7234bebdfc424f8a4e0e256dfd49aba4b643284308404f
 DIST x11rb-protocol-0.13.1.crate 508522 BLAKE2B abd88b4175e2fadebc44f232262b71261fac9b1289ee749d31fbd4a9d9c8ff426ccf9edef8eced4b41e4fba3401cd81d109fbf8aef1c99b4529f57910d000a8d SHA512 5c1a40fcbc77aa6e3357ac64af37958ac54aa3a78af354c1ea5f8e8b28f352c6e5d8b4762d8c4eb93fa8a1a122184b89c9b1c95a53d35b08819654dbd4cc4db0
 DIST xcursor-0.3.5.crate 6256 BLAKE2B 09af0002e0fc70790dd4a132fd74525c18d45cd285fc5ba263e9e6faf83a97aeaaef2ef6e04fc7eb939c501e865623a0f454cbc93913d9821fa6005b8f4445e7 SHA512 284f0012a07776f351d9951de33187636f8410651ed71cee3169c0cc082fda6a01a39fddbed4185dae894f7d5314ce204078ce0848308672ee19789a1fdfb05c
+DIST xcursor-0.3.8.crate 7191 BLAKE2B 3f34ce4a29b7679c099d3df633e734b0304d4bd2b1d749b37281a5d76def9f0f15b0bf6d292a2efcb1b0e99ab11b386fffc3fa8544f079ac5e21a582a35debfe SHA512 6b50ee95595993fc3a5b28ab3b88bea10068136e8b5b319b8b17f77dd923e0c73ee852555eaaaae510acd0c8f00e0f32dc1c9fc83201ea5871386e5b991b49f7
 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 xkbcommon-dl-0.4.2.crate 5879 BLAKE2B f80fdcd23e71ac64a302f89d572ae8eb61be3115f298c4a6a5b65345cc625bac089c131aa7f77a3601ee898405c0b1a6a1cb4d754fae200c932456964d12ee1e SHA512 71d6a8468bb05d5c1dac130c90135dec88804708f8f2061b861953a980948b1e7c1f893b86ba8bbf251012d834398394deaa26934939ad161fd4ab9a28578cba
 DIST xkeysym-0.2.1.crate 103129 BLAKE2B ece5c6af4230b6a0397621a5b2b2bcc9bc0465beee89ea397660ff3800a8a7cdfd7752c4cb73b14596cbe20333479febdc5859bd484bbe5b07d62461934079a7 SHA512 47ff2d219c097f2e3c6d74f1ed4bfdb919c449a055b204154af4fe4b39cf5aba41d53a9f073833a75ee441b90171bdbbb528b765d68745d2b95d24ef81045834
 DIST xml-rs-0.8.20.crate 54443 BLAKE2B 67396f3666765ff3d9f0df71454d59ff391fa8d3abaaf60e63ad764e4dd7a9f015179eb3eaaa177fae1f03ef8731d0c903ab0b37cfd4df1192df28f905f0f2d8 SHA512 82190f37e42ca409501ee645c38f7b6a918bc17f6ea86f5a1fc7070babeb2eaedb20a5434e96f60685d7a1176add87c87cc6ca74d7d1c6d78481921c53ecf961
+DIST xml-rs-0.8.21.crate 54522 BLAKE2B fa744b876b96d5ca8ece5e67757508b5daa25340d4a38b7be1e7e5f1e0aa06a0b38b26d65d2cbb20f49d017126ebedc1c97bde6eff068407bfdf963cd90048a9 SHA512 4b4e68d1a25f79003b182fec456c84b4316dcfae40790afaf492f240285f7d10b78a230d1214142f93b4fdc585976c1a79494320ce420f544a6bddd39c0b1fb3
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 DIST zbus-4.2.2.crate 157675 BLAKE2B 1f174b708dcd1dbae17a47c9a3bd72cbc435812f1a54f7e3192df17ed80c7d1e3ad02dd093532ef35577661ca68b2c58036528dcfb02c2983589f28a1f77c602 SHA512 06a0f76f865ee88a33a81b8855a95013ff98947c6a2d3866788ec875b0d2c35553bb6c7eaa83396c1dde12abbd16ec6a6f1e48ac60eb04e3d65af6f370b0b4b4
+DIST zbus-4.4.0.crate 158301 BLAKE2B 7a9a3f8712d99285955020ec60c128289578824061964ae0c26d7f6b284f0ea393087dcf40ae15d13bf87977ba61acab71460120256a5f16b9e5f713fe0a9cad SHA512 2522cf51b6eeeb06b350a0fcacd7cb768459a55a524c8c379da8d0c6f1b7b946f352fe95f993b0af8297de4eb9e63e2f009888465a2b554cfd904d4ca3717699
 DIST zbus_macros-4.2.2.crate 29400 BLAKE2B 6faae26ce9ca410b4311fb3c5ae632f650515c68857719014cffda289077a3de2fe6bb420c01a0bd478fd0bd8eb0faa914c4a355c1cf02a47c03b45cfcc26069 SHA512 0e6be7c2318f8b005376d9ca5c12e6fc263617e7c69db6545fa6e30fe175bf8329b26ff710030259c2d38e1b3703c5aaf9fb922136021e8815ce349c038ebd62
+DIST zbus_macros-4.4.0.crate 31183 BLAKE2B 9448845e1cfa58d51688b74ddf0aa3e65d1621db3c636809426e67433074dcbce36cbe595dbdaca895650775e7971d9e1fd1e9feb7cad42ba6521839459b6780 SHA512 7fa5d4baa95f440be12d74d4c855f16f60803690020a6af1d28d1ba04d792ff763df3c2c3e4d275e0753a6effeaf597ad8cdedd4a34d4b93f8e69a34b31fa1dd
 DIST zbus_names-3.0.0.crate 10650 BLAKE2B 0c8a0ee67c9236ef51a1add3038d5ac5a9f00dccd9df059b16454754db44e7c5ac66b74f3f98c317ee73a1c982b8439d6a92995d984b9b9d744c3c9203edbed3 SHA512 e0ebd468f152ef8063faa547f60b58d2d87948e24741d1cec0e97eef1817653d524ce5519795db64a3a7d9101ee2c6b67f0bf2bade894c57b5c37aee19fc82ab
 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.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
+DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
 DIST zip-2.1.3.crate 96641 BLAKE2B b16604ea78b44974304ce696fec0e0ce61c51b0d20033b740f8dca1e3e5c6439664447f107a75fd5e827eee6efc82fba1bbff96a37eba23c7aacb7e593854c66 SHA512 180fda1b4cff4f396616eccff5140c31e2fc1999e5a89a8590d5fb933a9bf075d68ab84d33a041402fcd30c579de164d716a44a49a12b869e05248f9f518072f
+DIST zip-2.2.0.crate 108080 BLAKE2B 34fef56b71628ab10ff5a893051f38c88717b7640e7a07c4fc7979d44b75eaf887edc61804a97a86395e94fe6d1d8cc6794ce673a29189186f2a2be8f38d0cb8 SHA512 12d79f9ab656a3ed49497e29dc2a1b99d8f5e43d9b113aa70041b7ec7fc8f95e96d3944a2d07435dcf05a318228926dcad73d8f2c580790f2d02f5ec96eb4e0f
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 DIST zvariant-4.1.1.crate 81949 BLAKE2B 02f89f813171271aede1c128011274b6ed345fb4193461db7100d554ac8a87d75828eb163af2dd603e6f8553f725106258eb9b81ca8dfbeb535680167fb4c891 SHA512 23420fe17cef6d24f4b94556632352c2d200b6052a2c8393c47cd41b3aaff47547b55631b3c99f9c2f9e2db9694b76c7b6499e9f35ec815919d91e4d59a1e480
+DIST zvariant-4.2.0.crate 82180 BLAKE2B 6d8309a223c32eae3c1ba4291d69bab395a3ef0f65da1e380552d27ccc547a31cf32f9dcf2feecce34276c065d044d0c897c9468b6df4c16efa94a0668dd19eb SHA512 ae7329db133ff8c262443bfe6fc10698606501ecdde8295367f3876e9c590730778ad2d4977c27e26288c92737055897686e7a0d30210723279c33da7467af80
 DIST zvariant_derive-4.1.1.crate 11028 BLAKE2B b00fb48e2483bfe24a482a198db6e6d3deedc9f913a7b31b3a57cf0692818c68be3b8a765f1a79d5ca914d6754654c81d900d25d29307c69ab67ed36d79c9c8f SHA512 532f965c4461ee2c89a6cfb5f14d43639a3aac1fd2a6ee7e89e01d3c9efb47957d8f73ccca4436d938f18fc536dca0770a50f18bf688b12c8bb7504af9ce072f
+DIST zvariant_derive-4.2.0.crate 11057 BLAKE2B 891c141bfa0db95a5ac62ab2c31bef1215ef658a787d855c09c9b0e42485cd8aa52683c82a07394042615ec51b42ae5efcde81e7dbd2a35f7670888b28477df2 SHA512 8a50d143b38d57a757b3a6b6293c43d7db1a563ccf25002ad6b6a69b7c157765c604329659318a0cb64df1ecf78b3f0dbe88d6650740c016da9161719427f9c2
 DIST zvariant_utils-2.0.0.crate 6815 BLAKE2B 0321261a8371f2df14fcb0abb575dd413d834630eaf1a62b0bfc35384a536e1c1dff5a1fb26248ba4fc0dd5663dfca57892f0175ea98e5a000c8a19996e56b11 SHA512 162d8af9800a8afa16817e3580621768c9ab7d863153edc3cb1748e80aaa2f2b9c05bfffb53b098f313fe7cc2052cf49d854cc761771bc21ab1a93965a55f066
+DIST zvariant_utils-2.1.0.crate 7043 BLAKE2B b891c5fc2b5afb5eba01b9068b454a965b4f07548c1a080fd5b598165994a5177a7df5f39cf7263ea8bcc5d054c7d87012ca1588737d630d96f24f0d00dee6cf SHA512 345b70d1106b37df41426efdb1ba49bf270e00898381c2a8021b5761c59efdea55def45cb2e2598b130b6cba8733503f3997a55578bca90867ab3e8f2346f80e
diff --git a/app-emulation/ruffle/ruffle-0_p20240622.ebuild b/app-emulation/ruffle/ruffle-0_p20240622.ebuild
deleted file mode 100644
index 1e9da2eb25ad..000000000000
--- a/app-emulation/ruffle/ruffle-0_p20240622.ebuild
+++ /dev/null
@@ -1,754 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ab_glyph@0.2.26
-	ab_glyph_rasterizer@0.1.8
-	addr2line@0.22.0
-	adler32@1.2.0
-	adler@1.0.2
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	allocator-api2@0.2.18
-	alsa-sys@0.3.1
-	alsa@0.9.0
-	android-activity@0.5.2
-	android-properties@0.2.2
-	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
-	approx@0.5.1
-	arbitrary@1.3.2
-	arboard@3.4.0
-	arc-swap@1.7.1
-	arrayref@0.3.7
-	arrayvec@0.7.4
-	ashpd@0.8.1
-	ash@0.37.3+1.3.251
-	async-broadcast@0.7.1
-	async-channel@2.3.1
-	async-executor@1.12.0
-	async-fs@2.1.2
-	async-io@2.3.3
-	async-lock@3.4.0
-	async-net@2.0.0
-	async-process@2.2.3
-	async-recursion@1.1.1
-	async-signal@0.2.8
-	async-task@4.7.1
-	async-trait@0.1.80
-	as-raw-xcb-connection@1.0.1
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	backtrace@0.3.72
-	base64@0.21.7
-	base64@0.22.1
-	bindgen@0.69.4
-	bitflags@1.3.2
-	bitflags@2.5.0
-	bitstream-io@2.3.0
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	block2@0.3.0
-	block2@0.5.1
-	blocking@1.6.1
-	block-buffer@0.10.4
-	block-sys@0.2.1
-	block@0.1.6
-	bstr@1.9.1
-	bumpalo@3.16.0
-	bytemuck@1.16.0
-	bytemuck_derive@1.7.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	calloop-wayland-source@0.2.0
-	calloop@0.12.4
-	camino@1.1.7
-	cargo-platform@0.1.8
-	cargo_metadata@0.18.1
-	cc@1.0.99
-	cesu8@1.1.0
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chrono@0.4.38
-	clang-sys@1.8.1
-	clap@4.5.7
-	clap_builder@4.5.7
-	clap_derive@4.5.5
-	clap_lex@0.7.1
-	clipboard-win@5.3.1
-	codespan-reporting@0.11.1
-	colorchoice@1.0.1
-	color_quant@1.1.0
-	combine@4.6.7
-	com@0.6.0
-	com_macros@0.6.0
-	com_macros_support@0.6.0
-	concurrent-queue@2.5.0
-	console@0.15.8
-	console_error_panic_hook@0.1.7
-	convert_case@0.6.0
-	cookie-factory@0.3.3
-	cookie@0.18.1
-	cookie_store@0.21.0
-	core2@0.4.0
-	coreaudio-rs@0.11.3
-	coreaudio-sys@0.2.15
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	core-graphics-types@0.1.3
-	core-graphics@0.23.2
-	cpal@0.15.3
-	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
-	csv-core@0.1.11
-	csv@1.3.0
-	cursor-icon@1.1.0
-	d3d12@0.20.0
-	darling@0.20.9
-	darling_core@0.20.9
-	darling_macro@0.20.9
-	dary_heap@0.3.6
-	dasp@0.11.0
-	dasp_envelope@0.11.0
-	dasp_frame@0.11.0
-	dasp_interpolate@0.11.0
-	dasp_peak@0.11.0
-	dasp_ring_buffer@0.11.0
-	dasp_rms@0.11.0
-	dasp_sample@0.11.0
-	dasp_signal@0.11.0
-	dasp_slice@0.11.0
-	dasp_window@0.11.1
-	deranged@0.3.11
-	derive_arbitrary@1.3.2
-	diff@0.1.13
-	digest@0.10.7
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	dispatch@0.2.0
-	displaydoc@0.2.4
-	dlib@0.5.2
-	document-features@0.2.8
-	downcast-rs@1.2.1
-	either@1.12.0
-	embed-resource@2.4.2
-	encode_unicode@0.3.6
-	encoding_rs@0.8.34
-	endi@1.1.0
-	enumflags2@0.7.10
-	enumflags2_derive@0.7.10
-	enumset@1.1.3
-	enumset_derive@0.8.1
-	enum-map-derive@0.17.0
-	enum-map@2.7.3
-	env_filter@0.1.0
-	env_logger@0.11.3
-	equivalent@1.0.1
-	errno@0.3.9
-	error-code@3.2.0
-	escape8259@0.5.3
-	euclid@0.22.10
-	event-listener-strategy@0.5.2
-	event-listener@5.3.1
-	fastrand@2.1.0
-	fdeflate@0.3.4
-	filetime@0.2.23
-	flate2@1.0.30
-	float-cmp@0.9.0
-	float_next_after@1.0.0
-	fluent-bundle@0.15.3
-	fluent-langneg@0.13.0
-	fluent-syntax@0.11.1
-	fluent-templates@0.9.4
-	fluent-template-macros@0.9.4
-	fluent@0.16.1
-	flume@0.11.0
-	fnv@1.0.7
-	fontconfig-parser@0.5.6
-	fontdb@0.18.0
-	foreign-types-macros@0.2.3
-	foreign-types-shared@0.3.1
-	foreign-types@0.5.0
-	form_urlencoded@1.2.1
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-lite@2.3.0
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	futures@0.3.30
-	gc-arena-derive@0.5.3
-	gc-arena@0.5.3
-	generator@0.8.1
-	generic-array@0.14.7
-	gethostname@0.4.3
-	getrandom@0.2.15
-	gif@0.13.1
-	gilrs-core@0.5.11
-	gilrs@0.10.7
-	gimli@0.29.0
-	globset@0.4.14
-	glob@0.3.1
-	gloo-net@0.5.0
-	gloo-utils@0.2.0
-	glow@0.13.1
-	glutin_wgl_sys@0.5.0
-	gl_generator@0.14.0
-	gpu-allocator@0.25.0
-	gpu-alloc-types@0.3.0
-	gpu-alloc@0.6.0
-	gpu-descriptor-types@0.2.0
-	gpu-descriptor@0.3.0
-	h2@0.4.5
-	hashbrown@0.14.5
-	hassle-rs@0.11.0
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hexf-parse@0.2.1
-	hex@0.4.3
-	home@0.5.9
-	httparse@1.9.2
-	http-body-util@0.1.2
-	http-body@1.0.0
-	http@0.2.12
-	http@1.1.0
-	humantime@2.1.0
-	hyper-rustls@0.27.2
-	hyper-util@0.1.5
-	hyper@1.3.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	icrate@0.0.4
-	id3@1.13.1
-	ident_case@1.0.1
-	idna@0.3.0
-	idna@0.5.0
-	ignore@0.4.22
-	image@0.25.1
-	indexmap@2.2.6
-	indicatif@0.17.8
-	inotify-sys@0.1.5
-	inotify@0.10.2
-	instant@0.1.13
-	insta@1.39.0
-	intl-memoizer@0.5.2
-	intl_pluralrules@7.0.2
-	io-kit-sys@0.4.1
-	ipnet@2.9.0
-	is_terminal_polyfill@1.70.0
-	itertools@0.12.1
-	itertools@0.13.0
-	itoa@1.0.11
-	jni-sys@0.3.0
-	jni@0.21.1
-	jobserver@0.1.31
-	jpeg-decoder@0.3.1
-	js-sys@0.3.69
-	khronos-egl@6.0.0
-	khronos_api@3.1.0
-	lazycell@1.3.0
-	lazy_static@1.4.0
-	libc@0.2.155
-	libflate@2.1.0
-	libflate_lz77@2.1.0
-	libloading@0.7.4
-	libloading@0.8.3
-	libm@0.2.8
-	libredox@0.0.2
-	libredox@0.1.3
-	libtest-mimic@0.7.3
-	libudev-sys@0.1.4
-	linked-hash-map@0.5.6
-	linkme-impl@0.3.27
-	linkme@0.3.27
-	linux-raw-sys@0.4.14
-	litrs@0.4.1
-	lockfree-object-pool@0.1.6
-	lock_api@0.4.12
-	log@0.4.21
-	loom@0.7.2
-	lru@0.12.3
-	lyon@1.0.1
-	lyon_algorithms@1.0.4
-	lyon_geom@1.0.5
-	lyon_path@1.0.5
-	lyon_tessellation@1.0.15
-	lzma-rs@0.3.0
-	mach2@0.4.2
-	macro_rules_attribute-proc_macro@0.2.0
-	macro_rules_attribute@0.2.0
-	malloc_buf@0.0.6
-	matchers@0.1.0
-	md-5@0.10.6
-	memchr@2.7.2
-	memmap2@0.9.4
-	memoffset@0.9.1
-	metal@0.28.0
-	mime@0.3.17
-	mime_guess2@2.0.5
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.3
-	mio@0.8.11
-	naga@0.20.0
-	ndk-context@0.1.1
-	ndk-sys@0.5.0+25.2.9519653
-	ndk@0.8.0
-	nix@0.28.0
-	nohash-hasher@0.2.0
-	nom@7.1.3
-	number_prefix@0.4.0
-	num-bigint@0.4.5
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-derive@0.4.2
-	num-integer@0.1.46
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	num_enum@0.7.2
-	num_enum_derive@0.7.2
-	num_threads@0.1.7
-	nu-ansi-term@0.46.0
-	objc2-app-kit@0.2.2
-	objc2-core-data@0.2.2
-	objc2-core-image@0.2.2
-	objc2-encode@3.0.0
-	objc2-encode@4.0.3
-	objc2-foundation@0.2.2
-	objc2-metal@0.2.2
-	objc2-quartz-core@0.2.2
-	objc2@0.4.1
-	objc2@0.5.2
-	objc-foundation@0.1.1
-	objc-sys@0.3.5
-	objc@0.2.7
-	objc_id@0.1.1
-	object@0.35.0
-	oboe-sys@0.6.1
-	oboe@0.6.1
-	once_cell@1.19.0
-	option-ext@0.2.0
-	orbclient@0.3.47
-	ordered-stream@0.2.0
-	os_info@3.8.2
-	overload@0.1.1
-	owned_ttf_parser@0.21.0
-	parking@2.2.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	paste@1.0.15
-	path-slash@0.2.1
-	percent-encoding@2.3.1
-	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.3
-	pkg-config@0.3.30
-	png@0.17.13
-	polling@3.7.1
-	pollster@0.3.0
-	portable-atomic@1.6.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	presser@0.3.1
-	prettyplease@0.2.20
-	pretty_assertions@1.4.0
-	primal-check@0.3.4
-	proc-macro2@1.0.85
-	proc-macro-crate@3.1.0
-	proc-macro-hack@0.5.20+deprecated
-	profiling-procmacros@1.0.14
-	profiling@1.0.14
-	psl-types@2.0.11
-	publicsuffix@2.2.3
-	quick-xml@0.31.0
-	quinn-proto@0.11.3
-	quinn-udp@0.5.2
-	quinn@0.11.2
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	range-alloc@0.1.3
-	raw-window-handle@0.6.2
-	rayon-core@1.12.1
-	rayon@1.10.0
-	realfft@3.3.0
-	redox_syscall@0.3.5
-	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.5
-	regress@0.10.0
-	renderdoc-sys@1.1.0
-	renderdoc@0.12.1
-	reqwest@0.12.5
-	rfd@0.14.1
-	ring@0.17.8
-	rle-decode-fast@1.0.3
-	ron@0.8.1
-	roxmltree@0.19.0
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustdct@0.7.1
-	rustfft@6.2.0
-	rustix@0.38.34
-	rustls-pemfile@2.1.2
-	rustls-pki-types@1.7.0
-	rustls-webpki@0.102.4
-	rustls@0.23.10
-	rustversion@1.0.17
-	ryu@1.0.18
-	safe_arch@0.7.1
-	same-file@1.0.6
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	sctk-adwaita@0.8.1
-	self_cell@0.10.3
-	self_cell@1.0.4
-	semver@1.0.23
-	serde-wasm-bindgen@0.6.5
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.117
-	serde_repr@0.1.19
-	serde_spanned@0.6.6
-	serde_urlencoded@0.7.1
-	sha1@0.10.6
-	sha2@0.10.8
-	sharded-slab@0.1.7
-	shlex@1.3.0
-	signal-hook-registry@1.4.2
-	simd-adler32@0.3.7
-	similar@2.5.0
-	simple_asn1@0.6.2
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.2
-	smithay-client-toolkit@0.18.1
-	smithay-clipboard@0.7.1
-	smol_str@0.2.2
-	socket2@0.5.7
-	spin@0.9.8
-	spirv@0.3.0+sdk-1.3.268.0
-	sptr@0.3.2
-	static_assertions@1.1.0
-	strength_reduce@0.2.4
-	strict-num@0.1.1
-	strsim@0.11.1
-	subtle@2.5.0
-	symphonia-bundle-mp3@0.5.4
-	symphonia-core@0.5.4
-	symphonia-metadata@0.5.4
-	symphonia@0.5.4
-	sync_wrapper@1.0.1
-	synstructure@0.13.1
-	syn@1.0.109
-	syn@2.0.66
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	sys-locale@0.3.1
-	tempfile@3.10.1
-	termcolor@1.4.1
-	thiserror-impl@1.0.61
-	thiserror@1.0.61
-	threadpool@1.8.1
-	thread_local@1.1.8
-	tiff@0.9.1
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tinystr@0.7.6
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tiny-skia-path@0.11.4
-	tiny-skia@0.11.4
-	tokio-macros@2.3.0
-	tokio-rustls@0.26.0
-	tokio-util@0.7.11
-	tokio@1.38.0
-	toml@0.8.14
-	toml_datetime@0.6.6
-	toml_edit@0.21.1
-	toml_edit@0.22.14
-	tower-layer@0.3.2
-	tower-service@0.3.2
-	tower@0.4.13
-	tracing-appender@0.2.3
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing-tracy@0.10.4
-	tracing-wasm@0.2.1
-	tracing@0.1.40
-	tracy-client-sys@0.22.2
-	tracy-client@0.16.5
-	transpose@0.2.3
-	try-lock@0.2.5
-	ttf-parser@0.21.1
-	typenum@1.17.0
-	type-map@0.5.0
-	uds_windows@1.1.0
-	unicase@2.7.0
-	unicode-bidi@0.3.15
-	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
-	unic-char-property@0.9.0
-	unic-char-range@0.9.0
-	unic-common@0.9.0
-	unic-langid-impl@0.9.5
-	unic-langid-macros-impl@0.9.5
-	unic-langid-macros@0.9.5
-	unic-langid@0.9.5
-	unic-segment@0.9.0
-	unic-ucd-segment@0.9.0
-	unic-ucd-version@0.9.0
-	untrusted@0.9.0
-	urlencoding@2.1.3
-	url@2.5.2
-	utf8parse@0.2.2
-	uuid@1.8.0
-	valuable@0.1.0
-	vec_map@0.8.2
-	vergen@8.3.1
-	version_check@0.9.4
-	vfs@0.12.0
-	vswhom-sys@0.1.2
-	vswhom@0.1.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
-	wasm-streams@0.4.0
-	wayland-backend@0.3.4
-	wayland-client@0.31.3
-	wayland-csd-frame@0.3.0
-	wayland-cursor@0.31.3
-	wayland-protocols-plasma@0.2.0
-	wayland-protocols-wlr@0.2.0
-	wayland-protocols@0.31.2
-	wayland-scanner@0.31.2
-	wayland-sys@0.31.2
-	weak-table@0.3.2
-	webbrowser@1.0.1
-	webpki-roots@0.26.2
-	web-sys@0.3.69
-	web-time@0.2.4
-	web-time@1.1.0
-	weezl@0.1.8
-	wgpu-core@0.21.0
-	wgpu-hal@0.21.0
-	wgpu-types@0.20.0
-	wgpu@0.20.1
-	which@4.4.2
-	widestring@1.1.0
-	wide@0.7.24
-	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.54.0
-	windows-result@0.1.2
-	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.52.0
-	windows@0.54.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_gnullvm@0.52.5
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.5
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@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_gnu@0.42.2
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.5
-	winit@0.29.15
-	winnow@0.5.40
-	winnow@0.6.13
-	winreg@0.52.0
-	wio@0.2.2
-	x11rb-protocol@0.13.1
-	x11rb@0.13.1
-	x11-dl@2.21.0
-	xcursor@0.3.5
-	xdg-home@1.2.0
-	xkbcommon-dl@0.4.2
-	xkeysym@0.2.1
-	xml-rs@0.8.20
-	yansi@0.5.1
-	zbus@4.2.2
-	zbus_macros@4.2.2
-	zbus_names@3.0.0
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zeroize@1.8.1
-	zip@2.1.3
-	zopfli@0.8.1
-	zvariant@4.1.1
-	zvariant_derive@4.1.1
-	zvariant_utils@2.0.0
-"
-declare -A GIT_CRATES=(
-	[egui]="https://github.com/emilk/egui;413843dd7ca7c177aaac233cd24b547d2b904d19;egui-%commit%/crates/egui"
-	[egui-wgpu]="https://github.com/emilk/egui;413843dd7ca7c177aaac233cd24b547d2b904d19;egui-%commit%/crates/egui-wgpu"
-	[egui-winit]="https://github.com/emilk/egui;413843dd7ca7c177aaac233cd24b547d2b904d19;egui-%commit%/crates/egui-winit"
-	[egui_extras]="https://github.com/emilk/egui;413843dd7ca7c177aaac233cd24b547d2b904d19;egui-%commit%/crates/egui_extras"
-	[flash-lso]="https://github.com/ruffle-rs/rust-flash-lso;2f770555ea49c6db49c57c1dd46c7cc686e8dacc;rust-flash-lso-%commit%/flash-lso"
-	[h263-rs-deblock]='https://github.com/ruffle-rs/h263-rs;f0fa94c366a1d0383df99aa835add175658d6bad;h263-rs-%commit%/deblock'
-	[h263-rs-yuv]="https://github.com/ruffle-rs/h263-rs;f0fa94c366a1d0383df99aa835add175658d6bad;h263-rs-%commit%/yuv"
-	[h263-rs]="https://github.com/ruffle-rs/h263-rs;f0fa94c366a1d0383df99aa835add175658d6bad;h263-rs-%commit%/h263"
-	[jpegxr]="https://github.com/ruffle-rs/jpegxr;db88651220688d2883a90d5477048071507b0493;jpegxr-%commit%"
-	[nellymoser-rs]="https://github.com/ruffle-rs/nellymoser;754b1184037aa9952a907107284fb73897e26adc;nellymoser-%commit%"
-	[nihav_codec_support]="https://github.com/ruffle-rs/nihav-vp6;83c7e1094d603d9fc1212d39d99abb17f3a3226b;nihav-vp6-%commit%/nihav-codec-support"
-	[nihav_core]="https://github.com/ruffle-rs/nihav-vp6;83c7e1094d603d9fc1212d39d99abb17f3a3226b;nihav-vp6-%commit%/nihav-core"
-	[nihav_duck]="https://github.com/ruffle-rs/nihav-vp6;83c7e1094d603d9fc1212d39d99abb17f3a3226b;nihav-vp6-%commit%/nihav-duck"
-)
-inherit cargo desktop optfeature xdg
-
-MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Flash Player emulator written in Rust"
-HOMEPAGE="https://ruffle.rs/"
-SRC_URI="
-	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-LICENSE+="
-	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 openssl
-	Unicode-DFS-2016 ZLIB
-" # crates
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# dlopen: libX* (see winit+x11-dl crates)
-RDEPEND="
-	media-libs/alsa-lib
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXrender
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	virtual/jre:*
-	virtual/pkgconfig
-	>=virtual/rust-1.77
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
-)
-
-src_configure() {
-	local workspaces=(
-		ruffle_{desktop,scanner}
-		exporter
-		$(usev test tests)
-	)
-
-	cargo_src_configure "${workspaces[@]/#/--package=}"
-}
-
-src_test() {
-	local skip=(
-		# may need more investigation, strangely "pass" (xfail) when
-		# RUSTFLAGS is unset, skip for now (bug #915726)
-		--skip from_avmplus/as3/Types/Int/wraparound
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-src_install() {
-	dodoc README.md
-
-	newicon web/packages/extension/assets/images/icon180.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
-		"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
-
-	cd "$(cargo_target_dir)" || die
-	newbin ${PN}_desktop ${PN}
-	newbin exporter ${PN}_exporter
-	dobin ${PN}_scanner
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} is experimental software that is still under heavy development"
-		elog "and only receiving nightly releases. Plans in Gentoo is to update"
-		elog "roughly every months if no known major regressions (feel free to"
-		elog "report if you feel a newer nightly is needed ahead of time)."
-		elog
-		elog "There is currently no plans to support wasm builds / browser"
-		elog "extensions, this provides the desktop viewer and other tools."
-	fi
-
-	optfeature "the in-application file picker" sys-apps/xdg-desktop-portal
-}
diff --git a/app-emulation/ruffle/ruffle-0_p20240902.ebuild b/app-emulation/ruffle/ruffle-0_p20240902.ebuild
new file mode 100644
index 000000000000..efada32ef950
--- /dev/null
+++ b/app-emulation/ruffle/ruffle-0_p20240902.ebuild
@@ -0,0 +1,745 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ab_glyph@0.2.28
+	ab_glyph_rasterizer@0.1.8
+	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
+	alsa-sys@0.3.1
+	alsa@0.9.1
+	android-activity@0.5.2
+	android-properties@0.2.2
+	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
+	arboard@3.4.0
+	arrayref@0.3.8
+	arrayvec@0.7.6
+	ashpd@0.8.1
+	ash@0.38.0+1.3.281
+	async-broadcast@0.7.1
+	async-channel@2.3.1
+	async-executor@1.13.0
+	async-fs@2.1.2
+	async-io@2.3.4
+	async-lock@3.4.0
+	async-net@2.0.0
+	async-process@2.2.4
+	async-recursion@1.1.1
+	async-signal@0.2.10
+	async-task@4.7.1
+	async-trait@0.1.81
+	as-raw-xcb-connection@1.0.1
+	atomic-waker@1.1.2
+	autocfg@1.3.0
+	backtrace@0.3.73
+	base64@0.22.1
+	bindgen@0.69.4
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bitstream-io@2.5.3
+	bit-set@0.6.0
+	bit-vec@0.7.0
+	block2@0.3.0
+	block2@0.5.1
+	blocking@1.6.1
+	block-buffer@0.10.4
+	block-sys@0.2.1
+	block@0.1.6
+	bstr@1.10.0
+	bumpalo@3.16.0
+	bytemuck@1.17.0
+	bytemuck_derive@1.7.1
+	byteorder-lite@0.1.0
+	byteorder@1.5.0
+	bytes@1.7.1
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	calloop-wayland-source@0.2.0
+	calloop@0.12.4
+	camino@1.1.9
+	cargo-platform@0.1.8
+	cargo_metadata@0.18.1
+	cc@1.1.15
+	cesu8@1.1.0
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chardetng@0.1.17
+	chrono@0.4.38
+	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
+	codespan-reporting@0.11.1
+	colorchoice@1.0.2
+	color_quant@1.1.0
+	combine@4.6.7
+	com@0.6.0
+	com_macros@0.6.0
+	com_macros_support@0.6.0
+	concurrent-queue@2.5.0
+	console@0.15.8
+	console_error_panic_hook@0.1.7
+	convert_case@0.6.0
+	cookie@0.18.1
+	cookie_store@0.21.0
+	coreaudio-rs@0.11.3
+	coreaudio-sys@0.2.15
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	core-graphics@0.23.2
+	core_maths@0.1.0
+	cpal@0.15.3
+	cpufeatures@0.2.13
+	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
+	csv-core@0.1.11
+	csv@1.3.0
+	cursor-icon@1.1.0
+	d3d12@22.0.0
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	dasp@0.11.0
+	dasp_envelope@0.11.0
+	dasp_frame@0.11.0
+	dasp_interpolate@0.11.0
+	dasp_peak@0.11.0
+	dasp_ring_buffer@0.11.0
+	dasp_rms@0.11.0
+	dasp_sample@0.11.0
+	dasp_signal@0.11.0
+	dasp_slice@0.11.0
+	dasp_window@0.11.1
+	deranged@0.3.11
+	derive_arbitrary@1.3.2
+	diff@0.1.13
+	digest@0.10.7
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	dispatch@0.2.0
+	displaydoc@0.2.5
+	dlib@0.5.2
+	document-features@0.2.10
+	downcast-rs@1.2.1
+	either@1.13.0
+	embed-resource@2.4.3
+	encode_unicode@0.3.6
+	encoding_rs@0.8.34
+	endi@1.1.0
+	enumflags2@0.7.10
+	enumflags2_derive@0.7.10
+	enumset@1.1.5
+	enumset_derive@0.10.0
+	enum-map-derive@0.17.0
+	enum-map@2.7.3
+	env_filter@0.1.2
+	env_logger@0.11.5
+	equivalent@1.0.1
+	errno@0.3.9
+	error-code@3.2.0
+	escape8259@0.5.3
+	euclid@0.22.10
+	event-listener-strategy@0.5.2
+	event-listener@5.3.1
+	fastrand@2.1.1
+	fdeflate@0.3.4
+	filetime@0.2.24
+	flate2@1.0.33
+	float-cmp@0.9.0
+	float_next_after@1.0.0
+	fluent-bundle@0.15.3
+	fluent-langneg@0.13.0
+	fluent-syntax@0.11.1
+	fluent-templates@0.10.1
+	fluent-template-macros@0.10.1
+	flume@0.11.0
+	fnv@1.0.7
+	fontconfig-parser@0.5.7
+	fontdb@0.21.0
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.3.1
+	foreign-types@0.5.0
+	form_urlencoded@1.2.1
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-lite@2.3.0
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	gc-arena-derive@0.5.3
+	gc-arena@0.5.3
+	generator@0.8.1
+	generic-array@0.14.7
+	gethostname@0.4.3
+	getrandom@0.2.15
+	gif@0.13.1
+	gilrs-core@0.5.15
+	gilrs@0.10.9
+	gimli@0.29.0
+	globset@0.4.14
+	glob@0.3.1
+	gloo-net@0.6.0
+	gloo-utils@0.2.0
+	glow@0.13.1
+	glutin_wgl_sys@0.6.0
+	gl_generator@0.14.0
+	gpu-allocator@0.26.0
+	gpu-alloc-types@0.3.0
+	gpu-alloc@0.6.0
+	gpu-descriptor-types@0.2.0
+	gpu-descriptor@0.3.0
+	h2@0.4.6
+	hashbrown@0.14.5
+	hassle-rs@0.11.0
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hexf-parse@0.2.1
+	hex@0.4.3
+	home@0.5.9
+	httparse@1.9.4
+	http-body-util@0.1.2
+	http-body@1.0.1
+	http@1.1.0
+	humantime@2.1.0
+	hyper-rustls@0.27.2
+	hyper-util@0.1.7
+	hyper@1.4.1
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	icrate@0.0.4
+	id3@1.14.0
+	ident_case@1.0.1
+	idna@0.3.0
+	idna@0.5.0
+	ignore@0.4.22
+	image@0.25.2
+	indexmap@2.4.0
+	indicatif@0.17.8
+	inotify-sys@0.1.5
+	inotify@0.10.2
+	instant@0.1.13
+	insta@1.39.0
+	intl-memoizer@0.5.2
+	intl_pluralrules@7.0.2
+	io-kit-sys@0.4.1
+	ipnet@2.9.0
+	is_terminal_polyfill@1.70.1
+	itertools@0.12.1
+	itertools@0.13.0
+	itoa@1.0.11
+	jni-sys@0.3.0
+	jni@0.21.1
+	jobserver@0.1.32
+	jpeg-decoder@0.3.1
+	js-sys@0.3.70
+	khronos-egl@6.0.0
+	khronos_api@3.1.0
+	lazycell@1.3.0
+	lazy_static@1.5.0
+	libc@0.2.158
+	libloading@0.8.5
+	libm@0.2.8
+	libredox@0.0.2
+	libredox@0.1.3
+	libtest-mimic@0.7.3
+	libudev-sys@0.1.4
+	linked-hash-map@0.5.6
+	linkme-impl@0.3.28
+	linkme@0.3.28
+	linux-raw-sys@0.4.14
+	litrs@0.4.1
+	lockfree-object-pool@0.1.6
+	lock_api@0.4.12
+	log@0.4.22
+	loom@0.7.2
+	lru@0.12.4
+	lyon@1.0.1
+	lyon_algorithms@1.0.4
+	lyon_geom@1.0.5
+	lyon_path@1.0.5
+	lyon_tessellation@1.0.15
+	lzma-rs@0.3.0
+	mach2@0.4.2
+	macro_rules_attribute-proc_macro@0.2.0
+	macro_rules_attribute@0.2.0
+	malloc_buf@0.0.6
+	matchers@0.1.0
+	memchr@2.7.4
+	memmap2@0.9.4
+	memoffset@0.9.1
+	metal@0.29.0
+	mime@0.3.17
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.4
+	miniz_oxide@0.8.0
+	mio@1.0.2
+	naga@22.1.0
+	ndk-context@0.1.1
+	ndk-sys@0.5.0+25.2.9519653
+	ndk@0.8.0
+	nix@0.29.0
+	nohash-hasher@0.2.0
+	nom@7.1.3
+	number_prefix@0.4.0
+	num-bigint@0.4.6
+	num-complex@0.4.6
+	num-conv@0.1.0
+	num-derive@0.4.2
+	num-integer@0.1.46
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	num_enum@0.7.3
+	num_enum_derive@0.7.3
+	num_threads@0.1.7
+	nu-ansi-term@0.46.0
+	objc2-app-kit@0.2.2
+	objc2-core-data@0.2.2
+	objc2-core-image@0.2.2
+	objc2-encode@3.0.0
+	objc2-encode@4.0.3
+	objc2-foundation@0.2.2
+	objc2-metal@0.2.2
+	objc2-quartz-core@0.2.2
+	objc2@0.4.1
+	objc2@0.5.2
+	objc-sys@0.3.5
+	objc@0.2.7
+	object@0.36.3
+	oboe-sys@0.6.1
+	oboe@0.6.1
+	once_cell@1.19.0
+	option-ext@0.2.0
+	orbclient@0.3.47
+	ordered-stream@0.2.0
+	os_info@3.8.2
+	overload@0.1.1
+	owned_ttf_parser@0.24.0
+	parking@2.2.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	paste@1.0.15
+	path-slash@0.2.1
+	percent-encoding@2.3.1
+	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
+	pkg-config@0.3.30
+	png@0.17.13
+	polling@3.7.1
+	pollster@0.3.0
+	portable-atomic@1.7.0
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	presser@0.3.1
+	prettyplease@0.2.22
+	pretty_assertions@1.4.0
+	primal-check@0.3.4
+	proc-macro2@1.0.86
+	proc-macro-crate@3.2.0
+	proc-macro-hack@0.5.20+deprecated
+	profiling-procmacros@1.0.14
+	profiling@1.0.14
+	psl-types@2.0.11
+	publicsuffix@2.2.3
+	quick-xml@0.34.0
+	quick-xml@0.36.1
+	quinn-proto@0.11.3
+	quinn-udp@0.5.2
+	quinn@0.11.2
+	quote@1.0.37
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	range-alloc@0.1.3
+	raw-window-handle@0.6.2
+	rayon-core@1.12.1
+	rayon@1.10.0
+	realfft@3.3.0
+	redox_syscall@0.3.5
+	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
+	regress@0.10.0
+	renderdoc-sys@1.1.0
+	renderdoc@0.12.1
+	reqwest@0.12.7
+	ring@0.17.8
+	roxmltree@0.20.0
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustdct@0.7.1
+	rustfft@6.2.0
+	rustix@0.38.34
+	rustls-pemfile@2.1.3
+	rustls-pki-types@1.8.0
+	rustls-webpki@0.102.6
+	rustls@0.23.12
+	rustversion@1.0.17
+	ryu@1.0.18
+	safe_arch@0.7.2
+	same-file@1.0.6
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	sctk-adwaita@0.8.1
+	self_cell@0.10.3
+	self_cell@1.0.4
+	semver@1.0.23
+	serde-wasm-bindgen@0.6.5
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.127
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	serde_urlencoded@0.7.1
+	sha1@0.10.6
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shlex@1.3.0
+	signal-hook-registry@1.4.2
+	simd-adler32@0.3.7
+	similar@2.6.0
+	simple_asn1@0.6.2
+	slab@0.4.9
+	slotmap@1.0.7
+	smallvec@1.13.2
+	smithay-client-toolkit@0.18.1
+	smithay-clipboard@0.7.1
+	smol_str@0.2.2
+	socket2@0.5.7
+	spin@0.9.8
+	spirv@0.3.0+sdk-1.3.268.0
+	sptr@0.3.2
+	static_assertions@1.1.0
+	strength_reduce@0.2.4
+	strict-num@0.1.1
+	strsim@0.11.1
+	subtle@2.6.1
+	symphonia-bundle-mp3@0.5.4
+	symphonia-core@0.5.4
+	symphonia-metadata@0.5.4
+	symphonia@0.5.4
+	sync_wrapper@1.0.1
+	synstructure@0.13.1
+	syn@1.0.109
+	syn@2.0.76
+	system-configuration-sys@0.6.0
+	system-configuration@0.6.1
+	sys-locale@0.3.1
+	tempfile@3.12.0
+	termcolor@1.4.1
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	threadpool@1.8.1
+	thread_local@1.1.8
+	tiff@0.9.1
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tinystr@0.7.6
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	tiny-skia-path@0.11.4
+	tiny-skia@0.11.4
+	tokio-macros@2.4.0
+	tokio-rustls@0.26.0
+	tokio-util@0.7.11
+	tokio@1.39.3
+	toml@0.8.19
+	toml_datetime@0.6.8
+	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-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing-tracy@0.10.4
+	tracing-wasm@0.2.1
+	tracing@0.1.40
+	tracy-client-sys@0.22.2
+	tracy-client@0.16.5
+	transpose@0.2.3
+	try-lock@0.2.5
+	ttf-parser@0.24.1
+	typenum@1.17.0
+	type-map@0.5.0
+	uds_windows@1.1.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-segmentation@1.11.0
+	unicode-width@0.1.13
+	unicode-xid@0.2.5
+	unic-char-property@0.9.0
+	unic-char-range@0.9.0
+	unic-common@0.9.0
+	unic-langid-impl@0.9.5
+	unic-langid-macros-impl@0.9.5
+	unic-langid-macros@0.9.5
+	unic-langid@0.9.5
+	unic-segment@0.9.0
+	unic-ucd-segment@0.9.0
+	unic-ucd-version@0.9.0
+	untrusted@0.9.0
+	urlencoding@2.1.3
+	url@2.5.2
+	utf8parse@0.2.2
+	uuid@1.10.0
+	valuable@0.1.0
+	vec_map@0.8.2
+	vergen@8.3.2
+	version_check@0.9.5
+	vfs@0.12.0
+	vswhom-sys@0.1.2
+	vswhom@0.1.0
+	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
+	wasm-streams@0.4.0
+	wayland-backend@0.3.4
+	wayland-client@0.31.3
+	wayland-csd-frame@0.3.0
+	wayland-cursor@0.31.3
+	wayland-protocols-plasma@0.2.0
+	wayland-protocols-wlr@0.2.0
+	wayland-protocols@0.31.2
+	wayland-scanner@0.31.4
+	wayland-sys@0.31.2
+	weak-table@0.3.2
+	webbrowser@1.0.1
+	webpki-roots@0.26.3
+	web-sys@0.3.70
+	web-time@0.2.4
+	web-time@1.1.0
+	weezl@0.1.8
+	wgpu-core@22.1.0
+	wgpu-hal@22.0.0
+	wgpu-types@22.0.0
+	wgpu@22.1.0
+	which@4.4.2
+	widestring@1.1.0
+	wide@0.7.28
+	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.54.0
+	windows-registry@0.2.0
+	windows-result@0.1.2
+	windows-result@0.2.0
+	windows-strings@0.1.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@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.42.2
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@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_gnu@0.42.2
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@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.29.15
+	winnow@0.6.18
+	winreg@0.52.0
+	wio@0.2.2
+	x11rb-protocol@0.13.1
+	x11rb@0.13.1
+	x11-dl@2.21.0
+	xcursor@0.3.8
+	xdg-home@1.3.0
+	xkbcommon-dl@0.4.2
+	xkeysym@0.2.1
+	xml-rs@0.8.21
+	yansi@0.5.1
+	zbus@4.4.0
+	zbus_macros@4.4.0
+	zbus_names@3.0.0
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zeroize@1.8.1
+	zip@2.2.0
+	zopfli@0.8.1
+	zvariant@4.2.0
+	zvariant_derive@4.2.0
+	zvariant_utils@2.1.0
+"
+declare -A GIT_CRATES=(
+	[egui]="https://github.com/emilk/egui;37b1e1504db14697c39ce1c3bb5e58f4f2b819bf;egui-%commit%/crates/egui"
+	[egui-wgpu]="https://github.com/emilk/egui;37b1e1504db14697c39ce1c3bb5e58f4f2b819bf;egui-%commit%/crates/egui-wgpu"
+	[egui-winit]="https://github.com/emilk/egui;37b1e1504db14697c39ce1c3bb5e58f4f2b819bf;egui-%commit%/crates/egui-winit"
+	[egui_extras]="https://github.com/emilk/egui;37b1e1504db14697c39ce1c3bb5e58f4f2b819bf;egui-%commit%/crates/egui_extras"
+	[flash-lso]="https://github.com/ruffle-rs/rust-flash-lso;f9e3de59a86df1c954fecba6b4b752df61cad73a;rust-flash-lso-%commit%/flash-lso"
+	[h263-rs-deblock]='https://github.com/ruffle-rs/h263-rs;f0fa94c366a1d0383df99aa835add175658d6bad;h263-rs-%commit%/deblock'
+	[h263-rs-yuv]="https://github.com/ruffle-rs/h263-rs;f0fa94c366a1d0383df99aa835add175658d6bad;h263-rs-%commit%/yuv"
+	[h263-rs]="https://github.com/ruffle-rs/h263-rs;f0fa94c366a1d0383df99aa835add175658d6bad;h263-rs-%commit%/h263"
+	[jpegxr]="https://github.com/ruffle-rs/jpegxr;db88651220688d2883a90d5477048071507b0493;jpegxr-%commit%"
+	[nellymoser-rs]="https://github.com/ruffle-rs/nellymoser;754b1184037aa9952a907107284fb73897e26adc;nellymoser-%commit%"
+	[nihav_codec_support]="https://github.com/ruffle-rs/nihav-vp6;83c7e1094d603d9fc1212d39d99abb17f3a3226b;nihav-vp6-%commit%/nihav-codec-support"
+	[nihav_core]="https://github.com/ruffle-rs/nihav-vp6;83c7e1094d603d9fc1212d39d99abb17f3a3226b;nihav-vp6-%commit%/nihav-core"
+	[nihav_duck]="https://github.com/ruffle-rs/nihav-vp6;83c7e1094d603d9fc1212d39d99abb17f3a3226b;nihav-vp6-%commit%/nihav-duck"
+	[rfd]="https://github.com/PolyMeilex/rfd;42dcc7d61fc5e278b4ed76bb9720ba4d89266f01;rfd-%commit%"
+)
+inherit cargo desktop optfeature xdg
+
+MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Flash Player emulator written in Rust"
+HOMEPAGE="https://ruffle.rs/"
+SRC_URI="
+	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+LICENSE+="
+	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 openssl
+	Unicode-DFS-2016 ZLIB
+" # crates
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# dlopen: libX* (see winit+x11-dl crates)
+RDEPEND="
+	media-libs/alsa-lib
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXrender
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/jre:*
+	virtual/pkgconfig
+	>=virtual/rust-1.77
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
+)
+
+src_configure() {
+	local workspaces=(
+		ruffle_{desktop,scanner}
+		exporter
+		$(usev test tests)
+	)
+
+	cargo_src_configure "${workspaces[@]/#/--package=}"
+}
+
+src_test() {
+	local skip=(
+		# may need more investigation, strangely "pass" (xfail) when
+		# RUSTFLAGS is unset, skip for now (bug #915726)
+		--skip from_avmplus/as3/Types/Int/wraparound
+	)
+
+	cargo_src_test -- "${skip[@]}"
+}
+
+src_install() {
+	dodoc README.md
+
+	newicon web/packages/extension/assets/images/icon180.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
+		"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
+
+	cd "$(cargo_target_dir)" || die
+	newbin ${PN}_desktop ${PN}
+	newbin exporter ${PN}_exporter
+	dobin ${PN}_scanner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "${PN} is experimental software that is still under heavy development"
+		elog "and only receiving nightly releases. Plans in Gentoo is to update"
+		elog "roughly every months if no known major regressions (feel free to"
+		elog "report if you feel a newer nightly is needed ahead of time)."
+		elog
+		elog "There is currently no plans to support wasm builds / browser"
+		elog "extensions, this provides the desktop viewer and other tools."
+	fi
+
+	optfeature "the in-application file picker" sys-apps/xdg-desktop-portal
+}
diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild
index 55782a3c6b41..457bc5e52efc 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -11,8 +11,8 @@ EGIT_REPO_URI="https://github.com/ruffle-rs/ruffle.git"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 LICENSE+="
-	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC UbuntuFontLicense-1.0 MIT
-	MPL-2.0 OFL-1.1 openssl Unicode-DFS-2016 ZLIB
+	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 openssl
+	Unicode-DFS-2016 ZLIB
 " # crates
 SLOT="0"
 IUSE="test"
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index dbb5bd287253..685a61415153 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -1,2 +1 @@
-DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
 DIST ski-1.4.0.tar.xz 2373876 BLAKE2B c9c20582274dd6db6e216c709a1793b55ac2c1aaf26c5e235bffdd190e9e7dca4c7ef37f96309c61ba9b5f03229966710a65405e2a345d65a08b9163f545c85b SHA512 855bc73c2cd93d890cd532db524eecc122d5f3eddf189efdbf34069d1c9bd7b7f98d5e593387fdc31b38fc8630f00b6b126f5c1a1f22dab57447e024b9015cf5
diff --git a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch b/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
deleted file mode 100644
index 34a7d8183702..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-use standard AC_C_BIGENDIAN macro rather than trying to define it manually
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,52 +155,24 @@ AC_SUBST(GSKI_CFLAGS)
- AC_SUBST(GSKI_LIBS)
- AM_CONDITIONAL(WITH_GTK_INTERFACE, test "x$with_gtk" = "xyes")
- 
--dnl Target endianness
--AC_ARG_ENABLE(bigendian,
--AC_HELP_STRING([--enable-bigendian],
--    [the target is big endian default=no]),
--ski_cv_c_target_bigendian=${enableval}, ski_cv_c_target_bigendian=no)
--
- dnl Check for host endianness
- AC_CACHE_CHECK([whether host byte ordering is defined in sys/param.h],
- ski_cv_c_bigendian_compile,
- [AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/param.h>
- ],[
- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- #error bogus endian macros
- #endif
- ],
- ski_cv_c_bigendian_compile=yes, ski_cv_c_bigendian_compile=no)])
- 
- if test "x$ski_cv_c_bigendian_compile" = xyes; then
- AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1,
-     [define if sys/param.h defines the endiness])
--else
--AC_CACHE_CHECK([whether host byte ordering is big endian],
--ski_cv_c_bigendian,
--[AC_TRY_RUN([int main () {
--    union {
--        long l;
--        char c[sizeof (long)];
--    } u;
--    u.l = 1;
--    return (u.c[sizeof (long) - 1] == 1);
--}],
--ski_cv_c_bigendian=no, ski_cv_c_bigendian=yes,
--AC_MSG_ERROR([cannot detect host endianness]))])
--
--AC_DEFINE(BIG_ENDIAN,    4321, [define to 4321 if missing from sys/param.h])
--AC_DEFINE(LITTLE_ENDIAN, 1234, [define to 4321 if missing from sys/param.h])
--if test "x$ski_cv_c_bigendian" = xyes; then
--    AC_DEFINE(BYTE_ORDER, 4321,
--        [define to 4321 if host is big endian, 1234 if little endian])
--else
--    AC_DEFINE(BYTE_ORDER, 1234,
--        [define to 4321 if host is big endian, 1234 if little endian])
--fi
- fi
-+AC_C_BIGENDIAN
- 
- dnl Check for variables & functions
- 
---- a/src/std.h
-+++ b/src/std.h
-@@ -62,6 +62,14 @@ extern unsigned long long __strtoull(const char *, char **, int);
- #   define BIG_ENDIAN 4321
- #   define LITTLE_ENDIAN 1234
- #   define BYTE_ORDER BIG_ENDIAN
-+# else
-+#  define BIG_ENDIAN 4321
-+#  define LITTLE_ENDIAN 1234
-+#  ifdef WORDS_BIGENDIAN
-+#   define BYTE_ORDER BIG_ENDIAN
-+#  else
-+#   define BYTE_ORDER LITTLE_ENDIAN
-+#  endif
- # endif /* !defined HAVE_CONFIG_H */
- #endif /* !defined ENDIANESS_IN_SYS_PARAM_H */
- 
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
deleted file mode 100644
index dcb3f6793fba..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
-index 73be0e6..c4051a3 100644
---- a/src/linux/dwarf-linux.c
-+++ b/src/linux/dwarf-linux.c
-@@ -116,14 +116,14 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
-   /*
-    * we're looking at loadable code only
-    */
--  if ((bfd_get_section_flags (bfd, sect) & (SEC_CODE | SEC_ALLOC)) == 0)
-+  if ((bfd_section_flags (sect) & (SEC_CODE | SEC_ALLOC)) == 0)
-     return;
- 
-   /*
-    * check if address belongs to this section
-    */
--  vma = bfd_get_section_vma (bfd, sect);
--  size = bfd_section_size (bfd, sect);
-+  vma = bfd_section_vma (sect);
-+  size = bfd_section_size (sect);
- 
-   offset = info->address - vma;
-   if (offset >= size)
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils.patch b/app-emulation/ski/files/ski-1.3.2-binutils.patch
deleted file mode 100644
index 71094f3bf4b6..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-binutils.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 30d3253c6b413ba22ca0ca30dcd4c4c24daec2e1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 19 Aug 2014 09:42:43 +0300
-Subject: [PATCH] Fix build failure against binutils-2.16.1 and upper.
-
-Follow binutils' upstream change from 2004:
-
-    https://sourceware.org/git/?p=binutils.git;a=commitdiff;h=7e2dd9e4c3e0b69dcb7d471b891879b5fd28687e
-    > section.c (struct sec): Rename "_cooked_size" to "size".
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/linux/dwarf-linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
-index 1941a1f..73be0e6 100644
---- a/src/linux/dwarf-linux.c
-+++ b/src/linux/dwarf-linux.c
-@@ -155,7 +155,7 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
- 	      first.function = function;
- 	      first.line = line;
- 	      first.num_lines = 1;
--	      first.limit = sect->_cooked_size;
-+	      first.limit = sect->size;
- 	      last_line = line;
- 	    }
- 	  if (line > last_line
--- 
-2.0.4
-
diff --git a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch b/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
deleted file mode 100644
index 7bb3ce9fc85c..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix handling of 3rd/4th args to AC_ARG_WITH()
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -130,7 +130,7 @@ dnl See if we build X11
- AC_ARG_WITH(x11,
- AC_HELP_STRING([--with-x11],
-     [Enable the Motif based X11 interface default=no]),
--    [with_x11=yes],[with_x11=no])
-+    [with_x11=$withval])
-   
- if test "x$with_x11" = "xyes"; then
-   dnl Check for motif, error out if not found
-@@ -144,7 +144,7 @@ dnl See if we build GTK
- AC_ARG_WITH(gtk,
- AC_HELP_STRING([--with-gtk],
-     [Enable building the GTK Ski interface default=no]),
--    [with_gtk=yes],[with_gtk=no]
-+    [with_gtk=$withval]
- )
- 
- if test "x$with_gtk" = "xyes"; then
diff --git a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
deleted file mode 100644
index bfe5de33acbf..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/linux/syscall-linux.c
-+++ b/src/linux/syscall-linux.c
-@@ -538,7 +538,7 @@ pid_t cons_pid = -1;
- static int cfd = -1;
- BOOL trace_syscalls;
- char *consLog = NULL;
--extern BOOL noConsole;
-+BOOL noConsole;
- extern BOOL userint;
- static struct termios sane_ttyIos;
- 
---- a/src/platform.c
-+++ b/src/platform.c
-@@ -29,7 +29,7 @@
- #include "platform.h"
- #include "state.h"
- 
--BOOL autoAlloc, noConsole;
-+extern BOOL autoAlloc, noConsole;
- extern char *consLog;
- extern unsigned va_len, pa_len, rid_len, key_len;
- extern unsigned mips;
diff --git a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch b/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
deleted file mode 100644
index f09c5b410563..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/dos.c
-+++ b/src/dos.c
-@@ -51,5 +51,2 @@ extern int localtime_r(const __time_t *, __struct_tm *);
- #include <unistd.h>	/* Also #includes <utime.h> */
--#if !defined(__FreeBSD__)
--#include <ustat.h>
--#endif
- #include <sys/utsname.h>
diff --git a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
deleted file mode 100644
index 1dc8470864e2..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-escan.l depends on generated eparse.h.
-If eparse.h is not present yet escan.o
-could be built before ${YACC) is ran.
-
-https://bugs.gentoo.org/744676
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -113,7 +113,8 @@ BUILT_SOURCES= \
- 	$(DAS_INSTR_DERIVED) \
- 	$(ASM_HASH_DERIVED) \
- 	$(ICNT_DERIVED) \
--	instr.c
-+	instr.c \
-+	eparse.h
- 
- ski_SOURCES= \
- 	main.c
diff --git a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
deleted file mode 100644
index 4317df415efa..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-use pkg-config to look up ncurses deps to support things like split tinfo
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,6 +93,7 @@
- AC_PROG_SED
- AC_PROG_YACC
- AM_PROG_LEX
-+PKG_PROG_PKG_CONFIG
- 
- AC_C_INLINE
- AC_C_CONST
-@@ -304,9 +305,9 @@
- fi    
- 
- if test "x$check_curses" != xno; then
--AC_CHECK_LIB(curses, tgetent, [],
--    [AC_CHECK_LIB(ncurses, tgetent, ,
--            [AC_MSG_ERROR(Required curses library not found.)])])
-+    PKG_CHECK_MODULES([NCURSES], [ncurses])
-+    CFLAGS="$CFLAGS $NCURSES_CFLAGS"
-+    LIBS="$LIBS $NCURSES_LIBS"
- fi
- 
- AC_CHECK_LIB(elf, elf_begin, [],
diff --git a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch b/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
deleted file mode 100644
index aa75146668b5..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-build against the system ltdl rather than the local copy
-
---- ski-1.3.2/src/Makefile.am
-+++ ski-1.3.2/src/Makefile.am
-@@ -181,8 +181,7 @@
- 	eparse.h \
- 	libdas.h \
- 	netdev.h \
--	osload.h \
--	ltdl.h
-+	osload.h 
- 
- EXTRA_linux_FILES = \
- 	linux/dwarf-linux.c \
-@@ -279,7 +278,6 @@
- 	eparse.y \
- 	escan.l \
- 	load.c \
--	ltdl.c \
- 	platform.c \
- 	libdas.c \
- 	libsrs.c
diff --git a/app-emulation/ski/files/ski-1.3.2-prototypes.patch b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
deleted file mode 100644
index b66614368708..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-prototypes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fix up prototypes to avoid -Wimplicit-function-declaration warnings
-
---- a/src/coreui.h
-+++ b/src/coreui.h
-@@ -177,6 +177,7 @@
- void stepIt_setupGtk(CTR cnt);
- 
- void runIt_setupX(void);
-+void runIt_setupGtk(void);
- 
- 
- /*--------------------------------------------------------------------------
---- a/src/ssGtk.c
-+++ b/src/ssGtk.c
-@@ -82,6 +82,7 @@
- 
- /* externals */
- extern dataStart;
-+ADDR iAinstAddr(ADDR baseAddr, BYTE iAmode, int delta);
- 
- static GtkLabel* instcount_label;
- /* sits in a background loop */
-@@ -100,7 +101,7 @@
- }
- 
- 
--void runIt_setupGtk(void *data)
-+void runIt_setupGtk(void)
- {
- 	g_idle_add(runItGtk, NULL);
- 	stopPressed = NO;
diff --git a/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch b/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
deleted file mode 100644
index 3e9de483fd17..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-## Description: Remove references to HAYES
-## Origin/Author: Andreas Moog <amoog@ubuntu.com>
-## Bug-Ubuntu: https://bugs.launchpad.net/bugs/756157
---- ski//src/linux/syscall-linux.c
-+++ ski.new//src/linux/syscall-linux.c
-@@ -2250,8 +2250,6 @@
- 	case TIOCSERSETMULTI:	/* Set multiport config */
- 	case TIOCMIWAIT:	/* wait for a change on serial input line(s) */
- 	case TIOCGICOUNT:	/* read serial port inline interrupt counts */
--	case TIOCGHAYESESP:	/* Get Hayes ESP configuration */
--	case TIOCSHAYESESP:	/* Set Hayes ESP configuration */
- 	case SIOCRTMSG:	/* call to routing system	*/
- 	case SIOCSIFLINK:	/* set iface channel		*/
- 	case SIOCGIFMEM:	/* get memory address (BSD)	*/
diff --git a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch b/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
deleted file mode 100644
index e3c1083687ac..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ski-1.3.2/src/linux/syscall-linux.c
-+++ ski-1.3.2/src/linux/syscall-linux.c
-@@ -45,7 +45,6 @@
- #include <linux/posix_types.h>
- #include <linux/personality.h>
- #include <linux/sockios.h>
--#include <sys/io.h>
- 
- #include <sys/file.h>
- #include <sys/fsuid.h>
-@@ -72,7 +71,6 @@
- #include <sys/uio.h>
- 
- #include <linux/serial.h>
--#include <asm/page.h>
- #include <asm/unistd.h>
- 
- #include "std.h"
diff --git a/app-emulation/ski/files/ski-1.3.2-uselib.patch b/app-emulation/ski/files/ski-1.3.2-uselib.patch
deleted file mode 100644
index d600cb2ce3fa..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-uselib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/592226
-
-patch taken from Fedora
-
-glibc-2.23+ no longer exports the uselib function.  make the syscall directly.
-
---- ski-1.3.2/src/linux/syscall-linux.c
-+++ ski-1.3.2/src/linux/syscall-linux.c
-@@ -554,7 +554,8 @@
- extern void munmapSyms (ADDR, ADDR);
- extern void dynBlock (ADDR, ADDR);
- extern void memFree (ADDR);
--extern int uselib (const char *libname);	/* Linux specific */
-+#include <sys/syscall.h>
-+#define uselib(libname) syscall(__NR_uselib, libname)
- 
- extern int setresuid (uid_t, uid_t, uid_t);
- extern int getresuid (uid_t *, uid_t *, uid_t *);
diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
deleted file mode 100644
index ae695b1a8056..000000000000
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="ia64 instruction set simulator"
-HOMEPAGE="http://ski.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug motif"
-
-RDEPEND="dev-libs/libltdl:0=
-	sys-libs/ncurses:0=
-	virtual/libelf
-	debug? ( sys-libs/binutils-libs:0= )
-	motif? ( x11-libs/motif:0= )"
-DEPEND="${RDEPEND}
-	app-alternatives/yacc
-	app-alternatives/lex
-	dev-util/gperf"
-
-# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110
-RDEPEND="${RDEPEND} !!games-sports/ski"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-syscall-linux-includes.patch
-	"${FILESDIR}"/${P}-remove-hayes.patch
-	"${FILESDIR}"/${P}-no-local-ltdl.patch
-	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
-	"${FILESDIR}"/${P}-configure-withval.patch
-	"${FILESDIR}"/${P}-binutils.patch
-	"${FILESDIR}"/${P}-uselib.patch #592226
-	"${FILESDIR}"/${P}-ncurses-config.patch
-	"${FILESDIR}"/${P}-prototypes.patch
-	"${FILESDIR}"/${P}-glibc-2.28.patch
-	"${FILESDIR}"/${P}-gcc-10.patch #707144
-	"${FILESDIR}"/${P}-lex-deps.patch #744676
-)
-
-src_prepare() {
-	default
-
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.3.2-binutils-2.34.patch
-	fi
-
-	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
-
-	AT_M4DIR="macros" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-included-ltdl \
-		--without-gtk \
-		$(use_with motif x11) \
-		$(use_with debug bfd)
-}
diff --git a/app-emulation/ski/ski-1.4.0.ebuild b/app-emulation/ski/ski-1.4.0.ebuild
index 1867d53df65f..fbb3ebc06623 100644
--- a/app-emulation/ski/ski-1.4.0.ebuild
+++ b/app-emulation/ski/ski-1.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit flag-o-matic
 
 DESCRIPTION="ia64 instruction set simulator"
-HOMEPAGE="https://github.com/trofi/ski http://ski.sourceforge.net/"
+HOMEPAGE="https://github.com/trofi/ski https://ski.sourceforge.net/"
 SRC_URI="https://github.com/trofi/ski/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 00d2dee7e877..716cebb1f2a7 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,4 @@
 DIST VBoxGuestAdditions_6.1.50.iso 64051200 BLAKE2B 9eff4a3643579ee0426dbe2b62247b8c89321be495e61469628574445fedc06ff2fb9afa108705cbaf24a13db99b4e6e850c61e5c97343095549f444831fcf62 SHA512 d74ce912dbbcef7f644a9f3ba9917782336cbee8e0756727a8753ffc17486a75e833adaa869e205531bc3b81b9cb26aa9b50f44210e78dceece966687122f6c6
 DIST VBoxGuestAdditions_7.0.18.iso 52887552 BLAKE2B 03c2b6a777f37286f97d5e2b3f90bf9592e72f5df45f05dd9ae532c092cc38120475795821a31b6106579e49f86ad0e598b15b63ff52107794d0403fdf617ed9 SHA512 21bac2c7c10b0900c0e29cebd546a31cfb058ce0567166c71d45f150824a8818f739284787181678076982dcf40a2e62578b7a5baf19eabcab4f7385e17d2b44
 DIST VBoxGuestAdditions_7.0.20.iso 53504000 BLAKE2B c29824e0e35104051205b13ce11137c1900be7c24c0d1dd4ff7cb6d936e61a8413a4ee1713034f8a347adfaa9b0ce3b43ce2de5b41dd9e74202f2f97710a8009 SHA512 6b87812ad1d8230c4f8ab79b58b7095c8c56b0b2acd7dcf0ecf54248fff2d0f3c89cc590de32a3cbabf5853ffa55e1cad8500206512141f027919c37b01f84ad
-DIST VBoxGuestAdditions_7.1.0_BETA1.iso 58927104 BLAKE2B 23fd83ecca7f01abde03354bbf896f052e1ca02b805c8a3cc86c995b6541a755de62a695f2ac25b7e41f0eed07ffbb335b6393559611371f80e1a4e97fbd2d60 SHA512 e3f5c095067e37e1c1c7d85f40a5a837d8f316b7577ed291114dac34fffb7eb232a002aad9be1bafe83f7c2bc91c46ee333a8e0154df299c8c6974849a25785c
+DIST VBoxGuestAdditions_7.1.0_BETA2.iso 58843136 BLAKE2B ed04206ff5551da51de1e634c4ccb2a85c9d3565b5945fbc9f4ab4338d2e9cf0babd62d536363402db703783b46f6ff6c4431ac1b5a919f16c33a474e5f7fd60 SHA512 485a88ebe94758bcdbff0e1ce813ed767d731e48d917a9cf05dbbe3e633fdfaebaaf458fd69e8d150f01944fb3cb7dc72e00930ac1a7a3690d638e9870be901a
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.20.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.20.ebuild
index 92124a9f779e..1cb70c695bbd 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.20.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.20.ebuild
@@ -13,7 +13,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-additions/virtualbox-additions-7.1.0_beta1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.1.0_beta2.ebuild
index a33c350bb86a..a33c350bb86a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.1.0_beta1.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.1.0_beta2.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index ddb366bc0c08..f22001eb4f6b 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.50.tar.gz 11175855 BLAKE2B 898ef92a91dbfb39079f8dfa5f4c1e6d91df66e92deb00849ba1da8a2278e3adcfd5754bf70acc6d8b6d7d6273923999860b71c01de3eaabf4d487d718aa14ef SHA512 818f0564a8ee1266f2d03d6e0d5df44278746067ae86279f6e884f519ad3e923382c7b987b3a58fe95e2aa4f0a53b98d553106b0250923e88989e5fdaa9dc3ae
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.18.tar.gz 18264093 BLAKE2B 4cd3f87b02f0340e0b226a68a595fd947de490a0eae36471beedb7f154529bc8f095f7512486660c4373a612608f42cbf6764dc84407143a4db9b1b9e684f754 SHA512 c83bdb6de0c98d558b66eaacdcf07baf004559c436201105e97bbdf387743dcefad285528a7de15c75162b38cd3b13d95155304da744a205661adfb692c6d958
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.20.tar.gz 18263914 BLAKE2B ca31eccf361e7ce865e838d6e819f3b9ecc0852d07660f14aa9fae200a0d04777256e3cd933ffc02992ed7b596779280176916e9d9f030d7aaf2319433fc63f3 SHA512 b0ba22299a9bb81f47fb4c7f4117b1b5210a72973da723185c6d87fe192f7ab0ea0eb9fae6671b84332a234ead8539375976c87c483628449812e617c42598c7
-DIST Oracle_VirtualBox_Extension_Pack-7.1.0_BETA1.tar.gz 22881198 BLAKE2B 2e7fc0c735b2b561fb107c242c9e350f9289df9618a37c3b5a4ec147705d950bf79eadf8472d94fdd5c53a0df02603d7b8c3eb44b99f0d5abc4f5d084e4106ea SHA512 a155a5948fbe78a007791b0522b6eb15ce90b3b31fc3c1a68a9bae143aef77133756c4c0327ad23f88204d34a8d2cef568c316ddce11425181c07f5546220dd7
+DIST Oracle_VirtualBox_Extension_Pack-7.1.0_BETA2.tar.gz 22880390 BLAKE2B 6d88454cbcfdb0321c39e5ee88dbb671cb0652922692d75cdc88d43723d81c23da3d26fff3090c4cae5a42e18cf3d8c905ec077f6448a92b87e84a4fa34c892d SHA512 2f3b4561d1a4c3526d419b3d3aef35a7ee2b2e7b8d2379123b590b0f13bdaab428ee043a4e058d1925da74849a339a834d45825b750a39cf5a03e75eab854393
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.20.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.20.ebuild
index 8c44669215ab..14864047f715 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.20.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.20.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="PUEL-11"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.0_beta1.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.0_beta2.ebuild
index 79106c6400b9..79106c6400b9 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.0_beta1.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.0_beta2.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index d6a331631140..bff11f6adff0 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,7 +1,7 @@
 DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
 DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
 DIST VirtualBox-7.0.20.tar.bz2 173300021 BLAKE2B 23a1553578c8b89c3bea65fd9a451ef5abf419ce8a05524f2afc15b8d9a378a22ffb01c0c792d258320aeddb330b74f8f769180863041e333512d0eed2f4449c SHA512 7682e24d60c1896c661f2689af6820ae67b6bd8d9faaf18c58e8159bc7694ef80722f8e9611d6272da5b46eb2f3a44fc637b277e6801b7a8bf53aad045a81fe9
-DIST VirtualBox-7.1.0_BETA1.tar.bz2 210810840 BLAKE2B adc772165041abf38b748fb92d2923428022631fe1d8e13332142c46e989b2e3408036755f6faa00958b679b200b77d295979451bde2bb2f09917ce1c5e0cf28 SHA512 33fe6000ad58f6cedab69c15384da518e05e946792045ab36f93f54b429accc586914ae1f1532560c78c323b478798296d71795a4baaa3bd6714880a33e69c5e
+DIST VirtualBox-7.1.0_BETA2.tar.bz2 208790183 BLAKE2B 30d1fb0a37463ab4bf8673414cc56c51f618755fe4ec23720379df2519af7af3664c51c0b49955ee03ffdba0a55e67ec75df6af6d2ff79cd611b50c16048df3e SHA512 730c9728e9bdf46e6846c423c13e8e438716eff518f30b102ef29eb71b6c88aa70fc786f1e8b63f9641ef0f90dd6c9768c4fbf002db9fc15ceb22865b4182b1e
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.1.0_beta1.tar.bz2 5287 BLAKE2B 5286b5ad2a8c54150f58e2675383ed611b385b9758e1ed6bf81c7551f01724f5132591b3f173b9605c226a200cf70bf3b170ab6c174554b34ed57ada7e35a12b SHA512 d1599d990dd3341393c4be5f5d947b15de9345b6f1d7201fb44c2506d299479564ca7bf5a0c45ade14998e7a48c300e4514da626a248c0447fd31f3cb31e6715
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.20.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.20.ebuild
index d04a4c8b8c76..b94640b41c20 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.20.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.20.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${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-guest-additions/virtualbox-guest-additions-7.1.0_beta1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.0_beta2.ebuild
index cd37ff892ced..cd37ff892ced 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.0_beta1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.0_beta2.ebuild
diff --git a/app-emulation/virtualbox-kvm/Manifest b/app-emulation/virtualbox-kvm/Manifest
index 6df664b861f1..1d234c3cf39b 100644
--- a/app-emulation/virtualbox-kvm/Manifest
+++ b/app-emulation/virtualbox-kvm/Manifest
@@ -1,4 +1,7 @@
 DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
+DIST VirtualBox-7.0.20.tar.bz2 173300021 BLAKE2B 23a1553578c8b89c3bea65fd9a451ef5abf419ce8a05524f2afc15b8d9a378a22ffb01c0c792d258320aeddb330b74f8f769180863041e333512d0eed2f4449c SHA512 7682e24d60c1896c661f2689af6820ae67b6bd8d9faaf18c58e8159bc7694ef80722f8e9611d6272da5b46eb2f3a44fc637b277e6801b7a8bf53aad045a81fe9
 DIST virtualbox-help-7.0.18.tar.xz 3948116 BLAKE2B 5715a7e609297387b5fccce0951c62e5969fd68adeecb869712e69f5e90daef97384bd3ff3c39de40903a1fabe7ac6d2f8ecdbb40de16abe955d40e49b962eec SHA512 ec0f915b7221bc40d02f5f1675eb0defb5506b2f2bd96c063a96a9346e1c82428ccdda8b3adac43238c451ae185ac31af4a186da17ffe091469e14e696388b3a
+DIST virtualbox-help-7.0.20.tar.xz 3949292 BLAKE2B c56f736606fdedfb59bd1f4446a457587dcbe018d1be3162d94eca780cacfa45b49ba5a9c6b25970d28e5a428904bdfd34d2f229c1e24b567fd1b1959cbdc9ea SHA512 e73e448b8aa875d0f6ae1fb398082fa7183e198191a9b509b63592b5df3a19069b805dcdc11d98da3971a14fd6670d8b0a777e5a6d6b63358f7a4f263ca8d31e
 DIST virtualbox-kvm-7.0.18_pre20240617.tar.gz 131620 BLAKE2B 88f22665c1f774f4799f17777541fb1dd48a6d65f170bd998516f32fa0d84a2b1b18f7ecfcf53dc5365614b7c5b35f9c29ce69be59d475a53cbe8a7ee591f522 SHA512 c3d331bee135c746947735b483ec69536c2b7dfd19049d45212144da5eb952f67081b35a7a874eb3f4a0a611fa617f5d62566a89d2e4c1e4863657f80abd3af5
+DIST virtualbox-kvm-7.0.20_pre20240828.tar.gz 130388 BLAKE2B 68589fce348efe37a46d4e6cb28ced18969c5cffbd3dcaf85a4f0a085782521a26b4fe4901bda914a17dc97514df7c2a0548d616830abdb9b279afc1508f6c28 SHA512 3625a069729158e48d0f356d34657b925e235f24af0cd42d01625936b6baf1f16ab11448fb7c82190722e24b81b240b08786154ad26050ed6dff2c69c89e0cd4
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
diff --git a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.20_pre20240828.ebuild b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.20_pre20240828.ebuild
new file mode 100644
index 000000000000..66f1c7223292
--- /dev/null
+++ b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.20_pre20240828.ebuild
@@ -0,0 +1,753 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+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.0.16"
+ORIGIN_PN="VirtualBox"
+ORIGIN_PV=${PV%_pre*}
+
+MY_PN=virtualbox
+MY_PV=${PV#*_pre}
+MY_P=${ORIGIN_PN}-${ORIGIN_PV}
+
+PATCHES_DIR="${WORKDIR}"/${PN}-dev-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/ https://github.com/cyberus-technology/virtualbox-kvm"
+SRC_URI="
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${PATCHES_PV}.tar.bz2
+	https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://download.virtualbox.org/virtualbox/${ORIGIN_PV}/${MY_P}.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${MY_PN}/${MY_PN}-help-${ORIGIN_PV}.tar.xz ) )
+"
+S="${WORKDIR}/${ORIGIN_PN}-${ORIGIN_PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0"
+IUSE="alsa dbus debug doc dtrace +gui +hardened java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	acct-group/vboxusers
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	!app-emulation/virtualbox
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-build/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+	python? ( ${PYTHON_DEPS} )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk ${PYTHON_REQUIRED_USE} )
+	vboxwebsrv? ( java )
+"
+
+PATCHES=(
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-${PATCHES_PV}/patches
+	"${PATCHES_DIR}"/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${MY_PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# bug #916002, #488176
+	tc-ld-force-bfd
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${MY_PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+		--with-kvm
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !hardened --disable-hardening)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev !vmmraw --disable-vmmraw)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	if use python; then
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON=$(usev python 1)
+			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+			VBOX_LIB_PYTHON=$(python_get_library_path)
+		EOF
+
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	else
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON:=
+		EOF
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${MY_PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${MY_PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${MY_PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root with USE=hardened.
+	local mode=$(usex hardened 4750 0750)
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} ${mode}
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL ${mode}
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM ${mode}
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		if use opengl; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		newmenu ${MY_PN}.desktop ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${MY_PN}-${size}px.png ${PN}.png
+		done
+		newicon ${MY_PN}-48px.png ${PN}.png
+		newicon -s scalable ${MY_PN}.svg ${PN}.png
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${MY_PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${MY_PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo ${mode}
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${MY_PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${MY_PN}-help-${ORIGIN_PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
+	fi
+	dodoc ${PATCHES_DIR}/README.*
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+		sed -e "1 i\#! ${PYTHON}" -i vboxshell.py || die
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${MY_PN}-vboxusb_tmpfilesd virtualbox-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${ORIGIN_PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${MY_PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 8620eefe8a73..81c02fe4afdb 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
 DIST vbox-kernel-module-src-6.1.50.tar.xz 680700 BLAKE2B c3a10ce8f3eb7e6c0c05f81cd3c072296557b9f9f6f501bb0aec3f04aabfe1fbb67b553510104139cef290c09ff9e67161085781b8d28c968dfafd15958a1b1a SHA512 7822e421b595263cbdaae08103255742360ca7ab0c385818ec895f10570c5b9ed5c7614742d8fa8bc2414cd426907cd1c49d735cde8caf9d2b7692898058f592
 DIST vbox-kernel-module-src-7.0.18.tar.xz 719604 BLAKE2B 44e9d895791a7ff50681dd8860456a87078b41a4eb3005a6b249f9b34c37de709e190cbd6f352d21010ddcb9d8d1c35303bafd765e999664288df9e0ead94e6c SHA512 1cc17e302ef8251abd08a078abf11fede242154b0bb78d03f8d7c2821ba7cff410bd255802316a2f13100884b35a6f14fdf0b594304bd041521b66d264f51b77
 DIST vbox-kernel-module-src-7.0.20.tar.xz 720160 BLAKE2B 833aa87af13a6c3e9426bd00e32b14c8b3958ab14425e8c02141d8579e987255b170662e00abb92f17234d4f03462d6d5b9fc1279d9da5449d344a328c905c8f SHA512 650bb6cf16ae42774524bf2e7ad2ee125d7a8d57de1e58d24b8b49bb9cf2829ea01dd32d2c1e0b2df556eab4a458cb0d84715b92d4085d03891f62a46aaf2916
-DIST vbox-kernel-module-src-7.1.0_beta1.tar.xz 738208 BLAKE2B 86a1edbfdf5505ccda2f8c3024570b7797e0d81b3c9ce7f9c3c3bf33d997558f93a660d20e29dc9da3ad0d9ae81300132f702d76756b9967c9d8d2e5b2947f67 SHA512 6b3ecbcc2a57d8292df6c4d880ebd9378245ff2eda1e623e7efefe9d99badce93a9ad5416c24a7e25ba0a81c8965407abb946cd858b9641db4e0945f4cc66c7a
+DIST vbox-kernel-module-src-7.1.0_beta2.tar.xz 738152 BLAKE2B bb51b804f91890c4ad8254ea1d920dd1a491ef4e9e72c644c4d9189dbb507f330cbf312d8187611cab6f946f959c3171a144d8466dbb38303d0b96b6a36f58e0 SHA512 6b99b42d5475be053e826a3fc3d3b2e53effd08abd533d266e9fcbbca46c1b2dd3eedc4f15eb105917411ef8e32eefa9392d49fa93b2ab9ef917d12931b50f59
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.20.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.20.ebuild
index 08e22e5e0379..ba255fc783b5 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.20.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.20.ebuild
@@ -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-modules/virtualbox-modules-7.1.0_beta1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.1.0_beta2.ebuild
index 0c1f6c073492..0c1f6c073492 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.1.0_beta1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.1.0_beta2.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 04a5a40741f9..22bb0c1104a5 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,7 +1,7 @@
 DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
 DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
 DIST VirtualBox-7.0.20.tar.bz2 173300021 BLAKE2B 23a1553578c8b89c3bea65fd9a451ef5abf419ce8a05524f2afc15b8d9a378a22ffb01c0c792d258320aeddb330b74f8f769180863041e333512d0eed2f4449c SHA512 7682e24d60c1896c661f2689af6820ae67b6bd8d9faaf18c58e8159bc7694ef80722f8e9611d6272da5b46eb2f3a44fc637b277e6801b7a8bf53aad045a81fe9
-DIST VirtualBox-7.1.0_BETA1.tar.bz2 210810840 BLAKE2B adc772165041abf38b748fb92d2923428022631fe1d8e13332142c46e989b2e3408036755f6faa00958b679b200b77d295979451bde2bb2f09917ce1c5e0cf28 SHA512 33fe6000ad58f6cedab69c15384da518e05e946792045ab36f93f54b429accc586914ae1f1532560c78c323b478798296d71795a4baaa3bd6714880a33e69c5e
+DIST VirtualBox-7.1.0_BETA2.tar.bz2 208790183 BLAKE2B 30d1fb0a37463ab4bf8673414cc56c51f618755fe4ec23720379df2519af7af3664c51c0b49955ee03ffdba0a55e67ec75df6af6d2ff79cd611b50c16048df3e SHA512 730c9728e9bdf46e6846c423c13e8e438716eff518f30b102ef29eb71b6c88aa70fc786f1e8b63f9641ef0f90dd6c9768c4fbf002db9fc15ceb22865b4182b1e
 DIST virtualbox-help-7.0.16.tar.xz 3948696 BLAKE2B 5c5937313ea0e5cb4764b8a61fd1587e88a4afc965ef00862c5a265a15253929d35e0635231b6be5656f26f600bc4b70a2fa2ebc0f33b35d35c184b57e5acef8 SHA512 b9baca57118a82e3489c8445f0988671f16f75de60cc2d929d5e3b0c4c9e3ceacd796a72a81bba88d69eb4b4559835a13775c18d7782ae7dbe8ad202e247db0c
 DIST virtualbox-help-7.0.18.tar.xz 3948116 BLAKE2B 5715a7e609297387b5fccce0951c62e5969fd68adeecb869712e69f5e90daef97384bd3ff3c39de40903a1fabe7ac6d2f8ecdbb40de16abe955d40e49b962eec SHA512 ec0f915b7221bc40d02f5f1675eb0defb5506b2f2bd96c063a96a9346e1c82428ccdda8b3adac43238c451ae185ac31af4a186da17ffe091469e14e696388b3a
 DIST virtualbox-help-7.0.20.tar.xz 3949292 BLAKE2B c56f736606fdedfb59bd1f4446a457587dcbe018d1be3162d94eca780cacfa45b49ba5a9c6b25970d28e5a428904bdfd34d2f229c1e24b567fd1b1959cbdc9ea SHA512 e73e448b8aa875d0f6ae1fb398082fa7183e198191a9b509b63592b5df3a19069b805dcdc11d98da3971a14fd6670d8b0a777e5a6d6b63358f7a4f263ca8d31e
diff --git a/app-emulation/virtualbox/virtualbox-7.0.20.ebuild b/app-emulation/virtualbox/virtualbox-7.0.20.ebuild
index ac0bf0cafce8..be25e287f25e 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.20.ebuild
@@ -34,7 +34,7 @@ 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 +udev vboxwebsrv vde +vmmraw vnc"
 
 unset WATCOM #856769
diff --git a/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild b/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
deleted file mode 100644
index 40cc4cfebb03..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
+++ /dev/null
@@ -1,739 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# USE=doc does not work for now.
-#
-#
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-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
-
-MY_PN="VirtualBox"
-MY_PV=${PV^^}
-MY_P=${MY_PN}-${MY_PV}
-HELP_PV=7.0.20
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.0_beta1.tar.bz2
-	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${HELP_PV}.tar.xz ) )
-"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-# Beta version
-#KEYWORDS="~amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	acct-group/vboxusers
-	app-arch/xz-utils
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libtpms
-	dev-libs/libxml2
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	net-misc/curl
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtbase:6[widgets]
-		dev-qt/qtscxml:6
-		dev-qt/qttools:6[assistant]
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,video]
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	x11-libs/libXt
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-base/xorg-proto
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? (
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-	)
-	pulseaudio? ( media-libs/libpulse )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	>=app-arch/tar-1.34-r2
-	>=dev-lang/yasm-0.6.2
-	dev-libs/libIDL
-	dev-util/glslang
-	>=dev-build/kbuild-0.1.9998.3592
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qthelp:5
-	)
-	gui? ( dev-qt/qttools:6[linguist] )
-	nls? ( dev-qt/qttools:6[linguist] )
-	java? ( virtual/jdk:1.8 )
-	python? ( ${PYTHON_DEPS} )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk ${PYTHON_REQUIRED_USE} )
-	vboxwebsrv? ( java )
-"
-
-PATCHES=(
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.1.0_beta1/patches
-	"${FILESDIR}"/${P}-link-with-mold.patch
-)
-
-DOCS=()	# Don't install the default README file during einstalldocs
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use nls && use gui; then
-		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
-		einfo "will have NLS support."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# bug #916002, #488176, #925347
-	tc-ld-is-mold || tc-ld-force-bfd
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# bug #908814
-	filter-lto
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		sed -i 's/sdl-config/sdl2-config/' configure || die
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	if tc-is-clang; then
-		# clang assembler chokes on comments starting with /
-		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
-
-		# clang does not support this extension
-		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# fix help path #891879
-	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VM.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-
-	if ! use nls && ! use gui; then
-		cat >> LocalConfig.kmk <<-EOF || die
-			VBOX_WITH_NLS :=
-			VBOX_WITH_MAIN_NLS :=
-			VBOX_WITH_PUEL_NLS :=
-			VBOX_WITH_VBOXMANAGE_NLS :=
-		EOF
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev vboxwebsrv --enable-webservice)
-		$(usev vde --enable-vde)
-		$(usev !vmmraw --disable-vmmraw)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	if use python; then
-		cat >> AutoConfig.kmk <<-EOF || die
-			VBOX_WITH_PYTHON=$(usev python 1)
-			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-			VBOX_LIB_PYTHON=$(python_get_library_path)
-		EOF
-
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	else
-		cat >> AutoConfig.kmk <<-EOF || die
-			VBOX_WITH_PYTHON:=
-		EOF
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	# environment variables used during SDK binding installation
-	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
-	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM 4750
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		domenu ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	elif use gui; then
-		dodoc "${WORKDIR}"/${PN}-help-${HELP_PV}/UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-
-		# 378871
-		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
-		pushd "${installer_dir}" &> /dev/null || die
-		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
-			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
-			-i vboxapi/__init__.py || die
-		# insert shebang, the files come without one
-		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
-		python_domodule vboxapi
-		popd &> /dev/null || die
-
-		# upstream added a /bin/sh stub here
-		# use /usr/bin/python3, python_doscript will take care of it
-		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
-		python_doscript vboxshell.py
-
-		# do not install the installer
-		rm -r "${installer_dir%vboxapi*}" || die
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${MY_PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-emulation/virtualbox/virtualbox-7.1.0_beta2.ebuild b/app-emulation/virtualbox/virtualbox-7.1.0_beta2.ebuild
new file mode 100644
index 000000000000..19e72e29a5e4
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.1.0_beta2.ebuild
@@ -0,0 +1,739 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# USE=doc does not work for now.
+#
+#
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+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
+
+MY_PN="VirtualBox"
+MY_PV=${PV^^}
+MY_P=${MY_PN}-${MY_PV}
+HELP_PV=7.0.20
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.0_beta1.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${HELP_PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+# Beta version
+#KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	acct-group/vboxusers
+	app-arch/xz-utils
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtbase:6[widgets]
+		dev-qt/qtscxml:6
+		dev-qt/qttools:6[assistant]
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	x11-libs/libXt
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? (
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+	)
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-build/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/qttools:6[linguist] )
+	nls? ( dev-qt/qttools:6[linguist] )
+	java? ( virtual/jdk:1.8 )
+	python? ( ${PYTHON_DEPS} )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk ${PYTHON_REQUIRED_USE} )
+	vboxwebsrv? ( java )
+"
+
+PATCHES=(
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.1.0_beta1/patches
+	"${FILESDIR}"/${PN}-7.1.0_beta1-link-with-mold.patch
+)
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# bug #916002, #488176, #925347
+	tc-ld-is-mold || tc-ld-force-bfd
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev !vmmraw --disable-vmmraw)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	if use python; then
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON=$(usev python 1)
+			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+			VBOX_LIB_PYTHON=$(python_get_library_path)
+		EOF
+
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	else
+		cat >> AutoConfig.kmk <<-EOF || die
+			VBOX_WITH_PYTHON:=
+		EOF
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${HELP_PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+
+		# upstream added a /bin/sh stub here
+		# use /usr/bin/python3, python_doscript will take care of it
+		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir%vboxapi*}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${MY_PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index f4fda221d58a..1586b5b7222c 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1 +1,2 @@
 DIST vkd3d-1.12.tar.xz 1095416 BLAKE2B 6e5fa5c6a743ab103c6d1564f025689351620d587008eb079517a871aaf9895f9521a4a83e30896c1d7b4a378ff54e193340d4c915dbf91ad6b350746ccdbfd8 SHA512 ac444ebcdbc7bf84cb5726affd7a4f075116b4016f06a9fff47f30182945848ee04ceda587f864fc02c11a064bf7d92e492e2cf30fe53cc7cfe23a61cf85e776
+DIST vkd3d-1.13.tar.xz 1123980 BLAKE2B 1b144ce9bd4351b59f1fc36f342d40f448ae45e8293968c1326ad74ec2a065a45ca543f7837fb0ab905caeaff2b38e54b76d81174839655465ed8a5cc3d024d5 SHA512 a2cb339aa68c01d961a67236fb3f5d247f359fce73aabe948933a02102a63029fb697ea8577e3086458c5fd59b787f74957b7a79534394960df8b6052fd0f993
diff --git a/app-emulation/vkd3d/vkd3d-1.13.ebuild b/app-emulation/vkd3d/vkd3d-1.13.ebuild
new file mode 100644
index 000000000000..92d9d092e4bf
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.13.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: This package is only needed by old wine-7 given >=8 builds a
+# bundled PE vkd3d using mingw rather than use the shared ELF library.
+#
+# Also unclear if bumping is safe, newer vkd3d is hardly tested with
+# old Wine and its old vulkan support. Quite possibly already unusable
+# but there is very few users of wine-7+d3d12 to report issues.
+#
+# Either way can be last-rited whenever wine-{vanilla,proton}-7 are gone,
+# or alternatively USE=vkd3d could be masked/removed if broken.
+
+inherit multilib-minimal
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://gitlab.winehq.org/wine/vkd3d/"
+SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ncurses spirv-tools"
+RESTRICT="test" #838655
+
+RDEPEND="
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	ncurses? ( sys-libs/ncurses:= )
+	spirv-tools? ( dev-util/spirv-tools[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/spirv-headers
+	dev-util/vulkan-headers
+"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local conf=(
+		$(multilib_native_use_with ncurses)
+		$(use_with spirv-tools)
+		--disable-doxygen-pdf
+		--without-xcb
+		# let users' flags control lto (bug #933178)
+		vkd3d_cv_cflags__flto_auto=
+	)
+
+	ECONF_SOURCE=${S} econf "${conf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 69d60f92bee6..ccd2d39ee888 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -10,3 +10,5 @@ DIST wine-mono-9.1.0-x86.msi 84623872 BLAKE2B 63e86a4f99a5300782017f0b1a2168ad49
 DIST wine-mono-9.1.0-x86.tar.xz 43820028 BLAKE2B 6249e661239b71ca2607cf5fb3285bbef3e4c056c87e15352e40d2875028dbaa7f1c1a8b4d908f74de8447b4166c61c708314dc6422e9f69a6eea5f588e7c73b SHA512 cede2b910e95fc43e658e6d4d8086ec5324407a32fff4852341178e1e56df240356c02f270e3be174f3ab82aa076e50d70be4da8e8c5f77e877fce8fe3217374
 DIST wine-mono-9.2.0-x86.msi 84566016 BLAKE2B 08c106998536622cdda10065304416a338ba9fe0e5680949c66b2766116bfc93c41b0169e0beb614f741edccf5fae576de78d2b1c6bc9f2dfa89036bfd3b23ed SHA512 3256358a49321173c17e8b907e0d8affed4fb735ca3da91749377501de1a924711f37971a9c8e05e687140d3d65399903e69bb5981d271f2b698a910d91e8b54
 DIST wine-mono-9.2.0-x86.tar.xz 43901320 BLAKE2B 125d81049bca105e8967338659dd21c174388dfc8be9802a5984b8fc11b4da22b82512590481d45ebd7554f89c5e9cad9c59b4406ba04436ada5b52ea2aea0cc SHA512 7d0039b7c77ed968c0e00eacd3bf716d3ec9dffc86f6cc2c2f9439320b889ae2e05cc4f9aade5e1a0122a86ee4b86cea4224e666aba0d0bb3f2fa6fb0d18f8ae
+DIST wine-mono-9.3.0-x86.msi 84572160 BLAKE2B b6e13d5245b17c0f2857771c8bcfc7ca248d13f300df69970b5994d3287e3e4db0c49601b0cd29b7f6764f2abda5b54a3f0bf1ad1d2beb28033adba9276c7b5c SHA512 d5bb8ed9cc963292b37edb2ac3fb5945346b9632a080d5413ebde3470ff1702c9fdd0d4a25c0cd228e56abe11f6e1cf3d949a2c26099bf2fdef41aaf65f686ef
+DIST wine-mono-9.3.0-x86.tar.xz 43906032 BLAKE2B 94dc27d305fb062f845064c07dcd00d2daaf9647ae5353e18267314b6534018bf22b1411981ef8e3cb9ef8fa0d91da662211376a309a243100d691386b1840e4 SHA512 094113aad504fa46d9f3b0ca6f7926c14fbda3edbbbc5dab307f19114fec0173a451a604b2083f399e61d5c6704971a0d602930cc9ba11502c863ec67318c480
diff --git a/app-emulation/wine-mono/wine-mono-9.3.0.ebuild b/app-emulation/wine-mono/wine-mono-9.3.0.ebuild
new file mode 100644
index 000000000000..f756896e7c2e
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-9.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://wiki.winehq.org/Mono"
+SRC_URI="
+	shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz )
+	!shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
+S="${WORKDIR}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+src_install() {
+	insinto /usr/share/wine/mono
+
+	if use shared; then
+		doins -r ${P}
+	else
+		doins "${DISTDIR}"/${P}-x86.msi
+	fi
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2ffa82559c6b..2c954f943873 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,12 +1,8 @@
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-DIST wine-9.11.tar.xz 30301904 BLAKE2B 745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf SHA512 695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
-DIST wine-9.12.tar.xz 30339552 BLAKE2B e114b3a1db237345b9f86cb3a9f1e0040067275eb6c840e480f5fe6f4fa67ba9d4603b2006552ba2ef0ed45e53de9a25b67d4a50e24fad6a9b0e06d1e95763c7 SHA512 00c25cb11feed3625ebd8dc76fa35930d07d51182be4537c488ac4e713d6f9c61b974b19eafb57f54630376346dc1749c4d36a18d0f72748b34052cc7322df19
-DIST wine-9.13.tar.xz 30542188 BLAKE2B a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608 SHA512 f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
-DIST wine-9.14.tar.xz 30561796 BLAKE2B 8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4 SHA512 f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117
 DIST wine-9.15.tar.xz 30580680 BLAKE2B 70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6 SHA512 4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
+DIST wine-9.16.tar.xz 30638928 BLAKE2B 65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9 SHA512 5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187
+DIST wine-9.17.tar.xz 30684564 BLAKE2B 36049b7ed096865a647cea9ac1def6cf2a35984a72ae192d402a40f34c8a97e967cee31724d84d422f835f272fcba9ba818e1e787f7940b18d835aa234b0c6b7 SHA512 06ee82fc0f0c8c02f1f646f674e8e3c5d4b9ca9cf64a910b01eb9c6d5dbe0471a6b232875e099c2e5cfd8e1c183ee72850820f24fc026b11523b56872a2efec5
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
-DIST wine-staging-9.11.tar.gz 9460666 BLAKE2B 8b4193663c6f6f4e17f4dc6a2486f7b96be67f2034298709bc14971376d53b0d41e748b4ab991bb24430cc8eefd52ccd0ca4577f4612df80db8d72310110debb SHA512 3f60e43e39b0d78938e3765719bb0aa3f052e9dbbed71cc6990a8038c9dddcd62edacd85c75bf7383f62294f2b0b464adc1eb9e16fbac81d60f779e55addc65b
-DIST wine-staging-9.12.tar.gz 9456608 BLAKE2B a9bdcc4fc855ce4382a688cb57232715d26917b6d9c6fbd43323bb943070cb3b11ebc1c3040cc51fd3b6d2af6e8a7c50907480f8c538ea12e3846529ed9da255 SHA512 85d135cc9bef9357ae0899f7b2b5ae61750f1d733dbae05c56e29e5b5705c6b2b9c3c95a83ceec35cf7b631f4157d6685317f8a1078fe1cf7f6c550f7db80009
-DIST wine-staging-9.13.tar.gz 9486868 BLAKE2B ef89e0c542689dfab7cc761ee210e434df9586f997da19868991752f6aa152494060ba39e9d70f8652749d77c0273b86b11fb06ff27efe3e4e1af9ef2795c969 SHA512 a43e1ac3be6e9563cf14b27bbfeb7b916b10322affacaf4fb1b648444ff6d43f8f15f7b31b01c692add884d45394acd21f0699ed25c52e1a021a821cf47d6168
-DIST wine-staging-9.14.tar.gz 9452219 BLAKE2B 31da595c5e6a51bbf5a244b2a40bbc02d536c4bd64468ef5615bf2c1356967d2e18f0c68d3ff30a6fec31362373a1a24871362fd08d27d76780fd400d290a28c SHA512 ab5fcbc32d6920be887618f58d2b848f42ee90677b4fe24c40cda40f26d640168e96c5021edb5c27ed2355cc3b2ec19a99bc3a8a745abdbb70a8498703a3db91
 DIST wine-staging-9.15.tar.gz 9516589 BLAKE2B e0511494a9cefec0349f7f24830e6dafb032ea33290b09c9b168f06cc7c621a53ede34dbc379a0adb17feb17af4d8872c6863ca4a38c5979572feaa3c0cabbc5 SHA512 37237e4f19319e34341fef1bb656d5c98309d148cdef7f105e7cd4eb10134364766df5287755ba23ebc2a3d28294bd10c7991c9a3acbe076ad33a386ae92b304
+DIST wine-staging-9.16.tar.gz 9506127 BLAKE2B 05311c5af15052b1a8d846d3ff3f09b476b71eb13f82e37e8d1dcd08032c85d9ab03c27f595d5b72dd121f143f07b6b7246b7bd9f8df16e0923aa26a8f92195f SHA512 513af6d56f491e49c29ffced546b9025d0dbd4cf0c0186cd118132380bf58f45277d129c49fd3f5bc1ccc5d391e456fd2f0792b60b92d1dc448ba8b1f98efa34
+DIST wine-staging-9.17.tar.gz 9383269 BLAKE2B b82d74a6cfefce477193f72906fccd69dc34e4199db4f9c68efda484dfc462b6a828c549d4428f6a3c7479d3a3ad939eb3f4b28b2d64e31093d107b1c2316ef8 SHA512 ce21e026870dece09713eb64a046381942085742456057dc147490968724a0f7dc5ef059f0b26f9125f20de50a3e6beaae5cea2aa95ab1fae3e1d92305d92488
diff --git a/app-emulation/wine-staging/wine-staging-9.11.ebuild b/app-emulation/wine-staging/wine-staging-9.11.ebuild
deleted file mode 100644
index 087ec27eccec..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.11.ebuild
+++ /dev/null
@@ -1,486 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
-	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-			EGIT_CHECKOUT_DIR=${S}
-			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-			git-r3_src_unpack
-		)
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-staging
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	# >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
-	# staging patchset is messier and would rather not have to worry
-	# about it (try to remove on bump now and then, bug #919758)
-	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-9.12.ebuild b/app-emulation/wine-staging/wine-staging-9.12.ebuild
deleted file mode 100644
index f37334b9fc3c..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.12.ebuild
+++ /dev/null
@@ -1,488 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-			EGIT_CHECKOUT_DIR=${S}
-			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-			git-r3_src_unpack
-		)
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-staging
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with odbc)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	# >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
-	# staging patchset is messier and would rather not have to worry
-	# about it (try to remove on bump now and then, bug #919758)
-	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-9.13.ebuild b/app-emulation/wine-staging/wine-staging-9.13.ebuild
deleted file mode 100644
index 701e686b693b..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.13.ebuild
+++ /dev/null
@@ -1,487 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-			EGIT_CHECKOUT_DIR=${S}
-			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-			git-r3_src_unpack
-		)
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-staging
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with odbc)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	# >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
-	# staging patchset is messier and would rather not have to worry
-	# about it (try to remove on bump now and then, bug #919758)
-	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-9.14.ebuild b/app-emulation/wine-staging/wine-staging-9.14.ebuild
deleted file mode 100644
index 701e686b693b..000000000000
--- a/app-emulation/wine-staging/wine-staging-9.14.ebuild
+++ /dev/null
@@ -1,487 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-# gitapply.sh prefers git but can fallback to patch+extras
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-			EGIT_CHECKOUT_DIR=${S}
-			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-			git-r3_src_unpack
-		)
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-staging
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with odbc)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	# >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
-	# staging patchset is messier and would rather not have to worry
-	# about it (try to remove on bump now and then, bug #919758)
-	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-9.16.ebuild b/app-emulation/wine-staging/wine-staging-9.16.ebuild
new file mode 100644
index 000000000000..992a6503e0ea
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.16.ebuild
@@ -0,0 +1,482 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.2.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/
+"
+
+S="${WORKDIR}/${WINE_P}"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
+	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+	+xcomposite xinerama
+"
+# bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900334)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		# hack: use subshell to preserve state (including what git-r3 unpack
+		# sets) for smart-live-rebuild as this is not the repo to look at
+		(
+			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+			EGIT_CHECKOUT_DIR=${S}
+			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+			git-r3_src_unpack
+		)
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local patchinstallargs=(
+		--all
+		--no-autoconf
+		${MY_WINE_STAGING_CONF}
+	)
+
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-staging
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with odbc)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				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,*'
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
+	fi
+
+	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
+		games-util/game-device-udev-rules
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-staging/wine-staging-9.17.ebuild b/app-emulation/wine-staging/wine-staging-9.17.ebuild
new file mode 100644
index 000000000000..52de71bd6897
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-9.17.ebuild
@@ -0,0 +1,482 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.3.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/
+"
+
+S="${WORKDIR}/${WINE_P}"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
+	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+	+xcomposite xinerama
+"
+# bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900334)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		# hack: use subshell to preserve state (including what git-r3 unpack
+		# sets) for smart-live-rebuild as this is not the repo to look at
+		(
+			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+			EGIT_CHECKOUT_DIR=${S}
+			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+			git-r3_src_unpack
+		)
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local patchinstallargs=(
+		--all
+		--no-autoconf
+		${MY_WINE_STAGING_CONF}
+	)
+
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-staging
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				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,*'
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
+	fi
+
+	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
+		games-util/game-device-udev-rules
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 701e686b693b..f01c88936d1c 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
+WINE_MONO=9.3.0
 WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == *9999 ]]; then
@@ -36,11 +36,11 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama
+	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
+	+ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland
+	wow64 +xcomposite xinerama
 "
 # bug #551124 for truetype
 # TODO: wow64 can be done without mingw if using clang (needs bug #912237)
@@ -74,6 +74,7 @@ WINE_DLOPEN_DEPEND="
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
@@ -89,13 +90,13 @@ WINE_COMMON_DEPEND="
 	)
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
 	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		dev-libs/glib:2[${MULTILIB_USEDEP}]
 		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@@ -289,6 +290,7 @@ src_configure() {
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with cups)
+		$(use_with ffmpeg)
 		$(use_with fontconfig)
 		$(use_with gphoto2 gphoto)
 		$(use_with gstreamer)
@@ -297,7 +299,6 @@ src_configure() {
 		$(use_with mingw)
 		$(use_with netapi)
 		$(use_with nls gettext)
-		$(use_with odbc)
 		$(use_with opencl)
 		$(use_with opengl)
 		$(use_with osmesa)
@@ -318,6 +319,7 @@ src_configure() {
 		$(use_with wayland)
 		$(use_with xcomposite)
 		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
 	filter-lto # build failure
@@ -334,11 +336,6 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
-	# >=wine-vanilla-9 has proper fixes and builds with gcc-14, but
-	# staging patchset is messier and would rather not have to worry
-	# about it (try to remove on bump now and then, bug #919758)
-	append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
 	if use mingw; then
 		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 8ec1b3afebef..27f42fedd669 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,8 +1,6 @@
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-DIST wine-9.11.tar.xz 30301904 BLAKE2B 745cab93268f51a3d31562af6d392fec5ed0d18aeca3684d0d3ef68ef144e20ec2c0879853f67538db833ec89321e1b1e09533882802eb68452ad3fed87193cf SHA512 695170140372f169e78e90a66d938839c70f9647531ae8d782c58fb0450460174f2958f7656f8d516447a22ef6e792a8c89f2f18c25fac847adf46bc51184999
-DIST wine-9.12.tar.xz 30339552 BLAKE2B e114b3a1db237345b9f86cb3a9f1e0040067275eb6c840e480f5fe6f4fa67ba9d4603b2006552ba2ef0ed45e53de9a25b67d4a50e24fad6a9b0e06d1e95763c7 SHA512 00c25cb11feed3625ebd8dc76fa35930d07d51182be4537c488ac4e713d6f9c61b974b19eafb57f54630376346dc1749c4d36a18d0f72748b34052cc7322df19
-DIST wine-9.13.tar.xz 30542188 BLAKE2B a832468142d68a21696d45d01ed8b9e464dc5f95e5a5205a08573024a2b0e7ccc4415388de4cef9581976b10a7e5723d9058e22cc56eed897b25b2a7fa369608 SHA512 f9c74beae87a02c4ae6176676bbc9de203224651ed4eeafbe6cfc05b8a455a9ce790d3211135fbeb6425719e4c0423e345dfee5ed2cefdb80706784f464f7225
-DIST wine-9.14.tar.xz 30561796 BLAKE2B 8055d311cd3d3d2c5f19e5f065066166afa41d8c95f946dea31931f2780953f2902b8bd36f5438ebc582cbe3c51fd4c221b429b9b9a6b59c0b8f9012a52b9bf4 SHA512 f242d4fa55db2d68813a8516c16f5404000e0da941c5e4796fea837625a67df16d31a60b7a4f5769662f0709086dc1d952e8d63cb16c493c805eff9a4264b117
 DIST wine-9.15.tar.xz 30580680 BLAKE2B 70a3dd1d566ce2022a197735bfbc6a879f99608d3b44dcb170dde68762b86cd880581bdc857090dad2733468f5aca3bb2613ef884fa35e361fce19e6e15dcef6 SHA512 4d19b7c0fbdf6ee5dc90c0aef800df47f5bda7e3506e5a3c065dcd29b33cc62840ae4eeb5c20c48e9400c0d1252b897d8bbc60fd5a58da1ad6e76ba677997cb3
+DIST wine-9.16.tar.xz 30638928 BLAKE2B 65665d674842980345d4f3730a75a1734fd5b9c3f08a2700624e4cc18b3d496a1db790e6098c404e05ea9544e671e2cf3f5d10f7fdc0863c6cf0714a9b597af9 SHA512 5f2994d20b8c7635125b38b6a4d89db4b71791f096276fa93e36dc6951c47c25b8a3354f0be0931799ac83c54f048e34693b56512cc446b93c74344b1a458187
+DIST wine-9.17.tar.xz 30684564 BLAKE2B 36049b7ed096865a647cea9ac1def6cf2a35984a72ae192d402a40f34c8a97e967cee31724d84d422f835f272fcba9ba818e1e787f7940b18d835aa234b0c6b7 SHA512 06ee82fc0f0c8c02f1f646f674e8e3c5d4b9ca9cf64a910b01eb9c6d5dbe0471a6b232875e099c2e5cfd8e1c183ee72850820f24fc026b11523b56872a2efec5
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild
deleted file mode 100644
index ea264050fc99..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-9.11.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build optfeature
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
-	S="${WORKDIR}/wine-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="
-	https://www.winehq.org/
-	https://gitlab.winehq.org/wine/wine/
-"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
-# bug #551124 for truetype
-# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900338)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-vanilla
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with odbc)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild
deleted file mode 100644
index 27cb53b52387..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-9.13.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build optfeature
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
-	S="${WORKDIR}/wine-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="
-	https://www.winehq.org/
-	https://gitlab.winehq.org/wine/wine/
-"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
-# bug #551124 for truetype
-# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900338)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-vanilla
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with odbc)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.14.ebuild
deleted file mode 100644
index 27cb53b52387..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-9.14.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build optfeature
-inherit prefix toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
-	S="${WORKDIR}/wine-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="
-	https://www.winehq.org/
-	https://gitlab.winehq.org/wine/wine/
-"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
-# bug #551124 for truetype
-# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	|| (
-		sys-devel/binutils
-		sys-devel/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900338)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# if used without --target *-windows, then gets used in install
-			# phase despite USE=mingw, drop as a quick fix for now
-			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-		else
-			# fails in ./configure unless --enable-archs is passed, allow to
-			# bypass with EXTRA_ECONF but is currently considered unsupported
-			# (by Gentoo) as additional work is needed for (proper) support
-			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
-			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
-				die "building ${PN} with clang is only supported with USE=mingw"
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-vanilla
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with odbc)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	filter-lto # build failure
-	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-
-	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
-	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
-	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.16.ebuild
index 27cb53b52387..27cb53b52387 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.16.ebuild
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.17.ebuild
new file mode 100644
index 000000000000..22b468368b77
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.17.ebuild
@@ -0,0 +1,439 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.3.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/
+"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
+	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+	+xcomposite xinerama"
+# bug #551124 for truetype
+# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900338)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-vanilla
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				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,*'
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
+	fi
+
+	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
+		games-util/game-device-udev-rules
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 27cb53b52387..838210bfb98a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic multilib multilib-build optfeature
 inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
+WINE_MONO=9.3.0
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -30,11 +30,12 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
-	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
-	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama"
+	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
+	+ssl +strip +truetype udev udisks +unwind usb v4l +vulkan wayland
+	wow64 +xcomposite xinerama
+"
 # bug #551124 for truetype
 # TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
@@ -67,6 +68,7 @@ WINE_DLOPEN_DEPEND="
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
@@ -82,13 +84,13 @@ WINE_COMMON_DEPEND="
 	)
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
 	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		dev-libs/glib:2[${MULTILIB_USEDEP}]
 		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 	)
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@@ -246,6 +248,7 @@ src_configure() {
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with cups)
+		$(use_with ffmpeg)
 		$(use_with fontconfig)
 		$(use_with gphoto2 gphoto)
 		$(use_with gstreamer)
@@ -254,7 +257,6 @@ src_configure() {
 		$(use_with mingw)
 		$(use_with netapi)
 		$(use_with nls gettext)
-		$(use_with odbc)
 		$(use_with opencl)
 		$(use_with opengl)
 		$(use_with osmesa)
@@ -275,6 +277,7 @@ src_configure() {
 		$(use_with wayland)
 		$(use_with xcomposite)
 		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
 	filter-lto # build failure
diff --git a/app-emulation/winetricks/winetricks-20240105-r1.ebuild b/app-emulation/winetricks/winetricks-20240105-r1.ebuild
new file mode 100644
index 000000000000..b6d5aec199b7
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20240105-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WTG="winetricks-gentoo-2012.11.24"
+inherit xdg
+
+if [[ ${PV} == *99999999* ]] ; then
+	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+SRC_URI+=" gui? ( https://dev.gentoo.org/~chiitoo/distfiles/${WTG}.tar.bz2 )"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gui rar test"
+RESTRICT="!test? ( test )"
+
+# dev-util/shellcheck is not available for x86
+RESTRICT+=" x86? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/bashate
+		dev-util/checkbashisms
+		|| (
+			dev-util/shellcheck-bin
+			dev-util/shellcheck
+		)
+	)
+"
+RDEPEND="
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	net-misc/wget
+	virtual/wine
+	x11-misc/xdg-utils
+	gui? ( || (
+		gnome-extra/zenity
+		kde-apps/kdialog:*
+	) )
+	rar? ( app-arch/unrar )
+"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+	case ${PV} in
+		*99999999*) git-r3_src_unpack ;&
+		*) default ;;
+	esac
+}
+
+src_test() {
+	./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+	default
+
+	if ! use gui; then
+		rm -r "${ED}"/usr/share/{applications,icons} || die
+	fi
+}
diff --git a/app-emulation/winetricks/winetricks-20240105.ebuild b/app-emulation/winetricks/winetricks-20240105.ebuild
deleted file mode 100644
index c478f02e2cd3..000000000000
--- a/app-emulation/winetricks/winetricks-20240105.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 xdg
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-RESTRICT="!test? ( test )"
-
-# dev-util/shellcheck is not available for x86
-RESTRICT+=" x86? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		|| (
-			dev-util/shellcheck-bin
-			dev-util/shellcheck
-		)
-	)
-"
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )
-"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-
-	if ! use gtk && ! use kde; then
-		rm -r "${ED}"/usr/share/applications || die
-		rm -r "${ED}"/usr/share/icons || die
-	fi
-}
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 91fa5d31a9b7..1a7b9025d53b 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
+WTG="winetricks-gentoo-2012.11.24"
 inherit xdg
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999* ]] ; then
 	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
@@ -14,19 +15,14 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
+SRC_URI+=" gui? ( https://dev.gentoo.org/~chiitoo/distfiles/${WTG}.tar.bz2 )"
 
 DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
 HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde rar test"
+IUSE="gui rar test"
 RESTRICT="!test? ( test )"
 
 # dev-util/shellcheck is not available for x86
@@ -42,16 +38,17 @@ BDEPEND="
 		)
 	)
 "
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
 	net-misc/wget
 	virtual/wine
 	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
+	gui? ( || (
+		gnome-extra/zenity
+		kde-apps/kdialog:*
+	) )
 	rar? ( app-arch/unrar )
 "
 
@@ -65,16 +62,10 @@ RDEPEND="${DEPEND}
 QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 
 src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-
-	else
-		default
-	fi
+	case ${PV} in
+		*99999999*) git-r3_src_unpack ;&
+		*) default ;;
+	esac
 }
 
 src_test() {
@@ -84,8 +75,7 @@ src_test() {
 src_install() {
 	default
 
-	if ! use gtk && ! use kde; then
-		rm -r "${ED}"/usr/share/applications || die
-		rm -r "${ED}"/usr/share/icons || die
+	if ! use gui; then
+		rm -r "${ED}"/usr/share/{applications,icons} || die
 	fi
 }
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.3.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.3.ebuild
deleted file mode 100644
index 3d65df2747d5..000000000000
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.3.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
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/pinentry.eselect-${PV} pinentry.eselect
-}
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.3 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.3
deleted file mode 100644
index bc058bb41ee7..000000000000
--- a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.3
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/pinentry implementation"
-MAINTAINER="maintainer-needed@gentoo.org"
-VERSION="0.7.3"
-
-SYMLINK_PATH=/usr/bin/pinentry
-SYMLINK_TARGETS=(
-	pinentry-efl
-	pinentry-gnome3
-	pinentry-qt5
-	pinentry-curses
-	pinentry-tty
-	pinentry-emacs
-)
-SYMLINK_DESCRIPTION='pinentry binary'
-
-inherit bin-symlink
diff --git a/app-forensics/aide/aide-0.18.8.ebuild b/app-forensics/aide/aide-0.18.8.ebuild
index 9f98d3dca440..84849713e5d8 100644
--- a/app-forensics/aide/aide-0.18.8.ebuild
+++ b/app-forensics/aide/aide-0.18.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aide/aide/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="acl audit curl e2fs mhash selinux xattr"
 
 DEPEND="
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index c7ef97138e2c..521bc1519fe1 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,2 +1 @@
-DIST honggfuzz-2.5.tar.gz 65224877 BLAKE2B 610a15a674cfa928eb4b4d9fda91e5494fe08be4b01857f390c36925872479c77b5424c06ed4df87ad791de29598d848d88eb5437d6f5f9bf9521ff67aaa5ded SHA512 d1ff23471372a3d9d62de768bda8beba0e75c49f9550bc106efb4ab49ea626c1ccc078f7a9950051a99fbc841615a81faae2c3b39270facd6c0064e28956c419
 DIST honggfuzz-2.6.tar.gz 65227315 BLAKE2B 527d36dd66974b74be29e3dc22e22c893d0e35654a768bfd93c6a919de82841cc1552af2b479ac0d65ce2fcfd66886ca0e43bc95db5b8187c8d13191e65de320 SHA512 cdd97b65e679652be888b966e2c010fe29af262e88d6c94b94b2e78c88258c5c53b4928fdf9e8afe54029c0742c5dfb0f6f8e8cb8157093e7f5ffdcfa5c92fd4
diff --git a/app-forensics/honggfuzz/files/honggfuzz-2.0-no-werror.patch b/app-forensics/honggfuzz/files/honggfuzz-2.0-no-werror.patch
deleted file mode 100644
index c5d6b8060450..000000000000
--- a/app-forensics/honggfuzz/files/honggfuzz-2.0-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -26,7 +26,7 @@ LD = $(CC)
- BIN := honggfuzz
- HFUZZ_CC_BIN := hfuzz_cc/hfuzz-cc
- HFUZZ_CC_SRCS := hfuzz_cc/hfuzz-cc.c
--COMMON_CFLAGS := -std=c11 -I/usr/local/include -D_GNU_SOURCE -Wall -Wextra -Werror -Wno-format-truncation -Wno-override-init -I.
-+COMMON_CFLAGS := -std=c11 -I/usr/local/include -D_GNU_SOURCE -Wall -Wextra -Wno-format-truncation -Wno-override-init -I.
- COMMON_LDFLAGS := -pthread -lm
- COMMON_SRCS := $(sort $(wildcard *.c))
- CFLAGS ?= -O3 -mtune=native -funroll-loops
diff --git a/app-forensics/honggfuzz/files/honggfuzz-2.5_binutils239.patch b/app-forensics/honggfuzz/files/honggfuzz-2.5_binutils239.patch
deleted file mode 100644
index af574bc495a0..000000000000
--- a/app-forensics/honggfuzz/files/honggfuzz-2.5_binutils239.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 23c3da7ea63e4a841fa0e181d173e16b437adff0 Mon Sep 17 00:00:00 2001
-From: Robert Swiecki <robert@swiecki.net>
-Date: Thu, 2 Jun 2022 23:17:49 +0200
-Subject: [PATCH] Always pass 4 arguments to init_disassemble_info(), no matter
- what's the declaration. binutils/libopcode offers an unstable interface
-
----
- linux/bfd.c | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/linux/bfd.c b/linux/bfd.c
-index 228365f69..236f050ec 100644
---- a/linux/bfd.c
-+++ b/linux/bfd.c
-@@ -197,6 +197,24 @@ static int arch_bfdFPrintF(void* buf, const char* fmt, ...) {
-     return ret;
- }
- 
-+static int arch_bfdFPrintFStyled(void* buf, int style HF_ATTR_UNUSED, const char* fmt, ...) {
-+    va_list args;
-+    va_start(args, fmt);
-+    int ret = util_vssnprintf(buf, _HF_INSTR_SZ, fmt, args);
-+    va_end(args);
-+
-+    return ret;
-+}
-+
-+/*
-+ * binutils/libopcode has an unstable public interface. At some point in time the function
-+ * init_disassemble_info() started taking 4 arguments instead of 3. Always pass 4 arguments to it,
-+ * no matter what's the declaration.
-+ */
-+static void arch_bfdInitDisassembleInfoStub(
-+    struct disassemble_info* info, char* instr, void* bfd_printf_func, void* bfd_printf_styled_func)
-+    __attribute__((weakref, alias("init_disassemble_info")));
-+
- void arch_bfdDisasm(pid_t pid, uint8_t* mem, size_t size, char* instr) {
-     MX_SCOPED_LOCK(&arch_bfd_mutex);
- 
-@@ -227,8 +245,9 @@ void arch_bfdDisasm(pid_t pid, uint8_t* mem, size_t size, char* instr) {
-         return;
-     }
- 
--    struct disassemble_info info;
--    init_disassemble_info(&info, instr, arch_bfdFPrintF);
-+    struct disassemble_info info = {};
-+
-+    arch_bfdInitDisassembleInfoStub(&info, instr, arch_bfdFPrintF, arch_bfdFPrintFStyled);
-     info.arch          = bfd_get_arch(bfdh);
-     info.mach          = bfd_get_mach(bfdh);
-     info.buffer        = mem;
diff --git a/app-forensics/honggfuzz/honggfuzz-2.5-r1.ebuild b/app-forensics/honggfuzz/honggfuzz-2.5-r1.ebuild
deleted file mode 100644
index 54fe2dc7889f..000000000000
--- a/app-forensics/honggfuzz/honggfuzz-2.5-r1.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 toolchain-funcs
-
-DESCRIPTION="A general purpose fuzzer with feedback support"
-HOMEPAGE="https://honggfuzz.dev/"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="clang"
-
-RDEPEND="
-	>=sys-libs/binutils-libs-2.29:=
-	sys-libs/libunwind:=
-	app-arch/xz-utils
-	clang? ( sys-libs/blocksruntime )
-"
-
-DEPEND="${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )"
-
-DOCS=(
-	CHANGELOG
-	COPYING
-	CONTRIBUTING.md
-	README.md
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-no-werror.patch
-	"${FILESDIR}"/${PN}-2.5_binutils239.patch
-)
-
-pkg_pretend() {
-	if tc-is-clang; then
-		use clang || die "${P}: to use clang enable USE=clang for ${P} (bug #729256)."
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export AR CC
-	export CFLAGS
-	export LDFLAGS
-}
-
-src_install() {
-	dobin ${PN}
-	dobin hfuzz_cc/hfuzz-cc
-
-	einstalldocs
-}
diff --git a/app-forensics/radamsa/Manifest b/app-forensics/radamsa/Manifest
index 7cdb58000b92..34877e4c9408 100644
--- a/app-forensics/radamsa/Manifest
+++ b/app-forensics/radamsa/Manifest
@@ -1,4 +1,2 @@
-DIST radamsa-0.6.c.gz 142359 BLAKE2B e9cfda273ca78e97d7e8a94f0399c2c8d7b543c578a7b6745a03c9a2a18aa965a13ead55e15aab27c5386bb4d4ab961cedfbdca72c72013dc1ace0931c237199 SHA512 b9f0b8801063821ebd435464057aa119c5eae2dec8c39b5ec295854832e25dd8b102d6beec2084a71c380dd0e1419fbce6ee2acc1064c8a4491ad32ff94673f9
-DIST radamsa-0.6.tar.gz 51962 BLAKE2B c909b917e55ea2d69f4bec22981afb73dabc0d380d6942167f805ecfd96c3f3d724a5e6d80acf4b2abe2ddf9141dd596a9c0b2e22db98e6c441236c49a06502d SHA512 6808a7f9a42c1a38bfa18ca8613067f4550a5960500e7438011ff26a37a663707a92597f869678600a7bd20df9d2bda19d3c80b07cd12fc49bad3b123739bae7
 DIST radamsa-0.7.c.gz 139939 BLAKE2B ae3e2fca777bdc672431810ec6e9a245774e3f761fb4552ae973caf3b82348c73221e9cfac023e80f161c37fb3e63ff043aac2f98cb932056c1618a842245f52 SHA512 f0b0c21034cb33182be74d8927c879a2a49cb20c992e97556bb9d76c35c8a39f1caf2042a3d001f0063b09e80705fa5d285d1d95b9f8a2dd5c62deb9a18d9bde
 DIST radamsa-v0.7.tar.bz2 49194 BLAKE2B a3e24302c67ed887373109ce3bd1b3b796c742ad50c04d83980caf7b5e92793668c9262791749653e72e15d65d7a4971d498013d3c5a8fafda9033cddc5b3e03 SHA512 ca55e499b739e4a24038b36115106dc10b6f68e3e127d3c45b0ab79676a1e6e82021be02e378bd6fd09f6df537d266ea4cf8f3528a25ed9e788548d6edc62fb5
diff --git a/app-forensics/radamsa/radamsa-0.6.ebuild b/app-forensics/radamsa/radamsa-0.6.ebuild
deleted file mode 100644
index 8ba7a7775a3d..000000000000
--- a/app-forensics/radamsa/radamsa-0.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="A general purpose fuzzer"
-HOMEPAGE="https://gitlab.com/akihe/radamsa"
-SRC_URI="
-	https://gitlab.com/akihe/radamsa/-/archive/v${PV}/${P}.tar.gz
-	https://gitlab.com/akihe/radamsa/uploads/a2228910d0d3c68d19c09cee3943d7e5/${P}.c.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs an owl-lisp
-
-DOCS=( LICENCE NEWS README.md )
-
-src_prepare() {
-	default
-
-	cp ../${P}.c ./radamsa.c || die
-}
-
-src_compile() {
-	emake bin/radamsa CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin bin/radamsa
-	# avoid man compression by build system
-	doman doc/radamsa.1
-
-	einstalldocs
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild
deleted file mode 100644
index ea1a014a2a9c..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
-inherit autotools java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
-# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
-#		See: https://bugs.gentoo.org/690010
-# TODO: Upstream uses a very specific version of libewf which is not in
-#       the tree anymore. So we statically compile and link to sleuthkit.
-#       Hopefully upstream will figure something out in the future.
-#		See: https://bugs.gentoo.org/689752
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
-	java? (
-		https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.jar
-	)
-	ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz
-			-> sleuthkit-libewf_64bit-20130416.tar.gz )"
-
-LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
-SLOT="0/19" # subslot = major soname version
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="aff doc ewf java static-libs test +threads zlib"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-lang/perl:*
-	aff? ( app-forensics/afflib )
-	ewf? ( sys-libs/zlib )
-	java? (
-		>=dev-java/c3p0-0.9.5.5:0
-		dev-java/commons-lang:3.6
-		>=dev-java/commons-validator-1.6:0
-		>=dev-java/gson-2.8.5:0
-		dev-java/guava:0
-		>=dev-java/jdbc-postgresql-9.4:0
-		>=dev-java/joda-time-2.4:0
-		>=dev-java/mchange-commons-0.2.20:0
-		dev-java/sparsebitset:0
-	)
-	zlib? ( sys-libs/zlib )
-"
-# TODO: add support for not-in-tree libraries:
-# libvhdi: https://github.com/libyal/libvhdi
-# libvmdk: https://github.com/libyal/libvmdk
-# libvslvm: https://github.com/libyal/libvslvm
-#   Upstream also says "A stand-alone version of libbfio is needed
-#   to allow libvslvm to directly read from a TSK_IMAGE." Not sure
-#   what it means yet.
-#
-# DEPEND="${DEPEND}
-# 	vhdi? ( dev-libs/libvhdi )
-# 	vmdk? ( dev-libs/libvmdk )
-#   vslvm? ( dev-libs/libvslvm dev-libs/libbfio )
-# "
-
-RDEPEND="${DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-DEPEND="${DEPEND}
-	java? ( virtual/jdk:1.8 )
-	test? (
-		>=dev-util/cppunit-1.2.1
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
-	"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
-	"${FILESDIR}"/${PN}-4.10.1-exclude-usr-local.patch
-	"${FILESDIR}"/${PN}-4.12.0-configure-ac-test-fix.patch
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.gz
-
-	if use ewf; then
-		pushd "${T}" &>/dev/null || die
-		unpack sleuthkit-libewf_64bit-20130416.tar.gz
-		export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010
-		popd &>/dev/null || die
-	fi
-
-	# Copy the jar files that don't exist in the tree yet
-	if use java; then
-		TSK_JAR_DIR="${T}/lib"
-		mkdir "${TSK_JAR_DIR}" || die
-		for f in ${A}; do
-			if [[ ${f} =~ .jar$ ]]; then
-				cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
-			fi
-		done
-		export TSK_JAR_DIR
-	fi
-}
-
-tsk_prepare_libewf() {
-	# Inlining breaks the compilation, disable it
-	sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
-		-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
-}
-
-src_prepare() {
-	use ewf && tsk_prepare_libewf
-
-	# Do not pass '-Werror'. This is overkill for user builds.
-	sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
-		-i tsk/util/Makefile.am \
-		-i tsk/pool/Makefile.am || die
-	# Remove -static from LDFLAGS because it doesn't actually create
-	# a static binary. It confuses libtool, who then inserts rpath
-	sed -e '/LDFLAGS/ s/-static//' \
-		-i tools/pooltools/Makefile.am || die
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		# Prevent "make install" from installing
-		# jar files under /usr/share/java
-		# We'll use the java eclasses for this
-		# See: https://github.com/sleuthkit/sleuthkit/pull/1379
-		sed -e '/^jar_DATA/ d;' -i Makefile.am || die
-
-		java-pkg-opt-2_src_prepare
-
-		popd &>/dev/null || die
-
-		# Call ant with jar target for case-uco.
-		# The default invocation of ant tries to
-		# run junit tests, which there are none.
-		# It ends up failing with:
-		# junit.framework.AssertionFailedError: No tests found in org.sleuthkit.caseuco.TestSuite
-		sed -e '/\tant \$(ant_args)/ s|$| jar|' \
-			-i "${S}"/case-uco/java/Makefile.am \
-			|| die
-	fi
-
-	# Override the doxygen output directories
-	if use doc; then
-		sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
-			-i tsk/docs/Doxyfile \
-			-i bindings/java/doxygen/Doxyfile || die
-	fi
-
-	# It's safe to call this even after java-pkg-opt-2_src_prepare
-	# because future calls to eapply_user do nothing and return 0
-	default
-
-	eautoreconf
-}
-
-tsk_compile_libewf() {
-	local myeconfargs=(
-		--prefix=/
-		--libdir=/lib
-		--enable-static
-		--disable-shared
-		--disable-winapi
-		--without-libbfio
-		--with-zlib
-		--without-bzip2
-		--without-libhmac
-		--without-openssl
-		--without-libuuid
-		--without-libfuse
-
-		--with-libcstring=no
-		--with-libcerror=no
-		--with-libcdata=no
-		--with-libclocale=no
-		--with-libcnotify=no
-		--with-libcsplit=no
-		--with-libuna=no
-		--with-libcfile=no
-		--with-libcpath=no
-		--with-libbfio=no
-		--with-libfcache=no
-		--with-libfvalue=no
-
-	)
-	# We want to contain our build flags
-	local CFLAGS="${CFLAGS}"
-	local LDFLAGS="${LDFLAGS}"
-
-	pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
-
-	# Produce relocatable code
-	CFLAGS+=" -fPIC"
-	LDFLAGS+=" -fPIC"
-	econf "${myeconfargs[@]}"
-
-	# Do not waste CPU cycles on building ewftools
-	sed -e '/ewftools/ d' -i Makefile || die
-	emake
-
-	# Only install the headers and the library
-	emake -C libewf DESTDIR="${T}"/image install
-	emake -C include DESTDIR="${T}"/image install
-	find "${T}"/image -name '*.la' -delete || die
-
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-offline="${TSK_JAR_DIR}"
-		$(use_enable java)
-		$(use_enable static-libs static)
-		$(use_enable test cppunit)
-		$(use_enable threads multithreading)
-		$(use_with aff afflib)
-		$(use_with zlib)
-	)
-	# TODO: add support for non-existing libraries:
-	# myeconfargs+=(
-	# 	$(use_with vhdi libvhdi)
-	# 	$(use_with vmdk libvmdk)
-	# 	$(use_with vslvm libvslvm)
-	# 	$(use_with vslvm libbfio) # not a typo
-	# )
-	myeconfargs+=(
-		--without-libvhdi
-		--without-libvmdk
-		--without-libvslvm
-		--without-libbfio
-	)
-
-	use ewf && tsk_compile_libewf
-	myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-		java-ant-2_src_configure
-		popd &>/dev/null || die
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Give it an existing bogus ivy home #672220
-	local -x IVY_HOME="${T}"
-
-	# Create symlinks of jars for the required dependencies
-	if use java; then
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" gson
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" mchange-commons
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
-
-		# case-uco needs gson and expects it under case-uco/java/lib
-		# symlink it to the jar dir we create for java bindings
-		ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
-		ln -s ./gson.jar "${TSK_JAR_DIR}"/gson-2.8.5.jar || die
-	fi
-
-	# Create the doc output dirs if requested
-	if use doc; then
-		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
-	fi
-
-	emake all $(usex doc api-docs "")
-}
-
-src_install() {
-	# Give it an existing bogus ivy home #756766
-	local -x IVY_HOME="${T}"
-	local f
-
-	if use java; then
-		pushd "${S}"/bindings/java &>/dev/null || die
-
-		# Install case-uco
-		pushd "${S}"/case-uco/java &>/dev/null || die
-		java-pkg_newjar "dist/${PN}-caseuco-${PV}".jar "${PN}-caseuco.jar"
-		popd || die
-
-		# Install the bundled jar files as well as the
-		# sleuthkit jar installed here by case-uco
-		pushd "${TSK_JAR_DIR}" &>/dev/null || die
-		for f in *; do
-			# Skip the symlinks java-pkg_jar-from created
-			[[ -L ${f} ]] && continue
-
-			# Strip the version numbers as per eclass recommendation
-			[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
-
-			java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
-		done
-		popd &>/dev/null || die
-
-		popd &>/dev/null || die
-	fi
-
-	default
-	# Default install target for case-uco installs the jar in the wrong place
-	rm -r "${ED}"/usr/share/java
-
-	# It unconditionally builds both api and jni docs
-	# We install conditionally based on the provided use flags
-	if use doc; then
-		dodoc -r "${T}"/doc/api-docs
-		use java && dodoc -r "${T}"/doc/jni-docs
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	emake -C "${S}"/unit_tests check
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
index f59307c9ecba..357f7c67d8b1 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
 
 LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
 SLOT="0/19" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="aff doc ewf java static-libs test +threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-forensics/unhide/Manifest b/app-forensics/unhide/Manifest
index 8d4dcbc14b8f..fece606b0e0b 100644
--- a/app-forensics/unhide/Manifest
+++ b/app-forensics/unhide/Manifest
@@ -1,2 +1 @@
-DIST unhide-20210124.tgz 75982 BLAKE2B 2c7a016830820d40d086d72db220e3b56e4453483b471e0803ce0170deee8327f514254ed1039fe4862685d665b38c8c5461ac870caf3fe200f7cebac19955f1 SHA512 60c5bf73fcb8af9ae0414c5e3397d1f9d6b12ed2da36fd1924dea4e43044d7f72a31c6fdf38e6615bd8465fbf839a34f588f9b795d1fe593c17fcc2f2da21e79
 DIST unhide-20220611.tgz 80219 BLAKE2B 70cd485197aa22387852b2f71831d9dcf02e2357b798184844d9289796717256ab28d555c29503c53b32718246dc32afccd386decce75dde5a50a35782569ba4 SHA512 0b2bb7d1a536fe572cce94b438cae0495a969e40014e95b2d19406c3108ce05ec8d722d77b76d4095a1dc5cf8fb6613f3e5df295ce10a08648d7c7390aa4500e
diff --git a/app-forensics/unhide/unhide-20210124.ebuild b/app-forensics/unhide/unhide-20210124.ebuild
deleted file mode 100644
index 41ce459b1ddd..000000000000
--- a/app-forensics/unhide/unhide-20210124.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Forensic tool to find hidden processes and TCP/UDP ports by rootkits/LKMs"
-HOMEPAGE="https://www.unhide-forensics.info"
-SRC_URI="https://github.com/YJesus/Unhide/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/Unhide-${PV}"
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} --static -pthread \
-		unhide-linux*.c unhide-output.c -o unhide
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} --static \
-		unhide-tcp.c unhide-tcp-fast.c unhide-output.c -o unhide-tcp
-}
-
-src_install() {
-	dobin ${PN}
-	dobin ${PN}-tcp
-	dodoc changelog README.txt TODO LEEME.txt LISEZ-MOI.TXT NEWS TODO
-	doman man/unhide.8 man/unhide-tcp.8
-	has "fr" ${LINGUAS} && newman man/fr/unhide.8 unhide.fr.8
-	has "es" ${LINGUAS} && newman man/es/unhide.8 unhide.es.8
-}
diff --git a/app-forensics/yara-x/yara-x-0.5.0.ebuild b/app-forensics/yara-x/yara-x-0.5.0.ebuild
index c0834635b720..d658ac1b9717 100644
--- a/app-forensics/yara-x/yara-x-0.5.0.ebuild
+++ b/app-forensics/yara-x/yara-x-0.5.0.ebuild
@@ -530,7 +530,7 @@ LICENSE+="
 "
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="python"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild
index 69d95324d3f2..b3ac6d27c992 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="kcm +config-qt qt6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest
index a3997a58185e..7b70e4942836 100644
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@@ -1 +1,2 @@
 DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466
+DIST fcitx-sayura-5.1.2.tar.zst 25363 BLAKE2B f498b9062c0e450b8cd3632b231e6e3bc7010ef6aed6bc0b6c6118de854202e36ffa04249ebe4527a69e30d261c3c07a89f221fc9b578df4eee293acace05766 SHA512 bc00188affa127f3ddbcd5eb6dc99030f432bdcf408e4b7abbee50fd906686f9697338e2d774c6639e5984f1a5bc1ab00261ae4752f9a984c4a639fe5315645f
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-5.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-5.1.2.ebuild
new file mode 100644
index 000000000000..32507f2e276f
--- /dev/null
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-5.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg unpacker
+
+MY_PN="fcitx5-sayura"
+DESCRIPTION="Fcitx-Sayura is a Sinhala input method for Fcitx input method framework"
+HOMEPAGE="https://github.com/fcitx/fcitx5-sayura"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+LICENSE="LGPL-2.1+ MIT"
+SLOT="5"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-i18n/fcitx:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+"
diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml
index cf5c857c8e32..b42843ddf729 100644
--- a/app-i18n/fcitx-sayura/metadata.xml
+++ b/app-i18n/fcitx-sayura/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>tanekliang@gmail.com</email>
+		<name>Yongxiang Liang</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 7869c92d0088..c694268b1de5 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1 +1,2 @@
 DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
+DIST fcitx5-unikey-5.1.4.tar.zst 114482 BLAKE2B daa7cb04f2047e7495f4699c4b7abe711b96553f8339b6ed41f84e934239e935ba55110076fd177fe14a8a5f01b65090fb2bf517acef9d085af018879b10b75a SHA512 d8918222c37609c078bdf6d73a5acaa5ebaf23b4b49d253850c737ac659cee94956ee8782b3ac2ea6eaa5cfdb8fccec6a62e86d6b0a1b4f5b03c4a6e395ca3f0
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-5.1.4.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-5.1.4.ebuild
new file mode 100644
index 000000000000..a3ba80268567
--- /dev/null
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-5.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5-unikey"
+
+inherit cmake unpacker xdg
+
+DESCRIPTION="Unikey (Vietnamese Input Method) engine support for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-unikey"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui +qt5 qt6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-i18n/fcitx-5.1.10:5
+	>=app-i18n/fcitx-qt-5.0.12[qt5?,qt6?,-onlyplugin]
+	gui? (
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5=
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[dbus,gui,widgets]
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=( )
+	if use gui; then
+		mycmakeargs+=(
+			-DENABLE_QT=ON
+			-DUSE_QT6=$(usex qt6)
+		)
+	fi
+	cmake_src_configure
+}
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
index ce4b6e943c2c..d9272badfada 100644
--- a/app-i18n/fcitx-unikey/metadata.xml
+++ b/app-i18n/fcitx-unikey/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>tanekliang@gmail.com</email>
+		<name>Yongxiang Liang</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
@@ -10,5 +18,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">fcitx/fcitx-unikey</remote-id>
+		<remote-id type="github">fcitx/fcitx5-unikey</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index a4fac576d368..541e5ee6711c 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,3 +1 @@
-DIST ibus-m17n-1.4.29.tar.gz 648370 BLAKE2B c3c65439167bbca9bbef8734f4f95282c3c8476a51654325b517bd22350ae98e5194bcf20cd3311d14e4938f66d98a40419145e7d5ffb6d33398ddbde4212702 SHA512 bb3b3f44fa5a79e7e15c71b30760f7b29454a47b167f12cc4bde52ee03151f794795fd0d9bb6a2a7877a0afc909f81342d50461da3d49a905255c76288023edb
-DIST ibus-m17n-1.4.30.tar.gz 648432 BLAKE2B c85c408135ce75c6e27a55ecd7e89288377dcefe85f57ebb40307e32c4e36eb6215f109f3480da9d219c0f4df68c652ecfcf64b29f518369c86c2d99c6d8ee89 SHA512 d2abbf6018231b1b84b4c04170aaf48f9efc1936c88cac7a960141b18d4f4477ca02354ca080937c9b7a6971b57d4b20981d88267caac3cae87330dc710e3560
 DIST ibus-m17n-1.4.31.tar.gz 649211 BLAKE2B 6c6f8a12b474dd14553c5214d420bebec60c5d09eccf8b848d24277d6a20c369446431860db8c1e9d51c0a4c1a6e3db5cc7e57a2754d6ce8042ffa76e6c9f42c SHA512 06f6d412d36b13628cb2ce9d7b3a1827a19c7e7213a0579f685f791bfbe101d5e8fc80162bde1ba46ac931f3f689492d02da8c02a8e2155cddc39181416f2269
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild
deleted file mode 100644
index 25014678be43..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.29.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"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-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-m17n/ibus-m17n-1.4.30.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.30.ebuild
deleted file mode 100644
index d17cb13bd689..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.30.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"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-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-m17n/ibus-m17n-1.4.31.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.31.ebuild
index d17cb13bd689..25014678be43 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.31.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 0e5353911d0c..7eb2a657b310 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,2 +1 @@
-DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
 DIST ibus-pinyin-1.5.1.gh.tar.gz 241963 BLAKE2B 4f7a08c20a311e0dc76bbea87439976a4a26c01fb80be880f3f8ba7fdd9c309011b0cc9bbb63030e6f4e1f0866d4fad8d3324464160ca73ce663e272a042e0eb SHA512 2ad3e7705d3f537135576ceb165a305728739ba2965d8d50f6db8c5043f17f722ca8b42de053cdcb8ff05ef10a7f7c4a0c7f0924beefdfa197225e360c98abd9
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch
deleted file mode 100644
index 737046cfd7c6..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-commit 97565d04e40634a1ab62790f718a8377754d2954
-Author: Peng Wu <alexepico@gmail.com>
-Date:   Wed Feb 19 10:57:40 2014 -0500
-
-    support setContentType method
-
-    ibus now supports setContentType method, if an application input some
-    password, the password will not be shown.
-
-    BUG=rhbz#1027029
-    R=Shawn.P.Huang@gmail.com
-
-    Review URL: https://codereview.appspot.com/22330043
-
-    Patch from Peng Wu <alexepico@gmail.com>.
-
-diff --git a/src/PYBopomofoEngine.cc b/src/PYBopomofoEngine.cc
-index 581c4cf..16d47b3 100644
---- a/src/PYBopomofoEngine.cc
-+++ b/src/PYBopomofoEngine.cc
-@@ -72,6 +72,9 @@ BopomofoEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
- {
-     gboolean retval = FALSE;
- 
-+    if (contentIsPassword())
-+        return retval;
-+
-     /* check Shift + Release hotkey,
-      * and then ignore other Release key event */
-     if (modifiers & IBUS_RELEASE_MASK) {
-@@ -139,6 +142,8 @@ BopomofoEngine::focusIn (void)
- void
- BopomofoEngine::focusOut (void)
- {
-+    Engine::focusOut();
-+
-     reset ();
- }
- 
-diff --git a/src/PYEngine.cc b/src/PYEngine.cc
-index d9fa04a..553d13f 100644
---- a/src/PYEngine.cc
-+++ b/src/PYEngine.cc
-@@ -67,6 +67,12 @@ static gboolean ibus_pinyin_engine_process_key_event
-                                                  guint                   modifiers);
- static void     ibus_pinyin_engine_focus_in     (IBusEngine             *engine);
- static void     ibus_pinyin_engine_focus_out    (IBusEngine             *engine);
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+static void     ibus_pinyin_engine_set_content_type
-+                                                (IBusEngine     *engine,
-+                                                 guint           purpose,
-+                                                 guint           hints);
-+#endif
- static void     ibus_pinyin_engine_reset        (IBusEngine             *engine);
- static void     ibus_pinyin_engine_enable       (IBusEngine             *engine);
- static void     ibus_pinyin_engine_disable      (IBusEngine             *engine);
-@@ -123,6 +129,10 @@ ibus_pinyin_engine_class_init (IBusPinyinEngineClass *klass)
-     engine_class->focus_in = ibus_pinyin_engine_focus_in;
-     engine_class->focus_out = ibus_pinyin_engine_focus_out;
- 
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    engine_class->set_content_type = ibus_pinyin_engine_set_content_type;
-+#endif
-+
-     engine_class->page_up = ibus_pinyin_engine_page_up;
-     engine_class->page_down = ibus_pinyin_engine_page_down;
- 
-@@ -182,6 +192,17 @@ ibus_pinyin_engine_process_key_event (IBusEngine     *engine,
-     return pinyin->engine->processKeyEvent (keyval, keycode, modifiers);
- }
- 
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+static void
-+ibus_pinyin_engine_set_content_type (IBusEngine     *engine,
-+                                     guint purpose,
-+                                     guint hints)
-+{
-+    IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;
-+    return pinyin->engine->setContentType (purpose, hints);
-+}
-+#endif
-+
- static void
- ibus_pinyin_engine_property_activate (IBusEngine    *engine,
-                                       const gchar   *prop_name,
-@@ -220,6 +241,39 @@ FUNCTION(cursor_up,   cursorUp)
- FUNCTION(cursor_down, cursorDown)
- #undef FUNCTION
- 
-+Engine::Engine (IBusEngine *engine) : m_engine (engine)
-+{
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
-+#endif
-+}
-+
-+gboolean
-+Engine::contentIsPassword()
-+{
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+   return IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose;
-+#else
-+   return false;
-+#endif
-+}
-+
-+void
-+Engine::focusOut (void)
-+{
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
-+#endif
-+}
-+
-+#if IBUS_CHECK_VERSION(1, 5, 4)
-+void
-+Engine::setContentType (guint purpose, guint hints)
-+{
-+    m_input_purpose = (IBusInputPurpose) purpose;
-+}
-+#endif
-+
- Engine::~Engine (void)
- {
- }
-diff --git a/src/PYEngine.h b/src/PYEngine.h
-index b74e6e8..21041b1 100644
---- a/src/PYEngine.h
-+++ b/src/PYEngine.h
-@@ -37,13 +37,18 @@ GType   ibus_pinyin_engine_get_type    (void);
- 
- class Engine {
- public:
--    Engine (IBusEngine *engine) : m_engine (engine) { }
-+    Engine (IBusEngine *engine);
-     virtual ~Engine (void);
- 
-+    gboolean contentIsPassword();
-+
-     // virtual functions
-     virtual gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers) = 0;
-     virtual void focusIn (void) = 0;
--    virtual void focusOut (void) = 0;
-+    virtual void focusOut (void);
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    virtual void setContentType (guint purpose, guint hints);
-+#endif
-     virtual void reset (void) = 0;
-     virtual void enable (void) = 0;
-     virtual void disable (void) = 0;
-@@ -122,6 +127,11 @@ protected:
- 
- protected:
-     Pointer<IBusEngine>  m_engine;      // engine pointer
-+
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    IBusInputPurpose m_input_purpose;
-+#endif
-+
- };
- 
- };
-diff --git a/src/PYPinyinEngine.cc b/src/PYPinyinEngine.cc
-index 7aea261..babaaed 100644
---- a/src/PYPinyinEngine.cc
-+++ b/src/PYPinyinEngine.cc
-@@ -82,6 +82,9 @@ PinyinEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
- {
-     gboolean retval = FALSE;
- 
-+    if (contentIsPassword())
-+        return retval;
-+
-     /* check Shift + Release hotkey,
-      * and then ignore other Release key event */
-     if (modifiers & IBUS_RELEASE_MASK) {
-@@ -195,6 +198,8 @@ PinyinEngine::focusIn (void)
- void
- PinyinEngine::focusOut (void)
- {
-+    Engine::focusOut ();
-+
-     reset ();
- }
- 
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch
deleted file mode 100644
index 2014bad9820a..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup/main.py
-+++ b/setup/main.py
-@@ -45,7 +45,12 @@ class PreferencesDialog:
-         locale.setlocale(locale.LC_ALL, "")
-         localedir = os.getenv("IBUS_LOCALEDIR")
-         gettext.bindtextdomain("ibus-pinyin", localedir)
--        gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
-+        # Python's gettext module doesn't provide all methods in
-+        # new Python version since Python 3.10
-+        try:
-+            gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
-+        except AttributeError:
-+            pass
- 
-         self.__bus = IBus.Bus()
-         self.__config = self.__bus.get_config()
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch
deleted file mode 100644
index 03988ee0ab7e..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 616770084991de0f36bea7b5861ef1b1657c9a31
-Author: ZhaoQiang <zhaoqiang@gnome.org>
-Date:   Mon Nov 19 19:35:10 2018 +0800
-
-    Update ibus-setup-pinyin.in: to avoid ibus-pinyin-setup crash in pure python3 env.
-
-diff --git a/configure.ac b/configure.ac
-index aa6242a..ca99a6f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,6 +82,11 @@ AC_PATH_PROG(ENV_IBUS_TEST, env)
- AC_SUBST(ENV_IBUS_TEST)
- 
- # check python
-+AC_ARG_WITH(python,
-+    AS_HELP_STRING([--with-python[=PATH]],
-+        [Select python2 or python3]),
-+    [PYTHON=$with_python], []
-+)
- AM_PATH_PYTHON([2.5])
- 
- # --enable-boost
-diff --git a/setup/ibus-setup-pinyin.in b/setup/ibus-setup-pinyin.in
-index 2566737..314072c 100644
---- a/setup/ibus-setup-pinyin.in
-+++ b/setup/ibus-setup-pinyin.in
-@@ -26,5 +26,5 @@ export IBUS_PREFIX=@prefix@
- export IBUS_DATAROOTDIR=@datarootdir@
- export IBUS_LOCALEDIR=@localedir@
- cd @prefix@/share/ibus-pinyin/setup/
--exec python main.py $@
-+exec @PYTHON@ main.py $@
- 
-diff --git a/setup/main.py b/setup/main.py
-index fb27103..2e4051a 100644
---- a/setup/main.py
-+++ b/setup/main.py
-@@ -20,15 +20,21 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- 
-+from __future__ import print_function
-+
- import gettext
- import locale
- import os
- import sys
- 
-+from gi import require_version as gi_require_version
-+gi_require_version('GLib', '2.0')
-+gi_require_version('Gtk', '3.0')
-+gi_require_version('IBus', '1.0')
-+
- from gi.repository import GLib
- from gi.repository import Gtk
- from gi.repository import IBus
--from xdg import BaseDirectory
- 
- import version
- 
-@@ -250,8 +256,8 @@ class PreferencesDialog:
- 
-         def __correct_pinyin_toggled_cb(widget):
-             val = widget.get_active()
--            map(lambda w: self.__builder.get_object(w[0]).set_sensitive(val),
--                self.__correct_pinyin_widgets)
-+            for w in self.__correct_pinyin_widgets:
-+                self.__builder.get_object(w[0]).set_sensitive(val)
-         self.__correct_pinyin.connect("toggled", __correct_pinyin_toggled_cb)
- 
-         # init value
-@@ -300,8 +306,8 @@ class PreferencesDialog:
- 
-         def __fuzzy_pinyin_toggled_cb(widget):
-             val = widget.get_active()
--            map(lambda w: self.__builder.get_object(w[0]).set_sensitive(val),
--                self.__fuzzy_pinyin_widgets)
-+            for w in self.__fuzzy_pinyin_widgets:
-+                self.__builder.get_object(w[0]).set_sensitive(val)
-         self.__fuzzy_pinyin.connect("toggled", __fuzzy_pinyin_toggled_cb)
- 
-         # init value
-@@ -404,7 +410,7 @@ class PreferencesDialog:
-         elif isinstance(val, str):
-             var = GLib.Variant.new_string(val)
-         else:
--            print >> sys.stderr, "val(%s) is not in support type." % repr(val)
-+            print("val(%s) is not in support type." % repr(val), file=sys.stderr)
-             return
- 
-         self.__values[name] = val
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
deleted file mode 100644
index 0faa622e3230..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-UPSTREAM: https://github.com/ibus/ibus-pinyin/pull/12
-BUG: https://bugs.gentoo.org/896366
-AUTHOR: jinqiang zhang <peeweep@0x0.ee>
-
-As sqlite 3.41.0 release note say:
-
- The double-quoted string misfeature is now disabled by default for CLI
- builds. Legacy use cases can reenable the misfeature at run-time using
- the ".dbconfig dqs_dml on" and ".dbconfig dqs_ddl on" commands.
-
-We should change this double quote to single quote
-
---- a/data/db/english/english.awk
-+++ b/data/db/english/english.awk
-@@ -16,7 +16,7 @@ BEGIN {
- }
- 
-     # Insert data into english table
--    {   printf "INSERT INTO english (word, freq) VALUES (\"%s\", \"%f\");\n", $1, $2}
-+    {   printf "INSERT INTO english (word, freq) VALUES (\'%s\', %f);\n", $1, $2}
- 
-     #quit sqlite3
- END {
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch
deleted file mode 100644
index 124339e81bf2..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,9 +93,9 @@
- )
- if test x"$enable_boost" = x"yes"; then
-     # check boost
--    BOOST_REQUIRE([1.39])
--    BOOST_FIND_HEADER([boost/bind.hpp])
--    BOOST_FIND_HEADER([boost/signals2.hpp])
-+    AX_BOOST_BASE([1.39])
-+    AC_CHECK_HEADERS([boost/bind.hpp])
-+    AC_CHECK_HEADERS([boost/signals2.hpp])
- fi
- AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
- 
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild
deleted file mode 100644
index 17c7102262c0..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools lua-single python-single-r1
-
-DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus-pinyin"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/pyzy
-	dev-db/sqlite:3
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	boost? ( dev-libs/boost )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-boost.patch
-	"${FILESDIR}"/${P}-content-type-method.patch
-	"${FILESDIR}"/${P}-python3.patch
-	"${FILESDIR}"/${P}-sqlite-3.41.0.patch
-	"${FILESDIR}"/${P}-gettext.patch #905906
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable nls)
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild
index 11b12c65352d..8b83f5c0a1c7 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ibus/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 4cbe756b08ea..84b58381b037 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1 +1,2 @@
 DIST ibus-table-1.17.6.tar.gz 1563218 BLAKE2B 45ad1f8f489f8df0ca1108df9fda910d0f144c10cff29d047f0e345efd1be9e5a6d6cd2b47ba59904769ba3f0c207d2d641c9e7299b0d1ca4b77ff59bffb5d4c SHA512 0c3f23595bf1ecc2c3e34962fca3e2317771ba0837c1a04fbcbaae089196994764307184dd482f0a9efcae2106e013ca51cf9530bd1c7cfb29070f54b16a276e
+DIST ibus-table-1.17.7.tar.gz 1564577 BLAKE2B 2052c082a11b87f46351bccedbb4b3dd896337af8b772a33a822a285a7685cfb68cbe3269f21790aefd3c151aa7390a095c51343ec7c461a2d15a3457abaf2d6 SHA512 938b589b16728f2a5bdfa64e06277cd2fd41719fa5033c3935a07a8350be746a75bf10702f0a17bcec2f9af591d2ccfe486486b788035c5c39cb62ca6f0cec74
diff --git a/app-i18n/ibus-table/ibus-table-1.17.7.ebuild b/app-i18n/ibus-table/ibus-table-1.17.7.ebuild
new file mode 100644
index 000000000000..4ecd082cf0d0
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.17.7.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} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+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/Manifest b/app-i18n/ibus-typing-booster/Manifest
index a8db75fefe1f..05696dc1ffa8 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,3 +1,2 @@
-DIST ibus-typing-booster-2.25.11.tar.gz 13239747 BLAKE2B 13273ee1bc7b86ff60b79a9303da59b1e7f01675e1bf7919ead5c79ea04068db2aee67ff41610f24112a346f3be079108f6aa1a2e40fcb7cfdb6378aea949326 SHA512 97137a0ad68b96c7a4bbd560f916e1f42f4ee191f867967a35ac52031d48940d1942d4bdcad7d08a0430f8cdc32232c82042460b8fe819c313fc96c72df73db6
-DIST ibus-typing-booster-2.25.13.tar.gz 13254481 BLAKE2B 34739007b1bc4a78c731816d6c2659276b93d0ecaf8d28e3c0e81169543b9234314a0b7279de8568f44c0fc87f20e857ead6e41e3799227eac8dc81ab601dd46 SHA512 634a554b6921594cd0f90618fbed15597362b1442e6c1dfb6b2aab8a80010243108b2d7411fde9e87577e60394172f6051ef36330d178eb28a030b58bb343240
 DIST ibus-typing-booster-2.25.14.tar.gz 13450399 BLAKE2B 2a8d5b823e51aee782bede9ddd08b10217744a646f309b46e320359631aee76c4b451d124d365e2b843b09cb8263603da490e99eef0073b8487ff4e42a079f73 SHA512 1687d2c4e51ffc8b84895845c7d37c3d6e186211fe0b2dd4f9bfc2f36168dc3bc993b8cfdc2e49ce108dfe7d1d9bdbc81480e952b832950fcccc53c9e523fe92
+DIST ibus-typing-booster-2.25.15.tar.gz 13237545 BLAKE2B 0844b1a35a7aae46abc22a5181992c87770f8083f1cab1fc5fe482db0bde76c3b51b58777da7588cf48787dfa90a811f83c57ed1dce9eb9ce1d6ec7236d9fbeb SHA512 0a8228c525eebe57f2de117cde480164231f03edd0d0f720c176aab366d6964a5e10ea70ae3976e99630e03af1505c1eadf8580d04bcf8cfef460d7e07c467ed
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.11.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.11.ebuild
deleted file mode 100644
index 479696719c1b..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.11.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"
-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.25.14.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.14.ebuild
index 97351b6920ac..479696719c1b 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.14.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.13.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.15.ebuild
index 97351b6920ac..97351b6920ac 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.13.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.15.ebuild
diff --git a/app-i18n/libime/libime-1.1.8-r1.ebuild b/app-i18n/libime/libime-1.1.8-r1.ebuild
index 2b77704e6cb8..88734c7e37ce 100644
--- a/app-i18n/libime/libime-1.1.8-r1.ebuild
+++ b/app-i18n/libime/libime-1.1.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake unpacker
 
-DESCRIPTION="Fcitx5 Next generation of fcitx "
+DESCRIPTION="Fcitx5 Next generation of fcitx"
 HOMEPAGE="https://fcitx-im.org/"
 SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.zst"
 
diff --git a/app-i18n/libime/libime-1.1.8.ebuild b/app-i18n/libime/libime-1.1.8.ebuild
index 3742a0051661..7fb6da2943a7 100644
--- a/app-i18n/libime/libime-1.1.8.ebuild
+++ b/app-i18n/libime/libime-1.1.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake unpacker
 
-DESCRIPTION="Fcitx5 Next generation of fcitx "
+DESCRIPTION="Fcitx5 Next generation of fcitx"
 HOMEPAGE="https://fcitx-im.org/"
 SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.zst"
 
diff --git a/app-i18n/librime-lua/Manifest b/app-i18n/librime-lua/Manifest
index 00d57a498cb6..cf2939130da1 100644
--- a/app-i18n/librime-lua/Manifest
+++ b/app-i18n/librime-lua/Manifest
@@ -1 +1 @@
-DIST librime-lua-20211030072627.tar.gz 27894 BLAKE2B a527e865a9945aa7d56cce3905bc80156b60ebf6323828ca40999cb73ebe8d8f66ddf6b0a1d6d5904f2bc754b5f8fe6ac1f5ecdc56351c2222a21429a0c2b701 SHA512 b15f85b0a18e5e05fa691a84aef7cf3689b4a5271a1d5b6f78ea42488f6dbe4dfc56a91fa547ca3636269b9c898d646d24d3a160096ace9927901f9fdba06e9c
+DIST librime-lua-20240819212322.tar.gz 45085 BLAKE2B 3f5d6f5282def197477ea45daadf56be22a41f3bc0f2d9254ec6c3c95d16a19ca63de5f8041c44547bc736146ad804ab6a3e95e19d49c3f344d36e083e173c9b SHA512 65177c6ab36e16393c0412fd75cbd1b7e8b45cbad0129743bee101db47d4575e45846709d7a76be59c51fed04a0fb97fa872750e0762e04774204ddbc8519831
diff --git a/app-i18n/librime-lua/librime-lua-20211030072627.ebuild b/app-i18n/librime-lua/librime-lua-20211030072627.ebuild
deleted file mode 100644
index 64263dc37b78..000000000000
--- a/app-i18n/librime-lua/librime-lua-20211030072627.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-LUA_COMPAT=( lua5-{3..4} )
-
-inherit cmake lua-single
-
-if [[ "${PV}" == "99999999999999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hchunhui/librime-lua"
-else
-	LIBRIME_LUA_GIT_REVISION="67ef681a9fd03262c49cc7f850cc92fc791b1e85"
-fi
-
-DESCRIPTION="Lua module for RIME"
-HOMEPAGE="https://github.com/hchunhui/librime-lua"
-if [[ "${PV}" == "99999999999999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/hchunhui/${PN}/archive/${LIBRIME_LUA_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND=""
-RDEPEND=">=app-i18n/librime-1.6:0=
-	${LUA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/boost:0"
-
-if [[ "${PV}" != "99999999999999" ]]; then
-	S="${WORKDIR}/${PN}-${LIBRIME_LUA_GIT_REVISION}"
-fi
-
-src_prepare() {
-	sed \
-		-e "1icmake_minimum_required(VERSION 3.0)\nproject(${PN})\n" \
-		-e "s/ PARENT_SCOPE//" \
-		-e "\$a\\\n" \
-		-e "\$aadd_library(\${plugin_modules} MODULE \${plugin_objs})" \
-		-e "\$aset_target_properties(\${plugin_modules} PROPERTIES PREFIX \"\")" \
-		-e "\$atarget_link_libraries(\${plugin_modules} rime \${plugin_deps})" \
-		-e "\$ainstall(TARGETS \${plugin_modules} DESTINATION $(get_libdir)/rime-plugins)" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
diff --git a/app-i18n/librime-lua/librime-lua-20240819212322.ebuild b/app-i18n/librime-lua/librime-lua-20240819212322.ebuild
new file mode 100644
index 000000000000..d1f5dd7e4886
--- /dev/null
+++ b/app-i18n/librime-lua/librime-lua-20240819212322.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+LUA_COMPAT=( lua5-{3..4} )
+
+inherit cmake lua-single
+
+if [[ "${PV}" == "99999999999999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hchunhui/librime-lua"
+else
+	LIBRIME_LUA_GIT_REVISION="fa6563cf7b40f3bfbf09e856420bff8de6820558"
+fi
+
+DESCRIPTION="Lua module for RIME"
+HOMEPAGE="https://github.com/hchunhui/librime-lua"
+if [[ "${PV}" != "99999999999999" ]]; then
+	SRC_URI="https://github.com/hchunhui/${PN}/archive/${LIBRIME_LUA_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND=">=app-i18n/librime-1.6:0=
+	${LUA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/boost:0"
+
+if [[ "${PV}" != "99999999999999" ]]; then
+	S="${WORKDIR}/${PN}-${LIBRIME_LUA_GIT_REVISION}"
+fi
+
+src_prepare() {
+	sed \
+		-e "1icmake_minimum_required(VERSION 3.0)\nproject(${PN})\n" \
+		-e "s/ PARENT_SCOPE//" \
+		-e "\$a\\\n" \
+		-e "\$aadd_library(\${plugin_modules} MODULE \${plugin_objs})" \
+		-e "\$aset_target_properties(\${plugin_modules} PROPERTIES PREFIX \"\")" \
+		-e "\$atarget_link_libraries(\${plugin_modules} rime \${plugin_deps})" \
+		-e "\$ainstall(TARGETS \${plugin_modules} DESTINATION $(get_libdir)/rime-plugins)" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
index 2211e7aea769..9f01797781a9 100644
--- a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
+++ b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,19 +16,14 @@ fi
 
 DESCRIPTION="Lua module for RIME"
 HOMEPAGE="https://github.com/hchunhui/librime-lua"
-if [[ "${PV}" == "99999999999999" ]]; then
-	SRC_URI=""
-else
+if [[ "${PV}" != "99999999999999" ]]; then
 	SRC_URI="https://github.com/hchunhui/${PN}/archive/${LIBRIME_LUA_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-BDEPEND=""
 RDEPEND=">=app-i18n/librime-1.6:0=
 	${LUA_DEPS}"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20240116.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20240116.patch
new file mode 100644
index 000000000000..804b4d9ff3d4
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20240116.patch
@@ -0,0 +1,50 @@
+Exported from my fork: https://github.com/xen0n/mozc, branch
+gentoo-2.28.5029.102.
+
+From: WANG Xuerui <xen0n@gentoo.org>
+Date: Tue, 27 Aug 2024 16:44:13 +0800
+Subject: [PATCH] fix build with abseil-cpp 20240116
+
+Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
+--- a/src/base/absl.gyp
++++ b/src/base/absl.gyp
+@@ -128,7 +128,7 @@
+           'all_dependent_settings': {
+             'link_settings': {
+               'libraries': [
+-                '-labsl_flags -labsl_flags_internal -labsl_synchronization -labsl_flags_reflection -labsl_flags_marshalling',
++                '-labsl_flags_internal -labsl_raw_hash_set -labsl_city -labsl_hash -labsl_low_level_hash -labsl_synchronization -labsl_flags_reflection -labsl_flags_marshalling',
+               ],
+             },
+           },
+@@ -178,7 +178,7 @@
+           'all_dependent_settings': {
+             'link_settings': {
+               'libraries': [
+-                '-labsl_flags_commandlineflag_internal -labsl_flags_usage -labsl_flags_usage_internal -labsl_flags_internal -labsl_flags -labsl_flags_private_handle_accessor -labsl_flags_program_name -labsl_flags_parse',
++                '-labsl_flags_commandlineflag_internal -labsl_flags_usage -labsl_flags_usage_internal -labsl_flags_internal -labsl_flags_private_handle_accessor -labsl_flags_program_name -labsl_flags_parse',
+               ],
+             },
+           },
+@@ -398,7 +398,7 @@
+           'all_dependent_settings': {
+             'link_settings': {
+               'libraries': [
+-                '-labsl_synchronization -labsl_flags -labsl_graphcycles_internal -labsl_string_view',
++                '-labsl_synchronization -labsl_graphcycles_internal -labsl_string_view',
+               ],
+             },
+           },
+--- a/src/dictionary/file/codec.cc
++++ b/src/dictionary/file/codec.cc
+@@ -42,6 +42,10 @@
+ #include "dictionary/file/codec_interface.h"
+ #include "dictionary/file/codec_util.h"
+ #include "dictionary/file/section.h"
++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION >= 20240116
++// Abseil 20240116.0 needs explicit inclusion for StrCat
++#include "absl/strings/str_cat.h"
++#endif
+ #include "absl/status/status.h"
+ 
+ namespace mozc {
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
deleted file mode 100644
index c86eb2dc6fcb..000000000000
--- a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 2010-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/google/mozc"
-	EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
-	MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837"
-	MOZC_DATE="${PV#*_p}"
-	MOZC_DATE="${MOZC_DATE%%_p*}"
-
-	FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001"
-	FCITX_MOZC_DATE="${PV#*_p}"
-	FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
-	FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
-
-	JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
-	JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="
-		https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
-		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
-		fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
-		fcitx5? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
-	"
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-build/gyp
-	$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
-	>=dev-libs/protobuf-3.0.0
-	app-alternatives/ninja
-	virtual/pkgconfig
-	emacs? ( app-editors/emacs:* )
-	fcitx4? ( sys-devel/gettext )
-	fcitx5? ( sys-devel/gettext )
-"
-DEPEND="
-	>=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)]
-	>=dev-libs/protobuf-3.0.0:=
-	fcitx4? (
-		app-i18n/fcitx:4
-		virtual/libintl
-	)
-	fcitx5? (
-		app-i18n/fcitx:5
-		app-i18n/libime
-		sys-devel/gettext
-		virtual/libintl
-	)
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	ibus? (
-		>=app-i18n/ibus-1.4.1
-		dev-libs/glib:2
-		x11-libs/libxcb
-	)
-	renderer? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-		dev-libs/jsoncpp
-	)"
-RDEPEND="
-	>=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)]
-	>=dev-libs/protobuf-3.0.0:=
-	emacs? ( app-editors/emacs:* )
-	fcitx4? (
-		app-i18n/fcitx:4
-		virtual/libintl
-	)
-	fcitx5? (
-		app-i18n/fcitx:5
-		app-i18n/libime
-		sys-devel/gettext
-		virtual/libintl
-	)
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	ibus? (
-		>=app-i18n/ibus-1.4.1
-		dev-libs/glib:2
-		x11-libs/libxcb
-	)
-	renderer? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	"${WORKDIR}"/mozc-2.28.5029.102-patches
-	"${FILESDIR}"/mozc-2.28.5029.102-abseil.patch
-	"${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-
-		if use fcitx4 || use fcitx5; then
-			local EGIT_SUBMODULES=()
-			git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
-			git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
-		fi
-		if use fcitx5; then
-			cp -pr "${WORKDIR}"/fcitx{,5}-mozc || die
-		fi
-	else
-		unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
-		mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
-		unpack ${PN}-2.28.5029.102-patches.tar.xz
-
-		unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
-		cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
-
-		if use fcitx4 || use fcitx5; then
-			unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
-			if use fcitx4; then
-				cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
-			fi
-			if use fcitx5; then
-				cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die
-			fi
-			rm -r mozc-${FCITX_MOZC_GIT_REVISION} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	if use fcitx4; then
-		cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
-		PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch )
-	fi
-	if use fcitx5; then
-		cp -pr "${WORKDIR}/fcitx5-mozc/src/unix/fcitx5" unix || die
-		PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch )
-	fi
-
-	pushd "${WORKDIR}/${P}" > /dev/null || die
-	default
-	popd > /dev/null || die
-
-	sed \
-		-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
-		-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
-		-e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-		-i build_mozc.py || die
-
-	local ar=($(tc-getAR))
-	local cc=($(tc-getCC))
-	local cxx=($(tc-getCXX))
-	local ld=($(tc-getLD))
-	local nm=($(tc-getNM))
-	local readelf=($(tc-getREADELF))
-
-	# Use absolute paths. Non-absolute paths are mishandled by GYP.
-	ar[0]=$(type -P ${ar[0]})
-	cc[0]=$(type -P ${cc[0]})
-	cxx[0]=$(type -P ${cxx[0]})
-	ld[0]=$(type -P ${ld[0]})
-	nm[0]=$(type -P ${nm[0]})
-	readelf[0]=$(type -P ${readelf[0]})
-
-	sed \
-		-e "s:<!(which ar):${ar[@]}:" \
-		-e "s:<!(which clang):${cc[@]}:" \
-		-e "s:<!(which clang++):${cxx[@]}:" \
-		-e "s:<!(which ld):${ld[@]}:" \
-		-e "s:<!(which nm):${nm[@]}:" \
-		-e "s:<!(which readelf):${readelf[@]}:" \
-		-i gyp/common.gypi || die
-
-	# https://github.com/google/mozc/issues/489
-	sed \
-		-e "/'-lc++'/d" \
-		-e "/'-stdlib=libc++'/d" \
-		-i gyp/common.gypi || die
-
-	# bug #877765
-	restore_config mozcdic-ut.txt
-	if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then
-		einfo "mozcdic-ut.txt found. Adding to mozc dictionary..."
-		cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die
-	fi
-}
-
-src_configure() {
-	if use debug; then
-		BUILD_TYPE="Debug"
-	else
-		BUILD_TYPE="Release"
-	fi
-
-	local gyp_arguments=()
-
-	if tc-is-gcc; then
-		gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
-	elif tc-is-clang; then
-		gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
-	else
-		gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
-	fi
-
-	gyp_arguments+=(-D debug_extra_cflags=)
-	gyp_arguments+=(-D release_extra_cflags=)
-
-	gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
-	gyp_arguments+=(-D use_fcitx5=$(usex fcitx5 YES NO))
-	gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
-	gyp_arguments+=(-D use_libprotobuf=1)
-	gyp_arguments+=(-D use_system_abseil_cpp=1)
-	gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
-	gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
-	gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
-	gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
-	gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
-	if use ibus; then
-		gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
-		gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
-	fi
-
-	unset AR CC CXX LD NM READELF
-
-	edo "${PYTHON}" build_mozc.py gyp \
-		--gypdir="${EPREFIX}/usr/bin" \
-		--server_dir="${EPREFIX}/usr/libexec/mozc" \
-		--verbose \
-		$(usex gui "" --noqt) \
-		-- "${gyp_arguments[@]}"
-}
-
-src_compile() {
-	local targets=(server/server.gyp:mozc_server)
-	if use emacs; then
-		targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
-	fi
-	if use fcitx4; then
-		targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
-	fi
-	if use fcitx5; then
-		targets+=(unix/fcitx5/fcitx5.gyp:fcitx5-mozc)
-	fi
-	if use gui; then
-		targets+=(gui/gui.gyp:mozc_tool)
-	fi
-	if use ibus; then
-		targets+=(unix/ibus/ibus.gyp:ibus_mozc)
-	fi
-	if use renderer; then
-		targets+=(renderer/renderer.gyp:mozc_renderer)
-	fi
-	if use test; then
-		targets+=(gyp/tests.gyp:unittests)
-	fi
-
-	if use ibus; then
-		GYP_IBUS_FLAG="--use_gyp_for_ibus_build"
-	fi
-
-	edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}"
-
-	if use emacs; then
-		elisp-compile unix/emacs/*.el
-	fi
-}
-
-src_test() {
-	edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1
-}
-
-src_install() {
-	exeinto /usr/libexec/mozc
-	doexe out_linux/${BUILD_TYPE}/mozc_server
-
-	[[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt
-
-	if use gui; then
-		doexe out_linux/${BUILD_TYPE}/mozc_tool
-	fi
-
-	if use renderer; then
-		doexe out_linux/${BUILD_TYPE}/mozc_renderer
-	fi
-
-	insinto /usr/libexec/mozc/documents
-	doins data/installer/credits_en.html
-
-	if use emacs; then
-		dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
-		elisp-install ${PN} unix/emacs/*.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
-	fi
-
-	if use fcitx4; then
-		exeinto /usr/$(get_libdir)/fcitx
-		doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
-		insinto /usr/share/fcitx/addon
-		doins unix/fcitx/fcitx-mozc.conf
-
-		insinto /usr/share/fcitx/inputmethod
-		doins unix/fcitx/mozc.conf
-
-		insinto /usr/share/fcitx/mozc/icon
-		newins data/images/product_icon_32bpp-128.png mozc.png
-		local image
-		for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
-			newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
-		done
-
-		local locale mo_file
-		for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
-			locale="${mo_file##*/}"
-			locale="${locale%.mo}"
-			insinto /usr/share/locale/${locale}/LC_MESSAGES
-			newins "${mo_file}" fcitx-mozc.mo
-		done
-	fi
-
-	if use fcitx5; then
-		exeinto /usr/$(get_libdir)/fcitx5
-		doexe out_linux/${BUILD_TYPE}/fcitx5-mozc.so
-
-		insinto /usr/share/fcitx5/addon
-		newins unix/fcitx5/mozc-addon.conf mozc.conf
-
-		insinto /usr/share/fcitx5/inputmethod
-		doins unix/fcitx5/mozc.conf
-
-		local orgfcitx5="org.fcitx.Fcitx5.fcitx-mozc"
-		newicon -s 128 data/images/product_icon_32bpp-128.png ${orgfcitx5}.png
-		newicon -s 128 data/images/product_icon_32bpp-128.png fcitx-mozc.png
-		newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png ${orgfcitx5}.png
-		newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png fcitx-mozc.png
-		for uiimg in ../../fcitx5-mozc/scripts/icons/ui-*.png; do
-			dimg=${uiimg#*ui-}
-			newicon -s 48 ${uiimg} ${orgfcitx5}-${dimg/_/-}
-			newicon -s 48 ${uiimg} fcitx-mozc-${dimg/_/-}
-		done
-
-		local locale mo_file
-		for mo_file in unix/fcitx5/po/*.po; do
-			locale="${mo_file##*/}"
-			locale="${locale%.po}"
-			msgfmt ${mo_file} -o ${mo_file/.po/.mo} || die
-			insinto /usr/share/locale/${locale}/LC_MESSAGES
-			newins "${mo_file/.po/.mo}" fcitx5-mozc.mo
-		done
-		msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o \
-			unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml || die
-		insinto /usr/share/metainfo
-		doins unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
-	fi
-
-	if use ibus; then
-		exeinto /usr/libexec
-		newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
-		insinto /usr/share/ibus/component
-		doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
-		insinto /usr/share/ibus-mozc
-		newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
-		local image
-		for image in data/images/unix/ui-*.png; do
-			newins "${image}" "${image#data/images/unix/ui-}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "ENVIRONMENTAL VARIABLES"
-	elog
-	elog "MOZC_SERVER_DIRECTORY"
-	elog "  Mozc server directory"
-	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
-	elog "MOZC_DOCUMENTS_DIRECTORY"
-	elog "  Mozc documents directory"
-	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
-	elog "MOZC_CONFIGURATION_DIRECTORY"
-	elog "  Mozc configuration directory"
-	elog "  Value used by default: \"~/.mozc\""
-	elog
-	if use emacs; then
-		elog
-		elog "USAGE IN EMACS"
-		elog
-		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
-		elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
-		elog
-		elog "In order to use mozc-mode by default, the following settings should be added to"
-		elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
-		elog "by default) will enable mozc-mode."
-		elog
-		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
-		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
-		elog
-
-		elisp-site-regen
-	fi
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-	fi
-	xdg_pkg_postrm
-}
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild
new file mode 100644
index 000000000000..9e3e0a65db7d
--- /dev/null
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild
@@ -0,0 +1,467 @@
+# Copyright 2010-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/google/mozc"
+	EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+	MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837"
+	MOZC_DATE="${PV#*_p}"
+	MOZC_DATE="${MOZC_DATE%%_p*}"
+
+	FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001"
+	FCITX_MOZC_DATE="${PV#*_p}"
+	FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
+	FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
+
+	JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
+	JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="
+		https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
+		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
+		fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
+		fcitx5? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
+	"
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-build/gyp
+	$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	>=dev-libs/protobuf-3.0.0
+	app-alternatives/ninja
+	virtual/pkgconfig
+	emacs? ( app-editors/emacs:* )
+	fcitx4? ( sys-devel/gettext )
+	fcitx5? ( sys-devel/gettext )
+"
+DEPEND="
+	>=dev-cpp/abseil-cpp-20240116.0:=
+	>=dev-libs/protobuf-3.0.0:=
+	fcitx4? (
+		app-i18n/fcitx:4
+		virtual/libintl
+	)
+	fcitx5? (
+		app-i18n/fcitx:5
+		app-i18n/libime
+		sys-devel/gettext
+		virtual/libintl
+	)
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	ibus? (
+		>=app-i18n/ibus-1.4.1
+		dev-libs/glib:2
+		x11-libs/libxcb
+	)
+	renderer? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	test? (
+		>=dev-cpp/gtest-1.8.0
+		dev-libs/jsoncpp
+	)"
+RDEPEND="
+	>=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)]
+	>=dev-libs/protobuf-3.0.0:=
+	emacs? ( app-editors/emacs:* )
+	fcitx4? (
+		app-i18n/fcitx:4
+		virtual/libintl
+	)
+	fcitx5? (
+		app-i18n/fcitx:5
+		app-i18n/libime
+		sys-devel/gettext
+		virtual/libintl
+	)
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	ibus? (
+		>=app-i18n/ibus-1.4.1
+		dev-libs/glib:2
+		x11-libs/libxcb
+	)
+	renderer? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${WORKDIR}"/mozc-2.28.5029.102-patches
+	"${FILESDIR}"/mozc-2.28.5029.102-abseil.patch
+	"${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0.patch
+	"${FILESDIR}"/mozc-2.28.5029.102-abseil-20240116.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+
+		if use fcitx4 || use fcitx5; then
+			local EGIT_SUBMODULES=()
+			git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+			git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+		fi
+		if use fcitx5; then
+			cp -pr "${WORKDIR}"/fcitx{,5}-mozc || die
+		fi
+	else
+		unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
+		mv mozc-${MOZC_GIT_REVISION} ${P} || die
+
+		unpack ${PN}-2.28.5029.102-patches.tar.xz
+
+		unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+		cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
+
+		if use fcitx4 || use fcitx5; then
+			unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
+			if use fcitx4; then
+				cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
+			fi
+			if use fcitx5; then
+				cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die
+			fi
+			rm -r mozc-${FCITX_MOZC_GIT_REVISION} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	if use fcitx4; then
+		cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+		PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch )
+	fi
+	if use fcitx5; then
+		cp -pr "${WORKDIR}/fcitx5-mozc/src/unix/fcitx5" unix || die
+		PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch )
+	fi
+
+	pushd "${WORKDIR}/${P}" > /dev/null || die
+	default
+	popd > /dev/null || die
+
+	sed \
+		-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
+		-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
+		-e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+		-i build_mozc.py || die
+
+	local ar=($(tc-getAR))
+	local cc=($(tc-getCC))
+	local cxx=($(tc-getCXX))
+	local ld=($(tc-getLD))
+	local nm=($(tc-getNM))
+	local readelf=($(tc-getREADELF))
+
+	# Use absolute paths. Non-absolute paths are mishandled by GYP.
+	ar[0]=$(type -P ${ar[0]})
+	cc[0]=$(type -P ${cc[0]})
+	cxx[0]=$(type -P ${cxx[0]})
+	ld[0]=$(type -P ${ld[0]})
+	nm[0]=$(type -P ${nm[0]})
+	readelf[0]=$(type -P ${readelf[0]})
+
+	sed \
+		-e "s:<!(which ar):${ar[@]}:" \
+		-e "s:<!(which clang):${cc[@]}:" \
+		-e "s:<!(which clang++):${cxx[@]}:" \
+		-e "s:<!(which ld):${ld[@]}:" \
+		-e "s:<!(which nm):${nm[@]}:" \
+		-e "s:<!(which readelf):${readelf[@]}:" \
+		-i gyp/common.gypi || die
+
+	# https://github.com/google/mozc/issues/489
+	sed \
+		-e "/'-lc++'/d" \
+		-e "/'-stdlib=libc++'/d" \
+		-i gyp/common.gypi || die
+
+	# bug #877765
+	restore_config mozcdic-ut.txt
+	if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then
+		einfo "mozcdic-ut.txt found. Adding to mozc dictionary..."
+		cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die
+	fi
+}
+
+src_configure() {
+	if use debug; then
+		BUILD_TYPE="Debug"
+	else
+		BUILD_TYPE="Release"
+	fi
+
+	local gyp_arguments=()
+
+	if tc-is-gcc; then
+		gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
+	elif tc-is-clang; then
+		gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
+	else
+		gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
+	fi
+
+	gyp_arguments+=(-D debug_extra_cflags=)
+	gyp_arguments+=(-D release_extra_cflags=)
+
+	gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
+	gyp_arguments+=(-D use_fcitx5=$(usex fcitx5 YES NO))
+	gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
+	gyp_arguments+=(-D use_libprotobuf=1)
+	gyp_arguments+=(-D use_system_abseil_cpp=1)
+	gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
+	gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
+	gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
+
+	gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
+	gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
+
+	if use ibus; then
+		gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
+		gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
+	fi
+
+	unset AR CC CXX LD NM READELF
+
+	edo "${PYTHON}" build_mozc.py gyp \
+		--gypdir="${EPREFIX}/usr/bin" \
+		--server_dir="${EPREFIX}/usr/libexec/mozc" \
+		--verbose \
+		$(usex gui "" --noqt) \
+		-- "${gyp_arguments[@]}"
+}
+
+src_compile() {
+	local targets=(server/server.gyp:mozc_server)
+	if use emacs; then
+		targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
+	fi
+	if use fcitx4; then
+		targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
+	fi
+	if use fcitx5; then
+		targets+=(unix/fcitx5/fcitx5.gyp:fcitx5-mozc)
+	fi
+	if use gui; then
+		targets+=(gui/gui.gyp:mozc_tool)
+	fi
+	if use ibus; then
+		targets+=(unix/ibus/ibus.gyp:ibus_mozc)
+	fi
+	if use renderer; then
+		targets+=(renderer/renderer.gyp:mozc_renderer)
+	fi
+	if use test; then
+		targets+=(gyp/tests.gyp:unittests)
+	fi
+
+	if use ibus; then
+		GYP_IBUS_FLAG="--use_gyp_for_ibus_build"
+	fi
+
+	edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}"
+
+	if use emacs; then
+		elisp-compile unix/emacs/*.el
+	fi
+}
+
+src_test() {
+	edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1
+}
+
+src_install() {
+	exeinto /usr/libexec/mozc
+	doexe out_linux/${BUILD_TYPE}/mozc_server
+
+	[[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt
+
+	if use gui; then
+		doexe out_linux/${BUILD_TYPE}/mozc_tool
+	fi
+
+	if use renderer; then
+		doexe out_linux/${BUILD_TYPE}/mozc_renderer
+	fi
+
+	insinto /usr/libexec/mozc/documents
+	doins data/installer/credits_en.html
+
+	if use emacs; then
+		dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
+		elisp-install ${PN} unix/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
+	fi
+
+	if use fcitx4; then
+		exeinto /usr/$(get_libdir)/fcitx
+		doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
+
+		insinto /usr/share/fcitx/addon
+		doins unix/fcitx/fcitx-mozc.conf
+
+		insinto /usr/share/fcitx/inputmethod
+		doins unix/fcitx/mozc.conf
+
+		insinto /usr/share/fcitx/mozc/icon
+		newins data/images/product_icon_32bpp-128.png mozc.png
+		local image
+		for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
+			newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
+		done
+
+		local locale mo_file
+		for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
+			locale="${mo_file##*/}"
+			locale="${locale%.mo}"
+			insinto /usr/share/locale/${locale}/LC_MESSAGES
+			newins "${mo_file}" fcitx-mozc.mo
+		done
+	fi
+
+	if use fcitx5; then
+		exeinto /usr/$(get_libdir)/fcitx5
+		doexe out_linux/${BUILD_TYPE}/fcitx5-mozc.so
+
+		insinto /usr/share/fcitx5/addon
+		newins unix/fcitx5/mozc-addon.conf mozc.conf
+
+		insinto /usr/share/fcitx5/inputmethod
+		doins unix/fcitx5/mozc.conf
+
+		local orgfcitx5="org.fcitx.Fcitx5.fcitx-mozc"
+		newicon -s 128 data/images/product_icon_32bpp-128.png ${orgfcitx5}.png
+		newicon -s 128 data/images/product_icon_32bpp-128.png fcitx-mozc.png
+		newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png ${orgfcitx5}.png
+		newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png fcitx-mozc.png
+		for uiimg in ../../fcitx5-mozc/scripts/icons/ui-*.png; do
+			dimg=${uiimg#*ui-}
+			newicon -s 48 ${uiimg} ${orgfcitx5}-${dimg/_/-}
+			newicon -s 48 ${uiimg} fcitx-mozc-${dimg/_/-}
+		done
+
+		local locale mo_file
+		for mo_file in unix/fcitx5/po/*.po; do
+			locale="${mo_file##*/}"
+			locale="${locale%.po}"
+			msgfmt ${mo_file} -o ${mo_file/.po/.mo} || die
+			insinto /usr/share/locale/${locale}/LC_MESSAGES
+			newins "${mo_file/.po/.mo}" fcitx5-mozc.mo
+		done
+		msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o \
+			unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml || die
+		insinto /usr/share/metainfo
+		doins unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
+	fi
+
+	if use ibus; then
+		exeinto /usr/libexec
+		newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
+
+		insinto /usr/share/ibus/component
+		doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
+
+		insinto /usr/share/ibus-mozc
+		newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
+		local image
+		for image in data/images/unix/ui-*.png; do
+			newins "${image}" "${image#data/images/unix/ui-}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "ENVIRONMENTAL VARIABLES"
+	elog
+	elog "MOZC_SERVER_DIRECTORY"
+	elog "  Mozc server directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
+	elog "MOZC_DOCUMENTS_DIRECTORY"
+	elog "  Mozc documents directory"
+	elog "  Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
+	elog "MOZC_CONFIGURATION_DIRECTORY"
+	elog "  Mozc configuration directory"
+	elog "  Value used by default: \"~/.mozc\""
+	elog
+	if use emacs; then
+		elog
+		elog "USAGE IN EMACS"
+		elog
+		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
+		elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
+		elog
+		elog "In order to use mozc-mode by default, the following settings should be added to"
+		elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
+		elog
+		elog "  (require 'mozc)"
+		elog "  (set-language-environment \"Japanese\")"
+		elog "  (setq default-input-method \"japanese-mozc\")"
+		elog
+		elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
+		elog "by default) will enable mozc-mode."
+		elog
+		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
+		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+		elog
+
+		elisp-site-regen
+	fi
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if use emacs; then
+		elisp-site-regen
+	fi
+	xdg_pkg_postrm
+}
diff --git a/app-i18n/opencc/files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch b/app-i18n/opencc/files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch
new file mode 100644
index 000000000000..8e80ff29014c
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-1.1.7-fix-missing-cstdint-for-gcc-15.patch
@@ -0,0 +1,13 @@
+https://github.com/BYVoid/OpenCC/pull/894
+Fix missing cstdint for GCC 15
+
+--- a/src/SerializedValues.cpp
++++ b/src/SerializedValues.cpp
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <cstring>
+ 
+ #include "Lexicon.hpp"
diff --git a/app-i18n/opencc/opencc-1.1.7-r1.ebuild b/app-i18n/opencc/opencc-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..afce6038391d
--- /dev/null
+++ b/app-i18n/opencc/opencc-1.1.7-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2010-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
+HOMEPAGE="https://github.com/BYVoid/OpenCC"
+SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenCC-ver.${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/1.1"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/marisa
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/tclap
+	dev-libs/darts
+	dev-libs/rapidjson
+"
+BDEPEND="${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+	python? (
+		${DISTUTILS_DEPS}
+		app-admin/chrpath
+		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+		test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+	)
+	test? (
+		dev-cpp/gtest
+		!hppa? ( !sparc? ( dev-cpp/benchmark ) )
+	)
+"
+
+DOCS=( AUTHORS NEWS.md README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-missing-cstdint-for-gcc-15.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -r deps || die
+
+	sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
+
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_PYTHON=$(usex python)
+		-DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi)
+		-DENABLE_GTEST=$(usex test)
+		-DUSE_SYSTEM_DARTS=ON
+		-DUSE_SYSTEM_GOOGLE_BENCHMARK=ON
+		-DUSE_SYSTEM_GTEST=ON
+		-DUSE_SYSTEM_MARISA=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DUSE_SYSTEM_TCLAP=ON
+	)
+
+	cmake_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use python; then
+		cp "${BUILD_DIR}"/opencc_clib.*.so python/opencc/clib/
+		distutils-r1_src_compile
+	fi
+}
+
+python_test() {
+	epytest
+}
+
+src_test() {
+	cmake_src_test
+	if use python; then
+		cd "${BUILD_DIR}_${EPYTHON}/install/usr/lib/${EPYTHON}/site-packages/opencc/clib" || die
+		mkdir -p share/opencc || die
+		cp "${S}/data/config"/*.json share/opencc/ || die
+		pushd "${S}" || die
+
+		distutils-r1_src_test
+
+		popd || die
+		rm -r share/ || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		distutils-r1_src_install
+
+		# Hack to make opencc's python binding to use system opencc's configs
+		dodir "/usr/lib/${EPYTHON}/site-packages/opencc/clib/share"
+		dosym -r /usr/share/opencc "/usr/lib/${EPYTHON}/site-packages/opencc/clib/share/opencc"
+
+		# Remove insecure RPATH
+		chrpath --delete "${ED}/usr/lib/${EPYTHON}/site-packages/opencc/clib"/*.so || die
+	fi
+}
diff --git a/app-i18n/opencc/opencc-1.1.7.ebuild b/app-i18n/opencc/opencc-1.1.7.ebuild
index bb06c29d91af..300ca308f554 100644
--- a/app-i18n/opencc/opencc-1.1.7.ebuild
+++ b/app-i18n/opencc/opencc-1.1.7.ebuild
@@ -34,6 +34,10 @@ BDEPEND="${PYTHON_DEPS}
 
 DOCS=( AUTHORS NEWS.md README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-missing-cstdint-for-gcc-15.patch"
+)
+
 src_prepare() {
 	rm -r deps || die
 
diff --git a/app-i18n/poedit/poedit-2.3.1.ebuild b/app-i18n/poedit/poedit-2.3.1.ebuild
index 963ef61966a9..f2e75b498ac5 100644
--- a/app-i18n/poedit/poedit-2.3.1.ebuild
+++ b/app-i18n/poedit/poedit-2.3.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 381346564b33..fe1ef988157c 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,4 @@
 DIST transifex-client-1.6.14-deps.tar.bz 241704343 BLAKE2B 06a0dff0451706b1f2ad800a604d588267fc6152ff34b79fc55f823d245ef31fb210ef1c29b52312edb6f868d2d4ad8af6cbf30c104051de3036810cd359b1f6 SHA512 d24fdd630c978e043bd177b8c47d6baf37f68c479104a789ecc92c7749d6482c097956f3280274e0f61cfe93ebb02213e888a98058f81df30b7eedc6c18ba5bb
 DIST transifex-client-1.6.14.gh.tar.gz 97070 BLAKE2B c072efa54c47f78f960a5dc8e8839202c33ab53dae542a87ab0c6676512962aa70e50d57364ac37489cc193c17fb3c2e7763f693bd16d29208ff82e03700ed5a SHA512 b242a5e954eea2c6397c19e286ec953a4afa48d9269a2b7cddf83b61e4e168ac27871ae5607a62438b7bec7bd352e3f7b902dae550a4373f8e8d13763aa79d30
-DIST transifex-client-1.6.4-deps.tar.bz 241683180 BLAKE2B 395caf5b5db1ea93363a7f6efc4d2b8ff9e5e8040b04fd8e78ccfbc4b6239c809e348de9d4f8e494d34a2fc6564a70df448961d62a2949c9e2a326cb5f873fcf SHA512 0463cc7ead2c111f4d3889f3f29aa1c729554af0d0934a51aebd691e1f621f9bc61b5b3a90166ee0c947187aa5b489dc6b1bbd438193d6009afdc1a040db1270
-DIST transifex-client-1.6.4.tar.gz 94703 BLAKE2B b51e29aadab41c23b95efc86c334876094772e9d4f4f0cdaa41a5d016e710597da631953446d20689b0028e34bb4cc31ab0bdc1d3107dbc3a4abd6ba9279698e SHA512 d8e6b18d30b9d225c6ed84c9cc699743c289ccfc151c1aa74411989f965f554e651ece3e36a033dc8fc77bc3bb5502b02b2d04b1affe96811195b74edadf128c
+DIST transifex-client-1.6.16-deps.tar.bz 241721174 BLAKE2B e3024f212906743b9feac0d4418e6c9b189fe13d8ea3afa0aa9d528d67aef70175dbf48fcfc72278558bc47dd05b03066a4d55b5b4e511554cd1fde2bd9611f9 SHA512 d0c2cc86405f60d2e35296f940ce70c1d4782b9f4489334dd6a7b0fcb529215be434e3a1730cd120aa3babdf0a79f7f811b3717219ee2d8a64e922bbbeb414dd
+DIST transifex-client-1.6.16.gh.tar.gz 97151 BLAKE2B 42da0aa3d7319daafd7c7a6e2102d394eeebf4693da5024570d2362b81f97696fa1b9ade55548a5e0d54298f3d462292826c26dc41ec4ecee5dbf268b38a8e13 SHA512 c8945b5a14f5550bbc30ae50e1d56f6f06e31d6aa65d2a2f5f4fa36469607e8f0227afd26c942855e196765967a43992aa58c43b48661582415d600ac5f99b28
diff --git a/app-i18n/transifex-client/transifex-client-1.6.14.ebuild b/app-i18n/transifex-client/transifex-client-1.6.14.ebuild
index 77f7ca2c8ac8..767b653b5052 100644
--- a/app-i18n/transifex-client/transifex-client-1.6.14.ebuild
+++ b/app-i18n/transifex-client/transifex-client-1.6.14.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/cli-${PV}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 src_compile() {
 	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
diff --git a/app-i18n/transifex-client/transifex-client-1.6.16.ebuild b/app-i18n/transifex-client/transifex-client-1.6.16.ebuild
new file mode 100644
index 000000000000..77f7ca2c8ac8
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-1.6.16.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="The Transifex command-line client"
+HOMEPAGE="https://github.com/transifex/cli"
+
+SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-deps.tar.bz"
+S="${WORKDIR}"/cli-${PV}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+src_compile() {
+	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
+}
+
+src_test() {
+	# Skip tests depending on a network connection. Bug #831772
+	rm internal/txlib/update_test.go || die
+	go test ./... || die
+}
+
+src_install() {
+	dobin bin/tx
+	dodoc README.md
+}
diff --git a/app-i18n/transifex-client/transifex-client-1.6.4.ebuild b/app-i18n/transifex-client/transifex-client-1.6.4.ebuild
deleted file mode 100644
index 6ba19788bb45..000000000000
--- a/app-i18n/transifex-client/transifex-client-1.6.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="The Transifex command-line client"
-HOMEPAGE="https://github.com/transifex/cli"
-
-SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-deps.tar.bz"
-S="${WORKDIR}"/cli-${PV}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-src_compile() {
-	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
-}
-
-src_test() {
-	# Skip tests depending on a network connection. Bug #831772
-	rm internal/txlib/update_test.go || die
-	go test ./... || die
-}
-
-src_install() {
-	dobin bin/tx
-	dodoc README.md
-}
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 0926ca93b63c..9320ff6f8115 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -8,10 +8,10 @@ DIST ammonia-3.3.0.crate 46061 BLAKE2B 082ee30f39ad788c9ae87888f003c2f6d08fbea7a
 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 anki-24.04.1.gh.tar.gz 2394990 BLAKE2B 9e38d460bd7591bfefa4d6e90b3c0565c7558acbd867d9303f89b69e486c5f174964ec1a1d4adba4148837cd95e887c62484d06bbcb685e43ce3659a3771b754 SHA512 998e62181f37243f0357c185426697bcca53a3f7d2c1703f869849b20d175ca07a27b0b344f308771ee9e0f07c8120d5aa45940e6964e1a66087a58ac4547cee
-DIST anki-core-i18n-e3af3c983241448a239871ca573c9dd2fa5e8619.gh.tar.gz 1295257 BLAKE2B 00aa9ced09aad9633189ae29597cde56ffea627455003bc6f4622241a2ce80a634d8c992c6a10289c940cbcfeb3247080b74cdf88d871febc96ea886158b3277 SHA512 abbb6f77cd476aa798b66d283c7b560a9ad82bb17daec241d021a7aab73212f6272baefae1f49144054654efa74df7ac6c1b5ef8eb9305308ae5b08831c4da2e
-DIST anki-desktop-ftl-45155310c3302cbbbe645dec52ca196894422463.gh.tar.gz 218582 BLAKE2B 0e0b43c3b6565a657915c6ee1e69967dcd42c76712cc521e3273efcd4c18e43ce359dc7dec8611f275b1aef1f941b308a8d5d45d6c93d991c83f09e92b9786a0 SHA512 b5163edd076562b89d90a12bb05eff2ac3f1adc5fd5f9f7450679ed7064fd79a2e741cee6fab59e571233c9ba6f6181b61915945eb916c3c4a5916489ababff3
-DIST anki-node_modules-ea8f0c1491d0b0f9e0fdff589b1f0d297e6e11a6.tar.xz 52164300 BLAKE2B f8c1b3b7d02d7a9b0fe9736769b023c083b08dc6a863bbc67576c25baf20ddbafe3c25328e8eb145ee813c0cd12438fa916480ba6d07734df88ca2ab6ce67728 SHA512 84f65d552044d6bd95d0d8141a7d50fff8a4f3a97c9635ffead42842238a59a48be67150fc49a91b0950e57e93ab64473daa1165d206a9ab9e18dec4aa5970de
+DIST anki-24.06.3.gh.tar.gz 2389824 BLAKE2B 4e1e908bc003ddee25976f1040ad0867980fadc90876c785025e4acf0e043f6cb1b973b568ff3a0a21907e0c12bcccb0d66078d1387fa400b8a61a06e7a2a395 SHA512 9690eed253f5ef1f065800f1a7778be5d36cf253ec34abb89996e5b0b8eee376fe3e752d1c63ce5c392787fc34c58cfae4dba14457c2963b39d674ee3f4212a8
+DIST anki-core-i18n-b4813a328f44c8224d2649adbdbcbef095db9a40.gh.tar.gz 1346295 BLAKE2B 8e8c20a2a456ae87dbb4103be3506233731da7418e22081343a78075166d37a9ac7aab9212bd42480fd7ee91850ff1d66578594ffe9b24577e8480e5ee44e342 SHA512 a9346db7509cc6895977f20f3e2a1de4d58e7dc76df21c74d869c1fee0ed49b1954bed96d1bc9e503612b135a47ddc156d604cb6bd1b3245a43775d8c9fe1999
+DIST anki-desktop-ftl-b95608421ba2ba1cdca407933aff9ba25d567e12.gh.tar.gz 224579 BLAKE2B a0b8520c5a68e0714762b92c7b9cb07e8a39d3e2c3f6fb1209d83ba74af7f51075d530860ce595239fae66f00a68a3c6cdb8d0fe399d5ddf9d21974b629cda15 SHA512 7d6242250dac72afa0c27dff26f6738a23ac13e7fffd9868c918296802bedb07e37c56f5aba04e6d99173b89d585ba3304ca482c2551646f157c8b1c5253db67
+DIST anki-node_modules-b9a182d8e2f3a11b633a6d5fbb582e9e7d8a4f34.tar.xz 55303852 BLAKE2B 80a3f7259552406360480148e2d1baa60c411a18f4a6f3f987119e5eaa5d0e97c23256f85efe3511dfd09d6386d2849879f18cb85eb93ffe53465987d047327b SHA512 e712d47ec7a8119a992e4e9dcb2876aa59c9d338262b3192ff2123a4f2981128c67f6c99c25c5176efa3d41393060dd02fc19e26ec62d129489146e43d60d0be
 DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
@@ -27,7 +27,7 @@ DIST async-channel-1.9.0.crate 13664 BLAKE2B 52455c1c9f82bede902a96de0526ce45631
 DIST async-compression-0.4.6.crate 99437 BLAKE2B a5419a49c52d89604b1015370cb45dca89d9444ea8932adf075f33cca54e7ca4508f9d0d4c24fc51c77b11d75a9ca5b8b46a4e526125c3bd90a19546eb04d4dc SHA512 efe1047834ac384dcdfa4a7dc44807035ea56215b49969138aed739cc6a6c42eb2f692e5eb887ae5c3a5f4da5b1aec16c80ecae491eb6d83f0637e9aa20e7d87
 DIST async-stream-0.3.5.crate 11916 BLAKE2B d79804d7310d1f47d7848007518e0b0e0f0724f2589a20478eda3ab1a1db8775c5aea494688c69437046accd10eaec789b244451e84a19e489f071519b50d2fa SHA512 d34ab46a9e18bdf35fe0e58808fadf422dd50246cedf48110b3273be17939678d2cb5b61fae9da176bc2c2b373933821e912fc395627f7a6fed1d2c43bc66c9d
 DIST async-stream-impl-0.3.5.crate 4173 BLAKE2B e7c0d2371299af6fe9983adf4f8cbb6402ceaa5f9d286f124362332a4016404069c362176dd3b71061027b0768ac1f772b3e5e38809b870411f4590126a74ca6 SHA512 3725216119cf4cc78d433e2f8a8df9bfb7a3f046e4a8346bbe76e91b23686dfcbdb7cd182765e12d606ed0e3391477c43652a025597de9120170fd0b1151d204
-DIST async-trait-0.1.77.crate 29986 BLAKE2B f678cea4defa1cc7c0f1571e71f87392c0fdca8ba175bd94be68b92adaf2b4afe13fac9020bd27bfbb2af9a7d5f2f7047e3bbd0b080a7213354a8175e6ccd455 SHA512 7ddadfe6c434267cbb22de62f09373ea83ec3c4eceb7781e0bc438ce422266f30193730e0215411f1c7c9c6d5cc589ed9bbbd71c836e440bbcddf8afd3d8950f
+DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST axum-0.6.20.crate 146227 BLAKE2B 24592e684de9b7c0b06b9871028dd6ed14b9a2ed259076b50b12a2376e93b8fc028831a94bc748eb6c66dce49978987d3655fc30313daccb0ddf92919fa9da00 SHA512 e0ef6bab62d465a607a49c799823133d634d93d7a389fddd2e165fc3895eeb4c544f35e044e3c8f52a21c8421e4e4880982fc0be62de613f98ee571186f55646
 DIST axum-client-ip-0.4.2.crate 15027 BLAKE2B 9f472f6c155959e3931088a776aaf1f8703917aba2b735b4055a16ee132b1ee34e7b2bf6d1500bb68e6cc7614b2b2f15961fc5a6cde2544d8013a653ef223de4 SHA512 d3b7444afd1bae08688616f59b655d28482e331830a6866cf8a890c1e91963a85465c9468698ce37b4e17f7e584facae83e27fd55804620bd3e9d782067c946f
@@ -36,6 +36,7 @@ DIST axum-macros-0.3.8.crate 35948 BLAKE2B 21b99a12243289570e49a4b25e7273b63d4a7
 DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
 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 base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
 DIST bincode-2.0.0-rc.3.crate 57746 BLAKE2B ab3337700486b329a8ffb6e11779fbe63707059480abc3ca27d9556c08afcc3672718019fdf63f9ec07f99ef5cc381e5cc47a8afb145dfd693f63c2cb2ee79f0 SHA512 d9e1686df2b419b9a02ff84efa08e4b6070498362fc1fdbcf761ad04fcece36f6270b0dbcdbdf5abcfe1e534fa4ea1dcf3213aceadc5955f8f6a6fb20dc156d2
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
@@ -49,20 +50,21 @@ DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58
 DIST block-padding-0.3.3.crate 8504 BLAKE2B d62481c25fd8680cdf0ad0bc259bd3777c3985ee91d5bb4995f484a15d4a9bde21c5d20f8c2efd0eb340aa0b8c7faac0f3fd817202ef4350d17994f478715eae SHA512 0849c99f2027f4e1a12872d2210310e9669f98929c99690febfeec90c0199b2274e20a5f83824f200f75f2553be2029ca85b0c5d0db4d9d477ffee9a71dd3b7c
 DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST bumpalo-3.15.3.crate 84438 BLAKE2B b76885372dbf91d3991fe5428c187bf4f66f3a8ed7ae44932d7479cc154ae0f03356d3f4fe56ccb5cb54f1690a3b21c4def5081228e778a5e64071023a73db97 SHA512 0871115264dd63ea9b636481bcc6f7fbe1c9f7579bb7cd69622ae79a3df216a639cda2f91af370f84d3e8a8bd615d894906ad614a20f94b9ece954d31df5dbc1
-DIST burn-0.12.1.crate 15175 BLAKE2B 5ee5618170630c78e47d19418cb6895024b0382ea65b577d16c4c6669c1c94352c1b4d046234ddca1163ad0b966bcaba327b405f9dc9b06cf4362f0b245fb380 SHA512 10891ac9ea17986dab761bb8907c82d51ee879804a541373ec0c576d8b83bc11c03905a6f3953d43e6c92a68fd395f6daca3186d4906da70ddd35c403780b8af
-DIST burn-autodiff-0.12.1.crate 38099 BLAKE2B 873fdcd21da7a8dd8235e3bbd6e4c441a13cc30d49f43ac1bdec1562d06e793c3ec2fb0ce88c4e4eafd0e47f843f4156a45ac0b6d3e18ace2de1beba4eca63e2 SHA512 d1049107ef48db1fe9460331a101c27c6d39e911aa9ccb29abd38c95fec27fd62489ae657f4e666ae14dd036439df2d5c7c389436068a1243b4bca6ec08d94ed
-DIST burn-candle-0.12.1.crate 8974 BLAKE2B eca7341b38adb923b52ee381a1d2256738d116d6745edde1f2f36740c470755c987d0b282f18b62baa46768efdc5e9904f645488e22724045380cb1ef8b47874 SHA512 dfbbe00667cc358a4eb0325dd8657a1fcda634f6a8140d0a0d4115c92d75016b4dd8a0964351b86f5146f3a893fb7aa1d06b0a139dda1e58b089614046ea54db
-DIST burn-common-0.12.1.crate 10814 BLAKE2B 44fe710413223fd7d1403eadccb54a521db97a451936ab2d61d93b3a69a0ab5a8583d50778611a508e6488568afe9722e5b8917d18f881284f5769e2da476afc SHA512 2c5b3f7d55ba73ac3e7e68ed49e4ddf0e63f245a5afeca4d43114be1093bb95030b0c0a2c5093b23cfe2f3a38dd4b2688fcdab33a67c417e3c5d02dfd897950d
-DIST burn-compute-0.12.1.crate 18570 BLAKE2B 81736f4bb0d731bb8cc6c02c54b7c80af8304cf0f587aaa5c5ea49a121df5a7eefb97c15273c7f45e4ecbef88ae64ec392c7e52c2379c25f9639d85c22ea7ace SHA512 aca5b13524b8c0c300cf93af3fc467c9cba1be51ff3b8ec474c3ad76e84e61aee5eb6c0524ec56499b92a3457313c7db0cd91abf52d8f303fce0f57ea9112c22
-DIST burn-core-0.12.1.crate 1994180 BLAKE2B a35e5a0d7e9338df96587ad5da7788f316ca1e2d113e016f384cd917feb3615eb6c624dd7331a6f7df82b83da6992f7b21b60bdc33cb5a0659ae5ee9fdaa957c SHA512 b52e5a5cb4595444833d2b1e9676e6ac4d744e1170b3d26f5936c19f26938771a1eba116b2294d03c99f87399bbe1951538213ee9b8ce4d16227c1e1e019399c
-DIST burn-dataset-0.12.1.crate 42611 BLAKE2B d4e6ca27a0a8c3b20a01856151e09e4f89ff2fbea642b5f93c05cde336084961d1e1970a4cf0bd31830b649a68dfdc5f746ca9e5bd4807c8576c1054ceae55e8 SHA512 0a2da11e58922d13eab5830a86278b1ea5ab415503288da60d98248e37e5ee94e15e5608b516dad5b2b7de27613a361285a19260e38afd0ec21dc2f3f98e5a69
-DIST burn-derive-0.12.1.crate 14315 BLAKE2B c921b3ab387fbbfe0ee6014feb33e6ee9f618d380371c172b211a6f4cce0737623c4580d636fa7b598a3746374d7ce5724d1c4bf9bf180016facd15c5b496762 SHA512 28efac40a2e042f3a30a509d2c40d946086d9040219a657e0a5223a8c3303d0300ee19cfc399b33c84047482c5c95de732bf7c7c034f3ad72601fb453d4e0096
-DIST burn-fusion-0.12.1.crate 42358 BLAKE2B a49a2a10733574fe6867e31c3d19cc24cba946c97e5db26cf46cb95b3389d802c5f38e49fc3bfab1b103e8b0df1e829bbc6a632ba34d2b884b49846d88680013 SHA512 ddf71d245be976b4ce979ef8c1d6d86490f3659e821d0b9686fb900beedbdd3ff6ea37a6469b76b9001fe1a24102ed75eea76dd70cdc470efd55729673ce0698
-DIST burn-ndarray-0.12.1.crate 21677 BLAKE2B 99cb5f702f6964fe15c81211c7c31008fef33a85679f33aaa81a8ed42f654408748fe933089bb8d17f81297da5a171a1ce2560894e704a21566897dd467b05bf SHA512 e5585658014aeee27e692542610d78afd8a862ab39f60084beb93c18ea9669bad6a49651121e90b950458c33275c68086ac9ced351c375f9308059011aff543d
-DIST burn-tch-0.12.1.crate 26323 BLAKE2B e4ef17d5225eb00b4a08f77bfd1ad9a3ba74cb1f8c18a4a7f0963a8e5a51a0a0e8d9a88924c15061e8b94c81988bd3b188599246235481ee994ad11c346796ec SHA512 50b7618f5036242ff3d1ed4321d91f122db761c2ef2d8f37b003dc02737f5031316e4c5e9fd62a04e0ef42e98fa56d6d055b5273ae85da10b6fb4374f8942d62
-DIST burn-tensor-0.12.1.crate 82745 BLAKE2B 012a8d986e05dbda35c8342e955c61118731f9fb11de072a732a7a90def2385bc0d1a63da9859f8e2667da646fc11e0792b633ea055ed980023140f06ff1893c SHA512 8fd7f7eaea70ff0eb83be6ae6476e22daa295cbee48d76482d72afdb0c3d7eb363d5040179d41e83100ffd0fa818ed77482a63ce47defe03531a569ef4a83e8c
-DIST burn-train-0.12.1.crate 42343 BLAKE2B a9de54efba8fb1de89e054ea3fa1019bf4cbfb45c062909e76a458cf891021f7e5e011c97309f6969f849b55eedb92c5e36b097b9e08a247f7890406f98e1d59 SHA512 9bf46222e847cc65ed63b9859414814460cddc9f5a9523ddcb129b9f3caad2490f876c1fb73142556d4971ade6b2e46dd390ddc0b89aa888c5246f002c3284f6
-DIST burn-wgpu-0.12.1.crate 82313 BLAKE2B ce6e1c7c810bd090f4fc84e5d3b8e90638f4eee3e8def41c241f5f5420e08c02245d93dcd6caa598727bfc73a4b8aee8e7a3465afcb7a060d0246f23973fa06f SHA512 1f8a5a8ffada25ee780c5c56da8756fe6b1f76530e8b012926c05947d97ab9c7c9bdaa47f3e6346ca2c01c80ad6f82eb1c2e993536446e1873772df6cb0ceb6e
+DIST burn-0.13.1.crate 15357 BLAKE2B a81930340575c74df13c9d18764b4622b37c3dbe4dec41c23e6069b089c7b4fa187d739fcfab5d0ccec2fca5a9cc3e43998c16bcae552a694042d7ec05231be9 SHA512 04ee1da4add8d76993bc332e716b93427c5bbfbc48a6d7164c0eb2b4eaa058ccaaa47a93d62c2ddd074f36ba56d9c2e168ee1802287dadb3a14d4f8e7e4c4e17
+DIST burn-autodiff-0.13.1.crate 56185 BLAKE2B 7a0449dbe00d77f811d5cd7c4c3acb8aeaedd754b3a931283ca4d8d0a24a3bb0d665f8dae905532d2c0a850a8fbf1a0213e170777fb96abe96055e7504dae665 SHA512 4b9a0e7da0adbb2a737adb4cb040cfb1bc9c71833ec2344cd5d7c866f54c355c4a54144d5c4f07e442a0c593ab7afa73ed618483406569e42e5da6f8d075cd56
+DIST burn-candle-0.13.1.crate 14461 BLAKE2B 5df499dcf6e4044c0883e8b7211e8da15b5c723bfb068134a91bb2ec78862b1d83668a4e3ea0818bb42f379c96a1a3aecc8f8e06905270e11ad0eb77354184d3 SHA512 a1d8cc0902b49ab3e563d5ada893ac3563cb04b41b2fe9414592c72cb77147c695bf14f9e745dbf3a750d5fc5a5ae310a2b1e7a6edcedb18b8ba46a0f9c39e16
+DIST burn-common-0.13.1.crate 12064 BLAKE2B 27a9b643b87fda9d53c333e19b39c5c32326ed518f712c84ef329f5d82ab1a7a51d3dbd0bf1f4f737add52f034fae8c89a1b2aa3f66c22388b43ba3eaaa9345d SHA512 eb855f498372139488024645d8f3560900c851b68515ba23b1610578046773c236ab293cbeaf7c28a46512d21856f4daae766771c8a130f77a6341fc2d5b18cd
+DIST burn-compute-0.13.1.crate 23064 BLAKE2B b6dc255056a67dde38600972ddfdb31f8e4f8853162b635c3c3dae0bc0eea0f6acaf569aadec1c9add60f52b982646e6f5b5ecf6566cdb334845678ceb587c8d SHA512 84e8205bb4d7fb8db551b52aa24fc554680175a79e4f5d86c30dfbf9bfa3dfcfcf05aba670f2b399f2cef4c3ea8a46408d51d292ec46337fa4afc459a07781ff
+DIST burn-core-0.13.1.crate 97316 BLAKE2B 555466f250e94f9a85a9cd2e8765d237d020c775393c496111ded7b48a3f0c1e91ca7f873f4ae109348dba8ca7c8afe3e0217fc5f400cf3f3d424a0437bfaab5 SHA512 04f657ead2d4a31ca2084a42b119bcae762202ab2efbc42abd2e4a15d253e4f100291a2b213698a4984d086eb8c383a60b684e3013b618f461f880677127d802
+DIST burn-dataset-0.13.1.crate 47195 BLAKE2B fb666bdaf46b8b67d478e2d2d32f4c20cd0909b139436dd2f730ed70ea9a98ae455fc401aa5c609d360c182794bd46c14237b0c3e37626a48949375a9febd02d SHA512 2a0c5924788e72d313407c2d23cdb0038bc2b551b6db1c7a30801d7a6deae3df4708000b44a77cf4dbcfbbb6309aa92c5728f0f8d7ec0f544d0ec789d68abb95
+DIST burn-derive-0.13.1.crate 15873 BLAKE2B 44b4a85b765bb9427da76e4a1f9f7fe036c2476bf933770704c1112f494ac976e5bd88bce50f6a0b00c0fffb647d2ee5f3b2d1b547f1fe146bf6f56d6003eab4 SHA512 44c4e5f21d4805ef5c5e749986669940673edaf4078e12e4df7b801ef9faeffd6ae08b25dd716ee323a5c39eabdc4dc9ee023ac998552d68151b954dc67d97f8
+DIST burn-fusion-0.13.1.crate 49334 BLAKE2B fdf264fa33d537849a3929f48563e0d4566cf27f3d7f1a584664494eb62246ac8a36065f8df31c7329cf9cab944c2a6e2997d10bbabd584e0b4df4530aaf87d6 SHA512 5bbadf6851823e1c5b68c6a8d6848715aab95f6db4f2bd129ba3dbfce110db07711d66c00526e8a32a29a075b8437fa28c63d3252c47d8da523168ebe482e73f
+DIST burn-jit-0.13.1.crate 99652 BLAKE2B e288f6cb173dab13ac7ff0c663438eed7b7e81a20a953a5da3db9ae1ace81128bf2ddb2a9f96054d3e23f063eb841692eadce543eb6d76842f2a22ebe3741407 SHA512 740016c22832c6ef43a13e51e0c42dd59766d1d2cceff0eacc224629bd4c8b9bdfd3fc82742520444fd76e2be1ac70cebecda4c3bbb603c7a97076e086dfa5b5
+DIST burn-ndarray-0.13.1.crate 24601 BLAKE2B d9f2c4830d4ed8372c554e54749c291a89f38ace766f0d2f83a371a7aba2c5a1ac076364fae926d381ea48a71857694b7e39bf7144ac013c25bbfa933b214396 SHA512 f06250c7ffe2f4c6e018cd51ed292de5dce036b563509f320bfc31418653bf9c2c0cff2d484350178b1e4ba477592704229751f3bc4e6c12dfc0cc55b3e939fd
+DIST burn-tch-0.13.1.crate 28194 BLAKE2B f34c77b4a502bb99bb17f871066fd0cf6ad870e4207b7a35328f37d804bafbfce0f60235b50d03b4e6e305eff2e30cd639e8069f89795f1e6207fd25d12b4a55 SHA512 afcbdb5c76fad58894967998b43f4b50043bc27c6d511f82973f92197e4f6105f75a7e6358a618fdca0f0130d2af90175bad827124afe913b8436426003924d1
+DIST burn-tensor-0.13.1.crate 107135 BLAKE2B 187d6bd224ce60bd6add149c086d791f2dc17128f4c04b5d7eaf3c6d185ad8e879eb85abb632e9a297c53453dd6e9c5cf5344f57459a860f78e11b529576e4eb SHA512 d435e909c1151e03d721a2b5ca2c71d73f50a1ee124eb16c087ba8ff10a2d3a3d2bf1f37a22d59b2133f7fa87510a7c1fb00b449489c56335cbfd4115de4d008
+DIST burn-train-0.13.1.crate 46649 BLAKE2B a16fd48e35c4cea588d4ca5948cae67313035d7a55b87976e6a5349b035138f5fbe05a5f62db5d4c5c40785603f40adb66ec796eff1d427838d18caacb1ba26c SHA512 894c94cfaeb40ba5a6bbe8cec0eea8611d58a4f77db8fa9eea1baf1cc6d2b43ee5f9d9a26d1e0d19bfc5484e549767c15d42c0d1266bd332a0b6fc1e34e2ec59
+DIST burn-wgpu-0.13.1.crate 23742 BLAKE2B 9434d13c5e7246139dfdd6c7c75ac3e165ba1546c995b3d23ab664b5f72278bc98804582200b7cdae79c178a63d280b6ae9ac2596367d8126ccacb10ee123733 SHA512 73cce70c4581dbd410d5ffa2d3a499dd46b0480f6b1d416d6e47a779ce5bf91889283622bf134418269d4acedd04a74ba7b749513f0ee7d6db829f193b6425e1
 DIST bytemuck-1.14.3.crate 47032 BLAKE2B 7364a8b474013fd1ffd1df66e47f4f3fa516ab762e10e7b31d9135c5a811ebd87d368b1e723ef41095d17a05465b80128893cb76af310c52fd1fb04b57f7e1f2 SHA512 f01f21142273c53daf07bd168068661ab763f4696a39543a73d9341335f6da6f2e3c88e8859bb06ab3c1ddfddec9bbebf00f4cbd42ad49d77618dea612523c13
 DIST bytemuck_derive-1.5.0.crate 17323 BLAKE2B 847cbbe7a4449d17295d9b6082a8f38be8a1a426638a80f0fc097b208533bdf74d2192d5d898c4a7baf69921a56344e52e70c50daedd4818d6d0e0cd9f8959ff SHA512 aec9f0a10da379a0e909430d4f752457221a53a2a44801be1850072e3a0c6e9dbb1bae6c00609c85419f634a88204b9916a63276692399270223e4d67d7dbe29
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
@@ -70,11 +72,12 @@ DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d
 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 camino-1.1.6.crate 30519 BLAKE2B 3696bee362c9a6c7331079f86823aede0df06c1c36fdc2d11c0628267ca7635fd78430cc927cf3b2af34591537d3968b3c5f1cf9d500f3e889c202c944fc6138 SHA512 e777cc6e2a01c95931a81521eb278156d1c50ffd0126f914b21e35dbb7644b835f3c26bbe7a487bbca508d26b4c933bbbb9e051fa42825b154c2fa03c04375b0
-DIST candle-core-0.3.3.crate 193222 BLAKE2B 43e884d5067740fe42d60e0a81918ad5edcdd0eb960104015bf4e6340903042cf6a6ccc15edcc6de2af4c374ad46cf792f11c4af1e3455b7a0cb8c1cd1dfde85 SHA512 a0c1fcf4cfa9961e0ba512e5013b8c77f1791e8837e4a53d678e5a38d67cb5250c82e2e22db14da76c570b6c0458a00cff21ae851411e77d4aec46ce4d770677
+DIST candle-core-0.4.1.crate 200622 BLAKE2B 78e41a9d239b2be1082946ec2fae2d33a4392111c9c98eaed9493b37c3cd27872865f3825ce5dd2fae31177c1910788b1a96e2015616455e952c8a245d030c1e SHA512 a835cb35866f7151c6142581eb22a3e742f8dec5f0780d798e0b508cc00979e19895b971c6a72c45ba76ee7c740cc4bef881cb7eff7ab288d39474ab125f36be
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cbc-0.1.2.crate 23501 BLAKE2B c0d537af0323a92cd01a9ec197bbe46507835348e16dcec7360072226647abe2eaa4823023930da93885347fe1429acc2f9c079b7bcac686c1293ef73b91bf0a SHA512 d3b33deff64d839ad25141f1c3b5fbeaa21f71aee7b58dbed91e7d257f93e68073c8d4a63d4c4eb9775c20f00bb0ceeee714a8218e85a231f30cd7423022f820
 DIST cc-1.0.88.crate 75288 BLAKE2B 81c512bff79ddc40af633620ea440a73d3f7370c96878b3a84606ac0523f13a9ea756765afedaf2148344ffca3ce928fbb0678977273c918c21b4e3985507938 SHA512 67ca5820d36d1be38e56f54a0292d550c9c129d680611a60fbbfa458b8cb748e5f27c7ed1eb767ac3df41cd4e875160525b81ab624726183b1d298ffdcb87846
 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 chrono-0.4.34.crate 228932 BLAKE2B a2feab8d8b079209f8661fd8c5069f2a5fc3e5b0a6233187ace16f8f2ad8b4a147253e47af306cb31aacd82bdf490a8c8a171ad702b8dc22f9b934205d080c55 SHA512 2aaccde5e5ecaec744613429f807b3c34b92632973de7fdbdafd7ca510b917a23a0abc92a6497754d0d3368d684305648aec1fa2a0a61c88a100a20fab2348f1
 DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1
 DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106
@@ -90,7 +93,9 @@ DIST codespan-0.11.1.crate 8895 BLAKE2B af314a191a4dbfaac84aac58662209ff688de33d
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
-DIST com-rs-0.2.1.crate 10647 BLAKE2B fe4306095363fc20ed18b3880527d7a574e96d1b1b9613fea73b9c311ed391db7c2f3ae5e649b16b4975161220bb2907eec14238df4e9bb329898224bed5ca12 SHA512 e4bddb8d740553351e58a46c5dca95182db6eac90bc3f7a5f9fcb1d41b6dd7988eb12596ee8eec4f1c114a283f15f1fb15b0506fff9c1beadf811638c2a636b0
+DIST com-0.6.0.crate 24855 BLAKE2B 3cb2eaae6864f05a6d47819d58c83c9be2ecff8e382ed84dec93763f605d1392947dc5025198ccff4b28be5b37287725ee4cc7d7f8e057f1804351b82ed0bd2c SHA512 3ca186fdfb130863ab62fabb2c266f2258ee45482fa9b925dc0d5d7ff492a49fde5c75f8850b18895a27f804aea16fe7bd4c53011e8badfc5114a9740b5b52d9
+DIST com_macros-0.6.0.crate 1075 BLAKE2B e271f5e11a62d666bfcb530879b0f41dbb2d81b94b6cbea15a306a72c97cde9eb77360cd8b5b169f861dd1d5c422c3de07442f016ae169287f243b0e9ebbe7df SHA512 737df65d1281fcb0b636ec1dd908ac48dfc020681022d64de1e327605604cecf9100c6ed629a991716693cd251563e259c4ff5611410117a6e585c94de03faff
+DIST com_macros_support-0.6.0.crate 17334 BLAKE2B a786a331c0080b0803684d1447efbe2f6903ce5139242b6c81773727fa61c7721cb198050119f3cefdaed32753f756f9862debf5e8f91d49e39804291080d572 SHA512 e4ec9f58d8ee25b0447854db8f528fe4e989d8944b3fc2b74ef8ea899d3bf6e082e8b516a51a7f77a09073f18c1ad7efdc62d6da8c82e52bbfee02cd7a552cb3
 DIST concurrent-queue-2.4.0.crate 20244 BLAKE2B b30b97eeaabf0205bbd8f4eddcc57e59b6863f18969731be66b134cdc5bcac9eb543493c54b17bb394b6e227e808f016e4f3c1da2fd6b40269b9b24a5c433f7f SHA512 5821bb396a73692e5b033d8406c2996bc4318cebf8807e596e441a2bdc28715fc6bb8eb29b575ea318f84b748ce47341a8d23f5c4de65660f86056e99b6a8b78
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST constant_time_eq-0.3.0.crate 11369 BLAKE2B a6fb4ad3146b26bb3e18458938e65133431df129963041465291b38a69ba2b53ffcc849f455e67a65a5291803591b350afe4ad4996f1c4cb76c18a987b5b3ee2 SHA512 77bf6817c521daa45c0df7721418b4aa367531adde46b1db97316d52ffb46fc4ee2d3e6f62ff91ca6292db5e1d3e040f0f5287c3936f12a595b2c8c5928bf5e6
@@ -110,7 +115,7 @@ DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a8898dd49bcc8bb7430d25727a03430c32ec23cc44ced043709de1f80f4d750e335bd12b22d0b06050881c6 SHA512 1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed
 DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee
-DIST d3d12-0.7.0.crate 17319 BLAKE2B aff7692ca8aaf6f9a55917dbcbcbeb7ba68abc5e5c8306c8ef2f738aabb5a88d8369f3a49a62ca587228831a8b226e429af6e33d16f597cfb9a677059cb8be16 SHA512 55e1506e35c65059c9c1f5448e9c1e628ad317e124773a516ed7bacad35e7dcf400e88c9b853c95a38cca94ef15db887f34874582bd287b8707527e6a08f55e8
+DIST d3d12-0.19.0.crate 16772 BLAKE2B da5466148c3bfdd47a9a70d8eea4599b68cd0381a8fc0e5f7e27893d6a5d35b9507712cdeb1d753c4e321fca07cbddc898daf0ede1bba0ac3ca6ea746950b6bf SHA512 8d36d0ddad5da12fde6db6dbcf0493059221bae91b16ab2832dcb73e692d47344c407882b25cae9e95e4554f4c8ffe96721b1dbe8053caff931956adb53e365b
 DIST dashmap-5.5.3.crate 24061 BLAKE2B 2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71 SHA512 15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a
 DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
 DIST deadpool-0.9.5.crate 32190 BLAKE2B 01f5a0afef5e633c39f6c1bac09a0e0b4cf9321cb26944560b5b4ac11f8783132b7c62f3c41131b8cf390b443001d0fb3c99d5015fce122f982fd7232340003e SHA512 f29b5a861c4c25f1a141cde2802c24c45082defaf4c233d713e4382f080781b6ef3158ae2303b7171802f85f0fb5efd075bf456ccd1fa469b88299876d0ef2fb
@@ -162,7 +167,7 @@ DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d7705
 DIST forwarded-header-value-0.1.1.crate 5805 BLAKE2B bc51cb0eb5f922cc34c2a3f79d6887238bb83401fc1f350efeab58e49f18b7ba19fe657a0aaa3d694579d1a666392da9ccd0d0086f1bb7318eabe8a50f002e1c SHA512 65694de143ec9581e98707e309088ba3c806434465d2629e98d6293640822eac6d08f572bac414d1f53608ed69aec3d5b79ccf85daff14c1ab298e55f8e46f41
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
-DIST fsrs-0.5.5.crate 35913 BLAKE2B f71c4c908dae552b908eaa5693a90195abde0c307fbdcac795658ee7a7eda4d699cdc0b1fc2cf3323dffce35248dee1f7279e59b702b83e5e0b0e6cc4104645f SHA512 99b991b96e4f2188ef37e867ec64ae0a509cf7fa6082982c211ae14fbf9f89442bde487b58f1c1890a745040b66fd4b051492f88cf4a5b34a22dbec78b321dca
+DIST fsrs-0.6.4.crate 36422 BLAKE2B b610a03dbda0c979a227c99e8c5effe4052273d1180368e3e6b9762b0739d54033fe3276646f3909ef76d61c26b4e204c2c88e2b5ee82572b1ef978bc95e018e SHA512 a732c2ebf8db16a2ff2a3c51f08781b6b2ab912bba65cad9ddf76e9f13cfd08fbec46682a0d94435d957a0d261a270d34469965b06dae908c788702b98eda292
 DIST futf-0.1.5.crate 11344 BLAKE2B 2cc5e5f5d4ace47e9273546e46c500432da47f246cee18f24607432305dec9481ec3d02b8a9bff4724efe05ea1d235294c52ee4eeb2f5f285ce56c2987b62d24 SHA512 4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3
 DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
 DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
@@ -186,7 +191,7 @@ DIST gemm-f64-0.17.1.crate 3515 BLAKE2B f5df0a8e070542b140396d44aecc2be693b4788c
 DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
+DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658
 DIST gif-0.13.1.crate 36408 BLAKE2B f2544552c177a4e33440b05a949f6b205d3dda1afcb7e6574c92ed9d31cdb3bf536e1914186730bd8777e1c10d86466dffbee34d975884f0125a1dfcce937bda SHA512 7e76ee111c6a94763c4dfe01faf4cb0b5272d5041e2b2b8f4db666debf647e192b963c6fb3228cdde28e1d112830c2aa31eaf0551d712ea9963e41e47e26fb26
 DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
 DIST gix-features-0.36.1.crate 29362 BLAKE2B 13e2aef38ee33dcde780fd2ff68f36c3ee32612f4853f7b56144ff5ec21b50f3d6ad8748a0e0f00289a1e33f861eb23bda8b8aeee7a684848cd003123ba299fa SHA512 558d9ee8d48f3867cc8e4fde8f4a189ea7788b1859c9493a5e87e28c3c545bd4eecd14a23ccfe457858273dac1e59fce6089f554423a815740054c2656875169
@@ -201,16 +206,16 @@ DIST glow-0.13.1.crate 150940 BLAKE2B 30916c62bf166cc5aa07cf2bf7f91b80d3580f0e7d
 DIST glutin_wgl_sys-0.5.0.crate 5469 BLAKE2B 853aeadd1e7a775deb075116d08efc0b17e7032e6a41bcfbc4ea87cd3c466596f083042e3b213f1e33afa4bb106ade7a64f346311c0c1cf6d228820859887a5d SHA512 a8f44456b66a95627f7d0fe3b8a79270368b11343a9f34feeae5675af0e0fc1629b5ccb00e8cddae21ae8e71f61028567d806796595fb94e02b31dc1db03d521
 DIST gpu-alloc-0.6.0.crate 19649 BLAKE2B 47fbe3b604b4ffdd2e44d2298e969117688378ef5ed32aaf698106cc06f9973caefbad0cf7ee7a4e75a5602bae9ac0eb3b0661ceaaa82ec1c0d08184d0880ea8 SHA512 b0d19c68c3d122b89dde988d2df53798ba7f3cc9475698eddb0bd116a55509610a9e4edeea81ffd501b3e0a3d50a656161b6f3eabadc7a14e46578f9f5230314
 DIST gpu-alloc-types-0.3.0.crate 4128 BLAKE2B 3f14d804b0d02cd8b2a3532412085db3b6e78a500c9629e3908ab1ac7787d8b807cfc88c8b98bba8b9aea0635787e3d6cdc65d2f565047c6ec74a90ed74002e3 SHA512 9b9f7e81269070269c592c3ded750e0507bf56e1062708ae0f3784fdffa86786f15fd647b07a5d9a4d8c83d5bc277f4062711a5af99e88604e0a0b5d708534e4
-DIST gpu-allocator-0.23.0.crate 50234 BLAKE2B e8dbcb30a3a9771cc79671d6a48f16cdf92fb1a426880b080b3552b9c6ba7055140faf13874605733a75a34d71cd2f8f882974258df9b63223359ddd5dbe7877 SHA512 1afb4638158b007249ece8448822a512e9c7b47363653515c990ec9fd4d23d929a2a7fd6b150baf6e75d93dd40688e3c6472c4593d25d6b4e750f9595ad4113d
+DIST gpu-allocator-0.25.0.crate 44341 BLAKE2B ebc71ad9ce8178c07dd86c5b0db68177809b60d63d8c7094b23a0bbdbbd0c43b50c85a967ff6ba8802e87dfc11d8b2a526c096454dab34931d2135ce9578205a SHA512 b311f10c39cf01afa6d196b3557f3d1193c110ec3d4d8195b55c84eadd9e34a75c1b2fb72e79106d19b3399bb917b5d46dedf73ce3be049db918de4db9fe9f7d
 DIST gpu-descriptor-0.2.4.crate 6641 BLAKE2B e80259593e7768e96829e262f1cdcee69fad3e5ba635e61e83d40d1c43e3d50db4f88c7fd0ce70160e65b60f220cafea290bfe286e16267c72dede48dd7cd8e9 SHA512 f68c75425ea5c675a61f7dc0ef23a9b38772acafe6eab15d5a1f74f2c41a5aaf3433f685dad31810df2c82cbaf8ea2b0b15c272fbde38e0d9a02629861e8a83f
 DIST gpu-descriptor-types-0.1.2.crate 1928 BLAKE2B 5f36337952eccc0d564d9342932235d26cc01c5234a7ee6f01525cec10236e59b6c039e81c595e3252e5ddfce246c877aaa8af928f6965d4e07b67694df5f7fa SHA512 570308c4f788abeaa0de6df121b8111b73c7c9f81661968a9b3fb40d2ab1f593ac89711407a91693b05ae0a8189b741030b7b8154a5dbbb2e6b3aa794c5d015e
-DIST h2-0.3.24.crate 167814 BLAKE2B df25fee9f6e39f8ddcb9c1be4775d055328606b3454786a397c50564e3e8340d72d0fd58581239063e29fb80acf92444e1d588b0672817b12cc5c1322652189d SHA512 4741e2732f08c6388c112877f52d6f859088026f75bf928f90b06a521d43e8e8c10f14d088f8a17b42a0a613ee43009882077a68df9300d17365d936400f1695
-DIST half-2.4.0.crate 50666 BLAKE2B 5175650e5cb9fa08a5d45ce35b76b15454d27f214d9b9236902ffab71834b342beba0654f9c85fc796bbb499a1a979b60714a5bf7666d1faf59d61530073adbd SHA512 7357a0f84dc6ae394efdd464f5a6da2bafa48bf8d794b2c34d1507d4d66af31ece8a012b58e6f76eacea2c249488a12c20f8c7e516ddd42a70633c9dbaa13bf5
+DIST h2-0.3.26.crate 168315 BLAKE2B 81c65e519bacc8570a28b82808828044d1c94f8cf9111ae432b1684f216ce51c1b583b87a2bda3c36cf206dd508084b8f0877e93d58c8d511f87eb143bc77ca9 SHA512 3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163
+DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193
 DIST handlebars-5.1.0.crate 97779 BLAKE2B 584b6f710a4860168b0ca6e587adf19181ea7580a733ba2570380d0d7418fbf7551a77d5a52677704122e7ba7f2d63d3740d6f95a2731119669e6335389ff81a SHA512 6f80735c183bdfea58547329bfd72bc63aa21e6bdf74dc06782adfbb4e987ee31f0f86d9ceee4abab99b5ea2083c3d3369856ac51123e3bfaa0e4704e2406d64
 DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70
 DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hashlink-0.8.4.crate 26514 BLAKE2B b4f0e4c964a7a3f7bb31f5b04c34598372fa867fca4550c3e170a1eb31d58cff44314448a467d4b8d6748aa7a7bea4ed422bff76e9e0a5018f29b85a6c51f3f0 SHA512 4b21564c26673458668da18fd95246514e90cad603ada7875466bb056fe461ab31c1db77fc2ebfe207a1bcff06df2b0b29c258f7fa9e5c19cb4e4b2388d53ff7
-DIST hassle-rs-0.10.0.crate 25867 BLAKE2B a323b80b53446312ca465ac8bd86da29aba7e282d3d76b53c96517fed57b0023aeede9817e04a40aef7fc25610ee17b6352c1a2699ab0ce3cd06a8116d5365f8 SHA512 c7ef8c2ba7fd853af848348b641dfed55c9f612340a3ea6a1fb882647d0c0164d5ab8837bdfb3f98b9bbe5a90adf72fd9d2cbea1a64227f497d4a76a64d1fb3d
+DIST hassle-rs-0.11.0.crate 27178 BLAKE2B 5af929f5989f5522fc04aa27631b24dc53aac842a238d2c7e3a5f45221ab56a0725578cf3bde1b070b88a3d151ee6522e914318fcaeb0317c0da9d2cd74d082f SHA512 b4eeed4e47236cfb88087b1b6e4d2ad7c93acd90e55ef4c1b039d3798b3a7c6f81238200c15948e42be69010a7bfc24bc20f309dedd90625160a5a50f35e0930
 DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
 DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
@@ -253,6 +258,7 @@ DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a4
 DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8
 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e227bf6779880a6e197189d91583cd463b9876125cf892ffa5f8417dcc51aa010cdb8c99bb4f969990e969b1 SHA512 1e47582ed4dcf608ffd218549f1eef5ee3c87a89e28c65eeb5bba801edd6cabc0f095e213e8df606e050a57608653a59ced6f01a8bc76a5eb32ba1a337a63321
 DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
 DIST js-sys-0.3.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b
 DIST junction-1.0.0.crate 11136 BLAKE2B 70bfedc3265462b936cdc0e9cf7574c5accd6d95878272aeaddfe03d87e66eea303b5524ae2db60da41522a9a528395b4f7d1523f17081c06ceb6ee0a0a4c90b SHA512 51c9fe5894f41bc180ad716b7afbf54f0015b512e43d9244ad9292c5ab39b5c2feae3c5f961228dbd59cb11c8abc02b0b9f62451cabd7ae027cd898c9d5188a3
@@ -273,7 +279,7 @@ DIST linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca.gh.tar.gz 19408 BLAKE2B
 DIST linkify-0.7.0.crate 15498 BLAKE2B 71b3a9935f3921fa49eac2cc89c1a8de3ab9edfaa42b5da4a31cabd16439772d5ebea2b12e6fded6f865fa1efe633a929739bd899958611438a8ba003026e007 SHA512 4b0af8a29d130745d1a1b5bcc79f8f6f18dbbce636de518ba88d31b1978a30dc0fabc0a5ccb705fd9e3d3b2441898e82dfd2ddc9f014a3dbf1fac88da89e4cee
 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
-DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST lzma-sys-0.1.20.crate 760045 BLAKE2B 1f66d32008178c218575fba12df95a2cdc448e080c0a81ef4617f35dde09f0d56c86c28050db61c2ae7b464d0eaed7dd8c59a1fa605b39ff8c329e49165cd922 SHA512 393908b4e3006e4d9948a077d84ba7f5004765c4cc0f854e04847e504a246ab9a8e761fa48d4f211a7ac08dc119d950481da1ed1a480778d6b6e9b446a697279
 DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
@@ -297,11 +303,11 @@ DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975c
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST multer-2.1.0.crate 23976 BLAKE2B 3124a7858a70ebd00cae02c5863ad631eeb4243e848001a097ac81166360d6eff64533ff109722eb6fa2fd2f4e9d3dfa677fa78e2990943932a1e58408411c8c SHA512 6824de499cc180dadf6e7535aef39e2b92921b6bac135b5849129e72ec1ed2a85bd56a08a849b7c3718f35365d3fc7489f579487cd4a141cf839e6491242b4e9
 DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd
-DIST naga-0.14.2.crate 527007 BLAKE2B ce8b9a00704abdb4708abf64446b5e377af4505bde32bfda5f19aa9283d581177c7c0ebd37a37dfc08564f1dcf40bb2fa80a5dcefc73b3111f15ec8b54176ec0 SHA512 6f3b0e5312ff875d2d7c83e8c5cbeca08e2886b9f0f7dc38d406facf24f4f7d007e79981a28a95342c27c20a453d2b5499c8fa1f6034ca2e2372a7f2294e7d64
-DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55ca5662031204b999293d417e0ab2726eacff084dc6681ea5e46ce01335a1a5cfaa5e8bc6e602aacb1fd25252 SHA512 3ac650451d629852236eeb45dfee808acbea616036025676b47310100982d7e8317df647fe8649e7753dd0f57c501dcb3f7401c3d804af52ff2a2f50ace8cc69
+DIST naga-0.19.2.crate 537942 BLAKE2B 0368d7de05f3ba696b1581792ffe8a420e632e287930a53ae2df5de4735783de83e20758eb6f95c1b8d33bd5452f619fb9ce7c6c9d9a2b7d2aab06787372c182 SHA512 521926b6704a6dba2d1dfbf083641bb71e575474a4c44aa5be10285f0be4467c36e68f5b2f4542a2073b7f59ba6d901249d9957ad10d0414c0015a5e1005049b
 DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
 DIST ndarray-0.15.6.crate 275225 BLAKE2B f17e028e7d57670f136d777dc2bb720dd52bc3d9fdbc0e2de5f5c2fcd9f6310f0bc39299fadbb53e0d1588e1e64d9f2b5daf20e30dd95517bbfa597b9572581f SHA512 19037ba1de0ea5f8e0cba5d8735d6192c1674007529289a357e9c5e036a1af88b48ba8a26b4929663403159f6700bd00d04becd9b1fdd4c07990bbeddfc20ead
 DIST ndarray-rand-0.14.0.crate 10025 BLAKE2B fae3169a0b0ed67e37fa556d850effc24ec25303d8754163eabe270441d63c2122ed6bb8eb6adcd5f339838c09f667ba8f49f140667ccbf09086637bbfde558a SHA512 d14f77910dac3f70183eb5a10fe819514354f0a8eaa51c884289fe73620bcd15f7b37f638e77b995d51b94716a5a6668c13099747cbda8976d01983a909f20d6
+DIST ndk-sys-0.5.0+25.2.9519653.crate 307233 BLAKE2B 884f73ab15acf81b238d0ef06b66942949222506ff0f6deeb009348ac8870b0a8e74b4015ceceb2bf0611609ec4acd0923c2724b1240f314d0b56a42213e0b44 SHA512 380a6c0124df4bc2a835465506c1837ced58f1174ddfd89891c1784ea27508023543dfd229a5440ec1e593461e0e96b07557da72eff4b90032deb8cdf9db9be5
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST nonempty-0.7.0.crate 7157 BLAKE2B 2d68e804a93f7737c7349a82ab2a6363579de96a74538f251e7ae521f7deff5e3c62f578c9c2ff9779ff125e0be315bf9ce85fe61220a30ad375c54ea05e5568 SHA512 c005ae2955465e3c98126ab4c3abe918660f3730ddb438caba1d7d8e2b4dc2a4d5e7581c7832c49522983b6a220cb0d720451e28eb3e1227543bf46b63c74272
@@ -374,7 +380,7 @@ DIST presser-0.3.1.crate 20946 BLAKE2B 270c86e5b21e660c68fc5c4f6780371041dcb161b
 DIST prettyplease-0.2.16.crate 57630 BLAKE2B b3548f37a41d1bf46d58e84297142e8d3addf6134e39c07b7fca809cd2f72004947c31bcf7ee2aeef548bc200dfcb9c888e090d3a96f63289bc15aebe1085075 SHA512 f542640f809de6aa77d34d92d9a4454ef2a92153dba38ab41782d9a3fb73cbae2569c3163c21938b908e666303631ca9393ea1166c7ad5e5970145f26238c79e
 DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
 DIST proc-macro-hack-0.5.20+deprecated.crate 15045 BLAKE2B fb7b9fa57ad64f2920e801482bfccc762bb7b2c8c1db7da32f393c7b47414fab37234c8a408a4ca9d7072a541df22b07775fc509f76f352fb6be9fe822f84dfd SHA512 278e786f8e0c93e346de900666b3d55d366324167a2e5e553565870c4444bfe661cf8c151a29cbd3176a4905ec49d69cffb81ae1e4a129f30404f930972c4b43
-DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
+DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
 DIST profiling-1.0.15.crate 14255 BLAKE2B fb2281d4a8f09896278f4aabd91f054daee0bf30c58ff03c740daccaded75c79c2ffa838d5058f5fafc8d21d12c2b18470a5018b67fee931f4fca2f9319f0036 SHA512 3f944c6e219e2410be4b555c4421fa26cb4b6ebdde3058c8c191c12290ba1009ad28f2e021d1d86feb71d29bbd717050a6567a2ef8b40a5d431fb8ca1b03925d
 DIST prost-0.12.3.crate 29461 BLAKE2B 5a0a183ae2d5981463befbd915664a3f3b334151f2d16df898c1999fc3a6470639ba7c701c4fbd02a9283406b922fbeab2558b744988d95e159fcfcde468279a SHA512 08a910897ba623e2773964a016a16f5b40b8f95037825fd6b2160912346ef83522482745ff3a17a77a634867b9dece8d5c10a22ac1cf779e632c5c7501897f24
 DIST prost-build-0.12.3.crate 39018 BLAKE2B 293a521917ab9468a59100df96c943038586097082f3ab040bcbd59a40c8349e59a192d2fe9c549f838db9569232a0d8d5cf0fdd2c555a71be2eb1f954c7c2e9 SHA512 65f69a406d71656b099c7eef8a70412aa06ef7d479aece8eee5edc8ed69a4492ca042a4752ce20f14f96282f6c9c64bff5dd3b974e9b0e88d799c87b60072fe9
@@ -406,9 +412,9 @@ DIST rand_distr-0.4.3.crate 58255 BLAKE2B c93a4db62e1c27bde51c77423e15674c4bafd0
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST range-alloc-0.1.3.crate 7664 BLAKE2B 19c453738d48d09d0e076d3cf833a5cec2721627ada1e88eada2a4a5087b00dbd2784594e63c379c2d15977696a83bbacc6cda76e9bf37ca29a20f73ed082781 SHA512 b165ff007057143e1e68e8ccbca955364749cb45d7ca6aecc37c9099478ca3d954e959685941f0e505aa1cdccc9e25e43131c18d3eb447b2486254a32401653e
 DIST raw-cpuid-10.7.0.crate 107292 BLAKE2B 5452276b4e7d3ab164bf0fe65eb767df262404d059a140548afdbd34725af80dfb0e1fd9f0f3816cd31455a1d7b2b00476dcb60d8634aa113249b3832ae42d86 SHA512 74a80eb24c01946e96e995e63cc346cf9ebb1cebdab4026bfe30dd18926d23a95d3eacc140ba2742cf847b0df4097017ae365f76c6d7f09dbf1aa027ee72c892
-DIST raw-window-handle-0.5.2.crate 17063 BLAKE2B af6170239d2a2e9db62ed9450cee9be6350fd8f74d6344ddd76acfa873d124996dd8dff798a79e8c03fed50fdf26b2731b150bd20f8dcf905c8d68da351e0861 SHA512 51d93a4609533742178ab15d4454ffca1668e2a03c2a6e742ee2a61554564c74307311a50e3992919451f4f4d30ac112284413fb4310abbf06c0fa24d85d5971
+DIST raw-window-handle-0.6.1.crate 19274 BLAKE2B b90be0c9fccbd3ed3f1a997c074a0985902f09c854557802b2c89f1ac75b84cb61c4d657311e0137f8d7844cbc48473e555f31786cb35a3ddea1a0923b58a5df SHA512 1444f5468ea148fe1062b6992312b47c821145df918d15af32cc5d77f0570f1d51efbfbfdf68a1293eeb35d2f5345eb99341f66938b4b898e29ae9a91fdda82c
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
-DIST rayon-1.9.0.crate 177770 BLAKE2B 34e20aeb82a548bd80b8ab3faf8fd870201ba3d67f9618e5493332a3c43bcf1443c027b8ccc76cec8df6bff852434531a01c8490f829f57df5cfbc3d8a6e8a42 SHA512 c9763503fb135eefdebebb82d4d19d20e48a182f1125030a7df085ebda4184942d9057598194ab8e8d39b942c83c231834b10a677e89badb6305a2b571fc1abc
+DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST rc2-0.8.1.crate 7009 BLAKE2B c1f33c4959a541dd8e1bda791df995cfe0424d27f7d3f13d446118ca5121a3e434b7133be15f057a1573b1744b20dc84aacea891c3a2ae4fe3c777b5fa9e4747 SHA512 d2245a18df4e3e7cd979734f9be62a894e291e228fa894a2ad6e2463eaf0374718f20e65012b3de43cca0ba1c1d61d0acb9a0db46ac42b4dc99313f040a930d8
 DIST rcgen-0.10.0.crate 40402 BLAKE2B 628ed423f1cb9679cae1ffa49797073b5b35ec7fd974e32cccb74d8d7735ae579a525e9a9d7637bef8194800a5e42cf6dd67d6bf29f41c63fc3c47f4479f20db SHA512 c51d03ad1e5576490c48c00e5bfe933f897d3bbf443c2a2c6091a20503ba147cf93cabb266dd99dc054ff46deb71eee5457f146fe925b84784df18c4fc0fb3ff
@@ -432,10 +438,11 @@ DIST rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88.gh.tar.gz 394844 BLAKE2B
 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
-DIST rustls-0.21.10.crate 284920 BLAKE2B eb4628b6e0384fa7cbb5468c75c11512eb111a8a7dc7c655c6ac6beac72fc3025b1a590324ec3275ba66b632dab14dd78da4d62c1c66b2c2502099ad153900f5 SHA512 3bfcd137e6d4d86c716e8afe75450a39ca055d44557fd1a8d4b6ad4d7c58e2d5fb86ba92c3825a667c9daf5bd7a89a779ffcf8c23d6cd0af05ad47ad437da139
-DIST rustls-0.22.2.crate 332080 BLAKE2B e384541cb737c17af63b494b13533256ac15692124e64db7c3939e61c1097b5ee9ca96ab3e2336500d2554c9fcd8244e76a4f72d05e0791e16432f37ff8cdf39 SHA512 c25f71a3291420ccc33ad21f2495296d092f7d01365f1ce27c71343d9fb5f50c45024d84fdd25791d7ac9aa0dd53d6b7e25f31f35f9a7e823fac8117560ea6c1
+DIST rustls-0.21.11.crate 284815 BLAKE2B 1d14027e1bffe6f0f1190330eeb19dbd4eb2df1c52e7b78dc2e35102d008a55724a3948d04b2598b2b698e1d934c90be337799831dcb63b04d7daee89b0f484b SHA512 e16d817d94b28e7d7d5b466497d8d52b5a850ce289b3d899bed81bc69246ef3fde7ed5a8e7a64babf5566c8b3666124dae67bbcf14f2f2f3ad84a021b938dcb1
+DIST rustls-0.22.4.crate 333681 BLAKE2B 01f84b7f44883c807d8651b6058647180d6e9d48deb51fab0e76d7b587ad11face13215170db3bb7d0216505eb108438dcc3bc08ed2080816401f3955f73fbab SHA512 0b62c741b73dd49dd9d5531c9ae749fc8eedd4a396c5b4c02b1b33062d56c84e327e12f5a984b9ca22c7984103896d4ac69899032397dd6eac1b737e0647e2da
 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.3.1.crate 21637 BLAKE2B 7734df5facdf21120d0dba9d6e2c0e30ac36d4368048e89639d53e68d6cb72a03cab08dc64e443f6d5b43c3f25020016bb2010ec8d20c329fb60d6cd93c9134b SHA512 741cf0def113336865320aecde54a56cd5bbc7f3aad6e71dd209b4e38b642f42d0244b6fabf03a55467aa42fc3d1582bfa1fd5fda6402ae2ca11191f21158939
 DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
 DIST rustls-webpki-0.102.2.crate 196881 BLAKE2B 783877064d2cfbc9078d33f081b2b1edfe43218184e60a8a3b3917ba0a3ab97a226f677d4bf4addef5d19d29ac63a8268dab5bd3cf973d64df866e3e71492f9d SHA512 697d44daa5e0a8ea2d12aa6f68026eb63a6e1c4420ee92656c9479df77e3f672ca2525442be55ab6183111fe594ac85661647150326223129ec23686792f6014
@@ -460,7 +467,7 @@ DIST seq-macro-0.3.5.crate 13332 BLAKE2B 2e93de606214852f2d5818398565770d01425fa
 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
 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_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
+DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
 DIST serde_path_to_error-0.1.15.crate 16623 BLAKE2B 99700d1e70d9c80bea941fad34f9c6168891139c0446223eec46e6fd4185aa3fcf37a084a533b54b0f96ac4c9f9d1a141fee2b42f0a433dfd66b0259a27f4852 SHA512 b6c84dd3b5e9fa3d50f6af4a95facf67d2c5ec0590ad6b0e5e3914ae509c787a17e7a099295ae98695bba6e22184d4f515bf240db9513a42c8c73df96f884ef1
 DIST serde_qs-0.8.5.crate 44854 BLAKE2B 85beaf2fb1c5918cc4cebd536b351e34e0fdee08659ce1db4c7776a8793c3765f0f9c525f33db239b7a52d9e6f997e2b2fb14b1531a5205dba4bac4fab79ded9 SHA512 c9c94a791c5dbd6c87a6c4f487c98f1be44f7206ae0de1ff836fa43b2c867d45b5019f4b91d3d9dfc764b3043ed4f6df63e8de208b6a9288a2e283588b970274
 DIST serde_repr-0.1.18.crate 9974 BLAKE2B f6a8b2c8bc759bc8cfb3826489faf67da13b1cbe2432c30ec877036924869b9cf7c1ead2809b8e5852e352b51c91f40fa892ca68832ea567e4a7df29f8590a98 SHA512 09d77ccc60a748f8c95998632459f52268cf45949c0e22250f751eeaceb7336c03a457587af7bdc6fbc188cea4e15e77c8bf63d9741a9ae31fd0b8e787cabcde
@@ -487,7 +494,7 @@ DIST snowflake-1.3.0.crate 8073 BLAKE2B 60471bacacc4c22264c3177fbe1963dc6e785053
 DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
-DIST spirv-0.2.0+1.5.4.crate 30491 BLAKE2B adc19c32ceafee6eddde0e92fff3b995fa062877f653efe60bcf4a73b86da4e00f77c5922ee36b239e10e4d942a12724130b726eeacca6a60ddbe2c0a87d204b SHA512 a0725df0ae9ce0ebd0b3037a740ce82c565c21a0ee343408291b30a2aebd3ced236d1df511a73abf5480ab3d23e83a88b237ee172adf5832ea7014355a3733f3
+DIST spirv-0.3.0+sdk-1.3.268.0.crate 30802 BLAKE2B 8608a8613b02bb5c9e5258bb604db55c81d289664383606686c70f314e5bd31d5b4b0cd1e0b77c8431c363e023861c18a08f642b690a9ce01ce485d069bb6a25 SHA512 82187b94f32ee784eca112408e61e3c3ca8c825207b4c817b2b87900b252c514d137e6ea5e9384a2e241d5352ebad0e153a72d5b3db2b0dc938aaa472d3c261d
 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 string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
@@ -513,14 +520,14 @@ DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c245
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST text_placeholder-0.5.0.crate 7102 BLAKE2B 420900107e31f92f20c3e3260167a27c99ae17dc564dbb2233ea19a40be265bd2ff9e8311c4d449d9f5585ef4a6cc59cdf7c4deffb46d430dd2c62bafb8930ab SHA512 a42a3e5c0827a0c59b5ceccf113edd30d3f6a02bb916c35ffcd27860aa2f14eb14b19fcf8f5a3dcf14d93b8a352b2bffa5f8aae0e01308ab2890846c7548bc81
-DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f2bd2966503501ff89ca6b49afd61e6d9e1ebf18c08d374ff9de4e958dfcb3da8740fdfe31cceace5be456bfe4b SHA512 0ff7e48c3696f4f4c6af29f3142f0a7bb88a07b7a9877ec243e3ea15d89c48f1898b731311da5d4a7c88060628cae3eeea6a4eccf25bd851cb3075920cb1a936
-DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
+DIST thiserror-1.0.59.crate 21040 BLAKE2B d9ae0b1d810e7631edf072a41267a871c1cd88d71c882c8fb47d65b3dc563ca2addef0ebf9a9cb122fbfdccff5b92815b8f2e0f7c3382963828cb69d21ec8531 SHA512 254b0ad6c4b135234f89db8bd5674fb8c6b633495810140abf93cf06c58e911ad2ebcfdc002e7ce29739e95ea066eeed3fbd7c831e2858822dff620598dd147a
+DIST thiserror-impl-1.0.59.crate 15726 BLAKE2B 0e524c851f999f4592e5450d7d8ad45a922c9cc5d2229f4dd106144238c8a0ceaeff5a4d1c7e27cdc53a7eb44e60f890fabe1f43ba3d5b950da9c63e6ddcc9d1 SHA512 75543ad39d1243dab23a4b50075bec337c39045f0271337a1ccc144f25dc1e7fc23b0163f16958ded9a1f44ff359378bd22f4c0f5e095c1823e928fc929457e8
 DIST thread-tree-0.3.3.crate 12263 BLAKE2B 893f1a26377d6d14fdc7dd8bf44715a23d8bd10e6ec366753a7e955025c9b5ea8167a71f9f42fb684b192abbd507ec98e5eff581c1da4f7be7a647739bc70cf2 SHA512 80e6bdd55520a8372f944834546b250f33747f35617bde94a38d1ec2320c93fa9b145cbc3c091e3f44c8aaf336ecfd09676adf3de1bdff09eb38798b867ae922
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
 DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+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 tinystr-0.7.5.crate 16366 BLAKE2B 00a5eda21da581ab351dbdd2591960c027d0d1e35f00b2b1049cf78ce115b4e7f9583ebec74d0a95c79112d2b4fa60ab8440ec83646542d8c73236790c07ae8c SHA512 f6f5ee490049a3572d13305f1431d4882f201c81bacb0e0a333e949a0a955c98d3a0d347b1f31d1fc8eaeefb4690a3fe6fb18e82163b92d10b757a56bb5610c3
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
@@ -580,7 +587,7 @@ DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb7
 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST utime-0.3.1.crate 8311 BLAKE2B 8068a7257a42b35046c7b6d88ffd6c93db1e8aefe8503baa4879d4e0ed247e9a678b1466c1a678f35283d17db585ba4db41b17ee7ede71a736df1b446a57d12a SHA512 106a430f215b4c7fb2e05c159a0deaa3d3fb5b832fcde759e362c62567c069fb8bec989e88befa09d5bcc46467791de1ab45e928afc82fdf04d622cd189b0a42
-DIST uuid-1.7.0.crate 42627 BLAKE2B 493f6a3a643d3493a2bd7e0e92a1ccfb7bd722e3a1fc8deb7df0ddc875a822daead1cdd35dc3ac6f26346844100a671318d71e5ad760c9587471d4f05bbb0c69 SHA512 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856
+DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
@@ -598,15 +605,15 @@ DIST wasm-bindgen-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805b
 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 wasm-streams-0.4.0.crate 34328 BLAKE2B a29fc66c00b9fab42ba1691ddbc251bebba429837875989874073427cfcd2ed1874597d7f7a9f1097e0bab74a3cef04ba6d312ee9138a5cd973d71837a545d6c SHA512 9a729b183999bd5cd6a31e69014381371d7c750bd0ff5c3ef0b08682fa4563ad8de1a2db0901bfc53f6721269c937cfdc4742b34388829513dfee1337d30d60d
-DIST web-sys-0.3.64.crate 725584 BLAKE2B f650eecc22ca53b75fff06c4117439d8fe9efa486701cb16a0daf76865cd017a9e25ed8c7ae1fc65fa2dd94a12c14bc2e6f9e837b70b47b4ca468bef65a29f82 SHA512 b02b0bc3f1354842b364d2f062ea4f5025edb6e615046750b56a6e2fcacef7e0b46a190eb45e14e590cf297e3ec1a813a81612ac5acfc12d744fe16c5ce041a4
+DIST web-sys-0.3.68.crate 728353 BLAKE2B d0e8d47bb44e83f376b3d3556caf2d243eeeb5f2798fed767ce3cf0eb0c67fa13b74cdd9a9999f48de06fd2f2d720f68b602ba24c20b50fa6e78966e5cc19893 SHA512 f4b537310e9900410bf4a00b382c2bff29317efd2ccfe12b9680dd3ed49a896eb8e8e10d9964d463f1627cc9df1e27dfef1c86693e90b94ce3c488915762d88e
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST webpki-roots-0.25.4.crate 253559 BLAKE2B 737f608323fec02b77c47a40f8b2f9bf44f1b29d32b936fd7bd8c1066efd8916451b96ffab8949f5b5ba537bb1ed6300143bf51d1ef8663ce5a9a7a33947e81d SHA512 4891aa5c6a5bb8a4d6bd730fca5ab5bbddb5a39b9267c81951ca8d3ff0dbcd305b498328f99b2da79ac65cdc9dfa42c40631a4f8d6975ac6f4ed9c85a8d2178e
 DIST webpki-roots-0.26.1.crate 249748 BLAKE2B 6a2468eb2f868c65c599d2f6664798f75e77cb7a7228a2c7285ee5256cb01d110709474feb389991f12ba0d143211770c6922932c7fab01b4b0e37b612cbd453 SHA512 89ac53267d850953aa78550a60f58f5bcb0f9e885c4c448911dc55bbb8dbc3fb845cd7545fc40ff26998b0c360756de85206adcb148ca6190e50bc2daea7f61f
 DIST weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
-DIST wgpu-0.18.0.crate 99673 BLAKE2B 19568a0860390104d7d62fb279051134f4f467310a6f3700ca6a524dcd1871abb5499716f51083fdfa2356ff57faec125b17ed72fe7e479984446734699720ce SHA512 de51fb90fd012cd11c28142f82ff9023eb9b61ceddbc044f648aff6c65d02351faf9843e6d81947fe8ed9292183d111a07ea6634ee18bbd7a23610ad2899873d
-DIST wgpu-core-0.18.1.crate 225351 BLAKE2B 5099bae6c88ec08389ba92072e155776560922e8fbd709a1cf198886a64e7e783747ac740a9994ed739a70d77f0ca60d87f5df2a0bf791ad65ac503f9f584b3d SHA512 7e0ded80117e68f269ba98493ed4f5fed908791700c62a37ce26556257b378b6eee968b9eece52ab3ccccc24b40364840269d07a0fa066655661f32ec4fad291
-DIST wgpu-hal-0.18.1.crate 268148 BLAKE2B e710f602b4d5011bb921b07bd27c39def6acaa0168180f9a64e61bf32c8ceefa112965fa13c3a1f4b3c6eb3d8468f8713ba200522901ca298e9908b870f26727 SHA512 e84f3f2f47d2ed9d257ece555f16ede622fdf2e7b2ecbc74e77af686a6b5a51f53a2e45d4df5a579feca061e50cce88a2b0698d1ffe304d5da159f46370445bb
-DIST wgpu-types-0.18.0.crate 55501 BLAKE2B a7a2cded68c54c645ee68107db3529a4a23148c50ac3ef99b9d8b8172a89497710851f731216cc46963f9e668bb5505ba64247a681ada6c4bdfbf59fe26988d2 SHA512 0d886b0d1f7c1b618297e03db92dffb775ae5aac6768af348297e78cb1798df93d41ce3b005b5ec7c77d22156b5920bcf17fc341549acddd5c203091f332e20a
+DIST wgpu-0.19.4.crate 140361 BLAKE2B e1cab07eec353b487f7cec5ef7924dfd8b892a58332ef492ad0ed2baff77766dfcdd4aab4b16c1e28b5704702b12e5f8c0cec6a33836283b628cec4bda2b332b SHA512 6a4e92be70b639ad7870db2a1425f145448e480315ae1d2f5de061c4a2b4be3dd83a2971138dc6de107356947a8bc40ec869b7b0f03a99873065f07217cd8b62
+DIST wgpu-core-0.19.4.crate 235954 BLAKE2B f8a8ef81071ca15091f4b6b7b73ac86353994d4bdb39f2329816bb095e4d4300602eb4954d4c0f4e78385a8371b3c5df7a970de4daede58ceaa6735a6ae013e3 SHA512 2260c1482553805c518cc4c589496763003243e357c4b1c40703e4db3b6060f0b275fc011ac09e03e7dbf5735c973535b15c50d3135113fd1aba783d4a6aaa9d
+DIST wgpu-hal-0.19.4.crate 290171 BLAKE2B a4508762024279cbac741ea77888464ef44b024131a3191c0d68349f74128bd751024d246821139a242e807ebac624a5ed56774f3896384080cf7087cf85deee SHA512 7101f95e12e9c57af90c52e82093c60a218e86fc4517ee262091bff81d800249b30322e076f29583b4d1dc445b7c1b8f2e9e662d7d50c27d53a7b25dc23b4e13
+DIST wgpu-types-0.19.2.crate 59463 BLAKE2B 25d333b889e4fa21a79d0ae2a4b613cc317afa1eb57cfc73e08191facc29a2536a00a0cbb67470da9f98b1dcb11e96e3d63d0b434a6ddaec479db2beea2faa2f SHA512 5476fb614a92cd74197831ee7f7aa16e7cd1ed8258d699458c7a77d2ea2d6224c58076f994e01554cee8010b826a8d0dc15fa2c03a25797f87f4d92060c69ce6
 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
 DIST which-5.0.0.crate 16635 BLAKE2B 5319f2effea2b86ed865be31efbb66035670cb80245f212268a9d3b4798b97fb658ef02b4db3ba85aaf82007e0498e98f35f67128bd9a6796accbbb37161fadd SHA512 cf2b6ec2f156f4d6af0bdb8b468965784000158bc7ab8f76fa1b1d7a1a2c732a7392c8ea09d3cc79259411e3ed7ed2d448a6aa94fe7c2fae077186086b0f826a
 DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b
diff --git a/app-misc/anki/anki-24.04.1.ebuild b/app-misc/anki/anki-24.04.1.ebuild
deleted file mode 100644
index 54dfbf94f31b..000000000000
--- a/app-misc/anki/anki-24.04.1.ebuild
+++ /dev/null
@@ -1,946 +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} )
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aes@0.8.4
-	ahash@0.8.10
-	aho-corasick@1.1.2
-	allocator-api2@0.2.16
-	ammonia@3.3.0
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anes@0.1.6
-	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.80
-	apple-bundles@0.17.0
-	arrayref@0.3.7
-	arrayvec@0.7.4
-	ash@0.37.3+1.3.251
-	assert-json-diff@2.0.2
-	async-channel@1.9.0
-	async-compression@0.4.6
-	async-stream-impl@0.3.5
-	async-stream@0.3.5
-	async-trait@0.1.77
-	autocfg@1.1.0
-	axum-client-ip@0.4.2
-	axum-core@0.3.4
-	axum-macros@0.3.8
-	axum@0.6.20
-	backtrace@0.3.69
-	base64@0.13.1
-	base64@0.21.7
-	base64ct@1.6.0
-	bincode@2.0.0-rc.3
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bit_field@0.10.2
-	bitflags@1.3.2
-	bitflags@2.4.2
-	blake3@1.5.0
-	block-buffer@0.10.4
-	block-padding@0.3.3
-	block@0.1.6
-	bstr@1.9.1
-	bumpalo@3.15.3
-	burn-autodiff@0.12.1
-	burn-candle@0.12.1
-	burn-common@0.12.1
-	burn-compute@0.12.1
-	burn-core@0.12.1
-	burn-dataset@0.12.1
-	burn-derive@0.12.1
-	burn-fusion@0.12.1
-	burn-ndarray@0.12.1
-	burn-tch@0.12.1
-	burn-tensor@0.12.1
-	burn-train@0.12.1
-	burn-wgpu@0.12.1
-	burn@0.12.1
-	bytemuck@1.14.3
-	bytemuck_derive@1.5.0
-	byteorder@1.5.0
-	bytes@1.5.0
-	bzip2-sys@0.1.11+1.0.8
-	bzip2@0.4.4
-	camino@1.1.6
-	candle-core@0.3.3
-	cast@0.3.0
-	cbc@0.1.2
-	cc@1.0.88
-	cfg-if@1.0.0
-	chrono@0.4.34
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	cipher@0.4.4
-	clap@4.5.1
-	clap_builder@4.5.1
-	clap_complete@4.5.1
-	clap_derive@4.5.0
-	clap_lex@0.7.0
-	coarsetime@0.1.34
-	codespan-reporting@0.11.1
-	codespan@0.11.1
-	color_quant@1.1.0
-	colorchoice@1.0.0
-	com-rs@0.2.1
-	concurrent-queue@2.4.0
-	constant_time_eq@0.1.5
-	constant_time_eq@0.3.0
-	convert_case@0.6.0
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	core-graphics-types@0.1.3
-	cpufeatures@0.2.12
-	crc32fast@1.4.0
-	criterion-plot@0.5.0
-	criterion@0.5.1
-	crossbeam-channel@0.5.11
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.19
-	crunchy@0.2.2
-	crypto-common@0.1.6
-	csv-core@0.1.11
-	csv@1.3.0
-	d3d12@0.7.0
-	dashmap@5.5.3
-	data-encoding@2.5.0
-	deadpool-runtime@0.1.3
-	deadpool@0.9.5
-	deranged@0.3.11
-	derive-new@0.6.0
-	des@0.8.1
-	difflib@0.4.0
-	digest@0.10.7
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	displaydoc@0.2.4
-	duct@0.13.7
-	dunce@1.0.4
-	dyn-stack@0.10.0
-	either@1.10.0
-	elasticlunr-rs@3.0.2
-	encoding_rs@0.8.33
-	enum-as-inner@0.6.0
-	env_filter@0.1.0
-	env_logger@0.11.2
-	envy@0.4.2
-	equivalent@1.0.1
-	errno@0.3.8
-	event-listener@2.5.3
-	exr@1.72.0
-	fallible-iterator@0.3.0
-	fallible-streaming-iterator@0.1.9
-	faster-hex@0.9.0
-	fastrand@1.9.0
-	fastrand@2.0.1
-	fdeflate@0.3.4
-	filetime@0.2.23
-	find-winsdk@0.2.0
-	fixedbitset@0.4.2
-	flate2@1.0.28
-	fluent-bundle@0.15.2
-	fluent-langneg@0.13.0
-	fluent-syntax@0.11.0
-	fluent@0.16.0
-	flume@0.11.0
-	fnv@1.0.7
-	foreign-types-macros@0.2.3
-	foreign-types-shared@0.1.1
-	foreign-types-shared@0.3.1
-	foreign-types@0.3.2
-	foreign-types@0.5.0
-	form_urlencoded@1.2.1
-	forwarded-header-value@0.1.1
-	fs2@0.4.3
-	fsevent-sys@4.1.0
-	fsrs@0.5.5
-	futf@0.1.5
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-intrusive@0.5.0
-	futures-io@0.3.30
-	futures-lite@1.13.0
-	futures-macro@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-timer@3.0.3
-	futures-util@0.3.30
-	futures@0.3.30
-	gemm-c32@0.17.1
-	gemm-c64@0.17.1
-	gemm-common@0.17.1
-	gemm-f16@0.17.1
-	gemm-f32@0.17.1
-	gemm-f64@0.17.1
-	gemm@0.17.1
-	generic-array@0.14.7
-	getopts@0.2.21
-	getrandom@0.1.16
-	getrandom@0.2.12
-	gif@0.13.1
-	gimli@0.28.1
-	gix-features@0.36.1
-	gix-fs@0.8.1
-	gix-hash@0.13.3
-	gix-tempfile@11.0.1
-	gix-trace@0.1.7
-	gl_generator@0.14.0
-	glob@0.3.1
-	globset@0.4.14
-	glow@0.13.1
-	glutin_wgl_sys@0.5.0
-	gpu-alloc-types@0.3.0
-	gpu-alloc@0.6.0
-	gpu-allocator@0.23.0
-	gpu-descriptor-types@0.1.2
-	gpu-descriptor@0.2.4
-	h2@0.3.24
-	half@2.4.0
-	handlebars@5.1.0
-	hashbrown@0.13.2
-	hashbrown@0.14.3
-	hashlink@0.8.4
-	hassle-rs@0.10.0
-	headers-core@0.2.0
-	headers@0.3.9
-	heck@0.4.1
-	hermit-abi@0.3.8
-	hex@0.4.3
-	hexf-parse@0.2.1
-	hmac@0.12.1
-	home@0.5.9
-	html5ever@0.26.0
-	htmlescape@0.3.1
-	http-body@0.4.6
-	http-range-header@0.3.1
-	http-types@2.12.0
-	http@0.2.11
-	httparse@1.8.0
-	httpdate@1.0.3
-	humantime@2.1.0
-	hyper-rustls@0.24.2
-	hyper-tls@0.5.0
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	id_tree@1.8.0
-	idna@0.5.0
-	ignore@0.4.22
-	image@0.24.9
-	indexmap@2.2.3
-	indoc@2.0.4
-	infer@0.2.3
-	inflections@1.1.1
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	inout@0.1.3
-	instant@0.1.12
-	intl-memoizer@0.5.1
-	intl_pluralrules@7.0.2
-	ipnet@2.9.0
-	is-terminal@0.4.12
-	itertools@0.10.5
-	itertools@0.11.0
-	itertools@0.12.1
-	itoa@1.0.10
-	jpeg-decoder@0.3.1
-	js-sys@0.3.68
-	junction@1.0.0
-	khronos-egl@6.0.0
-	khronos_api@3.1.0
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	lazy_static@1.4.0
-	lebe@0.5.2
-	libc@0.2.153
-	libloading@0.7.4
-	libloading@0.8.1
-	libm@0.2.8
-	libredox@0.0.1
-	libsqlite3-sys@0.27.0
-	line-wrap@0.1.1
-	linkify@0.7.0
-	linux-raw-sys@0.4.13
-	lock_api@0.4.11
-	log@0.4.20
-	lzma-sys@0.1.20
-	mac@0.1.1
-	malloc_buf@0.0.6
-	maplit@1.0.2
-	markup5ever@0.11.0
-	markup5ever_rcdom@0.2.0
-	matchers@0.1.0
-	matches@0.1.10
-	matchit@0.7.3
-	matrixmultiply@0.3.8
-	md5@0.7.0
-	mdbook@0.4.37
-	memchr@2.7.1
-	memmap2@0.9.4
-	memoffset@0.9.0
-	metal@0.27.0
-	mime@0.3.17
-	mime_guess@2.0.4
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	multer@2.1.0
-	multimap@0.8.3
-	naga@0.14.2
-	nanorand@0.7.0
-	native-tls@0.2.11
-	ndarray-rand@0.14.0
-	ndarray@0.15.6
-	new_debug_unreachable@1.0.4
-	nom@7.1.3
-	nonempty@0.7.0
-	normpath@1.2.0
-	notify-debouncer-mini@0.4.1
-	notify@6.1.1
-	nu-ansi-term@0.46.0
-	num-complex@0.4.5
-	num-conv@0.1.0
-	num-format@0.4.4
-	num-integer@0.1.46
-	num-traits@0.2.18
-	num_cpus@1.16.0
-	num_enum@0.7.2
-	num_enum_derive@0.7.2
-	objc@0.2.7
-	objc_exception@0.1.2
-	object@0.32.2
-	once_cell@1.19.0
-	oorandom@11.1.3
-	opener@0.6.1
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.101
-	openssl@0.10.64
-	option-ext@0.2.0
-	os_pipe@1.1.5
-	overload@0.1.1
-	p12@0.6.3
-	parking@2.2.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	password-hash@0.4.2
-	password-hash@0.5.0
-	paste@1.0.14
-	pathdiff@0.2.1
-	pbkdf2@0.11.0
-	pbkdf2@0.12.2
-	pem@1.1.1
-	percent-encoding@2.3.1
-	pest@2.7.7
-	pest_derive@2.7.7
-	pest_generator@2.7.7
-	pest_meta@2.7.7
-	petgraph@0.6.4
-	phf@0.10.1
-	phf@0.11.2
-	phf_codegen@0.10.0
-	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-internal@1.1.4
-	pin-project-lite@0.2.13
-	pin-project@1.1.4
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	plist@1.6.0
-	plotters-backend@0.3.5
-	plotters-svg@0.3.5
-	plotters@0.3.5
-	png@0.17.13
-	pollster@0.3.0
-	portable-atomic@1.6.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	presser@0.3.1
-	prettyplease@0.2.16
-	proc-macro-crate@3.1.0
-	proc-macro-hack@0.5.20+deprecated
-	proc-macro2@1.0.78
-	profiling@1.0.15
-	prost-build@0.12.3
-	prost-derive@0.12.3
-	prost-reflect@0.12.0
-	prost-types@0.12.3
-	prost@0.12.3
-	pulldown-cmark-escape@0.10.0
-	pulldown-cmark@0.10.0
-	pulldown-cmark@0.8.0
-	pulldown-cmark@0.9.6
-	pulp@0.18.8
-	pyo3-build-config@0.20.3
-	pyo3-ffi@0.20.3
-	pyo3-macros-backend@0.20.3
-	pyo3-macros@0.20.3
-	pyo3@0.20.3
-	qoi@0.4.1
-	quick-xml@0.31.0
-	quote@1.0.35
-	r2d2@0.8.10
-	r2d2_sqlite@0.23.0
-	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_distr@0.4.3
-	rand_hc@0.2.0
-	range-alloc@0.1.3
-	raw-cpuid@10.7.0
-	raw-window-handle@0.5.2
-	rawpointer@0.2.1
-	rayon-core@1.12.1
-	rayon@1.9.0
-	rc2@0.8.1
-	rcgen@0.10.0
-	reborrow@0.5.5
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	regex-automata@0.1.10
-	regex-automata@0.4.5
-	regex-syntax@0.6.29
-	regex-syntax@0.8.2
-	regex@1.10.3
-	renderdoc-sys@1.0.0
-	reqwest@0.11.24
-	retain_mut@0.1.9
-	ring@0.16.20
-	ring@0.17.8
-	rmp-serde@1.1.2
-	rmp@0.8.12
-	rusqlite@0.30.0
-	rustc-demangle@0.1.23
-	rustc-hash@1.1.0
-	rustix@0.38.31
-	rustls-native-certs@0.6.3
-	rustls-pemfile@1.0.4
-	rustls-pki-types@1.3.1
-	rustls-webpki@0.101.7
-	rustls-webpki@0.102.2
-	rustls@0.21.10
-	rustls@0.22.2
-	rustversion@1.0.14
-	ryu@1.0.17
-	safemem@0.3.3
-	safetensors@0.3.3
-	safetensors@0.4.2
-	same-file@1.0.6
-	sanitize-filename@0.5.0
-	schannel@0.1.23
-	scheduled-thread-pool@0.2.7
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	sct@0.7.1
-	security-framework-sys@2.9.1
-	security-framework@2.9.2
-	self_cell@0.10.3
-	self_cell@1.0.3
-	semver@1.0.22
-	seq-macro@0.3.5
-	serde-aux@4.5.0
-	serde@1.0.197
-	serde_derive@1.0.197
-	serde_json@1.0.114
-	serde_path_to_error@0.1.15
-	serde_qs@0.8.5
-	serde_repr@0.1.18
-	serde_rusqlite@0.34.0
-	serde_tuple@0.5.0
-	serde_tuple_macros@0.5.0
-	serde_urlencoded@0.7.1
-	sha1@0.10.6
-	sha2@0.10.8
-	sharded-slab@0.1.7
-	shared_child@1.0.0
-	shlex@1.3.0
-	signal-hook-registry@1.4.1
-	signal-hook@0.3.17
-	simd-adler32@0.3.7
-	simple-file-manifest@0.11.0
-	siphasher@0.3.11
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.1
-	snafu-derive@0.8.1
-	snafu@0.8.1
-	snowflake@1.3.0
-	socket2@0.5.6
-	spin@0.5.2
-	spin@0.9.8
-	spirv@0.2.0+1.5.4
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	string_cache@0.8.7
-	string_cache_codegen@0.5.2
-	strsim@0.11.0
-	strum@0.25.0
-	strum@0.26.1
-	strum_macros@0.25.3
-	strum_macros@0.26.1
-	subtle@2.5.0
-	syn@1.0.109
-	syn@2.0.51
-	sync_wrapper@0.1.2
-	synstructure@0.13.1
-	sysctl@0.5.5
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tar@0.4.40
-	target-lexicon@0.12.14
-	tch@0.15.0
-	tempfile@3.10.1
-	tendril@0.4.3
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	text_placeholder@0.5.0
-	thiserror-impl@1.0.57
-	thiserror@1.0.57
-	thread-tree@0.3.3
-	thread_local@1.1.8
-	tiff@0.9.1
-	time-core@0.1.2
-	time-macros@0.2.17
-	time@0.3.34
-	tinystr@0.7.5
-	tinytemplate@1.2.1
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-rustls@0.24.1
-	tokio-socks@0.5.1
-	tokio-stream@0.1.14
-	tokio-tungstenite@0.20.1
-	tokio-util@0.7.10
-	tokio@1.36.0
-	toml@0.5.11
-	toml_datetime@0.6.5
-	toml_edit@0.21.1
-	topological-sort@0.2.2
-	torch-sys@0.15.0
-	tower-http@0.4.4
-	tower-layer@0.3.2
-	tower-service@0.3.2
-	tower@0.4.13
-	tracing-appender@0.2.3
-	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
-	tugger-common@0.10.0
-	tugger-windows-codesign@0.10.0
-	tugger-windows@0.10.0
-	tungstenite@0.20.1
-	type-map@0.4.0
-	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-langid-impl@0.9.4
-	unic-langid-macros-impl@0.9.4
-	unic-langid-macros@0.9.4
-	unic-langid@0.9.4
-	unic-ucd-category@0.9.0
-	unic-ucd-version@0.9.0
-	unicase@2.6.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.11
-	unicode-xid@0.2.4
-	unindent@0.2.3
-	untrusted@0.7.1
-	untrusted@0.9.0
-	ureq@2.9.6
-	url@2.5.0
-	utf-8@0.7.6
-	utf8parse@0.2.1
-	utime@0.3.1
-	uuid@1.7.0
-	valuable@0.1.0
-	vcpkg@0.2.15
-	version_check@0.9.4
-	waker-fn@1.1.1
-	walkdir@2.4.0
-	want@0.3.1
-	warp@0.3.6
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasi@0.9.0+wasi-snapshot-preview1
-	wasix@0.12.21
-	wasm-bindgen-backend@0.2.91
-	wasm-bindgen-futures@0.4.41
-	wasm-bindgen-macro-support@0.2.91
-	wasm-bindgen-macro@0.2.91
-	wasm-bindgen-shared@0.2.91
-	wasm-bindgen@0.2.91
-	wasm-streams@0.4.0
-	web-sys@0.3.64
-	web-time@1.1.0
-	webpki-roots@0.25.4
-	webpki-roots@0.26.1
-	weezl@0.1.8
-	wgpu-core@0.18.1
-	wgpu-hal@0.18.1
-	wgpu-types@0.18.0
-	wgpu@0.18.0
-	which@4.4.2
-	which@5.0.0
-	widestring@1.0.2
-	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.51.1
-	windows-core@0.52.0
-	windows-core@0.54.0
-	windows-result@0.1.0
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.3
-	windows@0.51.1
-	windows@0.54.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.3
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.3
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.3
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.3
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.3
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.3
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.3
-	winnow@0.5.40
-	winreg@0.5.1
-	winreg@0.50.0
-	wiremock@0.5.22
-	xattr@1.3.1
-	xml-rs@0.8.19
-	xml5ever@0.17.0
-	xz2@0.1.7
-	yasna@0.5.2
-	yoke-derive@0.7.3
-	yoke@0.7.3
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-	zerofrom-derive@0.1.3
-	zerofrom@0.1.3
-	zeroize@1.7.0
-	zip@0.6.6
-	zstd-safe@5.0.2+zstd.1.5.2
-	zstd-safe@7.0.0
-	zstd-sys@2.0.9+zstd.1.5.5
-	zstd@0.11.2+zstd.1.5.2
-	zstd@0.13.0
-	zune-inflate@0.2.54
-"
-declare -A GIT_CRATES=(
-	[linkcheck]='https://github.com/ankitects/linkcheck;184b2ca50ed39ca43da13f0b830a463861adb9ca;linkcheck-%commit%'
-	[percent-encoding-iri]='https://github.com/ankitects/rust-url;bb930b8d089f4d30d7d19c12e54e66191de47b88;rust-url-%commit%/percent_encoding'
-)
-inherit cargo desktop flag-o-matic multiprocessing ninja-utils optfeature \
-	python-single-r1 readme.gentoo-r1 toolchain-funcs xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net/"
-
-# Don't forget to update COMMITS if PV changes.
-# Update [node_modules] to the most recent commit hash until ${PV}, that
-# changed yarn.lock.
-# Oftentimes this file does not change between releases. This versioning
-# scheme prevents unnecessary downloads of the (sizeable) node_modules
-# folder.
-declare -A COMMITS=(
-	[anki]="ccd9ca1a8309b80bcb50ddc5d99c7ce63440bce9"
-	[ftl-core]="e3af3c983241448a239871ca573c9dd2fa5e8619"
-	[ftl-desktop]="45155310c3302cbbbe645dec52ca196894422463"
-	[node_modules]="ea8f0c1491d0b0f9e0fdff589b1f0d297e6e11a6"
-)
-SRC_URI="${CARGO_CRATE_URIS}
-	https://github.com/ankitects/anki/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/ankitects/anki-core-i18n/archive/${COMMITS[ftl-core]}.tar.gz
-	-> anki-core-i18n-${COMMITS[ftl-core]}.gh.tar.gz
-	https://github.com/ankitects/anki-desktop-ftl/archive/${COMMITS[ftl-desktop]}.tar.gz
-	-> anki-desktop-ftl-${COMMITS[ftl-desktop]}.gh.tar.gz
-	gui? ( https://git.sr.ht/~antecrescent/gentoo-files/blob/main/app-misc/anki/anki-node_modules-${COMMITS[node_modules]}.tar.xz )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}/ninja-gentoo-setup.patch
-	"${FILESDIR}"/${PV}/remove-mypy-protobuf.patch
-	"${FILESDIR}"/${PV}/remove-yarn.patch
-	"${FILESDIR}"/${PV}/revert-cert-store-hack.patch
-	"${FILESDIR}"/23.12.1/use-system-nextest.patch
-	"${FILESDIR}"/23.12.1/remove-formatter-dep.patch
-)
-
-# How to get an up-to-date summary of runtime JS libs' licenses:
-# ./node_modules/.bin/license-checker-rseidelsohn --production --excludePackages anki --summary
-LICENSE="AGPL-3+ BSD public-domain gui? ( 0BSD CC-BY-4.0 GPL-3+ Unlicense )"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 ISC MIT
-	MPL-2.0 Unicode-DFS-2016 ZLIB
-"
-# Manually added crate licenses
-LICENSE+=" Unicode-3.0 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+gui qt6 test"
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!gui? ( test ) !test? ( test )"
-
-# Dependencies:
-# Python: python/requirements.{anki,aqt}.in
-# If ENABLE_QT5_COMPAT is set at runtime
-# additionally depend on PyQt6[dbus,printsupport].
-# Qt: qt/{aqt/{sound.py,qt/*.py},tools/build_ui.py}
-# app-misc/certificates: The rust backend library is built against
-# rustls-native-certs to use the native certificate store.
-
-DEPEND="
-	dev-db/sqlite:3
-	>=app-arch/zstd-1.5.5:=
-"
-GUI_RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/decorator[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/flask-cors[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/waitress[${PYTHON_USEDEP}]')
-	qt6? (
-		dev-qt/qtsvg:6
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}]
-			>=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}]
-			>=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]')
-	)
-	!qt6? (
-		dev-qt/qtgui:5[jpeg,png]
-		dev-qt/qtsvg:5
-		$(python_gen_cond_dep '
-			>=dev-python/PyQt5-5.15.5[gui,network,webchannel,widgets,${PYTHON_USEDEP}]
-			>=dev-python/PyQt5-sip-12.9.0[${PYTHON_USEDEP}]
-			>=dev-python/PyQtWebEngine-5.15.5[${PYTHON_USEDEP}]')
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-misc/ca-certificates
-	gui? ( ${GUI_RDEPEND} )
-"
-
-BDEPEND="
-	>=app-arch/zstd-1.5.5:=
-	dev-libs/protobuf
-	virtual/pkgconfig
-	>=virtual/rust-1.75.0
-	gui? (
-		${PYTHON_DEPS}
-		app-alternatives/ninja
-		app-arch/unzip
-		net-libs/nodejs
-		$(python_gen_cond_dep 'dev-python/wheel[${PYTHON_USEDEP}]')
-		qt6?	( $(python_gen_cond_dep 'dev-python/PyQt6[${PYTHON_USEDEP}]') )
-		!qt6?	( $(python_gen_cond_dep 'dev-python/PyQt5[${PYTHON_USEDEP}]') )
-	)
-	test? (
-		${RDEPEND}
-		app-text/dvipng
-		app-text/texlive
-		dev-libs/openssl
-		dev-util/cargo-nextest
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]')
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/anki-sync-server
-	usr/lib/python.*/site-packages/anki/_rsbridge.so"
-
-DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either
-switch to ${CATEGORY}/${PN}[-qt6], or temporarily set the environment variable
-ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code.
-The latter option has additional runtime dependencies. Please take a look
-at this package's optional runtime features for a complete listing.
-\n\nIn an early 2024 update, ENABLE_QT5_COMPAT will be removed, so this is not
-a long-term solution.
-\n\nAnki's user manual is located online at https://docs.ankiweb.net/
-\nAnki's add-on developer manual is located online at
-https://addon-docs.ankiweb.net/
-"
-
-pkg_setup() {
-	export PROTOC_BINARY="${BROOT}"/usr/bin/protoc
-	export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-
-	if use gui; then
-		python-single-r1_pkg_setup
-		export NODE_BINARY="${BROOT}"/usr/bin/node
-		export OFFLINE_BUILD=1
-		if ! use debug; then
-			if tc-is-lto; then
-				export RELEASE=2
-			else
-				export RELEASE=1
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	rm -r ftl/{core,qt}-repo || die
-	ln -s "${WORKDIR}"/anki-core-i18n-${COMMITS[ftl-core]} ftl/core-repo || die
-	ln -s "${WORKDIR}"/anki-desktop-ftl-${COMMITS[ftl-desktop]} ftl/qt-repo || die
-
-	mkdir out || die
-	echo -e "${COMMITS[anki]:0:8}" > out/buildhash || die
-	if use gui; then
-		mv "${WORKDIR}"/node_modules out || die
-
-		# Some parts of the runner build system expect to be in a git repository
-		mkdir .git || die
-
-		# Creating the pseudo venv early skips pip dependency checks in src_compile.
-		mkdir -p out/pyenv/bin || die
-		ln -s "${PYTHON}" out/pyenv/bin/python || die
-		# TODO: ln -s "${BROOT}/usr/bin/protoc-gen-mypy" out/pyenv/bin || die
-
-		# Anki's Qt detection mechanism falls back to Qt5 Python bindings, if Qt6
-		# Python bindings don't get imported successfully.
-		if ! use qt6; then
-			sed -i "s/import PyQt6/raise ImportError/" qt/aqt/qt/__init__.py || die
-		fi
-	fi
-}
-
-src_compile() {
-	filter-lto
-	tc-export AR CC PKG_CONFIG
-	export CARGO_TARGET_DIR="${S}"/out/rust
-
-	# Overview of the build process
-	#
-	# 1. The "runner" build system is built explicitly with the "--release" flag
-	#     to avoid issues with hardcoded paths.  Once completed the binaries are
-	#     placed into "${S}"/out/rust/release.
-	# 2. As soon as step 1 is finished, the "runner" build system is executed,
-	#    which then processes the following steps:
-	#    * build remaining components of "runner" (= ninja_gen, configure, etc.)
-	#    * generate the ninja file and run ninja afterwards
-	#    * create the Python wheel files in "${S}"/out/wheels
-
-	cargo build --release --package runner || die
-	if use gui; then
-		out/rust/release/runner build -- $(get_NINJAOPTS) wheels  || die
-	else
-		cargo_src_compile --package anki-sync-server
-	fi
-}
-
-src_test() {
-	ln -s "${BROOT}"/usr/bin/pytest out/pyenv/bin/pytest || die
-	mkdir out/bin || die
-	ln -s "${BROOT}"/usr/bin/cargo-nextest out/bin/cargo-nextest || die
-
-	local nextest_opts=(
-		cargo-verbose
-		failure-output=immediate
-		status-level=all
-		test-threads=$(get_makeopts_jobs)
-	)
-	# cargo-nextest respects Cargo's CARGO_TERM_COLOR variable
-	if [[ ! ${CARGO_TERM_COLOR} ]]; then
-		[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && nextest_opts+=( color=never )
-	fi
-
-	nextest_opts=( ${nextest_opts[@]/#/--} )
-	# Override hardcoded cargo-nextest options
-	sed -i -e "s/\(cargo nextest run\).*\\$/\1 ${nextest_opts[*]} \\$/" \
-		"${S}"/build/ninja_gen/src/cargo.rs || die
-
-	for runner in pytest rust_test jest; do
-		out/rust/release/runner build -- $(get_NINJAOPTS) check:$runner  || \
-		die "check:$runner failed!"
-	done
-}
-
-src_install() {
-	readme.gentoo_create_doc
-	if use gui; then
-		pushd qt/bundle/lin > /dev/null || die
-		doman anki.1
-		doicon anki.{png,xpm}
-		domenu anki.desktop
-		insinto /usr/share/mime/packages
-		doins anki.xml
-		popd || die
-		for w in out/wheels/*.whl; do
-			unzip "${w}" -d out/wheels || die
-		done
-		python_domodule out/wheels/{anki,{,_}aqt,*.dist-info}
-		printf "#!/usr/bin/python3\nimport sys;from aqt import run;sys.exit(run())" > runanki || die
-		python_newscript runanki anki
-	else
-		cargo_src_install --path rslib/sync
-	fi
-}
-
-pkg_postinst() {
-	[[ "${REPLACING_VERSIONS%-r*}" = '2.1.15' ]] && local FORCE_PRINT_ELOG=1
-	readme.gentoo_print_elog
-	if use gui; then
-		xdg_pkg_postinst
-		optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng"
-		optfeature "sound support" media-video/mpv media-video/mplayer
-		optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt$(usex qt6 6 5)[multimedia]"
-		optfeature "faster database operations" dev-python/orjson
-		use qt6 && optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport]
-		use qt6 && optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase[vulkan]
-			dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]"
-
-		einfo "You can customize the LaTeX header for your cards to fit your needs:"
-		einfo "Notes > Manage Note Types > [select a note type] > Options"
-	fi
-}
diff --git a/app-misc/anki/anki-24.06.3.ebuild b/app-misc/anki/anki-24.06.3.ebuild
new file mode 100644
index 000000000000..77c1754f1f9b
--- /dev/null
+++ b/app-misc/anki/anki-24.06.3.ebuild
@@ -0,0 +1,982 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+CRATES="
+	addr2line@0.21.0
+	adler@1.0.2
+	aes@0.8.4
+	ahash@0.8.10
+	aho-corasick@1.1.2
+	allocator-api2@0.2.16
+	ammonia@3.3.0
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	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.80
+	apple-bundles@0.17.0
+	arrayref@0.3.7
+	arrayvec@0.7.4
+	ash@0.37.3+1.3.251
+	assert-json-diff@2.0.2
+	async-channel@1.9.0
+	async-compression@0.4.6
+	async-stream-impl@0.3.5
+	async-stream@0.3.5
+	async-trait@0.1.80
+	autocfg@1.1.0
+	axum-client-ip@0.4.2
+	axum-core@0.3.4
+	axum-macros@0.3.8
+	axum@0.6.20
+	backtrace@0.3.69
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	bincode@2.0.0-rc.3
+	bit-set@0.5.3
+	bit-vec@0.6.3
+	bit_field@0.10.2
+	bitflags@1.3.2
+	bitflags@2.4.2
+	blake3@1.5.0
+	block-buffer@0.10.4
+	block-padding@0.3.3
+	block@0.1.6
+	bstr@1.9.1
+	bumpalo@3.15.3
+	burn-autodiff@0.13.1
+	burn-candle@0.13.1
+	burn-common@0.13.1
+	burn-compute@0.13.1
+	burn-core@0.13.1
+	burn-dataset@0.13.1
+	burn-derive@0.13.1
+	burn-fusion@0.13.1
+	burn-jit@0.13.1
+	burn-ndarray@0.13.1
+	burn-tch@0.13.1
+	burn-tensor@0.13.1
+	burn-train@0.13.1
+	burn-wgpu@0.13.1
+	burn@0.13.1
+	bytemuck@1.14.3
+	bytemuck_derive@1.5.0
+	byteorder@1.5.0
+	bytes@1.5.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	camino@1.1.6
+	candle-core@0.4.1
+	cast@0.3.0
+	cbc@0.1.2
+	cc@1.0.88
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chrono@0.4.34
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	cipher@0.4.4
+	clap@4.5.1
+	clap_builder@4.5.1
+	clap_complete@4.5.1
+	clap_derive@4.5.0
+	clap_lex@0.7.0
+	coarsetime@0.1.34
+	codespan-reporting@0.11.1
+	codespan@0.11.1
+	color_quant@1.1.0
+	colorchoice@1.0.0
+	com@0.6.0
+	com_macros@0.6.0
+	com_macros_support@0.6.0
+	concurrent-queue@2.4.0
+	constant_time_eq@0.1.5
+	constant_time_eq@0.3.0
+	convert_case@0.6.0
+	core-foundation-sys@0.8.6
+	core-foundation@0.9.4
+	core-graphics-types@0.1.3
+	cpufeatures@0.2.12
+	crc32fast@1.4.0
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-channel@0.5.11
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	csv-core@0.1.11
+	csv@1.3.0
+	d3d12@0.19.0
+	dashmap@5.5.3
+	data-encoding@2.5.0
+	deadpool-runtime@0.1.3
+	deadpool@0.9.5
+	deranged@0.3.11
+	derive-new@0.6.0
+	des@0.8.1
+	difflib@0.4.0
+	digest@0.10.7
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	displaydoc@0.2.4
+	duct@0.13.7
+	dunce@1.0.4
+	dyn-stack@0.10.0
+	either@1.10.0
+	elasticlunr-rs@3.0.2
+	encoding_rs@0.8.33
+	enum-as-inner@0.6.0
+	env_filter@0.1.0
+	env_logger@0.11.2
+	envy@0.4.2
+	equivalent@1.0.1
+	errno@0.3.8
+	event-listener@2.5.3
+	exr@1.72.0
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	faster-hex@0.9.0
+	fastrand@1.9.0
+	fastrand@2.0.1
+	fdeflate@0.3.4
+	filetime@0.2.23
+	find-winsdk@0.2.0
+	fixedbitset@0.4.2
+	flate2@1.0.28
+	fluent-bundle@0.15.2
+	fluent-langneg@0.13.0
+	fluent-syntax@0.11.0
+	fluent@0.16.0
+	flume@0.11.0
+	fnv@1.0.7
+	foreign-types-macros@0.2.3
+	foreign-types-shared@0.1.1
+	foreign-types-shared@0.3.1
+	foreign-types@0.3.2
+	foreign-types@0.5.0
+	form_urlencoded@1.2.1
+	forwarded-header-value@0.1.1
+	fs2@0.4.3
+	fsevent-sys@4.1.0
+	fsrs@0.6.4
+	futf@0.1.5
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-intrusive@0.5.0
+	futures-io@0.3.30
+	futures-lite@1.13.0
+	futures-macro@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-timer@3.0.3
+	futures-util@0.3.30
+	futures@0.3.30
+	gemm-c32@0.17.1
+	gemm-c64@0.17.1
+	gemm-common@0.17.1
+	gemm-f16@0.17.1
+	gemm-f32@0.17.1
+	gemm-f64@0.17.1
+	gemm@0.17.1
+	generic-array@0.14.7
+	getopts@0.2.21
+	getrandom@0.1.16
+	getrandom@0.2.14
+	gif@0.13.1
+	gimli@0.28.1
+	gix-features@0.36.1
+	gix-fs@0.8.1
+	gix-hash@0.13.3
+	gix-tempfile@11.0.1
+	gix-trace@0.1.7
+	gl_generator@0.14.0
+	glob@0.3.1
+	globset@0.4.14
+	glow@0.13.1
+	glutin_wgl_sys@0.5.0
+	gpu-alloc-types@0.3.0
+	gpu-alloc@0.6.0
+	gpu-allocator@0.25.0
+	gpu-descriptor-types@0.1.2
+	gpu-descriptor@0.2.4
+	h2@0.3.26
+	half@2.4.1
+	handlebars@5.1.0
+	hashbrown@0.13.2
+	hashbrown@0.14.3
+	hashlink@0.8.4
+	hassle-rs@0.11.0
+	headers-core@0.2.0
+	headers@0.3.9
+	heck@0.4.1
+	hermit-abi@0.3.8
+	hex@0.4.3
+	hexf-parse@0.2.1
+	hmac@0.12.1
+	home@0.5.9
+	html5ever@0.26.0
+	htmlescape@0.3.1
+	http-body@0.4.6
+	http-range-header@0.3.1
+	http-types@2.12.0
+	http@0.2.11
+	httparse@1.8.0
+	httpdate@1.0.3
+	humantime@2.1.0
+	hyper-rustls@0.24.2
+	hyper-tls@0.5.0
+	hyper@0.14.28
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	id_tree@1.8.0
+	idna@0.5.0
+	ignore@0.4.22
+	image@0.24.9
+	indexmap@2.2.3
+	indoc@2.0.4
+	infer@0.2.3
+	inflections@1.1.1
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	inout@0.1.3
+	instant@0.1.12
+	intl-memoizer@0.5.1
+	intl_pluralrules@7.0.2
+	ipnet@2.9.0
+	is-terminal@0.4.12
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.12.1
+	itoa@1.0.10
+	jni-sys@0.3.0
+	jpeg-decoder@0.3.1
+	js-sys@0.3.68
+	junction@1.0.0
+	khronos-egl@6.0.0
+	khronos_api@3.1.0
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	lebe@0.5.2
+	libc@0.2.153
+	libloading@0.7.4
+	libloading@0.8.1
+	libm@0.2.8
+	libredox@0.0.1
+	libsqlite3-sys@0.27.0
+	line-wrap@0.1.1
+	linkify@0.7.0
+	linux-raw-sys@0.4.13
+	lock_api@0.4.11
+	log@0.4.21
+	lzma-sys@0.1.20
+	mac@0.1.1
+	malloc_buf@0.0.6
+	maplit@1.0.2
+	markup5ever@0.11.0
+	markup5ever_rcdom@0.2.0
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.7.3
+	matrixmultiply@0.3.8
+	md5@0.7.0
+	mdbook@0.4.37
+	memchr@2.7.1
+	memmap2@0.9.4
+	memoffset@0.9.0
+	metal@0.27.0
+	mime@0.3.17
+	mime_guess@2.0.4
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	multer@2.1.0
+	multimap@0.8.3
+	naga@0.19.2
+	native-tls@0.2.11
+	ndarray-rand@0.14.0
+	ndarray@0.15.6
+	ndk-sys@0.5.0+25.2.9519653
+	new_debug_unreachable@1.0.4
+	nom@7.1.3
+	nonempty@0.7.0
+	normpath@1.2.0
+	notify-debouncer-mini@0.4.1
+	notify@6.1.1
+	nu-ansi-term@0.46.0
+	num-complex@0.4.5
+	num-conv@0.1.0
+	num-format@0.4.4
+	num-integer@0.1.46
+	num-traits@0.2.18
+	num_cpus@1.16.0
+	num_enum@0.7.2
+	num_enum_derive@0.7.2
+	objc@0.2.7
+	objc_exception@0.1.2
+	object@0.32.2
+	once_cell@1.19.0
+	oorandom@11.1.3
+	opener@0.6.1
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-sys@0.9.101
+	openssl@0.10.64
+	option-ext@0.2.0
+	os_pipe@1.1.5
+	overload@0.1.1
+	p12@0.6.3
+	parking@2.2.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	password-hash@0.4.2
+	password-hash@0.5.0
+	paste@1.0.14
+	pathdiff@0.2.1
+	pbkdf2@0.11.0
+	pbkdf2@0.12.2
+	pem@1.1.1
+	percent-encoding@2.3.1
+	pest@2.7.7
+	pest_derive@2.7.7
+	pest_generator@2.7.7
+	pest_meta@2.7.7
+	petgraph@0.6.4
+	phf@0.10.1
+	phf@0.11.2
+	phf_codegen@0.10.0
+	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-internal@1.1.4
+	pin-project-lite@0.2.13
+	pin-project@1.1.4
+	pin-utils@0.1.0
+	pkg-config@0.3.30
+	plist@1.6.0
+	plotters-backend@0.3.5
+	plotters-svg@0.3.5
+	plotters@0.3.5
+	png@0.17.13
+	pollster@0.3.0
+	portable-atomic@1.6.0
+	powerfmt@0.2.0
+	ppv-lite86@0.2.17
+	precomputed-hash@0.1.1
+	presser@0.3.1
+	prettyplease@0.2.16
+	proc-macro-crate@3.1.0
+	proc-macro-hack@0.5.20+deprecated
+	proc-macro2@1.0.81
+	profiling@1.0.15
+	prost-build@0.12.3
+	prost-derive@0.12.3
+	prost-reflect@0.12.0
+	prost-types@0.12.3
+	prost@0.12.3
+	pulldown-cmark-escape@0.10.0
+	pulldown-cmark@0.10.0
+	pulldown-cmark@0.8.0
+	pulldown-cmark@0.9.6
+	pulp@0.18.8
+	pyo3-build-config@0.20.3
+	pyo3-ffi@0.20.3
+	pyo3-macros-backend@0.20.3
+	pyo3-macros@0.20.3
+	pyo3@0.20.3
+	qoi@0.4.1
+	quick-xml@0.31.0
+	quote@1.0.35
+	r2d2@0.8.10
+	r2d2_sqlite@0.23.0
+	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_distr@0.4.3
+	rand_hc@0.2.0
+	range-alloc@0.1.3
+	raw-cpuid@10.7.0
+	raw-window-handle@0.6.1
+	rawpointer@0.2.1
+	rayon-core@1.12.1
+	rayon@1.10.0
+	rc2@0.8.1
+	rcgen@0.10.0
+	reborrow@0.5.5
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	regex-automata@0.1.10
+	regex-automata@0.4.5
+	regex-syntax@0.6.29
+	regex-syntax@0.8.2
+	regex@1.10.3
+	renderdoc-sys@1.0.0
+	reqwest@0.11.24
+	retain_mut@0.1.9
+	ring@0.16.20
+	ring@0.17.8
+	rmp-serde@1.1.2
+	rmp@0.8.12
+	rusqlite@0.30.0
+	rustc-demangle@0.1.23
+	rustc-hash@1.1.0
+	rustix@0.38.31
+	rustls-native-certs@0.6.3
+	rustls-pemfile@1.0.4
+	rustls-pemfile@2.1.2
+	rustls-pki-types@1.3.1
+	rustls-webpki@0.101.7
+	rustls-webpki@0.102.2
+	rustls@0.21.11
+	rustls@0.22.4
+	rustversion@1.0.14
+	ryu@1.0.17
+	safemem@0.3.3
+	safetensors@0.3.3
+	safetensors@0.4.2
+	same-file@1.0.6
+	sanitize-filename@0.5.0
+	schannel@0.1.23
+	scheduled-thread-pool@0.2.7
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	sct@0.7.1
+	security-framework-sys@2.9.1
+	security-framework@2.9.2
+	self_cell@0.10.3
+	self_cell@1.0.3
+	semver@1.0.22
+	seq-macro@0.3.5
+	serde-aux@4.5.0
+	serde@1.0.197
+	serde_derive@1.0.197
+	serde_json@1.0.116
+	serde_path_to_error@0.1.15
+	serde_qs@0.8.5
+	serde_repr@0.1.18
+	serde_rusqlite@0.34.0
+	serde_tuple@0.5.0
+	serde_tuple_macros@0.5.0
+	serde_urlencoded@0.7.1
+	sha1@0.10.6
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shared_child@1.0.0
+	shlex@1.3.0
+	signal-hook-registry@1.4.1
+	signal-hook@0.3.17
+	simd-adler32@0.3.7
+	simple-file-manifest@0.11.0
+	siphasher@0.3.11
+	slab@0.4.9
+	slotmap@1.0.7
+	smallvec@1.13.1
+	snafu-derive@0.8.1
+	snafu@0.8.1
+	snowflake@1.3.0
+	socket2@0.5.6
+	spin@0.5.2
+	spin@0.9.8
+	spirv@0.3.0+sdk-1.3.268.0
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	string_cache@0.8.7
+	string_cache_codegen@0.5.2
+	strsim@0.11.0
+	strum@0.25.0
+	strum@0.26.1
+	strum_macros@0.25.3
+	strum_macros@0.26.1
+	subtle@2.5.0
+	syn@1.0.109
+	syn@2.0.51
+	sync_wrapper@0.1.2
+	synstructure@0.13.1
+	sysctl@0.5.5
+	system-configuration-sys@0.5.0
+	system-configuration@0.5.1
+	tar@0.4.40
+	target-lexicon@0.12.14
+	tch@0.15.0
+	tempfile@3.10.1
+	tendril@0.4.3
+	termcolor@1.4.1
+	terminal_size@0.3.0
+	text_placeholder@0.5.0
+	thiserror-impl@1.0.59
+	thiserror@1.0.59
+	thread-tree@0.3.3
+	thread_local@1.1.8
+	tiff@0.9.1
+	time-core@0.1.2
+	tinystr@0.7.5
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.2.0
+	tokio-native-tls@0.3.1
+	tokio-rustls@0.24.1
+	tokio-socks@0.5.1
+	tokio-stream@0.1.14
+	tokio-tungstenite@0.20.1
+	tokio-util@0.7.10
+	tokio@1.36.0
+	toml@0.5.11
+	toml_datetime@0.6.5
+	toml_edit@0.21.1
+	topological-sort@0.2.2
+	torch-sys@0.15.0
+	tower-http@0.4.4
+	tower-layer@0.3.2
+	tower-service@0.3.2
+	tower@0.4.13
+	tracing-appender@0.2.3
+	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
+	tugger-common@0.10.0
+	tugger-windows-codesign@0.10.0
+	tugger-windows@0.10.0
+	tungstenite@0.20.1
+	type-map@0.4.0
+	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-langid-impl@0.9.4
+	unic-langid-macros-impl@0.9.4
+	unic-langid-macros@0.9.4
+	unic-langid@0.9.4
+	unic-ucd-category@0.9.0
+	unic-ucd-version@0.9.0
+	unicase@2.6.0
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-segmentation@1.11.0
+	unicode-width@0.1.11
+	unicode-xid@0.2.4
+	unindent@0.2.3
+	untrusted@0.7.1
+	untrusted@0.9.0
+	ureq@2.9.6
+	url@2.5.0
+	utf-8@0.7.6
+	utf8parse@0.2.1
+	utime@0.3.1
+	uuid@1.8.0
+	valuable@0.1.0
+	vcpkg@0.2.15
+	version_check@0.9.4
+	waker-fn@1.1.1
+	walkdir@2.4.0
+	want@0.3.1
+	warp@0.3.6
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasix@0.12.21
+	wasm-bindgen-backend@0.2.91
+	wasm-bindgen-futures@0.4.41
+	wasm-bindgen-macro-support@0.2.91
+	wasm-bindgen-macro@0.2.91
+	wasm-bindgen-shared@0.2.91
+	wasm-bindgen@0.2.91
+	wasm-streams@0.4.0
+	web-sys@0.3.68
+	web-time@1.1.0
+	webpki-roots@0.25.4
+	webpki-roots@0.26.1
+	weezl@0.1.8
+	wgpu-core@0.19.4
+	wgpu-hal@0.19.4
+	wgpu-types@0.19.2
+	wgpu@0.19.4
+	which@4.4.2
+	which@5.0.0
+	widestring@1.0.2
+	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.51.1
+	windows-core@0.52.0
+	windows-core@0.54.0
+	windows-result@0.1.0
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.3
+	windows@0.51.1
+	windows@0.54.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.3
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.3
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.3
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.3
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.3
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.3
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.3
+	winnow@0.5.40
+	winreg@0.5.1
+	winreg@0.50.0
+	wiremock@0.5.22
+	xattr@1.3.1
+	xml-rs@0.8.19
+	xml5ever@0.17.0
+	xz2@0.1.7
+	yasna@0.5.2
+	yoke-derive@0.7.3
+	yoke@0.7.3
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zerofrom-derive@0.1.3
+	zerofrom@0.1.3
+	zeroize@1.7.0
+	zip@0.6.6
+	zstd-safe@5.0.2+zstd.1.5.2
+	zstd-safe@7.0.0
+	zstd-sys@2.0.9+zstd.1.5.5
+	zstd@0.11.2+zstd.1.5.2
+	zstd@0.13.0
+	zune-inflate@0.2.54
+"
+# https://github.com/time-rs/time/issues/693
+# cargo update time@0.3.34 --precise 0.3.36
+CRATES+="
+	time-macros@0.2.18
+	time@0.3.36
+"
+declare -A GIT_CRATES=(
+	[linkcheck]='https://github.com/ankitects/linkcheck;184b2ca50ed39ca43da13f0b830a463861adb9ca;linkcheck-%commit%'
+	[percent-encoding-iri]='https://github.com/ankitects/rust-url;bb930b8d089f4d30d7d19c12e54e66191de47b88;rust-url-%commit%/percent_encoding'
+)
+inherit cargo desktop edo multiprocessing ninja-utils optfeature \
+	python-single-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net/"
+
+# Don't forget to update COMMITS if PV changes.
+# Update [node_modules] to the most recent commit hash until ${PV}, that
+# changed yarn.lock.
+# Oftentimes this file does not change between releases. This versioning
+# scheme prevents unnecessary downloads of the (sizeable) node_modules
+# folder.
+declare -A COMMITS=(
+	[anki]="d678e39350a2d243242a69f4e22f5192b04398f2"
+	[ftl-core]="b4813a328f44c8224d2649adbdbcbef095db9a40"
+	[ftl-desktop]="b95608421ba2ba1cdca407933aff9ba25d567e12"
+	[node_modules]="b9a182d8e2f3a11b633a6d5fbb582e9e7d8a4f34"
+)
+SRC_URI="${CARGO_CRATE_URIS}
+	https://github.com/ankitects/anki/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/ankitects/anki-core-i18n/archive/${COMMITS[ftl-core]}.tar.gz
+	-> anki-core-i18n-${COMMITS[ftl-core]}.gh.tar.gz
+	https://github.com/ankitects/anki-desktop-ftl/archive/${COMMITS[ftl-desktop]}.tar.gz
+	-> anki-desktop-ftl-${COMMITS[ftl-desktop]}.gh.tar.gz
+	gui? ( https://git.sr.ht/~antecrescent/gentoo-files/blob/main/app-misc/anki/anki-node_modules-${COMMITS[node_modules]}.tar.xz )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}/ninja-gentoo-setup.patch
+	"${FILESDIR}"/${PV}/remove-yarn.patch
+	"${FILESDIR}"/24.04.1/remove-mypy-protobuf.patch
+	"${FILESDIR}"/24.04.1/revert-cert-store-hack.patch
+	"${FILESDIR}"/24.04.1/rust-1.80.0.patch
+	"${FILESDIR}"/23.12.1/ninja-rules-for-cargo.patch
+	"${FILESDIR}"/23.12.1/remove-formatter-dep.patch
+)
+
+# How to get an up-to-date summary of runtime JS libs' licenses:
+# ./node_modules/.bin/license-checker-rseidelsohn --production --excludePackages anki --summary
+LICENSE="AGPL-3+ BSD public-domain gui? ( 0BSD CC-BY-4.0 GPL-3+ Unlicense )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 ISC MIT
+	MPL-2.0 Unicode-DFS-2016 ZLIB
+"
+# Manually added crate licenses
+LICENSE+=" Unicode-3.0 openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc +gui qt6 test"
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!gui? ( test ) !test? ( test )"
+
+# Dependencies:
+# Python: python/requirements.{anki,aqt}.in
+# If ENABLE_QT5_COMPAT is set at runtime
+# additionally depend on PyQt6[dbus,printsupport].
+# Qt: qt/{aqt/{sound.py,qt/*.py},tools/build_ui.py}
+# app-misc/certificates: The rust backend library is built against
+# rustls-native-certs to use the native certificate store.
+
+DEPEND="
+	dev-db/sqlite:3
+	>=app-arch/zstd-1.5.5:=
+"
+GUI_RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]')
+	qt6? (
+		dev-qt/qtsvg:6
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}]
+			>=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}]
+			>=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}]')
+	)
+	!qt6? (
+		dev-qt/qtgui:5[jpeg,png]
+		dev-qt/qtsvg:5
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt5-5.15.5[gui,network,webchannel,widgets,${PYTHON_USEDEP}]
+			>=dev-python/PyQt5-sip-12.9.0[${PYTHON_USEDEP}]
+			>=dev-python/PyQtWebEngine-5.15.5[${PYTHON_USEDEP}]')
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-misc/ca-certificates
+	gui? ( ${GUI_RDEPEND} )
+"
+
+BDEPEND="
+	>=app-arch/zstd-1.5.5:=
+	dev-libs/protobuf
+	virtual/pkgconfig
+	>=virtual/rust-1.75.0
+	doc? (
+		$(python_gen_cond_dep '
+			>=dev-python/sphinx-7.2.6[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+			dev-python/sphinx-autoapi[${PYTHON_USEDEP}]')
+	)
+	gui? (
+		${PYTHON_DEPS}
+		app-alternatives/ninja
+		app-arch/unzip
+		>=net-libs/nodejs-20.12.1
+		sys-apps/yarn
+		$(python_gen_cond_dep 'dev-python/wheel[${PYTHON_USEDEP}]')
+		qt6?	( $(python_gen_cond_dep 'dev-python/PyQt6[${PYTHON_USEDEP}]') )
+		!qt6?	( $(python_gen_cond_dep 'dev-python/PyQt5[${PYTHON_USEDEP}]') )
+	)
+	test? (
+		${RDEPEND}
+		app-text/dvipng
+		app-text/texlive
+		dev-libs/openssl
+		dev-util/cargo-nextest
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]')
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/anki-sync-server
+	usr/lib/python.*/site-packages/anki/_rsbridge.so"
+
+pkg_setup() {
+	export PROTOC_BINARY="${BROOT}"/usr/bin/protoc
+	export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+
+	if use gui; then
+		python-single-r1_pkg_setup
+		export NODE_BINARY="${BROOT}"/usr/bin/node
+		export YARN_BINARY="${BROOT}"/usr/bin/yarn
+		export OFFLINE_BUILD=1
+		if ! use debug; then
+			if tc-is-lto; then
+				export RELEASE=2
+			else
+				export RELEASE=1
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	rm -r ftl/{core,qt}-repo || die
+	ln -s "${WORKDIR}"/anki-core-i18n-${COMMITS[ftl-core]} ftl/core-repo || die
+	ln -s "${WORKDIR}"/anki-desktop-ftl-${COMMITS[ftl-desktop]} ftl/qt-repo || die
+
+	mkdir out || die
+	echo -e "${COMMITS[anki]:0:8}" > out/buildhash || die
+	if use gui; then
+		mv "${WORKDIR}"/node_modules out || die
+
+		# Some parts of the runner build system expect to be in a git repository
+		mkdir .git || die
+
+		# Creating the pseudo venv early skips pip dependency checks in src_configure.
+		mkdir -p out/pyenv/bin || die
+		ln -s "${PYTHON}" out/pyenv/bin/python || die
+		# TODO: ln -s "${BROOT}/usr/bin/protoc-gen-mypy" out/pyenv/bin || die
+		if use doc; then
+			ln -s "${BROOT}"/usr/bin/sphinx-apidoc out/pyenv/bin || die
+			ln -s "${BROOT}"/usr/bin/sphinx-build out/pyenv/bin || die
+		fi
+
+		# Anki's Qt detection mechanism falls back to Qt5 Python bindings, if Qt6
+		# Python bindings don't get imported successfully.
+		if ! use qt6; then
+			sed -i "s/import PyQt6/raise ImportError/" qt/aqt/qt/__init__.py || die
+		fi
+
+		# Fix hardcoded runner location
+		export CARGO_TARGET_DIR="${S}"/out/rust
+		cbuild_dir="$(CHOST=${CBUILD:-${CHOST}} cargo_target_dir)"
+		sed "s,rust/release,${cbuild_dir##*out/}," \
+			-i build/ninja_gen/src/render.rs || die
+
+		# Separate src_configure from runner build
+		sed '/ConfigureBuild/d' -i build/ninja_gen/src/build.rs || die
+	fi
+}
+
+_cbuild_cargo_build() {
+	CHOST=${CBUILD:-${CHOST}} cargo_src_compile "${@}"
+}
+
+src_configure() {
+	cargo_src_configure
+	if use gui; then
+		tc-env_build _cbuild_cargo_build -p configure
+		cargo_env edo "${cbuild_dir}"/configure
+	fi
+}
+
+src_compile() {
+	if use gui; then
+		MY_RUNNER="cargo_env edo ${cbuild_dir}/runner build -- $(get_NINJAOPTS)"
+		unset cbuild_dir
+
+		tc-env_build _cbuild_cargo_build -p runner
+		${MY_RUNNER} wheels
+		use doc && ${MY_RUNNER} python:sphinx
+	else
+		cargo_src_compile --package anki-sync-server
+	fi
+}
+
+src_test() {
+	ln -s "${BROOT}"/usr/bin/pytest out/pyenv/bin/pytest || die
+	mkdir out/bin || die
+	ln -s "${BROOT}"/usr/bin/cargo-nextest out/bin/cargo-nextest || die
+
+	local nextest_opts=(
+		cargo-verbose
+		failure-output=immediate
+		status-level=all
+		test-threads=$(get_makeopts_jobs)
+	)
+	# cargo-nextest respects Cargo's CARGO_TERM_COLOR variable
+	if [[ ! ${CARGO_TERM_COLOR} ]]; then
+		[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && nextest_opts+=( color=never )
+	fi
+
+	nextest_opts=( ${nextest_opts[@]/#/--} )
+	# Override hardcoded cargo-nextest options
+	sed -i -e "s/\(cargo nextest run\).*\\$/\1 ${nextest_opts[*]} \\$/" \
+		"${S}"/build/ninja_gen/src/cargo.rs || die
+
+	local runner
+	for runner in pytest rust_test vitest; do
+		${MY_RUNNER} check:${runner}
+	done
+}
+
+src_install() {
+	local DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either
+	switch to ${CATEGORY}/${PN}[-qt6], or temporarily set the environment variable
+	ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code.
+	The latter option has additional runtime dependencies. Please take a look
+	at this package's optional runtime features for a complete listing.
+	\n\nIn an early 2024 update, ENABLE_QT5_COMPAT will be removed, so this is not
+	a long-term solution.
+	\n\nAnki's user manual is located online at https://docs.ankiweb.net/
+	\nAnki's add-on developer manual is located online at
+	https://addon-docs.ankiweb.net/"
+
+	readme.gentoo_create_doc
+	if use gui; then
+		pushd qt/bundle/lin > /dev/null || die
+		doman anki.1
+		doicon anki.{png,xpm}
+		domenu anki.desktop
+		insinto /usr/share/mime/packages
+		doins anki.xml
+		popd || die
+		use doc && dodoc -r out/python/sphinx/html
+
+		local w
+		for w in out/wheels/*.whl; do
+			unzip "${w}" -d out/wheels || die
+		done
+		python_domodule out/wheels/{anki,{,_}aqt,*.dist-info}
+		printf "#!/usr/bin/python3\nimport sys;from aqt import run;sys.exit(run())" > runanki || die
+		python_newscript runanki anki
+	else
+		cargo_src_install --path rslib/sync
+	fi
+}
+
+pkg_postinst() {
+	[[ "${REPLACING_VERSIONS%-r*}" = '2.1.15' ]] && local FORCE_PRINT_ELOG=1
+	readme.gentoo_print_elog
+	if use gui; then
+		xdg_pkg_postinst
+		optfeature "LaTeX in cards" "app-text/texlive[extra] app-text/dvipng"
+		optfeature "sound support" media-video/mpv media-video/mplayer
+		optfeature "recording support" "media-sound/lame[frontend] dev-python/PyQt$(usex qt6 6 5)[multimedia]"
+		optfeature "faster database operations" dev-python/orjson
+		use qt6 && optfeature "compatibility with Qt5-dependent add-ons" dev-python/PyQt6[dbus,printsupport]
+		use qt6 && optfeature "Vulkan driver" "media-libs/vulkan-loader dev-qt/qtbase[vulkan]
+			dev-qt/qtdeclarative:6[vulkan] dev-qt/qtwebengine:6[vulkan]"
+
+		einfo "You can customize the LaTeX header for your cards to fit your needs:"
+		einfo "Notes > Manage Note Types > [select a note type] > Options"
+	fi
+}
diff --git a/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch
new file mode 100644
index 000000000000..cf9356bbc24c
--- /dev/null
+++ b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch
@@ -0,0 +1,40 @@
+Fix the output path for Rust binaries in the Ninja file to match
+Cargo's target directory when CARGO_BUILD_TARGET is set.  This prevents
+file-not-found errors for some build steps.
+
+Provide the cargo-nextest binary ourselves to prevent network access.
+Set test runner options in the ebuild.
+
+From: Lucio Sauer <watermanpaint@posteo.net>
+--- a/build/ninja_gen/src/cargo.rs
++++ b/build/ninja_gen/src/cargo.rs
+@@ -61,6 +61,9 @@ impl RustOutput<'_> {
+         let mut path: Utf8PathBuf = rust_base.into();
+         if let Some(target) = target {
+             path = path.join(target);
++        } else {
++            let triple = std::env::var("CARGO_BUILD_TARGET").unwrap_or_default();
++            path = path.join(triple);
+         }
+         path = path.join(profile_output_dir(build_profile)).join(filename);
+         path.to_string()
+@@ -152,19 +155,11 @@ impl BuildAction for CargoTest {
+ 
+     fn files(&mut self, build: &mut impl FilesHandle) {
+         build.add_inputs("", &self.inputs);
+-        build.add_inputs("", inputs![":cargo-nextest"]);
+         build.add_env_var("ANKI_TEST_MODE", "1");
+         build.add_output_stamp("tests/cargo_test");
+     }
+ 
+     fn on_first_instance(&self, build: &mut Build) -> Result<()> {
+-        build.add_action(
+-            "cargo-nextest",
+-            CargoInstall {
+-                binary_name: "cargo-nextest",
+-                args: "cargo-nextest --version 0.9.57 --locked",
+-            },
+-        )?;
+         setup_flags(build)
+     }
+ }
diff --git a/app-misc/anki/files/23.12.1/use-system-nextest.patch b/app-misc/anki/files/23.12.1/use-system-nextest.patch
deleted file mode 100644
index 8f931b97da86..000000000000
--- a/app-misc/anki/files/23.12.1/use-system-nextest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Provide the binary ourselves to prevent network access.
-Set test runner options in the ebuild.
-
-From: Lucio Sauer <watermanpaint@posteo.net>
---- a/build/ninja_gen/src/cargo.rs
-+++ b/build/ninja_gen/src/cargo.rs
-@@ -152,19 +152,11 @@ impl BuildAction for CargoTest {
- 
-     fn files(&mut self, build: &mut impl FilesHandle) {
-         build.add_inputs("", &self.inputs);
--        build.add_inputs("", inputs![":cargo-nextest"]);
-         build.add_env_var("ANKI_TEST_MODE", "1");
-         build.add_output_stamp("tests/cargo_test");
-     }
- 
-     fn on_first_instance(&self, build: &mut Build) -> Result<()> {
--        build.add_action(
--            "cargo-nextest",
--            CargoInstall {
--                binary_name: "cargo-nextest",
--                args: "cargo-nextest --version 0.9.57 --locked",
--            },
--        )?;
-         setup_flags(build)
-     }
- }
diff --git a/app-misc/anki/files/24.04.1/rust-1.80.0.patch b/app-misc/anki/files/24.04.1/rust-1.80.0.patch
new file mode 100644
index 000000000000..397e43dbb4b2
--- /dev/null
+++ b/app-misc/anki/files/24.04.1/rust-1.80.0.patch
@@ -0,0 +1,31 @@
+Allow builds with ~virtual/rust-1.80.0
+
+https://github.com/gentoo/gentoo/pull/37727#issuecomment-2251642236
+https://github.com/time-rs/time/issues/693
+Author: Lucio Sauer <watermanpaint@posteo.net>
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -5515,9 +5515,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -5536,9 +5536,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
diff --git a/app-misc/anki/files/24.06.3/ninja-gentoo-setup.patch b/app-misc/anki/files/24.06.3/ninja-gentoo-setup.patch
new file mode 100644
index 000000000000..22df6adcaaf0
--- /dev/null
+++ b/app-misc/anki/files/24.06.3/ninja-gentoo-setup.patch
@@ -0,0 +1,44 @@
+Respect app-alternatives/ninja (n2 is not yet in the tree) and
+user variables from the ninja-utils eclass.
+This is a workaround. A proper implementation similar to
+the LTO implementation (c6f429) should allow the build system to be set at
+configure time.
+
+From: Lucio Sauer <watermanpaint@posteo.net>
+--- a/build/ninja_gen/src/build.rs
++++ b/build/ninja_gen/src/build.rs
+@@ -49,7 +49,7 @@ impl Build {
+             output_text: Default::default(),
+             action_names: Default::default(),
+             groups: Default::default(),
+-            have_n2: which::which("n2").is_ok(),
++            have_n2: false,
+         };
+ 
+         build.add_action("build:configure", ConfigureBuild {})?;
+--- a/build/runner/src/build.rs
++++ b/build/runner/src/build.rs
+@@ -56,6 +56,10 @@ pub fn run_build(args: BuildArgs) {
+ 
+     let start_time = Instant::now();
+     let mut command = Command::new(get_ninja_command());
++
++    if env::var("NINJA_VERBOSE").unwrap_or(String::from("ON")).eq("ON") {
++        command.arg("-v");
++    }
+     command
+         .arg("-f")
+         .arg(&build_file)
+@@ -108,11 +112,7 @@ pub fn run_build(args: BuildArgs) {
+ }
+ 
+ fn get_ninja_command() -> &'static str {
+-    if which::which("n2").is_ok() {
+-        "n2"
+-    } else {
+-        "ninja"
+-    }
++    "ninja"
+ }
+ 
+ fn setup_build_root() -> Utf8PathBuf {
diff --git a/app-misc/anki/files/24.06.3/remove-yarn.patch b/app-misc/anki/files/24.06.3/remove-yarn.patch
new file mode 100644
index 000000000000..e13588505bc5
--- /dev/null
+++ b/app-misc/anki/files/24.06.3/remove-yarn.patch
@@ -0,0 +1,58 @@
+Pre-built node_modules allows us to run JS tests but we lose the ability to
+hack node packages' source files in YARN_CACHE_FOLDER.
+
+From: Lucio Sauer <watermanpaint@posteo.net>
+--- a/build/ninja_gen/src/node.rs
++++ b/build/ninja_gen/src/node.rs
+@@ -76,12 +76,11 @@ pub struct YarnInstall<'a> {
+ 
+ impl BuildAction for YarnInstall<'_> {
+     fn command(&self) -> &str {
+-        "$runner yarn $yarn $out"
++        "$runner yarn $out"
+     }
+ 
+     fn files(&mut self, build: &mut impl build::FilesHandle) {
+         build.add_inputs("", &self.package_json_and_lock);
+-        build.add_inputs("yarn", inputs![":yarn:bin"]);
+         build.add_outputs("out", vec!["node_modules/.marker"]);
+         for (key, value) in &self.exports {
+             let outputs: Vec<_> = value.iter().map(|o| format!("node_modules/{o}")).collect();
+--- a/build/runner/src/yarn.rs
++++ b/build/runner/src/yarn.rs
+@@ -1,36 +1,18 @@
+ // Copyright: Ankitects Pty Ltd and contributors
+ // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+ 
+-use std::env;
+ use std::path::Path;
+-use std::process::Command;
+ 
+ use clap::Args;
+ 
+-use crate::run::run_command;
+-
+ #[derive(Args)]
+ pub struct YarnArgs {
+-    yarn_bin: String,
+     stamp: String,
+ }
+ 
+ pub fn setup_yarn(args: YarnArgs) {
+     link_node_modules();
+ 
+-    if env::var("OFFLINE_BUILD").is_ok() {
+-        println!("OFFLINE_BUILD is set");
+-        println!("Running yarn with '--offline' and '--ignore-scripts'.");
+-        run_command(
+-            Command::new(&args.yarn_bin)
+-                .arg("install")
+-                .arg("--offline")
+-                .arg("--ignore-scripts"),
+-        );
+-    } else {
+-        run_command(Command::new(&args.yarn_bin).arg("install"));
+-    }
+-
+     std::fs::write(args.stamp, b"").unwrap();
+ }
diff --git a/app-misc/anki/metadata.xml b/app-misc/anki/metadata.xml
index 9b09c9b95827..7f320c364eb0 100644
--- a/app-misc/anki/metadata.xml
+++ b/app-misc/anki/metadata.xml
@@ -19,6 +19,12 @@
 		quickly, easily and efficiently as possible.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://forums.ankiweb.net/c/anki/21</bugs-to>
+		<changelog>https://github.com/ankitects/anki/releases</changelog>
+		<doc>https://docs.ankiweb.net/</doc>
+		<maintainer status="active">
+			<name>Damien Elmes</name>
+		</maintainer>
 		<remote-id type="github">ankitects/anki</remote-id>
 	</upstream>
 	<use>
diff --git a/app-misc/astrolog-ephemeris/Manifest b/app-misc/astrolog-ephemeris/Manifest
index 5ed2adfca4d3..fa28ff836eee 100644
--- a/app-misc/astrolog-ephemeris/Manifest
+++ b/app-misc/astrolog-ephemeris/Manifest
@@ -1 +1,2 @@
+DIST astrolog-ephemeris-20230414.zip 34586270 BLAKE2B 301cd558cf50fbea242b41388b6f04372f8d1af0dd899dc40731b3a2ac8771c5ef08a4cbb987c6b4ef6f29613b5fe4d5933601808b18f2d266dee36f17bfea36 SHA512 a058a81815c13e31cb03c22408238fe7582cd5b5b548ef9562a60fa89e37b2de2c16d729fd3e78311c9a822169e9d93987599f658ca7b6b1f536c2a0ba76307c
 DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild
new file mode 100644
index 000000000000..f840301c959c
--- /dev/null
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-20230414.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This archive is most probably created from files from following repository
+# https://github.com/aloistr/swisseph/tree/master/ephe
+#
+# The version represents archive creation date.
+#
+# Upstream calls them Swiss Ephemeris files and Astrolog version 7.70 (most
+# recent version in time of writing this comment) tries to search them by
+# default.
+
+DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
+HOMEPAGE="https://www.astrolog.org/astrolog.htm"
+SRC_URI="
+	https://www.astrolog.org/ftp/ephem/astephem.zip
+		-> ${P}.zip
+"
+
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="app-misc/astrolog"
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	insinto /usr/share/astrolog
+	doins -r .
+}
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
deleted file mode 100644
index 269fbde6ea43..000000000000
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
-HOMEPAGE="http://www.astrolog.org/astrolog.htm"
-SRC_URI="http://www.astrolog.org/ftp/ephem/ephemall.zip"
-
-LICENSE="astrolog"
-SLOT="0"
-# works fine on x86 - runs probably on other architectures, too
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND="app-misc/astrolog"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	insinto /usr/share/astrolog
-	doins -r .
-}
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild
deleted file mode 100644
index e07bb6f43c66..000000000000
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.40.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-misc/astrolog
-
-DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
-HOMEPAGE="https://www.astrolog.org/astrolog.htm"
-SRC_URI="https://www.astrolog.org/ftp/ephem/ephemall.zip"
-
-LICENSE="astrolog"
-SLOT="0"
-# works fine on x86 - runs probably on other architectures, too
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND="app-misc/astrolog"
-BDEPEND="app-arch/unzip"
-
-src_install() {
-	insinto /usr/share/astrolog
-	doins -r .
-}
diff --git a/app-misc/astrolog-ephemeris/metadata.xml b/app-misc/astrolog-ephemeris/metadata.xml
index 062170537b8f..f5ac3a0ecaf3 100644
--- a/app-misc/astrolog-ephemeris/metadata.xml
+++ b/app-misc/astrolog-ephemeris/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
-	<name>Gentoo Science Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index 905de738fda6..b4883f98e9a9 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1 +1,2 @@
 DIST ast74src.zip 4483648 BLAKE2B d15d3e5d98337c5c5884973d079cffda9144a5c9f43ab48dd38f782eeef089d9fd5fb3f5a01f1d607bd2134e6a774494d4cf7d99e117d3092c8787626436e778 SHA512 540bda7ee10cde0723f6bd4afe410e4e9c59168e31dbdbd0b3b62a9e77ae83a971543fc812876258e2b7b9636f880c74b9be5497c54e7dd0e9b444bad2edbf6b
+DIST ast77src.zip 4706533 BLAKE2B ea5ae3805ea43d61f5ff27f199bd36e7263800e441b1aa31044c814b08f6ae2be8969d752a16262ec944dbaae0e0bc2ab3413ee14edbe2366f332a56452bc4d1 SHA512 f5ad29cc023e4bd6a36ddc8434f422fcfe4dbd0b3ebebb85bf6e2d12de58cf60e8304c8a5cea6cb385de346dc1441752542774ee1e7319de9af2166289fd1291
diff --git a/app-misc/astrolog/astrolog-7.40.ebuild b/app-misc/astrolog/astrolog-7.40.ebuild
deleted file mode 100644
index ab421e0eb9aa..000000000000
--- a/app-misc/astrolog/astrolog-7.40.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-misc/astrolog-ephemeris
-
-inherit toolchain-funcs
-
-DESCRIPTION="A many featured astrology chart calculation program"
-HOMEPAGE="https://www.astrolog.org/astrolog.htm"
-SRC_URI="https://www.astrolog.org/ftp/ast74src.zip"
-
-LICENSE="astrolog"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove stripping of created binary, dump hardcoded CFLAGS,
-	# respect CC (bug #243606), and CFLAGS (bug #240057)
-	sed \
-		-e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
-		-e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
-		-i Makefile || die
-
-	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
-	sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
-
-	# if we do NOT use X, we disable it by removing the -lX11 from the Makefile
-	# and remove the "#define X11" and "#define MOUSE" from astrolog.h
-	use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile || die
-		   sed -i -e "s:#define X11:/*#define X11:g" astrolog.h || die
-		   sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h || die)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin astrolog
-	dodoc astrolog.doc changes.doc
-	insinto /usr/share/astrolog
-	doins astrolog.as
-}
-
-pkg_postinst() {
-	elog "There is a sample config file /usr/share/astrolog/astrolog.as"
-	elog "astrolog looks in current dir for a file astrolog.as before"
-	elog "using the file in /usr/share/astrolog"
-	elog "If you want extended accuracy of astrolog's calculations you"
-	elog "can emerge the optional package \"astrolog-ephemeris\" which"
-	elog "needs ~32.9 MB additional diskspace for the ephemeris-files"
-}
diff --git a/app-misc/astrolog/astrolog-7.70.ebuild b/app-misc/astrolog/astrolog-7.70.ebuild
new file mode 100644
index 000000000000..84ef17f76a89
--- /dev/null
+++ b/app-misc/astrolog/astrolog-7.70.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please also check if app-misc/astrolog-ephemeris archive needs update
+
+inherit toolchain-funcs
+
+MY_PV=$(ver_rs 1 '')
+
+DESCRIPTION="A many featured astrology chart calculation program"
+HOMEPAGE="
+	https://www.astrolog.org/astrolog.htm
+	https://github.com/CruiserOne/Astrolog
+"
+SRC_URI="https://www.astrolog.org/ftp/ast${MY_PV:0:2}src.zip"
+
+S="${WORKDIR}"
+
+LICENSE="AGPL-3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
+	local cfgargs=( -e "s:~/astrolog:/usr/share/astrolog:g" )
+	# if we do NOT use X, we comment the "#define X11" in astrolog.h
+	use X || cfgargs+=( -e "s:#define X11://&:g" )
+
+	sed -i "${cfgargs[@]}" astrolog.h || die
+
+	local makeargs=(
+		# respect CXX (bug #243606), and LDFLAGS
+		-e 's:\tcc :\t$(CXX) $(LDFLAGS) :'
+		# respect -O flags
+		-e '/^CPPFLAGS/s:-O ::'
+	)
+	sed -i "${makeargs[@]}" Makefile || die
+}
+
+src_compile() {
+	local libs=( -lm -ldl )
+	# we need to link with -lX11 if the X use is set
+	use X && libs+=( -lX11 )
+
+	# Makefile contains stripping flag in LIBS. It is easier to overload it
+	# here because we need to control LIBS content with X use anyway.
+	emake LIBS="${libs[*]}"
+}
+
+src_install() {
+	dobin astrolog
+	dodoc astrolog.doc changes.doc
+	insinto /usr/share/astrolog
+	doins astrolog.as
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "There is a sample config file /usr/share/astrolog/astrolog.as"
+		elog "astrolog looks in current dir for a file astrolog.as before"
+		elog "using the file in /usr/share/astrolog"
+		elog "If you want extended accuracy of astrolog's calculations you"
+		elog "can emerge the optional package \"astrolog-ephemeris\" which"
+		elog "needs ~32.9 MB additional diskspace for the ephemeris-files"
+	fi
+}
diff --git a/app-misc/astrolog/metadata.xml b/app-misc/astrolog/metadata.xml
index 85e4ed814fa2..41cdaf139913 100644
--- a/app-misc/astrolog/metadata.xml
+++ b/app-misc/astrolog/metadata.xml
@@ -1,5 +1,8 @@
 <?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">CruiserOne/Astrolog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/binwalk/binwalk-2.4.2.ebuild b/app-misc/binwalk/binwalk-2.4.2.ebuild
index b0874ff39ee8..5088d07f539f 100644
--- a/app-misc/binwalk/binwalk-2.4.2.ebuild
+++ b/app-misc/binwalk/binwalk-2.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OSPG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 8929383ff6b7..41d2ad9dfb62 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -1,27 +1,28 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.4.8.crate 51510 BLAKE2B a9071c5242682a56015f8f4df6464c7c77c7cc68dcae9d49b14ad0e55ad12ae8084fa8e8c7f216888e99f8fee9b53d777219c4a9ca127f2a7685f0896ed835ff SHA512 983cb6a69351af82c597ed4ca85f77a475fad2c6cb6faf57962141432defa00f58b06ce191f9ca8652bfd05f7d029e116e296c37d3c927d33031c2faaf7f5562
+DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 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 ansi_colours-1.2.2.crate 21374 BLAKE2B a5ca621a12070686d531b1053eb2f7c01ee848a8c5f10469011d4ebb7b92d9b4d5ad9a569dc7bdcbc127e572e58f2e80af4154080014b02164941a8b115ed867 SHA512 077a6ddb4b44f79aebc704128804bcfe549b5c68a75d0d57452250b91cc02cd3784c25a93f061bae6060bff3eb02bb8a88fdf46ef6128a843eff4b0e84f7c972
-DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
+DIST ansi_colours-1.2.3.crate 21802 BLAKE2B 62a3d0ac0e94ebbbf20c35665217d3a00501ab048d08e64ef57197138027ac711837526dcfd5c40c1f22f2afa424d60cdfa914b65191aa205c6ada54ea46383e SHA512 6c11188b9cdf7c136ceaa9fddf0ad3cc7b15d792beda70aa02236d076d44e06db64efe6fa2bd40c072d9f149c26ad142b1e97c09ac2285ed59838dae98f8dd87
 DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
-DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
+DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
 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-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
 DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
-DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
+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-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+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 anyhow-1.0.82.crate 45361 BLAKE2B 558bac4de847a432fc80427e7be4e78cae4b01c4da852eae2121416af4d7e6ddeaeffd7de9bb69e55340b9a228436b975fdea88e380391a77c782a3776b835dd SHA512 e0d25a8c0b9c45e1db2072618097aff3908f70bfcbf0963d3c9dd9c97be27a85c4a763c5cb74e1ccd1b0a2059360e0879df4be80e10e58e0a5346b65f4fa1a69
+DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST argh-0.1.12.crate 26411 BLAKE2B 042924cfc27024e2367e879d90f390fd507c1e68dce82e35e38b1d6277c439b305de935aec74db17f704c7f333a65a85bf45d49a7af12fdd2c7b2b5639edf0ee SHA512 c8e1277ffe9161ba0a22985dbae5d19b493b54bc5c5af8a50261a67c1ce546963c069328784232192933246720acc0c2b59c87c74b4cafc25e8302970df115a1
 DIST argh_derive-0.1.12.crate 21575 BLAKE2B beb4031b1bee2e985250c130fa122749bbe7b85f68d5979569e06311a3d8b41e6dbc6605ed2bd56582632f21b6db54095dbc85620921bc67cab38f4ed3908c15 SHA512 c5ec82f66f5ab442c57fba285e5f23a20dc12d3c4af13bb7a419b504a8eb03313de4d0ea2ecc174716f75c46c100d192641cac7528351ddb683bf1788891c459
 DIST argh_shared-0.1.12.crate 5129 BLAKE2B 76421b45a493b15563a77b763a89420841101c21a4f93153127a834971daedc484dc0f63f39887a3ef6f062dc936b1c19310596fa342fda29777074d38be4799 SHA512 96fe841c182366ef809051a9c4db914e8762fdd78ed86b08fb3068fcb3b991b87ae3a452f6896686284c0828201960e889e975a3035ad969e4a0b031858af164
 DIST arrayref-0.3.7.crate 9620 BLAKE2B 69d25ca9c15c188ca954a862f320869a448a5d8ed5765a6fc26309abb030e1d846d12800d960c8a97aa3ab422e8d2b883bd154781ed219a858e02b20cc803613 SHA512 dcf1c7de6d1d4b921e26a39cd70070bd460cd27f0a38be9099e41fc8b05fb60ba4f9aa91f92401cdcd0847bad08bffa7db4dca8d7cc84a3c8a1416d1758838ce
+DIST arrayref-0.3.8.crate 10279 BLAKE2B f77ff13afd788ce0f30c2959ac03079e8cb5a225f55ce647fc14604b5775d4d3aa70324cb3a0fe3ca35e6c43a8c64282dfd9869a497fbf4ddbad16b606db275b SHA512 27a1b5688327a45358cc62df868835e7da7276c73e853130c41c9f6d9f95822780f159c6e7d1fa10848ba30fed8e173a1d8949630f18a828c3009de342be21dc
 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
-DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
@@ -30,65 +31,68 @@ DIST bet-1.0.3.crate 7835 BLAKE2B 2c96628e866cb39cc6b671e48d6935172f7bc3e230eb55
 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.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 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.39.0.tar.gz 12917263 BLAKE2B 97648724f42b7b2619191b3090715fb77602e0c4962ed0239450a1a9abdbafe4bf3f79a6ea67dce6477f1573553b470cbfc8f68c6cad98dbc820737a390033a5 SHA512 f3aaa89a83296c5b31433b6e0cde739ec165b2e218191b003c04f1ee3069dafdaee6faaae025d3ab917e1948200c1b88541a0a1d9abbe1e2b2b738d3d0138678
 DIST broot-1.39.1.tar.gz 12917870 BLAKE2B 762aa81fbc2efbc0fe4d240b2c1083c302edd730e54f479d57e4ea493fb4b7142cf95022b90680fb1d1a89065da7b2fa8978508d5b348b12d870ec1064aade4c SHA512 06e906a965b7193436774a27dc56fe54b4f83fd1041870a15fa0aaf4e6d3a2548475140e3dd1b4785621d82070fe1355a4e26abf96ab000c1436687144353501
 DIST broot-1.40.0.tar.gz 13906654 BLAKE2B 46c182da0165ef25f3f880980828ec5cd5f3ac662d7283ceeef90ce180d48f9af6163035ff92ef746af2316b64a33cf202f60712a3750d0ed367753eca535c9c SHA512 f532916557fdec8d4bcac76fdea0f121a14e7e96050fd4fa8468e43b25a23bacd41c7f6c86d1d65f4be7eeb83573f74aaf40553aab1d1759f8a63d7fe5071401
 DIST broot-1.41.1.tar.gz 13908821 BLAKE2B ab13eb252b5174e21011c9b0182ae508b2f7319bda66bcebf6128513b208bb7b4c4010e811c1f9f36b2bfbb4c5c62666885282a75247ccdbbce9325a69d8fd59 SHA512 8c87f59bb8d6b3b87418c1dc5b3f0f78a3d663e7bbd4dc4aa409467411bf1dfc4dcb77a5e9026aa3c549d0d3c7574d8a5f4a10576e6a35147681d2e0c4a58c9f
+DIST broot-1.42.0.tar.gz 13911224 BLAKE2B 2f1c4429227eb6add7d78def5f52024ec1a76cb586cd596fa5b1ae10ab8854840066611e31c2c5ec99c3b782e09efd1a882e46a96bf415648e0b8ad3e2d0c6ab SHA512 5a43be1e2fe4e856ba005a5142e3f279a9c86efa2fd0a50ea02e94d9a06b16d50411a38b47aed114b6a1c9df4f886f6839f9a274db942621c03503a5d5e8a595
+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 bytemuck-1.15.0.crate 47672 BLAKE2B 49f2d92cfd5abfbe3fd94e7e4c9a3d4ac22c67b58e73947f461cf8e5022738b7d38c790de2a1717b731d658f1646066bee2f936a1575e2995e6de39d20f918b2 SHA512 5b6886f252945449c4546c181bbb6c95597e498aba6b1faf81c5a4af69bcb9e3e024d7d6e849d347682e8ca72ecaa9a70d13fb06c174e17846f0c85bb4810433
 DIST bytemuck-1.16.1.crate 48321 BLAKE2B ae8525a829a2c981200dfbc17de7f2a4e14fc6df71328c1a62b27dfa7488fdf634b4a6f45e65104bc45b828a91d3d0a70d06e9dd4c61dcba18db09204a22a6f2 SHA512 ba9e5eaae4d4d5ffd654da0359cdb5e85ad2d111b26a3b5147bae69519963ae3118ebe2afd34e92305cad3b3e573cd5aaf175c3bf81e94126f65ca3c9320b9dd
+DIST bytemuck-1.16.3.crate 49539 BLAKE2B 5e9a4c9e5bb1ec5398670edad455fa54b08955b48390d784c29c7ba153db4d0fb25c4d14f445ed28c443379a761354b1d9eb8c9c6e2a2930f5fb3f9085ad45b2 SHA512 17bf35d082c8009ce6ae24ae681715d8fd303f728f9bb2a0702096fd8635b5e7294eeea5375217a8276ba6136a16f94eb670c5d5baba9020674dc958173342f8
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST cc-1.0.104.crate 79710 BLAKE2B 67248278ef46eada183d63377fc66ad83244c906b4a7d26a8363cc1e88dabb13e894ceaeb1c02f0444a0d7d2d2bc92075689b17de990348ec61e855ac473e97f SHA512 b8c9a3dcc685fd7c962f59ff96e1d60ee0bce290d9019d9d3035f49ac4d2806708a3266985e8d2e6fa8c9b36bcde8272b5ed7a6b258cbb8dc4cebeed69eb3b15
-DIST cc-1.0.95.crate 76485 BLAKE2B fb86d2c49e9ee73f1a7f9268274a879260b13adafa49c8bd4bcd4acb77861b7b65c5cdda988877e1ad2d4a4eee52308ddc29b545a07cf90cdcf10268ce639986 SHA512 7e19d1c2271a094311db96edc6faa6576366070dc2e77a666ce43016c367d5a94e832724b95b170650bdb16998699699e45d3ac2cd0eda6655c58c1e141d40d1
+DIST cc-1.1.12.crate 82696 BLAKE2B 3bdb52494182e803c8abc24dfdbb269f3e1267902aa0741b4e780e14db3db3ccaf69b25472d71edb892092e2b623cc2d658608bd86fe31a10794ffd5b70240d6 SHA512 168327f14ccc442df55a59f96fdc7b8a5241581e4a80d6dc76037893293c9fbb8ad4c77e771b4cc77bd5d058c8e280ce73b253dfc66481df132d3c2d763d8ef9
 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 char_reader-0.1.1.crate 4896 BLAKE2B 8b13d1b09a2a9f7f323e82c5ff2920be3ebce1429a2789f663f7e7c75ff374bfd15af115832f80b71a6d62e58d6f248d7020d3f48f19213c8bf41081a3a76f49 SHA512 4608b588620848333bec37a45a8cd605a935bd56d2a1fa5ea819f16aa32305aba7325af02ea3ab6821f6e981beac4e62c59d745a7f2f869573b90cb79b3c3d2d
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
-DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
+DIST clap-4.5.15.crate 56612 BLAKE2B f5f34a6d3e84731de7dc1b54d8576e8e9e573fa1381e9bbcba8e2b66f8cc693ce51c7a876c34705ed705de7a793bfd2f4922fb86f8764adb7a4dacd03af06ff7 SHA512 a0bd102065cb29eb565e65408ce5bf37e3404b7496959614d10ff2f9bb2e29c1abf8f5a3716aa85994a49bce4ac12d63586c8ec8187c0d3a6f696a4804fb446b
 DIST clap-4.5.8.crate 56338 BLAKE2B d8f07ac09b59f631047a54b0b9918d18d264508d5ba173c9895fc613102b0cfbbc76b89e58abafb43c1fde7dfa129f3a0b478219c3984eb41af6efd3ae138ff9 SHA512 cbfdb79e8020b72c618dcc2d554e41224f4995b6c47512c8406137aeb2df971a29fa198e504254b758c7b87bb2f2ea3cafc542f412d747744abf25a334ed6cb7
 DIST clap-help-1.2.0.crate 614844 BLAKE2B eea06778b6c78ac58ba4d206098dc3dca8157afb4b53b6f379925f246783e810be7bf0408b4bfef807df2c52f38d4b78658b9fb3c27a2c1d3791d5ef77a5e5d9 SHA512 38ccaaabcb89966d85347764a53fbf3764f84fb9d8b69cf9509310cd37c62d4915a99af8f34372281fec557b30ff23163bc776450d711c84a0ff0da66a4d774f
-DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
+DIST clap-help-1.3.0.crate 621107 BLAKE2B d2802b65153f861ccf9c7d7299fde0e6e51722c09aacdd27a5d46fe0341c883c10c3a27496b3d9a368d67fcf83e750c2a26ced0bfc6bf6748397433ed5ea1f04 SHA512 45bfd60e314725d3833a5e1397c84a85ae08f60e8df859ac30324ef24c79be71999c97e6130e45712d194f26970b8bb4ce7d9f5fb721d61a83e1142ba40876a5
+DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
 DIST clap_builder-4.5.8.crate 163870 BLAKE2B 291af36cff2cf7c97cf0b6b58843ebc8a590efcffefd8fadf0db1a1689ded94b2288fd40bfaebdcc827e50f081f8aa1758c4cbf2b5bb9f666e0cf66091fb8896 SHA512 9b0f422369086be254a7034e96d2bd5fc496da9d8be55d962528f765a5e77f003a048deb84569319d4e424abdaa3c653bdff2897fa393e7d34c1ff90a99c4eea
-DIST clap_complete-4.5.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3
+DIST clap_complete-4.5.16.crate 49011 BLAKE2B 01ecd71cbccb5fe9f99ee942aa234581aecf5fb59a79eb4e110a71b1822055217fa13f239a3270836622f556d752f3c252682a416efc967a9821a2b8fbab6e8b SHA512 7d8176816f036192e41e3bf2197395ed746d3caa5006393d0e3f7290dc835db146c506d3975d67081826464165e1dbfbb90fa39bf8d0661d51c2e0f5ccded2ce
 DIST clap_complete-4.5.7.crate 38833 BLAKE2B d3028583ac233da8a47e9dad776f551e1e9b1b884337f35e7632e84a84d75968fa32f40fc0c08709661b6e9f1f536032228030b01c545553a3e0d9b6bf202a94 SHA512 9cc3a1a93e0f42174d4e7d03c628f48f94a9398527c85a5e52a915020998c8daa7ed656d3bf4b85137a7f5b5a7d8d08e17d3f5776f1d6d983d3979bc940583c8
-DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea42d9df9af26b5234ccde23175180efe21df93513df49f6ba83e46cc85cedcead29c902e426c39b25086c9f79a51c SHA512 670411136c819577c0129c6fcf5a8216cac82a47ae11ce3cd97cffd038644e06c5a21f7a69948628f01fb77f1e656678ffbfe441385866fdf90d247bda036c4d
+DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_derive-4.5.8.crate 30024 BLAKE2B 3d2d7e3652c6e16329a0897b985288d8beb6c68051d3f6216e75c6aa98a773d2cf609c1df82df7ab2b5f43c62c8a028da29ff1e314cbde096376bd43ff6b3b70 SHA512 587b63b99ad47b6902094d40ee4cea6c4e1d547e11fa50095b007a8495b11b25b3b6ef37583526938a56103982aac7d2addda833d2323545b753a852fc830b43
-DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
 DIST clap_lex-0.7.1.crate 12766 BLAKE2B e0e3a1a4a65bf9df3c21753f9298a7461046e6b34c7a8d26521efc551ef3511a7d202f25ebdddf285ff68c4073364f48cf739ff0bda32f41d4fd0c87c4cf02fb SHA512 4cdede5eb9fa527567e9f3f94fd8fe7e1022d9e9236e78d30b3068befbaadedd778b5464f800e74bf187c44af9df582365f4d41a0113f8ab0fe9abc936171fc2
-DIST clap_mangen-0.2.20.crate 14861 BLAKE2B 68fc1a18d0c2df088b4c11ba2bd4de73b8d272f888f9c1e7da73493012bab26a47cf178769fa657e4b893bd11eeda038135dd7a606a31b86e03bbbe57422deb5 SHA512 f651d0c044cea804c469a59a6f4e3024546cd018d73aa4dedc4f2ddd78c04fe0cf6790d442fc16968146068cd61c685819e5f39fef6320aeaf6dc210f61582c2
+DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clap_mangen-0.2.22.crate 15699 BLAKE2B 8c2d3e9b02466fcec671b6e0f57d1f4bb4a576e055f9bddf8950386a88382f1a97a7aa398038cf6cdb8ba348983e6226278fa5f21454dabb7da85f5c91de245c SHA512 7abb55db27671391575bb7a0ee284a601938fd69e7a8e34c03f335fccdb1efcbf290e5ecb2f44d5dd0bf146ebd862e704f050aee940597df27181ba5434c54e8
+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 clipboard-win-4.5.0.crate 13476 BLAKE2B bfe3e9c21d58e0001b85c69d724b03b2bc7128fe67420948dffe0b9709504924339c93b5acc2a572a7780bb1adcb51ab10ac172b972c26d325f3ceb7f7f6dde7 SHA512 2dfaf30119eb77c9f069310417f11e836e158ba43f988ff49f79647f5fe44bacf7e28dcc11ba2cd95389c685a69be0f5ef8b033ef09b94c9a3e484952e891d8e
 DIST clipboard_macos-0.1.0.crate 5958 BLAKE2B b16b41b412ebe1ad59bab48e43f394bcfde683f73827e43b2ac52f43dbdad354181c9ae3f69bf948791c014be86aad20503f44154cee0a8307012397a0562dff SHA512 a63800826ff680e24fd60cb77945dafa19feffca2a99a2f5ce9bdaf19856bfc628b4ceca5d28a30d0b6db69b18bde16634a7291817aa10421ad8ead566614f8a
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
-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.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST coolor-0.9.0.crate 135277 BLAKE2B fbda445db5f544355d7938e2ecfc5b1c5b3ad62d629e82c91eadac6cd8cdd14e5513782a5249438e4dd160e710be3aa2db1d0b16320ec0f036db7600921bcbb5 SHA512 d4fee108b66bf4520f9343f11e05574611db58103ffe842ed6749d3252a74d8002760a0958c06538273f8feaabd6058949a2144c8e6342c0a397e52513ac3873
+DIST coolor-1.0.0.crate 136158 BLAKE2B 8eede79721280cb750f5df114d4372b288cd3ca58ee0e1b13a1bc8627d313c95790bca5b7b4646448e56e39480b634a731b32a966b806420194ff732c38c2f19 SHA512 70c817b806ad06521275b9f873c75a53c3dfe32e67af41b54f997c24466ceb47e414baf6f418be6f69d0362818c6dbc0b71bf13e0ab9cdc7bcbf7144a895a41f
 DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
-DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
+DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
-DIST crokey-1.0.0.crate 38315 BLAKE2B 169270b04f6a6e4a1fa3b576859b0fd344f0108001fc46dd3af1450ccdd0f28b9a4d29138d12d683287ece191af9aaef6a0b4edaa4198f31c73aba0151df4d30 SHA512 08526afcd3305713273ffd7280646f60c6005ad742b57dfb5a552892919816fde97dbf97a4bf87709e24f02373cbfbf64c2d33f1b26b7fe7d451f73b94be1489
 DIST crokey-1.0.1.crate 38306 BLAKE2B a08fd03c8c890cca930896f4f8e16706268b0cae3d55f8336e208d32dbb810e534a2b82145ef6448e6da2b8c4a590655bedc6041617a5221e315b45f4b1c7912 SHA512 4bfa9a800476f4ebce5a1c4bdcd13545ad94f27a6ba75e0d36d5aeae2ed61c7ca86f024b611f57a81e9325dd2bcd22155fd0301347c46febb633105b39ef06ec
-DIST crokey-proc_macros-0.6.4.crate 3124 BLAKE2B 21cc60f7e091241376275192cf35981e8d6db4984fb3a9319946ba6e3af5628023f9fa17faa63364805478815857e3fd602faa038c44b8c531d76ee520e0d55e SHA512 ec09593fad99e3b33c763d443e1debff9af74abf13a827cf94989f60cdfae8598d851aeba516f51bd4833134b0940358238fb41d1d2d6a33a3dad7cebcf1c36f
+DIST crokey-1.1.0.crate 39117 BLAKE2B df3736efdac479f909084f58ea90dc6313f86845b0080c7d75906640eea8da1f4292f69a0a5648954e14252c7dc4723e787e6387b88513c6da012d4bc6bd30ee SHA512 c8282c5729c47764c11526a2e3d3f82c10cfe74b82ac05097017f06ce6f9fd6d92dd153aba653a251e85b08a4bff6d9d83aa51b122ae4ae0965beb7337f58a38
 DIST crokey-proc_macros-1.0.1.crate 3121 BLAKE2B d2d97d48b27616d3de313df4aafd016e30d7b00c82fa8240cae468221b66575152644074bebc66742aef53210af30982a54781989c176488b121c4232d7eb4c5 SHA512 0b45cc4c0d172f310acdd07ea3be9afc9e8923c2988c8f750759c499a1e80d382d020f01a6c8ecfbef91a9c2d86dc72f8af21316d1f8719e483957967e380e46
+DIST crokey-proc_macros-1.1.0.crate 3174 BLAKE2B d3f28290df9e97109f0f0c06feec8311d521325c0c5593730a62ef5335614bb37e7681d74497d3b953cff1d5388f731ecfce7cf34373021f831c2aa042435544 SHA512 cd2c50b773e1c20a01604d0364fbc3e0493f748cdaaaa659148407dc4a0d707df2de868f5619788fdf72fdadde0da0a7035469d53aaa160be6f64a393337c5f1
 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 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 csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a8898dd49bcc8bb7430d25727a03430c32ec23cc44ced043709de1f80f4d750e335bd12b22d0b06050881c6 SHA512 1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed
 DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee
 DIST csv2svg-0.2.2.crate 168459 BLAKE2B 48f02f331cb21abaffaacf27107b09ca139b86841e1dd04c74bbe0c0cb2a77de0ed1eb5f189313ee33dab8d0b17aec83cc6a1900df50bff09c461e60dd263a06 SHA512 e7fc9e317875e46ac599c97878725302048d023175c8fdfaf2caf9d2d4bf6ef1ed9244046d1b5015416afd96bc866b171cf05251f6bc877a2f221f2c3723244e
+DIST csv2svg-0.2.3.crate 168567 BLAKE2B af628e9750ed423ac73bc27a55e8fa092a6175d677905a1ad41214b75d6aebbb48fc3fb7bc2d8de67b710a5ed5f41e08464e4d5c5f5712e0beb9d04621d85df0 SHA512 0a2b753b64e5a72fc73050d246394561d9bad945b761ff3ecddd7592f7a5b0c81f033c9db8aff5d0f9d16b7f01198a81e4f0cf433ce264eaf01f68cbe60059ed
 DIST custom_error-1.9.2.crate 10826 BLAKE2B 24186a381d6df9d0262e123208f8bfda21dadded4fada889aea627c07e9812f8b16ce383dcd4ffed87f8a71a06bd92ea2ef12a0f835c67a82a436f9078c53f6b SHA512 6e91d3b1f82f7bcc5d4f3d22aa1f3cef150be130bf6f7785eee7511b8f6581384d82f532049570aed76278486ecee17d9896e1da9d3fce18d54b189fcb0a3984
 DIST data-url-0.3.1.crate 21109 BLAKE2B 70c8616c6b3cf16da70a8fe3e8c6752bff3dc7d9e1aaf593617ddf191f31b1187b41ba6491581488b4dc9db1e2fc944035af9fb1acb6320de0ccb2ae7f13373f SHA512 cd13b3da27b20d5b16dff797b67323bb09f12f8582724ce9dbe18dc668a5c77b429ac9d9563be2112368f7067e7694653cbb2aae1c3aa897892c404822a079bb
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
@@ -98,41 +102,43 @@ DIST directories-5.0.1.crate 15833 BLAKE2B 2348af89efae3020f901bc6d97a42028c12d3
 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 doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
 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.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST error-code-2.3.1.crate 5324 BLAKE2B 3e6c18560c4f30d9fa8e5487453432b220b88acf59a421d2c2ec29bd77bba75ad8bca63e99d384442c7d458b5936dcae149897c2b0c57ad6e621f9b7928b2331 SHA512 a3953c854f7fba48dc34c35ca841d6f0671e8bde19f5dc36cbdc167fcc7c22c143dcd071a35c1866f5bbf05cedcdbcba3f1902d93aa21d19993b426c458af46e
 DIST exr-1.72.0.crate 243996 BLAKE2B 53797775fef4e8cd520f4a98d390453b36f9500dbe999a631a54d906476f82a7a975bde0a369116a997db5e383c846de9a7bf4330c68ea7ec2c9e44e4856aaf0 SHA512 eeab15189ca6801d3b3748c88395de9d2a3fd970f182f70bd39ff7dbc960bd27d06191a42d1a5cb895a334787f18dd3ff31af74d223419e1845396a5f696dd1c
 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
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
 DIST file-size-1.0.3.crate 1819 BLAKE2B 6bab7dd8da03815b1f98d5dc16cac8a54da6e9fbc441bf6b2735cee95f138c566237100736eb99855d9ae951dace57a0d84556a7d252bcbf1f1eec16e9acdabe SHA512 2fb1289b4ec3b092fb260f93356a35a1714ca0aa9fb0a3b0e7b626e8a5f1d2998165799ec3ee5a07f4c7beacf19ca9d94f0787e2305c8137643509693462ae67
-DIST flate2-1.0.29.crate 75501 BLAKE2B cd108894970dd777575032a292ee2aa26a2cfd4f20ad776510bbac4f6ddcdcb377f3bd3c3f96816b6c63e33e390f1b033fd09656bbe5873071a05616fa635060 SHA512 eeb0cd138e8a6489cf4ef8c668d2e4d2f77a9b7551cc0bfb5b99debba4749ae1eafd2c35da5bc5d8600803001eb8c754d573725b609b182422cd4bf86be1b055
 DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
+DIST flate2-1.0.31.crate 108176 BLAKE2B 2b0afbeec9ef08e54bfc572d7a386052d519d5bdeb220a316b67409403d229425580e33991f0a98536e6468f0e59ca87b59ff2d00425749336d4e68906d5d787 SHA512 b211254e15b38663f080552598d61d6766d6e7abc45cbac8fbdb5af65b833d2d3fbc00b5748ee12d4fc71726ab84dda9da20b6916121735c7b1c6c9d7a09fa61
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST flume-0.11.0.crate 67502 BLAKE2B aadebeda44f899b6290df4ccddfc0fc49c4e55709243e9b1eb26b6a232aee042d2260c9b504d554551be54ad4e4ae1b1dc6ee861fee0cbb6eb92fbebb5a7d9ad SHA512 29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fontconfig-parser-0.5.6.crate 39300 BLAKE2B d919f290d09bcfd37b790c03b301dead637543082952339394504b6de9eec2baa27fb79d08cd782b318bd8662df100e40284e929940aec94be551de332d886b4 SHA512 8d58fa2db0d6444025841d460ef3703ed1ff4bab9a7399df9830b8c13155633932e90684530ceb85a6d0803bf8a15f1647650158e5b8aa6288e4300b5201319d
+DIST fontconfig-parser-0.5.7.crate 39564 BLAKE2B 315be3d94b4c46bab60fb40b9b48d1bda134ba4018e5392eb9937896ea8f79098f771942988d4157fbbf5cb4af8f5739abab96b79c67389f14142f24ae3061dc SHA512 0e4ee78ecd12d891492d2132778649460c3a1e553ae67245581677e28b2b813f4303599b64461c2a7a47957591e577ec863fa4365e3f277b8a7f6753332583e0
 DIST fontdb-0.15.0.crate 107284 BLAKE2B d8562cbd37a15e3769be73fe2f8854b92b5980d829e61b14354e7eb37905264dea727e44b03fe60dc9171a8d1696638974bb54667a499d980aa765448478875f SHA512 40a9c4217369d6e80d5aad0dc7eaa78c1c2dde5e92b9c9dab6f0eb77b5a268323a4458c369e1bb98ae2c2765482d5b2d8d751ed879942ace1fde475350e1a2c3
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST gethostname-0.3.0.crate 8440 BLAKE2B a8598187c628c15bb74739d3a8033ac6b33194433ea13f0af9ddc8b455305a35933218d3ee7bc5133a1908b172b7ef3f9cfd361e1951041bdb85d67a68dd3bac SHA512 1655174eb6713d40519f70f487dc6dc65f93f03f84f9289bd1781587c06692823fa0e97f5f821938680d47ea9680cd127e0b9ffa8863f730c39abe9fe0a0f741
-DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST gif-0.12.0.crate 634734 BLAKE2B 067baacc4a10ad1d992aadecb578034bc820ff2470eb2fe1b63212584ae1f73fb6febe3652a309a3931fc6fc6823533af2c3d567414925118c5086970a09bdf3 SHA512 9cee5c4f68b02252f6214fccabda29087c89cadd8408df4fb6b9479da7958a9759dfc4b13ad2bc7e1447be9050cea6d3757d891b774a7e6fe8c6fd25bca3b74a
 DIST gif-0.13.1.crate 36408 BLAKE2B f2544552c177a4e33440b05a949f6b205d3dda1afcb7e6574c92ed9d31cdb3bf536e1914186730bd8777e1c10d86466dffbee34d975884f0125a1dfcce937bda SHA512 7e76ee111c6a94763c4dfe01faf4cb0b5272d5041e2b2b8f4db666debf647e192b963c6fb3228cdde28e1d112830c2aa31eaf0551d712ea9963e41e47e26fb26
 DIST git2-0.14.4.crate 196849 BLAKE2B 020e8c87fedb49fcf38727a8c0abc975dce2b70dfcb1db996e526967bd71455be8f81ed7d7e58d56e584f34adcfa2aaad7765d262b2d4899370ed9e0a7e2175d SHA512 05a5894eb90e5371525222f69321c2376f6b8e0306a04ff05a9917005ca77a86b6100ec19338e47265599f3a61603511991ea8664e7c64702a580841ef98963a
+DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST glassbench-0.4.1.crate 1256770 BLAKE2B ff66d3326c9b6fdfdb2b8daf5a9d2601d72d52ccfd5fa22714aff1303ea715240771078b25495668d09a5e7d319253acbeb232aa73833f20aa46dcd8185b8e32 SHA512 33b5d0cc2e460ed5996b75e198e28b641af5fe251f96eb4782838dc868402161db9280c2ea396322a84843ec8f02bac643df9b3ddd4cb803cab3a78a044b5e7e
+DIST glassbench-0.4.3.crate 1256841 BLAKE2B fe9a9d62aa5a037b1d3361007c73b333cc8452a74161f5107dc5272b43112d6baad66196cbf464920701109fb9b662adae827d6289147269c86df171e2b0b566 SHA512 2d1da07ac27fabd69a401ae0f40b6d01ae3a8756a1c8c18c99a89cf8403f98b7db704810de9f497ec34aa139963259d558a1cf826a601fa0d615eaf39d98cfe9
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 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.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hashlink-0.6.0.crate 24952 BLAKE2B 3bc2588dd7ab04a9f49a1bfcdb633c09cd4031177d104ef4ead0caf8d3352383f60b3550bdead591bf21bbbdc097407d4de2525fbd3012d0772c40b9413162b2 SHA512 bd019fb982f8521b818d2862b739b489539d7e15d6ffbddc0c6a11a9611c9e0eaada767f3d9c9b8a966dc0c408b8cb475298fc97c7f6afcdedbd6e8cfb5e4df9
+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 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-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
@@ -140,58 +146,56 @@ DIST id-arena-2.2.1.crate 12203 BLAKE2B d5cf0da97a7d95e57f2281f7ca64bc1f58578e47
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST image-0.24.9.crate 9261055 BLAKE2B b4d95a88fa2fdca01e5d89ba9975be22269e3a5d90d24bc31d5f1168007508a0337d0acc5347be012c2b98de02e4f481a573f012f47a1f1e365d26d89df236d8 SHA512 3f858efceeed54e21543eee065ca6008f40c568e1ece1016b38040eff5625c9fb6de77c7e950c08c9e82b9fcbd4c4ec2f8c4c1157ed5d232bc8e35b4850420d2
 DIST imagesize-0.12.0.crate 15747 BLAKE2B 062e1d4687d7dc4cac719c7ed1b341452e2134e06ba457e0032eb61c30d47393912fcb115421ff5edcce39b05118df522da2f2cfd5ee0adb9c158ca5fbd337b5 SHA512 192bd4820e7fcc78ad906c4d9edeb392701206b8e7043e78d7bb90458f2187e1f746e37adcdbebee90c08e58cafc0f48eed7ab055699c65da0578e6dbc36433d
-DIST include_dir-0.7.3.crate 6046 BLAKE2B 330bfb1d2cd10d95627cda48f8671ca3aaa36a14d6ccab1fbf08f53054a4401d18114896c39de9ff3e13a77d8fdc227a5415001517448cfe3676614e401f7f61 SHA512 875a03eee6f5b3d5b5eb028868fa5fcb8fdd4b84b1136b705cefcfefd28a4149142b46bd893655c66fa3867c779ba2e11f1e2750cdde253104ee8df4bccd9972
 DIST include_dir-0.7.4.crate 6365 BLAKE2B d45532b0a9eca58ca63b404011b2943f799cf84c6d4757f3972c13b460cf9ab5e92aa7c91346b252e057a4eadb948f1cbfee8906639e2b467ba1d9c72e70d683 SHA512 32168a809ad3e97db0cfa28d3e30651f8d69d22f1b7152f35c998ff155663ebf7573b47acb9a21fe5c62fa345cdf8ccb6321863ddc1205c844f4e454c1cf38ad
-DIST include_dir_macros-0.7.3.crate 3700 BLAKE2B 70c53cacf361b5a5339ad63291fc76c4e43c9eb2e93d14a53e37971ad51f44e872087c56e6c4027deb2f94cb96aabf6184643546ee9bf3ee291d8c8686c900a1 SHA512 39d38dbe1835456578a5ada9465fcfe00e37433484e8b109b037977eee50b167dac60879666256af2057269669ce9d32213b1b0d25b9a50af52c4906f9914f24
 DIST include_dir_macros-0.7.4.crate 4560 BLAKE2B 367dcc23a000e638ae06cb9e9690cc24bcbdba06d3d1e99eba806357d796d460d23eef8ea5208f4385808501a9a53f2d35bfea1e03dac197e5399a005e8bac89 SHA512 c8255e4c053e33cf8c33876709afd259350011934835e04ace95614a703840219727a46a318cd143b4e9606f969f498be1b45ed0a47d7000a64ab91f8e1bebd7
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
 DIST is_executable-1.0.1.crate 9550 BLAKE2B 64fbfd2805b9e7a2498a59bd1ff924f84a42c5f1061ba59e7d3cd72cbecb394272c3f9af101f838c7a6a636746d8ed3b7f698c5720857675c58127cec9846d81 SHA512 677980983db2c8ed72e87a2f2df3bac328dc6ba6dba6c3e8c4e4eaa7b8fee160ef4e81d105f65ed718fb7263137ffdb21d86b148f614f04fb9e24201417c8a29
 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.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jobserver-0.1.31.crate 27306 BLAKE2B 08ed4a90dfdad5bd7d67b8e15cf61bccb4a9669dfe4a479680c481e7066c70d833cd199b56a4ce7d1180cc9fef565d0afe722a13a436b86326cdfc8c10fb0424 SHA512 0488e5eafc5a99583d4626ae8900d49082aa09228b35a8992d8e715b5a39aade47f51562dc4db8ac41305e069988c4c63e1c78e92d65561e3e8a09d4dfa5fe25
+DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
 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 kurbo-0.9.5.crate 108513 BLAKE2B e354dfffefcda08da6b4e4b2048b9aef9b0f6f9aeac5b35e1ccfe540b947733e7cf824e4fc701896216d5a2895b7e18fa3ab562262a9e3f0f874194e46bd629b SHA512 2f145fd6ee686fbf7156bcd201ff66b6e92c15eb673fe1e3bd49a1f8d89e2b32c944d090d866a4d818fe54a3197d6a805504562a3df835c477aebab2d18e771d
 DIST lazy-regex-3.1.0.crate 6283 BLAKE2B cd516aeb9f5ccba2259a08df1e7239a0692c438006c988dfa182753f982d05640751c57ea9bb42d24a0c4bb5b238fb67d34d8aa055995f68b0d67cb89d4728fb SHA512 da138f549ebc50705a145859f83c60298e9c8e07ab3f3386bed2505fdfe7f52b89d3072a17d99c942681b839395973c2d232b4bb527976e6cb64913a7f41b63d
 DIST lazy-regex-3.2.0.crate 7547 BLAKE2B 32bb7ab3f9b0790092e63c9603ad87bab1c5a86fa03a30bb8298ad866ad4f7f9498e01c1d2e1c08a777506e3bae99518333e2aac8e6293c649596e2bede09b1f SHA512 bfd91441644e382756541eb7719a325def0807fe18f44d785255fd458b457312c554d79008b21f0a7a4cb56168f4295d4fcbf43de57131c523b115f0974d91f5
 DIST lazy-regex-proc_macros-3.1.0.crate 4490 BLAKE2B ed39d0e5634776f55ed43e37eaca5ff3cc413bcb582eadab700d520236b510944b7c42a52f3bd1d50ea31f6ce747c21cf767cbaffacc22b1cf401c4e8e83c6aa SHA512 2dfd9f679f394d8801d70363c2be93a8cdd86b739c41805a2f82ad2bdcb06afa606d0d3f343fad5301c8d1165564568bae64d0cc8ab7c4bc684392d4c85397dc
 DIST lazy-regex-proc_macros-3.2.0.crate 5665 BLAKE2B 1762b13c0533622b3811a4adffe51e8834cfead74434c108c9af15ff953599f0d216498ce7ff6ae9341da86fc7c83e45cab12df25d04546316576f93c33c68ba SHA512 401d5d086d9c65dcf49934cec9cb882fbe9f30840384c839405bc261ccdb89ee2dc15a6ee97914bf8880556d3dafb2726c67c414fc2d552d087a1f47ebaff9c8
-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 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.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libgit2-sys-0.13.5+1.4.5.crate 1713465 BLAKE2B 6b27784c4ffcb5f262fda8f61f20bfb3ef3ac7680935e6a254fa59eef268cfd5990a10e79ba31428f6772f7eaad78b1657be5af5c7835c3f9e2560c02846390d SHA512 0f35f819b873113f7e1dab7074dd873bc9f2893e2ae76b35f0a5d38e54a88dc53ed1bd91aba634d8b3d84aa3cb9908b04ca807c1a6ef075ec164ff46530696f8
+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
 DIST libsqlite3-sys-0.20.1.crate 2306064 BLAKE2B 9e0276c36311a7aab2613735c13b91f8dcd77c02f98bf38bce5f84852f1139d9c8dcd077bbc6ab55560fca69b27e08d4d1a0a7ed17152465267cf1cb4477d5ef SHA512 8ba1e7c7a6a5dc11ee4a2c817879478c7e3d349b237b418edf72489a232d39904537abfa2274553b06ae2dc909f4f9e2b3d8ae91a4c75768a3215ebeb5c057d1
-DIST libz-sys-1.1.16.crate 3958920 BLAKE2B 1780cfc7181a3c33dd8f693ee93e46bf0f70c1958503e8eb866d6ecb6732c8ab7bec56397c5384d582680fdbd8762ae37ccca7063616f266c59a7eff7801c0db SHA512 1d6b65b5a5293d470cf8ed48293a6f8273828a0cdf096d286e777d438b2c4d076360b5492ee3c2c83b27605d51389e6a3eda7eaebfb09a6041a877a48540aef1
+DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a7095eea281e1496ffa5b312f632958c751d50d9051f5ad09777e23a18dec08821cf9c43a405c4ac64fbb8719820c12886b54 SHA512 4a3d16eec47c6e3e53e00232501fd50fa77f1ee1370f4ab6c984496f2f897b4acd1c15c697caa8babd635d31a946e147d5d090378615676a3b5c4a9656355016
 DIST libz-sys-1.1.18.crate 817891 BLAKE2B c05a758eeeb1063fb369c0e9de6956d398ea4755a59bb9be889a672676510ae9a8cb5f1cd5c07b45d50397bd392704f4486930433247771eed6232464ca30db1 SHA512 af7f037a4fed00ef58d49db444e4bb3dcc8e979deadd0fce8ec2120aa2da74f3ea1fff5a372fd771b037e3814fd73ea2f193606d3fb37afa9087edac5a3c1237
-DIST line-wrap-0.2.0.crate 10633 BLAKE2B 0207bc5f38e0a11168684769c8f743a77930dc48f774f3cd9653e09c92394b918bb8186cb0aaf69ef120f5439acd8f3d7baf9e2b79a77a802a9f77a6077af57d SHA512 0fdb591ffaee918e32249a83cc28b72bcabb1259b0531cc4cc2a2241f1dc4fef27af41d5e8da150b9629de025ed60d25240bbffd02f4121f355433e7dd13297c
+DIST libz-sys-1.1.19.crate 830335 BLAKE2B f17c18cc4e18387e539cb227adf5b4c41bc799954cfa9a1d8d113d5fe1f80f249a6fb4ff51db286852495b029da6972ff60da538594d8b334d91df9acedab44b SHA512 1a8c3848ea4ed78e35dba29299aca69dd1886e6a81abea21854cca9177722ab926cb11240a19efcc93a9583925435179bcb73b9bbdc62c8d32aead2e572b44e3
 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 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 malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
-DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 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.0.crate 21049 BLAKE2B 124e5fc5df81c8c77616c487592e300d184b3c0e6171759623ed280672aa578d5f2d75ef02d1d721c5e99d2c90d16f36120a5c5e6daab5524a06ecaf4e0127e7 SHA512 9dead60108d473066e7be73a9fbab654a65a3ec1dccfd2e3f1b97a81d71141d68bf2ff7a12a66411e1b7443f7f658178e33cbbfcb9f803b2939d9863867383b0
 DIST minimad-0.13.1.crate 21041 BLAKE2B 021e8b08bd0ca62ff27f106182a9282c55de7e043601036e973670dc37563e66215078b7d92503aa130f5be4c0e07f0dc87736a7259a2686aa66ff19e191226b SHA512 0e6c2a6b7176a0ff173f7f0b7015abd9aed11df1f553c6f46295555f89878aa56e7e2fef622c14a430ce04db0ddd0728dabb27aa8848faf6555d4e13ff954af2
-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 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.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
+DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST normpath-1.2.0.crate 20107 BLAKE2B 08a86e545ed8d0f1881645690c45c4a5fff438680a36778d938bda03e489706a1086e91e27429a414b5925b15be93a80d8dd2327cae28bd567a058cbec5b6c3c SHA512 a8e20301909e28d6b46ff388ac77c7b093c3654418f74955aaa185489fb859b79fa75b7cc303c0f6ef93b01efe18fa70628b1e85c123e143cbaee98eeb558e15
+DIST normpath-1.3.0.crate 20719 BLAKE2B 6f7e91bd80a6fac14fbb72e304aecb6353b05a5e970d75899b8c40313b095f79463fa4cca1f7879c11d41e2437d499247c36915075b4190054f2f9a810e1e682 SHA512 a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
-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 objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
@@ -202,7 +206,6 @@ DIST onig_sys-69.8.1.crate 638216 BLAKE2B 08d5f61f4047cfc841ee9e1881deeee49478bd
 DIST open-1.7.1.crate 6129 BLAKE2B 024657c1e17e73f1aa24921e0b6bcd11b94754cb9032dfb1aafd6e3f58e484d0f5a1b4e504febfc514dd15e947791095465d2090ac4bd7b6dc43cb38b1e63ac3 SHA512 97c064ade1c9e1329aef03cffc6dbf565a7a3c0acf41845236202b0003d4d709b769e22cef0190624c32b5b6e1506964028a4649e4bb79f1ced5ae9f954508b3
 DIST opener-0.6.1.crate 19173 BLAKE2B c235ccc8ca6f1f87a30bcf94b0014b5e1df99c6dfd942d5c3ab02f351afdc8c8fa3f7074ab87450eea939bf682d31e3a08ce90d18dcce88aefaaa7ea61425785 SHA512 bd56a5c23a3d1fc3d5828bbffc3f7df6f3d92f03cf38665587ebb5b16a716e04395ee30b239acfa8fc95f4daa67807e48d9cfcc79817f2926880832c4ea4ba2c
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
-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 pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
@@ -213,15 +216,12 @@ DIST phf_macros-0.11.2.crate 4748 BLAKE2B 643942f8e83dcf5623f3479d677ee11c7e25a8
 DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
 DIST pico-args-0.5.0.crate 11545 BLAKE2B d1247ad160bc37db36e05244772f506ee5e27c4bd75d2eb0c763c43ca304e5280350b24a818f5e470303167640a22f38ac7064afd6313fd65b14d0d3e5572817 SHA512 2d3dc5bf1ae11b0373e03698e7020c20b4e14c9aa482ff2d8e98e68ecacc5c0804152bf7d188779197da9464907bda60cf270cd6fe85e6b9fcbf29b1b82bf99e
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
-DIST plist-1.6.1.crate 47933 BLAKE2B 6b064b7b30aa6c07b31843bc548d7f38a04cbdd0d282706ff4cc1d8ccb1060891ce28c28350db86a970be9277a0f978c2c6e3283a7ceabf406c28044574fccfc SHA512 fdec4ff7d080668df45e6a26a92520f72a3fcd58638238f42603723ad0cac48ea5df41c066a19f6f6e1207263cea02c775495b1ecf6e09ef101ffdc157cccea6
 DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
 DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
-DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST proc-status-0.1.1.crate 4136 BLAKE2B b5627ca489e6235f587ddd284040db3dc60d3c8c2c7120d101a07b4e6064aa297d0838b547feea0b81d2e2b41fddeb68ffbe46b5922f8cf03b0262d5d0b9ff44 SHA512 1e01be4b3d4ab90f450a760a129e614fede75106ed595e477227925b0dbbe96adf3957d47a42b6fb61065c47f0ac71c937facdfcdb1aa3cdd4259763c89536dd
 DIST qoi-0.4.1.crate 71135 BLAKE2B 8b4e2ebfdd6df425efb1326912e8db02258e570320fdeef465aa8b03f3248cd811bedaa17c15902f851083cc1db06a2b500aeddf734345eb25af0d835300b2f0 SHA512 884cde33bfb2d02716daa5f309890093bdb7b3f53eb06aca0b6eff0b7a66fd67cb8b9acd510d19e3ae7718930add971e871532a1605e4989639bf72f59329377
-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 quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -229,41 +229,43 @@ 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 rctree-0.5.0.crate 8298 BLAKE2B 64239e74abce1a80d200a9d62c4c0c5910373e073c9a8222a29aaf0761d7c8efa9a30ea46340ef7ccfa233b484057298561e7109f9eb2347db3bbd842300152a SHA512 d781a1201fccd6dd3921460993f3c6e737c71a0fa2cc699c95ba17043d73a70d2f14c3262096374c89a8b0d89d5157380efc4e1d2d13f702b9039bfee2febc96
-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 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.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 resvg-0.36.0.crate 85414 BLAKE2B b20b24d2c6cce165eddaaacbb39f2d3572b1530dbfd5f7ab8036429950114ae3073092cf904a89f1a8b44823ff3d7e8b55cb65da91e8ba4ce4aefa48ca705493 SHA512 0e3809e19692cab81deeaed3ca370df5d1d3caaf68ff6b322390ed9dde7ef2647001ddbacca5759833bc7708b384e878211d66f1570b200f319f6312bf77132e
-DIST rgb-0.8.37.crate 16644 BLAKE2B 4f158ac34c03627bae762a3b579901d4737c2b71d9cd96b18024bf7f297169c3edb097d0d67289f8e20b2275a0613a45eedc8fae306437b76435eabaf8cb0793 SHA512 72491fb2c315ee347c7474e6f9b3d6eaaf1db66ddf163214df8466a4a8ccb0aaaed76fc4c72808b70bfbcdf9dc2a109511ccf8e405e4a006b349030e8ad199a8
 DIST rgb-0.8.40.crate 19157 BLAKE2B 9b7a61094514195e45231512daecc758349725309852bf78a35624db5629325688a23d8f8f5871eee09ec9c3f5b49c549192cc33d9875b87dc1f346e74266193 SHA512 25bfea0dabebd07aed42d36858f1f24dc293c63863d48d735f31983e6b668aa8e73d6ce9a78916fa776da789190cfb7c378c17e5df2bf71eda58c4c25f1b24f1
+DIST rgb-0.8.48.crate 21564 BLAKE2B 64b4870c4441f19f240627f098ba0022e5ca0779eb35f11663a3eb2430519d0daf87e38d7b6c2275cbd85041d8d01711a0be2f417b148fb2bd215353dfcf1253 SHA512 bcd9d3d1fd1901ba63569129f29e3244622d9cc17dca7d0018221f1cc481666a0949a13593e7ab283562ee17bf38167394dffa1ecafb616e3603c186ffd0642c
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
+DIST roff-0.2.2.crate 11648 BLAKE2B 38431e1dbfe394274c09e32a9f4c99f7e208130efd1765e9df0c08cf313a0ca81d13198158af6342ec658648cfcfe2e3cae5a5306f8e27e18af7b8163359e896 SHA512 0098d4cc921435cd48fd924d96e8dd27f6443a9b6cba847388ec4be7c2222bffa7a1507862b8c120314d32d08e0cc04e52d44973e25d85536a3a2560fa2a06aa
 DIST roxmltree-0.18.1.crate 43040 BLAKE2B 3b27385805466363d082dba273f35a975d1b2f02842f150a91cb94f86b478bb220a1824150d3650677af069e225f0498f90733e9c2462b7614fde382c78366fa SHA512 36409eb077bb3b26663096ad6457338f124eaad7bfb11de08d57bf44eef0653736d234a9bf8ed6d49ea357741d775e0f01bea931b298aa4445a086d58bcea937
 DIST roxmltree-0.19.0.crate 53547 BLAKE2B 0bf23bb050dec29cdfcd66bb231ea81caab40aa54b015c5480fde7dac899128438ecfb10d818dde456db8ec4cbeebc7f32f3c8ff17594b6a78c0f04f0361555f SHA512 c8eeb974d797316a8dc332c4068b2850eee124a13b0792cdc8acaefe521d8b40161f9159bbfee2866ab2c4f6133ceaaa1b5ed704a5f0db5ae3819d76042cbf36
+DIST roxmltree-0.20.0.crate 54594 BLAKE2B 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603 SHA512 f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
 DIST rusqlite-0.24.2.crate 120103 BLAKE2B b72c206b640a692f466afb6262ffbe16520b1ebd25e5c6c59d618dbcf3cc448c279f56baa5eaf351b98dfd7a21e42bdcb8e43ed8a74536625369ca66f7a08951 SHA512 47c7cd04c666fe42edcd667ecb3289c7a2b612446b2f95d78bf576fb691a167f372ec48e0d4cfbe973b32068b4f06e664d079fd3358a69fde895295a80d20caf
+DIST rusqlite-0.31.0.crate 152252 BLAKE2B 5ef8396ab6ee9f6887466e7ff856c6260f40ef85361ca451e230d8590019d6ffa4952df15abd21cf300cf51da4a6ea4e82f5dc88dfba474f2f62036cee76caa3 SHA512 6d20b015ab72d3d75c363111c0cb41feae8bff83104ebdfcb8e5efc1bfb63eb48a17f6de2e6c96cb1e916b4795fea6d58466ab0820b151b12d1dc4c29800ba66
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustybuzz-0.10.0.crate 240016 BLAKE2B d2355c49eb98a71f40f0c11b2a932fa28f82fdc1ee6aa70c8a425235a042490bd9db30f059dd41e78bd82c96dc08e9e5e2db00cc6a26ae12d3bb5dfa5d4a428b SHA512 04c0028099b411fc88cdd3f513c898d3609f4ddc3dbac9a067374e6301dbc0c0eb6f58ba9834183d61f4d11974a9e07c566a9bdf23cced26bd4da56de451ad42
-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 scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST secular-1.0.1.crate 184234 BLAKE2B 879ed6ecc460ae065dd1033417cb3f72acb82bd27df3d20577005c18f33f782ecf9347bd328ec124b34547202d2b5843cadd4b0f60ef13ec753dbd2d8d2423df SHA512 3b5af4087272bb07f40e1f1309470da29405a60bd0fdadbfaf1969acb5ec626efde4549d12c06c819757ef4e5932a8fcc44b0719bb65ad30db54de0109bd1f2c
-DIST serde-1.0.199.crate 77598 BLAKE2B 8c0adc59a4fe7bebce94394059a487b6a23415a9f6cd39e6207793125018b838530443bd4264be2912c42657a68b271a6646480161f02b4a66e46b4ce9120858 SHA512 6d365e23d5980d343175cfa14edf82d8ba34f00d197e3cfeff813c27e1d088df945611780fa22b243807b4948c576bbf6f0f18faf5f03be984f6810ceada33f3
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
-DIST serde_derive-1.0.199.crate 55793 BLAKE2B cf59a2653bdc15ed439415ffd5c21300023ed669f9076354198429f146ec0d96b9905d66aaf6a5ba3e18f16b8afcce7d9349baa75e39d1968b7fb75177b586be SHA512 8b3ac20b7374a515ac9f7a929582dba79701de4096de1662368b361faeaf9259b0a898458ba1cbbfd5ddde4c9c8216c305e307656fa1dc85aab3df87e428201f
+DIST serde-1.0.207.crate 78247 BLAKE2B 98b69e4baa27b1cad22d5dc831de715bff10a3e8ef864f14bc6acbd5436ed49f9d85e6f7eb952c5db9eb4d03cf921dd70d3c606f9531eb48939ddf75135fcb35 SHA512 e9ccf2b2b6ac61712cefb8d9eacd39606572363046000eef26b9af79e15978e70c2374764d1908876ecf1b6435c4040fc1bb6a941d1aade7f1d697bfcf67ec3e
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
-DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
+DIST serde_derive-1.0.207.crate 56016 BLAKE2B e0e33058c74925a506422860a9cf3b154188fd90d52679adc53a03da0ff0dbc1db96a7ee1584379b971838598c8f5d13b836c8080d5f2eb36ab8089362318c62 SHA512 24c67bf5972c2bc254a359e2a1884b0a3f8b79f8da6aa29edcdca7a66c58bb2b3b0646317c13fc73dcd32fe4e3b8774fe07840b67bc238c0ac7e9a0a3ba7c9b8
 DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
-DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
+DIST serde_json-1.0.125.crate 148919 BLAKE2B 551b29a79dd35e20e7432b434a163b62ffcadcb40a7755946e25ea29f59a39c55a85d589f6b90d449847023d0021b6ab189e41b52922468df5c46ed663a012fd SHA512 45cc034bed4ad15a6698ed2b723b3540db255c7ba8014c103d3b7782f10a3a8e2f6d5fe5d0dc47b54286f01f20c21818a5dda670a942182a07dcd1d71bea67a1
 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 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.2.crate 18064 BLAKE2B 7274d4c115678eae2640a709bf9d682ce867c1f6295a0c5f49e492f95dd1c457f20b56207a74221df1fd9d744b24c6260e28f705777e3c7d47b7bdd36f1d57fb SHA512 16362d232b1d301007c069198d7716848aa73d898ef92e050422b36c09001b4334390dc95a6650e5315377fd8960d4336e5ae869b0a305e8525e977b8327c508
 DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
 DIST simplecss-0.2.1.crate 19418 BLAKE2B 1cb0f9d0279bbb3756a6cd66505ca5be7df3c1a9ee4099c421c93991ace676cf5292db91ebdca9555b6b16859cd6786a9d1757d078c29e2141e482d193a76203 SHA512 4a7de5e332d88447b418b5eeb9fd87a2ab7ba819c2af4b84988330631a02ec42ec868cf5c6f5f43f8e5d5e78fb9b5d3b6ecbae254fe65ccd9345bb5da01ee6fd
@@ -283,34 +285,36 @@ DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b
 DIST svg-0.16.0.crate 18708 BLAKE2B c9c2dcb68667b8f55612698a374322b56cf555bf5d8b66bf8aec06b053a943ca1d09127a444a5211f4c6876ddb89cfb9e5bf82a1546b403c845fe5c59b2607e8 SHA512 54683f776fab9e9c01f1ffa541a9a310c64a4b2d632da902745a84f8ec553c656a54f46671e19ba6525a651197cb1880df27a86ddf8838c1bcdb231819ea1618
 DIST svgtypes-0.12.0.crate 35932 BLAKE2B c63951e5064d1a37184bd6e8409038107748bb15d4aeb02b8a725d4db4dd861b25aefad0744b5d220b7125916cbc0ea88e38f69e8b77e18182d451d90988dfed SHA512 d15d26b2dc61a0a6fb97195a27b1f8fa0f1724e4eb90951d2373ba7a8ec9b658f8a999dae194f40fe6bae93f3b3a7e99595ac907b345cbb47a89c174c642beec
 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.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
+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.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
-DIST termimad-0.29.2.crate 441111 BLAKE2B 06f9391f8b0d3a428f505aa423cef2ff1ce6f5f1bb68f42e11ccf3bc1511c519b507fb1f1c10716d562a77ae4f250e3f72fe4834918384f76b1b0d2c8bb12bc7 SHA512 b418d51b865c91b385af993aa889b2786be365a542781c7061bcb2b1ccbbce2dc15ad13620a72a7cab92f6e119afdf9844810650031b6f5b2c48e354d123400b
+DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST termimad-0.29.4.crate 441288 BLAKE2B fbd79e8eac56bda7e8d0bf069825956ade3149a96b8d5a10876742db2c83137ee2e655574cffbede0fc1e576ac081c621cdbd3eaf40d818ceb9326e379a487b7 SHA512 ec989299e3d586004c410647d6d626806a0f7383844dd31cfb5e27e7c5fb73e5ae31d213d50a619707564563ecf7786d6d99ae39ae98dcdc196dd1cb07aa2029
+DIST termimad-0.30.0.crate 442191 BLAKE2B b4077b8a90e07fad02076096c0b039f31e5e02c51c208632f66eb77e94df5b0ca6eaa0dfff2f91c004120a98f23db9c5358081ae754eb30ed985fbe6b7b63212 SHA512 7fb172d1a9f44e04190ad7b67ff6cdb94f528cf3dbd1e832152b6e30fa1597066bd7765c0283fe66459edf4938d6833c4969e268845a0b02c622dee5f0e2e94a
 DIST terminal-clipboard-0.4.1.crate 8043 BLAKE2B 3d1380df326081cb72034b9d5a1f946aec5e874385fa0c50dd2b9a6dd7e0a5ac07b5faf533b4aa45fd58567e2582153242e4b44f4501dcfea06670b4229127a0 SHA512 c856038b79e6e0c77fe69133e4e7bb80178459d192059885a7841fbb972d1fde1846a2bdd83703e70650f7c0a09f629d0bd169df5512b61449bf1fbb19a2f60d
 DIST terminal-light-1.4.0.crate 39161 BLAKE2B b8ae8def8410731856b5c2fa49de534c9ddbd564cd8b929f96d8688a120fa6a62ff167b577df84641bfababc18e10df056509cd684968c37f4f69d62f4ac8c9f SHA512 4e0dd0f7e259b028aea6cfc5d38b1dfd420bdfb38995356a9ac18cf698d8b5090678e66a1091b2bdfba7f1b77b24834800050098a15c49871287605c0328aa90
+DIST terminal-light-1.5.0.crate 39651 BLAKE2B 5da31fc467b506b91360c6483ca65215597fca27ecd5d9d380b735354850b21f048c42cdc9886e1b23893ff17c7d0f4a0074a502b91e0fce6b3cc8ed7fe1d8d2 SHA512 4b89f0977051c3caccdff9996af69b2145ad60b4c0c267d47076aa1c3d4c2f76f70d1badcbbb75ab05ed6d1ea730d26f8e207ae7ca84f2886a7dce2371050a1b
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
-DIST thiserror-1.0.59.crate 21040 BLAKE2B d9ae0b1d810e7631edf072a41267a871c1cd88d71c882c8fb47d65b3dc563ca2addef0ebf9a9cb122fbfdccff5b92815b8f2e0f7c3382963828cb69d21ec8531 SHA512 254b0ad6c4b135234f89db8bd5674fb8c6b633495810140abf93cf06c58e911ad2ebcfdc002e7ce29739e95ea066eeed3fbd7c831e2858822dff620598dd147a
 DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
-DIST thiserror-impl-1.0.59.crate 15726 BLAKE2B 0e524c851f999f4592e5450d7d8ad45a922c9cc5d2229f4dd106144238c8a0ceaeff5a4d1c7e27cdc53a7eb44e60f890fabe1f43ba3d5b950da9c63e6ddcc9d1 SHA512 75543ad39d1243dab23a4b50075bec337c39045f0271337a1ccc144f25dc1e7fc23b0163f16958ded9a1f44ff359378bd22f4c0f5e095c1823e928fc929457e8
+DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
 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 tiny-skia-0.11.4.crate 201082 BLAKE2B fe350137665e6229ea707bedbb535b8d5c3fd24752ec9c97e2a6c43b28ce7fb9107935a6f91074e0613dd2a156a45dde695343cde7ca78f3f9079636c5e1f9d9 SHA512 1371fa11934c1223169fb4494accf3b47958003e19a603e8fde446216e2c1253a6ef80da5d7bf3c9c73038f5282e3c47cc5f8eb87f8456cc5706392b28b4ecac
 DIST tiny-skia-path-0.11.4.crate 47764 BLAKE2B 55b76adc467fb4c063ac2136271c353b92254f20a68e5205395081582c624481687bc319845e217868e5f2c54ef320728d0b2ddefe32fab1a17b90882168c2dd SHA512 723557dcb08cbdbc4d442ccfbba38481b922e367cec07fa23957f9271a96d1c656fd46bb0e0b5609686e5c830d1a988b0e209f57d0765d0afa738e5b2b0d8dc8
-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 toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265
 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_edit-0.22.12.crate 104416 BLAKE2B 8f1f670ae986b900e141ed359f8ec1300dd91c3b0c204c8f3d6bcb44bd11ed06dda87535a6a8b94efa604a323e2a714ddfb382633b1ee3605e1f91488d9f2e56 SHA512 723b9cf08b1262c3e28c227ab363fec0122e23c3c9854f428d1aa117dc87564be2e22f368f9ee63cfe7abafa563c2ea51c00909d44eaa067bf1fd8c985d25965
+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.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
 DIST trash-3.3.1.crate 49531 BLAKE2B 587089c9705a458f891c4f3103cd95efb2cc7edc10b8f26a7258190a93f54b49e41370155b928b3698824f4c413cd6a2824d72d2a845415a8a658c267f9b41ba SHA512 c7380aaedc125a111398a4f1c0f0c3e5c5fed07c655d8a3b7e248b6ba06c82d01f068cb891512e031ca3fc37386fe9e5ca95552972ed15d4caa4fc19ec432ee8
 DIST ttf-parser-0.19.2.crate 158329 BLAKE2B 9befaaf7779f96eefc217183b1d8fb7c53221b0d6cd1b249d174b37dcbb5ca852f873e2847f409fbaf2bbe870d40622a930fd5b90c2f185efa0eeb55b3c91edf SHA512 3638a30a959d3a5a36c53b8469f64ce8fe1eff671103172097a4f406a545ba3b45c92450cf4777cc92e4d291e243d00e796db1b907da7439c5ee6994c297a109
 DIST umask-2.1.0.crate 6817 BLAKE2B 0e33659d5caca980a2154cf9ad381e33977cb19a1b9d8a421ac9c55f0428fbbe7985ba62012acf568a4bfe1c08a8c289b4665155ddc59aee781ad10449cb7297 SHA512 aa2db7f62a4be2dade1dbba574b14ba2af42c9f3fcce10b27b250cbed69f8e44129bbe3f9da061fa1031d3a256553540ab97ec0f13f6fb8b6747fd97ce87ca82
@@ -322,73 +326,69 @@ DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c878232
 DIST unicode-properties-0.1.1.crate 41088 BLAKE2B 1cbe1df6b2d17ede3b83a65fcd09948637428d1ea17a051ea9da62b97a5564d34a39d3105e3d49362d52ad637656210cf03cfaae4b7b759a483a346e05c0db89 SHA512 377ce59a78cb7a0b5f040c90cd80ca800e9e48867df69ed3a5476618613c3520a3fb9306b212dcefc927e44db52f2cca99839b5ff762446dc190019f3ae0a039
 DIST unicode-script-0.5.6.crate 43993 BLAKE2B 37d7e1566a9b1810a4c4593de6ec5d82b05aad0dd9093e843894ce65eecfb631242a975958a9c6e795d623e1c415a8494d40a82af939c7b22065d2805505391f SHA512 624104995e164b0c9115d04d9e40a5331b224b321664520d396963a26ba2d153cecc79c3701da4f7b4cd4b65913d933c1712b5a73d7db707fcf045b2dd42b858
 DIST unicode-vo-0.1.0.crate 8084 BLAKE2B 492548fcd13dc6831114a0b4df5d2179dfb4aade7c5ccb4d0491fcbdd245b20f5784165dc2098d537249a80cef51aa76274d0968644d201ef124ea4988faa8d6 SHA512 71c89d0db109d627890304f6b4490e7ae008fae79be7d25df7d4f5685b0ee08e8efc55c1b961ad0e40a4c6ec57fe1bb5f674d0f31cfe11c244d3e3fbef4bb575
-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 url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST usvg-0.36.0.crate 28011 BLAKE2B 98872393768839ef5f2862107d678e9a95c8073cb16dc7b7897be9e2920f18b9247ea9265b1786dc0924c7bf5b873b1d58a76cca556e45d452f202ade9eacc7c SHA512 d4563dc46d754195325bb787e6b2d81de26c0d04e4276db38be91b31e1f613cdfffa31a04973874ba83aa4815f8d52ab4ba543f0428b85398eacfa3bf5c1cd1e
 DIST usvg-parser-0.36.0.crate 64951 BLAKE2B 922bbcfd52bdd473534dd19b0d657e75991c460c923f97a52906c2567d3be02c2eb25171bca64401bf4c9634fa0e5cea7099f75d07c2a9abe722b168035ea520 SHA512 282452e1d47733fe376cb8b0182b2cf3a43987a6aa0b8c712587f1e2d3385d58e5dc51d148dcb6f44bd8fbee04dbee4e7b937433fa4150531ba70be866231daa
 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.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 DIST uzers-0.11.3.crate 22745 BLAKE2B 59a64624c1a59dff483e28f1b80499191c9a860dcb00e4f27c5c39942ba5a1ec6a4fbe98bb585fca079f4594a57fb24db41675e1aac87fb4873e6056ef13c98f SHA512 3a4eb2d2479550bb34319d2d3841f1e4a5b024dd85193ce127a90479b3d801880d9d3624caa265aaaf9908c7dea73fd7da5780c12c2984db3db04ce45668d97d
 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 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-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 weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd
+DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9
 DIST winapi-wsapoll-0.1.2.crate 2865 BLAKE2B d3d8538604d9d4c99956bee2112b62504730a9ed06521b1d22e3a74c32dc1aa0b2ad5076e411800c6e32bbcba7b86ad896c978a5ac7ddc41c2160ebe572e7223 SHA512 2e07b90ae535b25004b61ad9ae9fba9c7f115854b0471244fe722f590c2a2c6c56db639e20928b441ed77a4249b966ae90a11f9a7da59269a854db13d54dba97
 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-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.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.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
 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.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.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.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.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.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.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.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.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.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.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.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.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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST winnow-0.6.13.crate 162649 BLAKE2B f088396ccdc6e96e56b822c20ea483eaead57794e101bff3df6ea35fe039fa2dcf2eac98dabebc3decb4129c200490633f05ba5dd4325cec29d28c78887c3de1 SHA512 a8a94c26afc4cc4db6ec2e65e7bff325fbe6816d4a80fb97e2014e202af0f549a77518f0435157985822aa9fd8642b95258b6cf87a9e695f4b9a11b5fe514d86
-DIST winnow-0.6.7.crate 159491 BLAKE2B 1169a7cde2c588bbc86db6a01e145c2af5aaa92b1b6e9f1c7d72faed32972bc2d706e7a900aea495d0fed3dd150f5a5b6bbf75bac203c07e118b449a7a5f07a4 SHA512 b8a0f161f338760dc24da0f8f6706c84dbb9318430556d87cce841a725357dd4800e86552c448f9b521975a716eb80c0e631346073295a11cdea3f59c6207a45
+DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST x11-clipboard-0.8.1.crate 8609 BLAKE2B 809689bd1d8d31ca8e6ebc04b12913523156865ec8807f16921390460a62f616d1a2fc5f3743fd24860e9ae9811ca5405a7b5e4572310ebfe21a1230ae11015c SHA512 fd040632a4e0068a641accaccf493f67aed0d941b2c660df8196b298a82e4d244e235feeb7a4367c24bca0a12565a1faa56bad612d66544c5aa88dfaeb9eefec
 DIST x11rb-0.12.0.crate 218514 BLAKE2B a067d012cf2aa5e7a20a11270fa1101bf6a2464bbb1855569d752bbf781f70d827c3f24912d062b23fa625b2ff9eaba4b59b8c28b7614e0340fed5f046535b6f SHA512 1e2122effd38c5f67d1fc24e6a9b74e14a04713166980e4cb071860616a19cfa9ed87e4733c1f029df10de1a17e732b928a138027e8ee0e4a1f4242f251f5f78
 DIST x11rb-protocol-0.12.0.crate 478311 BLAKE2B f00f66053ef81d664a6f8bd083bd91ebe5c607b9190e9e7259bfd6f4b2920dbc05c0b85267a1cf878d0f43cd4b11fc5e45233744c18b5aeea02dad6d04445479 SHA512 3ef8a79a98f428e82b250c2162357f9965618aa3d9b92e37521e42de884d7b71fd7de51c56ba117f0cced674151c9bc6451dc919326ddea362b4e44f839ae492
@@ -396,5 +396,8 @@ DIST xmlparser-0.13.6.crate 26718 BLAKE2B 40796a610755a10de4f435c36e251093719321
 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.0.crate 6163 BLAKE2B 0b7b9d5a460c41150d16ba0af22cb61ee1fcfabd497526c664f2f11061c4baf0b3c61fb5ce5ec636b2f254a19fa4648f7dee4e7529ac17ef1dbb7380e230b2e2 SHA512 90fc59780919242bc92b003bfce0d0678c11cd81c3fa706531328211af7488ff4ceeb722a38e3396746e18e36ff4405d3b6cc892f8413e7396f7fc8e0944539a
+DIST xterm-query-0.4.1.crate 6153 BLAKE2B 9a7f519d1ce5967a01afbcb32df904dafac66efaade4cedefbd02829f99eaf1a0767e9826ea89772f407e12eb9d5cdb04e3c552bb3d469e6b30b62a8a18edf44 SHA512 accbc4b46fd1a5bbe366f5a8a2ea057ec4d13a0715be9678ec120a50e0309b4d4c69cfb0e0d0501904bddd7882e77301df2e7bdb841a0ad57d41750d838633a6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
+DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
+DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
diff --git a/app-misc/broot/broot-1.39.0.ebuild b/app-misc/broot/broot-1.39.0.ebuild
deleted file mode 100644
index 43912b60833c..000000000000
--- a/app-misc/broot/broot-1.39.0.ebuild
+++ /dev/null
@@ -1,383 +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.4.8
-aho-corasick@1.1.3
-android-tzdata@0.1.1
-android_system_properties@0.1.5
-ansi_colours@1.2.2
-anstream@0.6.13
-anstyle@1.0.6
-anstyle-parse@0.2.3
-anstyle-query@1.0.2
-anstyle-wincon@3.0.2
-anyhow@1.0.82
-argh@0.1.12
-argh_derive@0.1.12
-argh_shared@0.1.12
-arrayref@0.3.7
-arrayvec@0.7.4
-autocfg@1.2.0
-base64@0.13.1
-base64@0.21.7
-bet@1.0.3
-bincode@1.3.3
-bit_field@0.10.2
-bitflags@1.3.2
-bitflags@2.5.0
-block@0.1.6
-bstr@1.9.1
-bumpalo@3.16.0
-bytemuck@1.15.0
-byteorder@1.5.0
-cc@1.0.95
-cfg-if@1.0.0
-cfg_aliases@0.1.1
-char_reader@0.1.1
-chrono@0.4.38
-clap@4.5.4
-clap-help@1.2.0
-clap_builder@4.5.2
-clap_complete@4.5.2
-clap_derive@4.5.4
-clap_lex@0.7.0
-clap_mangen@0.2.20
-cli-log@2.0.0
-clipboard-win@4.5.0
-clipboard_macos@0.1.0
-color_quant@1.1.0
-colorchoice@1.0.0
-coolor@0.9.0
-core-foundation-sys@0.8.6
-crc32fast@1.4.0
-crokey@1.0.0
-crokey-proc_macros@0.6.4
-crossbeam@0.8.4
-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
-crossterm@0.27.0
-crossterm_winapi@0.9.1
-crunchy@0.2.2
-csv@1.3.0
-csv-core@0.1.11
-csv2svg@0.2.2
-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.11.0
-equivalent@1.0.1
-errno@0.3.8
-error-code@2.3.1
-exr@1.72.0
-fallible-iterator@0.2.0
-fallible-streaming-iterator@0.1.9
-fastrand@2.1.0
-fdeflate@0.3.4
-file-size@1.0.3
-flate2@1.0.29
-float-cmp@0.9.0
-flume@0.11.0
-fnv@1.0.7
-fontconfig-parser@0.5.6
-fontdb@0.15.0
-form_urlencoded@1.2.1
-gethostname@0.3.0
-getrandom@0.2.14
-gif@0.12.0
-gif@0.13.1
-git2@0.14.4
-glassbench@0.4.1
-glob@0.3.1
-half@2.4.1
-hashbrown@0.9.1
-hashbrown@0.14.3
-hashlink@0.6.0
-heck@0.4.1
-heck@0.5.0
-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.3
-include_dir_macros@0.7.3
-indexmap@2.2.6
-is_executable@1.0.1
-itoa@1.0.11
-jobserver@0.1.31
-jpeg-decoder@0.3.1
-js-sys@0.3.69
-kurbo@0.9.5
-lazy-regex@3.1.0
-lazy-regex-proc_macros@3.1.0
-lazy_static@1.4.0
-lebe@0.5.2
-lfs-core@0.11.2
-libc@0.2.153
-libgit2-sys@0.13.5+1.4.5
-libredox@0.1.3
-libsqlite3-sys@0.20.1
-libz-sys@1.1.16
-line-wrap@0.2.0
-linked-hash-map@0.5.6
-linux-raw-sys@0.4.13
-lock_api@0.4.12
-log@0.4.21
-malloc_buf@0.0.6
-memchr@2.7.2
-memmap2@0.8.0
-memmap2@0.9.4
-memoffset@0.6.5
-memoffset@0.7.1
-minimad@0.13.0
-miniz_oxide@0.7.2
-mio@0.8.11
-nix@0.22.3
-nix@0.26.4
-nix@0.28.0
-normpath@1.2.0
-num-conv@0.1.0
-num-traits@0.2.18
-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.2
-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.6.1
-png@0.17.13
-powerfmt@0.2.0
-proc-macro2@1.0.81
-proc-status@0.1.1
-qoi@0.4.1
-quick-xml@0.31.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.1
-redox_users@0.4.5
-regex@1.10.4
-regex-automata@0.4.6
-regex-syntax@0.6.29
-regex-syntax@0.8.3
-resvg@0.36.0
-rgb@0.8.37
-roff@0.2.1
-roxmltree@0.18.1
-roxmltree@0.19.0
-rusqlite@0.24.2
-rustc-hash@1.1.0
-rustix@0.38.34
-rustybuzz@0.10.0
-ryu@1.0.17
-same-file@1.0.6
-scopeguard@1.2.0
-secular@1.0.1
-serde@1.0.199
-serde_derive@1.0.199
-serde_json@1.0.116
-serde_spanned@0.6.5
-signal-hook@0.3.17
-signal-hook-mio@0.2.3
-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.1
-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.60
-syntect-no-panic@4.6.1
-tempfile@3.10.1
-termimad@0.29.2
-terminal-clipboard@0.4.1
-terminal-light@1.4.0
-termux-clipboard@0.1.0
-thiserror@1.0.59
-thiserror-impl@1.0.59
-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.6.0
-tinyvec_macros@0.1.1
-toml@0.8.12
-toml_datetime@0.6.5
-toml_edit@0.22.12
-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.12
-url@2.5.0
-usvg@0.36.0
-usvg-parser@0.36.0
-usvg-text-layout@0.36.0
-usvg-tree@0.36.0
-utf8parse@0.2.1
-uzers@0.11.3
-vcpkg@0.2.15
-version_check@0.9.4
-walkdir@2.5.0
-wasi@0.11.0+wasi-snapshot-preview1
-wasm-bindgen@0.2.92
-wasm-bindgen-backend@0.2.92
-wasm-bindgen-macro@0.2.92
-wasm-bindgen-macro-support@0.2.92
-wasm-bindgen-shared@0.2.92
-weezl@0.1.8
-which@4.4.2
-winapi@0.3.9
-winapi-i686-pc-windows-gnu@0.4.0
-winapi-util@0.1.8
-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-targets@0.42.2
-windows-targets@0.48.5
-windows-targets@0.52.5
-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
-winnow@0.6.7
-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.0
-yaml-rust@0.4.5
-zune-inflate@0.2.54
-"
-
-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}"
-BDEPEND=">=virtual/rust-1.65"
-
-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=( target/$(usex debug{,} release)/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.40.0.ebuild b/app-misc/broot/broot-1.40.0.ebuild
index 8f08bcbb47d3..69a4effdf7ac 100644
--- a/app-misc/broot/broot-1.40.0.ebuild
+++ b/app-misc/broot/broot-1.40.0.ebuild
@@ -334,7 +334,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.41.1.ebuild b/app-misc/broot/broot-1.41.1.ebuild
index a6e4e982b186..cf8bfec8f22d 100644
--- a/app-misc/broot/broot-1.41.1.ebuild
+++ b/app-misc/broot/broot-1.41.1.ebuild
@@ -334,7 +334,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.42.0.ebuild b/app-misc/broot/broot-1.42.0.ebuild
new file mode 100644
index 000000000000..004d7599c468
--- /dev/null
+++ b/app-misc/broot/broot-1.42.0.ebuild
@@ -0,0 +1,389 @@
+# 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
+"
+
+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}"
+BDEPEND=">=virtual/rust-1.76"
+
+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/chkcrontab/chkcrontab-1.7-r2.ebuild b/app-misc/chkcrontab/chkcrontab-1.7-r2.ebuild
deleted file mode 100644
index 6de9a0bd56b9..000000000000
--- a/app-misc/chkcrontab/chkcrontab-1.7-r2.ebuild
+++ /dev/null
@@ -1,26 +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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to detect crontab errors"
-HOMEPAGE="https://github.com/lyda/chkcrontab"
-SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	doman doc/${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/app-misc/cmatrix/cmatrix-2.0-r4.ebuild b/app-misc/cmatrix/cmatrix-2.0-r4.ebuild
deleted file mode 100644
index fc52c436c8d1..000000000000
--- a/app-misc/cmatrix/cmatrix-2.0-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_SUFFIX="pcf"
-
-inherit cmake font
-
-DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="
-	https://www.asty.org/cmatrix/
-	https://github.com/abishekvashok/cmatrix
-"
-SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="+unicode"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)?]"
-BDEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCURSES_NEED_WIDE=$(usex unicode)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use X && font_src_install
-	doman ${PN}.1
-}
-
-pkg_postinst() {
-	use X && font_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && font_pkg_postrm
-}
diff --git a/app-misc/cmatrix/cmatrix-2.0-r5.ebuild b/app-misc/cmatrix/cmatrix-2.0-r5.ebuild
index 3d7f701bb30a..9be622552f2c 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r5.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="+unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index ec7e4ad46481..5b95bb1a7527 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1 @@
-DIST ddccontrol-db-20230223.tar.gz 112436 BLAKE2B 2ea33abe318005b340481ea6973ecbf5e261dfdd5579ad016262d0e1ee5ef44e15d16600a88d0323810bed4bf062632406c305202296932dc2e71288a888b091 SHA512 303345137d9f5760d4ee10db75322a3be97fe4269eb469e4ff798fe69f60670b8408ca87d2b3ad10f47ccb1f33c99c3ce09a1294f60e66d429074df685ab1501
-DIST ddccontrol-db-20230627.tar.gz 118149 BLAKE2B addbe499c4021efd3114740100abc3bdbb0bbeb5519a77340e90f736e72d1ffe80996bdfe450e60a6bba78175ddf9fb2be162e399402ed306dbdd931f1760a4e SHA512 efb1f1d407705e5baa3bc8924af4f7edb1ad05c36af5301a4d3053fa5aca4739d72091f00da4ec10ad0511ee1bfd148e75db66fd1c1a1e50e97d51679aa6ae64
 DIST ddccontrol-db-20240304.tar.gz 120669 BLAKE2B 5144294ffff45c661edfd24bfe3b9df70544cff2c1f4ff692370b507bc6486dc6a25de61553fea938975daa00932eaab6ad1454c0ef8e34edccb4988061c097e SHA512 ea6db89767272e28769d7ed45cccf8ffcbb734a17174d5dc6c8ca155a75737636d3b9884bb5bae230bddc6ebf06d8d8786e0ad2390d073258abd7bf7cd7a7e65
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20230223.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20230223.ebuild
deleted file mode 100644
index c702318cfafa..000000000000
--- a/app-misc/ddccontrol-db/ddccontrol-db-20230223.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
-
-inherit autotools
-
-DESCRIPTION="DDCControl monitor database"
-HOMEPAGE="https://github.com/ddccontrol/ddccontrol-db"
-SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-util/intltool
-	dev-perl/XML-Parser
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	touch db/options.xml.h ABOUT-NLS config.rpath || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20230627.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20230627.ebuild
deleted file mode 100644
index c702318cfafa..000000000000
--- a/app-misc/ddccontrol-db/ddccontrol-db-20230627.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
-
-inherit autotools
-
-DESCRIPTION="DDCControl monitor database"
-HOMEPAGE="https://github.com/ddccontrol/ddccontrol-db"
-SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-util/intltool
-	dev-perl/XML-Parser
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	touch db/options.xml.h ABOUT-NLS config.rpath || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index b4981f59079b..8ce6375b654e 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,2 +1 @@
-DIST ddccontrol-0.6.1.tar.gz 180407 BLAKE2B fba90502925320f3eb20e71498456e8b1135af9d67a78a74ec7b28d3d49a2841fcb77806a983c4231e8e97d07ef7fdf29b36145316f130ed8a529ef39ed4d104 SHA512 abc8940dcd651c25e1030bd4f5ae59774cfa08b22352a653140ec924cbcaa93855473385575636ec0cd51ea5f1871e2331ade592846eafddb7eae99f55ff1164
 DIST ddccontrol-1.0.3.tar.gz 175621 BLAKE2B f3a2f477f1e2553da0069da020fa49e06ab4be5d13f2c238fa0e4e800d7632490ed91e3f3fcb234b90bdff9ea03a0a8c32613153ae45ff450b4bac4ff568e96b SHA512 5e49217c8560245d53d5a2dc71cda5683698e798bd1f75ca69e445b68b33d2fb826ff05dced1c0a40f2baf8fd26396c78d1c1bf6f95f30287da6d5b149bb98e2
diff --git a/app-misc/ddccontrol/ddccontrol-0.6.1.ebuild b/app-misc/ddccontrol/ddccontrol-0.6.1.ebuild
deleted file mode 100644
index 5324da6ba848..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.6.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Control monitor parameters, like brightness, contrast, RGB color levels via DDC"
-HOMEPAGE="https://github.com/ddccontrol/ddccontrol/"
-SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk nls +pci static-libs"
-
-# Upstream doesn't seem to care about tests: failures for lack of translations,
-# and no real test targets.
-RESTRICT='test'
-
-RDEPEND="app-misc/ddccontrol-db
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	app-arch/xz-utils
-	gtk? (
-		dev-libs/atk
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	pci? ( sys-apps/pciutils )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-perl/XML-Parser
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	sys-kernel/linux-headers
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.65.1
-		app-text/htmltidy
-		>=dev-libs/libxslt-1.1.6
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# ppc/ppc64 do not have inb/outb/ioperm
-	# they also do not have (sys|asm)/io.h
-	if ! use amd64 && ! use x86 ; then
-		local card
-		for card in sis intel810 ; do
-			sed -r -i \
-				-e "/${card}.Po/d" \
-				-e "s~${card}[^[:space:]]*~ ~g" \
-				src/ddcpci/Makefile.{am,ini} || die
-		done
-		sed -i \
-			-e '/sis_/d' \
-			-e '/i810_/d' \
-			src/ddcpci/main.c || die
-	fi
-
-	default
-
-	## Save for a rainy day or future patching
-	touch config.rpath ABOUT-NLS
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
-	# amdadl broken, bug #527268
-	econf \
-		--htmldir='$(datarootdir)'/doc/${PF}/html \
-		--disable-gnome-applet \
-		--disable-amdadl \
-		$(use_enable doc) \
-		$(use_enable gtk gnome) \
-		$(use_enable nls) \
-		$(use_enable pci ddcpci) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
deleted file mode 100644
index cb6545c1f3ce..000000000000
--- a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,37 +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 ncurses-based typing tutor for learning the Dvorak keyboard layout"
-HOMEPAGE="http://www.linalco.com/comunidad.html"
-SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-debian-changes.patch
-	"${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch
-	"${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-	emake \
-		CC="$(tc-getCC)" \
-		PROF="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ChangeLog README
-}
diff --git a/app-misc/esekeyd/Manifest b/app-misc/esekeyd/Manifest
index 2cbe0e028984..9bc100bf39f5 100644
--- a/app-misc/esekeyd/Manifest
+++ b/app-misc/esekeyd/Manifest
@@ -1,2 +1 @@
 DIST esekeyd-1.2.7.gh.tar.gz 10623 BLAKE2B 599813e046ddbd69c218dc823c760c3598d3f1ef0411e953f7c64adc00846b63912fc143baeca8acd9d4631e99e7fac79246309af06dce6bd852c3124604908e SHA512 cc6d227ee5138b4bbc6affcf5214c7233d9245532d69233afe2322121b04428e0708c923bea8db358fe5e0bd4a6b9d6f67f3dbd8fafd0accdff8508600929b0d
-DIST esekeyd-1.2.7.tar.gz 104502 BLAKE2B d8060837e533c5c3fda11dc3a2d67f3010b820035d1f1a794c296a132f3dde3c17fe132257b996532ae6caa57fe2150c370aa71d03c2e48b9a88568498144769 SHA512 dc15623e0ffdd4cc7f3834b2becabf54ce61ea5190fd44734b2aa426db3d936cb5e3caada82357d6ed41db6eba41e9f792e453e2bb93c0fe62d87ac29651c89a
diff --git a/app-misc/esekeyd/esekeyd-1.2.7.ebuild b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
deleted file mode 100644
index ba1cc0bce966..000000000000
--- a/app-misc/esekeyd/esekeyd-1.2.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
-HOMEPAGE="http://freshmeat.net/projects/esekeyd/"
-SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-DOCS=( AUTHORS ChangeLog examples/example.conf NEWS README TODO )
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index 18ab103af7b4..875c6ad0c19c 100644
--- a/app-misc/evtest/Manifest
+++ b/app-misc/evtest/Manifest
@@ -1,3 +1 @@
-DIST evtest-1.33.tar.gz 19736 BLAKE2B 1b36207f67fe7db12bbe8d8db119f1cd4a9adc34b839762b198c29044a36e6fe9e8275d68a27204de4d287d1f12bde43f3895003fba9403a443189fe289decb2 SHA512 e8d6b76a2256ca6085ec07a66af913873ec5bc196bea87bca4f9b3e8b3222b34fcf636572383df74940b9b5db4a07f3e0be3ffe1454c605520da0c56f38506c3
-DIST evtest-1.34.tar.gz 19954 BLAKE2B 17ca600e89070d65f2bb95b468b921278ab63e50aa6042a974e8d4ac214b51355423c910bb0911e16a6bfc27e9fce59159719aae7d280679e7b292d02a2ee955 SHA512 5b4a18f13b86b1e2f5f723f6abb18c0a50d7f96b4412f46f503895c7ea8701a67a3237701de367c6b789533d8de887baa8f8f8e7e2fc4611235408ae21021b38
 DIST evtest-evtest-1.35.tar.bz2 18686 BLAKE2B b2f747fab1f47c425133fc60697448972351e22d3ae606d3c548ead4e53f359eb1cebd2ec555afb678785670bddf3ff55d13b47f3160d4a49ff9ee496f041099 SHA512 d9ec506ad326af7749bdf9e92bf96af7eee29ef9ced645a12f99453019f6c072e2a84d67f59cc6014d27f0e4e53c3e517de1c5302b0789eaaf8ad9ca3c824282
diff --git a/app-misc/evtest/evtest-1.33.ebuild b/app-misc/evtest/evtest-1.33.ebuild
deleted file mode 100644
index f21bef0d01c9..000000000000
--- a/app-misc/evtest/evtest-1.33.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="test program for capturing input device events"
-HOMEPAGE="https://cgit.freedesktop.org/evtest/"
-SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="app-text/asciidoc
-		app-text/xmlto"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-misc/evtest/evtest-1.34.ebuild b/app-misc/evtest/evtest-1.34.ebuild
deleted file mode 100644
index e2bdeb5b7b8b..000000000000
--- a/app-misc/evtest/evtest-1.34.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="test program for capturing input device events"
-HOMEPAGE="https://cgit.freedesktop.org/evtest/"
-SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-BDEPEND="app-text/asciidoc
-	app-text/xmlto
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-include.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-misc/evtest/evtest-1.35.ebuild b/app-misc/evtest/evtest-1.35.ebuild
index df1a1a628e45..8ce2f1bc4bc2 100644
--- a/app-misc/evtest/evtest-1.35.ebuild
+++ b/app-misc/evtest/evtest-1.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,14 +6,14 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="test program for capturing input device events"
-HOMEPAGE="https://cgit.freedesktop.org/evtest/"
+HOMEPAGE="https://gitlab.freedesktop.org/libevdev/evtest"
 #SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz"
 SRC_URI="https://gitlab.freedesktop.org/libevdev/evtest/-/archive/${P}/${PN}-${P}.tar.bz2"
 S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="app-text/asciidoc
 	app-text/xmlto"
diff --git a/app-misc/evtest/files/evtest-1.34-musl-include.patch b/app-misc/evtest/files/evtest-1.34-musl-include.patch
deleted file mode 100644
index 7bf7f044c684..000000000000
--- a/app-misc/evtest/files/evtest-1.34-musl-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/716876
-https://cgit.freedesktop.org/evtest/commit/?id=049396aab18849eef257af1116951a83416339e6
-
-From: Mateusz Piotrowski <0mp@FreeBSD.org>
-Date: Fri, 13 Nov 2020 13:41:41 +0100
-Subject: Remove PATH_MAX
-
-This makes evtest more portable.  We could try to use ifdefs to include
-sys/syslimits.h on FreeBSD to get PATH_MAX but it feels to be an
-overkill for evtest.  Let's keep it simple as just replace PATH_MAX with
-4096.
-
-NB: it's fine to leave linux/input.h there, because this header is
-actually available on FreeBSD via the devel/evdev-proto port.
---- a/evtest.c
-+++ b/evtest.c
-@@ -888,7 +888,7 @@ static char* scan_devices(void)
- 
- 	for (i = 0; i < ndev; i++)
- 	{
--		char fname[PATH_MAX];
-+		char fname[4096];
- 		int fd = -1;
- 		char name[256] = "???";
- 
-cgit v1.2.1
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index ea117db347a0..044e51f33b66 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,4 +1,4 @@
-DIST fastfetch-2.18.1.tar.gz 1067696 BLAKE2B 96d4ab7d1ee455029c846690eed65a2ae31f6e4f659c9e609c4c0f3cdd3703af0d8b45e1ce12d7399305f9c3a186958037adfbd9c52b399d15bc3bbb074a2cd5 SHA512 f30e2123cc1f98453bb01ae8291d57f8678a1cfd7348f3046de3735d214a7f965240d6e3cf4983c1933531e6bab1e35632af5399fcb6ca0ebf0592b7a929efba
-DIST fastfetch-2.19.1.tar.gz 1075300 BLAKE2B 66cc78bdda56c59abf5adf626159493c0e36d9519b59ad5fc4aeba6af24a5d82a14ad234820a4b548511e935191cbaeb64a3e7c77d29fe2c2d9fe39601229dc1 SHA512 ea45f42c016a5a32f2fc6255eac1076adb3a5f223a27cae3304d76f9df10a5043ccfbbc63ae7f7da2188462ceacb5fc65e9884749de7c4f75afdbcb8a102fca0
 DIST fastfetch-2.20.0.tar.gz 1076860 BLAKE2B 61c50a4c96962063f18ae895d2f7cbe505c9276fcba8fb5a3d7e9cc6b6854709cdb955681a868b23421f172f5cecfa51fb526f17d6800e072d96698efe7758bb SHA512 96b02688d8817ef84bb926ffa3c77ee95c8d402a6f1e5daeb8170484e6092f953f05a5ab463cdce544adb052a1e89b4ee530cc9f09e54223d5f666099e0ad6dc
 DIST fastfetch-2.21.3.tar.gz 1093534 BLAKE2B dca99e337e1239958add6323c159f58de5f38fe92c9a7c778d04b127e1467066948e4bc5503afb1054ccbab914eb35d8f35cd2a3cb88bf2ba595255fac5f2ece SHA512 e097d9360b7c5b93b30ad117e47ae5375c48c7e941eaaa56ee5f39b7757374c1ecfe321bec0999ee81aa52deff1be001ff057b621d34a90e95ec6ea83bf9f0b6
+DIST fastfetch-2.22.0.tar.gz 1099230 BLAKE2B 4faef7574bc8897f17c9e59f05f033f8952d97ed56677f0ebe5afec11b7b708fce5d907431dda567cc71b0dd067239d97614b6035792009fff340a069691b547 SHA512 edb4532d220e031d666eac3ae12a004e1481a7c36c68a94b17323953822d0cedb80cdf34c84a184766e9bad64089aaadc3828b5e13f8867e961533c6919dbeae
+DIST fastfetch-2.23.0.tar.gz 1105725 BLAKE2B 8b79deb0f35d8238979441014ca049fcfa838c27323fec13127f5a48e6b28feb03965135c1a338b6bd1e59913e660fc91196c27acbe1b693bc5ff7727efaa5cb SHA512 aad3d549c0f4be3b1f99e7bbbf992dccf79f9ef7ea6a26bfc31ba574b1a32496a1cf75b85c32e0643941cad4061d7ba003b42924f9f272a825a1a09b628acc39
diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index 4c79ef4ccba3..4fb2091c80a6 100644
--- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
index 4c79ef4ccba3..4fb2091c80a6 100644
--- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fastfetch/fastfetch-2.18.1.ebuild b/app-misc/fastfetch/fastfetch-2.18.1.ebuild
deleted file mode 100644
index 446249cebaae..000000000000
--- a/app-misc/fastfetch/fastfetch-2.18.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022-2024 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 ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager 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-libs/zlib
-	X? ( x11-libs/libX11 )
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	networkmanager? ( net-misc/networkmanager )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
-	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}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	xrandr? ( X )
-	chafa? ( imagemagick )
-"
-
-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 mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_LIBNM=$(usex networkmanager)
-		-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_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
-		-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/fastfetch/fastfetch-2.19.1.ebuild b/app-misc/fastfetch/fastfetch-2.19.1.ebuild
deleted file mode 100644
index ffccfb73cae0..000000000000
--- a/app-misc/fastfetch/fastfetch-2.19.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022-2024 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager 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-libs/zlib
-	X? ( x11-libs/libX11 )
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	networkmanager? ( net-misc/networkmanager )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
-	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}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	xrandr? ( X )
-	chafa? ( imagemagick )
-"
-
-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 mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_LIBNM=$(usex networkmanager)
-		-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_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
-		-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/fastfetch/fastfetch-2.20.0.ebuild b/app-misc/fastfetch/fastfetch-2.20.0.ebuild
index ffccfb73cae0..c5461c00eeb9 100644
--- a/app-misc/fastfetch/fastfetch-2.20.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.20.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fastfetch/fastfetch-2.21.3.ebuild b/app-misc/fastfetch/fastfetch-2.21.3.ebuild
index 1172d42eb56e..2609a6c86f16 100644
--- a/app-misc/fastfetch/fastfetch-2.21.3.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.21.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fastfetch/fastfetch-2.22.0.ebuild b/app-misc/fastfetch/fastfetch-2.22.0.ebuild
new file mode 100644
index 000000000000..2609a6c86f16
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.22.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022-2024 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-libs/zlib
+	X? ( x11-libs/libX11 )
+	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] )
+	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}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	xrandr? ( X )
+	chafa? ( imagemagick )
+"
+
+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 mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+		-DIS_MUSL=$(usex elibc_musl)
+		-DINSTALL_LICENSE=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=$(usex opengl)
+		-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_X11=$(usex X)
+		-DENABLE_XCB=$(usex xcb)
+		-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/fastfetch/fastfetch-2.23.0.ebuild b/app-misc/fastfetch/fastfetch-2.23.0.ebuild
new file mode 100644
index 000000000000..2609a6c86f16
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.23.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022-2024 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-libs/zlib
+	X? ( x11-libs/libX11 )
+	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] )
+	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}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	xrandr? ( X )
+	chafa? ( imagemagick )
+"
+
+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 mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+		-DIS_MUSL=$(usex elibc_musl)
+		-DINSTALL_LICENSE=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=$(usex opengl)
+		-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_X11=$(usex X)
+		-DENABLE_XCB=$(usex xcb)
+		-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/g15message/Manifest b/app-misc/g15message/Manifest
index f6022ce46a62..905ea0ea9266 100644
--- a/app-misc/g15message/Manifest
+++ b/app-misc/g15message/Manifest
@@ -1,2 +1 @@
-DIST g15message-1.0.0.tar.bz2 219798 BLAKE2B 47320e9f43547756e3f427d917b76f816e5422ad65151e5b9cac72813a6a5c7233273c089e9bc2693c243d98bc612c0a2a824d7e6c84b2565f99c01f3034f476 SHA512 608fb789e1390e6f8fabe4c1f21cabfb0c445660a2629616ddca253d232d9e58775c8aeb8c44dde0b014e6e26cbab70db991000f1bfcb4daed1727a06de7a78f
 DIST g15message-1.2.tar.bz2 281717 BLAKE2B ea7945b269bf79e373aa1067c8d85c62da7df1726268edb1495f84928302e0468d065b4f8860325dcdb3941c7be6e91f734ecca35a3dc212bfddab67007a8a57 SHA512 aac0bcfa92020abe371cb7023236b8f4590eedb301e9d2731f6b7b012baf9a6898b9139bebe5e6adb004979162f36b6aed27522be67e7829e41a0609dc761af9
diff --git a/app-misc/g15message/files/g15message-1.0.0-docdir.patch b/app-misc/g15message/files/g15message-1.0.0-docdir.patch
deleted file mode 100644
index e30f15fc74e4..000000000000
--- a/app-misc/g15message/files/g15message-1.0.0-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- g15message-1.0.0/Makefile.am
-+++ g15message-1.0.0/Makefile.am
-@@ -3,7 +3,7 @@
- METASOURCES = AUTO
- bin_PROGRAMS = g15message
- 
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+docdir = @docdir@
- doc_DATA = README ChangeLog AUTHORS NEWS COPYING
- 
- LIBS = -lg15daemon_client -lg15render
diff --git a/app-misc/g15message/g15message-1.0.0-r2.ebuild b/app-misc/g15message/g15message-1.0.0-r2.ebuild
deleted file mode 100644
index 4ce8f191303a..000000000000
--- a/app-misc/g15message/g15message-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,30 +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 message/alert client for G15daemon"
-HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
-SRC_URI="https://downloads.sourceforge.net/g15daemon/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	dev-libs/libg15render
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-docdir.patch" )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/app-misc/g15message/g15message-1.2.ebuild b/app-misc/g15message/g15message-1.2.ebuild
index 9b070a283210..7c397e03d13e 100644
--- a/app-misc/g15message/g15message-1.2.ebuild
+++ b/app-misc/g15message/g15message-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	>=app-misc/g15daemon-3.0
diff --git a/app-misc/g15message/g15message-9999.ebuild b/app-misc/g15message/g15message-9999.ebuild
index 5555fe08cebd..4882cb8454c9 100644
--- a/app-misc/g15message/g15message-9999.ebuild
+++ b/app-misc/g15message/g15message-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	>=app-misc/g15daemon-3.0
diff --git a/app-misc/g15message/metadata.xml b/app-misc/g15message/metadata.xml
index ef5d2548d49c..03b852beff01 100644
--- a/app-misc/g15message/metadata.xml
+++ b/app-misc/g15message/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="gitlab">menelkir/g15message</remote-id>
 		<remote-id type="sourceforge">g15daemon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/g15stats/Manifest b/app-misc/g15stats/Manifest
index b0d6e367bea6..29ca7ffd2d66 100644
--- a/app-misc/g15stats/Manifest
+++ b/app-misc/g15stats/Manifest
@@ -1,2 +1 @@
-DIST g15stats-1.9.7.tar.bz2 24103 BLAKE2B ead6f95c1e320b975a0d3ace2c76c1244e5c36b5df60bb73133d19c2bab4f21e1a9d1c423baa9d87feae166861734c02fa60d7ec2e06a0ab764b77a0e00c7ba5 SHA512 de447dfddd563513205b29b3611b0558371b2a7fbe7bf3aa11cd997c0ee2767b3aba05df9745d15e5c0b81382b96163fb7d33ba6a77e04ac817c7a8e26e228ff
 DIST g15stats-3.0.3.tar.bz2 300026 BLAKE2B 2504b283d26f69148672f2645acf2f7b81dfb3028c29485c1174c6283fdc2d352c53765e169d0ed721333ed8cea55c9a0d6d57785f30fbbcbd8219338c7f1e8c SHA512 6034fec8f2188182c6fd7587ec5f5ef8d06b617875573382385edc12f1aefb3b9bf52b437eafb7c9412676c5ceae42ae8c9c2099270908aea2b949d01df79047
diff --git a/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch b/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch
deleted file mode 100644
index e4d9c4725814..000000000000
--- a/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- g15stats-1.9.7/Makefile.am
-+++ g15stats-1.9.7/Makefile.am
-@@ -4,7 +4,7 @@
- bin_PROGRAMS = g15stats
- noinst_HEADERS = g15stats.h
- 
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+docdir = @docdir@
- doc_DATA = README ChangeLog AUTHORS NEWS COPYING
- 
- LIBS = -lg15daemon_client -lg15render -lpthread -lm -lrt
diff --git a/app-misc/g15stats/g15stats-1.9.7-r2.ebuild b/app-misc/g15stats/g15stats-1.9.7-r2.ebuild
deleted file mode 100644
index f5f3fc8f6c23..000000000000
--- a/app-misc/g15stats/g15stats-1.9.7-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=7
-
-inherit autotools
-
-DESCRIPTION="CPU, memory, swap, network stats for G15 Keyboard"
-HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
-SRC_URI="https://downloads.sourceforge.net/g15daemon/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	dev-libs/libg15render
-	sys-libs/zlib
-	gnome-base/libgtop"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-docdir.patch" )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	export CPPFLAGS="${CFLAGS}"
-	econf
-}
-
-src_install() {
-	default
-	rm "${D}"/usr/share/doc/${PF}/{COPYING,NEWS} || die
-
-	newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-1.9.7.initd-r1" ${PN}
-}
-
-pkg_postinst() {
-	elog "Remember to set the interface you want monitored in"
-	elog "/etc/conf.d/g15stats"
-}
diff --git a/app-misc/g15stats/metadata.xml b/app-misc/g15stats/metadata.xml
index ef5d2548d49c..6bac5096ddd3 100644
--- a/app-misc/g15stats/metadata.xml
+++ b/app-misc/g15stats/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="gitlab">menelkir/g15stats</remote-id>
 		<remote-id type="sourceforge">g15daemon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 11642f054cd5..bd96f3bad8af 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1,2 @@
-DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b SHA512 419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
 DIST gramps-5.2.2.tar.gz 21070723 BLAKE2B 8edf794e766663a1536cc50599a418ccb6e06ea832be14227aaa29336a1165f54c00cfb5fa7ed6657256b6660d3217ac4f4e2e62d41097d66808f0f4f554238c SHA512 4e2480081c16a61e9b0d4b0bbecccf4e6af6a40498d6994d8103ac37a7f3ce7993359fc0a9ee72cb06173ab82e17029e1a731bcf4af360cfc73e3c44c9800ef5
+DIST gramps-5.2.3.tar.gz 21081011 BLAKE2B 1ed8bc46e3c0d49b77194e52a060e5e3627871620f87bb7aca1b112972aecbd94a382cbc03ac07f8ef0424b4e47abbb4245ec4761fce5f5b019bdf41591530a1 SHA512 830af5c7276ff4e6c3a43ce37f1cd7bf345368885489701d17e4fe276f468890b267c5c72d7055e6043dc715e7a7f950e5a2084e31863d338c3487f29561ac75
diff --git a/app-misc/gramps/files/gramps-5.1.3-test_locale.patch b/app-misc/gramps/files/gramps-5.1.3-test_locale.patch
deleted file mode 100644
index 40eba66dd216..000000000000
--- a/app-misc/gramps/files/gramps-5.1.3-test_locale.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-GEDCOM-import tests explicitly set the locale to en_US.UTF8 because they
-assume a US date and time format. That locale is not guaranteed to be
-present and checking that in ebuild is a hassle, therefore use C.UTF8
-instead - it's similar enough.
-
---- a/data/tests/imp_sample.gramps
-+++ b/data/tests/imp_sample.gramps
-@@ -1706,7 +1706,7 @@
-       </style>
-     </note>
-     <note handle="_000000f9000000f9" change="1591544255" id="N0036" type="General">
--      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
-+      <text>Objects referenced by this note were missing in a file imported on 12/25/99 00:00:00.</text>
-     </note>
-   </notes>
- </database>
---- a/gramps/plugins/test/imports_test.py
-+++ b/gramps/plugins/test/imports_test.py
-@@ -51,10 +51,7 @@
- # ------------------------------------------------------------------
- 
- # These tests assume a US date and time format.
--try:
--    locale.setlocale(locale.LC_ALL, 'en_US.utf8')
--except locale.Error:     # seems to fail on Windows system for some reason
--    locale.setlocale(locale.LC_ALL, 'English_United States')
-+locale.setlocale(locale.LC_ALL, 'C.utf8')
- 
- 
- def mock_time(*args):
diff --git a/app-misc/gramps/files/gramps-5.1.6-pep517_setup.patch b/app-misc/gramps/files/gramps-5.1.6-pep517_setup.patch
deleted file mode 100644
index 7853b23ba1b8..000000000000
--- a/app-misc/gramps/files/gramps-5.1.6-pep517_setup.patch
+++ /dev/null
@@ -1,163 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@
- #
- 
- '''
--Gramps distutils module.
-+Gramps setuptools module.
- '''
- 
- #check python version first
-@@ -32,11 +32,11 @@
- if sys.version_info < (3, 2):
-     raise SystemExit("Gramps requires Python 3.2 or later.")
- 
--from distutils import log
--from distutils.core import setup, Command
--from distutils.util import convert_path, newer
--from distutils.command.build import build as _build
--from distutils.command.install import install as _install
-+from setuptools import setup, Command
-+try:
-+    from setuptools.command.build import build as _build
-+except ImportError:
-+    from distutils.command.build import build as _build
- import os
- import glob
- import codecs
-@@ -45,6 +45,9 @@
- from gramps.version import VERSION
- import unittest
- import argparse
-+import logging
-+
-+_LOG = logging.getLogger(".setup")
- 
- # this list MUST be a subset of _LOCALE_NAMES in gen/utils/grampslocale.py
- # (that is, if you add a new language here, be sure it's in _LOCALE_NAMES too)
-@@ -75,6 +78,17 @@
-     packaging = True
- sys.argv = [sys.argv[0]] + passthrough
- 
-+def newer(source, target):
-+    '''
-+    Determines if a target file needs to be rebuilt.
-+
-+    Returns True if the target file doesn't exist or if the source file is
-+    newer than the target file.
-+    '''
-+    if not os.path.exists(target):
-+        return True
-+    return os.path.getmtime(source) > os.path.getmtime(target)
-+
- def intltool_version():
-     '''
-     Return the version of intltool as a tuple.
-@@ -140,7 +154,7 @@
-                 reply = input(ask)
-                 if reply in ['n', 'N']:
-                     raise SystemExit(msg)
--            log.info('Compiling %s >> %s', po_file, mo_file)
-+            _LOG.info('Compiling %s >> %s', po_file, mo_file)
- 
-         #linux specific piece:
-         target = 'share/locale/' + lang + '/LC_MESSAGES'
-@@ -179,7 +193,7 @@
-                     with open(newfile, 'rb') as f_in,\
-                             gzip.open(man_file_gz, 'wb') as f_out:
-                         f_out.writelines(f_in)
--                        log.info('Compiling %s >> %s', filename, man_file_gz)
-+                        _LOG.info('Compiling %s >> %s', filename, man_file_gz)
- 
-                     os.remove(newfile)
-                     filename = False
-@@ -193,30 +207,26 @@
-     '''
-     Merge translation files into desktop and mime files
-     '''
--    for filename in _FILES:
--        filename = convert_path(filename)
--        strip_files(filename + '.in', filename, ['_tip', '_name'])
--
-     i_v = intltool_version()
-     if i_v is None or i_v < (0, 25, 0):
--        log.info('No intltool or version < 0.25.0, build_intl is aborting')
-+        _LOG.info('No intltool or version < 0.25.0, build_intl is aborting')
-         return
-     data_files = build_cmd.distribution.data_files
-     base = build_cmd.build_base
- 
--    merge_files = (('data/gramps.desktop', 'share/applications', '-d'),
--                    ('data/gramps.keys', 'share/mime-info', '-k'),
--                    ('data/gramps.xml', 'share/mime/packages', '-x'),
--                    ('data/gramps.appdata.xml', 'share/metainfo', '-x'))
-+    merge_files = (('gramps.desktop', 'share/applications', '-d'),
-+                    ('gramps.keys', 'share/mime-info', '-k'),
-+                    ('gramps.xml', 'share/mime/packages', '-x'),
-+                    ('gramps.appdata.xml', 'share/metainfo', '-x'))
- 
-     for filename, target, option in merge_files:
--        filenamelocal = convert_path(filename)
-+        filenamelocal = os.path.join('data', filename)
-         newfile = os.path.join(base, filenamelocal)
-         newdir = os.path.dirname(newfile)
-         if not(os.path.isdir(newdir) or os.path.islink(newdir)):
-             os.makedirs(newdir)
-         merge(filenamelocal + '.in', newfile, option)
--        data_files.append((target, [base + '/' + filename]))
-+        data_files.append((target, [base + '/data/' + filename]))
- 
- def strip_files(in_file, out_file, mark):
-     '''
-@@ -232,7 +242,7 @@
-                     line = line.replace(marker, marker[1:])
-                 fb.write(line)
-         old.close()
--        log.info('Compiling %s >> %s', in_file, out_file)
-+        _LOG.info('Compiling %s >> %s', in_file, out_file)
- 
- def merge(in_file, out_file, option, po_dir='po', cache=True):
-     '''
-@@ -262,7 +272,7 @@
-             msg = ('ERROR: %s was not merged into the translation files!\n' %
-                     out_file)
-             raise SystemExit(msg)
--        log.info('Compiling %s >> %s', in_file, out_file)
-+        _LOG.info('Compiling %s >> %s', in_file, out_file)
- 
- class build(_build):
-     """Custom build command."""
-@@ -273,22 +283,6 @@
-         build_intl(self)
-         _build.run(self)
- 
--class install(_install):
--    """Custom install command."""
--    def run(self):
--        resource_file = os.path.join(os.path.dirname(__file__), 'gramps', 'gen',
--                                     'utils', 'resource-path')
--        with open(resource_file, 'w', encoding='utf-8', errors='strict') as fp:
--            if packaging:
--                path = resource_path
--            else:
--                path = os.path.abspath(os.path.join(self.install_data, 'share'))
--            fp.write(path)
--
--        _install.run(self)
--
--        os.remove(resource_file)
--
- class test(Command):
-     """Command to run Gramps unit tests"""
-     description = "run all unit tests"
-@@ -503,7 +497,7 @@
-       url = 'http://gramps-project.org',
-       license = 'GPL v2 or greater',
-       platforms = ['FreeBSD', 'Linux', 'MacOS', 'Windows'],
--      cmdclass = {'build': build, 'install': install, 'test': test},
-+      cmdclass = {'build': build, 'test': test},
-       packages = packages,
-       package_data = {'gramps': package_data},
-       data_files = data_files,
-Binary files a/.setup.py.swp and b/.setup.py.swp differ
diff --git a/app-misc/gramps/gramps-5.1.6-r3.ebuild b/app-misc/gramps/gramps-5.1.6-r3.ebuild
deleted file mode 100644
index 6b5daf8a89da..000000000000
--- a/app-misc/gramps/gramps-5.1.6-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2001-2023 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..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="exif geo postscript +rcs +reports spell test"
-
-# Many tests fail unless the deprecated BerkeleyDB back-end is enabled.
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyicu[${PYTHON_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	')
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-	reports? ( media-gfx/graphviz[postscript?] )
-"
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
-	"${FILESDIR}"/${PN}-5.1.6-pep517_setup.patch
-)
-
-DISTUTILS_ARGS=(
-	--no-compress-manpages
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the ${PF} variable,
-	# and that changes with every revision.
-	sed -i -e "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-
-	# The final part of PEP-517 support, handled with sed in order to avoid
-	# making the patch file too large
-	sed -e "s:_name:name:g" data/holidays.xml.in > data/holidays.xml || die
-	sed -e "s:_tip:tip:g" data/tips.xml.in > data/tips.xml || die
-
-	default
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# setup.py option --resourcepath appears to have problems at the moment
-	echo -n "/usr/share" > "${ED}"$(python_get_sitedir)/${PN}/gen/utils/resource-path || die
-}
-
-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-misc/gramps/gramps-5.2.3.ebuild b/app-misc/gramps/gramps-5.2.3.ebuild
new file mode 100644
index 000000000000..e65eb3ca41c1
--- /dev/null
+++ b/app-misc/gramps/gramps-5.2.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2001-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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="
+	https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif geo postscript +rcs +reports spell test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	')
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+	reports? ( media-gfx/graphviz[postscript?] )
+"
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+)"
+
+DISTUTILS_ARGS=(
+	--no-compress-manpages
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the ${PF} variable,
+	# and that changes with every revision.
+	sed -i -e "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+
+	default
+}
+
+python_test() {
+	# gramps.gen.utils.test.file_test.FileTest.test_mediapath expects existing ~/.gramps
+	# see https://gramps-project.org/bugs/view.php?id=13305
+	mkdir -p "${HOME}/.gramps" || die
+	# we need to populate test data to resources, they are not installed
+	ln -snf "${S}/data/tests" "${BUILD_DIR}/install/usr/share/gramps/tests" || die
+	# test_imp_sample_ged wrongly detects mimetype for OBJE without file in ${S}
+	rm -f data/tests/imp_sample.ged || die
+
+	# TZ=UTC is expected in ged export test, #939161
+	local -x GRAMPS_RESOURCES="${BUILD_DIR}/install/usr/share" GDK_BACKEND=- TZ=UTC
+	eunittest -p "*_test.py"
+
+	# we don't want to install this symlink
+	rm -f "${BUILD_DIR}/install/usr/share/gramps/tests" || die
+}
+
+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-misc/hddled/hddled-0.3.ebuild b/app-misc/hddled/hddled-0.3.ebuild
deleted file mode 100644
index 2e4b5b8cf0bb..000000000000
--- a/app-misc/hddled/hddled-0.3.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 toolchain-funcs
-
-DESCRIPTION="Show hard disk activity using the scroll lock LED"
-HOMEPAGE="http://members.optusnet.com.au/foonly/whirlpool/code/"
-SRC_URI="mirror://gentoo/${P}.c.xz"
-S="${WORKDIR}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	mv ${P}.c ${PN}.c || die
-}
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ${PN} ${PN}.c ${LDFLAGS} || die
-
-	if use X ; then
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DX -lX11 -o x${PN} ${PN}.c ${LDFLAGS} || die
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-
-	if use X ; then
-		dobin x${PN}
-		elog "X version was renamed to x${PN}"
-	fi
-}
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
index e5170c726a7c..0c69109c8e9f 100644
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@@ -1,2 +1 @@
-DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadfc2b291e2fe3612e73f7eca48b3b63032c883f11a8a5764c757625c4a736904d756d451ad0516578040290f SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de
 DIST hello-2.11.tar.gz 1018256 BLAKE2B 6e06e4a3a113fc24bca056197ba004fd97b2076bb2f5d660f337782c9a982a0d80e265e7e1dc22f3467257eab071fe5e252a020234839f30ce767ae5d5ee7a3b SHA512 9b1defc1dd7b6a989d3f64a1cb1c6f47276192d7bacf11282ae8683606eb613473c882c1a5e74c18d641f46584f0735981597a45ae4eb37830a5b4d955e3aec7
diff --git a/app-misc/hello/hello-2.10-r1.ebuild b/app-misc/hello/hello-2.10-r1.ebuild
deleted file mode 100644
index 933565e40f5f..000000000000
--- a/app-misc/hello/hello-2.10-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="GNU \"Hello, world\" application"
-HOMEPAGE="https://www.gnu.org/software/hello/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3+ GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-misc/hyfetch/files/hyfetch-9999-pyproject.patch b/app-misc/hyfetch/files/hyfetch-9999-pyproject.patch
deleted file mode 100644
index ae0a3131d228..000000000000
--- a/app-misc/hyfetch/files/hyfetch-9999-pyproject.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 4b926d90e8f2a5eebfdd68105facff1f99694f5a Mon Sep 17 00:00:00 2001
-From: Bailey Kasin <baileykasin@gmail.com>
-Date: Thu, 28 Sep 2023 13:05:22 -0700
-Subject: [PATCH] [+] Start switch to pyproject.toml
-
-Signed-off-by: Bailey Kasin <baileykasin@gmail.com>
----
- pyproject.toml | 37 +++++++++++++++++++++++++++++++++++
- setup.py       | 52 ++------------------------------------------------
- 2 files changed, 39 insertions(+), 50 deletions(-)
- create mode 100644 pyproject.toml
- mode change 100755 => 100644 setup.py
-
-diff --git a/pyproject.toml b/pyproject.toml
-new file mode 100644
-index 000000000..d30f10c0b
---- /dev/null
-+++ b/pyproject.toml
-@@ -0,0 +1,38 @@
-+[build-system]
-+requires = ["setuptools", "typing_extensions"]
-+build-backend = "setuptools.build_meta"
-+
-+[project]
-+name = "HyFetch"
-+authors = [{ name = "Azalea Gui", email = "me@hydev.org" }]
-+description = "neofetch with flags <3"
-+readme = "README.md"
-+requires-python = ">=3.7"
-+license = { text = "MIT License" }
-+classifiers = [
-+    "License :: OSI Approved :: MIT License",
-+    "Programming Language :: Python :: 3",
-+    "Programming Language :: Python :: 3.7",
-+    "Programming Language :: Python :: 3.8",
-+    "Programming Language :: Python :: 3.9",
-+    "Programming Language :: Python :: 3.10",
-+    "Programming Language :: Python :: 3.11",
-+    "Programming Language :: Python :: 3.12",
-+]
-+dependencies = [
-+    "typing_extensions",
-+    'psutil ; platform_system=="Windows"',
-+    'colorama>=0.4.6 ; platform_system=="Windows"'
-+]
-+dynamic = ["version"]
-+
-+[tool.setuptools]
-+packages = ["hyfetch", "hyfetch.distros"]
-+license-files = ["LICENSE.md"]
-+script-files = ["hyfetch/scripts/neowofetch"]
-+
-+[tool.setuptools.dynamic]
-+version = {attr = "hyfetch.__version__"}
-+
-+[project.scripts]
-+hyfetch = "hyfetch.main:run"
-diff --git a/setup.py b/setup.py
-index 95260a40..60684932 100755
---- a/setup.py	2023-12-02 00:22:33.000000000 -0000
-+++ b/setup.py	2024-05-03 08:58:46.479797868 -0000
-@@ -1,53 +1,3 @@
--#!/usr/bin/env python3
--from pathlib import Path
--from setuptools import setup, find_namespace_packages
-+from setuptools import setup
- 
--# The directory containing this file
--HERE = Path(__file__).parent
--
--# Load version without importing it (see issue #192 if you are confused)
--for l in (HERE / 'hyfetch' / '__version__.py').read_text().strip().splitlines():
--    exec(l)
--
--# The text of the README file
--README = (HERE / "README.md").read_text('utf-8')
--
--# This call to setup() does all the work
--setup(
--    name="HyFetch",
--    version=VERSION,
--    description="neofetch with flags <3",
--    long_description=README,
--    long_description_content_type="text/markdown",
--    url="https://github.com/hykilpikonna/HyFetch",
--    author="Azalea Gui",
--    author_email="me@hydev.org",
--    license="MIT",
--    classifiers=[
--        "License :: OSI Approved :: MIT License",
--        "Programming Language :: Python :: 3",
--        "Programming Language :: Python :: 3.7",
--        "Programming Language :: Python :: 3.8",
--        "Programming Language :: Python :: 3.9",
--        "Programming Language :: Python :: 3.10",
--        "Programming Language :: Python :: 3.11",
--        "Programming Language :: Python :: 3.12",
--    ],
--    packages=find_namespace_packages(),
--    package_data={'hyfetch': ['hyfetch/*']},
--    include_package_data=True,
--    install_requires=[
--        # Universal dependencies
--        'setuptools', 'typing_extensions',
--        
--        # Windows dependencies
--        'psutil ; platform_system=="Windows"',
--        'colorama>=0.4.6 ; platform_system=="Windows"',
--    ],
--    entry_points={
--        "console_scripts": [
--            "hyfetch=hyfetch.main:run",
--        ]
--    },
--    scripts=['hyfetch/scripts/neowofetch']
--)
-+setup()
diff --git a/app-misc/hyfetch/hyfetch-9999.ebuild b/app-misc/hyfetch/hyfetch-9999.ebuild
index 796c87637890..9e69c3b7e081 100644
--- a/app-misc/hyfetch/hyfetch-9999.ebuild
+++ b/app-misc/hyfetch/hyfetch-9999.ebuild
@@ -21,11 +21,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-pyproject.patch
-	"${FILESDIR}"/${PN}-1.4.11-neofetch.patch
-)
-
 RDEPEND="
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
@@ -37,9 +32,12 @@ python_install() {
 	distutils-r1_python_install
 
 	dodir /usr/bin/
-	cp neofetch "${D}/usr/bin/neowofetch" || die
+	python_newexe neofetch neowofetch
 
 	rm -r "${D}/usr/lib/${EPYTHON}/site-packages/hyfetch/scripts" || die
+	rm -r "${D}/usr/lib/${EPYTHON}/site-packages/docs" || die
+	mkdir "${D}/usr/lib/${EPYTHON}/site-packages/hyfetch/scripts" || die
+	cp neofetch "${D}/usr/lib/${EPYTHON}/site-packages/hyfetch/scripts/neowofetch" || die
 }
 
 pkg_postinst() {
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 3df6d707df87..924aaf24e033 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1 +1,2 @@
 DIST khard-0.18.0.tar.gz 602016 BLAKE2B 856190b5972c6b912977a69a4786779d59fafbdea1bc323c8ca8af56c7ce33e09efbe58734db261437ea0e654a8457086174becedb76dacf802f975847e03c63 SHA512 eb1e82b5350febdd388b251514562a2d3776d5f5c8b3c70cd73153eaedc7ac3504b25d88179eced26c96ced90785fac9267cc23b2425fac816c233a2e1f2b9df
+DIST khard-0.19.1.tar.gz 605230 BLAKE2B d0b0186c3006aa44dbdbf61afb81a2e9dbe0f2ecc439d2ebcd1ba33620dbb4f11bf8146e127f8cc8dc18db490b65d4bb1f2dde3962748f0570cf9f529d394ae5 SHA512 619678902abee2561f2cef8d525d9688269f9f4da244b1c5cf97a9c2f15f5d08f80d09bc08304dfe3a7ca44dd5082e0152c5dce82063b6f98ea12b961b34bdf4
diff --git a/app-misc/khard/khard-0.18.0.ebuild b/app-misc/khard/khard-0.18.0.ebuild
index 1f6d9ba081ef..44fcf538cdff 100644
--- a/app-misc/khard/khard-0.18.0.ebuild
+++ b/app-misc/khard/khard-0.18.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit distutils-r1
 
 DESCRIPTION="Console CardDAV client"
@@ -52,7 +52,7 @@ DOCS=(
 	doc/source/examples/khard.conf.example
 )
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
 distutils_enable_sphinx docs
 
 python_compile_all() {
@@ -71,5 +71,5 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	doins misc/zsh/_khard
 
-    distutils-r1_python_install_all
+	distutils-r1_python_install_all
 }
diff --git a/app-misc/khard/khard-0.19.1.ebuild b/app-misc/khard/khard-0.19.1.ebuild
new file mode 100644
index 000000000000..cc08e4b2d294
--- /dev/null
+++ b/app-misc/khard/khard-0.19.1.ebuild
@@ -0,0 +1,75 @@
+# 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="Console CardDAV client"
+HOMEPAGE="
+	https://github.com/lucc/khard
+	https://pypi.org/project/khard/
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lucc/khard"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/sphinx-autoapi
+		dev-python/sphinx-rtd-theme
+		dev-python/sphinx-autodoc-typehints
+	)
+"
+
+DOCS=(
+	CHANGES
+	CONTRIBUTING.rst
+	README.md
+	doc/source/examples/khard.conf.example
+)
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-autoapi \
+	dev-python/sphinx-autodoc-typehints
+
+python_compile_all() {
+	use doc && emake -j1 -C doc/ html text man info
+}
+
+python_install_all() {
+	if use doc; then
+		DOCS+=( doc/build/text/. )
+		HTML_DOCS+=( doc/build/html/. )
+
+		doman doc/build/man/*
+		doinfo doc/build/texinfo/*.info
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/zsh/_khard
+
+	distutils-r1_python_install_all
+}
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 394b8489a23e..f73463151b6e 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,2 +1,3 @@
 DIST livecd-tools-2.10.tar.bz2 9999 BLAKE2B 866bb49d70b8008df30357beb0be7692cee44053bcf25f9544f67ad3ef1f53ddd38604d70ea7db791e6a81cba8de4bc62cd31753bacd01d45d5e6cc558da3d7c SHA512 dbd66a9a6e94b90d06231af2e4d677d97394b765502a72e81a7dcc7ad591d458ad28c69f1de96dc8c9fb10e7ac7031f6595aa89ab8d343f6bfcde875889fdfcb
+DIST livecd-tools-2.11.tar.bz2 20785 BLAKE2B b2abca39a296a399e7328ca5ab247dcf0c79053f76d3105aa7d56430dc5cc26508653252daa9b50022969e91ea881b8bc752788249bd3c80899a591557546339 SHA512 f3a9abe439911de8b52f9255609a20308c88f415c8eebf9562f038b5770640786e3bd60945d069fec0d43b1b713716e699df7578f381f6475e9fafbfe5398374
 DIST livecd-tools-2.9.tar.bz2 9987 BLAKE2B b24ee78aa0111950322b4424d630f640aa2d525c5c87b5ff3397628ed3e1c55eb2dbb71c32cbd5e57fa3a4310af1f541c1acd370b4f829dce49d2beb6f1be442 SHA512 89e892dfa8581e0f1f8208fecb7a686f19da100751e3430b014e90455c391efd2a3d25f3fff046576f8f739090715a2c14bc8c0b1fc9fe7db03455d84426a889
diff --git a/app-misc/livecd-tools/livecd-tools-2.11.ebuild b/app-misc/livecd-tools/livecd-tools-2.11.ebuild
new file mode 100644
index 000000000000..b088e11e6125
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-2.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+KEYMAP_VER=v1.0.0
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="https://gitweb.gentoo.org/proj/livecd-tools.git/"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-util/dialog
+	media-sound/alsa-utils
+	net-dialup/mingetty
+	sys-apps/openrc
+	sys-apps/pciutils
+"
+
+pkg_setup() {
+	ewarn "This package is designed for use on the LiveCD only and will do"
+	ewarn "unspeakably horrible and unexpected things on a normal system."
+	ewarn "YOU HAVE BEEN WARNED!!!"
+
+	CONFIG_CHECK="~SND_PROC_FS"
+	linux-info_pkg_setup
+}
+
+src_install() {
+	doconfd conf.d/*
+	doinitd init.d/*
+	dosbin net-setup
+	into /
+	dosbin livecd-functions.sh
+	# Add the keymap hook for dracut
+	insinto /usr/lib/dracut/modules.d
+	doins -r dracut/90dokeymap
+	insinto /lib
+	doins -r lib/keymaps
+	# Copying Genkernel's hack to create /mnt/gentoo until a cleaner
+	# solution is created.
+	keepdir /mnt/gentoo
+}
diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
index d9caac398248..b088e11e6125 100644
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info
 
+KEYMAP_VER=v1.0.0
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git"
 	inherit git-r3
@@ -15,18 +17,14 @@ fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
 HOMEPAGE="https://gitweb.gentoo.org/proj/livecd-tools.git/"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 
 RDEPEND="
 	dev-util/dialog
 	media-sound/alsa-utils
 	net-dialup/mingetty
-	|| (
-		sys-apps/openrc
-		sys-apps/openrc-navi
-	)
+	sys-apps/openrc
 	sys-apps/pciutils
 "
 
@@ -45,4 +43,12 @@ src_install() {
 	dosbin net-setup
 	into /
 	dosbin livecd-functions.sh
+	# Add the keymap hook for dracut
+	insinto /usr/lib/dracut/modules.d
+	doins -r dracut/90dokeymap
+	insinto /lib
+	doins -r lib/keymaps
+	# Copying Genkernel's hack to create /mnt/gentoo until a cleaner
+	# solution is created.
+	keepdir /mnt/gentoo
 }
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index acba57839f87..678b1b2134a0 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,3 +1,3 @@
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.31.tar.xz 2385632 BLAKE2B aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe SHA512 dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d
-DIST mc-4.8.32_rc1.tar.gz 3072991 BLAKE2B e22cf90530abe7240017688c5659eae14e3bb4d495a61f93c15f00be65459e4cf1ce19b82def55a8c03bf40ca196597cbdf029b55aa1b6542ef4b467355f65a0 SHA512 d9377cfe9214d7a585cf817cf843f4b7238c7d16051c8e19490b5b2786a1e407fa7d500bcb072b8a0ccc5f51bc610778e62091c9cf2f94cd96846dd0f3e44611
+DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8
diff --git a/app-misc/mc/mc-4.8.32.ebuild b/app-misc/mc/mc-4.8.32.ebuild
new file mode 100644
index 000000000000..a26ebf139e63
--- /dev/null
+++ b/app-misc/mc/mc-4.8.32.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${P/_/-}"
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+edit gpm nls 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 )
+"
+
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	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
+}
+
+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
+		$(use_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 NEWS README
+
+	# 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/mc/mc-4.8.32_rc1.ebuild b/app-misc/mc/mc-4.8.32_rc1.ebuild
deleted file mode 100644
index cbd7e1512974..000000000000
--- a/app-misc/mc/mc-4.8.32_rc1.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
-
-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 )"
-
-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/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-	)
-"
-
-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
-
-	# This test fails.  Disable for now
-	# https://midnight-commander.org/ticket/4567
-	rm tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.* || die
-
-	# 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 NEWS README
-
-	# 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 2172c7bf4447..837cb4dc3d59 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,4 +1,5 @@
 DIST openhab-4.1.1.zip 110909555 BLAKE2B df89e2391e8abe926635fc1e0fbb5c7b1f6a03a87ba643d68a3c8bf1ef52f8b6ca862d8655112a225e1ec2f2d9cc90e0906c40a5dc00f52b53fcb4bac8059378 SHA512 50125e025e4ed8f3ea93359a777e0944150cf157b853bc3f6e777c04956c59346d77d4f3680756241d3d71b8c57014f777601cb5ca836b8e80046ce5a5aac770
 DIST openhab-4.1.2.tar.gz 110558399 BLAKE2B b77800898d5358caaadf31e921351d5431a09cf97ad881e091c0f7f7ca6efa13439f39075e15d4887df3b28d2548b10cbf44176328570cf2b8df8fc15bc25ecd SHA512 ccad90d1905f2190cd54284353981453d4d38f1206a427b91094dfd8e8a25e31cc15921544ac883f501ee33d018226b07e12e04bfd5c928771ff090826de3cba
 DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
+DIST openhab-4.2.1.tar.gz 110592664 BLAKE2B 6c1ef4ff6a25904a6bd56c5bbb5d6c08163e14723a61966930ffb96183a5890f86ddc73d316d8b48712b262eae80b7e086cdf53510d5a1a09a596b591fe3d037 SHA512 1d8b4b6b7ef4f76ecaee0355842b5bbfce9c422915bdc345e974bfe7d1c275dc4f8bc317f3e53ed6778d7875c7e7757bb3d26e68e016c1d3fbf1009a6a1e070d
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98
diff --git a/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
index 6625624aba64..683f79d8f3fa 100644
--- a/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
@@ -20,7 +20,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.2.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
new file mode 100644
index 000000000000..6625624aba64
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
@@ -0,0 +1,135 @@
+# 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/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index bc8761ad746a..961ed38ac207 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -81,7 +81,7 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
-	dodoc README.md OpenRGB.patch
+	dodoc README.md
 
 	rm -r "${ED}"/usr/lib/udev/ || die
 	udev_dorules 60-openrgb.rules
diff --git a/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild b/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild
index 9521d77a3fe3..d8692fc1b148 100644
--- a/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.ebuild
+++ b/app-misc/qtxdg-tools/qtxdg-tools-4.0.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 4ad5f8ef7ae9..1809c362172c 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,2 +1 @@
-DIST recoll-1.36.2.tar.gz 3129206 BLAKE2B 0631d8c88f56f3381dd899fa385cba84a720d9d3a49b19b9b344de9542d79e3e5d5e10008fd7dd098795df2a4c79a682ff9a10ff4f99243fa2f7abd99831b553 SHA512 4c7ce5b6f6213ba4cb9266dcd6ea26e56850aa984c343552464766c5036ac6fd2ac6e9e71157997e10e8ba0350d23a4ebc3f2d57978805aa2d33674aa2a6c8b0
 DIST recoll-1.37.4.tar.gz 3135691 BLAKE2B 1c9113cbccb812e522addbc7fec0aa0b958d8616aa1b753aa866e9bb96f78dc0a40bb79a4a8ad016286f2508f1d8dea172d308917a430fa4c98822feaba0d309 SHA512 9e5af5d00191658f23e6a5916718014827f12f4553d9429fe385c0bd1c72f2f49ae97e7d7b8121cb174b299ffe482aa547e4a3aabf2da92e9773bf9eb0f57814
diff --git a/app-misc/recoll/recoll-1.36.2.ebuild b/app-misc/recoll/recoll-1.36.2.ebuild
deleted file mode 100644
index 8984ef8682eb..000000000000
--- a/app-misc/recoll/recoll-1.36.2.ebuild
+++ /dev/null
@@ -1,128 +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 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/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
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
-	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.37.4.ebuild b/app-misc/recoll/recoll-1.37.4.ebuild
deleted file mode 100644
index 422dbf52adef..000000000000
--- a/app-misc/recoll/recoll-1.37.4.ebuild
+++ /dev/null
@@ -1,129 +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 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/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
-	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/remind/Manifest b/app-misc/remind/Manifest
index b3c404c9f04c..ec18c9fc9325 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,2 +1,3 @@
 DIST remind-04.00.03.tar.bz2 390884 BLAKE2B 4f619ec902f76c5c4857ffa85428154ef6fe525cc97bbe92272f3abca3e8cdd39dd45d1c45c5f6e87f0d22dde500dd80629882bdbe93a6b97b5da96757b5af9c SHA512 41d61d267d99d787993cd5bf3889f1fe80f76a0cfe5a7e2d360eb7239a1b5a05b50b3b5cde30c50404813e723545eb805148ca2c6e540eb9aacbf5e8ffd64014
 DIST remind-04.02.02.tar.bz2 413760 BLAKE2B d4e91b531c0e88dc4436a0399103af6c9ae8e642a8df729a49ac6be06e215705c7605424030d92761753637a68a89eea2d935347b40c1b39b626b13e4e7297db SHA512 2d10f8d0066c291d52220fc1c39cfc4948e5f1f94223780b7d4770348b5c9e06e2b8f34e1e193c06f8e74b26d3e4126fcaeea88dbf8900f064610df22e9c8739
+DIST remind-05.00.05.tar.bz2 468131 BLAKE2B dc02e21fa1da4eca47fe59bda3555f0fb7cee8d0eef5cca27be73f1d1053ad7b7c3a23cb7e2648bb88d9d5fbf8b39fbd7bb3df245b0eaf1f76ec6b124928bc2e SHA512 5e9657b3946d69ff1d615e5dead2013381cd12660dc0cdda39f7465227888aeb2cb2bc9c9dc4ab27474df82062520c44605d95339812325257e363b075c3e829
diff --git a/app-misc/remind/remind-05.00.05.ebuild b/app-misc/remind/remind-05.00.05.ebuild
new file mode 100644
index 000000000000..0e6403f27109
--- /dev/null
+++ b/app-misc/remind/remind-05.00.05.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Ridiculously functional reminder program"
+HOMEPAGE="https://dianne.skoll.ca/projects/remind/"
+SRC_URI="https://salsa.debian.org/dskoll/remind/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="tk"
+
+RDEPEND="
+	tk? ( >=dev-lang/tk-8.5 dev-tcltk/tcllib )
+"
+DEPEND="${RDEPEND}
+	dev-perl/Cairo
+	dev-perl/JSON-MaybeXS
+	dev-perl/Pango
+	virtual/perl-Getopt-Long
+"
+DOCS="docs/* examples/defs.rem"
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		ewarn "Testing fails if run as root. Skipping tests"
+	else
+		emake test
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use tk ; then
+		rm \
+			"${D}"/usr/bin/tkremind \
+			"${D}"/usr/share/man/man1/tkremind* \
+			|| die
+	fi
+
+	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
+	insinto /usr/share/${PN}
+	doins -r contrib/
+	insinto /usr/share/vim/vimfiles/syntax
+	doins examples/remind.vim
+}
diff --git a/app-misc/sonypid/Manifest b/app-misc/sonypid/Manifest
index 0b11356fe16a..1c87552abdc1 100644
--- a/app-misc/sonypid/Manifest
+++ b/app-misc/sonypid/Manifest
@@ -1,2 +1 @@
 DIST sonypid-1.9.1.tar.bz2 10089 BLAKE2B 51b1376f6fefc5e04d11431a302b462452c7511ff16fa4598b257b9569987aa817d2f895418fbb545e028360fdde0642f3a41f7fb885bf14868d42c69506c436 SHA512 7bf65f88b719ff511cce82d0def528e054a34274449f5cf9a07f721f5f3a9cb9b328656ff375585ad48405e6511f8b2de6bfe30a78bfba8c85d5e835d8cc0e96
-DIST sonypid-1.9.tar.bz2 9710 BLAKE2B edc68ffe6649b6ad7f8afa41666be514b34593bf5f764f29d1ea0d94c335e2f497b7c31b9f0946210b008d6c37e0647b3327476cbc628db24ba7179dc2c25360 SHA512 fcd2b2d2a9db94cd59b8d0f23c41aca2e738e433ecd6818ce84cc1298f5609c84aa16b75e0ce1323e24bf6bb59feccd28c5016549d0690e6dd2f3aae1244e3d0
diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild
deleted file mode 100644
index d2cabe974388..000000000000
--- a/app-misc/sonypid/sonypid-1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tool to use the Sony Vaios jog-dial as a mouse-wheel"
-HOMEPAGE="https://www.popies.net/sonypi/"
-SRC_URI="https://www.popies.net/sonypi/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-RDEPEND="x11-libs/libXtst"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin sonypid
-	dodoc AUTHORS CHANGES
-}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 5b8dae320eda..8cbd65b85d8b 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,3 +1 @@
-DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
-DIST vifm-0.12.tar.gz 1913398 BLAKE2B 6a1933e5a70a61402ae52259ee9e03515916e9d6df57285726ec6062257d85966a32173142e730fbc35b48250c585a5e66cadba788e2029e5dcd620544341c4f SHA512 9491b1932535daa0ce6bd33ef955bfaedf995da27f049b36bdb0de9aa87a9a4dd6d2e22c8bf79e343febee16ae0fb87edfa8bde9c2d115b92c768e87bc0a8a7d
 DIST vifm-0.13.tar.gz 2218099 BLAKE2B 99661dd0defcb434abdc397855feac5c6da55a783cf8ad6afe333e208c431b9d10f05928fcf5a9f8e28ed4d602f66414162b14a872ce8881526f679e6e66259a SHA512 bd5e9f84cfb176e220e798dcdfc62e2ae3e89dbebd08cf4cce73eb843b85060c2df05f04f4db994d406baf2e0f90a04f5cb871beaf00fb04174464c81dd85938
diff --git a/app-misc/vifm/files/vifm-0.13-musl.patch b/app-misc/vifm/files/vifm-0.13-musl.patch
new file mode 100644
index 000000000000..6682da354187
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.13-musl.patch
@@ -0,0 +1,133 @@
+From c97f144231afbeb4215659d5c685fdf1e3fe5612 Mon Sep 17 00:00:00 2001
+From: xaizek <xaizek@posteo.net>
+Date: Sat, 8 Jul 2023 15:02:37 +0300
+Subject: [PATCH] Fix running tests with musl libc
+
+Thanks to Henrik Holst (a.k.a. hholst80).
+---
+Upstream commit https://github.com/vifm/vifm/commit/c97f144231afbeb4215659d5c685fdf1e3fe5612
+
+diff --git a/src/filelist.c b/src/filelist.c
+index 28d26c69f..a7121f238 100644
+--- a/src/filelist.c
++++ b/src/filelist.c
+@@ -329,7 +329,11 @@ flist_free_view(view_t *view)
+ 	modview_info_free(view->vi);
+ 	view->vi = NULL;
+ 
+-	regfree(&view->primary_group);
++	if(view->primary_group_set)
++	{
++		regfree(&view->primary_group);
++		view->primary_group_set = 0;
++	}
+ 
+ 	marks_clear_view(view);
+ 
+diff --git a/src/opt_handlers.c b/src/opt_handlers.c
+index 5d1c000b0..9905b2b7f 100644
+--- a/src/opt_handlers.c
++++ b/src/opt_handlers.c
+@@ -3301,9 +3301,13 @@ set_sortgroups(view_t *view, char **opt, char value[])
+ 	{
+ 		if(scope == OPT_LOCAL)
+ 		{
+-			regfree(&view->primary_group);
++			if(view->primary_group_set)
++			{
++				regfree(&view->primary_group);
++			}
+ 			(void)regexp_compile(&view->primary_group, first,
+ 					REG_EXTENDED | REG_ICASE);
++			view->primary_group_set = 1;
+ 		}
+ 		free(first);
+ 	}
+diff --git a/src/ui/fileview.c b/src/ui/fileview.c
+index 11c80fe8b..ef5f422be 100644
+--- a/src/ui/fileview.c
++++ b/src/ui/fileview.c
+@@ -253,6 +253,7 @@ fview_init(view_t *view)
+ 	view->sort_groups_g = strdup("");
+ 	(void)regexp_compile(&view->primary_group, view->sort_groups,
+ 			REG_EXTENDED | REG_ICASE);
++	view->primary_group_set = 1;
+ 
+ 	view->preview_prg = strdup("");
+ 	view->preview_prg_g = strdup("");
+diff --git a/src/ui/ui.h b/src/ui/ui.h
+index c9fee0782..886eb9d38 100644
+--- a/src/ui/ui.h
++++ b/src/ui/ui.h
+@@ -449,6 +449,9 @@ struct view_t
+ 	char *sort_groups, *sort_groups_g;
+ 	/* Primary group of sort_groups (not sort_groups_g) in compiled form. */
+ 	regex_t primary_group;
++	/* Indicates that primary_group was initialized, which is used to avoid
++	 * freeing uninitialized data or freeing it twice. */
++	int primary_group_set;
+ 
+ 	int history_num;    /* Number of used history elements. */
+ 	int history_pos;    /* Current position in history. */
+diff --git a/tests/misc/sort.c b/tests/misc/sort.c
+index 9938414b5..3db71db5b 100644
+--- a/tests/misc/sort.c
++++ b/tests/misc/sort.c
+@@ -409,8 +409,13 @@ TEST(groups_sorting_works)
+ 	lwin.dir_entry[6].origin = lwin.curr_dir;
+ 
+ 	update_string(&lwin.sort_groups, "-(done|todo).*");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "-(done|todo).*",
+ 			REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	/* Ascending sorting. */
+ 
+@@ -437,15 +442,17 @@ TEST(groups_sorting_works)
+ 	assert_string_equal("11-todo-publish", lwin.dir_entry[4].name);
+ 	assert_string_equal("1-done", lwin.dir_entry[5].name);
+ 	assert_string_equal("3-done", lwin.dir_entry[6].name);
+-
+-	regfree(&lwin.primary_group);
+-	update_string(&lwin.sort_groups, NULL);
+ }
+ 
+ TEST(global_groups_sorts_entries_list)
+ {
+ 	update_string(&lwin.sort_groups_g, "([0-9])");
++	if(lwin.primary_group_set)
++	{
++		regfree(&lwin.primary_group);
++	}
+ 	(void)regcomp(&lwin.primary_group, "([a-z])", REG_EXTENDED | REG_ICASE);
++	lwin.primary_group_set = 1;
+ 
+ 	dir_entry_t entry_list[] = { { .name = "a1" }, { .name = "b0" } };
+ 	entries_t entries = { entry_list, 2 };
+diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c
+index 932bdc9c9..e3d9ba694 100644
+--- a/tests/test-support/test-utils.c
++++ b/tests/test-support/test-utils.c
+@@ -32,6 +32,7 @@
+ #include "../../src/utils/macros.h"
+ #include "../../src/utils/matcher.h"
+ #include "../../src/utils/path.h"
++#include "../../src/utils/regexp.h"
+ #include "../../src/utils/str.h"
+ #include "../../src/utils/string_array.h"
+ #include "../../src/utils/utils.h"
+@@ -254,6 +255,10 @@ view_setup(view_t *view)
+ 	view_set_sort(view->sort, SK_BY_NAME, SK_NONE);
+ 	view_set_sort(view->sort_g, SK_BY_NAME, SK_NONE);
+ 
++	/* The code assumes that this field is initialized. */
++	assert_success(regexp_compile(&view->primary_group, "", REG_ICASE));
++	view->primary_group_set = 1;
++
+ 	view->custom.entry_count = 0;
+ 	view->custom.entries = NULL;
+ 
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index d48a2ae9eff2..408df775c61b 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -14,7 +14,6 @@
 	conjunto de órdenes.
 	</longdescription>
 	<use>
-		<flag name="developer">Enable features of interest to developers</flag>
 		<flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
 		<flag name="gtk">Use gtk+ to determine mimetypes</flag>
 		<flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
diff --git a/app-misc/vifm/vifm-0.11.ebuild b/app-misc/vifm/vifm-0.11.ebuild
deleted file mode 100644
index 9927dd8f487f..000000000000
--- a/app-misc/vifm/vifm-0.11.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools vim-doc xdg
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86"
-IUSE="developer +extended-keys gtk +magic +vim +vim-syntax X"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_install() {
-	default
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins -r data/vim/doc/${t}/${PN}*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins -r data/vim/${t}/${PN}*
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vifm/vifm-0.12.ebuild b/app-misc/vifm/vifm-0.12.ebuild
deleted file mode 100644
index 0084f374fe4d..000000000000
--- a/app-misc/vifm/vifm-0.12.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools vim-doc xdg
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="+extended-keys gtk +magic +vim +vim-syntax X"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )"
-
-RDEPEND="${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# developer just turns off optimisations and adds -Werror again
-	# bug #855386
-	econf \
-		--disable-developer \
-		--disable-werror \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_install() {
-	default
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins -r data/vim/doc/${t}/${PN}*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins -r data/vim/${t}/${PN}*
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vifm/vifm-0.13-r1.ebuild b/app-misc/vifm/vifm-0.13-r1.ebuild
new file mode 100644
index 000000000000..524072b9c243
--- /dev/null
+++ b/app-misc/vifm/vifm-0.13-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools vim-doc xdg
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vifm/vifm"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+extended-keys gtk +magic +vim +vim-syntax X"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:=
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# "Either perl or Vim is necessary to generate tags for documentation in Vim's format." from configure
+BDEPEND="|| ( dev-lang/perl app-editors/vim )"
+
+PATCHES=(
+	# Bacported fix from upstream,
+	# see also https://github.com/vifm/vifm/issues/913
+	"${FILESDIR}/${P}-musl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# developer just turns off optimisations and adds -Werror again
+	# bug #855386
+	econf \
+		--disable-developer \
+		--disable-werror \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	default
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/doc/${t}/${PN}*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/${t}/${PN}*
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index b784c00a4f27..6e8d9bc597c7 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,3 +1 @@
-DIST ytree-2.05.tar.gz 124141 BLAKE2B 88f545594069b30deda51294f42f293a244eec19fcd3cdd46139612ee19204e190ecec75cd2286480a0650715ad7d7bdce9806407c3d2d66c77af45d2993d18a SHA512 561255992492c0251892512999de1e8351e1f589fc38404755c4afe753873abb37b1ffec53de0a153a6870ccf6d665fccaa08f3dc9c8a04903175bcb6c278129
-DIST ytree-2.08.tar.gz 120455 BLAKE2B 8252f4895732fe91140f60e18b2e3add34331e0cd8450878f37c19ccfbbb580a6adebf3018db656c668f5d38abb4501b938f73cff6fd3efe65245e9a9110e1ca SHA512 048af56db016a643cefe2a0c3ccf4640a7ab874f0cc4bdcf541801bdaa0b11609934623f651d8511ab7ad783458926b5311e22f18862c831aa8c6b5630b0dc6e
 DIST ytree-2.09.tar.gz 121209 BLAKE2B 51acea07f345694ca164dc81dac2e6bb54ce53970d42ee60cbfe0511e3fc7663ef23e8006af136fb2a5d7416313664db64cd2897cc7be71046746db3c17f1211 SHA512 6220345d89791b0ac7a68c4ac477e669cd2c50fb25002b1c4742f811f2dd4ec89385e5a920e5ef815e8eb1efa935d388f096216a94971a0ef3b90789ead8663b
diff --git a/app-misc/ytree/ytree-2.05.ebuild b/app-misc/ytree/ytree-2.05.ebuild
deleted file mode 100644
index d1de1eb2536b..000000000000
--- a/app-misc/ytree/ytree-2.05.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.08.ebuild b/app-misc/ytree/ytree-2.08.ebuild
deleted file mode 100644
index 22e983bf444f..000000000000
--- a/app-misc/ytree/ytree-2.08.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 toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.09.ebuild b/app-misc/ytree/ytree-2.09.ebuild
index 8525ec06e24c..d86278be06e2 100644
--- a/app-misc/ytree/ytree-2.09.ebuild
+++ b/app-misc/ytree/ytree-2.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	sys-libs/ncurses:0=
diff --git a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
index 93350d080235..c5eac4319329 100644
--- a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
+	EGIT_REPO_URI="https://git.code.sf.net/p/dfu-util/dfu-util"
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
diff --git a/app-mobilephone/dfu-util/dfu-util-9999.ebuild b/app-mobilephone/dfu-util/dfu-util-9999.ebuild
index 7204f3fb82a4..86f93de93c65 100644
--- a/app-mobilephone/dfu-util/dfu-util-9999.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
+	EGIT_REPO_URI="https://git.code.sf.net/p/dfu-util/dfu-util"
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index e9a2e5b5577c..ddcf8d9d70ce 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,2 +1,2 @@
-DIST heimdall-2.0.1.tar.gz 83642 BLAKE2B 29cd784a4ea4c25f9670d27c306ca95d60d7ad8a11175d2ee835a0cf1e7fc5eb179aa4e49c5e05e280ed5ce475a9e66e56b48444dd4b3b93ea8cb173e3d18060 SHA512 f6df4551702a7ad7688018d60569b8b94f20be4f78a9b4bf5f6e89396ed43cd7519617ef1f420b41bbfeec8b51ae636759a7b90443d3d5945cd8744b43e2d0ef
 DIST heimdall-2.0.2.tar.gz 83619 BLAKE2B 783f94243730a53f25e8d6d95b4c0839d727a5290aed72948fa7e7a3f4217b3ef1cbfc5e3cd828642d0eb5e965b153097d9dfde11d6fcec2066364a444899f41 SHA512 62849bfe7550214dd774efea65169673fa916f9d204000f793d995aed9def95fcc895c8913cd648f2397ab7fd154257e0394b78c180ed60d043c75858bac7c0a
+DIST heimdall-2.1.0.tar.gz 69505 BLAKE2B b35b53d705cc3e6db4041e5941aefaf86217ea920fd26ed9a861eb5b8f94a8f3d5babbdfcf430a85a01e6b5130e381d95720062d1955abf63f83db1ba3e87c5c SHA512 75c58cdfaa183e1a8a73127875f716cf168da3a109eefafc7bf1fe9573b9d716da23ff15d0df93474568a678a1b38e71611c745b688c3bc024e70672d921fdd6
diff --git a/app-mobilephone/heimdall/heimdall-2.0.1.ebuild b/app-mobilephone/heimdall/heimdall-2.0.1.ebuild
deleted file mode 100644
index b1c61d9f7b06..000000000000
--- a/app-mobilephone/heimdall/heimdall-2.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://git.sr.ht/~grimler/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-	S="${WORKDIR}/Heimdall-v${PV}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~grimler/Heimdall"
-fi
-
-DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
-HOMEPAGE="https://git.sr.ht/~grimler/Heimdall https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gui"
-
-RDEPEND="
-	sys-libs/zlib
-	virtual/libusb:1=
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_FRONTEND=$(usex !gui)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/bin/heimdall
-	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
-	udev_dorules heimdall/60-heimdall.rules
-	dodoc README.md Linux/README
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/app-mobilephone/heimdall/heimdall-2.0.2.ebuild b/app-mobilephone/heimdall/heimdall-2.0.2.ebuild
index 7595551d2aa5..7e308dc208fe 100644
--- a/app-mobilephone/heimdall/heimdall-2.0.2.ebuild
+++ b/app-mobilephone/heimdall/heimdall-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://git.sr.ht/~grimler/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 	S="${WORKDIR}/Heimdall-v${PV}"
 else
 	inherit git-r3
diff --git a/app-mobilephone/heimdall/heimdall-2.1.0.ebuild b/app-mobilephone/heimdall/heimdall-2.1.0.ebuild
new file mode 100644
index 000000000000..4869617d580c
--- /dev/null
+++ b/app-mobilephone/heimdall/heimdall-2.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="
+	https://git.sr.ht/~grimler/Heimdall
+	https://glassechidna.com.au/heimdall/
+	https://github.com/Benjamin-Dobell/Heimdall
+"
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://git.sr.ht/~grimler/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Heimdall-v${PV}"
+
+	KEYWORDS="~amd64 ~arm64"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~grimler/Heimdall"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gui"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/libusb:1=
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_FRONTEND=$(usex !gui)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	udev_dorules heimdall/60-heimdall.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
index 69599346a8bb..4869617d580c 100644
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake udev
 
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="
+	https://git.sr.ht/~grimler/Heimdall
+	https://glassechidna.com.au/heimdall/
+	https://github.com/Benjamin-Dobell/Heimdall
+"
+
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://git.sr.ht/~grimler/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
 	S="${WORKDIR}/Heimdall-v${PV}"
+
+	KEYWORDS="~amd64 ~arm64"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~grimler/Heimdall"
 fi
 
-DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
-HOMEPAGE="https://git.sr.ht/~grimler/Heimdall https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
-
 LICENSE="MIT"
 SLOT="0"
 IUSE="gui"
@@ -41,10 +46,9 @@ src_configure() {
 }
 
 src_install() {
-	dobin "${BUILD_DIR}"/bin/heimdall
-	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+	cmake_src_install
+
 	udev_dorules heimdall/60-heimdall.rules
-	dodoc README.md Linux/README
 }
 
 pkg_postinst() {
diff --git a/app-office/abiword/abiword-3.0.5-r1.ebuild b/app-office/abiword/abiword-3.0.5-r1.ebuild
index 4e942cdb2686..f753d91ff68a 100644
--- a/app-office/abiword/abiword-3.0.5-r1.ebuild
+++ b/app-office/abiword/abiword-3.0.5-r1.ebuild
@@ -86,6 +86,8 @@ PATCHES=(
 	"${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch
 	"${FILESDIR}"/${PN}-3.0.5-musl-lose-precision-fix.patch
 	"${FILESDIR}"/${PN}-3.0.5-libxml2-2.12.patch
+	# https://bugs.gentoo.org/922633
+	"${FILESDIR}"/${PN}-3.0.5-gcc14.patch
 )
 
 src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.5-gcc14.patch b/app-office/abiword/files/abiword-3.0.5-gcc14.patch
new file mode 100644
index 000000000000..aa0519c0d43a
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.5-gcc14.patch
@@ -0,0 +1,12 @@
+diff --git a/plugins/mathview/itex2mml/itex2MML.y b/plugins/mathview/itex2mml/itex2MML.y
+index c4e1cc5..60bc842 100644
+--- a/plugins/mathview/itex2mml/itex2MML.y
++++ b/plugins/mathview/itex2mml/itex2MML.y
+@@ -1804,6 +1804,7 @@ static void itex2MML_keep_error (const char * msg)
+   itex2MML_last_error = itex2MML_copy_escaped (msg);
+ }
+ 
++int itex2MML_do_html_filter (const char *, unsigned long, const int);
+ int itex2MML_html_filter (const char * buffer, unsigned long length)
+ {
+   return itex2MML_do_html_filter (buffer, length, 0);
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index 61f8e29b6277..c2c35f810d02 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -22,6 +22,6 @@
     <flag name="wordperfect">Enable wordperfect file support via <pkg>app-text/libwpd</pkg></flag>
   </use>
   <upstream>
-    <remote-id type="gnome-gitlab">World/abiword</remote-id>
+    <remote-id type="gnome-gitlab">World/AbiWord</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index d7c2d4419fe5..5a47f72b8b0a 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,2 @@
 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc
-DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
+DIST calligra-4.0.1.tar.xz 57780728 BLAKE2B 0ea82f5b21d36e04222db4ee282048b61a6d144630cc26d007d722fa8fc3081ee38e8f54b7256f9e722cccedc7ddc7489e3a3bd7dff34263d81cd5a7081aa6b2 SHA512 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78
diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild
deleted file mode 100644
index 0503c3fba007..000000000000
--- a/app-office/calligra/calligra-3.2.1-r9.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
-
-CHECKREQS_DISK_BUILD="4G"
-CMAKE_REMOVE_MODULES_LIST=( FindGSL )
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit check-reqs ecm flag-o-matic kde.org
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	PATCHSET="${P}-patchset-1"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-fi
-
-CAL_FTS=( karbon sheets stage words )
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
-	okular +pdf phonon spacenav +truetype X
-	$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
-
-RESTRICT="test"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-COMMON_DEPEND="
-	dev-lang/perl
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${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/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	charts? ( dev-libs/kdiagram:5 )
-	crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
-	gsl? ( sci-libs/gsl:= )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? ( media-libs/lcms:2 )
-	okular? ( || (
-		media-gfx/okularpart:5
-		kde-apps/okular:5
-	) )
-	pdf? ( app-text/poppler:=[qt5] )
-	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	lcms? ( dev-libs/imath:3 )
-	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	gemini? (
-		>=dev-qt/qtquickcontrols-${QTMIN}:5
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cmake-3.16.patch # bug 796224
-	"${WORKDIR}"/${PATCHSET}/${P}-{openexr-3,imath-{1,2}}.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cxx17-for-poppler-22.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-cxx17-fixes.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.03.0-{1,2}.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
-	"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
-	"${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
-	"${FILESDIR}"/${P}-clang-16-configure.patch
-	"${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	ecm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	if has_version "media-gfx/okularpart:5"; then
-		eapply "${FILESDIR}/${P}-okularpart.patch"
-	fi
-
-	ecm_src_prepare
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	ecm_punt_bogus_dep Qt5 Declarative
-	ecm_punt_bogus_dep Qt5 OpenGL
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use okular && myproducts+=( OKULAR )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package charts KChart)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake_use_find_package gemini Libgit2)
-		$(cmake_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	ecm_src_configure
-}
diff --git a/app-office/calligra/calligra-4.0.1.ebuild b/app-office/calligra/calligra-4.0.1.ebuild
new file mode 100644
index 000000000000..f27d1244b2d1
--- /dev/null
+++ b/app-office/calligra/calligra-4.0.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+PATCHSET="${PN}-3.2.1-patchset-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon
+	+truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+RESTRICT="test"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+	dev-lang/perl
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(-)]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[designer]
+	>=kde-frameworks/karchive-${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/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/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${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
+	sys-libs/zlib
+	virtual/libiconv
+	charts? ( dev-libs/kdiagram:6 )
+	crypt? ( dev-libs/openssl:= )
+	fontconfig? ( media-libs/fontconfig )
+	gsl? ( sci-libs/gsl:= )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? ( media-libs/lcms:2 )
+	okular? ( kde-apps/okular:6 )
+	pdf? ( app-text/poppler:=[qt6] )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] )
+	truetype? ( media-libs/freetype:2 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	lcms? ( dev-libs/imath:3 )
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use okular && myproducts+=( OKULAR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package charts KChart6)
+		$(cmake_use_find_package crypt OpenSSL)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		$(cmake_use_find_package phonon Phonon4Qt6)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular6=$(usex okular)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+		-DWITH_Freetype=$(usex truetype)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+	)
+
+	ecm_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
deleted file mode 100644
index c723eca0b75f..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://invent.kde.org/office/calligra/-/merge_requests/81
-https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586
-
-From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Wed, 19 Apr 2023 10:34:25 +0200
-Subject: [PATCH] Avoid implicit declaration of atoi in CMake check
-
-Future compilers will not support implicit function declarations by
-default, so include <stdlib.h> for a declaration of atoi.
---- a/cmake/TestModernZlib.c
-+++ b/cmake/TestModernZlib.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include <string.h>
- #include <zlib.h>
- 
--- 
-GitLab
diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch b/app-office/calligra/files/calligra-3.2.1-okularpart.patch
deleted file mode 100644
index 75a3b0d05416..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-okularpart.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 15 Mar 2024 12:39:45 +0100
-Subject: [PATCH] Switch okular headers to okular5
-
-Otherwise it will be using okular6's.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +-
- extras/okularodpgenerator/OkularOdpGenerator.h   | 6 +++---
- extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +-
- extras/okularodtgenerator/OkularOdtGenerator.h   | 6 +++---
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp b/extras/okularodpgenerator/OkularOdpGenerator.cpp
-index 823d039b3b0..a4614f38f6b 100644
---- a/extras/okularodpgenerator/OkularOdpGenerator.cpp
-+++ b/extras/okularodpgenerator/OkularOdpGenerator.cpp
-@@ -33,7 +33,7 @@
- #include <KoDocumentInfo.h>
- #include <KoGlobal.h>
- 
--#include <okular/core/page.h>
-+#include <okular5/core/page.h>
- 
- #include <KLocalizedString>
- 
-diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h b/extras/okularodpgenerator/OkularOdpGenerator.h
-index 9107c52c52b..5564ec7f881 100644
---- a/extras/okularodpgenerator/OkularOdpGenerator.h
-+++ b/extras/okularodpgenerator/OkularOdpGenerator.h
-@@ -22,9 +22,9 @@
- 
- #include "kookulargenerator_odp_export.h"
- 
--#include <okular/core/generator.h>
--#include <okular/core/document.h>
--#include <okular/core/version.h>
-+#include <okular5/core/generator.h>
-+#include <okular5/core/document.h>
-+#include <okular5/core/version.h>
- 
- class KoPADocument;
- 
-diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp b/extras/okularodtgenerator/OkularOdtGenerator.cpp
-index 9ba114d6080..bccfb11a068 100644
---- a/extras/okularodtgenerator/OkularOdtGenerator.cpp
-+++ b/extras/okularodtgenerator/OkularOdtGenerator.cpp
-@@ -41,7 +41,7 @@
- #include <KoTextLayoutRootArea.h>
- #include <KoCharAreaInfo.h>
- 
--#include <okular/core/page.h>
-+#include <okular5/core/page.h>
- 
- 
- OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList &args )
-diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h b/extras/okularodtgenerator/OkularOdtGenerator.h
-index d3e9692b385..994a81aae2c 100644
---- a/extras/okularodtgenerator/OkularOdtGenerator.h
-+++ b/extras/okularodtgenerator/OkularOdtGenerator.h
-@@ -22,9 +22,9 @@
- 
- #include "kookulargenerator_odt_export.h"
- 
--#include <okular/core/generator.h>
--#include <okular/core/document.h>
--#include <okular/core/version.h>
-+#include <okular5/core/generator.h>
-+#include <okular5/core/document.h>
-+#include <okular5/core/version.h>
- 
- class KWDocument;
- 
--- 
-2.44.0
-
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
deleted file mode 100644
index 2ef45d675e3b..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt calligra-3.2.1-dwok/CMakeLists.txt
---- calligra-3.2.1-orig/CMakeLists.txt	2024-06-05 13:06:55.730007129 +0200
-+++ calligra-3.2.1-dwok/CMakeLists.txt	2024-06-05 13:08:00.587082911 +0200
-@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD)
- endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
- 
--set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01
-+set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04
- 
- ############
- #############
-diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h calligra-3.2.1-dwok/libs/pigment/lut.h
---- calligra-3.2.1-orig/libs/pigment/lut.h	2024-06-05 13:06:55.922010313 +0200
-+++ calligra-3.2.1-dwok/libs/pigment/lut.h	2024-06-05 13:09:24.460474108 +0200
-@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32;
-   template<>                                                                      \
-   class LutKey<_INT_TYPE_> {                                               \
-     public:                                                                       \
--      LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \
-+      LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max)             \
-       {                                                                           \
-       }                                                                           \
-     public:                                                                       \
-@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3
-   template<>                                                                      \
-   class FullLutKey<_INT_TYPE_> {                                                  \
-     public:                                                                       \
--      FullLutKey<_INT_TYPE_>()                                                    \
-+      FullLutKey()                                                                \
-       {                                                                           \
-       }                                                                           \
-     public:                                                                       \
-@@ -233,7 +233,7 @@ class LutKey<float> {
-       float f;
-     };
-   public:
--    LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision)
-+    LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision)
-     {
-       // Those values where computed using the test_linear and setting the shift and then using
-       // the standard deviation.
diff --git a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
deleted file mode 100644
index 07e31a0ed77d..000000000000
--- a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001
-From: Dan Leinir Turthra Jensen <admin@leinir.dk>
-Date: Thu, 29 Apr 2021 13:02:39 +0100
-Subject: [PATCH] Fix GSL find module
-
-This increases the CMake requirement to 3.2 so we can use the GSL find
-module that ships with CMake since then. The custom find module
-apparently doesn't work right on Windows, so...
----
- sheets/plugins/solver/CMakeLists.txt |  4 +-
- 1 filee changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/CMakeLists.txt
-index 41bc4a77ae9..ecd4bd8d218 100644
---- a/sheets/plugins/solver/CMakeLists.txt
-+++ b/sheets/plugins/solver/CMakeLists.txt
-@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver sheetssolver.desktop)
- 
- 
- target_link_libraries( sheetssolver
--        ${GSL_LIBRARIES}
--        ${GSL_CBLAS_LIBRARIES}
-+        GSL::gsl
-+        GSL::gslcblas
-         calligrasheetscommon
- )
- 
--- 
-GitLab
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index b581a8d5393a..e6dded498c02 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -12,15 +12,14 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="cpe">cpe:/a:calligra:calligra</remote-id>
+		<remote-id type="kde-invent">office/calligra</remote-id>
 	</upstream>
 	<use>
-		<flag name="activities">Enable kactivities support</flag>
 		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
-		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
-		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 5f5d4e199afe..e2c27b4d75ee 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,2 +1,3 @@
 DIST homebank-5.8.1.tar.gz 3722739 BLAKE2B 23042c8fc952faf2da039934f4b82c9c5949649647bac1861cf291dc360929911316fa912e676bd1b2d87f7290e0b6a4fdce035b1e7ca6558bf613365f71e8d6 SHA512 900228b813c79bd4a5f1257a51e422e4748c7b7e9945d6d9c72c04097caf2275dd8294fd901a55fa6110c8c75be418e89a3a541a3350d350ef01b052e0cfb1f6
 DIST homebank-5.8.2.tar.gz 3771644 BLAKE2B b660ebbab36ce7f42f9db662e0f2dc62fbac425ea91e2335bbcea14bce799f6b2e79fe130a56e47880cf0b55c86095fecc1b9583f91738126122f94e2ba1c241 SHA512 f241a8569209b9504e1a68b3c72168147641666e838a3a0160e56efcf2070c016a1ae906d7fcea8ac26e6785a74f5bf571a3f14f82bd8daa1f0cf33b0c7be983
+DIST homebank-5.8.3.tar.gz 3773027 BLAKE2B 0af8b22b113c1be391cee455666ed767c9edefbba3973cdbdd85ca020611a5a8d992d85ee7b5e39ec56ea6693b4ee147cc05591623cb10d71b17466e7c205db2 SHA512 20b08c2329c7f11a4317b460be3e3b99072dab618965f9c96b21ed9355843e3cbb68730fa1517a5c6c90f9ab9fa53f7ed1e4f6d5af62a32d7d92e82acf342944
diff --git a/app-office/homebank/homebank-5.8.2.ebuild b/app-office/homebank/homebank-5.8.2.ebuild
index b794b4f11bfc..6fe8275d16b7 100644
--- a/app-office/homebank/homebank-5.8.2.ebuild
+++ b/app-office/homebank/homebank-5.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+ofx"
 
 RDEPEND="
diff --git a/app-office/homebank/homebank-5.8.3.ebuild b/app-office/homebank/homebank-5.8.3.ebuild
new file mode 100644
index 000000000000..b794b4f11bfc
--- /dev/null
+++ b/app-office/homebank/homebank-5.8.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="
+	https://www.gethomebank.org/
+	https://launchpad.net/homebank
+"
+SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+ofx"
+
+RDEPEND="
+	>=dev-libs/glib-2.39:2
+	net-libs/libsoup:3.0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	ofx? ( >=dev-libs/libofx-0.8.3:= )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	>=dev-util/intltool-0.40.5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	econf $(use_with ofx)
+}
diff --git a/app-office/joplin-desktop/Manifest b/app-office/joplin-desktop/Manifest
index 935a96cabb85..61ba1d4cb866 100644
--- a/app-office/joplin-desktop/Manifest
+++ b/app-office/joplin-desktop/Manifest
@@ -1,4 +1,4 @@
-DIST Joplin-3.0.12.AppImage 239283737 BLAKE2B 69c18d9cd77e0352a3c21e0225f9d6b866f5d1983a66700bb4a9fcd87c0c4476dbe292f0b1a7a3b8962c9dfef1d518501933a509772cd06661991e0edddb5fc3 SHA512 e53448e5cca06a33b16bef12df447b52b00287c0c73658523a261145efb8d3877dd662ff256a96d612b82390fed9431e8377baf16a0c28d1f6fc1062c2cde06a
 DIST Joplin-3.0.13.AppImage 239287815 BLAKE2B 0766d60d974698758872c046046b133629583f06cbc3b4fd33d0f4886bc7eba3188a47ec5205b5396dbe7a4bd537c0c9ec9677ace97a03dc0d0087c540bb1dd9 SHA512 f96ca6dfb18a5794236e16fd0c0e0c851af2cc20ecfd6095ebbdbf74bd29888726676744196927f84f5f03518ad2bb3960bb599c149b480b8a2383e936eb4a30
 DIST Joplin-3.0.14.AppImage 239287839 BLAKE2B 3aedf934239f2f20da76a7a59e1e11587a7ad7aadbab3718be79d62100c5b98560c9856a16948dea4f0f2f2a1c3e412dadb27d5c88b5f4c23be922775d611b08 SHA512 27e44ae52c9954f5ce1b2cb96e2287725d1371262c645eb73953cbe4de9e1ce875211842a666153b8e4820e3117f91249f2e9ee7770e24b15383a269ce6829ce
-DIST Joplin-3.0.2.AppImage 253581812 BLAKE2B aa125e8bae0af2ff2e156378d221fd09dda43452b003da36486a59abb7323f81999242475450ab7e164712a060be4f59de68cfcf0736b5237db0e6f0b2914164 SHA512 da53055e23c8bf87e630bf2546c959b2b7a97d65193893c421793259055318ef5ba72f1ca897bcd60e76cc1f060db4f2bc4a39303640872301a7984dd4d7620a
+DIST Joplin-3.0.15.AppImage 239276178 BLAKE2B 749095fd4e89a876155b4f83b87ec461df3054d75b81eb13c62383d6ba43fb7e846f9d48a855a14d6a4b8cb26e6660e28d08dca5e5f9a7191d21c29982ad250e SHA512 ace649b9e4c4039e0e85f6fee6a9e39b850601ae493a4b98451f651ca24fd9177fad89b5b81cb116b3b41c82b7ccd76f870f0293ca8398d20cdb74e992b9b0c8
+DIST Joplin-3.1.3.AppImage 241399868 BLAKE2B a8a6960788dd0e703387fa3e88722513d6a394d4b347b6a69e0cf0079c2e4ce276e21fac60fe9a7a8f573259cdce5dc19dd871c06b6faffeedf5f6ded874a930 SHA512 b49bfed97bcc2210ef6c74d5a431d0620fe43332418486cc854e2f525c9e93d62682a732a03e977ed42ca55eabcde5e897406c3ecf4cc6d86fa6e333a71b9345
diff --git a/app-office/joplin-desktop/joplin-desktop-3.0.14.ebuild b/app-office/joplin-desktop/joplin-desktop-3.0.14.ebuild
index a9c365263d83..8178f87f501f 100644
--- a/app-office/joplin-desktop/joplin-desktop-3.0.14.ebuild
+++ b/app-office/joplin-desktop/joplin-desktop-3.0.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist"
 
 RDEPEND="
diff --git a/app-office/joplin-desktop/joplin-desktop-3.0.12.ebuild b/app-office/joplin-desktop/joplin-desktop-3.0.15.ebuild
index a9c365263d83..a9c365263d83 100644
--- a/app-office/joplin-desktop/joplin-desktop-3.0.12.ebuild
+++ b/app-office/joplin-desktop/joplin-desktop-3.0.15.ebuild
diff --git a/app-office/joplin-desktop/joplin-desktop-3.0.2.ebuild b/app-office/joplin-desktop/joplin-desktop-3.0.2.ebuild
deleted file mode 100644
index 8178f87f501f..000000000000
--- a/app-office/joplin-desktop/joplin-desktop-3.0.2.ebuild
+++ /dev/null
@@ -1,103 +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/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.1.3.ebuild b/app-office/joplin-desktop/joplin-desktop-3.1.3.ebuild
new file mode 100644
index 000000000000..a9c365263d83
--- /dev/null
+++ b/app-office/joplin-desktop/joplin-desktop-3.1.3.ebuild
@@ -0,0 +1,103 @@
+# 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/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/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index a5c40ea37880..90291c6a708b 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,12 @@
-DIST amd64-debug-libreoffice-7.6.4.1.tar.xz 1546322676 BLAKE2B e3a87fa3d91ecb517cef0dd0e941610cc6c879d95f2eae3bf8f6e0756c0275c8ce95a15898d7a4c4a2497dee81ead2a3fc1ab1d12f394022c597e9e57bc48b00 SHA512 6e052fd9e0c6204fbb8226e8d8c44325775cc6b03571decdf88fab82df64c0fe281c1eeeed12e4429c1971a6a2ed43d0eb6163ec564fffdfb2ad3ebb3e6adced
-DIST amd64-debug-libreoffice-gnome-7.6.4.1.xd3 328596750 BLAKE2B f3baab2ac907d27b31c4b321fc27784f42ebd093ed9322222decdad8229d0466f57c9cb9ab04ac79546c1ddb276f1877008c7a3b0b4169efeed6a4a92236fd8a SHA512 caab6fbc535bd9a2a909133284f8fe894812490ecc2c5ce42fa51adb681eeed9be709aeade4ed23532500a466e9e585c892466265e3b189a3abbd01a550bbaf2
-DIST amd64-debug-libreoffice-gnome-java-7.6.4.1.xd3 762003957 BLAKE2B 538c24350586e967e6db2753923b278198571f0d87b21cb25f712822e07d7248a1fbb5377ea486f06a08b53afeb7981aa060e8e862d5de5260792d1645eacf38 SHA512 1d73f44066a035fa2b66df9cc4bb0ef27a71ecdc3f40a1ce031ab342e9c594446db2cfbd29886e3a31f44c702905d0f18f394abc6b449d02f8c86d046d4cab61
-DIST amd64-debug-libreoffice-java-7.6.4.1.xd3 760673801 BLAKE2B 4871e690389580f9eeff897b0a933aaae8b3927db2625595e50304d1f922793fa1194de77cd5f23cc1998bff741df7608ed453f767385560c62820c11728b67b SHA512 ceae4ed6f8ecb216d2d1fcc7fc39d2d1240963859335b52553c833ed332f5577c4a519b3734c4f2e2f83c7d1877837db2fe043d8bf6fee026de4918e23c70923
-DIST amd64-debug-libreoffice-kde-7.6.4.1.xd3 444926588 BLAKE2B cab332739944f8b9858362aed6c1507947c3571601fbf709638ef0a2b3bf6f0081d4fbeba14cb55587735156f12f121f08b90ed4f2c6198acba2b6e9dd55a337 SHA512 ade82b758e997068766f714b63a56c985c219c4ce266452a20aad6180e4a70acb8f0211bfbd8941860e9d7651b39e437149c3ce7508cc07516a1170e9b5919d4
-DIST amd64-debug-libreoffice-kde-java-7.6.4.1.xd3 769801942 BLAKE2B 970bb24d3b6dc617bd29614aeda50137ede2877fbb4547818f437a493c2d684888aff49ae5343100d237d1be25b114d5ba83af2fae1bf21b1d06b22725aaddf3 SHA512 b0f95f862b174d08bf4ecee28eb6939067c726407e889200fa51543328aa33537b3f52077ec2a838f29fd4d88bd53067ab852614f44766a84e7e06575f6e9620
-DIST x86-debug-libreoffice-7.6.4.1.tar.xz 8512224 BLAKE2B fa6877ccccb90ad9f0f42c9e351eed17eddfc71f8341a5a4e26ccd4a4abf1e688278cd1022cab61964884ea4269a79047bebd44272e9bd2cc73be05f089e05af SHA512 57d379a8e292a568ac2a9a76511d55d59d20b624b762c14f9bdb922fa6bb4b5debc7f55c842a0c287bc36f231581eda54d6bde7d080b412a0399ac1884fb07f2
-DIST x86-debug-libreoffice-gnome-7.6.4.1.xd3 45426 BLAKE2B 1d501c672372b1416928b8ed9640e2444a3114081a891a647e2f0a374f7bc6c983218143e7a1bbde113cbb46850b8a83d3532c3197ce363319f030742b0354fa SHA512 62e0cad47b99f695b4aa2d448c0d49aec33e6dbd696bb7baa0fc25503f53c22ce817d877f24f5bda1b4ee73fcb89125f481c29ea568bed5a0b08198a438df3e8
-DIST x86-debug-libreoffice-gnome-java-7.6.4.1.xd3 3811178 BLAKE2B 5389ed41031304e5fc8dab03aea137ffa1fd77f701a38328c6cfaf1868a6163f25a1ca00ce4be26693889d5d42e765f7749cded98f137ec87bd3fa4d6abb0557 SHA512 3fdfc479449ccf09c6b812018b5471cd36aed21c19f01c6d41a4d22e847d98c2f5b6093dbc8c0771af649787ac37af4125f70fa51db350b93ee9f29842e893a4
-DIST x86-debug-libreoffice-java-7.6.4.1.xd3 3763858 BLAKE2B 31d0745fa45dcc11ad9b36eae50d951a2b6212ceb1fd0684f8fd1f87ee97cd7d03e4a2bd487bc50b506b8108c5a9563102e3b45416435e6bbad3a767dbff162f SHA512 dce61f9ce48f30e12ff610ab4dcb76a6b3031d42f5dbfa76c5405127008e50e904dab3452837caf8185209b73d0be6ddfcf0ab9914f45d7257881ff71d943028
-DIST x86-debug-libreoffice-kde-7.6.4.1.xd3 2783416 BLAKE2B f20e633cac18ece22ea5ac0d42fe4b20784df8abdabfd0ed17dc942f716c0fa661439959868046006341d44d64172cd140796ba61c8bf671e0539ba047e94c35 SHA512 14bfd78e19e94f37a9d6e52a8febea66ecd2d9b5010ecc03413c583ea0d2157dcb7fc60cadc9ec61577676b624f2342eda891dfdab8ed4a8e6f3886031d6164b
-DIST x86-debug-libreoffice-kde-java-7.6.4.1.xd3 3863083 BLAKE2B de7b31e007fe239d02adb4ffd09fe1c5e29b51a44a49075930dd2fa6ccbc0c5eacfdcc61aded045ea02653415e151b008ff5c58db640192116883441e011bd90 SHA512 1320e53ba10d8858de722c6fa1c4b259842531c5156f586b3a6c43e92fafe96fea67a27248f6d8db94fcb63ff1b968ec740b321e4b9432a27387de89266c5c56
+DIST amd64-debug-libreoffice-7.6.7.2.tar.xz 1545355716 BLAKE2B 09ebc1678a2eb44009aedfda8daeefb20318623039371b64e7d2dbe1f17714d7d50060fb851501edd7e39ed02e5c2d73ab8a63a18f60c8f72cc23239ae4ff559 SHA512 64424bfba6a6dbdd9d8324a90d4b238c55e1cb1a6e42bb07d7815caf446c00e5c0438b87f11ed76e8d5b74b28f549265ebd2266e1ef8707fce60df1049e12e33
+DIST amd64-debug-libreoffice-gnome-7.6.7.2.xd3 332078358 BLAKE2B 4c0d592093b718682c51703602fdd764af9d72cc539371f6ac892d103215777a9ada96dc7563ab16ea751fc6dc15fcd19af1d23bc5ff9330ed5211077be3bbfd SHA512 cf08daf566a2b3feba4fa5e615473b44a87a916fdf215e4111f07e84373e87d87351f2a6e49b50b84947c90f27d59bb4cc5768c88f0d60ce964145ea3569571b
+DIST amd64-debug-libreoffice-gnome-java-7.6.7.2.xd3 756933428 BLAKE2B cae1a2cb125cba6469e58c4076107fde9d8a0a44d11c1e304cd1f8bd762f2529c1d8e126aac0042de91b64ff9b9c20162828d70ceea919eb61b618027bd1aa81 SHA512 e7d413549fc6d7eb421869c44158fbcc9e4489557ba3be6b1734f1b44d22ad75855b780c4239229cdf746ea513c179da860651af2334e0a4d0b76c2d10e89f5f
+DIST amd64-debug-libreoffice-java-7.6.7.2.xd3 755614285 BLAKE2B acba85879916c169579bc6ea5b3b26740ea6d559d3c406b4fd7852e759b5c5025bf5ae392cd46c038789aba0c176ef9414c7584fb52d5c49134d89858cafa6cd SHA512 6ef5f5767e0af0d8459e2aef351e36bea987b9870a39fe8fa9e884a18bb075075f402296fcf2b139eb678d04aeddcd8795ec42ee78e68de2e7a47f361d2c2fd3
+DIST amd64-debug-libreoffice-kde-7.6.7.2.xd3 444366970 BLAKE2B 8cb4ee53873db0c2130982c18efd5053202a21b319f26c95befb5885621c28d784fafea0e4e7d03a87d1be61d664f98934941646db41bf91250be5f6f346645f SHA512 4df05df17a421274c3f1b8f13dcb9b97eb507187a8c58f3367f87322abbb6e54f15decbb528db7d32c3a66758ca3a83a968974810df6fb82ca05d97f85ea6d7f
+DIST amd64-debug-libreoffice-kde-java-7.6.7.2.xd3 764769103 BLAKE2B 30b248d59124b349aa7bf2c2ba65542810217e45df22ee3b28ac710f50391f49c02d67139f31ef66b2832f8b950fe863a448653c337503d57e3ab3b199342714 SHA512 725e817b128ab41a5dbb903e9291cf603f77bec214aead1babb504982c9dce7d40f331bac1f5c4d39188d5bf585c6338dd9630f8c4e438711711a93045b73d11
+DIST x86-debug-libreoffice-7.6.7.2.tar.xz 8523988 BLAKE2B 0bf121535db620f1ef8562bb7797663a7ec76f594f7d2237b7db0af90f14c2b7246a666d7c3d9ced5dffb597498e4f182967e9dd798f9daa3c3e29a275f673b2 SHA512 c2648a0ad347cbb59c67c772346650aad780c570ebb08e075a33b27afd3cb4b467bd18837b011b2cd11e3e358db3b8165923705f4daf6b3ff7d2052173a583fc
+DIST x86-debug-libreoffice-gnome-7.6.7.2.xd3 45701 BLAKE2B a39809a0d3722dee9832dcb4f67aadf93e3965dde940a6346383d92646ba95db6ab6719922192732585bd572365e814e79f85286f3d4e8b1df471b956d52fb32 SHA512 33bcfe70c8420fad99c35da6e0ccc3896dd5b57e43c923582a20cffd53e9e8818e8c189fd24ea484c61f698ddd468265737ef74a719624aaf9e4a9dc1c337b48
+DIST x86-debug-libreoffice-gnome-java-7.6.7.2.xd3 3806773 BLAKE2B e33c6183e719bd037beaf1c030aa6e0d7de6ec5010a92e1009c9fcc50d84a07d31b7a233e5a51622bc41a442ff0300917477657f48c39d196e142b134d5b8a09 SHA512 91cf8f12eaf5bc528812ca89db04b51bf22ec3571ec66d7d4be719c51c2cc0c3f4bd3923801eb606a6e3339176e52153d541dc60d7f5d4613e6de9ca336f2df9
+DIST x86-debug-libreoffice-java-7.6.7.2.xd3 3757999 BLAKE2B 9880d7563747cf527adb4904807ee32ab674897527c5bcc1253eed242d8ca99c261b6104bcc07383e16bc7ec5a69e33f56b0959d48d422f8a593f30400dcb341 SHA512 5b816016810eac65201a7233b08ad173dcb990e55fb8e40538766269a999ef5b59a5bef391542c32c630d0797cd45f29c9267ac1dedfa437bb23408411cbe12f
+DIST x86-debug-libreoffice-kde-7.6.7.2.xd3 2817856 BLAKE2B 5e0b9f4ba74cf0c48fbaac13037169b684393e588da343bc6d9b5b781f73c949c11b0e1a174a1df6604dc546d4fecea4982487d4387af89ceee9524a659ef808 SHA512 b576a698e1e985cdce5456196d75b2751763e7643c7d1c3f2f69a028da4c27346358bbf57178961d52f1bec60bce12690c82fa2378a185e9fdcfc53c9bc90695
+DIST x86-debug-libreoffice-kde-java-7.6.7.2.xd3 3839163 BLAKE2B 807955d419ebf73b27d176154551c03c9ca82ede3f9c8d8da6829419f3a337e5db1d660ac954f0bfdd505fecd5a95d784134bf9c8718fa37cc7c23c1a0b56195 SHA512 0153e28127c5e42c1450dcbb4f9bad080a007835abc0fe17dbdfe2dd5f336ec42b9efecea05f646ea81b706eaaa0e7b27062b9f968a72d27c5fd3edbee6b5170
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.7.2.ebuild
index e941f6214135..e941f6214135 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.4.1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.6.7.2.ebuild
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 90436b27cad1..569e7f050f7b 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,12 @@
-DIST amd64-bin-libreoffice-7.6.4.1.tar.xz 155337216 BLAKE2B a34dabadcdbd12ba3b8d23dbf06f0151b70080df4b05de387b5c30c280a952b09f58e2afdd59d5e799825db6dce17938f236531fb4dfb5d1f211b6d1f26c0f36 SHA512 f99369f9cfdd44652aaab7796724ab4602020dea2776fa7b01e405b8669881d1f9b768bff6e08fb2296d7fae272131e1e14e277ba91064510fbde1ca62b7cb37
-DIST amd64-bin-libreoffice-gnome-7.6.4.1.xd3 2369910 BLAKE2B 5dad02e5e3967fd5853a24e82fe747acc88cf1e7bf62c732ba74ff9fd1cc327afe85e7ad477cbcf3816c8199538eb13b004bbcff567f85ee1ff35636b7c7ad7e SHA512 0af847492617bc4156586a442085ee9ac3e2fdc5f48a3fe377f67c80d274e6aaf26c9958cd5e75702feed47efb947c30a005d8c83bcb2a864a634103f03ebc16
-DIST amd64-bin-libreoffice-gnome-java-7.6.4.1.xd3 35575107 BLAKE2B fa8ac97c615e2d9363417ff96b490ef7f22b31cb61db90ab317d9bd5fd9f0e14efd140d0d598241f1bf57d063084626c5566c25d89ef246065175ff523961fa8 SHA512 8a7bf6eb38ae870dca06661bee9a9cd5300255b8b2fa709aa0dae88791bfa7c2e61536d1aa131615eaebe9ef561d02c2add4c33b6adedf38d2b4739bdd7296c4
-DIST amd64-bin-libreoffice-java-7.6.4.1.xd3 35401441 BLAKE2B e59e67c52ead2c2defdbff6d122c5e4ee13ea39ceb5ab1f65051b2878d9855e708b76cf6b5cf4bf24e396ec7224863d405ad0d34e7b494ac9781b316098a5e6e SHA512 dc660b72223a37ed6a9fef37309402a8a20cdc1575bcccb363fda7783055cfb31f52848cc81d3207043f97f54e654f860b60d4a6b63f3e44c7c0e34812f78eab
-DIST amd64-bin-libreoffice-kde-7.6.4.1.xd3 23595574 BLAKE2B b2e6bdad2df6f39f5d5855ac72efb33c38ee0530188a286bf38d8810f159619c8aefb2ac48efd8aee742d17743e637b0309d92438f4e9fcd483ea09a31e32c0e SHA512 d0b48c7a0242912728163ecd414272a25b59a11d4ba724c28e6c488af685172f3a630b3e153e5ba1bc722cf0b18b3688fd5422fbbd8523f2d18ec4e8beb772a1
-DIST amd64-bin-libreoffice-kde-java-7.6.4.1.xd3 36040935 BLAKE2B d244ac216e8ef8ac3f18236a3fc3900d6475be82f12354d3a646f7254963caa3e5a8fefd4951a377aecf70df90892ef61e26fd6181a68f09602e4103983c7d43 SHA512 d13e4ea9dbfed0db2a323045b18d8218d27973c889aafbf1d1559ed85bdb7c7fd6d4ff879d926450ba5f00ba691ebc9ca911cee57279a9ba7fed43a3bda879f8
-DIST x86-bin-libreoffice-7.6.4.1.tar.xz 157246964 BLAKE2B ad5415a749853a5c4374dc985d957a693a598c221afcf28afe02d6b0cad81ce730fc406c247d2ed5a7873e69216505da1feaff19a3729b5a5f28b30ba78469f3 SHA512 a4cb6d1d38a93c5325eaaede12b9732ff45338511d95dd1471fb8f4e9cfbf382b38d3cb42fb175b60b5387ccf932067998b9ade1f8520819486f5c76a35c3a47
-DIST x86-bin-libreoffice-gnome-7.6.4.1.xd3 2358266 BLAKE2B ef0a098803ec0c2ac7e08d4727cd84e8fe9b757f2da37f8f5a573008974492aad829d19ac6dccdee36af834851edda5d6fee36c9ff0fbfd48078f3d90c824ae6 SHA512 42d0998c4977722e2dd66c6e77772e5cbfac317f16be43a78192a85c1c4419df1c532422785b9171d621ff3722b88f36a57b222b736b5c72f6956b8be61f0c08
-DIST x86-bin-libreoffice-gnome-java-7.6.4.1.xd3 35089875 BLAKE2B 47117fac40a8d7e842f0eeb02cea69cf0cc6869cf2d1cb4e9cb7e3f10ea038dd9e64585300c99fe8ea1d96162e7e042344beb82896b87a46b847ca43b14e3ecc SHA512 b1b68b31ae311745c21992f0fe55d02ed0194f8050f458686bc13b39bd593c4f82298b86139b9c7a3ae99e7d18fb77ffa291637590dc7005929fc549703a1b00
-DIST x86-bin-libreoffice-java-7.6.4.1.xd3 34964945 BLAKE2B 3184b34858c122017e3f85f6466fcbf795add44f98d8b9bdca82530e65b6a4b4ae2d0407cf5fbe74702acbc7303e1a6a7c5ef6a6dc694194c6157ef8143f71db SHA512 193447d4baa827f08916d6a0409b65d9e4c71dee58a0e84e0582b839b07f02136c164aa67e11d1317dc49466af4db50781a4a9b6933533334d23a03f260382af
-DIST x86-bin-libreoffice-kde-7.6.4.1.xd3 24213821 BLAKE2B e9b0247ef72ba316ce424188b45d1cd79c9edba453cef3b1a76a6b742c5e00247aafe3a6da2c77d1041002f6e7d77f1c4fc0b1a5bff323812786aedd78f2acd7 SHA512 11d956e519cea6415a22d7115110ae5b6caeb0785b7b4770ebcd34feaef099dcad8ab2be8f097595bb2a5d55f671889e660bba3bc4a0f1c7715b75f0a06b8239
-DIST x86-bin-libreoffice-kde-java-7.6.4.1.xd3 35610663 BLAKE2B 035ca46da78af9013ca702cc03110604708ded283bb1de2ceedbb3121855674ee9728840c630603942af7da2feb786bafbfd2b63b2db57cfb47865dca93a6165 SHA512 5037aad10bd9c59e5542f62e4732bee26a2bbda414496601b345d635c0f7beeb72f0e9f2d749f2fd252305b37a23cb59ad53620148ddc86d7f2c80c0521e1184
+DIST amd64-bin-libreoffice-7.6.7.2.tar.xz 153834060 BLAKE2B 4f2de825f55080b261fa4e61ce1574fa4f1f3faaa0ffe729db20e9ef654b55e8756f7f645fdc5ba453f7747d669d02dfdae5c6b1015056278fc46ce91463518b SHA512 25b5f81d99d1a25afc12fd871c8d484334a780b8c3fb084575685e95cd17ff96d7812798fd94052b85ddcab24a11018ffd7b0777c3c960addbb94329ab71692c
+DIST amd64-bin-libreoffice-gnome-7.6.7.2.xd3 2346976 BLAKE2B b68f9ea5629cee68da5400eee0ae7d11f52265201708cbc8ae80381a090841d6a50f0a3ff4645db9bdb2ab1b2c7f1ae91b57b06ebf5e1bbc97599dcc49e69b5e SHA512 18a5e3bfacbb2372ba8ce8d86e67a178fe82edfa2640f9dfc937219c8ce3b22904b25e2d4c044e07a372d684c80f9b1594c7c3b0c694f9f4ad4eef8795193feb
+DIST amd64-bin-libreoffice-gnome-java-7.6.7.2.xd3 32964533 BLAKE2B e7eeef6fe173ef64f7300abba73cbaccba8296650a06fda7cceb3d2e53363c3301d481efd88bacb02fac4f6e31864f104f3125285b3d4a909dc2ad3044845b10 SHA512 90f869daf0472dc27728e84671cb80e0b7bdaded4e890d22ebca648366be2d6b3b459d69bb6761bc164cb4f356175671f8047b5549cdfe86d523b90f80534749
+DIST amd64-bin-libreoffice-java-7.6.7.2.xd3 32816296 BLAKE2B 248666b1e86f7cb7570a50dd7ce6d2441d2370d312e661064e0333469cbad2ae3263929730191f1fe01321155ccfb2dd28fe03ac48082fd0b0d438dd2cbd6fff SHA512 66fc04139648ced79c713714bbcab647e27ec14012ff37de8e84bb4145977cd68fdfb04296ecaa81861aa9aea25e3b06a4237020146a9f2f7e705b74b648799d
+DIST amd64-bin-libreoffice-kde-7.6.7.2.xd3 21536009 BLAKE2B 496bf21bdb98dd98f7311f6a05413541cf6c57feb19c2ea8f6b55dd3d0e07399407d8c55a4e749cb0f5cab0958856c0392ec47149c2e8af8f991ec8614f1f041 SHA512 a2db309afbf5f09cd758ce7a043110fa0e420a5b70d877d549cdb714a118c44d0aa61f0afbb288ded7d70947ca60c556604e9074bccf6fc460fb1a101b7c520b
+DIST amd64-bin-libreoffice-kde-java-7.6.7.2.xd3 33954641 BLAKE2B 326441684af8059f945b3809c1b5b0d301677c19f55118039f714e5c251e43dff025828face8aeb048c7121c87edfe42da5aff9f11c1139636b695755cdd8882 SHA512 03c48555d6301f2e43511badf1aca6ecfe0fd75e34da17f06bbc6b6a49b19524efb6688c41f348614e90a6509a180f179bdacdb6189a86079bd73d56531fa774
+DIST x86-bin-libreoffice-7.6.7.2.tar.xz 156969004 BLAKE2B 920bd7a98eb73cab3eacc8f3f8060ee47b8506335bffa4e37dd5438033cdd512d0254860dec1129b9b173d225910c83c316e6986d52ac084b1316bf82b48ccce SHA512 a011c42cbfaaccf6b62c80f669733228ad7ab084b7c248c3d90da1ccf5d3e5f8f0044219b7df859158a4476ed88b5795b5a0db6972e84c75200c86f606d1cef0
+DIST x86-bin-libreoffice-gnome-7.6.7.2.xd3 2421905 BLAKE2B 7853345950f396357f2303625a58d878c4aabb689f070daeecba9de57aabb7f0dd91f5c0d67a10ed4300f739a6a56b7f2968155a417422c0504fd2c99724d585 SHA512 64a277ebd92591ac04d74ea24c40aa0d0af2405e9afb2cbea1fdbb94917ba460d6954a77929fbfae5d86ac333811fe092994e7dd3e45d86c40e680689cee9ccb
+DIST x86-bin-libreoffice-gnome-java-7.6.7.2.xd3 33296771 BLAKE2B bb89df58f254613825877f967cf0e7d8194311526cc90ddc38d79d7e3cccfae30cce2e48b8ffff38fa1d2694fc1d771da52376a8ef10501ec5209ed48b6876a6 SHA512 49f8feb41f3da3f0d3d8b0a61210a2c87f06ea4f48eb2a6c8fb195ecdd1590906e21686851658dbcc3260870bf7601e0b9a0e676e4d7984589d78be7eb978344
+DIST x86-bin-libreoffice-java-7.6.7.2.xd3 33342077 BLAKE2B 93b8d46b4ebd9258fc436aae81ecca62256af40fb79d3dc2c82fb5ee28d25c37b1b9e85293a69bb33725f1c5e4f8d88540a8040e0d83758de546e1cefcfa0a7b SHA512 696006a7ef2b95dd84a21450c50b6cc3657976e4c73550e3d22593f9de1986bb7265d4c72e0f1e6d49e6dc65f70f7e266c671e032c07fc27c95a733c09fcebe9
+DIST x86-bin-libreoffice-kde-7.6.7.2.xd3 23190388 BLAKE2B 8e0ce80f4fbd889f30d9808af7716e62d4338a5a7fb78dc80c9dd9575d4f43c1e21a054326c560719ae89efa115aef5aeda4e1578c3622813b906724b2fc5266 SHA512 4773d5a699f1775fc0ecae403d58985663ffd7849807c026beb83b4b260bbe25e9f557197d9bf278abf9e7b8ddc6d0e182cd0d54ac066415ccdb4262885b1348
+DIST x86-bin-libreoffice-kde-java-7.6.7.2.xd3 33899754 BLAKE2B cedeeac33a5bc17ad9d85ab084c12c1a6274384ad3a42b6c92f3608ecb4e9ef9fd4e73f22f0158cab580953e73d96ccb7da2269448e1dcf20250439e2f7e0fc3 SHA512 7f3c4f56fc7bc02c8888949627cbf3b1b6eb7cdd7387161582e58adf991f9f0b8a3ded35cfb30d1547d6b9a223122f3f9abdef073871858b0417229cfec3eece
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild
deleted file mode 100644
index d1bcd6894359..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.6.4.1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_11 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde cpu_flags_x86_sse2"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-cpp/libcmis:0/0.6
-	dev-libs/boost:0/1.84.0
-	dev-libs/icu:0/74.1
-	dev-libs/liborcus:0/0.18
-	dev-libs/xmlsec:0/1.3
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/6.0.0[icu]
-	media-libs/libjpeg-turbo:0/0.2
-	media-libs/libpng:0/16
-	media-libs/openjpeg:2/7
-	media-libs/zxing-cpp:0/3
-	sci-mathematics/lpsolve:0/55
-	>=sys-devel/gcc-13.2
-	>=sys-libs/glibc-2.38
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	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.5.2-r2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	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]
-	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/glu
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus
-	gnome? (
-		dev-libs/glib:2
-		>=gnome-base/dconf-0.40.0
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		app-accessibility/at-spi2-core:2
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		>=gnome-base/dconf-0.40.0
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( virtual/jre:11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}  x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.6.7.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.6.7.2.ebuild
new file mode 100644
index 000000000000..1a3d388f5743
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.6.7.2.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_11 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde cpu_flags_x86_sse2"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-cpp/libcmis:0/0.6
+	dev-libs/boost:0/1.84.0
+	dev-libs/icu:0/74.1
+	dev-libs/liborcus:0/0.18
+	dev-libs/xmlsec:0/1.3
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/6.0.0[icu]
+	media-libs/libjpeg-turbo:0/0.2
+	media-libs/libpng:0/16
+	media-libs/openjpeg:2/7
+	media-libs/zxing-cpp:0/3
+	sci-mathematics/lpsolve:0/55
+	>=sys-devel/gcc-13.2
+	>=sys-libs/glibc-2.39
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	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.5.2-r2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	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]
+	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/glu
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus
+	gnome? (
+		dev-libs/glib:2
+		>=gnome-base/dconf-0.40.0
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		app-accessibility/at-spi2-core:2
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=gnome-base/dconf-0.40.0
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/libreoffice
+	acct-user/libreoffice
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( virtual/jre:11 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}  x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index d83900e17418..b743c263730b 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -360,189 +360,187 @@ DIST LibreOffice_24.2.5.2_Linux_x86-64_rpm_langpack_xh.tar.gz 235032 BLAKE2B 1e7
 DIST LibreOffice_24.2.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 932851 BLAKE2B da1b02252546ff0020aa5e69ead870eb529e97a8f2e145a2d73d6022be224f52874bf4f6739cacd0b1cb1871b3bb08dece47d6cbc5f03ce1a542a20366650e3c SHA512 936d261768e715d8e7774135cc58fc21074ee2de9748985b66d3d3301cd1596cd189e5368189392e5567b9d51ab68870ccc3d4da9383c8fa860c8641190a3c47
 DIST LibreOffice_24.2.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 945356 BLAKE2B 41164c4b7a8708d1925623624c959ae36f56ef429dccd5ae9c3258672c809917749bcea57116b6e4353c648febd87060fe36ddf04e900ab2a1113ada07bb2e24 SHA512 16824ea30a888c8424a8931a0b12909fe55c7716b9d94d713cfdb8e60b84353790563990ddea3823dbc0f2af143e1dfb1ddbb62039746c1e8a23e4626962d901
 DIST LibreOffice_24.2.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 258047 BLAKE2B 74b85719e562134af2e52aa9d80d0fada91cdf8c94b0bcb535bcd59bc9b1d5e9aaea48a907e5a4114f8b34cc512897098712dd59cb3ab6bcb9c987c2af883593 SHA512 9b235ef7606b4d937c6d9503e9f777884a16e08b59a27f601b92f2ba6abd8af616453c2b6628f9cbdb4156ffde90c232fa3ef91c0520ecdebcc7fbcd00497ea4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_am.tar.gz 3249921 BLAKE2B 6cfe941bfb4cc3a006a5e99b8b8e1f2c9122b7060acd45eb623a77fa37cfb32a02bf8f1e8d6dd132259ae17445bf629ee1992f1047661b057cda835b522beed3 SHA512 81f41a8176169b12e71de6915588c499d2e6d76bf167018f1543ffad80d298a2b66143f32479e8ac875dade478f4bc9e41fa0b8ad5f778fdf3bda13b5ed3717f
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ar.tar.gz 2938858 BLAKE2B 5fd8ebfd3b144201439013170b7c853cbe140687f54cacfc1ef996d2bac4dbe1de38ec99093554616eda04274d52cc6a4c00d53d558148e7a04d57dfd60c50f5 SHA512 ee9aad86bf5f9b9943862ffdbd6c3bdd1ccdcb6df0f561004698ebd33da5ac6679256d421b8fca0a180177f0834b39f95c6513e50faa3edf1884fdea338c4fe0
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ast.tar.gz 3108335 BLAKE2B fe459255bb6f2078864a9b56650e28b2986c86bb440ed1f1784304738f566cd318fb40bc5b16134ace7404ac4eadb256f2c6f1b8d172e40273ab0ef4d37df2af SHA512 3f0e86a141f2c81bbb6cf6cd99fe86b42147ddfa53582bab45d277652c5d206c14f6e565f08a2bfd4ccf41e3707d68fdefb27ec33fab27a579e882ac45e1ee59
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_bg.tar.gz 3412440 BLAKE2B 5bdc86b8e677a6c5ae5e088d04246a4a9ce51385664e6c9f29ae0367dacaddb40811223ce458bcda10acc17ce1df5ac6985e4d12a61f097a092dd6400b4be98f SHA512 5418476d8a0a3fcf0909164cc2fc587072bdfaa8395370f243187fe1871cfd21907a941a252a4fa23314cbe630e5a0d93ba7abed4bd2477f31e9d8ff0ef3f8b4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3408702 BLAKE2B 63cafbc5da65284347e1f1f1251c01aa6b7bdb682f228182a73244a54dbe0d8f027ae20db2c9cacf097949febb31c3e6ec4f07aca18d6308495b11129fc8a7b0 SHA512 85b1229a5216df3ff25e3ae035f95f97fa3ff2a9c64e177c6e1fd58ea99af7e352464cbe49316a51ecefc4d46a6f31623f1cc898ac08eb977bd39125c562d13b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_bn.tar.gz 3220953 BLAKE2B 04c8be0b69a49ff0201ff9fe8a2bac64d44f1d4ef10c576930a30f299ef2f23b1dec0c627960b7c40b404df902310890e502677b43b47041920117ab0db9b360 SHA512 3e3fbc68f4997fe0255b691df0f8b4ae463643964018bfd28b82532419a943195587b7c945f15d5ecf5a5123ef4aa75b0a19048246effae030981580612f5071
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_bo.tar.gz 3218754 BLAKE2B c200f7283eed91cffb36287dbf37451de9ad243e9b9d2160aa08f57fc30fc91b24fb61e79fb79a26663dcaa557f1bd92cf181ba0b1d86d3c0cebbb08874dc7dc SHA512 fb8d255bd9f4ef431b89f851d12de773a2c3d3553d54aa7ad2ab91c576276bbbec07824e7e21625e3c6f9bb5d6b1e1b831ba8c6db91270b638d943eb16ce6413
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_bs.tar.gz 3025183 BLAKE2B 1d833f130911317edea52f13fcb4e59fa0e96f08bc3086b293e14d8a7c47ab3b519aff7d73b5e1b912dc50abf295c162c6e4ef7136bd9fa60fdf7d0355e7875f SHA512 0efc66157b75d396db369456ca4a1b98ab0761f2ac4b3f312aba94d6918d7075b263e6f9c9c6e38a7a087d8da6533a11c8da588b84cc91e3400b43149f994eb9
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3133118 BLAKE2B e5d9a1501ac51263885f0ba83c577b5c0d3903083355cee4152858b512b234029221002b1beacd93fc901c41044c71e43641ce4e1684e409378b067c69e032f7 SHA512 2719207c1d41131f89e510a313d88b882ca900d4c3fcd80e8aac266c58a7c22efbcf1e8c373bb80027688158e6336f06efce3443756d70c8e738f547d37cf9f8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ca.tar.gz 3131664 BLAKE2B 21c217fb24b1f0141431dc1ac028b24fa175a0963e65f7c6cd9b3de77b3c0aa4647e7ef2de90b6bcc91a8b63e80fe3e87772b2768eb67c2a843bf938fa24b810 SHA512 d3c87f25e65ec3eb435fc75ee485e20e506d8109417e150ae99d1bec7f76fd6a1b0985971cb9cb7ed0eb6725834edebec491e8b9e1e8d5a9648d5355a1893d1e
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_cs.tar.gz 3097770 BLAKE2B 812398359662638092459de4495b6a2c99d365a5acbfd561d928124131f50b454032175adab64327d6dae149342014913a7149cadf0cac093dcfc3add0c2f2dc SHA512 be3b28fecc8f7c5f47e52ba93b98000c26652ea64ebdec6e630b45694f65cfa8cfc5c1aef944ece23c28b76787e6f298cdb8c426a84106893f486962d998b7f5
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_da.tar.gz 3101633 BLAKE2B 532d51f1c8bedb0d0ce2b5ec0baf836731591641548ee7cc955eac28b624d1704c22797668daf7e9aa458e8b6e57c345366bce97c65aa5b29c86202b36119cd6 SHA512 01bbdb49b3b4e65d3c1e95f3599b2932dcea2e9545135f3a1772726d27e96f49c107192ec2dde2c129f7f11f9378fd91b795576267f9305ffa668311f3c9615f
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_de.tar.gz 3181637 BLAKE2B 5eb7fe89b2b4394fcad1000436826982024c7baa6fe9c500268de0a1284c0401bf0717a24a1695628ae060bfb64648d2618f0dd44902fb8fb3929e7c02314ded SHA512 abe3b35910a1575503952660287c79f9b21172f21110b5122179d73b5946aecd0b7abf6af48ae5568f83c84a77c2ca1e12cdfb40e4af87801fd14257458617ae
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_dz.tar.gz 3337040 BLAKE2B f07dd3528c2dfc5a02e07465c7bc802c29ed1897cff2b7cc7491c490e67a5b691d254336d8a28c3372d4890534bf9c2e9605326c4d5b851490273eebf6f84872 SHA512 894db71e0b2bbc9d4f76870430d8e175b002645d7a4ccc7e272ed22b0b6634f96387a82036c8aa0f52196abe6285e6a3288b73c4c11f16a50728b25ab499c033
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_el.tar.gz 3717661 BLAKE2B 761f916c4d403f1a88efc3a4389fdbedcca11301392f285d5b82512bdbbd062369044a9096742a46ee614397946569d4ee11c1678a565fb01ae03caddddb1418 SHA512 238832887c6fa0384de8e4a62d09f5b7dc3fbe2d970da505f5f38adc97af5b6c05807c75b28c1b747c630daf28b36233e90218fa294fd07b9e2c6c840346f860
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz 2945939 BLAKE2B 26c65c393102868641c81fbc092878cb1a432dbb60b24bb6c2242c12a73a95fde9ad17ed773120d704a355962311b941d31f0439af6bc25042c6f0d8c3b07e95 SHA512 11b92925c248124504e85ab23bad4a353b1693005b851d70233bb0e9b72303e5d99ba35cc1bd2e46a8fad75d2a13b468f704f29153cedb6ce11ee8ea4e6b0f6c
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_en-US.tar.gz 2361702 BLAKE2B 811e80095896a22b911ab5ced3b2b837171ed8c2c6088a5c32f26d8dea7247ab06f10fd6ca37dd9b166289a2ab2388dd60c11698c2d5e826110a8fc6d7787c2e SHA512 1c81f1c22d79fd7c3059dd1c6beb80c903df63e7f77c3fe4ad3c1e7e6cbc3741a29e75cc4f185c26a6b0951f58551ab673262f8d008e4edb0e7b265823c2047b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 2944822 BLAKE2B d8979b1e35232191fc2bcd588158e41b09dad54c5ede26dc80b764b32405b80805ccaf3d6858331885bf0f6a638dbabaebda06a5d63f0d688b0bfde37c635033 SHA512 070a2d337da52b7351eaa988102831ff4a43d3643be71b979aece9a35584476d3cb3e20182f41a1d059fa7a961d59b68c3b8b5abbcf9ad384483fec9617748ec
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_eo.tar.gz 3030067 BLAKE2B 0752de770233fb2497f2985ec521650f417db6c09a51e6bb94c81c768b77f9f8716ee4843f5f8f8b53718d31b86a2b4ce85ec27854f7ab136830a6cd81bff7fa SHA512 4e8e38cf1ed21fdf3551aa4760aa138b79a86ff89f45527fb5ff92c6ec557ac78f64b5ed7ed68c393a3943bfeb3cbae30b9713d11b0220c000ebebccf255d017
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_es.tar.gz 3172532 BLAKE2B 8014271fa6630742768d580120790e00dc5758d58d213aec4734964374ae0cdf2e2a424ef3f0ef3535cd58183f10bf4d54a302ed352dc75f98f8d07ade9c881d SHA512 e33f36292905b9b6a47e7504ee74133ba6c1ce2bb9c1ad55b9bd90d20a5804c9e98f0a9e0c54ecb33c69f17da9b68e35dc21e2d3a3f6a58e42e6f5136d234738
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_et.tar.gz 3052522 BLAKE2B 345d64374c457c0557b3e3241aea802204cc02ec18fd44bd027236dcf232418335f03d3f158a0b2f14d036aa871c33c49b77f6f38b8252947302d53fdeb2d9ba SHA512 5c52bc81904f7940a39aafa7a82e21bc43a6c38be747c521e1d8c963b295e9f0367c8d307ae98693ed1e9ea010defa023cc0b7e9f60b310d42ccc5bd14146b39
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_eu.tar.gz 3060485 BLAKE2B 77568ca2ade0af48ddd4bd37808007090ebb5a3c89a14ecff586b2775ecdfe155eb061e9652f3e7031ee75f5265897e01a46edde0644de85dddfb2f27840119e SHA512 819aa13ba43f85d9b3bfee079b4b9a6d91b2e8a41053fa9fe981d4f3980240ee465b99aadea778f678b235be6fd7ac0717ea0d19890021a69dbd724014b7bb2b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_fi.tar.gz 3082931 BLAKE2B e6f6fcc048f85bec3add44f54c2f66f0394a3125debc671f9b7dd3e9742315da60b00bf78fd9994825578e98398dce7d6f804516f00a8b20f941fe90d61894c4 SHA512 a653b1eee21e9c155107dd7786172a627549f7b7d6be129ca6ba6e08529b96bcbb5a6693e09be43f05e045b9ce9b0f70e54a0c1a698dca3ffe64bd0717e0e21a
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_fr.tar.gz 3154454 BLAKE2B 47ab038a4958c5ed9e45fe3aadb6fcf616332a38bb20e4b6799c56c7f7cfe1319edc880db30a99c200d5402252ae7b382f6cceade9d9fb4c652191be62fdc8fd SHA512 9391a4575311ec5d523d72719308bc53b20f8a8c4820a447f047882341a0033f607f26c266b140816b86e022ed86b9581667179eec74bd0f0f675eabd1730374
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_gl.tar.gz 3102689 BLAKE2B 9189479394dc677eb77b3be59891e47c39a0a8773365f780154fe6b1095049ca16587cc0f7ca108a96c9851c2a953ba301788757a35ab52e5c6f45ad839282f4 SHA512 691ad6dd62b0f5a78b37de4e7c8535e5fe8b10b490cd2029f10a2b3a19b0d9c3d99524a43a635ff82c88fede6f346caaca212f8afffad52bd3045a3942defbbf
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_gu.tar.gz 3032967 BLAKE2B 37ce7774d1812a618a2f3b7705c526fc705a4f74d0462125bf2fe31dcda65987d403269154dd3400e5a29e225f675bcf306bfcc3ab1f23161c8acdfce3df9302 SHA512 6b8e8bdbcf12d5713ed839058b5e64e501b81e7d29da1b1d4d7f4eec5eceb22c5b3b8deb3748382800abaa5a5fc1de5f77a9de6d14b7d9a599455041a2f9a532
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_he.tar.gz 2869807 BLAKE2B ce75f43343484892e107d7befbc3d0a86642eec18d44d1d3095ff03ec2f69206b2c0de4327e9eb0e62917b74bf45067b715db01d710c0688b07ecdac0d4ef339 SHA512 601c58fcd5dd03c3a0ca57cb1020c8c39f186f9c0cdff3c45d78b0f21e3c94d4ab1c8d480f5290f3ff0f57a4f2320aeefd76ec984ed5069b04edbafae7329548
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_hi.tar.gz 3063830 BLAKE2B dff343500e977deb51ca46c43f96e8135825e385a49ad822ec278b2263b63eb1840f4574bb99d6a4dac01962f48ebb48a896a1513e30f871bd350fd05ba157ff SHA512 fdb34a95bb7dc97d979f6625440f44c42f0ca38ef9c0f118835bd8fd502ec7295e5f181a360228dcb7a60df957b4bbec77ed0cd0692f818aed3e8a8ab2736cc3
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_hr.tar.gz 3020018 BLAKE2B f849cd89f11c156e3070c62b87d38fb56fd1ed2651a3fa84bbe969ce736e3643da776e540b5a122c8ab65be3664b1ab009714918231c4a21b8c256d46bc29ad9 SHA512 0058b03cd03e21e275a683de8c180a18862b6cd0b4f86241cde2ae2530bbd389ec1f097e6071a0a3b26331d694e804dcc88cf9736de80b407bee921548fe972b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_hu.tar.gz 3234525 BLAKE2B 0231b554a64ae97d9f0dc4bdf63ef67e31dcd6294543fcc66d814cfb332df76d6cc1ac752bbe6ae3fceee8c15e77e4cd5a168790c5c46c1d09b1876e714f3163 SHA512 7c47d2335a8764344cf191c43988d1ab210520d82bb97215c5555f059e1bec4f200718f27ac9ee9ef93f607a871ba5b59cf1d929f80e258ad60ebb94524b0c0b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_id.tar.gz 3038959 BLAKE2B 68b6031aa757c41c3c9c94cfa8351af36f0025120cc93e4ced46867d72688683b293d2fbf78fb33e9ccaa49c5a7a4ede6045d2c77bf864f348626eca5b86d926 SHA512 cf37a633bcd4a5e3c8b742000dcf10cfa6afe7267eeb94d77691ca881da088353e79e463fafab178df1ee686a264230f3b9ff3eb46337a4edfc8cea54a1b0d28
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_is.tar.gz 3026359 BLAKE2B 799455c1f0c54420dd72ea8a56bc91767dc51b874775ef8d82c87e352d3733f2da6f98147f82193dcde844dbca3ccec9ccb5124a3584bfe140ad4fcacb7dcc59 SHA512 aa4cca6f7a4efc14f1c89b497b4b985bb6d188da292ec7d017d8c9e30d8b88120bcc1e47b493e4ea7b2efe9287567d453912b496ea0fa3e7ba3f8027568245d9
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_it.tar.gz 3105583 BLAKE2B 5f5db0cdd29a4d616ed37547e12b6f484edea1f0d201a2b6fc79afcde5d39db67b7e941b157c9229455986d8efe7d0b094452207504585437692f9647f85b57c SHA512 25cadeab171297ab89c9f383be98c315ea5e6cf6d6eaa8e7c9f9796a502ec907cc0ad8c6c171d481c2b113090e04b643e72e6753c8413c854a76079d23e70e51
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ja.tar.gz 3452759 BLAKE2B e0a1e5fa80d571f32ec26d0769ce95a79575b15e515ffe7497e548b86e26ae7d5e129d59352d4a29380aecc1dde3574ed698bddd902b79c5e091a9328417f274 SHA512 335860571802a3de5a083401c4a2af49eb5026524e9c33d17d14bf31017e947925808461fed0af052f34cb8ac04a5e871245763defdbbc1dec1266b71ea26ebe
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ka.tar.gz 3114621 BLAKE2B 61e30dcceb05534823e25610bf27dd865692868d6a8a92f880b4ea8ae2d020131db400a71dd2c1d2607e0565a7bd68916326994b20f6330332fb8abb36bc3493 SHA512 97ad91a720171d2cbe4de85d2dc0a7377ec88f0f24a1805fc479a7adfc5a4d12f8070a8083178cc477991a3696d30acf333481f7c06c756042b5b29fd6e5434c
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_km.tar.gz 3436338 BLAKE2B 96b34b133826e2874783522638759a57f1339c41876939a6953b2fc19554dce120858efdb11df31c144f5f728fd3ef3de054710d5897212839192b80ffccda56 SHA512 a6c4c6199fada808b6139dcc6973c9be56123b79441ce7f470c42af0a9e8ec97c5c0d97b853c139085d8d4fce0cd5e055c9a65688daa716939faf3fa07163afa
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ko.tar.gz 3098377 BLAKE2B a700e03e44cd64d587af4adc74807482334b5262b61d517035690991de5fc2fa79b2315f0cd31d9380bf58746862e155d17845a0d13842f1a210fa13575882a9 SHA512 056a89c8ae904614fe6b7cc7368489582fc3cdc671c66d684c365903e37bab46feb62a02df6a76fcdc0770dce04b1465b6a6d2858275a220a2cfea493b54899b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_lo.tar.gz 2975360 BLAKE2B b077d4154555826a1eac4cc06fa29388ac696c4ff368be8ab8e31fd682abb9d1643eeeb255e9043065ce13fe30bfca99a8fe4fabb18f5e87fcece7b28e377dae SHA512 15d15d432266a4560f5de77c5b1f7ae364aa4fbc16613a7a50506908772065ed182426b2c7af0fd210b32e7df60b235fa71a18e5dbdc1f2755eecd670cc665d5
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_lt.tar.gz 3143417 BLAKE2B fdecdd43fb760737f79da7e3c2893b009d8512346191b0f1b1df16e409c1acccfe13295b74c43f45d239842ea0e50b224246eed5d2ff3c82633b78b40aaf26b6 SHA512 53ddf9606e725be35f82082ee99d6fa808e98786b6a8bb27d9a030de9d16f663b6f9fd2a28a840e454bd90da2a1972e6f419b053bc3a24ff964c0dfc322acea8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_lv.tar.gz 3020140 BLAKE2B 89a7f834b7667df5e31f0c398195d270f55e5def22abfeb479457eb2207bc1b73aafbd2570e80b8e19b0e2678255690d1363777cb5fe85b6547bded3641438c1 SHA512 ed7f6ce7d32d22f781c2d7b16b8492c0d6c2fd2c8ac3560690af814de82508cf498dbc096bd7f0fbc2b46795a5984a9090e2537c48be61b318e76aaef1b7bb58
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_mk.tar.gz 3057116 BLAKE2B da0e5bc752bc74eb4d537a3ec713904116771d66854a04cc5fad4bd1a326ebff92fd0760df2c6a03927e83955be375682d91051c1fb47923fcda827962c84a51 SHA512 a8b635fde59ebfc1be71795457021fa5447a0c445d7f2283ad7bb545ccda766fe8b30560e28c4e0046a96a209fb5317a69f68a4b075f4e892ac67cd7dda5d1d0
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_nb.tar.gz 3058138 BLAKE2B 281efab8914f68eb471c2f66e6c1b0ccdef3f6455ff6e45685f8b332cc7b2cde3c1df5e59ffffd342c9a42e837972d695e5bf386132c2151b43fb464200bd1f2 SHA512 a8145c7e5905020f67004441da29e0fb88fe4be48a6e8c0ea15c9e15d802384c1f52d28ec3ee8541840c74e9e7663d87733f04028f733dc8738f4a7ccbb9d568
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ne.tar.gz 3270082 BLAKE2B 42c7776bb53d2819e866c8dedf406bfac806cd09a4ad47b1a28a431bc3d7292b34abd64efc3461b24737887c5e2a3d364b04c2c713728c082b9be688e2485596 SHA512 6b32554a610a2f8a4c126a7df95f7d80a4b53512a4764655cb8cdfbf8812960b2a7d3a50e259fe930deb0d7ba42ebb7b1c1336a6a45d71437ca172bd4051749a
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_nl.tar.gz 3129873 BLAKE2B a31d005e34c5ba14c4e74f5be36033b16851b852de391e6551f172e6fbc6932357e0005145a5ab9d76b389abfc581101cf458b1045b1871cb49462d55a7cefbb SHA512 53d9abecc75c5dc571e690477dda0320762c300995689bd6b534fc15a055098cdb887ba1a8bc3076b111454442a115f2b83f9346c3dcdec707cb2fcd8e3b5b7d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_nn.tar.gz 3065179 BLAKE2B 3ee72038ae3d373371d6dfef310c1df2471061978ce26de60e122c70078673ad6184cac3a11fcf57a965d37b2ca478eb465fdd8a9ff3b05cfaaf07a44e7d2e4b SHA512 0936d6a2d0f7442b0b8c85cdde1b60a1c170f2ba7bf525655bb5dbf09c257b1556a9e567b6a6b6a73ef27ea9f362fe9a4386db5cbe22518a4e34a02dca3e0012
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_om.tar.gz 3094495 BLAKE2B ffe43cc204e0b0042ae4a73ebef1c6feab7596ff362a8bcae1275192cdc3522b365c9f5e02f148c1df8a639cf0e5cb11d73c74be992c85841247636783aa2a83 SHA512 2add2e4e2793d5f4d9fa8c156afc200f2d57e76ad7ca40aa2134b9a0398603493623eb74477e66c50f64f0661921afcdd4fb6563cbfd0968975978fa867be868
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_pl.tar.gz 3179623 BLAKE2B a6114b4e225ed63dcef8cff33919d9127f361762a18ba7cd0dce3372052759ff0d0766a21ab4442ea6ebdc94d1a5a5526c09e77827f59127a920880ff75b3464 SHA512 f1bd294ada5e7870b3ce4be9198610c34b91d2c4649ddb9c70a10b1a19b1c9b8cfb0d3b2a912e5d1e6df78f77c651ce2d87d98cc375064d0e6037628497d1396
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3086514 BLAKE2B 60a9c46187337b9b6a02a8a563ef694487b82b0c92e1a88084c23746e6b03e312f81cdde32c7869dea387aae147d1c72b0e7e22ef59570da9625b80d5decf28e SHA512 bed26f384a1d719600ea3b8ff8eb4b8b14aa5835bfc79bf38f0e05630d9bbef9db3652fc7a5fc7a2d42565b0a250daad5e3c6cfc1683ef5c27ad16a3d723bc2b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_pt.tar.gz 3102157 BLAKE2B 033ba005ef902729f5fd73e93d7bb68a1973d13d1c9187a41ecaf6c006f99b39d9e2af0b9d3f0892d75c27b15efdd31d3fe34f3a1b093f5499c9b04f1d8d047b SHA512 1fbbc38c8c4c759a5d83e176aeee465eb6814656b50afc7a7915d79258c38c7c00e27fcd5a1cd4f9f71a09600e559bb985c01a84830f28c72a6b791ec3b3c970
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ro.tar.gz 2986446 BLAKE2B e5107c11e1ebb35e7d2ebbde45b5c66be8a0abb7dad7f20b913d428623e04dd667f672be54bc770a71c14d74f8b0426687b61654697039d11bf1dd69cab5b37f SHA512 f2c8cc3babd0cdb3fefff6feb992f92867bd2b6a8a2444d97a08b6e42fa8ec464550a79bfb28f5c22d184c1f331d375cf1c6c89fa5bad8e36bbc4f02c3c190bd
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ru.tar.gz 3343665 BLAKE2B 3319e9c0877fc4113e80c0d75c1647dcf21c1c265031b7b5a8156713a14fcdc3cd4450f42862f84c92ac8d410606ac8bf0a978b848420cbf725d4aa881af4747 SHA512 238d23d456d5d1d89fee07dc7c2bcd480de2325a3cd2ea6ef2b43f39521428cff39c225f3423dc5fe64be35b05088ef9024fea3f01033b6064e4d1645fcee2dd
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_si.tar.gz 3126438 BLAKE2B 6d54611e6fd2f8ee02974dcd8795bbd850b6d53e27b138db8e3288e48db6ae54ac2f7f612571072d4f74eaf9619b37c7cad340ccc05252c138d52d40dce91ab2 SHA512 d0973ae737d176898b6d19b5443f7af3a6fc6eee4aa16311e5fcd77152f57154a0dea9dee42e69b41b598c27b87594fc508ff436a87fc94f9faecc08e3a6edc6
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_sid.tar.gz 3079526 BLAKE2B e66fa304899eb9263516ce4e6223914b09954ec6f1fafdeb05f36e396545002bbaef1505da256ec9088d8dcbd1089711dcc54d3ffd44f80e611f1eb5530d710b SHA512 5bd2e220bf22b4458579b9937714632269737339b958d7650f7d901d1f31f4d03c60b10833e0f0e907475ad12a34af696e08dc4098a0a05c1b2446b9e4e7c885
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_sk.tar.gz 3135168 BLAKE2B cd54d1e66c8101c2fffa1ffe23cc94952eabb62bb31e500f2831dbf30b04ac4c8e041c0ba0a441cf88d0cff746e11555c34b6d97e6b1098706cadee0e7bfd1ef SHA512 eae2dc65b15df06ce48a94f6323a473eb73cb9889a9a8e2af090d6cf68131c78cc941452d13b2062d6042bd1bb78c20866038e6290659f49e2e0b993b01cabd5
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_sl.tar.gz 3076223 BLAKE2B a2c349a13dfb70c7ddd33d30db0a8689ee36ddcf7e76f3dd6c00b9a74d1e92acc0de7a738845e04bcd6725b8b96cdcaa81ae99ba63e6f2beb8814445a53bc901 SHA512 667f9f6576e493eba1662499f8eb5e60d0a17e7de0c3bec3fb3f5560e2fa935780c7479430f26420225120437cbc44d67e3d909981486546e475792b0bd16ce4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_sq.tar.gz 3007102 BLAKE2B 463403c174db1739729f4b1f391e4350ded4aa42ded4d5cb13f39e6b8e4f448f061e8479eb285275639878c54432107b218005eb67e4553d7ce7d80d6e32218d SHA512 c350e9864b05d55d4b3a55a3998f5188a1da130c85409b1c89ef9d2992c835369f05706aea208538a382705480b8f84138fec095ce1b8491e766e94979c176d5
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_sv.tar.gz 3083461 BLAKE2B 8dd52025f10d8ea8d9643297723fb929efdfdb338f9a0c86f6822edbb6e5272d7972e0c53caedadd59a022a5e6a1ad1db7d34363338d36ae8547b64a36c24f0f SHA512 6432caffc3119810b815f58c40749361b7d6b4ee0819d5605f01003cea24811d76c5f68726bd7aba4b59cdc022f159ceeaba1b8dc14650c7a974f22330143708
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ta.tar.gz 3318925 BLAKE2B 72d1a5bd1c9ea27ee0b81d0823ef9a705eab9747cda976485dcce7bf84826157afd0eadc0af789ceb6b9f660bc29f566cde944a55ff0990d4b7c83d7ee23291e SHA512 400b29961800a8283a5309270f1e594e0e21ec139f1a5937662e71252373e58a14a116427fccc11a20956e7037516055871c4efe84a03c494539d30b882fece5
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_tg.tar.gz 3022650 BLAKE2B 3d8a036da06be27d4997c3805ca4e2fab1f4508f9ba8376f925a27ae9975749724807636a884833239de16a23cc4728d71b009db5cb868595db4da89120b37ce SHA512 64cdd115ede22999f19dc455518340069ba2425dd7d4e1337e20286a71ca3566bb47b4a77b72b3c33d10603e2d646c239b815b1742ea09c7849a0cfa86d54075
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_tr.tar.gz 3139980 BLAKE2B 50455f469c9995c1abd6af665549bd035f286c4684102abc95affa74a2b9ebcb5f1ddf2d091aa007ff04c5d5b7c90b9fd85985d2dcc2a988c0423397f8f46e9f SHA512 c49a6284dddf2b44a99852e96de6bef474db4d95b27094252f262deb2d7fe093f73481a5aeac54ab91b1df2125562e5ae1e5bf2412f53821e59610bf4dd8c337
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_ug.tar.gz 3040871 BLAKE2B 238b11244b60738a9ca74bf4dce597511539947fbe8c02d77599cdf4680745aef54aaa6bf7f559fe66fc844d69a4ea925253f47775660f834e78d5fe9c0f4b88 SHA512 78d9f0ef163e2618d6c69c30652150b66beff6b424fafd27d448fcda2335f04f3dfac2e80d80d12099274cf7d064efceb5d912fd612769b74c016bf769807241
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_uk.tar.gz 3334779 BLAKE2B d850cb7a054dc61e557293c15b03a57a18860a472b09c2244125fbdfdeb13229e9116f4cd0810ac69cd3c4738f0b9899c7a8fd971d75d4ae445b2199c61e7558 SHA512 020ebca9580efcd84b277d9b2b48c9cc87d1b1f638be00bcd18f4251288d4f538266fa97ce3cfd6a53a07ba57bb671f5d47929fae29adeadeb2fabc83ce42d38
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_vi.tar.gz 3072143 BLAKE2B 87133e9591f8afb0190c67933ef5e9a55fb88fca81a1ccc44166a6cd484478c3ef7bdc1d58e162db66bca1203cec1f896246ca963a7183acc88d3984c31d0858 SHA512 77b10a3bda3f0f13598ac4083ef8a8c579db352399eea23a58a8fa164e58901ccb8db71e421164c2113d2f2cee0a901520c89dd2778bc553c8d66a145465e289
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3176559 BLAKE2B 4d1e9d1917cf2c90f88e40c35c9083a9aeb7891b90d220c53c47f3cfc26af5847b51d9165aa721c37d287e0f033ff39d5356a1fde175b73836aa3cbeb69eb213 SHA512 2b2f40d976185265c64ff67741c72730300b3b946df40572524e5b2768bb74c69b355c6656b5f8788c651c8838ef4b32b22748e366db1a6b194092e6712c6b5c
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3210106 BLAKE2B 4d70d91ead63395b17a81f8e97dbb083c976f23e1921f0eaffb162a04ca367d7cb3cc1a9726f19cb03d32f80678aa30ff334cd6152286a719b42791d38217528 SHA512 3695eff1d7fd88a76a4a30bbb3e51869c60f42ae763cec586c5f4a2a75d40f8b9c2832816be4e566f66b5c48352b4d28f03d07f922ae69ee703fb130d2e527af
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_af.tar.gz 1347520 BLAKE2B c18150dbec2ae96f626c7d53a0b3f5191a76293d763d11ef02c10089995065ef4472ef2565cd3071fe442378041bd687f71ea8b5b7f9eaea2d45f195a6bbb554 SHA512 1db4940a0d231b425614656e812e0951fe1ae62bc2153ef2b84aab1bb0269c52cefeb9a77a81329c8389038f43b81b80ac5c9b241b6629bea935685b5bf9325d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_am.tar.gz 797922 BLAKE2B fc03196b8a4a9fa1f8f74f470b2c66018e58d4f3bc4f0ba7a70a78019d17cbebc9be2a111585666c9e751d7cc6216a4371736f1807c1ec16bbf4951bccd3bd91 SHA512 82fd8dfc83cfbc9475c2552e40c382ef40eab101a9dd8fdab5b062a58a91cea7a8b5a43d3610a64eb7c49b815e65d6b61dbe31844a7c475c5b0de5fc90364aa6
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ar.tar.gz 2310718 BLAKE2B e1f721c44585205529bb40b2753d82114ff8a3f691399dabc2886af438954048454727f3b8bad3a7cdca065f331b245f63a04f323507ca532388fa4cb018b208 SHA512 794a81bc7f25dee2c83f001d76ff8e578fbdc5c55ecab4c5644a2b2bc60a34e590a1e94ed67d4cda2078cc17608e08a05a687cf684a188aab987c264a2bcf979
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_as.tar.gz 428496 BLAKE2B 62f31b15b37ac0ccf9bd00c4548018a2c4b891c0a8ae23934ae2545b9e7986c9dfbbe85b823294f8f59c3874dd50b8308c3582feddd6ea26f37231956d036b25 SHA512 efdc2ecb5c5124a924126fda8d2df5c42164f5681c472a8d02e92ce9e171cbffbbae445e81ea5bc20c26cc312e25a79e0d9898322ca71983ef734db5774fa074
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ast.tar.gz 494412 BLAKE2B 397681456f2b14bee49a96c3780101203208d15de9fa575220b4e3c97fae1039e49c83175b2247a5a90f60bd47ee29613149888dcca8fe965f8d3b389d5008f4 SHA512 b54439bffb1104056f365654e13ffaf186f60dda20fb528c51ce6b603bd4a0ffc2cb7a306d053e8edc50d4ae00059cc21865862ace34bd0a6a3824ba0636ec92
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_be.tar.gz 1951523 BLAKE2B 6a72bf875c962d9929e94bd08815a1e3ee376a9587af4205a21e170dfe0368068a10ccf9ee8c966f22cdeb29a4eb91d4d7424505209e49b923f93c862f7a1a2f SHA512 5ae58d92336eaaa6e45977e3546044d5fd4863e5901df79be0c941ab5b9afb1ffa26c9a9fc74741a590c9477d9107ebd674fb8834fea40c1cd0f8e9241c15bee
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_bg.tar.gz 2630889 BLAKE2B edea974c3b2a501ce433d353e775a742897ab82a7bdf7ffb0fa247bfd6e3dc994e00f7555bfcc4e11ce22c46bb5b38ffcbcce0747c216d4172d14d98bc8f3dde SHA512 0d82ec407842b88445aee025b4ac5ee8dbaa936944e3647a013c071d5c73b4432be74a4d25ca4c9bb0132f898a42f0776d927cfcec158b290777bee325f66411
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 595573 BLAKE2B 31a94dc22ab6d871d921ce3e79f57dfd25ffb4dffb853327ae0c41b8f3709649fa137e1f94a83c6e201b3ed7efe2c7f4218cea534c2a3700a91f12da02ead148 SHA512 67d3fae7fa24443bed99c3c9fd6dd4278c9c7072417abb22446cfa7dea45f5fb23aac2fe6fd6b9ab697e29ba2c4d0dea98ed91f7de5685b687475f7a84bad9ea
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_bn.tar.gz 752379 BLAKE2B c0f92ec8d992721258c4d68b1537a9703490009d7ed5792e54253edfd8cda17bf4e1a56e23ecd1fa1975fa1e16847b20dc74ad122f4c0dde16f3acc72672bf66 SHA512 03084ae4d7e771e21cb3a35f58079f0c14b4b3f45f94c5af41dd9ca5f55fef9723053b69617439412213f82c9f41cd372d4775a24980c117f6edae90dac50034
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_bo.tar.gz 382217 BLAKE2B acf7b655af93875dbfed1f50e54ab3fcbd3b69c275b305271b0d551cba1297b9a12395f44e1ad9e47b760c7cb8f4af0f29d5900d81ebad7ac1644f375a5e6fd6 SHA512 e0363e6966ffe15397c4242129e05e47045e36f3677b0995e1c07394afad0350d157c7e1d1cebb3612ca5bdd251d6cc7cef2cd0a9d13db78af3118a4c437e0b0
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_br.tar.gz 1338151 BLAKE2B 87c2fcd8467cd970585ff4faa0e4deb295c8808bbf5bc450e1ced7fbf9bb1745e8db1e493d36cd5919396d352da7d7e74a9563bd3bb33936f7d845d64eeefd86 SHA512 dd9b35d56a178239e62a01025c8af0e1585656841091748cdf7ae1f5fe1cfd2dbcc5fcdf46e41cf6bb0082e8f360d031a7a03723acbe2d5cabbc142b3eeaf218
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_brx.tar.gz 279485 BLAKE2B 0c2269773e5267d1d8e5397d0ddcf211d448d1f7ad69d559c2ad9669880977dc2796377bbf0cfea7b61cc94ad0d89f6ecc64dd055e291fc8f597f644b3631bf4 SHA512 f032b97ab6fd3f3ca7a6b3565e20cc4c19d56142c5bffb943802b917ad073f1f6d109a7376cce6f5304e3e3977b0665dce548d8491e0041fe3fd1e1932fa0ea6
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_bs.tar.gz 554752 BLAKE2B ae779d5beb9781e07aa236208e28c34f255785cdc4b3fae00f89716d08d5a20b90b291a6fa11750d18662112e8887fa771efc152b9136406c9f15759db9bb7a9 SHA512 99f59f9cb709073124c1d4ce08e9a389f7eb8db9ec8218bb468dc1ab9fd38b5b4671546c0c8ae0c5cf4b48874f2d0f713ae6b52e0dfd674381f4e7c7fb59d223
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2474715 BLAKE2B fb8e49c7287c6db3fe881d6b796b155255d6b6ac0142d6fe0483f18d262d724d976a29ff75e5d1cd705553f80733bf21b4ebf4074bbef9e44ec5f032fc9d9297 SHA512 2bd7345e1c4722a0eecd01f49f51eecc3fdb09234a27f1ba58be7dfa04bc59ab26b21ee256a8f6d35298657fbad5038a83d02f45fd2c37f51cd83f877b255925
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ca.tar.gz 2474919 BLAKE2B d705ba8f149864f8db9baa3c394c26e99253be93a8f6e98b4dcd016d2f52e2ff22e0403e830469193521463b05a6da2ac875a0bb63d095cd2a963e3da8b19de1 SHA512 33d8fb9debf9f9a40c2716342f8604bf1743b618b5964a387eb2ed3b5ee5eb83b78b08836fda5e245902fbecb3a1e877a8b3289cff1fc00e807ca9f4c9f890df
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ckb.tar.gz 412115 BLAKE2B 18eac0a70ee4fff924b56eeca400207784307c9849935dddb9af58a15e2b3191ca7725af7b6b4f390de272c9ae7370556d543f89c9cb9ec498f9e87b225ad65d SHA512 1d0dc9e4ea50fddd1b1cb579e9adc9ff8277aa06aef41c44dbd3134091187f0867d3b0fa05740b93658b99b07fe721029f2973c1396860ec8790a0e9bdd7f11e
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_cs.tar.gz 3352640 BLAKE2B 491630f4a89639080b802530e8e0cecca7c0f1332e2ac6aa9fb514cd416d4ff33a0f69259e03a46078aefdb0d29d47be92219c4abd0af030d52cf966b1f0d08b SHA512 d085dfdb451c5622e5194af6ba152b04fec2472b2f0b08933c25e9b4fdbfa20317074b85240360ab751ae9e88a63ca59a9ffaae55ef2dd7e29a77cfffb91c02a
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_cy.tar.gz 890104 BLAKE2B 62db78fc2d1ade4f9454e6714c2247de6664b860f178c68121cdb7b4adcf2e65d26d1260714b13152b8a7425ba6ab26d3c05be613678ed57802b3e0ff95b2e71 SHA512 49c4b28cd7161c0a0a297e2a3c8c5c3d4cecae06e42f1f4da5c45190088674ce2bbb4f325a172fdf03fd88fcc90e68920b6a84de3c2b263a18dbafc29313be12
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_da.tar.gz 2833970 BLAKE2B df75a03d5910b235f5df5e3ce2aa015567e7129eeb54b822693157327aea96f4694d1df2e827c718bf55195e6c8b006a1b4b90f197f80bed60c1b2ce4d14b7e9 SHA512 7e1abad10710303c822faf7762ac7fc0c84cc36051e5899299658636049e0116ca38e9a297ec4d0467c4467d6c44652bcd87c5744d4b13b0253ba41221334a45
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_de.tar.gz 17376356 BLAKE2B e39b039ac42ebe153fb5ee768b4f96b27f3b012b63c3b1aec77c9df6a64c8e671dfc5f2ace66c13831a21e9e5250ac04ede7c9fd6a6074ae8a12d13ff543c983 SHA512 92876699a3c971c940d78283f43e0e7153c3baeea275f47ea266a78c477ac2067df7ec241b688cf75689ecbb2d54f462d69a1b190b6af2e5ce3a87b001413377
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_dgo.tar.gz 352447 BLAKE2B fa98182abf92c0a493146c31e01e7eb7b4f2254cff71faf20ba235c23110325296b8d3112ea7d2131b9348f7c0e2e50acf84edc9ab9a428cb52900caecc58b82 SHA512 2c6ae7fff3c5dc4f8ac2c0eb4fe43edba84e64a7e8f9a53443db05b66590b6d467e7bed1eb8258a75645bfc9fff68bfe9602132ad970cc73daef9a536c4df8e1
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_dsb.tar.gz 907756 BLAKE2B a0f6f01a609d25eddc23c24cd172f9e09d7341abc20ff41db19c3e335d58ac9047d985afb7463e8f6faeebbd04781a6d5f4726d082d6cf690adbfb7f59f83af3 SHA512 81858fa11840d076e81c664ed6b2b65105556f1f8229008cb81a29810cc77e6d2b68f9be187fe4660aa6f6e0962d616926be7bcf212658e1a3f6c4b388bdbfb4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_dz.tar.gz 405239 BLAKE2B 070b5f0f4ad606baf2b9d864a6debee8a15e302b6a8a57714a27cbead21b669c03e1ab461a7898cda23f416132e38be67e899223cafc647762b402210a440021 SHA512 9d24646378e5177a824d4768d79e4f83c2f4e3b3d91f9b228da124ce46df6e2fd3962caf5ddf8d4f14821ec707a8c2a8e82620016b92c9d41c6945ba0ac5d94a
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_el.tar.gz 2907746 BLAKE2B 3c0361218dde131fd1cb41e36788c4b9e807855b6fef610019032259deae9e33537d9708d9defed2c98f74aad60492948077d55083a8e326a9ff0d0ecc7ee989 SHA512 39444127b111d220a8cb8a4ec05b2527563616e947b6f35d43a82e992d8a6ef746b1b134bc1cf6761b3985503ba50c0d91eeeb20b9d2aad015fed1d040740a7b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz 6493599 BLAKE2B 9ee580a63b5801309be17e67cb5272d1df664e92c52ac0a09ea2452a5de5d55f67b67cf46e42c1187dc84552aa98444f5d57339d75c5ee86b0d4d4bb230b8577 SHA512 cb3a8182e33a291ae53b1044c9c2d2b356cd9e6e4b2eeeb42cb98f848e2a2c43a2d1cab6a615e5bf3824ecd1cec47aa88e7062d4ddfc99ad3776ed7a9f9b10db
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6010101 BLAKE2B 4d03c9f0ae61a3d4682914a47ec03367c160a8a5e454058bb2bc47301906a44c3b048edbc0e3d53ad25755afffae02cd3b0d47690ce0c281e7e1ab16128e10ba SHA512 f722eb305c4a3fd79b7d56994f9d25ed44575e6b93519ac7fe0795e29cd6e4fe93de7fee8b9fa92085e5d9ea4dea39a46558a8b08109e24be1554efc8aac3de6
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_eo.tar.gz 1151670 BLAKE2B 6578e53e1e6722aad779b0c0d6ce3f4e9e1b842d44ca1d2e7c4d1257866bf0697abe43cad4773d4c0d06dd98a7458bd4754f4665fb8983c21407a314485e253b SHA512 953dc8d0dd51f77a2099896c876bf5ad73e7705a5f451bb829c7a779fb62157082bd312c2343dd7fffb81fe8513f4ed7b51142b468d72b77e0b2427944eda3a2
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_es.tar.gz 3757084 BLAKE2B ca646030022b77dbcb1da18ab62ff2861fd63114966d1523f9f9c4e5e9c8cd25eb10690413071133a8c022cb2dcdc3e3e257c349fe11e26b2aea6a7907d97c5a SHA512 d8acb90b3b9a240fd134a96827055eab0709760041a18dfc85cc3c6dcf542d0d52058efdcf3c2fd37f55ce9d28e48561350e601618b7e8a2a11d3c4bb54378a6
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_et.tar.gz 1614636 BLAKE2B 9c1d139b9351ec00652138117aa64541a76b77f8f1eb5a6348a84c088d44b734188f49e6850c268b7cf5fbf1c9a3bbced9cbaa3e296073a3dbff4e6b655c7af4 SHA512 53d16e461b96276b232852bbe4aaf97766dfc573be885ab453ce09c658ef46a782b1e6a2764564b0537294e52ed1c109e49549c2eb2b8b18782da4bade335502
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_eu.tar.gz 875551 BLAKE2B afcbcb6c6e98e3bfdab77338d3cc51b8bc379254eea5afd1eae38e238fb279e2fe6fc611404b01d51b02214785df70df765f522483b546e85552b3250d443d49 SHA512 099d99674734765a17eff6696dfbfeded15383c61899ef127f0d9891a12b3bb6b4a02610afcab96eda798c31f9829f6b4d40379f68ea5007a9b64265e77bfbfd
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_fa.tar.gz 681127 BLAKE2B 7d2f6e9e4d868e88a766393fc7d278c1f879e5213e2e4e5d9c2361f8b46013ea9c3978dcdc3aa7dbf7dd9d3b823216a38f00d910a77676613bd7666cd4b65cb6 SHA512 0a5f84bcbb753ccf029378f76adbda9d4995da17192111c6f790b57b0b1ddab93587af415c8b7072f2d1065d3497e6446ed6295ee2a985cc7377e7df1e0a4de8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_fi.tar.gz 755112 BLAKE2B 699336b29f2a8faa5c282ab4ce9b4501aadf5979fcea765f67acb525a982fe2f5cb54122e08c09a9f08fb7c4c39a043e8bb4a628a5c7ce8d34b0cf42c0b756b2 SHA512 6f82ee16ff958a868c335eac6c142350841c49f30c94f29ca8e61cf6aaa6933f5077dc363437b7191f82c1e1cca5eb4279622482ebfe1a6575a7e8e5f69e4cf7
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_fr.tar.gz 2836774 BLAKE2B d18ba706fb2e75afd4308bcf46967ebd9eb7146ed409b12cf15ac05befa7aa6c70828153422df9217e11a8a2ac421e4908968c9ad6a6f6e440774d5e7a3543de SHA512 686043bf98b0307480b929ee489e0d8bfc3dd71502b2b97ec1931893845070a34bf7641ef3ed009c4cad8c7fec82f561724355f95fe0df12ea13431ac0514b98
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_fur.tar.gz 167262 BLAKE2B 0d8076881ad1fc5c2369b46dd48912b29697c83e9161162c66ccfc8fc4ad599db0e19655a498f9807e083c5338476cd5d1bef1e23e6646fff9a67b2d51223f7c SHA512 ed800fbf8af55820e99fe34f365a76057d1b5074048bd82ce3e5ddadf03622be54a41f7974a67dde2fa627e1ebc52f9a31436884121c983318092b022f79c129
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_fy.tar.gz 749111 BLAKE2B 88ffc6202e1ec2387e3ab8740995c9508e9fa7099538378f1015766a6ebc4faf67da2f5513f6b1853cf35b34fa78d07cc427d9740d409f51c1a7c73e50ae4d28 SHA512 f12d972890e41446b87fd74861ba24c8952983ac072881695982e0d0c763d357ef99982f235cc28ddad5b513d728dc36b81ac7a0254b3c7ae46a00252934d541
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ga.tar.gz 574259 BLAKE2B a23ebfb2f2163ea5afa9410a2eea5a421a9adc03cfb900296e9daf26b05c5e8371800be04d69f3e094a2e327b65954b21708968edfb95c943febaaff2540075f SHA512 bfd9cc9a870f3460dc377696b901cb66e01d7c7601a4517152bc50b8b5f93f66ef7870410fc6d68f2a950c30c98e8a560576919a9a9b2a44d9f6beefd52d3e79
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_gd.tar.gz 1543574 BLAKE2B d45824ce5c83d0500a1b5b735c5ec212721926248b8e719f6b749bff24b4a33d8f38e6f21f958a53e991484bf27a13cb6504ac46dbc84a5ee4a05c0fd2708ba0 SHA512 89ce545900c28728aa275166a1f3fd0a7f40671256d5a011decec8658cc923f8af39af7f7f5652882147b6852f76da1d3e2fa42c4d23fc0c2e5b45c483a3af55
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_gl.tar.gz 2566128 BLAKE2B f61ea121428455fb9eb306d374ee147d0cd2f6cdcc9899e19ac2bd15e0cd6932bbf2752af35661d0905519ffc6d4b62d6eaf3ba241a886b3394b78ad9b6e0116 SHA512 2d27f1060ef9fd8f05414dea6f5cd0e2ba53bf0f360843d1fe2c3cf88b2e07066227054b5641b6af9a61197ab8f65a976196a4d389dabbca3bfc39f789a4d5ca
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_gu.tar.gz 1135187 BLAKE2B 412bca066a71a1d4fba8f0ed86106c641fead89d71300682cd2a2cefa97cd0b8933cf22cc4dabd5ccc3ac17fffb5a8d3ac4bb65fb77a53ed11cf65c3ecc8dba1 SHA512 dcd22f9d4141479ac25622e853fd6115381c9f2d6b31f7d912b6e23373768bae00a45d249120224a6b5f8dcc7a0283e2a19178ea4ac4b88738b6976147a0f579
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_gug.tar.gz 406710 BLAKE2B 22a6155653c6a3392b8edd7e357e9cf9b25c6e44a88646a049ccaa4786dc43c39bcb9fe8b8167ea2b0152a6c1d61803cf3dd2ea7f28cfe999e531da61616e9ea SHA512 7dcc7708853044dc12c2ffd4a03704d8e7748c88d5b62952ef40c208c0d5002caa3b28bc75c3dbe411c99412d916d2e13977f45b874380098779c1d524f39c28
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_he.tar.gz 1542447 BLAKE2B 10f9d5eedc618df268e32081964d1d21b131e7a07fa9b4c6acd5b3911ee1a7663848fd201d59c9de016643bf66bb147f164884e81222dbc1b10ad14d04c34eab SHA512 d5a6cb46fbce2e50dfb74ee0007f025b50930c49ae7f95ec5a78790d342b230147726e7ff1edf1c5a750b9616651a46a7f78772ff20647f2f7548a5970ed9676
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_hi.tar.gz 463880 BLAKE2B c9d4aedf446c907b9d744f808804a1713136e49e7e840f46d95fcb1ad6f9a3e84a3f59c6b335a8baead5a0ce9b03727008f73687edd4d55f64d162f742bd0791 SHA512 1c255eaf96dc3a3af8becf183b3266b066b272525b0408b9d0b26acc2a98fb3511e3f7092e2880e6cc8ac4cb90120c6624a25bdb121a00e283c26a6d491f89de
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_hr.tar.gz 832171 BLAKE2B fe148d656b3dfc8da8f6d90790fce0ac23fa0d3df7a54bb278324b369fa80bd2bf54b393994cf1867900fc68d05547917ffac3484d76ad17eb82f4d1a51a7c09 SHA512 c3fb08ca49629fa9570c87701d7c1ce0da177d6949020d0bb11304fd502bea14a80f79cac8e8467d157e250d04022e16ec6dae4339904f01766765d0498fa686
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_hsb.tar.gz 905230 BLAKE2B d0e133050cf2a204296105ff0b45ec9f4feac4387d249b3da2d2f10f59cec4132a62f9f32c09954ada42577f0460137088289a98117b370d71c0e2d944648b33 SHA512 c804cba382c6ce841f5070c77557651854041197af4e2c210e7626fe6ab392376755bebd7b4e817200a57bddcd77f82561f324a88b35be239c5dd2275bb4daaf
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_hu.tar.gz 2728815 BLAKE2B 2d5686df0769f041452b9da5eb6037072563785c5b33e6f7a29d6e0e30501266bab973e066e7a2c1386c125b41e62cf7dcb038a2cbff148bcda9c61d99712453 SHA512 ae10cd4687dd013b86b19cd6d1b694ee55c28aa193cda68ca56890013b29bdec66f3745ff7c04f4217bab174660db55df4c33354697d0983b873828780d3f695
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_id.tar.gz 1721215 BLAKE2B cd6e966ff3f469544c76cc6ceeb1b2a6baa8409191bdb1d555be156ce85f4c56c6031b9f76c935e5456e2c67c54d66c1bcccede75dd2f6b0b2911b41244ffa31 SHA512 7dc672e5f00acaac653219f806ceaa399722fbb92dfa64260a72660748d191023d852a4321e4a4138af800ac528d58ee03936f558bd806e86f82765afe0343ed
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_is.tar.gz 1397295 BLAKE2B b11f963cf64ac28e160a5b1390a2db332dfd24eefb00208d98a3105cb05b2fd9f32cfa62fbb9614a1ce90ecd242056960375ad21ad0ddcd5b23bdcae9887efa9 SHA512 f995e3716ab8bef36bb980fb544ebc5a88b106685b63fbc9770916c60fd03468c298c2e0abd38dedfe0e804463c23e051d490990204d2ef5ad34536254d680a5
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_it.tar.gz 2151196 BLAKE2B 3c6021b205e0e51dcbde58de70c397ff1139ad2375625eb1ae2f7017d325e686288d6d0223f19d31f30ee39a333297d86bffa4060c3770eebaab9a19ac189de2 SHA512 35c6de342460cabbad4cc53c8dece527b94a2c223ff224cdcf0ddb5e319e2c92194260c7d70eced0e45497f0b107a8134d6de384eab35a019a0ce5a5ecf397dc
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ja.tar.gz 863845 BLAKE2B fd08e7fb24c32673e54e99eae18d700f267be503a83ab7bcf6cbbc15bebe09bd4e0c1a48b6be95f1699465fdfd1a6e2f59908830975046dcf4bf7972679d92b0 SHA512 67b172ee70bd2a254bf640d546007cb513f7cbe63eab46e87660f66385b7ce80e1d7f663cad062c631f0da3e540f4a80b3e4d2cfa7417012d0d9d80367c41aff
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ka.tar.gz 328742 BLAKE2B 368c2c81de022135182cdb63ce933b41130c34d7b87eff9bdb627f84754121bb89f49749d0cf808c4fb8f1666dd3a937f2f6c59fe31e4c61e7aab81831855fa4 SHA512 8e3fffad56433b260145c97aa197ceabfb0d253ad4b69dc85129f83d006b3c971c6dcd1aff07636a9ac7ec9a1912a570681978a9a8732e48735b79dcc1b3fc08
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_kab.tar.gz 506700 BLAKE2B 228cfdbf102f0c3e1cadbcba8846bc9d8a24b7955c3071aa71e9c300b162c0953158bef8cb33457183869251bd113e069ffc620b489a5faa58fcc5289dc8b2d3 SHA512 8bcb26b1e5c52719d0cd5aa2a08a3b609155123fa6e75e44dc9c940a5aa9a5192c1703c2d8017b22b5116311562ed02701d727ac0b65460d3b5272c7479c9339
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_kk.tar.gz 891738 BLAKE2B ac9e6d5681eee778e2691a2b45bf47dfbce67d3ca4020fd09ddb0b645797b025f897454e3e8b810cd23f18104f52b4101da8998295d8973a5670e361c68a3e3f SHA512 0ce5a50c19e0873d928824cc19cf6a440dd7662c6c699a6656f0c74cf324a751c60302eb56b4b12be9ca6b0a95a1bbf36f70fc675154ae1bf0faaea027feaf12
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_km.tar.gz 684490 BLAKE2B c8ce340312ad07ba57dfa8161dd9c5f9574d007141a0d545d137a6699e169bae3ed35455e0436bc69e8766f72eefaca1dda3dcec2391d8a3b39d98c578a853c0 SHA512 688220e7de4deadaccd6df50efe475fbb58d1af26397c03d3c91d22c3149cdf83938b106e56b4fd41de91ae98eb4c8397fa3f06d0fc2675ceed05caa15695a83
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 265765 BLAKE2B c9243941e69715d24decd9383d36a747fb9476cc34e2351e461b72359334c4b977f7fa0a009131f043fcae469bba58817d93095f70566e1d8d3750680a9dee95 SHA512 ddf404a53309fab08ec3ebd09fc87ee30f8190617e8badb7db4cd43fa94924a7d85a5afcd1d15d85d46f2d280b491275cc73455e72291d90e8072bd6b2b494f7
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_kn.tar.gz 465277 BLAKE2B 5c33589a23a880bdb51627d78067bde3cbb486ebb49219a00f7a070047c5cf25481f2ad77a2ed571d142afaf5468ddc4ed5160e4eaf63e98cee948b8002bd679 SHA512 6c64df123bba4982be92ec85d00e42588cbe9d86292debfad2f799c5fb434ccee78e685da7dd45e393c817ecabf0f0fdecaf1acc39dc7df79855cc4a64d6a115
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ko.tar.gz 1482506 BLAKE2B 0e18802a9d1c9aefaaec993d727d0d1946cd5d1f10d19c330c71ebd4987746d8a6b5a29f08e24f8efa4a0b58975eb2d205a212b0b9866276de6779cd4335df0b SHA512 dadc3b5ae99b16dbb332f5ec92bf26f01c42404f4b6fa0a0a58c6c3c7a832bc36b637219f73c0191c1dbff0793ab3d5f54e762f83e30fac71b0678d049e2c0b4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_kok.tar.gz 333208 BLAKE2B 68087bfc2d4ab86629923c9a91f9ef703ae274d6873dc403a6c5abc1e95131b6fd2a556e4c467a9b3193ce3772b41308017125bb8661a77b66965b294af42afd SHA512 c5eab6c32dd412e3c69697923c0a7b94a9998b3fc1b5f5c63a96a3d75596fb28a8e81728cff15de46624653bc9b247fbe2ae73a61b474343b9711af42899f7c4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ks.tar.gz 267327 BLAKE2B 81ba87680b46f424dcc5b35d9f1d62ca1befb238768796ad5324e889e08b6611166e53c28c48b9f45102ba8e346fa1c751723aa94cd0fd84088ecee9731da293 SHA512 dcad8b7bf5771337ca08d1cc6e2475b2330f3b6f386b5887529199ca8d83c2052cc75a87f939785556be14ed84b9542f71388e02280a05cd07e4b05fee31a5ec
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_lb.tar.gz 126208 BLAKE2B 7ba1d474404a0c0d7920c462bac225b060d5af4cb9af2c4d6770ce777cdd353c1f757991ee1bf922ba26c26178b900ab6409305d9e6d0c6c102e4b992cd0ba2f SHA512 ba4c5e6338bc6620fd1540ac06922f576f1ef13428a9a4aefbf276fbe49fe34a96e97ccd30db21e3de0442cb2b51c32ce72f26e1a0c7b1519d50120ec02c574d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_lo.tar.gz 448459 BLAKE2B 08eddd9e3004aaad125739aad36bc8aa1557de2069462dd5c7cfb080468ea706df11c5cfdbe640c2282780b22bc8d96984e7279e4838318188bf141458441070 SHA512 28d28c669617d17bab201f020e158d0c2b95eab3df79b4ed0efcce9d6b36f4159515aae5d0072681210bdaad5cfc49e2dd7b839c7e3d3f3bd804c495e8bd6dda
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_lt.tar.gz 1064182 BLAKE2B 795b3f5893abb004ecdb5c980022314dab72a79827e5309b7d9d7ec950395db9b3e05d9664f6f58bd85b3c23c4210b54b70b986e60330cfe1055ab78d7f2f3c4 SHA512 c8e8739b16bf7b172e137511a1f9698e1bb03d35ed5310dc03c6dc646e239f36d01573ebcd9496a3c04f35283d747be561b943e3f819edf7d54c8e1df01fa454
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_lv.tar.gz 975352 BLAKE2B d2fd3ed33c1bfacc5b88847ceef3461b5f9487828f49970c508c81fff14d2e8b2c230c4258412476abebfead2da0afdb382917721bf788a7198733a0a63bd054 SHA512 5290782d8163915a142ce1a332a7a73e8f35d9006de8644bd02995b7d11548e269399beee762b2cf0ad2e9836604215416a9e893d9f1c76d33c7013c2af90347
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_mai.tar.gz 271097 BLAKE2B 447efe9a6aea43d09dacb0f5ac97c57b659b4fa4baad67be8bb93cae007ab80b1c46f9dc94f8da787fbdf96d8784ad0ed12e91fcecde66ba64ceced8084d84cf SHA512 281934fc7672edb7c0510141b0e10e4be1d509836eefb23992daccf9db4fc9a2d1dfc3c6e3f66e950f216ed50a9a0d5fb109e80adc9baf8534e4aec8b6c7ddf4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_mk.tar.gz 377368 BLAKE2B dc45733fe667fc2827c9ce5685fb67e189edd5b5a769b01f5a3040c7bc367b285f6109ad97e91ed5965f3edcf9fd157eeecab34e53436658e3a33d31acc3ead8 SHA512 aeeeb3431784ca45f1142ee74be569fdb07dc87766af746c58715f80be7a80085f21cf63e73e5d4f79d5bdc8f01a21eeab1e76aa24088a4a85a275914f721eaf
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ml.tar.gz 432307 BLAKE2B f5af3532fe91bed7165281fbbde1ebc5e5b7a52b147b6cf9eb28384f4810639451896c8c712a45bef5265123f924c52a56d3a6195b121d97d8108af35602e1cc SHA512 a52668312d9a9ae1c8d2fba27f4b3401cdf8066d002e2661789c7c222e56947ef5eb7e251630e0c3ab66085e0e62220e7e8b933fe40d4d00dbded1713671a27f
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_mn.tar.gz 2315236 BLAKE2B e86ed4247811eaad4c31c2a31938f9c159e60c525edfec0436ebfbf41e94fd216acde4d7b5ff9212b9f803f02e781bad99556cb60ca72b3d68bc7e10053067ba SHA512 49900f0b9dbcc955f071d146f10b3f84e6dad87277bf9f7186a9302fbfa22f4909a2b82088a528f7f8c256f3222b4e738cae531ed6f1234f3de57b8a8cac5eb4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_mni.tar.gz 326654 BLAKE2B ad06b3f9a49a716359d3432a0d6bd5c9297996fc44a084a4d09ac7f48d7b24d9c649fd57cc70392fe060202e16b110e71900e73b7bf81d12dc7e813da5ea0be0 SHA512 cc54d0815ea03925c33c5c6a65e8f9b3be8effbf78a4b06cd4ab5d438db1d037343ac2740ca0d6be04248f22aab3c2822eee682b3994c734fb422d3616f45037
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_mr.tar.gz 460941 BLAKE2B f95662c53f4ac72dde33bd9ae61cf463cecdc3ea787317e9cb048a7615256cbd1d78804034b83b1573a73ed4c143880a14a4d34062e122f022fb32619abd799e SHA512 689a6ba9b45451a4f02c4d7e6c56f086073526bc492803cdd25c86663121d155a8a87816249d1601731426f2c06148f534b5934e08d1d276dad2c4090d068c9d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_my.tar.gz 373644 BLAKE2B a994cd736efa02d6221195b7c31ae99d4e597da06886081940749eb52318175c205a307b4b1f92d9185551fa9e349cb7357f5ebccd0ccce9657bc903981c209e SHA512 994c0fd005bf72d0370e47b1352792553bf532fae996ff9d57291e106cd31e6cde4df037dab519c38136c45733b864a282b9aaeac47592ed8dc1364bab27916d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_nb.tar.gz 3551228 BLAKE2B 8d8f1e034f4ff3b79c3a166f954ce6fc4ae9dad1a258e219d652066ca3d2580e81356a1384aa1fe0b8c73a8a5031ef715de9d4d078f2fece366ad2bb174a8862 SHA512 b842b81fdcb765fb77c0c98b8d9df76f95caa84f1421edbe7758c93d239f3dcbb30ee73a27169e9643b25fb554de784a7cedd5febc4c9d14d4e2b918466a1420
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ne.tar.gz 853292 BLAKE2B c2cf54f579e0b74f968a5955ac41e32d41984632e8fd5f46fb328eafbaec23e1300f48dbab3890fa7a120ecdfdb3bc8106266f6e4df2c3954f683f9ab26e576f SHA512 8f5da633f7a42bc3c92c563d61e95f54bafc89ccec3417dbaf35c8f9479dfc22b2766106a30c1a80b31ffb1088f4c943c9b94e4b692c64e534fc973c67cb6b53
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_nl.tar.gz 1655596 BLAKE2B 7af096e2a5be662e440b37e8c35d97fd40b7c661f28aed9c3f2ada33a11bfbb0dcad4f8b50d036b61d3bbbf5be6eb6894d975d6a4120a6f4961d51dfb0ceebbf SHA512 f7cb8b396f5134643e25b76ff00523542243e5cfa1485b0436d376b5c55d6b155df9e12472fc06261621f2bde58fffd6afae3bc53c5db6e9ef84e65071506cf7
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_nn.tar.gz 3553541 BLAKE2B 7bba8e10d2c7220578233f69a9d0bba0d0a9a2c7fd1f1e2151671e47f81f228ae1a151b731e6352bbd01816b4edaca60c1f185db2230b4e18d3e20e41b270dab SHA512 78a86f2bd2e7826edab64625abdb3242d47eb408dbe91a2e4691a2bfcf18d4f98f81a75a9b5bd8e0514ad30b891db976a7490bb35d14efff466897d08627876d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_nr.tar.gz 228548 BLAKE2B b96b744b2c4936e467e162501bb75ffc42b4f3fe756ef89e76ad0dffb5f00faebf48a4d0fc454e222e6432554683b0bfe0004147a4988fd88c0e5900436dce99 SHA512 d8a6b1a84cdb7d21ba265c37a4d31ac9b21eef20dd7080986ed4f69c06772553db2546f306a52fb3a2f62e2d6455b5c85a718cbe73bb9aa1b6851359324f83fa
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_nso.tar.gz 259323 BLAKE2B 5a2f47c00cb6538651e280343d3ca17bea838582dbd6e7092a40d516c525d105158395e72e3160c0d353764bd2be1b1df56239d4b643b1bfa19d75eaa0f26a7f SHA512 b2040e8feeffff46e440e5ec8fd9691f7b297fabd341bcd02a67ca828ca36fd76de0647491faba5294381d6f13d123deaa49b8f5a017c98ec22814b4fe65b512
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_oc.tar.gz 1166654 BLAKE2B 486472785dcefafcdd19b20b75e97ac54f4a547e878be04eec4fce082561d7ccbec3ddc39e39b93d7c90808c6f26521f743540e09e52d358b954e3bdfe1a265b SHA512 51312436edc83521841b4c2465b38c03e5798c837ca20e70b7c7bed4a99530dd6e79442a9bec905e7bd9beffbec886c6e6038e0bbb7de48b12a4b22fafd210fd
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_om.tar.gz 386452 BLAKE2B 1756b8621e3d4ba9068a00bff4ff47e24c8394680d13f44db933b5bfc5b32ebb117b51b9b7855230d91811034b0255fdfa4dfe58d4ea0fe14089176d7a6e0d36 SHA512 ac9661ae86f670d4a0e0adb1416839929693d8224bc48c1121ba47453139a946e77121da21134207cdd315556deea73760cc0221ba383c4eb748b8a9e7752f51
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_or.tar.gz 478531 BLAKE2B a7ba363bf0443051305d280a7825b560e0741092fb6a71d0609de65db5ec002b770f87669d0ef42f8a4fded0919e463c45950527e886881b9b6e5909fcde3525 SHA512 73090ee4154d735dec6578f340b3428d2141dee49f48e14db921a70ab15ff9ad0435b53475245970a733c7d07f97de8b75b261772c672f71e129679e4f8ebc80
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 452889 BLAKE2B bedefe80698bd7a75887dc13b6485cc0a79ece5b48d9feb76de42824196bec44e27b06493530ba1b576d65662235ad66e7d74789291695fc4edd4b1345f58dbb SHA512 25a1a06df89dc85baceec8bba1553344d06416beb06aee49ee396c626df7fbd214f08e4ae5bdd7e36ec19d8566d0164aedba444f59fb7d74fd4f26f286079cd0
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_pl.tar.gz 3055329 BLAKE2B 8d7dd814f0860bbe9035ca6c11af53a88ab94e220ede5b6d2e891009a1e6f97d7b193a96a8068f14c18fe6a34f3eb66f297c4b4bd34bb2bbf0d2406141538a7f SHA512 840cd630a848d3ec7d94e02ede469a907446c95213e1448ce419f162e38c665c191af4c161decd3cb43ad1df307ef7bb1448a5be043fa1f8331698ae914bad5f
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 5753998 BLAKE2B fc1b3ae899e4f96d2697bfe634f750d97237540704038ef845537cae1712cf6ecb68a2266c67bf410111c6aa7c35cda9452ca650882c9b866d9dd133077e8bdc SHA512 57e82c62abe804a69d1391a5e5ff0f6f35ece110331ae86b784daaa99e0aba98c9de28e1a2b1bdf1410a7a29dea732a6686a710ed6e9c7a245b1e334d74e3ae8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_pt.tar.gz 2389081 BLAKE2B 0c80878e99b87fc060fd22e0ac15c22ce036d7b44365b95840a152d5e1dd390a75806140e04a0e4afab72b02acaa6c9f53bdf1d0c59850720f867f9349f97b0c SHA512 d90034770e7128db42ca0f8a0803e77fa1b186437b7fe6538831c03185b89a0266da0f3ad82a04767ddfc7778d828c0f62b59560c1589bd8bdcf9f666c98b5f8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ro.tar.gz 2332503 BLAKE2B 717d602b0d09e48751c9c6dbc0f7b41caff8fb2462957831edcd7afb2c420ee3ba92349937a474abd4091339d53fd0acf6831b4eca49bcd4d525dd3609ff1b8d SHA512 cbc94f35187848ea70e6ef94e83a3c26caa60dec558369cb979f95b4f9b88b73c5a259b4d79c5bd59591aad99244d3d7570385b11b1321111d6a65e5201ea25c
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ru.tar.gz 2249149 BLAKE2B 925ced2831625d24c6c4c879357145af674cfbada0bf7ab415d177460d6d7130cafe568d78710e38649b092ac6d97696da01ffa64144bfa614a737bde688523b SHA512 37dca016f177a0edd6ef39e7feb99619592fe8160cb39d62536ed589c5e5bf936fa5f9280560500a0fdaf0b43642b3e54b7f5ed7b7f1d6370a9c4729327f50e0
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_rw.tar.gz 279640 BLAKE2B 0b474cbee32e7b538594ab6d586880bc30d8b342d3d166259455fa0405c89212e42f72679f5d7a5f5c832263b5ffba3d65a1764b5dacc30e8964d7de08915084 SHA512 6d10260a4e4ad7dfba81f6b7a4af0ddfbb9b9711aab29f97298238e3dffd6a7ee7eb065732cf7128b1bb64d4c44c8f37fe72ba1e37f3133dc873efa26589807d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 364337 BLAKE2B 1bde4cd7e57cfaed134191e3543c163733c957e5c8b58bf4610b083570708ac8fdad6bfae3bbc0e289d8252f1a587692d145d81fecaeffe5b74bbf4c71b6c281 SHA512 be6862fe8318f061b5316de2f615dd0bdff25146b07b1a5ef260068361a8d3d1be1140d4a6281ccbfd711abdc23d1e4fd2d5d63e317aa0d1ed2b24e653002096
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sat.tar.gz 414620 BLAKE2B 14bf8272bf724679a5b6a97f947b0b576031aa9ab7b76ff54f6ad8faa3c11175fe04b30c04a92b0845c2b863dfc73f9698e2f25bf685d438f43f4c369cff3c0b SHA512 e397db02ee97969440d46205c25fe34261fa68a9387c99e3bcb5a3fd06fec2c0a9603f8d5ab18dd7bec642113b72c2c2fc1ad09fd09ea0a31cfe8fdba60b7e2b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sd.tar.gz 345059 BLAKE2B 4686759028e9bf3991e846271ebbe0be9369eb0fd40713c24eea046edd44e1bf4209a0f1a7815ed4f3c32c308631d3a0070a09303ee26b4cf211ef5e162ce8c9 SHA512 54d9b7ffbb61b7b4202fc7f6de0c76d57228f62e0d82fa9562046954d1b0cb8374898ce882a5f758536013e066a59db50663b9f1af889a9b4396c428f3b56f3c
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_si.tar.gz 656262 BLAKE2B 0356dd48bfc2e93a1008acd1845f90c1c8b900d2a211a31a6f6b53df0c3a5afb34e3c8c33c821e659fec383a1f060e334be41c5e7296d50fa91ea05e9854715c SHA512 4534c75681737f8fa561d35c96c3804aed79e03f51a5e4430e32f2fb7ccfc9037df94fc8609fff1b25a6390d2a18569d9e910aebdc1f20d1928d17275a45e309
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sid.tar.gz 415391 BLAKE2B 5716e893a758ccd2f27107b36e7b1d0b264e36cf884d404deff78625020cbdc7cd0915f72b4b773c07c261cd141dde518239993357f05059bf4319f2eedbe10f SHA512 29f59e422e60b29bae9dcf2d291dabaa169d1d3115271c5390ff207e83a6489ad722ed08b16e1c4ef93c0f7324c747c71eb4d0db80a15804fe96d9e962f66510
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sk.tar.gz 1922550 BLAKE2B 25efe5d226dba73913cbee8eb2ee5ef9c57623c64d007950503696bbb0ed6a43333c38387e3e5fb59448949fe2dd615bd072d96d25dcc62bf81f1a60775cda44 SHA512 4767c3959830e3ebb7e124654c9d48631fa8f628ee31fb14471d61eb2c2a1bf20f39874429cb8cc0ade82eb1cec77fd1e22a3221bdbe83a06bad31e13861976c
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sl.tar.gz 2507615 BLAKE2B 105f47818efa58671c2a2dedbeb0ee47131dda7a9e02ae5a5d4a35ddb02e59a8065b8542d6f175cbd4a39e11228dd0891112c4eb3445990fb6dda3631b283043 SHA512 bd15370f2283c7d53fe9cd27b6e6001b5aa7e1bd45313b7c1c7dbb2c04edf3df4e427071d9aa11442edb21da5c48090c0509a8216890dbf9e183e5344a3ebfd0
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sq.tar.gz 1075940 BLAKE2B fdef44fffae4b6e2c3bb65bbd716adb7bf2a104477c587623fcea778a0949c0748dbe3dd5cfe274a6cef0f0eef5c9a04b58150607a9bc200a4014353691c61f6 SHA512 591469f249d621e801b5574c1a546bef0b949a7c98bf4ccbb8248277ad0ba7430ba58a0dde9c9a6d4e1c415d700b0bf82cba221d1c1f107b5fe0e9baa94ee157
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2291868 BLAKE2B a56bf42376713d632f582ad5af024a5730e1daf5ad8b8f9058566f2243c49b3a22759c0c445d1a3944be6731e113dd3b4022f12693842288091d4c0573b9c2e1 SHA512 6db790b43f0f6437b581ef3d5849746480ca543b3a31982cef4fd4ff0da2beafdd38c7b7a0902b2ade89f22bf906f0ff503709eb1ea5fffb1ecf68fa2ab208cc
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sr.tar.gz 2694020 BLAKE2B c47e51278525651c138bb2c8e4c9d06f1084e914c7f50c503aa6397703998e8f5cc2ebbd4d562f40a4f1450073986ab4e8e5ace728bc65e7bd9c393addb2b024 SHA512 754d5558d437aade5041d6eac68a2447c47232153c2ef0275607359e77abef7984800862cfdfa113f76f2f968a498b617b11d4f93e8fe0da76c5b03e61a5902f
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ss.tar.gz 234217 BLAKE2B e9b758995a68147f6963506a29230d7d7b954baa02aa586ce530f5ccb7933ef41d75455a97308dc11970831396877762942068b797445003a6ab750f0f4e57ea SHA512 6fc4340a87955f9eeea0269767eb1c2503d98799b608cd2a1e0678105ee0f16f3b1aaa4c14015ba6e33b6905a239de8d87b71962e9362557337bb792256aff92
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_st.tar.gz 230001 BLAKE2B 42605df9d8b0f0e02304d0340f76826c5975d79b2b196c128597c8915990df922029414961143ee6a0b3f91ed564b0ae17fbb9f01a1905b3ee920614cdca7280 SHA512 0d49e54ada23a5b7cfc2d5225b10f7a805c89d63d1b7ac1066d579c3a1aa6ca53a7e0dfd2f7688b149e1ba6b1b163806403201bae7df26e8267d6254f37fe3dc
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sv.tar.gz 2642404 BLAKE2B 905f7e50612072bceab098ba7f996b570e73e105598720918e0aecda901b539706ae03fbf83768e70462a68a70b3ae97ca17e1898da7ad431a02934bb0a4b665 SHA512 3dd93077c2c78da75edd88e72dfc895310f34f666ed3bc05034a85943858391e00688a488b753f22a97d203bfb5c13f2394c965b895ab75dc65f0edb0be15606
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 256458 BLAKE2B 231372e06faf65749a7daf2570f1f227b3a2c33af206374dcab0b59ed22c1dfa15b7fbba758fbc0b886086c42b33f4e942df5309ba029652d67b54c685bc7300 SHA512 84b15474699e74b3316ef605c7a6d6e7069579b0455c435b882649c6a626490abffbe1a2f1601e8094a33b1e897d229037f29ab86ce12bffbff3573ddc04726d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_szl.tar.gz 581979 BLAKE2B 19f69cde3777db3c00aac36fa5fed6844b93834ae158d4285f2b025bc2fae23cb22f606d7c8bb94b257adf02a57a3a695a5fc7aeee1a359bb96f0074a4237b7c SHA512 45cdc64f11824a28a3ef4c76b9b9e059d844c86650ddf462473fdc0738b77d70e2f615c11a0019719d6bdc1c6dd8f1f69075ac1be35b83a5959fad6b3d3357c8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ta.tar.gz 611674 BLAKE2B 57064c3e40f9508dd6ab0bcbab55c0d41833c41f44c1873abae5e5116f1e926fd78095a4cc73f06a45394ab2721a2fa1a4c42bf4a0c5bae9638c955f03e45406 SHA512 1a0061837551ee5493f9561c77af875c35c9249f775d65c7ce0c2a20ec811f083901620b3fc482f25b3e8032aea4ae76567a34315c1b6970911287107a9643ae
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_te.tar.gz 971234 BLAKE2B a61a2cd0a61e63519e5e4b1479eb78dd45401fbfa30903922a4d39d47de147406523ff8fc95595d5cee33f69b85c31af2bc6c89a7f6926bf7a4911207dd2c1fd SHA512 e3e7c363198c834d00a857c77e867722b39605f78230f7ef045716f86331bc49e57b4f60fcdd39bf86fecbacf1a221bc3f14b58a60cc1052eba56cce1cd7a2c2
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_tg.tar.gz 311471 BLAKE2B 986f118fcf1a59e42b18c6b65a04e3da4ba695fff4a4bfea15dbff7acfefa0dd445f27af045f1e8b19a798abec47c25e5bdf51b9a18ea8ff97cdbfcbc0abdcd0 SHA512 79b14d620f24218e02914c83d2ef965159816e609068eaeee9b2595813bf9abde1a04ae74efb95468aa5564d900e66bdb52b6273e55597d6a35499a9dfccaa36
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_th.tar.gz 1177076 BLAKE2B b64995de1991d3b5018fc6d350ebbcafd1a783d88f7a76ae88e95c3dac415cbb0600b5214d1b099c1e29e908c4463ca642da29c3b607f53ef01e266da3d5dacc SHA512 76473542c048fd209f356fb0eeee5896defc6dd337ca932ae1f18af386f3b4ce2570087ef87576b7e51dc54056971c15ce92af69ad65b3dc68001dd602cbee3f
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_tn.tar.gz 214409 BLAKE2B 0ce7f2cd86db37cc88a38ec5b3c403767da8a3ed9837cf08f5855358a915871d5c40e9b4fbd53aeb2d694e4c21dcab705875b475b7c9fecd41c89cac4e0e8c4b SHA512 604806edbc60caedc24db387a19aa9c888bb471586f0d176c94571c2b8dd5e3d43c9318b40e5ef300bc92ea1c18230a28e0e261c3e3943482a8ba3bca61bd5a9
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_tr.tar.gz 3014442 BLAKE2B 23300c382a4b022bae1ee9ba783f1f12be5b857c84971cb8972840ef7385c91151c5ec69895699de07f6c1ca4a4887305891a7273d18a7f18a3c667e8ab8db54 SHA512 a83344ed5d8ea67ba4e8964d5320e26abc07260a3709858d3cb258d08a208dbab3085438dfd41804c82b7e71781a5b7caee828bbf89e9f2b9ba94d11cffc175b
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ts.tar.gz 227763 BLAKE2B baa8844692d12bc695eb8c1a34be77fd35e669f0fc8cc060abad10f99437c1b17850e18ff835bab32696f9c75ad66479352f07f6d270b05a2c48d84d265bb482 SHA512 1f22219704bb1674d21fdfebf1b1abae24b8b8f67b62779d71eefed92b1c21ddddda7a27ed7aa90a14eb5bc75e155aa65ef29a767d8460b4694b5862e413fb47
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_tt.tar.gz 148827 BLAKE2B 981950ed5151797420d9f0db55e89fb04c0603f39ec57c767c1e61d62f46967a97dda0fc07b33dae853c691fb0aeebfabcf9a9d189646a9b300d7c89c27750e7 SHA512 66be2378c9aca0979ecaa6b18f6516643fe40ad6e1c9c34992fc3f1a654f35bf4b7f3ae8b1ee0a6c5ad1e93ffdca6475762f2ff7a4fedfc0461ca2ba43c23c91
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ug.tar.gz 445799 BLAKE2B 49c1cccd39e168a02eb3ce108ebba9e7482137b47e206bd092ca65f69af799c298aa8ced300d0749901b5279737c7ce8a2a0213e4daeb80c25458b9d9c4f0ef7 SHA512 a5bdf7c9f6eec081a3c0be9c4cf96be3db0aab1aed97ab859149b2ff481752461c9999d7600726859f2aca91350a1b70273f50df3240964fc4ce42c074f25606
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_uk.tar.gz 2730654 BLAKE2B 83e910cc52d664f809dc720ccd54b5b814d8f71b9c6858951aac1bea7ee8ce31d4b2a124aa6edfb1eba8452c82732b98ebddfecc7ec43a6e857e5363c5eca220 SHA512 5cd51b90c80226b7f6205bd1419f586fe1002b6da83775d690f800da9d12d39e3c511fbd57201b269da4b5075e1632a75b129e50bd7325d4c9d75ff1710b15d8
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_uz.tar.gz 247892 BLAKE2B e4db854938070d71f77c11717b267f9b418c8cb98abf12cd7396af7630c36cbc907325910a719627454f4ddf867a1ab1d988c8cc0ec5e1b375d3e78d11309611 SHA512 0b754447b333eec5850f8df56bd6e6a0c7d395aada630146ab5cadd302a9689d50a986745828ee23cfb9f3d437ee8f43bee62f91158db48ab32d7c8f2c46b800
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_ve.tar.gz 231219 BLAKE2B e501256e7ead41cf1daa13a805a17918efbeeeb3aaa3583e20ac03bfe20aa1c5d4608843e5ece44383535e2defbc4a9f4da06c34cbe96a15f8956bbc3776be9d SHA512 15c2e7d027cec03c544b8053991d0542b9d31e80e7c183c8722d17cda4eb6b553efca0b180abe453d2824e917e055e62c6b7dc4f32941c8203e3c415f0636d19
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_vec.tar.gz 598639 BLAKE2B e99e97d666d925a7372619adee782f4d3230fd0c0fac96d6e3e97b1baac83cc569447dd85b6871196d5533a19fe76f53ded148574a968407c748e6e255d2adcb SHA512 5632f8c6e22effb157a5649b094b492f67962a43c6d188445222c58c275b5a92452657da14d4280c83cb47a2edb0d16afd68d7359d5f6b5522f330aef8238b91
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_vi.tar.gz 659228 BLAKE2B 36ad13a9c30011d0ec215b02752b4bc4ea8db1da4578558605b5e55dd7b374cd083a44deb70f85d8059492f33ccc98087fcf53d8bd4a34b3c1f607d86dc26724 SHA512 931fed2cb328ee0f61e2226aa717b821aa99373768b66a286daf279e2ad00c96f741ec3899d06e912252fc2ccd4fe44cbe0380adaee8dda82b14bfe1a5ad610a
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_xh.tar.gz 235072 BLAKE2B 6033ee39f27fdc9c51e76f2e838fff7174aa8d6fcd811d5b4b9cbe75b0c0e4f5cee829926f3dbf877273a68ce70359993f65852728bfd08eecc2302805fe7188 SHA512 28af9dc199338b886242b736fba07f7dbe893170f0b0ab56e66fb5c77894184a87223e3266825382e137c3330b94aa0a92fb51127d485be61021fbf87478edd4
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 929110 BLAKE2B dae1dd9c0bf6436d9bcbdaff88fabc96d9b54bf8f5f0e20b55464a2b31e4128f22702e43c1e00a62001a9c7557d688b38967d2dfeb0e437a9e5e2a45a03f3dce SHA512 d8e41d6e457ca8954e8476b6da23dbc332c84833dbfd9c90b2644cb0c9e02e1069ca174b7d580ad3d924ec8923a21424e4452b74eb5847a1d7d8db8d7e539389
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 948538 BLAKE2B 6358244a979f57d994066d7e519762f77a3145e54897cca9cc61a9b0a00afa8802db1ddb040b59fcc75cf5a76b929c033bb69837d0272bc5eebff123e18c7af5 SHA512 15c0ba3c367e570715811b30afe5590bac66097d2f9305a4d0e1551a1b06498f55f373902121ae420494b69a13998245cb6f4ff338f9d54f2d623ba91ae8194d
-DIST LibreOffice_7.6.4.1_Linux_x86-64_rpm_langpack_zu.tar.gz 258588 BLAKE2B 3fe65d84aa359035a67d70dcc8dd5a29430da70b6deb10fb4c40e9adfc8b7e182de173b1f5a5e51e94995cc9a8b00336f55fd7b3b8035db52acc868d14436bc8 SHA512 64cd74e6b6af1a50380fc1b4f29e556a22a59823ac4a0b3109585d801eddba1f414314ddc0e757f9044207366618f536c8ea982139dcfe0f588edf5a7940cd9d
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_am.tar.gz 3362409 BLAKE2B 3e0d23f294e157993d1d114034c99a68acdace52b2e812e091e7e151fc2eb4a4e3de39adfe0e7668a4e182a99f1d0d0b5e557d310c28a3b34e69fb8f87cb7fcb SHA512 6c96a2383d80befb5a25e09aea151be2bcfeaed8fd8d62b9d17264374a07b2c17aa655607e8783e61d9c4450e402d8dff302cc62b6c35c7f28fd779b2568c45c
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3058462 BLAKE2B c7da250f8ca509d5d1ce667bf548e3859f275c6604c97f4213ff03797aec250b51f984b39f124a7aa9bd3d0690a7ad09c28a43d019da0af526b414924d986b84 SHA512 469dab62845aecb068dcc7d7e891d8c1408fb0c440f393386ad20a863ab556243277e1bf9760a28861df7f3be1c40cbc8d8cd022a944f3f860b48a65d603ceea
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3229435 BLAKE2B aaabf132cb6f87e1a01c1ff59959f9091118908dea02bce369efa3f6cb9511ca539eb5f9ea5dcfcbb418c54257e743fd29c4a642defd091711ed2b22de1e75ed SHA512 03c74ddac60a7a707dc745dcc30cfe1a106ebf2cfd0f439b98a8f24ffe5c75f09fd88c2eba861517a718983aa91246d7de32f9bd7265b8db62d11497a5e935f1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz 3536975 BLAKE2B e8b3d0357dc811513f92f4d70c42e4285de475a8f13e9b55c36aae9ba0fabd30b9e9abc2a4a430b8098d6b624f5de2e1a1ed89c22a30334352478f6974a96184 SHA512 57e8740b72eacb275e4083c89d56bc12e01422a45bc36ecac63c4a5e1ac91eecaf23197d40343120d19b000e59d4bb77a7914d177f7aefc0d78933f01bdb02ba
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3514812 BLAKE2B 96f4ed471d2a8197ca2f6746f9f330ec2651fe4bbbae62b0828571abbba6c99e5164d9504cd18c315abe1cc38b7c960957f831f7273f7c703d8f6065365a8e2d SHA512 4f7be071f0e70987c16b51f3e0ecda32c3d744ac7756b254443a1165aea1d76a90a429bf80e06289acf9d09ef9763dafd6e458c30fc952d4ebfd447a8c69e211
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3328753 BLAKE2B 8e8c3ab20af5f16c0a962440c696bd5a0509edf6a1571c6762371a98e3bab5757effaff3d3760e7d1f8cae3195bbc2a623427d2f09cbc0381651d9ec7497d5b1 SHA512 0667afd6adcd8ebdba9bdf6491065c85cf11da64a338d12b213706f07ca62ae687743342598ec76b80bad8ac5128e8cf25559ed4af2dc6037b44b091e9c1a683
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3327806 BLAKE2B 8ee575767d691ffdb00be8249d8b402551dbd706e2f685883f9ec897ab3e064ab183b9ea65f959a9ecd28f0173111e68e743129b381d763df14e93b703dc2e6c SHA512 a7408855ae24108cfd9652effda8328f5bd6003e366b23c7a55607da18007fcbe37825ff11fb3b619fa75a1d282aeef02b3ac2d50a7db662eff1943d3a95be7a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3145172 BLAKE2B 4db1f35c48c09f244a3f1784a4fdc933ecf00b821151cf8274868fb33f342537e9e8046fd1ff60cb7e49883a8e62bcfdeba8acc5aafe43c6fa3373c993b1de4c SHA512 735b4b54b4a9f41e198a801acd08780272d2cc11c265dc81785b0abf068377c4fdf0a2efdda9db23aeb404f543357714f5510618e56df5d80109b1e22fa19673
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3250515 BLAKE2B 52b8c455032055b168671c21f1ef0d9a5fd2fa25e66fe50dd82bc7e2dfbb84aac9b92f8b4e3bc98080b65e70cbde8670a1f1b7b464b62c7cd073720bfbeaf035 SHA512 f1c76e658965003950ea7469494cddc6e352f1a50d7756d48a155d53cbc81a3682b8c0d0687b855397c1e896368f966daba64577f227125c5aafc4a829da29fa
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3251745 BLAKE2B 5d538b408d07b7d3f3c9d18118e887d7c7af2db85c650326beab81d2aed0b50b58007af1d9a54e1ebc664a79aaa392e7db436792ed52f14cc2610b1affee6136 SHA512 ed32d1f282b8829102539818465a69db3b4c53a03a8937beedffa051e13e2863494fe3caf88911addf7940c02befa3a1d51c7460c7991c7b5ecb669f5a65bfd0
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3207932 BLAKE2B bd50158daa01a04eeb9a277a548642995fb2b0f81718e189f736476d1068f28f0694f2707e4c72d5d6e9256fa9281f1587d273d59a2550a19197a537557fd13e SHA512 a5aa7e1e369633322e3485dee6c5e84d397316f340069218d584d143bdb2db41859a80b51a262302b6b692c22f602ca392a277bab00c46ab18d16ed92a4abd71
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_da.tar.gz 3219608 BLAKE2B ff2497ca744de04979b2490ecf65ca1d28f51861a4e2e7e6066f5d79e73ee0d6b008bbba11e5bb458b1ba7345eb6be2725a1474e556fb3a52685cfe91faa411e SHA512 069d75b4201f30279f4d17eb4921c8b896aadb39fcace48b3e34532a9c66890544056226778f753df91a2856f4c98f176ad1a4df00901310c2e4ce4ee9d62c25
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_de.tar.gz 3300451 BLAKE2B 74f58abd066d1935d075da56a340cee97f193c23a2c840a5b190b1c43df1c7b16ce36ca7fd79131e80c6ff2d420c5eff2c7f36124306639b47e42547d3c27cfa SHA512 64b01ac9ae9d70eed348aad7e736b0ea01bcd8a3878dab224a5c613a628d0cfadc03439fc187bf2b3ceb919b7d4c9f6289f6fff1c001d384ee07b4cadc0850fc
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz 3454581 BLAKE2B c57363deddc97ef7149042c53e0ff855596da2ece94b566ed8c4dc671f46f0a19c2c840a83fa67d1555e422e380f38ae085ae3a939347fe793cffe306040ac23 SHA512 91205da6b9a1566e035b2ebd79b3d2ef7e71487cc7142094611ec9631c4cdd22efe44eb21af25893acf8e49e0352a3ff49ed983c935b2f3450883bf063d8dc68
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_el.tar.gz 3835844 BLAKE2B d7d606bb7c163477820a78a0ea513c58f44e74f3061c3cea3773a1ce97ed926403ad6175422cdae2273479c2bd5acfa756ec471e2892b589f797fc0c29f06a3f SHA512 b1577685f601300c8e66f9f5104a3e8c2a4a18c71ff1a6f551d11e23c0671f65759c846ef00f5db49669b437109af5b0d4d997cc950927277f93304f05d15eef
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3064401 BLAKE2B a46d7d8e1e98f58625e7506834862f5441bed33c70c9dff56140292bd7ecbf9c400d6db67f7a10705f96547b753d37e69ccb50dac5480a8a24e16166a7958f93 SHA512 79fe3807bf71e03cbecda6c3860a11090aa0f6d3aa98aff433901412f3a98fefdd718ef388f435212ba9cebb9f2dbd6e678cb022fec8a539f0fa2d7fb6c46258
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2478178 BLAKE2B ce81456fb1ea7963fc505050a8885d59bfc06906d9bc8153a76dd1d895119fa6b49779f7e4dd1843281800ce70957a5e37c532c9e2271ac353104235b61f3f02 SHA512 a257ac23505ab41b1628a298f96e157b271c1584c34165fbc2df4c6378a86149c9e9634e0f73147ef2358a51b5ef73d21f529c33c2b8ac6f05de3c84d258e9f8
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3062618 BLAKE2B 169357380cc6b9ea0c47e2a1b396a50ba7a0ac9981e23d2b45a27d8a8d0795e614e37bd7a7984937557b8bf3c4e86aee2284927223202bf6158c460c4fbebc81 SHA512 d096cd7e7779eaab5658494f0cf909b08e9935c6b21ce2c6fe2e17ded5a13e7a7559021027abf86b8443b06b1dbe909579ff0a81df4212efe34885320c2b0df7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3148655 BLAKE2B 1d90b7962c621eb172cf0fa030d09ce8d46aaae6caed57cb22e5d42498a944cd9dabc60d2be595bb944ace43249c569dae0d26867a8910fd0d4c543e75fddec6 SHA512 76f90f9538ad4c6f9012440d772e7c6589ee0d488a4a2cfafbc7e4803d53412f74964b60e108efbab98662d707444dbb8cada2f1227082c9a48117b67e9d8763
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_es.tar.gz 3296894 BLAKE2B afe5f4f5d488c41c03fec1dc750f5c9a8d6d7e824b5b5ed8cb0fe683c0cb8ecbe7bcca33481dda5fdf82a09458d2e45b365a23ad278008b4f94be79a844c4f73 SHA512 c21b0ad818049b707bbf55f88d65473b83d67da7de8f763b529775a8a4d491630808ece1b5ecd96d41268e68571a332ebfbc85b2ef8d342f493736776c999bd9
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_et.tar.gz 3174025 BLAKE2B 27370ba3940eb2464ca543a2fa807a6d2719a21d28851fe4edda7101d1457c9fe07c5eeaaccd352a9235d4425c59c0bb48c0dd7f5ad0ab89d1132c47d61cf0ec SHA512 a3e27701f63f4c9dd3bcf173646bb2de6010ed7066db4932013dd8073ae4f257e5c22111e3d2a409c45c3c06c64d252cad419b136c5e58b90ab6f38d0e249cd7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3189916 BLAKE2B d050a8b2e406ae6b5bfb727fa37631c2c52f4fa4814c1e8144aa603039b30f7d8829579b67c518060f9ff5855b7bdab194971dadd7642a8fcfbbd38ffda6cd16 SHA512 5ffac1365cffc62685d76e652dfb671033bd6dc7ef4948af55b75c0abaa390b328c11d6b5fbba141c88d557683d59da3d71d84c373deb2d05983e278c51dcff6
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3199087 BLAKE2B e235a65c0def0e455d9f31597dffd517164277bff24d9669eefa44f47f7337a108a26a18f1d6ba25d77d5eeb8019dff183f2ec3cb3a03a2497cd66da42e1e7a5 SHA512 218a2aed371e37810f5a00bde5ccccf1a7e99cf1b03c211bf32f704020124f09cceb7b7f9124b1f91739b3e7155ce27cea649b341ae21f1adc2cd1d2744b871b
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3269672 BLAKE2B 023826978e374e7449a7c5ebd6ce06ea0fd06aac75e02afe49132fdcfac939fdd8612d88a297d2a03b2148eb55105406138804d29aca1f38f3612d79c4e092c4 SHA512 305ac1712c6cbe9761ccfd5ec78ec8f4be6963b54e95473f377586570ddc829d25f90d41f863d20b0342101ad4eb5987d910ff44fdf062f1d35f1f324f459590
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3217849 BLAKE2B 2ee6f8943a311350de589baa2799ff97ee14c49e90b973758ec3a89fc12ddefc4862c2d34ad1015e27029297cdb23bf158b8a8609d5af4d4aa4228b164f87c85 SHA512 5dd226297a8be59c907a6108166d99371dfebe42d19b7d25884df7dbefd7b867ee4990f41b967a8489e41929a63904e8f03396dde7f2835b1737eb0073443e81
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3153857 BLAKE2B ed9a806b2676b97c3594bef757be4c7fa6c6f3ed31094fcb99f11ce7a30cddd47ee2db97c52d5380a0589ea69723431d6e70d867ae8869bfd2ef4bced8de74f7 SHA512 26a7743c4d04634495a180e14e57a285da70cfa60c22167439e035b20c38d68223beb9c64d2dd06e77bb91842d8dbb32eab639d1d770393279a7f1cb2be64764
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_he.tar.gz 2985794 BLAKE2B f8816f0a73a9db221737bdb9d8d57288b6d275c818acb1a8a1e869e04a5a9438106837a299424d667f9b980f9d7c8f30576866084655bf654edbb6a80cf9032c SHA512 6af9461a23f9690b48bc77b78e9735856312ccaf590a8e3d52008ee7f7ae2fd4b42ed005b41bbf1478edeb3152f92fe1ec7d55b930c6f6a146bdbc147af82089
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3177688 BLAKE2B 16009e5b345399c72c795c7f4c4fc897f8aa55c31d7fbd5bebc4550252a9984f07b6e1e34d8e9262dd52d0ae73292568ba194e1e85115955980c8e9e9f063567 SHA512 5a7aa7d23e6297fb717b6e2effc33caf50547579050f1a3a3049e4d2b905552cc909b06eaded8060232d0f49c919bea8e2ac4db919926d16bee2635fdb3d3c22
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3141738 BLAKE2B 569b4edeae49d751604cb32a18dd0945de72592d418d6b15cde1406a9c3ae937a1bfe5010f2384bff8c402175ec1da96827233a78df88c83ad2459b6dc1da60b SHA512 3dd09bd00892ef331d387da0e4991e09594c3c2d47e1193f7af5b2179901ee524e4c59b0eb982d354492d8b3266324d6f96975159e7c0a9e3aa820384d4af36e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz 3353945 BLAKE2B 12669dc6d01fe1b71acc10625ee703e03b03482f42754eec0992756bf577aac356c656553f30130d903976dcdf55fa05ede2010150bb54b32196b7fbbc2de769 SHA512 9aa89ef407c3ecaa177a8a888ffcf2ed590d7c8d589ca06445073bf89572b2d4ddb88472dc5822695ae139f2d2e2bf41d1d33eaaa4806a751e59061989f5ed43
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_id.tar.gz 3155871 BLAKE2B a215159d36f6919d73b0aa0b0a272a2c5e50a78f24e40b9e2b26b8cad341019175718e6fc30b81c75d36f7523898443afcef4e85bc88529358fbbcb0e4f72f18 SHA512 fc0939f99f42249f32ea6e4b33815f7485f3e9e5fc8260d47df51258fc0845f6b5d27c3d74caa0831a9f9808742f83448d220d6084d0cf1bd5b60e89414fa07b
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_is.tar.gz 3146043 BLAKE2B 0b4ac6754fe45eecfd150ed43af511294de1e51591597ab5f6a338c25006ae0c4cbf32d48ac46d98ac9d19c69073dcf995ec7f2986c5ace9479d804a8d0d116d SHA512 44508f65c48dd3023692a4a43a5920d8590c9a8e4a76e8e5b3fcc1a09ae6f77a9c66778df742309e15ecdbcb48ba8920d6015bac8e535d92f375a932faa349bd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_it.tar.gz 3227166 BLAKE2B ea324728c25acb811396ecb73f8695dd505bf4c536af97958bc770572be9c9c2e8d209b40433f93ca85b212b1e1d29f7014e98aaf0c090eb4668eeea733e778a SHA512 c7f20d1506970144156157a76530a4eeeec6f1ba0b3ffef46e62becf7ec52c8e78f9cbd86c00e94fe58ae7f3a224c1eefff7786b74bbf7743194c251c3e402bd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz 3577829 BLAKE2B 0590c66c597fb6c5665133b0dfe6fdcd8d7a358926d6a43eb62ff7e42017f23e34c1602bc35c41b088cb7ce273b326500d81272ae93e62360473c8ebc9e845d0 SHA512 0bd90714e3fd0cb6bc566604a445cee4457e14a3a081e5657bcc29bf4ffb4ccb9201e89a9f896f3ba85e32631aafaac698fcef893b19f3746e2c6ac4e690bced
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3231983 BLAKE2B 0d736da1701c3f391d3168a0e76546fa983ef6cd2386fb3d7582a0142525b2149815760ce439bff41b2ff41af730ba4a1d3701b300458056bfcdd4e94d16e75a SHA512 f4671c9552f58cbe129217d6263c908ad4405fe1c8dd6f4aa13a22905119b39c071f226a87dcfad99d1a180eed4614e5808e3acfa7d34831145793cf218806c4
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3212876 BLAKE2B 6ccaa253b2f7485fb380a2ee8d2be168e93fa7aaf473053be2e45da8695ecfa998ca18bf903ac4357029cafe1a1d342e4299fe8317ede8404b42116435c27427 SHA512 aa7a5fe9ef31df71e79cda1f0116c903a3835c4f57de0ec72e07411a1877c301ce3321eedec60675d9e05aff5f9029ec619092006a45514053bf50ee1f524b06
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_lo.tar.gz 3097593 BLAKE2B e7dc0d79ac4b5395c61be2710edd5ad74bd7775e650ac504ae296e48bcf6b0a6f41fe0ef38419030447a8391f111b34b9904b24471c4a7af98e5cad0b48a228e SHA512 a40325ed931e0883c226224120fcc2ac3aa404a26d40fbd98ab4f9f4fa56dc242c47c2d0a7b33c22a1df95c2a27b5aa6782ddabad751cd1e07821c4e542e5a8e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_lt.tar.gz 3259711 BLAKE2B d9acc997e019c95858bf0a027c1502e50306bbf302b2b5e097e3368f8ae784131e5b83b06c613d6a167e023735e81188866f08209a30e03756410e8974aaad78 SHA512 72f7d69eacf7e2022a2945f1ff0783573e42fb3287c9cc1226ca06fad02e7762a751a848553e3c441d603d71dcd91d81b10f0b07f72a57c01d2b450152152ce8
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_lv.tar.gz 3138708 BLAKE2B 29439efed5862e4a1d22b2be4606bc693cdb05faa48e93d6124a8ea9cc64b37596c01c37de4921a0060b94300af7232295a2869544dae5de70d63ec8017b5346 SHA512 534f417cf3b3e24f100382105f5d09b4e6f55bea93bd35b7e8ffab0a1443d591d893919fb6b09f3342b4ca9d3095b56e59feffdc0bf1b64c73748841029f5507
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3160129 BLAKE2B 7670492598627183913ce4b172c2481e385990aa8a9dcb9fd1651d60ea4a651ba92d8524892151aa984fd8fafa0688a50ee95e5668230e0b4dfb7c3c78c24fdf SHA512 296fb4dfc09cc19564a52611bcc348c1ad66c13bf0d4a39ae929f40f0347bdd7b062b2132999fc4a120e005956694c7556560563f355c37d4cd1189cf8592701
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3162822 BLAKE2B e55538d1d48c68a87c3ce973ae622ca35fa5a8dac7e1fd711ba909143bf0b9ddb60fe8a5cf4d7130d395a81a27aefceb4ab922a5a8df620297a6a9c57072467a SHA512 e657f8952e1ae1f5241f715bbd5349dab8b74612b4fb87ce2e96af39602674a6d1be2286171b9606d16d9a26c6de4aebc731a1a433b082d2564e68531e7fddf2
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz 3381558 BLAKE2B e256fbf89e4706479695ad8513965bee54f33d505dc8340d1d085120cc42500b99b57c20051813de4c925dd0042db17f8cb8a8dd7deb066afa607d3ec934af14 SHA512 f08c7f366c09eaffd09a32a549f9bdefc6c35d59b6dc208188d682ed76efc0802f9e603baad3472564495d9b7f7fc19e5cd47b39318b329ceb7abaaa13f0d20a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3255348 BLAKE2B 0c44536dc80940c6bb3ab49522a63c261ab3cef7abc74eda2b122138857ce06ac97a8960bb51e5f1264bf6a1b5f9805391a20b9caefa26ab87a55f60b9fc2310 SHA512 0152778cdcc9115653d898a969b492753dff0106ed79cb8d5837db9b43968819c1e499d5ec07794e302b50f2481990e24f348f7de24f00c8a78c373283210a90
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3168949 BLAKE2B 31e2e49dcfb37ec34851a9eaf6776e7e8091c708e52caf0b08cb75d9c208bceebb66625226456fa84d483b90c9b12ae55a8097c4ca572053bf9b8f45fce7c202 SHA512 45515933cf2e171bb2191834a5707873665c6a6a4d3d164d63627a693660f0d257b5ddea37af80ec11e4e6b86dceb4421e707502859a99ccdfd64b30d9a24cb6
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_om.tar.gz 3194167 BLAKE2B 612ee656da42fd83033aa27a96b6372839571b45f3000f810b81cb78b793af103dfaa46a9a3806329cf9c227c58dcba3a81b37c53e0e29ec53ed8d6a76455fc9 SHA512 7ae706df992d0e566f49e764e8b118845169e2c3645fc6a0669d470a91b0d2c71f40ae0d64fb48448f3efe4c20566849fc18d5be2774edbd08d45ed50b64dd88
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz 3304458 BLAKE2B 9c4a2af8f9d870a8abb5af1c4ab1ee9d81758fc4ddea38b6fd8d972460f92eaa269fa53a7d08b4f56abc49002bc8d78020ec74eb27e043c240aa7d58c26b95c9 SHA512 13863651eb27251d5af08f697fa391e1c43374acf5da26e67cd1710916b694e6c13ad585cde80881fb20938d93272cbeada510f982ade9a61fade13e67838b0f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3208334 BLAKE2B eeaf7bd263174586a1ec9d38b469482329dd114a26da31190e5de04273495c7db29f5a8282d3801b29b2ea7111b8855aa8beb9dad6d576c13261ebe142fe583a SHA512 67a59fedf30dfbb247cc75208c67d4f02c4b3c1d388aad1dd76878943cddb046c186584e502956058ab19f58608b217bf34271f03dd1fa64cc033230aad5629e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3212505 BLAKE2B 086e548494d751788fa674974aaaf329093cd9bd1ac4ae9e9dec7f1ba52936589776c5fbddd50b671dabff7bf5d629037f12505c713eaeb27c9d880ecbe34788 SHA512 fb2c6bdf754dd90ad8f94c532429d29303e69edec9c1e155b8d6656dae62672beacec4ec812c24f76e338c26a17df4260f9b5b5a1ccb5cbcb6ff5f831d4b455a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ro.tar.gz 3087582 BLAKE2B f9c83b58c3f6a1c9e9a6664800a6d6949769ea7f31096a3b4010bc71d959cbab17f3524989b4747a71ecb580c42d191fd7d485f8354561b0c9b3aa96ea493c0a SHA512 5d743e34add8b57e4dc2852f420b7162f43d20ad59c7f6183dfb14c9e794fda0bb0a6f6cf151bd1f2729c67a67f3b24189465eecd14b9a87ed59111d39e5fa58
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz 3459021 BLAKE2B 1da74caeee0ea8bebcd6c7e213750ca8274c30097258c2f1a75d612d519614ba49485b66a97c5e091e90825487aa970d0106a0ac8d089c3bf66f730a43280dbd SHA512 1a4bcec0c2ff343556355b25a61a2b84e6af49cf340f4e21c25f19c31d5fbc1e12797abe2d3a736c50d29097cf1bbb1db89684bd12421ff7e51765b08fba7591
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_si.tar.gz 3236803 BLAKE2B 21173692a54bb0375fedada97b965fb317e425239839fdf76a2951532a5310c11762f8996d1ebd70fc14797e9bc56516273c077a09a2509032ff30ea25a0cc45 SHA512 007b5578acdce008e494a4dde8d6f45739b734e19a20d990103366dd452ab05048093f72d0910ead3b7825e3591da1198cf28ea2311cdff9636d9b7bd90eff0e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_sid.tar.gz 3180312 BLAKE2B 348127d62962ba80532c1b7b2a0b418f13d1b9a1fe108d37ace494b3b3f679b391c0253dd387784e5b5e27ce6bd703041d439a39a10cee3f887ce6fb33a55cc1 SHA512 177c2f8a07bc4e80c74872b47af00f9b8b762e3e78c5fc41a3cbbd955d2c3ecc7d781044c28b09af13655f148c4402e8215b035a7b8c9318f4d4428a4c73f9f7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3238572 BLAKE2B 2d0dc465cb9ce5802a2cb1e31fc4b0be76c522bc1879378a657145449b012abb2937761b9907143296b6e6ed88841fe78fc008abfa58122d717b32ed14995711 SHA512 3a8d2a17fbf9e49d635dbdb8c19f5a468ea04bfbb2bcf87359e3169977fdaa8f3cbf05c9d267a53cf7eb530807988d7865c68ef182f13e62b4a73b04ba62758f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3184822 BLAKE2B 65364580157d6a7797b54281ab4636fe269bb6fc8d80461bba4699098fb839682c27905106288592b892b6d9a2b312e824dcb5799d0a4766440328e201594d58 SHA512 9e09b0f5b7e7d1d2c2c5b94701e58baca8c4d3a1c11914ac287aadf8ee55e4c2d65d828c9c1b008b2bf836776e4ca4f4fd4e666aa382e8d3a139695292655d3e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3105270 BLAKE2B 7eecd912427ca8d000fd01dc42d285ee508bf7896a9c2cb7c3218e22886d6a7564cb7247c9beab98898d6804b3d2fa9c21be22413136e730200c2e7d8b12ac6d SHA512 49939913f382b1155027af048a3ce030ed1519663a71804d4afa6cc05432a60c7572fca80289b1b1737b8a47cafb86eeb593f53262b6bbdd5e6d18e4e8e9cd3a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3185107 BLAKE2B dab01a005a23b426eca1f107dd1c1255a10489974b16795a5f5c162873d2c40324db258a7afc3de254fe3df641fd252f1f9a4089659b8b441dbb1597a7e907b3 SHA512 f610fa8199971d1f9fe1572063672d786f2937b14a631c29e4781aa8ba538424c0f1e99da32ca3f5b4fb1458406129a4d457b04bac0ac5c15d84a5d91e8264e1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ta.tar.gz 3431381 BLAKE2B b041e106f838af666e724cf7718f23073b9cdae9760ca8ecb023c60914d664e808033a3c26ebe80d5047f34163c875935d0a4fe6e76b5597c924928e8b6ca0b8 SHA512 12ff878df8857b5c3c24b67d4a1041e4af26d6002b82b4c58ddbb4124a4cc791dee6f783803f571cfa7a8bd897ccfcb1b745f8b798a678cd9ca2dc2a0abe95f1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3123137 BLAKE2B bed251231e241e60576692261abf9197aaf02bf7d7959ac1562abec901aab27a59580b0e1f50c0590f9d77a85365df18a273ffccc4ea366251bd61da9bf80d0c SHA512 3434200a6ae8338465106d6b99790d5d1271606c38feb0a732a7cea5f0c0103b3e51b3f50d91b9858cca13fed576844b7d9bf89a58f46629cfba8196282e45fa
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3244181 BLAKE2B e3b8eafdcb77d82484f098780d5d0eef976bce461b2792455eac1f8c26b34bdcfb553c2040e5492c5d2b2aee09b1720f4da6f14c34685f803efe6f850f128f8c SHA512 49246d2f85140efd60beafb3ee97013b4f7f7c88031202b1e81c4a4ad8d6ac5ec7d7ceb1bca992a72d15d62e9b492912e3a12e742cf2cf0241e8ee0988f3eb92
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3144320 BLAKE2B 34ded94897e7b31a917db3e538bbccaec445c0e896f99183fa72124827e91564bacf4fff66ade985d0f9a79f1f507769daea91e2caa48d086d427312382ca39f SHA512 ed9c72d842eeae5b9ee254aaa8c816b7e168a139481b5e5f46d71bfdd733b2dac5824d6e4a93576a462ad5c8f1f4e93f1949961c6491bd910b8e8395117fd775
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz 3445953 BLAKE2B 2fd53de09c15ba67df908f513508ff379a0f38ddad664cc16ac827428856b9250710bd724e531efdeeae953e49f7ee0f0f30a56f24fbf7d11c79620a8088303e SHA512 a3e5b98fa8762278a22b8a6ea22bf6b78274b771427b4f66eac42c380113c70cf8b973aeda8a7764673a6b1baa2482c2a0090c1e32aff376865a6e17907749c2
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3173874 BLAKE2B 976fb9337060210a2f0680031316fbd77938e9eec109404f79cd79d1b9b13cf61e058ec7fde1623b282e97f6cdd83813a416bdb7467ab92766aa7455756cc87c SHA512 c4c4069bbaa1af3824158fbada66c1ca539313ebbd7c59b91fc3c651501302f8974b7a4f2c45018699414d41e87f7303f99854fcf15fc1af4e1fb3e7d1d50de9
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3279687 BLAKE2B 78f3881f0edc28deba76879393ba17a9c2237d578ab24c733fb4ae0d99833498993995b5c88c35e7e8095cff48aa280a96da74147f259b0a63184d1ff693e290 SHA512 49e8e34204bbd4df0a2ca940f2eba69ad128b6980242b48d79001c7a0bda76cf58c50dae6ca349baddfb391a27d24dc4999acf0f32864f709f472d9491c185cb
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3315885 BLAKE2B 8cc40c0098cf97cb51a46032c2dff52c352621cab37fd2fdad4d0a9b14acc46552371811518a8045aa9370ea1e6c229b6d8e5dc91250fa6aa4d6c3998da687d5 SHA512 a88c6126e5fe845357d4adfd0d8c676fd6068cebcb6d7d4619d5c4147829ce06d42dc15cc51d2f7008c1351d081d74c7af913075a6f3b48103ae918068678926
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_af.tar.gz 1333286 BLAKE2B bf9e848502d827338f4d4fccee0ded0b3160bcfaf7b89d5bd6f318b4c7679585cd0b69c2d55b0c8f906e64d236c9048f2edd79314e107b1ae749ee20c4e44772 SHA512 ab4f8482856fb8ba32283378cdcd9a4625a1219c0d9bf894f20985519ea650be528faaad2d5d2444c759aecbfdb3687ffd5a54062a467b1a9743c99be9177c00
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_am.tar.gz 788747 BLAKE2B bf63dc098b6e6b9c788ecc0494914fb2a1369135278800d5515faaa3706879e5b0d51405bfca0715404e519208b66660e9491b0218054a95da59e8f0548814e0 SHA512 f3c8dfb3b77bc336c8ec88ce61bd8c0d703a598dc33e33ecd65961aa102ff13772077d65aec6b6df433277a3c980573c6d4fb9640240f2365444c2a6db29085f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2305275 BLAKE2B c9a8e75fad6ae387b72023c7ac59679d0201dbb2de3ff684a155a0e62d3ca20a35501db1a5b5c0df5512d4356ec064cdac1d126580fdfceb04c29e6b65e94d73 SHA512 8cbfd09b360aafae1f180055103e384a3934fcfeec98e4bfb510fd64519cf5db536ff78450690270370a65fe175d3fba2d6d48b06c285cddbf1591f4532fdc88
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_as.tar.gz 426356 BLAKE2B e6961220d51b1e2754c5008ed4b42959911eae60e730d448409b2bcf1a09af17c3a978966d0592f236f5e2f87aaab6d5fc81a232d18bc59e53720a8793bfadad SHA512 07a36b1cb94873e04e3a4db38cd0e7d45936889dab76bd5ba185f3ca095f70b62775b47a52a44e50a88cfd47b624e846bec5e2fcd53df2db51dcf8dd89520e88
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz 537366 BLAKE2B be29b49c88da1ddb593f5c443558322c2a6948d301cb3b74963397c941fc44f120a98af83c8b1ac5deeb63472dde7eb15fa370d9d9986f848deb8ec140111b63 SHA512 293728f758fe13542dd1e5262f8eb1fc1712b858d9e78a32a1e97c1d01011366997a09f448ac792f0bf822eec5594e14e6c1ee1c00a861ba975f48adcb00f1cc
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_be.tar.gz 2179569 BLAKE2B 02b111bb6308fc79e76e8fc46d62ec6d97a09c08755c90bae22b6e68e8404f2f698d3c52b7389f0e827d2fa843cceca1c663fd798d527ea90d37f192ac263bfb SHA512 d278df22609b53b30e274b2ad0bfd5b8e95863da9c31ebda6a44037ba58222d6adefb2848fad067247671208bcd24ba65f00b6aece28db75ce629e5c475bd8be
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2631991 BLAKE2B d569e45c50bc2ee76dcee0850d43f81ae8aee7babef3c314e0dcc3b07f50e79954e044ca2741fdddf483f10dc239f558541ad5031ff1a47728e0e3ba49574074 SHA512 de9a21e180ecab89c746b35833799e2128f433acec3cdd29ef11722982f356f802f0f656ddc407b48b19334b8a9c5d3f34c0320e909d819108f6ec535d9f04d1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 588686 BLAKE2B 7ea4a0409ce32a364926dcc15ce782ad806ef18b5e005e615ffcce3c185c0fa4ac1eec489cf2ff894c6da6a0957e0b9a00a843f0dd2e8f88ec6e3a983a29341f SHA512 689c00dd92b89be28dbe23f377c5d46454b9b471e637936e11eea17ae5f486b315b8e2c7c44762615aa4772f645fa0ad0d5fcc8c5f797efc27b831506bdd5b14
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz 748826 BLAKE2B e6a5228c2f5cc43c48ad630de2edc7f03283da26d92ecd1590d62bba5b401d6b7ce1d40638f36535a7ab0746f21690914f33ea363464d851fb816fb6de68de8d SHA512 fb2fcd359a2938307ead35dca8b0dcc1eeaa119816ae0faab4baee9a42fb08220d975a1a0ddd7da7674e581195ce4ec2365efb1fd515b9ed8daf501e47ed06aa
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz 378881 BLAKE2B a12441963d927a2b80965887b2da1809cad53f2ac2b3acac1b62e80af1c22d1248f343f379b63dd3ef85a53393279b3bacd8e1962c9dc5823ae7a6687c7b64b5 SHA512 57020dd6fc9ca3889f2e1cb3377603efcc7304a3459484bdc4b8897afee3a481ddbc0355c56b980b53b4f83fe90277e16a4a1f49cf8e9970ad6e3b5dcd4e5be6
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_br.tar.gz 1334890 BLAKE2B 9dad8aec8c504ec535bd90485b7b2af07febbed34868621f36f021e60e37cefb3267c7655ff5b630eacc9243a67818b387e09393ceca234d28a4e008196427b7 SHA512 f103c34f0f5bc02bb76194488a1971dbd84eacd2e3a2eb1638482a4be4f368a26a3071e3e2129ec28e0b5333268043a17129c3c5c72754c577099b3c22270f53
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz 278143 BLAKE2B 67efbaf1d6d9d641145336d4e131636172a398ddb96bac945545a15448fc4290c77195b542471d660c6cc412f142f661b0e4eba7727f0c1ef5f8fb006664f5b4 SHA512 6d302c0157e8626b8f6db01d971a919d9920ff603b09a2c6174287520356b51cf5f4a0488b590c3150dcbc5cd97912391fd2127fd44501ee08124418b22b4e0d
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz 551009 BLAKE2B 76b6886bb025a3d99ccd8d3a15ae1ae3ea6b2efd98a0cbe1705793af9760a9b0d26610259420d89232504c2db225ca4008c6952a3a0849abfc6e0981bef70aed SHA512 5cadedb6d401f0ef99f5f51210787c642e741df6da6d8758fc35698d91941e23cf85e88ebb6a0ce3add624f231243a256041de35ec1d21118fb3fb2458f2eb96
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 4536344 BLAKE2B 5b6186c6a3e753d139010cc3e705163b3dd1e1fe6e593afca3727e7acd06c6b1a371c4046969046644d7856cb4c82b42469058d3b5f013f23de3e410b1c1ec5a SHA512 5094145be16d497d13d49b50dd44580d74924fc786342ac6724197ea3302a353cb61bbffb13b78ad2a451bfdeb7935c4675b675ac2d8e348d8d160686f28e383
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz 4546427 BLAKE2B 2096154c497c728df0de5bde597748377b2968d05a5b2d2bbc31cc7c853d9836bb7f2731fff3d909188349606c43f5b911a0b54ec721090eeaf21b8f19a8f381 SHA512 899e0f7d206077b8fe08d4a6859606d43015bab0adf925cade6f1bfae171611557eb33259031769e280fdce92597e3fd29022d1948fa15d2ae08eff3b2202006
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ckb.tar.gz 411038 BLAKE2B a4b3077a79351096168b99c4df33515caad33412be06d5058ec4ef51925b4e87dd6b62ffde70c92951e7f1076a8e94efaf541b35277095a3486ce6bb973d9c65 SHA512 e2e705d2a447b750c5994a15a06bfb24fb070505271c5bb6b3682ebda778c56be5d430a0e0ddeae821ac9fcbc60614f97e48efa70dd8e69b248111897f63e1d7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3352961 BLAKE2B 5a885519c691fdcd6368f31638b0e457dd5835d58997175dde11643bfd44042e9fdf48e0562b71ce5bd57e448c133ff43a8c68933f6cc914a1292096bcf6beb5 SHA512 c22c14d10b52f438918c07012e91f80c7b13736e770b4e0be587b054493da1b4e52b8c57338cde7f03d59356d1f884682fd527357edf91fedca100e5389ffc3f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz 889440 BLAKE2B 0c4cc1554b7a73edcc888bc1f612a9b1aabd93bc278c50b78a1bbce72b8c24c21821a4abe9e2cf79e4b547aea1a5d9afd8d9274fda42d59a7c599e0e75e828ec SHA512 970964cfce4319a0705f2b8df8efebbb99e8f2b95469bc8a9f6ff66cf27415197393088c567da9f7b48a3baf428c15536b43dc365aa4992e76fc81fd875e97c0
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_da.tar.gz 2863963 BLAKE2B bdaaf268d741e45caa1c8cfcb08536cd300313aa5b1f644e88a426d59967d28b95d6b9722e251b22dc9954865b71ac83cb60755e3af17b7a666de7a3b8aa4b5d SHA512 e646bb94de2d2c0000d289d192bb80f0ece16da7ab30a4f8bbdce8242fbdb58616d2b44eeb6d682f3fbf97a86ad847bccb47931469736f5a64646241c8d6bd56
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_de.tar.gz 17377997 BLAKE2B 17448b3b49c3ae3f78728916cdbdbac2cc2dcfa16d29698863ff15b5b180706113d6922f3e8cbce96244eda647815fd9688027820e4fe8931363a3d56b3fc42c SHA512 941c64f76f82db436af4e30f2035403c383f9148c791badf11348c3c5873913e709bc0f7434418f8b1d8200622d2f5067c50969dd09906f568aba1dd4f289d5b
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 352050 BLAKE2B f86f4d5b362aa397ef3662e6d52457053b2ffc0ef9ca97ac671b2de51cb0c8c0535d49da235ea1a041739482082da3626281c3c3d0694b830b9e8d871a8e2022 SHA512 0a382988792dfe3c54e06cb7b2e494bf21344485544b32cffd72253ab72beadb8c6a217ead9ba36d6b270567cb8db99555532e7eedde250529db5346958062b9
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_dsb.tar.gz 906331 BLAKE2B 23724b5f9649a1d2811a77d4dc44363ee8de520d3563b9eb715a04d7386246a458a749b788658eb0751ee00968ab7bb9858480e9741f2b1fab3e389d089f64a0 SHA512 e2a54cbdb9cbefe31ff22b5927af9f937ba3f15e556baebcc3b7101836fc21a2b139fc7ecb8d218ef37750120d26b71735a9eb085762f7e89c9b006e352e4aad
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz 400999 BLAKE2B b427f517fe7818a1b7a820239ebac037ba6afe9dc2f451a63420ce7fcdd0f2983629e05361c5c488dde8537f8ac70b4a246e354b62cfd816a1de824fcdd852cc SHA512 74689dcf98697519f4a17b296acf19c215b1dfbb9d619d569837afe9912683511aac2aec76a546a374d2249b0245c552e19e5ba08e869fbfd92cecf97e5e7b1e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_el.tar.gz 2908148 BLAKE2B b3b9f7491d4849770aa1d67035b6acff97fb81976f82bd8a04021b810f55945f49e18ce419cd525c2c43bfa6b8bd8f44dd8ec5d3950445022b4c695b00e8dfd3 SHA512 d880c5b7c5992aebd6f45f0e9fd335b27adeb111a02c94f786672e3b38351835e4c96eb45b88cfefd2457f1dde1873bad7cce82a259c9b3c75a286ec0f895fe9
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 6490753 BLAKE2B 927810d8e62f4487735dfec650e7b81ded0e54b43259538542a995ff8ffdf4a3c31ede861b44be581dcd73dbd36ab5d4616572e80c2514c4312e94f9d63bdd79 SHA512 1acc84f1840fabd48bbb540ba522ee8302f1c7324daf625fbe8952d36aa2013af4237be6c21e2cb7d797bad632ca93211b192d9683c3a4c07a39691ef4b96963
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6019381 BLAKE2B 5a8b6b3ca714aa1d609b8e716d1bd1684fa38019efbd602100f1ae5fe7dad96ed8d01c0217b85bfdce37be1340c4af038280b9e60b87dcbbbcb1bdff2fe2cc59 SHA512 de0e65b72fa0292fc4bfca0d009b59ab9e0701e0dd23c35c83023ee9633ee85fe6074076373940bf3ab4d54cb37211f97ca0e784096634eca34aff9a5ae70fbd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz 1149877 BLAKE2B c3061b386591c6bd56a38bbb8b5dc100a6bc63ce4e19ec01ba14e0868234acca2b2d17d97af7492c28b2162ac77e521db43ea8e137b3dc37e1e405d4fe82f623 SHA512 1f4144bb6c6783402b392f2113481f8ed8cbce54bd209650f0b7d885bf25e2e0e290825118f309b893dfd1b0920e0f0ca0a3bcefe8b40539f8cde547476a9a20
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_es.tar.gz 3708977 BLAKE2B 96a43b4ace18e6a9c407f689c0825a5b28b84d5490d0e65afd65fd2e5ef48d408fddef478b5af9f80f12f387f8070d548294267ad2d7cf1a75368e9ca6d7616b SHA512 c90967070b610fb6b4d2d58c94ff86a6a73b54988be637e9b180ef0e659c82156406f6dc7b2cf95d147419a78afd4f7dd14c6df82bffacfe1c582ccf6d8d3aa1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_et.tar.gz 1607569 BLAKE2B 8c5e13fd95fde44ded32c7f2df99cd06c8525e9606e2350e56dbcd7e72913391cc3efd1b02c7573133ad43dec01cf39fed45ad96b247332a973b93f1c3df979f SHA512 6e5cc9cdd667ca151c8a1a77affd47c642c34d81ca68a262724ddf61b55dcb17f982c014fc1af1f1698d4c39af2aac2a34ed08e954a61ee1705897ed1479d013
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz 866365 BLAKE2B d3585492b1bf64f4b09db091f65d0c155e80ec4585078ce0c94a29f2479d4da64006b77faebd50ed9cd7c821e846a85295784806bc796d1ea64254900f947dd5 SHA512 4780c733d9f2dfee9dc4c165638d1b1bc2c19095ae30aec5bdb8212fa1eb752b0c01dd4504b39a51533e91f2dbc862054e4c7d1a785b0cf0562efac6bc9be1d1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz 683755 BLAKE2B 6938b22e5d3d6a13fc1b2b11c2b0f83f98dc5e5e95fd4962348e106d063f39dd748de88f5ffe2e4beb03e84b284ff5888f063e681d9ff5c9cd89622689373fef SHA512 43f69a1ca505b59e142b0fa398abb903a2746e5ac07ebf198f7442bfaf5caf6fe7a68930d9bd10d4fbe65deb8e59ba4f913351455010d09858bf37a5d02841dd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz 764208 BLAKE2B ccb8a9840f37dcdb43447685b0f5e6ba4a47663faaa3ccc8b9fd631b6c9c7029d7fa5a68a8351aff2efb897ba7b176d104444e67c0bbe34e63a3ba87d5784aec SHA512 6ecbf329eddc427601422a786dfbb105e9f9a15883b3f3dd4a2243176d3b5f4af6cb072bd40c55a40edede3d64c31e9d3a840693b16baf690783902278dde6b9
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz 2837099 BLAKE2B 47a8f122e02619e39954d558f389d74ba075027a1341a59ca56d3da4ced64e379760153e3f4224035fb01b22c09e578c8c0f161662430a235b1cdd7079ed90de SHA512 af5f916985fa40a7de3c845137287070793aac9792405869c3c27040b3c8f664c7ca3ee350b0a9003ff5a23bfb41ba54e23860ef1564a631cfb11632ff32224f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_fur.tar.gz 167266 BLAKE2B 63f71ffd950a3512d78d8f0c5dc3478416055b2a5c02d320a83098f60950767b8678d80ade7d8fd2303d06c49c663bdb20d92593cf10e4e2c52514a059b4db46 SHA512 9f6501b593b2e2f0e89ffa5c771000c99a0b13804863dba09cd106a6e939bc9831221a28eec53a75c8b856d565d0080d2492890c4eeb76b3e53447623f6855c7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_fy.tar.gz 742343 BLAKE2B 9c2d33bbcc4967cd5fdb861f6990c21c318ba17b209c72a98636d22ffe97aeed156ef6185ec275b3b43d48e6dd89de81ba58fa92ebd957931845e06e4c9bffc0 SHA512 7113456c44fa7ce6b9f207c6aed1f49cf7a878d71d69fcdf63f34c06db5c523d2256ae513caedb55cd2e61c75db14cd629495f88e84b43b5f94c452d24b0fcb6
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz 570275 BLAKE2B 794190c44b2c4dd0d6acf1048ff5d7fd5ba027554a339cd1f7977e76f97908f0429a73ca1bb78f90212c98f3e0875f321c6332d8308ad35684b3b3e9cfa22d2c SHA512 2f1fa51e89f80d13401fc99e66648b8b29507c30124cc0165b5466cfcec176173523d00a32e578cf353b825e8e8511b111bb279efb492f613948ef08b5c045b5
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1539823 BLAKE2B a98883b0e4fbcee0cd2ba9f6dd8bb7a1c79f35043618247d6a34507cc67e555b8609e9643cf36df900abe7914ab8102c61b3c37bda6d02d7d2db9ec21b60a5b8 SHA512 05ead5655de1dd04e3f7eabe4fe9ac927b5f84ef99d3a17f62843ebfd9bb581e76593ea7ab2a7f0dba4d2c3d9def45540f70b972ba395a46c670a10f6dd9d2a1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2567011 BLAKE2B 132a57e8e0d4ae76bec2b3a6e93dc6890a32f66f2710924d9362a10b61306dd4f8917680001ce5b095855e5062d55e6e7c51b104026ab3015dfb1109b6e210d2 SHA512 15ec5888d0b995305c58fd7f5119057554661b7d4292fc892ae3b2fb34cebc56abef7de0fdf92c4220d0b489b3cc256f25deeddae9852567f6f8b571367d12d8
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1133189 BLAKE2B 15210efd8e1282426d54c5d4a4ed05163e07ede693dbc26a2add1552834b1f961bccbca54d69a6533c52bf3ea1f28731dd36f3dd75c352027fc307ab96e8baa6 SHA512 82493073dbb870cd6cb2fc3ccdd5f2687606e0dcded9c236dae75a6df6ceccbb37b3b818d51b8e565917f07815d3b84762bc4fca19f653c53dc9626b66137366
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz 402547 BLAKE2B 2cdbfd68f4b2328090de6fcb205b00b8fb6960eb9bf7b30eaf6071924641c10b01860a88b21b0f9dedeac545db29ebe1116ab9ec0053a27acde24918b15725a3 SHA512 7948bd241b6b46f0af00e4d56223e2b4012a5da151b49d0b9593abfe78fb92ac36617d1d8f308498e7226b1b13da9072288286ec4eed6ff3ed4ed3a2198f2d2e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_he.tar.gz 1546360 BLAKE2B f3ece1590821bb818c2ac2233e15299b6b63ed18c22bfb5a642d0984240409b1c2fe107552a0b81149b7b4888e6123af7240f81ed48378fb0640ee2b4e6f7441 SHA512 e866bb5913d98497a0cbad02766f917d56f5d8e51d42e1cbd163ab3605ce6d5cff8e05844624fbb1e899b49e51607b0749f215d6b79f97f7a08152608f5b4e17
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz 462708 BLAKE2B 20cb939210922dc1c5469cb66c4fb0efa489f22facc6f5c06e4fb06df41c95dc8ab20351f05e6f1ac64d9c2390ecd78bd0d323c965b69dd90f3ee1e3063632a7 SHA512 a02c907f8a97ed0d22f906a2584359e92432cb9394e1cfcf3bf978228c87fd37b3f43834950aacd9281721fe12a7f16536cb48538eb73cddb190ccbb1c7a67c7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz 827355 BLAKE2B c0f3254eb3f9daa73aae8916b7a54d21d0759bf76c1694c94ddba252ce79f372373234cd433e6fe7911a731988df3729ca032e9ba80b63d5e3e60fc53a7cf562 SHA512 bf567cde311d2aee0f0d406368f11ffa919bb28f69bb17113b9517703ab3dc4555d03f29b872030f16a5e6baf4ed638d015968ca5c5fdc46f826cf8f37655a88
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_hsb.tar.gz 904482 BLAKE2B ec6272c1c64a312fc719f40ef6705234e8fffdd0d0953e78d4968fbd2ff854dd1f8e6c6437d805787904eebcadc93a94e14ecf16eb70169198eb21ac30eefc03 SHA512 5367e75fe87faa62e66b2108c59cb7cafcb22abf2445781faa68d2b6509d77c302eeeffe87e862b983e0a6c7447c5a25a436ccfea707adb34b2e9b136a1c7583
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz 2778758 BLAKE2B 32750484783af8abecf53d58f59ba61c1811d082ce3ae14099f641fb8b0dd612e3362e14290a31a73dc2248844c581d59dd90155ec3daf3ffecc2b6d7ca0b611 SHA512 2d9f29a8f9a2cf4a1e2b3089f80ea600479519de7d4706947e304f5d081e118b208d4c18f87fb9372d301661e91580c5363f6ad3be4a557af15dffcba1643092
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_id.tar.gz 1757731 BLAKE2B 2c23f2149c28c1bebad9f34a2cf2bdc42d2f3a01a886a043f3f859f3046fbd2e474b54840e3db65eecf7cb4913d6a2521e5885340e7556c32e98c1bd7c0188c3 SHA512 2880bbd11ea156f951367f2801316a44625fafd7d0aede3425518b1d8b35e76ccd7c49e39b24dfda362dfc0344cfe865d631be3f46ec8cd77491fd9eabd4a2c0
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_is.tar.gz 1421859 BLAKE2B 43592f533a92c4c0c1507244c699d3f02644e821a1c4d76145e73704abebc7b52a430c8fdea08f3e43fc28360b011af78d992d1c2957b91445d0e8a911a8b5e6 SHA512 c9b0a62c2bc4aeb04df2418c727e341f5e42511f95cdfc023c12fbfff725cc813263cffbdd84105fc507e5248905ed7898ab4582ce46b52c63c2ec716968267e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_it.tar.gz 2151230 BLAKE2B 5f919fb1d4f541724cfae97990d1c9c970153591c3fae854d0d38a9217ca3da5eee50e3c7abbb46df3242a4b78ff8074d70e86a42dc8da35bfaf552c639ff020 SHA512 877a1d37544f8403db1c744004b9b6845ba0d4e6c6b2070f29c85386e841238b37b36441b758d0f79c0dc9f44f7d3aa767ca2be55fcd1a46a56007ac7d2b320f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz 868809 BLAKE2B 829cff1f8a247796d57c4f6cfea393c59c4d9ec93de43e43aaedb45d7200be970e4d6dbd539cf28206e0203286c241ee7452fe8f94eeaa6980442e71a3b50bc6 SHA512 09c18996e455ea7f519fc3ac31529523bf4e5b385237035729bf2237b7ae7c245750ca377f3c34fdc8e91b536bc84c9629b447bc0fefdc9e935df50d82e75f62
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz 1033151 BLAKE2B cff8660af8c625251d63b43598bf6438f78338bdf488749521cb404902c7bbf711e811d6b92f07f838af9dfb915580297b40c9a8de5c3fbd51a5efb1c36c31bb SHA512 02ac437dcdded5e81b89a6b14f94df810e67b65a3ef11acdb807ae036cab51bdbf117933b4f7ababd5e13b950f21d7b5129c63226f74f84469a2eca5e2d2ada4
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_kab.tar.gz 501003 BLAKE2B 5ad8a87912db784a48252f7300f1f2c168a2c2b944b14e0ec9d79d5e569cab951c658a918a540d17d8ce2395bbd80b22e9fead79dfdee91aaedd1f4c49cd4bd6 SHA512 0d405093332c4be251fa7ff20f60211e2b15d1c56bab4850b9b1f9f28de3677241487c63925523a62448a3d8c0588f518eddb07571a8433ca27c870e2447eaec
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz 885162 BLAKE2B ae859ee34be05d7def97dd40f3ee615f1421bd992ef624ee9c67d51e4b5b144a4038c3f9d4b33471b0811b0dc4889b506aa256df23269990a5d12622ffe1400b SHA512 1e8407d7efaebf8adbc70dcd478cf3875ee3c9c8bb82a37b9cc36bdc2c0feb4c82928465eeb1eefe14082f2849666d2f0181c9ff241e2554a9b8e9f6bb9e8642
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 265495 BLAKE2B 225a0f6e52db4420499682a0d9ed7e01d30701363b067448062c5527170656ab7ac6c1c6dc5c638eaba5ab8e93d19a482705f155497c9e751949033155669503 SHA512 08c6605bbd8b7a8d24e91ce5f8aaa32cf056c80cf117f1dc2c2cdb573ed368d18b9776cca1c8418fa9a066fd6646073a825f0397f84af1f344221428a7d11bc7
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz 462651 BLAKE2B 72745474ceb3317c2d3e101fbb9280fe30f86ba9df720e99b9d421b113b07e8dff59fd8dc3d240551e5916c8bc3786397c108f50a7a5d4ffee6e8770f4d6991b SHA512 1aea9e7ad5fc94d78f4834ba81488aad39c3b01c86cb1cda08a6412759cccb36fc6320aff0b94687d5fb15c0942902f8a4eb74c26beaf285995b9f9fa1adfe99
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz 1481777 BLAKE2B 0f57ef18c2252ca4e2e08d557403d831e2e55494b9db16aa17770bbf11edd719e5c1368691a230d9c541a6c76afe86946345df3ab2f789547a5c5b270e5b2f69 SHA512 44e9466bb8a6a4d700c2bfe7c8e72444ac779821596b290293659e7b2942368bdbdf4e9d870037b45a058594477ccbb6c82e48f90429b905bdbf19fd03f00322
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz 333172 BLAKE2B 0d2986404845e73649b190eab1f5abc6a91f058281855181592fab5a21be7aed22b3d3acccda6729438c19029724d51846353b67a8eefd073f776c733995c765 SHA512 49308e315ac30f97e06d6c20aa8bedb6686ae3b57f1471177e33e85eda6b4345256b8710ee84e9abf383256c2f17a759bdd5090186b1a34678de9ea5880cc260
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz 266391 BLAKE2B 063d59e96795835a62a944be92343dda2ff85690401ceda91fa95fb46d4dd5b15d818efc373a9d0cbb8bb3e564911db501f5709df52c3e72dd7932fab6839663 SHA512 44ca113cde9c966054d2bea0f43dfc637714b1a2743b4f1bb78d930da026d14dc20c59556ae40d623a7c0a3cc3cd05a5b4013c3b52ac2fe7299412695b9822dd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz 126491 BLAKE2B 64d06975c8ba71863e316fc9939559af3352f5b03d50c7ddc8607cc11d83d55ea6ae81a1867421d59d92b9f413ac60ac062e2b7163b7e7628767cccbd42a2cfa SHA512 11a70c7c031ac8634eb3b48a5e92efeea9341d9788f568a96c03d418be8a787ef13155295eb5e06220bd2b15130cfbd605369f7530812bc1d9ee4a4dd5740957
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz 450802 BLAKE2B ea69ad27af77e8c02c7c11c2c990ce543c07347908a186906156778548868b3d29b8f176856e3a7771d0026746becacdc619709aa5509cf1b98eee23516e3310 SHA512 0e89f8b0d7a5f16fbf90c18c6e5d6aa2b7ea5f996e8f807a05ae64ec3abdf578fc441f341447ad875f68459115e9afca7bc6c4bdd85ec8e16e7ba8a8375b28bb
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1057427 BLAKE2B 702817796e72d6e52072f3acf7fc02223c47b0af393da35190c167fbddf253ca9ce68f51c7bd9cfa10a4e660bd442d2f27d8efd9c5721ebc03e5ba196253097e SHA512 5cba8cd7f8a2229fdef50da595fa60eea81e8d4e9599556917988b65929889f9ffdb209e64fc1f6b95efc75c550d735f80a7a70a404132dbf3b6294f8e35198f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz 970963 BLAKE2B 3043f13fd8380a94c39fa0859f220a7e4abb4204f860247e0e5ee54f729cd7b6c6b63518c0815fb06ca047132ffe10cfc0c218920869b75866ccd11d1b7c55db SHA512 bc297296fae4849354c924d522579263ff6e6285b7b71007ee1cb5188038d9d3db21b048b4d8bdba94d90c6a07ae622b73ce7a338fa0e2a08c61306b9cbff282
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz 271171 BLAKE2B 655f8b9889af015847c3e6478eb0e127f825e097ac22cec2166ce6718d05bdafcd16698c887ec9b2b523f92f078ddb20832eab04d3fbee601bf05a0e2363774b SHA512 cecc01ebf8b4de66a191b27ffa16cbb9b46e8226afce442d9e641fabd491f81ffd72a28e57f0eb1d48ac6486945f2386326655894381a16f51253a28b249d33f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz 374189 BLAKE2B 5f18a52af1705588e7b3d131ba1b8f1f45064e99ff138e2f60ae23bc7257bc22254aac1c835cde7145aa1211e11034f026c7372d4c2775ab5156304257b99c3e SHA512 c064f642eaec90206de014aae77c6326050daf58c64d8a6f30db8c79533d42c52f3f1a8609de082d728472478e141255767de3a8d6c220268e73ddd39842848a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz 429586 BLAKE2B 3b4076b9b50dbae3fbfba4804419850a02515ad4b320ec45d018e28b0cdb2bdcfc0af2b5a82008d7ec26492bc6ecd3744979c696fc65c805391b8c2f58f3938a SHA512 490437592d244c9b31abf1a3ce6155b55f224b6e70f7f03b1a48e74ac8d8a52adcf6a73b74ce31af85c7fd50c72c996322f3074ec18b3c5d204eb5027264da04
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz 2311763 BLAKE2B d6167380132f2333d8d59c4afd2d2572f30fa9c6a4b75e146bcf4da5ba611e1bd870ac66789725e59b9fecbea26821b24a46d2e56858aad614f5ac6c611b1df0 SHA512 8ffaade42a03e6712e9b15756ac9dcfe03312867bb4ebdf2a07c859e6585484da01655044cd3b3e093c36c0b07d613bebe0482a3db812f8cc4afe4990a90c06c
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz 325581 BLAKE2B e13999c53456fb5c1b9e218a098912afe948022c3af0c8130a3fbb928a1fb73d400ecbec63411d67a7f2922dd2039fa4a6caf303e9b4b137320e15e2b24f700f SHA512 e4004efa036355eb303f2ba2c4a5c8f4076cfc6a4d9b402cd6e56055f86dc804f666ef596c4133f47e27ba2d5de97c3319a366b06b316adce37f7596b91e7c9e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz 459345 BLAKE2B e9da01a2c740804767262072b49d729ca0f9a1a024d0ed747906391673795d0d99dc43180c9c6af041e69e7a7aa83dbb19bca91cdc4ba6ab46d3db3722759524 SHA512 d20a56607b9bca6612eb79fb4e2051b737802a243ad851678add460aa956d3ed317c8e25f117e0e53aa92b7fd2b44501c5d10f8ce22137303562906ac9e086be
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_my.tar.gz 371779 BLAKE2B 4a80e5083e63eff82f9f865dea5cbdd67c7bd198075378a0d701184da9b295f638caa65379bd60e4b99db179dbcbf0bc2daee6964e6305e6d491e7743540e0f9 SHA512 7718c3db866dd88006ee3f049c154ff7bdf290923cec4fb65a8f254023031395b101980b1e2ce18d880e541db2a8601099d315948196c75cfb5f7cffe56c337d
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz 3551755 BLAKE2B 718ea391f22d9201bccd5e1b9d91e31b69af984ae7335033d642aa8d248632786fa0ed2badf8b972a22539428835dd6f01658ad6802598b6df81ed944aea9af2 SHA512 30b91a5c3e8b86eb3a25045f328a8360b1cdfb081c711bca8d1c0d9779a786c8afefe092a5ad61fb814985d9652b4a58ce7984ec48ffd818364e1d2ed0e511d4
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz 850910 BLAKE2B 82e77ec67bd431a6277521c283ce4f99024e3503773d7ad69f2cce35824651647bcc7c59397d3002885b9d0e4fe0fa5a74d59deabd1e728a3136c073943d7d49 SHA512 d8cf796ad43440d52e16a05ab35ff8eb89d51539505240f5a31eb59d7b40e337527695eac72fa2509ba6c6fed06bdbe0df64286f3c4cb3989050c58de024d237
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1656578 BLAKE2B 48790a03a8c66949d33bfefbc9a923edba6dc7706295c9de24e5326e368f8c9c4022277920cca41ff039bf49d53e792c50c08f6778c5453f4d928e0c5bebbfba SHA512 0634932bfea1a55ad4d09ae42be72b9795737061842b617c4eb4d69c51761ea571c7f63bdf83ed63af127f904b92c7f80f89c6bfe3d437701c0540221565e46f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz 3553852 BLAKE2B f0c02e6f97181aa1fe91fb8385ca9eda1555e232787f648f7b9f707f9db5f508fe7abd080135ece7722bed3e514708e8ac077434a8bc1ab9752e96f2b82d6d2e SHA512 f9af3e8b7112e116c5294292161b64833b80c683662c3ba1bba983c8f7423c2567cbc99d757e00f30b494561b525e2148ed39e4f2f5eabed0c0b0c12fbaed099
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz 227137 BLAKE2B 67407fbe5e8764865697f785c61425146153c8dbc20efb8d37a053d3aee5ac72b739ace583b9b79818244aedbce67bc2c629ee0a3bb91a5e0904db6dea0ba286 SHA512 35ac6918f1739d1c6791f6b7b695fbf3d613d56ca2c64ce4f47a577b348ead24f451541975571e17d18c5e9bf3e39b73719ecb63bcf0e42adca48636da0233b5
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz 258811 BLAKE2B 6805d9c4289d6ecb1e24af9b0c55eb633e6ad965a2732a773ee10476c3c7e523034e48cd4d52bb21b569062ad9629a94d994526475fbfd0d6c34b98c529e9c45 SHA512 2ef42e5d258afe3ab0a5ed9e92a3c21815cfca5760175823834df2fe76e8e1ebf4fb77fdc12977a4ffa5828c022bc8adf44253f7719d338c0f86cac7964dc2cd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz 1166061 BLAKE2B 1a0c783feaedb59d02a8fd50c058834a1967377cb4dae9edc5657ea0d1bab487eddcec72f4caa32fac149ce5c1670c2357a9984df75244850e0265c8ad859c27 SHA512 15bc3c80acf43232942b90c1f7a5aaaf3c81255d7b6ac26356cc4682fafb4d15a10a127e89206084ccbd1eebd8d65fc2ed404310a7dd58b29b5cc50118070716
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_om.tar.gz 382606 BLAKE2B 18e643efb8618d8e2fecddeca4135fb43513ac6757ce6f9401fc3f978d9aabd49d6288e652652b9d09c4ab7d6ee143715ec2f41106f2cdcd010c83c0fa7b61d0 SHA512 885a69132549ee5a2cc6bf5d6c549ac23997edb6e7806f36f470390787b4898ada2b33a21a346489813a991a8f6f674a472000a91f80b6dd354935dd8f14f293
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_or.tar.gz 476795 BLAKE2B 103aa0544d4296283dcc07a2a301971f5330054f05654e278ca37b2aac11727a08989136fb8aa980d8ef20e4ae19d0f6a168a91661b27c2e1ed6db5645dda20b SHA512 2e07257c0e2475fef4665db30a6b508634f311a6e62e14c9d75e773fde0877aee2b044d680e831c72df456b7a48a16f03b3187c69a6a9ee4ee2bd2d64a13cb7e
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 486694 BLAKE2B 436cf01497a1529bf38b6bc32e93b280d240b15c046b62338e47a33f9a9376151593e555ef3b91d22ffd5ee14740255be375af07cfba18b4fd023713e39d7d7c SHA512 ea52715e4431e4aae3d37763fbefd4ce8d9eb6c970063e5f5e2a0e0598335f1247d6be164f45a4b017891a7b83d17cfb36064f6e8091a3258e2a2ffb2c9c6667
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3055532 BLAKE2B a6c04a2fb473fa68575a3d3005f7f1856040e5452dbd894cec0bae08f78eef8828ff524c44ac5fdb5d935272a7f7959487667ee0204cbd05555af2031dc8c9cf SHA512 5fe95463b8c19227d5ad83c12696680b73beb0178394a98463cacb730b647ec0b584fbc0719b0bd75f2e624e2e665d46050b4130027ae4b47642b77f33079953
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 5761653 BLAKE2B 3e2718226ec71b68e14ce43a5dcd2ab54150f2bf74f21efe063a6e9fed9b1367cd8e1a31fed100a83a563c6a03682a5f2f75fdb3518065326531367821c01b1b SHA512 095c46b642a71b100a5725b666457080198335f7519ca7b113028421495c7478e9b4e95e678214643b81035f0e705073b26b621583e124e74f6acbb33de922a0
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2383590 BLAKE2B e9792c042896ab631aa26c56cf6bffdb6b3773c719ff0d5908e79304e5338ba1810478985e17c3ea201157d3f385c2be43a73016ad3466782449b6fde641a4ab SHA512 ac3a53d17f1c1f56cf96e069d59a21186b04b046b875dc545c6e53fa2067bbbcac4f86a4846e31e298cacca79900264dd5e0b861624646162397c860cc42632d
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2329168 BLAKE2B f26af721a3389675d43f5af5471247a7daaf91ac75b48c6a67d2d1e9be0c4dfbd259a67b4ff33ce8375cbacfa2390302293dbf1d7c2cdbc7528a2ed8b5fe618c SHA512 0996676d2676823aff0e199f8c08ef20720bf7ab452f0ebe1665480a6962ca7abb303d641678e7c921b395887bac98fac2d2bebea507be068c598a18af7e97c4
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz 2239681 BLAKE2B 32d22853e0a292691f844d6e4e5f6a9a2a29c99041801ecf70fc3afe3f4968f0a5bd0b8fe77b539dfc234d0354703cc38605ddf462b2d774aad52bf66f0978ae SHA512 81a898e24bf57ba4599a2d0ef5ed738059cd67b1c0b458c3ad8e52f2793da0a9935477f762aaa3597f5348e3a64c15f6e1282d8c94a5cce9eae6da61814f97ba
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz 278964 BLAKE2B a2d3cddd4fe7fdc7c46bcc809c5ae87757997e70406f5bb3ff185a68a216cc4bf67f9d14ae77518a00bb31bdaa1a437738e64fae32ac4b628ef14c08fac4b710 SHA512 1c8de04f28cd79a0628d85c43e183d90ef7974dd2d2e79d4ec734ee448fd054fec0e4ffb0842c9bcf3673fe738d9f5b3e812b6dc3374dcf956e3a1cd77a48428
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 362459 BLAKE2B 3c605ea2665b649e01c6cca9f6e5585366099dafa4b32b9340af0e3c2da84feb9d736faa0fa098fb610ecde09cd31cf05fe541d097d07a84a8237240ea9c10f0 SHA512 b0d40fffd0b122819e579dbd03b5f4f71d09c84b31128fa73f67e986ec0f1e245d56503e751be40b6fc7900238b4ca2e08ea69c333e82f64c8a07a089ba67218
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz 412772 BLAKE2B bd26b55f14ded867b0858453e9565e03619880befaac4f54fbd20e389b71eb613f45825cd1d725f1b3a20f59e7e82b2965ee6742085c5cedf6c6606e32ca1606 SHA512 7e7a858c7982e67a6ffae8de5052a6ffabf052d64c42fea59db7d52c530787c18c141f94dde476df29a6595a125e0ec6420ac832efea813b62f977fda902abc4
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz 343091 BLAKE2B 5a22d0f476662ff7dcb46bcaefdc6bff8717a68f302b7fd33cbab69c6367e05d389bc913d1cd21f5e4f3df8bc23a5e3a1edb537f0114e728a05023ff3db00bbd SHA512 79f9745dbd4aebc74d5eeb1041915b1ee0ca0a0854b18e21f1d392d439b365df633ab690619b6bfecda5f1bcc7e49b1323d29cc81ed473f59b81f1538c7253ae
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_si.tar.gz 654319 BLAKE2B b49a414f8defd6f0b3c72e90a8892ac9074e6d67dfbad482d55d6f1374310d47c126ec9a70674028f4d0acb49da3ab6bbe95a726fd19f1f585cec2f8ebecfe9a SHA512 92d2d8b86c05b687ce779579c7d6bdb0554330a88fe6c5f2b1e35a584c000c73e0ea74a92ca277afcd8f182be9384867f1aca4dd1cd76e9715b534816fb79355
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz 411749 BLAKE2B a5f8e399d646759c323cbb5d48c723b77f5ff3885fdd1b492371fe3bb5530327b0f0278f8ed0eb40536003844328ff4720883d9f1f9ef507a7600414118ff5cf SHA512 fd6c99131ff530470adac5cc7d9c719c483fd2d52daebe4b167bb80c208cacd6d9b42bcde02cdda79dd26235912f04c1e6e97f2c78e9bab268d341592f1eb61a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz 1923060 BLAKE2B c7881b234171b0866b04427a786a834f9744615b521c4ea94444ceed1c2f57852a8677ed6bc68d1a0c75736371ff850f845dc478852f364494e4395d07337351 SHA512 43837db79582c8ce5c3ba06b490ed0cb5f84fef5880c87fd39b273b555451bb9bfe8ffc987af4256927c701964c5398e2abc0832c5f50bbbb120a675cc224436
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2517776 BLAKE2B c03508cffb186555d94c696e3b025278e04e3c21c6507cda89ad90bd2ba3bc02b04686b3e57cb2733ce11a7f97319ea7a4618491966d2da6481f88ef449c01eb SHA512 68f5a4389a5a23ed1c8bd14c5a01ff566e7d44c54f1bdfceb8d908a6b551c8bbeb32be442f17d18d36a4dd0ce9c9030bef0b8d70bc66ddb8453cf795813cdd3f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1073934 BLAKE2B 46006177af5f29727cf6ae7512f25e7ba9ea1c8647b6d98731dfd2b25bed3e20fac01aadc3c8c167fde6622b69687a8c5072a7b8c2467d3cefb1c2f04b5c4bc8 SHA512 71938ca1a633a36ad467430275ad8feea18239da166c48c6bb40d97ce0bbe2f0281536d5d7e166d301b9ce271d49ad8ab526c77434e36d0e4958ed528c5a72be
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2292095 BLAKE2B 6354fa15e0045209e33efeb742aef17cded9b03ebb2739d3098969674a718ab85632963aea16ad2bc3b6c3a640bebb4f34da2b8cb6f702f417033b7de2661338 SHA512 fc0a5bd7e34444f2fd979ca1b59ca38fd61e7ee52d7322b5973c4e03ec40c3469aa37fa588dac66a0415e7cb37805648f3315c41f6fa588a81ab9710a54d59bd
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2783144 BLAKE2B 4b92b2e17ff5a171e402f8ea275edc545b0530d70a9993ac5c7985a63448c1c34704b9dd581b443fb23d84012aae7b3ad7fea6f43bb516725cae9e24ff9f829d SHA512 768a046f11cc23bc17281fe064a44f31f0400e3ff5e398cf003ffb79a7d55728c436f84bf0a0f0792eaf6049b7531cbf01e592a430ca18f49a9a9e2b9667ee3f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz 232697 BLAKE2B 55e8eaf78e6f77e2afd0b1ea4af270a415fc17514278c3b59604d38d3282524c4955dee0d489d3f8d5a3dd82ec884ae043b489216aec51791b6ba7a77c34b171 SHA512 5c4ff4a172dac3c0f3a5d75a895e69d169f1b5810e3fb4a2ec1479f27d197b53c492e759b97b445f23a18deea0782fdb3d68bacf86b92d5e5e119c48fac76e4c
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_st.tar.gz 228556 BLAKE2B 50189526098fa150179eb02981aa4b92dd09daba4497b1d5c20f1d81eaab5779fa587f5195ca3f949362e76f61884457086ee13c5e2a30c5ce5cf26666fef4ff SHA512 5ed6bc9731469efbb9d64d5656e43c9f368e4295065ca149d20c718d102fa7d96fb48cf9dc9c5a625fefd726c333d88cb510ebe47e2e9d143a3209167d976d14
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2642735 BLAKE2B 88a1f1098947de742470bc044b6eb42299cb024ca25409781cc2205b71fc98d1730a1c1b0414df9b88fb33e93b00df8043356579e59125179c90ecd76e5b7b0d SHA512 bd430c3ff2927311452126ee4345fb9152c552bced89a0eb7b4291748685e5e6cd9fa1fa6782c4266b74a07a4cc62fa7c7691f7edbfc788a292e10de508d0951
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 255528 BLAKE2B d7ab7238c7a727faee30ad54b6d0c3a465dfbbaeecc4595286ed4e02f56c5f64fb255ce2974a9a2e6c1fe357c2a05dd05c8f4f744546e2b8429c36cfc0635ad8 SHA512 faa2ed1b8028c56789b85c3cd1abb8cf92010c5d3b735bd19e9f0cacf3b9cd69dc3bcfbf2af1504de89206dc20e20fe095ad3455d53e771dab1e9ae3cd6cae52
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_szl.tar.gz 578256 BLAKE2B 923a70a91e1a1590c97319435cbbbd918a0633660aa1763d7102467d7cd7581feb60e503b7f5560de09f8b047a7239c3781992e1683f7557c2e81520e2eed6f4 SHA512 6f89822911c0613bb0b028b243edeef421aa767a169334d5d0dbdf8e5f2091cad5dd8d20af55b6f34672e1274176d2061ce04c7f6632772d98ab22f2ca815582
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz 605659 BLAKE2B 32490b45eb30524fac1bf55ddd1b6cac1ab4293fd86066b780e50c326d57e80f9916a3a8be4920f12a63d3f589342f68f61ee97fad1980ff8a62ee2bc632af45 SHA512 ea758adcaa3898b86af324d511a930bac18c174f0137845b35333515dfe56ddf9468dce88c9c85f8522ba30ae2cae5fc3b5d30fbb6916dc5c5d6c4aaef044290
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_te.tar.gz 969856 BLAKE2B d85cbd936d1e0d98eb054b5af68fb8e0e2c4f02cb4768f6bb1a35065ff5ce75e43526a8fb140b26f8accb28f5bceb0e997eba87a4e1463baf31edf827bc2232b SHA512 3154243d76f084934ccc85c6cb3a1154c6ddeb1683e83332778da31e134aafc97c7736b9bab29a16d2aff3e74554f339967cf8f324986653350b94feb5bcee94
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz 307607 BLAKE2B 403a7987eb39bba9f873ae0f6408d8059a9f6f63887101f872b5b9a16100a8fa76736b493cee49521b960d98774f789f3052703a02174a87af3454815a686979 SHA512 d4c49da9a1debf951647efe17de026765f10e27ecb0eb380d8b95e22564fe343a4272e9189851d08d96870e3326236f9665ea210cf886bc5eb66393ebb45afdf
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_th.tar.gz 1234373 BLAKE2B 862311b3b35c5e0d0e86c6cd039bf48087f48a2583474104ea4736fefb18763ae3004a4bd05e55be2ac1287615f03dbaceea35cfc070fbaa7ee0f0692a5914d3 SHA512 0fc22f57d59ef1f1be64f5c622190a4f84ea061cbe3d02e6fb998b27ed266a5f447741a845a2a31e7764d421e654208e5adf06fb08abf8856728415a3f822d5d
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz 213050 BLAKE2B e565b2eb2ba720235ccd5a5c1e985be23bb346d4e4b3f2c82b3127bf06fb43662356a6e18fd6e3bed2f13bca321a9a69d6cbd0ceb51852372e9936ed23ecc4d6 SHA512 fdd63a992f90272332d8ba2f68cd2b38bdc4157cb9cdcfd3a427c6b468b7a712edab319ace7d16c716c7fb25cd2b331bdcd57907c86ea93123fc13f41293087a
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz 3014656 BLAKE2B f9b6ec438bbbd0c4479e85cf74f302ef230d8850cc7c3d9ce4e4008cdfbb221430d05bbfafe2ae13a54dc7504e7bec7ea901aeb5e3a3fc5bd3e5b2a1895129ed SHA512 f4615360c1604250021a03f1152afdf64e5c47e30a3d1462ecf8c86451ee76659d0e2d2187a3c68e69abc199f90d0f8358d46e56c9c7f183597268eda75df057
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz 226411 BLAKE2B ab590faf761ec914929a6b0c1e9b2143f1290dc24c3ff9ff3f9fcd449f73b619827fd4bddf8136cc7a4aa137e4f86b5900dbf94201aeed568f102375610fceba SHA512 dc4a1be4415b7c82aaa9fc36489bed46fd06012fbfa281669613e6ce205438ece1d3517b46cd575b51b4ad52a039d6bcf49c70a447dff1eb01bf078767d00c56
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz 148109 BLAKE2B 71e41ee08c602c99951f7295e8cd90d76f8d206cf0d3814a66905edcfb9ad00cb47ac7f61cab973ad5750bba64e935c31a430cb8de1ff3872ab2caeb9c5dd450 SHA512 4973bc4fa4469e5f3155a1f31684382c75dfee0c830be24c066af97c0de6232d7b2ded29776ca12e5405de3fae31fbd5a303490060b2e45a855c07fe0da3d8df
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz 446185 BLAKE2B e0abd25438946075c9c8d34ab3cf7c3694be4161c92ee277a9240e700a1fe446056740bbf0846ab30a9d331fab9c93b56e7d2f850c5d3c8d4c41ec83debf5107 SHA512 0081e86d0904c5f70b09e33fe2fdcafc2545cd1a5bdbb0e46dcb13a897eceecb6a62b0b4778566de75cf9aa84b3142ef69df401853347590a84f1f40338a2689
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz 2757659 BLAKE2B c4ebb4071bb41fdc27ac7162b4eb3976110698913c05508b317440658c874d6559bf45861eba10a79086d84a98dd5054bc624676513ae20f9fb774a6a4a176a1 SHA512 b49fda7df5169f202cb8bb27e8f216c0455e61b91b7db604ec5e1b9bfc2be4ec5461e9d4b2fbba32dbfa20c318ee4682086fa7a8576423306951ffc9d1846409
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz 247945 BLAKE2B c1e6e659ef6ded12ea8db365b4d389dcd7f1a34ce63ddbed213503f24b902c751ac3072a30d1d4ed0f31375edefbe789dbf7af03b12314115b4417ac38179ccd SHA512 1864c5751a3997189b3bdf9a6503048cf0e2afe81efa4d83b89eb08ae102cb3ac0df3d8d4351ef2c48a8a79319f531aa0f468fc0b3db8a2059c177241d4cd66f
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz 229766 BLAKE2B 0973bf1410a9750948e1a39d34c47f66e958d615ab3f1f90b05711ca187fe11790aeb29782af730d66d6b292f6a708b0f3a459f610848b70eca98949aa147313 SHA512 846a79ad14b40ec89e248467d93104bac41c4337b05cd3b87569edf0f56aaf76c88364639306adf99c788ad5e0110f32592ee682c5a3b76cf47aa7798faa70e5
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_vec.tar.gz 593583 BLAKE2B 98055152cccb9a05b00c75ae0b89d556bf5bb01c4c4ee5cc57e7e2a606253df4f64c004b6024405ee55947ee8d495d6be15693ad224a1b944fff1b7e413627b0 SHA512 64ddb91d6183b300a6f0aac705cc5034a2027b11fa1b3eea9f6518be78a8e4349e934d2749b05e3888b29baa2a8acb06c028a56e9b006f25c65208141a3504c5
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz 663402 BLAKE2B 045781b9a2f6a43b0fc7324877470349809a275ad682ac151c7a45dccd85a4fd044939eb668500d8ae6d35c5d052ac8a9cda992e0c647b275bf3eeb76580a28d SHA512 c703e671ad9162c4916c077d7281df84fe1ce04200600ed3c00bbb3f3b9afadeba82f60eb6ca6e72390e2e0d08ea029cf6e63a8416018c27b756df3a1be8f90c
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz 234139 BLAKE2B d2f3f248fd3b2565b1a4eaf5f64798a716f148c0ab15daa57e0840c5224d48008b3e1a9e9fca0e2e33e673ec30fd81a5a38da8ca74740be4a89bc8e9ac521f32 SHA512 c08729902c731a3488c79758569413a6192bc6e6747b3e1a5ff8c20a8aacae2ee98864de037fefa0efdd0c53f610de690f9aa318a47c2a49bcc5a291c8950beb
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 947684 BLAKE2B b9da074db00208e676fbc9be47ea56bb8748f3260602d06f8a1ce83928cebb6d8ac654a56dbdf56e6a9cb090fb0ca81693514cab7f6c9f07b0934731e99e88a7 SHA512 fc9a0f8de130b4730f19c2d6b6e2117e1ceaa9e1355b854ad526444aec41869fc612d648e3d144d3d6a1096822a9dbdeff11b444f387ff1cd8cad92e419067b8
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 945448 BLAKE2B 1450b79b6e9a9daec32fbe5b9cffba889d14ac9c02f0a99ca89382413fb2225a68f05d5f150bc8d5d0d0273c98a8f1a9f2e162206dfe49660d6fd95f47681b0c SHA512 a6a97b23533839b415a2679c66b7bb9393a3c45ca976b87b21988b5804883eb4dd81e54447d3b808e0ad3a8d5ed7ccbf487cd09eba9801665820421aff85cdb1
+DIST LibreOffice_24.2.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz 257134 BLAKE2B c12f8b92412f2a91363c33f89d2add030988ab278e30b99fdae11151e797172e83068df5537272e2e90e2de9f1d5f91df8d68bcf1777aea86fe62b92f001f68c SHA512 ff06b4a3c04997603b8a848c508aaf72b8e2bc51b32fbf85bb1c68260f1633e58502705ef5230e9dd43870998bee3c90d26dcf44965d28f43064c924cb95fa25
 DIST LibreOffice_7.6.7.2_Linux_x86-64_rpm_helppack_am.tar.gz 3249949 BLAKE2B 69518ecb6d9f5d350fce775bf000661de002943522e789bf1c653f895c011ae4800ace3d30b4b54382e90894ac5feec941697e36e54d2dd1ef6fb27c667b40e5 SHA512 ff6637b8820ff2a47667ab0e59e819859a47c93e5bd6c48e74f7e830cd6acfae25ef535e10100c49b92f919062f1a6bb542818cc526b27d2a5ccabf9fc3c88e7
 DIST LibreOffice_7.6.7.2_Linux_x86-64_rpm_helppack_ar.tar.gz 2940197 BLAKE2B 4e6997fa63fff7e26b8f172c686c84ad3da4d75b2cb5d28fed5d167c3f1f068340ba6d778fe621ca16bc76aca6ee5ac7de7e82faaf10978ed1c4a85b86e11117 SHA512 ceb4db136021e908f436a7fda8c1d6e3a52d81a117e43f398c8b749787e329bf02f8a594474042a66fc0a3fa2b87d1848275ac7ae4cb951721e9442cfef376b6
 DIST LibreOffice_7.6.7.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3111053 BLAKE2B 337a3de96f99dd70f9bd60d67d8a4f907ccd8286ab09685762a37323d5c5f08cc8b3155db30309f98d659cae810c3d16810402cfb3c49d650b781348a533acda SHA512 16c29922c967a845ca0cd7be97eca3434a1da781068e40ddd6d6147c04acc174a8d9f11c027ab0bea7bb6394be6bfea0fd6747ebadf9cbf6f93e78ac28b7c6f6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-24.2.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-24.2.6.2.ebuild
new file mode 100644
index 000000000000..36af8344e564
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-24.2.6.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+# TODO: Try re-add LANGUAGES_HELP=km again (bug #933765)
+LANGUAGES_HELP=" am ar ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka ko lo lt lv mk nb ne nl nn om pl pt-BR pt ro ru si sid sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af as be br brx ckb cy dgo dsb fa fur fy ga gd gug hsb kab kk kmr-Latn kn kok ks lb mai ml mn mni mr my nr nso oc or pa:pa-IN rw sa:sa-IN sat sd sr-Latn sr ss st sw-TZ szl te th tn ts tt uz ve vec xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people who do not install anything e.g. no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in l10n for some weird reason
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.ebuild
deleted file mode 100644
index 7ab48e1a867d..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.6.4.1.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 rpm
-
-BASE_PV=$(ver_cut 1-3)
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ar ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv mk nb ne nl nn om pl pt-BR pt ro ru si sid sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af as be br brx ckb cy dgo dsb fa fur fy ga gd gug hsb kab kk kmr-Latn kn kok ks lb mai ml mn mni mr my nr nso oc or pa:pa-IN rw sa:sa-IN sat sd sr-Latn sr ss st sw-TZ szl te th tn ts tt uz ve vec xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
-	# Condition required for people who do not install anything e.g. no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in l10n for some weird reason
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 63d0e5b237ef..4b9c42b9cb88 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,10 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
 DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
 DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
 DIST libreoffice-24.2.5.2.tar.xz 280162592 BLAKE2B 59e07ebd9a3471fa03abf3dd9abc9e4b440598a0753564999bfe8e95d864161a8b3a0bb9388a7e8a87aaa4ac75429e7ae12c233b4ef08174224223a37040af74 SHA512 6f2893bc4e00a988e5f16e6288c95c66faf86f366c3fbfdfac3d6d46c6c03501504adb41ab7e51a7eba749be07cac1e124f97805500d29808155653c217b7c07
+DIST libreoffice-24.2.6.2.tar.xz 280090508 BLAKE2B f7bc3d1b8cdb1d3212d0aba97b8d7ba2e4b833e8ab796b477b8faa10854b6681d397a239b3085f351c8d28295490d7d3f6c0c62f876b879a367abb0df9053314 SHA512 3609fbfc03d6140e3275e7b8ef23297293df4bede68d9714dc2e7075578ec345ffdba4dfc873eb3dc4ee08080fb7d902daa86c8222f63999fe1df259384858cc
 DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
 DIST libreoffice-help-24.2.5.2.tar.xz 167013608 BLAKE2B 8e05fadd1e61534828ddcbbc4422658002f41715e049b1d92c371a67469d5bcffde9483f106df7d5e74691dd29c4374cb48f144e1d2506ff9829425206e49ce4 SHA512 c7a8c5051797d722c7f250828e53eba7603212db3df119d92b4c4a492e0e79cb9e1da5b016b9664f2133ced6fa414f08a0edcd44cba291757b7ba8e7ae46493d
+DIST libreoffice-help-24.2.6.2.tar.xz 167013048 BLAKE2B 026c783643433da61cf29dcf8edd4dd9d7229d1caf48f47a5a9ced5a9357a3eb9bf780875214189413775742e8fc63c7610549f154911871537563afb4ea4d58 SHA512 0d4ec689649b99e4a1081105d2f4c3966e9230eedd1c1d66c531e507a47fa5cd8a16bc30829b153ae9730d3214be8b75675bb123bfbd2c35a1f8ef7a9300cd4c
 DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
new file mode 100644
index 000000000000..dea7db5c8f02
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
@@ -0,0 +1,701 @@
+# 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="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} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz"
+[[ -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 firebird
+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
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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? (
+		|| (
+			(	sys-devel/clang:18
+				sys-devel/llvm:18
+				=sys-devel/lld-18*	)
+			(	sys-devel/clang:17
+				sys-devel/llvm:17
+				=sys-devel/lld-17*	)
+			(	sys-devel/clang:16
+				sys-devel/llvm:16
+				=sys-devel/lld-16*	)
+			(	sys-devel/clang:15
+				sys-devel/llvm:15
+				=sys-devel/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"
+
+	# git master
+	# bug #917618, thx to Debian:
+	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"
+	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch"
+	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.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-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 firebird firebird-sdbc)
+		$(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/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 20bf4268cdef..1360d7d1e65e 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -312,7 +312,6 @@ PATCHES=(
 	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
 
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 20bf4268cdef..a4aacb61b9f0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -91,13 +91,13 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	base? ( java )
 	bluetooth? ( dbus )
-	kde? ( || ( qt5 qt6 ) )
+	kde? ( qt6 )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -209,20 +209,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		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
-		)
+		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 )
@@ -231,12 +222,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	!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
@@ -312,7 +297,6 @@ PATCHES=(
 	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
 
@@ -474,9 +458,6 @@ src_configure() {
 	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
@@ -521,6 +502,7 @@ src_configure() {
 		--disable-online-update
 		--disable-openssl
 		--disable-pdfium
+		--disable-qt5
 		--with-extra-buildid="${gentoo_buildid}"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -555,11 +537,11 @@ src_configure() {
 		$(use_enable firebird firebird-sdbc)
 		$(use_enable gstreamer gstreamer-1-0)
 		$(use_enable gtk gtk3)
+		$(use_enable kde kf6)
 		$(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)
@@ -571,9 +553,6 @@ src_configure() {
 		$(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
diff --git a/app-office/merkuro/Manifest b/app-office/merkuro/Manifest
index 7e2f20adf6a1..1a4e79a91dd5 100644
--- a/app-office/merkuro/Manifest
+++ b/app-office/merkuro/Manifest
@@ -1,2 +1,3 @@
 DIST merkuro-23.08.5.tar.xz 981888 BLAKE2B 26c93d9663b11f2221c62bab467e11c5938b11c34c21074688e3ad654d9e0d203d0f01cb76d07c629a9193e1481bef873f0cee0b6643b903747369b5e71cc13a SHA512 d3ce8f149a890890548e87e06fe480798410efc137fb602e173fa96b15bcb568e58d5f7064cbdddcdc0eef309f847dae3e9f5f112bc96ce6bac4b9a98b0ea38e
 DIST merkuro-24.05.2.tar.xz 748112 BLAKE2B 6c87436d99f7a11fbccbaa75e810566e8dbd03106e179da45a9fa228fe458590bd06b9d1a2e9bd3109a37090147e8ae386fa9fc1b7612dc545d21c73ac2718b5 SHA512 1875dd0b5d55769f88cd9592c5b6b75084abf0c2afeb20a9f6d0aa64378300c64b95027fe5ca739dfcabc2ae4d679de2d3a2073d6fcb1d07f510d257589d4b5d
+DIST merkuro-24.08.0.tar.xz 765740 BLAKE2B b42adebf79695bd8fcf757af1e1ca275063e3a9e2edc0d749e2845783dc1c99304493b9fd7072c67f51ecf0d3d19cf9b8d755be342438146ace54fb697532cf6 SHA512 79da364ce5d1cba4cbe85d5e91d235af05a18951f9dac5c97002702d0817b9bde3766c426e3c6720b95d6590f6419476d06aff50526656c219376de1f2372348
diff --git a/app-office/merkuro/merkuro-24.05.2.ebuild b/app-office/merkuro/merkuro-24.05.2.ebuild
index e993c5c5531d..40b50848548d 100644
--- a/app-office/merkuro/merkuro-24.05.2.ebuild
+++ b/app-office/merkuro/merkuro-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # All of the tests involve interacting with akonadi right now (as of 22.04)
diff --git a/app-office/merkuro/merkuro-24.08.0.ebuild b/app-office/merkuro/merkuro-24.08.0.ebuild
new file mode 100644
index 000000000000..d8627dde33d2
--- /dev/null
+++ b/app-office/merkuro/merkuro-24.08.0.ebuild
@@ -0,0 +1,65 @@
+# 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.5.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/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/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/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
new file mode 100644
index 000000000000..bd47d3f09c88
--- /dev/null
+++ b/app-office/naps2/Manifest
@@ -0,0 +1,274 @@
+DIST appium.webdriver.4.4.5.nupkg 222361 BLAKE2B 966ba3d0386c19c5c5baba7c97aa749115bc36cd7fb32b5dd93f73c8067a23019cacafe6647ccb194d0237b4cea95b3e20e3607b08ef004df99fa03c2c1f7880 SHA512 29827bfed7e3744dfd50b56126ad2d00b43d63a7838b8039acef8d5af947a3b43c11a9a57f3449675ef285c2366f68c18aaeed8c3745240da8e5c8ce92999256
+DIST atksharp.3.24.24.95.nupkg 195633 BLAKE2B 370e3889eb46bbc183fbc680c928b20e29f8586eb6e2669a3f7e297958c4e264e30f04fae83bc52d109d9b7d354c4d7cd2c2df625b96653b7ba84338ff5829d0 SHA512 23252633a3271610b68b0a80d33a513880c0dd8a9bfec1de07f6c53cffaa48a0339e261469cebc3c98a46a0c09e8e42a9ce4ed05ed153bdbcc1d3676be4eea22
+DIST autofac.8.0.0.nupkg 1143635 BLAKE2B a267378ddfccc8c8b165076a92da7db6c39ce00f0866a7bc97b5d4cc84524254c12919f0f94dd137a52f0f9cd52b87b7c82fd89f94d071e698006e67d86b18d1 SHA512 7ed7400318763a8983449b63c244d3e6a9511c57baeceef12ed48d98434e33f8e047178651e4bd4e4537f8c017c998e647a5b0bfd272bd3ef762d7e1d815de73
+DIST ben.demystifier.0.4.1.nupkg 389075 BLAKE2B 66e6fcad76c347df9ea567160b0b6de4af65fd75b6b937e0fbd9b4428df13af3e039c2d52a18c086ed04cc6ba470e345a319f176dbd35f3e86ee53e99a81f92b SHA512 b7d069c5f3afdd117a2f7c5dca62eed015b1074bd0bceca6d28bbf160e91cc3974f1a9e26ef7ff6ea4ca3a63468618486a7547e5cbe94b9573779bbf1b3ebd93
+DIST cairosharp.3.24.24.95.nupkg 91899 BLAKE2B 0150623baf436137ec2a205f47b96b016fa4146639727369bca0994e0b1041c5dd62401331443b5bd8020e65877be05b9aebb0256ec6c91524e4b5702ccaa0f6 SHA512 aee6e0155a56ed7b263ece763af9aafb2af806e8aa8997dcfba4c8d1e498d021590e8630b35356b4ddb8491f884932eeeef495081a86f76b2033511d9e21a70a
+DIST castle.core.4.3.1.nupkg 898530 BLAKE2B ffe226762b38773de5d4345fa2e1730864cada0bde31b5f866d30143ace85f5d691f1ced2d82edf4e6e768e63e17fa8cde1c40bf637715b548a3d137d5159700 SHA512 0f1f7403bc737726226aad5a327dd099b9691406958430a266449b96df7aa5ff10a293a32f109cb39b9f289035cf28362fe1f18e7cf1dc936b99f2bc64c447bc
+DIST castle.core.5.0.0.nupkg 797531 BLAKE2B e24ccd29030be7d337291ea670bf6909b8a58f1fc2a3c413ca2307d948445761ea479e89ea3262196677d32b12cf49c185d90d0c9d5d07ea8330f4decf0dc027 SHA512 210328587ff705f78fa46a9e1bdc07c5a8110335122d533f604bde9382b6317677a3168cb4238a45483fc38bd3d2661738f6afaecc42d170b7ba778912cfa74e
+DIST castle.core.5.1.1.nupkg 800128 BLAKE2B 28c469b65fa9898e0dd87a416b015462db1761f11429654f613541245b213ce62f77257a63770468f8019d635bef20e50e60f620359d0e39ceafbcc7bf88214c SHA512 378a149ebfaa12d00cb35bcaee8806803df7bc75980c9e0c67f36e3e057d6af2abaead24cd8274a9595c7ac74cb9597c9d6913b1125b86e6b156a66f7a1ac2fa
+DIST commandlineparser.2.9.1.nupkg 496069 BLAKE2B e2c4b38841f83d6bc10432b8055af90369f1fe0a10105a58b51b44cd48e5d84cb0b5e4b19f444d8c81b38646a62c7c4d11cbd710e92fea68be3ebea6ab98e3f1 SHA512 4f364e45c9668c7e7cc6a922b488f3fa523033c20d7a432694f0a6af05ce528ea0481d8375e2f4f1032c6990347b4803ce9a0e48068c6fe15ec46fb1254f085d
+DIST dotnetseleniumextras.pageobjects.3.11.0.nupkg 43197 BLAKE2B 4bdce71dd730951098ba2b407317ed897aeae5f0c97fd5cba384386cc8c368e1c22a81fe28caead508d240c01f14d760afed3c14845fee0f91bde8a9fd488605 SHA512 0bb3aeae66e1a69d369125e45a0fc4e644e16ab8284226600998b4e77aff5f48f0024ef05e5203e949461d106bff9f8d36fa2374ac07802bf5330d2253b8aa5a
+DIST embedio.3.5.2.nupkg 280651 BLAKE2B 36b77c4d822441d73499f5e5f1895c4761878221a8e5217caa367c5bb914838e9b944f0c73b50de7bdd3f45cbc845c4dae8f3acba1e8fc79ae2b71913970f1ad SHA512 1a39a574988f254ee0fc463af26e2d2b651b6d1d3133d94bece66e3bcf1d7135456124b84dee406f205ee7c3a3212d5352e2814d4b5564faa8c801a912b878d8
+DIST eto.forms.2.8.3.nupkg 1063501 BLAKE2B 079aa3b1d2e0a2b90a553900bbabeb99edd9ba8d219b0d01a15a1b22cadef26c32e7e1e1597a3ae884b2c0dd6c8d7f544d47bfbca0b89b59aa8b8405026dd887 SHA512 ec612bd926c30516af962bbe0524ca61c962214b7c14ae2ce7b2d94f4fc160e6dec4e2e225c75229be11f1e297a33861375a5de041a53b85d7664bb1b39627fd
+DIST eto.platform.gtk.2.8.3.nupkg 418338 BLAKE2B 035934ea8a6cd0330850bf40754e8e2c13a756bed74da668be58a330d55374ce9aaf345f3093c3d04a1fd92242c21973884397050c43fa91e9aed6a9a40b6432 SHA512 b059e6e301ec4a8fd4d198de9643a4c186134d12983a4562b02032ccb993ed0ebb5369f4652c757ec9de199a2a9b0e10b15c721ea78914008e144789d63a71a4
+DIST eto.platform.windows.2.8.3.nupkg 546416 BLAKE2B 218e7ddd82816b101558f975ef981685ba863dd6a9c821b6b63709e9e79fbaa01c76b39c999412bf7b04b74ae3dd19ea38d9cf08d2d465b4667404c236ac9aab SHA512 8c74b26b82c8533916816b5ea251fb7f2cf323b1a80d39220c7139d83e9b0e0e28210d89bbc5c5c6bcc7af6b7378f068fb12e3a6b57eb0f7af5262b3c489599b
+DIST gdksharp.3.24.24.95.nupkg 373523 BLAKE2B acc54f1da5abde304be26ac3beffdd445dc9201879506f2e4d01d6e622dd73c46a5f31b3abaf09ef668a0886775e49ca3bb58e730dd4a20e5bf1a01f23c6a08f SHA512 c0ee9c1b39faaebd244d0bd2cd717f892f790603d46eb443bf708eb4babe3be065e7d14c7276c742710c6e51b1418c7f7f6050def3852aaac1c66061850d7207
+DIST giosharp.3.24.24.95.nupkg 518698 BLAKE2B d66d48e5befd690740ed442838b72630cdfeecccfe2bebc139d28ddbba232f6097d0a8df551818e595c8ab18b63828b271a627ce2f5567c21345662e345fefa5 SHA512 678d396bf6ecea17242b9fdf0a1736a8dc10004f9f5f137c78036a9da2e9f3386025180e776540a88b2c935da3d7ba0c158434117c5202b8167d2d2b184c0109
+DIST glibsharp.3.24.24.95.nupkg 192457 BLAKE2B 79ef8ea12478f147d0a39781c4bf2c012adf7545ec987706542c27de3a3c01882c6c1674216ed6e94616d0bf3cada27ca33eb2e620f559605d1a4d6c7a528a8c SHA512 988b7f7292fde9c86d38ba87fd707c7f47384235b478509adf4ad214a6278d32ceab8be4ed7f92216e63ff123a5ad481e258e936e5ebbef016fb93822a841ace
+DIST google.protobuf.3.25.1.nupkg 1350971 BLAKE2B 452e6a7b828b849a69a3a7908d96ec1e23941b1d10281e221554109200d731e72b86a05e70ed8cd53a69ef77566e708e09ecdf0e2c47c0d77ccb4385a93202d1 SHA512 5c2fc9f163aa982c8d8ba30b42c4afd6f42d343118bc7fd912a0171cbfc4df3ef07470aac37526c79fb528fd6be08dcb5bf35802dddeee29b2c80efaa3fd5a85
+DIST grpc.core.api.2.59.0.nupkg 252357 BLAKE2B 851aabbcabcc75dfedc16770b0537370606d3470d1686b4d8e9ab4bcadfaa2f28c6ba0afa713ad00415baaa8a2f090d5ff15d7a2315b08cdabab5c46650d9240 SHA512 907036337081ff8ec3f9ff3894e03d5791afeed81bc68dff417fe0bfdf123b670b97a86f34f2ce34d734c84cac71d1fcc75e1ed25af131a694b98a37c04eccb3
+DIST grpc.tools.2.65.0.nupkg 19912453 BLAKE2B 7fe9b26d0a3735037c9f13740df4db75fee547824ce9cc1a69302daee9107b31c9b4395f6385a533c0c77e5084e25ca011a9356b5cc62d360dcaf84b8e45663f SHA512 fe409612ee0aa20252d7fc53f3fb26f787e9b83697a647de5c9d1c1e1b4a5f7bbb1e3024ada46808d091622cd55f83598b64d621d5d3157c21102efe876f867b
+DIST grpcdotnetnamedpipes.3.0.0.nupkg 122293 BLAKE2B 0528fe3bf8e3f6878a9a5bda2414d89b91c01af25eae101cefea991e34806ad265dbf8dbe71abd17fcabf38302cc7b57e21b2ae4a8629d672480d4b149126c10 SHA512 9fc154952be07a4ce69d920589cdeea59adbfc8d1753cbd3210d285d247e336f528c7dcd56d749c0d3c4a81d4c9ed90d0812b27558964a5c0e98c87ce6c08053
+DIST gtksharp.3.24.24.95.nupkg 1621790 BLAKE2B ede94b76a9c0d5fcedf300cec494a4972009b1060a8206e2ecbc752d53147ef8876c1d0510aa54399871ab005227948ddc3301291ff17b7e620e834a20190d27 SHA512 fc5ba4f0f38e68838fcd27350ea16451a6d6128b94bd3d8c639b4b8c81e3d14c4cf10be08056ebbf609accb3c7eacd3e9c342c1c63404954a71ba3587475d955
+DIST isexternalinit.1.0.3.nupkg 30699 BLAKE2B 4e5e564b5fba51cd09f32fc61e5067e630c950dd039867bf1449301dd4ac3fdb72dc20a49b328cc4266b10e627d1d65ac067ca3781b77c9b1ed40100b94eeddf SHA512 8c03070b842f5d1aa5fdf9904326cf73480b2974c008af697cbc37b0d0756392d96a90a102b2a15cca3ce2c324865e957c281c6e29ea07f2435344b8110fd0d7
+DIST largeaddressaware.1.0.6.nupkg 20266 BLAKE2B b17547ac5eded95eb699f926527f7f4cb9174c5778e9d6edb05a188af76ab6ca5dc2449996140785d327e2f558a2c86b12ea2dba281e3f0146221f4aff093798 SHA512 17b6862d03f3c1161ab12b08783adffc9dfe551ffd6831793ea6f9f9935ee4b06741fc2f251b59150e93f62ca2bb1ef8793a8225373a680d8ac8d6d1c5ce5d8f
+DIST libusbdotnet.3.0.102-alpha.nupkg 374317 BLAKE2B 5f92429c7ad47d7318f2b032110d986a5e12101bde869e53f31934060219ae3c5fb98b4e37cb1415c6b192c0c1c886bd064a4c5ff962405f726a9b20dce8778d SHA512 e31e89f4c381101d844d5e036559aebb3c95f2eb8a749b76084c1887fc086feea77e9d61e5f7582c85d85a5566e8aa10aed9efaaa67a8c1383b353f06a4b9be7
+DIST makaretu.dns.2.0.1.nupkg 349545 BLAKE2B 0917ee0082b9c7972a25faeb4176886a5513d3262d652fea7ffead33bae8a7aa0fbeeed3f3e1d2525a66b4c657c743dafc3112eb5d80feed37aaedcccc700daa SHA512 6a69a941d3b530f664f8f0c6f1495f5a0329495a1fec220beb9c5028ec8677f77d35b2905ebabd633ff89f7c1aae5aa7b5ed508df51132b28acac0b85ac900f1
+DIST microsoft-windowsapicodepack-core.1.1.4.nupkg 373166 BLAKE2B e0fb501f1fb8eca899630101cecc739f6c58a4f915a3217386a5ceadfd53867c1bc20fa1ea6c40ce1e087c538fa3f95aa54763d956d7967af496d53ea6dce9c4 SHA512 772af700d92dc20730ddcf8cad6a5156041e9e484293f100afe779c54966db80e31022360ae3c2e24e13c253f7c820d3b80620d7de5e88c007b4338f236dca61
+DIST microsoft-windowsapicodepack-shell.1.1.4.nupkg 2011089 BLAKE2B 8e0adaf5caaed7e7d80a1325aa1a15f82b369ee9d21dd306681229cf08356f122a2c0e5b3b50465c96bd8b14f04a8654aa11d21b255b9c00c07f06f4018c403d SHA512 d6ac84508dfa656aa852218f1a60219ef6519edcddba2ea22b9c39db85692a6dafe292c4fa6c6a6fb66c9d5e17ced292cfa5527dcd8b5c911ef45691e3d94f9f
+DIST microsoft.bcl.asyncinterfaces.6.0.0.nupkg 76354 BLAKE2B aca3f5db71e4037dbdd604aeaebcd0962ccc171915b77b4c409ab744bf0a469c7d588f9504fc7fa49e3863e9593b66b4083235cb49e812d1f87b3dadb32e6003 SHA512 221a05a0c910f7a87b620d8f3831ed392b4eb95d112bee274d35f27009ad2a26445de9d7cd235fe6fb4a03f2550874bda3be3dddd96edaf9c0852a9c23d7b099
+DIST microsoft.bcl.asyncinterfaces.7.0.0.nupkg 95839 BLAKE2B 057f789af840dcb18f3e2a823f8e16725fdecf93986a469544876d66854e541fcbda2031f8379fc22489d5a8a1fd9f766285b99cae88b7ef8412cb4befb0fabe SHA512 35bf41d65c4269bd0b662d228cd2c4a70e21830b745a5f1040cd43c488494b6a2d0a102d21531fc86ad89776337528eca6f0583e588996bd240ad8b334055edf
+DIST microsoft.bcl.asyncinterfaces.8.0.0.nupkg 99740 BLAKE2B 010d05e4adb8b42dd2e4464063b4601750ee30e377a1aec3e1f9b833d4c599b3e3e01832779fd52a56c77572175df2f8bc3d08c134d99f62f58767a588b8ad13 SHA512 79cb0773d94465924cee4e471d90353d5d8df842c46ab2c572cb15d9b9fb5d0209a1a88d64392995335c5fe54a00d7c3194440b84c95142711bbb685cb5e9552
+DIST microsoft.codecoverage.17.10.0.nupkg 8906478 BLAKE2B 73d760059dd1b7b96856021aec53b0d65692710d80bd4f1b0f77754c3cc6f143978af25b37d26d994e5562254afe51c85ef377a6637b47319474ae5c674f3945 SHA512 479dd9d459c4a7b62a20943afd29e982800cf61e21220bb2d1acda4ccad7239e613450ade8819b6b06fb8f3f33fb51decb27ce68dcf3bc5b61fb70d7e480a25a
+DIST microsoft.extensions.configuration.2.1.0.nupkg 41890 BLAKE2B 6e896951a480c6c4bfb747f0ec1e01d0148c238625783e3768f73c075eaa530671906dae731cbc549e057c553145c1ae6e2641c0cbdea8b1442effb5c34ff687 SHA512 e679d962f1095ccd23342a08eda61b8d553708a372e98c74f562cc49a6b9661c1a621f76ffbbb382a9fc63def0416da33977aee20a9c4b81713dafe4330562c5
+DIST microsoft.extensions.configuration.abstractions.2.1.0.nupkg 37949 BLAKE2B c451025174f3260c829623a421d316c0057674fb953d9ee27b509dabcccb2f2cc149cd7338c471f229708218532c363e682e10d3a729458e6516bbbf5b50eb0b SHA512 dda4cb8d0d6dfb9875e4c4aab75073cf0cd53bc8f5dff351785c27febf279b0441070d94efc6f63a7d63dbb2fa4bb1b74329cf6fdd08b6cbeeb74108a1935f77
+DIST microsoft.extensions.configuration.abstractions.8.0.0.nupkg 149230 BLAKE2B e3d49a61ded7a88e0ffeccf5901f1fb021d66ef9914a5e5e7e43e69a193253f1009a55cfb2199579e017dc547050b77f7e777f5fe944dde609def9f66be3217c SHA512 3316170910a94290c8df4fed26fa884a47dd9bf974eb7ad22368d5a63308660a01d2dab4a44662061dacaeccf4ba09cdabfccd4636f76ab3178becec5ad31a2f
+DIST microsoft.extensions.configuration.binder.2.1.0.nupkg 36217 BLAKE2B 9c295fb11edb9bfa57b3ea544fdb1e0dc41e91efc1d86533497f17155ed3f17e9661af93c4affdae6a042fa9ad5c92369bd1f1ebc1db236af0c1572f00756ab2 SHA512 93d74744a7e65e37874c099a7f240f07d2c5a106ef7cb703ee6fce009dd1d4b6881390bddadd76b4e914d89a6ba799f523c3737b48daf73901358c4bc9dc4f44
+DIST microsoft.extensions.dependencyinjection.8.0.0.nupkg 341717 BLAKE2B 4c6e981247ce8ca11783d442e658f69edfc307020adacdb58c28ad93e7d75b7d4b89001cc34787041e44eb6efd2310e4bc8ae25f31d5a2688f4d363f9756d9dc SHA512 96391af4ae0542f4ae96c8009c9ffbf304acadf476cda262a8ea73e33b172529541044186c59d656377bb2de42c9f5925e0632a81f6e7516f2a646e8916f16ec
+DIST microsoft.extensions.dependencyinjection.abstractions.2.1.0.nupkg 47277 BLAKE2B ccca23dbcc6a259f1a04d83f0896a626afbf9c0acfa5dd5e46dd9bd9027d99d5813d5f1e82450cf3d631eb3fbd05bd397883a4748d765d7797eb1e69f5b0358f SHA512 903b3f4a780175f65946f6f1bb6e2c56a7b6d8f4a30ad2f1ed3d5839e271b34ec69ef6fdac2356c04fe48ee6d1a52e4dd805eedb273137f9fa8de405e3cbe993
+DIST microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg 276886 BLAKE2B af87cb01e181a5f75df78f59639d4b7dae4fc0b930c7ace4a3ed506c43a98edd447f7359ae964aea1824cfce9213b8f225fd67e9240205a1630d67cd0a274415 SHA512 94bc05ed29755109565d9cdfc901087ee1fa08302dda393106bc9a0bd7384f0dc2b6c2f123c1bd53fce06babdbfa845dc6d22a163c4b0646c5251dcc5aeac282
+DIST microsoft.extensions.dependencyinjection.abstractions.8.0.1.nupkg 276691 BLAKE2B 60d1edbfed31aa8198a6e07e1d66e228357c2df2955b74250b4fe0c9124728fbe342b9d0b64c7e053e37ac018f5439082e1c925aeed309da050ad0fd490b06b0 SHA512 8118da9932da382b1c22379f9169bea93cabcf17f5d56c1b6616fae23b1bf14b4a38539b7f8417f63f161b14021f2634df9e4f9fa62f5fc84667018a1d92c967
+DIST microsoft.extensions.logging.2.1.0.nupkg 42532 BLAKE2B bcb24f67b4d5c009de50d139197c797f9f2a0f6f4e64694d344a223ad410f017eac9ed5f9cd92ebab1faff0fc11f6aea98be5aeaa388e0b0e056f18bb09e18d7 SHA512 c071cbace76159083b0297857fadeeda09bea91c57610e91a0ef913d1a14f7a6902d2da8c7af554a6412969202b326e961014ddaba950e2a1546513cc4d6c2cb
+DIST microsoft.extensions.logging.8.0.0.nupkg 232520 BLAKE2B 79e950dbc495ab3078fe05219ac5afd79051fb841ccc47c919958ffdc94b1077eacd6038a8cb70cb27404295161c75fdd7e19dcaa006bc0f237781c3e4a434d7 SHA512 aa30576c428dff69bac5f5d71721af6c4ef583bc524edbd0a94b49cbd80f698905021260e1a432c32e6d48ce5a30f6822c209f11dcf7c819aba1fa8347925b06
+DIST microsoft.extensions.logging.abstractions.2.1.0.nupkg 51586 BLAKE2B 34be56137e5ffaf61c07ef69106f9959055edeca7758169163bb201e987371a45eca464eaeb8af1f99b43247a4897751981448e610e6b38793502411b51dfc8d SHA512 1db2ddd12b15350ec0881e05bec8f2e23b965ea00b8584858a1d4a2d5b9cdc9a837bb3a03843d7e2fc7e1bf8e1be5f9efb36adfec052ef28d69ad950ffaaf308
+DIST microsoft.extensions.logging.abstractions.8.0.0.nupkg 795935 BLAKE2B c27db06351766972dd55b3ebf927ba7594aefaa0239fd00e0a8ea9ba6b8acc3c1e040512cd07a9849af5ed066c69450d1ab4d7fc231103db2981d2264f515dcf SHA512 50a0add96d30d90580fb8e02a25cea0aa15f4d22744279b5acfe18cc8568b74402aa062d5db13cc5887a08bfd24e07cbc88b2fc10ee8eec2c37edf3bcda7f8a7
+DIST microsoft.extensions.logging.abstractions.8.0.1.nupkg 800001 BLAKE2B 1064221148535eae51278549a244a50ca303d9e1a841a29bf3c47b388af3bb1dec81328f09249c3049e76e941e595d0d6f54a79cc66c232b0afad2891ddef91d SHA512 c8e0fdb230e0133f2e3e2f84f300258f4348fc34af23ce597cf12446e0e91711cb4d4d0fef3333de3ac23a49e006a9eef36baf95d2b5b7449c3d755a6d55c045
+DIST microsoft.extensions.options.2.1.0.nupkg 47781 BLAKE2B 7a88a2f803d687031f2a773e3e8f824102ae528822794e05634ea20e7f5a9a4a20030d2063a611451ec2582bce22e9bbe4e4a42f2eb8d74c6d1f967d3d672579 SHA512 adb7476a9ea879c36e4ce95c13392d86ecfe3aa195a45ea1cea8b3ea399be819001062bad9b9e4bc26e8ba7d0a5ac121f2c6ea2a0c56e041abe0b3b69b4e1047
+DIST microsoft.extensions.options.8.0.0.nupkg 492963 BLAKE2B 7724b16d3cbcf0149a9a5a194254ca12103c9162b71f0e07994aeb22ba23a6f3119030d720f79b43dc1d96011ae3156dd003778aaadec4bcbc7526d46095f25b SHA512 1c004082a132e7b75a0c95acef3578a4d5db42c55e0996e40b95b663e9a83c5a20ed481a85db7567fff7e3de3dbba6a7d4fe5c825dc7ce95de956689afa16c5a
+DIST microsoft.extensions.primitives.2.1.0.nupkg 46654 BLAKE2B 14cb196d80185bbe46b2334d14cc561c55a961e2b2003e28724447c8ec1889b117f50bb10257b51579c054e7c0460d425d154d0aa936ccc9c735a7a592720bfd SHA512 df29b677828345836defbc9b04f763af85a85524fd502ef150cfd7c6bf2248a0fd6a3e40f866e68da42b5343b2d9f11131f2c5f1d626d302c9a0d4aae65b7994
+DIST microsoft.extensions.primitives.8.0.0.nupkg 209772 BLAKE2B 46a3392933c0b901d1c535d534f0f9501b63659fee1f83bed47e48b49aa0162da5af1b3190af401d709fa0d4b8bcde3f17f7e4e28f0141328a1a7446e4f81b45 SHA512 1f5475ca3d3ce18463456dd135afac502d6f82fea6e4e4814a61f86616c348decf28b73d15c2bb276d1a3c039ea6064f75e1329f6f3a64caa3520d70ab92c32d
+DIST microsoft.net.test.sdk.17.10.0.nupkg 34302 BLAKE2B 24d0b42d462d7dcb43472307cb5863df86a0ca4dea0d3d0bd182a917d467951b261d9ec1cf5ec944762fcc9afc503aebcd1b592d0dc74cd31c0d02aac5f9ff8e SHA512 63933dce26e5e3e7d59133f4b4eef9b28ab618f6186bc69d46ae3c2af6078c840b80d9000530ae8bff2245852e79b8a05e1914a123fb2c7d35ea99d190d10d70
+DIST microsoft.netcore.app.2.1.30.nupkg 3502115 BLAKE2B 96ed13892e156d45b30be59ee618e18d4c997021815ceae0cfc6722c6a1cfd280e0bcc24eaa15aeb32c03ed34c1dcac350a86cbd45f891acabe5d3bc57ccfc7f SHA512 ae35df05e5d964e8b17932178bc17e1e47d749ffa26ae4d0834c0ef8265bcea0ce9b95cf7ac7361b2a58434a2d14e05b7db14fe1ac19ad9c0d6bad0b69856f61
+DIST microsoft.netcore.dotnetapphost.2.1.30.nupkg 28131 BLAKE2B b80eb44298b9ed2bdb116ddc323f172f98f0b5416475a0395d8bba948ed88e2d6de26e2c9f6ba848b0ebd435304e7512042279fd0c1dbb7805167a8c8a98c2d0 SHA512 51e3847a001e2aff1dd2b3a1458cee6f268549372b57745e1d1ae7a5cc18567a912dbc42aac98682fc399942b58924a4e5db933cfa7739f23ee3e121154210d0
+DIST microsoft.netcore.dotnethostpolicy.2.1.30.nupkg 28205 BLAKE2B a0353e41e19edb00ef0a52ae6b9333b104df51c62e3b788b93ec2f8cd59138c9f2b7371976f18f3cdfde86c5208f02f054d56458dffc29e5ef9dfa4c537ad048 SHA512 a75cdcee96e4ec30c8ec6dac58f2a022d1e151603a67e45e691852cfdeb300dd77b95de693e6ea6b73b0de1c2c7f75f9cf3a20a813814cd43d80b780184d6a7a
+DIST microsoft.netcore.dotnethostresolver.2.1.30.nupkg 28169 BLAKE2B 49e1f45f45469027e4f625ecee2c44180a9b055fa76474cdee7c467725f039ea11799cbdd82f88d295ad839f2acaa2b49c9422c4324a6b8b3a06a260d01fea96 SHA512 0790c547a5533ba17ccd7a0df6628490a19e4e5b30bf59564466a3b801a01380b082049038905a98cb4d1e5d0ad26f4ae43465c3da475ea01c7236bcab208aca
+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.1.14.nupkg 32810 BLAKE2B d01769448242572f0c1e81ae5bf35e99af9e14173a95123cba4a9e49e2301c8f906be952b43bdf7589c95bd24b20f9615a57e7947f49b61d9cdf56fcea388a84 SHA512 95d46d27d949ded9d87c1e875a217d90a3bb3fb2adcf284b313d8136d1adba7050fb7f191bd7b7e737263beb026761e2af7371ed88b1189ccf3626487cde62e3
+DIST microsoft.netcore.platforms.3.1.4.nupkg 31283 BLAKE2B 853a4d6aa555162a1be6443a1c2566f6e60509515093bb6814a0adb09d0ff05c6344686bbc6f4b9c048ab9f8ef7b5bcec0c80aab0f9aeb7aea9403493e365845 SHA512 29c32148d429ad057255097728322ce0f12d7ba4746914304dd8d2ee11d9fd7fa3dc14806e582bb44a8396867b9b08c0a4be28e4837c71d71ccf7868b302d869
+DIST microsoft.netcore.targets.1.1.0.nupkg 18162 BLAKE2B 419d19e0da934ab4b9db75dd66cc22b83a003f34e93cf7a92feccf4f32d3d695e18b826b1aba13073dd4ec53aa7905a67346921d1055516647ddcde0d79009f1 SHA512 1ef033a68688aab9997ec1c0378acb1638b4afb618e533fcaf749d93389737ba94f4a0a94481becdf701c7e988ae2fe390136a8eae225887ee60db45063490fe
+DIST microsoft.netcore.targets.2.0.0.nupkg 17248 BLAKE2B 585c0118a020076a3a18089faed9c67c4d666dca3177ba7e532d43eec07a16192656569bc48a45f8b3e5f72e9dece498aceee664fe060edc32dec4a5cb4b1cc9 SHA512 9899c232805f58bd25c71941149ffc7192937cfa48f364de919914aaf48206dba751a6aaaf62d5796975cd061d6a701d9380dd7f51c2c1bf3e0cd61a345064d7
+DIST microsoft.netframework.referenceassemblies.1.0.3.nupkg 20961 BLAKE2B 8632244fc71708fbb2a56331c8642a12782baeebda676b1b8d3ada50788e0725a7572cf0ed1c296c4cad3fb8bdd669871c90f963b9c8da6eff796fd30ba768e2 SHA512 e3b8317b290696a380a32abdd9e75e71ddae68049769beb895024c34089f41262aeddf53e30984330b1293f013e34d854a83223ae1e2afe417186795da8dc148
+DIST microsoft.netframework.referenceassemblies.net462.1.0.3.nupkg 19902484 BLAKE2B f4380ca1d96ecfd7a05ba260d69d240bd656e07ed57f38f5c774246ee256ebff1a489a198afdc55a6359e54af8d3f211dfab4302a3d3a8c4800c0e191f4dae51 SHA512 1cc9f441098f61c26c56e29eb7d580f0841b070799bdced44bcf0ddfd8ad491a9c9ffd57393fca6a8d508a2ca4c54fafc7c93bff38a6d7571598ab6e9e3bb830
+DIST microsoft.testplatform.objectmodel.17.10.0.nupkg 1654989 BLAKE2B 86644813b79206d2c660a15ce5be29b1684a4dd335f8e6b5913251a0a8a8f61b52c528fe0f1895951b529014b1344df59ab9555ade3aec7d2bc52d9c59b93012 SHA512 3b7f8038f6cd77389b1923f1b19936aeaaa8226e784228686ece42b16c4f77fb23b523bb7acfb085c32ed8492b0880c798a1ba980e20c9ed23ceffcca35359dd
+DIST microsoft.testplatform.testhost.17.10.0.nupkg 2879677 BLAKE2B 5828346a430b8e9e2ce8a4669c3132316b2ad38c1ba623ca892eea27de510be75a0e6aca41717e19d41e0b53d64b43ef677f4341e000e2d5696187cbf7040cbf SHA512 b400651bdb20d38fff63c381328801363df1b8ff9f26e3564bbe39c37251818beb96f0c2c19b4ff7586383fa84ffb05fc3cd755859b755380cd2a2e4fb04da53
+DIST microsoft.win32.primitives.4.3.0.nupkg 63333 BLAKE2B 132ec29940d4b716110980c4f9a06ba15183d29de638379d09998124605165e51652b2727e3892b57dbc7cacfdc71f9e1b59c9dd5463a524657351f5385d896d SHA512 366f07a79d72f6d61c2b7c43eaa938dd68dfb6b83599d1f6e02089b136fa82bec74b6d54d6e03e08a3c612d51c5596e3535cbc2b29f39b97a827b3e7c79826f0
+DIST microsoft.win32.systemevents.4.7.0.nupkg 148460 BLAKE2B 07615e6811f9fbfb65b22f70e266ac3af25117bf0e57803c1e19f452ceb71b5feed2d6bd78caae7b0dd87e2a752442ff25e639fbc02831d3c02f6377a1c2913a SHA512 3dc95211fd597cbeb7b8498e79d58c8dc373767d129252f1858f223fe9228bef56c4dd48e613694581fd197e8c1ec428ec8788a451b9c248e2073c7603c994d4
+DIST microsoft.win32.systemevents.8.0.0.nupkg 233719 BLAKE2B 7d8cad3d5cad9646167ac7b6c9784e080bbc3033fa010d6ebf795d8c38aa1e8e6c75a612c769137a19dfcbc14c88b4d00e3ce50eff4070ee011ef7f2a9c8ffb4 SHA512 25016c508653fbf463c52d8fc3d2773b7c211c2402c4ea7b4aa987fb29c851d3f80c5e7abbcace2d4d5e061ae290524e8029afbc49a37d7e5186fe06aa4609b2
+DIST microsoft.windowsdesktop.app.ref.6.0.32.nupkg 3854138 BLAKE2B b36cf8f3165db48106bb68447e39c8dd86eae2fc1be0a448ace8ecae77d30a74e3113f08b9115b1116201d71e883ebe9b1b43ca8ffab990d8ab9576140744477 SHA512 0a569b52b1d2ba44e4414988ec03ec0fa4e9fb047d891e3eaf9f69a03d89460b03da410be8fd7f17444f5015bfb284cf19cb2bbf9ffb081b95ce3bb3ba362507
+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.1.tar.gz 41099136 BLAKE2B d64c2a910b5bc0e4c8182ba5e2face0973ff710fdd04b65477ec47be55cfd0570a9c198ca9d79d72fd8b657bd2ad18564e01654d773b91de5b3a3be73257553a SHA512 29f22ae88b349a765d2a96c02cc2891dfbc9b6bd14a6a2721236e620ae8376a2df9eda6088ff81cb9d274f48125988e52461f914f107b8d20a51aaf246c97d4a
+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
+DIST naps2.pdfsharp.1.0.1.nupkg 668676 BLAKE2B d060b00b9c4fb6be89bfc69b9be2a3b640c928c6e7e712a44b4a38a6fd6bd6c4ad990f737ad1f57ad8f6b96d7cecd5020e51fc52b8acb4b1400c88558bee4817 SHA512 30b5ad84214860c5260a483944c2d72dec40abd7620679e9143f747948f4b5d5247ad505b5025628eabc8420b375aa805e645091407fb09d3fd3a88ef4450f60
+DIST naps2.sane.binaries.1.1.0.nupkg 10280612 BLAKE2B 9787f72851ac8e0e32190065ef12bae7940fdc1c5ec6313c0938a8bdbfa2cf4ff40a39da46a4afe17d955aa0e0b56a5a9c6f6b4a43d1b692b8a48643499c7648 SHA512 e6802adec2cc2f3939ba7bb5f725b08bba8c123d29603183761c67fdbb98008f318760b2177adb832222675c1c8b1c6310d45bfe2751f3238194909f42ab9e38
+DIST naps2.tesseract.binaries.1.2.0.nupkg 12374829 BLAKE2B 1018b72c517cabc2e56941860c305b30b3c9ae3f8ca2b128961954078c290fe6afb10b6e75797174891140118300b9ce5f1a9536dffe8e3068c033d1764aa8e3 SHA512 3c1f8bced2878eecb1a18268829fa98b3a31ef808357eb50d00533345f4c4ae8e770e0bc62104661cf0429bcbc736c280883a58ada73e350f1df2dde0859f376
+DIST naps2.wia.2.0.3.nupkg 81720 BLAKE2B 19658f6ecfd47a21d88955c89968e111f06504246790f779078f47f9d4d947d692df19713e6422b7fcb75608d4ee999872f78729fd80ae58d9b9e612a8f2d0ae SHA512 0eede4a6c57e76c87fd44aa56aca8181e39ea3f2bce782027ae6161781deb7b7c9b060966a31a6d22202fc75648f744e1fa0aefa27a8550fc13d04454a9b0743
+DIST netstandard.library.1.6.1.nupkg 17360 BLAKE2B 02badd3473451f83997f0b66d05f1541c741e65b9127b8b27ab391260df7939f235eb6648b11c7c11cc5400489ddf1cd26820b7bdf6fd9f1d8f0dfdfeef96acc SHA512 0972dc2dbb4925e896f62bce2e59d4e48639320ee38ad3016dcd485fbd6936a0ed08073ad5eef2a612dff05dfc390f3930fff9e79d87a06070eeb8128277cbd0
+DIST netstandard.library.2.0.3.nupkg 3146139 BLAKE2B 311e5367398f76c74e78930bc2cd39e450a86bd8626311ded8d58bd84c94a8a84db3c11b2bc10f3eeba20a9d081fe7827981f702ad746b49ae3108c949ba1022 SHA512 e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601
+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 nlog.5.3.2.nupkg 2946037 BLAKE2B 8ac431bc9e733422547dcfa8a5d15b012dac687ea316b27b6311af0e83076379186fd9ead3fa58b9d73b72e84c797232b8c4b1f0b5a5936b3a6168afd2732382 SHA512 4b189d27b9b082d079683e5cca45ddb442eedb280b8e042186df202d14d088edaf0e827a78a5cf4dc0e9b2e1a845bdc1a5b84a517ad059aafa3973719da354c1
+DIST nlog.extensions.logging.5.3.11.nupkg 252211 BLAKE2B d4ea487d2be4f447ffa8901f60bd16bec010130d29b5b8318a1f849a27326a11f8031871334584201c6b59aa234ec43b939f92fd419daffec3e725a37817d431 SHA512 3baa056db3992726ba81fe2483ce1197310fd6de26cc8aa231822eacd3784f6b285e3bf414eace8c4b56d79d5ecfa7877e636134c7c08d75d2cd91e4f1a5350b
+DIST nsubstitute.5.0.0.nupkg 239856 BLAKE2B 979a1ac47f1fab572ea37b685846c30b39457bdfaf17c1d6f298d904fc414be9bb5302d36019023af88900628e88fb53f931a502077529f0e6af0556b3a206ec SHA512 353ef07b54279d6e907bf8ad60c63ec6d399c420b759a2d884c77714f9bdb33a0133b25ee2a2637d91f45ffa2b43f737f0351f2e3a54d7f56c4c3461896b77cc
+DIST nsubstitute.5.1.0.nupkg 241386 BLAKE2B 850d5cc0f57141082d1cc0300694653fef34f34d7ac7c94b9a8427f6795cc3be64edc096db615762347e8958dd0c3114475f9f3a241fa8aa33e1c55b411d8141 SHA512 a0ded6cdf22cbf89d2cbe1e78bc70a4d31cb9ce55b4da159c8fd81e5bc6edfb71cce8580a5578e5479f116fbaab54ca5bab1966eb1bbcd50ef412e62e22ff2fd
+DIST pangosharp.3.24.24.95.nupkg 145886 BLAKE2B 00c7545366cdd3dc8386ae9b558f719008b831811cfab2f580ea9998b32d9fd42efce58715c9f72d954b6b59f1cd4d9f67acf666ec461ed3f7c52af3b650e5db SHA512 37d65c204410485be4f144d7115af80402effca833b37b3d7b6f58e2d3f20d6f232c6299409da748b4ef9aff63dfc2dfaaeb3a5b6b02181edf4e5017ace22d68
+DIST pdfavalidator.2.1.109.nupkg 53170047 BLAKE2B 4e4a38a914bd1ce7d8526fa5983b15afa687d08a11af52b2c858cfb85b4ee9372344ab902b7e803253863afe776928ce02bc8dcfbe0aab19e2670a6a7d464a5c SHA512 669d097e7bfb685cb144267c3dbd40b37d6851c844a705fef862f30328d7facc49f7999b0cdf7431af882b66e82c32fd3af89c40171542f45bada2ba6c5919ee
+DIST polyfill.4.9.0.nupkg 146125 BLAKE2B f56e4d73395f1cde6715d8f1e58ff6e93ee12e152904694c25630a7b7250529120e1086b69f0f4280c26418c4ff4a5eae31d0aee08d8167eb99719d92a0337ba SHA512 b2d2be6703b7f46fb6f8ea040a4b078809b750b7c5740afdd73c09941b0cd8ecc12f9bb60631e7cd2371743149fc506b8dc4b1359fa618df8621fb21c548bf5b
+DIST richardszalay.mockhttp.7.0.0.nupkg 159481 BLAKE2B 1d71642c06d3516709a02a56aa92e6f1884b115e834c04f9f1a3200abe2c9403e9cbe924ea5900709f40075aac9d2c9b057918013e67fd4c0e9556f260762804 SHA512 77358c148de08a8c45a0dc3800e990cfc862c7038a13faf70769733fe4c564f8896da0119246c6747dea68ab2e6d14346242828ba42acc95f630956f7dee41fd
+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.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 44424 BLAKE2B 03ee263658048f24116b9f1ba16441bc197c8868113a457aec34ef84574ae3e73557bc6b144fa1f53135ffc201cd23fc86f8d76032e77576f2a69ee7ad4320f0 SHA512 8f071552ee042f0cba39b1ba0a1205cf73de447d662995bae68f857a5946f7d154c029a79e37469081675687873c8bf2b9efe57f5cbd660c366b1ca51823f7f2
+DIST runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42827 BLAKE2B d2b79a9b83e0bdf569a5c333ba4f86ccb1d5b532d2e1cff3ba7bb597688ac78268a515be4c35a025c66727070100634a4bc946e02ae7b93061be968fab241bed SHA512 fd8e32d7d3e9a465202e391b0ab8b95e212900879bc4d8ac22954fd2d0f98fa579e9d25f88885ac2a4bf1eba755db940f8d131250a3ffec34dbe77431a379cab
+DIST runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 42852 BLAKE2B 9c98b0726b226f275e29eefc0058f5f5616f9e2786596d5aa213421366e93f7c790583090ef719249ea3aef835b8724275667556fac3bb9935a46769d0e1bf2b SHA512 a135ca0f4f5a49319b5a52b7f4338f8a5fc4387edf26f29e6cbf63a3c3a37b2b5c51c9caf562ec41e470fba281060362465bc56915be782d6c75778aa6195e46
+DIST runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42833 BLAKE2B be9197f3008b3dda19a45e5b5df2ce3604f58a98045a122aa77f082708de67ad953fba761c39ec419e945155ad74d5800638feb581e5d84424ba104f32541640 SHA512 4afac5cc1734330a6103880e790d639e825bfb1b34dbd42083762c47db5e5dab6c03efd16049ac03861d7d87746caed09c7534241d51b7341d47ba6af7e8dd31
+DIST runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 42843 BLAKE2B 22e270cc59cf6a4bbc857569499baab7ace2596db57cba867111bb46a609e1c98461e7710f964ea9a5886a9b416b6ac271e2b045ef470ed644d757135162853f SHA512 2f24e2cba88a96bb23848e1404878e4478a65642387b7b76aa4007587fe7c4d8208cbde53d3ed65f8d0d71cd688bfc16be66dc5f7bcf84c7b2ccf1b3c505b0b4
+DIST runtime.linux-arm.microsoft.netcore.app.2.1.30.nupkg 34370027 BLAKE2B e446f5f2e1f123892a5cc3139598d8648f9928a3eee4263b30e682acbd0f10b882472e6b5ba0ff8875241791a0f3f9aeaf5d848f75e3c868eb7e844ba41d37c4 SHA512 e6d644980d356c8ab220f0b6858a0c3635c55bda998d243698d3396838658b4bfa2416e1ef50523c2147b20934c0e78769ea2a8146a0fe4125dbc8b08caff4fc
+DIST runtime.linux-arm.microsoft.netcore.dotnetapphost.2.1.30.nupkg 60530 BLAKE2B ff025b27766866a0efd65dd8fc4b96d89e587b787248f61d541a0445d41b0a92d526c5c80025ce271bd7ba6bcc941356a1b92ffc7faa29d8820993e9e85ac969 SHA512 2c14986578f1c0bbc26efbd97ceabc7fd89a56bfcfce634e8fe1fa626f327bf1922eecd307ee3b2dfa545ecc5f71470e31eb32e576951986760c8c29f15d07f4
+DIST runtime.linux-arm.microsoft.netcore.dotnethostpolicy.2.1.30.nupkg 200311 BLAKE2B 4864be06dd10b07d00d0fd0722d9a04c43252dbc400d3e42553d6bcd7b5b30cffd37166ba85b5e369269d7a8bf999c2d4efd19a780d69ba47d918b2b582939f4 SHA512 ed841417f6660211e0e55c5f07b40868e1a6d9f59c9e23d0195176d93f18770776c149042c7557836ec4509c4c32b17ca95bfc111c58aea480b235702d45a509
+DIST runtime.linux-arm.microsoft.netcore.dotnethostresolver.2.1.30.nupkg 200120 BLAKE2B 43a7356823d0325bc6fa333262c023a5947e30909af1e5dfadcb02e3965dad078ecbd6569724d561df71e3823f51be8c0c7b34dfea0cb24a0c3c2d95f70df3bd SHA512 e481740015458ef804b8116aa178ba1aac769acde57dc58c43dedb71f5c0473acdaf1ca51150992c93f1da1a0ea637686e221d9175c8a9284ac3aca223d5fa71
+DIST runtime.linux-arm64.microsoft.netcore.app.2.1.30.nupkg 33097699 BLAKE2B 205a4b3c1a9f98ffe926895d9bc3d2f71575e7b55acd49b50e8adf8d90c0a1dd0925b27263356eac7c8d0484ee70b064ec8349fcef8a5a6503aa956de5ec7a69 SHA512 68e21fa7bf287eba80414835f83dcae8ae9a079ee6d189fa288d26383f4b8e4a8c6d1abdc16035aa6eaa3e494a90053c6706730afce41e25d6104e77e573e406
+DIST runtime.linux-arm64.microsoft.netcore.dotnetapphost.2.1.30.nupkg 65726 BLAKE2B e6e99e1c7e3a34ce05bf2e3e1ea05e918d77165634fc9fc31e830f0aac05d748a1421ea3faa483450ede07a850ce6209e021636ba6515c876254d031338d272a SHA512 6837a65e58642e7fe3f1281f79db9b55c6aab7b557cbd5a21d377f5637a839c0dda2ebec6f7c868b68df8ab7d3c70d165b04562fb135eca42e7460575de58589
+DIST runtime.linux-arm64.microsoft.netcore.dotnethostpolicy.2.1.30.nupkg 234004 BLAKE2B 5572b5b551f5eea2dd957bd63f12296202c4630a1455e95bf418b071413460c3c3f8611915e80b5eeabb6200dfcdd75041c4bbb3cbb2a26acb657c7ddb80500b SHA512 616433b5824c81ca71d43490dac107861d02aec7f93e4b94c3ed513ede87b5cdce0d78dce57ad0ba6ffd27bb1e57f5090dce155a72b6614c8374585578c23c28
+DIST runtime.linux-arm64.microsoft.netcore.dotnethostresolver.2.1.30.nupkg 229295 BLAKE2B d3ebacc3ede609e0f5740de1ad4ea53512d07068130b01db7b525f048f6328faa033817d8a25adf1ee479b4582be296a9913f8d929f41719fcfcdb0c3a799de7 SHA512 7811a068792dadc3c5577d5951f66af338a33b778764031223b8fcc2928b0ec66fd600f563dc994f6064d60f5776ef8591b7e793663fcfcc88ef0411ef176483
+DIST runtime.linux-musl-x64.microsoft.netcore.app.2.1.30.nupkg 31698306 BLAKE2B bd28438b9a40063ae3c084e972ed627bc8dd12e519dacb9c20c9c2908d3f350e8e97d5ce55278a3d1d1d1b7fba3689115ee4ded906c8f3ddda80a5eb7765ca67 SHA512 3342b615f25348cb6cb083c1d3b2a7eea0d6f874e65ec5b0a6915976fddcbd6478f89cc12a72720eee28e251821f3ca6bb56d2040f7ea2406eb7d969cdf87c70
+DIST runtime.linux-musl-x64.microsoft.netcore.dotnetapphost.2.1.30.nupkg 63289 BLAKE2B 819f231fbf2b3a76e5bddd1fede97502cdb08947da8be8d7c84bbbdce052f9ee722e8bfccd6a2940232c5dfae9bc04bb1e6093f22f2b0cb5efebc9dabe8625ef SHA512 624c0151ebe3165b3752001fa5c153e80df4b1aa334d374a06818d0d86294c42de83e7b52e1e56dd9c13efb1faca5ee0753f5360f5598075cea200597336c689
+DIST runtime.linux-musl-x64.microsoft.netcore.dotnethostpolicy.2.1.30.nupkg 225576 BLAKE2B 3912d8fd0b2ffa9eda95cd0029133343e2e8e370f0a00b21206e6b710bc6c91e74b705478c039c80e0f79464c9f3a23f1704ab1f54579d67d03edaea04393176 SHA512 239766c932a0c5c379d367ab7977ec5851fe3d3be1ecd2cd8e1fb11a9ce10dac68a658c9fc5ca11c48f2257c7299be1e094ce7e9024b1f559f67fc00ca8333a4
+DIST runtime.linux-musl-x64.microsoft.netcore.dotnethostresolver.2.1.30.nupkg 225382 BLAKE2B 914b22f68c41a45c61258c22186ebf29a50cbfe927af56394c7bddb9a4569ef28cfc8d2ee1010b9edfa1da6c2fca75d7247c8e6f003ebbb34239f91c217749a8 SHA512 e0dfba9c1003335ae7f4b8cd3350170dc98e6b590b54a655389f146172b3fdbaebea485acd500c01c5f18ff03056b44ed9f4352d3596508c33eff123c642ca67
+DIST runtime.linux-x64.microsoft.netcore.app.2.1.30.nupkg 31384348 BLAKE2B e906ed0c8d71add26a4bfe7aab5f13d9d0832832cfebbbbece44eedd8dc72ee7afc70e1257225385e2f6fceadbbae663ccd9e923ffd4710aa60a14f1894f4561 SHA512 364086bab5181f723161a3ea8e98f1f12d9ec25e2a318e4ac0efdd823895da239bb298c802d234a5788b8ba7f303bd176ac254f08d3b47cd3365d31afb5a8c8f
+DIST runtime.linux-x64.microsoft.netcore.dotnetapphost.2.1.30.nupkg 63226 BLAKE2B fe0c5ecb39d7eb299c301699a61c196b969c62bb40788c3b92c08e09c802e29dfbba9e2c9e03f5dac02b0f75f672ee8a1a8989e277a53384ed5f8f20465544fe SHA512 caf2dd9185b64dce3f7c4abcdaa0a0511335d00289cf7565b0a34082d1aafa0f238066baf6a5c5d830eb2df158b2892c13b8abfb3ff86878fc916d98473699cc
+DIST runtime.linux-x64.microsoft.netcore.dotnethostpolicy.2.1.30.nupkg 229059 BLAKE2B b29c4a958f5f7216087d1e5560bfac1d6296a69c82dee6b8bba7a0710f341c47c830bcf42a27ea2130be228a58a527d3b925465310e35e33287409a41b1596d3 SHA512 b13546f55bc6a382e59cc600a5def71c19f581d2fc6942822cec3a73551476516c1996b768559d1aea094d9b96fdb399b66a0afabd93928748f5bef0178ac779
+DIST runtime.linux-x64.microsoft.netcore.dotnethostresolver.2.1.30.nupkg 226528 BLAKE2B 51df4b51f20c200adfd5fd785a43818c5129c701a83f21199ab9c1ffd90568eb1a0c6d99fd6dacabfd2d4b49beeee4597b8f73557570ae8cf2a217a1cbd339cc SHA512 debc03fcdae53c61df784b2bad5355c032e189625f0b884a2a155c8337d52ca646ac3784be786bc21691d78c47c3a2406e4c6e3e0187ed2186a8557a2ad9e68e
+DIST runtime.native.system.4.3.0.nupkg 16854 BLAKE2B be46e3bd8781915572308ed7d4d8a0338a5c79b901a27c7e7c7fb7fb25788cf00968a40f96cc43b1202e56e5bbb2f87602d247295d8c98f2c143a0ad3a8d7664 SHA512 299c5a96fffdcaf1972e3e3d1c727837d18ac9e88cb79c09914f12ff1de7280dff10c9232a49a1c1d3ba7785a5cf76f28c9dce414f0a2a567688de7fd5331dc8
+DIST runtime.native.system.io.compression.4.3.0.nupkg 16918 BLAKE2B a158ea64e917d9117684a9974482172fa2450cbc3e41a2918cae1ccbe004988fa31d975c8f06fd9a3bd320bf9b5a0e329eed36491b928df6db242507162dc3b3 SHA512 bff1f0cac94327014bb07c1ebee06c216e6e4951b1ddaa0c8a753a4a0338be621fd15ec621503490dbca54a75809abc4f420669b33052b28d24d726ac79c9891
+DIST runtime.native.system.net.http.4.3.0.nupkg 16894 BLAKE2B c803da4a0e31f509b83e061c0dde9b990188418ee29efe9bb0b7f5873fb2b14990560b4191d78ad16e9ecd53ec701a4fdbec3ff66b88c3e49b5f41b57ae11df1 SHA512 ddd1e5b67545477f7c72b5883666de40e89efb0836d91e7a349e2f3d4ac05ce1125e6add3cb09c39cbdfe7ab7c5dc8fdaeaf6ac25acd92f6de3d8ce2d6db7918
+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.native.system.security.cryptography.openssl.4.3.2.nupkg 17049 BLAKE2B 4440283e2844f2e900eee3505cb6ae038288117a452ea41b3fb4b2f6bccd3649749d655436bb6a87f4fad0880a9960630f016f6ffae68ea162e4cc5e4db15401 SHA512 a34ad2dbe67efcae97fcbea57af386b30660a98ab8229a56c0dca241316e673cf7a26e19c6efb6b7117cc271fdf208741ba6f8447ae254c91acba3ddb7d2923a
+DIST runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 44200 BLAKE2B 30ee247fc53f9de0147a5c5666bcfbfb674ebf03ceaa4ea3c73671154caa6ccee2c9254c0fca588e9a21f98e27ad86f387255b554ce37d7e36f8a69502049e71 SHA512 81bdb93c1c86c560343df6cc367499fb2a01a9b3016617be416874a23c4355a8d95c7be34f175510f3fdea4872302a87c8efab98a328dfa39422db520c3f291c
+DIST runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 44199 BLAKE2B 475710c40d856c6ea97201e800a3d8f418a7489043bb48b42c79f4e63fbf390630c0b2379f45f0e183f98bd2f3963c93b1efebd4650c2e1f2f08002788f0a8e1 SHA512 ce0873e07000df98e640bd265e969d4a9236535cee2699c5363f3ab297557b0d756260557995f2ee163cff05fc2ba922d66ba0e4cb28521f841e7d546ab3b63e
+DIST runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 44118 BLAKE2B f89226f71e042a6bf70a45db59dddf06fb5083da2ccc1cbc17e8b3381a1462c36e0ddee7cb38a2003ccd07ec4f2a987a9e69ab143054a3a106ec314e3ac4947e SHA512 6de9544b4da49f127680cf5b3b4afea96bfcac3293038a1b0a12eea0ad60be368af31ee1dfd66d48d458b40200738c04aa0c71adcc54ae2dddbea2cd50d6f28d
+DIST runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 44143 BLAKE2B a46295bfc89c96c9fb28650d64b2ffaa1bb10c005227c2982da898955e85b04e8f344813c2b37edd6ae855bd24de3ae8dd39dfca6523fcce1f9b2dae9cd4ba14 SHA512 bf754c1a66cd70dc1bd38d54fe675e9dd470417ebba62e2f79e278be8f06cc3496ff58ed90d30b5dd4d3efea9accbd09eb17cd87be882951c0fdfb833c371f70
+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.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 37725 BLAKE2B d777e672cf2cca1b8df607fb9e38a1349f99d68c2ac4cc553db4ef98cf00d637182da19842acf774cce1e1ae78d52a5bdfd1b21f79ea59294344600fc2d4d5fd SHA512 0a38f25e8773b58155b5d3f94f849b93353d0809da56228b8ebab5c976e6458ca50eb5a38acca4c8940678e6e9521fb57ae487337f7cbf2ea7893ae9e3f43935
+DIST runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42668 BLAKE2B be90c86ebb383a1d7e037d0a0b24aeb8a7e9974388ded41964a82a2d2a4dce0e62feae830fe7dcd29c0fa19584c0b15281f1959d326fd6b7e17c6e70bf125c1b SHA512 e65a6a1f1928cfb760c395a399542dc7f9087399c53874376604504ae60abd2da24ed735ebd148d335000a5e35c8108ea55404685e902df392eac2e8d38fb665
+DIST runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 42676 BLAKE2B 92c345d649195d7ebf1ae645fd122b77ceb423f391dc631f142c7e1890f6b1fe63fa896f6842dae5aa1ea33994d3fc9a7f44f52954f0f50ea682988373ba071f SHA512 2ae9db4b719b31fa7e40c60f52c70038fc8668e029cf4e1d120fde8c295631d6b08207d7018a22937b79546016c560c894e27dd6ebc01d5e0f677567e6b2c4f2
+DIST runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 43118 BLAKE2B 242cc78b2b335d3c15e798c81cb19654b44ecb79e29e6babdc404bcbffd1691b07e0640143cde2d03a0640d6e1851228188eb91cc6b8b9f8759d13e8aa258e52 SHA512 c9f219515e268cf40e16b135bd64cba95c35e866dd9bc34954159562314d01d2f9ea7eb8b0db94acf6bdac83d651d90bad7890cb657ffe40fa3440ec662c9944
+DIST runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 43121 BLAKE2B 5b079a85f032b9933cb9033acd4531f49b862c9aa4a35ff260141c228068e62dacdaae59f95e309e4ea2278da046ad82b0b88be37420849d67bbd2325def7e00 SHA512 cd4b7ba744de80086521ab67cad2db3085d488388d3d9cb83d9946389f0f4c784539bf3a4ffb8d4f3347c5c7813aadef95b355fd2563e30c948a883c27b95287
+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.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 42947 BLAKE2B 12495fa67415ebb0ff203ce50c3a3bc63bb6adf53a55a72d73d80eec8607533a69036cc3286dd8e52a645bea6519655b31855c473dac70a08fd228f0a3381df0 SHA512 d7fc28a9f600e471edce0989c01c485d4e2a7e99551f531413afa75039a4004d4e2c27e88976d65432635a321d86316a3c6cdaebc7b2fefa42141b64f4f10d66
+DIST runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg 42939 BLAKE2B f166d9c0b266e7c7fa6d6ac61201a755ddca3ca6d3f13e52e4a04575c7143af5bfda9929d3701ac7cacb0e61d8debedae4419fc202d8cef73c8c1496776ffe28 SHA512 5dbe6bc007a9b46491e5299602291f5dbf8cc8d51e6c1b08db2fa0efd365990b41b6e181ed6bf82e873a659396427bc0e33e85b47d645d273fef8bf8ec643631
+DIST runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg 42971 BLAKE2B 876fa77151634597a78a5e31771f370fe0632fc3d2cd5d5e5eaa216ace436483e7cb04beb8c101340b63899efd40e3e5fa649b4cf208656d9064adf61e3993ea SHA512 5fe0e6a878eff59cfe24a8d57af51140576d8e0fec4988e4892c233c47b3a3eed27dec072a6c0d55dd615777cd9ce3fe545c5353b4a95289376ad0b9408ed4be
+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 selenium.support.3.141.0.nupkg 155529 BLAKE2B 315789f206f73bd6f49bc4438626fe4563868c7b353e488d30ce5b7185d817fda16becbe96dbb253f0ef8151e922cf5d667fae391824a1c2850a4f5d98d81fe4 SHA512 a2fd97044e3c2f53366d373c6b3cf9ad2a5f4f8e7eaba6f0f6c05cf3834e6c679b159fd2d920a757f4d2a01cb665fdef3d78a3eb735dd5545cc10932282e15cb
+DIST selenium.webdriver.3.141.0.nupkg 4321149 BLAKE2B ec353d6e23beee4c08fad6b7c5b8fd9712acadebf8820c27a3399f19eec6af7da64c9d0378fb09f613405bd2a97886d2dcf85dde28b5ee30167f97b793201360 SHA512 ca65cf27dce9eca3c85741fa0dd2376e8230738e8bac45b54fae773b0e8eb116cc160c8372a4425fc24e7982e6ebc8c8abeeeb80408b2d45f19808ade533ff23
+DIST sharpziplib.1.4.2.nupkg 741182 BLAKE2B 3d22a281cf9afed622be8a4134f0ce143df11a94c6950bd14d35cf5a39700c4a1bb706c718561b06f8698ae804254bb1d38552a5f1bcce316d85a9394ee359f3 SHA512 4e080196e9b20427d1b5abe23943d647c365611247cf571d3cf2575808be7294b9957050aed57fa34326ef8965bbb314e03944693216502d0eb990253dfc94f4
+DIST simplebase.1.3.1.nupkg 29903 BLAKE2B e66b93aceea0d44b8b2c3f5b075eae1d30c5e94fd6ed5b75a7b36b3f95067b2f518996e946dd283845b2df6ccb50932c8277107eb39bf366090f635f5a59d854 SHA512 85eacd0622afa466273774d5190cc3bd22d24502918b4c617e16e5c3b57fcd2300c21cf43ac5a475b81a2b0c0e195558b21e11ff81813af0344dc3cd83ce10b8
+DIST sixlabors.fonts.1.0.1.nupkg 1018229 BLAKE2B 3d938c3d917e5081e818890d538c595ecfdfe5395023a562ad9a69e2a842b19e7926bce7b59f2fd847bbcd36328e49dc8cbf2ea18ec9b85f593c9a84e7dac8eb SHA512 f6d5a2216cf2e728ff806fbf131e0aec32175cc90480ff15c792fe401d0f9e9728998f42f651a0583d1507ca7e94719463ba729dd0df89b982661c590257190f
+DIST sixlabors.imagesharp.3.1.5.nupkg 1040923 BLAKE2B 6ba96ed284a5fe50467cca80cd30a56830f248cf37883b27225811a48cb890dd67e4a3389273ca4b57cac4b52a223678b55f72f5a5788d124e812df55b801433 SHA512 88621a2fac5501d0a3b89387b213791b08448075a8d81666c52a35627754c59d760ee6c54f1dca39a897ae870f32bcd2594a51beb721b2de4af482d0b6762442
+DIST standardsocketshttphandler.2.2.0.8.nupkg 496395 BLAKE2B aab8d3a9650776f9195ecc70de80b401731396237d85789fa6bac0d863e686f53d49b7cf5b2238b120d1e74a53a1f582376ac292e08afd478ee912aa1c435221 SHA512 6b7c907fc80fa4cecc2bd8758c54774dc4bcae66f388160c921c80d02ab1e0b0f6de389d919a5cc65dc1cfb5ae5ac842b0ba439b1665a9009d2829fa43ce6aab
+DIST system.appcontext.4.3.0.nupkg 147030 BLAKE2B fafd6d050e77a265cf41c6d00a3ab3d8db47f2258e10a6cb556031ab183a01a508a986bb495b68c5e8610c05b92b2f3c7b0718f68f508111fd262291684f84c3 SHA512 0d6ea63006304708feae2cc0590d2cdd99327b682210822bb2803ac842fdf4d8d57170d7947c006eec4b5687c942768478a7ec109745472f3946d230732483e8
+DIST system.buffers.4.3.0.nupkg 35171 BLAKE2B 3b274a048ce14845ca957019b3670db00338972f6e11279e47f59ca6b4326aaecab1d11317694ed98e8a27f3de7ef6f90de94d4711ab224f805388d468728392 SHA512 3dcbf66f6edf7e9bb4f698cddcf81b9d059811d84e05c7ac618b2640efed642f089b0ef84c927c5f58feffe43bb96a6bcf4fec422529b82998b18d70e4648cbe
+DIST system.buffers.4.4.0.nupkg 78363 BLAKE2B 3d25c21afaf3f3b2ebe348b55ac9350bc982a2f3a78659ba0a6a2994ae6423ca94c5a0f55bf97ff5041d882dba2403f52efc9a125b8a6250c681e3334d10ea41 SHA512 222d9b79d7781d5cdd76ea5d537e67df28288543e5367ecc0e298139873058d71ed8d8b34357c249a4096354f3bfcd1a32a386a55714e3066bfd77b9d31713c2
+DIST system.buffers.4.5.1.nupkg 93737 BLAKE2B e846885f9ace79f30bf7698a96ff3277a45fc2988a48cddba1862e23650ce55b06dcc6c1bcc29e08cf5380c9700dfcc15964f7263aeb11c737306d27963b34da SHA512 80da6158e55b9bcf7e0b5e6379b9cf45a632914f037b53c5bf5609576e3cd7821f7861956b73d74470d2d0c2e56dd235a5ef4ca6ffe7e192b820dc2d023aaff2
+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.1.5.0.nupkg 804405 BLAKE2B f11cab8fc6e1543d09bb65aec905d8a7b56318fc1f6e4ba723fc5ef393340fe3e29cb8f5d3e788d31b61a80661367371af90065432a63b3a954c39b68b8ecf16 SHA512 4f95c64257078443bbe50c77f061825033dd9389ffef2ad1993832e32733cc957c6a53c76b13d4e794c10b6505ae4438d9bbb7e2c64f7cad1d53e9d665438424
+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.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.componentmodel.4.3.0.nupkg 95320 BLAKE2B 8c03f003539d1c0920c4d1a2d0b57a19f93c9c1d7f2e0004035b758b56915da1ba0207d1506cc0cf8af71bb2e58408fb824674941230a0465249752b1dc0df93 SHA512 7c638ac92a132e1553a089c6a711ffb7431b22fecca322ce748d6684ae2baaf161bab2f71704750bd15ec6fda11e795f2ab8491ac769b89341bde77aa9212d59
+DIST system.componentmodel.annotations.5.0.0.nupkg 771145 BLAKE2B eaba2dca2356dbf4c1af4bd03d1b8bfcb55dc4f7e449e61e25dace119b35aa6308810fac7860b5d64d5e9569d27da693b3983a1427179e2d26b66a7df48d3904 SHA512 589aac4c669701ce7910f1a327294f15788d3ecff1d6df5d9255651e5201c5411c2312286fab111a6f549fb4de864c8414cfaf2a365deeb6f068c1ffce7c353c
+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.3.0.nupkg 102397 BLAKE2B c21bc97bbcda781257473768239f775a16fcc399e933df35a5f5c00f75c5088462ea01ecec2d711a803581d5499c8cb15518e790d6c9e74b15a36c3a1f237d19 SHA512 a08a684a583c9b3278ce32be1007dae495f9d87254666392f794ef1203079f333cd7d388c28944ffa36fb49f0c8bb21f42c70f6e1d7c1c03920df6d0d1130c82
+DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b098281b7d2957d0996f9345aa086a54b1a981822962e5cc319687849ee52445db47b439b6cd4e99a4c71595f6227f78160aa31724b SHA512 6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24
+DIST system.diagnostics.diagnosticsource.4.3.0.nupkg 120125 BLAKE2B 33f203d8ffc39e0c38599eee625053beae160a0aebe6fbfaaafdc85b570c7b82e3aae281092014e90d10fad7083f37afbb546ad5a0c74a94843ae9b1e9fe85f1 SHA512 8f54df5ff382b6650e2e10d1043863a24bf49ff0714e779e837cd7073e46fb2635bcfcdcf99d7c4a9d95f35ebffd86ab0ca068305f4b245072e08303b917b34d
+DIST system.diagnostics.diagnosticsource.7.0.2.nupkg 398733 BLAKE2B 8e551d460454942d575c72583a009ee607ba9749ac7575d8bb11e34a767235812d112b84e8eb4b4542ae66f351b0e2a31e4d953417b182142fdbd5a130577520 SHA512 1d346c423dc811aaa04f31436b48711659f7f0c87599758f842c10c3beb2779c40b028b9d4718c75eda7f9d9e40f341c05f267f863aa9357237b5edd95e3c2a8
+DIST system.diagnostics.eventlog.6.0.0.nupkg 296510 BLAKE2B b1f7d78b0c5a4c46898972f5d9c086daaf2d825e6b08f4150d5ddd99d355fbe7f43e13b9a0b24a66adb4eaa1279a58621f3d2b15c8957c528ebd7bb99bef3b6e SHA512 40103d5b7cb2b41c7cafca629c112c5526bb773d11367ca62918d8864fba8dac2b48151f37671bcf50499d8f8b268489ee1cade2fb8947cc06e205a1fac6784c
+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.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
+DIST system.drawing.common.4.7.2.nupkg 1218622 BLAKE2B 6ead80743aedd6def2af97699cc35b48b86cd0af021517550486fcdf5cd2a5ad4ffa430c8472cbdfb754629e2008b5ada8e3ecea37abbdc63de9125788b211e7 SHA512 5510e9093f9b0655fb140ec173fa8c3944e9cb1661939763ab7ee66005507c7a37ef90422f18f4e609e27334a962f9a1b47474387941eb77c665a0f72d82a7d9
+DIST system.drawing.common.8.0.7.nupkg 1568177 BLAKE2B 31993b92e50f7b39499d04839b8ac2c6308dbd2c9af6871e2ee20be605d78f754848e2edaa6fb1529a38bfba2a925faa4a96228d271013dec46510c64a9866b1 SHA512 1a527afac8c5dc6c622f98f6f2e9815734da515e3a11428b69fcd0a4726883918c0942b2a54653ba1381bdd1cb5985eba5090c81e9be3087d72e51308d40e7fd
+DIST system.dynamic.runtime.4.3.0.nupkg 548103 BLAKE2B 42ac34ffe9b9b6fe69c984aa2b22f0715f7979685730de048490ca05feefd800349df39aeb2bc6b4c3608cd042abc018714fbdc49475a11b46077a2638824c8b SHA512 54446fee94f432cb8fd38ec10c929a87b307a76f152a2e9da11ba99c41ceb0f65913cf218944990f0e122d4f858945091e9806c84c0285ada1fcc939337d30ea
+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.compression.4.3.0.nupkg 485197 BLAKE2B d813f11d1eafa9c5bae049c2e6d7081edbb264520e253bc03441fbc1ea62b75760dd31c038a5a376d41df59c8be55fe1085d7dc012f611731b72040c8c41430b SHA512 f540ee51a3bb6941cdfbaace9a9738d7f7986a2f94770db61f45a88ecb7ef36b571d4c07417dc89cdbe9655a262b7cc599b0a4b78effea91819e186121b44807
+DIST system.io.compression.zipfile.4.3.0.nupkg 113746 BLAKE2B 0622b6c3b6ce841b3c3c1df620ffb68f995ac02d7540d7128ef2831cf08deaa60aaf46059cee0c98624ed5402c8d746128ecfd674acb90ed665d834eb879960b SHA512 1860634672767f818f0192ec2b2750693f0d39390f3b7d400cc6fd4f6e74a5cbed27bf49e5980ec85ff3e161c30f6190f700e339a1040c1699b87eb4aa7b6792
+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.linq.4.3.0.nupkg 512550 BLAKE2B cc6cbb532575bfcfde7ac897970dcd49067186547108f46449f9f819e7910ad32496df3663d4db8eff48224b8ee95b27f7bb442bb477ad47f44da2f6fa893078 SHA512 eacc7fe1ec526f405f5ba0e671f616d0e5be9c1828d543a9e2f8c65df4099d6b2ea4a9fa2cdae4f34b170dc37142f60e267e137ca39f350281ed70d2dc620458
+DIST system.linq.async.6.0.1.nupkg 2000666 BLAKE2B 8d4d0e71e4bb1bc29dbd2775803ed7e7e1bd5d3d415a3e924897513d18d23b0b1dfa569419fe24bb2cdad237d8a466f319091f0524fcc73c27b665922e5185ea SHA512 792b7b14a6fcc52f88cc0475a2ba8a694399393fa602446fe23fa6d39d782c16f908b4bc3acd58454554932b7a41056d84424b5fd66f0fe6e3c00178eb3d8a1a
+DIST system.linq.expressions.4.3.0.nupkg 1928029 BLAKE2B 1add363cc651e551fd7abcb797252785e2617159b197ec081de605d7c7dd829e7653e7693495a87909f46575b6619e95fef6e3132532110b3c1e74157ff096a6 SHA512 61b90ef9ae6f779fbc8a7b6483ee8f5449cdd05c81b05235f70447e656a73b2aab7c341784b999f7532374744a72e2c3a5cd13800ea23417fac32ccfae5cde6d
+DIST system.memory.4.5.0.nupkg 197549 BLAKE2B ac3965ebbf3cb4905059d93302386c99b368ae6e8fdffd2f77c145db6234787e7f4ee5d236111f9f458bfb1e158d94cd0ec2bea315c815ebc441ad8107043ec4 SHA512 50b3838aa76af357bd61f412fc62f83f9ce07a4f748f23f2900578b754a9e2c8c80f7fc46e2d7c95bbce2a6fbcd5b8874796b915d1515d253f25573a9f1affec
+DIST system.memory.4.5.1.nupkg 195808 BLAKE2B 15be57951bb2031a33315090878122d12add7d3eaabf2f3e7965dbd9d859df6030e36b87f70f1c7435e6404a908039c26d3baead8e4dfb064f5ac023c141f5dd SHA512 a289e72d03d90060f6d6ab4d306e04b5599b60e2279368d5eccfa0d74f01e8e1ce6faed939a5a703f2bc3f9a10eae2bdc312b30758845d20a140e8b6b1c28ea8
+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.net.http.4.3.0.nupkg 1371903 BLAKE2B c0b56398662d8f149eba439ce16ec254bd5a64cee0faf251af07d89ec130953d8865d537b52b432ee19df9ed7405318119d301743bf84f98179c1cd7e6615731 SHA512 e8105ce8151aee95852fb29423f73cc1bd7c2286d36474ed7102a4b31248e45f434434a176d3af0442738398c96c5753965ee0444fb9c97525abbd9c88b13e41
+DIST system.net.http.4.3.4.nupkg 620644 BLAKE2B b3d038bfcc0232f449e9dba14ad885cd29a5df759520d0c6ca12333d8fcf052e2a3b25347df376604442e3bf10b5a2072b6c0dd66ae41bc7c9bf4e17908a8bf5 SHA512 163edeef734d1f0a1ff7b8053d326eabc82fe86f3de72c6466dd780d59d974487882f2a5f16ae4b02c0d8c8a7f25e617ff2bbfab133f88ebfd6a2f99637169ed
+DIST system.net.nameresolution.4.3.0.nupkg 177639 BLAKE2B c3d666f33577682ba43292ccca908cbd81971ab53eaeb904438a378997903e80d5d3789b3c76db6c50f0411fb17b227db973bc09eadfc0f98ebed88ac0209057 SHA512 40d39e131fe7a392e58e9f58b516b5db88383de91c05b771f5e509acf46cc874271e90623d327ab039003ab8f2714144694390261278de324e1aee228a828ab4
+DIST system.net.primitives.4.3.0.nupkg 769347 BLAKE2B 070d9aaecf9c4ec485850954c425d6d6af23fdb8a50fe40c305657654fcaf58d366f29f62bca6ae32c8604dfd7f5217f822ebe03c68446d4fbc4ee7e44b07852 SHA512 9f7fdece330a81f3312ea7c804927852413bee2c929f3066b736993803df47cc0692fbca236c222bf19dc8f59b42f54f2a4c00da9a4d624e458da5874d127ce6
+DIST system.net.sockets.4.3.0.nupkg 135695 BLAKE2B 17f58a8445cae9ef2ad17bbd7dda092e66bc8be07d767e971fabf14da98f549924cd6a7abf54e8a5a7557710612a151f2f27dd35e559b81f2f06dd71fd43c9f7 SHA512 e32ed9518e9630e99edcf1963c3d0e7047ea8252853c9260eb5403a4206170ae28fd27eb239f39da4d2db766f830b3ebdc9e4da2e697be20241d928082200955
+DIST system.numerics.vectors.4.4.0.nupkg 337043 BLAKE2B 94cca7283873edd9199d843db78e23bc5815de039c2aaeb67ba3cbe4cb5e161eab27b89cfbeeb437f0a9d235b48e86a5b31f53306a7e7a2a38feb28d6e5e523c SHA512 81d46b509b3546b8d6dc9079a7cda162303aef1a1e14bbe1d127522168d388df2a13195b16dfd1b57c1560d73906e909fdff4e2b34104ba81a9336c97874ea1e
+DIST system.numerics.vectors.4.5.0.nupkg 382792 BLAKE2B a97284a76a6729052d3a127e1875e2012ae5b90a40533783dc799b543d44cc084035374799e9e1b894083cb61f2639711f18b76ff31145140519a9674dd9d2aa SHA512 9c04ec0530f608aaf801837a791b33857e2ca6d2265a6049c01fd4e972825967e709cad3070f174829b7400f608e9a641d3afc3a45d4636d4c47dd43dd0657b3
+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.3.0.nupkg 700821 BLAKE2B a6aaf054f27be81f1a8251241deaddd6d35aa9ff1cd1b35a65c75201c3305ca0481d8f7a6de52a85736b0477332c404573db300f324e6301365f14fd59784225 SHA512 2325b67ed60dce0302807064f25422cbe1b7fb275b539b44fba3c4a8ce4926f21d78529a5c34b31c03d80d110f7bace9af9589d457266beac014220057af8333
+DIST system.reflection.emit.4.3.0.nupkg 219534 BLAKE2B dddeaced247da3ced46ad776c3560d886db0581d10d2a32df3827c275a895f474933c528b637439831e7f69cabf70bcec544ed1d16069ef11cb047126f2c3b57 SHA512 be45051467a36ab965410f112a475fb81510a5595347d1cc0c46b028e0436a339218dd3c073f048c2d338b67dc13b45742290b6c46f55982503f74a8f2698818
+DIST system.reflection.emit.ilgeneration.4.3.0.nupkg 124567 BLAKE2B 4495327d565f0ef5935bb2ff6f71e25132abda4c8ffeb51195bd4b96d1d5c885e344519287dbb22d28957f0fbad2af0cc977c2fe4650206f7b72ee5dec45a08c SHA512 e9be5f62bf64b1947a49857337306a5d0980686b58d665989e94006ab04aa7e0bbf4d8543d1b57d5bb38079052f275f339b73054a7357e4fa357208a0ac85d69
+DIST system.reflection.emit.lightweight.4.3.0.nupkg 84426 BLAKE2B 370e3b74a769e2a8043287ae93804d726ae0704440e3fea9cf5fd1ee46222cdd293d35896349719e87123ac24b05042665148023185ffb89ab8e00820820590c SHA512 ad58af07296bd084907a089f92026fa3898b764eb9d6a07c9414b550a83ac60456f32a34127c29bb93a9633fb07ba9fd828f7b41a31dce5ff019a7cf1ab29435
+DIST system.reflection.extensions.4.3.0.nupkg 99740 BLAKE2B 15554874193bbddbb2a7a769a239923ea039b117d9f8ba5ae634b82fdc8f04fcdc871bdf328b0b4e418c9f0c987dfd71546c778a99453ba6b5e754e6939b3c28 SHA512 06cfd992c8d7fd9ab6432ab02be981a01b6558285a6e26a7825a064d4efcce08d9e7344f03fa19b033a2459d42b0b80e8c1400ce39b47a1752869ab8825b0475
+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
+DIST system.reflection.typeextensions.4.3.0.nupkg 187842 BLAKE2B 2cec73bd787cc6b4bee793782ff0db98aaced7e7a0645cefb60e6e47d353e1959eed7a48db24e9c7ea6ad7b87648c11c3588d43028c4e0d14c695c38356943a2 SHA512 68ae81a635b9af2aee9fc8fc8fe7da0356ef4da4eb32f81a89fb75613b96714e8f1a1f4c12bd0d335efbb03408cc7a744314837f13564d5fb262ca272055677f
+DIST system.resources.extensions.7.0.0.nupkg 171722 BLAKE2B 2ac85f1a43228af42db9360dc7270b919265cb9498ac8053054956b8799cd326c30d5c07d026ce87150e0c721542ada831c5e36483558907a220077684df597d SHA512 724f84a57347d2f4e4977f9e889383c5e4b4ee8f39f08cf15f13e3c7bc13fd02cf9ebf2b1249c6196ed280c07720e83bb14e4f518134e118ec1e4a0a6eddba42
+DIST system.resources.extensions.8.0.0.nupkg 220921 BLAKE2B 38a37efba1124e20633784acadfe96d9c68b27d7ef30bfe9b0f7f619bbf983f1df4d125a0dcff9ad54dbd63b8dae9de1542b2b1c836ffafa9718278fbaaf6d02 SHA512 a02ad3031183b161e37d2e6a25d73437b0fa42ac04cb198ae3277797f33be69600bea8921f70b1c93d398857dc3ae862dbe46bb09aab712989c1099996f11651
+DIST system.resources.resourcemanager.4.3.0.nupkg 85908 BLAKE2B 002ba25bb953e5a9162214338b50abcecfd8183c68c7b5de8bbc1780e57322b6aa225e13436ffda54b4013fb77540df7428d8c3c89c1a21622ab124d8ca174cd SHA512 9067db28f1c48d08fc52ad40a608f88c14ad9112646741ddaf426fdfe68bed61ab01954b179461e61d187371600c1e6e5c36c788993f5a105a64f5702a6b81d4
+DIST system.runtime.4.3.0.nupkg 7263712 BLAKE2B 6cf2c6704f2a5639bffe2db645fd6ac935e341a5d50f1be97969bfba15e7fd93c94a2ddbb75a3538cefc05142fd72331185ca7ed175141102e8f977649f3bf1f SHA512 92ab2249f08073cfafdc4cfbd7db36d651ad871b8d8ba961006982187de374bf4a30af93f15f73b05af343f7a70cbd484b04d646570587636ae72171eb0714fb
+DIST system.runtime.compilerservices.unsafe.4.5.0.nupkg 103605 BLAKE2B 6c7ca30e2c763d57a4253d631a28d2b157165f9d171f80a79ecc1793afe11c9521b57965b015c8e05f5e7002db23936ff0769c837d59b941dc3e3d1b73f5243a SHA512 91433424f3077ddb5e7869bfafdfed765b1d74f5753d4900cdc814b5c53b2d79f96582a85d4cab3e9f4e6ab042cb72514b99e4ec1b7077e5cc304aa14b3aee34
+DIST system.runtime.compilerservices.unsafe.4.5.2.nupkg 104723 BLAKE2B 30ab5b99a60b0a207bb4306ebcd483882af1721025f61a63dc3d654f060a42ec23e3dcac10623665a14e69ade86189ba0138deb199f63fb8f5124c3581e63c90 SHA512 84c91d5b192cca942515707b25a9907a00ec73110040ee051ddfe5c3fce549953d7598008a3eb9c630ab5deaf5f37c2fa0d033262739cf38e3da873dfdd9685a
+DIST system.runtime.compilerservices.unsafe.4.5.3.nupkg 102160 BLAKE2B a86cea1017d251d3cd271eff0be90ce43ca0becd8b0cd37215aba847c00369414de1d34df318e2554f8989fa48ce0f5bf61e0404fd97b476eb0fe0bf5f10579d SHA512 765d87d36a7b7415dee5b6cbd3a08ead9762915fbfacfad8a205a78d4a187cec6677da2407f7f7c2d1b55fe9f8c0257925c9b0bc193d402972c323979678baab
+DIST system.runtime.compilerservices.unsafe.4.7.0.nupkg 82752 BLAKE2B ad9aa645b0d20621ff204210982a37d777d1d2d996ffb094117f7e40ff332dc48bdfd4b5961739adc7ef8e9c1bb08a495f6c37ae130fd867d71dedfd8f2fbb42 SHA512 14c154122872d3929f4f691aa2cb8db78f62b8b6e18b278b39a53d128d93b5cc59be330fa9b6b4613c81f9acfe004f1c97f2f815df753a8b97628c17dd543605
+DIST system.runtime.compilerservices.unsafe.6.0.0.nupkg 84343 BLAKE2B aea2f833d6da80dbc275c47bfb207d77a1f2dd203a29352ff5a6e96d8b52752ee3c5bde38117c5ecc5dfbad66d8b47b2001efa1e2d564e14cbbf58d0d1fe208e SHA512 d4057301be4ec4936f24b9ce003b5ec4d99681ab6d9b65d5393dd38d04cdec37784aaa12c1a8b50ac3767ed878dae425749490773fec01e734f93cf1045822b3
+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.interopservices.runtimeinformation.4.3.0.nupkg 179546 BLAKE2B 780a92196ee216c1175768b32c04e88cfbc453bd9fdd6e5645c4ccc98f2c5ad62fd5cb158117df9391b1cdc3130a2cddca49304d2579434597350097960ce013 SHA512 6f4905329a3cc9e62d274c885f275ee31c5af57a6c9fd1a5080d039cb748e0277bef3dc8ce42863cac78365084e00a032279bf3d2b7254a49f3fb1566a29ad1b
+DIST system.runtime.numerics.4.3.0.nupkg 283763 BLAKE2B b9e2ffc7e974fb4824ed174be43e664d0fcbe1e996640b8f66a17503c8af24d106e883092fd61b2990c32472423bcad943e07b7e25d126563a219e1b617446ee SHA512 3e347faa8e7ec484d481e53b1c219fe1ce346ae8278a214b4508cf0e233c1627bd9c6c6c7c654e8c1f4143271838ddd9593f63a1043577ad87c40e392af7fd34
+DIST system.security.claims.4.3.0.nupkg 147933 BLAKE2B bd00c65069b23415c146861ba7ba768a0da69f9f0a4496fb1f43780222f899ae62ed35cd0bc5a0953d8b13920800b59414cccad7e6bf6614ee675680c06e27cb SHA512 ab72b90801f6c051a2b31645448eebfca74642b3cfa1d51f80e21a0d0d7ad44d3366dea139347e2852781b7f3bae820df16c3eb188a2c96244df05394ed72c86
+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
+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.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.x509certificates.4.3.0.nupkg 706727 BLAKE2B 67c777394c982267c08dba232dd75aba6e924784d14388f7f8e347293c8f3a67ef9490a078b3f56f649a1ab352a4c924630f384850e3d5f1510dceae45fd0af1 SHA512 318d86ab5528e2b444ec3e4b9824c1be82bb93db513eab34b238e486f886c4d74310ed82c2110401fe5cd790e4d97f4a023a0b2d5c2e29952d3fd02e42734d00
+DIST system.security.principal.4.3.0.nupkg 94590 BLAKE2B c6fc5d6944a44b3ab125af5d59493aada6e8c73857311b8118adf197b9db3bf77fc8de9f320dcc0d55c6e529106b36307e14baab75766296bf804289de800a26 SHA512 db8a1ed0d189637d9ef83147550ce5da890cf6ec189a7d006ba9de86ab55679e7f025e18bdaed2dc137ddf82a7e6a0131fb4d54d4264831862b1d7c5ee62837e
+DIST system.security.principal.windows.4.3.0.nupkg 220931 BLAKE2B dcf84627ab57c5e72e0f1828b48c6e9bfa2ea2ead7b9c02bff03b9819f4057cb9d4a8821cfd0a98a381f2d7a2471df04041567de970f9d60557923e6e09317aa SHA512 66c1d5a9d649b964e1653fa2cd41d8f80515b7cd727fcd7f0890552070da1099ecd1032560f259a108e0d1d6a6da23fa07bc5c922f426a91f33b667f7c004019
+DIST system.text.encoding.4.3.0.nupkg 327281 BLAKE2B e153609b257919932499a013337b8b2a4087ebff7e8ffe6854ad1c70fbd058aaabc4e974313dfb3cf1a9355b0ced87bd97cd39f6a4962b8a4a87003d3a66c53c SHA512 6ff7feec7313a7121f795ec7d376e4b8728c17294219fafdfd4ea078f9df1455b4685f0b3962c3810098e95d68594a8392c0b799d36ec8284cd6fcbd4cfe2c67
+DIST system.text.encoding.extensions.4.3.0.nupkg 244195 BLAKE2B 9dc2fbf672e07c5302bbb8435e8c09bc91febb96f22b85b57b09b2046fca224c786f8710b634559de2722f3dbece7b30e6a3c6a78e98e77f955d550e440beb60 SHA512 e648c5dc781e35cf00c5cc8e7e42e815b963cf8fb788e8a817f9b53e318b2b42e2f7a556e9c3c64bf2f6a2fd4615f26ab4f0d4eb713a0151e71e0af3fe9c3eed
+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.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.extensions.4.3.0.nupkg 52499 BLAKE2B 3e6532ad1936859e2713e2e864831efe0af00a5ce561bd7f8723845bf285b8c15de00cb1fc246504f99599d183b400746cea987db883f0e61283db1fb2725a1e SHA512 2c33900ff7f544d6db31ad11b6baee1c9ecb40d5a54f51e5dd5bbbb37f4c50ee35ed481615cbf7c1da61a31ae3333c4454bfbeee4ae32241789e72ce3f910db6
+DIST system.threading.tasks.extensions.4.5.2.nupkg 87298 BLAKE2B a94766dbafe79b031dff04ce899e24c2e76e665b35560d4b8d5cd03af876d351ae87205c51315ce9a1910bbc9103f05c334e8b54b518df9dee2bc4cce0e5453f SHA512 e470aef15dd007e828b8c6661ab03aebac1e67451046df8e4c3d7aad21371f286ee10865bf191fe274cf23418bcb9dacd2bc608bb0bcb766b2140cf0ed42b5a2
+DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
+DIST system.threading.threadpool.4.3.0.nupkg 89926 BLAKE2B ec4210a5862c0704b118e4055785c7094ff8c3586800fcae109fa60e77565d8288089c64bce105e9cab08f8bb107dca340e72ae1d39d19f6118538ed32f449d6 SHA512 450a40f94a48e9396979e764e494ad624d8333f3378b91ea69b23fc836df8f5c43bbd6c8cfd91da2ab95a476e1ff042338968e09b720447f2241c014bfc75159
+DIST system.threading.timer.4.3.0.nupkg 77054 BLAKE2B be1665b86776f2f7e780de889e363a3c10da581eaf9a414da5ae5d059564281d78691142281d31b48c47b9efc084f1826165763097273f77e58699742c8c93da SHA512 d5ce8e258b7be7be268f944e21621195948106f57e6c46e69b2887c46f567760368b14e84046b4be4466ecd08ecd4cb04016a2ff7948cb4640960befc7aa1739
+DIST system.valuetuple.4.5.0.nupkg 204904 BLAKE2B effebc14eba236b1b5c4dbbab544781867b66418fb293ecb1a71c42daeeacd4327c3cb6f988742a038fb978c2d23546485e3c29ca7afc41c5e2425013c29e842 SHA512 fa00ebb5045d12c51274f64411c551981beceb1266a8606a4731063109b95ea1f15939197bf3d2ba899db61e593dc39bfce876908bba34286823525093ae3d8e
+DIST system.xml.readerwriter.4.3.0.nupkg 1388897 BLAKE2B ae51b8fe4492dec1e4e3584d05b0f477fd4e75e79dddb46d8077ae5311245d6fc6213d0655025f25db56f1370cb0e88bd60a83dc937bb53db1db0262390281f2 SHA512 991101497fbd39e43fc306ca280a465318868afa8db1f34bb87c266fe61f0c81a0ec34a797b236ee823bd60d1149b7592def96fe044abb511858efffe890c2e6
+DIST system.xml.xdocument.4.3.0.nupkg 591350 BLAKE2B 86f910cef36c056f4a9ea9dc26eea6e01070467d27ac80fb8a0af5e1a572ad5d2169e4f1297cd362fddc9e0309458dbd413fca85ef8e56f97781c218e594604a SHA512 c2d9236a696daf23a29b530b9aa510fb813041685a1bb9a95845a51e61d870a0615e988b150f5be0d0896ef94b123e97f96c8a43ee815cf5b9897593986b1113
+DIST system.xml.xmldocument.4.3.0.nupkg 285212 BLAKE2B 0d96ca356543e8e915597e0624dca42f0c7032a2ae9e380a6fba3fbee0dacb9e5f06017893b2b7a8b937dbb4de7d5665fa6648e3bf8df12e0d34e4075c125109 SHA512 22251b3f16de9aa06e091b24baea1b8c95752f0d22266faf34e1fb76b347b23f7910cdaf567058e23d06b7079961090ca70805070a2491add5da4d0271afd133
+DIST unosquare.swan.lite.3.1.0.nupkg 272015 BLAKE2B d79af2655bf1e73c6c64f776a90eca01a569c85347a1722d64c96c9a2c0c2c3c7520b5da987dca7e35e3c9f0db98c69365d6bd21d6a031daee6cb11b95bafae4 SHA512 ff539afbb1dd45a832c0310736d28349d078b9e5cbe3d4b3cc70b5be1f76bbdeab2f1393e21da640a0c7f38d90763f81fae54d0eb7f1730fc846630835298c5f
+DIST xunit.2.9.0.nupkg 31651 BLAKE2B fcef29189afc9a9589db5220dfd6336d6e317c778025009ee571500316e980871f39e4cbae66ae86c866e1ada20d7260d8967dbaced3318a4a186b8b82ce6f35 SHA512 7f97ade8f0f070f4c5a33901add240176fa45e28b54fc392142c2dfc388b3a5d207b1028e758445c738c919a20fc5cd449f05a492751e804ad917b957a6a7193
+DIST xunit.abstractions.2.0.3.nupkg 75155 BLAKE2B 8cfecf557dbe20e0e14b1d8b413acd7516b6538cb543a12708910311fa76b7dcd9d060c7be70a05b0af5ef3b8bd5f819104025afe9796e240c28fcae1c7460c1 SHA512 3ca26b8b97f4a8440f16f818e82651f571bc2513a5592742fd960b9240d0b880fef84827fb25a307e61fe7b019f14e864653fbcf7dee0d0e3faf90593deaf624
+DIST xunit.analyzers.1.15.0.nupkg 256030 BLAKE2B a8049a4986d18c77e14ab1e9aa933aebdb63f67d1d4241c9737a0e99dddd13bc8735d2e9d79f5f3e5960a4eaa06326afe77a7a09e075e1d100fdfdf433f1742a SHA512 3b6b0ead18b4b5f3390d8a4704211970fa3fb63b8a7d9a28c5315f618108ba6d1b0df1d7a4851e3eaadd7b69378d8a9d1fdcc7146a4d026b2b5c4576f246e706
+DIST xunit.assert.2.9.0.nupkg 241676 BLAKE2B b30a5b6a2ebaf297a50193c763aa651a7bd5cee1f9effbe579f4fc2fbe234c98bdabd6fb391f232f48a74a0b9dfbe07a608e7ee0a58ed7d1a54fe7aac8212d36 SHA512 9c165702d49211134387ee0cd9439cedcd72b592a167208ee79ad132046962e0da34e8ca73d3bd6951c6961bf42b95ac8a5f6693dcebb6b0f11f7e4e73abdd6d
+DIST xunit.core.2.9.0.nupkg 33542 BLAKE2B 878b09e395bd3e6b74caf2a2c24082811ee546a64481a6a58de9a5cdcb79ccc0b69bad3092d1730326c14c5beb8ef0932eabb50a6009239e1adeb5cff2b8521f SHA512 10b5f10d9182ff0de612bcebe4563216c4244f49baba6e5c94971025ae695581311902878833db548c2b7cb7cbb30b4ffb080caf1cb33c318d42b0a001b3488c
+DIST xunit.extensibility.core.2.9.0.nupkg 296715 BLAKE2B 76b33cd2a89e2d22bc02b3007c798cd55095d48c9d422b9e0141571fc7d53800e328b075c2bc6e97702513c2c68ab4ff532e50e074b1ce8223cc530a5aede9bb SHA512 94a95b9a68c2271ac71e8506a950ffc9be9814aa17d6965d4aa233d4c2fd8fab9c04baf6c265829dc259ba286efa8fde86dc76e28eb4b32115c7a945dde4c9f4
+DIST xunit.extensibility.execution.2.9.0.nupkg 378299 BLAKE2B 6ca0e2cf8026b3fb0b36805704bc11bb8492abb53b89e65baec6dae83d8cc0d914a6424e917d334f860a3396be537f0782a1a54e3813f9ba8441499183d4aad7 SHA512 9674463e310e5e26c5da4d256ff45bcfca9f5c40b9541ba68d7a091f6350ad27134534ce0ede94b041cbaab0730b91bcd1726d300f6da3b991da17171922f0cb
+DIST xunit.runner.visualstudio.2.8.2.nupkg 595969 BLAKE2B d1ef775c4234177fcca64dc44144fecc2d613976c7afe58ddfba0a204bd36b932cb8adaa3619e47922218306b487de1f256611f5d1448798afc393a91b896c13 SHA512 cfe133857c4b9609ff9fb150e49d032716c69ecff5bf1d643c987852af8e3c2851a5d4b2df1fcc0aa43f8ed91ba1cec144cb61cf5e24ee92f40f78aafdee1dd0
+DIST zxing.net.0.16.9.nupkg 9657500 BLAKE2B a23c04e26bc09fccfec0a1e6f810ad2d3fae8e733fd5a3bd7ca17acc1010a7410657ae57576af6e66238999dcf945ca97f7e7b85abeee0b69b1b67692fa8332f SHA512 145f8e6bcf29b6c19ca336b4ec6063d0d35393f8fb613046cf40fcf68e9c1b7bb97341baece18ff3d37fc1cf31a227ff9da5266b994d6196dad592a43acfb567
diff --git a/app-office/naps2/metadata.xml b/app-office/naps2/metadata.xml
new file mode 100644
index 000000000000..ff03c465bdde
--- /dev/null
+++ b/app-office/naps2/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
+  </maintainer>
+  <longdescription>
+    NAPS2 on Linux allows you to scan from USB (using SANE) and network
+    scanners. Use your chosen settings, or set up multiple profiles for
+    different devices and configurations. Once you've finished scanning, you
+    can save, email, or print with only a couple clicks. Save to PDF, TIFF,
+    JPEG, PNG, or other file types.  Easily rotate, crop, and rearrange
+    scanned pages. Adjust brightness, contrast, and apply automatic document
+    corrections to make your scanned pages look great. Use OCR to add
+    searchable text to your PDFs in any of over 100 languages. Use batch
+    scanning, advanced profile settings, and an optional CLI to automate
+    tedious tasks.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/cyanfish/naps2/issues/</bugs-to>
+    <remote-id type="github">cyanfish/naps2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-office/naps2/naps2-7.5.1-r1.ebuild b/app-office/naps2/naps2-7.5.1-r1.ebuild
new file mode 100644
index 000000000000..1299470412a2
--- /dev/null
+++ b/app-office/naps2/naps2-7.5.1-r1.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2024 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
+
+	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/onlyoffice-bin/onlyoffice-bin-8.1.1.ebuild b/app-office/onlyoffice-bin/onlyoffice-bin-8.1.1.ebuild
index a284a31d72eb..a61865ebe953 100644
--- a/app-office/onlyoffice-bin/onlyoffice-bin-8.1.1.ebuild
+++ b/app-office/onlyoffice-bin/onlyoffice-bin-8.1.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="mirror strip test"
 
 RDEPEND="
diff --git a/app-pda/libimobiledevice-glue/Manifest b/app-pda/libimobiledevice-glue/Manifest
index 309afdf12745..c8bf40d1c264 100644
--- a/app-pda/libimobiledevice-glue/Manifest
+++ b/app-pda/libimobiledevice-glue/Manifest
@@ -1 +1,2 @@
 DIST libimobiledevice-glue-1.1.0.tar.bz2 324600 BLAKE2B 3fcd92de24884d73b83767ace135246c45b60b1221a9937b7d8d4e42f4ccc2105e1f88854682bcef3002af22913df76f61a40d0bece20a354def1b54e260d242 SHA512 5d3522f764bd33a847ec1773d6493a2671965f2432b569d7e2c98746dca7440188823e46a405893d936f725c6bc522bd273b16234e8780cf87b602fc395bdf75
+DIST libimobiledevice-glue-1.3.0.tar.bz2 340138 BLAKE2B c9133e6ec5d88cd3b0345f4dd2f3fc63f204dbc996ac649423884d9ed0e240e4659c7f9470560887db69255d3d675c4d38963c9b0f53521d835f33a4b3a9c93f SHA512 920705a2c467357308241d623ec0bd60eb76c225f11be45b06c4565e93b0daf6502a189e2c0278b36476d2d48472e690ab86cc7cc1a8c9365410510f60011011
diff --git a/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.3.0.ebuild b/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.3.0.ebuild
new file mode 100644
index 000000000000..1f5b8dfc748a
--- /dev/null
+++ b/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Support library for libimobiledevice projects"
+HOMEPAGE="https://github.com/libimobiledevice/libimobiledevice-glue"
+SRC_URI="https://github.com/libimobiledevice/libimobiledevice-glue/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND=">=app-pda/libplist-2.3:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index c02e6d5bd5d7..e96a57d1289e 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,2 +1 @@
-DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
 DIST libimobiledevice-1.3.0_p20240201.tar.gz 405723 BLAKE2B 5f3672e6b3c180440c215d9411eb2f21fe9451d822707e5b11ffff6693dccabfb5d184ef35f36bce2af508cbdebb656923927558ef39669825679a8ebf3cc8ee SHA512 d3746b7e0803840489593c9a3d8c8b16f6d4be5e2cd5c947d05be31e49c095c6503ef9150c886a87c68f4694bc6c1bfba96c4578789adc8f165a6391d0e4918f
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch
deleted file mode 100644
index c7b8cf0dcc2f..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/898666
-https://github.com/libimobiledevice/libimobiledevice/pull/1521
-
---- a/cython/installation_proxy.pxi
-+++ b/cython/installation_proxy.pxi
-@@ -27,7 +27,7 @@ cdef extern from "libimobiledevice/installation_proxy.h":
-     instproxy_error_t instproxy_restore(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data)
-     instproxy_error_t instproxy_remove_archive(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data)
- 
--cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) with gil:
-+cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) noexcept:
-     (<object>py_callback)(plist.plist_t_to_node(command, False), plist.plist_t_to_node(status, False))
- 
- cdef class InstallationProxyError(BaseError):
-
-From deba42ba94c13517ebdbe7a4d8177ab47a9589a5 Mon Sep 17 00:00:00 2001
-From: IridiumXOR <oliveriandrea@gmail.com>
-Date: Thu, 11 Jan 2024 22:00:39 +0100
-Subject: [PATCH 2/3] Fix np_notify_cb for Cython 3 noexcept error
-
---- a/cython/notification_proxy.pxi
-+++ b/cython/notification_proxy.pxi
-@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END
- NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED
- NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED
- 
--cdef void np_notify_cb(const_char_ptr notification, void *py_callback):
-+cdef void np_notify_cb(const_char_ptr notification, void *py_callback) noexcept:
-     (<object>py_callback)(notification)
- 
- cdef class NotificationProxyError(BaseError):
-
-From 7739a4bf61a0fa549646d6062978f126a1ff06fa Mon Sep 17 00:00:00 2001
-From: IridiumXOR <oliveriandrea@gmail.com>
-Date: Thu, 11 Jan 2024 22:03:07 +0100
-Subject: [PATCH 3/3] Fix idevice_event_cb for Cython 3 noexcept error
-
---- a/cython/imobiledevice.pyx
-+++ b/cython/imobiledevice.pyx
-@@ -94,7 +94,7 @@ cdef class iDeviceEvent:
-         def __get__(self):
-             return self._c_event.conn_type
- 
--cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) with gil:
-+cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) noexcept:
-     cdef iDeviceEvent event = iDeviceEvent.__new__(iDeviceEvent)
-     event._c_event = c_event
-     (<object>user_data)(event)
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch
deleted file mode 100644
index b52bf89355d9..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4b2f17e8cce8fa078aa55f5da5f726c20eac3e2e Mon Sep 17 00:00:00 2001
-From: Nikias Bassen <nikias@gmx.li>
-Date: Tue, 13 Apr 2021 05:36:03 +0200
-Subject: [PATCH] common: Add missing *_LIBS and *_CFLAGS to fix build
-
----
- common/Makefile.am | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/common/Makefile.am b/common/Makefile.am
-index 4e3facba..ab01b834 100644
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -8,12 +8,17 @@ AM_CFLAGS = \
- 	$(libplist_CFLAGS) \
- 	$(libgnutls_CFLAGS) \
- 	$(libtasn1_CFLAGS) \
-+	$(libgcrypt_CFLAGS) \
- 	$(openssl_CFLAGS) \
- 	$(LFS_CFLAGS)
- 
- AM_LDFLAGS = \
- 	$(libusbmuxd_LIBS) \
- 	$(libplist_LIBS) \
-+	$(libgnutls_LIBS) \
-+	$(libtasn1_LIBS) \
-+	$(libgcrypt_LIBS) \
-+	$(openssl_LIBS) \
- 	${libpthread_LIBS}
- 
- noinst_LTLIBRARIES = libinternalcommon.la
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch
deleted file mode 100644
index 28ca6da51ebd..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-https://github.com/libimobiledevice/libimobiledevice/pull/685
-
-From fb337f26c8e58ed0ce0750f7899ccbd5da203dee Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:43:57 -0700
-Subject: [PATCH 1/5] Fixed AFC afc.pxi definitions for Python2/3
- compatibility. Added missing public method 'remove_path_and_contents'
-
---- a/cython/afc.pxi
-+++ b/cython/afc.pxi
-@@ -52,6 +52,7 @@ cdef extern from "libimobiledevice/afc.h":
-     afc_error_t afc_read_directory(afc_client_t client, char *dir, char ***list)
-     afc_error_t afc_get_file_info(afc_client_t client, char *filename, char ***infolist)
-     afc_error_t afc_remove_path(afc_client_t client, char *path)
-+    afc_error_t afc_remove_path_and_contents(afc_client_t client, char *path)
-     afc_error_t afc_rename_path(afc_client_t client, char *f, char *to)
-     afc_error_t afc_make_directory(afc_client_t client, char *dir)
-     afc_error_t afc_truncate(afc_client_t client, char *path, uint64_t newsize)
-@@ -235,17 +236,17 @@ cdef class AfcClient(BaseService):
-             afc_file_mode_t c_mode
-             uint64_t handle
-             AfcFile f
--        if mode == <bytes>'r':
-+        if mode == b'r':
-             c_mode = AFC_FOPEN_RDONLY
--        elif mode == <bytes>'r+':
-+        elif mode == b'r+':
-             c_mode = AFC_FOPEN_RW
--        elif mode == <bytes>'w':
-+        elif mode == b'w':
-             c_mode = AFC_FOPEN_WRONLY
--        elif mode == <bytes>'w+':
-+        elif mode == b'w+':
-             c_mode = AFC_FOPEN_WR
--        elif mode == <bytes>'a':
-+        elif mode == b'a':
-             c_mode = AFC_FOPEN_APPEND
--        elif mode == <bytes>'a+':
-+        elif mode == b'a+':
-             c_mode = AFC_FOPEN_RDAPPEND
-         else:
-             raise ValueError("mode string must be 'r', 'r+', 'w', 'w+', 'a', or 'a+'")
-@@ -282,6 +283,9 @@ cdef class AfcClient(BaseService):
-     cpdef remove_path(self, bytes path):
-         self.handle_error(afc_remove_path(self._c_client, path))
- 
-+    cpdef remove_path_and_contents(self, bytes path):
-+        self.handle_error(afc_remove_path_and_contents(self._c_client, path))
-+
-     cpdef rename_path(self, bytes f, bytes t):
-         self.handle_error(afc_rename_path(self._c_client, f, t))
- 
-@@ -308,17 +312,17 @@ cdef class Afc2Client(AfcClient):
-             afc_file_mode_t c_mode
-             uint64_t handle
-             AfcFile f
--        if mode == <bytes>'r':
-+        if mode == b'r':
-             c_mode = AFC_FOPEN_RDONLY
--        elif mode == <bytes>'r+':
-+        elif mode == b'r+':
-             c_mode = AFC_FOPEN_RW
--        elif mode == <bytes>'w':
-+        elif mode == b'w':
-             c_mode = AFC_FOPEN_WRONLY
--        elif mode == <bytes>'w+':
-+        elif mode == b'w+':
-             c_mode = AFC_FOPEN_WR
--        elif mode == <bytes>'a':
-+        elif mode == b'a':
-             c_mode = AFC_FOPEN_APPEND
--        elif mode == <bytes>'a+':
-+        elif mode == b'a+':
-             c_mode = AFC_FOPEN_RDAPPEND
-         else:
-             raise ValueError("mode string must be 'r', 'r+', 'w', 'w+', 'a', or 'a+'")
-
-From b71e8935949a1d6f419a3f783d804809fb4c309b Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:44:40 -0700
-Subject: [PATCH 2/5] Fixed debugserver.pxi PyString_AsString compatibility
- with Python3
-
---- a/cython/debugserver.pxi
-+++ b/cython/debugserver.pxi
-@@ -44,7 +44,12 @@ cdef class DebugServerError(BaseError):
- 
- 
- # from http://stackoverflow.com/a/17511714
--from cpython.string cimport PyString_AsString
-+# https://github.com/libimobiledevice/libimobiledevice/pull/198
-+from cpython cimport PY_MAJOR_VERSION
-+if PY_MAJOR_VERSION <= 2:
-+    from cpython.string cimport PyString_AsString
-+else:
-+    from cpython.bytes cimport PyBytes_AsString as PyString_AsString
- cdef char ** to_cstring_array(list_str):
-     if not list_str:
-         return NULL
-
-From 44f54cdc0ebb052e4a642023bbf96504e6139ec9 Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:45:22 -0700
-Subject: [PATCH 3/5] Fixed bytes/strings check in imobiledevice.pyx for
- compatibility with Python2/3
-
---- a/cython/imobiledevice.pyx
-+++ b/cython/imobiledevice.pyx
-@@ -171,7 +171,7 @@ from libc.stdlib cimport *
- cdef class iDevice(Base):
-     def __cinit__(self, object udid=None, *args, **kwargs):
-         cdef char* c_udid = NULL
--        if isinstance(udid, basestring):
-+        if isinstance(udid, (str, bytes)):
-             c_udid = <bytes>udid
-         elif udid is not None:
-             raise TypeError("iDevice's constructor takes a string or None as the udid argument")
-
-From 8908619973e751b778d3fb73dc309cd5cb7f4122 Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:45:55 -0700
-Subject: [PATCH 4/5] Fixed bytes/strings checks in lockdown.pxi for
- compatibility with Python2/3
-
---- a/cython/lockdown.pxi
-+++ b/cython/lockdown.pxi
-@@ -230,9 +230,9 @@ cdef class LockdownClient(PropertyListService):
- 
-         if issubclass(service, BaseService) and \
-             service.__service_name__ is not None \
--            and isinstance(service.__service_name__, basestring):
-+            and isinstance(service.__service_name__, (str, bytes)):
-             c_service_name = <bytes>service.__service_name__
--        elif isinstance(service, basestring):
-+        elif isinstance(service, (str, bytes)):
-             c_service_name = <bytes>service
-         else:
-             raise TypeError("LockdownClient.start_service() takes a BaseService or string as its first argument")
-@@ -253,7 +253,7 @@ cdef class LockdownClient(PropertyListService):
- 
-         if not hasattr(service_class, '__service_name__') and \
-             not service_class.__service_name__ is not None \
--            and not isinstance(service_class.__service_name__, basestring):
-+            and not isinstance(service_class.__service_name__, (str, bytes)):
-             raise TypeError("LockdownClient.get_service_client() takes a BaseService as its first argument")
- 
-         descriptor = self.start_service(service_class)
-
-From e59cbdbf4e7dba98ef57a54e314a89edfea0a3dc Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:47:48 -0700
-Subject: [PATCH 5/5] Fixed method visibility in mobilebackup2.pxi API
-
---- a/cython/mobilebackup2.pxi
-+++ b/cython/mobilebackup2.pxi
-@@ -54,10 +54,10 @@ cdef class MobileBackup2Client(PropertyListService):
-     cdef inline BaseError _error(self, int16_t ret):
-         return MobileBackup2Error(ret)
- 
--    cdef send_message(self, bytes message, plist.Node options):
-+    cpdef send_message(self, bytes message, plist.Node options):
-         self.handle_error(mobilebackup2_send_message(self._c_client, message, options._c_node))
- 
--    cdef tuple receive_message(self):
-+    cpdef tuple receive_message(self):
-         cdef:
-             char* dlmessage = NULL
-             plist.plist_t c_node = NULL
-@@ -73,29 +73,34 @@ cdef class MobileBackup2Client(PropertyListService):
-                 free(dlmessage)
-             raise
- 
--    cdef int send_raw(self, bytes data, int length):
-+    cpdef int send_raw(self, bytes data, int length):
-         cdef:
--            uint32_t bytes = 0
-+            uint32_t bytes_recvd = 0
-             mobilebackup2_error_t err
--        err = mobilebackup2_send_raw(self._c_client, data, length, &bytes)
-+        err = mobilebackup2_send_raw(self._c_client, data, length, &bytes_recvd)
-         try:
-             self.handle_error(err)
--            return <bint>bytes
-+            return <bint>bytes_recvd
-         except BaseError, e:
-             raise
- 
--    cdef int receive_raw(self, bytes data, int length):
-+    cpdef int receive_raw(self, bytearray data, int length):
-         cdef:
--            uint32_t bytes = 0
-+            uint32_t bytes_recvd = 0
-             mobilebackup2_error_t err
--        err = mobilebackup2_receive_raw(self._c_client, data, length, &bytes)
-+        err = mobilebackup2_receive_raw(self._c_client, data, length, &bytes_recvd)
-+
-+        # Throwing an exception when we test if theres more data to read is excessive
-+        if err == -1 and bytes_recvd == 0:
-+            return 0
-+
-         try:
-             self.handle_error(err)
--            return <bint>bytes
-+            return <bint>bytes_recvd
-         except BaseError, e:
-             raise
- 
--    cdef float version_exchange(self, double[::1] local_versions):
-+    cpdef float version_exchange(self, double[::1] local_versions):
-         cdef:
-             double[::1] temp = None
-             double remote_version = 0.0
-@@ -107,8 +112,8 @@ cdef class MobileBackup2Client(PropertyListService):
-         except BaseError, e:
-             raise
- 
--    cdef send_request(self, bytes request, bytes target_identifier, bytes source_identifier, plist.Node options):
-+    cpdef send_request(self, bytes request, bytes target_identifier, bytes source_identifier, plist.Node options):
-         self.handle_error(mobilebackup2_send_request(self._c_client, request, target_identifier, source_identifier, options._c_node))
- 
--    cdef send_status_response(self, int status_code, bytes status1, plist.Node status2):
-+    cpdef send_status_response(self, int status_code, bytes status1, plist.Node status2):
-         self.handle_error(mobilebackup2_send_status_response(self._c_client, status_code, status1, status2._c_node))
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch
deleted file mode 100644
index 1e9fa6caf585..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 735ac51e0eeaa3419e85dbad9579401ae828f631 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Tue, 6 Apr 2021 13:06:35 -0700
-Subject: [PATCH] tools: Fix usage of LDFLAGS and LDADD.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- tools/Makefile.am | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 8ed8ad91..04a5faa7 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -40,8 +40,8 @@ bin_PROGRAMS = \
- 
- ideviceinfo_SOURCES = ideviceinfo.c
- ideviceinfo_CFLAGS = $(AM_CFLAGS)
--ideviceinfo_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+ideviceinfo_LDFLAGS = $(AM_LDFLAGS)
-+ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicename_SOURCES = idevicename.c
- idevicename_CFLAGS = $(AM_CFLAGS)
-@@ -50,8 +50,8 @@ idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicepair_SOURCES = idevicepair.c
- idevicepair_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
--idevicepair_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS)
--idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS)
-+idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicesyslog_SOURCES = idevicesyslog.c
- idevicesyslog_CFLAGS = $(AM_CFLAGS)
-@@ -65,18 +65,18 @@ idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicebackup_SOURCES = idevicebackup.c
- idevicebackup_CFLAGS = $(AM_CFLAGS)
--idevicebackup_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicebackup_LDFLAGS = $(AM_LDFLAGS)
-+idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicebackup2_SOURCES = idevicebackup2.c
- idevicebackup2_CFLAGS = $(AM_CFLAGS)
--idevicebackup2_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicebackup2_LDFLAGS = $(AM_LDFLAGS)
-+idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- ideviceimagemounter_SOURCES = ideviceimagemounter.c
- ideviceimagemounter_CFLAGS = $(AM_CFLAGS)
--ideviceimagemounter_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+ideviceimagemounter_LDFLAGS = $(AM_LDFLAGS)
-+ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicescreenshot_SOURCES = idevicescreenshot.c
- idevicescreenshot_CFLAGS = $(AM_CFLAGS)
-@@ -95,13 +95,13 @@ idevicedate_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- ideviceprovision_SOURCES = ideviceprovision.c
- ideviceprovision_CFLAGS = $(AM_CFLAGS)
--ideviceprovision_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+ideviceprovision_LDFLAGS = $(AM_LDFLAGS)
-+ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c
- idevicedebugserverproxy_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
--idevicedebugserverproxy_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicedebugserverproxy_LDFLAGS = $(AM_LDFLAGS)
-+idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicediagnostics_SOURCES = idevicediagnostics.c
- idevicediagnostics_CFLAGS = $(AM_CFLAGS)
-@@ -110,8 +110,8 @@ idevicediagnostics_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicedebug_SOURCES = idevicedebug.c
- idevicedebug_CFLAGS = $(AM_CFLAGS)
--idevicedebug_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicedebug_LDFLAGS = $(AM_LDFLAGS)
-+idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicenotificationproxy_SOURCES = idevicenotificationproxy.c
- idevicenotificationproxy_CFLAGS = $(AM_CFLAGS)
-@@ -120,10 +120,10 @@ idevicenotificationproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicecrashreport_SOURCES = idevicecrashreport.c
- idevicecrashreport_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
--idevicecrashreport_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicecrashreport_LDFLAGS = $(AM_LDFLAGS)
-+idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicesetlocation_SOURCES = idevicesetlocation.c
- idevicesetlocation_CFLAGS = $(AM_CFLAGS)
--idevicesetlocation_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicesetlocation_LDFLAGS = $(AM_LDFLAGS)
-+idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild
deleted file mode 100644
index c7233fe43fc1..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.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_{9..11} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/${PV}/${P}.tar.bz2"
-
-# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="doc gnutls python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=app-pda/libplist-2.2.0:= <app-pda/libplist-2.3
-	>=app-pda/libusbmuxd-2.0.2:=
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=dev-libs/libtasn1-1.1
-		>=net-libs/gnutls-2.2.0
-	)
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	python? (
-		${PYTHON_DEPS}
-		app-pda/libplist[python(-),${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )
-"
-
-BUILD_DIR="${S}_build"
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch"
-	"${FILESDIR}/${P}-missing_libflags.patch" #787962
-	"${FILESDIR}/${P}-python.patch"
-	"${FILESDIR}"/${P}-cython3.patch # Bug #898666
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	local myeconfargs=( $(use_enable static-libs static) )
-	use gnutls && myeconfargs+=( --disable-openssl )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		# Bug 567916
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:$1/cython" \
-			imobiledevice_la_LIBADD="$1/src/libimobiledevice-1.0.la"
-	}
-
-	emake -C "${BUILD_DIR}"
-	use python && python_foreach_impl python_compile "${BUILD_DIR}"
-
-	if use doc; then
-		doxygen "${BUILD_DIR}"/doxygen.cfg || die
-	fi
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" install \
-			DESTDIR="${D}" \
-			VPATH="${S}/cython:$1/cython"
-	}
-
-	emake -C "${BUILD_DIR}" install DESTDIR="${D}"
-	use python && python_foreach_impl python_install "${BUILD_DIR}"
-	use doc && dodoc docs/html/*
-
-	if use python; then
-		insinto /usr/include/${PN}/cython
-		doins cython/imobiledevice.pxd
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild
index 407e3ee47d02..3d123b13e748 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 MY_COMMIT=73b6fd183872096f20e6d1007429546a317a7cb1
 
 DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
+HOMEPAGE="https://libimobiledevice.org/"
 SRC_URI="https://github.com/libimobiledevice/libimobiledevice/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index d9ffa60af239..1ac9f02b1f69 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,2 +1,2 @@
-DIST libplist-2.2.0.tar.xz 102932 BLAKE2B cca3099d5a2230feb67fd4d54777f2c3d0a083b811d2b7e3365399d2c2d2fff922a3c9f4924400810b71d92668779ede663c9ed2cebc8acd6f3b2c6e09285d90 SHA512 913a8d05239496d8e8e458e1cb974813d8b5ca013df9e0fddb97b1da6006c300f6ba2be2f3826fd157c0ae4ff2d003ecfdc55e2401884be26360ffe0ebdabd79
 DIST libplist-2.3.0.tar.xz 123876 BLAKE2B 2e5555eeeed5a7572fcdb98e537af842af1d056bb5fe42ae83b7e71e1a57535ee388fc263c9b7a495feccbe5d2d7c53c89987fb0a81573fe3f5ac9f884144cf7 SHA512 ce86f066ea03d86b3a6dcca5905044e93af46164ab55be167f7804926b7e28c3383a024903986fb273b8c40b07b749f5431048ce76e550674f83388d6cff7542
+DIST libplist-2.6.0.tar.bz2 493169 BLAKE2B d022b64a02e30fe7d5f2937e8b6743b0af8f30cf2012e2c19da9f10366200d25968b11a401a62697ce46eb71d08111104115a993e2f578c36e19ccd42d9eb627 SHA512 67b9ef7c1cf1edd9e0a13462cc21a42dba6bb1ff4465edd56c5d4251e4063e71eb8839ed9952ffb8cdab9cd69ebb4ef46e5f804d3a2b4e44b4e04f6c571398a4
diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
deleted file mode 100644
index 7b9bdc353268..000000000000
--- a/app-pda/libplist/files/libplist-2.2.0-fmin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,19 +79,7 @@
- esac
- AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
- 
--# Check if we need libm for fmin
--CACHED_CFLAGS="$CFLAGS"
--CFLAGS="-O0"
--AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin,
--	AC_TRY_LINK([
--		#include <math.h>
--		#include <float.h>
--	], [
--		double val = 3.1415f * 0.55555f;
--		double diff = fmin(val, DBL_MAX);
--		if (diff > 0) return 1;
--	], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no))
--CFLAGS="$CACHED_CFLAGS"
-+AC_SEARCH_LIBS([fmin],[m])
- 
- # Check if struct tm has a tm_gmtoff member
- AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-@@ -153,10 +141,6 @@
- AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith  -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS")
- GLOBAL_LDFLAGS="$PTHREAD_LIBS"
- 
--if test "x$ac_cv_fmin_builtin" != "xyes"; then
--	GLOBAL_LDFLAGS+=" -lm"
--fi
--
- AC_ARG_ENABLE(debug,
- AS_HELP_STRING([--enable-debug],
-                [build debug message output code (default is no)]),
diff --git a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
deleted file mode 100644
index 2771a9f08a69..000000000000
--- a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/854837
-https://github.com/libimobiledevice/libplist/pull/212
---- a/src/bplist.c
-+++ b/src/bplist.c
-@@ -998,18 +998,24 @@ static void write_real(bytearray_t * bplist, double val)
-     buff[7] = BPLIST_REAL | Log2(size);
-     if (size == sizeof(float)) {
-         float floatval = (float)val;
--        *(uint32_t*)(buff+8) = float_bswap32(*(uint32_t*)&floatval);
-+        uint32_t intval;
-+        memcpy(&intval, &floatval, sizeof(float));
-+        *(uint32_t*)(buff+8) = float_bswap32(intval);
-     } else {
--        *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
-+        uint64_t intval;
-+        memcpy(&intval, &val, sizeof(double));
-+        *(uint64_t*)(buff+8) = float_bswap64(intval);
-     }
-     byte_array_append(bplist, buff+7, size+1);
- }
- 
- static void write_date(bytearray_t * bplist, double val)
- {
-+    uint64_t intval;
-+    memcpy(&intval, &val, sizeof(double));
-     uint8_t buff[16];
-     buff[7] = BPLIST_DATE | 3;
--    *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
-+    *(uint64_t*)(buff+8) = float_bswap64(intval);
-     byte_array_append(bplist, buff+7, 9);
- }
- 
diff --git a/app-pda/libplist/libplist-2.2.0-r4.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild
deleted file mode 100644
index d1180010c230..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r4.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-fmin.patch
-	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
-	"${FILESDIR}"/${PN}-2.2.0-strict-aliasing.patch # bug 854837
-)
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf --disable-static "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	# Don't prefer clang.
-	tc-export CC CXX
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	local native_builddir=${BUILD_DIR}
-	ln -s "${native_builddir}/src/libplist-2.0.la" \
-		"${native_builddir}/src/libplist.la" || die
-
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
-	}
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	einstalldocs
-
-	if use python ; then
-		insinto /usr/include/plist/cython
-		doins cython/plist.pxd
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# temporary fix for 2.2.0 release:
-	# bug #733082,
-	# https://github.com/libimobiledevice/libplist/issues/163
-	# upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
-	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
-	dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
-	dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
-}
diff --git a/app-pda/libplist/libplist-2.3.0-r1.ebuild b/app-pda/libplist/libplist-2.3.0-r1.ebuild
deleted file mode 100644
index 432e1904e74f..000000000000
--- a/app-pda/libplist/libplist-2.3.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
-
-inherit autotools
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
-	"${FILESDIR}"/${PN}-2.3.0-test-rename.patch
-)
-
-src_prepare() {
-	default
-	RELEASE_VERSION=${PV} eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--without-cython
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	# bugs #733082, #915375
-	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
-	dosym ./libplist++-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist++.pc
-	dosym ./libplist++-2.0.so.4.3.0 /usr/$(get_libdir)/libplist++.so
-	dosym ./libplist-2.0.so.4.3.0 /usr/$(get_libdir)/libplist.so
-}
diff --git a/app-pda/libplist/libplist-2.3.0-r2.ebuild b/app-pda/libplist/libplist-2.3.0-r2.ebuild
index 8b80dfcaf736..4d3c47a1ae03 100644
--- a/app-pda/libplist/libplist-2.3.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.3.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
+HOMEPAGE="https://libimobiledevice.org/"
 SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-pda/libplist/libplist-2.6.0.ebuild b/app-pda/libplist/libplist-2.6.0.ebuild
new file mode 100644
index 000000000000..b4811e935f01
--- /dev/null
+++ b/app-pda/libplist/libplist-2.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://libimobiledevice.org/"
+SRC_URI="https://github.com/libimobiledevice/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--without-cython
+		$(use_with test tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# bugs #733082, #915375
+	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+	dosym ./libplist++-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist++.pc
+	dosym ./libplist++-2.0.so.4.6.0 /usr/$(get_libdir)/libplist++.so
+	dosym ./libplist-2.0.so.4.6.0 /usr/$(get_libdir)/libplist.so
+}
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 3867523c0108..3e11ab998d28 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1 +1,2 @@
 DIST libusbmuxd-2.0.2.tar.xz 41960 BLAKE2B 74a031ec595e40cf0532c753553cb2c35785410eba41a0a0abf45ed23dd6af7528238386ee9c0a4f8709cd447192969f15504fcbb58476441dc593ae28c388d9 SHA512 ce940fc6741973ed09ff0e5428aef78577449ca8e13766e9cbe121f3a2a26873ca164f10b441cc046653cc8550b68cc869ecb57a50fc999cebb55702642c4766
+DIST libusbmuxd-2.1.0.tar.bz2 325055 BLAKE2B f027a3d5fe7cae4628f2120f2c47b66928d4c426848e925ed3cf9ad22f8da23c7fb3a8c9588bc1576a797ac1b8f523455f46b94ce453c8e894da16e06c6bb05a SHA512 c7646b8c7e6c55bb87595380d22d77563f9d3981bf8f169a7ac85650e2860bcbb6831c4968040b92efdc1267a8ca9ae81c2f46c6644ba0c40333f81d6651cf19
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
deleted file mode 100644
index 863023df28a5..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.2-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=7
-
-inherit autotools
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
-LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
-SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=app-pda/libplist-2.2.0:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(usex kernel_linux '' --without-inotify)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.1.0.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.1.0.ebuild
new file mode 100644
index 000000000000..5221189169b4
--- /dev/null
+++ b/app-pda/libusbmuxd/libusbmuxd-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://libimobiledevice.org/"
+SRC_URI="https://github.com/libimobiledevice/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
+SLOT="0/2.0-7" # based on SONAME of libusbmuxd-2.0.so
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	>=app-pda/libimobiledevice-glue-1.2.0:=
+	>=app-pda/libplist-2.2.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(usex kernel_linux '' --without-inotify)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 9b037fbf4578..17be1bb35aed 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,2 +1 @@
-DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
 DIST usbmuxd-1.1.1_p20231011.tar.gz 65638 BLAKE2B 68bfdcdf907241fbf3b8b41133e11f3b08c5007417a1ea86f5428a5c11f480f9e6a6a9073080976d84ed14b456f61e19ef2b2f161d5b1ec19367fe01eb89b435 SHA512 dfe2e39496aa6841aaa7c02dc5ad5425f4199d5e5ccf560438e5f07fff9050124918ce99a1b2e22fc5b8718e091aff81ff209467de16701a14279e994c5ceefe
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
deleted file mode 100644
index 59ac7d442a59..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.1.1-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
-
-inherit systemd udev
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://libimobiledevice.org/"
-SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P}.tar.bz2"
-
-# src/utils.h is LGPL-2.1+, rest is found in COPYING*
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="selinux systemd"
-
-DEPEND="
-	acct-user/usbmux
-	>=app-pda/libimobiledevice-1.3.0:=
-	>=app-pda/libplist-2.2:= <app-pda/libplist-2.3
-	virtual/libusb:1=
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/udev
-	selinux? ( sec-policy/selinux-usbmuxd )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		"$(use_with systemd)" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/app-portage/command-not-found/Manifest b/app-portage/command-not-found/Manifest
index 5dee0b041929..8a54bd2f432e 100644
--- a/app-portage/command-not-found/Manifest
+++ b/app-portage/command-not-found/Manifest
@@ -1,2 +1 @@
-DIST command-not-found-0.0.5.tar.gz 10045 BLAKE2B 5225fe4512516518172b1c7d25563488f26b359e0698a3352ebf2143dd7983fee2c44050e2b4abf72377780875436861855f0891bc10d429fba9bba695808bf3 SHA512 9125e168d64b7474f83d1bc8ed7f54ef332190d0d7325c281f1a041d47b23ce18170dff2fa3342468941cba7b0197821790ef5d1e9b8c1ee1f5a6ba1383b1005
 DIST command-not-found-0.0.6.tar.gz 10290 BLAKE2B 352a77790539acca9d54902e8078b580a5f4a789d61c395944363b4a42f8750cd518e3d8a22f69c409c8ab090cf6345677c324f3faa1e67071439cd6f600c7a3 SHA512 9396b7cb1cbcbc53047928ede0f77613e7f5ad3d5855f6476c40642c52a419aa6227e9b329d8d73d267fbd946e36f21740420ea854555025ddd2ea7eb1dbcec2
diff --git a/app-portage/command-not-found/command-not-found-0.0.5.ebuild b/app-portage/command-not-found/command-not-found-0.0.5.ebuild
deleted file mode 100644
index 8a564e886685..000000000000
--- a/app-portage/command-not-found/command-not-found-0.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit optfeature python-r1
-
-DESCRIPTION="Command-not-found handler for Gentoo"
-HOMEPAGE="https://github.com/AndrewAmmerlaan/command-not-found-gentoo"
-SRC_URI="https://github.com/AndrewAmmerlaan/command-not-found-gentoo/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-gentoo-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	python_foreach_impl python_doscript command-not-found
-
-	insinto /etc/bash/bashrc.d
-	doins command-not-found.sh
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "${PN} is automatically setup for app-shells/bash, see"
-	elog "    /usr/share/doc/${PF}/README.md"
-	elog "for instructions on how to set it up for various other shells."
-	elog
-	optfeature "suggesting snaps providing the missing command" "app-containers/snapd"
-	optfeature "suggesting ebuilds providing the missing command" "app-portage/pfl"
-}
diff --git a/app-portage/command-not-found/command-not-found-0.0.6.ebuild b/app-portage/command-not-found/command-not-found-0.0.6.ebuild
index 4943e69c1ba9..8a564e886685 100644
--- a/app-portage/command-not-found/command-not-found-0.0.6.ebuild
+++ b/app-portage/command-not-found/command-not-found-0.0.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 9fef1bcd1cd0..afa454fcf53c 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -1,4 +1,3 @@
-DIST elt-patches-20240315.tar.xz 45416 BLAKE2B 4a1e33bba89c43cb91d75641d35837aa482e2e119079321b4e1824ee5bd4b0f5c465c4709082daf987dedf423fef5adb9ba8d8d1b9d6dc814c663dda86ac0ee0 SHA512 7c2034713630f8ad40fed5be34f397749e8e1f63d5933656fe3618e97cf59240aaa64468fcb1a46bac111b96603e538b857513ca80d327c0be865868020457ea
-DIST elt-patches-20240324.tar.xz 45712 BLAKE2B 29a94ad3132ba10f4fc90cde685732b1cb679d693e1b1a1fbdb7fd99fbfc70aa7df9e6753ef6374cd606195829bd9d6a8b9b19126780ffa8f28542fb59d99fb0 SHA512 3878d5d303b372c873859510d6a0f3911657f4b66af8a91833657a13902474d011e30b4d245e5f82df791a9231f0253bb0ddef42bba66acb4241600265fb7925
 DIST elt-patches-20240512.tar.xz 46176 BLAKE2B 8ca496aae63dd49e7148b7c06e687b3644a58211ec5cf7b82d8ccb7603df6390c7f9ba6f71b4b9b9db7263bf0c7005f9c6098091227c6b34729032f6a6101cd7 SHA512 c33321668b9191d2f8221fb4a1ea365ccce6d0b61bf8bb1b95fc6c2c67ada8b36c44d7423d994678e60e3197bf2721aca9e062e882d2cea05b465ad0d4e8a93c
 DIST elt-patches-20240721.tar.xz 46392 BLAKE2B 87d2cefebcacbfa447e8981bf16eda3d21bcf4190e91c478280cd81089ab43440a86ff84a5c6b2cda7d772707dad645d4f481d9ec2543f9c14059fe084c2f54d SHA512 a8a8f55e5e1b0a2ea67895e86307a6fd5116593c25a2e3cc6fb2361f21eddc125a91c46ef84c0fd036c1bb25a682a4ff07c581c041a9b853d713d5c8f73d8d5b
+DIST elt-patches-20240824.tar.xz 47256 BLAKE2B 3fc40af8eb219277a11051be3e8391bed08fba28a7d79b83ee3ab3cf6360d5d0c04ce2a2db7d627eaf76e029899cafb1ad22ac465634a17d3ba6b7b48d9a457d SHA512 0eb502b026003e918e8aa4045cb3556524d52c331c099a445b9638b3cdfdabf22538c08a0526332671c3623db77bf56d3b6f580402abbc5253d1dca9ec759476
diff --git a/app-portage/elt-patches/elt-patches-20240315.ebuild b/app-portage/elt-patches/elt-patches-20240315.ebuild
deleted file mode 100644
index 1c8e8632cc83..000000000000
--- a/app-portage/elt-patches/elt-patches-20240315.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="Collection of patches for libtool.eclass"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/elt-patches.git
-		https://github.com/gentoo/elt-patches
-	"
-	inherit git-r3
-else
-	SRC_URI="
-		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-	"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# The 'check' target currently wants network access to fetch libtool tarballs.
-RESTRICT="test"
-
-RDEPEND="sys-apps/gentoo-functions"
-BDEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
-}
diff --git a/app-portage/elt-patches/elt-patches-20240324.ebuild b/app-portage/elt-patches/elt-patches-20240324.ebuild
deleted file mode 100644
index 1c8e8632cc83..000000000000
--- a/app-portage/elt-patches/elt-patches-20240324.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="Collection of patches for libtool.eclass"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/elt-patches.git
-		https://github.com/gentoo/elt-patches
-	"
-	inherit git-r3
-else
-	SRC_URI="
-		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-	"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# The 'check' target currently wants network access to fetch libtool tarballs.
-RESTRICT="test"
-
-RDEPEND="sys-apps/gentoo-functions"
-BDEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
-}
diff --git a/app-portage/elt-patches/elt-patches-20240721.ebuild b/app-portage/elt-patches/elt-patches-20240721.ebuild
index 29410c13f990..e4f296996a88 100644
--- a/app-portage/elt-patches/elt-patches-20240721.ebuild
+++ b/app-portage/elt-patches/elt-patches-20240721.ebuild
@@ -19,7 +19,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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-20240824.ebuild b/app-portage/elt-patches/elt-patches-20240824.ebuild
new file mode 100644
index 000000000000..29410c13f990
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20240824.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/elt-patches.git
+		https://github.com/gentoo/elt-patches
+	"
+	inherit git-r3
+else
+	SRC_URI="
+		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# The 'check' target currently wants network access to fetch libtool tarballs.
+RESTRICT="test"
+
+RDEPEND="sys-apps/gentoo-functions"
+BDEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
+}
diff --git a/app-portage/emlop/Manifest b/app-portage/emlop/Manifest
index 08867fedb507..52d016592e54 100644
--- a/app-portage/emlop/Manifest
+++ b/app-portage/emlop/Manifest
@@ -106,10 +106,10 @@ DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f
 DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2
 DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
 DIST time-0.3.22.crate 113792 BLAKE2B 8c9920d38b2d9b2f3204de7fe399f6e25b0a7ae7bb72d155eeba397f5721130fae1e0b3022ce9f1109d08e73b72a9fd09043d69f5cca953e80f3d70c4f49a71d SHA512 55575d043cdda64f7a789c61360974d17d3d380a4f0b243346222709743609503644c352ab2ec5d5336bd2b2a4709d54fe1863209d5625f14f881a1c33df1763
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+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.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST time-macros-0.2.9.crate 23684 BLAKE2B 5484a3c5bca52fcff3fcd4e6f060ee24ce293fbdad1abd5819d0426eca29b95de866fe1273e0ed3431d1b94b12c37f23748d4cacb0112a67e9be0f49132d03ba SHA512 2fe094e61ca0ab708d60693367812f1b87fb9b6770dbfa3dad8a2aad7d2a000c24ae3b8960104d6c5b72b4a055c7715fa5d4d601eb7b7ea1764bb730aec86033
 DIST toml-0.8.10.crate 50667 BLAKE2B 815c850d4e2b8f107729c24ff82a6be81160649fff726f07a2c6e2af0283298fd5eadcc5811ba4ef20ce12914ecb43da79fa1840fea8d1572ca59f02f9e2c310 SHA512 24f3b44244d7e91ae50eaf20bde40c177352592aadd2dac697a831a5de9305ac1c93c8dc407579b9bbd8d9984fe34cfdc42c3243cd0057ad83db14bd899bb546
 DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
diff --git a/app-portage/emlop/emlop-0.7.0.ebuild b/app-portage/emlop/emlop-0.7.0.ebuild
index bd064cc27d2f..cf05a60489ae 100644
--- a/app-portage/emlop/emlop-0.7.0.ebuild
+++ b/app-portage/emlop/emlop-0.7.0.ebuild
@@ -68,8 +68,8 @@ CRATES="
 	thiserror-impl@1.0.57
 	thiserror@1.0.57
 	time-core@0.1.2
-	time-macros@0.2.17
-	time@0.3.34
+	time-macros@0.2.18
+	time@0.3.36
 	toml@0.8.10
 	toml_datetime@0.6.5
 	toml_edit@0.22.6
@@ -111,6 +111,11 @@ BDEPEND=">=virtual/rust-1.71.0"
 # rust does not use *FLAGS from make.conf, silence portage warning
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
+PATCHES=(
+	# Fix build with rust >= 1.80
+	"${FILESDIR}/${P}-time_dep.patch"
+)
+
 src_install() {
 	cargo_src_install
 	dodoc README.md CHANGELOG.md emlop.toml
diff --git a/app-portage/emlop/files/emlop-0.7.0-time_dep.patch b/app-portage/emlop/files/emlop-0.7.0-time_dep.patch
new file mode 100644
index 000000000000..ccf42d498e00
--- /dev/null
+++ b/app-portage/emlop/files/emlop-0.7.0-time_dep.patch
@@ -0,0 +1,28 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index b34d367..21ab90b 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -536,9 +536,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -559,9 +559,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
diff --git a/app-portage/gentle/Manifest b/app-portage/gentle/Manifest
index 32a131baf15b..070d0735a8c8 100644
--- a/app-portage/gentle/Manifest
+++ b/app-portage/gentle/Manifest
@@ -1,2 +1 @@
-DIST gentle_mxml-0.4.0.tar.gz 329273 BLAKE2B baf6d954838d6cd2fc9548aaa33c85cb53307b325521a2fe300486a2cc08e833f835016ba632b484c1068c7deee3b2eeb17606f0180d248081304fa866b79461 SHA512 beac2c7bd3e4d80448fec5a633502e6cdc763145541b9205e3c354597b4e9c724f94cadb747b87df3c49669f5534cc9d123ded00b45b9cb783cd4e086a9b3ceb
 DIST gentle_mxml-1.0.0.tar.gz 356588 BLAKE2B bb5eddfd91876226cad27c6e2b06ac60926c7f1075c3c6838b2abf262b9a7ec7740083e8397a3980174d83d3c2b6fff67772adf2454fb11892a1624d27ebf533 SHA512 fdd9399545e6613b932de3bfc093815019941fcbba1535384a77431259320b478cd4a020ea3d657f1bf2a296a8f788fb9a08bc1c917b3c59e06d2a237f22a91a
diff --git a/app-portage/gentle/gentle-0.4.0.ebuild b/app-portage/gentle/gentle-0.4.0.ebuild
deleted file mode 100644
index b2f9beb6bc2b..000000000000
--- a/app-portage/gentle/gentle-0.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=flit
-PYPI_PN="gentle-mxml"
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Gentoo Lazy Entry - a metadata.xml generator"
-HOMEPAGE="
-	https://gentle.sysrq.in
-	https://pypi.org/project/gentle-mxml/
-"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		app-text/xmldiff[${PYTHON_USEDEP}]
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/rdflib[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep \
-			'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# require network
-	"tests/python/wheel/test_generator.py::test_pkg_empty[pyproject.toml]"
-	"tests/python/wheel/test_generator.py::test_pkg_empty[setup.py]"
-)
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/insipid-sphinx-theme \
-	dev-python/sphinx-prompt
-
-pkg_postinst() {
-	optfeature "python packaging support" dev-python/build
-	optfeature "PKG-INFO support" dev-python/pkginfo
-	optfeature "yaml support" dev-python/pyyaml
-	optfeature "rdf support" dev-python/rdflib
-	optfeature "toml support" dev-python/tomli
-}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 27d5cee1963f..30f127a1258a 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,3 +2,4 @@ DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B 0f9befac53faa2b578b461a55c7113934a
 DIST gentoolkit-0.6.5.tar.bz2 3186457 BLAKE2B 7f873385b183e51b03e1c4be0edbabc89556e1b3a1dce2be71584c9ea927dd09185ba1022e570de0ed2a46cbb764c67f6eaccf97dc5892f4f355244bac7c0545 SHA512 cff9e7b1b8122941b03f7e156f25b5b416c5e4bbf1b759ecf006c271758f2548323bf59ba94a14f3268eea43081ccbba3ab63e118123af870c0257aaecbb9554
 DIST gentoolkit-0.6.6.tar.bz2 3187351 BLAKE2B f8add246e9d968c57a8d0e5c842a40a7646e92cc165ca611df35988ba55bd0221a26eefb351680f53e81adcf608a20eab604d0a9b9e52f936ebc7c20575c597c SHA512 73fc4b8d98dc118d3c505c49d94dd248c92d2bde883c130c65dcf814d200a165084e9c94713e93341e7c54b59b59db83279538440e0822902de688c135b8949d
 DIST gentoolkit-0.6.7.tar.bz2 3187598 BLAKE2B 54c576fa7ded310fae24100171e069bfc79c0f908199384d33cac34d49f62e5cac4bda3e7f93db1866f8d4cf75afb465d82038eebb4df27070e14e73fba65feb SHA512 a5fb73c9b43e74541ccbb0537f860b6623284b84feb8922c95b5b5dd1dbd3db5117cbc3f899483c1a99086fcd8ddf49f71b81475e29af9e8bcdd1255553501fe
+DIST gentoolkit-0.6.8.tar.bz2 3190065 BLAKE2B 2f792d174a25c03e0f1b895fe06282412d383561e5456d5b4d2d918f7648790846fa9390b3bb9c862618ffefe749d9ccc236682be9fecde12ef8fda17c79359d SHA512 91ba97d8000d90350ea63c4d3be69dda919795b62ae84fe264ae8fee24ce6f6250599e03b086a334344df402781372ba9ced4cedb1c2fc66e2a4f6115ee57fc5
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
index a463fae5ad9d..cdf0defdfb25 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
new file mode 100644
index 000000000000..a463fae5ad9d
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit meson python-r1 tmpfiles
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Need newer Portage for eclean-pkg API, bug #900224
+DEPEND="
+	>=sys-apps/portage-3.0.57[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	app-alternatives/awk
+	sys-apps/gentoo-functions
+"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-build/meson-1.2.1-r1
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	default
+	if use prefix-guest ; then
+		# use correct repo name, bug #632223
+		sed -i \
+			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
+			pym/gentoolkit/profile.py || die
+	fi
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		$(meson_use test tests)
+		-Deprefix="${EPREFIX}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles data/tmpfiles.d/revdep-rebuild.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+	)
+
+	meson_src_install
+	python_optimize "${pydirs[@]}"
+}
+
+pkg_postinst() {
+	tmpfiles_process revdep-rebuild.conf
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/kuroo/kuroo-1.2.3-r1.ebuild b/app-portage/kuroo/kuroo-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..24ea23d344a7
--- /dev/null
+++ b/app-portage/kuroo/kuroo-1.2.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.96.0
+inherit ecm
+
+DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
+HOMEPAGE="https://sourceforge.net/projects/kuroo/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=kde-frameworks/kauth-${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/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	app-portage/gentoolkit
+	kde-misc/kdiff3
+"
+
+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
+
+	ecm_pkg_postinst
+}
diff --git a/app-portage/kuroo/kuroo-1.2.3.ebuild b/app-portage/kuroo/kuroo-1.2.3.ebuild
deleted file mode 100644
index 75678dec77e9..000000000000
--- a/app-portage/kuroo/kuroo-1.2.3.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
-
-KFMIN=5.96.0
-inherit ecm
-
-DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
-HOMEPAGE="https://sourceforge.net/projects/kuroo/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=kde-frameworks/kauth-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	app-portage/gentoolkit
-	kde-apps/kompare:5
-"
-
-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
-
-	ecm_pkg_postinst
-}
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index 821009e5e6fc..c5795080ee37 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,7 +35,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
-	kde-apps/kompare:5
+	kde-misc/kdiff3
 "
 
 pkg_postinst() {
diff --git a/app-shells/atuin/atuin-18.3.0-r1.ebuild b/app-shells/atuin/atuin-18.3.0-r1.ebuild
index 6805ed102eb1..6f383e0b5123 100644
--- a/app-shells/atuin/atuin-18.3.0-r1.ebuild
+++ b/app-shells/atuin/atuin-18.3.0-r1.ebuild
@@ -468,7 +468,7 @@ LICENSE="MIT"
 # - openssl for ring crate
 LICENSE+=" Apache-2.0 BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="+client +daemon server test +sync"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 47c184961f90..6d641d70ec1d 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -20,12 +20,16 @@ DIST bash-5.0.tar.gz 10135110 BLAKE2B a6c4d79144aa0c0f4a9433d618085c0d46b792b1de
 DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 89e615a08920a4cfc90f72d125a8256275b0677fb2d7abf208ca90ac80471d5fbf7efb86c814b6ccbbc65772370ed8fe82b7cee9b247ec881c0b664dee152f72 SHA512 538f817867ff3613f2177f2e6d9fecc69057152ac9cf35a5a7448ddc83960b94bc8e8f2987226ba68d14de376127ee5cf6c83f5374b74feb14fa1c5aab6105c7
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7 SHA512 c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f SHA512 3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
-DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015 SHA512 c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
 DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30919a13271e39e1cb66a0672f242df75fc7d71627ea873dfbce53ec35c0c56a71c5167143070a7811343fd9 SHA512 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258
 DIST bash-5.3-alpha.tar.gz 11195025 BLAKE2B b3325f6927d7dde86aae165891317b972f0b9814e134676b3d7d3aea81ce4d4cad1a01f160e290352072153ad3568ee21701a35190ef5e6274b3c03fc95c8d42 SHA512 52354eb7cd71330192ec76fdda04bcacf758a312e89b45558db5f5345f19b0d8e54732049934958cf89786f5bd7c538d88859eb8d8d22dabfc9ec7305263d10e
 DIST bash-5.3-alpha.tar.gz.sig 95 BLAKE2B 69c8b33fe2a40498662ef084967701cff1926086785a41d6f49a3c2e2b9908499226d3d970bdb6397a74d3ccc22acb3651261ad2a421799eb135c64a78af8589 SHA512 c9587da66457e2010b0852c6dbf5949821a543b7f1b616a4d016df3477913e2a655c57289e83adeeb31b8b8afca22313e3af76cf727b93932d33a889c1263c20
 DIST bash-5.3_alpha_p20240815-cf694865de527e597de5a906643a74037341a431.tar.xz 8537760 BLAKE2B df370a28aa40af0cf108f9578c81ef53cf175e97ca9b5cdca85fa8de99df81a0f58950c20e7af0180ee420218b04b9e9f721fef42b292e6b3261aa4846cabf55 SHA512 dd552214404aa1410954f3b4e3da5e744001eda2b6a613f52177bbfdff19c094a7406673dcfc1dfa653895a221969c2edcf8362556cdeadbd0cf16a610fcd191
+DIST bash-5.3_alpha_p20240821-e327891b52513bef0b34aac625c44f8fa6811f53.tar.xz 15948864 BLAKE2B c8afaa735df7dc75bf0f3b4b07c25bf9ac0cb23d7fe10451b4a39e821d3fd308384760e16d6e2256601f938f3665a1d0cdbd2638806b63029906f2ae5d646091 SHA512 e3291af9bb0c66ba6d0c52db446e51bc628933f132ab7654eb803da02ec7bf6e57bf6d13e65a25fe1c07b518e5d68a9b3526ca4e157ba3cc3d091b3c4f1fea43
+DIST bash-5.3_alpha_p20240823-2e01122fe78eb5a42c9b9f3ca46b91f895959675.tar.xz 8541288 BLAKE2B 64cf9fc5873b925558a7aa2e2a0e76f9f326ab0606b720e8684021e540bcd992307d146b9c5d2e3f1e2779a372874753c9dd8cf7296e1013470f53e70082fc5a SHA512 3a8a5b522ac082c081ababee84cf2f1f1518c9a397a1b612de40c6e07a3104c74561eb5db75e74eec742284665667135eba5eb975d8599c3e89eeafa7383b5e4
+DIST bash-5.3_alpha_p20240828-2610d40b32301cd7256bf1dfc49c9f8bfe0dcd53.tar.xz 8542760 BLAKE2B 1d06b9837e3c1a23f34f6fcc3ec919b824d28a01301e459d602cad7bde1568299e1bc01abb94f4cade96450e19ebaf85b14a7dbb6e7d8d6b38006bae5a755c5f SHA512 eff12dbf54744c3a528cc0aa5395739221ba722b08c06b9fdf5d3f93b18b9d9e2505d91abac76510b33231075b629df7a53ddf99539e8bf3b13dc2982d532e47
+DIST bash-5.3_alpha_p20240904-5576c26da8e0ad74048203398acb493c65fd3476.tar.xz 8543756 BLAKE2B 797a97c92fcef0f675c091c4fa0d9fb12f4bed75150985ba34c99b934b77821dfa57300fc9085d606ca57fb868c3b17a04d71090eb6a0fb0f711acf5901d2fa4 SHA512 634005182fc43d752f8af6d5ff04c2612ae3e5ecd9cf5fe83a53c9242df5efead0b1c4c6142a2546566d2abd81277e7133ee8e9ca19eb179b679cf8574945403
+DIST bash-5.3_alpha_p20240911-bc5ddc8698d56df588fd99864a650b834426ccf7.tar.xz 8544476 BLAKE2B 05985908b330081485fa89f4bf89ecad01f20d94dd925dcc103b3759a35629535bee5d3ebdb8673b77b9ebba813861db2be65cabdd1b637e608cd247537f7add SHA512 c648af06d1e73eea1823d144ee269e4b05ad5d9286f18eae4cd4d2c78072e23ad2c5eaebbf619c7b9aa03e4c52676130a8a105198166a18a14d0676fce938764
 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.1_p16-r6.ebuild b/app-shells/bash/bash-5.1_p16-r6.ebuild
deleted file mode 100644
index 488dbff0dc94..000000000000
--- a/app-shells/bash/bash-5.1_p16-r6.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-	case ${PV} in
-		*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.1"
-
-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"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PLEVEL} -gt 0 ]] ; then
-		# bash-5.1 -> bash51
-		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-		patch_url=
-		my_patch_index=
-
-		upstream_url_base="mirror://gnu/bash"
-		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
-
-		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
-			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
-			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
-
-			SRC_URI+=" ${patch_url}"
-			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-
-			# Add in the mirror URL too.
-			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
-			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
-
-			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
-		done
-
-		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
-	fi
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-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"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="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, bash51-011)
-BDEPEND="sys-devel/bison
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-S="${WORKDIR}/${MY_P}"
-
-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=(
-	# Patches from Chet sent to bashbug ml
-	"${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() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig ; then
-			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
-
-			local patch
-			for patch in "${MY_PATCHES[@]}" ; do
-				verify-sig_verify_detached ${patch}{,.sig}
-			done
-		fi
-
-		unpack ${MY_P}.tar.gz
-
-		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	# 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
-
-	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,"${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
-
-	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
-
-	# 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/
-	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.2_p26-r6.ebuild b/app-shells/bash/bash-5.2_p26-r6.ebuild
index 4350a8a719c3..5170241ed7c7 100644
--- a/app-shells/bash/bash-5.2_p26-r6.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r6.ebuild
@@ -65,7 +65,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/bash-5.2_p32-r1.ebuild b/app-shells/bash/bash-5.2_p32-r1.ebuild
new file mode 100644
index 000000000000..e84a17739b2c
--- /dev/null
+++ b/app-shells/bash/bash-5.2_p32-r1.ebuild
@@ -0,0 +1,403 @@
+# 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.2-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.2_p1"
+
+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 ~ia64 ~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"
+	"${FILESDIR}/${PN}-5.2_p15-random-ub.patch"
+	"${FILESDIR}/${PN}-5.2_p15-configure-clang16.patch"
+	"${FILESDIR}/${PN}-5.2_p21-wpointer-to-int.patch"
+	"${FILESDIR}/${PN}-5.2_p21-configure-strtold.patch"
+	"${FILESDIR}/${PN}-5.2_p32-memory-leaks.patch"
+	"${FILESDIR}/${PN}-5.2_p32-read-delimiter-in-invalid-mbchar.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
+
+	# 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
+
+	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_alpha_p20240821.ebuild b/app-shells/bash/bash-5.3_alpha_p20240821.ebuild
new file mode 100644
index 000000000000..650520901e72
--- /dev/null
+++ b/app-shells/bash/bash-5.3_alpha_p20240821.ebuild
@@ -0,0 +1,411 @@
+# 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="e327891b52513bef0b34aac625c44f8fa6811f53"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	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 ~ia64 ~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_alpha_p20240823.ebuild b/app-shells/bash/bash-5.3_alpha_p20240823.ebuild
new file mode 100644
index 000000000000..f309185219fd
--- /dev/null
+++ b/app-shells/bash/bash-5.3_alpha_p20240823.ebuild
@@ -0,0 +1,411 @@
+# 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="2e01122fe78eb5a42c9b9f3ca46b91f895959675"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	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 ~ia64 ~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_alpha_p20240828.ebuild b/app-shells/bash/bash-5.3_alpha_p20240828.ebuild
new file mode 100644
index 000000000000..94ab6bda8241
--- /dev/null
+++ b/app-shells/bash/bash-5.3_alpha_p20240828.ebuild
@@ -0,0 +1,411 @@
+# 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="2610d40b32301cd7256bf1dfc49c9f8bfe0dcd53"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	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 ~ia64 ~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_alpha_p20240904.ebuild b/app-shells/bash/bash-5.3_alpha_p20240904.ebuild
new file mode 100644
index 000000000000..5a7002f5afab
--- /dev/null
+++ b/app-shells/bash/bash-5.3_alpha_p20240904.ebuild
@@ -0,0 +1,411 @@
+# 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="5576c26da8e0ad74048203398acb493c65fd3476"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	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 ~ia64 ~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_alpha_p20240911.ebuild b/app-shells/bash/bash-5.3_alpha_p20240911.ebuild
new file mode 100644
index 000000000000..1daf9f36ee29
--- /dev/null
+++ b/app-shells/bash/bash-5.3_alpha_p20240911.ebuild
@@ -0,0 +1,411 @@
+# 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="bc5ddc8698d56df588fd99864a650b834426ccf7"
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.xz -> ${P}-${BASH_COMMIT}.tar.xz"
+	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 ~ia64 ~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_p32-read-delimiter-in-invalid-mbchar.patch b/app-shells/bash/files/bash-5.2_p32-read-delimiter-in-invalid-mbchar.patch
new file mode 100644
index 000000000000..832520c6e7ec
--- /dev/null
+++ b/app-shells/bash/files/bash-5.2_p32-read-delimiter-in-invalid-mbchar.patch
@@ -0,0 +1,297 @@
+From 0432ec33408ac124b620c44416c9c58f0c10b63b Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Fri, 23 Aug 2024 04:14:36 +0100
+Subject: [PATCH] Backport fix for issue with read delimiter in invalid
+ mutibyte char
+
+This addresses a regression introduced by 5.0. Consider the following
+test case.
+
+for i in {194..245}; do printf -v o %o "$i"; printf "\\$o\\n"; done |
+while read -r; do declare -p REPLY; done
+
+BEFORE
+
+declare -- REPLY=$'\302\n\303\n\304\n\305\n\306\n\307\n\310\n\311\n\312\
+n\313\n\314\n\315\n\316\n\317\n\320\n\321\n\322\n\323\n\324\n\325\n\326\
+n\327\n\330\n\331\n\332\n\333\n\334\n\335\n\336\n\337\n\340\n\341\n\342\
+n\343\n\344\n\345\n\346\n\347\n\350\n\351\n\352\n\353\n\354\n\355\n\356\
+n\357\n\360\n\361\n\362\n\363\n\364\n\365'
+
+AFTER
+
+declare -- REPLY=$'\302'
+declare -- REPLY=$'\303'
+declare -- REPLY=$'\304'
+declare -- REPLY=$'\305'
+declare -- REPLY=$'\306'
+declare -- REPLY=$'\307'
+declare -- REPLY=$'\310'
+declare -- REPLY=$'\311'
+declare -- REPLY=$'\312'
+declare -- REPLY=$'\313'
+declare -- REPLY=$'\314'
+declare -- REPLY=$'\315'
+declare -- REPLY=$'\316'
+declare -- REPLY=$'\317'
+declare -- REPLY=$'\320'
+declare -- REPLY=$'\321'
+declare -- REPLY=$'\322'
+declare -- REPLY=$'\323'
+declare -- REPLY=$'\324'
+declare -- REPLY=$'\325'
+declare -- REPLY=$'\326'
+declare -- REPLY=$'\327'
+declare -- REPLY=$'\330'
+declare -- REPLY=$'\331'
+declare -- REPLY=$'\332'
+declare -- REPLY=$'\333'
+declare -- REPLY=$'\334'
+declare -- REPLY=$'\335'
+declare -- REPLY=$'\336'
+declare -- REPLY=$'\337'
+declare -- REPLY=$'\340'
+declare -- REPLY=$'\341'
+declare -- REPLY=$'\342'
+declare -- REPLY=$'\343'
+declare -- REPLY=$'\344'
+declare -- REPLY=$'\345'
+declare -- REPLY=$'\346'
+declare -- REPLY=$'\347'
+declare -- REPLY=$'\350'
+declare -- REPLY=$'\351'
+declare -- REPLY=$'\352'
+declare -- REPLY=$'\353'
+declare -- REPLY=$'\354'
+declare -- REPLY=$'\355'
+declare -- REPLY=$'\356'
+declare -- REPLY=$'\357'
+declare -- REPLY=$'\360'
+declare -- REPLY=$'\361'
+declare -- REPLY=$'\362'
+declare -- REPLY=$'\363'
+declare -- REPLY=$'\364'
+declare -- REPLY=$'\365'
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+---
+ builtins/read.def | 25 ++++++++++++----
+ externs.h         |  1 +
+ lib/sh/zread.c    | 74 +++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 94 insertions(+), 6 deletions(-)
+
+diff --git builtins/read.def builtins/read.def
+index ddd91d32..53b4bd81 100644
+--- builtins/read.def
++++ builtins/read.def
+@@ -130,7 +130,7 @@ static void set_readline_timeout PARAMS((sh_timer *t, time_t, long));
+ #endif
+ static SHELL_VAR *bind_read_variable PARAMS((char *, char *, int));
+ #if defined (HANDLE_MULTIBYTE)
+-static int read_mbchar PARAMS((int, char *, int, int, int));
++static int read_mbchar PARAMS((int, char *, int, int, int, int));
+ #endif
+ static void ttyrestore PARAMS((struct ttsave *));
+ 
+@@ -806,7 +806,7 @@ add_char:
+ 	  else
+ #  endif
+ 	  if (locale_utf8locale == 0 || ((c & 0x80) != 0))
+-	    i += read_mbchar (fd, input_string, i, c, unbuffered_read);
++	    i += read_mbchar (fd, input_string, i, c, delim, unbuffered_read);
+ 	}
+ #endif
+ 
+@@ -1064,10 +1064,10 @@ bind_read_variable (name, value, flags)
+ 
+ #if defined (HANDLE_MULTIBYTE)
+ static int
+-read_mbchar (fd, string, ind, ch, unbuffered)
++read_mbchar (fd, string, ind, ch, delim, unbuffered)
+      int fd;
+      char *string;
+-     int ind, ch, unbuffered;
++     int ind, ch, delim, unbuffered;
+ {
+   char mbchar[MB_LEN_MAX + 1];
+   int i, n, r;
+@@ -1101,8 +1101,21 @@ read_mbchar (fd, string, ind, ch, unbuffered)
+ 	  mbchar[i++] = c;	
+ 	  continue;
+ 	}
+-      else if (ret == (size_t)-1 || ret == (size_t)0 || ret > (size_t)0)
+-	break;
++      else if (ret == (size_t)-1)
++	{
++	  /* If we read a delimiter character that makes this an invalid
++	     multibyte character, we can't just add it to the input string
++	     and treat it as a byte. We need to push it back so a subsequent
++	     zread will pick it up. */
++	  if (c == delim)
++	    {
++	      zungetc (c);
++	      mbchar[--i] = '\0';		/* unget the delimiter */
++	    }
++	  break;		/* invalid multibyte character */
++	}
++      else if (ret == (size_t)0 || ret > (size_t)0)
++	break;		/* valid multibyte character */
+     }
+ 
+ mbchar_return:
+diff --git externs.h externs.h
+index 931dba9c..1b70a13b 100644
+--- externs.h
++++ externs.h
+@@ -536,6 +536,7 @@ extern ssize_t zreadintr PARAMS((int, char *, size_t));
+ extern ssize_t zreadc PARAMS((int, char *));
+ extern ssize_t zreadcintr PARAMS((int, char *));
+ extern ssize_t zreadn PARAMS((int, char *, size_t));
++extern int zungetc PARAMS((int));
+ extern void zreset PARAMS((void));
+ extern void zsyncfd PARAMS((int));
+ 
+diff --git lib/sh/zread.c lib/sh/zread.c
+index dafb7f60..7cfbb288 100644
+--- lib/sh/zread.c
++++ lib/sh/zread.c
+@@ -41,6 +41,10 @@ extern int errno;
+ #  define ZBUFSIZ 4096
+ #endif
+ 
++#ifndef EOF
++#  define EOF -1
++#endif
++
+ extern int executing_builtin;
+ 
+ extern void check_signals_and_traps (void);
+@@ -48,6 +52,11 @@ extern void check_signals (void);
+ extern int signal_is_trapped (int);
+ extern int read_builtin_timeout (int);
+ 
++int zungetc (int);
++
++/* Provide one character of pushback whether we are using read or zread. */
++static int zpushedchar = -1;
++
+ /* Read LEN bytes from FD into BUF.  Retry the read on EINTR.  Any other
+    error causes the loop to break. */
+ ssize_t
+@@ -59,6 +68,15 @@ zread (fd, buf, len)
+   ssize_t r;
+ 
+   check_signals ();	/* check for signals before a blocking read */
++
++  /* If we pushed a char back, return it immediately */
++  if (zpushedchar != -1)
++    {
++      *buf = (unsigned char)zpushedchar;
++      zpushedchar = -1;
++      return 1;
++    }
++
+   /* should generalize into a mechanism where different parts of the shell can
+      `register' timeouts and have them checked here. */
+   while (((r = read_builtin_timeout (fd)) < 0 || (r = read (fd, buf, len)) < 0) &&
+@@ -95,6 +113,14 @@ zreadretry (fd, buf, len)
+   ssize_t r;
+   int nintr;
+ 
++  /* If we pushed a char back, return it immediately */
++  if (zpushedchar != -1)
++    {
++      *buf = (unsigned char)zpushedchar;
++      zpushedchar = -1;
++      return 1;
++    }
++
+   for (nintr = 0; ; )
+     {
+       r = read (fd, buf, len);
+@@ -118,6 +144,15 @@ zreadintr (fd, buf, len)
+      size_t len;
+ {
+   check_signals ();
++
++  /* If we pushed a char back, return it immediately */
++  if (zpushedchar != -1)
++    {
++      *buf = (unsigned char)zpushedchar;
++      zpushedchar = -1;
++      return 1;
++    }
++
+   return (read (fd, buf, len));
+ }
+ 
+@@ -135,6 +170,14 @@ zreadc (fd, cp)
+ {
+   ssize_t nr;
+ 
++  /* If we pushed a char back, return it immediately */
++  if (zpushedchar != -1 && cp)
++    {
++      *cp = (unsigned char)zpushedchar;
++      zpushedchar = -1;
++      return 1;
++    }
++
+   if (lind == lused || lused == 0)
+     {
+       nr = zread (fd, lbuf, sizeof (lbuf));
+@@ -160,6 +203,14 @@ zreadcintr (fd, cp)
+ {
+   ssize_t nr;
+ 
++  /* If we pushed a char back, return it immediately */
++  if (zpushedchar != -1 && cp)
++    {
++      *cp = (unsigned char)zpushedchar;
++      zpushedchar = -1;
++      return 1;
++    }
++
+   if (lind == lused || lused == 0)
+     {
+       nr = zreadintr (fd, lbuf, sizeof (lbuf));
+@@ -186,6 +237,13 @@ zreadn (fd, cp, len)
+ {
+   ssize_t nr;
+ 
++  if (zpushedchar != -1 && cp)
++    {
++      *cp = zpushedchar;
++      zpushedchar = -1;
++      return 1;
++    }
++
+   if (lind == lused || lused == 0)
+     {
+       if (len > sizeof (lbuf))
+@@ -204,6 +262,22 @@ zreadn (fd, cp, len)
+   return 1;
+ }
+ 
++int
++zungetc (c)
++     int c;
++{
++  if (zpushedchar == -1)
++    {
++      zpushedchar = c;
++      return c;
++    }
++
++  if (c == EOF || lind == 0)
++    return (EOF);
++  lbuf[--lind] = c;		/* XXX */
++  return c;
++}
++
+ void
+ zreset ()
+ {
+-- 
+2.45.2
+
diff --git a/app-shells/fish/fish-3.7.1.ebuild b/app-shells/fish/fish-3.7.1.ebuild
index 442a49ed9a1f..ac9ca3058516 100644
--- a/app-shells/fish/fish-3.7.1.ebuild
+++ b/app-shells/fish/fish-3.7.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index ed9063e08744..79d867044729 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -2,3 +2,5 @@ DIST fzf-0.53.0-deps.tar.xz 5882848 BLAKE2B b7faec7c2afd60642c27afa6f3c7a99fc140
 DIST fzf-0.53.0.tar.gz 286797 BLAKE2B f6355c168f2b587cc2d0b21ef483812db7e077e4bf19517a4fc8fed43dd6b3f557ce1a28630075b4f1e6238aacf02ce10ceb1afd4d7fe5ca6e2453c132c56d80 SHA512 4122b49e8fec936ec4da79cdb7a7ed1891caadf842008ae36aac5ce0aa1c2263bed68fa0332f2cb4f2b38551469af0f14874410407b922827e62767032e92393
 DIST fzf-0.54.3-deps.tar.xz 5875812 BLAKE2B 19e27c17c86ae5df2a84bfde2a7df912a3e1b4e46c1475da0d10b190df272de0f09b3e546c84bc78e012788bd0842125681e43fe090f244bbd538bf2c6050175 SHA512 29a006cdb8352090aeda6d15e020700d123a1fa1e125bb82058253054e0cefc2d52b055392b38ba9b262bf0802609a7d99b49f602081fb472f0d0c7d709fcc59
 DIST fzf-0.54.3.tar.gz 292944 BLAKE2B 4a2e7a6cc50504215fa14ef6559df8b14fa0d89a499ca06f25b170cd2456d22cc30260de80821db9525ba4d6ece24ab39d863f23004f680bd3cf1d2a6985ec25 SHA512 e93056c3030e4a9dca59066fe111ef7539040a2e5bb800030d8f3e032acfae7db5fd2cf32aa7a45b505ec180e95c05bebe801bfc60c65db15fe9b647959ea987
+DIST fzf-0.55.0-deps.tar.xz 5891700 BLAKE2B 63de6f3817796eef8c6e69c7bdf66e2f379be1e438558245cedb4dfa6ab16ad6dc74fb901481359bd099533b48f4f4670a83588d7befe4812085b7c6bb2faf58 SHA512 2c3f0affe988e8dabb743425b707ec082f59d185abad7f9d82043d922890060151b06c89056c201df7a328d67edcd54ed91ca1c62d1dd4648ee72977186ffeb4
+DIST fzf-0.55.0.tar.gz 295984 BLAKE2B 304eb1c3ce682827d99ed699f2432eccb9cfe2025e331a291a43068000e9423913642a41cf124dbedf494adafd85a2ddcd5311f16f1a41b98550a0befd209f03 SHA512 b931b24b9398d189e83caf69fc7bdabbd906be6caed9d84dfe8ce0ec4ac980a78a89b7af988105996c6f217604d00f73efbf7be89b2c871e8b1f57b5e6bb72bb
diff --git a/app-shells/fzf/fzf-0.54.3.ebuild b/app-shells/fzf/fzf-0.54.3.ebuild
index 380854366f61..616369a9c977 100644
--- a/app-shells/fzf/fzf-0.54.3.ebuild
+++ b/app-shells/fzf/fzf-0.54.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
 
 LICENSE="MIT BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/app-shells/fzf/fzf-0.55.0.ebuild b/app-shells/fzf/fzf-0.55.0.ebuild
new file mode 100644
index 000000000000..380854366f61
--- /dev/null
+++ b/app-shells/fzf/fzf-0.55.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+# For fancy versioning only. Bump on the next release!
+# MY_GIT_REV is the first 7 characters of release commit, we truncate it
+# after to make it easier to copy/paste.
+MY_GIT_REV=9e92b6f11e0f59272de410f56493893334071e6e
+MY_GIT_REV=${MY_GIT_REV:0:7}
+
+SRC_URI="https://github.com/junegunn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+src_prepare() {
+	default
+	sed -i 's/-s -w //' Makefile || die # bug #795225
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman man/man1/${PN}.1
+
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	newbashcomp shell/completion.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	insinto /usr/share/fzf
+	doins shell/key-bindings.bash
+	doins shell/key-bindings.fish
+	doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To add fzf support to your shell, make sure to use the right file"
+		elog "from ${EROOT}/usr/share/fzf."
+		elog
+		elog "For bash, add the following line to ~/.bashrc:"
+		elog
+		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
+		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
+		elog
+		elog "Plugins for Vim and Neovim are installed to respective directories"
+		elog "and will work out of the box."
+		elog
+		elog "For fzf support in tmux see fzf-tmux(1)."
+	fi
+}
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index a0aab3a4a3a3..1a45f8f3d6d8 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1 @@
-DIST loksh-7.1.tar.xz 211636 BLAKE2B 7604d6a5d3d3bce7dc51cde1d53ec10b927411afe700192e243e8dc022011cb3d89668768ba7940af22e97d95fd074638860e7b74fcacc8c83de4ad995654da4 SHA512 f46221f765f2799856049fbfe1650e6f3d13d597cf97843d4b54b9803b9ecedbf8a8c9364e1ba9b981b667004a8fe4da043006945f8b61f094678d3578518716
-DIST loksh-7.3.tar.xz 212120 BLAKE2B 2c1c56dcbfa664aa894b1f09f145b28f6861bf28f06274f32697eace30f24660dbcecdcf58938f6cae106e654d200ef0cb4cb2ecd309f3d60be4afc7fa6a6b9c SHA512 a054917c975f65dfb5f8eb35665044ddacacdbd2d1e1113e6bf62d5cd8d5f4fd775ff5f20e28191d2417016684a310f23115af102b834aa33083e2be41034477
 DIST loksh-7.5.tar.xz 212104 BLAKE2B c5897860ca9ce7614921e890ec2ba6f464f600df9410082256e7b4cb53c15fbacb2f46fb8eada77910c19a260338f8e2fb55e3b324c96ab82e44f502859769a2 SHA512 9aee8219a4d63d06c95df2347611a04664ec344c2cb4c3d5d14bdea6b9cabc424246b0e070c901b4a5e38f5784b2c43f5c3c78b01f74cbdce46eded6fda043db
diff --git a/app-shells/loksh/loksh-7.1.ebuild b/app-shells/loksh/loksh-7.1.ebuild
deleted file mode 100644
index d9bbe74073b3..000000000000
--- a/app-shells/loksh/loksh-7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh"
-SRC_URI="https://github.com/dimkr/loksh/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="
-	${DEPEND}
-	!app-shells/ksh
-"
-
-src_prepare() {
-	default
-	sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
-}
-
-src_configure() {
-	# we want it as /bin/ksh
-	meson_src_configure --bindir=../bin
-}
diff --git a/app-shells/loksh/loksh-7.3.ebuild b/app-shells/loksh/loksh-7.3.ebuild
deleted file mode 100644
index f591c53b2237..000000000000
--- a/app-shells/loksh/loksh-7.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
-
-inherit meson
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh"
-SRC_URI="https://github.com/dimkr/loksh/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="
-	${DEPEND}
-	!app-shells/ksh
-"
-
-src_prepare() {
-	default
-	sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
-}
-
-src_configure() {
-	# we want it as /bin/ksh
-	meson_src_configure --bindir=../bin
-}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
deleted file mode 100644
index 9154bea1a42e..000000000000
--- a/app-shells/mksh/mksh-9999.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
-	ECVS_MODULE="mksh"
-	ECVS_USER="_anoncvs"
-	ECVS_AUTH="ext"
-	inherit cvs
-else
-	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MirBSD Korn Shell"
-# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
-HOMEPAGE="http://mirbsd.de/mksh"
-
-# See http://www.mirbsd.org/TaC-mksh.txt or ${S}/www/files/TaC-mksh.txt
-# MirOS for most of it
-# BSD for when strlcpy(3) is absent, such as with glibc
-# unicode for some included Unicode data
-# ISC if the printf builtin is used, not currently the case
-LICENSE="MirOS BSD unicode"
-SLOT="0"
-IUSE="lksh static test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-lang/perl
-		sys-apps/ed
-	)
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	if use lksh; then
-		cp -pr "${S}" "${S}"_lksh || die
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	use static && export LDSTATIC="-static"
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-
-	if use lksh; then
-		pushd "${S}"_lksh >/dev/null || die
-		CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
-			sh Build.sh -r -L || die
-		popd >/dev/null || die
-	fi
-
-	sh Build.sh -r || die
-	sh FAQ2HTML.sh || die
-}
-
-src_test() {
-	einfo "Testing regular mksh."
-	./mksh test.sh -v || die
-
-	if use lksh; then
-		einfo "Testing lksh, POSIX long-bit mksh."
-		pushd "${S}"_lksh >/dev/null || die
-		./lksh test.sh -v || die
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	into /
-	dobin mksh
-	dosym mksh /bin/rmksh
-	doman mksh.1
-	dodoc dot.mkshrc
-	dodoc FAQ.htm
-
-	if use lksh; then
-		dobin "${S}"_lksh/lksh
-		dosym lksh /bin/rlksh
-		doman "${S}"_lksh/lksh.1
-	fi
-}
diff --git a/app-shells/pwsh-bin/Manifest b/app-shells/pwsh-bin/Manifest
index b2777515718a..9c58a5e5a53d 100644
--- a/app-shells/pwsh-bin/Manifest
+++ b/app-shells/pwsh-bin/Manifest
@@ -4,3 +4,6 @@ DIST powershell-7.4.3-linux-x64.tar.gz 70893666 BLAKE2B bc898eeafdf7b0eb2c3c1420
 DIST powershell-7.4.4-linux-arm32.tar.gz 69166374 BLAKE2B 8be16e528ddef95422906b1e37d12067ae274d68efd03dd75c1c5b50e947b5ec617084bc0f5168f4f577893956ebdfee3ceb896c918fd149bc844581ff778a0d SHA512 66e822067dfaba1fb24c853c992539d0ec3562cb63513d7f3d5a1ded12bf6dce2d5d31ca0cd32bf6951fafc16b91be8bc3629559897e287b9bb0815f424ea557
 DIST powershell-7.4.4-linux-arm64.tar.gz 68135393 BLAKE2B 12803b407093c9e9a804909c42b4237bd6376caeb174e815d258b3e53da2809f18d953e5103ea7a3ce7edacb2fccd7c668a2709f74e756b4bea8e4083c134228 SHA512 cd451c12b2877948e9c11d203a4cdd5af1791dd7f4ca338e936254c0268a5f93ee238034f5c1784b9472eb60d841548445557246296a0e3ff6973dbb641a43c7
 DIST powershell-7.4.4-linux-x64.tar.gz 70860313 BLAKE2B 8780833ce8afd594503d1e62a9e794de12f7947b41e1823e41e646e1751723b957508efd8987dd8c0e36e8b8bf26ee819240ab38f7169712f108c889c8432eab SHA512 ddafaed9fc2e016e8f354e44709917f7999e16fbf4ad1d1b52b6b4682171b121e772d53bc9da5f6936ef770aa162b9da7f1ad99e337befb878b5bef265e2560f
+DIST powershell-7.4.5-linux-arm32.tar.gz 69183797 BLAKE2B 44ca41b55f6cebde7a2717cb04550ae675df019fc13872a6e1a8dea93ad4802663b21fb6caa19ffdd6335e6d908022881b2953019c9cfae05aee4ce3bbe666ce SHA512 3bd6f846d4a1ac0d67764792314031c61cc399386ef65253e6080f234bee07333acdcc88dca68b9fce75a5bfd71ea27d648176d39925866f304ca45a6d8dddb8
+DIST powershell-7.4.5-linux-arm64.tar.gz 68157221 BLAKE2B 4665d26f22c74129888c59f06fceac17e61c38c83e3f3178e3bf2d566a6f67748451bd74b5ad717896c2f4f1ff5536c7f71a656cf11fabb7790aac152484ef5a SHA512 de7fcdfe132e1e50a71caf6aff62f0fd915b9eb361147c15d746f7cb0246d544ee66076118ea74589b26e0548ad32e1eed8f5b59fde9be7798df502f002934a8
+DIST powershell-7.4.5-linux-x64.tar.gz 70898869 BLAKE2B c315c1ed361c7f97e834fbac589a0d4edc175d808e6b66d526fe2cdaf9e74ef2431a4cd513689fe79097c173cb988818f80a5f5101842e2ca96796b685fd618a SHA512 372959a6a5fa8a7ebe1c34999fa04d1ceb1eb30c6b8c082e030d09e5d4ed7782616002d5eb648412aed94d9998367358245544c685cbedfe60f9a522f9cda4f1
diff --git a/app-shells/pwsh-bin/pwsh-bin-7.4.4.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.4.4.ebuild
index e09b2d5daf99..c180fccd95ae 100644
--- a/app-shells/pwsh-bin/pwsh-bin-7.4.4.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.4.4.ebuild
@@ -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/pwsh-bin/pwsh-bin-7.4.5.ebuild b/app-shells/pwsh-bin/pwsh-bin-7.4.5.ebuild
new file mode 100644
index 000000000000..e09b2d5daf99
--- /dev/null
+++ b/app-shells/pwsh-bin/pwsh-bin-7.4.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wrapper
+
+DESCRIPTION="Cross-platform automation and configuration tool (binary package)"
+HOMEPAGE="https://microsoft.com/powershell/
+	https://github.com/PowerShell/PowerShell/"
+
+BASE_URI="https://github.com/PowerShell/PowerShell/releases/download/"
+SRC_URI="
+	amd64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-x64.tar.gz )
+	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
+	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64"
+REQUIRED_USE="elibc_glibc"
+
+RDEPEND="
+	app-crypt/mit-krb5:0/0
+	dev-libs/icu
+	dev-util/lttng-ust:0/2.12
+	sys-libs/pam:0/0
+	sys-libs/zlib:0/1
+	|| (
+		dev-libs/openssl-compat:1.0.0
+		=dev-libs/openssl-1.0*:0/0
+	)
+"
+IDEPEND="
+	app-eselect/eselect-pwsh
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	local -a broken_symlinks
+	broken_symlinks=( libcrypto.so.1.0.0 libssl.so.1.0.0 )
+
+	local symlink
+	for symlink in "${broken_symlinks[@]}" ; do
+		if [[ -L "${symlink}" ]] ; then
+			rm "${symlink}" || die "failed to remove ${symlink}"
+		fi
+	done
+
+	local dest="opt/${PN}-${SLOT}"
+	local dest_root="/${dest}"
+
+	insinto "${dest_root}"
+	doins -r .
+
+	fperms 0755 "${dest_root}/pwsh"
+
+	local gentoo_path='PSModulePath="${PSModulePath}:${EPREFIX}/usr/share/GentooPowerShell/Modules:"'
+	make_wrapper "${PN}-${SLOT}" "env ${gentoo_path} ${dest_root}/pwsh"
+}
+
+pkg_postinst() {
+	eselect pwsh update ifunset
+}
+
+pkg_postrm() {
+	eselect pwsh update ifunset
+}
diff --git a/app-shells/starship/files/starship-1.17.1-no-strip.patch b/app-shells/starship/files/starship-1.17.1-no-strip.patch
deleted file mode 100644
index f62be9a00f07..000000000000
--- a/app-shells/starship/files/starship-1.17.1-no-strip.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d8f0a355fa04dc0ba1874c3e549ac962c578efd1 Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Wed, 12 Jul 2023 20:20:45 -0400
-Subject: [PATCH] Do not strip executable
-
-This should be a choice for the user.
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index fb9e0a39..b2a38a6d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@
- [profile.release]
- lto = true
- codegen-units = 1
--strip = true
-+strip = false
- 
- [[bin]]
- name = "starship"
--- 
-2.43.0
-
diff --git a/app-shells/starship/starship-1.20.1.ebuild b/app-shells/starship/starship-1.20.1.ebuild
index 9a8a0c92ae3f..a6607e763860 100644
--- a/app-shells/starship/starship-1.20.1.ebuild
+++ b/app-shells/starship/starship-1.20.1.ebuild
@@ -410,7 +410,7 @@ LICENSE+="
 "
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 BDEPEND="
 	dev-build/cmake
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 4511850c60c0..0f3a08bbe6d2 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -14,7 +14,6 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
-
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="https://www.zsh.org/"
 
@@ -47,11 +46,7 @@ BDEPEND="
 if [[ ${PV} == *9999 ]] ; then
 	BDEPEND+="
 		app-text/yodl
-		doc? (
-			sys-apps/texinfo
-			app-text/texi2html
-			virtual/latex-base
-		)
+		doc? ( virtual/texi2dvi )
 	"
 fi
 
@@ -166,7 +161,10 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install $(usex doc "install.info" "")
+	emake DESTDIR="${D}" install
+	if use doc; then
+		emake -C Doc DESTDIR="${D}" install.html install.html
+	fi
 
 	insinto /etc/zsh
 	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
@@ -199,12 +197,8 @@ src_install() {
 
 	dodoc ChangeLog* META-FAQ NEWS README config.modules
 
-	if use doc ; then
-		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-		dodoc Doc/zsh.{dvi,pdf}
-		docinto html
-		dodoc Doc/*.html
-		popd >/dev/null
+	if use doc; then
+		dodoc Doc/intro.{a4,us}.pdf Doc/zsh_{a4,us}.{dvi,pdf}
 	fi
 
 	docinto StartupFiles
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 9187309fb066..3c4d1dd289af 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.20.tar.bz2 439551 BLAKE2B 71a24e904d7d3769bd0fed4ce93d960fbe434b117dc9f0e0d6b43ced40ce78d315ad58a5b83925ea0d16595e79e0ae415fc1e52323a0c367c63edc1ede57c039 SHA512 f05942eee53513cc81054bfb853fa9a946ffc0c488564975b06e3d1feb15d8ee7be05c561905cdc5944f4d083f04196af0f7c90665b8048ca7e400537517498c
 DIST ansifilter-2.20.tar.bz2.asc 488 BLAKE2B 2f2bb56e3cd81e79cd3b5b34e0f5224a79e26977f94708c64ea4278b186acc72e28ce9509fa3c0f31619b3d3ea8e35ee83656d7560152c05bafcffcb12204456 SHA512 5002436eb38399bb7cf96914fd1778ed53a9a0d8fd029b37ae50c6db8b411248f602efcd7bcb9a69871f2b3526fccf4875e3f958afccaeea94e286ddb0f071db
+DIST ansifilter-2.21.tar.bz2 434994 BLAKE2B 57d85bf0b1feabf6665b4b84e6b2418985c72a12a62e0e8f39f1b5f32190b64f3224dbe84d124631a8adfe08a1699c59b072a963770d44b09f9a97662ca0b274 SHA512 9bdaf7ec769ec58258c27723ae1aab5f8227b61fe8b8ddb4b429787819c7e40f8a911daacd21427b93e2668555e97b2dc28d502c971ba496a3b50a1eeec5fbb1
+DIST ansifilter-2.21.tar.bz2.asc 488 BLAKE2B 80fdedbe258417cd9eb858bbb342583a00e1cc2bf7344c30cbdbccb5a781770ecc73ae237ad03701d19a97b6c1eb7f0b49c02307533725d56b54141fd67b3c99 SHA512 f58d355aaa1362912ebae214bb6b6f5d355a6cf3fbc9ad42e8d2be8d3f0106a8eb2f7e2db69460f92816f57f5a6b33b28ad21d2c86301686975b6ad3b49c2a59
 DIST ansifilter2_logo_256.png 54539 BLAKE2B f8b98e22b08c62769bc679f17b3f9d2faeee806d95af3b4a4876e4938813694a4924ed4684163e962d94d3f1efdd31facdae4c3eb75c98322da228bdf0a130be SHA512 ff6f76a91a4809289f90db2bcefc01e772e043a478d7f84b33b4313ed163692e7d2f87880e5fdb64f0e419f6c1ef6ec85240f5a9984223e9059f0803be313de5
diff --git a/app-text/ansifilter/ansifilter-2.21.ebuild b/app-text/ansifilter/ansifilter-2.21.ebuild
new file mode 100644
index 000000000000..3b3d54244225
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.21.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs qmake-utils verify-sig xdg-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="
+	http://andre-simon.de/doku/ansifilter/en/ansifilter.php
+	https://gitlab.com/saalen/ansifilter/
+"
+SRC_URI="
+	http://andre-simon.de/zip/${P}.tar.bz2
+	gui? ( https://gitlab.com/uploads/-/system/project/avatar/6678914/ansifilter2_logo_256.png )
+	verify-sig? ( http://andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="gui"
+
+DEPEND="
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	verify-sig? ( >=sec-keys/openpgp-keys-andresimon-20240906 )
+"
+
+DOCS=( ChangeLog.adoc README.adoc  )
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+
+src_unpack() {
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/d" \
+		-i makefile || die
+
+	sed \
+		-e "s/-O2//" \
+		-i src/makefile || die
+}
+
+src_configure() {
+	if use gui ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CXX="$(tc-getCXX)"
+
+	if use gui ; then
+		emake -C src/qt-gui
+	fi
+}
+
+src_install() {
+	emake -f makefile \
+		DESTDIR="${ED}" \
+		doc_dir="/usr/share/doc/${PF}" \
+		-j1 \
+		install $(usev gui install-gui)
+
+	einstalldocs
+	if use gui; then
+		newicon -s 256 "${DISTDIR}"/ansifilter2_logo_256.png "${PN}".png
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index ba6c37529be0..d3f5cfa1ada0 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,2 +1,2 @@
 DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
-DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
+DIST asciidoc-10.2.1.tar.gz 1280535 BLAKE2B 9e15eb5d40384fe586a6148e53e03e73a6958061841843f7b32b4209a15477f97a6547ea1cb48d23b5d4c9ee5add1bfa87d53c1bfbc14c10f31397ebeb86ba39 SHA512 02d064aab8dfb05af4ae49a7c7bd1381156c6c90f95b2494218c80f01c39987cb971d68c533b5519abade77be9832b3fab653d8ae2ca7bb682c5bb720612839f
diff --git a/app-text/asciidoc/asciidoc-10.2.1.ebuild b/app-text/asciidoc/asciidoc-10.2.1.ebuild
new file mode 100644
index 000000000000..af922182340a
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.2.1.ebuild
@@ -0,0 +1,64 @@
+# 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} pypy3 )
+inherit distutils-r1 optfeature readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="
+	https://asciidoc.org/
+	https://github.com/asciidoc-py/asciidoc-py/
+"
+SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+"
+BDEPEND="
+	test? ( $(python_gen_cond_dep '
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	') )
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# TODO: Consider using Debian patch to allow /usr/share?
+	insinto /usr/share/asciidoc
+	doins -r asciidoc/resources/.
+
+	doman doc/*.1 # bug 834835
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "music filter support" \
+		"media-sound/lilypond virtual/imagemagick-tools"
+	optfeature "source filter support" \
+		"dev-util/source-highlight dev-python/pygments app-text/highlight"
+	optfeature "latex filter support" \
+		"dev-texlive/texlive-latex app-text/dvipng" \
+		"dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "graphviz filter support" "media-gfx/graphviz"
+}
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
deleted file mode 100644
index 075821590784..000000000000
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2
-	"
-DEPEND="
-	test? (
-		${PYTHON_DEPS}
-		app-text/dvipng
-		app-text/dvisvgm
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick[png]
-		media-sound/lilypond
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
-	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
-	   filters/code/code-filter-readme.txt )
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		asciidoc.py || die
-
-	# enforce usage of the configured version of Python
-	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		emake DESTDIR="${D}" docs
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
-	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
-	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/aspell/aspell-0.60.8.1-r1.ebuild b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
index 9a89d92f72db..01a5944de71e 100644
--- a/app-text/aspell/aspell-0.60.8.1-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="nls unicode"
 
 # All available language app-dicts/aspell-* packages.
diff --git a/app-text/bdf2psf/bdf2psf-1.227.ebuild b/app-text/bdf2psf/bdf2psf-1.227.ebuild
index 48fb146f6c2f..66975678e365 100644
--- a/app-text/bdf2psf/bdf2psf-1.227.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.227.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/console-setup-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 2e023d6be5a8..db0341d892c8 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,3 +2,5 @@ DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b3
 DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059
 DIST calibre-7.16.0.tar.xz 44833684 BLAKE2B 2b609a0d014d43998f693a69c10f6d8b0165bf97f8c9d388cf4e1e398e7254b300d53b26e5ec24af651e03bb625bb088331dc77aa2ed6edea13de2beb0e75339 SHA512 5ea11badd972422299ce143e2aa33f58f7abcfd2837acba47d2a7aa6f0997a711245273205ed043c783e5e82bbaaf7cab44e5c03c00e274a03a4ba29be53a708
 DIST calibre-7.16.0.tar.xz.sig 566 BLAKE2B 1d09e8dd49ad53c88632dc23573fa9cd5403d45a308598ac4ed7d4f2dd5a84cc3ae6812ac652ff4a98fc5d67589ad1584411f7746b6b98468bf03a35a0585de6 SHA512 91f3897d95d234a8d673006273974d32cb6c5aa4953d247700d6d89d511c9b1450dc8e222eabf5d1e4d82de206e425ee440defaff38d1ca83efdbf4bcada7c7c
+DIST calibre-7.17.0.tar.xz 45053400 BLAKE2B 93149c4fab7a25e1239c4b8c72b766e5ffc71eb27d1206225bc8436f26d2c76f9323e0f0f63d8444291f02a5a7e94d4500715398a71df4ab2a5b16e325e7be73 SHA512 916337dc425916110528828bac0fbdc24db9496362c1e8dad67eafdfda42b90174fb6a4352400cd34af0f11268aabed82b166b3e4875f59e317359079e10bf3b
+DIST calibre-7.17.0.tar.xz.sig 566 BLAKE2B c041904919ef300f51ba7363daf7d2bc70fc8bb819ffef157e53c28f91b9716be56b1e95465180ecd67069241a5810b70ac08027f4837426a5426792fab05e49 SHA512 af88bcbf394ac6ec68c40d661545a17e956b31dd7797d1cc8490e090437206902a64c7a642cf1e34184e379c79066843959e1459eb1836bddbd615febbc85c07
diff --git a/app-text/calibre/calibre-7.17.0.ebuild b/app-text/calibre/calibre-7.17.0.ebuild
new file mode 100644
index 000000000000..ba0528419925
--- /dev/null
+++ b/app-text/calibre/calibre-7.17.0.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-i18n/uchardet
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.10.0:=
+	app-text/poppler[utils]
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/xxhash[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtbase:6=[gui,widgets]
+	dev-qt/qtimageformats:6
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-gfx/optipng-0.7.6
+	virtual/libusb:1=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+	system-mathjax? ( >=dev-libs/mathjax-3:= )
+	udisks? ( virtual/libudev )
+	unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	system-mathjax? ( dev-lang/rapydscript-ng )
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+	# Don't test availability of PyQt6 tts module, which is not yet used.
+	# Recheck this with future version bumps...
+	"${FILESDIR}"/calibre-7.17.0-qt-texttospeech.patch
+)
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora's packaging is recommended.
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	# This is only ever used at build time. It contains a small embedded copy
+	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+	# is to build some resources that come bundled in dist tarballs already...
+	# and which we may also need to regenerate e.g. to use system-mathjax.
+	#
+	# However, running qtwebengine violates the portage sandbox (among other
+	# things, it tries to create directories in /usr! amazing) so this is a
+	# wash anyway. The only real solution here is to package rapydscript-ng.
+	#
+	# We do not need it at build time, and *no one* needs it at install time.
+	# Delete the cruft.
+	rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+	export QMAKE="$(qt6_get_bindir)/qmake"
+
+	edo ${EPYTHON} setup.py build
+	edo ${EPYTHON} setup.py gui
+
+	# A few different resources are bundled in the distfile by default, because
+	# not all systems necessarily have them. We un-vendor them, using the
+	# upstream integrated approach if possible. See setup/revendor.py and
+	# consider migrating other resources to this if they do not use it, in
+	# *preference* over manual rm'ing.
+	edo ${EPYTHON} setup.py liberation_fonts \
+		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+		--system-liberation_fonts
+	if use system-mathjax; then
+		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+		edo ${EPYTHON} setup.py rapydscript
+	fi
+}
+
+src_test() {
+	# Skipped tests:
+	local _test_excludes=(
+		# unpackaged Python dependency: py7zr
+		7z
+		# unpackaged Python dependency: pyzstd
+		test_zstd
+		# tests if a completely unused module is bundled
+		pycryptodome
+
+		$(usev !speech speech_dispatcher)
+		$(usev !unrar test_unrar)
+
+		# undocumented reasons
+		test_mem_leaks
+		test_searching
+	)
+
+	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 # bug #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	addpredict /dev/dri #665310
+
+	# If this directory doesn't exist, zsh completion won't install
+	dodir /usr/share/zsh/site-functions
+
+	edo "${PYTHON}" setup.py install \
+		--staging-root="${ED}/usr" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--staging-libdir="${ED}/usr/$(get_libdir)" \
+		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+	cp -r man-pages/ "${ED}"/usr/share/man || die
+
+	find "${ED}"/usr/share -type d -empty -delete || die
+
+	python_fix_shebang "${ED}/usr/bin"
+
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch b/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
deleted file mode 100644
index 4d37c3b642f5..000000000000
--- a/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
---- calibre-2.9.0.orig/src/calibre/gui2/main.py	2014-11-09 20:09:54.081231882 +0800
-+++ calibre-2.9.0/src/calibre/gui2/main.py	2014-11-09 20:15:48.193033844 +0800
-@@ -37,8 +37,9 @@
-                       help=_('Start minimized to system tray.'))
-     parser.add_option('-v', '--verbose', default=0, action='count',
-                       help=_('Ignored, do not use. Present only for legacy reasons'))
--    parser.add_option('--no-update-check', default=False, action='store_true',
--            help=_('Do not check for updates'))
-+    parser.add_option('--update-check', dest='no_update_check', default=True,
-+            action='store_false',
-+            help=_('Check for updates'))
-     parser.add_option('--ignore-plugins', default=False, action='store_true',
-             help=_('Ignore custom plugins, useful if you installed a plugin'
-                 ' that is preventing calibre from starting'))
-diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
---- calibre-2.9.0.orig/src/calibre/gui2/update.py	2014-11-09 20:09:54.082231864 +0800
-+++ calibre-2.9.0/src/calibre/gui2/update.py	2014-11-09 20:17:49.954767115 +0800
-@@ -154,6 +154,8 @@
-             self.update_checker.signal.update_found.connect(self.update_found,
-                     type=Qt.QueuedConnection)
-             self.update_checker.start()
-+        else:
-+            self.update_checker = None
- 
-     def recalc_update_label(self, number_of_plugin_updates):
-         self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)
diff --git a/app-text/calibre/files/calibre-7.17.0-qt-texttospeech.patch b/app-text/calibre/files/calibre-7.17.0-qt-texttospeech.patch
new file mode 100644
index 000000000000..ff50735e4788
--- /dev/null
+++ b/app-text/calibre/files/calibre-7.17.0-qt-texttospeech.patch
@@ -0,0 +1,38 @@
+From 6d87aa054724155c9413e5692fa1f242f9cc0efc Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Fri, 23 Aug 2024 02:20:00 -0400
+Subject: [PATCH] tests: delete qt TTS assert which is not yet used
+
+It will be used in future versions of calibre, and should likely be
+gated on USE=speech.
+---
+ src/calibre/test_build.py | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
+index 4f19363680..898caad665 100644
+--- a/src/calibre/test_build.py
++++ b/src/calibre/test_build.py
+@@ -314,7 +314,7 @@ def test_apsw(self):
+     def test_qt(self):
+         if is_sanitized:
+             raise unittest.SkipTest('Skipping Qt build test as sanitizer is enabled')
+-        from qt.core import QApplication, QFontDatabase, QImageReader, QLoggingCategory, QNetworkAccessManager, QSslSocket, QTextToSpeech, QTimer
++        from qt.core import QApplication, QFontDatabase, QImageReader, QLoggingCategory, QNetworkAccessManager, QSslSocket, QTimer
+         QLoggingCategory.setFilterRules('''qt.webenginecontext.debug=true''')
+         if hasattr(os, 'geteuid') and os.geteuid() == 0:
+             # likely a container build, webengine cannot run as root with sandbox
+@@ -348,10 +348,6 @@ def test_qt(self):
+         try:
+             ensure_app()
+             self.assertGreaterEqual(len(QFontDatabase.families()), 5, 'The QPA headless plugin is not able to locate enough system fonts via fontconfig')
+-            available_tts_engines = tuple(x for x in QTextToSpeech.availableEngines() if x != 'mock')
+-            self.assertTrue(available_tts_engines)
+-
+-            self.assertGreaterEqual
+             from calibre.ebooks.oeb.transforms.rasterize import rasterize_svg
+             img = rasterize_svg(as_qimage=True)
+             self.assertFalse(img.isNull())
+-- 
+2.44.2
+
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index 90af51fd9036..fd1e3a4d9569 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1 +1,2 @@
 DIST cpdf-2.3.1.tar.gz 385720 BLAKE2B fae61c8e62b1c679919512c5fa4c57279e118d7ecc8378b528053a1487731675f47877c6164d92f3770e38db78fd9bcce0635f76f0b2efdf10c775a1e9cf5ed7 SHA512 3f22e76bc6bffe2bcd6b2c27d0aa8dc55b842cf0eee46f23c0f3e23e1a86ac7af4665b48513ae3e2d7d2ae84fc864af3b6c3c92e93d78b7798b801bb9be987a1
+DIST cpdf-2.7.1.tar.gz 1660693 BLAKE2B 71cbb72c06ceacd12adbb97c81a504626273d3c0bc74077936b6693bb397b38c97a2db70703a3da8a7caa49d696ee904992150cba133079408e961ef8c7273a2 SHA512 b23c1c151f095d11b6c3c56766cdc05aa6b12a0e1224880a050f69f67c4d40053f2415ac3f9e54233bf8314ca8bdfccc2c65dd44b0c6d60ae8d7c08b1c411a04
diff --git a/app-text/cpdf/cpdf-2.7.1.ebuild b/app-text/cpdf/cpdf-2.7.1.ebuild
new file mode 100644
index 000000000000..41207a922e79
--- /dev/null
+++ b/app-text/cpdf/cpdf-2.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="A command line tool for manipulating PDF files"
+HOMEPAGE="https://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-source-${PV}"
+
+# ISC is only for cpdfxmlm.ml{,i}
+LICENSE="AGPL-3 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
+	~dev-ml/camlpdf-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	# parallel make issues
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+
+	dobin cpdf
+	dodoc Changes README.md cpdfmanual.pdf
+	doman cpdf.1
+
+	use doc && dodoc -r doc/cpdf/html
+}
diff --git a/app-text/cpdf/metadata.xml b/app-text/cpdf/metadata.xml
index ab661943a416..39f2e225f55d 100644
--- a/app-text/cpdf/metadata.xml
+++ b/app-text/cpdf/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>ivan.lloro.boada@gmail.com</email>
+    <name>Ivan Lloro</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">johnwhitington/cpdf-source</remote-id>
   </upstream>
diff --git a/app-text/crqt-ng/crqt-ng-1.0.14-r1.ebuild b/app-text/crqt-ng/crqt-ng-1.0.14-r1.ebuild
new file mode 100644
index 000000000000..5b43a9d0c3dc
--- /dev/null
+++ b/app-text/crqt-ng/crqt-ng-1.0.14-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="bg cs hu nl ru uk"
+inherit cmake plocale xdg
+
+DESCRIPTION="Cross-platform e-book reader"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+qt6 +gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
+
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	qt6? (
+		dev-qt/qttools:6[linguist]
+	)
+	!qt6? (
+		dev-qt/linguist-tools:5
+	)"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_environment_reset
+
+	# locales
+	plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts'
+	sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \
+		-i "${S}"/src/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs
+	if use qt6; then
+		mycmakeargs=(-DUSE_QT=QT6)
+	else
+		mycmakeargs=(-DUSE_QT=QT5)
+	fi
+	cmake_src_configure
+}
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
index edf9fae0ee13..1d4029dfe185 100644
--- a/app-text/doxygen/Manifest
+++ b/app-text/doxygen/Manifest
@@ -1,3 +1,4 @@
 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.9.8.src.tar.gz 8087770 BLAKE2B 9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944 SHA512 edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb
diff --git a/app-text/doxygen/doxygen-1.12.0.ebuild b/app-text/doxygen/doxygen-1.12.0.ebuild
new file mode 100644
index 000000000000..7e15463915fc
--- /dev/null
+++ b/app-text/doxygen/doxygen-1.12.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+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 ~ia64 ~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="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 '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/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"
+	"${FILESDIR}/${PN}-1.12.0-libfmt-11.patch"
+
+	# Backports
+	"${FILESDIR}/${PN}-1.12.0-clang-19.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/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-9999.ebuild
index 563834fb7d62..a16e28ba2ca6 100644
--- a/app-text/doxygen/doxygen-9999.ebuild
+++ b/app-text/doxygen/doxygen-9999.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT=17
-PYTHON_COMPAT=( python3_{10..12} )
+LLVM_COMPAT=( 18 )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit cmake flag-o-matic llvm python-any-r1
+inherit cmake flag-o-matic llvm-r1 python-any-r1
 
 DESCRIPTION="Documentation system for most programming languages"
 HOMEPAGE="https://www.doxygen.nl/"
@@ -43,14 +43,15 @@ RDEPEND="
 	dev-lang/perl
 	dev-libs/libfmt:=
 	dev-libs/spdlog:=
-	media-libs/libpng:=
 	virtual/libiconv
 	clang? (
-		<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
 	)
 	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
+		media-gfx/graphviz[freetype(+)]
 	)
 	doc? (
 		dev-texlive/texlive-bibtexextra
@@ -72,7 +73,6 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
 	"${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
 
 	# Backports
@@ -81,7 +81,7 @@ PATCHES=(
 DOCS=( LANGUAGE.HOWTO README.md )
 
 pkg_setup() {
-	use clang && llvm_pkg_setup
+	use clang && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
@@ -120,6 +120,9 @@ src_configure() {
 		-Duse_sys_sqlite3=ON
 		-DBUILD_SHARED_LIBS=OFF
 		-DGIT_EXECUTABLE="false"
+
+		# Noisy and irrelevant downstream
+		-Wno-dev
 	)
 
 	use doc && mycmakeargs+=(
@@ -149,5 +152,12 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
-	doman doc/*.1
+	# 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/doxygen/files/doxygen-1.12.0-clang-19.patch b/app-text/doxygen/files/doxygen-1.12.0-clang-19.patch
new file mode 100644
index 000000000000..acca39a18d51
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.12.0-clang-19.patch
@@ -0,0 +1,43 @@
+https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f
+https://github.com/doxygen/doxygen/pull/11064
+https://github.com/bisqwit/TinyDeflate/commit/68ced8bd5c819264e628d4f063500753b77f613d
+https://github.com/bisqwit/TinyDeflate/pull/9
+
+From cff64a87dea7596fd506a85521d4df4616dc845f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Fri, 9 Aug 2024 14:13:34 +0200
+Subject: [PATCH] Fix build with clang >= 19.0
+
+Clang >= 19.0 requires a template argument list after the template
+keyword for CWG96 compliance, see
+https://github.com/llvm/llvm-project/pull/80801
+
+This patch has also been submitted to upstream TinyDeflate as
+https://github.com/bisqwit/TinyDeflate/pull/9
+--- a/deps/TinyDeflate/gunzip.hh
++++ b/deps/TinyDeflate/gunzip.hh
+@@ -1141,21 +1141,21 @@ namespace gunzip_ns
+             //fprintf(stderr, "both track flag\n");
+             SizeTracker<DeflateTrackBothSize> tracker;
+             return tracker(Gunzip<code & Flag_NoTrackFlagMask>
+-                (tracker.template ForwardInput(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b)));
++                (tracker.template ForwardInput<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b)));
+         }
+         else if constexpr(code & Flag_TrackIn)
+         {
+             //fprintf(stderr, "in track flag\n");
+             SizeTracker<DeflateTrackInSize> tracker;
+             return tracker(Gunzip<code & Flag_NoTrackFlagMask>
+-                (tracker.template ForwardInput(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b)));
++                (tracker.template ForwardInput<I>(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b)));
+         }
+         else if constexpr(code & Flag_TrackOut)
+         {
+             //fprintf(stderr, "out track flag\n");
+             SizeTracker<DeflateTrackOutSize> tracker;
+             return tracker(Gunzip<code & Flag_NoTrackFlagMask>
+-                (std::forward<I>(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b)));
++                (std::forward<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b)));
+         }
+         else
+         {
diff --git a/app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch b/app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch
new file mode 100644
index 000000000000..a73f6ad58514
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.12.0-libfmt-11.patch
@@ -0,0 +1,112 @@
+https://bugs.gentoo.org/937599
+https://github.com/doxygen/doxygen/pull/11083
+
+From 567aca983f70b01103271e431bc71a13ac79213c Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Fri, 9 Aug 2024 03:00:05 +0300
+Subject: [PATCH] Adjust to libfmt-11 changes
+
+Bug: https://bugs.gentoo.org/937599
+See-Also: https://github.com/fmtlib/fmt/commit/d70729215fba1d54862e407b626abf86ddf409bf
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/src/trace.h
++++ b/src/trace.h
+@@ -156,7 +156,7 @@ namespace fmt { template<typename T> struct formatter {}; }
+ //! adds support for formatting QCString
+ template<> struct fmt::formatter<QCString> : formatter<std::string>
+ {
+-  auto format(const QCString &c, format_context& ctx) {
++  auto format(const QCString &c, format_context& ctx) const {
+     return formatter<std::string>::format(c.str(), ctx);
+   }
+ };
+@@ -164,7 +164,7 @@ template<> struct fmt::formatter<QCString> : formatter<std::string>
+ //! adds support for formatting Protected
+ template<> struct fmt::formatter<Protection> : formatter<std::string>
+ {
+-  auto format(Protection prot, format_context& ctx) {
++  auto format(Protection prot, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (prot)
+     {
+@@ -180,7 +180,7 @@ template<> struct fmt::formatter<Protection> : formatter<std::string>
+ //! adds support for formatting Specifier
+ template<> struct fmt::formatter<Specifier> : formatter<std::string>
+ {
+-  auto format(Specifier spec, format_context& ctx) {
++  auto format(Specifier spec, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (spec)
+     {
+@@ -195,7 +195,7 @@ template<> struct fmt::formatter<Specifier> : formatter<std::string>
+ //! adds support for formatting MethodTypes
+ template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
+ {
+-  auto format(MethodTypes mtype, format_context& ctx) {
++  auto format(MethodTypes mtype, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (mtype)
+     {
+@@ -213,7 +213,7 @@ template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
+ //! adds support for formatting RelatesType
+ template<> struct fmt::formatter<RelatesType> : formatter<std::string>
+ {
+-  auto format(RelatesType type, format_context& ctx) {
++  auto format(RelatesType type, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (type)
+     {
+@@ -228,7 +228,7 @@ template<> struct fmt::formatter<RelatesType> : formatter<std::string>
+ //! adds support for formatting RelationShip
+ template<> struct fmt::formatter<Relationship> : formatter<std::string>
+ {
+-  auto format(Relationship relation, format_context& ctx) {
++  auto format(Relationship relation, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (relation)
+     {
+@@ -243,7 +243,7 @@ template<> struct fmt::formatter<Relationship> : formatter<std::string>
+ //! adds support for formatting SrcLangExt
+ template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
+ {
+-  auto format(SrcLangExt lang, format_context& ctx) {
++  auto format(SrcLangExt lang, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (lang)
+     {
+@@ -273,7 +273,7 @@ template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
+ //! adds support for formatting MemberType
+ template<> struct fmt::formatter<MemberType> : formatter<std::string>
+ {
+-  auto format(MemberType mtype, format_context& ctx) {
++  auto format(MemberType mtype, format_context& ctx) const {
+     std::string result="Unknown";
+     switch (mtype)
+     {
+@@ -301,7 +301,7 @@ template<> struct fmt::formatter<MemberType> : formatter<std::string>
+ //! adds support for formatting TypeSpecifier
+ template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
+ {
+-  auto format(TypeSpecifier type, format_context& ctx) {
++  auto format(TypeSpecifier type, format_context& ctx) const {
+     return formatter<std::string>::format(type.to_string(),ctx);
+   }
+ };
+@@ -309,7 +309,7 @@ template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
+ //! adds support for formatting EntryType
+ template<> struct fmt::formatter<EntryType> : formatter<std::string>
+ {
+-  auto format(EntryType type, format_context& ctx) {
++  auto format(EntryType type, format_context& ctx) const {
+     return formatter<std::string>::format(type.to_string(),ctx);
+   }
+ };
+@@ -317,7 +317,7 @@ template<> struct fmt::formatter<EntryType> : formatter<std::string>
+ //! adds support for formatting MemberListType
+ template<> struct fmt::formatter<MemberListType> : formatter<std::string>
+ {
+-  auto format(MemberListType type, format_context& ctx) {
++  auto format(MemberListType type, format_context& ctx) const {
+     return formatter<std::string>::format(type.to_string(),ctx);
+   }
+ };
diff --git a/app-text/epspdf/epspdf-0.6.5.1.ebuild b/app-text/epspdf/epspdf-0.6.5.1.ebuild
index eecaa0256356..569738ea0a80 100644
--- a/app-text/epspdf/epspdf-0.6.5.1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc tk"
 
 RDEPEND="
diff --git a/app-text/evince/evince-45.0.ebuild b/app-text/evince/evince-45.0.ebuild
index fd78478a7ed5..3f99d2e628da 100644
--- a/app-text/evince/evince-45.0.ebuild
+++ b/app-text/evince/evince-45.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="cups djvu dvi gstreamer gnome keyring gtk-doc +introspection nautilus postscript spell tiff xps"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
diff --git a/app-text/evince/evince-46.3.ebuild b/app-text/evince/evince-46.3.ebuild
index e9eb8776c05a..992a46e8fff2 100644
--- a/app-text/evince/evince-46.3.ebuild
+++ b/app-text/evince/evince-46.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://apps.gnome.org/en/Evince/"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="cups djvu dvi gstreamer gnome keyring gtk-doc +introspection nautilus postscript spell tiff xps"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
diff --git a/app-text/feathernotes/feathernotes-1.3.0.ebuild b/app-text/feathernotes/feathernotes-1.3.0.ebuild
index 3f3075fd6e7a..162e2297324e 100644
--- a/app-text/feathernotes/feathernotes-1.3.0.ebuild
+++ b/app-text/feathernotes/feathernotes-1.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake xdg
 
-DESCRIPTION=" Lightweight Qt Notes-Manager for Linux"
+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}"
diff --git a/app-text/feathernotes/feathernotes-9999.ebuild b/app-text/feathernotes/feathernotes-9999.ebuild
index 880fc704e847..b729c5ce9a02 100644
--- a/app-text/feathernotes/feathernotes-9999.ebuild
+++ b/app-text/feathernotes/feathernotes-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit git-r3 cmake xdg
 
-DESCRIPTION=" Lightweight Qt Notes-Manager for Linux"
+DESCRIPTION="Lightweight Qt Notes-Manager for Linux"
 HOMEPAGE="https://github.com/tsujan/FeatherNotes"
 EGIT_REPO_URI="https://github.com/tsujan/FeatherNotes"
 
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch
new file mode 100644
index 000000000000..4b64fff16f5e
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.1-arm64-neon-tesseract.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/926891
+https://bugs.gentoo.org/924757
+https://src.fedoraproject.org/rpms/tesseract/raw/rawhide/f/tesseract_neon.patch
+(See https://github.com/tesseract-ocr/tesseract/pull/4154 too)
+--- a/tesseract/CMakeLists.txt
++++ b/tesseract/CMakeLists.txt
+@@ -249,7 +249,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64.*|AARCH64.*")
+   set(HAVE_AVX512F FALSE)
+   set(HAVE_FMA FALSE)
+   set(HAVE_SSE4_1 FALSE)
+-  set(HAVE_NEON TRUE)
++  check_cxx_compiler_flag("-mfpu=neon" HAVE_NEON)
+ 
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*")
+ 
+--- a/tesseract/src/arch/simddetect.cpp
++++ b/tesseract/src/arch/simddetect.cpp
+@@ -254,7 +254,7 @@ SIMDDetect::SIMDDetect() {
+     // SSE detected.
+     SetDotProduct(DotProductSSE, &IntSimdMatrix::intSimdMatrixSSE);
+ #endif
+-#if defined(HAVE_NEON) || defined(__aarch64__)
++#if defined(HAVE_NEON)
+   } else if (neon_available_) {
+     // NEON detected.
+     SetDotProduct(DotProductNEON, &IntSimdMatrix::intSimdMatrixNEON);
+@@ -311,7 +311,7 @@ void SIMDDetect::Update() {
+   } else if (dotproduct == "accelerate") {
+     SetDotProduct(DotProductAccelerate, IntSimdMatrix::intSimdMatrix);
+ #endif
+-#if defined(HAVE_NEON) || defined(__aarch64__)
++#if defined(HAVE_NEON)
+   } else if (dotproduct == "neon" && neon_available_) {
+     // NEON selected by config variable.
+     SetDotProduct(DotProductNEON, &IntSimdMatrix::intSimdMatrixNEON);
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
index 54f3cdcf36f3..663558774565 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
@@ -63,6 +63,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.03.0-c99.patch
+	"${FILESDIR}"/${PN}-10.03.1-arm64-neon-tesseract.patch
 )
 
 src_prepare() {
diff --git a/app-text/highlight/highlight-4.9.ebuild b/app-text/highlight/highlight-4.9.ebuild
index b7e7bd01dd57..f1b2b20a3b17 100644
--- a/app-text/highlight/highlight-4.9.ebuild
+++ b/app-text/highlight/highlight-4.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples gui test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index b789100379d5..03067c7bcd5c 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,3 +1 @@
-DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
-DIST html-xml-utils-8.5.tar.gz 421376 BLAKE2B 8fa959104db2d5765ceaf49be815f16c1422a3c7b94e0e8cd91e3bd0a8b18dfc33dff5d98204d7fe5694cfb711d213a5d82f58159b6d493fc78336d8dae1824d SHA512 f1140a81e66cc2f46dd0507a8948b2c267230fa8aed3dc79e91eeb2b6bcfe7053378da9d35fd053f8a8bc25c46491388aa7fd519c7e1c7757e73a7e1b1c67d87
 DIST html-xml-utils-8.6.tar.gz 421530 BLAKE2B 8c13a36798c5bb2e325f0df38696a9428b6c3ca087bbb4d1e7d9f2dd372e0aff386b7747e117016ad733ac07ab56a38b5ad0bcb1a0aa6b5ffd58de0ba2d8027d SHA512 0050b789a4921fa66b863255f1fd1ef9826e4b778ebc6dc67592fe854ec314b13cd8b162af67dae204018867966cfd5cb9822345917d3de3dc76c797bc0d2ec1
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
deleted file mode 100644
index 40dab6ff6400..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
-SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	net-dns/libidn2:=
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-src_test() {
-	# Lots of tests lack a shebang and use bashisms
-	emake check SHELL="${BROOT}"/bin/bash
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-8.5.ebuild b/app-text/html-xml-utils/html-xml-utils-8.5.ebuild
deleted file mode 100644
index bf51929c322d..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-8.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
-SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	net-dns/libidn2:=
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-src_test() {
-	# Lots of tests lack a shebang and use bashisms
-	emake check SHELL="${BROOT}"/bin/bash
-}
diff --git a/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
deleted file mode 100644
index 4c8e54fb26ef..000000000000
--- a/app-text/htmlmin/htmlmin-0.1.12-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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-# upstream doesn't do tags much
-EGIT_COMMIT=220b1d16442eb4b6fafed338ee3b61f698a01e63
-DESCRIPTION="A configurable HTML Minifier with safety features"
-HOMEPAGE="https://github.com/mankyd/htmlmin"
-SRC_URI="
-	https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	sed '/prune/d' -i MANIFEST.in || die
-	distutils-r1_src_prepare
-}
diff --git a/app-text/htmlmin/htmlmin-0.1.12-r3.ebuild b/app-text/htmlmin/htmlmin-0.1.12-r3.ebuild
new file mode 100644
index 000000000000..188d0350d718
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.12-r3.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+# upstream doesn't do tags much
+EGIT_COMMIT=220b1d16442eb4b6fafed338ee3b61f698a01e63
+DESCRIPTION="A configurable HTML Minifier with safety features"
+HOMEPAGE="https://github.com/mankyd/htmlmin"
+SRC_URI="
+	https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -i -e '/prune/d' MANIFEST.in || die
+	# unused import
+	sed -i -e '/cgi/d' htmlmin/main.py || die
+}
diff --git a/app-text/hunspell/hunspell-1.7.2-r1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
index 97635c6a1145..2063962ef9b7 100644
--- a/app-text/hunspell/hunspell-1.7.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/libiconv
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index d415981d9743..df9e1bd765b2 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,2 +1 @@
-DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
 DIST jo-1.6.tar.gz 151941 BLAKE2B 13d7d68c33d7f89ebb4a5cdb448082bd4d245060ebf8c85149c39f2a184f03f1ac1c380833a742894c37c0815e3627569cfe29f202f9aa3dcec7fa089f99b918 SHA512 a2cb1327c8255e0f8d1b6e6056bbce081d7703192bdb974e908549b863d7db645531dbeff87629a6ed53626295ab7ca8a72816d104f9188846ef175c8a9acb07
diff --git a/app-text/jo/jo-1.4.ebuild b/app-text/jo/jo-1.4.ebuild
deleted file mode 100644
index bf84777ca6d8..000000000000
--- a/app-text/jo/jo-1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1
-
-DESCRIPTION="JSON output from a shell"
-HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	export bashcompdir=$(get_bashcompdir)
-	default
-}
-
-src_install() {
-	default
-	mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
-}
diff --git a/app-text/languagetool/languagetool-6.3-r1.ebuild b/app-text/languagetool/languagetool-6.3-r1.ebuild
new file mode 100644
index 000000000000..81b489384018
--- /dev/null
+++ b/app-text/languagetool/languagetool-6.3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit java-pkg-2 desktop xdg-utils
+
+MY_PN=LanguageTool
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A proof-reading tool for many languages"
+HOMEPAGE="https://languagetool.org/"
+SRC_URI="https://languagetool.org/download/${MY_P}.zip"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:0
+	dev-java/commons-collections:4
+	dev-java/commons-io:1
+	dev-java/commons-lang:3.6
+	dev-java/commons-logging:0
+	dev-java/hamcrest-core:1.3
+	dev-java/jcommander:0
+	dev-java/jna:4
+	dev-java/slf4j-api:0
+"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	rm libs/commons-{cli,collections4,io,lang3,logging}.jar || die
+	rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die
+
+	# Loads of bundled stuff :(
+	#java-pkg-2_src_prepare
+}
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_dojar *.jar libs/*.jar
+
+	local DIR=/usr/share/${PN}/lib/language-modules
+	java-pkg_addcp "${EPREFIX}${DIR}"
+	insinto ${DIR}
+	doins -r org META-INF
+
+	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
+	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
+	java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer  --config /etc/languagetool.cfg
+	newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
+	domenu "${FILESDIR}"/${PN}.desktop
+	newinitd "${FILESDIR}/languagetool.initd" languagetool
+
+	dodoc CHANGES.md README.md
+
+	unset MY_DEPEND
+	java-pkg_gen-cp MY_DEPEND
+	java-pkg_register-dependency "${MY_DEPEND}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-text/languagetool/languagetool-6.3.ebuild b/app-text/languagetool/languagetool-6.3.ebuild
deleted file mode 100644
index ddcbe701a0a1..000000000000
--- a/app-text/languagetool/languagetool-6.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 java-pkg-2 desktop xdg-utils
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://languagetool.org/"
-SRC_URI="https://languagetool.org/download/${MY_P}.zip"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-io:1
-	dev-java/commons-lang:3.6
-	dev-java/commons-logging:0
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/slf4j-api:0
-"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	rm libs/commons-{cli,collections4,io,lang3,logging}.jar || die
-	rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die
-
-	# Loads of bundled stuff :(
-	#java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar *.jar libs/*.jar
-
-	local DIR=/usr/share/${PN}/lib/language-modules
-	java-pkg_addcp "${EPREFIX}${DIR}"
-	insinto ${DIR}
-	doins -r org META-INF
-
-	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
-	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-	java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer  --config /etc/languagetool.cfg
-	newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
-	domenu "${FILESDIR}"/${PN}.desktop
-	newinitd "${FILESDIR}/languagetool.initd" languagetool
-
-	dodoc CHANGES.md README.md
-
-	unset MY_DEPEND
-	java-pkg_gen-cp MY_DEPEND
-	java-pkg_register-dependency "${MY_DEPEND}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-text/lesspipe/lesspipe-2.13.ebuild b/app-text/lesspipe/lesspipe-2.13.ebuild
index 31e7d52d9b69..a0393dafe206 100644
--- a/app-text/lesspipe/lesspipe-2.13.ebuild
+++ b/app-text/lesspipe/lesspipe-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
index 07c5d97647c2..0bb1b3e8f18f 100644
--- a/app-text/mandoc/mandoc-1.14.6.ebuild
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cgi selinux system-man test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/marknote/marknote-1.3.0.ebuild b/app-text/marknote/marknote-1.3.0.ebuild
index fbad5181cd72..aaa998f5fe48 100644
--- a/app-text/marknote/marknote-1.3.0.ebuild
+++ b/app-text/marknote/marknote-1.3.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/marknote/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-text/mdbook/mdbook-0.4.40.ebuild b/app-text/mdbook/mdbook-0.4.40.ebuild
index 5adbdeee6234..bf8098720bf5 100644
--- a/app-text/mdbook/mdbook-0.4.40.ebuild
+++ b/app-text/mdbook/mdbook-0.4.40.ebuild
@@ -268,7 +268,7 @@ S="${WORKDIR}/${P/b/B}"
 LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1"
 LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 2d8887e05469..c1805aa70fe3 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,2 @@
-DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777
 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
diff --git a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
deleted file mode 100644
index 02fa3bfdd45c..000000000000
--- a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Refreshed patches based on:
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
---- a/Makerules
-+++ b/Makerules
-@@ -9,6 +9,9 @@ ifeq ($(OS),)
-   OS := $(OS:Darwin=MACOS)
- endif
- 
-+PKG_CONFIG ?= pkg-config
-+CC_FOR_BUILD ?= $(CC)
-+
- WARNING_CFLAGS := -Wall -Wsign-compare
- 
- # Feature configuration options
-@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux)
-     LDFLAGS += -sTOTAL_MEMORY=48MB
-   endif
- 
--  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
--	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
--	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
-+	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
-+	SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
-   endif
--  ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
--	SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
--	SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
-+  ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
-+	SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
-+	SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
-   endif
--  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
--	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
--	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-+  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
-+	SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
-+	SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
-   endif
--  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
--	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
--	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
-+	SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
-+	SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
-   endif
--  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
--	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
--	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
-+  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
-+	SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
-+	SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
-   endif
--  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
--	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
--	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
-+	SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
-+	SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
-   endif
--  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
--	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
--	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-+  ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
-+	SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
-+	SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
-   endif
- 
--  HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
-+  HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
-   ifeq ($(HAVE_SYS_LEPTONICA),yes)
--	SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
--	SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
-+	SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
-+	SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
-   endif
- 
--  HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
-+  HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes)
-   ifeq ($(HAVE_SYS_TESSERACT),yes)
--	SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
--	SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
-+	SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
-+	SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
-   endif
- 
--  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+  HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
-   ifeq ($(HAVE_SYS_CURL),yes)
--	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
--	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+	SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
-+	SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
-   endif
- 
-   HAVE_GLUT := yes
-@@ -243,18 +246,18 @@ else ifeq ($(OS),Linux)
- 	SYS_GLUT_LIBS := -lglut -lGL
-   endif
- 
-   HAVE_X11 := not-unless-portage-tells-me
-   ifeq ($(HAVE_X11),yes)
--	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
--	X11_LIBS := $(shell pkg-config --libs x11 xext)
-+	X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
-+	X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
-   endif
- 
-   ifeq ($(HAVE_LIBCRYPTO),)
-     HAVE_LIBCRYPTO := not-unless-portage-tells-me
-   endif
-   ifeq ($(HAVE_LIBCRYPTO),yes)
--	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
--	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+	LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
-+	LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
-   endif
- 
-   HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.23.3-darwin.patch b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
deleted file mode 100644
index c151d81f175d..000000000000
--- a/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makerules
-+++ b/Makerules
-@@ -161,11 +161,11 @@ ifeq ($(OS),MINGW)
- else ifeq ($(OS),MACOS)
-   HAVE_GLUT := yes
-   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
--  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
--  CC = xcrun cc
--  AR = xcrun ar
--  LD = xcrun ld
--  RANLIB = xcrun ranlib
-+  SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
-+  CC ?= xcrun cc
-+  AR ?= xcrun ar
-+  LD ?= xcrun ld
-+  RANLIB ?= xcrun ranlib
- 
-   ifneq ($(ARCHFLAGS),)
-     $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
-@@ -180,15 +180,7 @@ else ifeq ($(OS),MACOS)
-     endif
-   endif
- 
--else ifeq ($(OS),Linux)
--  ifeq ($(PYODIDE_ROOT),)
--    HAVE_OBJCOPY := yes
--  else
--    # Pyodide's ld does not support -b so we cannot use it to create object
--    # files containing font data, so leave HAVE_OBJCOPY unset. And we need
--    # extra memory when linking.
--    LDFLAGS += -sTOTAL_MEMORY=48MB
--  endif
-+endif
- 
-   ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
- 	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
-@@ -263,8 +255,6 @@ else ifeq ($(OS),Linux)
- 	PTHREAD_LIBS := -lpthread
-   endif
- 
--endif
--
- # The following section has various cross compilation configurations.
- #
- # Invoke these as:
diff --git a/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
deleted file mode 100644
index b91bd9ad12e3..000000000000
--- a/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makerules
-+++ b/Makerules
-@@ -243,14 +243,14 @@ else ifeq ($(OS),Linux)
- 	SYS_GLUT_LIBS := -lglut -lGL
-   endif
- 
--  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-+  HAVE_X11 := not-unless-portage-tells-me
-   ifeq ($(HAVE_X11),yes)
- 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- 	X11_LIBS := $(shell pkg-config --libs x11 xext)
-   endif
- 
-   ifeq ($(HAVE_LIBCRYPTO),)
--    HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-+    HAVE_LIBCRYPTO := not-unless-portage-tells-me
-   endif
-   ifeq ($(HAVE_LIBCRYPTO),yes)
- 	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
diff --git a/app-text/mupdf/files/mupdf-1.24.8-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.24.8-add-desktop-pc-files.patch
new file mode 100644
index 000000000000..03d5a014fe48
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.24.8-add-desktop-pc-files.patch
@@ -0,0 +1,33 @@
+--- /dev/null
++++ ./platform/debian/mupdf.desktop
+@@ -0,0 +1,15 @@
++[Desktop Entry]
++Name=MuPDF
++GenericName=PDF file viewer
++Exec=mupdf %f
++TryExec=mupdf
++Icon=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.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild
deleted file mode 100644
index d27ecf8911d4..000000000000
--- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild
+++ /dev/null
@@ -1,165 +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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="+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="
-	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}"/${PN}-1.23.3-darwin.patch
-	# See bugs #662352
-	"${FILESDIR}"/${PN}-1.23.3-openssl-x11.patch
-	# General cross fixes from Debian (refreshed)
-	"${FILESDIR}"/${PN}-1.23.3-cross-fixes.patch
-	"${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.24.8.ebuild b/app-text/mupdf/mupdf-1.24.8.ebuild
new file mode 100644
index 000000000000..7773f50f2acd
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.24.8.ebuild
@@ -0,0 +1,166 @@
+# 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 ~ia64 ~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}"/${P}-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
+)
+
+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/${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/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 9f7429d2402b..6fb364ce0a29 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -1,4 +1,4 @@
-DIST pandoc-3.2.1-linux-amd64.tar.gz 32117390 BLAKE2B a927de6467bf48f18c54f0b9846f0060aada3284ca7b4b77c46f7111b760a62babdc8846e543b55a5c9b1d6eede365888c348cf853ea25e31023790661f8faab SHA512 44f4fcf49e69a4a45c135ea5bfc8fbd41afa59f9f367232fddd1a9141629faacd4b8e29bf90e495d517b9c3830ce392807853886be4188e2fb27a61240c8dea6
-DIST pandoc-3.2.1-linux-arm64.tar.gz 34812370 BLAKE2B 7d18f3749bdaf25a0305ba2b6927c2fc64efc9f6c7ee16d1b82bf063ff872e1ed5b22f346fdd45094b4245b0930659e840d8f41de4198d0831a2e4003088a63f SHA512 4bf651ecade55b4b3880a63a97586fb2602a51550c45853a0ebcd59def000095b42018fbbc20a707ade85854c45c88ce38ebb80d5c7f0101e6b465b951f21f0c
 DIST pandoc-3.3-linux-amd64.tar.gz 32140122 BLAKE2B eda93f6a127e40d3ef064604385558fdd4e98c497bd65a845062e6daa988f5bf4cda952a0025835a918b5d7c693d299e4ef7a4244ebce065e48571442f199494 SHA512 4dbf051707fe6d2a6e4d46e32ef000a684edd724059059578950d808114f234bef009725f77b5c9ce44b6feb21bdaf9ac16196bb272b9a79456dd5f67b84cbb9
 DIST pandoc-3.3-linux-arm64.tar.gz 34838805 BLAKE2B a81e590d862aa3c7832425cba67d3622805373dbee5c1a36e52e80326d28251d2076ec95392b0bea62c5154c6f59e2f60d2195b64d0fe6688313437f76f678c4 SHA512 e2c42c2af49dffd05506dc268d929214b85559560140da163145b72dce4dd8fd2f22b8e3278dfdaf0d90f7caba8a8d5a56443362054d508437326b7fc1dfcb93
+DIST pandoc-3.4-linux-amd64.tar.gz 32415360 BLAKE2B f1daec8a527b5a58c55ed060f6dc38db36011ffc4825d11710e82301f984511e9584dba8bc52823c3e1acc6acdd58d5cfc60714263b5e8eafa210c383316e944 SHA512 b38ca8b7c51117051de235a937bf50382ca831e68f190503c3526261920c4568f963400c1953247495d18782f5b0d864085621965a11750255b508ba7779ccaa
+DIST pandoc-3.4-linux-arm64.tar.gz 35126564 BLAKE2B 4dba5ce0e85b3189d1af814bf4a27198004c391b4e27aabe7b71bbb122a310af6b83cf032e495ccab2004226687b5f830fa26554d12d1be49c250d28fc792958 SHA512 954c7b267d67566da8c613f866c82b3a2e6d65e42f261f07ffa486a0e2c4095b3320cee637aecfa297e7abd81e118fcfe0e05d04870bc23219c0a3154c96e15a
diff --git a/app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild
deleted file mode 100644
index 1a9e4cefd9f7..000000000000
--- a/app-text/pandoc-bin/pandoc-bin-3.2.1.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
-
-MY_PN=${PN//-bin/}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Conversion between markup formats (binary package)"
-HOMEPAGE="https://pandoc.org/
-	https://github.com/jgm/pandoc/"
-
-BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
-SRC_URI="
-	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
-	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 arm64"
-IUSE="+pandoc-symlink"
-
-RDEPEND="
-	pandoc-symlink? (
-		!${CATEGORY}/${MY_PN}
-		!app-text/pandoc-cli
-		!dev-haskell/pandoc
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-	default
-
-	# Manpages are gzipped.
-	unpack "${S}"/share/man/man1/*.1.gz
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe bin/${MY_PN} ${PN}
-	dosym ${PN} /usr/bin/pandoc-lua-bin
-	dosym ${PN} /usr/bin/pandoc-server-bin
-
-	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
-	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
-	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
-
-	if use pandoc-symlink ; then
-		dosym ${PN} /usr/bin/${MY_PN}
-		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
-		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
-
-		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
-		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
-		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
-	fi
-}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
index 6c205a599708..1a9e4cefd9f7 100644
--- a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 arm64"
 IUSE="+pandoc-symlink"
 
 RDEPEND="
diff --git a/app-text/pandoc-bin/pandoc-bin-3.4.ebuild b/app-text/pandoc-bin/pandoc-bin-3.4.ebuild
new file mode 100644
index 000000000000..6c205a599708
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+	https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="
+	pandoc-symlink? (
+		!${CATEGORY}/${MY_PN}
+		!app-text/pandoc-cli
+		!dev-haskell/pandoc
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+	default
+
+	# Manpages are gzipped.
+	unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bin/${MY_PN} ${PN}
+	dosym ${PN} /usr/bin/pandoc-lua-bin
+	dosym ${PN} /usr/bin/pandoc-server-bin
+
+	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+	if use pandoc-symlink ; then
+		dosym ${PN} /usr/bin/${MY_PN}
+		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+	fi
+}
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index 51ac900fba76..e943ae546d27 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,3 +1 @@
-DIST pastebinit-1.6.2.tar.gz 53444 BLAKE2B 1e8853f0f37ac98eb1537dcc01f7c2ee33a3cf72fb5b10fc18b3f6b1662f3e15acf29c1674c2a34e234c6636ac70f59b265862a48c0860d1ff3725eabe11d7c4 SHA512 a04863bc748340bd8bc9d6170dedb2b234b53996cbaf5d1fdd0a078d0d6f03c4c558d2a5029359eb95d25c1339af25d74dbf247af1de0ae278a7664869e8841d
 DIST pastebinit-1.7.0.tar.gz 54026 BLAKE2B 11d049333cd08866765ccd22292d1c13e13248ace2e713b69a30a0100d65ff16554368e0c875752d07050de2728ff5ad327f0f8fdbbaa6b53bd7fa98a7286cde SHA512 01f65eb91803926bc401d01781d29ff5e409e1caf0aa593744a6e137571db6308893ce327b954131d55b2a5f764d4598fcfbfbab40cdc74a3fdb776566ab4488
-DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
diff --git a/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
deleted file mode 100644
index ee7245c03faa..000000000000
--- a/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix DeprecationWarning
---- a/pastebinit
-+++ b/pastebinit
-@@ -32,8 +32,7 @@
- # Now try to override it with a distributor pastebin
- try:
-     import distro
--    release = distro.linux_distribution(
--              full_distribution_name=False)[0].lower()
-+    release = distro.id()
-     if release == 'debian':
-         defaultPB = "paste.debian.net"
-     elif release == 'fedora':
diff --git a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
deleted file mode 100644
index bf613cf69206..000000000000
--- a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit optfeature python-single-r1
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="man"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	sys-devel/gettext
-	man? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-distro.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"/${PN}
-}
-
-src_compile() {
-	emake -C po
-
-	if use man; then
-		ebegin "Generating a manpage with xsltproc"
-		xsltproc --nonet \
-			"${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-			pastebinit.xml
-		eend $?
-	fi
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	dosym pbput /usr/bin/pbget
-	dosym pbput /usr/bin/pbputs
-
-	einstalldocs
-	doman utils/*.1
-	use man && doman pastebinit.1
-
-	insinto /usr/share/locale
-	doins -r po/mo/*
-
-	insinto /usr/share
-	doins -r pastebin.d
-}
-
-pkg_postinst() {
-	optfeature "identification of your distribution" dev-python/distro
-	optfeature "pbput and pbputs scripts" app-arch/xz-utils
-	optfeature "pbget and pbputs scripts" app-crypt/gnupg
-}
diff --git a/app-text/pastebinit/pastebinit-1.6.2.ebuild b/app-text/pastebinit/pastebinit-1.6.2.ebuild
deleted file mode 100644
index 9ea08d834305..000000000000
--- a/app-text/pastebinit/pastebinit-1.6.2.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_{11..12} )
-inherit optfeature python-single-r1
-
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://github.com/pastebinit/pastebinit"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="man"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="
-	sys-devel/gettext
-	man? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"/${PN}
-}
-
-src_compile() {
-	emake -C po
-
-	if use man; then
-		ebegin "Generating a manpage with xsltproc"
-		xsltproc --nonet \
-			"${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-			pastebinit.xml
-		eend $? || die
-	fi
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	dosym pbput /usr/bin/pbget
-	dosym pbput /usr/bin/pbputs
-
-	einstalldocs
-	doman utils/*.1
-	use man && doman pastebinit.1
-
-	insinto /usr/share/locale
-	doins -r po/mo/*
-
-	insinto /usr/share
-	doins -r pastebin.d
-}
-
-pkg_postinst() {
-	optfeature "pbput and pbputs scripts" app-arch/xz-utils
-	optfeature "pbget and pbputs scripts" app-crypt/gnupg
-}
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index e85ac0372024..0fde5861c685 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1 +1,2 @@
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
+DIST pdfgrep-2.2.0.tar.gz 213237 BLAKE2B eedc41810a1b1b1e23323118c10617787364496ac224738a7b0b9b566c47b08e609788f9d8e1a3b56587be86833820acef58c53ba32dd9fdfc8cc3be89db5e68 SHA512 de39ccb266f30b32ec71083759553979a31f7220b4923a4c3c74e1001c2f2c0dbef17c00f8139ffe88eec2031c48a13f18a057c7523ad363689b0f5b004c420f
diff --git a/app-text/pdfgrep/pdfgrep-2.2.0.ebuild b/app-text/pdfgrep/pdfgrep-2.2.0.ebuild
new file mode 100644
index 000000000000..e0c242ff2d5a
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-2.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A tool similar to grep which searches text in PDFs"
+HOMEPAGE="https://pdfgrep.org/"
+SRC_URI="https://www.pdfgrep.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+pcre test unac"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-text/poppler:=[cxx]
+	dev-libs/libgcrypt:0=
+	pcre? ( dev-libs/libpcre2:= )
+	unac? ( app-text/unac )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+	test? (
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-util/dejagnu
+	)
+"
+
+DOCS="AUTHORS README.md NEWS.md"
+
+src_configure() {
+	econf \
+		$(use_with pcre libpcre) \
+		$(use_with unac)
+}
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index bc4be7f0c4ab..e374a866227e 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,2 +1,2 @@
-DIST pdfminer-20220506.tar.gz 10853104 BLAKE2B b6008db789973fb69537801b8e928761bd0a949cc72ddf380fd71b6373913f6a689b71bee159e6991e99c196b7e8a1fac5530d2bf9c577e53b8b556bed00b85a SHA512 b81916c70f22f3408cf41a50d35937f950ee6205f59fa03603bc7a78d1b1b037311ebaf5661f6d46b9d4190f2f56189fc28b714463dc5854328c14f97fbc28c4
 DIST pdfminer.six-20221105.gh.tar.gz 10857730 BLAKE2B dd9282bfc3c636676f087e6ffc2cfb137f66eee18427f08de488c7bdc13bd27b6cc674d3b75c93d1566668272ee4111e3347664a70152bd4b2f7e4e63664d01b SHA512 72034a75005c91100274f86baa4c8884caad86aacf94ca9d0d5a51d8b3c772aa0bcd766416bed9e26df00bd9a2be585649eaa24321735f532e40a3871e19c6df
+DIST pdfminer.six-20240706.gh.tar.gz 11010877 BLAKE2B 7253d9fbdd44bce80b46d2006caa530b628327c2a2c5d68dd165267b7f2c1078895361da62b508991e4c0938163835a3381356e7353efd7208ee7b9e5ee3a0bd SHA512 01359926e889788daf92db8845978c3cd6e0b88c0659041d2df26d48e558a2918aa373ab86db19bc3c314220ed8c5070778d5b7fd1457b9145fe67aa735a94b5
diff --git a/app-text/pdfminer/pdfminer-20220506.ebuild b/app-text/pdfminer/pdfminer-20220506.ebuild
deleted file mode 100644
index cbc3e5638e44..000000000000
--- a/app-text/pdfminer/pdfminer-20220506.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-MY_P="${PN}.six-${PV}"
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/"
-# Release tarballs lack tests
-#SRC_URI="https://github.com/pdfminer/pdfminer.six/releases/download/${PV}/${MY_P}.tar.gz"
-SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s:package.__version__:${PV}:" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use examples && emake -C samples all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && dodoc -r samples
-	distutils-r1_python_install_all
-}
diff --git a/app-text/pdfminer/pdfminer-20240706.ebuild b/app-text/pdfminer/pdfminer-20240706.ebuild
new file mode 100644
index 000000000000..5ce145c1bb21
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20240706.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+MY_P="${PN}.six-${PV}"
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/"
+# Release tarballs lack tests
+SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source "dev-python/sphinx-argparse"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -z -e "s:setuptools_git_versioning={[^}]*}:version=${PV}:" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use examples && dodoc -r samples
+	distutils-r1_python_install_all
+}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 5d37f3e38a90..89244bd59cf3 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,3 +1,2 @@
 DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b
-DIST pelican-4.9.0.gh.tar.gz 1374399 BLAKE2B 2fa91ff9b5ddacac1fd64d9325ccb1fadb9bbfaa9c6098920a43a576f3d8d7be31a98b5250b2ea10bee63993d8b9bb72fdebdf9d57d0518d1f4bddef705e2804 SHA512 a50d0fbad816fa4a73eb94d0aa15cf5f9321ed2bdb50addbebbf0024f2fc7fd73ab94b314b5821068d552dcd1b11a54ca6511117aac732340156f2361a7e832c
 DIST pelican-4.9.1.gh.tar.gz 1374443 BLAKE2B d9dfa234b0f19cd02ccc8867e5b4f6e0444300692d69001baf23943230f27f8a7bc91e98e5c4c3cd194abadf8fb140c0e1a0c3beb39e5d288113ecc4e487c6a6 SHA512 70b7efd7a38dc2069b1eb9141647fa80bf959de36936ad7b4d38407be7e029fc788ef9b9f297d99e5dc6cad67d58fe6ff97f9b542db7e0a9c23e2907d4604e21
diff --git a/app-text/pelican/pelican-4.9.0.ebuild b/app-text/pelican/pelican-4.9.0.ebuild
deleted file mode 100644
index a8ec456458a6..000000000000
--- a/app-text/pelican/pelican-4.9.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="
-	https://getpelican.com/
-	https://pypi.org/project/pelican/
-"
-SRC_URI="
-	https://github.com/getpelican/pelican/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="doc examples markdown"
-
-RDEPEND="
-	>=dev-python/docutils-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/feedgenerator-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.6.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-1.3.7[${PYTHON_USEDEP}]
-	>=dev-python/watchfiles-0.21.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? (
-		>=dev-python/markdown-3.1[${PYTHON_USEDEP}]
-		dev-python/typogrify[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( README.rst )
-
-EPYTEST_DESELECT=(
-	# Needs investigation, we weren't running tests at all before
-	pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
-	pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
-	pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
-)
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}
-		docompress -x /usr/share/doc/${PF}/samples
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
-}
diff --git a/app-text/po4a/po4a-0.73.ebuild b/app-text/po4a/po4a-0.73.ebuild
index b357dbe88d6d..2e5edcf53f96 100644
--- a/app-text/po4a/po4a-0.73.ebuild
+++ b/app-text/po4a/po4a-0.73.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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/poppler/Manifest b/app-text/poppler/Manifest
index 1eebf965bd96..5bb47a83654f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,10 +1,7 @@
-DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4035b19ec3d87c328ef67b22b9e36cc15ef4912da625a55a5befacc95aef6a8ef5dc48aa46cd79943b03985333b47 SHA512 49a9bef20ebdca3b56e53fa610d5ff76a7fba378dd7d8bb64a11bea909bf103ec7fd385e95ca971feab84aaebb523d4c7515a3a42ac0c7eb728e376a1239cfd9
-DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28
 DIST poppler-24.06.1.tar.xz 1910252 BLAKE2B 7eb2543dce1da0a04ce872d4af30eb25304db72fb6dc6f3ed309d478844af0fdd66e886a6e8c3a48df2096a8aa834f6b14e65689466de3283b54bc50289cd8b3 SHA512 4add06c9cb7741a66cd11e169b6cc332e80151b6e3450295400e948f30c340d018f67fcf2b923f4f65a11f20e2ce1c2740008e823d9b97f966eded7ae51e4167
 DIST poppler-24.06.1.tar.xz.sig 833 BLAKE2B f2fa137d12e9143691d1a640a39c40fe8d923b017e60e2a125026082adce8e0863c501167a170d60aa38044d9c799f9e31a8eacfee68847554ac86f7eea84d26 SHA512 f6343d3b7c8889a5b8e8a14a14e60fd11990393608639b0f41bb35451c2ac5ec28bba01af79578c0cb224726886b28a491a769cba5347df67680d18812258b9f
-DIST poppler-24.07.0.tar.xz 1913256 BLAKE2B fe4c227e72b215faea3942d9bab20b495da68cded7fbf082148362eae7ff35004e982fccb80fd05d3774cbf42d510b2784bbb6e71eb8b9fe7ac7f77a52d980ad SHA512 c11877c9977341c75166991118d9cbd0b4167708ead06bc464f0c13ef1e8ff30733f6521d9c8f8608fb6c59db2a3a046eac36a635f90e7aa7124f9be21df422d
-DIST poppler-24.07.0.tar.xz.sig 833 BLAKE2B c903a8f84c65c187f2f976eb83059722ef524331e0bae8aef21f0cc8af0d144528bc8c0b29e821eced49e318565e1c8fff4a674f9d74cf63e645e93caebd976d SHA512 5a80f27ce09ca2864e870a6d1cd9b8ac3d727c7c7522ff865517cb804344c797067ecb0763c58b486a5e371286ca2e0afa93c260cb864b11815972c03207ad5d
 DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad734d31b460bc7b3578d08a75ad146d6d2c1e4108acb33d08fd518fee014cc84e23d2e04ea92ad152702af614c5ca2 SHA512 47309b75746d5bc309ae98da9280e5178c81505c8873e849ece6923eb0ae0df6f271dab1e38b3aac1dbd5d05518284ad237ea78ba40d90420c6fc53ae1c3b400
 DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
-DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
+DIST poppler-24.09.0.tar.xz 1914488 BLAKE2B be6a388b9ca80aa6d86f05a69e712f5db8764653464ac0b511ed6d4b6090e796df041749f7c39519d3e6606e8c5692deadda9a60d5e8fc67931862676eda1b28 SHA512 1e8aea61d6bc1ce0d94bbcd0bb3b329a128b546082b2d74a005f6e36457c8c4632695ddddff6fe6e1e98cd40e5080e6b54eeb816846cb5e891d68b7051641151
+DIST poppler-24.09.0.tar.xz.sig 833 BLAKE2B 01c532ac962133ab85de72520a558b5f67ab27e8c260097b40a633f0f51978562c0ded7230828424712dbb931032d02d18179090fbc80dc926c1d58e8c32c2c2 SHA512 612b7b8a69ef4feb05c029cf925e5e876697abef4ee01575c3cfe68f20f7acd10103e18705c56f7c199707df648523553a6c87b8f39287ace03e444abf8750f2
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
diff --git a/app-text/poppler/poppler-24.04.0.ebuild b/app-text/poppler/poppler-24.04.0.ebuild
deleted file mode 100644
index 47fea88caf87..000000000000
--- a/app-text/poppler/poppler-24.04.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://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
-	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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/136"   # 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.64:= )
-	)
-	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
-		dev-qt/qtgui:5
-		dev-qt/qtxml: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.71 )
-	test? (
-		qt5? (
-			dev-qt/qttest:5
-			dev-qt/qtwidgets: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-24.06.1.ebuild b/app-text/poppler/poppler-24.06.1.ebuild
index bb7ab3e3a6d6..92292389aefc 100644
--- a/app-text/poppler/poppler-24.06.1.ebuild
+++ b/app-text/poppler/poppler-24.06.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake flag-o-matic toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
 	SLOT="0/9999"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
@@ -17,7 +17,7 @@ else
 	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 ~ia64 ~loong ~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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/138"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-24.07.0.ebuild b/app-text/poppler/poppler-24.07.0.ebuild
deleted file mode 100644
index 7b4beeb49ab3..000000000000
--- a/app-text/poppler/poppler-24.07.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://anongit.freedesktop.org/git/poppler/poppler.git"
-	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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/139"   # 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-24.08.0.ebuild b/app-text/poppler/poppler-24.08.0.ebuild
index 06e7220bfbba..ee6d112e8aa6 100644
--- a/app-text/poppler/poppler-24.08.0.ebuild
+++ b/app-text/poppler/poppler-24.08.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake flag-o-matic toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
 	SLOT="0/9999"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
@@ -17,7 +17,7 @@ else
 	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 ~ia64 ~loong ~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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/140"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-24.09.0.ebuild b/app-text/poppler/poppler-24.09.0.ebuild
new file mode 100644
index 000000000000..3d2df6ffea62
--- /dev/null
+++ b/app-text/poppler/poppler-24.09.0.ebuild
@@ -0,0 +1,157 @@
+# 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/141"   # 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 06e7220bfbba..3d2df6ffea62 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -7,7 +7,7 @@ inherit cmake flag-o-matic toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
 	SLOT="0/9999"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
@@ -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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/140"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/141"   # 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/ronn-ng/ronn-ng-0.10.1.ebuild b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
index 50dffd57b057..2ab027ac7026 100644
--- a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/apjanke/ronn-ng/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND+="!app-text/ronn"
 
diff --git a/app-text/rpl/rpl-1.15.5.ebuild b/app-text/rpl/rpl-1.15.5.ebuild
index 7137111d7232..689b84560202 100644
--- a/app-text/rpl/rpl-1.15.5.ebuild
+++ b/app-text/rpl/rpl-1.15.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 05b7e414b68f..f42c8773a1c3 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,3 +2,4 @@ DIST Sigil_User_Guide_2022.05.17.epub 8894634 BLAKE2B 8a7c5b5add54d87dfe791a0dbb
 DIST Sigil_User_Guide_2024.08.15.epub 12641984 BLAKE2B feaa8a4f6b64786d5cbf494a61c8726a5dd3e169ca8902348e2fee9f890ab7496b5ad018d49d6cecd65cb3d3d4a9b4a6bda019ac52c324fa92fad3e7b5dbc680 SHA512 10199c037a57f4b9ed913a8c726a58e376dcd34300a98cdd4cf934fd3a2f9a26d2f92bd85131af7ee1084824d7b082f7becdec9b0731a62f9cde712bfada5a09
 DIST sigil-2.2.1.tar.gz 26131954 BLAKE2B b467d33a1e98733d7bf051cc152a5e8980af83c0992c4ca755d5dd666d5ea753b51d2642b6027a8c52e86077f3a92e999867cb774f619f729df3c51424fa3795 SHA512 a0f7e0529286e9d5020a97c6179791a1312df93cbbca4f5966dea40517eb9ab8979dd7048fe54f3cc821ef165ddf8a5bcb2ca6ffdde1b51196f6d2a7376162f0
 DIST sigil-2.3.0.tar.gz 17480782 BLAKE2B abcb5eac75ec56e9bc83a50175e6e9dc8a494aec0a8aca1585503a5a5727557bef9039d1b457f8e03ef00a8baf1bcb9fae29a6f720483ee30fa3bace777e7066 SHA512 1a12022f7af26e4713083c0c84b07c4ebe2825667391f8d47cd5984e69547daad58fe3bdf7a40c3b4f1aa4c4037a548c011833a9dd8754c1c914555548a0ca8f
+DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
diff --git a/app-text/sigil/sigil-2.3.1.ebuild b/app-text/sigil/sigil-2.3.1.ebuild
new file mode 100644
index 000000000000..cb9aa8b5f970
--- /dev/null
+++ b/app-text/sigil/sigil-2.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-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-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}"
+
+		-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/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
new file mode 100644
index 000000000000..d3869cfea1dd
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.4.1-arm64-neon-tesseract.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/924757
+https://bugs.gentoo.org/926891
+https://github.com/tesseract-ocr/tesseract/pull/4154
+
+(Note that if moving to CMake, can use the patch from ghostscript-gpl
+instead, i.e. https://src.fedoraproject.org/rpms/tesseract/blob/rawhide/f/tesseract_neon.patch).
+
+From b1e48789d61d995740762f66f505385db42410a5 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Mon, 30 Oct 2023 01:36:57 +0100
+Subject: [PATCH] Check if NEON extension are actually available
+
+User may pass own compiler flags to configure which override those
+provided by project through automake. Therefore it is possible for user
+on ARM platform to pass CXXFLAGS=-mfpu=vfp which will effectively
+disable NEON even though used compiler supports -mfpu=neon (since user
+supplied flags take precedence compiler invocation will use flags:
+-mfpu=neon -mfpu=vfp). Instead of checking whether compiler supports
+-mfpu=neon flag, check if NEON extensions are available by checking if
+__ARM_NEON is defined when compiling with -mfpu=neon and user supplied
+flags combined.
+
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+---
+ configure.ac | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b38537229..0514b619c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,10 +178,20 @@ case "${host_cpu}" in
+     ;;
+ 
+   arm*)
+-
+-    AX_CHECK_COMPILE_FLAG([-mfpu=neon], [neon=true], [neon=false], [$WERROR])
+-    AM_CONDITIONAL([HAVE_NEON], $neon)
+-    if $neon; then
++    SAVE_CXXFLAGS="$CXXFLAGS"
++    CXXFLAGS="-mfpu=neon $CXXFLAGS"
++    AC_MSG_CHECKING([for NEON support])
++    AC_COMPILE_IFELSE(
++    [AC_LANG_PROGRAM([], [[
++    #ifndef __ARM_NEON
++           #error
++    #endif
++    ]])],
++    [neon=yes], [neon=no])
++    AC_MSG_RESULT([$neon])
++    CXXFLAGS="$SAVE_CXXFLAGS"
++    AM_CONDITIONAL([HAVE_NEON], test "xyes" = "x$neon")
++    if test "xyes" = "$neon"; then
+       AC_DEFINE([HAVE_NEON], [1], [Enable NEON instructions])
+       NEON_CXXFLAGS="-mfpu=neon"
+       AC_SUBST([NEON_CXXFLAGS])
+
diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild
index d90adb970643..af83b0284a3a 100644
--- a/app-text/tesseract/tesseract-5.3.4.ebuild
+++ b/app-text/tesseract/tesseract-5.3.4.ebuild
@@ -37,6 +37,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/app-text/tesseract/tesseract-5.4.1.ebuild b/app-text/tesseract/tesseract-5.4.1.ebuild
index 1469566c29ed..d4438214a13d 100644
--- a/app-text/tesseract/tesseract-5.4.1.ebuild
+++ b/app-text/tesseract/tesseract-5.4.1.ebuild
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 4c31653fca31..d3c34531c724 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -32,6 +32,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/app-text/texlive/texlive-2021-r1.ebuild b/app-text/texlive/texlive-2021-r1.ebuild
index 446fbb70cc7a..47dfa610dfa9 100644
--- a/app-text/texlive/texlive-2021-r1.ebuild
+++ b/app-text/texlive/texlive-2021-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 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/texlive/texlive-2023-r1.ebuild b/app-text/texlive/texlive-2023-r1.ebuild
index 947ddd5379ea..e02f49a4c505 100644
--- a/app-text/texlive/texlive-2023-r1.ebuild
+++ b/app-text/texlive/texlive-2023-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 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/texlive/texlive-2023.ebuild b/app-text/texlive/texlive-2023.ebuild
index a26673259a5a..e66a068ff326 100644
--- a/app-text/texlive/texlive-2023.ebuild
+++ b/app-text/texlive/texlive-2023.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cjk context extra games graphics humanities luatex metapost music 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/files/test.xml b/app-text/trang/files/test.xml
deleted file mode 100644
index 747972587821..000000000000
--- a/app-text/trang/files/test.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
-All Rights Reserved.
-
-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 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.
-
-Except as contained in this notice, the names of the authors or their
-institutions shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from the authors.
--->
-<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS"
-    major-version="0" minor-version="0">
-  <request name="GetVersion" opcode="0">
-    <field type="CARD16" name="client_major_version" />
-    <field type="CARD16" name="client_minor_version" />
-    <reply>
-      <pad bytes="1" />
-      <field type="CARD16" name="server_major_version" />
-      <field type="CARD16" name="server_minor_version" />
-    </reply>
-  </request>
-
-  <request name="Capable" opcode="1">
-    <reply>
-      <pad bytes="1" />
-      <field type="BOOL" name="capable" />
-      <pad bytes="23" />
-    </reply>
-  </request>
-
-  <request name="GetTimeouts" opcode="2">
-    <reply>
-      <pad bytes="1" />
-      <field type="CARD16" name="standby_timeout" />
-      <field type="CARD16" name="suspend_timeout" />
-      <field type="CARD16" name="off_timeout" />
-      <pad bytes="18" />
-    </reply>
-  </request>
-
-  <request name="SetTimeouts" opcode="3">
-    <field type="CARD16" name="standby_timeout" />
-    <field type="CARD16" name="suspend_timeout" />
-    <field type="CARD16" name="off_timeout" />
-  </request>
-
-  <request name="Enable" opcode="4" />
-
-  <request name="Disable" opcode="5" />
-
-  <enum name="DPMSMode">
-    <item name="On" />
-    <item name="Standby" />
-    <item name="Suspend" />
-    <item name="Off" />
-  </enum>
-
-  <request name="ForceLevel" opcode="6">
-    <field type="CARD16" name="power_level" enum="DPMSMode" />
-  </request>
-
-  <request name="Info" opcode="7">
-    <reply>
-      <pad bytes="1" />
-      <field type="CARD16" name="power_level" enum="DPMSMode" />
-      <field type="BOOL" name="state" />
-      <pad bytes="21" />
-    </reply>
-  </request>
-</xcb>
\ No newline at end of file
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index c87f0bfe8493..da2491c4c43d 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,3 +1 @@
-DIST vgrep-2.6.0.tar.gz 1589155 BLAKE2B 847954ccf020c2b7f54360aab2fd9e3fc897dfd3ceab7d9ecd79f378c18196048649b37f4f9b62dc8f2af46f874a8433c8a20e5e025ca9e0f08b8f6859b0dd40 SHA512 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846
-DIST vgrep-2.7.0.tar.gz 1998937 BLAKE2B 8f5bf53814604ff3bdf7492ec8ad96811a62c9accc0664d07db86039e117686f551c6aaba40e5af4e1b646289a0e996b4f1cade9fc1a197778504e5c8d114830 SHA512 5cc9e866c6de9b024d29dc9aeeb87d6eea23becde63968b2a9266412bbe44920fa13d5e7dda47bb46135301ff7f5fd79e02ec2da8a9a694183d9e63aad64478d
 DIST vgrep-2.8.0.tar.gz 2039369 BLAKE2B a01191c860fb615ff569e3b3e9b49dfeab9d534bd8a94d07ff8ce49f65bedd75eda8ae79127e0e3eb7cf2343e6493815a954f74318296c89397a384566448f69 SHA512 1fbd674a7fddffede70a9d0715bf09359d48abf5c238cace43996a222e3e34ec73a7911f62b8476a2dcef40485ce192476067fd99d52b7fa0e7e3fe9297f461e
diff --git a/app-text/vgrep/vgrep-2.6.0.ebuild b/app-text/vgrep/vgrep-2.6.0.ebuild
deleted file mode 100644
index 1b3329afca49..000000000000
--- a/app-text/vgrep/vgrep-2.6.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"
-
-inherit go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD GPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# golangci-lint is required to run tests which is not yet packaged
-RESTRICT="strip test"
-
-BDEPEND="dev-go/go-md2man"
-
-DOCS=( README.md )
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	einstalldocs
-}
diff --git a/app-text/vgrep/vgrep-2.7.0.ebuild b/app-text/vgrep/vgrep-2.7.0.ebuild
deleted file mode 100644
index eac568a4d663..000000000000
--- a/app-text/vgrep/vgrep-2.7.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 go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD GPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# tests just run golangci-lint
-RESTRICT="test"
-
-BDEPEND="dev-go/go-md2man"
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -e '/-ldflags/s/-s //' -i Makefile || die # bug 795345
-}
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	einstalldocs
-}
diff --git a/app-text/vgrep/vgrep-2.8.0.ebuild b/app-text/vgrep/vgrep-2.8.0.ebuild
index 097f33c9270a..2b945375c31e 100644
--- a/app-text/vgrep/vgrep-2.8.0.ebuild
+++ b/app-text/vgrep/vgrep-2.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD GPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # tests just run golangci-lint
 RESTRICT="test"
diff --git a/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch b/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch
new file mode 100644
index 000000000000..f18f185f62a0
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-gsf-doc-meta-data.patch
@@ -0,0 +1,11 @@
+Bug: https://bugs.gentoo.org/936163
+--- a/wvSummary.c
++++ b/wvSummary.c	2024-08-20 16:14:11.260000000 +0300
+@@ -33,6 +33,7 @@
+ #include <gsf/gsf-msole-utils.h>
+ #include <gsf/gsf-docprop-vector.h>
+ #include <gsf/gsf-meta-names.h>
++#include <gsf/gsf-doc-meta-data.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/app-text/wv/wv-1.2.9-r4.ebuild b/app-text/wv/wv-1.2.9-r4.ebuild
index 4f6cf22d4f1e..e0ca468a887f 100644
--- a/app-text/wv/wv-1.2.9-r4.ebuild
+++ b/app-text/wv/wv-1.2.9-r4.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-C99-decls.patch
 	"${FILESDIR}"/${P}-gcc14-build-fix.patch
+	"${FILESDIR}"/${P}-gsf-doc-meta-data.patch
 )
 
 src_prepare() {
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index a16ba7a583d1..9c3c515949d9 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,3 +1 @@
-DIST xapers-0.9.0.tar.gz 159928 BLAKE2B d202a3835ccbcb1adfc2123ee40f6e1992e0c10f84cf57fc38eaae27134d649c94b5c625bf3a11ef2f4d119093fb1dcd99a923a9585d8e6b6b37ed9db7c15247 SHA512 0b2e32d215c64842a2d586c776d6cdfd2b77cd3081929c37dde9682fb61e8c58e374773ef33e1123087e8dcf655e12fd19db371005aaf31875492607d6494dd7
-DIST xapers-0.9.2.tar.bz2 155239 BLAKE2B 918ce421b154291deeb636b50c0dd0db2e523405d66105e3799a7abb054411b15b02cc5fa55e9667fb7c8fe98664778fb90e7c77aaa716b66c0f4dc4d463aae7 SHA512 73604490278bcdb228333dc677be12f6110cc11ab96a8a0d3c4590c5e6383d0869db2e82fbed88e4bf82fd997025ca831b6412bb00a54a7ab8ba3309b755d84b
 DIST xapers-0.9.3.tar.bz2 155307 BLAKE2B e448303ae6ee5fba41fd38814dc63d44b8b362f778677f55d8deecbb3b27572b7db5b4f274b5d33dc6d052b87b7379b34246eca6b182989511e5da635219be22 SHA512 84ef543b4fd3400ac796944e9baec92a4df9c09d2779184595cc582d2c91f6b8a9f500956d77266f733a830ca5416b3db8a189323781b7d5283ebfc8aece94b0
diff --git a/app-text/xapers/xapers-0.9.0.ebuild b/app-text/xapers/xapers-0.9.0.ebuild
deleted file mode 100644
index f2d6b0f70140..000000000000
--- a/app-text/xapers/xapers-0.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Personal document indexing system"
-HOMEPAGE="https://finestructure.net/xapers/ https://gitlab.com/jrollins/xapers/"
-SRC_URI="https://gitlab.com/jrollins/${PN}/-/archive/${PV}/${P}.tar.gz"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-text/poppler[utils]
-	dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	x11-misc/xclip
-	x11-misc/xdg-utils"
-
-BDEPEND="test? ( ${RDEPEND} )"
-
-python_test() {
-	cd test || die
-	./all || die
-}
diff --git a/app-text/xapers/xapers-0.9.2.ebuild b/app-text/xapers/xapers-0.9.2.ebuild
deleted file mode 100644
index cee8778f4ad9..000000000000
--- a/app-text/xapers/xapers-0.9.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Personal document indexing system"
-HOMEPAGE="https://gitlab.com/wpettersson/xapers/"
-SRC_URI="https://gitlab.com/wpettersson/${PN}/-/archive/${PV}/${P}.tar.bz2"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-text/poppler[utils]
-	dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	x11-misc/xclip
-	x11-misc/xdg-utils"
-
-BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	cd test || die
-	./all || die
-}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 710493a26075..4824a9161da0 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1 +1,2 @@
 DIST xapian-omega-1.4.25.tar.xz 578904 BLAKE2B d0bb62741f7c58d1398a4dc8bca3de2b385094fb8126a4e36f424cb09964ac350709bf6dabc38d8d7ebf5f3fcd213d2a444d8e5e5cc52c6353f1c72fc7eebd72 SHA512 2b0d855baaaabbf6da1b86d61f0d3e85d5fb62d1b7d04738a7e15758d0042b9e22f80f0aa273b9a9a21b04dff579c561280e44f2a69a0c0d4f270cb0fbcef169
+DIST xapian-omega-1.4.26.tar.xz 583808 BLAKE2B b5a2779ed5fb4f729e8aa3bd309f09d9867ba8d646121f4f577a5208e1fae605f18c7ecfbcba2fdb8a7ddd54de7f0eb8b8299f0f7d26b272ccdf417fbbf5b2a6 SHA512 576eb82fa972bd0db46c8422695930235ab75677104ec32765421b0e1e813d0c40d3bdace3d88cc66fd28680fbcb75a3adcd808617ae4d7d48e35e0556f908c3
diff --git a/app-text/xapian-omega/xapian-omega-1.4.26.ebuild b/app-text/xapian-omega/xapian-omega-1.4.26.ebuild
new file mode 100644
index 000000000000..1e0983f89c26
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.26.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+HOMEPAGE="https://xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libpcre2:=
+	~dev-libs/xapian-${PV}:0/30
+	sys-apps/file
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index 61fa93f0c7a1..f975836204e8 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}/texk/xdvik
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE="motif neXt Xaw3d emacs"
 
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index a1c78ebba9a1..2c9b6815025a 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 739966069752..a4292f96258e 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1 +1 @@
-DIST xlsx2csv-0.8.2.tar.gz 227107 BLAKE2B a140cf748d36a59e354620a8c44533acf6c9f4f0840f5e733c37a0ec4e83d4e9a8db1b0d776d4d3858038bc2871361db312d5137c52fcbe0587bf9ac921886c3 SHA512 73b034a12d96f956d3604b64de226b37d9b63e551d35d021e3cc50292fed5c84d1d5ab2bcb2fe92010d81aaa4631d9080a5f92209adae88cf6f2e072eaf0561e
+DIST xlsx2csv-0.8.3.tar.gz 221408 BLAKE2B 6570f76d9879df086a34f6783bf5b3409820a7791ec23a33cbcff7c9521ae2cc5f17712f660a10de330be40c3b6906833f6c539cf103208a840359abb69bd3f5 SHA512 fb8ce770263070d74105385ed5eb051165b8075e8be7ec86ba7e4d586d02a57a20f3106e8c3ab26a35e013076c9a63a22f636312594d58b4c2f20190d075241a
diff --git a/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild b/app-text/xlsx2csv/xlsx2csv-0.8.3.ebuild
index fdd7d94e35ef..fdd7d94e35ef 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.8.3.ebuild
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 8913a6b305b1..7c2ac3fa7471 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,2 +1 @@
-DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
 DIST xmldiff-2.6.3.tar.gz 86132 BLAKE2B 9e5777f498677bf12a603d6636833d4942fb1af2c461e9a60e2dccf89c3776f72018407928991c8a9f53abe8c704ca9a736a4f0f81ce3ca23e1657a896d43804 SHA512 ba25b8cc9866c66bc829a82d1f20108c17a09e2f46735763317f7fd6f60c3920ba6d3114454ead1461de4a59c177065291bb71bebb7ee9c4a03f3584452a9e33
diff --git a/app-text/xmldiff/xmldiff-2.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild
deleted file mode 100644
index 8b5eb94577e0..000000000000
--- a/app-text/xmldiff/xmldiff-2.4.ebuild
+++ /dev/null
@@ -1,24 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff"
-SRC_URI="https://github.com/Shoobx/xmldiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-DOCS=( CHANGES.rst README.rst )
diff --git a/app-text/xmltoman/Manifest b/app-text/xmltoman/Manifest
index cc8d650c97d7..6d7737c49c0e 100644
--- a/app-text/xmltoman/Manifest
+++ b/app-text/xmltoman/Manifest
@@ -1,2 +1 @@
-DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
 DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d
diff --git a/app-text/xmltoman/xmltoman-0.4-r2.ebuild b/app-text/xmltoman/xmltoman-0.4-r2.ebuild
deleted file mode 100644
index 925a47ce4c20..000000000000
--- a/app-text/xmltoman/xmltoman-0.4-r2.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
-
-DESCRIPTION="Simple scripts for converting xml to groff or html"
-HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-	# 'make install' requires GNU install, upstream is dead and carrying
-	# a patch is more space than redoing it here
-	dobin xmltoman xmlmantohtml
-
-	insinto /usr/share/xmltoman
-	doins xmltoman.{css,dtd,xsl}
-
-	dodoc README
-	doman xmltoman.1 xmlmantohtml.1
-}
diff --git a/app-text/xpdf/xpdf-4.05.ebuild b/app-text/xpdf/xpdf-4.05.ebuild
index 74678b63195a..a6b60faa0c1a 100644
--- a/app-text/xpdf/xpdf-4.05.ebuild
+++ b/app-text/xpdf/xpdf-4.05.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils qt6"
 
 BDEPEND="
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.ebuild
index a939c6c183b8..12ed4e759d1b 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.3.ebuild
@@ -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/zathura/Manifest b/app-text/zathura/Manifest
index 97caafbb2f92..942803becaa7 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,3 +2,4 @@ DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 DIST zathura-0.5.4-manpages.tar.xz 10060 BLAKE2B 103d2b5ed4ab71bc096305e70addbf94f11539cc989fc867766a1366ec18ca30379ce8f5b9f2b4a4a67507f79bbf6c6136c46f47161d1b74457c04488aa3dcea SHA512 a8251740a8e24e1c37093bec58b0169f04bd318878d743c72f07505a722c58da4f84a2dad5d46ded7789e1b4c5f2a7bab9cc6d023cd0935e49fe4388c9c28bd9
 DIST zathura-0.5.4.tar.gz 216719 BLAKE2B 94219e1feb22dc5cf3c072ed7d53b984c58e1f5c2d86b7e2b9e67c2d1cde92e9972aa18583930d3af3bc7d9c2afe367221ed3c2141fee682cc7ea54aae603ec4 SHA512 16f7291c3742cffe9ba5c6a3137781b2dd0b0bfcd61747e45a3c4b14df97781b49d526a298d2be9f564c84e616f1adef2ff4f5442d539fd42ab5e862baa00922
+DIST zathura-0.5.6.tar.gz 215311 BLAKE2B 4609fbd38b92aeee55e2f89f0abc15d90a3086ff2e19d497f51fb708016d51d714d3c8a31e6d0574fa01a7f3b4b7b9f758a3296784fc1fa66e6730bac21a0f3b SHA512 df518865bc559b97d7abebde2dae17cbd7bde6b9f8219338bd3a455a5d71b42f62299591b9c12c75a9a6f007b1179cb163722eaaf43ee86e6a6d9e2e25f63465
diff --git a/app-text/zathura/zathura-0.5.6.ebuild b/app-text/zathura/zathura-0.5.6.ebuild
new file mode 100644
index 000000000000..c79f9452996e
--- /dev/null
+++ b/app-text/zathura/zathura-0.5.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="
+		https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0/5.6"
+IUSE="man seccomp synctex test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/json-glib
+	man? ( dev-python/sphinx )
+	seccomp? ( sys-libs/libseccomp )
+	synctex? ( app-text/texlive-core )
+	sys-apps/file
+	x11-libs/cairo
+	>=dev-db/sqlite-3.6.23:3
+	>=dev-libs/girara-0.4.3:=
+	>=dev-libs/glib-2.72:2
+	>=x11-libs/gtk+-3.24:3
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-libs/check
+		>=x11-libs/gtk+-3.24:3[X]
+	)
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+src_configure() {
+	local emesonargs=(
+		-Dconvert-icon=disabled
+		-Dmanpages=$(usex man enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest
index 0a6f7597ea5a..daff4ded0f96 100644
--- a/app-text/zeal/Manifest
+++ b/app-text/zeal/Manifest
@@ -1,2 +1 @@
-DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d
 DIST zeal-0.7.1.tar.gz 1195333 BLAKE2B 56e6d56e152ed94559d15ba4a5dd7972466db75a4d760640b55b532ba3ed325a429e8e03f450efaa3e24f09af68ff5b43463d9b8f21b8a9bd11e23a3841780c4 SHA512 bf2b5e2878b349ec4e5e74377a2a74e263d5f20649f152f194375547c5e69b3e6115c9d0f103acad7f087b20456d888a3be9f7ce1aa232206bba7e0ed38d252b
diff --git a/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch b/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch
deleted file mode 100644
index 977412c47339..000000000000
--- a/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3d499c8391e36b7fb1780815d04e533f26333145 Mon Sep 17 00:00:00 2001
-From: Henning Schild <henning@hennsch.de>
-Date: Sat, 9 Mar 2019 10:29:54 +0100
-Subject: [PATCH 2/2] settings: disable checking for updates by default
-
-Signed-off-by: Henning Schild <henning@hennsch.de>
----
- src/libs/core/settings.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp
-index 8922bc4..549ddff 100644
---- a/src/libs/core/settings.cpp
-+++ b/src/libs/core/settings.cpp
-@@ -72,7 +72,7 @@ void Settings::load()
- 
-     // TODO: Put everything in groups
-     startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool();
--    checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool();
-+    checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool();
- 
-     showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool();
-     minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool();
--- 
-2.19.2
-
diff --git a/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch b/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch
deleted file mode 100644
index 0a5a8f69be2d..000000000000
--- a/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b48ee895ce7fc1db1dce20dac5115ec4c60f75fa Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 18 Aug 2020 15:03:59 +0200
-Subject: [PATCH] sidebar: Add missing STATIC keyword (similar to #1085)
-
-Fixes unresolved soname dependency after install.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/libs/sidebar/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libs/sidebar/CMakeLists.txt b/src/libs/sidebar/CMakeLists.txt
-index 4332b8f..dc6be0e 100644
---- a/src/libs/sidebar/CMakeLists.txt
-+++ b/src/libs/sidebar/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(Sidebar
-+add_library(Sidebar STATIC
-     container.cpp
-     proxyview.cpp
-     view.cpp
--- 
-2.28.0
-
diff --git a/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild b/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild
deleted file mode 100644
index 674a37e1858e..000000000000
--- a/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT=994cc5f6b6bfffddd5faaaafdb4fed483c38188f
-inherit cmake xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-arch/libarchive:=
-	dev-db/sqlite:3
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	>=x11-libs/xcb-util-keysyms-0.3.9
-"
-RDEPEND="${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-BDEPEND="kde-frameworks/extra-cmake-modules:0"
-
-PATCHES=(
-	"${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch"
-	"${FILESDIR}/${P}-fix-sidebar-static-lib.patch"
-)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 8eae2ddc9689..a728f02eb741 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,2 +1,4 @@
 DIST zotero-bin-6.0.35-amd64.tar.bz2 69475661 BLAKE2B d66ab95e8cfc954da76e74acf8936785460f8de0a4e204c761b0c32ca42fe1d71051f509f68fe0609751c670c598f74f4567c097b2ce89f0a3ebf3663833bc02 SHA512 f74574ecddba45c15f4cb61015969af0bdbc594e8f7f7707d6e5d6f6f74dca839b1f71cada2f5c66b530da28719a832ed0cc93c0684e948e17591a46fde50297
 DIST zotero-bin-6.0.35-x86.tar.bz2 71115051 BLAKE2B fb756681f6eca8dc45fb9eb44b5a1f0ca69138984cc4c8900d5b03ab4d637bea4d6e63bd6804d83e2aeef0209c4304202c1a0f2cc08c6f94dfcc62ca7152fa53 SHA512 93b11b8357dbb969e859938c604d109ae14b2a10d2bbe5d8096c0bd0cd3a89c65a64cc00d2b9fbff0339e8d2e0d4920701884965baae5bf29e9742049fb4703d
+DIST zotero-bin-7.0.3-amd64.tar.bz2 109081052 BLAKE2B 309a3594d9fd2207327b0902f44f152fc7eb58b4a1687c191514611d310c7ac6d61c9d315c9e5ef96633b13ec2ba3aa8c7f3b35094f703036e4c5e23e0385423 SHA512 3ad626446ee8e4cdcaaf53910776ab66494097f2ba78c3f913c72543094136b6adeb1cf6e1427068e787136388d58086590f34a1392d5d0cf7b738640a57ae20
+DIST zotero-bin-7.0.3-x86.tar.bz2 112911571 BLAKE2B 89fe744bb8f19fb13ae92f8ceebdf9b8026d242c63ad8363fdc30eccd4696187a93194b1d98ac62e9d57a8ad7f6a39abcd9c648fa3b62cfc4940d8f132898920 SHA512 d26c6806239a366f7fec5f6dde7480e5fbedccdd57c7d9b1dba4cb1ba30e5be8a45b347a1cb78aac63019e70dcca6c2d1ad16267433cab2e4105f0f67235a3ec
diff --git a/app-text/zotero-bin/zotero-bin-7.0.3.ebuild b/app-text/zotero-bin/zotero-bin-7.0.3.ebuild
new file mode 100644
index 000000000000..56e522c44ad2
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-7.0.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="
+	amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
+	x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-core
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+	if use amd64; then
+		cd Zotero_linux-x86_64 || die
+	elif use x86; then
+		cd Zotero_linux-i686 || die
+	fi
+
+	# disable auto-update
+	sed -i -e 's#URL=.*#URL=#' app/application.ini || die
+
+	# fix desktop-file
+	sed -i -e 's#^Exec=.*#Exec=zotero -url %U#' zotero.desktop || die
+	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+	default
+}
+
+src_install() {
+	if use amd64; then
+		cd Zotero_linux-x86_64 || die
+	elif use x86; then
+		cd Zotero_linux-i686 || die
+	fi
+
+	dodir opt/zotero
+	cp -a * "${ED}/opt/zotero" || die
+
+	dosym ../../opt/zotero/zotero usr/bin/zotero
+
+	domenu zotero.desktop
+
+	for size in 32 64 128; do
+		newicon -s ${size} icons/icon${size}.png zotero.png
+	done
+}
diff --git a/app-vim/colorsel/colorsel-20100406.ebuild b/app-vim/colorsel/colorsel-20100406.ebuild
index 8f158dd6f371..254b06227000 100644
--- a/app-vim/colorsel/colorsel-20100406.ebuild
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: RGB / HSV color selector"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=927"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 9925c457e4e4..0cdc1d18fecc 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,2 +1,2 @@
 DIST ebuild-mode-1.72.tar.xz 41968 BLAKE2B 24170aa6f23022f47707445eebbb7272c898fa8ca922d0a1ee57962ccc9feed6ea608661998e3f812a0b5fcc8ce8d8ff0baa890505dad846e0dc4b5c9e0b4236 SHA512 7f2234f9f5053f9588fb25d673dbce10a9d6e5c056ea7dabf04ffe5a0f8da7064b81829229339c5d98ee7ce840eb6c8b9ec24fcfd3dee2d5b798b5e6adb81e10
-DIST ebuild-mode-1.73.tar.xz 45264 BLAKE2B 115f67f9bfbf80ce5ddda1cc1dfee62aec15cb66c694b634361762c47c8c5afa6cdf0bc6c374440e939accbe9b13df0a84a7957b8c8c72a13324d2544388124a SHA512 855fdd0c94da77bae8f948fbc02782d47a0982e4a3d8ccff5d77a9c6b1f55b80a78144b493e5949e04b196cf8ee95e1fcc0b84c6ecace1a7d687ed6733d25820
+DIST ebuild-mode-1.75.tar.xz 48592 BLAKE2B 2273357c2736e0952637bb00754f0eff8379b5bd27793dac43d4d17e12affb8e88925ef321bd74709bc1054953f3fe3263b676c9faab93434558f45f55a70b28 SHA512 c00835513db517f07361ffa9fc86e8b268c89126fb1a0c88950e8566fcae296f115e29e6fa371bd93be34d6938e2a828e3382ea0b489a3e72af972b4f7b22e2e
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.73.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.73.ebuild
deleted file mode 100644
index f1b2b957d51f..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.73.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 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.4.20-r5
-	app-xemacs/sh-script"
-BDEPEND="${RDEPEND}"
-
-src_compile() {
-	local XEMACS="${EPREFIX}/usr/bin/xemacs"
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(add-to-list 'load-path nil)" \
-		-f batch-byte-compile \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-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() { :; }  # ERT is not yet available for XEmacs
-
-src_install() {
-	insinto /usr/share/xemacs/site-packages/lisp/${PN}
-	doins *.el *.elc
-}
-
-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.75-r1.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.75-r1.ebuild
new file mode 100644
index 000000000000..425566a1bee1
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.75-r1.ebuild
@@ -0,0 +1,54 @@
+# 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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-editors/xemacs-21.4.24-r9
+	app-xemacs/sh-script"
+BDEPEND="${RDEPEND}
+	test? ( >=app-editors/xemacs-21.5.35 )"
+
+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/dev-build/autoconf-dickey/Manifest b/dev-build/autoconf-dickey/Manifest
index 10efe3adcab6..39c5b795e32e 100644
--- a/dev-build/autoconf-dickey/Manifest
+++ b/dev-build/autoconf-dickey/Manifest
@@ -2,3 +2,5 @@ DIST autoconf-2.52-20230114.tgz 878069 BLAKE2B 96e93585088b87acf0c3336e390ef098e
 DIST autoconf-2.52-20230114.tgz.asc 729 BLAKE2B 9bcafe59763d2fb169e498ee5542500184974697838497dcd722d43c14e90475e004c0c7ae9fe2bdac523cb9d14ebe82a19d10c3369fe2a035c2f44b60c4d676 SHA512 d60d0155fa20f4808cc49ae06e76a969b82e2b2e5ea4ecd08182b34ca224401eab012659d2519072ca8afdf1ddc2febf8af090cff28990e2b4f2372da13635a8
 DIST autoconf-2.52-20231210.tgz 869909 BLAKE2B 6830ef1b5b1c0e65c643c932aca53904ae36d453fe2af7bbeb8dd4131254528c218302f695920413c674e08b50b4b9da64a3bb16304e238ab6beae086c0a7d07 SHA512 95fe07bfb6be12dad7d32379f57071e7671923d971774eb49e20597ab4609b83ef2a07a6f12e2e49424faedd9c1017f8f1eaacab232d6cadb04950448cc27798
 DIST autoconf-2.52-20231210.tgz.asc 729 BLAKE2B a7a83bf40e3f1cfd7624e21015a73353b0b0d430d6dd758601a2b441bc26b45e6c12fc82ee980764754d4cf5747978ea10e8d8b8ff7fe234436011fe2091fee1 SHA512 487abd6d39e62473058cb2eccbace1516529e0eba10575bf258960ed1acbe671d3839a3e97a3c82ac98ff84f804f0eaf5e6dd77d1c8ed21ff5349caf56c7963c
+DIST autoconf-2.52-20240618.tgz 870308 BLAKE2B 78b2fab651fe4b77e656f412d391f17585a419068b1b743f08ea7598c3fd76d0d05005893e4b4c90ccaab1ad2aa0a81b7c0da64263f86ac9a21ee4aa9255c2ec SHA512 33f23657a5dfc061356b5642095f0596a3f1c7194c3d1fd32c955b2f67a53346a5ae9720aaa8b882b33c16a2c8fb392c388277557780c3c60b73c510956cdd69
+DIST autoconf-2.52-20240618.tgz.asc 729 BLAKE2B 22cdad45046d39fb52ae3089171a31a2e83fc55dd0d97d8f809d7579c59361d23cb3f738da147bf52b4f63e93b513151042605d3eec5a98b806bd8be7f66d19a SHA512 3254af7e4c2df90ebaf2938865f1b3c75d091bfe59b2c43f5eaa4d731f6a613b9eeebb9064abf7fe8e80017fd16e17de218e27f681c2635916a034717f5617eb
diff --git a/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild
new file mode 100644
index 000000000000..81998a6d476c
--- /dev/null
+++ b/dev-build/autoconf-dickey/autoconf-dickey-2.52_p20240618.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: adapt toolchain-autoconf to take econf args?
+# TODO: review our old autoconf-2.52 patches?
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+MY_P=${PN/-dickey}-${PV/_p/-}
+DESCRIPTION="Fork of dev-build/autoconf for Thomas Dickey's packages"
+HOMEPAGE="https://invisible-island.net/autoconf/autoconf.html"
+SRC_URI="https://invisible-island.net/archives/autoconf/${MY_P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/autoconf/${MY_P}.tgz.asc )"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6
+"
+BDEPEND="
+	${RDEPEND}
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	#if [[ ${CHOST} == *-darwin* ]] ; then
+	#	PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+	#fi
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datadir="${EPREFIX}"/usr/share/${PN}
+		--program-suffix=-dickey
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# -j1 for bug #869278
+	emake -j1 check
+}
diff --git a/dev-build/bazelisk/Manifest b/dev-build/bazelisk/Manifest
index 221b82396fe7..59c0e44a4779 100644
--- a/dev-build/bazelisk/Manifest
+++ b/dev-build/bazelisk/Manifest
@@ -1,2 +1,4 @@
 DIST bazelisk-1.19.0-deps.tar.xz 2414272 BLAKE2B d044bafa94ce8d4fd9bc6dceb76368653c5052ed579be6f6a6fd37c68c821442f86fabcebc88eff118a414bd99e0e9b49dde5321130107da9c3c3563e7cba01b SHA512 57bafd7bb370f49cf2ff90596e25be8672dc4ed4f8466f8a969b49ce6b1bc57d6aff917065ec07bb04c634efb259d8e045213acb04ba1288c6a5f2a441eb2607
 DIST bazelisk-1.20.0.tar.gz 165942 BLAKE2B 2ff0c56bdbd9b8fe6a2fd35c0d2d733b3fa9be706875c2c466e3af22e06674ac23e92b6ee23c8c5150db449ae38f2f9ad313cd0e60a50446182b88f12333549c SHA512 05199786b007572544713653a1cdffb66e8db5edde4bbdb5c6c2e75d7436bfbb26311f1dca8ee107dd4088d8354fc81a6127977c998bdfff9bfddbd7cf7cbbb6
+DIST bazelisk-1.21.0-deps.tar.xz 2484860 BLAKE2B 72ac4415fa8123816444a6514d87f5bc3cf40dcce69e4e75e248b785c0da840a86eb86a99ac46103259affe8a0d055823834dcb225d553e1a2f91d14b6363d1e SHA512 b3fdb272889deeb043163c5c0a032d99177a3baff6044d1a0c80db2870f67324fa75b6a87c3377afd528312aedcefb22109a8899f3368473cfd30f41ba339574
+DIST bazelisk-1.21.0.tar.gz 150298 BLAKE2B 17d9647cf27e4a6127bf96840aba0d80fb935cb82cc4b9f95e11fdb7a08ba0e598b56401adff36af19562e10a43cf3c02a6e7c43e69bf2847c0f6459a03ee7e7 SHA512 a56106d11689366171e62fc7a5c73ac9a3c5b8a2158217845ba59b1152485f9eb5c786a303f2ae41e667e2fcfa7fab50e237311c07a5d5e791390dfa4d08f326
diff --git a/dev-build/bazelisk/bazelisk-1.21.0.ebuild b/dev-build/bazelisk/bazelisk-1.21.0.ebuild
new file mode 100644
index 000000000000..9b18306d7e1b
--- /dev/null
+++ b/dev-build/bazelisk/bazelisk-1.21.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A user-friendly launcher for Bazel written in Go"
+HOMEPAGE="https://github.com/bazelbuild/bazelisk/"
+SRC_URI="
+	https://github.com/bazelbuild/${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 ~arm64 ~x86"
+IUSE="+bazel-symlink"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_compile() {
+	mkdir -p bin || die
+
+	local go_ldflags="-X main.BazeliskVersion=${PV}"
+	local -a go_buildargs=(
+		-ldflags "${go_ldflags}"
+		-o bin
+	)
+	ego build "${go_buildargs[@]}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "bin/${PN}"
+
+	if use bazel-symlink ; then
+		dosym -r /usr/bin/bazelisk /usr/bin/bazel
+	fi
+
+	einstalldocs
+}
diff --git a/dev-build/bmake/Manifest b/dev-build/bmake/Manifest
index 107b9d0dd5e1..6639bcc5fdf5 100644
--- a/dev-build/bmake/Manifest
+++ b/dev-build/bmake/Manifest
@@ -1,3 +1,3 @@
 DIST bmake-20240602.tar.gz 868526 BLAKE2B 0c5357dc0adfd8e9b977798cbb3d7d024c3149b4b7ac945bfbfdde4de091b9afafb9dd1f33c673b6e966430e154e5e799deef517022a947fb584092cee3a3bbb SHA512 0965fe8a35fc75fd22ed66800636e3912a6f8ce008794d39870847bf50b039d86cfe0b3b346831ba0b49f4d2d9d0c10f6c6b82e5c5d9387d21ed4614384367df
-DIST bmake-20240711.tar.gz 873343 BLAKE2B 1102a414fe9db25a19bb8ab2c8425e553ca49cd3d01143604c127da7525ae537e66c7bc755101e89bfa3495d6784e7e4bd1986e1851cee5897c2c0d8d22f1ed1 SHA512 df1962d03dd7a577bcf92acb7a3d6b022ec0d6958242c2941345b330ec9c2951f12eb4a2ba2d652a2bd1c6913f47d5ace718f47eb0435d03a5ef3119c0332f03
+DIST bmake-20240808.tar.gz 874139 BLAKE2B 626aecfc152ca3a1c0193f8f64722f20eb653faab031751284a305233e8f808a5c7ecdc78dcdac78f0043613c5eb45fa73611a3ff786b96dbac0183192192850 SHA512 c80a5eb028da68ecd002720301f66ae9708a75a564aaf468d98c4f76416defb8e52bad2024ef3661cafb0741d5afd0146a70d01fe58735f3d5a416acff4c44c7
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
diff --git a/dev-build/bmake/bmake-20240711.ebuild b/dev-build/bmake/bmake-20240808.ebuild
index 9c749f92ff06..9c749f92ff06 100644
--- a/dev-build/bmake/bmake-20240711.ebuild
+++ b/dev-build/bmake/bmake-20240808.ebuild
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 607028b23945..5210ba7904e3 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -2,22 +2,13 @@ DIST cmake-3.28.0-docs.tar.xz 525776 BLAKE2B b643f76012768f0100c51f0dd146230eba2
 DIST cmake-3.28.5-SHA-256.txt 1646 BLAKE2B 763cbec9ede58cc43a7435e3fe97a9a9f28b201712f52d98ecdf8035887232fe6000675c9bab90f275ff6d44406839f04352784a921dcbc9d65c5e2440b53f52 SHA512 0fdeed277d113e4642c11b87b98305da43213bd89566e3aaaf427a11e168d9e6754632c2fd76fae542d29fddfa8b67c3c0df19f741c53fdd3aea8ce7bec73ff3
 DIST cmake-3.28.5-SHA-256.txt.asc 833 BLAKE2B bde735a577b556bc30ae1a5de0df8533243c955cc5d222537b3323e7108900af2f01799a4bfa843d953b141cc76a19aed77bfba15cf4e2c3cc36a0e7e844e853 SHA512 d495afd2ce4e16f8d3ecc0b319d59c3634aae71c26110d14225f9dd628bfe173cdd94818c69c930ef5cfff3b331445e192db0082188e0822155184e3f6f80e7d
 DIST cmake-3.28.5.tar.gz 11076017 BLAKE2B 7da653e42fca4848362a97e80320ffcc85ced4951dfe475f48f1619a40dc674d2828a78df2ef09589868f41f1da86970074186f730e675851cd9e7c1b099ba4c SHA512 d8f1c056e94c835c2078a5e68b23a3918f0e2cc40ef9dacaf5df4f2c26106149d85364c01528fcc2d6a4b6c2182ba420d938c519fa98757a5fc375cf152c7f82
-DIST cmake-3.29.3-SHA-256.txt 1646 BLAKE2B a1cb6895e9d98ac750450230adaba562a4be7134563869feb59c5a32dbea62a49273a9d163aade84c81fa410a94fcdfe2adaa653cd663972376b20a3b5436be9 SHA512 118604ac64ccd02995e6b421c256cb414637471094a72ff65d0f604cc4cc9f869f64fe1d409584925b93050373e7b69966ea91e4a9fc34b98287b0ee49eeb23c
-DIST cmake-3.29.3-SHA-256.txt.asc 833 BLAKE2B e4bfe4ea447441bcb7d4c46861b30da21e15ba6327c5ccbf1456ef273383b0ce8ee4a2e5a3de3312e112c26fe256e23021f4a1f89f8f96b5b39ff28398d4a51c SHA512 f2ed15c13a8fc7e05f5a8e41c3506435b4a204be37372c769577b51e30478740863eac800d32a0ef838f9b0a1125c1fe6772132ac4570e88a482109d42333fd9
-DIST cmake-3.29.3.tar.gz 11247199 BLAKE2B 8d18aca8871a615a4dca8eeb380ad79fdf41a2696bfbc69141db2a2715ff52b2a17c57b195aa00f7b0643791f40991c123056ef10482e80c1f963631d8d8ea50 SHA512 930060cf484a769992ebc798d5e81984560b2cd7e163db7053181ad842656ccd0085e7e077c9c620e719d212f78283ca0db19bec5491a355d38078bbe0bac254
-DIST cmake-3.29.6-SHA-256.txt 1646 BLAKE2B 8d2e11fe0e7ba89e394e51920657deb793e5f45026ebb86c39748410f110568c68021099286901f05fea47bf641d583b4f3715fe315e795cc8041a1fb66d5107 SHA512 1df0e791c3f42e5f96a967b385155b1f2e5214d78df639c81d2632455748f68423ab5de580f7f3e64c06387fd25247660da4b4bda0c9881f7ca25a317b62556f
-DIST cmake-3.29.6-SHA-256.txt.asc 833 BLAKE2B 25e2588375d353cc3d56480dae7aa3d2376c11cb1d830167f57544429fb0b455aeaceb121ac0fdd3f6f2b235c418bc4f52eafacc436472d9a2f3e80b97b08b18 SHA512 f01fff8b188ddd5aa7501acba3d68f3ba2a6b94d402af1afd716be66fa8f76c2d373cd6851a7fe308761171e2206c60f4f785209c86170037afcf3f416f080de
-DIST cmake-3.29.6.tar.gz 11248411 BLAKE2B cfd639ce975a4a13221d1fffea97c3bf0599c9af1c8de28e340013ea918bd0fc1eff1d97ca07b2cdd9c34f790950246530ebf1282d400f658fb2d1f4f89a089c SHA512 ecb7b62d2ed133da5c03932d78cc218deddd3c5d7d1116a5ded80b07f6e5f8145928fc15a5c22265995a2b451b1e20aa4dcaa1918060d025485fe8fa7730f3ec
 DIST cmake-3.29.7-SHA-256.txt 1646 BLAKE2B 8de09802b055a05fe3cddae74f3952173a63dcbfdd2aef36f31c2c362bbd942a37cd2b7dae4cb56e46501be5c0963c21f2273eba55da026887ab0d2b37039958 SHA512 21c6c186a20ec986d6e4df528f68b9946d051e63feb7f94cfe80c9a7b686b933b4bd26242c391475bf3cb52ed2a7bb02fff06fda42688fe4129f05e54945fc0d
 DIST cmake-3.29.7-SHA-256.txt.asc 833 BLAKE2B 73cb2182d7b10d1e36e08494a2c97607550ddab0048f62362ecc0ec37e08967d0968982d2beb606fc099cea99dec9f1c57f0e84128cbea4b09dcf62b87156bea SHA512 783ea23764ac41a487fd58075eec529ae2b1e1ea5057d61c933245474b84e3a866715c81255ac353578bd272d2a17e54f925aa2238c516f6a4c00ba58336174b
 DIST cmake-3.29.7.tar.gz 11249246 BLAKE2B ffc1c67e310632d58353c361b0f7a7c3624ab54662829e982adb1ebf3c4ab0479b6ae96d10c3d2273ea460a9836b2f0a43cd769154e2f1a30b77eb3a9f96dad3 SHA512 96e963cd2b5bccd34ed8ec3d2a7f19bd798611cd946adce8ebe142015562b20cb3bae0aa832e8ccb60bb3dc290e41218b4f3ca0361f3e11afecbccf7a182f7d2
-DIST cmake-3.30.0-SHA-256.txt 1646 BLAKE2B 9ef563e1b7a49a34bd08547483e628de469edf64889e4a82975441eba6ec77f1ae3cafec4bfcc641699f9c5a60a9998960a6a3e0fd2b955678dc3c40729248ed SHA512 7236dba187dcd5c92b5221116fe31931324ffd09f3371eb3d06b10cdcdb45c6822d95646cf4f8a44926210485f68f34c09f78cc4e3939b5f176f84aa818e82cd
-DIST cmake-3.30.0-SHA-256.txt.asc 833 BLAKE2B 2c2657afba4b9d2b176d82789d634505e1eb9a1f46969a0993aadf52da34a242dc104988bc2d5d24cecbab7f32266aa22ac57c09986e20871321bbab11d2aa92 SHA512 de86b2b88c78bc5db905f0d8cbbb7f3ce736c1905375de93d68a2eea3927a02bc4d93d2f3a49c6cb5b0afbc61f6520c9cb1e8b4a33897670d16caff60aa4cdb3
 DIST cmake-3.30.0-docs.tar.xz 572276 BLAKE2B 0c258f8dd0a518bb7bf97d35a778d8e406c986e123fc8acafb174a750ad0883d346254d12e8134dd9d030faefddc13b8260e7b43e405272157ada742c75b5fc2 SHA512 9d534b0efc30829f1144fb32c4f10ba25749e238c8ceeb4399b6d1eb8421b9fb1363972a497757ef84689bb987840619cbb4333ae95fd2397eea07eebed112c1
-DIST cmake-3.30.0.tar.gz 11500060 BLAKE2B 62b3f3d5ed92f7f118991f36ba7098ff20c202dd924ecd1e7af3fedc54345c5db26ce6fa782fe1acb490857b478067c17383f0453dece579482c2e962bd9de12 SHA512 1dd872a3f93cfadb7ac0f93177e7d4d7ded67cf09c71b1b776dc3bc8b7d4e44dd81533a8a4bf2c9eaaed56443060aa27a11250a5e47de316c89db7e146929782
-DIST cmake-3.30.1-SHA-256.txt 1646 BLAKE2B 39c8a32acb873f3b2b35af543006ef4ebc976f1939f4a857e55048654c60c23ee79cde0f1c625a7388f612d5ad594fa4ddfc89e4bb6e13764ffc78ce2e70f0e4 SHA512 bf3ba7218d504c75474b048b7c8b5db3928994fa269ea3762e68a751905403f87946c3dfdfbf63836d87f5180c905ed57b0d287bec97b04ee0e81f1f420a8c5f
-DIST cmake-3.30.1-SHA-256.txt.asc 833 BLAKE2B 5232626cc85bbcf0f44a9df4904ede8935c4d028b9604c9749a04b6eb2d51f648c817412b7870ae7f3e635dd88a44143568985d4ed2322d5239c5935e073a92b SHA512 b2a7b344a2d6350e55721860e7579a70c767b94b04a88b73a9fb1e9830658689561f9467d09eed87b2dce00106917543cf69ede5c7ed66a529359a1f6427dbc5
-DIST cmake-3.30.1.tar.gz 11500521 BLAKE2B 0e604ecc6b7da1c1c1baa81488a033aef6fa39cbddaaf43364193dda3e30d02a072f58a75573723e71653a2d1b34d09a7e1d0cc98280d76801d262bf54ffe77d SHA512 e3b38d309554a4239b8048434d770d3ac4533280a82c1bec65c37c9b0996cdf1753185e38deb4fb5da890ddc3d39c1d5c075e2ab0f7e0c52d61f5d556851fd20
 DIST cmake-3.30.2-SHA-256.txt 1646 BLAKE2B b36e1e099261d80bde7c57564d3030bc99b12ed3f6a70f69de16d81f6e6da567e3cfa792d010921017a02eaf238b056e7eb2cf330e6c6711aa3a4bd835732b57 SHA512 7991c834ed2e384d863793725fbe0b6195824f4e14a665ddd71348ecfa8bd03dddb46d0e9f26cc75b7d9e0a2eb90bdec01b7e79f32ff1a9cc9a8fcdd1d060de3
 DIST cmake-3.30.2-SHA-256.txt.asc 833 BLAKE2B cf99bfec2bd4cc8c828162353ceac9ebae2d7ad02c5df77873a751df7314eb56266525c755ba2f9015e043c9bb6c8218251b47744741c02fb81a80f93809ab32 SHA512 d7f07fcdd02b1846bafff4a3e08e38a2cce38131358a783097555d7934dddc82a67c3a6b84cbd8731171d82e293ff18f7e5e66d0d3bbb7d200da3904089e923d
 DIST cmake-3.30.2.tar.gz 11500719 BLAKE2B 85873311000831d2a8acb2c9d7f107e7fcef9dcd56f47307bd384a26c1b63d8f15b41989944e41969d6637139d916101fe236d3fe448a76f5b18b7809570ad5d SHA512 2b4c4ebb2213e19a08b9bf5a3cf0427dd2bfc44c7d86734abf5524c311bbce7e79f76d08e4df87a1e4508fe9fa05a28333068dc3bab308ef9724a9beeb39daab
+DIST cmake-3.30.3-SHA-256.txt 1646 BLAKE2B 9470d83b929f26d2ac8c1366209d78763963c981490b0ff2c959da85e3b58b72dfff3fe42c98b918089ac4ae05f302d5ec3d7254e9c061c610636d2089cf2b33 SHA512 629375ae3cdbd7b9248c92b7dc3149e109a0c93522a0d35fe458be69f70c5951781781404096f38dde09961a8d4f785866a909a2e282812be275871434f8243a
+DIST cmake-3.30.3-SHA-256.txt.asc 833 BLAKE2B 15a9cde54b0dac1006cd676c404d5a9756f005bfde9abf5ea89dcaf4ab578f474f653dce95998ba8cb247875d6d58e4b298c540f993997c3cd3326e748a5b8f3 SHA512 4c2090ecb52c74806caf720cbdc6e89a7e60b7a3daaeefb56d54c4ce77d4d1d04d7cd5e72f7c8782fb82ec55374b28d64238b7e5759c675f075eb270087790b7
+DIST cmake-3.30.3.tar.gz 11501292 BLAKE2B 8b6d989b90568b6fe42ada549f5cd766d8f919f8f5ca3cdea15b5a7b7946d3a82642c178967edc1a9d90d398a7447e25647957489436758381f91b64fa401029 SHA512 1cc0381077819f7210e3fad5fe8194ddc65210f6591044b3982ca0c600e8e978330f1a5602515780bd691264678c7c35a8d9c28d34c14ffa22ef96c7544a20d4
diff --git a/dev-build/cmake/cmake-3.29.3.ebuild b/dev-build/cmake/cmake-3.29.3.ebuild
deleted file mode 100644
index b40e1ca5c088..000000000000
--- a/dev-build/cmake/cmake-3.29.3.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
-
-# 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=3.28.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 virtualx 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 ~ia64 ~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
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 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? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( 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
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.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"
-}
-
-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 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"
-
-	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() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	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=$(usex qt6 6 5) )
-
-	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
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy 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)" \
-	)
-
-	virtx 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/cmake/cmake-3.29.6.ebuild b/dev-build/cmake/cmake-3.29.6.ebuild
deleted file mode 100644
index dc2e2378fa00..000000000000
--- a/dev-build/cmake/cmake-3.29.6.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 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=3.28.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 ~ia64 ~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
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 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? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( 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
-	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.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"
-}
-
-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 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=$(usex qt6 6 5) )
-
-	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 actualy 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/cmake/cmake-3.30.0.ebuild b/dev-build/cmake/cmake-3.30.0.ebuild
deleted file mode 100644
index 7957c7bb58b2..000000000000
--- a/dev-build/cmake/cmake-3.30.0.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2024 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 ~ia64 ~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
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 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? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( 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
-
-	# 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"
-}
-
-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=$(usex qt6 6 5) )
-
-	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 actualy 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/cmake/cmake-3.30.1.ebuild b/dev-build/cmake/cmake-3.30.1.ebuild
deleted file mode 100644
index 7957c7bb58b2..000000000000
--- a/dev-build/cmake/cmake-3.30.1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2024 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 ~ia64 ~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
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 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? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( 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
-
-	# 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"
-}
-
-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=$(usex qt6 6 5) )
-
-	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 actualy 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/cmake/cmake-3.30.2.ebuild b/dev-build/cmake/cmake-3.30.2.ebuild
index 7957c7bb58b2..11c5afac3f82 100644
--- a/dev-build/cmake/cmake-3.30.2.ebuild
+++ b/dev-build/cmake/cmake-3.30.2.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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.30.3.ebuild b/dev-build/cmake/cmake-3.30.3.ebuild
new file mode 100644
index 000000000000..1da4eb19984c
--- /dev/null
+++ b/dev-build/cmake/cmake-3.30.3.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2024 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 ~ia64 ~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
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 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? (
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( 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"
+}
+
+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=$(usex qt6 6 5) )
+
+	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 actualy 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/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild
index f6f904da2105..5c33c621e047 100644
--- a/dev-build/cmake/cmake-9999.ebuild
+++ b/dev-build/cmake/cmake-9999.ebuild
@@ -49,7 +49,7 @@ else
 
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
-		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
+		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
 	fi
 fi
 
@@ -102,6 +102,8 @@ PATCHES=(
 	"${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
 	"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
+	# Cuda
+	"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
 
 	# Upstream fixes (can usually be removed with a version bump)
 )
diff --git a/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch b/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
deleted file mode 100644
index 9ee8a1c9fcbf..000000000000
--- a/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8789
-
-From d47771bbb96a8435401950fb504b06003ec0babb Mon Sep 17 00:00:00 2001
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Sat, 9 Sep 2023 13:45:19 +0200
-Subject: [PATCH] FindPkgConfig: ignore whitespace separators in version check
-
-The regex used to split up the version if it contains an operator fails
-if the string contains whitespaces. Resulting in an extra whitespace
-after the package name and before the package version leading to
-breakage in pkgconf and thus webkit-gtk.
-
-See:
-https://github.com/pkgconf/pkgconf/issues/317
-https://bugs.webkit.org/show_bug.cgi?id=261125
-https://bugs.gentoo.org/913644
----
- Modules/FindPkgConfig.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 4d29f4505..6e8b78441 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -563,8 +563,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
-     foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
-       set(_pkg_check_modules_exist_query)
- 
--      # check whether version is given
--      if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
-+      # check whether version is given while ignoring whitespace
-+      if (_pkg_check_modules_pkg MATCHES "(.*[^>< \t])[ \t]*(=|[><]=?)[ \t]*(.*)")
-         set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
-         set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
-         set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
--- 
-2.42.0
-
diff --git a/dev-build/cmake/files/cmake-3.30.3-cudahostld.patch b/dev-build/cmake/files/cmake-3.30.3-cudahostld.patch
new file mode 100644
index 000000000000..f8b29730ea9f
--- /dev/null
+++ b/dev-build/cmake/files/cmake-3.30.3-cudahostld.patch
@@ -0,0 +1,23 @@
+From 0648f8f75c5f7044cca0f96d26e3ef6ed9440b3d Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 17:04:04 +0200
+Subject: [PATCH] allow custom CMAKE_CUDA_LINK_LAUNCHER
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/Modules/Internal/CMakeNVCCParseImplicitInfo.cmake b/Modules/Internal/CMakeNVCCParseImplicitInfo.cmake
+index 3aa10a2..a58c3ec 100644
+--- a/Modules/Internal/CMakeNVCCParseImplicitInfo.cmake
++++ b/Modules/Internal/CMakeNVCCParseImplicitInfo.cmake
+@@ -77,6 +77,11 @@ macro(cmake_nvcc_parse_implicit_info lang lang_var_)
+   if(_nvcc_link_line)
+     if("x${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "xMSVC")
+       set(CMAKE_${lang}_HOST_LINK_LAUNCHER "${CMAKE_LINKER}")
++    elseif(DEFINED ENV{CUDAHOSTLD})
++      set(CMAKE_${lang}_HOST_LINK_LAUNCHER "$ENV{CUDAHOSTLD}")
++      string(APPEND _nvcc_log "  env link launcher name: [${CMAKE_${lang}_HOST_LINK_LAUNCHER}]\n")
++    elseif(DEFINED CMAKE_CUDA_HOST_LINK_LAUNCHER)
++      string(APPEND _nvcc_log "  set link launcher name: [${CMAKE_${lang}_HOST_LINK_LAUNCHER}]\n")
+     else()
+       #extract the compiler that is being used for linking
+       separate_arguments(_nvcc_link_line_args UNIX_COMMAND "${_nvcc_link_line}")
diff --git a/dev-build/ignition-cmake/Manifest b/dev-build/ignition-cmake/Manifest
index 809decf35fd8..d6139bb9c4ce 100644
--- a/dev-build/ignition-cmake/Manifest
+++ b/dev-build/ignition-cmake/Manifest
@@ -1,2 +1,3 @@
 DIST ignition-cmake2-2.17.0.tar.bz2 212353 BLAKE2B 4945559d35cea859383fc510fd2b78cbbd3127ef58c94fa239ecad3643725b7e003a9a18ddb25deec42938196adaf0a4f3466b602cf35dd1fe58f02c5a0ede91 SHA512 bb7263531c772474780fab990dafaa9697b1ce7d9113053bc7af3b2ae6cf292a46c6b37452e5bf720ef34ed3a9732503106d5e55b5ae813bed65618ae4ee69dc
 DIST ignition-cmake2-2.17.1.tar.bz2 205001 BLAKE2B aed538d6c1ebd722067e4747a69be86711ee3d31cabc2070291496cc80cfdb2375530030223378a6a8a5fc98a5e0be1cd3b772ccc06ba9771d9faf7435663382 SHA512 4a07fd7b63b0186855f855a557dfac30ba716c031042a3d5bd0e816eccc77de6c6b221a6b0669e79f743e23c9ae2bd529e23c3bcc7d890062baade378dbbf777
+DIST ignition-cmake2_2.17.2.tar.gz 272579 BLAKE2B 564f6e55d565cd1fd8748a7e5b207660230a73057b99f8739f9ae24b7af6ab0cfef513acdba1fa1e1869335f3090c1a8dded49f3c4a064782cc9ae557cbdc028 SHA512 2745afb72b6a410df4b4a256eafecc7e0b5ca6e6b1a334d6778859cd75462f4a03bd783cec66e5d8dc1428b4fce6ffb5f39a67744a92b424c058686d2ab889ec
diff --git a/dev-build/ignition-cmake/files/protobuf2.patch b/dev-build/ignition-cmake/files/protobuf2.patch
new file mode 100644
index 000000000000..1c28803e7ff0
--- /dev/null
+++ b/dev-build/ignition-cmake/files/protobuf2.patch
@@ -0,0 +1,13 @@
+Index: gz-cmake-ignition-cmake2_2.17.2/cmake/FindIgnProtobuf.cmake
+===================================================================
+--- gz-cmake-ignition-cmake2_2.17.2.orig/cmake/FindIgnProtobuf.cmake
++++ gz-cmake-ignition-cmake2_2.17.2/cmake/FindIgnProtobuf.cmake
+@@ -31,7 +31,7 @@ find_package(Protobuf ${IgnProtobuf_FIND
+ if(NOT ${Protobuf_FOUND})
+   # If a config-file was not found, then fall back on the system-installed
+   # find-module that comes with CMake.
+-  find_package(Protobuf ${IgnProtobuf_FIND_VERSION})
++  find_package(Protobuf CONFIG REQUIRED)
+ endif()
+ 
+ set(IgnProtobuf_missing_components "")
diff --git a/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild b/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild
new file mode 100644
index 000000000000..dcd8ecacc7a5
--- /dev/null
+++ b/dev-build/ignition-cmake/ignition-cmake-2.17.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="CMake modules to be used by the Ignition projects"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
+SRC_URI="https://github.com/gazebosim/gz-cmake/archive/refs/tags/${PN}2_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/protobuf2.patch" )
+S="${WORKDIR}/gz-cmake-${PN}2_${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_TESTING=$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/dev-build/ignition-cmake/ignition-cmake-2.17.2.ebuild b/dev-build/ignition-cmake/ignition-cmake-2.17.2.ebuild
new file mode 100644
index 000000000000..ff5c18e44d22
--- /dev/null
+++ b/dev-build/ignition-cmake/ignition-cmake-2.17.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="CMake modules to be used by the Ignition projects"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
+SRC_URI="https://github.com/gazebosim/gz-cmake/archive/refs/tags/${PN}2_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/protobuf.patch" )
+S="${WORKDIR}/gz-cmake-${PN}2_${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_TESTING=$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest
index f994b75503da..d6ef406bec42 100644
--- a/dev-build/libtool/Manifest
+++ b/dev-build/libtool/Manifest
@@ -1,3 +1,4 @@
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609
 DIST libtool-2.5.1.tar.xz 1043544 BLAKE2B ae1e45c9d56a94980549476ed5abb7d617491360ff23ce88da9e884630280004152a9f5a96267be710930f14917bf7b00ab212acd4c65ceba1e201d2f01809e0 SHA512 ac0a6a8570ff81099585f6c3bf5a8f94851457a068b808e505422276a22638b1912a81f94e185bc2f8661b7abe2f2b2482b1af2cf42307787cbbd71d1b1612da
+DIST libtool-2.5.2.tar.xz 1046372 BLAKE2B 12e3d1f948f64031519ad5619573593b2518ec63cb8e3d69487a4b6104f5ee385c2123d3163c036fe10ca7214ba7558b6bd7fb56d22f1e249945a50091e18862 SHA512 cd6eb8ea470dd5bbfdfcfb06f31b36c84962f09c7155ca8175bc340b0a0289ca85dc9ea6e49c02e6876630913031739ef71dae231bc76c44f0c24e1be09d8cee
diff --git a/dev-build/libtool/libtool-2.5.2.ebuild b/dev-build/libtool/libtool-2.5.2.ebuild
new file mode 100644
index 000000000000..170c55f2db74
--- /dev/null
+++ b/dev-build/libtool/libtool-2.5.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
+WANT_LIBTOOL="none"
+inherit autotools flag-o-matic prefix multiprocessing
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
+	inherit git-r3
+elif ! [[ $(( $(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 ~ia64 ~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"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="vanilla"
+
+# Pull in libltdl directly until we convert packages to the new dep.
+RDEPEND="
+	sys-devel/gnuconfig
+	>=dev-build/autoconf-2.69:*
+	>=dev-build/automake-1.13:*
+"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
+
+# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
+# for package builds. The patches here are just those which are definitely fine
+# for the system-wide libtool installation as well.
+PATCHES=(
+	# bug #109105
+	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
+	# bug #581314
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
+
+	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
+	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+)
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
+		./bootstrap || die
+	else
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
+		)
+	fi
+
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
+
+	if use vanilla ; then
+		eapply_user
+		return 0
+	else
+		default
+	fi
+
+	if use prefix ; then
+		# seems that libtool has to know about EPREFIX a little bit
+		# better, since it fails to find prefix paths to search libs
+		# from, resulting in some packages building static only, since
+		# libtool is fooled into thinking that libraries are unavailable
+		# (argh...). This could also be fixed by making the gcc wrapper
+		# return the correct result for -print-search-dirs (doesn't
+		# include prefix dirs ...).
+		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
+		eprefixify m4/libtool.m4
+	fi
+
+	pushd libltdl >/dev/null || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	popd >/dev/null || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+
+	# Make sure timestamps don't trigger a rebuild of man pages. #556512
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
+		export HELP2MAN=true
+	fi
+}
+
+src_configure() {
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	# Do not bother hardcoding the full path to sed.
+	# Just rely on $PATH. bug #574550
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
+	export ac_cv_path_SED="sed"
+	export ac_cv_path_EGREP="grep -E"
+	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+	export ac_cv_path_FGREP="grep -F"
+	export ac_cv_path_GREP="grep"
+	export ac_cv_path_lt_DD="dd"
+
+	local myeconfargs=(
+		# Split into dev-libs/libltdl
+		--disable-ltdl-install
+
+		# Tests break otherwise (when porting to EAPI 8)
+		# https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html
+		--enable-static
+	)
+
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	(
+		# The testsuite is sensitive to warnings, expects static
+		# archives to really be archives (not compiler IR), etc.
+		strip-flags
+		filter-flags -fno-semantic-interposition
+		filter-flags '-Wstrict-aliasing=*' '-Werror=*'
+		filter-lto
+
+		emake -Onone check \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			FFLAGS="${FFLAGS}" \
+			FCFLAGS="${FCFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+	)
+}
+
+src_install() {
+	default
+
+	local x
+	while read -d $'\0' -r x ; do
+		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
+	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
+}
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 6e0689e80bcc..3b6ec88f671d 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -4,12 +4,9 @@ DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa
 DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9
 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
-DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e
-DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633
 DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0
 DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093
 DIST meson-1.5.1.tar.gz 2257106 BLAKE2B 3368b209444d0873217bafee2339b395dca9fa43df68adce19029a41ad5c0eca59426ef681d174ef8b6b89d4a6c5b4f189c1ae219deed78334028d44bdb23a95 SHA512 3239d6f3d64dcedddd456dc451278a37aa6c4460708b0efdff1b04b6e8844c20f5f882060de311c59a678bebd51ee09e1906c9384d4b0c85b28015fd1713ab0a
 DIST meson-1.5.1.tar.gz.asc 833 BLAKE2B c099720b102b8fff581f2043000454f5cb3593352a8b69c681cda73dae7172fb7d892dc0500e29fffe4ba7828cdcba418acea230563dc26a7a89139ab526b231 SHA512 f8210dd309a104b4169bc2eae9ff370f3ced6fe2c5dfc8f3477c9fbbed983dd6636ea05822d9345d7570e88bfe7789c6cc075e5a91d578a8376666d16ad550a3
-DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a
 DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca
 DIST meson-reference-1.5.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3
diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild
deleted file mode 100644
index db2001929162..000000000000
--- a/dev-build/meson/meson-1.4.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} 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 ~ia64 ~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-${PV}.3 meson-reference.3
-	fi
-}
diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild
index c1202d979e1c..cbfd9c783e84 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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.5.1.ebuild b/dev-build/meson/meson-1.5.1.ebuild
index 8c9c3db01773..432bf445fd27 100644
--- a/dev-build/meson/meson-1.5.1.ebuild
+++ b/dev-build/meson/meson-1.5.1.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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/rocm-cmake/Manifest b/dev-build/rocm-cmake/Manifest
index eee3894c9b05..59bb1b627c2e 100644
--- a/dev-build/rocm-cmake/Manifest
+++ b/dev-build/rocm-cmake/Manifest
@@ -1,3 +1 @@
-DIST rocm-cmake-5.7.1.tar.gz 50940 BLAKE2B f3a36cedfc15af69819b576bf8f8bdfe7b49e5dd1d4db57f707295f14a8d64904745f454fc211b28adfde369c82cb42a061c05b6675679e11a3946f6ebfea6d5 SHA512 1265ed8e23a04f9cff57b43f815e8fbbb1a3f200bc040e01ceaa92c322088c9ef04da795b09d732c6466dc9a3fefc505b8b474d3f18f55cff491758aa53a6e6b
-DIST rocm-cmake-6.1.1.tar.gz 86888 BLAKE2B 91064e82199ac317c273005b9b6c07e33ab5199b456467e84ac0937036d26d1d5c1286e1e38932b2da11700fb2a7a90795e34d4a7c03ed3bf58959402060091e SHA512 af6d4e124a3ec4d1e810867db69d738ebe7cfea672065bb5279b72a4d4efce8c14305e76173f760044977082c6aa069453d8eef488368a88ac57eb9df20f8b0c
 DIST rocm-cmake-6.1.2.tar.gz 86889 BLAKE2B 66e31b629171a5746eefd83e1ff14826a02f5d20a7b3125e20177bf801fa48526f541fcf9be0c832041a237799cd3d38a3daaec8f4dc17a5c048f7d603b7ef30 SHA512 9c83bd0b69a8bf040ddf9508df4ea8fb5daaaf8720f4b60ba3d6e4cc62b00a7dcfeead40cd37a6343b2173f9cf5db2e21f054661dcc2ac0591426e37ba61d3ba
diff --git a/dev-build/rocm-cmake/files/rocm-cmake-5.0.2-license.patch b/dev-build/rocm-cmake/files/rocm-cmake-5.0.2-license.patch
deleted file mode 100644
index b4a73e1bc2ed..000000000000
--- a/dev-build/rocm-cmake/files/rocm-cmake-5.0.2-license.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This is not needed. Gentoo automatically collect license files into
-the documentation directory.
-
-Index: rocm-cmake-rocm-5.0.2/share/rocm/cmake/ROCMCreatePackage.cmake
-===================================================================
---- rocm-cmake-rocm-5.0.2.orig/share/rocm/cmake/ROCMCreatePackage.cmake
-+++ rocm-cmake-rocm-5.0.2/share/rocm/cmake/ROCMCreatePackage.cmake
-@@ -230,7 +230,6 @@ macro(rocm_create_package)
-             ")
-         endforeach()
-     endif()
--    rocm_setup_license(${PARSE_HEADER_ONLY})
-     if(PARSE_COMPONENTS)
-         rocm_set_comp_cpackvar(PARSE_HEADER_ONLY "${PARSE_COMPONENTS}")
-     endif()
diff --git a/dev-build/rocm-cmake/rocm-cmake-5.7.1.ebuild b/dev-build/rocm-cmake/rocm-cmake-5.7.1.ebuild
deleted file mode 100644
index 706498981138..000000000000
--- a/dev-build/rocm-cmake/rocm-cmake-5.7.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=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/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/RadeonOpenCompute/rocm-cmake"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.2-license.patch
-)
-
-src_prepare() {
-	sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
-		-i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
-	cmake_src_prepare
-}
diff --git a/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild
deleted file mode 100644
index 7d097ae7d18f..000000000000
--- a/dev-build/rocm-cmake/rocm-cmake-6.1.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
-
-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/scons/Manifest b/dev-build/scons/Manifest
index 5cd810290fab..b2b5de82efc5 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -1,8 +1,12 @@
 DIST SCons-4.7.0.tar.gz 3220744 BLAKE2B 0fe8cdbaef46ca6571de35fb6544afe992e8a509cf52a8078133584e3af63919d2e0fb83ad646e042290fc47ca5a8932435946df9d40a099ccb2105b54bfd5cd SHA512 d08fba3e7f058eb2eeee4a129d10b55affada6b192932f069271fcbc28fd8216b2bf7e94285d9c448235a3965a789d3a91db9ebae1945aa73306788009dd2e77
 DIST SCons-4.8.0.tar.gz 3243387 BLAKE2B 1ab4a63d14ecfd1984e41f6be11c87003413f74a0d6b03eb7d5fd7d7b66ad5cf904b1061b3cd91a33735fd6ea1ffda6aa388dbf42a7085caa900961bcf2340dd SHA512 6f1ab01b25752f1f43a1796fb68fb0508105b372cf082a57477af4685399f8b83372466d65070d5c928d81c9fd4bdf1e8ba357c72537f32c50f77121f52415fb
+DIST SCons-4.8.1.tar.gz 3244423 BLAKE2B 31441e16ca96b844b1bcc388cd430a4a087bb5f09a8951166fc44b7422611d416fc6311d79370d768b52a93ad417369682e2a77ada3fe77e82d59c81bfd7b4dd SHA512 dad76d7f16b4cc1d9e25c9d8969773604e23accbb4e94451f0fc725919bf223cf04265f5d2b64a1b7e96cc63496cba574df3a634fd6779f2eb5fb7246fded120
 DIST scons-4.7.0-user.html 1683569 BLAKE2B 6c68f34af85fbfaf70f77758321bd0bb86b4f549c5fa05f721df94af0627d030a15db89565910ee6674b514d6b4fac9e624ac0aa6e849bd1224833c0473ed4c6 SHA512 8b0320794775890d898854767cd12bc4da725f6a33ae4496dc41a7b37a6dcb5f812c23083093d17685db9799b230552e19cc5550a108c2cf6787ffd963e649d6
 DIST scons-4.7.0-user.pdf 3069908 BLAKE2B 7196a5b247802c9f42914c4de5968862c4a183e5c3ff7e5172ec7bbf58f049362f0b85fdaba47c66fc09dbed79c22ddac8195a78bff2e564eff879b0e6a4f482 SHA512 6d62def8a68c8bf3b6cc269a93272c815e82b46bd6a223d0f7f3848daf9c7212e5f9de8dcdac41d2a6f2d7d70053b97f92e0b99c11f4f5b2b3a69951d474fe3a
 DIST scons-4.7.0.gh.tar.gz 5896790 BLAKE2B 1ce9041ad1e2891da92a9bd50e07e29a5e23c7c9432adb120d6610956a2ea4a5125fb6bfa1f8b944797d589cfdbe036a1b9b1eae271ae51abb826c6ee5a3ee1c SHA512 8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c
 DIST scons-4.8.0-user.html 1695726 BLAKE2B 1c44141dd7d04d738cb9495aa4749f3b44275f2c0808695270bdb0642454eb3b93d599b5c0fa21fd4f1099a95b1dd90583eb2184631bbc14fbef6644faf3f633 SHA512 c69be0e682755bf74f7b9c366e56a69b60962327d2ee5f4c1928edd41e800484bfb43836c575500be4132e90ef78d39f23dda5655dedd05b42b54ca4a65f4766
 DIST scons-4.8.0-user.pdf 3091708 BLAKE2B 430e56d3f0e433eb5c24a2ad1d9cf12b4912a3be9b98682019a071964d9824c55c18147e4c5ffff326c43ce6f232f03ce14386849d112b4fc29e09d0743dfb0f SHA512 8474bfbfeb76cc915f3b8392a7a38901206a264e23d867d5ed4a610debf3c5cd68d812e6b4e730b037eea4de1523aa7afc4e41e636fb3cd315c0fc5797fdb4e9
 DIST scons-4.8.0.gh.tar.gz 5933373 BLAKE2B 6912696f5ffdfa7f54fd00210228f308468bc35be76dda56652f91c1cf301d2df1720715d88d755e1c783360efec79a708cfa7c21514983fec3111db0bb05500 SHA512 056bc7f5308e73e202a96ce6e56efee4df278cd77455dc42278d63470ff2ea05163124c2f971a87416766d098103f85cfc0a0340bd9d0aa9209d200890197af9
+DIST scons-4.8.1-user.html 1696975 BLAKE2B 5c34754daa149f49b35a06ae1ab0264649004cdd94106eb70965c0f89aef80268ee6b138aa0beaac1451222888ccd11ec34f2872006702c36460f719fc90a3c7 SHA512 dadfc79a441de6d882e18d3fbf82e668d8a7eca6fa449aaebac9d3edd518d91e208342b7203c5e74ed4651fa5cf5d2d453055e4805407a18aad5349a9e1ea92f
+DIST scons-4.8.1-user.pdf 3093300 BLAKE2B 84752a76fba302ab6ae1bbd6c960680e94144f0c9d7b1292096fb7df40a090848aede0b3c309271089ab6bbfd8ff89265496c71e970a9b2b6c5789e04ea4954e SHA512 11776a6f0ca475633a85673fb2347358f45e3c20465424aefe4c12f3037e22199ffdc2ae921d002a67f4edee204961f405aef172ca93a77452e25eb9cab33445
+DIST scons-4.8.1.gh.tar.gz 5931602 BLAKE2B 702252622bc9dd97417cb3db09caebd8732cabe3627e8539475f2177a15bf9cfa8dae9863c462796a6ebf079db2c1609089f1a6d1a0e0ffa220cc69f905beff1 SHA512 b9f39634b36876fa15e2db968a38693745ce3f0f14e838e97f69e2a6762d8f78c04e52843e2ce50900000833854c90ee2bd9d3d84bb48d9acfbf41f94af02775
diff --git a/dev-build/scons/scons-4.8.1.ebuild b/dev-build/scons/scons-4.8.1.ebuild
new file mode 100644
index 000000000000..c3320fbacd32
--- /dev/null
+++ b/dev-build/scons/scons-4.8.1.ebuild
@@ -0,0 +1,157 @@
+# 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="threads(+)"
+
+inherit distutils-r1 multiprocessing
+
+MY_P="SCons-${PV}"
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="
+	https://www.scons.org/
+	https://github.com/SCons/scons/
+	https://pypi.org/project/SCons/
+"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
+	doc? (
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
+			-> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
+			-> ${P}-user.html
+	)
+	test? (
+		https://github.com/SCons/scons/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	# use the git directory structure, then unpack the pypi tarball
+	# on top of it to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}" || die
+	fi
+
+	tar -C "${P}" --strip-components=1 --no-same-owner \
+		-xzf "${DISTDIR}/${MY_P}.tar.gz" || die
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# TODO: rebase the patches <4.5.1-r2 is gone
+	# support env passthrough for Gentoo ebuilds
+	eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
+
+	if use test; then
+		local remove_tests=(
+			# TODO: does not respect PATH?
+			test/Clang
+			# broken
+			test/DVIPDF/DVIPDFFLAGS.py
+			test/Java/swig-dependencies.py
+			test/Java/multi-step.py
+			test/TEX/newglossary.py
+			test/TEX/variant_dir_newglossary.py
+			test/Configure/option--config.py
+			test/D/HSTeoh/sconstest-linkingProblem_gdc.py
+			# broken by commas in date, sic!
+			test/option/option-v.py
+			test/Interactive/version.py
+			# warnings from new binutils?
+			test/AS/as-live.py
+			test/AS/nasm.py
+			# hangs
+			test/KeyboardInterrupt.py
+			# requires f77 executable
+			test/Fortran/F77PATH.py
+			test/Fortran/FORTRANPATH.py
+			test/Fortran/gfortran.py
+			# TODO, these seem to be caused by our patches
+			test/Repository/include.py
+			test/Repository/multi-dir.py
+			test/Repository/variants.py
+			test/virtualenv/activated/option/ignore-virtualenv.py
+			# broken by CC being set? *facepalm*
+			test/LINK/applelink.py
+			test/ToolSurrogate.py
+			# no clue but why would we care about rpm?
+			test/packaging/option--package-type.py
+			test/packaging/rpm/cleanup.py
+			test/packaging/rpm/internationalization.py
+			test/packaging/rpm/multipackage.py
+			test/packaging/rpm/package.py
+			test/packaging/rpm/tagging.py
+			# apparently fragile to... limits?
+			# https://bugs.gentoo.org/908347#c7
+			test/builderrors.py
+		)
+
+		if ! use amd64 && ! use x86 ; then
+			# These tests are currently broken on arm and other non-amd64/x86 platforms
+			# Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
+			# better plumb up the MSVC tests for alternative arches.
+			# Try again after 4.2.0.
+			# See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
+			# bug #757534
+			remove_tests+=(
+				test/MSVS/vs-7.0-scc-files.py
+				test/MSVS/vs-7.0-scc-legacy-files.py
+				test/MSVS/vs-7.1-scc-files.py
+				test/MSVS/vs-7.1-scc-legacy-files.py
+				test/MSVS/vs-scc-files.py
+				test/MSVS/vs-scc-legacy-files.py
+			)
+		fi
+
+		rm -r "${remove_tests[@]}" || die
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=80
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+
+	# sigh
+	rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman *.1
+	use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
+}
diff --git a/dev-build/slibtool/slibtool-0.6.0.ebuild b/dev-build/slibtool/slibtool-0.6.0.ebuild
index f1551f5cf160..cedee9e5dcb0 100644
--- a/dev-build/slibtool/slibtool-0.6.0.ebuild
+++ b/dev-build/slibtool/slibtool-0.6.0.ebuild
@@ -18,7 +18,7 @@ else
 	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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 BDEPEND="sys-devel/m4"
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index e652ac7bfedf..190373fa4aab 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -4,6 +4,7 @@ DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5
 DIST abseil-cpp-20230125.3.tar.gz 2119655 BLAKE2B 6c60201e4fc2cb5cd942fafb6023347739544f02fd257d003eeedff9e2e5137ee0c954342134d17a64844b9a5f309392a4c3ff9336907f35ba6c967ab03524ee SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70
 DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02
 DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e
+DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
index 81fab0813b28..edc9416eea6c 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
+	use ppc && eapply "${FILESDIR}/${PN}-atomic-patch"
+
 	# un-hardcode abseil compiler flags
 	sed -i \
 		-e '/"-maes",/d' \
@@ -66,3 +68,19 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
index 7c260feeb088..22b35c6f3d53 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
@@ -37,6 +37,8 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
+	use ppc && eapply "${FILESDIR}/${PN}-atomic-patch"
+
 	# un-hardcode abseil compiler flags
 	sed -i \
 		-e '/"-maes",/d' \
@@ -66,3 +68,19 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
new file mode 100644
index 000000000000..1aadd43217ab
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2020-2024 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="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io/"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV:2:4}.$(ver_cut 2).0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="test"
+
+RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
+	# "${FILESDIR}/${PN}-random-tests.patch" #935417
+	# "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+	"${FILESDIR}/${PN}-include-cstdint.patch" #937307
+	"${FILESDIR}/${PN}-20240722.0-lto-odr.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	use ppc && eapply "${FILESDIR}/${PN}-atomic-patch"
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TESTING="$(usex test)"
+	)
+	# intentional use, it uses both variables for tests.
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTING="yes"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch
new file mode 100644
index 000000000000..93c07b701948
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch
@@ -0,0 +1,30 @@
+From 05ed7fe8985d4903fb33031519eb3bc3d1211fa9 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 30 Aug 2024 02:14:26 +0200
+Subject: [PATCH] lto odr
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/absl/flags/CMakeLists.txt b/absl/flags/CMakeLists.txt
+index 7376d11..9914f73 100644
+--- a/absl/flags/CMakeLists.txt
++++ b/absl/flags/CMakeLists.txt
+@@ -326,6 +326,7 @@ absl_cc_test(
+     GTest::gtest_main
+ )
+ 
++#[===[
+ absl_cc_test(
+   NAME
+     flags_flag_test
+@@ -349,6 +350,7 @@ absl_cc_test(
+     absl::time
+     GTest::gtest_main
+ )
++]===]
+ 
+ absl_cc_test(
+   NAME
+-- 
+2.46.0
+
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch
new file mode 100644
index 000000000000..4a999760eb0f
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch
@@ -0,0 +1,18 @@
+From beee02af5b83cfe72159e2579fa3c6e0fb8f93db Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sun, 8 Sep 2024 17:09:17 +0200
+Subject: [PATCH] link to atomic on ppc
+
+Bug: https://bugs.gentoo.org/918981
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/absl/base/CMakeLists.txt
++++ b/absl/base/CMakeLists.txt
+@@ -131,6 +131,7 @@ absl_cc_library(
+     absl::base_internal
+     absl::core_headers
+     absl::errno_saver
++    atomic
+ )
+ 
+ absl_cc_library(
diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml
index 8984c4885cb9..16dd7edb45a5 100644
--- a/dev-cpp/abseil-cpp/metadata.xml
+++ b/dev-cpp/abseil-cpp/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<!-- maintainer-wanted -->
+	<maintainer type="person" proxied="yes">
+		<email>negril.nx+gentoo@gmail.com</email>
+		<name>Paul Zander</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">abseil/abseil-cpp</remote-id>
 	</upstream>
diff --git a/dev-cpp/ada/Manifest b/dev-cpp/ada/Manifest
new file mode 100644
index 000000000000..04842d7450dc
--- /dev/null
+++ b/dev-cpp/ada/Manifest
@@ -0,0 +1 @@
+DIST ada-2.9.1.tar.gz 384701 BLAKE2B ad4a03100de06179c71c4d368cc349a630f8273550840cb19ba3e0cc4d296bfc59fa827bd3ea261609e4f80ebd2adbe7be1450040b519be5844febdcbc55f0f6 SHA512 74bad3f234dfe7b72e2057583e077e6a0f78f34b9c699751972d079b8027ef2dc34e6ef07c0dedeb923d8979f91c58a8a90473e69152c89e76baaa3659fa575b
diff --git a/dev-cpp/ada/ada-2.9.1.ebuild b/dev-cpp/ada/ada-2.9.1.ebuild
new file mode 100644
index 000000000000..2eeab823b21c
--- /dev/null
+++ b/dev-cpp/ada/ada-2.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="WHATWG-compliant and fast URL parser written in modern C++"
+HOMEPAGE="https://github.com/ada-url/ada"
+
+SRC_URI="https://github.com/ada-url/ada/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		# Building anything other than the library requires the CPM package manager
+		# which isn't very well equipped for packaging...
+		-DADA_TESTING=NO
+		-DADA_TOOLS=NO
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/ada/metadata.xml b/dev-cpp/ada/metadata.xml
new file mode 100644
index 000000000000..c71625e8a5e4
--- /dev/null
+++ b/dev-cpp/ada/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>esteve.varela@gmail.com</email>
+    <name>Esteve Varela Colominas</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ada-url/ada</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild b/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..4bac816603bb
--- /dev/null
+++ b/dev-cpp/aixlog/aixlog-1.5.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only C++ logging library"
+HOMEPAGE="https://github.com/badaix/aixlog"
+SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/aixlog/aixlog-9999.ebuild b/dev-cpp/aixlog/aixlog-9999.ebuild
deleted file mode 100644
index b1164d6bbd11..000000000000
--- a/dev-cpp/aixlog/aixlog-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++ logging library"
-HOMEPAGE="https://github.com/badaix/aixlog"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 0fa4441613e2..9fa403401fa5 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,2 +1,2 @@
-DIST benchmark-1.8.3.tar.gz 250206 BLAKE2B 14b4af17184a88378314d11623b73c27368999fcff6e50986407a08739fdf388cdcbd140471b629cd2a9948f81073796f8a6c38d015be8413b7e4d4759715f97 SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c
 DIST benchmark-1.8.4.tar.gz 253916 BLAKE2B 78a290a5013d8371e87b7c918e518e3ec0e8247e25e211d160ab8dea51d8871d8dac54ee91ee0c512af86a60d1f4e9baedadc20d4a7fa28ef790411fda0399c8 SHA512 835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882
+DIST benchmark-1.9.0.tar.gz 253961 BLAKE2B fdac0018435622e3ee2c1cde02c8140a15f2579b9059d1592b588033e6935bd8d54c874f4ea912696e8e1d5f7eebae30ba849f77cc3f74f006b4b03c712685ed SHA512 0e91e0e5a2222d7650fd8bd9cafb2f0e7c1689cd1b87b2cc529c738db12bfef31162aa5a4da78f7b0aa7f0101dc08b626802c58d39862458f82f9fea9316ca25
diff --git a/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild b/dev-cpp/benchmark/benchmark-1.8.3-r1.ebuild
deleted file mode 100644
index 8e3db7fe1c4a..000000000000
--- a/dev-cpp/benchmark/benchmark-1.8.3-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
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )
-	test? ( >=dev-cpp/gtest-1.11.0 )"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.3-fix-32bit-test.patch"
-	"${FILESDIR}/${PN}-1.8.3-backport-pr1753.patch"
-	"${FILESDIR}/${PN}-1.8.3-backport-pr1756.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-		-DBENCHMARK_ENABLE_DOXYGEN=$(usex doc)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=$(usex test)
-		-DBENCHMARK_ENABLE_TESTING=$(usex test)
-		-DBENCHMARK_ENABLE_WERROR=OFF
-		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.8.4.ebuild b/dev-cpp/benchmark/benchmark-1.8.4.ebuild
index a48b13d02eb4..3ba3a6651fab 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 ~hppa ~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
new file mode 100644
index 000000000000..46af0a1dbe0f
--- /dev/null
+++ b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit cmake-multilib 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 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc +exceptions libcxx libpfm lto test +tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	libcxx? ( sys-libs/libcxx[${MULTILIB_USEDEP}] )
+	libpfm? ( dev-libs/libpfm:= )
+"
+
+BDEPEND="
+	>=dev-build/cmake-3.10
+	doc? ( app-text/doxygen )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	tools? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.10.0[${PYTHON_USEDEP}]
+		')
+
+		${PYTHON_DEPS}
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-documentation-installation.patch" )
+
+pkg_setup() {
+	use tools && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBENCHMARK_ENABLE_DOXYGEN="$(usex doc)"
+		-DBENCHMARK_ENABLE_EXCEPTIONS="$(usex exceptions)"
+		-DBENCHMARK_ENABLE_GTEST_TESTS="$(usex test)"
+		-DBENCHMARK_ENABLE_LTO="$(usex lto)"
+		-DBENCHMARK_ENABLE_LIBPFM="$(usex libpfm)"
+		-DBENCHMARK_ENABLE_TESTING="$(usex test)"
+		-DBENCHMARK_ENABLE_WERROR=OFF
+		-DBENCHMARK_INSTALL_DOCS="$(usex doc)"
+		-DBENCHMARK_USE_BUNDLED_GTEST=OFF
+		-DBENCHMARK_USE_LIBCXX="$(usex libcxx)"
+	)
+
+	cmake_src_configure
+}
+
+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.8.3-backport-pr1753.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
deleted file mode 100644
index 1c2516c38e37..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1753.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1753
-
-From cdd4a6d48077a78d07e3b7f165383f6d5052108c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:38:11 -0500
-Subject: [PATCH 1/3] CycleClock: Add support for Alpha architecture
-
-As documented, the real cycle counter is unsafe to use here, because it
-is a 32-bit integer which wraps every ~4s.  Use gettimeofday instead,
-which has a limitation of a low-precision real-time-clock (~1ms), but no
-wrapping.  Passes test suite.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/cycleclock.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/cycleclock.h b/src/cycleclock.h
-index 931bba146..eff563e7f 100644
---- a/src/cycleclock.h
-+++ b/src/cycleclock.h
-@@ -218,6 +218,15 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
-   uint64_t pcycle;
-   asm volatile("%0 = C15:14" : "=r"(pcycle));
-   return static_cast<double>(pcycle);
-+#elif defined(__alpha__)
-+  // Alpha has a cycle counter, the PCC register, but it is an unsigned 32-bit
-+  // integer and thus wraps every ~4s, making using it for tick counts
-+  // unreliable beyond this time range.  The real-time clock is low-precision,
-+  // roughtly ~1ms, but it is the only option that can reasonable count
-+  // indefinitely.
-+  struct timeval tv;
-+  gettimeofday(&tv, nullptr);
-+  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
- #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 b1bec2fa5aed335b5be78720a9812cf27baf9df6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:46:06 -0500
-Subject: [PATCH 2/3] sysinfo: support parsing /proc/cpuinfo on Alpha
-
-And also, bail out if unable to parse /proc/cpuinfo.  This will
-preemptively alert users on platforms that need custom code for parsing
-/proc/cpuinfo.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 04d64dc5b..786bb1b41 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -513,7 +513,11 @@ int GetNumCPUs() {
-     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;
-
-From 17f2f35e1ce650b4f8596a5c5df6a050588136c5 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Feb 2024 21:49:24 -0500
-Subject: [PATCH 3/3] tabular_test: add a missing DoNotOptimize call
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- test/user_counters_tabular_test.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/test/user_counters_tabular_test.cc b/test/user_counters_tabular_test.cc
-index 3e8fb1bf0..ffd3c0992 100644
---- a/test/user_counters_tabular_test.cc
-+++ b/test/user_counters_tabular_test.cc
-@@ -63,6 +63,9 @@ ADD_CASES(TC_CSVOut, {{"%csv_header,"
- 
- void BM_Counters_Tabular(benchmark::State& state) {
-   for (auto _ : state) {
-+    // This test requires a non-zero CPU time to avoid divide-by-zero
-+    auto iterations = state.iterations();
-+    benchmark::DoNotOptimize(iterations);
-   }
-   namespace bm = benchmark;
-   state.counters.insert({
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
deleted file mode 100644
index 6744d3cf212f..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-backport-pr1756.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://bugs.gentoo.org/922877
-https://github.com/google/benchmark/pull/1756
-
-From 3805709f137766c99922f647af9b97d49d14e772 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 13 Feb 2024 20:23:20 -0500
-Subject: [PATCH] sysinfo.cc: Always abort on GetNumCPUs failure
-
-Defines a wrapper function, CheckNumCPUs, which enforces that GetNumCPUs
-never returns fewer than one CPU.  There is no reasonable way to
-continue if we are unable to identify the number of CPUs.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/sysinfo.cc | 28 +++++++++++++++++-----------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/sysinfo.cc b/src/sysinfo.cc
-index 786bb1b41..daeb98b02 100644
---- a/src/sysinfo.cc
-+++ b/src/sysinfo.cc
-@@ -474,12 +474,11 @@ std::string GetSystemName() {
- #endif  // Catch-all POSIX block.
- }
- 
--int GetNumCPUs() {
-+int GetNumCPUsImpl() {
- #ifdef BENCHMARK_HAS_SYSCTL
-   int num_cpu = -1;
-   if (GetSysctl("hw.ncpu", &num_cpu)) return num_cpu;
--  fprintf(stderr, "Err: %s\n", strerror(errno));
--  std::exit(EXIT_FAILURE);
-+  PrintErrorAndDie("Err: ", strerror(errno));
- #elif defined(BENCHMARK_OS_WINDOWS)
-   SYSTEM_INFO sysinfo;
-   // Use memset as opposed to = {} to avoid GCC missing initializer false
-@@ -493,8 +492,8 @@ int GetNumCPUs() {
-   // Returns -1 in case of a failure.
-   long num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
-   if (num_cpu < 0) {
--    fprintf(stderr, "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
--            strerror(errno));
-+    PrintErrorAndDie("sysconf(_SC_NPROCESSORS_ONLN) failed with error: ",
-+                     strerror(errno));
-   }
-   return (int)num_cpu;
- #elif defined(BENCHMARK_OS_QNX)
-@@ -510,8 +509,7 @@ int GetNumCPUs() {
-   int max_id = -1;
-   std::ifstream f("/proc/cpuinfo");
-   if (!f.is_open()) {
--    std::cerr << "failed to open /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failed to open /proc/cpuinfo");
-   }
- #if defined(__alpha__)
-   const std::string Key = "cpus detected";
-@@ -540,12 +538,10 @@ int GetNumCPUs() {
-     }
-   }
-   if (f.bad()) {
--    std::cerr << "Failure reading /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failure reading /proc/cpuinfo");
-   }
-   if (!f.eof()) {
--    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
--    return -1;
-+    PrintErrorAndDie("Failed to read to end of /proc/cpuinfo");
-   }
-   f.close();
- 
-@@ -559,6 +555,16 @@ int GetNumCPUs() {
-   BENCHMARK_UNREACHABLE();
- }
- 
-+int GetNumCPUs() {
-+  const int num_cpus = GetNumCPUsImpl();
-+  if (num_cpus < 1) {
-+    PrintErrorAndDie(
-+        "Unable to extract number of CPUs.  If your platform uses "
-+        "/proc/cpuinfo, custom support may need to be added.");
-+  }
-+  return num_cpus;
-+}
-+
- class ThreadAffinityGuard final {
-  public:
-   ThreadAffinityGuard() : reset_affinity(SetAffinity()) {
diff --git a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch b/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
deleted file mode 100644
index 62e741687f9c..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.8.3-fix-32bit-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/916278
-https://salsa.debian.org/science-team/benchmark/-/blob/master/debian/patches/0007-fix-32bit-test.patch?ref_type=heads
-
-Description: Fix 32bit-test
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2023-10-17
-
---- benchmark-1.8.3.orig/test/statistics_gtest.cc
-+++ benchmark-1.8.3/test/statistics_gtest.cc
-@@ -28,8 +28,8 @@ TEST(StatisticsTest, StdDev) {
- TEST(StatisticsTest, CV) {
-   EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({101, 101, 101, 101}), 0.0);
-   EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({1, 2, 3}), 1. / 2.);
--  EXPECT_DOUBLE_EQ(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
--                   0.32888184094918121);
-+  EXPECT_NEAR(benchmark::StatisticsCV({2.5, 2.4, 3.3, 4.2, 5.1}),
-+                   0.32888184094918121, 1e-7);
- }
- 
- }  // end namespace
diff --git a/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch b/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch
new file mode 100644
index 000000000000..631e01881aa8
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.9.0-fix-documentation-installation.patch
@@ -0,0 +1,47 @@
+From 009874342ddcf6446bec308686c54bd387a212a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?=
+ <beatussum@protonmail.com>
+Date: Mon, 19 Aug 2024 09:12:57 +0200
+Subject: [PATCH] fix documentation installation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+HTML pages generated by Doxygen are now installed into
+/usr/share/doc/${PF}/html.
+
+The content of the docs directory is always installed even if HTML pages are
+installed.
+
+Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com>
+---
+ src/CMakeLists.txt | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 32126c0..40e75e0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -169,12 +169,12 @@ if (BENCHMARK_ENABLE_DOXYGEN)
+   if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
+     install(
+       DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
+-      DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-  endif()
+-else()
+-  if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
+-    install(
+-      DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
+-      DESTINATION ${CMAKE_INSTALL_DOCDIR})
++      DESTINATION "${CMAKE_INSTALL_DOCDIR}/html/")
+   endif()
+ endif()
++
++if (BENCHMARK_ENABLE_INSTALL AND BENCHMARK_INSTALL_DOCS)
++  install(
++    DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
++    DESTINATION ${CMAKE_INSTALL_DOCDIR})
++endif()
+-- 
+2.44.2
+
diff --git a/dev-cpp/benchmark/metadata.xml b/dev-cpp/benchmark/metadata.xml
index 7b3ec03c0ee6..0f523bea9937 100644
--- a/dev-cpp/benchmark/metadata.xml
+++ b/dev-cpp/benchmark/metadata.xml
@@ -1,10 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>beatussum@protonmail.com</email>
+		<name>Mattéo Rossillol‑‑Laruelle</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="exceptions">Enable the use of exceptions in the benchmark library</flag>
+		<flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of libstdc++ as the default stdlib</flag>
+		<flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag>
+		<flag name="tools">Install some additional Python tools</flag>
+	</use>
+	<use lang="fr">
+		<flag name="exceptions">Utiliser les exceptions inclues dans la bibliothèque</flag>
+		<flag name="libcxx">Utiliser <pkg>sys-libs/libcxx</pkg> à la place de libstdc++ comme bibliothèque standard</flag>
+		<flag name="libpfm">Activer le support de <pkg>dev-libs/libpfm</pkg></flag>
+		<flag name="tools">Installer des outils Python additionnels</flag>
+	</use>
 	<upstream>
-		<bugs-to>https://github.com/google/benchmark/issues</bugs-to>
-		<doc lang="en">https://github.com/google/benchmark/tree/master/docs/</doc>
+		<maintainer status="active">
+			<name>Google</name>
+			<email>opensource@google.com</email>
+		</maintainer>
+		<bugs-to>https://github.com/google/benchmark/issues/</bugs-to>
+		<doc>https://github.com/google/benchmark/tree/master/docs/</doc>
 		<remote-id type="github">google/benchmark</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/catch/catch-3.6.0.ebuild b/dev-cpp/catch/catch-3.6.0.ebuild
index 31c6d23ac8c3..cc35b0de6138 100644
--- a/dev-cpp/catch/catch-3.6.0.ebuild
+++ b/dev-cpp/catch/catch-3.6.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index e85e4cd3b517..9409e925d19f 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,3 +1,5 @@
 DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
 DIST cpp-httplib-0.16.0.tar.gz 1156790 BLAKE2B 4a75059f16f6e46685c2cf028c6fa4c9cd50c35273795a8dbb6ca9d2997146b04b305893ad50adbb62c39db14ab3f589e902353bb199ee167d2648fe3621aee1 SHA512 63dc5a50f425e7be909d60db138caa1b9d7260c5d4db26603011a329f0d6a645d56f436c79466fbe662f24a94bc0f72926062b3ed49cb658eb91a6bdb2ddf25b
 DIST cpp-httplib-0.16.2.tar.gz 1157538 BLAKE2B 0fdb3946e33f3af0a6b9646d5edf53572d67fb7e2334923c3ef9784aad569672c21e12c6d0f4c1f91ceccb8d9b3e8f14d51b21f4c6cf252da98024cee47cfcbe SHA512 d0a3d5477cb76cbbbc6da53b0abff3b45fd6b77c0d1686b355ce2904593c67c25849d2b1348e49b0b57ece5be91404fe976b06d75d34eb5068b1e130fd7ddbee
+DIST cpp-httplib-0.16.3.tar.gz 1157548 BLAKE2B 986a33043ddf86623f70f50244051089cb6b824866ee247de13772263c691fde2b10e9eeef2078265f0a91b5744dafd2940892cff03c1a9cfd4b35df0d446522 SHA512 1a0d40f17b526db74dfa51903f0d15876b20c836a438be8f87ac2b18e535c3fad1822fbad9cf97053705a2cedc8171ab648e2e8c823eeb2e180c347283f3de9a
+DIST cpp-httplib-0.17.3.tar.gz 1258203 BLAKE2B ea6f51eea2b0bc859b13a4c5bcc9df62ef83c718941d2298f35eba58213fd68546c3347125d00a6e1378a1b31885ea4ed9a62a139411fff097055d135faa176a SHA512 9ee144727470af8a9f6ba953e95227c534ec87c1c89a17d511bb763091336c106e8d3a5fd8d4bf2c2274da0a64d42fde77eb95fb166e59f44bbbe906b3d327ec
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
index 461e273e83ef..0325b37eb905 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.0.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
new file mode 100644
index 000000000000..d530e23268ec
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.16.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
+else
+	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+
+IUSE="brotli ssl test zlib"
+REQUIRED_USE="test? ( brotli ssl zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli:=[${MULTILIB_USEDEP}]
+	)
+	ssl? (
+		>=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}]
+	)
+	zlib? (
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DHTTPLIB_COMPILE=yes
+		-DBUILD_SHARED_LIBS=yes
+		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
+		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	local -a failing_tests=(
+		# Disable all online tests.
+		"*.*_Online"
+
+		# Fails on musl x86:
+		ServerTest.GetRangeWithMaxLongLength
+		ServerTest.GetStreamedWithTooManyRanges
+
+		# https://github.com/yhirose/cpp-httplib/issues/1798
+		# Filed by mgorny's testing, fails on openssl >=3.2:
+		SSLClientServerTest.ClientCertPresent
+		SSLClientServerTest.ClientEncryptedCertPresent
+		SSLClientServerTest.CustomizeServerSSLCtx
+		SSLClientServerTest.MemoryClientCertPresent
+		SSLClientServerTest.MemoryClientEncryptedCertPresent
+		SSLClientServerTest.TrustDirOptional
+	)
+
+	# Little dance to please the GTEST filter (join array using ":").
+	failing_tests_str="${failing_tests[@]}"
+	failing_tests_filter="${failing_tests_str// /:}"
+
+	# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
+	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
+}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.17.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.17.3.ebuild
new file mode 100644
index 000000000000..d530e23268ec
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.17.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/yhirose/${PN}.git"
+else
+	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+
+IUSE="brotli ssl test zlib"
+REQUIRED_USE="test? ( brotli ssl zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli:=[${MULTILIB_USEDEP}]
+	)
+	ssl? (
+		>=dev-libs/openssl-3.0.13:=[${MULTILIB_USEDEP}]
+	)
+	zlib? (
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DHTTPLIB_COMPILE=yes
+		-DBUILD_SHARED_LIBS=yes
+		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
+		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	local -a failing_tests=(
+		# Disable all online tests.
+		"*.*_Online"
+
+		# Fails on musl x86:
+		ServerTest.GetRangeWithMaxLongLength
+		ServerTest.GetStreamedWithTooManyRanges
+
+		# https://github.com/yhirose/cpp-httplib/issues/1798
+		# Filed by mgorny's testing, fails on openssl >=3.2:
+		SSLClientServerTest.ClientCertPresent
+		SSLClientServerTest.ClientEncryptedCertPresent
+		SSLClientServerTest.CustomizeServerSSLCtx
+		SSLClientServerTest.MemoryClientCertPresent
+		SSLClientServerTest.MemoryClientEncryptedCertPresent
+		SSLClientServerTest.TrustDirOptional
+	)
+
+	# Little dance to please the GTEST filter (join array using ":").
+	failing_tests_str="${failing_tests[@]}"
+	failing_tests_filter="${failing_tests_str// /:}"
+
+	# PREFIX is . to avoid calling "brew" and relying on stuff in /opt
+	GTEST_FILTER="-${failing_tests_filter}" emake -C test \
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I." PREFIX=.
+}
diff --git a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
index 927e75f3970d..931f57f2e5cf 100644
--- a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch
new file mode 100644
index 000000000000..5d2a9ba404e3
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch
@@ -0,0 +1,47 @@
+https://github.com/tdf/libcmis/issues/67
+https://github.com/tdf/libcmis/pull/68
+
+From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 31 Aug 2024 12:39:39 +0200
+Subject: [PATCH] Fix boost 1.86 breakage
+
+The fix does not break building against <1.86 since we're now accessing the
+object representation of the return value.
+
+Fixes #67
+---
+ src/libcmis/xml-utils.cxx | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
+index e487d17..cdf088f 100644
+--- a/src/libcmis/xml-utils.cxx
++++ b/src/libcmis/xml-utils.cxx
+@@ -531,16 +531,22 @@ namespace libcmis
+         boost::uuids::detail::sha1 sha1;
+         sha1.process_bytes( str.c_str(), str.size() );
+ 
+-        unsigned int digest[5];
++        // on boost <  1.86.0, digest_type is typedef'd as unsigned int[5]
++        // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20]
++        boost::uuids::detail::sha1::digest_type digest;
+         sha1.get_digest( digest );
+ 
++        // by using a pointer to unsigned char, we can read the
++        // object representation of either typedef.
++        const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest );
++
+         stringstream out;
+-        // Setup writing mode. Every number must produce eight
++        // Setup writing mode. Every number must produce two
+         // hexadecimal digits, including possible leading 0s, or we get
+         // less than 40 digits as result.
+         out << hex << setfill('0') << right;
+-        for ( int i = 0; i < 5; ++i )
+-            out << setw(8) << digest[i];
++        for ( int i = 0; i < sizeof( digest ); ++ptr, ++i )
++            out << setw(2) << static_cast<int>( *ptr );
+         return out.str();
+     }
+ 
diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
index c20057c85432..5130a7ba2744 100644
--- a/dev-cpp/libcmis/libcmis-0.6.2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
@@ -41,8 +41,12 @@ BDEPEND="
 	)
 "
 
-# https://github.com/tdf/libcmis/pull/52
-PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523
+PATCHES=(
+	# https://github.com/tdf/libcmis/pull/52
+	"${FILESDIR}"/${P}-libxml2-2.12.patch # bug 917523
+	# https://github.com/tdf/libcmis/pull/68
+	"${FILESDIR}"/${P}-boost-1.86.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-cpp/msgpack-cxx/Manifest b/dev-cpp/msgpack-cxx/Manifest
index ee0e3f82a9ec..6e465b95701d 100644
--- a/dev-cpp/msgpack-cxx/Manifest
+++ b/dev-cpp/msgpack-cxx/Manifest
@@ -1,3 +1,4 @@
 DIST msgpack-cxx-5.0.0.tar.gz 476103 BLAKE2B e631a47e8d39b6ad9c2dd5e782fbbd5044c177e18c619fb52d1293e2c5f2ea7e766e7b26ce6cac36a2ff98217143e12456e0541992afb4f78597ffd3852f2acf SHA512 5ee0237eb1bf05bd4becad32ab145a8f0654f8f0e2e3452331ed3df088cda03ee4cdf1557ba867447e3e18baed924c105c76934f7009dac98b6dc69282c39d0c
 DIST msgpack-cxx-6.0.0.tar.gz 476132 BLAKE2B 89b6505511bd8f6994a2e61661c7a33bd1aa68804c081ec2fcaf074f845caf4338ac362916af9fb0bab7285b0d0508c74b229316fa75ef8083546ac84c4ca95d SHA512 90f89216676af5a656d570fbff5a716d1177fa1941b0a928b2da20e0b6cd6d0ca880b7369e085dbbca944499c05694a73df919042d8cd78498ed4b34b77a0e9d
 DIST msgpack-cxx-6.1.0.tar.gz 478452 BLAKE2B 14c6e28ab02957e6313a01002d05c23e2599f433656c8ea8033eb338c6e8b97d10e00a91e1e67bc3b944c3f9b46ad1ea11fc6905d50554699caeed7bd9cbc8f7 SHA512 935453432b53d2cbecc3e34d4fb17ecd3bbc6eae9087fa3c4445c90750f144ab39ad6461cc9552eec7ed2b222315c5f6e8b30d409eb34a98bebe02e03582fd41
+DIST msgpack-cxx-6.1.1.tar.gz 476459 BLAKE2B 6ec940af9b9e02d892c5f118791015baa6b12baa60c77aaf2ff867e8836f21b4f16c436ce448cdfeb7dc8f8a9356a75f3ac829eba9059ca5d78f42a4393700ff SHA512 6a3df977e7a9c8b50feb7c88cff7a78814d1d41d2f7a657dd37d6cfcfe24f44746f40a6dd46bd5dba7ea59d94b9e40c2baa62c08d9b02168ac93c58cbff3becc
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
new file mode 100644
index 000000000000..62978b6f9fb4
--- /dev/null
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="MessagePack for C++"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+boost doc examples test"
+
+REQUIRED_USE="test? ( boost )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="boost? ( dev-libs/boost[context] )
+	!<dev-libs/msgpack-5.0.0"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/doxygen[dot] )
+	test? ( sys-libs/zlib )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		-DMSGPACK_CXX17=ON
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+		-DMSGPACK_USE_BOOST="$(usex boost)"
+		-DMSGPACK_USE_X3_PARSE="$(usex boost)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_build doxygen
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc_cpp/html/. )
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-cpp/popl/popl-1.2.0-r1.ebuild b/dev-cpp/popl/popl-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..81ab0225c4c6
--- /dev/null
+++ b/dev-cpp/popl/popl-1.2.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only C++ program options parser library"
+HOMEPAGE="https://github.com/badaix/popl"
+SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/popl/popl-9999.ebuild b/dev-cpp/popl/popl-9999.ebuild
deleted file mode 100644
index f58b83ff2381..000000000000
--- a/dev-cpp/popl/popl-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++ program options parser library"
-HOMEPAGE="https://github.com/badaix/popl"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/popl.git"
-	EGIT_BRANCH="develop"
-else
-
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index f0308f8c5d76..591bce8787fd 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1,2 +1 @@
-DIST prometheus-cpp-1.1.0.tar.gz 58489 BLAKE2B af24fbc34e79c04ec80dbf4430de5a2cf0e66b7de4c06f9b37e6bc3ab7f868b948db486a4f962c7986748eff1247eb0119ad5b581ac01129ce6bfa10f7b53ec7 SHA512 0715a0eb8a7f7065e01b8039c261eaa98a77a8d035783ccef9333fb06eecd75599959807ec157514c60ed435841bcd0cdd8cd295bcf7cd88e21e1099ba12be89
 DIST prometheus-cpp-1.2.4.tar.gz 73953 BLAKE2B 75ca7b8c88408b54ab806dcc8ecaa48c9d29a7cbb76fe786fc76e114fa0bfcacaced7d899f8aff24060c9cbb4836d144b25fca2ac45438982789bcf881fade67 SHA512 8c15492054189b736e502258c30aaaae0fac3c9ea61907260e6e3cd29fe4077451f9e49fd580508aa6e21691209545d9cf87011be5b046fa097a53a133167553
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-1.1.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-1.1.0.ebuild
deleted file mode 100644
index 6239a46b04df..000000000000
--- a/dev-cpp/prometheus-cpp/prometheus-cpp-1.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Prometheus Client Library for Modern C++"
-HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
-SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test zlib"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="net-misc/curl
-	sys-libs/zlib
-	www-servers/civetweb[cxx]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/gtest
-	)"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PULL=yes
-		-DENABLE_PUSH=yes
-		-DENABLE_COMPRESSION=$(usex zlib)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_THIRDPARTY_LIBRARIES=OFF
-		-DGENERATE_PKGCONFIG=ON
-		-DRUN_IWYU=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/range-v3/range-v3-0.12.0.ebuild b/dev-cpp/range-v3/range-v3-0.12.0.ebuild
index fd75ecd9247b..b2ffd55a091c 100644
--- a/dev-cpp/range-v3/range-v3-0.12.0.ebuild
+++ b/dev-cpp/range-v3/range-v3-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index 0e0a6986813e..2197240b2ad2 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -1,4 +1,7 @@
 DIST c4fs-0ee9c03d0ef3a7f12db6cb03570aa7606f12ba1b.tar.gz 25156 BLAKE2B 864a6a75c5ebe15d73fb6ffa5a83cd6448f37a0f465bf3992fc5bc1000f06d6e945c99b9a4f8f3625499c47ea719a49dd340d11e37c11ed759d1adcb1ea585be SHA512 58149c055b1f87abb12a01b042600a2927bfe7afeb878ca4523b658b0736aff6f752cd579c748cf9d4c85b4229ea50a1e70d633f85f9041fe157765286fa5233
+DIST c4fs-59cfbae26b821f4d4c50ff0775219cb739fa7f46.tar.gz 25149 BLAKE2B 8c8fbc59112e5a2e5d2a9aa8a0dc6665466ca309b78bbd5fe0203489bd8823097c79ff09f0dd1d33595f5b052fc95bde911580b8b083ee63f349a7fd0d0dde86 SHA512 3a76522f230c26bbe3b893421b1785259a79a4e7e01f83a2530f35af5d2a10195e4b85cfad6e8a6942715120f3c3b7f3eec3e95ac043ac5b47029dcd0ee8c3cf
 DIST c4log-457a2997e8ea26ea2a659b8152621f7fead1eb48.tar.gz 12056 BLAKE2B f0dc357c8beb28b2fa73e77f85918c3285be08a6e6c750317b7babddfc2372532d56b29a01adbc2284b7e850aeb2a45f1b24599acca0d0feccf5d60c00432627 SHA512 f728b34c000bbd58ad02d003697de1185feffc1a349600153a7d851f8dac28b88433e97c81dcb14769a74faa9e3d86b297536e8764d6e00b886f11bb2343518f
+DIST c4log-f4cf64caedd622a739aaa3ecb67a5aac105c2919.tar.gz 12076 BLAKE2B a5d09011d65aabad37f6821430a48e2ab0808863c34c750c7685f3de4b112251a6c7679b5d8962e83f3fe0847cbc9d80b791ec58907a4ee613dda950c947b553 SHA512 097c4566ad4f2906299e544ee067b01369433b654590cf4cf87cb56017caa5757ba037fef5ed1fd00c143a59e8d66013b07a28ad014903d761919a5ddda7c9d1
 DIST rapidyaml-0.6.0-src.tgz 7384217 BLAKE2B b81f797dcdac10368231256765bff08fa9d911550b620c286a657b41e74e589701a41d4f6e33317a7149fd1a2aabbad6bac6c66c1e494db053251e20bc5e505c SHA512 6637aa970919d76339ca7d3d131032ca97720650e275f7e285c0fa46671daf8638695c4db6ccb06f93671171110c445781a7f2c8e37f6d9a4951d6e649f60cde
+DIST rapidyaml-0.7.2-src.tgz 10139792 BLAKE2B f50005a313414073281258ed66d973adb9cf22995bf8742727b5f1910f05065bb14baac7273e437c450f72e984b713680a83951706f0cc0564113c406a07748c SHA512 076420688d9e230627ec48013928ede74a65980c1bf5335a187270f90958eb15af11e7958379e4915dbd35723f2eadfb425531a460fb0a0467559f9d1ba34b6e
 DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild
new file mode 100644
index 000000000000..107332c03e0e
--- /dev/null
+++ b/dev-cpp/rapidyaml/rapidyaml-0.7.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+# see no-download.patch, match with release date if "master"
+HASH_C4FS=59cfbae26b821f4d4c50ff0775219cb739fa7f46
+HASH_C4LOG=f4cf64caedd622a739aaa3ecb67a5aac105c2919
+HASH_YAMLTS=6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f
+
+DESCRIPTION="Library to parse and emit YAML, and do it fast"
+HOMEPAGE="https://github.com/biojppm/rapidyaml/"
+SRC_URI="
+	https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
+	test? (
+		https://github.com/biojppm/c4fs/archive/${HASH_C4FS}.tar.gz
+			-> c4fs-${HASH_C4FS}.tar.gz
+		https://github.com/biojppm/c4log/archive/${HASH_C4LOG}.tar.gz
+			-> c4log-${HASH_C4LOG}.tar.gz
+		https://github.com/yaml/yaml-test-suite/archive/${HASH_YAMLTS}.tar.gz
+			-> yaml-test-suite-${HASH_YAMLTS}.tar.gz
+	)
+"
+S=${WORKDIR}/${P}-src
+
+LICENSE="MIT Boost-1.0 BSD"
+SLOT="0/${PV}"
+# Bumped fwiw, but believe the future of this package is to be last-rited --
+# its build system is a maintenance headache and the only remaining revdep
+# (jsonnet) is not only incompatible with this version but upstream has
+# switched to single-header version and will not be able to easily use
+# system's anymore: https://github.com/google/jsonnet/commit/4003c4df8ee
+#
+# Leaving unkeyworded rather than do extra work until likely last-rites.
+# If kept, will be dropped to m-n given I no longer need this. Feel free
+# to take over and drop this comment if needed.
+#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-no-download.patch
+)
+
+DOCS=( README.md ROADMAP.md changelog )
+
+src_prepare() {
+	if use test; then
+		# also need c4core, symlink the one included in src.tgz
+		mv ../c4fs-${HASH_C4FS} ext/c4fs &&
+			rmdir ext/c4fs/ext/c4core &&
+			ln -s ../../c4core ext/c4fs/ext || die
+
+		mv ../c4log-${HASH_C4LOG} ext/c4log &&
+			rmdir ext/c4log/ext/c4core &&
+			ln -s ../../c4core ext/c4log/ext || die
+
+		mv ../yaml-test-suite-${HASH_YAMLTS} ext/yaml-test-suite || die
+
+		eapply "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch
+	fi
+
+	cmake_src_prepare
+
+	sed -E "/set\(_(ARCHIVE|LIBRARY)_INSTALL/s:lib/:$(get_libdir)/:" \
+		-i ext/c4core/cmake/c4Project.cmake || die
+}
+
+src_configure() {
+	# not looked into, but tests fail with lto and USE=debug fails to build
+	filter-lto
+
+	local mycmakeargs=(
+		-DGIT=false
+		-DRYML_BUILD_TESTS=$(usex test)
+		-DRYML_DBG=$(usex debug)
+		-DRYML_TEST_FUZZ=no
+
+		# TODO?: enable this+tests, should(?) be easier to do with >=0.5.0 but
+		# still need looking into (please file a bug if actually need this now)
+		-DRYML_BUILD_API=no
+
+		# rapidyaml sets c++11, but (system) >=gtest-1.13 wants >=c++14, also
+		# see: https://github.com/biojppm/cmake/commit/e344bf0681 (bug #893272)
+		-DC4_CXX_STANDARD=17
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test
+}
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild
index 9e31bea3b72a..cc77a55b6b9f 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..4fa97720bb96
--- /dev/null
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An extremely memory-efficient hash_map implementation"
+HOMEPAGE="https://github.com/sparsehash/sparsehash"
+SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-buildsystem.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index bbcc7a8f808a..8b1ca16deaa8 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/toml11/Manifest b/dev-cpp/toml11/Manifest
new file mode 100644
index 000000000000..855ca4eeb29f
--- /dev/null
+++ b/dev-cpp/toml11/Manifest
@@ -0,0 +1 @@
+DIST toml11-4.2.0.tar.gz 345359 BLAKE2B 771de7b1af5b3a8f93c114ff4a4ea84b2884c9a0a9a3c304aa3489e4a4aed90d31bca41287a183ee58519455839d7fb4a3075c48d689232991dca67a850f785a SHA512 acb29d37150e5752526cf0a38ae7f207fcfd142d3c78d280e706ad404b2d32f5bae6d44d6ce13cc0bdfd3b0fa4a0a94cf732d70b1fd2a01c3c517fee8a4ef05b
diff --git a/dev-cpp/toml11/metadata.xml b/dev-cpp/toml11/metadata.xml
new file mode 100644
index 000000000000..b6d01e802127
--- /dev/null
+++ b/dev-cpp/toml11/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ToruNiina/toml11</remote-id>
+    <bugs-to>https://github.com/ToruNiina/toml11/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/toml11/toml11-4.2.0.ebuild b/dev-cpp/toml11/toml11-4.2.0.ebuild
new file mode 100644
index 000000000000..da9ac1e07435
--- /dev/null
+++ b/dev-cpp/toml11/toml11-4.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="TOML for Modern C++"
+HOMEPAGE="https://toruniina.github.io/toml11/
+	https://github.com/ToruNiina/toml11/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ToruNiina/${PN}.git"
+else
+	SRC_URI="https://github.com/ToruNiina/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( README.md README_ja.md )
diff --git a/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild b/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild
index 9c8941ea61d9..4ac6f2dfc7a2 100644
--- a/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild
+++ b/dev-cpp/tomlplusplus/tomlplusplus-3.4.0.ebuild
@@ -14,11 +14,13 @@ SRC_URI="https://github.com/marzer/tomlplusplus/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="dev-build/cmake"
+
 src_configure() {
 	local emesonargs=(
 		-Dbuild_lib=true
diff --git a/dev-cpp/tree/tree-3.18.ebuild b/dev-cpp/tree/tree-3.18.ebuild
index 33b480f4a325..917ad3c60aed 100644
--- a/dev-cpp/tree/tree-3.18.ebuild
+++ b/dev-cpp/tree/tree-3.18.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_configure() {
 	tc-export CXX
diff --git a/dev-db/futuresql/futuresql-0.1.1.ebuild b/dev-db/futuresql/futuresql-0.1.1.ebuild
index 2f989131dd85..21dc63b8d983 100644
--- a/dev-db/futuresql/futuresql-0.1.1.ebuild
+++ b/dev-db/futuresql/futuresql-0.1.1.ebuild
@@ -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 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-db/hsqldb/files/StringComparator.java b/dev-db/hsqldb/files/StringComparator.java
deleted file mode 100644
index ae0f7b0fb979..000000000000
--- a/dev-db/hsqldb/files/StringComparator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2001-2008, The HSQL Development Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-package org.hsqldb.lib;
-
-public class StringComparator implements ObjectComparator {
-
-    public int compare(Object a, Object b) {
-
-        // handle nulls
-        if (a == b) {
-            return 0;
-        }
-
-        if (a == null) {
-            return -1;
-        }
-
-        if (b == null) {
-            return 1;
-        }
-
-        return ((String) a).compareTo((String) b);
-    }
-}
diff --git a/dev-db/hsqldb/files/TestBug1191815.java b/dev-db/hsqldb/files/TestBug1191815.java
deleted file mode 100644
index 06c606401cdd..000000000000
--- a/dev-db/hsqldb/files/TestBug1191815.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright (c) 2001-2009, The HSQL Development Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-package org.hsqldb.test;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-
-/**
- * Created on Apr 28, 2005
- * @author Antranig Basman (antranig@caret.cam.ac.uk)
- */
-public class TestBug1191815 extends TestBase {
-
-    public TestBug1191815(String name) {
-        super(name);
-    }
-
-    public void test() throws Exception {
-
-        try {
-            Connection conn = newConnection();
-            Statement  stmt = conn.createStatement();
-
-            stmt.executeUpdate("drop table testA if exists;");
-            stmt.executeUpdate("create table testA(data timestamp);");
-
-            TimeZone pst = TimeZone.getTimeZone("PST");
-            Calendar cal = new GregorianCalendar(pst);
-
-            cal.clear();
-            cal.set(2005, 0, 1, 0, 0, 0);
-
-
-            // yyyy-mm-dd hh:mm:ss.fffffffff
-            Timestamp ts = new Timestamp(cal.getTimeInMillis());
-            ts.setNanos(1000);
-            PreparedStatement ps =
-                conn.prepareStatement("insert into testA values(?)");
-
-            ps.setTimestamp(1, ts, cal);
-            ps.execute();
-            ps.setTimestamp(1, ts, null);
-            ps.execute();
-
-            String sql = "select * from testA";
-
-            stmt = conn.createStatement();
-
-            ResultSet rs = stmt.executeQuery(sql);
-
-            rs.next();
-
-            Timestamp returned = rs.getTimestamp(1, cal);
-
-            rs.next();
-
-            Timestamp def = rs.getTimestamp(1, null);
-
-            assertEquals(ts, returned);
-            assertEquals(ts, def);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        TestResult            result;
-        TestCase              test;
-        java.util.Enumeration exceptions;
-        java.util.Enumeration failures;
-        int                   count;
-
-        result = new TestResult();
-        test   = new TestBug1191815("test");
-
-        test.run(result);
-
-        count = result.failureCount();
-
-        System.out.println("TestBug1192000 failure count: " + count);
-
-        failures = result.failures();
-
-        while (failures.hasMoreElements()) {
-            System.out.println(failures.nextElement());
-        }
-    }
-}
-
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index cc68343464c7..7cb99a7db8a9 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -1,2 +1,2 @@
-DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
 DIST kyotocabinet-1.2.79.tar.gz 943804 BLAKE2B 8a12e6dd953a1ba995d5a60126fb2682a07be390698bf98535633af894573aafc63b55497dc869cad14eceb14824ceb4f8c471b9aa1dad51944c35eac0cf4912 SHA512 9243192c81d3aa37cc8c80eb3bdf235192a0919b134cededa2b4178be515d148916e7405e094cbcdd7dbf13bf38a569bf21863afac7cc05d6418cca5853a2ff4
+DIST kyotocabinet-1.2.80.tar.gz 942543 BLAKE2B 0a2c5e14fe1362d69d5676c9a8b203bee5a7f7c077d5a9fcb90b5697f0d0cfa5081d0547bff84493f4e1e3fdf5b263f6e4929aeae816e2f567236afaa905fd14 SHA512 9fe0a92c9a76db5ce06ef4d5a551c05930f2a9c065ab695b030fdaf45692bfe88d91f1b75791f50d0772c699567744cd74f3ef407172874d4bba467989d54328
diff --git a/dev-db/kyotocabinet/files/kyotocabinet-1.2.80-flags.patch b/dev-db/kyotocabinet/files/kyotocabinet-1.2.80-flags.patch
new file mode 100644
index 000000000000..d331bca2c55f
--- /dev/null
+++ b/dev-db/kyotocabinet/files/kyotocabinet-1.2.80-flags.patch
@@ -0,0 +1,34 @@
+--- a/configure.in
++++ b/configure.in
+@@ -202,28 +202,6 @@ test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
+ # Byte order
+ AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND")
+ 
+-# System-depending optimization
+-printf 'checking for 64-bit availability... '
+-if printf 'int main(void) {return 0;}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
+-then
+-  MYCFLAGS="-m64 $MYCFLAGS"
+-  MYCXXFLAGS="-m64 $MYCXXFLAGS"
+-  printf 'yes\n'
+-else
+-  printf 'no\n'
+-fi
+-if test "$enable_opt" != "no"
+-then
+-  printf 'checking for CPU optimization availability... '
+-  if printf 'int main(void) {return 0;}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
+-  then
+-    MYCFLAGS="-march=native $MYCFLAGS"
+-    MYCXXFLAGS="-march=native $MYCXXFLAGS"
+-    printf 'yes\n'
+-  else
+-    printf 'no\n'
+-  fi
+-fi
+ printf 'checking for useless warnings... '
+ if printf 'int main(void) {return 0;}' | $CC -xc \
+   -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o config.tmp - >config.tmp 2>&1
+-- 
+2.44.2
+
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
deleted file mode 100644
index c2108518f5f2..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A straightforward implementation of DBM"
-HOMEPAGE="https://dbmx.net/kyotocabinet/"
-SRC_URI="https://dbmx.net/kyotocabinet/pkg/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug doc examples +lzma +lzo static-libs"
-
-DEPEND="sys-libs/zlib[static-libs?]
-	lzma? ( app-arch/xz-utils:=[static-libs?] )
-	lzo? ( dev-libs/lzo:=[static-libs?] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/fix_configure-1.2.62.patch
-	"${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
-	"${FILESDIR}"/${PN}-1.2.76-flags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/DOCDIR/d" Makefile.in || die
-	tc-export AR
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# We need to set LD_LIBRARY_PATH which will be assigned to RUNENV later
-	# used by test suite
-	LD_LIBRARY_PATH=. \
-	econf $(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable !static-libs shared) \
-		$(use_enable lzma) \
-		$(use_enable lzo)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	if use doc; then
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		docinto example
-		dodoc example/*
-	fi
-}
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild
deleted file mode 100644
index b8df7c141a80..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A straightforward implementation of DBM"
-HOMEPAGE="https://dbmx.net/kyotocabinet/"
-SRC_URI="https://dbmx.net/kyotocabinet/pkg/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug doc examples +lzma +lzo static-libs"
-
-DEPEND="sys-libs/zlib[static-libs?]
-	lzma? ( app-arch/xz-utils:=[static-libs?] )
-	lzo? ( dev-libs/lzo:=[static-libs?] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/fix_configure-1.2.62.patch
-	"${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
-	"${FILESDIR}"/${PN}-1.2.76-flags.patch
-	"${FILESDIR}"/${PN}-1.2.79-configure-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/DOCDIR/d" Makefile.in || die
-	tc-export AR
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# We need to set LD_LIBRARY_PATH which will be assigned to RUNENV later
-	# used by test suite
-	LD_LIBRARY_PATH=. \
-	econf $(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable !static-libs shared) \
-		$(use_enable lzma) \
-		$(use_enable lzo)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	if use doc; then
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		docinto example
-		dodoc example/*
-	fi
-}
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild
new file mode 100644
index 000000000000..3872117c7f2c
--- /dev/null
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.80.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A straightforward implementation of DBM"
+HOMEPAGE="https://dbmx.net/kyotocabinet/"
+SRC_URI="https://dbmx.net/kyotocabinet/pkg/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug doc examples +lzma +lzo static-libs"
+
+DEPEND="sys-libs/zlib[static-libs?]
+	lzma? ( app-arch/xz-utils:=[static-libs?] )
+	lzo? ( dev-libs/lzo:=[static-libs?] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/fix_configure-1.2.62.patch
+	"${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
+	"${FILESDIR}"/${PN}-1.2.80-flags.patch
+	"${FILESDIR}"/${PN}-1.2.79-initialize-parameter-error-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "/DOCDIR/d" Makefile.in || die
+	tc-export AR
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# We need to set LD_LIBRARY_PATH which will be assigned to RUNENV later
+	# used by test suite
+	LD_LIBRARY_PATH=. \
+	econf $(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable !static-libs shared) \
+		$(use_enable lzma) \
+		$(use_enable lzo)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	if use doc; then
+		dodoc -r doc/*
+	fi
+
+	if use examples; then
+		docinto example
+		dodoc example/*
+	fi
+}
diff --git a/dev-db/litecli/litecli-1.11.1.ebuild b/dev-db/litecli/litecli-1.11.1.ebuild
index 04ce92d8dca4..a75b4d11a68a 100644
--- a/dev-db/litecli/litecli-1.11.1.ebuild
+++ b/dev-db/litecli/litecli-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/dbcli/litecli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-db/m17n-db/m17n-db-1.8.5.ebuild b/dev-db/m17n-db/m17n-db-1.8.5.ebuild
index 15bcacc57b5e..824af8a407ec 100644
--- a/dev-db/m17n-db/m17n-db-1.8.5.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libintl"
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
deleted file mode 100644
index e3ee9aa099f0..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/923020
-https://github.com/mysql/mysql-workbench/pull/43
-
-From 8f8917671ab5a06f842a340f31c6d4ec7634147a Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Sat, 27 Jan 2024 22:51:15 +0200
-Subject: [PATCH] Fix support for libxml2-2.12 with its api and header changes
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/library/grt/src/grt.h
-+++ b/library/grt/src/grt.h
-@@ -34,6 +34,7 @@
- #include <vector>
- #include <stdexcept>
- #include <boost/function.hpp>
-+#include <libxml/tree.h>
- #include <libxml/xmlmemory.h>
- #include "base/threading.h"
- #include <string>
---- a/library/grt/src/unserializer.cpp
-+++ b/library/grt/src/unserializer.cpp
-@@ -401,7 +401,11 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si
-   xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);
- 
-   if (!doc) {
-+#if LIBXML_VERSION >= 21200
-+    const xmlError* error = xmlGetLastError();
-+#else
-     xmlErrorPtr error = xmlGetLastError();
-+#endif
- 
-     if (error)
-       throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message));
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index b2d2676606de..adbd6df3cfba 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -1,35 +1,21 @@
-DIST instantclient-basic-linux-19.11.0.0.0dbru.zip 70336706 BLAKE2B 061f6abc83bab7f2e6712e33274783f96caee3d97629d39cacd925af658f737a072207449468e05f89672bcfc7ff98f81d7d9c92a8f844664ce97b4c6afabf27 SHA512 da4db9c64c0f92c2b78cc6b26ff710e3330e937395d62942625921401042af27fdf80d25eb3748c97f4281442ddb72f3ddc5f68171a89ae289f3d2f492c56ef7
 DIST instantclient-basic-linux-21.3.0.0.0.zip 74751697 BLAKE2B f9b29d1c98a55946670ce6a5c674f2c9e6a8d6152b0f4d335f41ad9479b0a2bcf9ba791aeba894161c64c5e088b458506c068d4ece386956158cb09f27f91b07 SHA512 b8599ebe0cf867336b1dfb4edb974b934ed29e96aa7b7a866b93c8d8271c8dfacc693b884a9e422272098e09b4c5a2d6badb11fffb57b43ca4eb15907878bb99
-DIST instantclient-basic-linux.x64-19.11.0.0.0dbru.zip 75943090 BLAKE2B 6e081d22af1161d1505847c6918cc618f92810d7803f2bb13b3c58f2e8c5bb3aa70d2006fbd1fcc193d3719ecf224c3541f3dc5c5ccfc6105a10c54c51ddd2c9 SHA512 0f7242a1becb062b6c55202587360895529e7ec277b0e41e27466dc01caf4b97cf0a256d0ccb9b71fb86b4802d9c427e0428f0419260b609d94472f89f7f33e6
 DIST instantclient-basic-linux.x64-21.13.0.0.0dbru.zip 83761712 BLAKE2B d7922bb6372bfb5a2c251f373ebf84130ec235ec95fa83a347aadf325f90f3be746de5c031035af7496ba728d75269434137090eb538790149ed051b23ebd63a SHA512 e2cf006fc542917367dbcf82287ac3a4614a5238d2d2dcf8f998fc0b91b3a3177aa2296bdbbea277d68dfe523f72ed32a2bca7dbc113a16bdaf5fe7982742aa3
 DIST instantclient-basic-linux.x64-21.3.0.0.0.zip 79375865 BLAKE2B 2215829c6f7df463d0cd1108755976eb5cc6d4fdf41201687236131151d2068a9e3c8762bfdac65ce2890c57cdb2fea6684e6012d836f232a8ff3cb93223deec SHA512 812dd6bb3a3c24b87e40a3df0c2a0dcfe1b5e27524b8e1622c533d8561cd4d674e9d90b8e66f571ee21bf3d1e152092ee986b6ff226d51674f1253f1ffb97ae4
-DIST instantclient-jdbc-linux-19.11.0.0.0dbru.zip 1577534 BLAKE2B 954049186c80028567f5ec0bb30aa28f6d9092d8c8be7cfef67f94e397dc26b935cfbbf75bee3b32e56c3697fb5a7e3181f9948ef91177af68c648e102a7db77 SHA512 5717137a6ebf28669347dd6f03f61b7242a332b927b55502b9019d108714c77e3dd31894f6d5260df6553604b0255b657aed46b63262db9f2e7153c067387e0e
 DIST instantclient-jdbc-linux-21.3.0.0.0.zip 1578398 BLAKE2B 42fbcd9946ff87f438297751febcaef4d361d36ac9d6538bc52f988f98c51531efb3a2721ba5c3859bf7f8e9092667704c206cc373d6ad099c1e6048077b3662 SHA512 3bb62dbe0738f6800945858acf56780d8049af0d6c6466e926c7173deaecf3dcd277f9a7e57f3b89aef08e73a585b57eded7175809ddf8a53402523ba392c1d5
-DIST instantclient-jdbc-linux.x64-19.11.0.0.0dbru.zip 1578059 BLAKE2B f5db4ab8b4424d21bb685b43012f71a228fdf1444e055b44dcf029b3beeefcca96aaddc496ac5912d4b337ec5d2bbd959df6083c18f7921811e996a2d73e5af6 SHA512 b2f906ae887f0421ff2edb80a70d0ede1fa624792e45ebfd205ade3f24dcd3cbc596c3ee64c39d7143810a2a11fafc649ad46cb5549d519dd3a1ffb7476fb537
 DIST instantclient-jdbc-linux.x64-21.13.0.0.0dbru.zip 1579013 BLAKE2B 3a3623fdddd8612c64ad42347c3272923753937d137f6af44b1211540dff0df495793caeb069ea1eb731e25d022728c2dca41eae8123af81070ffb30b509ef68 SHA512 634fdabfa4a2a90b436ff6fbe7227c0667a035a86aa51bb8d1ce3bb9b6a62a8285d3845cc58d29b5ec0a53c66c0314f63fff9412de8b25f4837428ad7863e9c4
 DIST instantclient-jdbc-linux.x64-21.3.0.0.0.zip 1578995 BLAKE2B 9913c62abe55d5c5ebe7e9feeb9051b7833d33e3a7bc8b96667336d2ecb8bd8766d268f2eef2f2de247b0edf1d3abb65c56316a3d11b14ebcf782a3c75ed332e SHA512 8d2b7344c99ec0744e147c899e252f34fd29b7dff49b2bbe5497836130fd8e9d01f874b33ddaf7a8cca442d62eb7da56ed547120ffd409bb4731a9b56166bb42
-DIST instantclient-odbc-linux-19.11.0.0.0dbru.zip 600428 BLAKE2B b4bcb4131bab1fac2650bee8cf1db4f389e89bbf0e310f9df2a9f1ce29ebf35f8056e350175ceb406e82bd077825cb4e6ad405c5ec00929f2db2630e99630006 SHA512 9a21c2dc06b6e1c4ae7305ce248cbfe45e4ad830a48f3e088be11065471beda002fd5a6bcca71f5095ad70186d742bddffc82bdb79a4368e89c59bfd3f04af4b
 DIST instantclient-odbc-linux-21.3.0.0.0.zip 760101 BLAKE2B 68a96fa5e24f5d44f64eabfd142280d620423f15fff62b10094b4425b520a2a31ba54fe6bce2d723700d38ce5a579d31a1c49ef6928eb6f4e342c7c8d98a49aa SHA512 e2e4cf126652580bf2d8f8ace7694881382b745a7adfabbba0c3e6fddcbb9ca7e300b0d18b19c8da029ca8f33c5f8f95baa141da20659ba49c9a8e6f4848b2db
-DIST instantclient-odbc-linux.x64-19.11.0.0.0dbru.zip 638686 BLAKE2B c9fa1b8988d85870bb4c2d9cb5c34c1572079c36a51da0ef726250f03ca0b53dbc19990582358011f099ca183d6148f8110cf80c1a17917549f6e38be503f706 SHA512 7d92ff08ea48de0e981cadad15a3c392749b3e20331b25f00f2f96ef7cc11a9802408f18dbfbf36366b0122d6c8fd256d43297c3bd87b4304b0479b1593e35fc
 DIST instantclient-odbc-linux.x64-21.13.0.0.0dbru.zip 798628 BLAKE2B 1cc41d2f1538924debbe0ee04c251abda45be769097103c8782c946772e8ab3c3734f443b5d910d29a308e9a3470fb1c72f5e72b208e347164f8fd44cabe1d5f SHA512 65551dbe35c5ac5bd709973147ef3a1a6cead8f21f4a5675cad6b8b5fc670f0eb0c897fcdeb2f421b1005c1c2763e3c4090c81fa73122f146411a27cdfbdd042
 DIST instantclient-odbc-linux.x64-21.3.0.0.0.zip 798599 BLAKE2B d020c68895dbb59e53e2e7ebc599e9016dee123dc03d3ce5f9263e721fa7664ecc6fc8b49b0b498a87b0d24bf74e79854edd66c2b2e7a9367be8e1e9c2cbe159 SHA512 0bf756458f3a856bbe6942d1f4bc30a7261ce3da7524ab8b71f77d9f367767ad75e8ed83e4de18bed1eb8d597f2aa0efe0c713a2e407e801e7ce3f83e152361b
-DIST instantclient-precomp-linux-19.11.0.0.0dbru.zip 5194893 BLAKE2B cbfda89f2f97728234aa3aa58d13289be66db0127f1e73675ea2fae348d8dff28e86b85b0a5a8f372dc155a07d6aa71f2096ef5b3cdc3082ca80c107fac06f4b SHA512 196ea51fc11d59212e274669e623d86cd91c6a8d7425cab5a08044d216b118ef2e4597e0c2a904579f35de87b5fb87f9d6a6eeab927af5878c3a7e1e504730b5
 DIST instantclient-precomp-linux-21.3.0.0.0.zip 5290951 BLAKE2B 3df4c41019315119d63ec780b9ae23d48823ecb2b9aa61a923c87c3e1f30fd97266030bbbc898d59b402931e02e8b3dcedfb6b96bd41381b583da2b380526f5d SHA512 b1fb267c373410c3c24fbdc4102b3395beaf0609ec3439f730a31ba43c5f2e1b276ce6e7df04de0d542c211dfef3ecadfccfe33f1472653feb42fb25a9dc700a
-DIST instantclient-precomp-linux.x64-19.11.0.0.0dbru.zip 6254880 BLAKE2B 0035623721a12c096a38ee64bc41465682214763f123ce9c529c61b6081c6de54bd7835f8b4ef07dca5eafda5354a77fa589c7c54cde412e1bdd4f313e58b3bb SHA512 d322b7896992cef8e48cc48acc68a5730d2a04ba0af5130eafa6ada79b64b16a4bd8cfaa02a28587d0871713579a5215ff46162499cd1f422252ef8dab61b7ab
 DIST instantclient-precomp-linux.x64-21.13.0.0.0dbru.zip 6389884 BLAKE2B 81921e1fb2cda680c1eafca4edc82c69fcb1afe2d573cdfefdd24fd50568cedf3c3992542486aad5acac083679221a14696c19ea6fc016ec8d0c7c8cb1cf7349 SHA512 1552723385e502bafa39853e12781cea3ef5d7a5407040fd8bf6ee878d1246dc8f976192861f60dbd71da1c854271953f98604d707393ce688b1fc726245f88e
 DIST instantclient-precomp-linux.x64-21.3.0.0.0.zip 6386663 BLAKE2B fea4e0465330d4309791f9ca58ae169b1ff2cd1f17b003210aab1fe4faa92d6e48ee20bbf7d84f44f437bf5297c69c9c2b5a2e3cfb687c8010f8ba75bb928c9f SHA512 8235236175f35d4634005249ccbe0ea5dec4078fd795545184578cefbb8d45663731c507baac4a952fb9603272aa3ff58197eb23801894bbd240cf5736460d57
-DIST instantclient-sdk-linux-19.11.0.0.0dbru.zip 933913 BLAKE2B 08cb6c94cd152f58fe9e52874b40dec56a6f7d3c9913122303b46f75ae2df0e13fff1a375136b6fffabe9ee7a7d844a2b95b1be380b6d957338b09a15c9fe83a SHA512 8d7aff3d066f423021a5babda86b1b378333966fd892146bf46a967495180fc099e9766deab27d81735fee845ab43ee48d8815fd96a73e3a235c4fde74952e40
 DIST instantclient-sdk-linux-21.3.0.0.0.zip 1000869 BLAKE2B 3e3f01da8218dad9de699b587ecd37dc465bd5779c7d6919149bcd947e9e9575d35727fe7d1251db8df12214a399b665c62be9e790dbaeaa895b2442ffcdd8fd SHA512 dd88433810e5b72d96747e57b34f7880607fdd0250d04972afed9a9f20c27ce1b74d7030b4de60e03621f98117b7ee93062c6c750b5c2dd104668a0afd45cd47
-DIST instantclient-sdk-linux.x64-19.11.0.0.0dbru.zip 933906 BLAKE2B 7d15f4c5a53708fd311ca75c35db5cf1241070217c21acf05f181ad07259135fd64eeb8f84582ce1faa6bbdd9c3fc29c07e44d82ff60fe1bbb9acaf7f70612c3 SHA512 d964612f0bb571c5c1fe78d14f861b2189d917d23e9be936faa637d5a2f8b530dc93a1ae0130346b70897bd1382f23953ff3e7f3163a580b7c6058675ac5fcf2
 DIST instantclient-sdk-linux.x64-21.13.0.0.0dbru.zip 1001591 BLAKE2B 36f3c40da230b66edc9c9462020f6070b7610ea55d20ffc0f2ef3e1729a4ed09edf0d105136939bd6d30ac5a5323fd43efe7327214d7b9d39480fdb553f1480e SHA512 b0d040e0d4e0dc59a35efed58162ec9cb8b1c0440a7d499bffca2da11c9a62ecf91ad5ac840bb5f35da1bbadb552bee757b0cffd8fef71dfadf44ff5f52ce4c3
 DIST instantclient-sdk-linux.x64-21.3.0.0.0.zip 1000777 BLAKE2B b593e3ef880a22d712a4e2b0c51f2f68e5d9ab6c3e4124b32de643eab7d3b41b6d5eb46f4ac98af743d90343d29975760048af5b7be0919c40a9b84217b31939 SHA512 5372c151a5b45bb2cdf80c47ea65b4d8ad849cc5a50818917484b952e03c344f2d7f1896a13d51ad9daf7fa9c43226aa011dca03161d6976375f239f782bdd23
-DIST instantclient-sqlplus-linux-19.11.0.0.0dbru.zip 884155 BLAKE2B f681321cc43646af74eda4d6da102587123e0f3fb423d978066f014c4729ed046806f9c49cae6928704b4993459089e8d8c1ab4fb1aab912cd6fa7ee27382fe3 SHA512 1f4bc70b070c9a0597f1433913018021e87a7b059784a56e47842afd8a501039def6591f4e7a009f3f4598f23c45aa807578a74082174862ecb444b1855f7b22
 DIST instantclient-sqlplus-linux-21.3.0.0.0.zip 909623 BLAKE2B 181da5e352dfea2ee1d87e138601f8b84ae2df278deb1c205bf25e5958a32da13252c8455a8aeb9941de2fc3752fd0510c53f196e8755bedae24e704cb4197a3 SHA512 e4417bccf0abbbfe16fce06b1a18c6e4f58ede1b87a1ab6407f74e3b926aa9d9b4d390c881bd578f95ed4fec6980e8b28cb9f624b8480e1ffac6dc599dcf49a7
-DIST instantclient-sqlplus-linux.x64-19.11.0.0.0dbru.zip 911265 BLAKE2B 78215f683458147792be3182eaf9edfde5943e8e470a7bcbe09c82c298df709bc7cdf919e349a9130b8d6313f2f8a1d04ad9b5b3c5ad91d49802ad14c3f15515 SHA512 dd1343ae49917a031cbd8d757d11da46354f157f46dd651afcde09b4b74a9e02008c6370eabf6bd313190629944cc075d6fbd893b491ad3505b7a05dbeecd963
 DIST instantclient-sqlplus-linux.x64-21.13.0.0.0dbru.zip 936856 BLAKE2B b4217412ed0b6f2d5cdff92c4e35a1bde119afaf0e6a5eb543d9b916a6d88fd358ee3396a4cddf2a5bd32252119a20047feaa6118cb086c6b0efc282f51ad080 SHA512 963535debcb8f811b0e2d5da03fdd7024ee6d8963d8d0450721b351a420042e1d3948fb4423dea0b6a3f7f4196ab054a99c202586adf73362640316b7a7171af
 DIST instantclient-sqlplus-linux.x64-21.3.0.0.0.zip 936305 BLAKE2B b6021f3ab3badb282f1a13a93beee6caa093b905efe6a647cc8ec9ea84eb3f7de4d9885692fd8d965608ba89964d13b5427af0f8710711f673ec97c528a6063c SHA512 9c6e87b4d319fc2bc35b2bd492b9608023d0f90b6230a66c75d9cd4d9fdea9b5dab178751cd188f9d1368f639d40f342ef1c71773dc4f9e9d8a199f4b46deaee
-DIST instantclient-tools-linux-19.11.0.0.0dbru.zip 1020021 BLAKE2B e2a615e0ffb4608af05931a8b49406c85db5d549761319c7116395fae206fe6cc0cf56b49e6c3968419e63616f2d07ad6ec3ed70c862fb2394b8dc0ce9f6dbb0 SHA512 255593c1e62a11f41793619c856d316815d77fa83cc9efee1d5366dc86b32e9909b042f7ac81ad693aafb8c34cdcc8faa7eebf816a90d037d36ce461df33f469
 DIST instantclient-tools-linux-21.3.0.0.0.zip 1083935 BLAKE2B e0caed4063d3322322beea599053fc40f1e08470d03c4bbe7cb5b46e5f4ba4759d313ea714806facd35d24924cb83e6d9d7d3a44bcf1da62c6c80d0321f33ce9 SHA512 301c126a3d2fefe36400c2287515ff6716a68a3273ae1450393d04509447d68e3bd2cc0412c5c078923421ff80534c3fa56123df61fbf92ea42965e3eed80bce
-DIST instantclient-tools-linux.x64-19.11.0.0.0dbru.zip 1085194 BLAKE2B 321e1cd7704f6a5ad33a9ca0eed35feb4d8e4a3ac2b5a5d11f992569f0024ae8ef5b8fb42b02d627ee4a81d2ae9170367ba7107e0f975f89d189c576eef45edd SHA512 d355b0a457ede28b20004b4709ada5bb2c2c8a72a20a19df07bc4fb8607f78ed4d24bbf07a9f2157873b544de7a43406faa27374a0f2d6a47d63f36478e97d3e
 DIST instantclient-tools-linux.x64-21.13.0.0.0dbru.zip 1150015 BLAKE2B f0263bd528e26658e4ee2f79365d3d891dcb25ef156486a3d39dc4aa819d77784e4638ab970375c9a85604f404930d8cd939a20f6adbcc8d9652bbfac74d91b0 SHA512 8b62c07ceeef342da835ba0d58802beecff366cb89142547732b368f8757e3017eaead4746816f37cbbe0ef053df8de2cadc4f6bed9307b92b15a27bf1523dc3
 DIST instantclient-tools-linux.x64-21.3.0.0.0.zip 1149632 BLAKE2B 3ad6ee973f813733e48c58f9a18d1dad321f9fb886d9460c2bc8f9d766d5a021722b34d9d9ea0ffb7a8466a38f5cf816bc55767b668e5cb5ee59b549fe4fc4ca SHA512 4c47b51f4801cab6d71a201c12ddb7a30616050584630107968a50457d4eca0e92f3344505bdd8f36481924a21a508d476c9f26ed111bad846f4a8feab98110d
diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
deleted file mode 100644
index bc4445fe354e..000000000000
--- a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Fake demo_xe.mk found in Oracle eXpress Edition,
-known by CPAN DBD::Oracle (bug#165834).
-This provides absolute paths for headers and libraries.
---- instantclient_18_3/sdk/demo/demo.mk
-+++ instantclient_18_3/sdk/demo/demo.mk
-@@ -28,13 +28,18 @@
- CC=/opt/SunProd/SUNWspro6.1/bin/CC
- cc=/opt/SunProd/SUNWspro6.1/bin/cc
- 
--ICINCHOME=../
--ICLIBHOME=../../
-+ifeq ($(BUILD32),T)
-+LIBDIR=lib32
-+else
-+LIBDIR=lib
-+endif
-+ICINCHOME=$(ORACLE_HOME)/include
-+ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
- ICLIBPATH=-L$(ICLIBHOME)
- THREADLIBS=-lthread
- CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
- 
--CCINCLUDES = -I$(ICINCHOME)include
-+CCINCLUDES = -I$(ICINCHOME)
- 
- CCFLAGS=$(CCINCLUDES) -D_REENTRANT -g -xs 
- LDFLAGS=
-@@ -55,10 +60,10 @@
- OCCIOTTPWD=tiger
- 
- .cpp.o:
--	$(CC) -c -I$(ICINCHOME)include $(CCFLAGS) $<
-+	$(CC) -c -I$(ICINCHOME) $(CCFLAGS) $<
- 
- .c.o:
--	$(cc) -c -I$(ICINCHOME)include $(CCFLAGS) $<
-+	$(cc) -c -I$(ICINCHOME) $(CCFLAGS) $<
- 
- all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
- 
diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch
deleted file mode 100644
index a197c2c7236f..000000000000
--- a/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- instantclient_18_3/sdk/demo/demo_proc_ic.mk.orig	2018-10-22 13:34:44.302293002 +0200
-+++ instantclient_18_3/sdk/demo/demo_proc_ic.mk	2018-10-22 13:38:55.015321571 +0200
-@@ -37,8 +37,13 @@
- cc=/usr/bin/gcc
- 
- # InstantClient Directories.
--ICSDKHOME=../
--ICLIBHOME=../../
-+ifeq ($(BUILD32),T)
-+LIBDIR=lib32
-+else
-+LIBDIR=lib
-+endif
-+ICSDKHOME=$(ORACLE_HOME)/
-+ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
- 
- MKLINK=ln
- REMOVE=rm -rf
-@@ -48,7 +53,7 @@
- MAKEFILE=demo_proc_ic.mk
- PROCDEMO=procdemo
- 
--PROC=$(ICSDKHOME)proc
-+PROC=$(ICSDKHOME)bin/proc
- SO_EXT=.so
- I_SYM=-I
- 
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
deleted file mode 100644
index cef395201617..000000000000
--- a/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit pax-utils multilib-minimal
-
-DESCRIPTION="Oracle 18c Instant Client with SDK"
-HOMEPAGE="https://www.oracle.com/database/technologies/instant-client.html"
-
-MY_SOVER=19.1 # the library soname found in the zip files
-
-IUSE="jdbc odbc precomp +sdk +sqlplus tools"
-REQUIRED_USE="precomp? ( sdk )"
-
-MY_PVM=$(ver_cut 1-2)
-MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
-
-MY_PV=$(ver_cut 1-4)
-MY_PVP=$(ver_cut 5) # p2
-
-MY_URI="https://download.oracle.com/otn_software/linux/instantclient/$(ver_rs 1-5 '' $(ver_cut 1-5))"
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${MY_URI}/${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
-MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
-MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
-MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
-MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
-MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
-MY_A_x86_tools="${MY_A_x86/basic/tools}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${MY_URI}/${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
-MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
-MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
-MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
-MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
-MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
-MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
-
-if [[ ${MY_PVP} == p* ]]
-then
-	MY_PVP=-${MY_PVP#p}
-	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
-	MY_A_x86_odbc="${MY_URI}/${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
-	MY_A_amd64_odbc="${MY_URI}/${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
-fi
-
-SRC_URI="
-	abi_x86_32? (
-		${MY_A_x86}
-		jdbc?    ( ${MY_A_x86_jdbc}    )
-		odbc?    ( ${MY_A_x86_odbc}    )
-		precomp? ( ${MY_A_x86_precomp} )
-		!abi_x86_64? (
-			sdk?     ( ${MY_A_x86_sdk}     )
-			sqlplus? ( ${MY_A_x86_sqlplus} )
-			tools?   ( ${MY_A_x86_tools}   )
-	) )
-	abi_x86_64? (
-		${MY_A_amd64}
-		jdbc?    ( ${MY_A_amd64_jdbc}    )
-		odbc?    ( ${MY_A_amd64_odbc}    )
-		precomp? ( ${MY_A_amd64_precomp} )
-		sdk?     ( ${MY_A_amd64_sdk}     )
-		sqlplus? ( ${MY_A_amd64_sqlplus} )
-		tools?   ( ${MY_A_amd64_tools}   )
-	)
-"
-
-LICENSE="OTN"
-SLOT="0/${MY_SOVER}"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror splitdebug test"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	sys-libs/glibc
-	odbc? ( dev-db/unixODBC )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="usr/lib*/oracle/client/*/*"
-
-set_my_abivars() {
-	if multilib_is_native_abi; then
-		MY_WORKDIR="${WORKDIR}"
-		MY_S="${S}"
-	else
-		MY_WORKDIR="${WORKDIR}/${ABI}"
-		MY_S="${MY_WORKDIR}/${MY_P}"
-	fi
-
-	local abi=${ABI}
-	[[ ${abi} == 'default' ]] && abi=${ARCH}
-	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
-	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
-	MY_A=MY_A_${abi}                ; MY_A=${!MY_A##*/}               # runtime distfile
-	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc##*/}       # jdbc distfile
-	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc##*/}       # odbc distfile
-	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp##*/} # precomp distfile
-	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk##*/}         # sdk distfile
-	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus##*/} # sqlplus distfile
-	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools##*/}     # tools distfile
-
-	[[ -n ${MY_PLAT} ]]
-}
-
-src_unpack() {
-	local ABI
-	for ABI in $(multilib_get_enabled_abis)
-	do
-		set_my_abivars || continue
-		mkdir -p "${MY_WORKDIR}" || die
-		cd "${MY_WORKDIR}" || die
-		unpack ${MY_A}
-		use jdbc    && unpack ${MY_A_jdbc}
-		use odbc    && unpack ${MY_A_odbc}
-		use precomp && unpack ${MY_A_precomp}
-		if multilib_is_native_abi; then
-			use sdk     && unpack ${MY_A_sdk}
-			use sqlplus && unpack ${MY_A_sqlplus}
-			use tools   && unpack ${MY_A_tools}
-		fi
-	done
-}
-
-src_prepare() {
-	local PATCHES=()
-	if use precomp; then
-		PATCHES+=( "${FILESDIR}"/18.3.0.0-proc-makefile.patch )
-		# Not supporting COBOL for now
-		rm -f sdk/demo/*procob*
-	fi
-	if use sdk; then
-		PATCHES+=( "${FILESDIR}"/18.3.0.0-makefile.patch )
-		rm sdk/include/ldap.h || die #299562
-	fi
-	default
-}
-
-# silence configure&compile messages from multilib-minimal
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	# all content goes here without version number, bug#578402
-	local oracle_home=/usr/$(get_libdir)/oracle/client
-	local oracle_home_to_root=../../../.. # for dosym
-	local ldpath=
-
-	local ABI
-	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
-	do
-		if ! set_my_abivars; then
-			elog "Skipping unsupported ABI ${ABI}."
-			continue
-		fi
-		ebegin "Installing runtime for ${MY_PLAT}"
-
-		cd "${MY_S}" || die
-
-		# shared libraries
-		into "${oracle_home}"
-		dolib.so lib*$(get_libname)*
-		use precomp && dolib.a cobsqlintf.o
-
-		# ensure to be linkable
-		[[ -e libocci$(get_libname) ]] ||
-		dosym libocci$(get_libname ${MY_SOVER}) \
-			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
-		[[ -e libclntsh$(get_libname) ]] ||
-		dosym libclntsh$(get_libname ${MY_SOVER}) \
-			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
-
-		# java archives
-		insinto "${oracle_home}"/$(get_libdir)
-		doins *.jar
-
-		# runtime library path
-		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
-
-		# Vanilla filesystem layout does not support multilib
-		# installation, so we need to move the libs into the
-		# ABI specific libdir.  However, ruby-oci8 build system
-		# detects an instantclient along the shared libraries,
-		# and does expect the sdk right there.
-		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
-
-		eend $?
-	done
-
-	local DOCS=( BASIC_README )
-	local HTML_DOCS=()
-	local paxbins=( adrci genezi uidrvci )
-	local scripts=()
-
-	if use jdbc; then
-		DOCS+=( JDBC_README )
-	fi
-	if use odbc; then
-		DOCS+=( ODBC_README )
-		HTML_DOCS+=( help )
-		scripts+=( odbc_update_ini.sh )
-	fi
-	if use precomp; then
-		DOCS+=( PRECOMP_README )
-		paxbins+=( sdk/proc )
-		# Install pcscfg.cfg into /etc/oracle, as the user probably
-		# wants to add the include path for the compiler headers
-		# here and we do not want this to be overwritten.
-		insinto /etc/oracle
-		doins precomp/admin/pcscfg.cfg
-		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
-			"${ED}"/etc/oracle/pcscfg.cfg || die
-		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
-		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
-		# Not supporting COBOL for now
-		# paxbins+=( sdk/{procob,rtsora} )
-		# doins precomp/admin/pcbcfg.cfg
-	fi
-	if use sdk; then
-		ebegin "Installing SDK"
-		DOCS+=( SDK_README )
-		scripts+=( sdk/ott )
-		insinto "${oracle_home}"/$(get_libdir)
-		doins sdk/ottclasses.zip
-		insinto "${oracle_home}"/sdk
-		doins -r sdk/{admin,demo,include}
-		# Some build systems simply expect ORACLE_HOME/include.
-		dosym sdk/include "${oracle_home}"/include
-		# Some build systems do not know the instant client,
-		# expecting headers in rdbms/public, see bug#669316.
-		# Additionally, some (probably older ruby-oci8) do
-		# require rdbms/public to be a real directory.
-		insinto "${oracle_home}"/rdbms/public
-		doins -r sdk/include/*
-		# Others (like the DBD::Oracle perl module) know the Oracle
-		# eXpress Edition's client, parsing an rdbms/demo/demo_xe.mk.
-		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
-		# And some do expect /usr/include/oracle/<ver>/client/include,
-		# querying 'sqlplus' for the version number, also see bug#652096.
-		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
-		eend $?
-	fi
-	if use sqlplus; then
-		DOCS+=( SQLPLUS_README )
-		paxbins+=( sqlplus )
-		insinto "${oracle_home}"/sqlplus/admin
-		doins glogin.sql
-		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-	fi
-	if use tools; then
-		DOCS+=( TOOLS_README )
-		paxbins+=( exp expdp imp impdp sqlldr wrc )
-	fi
-
-	ebegin "Installing binaries for ${MY_PLAT}"
-	into "${oracle_home}"
-	dobin ${paxbins[*]} ${scripts[*]}
-	pushd "${ED}${oracle_home}/bin" >/dev/null || die
-	pax-mark -c ${paxbins[*]#*/} || die
-	popd >/dev/null || die
-	eend $?
-
-	einstalldocs
-
-	# create path for tnsnames.ora
-	insinto /etc/oracle
-	doins "${FILESDIR}"/tnsnames.ora.sample
-
-	# Add OCI libs to library path
-	{
-		echo "# ${EPREFIX}/etc/env.d/50${PN}"
-		echo "# Do not edit this file, but 99${PN} instead"
-		echo
-		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
-		echo "LDPATH=${ldpath}"
-		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
-	} > "${T}"/50${PN}
-
-	doenvd "${T}"/50${PN}
-
-	# ensure ORACLE_HOME/lib exists
-	[[ -e ${ED}${oracle_home}/lib/. ]] ||
-	dosym $(get_libdir) "${oracle_home#/}"/lib
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
-		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
-	else
-		{
-			echo "# ${EPREFIX}/etc/env.d/99${PN}"
-			echo "# Configure system-wide defaults for your Oracle Instant Client here"
-			echo
-			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
-			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
-			echo "#NLS_LANG="
-		} > "${ED}/etc/env.d/99${PN}"
-	fi
-}
-
-pkg_postinst() {
-	elog "${P} does not provide an sqlnet.ora"
-	elog "configuration file, redirecting oracle diagnostics for database-"
-	elog "and network-issues into ~USER/oradiag_USER/ instead."
-	elog "It should be safe to ignore this message in sqlnet.log there:"
-	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
-	elog "If you want to directly analyse low-level debug info or don't want"
-	elog "to see it at all, so you really need an sqlnet.ora file, please"
-	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
-	elog ""
-	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
-	elog "put your tnsnames.ora there or configure TNS_ADMIN"
-	elog "to point to your user specific configuration."
-	if use precomp; then
-		elog ""
-		elog "The proc precompiler uses the system library headers, which in"
-		elog "turn include the headers of the used compiler."
-		elog "To make proc work, please add the compiler header path of your"
-		elog "preferred compiler to sys_include in:"
-		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
-		elog "Remember to update this setting when you switch or update the"
-		elog "compiler."
-		elog "For gcc, the headers are usually found in a path matching the"
-		elog "following pattern:"
-		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
-		elog "The exact details depend on the architecture and the version of"
-		elog "the compiler to be used."
-	fi
-	ewarn "Please re-source your shell settings for ORACLE_HOME"
-	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
-}
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 62b4a28cf654..efd1b10c4f09 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,4 +1,3 @@
-DIST percona-toolkit-3.5.3.tar.gz 14673470 BLAKE2B f0eeaaf20924a75ff68eb623d4027fd8402169bbd8479e91ec174638f20109cee33a3e93b19dd88cd860a3f572db7e0a645fb1bd96e63f52c5d261167ad5eae8 SHA512 80abe6fe1d690d8faff01d72918c5b5da188819389d0fafe8f88f23489b609aa9730b0c7c2b284eb057e0cc3ae8ccb5b83849b31ff61291d8ab75d58abcdf85f
 DIST percona-toolkit-3.5.5.tar.gz 14847253 BLAKE2B f26b88581b84a12fd2b353984b2dbfbf43056388a48821739e70f43a28f448fc7caea99bdb0f5284b91ce04436e0969da1eec85e66054bfc1e8ff2771dede6d2 SHA512 0fb367e2a967c1a459e2d8a70f3db6c75043caf4127c14472b2bdfdb89415286c9f52929e326fa4f402d73a4c3e95b4cf8b0ee0f0624e54e382e44eb653bfaf9
 DIST percona-toolkit-3.5.7-deps.tar.xz 108954608 BLAKE2B 788246531bdf3e1faa7d310fdd920b2fa42d9d82a75d730bb143047d0ce0c22d23ee86cf58bd646aae3dac503d88793040168be15fc74a7686979233a8d65dc1 SHA512 54a0698c5e3ae0fe30b6e253a31829db4c4656cccd48107126a5b99c148fe1ed9515d91e79784e1970569bfe8853d1b5cb74cf968dbc2d08e95aec6ef209659d
 DIST percona-toolkit-3.5.7.tar.gz 138784243 BLAKE2B a589c884348ad820ccadbb871ad85bf89a21ae49e8cea34fa019c61ab53302a5b7db03f01ae191138e15f61c77068388cb5d3863f360a7207d9f9075e9100385 SHA512 cfe232aa5b59d262242348ec18b676d0d8c7752dddadd1f027772346e02d329f5bc53b96dfdb82fbdb18524095f88ad0721e4b4c6ed611c727c0a5cde85998bd
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild
deleted file mode 100644
index 488a2c186226..000000000000
--- a/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit perl-module
-
-DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
-HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
-SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# Package warrants IUSE doc
-IUSE=""
-
-COMMON_DEPEND="dev-perl/DBI
-	dev-perl/DBD-mysql
-	virtual/perl-Time-HiRes"
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/JSON
-	dev-perl/libwww-perl
-	dev-perl/Role-Tiny
-	virtual/perl-File-Path
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-Local
-	virtual/perl-Digest-MD5
-	virtual/perl-IO-Compress
-	virtual/perl-File-Temp
-	virtual/perl-File-Spec
-	virtual/perl-Scalar-List-Utils
-	dev-perl/TermReadKey"
-DEPEND="${COMMON_DEPEND}
-	virtual/perl-ExtUtils-MakeMaker"
-
-# Bug #501904 - CVE-2014-2029
-# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
-# ^ is *-no-versioncheck.patch
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
-	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
-		Makefile.PL || die
-}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ae43bd992ca2..e8e48b3f0125 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -8,4 +8,4 @@ DIST postgresql-15.7.tar.bz2 23112318 BLAKE2B 6a31ca8b833caf9400ce176211005c2b52
 DIST postgresql-15.8.tar.bz2 23119460 BLAKE2B 15103c54464217fe2a327cc2e2fe242cfd41ea21365398670883f76cb82a12bb40d60f087676bb1ea294ed688a15a0a147ef121a9136aca79486db7910d12717 SHA512 da610d878819179fcafe8adf6cbe72e188537dbaff82457c67013f9089ae8cbb1f6d8c4d5ea62e4ef54c3e2a90060bd1f36b71b8531354279181e574d903940c
 DIST postgresql-16.3.tar.bz2 24737644 BLAKE2B 3390c781631645e9f51f31885d20cfeabf64992af9d56addaf847233e0c652aac8751dcf3a7c041962972de084722aee6070437c0517f729b200baf9e4bda2a3 SHA512 dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f
 DIST postgresql-16.4.tar.bz2 24765786 BLAKE2B 5ea2661b8ee86fe26e095377e3eede77dc94f40f352db4f0c12038f23b71fea6453f08ba43a62e17dd51ce4eb89e9a82cd06a31f122c1547fd187c58f9fec080 SHA512 f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96
-DIST postgresql-17beta3.tar.bz2 21464737 BLAKE2B b96a9b46c92e92a41c618c8896286fa1286762ae39e0b4188422792c09175476012fdf6d62aefc7e8c6dd899fb6e28fdbe267cb805176e14cfb7ad944996e473 SHA512 f74f9b3951e75e1d8953f81b12809ab7389271f7d8e5004938540079ecc45fb1666a0d962e556f0460fac8abe85ec90c4c81ec029283217dbda38a7902c46a1d
+DIST postgresql-17rc1.tar.bz2 21451314 BLAKE2B 343def79af7bbd12704a791c0aa1e8639d50b9d68a43586c02053190d70e471db0e719a43f96c07084e7547905ff5beee57ff3280a1447f9bf7494e827af634d SHA512 083e8ae7f4d6f9ccfd3075639c8c8a12b083e09e35e17a3753bc3ab1fb86ef39c5720de883cb9d0ba5c109b789b3f9d02778be38c313a34607ffb314e753a09b
diff --git a/dev-db/postgresql/postgresql-17_beta3.ebuild b/dev-db/postgresql/postgresql-17_rc1.ebuild
index 0051e4905613..0051e4905613 100644
--- a/dev-db/postgresql/postgresql-17_beta3.ebuild
+++ b/dev-db/postgresql/postgresql-17_rc1.ebuild
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index a9cadb5ca496..574d92f1a306 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1,2 +1,2 @@
-DIST sqlcipher-4.5.1.tar.gz 18132121 BLAKE2B 233ffbd9636eae78533553325f08fa3ceb1e01ce0d809be44ca8ed64d46478d6a70dd40f81c38a1f0524986932ebe8614e52fda9dfc1c2f20134692cac7d4b16 SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3
 DIST sqlcipher-4.5.5.tar.gz 18816611 BLAKE2B 46c6c64140848e02f7572afc3268db648f9968c41bd7d7e945d4918904ac572d57e0fdc049cf3dac40cc0fd0b034fb96693438ff04fffb4fcd603db2263b7ae9 SHA512 034774f8d320a53f08a9735c035bf83f81ef9223780473c39ec07658b80af89dc665599caa3b2662055039fa678c7a29cbf777d046922948e86123e677b823bc
+DIST sqlcipher-4.6.1.tar.gz 19115004 BLAKE2B 792e3342eba78ed8aee49265fcb9e216edaeb7d4c68fd9a95ac9abe60093a8baeb755e32e736a7af98811921d1bfd93f882418864bf5785952ffc2bbae1fc649 SHA512 023b2fc7248fe38b758ef93dd8436677ff0f5d08b1061e7eab0adb9e38ad92d523e0ab69016ee69bd35c1fd53c10f61e99b01f7a2987a1f1d492e1f7216a0a9c
diff --git a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
deleted file mode 100644
index 9c9ca41bb64d..000000000000
--- a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Full Database Encryption for SQLite"
-HOMEPAGE="https://www.zetetic.net/sqlcipher/"
-SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug libedit readline static-libs tcl test"
-
-# Tcl is always needed by buildsystem
-RDEPEND="
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/tcl:*"
-
-# Libedit and readline support are mutually exclusive
-# Testsuite requires compilation with TCL, bug #582584
-REQUIRED_USE="
-	libedit? ( !readline )
-	test? ( tcl )
-"
-
-DOCS=( README.md )
-
-# Testsuite fails, bug #692310
-RESTRICT="test"
-
-src_prepare() {
-	# Column metadata added due to bug #670346
-	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-fts3 \
-		--enable-fts4 \
-		--enable-fts5 \
-		--enable-geopoly \
-		--enable-json1 \
-		--enable-memsys5 \
-		--enable-rtree \
-		--enable-session \
-		--enable-tempstore \
-		$(use_enable debug) \
-		$(use_enable libedit editline) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl)
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -type f -delete || die
-	einstalldocs
-}
diff --git a/dev-db/sqlcipher/sqlcipher-4.6.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.6.1.ebuild
new file mode 100644
index 000000000000..33844a3cf18b
--- /dev/null
+++ b/dev-db/sqlcipher/sqlcipher-4.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Full Database Encryption for SQLite"
+HOMEPAGE="
+	https://www.zetetic.net/sqlcipher/
+	https://github.com/sqlcipher/sqlcipher
+"
+SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libedit readline tcl test"
+# Testsuite requires compilation with TCL, bug #582584
+REQUIRED_USE="
+	?? ( libedit readline )
+	test? ( tcl )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/tcl"
+
+src_configure() {
+	# Column metadata added due to bug #670346
+	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fts3
+		--enable-fts4
+		--enable-fts5
+		--enable-geopoly
+		--enable-memsys5
+		--enable-rtree
+		--enable-session
+		--enable-tempstore
+		$(use_enable debug)
+		$(use_enable libedit editline)
+		$(use_enable readline)
+		$(use_enable tcl)
+	)
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-db/sqlite/sqlite-9999.ebuild b/dev-db/sqlite/sqlite-9999.ebuild
index 7570a655878b..272447245cde 100644
--- a/dev-db/sqlite/sqlite-9999.ebuild
+++ b/dev-db/sqlite/sqlite-9999.ebuild
@@ -356,7 +356,7 @@ multilib_src_test() {
 	addpredict "/test.db"
 	addpredict "/ÿ.db"
 
-	emake -Onone HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
+	emake -Onone $(usex debug 'fulltest' 'test')
 }
 
 multilib_src_install() {
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.ebuild
index 2918a95b0493..294a79b3f045 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.13.0.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-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 8f1a5b6637c7..46bfc8d93bb2 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -1,3 +1,3 @@
-DIST sqlmap-1.8.5.gh.tar.gz 7245377 BLAKE2B 449a6eb42bfef68fa3a0d3ed56f67dbb1b1dbcaccd5170d7bd3b3cd4e06d992b0255564574de2920ce15db39e547ba9388aee3c9be05da8b507a8ca751493743 SHA512 ac11fdf7a3d3d3771bb56fb64def231a48efa2dc8e6122de4ad89c2c0ea4177059b44b0d83503d7c114f59fbb4b43e876f195e72c6afd3de32b09bed0a97f1ec
 DIST sqlmap-1.8.6.gh.tar.gz 7245375 BLAKE2B 7223e87ddb682c05e9d76cbb4407790c62146e005335ad45aec65a7445f56cd0e5ebc25a853bc199c44f2e7c98823040afca0b60da7ad5a30b7ffe0791704265 SHA512 d709b2885b19d4b69dab1f76bacdb2d07fe1f29cf24f221a7004387a296d399f934c6f3281ead45ed0e4901fd2924eda9c4202898e6a1aa69c6c5212ab0e6f30
 DIST sqlmap-1.8.7.gh.tar.gz 7249305 BLAKE2B 105881fe1889ff3a04dd6cf6b57cdd1a6b35e5533d858e9dcfe721b280591e9a9b6c41c5ba05e6de27d996330dc73d2d05571502cf0728fe27678de21613632d SHA512 938e60c13b08d10006de7feee6d9e10d7f156a2529a36b3c6c487389d06850f9a21a774909e21e9e9db74c8d337525b2c1ef6c59dfcd5c1fca8d0f156639810e
+DIST sqlmap-1.8.8.gh.tar.gz 7249385 BLAKE2B 69f8c8f3deaa8867b6a7101a70f81d71de94571fceed6c078ac0af8fe00df73ba7aed1a66b3232a1ec0e151d3fe045109f99fadaa254a11b6d43d86ba5751646 SHA512 717b0e15f4794eb349f58a7c8ffca3329cdcb42654a4ade9f8ca0bf7b4d70f2241d5216fcf7b35b71b6e15d4ff72841792706bb654f5fcf31e2d80c4557997ee
diff --git a/dev-db/sqlmap/sqlmap-1.8.5.ebuild b/dev-db/sqlmap/sqlmap-1.8.5.ebuild
deleted file mode 100644
index caaad5bf9d92..000000000000
--- a/dev-db/sqlmap/sqlmap-1.8.5.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit bash-completion-r1 python-single-r1 wrapper
-
-DESCRIPTION="An automatic SQL injection and database takeover tool"
-HOMEPAGE="https://sqlmap.org/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
-else
-	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-# sqlmap (GPL-2+)
-# ansitrm (BSD)
-# beautifulsoup (BSD)
-# bottle (MIT)
-# chardet (LGPL-2.1+)
-# clientform (BSD)
-# colorama (BSD)
-# fcrypt (BSD-2)
-# identitywaf (MIT)
-# keepalive (LGPL-2.1+)
-# magic (MIT)
-# multipartpost (LGPL-2.1+)
-# ordereddict (MIT)
-# prettyprint (BSD-2)
-# pydes (public-domain)
-# six (MIT)
-# socks (BSD)
-# termcolor (BSD)
-# wininetpton (public-domain)
-LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( doc/ README.md )
-
-src_install () {
-	einstalldocs
-
-	insinto /usr/share/${PN}/
-	doins -r *
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper ${PN} \
-		"${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py"
-
-	newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap
-}
diff --git a/dev-db/sqlmap/sqlmap-1.8.6.ebuild b/dev-db/sqlmap/sqlmap-1.8.6.ebuild
index e3d99c9eb231..caaad5bf9d92 100644
--- a/dev-db/sqlmap/sqlmap-1.8.6.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.8.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/dev-db/sqlmap/sqlmap-1.8.7.ebuild b/dev-db/sqlmap/sqlmap-1.8.7.ebuild
index 529820752d51..0170f6b3bc73 100644
--- a/dev-db/sqlmap/sqlmap-1.8.7.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.8.7.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/dev-db/sqlmap/sqlmap-1.8.8.ebuild b/dev-db/sqlmap/sqlmap-1.8.8.ebuild
new file mode 100644
index 000000000000..529820752d51
--- /dev/null
+++ b/dev-db/sqlmap/sqlmap-1.8.8.ebuild
@@ -0,0 +1,60 @@
+# 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="sqlite"
+
+inherit bash-completion-r1 python-single-r1 wrapper
+
+DESCRIPTION="An automatic SQL injection and database takeover tool"
+HOMEPAGE="https://sqlmap.org/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
+else
+	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# sqlmap (GPL-2+)
+# ansitrm (BSD)
+# beautifulsoup (BSD)
+# bottle (MIT)
+# chardet (LGPL-2.1+)
+# clientform (BSD)
+# colorama (BSD)
+# fcrypt (BSD-2)
+# identitywaf (MIT)
+# keepalive (LGPL-2.1+)
+# magic (MIT)
+# multipartpost (LGPL-2.1+)
+# ordereddict (MIT)
+# prettyprint (BSD-2)
+# pydes (public-domain)
+# six (MIT)
+# socks (BSD)
+# termcolor (BSD)
+# wininetpton (public-domain)
+LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( doc/ README.md )
+
+src_install () {
+	einstalldocs
+
+	insinto /usr/share/${PN}/
+	doins -r *
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper ${PN} \
+		"${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py"
+
+	newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap
+}
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r2.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r2.ebuild
deleted file mode 100644
index 144fdd76a75c..000000000000
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A library of routines for managing a database"
-HOMEPAGE="https://fallabs.com/tokyocabinet/"
-SRC_URI="https://fallabs.com/tokyocabinet/${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 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 debug doc examples threads zlib"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/fix_rpath.patch"
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/ldconfig/d" \
-		-e "/DATADIR/d" \
-		-i Makefile.in || die
-
-	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
-	sed -i -e 's/-O3"$/"/' configure.in || die
-	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
-
-	# flag only works on x86 derivatives, remove everywhere else
-	if ! use x86 && ! use amd64; then
-		sed -i -e 's/ -minline-all-stringops//' configure.in || die
-	fi
-
-	sed -e 's/libtokyocabinet.a/libtokyocabinet.so/g' -i configure.in || die
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# we use the "fastest" target without the -O3
-	myconf=(
-		--disable-static
-		--enable-off64
-		--enable-fastest
-		$(use_enable bzip2 bzip)
-		$(use_enable debug)
-		$(use_enable threads pthread)
-		$(use_enable zlib)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/.
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 1e34e2941e3d..8b54ea772251 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,2 +1 @@
-DIST unixODBC-2.3.11.tar.gz 1752585 BLAKE2B fa1502d7b83c8c10ee9d54b23281096156a3e3ec893b81acf125cd95c1de0f4ae7657ab3b4c5214a5c6a0fc9209e53cd9acdf6f99e65840e0a05366182af5600 SHA512 dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
 DIST unixODBC-2.3.12.tar.gz 1753915 BLAKE2B 9da9b0fb5ff962db8ec1483b700aca5d4adf88f3349b22010bd0b4b4ec1fe2e7a51d761527e3b9e49b08286a00e55aadc38c320a6db512ba52f491aecad7fd83 SHA512 ca9d8db943195679a44db1fc09391dc6662ab1721112c93d448f04011e98502462ffe14b8364eb03707d851db456eced20eb61a22370392ca88d917038d45b56
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch b/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
deleted file mode 100644
index f7b276523f83..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/lurcher/unixODBC/commit/685df9e2b4fbbd191ab081a2020956aa78295fe0
-
-From 685df9e2b4fbbd191ab081a2020956aa78295fe0 Mon Sep 17 00:00:00 2001
-From: Hugh McMaster <hugh.mcmaster@outlook.com>
-Date: Fri, 13 May 2022 22:03:37 +1000
-Subject: [PATCH] Makefile.am: Do not install config.h
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--ACLOCAL_AMFLAGS=-I m4 
-+ACLOCAL_AMFLAGS=-I m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = \
-@@ -21,7 +21,7 @@ SUBDIRS = \
- 	include \
- 	doc \
- 	man \
--	samples 
-+	samples
- 
- EXTRA_DIST = \
- 	README.OSX \
-@@ -47,7 +47,7 @@ EXTRA_DIST = \
- 
- include_HEADERS = unixodbc.h
- 
--pkginclude_HEADERS = unixodbc_conf.h config.h
-+pkginclude_HEADERS = unixodbc_conf.h
- 
- install-data-hook:
- 	-$(MKDIR_P) $(DESTDIR)$(sysconfdir)/ODBCDataSources
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch b/dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch
deleted file mode 100644
index 0e594487e666..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.9-clang16.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-https://github.com/lurcher/unixODBC/pull/138
-
-From d4782b9eea043de2a08519af3f1c49f56d917022 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Wed, 12 Apr 2023 21:28:26 +0200
-Subject: [PATCH] Avoid implicit function declarations, for C99 compatibility
-
-Add additional prototypes and #include directives for system headers, so
-that builds will not fail with compilers which do not support implicit
-function declarations by default.
---- a/Drivers/Postgre7.1/bind.h
-+++ b/Drivers/Postgre7.1/bind.h
-@@ -44,4 +44,8 @@ struct ParameterInfoClass_ {
- BindInfoClass *create_empty_bindings(int num_columns);
- void extend_bindings(StatementClass *stmt, int num_columns);
- 
-+RETCODE SQL_API PG_SQLBindCol(HSTMT hstmt, UWORD icol, SWORD fCType,
-+			      PTR rgbValue, SQLLEN cbValueMax,
-+			      SQLLEN *pcbValue);
-+
- #endif
---- a/Drivers/Postgre7.1/connection.c
-+++ b/Drivers/Postgre7.1/connection.c
-@@ -20,6 +20,7 @@
- #include "statement.h"
- #include "qresult.h"
- #include "lobj.h"
-+#include "misc.h"
- #include "dlg_specific.h"
- #include <stdio.h>
- #include <string.h>
---- a/Drivers/Postgre7.1/execute.c
-+++ b/Drivers/Postgre7.1/execute.c
-@@ -34,10 +34,10 @@
- #include "convert.h"
- #include "bind.h"
- #include "lobj.h"
-+#include "misc.h"
- 
- extern GLOBAL_VALUES globals;
- 
--RETCODE SQL_API PG_SQLExecute( HSTMT   hstmt);
- SQLRETURN   PG_SQLPrepare(SQLHSTMT hstmt,
-             SQLCHAR *szSqlStr , SQLINTEGER cbSqlStr);
- 
---- a/Drivers/Postgre7.1/misc.h
-+++ b/Drivers/Postgre7.1/misc.h
-@@ -106,4 +106,17 @@ int  my_strlen(char *s, int len);
- 
- int my_strcpy(char *dst, int dst_len, char *src, int src_len);
- 
-+RETCODE SQL_API PG_SQLExecDirect(HSTMT hstmt, UCHAR FAR *szSqlStr,
-+                                 SDWORD cbSqlStr);
-+RETCODE SQL_API PG_SQLExecute(HSTMT hstmt);
-+RETCODE SQL_API PG_SQLGetData(HSTMT hstmt, UWORD icol, SWORD fCType,
-+                              PTR rgbValue, SDWORD cbValueMax,
-+                              SDWORD FAR *pcbValue);
-+RETCODE SQL_API PG_SQLFetch(HSTMT hstmt);
-+RETCODE SQL_API PG_SQLColumns(HSTMT hstmt, UCHAR FAR * szTableQualifier,
-+                              SWORD cbTableQualifier,
-+                              UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-+                              UCHAR FAR * szTableName, SWORD cbTableName,
-+                              UCHAR FAR * szColumnName, SWORD cbColumnName);
-+
- #endif
---- a/Drivers/Postgre7.1/parse.c
-+++ b/Drivers/Postgre7.1/parse.c
-@@ -29,6 +29,7 @@
- #include "connection.h"
- #include "qresult.h"
- #include "pgtypes.h"
-+#include "misc.h"
- 
- #ifndef WIN32
- #ifndef HAVE_STRICMP
---- a/Drivers/Postgre7.1/results.c
-+++ b/Drivers/Postgre7.1/results.c
-@@ -29,6 +29,7 @@
- #include "qresult.h"
- #include "convert.h"
- #include "pgtypes.h" 
-+#include "misc.h"
- 
- #include <stdio.h>
- 
---- a/Drivers/Postgre7.1/statement.c
-+++ b/Drivers/Postgre7.1/statement.c
-@@ -22,6 +22,7 @@
- #include "qresult.h"
- #include "convert.h"
- #include "environ.h"
-+#include "misc.h"
- 
- #include <stdio.h>
- #include <string.h>
---- a/Drivers/Postgre7.1/statement.h
-+++ b/Drivers/Postgre7.1/statement.h
-@@ -220,5 +220,7 @@ void		SC_free_params(StatementClass *self, char option);
- void		SC_log_error(char *func, char *desc, StatementClass *self);
- unsigned long	SC_get_bookmark(StatementClass *self);
- 
-+RETCODE SQL_API PG_SQLAllocStmt(HDBC hdbc, HSTMT FAR *phstmt);
-+RETCODE SQL_API PG_SQLFreeStmt(HSTMT hstmt, UWORD fOption);
- 
- #endif
---- a/Drivers/nn/SQLBindParameter.c
-+++ b/Drivers/nn/SQLBindParameter.c
-@@ -126,3 +126,26 @@ RETCODE SQL_API SQLBindParameter(
- }
- 
- 
-+RETCODE SQL_API SQLSetParam (
-+									 HSTMT     hstmt,
-+									 UWORD     ipar,
-+									 SWORD     fCType,
-+									 SWORD     fSqlType,
-+									 UDWORD       cbColDef,
-+									 SWORD     ibScale,
-+									 PTR       rgbValue,
-+									 SDWORD FAR *pcbValue)
-+{
-+	return SQLBindParameter(hstmt,
-+									ipar,
-+									(SWORD)SQL_PARAM_INPUT_OUTPUT,
-+									fCType,
-+									fSqlType,
-+									cbColDef,
-+									ibScale,
-+									rgbValue,
-+									SQL_SETPARAM_VALUE_MAX,
-+									pcbValue );
-+}
-+
-+
---- a/Drivers/nn/SQLDriverConnect.c
-+++ b/Drivers/nn/SQLDriverConnect.c
-@@ -61,12 +61,7 @@ RETCODE SQL_API SQLDriverConnect(
- 			break;
- 		/* to next case */
- 	case SQL_DRIVER_PROMPT:
--		if ( nnodbc_conndialog( hwnd, buf, sizeof(buf)) )
--		{
--			sqlstat = en_IM008;
--			break;
--		}
--		server = buf;
-+		sqlstat = en_IM008;
- 		break;
- 
- 	default:
---- a/Drivers/nn/SQLSetParam.c
-+++ b/Drivers/nn/SQLSetParam.c
-@@ -1,40 +1 @@
--/**
--    Copyright (C) 1995, 1996 by Ke Jin <kejin@visigenic.com>
--	Enhanced for unixODBC (1999) by Peter Harvey <pharvey@codebydesign.com>
--	
--    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.
--**/
--#include <config.h>
--#include "driver.h"
--
--RETCODE SQL_API SQLSetParam (
--									 HSTMT     hstmt,
--									 UWORD     ipar,
--									 SWORD     fCType,
--									 SWORD     fSqlType,
--									 UDWORD       cbColDef,
--									 SWORD     ibScale,
--									 PTR       rgbValue,
--									 SDWORD FAR *pcbValue)
--{
--	return SQLBindParameter(hstmt,
--									ipar,
--									(SWORD)SQL_PARAM_INPUT_OUTPUT,
--									fCType,
--									fSqlType,
--									cbColDef,
--									ibScale,
--									rgbValue,
--									SQL_SETPARAM_VALUE_MAX,
--									pcbValue );
--}
--
--
-+/* Moved to SQLBindParameter.c. */
---- a/Drivers/nn/connect.c
-+++ b/Drivers/nn/connect.c
-@@ -129,6 +129,7 @@ readtoken(
- 
- #if	!defined(WINDOWS) && !defined(WIN32) && !defined(OS2)
- # include	<pwd.h>
-+# include	<unistd.h>
- # define	UNIX_PWD
- #endif
- 
---- a/Drivers/nn/driver.h
-+++ b/Drivers/nn/driver.h
-@@ -113,6 +113,11 @@ char*	getkeyvalinstr(
- 		char*	value,
- 		int	size );
- 
-+int sqlputdata (stmt_t* pstmt, int ipar, char* data);
-+int sqlexecute (stmt_t* pstmt);
-+
-+int upper_strneq (char*	s1, char* s2, int n);
-+
- #endif
- 
- 
---- a/Drivers/nn/herr.h
-+++ b/Drivers/nn/herr.h
-@@ -113,6 +113,7 @@ enum {
- extern	void*	nnodbc_pusherr		(void* stack, int code, char* msg);
- extern	void	nnodbc_poperr		(void* stack);
- extern	int	nnodbc_errstkempty	(void* stack);
-+extern  void	nnodbc_errstkunset	(void* stack);
- extern	int	nnodbc_getsqlstatcode	(void* stack);
- extern	char*	nnodbc_getsqlstatstr	(void* stack);
- extern	char*	nnodbc_getsqlstatmsg	(void* stack);
---- a/Drivers/nn/misc.c
-+++ b/Drivers/nn/misc.c
-@@ -15,6 +15,7 @@
- 
- #include <config.h>
- #include	<nnconfig.h>
-+#include "driver.h"
- 
- int	upper_strneq(
- 	char*	s1,
---- a/Drivers/nn/nncol.c
-+++ b/Drivers/nn/nncol.c
-@@ -18,6 +18,7 @@
- 
- #include	<nncol.h>
- #include	"nncol.ci"
-+#include	"driver.h"
- 
- int	nnsql_getcolidxbyname( char* col_name )
- {
---- a/Drivers/nn/nndate.c
-+++ b/Drivers/nn/nndate.c
-@@ -16,6 +16,7 @@
- #include	<nnconfig.h>
- 
- #include	<nndate.h>
-+#include	"driver.h"
- 
- static char* month_name[] =
- { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
---- a/Drivers/nn/nntp.c
-+++ b/Drivers/nn/nntp.c
-@@ -19,6 +19,7 @@
- #include    <string.h>
- #include	<errno.h>
- #include	<nntp.h>
-+#include	"driver.h"
- 
- # include	"nntp.ci"
- 
-@@ -28,6 +29,8 @@
- # include	<sys/socket.h>
- # include	<netdb.h>
- # include	<netinet/in.h>
-+# include	<arpa/inet.h>
-+# include	<unistd.h>
- 
- #else
- 
---- a/Drivers/nn/nntp.h
-+++ b/Drivers/nn/nntp.h
-@@ -78,6 +78,7 @@ extern int	nntp_end_post	( void* hcndes );
- 
- extern int	nntp_cancel	( void* hcndes, char* group, char* sender,
- 				   char* from, char* msgid);
-+extern int	nntp_postok	( void* hcndes );
- 
- extern int	nntp_getaccmode( void* hcndes );
- extern void	nntp_setaccmode( void* hcndes, int mode );
---- a/Drivers/nn/yyenv.h
-+++ b/Drivers/nn/yyenv.h
-@@ -37,4 +37,7 @@ typedef struct
- #  define	YYINITDEPTH	(512)
- # endif
- 
-+void nnsql_yyinit(yyenv_t* penv, yystmt_t* yystmt);
-+int nnsql_yyparse(yyenv_t* pyyenv);
-+
- #endif
---- a/Drivers/nn/yylex.c
-+++ b/Drivers/nn/yylex.c
-@@ -27,6 +27,8 @@
- #include	<stdio.h>
- #include	<ctype.h>
- 
-+#include	"driver.h"
-+
- static int	getcmpopidxbyname(char* name)
- {
- 	int	i, size;
---- a/Drivers/nn/yyparse.y
-+++ b/Drivers/nn/yyparse.y
-@@ -39,6 +39,9 @@ static	char	sccsid[]
- #else
- # define yylex()		nnsql_yylex(&yylval, pyyenv)
- #endif
-+union YYSTYPE;
-+int nnsql_yylex(union YYSTYPE* pyylval, yyenv_t* penv);
-+
- 
- #define yyparse(x)		nnsql_yyparse	(yyenv_t* pyyenv)
- #define yyerror(msg)		nnsql_yyerror (pyyenv, msg)
---- a/Drivers/nn/yystmt.c
-+++ b/Drivers/nn/yystmt.c
-@@ -14,6 +14,9 @@
- **/
- #include <config.h>
- #include "driver.h"
-+#if	!defined(WINDOWS) && !defined(WIN32) && !defined(OS2)
-+#include	<unistd.h>
-+#endif
- 
- static char	sccsid[]
- 	= "@(#)NNSQL(NetNews SQL) v0.5, Copyright(c) 1995, 1996 by Ke Jin";
---- a/Drivers/nn/yystmt.h
-+++ b/Drivers/nn/yystmt.h
-@@ -151,4 +151,9 @@ typedef struct {
- 	long		artnum_max;
- } yystmt_t;
- 
-+void nnsql_getrange(void* hstmt, long* pmin, long* pmax);
-+int nnsql_strlike(char* str, char* pattern, char esc, int flag);
-+int nnsql_srchtree_evl(void* hstmt);
-+int nnsql_srchtree_tchk(void* hstmt);
-+
- #endif
-
diff --git a/dev-db/unixODBC/unixODBC-2.3.11.ebuild b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
deleted file mode 100644
index 4f2306d56f48..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.11.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Complete ODBC driver manager"
-HOMEPAGE="https://www.unixodbc.org/"
-SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixODBC/unixodbc_conf.h /usr/include/unixodbc.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.9-clang16.patch
-	"${FILESDIR}"/${P}-config-no-install.patch
-)
-
-src_prepare() {
-	default
-
-	# Only needed for config.h install patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Needs flex, bison
-	export LEX=flex
-	unset YACC
-
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--disable-editline
-		--disable-static
-		--enable-iconv
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use odbcmanual ; then
-		# We could simply run "make install-html" if we'd not had
-		# out-of-source builds here.
-		docinto html
-		dodoc -r doc/.
-		find "${ED}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
-	fi
-
-	use prefix && dodoc README*
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-debug/apitrace/apitrace-9.0-r5.ebuild b/dev-debug/apitrace/apitrace-9.0-r5.ebuild
index f15cf68d8fc9..c66387dc172f 100644
--- a/dev-debug/apitrace/apitrace-9.0-r5.ebuild
+++ b/dev-debug/apitrace/apitrace-9.0-r5.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-brotli-unbundle.patch
 	"${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch
 	"${FILESDIR}"/${P}-pkgconfig-waffle.patch
+	"${FILESDIR}/${PN}-9.0-include-cstdint.patch"
 )
 
 src_prepare() {
diff --git a/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch b/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch
new file mode 100644
index 000000000000..45f7f2bd0f81
--- /dev/null
+++ b/dev-debug/apitrace/files/apitrace-9.0-include-cstdint.patch
@@ -0,0 +1,37 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Wed, 21 Aug 2024 14:53:50 +0200
+Subject: [PATCH] apitrace: Explicitly include <cstdint>
+
+GCC 15 will no longer include it by default, resulting in build failures in projects that do not explicitly include it.
+
+Error:
+apitrace-9.0/retrace/metric_writer.cpp: In static member function ‘static void ProfilerQuery::writeMetricEntryCallback(Metric*, int, void*, int, void*)’:
+apitrace-9.0/retrace/metric_writer.cpp:50:70: error: ‘uint64_t’ does not name a type
+50 |         case CNT_NUM_UINT64: std::cout << "\t" <<
+*(reinterpret_cast<uint64_t*>(data)); break;
+|
+^~~~~~~~
+apitrace-9.0/retrace/metric_writer.cpp:29:1: note: ‘uint64_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+   28 | #include "metric_writer.hpp"
+  +++ |+#include <cstdint>
+   29 |
+apitrace-9.0/retrace/metric_writer.cpp:50:78: error: expected ‘>’ before ‘*’ token
+50 |         case CNT_NUM_UINT64: std::cout << "\t" <<
+*(reinterpret_cast<uint64_t*>(data)); break;
+|
+^
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937722
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/retrace/metric_writer.cpp
++++ b/retrace/metric_writer.cpp
+@@ -24,6 +24,7 @@
+  **************************************************************************/
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #include "metric_writer.hpp"
+ 
diff --git a/dev-debug/cgdb/files/cgdb-0.7.1-respect-AR.patch b/dev-debug/cgdb/files/cgdb-0.7.1-respect-AR.patch
deleted file mode 100644
index e9837855ee3d..000000000000
--- a/dev-debug/cgdb/files/cgdb-0.7.1-respect-AR.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jakov Smolic <jakov.smolic@sartura.hr>
-Date: Sun, 6 Sep 2020 11:33:02 +0200
-Subject: [PATCH] configure.init: respect AR
-Bug: https://bugs.gentoo.org/724256
-Patch taken from https://github.com/cgdb/cgdb/pull/142
-
-Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
----
- configure.init | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/configure.init b/configure.init
-index 920b2a3..d2f696d 100644
---- a/configure.init
-+++ b/configure.init
-@@ -13,6 +13,13 @@ AC_PROG_INSTALL
- AC_PROG_RANLIB
- AM_PROG_LEX
- AC_PROG_YACC
-+m4_ifndef([AC_PROG_AR],[dnl
-+  AN_MAKEVAR([AR], [AC_PROG_AR])
-+  AN_PROGRAM([ar], [AC_PROG_AR])
-+  AC_DEFUN([AC_PROG_AR],
-+  [AC_CHECK_TOOL(AR, ar, :)])
-+])
-+AC_PROG_AR
- 
- dnl determine if we are running in linux, cygwin, solaris, or freebsd
- AC_CANONICAL_HOST
--- 
-2.26.2
-
diff --git a/dev-debug/cgdb/files/cgdb-test.patch b/dev-debug/cgdb/files/cgdb-test.patch
deleted file mode 100644
index 9bbb1749828f..000000000000
--- a/dev-debug/cgdb/files/cgdb-test.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From a8a567fc46fca4ca10a23016e2fe9055669b9102 Mon Sep 17 00:00:00 2001
-From: Ian Dinwoodie <dinwoodieian@gmail.com>
-Date: Wed, 29 Jan 2020 23:58:13 -0500
-Subject: [PATCH] Ncursesw should link with tinfow.
-
-This patch is a response to issue #219.
-
-Signed-off-by: Ian Dinwoodie <dinwoodieian@gmail.com>
----
- config/readline_check_version.m4 | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/config/readline_check_version.m4 b/config/readline_check_version.m4
-index 567bfbd4..01e61c28 100644
---- a/config/readline_check_version.m4
-+++ b/config/readline_check_version.m4
-@@ -7,10 +7,23 @@ AC_MSG_CHECKING(which library has the termcap functions)
- _bash_needmsg=
- fi
- AC_CACHE_VAL(bash_cv_termcap_lib,
--[AC_CHECK_LIB(]$curses_lib_name[, tgetent, bash_cv_termcap_lib=lib]$curses_lib_name[,
--  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
--    [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
--      bash_cv_termcap_lib=gnutermcap)])])])
-+[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
-+if test "$curses_lib_name" = "ncursesw"; then
-+	[AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
-+		[AC_CHECK_LIB(tinfow, tgetent, bash_cv_termcap_lib=libtinfow)]
-+	)]
-+elif test "$curses_lib_name" = "ncurses"; then
-+	[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-+		[AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo)]
-+	)]
-+elif test "$curses_lib_name" = "curses"; then
-+	[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
-+else
-+	[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-+		bash_cv_termcap_lib=gnutermcap
-+	)]
-+fi
-+)])
- if test "X$_bash_needmsg" = "Xyes"; then
- AC_MSG_CHECKING(which library has the termcap functions)
- fi
-@@ -19,6 +32,9 @@ if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then
- LDFLAGS="$LDFLAGS -L./lib/termcap"
- TERMCAP_LIB="./lib/termcap/libtermcap.a"
- TERMCAP_DEP="./lib/termcap/libtermcap.a"
-+elif test $bash_cv_termcap_lib = libtinfow; then
-+TERMCAP_LIB=-ltinfow
-+TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libtinfo; then
- TERMCAP_LIB=-ltinfo
- TERMCAP_DEP=
-
diff --git a/dev-debug/drgn/Manifest b/dev-debug/drgn/Manifest
new file mode 100644
index 000000000000..3f87369f6a99
--- /dev/null
+++ b/dev-debug/drgn/Manifest
@@ -0,0 +1 @@
+DIST drgn-0.0.27.tar.gz 1193358 BLAKE2B 9008c2784075dd2409d6a948474914f0b08bbd4ee0a7d537e77de5f9f34ebede20dab2fd371047708af5ded0ef395ae2361760edd5cbee2fac88140fcbb3d58e SHA512 fab4620eada3767184b48bf641fc700697b5897c9313ee15ff16aec1070d9e7e92a732e430d4a9d0d02d7071764961e7845b2f9ee6a87c661bdf0fc4d4ecb0f0
diff --git a/dev-debug/drgn/drgn-0.0.27-r1.ebuild b/dev-debug/drgn/drgn-0.0.27-r1.ebuild
new file mode 100644
index 000000000000..d3dfa2a25dd9
--- /dev/null
+++ b/dev-debug/drgn/drgn-0.0.27-r1.ebuild
@@ -0,0 +1,69 @@
+# 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} )
+
+inherit autotools distutils-r1 multiprocessing pypi toolchain-funcs
+
+DESCRIPTION="Programmable debugger"
+HOMEPAGE="
+	https://github.com/osandov/drgn
+	https://pypi.org/project/drgn/
+	https://drgn.readthedocs.io/en/latest/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openmp"
+
+DEPEND="
+	>=dev-libs/elfutils-0.165
+	dev-libs/libkdumpfile
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.27-bashism.patch
+)
+
+distutils_enable_tests unittest
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	cd libdrgn || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR CC OBJCOPY OBJDUMP PKG_CONFIG RANLIB STRIP
+
+	cat >> setup.cfg <<-EOF || die
+	[build_ext]
+	parallel = $(makeopts_jobs)
+	EOF
+
+	# setuptools calls autotools (!)
+	export CONFIGURE_FLAGS
+	CONFIGURE_FLAGS="--disable-dependency-tracking --disable-silent-rules"
+	CONFIGURE_FLAGS+=" --with-libkdumpfile"
+	CONFIGURE_FLAGS+=" $(use_enable openmp)"
+	distutils-r1_src_configure
+}
diff --git a/dev-debug/drgn/files/drgn-0.0.27-bashism.patch b/dev-debug/drgn/files/drgn-0.0.27-bashism.patch
new file mode 100644
index 000000000000..7f7151c4d6bb
--- /dev/null
+++ b/dev-debug/drgn/files/drgn-0.0.27-bashism.patch
@@ -0,0 +1,33 @@
+https://github.com/osandov/drgn/pull/427
+
+From 4aad3f174ceaaa740728ba92181d9d156f70abac Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 27 Aug 2024 21:03:42 +0100
+Subject: [PATCH] libdrgn: fix bashism in M4 macro
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ libdrgn/m4/my_c_auto.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdrgn/m4/my_c_auto.m4 b/libdrgn/m4/my_c_auto.m4
+index d38c72436..30f3221b5 100644
+--- a/libdrgn/m4/my_c_auto.m4
++++ b/libdrgn/m4/my_c_auto.m4
+@@ -12,7 +12,7 @@ if test "x$my_cv_c_auto" != xyes; then
+ 	AC_CACHE_CHECK([for __auto_type], [my_cv_c___auto_type],
+ 		       [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[__auto_type x = 1;]])],
+ 					  [my_cv_c___auto_type=yes], [my_cv_c___auto_type=no])])
+-	if test "x$my_cv_c___auto_type" == xyes; then
++	if test "x$my_cv_c___auto_type" = xyes; then
+ 		AC_DEFINE([auto], [__auto_type])
+ 	else
+ 		AC_MSG_ERROR([no auto or __auto_type])
diff --git a/dev-debug/drgn/metadata.xml b/dev-debug/drgn/metadata.xml
new file mode 100644
index 000000000000..277a11e65a36
--- /dev/null
+++ b/dev-debug/drgn/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>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">drgn</remote-id>
+		<remote-id type="github">osandov/drgn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-debug/dtrace/dtrace-2.0.1.1-r2.ebuild b/dev-debug/dtrace/dtrace-2.0.1.1-r2.ebuild
new file mode 100644
index 000000000000..d3a2543a5f97
--- /dev/null
+++ b/dev-debug/dtrace/dtrace-2.0.1.1-r2.ebuild
@@ -0,0 +1,231 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic linux-info systemd toolchain-funcs udev
+
+DESCRIPTION="Dynamic BPF-based system-wide tracing tool"
+HOMEPAGE="https://github.com/oracle/dtrace-utils https://wiki.gentoo.org/wiki/DTrace"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_BRANCH="devel"
+	EGIT_REPO_URI="https://github.com/oracle/dtrace-utils"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/oracle/dtrace-utils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/dtrace-utils-${PV}
+
+	KEYWORDS="-* amd64"
+fi
+
+LICENSE="UPL-1.0"
+SLOT="0"
+IUSE="systemd test-install"
+
+# XXX: right now, we auto-adapt to whether multilibs are present:
+# should we force them to be? how?
+#
+# TODO: can we make the wireshark dep conditional?
+DEPEND="
+	dev-libs/elfutils
+	dev-libs/libbpf
+	dev-libs/libpfm:=
+	net-analyzer/wireshark[dumpcap]
+	net-libs/libpcap
+	>=sys-fs/fuse-3.2.0:3
+	>=sys-libs/binutils-libs-2.42:=
+	sys-libs/zlib
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="
+	${DEPEND}
+	!dev-debug/systemtap[dtrace-symlink(+)]
+	net-analyzer/wireshark
+	test-install? (
+		app-alternatives/bc
+		app-editors/vim-core
+		dev-build/make
+		dev-lang/perl
+		dev-util/perf
+		net-fs/nfs-utils
+		sys-apps/coreutils
+		sys-fs/xfsprogs
+		sys-process/time
+		virtual/jdk
+		virtual/perl-IO-Socket-IP
+	)
+"
+BDEPEND="
+	dev-build/make
+	sys-apps/gawk
+	sys-devel/bison
+	>=sys-devel/bpf-toolchain-14.1.0
+	sys-devel/flex
+"
+# This isn't yet optional, valgrind.h is included unconditionally
+# https://github.com/oracle/dtrace-utils/issues/80
+DEPEND+=" dev-debug/valgrind"
+
+QA_PRESTRIPPED="
+	usr/.*/dtrace/testsuite/test/triggers/.*
+"
+QA_FLAGS_IGNORED="
+	usr/.*/dtrace/testsuite/test/triggers/.*
+"
+
+# TODO: report upstream (bug #938221) although it seems like it's
+# not relevant given it's a BPF object.
+QA_EXECSTACK="
+	usr/*/dtrace/bpf_dlib.*
+"
+
+pkg_pretend() {
+	# TODO: optional kernel patches
+
+	# Basics for debugging information, BPF
+	local CONFIG_CHECK="~BPF ~DEBUG_INFO_BTF ~KALLSYMS_ALL"
+
+	CONFIG_CHECK+=" ~CUSE"
+
+	# Tracing
+	CONFIG_CHECK+=" ~TRACING"
+	CONFIG_CHECK+=" ~UPROBES ~UPROBE_EVENTS"
+	CONFIG_CHECK+=" ~FTRACE ~FTRACE_SYSCALLS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+	CONFIG_CHECK+=" ~FPROBE"
+	# DTrace can fallback to kprobes for fbt but people often want them off
+	# for security and newer kernels work fine with BPF for that, so
+	# let's omit it. kprobes are slower and scale poorly.
+
+	# https://gcc.gnu.org/PR84052
+	CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"
+
+	if use test-install ; then
+		# See test/modules
+		CONFIG_CHECK+=" ~EXT4_FS ~ISO9660_FS ~NFS_FS ~RDS ~TUN"
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	eval unset ${!LC_*} LANG
+}
+
+src_configure() {
+	if tc-is-cross-compiler; then
+		die "DTrace does not yet support cross-compilation."
+	fi
+
+	tc-export CC
+
+	# https://github.com/oracle/dtrace-utils/issues/78
+	tc-enables-fortify-source && append-cppflags -U_FORTIFY_SOURCE
+
+	# lld does this by default, so fix that, although lld fails anyway...
+	# 'LIBDTRACE_1.0' to symbol 'dtrace_provider_modules' failed: symbol not defined
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+	# mold and lld can't cope with some relocation types used, e.g.
+	#  'test-triggers--usdt-tst-forker-prov.o:(.SUNW_dof): unknown relocation: R_X86_64_GLOB_DAT'
+	tc-ld-force-bfd
+
+	# -fno-semantic-interposition seems to lead to a broken dtrace
+	# that can't actually obtain results from probes, even trivial examples
+	# just hang.
+	filter-flags -fno-semantic-interposition
+	# https://github.com/oracle/dtrace-utils/issues/86
+	filter-lto
+
+	local confargs=(
+		# TODO: Maybe we should set the UNPRIV_UID to something? -3 is a bit... kludgy
+		--prefix="${EPREFIX}"/usr
+		# See https://github.com/oracle/dtrace-utils/issues/106 for man8 suffix
+		--mandir="${EPREFIX}"/usr/share/man/man8
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		HAVE_LIBCTF=yes
+		HAVE_LIBSYSTEMD=$(usex systemd)
+		HAVE_BPFV3=yes
+	)
+
+	edo ./configure "${confargs[@]}"
+}
+
+src_compile() {
+	# -j1: https://github.com/oracle/dtrace-utils/issues/82
+	emake verbose=1 -j1 $(usev !test-install TRIGGERS='')
+}
+
+src_test() {
+	# Needs root and is also very time-consuming
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install $(usev test-install install-test)
+
+	# Stripping the BPF libs breaks them
+	dostrip -x "/usr/$(get_libdir)"
+
+	# It's a binary (TODO: move it?)
+	docompress -x /usr/share/doc/${PF}/showUSDT
+
+	newinitd "${FILESDIR}"/dtprobed.init dtprobed
+}
+
+pkg_postinst() {
+	# We need a udev reload to pick up the CUSE device node rules.
+	udev_reload
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		# TODO: Make this more intelligent wrt comparison
+		# One option for this is to detect when it's needed (DOF stash layout changes)
+		# and then e.g. sleep and restart for the user.
+		if systemd_is_booted ; then
+			einfo "Restart the DTrace 'dtprobed' service after upgrades once all dtraces are stopped with:"
+			einfo " systemctl try-restart dtprobed"
+		else
+			einfo "Restart the DTrace 'dtprobed' service after upgrades once all dtraces are stopped with:"
+			einfo " /etc/init.d/dtprobed restart"
+		fi
+	else
+		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
+
+		# We can't do magic for people with ROOT=.
+		if [[ -n ${ROOT} ]] ; then
+			einfo "Enable and start the DTrace 'dtprobed' service for systemd with:"
+			einfo " systemctl enable --now dtprobed"
+			einfo
+			einfo "Enable and start the DTrace 'dtprobed' service for OpenRC with:"
+			einfo " rc-update add dtprobed"
+			einfo " /etc/init.d/dtprobed start"
+			return
+		fi
+
+		# For first installs, we enable the service and start it.
+		#
+		# This is unusual, but the behaviour without dtprobed running
+		# is untested/unsupported. It's not a network service, it
+		# has no configuration, reads a single device node, and
+		# does all parsing within a seccomp jail. It also leads
+		# to hard-to-diagnose issues because USDT probes won't
+		# be registered and an application might have already
+		# started up which needs to be traced.
+		if systemd_is_booted ; then
+			ebegin "Enabling & starting DTrace 'dtprobed' service"
+			systemctl enable --now dtprobed
+			eend $?
+		else
+			ebegin "Enabling DTrace 'dtprobed' service"
+			rc-update add dtprobed
+			eend $?
+
+			ebegin "Starting DTrace 'dtprobed' service"
+			rc-service start dtprobed
+			eend $?
+		fi
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-debug/dtrace/dtrace-2.0.1.1.ebuild b/dev-debug/dtrace/dtrace-2.0.1.1.ebuild
deleted file mode 100644
index 5baf5c47c35c..000000000000
--- a/dev-debug/dtrace/dtrace-2.0.1.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo flag-o-matic linux-info systemd toolchain-funcs udev
-
-DESCRIPTION="Dynamic BPF-based system-wide tracing tool"
-HOMEPAGE="https://github.com/oracle/dtrace-utils https://wiki.gentoo.org/wiki/DTrace"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_BRANCH="devel"
-	EGIT_REPO_URI="https://github.com/oracle/dtrace-utils"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/oracle/dtrace-utils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/dtrace-utils-${PV}
-
-	KEYWORDS="-* ~amd64"
-fi
-
-LICENSE="UPL-1.0"
-SLOT="0"
-IUSE="install-tests systemd"
-
-# XXX: right now, we auto-adapt to whether multilibs are present:
-# should we force them to be? how?
-#
-# XXX: binutils-libs will need an extra patch for what dtrace does with
-# it in the absence of in-kernel CTF: it will be backported
-# to 2.42, but perhaps a patch would be a good idea before that?
-DEPEND="
-	dev-libs/elfutils
-	dev-libs/libbpf
-	dev-libs/libpfm:=
-	net-analyzer/wireshark[dumpcap]
-	net-libs/libpcap
-	>=sys-fs/fuse-3.2.0:3
-	>=sys-libs/binutils-libs-2.42:=
-	sys-libs/zlib
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="
-	${DEPEND}
-	!dev-debug/systemtap
-	net-analyzer/wireshark
-	install-tests? (
-		app-alternatives/bc
-		app-editors/vim-core
-		dev-build/make
-		dev-lang/perl
-		dev-util/perf
-		net-fs/nfs-utils
-		sys-apps/coreutils
-		sys-fs/xfsprogs
-		sys-process/time
-		virtual/jdk
-		virtual/perl-IO-Socket-IP
-	)
-"
-BDEPEND="
-	dev-build/make
-	sys-apps/gawk
-	sys-devel/bison
-	>=sys-devel/bpf-toolchain-14.1.0
-	sys-devel/flex
-"
-
-pkg_pretend() {
-	# TODO: optional kernel patches
-
-	# Basics for debugging information, BPF
-	local CONFIG_CHECK="~BPF ~DEBUG_INFO_BTF ~KALLSYMS_ALL"
-
-	CONFIG_CHECK+=" ~CUSE"
-
-	# Tracing
-	CONFIG_CHECK+=" ~FTRACE_SYSCALLS ~UPROBE_EVENTS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
-
-	# https://gcc.gnu.org/PR84052
-	CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	eval unset ${!LC_*} LANG
-}
-
-src_configure() {
-	if tc-is-cross-compiler; then
-		die "DTrace does not yet support cross-compilation."
-	fi
-
-	tc-export CC
-
-	# TODO: Can drop once https://lore.kernel.org/dtrace/20240425164057.420580-1-nick.alcock@oracle.com/ is in
-	tc-enables-fortify-source && append-cppflags -U_FORTIFY_SOURCE
-
-	# lld does this by default, so fix that, although lld fails anyway...
-	# 'LIBDTRACE_1.0' to symbol 'dtrace_provider_modules' failed: symbol not defined
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-	# mold and lld can't cope with some relocation types used, e.g.
-	#  'test-triggers--usdt-tst-forker-prov.o:(.SUNW_dof): unknown relocation: R_X86_64_GLOB_DAT'
-	tc-ld-force-bfd
-
-	# -fno-semantic-interposition seems to lead to a broken dtrace
-	# that can't actually obtain results from probes, even trivial examples
-	# just hang.
-	filter-flags -fno-semantic-interposition
-	filter-lto
-
-	local confargs=(
-		# TODO: Maybe we should set the UNPRIV_UID to something? -3 is a bit... kludgy
-		--prefix="${EPREFIX}"/usr
-		--mandir="${EPREFIX}"/usr/share/man
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		HAVE_LIBCTF=yes
-		HAVE_LIBSYSTEMD=$(usex systemd)
-		HAVE_BPFV3=yes
-	)
-
-	edo ./configure "${confargs[@]}"
-}
-
-src_compile() {
-	emake verbose=1 $(usev !install-tests TRIGGERS='')
-}
-
-src_test() {
-	# Needs root and is also very time-consuming
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" install $(usev install-tests install-test)
-
-	# Stripping the BPF libs breaks them
-	dostrip -x "/usr/$(get_libdir)"
-
-	# It's a binary (TODO: move it?)
-	docompress -x /usr/share/doc/${PF}/showUSDT
-
-	newinitd "${FILESDIR}"/dtprobed.init dtprobed
-}
-
-pkg_postinst() {
-	# We need a udev reload to pick up the CUSE device node rules.
-	udev_reload
-
-	# TODO: Restart it on upgrade? (it will carry across its own persistent state)
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
-
-		# TODO: Make this more intelligent wrt comparison
-		if systemd_is_booted ; then
-			einfo "Restart the DTrace 'dtprobed' service after upgrades:"
-			einfo " systemctl try-restart dtprobed"
-		else
-			einfo "Restart the DTrace 'dtprobed' service with:"
-			einfo " /etc/init.d/dtprobed restart"
-		fi
-	else
-		if systemd_is_booted ; then
-			einfo "Enable and start the DTrace 'dtprobed' service with:"
-			einfo " systemctl enable --now dtprobed"
-		else
-			einfo "Enable and start the DTrace 'dtprobed' service with:"
-			einfo " rc-update add dtprobed"
-			einfo " /etc/init.d/dtprobed start"
-		fi
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-debug/dtrace/dtrace-9999.ebuild b/dev-debug/dtrace/dtrace-9999.ebuild
index 73afc981b1fd..5c1b20ad3238 100644
--- a/dev-debug/dtrace/dtrace-9999.ebuild
+++ b/dev-debug/dtrace/dtrace-9999.ebuild
@@ -21,14 +21,12 @@ fi
 
 LICENSE="UPL-1.0"
 SLOT="0"
-IUSE="install-tests systemd"
+IUSE="systemd test-install"
 
 # XXX: right now, we auto-adapt to whether multilibs are present:
 # should we force them to be? how?
 #
-# XXX: binutils-libs will need an extra patch for what dtrace does with
-# it in the absence of in-kernel CTF: it will be backported
-# to 2.42, but perhaps a patch would be a good idea before that?
+# TODO: can we make the wireshark dep conditional?
 DEPEND="
 	dev-libs/elfutils
 	dev-libs/libbpf
@@ -42,9 +40,9 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!dev-debug/systemtap
+	!dev-debug/systemtap[dtrace-symlink(+)]
 	net-analyzer/wireshark
-	install-tests? (
+	test-install? (
 		app-alternatives/bc
 		app-editors/vim-core
 		dev-build/make
@@ -65,6 +63,22 @@ BDEPEND="
 	>=sys-devel/bpf-toolchain-14.1.0
 	sys-devel/flex
 "
+# This isn't yet optional, valgrind.h is included unconditionally
+# https://github.com/oracle/dtrace-utils/issues/80
+DEPEND+=" dev-debug/valgrind"
+
+QA_PRESTRIPPED="
+	usr/.*/dtrace/testsuite/test/triggers/.*
+"
+QA_FLAGS_IGNORED="
+	usr/.*/dtrace/testsuite/test/triggers/.*
+"
+
+# TODO: report upstream (bug #938221) although it seems like it's
+# not relevant given it's a BPF object.
+QA_EXECSTACK="
+	usr/*/dtrace/bpf_dlib.*
+"
 
 pkg_pretend() {
 	# TODO: optional kernel patches
@@ -75,11 +89,22 @@ pkg_pretend() {
 	CONFIG_CHECK+=" ~CUSE"
 
 	# Tracing
-	CONFIG_CHECK+=" ~FTRACE_SYSCALLS ~UPROBE_EVENTS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+	CONFIG_CHECK+=" ~TRACING"
+	CONFIG_CHECK+=" ~UPROBES ~UPROBE_EVENTS"
+	CONFIG_CHECK+=" ~FTRACE ~FTRACE_SYSCALLS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+	CONFIG_CHECK+=" ~FPROBE"
+	# DTrace can fallback to kprobes for fbt but people often want them off
+	# for security and newer kernels work fine with BPF for that, so
+	# let's omit it. kprobes are slower and scale poorly.
 
 	# https://gcc.gnu.org/PR84052
 	CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"
 
+	if use test-install ; then
+		# See test/modules
+		CONFIG_CHECK+=" ~EXT4_FS ~ISO9660_FS ~NFS_FS ~RDS ~TUN"
+	fi
+
 	check_extra_config
 }
 
@@ -108,12 +133,14 @@ src_configure() {
 	# that can't actually obtain results from probes, even trivial examples
 	# just hang.
 	filter-flags -fno-semantic-interposition
+	# https://github.com/oracle/dtrace-utils/issues/86
 	filter-lto
 
 	local confargs=(
 		# TODO: Maybe we should set the UNPRIV_UID to something? -3 is a bit... kludgy
 		--prefix="${EPREFIX}"/usr
-		--mandir="${EPREFIX}"/usr/share/man
+		# See https://github.com/oracle/dtrace-utils/issues/106 for man8 suffix
+		--mandir="${EPREFIX}"/usr/share/man/man8
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		HAVE_LIBCTF=yes
 		HAVE_LIBSYSTEMD=$(usex systemd)
@@ -124,7 +151,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake verbose=1 $(usev !install-tests TRIGGERS='')
+	# -j1: https://github.com/oracle/dtrace-utils/issues/82
+	emake verbose=1 -j1 $(usev !test-install TRIGGERS='')
 }
 
 src_test() {
@@ -133,7 +161,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install $(usev install-tests install-test)
+	emake DESTDIR="${D}" -j1 install $(usev test-install install-test)
 
 	# Stripping the BPF libs breaks them
 	dostrip -x "/usr/$(get_libdir)"
@@ -148,26 +176,52 @@ pkg_postinst() {
 	# We need a udev reload to pick up the CUSE device node rules.
 	udev_reload
 
-	# TODO: Restart it on upgrade? (it will carry across its own persistent state)
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
-
 		# TODO: Make this more intelligent wrt comparison
+		# One option for this is to detect when it's needed (DOF stash layout changes)
+		# and then e.g. sleep and restart for the user.
 		if systemd_is_booted ; then
-			einfo "Restart the DTrace 'dtprobed' service after upgrades:"
+			einfo "Restart the DTrace 'dtprobed' service after upgrades once all dtraces are stopped with:"
 			einfo " systemctl try-restart dtprobed"
 		else
-			einfo "Restart the DTrace 'dtprobed' service with:"
+			einfo "Restart the DTrace 'dtprobed' service after upgrades once all dtraces are stopped with:"
 			einfo " /etc/init.d/dtprobed restart"
 		fi
 	else
-		if systemd_is_booted ; then
-			einfo "Enable and start the DTrace 'dtprobed' service with:"
+		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
+
+		# We can't do magic for people with ROOT=.
+		if [[ -n ${ROOT} ]] ; then
+			einfo "Enable and start the DTrace 'dtprobed' service for systemd with:"
 			einfo " systemctl enable --now dtprobed"
-		else
-			einfo "Enable and start the DTrace 'dtprobed' service with:"
+			einfo
+			einfo "Enable and start the DTrace 'dtprobed' service for OpenRC with:"
 			einfo " rc-update add dtprobed"
 			einfo " /etc/init.d/dtprobed start"
+			return
+		fi
+
+		# For first installs, we enable the service and start it.
+		#
+		# This is unusual, but the behaviour without dtprobed running
+		# is untested/unsupported. It's not a network service, it
+		# has no configuration, reads a single device node, and
+		# does all parsing within a seccomp jail. It also leads
+		# to hard-to-diagnose issues because USDT probes won't
+		# be registered and an application might have already
+		# started up which needs to be traced.
+		if systemd_is_booted ; then
+			ebegin "Enabling & starting DTrace 'dtprobed' service"
+			systemctl enable --now dtprobed
+			eend $?
+		else
+			ebegin "Enabling DTrace 'dtprobed' service"
+			rc-update add dtprobed
+			eend $?
+
+			ebegin "Starting DTrace 'dtprobed' service"
+			rc-service start dtprobed
+			eend $?
 		fi
 	fi
 }
diff --git a/dev-debug/dtrace/metadata.xml b/dev-debug/dtrace/metadata.xml
index 00989594025b..f9149c67c8a0 100644
--- a/dev-debug/dtrace/metadata.xml
+++ b/dev-debug/dtrace/metadata.xml
@@ -7,10 +7,10 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>arsen@gentoo.org</email>
-		<description>Arsen Arsenović</description>
+		<name>Arsen Arsenović</name>
 	</maintainer>
 	<use>
-		<flag name="install-tests">
+		<flag name="test-install">
 			Install the testsuite for manual use. It is not suitable
 			for automatic execution within the ebuild because it
 			requires root privlieges.
diff --git a/dev-debug/gdb-apple/Manifest b/dev-debug/gdb-apple/Manifest
deleted file mode 100644
index d52e9873b523..000000000000
--- a/dev-debug/gdb-apple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gdb-1752.tar.gz 17922994 BLAKE2B 9b27bca2b6a9f10e01d130d595270300a4e7f0040790c5b60337d41086e1238dc12d785cc88c484df630f742ddfe783f7baefc2132b47e41bb74a5d0b7ebbf1e SHA512 863a861a9a7708b8a763ea93599f6b519277f23fff35700d04e81a7747cc49421d0f051790deb92c440ced30ee15ba719b75066d5a614341e0f0b765d7a81094
diff --git a/dev-debug/gdb-apple/files/gdb-apple-1518-darwin8-9.patch b/dev-debug/gdb-apple/files/gdb-apple-1518-darwin8-9.patch
deleted file mode 100644
index a05169cec25d..000000000000
--- a/dev-debug/gdb-apple/files/gdb-apple-1518-darwin8-9.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- src/gdb/macosx/macosx-nat-dyld.c
-+++ src/gdb/macosx/macosx-nat-dyld.c
-@@ -2083,7 +2083,9 @@
-     case MH_DYLIB:
-     case MH_DYLINKER:
-     case MH_BUNDLE:
-+#ifdef MH_KEXT_BUNDLE
-     case MH_KEXT_BUNDLE:
-+#endif
-       break;
-     case MH_FVMLIB:
-     case MH_PRELOAD:
-@@ -2412,7 +2414,9 @@
-       break;
-     case MH_DYLINKER:
-     case MH_BUNDLE:
-+#ifdef MH_KEXT_BUNDLE
-     case MH_KEXT_BUNDLE:
-+#endif
-       entry->reason = dyld_reason_dyld;
-       break;
-     default:
---- src/gdb/macosx/macosx-nat-dyld-process.c
-+++ src/gdb/macosx/macosx-nat-dyld-process.c
-@@ -407,7 +407,9 @@
-     case MH_DYLIB:
-       break;
-     case MH_BUNDLE:
-+#ifdef MH_KEXT_BUNDLE
-     case MH_KEXT_BUNDLE:
-+#endif
-       break;
-     default:
-       return;
-       return;
---- src/gdb/macosx/macosx-nat-inferior.c
-+++ src/gdb/macosx/macosx-nat-inferior.c
-@@ -2692,6 +2692,7 @@
-   if (tp->private == NULL || tp->private->app_thread_port == 0)
-     return NULL;
- 
-+#ifdef THREAD_IDENTIFIER_INFO_COUNT
-   thread_identifier_info_data_t tident;
-   unsigned int info_count;
-   kern_return_t kret;
-@@ -2719,6 +2720,7 @@
-             }
-         }
-     }
-+#endif
-   return buf;
- }
- 
---- src/gdb/macosx/macosx-nat-infthread.c
-+++ src/gdb/macosx/macosx-nat-infthread.c
-@@ -809,6 +809,7 @@
-     print_stack_frame (get_selected_frame (NULL), 0, LOCATION);
-     switch_to_thread (current_ptid);
- 
-+#ifdef THREAD_IDENTIFIER_INFO_COUNT
-   thread_identifier_info_data_t tident;
-   info_count = THREAD_IDENTIFIER_INFO_COUNT;
-   kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident, 
-@@ -878,6 +879,7 @@
-       printf_filtered ("\tcurrent priority: %d\n", pth.pth_priority);
-       printf_filtered ("\tmax priority: %d\n", pth.pth_maxpriority);
-     }
-+#endif
- 
-   printf_filtered ("\tsuspend count: %d", info.suspend_count);
- 
-@@ -1175,6 +1177,7 @@
-   ui_out_field_fmt (uiout, "mach-port-number", "0x%s", 
-                     paddr_nz (app_thread_name));
- 
-+#ifdef THREAD_IDENTIFIER_INFO_COUNT
-   thread_identifier_info_data_t tident;
-   info_count = THREAD_IDENTIFIER_INFO_COUNT;
-   kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident, 
-@@ -1207,6 +1210,7 @@
-                               paddr_nz (struct_addr));
-         }
-     }
-+#endif
- }
- 
- 
diff --git a/dev-debug/gdb-apple/files/gdb-apple-1518-darwin8.patch b/dev-debug/gdb-apple/files/gdb-apple-1518-darwin8.patch
deleted file mode 100644
index f8ecc30be7f6..000000000000
--- a/dev-debug/gdb-apple/files/gdb-apple-1518-darwin8.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- src/gdb/macosx/macosx-nat-inferior.c
-+++ src/gdb/macosx/macosx-nat-inferior.c
-@@ -60,13 +60,17 @@
- #include <sys/sysctl.h>
- #include <sys/proc.h>
- #include <mach/mach_error.h>
-+#if defined(TARGET_ARM)
- #include <spawn.h>
-+#endif
- 
- #include <semaphore.h>
- 
- #include <dlfcn.h>
-+#if 0
- #include <libproc.h>
- #include <sys/proc_info.h>
-+#endif
- 
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-inferior.h"
---- src/gdb/macosx/macosx-nat-info.c
-+++ src/gdb/macosx/macosx-nat-info.c
-@@ -45,6 +45,22 @@
- #include "macosx-nat-inferior.h"
- #include "macosx-nat-inferior-debug.h"
- 
-+#ifdef __ppc__
-+#ifndef __darwin_ppc_thread_state
-+#define __darwin_ppc_thread_state ppc_thread_state
-+#define __r0       r0
-+#define __srr0     srr0
-+#define __srr1     srr1
-+#define __cr       cr
-+#define __xer      xer
-+#define __lr       lr
-+#define __ctr      ctr
-+#endif
-+#ifndef __darwin_ppc_exception_state
-+#define __darwin_ppc_exception_state ppc_exception_state
-+#endif
-+#endif
-+
- extern macosx_inferior_status *macosx_status;
- 
- #define CHECK_ARGS(what, args) \
---- src/gdb/macosx/macosx-nat-infthread.c
-+++ src/gdb/macosx/macosx-nat-infthread.c
-@@ -36,8 +36,10 @@
- #include <sys/dir.h>
- #include <inttypes.h>
- 
-+#if 0
- #include <libproc.h>
- #include <sys/proc_info.h>
-+#endif
- 
- #include "macosx-nat-inferior.h"
- #include "macosx-nat-inferior-util.h"
---- src/gdb/macosx/macosx-tdep.c
-+++ src/gdb/macosx/macosx-tdep.c
-@@ -64,7 +64,6 @@
- #include "gdbcore.h"
- 
- #include <dirent.h>
--#include <libgen.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
---- src/gdb/remote.c
-+++ src/gdb/remote.c
-@@ -63,7 +63,6 @@
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-dyld-process.h"
- #endif
--#include <execinfo.h>
- 
- /* Prototypes for local functions.  */
- static void cleanup_sigint_signal_handler (void *dummy);
-@@ -475,11 +474,13 @@
- static void
- remote_backtrace_self (const char *message)
- {
-+#if 0
-   void *bt_buffer[100];
-   int count = backtrace (bt_buffer, 100);
-   if (message && message[0])
-     fprintf_filtered (gdb_stderr, "%s", message);
-   backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
-+#endif
- }
- 
- static void
---- src/gdb/symfile.c
-+++ src/gdb/symfile.c
-@@ -67,7 +67,6 @@
- #include <ctype.h>
- #include <time.h>
- #include <sys/time.h>
--#include <libgen.h>
- 
- #include <sys/mman.h>
- 
---- src/gdb/utils.c
-+++ src/gdb/utils.c
-@@ -28,7 +28,6 @@
- #include "event-top.h"
- #include "exceptions.h"
- #include "bfd.h"
--#include <execinfo.h>
- #include <sys/resource.h>
- #include <uuid/uuid.h>
- 
-@@ -879,6 +878,7 @@
-   target_terminal_ours ();
-   begin_line ();
- 
-+#if 0
-   /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
-      to get useful bug reports.  */
-   {
-@@ -887,6 +887,7 @@
-     fprintf (stderr, "gdb stack crawl at point of internal error:\n");
-     backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
-   }
-+#endif
- 
-   /* Create a string containing the full error/warning message.  Need
-      to call query with this full string, as otherwize the reason
diff --git a/dev-debug/gdb-apple/files/gdb-apple-1705-darwin8-10.patch b/dev-debug/gdb-apple/files/gdb-apple-1705-darwin8-10.patch
deleted file mode 100644
index 32247431fe89..000000000000
--- a/dev-debug/gdb-apple/files/gdb-apple-1705-darwin8-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdb/macosx/macosx-nat-dyld.c
-+++ src/gdb/macosx/macosx-nat-dyld.c
-@@ -788,7 +788,7 @@
-        }
-      else
-        {
--#if defined (NM_NEXTSTEP)
-+#if defined (NM_NEXTSTEP) && defined(TASK_DYLD_INFO_COUNT)
-           if (macosx_status->task == TASK_NULL)
-             return 0;
- 
diff --git a/dev-debug/gdb-apple/files/gdb-apple-768-texinfo.patch b/dev-debug/gdb-apple/files/gdb-apple-768-texinfo.patch
deleted file mode 100644
index 41153d8436de..000000000000
--- a/dev-debug/gdb-apple/files/gdb-apple-768-texinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -280,6 +280,6 @@
- 	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
- 	else if (${CONFIGURED_MAKEINFO} --version \
--	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
-+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-9]|[5-9])') >/dev/null 2>&1; \
-         then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
- 
- # This just becomes part of the MAKEINFO definition passed down to
diff --git a/dev-debug/gdb-apple/files/gdb-apple-no-global-gdbinit.patch b/dev-debug/gdb-apple/files/gdb-apple-no-global-gdbinit.patch
deleted file mode 100644
index 0c132ec5b384..000000000000
--- a/dev-debug/gdb-apple/files/gdb-apple-no-global-gdbinit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Sourcing /etc/gdb.conf is annoying mainly because Apple put
-  set history save on
-in there, which means everywhere you run it, you end up with a
-.gdb_history file.
-
---- src/gdb/main.c
-+++ src/gdb/main.c
-@@ -675,6 +675,7 @@
-   memset (&cwdbuf, 0, sizeof (struct stat));
-   /* APPLE LOCAL end move inits up */
-   /* APPLE LOCAL begin global gdbinit */
-+#ifdef WANT_GLOBAL_GDBINIT
-   memset (&globalbuf, 0, sizeof (struct stat));
-   stat (gdbinit_global, &globalbuf);
-   if (!inhibit_gdbinit)
-@@ -683,6 +684,7 @@
- 	 source_file (gdbinit_global, 0);
-     }
-   do_cleanups (ALL_CLEANUPS);
-+#endif
-   /* APPLE LOCAL end global gdbinit */
-  
-   /* APPLE LOCAL: Set the $_Xcode convenience variable at '0' before sourcing
diff --git a/dev-debug/gdb-apple/gdb-apple-1752.ebuild b/dev-debug/gdb-apple/gdb-apple-1752.ebuild
deleted file mode 100644
index 974164cdbaa3..000000000000
--- a/dev-debug/gdb-apple/gdb-apple-1752.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-APPLE_PV=${PV}
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.3"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE_PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x64-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2:0=
-	sys-libs/readline:0=
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
-
-S=${WORKDIR}/gdb-${APPLE_PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-no-global-gdbinit.patch
-	"${FILESDIR}"/${PN}-768-texinfo.patch
-	"${FILESDIR}"/${PN}-1518-darwin8-9.patch
-	"${FILESDIR}"/${PN}-1705-darwin8-10.patch
-)
-
-src_prepare() {
-	default
-	[[ ${CHOST} == *-darwin8 ]] && eapply "${FILESDIR}"/${PN}-1518-darwin8.patch
-
-	# use host readline
-	sed -i -e '/host_libs/s/readline//' configure.in configure || die
-	sed -i \
-		-e '/^\(READLINE\|readline\)_/s/=.*$/=/' \
-		-e '/^READLINE /s/=.*$/= -lreadline/' \
-		gdb/Makefile.in || die
-}
-
-src_configure() {
-	if tc-is-gcc ; then
-		# force gcc-apple, FSF gcc doesn't grok this code
-		export CC=${CTARGET:-${CHOST}}-gcc-4.2.1
-		export CXX=${CTARGET:-${CHOST}}-g++-4.2.1
-	fi
-
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		--disable-debug-symbols-framework \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# unable to work around parallel make issue
-	# ignore texinfo issues (version mismatch, to hard to fix or
-	# disable)
-	emake -j2 MAKEINFOFLAGS="--force"
-}
-
-src_install() {
-	emake -j2 \
-		DESTDIR="${D}" libdir=/nukeme includedir=/nukeme \
-		MAKEINFOFLAGS="--force" install || die
-	rm -R "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
-		ewarn "Due to increased security measures in 10.5 and up, gdb is"
-		ewarn "not able 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
-	if [[ ${CHOST} == *86* ]] ; then
-		einfo "FSF gdb works on Intel-based OSX platforms, sometimes even"
-		einfo "better than gdb-apple.  You can consider installing FSF gdb"
-		einfo "instead of gdb-apple, since the FSF version is surely more"
-		einfo "advanced than this old 6.8 version modified by Apple."
-	fi
-}
diff --git a/dev-debug/gdb-apple/metadata.xml b/dev-debug/gdb-apple/metadata.xml
deleted file mode 100644
index 232d18dd1fa2..000000000000
--- a/dev-debug/gdb-apple/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>prefix@gentoo.org</email>
-		<name>Gentoo Prefix</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-debug/gprofng-gui/Manifest b/dev-debug/gprofng-gui/Manifest
new file mode 100644
index 000000000000..8feedb95e0ac
--- /dev/null
+++ b/dev-debug/gprofng-gui/Manifest
@@ -0,0 +1 @@
+DIST gprofng-gui-1.1.tar.gz 1576556 BLAKE2B 3b757ffe2785cfcee8d5f154f140685dddc8644ff04770be96fbb8bc2a6020e6d10b6daf60962454775c995806c1c7b669d867af88f1928e63f41996f3f85cb9 SHA512 5fad2f32be19bae829f92b3d1f307858c4cd26574dfc2be3ce47728b4c361f090b26cb2a541c63902f65395182cece49c82d39987644eeebe1bc11eb9a58fc48
diff --git a/dev-debug/gprofng-gui/gprofng-gui-1.1.ebuild b/dev-debug/gprofng-gui/gprofng-gui-1.1.ebuild
new file mode 100644
index 000000000000..a97566fb7708
--- /dev/null
+++ b/dev-debug/gprofng-gui/gprofng-gui-1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Full-fledged graphical interface to operate gprofng"
+HOMEPAGE="https://www.gnu.org/software/gprofng-gui/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/gprofng-gui.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://gnu/gprofng-gui/${P}.tar.gz"
+	S="${WORKDIR}/${P}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND="
+	sys-devel/binutils:*[gprofng(-)]
+	>=virtual/jre-1.8:*
+"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	java-pkg-2_src_prepare
+}
diff --git a/dev-debug/gprofng-gui/gprofng-gui-9999.ebuild b/dev-debug/gprofng-gui/gprofng-gui-9999.ebuild
new file mode 100644
index 000000000000..a97566fb7708
--- /dev/null
+++ b/dev-debug/gprofng-gui/gprofng-gui-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Full-fledged graphical interface to operate gprofng"
+HOMEPAGE="https://www.gnu.org/software/gprofng-gui/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/gprofng-gui.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://gnu/gprofng-gui/${P}.tar.gz"
+	S="${WORKDIR}/${P}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND="
+	sys-devel/binutils:*[gprofng(-)]
+	>=virtual/jre-1.8:*
+"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	java-pkg-2_src_prepare
+}
diff --git a/dev-debug/gprofng-gui/metadata.xml b/dev-debug/gprofng-gui/metadata.xml
new file mode 100644
index 000000000000..56ab0052cdce
--- /dev/null
+++ b/dev-debug/gprofng-gui/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>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="savannah">gprofng-gui</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-debug/kdbg/Manifest b/dev-debug/kdbg/Manifest
index 6c598e48c73d..4b48fcff287b 100644
--- a/dev-debug/kdbg/Manifest
+++ b/dev-debug/kdbg/Manifest
@@ -1,2 +1 @@
-DIST kdbg-3.0.1.tar.gz 431143 BLAKE2B 869bf9765650b2a4a2330f99303b51f599df764848ff18442c8c6813421fece2671e5e78a0e8c66a59bd77f06a7f02677ec08a49fb9a28874b92b0f84bf8f74f SHA512 9f3e0073bf37e56fa8ad0c3ae5f0be80331d8963b564ff376aee40c3ccebab5b5a482c31f110fd0f4dd14f9614cff31102d8edf62ffb33f4ae361d24346543ea
 DIST kdbg-3.1.0.tar.gz 444052 BLAKE2B d0083094f8ba3cb374b2df4a20b7697ddae4fb24579e18d883701a5e826e86041a8cdb7bd1919c881bc149c49e764221eb246d98bcebacbffbdb5e0f83264ad6 SHA512 e7da5bb1a4882b031077bd4344c6795b058088eb9a00ef3a2ba9c3d72c0a022bb16822525369ca7bcfb623c775cf73140caa114c1591d37f1d6f6a3b22ae649b
diff --git a/dev-debug/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch b/dev-debug/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch
deleted file mode 100644
index 44a2b33623f4..000000000000
--- a/dev-debug/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0feb0986f220126177084badf67813ccdbaa996c Mon Sep 17 00:00:00 2001
-From: Daniels Umanovskis <daniels@umanovskis.se>
-Date: Fri, 13 Mar 2020 13:48:19 +0100
-Subject: [PATCH] Fix a rare memory leak in the register display window
-
----
- kdbg/regwnd.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kdbg/regwnd.cpp b/kdbg/regwnd.cpp
-index edb0e55..93008f9 100644
---- a/kdbg/regwnd.cpp
-+++ b/kdbg/regwnd.cpp
-@@ -274,11 +274,12 @@ static char* toRaw(const QString& hex, uint& length)
-     static bool littleendian=(*testChar==1);
- 
-     length=((hex.length()-2)%2)+((hex.length()-2)/2);
-+    if (hex.length()<=2) return 0;
-+
-     char* data=new char[length];
- 
-     if (littleendian) {
- 	uint j=0;
--	if (hex.length()<=2) return 0;
- 	for (int i=hex.length()-1; i>=2; ) {
- 	    if (j%2==0)
- 		data[j/2]=hexCharToDigit(hex[i].toLatin1());
-@@ -288,7 +289,6 @@ static char* toRaw(const QString& hex, uint& length)
- 	}
-     } else { // big endian
- 	uint j=0;
--	if (hex.length()<=2) return 0;
- 	for (int i=2; i<hex.length(); ) {
- 	    if (j%2==0)
- 		data[j/2]=hexCharToDigit(hex[i].toLatin1())<<4;
diff --git a/dev-debug/kdbg/files/kdbg-3.0.1-usable-trace.patch b/dev-debug/kdbg/files/kdbg-3.0.1-usable-trace.patch
deleted file mode 100644
index 8336d2d53255..000000000000
--- a/dev-debug/kdbg/files/kdbg-3.0.1-usable-trace.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8f2add1046c2d23294496bc0bc7c00d18c6aa0a2 Mon Sep 17 00:00:00 2001
-From: Daniels Umanovskis <daniels@umanovskis.se>
-Date: Fri, 13 Mar 2020 16:23:02 +0100
-Subject: [PATCH] Change output for a trace so that trace is actually usable
- again
-
----
- kdbg/debugger.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdbg/debugger.cpp b/kdbg/debugger.cpp
-index 3751e4c..7d43eb9 100644
---- a/kdbg/debugger.cpp
-+++ b/kdbg/debugger.cpp
-@@ -2225,7 +2225,7 @@ void KDebugger::slotValueEdited(VarTree* expr, const QString& text)
- 
-     ExprWnd* wnd = static_cast<ExprWnd*>(expr->treeWidget());
-     TRACE(QString().sprintf("Changing %s to ",
--			    wnd->name()) + text);
-+			    wnd->exprList().join(" ")) + text);
- 
-     // determine the lvalue to edit
-     QString lvalue = expr->computeExpr();
diff --git a/dev-debug/kdbg/kdbg-3.0.1-r1.ebuild b/dev-debug/kdbg/kdbg-3.0.1-r1.ebuild
deleted file mode 100644
index 7bfbeb8b5914..000000000000
--- a/dev-debug/kdbg/kdbg-3.0.1-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_HANDBOOK="true"
-KFMIN=5.85.0
-QTMIN=5.15.2
-inherit ecm
-
-DESCRIPTION="Graphical debugger interface"
-HOMEPAGE="https://www.kdbg.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-debug/gdb
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-rare-memleak.patch
-	"${FILESDIR}"/${P}-usable-trace.patch
-)
-
-src_prepare() {
-	# allow documentation to be handled by eclass
-	mv kdbg/doc . || die
-	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
-	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
-
-	ecm_src_prepare
-}
diff --git a/dev-debug/lldb/Manifest b/dev-debug/lldb/Manifest
index 199e0e69f022..b0b9875fe54e 100644
--- a/dev-debug/lldb/Manifest
+++ b/dev-debug/lldb/Manifest
@@ -1,3 +1,4 @@
+DIST llvm-gentoo-patchset-18.1.8-r5.tar.xz 16528 BLAKE2B 9e094c3907ec9ca9a4f856af1b62c2d093bca4528badc4fc2d7109e1bc41d4a05219844ca434bf6d3a364f513c9ccae9120bb21739efa5674ce7dc40ba2a93b1 SHA512 5e714fc64c1d1246ae61e79310a02f58e06adaac6a7fc41ed5982bd2254586340597952633d3577e15b1246ac1417dd3f017d9757813d87daa9b82111fe57a59
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@@ -6,7 +7,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/dev-debug/lldb/lldb-18.1.8.ebuild b/dev-debug/lldb/lldb-18.1.8.ebuild
index 341bbe2f8140..3c13e49f375d 100644
--- a/dev-debug/lldb/lldb-18.1.8.ebuild
+++ b/dev-debug/lldb/lldb-18.1.8.ebuild
@@ -49,6 +49,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_PATCHSET=${PV}-r5
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
diff --git a/dev-debug/lldb/lldb-19.1.0_rc2.ebuild b/dev-debug/lldb/lldb-19.1.0_rc4.ebuild
index c79bdcdf6f3d..c79bdcdf6f3d 100644
--- a/dev-debug/lldb/lldb-19.1.0_rc2.ebuild
+++ b/dev-debug/lldb/lldb-19.1.0_rc4.ebuild
diff --git a/dev-debug/lldb/lldb-20.0.0_pre20240808.ebuild b/dev-debug/lldb/lldb-20.0.0_pre20240830.ebuild
index c79bdcdf6f3d..c79bdcdf6f3d 100644
--- a/dev-debug/lldb/lldb-20.0.0_pre20240808.ebuild
+++ b/dev-debug/lldb/lldb-20.0.0_pre20240830.ebuild
diff --git a/dev-debug/lldb/lldb-20.0.0_pre20240815.ebuild b/dev-debug/lldb/lldb-20.0.0_pre20240910.ebuild
index c79bdcdf6f3d..c79bdcdf6f3d 100644
--- a/dev-debug/lldb/lldb-20.0.0_pre20240815.ebuild
+++ b/dev-debug/lldb/lldb-20.0.0_pre20240910.ebuild
diff --git a/dev-debug/pwndbg/Manifest b/dev-debug/pwndbg/Manifest
index 838c10a82a44..0ebbe8c1a60b 100644
--- a/dev-debug/pwndbg/Manifest
+++ b/dev-debug/pwndbg/Manifest
@@ -1,3 +1,2 @@
-DIST gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz 385989 BLAKE2B b7582289f83fd0c76b8ef2a04540db979b0f599b6b711e17541e2804b93bcffe6fd611d43101c96644a7324398eea5df02326267b4e201564929de956849b719 SHA512 57701b5fdd4c69be79a451f08fa6d7cbd43a0963cfd7689443676b68ece96154ccb61121d4a770d6e519d3142f99c589df1143b0ff8308547c06fb0e87e187db
-DIST pwndbg-20230717.tar.gz 8392017 BLAKE2B e373a7408366090f58385dac8dfcdd13702c475117a35158a1a149d149c9a2cbf5f2702be33aeab537451cfd990b5253e9bc0283fa5ae197c9cceb680e65a724 SHA512 d261ed992327d62b0b3e7cc002d3185435748e27cc2ce0085d438848ef1bdb0b3921ae5c1ce19c25e49d52b10f8340eb67c4e05fc197d2adeb888b47e2c158ba
 DIST pwndbg-20240214.tar.gz 8536795 BLAKE2B 75524fb9f701769f2a117b4aa1158f648cd854fd38475c20bee4b7ae27ae8f331c40367738a467dd5c7f8994ac80efd3290a64e59ffb9e5a240546be8fb1c6e8 SHA512 3d55e762cecd2b42b9debb36f3ee0a8983be744192d4c1a0424517b0fd8ae8fb329197228a88ddd726e640f1bcd0e0bcdc7e95a64e041630e20cfcbf6acff1aa
+DIST pwndbg-20240829.tar.gz 8649207 BLAKE2B 5333c318ba3ccbaaac459f9c7b917d3defa1ad712f45555b31eb76774089e55e80720744dc92813ad8234302445e3bed3237c2275c795a49856028dec416dcc2 SHA512 503924742d4a6d767ec369bb1e37c931afb5ab09f2b4cfa048765ce7a61fb6adcda2576cdda64dd4cf74de27d83b13b4dc09d6e7480e01ae8f646c5394992d43
diff --git a/dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch b/dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch
deleted file mode 100644
index 4011236240f9..000000000000
--- a/dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6a351680675123ccc0d8fb192f28f3c654979c92 Mon Sep 17 00:00:00 2001
-From: Stefan Gloor <code@stefan-gloor.ch>
-Date: Tue, 28 Nov 2023 20:24:26 +0100
-Subject: [PATCH] Use global python packages instead of virtualenv
-Bug: https://bugs.gentoo.org/918705
-
-The upstream install script creates a .venv and installs the
-dependencies there. This patch allows the normal python packages to be
-used.
-
-Signed-off-by: Stefan Gloor <code@stefan-gloor.ch>
---- a/gdbinit.py
-+++ b/gdbinit.py
-@@ -20,29 +20,6 @@ directory, file = path.split(__file__)
- directory = path.expanduser(directory)
- directory = path.abspath(directory)
- 
--# Get virtualenv's site-packages path
--venv_path = os.environ.get("PWNDBG_VENV_PATH")
--if not venv_path:
--    venv_path = os.path.join(directory, ".venv")
--
--if not os.path.exists(venv_path):
--    print(f"Cannot find Pwndbg virtualenv directory: {venv_path}: please re-run setup.sh")
--    sys.exit(1)
--
--site_pkgs_path = glob(os.path.join(venv_path, "lib/*/site-packages"))[0]
--
--# add virtualenv's site-packages to sys.path and run .pth files
--site.addsitedir(site_pkgs_path)
--
--# remove existing, system-level site-packages from sys.path
--for site_packages in site.getsitepackages():
--    if site_packages in sys.path:
--        sys.path.remove(site_packages)
--
--# Set virtualenv's bin path (needed for utility tools like ropper, pwntools etc)
--bin_path = os.path.join(venv_path, "bin")
--os.environ["PATH"] = bin_path + os.pathsep + os.environ.get("PATH")
--
- # Add gdb-pt-dump directory to sys.path so it can be imported
- gdbpt = path.join(directory, "gdb-pt-dump")
- sys.path.append(directory)
--- 
-2.41.0
-
diff --git a/dev-debug/pwndbg/pwndbg-20230717-r1.ebuild b/dev-debug/pwndbg/pwndbg-20230717-r1.ebuild
deleted file mode 100644
index 78a314abc39d..000000000000
--- a/dev-debug/pwndbg/pwndbg-20230717-r1.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-single-r1 wrapper
-
-DESCRIPTION="A GDB plug-in that makes debugging with GDB suck less"
-HOMEPAGE="https://github.com/pwndbg/pwndbg"
-
-if [[ ${PV} == "99999999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
-else
-	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-	GDB_PT_DUMP_COMMIT="ebdc24573a4bf075cf3ab6016add9db6baacf977"
-	SRC_URI="
-		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
-	"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-debug/gdb[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-libs/capstone-5.0_rc4[python,${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
-		>=dev-python/pycparser-2.21[${PYTHON_USEDEP}]
-		>=dev-python/pyelftools-0.29[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.15.1[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
-		>=dev-util/pwntools-4.10.0[${PYTHON_USEDEP}]
-		>=dev-util/ROPgadget-7.2[${PYTHON_USEDEP}]
-		>=dev-util/unicorn-2.0.1[python,${PYTHON_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-venv.patch"	# Bug 918705
-)
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		rm -r gdb-pt-dump/.git || die
-	else
-		sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \
-			-i pwndbg/lib/version.py || die
-
-		rm -r gdb-pt-dump || die
-		mv "${WORKDIR}/gdb-pt-dump-${GDB_PT_DUMP_COMMIT}" gdb-pt-dump || die
-	fi
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r pwndbg/ gdbinit.py # ida_script.py
-	doins -r gdb-pt-dump/
-
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper "pwndbg" \
-		"gdb -x \"${EPREFIX}/usr/share/${PN}/gdbinit.py\"" || die
-
-	dodoc {README,DEVELOPING,FEATURES}.md
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "\nUsage:"
-		einfo "    ~$ pwndbg <program>"
-		ewarn "\nWARNING!!!"
-		ewarn "Some pwndbg commands only works with libc debug symbols.\n"
-		ewarn "See also:"
-		ewarn " * https://github.com/pentoo/pentoo-overlay/issues/521#issuecomment-548975884"
-		ewarn " * https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html"
-		ewarn " * https://wiki.gentoo.org/wiki/Debugging"
-	fi
-}
diff --git a/dev-debug/pwndbg/pwndbg-20240829.ebuild b/dev-debug/pwndbg/pwndbg-20240829.ebuild
new file mode 100644
index 000000000000..d15962d258f3
--- /dev/null
+++ b/dev-debug/pwndbg/pwndbg-20240829.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 wrapper
+
+DESCRIPTION="A GDB plug-in that makes debugging with GDB suck less"
+HOMEPAGE="https://github.com/pwndbg/pwndbg"
+
+if [[ ${PV} == "99999999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
+else
+	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
+	SRC_URI="https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-debug/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/gdb-pt-dump-0.0.0_p20240401[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/capstone-5.0.2[python,${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.8[${PYTHON_USEDEP}]
+		>=dev-python/pycparser-2.22[${PYTHON_USEDEP}]
+		>=dev-python/pyelftools-0.29[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.18.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.32.3[${PYTHON_USEDEP}]
+		>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.12.0[${PYTHON_USEDEP}]
+		>=dev-util/pwntools-4.13.0[${PYTHON_USEDEP}]
+		>=dev-util/ROPgadget-7.3[${PYTHON_USEDEP}]
+		>=dev-util/unicorn-2.0.1[python,${PYTHON_USEDEP}]
+	')
+"
+
+# Tests are architectur-specific (precompiled binaries)
+RESTRICT="test"
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/${PN}
+	doins gdbinit.py
+
+	# Signal pwndbg not to create it's own python venv (Bug #918705).
+	# See: https://github.com/pwndbg/pwndbg/commit/139b7542cd9567eaff32bd713df971b6ac5b81de
+	touch "${ED}/usr/share/${PN}/.skip-venv" || die
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "pwndbg" \
+		"gdb -x \"${EPREFIX}/usr/share/${PN}/gdbinit.py\"" || die
+
+	dodoc {README,DEVELOPING,FEATURES}.md
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo "\nUsage:"
+		einfo "    ~$ pwndbg <program>"
+		ewarn "\nWARNING!!!"
+		ewarn "Some pwndbg commands only works with libc debug symbols.\n"
+		ewarn "See also:"
+		ewarn " * https://github.com/pentoo/pentoo-overlay/issues/521#issuecomment-548975884"
+		ewarn " * https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html"
+		ewarn " * https://wiki.gentoo.org/wiki/Debugging"
+	fi
+}
diff --git a/dev-debug/pwndbg/pwndbg-99999999.ebuild b/dev-debug/pwndbg/pwndbg-99999999.ebuild
index 20a51614142c..212d1aa4a3ed 100644
--- a/dev-debug/pwndbg/pwndbg-99999999.ebuild
+++ b/dev-debug/pwndbg/pwndbg-99999999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "99999999" ]]; then
 else
 	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
 	SRC_URI="https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/dev-debug/scap-driver/Manifest b/dev-debug/scap-driver/Manifest
index 7d0200368674..751a4b17702b 100644
--- a/dev-debug/scap-driver/Manifest
+++ b/dev-debug/scap-driver/Manifest
@@ -1,2 +1,3 @@
 DIST falcosecurity-libs-0.17.2.tar.gz 4424458 BLAKE2B cbe3a689d3d93a6896b94fd54b35665b11263c07690a36d40617651f97806b0177af657824f62259df95a984d598a34c17ff942c73e3abd774569607dc22380f SHA512 8bb449d91c12225c08d678ea9a8e97a5b5e8828788b56d5b83ec3b3c6ad5e25d4f56120dba523ac9c593d02ee155026e2d4d47587be6f73f373f06fe7ddc2a0c
+DIST falcosecurity-libs-0.17.3.tar.gz 4425090 BLAKE2B 3d6300bba2303715581d9b35f63e453f85a3889fa93233d3b1ca69f6ba92b33e0a7d90bbd160b765487b44771a1d94f5a1fb380cf4e5130506a885471dddb7e7 SHA512 05707c404bdd45c2e944b903dbbc1e5e0e5991a3d4cbe9ea357efb35b5ad0c4ede7cdd7b056a7dde2543cc2c0b8d5d3b42606202128b7287a80a1da686de169e
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
diff --git a/dev-debug/scap-driver/scap-driver-0.17.3.ebuild b/dev-debug/scap-driver/scap-driver-0.17.3.ebuild
new file mode 100644
index 000000000000..4f288f35054a
--- /dev/null
+++ b/dev-debug/scap-driver/scap-driver-0.17.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod-r1
+
+DESCRIPTION="Kernel module for dev-debug/sysdig"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/falcosecurity/libs/archive/${PV}.tar.gz -> falcosecurity-libs-${PV}.tar.gz"
+S="${WORKDIR}/libs-${PV}"
+
+LICENSE="Apache-2.0 GPL-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND="!<dev-debug/sysdig-${PV}[modules]"
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+# We need to specify the driver version manually since we do not use a git tree.
+# This version can be found in the corresponding *sysdig* tree in cmake/modules/driver.cmake
+DRIVER_VERSION="7.2.0+driver"
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod, so just pretend to use bundled deps
+		# in order to make it through the cmake setup.
+		-DUSE_BUNDLED_DEPS=ON
+		-DCREATE_TEST_TARGETS=OFF
+		-DDRIVER_VERSION="${DRIVER_VERSION}"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local modlist=( scap=:"${BUILD_DIR}"/driver/src )
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
diff --git a/dev-debug/strace/Manifest b/dev-debug/strace/Manifest
index 5fe3185d767f..eb0dbf1c861d 100644
--- a/dev-debug/strace/Manifest
+++ b/dev-debug/strace/Manifest
@@ -1,3 +1,4 @@
+DIST strace-6.10.tar.xz 2600864 BLAKE2B acb26ed66fbfcb1bc6403441b632df2f7af018345e52120b8715e2bbfa578fc80af8e3844cba3e131601285f9e72b15c8b4ea56025c5efae846d2d36960f6c04 SHA512 0d7dafaa50fbcfebc37f37e53c2961972efd66ce0d71628fbcd2a8b871cb7e90bb3aebca14258a5a3115ae1e00cbe242b6d2f887d45f44e7321985720968f972
 DIST strace-6.6.tar.xz 2420364 BLAKE2B f1465fec58ac20ccce6a88441a34b1402e5c51f0bb4b7963f69b5ab5019a8c8722e3406c6f93c10c1eea11d17de7f9874895d6f4df24cf9ec42a18f36267687b SHA512 77ea45c72e513f6c07026cd9b2cc1a84696a5a35cdd3b06dd4a360fb9f9196958e3f6133b4a9c91e091c24066ba29e0330b6459d18a9c390caae2dba97ab399b
 DIST strace-6.7.tar.xz 2434880 BLAKE2B 249c149a9140fc79be1365e4e8697b46f6558334eefac11b51c96d2d2e67bb82cb2eac3c38c2fa31f40fc5e0ad3c52967e15a034c01c12ed041d51f006a194ae SHA512 da28fd9fb987044782e6fd6f5e90e2cea2ab8e536cbd3893ef4c9b11c9b3185f073ca3d8ca0eade49e9a2af8efbda8c2b66b8988be7ebc463dc45e8f48ca1256
 DIST strace-6.8.tar.xz 2457948 BLAKE2B 0897aedc6a1ed162b8967a56d54dd0bc589ce027321c1219e5fc23e6a44103576e0f363f79a03def365a05989173271eb6096a9c48b16cdf8c54033ec6bd6f2a SHA512 c477724a77112a74a5236a38b7dbaa9b6199622a1d21cc6253cac80dc4ddea78aeaf8cddf4a51ee4119e00e1adaf95f64f64e20d9775ec3edd77cd82c8f7b30e
diff --git a/dev-debug/strace/strace-6.10.ebuild b/dev-debug/strace/strace-6.10.ebuild
new file mode 100644
index 000000000000..b7477dfde2ee
--- /dev/null
+++ b/dev-debug/strace/strace-6.10.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="Useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1+ test? ( GPL-2+ )"
+SLOT="0"
+IUSE="aio perl selinux static test unwind elfutils"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.5-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}
diff --git a/dev-debug/sysdig/Manifest b/dev-debug/sysdig/Manifest
index 8685c6b8bc09..6e009591dfe2 100644
--- a/dev-debug/sysdig/Manifest
+++ b/dev-debug/sysdig/Manifest
@@ -1,4 +1,5 @@
 DIST falcosecurity-libs-0.17.2.tar.gz 4424458 BLAKE2B cbe3a689d3d93a6896b94fd54b35665b11263c07690a36d40617651f97806b0177af657824f62259df95a984d598a34c17ff942c73e3abd774569607dc22380f SHA512 8bb449d91c12225c08d678ea9a8e97a5b5e8828788b56d5b83ec3b3c6ad5e25d4f56120dba523ac9c593d02ee155026e2d4d47587be6f73f373f06fe7ddc2a0c
+DIST falcosecurity-libs-0.17.3.tar.gz 4425090 BLAKE2B 3d6300bba2303715581d9b35f63e453f85a3889fa93233d3b1ca69f6ba92b33e0a7d90bbd160b765487b44771a1d94f5a1fb380cf4e5130506a885471dddb7e7 SHA512 05707c404bdd45c2e944b903dbbc1e5e0e5991a3d4cbe9ea357efb35b5ad0c4ede7cdd7b056a7dde2543cc2c0b8d5d3b42606202128b7287a80a1da686de169e
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
 DIST sysdig-0.38.1.tar.gz 67528905 BLAKE2B 9b0e0f337bf64df200b44f7e23c64d00477d6ebfb2bc995dcb04951c8e25fb9274431022b8fa54f54851436f063b79d1268045ba686e97fb0195922bc8dfcf28 SHA512 17275c029368b203ec590cf448a33275bd6c20b81be77edcd393f1a3c04e6c4714c7286b6268823bb0c629d52a88cd97f7b3ef588bd10a000b65de23eb5b5a45
diff --git a/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild b/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild
new file mode 100644
index 000000000000..1c03185f156d
--- /dev/null
+++ b/dev-debug/sysdig/sysdig-0.38.1-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit bash-completion-r1 cmake flag-o-matic lua-single
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+
+# The version of falcosecurity-libs required by sysdig as source tree
+LIBS_VERSION="0.17.3"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/falcosecurity/libs/archive/${LIBS_VERSION}.tar.gz -> falcosecurity-libs-${LIBS_VERSION}.tar.gz"
+
+# The driver version as found in cmake/modules/driver.cmake
+DRIVER_VERSION="7.2.0+driver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+modules"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	dev-cpp/abseil-cpp:=
+	dev-cpp/tbb:=
+	dev-cpp/yaml-cpp:=
+	dev-libs/jsoncpp:=
+	dev-libs/libb64:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+	dev-libs/uthash
+	net-libs/grpc:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/zlib:=
+	virtual/libelf:="
+
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-cpp/valijson
+	virtual/os-headers"
+
+# pin the driver to the falcosecurity-libs version
+PDEPEND="modules? ( =dev-debug/scap-driver-${LIBS_VERSION}* )"
+
+PATCHES=( "${FILESDIR}/${PV}-scap-loader.patch" )
+
+src_prepare() {
+	# manually apply patches to falcosecurity-libs dependency
+	pushd "${WORKDIR}/libs-${LIBS_VERSION}"
+		# musl has no libanl (#929227)
+		if [ ${ELIBC} == "musl" ] ; then
+			eapply "${FILESDIR}/${PV}-libs-no-libanl.patch" || die
+		fi
+	popd
+
+	# do not build with debugging info
+	sed -i -e 's/-ggdb//g' CMakeLists.txt "${WORKDIR}"/libs-${LIBS_VERSION}/cmake/modules/CompilerFlags.cmake || die
+
+	# fix the driver version
+	sed -i -e 's/0.0.0-local/${DRIVER_VERSION}/g' cmake/modules/driver.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# known problems with strict aliasing:
+	# https://github.com/falcosecurity/libs/issues/1964
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# do not build the kernel driver
+		-DBUILD_DRIVER=OFF
+
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# do not build internal libs as shared
+		-DBUILD_SHARED_LIBS=OFF
+
+		# do not build eBPF driver for now
+		-DBUILD_SYSDIG_MODERN_BPF=OFF
+
+		# set driver version to prevent downloading (don't ask..)
+		-DDRIVER_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION}/driver
+		-DDRIVER_VERSION=${DRIVER_VERSION}
+
+		# point sysdig to the libs tree
+		-DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_VERSION}
+
+		# explicitly set sysdig version - required for some reason
+		-DSYSDIG_VERSION=${PV}
+
+		# do not use bundled dependencies for sysdig
+		-DUSE_BUNDLED_DEPS=OFF
+
+		# do not use bundled dependencies for falcosecurity-libs
+		-DUSE_BUNDLED_B64=OFF
+		-DUSE_BUNDLED_JSONCPP=OFF
+		-DUSE_BUNDLED_RE2=OFF
+		-DUSE_BUNDLED_TBB=OFF
+		-DUSE_BUNDLED_VALIJSON=OFF
+
+		# set valijson include path to prevent downloading
+		-DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include
+
+		# enable chisels
+		-DWITH_CHISEL=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove driver headers
+	rm -r "${ED}"/usr/src || die
+
+	# remove libscap/libsinsp headers & libs (see #938187)
+	rm -r "${ED}"/usr/include/sysdig || die
+	rm -r "${ED}"/usr/$(get_libdir) || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-debug/sysdig/sysdig-0.38.1.ebuild b/dev-debug/sysdig/sysdig-0.38.1.ebuild
index 937c2a94f1eb..be7cf88d7db3 100644
--- a/dev-debug/sysdig/sysdig-0.38.1.ebuild
+++ b/dev-debug/sysdig/sysdig-0.38.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( luajit )
 
-inherit bash-completion-r1 cmake lua-single
+inherit bash-completion-r1 cmake flag-o-matic lua-single
 
 DESCRIPTION="A system exploration and troubleshooting tool"
 HOMEPAGE="https://sysdig.com/"
diff --git a/dev-debug/systemtap/Manifest b/dev-debug/systemtap/Manifest
index fbcc54ede583..56cedb336373 100644
--- a/dev-debug/systemtap/Manifest
+++ b/dev-debug/systemtap/Manifest
@@ -1,2 +1,3 @@
 DIST systemtap-4.8.tar.gz 5628003 BLAKE2B 9f5050eba29d390c907b117187f94ef088f16bb739b4971bc32ffe88b1024a4157cd4e9793a8fc1e149a5a182a28330e3b4fd9d51213bb3637d616fbb9867f6d SHA512 fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2
 DIST systemtap-5.0.tar.gz 6572411 BLAKE2B db962df2fdcbc5bc11259c03d78073924f03fee4434dca8686a62fcb0818dab1ca91558160dd9d67d43b709f63ffe4f0af30ab1fe6965e19155bdd4c04501a04 SHA512 dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c
+DIST systemtap-5.1.tar.gz 6590820 BLAKE2B 22be535b7c55d0ab90a5361a23fad93c436560c14fbbd345aca7ea2c0fcdd0f66b1ef8591800f86a14cc7ae7fe737a120695d76fe15bfdb8b349080228c37e90 SHA512 da0fe237d2124031a5786d1221dbb420d90da5497376715fd43a7a9f61a354a229c1128e67ce6becbc012aa3796dc5d337149e239e3c1def0651b179e5bf199f
diff --git a/dev-debug/systemtap/metadata.xml b/dev-debug/systemtap/metadata.xml
index 4a3d4007cae0..eb938ea4fd71 100644
--- a/dev-debug/systemtap/metadata.xml
+++ b/dev-debug/systemtap/metadata.xml
@@ -5,6 +5,11 @@
   <email>swegener@gentoo.org</email>
 </maintainer>
   <use>
+    <flag name="debuginfod">Enable debuginfod support via <pkg>dev-libs/elfutils</pkg> libdebuginfod</flag>
+    <flag name="dtrace-symlink">
+        Provide /usr/bin/dtrace symlink pointing to /usr/bin/stap-dtrace.
+        This prevents coinstallation with <pkg>dev-debug/dtrace</pkg>.
+    </flag>
     <flag name="libvirt">Support probing of libvirt domains.</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-debug/systemtap/systemtap-4.8.ebuild b/dev-debug/systemtap/systemtap-4.8.ebuild
index 203f02f9b82c..7349ac27d462 100644
--- a/dev-debug/systemtap/systemtap-4.8.ebuild
+++ b/dev-debug/systemtap/systemtap-4.8.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit autotools linux-info python-single-r1
 
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/"
+SRC_URI="https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-debug/systemtap/systemtap-5.0-r1.ebuild b/dev-debug/systemtap/systemtap-5.0-r1.ebuild
index e3e98ce134ac..8461ac0c4eb8 100644
--- a/dev-debug/systemtap/systemtap-5.0-r1.ebuild
+++ b/dev-debug/systemtap/systemtap-5.0-r1.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit autotools linux-info python-single-r1
 
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/"
+SRC_URI="https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-debug/systemtap/systemtap-5.1-r1.ebuild b/dev-debug/systemtap/systemtap-5.1-r1.ebuild
new file mode 100644
index 000000000000..7bdeaac6c062
--- /dev/null
+++ b/dev-debug/systemtap/systemtap-5.1-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/ https://sourceware.org/systemtap/wiki"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/systemtap.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	dev-libs/boost:=
+	>=dev-libs/elfutils-0.142[debuginfod?]
+	dev-libs/json-c:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="
+	${CDEPEND}
+	app-alternatives/cpio
+	app-text/xmlto
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	>=sys-devel/gettext-0.18.2
+
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+# which: https://sourceware.org/PR32106
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		|| (
+			net-analyzer/netcat
+			net-analyzer/openbsd-netcat
+		)
+		sys-apps/which
+	)
+"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1-ia64.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's#$(INSTALL_DATA) $(srcdir)/stap-exporter.options "$(DESTDIR)$(sysconfdir)/sysconfig/stap-exporter"##g' \
+		stap-exporter/Makefile.am || die "Failed to modify stap-exporter Makefile.am"
+	sed -i \
+		-e '\#^EnvironmentFile=-/etc/sysconfig/stap-exporter#d' \
+		-e 's#$PORT $KEEPALIVE $SCRIPTS $OPTIONS#--port 9900 --keepalive 300#g' \
+		stap-exporter/stap-exporter.service || die "Failed to adapt stap-exporter.service"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--disable-Werror
+		# Our toolchain sets this for us already and adding in
+		# -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
+		# This option (at least as of 4.5) doesn't pass -fno* etc,
+		# it just doesn't _add_ options, which is good. If it changes
+		# to actually pass -fno-stack-protector and friends, we'll
+		# need to change course. Forcing =2 also has problems for
+		# setting it to 3.
+		# bug #794667.
+		--disable-ssp
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with debuginfod)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+
+	# Use bash because of bashisms with brace expansion in Makefile.am
+	# https://sourceware.org/PR32105
+	CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# TODO: Install tests like dev-debug/dtrace[test-install] and
+	# e.g. Fedora does.
+	(
+		strip-flags
+		filter-flags '-fcf-protection=*'
+		filter-flags '-fdiagnostics-color=*' '-fdiagnostics-urls=*'
+		filter-flags '-g*'
+		filter-lto
+		tc-ld-force-bfd
+		emake -Onone -k check CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	)
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Avoid file collision with dev-debug/dtrace
+	mv "${ED}"/usr/bin/dtrace "${ED}"/usr/bin/stap-dtrace || die
+
+	if use dtrace-symlink ; then
+		dosym stap-dtrace /usr/bin/dtrace
+	fi
+}
diff --git a/dev-debug/systemtap/systemtap-5.1.ebuild b/dev-debug/systemtap/systemtap-5.1.ebuild
new file mode 100644
index 000000000000..fbe559a2469a
--- /dev/null
+++ b/dev-debug/systemtap/systemtap-5.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/systemtap.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debuginfod libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	dev-libs/boost:=
+	>=dev-libs/elfutils-0.142[debuginfod?]
+	dev-libs/json-c:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="
+	${CDEPEND}
+	app-alternatives/cpio
+	app-text/xmlto
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	>=sys-devel/gettext-0.18.2
+
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+# which: https://sourceware.org/PR32106
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		|| (
+			net-analyzer/netcat
+			net-analyzer/openbsd-netcat
+		)
+		sys-apps/which
+	)
+"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1-ia64.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's#$(INSTALL_DATA) $(srcdir)/stap-exporter.options "$(DESTDIR)$(sysconfdir)/sysconfig/stap-exporter"##g' \
+		stap-exporter/Makefile.am || die "Failed to modify stap-exporter Makefile.am"
+	sed -i \
+		-e '\#^EnvironmentFile=-/etc/sysconfig/stap-exporter#d' \
+		-e 's#$PORT $KEEPALIVE $SCRIPTS $OPTIONS#--port 9900 --keepalive 300#g' \
+		stap-exporter/stap-exporter.service || die "Failed to adapt stap-exporter.service"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--disable-Werror
+		# Our toolchain sets this for us already and adding in
+		# -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
+		# This option (at least as of 4.5) doesn't pass -fno* etc,
+		# it just doesn't _add_ options, which is good. If it changes
+		# to actually pass -fno-stack-protector and friends, we'll
+		# need to change course. Forcing =2 also has problems for
+		# setting it to 3.
+		# bug #794667.
+		--disable-ssp
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with debuginfod)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+
+	# Use bash because of bashisms with brace expansion in Makefile.am (bug #913947)
+	CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# TODO: Install tests like dev-debug/dtrace[test-install] and
+	# e.g. Fedora does.
+	(
+		strip-flags
+		filter-flags '-fcf-protection=*'
+		filter-flags '-fdiagnostics-color=*' '-fdiagnostics-urls=*'
+		filter-flags '-g*'
+		filter-lto
+		tc-ld-force-bfd
+		emake -Onone -k check CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	)
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/dev-debug/systemtap/systemtap-9999.ebuild b/dev-debug/systemtap/systemtap-9999.ebuild
new file mode 100644
index 000000000000..9d0ddd4fb4aa
--- /dev/null
+++ b/dev-debug/systemtap/systemtap-9999.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/ https://sourceware.org/systemtap/wiki"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/systemtap.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	dev-libs/boost:=
+	>=dev-libs/elfutils-0.142[debuginfod?]
+	dev-libs/json-c:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="
+	${CDEPEND}
+	app-alternatives/cpio
+	app-text/xmlto
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	>=sys-devel/gettext-0.18.2
+
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+# which: https://sourceware.org/PR32106
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		|| (
+			net-analyzer/netcat
+			net-analyzer/openbsd-netcat
+		)
+		sys-apps/which
+	)
+"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1-ia64.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's#$(INSTALL_DATA) $(srcdir)/stap-exporter.options "$(DESTDIR)$(sysconfdir)/sysconfig/stap-exporter"##g' \
+		stap-exporter/Makefile.am || die "Failed to modify stap-exporter Makefile.am"
+	sed -i \
+		-e '\#^EnvironmentFile=-/etc/sysconfig/stap-exporter#d' \
+		-e 's#$PORT $KEEPALIVE $SCRIPTS $OPTIONS#--port 9900 --keepalive 300#g' \
+		stap-exporter/stap-exporter.service || die "Failed to adapt stap-exporter.service"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--disable-Werror
+		# Our toolchain sets this for us already and adding in
+		# -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
+		# This option (at least as of 4.5) doesn't pass -fno* etc,
+		# it just doesn't _add_ options, which is good. If it changes
+		# to actually pass -fno-stack-protector and friends, we'll
+		# need to change course. Forcing =2 also has problems for
+		# setting it to 3.
+		# bug #794667.
+		--disable-ssp
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with debuginfod)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+
+	# Use bash because of bashisms with brace expansion in Makefile.am
+	# https://sourceware.org/PR32105
+	CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# TODO: Install tests like dev-debug/dtrace[test-install] and
+	# e.g. Fedora does.
+	(
+		strip-flags
+		filter-flags '-fcf-protection=*'
+		filter-flags '-fdiagnostics-color=*' '-fdiagnostics-urls=*'
+		filter-flags '-g*'
+		filter-lto
+		tc-ld-force-bfd
+		emake -Onone -k check CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	)
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Avoid file collision with dev-debug/dtrace
+	mv "${ED}"/usr/bin/dtrace "${ED}"/usr/bin/stap-dtrace || die
+
+	if use dtrace-symlink ; then
+		dosym stap-dtrace /usr/bin/dtrace
+	fi
+}
diff --git a/dev-debug/valgrind/valgrind-3.22.0-r2.ebuild b/dev-debug/valgrind/valgrind-3.22.0-r2.ebuild
index 86ec190689c8..659c7970cf65 100644
--- a/dev-debug/valgrind/valgrind-3.22.0-r2.ebuild
+++ b/dev-debug/valgrind/valgrind-3.22.0-r2.ebuild
@@ -27,7 +27,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild b/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild
index bd5cb983fad2..0ee8b9865bd0 100644
--- a/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild
+++ b/dev-debug/valgrind/valgrind-3.23.0_p3.ebuild
@@ -37,7 +37,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-dotnet/dotnet-outdated/Manifest b/dev-dotnet/dotnet-outdated/Manifest
index 46a4189ea508..64fcdae477a8 100644
--- a/dev-dotnet/dotnet-outdated/Manifest
+++ b/dev-dotnet/dotnet-outdated/Manifest
@@ -1,23 +1,17 @@
-DIST castle.core.5.0.0.nupkg 797531 BLAKE2B e24ccd29030be7d337291ea670bf6909b8a58f1fc2a3c413ca2307d948445761ea479e89ea3262196677d32b12cf49c185d90d0c9d5d07ea8330f4decf0dc027 SHA512 210328587ff705f78fa46a9e1bdc07c5a8110335122d533f604bde9382b6317677a3168cb4238a45483fc38bd3d2661738f6afaecc42d170b7ba778912cfa74e
 DIST castle.core.5.1.1.nupkg 800128 BLAKE2B 28c469b65fa9898e0dd87a416b015462db1761f11429654f613541245b213ce62f77257a63770468f8019d635bef20e50e60f620359d0e39ceafbcc7bf88214c SHA512 378a149ebfaa12d00cb35bcaee8806803df7bc75980c9e0c67f36e3e057d6af2abaead24cd8274a9595c7ac74cb9597c9d6913b1125b86e6b156a66f7a1ac2fa
 DIST csvhelper.30.0.1.nupkg 717621 BLAKE2B 7461c95cf2687cb0344261a967c22c33602f2a360a18073fcfc4fcebe9513a56ab15c530683458c7c64bd2ceab4cc8c376aae01905f093f7774efb4bedc4a159 SHA512 f02de9ab8f3a99b5b6d83abc0e8eebbd65563512c3610cbdf4f433202075c342fcfe58245c3ab7735e328433e80f0d6379dbfd5fc5392df27fdaa15182a438da
-DIST dotnet-outdated-4.6.1.tar.gz 135711 BLAKE2B 36453875f01b9870723648f2a1e224476d5e5c127bdea033e0584d1dac34e5ff74bf2f3d84bad132d48281cad98a8d58d890c5a76a1f875340b763159d56e92d SHA512 0327833f60407d7ffa820df2be2c8fd1feb12b97c2fbc905fb0d8ce43fe002faee597e44dddbb2e37c3de761e69e8af1b8e40487d4f582d6a26087b8efa05970
-DIST dotnet-outdated-4.6.2.tar.gz 137021 BLAKE2B 737d0a1994fcbdb6add9ef3034f36f4d9345d0ea82d24f6a911af8004f4dc2817b4d7730dea1702e04312ca5c0408d62d2c898a8fa8a9140f0ee1dd10197f1f9 SHA512 06f41b42a223d7dd53c3c73327650202aac13b1a142433a82cee3c9672949588633ccf8e9b8d942a8ac5b49683c35028fa671eb92e88bfdfe6a5a0a01b26580a
 DIST dotnet-outdated-4.6.4.tar.gz 138005 BLAKE2B 670e46114cad0b5c93fbabfa5e8d0f1c91b82f8875f70f95f50bd5fdbc7109e9d073db6d7595c49a8b90211708c5314fe2694b7ee17de5ce5398ff8997696eb0 SHA512 005441abdbc331e231dc19a312ae9b775be2d0007ef0829ca08dd19a0bf7fc95099466fcba8d8d4bcc8d302591b10e52d4b79bcd453f1038b402978ebd3a2b4e
 DIST dotnet-xunit.2.3.1.nupkg 774955 BLAKE2B 338a47a377be9bb1edc7bebd765d2d9e740307358bd03ab3f18153f21ad00a7a3cbbb7de0341ae96c0b4355e6f3a41b0e40692d73bd1bfb67d531f054ee0c60c SHA512 2f0ee05b38a7674b4e1826a1284dbf18e2d122ae3f5f741150b318669ad1ebedb03e22a7c5c35d8b43c3a7a1a70ec8253eeb0b74915eb81309bcd998218dcdb8
 DIST libuv.1.9.0.nupkg 1270373 BLAKE2B c20e78a6c8cac53a66968af0eabeb270c84987f2e1e118325034ab07e7d08784c58b60c5ee70b3fc0cae05410da66b446e94b112eda9957bcabce1417394c053 SHA512 75fc28894498f492bdf5db6c599e40059e7a8c5417ba71bd6b4a87416b0f669611f6dd98dae1da4c0b1e076598724914514c87d4cc92ed51197e5a251b94ecc3
 DIST mcmaster.extensions.commandlineutils.4.0.2.nupkg 280825 BLAKE2B 66318edbb1103d364bd4a659bf75cbc3ac448b775abde2d5aba5a1f5e939757bd5d01d02b9e2014aa7da5284c157695159ba39e85a75de748b147ddc7cb16bf8 SHA512 d8767c2101e96f63267638acd3c21aa9b3259a32e7ee49aac5928cf84913a1f28262436adc83482b19c870dca5f734072bb3c9c7b4d23dcc779d83f7cf6b9316
-DIST microsoft.bcl.asyncinterfaces.7.0.0.nupkg 95839 BLAKE2B 057f789af840dcb18f3e2a823f8e16725fdecf93986a469544876d66854e541fcbda2031f8379fc22489d5a8a1fd9f766285b99cae88b7ef8412cb4befb0fabe SHA512 35bf41d65c4269bd0b662d228cd2c4a70e21830b745a5f1040cd43c488494b6a2d0a102d21531fc86ad89776337528eca6f0583e588996bd240ad8b334055edf
 DIST microsoft.codeanalysis.analyzers.1.1.0.nupkg 102426 BLAKE2B a0b94d8d6036e8d1da75d12c60db77f5166aadb04e179607ad850782d3a602a62f3612798120ba29edb40588ccd277f1c400f87887c42933470eb7f5454ff6f6 SHA512 12d7a033ec66d072c9249677fb0712446290991a587b180e6d18ffef0eb97b738443fe69098370984ee56eba9f6ca0bbe57d11ac59d41a32d137c7f9a6734aac
 DIST microsoft.codeanalysis.common.1.3.0.nupkg 3145733 BLAKE2B 22695ee9f2a6cd1bdb7f9a68fd9d8c1c8610580eac96b1f031c11629fdb44ebde10d3394b70af4dfc798c9e3dbd658a46af3c9abc8308eb8f5c03c53e653071b SHA512 ae29716477d0f7a34fc43298a8e71685362cef144def7d1554dcdac5efcd49686e8e03aaad411d972ebb087bd4529106683258ea201826d81aca1b8071ab218e
 DIST microsoft.codeanalysis.csharp.1.3.0.nupkg 5754312 BLAKE2B 6e1197a35a17c6c81dd58fe787555429a2af3b3bd832b951f2434e565704d8cce6f10692c79f21b74ad66773c60e144bdef7bfc4ed090c650534b30f4e68b2fe SHA512 1f08f8902b8e21c0e72ffa7d40946a028c843e1a1d510f9038304a2a8c7feefb2dcfb94697210ee28cb98c3283a06cb45751458f87e5c6fcb86fe02d1e4113c0
 DIST microsoft.codeanalysis.visualbasic.1.3.0.nupkg 6956584 BLAKE2B e2f7f898c319742e71ee02494c3fde394dfbc1773e597892f558804f322cdcd01f803fb48f80fda82ca168be0526c52fb692e3b30dac53f8d6b704af15c984a5 SHA512 141b616d7a6c7b533083271d56ce0adf23003c3328d7637e31b09a2bdd33a8357108555be7926d6486671a1bceca059e0d90bec8db8588d9673b70b1c91136c4
-DIST microsoft.codecoverage.17.8.0.nupkg 9139132 BLAKE2B b9a9e71595742023f43a50e159ae6c0ec61858b0f786a394eb24438a28708a4583e7cb1914ca5e0a717738452aa01c816258eb032736fd3ee404ffb1994d2988 SHA512 bbfb44e01038c77dc33c175478c5f1107bda23536cfc212c14060385c5e41145411550462f6665924883788fbf66477d2f517acb28c51fad53c0f895ceec288c
 DIST microsoft.codecoverage.17.9.0.nupkg 9175458 BLAKE2B 914155d9d4fcc4e164ef3a3a3da5465cc5ec70dfa7e85b41d66c782ad35553e7595fb5209c635b7d262b5e28685b2b8c1aa77e3af506b4fd6cd8dc1c92ffa986 SHA512 4046f8f19e34f3205f7bf7f5e7ab5ef7ca5f1f08ef2ce2a5f940b53f383b287d4f0d75e093c28df193847581ab0221b8de90bdf4ea37f5b09bd91e5613e7b954
 DIST microsoft.csharp.4.0.1.nupkg 462346 BLAKE2B 209ccebc9103b803d26ea1f0232245c3cd231078b03a83a0011a2a79a1a8a324a72c5b3fda94b2686fff170932f366e165f81a36a70df590a39c45d70778e4be SHA512 c0e75a9162f28ba4c4572c8fac4fd4c8c97d6d3505a37683646ba5f7e5f6ac0da69d5200d2646054de90e8e08f893a10e514591b69b8273640842b2cf90bddec
 DIST microsoft.extensions.dependencyinjection.7.0.0.nupkg 272235 BLAKE2B 70d1cc2e591c82a83343589e61b000599ad2ae2f6a0d7ff492e5413cf03dbec857ae113950d36d95611bae1e42d3d9eaeacb7d7e332bc444efc38339b333431d SHA512 db7584ae7dd6e47fe1c450ee6f01f567847f744a4f86ffa7eeeba04a0e573c88e371c89440323c281c6d2260d73015fe085d4ad5fb97d41136fe683dfed4a9dd
 DIST microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg 197491 BLAKE2B 9da47aa9c537dab4a8ef449d87a55f984dde479c5fcce8d2b6b7b1928f2905f6bbf0ae188b7345fdc03e35d3c0ed584611879a4de8d7def3d1bde991d34d3454 SHA512 a1cf52b01f5de43fe9de6055ec4c7b7f8247669e8dd049be9626df36e3163e0769d47843eac5d09fa3f9aab41bda228bbd51946c9350b6e24d45d86cc92eb317
-DIST microsoft.net.test.sdk.17.8.0.nupkg 37824 BLAKE2B 3ef98fbed1b0fb6e6734939601744c4047ea701681fc7eb5cd13ed33d3a317379aad946d931410492b9efed3543bd50213bb1def3fc465d812ff3ddab0f940cb SHA512 f211f2610137cd114621bd6c8418e52a64149af37c176a79f418892fadb6d5dba31ea4622a95c67e50b32a92fb1b1d5d7fb980502c5c9570dcc4c3258c6787e9
 DIST microsoft.net.test.sdk.17.9.0.nupkg 33666 BLAKE2B 083013cb17263a5bd06a5f21a371390d52aa62d79650649ee0367d9c9f06854e7be9d526f935b956022aa7bbcf0962c90797ec4d69dc85b2bb02286776a8d379 SHA512 d56b077911a15540e89e7eee4febc01a4626245e7b41347ed0f0e9a08bc33eafaf26d68dceb50725b3c5ad4dda57ecbaf03fb4c258f8411a29e5fcefc4504990
 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
@@ -25,264 +19,135 @@ 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.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.8.0.nupkg 1492114 BLAKE2B 32a3a7f4e4cb9af1d330fcb2588ee9602414760eb4f2bda49888372b3ed64e8c47347dbdeda11259134e37b717ad5c23b06ffeda9a1a1772e1afe299429e828d SHA512 17119c472fd87ff721677f92a801693eab53a1897582150c26a60429c99eb1764628e7ba895b40e3b10b9edc00f803b18316a6fdc906ffe54dbd2d04ac63db33
 DIST microsoft.testplatform.objectmodel.17.9.0.nupkg 1655717 BLAKE2B 5ae125e4fee8770a6a9f18a8566eeeacbbcac42cfd5eed4e407fd2cc2b1d773e20ad0dea461483fa3525cf113ea97dfbad6763a7afa354cf3d438057310d0140 SHA512 637048c70b190a0269d7e0761d7cbec7da8d306f5770480cb91286c06047d7f4f1666556dfc4494ec090db011b03fb736ca03313479b566019a5a54567e05f37
-DIST microsoft.testplatform.testhost.17.8.0.nupkg 2806274 BLAKE2B dff54d1c59a6873793bbe2d6fc9ed75c2d610a8dc41f4f9349228b690db3beb7845660c7d90a5d2588443c13aff4d97b6e0a1df58e88a398b3631a344609060c SHA512 39fb1549fd23fc2c7b4f5525043fc1152b8c62cc813a88c9701f33a666041c6690dadd455899d247fef5e6df372d17f081d6098839086007b2c10618e187ac7a
 DIST microsoft.testplatform.testhost.17.9.0.nupkg 2859892 BLAKE2B f7fb36494032105a390f6be4e8655c1d1c92a0b7c5d6da2964537b74f8f19e45e4ac650f8b202f8573d75783a032c68f89b9f4d6c17fbaba681445da0964360b SHA512 c8246c9b365a8afebf35317357125563819a3ea68b1a2ec4d95cd44838efb2f121be5710250a68ceb06c7a052606bff1c202a9504ee2d20cf65f66463b43d31a
 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 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.13.0.3.nupkg 2441966 BLAKE2B 0c83cd81b9eb647fd9106c5b8b7af4ff6b35eae4fa24712f16cef1db070857b072b9e40a52ed006a82125c860dc48b89ac54224baa24bfdedfa573183e19d169 SHA512 99b252bc77d1c5f5f7b51fd4ea7d5653e9961d7b3061cf9207f8643a9c7cc9965eebc84d6467f2989bb4723b1a244915cc232a78f894e8b748ca882a7c89fb92
-DIST nsubstitute.5.0.0.nupkg 239856 BLAKE2B 979a1ac47f1fab572ea37b685846c30b39457bdfaf17c1d6f298d904fc414be9bb5302d36019023af88900628e88fb53f931a502077529f0e6af0556b3a206ec SHA512 353ef07b54279d6e907bf8ad60c63ec6d399c420b759a2d884c77714f9bdb33a0133b25ee2a2637d91f45ffa2b43f737f0351f2e3a54d7f56c4c3461896b77cc
 DIST nsubstitute.5.1.0.nupkg 241386 BLAKE2B 850d5cc0f57141082d1cc0300694653fef34f34d7ac7c94b9a8427f6795cc3be64edc096db615762347e8958dd0c3114475f9f3a241fa8aa33e1c55b411d8141 SHA512 a0ded6cdf22cbf89d2cbe1e78bc70a4d31cb9ce55b4da159c8fd81e5bc6edfb71cce8580a5578e5479f116fbaab54ca5bab1966eb1bbcd50ef412e62e22ff2fd
 DIST nuget.common.6.8.0.nupkg 147762 BLAKE2B d34e14d37115b42387e2d92d8b1e4e12a3a8e81027adcb30b0d2ee95a6223810cf835de9d7d5476ce9e7e77f45ee89d2e6927cc30291e35e2fd2b50752f813d5 SHA512 54246106083b18797a0ce664bf9bec98cb27ad84e67ecd89ff851ab006cd39f81e158326150d4a3be1d3f73423b1a5e7d50dbf4941828757fc0a7580e0daca45
 DIST nuget.configuration.6.8.0.nupkg 176495 BLAKE2B e2d51d2ba2512e6598dc2fb5c54e1e11f7dad88e951acf40abd3ddb3e85b82ddce1348fa92f9ce431b8b9602653d689e34fa54f93656b3c2c41fc80079e12d4c SHA512 705f969fffc78c69191eb722ec9968a2e8b1ad9cab48c4316856ccadcc695ae92e25c090c72fe2bbe9448355b504191c34b91ff6700646ea5cd6ee6fcaafc802
 DIST nuget.credentials.6.8.0.nupkg 128043 BLAKE2B 8b8a60f6009ec1503465a5ccc5f6706fa94417e8a5f54c7ddaf6bdfebbe6dd64e06246321d58da54f24c762a7d3db6da1b0ab6d2531df52753294729d151bbf1 SHA512 b0088e01d4c0cfa9f4548cfcc1bd8885f2319926fbe4cdb7348586c11c62beaddae03f2c7f912af0076ab660cf9f9134ef70f92f6534078b96e8c3b6678c8e94
 DIST nuget.dependencyresolver.core.6.8.0.nupkg 160723 BLAKE2B df3f98c8edfe16eaafe677481ef34093b35e6c1a2973b327dc38993b4811724e49cb28c26767618d800a462aead98fda147d19abafa8d645a27add4d8ef9fe4b SHA512 d246d2aa09a4b13a3e7d3db43fc5d275ce9f8f0d67b17d7bcdc53d08b538bb2d23eca0dde9a9659e2ab7de5cf449ad8c619789c33688b7b1ba67e58e3ea8cc6a
-DIST nuget.frameworks.6.5.0.nupkg 131644 BLAKE2B d8fbfaeb2ec4c269ecad319478b64da5ad9e44d9d82fab8b42400a15ea7d31627bcdb9f1af0f18b15dd8455ac4e92df1b25bc47808f465cd2e972ffa40333f1c SHA512 3f97626af018fa9b03f06751054be2c4e8dbd0d5329de21662b36f3336849838bf5af7d3721643faa6ea90935f836cf502661573953176cff33d4d829d953d56
 DIST nuget.frameworks.6.8.0.nupkg 144992 BLAKE2B 0cac03d8104e178ad1d775d82d854ce45ef3525101064ba0039a716601773429c8994736f98ba602b688ef8eb5e8454fd506b61ef7f6964b4f85f3c8377177ca SHA512 842c7f958b2a21a2957b678fc5a32ff1814c2ccafbbf5d69134b3b587c574400f3ca17624f9678994d4d1c0584de93be487d7630b39bc08b40cc1183650a618c
 DIST nuget.librarymodel.6.8.0.nupkg 85627 BLAKE2B 034fbd304c79b57a643ae7fcec27b72ac295377fe63d7238693da041aa734cffbf20a75c923012bdd28e1819498f0478a63d57642bd269ad067fdb12b1c89066 SHA512 165a87079f167476efc7050f39de64affbd8e737f3fe5b7f482cfa368f4dfba97b525d78f7a813011c7caad5e7248898d2a33cf253a604a47a05a347404d7b4f
 DIST nuget.packaging.6.8.0.nupkg 787629 BLAKE2B f3dcc0ebe1e5da00365785128a6e08037e1e4f09aa6cb2c91f28a65fec34793c31e81707780ccdeb63dabfd1d91ddbd4bd03c5c126afa03183d4f2dccfc6ad08 SHA512 1954b5013fea361c89366da5bcc64426f7199ce3dabed8da23d89800596ecb3c042591537c6ff9103426e5f52554721df2e3fca6899415a9fb3c8a81c4589521
 DIST nuget.projectmodel.6.8.0.nupkg 306272 BLAKE2B f6e1b909f40370822493d32d7a7ae4f5a65495aa70a6443e07a300126bebad90d0900a1165bd94e0d3e7fd640543b51bec3710bbeebafb4b156b7cb31ac67789 SHA512 dede69bcc78e678b8ee2447c8c8cce115a4f8032bd4d3cce159dcd114346082bf74b0fa08e22260fb32b6e06d26112b09f5556287ec6f402a735fb5c4fa216da
 DIST nuget.protocol.6.8.0.nupkg 895173 BLAKE2B b0f65fd771a136f033ad52b6cd0e21ba5e4f97456ae9ea967ae251da583d0fc535f81ce7261561b91c1a6f0702f58dbefdc4fc8284756c5fc8da5758a73dc836 SHA512 ea266175274163a5f8640e4354a5329e94a6aa9eecfaf5a439ac9ba2cb761ac2da747a78b5fd2a6419b1635dafaf94faeec79826f5b5c526f4344630b567fefa
 DIST nuget.versioning.6.8.0.nupkg 96003 BLAKE2B 092f0997bc5d063448dbda1a078cba5264003f028c1c61373756d3d9e4554b7526fb6f87afff5a326652ff60a4af5fcf621496e0144499877b7d861c288c1de5 SHA512 064b1eba72569dfe697b826eeba88aee51553957423a55a040f34dabd29d91ba8c07672ae86585dd4c0ecdc2f68062563e556d18b915563b0804dd0d6fef4fe4
-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 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.buffers.4.5.1.nupkg 93737 BLAKE2B e846885f9ace79f30bf7698a96ff3277a45fc2988a48cddba1862e23650ce55b06dcc6c1bcc29e08cf5380c9700dfcc15964f7263aeb11c737306d27963b34da SHA512 80da6158e55b9bcf7e0b5e6379b9cf45a632914f037b53c5bf5609576e3cd7821f7861956b73d74470d2d0c2e56dd235a5ef4ca6ffe7e192b820dc2d023aaff2
 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.componentmodel.4.0.1.nupkg 95272 BLAKE2B 91bdd30bca847f0a48608e9cee642cba2bdc356661cf95e906e269a99f0679bf2497c88c770a93eb59cb9cb68aff68ed1f5322a62aee3ec658b01af17976eff4 SHA512 b4de433cc620eb214ee651792f9845e932190dc450ffe7f561c5c63fccb6632e3def55e8c4f38b1f896490bdb4bfacdbe1a015b29fb1ae4470ccc15e479647ab
 DIST system.componentmodel.annotations.4.1.0.nupkg 609969 BLAKE2B 8d441bd869666d722cdd13cd719b3be1ccd453e03cd956be99735ed85a5fd244d592da6c8fd6b68a962aa71cb200142c49026d6c15ffefdb67a7b6a3aac8c86c SHA512 ef92333f99ca0626e0409100b6f5077fa814a51c78dc558ab1313a74ae69090e05dbfaf764418ba51b979beebd563065e4ba432e0d1181afd0ae1ddaecbf5924
 DIST system.componentmodel.annotations.5.0.0.nupkg 771145 BLAKE2B eaba2dca2356dbf4c1af4bd03d1b8bfcb55dc4f7e449e61e25dace119b35aa6308810fac7860b5d64d5e9569d27da693b3983a1427179e2d26b66a7df48d3904 SHA512 589aac4c669701ce7910f1a327294f15788d3ecff1d6df5d9255651e5201c5411c2312286fab111a6f549fb4de864c8414cfaf2a365deeb6f068c1ffce7c353c
 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.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.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.formats.asn1.6.0.0.nupkg 182980 BLAKE2B dc3180f322e0c7992a3b951d7f08b631b8d3a14abe1aef2f7b8efebc4da32161760ace9189a2df2e41d2fb2d98844ae9ce3df5cbabd3e7e0f6341625f2ebca27 SHA512 eb660feb32e7be616d148deb8f26dbae749e2ba8474026857c925fa0d850aab1132413de852b9c43123242ce56f861815bfae94970ffd0da8d5bb9adb4859784
 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.abstractions.19.2.64.nupkg 43873 BLAKE2B a64223a7f81081f7f27e72a3ca3b054ceaa7aa15d1e5b6adfe8b4a132ebcb8399545667df8968855904903c725f97c03adca55079eadcd55ef8118018ec5b1fa SHA512 25341b99890374b951de6aa15c6b891ca2134e4d2d4f4b151ffc642dcf716d3c33c07f69c3c595fb132b31931662e4ed57027170261f04c5718753e50b363ad9
 DIST system.io.abstractions.testinghelpers.19.2.64.nupkg 44709 BLAKE2B 2dd83513c8de1f8d0d6d3f5282b35f9d34605f7839907486cb560a01e75f3dd086af45ae2e78b3c95fe8536542c6e080cacda39dc7eab67def18e8a9f8c5837a SHA512 010bccf099b0770919e3fe692c1825742d077704768423f8b15468600e182b840ee906ba02c66760fc1fe233a02bdaee8d1ae10575996173d761e99ebe6e45bd
 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.accesscontrol.5.0.0.nupkg 309442 BLAKE2B 74d1f3b655f8c74e0adbfd67edf10a0c6ffb474d83241f0d6756275936d2272cb78ddd29c611767cf53ef4a38233926a9a0ebe5cc4f36ea6741d301885c98566 SHA512 45a6b5446faa06612e90974bd7d542d9a1480c0583c0237e8732ffbceff1b70a6e12c23792145e7613bd00041bda26745b83d73008ee71a46da5c7a40a4568d3
 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.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.memory.4.5.4.nupkg 205467 BLAKE2B c5b66e68917fc14d5b94aef9aef53087756c59473a2580448f20233e559b3ac9d691b2c063d129083593a1b610252acb01016ef078ed21b390615bf5a6e04dc0 SHA512 8ece5491eb0fe332bc190f40cf76b3beee0c5f996325034861be221fdb0ff02fd59e4f7020b3c4a1f29a457f76ff76c4c95d46d38555e4f48c7a3bf172d87966
-DIST system.memory.4.5.5.nupkg 208978 BLAKE2B 487049b1ffd622868d4aa84cc14f13127641c56937826c11d83851b7032ea248ccf8555f48aca93acc4891ac99ce2178ede50bf13ccbd70ba6004226fb583275 SHA512 e8c8e536c97b94ac3443c940b30dad43cf6e97dc7a8c3d989371048fe74e168606384f5e0143bdc0d86f7783bf9fdee8417964cb3a8a5d752713e90b125172dc
 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.4.0.nupkg 337043 BLAKE2B 94cca7283873edd9199d843db78e23bc5815de039c2aaeb67ba3cbe4cb5e161eab27b89cfbeeb437f0a9d235b48e86a5b31f53306a7e7a2a38feb28d6e5e523c SHA512 81d46b509b3546b8d6dc9079a7cda162303aef1a1e14bbe1d127522168d388df2a13195b16dfd1b57c1560d73906e909fdff4e2b34104ba81a9336c97874ea1e
-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.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.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.5.3.nupkg 102160 BLAKE2B a86cea1017d251d3cd271eff0be90ce43ca0becd8b0cd37215aba847c00369414de1d34df318e2554f8989fa48ce0f5bf61e0404fd97b476eb0fe0bf5f10579d SHA512 765d87d36a7b7415dee5b6cbd3a08ead9762915fbfacfad8a205a78d4a187cec6677da2407f7f7c2d1b55fe9f8c0257925c9b0bc193d402972c323979678baab
-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.security.accesscontrol.5.0.0.nupkg 621573 BLAKE2B 617baef046a8bdb637db288425206cb95e6be55c53c3829690253fd76987b0fdebb1cd79db556c437ff5d9a0f4940e7d747e3e7b611e941f5f54248b6adfa32e SHA512 ae6b03ad029d3eb6818a6c8bb56cf4904013fa535a67b8e621b783a029dd88aa2e471e002cbc7d720381ad8bc8c6b93111a08f6ce2d271af6d974bf4d02b6c81
 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.cng.5.0.0.nupkg 957764 BLAKE2B 01f2072c00590027149390ee18b855d742c05cd66f0bbd2433ed52236954f6a3baae64291795303139cdc1ee1185116cfaac4ce20bfcb8f8712625e07e2e2632 SHA512 b6bbe402495487333eff3f5b3e71a60cbce66ef0f49752250ba829151a738c62f295382d4cfaa6f14bfbb670c14ee05039b8c4641c4d4b46c28488bacd0095f7
 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.pkcs.6.0.4.nupkg 1093766 BLAKE2B 9801c9b4355aae21c932163ae77963a97cb9cc52fee7d4e3a8bcf572032c0dbc9b9954cd2c1050c6ee353e4b1e51a6e441d350bba45ff456098b1096d12655d9 SHA512 db8bba63d2ff4b9bd7a35abaa754296000efd9de8ac6585564c5a1241ec782fa193f12e56807e717e62522bb77f127c6034b43af28fa62e599149d49290979a2
 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.4.0.nupkg 185701 BLAKE2B 8133633dc020cba0b552b7e1e498cda3b4f8578132e83a9fe38bb6f79a5b5ceaa76089440de2f6c7a948e160e9aebed1fca467cd02a9ca09b5e5cdcbf5c8f1c7 SHA512 5b011ec6f05dfb5ef27d8edf712f9f04697e1c00c47c226e29e0c9a814fb0fa8fabcac18bdf2f21aeab6cbf326aca3910ba99b630b61ee48e29ced663e14cbde
 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.security.principal.windows.5.0.0.nupkg 535022 BLAKE2B 4b20ab3cc0b4bc820df360df57b2eb0e2059de677c432af31e73acdf600a417685900aed2cee8e33ba9020d02ae688096cd9c3a77da441ed33cf968c90124bd5 SHA512 44a920aaaf22b2172d41319bb57ab2b8e1a4531d5f02192a6f53a81d875125195b60ba0b5a44a45981d137fd7b0f3a65b12959b5fd97afc0578cd84ef27467cd
 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.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.encodings.web.7.0.0.nupkg 283808 BLAKE2B 820e51fcee43bcf8141527b245b17c9d7f5d2f1e822e93f12719047b7ce0ace3bee429db4464726ce60ffefe6746209f5320071893f83f99b81e38110a8be7c5 SHA512 d164c15df021a99d18ed0c39b6b7c0290b7f948d8f09bf07140b47bae6403f1cb9a822c1504aabd7a6094367ad9fcf8ced1ea186b0662a51815ebbb37a3b0434
-DIST system.text.json.7.0.3.nupkg 1734391 BLAKE2B acc8027653d7c58d7740983e465904e61889dcb572a9a5cf9022a81a6c2ab2dfc263307111a23456c8c0c520eb58aaed09eada4793ec51b56d1d6790f710fe14 SHA512 0ea3fecca3dd4c84f8d9afddd6d3eefb0fe1ab5e1067cfbab5ba6ebf61accab8e1a81a9bb071fb98db5afec4af3a41777c1fb23fb3d6af62236082e29df4fa55
 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.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.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 testableio.system.io.abstractions.19.2.64.nupkg 232367 BLAKE2B 44fdc59c47415d0f85af06c392e4a0fd9d96a6baaf9bb1e34f45a74cd319805188418c6cc9a289e7125f9f1d1023313756a31db4edc3e4f1ea3ce7ea0f41a369 SHA512 6c37d9931693d52d48b07cd2032ccd755bb4aabf0c88ad97391ef03e2f1a6090c6caaa8bfa094ee43ec7f920b5731a07f4a72c2baa0fb3e9636447f36f95d0d9
 DIST testableio.system.io.abstractions.testinghelpers.19.2.64.nupkg 356207 BLAKE2B 941b712bf2cb2496070ed07f5964203a70bc3f9d4964bc6230e1b36eeda67402a962fcab664fcc6c78de3a3b922c61384b60f34551284951ddb900119db69089 SHA512 ddd83311d02f47066ef815795a4f7944e7f3f00432b4abbefc61b5dfd9516080f86140b6139126b884e005b4d7e6dfc4f25ad3806a2f637c7a873f5e98c1167f
 DIST testableio.system.io.abstractions.wrappers.19.2.64.nupkg 352008 BLAKE2B aa8fc28c81590e05ba61c4cd78a2e42c01610ba4a1c12a71aefbf056ac15466ff097d2c3e5c25f4b56f55bdd2c202a8a772ee5b453c59f7c0b7d1fcbe69af053 SHA512 24a753a4caea7c56fff953a12307f824cc5e71f290b75646e02b061ff9220499366a29023cbde0362b89d0273605b2f744a97d89d1cdec1c0c572e15b68571ee
-DIST xunit.2.6.2.nupkg 29065 BLAKE2B d8b97b3e5b1808b085f8845b73d5f3f1c5742a01a162042970d662231e11eb856c77b9d2374ff5eff2343d4d6555ae98106289cfb57133d9c3a7b86d90ba3cff SHA512 14103a510e5cfc139314040b4160b153d3702a9ba2be1e71bcc06342e68cb7e321567b30fbdec7e3c31d08d4454e86683c951b709a60c4b1f2d0648883a62b30
 DIST xunit.2.7.1.nupkg 30524 BLAKE2B 8bd9f16ce108fcef9e932e844bd0e56ef016f0c9877c9f9c46e5f10bbc25f5415bffc86272556b5d1aed9e0efb370dee52ab6641a5b3ac5fdb9c08f9520ab0fd SHA512 8137d21115910d5a6c5934122ace2ad03059c5e1af76fa0f485aaab06e78f1d43dd9bdcc8e00dd4d275fe65d7f3f2b8baaaae1ab088c998d062b6bcd2d4097b8
 DIST xunit.abstractions.2.0.3.nupkg 75155 BLAKE2B 8cfecf557dbe20e0e14b1d8b413acd7516b6538cb543a12708910311fa76b7dcd9d060c7be70a05b0af5ef3b8bd5f819104025afe9796e240c28fcae1c7460c1 SHA512 3ca26b8b97f4a8440f16f818e82651f571bc2513a5592742fd960b9240d0b880fef84827fb25a307e61fe7b019f14e864653fbcf7dee0d0e3faf90593deaf624
 DIST xunit.analyzers.1.12.0.nupkg 886507 BLAKE2B 957478795fb011db6d17dc2a702d515fe1953c0cd1156ce2d1d65a674ff8fd42d5af479ea8196d1ae54f927b1c3e7f34360199ebb10cfae6d8dd4bc213688ec4 SHA512 977e24389064ff31fe83cf36fdfbdb4056e909b7a4ea1f5cc4abb7014d082a78a6a4ce675315830199f3e718999715d3f84598d23ccb2eb9aefd574543852a8a
-DIST xunit.analyzers.1.6.0.nupkg 172621 BLAKE2B 9be6a23eb8ecad912a879293126a0eb5b0c3cebc21e54ca829de83ed4b102df7dac30b28fe7ebc7e223d8c343ef4515dfcc1ef40bd3dcc59eff54163fce461cc SHA512 7c2095196cc0275780353e82d50cb968a2961ba5cfc458e7d491ec647495dbd50cfbaa8f51e575b122988435082f63babd4cda9ccfba1f77ce6c5cb5266e9b7a
-DIST xunit.assert.2.6.2.nupkg 219001 BLAKE2B 532d452427d58abf56b12127d2403bf84cacb86eebd24d8f8cada01c9f7cc390fc13cd89230eb414a0cb0c8271fbe5fe25e79844a6c590846263118f915b7f43 SHA512 00da3612b13f1932abdf2a70bb821a2fd9c00da8507d088adeaaf6eb21d336b614da44439768dbe3f155a01729757f93e6a591922c85856dcda197e32d6ca843
 DIST xunit.assert.2.7.1.nupkg 235715 BLAKE2B a81912bca6c5e7dc249c5ef04744a3a135008374c28aa4d6ef29bdf7695ef612386e2b282077cb9052c4d85dcd90c5634c1cc746197df17993dab1e3549ab40b SHA512 4bda7bb81d5fc8d90dbde13c0fb7d76f7c39e22811f47d9859e81c5691e46042e04ad21e6992f98a76824db8ca140b7f2c8bbb945dd44a660754f96b954c665f
-DIST xunit.core.2.6.2.nupkg 30991 BLAKE2B 567d446844cfa84c415b9e2e094e42b1b6b498eb6e988c3ad0092be352de03c4c949bef72d09143e9edb4020a9c7a762d9e3e388102df1d68de53a60331d21c3 SHA512 8ed1836318021e091de56921db230b79ff0300234bb97ee97ad4485d8a398ea77775c4410be17120d151e0d8bd426ba0dcf111924f39b1e4d47afd2677c8cb70
 DIST xunit.core.2.7.1.nupkg 32417 BLAKE2B 1283021469e1047b16b9fa1b7448141d70d5786afd82ae983b45a3b59649df7ab49f1fd87853c9f9ea7921b52c487b4932caeee9feaaabfa9831ae07d909fbee SHA512 4bdd75c882d9c5f7eba347d5236bd7af338dcfe6e6969ed01a0e63227ac1d7cea309fcf0b8f1c592410394fe0215ecd7bfa0ab25e0a43ccf2cf0845a67147c56
-DIST xunit.extensibility.core.2.6.2.nupkg 277478 BLAKE2B 4ddf6199bf9291c3f726ff1fd2306aac203d83eb4df4a6971878de6ade07154fcf82dd53ef4f3bde77291fcc6b74788613fd5b8c5502d9d653a5ae4e2b90d6be SHA512 ff976b2f080664e4d18609953bb5e9306b9df95505a360dd5c218f502d97564892f6f139de048eef82c2b089aad699f5af180566f5efcb8abc9b97974429dfbb
 DIST xunit.extensibility.core.2.7.1.nupkg 287806 BLAKE2B 72624f9e9dcda952757d33542bd4b1e0e2ea6d9f0a90d87b6501756c928dcf2708c49f912e2d3cf0ca9b346b5043e2dd4185e264f081b2f4f5a59f2edb781140 SHA512 5d3cf8c242a0161b989a6d368a216e4169da584b9f609f9db7798165db3957cace82194d65869f84ef80b8f802d783a209243069baf83147bdc3c655a6d73ea4
-DIST xunit.extensibility.execution.2.6.2.nupkg 365448 BLAKE2B 20c1e852121fdeb126ee4b1a895e88baf1bf6046837354cb768397c16e07d7956866791b7d796889da903390eae4eea4dde15e9b6d31aa66d2a4b775660e4520 SHA512 332b7416440605cbd0e641d02553f6163df3dfb41d5f1af5bd7f6b89e27970cd30cbe147a93ec466e501f288c023ae811a772ecc646073344c2b40f2c0ed6d6e
 DIST xunit.extensibility.execution.2.7.1.nupkg 369523 BLAKE2B 847dab72909b2fd55276eaeea12631b6016bae45133c1d715629cf9f1df6a50f960c6ea3bdec879b5749b098d2e4793572b7a881841b92282c920eb757f7fac3 SHA512 9b63048caf7b69100d4fd94d28cca1cd77f2c3a703d96c9c83e930fd8536f0bdf94f35bdc030e72b2beee4b27a6af679acde54f28f56acc7176ce44a3ef4d7e3
-DIST xunit.runner.visualstudio.2.5.4.nupkg 575805 BLAKE2B 4c236a13f9daa0ef51e2c89f278ab13eaa381e608c760ecda5e509be8e1272dc33da7920996e9a61f8ae83281260bf62f000d8ca8edc29b23369ea1d0a6da0bd SHA512 0d719e261d990e4d3f56bff9a22d43793509ee644e23954d12053bf7be2952b33495fe4620b5975e3a601b1b7bec4c02e126ad3848970b5af4d7783ea91ccb1b
 DIST xunit.runner.visualstudio.2.5.8.nupkg 580504 BLAKE2B 5171e4104d3036f9f69a69fca28dd79b0246e8d8f1226c7ea3ee01b26d0ccaacb2f2e3fa35bdc083b1b08f118980cb87cf1b0ed870e0bb3c9850429dee821b56 SHA512 de14c62a3c878d080ae050c3cca138bd87b191722daf2f3c0decfc7168dec3d5948cc9adf5d37a601575540b0a621e5766ba4d1beea9b272260334478b93194b
diff --git a/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.1.ebuild b/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.1.ebuild
deleted file mode 100644
index 721895fa835e..000000000000
--- a/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.1.ebuild
+++ /dev/null
@@ -1,321 +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="
-castle.core@5.0.0
-csvhelper@30.0.1
-dotnet-xunit@2.3.1
-libuv@1.9.0
-mcmaster.extensions.commandlineutils@4.0.2
-microsoft.bcl.asyncinterfaces@7.0.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.8.0
-microsoft.csharp@4.0.1
-microsoft.extensions.dependencyinjection.abstractions@7.0.0
-microsoft.extensions.dependencyinjection@7.0.0
-microsoft.net.test.sdk@17.8.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.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.8.0
-microsoft.testplatform.testhost@17.8.0
-microsoft.visualbasic@10.0.1
-microsoft.win32.primitives@4.0.1
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@4.0.0
-netstandard.library@1.6.0
-netstandard.library@1.6.1
-newtonsoft.json@13.0.3
-nsubstitute@5.0.0
-nuget.common@6.8.0
-nuget.configuration@6.8.0
-nuget.credentials@6.8.0
-nuget.dependencyresolver.core@6.8.0
-nuget.frameworks@6.5.0
-nuget.frameworks@6.8.0
-nuget.librarymodel@6.8.0
-nuget.packaging@6.8.0
-nuget.projectmodel@6.8.0
-nuget.protocol@6.8.0
-nuget.versioning@6.8.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.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
-system.appcontext@4.1.0
-system.appcontext@4.3.0
-system.buffers@4.0.0
-system.buffers@4.3.0
-system.buffers@4.5.1
-system.collections.concurrent@4.0.12
-system.collections.concurrent@4.3.0
-system.collections.immutable@1.2.0
-system.collections@4.0.11
-system.collections@4.3.0
-system.componentmodel.annotations@4.1.0
-system.componentmodel.annotations@5.0.0
-system.componentmodel@4.0.1
-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.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.tools@4.3.0
-system.diagnostics.tracing@4.1.0
-system.diagnostics.tracing@4.3.0
-system.dynamic.runtime@4.0.11
-system.formats.asn1@6.0.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.abstractions.testinghelpers@19.2.64
-system.io.abstractions@19.2.64
-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.accesscontrol@5.0.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.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@4.1.0
-system.linq@4.3.0
-system.memory@4.5.4
-system.memory@4.5.5
-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.4.0
-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.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.reader@4.0.0
-system.resources.resourcemanager@4.0.1
-system.resources.resourcemanager@4.3.0
-system.runtime.compilerservices.unsafe@4.5.3
-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@4.1.0
-system.runtime@4.3.0
-system.security.accesscontrol@5.0.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.cng@5.0.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.pkcs@6.0.4
-system.security.cryptography.primitives@4.0.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.protecteddata@4.4.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.windows@5.0.0
-system.security.principal@4.0.1
-system.security.principal@4.3.0
-system.text.encoding.codepages@4.0.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.encodings.web@7.0.0
-system.text.json@7.0.3
-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.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.xpath.xdocument@4.0.1
-system.xml.xpath@4.0.1
-testableio.system.io.abstractions.testinghelpers@19.2.64
-testableio.system.io.abstractions.wrappers@19.2.64
-testableio.system.io.abstractions@19.2.64
-xunit.abstractions@2.0.3
-xunit.analyzers@1.6.0
-xunit.assert@2.6.2
-xunit.core@2.6.2
-xunit.extensibility.core@2.6.2
-xunit.extensibility.execution@2.6.2
-xunit.runner.visualstudio@2.5.4
-xunit@2.6.2
-"
-
-inherit check-reqs dotnet-pkg
-
-DESCRIPTION="Display and update outdated NuGet packages in a project"
-HOMEPAGE="https://github.com/dotnet-outdated/dotnet-outdated/"
-
-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"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-CHECKREQS_DISK_BUILD="1500M"
-DOTNET_PKG_PROJECTS=( src/DotNetOutdated/DotNetOutdated.csproj )
-PATCHES=( "${FILESDIR}/${PN}-4.6.0-net8.0.patch" )
-
-DOCS=( CHANGELOG.md README.md )
-
-dotnet-pkg_force-compat
-
-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
-}
diff --git a/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.2.ebuild b/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.2.ebuild
deleted file mode 100644
index e2bade626a6f..000000000000
--- a/dev-dotnet/dotnet-outdated/dotnet-outdated-4.6.2.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
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-castle.core@5.1.1
-csvhelper@30.0.1
-dotnet-xunit@2.3.1
-libuv@1.9.0
-mcmaster.extensions.commandlineutils@4.0.2
-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.9.0
-microsoft.csharp@4.0.1
-microsoft.extensions.dependencyinjection.abstractions@7.0.0
-microsoft.extensions.dependencyinjection@7.0.0
-microsoft.net.test.sdk@17.9.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.runtime.coreclr@1.0.2
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.windows.apisets@1.0.1
-microsoft.testplatform.objectmodel@17.9.0
-microsoft.testplatform.testhost@17.9.0
-microsoft.visualbasic@10.0.1
-microsoft.win32.primitives@4.0.1
-microsoft.win32.registry@4.0.0
-netstandard.library@1.6.0
-newtonsoft.json@13.0.1
-newtonsoft.json@13.0.3
-nsubstitute@5.1.0
-nuget.common@6.8.0
-nuget.configuration@6.8.0
-nuget.credentials@6.8.0
-nuget.dependencyresolver.core@6.8.0
-nuget.frameworks@6.8.0
-nuget.librarymodel@6.8.0
-nuget.packaging@6.8.0
-nuget.projectmodel@6.8.0
-nuget.protocol@6.8.0
-nuget.versioning@6.8.0
-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
-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.componentmodel.annotations@4.1.0
-system.componentmodel.annotations@5.0.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.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.formats.asn1@6.0.0
-system.globalization.calendars@4.0.1
-system.globalization.extensions@4.0.1
-system.globalization@4.0.11
-system.io.abstractions.testinghelpers@19.2.64
-system.io.abstractions@19.2.64
-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.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.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.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.pkcs@6.0.4
-system.security.cryptography.primitives@4.0.0
-system.security.cryptography.protecteddata@4.4.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
-testableio.system.io.abstractions.testinghelpers@19.2.64
-testableio.system.io.abstractions.wrappers@19.2.64
-testableio.system.io.abstractions@19.2.64
-xunit.abstractions@2.0.3
-xunit.analyzers@1.12.0
-xunit.assert@2.7.1
-xunit.core@2.7.1
-xunit.extensibility.core@2.7.1
-xunit.extensibility.execution@2.7.1
-xunit.runner.visualstudio@2.5.8
-xunit@2.7.1
-"
-
-inherit check-reqs dotnet-pkg
-
-DESCRIPTION="Display and update outdated NuGet packages in a project"
-HOMEPAGE="https://github.com/dotnet-outdated/dotnet-outdated/"
-
-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"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-CHECKREQS_DISK_BUILD="1500M"
-DOTNET_PKG_PROJECTS=( src/DotNetOutdated/DotNetOutdated.csproj )
-
-DOCS=( CHANGELOG.md README.md )
-
-dotnet-pkg_force-compat
-
-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 ./test/DotNetOutdated.Tests/EndToEndTests.cs || die
-}
diff --git a/dev-dotnet/dotnet-runtime-nugets/Manifest b/dev-dotnet/dotnet-runtime-nugets/Manifest
index 43be99d54524..a64c6e253499 100644
--- a/dev-dotnet/dotnet-runtime-nugets/Manifest
+++ b/dev-dotnet/dotnet-runtime-nugets/Manifest
@@ -1,221 +1,201 @@
 DIST microsoft.aspnetcore.app.ref.6.0.25.nupkg 3356722 BLAKE2B 7808c6b0a3b3cebd5a1968314b89d8b38c798c7480aad4dc53172a004bfa9ad807304afd9657b3a9710d72863f70674f02ef39588783b93245195f3f2829b29b SHA512 bba75505fce0302817e984b9d6faa71479f2761ca929c9b9a8d8c5329dcd607aa15e3d0dbaaecb03185a9a0fea689b17ba3c47872063220e8d8153ca547c43d9
-DIST microsoft.aspnetcore.app.ref.6.0.30.nupkg 3353063 BLAKE2B 9b9e1b4375b80615f6b41400f9cc6cd787e87de1a88f3f7288e7f206502a202cb062225116c39e0783a3876d2168676362519ea1ad914c53b5f4cc75822957e5 SHA512 15445f1f7f3761afa03830b65488f58c6ddb74c8942725e407826605faea8d765bebf26d9093303427787b61704d27acfc416a7e7a015acdbf8666c5b890f3db
 DIST microsoft.aspnetcore.app.ref.6.0.31.nupkg 3358756 BLAKE2B 39e1813d01849ac61135b39db4413687e7a309d10690be425a8acb0143b5ec6723c7f78870b282c5cfe5554765d3b365ee7f5cb33deda5f38d7d22eaa09fb4ad SHA512 f07ed91d3b4ee33e1da53d3c257a395c4687ee3867979e19ee890c3dfb7b9b21fa26fbca09c5b5738181fde034b395165c8fb9f8133d3e5a44c536921c45160f
 DIST microsoft.aspnetcore.app.ref.6.0.32.nupkg 3350964 BLAKE2B 65095e3241e9ff16546f308cd7b64378d59657f36d1b893581fee4ab915db8004f29de804dadc87dfe48ff8164ba6d673847f884e5695b857a8722257737790c SHA512 0247c906781d1f4d3f545665c09d7691d0c341c667c6741139bdc12d3679eae10f8831c0919dbf7c3271e59fc046da16146adb6c2b6208d56b0261be58ea134d
+DIST microsoft.aspnetcore.app.ref.6.0.33.nupkg 3354367 BLAKE2B c8a310b616255bd6e08fd10bc528dd7f7996f73a865f42591ff80fd11121117d178ea14ab88f46429372358953110df0f376c62a3de706b3021500d3a72bd8ba SHA512 c3af7eb6852e83a6325b4d454101ce1cac3b7aa28cb9fc53d1e01d8808276f7eb52adef6e56be8b2bac1a496e672fe247501cf135aef57f84ad72b717d5d5ddf
 DIST microsoft.aspnetcore.app.ref.7.0.14.nupkg 3572772 BLAKE2B d13fdf2957220158e22cba3f9a33b60e3775fa22254d21183d38d7bcc9e4220c5cbc2de5a586baa3a40345c3be58c3df38af2406b6b5d8cf59ce29e021b16e12 SHA512 b44f46dcd29ab33e860ef04da42b0151b96f95a9375ae1225c96b6c9af3ae12470962b4dd9c3d33f70bb7f8237a8c8d0edaeb0d17bd5c8d9cd8fcf0d70ddb221
-DIST microsoft.aspnetcore.app.ref.7.0.19.nupkg 3568997 BLAKE2B 282233fb6d08ae569b93827d75a0395bb9da59a5951b68255d01c12dbd8ae4ee7c1fa43412b9dbd4c4ef07ab10012100f60e2ed303891bb51d545254113cc3af SHA512 43d740b98b43dc766605f5de2e1cd8ececa5ff2e6eb3d5ac0696bb8a19e8b098c16363edbe9074f911406b5a58dde46422e6b064b7165398aee137bcc84e95b6
 DIST microsoft.aspnetcore.app.ref.7.0.20.nupkg 3574405 BLAKE2B b25ba2889b7b537a00d8637afc1f30a407f731ffca07f122fb48a6234aa7c0f7208b150d5e77546a5afcc117b172de7c7dace8d07af476621342250dd71bd112 SHA512 c925fa4d9162d5e4898f7737248ae808bcc76d990b9abf9f81e43bf00518b0e5218ca2b0eea962a91a0c2b1f54a9cfea30c9324694817307c9ed7eef5986cf79
-DIST microsoft.aspnetcore.app.ref.8.0.5.nupkg 4407963 BLAKE2B 07910a0f39a4d1f6f09576a78a896794d221b31c0aa67c8b37b61a037cd43c8f55b8162cb46bfe6d11bea15e035bfac2a16e63eae5990e520f4b393dd41421c4 SHA512 2f9b10add30994c9fcf8cfbfec7ac2489b908a28e6fed6d5da201d3d764bb250805df457441722d4bd810a8cd9ef2b475ac33c88e2137168a2556b0d78be9ba1
 DIST microsoft.aspnetcore.app.ref.8.0.6.nupkg 4415504 BLAKE2B 8431cbcd411421aa013232c3de57124c400c6e1edb990af33743126b23103efc5d26d89d327096e18994ee7a85b65f0bdd450f1e1938c149987193b5d92e7837 SHA512 1c294845cda71441825ad4ed70d7bd9e4155a7a389c45ac3f2f08407872716fe077531ccc5b783552cefb729b9f111837ad671655b792bc03ec0d6cb7db796e8
 DIST microsoft.aspnetcore.app.ref.8.0.7.nupkg 4412862 BLAKE2B 1c49f112cfed325c456158702b13a4febcb0e8952ec5e11c104b6a12a1c269aea6a63e5ed1e7e0c522cd6da2f88d0b62d8ee2f0c0ccc82c4370303fd62141ee0 SHA512 c1d801d6d2fb7aced0da35bb04f72e01487c91718500062bb2d1c9835b3ad207a833e674cb18924093a8fa15651a06071efdfcb58ac0db12d681a7594eb0e800
+DIST microsoft.aspnetcore.app.ref.8.0.8.nupkg 4406257 BLAKE2B 9ec770cd2d666a561b9ac1c6ece30cf290c29f42b461341ddf1598d4bf268072a2c90dc773348e5583d029183dd884770f85bede45b463470d04e98d484c4d32 SHA512 a8968bef05af918dba1d79d11100c26fa3b6359d3359f86727dc852a5acebb8e7697aa0b1c4f17d29144a2f26e0836b9e7b272eca7ec86436d046501496a2b1e
 DIST microsoft.aspnetcore.app.runtime.linux-arm.6.0.25.nupkg 10120602 BLAKE2B 79f907afbe46d74bf102fb6010632763b93492e03ce2db0231fca4c6c63c7708b320039a7b0edc54afbd3ada7b1a564ad4779c6a2e50d877ef0fcd42ba30fa4d SHA512 931dbebcd3e4de64c0c9090d9fe1af732cd319f5b5d0572e551f838c1e3944f838be5da7880019e3b571afc735f93c79803b0337ee7cd9b8b338a8e3319e245f
-DIST microsoft.aspnetcore.app.runtime.linux-arm.6.0.30.nupkg 10125354 BLAKE2B 066fef75f633713b95d6461f38152d2c2b506a3e95934607dfc9f47d5f640e7dfa6cdea8d683944483aeabaeffb04de02b1c694cf18bc2ac524d0d8a5479d001 SHA512 89ab670cc2c56237725cecc9893a97804148ecd7ded26dd44c8b0f6094090a05ac87d382a37478d152e821f8ba7eb19ab996c333f8f42cc8262caa9390c07912
 DIST microsoft.aspnetcore.app.runtime.linux-arm.6.0.31.nupkg 10128326 BLAKE2B b85f508c946f18ecb817b89ed37cece8e3a26f30335c7d7c592f3ab55d8e75366096efd581ea6f2498110ae53ff081377bb731d5be8e8bf1cdcdec8c8813cfce SHA512 2337ff08b08b70231934947a41616f349833f87dfacf734f3f5c4b50bed3379d8ad72cfad208c3eb38bba2960adf0f90c8b520c7a0e7b7d2b772a8770fef86bb
 DIST microsoft.aspnetcore.app.runtime.linux-arm.6.0.32.nupkg 10123952 BLAKE2B 4aac0e86b96a81ef894ac62b3b1d7abd5b22b128c2aeb2705d3ad3965ad133356a5b11be06d2c68f39976fa22acf4ccc1c9a5a375c4d6e59890ef88b337b737a SHA512 4f2962103023fc821bdda41861b7e32b162c265b515cda394110a77a52c507662b41ad1f559855ece99202010f45ab83cf3b96cd8283c0670088ef7bd6d64cda
+DIST microsoft.aspnetcore.app.runtime.linux-arm.6.0.33.nupkg 10130932 BLAKE2B e4331dccffdb9bae2d382fa8690753b55fb347cd500d1615680823c3bebbe973ce7a49430584d38e8fa01540595f4284aa36747fa90dbeb66af0f8aabaa871e4 SHA512 24189ea67ecd88c9c09fa101540ebf42e30fc0fd9377b39e7b098d024450c1093037ba42bc0895ab3bd31321337f16c6deb8c9a7b425696804f8d143244185ff
 DIST microsoft.aspnetcore.app.runtime.linux-arm.7.0.14.nupkg 10832780 BLAKE2B de24725c3bcaf0a593946646b70ee519b6173968240daec234b2a0347918bce594b296e9c061c9b7b4983436dfc14d23cbeba1b3a756316ba7522f1dd0d79613 SHA512 539cfe74fea5433f2255bbb6bb7afe545a98098f5299f8b667f2347cfeb45b2b71532f4e0d353bdd0b80195448367557003f4b11021325933845bc57a296f8d5
-DIST microsoft.aspnetcore.app.runtime.linux-arm.7.0.19.nupkg 10844438 BLAKE2B 7411a08cc9a8159b72db617b7066b25a5bcf8a79ceb2e5c8ca65b40b216f262ea4b94491fcd42f3a1ad7ccafc515824a32786605964baa81ffb22a25084903cb SHA512 cbe03e42c3d4b9720295bf48d7f7fcd606cbb7ffc3bdc9807bed463f11ddf532532126c53199df4c4e88cd677e4ce11a839d4c8c9c85013bbf7b7da24de9d40b
 DIST microsoft.aspnetcore.app.runtime.linux-arm.7.0.20.nupkg 10830958 BLAKE2B a5df8bba206169ab47530b8b7843b5c19e6f06c4d846ac780fd8dce27ed11c91d017789531e07c307f62ae81a8d327e99fd0e31fb261cc2b86272bf197d1b21d SHA512 5c7c0196b001c59039f859f2d33b348106bc38b1ea594d9d093e60b63d01dcef41e7af7aca21f45a34aee007f571ff6af730537d538f9158788797ad7f75543a
-DIST microsoft.aspnetcore.app.runtime.linux-arm.8.0.5.nupkg 11785019 BLAKE2B d4d3713d9f69fe0db50593ad97b6ed05f5a1b5007f1ef2ee1533448932e06e35884865ba2829ca5a0df777a145cbde5674cfb771867561fc68d90c600ccb0922 SHA512 f2fad67df54aeb0740f69745918d4d06c9fcd05bff43ea3b89ca9f44f396de456b75a8a6b8896348230cdebcd75cc4cb49e8b12b558c21af9db025c049fa282b
 DIST microsoft.aspnetcore.app.runtime.linux-arm.8.0.6.nupkg 11795689 BLAKE2B 8df3240ed278c4bfd40c92c34c324a64385f03d49e70f0187d6de39a9acd5a9c26f1414f75a424f555b30242348115cef66aacc9cf1bf58e448938f4c0606b09 SHA512 464fbe0d04095cee27bb2796ed01af43ed69f1c659a73ba10479b73f8f0134e876bc283c9a26470b61760c8c2d34726abbee3ca3d29a394a1c1ea3c6d54a6c14
 DIST microsoft.aspnetcore.app.runtime.linux-arm.8.0.7.nupkg 11788723 BLAKE2B 76be4ede1b7ba7b0ca87b36b588517279c3e44f5cf709ca06ceef660c49ded691202ad45dde32ab52018efa0aa8f1f67b9a1dd856f93169369b109f6e8f13212 SHA512 552dad8fdae11575b80600db09a21541d30833a8bd034a7d919f365313b9eafdf207e5c82230e6d2a8be417665fb807e34b8c72a6204b19fa716f996a3fca0c9
+DIST microsoft.aspnetcore.app.runtime.linux-arm.8.0.8.nupkg 11789900 BLAKE2B b9cf0e3af43c1e0535151c3061dd16d19e728e0c065d9582a4e12d270c6a6dd0431587967348fa7979c64c8e3007512fd883ff521934265f9fe993d30682123e SHA512 fe12f4f1b094f7ed4f7fcce5c8ef55166cf84c9bd00fb39b5b0d2875f1f7dea2510a9a9ba6fa946c174adbe5f1ca39de8cc2e8a0efb130fbea6886e5c4377c79
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.6.0.25.nupkg 9894201 BLAKE2B 369ed93078fb373bdd6a640ee1f52ddde23719415b5baa6ceeb32b82532365e2bee736fd060707cce9e0f2840ead7c235127007fde1c86d6449a6022e01e807f SHA512 8e747dc94ce413c8ce3c8ea6b3910e2ae9c81060e0fd73785675aff942bd10a99051236eb367f9f676badc3b8ef47051f60baa77388f8c5a9c87b7de1bc14b18
-DIST microsoft.aspnetcore.app.runtime.linux-arm64.6.0.30.nupkg 9894660 BLAKE2B 8309386d78b4c4e0d9970b33503247a47a77b7ad0cd939a66c418f224a52840fa630423b22e09052630356f12e82584e57bd139318343f723166d0cf22994140 SHA512 6bb836981301300bca8cd51984c9f382e6a5ea9389b0f6ef0be059202a83ed06cb94c5c9d720257a95773d71486bc1e59db68b50c11b55facacaa4ac153d3bf5
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.6.0.31.nupkg 9889528 BLAKE2B 707896cbe95daf4caecac7d3b44bb01e9452905829f3fe6117359c6fb579bff992f9a1edb143b05038146ed95ea58dfbb2154ff50cb9b7b08e20250580ac9f11 SHA512 2cc18bc886083fe495ec12c9fb00ba068fcb0af1e4a29c2dd4ff77b98b2b66c9d9c01f06b84abc96088dcae8d089813d9f1e0be09c38c40fc633a6709257b41b
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.6.0.32.nupkg 9889735 BLAKE2B c60d79c271402905be02b06a8c9cedff435926c6b40659bf5dee0be3289799fed0bdd0b5b66bf3a416e7dbe7a4072cf4522f5a745c6fcbb226a310970894d240 SHA512 c95daa23e9f2569f4aca9cc3e79a125fd919b86f042e8618726eb4ff1003c58f5cb586211291d27a1b92d65058279b7073c7583c164820cef530854ca3e80267
+DIST microsoft.aspnetcore.app.runtime.linux-arm64.6.0.33.nupkg 9897663 BLAKE2B 846b854090d637a125ac5256288c71022d60d95f701d5b0591092dabdb98c499f10b0b78ef9b4f22861959308065da841a089bc724f0f685f367b15fff84512f SHA512 badcb3cb4d2de421880b2220b756485a0b8701abd8b6df2210dbb1026ff27008a67c061953a5a95b1d26e84a3c738c2a12c92aac7414bcf6f453712f9a1acc0c
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.7.0.14.nupkg 10638789 BLAKE2B 3022e2383ff5dc51102940fda9725ee135d31a12a77f7ae96f1704589c16661ccc98260b7c86cfc8235e4a1813be5c2c4576233a3b62342632e947da5862578d SHA512 d9fe593c0123e908bf6d34b3984dfb41688ab6b5a8e47c8383a5eba8cd0e6529bc4ce8a397d5b3d0d87a231a0270a82c45f1ecc890cb132a2bcc8566ed02e72a
-DIST microsoft.aspnetcore.app.runtime.linux-arm64.7.0.19.nupkg 10633554 BLAKE2B 77d8323bb77c919a8db621bdd0e826a1d6734f5e264956da467b0d1d160fd63fc1e23c598481c1edcca8fd7037f18bbd4405af2b5487149ff7bb16d10716a450 SHA512 63146f1de02a688060fa988c5bdbe3e4a5818351e1b989b8e465ca9c6fe17b15ddd0102376c38df2d937c1862181ff5e64af7781a64ea546c88805ff79e51d86
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.7.0.20.nupkg 10649450 BLAKE2B d5203cf92e4f9f7e5a9ee443f167e902a355efe694c87291d734ff0a79716054850992907fe4e1febc6b0a94980b4817ea5498aa718874c05ae7ce1cd038e434 SHA512 eda94481d692f899a1b1fbe065670e1843967cbdb44c54a1c246e96d1b62c978d7ccc57a24754447cb379feb55f817a9f39304f85470661db560af8dc77dda66
-DIST microsoft.aspnetcore.app.runtime.linux-arm64.8.0.5.nupkg 11536180 BLAKE2B c5d11c2b78b84b35150e93c1d1dff521a8c6b16d150183a541b9554acac5ec0953a0cc7de7de4b66bb4da1230e27f744ad12d647c49318904abd874cc3e55f2d SHA512 287fa013fc4d560ca28a67e68baec62fe60f95edcac7eba9be6d51e6b81152bae96555ebc8f2570cad1d2696e34ec2dfa72ba0fab1fdc559bb7cf2f74dd9a5cd
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.8.0.6.nupkg 11526558 BLAKE2B 1901a8bc2880cfe22062ee87651bbac1ee08dc8655d5b86c68f7939a928b28fb322737918e6e71a342507ddec2ce93a2a2ddba45754213e3ce22beecadf737e1 SHA512 c608fb34dc086e96f4c51f583cae1e375a1a3b272f212ef61cc24cf22312d9c1e4096292139e79505debede83da9162e7ac2ae9b655cd2379bbf6971a480725d
 DIST microsoft.aspnetcore.app.runtime.linux-arm64.8.0.7.nupkg 11528589 BLAKE2B 63db0f760663df3977d9810976b9d56f06dc30dc87048c224295837cad0e1d30c42176f1fdabf77cb5028a1107e184f9a7d7771d6efffdf93a2dc44983dcfef0 SHA512 c24df24460ace29235c6a46259d73104070fabafe27e09805d1725cb5690027491795f8198da211917dea20c5d25145d5fca6c29632c820649c01804fc4be223
+DIST microsoft.aspnetcore.app.runtime.linux-arm64.8.0.8.nupkg 11525912 BLAKE2B 07606bde25432d2d57e0ab594a1bc75234a145c6b10edf0bbfed3bb49ed4bf25db5c67697c3e1215f87d4feb1bbccecf44c356b25b0a1abf1460f2a6234227b7 SHA512 377d0e494fdd3a68a08de12f375a643cb5f2e1361d47e8663c0709cf4625dc8bb2c84d07eacacaca7a1078cc7d81ead51a42cf019be2b65096d209dfce948ae9
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.6.0.25.nupkg 10121947 BLAKE2B 3bf9debaf62827d8246e9af208022164ceb925475d75be768ca862d5795f5c9c2515a853c0c6717f5bb0571f0dbc77c92482d3edf3eb2e9f077556770c918824 SHA512 fe3d3aef2387c97b7d6342198d01b341269bc8c388edb6f3d5a9eb37980afa8ba9be95aef2b02f01479167e6f377395096b133879cf269d6f925348a74ee5bfd
-DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.6.0.30.nupkg 10127015 BLAKE2B ae93cc9bc57d7090e60f0dab38241d6dfee7bbc37c4090bfb0abcc6cba360522f3f4d9dce5d00b30719eaa919830f16acf6532ea572351c82a6e0243857d2296 SHA512 901860e6c6573d33d3122a62ed02db455b850d3a938536ec8581afe51732be7ad4b20630cde8b719d038cff0fbd0217282a3f880831a52a2190ed9c33b654dc6
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.6.0.31.nupkg 10129602 BLAKE2B 1cdba2f549834cf18b1ae2f6504a240de57bf73a9c934e9533247e3d83cb23bb737629cf4fd2f8e8ceaa89280352f174e138a6670151a87dab015fc974fb513e SHA512 79ecd7a5f01e956f479586e8affea6548aefd5a9407be0d278b91bf4f6fb629d75ed7a52a0924fc892b12cd4707840d46cf654dadb44a4003db049a828f6d5f1
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.6.0.32.nupkg 10125307 BLAKE2B 397d4866520423be171254a1d2de749df453d76fa3cc31af5ca2836cfa6a21096d8e079ee11c484c0f76954a5970def575eab83ab466f3057bd0944ffb538fc3 SHA512 0d38a9e4190a970a41c0551bc18e54dd58863aeba79ec39be66b1eb288e5a4287d5449248c6c1a2d52e245f0c86b36b05be1e168df34ea3af0399a932b957f3e
+DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.6.0.33.nupkg 10132324 BLAKE2B 7d8aaca558498fe4692d11631b9da228783d54e9e3673c6ec5bff18d4848877e20b3b17a18195a73d1b8e5ae3b3dbb92e7c94b6fd937e32f9bef119d8b738131 SHA512 33cd01cf74932c26abb66934b19a0c3c8df8c7aabde3c1d64e8d7c2543e79e74dcb382411eb0a8afada35246ed5bdf00741fff700e4c6839ce3865c9bec1fd72
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.7.0.14.nupkg 10828513 BLAKE2B baebefba9d3a93d22ef3bf588d3d0b7d16b6cf1d9ca573aba80c5a4b89a81a6ef6c766c0678dc56533c98ea7acead1c87a23e133ef716aab6aaf4e160e23138c SHA512 a7b6e8a39efdef1211088cc91b9d9d50d2d4a934b2b555b5cb2c604f59f1bda974fa84be7686181205edd5fe133f4ccc5b801f99cf2d66448f7483354df146c5
-DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.7.0.19.nupkg 10845966 BLAKE2B 2dc3af32669b15c297e711eb5c6f3ebc95daf01d032fab40c003fa3702fd2bcc426941bc88ea1a1b5954c050f581373ee117a3dcd9c9545a9a83883e16611fc2 SHA512 2b8ee090efec1d2caa7999995a7b8749024e4098df2796da8edebbd5e73738dbfe45a86386fde4c535476bcfd70905b4fc2ec73d32b23cb7c6fc40211e80bcf5
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.7.0.20.nupkg 10838156 BLAKE2B 15b3a919cd22b3ea574dac62d76e2d39fa496a07f9e6e3d455cdabb99b34d0f8424efce1a404220c92c130e081d837dd8e53a1968881d3e5a10094c73ec1d961 SHA512 3042b803ee94e73731e2213e0fa881587a085ff90949251795731e58d7ccac4f24cf6cb4473724e7fcde217ca3dfdbcf0899ae3609a436a27405df7c93de2c7e
-DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.8.0.5.nupkg 11798069 BLAKE2B b12e469a7e43b23a9f51db2635e48d4753cca2401b5ee0fd1fabe01bc92dc614042f18cab2b3f52a02600530bd6b9045b88a0d013192b849954ee13f0b905b0e SHA512 19226b7683fe4e183c356c6f32b5fc623da87b92b2ab756be9b199f7f091dd6c6e38b9e50933db3de4c98456c39813aebbb6ed6451600031f84e77f0c46886e0
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.8.0.6.nupkg 11795628 BLAKE2B 654dd8b6e2b27b0206cad77c890e49215f200970ee108da7a2da958fc260feb999e565ab8202357e1882de186283a0af07b6021202b9f5da71a892c9fdc01cf8 SHA512 37e7bb591e5220d2f34667744c87d7191e821649276733d326fa3891aa680ca5b2a30f23363419d329f64437a5abbfad07ee33c7f2800b60213ba188800dfa7e
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.8.0.7.nupkg 11787118 BLAKE2B be1c0763d46c9c01ee72e379b7bc5cd00c7613877f89e5d31a2021a38832c9917ef15f1e42e43f0192beef5b69dfb9aa48bc2acd3c383643d1bace0f9180d4ab SHA512 10d9db5c3acbb35e854b8c8f8908351b544df8d66a481c664932f5c3bd24c77592f107c95387aebb0e52ebd66e0a37e73318e7ac46552086b729fc2ff3b36a41
+DIST microsoft.aspnetcore.app.runtime.linux-musl-arm.8.0.8.nupkg 11792366 BLAKE2B 4e020bd267df329b706559a9fb8e77b7421240bafd9cb065b356fa04cc7ebe7ef63e7ce234a19dd34048d1017919867d3dcbefb751c98769b975c4d54cba1fa1 SHA512 3fe9f2f373eef2fb579d73b3a47c936d054c67fafae73174b6e94f5fc1dcff1656504c6224a31ba54255d086225232526fca2d1103d131aa2b7d27972b35b662
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.6.0.25.nupkg 9895615 BLAKE2B ee2b219f67858cb857189be50455f6b67f8896e233f0c300d7fef758152340eae9f4e12bb2e59d1c04d88500d7a9fbc4c0c80940dbdce21ee391e8ac28260912 SHA512 1b6d1c3c9656ebd19a7b2e445e4e734e205ccb74246b984fee3b0f96c4b835705e47a4ca3a2ad07811028555ffbcc7704758752ac6b22a81e031834381252499
-DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.6.0.30.nupkg 9895808 BLAKE2B ea76e1635e35c9de92cc064fe91feb95b20182aa6d951aa114d37b0d2ca97438a27f4799aea9e8b18d290c7b4e887cf43ffe868531c12a98ffe684db950adf06 SHA512 cca53e478a7d210d6cd380ca29e7d658a39fe8731bfc919fccb455c144567d1acd64997e3472497750eb4bd11480934776b5c3aa8d3ece780e93439dce5d2468
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.6.0.31.nupkg 9890987 BLAKE2B 8dc755143d543bfa8967ec256fcc62320bd2854ed890093e5c30b232a89e89e30a6c6ad3d6a0b6edbbc8637133536c72856976d2d191fe8a36912e675747cc28 SHA512 d0edd4fcd118cad60b741cf3872509183247f22ec47edeb0eaf9d4d540ffc6c62fc458a8074f1475e34a182bb4361d57fe89c8e043f02f999d6d738a4fe15d07
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.6.0.32.nupkg 9891245 BLAKE2B 852176ff6ee03aaf0c4a9af1b8c23ff01e87cd19e4bba3abc6f74e46aa9e1bc127447349473564e531a2155bfe1c0cd3b5fb915b9a7b74e530c797b3c942f6b3 SHA512 f202032888a5cb953a645de20d40c6b97db7b9c2509188bb940cdcece36d94eb95143b6166796d66d72cca35568f3aad5bba724f631d362d1decc5546c2cc51d
+DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.6.0.33.nupkg 9898967 BLAKE2B 1b2bc532353d00c0c5b98bdb5e80110e8bda79a44862e09ff8bcfd6bfebd4f4de835037de2c30377f92817551a1378abea5c2706899fd884184ccbdb3a81781f SHA512 0bc5664d3fc77127afb062662e4b867f873d580c1009addd616d4912b074e1d7f0faf7d882b0f51103d4ac52eb993e37718aa58a68152feed17e1092f60d18c9
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.7.0.14.nupkg 10644195 BLAKE2B 20c3accadca675cd0849fb966d49c64953a7e0841099e145f8e497d696a6092bacca684d67bace728cc8d2b3c5b13b90e9e744a26968f1c8dbdd12af434ed8c6 SHA512 fe7fbc9167a0ffbc735a08440fe31d7914c2201614650b3536a3ba2d2ae0fd14b39398ac6b398c7a1012f46620404ff19faeeace631fe0b7dfbd9bc12606450e
-DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.7.0.19.nupkg 10650775 BLAKE2B c17042afe0dc47909d92933d117503c3226a5ce22fc26060a351c79f1b8d9ee05f5a24d4fb699d8ce6d0cdec8087eb58fbed02b0cf2c1246c77cccf158efd55f SHA512 43614e1095cf853f4cc12a38d337e0ef5402d2da2c857b6ee86d39985e4970ca6fb2b946881bf75096ae375e91674aa4281c547d7528a55050bf0cd34277e8d6
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.7.0.20.nupkg 10634450 BLAKE2B 939392cfccca0676e4c7a7d4c03fa7e705411a14fc9882df609f08b0a775e41bd8a24c98b1e567d6f7355420097fd28f85b83ce2c77d94c95b897fab725487b4 SHA512 fc7b7d2a062dff1b16f1c83309bbc58ec8c6125c76e2be790551acad0480e952c9311beb64bc14ea52c5b98d71d027c5e402ecd14bdafe30b14edb7ece081a60
-DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.8.0.5.nupkg 11537578 BLAKE2B 68f9fa30eca0855ec017d8eacd01d2af026d79901b8157e64195813e3c346afa547005e0945fc3d767fa909a5199bf68fd2d046714fc48f9c96d9cd37eafef45 SHA512 693e0779ae99ac4f6a55d43e185d910879181e854e1855cdee71383929f02f3bd95471acaa514edaaf2286d156fc16b7c7e67db9c569b9a290fad6b94dceedae
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.8.0.6.nupkg 11526617 BLAKE2B 39bf235910bb5ab4d9a04a219a2ba477245dc03bf5bd4adcbe9aaa149120eab6fe52008c2dad7284745b73f91a29bf9edd3d924322bba505107bd3a75f3c6961 SHA512 1d57acec0726a3b15cf4f57749cbd5e69a09d913fc5ae1b495b4ead4e93545eefe08b5ee180a730a100730ca1ada74ca98c93c93fc2b55b99067267f84adb43d
 DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.8.0.7.nupkg 11526548 BLAKE2B 9c9601827bc924cb3033fb9e06044ae5105ed73ae88e3259bddb77ad6266f1d206f90d2274ad1b0f2b2ee8b328b5f25058a0ac18aea8c5da5dc483f830854c1e SHA512 d3cc7813db4f7775535eec467f6a6c7461fd03ff7b7a1cbd62fbd3ed0489513cb341b156f441ef8be6c388b52e76797271cc5f90196b126f0fbf26294295e1ab
+DIST microsoft.aspnetcore.app.runtime.linux-musl-arm64.8.0.8.nupkg 11534467 BLAKE2B 9387b7b508608250483a266f2f2bed81b1c37257d7aa5f80022a41b058d3fd2b1c86b087f35f89eb56e5b66160a0519ee3c70d179b177b12df39e72a65e8d3e3 SHA512 fd246cf43ad40ccede0443c2fb56df785c5f587274cf7d2e94e24ff56eea61169c038751bde88c22f9f12304727fa6dd69f22db889cc98e716764c5d54fa49f3
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.6.0.25.nupkg 10239665 BLAKE2B 8447eee0c35ebdb4db6c56e43962ab7ccc2138f83b32a00f03fd8154b804e1640c1329ee4e0bc9d72f001d8fac020941ee1cd05efc1b6164875a784a6cab3a64 SHA512 23edb917bd02cf48337295881a7fc6c00dc8c2221367ba74d1531ec819224c81619bb50ea5cd3ddf84d17d540a8c4b52b2bdda88d604f3c9c96aa4427a221b16
-DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.6.0.30.nupkg 10245506 BLAKE2B 065a6fa92c2725cd1c0fe4dfadcb54b115c5fdf6df890ec21d547154c9d5f3af437b15835aa505a8d8c287929351221e1e0b2cee14cd4d7166d86b7eb3685c9d SHA512 964105262ec140d5a658f3ed2766c965990e22c90cada972829f5a71d9d3d4be8452d88f84caeef64ad83f5743e981e43c6e0b2470672b99810b68e25f6f567d
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.6.0.31.nupkg 10245991 BLAKE2B b464c561f9bf119a21c9bcb1bcba60f67da6767858fcacfc969ac787194fedcb1026117ebb7ca7ad59d6dfbd25068aa887ee320f833b884171ce4f799582e2ba SHA512 e7cba7334eafb6d98aac9bc2aabc59484dfba619647ac2ebcaae441b60583e44020357346b0badb30d1ca3e1b466c375fd4dcae7872050a5db9d573881b9f5bc
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.6.0.32.nupkg 10244510 BLAKE2B 961a52e13243cce94c6880ae3421325e4a7b0690d387f9c52232092a6974639db6aba56a74b574a9f268d4e9ec9096361f350d7a6fbe2cf56653b140a858b6e3 SHA512 ec48a1e5e9b7e922ff5dfb574d157c6e1554a5a484e2ee197faf46b1083d37e91deb6d2d22923d9c6872611c1f5ec850abb0ea0061c28726ddb332f5a04fa68d
+DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.6.0.33.nupkg 10242435 BLAKE2B bb31f8f640cea5dcb1deda0dc17ca7c3063bf4c546bd624930e5be8922dc6e8a2c893230bdb13c2b2ef966808caab17bf43c2d56bb420730e50a6f095cf71ca2 SHA512 72da15b913174024224492f210618b8f496b300659db848e224da5cc92ac06f7fe3f55055fa99026970b27161ba9e2104a7eab7eaaa29624f886677a6c78e691
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.7.0.14.nupkg 10891413 BLAKE2B 78cc4ef503e8644315509c31bfb130bf7554ece2e4c5801a5ecc73a934f27ed04eaec696535271b269feadf240c93c9c1cf8cc0c9bfee19aa7597efe84497121 SHA512 61e8a4c4a4bf51b40aa069143af97ef608ad5ba2732586a5415edab0730496f6e654a0909e04ec909e48c2ba2f5f7e0998c7900d2c8afda34320126409daf6a4
-DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.7.0.19.nupkg 10890958 BLAKE2B 47aaf19644ff2109ae056308f7f78bb033e83bf06c7a09929b5f9133350d012882b06fe6371aebd99524f03ff16d7b580661aa630767b9f626877e5e42b47898 SHA512 a014d30aa669075c39937e39271080add5e48b2b9552c59af49d3fb00737d9dc0a612fe741d74efa81eef5692c8e62c6fc0de42914cebeabfc10b441dcad11f1
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.7.0.20.nupkg 10885360 BLAKE2B 027dde78b9d5113152af7019bfde8e2edf1f993cb132c686fccb9e1e56413676c863f54ce6fb32050e5c9a0e9747520cc06330716b49c94363bbfc2b0a69ee5f SHA512 c21db96c1359a2c7e53e3da971b20c07f7edb6e4850af5a7e0df1798361de9703dd51a519381a4671e74e4f982fa4a5f536160334378cd682a9e372b89fa7a36
-DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.8.0.5.nupkg 11811511 BLAKE2B b072cfc10d59bbc364012dad4836dcdc538f41d3b78bf6e2ffacf68cc405c8a4ddb168dca48301c4aefa4a6ce92898e4e332d611a25f6cadcc256e0f83f89181 SHA512 166207e1b0c45b565e6f9c634924ba231686e0bd459d672e731c1db157d6e32876c181db76b26be3d652151ae261145c75b7219f2950994e61147cb69e9ab7d9
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.8.0.6.nupkg 11811006 BLAKE2B 7d56c88cdf2312296831a902400cd474ff2be4059386a650f1b1d92e13b5e662116b1e96c249b2a30e77ace59b0ee82368dafd3ed0d3269d67d2116a3816c10d SHA512 f56d5e5fa3fb12f289543042cf7e12e429c578ced7d6dc0919022ebcc66e25ecc9ffbc9182672617ad278ea64116733f1a715b35368114b3b6ae72d7bf49ecc4
 DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.8.0.7.nupkg 11809354 BLAKE2B c0296a950dcbeb1d97364d41e8c3365824aaa12191491d3b94c1dae9afc83361971552618ce88dfecb772a47e52308560e074c89e5df983bee6f3b305221417e SHA512 14dba8794d24e0b861f3658d1d21753fb4f855dbd246c7ec07d9a3322316cfbf23827d34ea328bcdbb62b8f67b791b2ce8586f3c78e8517e090b34b6411afc7e
+DIST microsoft.aspnetcore.app.runtime.linux-musl-x64.8.0.8.nupkg 11813326 BLAKE2B 6351e8ca403ffc361843d1731e7c6dc891de58b7b322f02cefad988f6f633e6b535fc0de94dd84838e3de6a9e92715bfaa93775563b43e16caeb03b82a4c988e SHA512 75f114ea06c9cf43c4f15d4b072aeb4581b24027fde6aed0ffb72901665b53ff70eff5b80c7ede1a17b370608bc62c337a793e76bf6b9760b2b2a24de7b9091b
 DIST microsoft.aspnetcore.app.runtime.linux-x64.6.0.25.nupkg 10238501 BLAKE2B ba9e064e98b723c8a9a63988489b01ccd9a4013b30199483bfcf385545835fbc7f4085f2b24d486abd249f073c9a4b51581b317ec7ef700ecd77a630fb6b33b5 SHA512 b4633649cdd291f03505712bd518627494a65773f68a958f51658e22f5773a09857c8f0fbc3d3db7cde33e9c17a66e34b2e7f80fbcb2733c45fc669eb096b796
-DIST microsoft.aspnetcore.app.runtime.linux-x64.6.0.30.nupkg 10244275 BLAKE2B 0b9dbb5a273ba2c0f93a689540c6d0fa6b6cb8e6e74f87622e379e42d0249088779e52d720368b22fec41b042cf172a36231b3da14512838f7be8d0c56f7b4f2 SHA512 088a75ea111a22dc46d851e46971ffcdbccb30613cb935384ec1f15fa7c83583f50aa1b77f4121326732bb807092704fcb4a1c8d63899e882181a7e120678842
 DIST microsoft.aspnetcore.app.runtime.linux-x64.6.0.31.nupkg 10244546 BLAKE2B 461cd933c6dbb806004a1eb3aefd13c72c3d39136c1a176ae2b30219c660307e82bcb8cbcea423cb5b45a1e1e2353fef88025d754676736068f16ef2933db434 SHA512 74f2e7386d24890faa3eef28f80574b4dd82c6fc8c418ec61cd634d15f3674674ce4a358879369f8a1486b36383a902ea602e32996cdce18eb4495be6a0960b0
 DIST microsoft.aspnetcore.app.runtime.linux-x64.6.0.32.nupkg 10243163 BLAKE2B c3456f5d583432066e87b55eb0d1969a2ed3f07dce937827ffeaba9352424862bfa717943616ec25e3e1a4cc75bb79bb9208bb7cc0ba4b7caa15dc22549ee284 SHA512 d752d08db70f940532276ad180f09f5ae585b73d2d4572eef2d8539a2308999b5fd222db376b26cb762a72efb462a38d4a7791e0015516130ea1ed7de99a9d16
+DIST microsoft.aspnetcore.app.runtime.linux-x64.6.0.33.nupkg 10241081 BLAKE2B 6e1cdf4367a5488e7ff4c845516ef11fd49e9fdfd306c6a95025054ccd0a2904d75eda3a175cd5af18bbc30a01e14898c251c14864d114e8d8811d02cdfe4d87 SHA512 c01fdf8100874507ea950c7223c283993e3bed521950fccc0e56c1584ab1c32771f951317f654acfb56eab21f1d3d854436eb774783326dded4225447324a5b7
 DIST microsoft.aspnetcore.app.runtime.linux-x64.7.0.14.nupkg 10896161 BLAKE2B 0cd423dec1ce3c73a439f74af6dfb0dd4dbdd177f163dd672829fbf58e1fc9145627c4d45bf243950e668604b18fc95fcbb14a4d109e38f9f150df36a461e869 SHA512 01e3f1f12046e02cd8483dc7025fec4ce57d00efd1c042ec1aad5c482505b44743f4450ff55eb27c32adc8f3b10ea03e0cd720f7b55c73c0ef2ed5c095f2fbea
-DIST microsoft.aspnetcore.app.runtime.linux-x64.7.0.19.nupkg 10885170 BLAKE2B b7549ce7ff4e0f3593493528af29f045ddf867cf4f8bec1e12ed2686d8e6fe0b45709db52227696c1559ef2438b68c682b26072ed5e229470e371d6b376c8410 SHA512 ffb1bd7eb074e575f1915cbc2fc474720ac11e64f653ce24bd37fcbd1aa543b0b57fb7a0e256128a52a1fd6967d9cb3f06ebb9fe67ea526d63f8aa9300aeb7e2
 DIST microsoft.aspnetcore.app.runtime.linux-x64.7.0.20.nupkg 10898665 BLAKE2B 17b364ebebc76c938b7f3dc1c3ff21edc7c668859c64166006a618d32cb14193a2ad9353333cdd38c9e6d4c1b1958563659f9e827837408e72f0863cc4e63286 SHA512 0c2f886ac4af61f9c592b713de09ead3cb748952a620f9b1105aef213c37a9dc07f58e64cfd644238c607100486ebcd4704fb3ff9af05958404dcc4d1e06805b
-DIST microsoft.aspnetcore.app.runtime.linux-x64.8.0.5.nupkg 11810832 BLAKE2B 3d1ccc539df3d0cf6578ce3b47f115e9c1bddb17dab522ddadb7a41c7e778b8a4b878a68174f9c23a486946e1c85019ab430df99b70bbc3eefe679d9eaa87cf1 SHA512 e53840b17723dd593f0daffb9fe549a1d924df1206973c8b3e26e48ab0261822813f745d9704303b69f78e2ad319d924347a35de6ee0c196317bce82df2e91f0
 DIST microsoft.aspnetcore.app.runtime.linux-x64.8.0.6.nupkg 11814085 BLAKE2B 6b27c38b1620bb6d6562360275729cd55266a2885f3caa67ce30b623278e7ff725b97db1d354a76e2e612b27cba00d267d6de158e2dc2fb9c8ba9393433c9c0e SHA512 6c16d99992b6aa718d1025d990023257b52b8296c3966ccd2025dcee0af7725ee73367172de5f972dc2387ea0110a4391c7efe7e1fe448cbd6abccab161d2aa5
 DIST microsoft.aspnetcore.app.runtime.linux-x64.8.0.7.nupkg 11805865 BLAKE2B ce3f0764c570a493c5404e118c61721b790171de538c2c53033f4185fa3a5f07ddb420d525d9a45e08fa9ec27044cf37783fb566a0d51beef3a1a81046233342 SHA512 d988cda5c92f6d6389adfeef6883adbd5c1c1117af56a824d0db912631db27d1d4df4d8c5e72ed8c438df2037ff7ab57e5d71d14537ecc283a351e3ac3c3be48
-DIST microsoft.dotnet.ilcompiler.8.0.5.nupkg 103489 BLAKE2B 7ae6ecbefc06536373c4e31d07679dd83b5cbe6fa38fba43495520547c1827c30da1ba8bf2122cc49f942c600917dd57d404601f4222556db70cd88461fb620e SHA512 226d989326547384da1975e7b3c82f72de598be705d6b912367dd7e41a0ca94683841290cdd7761b7fa94abd14ed4c71e4fd6dfc20cfb16a98dd3525f65dcb3b
+DIST microsoft.aspnetcore.app.runtime.linux-x64.8.0.8.nupkg 11815717 BLAKE2B 9a3095e623606f428923afb049684e57a8c8a948c0f46b17948aa0364c3c032dc061caa8f947df0f942872408ffcb42ccd790d6171993e71be09cc6854e95f30 SHA512 9912abe28750c7a38a0606f63ef02c0543b55a9eaf2aeccc043b4d9bf9fabce6e17998a5e7ec53566e4e80f66b62e16820d7d53f66d1a5e5fb5f0d65b0989aff
 DIST microsoft.dotnet.ilcompiler.8.0.6.nupkg 103478 BLAKE2B 48d13e97a56f2992026ea5db8ad2d1656108780f40eda0ef143b26efa22c826cd5cd546cd76ffad1915bd75432855f25543292432a00b8fde0773dd998b372a5 SHA512 a2212571042818adcac9cbbff6f2caa1503af52fa6e5ad9331e3dfeb45d1e467930d877fc11fd9c5031c70ad6a90a54a6e20af0b8ce88c8232996a6b3128b863
 DIST microsoft.dotnet.ilcompiler.8.0.7.nupkg 103338 BLAKE2B ead209fac8f5405d518460750738a17af766b2512b54f55dafe51b828510cbec59feb9a206f13ebb45b609c057ae1bec8747d9db776e131e5c2cddd787bb0467 SHA512 9cb4a2c0b49fd555b88f1d81842ffe9c24c6291f8a6b7b2c3696b7a1bbfeee5f1c50d6b80ec2aba55eda833166efe1d6dc23535fe17460c1ad84abf17696cbf9
-DIST microsoft.net.illink.tasks.8.0.5.nupkg 1443471 BLAKE2B 01b4c737716d651eba0c0008b51a48dfa5bd057650037bb6067cffcd8b9ecd22fbe510fc153cbd5f0ed6d1795fbab34599cecb95fcf36e1a195ba9a6b5d739c0 SHA512 5f13821eebe47bf5ec4afc22b508b2449e79390790d65884f5a4f7bde16d7f23f7aa3d842d851ec814c85205996d1449c7015c95c5f2b1488ea334c40455bc4f
+DIST microsoft.dotnet.ilcompiler.8.0.8.nupkg 103485 BLAKE2B 2e53418a308486c5ef3e50066f392051e487ac21b3c950e2a4605c235b4132ab5e20bc275c9b3fee6f8084ed2f4b8987d356ac68def4ea50acbcda9b5dc50585 SHA512 d9da7304e1a107b5b3a299889301bbe0dbf7d0d02fdf4e29ece37efba2624fb2173753c0177138d727c214d5cb98ac6af2f56afd68f7996791c2baf245b997be
 DIST microsoft.net.illink.tasks.8.0.6.nupkg 1444752 BLAKE2B 9b427252f2b6d8a077e24cb3a81087edcdbff6882c480783e0d43a6d9f6672dd565e226aec54e6e9074fa113975f3eae7c5cbfe3c106f7ae8816464382c67e86 SHA512 e1df55eab906146a1a90101ad356464609be49f78a41c3cf12432e1f2c3032e8ef72b3c3e7a2d1b19588fb89531b51add81fc33fc3f8687185a9f0f827bfc33a
 DIST microsoft.net.illink.tasks.8.0.7.nupkg 1445846 BLAKE2B db89eeb73aa86ce75afb1331e245c9abfd3f25a0ab027efa68bdfd0a7da3f08e031f0ba04eaaefcecfa2db6fc49a8c03fb55e986c41335d31ca470ca21fb1756 SHA512 3a7df206415b81aadb0536c3e34752001141b0177e2dd2274800bcc455d61babcc2eadd2bb8f7710abce3a63c30fd88a23aba26cac1156e7b236367f7d6e539a
-DIST microsoft.net.sdk.webassembly.pack.8.0.5.nupkg 7350494 BLAKE2B 3370bebc45f01aae8b808eb7206e2bb90085eebd59286effcc4e0c677832e46ac3b00689242903d3c058c27c90bccc8c976efaff8b29f4f0cf58b3423046f42d SHA512 dd04e9e449f86a173b9705027c4ccf7e123394a62e15afd230f4b61eda896f7fc797996ef39cf3a4ef841846014a6e5e54b986938c42b2a1908ea4acbbb60ddb
+DIST microsoft.net.illink.tasks.8.0.8.nupkg 1445824 BLAKE2B 9a1cd0375caa5444e02dd704db6aedeb7a3dfddaf78ef21cb0a80f795b899532298b11ee826c016158577e02b757e0abd32f5b6aa56df6185d9f9e0bfbe273ed SHA512 1c2a41e709bc210e925fadc90e8bcd23a389329ef989cd19783f06dc81a520753b4e99f54749ad85b5792763896a02a6cbfad03ee02efaaf94fb14fa96ed7114
 DIST microsoft.net.sdk.webassembly.pack.8.0.6.nupkg 7350512 BLAKE2B e2ca99fa2d0025b19af395d95b407857ba5306e10390514006db9ab71587ab9f4c9fb91b1ea8c71e4e7a387eafba0354d0e96face926901b389f6bbf04698dd4 SHA512 d1b214128dea4f50c4a2c9b511262e6d3e4d1119dafc1992528de87e12494bfb116785ca774dbb401e2c4d906ac1af12b63b189b846729ddb5da7fd420468172
 DIST microsoft.net.sdk.webassembly.pack.8.0.7.nupkg 7350537 BLAKE2B a8872e5b27a01e3a9832cafcaadbba82270bc6cb8e39be479bb7358302c9836cad01e8fa1c88c5b0da8d647da9e484b6a11feb3b6523989f3b8c849bb177eeb2 SHA512 8af6b37634a2ae26e0d571047cbc12ca11c1213d17d3259c5dce9dfdfafe281969ac962d55662afe3f1df950d787a70ca0441e7bc2dc47d7074ff6c382dd0303
+DIST microsoft.net.sdk.webassembly.pack.8.0.8.nupkg 7350474 BLAKE2B 5347efe7d167932a175ab87957d882e0355500de047841bff5f471d13b72c28cb6197202ee448a6c10ddb2433d0c6f6c0a53da4479ca3507de7788a00d8b9170 SHA512 63e418ffc80e6bff5564e50c1deff7380ef344164fb2ed3e5043858bf2c5cff87f5b97a4cc6b95a39ab0792137d5b4685d16778dbf8dbaa99a214058034b057e
 DIST microsoft.netcore.app.host.linux-arm.6.0.25.nupkg 4050867 BLAKE2B 6f2916c1702e3e1599ffc6607cb395f23f9a97f5d7b9a732d3d5a43a5a81d8eed875a6ff72f29a4b3a4beef022bf473dc8907e71c97b26b377ac9a101a423391 SHA512 3836e290564db1d02487493c7352f82f353d7684a13ad646b157296ed2f7c8d916d2622f090faf41039e111d2b7ecdee1712117b948c18f7d3519ebb6b87fe49
-DIST microsoft.netcore.app.host.linux-arm.6.0.30.nupkg 4052807 BLAKE2B da8c1daa67bd3a4cfbe6173fc48350294dea73156f93ced7d8e5be412a4d0717d10df2c5b46f3be906f544b44832f713d17f5b056f513826f7e5b50ed13a7276 SHA512 7b45ac6aa84ba097c472cbb42331045564dff41c5235ead22c90dc7b94d847de35eed22e1daa93cad7df4536247a229506e889b1330aec963b352d4c40a9a79f
 DIST microsoft.netcore.app.host.linux-arm.6.0.31.nupkg 4052813 BLAKE2B 3253e66269a5da56cea93da0f37b07e1a625611e4e60aa7c9fdcfc9872db684e1ca02be423649e8861e5d19eac1cb9edc26006eb8738ea81695f498cf20ffcc3 SHA512 dc244ece137a426eba25aedfc0d782f869a3ed631bf78003eccb55eb8a75308e397b9f39c0e5019ec8a5b98c19d5de4024bb290bd84c3cca273ba7f1d3b9c561
 DIST microsoft.netcore.app.host.linux-arm.6.0.32.nupkg 4052066 BLAKE2B 39edd07e8eba76878808b12f0e8b78c6f29b948971fe762089bef383a93ef0bf89fcd99cd2a8991fd111b951c11fe167c6e8722eaa48347916cdfd486c6de537 SHA512 3444d5fcaedbbb6b086a78f463d0505f86ac0a612b481dd4d9484f13b6860b5d389fd71ced3d63b28b99860fe53843458a2222586bdd3cc1285ee5b7bb1bf00e
+DIST microsoft.netcore.app.host.linux-arm.6.0.33.nupkg 4053770 BLAKE2B 26391e7219013649b4f55b93ad22b7bbd1d2589a22154d4f1de890a8b1894d9f1856295632d7103cb0d182e8b400beb68cc3b89003d6af9752ea72503116ff75 SHA512 983840c56f56d9ed77837daec7b0cfe383e0b5923e0804370a8f66ddff523857daf31ba8c1a04fafacfb80ac454c8fca56426dd9bac848e150e9802ccb2be2e9
 DIST microsoft.netcore.app.host.linux-arm.7.0.14.nupkg 4055641 BLAKE2B f301bb1b82841012c348bad652f6736530cd71058d42ce2e8d9ce81b2d0c84ff2f608ced4862a97a0cd5fcca8963250a327a33982db8dba3fe93032a2334ec13 SHA512 f0ad857400ce7c17a7af7c6f610a857a2f8135c341b3b6a48a0eda7eb31d67bfaae2efb4ad24f5b393d6d0cfbab9866d7b0258d8b8497e04bce24bfed258e313
-DIST microsoft.netcore.app.host.linux-arm.7.0.19.nupkg 4058085 BLAKE2B ded744fe1f621bca55adc2515824f120eb2c9de58de01404e352bce19f46366b44d330115c848619a4ca540982d477f5b8831c5a802916ba8024cba5cd302803 SHA512 31caf34c8f2ab45d869d97a2cd1adcb6f92e26cffbcdcd86016c7a2ea9b23fc1bb1df36a259740a5762cfd394981b353c314201e219cc153c060a608a7f85801
 DIST microsoft.netcore.app.host.linux-arm.7.0.20.nupkg 4058044 BLAKE2B e5f5e6a548287b5b237945e7242a38319ca46b53791e909565f8c188e3748ce57186e489d2308cbdf31c5e0aa350d486367cf78695c5a9ec89f28c7915be9249 SHA512 73e3fcfc218f7a29f1fdc87af544a8a57d2de27bb1fc9bd2131b89ce195c80da2b69858977ea9f478e2a64dd2075804a23008f7a6ff1013cdef05c3129c1b871
-DIST microsoft.netcore.app.host.linux-arm.8.0.5.nupkg 3944234 BLAKE2B b5388b9d6342f10ed31e7fb8c70e1f58ddca57f45ed7880eab5665b1978abb299f71748978e33e051069ce302de6d40674bdd920bc867bdb76d8acfc882aad18 SHA512 b70317080cae3708b54407a9c9f8da720852d89fbb88595e93c85b5cf1fda979b09bff15709e4665ad5a36c979666f62a1713025901b6729d70a8f92bdda551b
 DIST microsoft.netcore.app.host.linux-arm.8.0.6.nupkg 3944267 BLAKE2B f6eab6e5052c81004d6d29dc3688b47cd9adc39609b21765496e8858e92f891e1ed3dcdda67f74b5e78b6f77198105fd5cbe4a8c9a5e98a82aba04d9fc36eb7d SHA512 008357252426e661d71d71dd4accdf3879b21e8df4bd175d9202b8e8a7a4b551bb8c733d2f71918209f08c273b9364a1ffe7ea8ec2e8eb9101e483a04b8c00fa
 DIST microsoft.netcore.app.host.linux-arm.8.0.7.nupkg 3944392 BLAKE2B a7d544fbda85e1b0adceaf7391d8c4c02e2a8aeb1fec97c59dbc1a1e01e8d11d29ae2392362342e269f65a0057aa5ab70958f5ebddaa60101adc5657e2bf6c71 SHA512 09bb5fe5800868461d5ff6275ac7f999793241368d76fa7512acde63800b5b29d8023e3c1a445b9a0d19a1655a04e5abd60d7470ac9641c173d4703db354365a
+DIST microsoft.netcore.app.host.linux-arm.8.0.8.nupkg 3944371 BLAKE2B 15a43422c5e10b39a47d572499b31b78f1570f7ed779b0644976309c180b773385d4cebd66a8855346a6042c0aea50262962a6b2afff08281e4cd10090700a25 SHA512 072cb816ed173ff5a3d2a8da3e3824234a1ff992e11b5fa494c83a4f3540328427d1ccfd15a8c224099d73076f8ad91bf9cf0754bb84d6da3fb78eb053f17f07
 DIST microsoft.netcore.app.host.linux-arm64.6.0.25.nupkg 4521551 BLAKE2B f675d1c73f0f644938849a61739a5dce6d2f55c0f6bb1b69f55826566f305b848ff36c18ee9f743c73e9179463fbe531d25670e4903440296ee3681c720a4339 SHA512 ca3c85e36c1170633102b8ace1cebfff88922182f821d237dac68be4656d52bb3ff0e183f51c81c966de96351430f7b169ffa04a8119883171e380b5845a3c58
-DIST microsoft.netcore.app.host.linux-arm64.6.0.30.nupkg 4523586 BLAKE2B 561d09c29208b85e9be7b6b4274b7410bc327fb6b9b8545982df2fb5ed83a6c6b6f91812b7ac77bf96aa2cea61d65842642f55fbbf92f6f7088ec2e5f64dfcd9 SHA512 a99b372237c886ba8ce8ff514c65e293b951756650fa4eca0d2faae380e6d30eb08a08a0ff4a829612795216c32e3774e675b3255b4f0424f634bb1a3ce0c35d
 DIST microsoft.netcore.app.host.linux-arm64.6.0.31.nupkg 4523642 BLAKE2B b3dd78aacfc63aa38b1412a7b2f1277e368873e9d3776ce5260d2f190c1174d4f7f1d32435fa21a33fe1e0f91162c2f8ec6f4991e1642cf4951b324d9e15dfbc SHA512 a6ef5682c8b24c0e2810ef18ac3a3ba6a59a8cd21991985d65db579775bd25b1d3a3cf58f9f07144cc2f26a100a12912bf4c9319c01ff4b16d80fce6da1920d2
 DIST microsoft.netcore.app.host.linux-arm64.6.0.32.nupkg 4523172 BLAKE2B 2cf3ec18b06767aad1b7236675d3cfb1360ba25258a2bb98fc787d2ed932e6acc5723969b2b17c598d24adfb87d9f3962f8996f4482f518fba3ae5a9bbfba3fa SHA512 284df4836f5ef2128d179ef790d11ea3a9ec1850a8a6522613ed52bc456f8f3e42f419466b3694f6d70bcd19f455c529265278cfc1efb2b166868aafa9d6abfe
+DIST microsoft.netcore.app.host.linux-arm64.6.0.33.nupkg 4523177 BLAKE2B 6c380343fafa313be2f9c3727d59a917f86fdf623e851da1905c38ca1a12a9b88f4d35de3027ef53603f5b1c7ecf4858afdf13ddba4d2106fb0dfa333dcc39a6 SHA512 5bb5bc18253f62755cf4ebe5d85f1855ed70e5f0eb03970d5bfe55712c69f14604b25d20e975f2dc5d6b1b9d6ceeaf58a75439d0d45d75cefa3ce22b2fd756f4
 DIST microsoft.netcore.app.host.linux-arm64.7.0.14.nupkg 4603107 BLAKE2B 0c4e12fec24256528cf9b7441d484b4dd61fcab61e7d1915a8669a03574fd8d12243571ccb7d55925a78762b723167e4106f9b30d9277f0d75e1e0dda2785a9a SHA512 3af197a70568fcc1f636b6c5e1ed267724666e812197913d570737c1c2e441ecf5a833a0695712a79b4eab8f67df84a1ef78d82bce2343ee8775fb069c87f7d5
-DIST microsoft.netcore.app.host.linux-arm64.7.0.19.nupkg 4605149 BLAKE2B a435691b7556fcf043f76a00e8653c8c29d42474873ea9ed1ffc28a814ee24b1cad0ea7de88f37d4813e48fbae9bae0e6a42a10ff8429151151e487f4c2f3740 SHA512 65f9d0c5639550ba8f16e71feb62f898f6677c8697e641496bfe0cba2b7e45cd0e79316c7653b61f715900e762d1afe03bde830db0885ec98fdd6c1346ffd56e
 DIST microsoft.netcore.app.host.linux-arm64.7.0.20.nupkg 4605175 BLAKE2B a70fa362c25d7e3ba1ef25c28df9dc3e50c6490a2f9f1129ddf76c7d916b71a153f8ab3791e65cb2d4e7a2f74d9c45347ab02ffd273e1713c5ac72ef7315108a SHA512 6be4af24d35540c1966d328a983452e0373cdd6ccfe1110493676823752310c90576c2db126d8b7a9def094a5bee692416f8d83cc885a8d88d1ba3864ee55a54
-DIST microsoft.netcore.app.host.linux-arm64.8.0.5.nupkg 4724849 BLAKE2B df3576ce3ef341d2f19cad9287c4d12286db69415ec1a838ce176c8bbd1a6b0bcfec932b7735cb55ca5cedb41fb6002e6814ea49f81702b50dc8d06397d99fae SHA512 a2f823dbc2c1df7b0142838e6d2316392771f0bb818657c1dfdea7a9e5deddd44f4ab781dea27210eec04916087ce4883298cbef887834d8e3a890f954ddb559
 DIST microsoft.netcore.app.host.linux-arm64.8.0.6.nupkg 4724809 BLAKE2B 74e5f54c97529dcc478f433a757acdbb7ac75f3a9769e1a35dc7903c8af8eca42e36bb4cfd8d0552ec12f1518d1389b81f1a44d4a96b2a08b7beeac324551877 SHA512 5de4ecb0ed7a4f624ea1331aa7a0026c3e66801da69f5c06b3b88167839fdba4b66d19b6b7d9faabd8d6fd5f0d8c11219df3f01c89396339d2898128347adbc7
 DIST microsoft.netcore.app.host.linux-arm64.8.0.7.nupkg 4724643 BLAKE2B 109d88cd32f8feeff51b2b8cd966fa28c42ea933ccc3977eab48df6e10fed9a8f28cc49780ee8a2bbd0d3edbef0c62338f8224a94fa6dc8d89a7a70a4f280243 SHA512 cf44ce26fb3197944710dd019452171d7bd262b9db45e9186e3f13347c10be2d0ea3c40a042a5df8f6569699023d5f0ea0b36dac00d005cf0d2bcc151fe583f9
+DIST microsoft.netcore.app.host.linux-arm64.8.0.8.nupkg 4724516 BLAKE2B 63f92beb944b9fd3b940ec98b571b4617944154dbf30ab53ae5b6cd1e1be6bc0d8d41f278aae17f9d33514deac16448123e7aa6b8e617d6bb022f5356dca53ea SHA512 4547e71a3fee0c61795d0b524df39d027779c23deb224ff360c6feac217145daed75526c4bbf07f5b167eab923a6a9726279b45f91a707ea0aa01a19446dcf16
 DIST microsoft.netcore.app.host.linux-musl-arm.6.0.25.nupkg 4057878 BLAKE2B f62ffea6724545f17d34a9ec233a8a5d8ea21b47a96097188347b88d4503ec60322f85d9b1225d9ea1068a0205c6e80acd372bb1cd17c4d7c54846005925a507 SHA512 614b80a546c14bb23cd7b8baefb60247f5d501c040328440caa809b3bd478085a71e314ef680379989847090d544b1a17f42443ad5ba381ad271e45a412b4de9
-DIST microsoft.netcore.app.host.linux-musl-arm.6.0.30.nupkg 4059759 BLAKE2B 1c26bd29b5f4373cc5d8e567a684cebbf6df2f618c4977aa8d8c6ce21af1449d22771af7e5eb241300a84ea8f19bad8141a5fa2dd818b259f348f19b8cb3e9fb SHA512 e5738757e464edf9b821433dfae696c51540e996bdc94e983e27e1755d25d8f295a3833756191becf764da746326cda29782f4cae343b767e6e9ee810025f2f9
 DIST microsoft.netcore.app.host.linux-musl-arm.6.0.31.nupkg 4059778 BLAKE2B 84818d218c5e9c6c1d5188c4b6cb5163e5b4c9f77b670e6aa29270801e645e21f7663bf41ff0a4c3c2d466cf299ac4a2e1a6c3b50babc04c142f39af27263eb5 SHA512 b40e6171e9421cd852930d87e2847e6958c77689f2378e40eb18f3654ebf1fc06b56ef2f4eb0a53bb47dadd5953c85085d725fdf332b748e47a5e3fe0719d25a
 DIST microsoft.netcore.app.host.linux-musl-arm.6.0.32.nupkg 4060016 BLAKE2B 80b09f482416c0243366f3c1a4e2cd4ae6733555fef5fa4de0b750f3409bf2165a803ded2ff261c1573beb9c9439f47c4d0c56a7431f610e13bfdb408abfa344 SHA512 ccb7180f23ce94d31fe618da9196cc36f12760e778b8393b7f87e3ed73a978a8d0fbfcbe74c1cfdaf650da39ddad44c8d4c0bcdc81190bc1fa98a1c84ee28a58
+DIST microsoft.netcore.app.host.linux-musl-arm.6.0.33.nupkg 4056476 BLAKE2B 1a0b34006c4cb8a886305611797df21cc342301dcb3c02003ba360eecb222a0855b638525a555ecd4d88b0ec6ce34df3afe68cac62c6d91de4992020209edab0 SHA512 42c58f3f8ba8bbb10a92807f964974bf9e1df17a08b9436941366cb4376910436464e45a9132dfa27231483f4747f9a826bd8ccf2a47e32b2f9098a1c6d45de1
 DIST microsoft.netcore.app.host.linux-musl-arm.7.0.14.nupkg 4060406 BLAKE2B 4574c602e40d83136d42be774e3a4fa4c6713146d69cc5e86dd50c38f379d9588cc89e0c62a68d8f0b036cc24a35b6956ab49715353a0d69db44babb743eddc6 SHA512 2d6a4f3b6831dc718f11a5e971ade84d94a306f7ac13200cd1dc036b716b43000f1ed079c9b3f2807e5cf3c3f70ad6372f421feafb373fd93716d429d9b1b50f
-DIST microsoft.netcore.app.host.linux-musl-arm.7.0.19.nupkg 4062232 BLAKE2B 19420e81fe6a0148af19b3407979713cbcdf385f4f6f471387e2896fac9953be7de0e0e71337a59fa6048761097b4a94f134f422ec3a1cec08db439a96f64cd4 SHA512 f7eb36a4e2ba121d6dbd597934b3677b081406c8d4e2f9aa2e67b3cec8aa5119e95de02d87b3e1bec01758518eb20621e0df89f657198c4c2eac448536d77c04
 DIST microsoft.netcore.app.host.linux-musl-arm.7.0.20.nupkg 4062234 BLAKE2B 9206c70891cf7b0be0ffb39c60d39f30d6356ea969de6f73df699596abc379bbb3bbb8a046afbe16af548f6ff8aff4d994b4cca1d9d289aa203adac5509e2228 SHA512 bcb58d896704531d9648870ce54e641c3cf19be213a44ef8e9c23315cd085d8d9480b69cd8c3443319b2342fa423aad7606c14109c328088d986e8066a7bc3b0
-DIST microsoft.netcore.app.host.linux-musl-arm.8.0.5.nupkg 3949999 BLAKE2B 87aa4164831f8e153244e8aee9734608a0687fd628d159a9d3f86c35ecd5cc632c941ba78ff2c2b21e3870e1b1177a0b5d5f80a1339cfe0fd70f29e3a359b913 SHA512 31174ea42bbbac6889d3b440e8f5dc1ce5dc849d885cc7bdffb447638eac8100d6473b7bf202e5ff703b9f059db4fca81b217c688957ed697cdf1a1db21bf810
 DIST microsoft.netcore.app.host.linux-musl-arm.8.0.6.nupkg 3949956 BLAKE2B 130e60d161fd378df022df6e4f589c849618df1d75bfdba9c20396169855f191541fee2efaeac5157a12d706d8cbb0e9a09ac192a8c032c8cc6ebd903a49c7d7 SHA512 037fa0249951adf27d211a40c95deca6942297bd2377362331b84ef8bf68f89eade15f24234cd0ce3a8460f4d4808c6ccfb1436f2a40fa14638825d7a4e4807a
 DIST microsoft.netcore.app.host.linux-musl-arm.8.0.7.nupkg 3950117 BLAKE2B db143f6bee726a9af81f4f2c3265f6503932a4d4ce8af53b98711711e617b692a445d65a6721fbf8b58ef5a5b0aa5d5098797b0ffa2455cc69830481310ff298 SHA512 d1b030220293990e0540cadf79fa6f540acbf7e02847a941b5cf4675c019a6b67f648aa376260f3acca5f4d76bb796c97922ef99cd002aea4cdd325bf619ba88
+DIST microsoft.netcore.app.host.linux-musl-arm.8.0.8.nupkg 3950085 BLAKE2B 2aaf4f0533185c86fafe41c2ad17bd2d206510a40c6159f899587742b3b90fa4aec58b4d5167989b982950098b08386d39377c7b24cae3a709cceeed37aa91b7 SHA512 94478102a4278d73cb59cdc225aa9b6674cf6824a94a5fe71cb7e074e1a7ab8a1aed985561ecc51ba61e846b89af7bfb591168b4f9cdf57153399ee6120f4baf
 DIST microsoft.netcore.app.host.linux-musl-arm64.6.0.25.nupkg 4529006 BLAKE2B 8908961820cc4d4793de3bf1b7e5a6c2dd71dcb8c5fd857b0cff8c2a7c61d0a3804374e7e699758cc4e5d62794c838bf52fb285162afad7ff303c02ea80fe1c4 SHA512 86da2e190ff48042fa663809c0c60a7d339760aa481caa38083e57912fb3adf076d991c009cac73914af97a5dbd182206748c0a9cf98259e510e00e2fb146a65
-DIST microsoft.netcore.app.host.linux-musl-arm64.6.0.30.nupkg 4531042 BLAKE2B b910bc4b059af09129adee2d9692a02ab91b91257c48bd67d6aecd3275d817a73a5b934b8b2c6a8449f74ef115a83f2271a24baf444b9291f691f1f1c55c327a SHA512 6e2f80aadc7d44da239560f639355feb640cb74f61f66136e78596fa692348d712fc67fa969a0e43d34b7fdc72972774091b7ecfb3c3e40d95a66d87bbca6655
 DIST microsoft.netcore.app.host.linux-musl-arm64.6.0.31.nupkg 4531083 BLAKE2B 16616d51dd1554b0fe9ae82ed0568d8035ab24c8257bd3151a0fe45f1d44a376b117807aa2e194f1f2728ff3bb447d7167adc0e07820ddecf23079015af012af SHA512 285b172c9126faf3344bcfaafb9054669e4c7711d81c05e41911e26655498eac0aa7878c3626f6bb19a01e59d711a1d510c2146fe64a726cb106811b15f49588
 DIST microsoft.netcore.app.host.linux-musl-arm64.6.0.32.nupkg 4531542 BLAKE2B 9f94e11487f8d438eb9668f56671ea578c14a2ccd50e6526eac2037055f609a934c5f8737b30a600d88c9c46e82139029f159e49fc2592c0191fd01ab261c4f3 SHA512 44d926d5b005c4f92264ff69e218d6b6b132616fc74fcd8b6dbdfc6627197bbe6824fad624e090ffcac53621b0f6045e385f9e0e80042dbe8f66aab33eb51c29
+DIST microsoft.netcore.app.host.linux-musl-arm64.6.0.33.nupkg 4531586 BLAKE2B 88e1ddd2fa8bb64e689a2570cdf1f253ff2ba2f4893e67b0eb6120227a6fbeade816fb55134834a6671ccab47ea490d023d54a64ca4a5f219c3dcd63cc116884 SHA512 e45d3727da7938a5b89da03733e4601f738b599012ca200af93543e39baade2c4bc1ad85cb3707828664b5d3be07d6cb272aef35371d596f3c013adb4f1d18f4
 DIST microsoft.netcore.app.host.linux-musl-arm64.7.0.14.nupkg 4612049 BLAKE2B 50877066dd7bbb0de686f6f9ea18a8032703cc80dddaf43a27fca3a655b65a31d87e9bd651e7c309ff028a023fcfd714427618a4ca3b42babbff1e9c3fd1b35b SHA512 20a8147d627d83ee55c97e564b0dd40584700dca29078faa37421b0bc10e3b31a5c5247b7097c5bd32b7bd7e555172794bf20bbef08e2323335f78896e5347d6
-DIST microsoft.netcore.app.host.linux-musl-arm64.7.0.19.nupkg 4613857 BLAKE2B aef013bb3f9845efedbf4e628234a7eff2dc3adbeaa99a646783efcb866ce3725dc629ac922c3edf27d2dd891d03acd738b6f7158633ab5461ed9e6f7c97c549 SHA512 e2974db5a7b2364951b3fd25a468a9ee27b4f34554c46defd5b6a4357c024a39bc370d3b5afbec6736edcc42c4c28d0ccdeeacea42109caf37fc9789b1ae5627
 DIST microsoft.netcore.app.host.linux-musl-arm64.7.0.20.nupkg 4613980 BLAKE2B bab8a7b4cc39d1475f9fb8e7e374f69e4effd482c631125bc9289b3a936cb6810eaa87d3fc6a582c1784ad155dba8a7065a669003bb95803d9261ab4993ccd91 SHA512 6c272695a5cb066952710fc75e490b7f50d842d3a3a9eb7f748f32dac371d61bbcf41c0441cdbc8a7ce2db83d9f468d8a372b22afcbb535eda95d2bc6f6b9803
-DIST microsoft.netcore.app.host.linux-musl-arm64.8.0.5.nupkg 4728659 BLAKE2B 77371d3c4080a0a79817051b194c76e5122573292ba04aac957b4282c9feabc38be69ed0efbe0c04b633de6e93c4f43f30e88e961b20c54b71cf1561d27e405b SHA512 690cd32b1acc284fd380d71baf4cde41b2b4f04e83875db387766c8f4777dd2ced8794dfd51b0f30e2c6e62ebb309647d7655908316bcb68fdbc32f8be6c15cc
 DIST microsoft.netcore.app.host.linux-musl-arm64.8.0.6.nupkg 4728681 BLAKE2B a2b8d08bf566bffdc84c188217c87c78cf0f5ac013e15f71d88bb4ff78e653ffa9c578e0de242aeaa7d8bf11b302178beda3d246393ebf7d3db53af551ac3a4c SHA512 0d8658580c3e5f74a4e89bb396004d1ed8aab570108e1267e93c1fad5dbce3b58f694623d8b76ff7a4ade79ffc3cfa156148d25bd47020fcd4587ed5a687f746
 DIST microsoft.netcore.app.host.linux-musl-arm64.8.0.7.nupkg 4728572 BLAKE2B 0615406053f3f6c167475649b606fc8739c9ec8b2506107eb6346531ecbd1976618a1689cef91fdec46d8a5346a53a644acdd5c6321cd7aae2a99f306ce79eff SHA512 21cd75361705142318848bf5d1d49dea46f49fde183bf13a32fcf88b95d2edaaa493c221ebe953179b3c8e0cdb786f838120233e07103bbd92966787504cc69f
+DIST microsoft.netcore.app.host.linux-musl-arm64.8.0.8.nupkg 4728508 BLAKE2B ac9943682f73dcdb881f31fd31f2515279e5492216aca87c4700017ac3c6c79249577ebf3f76be8bb00efd79a5cc8a8841a4b3a8826100086b4ff52055bd0b37 SHA512 dfdcdaa35e81dc5820215a513de84359d1939300d454c6a4dfd2ea05c5dbc923db3654cbf4eb997a858e207a6f74a8e4618181e293fc10d282d7a5a261d7b7f9
 DIST microsoft.netcore.app.host.linux-musl-x64.6.0.25.nupkg 4914516 BLAKE2B 0e5ff43f515d6ec10b2d47db1ab4d0459ecd82062d714e8ff72b2f0cfd2d9dda1ae7855e10313acf66e9c62e14377e9f6e370afe2fe3a06315c3ee34535ed6af SHA512 1d8f689662675d4ea68f79d3fe0a3e1eaefa51e4674f384555d4136e3dde1f51bc585bb6d8c4bbb46fa2fef2ad69a41204633027ee1473a6aa80ea121540fc3a
-DIST microsoft.netcore.app.host.linux-musl-x64.6.0.30.nupkg 4916308 BLAKE2B 511c3a940c1a22bd1025b291c95e12e534cd92d922628389c87b7ad03edca384bcb51e42cbad6e3c7219d6a589a4ac78611aa1ef16994f0d0070a1b2b31c0817 SHA512 089d5e350306231904fff9fb1cb267ad75fe117373823ec99a52acb0a49d2feabbedf87d3038c2a5d1d79161ba7ecd3b30a0c579058f463953bf83c9223f9560
 DIST microsoft.netcore.app.host.linux-musl-x64.6.0.31.nupkg 4916438 BLAKE2B facb49be5702cc1ae815d14160c2845d247505119a2d58956bd28c0ea46bb54726342a4f990652013ce756f929c0b8dfa4fdd93ee74ad5c0a3b767775cfb3754 SHA512 de48220affa4cc1702242c2c6ab5437da28f61136f55a4633493427844e637e63203b8326a38d518b420e9dcbccce778084a333e6875bc8d9730b7c1ebf6d079
 DIST microsoft.netcore.app.host.linux-musl-x64.6.0.32.nupkg 4916109 BLAKE2B e03ba82dcb850765c3050d6a70a35c9263e16c8faa1e69fabce79deacf382cb351ea688123c4d4327fe689e2951c662498cb0c0ca913fb70bec6cdd59fcdff60 SHA512 0d39e8e8a2b4f4bad490ec47bd4fc8258a93bfb9675694d5c7b4ba5f650a0bdce0fc716c78a7bb5143e594132f56a5f7158b5cb90d810aa4ae2eb137d0921c4a
+DIST microsoft.netcore.app.host.linux-musl-x64.6.0.33.nupkg 4916109 BLAKE2B e629c67743bece1535a1d10a21b2c678b2016bbbdeb61e6250c1f477922eca5c70e706a9baa7b0fd6e8cb296068e1b7ca6dd02e39a519a8c0886d0c917c774c1 SHA512 f62331fbe3684b33226e5e263dc15c67c543049512018750b687367c1018b196562175e2d0c11cda67a90103f2ab081a5dfe87944834662e606f184b692b165f
 DIST microsoft.netcore.app.host.linux-musl-x64.7.0.14.nupkg 4934269 BLAKE2B e4dcfb959a8103e65700204f56d7651a8b739c204d4c891af5466d8fe679c14417a0e1dd3bd36b8558f8bd2b25d6440e43ac848df789cd2d4cfda1fa83abcda6 SHA512 e3d443f010e93e0f6948b2ffc03395154b6e16368a61c74159f28bfb1896775e452c493c56d90935cfbce62b0e2fe9cb250ddf61df278a8e6bdcb416b0573b39
-DIST microsoft.netcore.app.host.linux-musl-x64.7.0.19.nupkg 4936699 BLAKE2B dbf8240d0508a364a0a79b74efe21adbd9251f4f931f85050013cd9a89d669b439095b8a466360f7c221c45d5017729bea549aac30a5854197537c2aa288ddfa SHA512 2098296e8092a3e0910d5624f0aa46622371819702c4fefc49782062e21c11d6526cda85cca9941097c897abb9b2138f2abc77b1264f92c47f9747f4e0bc0ade
 DIST microsoft.netcore.app.host.linux-musl-x64.7.0.20.nupkg 4936698 BLAKE2B dee8b88c0667df42a1c1253172d6e7d3d6b5012971f99fad89f500e21b1206154d3e3d5cd5e6b4528925ed5748e60625286a671b2de111fd4807feb38357383d SHA512 f64fb9a8794bdbfba20b9fdcadf9fe4a1bfff77155d44f682c514aea702cfbfb545cbd28970b2aa7210c50074a740a028224efe741a70635ffee3969f5b32696
-DIST microsoft.netcore.app.host.linux-musl-x64.8.0.5.nupkg 4989398 BLAKE2B 09865704eebc14395252aa6446ed904621f0bb5458ef48eb06bbe2dc704e959158cdc5232dd944fe8b9448c1495cb67a17462bf22eabf660dc614ca529d92bbd SHA512 04c18967a083e79782fd5fb056fa77a890af1542554c78714fb37831ec318cb981f919c63a4d31982311a26d34f40644ebedb621fe11b8cc33cae7137f83dd3f
 DIST microsoft.netcore.app.host.linux-musl-x64.8.0.6.nupkg 4989311 BLAKE2B d874b6dac2f03a891905778c668d95d6834978c69edc971da6c1c9c4f38bb8e0fb23c6caae95e156ad8953b31a1a7584e4cb30434312065e64b28e69d91c9b8e SHA512 5b20c7f73a830e1e903e210e681bb4b8d3b3df3e0c62db22280223e58d557a39254b38bf50aed5bf4796d44a2c6ad3ad98d08839431ab8603d0887886731e6ed
 DIST microsoft.netcore.app.host.linux-musl-x64.8.0.7.nupkg 4989008 BLAKE2B 53e94e5d494f300896d8f6047bf8fbbe5f0c002719a77e11ae170ba97af084a39039eddf14fc2a50613fc27f8d0cdf02fd56b9d8df54b7ccdec1deb4ac1921c9 SHA512 0d83c8a495e457e237fc4538a0bac69fc9f9d635130dea48dd641e89e5b7266bc5481766d56bdc76f947217ee601416089a2756660385a2f6805bb34648f6f60
+DIST microsoft.netcore.app.host.linux-musl-x64.8.0.8.nupkg 4988922 BLAKE2B 1d10685afe56feffec1414f6f7b4ed13b0ea57f9247a72eb47c243d2a96f3ebc9b6633c90d97e81758916ecd40906f51668a17051ab0d7864f2693fba947c09f SHA512 6165c828c0c411d7b810b56c33881577beaaa500266f51cf0c72511ddd476cc293dc419fb13b79506669236e7a3e172506001f5c57eebdcb4e6ce3423465943c
 DIST microsoft.netcore.app.host.linux-x64.6.0.25.nupkg 5009896 BLAKE2B 8f4d27cf0517eb777484f582a8fce0468077caae473b32eb3ae71a3f845aef3846300f855ccb9dafbc13675ee570a273626b822065e66461270bf6d66f58f788 SHA512 6c929e8d7efa8be8234a920b8f5e2f701198e7a4bd95749777ddda1ad7551cbb0262c3ea22885636e5b536aeef111e82c60a69523ae2460c06bd6b2ab9cc9106
-DIST microsoft.netcore.app.host.linux-x64.6.0.30.nupkg 5011820 BLAKE2B 95ddb8235759cc060022d9e790c37b808a924ff1a57638d0d1ae4b5b9e37230104ef72071889724d315ebc5eaeb4c71a1fe99ff5a0000932f69e700ccccc4d8a SHA512 f688a6d8bc96c3bec5b1b915c34876abb80167d0a153c92a6d5d15fa7dfa4a6d914835386debbd477f64cc3f818fd71ca0cb7a8e1fe9e37188cb9471e0cde6cf
 DIST microsoft.netcore.app.host.linux-x64.6.0.31.nupkg 5011823 BLAKE2B 841f0fbc7a185c75df39a08b438c311cced189e8923943887bb2d13bfcbad98edd422bff68e71b9a8bc0d9f9b26066e9e13e676a9c16176106f38fd248130b96 SHA512 91c1718728c4c30960a8e6fc28f490c9c5c813e0b67a271e550d234e2219ef1b07468f417559f4d2055675ec49241f86b2cf52ba450b16b76d055a3f24a14fe3
 DIST microsoft.netcore.app.host.linux-x64.6.0.32.nupkg 5010021 BLAKE2B f343d3c3c539d7286c81f1e8e32865ac15c859174d35752431ba7a3bb8991d65e44c48acaec22d301c78821e3b446debdd6c8a6096b50839a426729d70f0a779 SHA512 8aa8f796b8d4f610951633f8cf80b4d14ae2bc46d832b96f86c8e3bade9a858e864a13625292e50fa78fc4737501e769f817dae4f57603a8c784f42662367927
+DIST microsoft.netcore.app.host.linux-x64.6.0.33.nupkg 5010067 BLAKE2B 45600bf2df24022a8c300a806604e905b1fcc4b4e5f1318c602872470f1181b1b3b6a1faae9d7c6bf6fb631050241c391cc6e270892359dbc8b1fb679aa7a66b SHA512 67515d804dcc437041989f286c096f653c97e6699f40a105d2d59c054b6d2dfbd941bb0c89c2784f77dce9d3e13ba0fa83dc4b05cf87ecc4eb9c4cdd58397689
 DIST microsoft.netcore.app.host.linux-x64.7.0.14.nupkg 5038134 BLAKE2B 53214e07e86d79f7a33b5f07e3e586f38dddf4cec118387368de1df28c1df5e40d3264a1b285d97a583f6b89f3c9ace4c97df28a7850d1e5c550af6a55458877 SHA512 20f1892a768051b1aa856356a705db1ee62a046000427c72984e894368403dc223aabe795d14558da4ff1933eb912df6a420f1cf72a37acce0277e64ccf39372
-DIST microsoft.netcore.app.host.linux-x64.7.0.19.nupkg 5040545 BLAKE2B cf32dcf628f46ca4c53c304fa1dc83634221ebd5b53dfd10cdff512e341de7bf38c9897a8925205a79999077278e0726d0daa0660074ab903c2abc903f701193 SHA512 ab193efe71953349a65adace6616520636a9c23a8b3b7c4a688e095f9c85f1bf757fbc833847adf13f9977f4a4561d413c353407d6f8fbcc446e81d7924b888c
 DIST microsoft.netcore.app.host.linux-x64.7.0.20.nupkg 5040546 BLAKE2B d0200d46d39d894a492520d5a7681e35e1a2d85848fee62b1c214ff2c2a1575f22daeffb7ed847e9ad68b83ec3231b8e353f95c801a65acf04d71f4ad9bbb852 SHA512 69b3e5124b1efedbbcc3f17d60f1bb7f320ff8d6ed7e17c1ae44e30a09d15272fe1d74649fbcacad4409eb7cd69615585a2973c130265259e3a81b19f8fb27ce
-DIST microsoft.netcore.app.host.linux-x64.8.0.5.nupkg 4982203 BLAKE2B d5e943a79a8f61cef084f3a2622c6c1bc8e5ca3b6499b25466203588b916da56f50ec3378d9008549be5c4aab6bd23f4ea15d5e79c7b13ef414a388d293c2bc9 SHA512 a57690020e3bee624701c8cda1e6ffb1c91d659a21f191d882a4abe63fd64d811bd3cb860c59cc05dd9dfdf0b07cda40fd31aea7ce75d2cdc57f51ccbf29a35b
 DIST microsoft.netcore.app.host.linux-x64.8.0.6.nupkg 4982205 BLAKE2B 3ca40d9d8659f86b8716a08e864772e698f1951254099f0e13013a88dfb8c947243874cf617b7cb549cddcaa76de1c825cde0f3b5a73dea955231623ae09a619 SHA512 a18db7c3d7771d7e63a434fd484aede7525e4e96de13a32242c167ab748af9c5c16d3432c0661b2509c712f16810f0c287ec4c7a9f5b575de5015a0995c967c7
 DIST microsoft.netcore.app.host.linux-x64.8.0.7.nupkg 4982167 BLAKE2B d62606709563d5f00e008cb1604755b392d83353cc28fbf7501684995fbd9b2dd4e3601e5dc69e4f9ca2a05fd34e8dc3e85c73ec21c84ff02df774818c0d5d25 SHA512 bb0e3728530e6c07bbbf08788b7d478bda1901beaf3e33fad87db2092c4fc27b722af7297a27577bcd0eb0f1c27e5e9d549d816e0df6d651a2d8f612cd22a491
+DIST microsoft.netcore.app.host.linux-x64.8.0.8.nupkg 4982237 BLAKE2B 91aafbfd44a0c0abf4296629109d9c31da4ffd025e81cd1f2209036a7964021a466f643338df41022704d5ae40245489025e149abeee692a959b0b708d7929a1 SHA512 981ea6721223b917cec1e96bc90da20e1931116e107268b9ceb531b73eaa5d3a8cebd74d96c3cf15da6c9e9c5cbd6dffb65c3f7e47720f6b839685bba006eac6
 DIST microsoft.netcore.app.ref.6.0.25.nupkg 4780742 BLAKE2B e37ff3c76ef9ad7798aa5c35bfad64858fd7458b5a89ee57a7fd78a21d9faef7398da45ea2b3ba18b85bd037fc1f7187c9028102f354417ecfff7d66c6883111 SHA512 bc32eddde312ee586d342c6430f21f83f63ba7af40b3e94f07ee9d4b6f3cb17126db3edd953c906ab98248586b4255bca2956d550ee65bd797effa030686bf20
-DIST microsoft.netcore.app.ref.6.0.30.nupkg 4773202 BLAKE2B 1059372e948e527d9b0be78930d5c03ec959b08008f86f9aefcae996d80616f9fc92e95842d93ed8412efe3a16309b937a3186369a8def3cc4d68f7131e2da82 SHA512 690fd8735a067a1abf5b75b479523216d7b9804e62f98d3f46e8e55a6aadb977fb2b267175883d3003633aeb4976a0e6fe28ceb421e32bafbb4d149dcf4aa11f
 DIST microsoft.netcore.app.ref.6.0.31.nupkg 4784516 BLAKE2B 103d0a2af28e871a5b50249cbd58e573f350e24e232f598ada6680f2af421e3faab39384dc8a59fe6593af81036dec6760aa9eb8737d530337ce4a07da5726de SHA512 512e4c0912194e42810384c9f8fa97880dfb4aaa45617f6568aebf5dc1ead619b62791b0064f02b7281ac74ad2798389bf6aff4fb8ccedc64496870ff02883a6
 DIST microsoft.netcore.app.ref.6.0.32.nupkg 4781786 BLAKE2B e3c370e597f34457b338bd4727607a699f2bfa0cbce1441faceccd679f7b7373cb4a2cb37f047bc427be5c01dfc34c141f5eb9e50703a45fb3364a9879ede215 SHA512 83051aa87a0867ec7d654ff3d7dedcbfb316e714295e635bfdcf5aad407c806bb40ffbfe3f6c3e06acad35868e7afe0cef2688d61811817f311a2cf5da3540b1
+DIST microsoft.netcore.app.ref.6.0.33.nupkg 4778672 BLAKE2B fc86619b7705b8496916c34b2b7c190a0e91f63f4a868d7f0536dc46d416e7b04ef2aa6bb1c321418847eac41200ac4c9ca007c3fba09bc4939f92f5f80dbab7 SHA512 5c4dc40f640fbbf248e5134457f8018a7404624f88c872164611ad3b652019d58255896f50e7d0c4a827d8fdd2a727105713d08d05769b193abc4de329be5663
 DIST microsoft.netcore.app.ref.7.0.14.nupkg 5924593 BLAKE2B e8c3cae7efe9714c58143b7c4ffd0bc0b0e6375175649c9c7e9b3bf5ef85e888ec8517976e2a53be79f3163124ad24b3fa815432752061a6888dff629c61e0e2 SHA512 c3eda2abadc722168c3c6c99ba36bb1c43d22c25cd3d66d656d93a17a9f857c6aa227c916bccad37660e7408240b99527f4d2d442020911c40d1dd4108b1f931
-DIST microsoft.netcore.app.ref.7.0.19.nupkg 5928969 BLAKE2B 455292a6ef32b97a6b8b60882996872a52e7e35afb4a8b96bfec38c38dcde4d17c62da7cfbafcc9722dad320116e586ac93bfc77236deabea4c1b2830d3cf3c6 SHA512 755f639f777b4f959114257fde1c0bad768956a9afb196c054d369ee4d4a710d5e5602e39068cccb1d8c0dbb7e0237eda4c0e6ceb9843df4f8ccbd2f17e6ca13
 DIST microsoft.netcore.app.ref.7.0.20.nupkg 5929716 BLAKE2B 306c22258f791b2ffbd3961492609e1190d787b70d8d523776e717883a90cddff2d0ba2bd48562993bd807649c83033f5fd532a681a5a85a64240e25ca9487a2 SHA512 764eb3fd9a8ca59e25c558ac8273d7d47f8cc225134501e1c2addef553122112f996855da87959f5f4457c07a3133dd4f046ef195e37569dcec05e51ee69534f
-DIST microsoft.netcore.app.ref.8.0.5.nupkg 6834625 BLAKE2B 87325772ef99edfcb3305c84bb8405a91a4c895c078f52685782cdb99c655b3ffaa2306d6c13bf2f1a6695eb13df90bef697d4d4b9b20ab6f2854e49df10e12b SHA512 57d2356d8d027fb65bbb01b506748002190ffee4dd1bb94beb7fbf86153f38a03f41142d39d3429dbbcf05740f8c84c6ca60cd9b35e9a052140921a0dd3802c5
 DIST microsoft.netcore.app.ref.8.0.6.nupkg 6825421 BLAKE2B 91302f4ca01edc88dbf59881b941957fff3a427ba0e00f690d46e8b6f40dc79d02dfa0a5b7ca6afa6ac9261b5bd0d0b14454afce4d3a9cbdbc6ddfc5bb4360b3 SHA512 35771d9c37bcc0c5bd60474cbf4572f7665af0fef6c880d74b73408d693d498c8c8b086424b955b0eacf04df437df0f6a2a8d2c1c098273a788cb929da88dcd5
 DIST microsoft.netcore.app.ref.8.0.7.nupkg 6820542 BLAKE2B e5f4886f63b5229ba4c151c58b82afccc309e3eab3d29c5efc4d03eaf0a977222600001daa97375abd194f5e1067227a0c14aeebf133cca81d59e92ff38d3355 SHA512 72ef4bc18eaffea2191d9204c2280de7d687dffadfd257879e08cb362074939e4467cf37a00f6274b7a8eb7b1894bb43211fc6e6888d6198ee67973ef2cce795
+DIST microsoft.netcore.app.ref.8.0.8.nupkg 6832547 BLAKE2B 01289989da2f0c8c995c0a155cb2794e7bf32f759b13b7a713545adf25e0dd825dbf9ac2812de876c3fde21c1691c8394be86872b31700cd1c41578b60ac8003 SHA512 d6e8447a907e4f3480e6a16d4d40ac4bde32d571be41394b60483ab8fc9b3332c8e1045120e74aeb09d84f720c047cfd2830999a9a0bbf02e24b1f922347f548
 DIST microsoft.netcore.app.runtime.linux-arm.6.0.25.nupkg 33390568 BLAKE2B 72a7cc24631b21953d0898f098006a9f89a4395fb2b2d022dba8435b63672b5625a7825bf7faab20420d1c641cfef2df2ec0612247a91dc2db26df95649d51ab SHA512 8ee70c58eaed0460a18452a3b2f767b120b1bb9c4d2b3d757ea8bbb1c877365bc8ec78ec906af7aa47447ad5a54a8b590d7ae3fe952e37645a71028a172a078c
-DIST microsoft.netcore.app.runtime.linux-arm.6.0.30.nupkg 33395448 BLAKE2B a294f9d644b66823ed8739f914576c0dbd7c4d36f04fdfd3137df31b61d4e82df37830f28db380a31a932f72a1d21775ef882d18cb02053a21d5da9aa1472844 SHA512 60cae9ddf1b7d946fbcbffd21370654d4ea2a0b70dc4fdf082ad052ea2925c6d2dac31dbe2145cedf145f3f4d5fed41248c6d09619395445ddc3b29c2019501a
 DIST microsoft.netcore.app.runtime.linux-arm.6.0.31.nupkg 33394256 BLAKE2B 95d9b5dadee45b28235c7f6a31c5960d2a8540eef70ee38eec1e0a1a2046a584fd26532444b770c059bf3d29d52a1d9e529baf8a4ec8ff67650c9aa6ea6d3b9f SHA512 16331bc34d37f9d81b84bf558fe442eee336bbc288736c6fef02ba807561cdb67399a7e117de72f0c23939e8c0f29faf95073e3ea1889080bc67df02e770bdd0
 DIST microsoft.netcore.app.runtime.linux-arm.6.0.32.nupkg 33394599 BLAKE2B 3c24fc38cdc2840dafecc05c01c581551d57e80e4e15ddf5567b9c60a9c89195c93dcc0e9cbd58a690f1c844a5b7022a093bc863002e1f6c815dad4c6abaf712 SHA512 fe78578f1263192c13c64020686ed88edfdbb008bd868bdafe247be003a6f194bb6fcd310d042cee3d7cd69948ffe285c5d30fe3bb6f9753c6ad238789b39e34
+DIST microsoft.netcore.app.runtime.linux-arm.6.0.33.nupkg 33411796 BLAKE2B eff2f0496e8fdfd909651a0fb39588a515c2f25ba47e6f6f1efbae734f53b11e0f108dafbea215770afb610d2797837e4438b8e30c3e9f84cd01dfc93e0a2ff7 SHA512 58f31b9823866d7a95f9fbf2c9203df13583de40ca221bbdba2f52cf328cd57d9868e71aee4b196d42b7dcbc39616ab5ca22e4bd8a7cd381c0f39082293fc214
 DIST microsoft.netcore.app.runtime.linux-arm.7.0.14.nupkg 32463869 BLAKE2B 38eef41a8ca3c7f188040f616d584d0348d4adf432b118e161f766033245d01426b807b5fd046ddefed556b414fd0356f6b8aaeadaf35b9316ffb78bac3cd53f SHA512 726ebce4758228d66f30c1e97b2e130e40b157b447ae052d19211b3844b6473aec392583982fc4c5f179018b939c9da50aa5e80747b02d00081337131565094c
-DIST microsoft.netcore.app.runtime.linux-arm.7.0.19.nupkg 32468301 BLAKE2B 831d68f6e9ed92a8fbc270a90a462b755a6d400d1d9ad8baebe36f7c103c3053acdcb1372e12dd9da3fd64646bec6ec2cbead363767c4537a624e965bd1ea2ad SHA512 243a167ba800329a60ba49e059c5fa4be794e0225fceae532261249d47ca80f3f7b6771bc152d562118d141aeb547eb5c5aa1ff1bdb86c64044339c649286f81
 DIST microsoft.netcore.app.runtime.linux-arm.7.0.20.nupkg 32471569 BLAKE2B 22a985a1d00737df6b4c442cdb19757a80a9d87d38a01d61a77c89b51f9a24a71f878f248f319fc76b64e3ed55e70b466dd11f8bc37496c401108c0c86f8bf95 SHA512 cbd1209f0d2a55774a44d38f299d1a9aed01d288e4f797fcdfc9c49add00d231b24d71c7a39b9708af833861fba426de89a69989f5a8e556bc0ad0d7487eb842
-DIST microsoft.netcore.app.runtime.linux-arm.8.0.5.nupkg 33260737 BLAKE2B d6a8b2dba884abb63242b90d4763098766a2dab305e3db2581424aad59bcc01999bc991f655c4cc2b02169554ede03874fea2a480a6e0b8c57268e583390c972 SHA512 fac4eda47b6493a2eb6a955f8e5ed22416c254b7844b770cbadeb9fe0cc7ac1f591cdf6dc5e9352f26ac7caa5954cdb4553f5f6158de88c38687038b360c3df5
 DIST microsoft.netcore.app.runtime.linux-arm.8.0.6.nupkg 33255648 BLAKE2B 1db06d6ff001b771b10e8b1741abd85dd3e52c96b8f4ce0110d250e498acaf0c2f2b22ae3089d44412b58c4a533c5f8ab38d7c6df825f8a3912dd0c5cc1a17d3 SHA512 0f334e8be73b27a03bcd1fea0fe5423a09eb83712a7631d84c305af70e55f9a7af9e0fa83c1ed993cce20afe9b5c3ed3c1319b077fcbaef7453a45f9423a5065
 DIST microsoft.netcore.app.runtime.linux-arm.8.0.7.nupkg 33268183 BLAKE2B ec7fe1f90bbf9f8250c4ebff746bf6ebb14c3c30b98243c5131d7bad628b01f1b4aca6cb020bce05dfdc4159e3d083aaa6d084083160924bdd787206d147cc0a SHA512 4b32536f7275b3986f8c4bc43162609ead0d0def2ed6bcf34c56b872441fdc02683bc9f02d69c92ecca6c4f784d4d7aa29b51fafb35a5cd7f9a3f357c15f713e
+DIST microsoft.netcore.app.runtime.linux-arm.8.0.8.nupkg 33260484 BLAKE2B 55af7b7ea6ca1c87c933ec0022b89eb24c46121aa5bb7d8664c0d04ad1e3a443002e04549857ffc72588bcb8457a5a0e55ceb5c36a115ddbc98bf390c3dfb7b6 SHA512 ed218d05ffe301d316f71954e62a24cf2b77e5814d573c35e1d6eec0dc22f78511312841b89db79c28dd417dcb332f99869124c656ae704182058211cb74e9ad
 DIST microsoft.netcore.app.runtime.linux-arm64.6.0.25.nupkg 33210771 BLAKE2B 16b15e6100fe53366a06bca956dfdb05d1805338c1223f8d6c2a992237f727684f2cdf7caa6d30d333b9ceb493fb1f069340c06ef60ab6f9828d7f4ece548eec SHA512 5591df69ffbaab9fcc455bebdba77ac47753782e9290f103d441d225d83c6634f926bae6ba9dea2fef99dff2b482beecb455c55518f4390ebca71bb8f528cee6
-DIST microsoft.netcore.app.runtime.linux-arm64.6.0.30.nupkg 33216033 BLAKE2B 08ada298058cd74a8498dcd42476d9d0f3ab2d1e927c04fafe21ff14d39a79244ab30f40548528edb9f548576c2b3dfc72a423b090e2e25c2758d00de867ba90 SHA512 825688c268131c297ca113406a746a397688c7cf727fa10b79273070c7ee8eebcccd39012cbebecd9d0c810c6635119de093cbdd9ea495e31ff3a05001652bac
 DIST microsoft.netcore.app.runtime.linux-arm64.6.0.31.nupkg 33211160 BLAKE2B e658000c49245eefec46274a11c581281deaee441e746ffcb8752ba20768461e8184994ee5c300199334013c3909c3db009a8ecdd841e2d7268fea989e43b821 SHA512 2724f397f1d13ab09c3012bfd7a6b679904f1f4565f7b9904015518515997b79d458a9c9fe526c72a9e16ad0ddc867ac279de7922c0706b99da722bc35c19f94
 DIST microsoft.netcore.app.runtime.linux-arm64.6.0.32.nupkg 33224398 BLAKE2B 39b71ad748ed15f3ce2917250a0fa3b6a2ab1013b4c2dcdb8ad43f446be065d4d32def2cc8cc1256e225db7f62f10253a81933bd34f18ea15a383f2c6f2203ab SHA512 3354b11cfd45af2e535f9c6d17d0ee373e1652dab7c682aa2f23dd06eb8be50401030fefc7bee7de299c89f06e9f6eeb4bc9969b7b30df715e5d3ea0684906f3
+DIST microsoft.netcore.app.runtime.linux-arm64.6.0.33.nupkg 33222061 BLAKE2B 4e9cd4f3ece40011e78e2e6dbfcac56d1f057a0190344081f94dcf7a4d77f8c91adfb552f27ca69827d8ee828d80feb9c5424dcb65cb7025d3da0508b9d2ecf0 SHA512 d9785cd5e755ba2367e1cf048884303c3d48257385ee8091dc96c56dfedb310f196818b333507889c8a6ddcbf29f317a6608cc97e19562e4beeb371ff2b7ceb9
 DIST microsoft.netcore.app.runtime.linux-arm64.7.0.14.nupkg 32505085 BLAKE2B 7c9ba7d53827235fa3da2e96d40d9fdf57c5dcbf2f9dc7ff3d6284d67348190401099d7ae2a5d16227fa06ef8d63c27fc30072cb57d6c26e42701be00693b932 SHA512 59d9aa61f657406c6f7d392d3b692e3ba31d7a5e3a935468ac11640d1bff1dee5598034b9ad967696ba09e780f617a70bee9fa8baeec3fd6c872a33ae3dd4980
-DIST microsoft.netcore.app.runtime.linux-arm64.7.0.19.nupkg 32519942 BLAKE2B 9c8acf73ae7980d0bb36b629007e1e47d6285ab82517f49e9be860a8d531a2a83d1858bd96c92b7eade211eedfb79f154c2540fece816cf65d6beef369db6ba4 SHA512 c002b94cc36224fb8c93bd0f7e3887522d184da86536d2d2f08ba8d3b9217989176172af5571d1668fabdaf158d4411c50c8579beb861ecb994f3349b78bdda9
 DIST microsoft.netcore.app.runtime.linux-arm64.7.0.20.nupkg 32521221 BLAKE2B 5383f9d29bd3319af4a9b5e8bfb6ac25e405b5666273dda90cc242734e76fa0744f724c11941203435bf4a6e2142ad31b3abe8fb0c4cbf6178ed54dc05ad1c69 SHA512 83147b8c532f60cd080deefbcc013d3a70af794339796da9a0239aca8f3c143f367ffff8fc12bab0763f82479dd1cbb9714321ca04e65c4c2bde494aad19f180
-DIST microsoft.netcore.app.runtime.linux-arm64.8.0.5.nupkg 33558297 BLAKE2B bd8d02337985adad5c5546d4f1bb15dafee8fcc634373ba946f8565a20a52b9ba38b28d7aaf05b6151cca2125dc6b4f1c2ce83d5d0262d610736d459cab8918d SHA512 7930458e23660190285d82eff9a67ddc6e541d74b6c0d0f34f6b87a9558caff7f0711a2002fb6372814d71402ea191bfde0922049ca1444636d2bc371fe4483d
 DIST microsoft.netcore.app.runtime.linux-arm64.8.0.6.nupkg 33549331 BLAKE2B 7f10df2919f1ba3111987e715527eb6efb314845f0394c27353abcb6368f38f73b051fa6f33fe3da2c83dc089db8935b0f1548bc83ddb9500dd5b6bcab16a9da SHA512 4c5a51afb28e1cbaddd9028cb43bf8761a5de4c1778beed4f8af9e8e23b38a44f2d7e6e9574fce07e0ede011d31472f95565c3461a378ba85d564b88c959a80f
 DIST microsoft.netcore.app.runtime.linux-arm64.8.0.7.nupkg 33565508 BLAKE2B 1fa645e61d212361d8c40401f469b7b99b18d2c716f3883187820307ed2770edd3e41af770ff7fc52f612af69175f073ee96e3e78fdb2a41be0f3334bd469637 SHA512 0f616a3adfe1a6d66447a02fe1de8391dcaf2c7dd3507b5b53e9f61f13349da7aae418d2e38f74b6a8193f742d6ed23278a2f4623c4e0edcbc459ea7502d1b54
+DIST microsoft.netcore.app.runtime.linux-arm64.8.0.8.nupkg 33558085 BLAKE2B 3b06409ddad97f4cc71849443a0e6b6d05a7ede799f7236bfefb344405e28853f7b68facbfa2e1a370dfe47621816008b9bc1dd7da8f47526426bf0a9ff35c66 SHA512 51896e7c095eb80c1ffb82666bfc694f664c4181cac00a09f6ec2156c0ba3bb74b17e8610097ac9ce77e51dada18c773e516cca53df02348a3c56a37fa174974
 DIST microsoft.netcore.app.runtime.linux-musl-arm.6.0.25.nupkg 33416661 BLAKE2B 776ea8022a050f1893dcb6fdd22fc5b05813c18614f7c91077542ae073d5226fd7008290a2c97dfb540392d9799327ba8c13f21f0b476c105f16b38aed22f691 SHA512 f9c7aded646925cefd1f68a328f29a18d73d40fbdcea50cc83ee4a91ecbb60ae53d2778ee5d0ccd3dc420bb9c24baf056a678243cba902b285c1447712940318
-DIST microsoft.netcore.app.runtime.linux-musl-arm.6.0.30.nupkg 33421350 BLAKE2B fc2f5af42a6d198a83678f07c06bb35598a7db8e1f71e0b5a88dc772c9ec766a683b59877fae22a3bb5569cb9affde0aca3cf5c3cc15a54bbb2c810f09cd3d66 SHA512 9a0d4c8238b810f4f253c8fc989e9615becdab16c97c074c3f277200dc3b0fbd9794298f64db5bb12a44745fe15fc3f167431ae3ece3c0148505b3c12772368e
 DIST microsoft.netcore.app.runtime.linux-musl-arm.6.0.31.nupkg 33420306 BLAKE2B 40b928634d1a6f1dc494443ddb9c81e02adbfe442bc5bd985ec0a75fab09d2d34c23eb80c8ac35c8b50b5de3b6533d2ffcefb7f57e98da46fd6e8ff302b5d50e SHA512 54a34ae918f770b7c4ef1d4b2ed5769c3a08658a7b287bfc55d8fab281b4e9bab1131eb3994877bd5d04a8ecd37465638c0abaf016cf1fbcc2a489bd317837d5
 DIST microsoft.netcore.app.runtime.linux-musl-arm.6.0.32.nupkg 33421433 BLAKE2B 9ba08bfaea50803dc8479eb2a4b5313212d9b49dee0be09599f40db2c25dde9b352be820762141a6823740636c0e6f97ecf958fe25a128a96dc77f9fcdce6655 SHA512 45da655c36d8ad288d4bfd7a4b9a25167593ae3f1046d70ddcfcec31e935aab9b8cbc43794351aea02785ec0b917a0e50940733c5192ec63c1599766ebd679c1
+DIST microsoft.netcore.app.runtime.linux-musl-arm.6.0.33.nupkg 33421577 BLAKE2B c6caf0421c4b899729f9c863d9574140960d338d66224cdd29df29fed6e4742f89512349000e514576264d4a2f109a63841c0524b6765ae2097a9d52958efbfb SHA512 fcc36f415ba4faeb3769f9cc51c247866d3f8c40b29e6e9d7af7ece96bb45c13bc9debc1bba79e1a7bace8db92e3b84b2f520d2591d30bee6e210b9b41c66dc6
 DIST microsoft.netcore.app.runtime.linux-musl-arm.7.0.14.nupkg 32471905 BLAKE2B 39cf7bc29f5b1b32eaf6e990c760c89c905662d549ba19d0404c21e8f079ecad5298c0a2b0111e1ed26d79b0b3a308dad79561cedb71b0e4398ef60039d1836e SHA512 2654d17ab6fabf9976336f2aa4025104a5b64f386ae10822d65566b2daac8f2711e34e986ea1bc4ad0c214c02624fd70f2b5aa6bbb9db7e6dee2a6fcef943df4
-DIST microsoft.netcore.app.runtime.linux-musl-arm.7.0.19.nupkg 32476373 BLAKE2B cd11631ea91c8671ff9081c09908f7cc9f74d97e141ffdc827a0ca7d01c5396c50cdce67651b42720f61d3a1282c05a1a8c3a3cfb78bd0b5efc88ddc7dbc235f SHA512 88f8da29c5bfb99378f597ea149a3364fd16aec2352645cad617dcc8c927d24798434d76ba35c500630b025c34fd444d1befc4abc0fcf76892b7fe37821751b0
 DIST microsoft.netcore.app.runtime.linux-musl-arm.7.0.20.nupkg 32479631 BLAKE2B 61bf7602dc720de6bcc51b74a282a3a7ce8a71d79011439827f570c61778f317f03557d56bf206f7bffb1de3135df09efb949e573ef3299b844ff1613fd48475 SHA512 5347a7873e4b9868bc14ae19b9edfa8a4c459e851e04cf671f76549ab9f2592613f66e7ec29f0177c23ab9b79b5b58fc2b977be3823d6f9a149cd59e18b564a3
-DIST microsoft.netcore.app.runtime.linux-musl-arm.8.0.5.nupkg 33282656 BLAKE2B 5192b3b6ce85a91ea5fddfaeb103265eb89649c60c92e7343b0b124fa2cf092b142d6230a0b26ff993c3f6e75c2ace0b0232581ad844772ff16912ed7d068591 SHA512 80e9fd09da10a5febae256eaa38c2426a37c0258d22f22c2f5fe705d89e5caeb5b3b691b30661b1e9de97bd281b2c11c9511bf9086d2068c20321f2265bd1dda
 DIST microsoft.netcore.app.runtime.linux-musl-arm.8.0.6.nupkg 33277621 BLAKE2B f720266321aa6eea467214e26c02e2cb1af717894bbe2f181b30131abc5236b31b53e15f92f767e4fe8fc9f06253710f1f99dcb2ebeea54e0750f293e0c5900c SHA512 02e3c8555c88d1fd45381990886b365bea144f8ca44c666e35b68b76185fbd12ef112bf297aa8e07424bf01bc1999336aa6c983cf265adab962f8088545d1065
 DIST microsoft.netcore.app.runtime.linux-musl-arm.8.0.7.nupkg 33290365 BLAKE2B a08a8df09de209495ad168c4cfd5eed77b46eb4fc043c00262a649d3091e50342de82a551107268f25b76f45293130c2a627ca5f5150f14abf36cc433bbeda3b SHA512 4a63404c7b3a854ef9919bf0bde4e400cdd43a8985f1c3cb2d3bb73fe2f56496c50662fe5b3aa5f2053cbb088de127aa039208fa8cc85884e277d82c7e277fa9
+DIST microsoft.netcore.app.runtime.linux-musl-arm.8.0.8.nupkg 33282538 BLAKE2B f7b0087f1b1aff73408c1b7c1d5a896f57d44b05ac06be48e1e9e0f0bd8c6e92c1633b9e64f674717277729084dc200d5a50d67c0782bc288f1dab01c8e13e25 SHA512 9eb5b09b5220552685d5875a06de54f5883ea03945cd5c0b5e76d23756f598ebc68ab291d019cf49221d471caccab71021b86ee7eafdb7cd5ab6f6b20d018ac3
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.6.0.25.nupkg 33227902 BLAKE2B a808e90f1c69acc939be37c5771571f4bee12c295d3bdca3823cc6fd7fb0f590f802fef0708a8a530e361909df5b235e881c403379cd9db6f314afc2ff0b080f SHA512 5538178e5b62de9ce17b11452d0fbc1effe273276ec472ab065a055a3c31047ca81f8207b2e8316813e94ecd77dcbbd0a32a1ff154c31aeef4a28a769c1d079e
-DIST microsoft.netcore.app.runtime.linux-musl-arm64.6.0.30.nupkg 33233024 BLAKE2B 237c2cc9fd7a7f45b1249e44fe13ba98a31b1cc2433f08c7e632175fabc5a8ba3db9dcd8b3e0f6d61d9b50905a9361857a719686f2b9ec91e8c5aa7a46ecd9d1 SHA512 516fdf6e3345c95fed4691bffcf1ae4f1e8f18e406a1db07d0c60661b165810d7ee9f65d48328fbd80a2a3e5a5386a8ea70be06bb578d328db91d73509112451
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.6.0.31.nupkg 33228424 BLAKE2B 0b7cbb166222c08a96f022d4727a4b12d0544597c38d92daef1f354b01b4113eee700477beb2fddab2dff950d258188c93472bb1d7824e749c93e8244cf15a13 SHA512 5b362b2abd9155694582ee6a52fc315319193b3cceacb2c10101aa3fd8dd6ba97f9f551850a388cf6447de361f32daf17d59e15ec3ee608937413a8924bea172
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.6.0.32.nupkg 33241880 BLAKE2B 17eeebd981bddaac01293b8e974ab24ec2080bc53f62241553c648a006109585c41c0752197683128caba81362e00e236f680838877d134d2d3599fd9824b9ca SHA512 e1e89433dd72abd91a200eac4248abcdd94700d15e9a30152893b43c024fc4c0bc90be20b55fab28162960b66ca74c2be63640346779afbe868d4ddc146cfc58
+DIST microsoft.netcore.app.runtime.linux-musl-arm64.6.0.33.nupkg 33239228 BLAKE2B 8593c92a302b340e991900e678f2746ef2b5514ad54abc66801a13c8708d737755cefcd5c30a0deb0ffbfdca247d26c664252ff6245512ac6296f827ad10e066 SHA512 8077c16c6b40a6995314c8dd1cdadb2fc3899854bf2af8af77418cf5aece990a1dc8671a0463b3d0c0834bbe832fe44da336302d228ccc6f20ce31f26162900d
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.7.0.14.nupkg 32506730 BLAKE2B 612b69943eda80cad43d8001eaf53519e99d0338c90473e9a023306c1652c70f054a3cd65606b6e2bf515e323d34994c6c623c53fb9223cd42a1966e445973b9 SHA512 84cf876e231fc27f6db03c6098860a21f23061cf80cb3a6ace4ce422efb6d0da3a14858bfe9125e034c0325a9958b7eca7633309c8fa43faf2781c928689f7ca
-DIST microsoft.netcore.app.runtime.linux-musl-arm64.7.0.19.nupkg 32521978 BLAKE2B 6c3b842caeae0a37d4b49f6e0e4763eb374cc8f7f45cf7acb43fc7883a07a668deff13ae52222360b58d6132ac9de2c8bf38ce2159afdd803462038d188af46c SHA512 f957f64ba84592dee1f8354e28d6e95e4d7c104c479657b0f1ff38e8713aeee5b0405e8364a7ac8f8dde1fd2f7766077736240c8be70df07774c68364338e2ca
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.7.0.20.nupkg 32523154 BLAKE2B a096da8980dd5309e6017ddbae52be403430836b8618fed74887ea6c3b3d39f3cbba84cbb69ef668b8b77148fcffe5f1a4a3899c68ce217fa0a0aba66e87d384 SHA512 e0e93e7b76dcd8e276622b2b98b08c157299fd60f91b2c5c86bca5e5c942e2cdb0d9c8bf9220e7288f3758bd626cdbc4939c080d1b2b090e4a5c0eef627f30cb
-DIST microsoft.netcore.app.runtime.linux-musl-arm64.8.0.5.nupkg 33576528 BLAKE2B 0497e0194c3b057f3ff4b2e6e2d2542e68bbf8bc49e4c539e33b6297dedf09ff998b9b2e8f8d624a70c28c040d6a38ebd78860db235bdccd6a745d73569cf677 SHA512 bfbd43792116d386859602f4d05d53b753691fcd12489b210f36fa80f48571a4e2d27251a69917621e9a3855bc4f7ca6ae3a6be0ba6890913e52c1a8938ae221
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.8.0.6.nupkg 33567578 BLAKE2B 6ce4312b05c4fa28dd73d260a769232ad26572a02dc2c75d2a96bf75a2c3acdb6c5ce2af5d1499a5e105de58e01f97dd476c8b2741cfc78b59ab0bbc0b8f58e0 SHA512 7b96ef3bed62d2706dd7270b48371ab1f7326eb528a66ebf7cf66b0686adbbd7afa929948a5bcbb7b3885342d7d399a0fa8c337f021df331415042a0e399adca
 DIST microsoft.netcore.app.runtime.linux-musl-arm64.8.0.7.nupkg 33583617 BLAKE2B 47d1c80d46467fe7cba1917e23444b89508122f83469ddb6da7e1471b713f9d2f2bfd6b1a412755c41ecdc7c046e1d8e83e1de1ccb61c7d4c24b835b47d581d0 SHA512 8d7c220e2f5709785369a7faec32c724d67296135d5e49908a20a0aff058b494577cec6aee0df1e2b6ebf1d0bab327b77b057ed9f7a25a614db2297d988a3c4f
+DIST microsoft.netcore.app.runtime.linux-musl-arm64.8.0.8.nupkg 33576620 BLAKE2B 3368556536596a068852a38cd01f7254d8a01498ef8addd8b33b2ce3157dd4b015d2262d6916c1a75e604903025fe1f8d64a351e5d4f9fd0e5a23644bbc992d6 SHA512 8a1b11e9f5bee6235e3036bfde82ad39dd769b9fdd272f7013d7a2917e5536ba4299f068b3fd187879127379c75618562ff01b666ede89363bad2d6d4ab8f38d
 DIST microsoft.netcore.app.runtime.linux-musl-x64.6.0.25.nupkg 32842905 BLAKE2B ab004213e3907808fd47562475641a9fe83bf8429fb7271a5aa987dbedb42d494c03a89ff0db384af8b4ad4b00823495b43e920317ff2cf712708ec173e303ca SHA512 6d4729b6e50c860072323ec775f361813a6dce8fdee2c79153b40d5d9f3e357ace97acb84559c5164cb88978b936a539a32b9bdd7160c1b61a1180d0d315c37f
-DIST microsoft.netcore.app.runtime.linux-musl-x64.6.0.30.nupkg 32842582 BLAKE2B aefb3658755290d2086aa0001563c7cd5dcf6bfb4f5492a2aa43672c4cb5871577a76f1bd2b2b4311714b6eb71de52f95feb2771feb665784b209e108bfd9f2c SHA512 b71827a1528fb8b081d20a32e1b844e6b857a696eddb03c74137bb4a4bd54a79f716c972d698628a278d845fbeabbb3d690210bdec29866fd5df03e5dacb6272
 DIST microsoft.netcore.app.runtime.linux-musl-x64.6.0.31.nupkg 32837434 BLAKE2B ac57a09ec834bf116180d20d82f1ca1474822c6218ced6468c8c602f6b50af4432e442c443ce8893f41882d4a457ea3ff21b1775a660a061687c0c1bffaa0b56 SHA512 f8dbc28906ecd5b8d7a956212f3e75eb4a02506fe1367e920c52d9ec3f3a5bd9dbd748bacbfba8c374ef101684b7dbbc11f412b87f2c7c82ad32b976d6fc0485
 DIST microsoft.netcore.app.runtime.linux-musl-x64.6.0.32.nupkg 32849577 BLAKE2B e4194783c5f4df211f7de7ff1e703848f079f769f53143e5853e78b5cba77131409c9942c41939a73f5b77c80e6a1c0063c5627ee90f83e023d9b034b0d04f6a SHA512 b55fd8a1e0796b7c477eb134c41e656906a5a6f7dcfbb06909ac7f5f35721e038a2b63c43be1d1635c0804fdce5c8f0cae4d78c24fc31ad367e1a0c819bdd476
+DIST microsoft.netcore.app.runtime.linux-musl-x64.6.0.33.nupkg 32845944 BLAKE2B 67760e3dde359c348e5cd577c8642da9726388ea27c3f83ad3ced51fc22892ae28ac37a9628cf28d4cfd2280a1811904b643bc81c4edd6387d28e809b3cab0d6 SHA512 b831abfb3c79088232bcc89f146a26c17dff169a687bc0812034b54238358fe00543b132bc8c92b3110a6ce7dc8f63d5bcdb4ab3fdf41e7a54d0d087c28e43cd
 DIST microsoft.netcore.app.runtime.linux-musl-x64.7.0.14.nupkg 33803212 BLAKE2B a873c9917a98c562be008a185ab8c28a2a12a0e25bedfd28ddef1d2f39451d8d907649b7cf53a4465f2c46fbe867a679d21c0761fc13ec936b08a8b58f47ae64 SHA512 ca43cf4e3b85a198a48b8004123fed287d0775e4119a5d10f3c5df1827173f5df04c84f2d41fc58d8632e37679856e00408b863b82260d7899fcf9a1c273ad9f
-DIST microsoft.netcore.app.runtime.linux-musl-x64.7.0.19.nupkg 33809133 BLAKE2B 9fe9e19fc9892d3485705f45e02fa0f665c034a3bd2dc8801bb1b0fec57176aeec58f7db13119d7cb43698255a35d0ca0e0389e9dee2e40159192c18a7f04066 SHA512 cfce6736e3e90f3eca8cab78bdcb8997757b8dcd185221a669a2fa04ba4efe3d98debf6774af23c39a5172d2bceb3cf9be39a915b43ad719a3edb324da3e3d89
 DIST microsoft.netcore.app.runtime.linux-musl-x64.7.0.20.nupkg 33811292 BLAKE2B dac093da819115b015a8463a61ae78a4648910a92f69c4d86dd77fe813408b6dab58d9ff478eed261e24426ea7cea5c15eae60ea851ceb229b975b9ab89e0a14 SHA512 27f6c55fd6a2f62f12d2ec7465d9c184dfacf8814ba2c20182716f4c11ee35f6e53d0e91d5816c7d8c30e4b40523ea652fc03635c21d9c1c4b002acddb68f035
-DIST microsoft.netcore.app.runtime.linux-musl-x64.8.0.5.nupkg 34993310 BLAKE2B 56377629c6be4191f24c39efa6ffbdc81404ba2a5f2b91048aee0e96872d390713e8bdbe2a8be918e89131c4225da70b4ed5276d1f9efc746b46e21996945205 SHA512 8cd6843f75bea37b52fdfc446226d2fe6d8019c0410c44fdc542a3b30753ee4027b278f2ceedfe31dabac2dafe970b1f62979e4d925da2a81e66a4804df0a032
 DIST microsoft.netcore.app.runtime.linux-musl-x64.8.0.6.nupkg 34996719 BLAKE2B 0ed4ea3598be139e084eb1ad65be211dfcb4f12d79d2a06e5a0da751510231115076098c3f2877377c675a516ded6b4a68ee86bc3ece154ee9d3f830643838be SHA512 b26d078d8b6c35dba0d3274578a121da052b3a4b5973c2611f3d6b976fc5bb440c52ada86842273633c6fafc2ef9d6e1a4283db7ed65d8eb16b3a1381bcbe173
 DIST microsoft.netcore.app.runtime.linux-musl-x64.8.0.7.nupkg 35009470 BLAKE2B 30ed009444e177182090af25f72a2c63af0af7293f68294025105cc6d4070af11376bf5cec75e91119431c9bdfd3523200bc42c2ad7f50c98430c061d2a0f7b2 SHA512 bc517588911d4af296327b67c838dd4a69267326d3b4ef478218b3ad6878a3e8b998add62da10ecb343bb01f0747f86e83b7ddaa479bec3b518964eec7a1bc9e
+DIST microsoft.netcore.app.runtime.linux-musl-x64.8.0.8.nupkg 35001621 BLAKE2B b29108c2a12edd50be6e32789a1fd50b520eb15067fed791130de35ba3fdea8cbb3019e7591aedeca97f21994b848e36945385b9e37a7ff12163b9443d33e1af SHA512 142f8fcae0300c3adba70e5d3d556d5ad6879970dcd66f79fca6a6b6d53e1351407180f7ddd8d435375add6937af2ec3765bf1132307c4e5ecaf00fecea97ad8
 DIST microsoft.netcore.app.runtime.linux-x64.6.0.25.nupkg 33263248 BLAKE2B b14c260c82c8ed7a009dd1e2f5d42447476af73257af49e57e7c0fcb08f6c4de14f4995d38ee4dd5a9d7ef30d6dc33c1157245eb10821a34ca62b42e1676c25f SHA512 28de604641e5c0fe694afb9fb394139074c240e331c7bf2513843ef39309f83fc6fe49eab657082548f29557cda602f2d310fb83a190bade076858227a111e62
-DIST microsoft.netcore.app.runtime.linux-x64.6.0.30.nupkg 33262824 BLAKE2B d72f50f114f047262604d32b6ab9b38ac334e087fcc92573e8285c1dff9c5358e9149f6403a4ce3e63667096d29bcd77c955401aab670c7dc212b822a086d2bc SHA512 880326c9b2a1d970742a67d9d8e1b2cf97a8a5a2661c2af5b5f494507b01039db3bef63d30c9053711fe4522f78bf741b1045c7e747e9f9efb519e9befa7dcf9
 DIST microsoft.netcore.app.runtime.linux-x64.6.0.31.nupkg 33257537 BLAKE2B 0b869b28df002ddbcb8ac25b01d2648f1149e205fe9d7972989c4db3a162e36312e7622177c6ecc5abdfc6520a0e3aab379b6aec12dfd827d6261d67f845c895 SHA512 7f67868ba4ea6030d0cae9f3a276666f6ce503fe4cd5afa93ce5fc1f8d4913ed2a628c0a7db3825cd2c6856e44f763787a93c270b9eca0ae3af1e807ea430885
 DIST microsoft.netcore.app.runtime.linux-x64.6.0.32.nupkg 33268828 BLAKE2B b6ca3a34f7a98e49a74e44d9d63864e1c1d10211db02cf9b48c077809ec11c94b551db45b0ae88ba2a50df0a047f5fea085ed9bcc193f5ede97c9645999d4b27 SHA512 f442a48fb671dee7fc1084007c650368bd22146d80d729aa60c070641cba539961212e914210f825cc5c8a7481d4e35c864814d2db1e8ff002963a3cadf145e3
+DIST microsoft.netcore.app.runtime.linux-x64.6.0.33.nupkg 33265012 BLAKE2B 092def06a0959dc282a27d8fde5f2e212010ec1af9948e6443619f528d7926bd6afa9dc625fe38038b0bcbcc07e0e4df376123bc5ee46948439e10f9c781668f SHA512 50dadddab99cd1f4c671da1a6c460c5e105f2c3087445a18df0648b049b8368e9df5e624b9db1bb9febed142852f5cfdfa2cfc61441c4455df70be27fc536d4a
 DIST microsoft.netcore.app.runtime.linux-x64.7.0.14.nupkg 34214906 BLAKE2B 96a31edd8743ba392a253015b7147eb17437ae19c47e36099432d457c7430e1b5a1e4c1aa0c216942c638f4e85e084b324a501551624d718b5a70a647d256ab4 SHA512 00cc67d89ffc477dff76ded60a8f03cc70fc7eaf119860c827f7e8d2ae4486b5aef7064db6564fa6d3fcf1f64a7efd0ea77ff063f3a3c580baf6ffecff63f46e
-DIST microsoft.netcore.app.runtime.linux-x64.7.0.19.nupkg 34220854 BLAKE2B 3f3a0fdab62e19947d3db6860b5301c3bd4a554a33185c61d5b1ab5179c33d878ecda5f5447d9f74ecf2109774fc8fe1678856959a86afdb4ee929d2beadc773 SHA512 636a8a365c246a28e09480831e01444bc8787ec44c961691229ae80fd7bf76e887645dcb90f1ef84d3a6babf8e907e11cb0b7ba2034242b889a435c075419053
 DIST microsoft.netcore.app.runtime.linux-x64.7.0.20.nupkg 34222885 BLAKE2B 951c5f5b26e4eaa20d5b6c864e89fdf4b992b0459e80ee7f3591e11eb39775f860261c50b29a7f7874a99121c1a863f2f0685bbd3093e974db45e6546c51ad7d SHA512 b302dcc0ca19b94bc05ae9309846e3afe61762d47278347f8626002d9e525458edc9f4bf152137218ff16d5b641327cc14f11c45d12b943558709104ab490f69
-DIST microsoft.netcore.app.runtime.linux-x64.8.0.5.nupkg 34972685 BLAKE2B 8c121843a335b72e6b0ba4a93a5641527cb4efaec2a433edf04c31c2efae052a8f502a827a3de31fa9954ceffd81de2ea12f2da81098f41e2e68ccb63c4c294a SHA512 b119c585acafa07428e0875170dae97b8ebc2e0b382f86976ad26531cf807f411cf67b7f4dea85ccc493e15ac0ea3046ae337021ee22bf1f1d3336c96106c54f
 DIST microsoft.netcore.app.runtime.linux-x64.8.0.6.nupkg 34976051 BLAKE2B eb21cf390e6d2f691dab21a0f31e6264dd34c1c516f55bd0f6de41ceb21e78f2bcc7dd65a45cb6ce9b3022e4f4cafb7d9faa025abff32da9a1834d26019114b1 SHA512 5bacb98224f0a6edba8223fa6cd0b6e4dbfb5656f371e0a8b61063492f6a47cac8b55a54b722e4786b8563845e7896f9e30a7cb5e185a5f5f3762aedd3734048
 DIST microsoft.netcore.app.runtime.linux-x64.8.0.7.nupkg 34989348 BLAKE2B bb795afdcdfcb718bf4686c2f8efe36a2c9bef065f350d09caebb961ad33bb1c4c3b200b0abc3c0254a5c9fd2bdf2186428b138ed7c7271f5e6aca67c9dc65c3 SHA512 10355aaae57cce97f0bcf9a7b25c9018df1a97a951aec5381f52649c96114607b6606bdc5f3df4bf808d26ac51c20d03a2d5de2a04420b113ffdd146027d4d68
-DIST runtime.linux-arm64.microsoft.dotnet.ilcompiler.8.0.5.nupkg 54349379 BLAKE2B eb46c70538778c4b5b66c1c2d6ef9d81ea8a45f4bee4afb9b60b0074f12bb117b7c6ce045b5ad15fca32e554e0d94d8905b1f01632c31b48f3f2855d1ab61dd2 SHA512 3eb36cfb88147ef228c73c07b69ff9c4408b0f6e33492f075ac1be18570182f4261e58dab00c89fb47b217c8155a96dfb1e866f920dc6f80f3633e4d3ae37216
+DIST microsoft.netcore.app.runtime.linux-x64.8.0.8.nupkg 34981540 BLAKE2B 9fbcb166b82f1b5701f0be87bae56836672efd6c2207263874c06c370606b58962db2a0409ee02fc72c66a23393c6296c5e8ccb0b76c5ea9647aa723b326d76a SHA512 e1e335711505187d34fd4a78996a3d3341d700cdf0fca9d3b527c6d9d5ac1ff159f2d54987d0925788dac45cf33e39dc63153640171c631e179b2521b7eae6f0
 DIST runtime.linux-arm64.microsoft.dotnet.ilcompiler.8.0.6.nupkg 54327416 BLAKE2B 3e626faf46381183e516f32fa938e95de561ea9ffd1eac4ccced919d94d120f3cc8d9a6d9de0c2e6ef54a0277e9312b4e0c30c7daba4e9682a936a0b08cba0a9 SHA512 20dccc170349d6ad85d997f834d03924b1cc984843e0aa440e8effd1521ffda6ab86f3ab0eca782d4de3d6db33affe783a6dbd0b430cea8277f7ccecd1ac9986
 DIST runtime.linux-arm64.microsoft.dotnet.ilcompiler.8.0.7.nupkg 54345293 BLAKE2B 2abab41278623cc4513c7c46e92576121523bd69ce478cdadc0fcb1998a9bf47cfa0d9a458462dced5996b2856c8aac98f5796ce2ec9e9eee6cb2a8387c601b4 SHA512 4168e3b892b8cec4b5e2cb356e4f9f87a87cdf6edda12acb7eff98b0bad2b8b2e9041a15bc8ed2ca43a6d487d8e3a0b18964844e5be6ab919a09ade8dbb5eb34
-DIST runtime.linux-musl-arm64.microsoft.dotnet.ilcompiler.8.0.5.nupkg 54356420 BLAKE2B 06d5f88d68ea53cc93c6782d4504a5d9487382c0e7a39ebb528f1edc417421e32506523ece424e8e5d1d664e7389d0fbb630a865e6c6bdae1bcd9f103b021ebf SHA512 f5aca4cbb60c51dc12141921fdf918a0eb3462f38bc13baeacdd6c216bdc8fc12adac29cb584c68b827b064f267791910b76fc9dadf30745d809a511a5878bc3
+DIST runtime.linux-arm64.microsoft.dotnet.ilcompiler.8.0.8.nupkg 54336790 BLAKE2B 5aed9dda93f0051619423cbd7899594c616155b60e7b56fe45356ccbd624cbd553a1a356a09e785a7d6732ba2019c63329bfc350cee6b5764249c8dd5bcb8acc SHA512 c31be385deca2849fd8f8cf2cd6d2c424b01e18df05a4cc69ea73415204c20a06b552ccc9ce2156a3c7c863611ecaf609909e48116a4e46d53f85b9cdbdd5bde
 DIST runtime.linux-musl-arm64.microsoft.dotnet.ilcompiler.8.0.6.nupkg 54337346 BLAKE2B c458a7a7ec6a06fbafda0d88080cb560d5a4b458003a987e889577b283767d089285600c5da68e6a3a476a655b755990e3ab6eb294e4bedb35cea95741e18881 SHA512 649cf1fe7d6fda2c55bc57c217b6538136a9c1f590f2167a924afaf25cb4abd2c3328070ea00ccf266f8bd789fcc17b99b8c1a04b76d03161efb8025f075b232
 DIST runtime.linux-musl-arm64.microsoft.dotnet.ilcompiler.8.0.7.nupkg 54351523 BLAKE2B cd1f1938483852e9f70379dc2d53fcfd7094f184596d43c4c9398a3e61c0c3883490116ca273d9eaf5a1f92b6d993cc8816aae7e5dcb7e2fa4243b547ef840c7 SHA512 3e6f9a80e227722b9fa40007e93bbcec8a671ac23fd1c788318cf7010436c332f361c1dacd05859699d1e5e1a9223e616f59211beed09b6b820e06b77842a57b
-DIST runtime.linux-musl-x64.microsoft.dotnet.ilcompiler.8.0.5.nupkg 55115558 BLAKE2B 1d500a29432509c134714cca3903281ec112e71960989a5e6bf38b8f307bfdb1418a078f36f2fed9e98d612049064abd7c456e6797f1d6be54b1c145508f4d27 SHA512 5a5f49fe5c9b77db7740c2d2f8346ddbcee91ee965d1d762f3db221b8aff493dc2b5d037100d7119751ed2f2b406a936a68c5f05d6169b2247b66d1d8dd97874
+DIST runtime.linux-musl-arm64.microsoft.dotnet.ilcompiler.8.0.8.nupkg 54346257 BLAKE2B 5a70e6f864ccfe34aded785996e5332e4f31837b650add4e86c4fbf2dd550c0e9304cc9c369976e548daeb26bf2c97336326829a9ed706f54b3de66aa51f4947 SHA512 359bfe7a11e463653e14c079ca4dcba0b5ee1706c4d3593cd3e411641485ebfd7a3dbe949d39d726cf9f0d48da1f11d1298fb54af18b1b7595e347b271096dff
 DIST runtime.linux-musl-x64.microsoft.dotnet.ilcompiler.8.0.6.nupkg 55108415 BLAKE2B bbb8caf2f2dee54f9ef69a97f0abe4654f1834927a89af0e5c7dccaad2dba3bca81d3a5c839171a43b4852b00a39d14f0ae762746a9bf0b71f2bcd5a25072591 SHA512 499cf5d281835c8e18a57654d8099d984767caa2e26107905fd6a2d4f902d9e1e314c95e10d11b8ff119bd9cd42b9c9f8bad5adce651bacda46f8db9eb752cf1
 DIST runtime.linux-musl-x64.microsoft.dotnet.ilcompiler.8.0.7.nupkg 55124117 BLAKE2B 184bddcccb4a2b3d3ae8aaf60964cab95638f0b82ab462342bfefd8fc892fec0de1f5558dad31ab6aca435d9de28a35eb8b1e062d188207f929289f5ba904a32 SHA512 16e1298f3e147785d5f08ee193a84670db7bcab0d7bd71f14259ea6b099fa040ff94265c2dc4be3cb2f135bc00512789609af094de31f4c54b8f19a4abcc05a0
-DIST runtime.linux-x64.microsoft.dotnet.ilcompiler.8.0.5.nupkg 55105097 BLAKE2B dce9ba53113b3157bbea562bc1e3f6064cddff7adccd5e9233a7e84c99c563ac4ded672d3c503f0b33acb2aa5a29e465ef69e95729711fee753a765fb37f0be5 SHA512 8c3a4a1c1a0eaffdbb096c165f16f08589240f6aed639f3e58318bbc594a70c3ae187f82982526c459c80f3285d0f755f80402121d85c15b9f4376fa9f7ac754
+DIST runtime.linux-musl-x64.microsoft.dotnet.ilcompiler.8.0.8.nupkg 55106066 BLAKE2B 124e54bc4bbb90fc9742b4cde955f7b2da183996dd08f8130aac03a6bd070986443e0e5019d288846c6ed61ed37660769bd6efe6fec62d442214b3c44ff22c85 SHA512 ed421a245a1521cd753add957aeb8284140a85fb2accdfe5b16484c9f3168921b2957abe183fed53a63dca043974b606fb5b3bd085c4a0eabc5f93e6f4a153db
 DIST runtime.linux-x64.microsoft.dotnet.ilcompiler.8.0.6.nupkg 55098099 BLAKE2B 8a6e94f2032f10d3e050a3751be561a544c9b82d751afef21d5d03c3c18c4ffa9e0e4f44d9812cc4dc3ed5b070ed5c4cb9bb269b851d34bb9442847bd7c6062f SHA512 f0a57112ec8f6e6b28a9b4432f1f842ac75e8ef0bdee072def690a0c1ab129b250f49dba8567bc6712908ed22d4de1b9f0b9b626acfe6003d999fbe6645ddc16
 DIST runtime.linux-x64.microsoft.dotnet.ilcompiler.8.0.7.nupkg 55113728 BLAKE2B 4fd1e989b80df19a0f0f27d80a612c697de762350c11f02e696f9742d523103ff669715afd26df5237685f8d880cf1eed48f4a11f31e6952c9d44dd8898e2865 SHA512 3d58d8d400f1489724c02ea0e3682a451622d7df4c99dee1f0f904eabe330a934c99306d4220148d6b2a88fdfa82c0cc3bc867fa4115f1b5624654d0d93c0106
+DIST runtime.linux-x64.microsoft.dotnet.ilcompiler.8.0.8.nupkg 55095221 BLAKE2B cf6f23f5c2a20b31e948e4b5e313df62c2373497b8c6faaa3e8477aa0f7501511b4a495f186d9ce9f8943f3ce2611a1df9710a5fb0e020c4399e78ff504ff0f0 SHA512 13870ebc23bf772a247da81c3e7669aef06a3ddee6200e76505847e024e32029d4342c5805119e9dca9ae23155a6f21bb3004016de1f83d5a780dd49e1fb7d99
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.30.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.30.ebuild
deleted file mode 100644
index 481fec58dc29..000000000000
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.30.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
-
-DOTNET_PKG_COMPAT=$(ver_cut 1-2)
-NUGETS="
-microsoft.aspnetcore.app.ref@${PV}
-microsoft.aspnetcore.app.runtime.linux-arm@${PV}
-microsoft.aspnetcore.app.runtime.linux-arm64@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-arm@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-arm64@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-x64@${PV}
-microsoft.aspnetcore.app.runtime.linux-x64@${PV}
-microsoft.netcore.app.host.linux-arm@${PV}
-microsoft.netcore.app.host.linux-arm64@${PV}
-microsoft.netcore.app.host.linux-musl-arm@${PV}
-microsoft.netcore.app.host.linux-musl-arm64@${PV}
-microsoft.netcore.app.host.linux-musl-x64@${PV}
-microsoft.netcore.app.host.linux-x64@${PV}
-microsoft.netcore.app.ref@${PV}
-microsoft.netcore.app.runtime.linux-arm@${PV}
-microsoft.netcore.app.runtime.linux-arm64@${PV}
-microsoft.netcore.app.runtime.linux-musl-arm@${PV}
-microsoft.netcore.app.runtime.linux-musl-arm64@${PV}
-microsoft.netcore.app.runtime.linux-musl-x64@${PV}
-microsoft.netcore.app.runtime.linux-x64@${PV}
-"
-
-inherit dotnet-pkg-base
-
-DESCRIPTION=".NET runtime nugets"
-HOMEPAGE="https://dotnet.microsoft.com/"
-SRC_URI="${NUGET_URIS}"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}/${PV}"
-KEYWORDS="amd64 arm arm64"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	local nuget
-	for nuget in ${NUGETS} ; do
-		nuget_donuget "${DISTDIR}/${nuget/@/.}.nupkg"
-	done
-}
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.32.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.32.ebuild
index 58bf329e96dd..1e5370778953 100644
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.32.ebuild
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.32.ebuild
@@ -36,7 +36,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm arm64"
 
 src_unpack() {
 	:
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.33.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.33.ebuild
new file mode 100644
index 000000000000..58bf329e96dd
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.33.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="$(ver_cut 1-2)"
+NUGETS="
+microsoft.aspnetcore.app.ref@${PV}
+microsoft.aspnetcore.app.runtime.linux-arm@${PV}
+microsoft.aspnetcore.app.runtime.linux-arm64@${PV}
+microsoft.aspnetcore.app.runtime.linux-musl-arm@${PV}
+microsoft.aspnetcore.app.runtime.linux-musl-arm64@${PV}
+microsoft.aspnetcore.app.runtime.linux-musl-x64@${PV}
+microsoft.aspnetcore.app.runtime.linux-x64@${PV}
+microsoft.netcore.app.host.linux-arm@${PV}
+microsoft.netcore.app.host.linux-arm64@${PV}
+microsoft.netcore.app.host.linux-musl-arm@${PV}
+microsoft.netcore.app.host.linux-musl-arm64@${PV}
+microsoft.netcore.app.host.linux-musl-x64@${PV}
+microsoft.netcore.app.host.linux-x64@${PV}
+microsoft.netcore.app.ref@${PV}
+microsoft.netcore.app.runtime.linux-arm@${PV}
+microsoft.netcore.app.runtime.linux-arm64@${PV}
+microsoft.netcore.app.runtime.linux-musl-arm@${PV}
+microsoft.netcore.app.runtime.linux-musl-arm64@${PV}
+microsoft.netcore.app.runtime.linux-musl-x64@${PV}
+microsoft.netcore.app.runtime.linux-x64@${PV}
+"
+
+inherit dotnet-pkg-base
+
+DESCRIPTION=".NET runtime nugets"
+HOMEPAGE="https://dotnet.microsoft.com/"
+SRC_URI="${NUGET_URIS}"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local nuget
+	for nuget in ${NUGETS} ; do
+		nuget_donuget "${DISTDIR}/${nuget/@/.}.nupkg"
+	done
+}
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.19.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.19.ebuild
deleted file mode 100644
index 481fec58dc29..000000000000
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.19.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
-
-DOTNET_PKG_COMPAT=$(ver_cut 1-2)
-NUGETS="
-microsoft.aspnetcore.app.ref@${PV}
-microsoft.aspnetcore.app.runtime.linux-arm@${PV}
-microsoft.aspnetcore.app.runtime.linux-arm64@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-arm@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-arm64@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-x64@${PV}
-microsoft.aspnetcore.app.runtime.linux-x64@${PV}
-microsoft.netcore.app.host.linux-arm@${PV}
-microsoft.netcore.app.host.linux-arm64@${PV}
-microsoft.netcore.app.host.linux-musl-arm@${PV}
-microsoft.netcore.app.host.linux-musl-arm64@${PV}
-microsoft.netcore.app.host.linux-musl-x64@${PV}
-microsoft.netcore.app.host.linux-x64@${PV}
-microsoft.netcore.app.ref@${PV}
-microsoft.netcore.app.runtime.linux-arm@${PV}
-microsoft.netcore.app.runtime.linux-arm64@${PV}
-microsoft.netcore.app.runtime.linux-musl-arm@${PV}
-microsoft.netcore.app.runtime.linux-musl-arm64@${PV}
-microsoft.netcore.app.runtime.linux-musl-x64@${PV}
-microsoft.netcore.app.runtime.linux-x64@${PV}
-"
-
-inherit dotnet-pkg-base
-
-DESCRIPTION=".NET runtime nugets"
-HOMEPAGE="https://dotnet.microsoft.com/"
-SRC_URI="${NUGET_URIS}"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}/${PV}"
-KEYWORDS="amd64 arm arm64"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	local nuget
-	for nuget in ${NUGETS} ; do
-		nuget_donuget "${DISTDIR}/${nuget/@/.}.nupkg"
-	done
-}
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.5-r1.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.5-r1.ebuild
deleted file mode 100644
index 42dac955ee7f..000000000000
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.5-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
-
-DOTNET_PKG_COMPAT=$(ver_cut 1-2)
-NUGETS="
-microsoft.aspnetcore.app.ref@${PV}
-microsoft.aspnetcore.app.runtime.linux-arm@${PV}
-microsoft.aspnetcore.app.runtime.linux-arm64@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-arm@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-arm64@${PV}
-microsoft.aspnetcore.app.runtime.linux-musl-x64@${PV}
-microsoft.aspnetcore.app.runtime.linux-x64@${PV}
-microsoft.dotnet.ilcompiler@${PV}
-microsoft.net.illink.tasks@${PV}
-microsoft.net.sdk.webassembly.pack@${PV}
-microsoft.netcore.app.host.linux-arm@${PV}
-microsoft.netcore.app.host.linux-arm64@${PV}
-microsoft.netcore.app.host.linux-musl-arm@${PV}
-microsoft.netcore.app.host.linux-musl-arm64@${PV}
-microsoft.netcore.app.host.linux-musl-x64@${PV}
-microsoft.netcore.app.host.linux-x64@${PV}
-microsoft.netcore.app.ref@${PV}
-microsoft.netcore.app.runtime.linux-arm@${PV}
-microsoft.netcore.app.runtime.linux-arm64@${PV}
-microsoft.netcore.app.runtime.linux-musl-arm@${PV}
-microsoft.netcore.app.runtime.linux-musl-arm64@${PV}
-microsoft.netcore.app.runtime.linux-musl-x64@${PV}
-microsoft.netcore.app.runtime.linux-x64@${PV}
-runtime.linux-arm64.microsoft.dotnet.ilcompiler@${PV}
-runtime.linux-musl-arm64.microsoft.dotnet.ilcompiler@${PV}
-runtime.linux-musl-x64.microsoft.dotnet.ilcompiler@${PV}
-runtime.linux-x64.microsoft.dotnet.ilcompiler@${PV}
-"
-
-inherit dotnet-pkg-base
-
-DESCRIPTION=".NET runtime nugets"
-HOMEPAGE="https://dotnet.microsoft.com/"
-SRC_URI="${NUGET_URIS}"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}/${PV}"
-KEYWORDS="amd64 arm arm64"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	local nuget
-	for nuget in ${NUGETS} ; do
-		nuget_donuget "${DISTDIR}/${nuget/@/.}.nupkg"
-	done
-}
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.7.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.7.ebuild
index 0a6e21191712..42dac955ee7f 100644
--- a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.7.ebuild
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.7.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm arm64"
 
 src_unpack() {
 	:
diff --git a/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.8.ebuild b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.8.ebuild
new file mode 100644
index 000000000000..0a6e21191712
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-8.0.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT=$(ver_cut 1-2)
+NUGETS="
+microsoft.aspnetcore.app.ref@${PV}
+microsoft.aspnetcore.app.runtime.linux-arm@${PV}
+microsoft.aspnetcore.app.runtime.linux-arm64@${PV}
+microsoft.aspnetcore.app.runtime.linux-musl-arm@${PV}
+microsoft.aspnetcore.app.runtime.linux-musl-arm64@${PV}
+microsoft.aspnetcore.app.runtime.linux-musl-x64@${PV}
+microsoft.aspnetcore.app.runtime.linux-x64@${PV}
+microsoft.dotnet.ilcompiler@${PV}
+microsoft.net.illink.tasks@${PV}
+microsoft.net.sdk.webassembly.pack@${PV}
+microsoft.netcore.app.host.linux-arm@${PV}
+microsoft.netcore.app.host.linux-arm64@${PV}
+microsoft.netcore.app.host.linux-musl-arm@${PV}
+microsoft.netcore.app.host.linux-musl-arm64@${PV}
+microsoft.netcore.app.host.linux-musl-x64@${PV}
+microsoft.netcore.app.host.linux-x64@${PV}
+microsoft.netcore.app.ref@${PV}
+microsoft.netcore.app.runtime.linux-arm@${PV}
+microsoft.netcore.app.runtime.linux-arm64@${PV}
+microsoft.netcore.app.runtime.linux-musl-arm@${PV}
+microsoft.netcore.app.runtime.linux-musl-arm64@${PV}
+microsoft.netcore.app.runtime.linux-musl-x64@${PV}
+microsoft.netcore.app.runtime.linux-x64@${PV}
+runtime.linux-arm64.microsoft.dotnet.ilcompiler@${PV}
+runtime.linux-musl-arm64.microsoft.dotnet.ilcompiler@${PV}
+runtime.linux-musl-x64.microsoft.dotnet.ilcompiler@${PV}
+runtime.linux-x64.microsoft.dotnet.ilcompiler@${PV}
+"
+
+inherit dotnet-pkg-base
+
+DESCRIPTION=".NET runtime nugets"
+HOMEPAGE="https://dotnet.microsoft.com/"
+SRC_URI="${NUGET_URIS}"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local nuget
+	for nuget in ${NUGETS} ; do
+		nuget_donuget "${DISTDIR}/${nuget/@/.}.nupkg"
+	done
+}
diff --git a/dev-dotnet/dotnet-sdk-bin/Manifest b/dev-dotnet/dotnet-sdk-bin/Manifest
index 0aa633de631d..c83e71e360a4 100644
--- a/dev-dotnet/dotnet-sdk-bin/Manifest
+++ b/dev-dotnet/dotnet-sdk-bin/Manifest
@@ -10,12 +10,6 @@ DIST dotnet-sdk-7.0.404-linux-musl-arm.tar.gz 214217752 BLAKE2B 32d392dfd4d4e60b
 DIST dotnet-sdk-7.0.404-linux-musl-arm64.tar.gz 213918271 BLAKE2B a310e95905ccb65506318c10fa4d492baf822dd143ac3ded8e9212ab0f304e188d0728deeeb03a0d34d3ab95e88fbc2d4fd4d727c2841bdd9401cf27396edf4b SHA512 209f29d23945d61d8d2bce57ed120b970ffdde7a23fcd397602e4755ff4be6ace2284d42297708e7cb2ef8a2f569885b0595b218e01b84b923c76c58fee1adb4
 DIST dotnet-sdk-7.0.404-linux-musl-x64.tar.gz 218631734 BLAKE2B 4dc1d752cbb6c60d494be3b8fd9e1bdebdca0f48e5c61cea2948ca384c9136b87612cfd89a77cd9960b4a660061c3f2791ce8be1987edade2d0c70e28b325d1d SHA512 db21720eadc79fadf62332cf0a10bbf8c83a96521b25967e69ce54a14a16d9098abb9c8d2c263170332a30ccd0fd1eca92129a1e9fc3c3460fc265ace38bb04c
 DIST dotnet-sdk-7.0.404-linux-x64.tar.gz 219088775 BLAKE2B 5b743021dd2209228fea77c7b63dc423ce70f1e8bae317dca0d3cd4e62ea4f770b790ca64dd15173281ef8224fce6fc211b57fe5460ce0ed427afe4b2a064c1a SHA512 f5c122044e9a107968af1a534051e28242f45307c3db760fbb4f3a003d92d8ea5a856ad4c4e8e4b88a3b6a825fe5e3c9e596c9d2cfa0eca8d5d9ee2c5dad0053
-DIST dotnet-sdk-8.0.105-linux-arm.tar.gz 209116084 BLAKE2B 3166c6b24ef6fe7dc27dba5bfd349a7006a353d587d7d6ed509038d2d50566ff50450b4ec166639fd5d995d066b9b0bc035b5b824472e2e5ef60c17510f495de SHA512 6aa5adc487b2f5e887a7c91ea9a6d1f948ea5ca6520e93826610c5ea58827f37421bd0ef09ebc0d9e2d3108dcb41aedb51188630df5e1da199e0ab2ee0d6acf8
-DIST dotnet-sdk-8.0.105-linux-arm64.tar.gz 208945369 BLAKE2B 98e61c44cbeb58c9b6e6da2eb7108b25f08ccf2deab2af0ba48b47f7a71d7955e6c4be97d111965faefc9b42aa08492347b8b4a27d352fd288a88e029d33b9a0 SHA512 8f04afa385676d2ec879ad22734a4c869d931ba4bc7507d0aa5889561d0230e382598057bdf75792048b28bd9a1c8eb187e80691f603309a46d6c50d71373381
-DIST dotnet-sdk-8.0.105-linux-musl-arm.tar.gz 209188121 BLAKE2B d4974b81d0c6c466293327fbef9774d18794bdbdab254858f75b997eb6ee224509d46bc75444922426e3dc58f47890489b8846a6053136e49db9372963c1b55a SHA512 b898fadd8b4a4e6a6ec2c3d936d20729dd03f912123fe7b8a40bbee609839ad019a6501a21712ad4e9b6c93d6a1ce5f8c9227f0fb5387edb08a0a8bea44d3c31
-DIST dotnet-sdk-8.0.105-linux-musl-arm64.tar.gz 209063416 BLAKE2B bd6d7ceffb7ab1ccef60b312c5e2eab073d8b5397534d867e41ce6942f5addcc96efe10fa959e45004b62fb728ab24e4b1443c3131531a5df62af60474617b53 SHA512 ea1cbb3fe35447418f552d51a359a4f133754240aeca91fea8e5ed97dcdd9b01a4cbfeb6354ec1a3f71c7fcdf82000c7f9492c42b66fc69caafd023927e6f658
-DIST dotnet-sdk-8.0.105-linux-musl-x64.tar.gz 213676181 BLAKE2B 8aa2513e2520c175ac80278af66bc5f943243f373b5d82b89af05a0e1174404e5cf79ecf7e75be0ba1bcb90b7f4886377eb833bf658d7fcac8377bad6765d299 SHA512 d8a8b2ea25b70139a4ac1356c210221243add6956a946fbc24c7195850624a4f25569e22024188dd718b1ff0fadbf775a6df97f8aa5ec2244159adfd81bb14dc
-DIST dotnet-sdk-8.0.105-linux-x64.tar.gz 213741300 BLAKE2B 17f6fe0d440fcb89d1b8959b869efc1adbd72dad6029a5d7e2f563ff41d9724402528e88758ac75f7ff6a0e1a36a354e5f46f3bae450fb6dacafaddadd330563 SHA512 60ff271ee7851ff9ab851f9dc3e3d0abc87ac9b982959abfc8f0a3b58301fb6a0ff7b9f07f8df18668e1e8182c688d0d661bb9cb1771a2d40a0015d02009fce8
 DIST dotnet-sdk-8.0.106-linux-arm.tar.gz 208974475 BLAKE2B f081fae8997e0d34e83de4a192ca7869c78d1e4eb31bc07d053c23b6577b65f33720428c362b12aeaa67a443f76a56410a0ee97e9682639c7cc9ca3693f9f85f SHA512 ebedfc205f9301890c78c4176d1a6f910890cf224e7ac34fd69f798d663550e36c3a2a057111304aaeecea31bfd496007ebbae4a51f33cd674588f42d8b3df9a
 DIST dotnet-sdk-8.0.106-linux-arm64.tar.gz 208853029 BLAKE2B b0fe93b920f168490ca40debb320746f20f0372fa9fdcd16a6092ebcbd8ae8eadade5e86bca2fe04d6211b2cbc6b49452e4e666b3c2d4a7b41b6b1a23ee32afc SHA512 e8f735d20d79b20d24ce5b2f7c25c60604cb6b694b6572488c654cbf14a4d99c269f64f4ca23ab78aefaedf14f35a0ae1f33adf6afac5556e2ebd22ec73e04eb
 DIST dotnet-sdk-8.0.106-linux-musl-arm.tar.gz 209248865 BLAKE2B 68fa57d4cebd7ff5903786fa8e1b7a7d66b5c9e75f9993b3b65692eade9fb67fa0c4fbaf48dc49d815c8043225962e218036811b68e71db2d7436a09b505dad5 SHA512 0d149ee7d5e3557d631ff96fff06e7bbf01cc80041d9a378cd8633f5304ba8351b3d25f7b889d68ae245329fd9cd86d9475cac5ca3a157e5fd98c18420857edf
@@ -28,9 +22,15 @@ DIST dotnet-sdk-8.0.107-linux-musl-arm.tar.gz 209094033 BLAKE2B ecc7f6ea32a71ecb
 DIST dotnet-sdk-8.0.107-linux-musl-arm64.tar.gz 208907068 BLAKE2B 0ee7875279dd37572c6d0b6360d76efa1078ffd8a67822c587a60e9ca50fee6c35418d7ddb92f182d2bbc8fc2c11bb015ea2790e668103b9f6c486b3414169d6 SHA512 5b99a07607cae652e4b392c17a7856ffb5df939e95d741d07c385d422e5511394567b5102213da1dc65183680d0e908d83c43c95b14bfabec305ca7731d9d676
 DIST dotnet-sdk-8.0.107-linux-musl-x64.tar.gz 213639420 BLAKE2B ee877963955c1ae23b69c3fce1b2ab1d799b646e5917d5a1eb19e707bfeacd0118fca79a91993b97a40aafdacffe259a5c94b303c0b277e3202d2bfc75a99b33 SHA512 f25c95f9acff4db16593541fda517c32477eb618dc9ad5b3983a4ab5bd62fdd3c03c7d9f56afe1132aff5137bbdc4161e0b83f7c8101cb1766b82ed4072becef
 DIST dotnet-sdk-8.0.107-linux-x64.tar.gz 213608643 BLAKE2B 716886da2c5a2190dc81e031b9e439eb31f6318418fdf47d487f3aacad99368f642f13d80aa6dd961517939d3e7e6f59efc4563a5ac62c4d7fc3a798e709e32a SHA512 10e0fbdc589e5e0de4fb0fe0e9c839bb2257c51948037a224d4358b8328b6791014ab4cb164beb617c83531a6ed774acb37b08e4a1b53f165e3eb853fd41a959
-DIST dotnet-sdk-8.0.303-linux-arm.tar.gz 218288787 BLAKE2B 7f689b9c695b2622f2489a9bb3b7d080e7f488d8c3dc63cf8bc1df0bba6fc7b97fd6407308c9998de40dcacfeea2e23eebbd4dafc7cd57ddb30b34819273c2eb SHA512 03b3730d1fd5e1955b8a23e69695c975e88e781513b1f47027ce4ed96a8743ba2560ca87ae2e937ebd89ef69a3aa05c4ca2f39eede5a27bd937775f372b9feba
-DIST dotnet-sdk-8.0.303-linux-arm64.tar.gz 218493906 BLAKE2B 2018811bbbde7835da9634635e479856e55a851eed0e6eed966cb8a125638c6f10f2a4687bc4134a895cbc4c8363b5ce878b8f8ebd2c5f37622452590f225f62 SHA512 09cb6b12770febe186e36971afdbcea6e8bf5fb34b7701cd8c416f597d3b7e930d05e51ccef1985e5598291540ef2d721187904587469300bb39772317e2be5c
-DIST dotnet-sdk-8.0.303-linux-musl-arm.tar.gz 218348934 BLAKE2B 4461a1b2cd3229e91cdffe315b04561029694f5425b80d00b57a3517c56952a3b93245ef7b4ccf156089252f3558b5324cfb9b25af1ba26dca293590528cdde8 SHA512 5e119bf1496bebd3b62d0c0c837bb8e8695784c91f9042771b01b47953d82e59605d7c04f2b821340792ace2966587a10d980bebeb8f9a39f1e8e4588ab59a6c
-DIST dotnet-sdk-8.0.303-linux-musl-arm64.tar.gz 218434418 BLAKE2B 2ca5f6999542f39325b6fe4c80a202d3e8fd931c958c97b6c08a2d8a27c509ee3c876b739ad3bca3acc951d73a10a25ce1a6315217c4080a7a4302198d80bd7d SHA512 88a42a0a9f0b6981eeb0d2cdbde0fd98631d57c09ddca566bc1b4d4b99a9165e276a3434f6804bd54628387edae99c8f0025e889c0e06ade0defaf2fa5858d65
-DIST dotnet-sdk-8.0.303-linux-musl-x64.tar.gz 223120552 BLAKE2B 7a8c257cd1c723d7232481a134b499afa0825f561957ccb0c2aa5baa6b20114e4db0d19fcec25a54ac8020799b6fd7afa582c9d221fc2a9208cd4f2b495e5e58 SHA512 5696332dcfa1dd16f897f68dd190e45f6604fd8228d563394ef9da09f2ff99214ba23b80fa416b7748a5c34912eb42523ba83138d5cbc4468e1efc15b747630a
-DIST dotnet-sdk-8.0.303-linux-x64.tar.gz 223236164 BLAKE2B 3008c5b3f84a965b717b2f51733cbf6d5ba218f5ae97dc250a2e7279e645b8577d8b6d5443f73e8130385d2263196f954ba6bfa64a2b33a8685d0c5a4035ed19 SHA512 814ff07ccdfc8160c4a24adfda6c815e7feace88c59722f827a5a27041719067538754911fc15cb46978e16566fe0938695891723d182055190e876131faedda
+DIST dotnet-sdk-8.0.108-linux-arm.tar.gz 208945195 BLAKE2B e5e2c06ef316da57b7fb39fdd7fa6865b1d5b9040ba1f89cda67bb8bb0039f6c8f41beafc1c180e0317b92c5dcdff21212b2ae312a675b5b48cc50f74efb5abd SHA512 fafa8564b34b524b4209e1047ce7cf1190a5d42e7ba1b13524f5de602b075e630cdd229567f14eb2f0ae6c96ac910ae9dbb4fc4e528df958c9d31471341eedca
+DIST dotnet-sdk-8.0.108-linux-arm64.tar.gz 208922242 BLAKE2B 76cc7262e503ebec87e665aa393dad704e8a38ce5c4b886c204ef96a9be18935ecc80b59f04c49a81cda152641bbbe17ba41120e4f56d0ce70e679808aafaa16 SHA512 6cc723f2b139d19b2e17da5936698d388a5b64638b75ef78c40c407ed3cfd3dea745c2916f03efc9e66479fc55d608eb3a89305727ecdb1c999b183b58de258d
+DIST dotnet-sdk-8.0.108-linux-musl-arm.tar.gz 209001685 BLAKE2B 3f788ab4a10c7372942764150b1e3845fa54bb253095d6ab303ad93bd69dc2c9038c49d7b2d5c132979c15ad70040394d9c8d5fe34fbba092e99a99c4c0e653d SHA512 efb308d81ac1020962f14d03e7ca9419a2901a0846120e07cd95c65407fe2981a26360c2ffea141d80581aac6d2c36a7379c76c07b2fb37d4efb836905f8ff68
+DIST dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz 209077243 BLAKE2B 1b2ca78c62c16dd50aee5946276eb3f578433fa20c6a18d391049dd7adffd8099191c1709e4d913337254cbf2fc063d68ea8f46b7c726f38cfddd7ec60f46cfa SHA512 e7009ba373b043ccb469557271ac8ae518ab9c9b5b364e9841d8b97305b6036f33240e672e7c483798616a233429748d5038fdfd336352b82060afd645747045
+DIST dotnet-sdk-8.0.108-linux-musl-x64.tar.gz 213832674 BLAKE2B fdd7b4c442f1ee2aa410275222892d5845946b125c60c63c6da968cf5efef65550ac4f92f764e6f09e10ce519ea995c7387fb17b83442317aa01f0d9cb405553 SHA512 744715501de3946f06cd316f35cabc0e363e0af651044c976708c0d48d4eb0d09489d92cceb283c751b2eed0e293ceaaabddcbabf7c25e21d658ebff9dc304aa
+DIST dotnet-sdk-8.0.108-linux-x64.tar.gz 213752759 BLAKE2B d2e2218e3770d023e2661b9b54e9fdb81ed1512cf08808216282cca9a064de23da5c2f5bc32b7e91e95a381656da7ddf6d5593bd01fe3f6297441174ed3769be SHA512 5666ddf6fa9b65deaba4d7c5fcc2e2d56f631c4f5f6fb2a9f5919af0616ab2b420b12a828becc2e4b8628a76ac3dae824b55abde5c6d5ac59ee131d7eceae7c2
+DIST dotnet-sdk-8.0.401-linux-arm.tar.gz 206587208 BLAKE2B 3ed67670a302f182fd0e8d2887a6bb775f31b427b9ae610c843e7b8ed421822b45aa330e1b0ef9eae9c8cd4ac551cd46e6c23e9290094e26ec8f120bbf8ab4bb SHA512 fb90a8e52f5dd29e5953e4662cc9d57caa96dc6a8f6ff6cfae17947aa8a3f53b5fef1bb35b8c05815fa1cafbdc73179f7296ce846bf5769ee12c9daf5bd27941
+DIST dotnet-sdk-8.0.401-linux-arm64.tar.gz 207131531 BLAKE2B 0f66e106939fb57c4d8340bc3678f535f497366485ebe2718762a873259afaf4c7da8c3176feb30827895b62d7b4055bfb4e604cfb4aa566917d67dfcaaf464c SHA512 e8738b21351d030a83be644571f3674c8dda9e6fbd360b221907a7108fab02becd18e1331907535a1294d8c4d0f608519674c27c77dc2c2803cc53cce3e10e0d
+DIST dotnet-sdk-8.0.401-linux-musl-arm.tar.gz 206681269 BLAKE2B 70b0ccf05cfba79ffc44dffc4b795eb77cbf13e355837ce2d080bd895478b00f3c63fc146af55bcb4ab6e155b000f128a8828c58562c0da6307b6fd0dfcf4cbe SHA512 c5c547eb301dc965eef1d9bcc64231678e209591b80197a78249d35d1655a5469f39ce6de65436375f6e42d22d159c3dc487be17f6dbe7634040095fc988db21
+DIST dotnet-sdk-8.0.401-linux-musl-arm64.tar.gz 207159631 BLAKE2B 6147ce5db03adc6fcf565411d86dc4afa4e777ed11dc2da5760f7d7b74b268239f0e897152ace3aa39763d72c84975380945c88f7764b00f43a4752e90c44b00 SHA512 2faab93dd38a49386032083a0f4a3a5a5661d6ecff4a98f068ed7aa07b201233804fa0e5efa4911b6eebedc9994d59c4d5d843deb773e7e2627b2aa97e634a82
+DIST dotnet-sdk-8.0.401-linux-musl-x64.tar.gz 211854109 BLAKE2B 26eed64cc8fdc5e54dd14fc70ee4555909d0308317823c6dc424bbddc6196a99e7cc27b4e6a40f77d8efa659273be03b3387c37f688a254db5ebe4e8f47b0d6f SHA512 e711b74832269463e27f98b049c442d3684cdc213115133285a2b189ef4564b65127747cdd3a900de53581019bdf8f47426f2cfc9bfc1c0c3a83106f9bb54ea5
+DIST dotnet-sdk-8.0.401-linux-x64.tar.gz 211866896 BLAKE2B 48700c9b7c0044992c0e5fb32e99f2e57fb7ce27a21b8e1619f92545b426d5f53047ac8400e34fd6e36c2211fd3f675a8bd008da7aed2caf1166962ced3061b2 SHA512 4d2180e82c963318863476cf61c035bd3d82165e7b70751ba231225b5575df24d30c0789d5748c3a379e1e6896b57e59286218cacd440ffb0075c9355094fd8c
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.105.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.105.ebuild
deleted file mode 100644
index b041233202d0..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.105.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SDK_SLOT="$(ver_cut 1-2)"
-RUNTIME_SLOT="${SDK_SLOT}.5"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/
-	https://github.com/dotnet/dotnet/"
-SRC_URI="
-amd64? (
-	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-x64.tar.gz )
-	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-x64.tar.gz )
-)
-arm? (
-	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm.tar.gz )
-	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm.tar.gz )
-)
-arm64? (
-	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm64.tar.gz )
-	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm64.tar.gz )
-)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
-KEYWORDS="amd64 arm arm64"
-
-# STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
-# bug https://bugs.gentoo.org/923430
-RESTRICT="splitdebug strip"
-
-CURRENT_NUGETS_DEPEND="
-	~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT}
-"
-EXTRA_NUGETS_DEPEND="
-	~dev-dotnet/dotnet-runtime-nugets-6.0.30
-	~dev-dotnet/dotnet-runtime-nugets-7.0.19
-"
-NUGETS_DEPEND="
-	${CURRENT_NUGETS_DEPEND}
-	${EXTRA_NUGETS_DEPEND}
-"
-
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-libs/icu
-	dev-util/lttng-ust:0/2.12
-	sys-libs/zlib:0/1
-"
-BDEPEND="
-	dev-util/patchelf
-"
-IDEPEND="
-	app-eselect/eselect-dotnet
-"
-PDEPEND="
-	${NUGETS_DEPEND}
-"
-
-QA_PREBUILT="*"
-
-MUSL_BAD_LINKS=(
-	apphost
-	createdump
-	dotnet
-	libSystem.Globalization.Native.so
-	libSystem.IO.Compression.Native.so
-	libSystem.Native.so
-	libSystem.Net.Security.Native.so
-	libSystem.Security.Cryptography.Native.OpenSsl.so
-	libclrgc.so
-	libclrjit.so
-	libcoreclr.so
-	libcoreclrtraceptprovider.so
-	libdbgshim.so
-	libhostfxr.so
-	libhostpolicy.so
-	libmscordaccore.so
-	libmscordbi.so
-	libnethost.so
-	singlefilehost
-)
-MUSL_BAD_SONAMES=(
-	libc.musl-aarch64.so.1
-	libc.musl-armv7.so.1
-	libc.musl-x86_64.so.1
-)
-
-src_prepare() {
-	default
-
-	# Fix musl libc SONAME links, bug https://bugs.gentoo.org/894760
-	if use elibc_musl ; then
-		local musl_bad_link
-		local musl_bad_link_path
-		local musl_bad_soname
-
-		for musl_bad_link in "${MUSL_BAD_LINKS[@]}" ; do
-			while read -r musl_bad_link_path ; do
-				# Skip if file either does not end with ".so" or is not executable.
-				# Using "case" here for easier matching in case we have to add
-				# a special exception.
-				case "${musl_bad_link_path}" in
-					*.so )
-						:
-						;;
-					* )
-						if [[ ! -x "${musl_bad_link_path}" ]] ; then
-							continue
-						fi
-						;;
-				esac
-
-				einfo "Fixing musl libc link for ${musl_bad_link_path}"
-
-				for musl_bad_soname in "${MUSL_BAD_SONAMES[@]}" ; do
-					patchelf --remove-needed "${musl_bad_soname}" "${musl_bad_link_path}" || die
-				done
-
-				patchelf --add-needed libc.so "${musl_bad_link_path}" || die
-			done < <(find . -type f -name "${musl_bad_link}")
-		done
-	fi
-
-	# Remove static libraries, bug https://bugs.gentoo.org/825774
-	find ./packs -type f -name "libnethost.a" -delete || die
-}
-
-src_install() {
-	local dest="opt/${PN}-${SDK_SLOT}"
-	dodir "${dest%/*}"
-
-	# Create a magic workloads file, bug #841896
-	local featureband="$(( $(ver_cut 3) / 100 * 100 ))"       # e.g. 404 -> 400
-	local workloads="metadata/workloads/${SDK_SLOT}.${featureband}"
-
-	mkdir -p "${S}/${workloads}" || die
-	touch "${S}/${workloads}/userlocal" || die
-
-	mv "${S}" "${ED}/${dest}" || die
-	mkdir "${S}" || die
-
-	fperms 0755 "/${dest}"
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SDK_SLOT}"
-}
-
-pkg_postinst() {
-	eselect dotnet update ifunset
-}
-
-pkg_postrm() {
-	eselect dotnet update ifunset
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.106.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.106.ebuild
index 7af2ebe4b2f8..cce5c7539061 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.106.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.106.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
 # See bug https://bugs.gentoo.org/932377
-KEYWORDS="amd64 ~arm arm64"
+KEYWORDS="amd64 arm arm64"
 
 # STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
 # bug https://bugs.gentoo.org/923430
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.107.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.107.ebuild
index 601d0882fdc1..c46945f5c350 100644
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.107.ebuild
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.107.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}"
 LICENSE="MIT"
 SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
 # See bug https://bugs.gentoo.org/932377
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 arm ~arm64"
 
 # STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
 # bug https://bugs.gentoo.org/923430
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.108.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.108.ebuild
new file mode 100644
index 000000000000..077e0cb0100d
--- /dev/null
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.108.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SDK_SLOT="$(ver_cut 1-2)"
+RUNTIME_SLOT="${SDK_SLOT}.8"
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/
+	https://github.com/dotnet/dotnet/"
+SRC_URI="
+amd64? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-x64.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-x64.tar.gz )
+)
+arm? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm.tar.gz )
+)
+arm64? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm64.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm64.tar.gz )
+)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
+# See bug https://bugs.gentoo.org/932377
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
+# bug https://bugs.gentoo.org/923430
+RESTRICT="splitdebug strip"
+
+CURRENT_NUGETS_DEPEND="
+	~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT}
+"
+EXTRA_NUGETS_DEPEND="
+	~dev-dotnet/dotnet-runtime-nugets-6.0.33
+	~dev-dotnet/dotnet-runtime-nugets-7.0.20
+"
+NUGETS_DEPEND="
+	${CURRENT_NUGETS_DEPEND}
+	${EXTRA_NUGETS_DEPEND}
+"
+
+RDEPEND="
+	app-crypt/mit-krb5:0/0
+	dev-libs/icu
+	dev-util/lttng-ust:0/2.12
+	sys-libs/zlib:0/1
+"
+BDEPEND="
+	dev-util/patchelf
+"
+IDEPEND="
+	app-eselect/eselect-dotnet
+"
+PDEPEND="
+	${NUGETS_DEPEND}
+"
+
+QA_PREBUILT="*"
+
+MUSL_BAD_LINKS=(
+	apphost
+	createdump
+	dotnet
+	libSystem.Globalization.Native.so
+	libSystem.IO.Compression.Native.so
+	libSystem.Native.so
+	libSystem.Net.Security.Native.so
+	libSystem.Security.Cryptography.Native.OpenSsl.so
+	libclrgc.so
+	libclrjit.so
+	libcoreclr.so
+	libcoreclrtraceptprovider.so
+	libdbgshim.so
+	libhostfxr.so
+	libhostpolicy.so
+	libmscordaccore.so
+	libmscordbi.so
+	libnethost.so
+	singlefilehost
+)
+MUSL_BAD_SONAMES=(
+	libc.musl-aarch64.so.1
+	libc.musl-armv7.so.1
+	libc.musl-x86_64.so.1
+)
+
+src_prepare() {
+	default
+
+	# Fix musl libc SONAME links, bug https://bugs.gentoo.org/894760
+	if use elibc_musl ; then
+		local musl_bad_link
+		local musl_bad_link_path
+		local musl_bad_soname
+
+		for musl_bad_link in "${MUSL_BAD_LINKS[@]}" ; do
+			while read -r musl_bad_link_path ; do
+				# Skip if file either does not end with ".so" or is not executable.
+				# Using "case" here for easier matching in case we have to add
+				# a special exception.
+				case "${musl_bad_link_path}" in
+					*.so )
+						:
+						;;
+					* )
+						if [[ ! -x "${musl_bad_link_path}" ]] ; then
+							continue
+						fi
+						;;
+				esac
+
+				einfo "Fixing musl libc link for ${musl_bad_link_path}"
+
+				for musl_bad_soname in "${MUSL_BAD_SONAMES[@]}" ; do
+					patchelf --remove-needed "${musl_bad_soname}" "${musl_bad_link_path}" || die
+				done
+
+				patchelf --add-needed libc.so "${musl_bad_link_path}" || die
+			done < <(find . -type f -name "${musl_bad_link}")
+		done
+	fi
+
+	# Remove static libraries, bug https://bugs.gentoo.org/825774
+	find ./packs -type f -name "libnethost.a" -delete || die
+}
+
+src_install() {
+	local dest="opt/${PN}-${SDK_SLOT}"
+	dodir "${dest%/*}"
+
+	# Create a magic workloads file, bug #841896
+	local featureband="$(( $(ver_cut 3) / 100 * 100 ))"       # e.g. 404 -> 400
+	local workloads="metadata/workloads/${SDK_SLOT}.${featureband}"
+
+	mkdir -p "${S}/${workloads}" || die
+	touch "${S}/${workloads}/userlocal" || die
+
+	mv "${S}" "${ED}/${dest}" || die
+	mkdir "${S}" || die
+
+	fperms 0755 "/${dest}"
+	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SDK_SLOT}"
+}
+
+pkg_postinst() {
+	eselect dotnet update ifunset
+}
+
+pkg_postrm() {
+	eselect dotnet update ifunset
+}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.303.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.303.ebuild
deleted file mode 100644
index ef3952b20a53..000000000000
--- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.303.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
-
-SDK_SLOT="$(ver_cut 1-2)"
-RUNTIME_SLOT="${SDK_SLOT}.7"
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/
-	https://github.com/dotnet/dotnet/"
-SRC_URI="
-amd64? (
-	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-x64.tar.gz )
-	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-x64.tar.gz )
-)
-arm? (
-	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm.tar.gz )
-	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm.tar.gz )
-)
-arm64? (
-	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm64.tar.gz )
-	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm64.tar.gz )
-)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
-# See bug https://bugs.gentoo.org/932377
-# KEYWORDS=""
-
-# STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
-# bug https://bugs.gentoo.org/923430
-RESTRICT="splitdebug strip"
-
-CURRENT_NUGETS_DEPEND="
-	~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT}
-"
-EXTRA_NUGETS_DEPEND="
-	~dev-dotnet/dotnet-runtime-nugets-6.0.32
-	~dev-dotnet/dotnet-runtime-nugets-7.0.20
-"
-NUGETS_DEPEND="
-	${CURRENT_NUGETS_DEPEND}
-	${EXTRA_NUGETS_DEPEND}
-"
-
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-libs/icu
-	dev-util/lttng-ust:0/2.12
-	sys-libs/zlib:0/1
-"
-BDEPEND="
-	dev-util/patchelf
-"
-IDEPEND="
-	app-eselect/eselect-dotnet
-"
-PDEPEND="
-	${NUGETS_DEPEND}
-"
-
-QA_PREBUILT="*"
-
-MUSL_BAD_LINKS=(
-	apphost
-	createdump
-	dotnet
-	libSystem.Globalization.Native.so
-	libSystem.IO.Compression.Native.so
-	libSystem.Native.so
-	libSystem.Net.Security.Native.so
-	libSystem.Security.Cryptography.Native.OpenSsl.so
-	libclrgc.so
-	libclrjit.so
-	libcoreclr.so
-	libcoreclrtraceptprovider.so
-	libdbgshim.so
-	libhostfxr.so
-	libhostpolicy.so
-	libmscordaccore.so
-	libmscordbi.so
-	libnethost.so
-	singlefilehost
-)
-MUSL_BAD_SONAMES=(
-	libc.musl-aarch64.so.1
-	libc.musl-armv7.so.1
-	libc.musl-x86_64.so.1
-)
-
-src_prepare() {
-	default
-
-	# Fix musl libc SONAME links, bug https://bugs.gentoo.org/894760
-	if use elibc_musl ; then
-		local musl_bad_link
-		local musl_bad_link_path
-		local musl_bad_soname
-
-		for musl_bad_link in "${MUSL_BAD_LINKS[@]}" ; do
-			while read -r musl_bad_link_path ; do
-				# Skip if file either does not end with ".so" or is not executable.
-				# Using "case" here for easier matching in case we have to add
-				# a special exception.
-				case "${musl_bad_link_path}" in
-					*.so )
-						:
-						;;
-					* )
-						if [[ ! -x "${musl_bad_link_path}" ]] ; then
-							continue
-						fi
-						;;
-				esac
-
-				einfo "Fixing musl libc link for ${musl_bad_link_path}"
-
-				for musl_bad_soname in "${MUSL_BAD_SONAMES[@]}" ; do
-					patchelf --remove-needed "${musl_bad_soname}" "${musl_bad_link_path}" || die
-				done
-
-				patchelf --add-needed libc.so "${musl_bad_link_path}" || die
-			done < <(find . -type f -name "${musl_bad_link}")
-		done
-	fi
-
-	# Remove static libraries, bug https://bugs.gentoo.org/825774
-	find ./packs -type f -name "libnethost.a" -delete || die
-}
-
-src_install() {
-	local dest="opt/${PN}-${SDK_SLOT}"
-	dodir "${dest%/*}"
-
-	# Create a magic workloads file, bug #841896
-	local featureband="$(( $(ver_cut 3) / 100 * 100 ))"       # e.g. 404 -> 400
-	local workloads="metadata/workloads/${SDK_SLOT}.${featureband}"
-
-	mkdir -p "${S}/${workloads}" || die
-	touch "${S}/${workloads}/userlocal" || die
-
-	mv "${S}" "${ED}/${dest}" || die
-	mkdir "${S}" || die
-
-	fperms 0755 "/${dest}"
-	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SDK_SLOT}"
-}
-
-pkg_postinst() {
-	eselect dotnet update ifunset
-}
-
-pkg_postrm() {
-	eselect dotnet update ifunset
-}
diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.401.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.401.ebuild
new file mode 100644
index 000000000000..af517c5a943e
--- /dev/null
+++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-8.0.401.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SDK_SLOT="$(ver_cut 1-2)"
+RUNTIME_SLOT="${SDK_SLOT}.8"
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/
+	https://github.com/dotnet/dotnet/"
+SRC_URI="
+amd64? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-x64.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-x64.tar.gz )
+)
+arm? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm.tar.gz )
+)
+arm64? (
+	elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm64.tar.gz )
+	elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-musl-arm64.tar.gz )
+)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
+# See bug https://bugs.gentoo.org/932377
+# KEYWORDS=""
+
+# STRIP="llvm-strip" corrupts some executables when using the patchelf hack,
+# bug https://bugs.gentoo.org/923430
+RESTRICT="splitdebug strip"
+
+CURRENT_NUGETS_DEPEND="
+	~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT}
+"
+EXTRA_NUGETS_DEPEND="
+	~dev-dotnet/dotnet-runtime-nugets-6.0.33
+	~dev-dotnet/dotnet-runtime-nugets-7.0.20
+"
+NUGETS_DEPEND="
+	${CURRENT_NUGETS_DEPEND}
+	${EXTRA_NUGETS_DEPEND}
+"
+
+RDEPEND="
+	app-crypt/mit-krb5:0/0
+	dev-libs/icu
+	dev-util/lttng-ust:0/2.12
+	sys-libs/zlib:0/1
+"
+BDEPEND="
+	dev-util/patchelf
+"
+IDEPEND="
+	app-eselect/eselect-dotnet
+"
+PDEPEND="
+	${NUGETS_DEPEND}
+"
+
+QA_PREBUILT="*"
+
+MUSL_BAD_LINKS=(
+	apphost
+	createdump
+	dotnet
+	libSystem.Globalization.Native.so
+	libSystem.IO.Compression.Native.so
+	libSystem.Native.so
+	libSystem.Net.Security.Native.so
+	libSystem.Security.Cryptography.Native.OpenSsl.so
+	libclrgc.so
+	libclrjit.so
+	libcoreclr.so
+	libcoreclrtraceptprovider.so
+	libdbgshim.so
+	libhostfxr.so
+	libhostpolicy.so
+	libmscordaccore.so
+	libmscordbi.so
+	libnethost.so
+	singlefilehost
+)
+MUSL_BAD_SONAMES=(
+	libc.musl-aarch64.so.1
+	libc.musl-armv7.so.1
+	libc.musl-x86_64.so.1
+)
+
+src_prepare() {
+	default
+
+	# Fix musl libc SONAME links, bug https://bugs.gentoo.org/894760
+	if use elibc_musl ; then
+		local musl_bad_link
+		local musl_bad_link_path
+		local musl_bad_soname
+
+		for musl_bad_link in "${MUSL_BAD_LINKS[@]}" ; do
+			while read -r musl_bad_link_path ; do
+				# Skip if file either does not end with ".so" or is not executable.
+				# Using "case" here for easier matching in case we have to add
+				# a special exception.
+				case "${musl_bad_link_path}" in
+					*.so )
+						:
+						;;
+					* )
+						if [[ ! -x "${musl_bad_link_path}" ]] ; then
+							continue
+						fi
+						;;
+				esac
+
+				einfo "Fixing musl libc link for ${musl_bad_link_path}"
+
+				for musl_bad_soname in "${MUSL_BAD_SONAMES[@]}" ; do
+					patchelf --remove-needed "${musl_bad_soname}" "${musl_bad_link_path}" || die
+				done
+
+				patchelf --add-needed libc.so "${musl_bad_link_path}" || die
+			done < <(find . -type f -name "${musl_bad_link}")
+		done
+	fi
+
+	# Remove static libraries, bug https://bugs.gentoo.org/825774
+	find ./packs -type f -name "libnethost.a" -delete || die
+}
+
+src_install() {
+	local dest="opt/${PN}-${SDK_SLOT}"
+	dodir "${dest%/*}"
+
+	# Create a magic workloads file, bug #841896
+	local featureband="$(( $(ver_cut 3) / 100 * 100 ))"       # e.g. 404 -> 400
+	local workloads="metadata/workloads/${SDK_SLOT}.${featureband}"
+
+	mkdir -p "${S}/${workloads}" || die
+	touch "${S}/${workloads}/userlocal" || die
+
+	mv "${S}" "${ED}/${dest}" || die
+	mkdir "${S}" || die
+
+	fperms 0755 "/${dest}"
+	dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SDK_SLOT}"
+}
+
+pkg_postinst() {
+	eselect dotnet update ifunset
+}
+
+pkg_postrm() {
+	eselect dotnet update ifunset
+}
diff --git a/dev-dotnet/dotnet-sdk/Manifest b/dev-dotnet/dotnet-sdk/Manifest
index 30f0ba089773..7b3c51f30a41 100644
--- a/dev-dotnet/dotnet-sdk/Manifest
+++ b/dev-dotnet/dotnet-sdk/Manifest
@@ -1,4 +1,2 @@
-DIST dotnet-sdk-8.0.105-prepared-gentoo-amd64.tar.xz 1774585908 BLAKE2B c8c14bb513e9421ed04df81bf4388a7b84333ff76cf678f5adfb658d4c32d4e3c90ad8f78676261cb0148d1f1a3f4763e4a4aad9e7d822f94c943ec6ca81f872 SHA512 6032f34c92c046fade8edf1e4c86b315e6f51ae38b7d505084b2903f6a883dcb9c3b17a67d2da28daffcf6f3bc4e2ebd19b481f2842716fad910fbc663980c8a
-DIST dotnet-sdk-8.0.105-prepared-gentoo-musl-amd64.tar.xz 1788053336 BLAKE2B 5cf9328ec19413ed6c82adb48f70346197e2d76926ab752c81c77fde94782c19a30f52aab07e2ddc7545280821bf64251de42afece08b5bcd0d52eceefca3064 SHA512 73b906a282d059e3829841f78e45b58beab980eb8a1c23857746af20630b1070ce9fca1e38d837d78ab039dc40273dc732be4b3ba10978df00dfdaa320dfd77e
 DIST dotnet-sdk-8.0.107-prepared-gentoo-amd64.tar.xz 1792165680 BLAKE2B 08d380090ef6475cae9a102383d0d925089733cb69f0cc97fa8fedb39ed17fcd50d5e17e5a10009640b30476220588bfd254de0c49362bfca8c015d677d58d87 SHA512 2362487033b6401e578918feabecb7d981fd87b4ab6bf09d61e5d62482c44ea6d6dd9f7fa5957abba7c537a8931d4487dd8c01ad86122af9b716bc817bed1564
 DIST dotnet-sdk-8.0.107-prepared-gentoo-musl-amd64.tar.xz 1785364676 BLAKE2B 50782e24f48484e0e4bfb03f08e3a67060eb5eb15e03f09036147b041828c1ddd039cf1eae03e9c48e0197c78f68532ff4e74b7cbfbbeaf59e70262190868aa5 SHA512 b196c7fea4f75bd39093148cf4d5034773fd1aa03024ca0fddc6a117c009555b8b125d7452df071181947957ba042f964e63e8ec6d18cebb62a766add7de50db
diff --git a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.105.ebuild b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.105.ebuild
deleted file mode 100644
index 4b6ea2c7bab1..000000000000
--- a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.105.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Pre-build (and distribution preparation)
-# Build the tarball:
-#  git clone --depth 1 -b v8.0.2 https://github.com/dotnet/dotnet dotnet-sdk-8.0.2
-#  cd dotnet-sdk-8.0.2
-#  git rev-parse HEAD
-#  ./prep.sh
-#  rm -fr .git
-#  cd ..
-#  tar -acf dotnet-sdk-8.0.201-prepared-gentoo-amd64.tar.xz dotnet-sdk-8.0.2
-# Upload dotnet-sdk-8.0.201-prepared-gentoo-amd64.tar.xz
-
-# 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.
-
-EAPI=8
-
-COMMIT=d396b0c4d3e51c2d8d679b2f7233912bc5bfc2fa
-SDK_SLOT="$(ver_cut 1-2)"
-RUNTIME_SLOT="${SDK_SLOT}.5"
-
-LLVM_MAX_SLOT=17
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit check-reqs flag-o-matic llvm multiprocessing python-any-r1
-
-DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
-HOMEPAGE="https://dotnet.microsoft.com/
-	https://github.com/dotnet/dotnet/"
-SRC_URI="
-amd64? (
-	elibc_glibc? ( https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}-prepared-gentoo-amd64.tar.xz )
-	elibc_musl? ( https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}-prepared-gentoo-musl-amd64.tar.xz )
-)
-"
-S="${WORKDIR}/${PN}-${RUNTIME_SLOT}"
-
-LICENSE="MIT"
-SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
-KEYWORDS="amd64"
-
-# STRIP="llvm-strip" corrupts some executables when using the patchelf hack.
-# Be safe and restrict it for source-built too, bug https://bugs.gentoo.org/923430
-RESTRICT="splitdebug strip"
-
-CURRENT_NUGETS_DEPEND="
-	~dev-dotnet/dotnet-runtime-nugets-${RUNTIME_SLOT}
-"
-EXTRA_NUGETS_DEPEND="
-	~dev-dotnet/dotnet-runtime-nugets-6.0.30
-	~dev-dotnet/dotnet-runtime-nugets-7.0.19
-"
-NUGETS_DEPEND="
-	${CURRENT_NUGETS_DEPEND}
-	${EXTRA_NUGETS_DEPEND}
-"
-RDEPEND="
-	app-crypt/mit-krb5:0/0
-	dev-libs/icu
-	dev-libs/openssl:=
-	dev-util/lttng-ust:=
-	sys-libs/zlib:0/1
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 ))
-	dev-build/cmake
-	dev-vcs/git
-"
-IDEPEND="
-	app-eselect/eselect-dotnet
-"
-PDEPEND="
-	${NUGETS_DEPEND}
-"
-
-CHECKREQS_DISK_BUILD="20G"
-
-# Created by dotnet itself:
-QA_PREBUILT="
-usr/lib.*/dotnet-sdk-.*/dotnet
-"
-# .NET runtime, better to not touch it if they want some specific flags.
-QA_FLAGS_IGNORED="
-.*/apphost
-.*/createdump
-.*/libSystem.Globalization.Native.so
-.*/libSystem.IO.Compression.Native.so
-.*/libSystem.Native.so
-.*/libSystem.Net.Security.Native.so
-.*/libSystem.Security.Cryptography.Native.OpenSsl.so
-.*/libclrgc.so
-.*/libclrjit.so
-.*/libcoreclr.so
-.*/libcoreclrtraceptprovider.so
-.*/libhostfxr.so
-.*/libhostpolicy.so
-.*/libmscordaccore.so
-.*/libmscordbi.so
-.*/libnethost.so
-.*/singlefilehost
-"
-
-check_requirements_locale() {
-	if [[ "${MERGE_TYPE}" != binary ]] ; then
-		if use elibc_glibc ; then
-			local locales
-			locales="$(locale -a)"
-
-			if has en_US.utf8 ${locales} ; then
-				LC_ALL=en_US.utf8
-			elif has en_US.UTF-8 ${locales} ; then
-				LC_ALL=en_US.UTF-8
-			else
-				eerror "The locale en_US.utf8 or en_US.UTF-8 is not available."
-				eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}."
-
-				die "Could not switch to the en_US.UTF-8 locale."
-			fi
-		else
-			LC_ALL=en_US.UTF-8
-		fi
-
-		export LC_ALL
-		einfo "Successfully switched to the ${LC_ALL} locale."
-	fi
-}
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-
-	check_requirements_locale
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-
-	check_requirements_locale
-}
-
-src_prepare() {
-	default
-
-	filter-lto
-
-	unset DOTNET_ROOT
-	unset NUGET_PACKAGES
-
-	export DOTNET_CLI_TELEMETRY_OPTOUT=1
-	export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-	export MSBUILDDISABLENODEREUSE=1
-	export UseSharedCompilation=false
-
-	local dotnet_sdk_tmp_directory="${WORKDIR}/dotnet-sdk-tmp"
-	mkdir -p "${dotnet_sdk_tmp_directory}" || die
-
-	# This should fix the "PackageVersions.props" problem,
-	# see below, in src_compile.
-	sed -e "s|/tmp|${dotnet_sdk_tmp_directory}|g" -i build.sh || die
-}
-
-src_compile() {
-	# Remove .NET leftover files that can be blocking the build.
-	# Keep this nonfatal!
-	local package_versions_path="/tmp/PackageVersions.props"
-	if [[ -f "${package_versions_path}" ]] ; then
-		rm "${package_versions_path}" ||
-			ewarn "Failed to remove ${package_versions_path}, build may fail!"
-	fi
-
-	# The "source_repository" should always be the same.
-	local source_repository="https://github.com/dotnet/dotnet"
-	local verbosity="${GENTOO_DOTNET_BUILD_VERBOSITY:-minimal}"
-
-	ebegin "Building the .NET SDK ${SDK_SLOT}"
-	local -a buildopts=(
-		--clean-while-building
-		--source-repository "${source_repository}"
-		--source-version "${COMMIT}"
-
-		--
-		-maxCpuCount:"$(makeopts_jobs)"
-		-verbosity:"${verbosity}"
-		-p:ContinueOnPrebuiltBaselineError=true
-		-p:LogVerbosity="${verbosity}"
-		-p:MinimalConsoleLogOutput=false
-		-p:verbosity="${verbosity}"
-	)
-	bash ./build.sh	"${buildopts[@]}"
-	eend ${?} || die "build failed"
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SDK_SLOT}"
-	dodir "${dest}"
-
-	ebegin "Extracting the .NET SDK archive"
-	tar xzf artifacts/*/Release/${PN}-${SDK_SLOT}.*.tar.gz -C "${ED}/${dest}"
-	eend ${?} || die "extraction failed"
-
-	fperms 0755 "${dest}"
-	dosym -r "${dest}/dotnet" "/usr/bin/dotnet-${SDK_SLOT}"
-}
-
-pkg_postinst() {
-	eselect dotnet update ifunset
-}
-
-pkg_postrm() {
-	eselect dotnet update ifunset
-}
diff --git a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107.ebuild b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107.ebuild
index 0009a1c7aedc..4a7ebe2b4a70 100644
--- a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107.ebuild
+++ b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.107.ebuild
@@ -45,7 +45,7 @@ S="${WORKDIR}/${PN}-${RUNTIME_SLOT}"
 
 LICENSE="MIT"
 SLOT="${SDK_SLOT}/${RUNTIME_SLOT}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # STRIP="llvm-strip" corrupts some executables when using the patchelf hack.
 # Be safe and restrict it for source-built too, bug https://bugs.gentoo.org/923430
diff --git a/dev-dotnet/fantomas/Manifest b/dev-dotnet/fantomas/Manifest
index e4d8b4a3a3cb..0cfe4f243859 100644
--- a/dev-dotnet/fantomas/Manifest
+++ b/dev-dotnet/fantomas/Manifest
@@ -7,14 +7,12 @@ DIST editorconfig.0.15.0.nupkg 110720 BLAKE2B 68a997f808b18a05aece36cf3f6f37c817
 DIST fable.core.3.0.0.nupkg 88115 BLAKE2B 5c5a18b6aa818db35b9ee8502f109477a7c86a12efcae9359f1d70aaa7e33ddcef32daf6c33d7b1c71aa83984bc3c110dbae0bad11edf3049503ee602b405175 SHA512 705f01b68ac1c03d71d03e3a7183e032ba45033da49942a98614d515d6ab7d4d308dff84eaf941625bbf44fbac496e1a28510d81a3e802713c3e92079aed2023
 DIST fantomas-6.3.10.tar.gz 50376693 BLAKE2B 88797d62f99e3ada271a267f0c9f34f0f944f66907e9ecf6ed3622894803aa700e80bfed90d4ca8e988f5e212e2f944a951ef1846e2e963d9c51d89b4e688a9e SHA512 29286aa34a0d230c4336b2156a2338d5651c2de2fe6efb5a2e38b260045f3d4edc0ed8e9640e57c05e3c4c8092698d0527402a87056d09d1c8c4e82346861ac7
 DIST fantomas-6.3.11.tar.gz 50376857 BLAKE2B bf8586c519da6d8c71db6a58bedf93b63a27c4f8a479b272409e37ca5d84acc453e0e22acc10c0ab1df8b519a812f676c796e93f8110105797a052f105385adf SHA512 d77fab3a4fac5c9dfe76e1a02dae939f411d02e91694384da3e374d54112301ea76536f8159dffcf832a87bebcd13a77d0623ae347b0740ece16e5a76dd0711a
-DIST fantomas-6.3.9.tar.gz 50375336 BLAKE2B 493cbed4e73b0151887994552ffc7a46ddfdcee61a7c522187b1c1bfbffb0f168f7231679c90560c45f797924d5258db09e7d90db472f2dea4ad7d7e6a20f6fa SHA512 8111d7df7280f5a7b61cfca7d30a5bd442eda529248f59d8545799ad93948401e488673bd470d3482c7e0c6bb34ddac2aef389edb78ad0a19f47a419f1179001
-DIST fantomas.6.3.0.nupkg 5811389 BLAKE2B 57a12579087cb6cbe0cfec9885d0bd5768ba79245a197d825a9b8e8fd15d03cf9a23b3661d91492e4621e5aebe468e846bbfeb44339a7754a3d61a8826a5c62a SHA512 a708356ee3c135c88d759f92aac75d272f9e706f1fd151dd4dadb0d6b808b169636adc40875a0e858a8fbab9e5006a475b3bacd6712e7d200deda17f6452d0c6
+DIST fantomas-6.3.12.tar.gz 50377421 BLAKE2B 7192b0220bd177f67988622dca82618ba2590976cfc0402e87ea6be0643661a50551db30b31d46d677119531682a559755eb79cb81384daccb0c119bbda0d91f SHA512 ef74d4b97404f2f21c7e2742ebc8fe351c252b9ae334a0acb13f004b08b3b4bcc9e3d3b90ba8519750a6f076d8cc2e941a271cb237d6559f14a50ecb731615ba
+DIST fantomas-6.3.13.tar.gz 50377869 BLAKE2B d27128083c6a470f918eb79a16689072799e7c815fa94308bb3875aa31696f0a02a8d64aae49d6aabb412ab30a7417a1975b14788670bddc310f11969cce1176 SHA512 9df96649a555d8d51c4f859fbfb2f83d07eb0bf05ebbc01ca3bacf5f5c231e4a1e9dd8bdd5a9618db70123ca8c0c1b9156a897de0efe3288fc4577777aeafde3
 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.20.0.0.nupkg 11763184 BLAKE2B a0e21f83fcf14ad10ee67aed7539c5d8a9cab0a2090b92dcb87cce399460215ef4841228ba944ff8a91a5d0645a1488055ec270857d8b1e72dde0023fb5d7bec SHA512 4f37253bf7006182135d78d38988e71fd50403d5f5379e138c430d048f1a4ef982b24cc81469bbf40b399128365b77e7201de9fc7adc2354a316ebbe4d0658a0
 DIST fsdocs-tool.21.0.0-beta-002.nupkg 11766459 BLAKE2B 6f4d9bb96004f0b6426066b320d14ae4fa2bb9f7cc7863ab90b77875d7f598ed0c2a063ae625d808de1733a5b50fe1478f505c5ad50c8eb26d4a63e7cab6c4d7 SHA512 7d875cb19fa5dd291024f3b2f723ef9a7199c7f819fa0b3d095c892f1f576179b34856be7b9a0d2865b2fefc067c991cf7c6a6ca3c5d4c06da025ebb6232fd60
-DIST fsharp-050271d631956a4e0d0484a583d38236b727a46d.tar.gz 17653435 BLAKE2B a97cc9caf04512cd8cda0a11870f9070f344e5efdfa1d7e9e0a5750ac8e608a8f9b7fb2daa46cd5c3d8ad1f9e335b75da77b9ea9750692f46e0aef20b81d6716 SHA512 9b677f4c5dc94904ecc064bd8e23b1f6d1bb3eb0f7956d182ca3858a435e5c5a1503bc5ef0c8ffdda87554f3db3906f5789fa48db05b011ddcf714cc296926e8
 DIST fsharp-836d4e0603442d6053c8d439993a022501cae494.tar.gz 17221818 BLAKE2B 972c42f0d095a65c953cca77aaf92ae6a25967d73597715668c8d6da58dc4b25cf450ec8e5569a02567e568fc176ff732c14d9d24df3b10c752956b96cd56c01 SHA512 ed0cfd605911e5d9ddbaff19c3604811bac155c727e2c2d1bceab21fe9ceec5b9e8b746e9394171bfa6d0fba539fd4acf60a867130b3cf9572d478f1887d0d9c
 DIST fsharp-analyzers.0.25.0.nupkg 17775447 BLAKE2B 71c843ccc197310dcf847527acca3b7fa9ef5af1912bcafa31c0f76f8f2af91728547fbf8e5ab870f9bb2881e4e34bd35356183804f7cd7e0ea70a3c261425dd SHA512 2aa601f7d02aa1943751ed89477f9a52fe267f1a8f53002b976dce434b55fbc0e2228283b51640c767522d9b6dd7f89554d5addee4c3696add0c845a8b95f138
 DIST fsharp.analyzers.build.0.3.0.nupkg 15911 BLAKE2B 64d63679503b16b541537fd4482c47cd384628bd7ca70f6ad771b93bb11554b82605c2827a0facc8dc5917b196548bc739f989d5ae7899e3b0673df5da50620f SHA512 f07cbbcfaca9ae92285d143ae303adbb95fedd15cca256f278fe4adefb7c8c7e810f74d7ff53bb50dcffbd3408f9350baddb925c6b39ff1a10814eddda7045fd
diff --git a/dev-dotnet/fantomas/fantomas-6.3.12.ebuild b/dev-dotnet/fantomas/fantomas-6.3.12.ebuild
new file mode 100644
index 000000000000..21dfb03e2b5c
--- /dev/null
+++ b/dev-dotnet/fantomas/fantomas-6.3.12.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT=8.0
+NUGETS="
+dotnet-fsharplint@0.19.2
+fantomas@6.3.9
+fsdocs-tool@21.0.0-beta-002
+fsharp-analyzers@0.25.0
+
+argu@6.2.4
+cliwrap@3.6.4
+commandlineparser@2.9.1
+dotnet.reproduciblebuilds@1.1.1
+editorconfig@0.15.0
+fable.core@3.0.0
+fparsec@1.1.1
+fscheck@2.16.5
+fsharp.analyzers.build@0.3.0
+fsharp.core@5.0.1
+fsharp.core@6.0.7
+fsharp.core@8.0.101
+fsharp.data.csv.core@6.3.0
+fsharp.data.html.core@6.3.0
+fsharp.data.http@6.3.0
+fsharp.data.json.core@6.3.0
+fsharp.data.runtime.utilities@6.3.0
+fsharp.data.worldbank.core@6.3.0
+fsharp.data.xml.core@6.3.0
+fsharp.data@6.3.0
+fslexyacc.runtime@11.2.0
+fslexyacc@11.2.0
+fsunit@6.0.0
+fun.build@1.0.3
+fun.result@2.0.9
+g-research.fsharp.analyzers@0.9.3
+gee.external.capstone@2.3.0
+humanizer.core@2.14.1
+iced@1.17.0
+ignore@0.1.50
+ionide.analyzers@0.9.0
+ionide.keepachangelog.tasks@0.1.8
+ionide.keepachangelog@0.1.8
+messagepack.annotations@2.2.85
+messagepack@2.2.85
+microsoft.bcl.asyncinterfaces@1.1.0
+microsoft.bcl.asyncinterfaces@5.0.0
+microsoft.build.tasks.git@1.1.1
+microsoft.codeanalysis.analyzers@3.3.3
+microsoft.codeanalysis.common@4.1.0
+microsoft.codeanalysis.csharp@4.1.0
+microsoft.codecoverage@17.8.0
+microsoft.diagnostics.netcore.client@0.2.251802
+microsoft.diagnostics.runtime@2.2.332302
+microsoft.diagnostics.tracing.traceevent@3.0.2
+microsoft.dotnet.platformabstractions@3.1.6
+microsoft.extensions.configuration.abstractions@2.1.1
+microsoft.extensions.configuration.binder@2.1.1
+microsoft.extensions.configuration@2.1.1
+microsoft.extensions.dependencyinjection.abstractions@2.1.1
+microsoft.extensions.logging.abstractions@2.1.1
+microsoft.extensions.logging@2.1.1
+microsoft.extensions.options@2.1.1
+microsoft.extensions.primitives@2.1.1
+microsoft.net.test.sdk@17.8.0
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@1.1.1
+microsoft.netcore.platforms@2.1.2
+microsoft.netcore.platforms@5.0.0
+microsoft.netcore.targets@1.1.0
+microsoft.netcore.targets@1.1.3
+microsoft.sourcelink.azurerepos.git@1.1.1
+microsoft.sourcelink.bitbucket.git@1.1.1
+microsoft.sourcelink.common@1.1.1
+microsoft.sourcelink.github@1.1.1
+microsoft.sourcelink.gitlab@1.1.1
+microsoft.testplatform.objectmodel@17.8.0
+microsoft.testplatform.testhost@17.8.0
+microsoft.visualstudio.threading.analyzers@16.9.60
+microsoft.visualstudio.threading@16.9.60
+microsoft.visualstudio.validation@15.5.31
+microsoft.visualstudio.validation@16.8.33
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@5.0.0
+nerdbank.streams@2.6.81
+netstandard.library@2.0.3
+newtonsoft.json@11.0.2
+newtonsoft.json@12.0.2
+newtonsoft.json@13.0.1
+nuget.frameworks@6.5.0
+nunit3testadapter@4.5.0
+nunit@4.0.1
+perfolizer@0.2.1
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system.net.http@4.3.0
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+semanticversion@2.1.0
+semanticversioning@2.0.2
+serilog.sinks.console@5.0.1
+serilog@3.1.1
+serilogtracelistener@3.2.1-dev-00011
+spectre.console@0.46.0
+spectre.console@0.48.0
+streamjsonrpc@2.8.28
+system.buffers@4.3.0
+system.buffers@4.5.1
+system.codedom@5.0.0
+system.collections.concurrent@4.3.0
+system.collections.immutable@5.0.0
+system.collections.immutable@7.0.0
+system.collections@4.3.0
+system.configuration.configurationmanager@4.4.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@5.0.1
+system.diagnostics.diagnosticsource@7.0.0
+system.diagnostics.tracing@4.3.0
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.3.0
+system.globalization@4.3.0
+system.io.abstractions.testinghelpers@20.0.4
+system.io.abstractions@20.0.4
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.3.0
+system.io.pipelines@5.0.1
+system.io@4.3.0
+system.linq@4.3.0
+system.management@5.0.0
+system.memory@4.5.1
+system.memory@4.5.3
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.http@4.3.4
+system.net.primitives@4.3.0
+system.net.websockets@4.3.0
+system.numerics.vectors@4.4.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.6.0
+system.reflection.emit.ilgeneration@4.7.0
+system.reflection.emit.lightweight@4.6.0
+system.reflection.emit@4.7.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@5.0.0
+system.reflection.primitives@4.3.0
+system.reflection@4.3.0
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.2
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@4.7.1
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.3.0
+system.runtime@4.3.1
+system.security.accesscontrol@5.0.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@4.4.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@5.0.0
+system.text.encoding.codepages@4.5.1
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.threading.tasks.dataflow@5.0.0
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks@4.3.0
+system.threading@4.3.0
+testableio.system.io.abstractions.testinghelpers@20.0.4
+testableio.system.io.abstractions.wrappers@20.0.4
+testableio.system.io.abstractions@20.0.4
+thoth.json.net@8.0.0
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="FSharp source code formatter"
+HOMEPAGE="https://fsprojects.github.io/fantomas/
+	https://github.com/fsprojects/fantomas/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fsprojects/${PN}.git"
+else
+	SRC_URI="https://github.com/fsprojects/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+FCS_COMMIT="836d4e0603442d6053c8d439993a022501cae494"
+SRC_URI+="
+	https://github.com/dotnet/fsharp/archive/${FCS_COMMIT}.tar.gz
+		-> fsharp-${FCS_COMMIT}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=(
+	src/Fantomas/Fantomas.fsproj
+)
+DOTNET_PKG_BAD_PROJECTS=(
+	src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
+)
+DOTNET_PKG_RESTORE_EXTRA_ARGS=(
+	--force-evaluate
+)
+
+DOCS=( CHANGELOG.md README.md docs/docs/{contributors,end-users} )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	dotnet-pkg_src_prepare
+
+	# Reimplementing "dotnet build.fsx -p Init" in shell.
+	mkdir -p "${S}/.deps" || die
+	ln -s "${WORKDIR}/fsharp-${FCS_COMMIT}" "${S}/.deps/${FCS_COMMIT}" || die
+	find "${S}/.deps/${FCS_COMMIT}/src" -type f \
+		 -exec sed -e "s|FSharp.Compiler|Fantomas.FCS|g" -i {} + || die
+}
+
+src_configure() {
+	dotnet-pkg-base_restore_tools
+	dotnet-pkg_src_configure
+}
+
+src_test() {
+	local -a test_projects=(
+		Fantomas.Core.Tests
+		Fantomas.Tests
+	)
+	local test_project
+	for test_project in "${test_projects[@]}" ; do
+		dotnet-pkg-base_test "src/${test_project}/${test_project}.fsproj" \
+			-p:RollForward=Major
+	done
+}
diff --git a/dev-dotnet/fantomas/fantomas-6.3.13.ebuild b/dev-dotnet/fantomas/fantomas-6.3.13.ebuild
new file mode 100644
index 000000000000..21dfb03e2b5c
--- /dev/null
+++ b/dev-dotnet/fantomas/fantomas-6.3.13.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT=8.0
+NUGETS="
+dotnet-fsharplint@0.19.2
+fantomas@6.3.9
+fsdocs-tool@21.0.0-beta-002
+fsharp-analyzers@0.25.0
+
+argu@6.2.4
+cliwrap@3.6.4
+commandlineparser@2.9.1
+dotnet.reproduciblebuilds@1.1.1
+editorconfig@0.15.0
+fable.core@3.0.0
+fparsec@1.1.1
+fscheck@2.16.5
+fsharp.analyzers.build@0.3.0
+fsharp.core@5.0.1
+fsharp.core@6.0.7
+fsharp.core@8.0.101
+fsharp.data.csv.core@6.3.0
+fsharp.data.html.core@6.3.0
+fsharp.data.http@6.3.0
+fsharp.data.json.core@6.3.0
+fsharp.data.runtime.utilities@6.3.0
+fsharp.data.worldbank.core@6.3.0
+fsharp.data.xml.core@6.3.0
+fsharp.data@6.3.0
+fslexyacc.runtime@11.2.0
+fslexyacc@11.2.0
+fsunit@6.0.0
+fun.build@1.0.3
+fun.result@2.0.9
+g-research.fsharp.analyzers@0.9.3
+gee.external.capstone@2.3.0
+humanizer.core@2.14.1
+iced@1.17.0
+ignore@0.1.50
+ionide.analyzers@0.9.0
+ionide.keepachangelog.tasks@0.1.8
+ionide.keepachangelog@0.1.8
+messagepack.annotations@2.2.85
+messagepack@2.2.85
+microsoft.bcl.asyncinterfaces@1.1.0
+microsoft.bcl.asyncinterfaces@5.0.0
+microsoft.build.tasks.git@1.1.1
+microsoft.codeanalysis.analyzers@3.3.3
+microsoft.codeanalysis.common@4.1.0
+microsoft.codeanalysis.csharp@4.1.0
+microsoft.codecoverage@17.8.0
+microsoft.diagnostics.netcore.client@0.2.251802
+microsoft.diagnostics.runtime@2.2.332302
+microsoft.diagnostics.tracing.traceevent@3.0.2
+microsoft.dotnet.platformabstractions@3.1.6
+microsoft.extensions.configuration.abstractions@2.1.1
+microsoft.extensions.configuration.binder@2.1.1
+microsoft.extensions.configuration@2.1.1
+microsoft.extensions.dependencyinjection.abstractions@2.1.1
+microsoft.extensions.logging.abstractions@2.1.1
+microsoft.extensions.logging@2.1.1
+microsoft.extensions.options@2.1.1
+microsoft.extensions.primitives@2.1.1
+microsoft.net.test.sdk@17.8.0
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@1.1.1
+microsoft.netcore.platforms@2.1.2
+microsoft.netcore.platforms@5.0.0
+microsoft.netcore.targets@1.1.0
+microsoft.netcore.targets@1.1.3
+microsoft.sourcelink.azurerepos.git@1.1.1
+microsoft.sourcelink.bitbucket.git@1.1.1
+microsoft.sourcelink.common@1.1.1
+microsoft.sourcelink.github@1.1.1
+microsoft.sourcelink.gitlab@1.1.1
+microsoft.testplatform.objectmodel@17.8.0
+microsoft.testplatform.testhost@17.8.0
+microsoft.visualstudio.threading.analyzers@16.9.60
+microsoft.visualstudio.threading@16.9.60
+microsoft.visualstudio.validation@15.5.31
+microsoft.visualstudio.validation@16.8.33
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@5.0.0
+nerdbank.streams@2.6.81
+netstandard.library@2.0.3
+newtonsoft.json@11.0.2
+newtonsoft.json@12.0.2
+newtonsoft.json@13.0.1
+nuget.frameworks@6.5.0
+nunit3testadapter@4.5.0
+nunit@4.0.1
+perfolizer@0.2.1
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system.net.http@4.3.0
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+semanticversion@2.1.0
+semanticversioning@2.0.2
+serilog.sinks.console@5.0.1
+serilog@3.1.1
+serilogtracelistener@3.2.1-dev-00011
+spectre.console@0.46.0
+spectre.console@0.48.0
+streamjsonrpc@2.8.28
+system.buffers@4.3.0
+system.buffers@4.5.1
+system.codedom@5.0.0
+system.collections.concurrent@4.3.0
+system.collections.immutable@5.0.0
+system.collections.immutable@7.0.0
+system.collections@4.3.0
+system.configuration.configurationmanager@4.4.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@5.0.1
+system.diagnostics.diagnosticsource@7.0.0
+system.diagnostics.tracing@4.3.0
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.3.0
+system.globalization@4.3.0
+system.io.abstractions.testinghelpers@20.0.4
+system.io.abstractions@20.0.4
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.3.0
+system.io.pipelines@5.0.1
+system.io@4.3.0
+system.linq@4.3.0
+system.management@5.0.0
+system.memory@4.5.1
+system.memory@4.5.3
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.http@4.3.4
+system.net.primitives@4.3.0
+system.net.websockets@4.3.0
+system.numerics.vectors@4.4.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.6.0
+system.reflection.emit.ilgeneration@4.7.0
+system.reflection.emit.lightweight@4.6.0
+system.reflection.emit@4.7.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@5.0.0
+system.reflection.primitives@4.3.0
+system.reflection@4.3.0
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.2
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@4.7.1
+system.runtime.compilerservices.unsafe@5.0.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.3.0
+system.runtime@4.3.1
+system.security.accesscontrol@5.0.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@4.4.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@5.0.0
+system.text.encoding.codepages@4.5.1
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.threading.tasks.dataflow@5.0.0
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks@4.3.0
+system.threading@4.3.0
+testableio.system.io.abstractions.testinghelpers@20.0.4
+testableio.system.io.abstractions.wrappers@20.0.4
+testableio.system.io.abstractions@20.0.4
+thoth.json.net@8.0.0
+"
+
+inherit check-reqs dotnet-pkg
+
+DESCRIPTION="FSharp source code formatter"
+HOMEPAGE="https://fsprojects.github.io/fantomas/
+	https://github.com/fsprojects/fantomas/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fsprojects/${PN}.git"
+else
+	SRC_URI="https://github.com/fsprojects/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+FCS_COMMIT="836d4e0603442d6053c8d439993a022501cae494"
+SRC_URI+="
+	https://github.com/dotnet/fsharp/archive/${FCS_COMMIT}.tar.gz
+		-> fsharp-${FCS_COMMIT}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=(
+	src/Fantomas/Fantomas.fsproj
+)
+DOTNET_PKG_BAD_PROJECTS=(
+	src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
+)
+DOTNET_PKG_RESTORE_EXTRA_ARGS=(
+	--force-evaluate
+)
+
+DOCS=( CHANGELOG.md README.md docs/docs/{contributors,end-users} )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	dotnet-pkg_src_prepare
+
+	# Reimplementing "dotnet build.fsx -p Init" in shell.
+	mkdir -p "${S}/.deps" || die
+	ln -s "${WORKDIR}/fsharp-${FCS_COMMIT}" "${S}/.deps/${FCS_COMMIT}" || die
+	find "${S}/.deps/${FCS_COMMIT}/src" -type f \
+		 -exec sed -e "s|FSharp.Compiler|Fantomas.FCS|g" -i {} + || die
+}
+
+src_configure() {
+	dotnet-pkg-base_restore_tools
+	dotnet-pkg_src_configure
+}
+
+src_test() {
+	local -a test_projects=(
+		Fantomas.Core.Tests
+		Fantomas.Tests
+	)
+	local test_project
+	for test_project in "${test_projects[@]}" ; do
+		dotnet-pkg-base_test "src/${test_project}/${test_project}.fsproj" \
+			-p:RollForward=Major
+	done
+}
diff --git a/dev-dotnet/fantomas/fantomas-6.3.9.ebuild b/dev-dotnet/fantomas/fantomas-6.3.9.ebuild
deleted file mode 100644
index f898bf40e0ec..000000000000
--- a/dev-dotnet/fantomas/fantomas-6.3.9.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
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-dotnet-fsharplint@0.19.2
-fantomas@6.3.0
-fsdocs-tool@20.0.0
-fsharp-analyzers@0.25.0
-
-argu@6.2.4
-cliwrap@3.6.4
-commandlineparser@2.9.1
-dotnet.reproduciblebuilds@1.1.1
-editorconfig@0.15.0
-fable.core@3.0.0
-fparsec@1.1.1
-fscheck@2.16.5
-fsharp.analyzers.build@0.3.0
-fsharp.core@5.0.1
-fsharp.core@6.0.7
-fsharp.core@8.0.101
-fsharp.data.csv.core@6.3.0
-fsharp.data.html.core@6.3.0
-fsharp.data.http@6.3.0
-fsharp.data.json.core@6.3.0
-fsharp.data.runtime.utilities@6.3.0
-fsharp.data.worldbank.core@6.3.0
-fsharp.data.xml.core@6.3.0
-fsharp.data@6.3.0
-fslexyacc.runtime@11.2.0
-fslexyacc@11.2.0
-fsunit@6.0.0
-fun.build@1.0.3
-fun.result@2.0.9
-g-research.fsharp.analyzers@0.9.3
-gee.external.capstone@2.3.0
-humanizer.core@2.14.1
-iced@1.17.0
-ignore@0.1.50
-ionide.analyzers@0.9.0
-ionide.keepachangelog.tasks@0.1.8
-ionide.keepachangelog@0.1.8
-messagepack.annotations@2.2.85
-messagepack@2.2.85
-microsoft.bcl.asyncinterfaces@1.1.0
-microsoft.bcl.asyncinterfaces@5.0.0
-microsoft.build.tasks.git@1.1.1
-microsoft.codeanalysis.analyzers@3.3.3
-microsoft.codeanalysis.common@4.1.0
-microsoft.codeanalysis.csharp@4.1.0
-microsoft.codecoverage@17.8.0
-microsoft.diagnostics.netcore.client@0.2.251802
-microsoft.diagnostics.runtime@2.2.332302
-microsoft.diagnostics.tracing.traceevent@3.0.2
-microsoft.dotnet.platformabstractions@3.1.6
-microsoft.extensions.configuration.abstractions@2.1.1
-microsoft.extensions.configuration.binder@2.1.1
-microsoft.extensions.configuration@2.1.1
-microsoft.extensions.dependencyinjection.abstractions@2.1.1
-microsoft.extensions.logging.abstractions@2.1.1
-microsoft.extensions.logging@2.1.1
-microsoft.extensions.options@2.1.1
-microsoft.extensions.primitives@2.1.1
-microsoft.net.test.sdk@17.8.0
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.platforms@1.1.1
-microsoft.netcore.platforms@2.1.2
-microsoft.netcore.platforms@5.0.0
-microsoft.netcore.targets@1.1.0
-microsoft.netcore.targets@1.1.3
-microsoft.sourcelink.azurerepos.git@1.1.1
-microsoft.sourcelink.bitbucket.git@1.1.1
-microsoft.sourcelink.common@1.1.1
-microsoft.sourcelink.github@1.1.1
-microsoft.sourcelink.gitlab@1.1.1
-microsoft.testplatform.objectmodel@17.8.0
-microsoft.testplatform.testhost@17.8.0
-microsoft.visualstudio.threading.analyzers@16.9.60
-microsoft.visualstudio.threading@16.9.60
-microsoft.visualstudio.validation@15.5.31
-microsoft.visualstudio.validation@16.8.33
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@5.0.0
-nerdbank.streams@2.6.81
-netstandard.library@2.0.3
-newtonsoft.json@11.0.2
-newtonsoft.json@12.0.2
-newtonsoft.json@13.0.1
-nuget.frameworks@6.5.0
-nunit3testadapter@4.5.0
-nunit@4.0.1
-perfolizer@0.2.1
-runtime.any.system.collections@4.3.0
-runtime.any.system.diagnostics.tracing@4.3.0
-runtime.any.system.globalization.calendars@4.3.0
-runtime.any.system.globalization@4.3.0
-runtime.any.system.io@4.3.0
-runtime.any.system.reflection.primitives@4.3.0
-runtime.any.system.reflection@4.3.0
-runtime.any.system.resources.resourcemanager@4.3.0
-runtime.any.system.runtime.handles@4.3.0
-runtime.any.system.runtime.interopservices@4.3.0
-runtime.any.system.runtime@4.3.0
-runtime.any.system.text.encoding.extensions@4.3.0
-runtime.any.system.text.encoding@4.3.0
-runtime.any.system.threading.tasks@4.3.0
-runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.native.system.net.http@4.3.0
-runtime.native.system.security.cryptography.apple@4.3.0
-runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.native.system@4.3.0
-runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
-runtime.unix.microsoft.win32.primitives@4.3.0
-runtime.unix.system.diagnostics.debug@4.3.0
-runtime.unix.system.io.filesystem@4.3.0
-runtime.unix.system.net.primitives@4.3.0
-runtime.unix.system.private.uri@4.3.0
-runtime.unix.system.runtime.extensions@4.3.0
-semanticversion@2.1.0
-semanticversioning@2.0.2
-serilog.sinks.console@5.0.1
-serilog@3.1.1
-serilogtracelistener@3.2.1-dev-00011
-spectre.console@0.46.0
-spectre.console@0.48.0
-streamjsonrpc@2.8.28
-system.buffers@4.3.0
-system.buffers@4.5.1
-system.codedom@5.0.0
-system.collections.concurrent@4.3.0
-system.collections.immutable@5.0.0
-system.collections.immutable@7.0.0
-system.collections@4.3.0
-system.configuration.configurationmanager@4.4.0
-system.diagnostics.debug@4.3.0
-system.diagnostics.diagnosticsource@5.0.1
-system.diagnostics.diagnosticsource@7.0.0
-system.diagnostics.tracing@4.3.0
-system.globalization.calendars@4.3.0
-system.globalization.extensions@4.3.0
-system.globalization@4.3.0
-system.io.abstractions.testinghelpers@20.0.4
-system.io.abstractions@20.0.4
-system.io.filesystem.primitives@4.3.0
-system.io.filesystem@4.3.0
-system.io.pipelines@5.0.1
-system.io@4.3.0
-system.linq@4.3.0
-system.management@5.0.0
-system.memory@4.5.1
-system.memory@4.5.3
-system.memory@4.5.4
-system.memory@4.5.5
-system.net.http@4.3.4
-system.net.primitives@4.3.0
-system.net.websockets@4.3.0
-system.numerics.vectors@4.4.0
-system.private.uri@4.3.0
-system.reflection.emit.ilgeneration@4.6.0
-system.reflection.emit.ilgeneration@4.7.0
-system.reflection.emit.lightweight@4.6.0
-system.reflection.emit@4.7.0
-system.reflection.metadata@1.6.0
-system.reflection.metadata@5.0.0
-system.reflection.primitives@4.3.0
-system.reflection@4.3.0
-system.resources.resourcemanager@4.3.0
-system.runtime.compilerservices.unsafe@4.5.2
-system.runtime.compilerservices.unsafe@4.5.3
-system.runtime.compilerservices.unsafe@4.7.1
-system.runtime.compilerservices.unsafe@5.0.0
-system.runtime.compilerservices.unsafe@6.0.0
-system.runtime.extensions@4.3.0
-system.runtime.handles@4.3.0
-system.runtime.interopservices@4.3.0
-system.runtime.numerics@4.3.0
-system.runtime@4.3.0
-system.runtime@4.3.1
-system.security.accesscontrol@5.0.0
-system.security.cryptography.algorithms@4.3.0
-system.security.cryptography.cng@4.3.0
-system.security.cryptography.csp@4.3.0
-system.security.cryptography.encoding@4.3.0
-system.security.cryptography.openssl@4.3.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.protecteddata@4.4.0
-system.security.cryptography.x509certificates@4.3.0
-system.security.principal.windows@5.0.0
-system.text.encoding.codepages@4.5.1
-system.text.encoding.extensions@4.3.0
-system.text.encoding@4.3.0
-system.threading.tasks.dataflow@5.0.0
-system.threading.tasks.extensions@4.5.4
-system.threading.tasks@4.3.0
-system.threading@4.3.0
-testableio.system.io.abstractions.testinghelpers@20.0.4
-testableio.system.io.abstractions.wrappers@20.0.4
-testableio.system.io.abstractions@20.0.4
-thoth.json.net@8.0.0
-"
-
-inherit check-reqs dotnet-pkg
-
-DESCRIPTION="FSharp source code formatter"
-HOMEPAGE="https://fsprojects.github.io/fantomas/
-	https://github.com/fsprojects/fantomas/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fsprojects/${PN}.git"
-else
-	SRC_URI="https://github.com/fsprojects/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-FCS_COMMIT="050271d631956a4e0d0484a583d38236b727a46d"
-SRC_URI+="
-	https://github.com/dotnet/fsharp/archive/${FCS_COMMIT}.tar.gz
-		-> fsharp-${FCS_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-
-CHECKREQS_DISK_BUILD="2G"
-DOTNET_PKG_PROJECTS=(
-	src/Fantomas/Fantomas.fsproj
-)
-DOTNET_PKG_BAD_PROJECTS=(
-	src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
-)
-DOTNET_PKG_RESTORE_EXTRA_ARGS=(
-	--force-evaluate
-)
-
-DOCS=( CHANGELOG.md README.md docs/docs/{contributors,end-users} )
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	dotnet-pkg_src_prepare
-
-	# Reimplementing "dotnet build.fsx -p Init" in shell.
-	mkdir -p "${S}/.deps" || die
-	ln -s "${WORKDIR}/fsharp-${FCS_COMMIT}" "${S}/.deps/${FCS_COMMIT}" || die
-	find "${S}/.deps/${FCS_COMMIT}/src" -type f \
-		 -exec sed -e "s|FSharp.Compiler|Fantomas.FCS|g" -i {} + || die
-}
-
-src_configure() {
-	dotnet-pkg-base_restore_tools
-	dotnet-pkg_src_configure
-}
-
-src_test() {
-	local -a test_projects=(
-		Fantomas.Core.Tests
-		Fantomas.Tests
-	)
-	local test_project
-	for test_project in "${test_projects[@]}" ; do
-		dotnet-pkg-base_test "src/${test_project}/${test_project}.fsproj" \
-			-p:RollForward=Major
-	done
-}
diff --git a/dev-dotnet/fsautocomplete/Manifest b/dev-dotnet/fsautocomplete/Manifest
index 757e078fccc1..f3fd75e60c73 100644
--- a/dev-dotnet/fsautocomplete/Manifest
+++ b/dev-dotnet/fsautocomplete/Manifest
@@ -1,14 +1,27 @@
+DIST System.Security.Cryptography.OpenSsl.5.0.0.nupkg 350364 BLAKE2B bb8a0171160d496e1520298639412ac74c7f54427865349726e46845b622a4b44f125f1ec69213e709d9c43f1afc4c800413d356b57d12d4e190d7d86f073a8c SHA512 fbc3f8128f4731c91ed55e1b3cae898c16878a523930060b72a3ca5477296c9996dceeaa382c6eb419848ae4f77ba099be4f1c138bf6c2a0b9277c28c6a105fd
 DIST altcover.8.3.838.nupkg 6777876 BLAKE2B ce94bcdb55b9658cd5431ad9fe96eef93cb754ae71a75d24ca2c471c2465881d40a25a8e728a628761e1ec0e06950b7e927779dccc72cf4d1670c8f7a6a140f6 SHA512 a5a28519dfecfc49f4ba1bcc80cda6823324f26012cd0c43e89b5ac593346cdc3c944cf295671beb573ed12f1d467b024a693048c20753225e9ae2dece3d0ffa
+DIST altcover.8.9.3.nupkg 6437229 BLAKE2B be3b8e7cd60954727e3b2425ab080b71559e3a2576daeca038d41cc15de9d4f0e3610d621c9cf639460ff793bafb82c73ecb78e6ecb16a100d75d27e880ab773 SHA512 99242cf45280a369a6506379a8054e58c554f3cdb24ddeb304fcf49f75044ba94271b0783c16c6339a2773be31e11435c52cae65a2771b63b33ae57629f9e13c
 DIST benchmarkdotnet.0.13.5.nupkg 2478369 BLAKE2B 0e603e07a77ec6b836a5c1736a57acfd8aa9f02d19be7ad6a886be954659f5e2dc598ddf85ee742e57f066fb1cd2fdc429d0a544dbb7e09aabe13fb2adc9bb61 SHA512 8eff8d1591789ceaf1c274bf932f6858e96e5700f1d4f55004e78d36155e83aa0e19e0d4992f9109850927179277d190b28ca2760cbbfd3db7d01536f1432687
+DIST benchmarkdotnet.0.14.0.nupkg 1412387 BLAKE2B 85c9bd75d4f14043b68ac2e6efe558f9bef490bb1838dfc361decd807deded29a40015277836d182f4fa30783654d1539c3bb4d1a7bd96325bd60b19ef30d39e SHA512 14baa1188a311697847a738cdc331dad8365f40b46e950d683335e730a8ec685ff7d2a4d8e7f4eed19adfe08d7b86a50e9b4ed4498f64886fe6aac0d551a7e12
 DIST benchmarkdotnet.annotations.0.13.5.nupkg 63241 BLAKE2B fe2eb66ae854b4a96636ec625b8c1b0122b40d2a1173379067bec2a12088907834b0c495c2a5b38ea2f20eac0b05489f0fbeb8d8058762c1a615b17facb339df SHA512 5e7a3814d61e3f628a95797088891fa426b1263706f3d4a3ed7e7bab1e31cb21c9298cc2050aa526b556fe778de31e107dbfec9743050a0da2424ddf8d531a7c
+DIST benchmarkdotnet.annotations.0.14.0.nupkg 78771 BLAKE2B ca809577e17b10e7b17de1f01c0e887a33bd5433b65ae391040a00054fe57fdc9cda72800e5c8ed27d442c77404f23c1bebd7e13a8e4379e12dc91665a09a9bd SHA512 7739666d7aaa281756ab9d9510971aee45d711d4b8c276b50f7a98c5239d9ae1befbf0da58d0f3a260093b9e78d714e535787311e688c3beab58d32a9e03d135
 DIST cliwrap.3.4.4.nupkg 278187 BLAKE2B 274d9f52a5fd73ebb5de065dc75e4051125ed1f53c79360b610737015ada7a8aa7bec3d08244b430ac20d6a8df3597d0bed282a3feb3c9d9553f8dcc814f3beb SHA512 8cf45b6f0611921a5955c2e631133ce6b8d2609f4486d065098e10f9425a47837c4307b971d51a006d5530f869ce4c697a8949a804272309cd89465f270d37eb
+DIST cliwrap.3.6.6.nupkg 514243 BLAKE2B 953c97ef948384d0e62da226d912fb894c9d1bb0308a3c93a2eb9ce06b7e3850c677a332a7c615a39b5b7c4dc6a5e49eaf6731ddda1084c06c66dcb56415d159 SHA512 998cc053615921d5c511fcaedfe5309474087a53354340cf36bad75541433dd257d9da96f45c6aa614eb5b5edc63d38d97a9574985971bdda2eb88ff1db999f2
 DIST commandlineparser.2.4.3.nupkg 110637 BLAKE2B 0493839d7a58ed915281dbf922c2223a8b7acf7b85433673c448e88246537ee95f352144b554af9e117b24f99518483c8d08d2c71a3843d52f222a6067e98dc5 SHA512 dff5a9482b07368e1a4d268d5bd4a7992a91343811e2678a5499f96a72999ff851fe51a70e9f076c332ed7fc361973978b6ac0851114d5c37040cb44b654759a
+DIST commandlineparser.2.9.1.nupkg 496069 BLAKE2B e2c4b38841f83d6bc10432b8055af90369f1fe0a10105a58b51b44cd48e5d84cb0b5e4b19f444d8c81b38646a62c7c4d11cbd710e92fea68be3ebea6ab98e3f1 SHA512 4f364e45c9668c7e7cc6a922b488f3fa523033c20d7a432694f0a6af05ce528ea0481d8375e2f4f1032c6990347b4803ce9a0e48068c6fe15ec46fb1254f085d
 DIST communitytoolkit.highperformance.7.0.1.nupkg 692625 BLAKE2B dba5f9823b9c47d96e5813a12e83ffccaada9b66c2132f90c0245f1eb96a62db923340b9dccf957d58786df7037940e8666f983d006257a39d423699b509e23f SHA512 9e6c3efb257ffbda08ecf81f217611802444a8d5cbd3c60c23c4c36a3dd7db7e459e049d339125941337653dfc3a6340ea877b03f7879639ac8efc97f4d2eb47
+DIST communitytoolkit.highperformance.8.2.2.nupkg 518641 BLAKE2B c043770539516369876f6ffcd82b1426cbb57b8a91146c81ce2c0c208e6f27b5c5c8d2e175a367100ef8b64ad3b0d36169c70db257dea88f49f7e639d909d986 SHA512 e8391b19e81f66095fc27af46667d83b504b68ab9f6391dd8984735050a3cc33672dd508c7e268af8a2f88519a663f8931bd4d58d0f03e81b34c2046b84d5022
 DIST destructurama.fsharp.1.2.0.nupkg 23845 BLAKE2B bdd46e4f95dc3927d37dee8b08d78ea5f03903e507b226aa80b9f9cf4b3e65913cb1a6c068e83726a95c5bcb497da691c0321074baab549c470f71100b94a29e SHA512 8f3a5fe7437d51ae7482f88b9b47d3829437edf4ce57d5a397788cf443d612437c782c39589e14c101f6c3dc287bdc8965034fd8eb7569d747c617e9fbb04d08
+DIST destructurama.fsharp.2.0.0.nupkg 32019 BLAKE2B f5a6980e18705ac54740e3eb160fcbe7695e11fe7bb06532b73bc9b4ddf2e35f891fd0a1b5c012ec1db8fa9b1481d193dc464aaf5967944c97a83aaee9946333 SHA512 3ffa375072db76cafbbcdfdeceb905ae1f626f253f9c93c892c1a780a336f416e8f3e25250f295abba5a85c250c206ac115728b3dc4acf6d602444b913c6bc0e
 DIST diffplex.1.7.1.nupkg 84087 BLAKE2B 39bc921b480f9d1e1175c876647a8f3a5f178b3275a1320b55370d51b76bf317b6106b06ec2aa5414c237201811191a859960b2fe63d5fda3be35846e5ae1372 SHA512 ef67b73e3835513e1b932e478299462830d54b49a18fd5b08c3bd5e18faa04ccb78839e884c4af2fbc4e2bb3009784746985cf73d10e37051f32dc14be731e9b
+DIST diffplex.1.7.2.nupkg 92255 BLAKE2B dc735fc95dad6a62d97e0aacf27f3b6cf2c094cfa8d490c125f67f93fc7ef416665033bbdcc778109a08b7cf2adc9440e314235796c290e3d156e1a75ee27348 SHA512 24fb44832dc3c975afa54eee2558a43a1c14e5ae0dfdbde80a155f61efe8f25a9cc8a290a8c24916a8db648afb90a91ceec800ea24edb0a9af0c37074c864d99
 DIST dotnet-reportgenerator-globaltool.5.0.2.nupkg 5112833 BLAKE2B 6146ef0d945d62de3d2bb03f7b5a3058efbc6c3f50f08787ab781c1622541f46567eb931150fb44c1a1debd823645b13d3352dd59073bfa68fbfe8c3e7eaf636 SHA512 59965004009b1b2ffee8a0e0b4c1a8040e04e3e854decb90be78f7888fbd7e4974c438fbcf6254b45c4c981d82bbb248c8f89d43b4f922073452ca65fb6da2e3
+DIST dotnet-reportgenerator-globaltool.5.3.8.nupkg 3733403 BLAKE2B 596f2429a2bb995ebd84c53f374cb53bbac68b89ae10f1b0b7b98f516225d088a76588afd6637edd33d91b1e3cb75dd2b68f83cbaa8622f6b0a717b350c85327 SHA512 8b0bf0e020aacaa4b1df8906e130e9bb8cfb6fb58260ee977c91ee478393fab95e74ae4ec51d1e3a57f1d7c32076e5eedfc4e2ab70cbd77bc277176776861dd2
 DIST dotnet.reproduciblebuilds.1.1.1.nupkg 24193 BLAKE2B 7fa2efe9549ec3f7242ceff1566e3e1a11c5fe51091a1ed6faa7fc39ed7feb40c1e6f0b24a0cbc024e157905215e5be1fe776df0f647acbfbb3ac60c9b654756 SHA512 03dabc14d61db33723dd02d11613848125a36ecbafaad95fba1727f909f92777d6ee963394d00a6eb4e9383e636cbe46b54516abe2c6ea2baffdb76a2617b332
+DIST dotnet.reproduciblebuilds.1.2.4.nupkg 33126 BLAKE2B 9a42f4977e7cb41e4825030d4e60c299fb7d97bdf891342787e02b2528f7484c39f22f74cd1282fc2fbdfc4a333a65d4e0e103e57c2553296b64e86996d0ea9b SHA512 766093b839626f909c9d8d6f62ead7e5d9bd2429f692fdebe8a24fdc4840f70fe15947eec3d45aad69ba63bd951a98ccd83d7350b7dbecf2a6d198c034962864
 DIST expecto.10.1.0.nupkg 373200 BLAKE2B c532c91f49625fe7edf2550194f5f3ae34b0f3c246242418ad43fe346a4cdf22e38a38bb7b3f0f981f4ea8e668a7f63f4f7e337411dd339426a5372be7b9c795 SHA512 cac251c942624de51d8fa2b521fdbbc89122db9ca3a0f433bec773ac2265cb0fae077690170887282570a79e470ab94fc515db0b24e64e0fc11713aa27c8a2e4
+DIST expecto.10.2.1.nupkg 385191 BLAKE2B f2fdb659d69a821ab0d5447c35daff492ee524ead1513f72e704ccfa247dac8d9c86bcae00763b0d2479c04ba051a32ef033fabea8e69511d7fd360eb070b689 SHA512 658c2c523d1b0cbb907622148c5417e9d7d3745d97aa9a9895ab6c7fc8f7a7b7aa975966dba3cafce4c0b867499f75554564550600b0c93fd590822b4057c151
+DIST expecto.diff.10.2.1.nupkg 35154 BLAKE2B 0b12a4c6804cf974b6380f888706376750eca4b9465863b6342ebfc5d5d9018096786ce1554dd8783bdeadd3baec54f55d73e10be5ab3bc70114915617288d51 SHA512 18fb5382f14ebae878d2c44844f3d8472714e6186e92359e7e038c321ddf645e1b2a21cb664bfade1c1b0211056ae6d5a409955b4be9f046157417ac8393f3fa
 DIST expecto.diff.9.0.4.nupkg 39084 BLAKE2B a275cda79b5bd09949c0d5c748e4ec27c3e5b0d35db1165fe6faa6d289c77044d8a6102a6a9e15f31cab14e8858beee4ca7c85ea1d3c5722fd1b575a1281544e SHA512 041f0a349805574e109a47c44214324839dbdc020b60281aac7436e607a8601f4e5773bddd341b4fb6c6f30d8cd74c89b1282d516505377b5947a39f898c8165
 DIST fake.core.context.6.0.0.nupkg 43895 BLAKE2B 6809e76f4c588600c3eb59e901649f5ad99401d23a736e8385e4443364a2d0f776e60333f7409d9afa4b4a5b1f04128ed06157bf4b65f01fca5f93501a370f7b SHA512 4056c53a216d963e1e631ca85b8873a7cf0632217d78c6177b01e7c7c597ad362c93c2431cf9df1b1433a12f25d222c0070b6bde78946f6c6c4e66c1729ccb57
 DIST fake.core.environment.6.0.0.nupkg 64457 BLAKE2B d186b1618240e8660b0fb2cae7f092d5d9fcfebb723c2e55a645c3abcdfb8545381eec4862eb6af3cd746224e75885289a00daed6ce4f9cf722c652f017ac044 SHA512 652bc8b02ce5713649489c3303a2acbbb9ebfe372eb635ac1d68a86d7e334c229189b9e200bdd6946973257f974197b88f0c10acd15bd8a87c5b1ba0036fdbeb
@@ -20,92 +33,158 @@ DIST fake.core.trace.6.0.0.nupkg 136258 BLAKE2B a48154076bdbfba1538df5cb773b4d2e
 DIST fake.io.filesystem.6.0.0.nupkg 154904 BLAKE2B 322685f8526150a34bc8f1c94699c8e60a8bc295899326b91398b192c6df04e9a8e3c6791eb3fe98a035a28367f6b8fdd3eaa78a870f2ff7eb843092945d4ca7 SHA512 edc50db1708c11d2c4e262bb4f139ea34ea2b7153c6a67ce7fddfe28eef0c4d1a0c61423df9cd66b328a10d6d2970833ea732c755e7070d5232bd3e274117ed8
 DIST fake.tools.git.6.0.0.nupkg 103475 BLAKE2B 1240283e442c5e28e9e8f57ccd3e324b399d01d281c9e00b00af62cb2790b40be97ec500e2113f10781f6b010205adfdd72f82a33e9b81a4f4634995145f5970 SHA512 5aed0e8cbe0c4dec010a5268edd784e189fef12a1fc75953751a3893e14878caa3807b7adc002b702db4090d2fc98f3bed3232a553978916543053c989ba93ea
 DIST fantomas.6.3.1.nupkg 5904065 BLAKE2B 7c3b45cc25f74887868ab1e8d0eecd0ec5989265bc261dbf1706564b3150ed35cc7f34f4a606dfcab4010300dca552499cb8e5d7a1a330568f1b1aedbd79d383 SHA512 93467e6daf7f0c3deed37c0282f6620cabc5d29ee5fbdf9ac51999d2ca3e36fcef0254c96473a30395b4a01290a7e4a32dc3377b3ee719340c086dfd7af0160b
+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.core.6.3.1.nupkg 662963 BLAKE2B 433ac076e141fdda3e08803638548de4dbd9e8fe2ad56603db43c18532d4a5dcc65ee3ccfb5f4d74cfeb980f9036c934e0747da8facd7bff222adc5f49e5e0dd SHA512 833094776035e1b7aa3d3e210a0dd91f8eebb5690e236bf086508cb144bf96bb4465149aaf15aabf7b78ade21507be113b9addd406cedfbb07489e3067bb4e1e
 DIST fantomas.fcs.6.3.1.nupkg 2210121 BLAKE2B e34f7eb901348797e8654fd9ad75c90661d1fddb77e0a24d07eb2c10e4daa798add61c861bbe89bd358d721840e98ae2be556e064b2ab5246e929838d7ed1f99 SHA512 64190d6c22fd95591fd8dc4de2b77685868ef5f7725885a2257fd7f5b9679cf3cf2b001a1853b4b6e56a0ce93e19c3138fbafb6a631650324f022774d35e0a95
 DIST fparsec.1.1.1.nupkg 353063 BLAKE2B 47e93d6ed373bcf3fd5c26ace2d60a1e6701b14bb4cbca1650bc15bfd0dce402ea8c8ad471004dfe618f0e9507ec60c53d7e01ead2e7480ececfc4a0395552ff SHA512 b28a1cc8a4fd2d4b000adf68b0a9ffb6aa72ec2cdd5157beb47635346122ac61f6dac0e0b06de8528ed7336e21e9881918fd18d36585507ebefb3336c57b6c76
 DIST fsautocomplete-0.73.2.tar.gz 1277548 BLAKE2B 83e99fd1db79ef70a7e21e90bce33d675d691e09939231971f8edf95668f48b31ea9cb9387ef242e82065d1a160728920c2075f0818dce0356f0d8922d3b06f9 SHA512 614acbfbf4bcff21563390591534db6415bb910d2f25dd4f0a1cd854c0f329e1309617fcd4dde219e67e38087e1e049d4480e31beb4ee616393250ee06921ce0
+DIST fsautocomplete-0.74.0.tar.gz 1277461 BLAKE2B 4882edb689ad029bd656882ee32151aefee0ae54e6536b2d7e9674ebbfed1c3e5f7e49b3ff2cfbc632a6b03e06cdd8f13e48a64be4cdb6565922707b3afa8412 SHA512 ba6af4cbfafe0e31a70cfe7524573c08f5cf101ef4bdc060ec8ee86ae1e326c2fae9f779c02c23e8548cb08a5e2ef094735a0e5f8f1143b5ecc6590a088c90ca
+DIST fsautocomplete-0.74.1.tar.gz 1278665 BLAKE2B 7be1426aec07d01e9819eb7d34ceefd545950fc9cd5078dbe723cccb66435ce24221a9f1dd13063856e80a8c708def4fb32ca4af6514fbcdee2741395dad257a SHA512 53bbf6230da167e4d81ea54a2118fa26ec3b720ce9e674564c4438cc30de43d843377efaf12e91686934fe4b6bdf0eb76df23693dfab8749ab20817096d37b46
 DIST fsharp-analyzers.0.26.0.nupkg 18015402 BLAKE2B d7b3e5890e4d58fee1dd014d7b39c68b36d31c759aad602bc9db04df964f17b743f278f28cb065c619855a72e3e2bc6c2ffcc0a442fc39149bf39432c1fb9648 SHA512 60bf0eacb8c169c5d94d4291855729e7ab647400d37e9569657e4a9232083d00e4822fbbbe2a249ec1ae0b8a5a368023ba4470785665b089b8ad19a6727d6785
+DIST fsharp-analyzers.0.27.0.nupkg 18438776 BLAKE2B a2db76a375e94b325436e058eda3f152cefb36c63c7eec81714724589c7f400cec1042e74e87d538c3e43754c72343cffa54ac6943bb0ac2db97daa7bfa8f88c SHA512 d000f2246f514762376ed45e30502ed6947d0e71011e15f2b16271a863d5b051b506a2884a0cee54e5b762c40ebf69cb3f983b5e2c6ecb19446f00555b84cd1a
 DIST fsharp.analyzers.build.0.3.0.nupkg 15911 BLAKE2B 64d63679503b16b541537fd4482c47cd384628bd7ca70f6ad771b93bb11554b82605c2827a0facc8dc5917b196548bc739f989d5ae7899e3b0673df5da50620f SHA512 f07cbbcfaca9ae92285d143ae303adbb95fedd15cca256f278fe4adefb7c8c7e810f74d7ff53bb50dcffbd3408f9350baddb925c6b39ff1a10814eddda7045fd
 DIST fsharp.analyzers.sdk.0.26.0.nupkg 98924 BLAKE2B 5813fa0b4ae17c8e7eb0395c940f791eb6f62ef43ce9bac7726117519c77e0754e01b763c5a582d67e46dc4e8b9ec6458e835e6bb7f596e8085c79cd27c2fb46 SHA512 ebb740c245533b98f8b6f92ed1db98891230044ceacc357701eb225f3533ae6ff9f5217a82be82530e4ff34674191c01e8461b4360ba51e62dc2a3dc5e73aa90
+DIST fsharp.analyzers.sdk.0.27.0.nupkg 98956 BLAKE2B 98468e8afe646116a9fd72a9db4cbb06909ed197d919e504605d6defdf31cdbb14ecbcb10245729c0629f6b9943557ab2a07afef1cb93eb4425387260b8dbd85 SHA512 13edd6ab56ab13ec0cb0caeb35e673692553b4eb61bc6c63f1812eda42d86eaaedba503015e62a414f2f65e205cf862b44bf172e123951f3d40c9467041c3834
 DIST fsharp.compiler.service.43.8.300.nupkg 8940569 BLAKE2B fd9076b33149bc294cd2f0053b5974e1057f74fa02aa15a8c61f3b6c0292a63b6571b346fd656f2a466d9ffc86aff34ec6f3d5949abba3fd64930c6f420b782a SHA512 106839f3fee4c6a1b03e799ba9ca943e9fcc1e40e16474f68e207ac317d8d37e5e43f2b3fe0518d82d27dcf8b03ae9068b98a72c7611b65d0d1c83a45fee6d16
+DIST fsharp.compiler.service.43.8.400.nupkg 9320503 BLAKE2B ffe616d687832f548fd551dc5ec6979a21df9ad97f4298be19b2ce7ae763cfc68ec761b3b041c4604d4c4146f63af6778e53fe7c9e323fc70aff7133970579e5 SHA512 a3cd2bc742e7ac88ca394abe3340def4044086f32b40f41bcc1955240b9122da0661fe82e7a24d5b9477f01460801a669bac054aaea390f1f1df774e320b400d
 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.102.nupkg 2818627 BLAKE2B dde51615fefcef7b6c57135035eb6fbc5832a2a0bd4e4b2587aa8c347743c379c62e695a903bc8a3b599e6ef6cd501b84bc5f43980705055d8a46b8ded99c6fa SHA512 b7840eda7bb6745b8af9c6cdcf3a0e23cb64ad4691bc81a388895c48fb641b0d2cdcf0fa37fea2ea63069763bc3a45316cb91be9be7d92cd15819afa54fc02a4
 DIST fsharp.core.8.0.300.nupkg 2825411 BLAKE2B 5e3cdbcfb2d488928850fbdf2f9e2bd9dba475fcb22e4e2253526904c521bff9c00d4e8c49779319b0db40a033d8b5686176cef8d6b8ec6f52b7871ac1e3040d SHA512 4e0950e916ca0fcf9456be499eae58bd99f58029a171bedf5dd8b7f95af721c7ed70036e2449928b56e32790dba2f5c239fa068635299295990493e6b5c1b0b4
+DIST fsharp.core.8.0.400.nupkg 2854967 BLAKE2B ef7316b2bfb70eec428cc5695b67d8631e588cc01e6ad90782777e8cacb3564cbbacf0bdd597473617a225d0d04d0eaeb75b2b6d1dd2d5969f5bf2f696bb971c SHA512 72ad8a4231b0a7e4ac8a4520e6968080dc0ada977ae378a07f0fa0dedd86506e432af705671f039fb3088d78b61d81b3b36003f4fdd678f622742def5ec98d1c
 DIST fsharp.data.adaptive.1.2.13.nupkg 2258485 BLAKE2B 6607b90e910b28573c9ee2c1e32e779ad1ab68bea32080cfab9df4fa4d13619013a392fef57d9abc2f1e75c0c2b61923e3fdd5275b8db9ca08f8c2b4c017c5bc SHA512 501a4be570f636cc1783476979f1c28355a185d6db5d7c7fd8d2562b1fd50bb56960b424d9d0ed7219cba1f8cc5238db39de89cb588c602ae965a207ef1b16e2
+DIST fsharp.data.adaptive.1.2.15.nupkg 2273922 BLAKE2B 245ca44df68b223a949312e67d36bd4c2b93ec6e88ff570e0d7b06407310e6ad3f6dc1bb0fa3d0df454278266635d5e704f578dfdb6407c1c1b9ab38da5d95aa SHA512 9490449ca5bde587357f74171b9ea5d30a55d77f942c19aa5d1c7dfca8eb4a61d46319baa92c95d5056ca9669023c28817e14eb2df5cc9877fe340ca4e47f571
 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.21.2.nupkg 403332 BLAKE2B 6af8741038ef12b99a6c74daee4c6c1005172c3171c5028a63603fdbd7ebd1c5dbdcb891838caff5bdb0ad2f742cbe0a98400df78e05d99bda255502f74a777b SHA512 c1c98024126b6a18a81e54772770c2913b2cc3883c3b5fbc6f520f83f675ee0843a94f445b5364cd369a35713cde04c54ffc6bdcc150fae2fca74b4837957ce7
+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.4.0.nupkg 400448 BLAKE2B 29b80d6dd5a2aabb9e6eeff0c612699f547e0415dbdbb47beaed116224fe841c0a5bfe7e5ba8a829fb03b9ce06607e13e42492299eec593b7f08f413bdf2d223 SHA512 bc20fafa45930ffaf8e05f45223078bdaeac19bc3ce679108e6adc684fdfd8ef09c7409f2f27b12b184fe6dfc0a2cc718a6289195ed846fe53dd35a0f7967468
+DIST fstoolkit.errorhandling.taskresult.4.16.0.nupkg 616782 BLAKE2B 02594b37a551757603e0ca33032778e331403e220b66995bee6a908565084d52e4acdda8fe3f87cc643c518c34916153d0b05edb0fe254b267d4c04241138bee SHA512 e66a4e50b9e06b14363a322935c0acf01ec0b1739d62eed874c071a893a9928455a33e2b8fa8933b0d45a62c39e86954e455d195f4039c715e33c199c936d890
 DIST fstoolkit.errorhandling.taskresult.4.4.0.nupkg 554538 BLAKE2B b9e445badeea7f0e422621b55bbd5cd3b1fa419200a44b295c48648940d7406e20c44ad2159145bedc801365adaf4f94f115ece632bc107385f60fbf8fa5507d SHA512 ac991a82c67f3bb3a1304f84092a434569a901addff7c9169fb768fba4b76f948a29e942e57e8100a6b7c35e58a9e63f1bb33c8b328cfcb2bc7274ebf2efc68d
 DIST fun.build.1.1.2.nupkg 142778 BLAKE2B c5755d783c48534922ef6a264cf26ad5591b0431dffb8baad37c6649a86d2c0eb885db43109e9399ced2bdcd587f4e08ad7e1235f7e4463087908a2ff4e59fea SHA512 553f1cf4c9ae08a9c55229b182a6532dbb95be1cd140ab870ef518cd21292f8576d4b0318fb4196827fcef14c46d02549845fd8027f7a561833787376a42299b
 DIST fun.result.2.0.9.nupkg 89042 BLAKE2B 2e884fc25dff5edaa6658e6967aa1a542c9d947021d99c0666d7d8cff792fcc2d44e7555f22ef7db090c71294afccf04a817d7c37a97c8120a3d830ec6fc37b0 SHA512 429bd89baa3629b71cf8da075c5fbabef7c25995603057c376c0380d47e9d00401a7dea651d40410e70005e36b58618ce3d53f8a2fd7c4a9ea26089d1bb96bd5
 DIST gee.external.capstone.2.3.0.nupkg 8145352 BLAKE2B 1e1cfa75c9d8fcff0e905e7d8d5fdd3415daec907f97ee4eb810630d1df26397a5a2a80cdb1fa5fee6268599bc49dd8ee41366867aa16ca689c97db78b4be135 SHA512 9079d5705d591c3b819127b2e0b763dacabb212314e9f96b2f632f62b45a9f3e1c208f136df91a4834dd1838a38ac2fd2161ce8b545fe70f8078b66fc66c4aa8
 DIST githubactionstestlogger.2.0.1.nupkg 56336 BLAKE2B 67e9b2e484e9b2d3d1bea0c0c1be009d265f2360c40dbc62081a7224cb9d2b4539903b35d7eddcba61643fb8559f1a7717c6ab5292031f15251294e9771d5dfa SHA512 9273aa09db5d2a83d126bd7cf06129a52166cefb9508b5270304d3b730aebf432a69a27413cfcc0a23ea247848d3721504b4851b5a397235d18b93eb23fdc942
+DIST githubactionstestlogger.2.4.1.nupkg 484899 BLAKE2B 51cee9927b13b8a9db1df14882cd2e395305a849fc59ab28a9054128bd5dde05b918a984c6718630840c78daa82a615ee0319a65af5b169d69d4e2a74ae795c9 SHA512 cc89ed7ccae61e4f4b5b859825b6f730e3d5619de6820e5df5b0929bbc93bdb98ef5d4f7cd3287dd3123313c939270958e4724f863c3473506d0839cd9021f95
 DIST google.protobuf.3.22.0.nupkg 1269263 BLAKE2B fe7166e7271f4b110d23ad0f43e2a5b72bf7fe115c42c2f9dda44f322de5ee655ad332038b87fbe29193f048b79e14f5e9eacdd651247000bcae36800f96e1ee SHA512 c0bdbc7d1cfe7e00ff8cd9e7a42b4a302f474f46acc502689109aedd2b79c135c87ff8f50049421ebe036fef03d8949511f860b9198a220045a8876ad0226b49
+DIST google.protobuf.3.27.3.nupkg 1382224 BLAKE2B c85c9fbd9e18d53465d2a9d02cde254541e414b6f4a89c72bfd5a13b06f43a216c7f992f151a2138b51cba436d0716a0c7d9fa96bbcb81bddd5e2bbfec893c1a SHA512 2852cbd140c0788548bb20da72ee12a18a4e4e9486cc9b45a1b084358185506eab86a97be5d9406001f2b8b7a59489fcca8bebb4c697e2a05d6f7c7e8815c7e3
 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.51.0.nupkg 293909 BLAKE2B b264ceebde46056e9466f53f394fd3a52dcf1e627fc6fd906d00795603103b41e73e305488a62dc1310b220d1280855e40091cf286bb32993a6223243208b564 SHA512 85447463ee761f0160f616b21c3dbb5744256c53c776c1a8154cb5e06a75b7adf39e5fdcc9009c253a6587d97e5c6c78fb9befab6b4a7cd1a549805118200220
+DIST grpc.core.api.2.65.0.nupkg 253423 BLAKE2B 8791b0cebc63d83f8fbebc92451c8af4c07749353246387a4ba0b0318415657ba4589efe2679fdce649791297a8cbf347c7b81a6d38ee5c04794454952d01891 SHA512 7daff35147ec2326f52467c768a5409c145d6697f26b99998bf53f5b9f9aeea170ad04b23b5ed7b10d6d2be879b0b9c57c2f7389963822feffed74fac7190cb3
 DIST grpc.net.client.2.51.0.nupkg 782584 BLAKE2B 482e0f5cb2c8b9a0c3cc65c37170613bd24d18340ba86e87a48f4caa0f9a71eeae812b7f60bf0e4c995d0a1a03b61a605be37438c1e10f861357cdb0868d5ba0 SHA512 c1df1ce9c7dbc475e6313025b2f455daa89bbb211a95299d7105607221708f2f04bff0627d715dda1966b516875a076638766fd84178cff3e617b2ff32135ec7
+DIST grpc.net.client.2.65.0.nupkg 975893 BLAKE2B 0915150569465de48d8e6b719a1cfdc233a63636fb986752065e51b21a65d2fa50758f8c9861e625430dbd8d620a1db0bb018f9900e95658b05d6e5181e7ca6d SHA512 e03ef499035d6c66ec1c34b8a1c1cbbc5cfcaa20ad34436d1fbf70003216c064bf35de34ca3b4d7cb4d7a18c0d2e69db2912ed2b36dcd3a13bd093e4238d23fe
 DIST grpc.net.common.2.51.0.nupkg 154007 BLAKE2B 75c504d97bc1cc973f630a5e04104d0a55a76acaa6a3111c7186526c4bb2fd3133eee4b49919dbef1e858e173d0740f65c218006fef65ebdd3ee4daf0d07e3f1 SHA512 5345f5f4560db8ef1f267fec587a9bb5d55c72bd8be4739512848d05049d3eab81db454b9bbd79a0e090dd6f3659d8a7d7cd45e4ab3aec2a81e90181144c3f98
+DIST grpc.net.common.2.65.0.nupkg 163104 BLAKE2B d875e391ed462a8cae6d2c3e0f3f68f14d16cf06954a8f52c7646b5cfb5660bd754eb8adbcbeb8dbac74268c7646742d0b3abc9fbfe32dff15ecdfbfeb4f15ea SHA512 4cab81007b4a0545f8303555778d417bd4e23883b8782d1cc00dd20e1c20ed35ccb9f68c0f5761e388c12a78da494da5f88f09a9465789815164b2839cbe84e7
 DIST humanizer.core.2.14.1.nupkg 538179 BLAKE2B c3e3c3c7d3fb3484dc85f5eaf25ff4f4428cd36b3458c5664fa7c29cb62ea291aded48a369823459d684ff79ce63a16650dcd37e8cd123c23ab943faea92cfd7 SHA512 cb3a8653f1ca34b67d52fafa92f49cdf0615fd2e4efc8be4948516e5617b32e8af18b63cc12e486672cf92dec3d4a5bc12dd849e5d08dcbce0daf196336e17b3
 DIST iced.1.17.0.nupkg 2106811 BLAKE2B c7042f76781d7a536a8169c861fdbd36d8761e0e89faccf1251506bc6304ad5719da9c62a1f07a43952c1bc1baab2e5ece7e78304b0cdb9eaf3f72d899622661 SHA512 6404bf5518b3d7a7c74478edd56c2c2f194ccadd1cfde3ae7c13c332e442779b817b99744aae19dd4c6400a205055eee7dfc16b43a2f97d0f5200a9bc6c97549
+DIST iced.1.21.0.nupkg 2127279 BLAKE2B 4eaeefb18fddae4dac7c967043b26bfdbaa2a51cace0fe127556d975b95b47c0dd26b7db1916d3484d0e5827fe2116be5389cd5c9ccccbc2c58c8e5997fafddc SHA512 960bdc10717639bca88f9ad48d4a5f50040dc74263c28109e4d4ddbdd8174b250957d5fcc23537310431b916ae1fd1adc706f45adf6ab9bb801d532914591164
 DIST icedtasks.0.11.5.nupkg 1145480 BLAKE2B 112d85723c478f70a2536ea3468e9eb593b7b702ebc7f899a1635c6bf2b9847dd1b54f30d3aab288df4a95f09d4cde8a614f9e06a347963fe563a0526040f41c SHA512 2249e131c268f207f24842c5db1cbf5ca95b3bd56455345ea58cf401fcc10e583d1aa04108a53aa3a72f079761ea1918f1033ba822c0c69fe77f837e437b025b
+DIST icedtasks.0.11.7.nupkg 1153927 BLAKE2B f0cacf2b4228732ea39a35b33a6021e02677262a63d224d957d3237cc029e95f61bc905d115fd9d3dced8013f828c9d98fd8f1e3e50ec41974fa4229b0f429a9 SHA512 788a3ead2aabc8babf312cade3973418fc6870c96fecc8baa23b1b92dbb1b9da41f7966856abfd4db41d0e3def64b8a6bc85c2870951bcb371327d8a905d539a
 DIST icsharpcode.decompiler.7.2.1.6856.nupkg 1267996 BLAKE2B 1c9bdacbfc213c5535bf8d5deefb0119137fd6d10b08508e7d3fe8889bfca8f38ca0135cc4b9428092446cc6aa6fa0f912708ff3a32c0d5ce011dacf20e99e0e SHA512 f00eed41227c66e3c9085909e0838b6eaceffdf12ad2ff905d4c7a4456df6757fb79ed48c65e8e3aef38c734a5d06e0620410170bc59f1443b0de49eeaa7f3fa
+DIST icsharpcode.decompiler.8.2.0.7535.nupkg 1325466 BLAKE2B 2d674e38ef18a3f67a8d45e1513e52d11cb6a8b1f234b09d63687df9446d6c63b02bd6dade1e9595d11b0cf6c4a956f62b6a7841617632a1a89e492c4899e415 SHA512 ed0f8f96704b9c603748a464c30bfb16e3d3be9b59e3f656017d7a4b897820ea660e69824c8ebcf67cb479938c2163106b6f8cd9a53c5a1ad7771fbad7249528
 DIST ionide.analyzers.0.11.0.nupkg 61415 BLAKE2B abdbb8608d1ebc0cccba6b769e618c59c8584da2922718fcb22160a5679abebd01cf672bd6d0034d930499c4bb96eace80dab51c19c369c28ed2c13ef197d639 SHA512 07d0639c08f55f5297ddc7d81cf74bc8137046cc8d61f20b8989c4dd3e1473c936f5a5a2dd749607a33401a1c9c22acedae81e89d3349ddeeafb14a0635c5952
+DIST ionide.analyzers.0.12.0.nupkg 61422 BLAKE2B ef091680b7cd4a7f587111e40ecd6bbb3551a94d1276e0d88a4cc199cbc358beeab7c4cd962f199fc63e08dae557fcf483852211e674dca30b8576ee8e5ae5c0 SHA512 0c9d7432151569879fdb86ce1375a8034a80934af03035ab7ca63c0c0576b0faebfecf714561b213dfcd5915ae51cff105b3d621c2ce7610e4a3a41bc3f36135
 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.65.0.nupkg 271046 BLAKE2B c792a128f26c89f55e5851740a5c1ceabc4d660b4f03387fba23dcedf21e67aa6d7bbf06c5b93f1f041a6a37c48957abc3d1c95e0092ec7d070b7ea4f0d72c98 SHA512 611f88adfd8781072ffa86a240b4333207d5a7fb9576538dd080316fd7a30c7ee24444bff901685e09c730d5c66094e908a1e1d62a259a6cdbc652cd70c94176
+DIST ionide.projinfo.0.66.0.nupkg 271049 BLAKE2B aa85fc6999a8be05adf5542b95868b4f969d216aac82586bddd576ac72546dedc0c82df52fea467ece52b1d8be3f2291dbfb0b3d73e957ef04aef0ebaed26289 SHA512 5f40e424bcbfd1332bacb8d4a1c5a1a49e9703d1b375ac2db0eda89aee83f305d959f02006c2f4a483338a3150873601aff244ce51f0d9cf54c5c09a183d4457
 DIST ionide.projinfo.fcs.0.65.0.nupkg 31541 BLAKE2B 05c6f1dacf95e8f9432a26a92b9e7f6c369f819acdb59886034e48b32879e75b737547702cd8bda792b36e70fe1bced71e74bace801f3d0ece5a2d0053ed1b35 SHA512 3c67db903936ae22753f282f9a0fad64ed6a460eea5306af1f991c57c76eb84e208d1bc441f414cceb430761da51f9a849d0582d7e4bf45c4ae22c0f8a9a23e8
+DIST ionide.projinfo.fcs.0.66.0.nupkg 31564 BLAKE2B 714a40dde798812d0fb084e14a41bce0101cc82d71c4cc89878fc2d0d8fa1ee0bd626c971148c63776bfabdeb0bf2cd815f3fbb2f1f90630eb07a095a5e106dd SHA512 3f43e12f89921a224f4652aff14e8ea8e1959d2986e62fb9ff584873ff5c3e1d2710eb5327d9a34caa5089d869200296f8261dc737c726660c3e1016db39dcad
 DIST ionide.projinfo.projectsystem.0.65.0.nupkg 151115 BLAKE2B 4cbd385f1aa66208c3612052087f38a429e350b848b2632e0cbc56105b305b56ea818ebaf98ae4c593b29c71d1ee08b3b4d992331078a9b73c02535e5494f193 SHA512 24bc05ed61f5e3cf69455cc82619646aa658e9b6bd6be4904a66d151e43c64a0d77fc7d00d786227f705b0af3bb8a44cc4413c78811ff06de4bb07ea4fc11b4c
+DIST ionide.projinfo.projectsystem.0.66.0.nupkg 151133 BLAKE2B 0597aa48da12d6b1f6dd66a8d39a92aaf29aea7a21f892f3f5bbecad83294f4c3f9319235590edee13f624880ae9566a851b16f636df5e7360d7fa3d128a7d87 SHA512 f3e543888eeab56594893e6152712f2b903f4a4b68109f31d733354e1ea4f0f5887eb74280b58f79c70ba620465c07e459f7b746d5a8a20fe529f45c9117f2be
 DIST ionide.projinfo.sln.0.65.0.nupkg 100804 BLAKE2B cccffbc9f457f9b6c2116cfbdc4dae2abc80e0a1f57d0454d1389f7d99a15f2aa61685a92ad096b578cbe23216fa005ef6d5a16215c937e06436f0d1fd8a3335 SHA512 442ec48133843da5f80452f6455a57bcb32a6853f6eb2a48f7b023ac9a4645b91f936af882fbe99c1182d0f27c94f81c2377137acd83b2e50f93679cfc4e4af1
+DIST ionide.projinfo.sln.0.66.0.nupkg 100797 BLAKE2B afcf8f86171d14ca379a56d98b8b584d9fd884558fdd5cb07b4fd81aa3482a1eb267153d9a6eb5bc11bf3988a1fd7d40d0fd02045d04c08ddcd74e8421772bb1 SHA512 acd27e955ae99ca7f4f18503aaf6ba0e2699e68942693b83a1e742bb74f8ed660db9c4d5e9d63ca312921eada40bb34a6d0be762c458c9dcb4b976aea4abffeb
 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.108.nupkg 326216 BLAKE2B b593c5150773aca28aefc2a8b34e24587907e4bfaa73857f3c3117b40a30458058e85f03a3dc3a02b6d7698a67ade141bb3b0c4b8570393a7a46a5ce43ae73d7 SHA512 e2ffda229151542f8f7e14102dd38dadbece62e9818fcda5dd25f7102facc14896d04a310e4c5f201edc59658bbaabb9d15f97ed73bbdfdfc1bef809012f5487
+DIST messagepack.2.5.172.nupkg 488887 BLAKE2B 69207775db51c6b58f1fa21668221d4f10c0cb8f400e453b63360a0135752ab103306eec832dfbc244c087c52a85adc527a5e8f7664421f2e7fc3541b79a28f6 SHA512 87208635b978c7c77da50f9f170d8229c92a1975b622378fd0cd19c030e0d93f50f29b97a5d7f2b006c0e3d99a1bad0d44323fe0211c1253c4f94e5dfca957cc
 DIST messagepack.annotations.2.5.108.nupkg 19480 BLAKE2B 0ac1c8f6c0407e144463aad425731cab7459ec74ec805b6bff6f11951f6ad5ab4cb54139ac5dc0f26f58c0f609e4092ea4f520b8e700f5cf418bf420aabc2208 SHA512 78219b983511749ac9e1d3a1cd9436b67b06e7358135c9c61acb19a70295e594ebdc7bece14b1c0535cfc91a17c1d74b9b9b007ba7078d883e6cc3a604b35066
+DIST messagepack.annotations.2.5.172.nupkg 20910 BLAKE2B 333628581722e7d97e602295f4bf12f5f097302974a1678750b40544622b6b0c2b40041c9d2297e5c9136bf05f7b9144426ca33d24774633073313e3803ef1f2 SHA512 04ca3d3e083a18e1fcc65df7a97e605aeaa4b098acf26c03c2b9e2aeeb20f823c6b76c3dbdfd336eb0c1d5c4ed582b045c0f587522f9e568165f72947c140d8f
 DIST microsoft.bcl.asyncinterfaces.7.0.0.nupkg 95839 BLAKE2B 057f789af840dcb18f3e2a823f8e16725fdecf93986a469544876d66854e541fcbda2031f8379fc22489d5a8a1fd9f766285b99cae88b7ef8412cb4befb0fabe SHA512 35bf41d65c4269bd0b662d228cd2c4a70e21830b745a5f1040cd43c488494b6a2d0a102d21531fc86ad89776337528eca6f0583e588996bd240ad8b334055edf
+DIST microsoft.bcl.asyncinterfaces.8.0.0.nupkg 99740 BLAKE2B 010d05e4adb8b42dd2e4464063b4601750ee30e377a1aec3e1f9b833d4c599b3e3e01832779fd52a56c77572175df2f8bc3d08c134d99f62f58767a588b8ad13 SHA512 79cb0773d94465924cee4e471d90353d5d8df842c46ab2c572cb15d9b9fb5d0209a1a88d64392995335c5fe54a00d7c3194440b84c95142711bbb685cb5e9552
 DIST microsoft.bcl.hashcode.1.1.0.nupkg 103004 BLAKE2B 836c528543658eff641fa40817b3c79b210a10ccfa2f8afbbfc62aacabce7be4e2bc9ac655ea635c798d428ab14db1bd17821120f1b139b1cbd382b00ecb2617 SHA512 c87ab8428d955385183bda617ff5dd5d3cae517c8a1a2125e45c18eee80dfe2506ff1b1985dd9acd5c6bb4c86234cf490020e99beef70aab444059cef4377649
+DIST microsoft.bcl.hashcode.1.1.1.nupkg 104231 BLAKE2B 0764224e6b3f27297118b298f107f9d8a1d25b97745dddc60ea05378412b3902beffe6410af54f25636d6c8d934525fbc8ef4206206e051a640acba560d48e93 SHA512 50c11207f3131c6499d6573d33c0951edecdba944bcd08762b5a912b9a4c9cd3844d4c7fe19686c219623365d6f7740818a825200ce4575b14c079b1f7fc6f3e
+DIST microsoft.build.17.11.4.nupkg 4514090 BLAKE2B b94371d15ce98d25f6e6bf3588853a906d9d4adec211c8eb080a9d5394fcc503f1a6dd3d687f8ab349c3feed105e6bbdd11e7dfa32065acb1e6b270bfc3d68b4 SHA512 8df18985c86357dc046a2b1aa50b3615ff5bdaa5df9e29aec9b28db8701ba2434a2efcc0c991670a2da57202b0bd884848200a2af37dd10f37e348a612f1098c
 DIST microsoft.build.17.2.0.nupkg 4006200 BLAKE2B ff5e7dadcbf9e521bb515846257141be6bc57ac96ae14d49788173dd613a417bb1c08c16da26e37e3da7455a52d628b879c53263253f163d4423aaa6490d1433 SHA512 5a8ac3ac37f4ff0565e70fbd4fefb0f01dc55f4d6f9a457a49da815417bde2699dd2c03ebaac556cd34c59cb20d6282764c6264424853ad7b368f24c1dc10a95
+DIST microsoft.build.framework.17.11.4.nupkg 1094566 BLAKE2B f3f6f3c2240f98c4bb95872c49f30baffd1d6e9ae870f62275d9adf867724cfea30d4dd836ad9825bde13f5d55b58352fa0b612a72a74a94c638422d78d4b000 SHA512 24c5852991509358598d5223b494b48eb6199800b20e792e4f077e56481bb717d16291c8e59a9e879217d985fa21fb9cc8492ba9d09a93fbabdb8bbbd81a6db4
 DIST microsoft.build.framework.17.6.3.nupkg 963091 BLAKE2B 9139ff25badf55d3cb299e122de4fd1afa2279bc560b0efc80c752b3013808c883e62de3e6cea62682b86cc2bc4b903b74a45e58def2e92051482004b0c6f8b9 SHA512 df6482fa6c8cb178038ee8387b83bd37b99b201ecefb411f7bbf14ff5f00402ebb0574746a4302cab5886bf0a4d34ce8888a1a6ca5756a79d2985b06b54e9458
 DIST microsoft.build.locator.1.5.3.nupkg 69354 BLAKE2B 7a84dadc9aad560c0b83eca3e595c8d1d42e10660b3b65606a5bd024136377936efd07595b61d9281deb1b5610b42242c0401612e9d20cc81b85bd4d1d280e3e SHA512 0c6cd03313d00582505b43d5fbe9aa0cd4bae5e117abeeee9d3a4c13fa1fb9ddeeb4c00390b99051500b99ade01498adf61df48a69a7b642fb44af8de27df4c7
+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.4.0.nupkg 2361698 BLAKE2B 83e56d83fb4d408f7e991dd8aac0e6813301d1a0c8d6c5d53310aa1aa4a6c0e629e840b688ead72c663c888fbe4fa5c0de518dcb09fab750d3519c145bdf5601 SHA512 b35520293c48b5804218920920b7d47873ec8c00a6d707a157facce6b90076ab07ee01236f86940d879a3178d5ba6a62b3604980fab4ace48e6d4814008f6c57
 DIST microsoft.build.tasks.git.1.1.1.nupkg 479497 BLAKE2B 053ad5b3b88194d12e9e784c8a91d33deb8a2abc48cf3179990fdd2f576168b19a757b3a3915309fb040a1441bd5102bca333383d757f828c029846e3feef88f SHA512 1961b5ba2ce215f6cd0943948e66462b7388b612708c58a5e03ab1e041ac77f1582f9ed9134136fce0d5345d1d46a1537ff728f542e6dd4ea2c11eac9d3f8d46
+DIST microsoft.build.utilities.core.17.11.4.nupkg 917815 BLAKE2B 9561d38f0a10a29848a3016ec6454e43798698613f84f6a6bfee64e7534bbccc28e738ba81e5a0af43753f7010a1cae2f0713649de261ee370952105b0ec7b08 SHA512 1fe36d4ef72e0e09e79200dd73464704bb36743df62ac0c9b7ec71515bded2b5559f5281f8d838c7e93840f4d9f2cab061d8d29a37b016a8e24bc91daf045ae0
 DIST microsoft.build.utilities.core.17.4.0.nupkg 895796 BLAKE2B aff48704c7c6d4c355119cab3209421cf21c64707abafe3c24136bf6f0f009104e37ef556915e87a4fc3d051a3cab02dacc4eed91993f1728e0cb837c8a94e02 SHA512 7909ff6c24e3449f6d68928a0be5b0ba84e0173e05490686c5cfb0756fecb551b76182dfd81c944e379a80983e8ce710b91e73f2eb06bfa79e1db62f5c5f02e6
+DIST microsoft.codeanalysis.4.11.0.nupkg 31564 BLAKE2B 42446ffca87ab64ea05c9bd4c5e861934046f7868b60cf7bb6e9080cb70b7e35e11465343c31ffed0a6da535f24f2b6edb0054459483f186cf3b77e2c5749951 SHA512 264c433ef1bffea499d9096a5aebfcc079542d2c563824bb0a45472238305aec592de0ff0010fc1e0589714bd1ab61c90d463b57dcf9cf4616f9b6d89157f3e4
 DIST microsoft.codeanalysis.4.5.0.nupkg 32663 BLAKE2B 474a0bc7e6a59774add7e92babb85b5774b54a1258ddff8796801fe2c7dd8b108df4ad84123bfe8ec93696a6e582d9eeed3e4c31703f0683f7b63c1e729f5b4e SHA512 75b4b5a0260de46725edb0ee92058b183851b8e1e98ddd077ccafe7f5eb0ba1339a2d5b7dca3c6d2df9263c255ffcc59e6a167d20b8c01b894b8cba265053a34
 DIST microsoft.codeanalysis.analyzers.3.3.3.nupkg 1111022 BLAKE2B 8704bf2c8a57bdca4ad3d5a2531ff47b0b44d2461ce3c8eec4b58f5cb38f9371fe5aaeb8026a3abbf6299fe30b3f059c892ee6dd239a03eb8b36462f132a2b4b SHA512 0d4896db8aff9d731c5b1c8f73a4b37460c3f08080fbeac0ecf169abf5bdff9c9a994778f453816b888e939d9d0d615245c91a2e4ba31f85d2ea8de222767104
+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.common.4.5.0.nupkg 4738098 BLAKE2B 292bb1e10cd6affdf5d6d7df77b4edc0e0e4fe81608c1e943ed8b9d7f94ad4e574a3817106b95ad2430431e79c5c41f4fbe2eec0de5e2a51aa4fbd0ffe2efa0c SHA512 61f1aa2061217670fab3e1043e5068b72aed43907866195c693211407e2b3ebd6cd9762ed0b3e9ef06965a33d3ce3fb09c88f3c900ad32feb0485922575a41e3
+DIST microsoft.codeanalysis.csharp.4.11.0.nupkg 16919271 BLAKE2B 20b1513d767922518fbf99f873be955aa35056403f92c15105dac78cbd3b429e5a4aeb72760d0958b42d35dfe59aa956445add9ad5a8ea4b2ec1713027d21c38 SHA512 23ba156592e8ca19ca6d286c11183883eb8967393a3e8d51ec959cd7e06f7b4081c768d44e0921da4e3016289b9a8408871e6d2f1f305e3fafde13e748e850f3
 DIST microsoft.codeanalysis.csharp.4.5.0.nupkg 10874098 BLAKE2B 880e5c503700ff666c544043b11d9ac6cf76185a4afb81162f91c0bd6653d9785b5d7a95797ee3980990b1f6910c27f744d4c111f1af846585084b1fa291e904 SHA512 68d7df26baf9362ec2cabb3543d1f7a570b0f345053a23e8feeb5317c50ba392825bafb1710ebee5c929e762e749782fd11eaadb3b437224ebfccba08b985fcf
+DIST microsoft.codeanalysis.csharp.workspaces.4.11.0.nupkg 2067586 BLAKE2B 3192cd1a6cacb19224b21dfaa3d20904a0b0d26f45c4805cbe0f70b94cae9726d5e47e9552d3795523985f05636bf192bbc329874079f1da4ba280d8d7f96ae7 SHA512 2cb5d8fee79f526a11043e52d341c4f5cfd5f9f931ef549762dde559615c8191327991bc9c495669d3eb599a0af5a95204442773f6baa0d77102b94a605f0c22
 DIST microsoft.codeanalysis.csharp.workspaces.4.5.0.nupkg 1337444 BLAKE2B c8c4f0b050eb22470e2b362570078b798ab81f6bd70cd55556973f61c4d7ab16c172b851968b9662d418ceb13fc55e9cdaecb9c0336adad4c35220c2478662b3 SHA512 474703fc47639e146aca623e2c15734c173167789e28bc2e46f65b8691d86c6db4e94723c469e2cea3ebd1f8395f816ad119350b91a88e95b6706db6ff977148
+DIST microsoft.codeanalysis.visualbasic.4.11.0.nupkg 12834142 BLAKE2B f54cc0b8eabe7b6ec55f8fd2087e874a56acf6e38299f890ee8ce44466dade7c1d6a83cad30f7d2899e9f62dbf8536cc182cd9ec6526dc5b046f84dd55dbd156 SHA512 2c56e2ba1eaa69f41c28a1a1583e3d67f00b556cd3761ecbb9bde7175ed21b1eff22f71ea98e8204f0eaec030baa774e43eeb672c3a4459a367b75a8cb083abc
 DIST microsoft.codeanalysis.visualbasic.4.5.0.nupkg 8791796 BLAKE2B cdcff1bec0e46eb0aea9990fe4770c12221e4663f778cbb8ec213dea0f9b9cc8078d1b67744e407166f4e10fb25d191cf0aae9667d8116e736e14462ef127a32 SHA512 d38d2cae86733b5207189f2d5cfdbfad709255be7ad3ef2e54e97b5770b2b50657afaa7999c182e524a844082c3e8f9addd235eae8ea6759cb1456949707de5b
+DIST microsoft.codeanalysis.visualbasic.workspaces.4.11.0.nupkg 1945546 BLAKE2B cf0bdccd761c56efd35019004aa4feaaf2e71c2b804e64490fad3d44d377847f2cdc4a4dd24ab42137a5296d5ff140d262a8bad48b6d5c1802fe550b64844ef4 SHA512 140870a2360f181e991bb36bf5c6b18c1a92cc7b22789d22319ba35f49131efdcff4c8594c1c944b392315636d79a663c3e864d98b1cbb5d23873435fa8089b9
 DIST microsoft.codeanalysis.visualbasic.workspaces.4.5.0.nupkg 1331804 BLAKE2B e0d71b4d3c2515b967bbc3e34fc1b99cf7cb32e132be94eff76a71693539596970f5beb9db2a00e04a109bf81c69959867a10eba8ea878197629fb35fa12358d SHA512 18189e1e3a0c6dff82b58cdba73b394f93f7e156c0906ae2b5ad6bc6114e1033918cb74113f62b6aec2957ef7a84f551ea3560d59aa3fbcac4f3775d385b3e58
+DIST microsoft.codeanalysis.workspaces.common.4.11.0.nupkg 8333461 BLAKE2B 94c8f50086a5a5bfa846542e26cf4c1b8a5f0b19b11c66f06f2695c9adc0d27dbf4958314592395db185e138504bd5226c019aab27a66fb61ecbcb2f9b290603 SHA512 a5461b6ef454328e2413e82326756c93cc056cc5b8f4af8570cf3efa1d2cc06dc22bba966cffd31ba5ce223b48651203d06addf46c90ec7be21d2f2e201bde16
 DIST microsoft.codeanalysis.workspaces.common.4.5.0.nupkg 4948883 BLAKE2B 1c208f5883e6e5817bbcb5edbf6671e152c2da678b5ced35d6d46db18894b224eb02f95dcf90715ed93268019f960d8fef601fe4ca1396078fd32a5406c6888d SHA512 66f89952c90fac37702c0df2d04fbe8561768578baa0aa30a947220b253c952e109f4bb79c852bd471c16ad3957593db6a6e5e468994472f6210d742e6a4757f
+DIST microsoft.codecoverage.17.10.0.nupkg 8906478 BLAKE2B 73d760059dd1b7b96856021aec53b0d65692710d80bd4f1b0f77754c3cc6f143978af25b37d26d994e5562254afe51c85ef377a6637b47319474ae5c674f3945 SHA512 479dd9d459c4a7b62a20943afd29e982800cf61e21220bb2d1acda4ccad7239e613450ade8819b6b06fb8f3f33fb51decb27ce68dcf3bc5b61fb70d7e480a25a
 DIST microsoft.codecoverage.17.4.1.nupkg 8958688 BLAKE2B 77c5ddc9af36a53e8f71a50cf9191cb697cd3821ba0e9869befe79ad3820e7f609419570f3713c55ea4febdda3fa0272f29901804ebd48a1fcc4e6bc8145e026 SHA512 60dd9648ef5e642a5dd0d8f5701f9103525ea5a9aa4abd6d0fbbe570d29237d3c946b6783050dbc4fbf5eaa5e239fdf7833c786b4ffb8f2837bc1a0dd6f047b8
 DIST microsoft.diagnostics.netcore.client.0.2.251802.nupkg 146459 BLAKE2B 5f3c1b217602aac357b529e8d48943c2aaf90973ccb86b577748d3eb11899e9a43f5370c3be77531d15550792f5f966fc694c72d8e3abe83fea1a0d6fcd11f9b SHA512 553336be495e4d899318256fdf085e7800e6cd01a50ba561a3fb879d12f75bd42d58383bdb7b0e679d6f9ba7414b9b5b9d07ded6150a57651e16d1e95cd804a4
+DIST microsoft.diagnostics.netcore.client.0.2.532401.nupkg 165935 BLAKE2B 492564840f6a14976b217a6fcb038bb890b0f19e28776d1bcd77a0eb4f89b3c7bb1f77b076a4c23f3a1d43153ea2cc471ec0b84b6ea8f86ae709d98b4a678c3f SHA512 d89a0cc4dccf46eafd9b15b87e7aaf3d2a52bb60503ab0bfbfc23a65245380fd885c12f5e9a9aa780b7b2531b2870e1ea6eb349a221c9ae588aae69b036d0c9b
 DIST microsoft.diagnostics.runtime.2.2.332302.nupkg 747281 BLAKE2B bb3335a3490ecfd1b4ee5c6d83e136c0a0411b599fdbc5a63f18fe8740f63c6d4e313c6c8346bc890ab95ed007c6ac31513b0351e90766a241f56397abc06cfc SHA512 7b682033f65f6ae06f8c63d6d607551861e1f36045cd670f8b39e28786958c5e7da10426f9ce13762a9a88edb8aa2e730c0a7d04455a61e3e014327ab06dde18
+DIST microsoft.diagnostics.runtime.3.1.512801.nupkg 882239 BLAKE2B 30f97229d2e6987045fb43284c16d7809b4d256689aa2384acda62e5c1d27a91d2ecbcb3369522dea8931081317ab473cf82f923ec7e7cd8abd25a22c695ce86 SHA512 842c30eafad766a014a0593514887a1b4aec84cca814ec0cf0ba83d3bf3f9abe6e9480c45cc054d6fa631cd8d66cc53aba434ae2293a2116e294be71a712ed31
 DIST microsoft.diagnostics.tracing.traceevent.3.0.2.nupkg 7528517 BLAKE2B 911f3cb4337c3eb9f9d3fe414691b4a3b1df3bf3ea1294c3053ee82cbf820d76e2d9afc8f7eeef295b1e34dece1757206b8aed102ddc89146757953e9878e1b6 SHA512 31fe5d47f445629e350a27b981f2eb97a9a9842746f8beaec553eb5832b8cb8362ada825d73cdafc02736a92836a16a1f21fe6b375f918241d553a9ae47d8ce0
+DIST microsoft.diagnostics.tracing.traceevent.3.1.13.nupkg 4405603 BLAKE2B f7d7a12946f8866629fdd84185dcf5d22f483f1c4b4d963f20e3d5a528bcd8aea9145508525545ebd4188997d07f1cf61a2475f97837b26bac306735d067f5e6 SHA512 d0a9fe7a4ab17e2963e173a7e5eb2d5644f66f8f113ecaa83d02348b42ecfb1f3a47b2414bf17688e26fa2e492ed9223b1a4eb881220b0710ad0ffe2a11a5343
 DIST microsoft.dotnet.platformabstractions.3.1.6.nupkg 72146 BLAKE2B 08d852b5e6558b499f2d780284aa747e5cf39886d86fa378128fae9f71741bd57c5bc75c0077948f193b7e8ea03a520d8ef3bd3b4fc80779adb4a84a4b44fe8c SHA512 55b87f544874686bed96889953b7e99e43426b79b0fac31cc452e0f4a27ca5cc08522c0ac967bf9df649f7c04137a5e2553d134ad79d5c1e69578367c2b4b4c6
 DIST microsoft.extensions.caching.abstractions.6.0.0.nupkg 70395 BLAKE2B cc787e907bcbcb2814105822f565db1fb9c1e3d20eeb048228cfb8e478e35e9374e37d24c8e3558f82c305115d430ff393669ec50c2ab565239e4e955cde1d4c SHA512 1101f4ba4867980da03aa494e6843acd3db2738aa3b7efb01c5a2cc9291c767dfc2e04fc7e17fcfdb3628c98a329632232cf351ce584d94222faf3c95e0efdff
+DIST microsoft.extensions.caching.abstractions.8.0.0.nupkg 160393 BLAKE2B fbdc0d02131ec3601e5f08abacad1916bbe03e390643c5bf40840707642371c2eae26a2b6abfc65bd24a89101f0787bd5681e679c5933048123f53dc301dacd8 SHA512 1fdc30912cc1ead9362f70853de219a9dc7070bc28f621e387185670e605746ee2f13b0df9db03d0b1f8919d4bdaad40ebe9f8203e3a0cbb61145aa8848be136
 DIST microsoft.extensions.caching.memory.6.0.1.nupkg 79804 BLAKE2B 3c9b256d0f3b41d87f9cc51f615bfb01e523c7fa93c3180cd5f556f4b740bc62121a20f7b211ed3ca6270f8e7cda4aace0d8e1828c6c6ce0687ca6a8da282979 SHA512 340aa5e4942da48c5462f4cf831f8f4f1e67843d2b5a50fd2bad537cee926adcdeb40c091fb701cd78928922b0271c580e10948c418d94a9af64feb15e5030ed
+DIST microsoft.extensions.caching.memory.8.0.0.nupkg 187247 BLAKE2B 3297ed8515ac9d3c8ed0cc96892355e064b94ad137e60d0e2a3394ec054e03610b87483e0db651ff8f91e410e46aa7e8fbb060f2fe00fd4e02b86ea037266098 SHA512 b9ea36c2da4c47edecf336fd3c7f5bf2cce343b333a7c6a98e6415dd26b4f8574c937e3ccbb19556e16d3de22e9564beaabdbfa94fe323992cbc7b47f90559f9
 DIST microsoft.extensions.configuration.6.0.1.nupkg 83275 BLAKE2B cc673110ea388eb8eb830cfe29080d7a996d450358aacadae2d80fe1385c1789a3a206b4062685acac3d3c9c5a4ade5fcf1d99713580a3905004241f93f3b313 SHA512 a7193ae0cc249c9b1f5c27fd5b92c04a5fd6e9aff17e0e3cebd2142efe2602e8d9d55cda6ea35142ebe5f72b8f6af8f33e6841e87aba835bdafdf2a9d8f88a74
+DIST microsoft.extensions.configuration.8.0.0.nupkg 191129 BLAKE2B 907151c54380b8cb10312a5dfe876512912eacd7471c91c0c4972a375c4e91b0b00e5a295cac19523d3e8443b9232aa06e949e071bc4a83ea3b45c7debe44437 SHA512 da48a8ef3b4cd2a6beb78008382d9fccdcdd42ff3a71d9efc5ac69d4020421294ac95b07cf11520341a69ee241925cd040d49a382df243e2fa194f6896ef9734
 DIST microsoft.extensions.configuration.abstractions.6.0.0.nupkg 67830 BLAKE2B 64452373f7b7bbe6dd3c2348ff97f3c87f5ab89d1ef97cda27c7899176bbc157ac306397ad968a3a1bd43d35816faf2ba7bf75bed0f03b2e35a4bc5b4f74413a SHA512 825fd78418c371f59143070fb788e0381cf8a52cd8fe51d34c313c5d1807efb597de97fa8860dd343a621e0e1f01b70bd07abcdeb03850dc8c7ec10f6e09d6ad
+DIST microsoft.extensions.configuration.abstractions.8.0.0.nupkg 149230 BLAKE2B e3d49a61ded7a88e0ffeccf5901f1fb021d66ef9914a5e5e7e43e69a193253f1009a55cfb2199579e017dc547050b77f7e777f5fe944dde609def9f66be3217c SHA512 3316170910a94290c8df4fed26fa884a47dd9bf974eb7ad22368d5a63308660a01d2dab4a44662061dacaeccf4ba09cdabfccd4636f76ab3178becec5ad31a2f
 DIST microsoft.extensions.configuration.binder.6.0.0.nupkg 75963 BLAKE2B 745c8b246a69c9eac0627aad96a252e8ed3ba2c0c1334766d868931a9594afa179d894aaeacf6223a7240c220c83b0b61685af591c9b52875725527ab0ee2408 SHA512 abcfd53976c32a05b43341beac795a7f4401c1d7ea5a7c5bea533aeaf6e12aff5401ad9292695233166829ee647ee841cce061ab04c387f6eb0e2d08bf17f477
+DIST microsoft.extensions.configuration.binder.8.0.2.nupkg 389312 BLAKE2B be1a477073ba8270e3419cd7df4b76852ea18039eca4678d5ad7d7183b6cfebf08c0e0bd219fdc8620b7f35a621d564000e4f85092333fee431b0e22ca3a4568 SHA512 63f5d5d0f5df1c7f90a138c75e14d81f3598af78c2c736a7aef5035ffcf9d40ac5a133571935a08290ceb92db72357c8203261165f8f7f057c450b2c611f6c2a
 DIST microsoft.extensions.dependencyinjection.6.0.1.nupkg 214896 BLAKE2B 05165ab97aa153634b668766d3fe248ae9dd02c56e5e198bf989dec25955b6a0d0b2e70dc2dd8a949c82f8766e51a5ad845cc9afd9783c3552e03fcd9c6eb878 SHA512 94eb72fee56c0b2fa13a0309de603c698edfb8710909e29ce161b38ed730fa0c8f1ab1a4863556e9e91da2c0e046c25940e1be0a10b8615ae7bbf032a066b06f
+DIST microsoft.extensions.dependencyinjection.8.0.0.nupkg 341717 BLAKE2B 4c6e981247ce8ca11783d442e658f69edfc307020adacdb58c28ad93e7d75b7d4b89001cc34787041e44eb6efd2310e4bc8ae25f31d5a2688f4d363f9756d9dc SHA512 96391af4ae0542f4ae96c8009c9ffbf304acadf476cda262a8ea73e33b172529541044186c59d656377bb2de42c9f5925e0632a81f6e7516f2a646e8916f16ec
 DIST microsoft.extensions.dependencyinjection.abstractions.6.0.0.nupkg 149541 BLAKE2B 0113d06e60abee710275fe7d9addf5297952f8c8759755ecf6c17265d303bd5d2e19a8213d6a023374cd8e8439dd05a8625f48af688fd3bc2abe25fab16e8d59 SHA512 015a392a362c81b35143b19c5da4eac0928cc2f2e13329ab2e945a15a5c9dea077cd66b0c467c75f2dfe6f90c3e0bf2ecdc059d75096bac39b4156a53f997bd2
+DIST microsoft.extensions.dependencyinjection.abstractions.8.0.1.nupkg 276691 BLAKE2B 60d1edbfed31aa8198a6e07e1d66e228357c2df2955b74250b4fe0c9124728fbe342b9d0b64c7e053e37ac018f5439082e1c925aeed309da050ad0fd490b06b0 SHA512 8118da9932da382b1c22379f9169bea93cabcf17f5d56c1b6616fae23b1bf14b4a38539b7f8417f63f161b14021f2634df9e4f9fa62f5fc84667018a1d92c967
 DIST microsoft.extensions.dependencymodel.5.0.0.nupkg 197710 BLAKE2B 47b21b0279c85f503f0c6faa93287e500e23f1f16b98e276ec76d337183a839277007bcf25ba9ccd7218f2d9fc7a7d89a73646d9c1c61ffdaf1cd183cbd62680 SHA512 5dccb349ebd93326865f8ed44da3e7adcf993fefd5a833de4fefb467100f322a2535cf1ec2b53b6c4300c5b389c15f49e0b526747ccccc5154ff7b9ca2043663
+DIST microsoft.extensions.dependencymodel.8.0.1.nupkg 262218 BLAKE2B 2aca6db81decd062175b1e8f8cad27b3bc3c1ab2f7d94cb0db3d7bed48bef38c90a872f4f8e9b958dbd91cc0ad8baafb16896fb70f2686d61be9172f61711560 SHA512 2ace6161b1549e64c9b3176eaa2007a76dfa8d6b4c2134a8ed4063e68457246a285abf4292b6b2a76a05b59c6f6ca7df13eed2591019a7f68369857b539fa277
+DIST microsoft.extensions.diagnostics.abstractions.8.0.0.nupkg 152735 BLAKE2B eabf9e321a5cd02f10595cc2ebb23d910780ea879dfc8f81fb2a9baa45c8d424361384aa853ceff40a078bab0d43185208c2bcf23f5f926ad39b57ad0d7f3686 SHA512 a75dd040e3e03e90c8baa006bd569db9fd09983cf9c27bfcb246d96a73e2595cea7aee6116438989f8df31b56bc7fe6adaa7a7fcb6ab95ec5b1d64d0b17ff617
 DIST microsoft.extensions.logging.6.0.0.nupkg 111767 BLAKE2B 8bdd2e7b57e786eeea1cbca6730cb30f3618612124a6df3e8aee4e4992e2a72618d9ebb003e5517b5c15c368a77313fa0442e97b74500b4110e53ebf269efbf7 SHA512 f5dec590a353b7fbb35fda799c083dc07857c70fa0d46daec0e00c4950a8d65f42c6f399a86706e2d97ee51fb5042be27f35637673a2479dc4f623590d597311
+DIST microsoft.extensions.logging.8.0.0.nupkg 232520 BLAKE2B 79e950dbc495ab3078fe05219ac5afd79051fb841ccc47c919958ffdc94b1077eacd6038a8cb70cb27404295161c75fdd7e19dcaa006bc0f237781c3e4a434d7 SHA512 aa30576c428dff69bac5f5d71721af6c4ef583bc524edbd0a94b49cbd80f698905021260e1a432c32e6d48ce5a30f6822c209f11dcf7c819aba1fa8347925b06
 DIST microsoft.extensions.logging.abstractions.6.0.2.nupkg 503017 BLAKE2B 6ab1756b198a31a1b7ab7ae1030ad195b70a37d87a58fe22d95a8428845cd1b7fbb13bd11328279a55ad308037dd52f0df452740aca1b8f3960db8d4725bdbf2 SHA512 b87e29908cdb8e5c8419778cb72343371484f6e4ce5e09b2698441a3887fa25d19fdd895b1ee42978d0c52123d976e1189acd7cf1d572ea486b2fe22c571fd0b
+DIST microsoft.extensions.logging.abstractions.8.0.1.nupkg 800001 BLAKE2B 1064221148535eae51278549a244a50ca303d9e1a841a29bf3c47b388af3bb1dec81328f09249c3049e76e941e595d0d6f54a79cc66c232b0afad2891ddef91d SHA512 c8e0fdb230e0133f2e3e2f84f300258f4348fc34af23ce597cf12446e0e91711cb4d4d0fef3333de3ac23a49e006a9eef36baf95d2b5b7449c3d755a6d55c045
 DIST microsoft.extensions.logging.configuration.6.0.0.nupkg 70360 BLAKE2B f15df88f8bf754935ae5391f64eab9f972216f87abf772f77a953e20896f573cf9a63e74f76954a40bf57feca94b2a34cba0bef86632b8678be4e39932adb5b4 SHA512 3ca31b00d4604a0a31ae857fa451b4e13dd542e0af50632c313c13b90fecae6931d6c05dfc94311b07806ab15decc9a464fd7557673e8c2010c503a025965b16
+DIST microsoft.extensions.logging.configuration.8.0.0.nupkg 143523 BLAKE2B 80c5daa2ccccad222ee087d67e5f0bfa274801c64706ff288e0fe5179f859cbda26015681eacc65ec2d6a25cc855c2dea907eaf825dee2d3808c8ef0b111b0ee SHA512 a6c7487b0daabbf7987496ece736b3a2c504298da762c30093982850fc3786d7df6efd92da5fe78d7ef194ad7d3e2632c8f5398ca70ea6c9ebcc1fc1c7bca41b
 DIST microsoft.extensions.options.6.0.0.nupkg 140038 BLAKE2B 16df4c4c02eaf0cb07515ce2e82ef40ad7da8b4f2202f207c30bb5b1fd5e84d2e1613e17a940391a88e61083fce3899d187af9c4d66b9a95b4788defffc8c689 SHA512 3c34452bac02193264b0563654ba5282a74b03ede2b675ad25fa85ebd915bdcca857158153eb4a4a024065eb4e9d7bc1ebbd23485493cd895c4d049aba4a5dd2
+DIST microsoft.extensions.options.8.0.2.nupkg 494417 BLAKE2B 05ba97879b2bb3c5a8c9296da11f6ea1ca365fe9856574f03b1c76e775510c25602ebbead9c8109de70fd3b3c65fc5794e90440698c311d17a2bc1de5db384b8 SHA512 cc0c10336580c9519740a042b1e42d391bcb32b63732163ae1161e1c5b55a4cd4a736e1902eb2a4dbb89d784b0acf584b5042b4f3481a61dd30a4e229fb523c5
 DIST microsoft.extensions.options.configurationextensions.6.0.0.nupkg 67326 BLAKE2B ce3ebde272f9997ceaebffc7376977305e795885f660bc0974ef0754c0ac1ce10b01437a87baf1c3b94dbe1f86029f902f72e5a866e8e59269be8d1a8528d900 SHA512 fbac4998f4cf00186c27a5ec710f92aa30c8535bbafc51186ca90a587005e7225df32f282b64231ae4ed3111dec837c711c207ef58bbe990e600149349bf49d9
+DIST microsoft.extensions.options.configurationextensions.8.0.0.nupkg 135412 BLAKE2B 049e740a869f8affe84b1b25572ae18e84879afee17bc0bd2fd5b629246dccbaa50463c41dc21e9cfe453190872eb69cf34e1951134c72a572b266830ee7af96 SHA512 5c32ae67ae4e873216bbbec15554778e0acbebc283862a2debcb11a995c42a5fd75f9436c8da421aa51bc5c12db4e6c4e82f12da1ff942bc5a6e1a8cf3c77a7d
 DIST microsoft.extensions.primitives.6.0.0.nupkg 144250 BLAKE2B 690d4b002a62d241d98968a16ae61ba731276eb08c234ce9d56bdf525ce952232b969bbfd1153361061ac5a5cb12acb74610fe050b6f3fa9a06bbd0b4e0bdcce SHA512 0b2697f35557aeff0784b10ae6a4eafd7601bf706121ed6584a61879ec6e494514ec7a3e0da0aa6baa99f3f716f69030ec7c4c82f657c8dfdbacb637bac4547f
+DIST microsoft.extensions.primitives.8.0.0.nupkg 209772 BLAKE2B 46a3392933c0b901d1c535d534f0f9501b63659fee1f83bed47e48b49aa0162da5af1b3190af401d709fa0d4b8bcde3f17f7e4e28f0141328a1a7446e4f81b45 SHA512 1f5475ca3d3ce18463456dd135afac502d6f82fea6e4e4814a61f86616c348decf28b73d15c2bb276d1a3c039ea6064f75e1329f6f3a64caa3520d70ab92c32d
+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.4.0.nupkg 209334 BLAKE2B 57b8e9d7f2df4785d795067878aab6ac784633c821fd8bbc6d5e93622994b92811a8f1d624090067434881534ffc39ce1105613c17e942288bda7d1c81b7436d SHA512 c20329af90c7d35281e71af21f13ff37c9f3fa93f204f82a07e2455ed7f36a4cc8215d2197e62904370ddab61b82fd6bfd733a198db47574c7ec6d61ca2baca5
+DIST microsoft.net.test.sdk.17.10.0.nupkg 34302 BLAKE2B 24d0b42d462d7dcb43472307cb5863df86a0ca4dea0d3d0bd182a917d467951b261d9ec1cf5ec944762fcc9afc503aebcd1b592d0dc74cd31c0d02aac5f9ff8e SHA512 63933dce26e5e3e7d59133f4b4eef9b28ab618f6186bc69d46ae3c2af6078c840b80d9000530ae8bff2245852e79b8a05e1914a123fb2c7d35ea99d190d10d70
 DIST microsoft.net.test.sdk.17.4.1.nupkg 39464 BLAKE2B bb74f964aa2d3cfc8b7fc9021492ec3604183286ad60fafed1d3a0f59b75e325066811914e566197cb0d03969e6caffd3ee4f648b95a67578c2aafee882cf4b2 SHA512 5901d8c30db965f97cfe6b363690811a3559e17687e928df8087e15ab96d6ac4499f961af31029db7ef73d4c0672ae80c468b875f8b5e40fff038e78b429316c
 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.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.1.1.3.nupkg 31152 BLAKE2B 80a656508fda7db32065d89f8eeb319db79869a00cb22d7a8c9c2204711f057f076e905050717302d4f900b8881c7d2a15bfc040fa285dca984c138cce311d3a SHA512 a71c2af20d8f61188417929756399914c353aac8361abd69baffe9475b2a01db802870066da0ae27afb2737a4026c782950503dbd4b651bae6ee7fd90fbf1d52
+DIST microsoft.netcore.targets.5.0.0.nupkg 35893 BLAKE2B 35374033d2637ceedfa9ec41bb48ee777d29ccf5c9ad5a0c85d082f757422a3d3fd3252830e0c817eb01e0299f3b0a9f77b85ee81b968a8000d145992cbb94b2 SHA512 8581e6dc902340efe7c92c5c9751296616045bed8fdc7d5e2d936bf90c603b94e72d2ea1aad7e2e567218d0ce389de393189a1cb65fb20e99c5ad0cfe1fa4c1b
 DIST microsoft.netframework.referenceassemblies.1.0.3.nupkg 20961 BLAKE2B 8632244fc71708fbb2a56331c8642a12782baeebda676b1b8d3ada50788e0725a7572cf0ed1c296c4cad3fb8bdd669871c90f963b9c8da6eff796fd30ba768e2 SHA512 e3b8317b290696a380a32abdd9e75e71ddae68049769beb895024c34089f41262aeddf53e30984330b1293f013e34d854a83223ae1e2afe417186795da8dc148
 DIST microsoft.netframework.referenceassemblies.net461.1.0.3.nupkg 20140575 BLAKE2B 9ed2a7674a3790b868e961452d6013a1c5023c6a4c707834167ca9351004e4cc2ee93128cd1e52d0a58915d1e7154dbca7b83eaed9288ed88cfb0b6027ec3e2f SHA512 b717dcc15dab52be03c6bd2bda353adfb0ecc785bd5a8d4fc47239a1324f46c4ac187595d902d2ef90c69bbbc9d9eeec97d04c6599f5ef8feba374833bfa01c6
 DIST microsoft.sourcelink.azurerepos.git.1.1.1.nupkg 296771 BLAKE2B 9280b274139271ba06630d983ec1c52752322dea1761e62ac2a7190ee3571db54e8474b6a19ae34ccb42a27d1f0bbbceece9e0fae087d0bf3f70a648687e6799 SHA512 3af1035f2d5dfdbc0430d32ee22ff3466b0b89048689ba1647fe8b27844e2897da792600ff630eeb3ac7aa7f8883762d0550080e188fe914fadaed502603caf1
@@ -113,68 +192,120 @@ 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.10.0.nupkg 1654989 BLAKE2B 86644813b79206d2c660a15ce5be29b1684a4dd335f8e6b5913251a0a8a8f61b52c528fe0f1895951b529014b1344df59ab9555ade3aec7d2bc52d9c59b93012 SHA512 3b7f8038f6cd77389b1923f1b19936aeaaa8226e784228686ece42b16c4f77fb23b523bb7acfb085c32ed8492b0880c798a1ba980e20c9ed23ceffcca35359dd
 DIST microsoft.testplatform.objectmodel.17.4.1.nupkg 1304442 BLAKE2B b926ab886db082be2cd59e47c0019adcba81f8049b9413d563ac99afc96f3f7b51058315487862e60facc36522991f33fbd1fdbc9ab79e2b8bbf0c725bcf7485 SHA512 feaf5d1d9a1b111e377d43f916c46e8338b4918f4d513feb05bb1807c44fde12265b4ebfaec57666c7e5fe0f15a35758212d126a9dd0ec7503b54eded375aa4a
+DIST microsoft.testplatform.testhost.17.10.0.nupkg 2879677 BLAKE2B 5828346a430b8e9e2ce8a4669c3132316b2ad38c1ba623ca892eea27de510be75a0e6aca41717e19d41e0b53d64b43ef677f4341e000e2d5696187cbf7040cbf SHA512 b400651bdb20d38fff63c381328801363df1b8ff9f26e3564bbe39c37251818beb96f0c2c19b4ff7586383fa84ffb05fc3cd755859b755380cd2a2e4fb04da53
 DIST microsoft.testplatform.testhost.17.4.1.nupkg 2580527 BLAKE2B 8675a320eccbe5a2244404343e9cd5507dfc347f96d0eeec6c69eff8671eac86dbd1e4b08c3081d35ddffd7f252ea984981c0ade31e21310b058ac5c6962c799 SHA512 889ed3a857baed9b4e8d3bf29656a55638f7b8291f80e6a0d7a76f75b9331551328e55a6258236fe18102ed5e3ee56f7f5a2f8ec4b2914c07e56c5d5dc86a122
+DIST microsoft.visualstudio.threading.17.11.20.nupkg 1656800 BLAKE2B 4ccabc1ed7bdf2efaa724be47e65d31001f500d585888e2dc0716a2313e5240c510ed84ad71a558712531740c6b272dbd7b0f480ef82cad7965094a6f89ba5c0 SHA512 5977c40d86c71884c2ef7df072e1fea8012a4cc18421e8ae9b0ebca09b508798a788de699e46bdc9b44ab0ef95951433669595288f0adc7131d4d1e68d9ad06e
 DIST microsoft.visualstudio.threading.17.6.40.nupkg 1615534 BLAKE2B a3c8e442e218f6b855299270ff9143d10e9fe7ede6b12b1534d562de7cb64cfcfcf3855f639b2abefe8ff48a5497192ee504e911abe207a39716c97fba75413c SHA512 eae7c4297da137ebaffed98c41e62b99db1cf60a8e6fa11c5e1eadbb789c66864f407e96a4f305efca1c02f8dfd8f7e9bfdf316c92e0187207df8766bcdb047a
+DIST microsoft.visualstudio.threading.analyzers.17.11.20.nupkg 488903 BLAKE2B b43d07657761c4b68a1b3bff7455fdb7a00a27d9ff3ecae36a389fb19e0021232547f9991ae98477e40340f21539221c4ca68b81ddaaa533a3e75bf18840faa0 SHA512 34f92b8a66b2d9461902ff1a3adc18562937d0889b893ea74b963f35d0da24fe0c2494c9d635c60dc6c1fd4158dbfd28f8a4296a8d0d24911c67d5c0409e07fd
 DIST microsoft.visualstudio.threading.analyzers.17.6.40.nupkg 481311 BLAKE2B 739e3903c08d57ffe214715c8e1dedba8cb7a8f226d36837f6a7ea16cd623f372d0a1365a6100b6f660a133a21396314899dc5e16d3935e2e1b25cebeb14c887 SHA512 04f0e018feeaf4d8d925820c6cde2436510200f38332283bbfcb585abcd6d9595f5d6a543f75da751366aeb7507a6ad12006afd5b27f6b82336f82a0d9714926
 DIST microsoft.visualstudio.validation.17.6.11.nupkg 329244 BLAKE2B c9f844f2ac036ab8bd3756cc06f374e15b529d00744dcbd78051a39a4c0876436caa67ea9f93308cb1cfdc806bb5be3c361909f515d837926d94df549ded2e46 SHA512 4e25ceca6eac1d8b6f311e5872f61dff6cb15b4dbc338cfc1e8076e6c7c949138d13627a111e246a2559d38001da785844a81174af63e7bee82b142243e82415
+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 microsoft.win32.systemevents.7.0.0.nupkg 174438 BLAKE2B 88fc0929dc13c34f563e6b1b30f2a21973751ef61071fc46ea83587519bf58d4978852469bd85f51a1dae3ff62ab837b34fc7accf6eb8fbe347b5912b6c2c1aa SHA512 18ee925b1ff0499205bf13a7ebb63a3a2206773f491828390910c36d2000bc10d079915bc9bbbdb043946fdc3fbd4950bfe0365da91315983d520d70fad81b59
 DIST mono.cecil.0.11.4.nupkg 692728 BLAKE2B 092512697bd512ffc3e79d66728526f86e2f4ceb58762b7d311d228de23e00eabede2d9b9f91e5e6406eb7592193c471365871b54f2dfe0a4707feb4da84a848 SHA512 0a78f050c9851e749c346f1eff80d1650417ebb1f96a37a4443b9d999e85cb58c22e1c87d638f36d008e1058412dad8d8cf590a4c17e447741258f1aec682694
+DIST mono.cecil.0.11.5.nupkg 702442 BLAKE2B b7f0914eb81bbb39462f2c6304807ba06ad3ba074026a2dd2a79c6803a9ca3eaf7605dd7e8552f285e97ad308617dd7c1660bd86c92c15c78b6824234158a42c SHA512 a03f273cdbf9da73b119a9381519a5e12c2fc96aa89c39da88fc1d6afe6d326e959e2ab7703f6668215db170989b9dbcad4036ebc5fb7470ee5964c0739e0caa
 DIST nerdbank.streams.2.10.66.nupkg 291984 BLAKE2B 20d0f4684814a92fa28fd27e95cca72ba6d8edbf5f5058539b3c54e088ff6da65faffdc04addf8deb473a8075ecbf3b0d5c4425b9da433a9c95ad66dcd31a654 SHA512 3cf62c572006c6a2d5a9d94dde33748906a6a646c239127b1093cc7e7c4a0495575f210b1d66810f093a4fca3b7b21b056586bc3f26e7181a1b7e4bb21e40dcd
+DIST nerdbank.streams.2.11.74.nupkg 426815 BLAKE2B d2cc625db6b03e3202297f9623be3c7378e74004fc47bb906f1f91df203af12924f348e37efc0a78ed2dbf7fa882b0da2c292b372ef9b2a68a78790b9214f413 SHA512 d5c4ef4db235ae59ec4a310c531b36672c8ae13b73559f79f0fcf6bd34fd8aab94daf9a40047406990908cbbd32401696b65d8df1b1e0f1278b0e5d9b9af2f29
 DIST netstandard.library.2.0.3.nupkg 3146139 BLAKE2B 311e5367398f76c74e78930bc2cd39e450a86bd8626311ded8d58bd84c94a8a84db3c11b2bc10f3eeba20a9d081fe7827981f702ad746b49ae3108c949ba1022 SHA512 e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601
 DIST newtonsoft.json.13.0.2.nupkg 2441714 BLAKE2B 5ae198b912e6440a2ba2ed537b463b6f9403c911cddc564382d4aa8e3d2317bfc28b913c986a0828a30ddba51635561d4cc080bd4dac28eda804aa72db06d1d5 SHA512 d743ae673bac17fdbf53c05983dba2ffdb99d7e6af8cf5fe008d57aa30b6c6ca615d672c4140eec516e529eb6ad5acf29c20b5cc059c86f98c80865652acdde1
+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.3.0.nupkg 166715 BLAKE2B cf7b768979f0d266b526b9517a579e203e1b07e32b4a2e0b1ca1e1e6de02980181b40b02829cf69e55698da9fefd69fe0aaccc08758c5cbd4f8278f03a6180b0 SHA512 d6a4790d462dc818b555f97bd29dd1bfe4d52e9d089d9930490b9e75102494bcc36ec0e2097f480c5399681ba8158115a7ccf7fbfb4006e8e5cc9c284a1dbc1e
 DIST opentelemetry.1.3.2.nupkg 169913 BLAKE2B 1ab77fa3db2b2f2a43db13d63d3bfcb6dae90e6717f6a3d09cfb0b2ac9e91a57055b803904a4b406a1d0fcb05176b87d228ed4927eff1a5212a5904624dd31a9 SHA512 ce10eb9c310b7ca42fd0539b33ff6bb1d887985e631a2a0711892d5de182f3f2cea668a3cd83d04ce0074c9e5398542afeac41a7d08b8b81361e90d6427313cc
+DIST opentelemetry.1.9.0.nupkg 603458 BLAKE2B 9aad6c2391713eb06e215ea63c1108e13f702915afb61258cefef9bc395bb0e41a93a8d6498e5a35d08c74ab15571e52fe2bfe49ce7ba8d2d740723b2bf94ab8 SHA512 cc743fce9599d59eedfb5fcaaff4b369290108be40e2560473ccf575aae0a5b55aaf4850f4fa73a4ca77a9385f8fdb01686106b5f81f23644c4d625d22029bfa
 DIST opentelemetry.api.1.3.2.nupkg 84921 BLAKE2B 877ded6362050c42be953aef0b764c97fb14ac74f4f705e7f3280d518129556c1c7cec23296504815527c3dc2c4f152c89de232f36b6e1b7491eb5c43ea036a2 SHA512 30b60db970b061c7c4269f4a397233635125d2758fb23ea89e69bc4a878e8847d0c21f2ed5d7b642072291ef9c15e88981d8ff8c8cad427060f584b503680406
+DIST opentelemetry.api.1.9.0.nupkg 169471 BLAKE2B 01a7541315a09f922f30c66194baa90c8ae5e233ca534be7fab8d0ab3da1a46c023c63c33882d2522bfdd601b6a746a78557da5ac120a9dcd2b57f3115056545 SHA512 de882979582f68e63e58771c2c2d288299ff1b46db1800315f54fa030438768a3d4529bab4e3c7cadeffa22d5c7ce153116c5106783e9f9ea95c46da50be057f
+DIST opentelemetry.api.providerbuilderextensions.1.9.0.nupkg 72961 BLAKE2B de76e86116c0745c07f031fd891fbcaf3468f102719921be1373e1bad808bfe75c1746a61beecb485fe481a9d519d8c84c633aee25278c9293d0d82b3e8fdedf SHA512 04d4fa13a7d7a80ec1b55ff993d2e8e6193f48edc38f342f675e71f1f2756f6e1c51fda80aaed72b80450e5d87a8cae84bfa2934cd24f6db3e3877594ffef14c
 DIST opentelemetry.exporter.opentelemetryprotocol.1.3.2.nupkg 468053 BLAKE2B 3529e15232b3464b5a8c9066b865818b17e7f60b0bb3709390e52e40f5f450bf9291c59bc96b794ca2a4139249847a086e954f177a38f920a34c431575e2cfac SHA512 2ef3056dd1688c844973417bf325e45bc4ee95cb1346af992fe012943ee2f3a4dabc50e1c6329e37bb99d39a2af249442114f7a917995832393ccf5fb7d06324
+DIST opentelemetry.exporter.opentelemetryprotocol.1.9.0.nupkg 824320 BLAKE2B 414627e398b1872f2f18147215d98c323ff8693f14d8cfba156444842f992ac469e3bfaa1cc9db7b6a57219229c937c1aad74c76f69acc37a044d78eb58b6345 SHA512 d41b83d70249bc57870b7da2b55954cdb7ed5c149906e943bd12a4c064fa0e133047b765861c23d52a7705e69900cd584406edbf2f1bce453d1b25c5dea215a7
 DIST opentelemetry.instrumentation.runtime.1.0.0.nupkg 47872 BLAKE2B 0572b53e172fe52e07a81e85502a0b2623e3cf77943047e8effbf0921b4a4b87550045ed29837ba01fd3aca25defda7f44c2a2902efdf70a870ab561954ed005 SHA512 1cc8dd7824e5da6b64f6e9501c0e776246c797ef9aa3cf4fa58dac71c56981bbc547b93e41888f512e9f6d65752cba1c001444f3f6725261f27b66f76677b907
+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 perfolizer.0.2.1.nupkg 51987 BLAKE2B 2e01e7673ae420136e6194d89c406fca31af85b7f90b460a53ebbe0fef82c38ba3be3821d9e1a7b9b2bf5d117bb9f2f4f91767796bffb51ac14e5cb9f472d873 SHA512 9db50cdcf13a85737c275a0aa3dc4a98b97e7d23e7aca1c9b27df28e454b0d4587315bd62f7181dc03e0257a83d79c7af2e90733eafda70afe5a956c92c20a9a
+DIST perfolizer.0.3.17.nupkg 194402 BLAKE2B cce0ab2c908ceca70336319dc20629c694855a9b834b06cc0669fc75dff4817f90514e6a7c39346ca2e732b4f92a4aff64a199c57dd7a1edef1ab9640cb868a5 SHA512 c66ef81a4cedbee659ee54fec138b4af50c1b53171195773d39c0a3f0cbb48afe415e8577e271d7be76262bebe530ad907e8d2e20a6e3e97176ed5b5e034bd86
 DIST runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 44424 BLAKE2B 03ee263658048f24116b9f1ba16441bc197c8868113a457aec34ef84574ae3e73557bc6b144fa1f53135ffc201cd23fc86f8d76032e77576f2a69ee7ad4320f0 SHA512 8f071552ee042f0cba39b1ba0a1205cf73de447d662995bae68f857a5946f7d154c029a79e37469081675687873c8bf2b9efe57f5cbd660c366b1ca51823f7f2
+DIST runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53676 BLAKE2B c13ea0ccf4ffe84466aaa6c4478b0825c170ef8a4a19ea11f5865c4ef41971df4a7c0b27c740bdb277893760b7f495385d3015556842b750a1ae5a75d86a6be9 SHA512 b3d00c7a56219a27eb26a1a391192aca83fb34cb9d932d2f24f758ce318aaf25988687d1130cc2e047aca989be768a0c401fbebdb82f1abb6b719a54dfa43eb0
+DIST runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53653 BLAKE2B 96d3e5271c92aa5d33e6243ace2ab2edb8cc0f00d28df3c4e6194044f7d944f87b7ea1385c09a5c8197cec7cd8c4725c336a68c9a756a28edc347aeaf467f0ff SHA512 d647127c9293834d0ac51e378ec9d88e36133e8521f9ff8e2e92f8ff217f6f32a2920c55e903e5cfbe14cabca9629af3dcd5071ce72c6b5d84efe5e9e11b539e
 DIST runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 42852 BLAKE2B 9c98b0726b226f275e29eefc0058f5f5616f9e2786596d5aa213421366e93f7c790583090ef719249ea3aef835b8724275667556fac3bb9935a46769d0e1bf2b SHA512 a135ca0f4f5a49319b5a52b7f4338f8a5fc4387edf26f29e6cbf63a3c3a37b2b5c51c9caf562ec41e470fba281060362465bc56915be782d6c75778aa6195e46
+DIST runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52088 BLAKE2B 103775579c3ef3876001567a12c7bc52cf4989daf076c0909949a39eea461fb93419fd24a079a030aa7ffdb7f00a27c41eb83c76f2448a99049ab94483bd0ebc SHA512 0cf70995788d620f25aaa08015381a2fd62ab356eb286dc7e9bd5756298b7fd458c56ef338bba3bdfdc77d396fad8116b00ba5809ffeec6874982c38154b7e21
 DIST runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 42843 BLAKE2B 22e270cc59cf6a4bbc857569499baab7ace2596db57cba867111bb46a609e1c98461e7710f964ea9a5886a9b416b6ac271e2b045ef470ed644d757135162853f SHA512 2f24e2cba88a96bb23848e1404878e4478a65642387b7b76aa4007587fe7c4d8208cbde53d3ed65f8d0d71cd688bfc16be66dc5f7bcf84c7b2ccf1b3c505b0b4
+DIST runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52102 BLAKE2B c196ffc1d1c7dd44e0af649354cb3c627957cc771eb30811a6e696abf8c41854759aad2f1d5374e28242b1e13b2a2da00218f4f83c41d73af545d211f153f797 SHA512 da9f448d94f2f0b907ff0c7a3b046e934391b952fb3f3a89ddc76f2ff498e7c129f975b40181018f2cbb925a09fe73d91985544fe352f243703d4e48095fc3c1
+DIST runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52261 BLAKE2B 855fe25fa83734d3f454043ff291802df88ba089de995bdc3f02961258fad6952ea18756ce21226583ef095359578116afe13a885a8e08a6530b84bd3bb975ac SHA512 dafe641f3119801142cfee4d260667dc39a2f6069863f9684793c9117bce274d7c5c817a06648660dc873574e67453eae74123c1a1a91e3f1c426477cf9a1e18
+DIST runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52277 BLAKE2B 5e30dfa979bbff05700922ad68739e7e28300c3f0130c94eaba699c6d90fd37221c5c529e1a01b50a223cdb6cd172db24d6b08e4865f22940006a623462d6668 SHA512 a9f074594fc75cb6214e55e90d98b4798d69d71f63970c4395515c5ab8fdbbeda01447ac50abb1f48a11f5bcd02cf3e3fff0747525a894a1205bfd57ef455608
+DIST runtime.native.System.Security.Cryptography.Apple.4.3.1.nupkg 16967 BLAKE2B 38ee005ed39d8cd844015a6188a201ab1ef549de0bafaf9288ab4b1b1c4f61e5c53c5a1605dab04a5d4b6c8789e15185a0db73916ba7cc5ad69e43082bb376db SHA512 0be0195264011605d1fcdc45f34ab44b2ed2818896f82dc2708b80ef27747f515758dd7ac612114a65cdf76214486c7f79b18ddd799a7ae55466977e36e63f8d
 DIST runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 17049 BLAKE2B 4440283e2844f2e900eee3505cb6ae038288117a452ea41b3fb4b2f6bccd3649749d655436bb6a87f4fad0880a9960630f016f6ffae68ea162e4cc5e4db15401 SHA512 a34ad2dbe67efcae97fcbea57af386b30660a98ab8229a56c0dca241316e673cf7a26e19c6efb6b7117cc271fdf208741ba6f8447ae254c91acba3ddb7d2923a
+DIST runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 26290 BLAKE2B 087c925cc82c2bfcbea84ed2e65d0a157c48ab90d44f628428c7dbded45a0468278a21159864a49629c16f9dfc6e6d643739b7994d9993348ec9995d2e11553e SHA512 0a24bde2b10af835902496c5a8e73e49ba126507acc204626a8e503198c78e18513e2d8d91ac1967497df62f3e786353568e9fe1c61339756636bd017894e261
 DIST runtime.native.system.4.3.0.nupkg 16854 BLAKE2B be46e3bd8781915572308ed7d4d8a0338a5c79b901a27c7e7c7fb7fb25788cf00968a40f96cc43b1202e56e5bbb2f87602d247295d8c98f2c143a0ad3a8d7664 SHA512 299c5a96fffdcaf1972e3e3d1c727837d18ac9e88cb79c09914f12ff1de7280dff10c9232a49a1c1d3ba7785a5cf76f28c9dce414f0a2a567688de7fd5331dc8
+DIST runtime.native.system.4.3.1.nupkg 29727 BLAKE2B 015b67eecfbfcd8e6265725761e1ad2fbbb55644a65640669709fe0a427071e212261c63ecae869fb528a0ad55a65b3cfdecd3812b97fe07d8e75f567a5ff7c1 SHA512 009b0dd062cf8a362d98565dbcf6277d374031396f32db6eb23c9ee990b511d8395d49de36fd41087cd77ccd125a9a9ff86b7fdf55ad8626c03c0a2b70de05d6
 DIST runtime.native.system.net.http.4.3.0.nupkg 16894 BLAKE2B c803da4a0e31f509b83e061c0dde9b990188418ee29efe9bb0b7f5873fb2b14990560b4191d78ad16e9ecd53ec701a4fdbec3ff66b88c3e49b5f41b57ae11df1 SHA512 ddd1e5b67545477f7c72b5883666de40e89efb0836d91e7a349e2f3d4ac05ce1125e6add3cb09c39cbdfe7ab7c5dc8fdaeaf6ac25acd92f6de3d8ce2d6db7918
+DIST runtime.native.system.net.http.4.3.1.nupkg 29770 BLAKE2B d820e0fa0bc74e77e02e1c0a19e5a936ea920ba48cf3ba863c22c99f5fb435b6ea868d64a5b4c29ffab5a09eaf1615cb90b6c3a2a8b1b677daa0c191505fab5b SHA512 9f77250630afe271280e5fe1578fc36308bfca846b15993d4e97b44de9cb8884cb1efb628cef8e49887057b26600272c6652c528c6985be3f9c8ddec2bfc54d1
 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.2.nupkg 17049 BLAKE2B 4440283e2844f2e900eee3505cb6ae038288117a452ea41b3fb4b2f6bccd3649749d655436bb6a87f4fad0880a9960630f016f6ffae68ea162e4cc5e4db15401 SHA512 a34ad2dbe67efcae97fcbea57af386b30660a98ab8229a56c0dca241316e673cf7a26e19c6efb6b7117cc271fdf208741ba6f8447ae254c91acba3ddb7d2923a
 DIST runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 44199 BLAKE2B 475710c40d856c6ea97201e800a3d8f418a7489043bb48b42c79f4e63fbf390630c0b2379f45f0e183f98bd2f3963c93b1efebd4650c2e1f2f08002788f0a8e1 SHA512 ce0873e07000df98e640bd265e969d4a9236535cee2699c5363f3ab297557b0d756260557995f2ee163cff05fc2ba922d66ba0e4cb28521f841e7d546ab3b63e
+DIST runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53445 BLAKE2B b537de9005b50641746cf1cd4a8af2a4e2776e7fed0bca824dc2ee34ccdf7d9852d873f9acf5c6d54d9aab5a6b9a6d1256d1502abb3a5a43c7ede42fbf2596c0 SHA512 91bbccc1fe624b4a0ceea8873f2dec1c00d06b69dca855d5cfb6d028288f29c9cdbb93530f3e1c3bf364e20cb9e2262353449299aff3d887d82293c656c76264
 DIST runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 44143 BLAKE2B a46295bfc89c96c9fb28650d64b2ffaa1bb10c005227c2982da898955e85b04e8f344813c2b37edd6ae855bd24de3ae8dd39dfca6523fcce1f9b2dae9cd4ba14 SHA512 bf754c1a66cd70dc1bd38d54fe675e9dd470417ebba62e2f79e278be8f06cc3496ff58ed90d30b5dd4d3efea9accbd09eb17cd87be882951c0fdfb833c371f70
+DIST runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53391 BLAKE2B 8ccd2f9b947d35b278c8d24040bad7e981f90e4763dc38910b89ab45c6bc73ecfc3817598f45f304ead87d806e62d120cea638233c356cdc5a350cd5ab0e6329 SHA512 6a73124bf9df4d4bd3baf504de383eb12131ec95202e47984bb4fd75b6fc644e365d859d68b263465a77a80ff2632a1ec09b9527a64f788f30f50ae52a0552a3
+DIST runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 53452 BLAKE2B 7651f4b7254aaae45f8ed21d1a710eceee4ba196edbe4eced73f89899221a26b1db7766345529ed4ea25d4f25706f07174aac2c0c94ee7d2d88e8999f7e01a64 SHA512 287433b03ea24e70f7469afe39d85ed0823d2ccc1326420e30a7a41b3073e5342535b129b9cd0bc10c4cb821381599f371e7d1630de40dde57caef8014d0fc15
 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.Apple.4.3.1.nupkg 19584 BLAKE2B 2ca109b6ee344f2c10cb5353d41d4e19c74e46d699146168b44f381032a7f128664b6929683b2e85ebda4867df001bd97c4cafe6dc1741fddb442abc8dd306c3 SHA512 61578fe9771c6c97a7d64dec8df9ed8ea592faf01c56ddfb556dde06e66f8c7ed9953990cf7b7a9fc80b361df8d8878348133ed3a48f62d06a3f5ae80252290c
 DIST runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 37725 BLAKE2B d777e672cf2cca1b8df607fb9e38a1349f99d68c2ac4cc553db4ef98cf00d637182da19842acf774cce1e1ae78d52a5bdfd1b21f79ea59294344600fc2d4d5fd SHA512 0a38f25e8773b58155b5d3f94f849b93353d0809da56228b8ebab5c976e6458ca50eb5a38acca4c8940678e6e9521fb57ae487337f7cbf2ea7893ae9e3f43935
+DIST runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 47013 BLAKE2B f19207491d9c9704fb9bdcfab46152f7e2236208e98e9c155c57117e0a746d4bfadd15827f420a40c1224d076d7a3086166125f4019e76deffe329d5323f68ec SHA512 2811d3e115820b7925c98cc758bc1e5d200f4733cbbb315d7e2c67ce88c0fad35413a907a7200186d6e04e2c21187c80dfe4e5c8b3a7d6f8b0d4d0681bb64ec5
 DIST runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 42676 BLAKE2B 92c345d649195d7ebf1ae645fd122b77ceb423f391dc631f142c7e1890f6b1fe63fa896f6842dae5aa1ea33994d3fc9a7f44f52954f0f50ea682988373ba071f SHA512 2ae9db4b719b31fa7e40c60f52c70038fc8668e029cf4e1d120fde8c295631d6b08207d7018a22937b79546016c560c894e27dd6ebc01d5e0f677567e6b2c4f2
+DIST runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 51921 BLAKE2B c776156549fc95658f97254e54a83280e04051deafa17cb8610487b919675306f00190726db86e4f69c4f0923e1bed947b7c69e2eee6e507458752b429bb1475 SHA512 2e6c37e1c85a0f58c33ab9a2125da321756809f6214c5316416b42e3b44344b298a702ce8ce9126ba1362cce4adbc50da6448e66ee7bf4eb3fb7e799fb00213b
 DIST runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 43121 BLAKE2B 5b079a85f032b9933cb9033acd4531f49b862c9aa4a35ff260141c228068e62dacdaae59f95e309e4ea2278da046ad82b0b88be37420849d67bbd2325def7e00 SHA512 cd4b7ba744de80086521ab67cad2db3085d488388d3d9cb83d9946389f0f4c784539bf3a4ffb8d4f3347c5c7813aadef95b355fd2563e30c948a883c27b95287
+DIST runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52395 BLAKE2B 49c17fe1e364e6cc0b39a3229b8bb65f764431c88a3df3cdd6fd64cf2bf9a5b6c644c9308a63570d89435faf563c4e30fc0802c12fe00762cac4a2799bba63a5 SHA512 2ba28b28dd480a93aabd51b60ee6feb97de06ff32aaa24b575e559a6e8f8e8cef26bdada9eb1b315854832c40523c7fbbe173eb1fd20c93b4dd1eb3db4de239b
 DIST runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 42947 BLAKE2B 12495fa67415ebb0ff203ce50c3a3bc63bb6adf53a55a72d73d80eec8607533a69036cc3286dd8e52a645bea6519655b31855c473dac70a08fd228f0a3381df0 SHA512 d7fc28a9f600e471edce0989c01c485d4e2a7e99551f531413afa75039a4004d4e2c27e88976d65432635a321d86316a3c6cdaebc7b2fefa42141b64f4f10d66
+DIST runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.3.nupkg 52190 BLAKE2B a449332e3f1ff5d6985e2bd47932a506c8d6e8ca607e6ce34e5f940beb37f5f3eacbefdca78f67f80c12419dfc695d41f08be130194993fe74b5bf3c4995ceec SHA512 2178991fe38be253fc7512a279e6c00c58163e0caafef6cc6d8a970b3f4485f694e02711975ca06f7a66a4d5a1549b15115ddf45bded11a105a309a46f9e9609
 DIST runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl.4.3.2.nupkg 42971 BLAKE2B 876fa77151634597a78a5e31771f370fe0632fc3d2cd5d5e5eaa216ace436483e7cb04beb8c101340b63899efd40e3e5fa649b4cf208656d9064adf61e3993ea SHA512 5fe0e6a878eff59cfe24a8d57af51140576d8e0fec4988e4892c233c47b3a3eed27dec072a6c0d55dd615777cd9ce3fe545c5353b4a95289376ad0b9408ed4be
+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.2.11.0.nupkg 593145 BLAKE2B 4c73e2e2cd0b52f0cbbc32a8eaceea71034cd5af34bc3f7097c0e3b8aad3e525544064b24c752d8b99ebda4d7177a68fbaeb0d48c09c39d911a37fcca1ccc89d SHA512 74008585f37a8d291ea38abff88c223a74d404e44d7a9d91eac253de0a5914e2dd084b30970333533801b267b8f4cf5f00a24ca61c0e232cc15ecdab68162484
+DIST serilog.4.0.1.nupkg 532585 BLAKE2B 742ed64df6d64df336bcc60312bb0539dcbe397689a26a644b7644064e78809673f9288c982514afbe69763796759991275626025e577e4982e419c7ab4ae302 SHA512 c1f2b058790256af7458f327082b774368197255a9e6f05dbe87008956d082d5f32ca5cff19e39f6f1e21aceda1b49425df4f1d011486165e3788da922ac2c9c
 DIST serilog.sinks.async.1.5.0.nupkg 54510 BLAKE2B a69fbd38a7f3d718ac337caf1755db414edfa953982270bd9588291651f03ba25b9d02bb5773803e78d6f5d1aaa1c83fff3b1839d89548ed715bb94f8bd30be0 SHA512 567425afcf810299105a4f472b7ed9f02f873b8a5a5d2a751a8780f8ca7516cf354b7c27fe2a02b86ddebcd39095b0b7833faea7911dee6d5aead64122679a73
+DIST serilog.sinks.async.2.0.0.nupkg 69897 BLAKE2B a56650106418f6e1b34ac9636d76f0b4d0ac4023f1b5519dc449646f287d93742e876a3484be6323c932c6f3943ccb3dabd9961ff6121c5fd7eca59143bfe85a SHA512 0ae4823f9363de874bc5725fa9abb2008cc18429d07caf6ba7fdd83b01d64d845e20a823e9e663ff176f18035bb3dfc4c87293c774adcfdd606b3f910d33fd17
 DIST serilog.sinks.console.4.0.1.nupkg 103972 BLAKE2B 5a017756c31da3cd3f64ba1cb0091f2e363bebd300284a6bf48989be4cc63d5988f0bf337d224407ff1ab214d0c4b505b67003909edb957f874f79e04f11a61d SHA512 fe74a57683bf12e8126e8158526445f2f110ff24a83b06f516e587e2e0f1db0f917259a8bd1420a917c943106820296e063ee7e3ea7517b5d0e355358e9c8134
+DIST serilog.sinks.console.6.0.0.nupkg 138337 BLAKE2B 2cb29f761056154a7cda20eba369ce04ef0537fc87abff1eb92eff037eab5777f79c5e3d915984669ca2c249e88e711c411770e87c26de8db608dbb71e19df69 SHA512 49c6a20f42a9b46d8cccd76d287e92210aeb967d8f8daf93be82561fa050d91f927d0bb5ea81a147caa899b9abf47b616e5d74a8cfcffeadc1545da0b73a979c
 DIST serilog.sinks.file.5.0.0.nupkg 170448 BLAKE2B a2c58b4b2c43ee9c13e43bd341c4a352214f870d2c6cc6f3fa71138aa8b07f8cafbdf0184a3522d0333480b0ae252d5124e1e3fd5dc26df89474cf9e2a147dda SHA512 e0139b1c37bbc6e8dcf4b44f696fae1212c7793a69d599d3a555f69d2ceaa92f2417a0d4d2845d80ea8be494d4fd994841b916b197f8dc597afb6a6d91528356
+DIST serilog.sinks.file.6.0.0.nupkg 133748 BLAKE2B 0a2bf6a4f779fa06be6144114e34cd8c8b28715a06ebc6a52114ffb15ca8e2cd1d8d557d383f7df64f6feec65dd14d2496a17f2c3d43935dae2ba3191cc68ee6 SHA512 90daa5403374597318b8973f4a7725dd14d44425a75793c82baa4143aeb3b4aeb8423636edd2b3b82a9df367d4e42339e73baaf62d42c87e7d4a958fa4394609
 DIST spectre.console.0.46.0.nupkg 1132321 BLAKE2B 5b0c0620e6adea69ef2b678dc8015d54f07b06f02cd3a9b6b5f475069886067b6784892c82dc4cdf7fbfb237d6622944269e8c248a09eb2cf5328023b701ed2b SHA512 e02bd9917d0c8c16657f51a0b945833ab0ebe0b6c69d4c272dae1e0970a507eb827ccc51ec2c3e54b76d98fad8837a6168977c3da3c8fc9ea57d93f5511699cc
 DIST streamjsonrpc.2.16.36.nupkg 879658 BLAKE2B 9f9a91d6852518df215efa93c41188fbc5e007677e0a80a93f6887cf2a3606f3fb69832c353a2fdbd9ddc0c7e65752e9289324002c0ce7ca9dba4aca857e6262 SHA512 f64b6dffb583deda5a3b904ec015f49b53b0a1d76b4c1ee7d31772217e88f237d3ca0ce377dc4163bf0d23b9efb07838a6585a30a3541b17dc61ad27ba4005f2
+DIST streamjsonrpc.2.19.27.nupkg 1642404 BLAKE2B 56a6a4a44abc39a1aaab1206da469528ae746d31c695acf59a3a3a83f9731455a08f1a35a698ae2c61981f732570db19ac73fdc5bbf4bd1e818ad0a56eab6ec1 SHA512 8798c9be81006e710e79cf33ba0931da9fcbc017da3274278c75f0e88403b68052c2180769e5b978436bfa9d107e526d71c08c71a925393fb47360d811c4b926
 DIST system.buffers.4.5.1.nupkg 93737 BLAKE2B e846885f9ace79f30bf7698a96ff3277a45fc2988a48cddba1862e23650ce55b06dcc6c1bcc29e08cf5380c9700dfcc15964f7263aeb11c737306d27963b34da SHA512 80da6158e55b9bcf7e0b5e6379b9cf45a632914f037b53c5bf5609576e3cd7821f7861956b73d74470d2d0c2e56dd235a5ef4ca6ffe7e192b820dc2d023aaff2
 DIST system.codedom.6.0.0.nupkg 197501 BLAKE2B bd626f958d3c36129ec319e69b0c057736d94027e2440aa87fcef5aa5d0767d7a52bb8ace5b93fe6af263c1b09238670dc16c9f5a1c1b7e9cc0e6d343d520324 SHA512 2b911b7c9bc524c86562a26547dfc92a8c774ed5937993a4a22e8a9ca1b146151aeaeaf15e4271ff6fe6cf20af634815aa1485a5a4c48d24acf39b2a6bc3cf27
+DIST system.codedom.8.0.0.nupkg 510041 BLAKE2B b2a564366ec48d84e9622ba0a3d10d9f3c52bdfbdc2884509b2bcda06bdc8018f22b9422f61b59f495d4c09da70d194c7ce0ceac8a80c084a5a460bdd969d305 SHA512 b86322c231f30477fb09f67314b0e4a03fd0efb6b5e242a68b6870ab0da5d8cb2d8c5a9f05740f317f37dbfd8d471d2afd1864d400d4105c2b331761c75d7593
 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.6.0.0.nupkg 393026 BLAKE2B 8927f74dff3a8a958c5ba3c25998ac19103c4352c888aaed1a70e1b2606f9eb1087297fb0719d7759be5f477a9edff5f0ca7a9c13f0dbded75e76bef57706759 SHA512 f8036412e384c5c5af6d28f4eab2543207d2ebbb16c47b70f6c471bc5aa4b9f44404c47d776d295191f20a89caa898abd73a2304dcaf77979174ced2d9160169
 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.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.6.0.0.nupkg 36690 BLAKE2B ba1d55411694042c17c2b7dc3ade61073ea3044dab06da1597681791df7008297e9e023b9837c01c4131b7976d3c4361717192d3cde2c9a40a4a4effa37fe41e SHA512 48618297e7fcf02b05bce032bcde1882be780e0e6d156b8312855f2a2d080ff590fd7bcc7a296ebddec9d82f654d9286e42b424ce07b112a449be2bfb29bcb8c
+DIST system.composition.8.0.0.nupkg 47465 BLAKE2B 0995116ccbeb4c01ad0383f5e18443a36c9100a702408cded3d60c5837b662f04db3e7e732ffd3bdb84936353a22a3bc7cba57c9db36eb43968c94d0f9e70a38 SHA512 fc067f4beb17e9ac2249e4af3afefdf7b6a2c1b53a1c270e0490cb79c7584098c3a3ee27602ad6c16290408677f1567a04b875a4399c6053d9a1c908ba844863
 DIST system.composition.attributedmodel.6.0.0.nupkg 74280 BLAKE2B beb53a472cef7b65e55874ae643c2218ac4d8e630a3dc0c4c870abfaed1206fb6af90c9c23ef660a9571cfe47a05b58a3d206a3194adb6366b16fd4d621f438a SHA512 a53c30b3cfeb4fc67741e85305707b324481a6ac394fb1af71acda01309c090557424a4352135effe0dc37c2953634441994328d89c22532d8fdf8eb7f717405
+DIST system.composition.attributedmodel.8.0.0.nupkg 116337 BLAKE2B bd6b10dad7dee4f7db32922fe3ea79a7795e08d3758414c743fb12c6df97528b167689c7e80a270d054f25b058110b5fed0d0f73eadc476a675347cec4419445 SHA512 826130a705f3f8238fb6e00048afa2721020f3ed2840068f395e7d83a7c3767b752966ebca6762c409f4e9b35b91d09419c0576fc457e64efd72a8341ea96fd6
 DIST system.composition.convention.6.0.0.nupkg 118447 BLAKE2B 1ddc449a1ad2d938be813ce3d15ed438624efa5c84075acccfc5c71d636692350c0c34ab1f2fc7f2f2cbeb5d3cc046b2a375b96e8b6cbd054edf3a78132bd321 SHA512 f4dd753fa196325d1a5e9a06874e88d9651f812f48b013608efe322e079ba194bdf4587603bcd71a86e33f53103c48b1dc8f1776842d5dfb4afbd7e8b4e9dd02
+DIST system.composition.convention.8.0.0.nupkg 189393 BLAKE2B 75921181fb3515162d5e52846be9d21cc4f395ec4ca2d27daf79c735426896c0b5a9acea6daede8a8e665164c12d817442787692f838bb604df9e7f46d13aa4e SHA512 30feea31a75019470c384c8638de5d9b2f53f8e5ee6ef231d389051ef4d53df67ff7e9ecf1daa6153a31a05ec80f32554969ad3901c350fd9f2f5c7c17ab254c
 DIST system.composition.hosting.6.0.0.nupkg 131638 BLAKE2B b147e5d07c36e35309594f38cb58fea6058a9dab194909b97165d346c12ef07083b438b4935d4a09400bbd7328dcefd0aa3841e6870bb62391dffcd4f66cbf72 SHA512 5a5a331c91f12b6cb63c5dfbea1095980a0a0bfa5d9e336c7316245706f6bedafd76a0b6880ca2c79415f31840c231730285b9bcc3b9474659a28ac9fdabd03b
+DIST system.composition.hosting.8.0.0.nupkg 203349 BLAKE2B 9db0c048bbda215d2c34b0d9d85303b0a0e43117f57f841510c59819b98ffdffb2703bd60496fe7afdbeba42172fffd791c842c6e33f32230ab967e79f04f07a SHA512 1caea658ddfc4cb5e8d2340ecd1eaca3c707d49f3fe8ccc27d2b104b5e5b59b14460a7a89ca44064ac930b613dda8fb007528292870da4ecb4d62c7ad499d68d
 DIST system.composition.runtime.6.0.0.nupkg 84119 BLAKE2B 51c686c81f086256e06cc9281919a18d1d4af4497c85086de68d1ab416650749cd6ac5c07fbc612b4737e129fb889c4e6e81fb54282834153598b7d7fd44d287 SHA512 ccf6d0fa4a8bb6a170121281728e965df4d346a69c55e0ecefab6b8241959876de568462b7d5dbd290aa6e510cbf1973802466e99b59a7e95b92889052acd79f
+DIST system.composition.runtime.8.0.0.nupkg 135019 BLAKE2B 71faba970e77051648b4e0e8415f2f5caac167046c3e546ae41cdcb0945459dc84fd7b8690f68554dd231cdd74e01406974f9fa89c309f9961d56b3441a0ded1 SHA512 860180dca0c8c7d14ddd6624a4cbf2d2952a580ba5f414de866aaae3d76a3f1bb913e31b50aaa092c5395d13fc33d2e804f6456bc16a05b29e160099deb8dadb
 DIST system.composition.typedparts.6.0.0.nupkg 131026 BLAKE2B 52007400b74b617347bc8192cdcca4d8157e7865cab85b21ea581a2ed35390d9ee4df96da1579bd0b8e570154e0d794a15d567a578c4d05763dc4c5ed56fb964 SHA512 8cf43d8d159dc065c04ad9ec09a60ff431a2fe5fb3d4821c04a02a11687ede9bbc900d82f6d4d6f5d298895c664afbe0e6982b63a20059c5884bdb8c265793b7
+DIST system.composition.typedparts.8.0.0.nupkg 212884 BLAKE2B 450fb729c58fd0584cbd8432ddabd954d5007b58170de7931d4f1b9760623a4d240a038bd7ffed4d6fec8387ef4f902d2710af1e348aed4ace1dd7416c62d688 SHA512 acabb419d678258396505edbaf55bb510148fd4833593534dc21d8ead9d32d95c232d87a612003189451418acbce9c21dbe36e35c048bafedaef1f09d71b1f77
 DIST system.configuration.configurationmanager.6.0.0.nupkg 447998 BLAKE2B 477de26b3619349fe0a42aabe463e3676c112b64af24d755664baf8d8d3d7d80ad3ef0182fcaee91d83a7a3eef38f9fb25171f30572ad39ead5e93081849d927 SHA512 de58cb928d6303a16301fd7aa8edac379dfe6c47e6d80b21665f92bab9dd5ff52b3e244cf6df0f945f1c72e71c92337561dbf2752fc3324174a8c9ecc70c3247
+DIST system.configuration.configurationmanager.8.0.0.nupkg 977652 BLAKE2B 375325623d3d6c8b4579f8613b33dd506f0485211bb98f4fed25f3851f520689ab22a45f3d0a15f6dd6f697ea5e3446839efc8c300469f5e154d251702bb25f9 SHA512 58b9fb5b134c1acf3ea5ba288c7a6277c08988d85caf68fb900d20988f1f814e4b174246286a8785248773c596d21efbb2f4124b6f4a3be86bfb129eb92d89f4
 DIST system.diagnostics.debug.4.3.0.nupkg 149774 BLAKE2B bdb6d5ee3b8ca4f28b241b098281b7d2957d0996f9345aa086a54b1a981822962e5cc319687849ee52445db47b439b6cd4e99a4c71595f6227f78160aa31724b SHA512 6c58fe1e3618e7f87684c1cea7efc7d3b19bd7df8d2535f9e27b62c52f441f11b67b21225d6bcd62f409e02c2a16231c4db19be33b8fab5b9b0a5c8660ddab24
 DIST system.diagnostics.diagnosticsource.7.0.0.nupkg 397186 BLAKE2B 686c2659094af61861182b51bdb1dda92f7573dd464842acbd113e3b26e5bedbc3a0f5538ff88ed3b45a2d67134c4ad68c22f5fb988f1f7544e480493bd8ac4e SHA512 7b711a54e1018066962c8a5d6ea0c1a6d22de56d02db5f262171ad333b4028b5fa5954af4066e40b74a9ac5931aac722de4a6ab997249d0b65697c088f9b6df8
 DIST system.diagnostics.diagnosticsource.7.0.2.nupkg 398733 BLAKE2B 8e551d460454942d575c72583a009ee607ba9749ac7575d8bb11e34a767235812d112b84e8eb4b4542ae66f351b0e2a31e4d953417b182142fdbd5a130577520 SHA512 1d346c423dc811aaa04f31436b48711659f7f0c87599758f842c10c3beb2779c40b028b9d4718c75eda7f9d9e40f341c05f267f863aa9357237b5edd95e3c2a8
+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.tracing.4.3.0.nupkg 581864 BLAKE2B e09e616dff7879932b358746a62b530499aa61726c4490c56d2d7a0bf888db5b42d75d89cc5befc9fdb6af231beff998b6b243c2b2a08084da089709e0c82a75 SHA512 d0a5d30e261cd45b7dfab02b7ffbd76b64e0c9b892ed826ea61481c983c0208b05b69981cd79e91cd4e5811e1cd4c3cea06a1afce05811ece58be5e4c20169ea
 DIST system.drawing.common.7.0.0.nupkg 772327 BLAKE2B 341e40f2b8b066dc8c38de95202450d78dc09d4c999ad97fc71af423bf2aa1a891df696012d1114b3e78cddc65c27af1984897a652d3cf2c9b13efbe37154a9c SHA512 d1325de54dba8110e019afeba800601c2e4e0408b297b326de92333e029fa663d7150f021555b21a2fb89a411a08aef5e5588e043914da90b69c088fba72f0ed
 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
@@ -182,11 +313,14 @@ DIST system.io.4.3.0.nupkg 703652 BLAKE2B b5b2627ace4cc49f35a0caf5c064c4c8262ff0
 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.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.3.0.nupkg 512550 BLAKE2B cc6cbb532575bfcfde7ac897970dcd49067186547108f46449f9f819e7910ad32496df3663d4db8eff48224b8ee95b27f7bb442bb477ad47f44da2f6fa893078 SHA512 eacc7fe1ec526f405f5ba0e671f616d0e5be9c1828d543a9e2f8c65df4099d6b2ea4a9fa2cdae4f34b170dc37142f60e267e137ca39f350281ed70d2dc620458
 DIST system.management.6.0.0.nupkg 465875 BLAKE2B d749ac6518305cf4f8cf73c543f2f52ddc7505a94c8d498733b03560396176166ec221dab4f874003f96a1e0a5104fa2483c1cf98a06fa7944e5f767cc7d9405 SHA512 d98847c56d026a1cb6bac6b2dfb34aa9976b86754217eb80063cda76c391dee54a0f1accf19e1a76dedb7e1c63f815bcbb6c81380a76f8bd4c58680773601a43
+DIST system.management.8.0.0.nupkg 791455 BLAKE2B 6490ed07f522d23340857ecf6eecf46ee60158bc443ee66e20585c3d22f20aff95dda0ed43fbb916e2691591fa1fc4314cb4306ba1af2196f951f3664ffb1ed0 SHA512 a0491f0b442496e4274e6c18da87c8e31f471f4af908b45fd000fb9b58e1760c49b4232b0df9f0ce9e569fea2de968f0b2cc54cf7c53d6e67b46156fb100e9df
 DIST system.memory.4.5.5.nupkg 208978 BLAKE2B 487049b1ffd622868d4aa84cc14f13127641c56937826c11d83851b7032ea248ccf8555f48aca93acc4891ac99ce2178ede50bf13ccbd70ba6004226fb583275 SHA512 e8c8e536c97b94ac3443c940b30dad43cf6e97dc7a8c3d989371048fe74e168606384f5e0143bdc0d86f7783bf9fdee8417964cb3a8a5d752713e90b125172dc
 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.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.private.uri.4.3.0.nupkg 16869 BLAKE2B 7a407e16b35e4a5f405029e80749f7ae1c907707d9f72657016667ccf1255463011497b09b7d9e23fb3ccfd4de508dea48b33b13267775619f63134897e54c61 SHA512 5989a57ef273b689a663e961a0fe09d9b1d88438e5478358efc4b165de3b2674fa9579c301ce12d2d2fa5f33295f2acb42eceea2ebebf70c733da6364ceaf94d
 DIST system.reactive.5.0.0.nupkg 3929643 BLAKE2B a0804fbdbaa1db017fb93e3b283403c9f22dde1fd94f1ef680ccb35b2b355c41ce1344850055318fc342be022b019ce2bf1e3bd1ccd82f1c513df755c0aad9e9 SHA512 23156e017b081b88aba7d9462438e09024003c61874e9798d389841a0f215cab63bdc69ab25d0ad3f1bf75d65d76771810f9d0184c338fd96c0b5c1e21df9590
@@ -195,8 +329,12 @@ DIST system.reflection.emit.4.7.0.nupkg 406832 BLAKE2B 7c523b9105ba23b7ae5cebe46
 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.7.0.0.nupkg 1029794 BLAKE2B c4eb7069819ae7d6ee8fcf156fcf5fbb5d57022eb2c8e4677f1e64508c69853410da7985a08c936c38eb43201bf5cdcaa8c3c091531238ae78f4037b286b60a8 SHA512 2d93c8ba1a78ceb90d25b7a3b82ae7c7f2452ad29f49ee8e1c60b2bcda19f8f6edf68689d42a586aef5faf9f1049fe5e8095ec9a4ab48a2cd2a950a8b7ec2c85
+DIST system.reflection.metadata.8.0.0.nupkg 1307788 BLAKE2B 45e8712d7cb14ce712722aa4871c6ee6a346ff05f7269f96858a47fb53e4e977473d47f20097f349f3ad1aae517f372006a172654df433aa7d309a4ddec172c5 SHA512 fbab0c76426379ed01ea79b702504197b710688d283e788bbef92b90586610dddfa3f84638d685770a4068ef8645395b65ee24459cc5c14ee4497416d11c89c6
+DIST system.reflection.metadataloadcontext.8.0.0.nupkg 610364 BLAKE2B ea9a83f50c6187141d856082d9b62364171c82df52dcac58c6dfc96456ab108cbf985b923f6ede3f6d8ad4d4b78652e6dc71ca15e94a1d94e9b86b38653683e9 SHA512 bdf47905f5175f2dda9a9e5a0e8393c0eb7d049f02b6995a02710a1db7936e6316d5224cad276f89355544da83074781f68d63ff6e960f5540f091857ebf2df9
 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.6.0.0.nupkg 127618 BLAKE2B dfe810c0e7c1b2c67e7edf13cef37aebd2c263260e61a7ec240fe586afa5f62caa921e45a74fd4925914ccdf5c03ef60b1dada30ab47a70a61e8df85afa79234 SHA512 6eb2df8d2af6a822916ce97d16c4994267b80a156b15a664a977501024517707f8c05234d9a32514e4d3ace7ffb89e6d934aef6766b4880ed293dba9a9ef6240
+DIST system.resources.extensions.8.0.0.nupkg 220921 BLAKE2B 38a37efba1124e20633784acadfe96d9c68b27d7ef30bfe9b0f7f619bbf983f1df4d125a0dcff9ad54dbd63b8dae9de1542b2b1c836ffafa9718278fbaaf6d02 SHA512 a02ad3031183b161e37d2e6a25d73437b0fa42ac04cb198ae3277797f33be69600bea8921f70b1c93d398857dc3ae862dbe46bb09aab712989c1099996f11651
 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
@@ -204,29 +342,43 @@ DIST system.runtime.extensions.4.3.1.nupkg 1069513 BLAKE2B 47ad5789e8c7b92bce767
 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.0.nupkg 322676 BLAKE2B 4a263e610c98360396e39dd03b61b5e652d957ec4f11086b831105d6390a8f48eae8cfc425e97114d52d81aee584b155c1dd450c297118d63be7a8085363bd83 SHA512 64a36a103b954ab4b7e8a76c0e876579bd484c308e444c2d915fb9a0fd05ad63614501ed235c544afc9b431cb8a4cf0f0715b8ed414e85958e6d68579168fb45
+DIST system.security.accesscontrol.6.0.1.nupkg 235270 BLAKE2B 8a328939b21aa92654796bf83e83753ce26f1938bbe9c9c0dcd19028647d8c5dfd3a837a941379f23f4ac6962e100d787083072d5e9ecff2e779f51b8d123c68 SHA512 e1beba70b45f8cc5ae06fdecf365f0bb5b58b9af6d7c79accfef15b5a7c7bbef65e10cf9f299418eb413aac86ffefaa0eab9d91650ce77cc398d390f0597ed42
 DIST system.security.cryptography.algorithms.4.3.0.nupkg 402204 BLAKE2B 3bed21fdd12f005b6a7eb225623e71880a37c79cfdaa770971b6563d8e7f613a64617c73deedc2c6c31fd8e908f9ac95903a1004f1376bd914431f89c9dcc8f0 SHA512 7641d70c2ba6f37bf429d5d949bda427f078098c2dcb8924fd79b23bb22c4b956ef14235422d8b1cc5720cbbcc6cfee8943d5ff87ce7abf0d54c5e8bce2aa5e2
+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.openssl.4.3.0.nupkg 71949 BLAKE2B ec1654bbd09e1244d260d1ddbefcbdeed207816a2719f3bb0f055a7a140d466f186667b1f202e0d1a3eda97f247d2c1776ad6f38f50de58960da5f0dfd2a2d08 SHA512 64530a19489730f873f8c68e6b245135ea260c02d68591880261768358d0145795132ba5ee877741822ff05dcd0c61edca27696ef99e8f9302a21cadf3b1329f
 DIST system.security.cryptography.pkcs.6.0.4.nupkg 1093766 BLAKE2B 9801c9b4355aae21c932163ae77963a97cb9cc52fee7d4e3a8bcf572032c0dbc9b9954cd2c1050c6ee353e4b1e51a6e441d350bba45ff456098b1096d12655d9 SHA512 db8bba63d2ff4b9bd7a35abaa754296000efd9de8ac6585564c5a1241ec782fa193f12e56807e717e62522bb77f127c6034b43af28fa62e599149d49290979a2
+DIST system.security.cryptography.pkcs.8.0.0.nupkg 1076987 BLAKE2B 0ec7a2080779ddfbb44bf13fdee79b3999c0a502439808ed35680f795c64c5238e2e56f611aa3720a83c493980798846efdf15afc3c7151a939546763291a683 SHA512 cd693d830f8a49762705fae6fa7505eeed7b81ec6b36624ec23d1670bc3b931241f5501a6cf4ec8fd3f03e877c408912a74ab833fe034c72a131b73ba29d8695
 DIST system.security.cryptography.primitives.4.3.0.nupkg 81382 BLAKE2B 55bcbe3143e85d24f47c72ec5e1f0ad38a1f931932b3a8a03dc00028668fc085d070dfcded55654e09328a745b208b9f15928aaff1087d8906bad41d7cfb23e0 SHA512 5ad8273f998ebb9cca2f7bd03143d3f6d57b5d560657b26d6f4e78d038010fb30c379a23a27c08730f15c9b66f4ba565a06984ec246dfc79acf1a741b0dd4347
 DIST system.security.cryptography.protecteddata.6.0.0.nupkg 126768 BLAKE2B 3ec81101da96e2395944ce93506d8f23b0f82bceb95a08b784d3d7aed619bee7aea80dcf725babf9650931018ced7e49988ceaea571cea8ea2595b2556d3f070 SHA512 489b5dab0abfadfb8bc2d0437de83a1447918071949440e766db701c81c3518de6a38a3e0f699706b06d591ab5393c7bc0b2eaa81c15bff156339248e6c35730
+DIST system.security.cryptography.protecteddata.8.0.0.nupkg 148572 BLAKE2B a27acdaa82dd87d5f0ff41f1f662f8720f1af597fcd8e8618fe72225981b5fdcdafb325177cbca966746ee8eb2cb956ad52cb04300f5870cd359b0b624001bf2 SHA512 86f71767f211f8a5f163d942f52da2cf0e7f7c6628383251dabf64412bece6ffc75009c146e61864f26b1f3693d02783449cc89bc04725bd59af01d0e7d8f7b9
 DIST system.security.cryptography.x509certificates.4.3.0.nupkg 706727 BLAKE2B 67c777394c982267c08dba232dd75aba6e924784d14388f7f8e347293c8f3a67ef9490a078b3f56f649a1ab352a4c924630f384850e3d5f1510dceae45fd0af1 SHA512 318d86ab5528e2b444ec3e4b9824c1be82bb93db513eab34b238e486f886c4d74310ed82c2110401fe5cd790e4d97f4a023a0b2d5c2e29952d3fd02e42734d00
+DIST system.security.cryptography.x509certificates.4.3.2.nupkg 362871 BLAKE2B 06217ec336ddd020cc833acd3fd08dedd03e1339141c0d36ee2bc957da1c62c95ff154ed438cc0865ea1bd3a8f88a6c9198aae50cbd20314a7a89f2068b1293f SHA512 031f1236cc3d3427b9a41132b158eb3e21a099cc3d4e850c43234eb1b28bd010063b7550f868acd9e95e27b295989e63da015d821e36c9cf54da16e85ddcbedc
 DIST system.security.cryptography.xml.6.0.1.nupkg 231247 BLAKE2B 8720dea2d6ba2d116d5455213f8faaa26667a1b2b75e993434f95b7a01c8914d9bb5861df02e7da6761f726cdb8fbfb8da294033fbad674e7b84b182d382146c SHA512 17f9e598d455c5ab883398f83affd8dd6879a332fea70f876265ef38517c7977764ba31b1b237c9cb72dffb3d486a24642148eacd63a2893e0714c92e679deb2
+DIST system.security.cryptography.xml.8.0.1.nupkg 465318 BLAKE2B f1dfc4c3a6e54d8e6d72ffe52b46a139976226700cad4dfae88b3fb8e53982b5dbd650b59192f620675e7a66ec7947045476c2e98f487c7aac3cdf8afe8977ec SHA512 7fe9ff91bb48e42810ad5e7512357460a20f08689a090942953fe2bd83347865f3eb530b293da23eabfc0926de7b6b1f2c358451c4f344ce45aefb2562269d0c
 DIST system.security.permissions.7.0.0.nupkg 202447 BLAKE2B 51419df67046cb1c2a42e1074cb531d1eec2b23ac48364d31d7a7db22a981263e4d7bc74ab9fe3435caf4030ac4b1c7bd41e944bfde50fa0a8fc958cbea8ada4 SHA512 5cd553990f49b824704574530e838713312dd30990791b9d1fd95384fd25dce0636b83f78e6447abfd07d0df4db35383ea03662a98cb74e787090117bf8895ac
 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.6.0.0.nupkg 4242377 BLAKE2B 253acdb943a224224bee2213f7b46e926d78900a569e490593a5e1157f228beef70674a5aa07a78e103c4e6d7c2f97a42b6339c5eb5f032a77d15102ff8cb8dc SHA512 ec873a95ec517de2c5a5364ada30974ddd5e0fafef2ad2517609a1900b5059d35757536fd073805001fa68d5b56a3d4647010a96c9eb233b1d172a3b45fbe4a9
+DIST system.text.encoding.codepages.8.0.0.nupkg 4260927 BLAKE2B a31aecd7246d821bec0b0f793c7076210132c2f9433265ec2059b8059d574a89e6167dc1154c645559ab0115e4abc43305518e0d62868640d8651009c84fec24 SHA512 77dadf6b1a73eeefb50507a6d76f5e3a20e0ae7d3f550c349265ae4e0d55f0ae4f0ef1b41be08dd810798a8e01dbba74e2caac746b5158b8e23d722523d473ed
 DIST system.text.encodings.web.7.0.0.nupkg 283808 BLAKE2B 820e51fcee43bcf8141527b245b17c9d7f5d2f1e822e93f12719047b7ce0ace3bee429db4464726ce60ffefe6746209f5320071893f83f99b81e38110a8be7c5 SHA512 d164c15df021a99d18ed0c39b6b7c0290b7f948d8f09bf07140b47bae6403f1cb9a822c1504aabd7a6094367ad9fcf8ced1ea186b0662a51815ebbb37a3b0434
+DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
 DIST system.text.json.7.0.3.nupkg 1734391 BLAKE2B acc8027653d7c58d7740983e465904e61889dcb572a9a5cf9022a81a6c2ab2dfc263307111a23456c8c0c520eb58aaed09eada4793ec51b56d1d6790f710fe14 SHA512 0ea3fecca3dd4c84f8d9afddd6d3eefb0fe1ab5e1067cfbab5ba6ebf61accab8e1a81a9bb071fb98db5afec4af3a41777c1fb23fb3d6af62236082e29df4fa55
+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.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.6.0.0.nupkg 181030 BLAKE2B 39e46b792436d972c61fe0e35d0375622488290de97ec9f7b905349faa5152d38f6104eab5f16511fc51bbe50164f42d3cd1ce073ba024e25859b19f114424be SHA512 32adff895c57ab9ef864cf89660403f041b07841be7c44a0c3c2c8451a1da076a8c1b4dcf1c993b585304ad7549afa408a0f797ad6814d0f14eb748a1fc9ce03
+DIST system.threading.channels.8.0.0.nupkg 245743 BLAKE2B 1c7af0153bc68398a9e8c4daf142e41904c952e18c575d851d12217e11d1e308ceab8e15eb29db3533556b0e14545ce2996838ab830a3528be6a3d35ce0ffae3 SHA512 335b37eb97f594e73ab36e7ce7f0135be291445167688e89bd249d135e27f592a0bd69d91e8246a1c72a578d57bed443ac7302311365c16160b7dc974eedf141
 DIST system.threading.tasks.4.3.0.nupkg 840017 BLAKE2B 1cf4a8cc833da0a38304757db3808df5c217518c817d5807bf6f35393725a31223129fd1c4c964a36a60c65b686d24fc25d1777fa12ee622bddbb0f7c1772bec SHA512 7d488ff82cb20a3b3cef6380f2dae5ea9f7baa66bf75ad711aade1e3301b25993ccf2694e33c847ea5b9bdb90ff34c46fcd8a6ba7d6f95605ba0c124ed7c5d13
 DIST system.threading.tasks.dataflow.7.0.0.nupkg 521688 BLAKE2B 509ea6148e1f10af0417b382afd232ebfd66dc2d104f82e5eaad549b92cb1310a9601d4f96780a15ca819657827a732bccd5f444ad315a850c809eeb5187b3b2 SHA512 9c1e9c5011048a63b7e6d3caf8a9a1505f23c718ac3b513ef0a537783200f7fa35e7aaae94cb3c61ea333937154581d95af827d5808323f651da06bd12b5c87e
+DIST system.threading.tasks.dataflow.8.0.1.nupkg 624009 BLAKE2B 7cd898761633b4c920d270323c4e1c5d543e5194dd49f3ed43eff39e322e96f56e51f01d0c3968f5cb4aa609b287b8af904a98d41a17e7e8b96330f735bcc3f4 SHA512 24622fd7d5e33cb55309d0dd35616aa3d6e7aa0c66e1e597c0ca6106cb26cc4248349815139c8f00a51e062506f5fa5f6cffeaa6fe8cb030c64b1d6952224ab1
 DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
 DIST system.windows.extensions.7.0.0.nupkg 133737 BLAKE2B 668b4565391a9911ae4f552a2c2e55e1bd0c8d9ee188c11c8115500b1074ec7847f918ad7c84b179528825284f20bc7e78f49901a1e9d8da37e04d81a8b52fc5 SHA512 28d9c7d065fb4ffa110333ad26379f6e8627822f9dfdb34677ade3f99205153211f11334770a6db8898d5e22aabc3efc93371601fde4777ca372287e5136246f
 DIST telplin.0.9.6.nupkg 10998854 BLAKE2B 0c263b0e2cfb397b02bc2d29d2ded13a536e5e97313f15dafd9cbf6f666bd007d056f0e4ffaead499b871b1c89c4e9a31478048c6affa7e8ba42473f277fe205 SHA512 22c286d6abe32d5ece411ecc4907446b92837a5f03618c31b87e9b77ce890484c678ca40258ad71b8aa6a6f3f517d568852ef3e4ea7032adf1695e76da5765d6
 DIST yolodev.expecto.testsdk.0.14.2.nupkg 50071 BLAKE2B 3b653924fd63ab59689355828303dac25ef1c0dcb2d9051b50e0a7790815b777779460e396dfe2b98d8ba6b501534625658ad36900a01422876f327d3041fa17 SHA512 c5631dc9958d42d4c2818ffd2ac91b1795e64771d6b2cab13354c81fcae9162b71b7ee251393ac726c644c43c07c46e388cf22d28419604beb151d6a2bd8b3a8
+DIST yolodev.expecto.testsdk.0.14.3.nupkg 50335 BLAKE2B 19215ee33440f70b055e43d38281799a0d737c5ea10a671cd005dce0fd0099d6dec33d31d6503884020d8dac7ed1313b547993b4a9dc61167c50a0bedc10e7ba SHA512 96fd564905a8ca630481f9acc437684ad0389232ef9f281cfdb1ca6a6de284b28ff8898240cec4b39556afd10b57d2c7c8ba862248637cdd1c480750cfcc8d7f
diff --git a/dev-dotnet/fsautocomplete/files/fsautocomplete-0.68.0-paket-dependencies.patch b/dev-dotnet/fsautocomplete/files/fsautocomplete-0.68.0-paket-dependencies.patch
deleted file mode 100644
index d1e8ffa95890..000000000000
--- a/dev-dotnet/fsautocomplete/files/fsautocomplete-0.68.0-paket-dependencies.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/paket.dependencies
-+++ b/paket.dependencies
-@@ -2,7 +2,7 @@ version 7.2.1
- 
- framework: netstandard2.0, netstandard2.1,  net6.0, net7.0, net8.0
- 
--source https://api.nuget.org/v3/index.json
-+source: @NUGET_PACKAGES@
- # this is the FCS nightly feed, re-enable at your own risk!
- # source: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
- #source: ./libs
-@@ -60,7 +60,7 @@ nuget System.Security.Cryptography.Pkcs 6.0.4
- 
- 
- group Build
--  source https://api.nuget.org/v3/index.json
-+  source: @NUGET_PACKAGES@
-   storage: none
- 
-   framework: net6.0, net7.0
diff --git a/dev-dotnet/fsautocomplete/files/fsautocomplete-0.71.0-net8.0-only.patch b/dev-dotnet/fsautocomplete/files/fsautocomplete-0.71.0-net8.0-only.patch
deleted file mode 100644
index 6b429feccbcc..000000000000
--- a/dev-dotnet/fsautocomplete/files/fsautocomplete-0.71.0-net8.0-only.patch
+++ /dev/null
@@ -1,395 +0,0 @@
---- a/benchmarks/benchmarks.fsproj
-+++ b/benchmarks/benchmarks.fsproj
-@@ -2,7 +2,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-+    <TargetFrameworks>net8.0</TargetFrameworks>
-   </PropertyGroup>
-   <ItemGroup>
-     <Compile Include="SourceTextBenchmarks.fs" />
---- a/build/build.fsproj
-+++ b/build/build.fsproj
-@@ -2,8 +2,8 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net7.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <IsPackable>false</IsPackable>
-   </PropertyGroup>
-   <ItemGroup>
-     <Compile Include="ScaffoldCodeFix.fsi" />
---- a/paket.dependencies
-+++ b/paket.dependencies
-@@ -1,6 +1,6 @@
- version 7.2.1
- 
--framework: netstandard2.0, netstandard2.1,  net6.0, net7.0, net8.0
-+framework: net8.0
- 
- source https://api.nuget.org/v3/index.json
- # this is the FCS nightly feed, re-enable at your own risk!
---- a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
-+++ b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
-@@ -1,8 +1,6 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFrameworks>net6.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
-+    <TargetFrameworks>net8.0</TargetFrameworks>
-     <IsPackable>false</IsPackable>
-   </PropertyGroup>
-   <ItemGroup>
---- a/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
-+++ b/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
-@@ -1,9 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
--    <TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
-+    <TargetFramework>net8.0</TargetFramework>
-     <IsPackable>false</IsPackable>
-   </PropertyGroup>
-   <ItemGroup>
---- a/src/FsAutoComplete/FsAutoComplete.fsproj
-+++ b/src/FsAutoComplete/FsAutoComplete.fsproj
-@@ -2,9 +2,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFrameworks>net6.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
-+    <TargetFrameworks>net8.0</TargetFrameworks>
-     <AssemblyName>fsautocomplete</AssemblyName>
-     <ServerGarbageCollection>true</ServerGarbageCollection>
-     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
---- a/test/FsAutoComplete.DependencyManager.Dummy/FsAutoComplete.DependencyManager.Dummy.fsproj
-+++ b/test/FsAutoComplete.DependencyManager.Dummy/FsAutoComplete.DependencyManager.Dummy.fsproj
-@@ -1,16 +1,16 @@
--<Project Sdk="Microsoft.NET.Sdk">

--

--  <PropertyGroup>

--    <TargetFramework>netstandard2.0</TargetFramework>

--  </PropertyGroup>

--

--  <ItemGroup>

--    <Compile Include="Library.fs" />

--  </ItemGroup>

--

--  <ItemGroup>

--    <!-- Keep this up to date with paket.lock, this is here to prevent error messages about downgrades -->

--    <PackageReference Update="FSharp.Core" Version="5.0.1" />

--  </ItemGroup>

--

--</Project>

-+<Project Sdk="Microsoft.NET.Sdk">
-+
-+  <PropertyGroup>
-+    <TargetFramework>net8.0</TargetFramework>
-+  </PropertyGroup>
-+
-+  <ItemGroup>
-+    <Compile Include="Library.fs" />
-+  </ItemGroup>
-+
-+  <ItemGroup>
-+    <!-- Keep this up to date with paket.lock, this is here to prevent error messages about downgrades -->
-+    <PackageReference Update="FSharp.Core" Version="5.0.1" />
-+  </ItemGroup>
-+
-+</Project>
---- a/test/FsAutoComplete.Tests.Lsp/FsAutoComplete.Tests.Lsp.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/FsAutoComplete.Tests.Lsp.fsproj
-@@ -1,9 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFrameworks>net6.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
--    <TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
-+    <TargetFrameworks>net8.0</TargetFrameworks>
-     <GenerateProgramFile>false</GenerateProgramFile>
-     <RollForward>LatestMajor</RollForward>
-     <IsTestProject>true</IsTestProject>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/AutocompleteTest/AutocompleteTest.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/AutocompleteTest/AutocompleteTest.fsproj
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <IsPackable>false</IsPackable>
-   </PropertyGroup>
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/CloseTests/Workspace/Workspace.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/CloseTests/Workspace/Workspace.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">

- 

-   <PropertyGroup>

--    <TargetFramework>net6.0</TargetFramework>

-+    <TargetFramework>net8.0</TargetFramework>

-     <GenerateDocumentationFile>true</GenerateDocumentationFile>

-   </PropertyGroup>

- 

---- a/test/FsAutoComplete.Tests.Lsp/TestCases/CodeFixTests/RenameParamToMatchSignature/RenameParamToMatchSignature.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/CodeFixTests/RenameParamToMatchSignature/RenameParamToMatchSignature.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-   </PropertyGroup>
- 
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net6.0/App/App.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net6.0/App/App.fsproj
-@@ -2,7 +2,7 @@
- 
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-   </PropertyGroup>
- 
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net6.0/Library1/Library1.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net6.0/Library1/Library1.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-   </PropertyGroup>
- 
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net7.0/App/App.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net7.0/App/App.fsproj
-@@ -2,7 +2,7 @@
- 
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net7.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-   </PropertyGroup>
- 
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net7.0/Library1/Library1.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/CrossProject-net7.0/Library1/Library1.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net7.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-   </PropertyGroup>
- 
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/SameProject/SameProject.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/DependentFileChecking/SameProject/SameProject.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-   </PropertyGroup>
- 
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/ExpectoTests/ExpectoTests.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/ExpectoTests/ExpectoTests.fsproj
-@@ -2,7 +2,7 @@
- 
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <GenerateProgramFile>false</GenerateProgramFile>
-   </PropertyGroup>
- 
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/A/A.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/A/A.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">

- 

-   <PropertyGroup>

--    <TargetFramework>net6.0</TargetFramework>

-+    <TargetFramework>net8.0</TargetFramework>

-   </PropertyGroup>

- 

-   <ItemGroup>

---- a/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/B/B.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/B/B.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">

- 

-   <PropertyGroup>

--    <TargetFramework>net6.0</TargetFramework>

-+    <TargetFramework>net8.0</TargetFramework>

-   </PropertyGroup>

- 

-   <ItemGroup>

---- a/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/C/C.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/FindReferences/Solution/C/C.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">

- 

-   <PropertyGroup>

--    <TargetFramework>net6.0</TargetFramework>

-+    <TargetFramework>net8.0</TargetFramework>

-   </PropertyGroup>

- 

-   <ItemGroup>

---- a/test/FsAutoComplete.Tests.Lsp/TestCases/FoldingTests/FoldingTests.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/FoldingTests/FoldingTests.fsproj
-@@ -1,11 +1,11 @@
--<Project Sdk="Microsoft.NET.Sdk">

--

--  <PropertyGroup>

--    <TargetFramework>netstandard2.0</TargetFramework>

--  </PropertyGroup>

--

--  <ItemGroup>

--    <Compile Include="Library.fs" />

--  </ItemGroup>

--

--</Project>

-+<Project Sdk="Microsoft.NET.Sdk">
-+
-+  <PropertyGroup>
-+    <TargetFramework>net8.0</TargetFramework>
-+  </PropertyGroup>
-+
-+  <ItemGroup>
-+    <Compile Include="Library.fs" />
-+  </ItemGroup>
-+
-+</Project>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/FsdnTest/BasicTest.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/FsdnTest/BasicTest.fsproj
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <IsPackable>false</IsPackable>
-   </PropertyGroup>
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/FullNameExternalAutocompleteTest/FullNameExternalAutocompleteTest.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/FullNameExternalAutocompleteTest/FullNameExternalAutocompleteTest.fsproj
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <IsPackable>false</IsPackable>
-   </PropertyGroup>
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/GoToTests/GoToTests.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/GoToTests/GoToTests.fsproj
-@@ -1,6 +1,6 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFramework>netstandard2.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-   </PropertyGroup>
-   <ItemGroup>
-     <Compile Include="Definition.fs" />
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/NUnitTests/NUnitTests.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/NUnitTests/NUnitTests.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
- 
-     <IsPackable>false</IsPackable>
-     <GenerateProgramFile>false</GenerateProgramFile>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/CrossProject/LibA/LibA.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/CrossProject/LibA/LibA.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-   </PropertyGroup>
- 
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/CrossProject/LibB/LibB.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/CrossProject/LibB/LibB.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-   </PropertyGroup>
- 
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/SameProject/RenameTest.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/RenameTest/SameProject/RenameTest.fsproj
-@@ -2,7 +2,7 @@
- 
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-   </PropertyGroup>
- 
-   <ItemGroup>
---- a/test/FsAutoComplete.Tests.Lsp/TestCases/ServerTests/Project/Project.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/ServerTests/Project/Project.fsproj
-@@ -2,7 +2,7 @@
- 

-   <PropertyGroup>

-     <OutputType>Exe</OutputType>

--    <TargetFramework>net6.0</TargetFramework>

-+    <TargetFramework>net8.0</TargetFramework>

-   </PropertyGroup>

- 

-   <ItemGroup>

---- a/test/FsAutoComplete.Tests.Lsp/TestCases/UnusedDeclarations/UnusedDeclarations.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/UnusedDeclarations/UnusedDeclarations.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">

- 

-   <PropertyGroup>

--    <TargetFramework>net6.0</TargetFramework>

-+    <TargetFramework>net8.0</TargetFramework>

-   </PropertyGroup>

- 

-   <ItemGroup>

---- a/test/FsAutoComplete.Tests.Lsp/TestCases/XUnitTests/XUnitTests.fsproj
-+++ b/test/FsAutoComplete.Tests.Lsp/TestCases/XUnitTests/XUnitTests.fsproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
- 
-     <IsPackable>false</IsPackable>
-     <GenerateProgramFile>false</GenerateProgramFile>
---- a/test/OptionAnalyzer/OptionAnalyzer.fsproj
-+++ b/test/OptionAnalyzer/OptionAnalyzer.fsproj
-@@ -1,6 +1,6 @@
- <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-   </PropertyGroup>
-   <ItemGroup>
-     <ProjectReference Include="../../src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj">
diff --git a/dev-dotnet/fsautocomplete/fsautocomplete-0.73.2.ebuild b/dev-dotnet/fsautocomplete/fsautocomplete-0.73.2.ebuild
index 84a00cd1484a..7266918d1e8d 100644
--- a/dev-dotnet/fsautocomplete/fsautocomplete-0.73.2.ebuild
+++ b/dev-dotnet/fsautocomplete/fsautocomplete-0.73.2.ebuild
@@ -243,14 +243,14 @@ yolodev.expecto.testsdk@0.14.2
 inherit check-reqs dotnet-pkg
 
 DESCRIPTION="F# language server using the Language Server Protocol"
-HOMEPAGE="https://github.com/fsharp/FsAutoComplete/"
+HOMEPAGE="https://github.com/ionide/FsAutoComplete/"
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/fsharp/${MY_PN}.git"
+	EGIT_REPO_URI="https://github.com/ionide/${MY_PN}.git"
 else
-	SRC_URI="https://github.com/fsharp/${MY_PN}/archive/v${PV}.tar.gz
+	SRC_URI="https://github.com/ionide/${MY_PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-dotnet/fsautocomplete/fsautocomplete-0.74.0.ebuild b/dev-dotnet/fsautocomplete/fsautocomplete-0.74.0.ebuild
new file mode 100644
index 000000000000..951475e2e3fe
--- /dev/null
+++ b/dev-dotnet/fsautocomplete/fsautocomplete-0.74.0.ebuild
@@ -0,0 +1,280 @@
+# 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/fsautocomplete/fsautocomplete-0.74.1.ebuild b/dev-dotnet/fsautocomplete/fsautocomplete-0.74.1.ebuild
new file mode 100644
index 000000000000..951475e2e3fe
--- /dev/null
+++ b/dev-dotnet/fsautocomplete/fsautocomplete-0.74.1.ebuild
@@ -0,0 +1,280 @@
+# 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/fsautocomplete/metadata.xml b/dev-dotnet/fsautocomplete/metadata.xml
index b94c954512c6..ce6ace62a821 100644
--- a/dev-dotnet/fsautocomplete/metadata.xml
+++ b/dev-dotnet/fsautocomplete/metadata.xml
@@ -13,7 +13,7 @@
     Visual Studio Code, Sublime Text.
   </longdescription>
   <upstream>
-    <bugs-to>https://github.com/fsharp/FsAutoComplete/issues/</bugs-to>
-    <remote-id type="github">fsharp/FsAutoComplete</remote-id>
+    <bugs-to>https://github.com/ionide/FsAutoComplete/issues/</bugs-to>
+    <remote-id type="github">ionide/FsAutoComplete</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest b/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest
index 4c357548e88e..a351a065c6d4 100644
--- a/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest
+++ b/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest
@@ -12,7 +12,6 @@ DIST fsharp.data.json.core.6.3.0.nupkg 71606 BLAKE2B 7ae58b0addc294a771993ba5dda
 DIST fsharp.data.runtime.utilities.6.3.0.nupkg 104522 BLAKE2B 62ca50953fd504d0973bbef224a48c814e6621a14052808abe392488f97b2b79206cabf30a6b43165bead50f8e1d21e7239729321c42e8c4385883f5a3818aee SHA512 173f3ec6809a36f77a4204ad0f8fe9d007dce22775beadea5a03f3e52affaede0a7852434f9794a507ba22db622f1fb9462506f6d56c083cfcfa9df8b74ed263
 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 gentoo-dotnet-maintainer-tools-2.4.0.tar.bz2 477077 BLAKE2B fca0b693b639d3fabddf7b620f3a7aa2f5bc712aec13f9d9f9cc9448491d2af21234363a26a2db6da967efc934e1ecf3c6a94b57b1141790551a32a932563205 SHA512 75b0881650c30601b963125df309d3806b3e4bd712aa05d0efc54122ec08a5b3726a29172669d8e6cd5f89a1306e50bdb41fca873732863a40e5831816891fec
 DIST gentoo-dotnet-maintainer-tools-2.4.1.tar.bz2 477640 BLAKE2B beb3af5b28e96b4a5ecad47cb99f102ce300e170b236f8c3772eb4fa904a31bdc38be4a351888317f0541529328870ab539ab6ece1ea962296f9e10dbf479ac7 SHA512 5e55241cc06f82797d69c56a8513e99c31a9b30ea98fb432fa959dda99496d56ace1342d17fd4b0961fa5f6a57e6c2f1dc16b9b866dd83225fbc58b18ed6fdc0
 DIST libgit2sharp.0.29.0.nupkg 720966 BLAKE2B 7fdb41e1654d2f572aabbe8141e8d39205437dc2e3bcd0f1dae3514b8c3bc2939fd418b44fb98f73d05b0a38b237b16bdc955343b0d05763a2db474477bf2e1f SHA512 add84f8c68c11e46247370cd3b506627326f26d1c9c5e23643e167875ffdf21ec90a5bb915d043e91a76a2820798db6ec13cdcb613a92b75d732a2a901b8b8a2
 DIST libgit2sharp.nativebinaries.2.0.321.nupkg 7966938 BLAKE2B d76dfae54215e463c3fc7ed652b93cfe8cf6bd9bd654eb70c443b226dcf9fbf5642949b5278b09bfa2abdad4707c9a22813a61098eef07af6c461f0e14237d0c SHA512 3b975be9c20bf4c1c637fefa1728443e5729a14c874b93818af0f177650d5e904bb8d09bb8fb9c490ee37391de96ddbabcda05fc4de519a990ceb79831b31d96
diff --git a/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-2.4.0.ebuild b/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-2.4.0.ebuild
deleted file mode 100644
index f4c9efadace1..000000000000
--- a/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-2.4.0.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
-
-MAJOR="$(ver_cut 1)"
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-fabulous.ast@0.7.0
-fantomas.core@6.3.0-alpha-003
-fantomas.fcs@6.3.0-alpha-003
-fsharp.core@6.0.1
-fsharp.core@8.0.100
-fsharp.core@8.0.101
-fsharp.data.csv.core@6.3.0
-fsharp.data.html.core@6.3.0
-fsharp.data.http@6.3.0
-fsharp.data.json.core@6.3.0
-fsharp.data.runtime.utilities@6.3.0
-fsharp.data.worldbank.core@6.3.0
-fsharp.data.xml.core@6.3.0
-fsharp.data@6.3.0
-libgit2sharp.nativebinaries@2.0.321
-libgit2sharp@0.29.0
-microsoft.netcore.platforms@1.1.1
-microsoft.netcore.targets@1.1.3
-org.xgqt.simplelog@0.0.0
-runtime.any.system.runtime@4.3.0
-runtime.native.system@4.3.0
-runtime.unix.system.private.uri@4.3.0
-system.commandline@2.0.0-beta4.22272.1
-system.diagnostics.diagnosticsource@7.0.0
-system.memory@4.5.5
-system.private.uri@4.3.0
-system.runtime@4.3.1
-"
-
-inherit dotnet-pkg
-
-DESCRIPTION="Gentoo tools for .NET packages maintenance"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Dotnet
-	https://gitlab.gentoo.org/dotnet/gentoo-dotnet-maintainer-tools/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://gitlab.gentoo.org/dotnet/${PN}.git"
-else
-	SRC_URI="https://gitlab.gentoo.org/dotnet/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-S="${WORKDIR}/${P}/Source/v${MAJOR}"
-
-LICENSE="GPL-2+"
-SLOT="0/${MAJOR}"
-
-DOTNET_PKG_PROJECTS=()
-DOTNET_TOOLS=()
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	dotnet-pkg_src_prepare
-
-	DOTNET_PKG_PROJECTS=( $(find . -name "Gdmt.*proj") )
-	DOTNET_TOOLS=( $(cat ./gdmt-tools.txt) )
-
-	einfo "Will build following DOTNET_PKG_PROJECTS: ${DOTNET_PKG_PROJECTS[@]}"
-	einfo "Will build following DOTNET_TOOLS: ${DOTNET_TOOLS[@]}"
-}
-
-src_install() {
-	dotnet-pkg_src_install
-
-	local tool_exe
-	for tool_exe in "${DOTNET_TOOLS[@]}" ; do
-		dotnet-pkg-base_dolauncher "/usr/share/${P}/${tool_exe}"
-	done
-}
diff --git a/dev-dotnet/omnisharp-roslyn/Manifest b/dev-dotnet/omnisharp-roslyn/Manifest
index d2db1dc2d494..439a49692297 100644
--- a/dev-dotnet/omnisharp-roslyn/Manifest
+++ b/dev-dotnet/omnisharp-roslyn/Manifest
@@ -40,29 +40,17 @@ DIST microsoft.build.utilities.core.17.3.2.nupkg 891521 BLAKE2B 113cf481440a4dc2
 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.9.0-3.23611.3.nupkg 6935503 BLAKE2B 031d927779aae21448d3b85a8756c1fd011e83c0b303d9ef5668b75467957d923751257db5c5b2cc2501be95b005679d35c1b9acce0df3cc1f1fc02cadd73008 SHA512 846a81928240d0eceeca11911e934a6ad66b85571fb1ead8c6dcb7565d22688bb18cbbd264ac379a52129bb3b1693a15d3dff0e4a2da1d2e2b81cf531ead040b
 DIST microsoft.codeanalysis.csharp.4.12.0-1.24358.3.nupkg 16906374 BLAKE2B d3582c694eb7376e2062c393288d3192280d6974815bbe2e619f6c0faa8011bbb214c2475c7e315e6cfcbaf47e4e5a01eeb8cbdb438b84f9b48ba4b14775e7a9 SHA512 7875f93cbf0bccf51adba667d2421138153d71274d4d874b3737a8352272305f113636367c4f8a281c88f48cdf5e35adce6905919f1090b6cbe8094a5a1fdfee
-DIST microsoft.codeanalysis.csharp.4.9.0-3.23611.3.nupkg 16967268 BLAKE2B 86a594d62938a0bd7a8df9d98da25929b1c9caad540854b9d2a4df629475a9a685695de66451cdb2932cf74e2f89588b663fd2e22edbf4c0cbeb336cb2bdf52c SHA512 287205a1ecf8e2e1625bc36a5df75634089ef7bbeb9c33546603e750fac17f19c4957c4b4cb1f6d905c706f430c9e2aaa9eca376414d5d6a2526623da3f83f98
 DIST microsoft.codeanalysis.csharp.features.4.12.0-1.24358.3.nupkg 4322543 BLAKE2B efe6555606e6bafef2706249d10981a64ad3569d95e7b07cf0a07f6b04d71bbda13db21e29241ed30666f6ac052ed84a2e40fb3e9cfeb10d173f38c267a0032d SHA512 157ad40edc23e171b584a26a8959a4cfbcb074c6c79f42b150986866a818486a75f8f4523c96355e1368b45614c398d0a1c1c29343efe96c19cd9362a4e7cfc6
-DIST microsoft.codeanalysis.csharp.features.4.9.0-3.23611.3.nupkg 4135302 BLAKE2B 5b8ea6cdf94afa84036dc9eca4bdd1101fc4510ecfe96405b636e6eaf6aa14c90f11e8835899450de386753bdffb786bacac5c1ab5f48e8486731e43576da0bf SHA512 c2dd46d8c30bda260c29f02f59f9f3b60ed32c87fa8703af444172b6c80f9f99b31eaae0344b1603ad168ee61093efccf8444c7d1d275400de766baafbb2c772
 DIST microsoft.codeanalysis.csharp.scripting.4.12.0-1.24358.3.nupkg 510134 BLAKE2B cf2fc27c8b106debce2a71ee3f25c6539ef68aae736cffaa77dfd0e15937c1827abaa8f608ec488f26efd73d60e0ea942c7b53bc60286ad03dc1a70fffca2651 SHA512 e284132f2b22394f51456203abdc95b64dc492dad23560464599bf40237b6df63e072062a290417eb0fbc9d04744f88b00704401c17d0a156265a6126e777b45
-DIST microsoft.codeanalysis.csharp.scripting.4.9.0-3.23611.3.nupkg 510146 BLAKE2B a6cd7d23d7f107a556a5183c54b310231c0f854fac274389707e96b7f7b0a9838ac720c2bf982307ce6087030c421483bd3de356faebaf6ad7582f04ad76c616 SHA512 3c0a8e1704397580b46a81dd5872c9e480edf6cb1eb072dea01213a8d3c82005778516b2c376f1d2bd7de08b89d3051b900011781fa96d3d230735fbd0f7504b
 DIST microsoft.codeanalysis.csharp.workspaces.4.12.0-1.24358.3.nupkg 2017617 BLAKE2B 1fcbb506209b467372ab03df49f1ef9a27986e97e06e838fe4a88642bd272b191d434767ae9cf080c854ccb437635a464b34338708636fcc131358987cbe8f3a SHA512 aacf8860d26f6cad6545cea708d18dc9257c071c4e100c334e3810cce24fc99afaee51a804a1d666a9db63b93156ea37b4794bcf52acf8c28c9ca133b1d80a31
-DIST microsoft.codeanalysis.csharp.workspaces.4.9.0-3.23611.3.nupkg 1973556 BLAKE2B 9be056803d95d6a57dc2967661f4b71841ce1341587e78193bc7dbb2fe2bf26812e850e680d9d5bd7c26f12d639b66138bb4e52d3c1b01e69989b61ff0cff2dd SHA512 b2a41ce2def06caf0ee2412f019760987a460b405a5b9bcd3045e24e95528053efefbc980c3cf9274fe3e311bc017e5b606d05cefe592ea3b7172b82a1d7e854
 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.9.0-3.23611.3.nupkg 173881 BLAKE2B be6adfe49c5e656b43e25985dbaae8f9c5fabf8df61aba763f5e24e41fffdf2e35990605a070d4e90c1fbf88e7fdb7b13c1a81116335797fa866bbfac1c69ce8 SHA512 bd9d7bfd8533a4d7892b1e99002c81d1f7a4b1c023d0ddf31be900663beb1ce6763744f1a3515409cb3ff65ec15be048b853ed552fb3f8fba661f842c3037c36
 DIST microsoft.codeanalysis.externalaccess.omnisharp.4.12.0-1.24358.3.nupkg 71740 BLAKE2B 1a0ee51af30f4f7d3d771801edb96aaa1136a50eb8ca6f21f58a815528b4ad55d11939b34715c7e858f95c7d81a5dacc5bc8b7ed31948a44c6d74fa9d4e5071d SHA512 75ddc51718c77d7b724fc992a6bee4c9a11751d834fe288dc9e4ad8cb8d833b8477a34e3452b8726619e79bdd94333793d1c67ad51d57c608299ff3bfaa33fc9
-DIST microsoft.codeanalysis.externalaccess.omnisharp.4.9.0-3.23611.3.nupkg 125953 BLAKE2B 257bc8d770a882de3599a5e5e4ec22aedcdca710d8f6af52009981128ce92c400fb495d5ad50c05dc2b18cd7e4302bf7ca23c76caece1f5ce4b7c3b2cfddad2e SHA512 e063de58e7e7033fe49816bbd02b450ac619c8ca6a846aab86d7f4947b6d8bb125a2597f9046429729e4b4c2506d657db978ce0a5276e6e17e38d5ba096d8f5f
 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.9.0-3.23611.3.nupkg 62707 BLAKE2B 154f5747b15d10789353e352cd409511206974ceec2aa891635f5634b09d12d0e5809fe37741d37d7814126653933dae81230fe1be04b174d70a7010ed2cd94a SHA512 866ed5ad82553922e16a5769c9b766cb16fc79d1206b3f421f3afe0e259e1ce817ec05afd98be303829a0147e76477d21b053e889d34a2c73f93a85bae5daa86
-DIST microsoft.codeanalysis.externalaccess.razorcompiler.4.9.0-3.23611.3.nupkg 83988 BLAKE2B 4c0a3bd02ed9081b4ff65c6dc518b3f30b235d217dddd816df57b2e968bff6d7ef10cb5449803a57a3487ae990b4b1e9844cc2e231e73d1f2c0b5379c1cf5b64 SHA512 3b6df275fd30db2d5d1883cb57def9a8975db0531c014e316cc9cb5bbd6d9d74249b1abe205f2e2e534a3dcff0f9fb6615e8669136bb36e8ceeaaf2c9948abee
 DIST microsoft.codeanalysis.features.4.12.0-1.24358.3.nupkg 10426918 BLAKE2B 34e9a975d80d897b190e941dab4ea9393f5470c6637b3e5158efbeaa2ff18f343649f6a0cdee6754e165d3ba9192c47c9297a9952bbdd911f45a123a9609f99f SHA512 cbed70c1a112608d5d28945a1f130e7970780bf413b79313b89c173781387f755cfabb662ad0ce759c65abc3d4dc09c7abbe6d936aa05bfe67df86880facdfc0
-DIST microsoft.codeanalysis.features.4.9.0-3.23611.3.nupkg 10236160 BLAKE2B 4b3569c2a3990ab3f32f1928f97d6e714b9ac8f0ddee50e9399fa62e0123f05352d0e0341557ebd53f356114bc576de28444749bb00b727051b003d25d665508 SHA512 61a0ba0195eb15e32be53bb8fd16d2e8a65c58f021e22a4691ba90bdab0af8697dcd721be889ca1ecdec8a143260f7bcf2c9e28c908a165c604856315c31a663
 DIST microsoft.codeanalysis.scripting.common.4.12.0-1.24358.3.nupkg 770926 BLAKE2B 9bbbf9a2511594a44739be0163a1d0ff69bbc9aba6405e5edfa13db54b3a12f76373f4a06e46355c04d7c1da1f945e6f3a35e7e64e6574493cb2511c986cb47c SHA512 96f7078967759208e3019be7f67a86d0fa319a9b21fa44e95825961b99e98639a0eb3445319e1b7fceab89d6d7bff971926d5b6a28b361868dd900fff1efe84e
-DIST microsoft.codeanalysis.scripting.common.4.9.0-3.23611.3.nupkg 770812 BLAKE2B fa6d2ae3d99e1746b44086b6f707bfa149d3a4783112ee525d2fc1ae1a08a66f07bdf1e02cda1cc00c1f1f3df287c9d2c0ca1480df7e17e7acd93a7a257ab614 SHA512 0e72ec7320ca337c07b7b4ef13e51f7166805587b7fd9cfb65fce1778e907801cf11abddd7d9e52ca846b25871faf8934d7787689aa38fe59c2110798aa3360b
 DIST microsoft.codeanalysis.workspaces.common.4.12.0-1.24358.3.nupkg 8471653 BLAKE2B 04b38cd0a7bb5f31bbc1dc60b771dfca20602229b993fedfeaa716eb0d47b1aa9baddff007be056a3ba21a26156f6cf055700718b036b264a0f43b2fe3d1f9f4 SHA512 4e9d9d7382b7af9bf8a2663f7319dbb12ee2235e325a7119d3c1b08cd715e3464cfa994acc8f5b47b947937586122b2054557e1ff4fb1c7537fd8b8ade896739
-DIST microsoft.codeanalysis.workspaces.common.4.9.0-3.23611.3.nupkg 7950825 BLAKE2B f6be14656d22ee1489bbd6172b2649a08f98752dc4d8c0fce7a415522063f346a8b600dc5717446e42749fcf17ef52d86e51ca65a7daa7b5e428e00ac2f74c4a SHA512 98e43ae85427640e52d842676e926b9baf933a1c2d44722ca8125317aeb20bf41c091e0fdcb8ba1791e23481b0d40d99c647d05133bd3f42f92f104facf25313
 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
@@ -125,25 +113,14 @@ 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.8.0-rc.122.nupkg 157262 BLAKE2B 5ad608b7cc58b427d7e6d95c15028680e11fc40529a46fefcf4ebbf25e2e2488f5542d3c975d31f2c0c4596021744f0ba7de1ba6af5dbcc2c89309f14ffb5143 SHA512 af9896e37e8aa40fc2ec325cecda821fd7d029d457b347a4cd62ce3469f7f4e444814a09b5adb5f7f99a1fa7ea2f2eb121c29684ce6e7d1d6ffcad7fae0f35bf
 DIST nuget.configuration.6.11.0-rc.110.nupkg 191428 BLAKE2B b40dd939314df4b94783fac9ea261ca8a46d6cc2f2daf0515ca990ad7f1b394738f3a8f1454c0f25a25b16dca4402c5e89f401bec51b2cd8890c0701a87b5515 SHA512 f580fcc85f83adc3b19228046ce11032219c00dbade8b6278575d68de6f19c05275bba9e6bb73a4a7dfadb9d3df3bedb020feb1e2cd0ee2b4668521ac6bdd42e
-DIST nuget.configuration.6.8.0-rc.122.nupkg 182275 BLAKE2B 43284ba81f8d8d6d27dd9118c01350b10003bfb0e1a58ed602fa5e7b16dd6195c8b1e0fd994dc58a12172f5e96530591ffc6aeb28bc1762bab74f1725fc91216 SHA512 5d294770f4f1e79760ffec753494c3610b9c97d7b8de007356981b64eb6420e6246f8f6aa56206f4ec63a5a493e202d2871456c4d9983e94177b9d286c70d8b8
 DIST nuget.dependencyresolver.core.6.11.0-rc.110.nupkg 183318 BLAKE2B de18788b8b1f5302a93b7528e14906be55bcf4fe9fc77baff5daffdbde4742f6beb1e55ddcbc24892b7f553c597351eab4d8475b150ad0229e69368a3cdd11c9 SHA512 3934da237e3138b537466cf8a18163d241e8ea3d8aeb9f8db8d905128892c23b98c502342bb02edbfddbe97859d07e91b1cddba153eafd8f2a9f1f843782f8aa
-DIST nuget.dependencyresolver.core.6.8.0-rc.122.nupkg 170247 BLAKE2B a176590810da237891919192754820a509591fe863e323f09c443fdde0e5b99a9ec1b8299550bcea0f8d73cec7daee6be5e0b85031ad6dace4258e6570008e75 SHA512 be0bcec352c6f0e484ff4a141fda73c6c29c6603134413e6c05b653ca9958983be584d15ef86b5033013a13f98bef9b2b89c674e1b40461daf22a00022e4e110
 DIST nuget.frameworks.6.11.0-rc.110.nupkg 157454 BLAKE2B 7520d897033731d9a00399490d0acd6cf122b5cca0fbe2752f3829578ae269ce66645826539a4ba20ba69ad4d9493625d5e031313048694a91023d7c148919ed SHA512 5cbe7004af3386c944ba8b76130c3bd93b08bee832a07741315307653cc94a6788fda2c67c56946b5f2aac0b6f71a070f0b5796da0ac05292ff5268cb832096a
-DIST nuget.frameworks.6.8.0-rc.122.nupkg 153774 BLAKE2B 1b49ce03477c5609cdce53604de8d794415497213c815aef0002e40faf91d93c256d1422e3b0a5db38be289fa5c7480c01e6cbe31e67910b07fd001d589f7b72 SHA512 1254dd4211583b5fa83286030cb5b4b2664cf3407984b29f2e99daece1ffeeefd1cb9205590d8ad2e0357320eab9e55a780f23ae0817472c9e01a77f5db34372
 DIST nuget.librarymodel.6.11.0-rc.110.nupkg 90393 BLAKE2B 001b28160743205087911a2c1a56e443a92108c9b36b6022ee4610763e3e14e80684a985a9ee19abe3b1a105a9427e52bcb5603fc34f80dd220e8f837d8fb85b SHA512 9ab3e4d49e4f229dceef2f59e8820d369ba06efc3dbb7cdf4a7e0711aa377240123c2b49217d8c3bf6d7fb1a9fa2e08f56fef32b3ea04a799001888779280590
-DIST nuget.librarymodel.6.8.0-rc.122.nupkg 86149 BLAKE2B 9a53c9f3fb7d2fd2f2e825b912cd46997171c94ff54ff158dba429c38384e13fa814b69350805f79728482b6bf29623e0a386ebed3980a6695edc1cd864aa1ca SHA512 e4ec2e9a8fbad15244e24654350a0ffd97c85f05653596463777fadbc3c8cd3757e8608fee4557a9b334920a3381c27d94befb504153745d3dcb95833fc65554
 DIST nuget.packaging.6.11.0-rc.110.nupkg 833267 BLAKE2B 495ed68dfadb6974db3371df00bccb03de20758921c944f2ea61389276dc2d1ade683bba25ea2825adc85398bfb44c0d512acee8dcd8199a83a7df750c8abce0 SHA512 e2546e5456beefdcb0e7041103583157525e9987600eef0e313110dd4eac412965353066d919ac6ada32162d19c2f59ca7997b47252f23284667061b5395aa4d
-DIST nuget.packaging.6.8.0-rc.122.nupkg 827580 BLAKE2B 71d235c239441e40f2df31eba5d6a944cbf432c606218dcf768dfc741a93c9df6fdf4cbd184a7bbe880c378345bfa0e2ac3b8ac85b40c5fe7d1edf6de80e05d0 SHA512 8190f50ad96f89a8d15d064d6b955192fd69f61d9eb2adcf9eb0aee5724ce7bc234f7baad542d485d68ff4222edc44354f093c65222ee1485d7c22749abe8d43
-DIST nuget.packaging.core.6.8.0-rc.122.nupkg 48495 BLAKE2B 88a23a5ffe60341488a09978c9cb3f7beae0fd5edac387a470e91fb61f22ab17920c64ca10d45e6db3e50eea2f194fe88f5d02616047a88f17b0dc01f79c60f8 SHA512 65f3a08a7041e23490f807f24332b0fb28064de460b5849bbca032df6539a711a4ceedf2d3c46b1a5d18ac121e89e39a7385af5ce22b1b4b49a8f91baaca5f19
 DIST nuget.projectmodel.6.11.0-rc.110.nupkg 386746 BLAKE2B cd9283015510c32c447474a5c29655cc2fc2dfdc10da624e406c381cd635ebd2ba7e38a97b7d606ff8d3388bc4115dc7e790d377c2bcb4c26bf1a3e8bdf44950 SHA512 16426c3dcc46dfe7662d2b4060369cd559a102190bd8ad5cfb8687006cffcdd5e51596e6a84992ebbace0edc1d1da5190b17fe78cfac542615cf10e41ff49dfd
-DIST nuget.projectmodel.6.8.0-rc.122.nupkg 333649 BLAKE2B 1b86b06db17bce2ae4f435875dc5c5341d9392056611d984e8d53422774e8e75e5c073afc58bb8be26f295e3291ad365160564863df2c63be6371c2ab7f83948 SHA512 458da0b3b391713e0295b4979208cad8e0487ac481d4be809fc1b887126315ac2977283852e662177043ccfec8c375d9364a812e8b4122495de800d8bd2368f7
 DIST nuget.protocol.6.11.0-rc.110.nupkg 964864 BLAKE2B 6a6be8ee2555ce9f1d376c0a204e905ad2c7c1923354b70c8d2a4aeb6c0bf6543848d356d6dbadc3b72e7fe75c63cda84c0ef4aaa592984b0bfa08f43da5959f SHA512 49414ce90ce493b25cc4fde203ed340c2f1195c11cf9499199c1072fe6f5613250f1326b8f793a8933b56bb9452beec23bb7170d1cdeebce10849fc03630a207
-DIST nuget.protocol.6.8.0-rc.122.nupkg 967026 BLAKE2B b15e5555e6128fd70b3464e01457a4f71805ddded6a7729d6520d5c2506167b1ab40a309bc3c58266e06ba637add06958e125a26b3e34982ccdac1f8cd9cb917 SHA512 05b89205dba80e5bd4e3d42ed00dcdde97c4f1d823573ad03e5a11f03f9d72ec2f0e8a64344bc7235cceba8b5a19f5497786d105041350b574a473ff894d474b
 DIST nuget.versioning.6.11.0-rc.110.nupkg 97131 BLAKE2B 8815f886d91ffd0e0e2ef15937cc9667b6d7adc2bb13c5253309fe8a56053acc8d2d24b5b5473174c8dd2ab214521bda812779135078d35f6a0833c0cde593a5 SHA512 7e41ee665455aed8ade67380b0dbd8eb93bad85a975630ecb27697e7f5995fa5fb60fb7ae1385f873092a5b224078732c4519d326e28b55692dac3f32c979645
-DIST nuget.versioning.6.8.0-rc.122.nupkg 93634 BLAKE2B 0bafa1ff42f24e296e0007a092353adfcc18fc6b2a5a7358e98655ec08ea7f70c9d3e745063b10fc134a5cc98b084565be6672d455462536656e778b818f7157 SHA512 aade8649fb35e68bac86ff6c392a88efca19d46554a6df15537f1253ad10ed87efa87ec032588669ff7081141931a26408c7c3d25807f7001f18ae793d5440b4
-DIST omnisharp-roslyn-1.39.11.tar.gz 604768 BLAKE2B a66c96de9bcd86793d1793e50272f2dac26f25e6e5f7acadfbdd0084800d21dc15f473b7db176b8305c286fe1b8ff757016cf8fc23927ea63261d46828e85da7 SHA512 0d26e825043f27a038b9af23e00a0f94b40745a3c91c0967ec25b9bffbfea40f34f3c36183c34646b83f7523c6e0babc23117e02f9b7261f4c9cb83f779570d6
 DIST omnisharp-roslyn-1.39.12.tar.gz 605459 BLAKE2B 8ed65fcfa918d52fc56310f5c5ada594cae497d89026746608d69ecbc8187c7345b8e7f1dad847e9ea60fd829893cbe1113079f4c2d33ea44e3497bec7aa5828 SHA512 8d17dc4294e202dd42904621408075ed15ba10f4aaa157fe4f215fffc93e5bfbd672f3850f5aa77b5b5328ad98bfd6744d34d008a40746e9181e7f0a77219d2b
 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
@@ -170,15 +147,10 @@ DIST runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.
 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 sqlitepclraw.bundle_green.2.1.0.nupkg 35791 BLAKE2B eea7245590614e095e1850616ea15d2e30664356cdb3a35bbc5e9d5fde0cfc08c85880a5c398fa5b5f12e08fcf663d96c6e795b2c49030ad1f6c88dd4cbd8555 SHA512 8cbfdfe0755fa617cad26f41e986c7823c1436a95c01ef393216dd349d7e378da50b60b877b73fd258bde4ef93ade4c541c9123e0594119d65544b5310296443
 DIST sqlitepclraw.bundle_green.2.1.8.nupkg 38070 BLAKE2B 4255a7d72694c2c72321d61645a2cc1b5a399cf5397dbd18c5c003c981e3ca5cb1e1cefb427d226f58c708633c71e5a05d47ca18e0150bece08df35470770c70 SHA512 59aaa9433c52f8e3297873cecb50addaa137c6225b3d28fc55cbbfd7040a26a77c8a2b1a73e33b4c2f1244e939572f8a3084ac13068b4cf23c0462cd1f7f8f0c
-DIST sqlitepclraw.core.2.1.0.nupkg 32456 BLAKE2B b55d130061c241d44dc0fee0643f0ac9ef940e2634124d3c2c76e35e190e065bee389b8db407f20b92d9386a51fcf70b5b879bf53da389055677c086848894f4 SHA512 a6ba7a17699368b6edc13ba5f2db380977612b8e678342ee7fcdd86c1e8ad62ab95d0e1814283ddf8df4b732e4f72acd88976f1c30244fea985f27c4aad79738
 DIST sqlitepclraw.core.2.1.8.nupkg 34771 BLAKE2B 9cd1832bf5cf69934199d989ff96c2ed408d249c9ba973bfe8ae73ab6435c09ec51b853f17c65ee98da097cf92798a5221b9a71e31967d5dbda497b46194fbb2 SHA512 44f6379ec6f00e6df247714726f008df0a905f7b933c62178c9a53bd71ecf003529d710db3ee99ab4c19dbde82e0e64d74356f95f48f857e1639893706826217
-DIST sqlitepclraw.lib.e_sqlite3.2.1.0.nupkg 16238825 BLAKE2B 126c83dd68c9f45f7529e628a0bea4c008d3db39ad387559b5b11eed28146dbfe9cf660c072e4f94c6350f58cb17592c7040618824185ddd9fbf03e94c828abc SHA512 f109e1ddb7e387b150edf788c3a1c77a22fab608a94df89706dc862aa6b419fd83ed48c5e0a04e8f4043daa40d310232096805d1798b1565df36bb771c8593a4
 DIST sqlitepclraw.lib.e_sqlite3.2.1.8.nupkg 18131960 BLAKE2B b3fe7fa9d8a9fc193c7df1f9bb42db0ef9dc62d00f6b1e25f9bd469d84e7834fa37efef52eb3350003d03d298ecf1080f88bab8e4960756b6bc745f9193fa5bd SHA512 aaf14bf6aca64043ad190c6a6f07afbfbfcd529cd08fe609fbc8f97b00830a4ca6837e779e1b18f95a948695019ae599391840b9b3e14e26f781bbdc5c2ec53c
-DIST sqlitepclraw.provider.dynamic_cdecl.2.1.0.nupkg 33864 BLAKE2B 235536e3573047c7c706830546e50eab395f203ba752fe53b604e29d78c80bac2233ec75ab65dda9938cd89d92b7b282328d6f3330dcc715440ece846b70ca9b SHA512 ea13d430f549d06c41ab67bd6d8527a553710e5e6a0414e4e83f7fec4a1ae8d51114c0ed542f1baaa5c3e2312845efab822c16d29b6710b88bd0e66bb8ffe833
 DIST sqlitepclraw.provider.dynamic_cdecl.2.1.8.nupkg 36412 BLAKE2B 6d4a98fed3847008048b4a5fae6b998fc7af1d1434c540e7db12bbc453942c49c40b4f94a54a2526f344f8270820b1b1438495e5e8fa645754a90b8da21f9ad7 SHA512 e453e16436baf184815db86d8380ed3d60a234adba1f6336995b2d1f036bd8851f397c1967a4fb0a17c88bf7633a7e90a9d3515fd7bbe57c21e1952052f28824
-DIST sqlitepclraw.provider.e_sqlite3.2.1.0.nupkg 56543 BLAKE2B 7df60b4e24ae76cc01498c59b50915b706a93c932075b277a39a607027682cd9ab01ba071affb1d61b64357fca4d036ade1ec8cdc80a8e2a671dc4cef3d2be1f SHA512 fb0e4e74bd2bd22c82d8cadd2f3a939230bcfcad1f3be27bfc0a691a07f6dcb98473d393b69a944a27f5a53b0cf61318213489b41f8422b56122591d16648094
 DIST sqlitepclraw.provider.e_sqlite3.2.1.8.nupkg 59396 BLAKE2B c17aa76191dc7b53bd702503504125331f81cefe45cdcb9c035adeef42ceabd911244211acb21ecf1052868de21e488601bd3ebb945ca0dc43fd6b16a0955dd4 SHA512 1871da4e903ec6a4e93be469c6d4b20cd2d6d09655615d303907a7a9192ea4c27083b259290f0a343cd4df4b983e781fa13beb40c02c1399ba2923a09c76bab2
 DIST system.appcontext.4.3.0.nupkg 147030 BLAKE2B fafd6d050e77a265cf41c6d00a3ab3d8db47f2258e10a6cb556031ab183a01a508a986bb495b68c5e8610c05b92b2f3c7b0718f68f508111fd262291684f84c3 SHA512 0d6ea63006304708feae2cc0590d2cdd99327b682210822bb2803ac842fdf4d8d57170d7947c006eec4b5687c942768478a7ec109745472f3946d230732483e8
 DIST system.buffers.4.3.0.nupkg 35171 BLAKE2B 3b274a048ce14845ca957019b3670db00338972f6e11279e47f59ca6b4326aaecab1d11317694ed98e8a27f3de7ef6f90de94d4711ab224f805388d468728392 SHA512 3dcbf66f6edf7e9bb4f698cddcf81b9d059811d84e05c7ac618b2640efed642f089b0ef84c927c5f58feffe43bb96a6bcf4fec422529b82998b18d70e4648cbe
@@ -279,7 +251,6 @@ DIST system.text.encoding.codepages.7.0.0.nupkg 3198933 BLAKE2B 077972f69636114b
 DIST system.text.encoding.extensions.4.3.0.nupkg 244195 BLAKE2B 9dc2fbf672e07c5302bbb8435e8c09bc91febb96f22b85b57b09b2046fca224c786f8710b634559de2722f3dbece7b30e6a3c6a78e98e77f955d550e440beb60 SHA512 e648c5dc781e35cf00c5cc8e7e42e815b963cf8fb788e8a817f9b53e318b2b42e2f7a556e9c3c64bf2f6a2fd4615f26ab4f0d4eb713a0151e71e0af3fe9c3eed
 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.0.nupkg 1983421 BLAKE2B 053f3200d5920a5a31b4e4e6d13f0a81490a518ed68363a1a04c1edbbc125f90b9fa8f469614127bde714df352052a0dc56d70c9595277686799d33a16df351b SHA512 59243516d9de8ce90be60d6c5d271ff4c5fc6b2a4b723443022a72bd1b8f98adac3d17439df5543fedead81a8e3b018fd9a89c40a2459d3cb2d1dd935d17b426
 DIST system.text.json.8.0.4.nupkg 1981785 BLAKE2B 32eaece9756c948453589d13f596d2481e8d7150f1c970f2cbc04aa9ab8ab399795e6ead5c16b47198113f10f43ef4407e613286fd55538de3f172885dd6be93 SHA512 9f87ee2a39ba4f602a2b3ec7584b8aa2c03a7f6db1e303f48224dbc139ddbf3cb10190be04efe1d1592b0bf5b2fd97f6d8f88fd492a45f778b84fd3e613acb00
 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
diff --git a/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.11.ebuild b/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.11.ebuild
deleted file mode 100644
index 7fc7ebaa1fa3..000000000000
--- a/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.11.ebuild
+++ /dev/null
@@ -1,360 +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
-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.15.0
-cake.scripting.transport@0.15.0
-commandlineparser@2.9.1
-diffplex@1.7.1
-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.3.4
-microsoft.codeanalysis.analyzerutilities@3.3.0
-microsoft.codeanalysis.common@4.9.0-3.23611.3
-microsoft.codeanalysis.csharp.features@4.9.0-3.23611.3
-microsoft.codeanalysis.csharp.scripting@4.9.0-3.23611.3
-microsoft.codeanalysis.csharp.workspaces@4.9.0-3.23611.3
-microsoft.codeanalysis.csharp@4.9.0-3.23611.3
-microsoft.codeanalysis.elfie@1.0.0
-microsoft.codeanalysis.externalaccess.aspnetcore@4.9.0-3.23611.3
-microsoft.codeanalysis.externalaccess.omnisharp.csharp@4.9.0-3.23611.3
-microsoft.codeanalysis.externalaccess.omnisharp@4.9.0-3.23611.3
-microsoft.codeanalysis.externalaccess.razorcompiler@4.9.0-3.23611.3
-microsoft.codeanalysis.features@4.9.0-3.23611.3
-microsoft.codeanalysis.scripting.common@4.9.0-3.23611.3
-microsoft.codeanalysis.workspaces.common@4.9.0-3.23611.3
-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.0
-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@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@7.0.1
-microsoft.extensions.logging.abstractions@8.0.0
-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.0
-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.netcore.targets@1.1.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.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.8.0-rc.122
-nuget.configuration@6.8.0-rc.122
-nuget.dependencyresolver.core@6.8.0-rc.122
-nuget.frameworks@6.8.0-rc.122
-nuget.librarymodel@6.8.0-rc.122
-nuget.packaging.core@6.8.0-rc.122
-nuget.packaging@6.8.0-rc.122
-nuget.projectmodel@6.8.0-rc.122
-nuget.protocol@6.8.0-rc.122
-nuget.versioning@6.8.0-rc.122
-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
-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.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@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
-sqlitepclraw.bundle_green@2.1.0
-sqlitepclraw.core@2.1.0
-sqlitepclraw.lib.e_sqlite3@2.1.0
-sqlitepclraw.provider.dynamic_cdecl@2.1.0
-sqlitepclraw.provider.e_sqlite3@2.1.0
-system.appcontext@4.3.0
-system.buffers@4.3.0
-system.buffers@4.4.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.3.0
-system.diagnostics.diagnosticsource@4.5.0
-system.diagnostics.diagnosticsource@8.0.0
-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.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.pipelines@4.5.2
-system.io.pipelines@7.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.ilgeneration@4.3.0
-system.reflection.emit.lightweight@4.3.0
-system.reflection.emit.lightweight@4.7.0
-system.reflection.emit@4.3.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.typeextensions@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.3.0
-system.security.cryptography.cng@4.5.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.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.0
-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.3.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-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.12.ebuild b/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.12.ebuild
index 770a8dcbf650..6e5a0c1322c8 100644
--- a/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.12.ebuild
+++ b/dev-dotnet/omnisharp-roslyn/omnisharp-roslyn-1.39.12.ebuild
@@ -300,7 +300,7 @@ else
 	SRC_URI="https://github.com/OmniSharp/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-embedded/avra/avra-1.4.2-r1.ebuild b/dev-embedded/avra/avra-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..b9203427a9b2
--- /dev/null
+++ b/dev-embedded/avra/avra-1.4.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Atmel AVR Assembler"
+HOMEPAGE="https://github.com/hsoft/avra"
+SRC_URI="https://github.com/hsoft/avra/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX=/usr \
+		CFLAGS="${CFLAGS} \$(CDEFS)" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${ED}" install
+	dodoc {AUTHORS,CHANGELOG.md,README.md,USAGE.md}
+}
diff --git a/dev-embedded/nodemcu-uploader/Manifest b/dev-embedded/nodemcu-uploader/Manifest
index 162fa1f909e9..e2d2e2e58bc7 100644
--- a/dev-embedded/nodemcu-uploader/Manifest
+++ b/dev-embedded/nodemcu-uploader/Manifest
@@ -1 +1 @@
-DIST nodemcu-uploader-1.0.0.tar.gz 855474 BLAKE2B f61e10d8c55653003063f93f276fda3d22eb7f4b30cf36bf23dac68775e6be55b73931a4cab54eb244f158b61b7dd4bb5290994386fb355b4be103bf429b5b3c SHA512 9196f8394a26bb5d412d667f7ad423c38b23f906c800e190bbc6f93206a2cbf7da28609a0803bff8b83b32c699df073c49525c05d2dbf276530156224c539864
+DIST nodemcu-uploader-1.0.0.gh.tar.gz 855474 BLAKE2B f61e10d8c55653003063f93f276fda3d22eb7f4b30cf36bf23dac68775e6be55b73931a4cab54eb244f158b61b7dd4bb5290994386fb355b4be103bf429b5b3c SHA512 9196f8394a26bb5d412d667f7ad423c38b23f906c800e190bbc6f93206a2cbf7da28609a0803bff8b83b32c699df073c49525c05d2dbf276530156224c539864
diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild
index bf82f1c4fcba..e13505b028f7 100644
--- a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild
+++ b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild
@@ -4,20 +4,31 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
+
 inherit distutils-r1
 
 DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU"
 HOMEPAGE="https://github.com/kmpm/nodemcu-uploader"
-SRC_URI="https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/pyserial-3.4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
 
 src_prepare() {
 	# https://bugs.gentoo.org/796422
@@ -25,3 +36,8 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	"${EPYTHON}" -m unittest -v tests.get_tests ||
+		die "Tests failed on ${EPYTHON}"
+}
diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
deleted file mode 100644
index d6a6dde13414..000000000000
--- a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU"
-HOMEPAGE="https://github.com/kmpm/nodemcu-uploader"
-SRC_URI="https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/pyserial-3.4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# https://bugs.gentoo.org/796422
-	sed -i -e 's:description-file:description_file:' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-embedded/raspberrypi-utils/Manifest b/dev-embedded/raspberrypi-utils/Manifest
index 24632d7cb267..e5914f26e539 100644
--- a/dev-embedded/raspberrypi-utils/Manifest
+++ b/dev-embedded/raspberrypi-utils/Manifest
@@ -1 +1,2 @@
 DIST raspberrypi-utils-0_p20240203.tar.gz 122695 BLAKE2B 178b84b5210ba47a51e9815710b05d3916981f5413986cefcdb621420c9e9ab33b67026ea95692c6aff900dd2c31302059eb39aae32267b88cf765a7575f8bed SHA512 bdbe47d87a4bcd0d37ea4567e95e41fbc8240f5ffbc805d4a1f576060535af13e272b262ddad87dac0f9ea43b8b2ff9092378e67de080bd651701435b4c67008
+DIST raspberrypi-utils-0_p20240903.tar.gz 123998 BLAKE2B 4281fee7761df03b3a555d5e36f4bec1621c8402a5d5456752ab2d95482ca355e51d174f461ed8a1f89ed5d420a14d5f09872c090eccff6751d0c00ab20cf398 SHA512 96504004a1b7b541fe126d973f60321769a4b54a1b603b1d9278ba902bed7c008c2f86906dfaf30632ce75e1073b2a97e9317a799a0bc8cea255d713cb26ae67
diff --git a/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240903.ebuild b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240903.ebuild
new file mode 100644
index 000000000000..0ede982eed41
--- /dev/null
+++ b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240903.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 cmake
+
+COMMIT="d4f8fb543a892ba65bfc608511bf582c0425aa81"
+
+DESCRIPTION="Raspberry Pi userspace utilities"
+HOMEPAGE="https://github.com/raspberrypi/utils"
+SRC_URI="https://github.com/raspberrypi/utils/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/utils-${COMMIT}"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm ~arm64"
+
+DEPEND="
+	sys-apps/dtc
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	!media-libs/raspberrypi-userland
+	!media-libs/raspberrypi-userland-bin
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-werror.patch
+)
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	local SRC
+	rm -r "${ED}"/usr/share/bash-completion/ || die
+	for SRC in */*-completion.bash; do
+		local DEST=${SRC%-completion.bash}
+		newbashcomp "${SRC}" "${DEST##*/}"
+	done
+}
diff --git a/dev-embedded/stm32flash/Manifest b/dev-embedded/stm32flash/Manifest
index e4e097bf8308..85abfecea490 100644
--- a/dev-embedded/stm32flash/Manifest
+++ b/dev-embedded/stm32flash/Manifest
@@ -1,2 +1 @@
-DIST stm32flash-0.6.tar.gz 376186 BLAKE2B 82e479b4fad2c3ff832aea9d0d62d556500fd8c0530e879690b9b83cdf05f078b0051e1e104e7cb64b9c360ef84415904639ee67ee147045ce8e15ca3f6c61e1 SHA512 2d92ecf4f82b8a702b596cbf3c4ff594f67083f7dcec82c064555f73b47834b41a918efa1846e47fc8740ae63fa818b16dfb5b38fa242c17f465666a651eee3a
 DIST stm32flash-0.7.tar.gz 380166 BLAKE2B 98522968072821e3cf110e62486a3b9ee90ac6c7e600f6633acbfac904024390157743f0895cae181fc9b20f4f14dc5b833c36e02de4adbfc644c797abd12d63 SHA512 328254dd043dc707cf8c3edf8ddd4a9441c85d9cb2ca1682bcb3f5301d526b04ed6fb335e72a94e3d26341f18bef45968bf321f0ffeb80eaa0c3add6701349ff
diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch
deleted file mode 100644
index c4c7a2a7fedc..000000000000
--- a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 01fbb65d4626e1c122e329075526bd6035cb0be6 Mon Sep 17 00:00:00 2001
-From: Tormod Volden <debian.tormod@gmail.com>
-Date: Thu, 2 Sep 2021 16:25:57 +0200
-Subject: [PATCH 06/15] stm32: Fix typo from recent commit
-
-Oops, I got this wrong while amending commit b079cd09.
-
-Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
----
- stm32.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/stm32.c b/stm32.c
-index 6e2e402..0edaf01 100644
---- a/stm32.c
-+++ b/stm32.c
-@@ -851,7 +851,7 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
- 		buf[i++] = pages - 1;
- 		cs ^= (pages-1);
- 		/* For I2C send a checksum after the number of pages (AN4221) */
--		if (port->flags && PORT_NPAG_CSUM) {
-+		if (port->flags & PORT_NPAG_CSUM) {
- 			buf[i++] = cs;
- 			p_err = port->write(port, buf, i);
- 			if (p_err != PORT_ERR_OK) {
--- 
-2.33.0.309.g3052b89438-goog
-
diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch
deleted file mode 100644
index e0b519c48413..000000000000
--- a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 17a24f873122b96481adefaadc128bd1abba594f Mon Sep 17 00:00:00 2001
-From: Tormod Volden <debian.tormod@gmail.com>
-Date: Sat, 21 Aug 2021 13:06:34 +0200
-Subject: [PATCH 02/15] stm32: Consistent and unique erase error messages
-
-Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
----
- stm32.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/stm32.c b/stm32.c
-index 82fa26a..e071905 100644
---- a/stm32.c
-+++ b/stm32.c
-@@ -797,7 +797,7 @@ static stm32_err_t stm32_mass_erase(const stm32_t *stm)
- 		return STM32_ERR_OK;
- 	}
- 
--	/* extended erase */
-+	/* extended erase (0x44 or 0x45) */
- 	buf[0] = 0xFF;	/* 0xFFFF the magic number for mass erase */
- 	buf[1] = 0xFF;
- 	buf[2] = 0x00;  /* checksum */
-@@ -870,11 +870,12 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
- 		p_err = port->write(port, buf, i);
- 		free(buf);
- 		if (p_err != PORT_ERR_OK) {
--			fprintf(stderr, "Erase failed.\n");
-+			fprintf(stderr, "Erase failed sending list of pages.\n");
- 			return STM32_ERR_UNKNOWN;
- 		}
- 		s_err = stm32_get_ack_timeout(stm, pages * STM32_PAGEERASE_TIMEOUT);
- 		if (s_err != STM32_ERR_OK) {
-+			fprintf(stderr, "Erase failed.\n");
- 			if (port->flags & PORT_STRETCH_W)
- 				stm32_warn_stretching("erase");
- 			return STM32_ERR_UNKNOWN;
-@@ -882,7 +883,7 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
- 		return STM32_ERR_OK;
- 	}
- 
--	/* extended erase */
-+	/* extended erase (0x44 or 0x45) */
- 	buf = malloc(2 + 2 * pages + 1);
- 	if (!buf)
- 		return STM32_ERR_UNKNOWN;
-@@ -925,13 +926,13 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
- 	p_err = port->write(port, buf, i);
- 	free(buf);
- 	if (p_err != PORT_ERR_OK) {
--		fprintf(stderr, "Page-by-page erase error.\n");
-+		fprintf(stderr, "Extended erase failed sending list of pages.\n");
- 		return STM32_ERR_UNKNOWN;
- 	}
- 
- 	s_err = stm32_get_ack_timeout(stm, pages * STM32_PAGEERASE_TIMEOUT);
- 	if (s_err != STM32_ERR_OK) {
--		fprintf(stderr, "Page-by-page erase failed. Check the maximum pages your device supports.\n");
-+		fprintf(stderr, "Extended erase failed. Check the maximum pages your device supports.\n");
- 		if ((port->flags & PORT_STRETCH_W)
- 		    && stm->cmd->er != STM32_CMD_EE_NS)
- 			stm32_warn_stretching("erase");
--- 
-2.33.0.309.g3052b89438-goog
-
diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch
deleted file mode 100644
index dcd7299570c5..000000000000
--- a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From b079cd09bc942b4a489cad29524418441a44fc82 Mon Sep 17 00:00:00 2001
-From: Yann Sionneau <ysionneau@kalray.eu>
-Date: Wed, 28 Apr 2021 14:16:01 +0200
-Subject: [PATCH 01/15] Follow bootloader protocol for page-by-page erase over
- I2C
-
-For I2C the protocol is slighly different than for USART,
-requiring a checksum after the number of pages.
-
-https://sourceforge.net/p/stm32flash/tickets/98/
-
-Signed-off-by: Yann Sionneau <ysionneau@kalray.eu>
-[Tormod: Add port flag, no wait, amend messages]
-Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
----
- i2c.c   |  2 +-
- port.h  |  1 +
- stm32.c | 37 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 39 insertions(+), 1 deletion(-)
-
-diff --git a/i2c.c b/i2c.c
-index bb99545..8425b41 100644
---- a/i2c.c
-+++ b/i2c.c
-@@ -204,7 +204,7 @@ static port_err_t i2c_flush(struct port_interface __unused *port)
- 
- struct port_interface port_i2c = {
- 	.name	= "i2c",
--	.flags	= PORT_STRETCH_W,
-+	.flags	= PORT_STRETCH_W | PORT_NPAG_CSUM,
- 	.open	= i2c_open,
- 	.close	= i2c_close,
- 	.flush  = i2c_flush,
-diff --git a/port.h b/port.h
-index 4e728d7..1a28dc6 100644
---- a/port.h
-+++ b/port.h
-@@ -34,6 +34,7 @@ typedef enum {
- #define PORT_CMD_INIT	(1 << 2)	/* use INIT cmd to autodetect speed */
- #define PORT_RETRY	(1 << 3)	/* allowed read() retry after timeout */
- #define PORT_STRETCH_W	(1 << 4)	/* warning for no-stretching commands */
-+#define PORT_NPAG_CSUM	(1 << 5)	/* checksum after number of pages to erase */
- 
- /* all options and flags used to open and configure an interface */
- struct port_options {
-diff --git a/stm32.c b/stm32.c
-index 966048b..82fa26a 100644
---- a/stm32.c
-+++ b/stm32.c
-@@ -843,6 +843,25 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
- 
- 		buf[i++] = pages - 1;
- 		cs ^= (pages-1);
-+		/* For I2C send a checksum after the number of pages (AN4221) */
-+		if (port->flags && PORT_NPAG_CSUM) {
-+			buf[i++] = cs;
-+			p_err = port->write(port, buf, i);
-+			if (p_err != PORT_ERR_OK) {
-+				fprintf(stderr, "Erase failed sending number of pages.");
-+				free(buf);
-+				return STM32_ERR_UNKNOWN;
-+			}
-+			s_err = stm32_get_ack(stm);
-+			if (s_err != STM32_ERR_OK) {
-+				fprintf(stderr, "Erase failed, no ack after number of pages.");
-+				free(buf);
-+				return STM32_ERR_UNKNOWN;
-+			}
-+			cs = 0;
-+			i = 0;
-+		}
-+
- 		for (pg_num = spage; pg_num < (pages + spage); pg_num++) {
- 			buf[i++] = pg_num;
- 			cs ^= pg_num;
-@@ -876,6 +895,24 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_
- 	buf[i++] = pg_byte;
- 	cs ^= pg_byte;
- 
-+	if (port->flags & PORT_NPAG_CSUM) {
-+		buf[i++] = cs;
-+		p_err = port->write(port, buf, i);
-+		if (p_err != PORT_ERR_OK) {
-+			fprintf(stderr, "Extended erase failed sending number of pages.");
-+			free(buf);
-+			return STM32_ERR_UNKNOWN;
-+		}
-+		s_err = stm32_get_ack(stm);
-+		if (s_err != STM32_ERR_OK) {
-+			fprintf(stderr, "Extended erase failed, no ack after number of pages.");
-+			free(buf);
-+			return STM32_ERR_UNKNOWN;
-+		}
-+		cs = 0;
-+		i = 0;
-+	}
-+
- 	for (pg_num = spage; pg_num < spage + pages; pg_num++) {
- 		pg_byte = pg_num >> 8;
- 		cs ^= pg_byte;
--- 
-2.33.0.309.g3052b89438-goog
-
diff --git a/dev-embedded/stm32flash/stm32flash-0.6.ebuild b/dev-embedded/stm32flash/stm32flash-0.6.ebuild
deleted file mode 100644
index 34348ceabecc..000000000000
--- a/dev-embedded/stm32flash/stm32flash-0.6.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 toolchain-funcs
-
-DESCRIPTION="Open source flash program for STM32 using the ST serial bootloader"
-HOMEPAGE="https://sourceforge.net/projects/stm32flash/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}/stm32flash-0.6-fix-i2c-erase-b079cd0.patch"
-	"${FILESDIR}/stm32flash-0.6-fix-i2c-erase-17a24f8.patch"
-	"${FILESDIR}/stm32flash-0.6-fix-i2c-erase-01fbb65.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch b/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch
deleted file mode 100644
index 90c8ce3f0a4d..000000000000
--- a/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Disable unused mkeficapsule
-
-`CONFIG_TOOLS_MKEFICAPSULE` requires gnutls to build. Since we don't actually
-expose the tool, we can just disable it.
-
-diff -ur a/configs/tools-only_defconfig b/configs/tools-only_defconfig
---- a/configs/tools-only_defconfig	2023-01-09 09:07:33.000000000 -0700
-+++ b/configs/tools-only_defconfig	2023-08-11 14:01:50.151294889 -0600
-@@ -33,4 +33,4 @@
- # CONFIG_VIRTIO_SANDBOX is not set
- # CONFIG_GENERATE_ACPI_TABLE is not set
- # CONFIG_EFI_LOADER is not set
--CONFIG_TOOLS_MKEFICAPSULE=y
-+# CONFIG_TOOLS_MKEFICAPSULE is not set
diff --git a/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch b/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch
deleted file mode 100644
index 8686341a8776..000000000000
--- a/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Disable unused pylibfdt
-
-The `imply BINMAN` causes `pylibfdt` to be built, which requires python. We
-don't currently expose `pylibfdt`, or declare python dependencies, so disable
-it.
-
-diff -ur a/arch/Kconfig b/arch/Kconfig
---- a/arch/Kconfig	2023-01-09 09:07:33.000000000 -0700
-+++ b/arch/Kconfig	2023-08-11 14:01:05.998403114 -0600
-@@ -205,7 +205,6 @@
- 	imply KEYBOARD
- 	imply PHYSMEM
- 	imply GENERATE_ACPI_TABLE
--	imply BINMAN
- 
- config SH
- 	bool "SuperH architecture"
diff --git a/dev-embedded/urjtag/urjtag-2021.03.ebuild b/dev-embedded/urjtag/urjtag-2021.03.ebuild
index 1b765b94391a..56275fc855ba 100644
--- a/dev-embedded/urjtag/urjtag-2021.03.ebuild
+++ b/dev-embedded/urjtag/urjtag-2021.03.ebuild
@@ -8,16 +8,16 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit python-r1
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
+	EGIT_REPO_URI="https://git.code.sf.net/p/urjtag/git"
 	inherit git-r3 autotools
 	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://downloads.sourceforge.net/urjtag/${P}.tar.xz"
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="amd64 ppc sparc x86"
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="https://urjtag.sourceforge.net/"
+HOMEPAGE="https://urjtag.sourceforge.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild
index d01057522264..60327e2adb4b 100644
--- a/dev-embedded/urjtag/urjtag-9999.ebuild
+++ b/dev-embedded/urjtag/urjtag-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit python-r1
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
+	EGIT_REPO_URI="https://git.code.sf.net/p/urjtag/git"
 	inherit git-r3 autotools
 	S="${WORKDIR}/${P}/${PN}"
 else
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="https://urjtag.sourceforge.net/"
+HOMEPAGE="https://urjtag.sourceforge.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 48ca269c753b..9035856a1422 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,2 +1 @@
-DIST xa-2.4.0.tar.gz 197862 BLAKE2B 27f8b41dafee9c1c4158681d57f971297a0a63e09df164469f665528cffae0cdd78441c0a939d742463e851f32a73ee30a95f2b2b41e2fe42137041a03041255 SHA512 eebaf67715324735203405016df7311bf2ed568ab0e609c0fec7d9d803c173cde5dea161b7f713cb5215454d1ce69acbde43372016dfe9866ed99acecb9aafb1
 DIST xa-2.4.1.tar.gz 208553 BLAKE2B 86092d2a215d141f76bb8a31861f20e5124f2ec7125a5649b9b28a86e727d5f201826581c38aea8693d16692d8be13103a917c1152980d6a4764555751af7dac SHA512 aaec796bec362ab253abc33320cb36ef879fa661c2091c7e3b2ce96ccc56063c59335fb7eb1d6a3de9486ab8973cbbc71c445e1ef816572a55a1338ffed19dc0
diff --git a/dev-embedded/xa/xa-2.4.0.ebuild b/dev-embedded/xa/xa-2.4.0.ebuild
deleted file mode 100644
index df008580717d..000000000000
--- a/dev-embedded/xa/xa-2.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="High-speed, two-pass portable 6502 cross-assembler"
-HOMEPAGE="https://www.floodgap.com/retrotech/xa/"
-SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.0-make.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${ED}"/usr install
-	einstalldocs
-}
diff --git a/dev-embedded/xa/xa-2.4.1.ebuild b/dev-embedded/xa/xa-2.4.1.ebuild
index 35f2dd66f1e2..8c7876bee858 100644
--- a/dev-embedded/xa/xa-2.4.1.ebuild
+++ b/dev-embedded/xa/xa-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.1-make.patch
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest
index 18d0ae031fb1..46eac68663fa 100644
--- a/dev-games/flatzebra/Manifest
+++ b/dev-games/flatzebra/Manifest
@@ -1 +1 @@
-DIST flatzebra-0.1.7.tar.gz 375938 BLAKE2B b84ee2a69c02a7fd519de3e709a81026946b107fa1ddf8f4ee24a490ae9993f2ecf6c8509b9e92d1ab4e11e7f41e41effaaa2b32a7d2e679400f02853602a9bb SHA512 12afbb0ef00dfac21654961da8d2101e9b7b0e6550b9e66bfb4da4faf77cc1dfb7f3da15c8b84c19379eb1ff8bac09324acc694f9282b74ae73a7379686f2374
+DIST flatzebra-0.2.0.tar.gz 654669 BLAKE2B ffb83a530ad8420e72913f3e1cd41ad8c323e712093a207fe46ac0a8faba76d8693c22d0546fc8fde00bb1d167bebf103ec5a748bb9edeef3554ad4b5f38a570 SHA512 d75914dd5a886d0c08407beb36370421c7cf8a375ca7df3d812f8edeac571d94b8ad2fc55a6cd8abadb14c55259d1031df585a1813c5b5e3b92ba07eb013a897
diff --git a/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild b/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild
deleted file mode 100644
index 89175cf28dff..000000000000
--- a/dev-games/flatzebra/flatzebra-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic game engine for 2D double-buffering animation"
-HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
-SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libsdl[joystick,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^doc_DATA =/s/^/NOTHANKS/' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-games/flatzebra/flatzebra-0.2.0.ebuild b/dev-games/flatzebra/flatzebra-0.2.0.ebuild
new file mode 100644
index 000000000000..35df9c7056e8
--- /dev/null
+++ b/dev-games/flatzebra/flatzebra-0.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Generic game engine for 2D double-buffering animation"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libsdl2[joystick,video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 8d87ae02a38c..5a5473e4a4b7 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,3 +1 @@
-DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
-DIST godot-4.2.2-stable.tar.xz 26768552 BLAKE2B e4a6040d7a1f63f841f56d74bb7b04e58f2fa26ddd8850df7f93937deb10c4af925ea2059c174d9f457222e0cddfe477498e3462bfaaf69ec8e57de8f2d43c83 SHA512 4a623063be5488957e1ede7e45b6865f6cd61bc954ac311587b9e97bed848a4083c4a7225d0a81bca285d854d33be9b07d7d0c21465c9f25b90e92b08090429c
 DIST godot-4.3-stable.tar.xz 29140004 BLAKE2B 0698cf6c8ba853d094c39b461efe998c57a7de0609701e46cca48b17c29eca3da29c8644aa356cff330d1d3ae88048afc2148f5389d57cdfa1dd26784e6d9a44 SHA512 6e1eaba5c3447527ce60d623f7f81cbd90633a5a1ad4c6dd469055a43c8fb9b4807fcd3bae25331294596c2418eb6c0c9db0871c3e1405ddcc7d84e29c39a45b
diff --git a/dev-games/godot/files/godot-3.5-musl.patch b/dev-games/godot/files/godot-3.5-musl.patch
deleted file mode 100644
index 0738b035480f..000000000000
--- a/dev-games/godot/files/godot-3.5-musl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-crash handler requires glibc or libexecinfo (not packaged),
-and is always enabled if build the editor (release_debug)
---- a/platform/x11/crash_handler_x11.cpp
-+++ b/platform/x11/crash_handler_x11.cpp
-@@ -38,3 +38,3 @@
- 
--#ifdef DEBUG_ENABLED
-+#if defined(DEBUG_ENABLED) && defined(__GLIBC__)
- #define CRASH_HANDLER_ENABLED 1
diff --git a/dev-games/godot/files/godot-3.5-scons.patch b/dev-games/godot/files/godot-3.5-scons.patch
deleted file mode 100644
index b8ed7f50311d..000000000000
--- a/dev-games/godot/files/godot-3.5-scons.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-* add option to respect AR
- (respecting PKG_CONFIG is handled in the ebuild)
-* handle recastnavigation unbundling
-* remove unnecessary opusfile
-* remove unnecessary -no-pie
-* remove -pipe from LDFLAGS, may "possibly" be relevant to:
-  https://bugs.gentoo.org/861689
-  https://github.com/godotengine/godot/commit/f035e784
---- a/SConstruct
-+++ b/SConstruct
-@@ -192,4 +192,5 @@
- opts.Add("CXX", "C++ compiler")
- opts.Add("CC", "C compiler")
-+opts.Add("AR", "Archiver")
- opts.Add("LINK", "Linker")
- opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
---- a/platform/server/detect.py
-+++ b/platform/server/detect.py
-@@ -135,5 +135,4 @@
- 
-     env.Append(CCFLAGS=["-pipe"])
--    env.Append(LINKFLAGS=["-pipe"])
- 
-     ## Dependencies
-@@ -178,4 +177,7 @@
-         env.ParseConfig("pkg-config libenet --cflags --libs")
- 
-+    if not env["builtin_recast"]:
-+        env.ParseConfig("pkg-config recastnavigation --cflags --libs")
-+
-     if not env["builtin_squish"]:
-         env.ParseConfig("pkg-config libsquish --cflags --libs")
-@@ -205,5 +207,5 @@
-     if not env["builtin_opus"]:
-         env["builtin_libogg"] = False  # Needed to link against system opus
--        env.ParseConfig("pkg-config opus opusfile --cflags --libs")
-+        env.ParseConfig("pkg-config opus --cflags --libs")
- 
-     if not env["builtin_libogg"]:
---- a/platform/x11/detect.py
-+++ b/platform/x11/detect.py
-@@ -232,17 +232,5 @@
- 
-     env.Append(CCFLAGS=["-pipe"])
--    env.Append(LINKFLAGS=["-pipe"])
- 
--    # Check for gcc version >= 6 before adding -no-pie
--    version = get_compiler_version(env) or [-1, -1]
--    if using_gcc(env):
--        if version[0] >= 6:
--            env.Append(CCFLAGS=["-fpie"])
--            env.Append(LINKFLAGS=["-no-pie"])
--    # Do the same for clang should be fine with Clang 4 and higher
--    if using_clang(env):
--        if version[0] >= 4:
--            env.Append(CCFLAGS=["-fpie"])
--            env.Append(LINKFLAGS=["-no-pie"])
- 
-     ## Dependencies
-@@ -298,4 +286,7 @@
-         env.ParseConfig("pkg-config libenet --cflags --libs")
- 
-+    if not env["builtin_recast"]:
-+        env.ParseConfig("pkg-config recastnavigation --cflags --libs")
-+
-     if not env["builtin_squish"]:
-         env.ParseConfig("pkg-config libsquish --cflags --libs")
-@@ -325,5 +316,5 @@
-     if not env["builtin_opus"]:
-         env["builtin_libogg"] = False  # Needed to link against system opus
--        env.ParseConfig("pkg-config opus opusfile --cflags --libs")
-+        env.ParseConfig("pkg-config opus --cflags --libs")
- 
-     if not env["builtin_libogg"]:
diff --git a/dev-games/godot/files/godot-3.5.3-gcc13.patch b/dev-games/godot/files/godot-3.5.3-gcc13.patch
deleted file mode 100644
index dd681b87dce5..000000000000
--- a/dev-games/godot/files/godot-3.5.3-gcc13.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Issues seem(?) to only trigger when gcc13 is combined with musl.
-
-https://bugs.gentoo.org/906363
---- a/modules/fbx/fbx_parser/FBXCommon.h
-+++ b/modules/fbx/fbx_parser/FBXCommon.h
-@@ -78,2 +78,3 @@
- 
-+#include <cstdint>
- #include <string>
diff --git a/dev-games/godot/files/godot-4.0_rc2-musl.patch b/dev-games/godot/files/godot-4.0_rc2-musl.patch
deleted file mode 100644
index 3b9a458ac7d4..000000000000
--- a/dev-games/godot/files/godot-4.0_rc2-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Crash handler requires glibc or libexecinfo (not packaged) and is enabled
-if build the editor (implies debug), but can be easily turned off.
-https://bugs.gentoo.org/894762
---- a/platform/linuxbsd/crash_handler_linuxbsd.cpp
-+++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp
-@@ -38,3 +38,3 @@
- 
--#ifdef DEBUG_ENABLED
-+#if defined(DEBUG_ENABLED) && defined(__GLIBC__)
- #define CRASH_HANDLER_ENABLED 1
---- a/platform/linuxbsd/detect.py
-+++ b/platform/linuxbsd/detect.py
-@@ -329,8 +329,2 @@
- 
--    if not env["execinfo"] and platform.libc_ver()[0] != "glibc":
--        # The default crash handler depends on glibc, so if the host uses
--        # a different libc (BSD libc, musl), fall back to libexecinfo.
--        print("Note: Using `execinfo=yes` for the crash handler as required on platforms where glibc is missing.")
--        env["execinfo"] = True
--
-     if env["execinfo"]:
diff --git a/dev-games/godot/files/godot-4.0_rc3-scons.patch b/dev-games/godot/files/godot-4.0_rc3-scons.patch
deleted file mode 100644
index 682e1510ac94..000000000000
--- a/dev-games/godot/files/godot-4.0_rc3-scons.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -241,2 +241,3 @@
- opts.Add("CC", "C compiler")
-+opts.Add("AR", "Archiver")
- opts.Add("LINK", "Linker")
-@@ -569,8 +570,2 @@
-                 env.Append(CCFLAGS=["-g2"])
--        else:
--            if methods.using_clang(env) and not methods.is_vanilla_clang(env):
--                # Apple Clang, its linker doesn't like -s.
--                env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
--            else:
--                env.Append(LINKFLAGS=["-s"])
- 
diff --git a/dev-games/godot/godot-3.5.3-r1.ebuild b/dev-games/godot/godot-3.5.3-r1.ebuild
deleted file mode 100644
index 9a41621d39b5..000000000000
--- a/dev-games/godot/godot-3.5.3-r1.ebuild
+++ /dev/null
@@ -1,218 +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 desktop python-any-r1 scons-utils shell-completion toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
-"
-S="${WORKDIR}/${P}-stable"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( BitstreamVera OFL-1.1 )
-"
-SLOT="3"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	+bullet debug deprecated +gui pulseaudio raycast +runner +theora
-	+tools +udev +upnp +webm +webp
-"
-
-# dlopen: alsa-lib,pulseaudio,udev
-RDEPEND="
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/alsa-lib
-	media-libs/freetype[brotli]
-	media-libs/libpng:=
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	bullet? ( sci-physics/bullet:= )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		tools? ( raycast? ( media-libs/embree:3 ) )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	webm? (
-		media-libs/libvorbis
-		media-libs/libvpx:=
-		media-libs/opus
-	)
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-musl.patch
-	"${FILESDIR}"/${PN}-3.5-scons.patch
-	"${FILESDIR}"/${PN}-3.5.3-gcc13.patch
-)
-
-src_prepare() {
-	default
-
-	# handle slotting
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-	sed -e "s/godot/&${SLOT}/g" \
-		-i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/{x11,server}/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		bullet embree freetype libogg libpng libtheora libvorbis libvpx
-		libwebp mbedtls opus pcre2 recastnavigation wslay zlib zstd # miniupnpc
-		# certs: unused by generated header, but scons panics if not found
-		# miniupnpc: check if can re-add on bump, bug #934044
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		platform=$(usex gui x11 server)
-		progress=no
-		verbose=yes
-
-		deprecated=$(usex deprecated)
-		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
-		minizip=yes # uses a modified bundled copy
-		pulseaudio=$(usex pulseaudio)
-		udev=$(usex udev)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_bullet=$(usex !bullet)
-		builtin_certs=no
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_libogg=yes # unused
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=$(usex !theora $(usex !webm))
-		builtin_libvpx=$(usex !webm)
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=yes #934044 (for now, should revisit)
-		builtin_opus=$(usex !webm)
-		builtin_pcre2=no
-		builtin_recast=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_bullet_enabled=$(usex bullet)
-		module_mono_enabled=no # unhandled
-		module_ogg_enabled=no # unused
-		module_opus_enabled=no # unused, support is gone and webm uses system's
-		# note raycast is disabled on many arches, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_vorbis_enabled=no # unused, non-theora/webm uses stb_vorbis
-		module_webm_enabled=$(usex webm)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these, e.g. can pass -flto as-is
-		debug_symbols=no
-		optimize=none
-		use_lto=no
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		# debug: debug for godot itself
-		# release_debug: debug for game development
-		# release: no debugging paths, only available with tools=no
-		target=$(usex debug{,} $(usex tools release_debug release))
-		tools=$(usex tools)
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	newfishcomp misc/dist/shell/godot.fish ${s}.fish
-	newzshcomp misc/dist/shell/_godot.zsh-completion _${s}
-}
diff --git a/dev-games/godot/godot-4.2.2-r1.ebuild b/dev-games/godot/godot-4.2.2-r1.ebuild
deleted file mode 100644
index d9ea297149f2..000000000000
--- a/dev-games/godot/godot-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,238 +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 desktop python-any-r1 flag-o-matic scons-utils
-inherit shell-completion toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
-"
-S=${WORKDIR}/${P}-stable
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-"
-SLOT="4"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +vulkan +webp
-"
-# TODO: tests still need more figuring out
-RESTRICT="test"
-
-# dlopen: libglvnd
-RDEPEND="
-	app-arch/brotli:=
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/freetype[brotli,harfbuzz]
-	media-libs/harfbuzz:=[icu]
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libvorbis
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxkbcommon
-		tools? ( raycast? ( media-libs/embree:3 ) )
-		vulkan? ( media-libs/vulkan-loader[X] )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
-	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
-)
-
-src_prepare() {
-	default
-
-	# handle slotting
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-	sed -e "s/godot/&${SLOT}/g" \
-		-i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		brotli doctest embree freetype graphite harfbuzz icu4c libogg
-		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		pcre2 recastnavigation volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-		# miniupnpc: check if can re-add on bump, bug #934044
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	filter-lto #921017
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		use_sowrap=no
-
-		alsa=$(usex alsa)
-		dbus=$(usex dbus)
-		deprecated=$(usex deprecated)
-		fontconfig=$(usex fontconfig)
-		opengl3=$(usex gui)
-		pulseaudio=$(usex pulseaudio)
-		speechd=$(usex speech)
-		udev=$(usex udev)
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		x11=$(usex gui)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but many ignore whether the dep
-		# is actually used, so "enable" deleted builtins on disabled deps
-		builtin_brotli=no
-		builtin_certs=no
-		builtin_clipper2=yes # not packaged
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_glslang=yes #879111 (for now, may revisit if more stable)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu4c=no
-		builtin_libogg=no
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=no
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=yes #934044 (for now, should revisit)
-		builtin_msdfgen=yes # not wired for unbundling nor packaged
-		builtin_openxr=yes # not packaged
-		builtin_pcre2=no
-		builtin_recastnavigation=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_mono_enabled=no # unhandled
-		# note raycast is only enabled on amd64+arm64, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		target=$(usex tools editor template_$(usex debug{,} release))
-		dev_build=$(usex debug)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	newfishcomp misc/dist/shell/godot.fish ${s}.fish
-	newzshcomp misc/dist/shell/_godot.zsh-completion _${s}
-}
diff --git a/dev-games/godot/godot-4.3-r1.ebuild b/dev-games/godot/godot-4.3-r1.ebuild
new file mode 100644
index 000000000000..0bf48fbd9cbf
--- /dev/null
+++ b/dev-games/godot/godot-4.3-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit desktop python-any-r1 flag-o-matic scons-utils
+inherit shell-completion toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="
+	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
+	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
+"
+S=${WORKDIR}/${P}-stable
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	speech test +theora +tools +udev +upnp +vulkan wayland +webp
+"
+REQUIRED_USE="wayland? ( gui )"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# mbedtls: "can" use >=mbedtls-3 but the module needs updates handle
+# the new tls1.3 default among other things, and the bundled 3.x copy
+# 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
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/brotli:=
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:4 ) )
+		vulkan? ( media-libs/vulkan-loader[X,wayland?] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	wayland? (
+		dev-libs/wayland
+		gui-libs/libdecor
+	)
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		brotli doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+		# miniupnpc: check if can re-add on bump, bug #934044
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	filter-lto #921017
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		execinfo=no # not packaged, disables crash handler if non-glibc
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		wayland=$(usex wayland)
+		# TODO: retry to add optional USE=X, wayland support is new
+		# and gui build is not well wired to handle USE="-X wayland" yet
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but many ignore whether the dep
+		# is actually used, so "enable" deleted builtins on disabled deps
+		builtin_brotli=no
+		builtin_certs=no
+		builtin_clipper2=yes # not packaged
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=yes #934044 (for now, should revisit)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+
+	bin/godot* --headless --test || die
+}
+
+src_install() {
+	# suffix varies depending on arch/features, use wildcard to simplify
+	newbin bin/godot* godot
+
+	doman misc/dist/linux/godot.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg godot.svg
+		domenu misc/dist/linux/org.godotengine.Godot.desktop
+
+		insinto /usr/share/metainfo
+		doins misc/dist/linux/org.godotengine.Godot.appdata.xml
+
+		insinto /usr/share/mime/application
+		doins misc/dist/linux/org.godotengine.Godot.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion godot
+	newfishcomp misc/dist/shell/godot.fish godot.fish
+	newzshcomp misc/dist/shell/_godot.zsh-completion _godot
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version dev-games/godot:3 || has_version dev-games/godot:4; then
+		elog
+		elog "Gentoo's godot ebuild has removed slotting support meaning that godot"
+		elog "is now invoked with 'godot' rather than 'godot4', and godot3 has been"
+		elog "removed. USE=runner and 'godot*-runner' were also removed."
+	fi
+}
diff --git a/dev-games/godot/godot-4.3.ebuild b/dev-games/godot/godot-4.3.ebuild
deleted file mode 100644
index 73a8bda01e8f..000000000000
--- a/dev-games/godot/godot-4.3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit desktop python-any-r1 flag-o-matic scons-utils
-inherit shell-completion toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
-"
-S=${WORKDIR}/${P}-stable
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-"
-SLOT="4"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +vulkan wayland +webp
-"
-REQUIRED_USE="wayland? ( gui )"
-# TODO: tests still need more figuring out
-RESTRICT="test"
-
-# mbedtls: "can" use >=mbedtls-3 but the module needs updates handle
-# the new tls1.3 default among other things, and the bundled 3.x copy
-# 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
-# dlopen: libglvnd
-RDEPEND="
-	app-arch/brotli:=
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/freetype[brotli,harfbuzz]
-	media-libs/harfbuzz:=[icu]
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libvorbis
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxkbcommon
-		tools? ( raycast? ( media-libs/embree:4 ) )
-		vulkan? ( media-libs/vulkan-loader[X,wayland?] )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	wayland? (
-		dev-libs/wayland
-		gui-libs/libdecor
-	)
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )
-"
-BDEPEND="
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-scons.patch
-)
-
-src_prepare() {
-	default
-
-	# handle slotting
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-	sed -e "s/godot/&${SLOT}/g" \
-		-i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		brotli doctest embree freetype graphite harfbuzz icu4c libogg
-		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		pcre2 recastnavigation volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-		# miniupnpc: check if can re-add on bump, bug #934044
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	filter-lto #921017
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		use_sowrap=no
-
-		alsa=$(usex alsa)
-		dbus=$(usex dbus)
-		deprecated=$(usex deprecated)
-		execinfo=no # not packaged, disables crash handler if non-glibc
-		fontconfig=$(usex fontconfig)
-		opengl3=$(usex gui)
-		pulseaudio=$(usex pulseaudio)
-		speechd=$(usex speech)
-		udev=$(usex udev)
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		wayland=$(usex wayland)
-		# TODO: retry to add optional USE=X, wayland support is new
-		# and gui build is not well wired to handle USE="-X wayland" yet
-		x11=$(usex gui)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but many ignore whether the dep
-		# is actually used, so "enable" deleted builtins on disabled deps
-		builtin_brotli=no
-		builtin_certs=no
-		builtin_clipper2=yes # not packaged
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_glslang=yes #879111 (for now, may revisit if more stable)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu4c=no
-		builtin_libogg=no
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=no
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=yes #934044 (for now, should revisit)
-		builtin_msdfgen=yes # not wired for unbundling nor packaged
-		builtin_openxr=yes # not packaged
-		builtin_pcre2=no
-		builtin_recastnavigation=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_mono_enabled=no # unhandled
-		# note raycast is only enabled on amd64+arm64, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		target=$(usex tools editor template_$(usex debug{,} release))
-		dev_build=$(usex debug)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	newfishcomp misc/dist/shell/godot.fish ${s}.fish
-	newzshcomp misc/dist/shell/_godot.zsh-completion _${s}
-}
diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml
index 71f596fee4e9..b1acc9b2ce0d 100644
--- a/dev-games/godot/metadata.xml
+++ b/dev-games/godot/metadata.xml
@@ -20,12 +20,9 @@
 		and consoles.
 	</longdescription>
 	<use>
-		<flag name="bullet">Enable the <pkg>sci-physics/bullet</pkg> module</flag>
 		<flag name="deprecated">Enable support for deprecated features</flag>
 		<flag name="raycast">Enable the raycast Editor module using <pkg>media-libs/embree</pkg></flag>
-		<flag name="runner">Build an additional binary optimized for running games (only relevant with USE=tools)</flag>
 		<flag name="tools">Enable the Godot Editor for game development</flag>
-		<flag name="webm">Enable the WebM module</flag>
 	</use>
 	<upstream>
 		<doc>https://docs.godotengine.org/</doc>
diff --git a/dev-games/irrlicht-mt-headers/Manifest b/dev-games/irrlicht-mt-headers/Manifest
index 10aff65bbbca..9250f2b93075 100644
--- a/dev-games/irrlicht-mt-headers/Manifest
+++ b/dev-games/irrlicht-mt-headers/Manifest
@@ -1,2 +1 @@
-DIST irrlicht-mt-1.9.0.10.tar.gz 898774 BLAKE2B 2b11aead4556127bff7c7f06d16a57632cf1758ad0ddf12e6d9346d80d13c0cd437ccade268db5bec25f8d62cfa61e9ecda07a98d0a82c18b548a1b520dccee2 SHA512 216221b5073d2b234b2d19658b30517c3abb2677c16e3a9b7fd31c15431bd2ffc047a68851c5bebf94aeb178d6b761a80c2f5744a7498cdac1d7b65fed139cc0
 DIST irrlicht-mt-1.9.0.13.tar.gz 754056 BLAKE2B 02e3a219c2cfbd0c383f70c5e82d06563e28b4ae3fb59d420bb570e38d8618b525db50ddb67fbb91182f64b0567f99caa517f9799c650be3c8cd98ce43a9bc76 SHA512 5226d78eaacf8b56eafbbb6359bfb6137f9d6a555a252224e33d39c0d219fcb7d0d29fd3828961eee37d55940f3aa6e767fea31c96fb772dd5eca3889f5ac16e
diff --git a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild
deleted file mode 100644
index ca22218f7ec1..000000000000
--- a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-mt-headers}"
-MY_PV="$(ver_rs 3 'mt')"
-MY_P="${MY_PN}-${MY_PV}"
-# These two should be kept in sync with dev-games/irrlicht-mt
-SRC_PN="${PN%-headers}"
-SRC_P="${SRC_PN}-${PV}"
-
-DESCRIPTION="Header files for Minetest's fork of dev-games/irrlicht"
-HOMEPAGE="https://github.com/minetest/irrlicht"
-SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${SRC_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="!<dev-games/irrlicht-mt-1.9.0.4-r1"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/include/${SRC_PN/-/}
-	doins include/*
-}
diff --git a/dev-games/irrlicht-mt/Manifest b/dev-games/irrlicht-mt/Manifest
index 10aff65bbbca..9250f2b93075 100644
--- a/dev-games/irrlicht-mt/Manifest
+++ b/dev-games/irrlicht-mt/Manifest
@@ -1,2 +1 @@
-DIST irrlicht-mt-1.9.0.10.tar.gz 898774 BLAKE2B 2b11aead4556127bff7c7f06d16a57632cf1758ad0ddf12e6d9346d80d13c0cd437ccade268db5bec25f8d62cfa61e9ecda07a98d0a82c18b548a1b520dccee2 SHA512 216221b5073d2b234b2d19658b30517c3abb2677c16e3a9b7fd31c15431bd2ffc047a68851c5bebf94aeb178d6b761a80c2f5744a7498cdac1d7b65fed139cc0
 DIST irrlicht-mt-1.9.0.13.tar.gz 754056 BLAKE2B 02e3a219c2cfbd0c383f70c5e82d06563e28b4ae3fb59d420bb570e38d8618b525db50ddb67fbb91182f64b0567f99caa517f9799c650be3c8cd98ce43a9bc76 SHA512 5226d78eaacf8b56eafbbb6359bfb6137f9d6a555a252224e33d39c0d219fcb7d0d29fd3828961eee37d55940f3aa6e767fea31c96fb772dd5eca3889f5ac16e
diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild
deleted file mode 100644
index aabef13c265f..000000000000
--- a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="${PN%-mt}"
-MY_PV="$(ver_rs 3 'mt')"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Minetest's fork of dev-games/irrlicht"
-HOMEPAGE="https://github.com/minetest/irrlicht"
-SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="~dev-games/irrlicht-mt-headers-${PV}
-	media-libs/libpng:0=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0.10-no_upstream_optflags.patch
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	cmake_src_install
-
-	# We package these separately
-	rm -r "${ED}"/usr/include/${PN/-/} || die "Failed to exclude header files from installation"
-}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index e42c7439c30b..99a75380d3c3 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1 +1,2 @@
+DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d
 DIST tiled-1.8.6.tar.gz 17053221 BLAKE2B a226ff9861ebfa3980176fac2b23c7fff8ac6db585444c5d5c21afff2301298e1eaa74179970bfaeb07c62074c706378040c520d5f0155b030f9e2025c51abb0 SHA512 f77ff46fbb707d8c02499f168e5748f39081fa780fb9a5b1ea04603b09cd71280d76034cab28b23fc30280bd856121e473c992c9c39d7c46fc97d5fbfbe4191d
diff --git a/dev-games/tiled/files/tiled-1.11.0-python.patch b/dev-games/tiled/files/tiled-1.11.0-python.patch
new file mode 100644
index 000000000000..f5407045e019
--- /dev/null
+++ b/dev-games/tiled/files/tiled-1.11.0-python.patch
@@ -0,0 +1,55 @@
+diff --git a/qbs/imports/PythonProbe.qbs b/qbs/imports/PythonProbe.qbs
+index 52eae7fc..93b4270c 100644
+--- a/qbs/imports/PythonProbe.qbs
++++ b/qbs/imports/PythonProbe.qbs
+@@ -7,7 +7,6 @@ import qbs.Utilities
+ Probe {
+     id: pythonDllProbe
+ 
+-    property string pythonDir: pythonInstallDir // Input
+     property string buildVariant: qbs.buildVariant // Input
+     property string minVersion: "3.5" // Input
+     property string fileNamePrefix // Output
+@@ -17,18 +16,9 @@ Probe {
+             console.warn(msg + " The Python plugin will not be available.");
+         }
+ 
+-        if (!pythonDir) {
+-            printWarning("PYTHONHOME not set.");
+-            return;
+-        }
+-        if (!File.exists(pythonDir)) {
+-            printWarning("The provided Python installation directory '" + pythonDir
+-                         + "' does not exist.");
+-            return;
+-        }
+         var p = new Process();
+         try {
+-            var pythonFilePath = FileInfo.joinPaths(pythonDir, "python.exe");
++            var pythonFilePath = "python";
+             p.exec(pythonFilePath, ["--version"], true);
+             var output = p.readStdOut().trim();
+             var magicPrefix = "Python ";
+@@ -45,9 +35,7 @@ Probe {
+                 return;
+             }
+             if (Utilities.versionCompare(versionNumberString, minVersion) < 0) {
+-                printWarning("The Python installation at '" + pythonDir
+-                             + "' has version " + versionNumberString + ", but " + minVersion + " or higher "
+-                             + "is required.");
++                printWarning("The Python installation has version " + versionNumberString + ", but " + minVersion + " or higher " + "is required.");
+                 return;
+             }
+             found = true;
+diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs
+index f1c959d3..8c43af9c 100644
+--- a/src/plugins/python/python.qbs
++++ b/src/plugins/python/python.qbs
+@@ -28,7 +28,6 @@ TiledPlugin {
+ 
+     PythonProbe {
+         id: pythonDllProbe
+-        pythonDir: Environment.getEnv("PYTHONHOME")
+         minVersion: "3.8"
+     }
+ 
diff --git a/dev-games/tiled/metadata.xml b/dev-games/tiled/metadata.xml
index 13233bbdb862..d6abd76eacce 100644
--- a/dev-games/tiled/metadata.xml
+++ b/dev-games/tiled/metadata.xml
@@ -1,8 +1,19 @@
 <?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>mechakotik@gmail.com</email>
+		<name>Andrei Sabalenka</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">bjorn/tiled</remote-id>
+		<remote-id type="github">mapeditor/tiled</remote-id>
 	</upstream>
+	<use>
+		<flag name="minimal">Exclude optional plugins and development headers</flag>
+	</use>
 </pkgmetadata>
+
diff --git a/dev-games/tiled/tiled-1.11.0.ebuild b/dev-games/tiled/tiled-1.11.0.ebuild
new file mode 100644
index 000000000000..c23e32344f0e
--- /dev/null
+++ b/dev-games/tiled/tiled-1.11.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit edo flag-o-matic multiprocessing python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/ https://github.com/mapeditor/tiled"
+SRC_URI="https://github.com/mapeditor/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/zstd:=
+	dev-qt/qtbase:6[X,dbus,gui,network,opengl,widgets]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtsvg:6
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/qbs
+	dev-qt/qtbase:6
+	dev-qt/qttools:6[linguist]
+"
+
+QBS_PRODUCTS="tiled,csv,json"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+qbs_format_flags() {
+	local -a array
+	for flag in ${@}; do
+		array+=( "\"${flag}\"" )
+	done
+	echo "[$(IFS=","; echo "${array[*]}")]"
+}
+
+src_configure() {
+	if use python; then
+		eapply "${FILESDIR}"/${P}-python.patch
+		QBS_PRODUCTS="${QBS_PRODUCTS},python"
+	fi
+	if ! use minimal; then
+		QBS_PRODUCTS="${QBS_PRODUCTS},defold,defoldcollection,droidcraft,flare,gmx,json1,lua,replicaisland,rpmap,tbin,tengine,terraingenerator,tmxrasterizer,tmxviewer,tscn,yy"
+	fi
+
+	edo qbs setup-qt /usr/bin/qmake6 qt6
+	edo qbs config defaultProfile qt6
+
+	local toolchain=$(tc-get-compiler-type)
+	edo qbs setup-toolchains ${toolchain} ${toolchain}
+	edo qbs config profiles.qt6.baseProfile ${toolchain}
+
+	edo qbs resolve \
+		--force-probe-execution \
+		qbs.installPrefix:"/usr" \
+		projects.Tiled.useRPaths:false \
+		projects.Tiled.installHeaders:$(usex minimal false true) \
+		project.libDir:$(get_libdir) \
+		modules.cpp.cFlags:$(qbs_format_flags ${CFLAGS}) \
+		modules.cpp.cxxFlags:$(qbs_format_flags ${CXXFLAGS}) \
+		modules.cpp.linkerFlags:$(qbs_format_flags $(raw-ldflags ${LDFLAGS}))
+}
+
+src_compile() {
+	edo qbs build \
+		-p ${QBS_PRODUCTS} \
+		-j $(get_makeopts_jobs)
+}
+
+src_install() {
+	edo qbs install -p ${QBS_PRODUCTS} --install-root "${D}"
+
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
+}
diff --git a/dev-gap/aclib/aclib-1.3.2.ebuild b/dev-gap/aclib/aclib-1.3.2.ebuild
index 1665099667cc..243dedb65439 100644
--- a/dev-gap/aclib/aclib-1.3.2.ebuild
+++ b/dev-gap/aclib/aclib-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/polycyclic"
 
diff --git a/dev-gap/alnuth/alnuth-3.2.1.ebuild b/dev-gap/alnuth/alnuth-3.2.1.ebuild
index 2201e9e41a1d..efd5c91c0e08 100644
--- a/dev-gap/alnuth/alnuth-3.2.1.ebuild
+++ b/dev-gap/alnuth/alnuth-3.2.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Algebraic number theory and an interface to PARI/GP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/atlasrep/atlasrep-2.1.8.ebuild b/dev-gap/atlasrep/atlasrep-2.1.8.ebuild
index d060050d4dce..b1ef24694fdd 100644
--- a/dev-gap/atlasrep/atlasrep-2.1.8.ebuild
+++ b/dev-gap/atlasrep/atlasrep-2.1.8.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.math.rwth-aachen.de/~Thomas.Breuer/atlasrep/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/autodoc/autodoc-2022.10.20.ebuild b/dev-gap/autodoc/autodoc-2022.10.20.ebuild
index c775df721697..9ec0544e9df0 100644
--- a/dev-gap/autodoc/autodoc-2022.10.20.ebuild
+++ b/dev-gap/autodoc/autodoc-2022.10.20.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Generate documentation from GAP source code"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 S="${WORKDIR}/AutoDoc-${PV}"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 # The test suite tries to LoadPackage this
 BDEPEND="test? ( dev-gap/io )"
diff --git a/dev-gap/autpgrp/autpgrp-1.11.ebuild b/dev-gap/autpgrp/autpgrp-1.11.ebuild
index f99ce75556a3..8c66dd2993ef 100644
--- a/dev-gap/autpgrp/autpgrp-1.11.ebuild
+++ b/dev-gap/autpgrp/autpgrp-1.11.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computing the Automorphism Group of a p-Group"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 DOCS=( README CHANGES.md )
 
diff --git a/dev-gap/browse/browse-1.8.21-r2.ebuild b/dev-gap/browse/browse-1.8.21-r2.ebuild
index 00da7a3a0433..feca5aa41003 100644
--- a/dev-gap/browse/browse-1.8.21-r2.ebuild
+++ b/dev-gap/browse/browse-1.8.21-r2.ebuild
@@ -9,12 +9,12 @@ MY_PN=Browse
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="GAP ncurses interface for browsing two-dimensional data"
-SLOT="0"
 SRC_URI="https://www.math.rwth-aachen.de/homes/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:=
 	sys-libs/ncurses:="
diff --git a/dev-gap/cohomolo/cohomolo-1.6.11.ebuild b/dev-gap/cohomolo/cohomolo-1.6.11.ebuild
index 7756fd073fb0..c046a8c0b0c0 100644
--- a/dev-gap/cohomolo/cohomolo-1.6.11.ebuild
+++ b/dev-gap/cohomolo/cohomolo-1.6.11.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Cohomology groups of finite groups on finite modules"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap"
 
diff --git a/dev-gap/congruence/congruence-1.2.6.ebuild b/dev-gap/congruence/congruence-1.2.6.ebuild
index d1dd8494ca93..2702762108f8 100644
--- a/dev-gap/congruence/congruence-1.2.6.ebuild
+++ b/dev-gap/congruence/congruence-1.2.6.ebuild
@@ -10,6 +10,6 @@ SRC_URI="https://github.com/gap-packages/congruence/releases/download/v${PV}/${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/corelg/corelg-1.56.ebuild b/dev-gap/corelg/corelg-1.56.ebuild
index 4fb27e8ac24c..d6f050ee649c 100644
--- a/dev-gap/corelg/corelg-1.56.ebuild
+++ b/dev-gap/corelg/corelg-1.56.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package to compute with real semisimple Lie algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/sla"
 
diff --git a/dev-gap/crime/crime-1.6.ebuild b/dev-gap/crime/crime-1.6.ebuild
index 965cc326ed15..c03f318e0f9d 100644
--- a/dev-gap/crime/crime-1.6.ebuild
+++ b/dev-gap/crime/crime-1.6.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP Package to calculate group cohomology and Massey products"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DOCS=( CHANGES.md README.md )
 
diff --git a/dev-gap/crisp/crisp-1.4.6.ebuild b/dev-gap/crisp/crisp-1.4.6.ebuild
index b6806f9febc7..05748fc7093c 100644
--- a/dev-gap/crisp/crisp-1.4.6.ebuild
+++ b/dev-gap/crisp/crisp-1.4.6.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP algorithms for subgroups of finite soluble groups"
-SLOT="0"
 SRC_URI="https://github.com/bh11/${PN}/releases/download/${P^^}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 GAP_PKG_HTML_DOCDIR="htm"
 gap-pkg_enable_tests
diff --git a/dev-gap/crypting/crypting-0.10.4-r1.ebuild b/dev-gap/crypting/crypting-0.10.4-r1.ebuild
index b998e7366c3d..0b6ed6d45b6a 100644
--- a/dev-gap/crypting/crypting-0.10.4-r1.ebuild
+++ b/dev-gap/crypting/crypting-0.10.4-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP implementation of SHA256 and HMAC for the Jupyter kernel"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:="
 RDEPEND="${DEPEND}"
diff --git a/dev-gap/cryst/cryst-4.1.27.ebuild b/dev-gap/cryst/cryst-4.1.27.ebuild
index 0b21d0ee0457..b10ba46a1925 100644
--- a/dev-gap/cryst/cryst-4.1.27.ebuild
+++ b/dev-gap/cryst/cryst-4.1.27.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for computing with crystallographic groups"
-SLOT="0"
 SRC_URI="https://www.math.uni-bielefeld.de/~gaehler/gap/Cryst/${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/polycyclic"
 
diff --git a/dev-gap/crystcat/crystcat-1.1.10.ebuild b/dev-gap/crystcat/crystcat-1.1.10.ebuild
index a28fb1ae0366..ee5e019ca6ba 100644
--- a/dev-gap/crystcat/crystcat-1.1.10.ebuild
+++ b/dev-gap/crystcat/crystcat-1.1.10.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The crystallographic groups catalog"
-SLOT="0"
 SRC_URI="https://www.math.uni-bielefeld.de/~gaehler/gap/CrystCat/${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/cryst"
 
diff --git a/dev-gap/ctbllib/ctbllib-1.3.9.ebuild b/dev-gap/ctbllib/ctbllib-1.3.9.ebuild
index 95a284407227..162235782a57 100644
--- a/dev-gap/ctbllib/ctbllib-1.3.9.ebuild
+++ b/dev-gap/ctbllib/ctbllib-1.3.9.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The GAP Character Table Library"
-SLOT="0"
 SRC_URI="https://www.math.rwth-aachen.de/~Thomas.Breuer/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/cvec/cvec-2.8.1-r1.ebuild b/dev-gap/cvec/cvec-2.8.1-r1.ebuild
index b32983dee029..cf6de1e9e8aa 100644
--- a/dev-gap/cvec/cvec-2.8.1-r1.ebuild
+++ b/dev-gap/cvec/cvec-2.8.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:="
diff --git a/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild b/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild
index 27f739021419..dfd593349949 100644
--- a/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild
+++ b/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit flag-o-matic gap-pkg
 
 DESCRIPTION="Collection of standard data structures for GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/datastructures/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:="
 RDEPEND="${DEPEND}"
diff --git a/dev-gap/design/design-1.7.ebuild b/dev-gap/design/design-1.7.ebuild
index a1f056a9a689..9ccc5bb994e8 100644
--- a/dev-gap/design/design-1.7.ebuild
+++ b/dev-gap/design/design-1.7.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The Design Package for GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/grape"
 
diff --git a/dev-gap/digraphs/digraphs-1.7.1-r1.ebuild b/dev-gap/digraphs/digraphs-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..2c7dd0866e1e
--- /dev/null
+++ b/dev-gap/digraphs/digraphs-1.7.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gap-pkg
+
+DESCRIPTION="Graphs, digraphs, and multidigraphs in GAP"
+SRC_URI="https://github.com/digraphs/Digraphs/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND="sci-mathematics/gap:=
+	sci-mathematics/planarity
+	sci-libs/bliss:="
+RDEPEND="${DEPEND}
+	dev-gap/io
+	dev-gap/orb
+	dev-gap/datastructures"
+
+# There are a few tests that will fail without a PDF viewer installed.
+# Having xdg-open is good enough, and light weight, so it goes first.
+BDEPEND="test? ( || (
+	x11-misc/xdg-utils
+	app-text/gv
+	app-text/xpdf
+	app-text/evince
+	kde-apps/okular
+) )"
+
+DOCS=( CHANGELOG.md README.md )
+
+GAP_PKG_EXTRA_INSTALL=( data notebooks )
+gap-pkg_enable_tests
+
+src_configure() {
+	gap-pkg_econf \
+		--with-external-planarity \
+		--with-external-bliss
+}
diff --git a/dev-gap/digraphs/digraphs-1.7.1.ebuild b/dev-gap/digraphs/digraphs-1.7.1.ebuild
deleted file mode 100644
index 56038c62d068..000000000000
--- a/dev-gap/digraphs/digraphs-1.7.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
-
-inherit gap-pkg
-
-DESCRIPTION="Graphs, digraphs, and multidigraphs in GAP"
-SLOT="0"
-SRC_URI="https://github.com/digraphs/Digraphs/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64"
-
-DEPEND="sci-mathematics/gap:=
-	sci-mathematics/planarity
-	sci-libs/bliss:="
-RDEPEND="${DEPEND}
-	dev-gap/io
-	dev-gap/orb
-	dev-gap/datastructures"
-
-DOCS=( CHANGELOG.md README.md )
-
-GAP_PKG_EXTRA_INSTALL=( data notebooks )
-gap-pkg_enable_tests
-
-src_configure() {
-	gap-pkg_econf \
-		--with-external-planarity \
-		--with-external-bliss
-}
diff --git a/dev-gap/edim/edim-1.3.7-r2.ebuild b/dev-gap/edim/edim-1.3.7-r2.ebuild
index 4db28d12584c..93bd0e749d98 100644
--- a/dev-gap/edim/edim-1.3.7-r2.ebuild
+++ b/dev-gap/edim/edim-1.3.7-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:="
 RDEPEND="${DEPEND}"
diff --git a/dev-gap/factint/factint-1.6.3.ebuild b/dev-gap/factint/factint-1.6.3.ebuild
index 5a98fa950d80..03f19bec91b7 100644
--- a/dev-gap/factint/factint-1.6.3.ebuild
+++ b/dev-gap/factint/factint-1.6.3.ebuild
@@ -8,12 +8,12 @@ inherit gap-pkg
 MY_PN="FactInt"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Advanced Methods for Factoring Integers"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 GAP_PKG_EXTRA_INSTALL=( tables )
 gap-pkg_enable_tests
diff --git a/dev-gap/fga/fga-1.5.0.ebuild b/dev-gap/fga/fga-1.5.0.ebuild
index 817f035b40c7..aad8c70f51fd 100644
--- a/dev-gap/fga/fga-1.5.0.ebuild
+++ b/dev-gap/fga/fga-1.5.0.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Free Group Algorithms (FGA) for GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/gapdoc/gapdoc-1.6.7.ebuild b/dev-gap/gapdoc/gapdoc-1.6.7.ebuild
index 4083a05b467f..89f51c97b400 100644
--- a/dev-gap/gapdoc/gapdoc-1.6.7.ebuild
+++ b/dev-gap/gapdoc/gapdoc-1.6.7.ebuild
@@ -8,12 +8,12 @@ inherit gap-pkg
 MY_PN=GAPDoc
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GAP documentation structure and tooling"
-SLOT="0"
 SRC_URI="https://github.com/frankluebeck/${MY_PN}/archive/relv${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-relv${PV}"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="examples"
 
 # PackageInfo.g defines TestFile := tst/test.tst, but that
diff --git a/dev-gap/gaplint/gaplint-1.2.1.ebuild b/dev-gap/gaplint/gaplint-1.2.1.ebuild
index 725d661d1d12..e65005237969 100644
--- a/dev-gap/gaplint/gaplint-1.2.1.ebuild
+++ b/dev-gap/gaplint/gaplint-1.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/james-d-mitchell/${PN}/archive/refs/tags/v${PV}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 
diff --git a/dev-gap/gbnp/gbnp-1.0.5.ebuild b/dev-gap/gbnp/gbnp-1.0.5.ebuild
index 0179f5923969..eab277f5c4cd 100644
--- a/dev-gap/gbnp/gbnp-1.0.5.ebuild
+++ b/dev-gap/gbnp/gbnp-1.0.5.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Compute Gröbner bases of noncommutative polynomials"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/genss/genss-1.6.8.ebuild b/dev-gap/genss/genss-1.6.8.ebuild
index c5439755306a..9cd2ecc89458 100644
--- a/dev-gap/genss/genss-1.6.8.ebuild
+++ b/dev-gap/genss/genss-1.6.8.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP implementation of the randomized Schreier-Sims algorithm"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-gap/io
diff --git a/dev-gap/grape/grape-4.9.0.ebuild b/dev-gap/grape/grape-4.9.0.ebuild
index 023681f3b574..5e54a459ea63 100644
--- a/dev-gap/grape/grape-4.9.0.ebuild
+++ b/dev-gap/grape/grape-4.9.0.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg prefix
 
 DESCRIPTION="GRaph Algorithms using PErmutation groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="bliss"
 
 RDEPEND="bliss? ( sci-libs/bliss )
diff --git a/dev-gap/guava/guava-3.19.ebuild b/dev-gap/guava/guava-3.19.ebuild
index 7cef6eaa6e7b..b00d33b0c4e0 100644
--- a/dev-gap/guava/guava-3.19.ebuild
+++ b/dev-gap/guava/guava-3.19.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap"
 
diff --git a/dev-gap/hap/hap-1.62.ebuild b/dev-gap/hap/hap-1.62.ebuild
index ef7a1b6988d4..df5a4545699f 100644
--- a/dev-gap/hap/hap-1.62.ebuild
+++ b/dev-gap/hap/hap-1.62.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/hapcryst/hapcryst-0.1.15.ebuild b/dev-gap/hapcryst/hapcryst-0.1.15.ebuild
index c68ce6b2cf52..4ec0b51665eb 100644
--- a/dev-gap/hapcryst/hapcryst-0.1.15.ebuild
+++ b/dev-gap/hapcryst/hapcryst-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-gap/aclib
diff --git a/dev-gap/hecke/hecke-1.5.3.ebuild b/dev-gap/hecke/hecke-1.5.3.ebuild
index 66b4ce9dc1b5..53aca48cc745 100644
--- a/dev-gap/hecke/hecke-1.5.3.ebuild
+++ b/dev-gap/hecke/hecke-1.5.3.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Calculate decomposition matrices of Hecke algebras in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/images/images-1.3.1.ebuild b/dev-gap/images/images-1.3.1.ebuild
index 1459076d3b18..b283177070cc 100644
--- a/dev-gap/images/images-1.3.1.ebuild
+++ b/dev-gap/images/images-1.3.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Find minimal and canonical images in permutation groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 BDEPEND="test? (
 	dev-gap/atlasrep
diff --git a/dev-gap/io/io-4.8.2-r1.ebuild b/dev-gap/io/io-4.8.2-r1.ebuild
index f5c4b33df639..b3f521e442b1 100644
--- a/dev-gap/io/io-4.8.2-r1.ebuild
+++ b/dev-gap/io/io-4.8.2-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit autotools gap-pkg
 
 DESCRIPTION="Bindings for low level C library I/O routines"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:="
diff --git a/dev-gap/irredsol/irredsol-1.4.4.ebuild b/dev-gap/irredsol/irredsol-1.4.4.ebuild
index 3c75a197123e..ceeb230d0319 100644
--- a/dev-gap/irredsol/irredsol-1.4.4.ebuild
+++ b/dev-gap/irredsol/irredsol-1.4.4.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Irreducible soluble linear groups over finite fields and more"
-SLOT="0"
 SRC_URI="https://github.com/bh11/${PN}/releases/download/IRREDSOL-${PV}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 GAP_PKG_HTML_DOCDIR="htm"
 GAP_PKG_EXTRA_INSTALL=( data fp )
diff --git a/dev-gap/laguna/laguna-3.9.6.ebuild b/dev-gap/laguna/laguna-3.9.6.ebuild
index c59b98ac1c4f..1731e665b985 100644
--- a/dev-gap/laguna/laguna-3.9.6.ebuild
+++ b/dev-gap/laguna/laguna-3.9.6.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Lie AlGebras and UNits of group Algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/liealgdb/liealgdb-2.2.1.ebuild b/dev-gap/liealgdb/liealgdb-2.2.1.ebuild
index 42b7641cbfef..89dba04e0a91 100644
--- a/dev-gap/liealgdb/liealgdb-2.2.1.ebuild
+++ b/dev-gap/liealgdb/liealgdb-2.2.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="A database of Lie algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DOCS=( CHANGES.md README )
 
diff --git a/dev-gap/liepring/liepring-2.9.1.ebuild b/dev-gap/liepring/liepring-2.9.1.ebuild
index ca182a6b376b..135453557876 100644
--- a/dev-gap/liepring/liepring-2.9.1.ebuild
+++ b/dev-gap/liepring/liepring-2.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Database and algorithms for Lie p-rings"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/liering"
 
diff --git a/dev-gap/liering/liering-2.4.2.ebuild b/dev-gap/liering/liering-2.4.2.ebuild
index a64b5875fbb1..c13cf5a52624 100644
--- a/dev-gap/liering/liering-2.4.2.ebuild
+++ b/dev-gap/liering/liering-2.4.2.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Finitely presented Lie rings in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/loops/loops-3.4.3.ebuild b/dev-gap/loops/loops-3.4.3.ebuild
index c96e47459840..7ad0b0a4f04d 100644
--- a/dev-gap/loops/loops-3.4.3.ebuild
+++ b/dev-gap/loops/loops-3.4.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computing with quasigroups and loops in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 GAP_PKG_EXTRA_INSTALL=( data )
 gap-pkg_enable_tests
diff --git a/dev-gap/mapclass/mapclass-1.4.6.ebuild b/dev-gap/mapclass/mapclass-1.4.6.ebuild
index 17b93c0c8360..f5d3a212bb07 100644
--- a/dev-gap/mapclass/mapclass-1.4.6.ebuild
+++ b/dev-gap/mapclass/mapclass-1.4.6.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="A GAP package to compute mapping-class group orbits"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 S="${WORKDIR}/MapClass-${PV}"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/nq/nq-2.5.10.ebuild b/dev-gap/nq/nq-2.5.10.ebuild
index cfa6ff041eb3..78ba87c48f47 100644
--- a/dev-gap/nq/nq-2.5.10.ebuild
+++ b/dev-gap/nq/nq-2.5.10.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Nilpotent Quotients of finitely-presented groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:=
diff --git a/dev-gap/orb/orb-4.9.0-r1.ebuild b/dev-gap/orb/orb-4.9.0-r1.ebuild
index 4161922dd244..dac1312f7d5a 100644
--- a/dev-gap/orb/orb-4.9.0-r1.ebuild
+++ b/dev-gap/orb/orb-4.9.0-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg toolchain-funcs
 
 DESCRIPTION="GAP methods to enumerate orbits"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/polenta/polenta-1.3.10.ebuild b/dev-gap/polenta/polenta-1.3.10.ebuild
index be16c92966ee..642fe3a81e9a 100644
--- a/dev-gap/polenta/polenta-1.3.10.ebuild
+++ b/dev-gap/polenta/polenta-1.3.10.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Polycyclic presentations for matrix groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/polycyclic
 	dev-gap/radiroot
diff --git a/dev-gap/polycyclic/polycyclic-2.16.ebuild b/dev-gap/polycyclic/polycyclic-2.16.ebuild
index 11250dca1cdd..b7f15dde6f07 100644
--- a/dev-gap/polycyclic/polycyclic-2.16.ebuild
+++ b/dev-gap/polycyclic/polycyclic-2.16.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computation with polycyclic groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 # Circular dependency polycyclic->alnuth->polycyclic. There's a global
 # variable called USE_ALNUTH in polycyclic, but setting it to "false"
diff --git a/dev-gap/polymaking/polymaking-0.8.7.ebuild b/dev-gap/polymaking/polymaking-0.8.7.ebuild
index e488b8819e71..e3546baa7f69 100644
--- a/dev-gap/polymaking/polymaking-0.8.7.ebuild
+++ b/dev-gap/polymaking/polymaking-0.8.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 # Tests fail: https://github.com/gap-packages/polymaking/issues/18
 RESTRICT=test
diff --git a/dev-gap/primgrp/primgrp-3.4.4.ebuild b/dev-gap/primgrp/primgrp-3.4.4.ebuild
index 0f9e7963b03b..82ad12467185 100644
--- a/dev-gap/primgrp/primgrp-3.4.4.ebuild
+++ b/dev-gap/primgrp/primgrp-3.4.4.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP Primitive Permutation Groups Library"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/gapdoc"
 gap-pkg_enable_tests
diff --git a/dev-gap/qpa/qpa-1.35.ebuild b/dev-gap/qpa/qpa-1.35.ebuild
index ddd175960b24..44e0ab7585fe 100644
--- a/dev-gap/qpa/qpa-1.35.ebuild
+++ b/dev-gap/qpa/qpa-1.35.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Quivers and Path Algebras in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-gap/gbnp"
diff --git a/dev-gap/quagroup/quagroup-1.8.3.ebuild b/dev-gap/quagroup/quagroup-1.8.3.ebuild
index ae11810b0f6a..5f7b24235df2 100644
--- a/dev-gap/quagroup/quagroup-1.8.3.ebuild
+++ b/dev-gap/quagroup/quagroup-1.8.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for quantum group computations"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DOCS=( README.md CHANGES.md )
 
diff --git a/dev-gap/radiroot/radiroot-2.9.ebuild b/dev-gap/radiroot/radiroot-2.9.ebuild
index 7ec9b762ca27..9fb93bee93e7 100644
--- a/dev-gap/radiroot/radiroot-2.9.ebuild
+++ b/dev-gap/radiroot/radiroot-2.9.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Roots of a polynomial as radicals in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/alnuth"
 
diff --git a/dev-gap/resclasses/resclasses-4.7.3.ebuild b/dev-gap/resclasses/resclasses-4.7.3.ebuild
index 8a6abb33adb9..9b63d27b293b 100644
--- a/dev-gap/resclasses/resclasses-4.7.3.ebuild
+++ b/dev-gap/resclasses/resclasses-4.7.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Set-theoretic computations with residue classes in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/utils
 	dev-gap/polycyclic"
diff --git a/dev-gap/semigroups/semigroups-5.3.7.ebuild b/dev-gap/semigroups/semigroups-5.3.7.ebuild
index 4981df03590e..3785c59ecb35 100644
--- a/dev-gap/semigroups/semigroups-5.3.7.ebuild
+++ b/dev-gap/semigroups/semigroups-5.3.7.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for semigroups and monoids"
-SLOT="0"
 SRC_URI="https://github.com/semigroups/Semigroups/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:=
 	>=sci-libs/libsemigroups-2.7.3:="
diff --git a/dev-gap/singular/singular-2024.06.03.ebuild b/dev-gap/singular/singular-2024.06.03.ebuild
index 4e1ed1e18323..3f7b6be3ac2a 100644
--- a/dev-gap/singular/singular-2024.06.03.ebuild
+++ b/dev-gap/singular/singular-2024.06.03.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GAP interface to sci-mathematics/singular"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="sci-mathematics/singular"
 
diff --git a/dev-gap/sla/sla-1.5.3.ebuild b/dev-gap/sla/sla-1.5.3.ebuild
index d6e4f0e16fd2..053c4e2274b9 100644
--- a/dev-gap/sla/sla-1.5.3.ebuild
+++ b/dev-gap/sla/sla-1.5.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for simple Lie algebra computations"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/quagroup"
 
diff --git a/dev-gap/smallgrp/smallgrp-1.5.3.ebuild b/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
index d9f9cef24604..36c76d21269f 100644
--- a/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
+++ b/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
@@ -7,12 +7,12 @@ inherit gap-pkg
 
 MY_P="SmallGrp-${PV}"
 DESCRIPTION="The GAP Small Groups Library"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/smallgrp/releases/download/v${PV}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/gapdoc"
 gap-pkg_enable_tests
diff --git a/dev-gap/sonata/sonata-2.9.6.ebuild b/dev-gap/sonata/sonata-2.9.6.ebuild
index b444b3fe3e9a..85c29f84d7a1 100644
--- a/dev-gap/sonata/sonata-2.9.6.ebuild
+++ b/dev-gap/sonata/sonata-2.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 GAP_PKG_EXTRA_INSTALL=( grp nr nri )
 gap-pkg_enable_tests
diff --git a/dev-gap/sophus/sophus-1.27.ebuild b/dev-gap/sophus/sophus-1.27.ebuild
index 479c9041b23b..2d88fd151019 100644
--- a/dev-gap/sophus/sophus-1.27.ebuild
+++ b/dev-gap/sophus/sophus-1.27.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computing in nilpotent Lie algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/autpgrp"
 
diff --git a/dev-gap/spinsym/spinsym-1.5.2.ebuild b/dev-gap/spinsym/spinsym-1.5.2.ebuild
index 3d1d493d8e2b..5282deefa086 100644
--- a/dev-gap/spinsym/spinsym-1.5.2.ebuild
+++ b/dev-gap/spinsym/spinsym-1.5.2.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Brauer tables of spin-symmetric groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/ctbllib"
 
diff --git a/dev-gap/tomlib/tomlib-1.2.11.ebuild b/dev-gap/tomlib/tomlib-1.2.11.ebuild
index 2cb24be48ec8..31bdfe2d5878 100644
--- a/dev-gap/tomlib/tomlib-1.2.11.ebuild
+++ b/dev-gap/tomlib/tomlib-1.2.11.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The GAP library of Tables of Marks"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/atlasrep"
 
diff --git a/dev-gap/toric/toric-1.9.5.ebuild b/dev-gap/toric/toric-1.9.5.ebuild
index 6cdfa8db665d..161fefba0d00 100644
--- a/dev-gap/toric/toric-1.9.5.ebuild
+++ b/dev-gap/toric/toric-1.9.5.ebuild
@@ -13,6 +13,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/transgrp/transgrp-3.6.5.ebuild b/dev-gap/transgrp/transgrp-3.6.5.ebuild
index 09f14ff66629..e7d261bce63b 100644
--- a/dev-gap/transgrp/transgrp-3.6.5.ebuild
+++ b/dev-gap/transgrp/transgrp-3.6.5.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP transitive groups library"
-SLOT="0"
 SRC_URI="https://www.math.colostate.edu/~hulpke/${PN}/${PN}${PV}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 # Data format is licensed Artistic-2
 # Code is licensed GPL-3
 LICENSE="GPL-3 Artistic-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 # This is one of the four required packages whose dependencies are all
 # listed explicitly.
diff --git a/dev-gap/utils/utils-0.84.ebuild b/dev-gap/utils/utils-0.84.ebuild
index 62eca8b3cca4..c0ca2ffc4227 100644
--- a/dev-gap/utils/utils-0.84.ebuild
+++ b/dev-gap/utils/utils-0.84.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Utility functions in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/autodoc
 	dev-gap/polycyclic"
diff --git a/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild b/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild
index 460c71d8bead..6c960737ddb4 100644
--- a/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild
+++ b/dev-go/go-dep-tarball/go-dep-tarball-0.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 src_install() {
 	newbin "${FILESDIR}/go-dep-tarball-${PV}" go-dep-tarball
diff --git a/dev-java/apache-rat/apache-rat-0.15-r1.ebuild b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
deleted file mode 100644
index 330f4023ee7a..000000000000
--- a/dev-java/apache-rat/apache-rat-0.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
-
-# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
-JAVA_PKG_IUSE="doc source test"
-MAVEN_PROVIDES="
-	org.apache.rat:apache-rat-core:${PV}
-	org.apache.rat:apache-rat-tasks:${PV}
-"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
-HOMEPAGE="https://creadur.apache.org/rat/"
-SRC_URI="https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2
-	verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="
-	>=dev-java/ant-1.10.14:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-compress:0
-	dev-java/commons-io:1
-	dev-java/commons-lang:3.6
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc"
-
-DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt )
-
-PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" )
-
-JAVADOC_SRC_DIRS=(
-	"${PN}-core/src/main/java"
-	"${PN}-tasks/src/main/java"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	einfo "Compiling apache-rat-core.jar"
-	JAVA_JAR_FILENAME="${PN}-core.jar"
-	JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources"
-	JAVA_SRC_DIR="${PN}-core/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar"
-	rm -r target || die
-
-	einfo "Compiling apache-rat-tasks.jar"
-	JAVA_JAR_FILENAME="${PN}-tasks.jar"
-	JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources"
-	JAVA_SRC_DIR="${PN}-tasks/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar"
-	rm -r target || die
-
-	# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
-	JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
-	use doc && ejavadoc
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="ant,junit-4"
-
-	einfo "Testing apache-rat-core"
-	cp -r "${PN}"-core/src/{main,test} src || die
-	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-	JAVA_TEST_SRC_DIR="src/test/java"
-	java-pkg-simple_src_test
-	rm -r src/{main,test} || die
-
-	einfo "Testing apache-rat-tasks"
-	cp -r "${PN}"-tasks/src/{main,test} src || die
-	mkdir -p target/it-sources || die
-	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-	JAVA_TEST_SRC_DIR="src/test/java"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "${PN}-core.jar"
-	java-pkg_dojar "${PN}-tasks.jar"
-	java-pkg_dolauncher "${PN}" --main org.apache.rat.Report
-
-	use doc && java-pkg_dojavadoc target/api
-
-	if use source; then
-		java-pkg_dosrc "${PN}-core/src/main/java/*"
-		java-pkg_dosrc "${PN}-tasks/src/main/java/*"
-	fi
-}
diff --git a/dev-java/apache-rat/apache-rat-0.15-r2.ebuild b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
new file mode 100644
index 000000000000..57fff834a4f4
--- /dev/null
+++ b/dev-java/apache-rat/apache-rat-0.15-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+	org.apache.rat:apache-rat-core:${PV}
+	org.apache.rat:apache-rat-tasks:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
+HOMEPAGE="https://creadur.apache.org/rat/"
+SRC_URI="https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2
+	verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14:0
+	dev-java/commons-cli:0
+	dev-java/commons-collections:4
+	dev-java/commons-compress:0
+	dev-java/commons-io:1
+	dev-java/commons-lang:3.6
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc"
+
+DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt )
+
+PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" )
+
+JAVADOC_SRC_DIRS=(
+	"${PN}-core/src/main/java"
+	"${PN}-tasks/src/main/java"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	einfo "Compiling apache-rat-core.jar"
+	JAVA_JAR_FILENAME="${PN}-core.jar"
+	JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources"
+	JAVA_SRC_DIR="${PN}-core/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar"
+	rm -r target || die
+
+	einfo "Compiling apache-rat-tasks.jar"
+	JAVA_JAR_FILENAME="${PN}-tasks.jar"
+	JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources"
+	JAVA_SRC_DIR="${PN}-tasks/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar"
+	rm -r target || die
+
+	# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
+	JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+	use doc && ejavadoc
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="ant,junit-4"
+
+	einfo "Testing apache-rat-core"
+	cp -r "${PN}"-core/src/{main,test} src || die
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+	rm -r src/{main,test} || die
+
+	einfo "Testing apache-rat-tasks"
+	cp -r "${PN}"-tasks/src/{main,test} src || die
+	mkdir -p target/it-sources || die
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "${PN}-core.jar"
+	java-pkg_dojar "${PN}-tasks.jar"
+	java-pkg_dolauncher "${PN}" --main org.apache.rat.Report
+
+	use doc && java-pkg_dojavadoc target/api
+
+	if use source; then
+		java-pkg_dosrc "${PN}-core/src/main/java/*"
+		java-pkg_dosrc "${PN}-tasks/src/main/java/*"
+	fi
+}
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 2ec40365fab3..18b5f35167c0 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1 +1,2 @@
 DIST asm-ASM_9_6.tar.bz2 1374579 BLAKE2B 621b19f1818ffdd451037af210ec7c3286e3dabdb1d6192157c2e6e8c101f599691cd4de57adf500f5413b4aaf4f808d6ac791e84626223a7be5672a17137670 SHA512 86b2db3e81c29c465d4128736f88ae3b73af8f312915921549d0acdb50a8d2c2c2beed5162af164b6e75278702af0c6f0a8d84b4133516eb4ac419520b7c764d
+DIST asm-ASM_9_7.tar.bz2 1376322 BLAKE2B 397a884b257edfd61f67909390c8fe07880d5a295b51dd3982ebbe9b6f8fbac200c46913e6c18e4efdcc80f0e1f0b8463ca9d912484b466ca174b55919a1c259 SHA512 9b7f2d4895f105f75e2c42d8882b176dba32defb17d8da4bdedb2bfe4e5413b03c05a9694114d171aa9623e86a65a677a24ab16a47aef774342d56224400274f
diff --git a/dev-java/asm/asm-9.7.ebuild b/dev-java/asm/asm-9.7.ebuild
new file mode 100644
index 000000000000..eb1994183f55
--- /dev/null
+++ b/dev-java/asm/asm-9.7.ebuild
@@ -0,0 +1,97 @@
+# 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//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2"
+S="${WORKDIR}/asm-${MY_P}"
+
+LICENSE="BSD"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~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/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
deleted file mode 100644
index 4111832765af..000000000000
--- a/dev-java/c3p0/c3p0-0.9.5.5-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
-
-# Tests require an existing running SQL server and 'junit.jar.file' property
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="https://www.mchange.com/projects/c3p0/"
-SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz"
-
-LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-CP_DEPEND="
-	dev-java/log4j-12-api:2
-	dev-java/mchange-commons:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}.src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	java-pkg_clean
-	java-pkg-2_src_prepare
-	java-pkg_jar-from --into lib/ log4j-12-api-2
-	java-pkg_jar-from --into lib/ mchange-commons
-
-	# Test sources interfere with Javadoc generation on JDK 11
-	# Remove since the tests will never be run
-	rm -r src/java/com/mchange/v2/c3p0/test ||
-		die "Failed to remove unused test sources"
-}
-
-src_install() {
-	java-pkg_newjar "build/${P}.jar"
-	einstalldocs
-
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
-	use source && java-pkg_dosrc src/java/com/mchange/v2
-}
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
index 89dc72a719c4..e41111b8469c 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}.src"
 
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 5defc51942de..6e506677c4d4 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1 +1,3 @@
 DIST commons-cli-1.5.0-src.tar.gz 156731 BLAKE2B b3bc3c7426f4564187f6b2fecf2977a8d307277cb244bb51064f32e6d2fc0ddb08c539b3bae68bba5ccc2319d0e483f01f6765ae3e86ebfe99eb775564fd7c8f SHA512 aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda
+DIST commons-cli-1.9.0-src.tar.gz 187533 BLAKE2B d38f6602e065059521a052e2a9bfe7b05f9cd7da26537b3237868e583d7ca904e36cd58ffe04b9ea5feae81594cdc2bcbab7c16d2c95f2888f5ffd35c78c485c SHA512 d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35
+DIST commons-cli-1.9.0-src.tar.gz.asc 488 BLAKE2B 22992f7fe15617c0422061447f9bae8ff5ab5804514b48bb277cfad0483e932694048159b82f1782369bdf1f25f5a9387f63ea2d83f147ea80f9ef21d1b772c5 SHA512 27f46b143efef09c6ec84382b2c7ca3877441190f3201ed167560572e741c23d641c3c534b1c25df399445957353285bed7913f113db8489c097b2057ed70571
diff --git a/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..d3b9d7264d64
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.5.0-r1.ebuild
@@ -0,0 +1,43 @@
+# 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="commons-cli:commons-cli:1.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for working with the command line arguments and options"
+HOMEPAGE="https://commons.apache.org/proper/commons-cli/"
+SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# There were 62 failures:
+# 1) testSimpleLong(org.apache.commons.cli.ParserTestCase)
+# java.lang.InstantiationException
+#         at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48)
+# FAILURES!!!
+# Tests run: 444,  Failures: 62
+JAVA_TEST_EXCLUDES="org.apache.commons.cli.ParserTestCase"
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
deleted file mode 100644
index 576a7661f095..000000000000
--- a/dev-java/commons-cli/commons-cli-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-cli:commons-cli:1.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for working with the command line arguments and options"
-HOMEPAGE="https://commons.apache.org/proper/commons-cli/"
-SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# There were 62 failures:
-# 1) testSimpleLong(org.apache.commons.cli.ParserTestCase)
-# java.lang.InstantiationException
-#         at java.base/jdk.internal.reflect.InstantiationExceptionConstructorAccessorImpl.newInstance(InstantiationExceptionConstructorAccessorImpl.java:48)
-# FAILURES!!!
-# Tests run: 444,  Failures: 62
-JAVA_TEST_EXCLUDES="org.apache.commons.cli.ParserTestCase"
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-cli/commons-cli-1.9.0.ebuild b/dev-java/commons-cli/commons-cli-1.9.0.ebuild
new file mode 100644
index 000000000000..c25fd62d91e9
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-cli:commons-cli:1.9.0"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="A Java library for working with the command line arguments and options"
+HOMEPAGE="https://commons.apache.org/proper/commons-cli/"
+SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/cli/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+
+}
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 2255e60c5501..46a5084819ff 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,2 +1,4 @@
 DIST commons-daemon-1.3.4-src.tar.gz 290834 BLAKE2B be57fbf89cad23fb4108e97b8e75d8380ff5b286068edfed65cd3539971375949ec80fd5aeece50a6498642f60e26498eb37ea3778f503d7498662ae79ecd14e SHA512 bb36d88bc21a5777245012b2a73ee0e764b85715731f54cc4ff09343e95ccb18fc6c68b3ae9c680fb45a60c7ef5ed0f9e40991c2c03246dd7f8dd65031eddf24
 DIST commons-daemon-1.3.4-src.tar.gz.asc 873 BLAKE2B f7886e67e2cfb0211d3271d79c251d07e5b0d7f7819566891e838619021ab9e3f468e3647f2f901d41a6d00f12b30adfa2d16f828ac5ce526666caab30ab8001 SHA512 eae6b01844bf5c49a95a60f4b59e0b989488728edb209252779f83e33ea3eeb53900a5fdeee5d953b231b241ba14a27c77967bdd3fe5acf2d9c6da50c225c79b
+DIST commons-daemon-1.4.0-src.tar.gz 291610 BLAKE2B 3a13a00e209ad501a34ebef32a5e5bf9bd25de309434249d81a5ba96bad2e922a6cdae42624a7a8da64555838c9bb12cb54de4da59193f16d91f4869ff72a9eb SHA512 285f33ce36e2591f49b6067da16612ec1b49b23a8637d077618aefaae4452993dc2a31660665551ea761857390d940100e162e205fe7c0fad9c72374f2d15bb8
+DIST commons-daemon-1.4.0-src.tar.gz.asc 833 BLAKE2B ac97dd01c02b4a52e2c3cdf4047504cc10b7b4bbfe70f86d442e301af48520c51513f2dae37eaa08648ac9a29e6212abb153b2e36cf85baf03245d8e528166b8 SHA512 8144068c97e76ca358850455d7b867ae106f04083223b43229cc1e05f21c99150c6734174e1b77e89eee93f94ec198831df57f3f53217f3416584509ca289fe1
diff --git a/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
new file mode 100644
index 000000000000..148d6bb0b68d
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-daemon:commons-daemon:${PV}"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs verify-sig
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/daemon/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( PROPOSAL.html )
+PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
+
+JAVA_ENCODING="iso-8859-1"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+
+	pushd src/native/unix || die
+		./configure
+		emake AR="$(tc-getAR)"
+	popd
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dobin src/native/unix/jsvc
+}
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 10661d3ab0c6..5bc8aa94144d 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,2 +1,4 @@
 DIST commons-io-2.15.1-src.tar.gz 618534 BLAKE2B 6fc539f28ce610e9947bf529154c79f6924d74872d6f03561d477feba6013e48d74cb5097c851173b690b27052d59c38a9ca4048c1ed54736d29d962746182d6 SHA512 809c7aa66354f2e35fd23f295c4e2f325596ee7f842b7f63f6acc3bd9377c17d4dd276ce62c477fff8d51d0d660e9addbc068270a876097cbecfe3e64f57f385
 DIST commons-io-2.15.1-src.tar.gz.asc 488 BLAKE2B 5fb3128a63d2fbc74cd96bf00919cca0fbf7b0a2cbd48287c8495c0fdb78c9df53dcc06a443b626b52ff3f9c32c55425ba619a4f61de542f3dd912916f3b2469 SHA512 1d358d3acd88816fb4d95746d8e4bd4351062cf35caad8c6f4d2da42c7974a4a583db4f7d98d8768ca7fcb4900172b869c6d6f714b8df71bb214634f83c7a55a
+DIST commons-io-2.16.1-src.tar.gz 634766 BLAKE2B 5bdc09ec07666ae513944040aae730a8bd5fe4fe65f05aa1f8295b6687f99c588ac4071113b5fa3bdc8f2e4fe0d8b40677c3afba18f332e283f28b5270d5f41c SHA512 07298e3af85726f2ec07a660fbb743f82cd88f8043a57e2e1063b758c81429dfafd77a024e2cdd48efe5d403299c20e898f5b3dd729f52bd55b8a6fb50c9a13a
+DIST commons-io-2.16.1-src.tar.gz.asc 488 BLAKE2B e42af1fe9cbb50371c981737e7899b30d99b8e7045485562614a72307068942b433614e4a1c3cdb17261917a1a5382c5828e290e50f3f3a12a3ed297be53cace SHA512 74e22fd7bf5daf58611537f6c21bd41e10942e3051785e13d771e5fd50e5403144a8d2ed9472de13263da5cbf579911a1aafaa7e43dea9f99fe6ad4011ecb74a
diff --git a/dev-java/commons-io/commons-io-2.16.1.ebuild b/dev-java/commons-io/commons-io-2.16.1.ebuild
new file mode 100644
index 000000000000..35be4d805df0
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.16.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-io:commons-io:${PV}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
+HOMEPAGE="https://commons.apache.org/proper/commons-io/"
+SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz
+	verify-sig? ( https://archive.apache.org/dist/commons/io/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_ENCODING="iso-8859-1"
+JAVA_SRC_DIR="src/main/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+
+}
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 32bc9f65cb7e..5a5b27266678 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,2 +1,4 @@
 DIST commons-lang-3.14.0-src.tar.gz 1153353 BLAKE2B 78d116864e488baf5c0c241b2304244f207c7b56b2f72006648de217d407d7c577a43ed89d78b0c868a2842eb1985c842e214078cc8e55bc5d93fac5553fa2ed SHA512 1ee4176c3588c11594a79f416a1f34b063cddb10c2124a37640fee48e5d8135091573002b6bf1eda5a60a324c1125665dadc93f9bfda32c9270c35113b6e1bea
 DIST commons-lang-3.14.0-src.tar.gz.asc 488 BLAKE2B 3ef9b7529a1681e2687f533bf8d45a8394f6633e0a56e8e17ae63b2f8631f94c854b35e50b0f780908ffdcd0f8a8d99d8132aaa1ade5e932ee1ff56181b1ce77 SHA512 025673c12587970de5ebb62aad0d2d34cdbd57c575ebb6c83359b975b3d1ec50ff3caa544395ad04aecd59df454a12a769025635aa55d860195e39086ddcf47e
+DIST commons-lang-3.17.0-src.tar.gz 1195408 BLAKE2B 1f612b8e5ef3ecc820ae040090633fd1a145298f0abdcc404e344adf9fb8c3632d144d1ee1cea4009ec32932b5b49a767abf77c45ff110129b98bdb0a7ba4557 SHA512 e633b0caeb9556c68384c2bf20e374fbac910b9979b25774c632e50c1bec41e97c14362978dc092c8b5859291e54fe51e76ad7a61c9b2efbe1e4538f46c1e3ee
+DIST commons-lang-3.17.0-src.tar.gz.asc 488 BLAKE2B ad6bbd5658a4fcdd56f830d55abef4a387fc8f42f4e3cc19d4700033acef8b02e30df4d6774014ae2b0a4f6811bdcc97a5c1a0c154705aa37724325850218beb SHA512 34f48ab6080c5730821bbf32f3715672c9f916d69985940f1dd17f9ab2c2ec04d1907426ee1dac1bd3654f7f50c65730042ebbffde1c12aa758f9a1e5634fcd0
diff --git a/dev-java/commons-lang/commons-lang-3.17.0.ebuild b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
new file mode 100644
index 000000000000..39a3dddf56a5
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.17.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-lang3:${PV}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
+SRC_URI="https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${PN}3-${PV}-src"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+
+}
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index ff3a88cde8b6..06cd5df4828f 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,2 +1,4 @@
 DIST commons-net-3.10.0-src.tar.gz 450082 BLAKE2B 0df46b21ca298393500494e41d918b3fc6e700485c4d9dfb2bab61d8f834a4f44dd881c464c4008731deec9fc82ca36e0442022f0942b3e59e384a2b44329660 SHA512 d9d80255feddfb434d3baa629aa9e6d8feffd530c5e3172106fec55bbc986f6423a46dc9e737a1bb7020c62447229e6b83d0b7f9582d041e1def423536cc92dd
 DIST commons-net-3.10.0-src.tar.gz.asc 488 BLAKE2B 31a15e952c55079e595f33be1730126b85c669b481c649e401cb4617a5489fc3e3025e8c172f8193b190b16fe55d9c78c171d16d4adf7fa1a8e71648e295bc77 SHA512 ab27b1fa2c02d79eff26f93697fafc54f22a7368db631bb6f7173b8702cda10836ac8b656df987135fe5c1d39a557840fefb0355d8d52f0e4815808d4938de18
+DIST commons-net-3.11.1-src.tar.gz 460104 BLAKE2B 5542a7d9d3d8f2f07a90b3ab21e4e8a66bceecfef8f1ae8ec378003e4c3906414435b095cc0c0016f24d3e174a5e16da52cf4c5503209c08d5e550ef25a7bbdc SHA512 0999067cc73cb0e0ab4940302180a0afa998b37c51f93c1c744bf1d346d14c89283166a665283d98200e98f0b8c39854f17493890d49ddad5769c4deb49de37e
+DIST commons-net-3.11.1-src.tar.gz.asc 488 BLAKE2B ea6ba15b7b6800b1c249cb82d784057f701fb13775fc9838e5247e1e8ead9360a7c5381083fa0c0e2b783e339b6e4ebb8ff66cb8c8924b3c00c9b28ee696e7a3 SHA512 c9e4c896d2f514996aa50c8af20bab6564d574db4fef69832fe2391beefabfed74a727faf7fe9227b037e943cdba5b2ac143164d5c0df3140b9b7c44ca316e53
diff --git a/dev-java/commons-net/commons-net-3.11.1.ebuild b/dev-java/commons-net/commons-net-3.11.1.ebuild
new file mode 100644
index 000000000000..2563be67f5d0
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.11.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="commons-net:commons-net:${PV}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
+HOMEPAGE="https://commons.apache.org/proper/commons-net/"
+SRC_URI="mirror://apache/commons/net/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/net/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=(
+	CONTRIBUTING.md
+	NOTICE.txt
+	README.md
+	RELEASE-NOTES.txt
+)
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	rm -r src/main/{java,resources}/org/apache/commons/net/examples || die
+}
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.apache.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+
+}
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index 0876b79d106f..8b9e1af98159 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,3 +1,2 @@
-DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e
 DIST coursier-bin-2.1.8.gz 20863902 BLAKE2B 13ce0a1aa6dd2c1272567a76f3a762e31d9d6794e034e033d5d5accd0b6c534702fc62b5cab83070bb1081c7072ad7a04be86c38b4929d75f2d1f050f320820d SHA512 9cc8f13ecd0c166d46aaeeedb9279eb2885a7edac24c5b106ca30968c4c6fc5f47efe3a38e7aa6864dee517a7bc2cfba71fdd32741d295887bdb62594832bb9e
 DIST coursier-bin-2.1.9.gz 20870390 BLAKE2B 720698e6c55a8c070d02f01ec528bab06f397b3c580fa3e533a45cf0073d8b9caf506cfff10d1b68eb9348c8b0da9abab9e7fb183f0561b62a82a96d21d35f5e SHA512 102c351aa0647fe5cd9d00ee164c1cebbcd6bd133a11bdfd653f70a5347da02e32ba74d5b51ea425e9189bb7113ef16c3902219bfa1ef0172bac7955712031c6
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.7.ebuild
deleted file mode 100644
index 4c77d05f1d13..000000000000
--- a/dev-java/coursier-bin/coursier-bin-2.1.7.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
-
-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/coursier-bin/coursier-bin-2.1.9.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
index af4c8329d0bf..536fb0da7de1 100644
--- a/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
+++ b/dev-java/coursier-bin/coursier-bin-2.1.9.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
deleted file mode 100644
index 62b81cfdee9d..000000000000
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-JAVA_PKG_IUSE="doc source"
-
-inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
-
-DESCRIPTION="Forward Error Correction library in Java"
-HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-CDEPEND="dev-java/log4j-12-api:2"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-libfec8path.patch"
-	"${FILESDIR}"/"${P}-build.patch"
-	"${FILESDIR}"/"${P}-soname.patch"
-	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-EANT_GENTOO_CLASSPATH="log4j-12-api-2"
-EANT_BUILD_TARGET="jars"
-
-# There seems to be unit tests, but they are in such a state.
-RESTRICT="test"
-
-src_prepare() {
-	# Apply patches.
-	default
-
-	# In fact, we'll wipe tests altogether.
-	rm -rf tests || die
-
-	# Get rid of bundled jars.
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	einfo "Sucessfully compiled Java classes!"
-
-	cd "${S}"/src/csrc || die
-	append-flags -fPIC
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
-	einfo "Sucessfully compiled C files!"
-}
-
-src_install() {
-	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/com
-	dolib.so src/csrc/libfec{8,16}.so
-}
diff --git a/dev-java/fec/fec-1.0.4-r5.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild
index e55373ea5fdb..65c72bd07d18 100644
--- a/dev-java/fec/fec-1.0.4-r5.ebuild
+++ b/dev-java/fec/fec-1.0.4-r5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 CP_DEPEND="dev-java/log4j-12-api:2"
 
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 98941f07f28e..338f92146a7b 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,4 @@
+DIST gradle-bin-8.10.zip 227843671 BLAKE2B fefa993dcceb31e6e864c08b67f922c7e797d9c847f286bd549dd181ef129c9d7f1268c9d806d0eb6ca7115be3063b44bdb05b9589eebfc69a4f4e4b60a98bf6 SHA512 b0888ba212c82306de2bef79d8fa091dabfeb5eeebd8f5075b3f9657df81d7263c496a35dd9a8e4d06476cad6879ae5176750e60951cd6900893dc6590739ab8
 DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22
 DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc175ca0ea047273e05c4b2219fd80cb92e62e9b961481d646157418cc91ea211eb83530cc6ec815ea790f6ad8380a SHA512 37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180
 DIST gradle-bin-8.7.zip 224435312 BLAKE2B 1926765aea8931b25a9f0b7b9a224dd70756cfd337eecb364c6d288486187dd6311f888c7e1c36b1fc81b454c3514d2807884343e7782f1be45fce03e611496b SHA512 fc18863654cbe8dd2357f388c0fc5f699ca2d40ffd32c283f00cfd5bda94e1711ab7b7a3b154e7da66c17468f00c3c72fe6b6603c4a29617b33b0f292cbac3de
diff --git a/dev-java/gradle-bin/gradle-bin-8.10.ebuild b/dev-java/gradle-bin/gradle-bin-8.10.ebuild
new file mode 100644
index 000000000000..d02f8b44ef4f
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-8.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+HOMEPAGE="https://gradle.org"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
index db8fb161eae4..f19c6fe1c13e 100644
--- a/dev-java/hamcrest/Manifest
+++ b/dev-java/hamcrest/Manifest
@@ -1 +1,2 @@
 DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
+DIST hamcrest-3.0.tar.gz 880513 BLAKE2B f2240a08d6d54e14a8e5441311127fc09f78c8a38a7dcf56d888827f716090cbf15e4a4a563ee56d5afc22574ca1d081276d0173e9361effd20ea3f5389e37a7 SHA512 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5
diff --git a/dev-java/hamcrest/hamcrest-3.0.ebuild b/dev-java/hamcrest/hamcrest-3.0.ebuild
new file mode 100644
index 000000000000..ff3a7d92fbcb
--- /dev/null
+++ b/dev-java/hamcrest/hamcrest-3.0.ebuild
@@ -0,0 +1,29 @@
+# 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.hamcrest:hamcrest:3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core API and libraries of hamcrest matcher framework."
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JavaHamcrest-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,README}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest"
+JAVA_SRC_DIR="hamcrest/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index 7b2fc15669ec..4eae70ab60e3 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,8 +17,8 @@ LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND=">=virtual/jdk-11:* "
-RDEPEND=">=virtual/jre-1.8:* "
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild
deleted file mode 100644
index 0ab6c71728ef..000000000000
--- a/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2016-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Dependency checker"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/asm:9"
-RDEPEND=">=virtual/jre-1.8:*
-	${CP_DEPEND}"
-DEPEND=">=virtual/jdk-1.8:*
-	${CP_DEPEND}"
-PDEPEND="dev-java/javatoolkit:0"
-
-JAVA_MAIN_CLASS="javadepchecker.Main"
-
-src_unpack() {
-	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
-}
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
new file mode 100644
index 000000000000..4133d7e336de
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:0
+	dev-java/asm:9"
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+PDEPEND="dev-java/javatoolkit:0"
+
+JAVA_MAIN_CLASS="javadepchecker.Main"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
diff --git a/dev-java/javacc/files/javacc-4.0-javadoc.patch b/dev-java/javacc/files/javacc-4.0-javadoc.patch
deleted file mode 100644
index 41093de26566..000000000000
--- a/dev-java/javacc/files/javacc-4.0-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru javacc/build.xml javacc-patched/build.xml
---- javacc/build.xml	2003-08-11 15:16:01.000000000 -0400
-+++ javacc-patched/build.xml	2005-06-25 00:37:53.000000000 -0400
-@@ -150,5 +150,10 @@
-   	<arg line="${version}" />
-   </exec>
-   </target>
-+   <target name="javadoc" depends="compile">
-+      <javadoc destdir="doc/api" source="1.4">
-+      	<packageset dir="src"/>
-+      </javadoc>
-+   </target>
- 
- </project>
diff --git a/dev-java/javacc/javacc-4.1-r1.ebuild b/dev-java/javacc/javacc-4.1-r1.ebuild
index ba73aa439119..5f0196671842 100644
--- a/dev-java/javacc/javacc-4.1-r1.ebuild
+++ b/dev-java/javacc/javacc-4.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/javacc-release_${PV//./}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 BDEPEND=">=dev-java/ant-1.10.14:0"
 
diff --git a/dev-java/javacc/javacc-4.1.ebuild b/dev-java/javacc/javacc-4.1.ebuild
deleted file mode 100644
index f74f36d4eb2f..000000000000
--- a/dev-java/javacc/javacc-4.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
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="https://github.com/javacc/javacc/archive/release_${PV//./}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/javacc-release_${PV//./}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/junit:0"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (	>=dev-java/ant-1.10.14:0[junit] )"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-pkg_clean ! -path "./bootstrap/*"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar bin/lib/"${PN}".jar
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc target/javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
-	doenvd "${T}"/22javacc-${SLOT}
-
-	echo "export VERSION=${PV}" > "${T}"/pre || die
-
-	local launcher
-	for launcher in javacc jjdoc jjtree; do
-		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
-	done
-
-	einstalldocs
-}
diff --git a/dev-java/javacc/javacc-7.0.13-r1.ebuild b/dev-java/javacc/javacc-7.0.13-r1.ebuild
index 83edc96db3e2..d8dfbc20ebc3 100644
--- a/dev-java/javacc/javacc-7.0.13-r1.ebuild
+++ b/dev-java/javacc/javacc-7.0.13-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD-2"
 SLOT="7.0.13"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 BDEPEND=">=dev-java/ant-1.10.14:0[junit]"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13.ebuild
deleted file mode 100644
index 3a111cb197bb..000000000000
--- a/dev-java/javacc/javacc-7.0.13.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
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD-2"
-SLOT="7.0.13"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (	>=dev-java/ant-1.10.14:0[junit] )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-pkg_clean ! -path "./bootstrap/*"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "target/${PN}.jar"
-
-	use doc && java-pkg_dojavadoc target/javadoc
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
-	doenvd "${T}"/22javacc-${SLOT}
-
-	echo "export VERSION=${PV}" > "${T}"/pre || die
-
-	local launcher
-	for launcher in javacc jjdoc jjtree; do
-		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
-	done
-
-	einstalldocs
-}
diff --git a/dev-java/javacc/javacc-7.0.4-r1.ebuild b/dev-java/javacc/javacc-7.0.4-r1.ebuild
index 41b912eee734..09d1ce85e478 100644
--- a/dev-java/javacc/javacc-7.0.4-r1.ebuild
+++ b/dev-java/javacc/javacc-7.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="7.0.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 BDEPEND=">=dev-java/ant-1.10.14-r3:0"
 
diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4.ebuild
deleted file mode 100644
index 58d0ccdccbcb..000000000000
--- a/dev-java/javacc/javacc-7.0.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
-
-JAVA_PKG_IUSE="doc examples source test"
-MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.github.io/javacc/"
-SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="7.0.4"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (	>=dev-java/ant-1.10.14:0[junit] )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=(
-	README
-	javacc-releases.notes
-	jjdoc-releases.notes
-	jjtree-releases.notes
-	release.notes
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-pkg_clean ! -path "./bootstrap/*"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "target/${PN}.jar"
-
-	if use doc; then
-		java-pkg_dohtml -r www/*
-		java-pkg_dojavadoc target/javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-
-	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
-	doenvd "${T}"/22javacc-${SLOT}
-
-	echo "export VERSION=${PV}" > "${T}"/pre || die
-
-	local launcher
-	for launcher in javacc jjdoc jjtree; do
-		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
-	done
-
-	einstalldocs
-}
diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615.ebuild
index cc3c6e0d7637..e2ce20b6b312 100644
--- a/dev-java/javacup/javacup-11b_p20160615.ebuild
+++ b/dev-java/javacup/javacup-11b_p20160615.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ant-task"
 
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
deleted file mode 100644
index 73a927bee381..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.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
-
-COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The JavaHelp system online help system"
-HOMEPAGE="https://javaee.github.io/javahelp/"
-SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/javax-jsp-api:2.0
-	dev-java/javax-servlet-api:2.5
-"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-DEPEND="virtual/jdk:1.8
-	${CDEPEND}"
-
-JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-_eant() {
-	local \
-		servlet_jar=$(java-pkg_getjars javax-servlet-api-2.5) \
-		jsp_jar=$(java-pkg_getjars javax-jsp-api-2.0)
-
-	eant \
-		-f javahelp_nbproject/build.xml \
-		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
-		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
-		-Dservlet-jar="${servlet_jar}" \
-		-Djsp-jar="${jsp_jar}" \
-		-Dservlet-jar-present=true \
-		-Djsp-jar-present=true \
-		-Dtomcat-zip-present=true \
-		${@}
-}
-
-src_compile() {
-	_eant release
-}
-
-#Does not actually run anything
-#src_test() {
-#	_eant test
-#}
-
-src_install() {
-	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
-
-	java-pkg_dolauncher jhsearch \
-		--main com.sun.java.help.search.QueryEngine
-	java-pkg_dolauncher jhindexer \
-		--main com.sun.java.help.search.Indexer
-
-	use source && java-pkg_dosrc \
-		jhMaster/JSearch/*/com \
-		jhMaster/JavaHelp/src/*/{javax,com}
-
-	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
-}
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
index 453dcfef7068..fdebeaa445de 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="
 	dev-java/javax-jsp-api:2.0
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index ae0e87bf4724..36a9daaf4143 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,3 +1,2 @@
 DIST annotations-24.1.0.jar 30570 BLAKE2B 55120bf8969384048e0fd438fc96dc6769d6974b96e0e492636351c15466401da623341fe526685e51cd63378fa54c6485fa5dca83b2fc853b85ed4a75dc5d7d SHA512 663395a885561cc97eed411c67b496c06ec9a54906185a871de8743bf53e92152f4bc7c2a0118b7f3cfe85cc0a6c408ac6d589839b8d25c851637f85880331f2
-DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
 DIST jclasslib-4.3.1.tar.gz 1396903 BLAKE2B 2f070186f75e40be7cb7122e34d3a00688691cb9da49b6c161beaff7da3170b8ddf3e805467b7ecfbd820ca4bd0b335dee765d7318d0f487f2242e5f8bf4ae76 SHA512 25e35b39a39eb09fe7730d70abb4f6f500522f755801f80ece9357a1a90429254eb3bf57ea7a6cd638fcac77b0d04a62e0df9336c8184738acc74901ed4516e9
diff --git a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild b/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
deleted file mode 100644
index 49ed3261956c..000000000000
--- a/dev-java/jclasslib/jclasslib-3.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 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-ant-2
-
-DESCRIPTION="Java bytecode viewer"
-HOMEPAGE="https://github.com/ingokegel/jclasslib"
-SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gjt.jclasslib.browser.BrowserApplication
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "jclasslib uses Firefox by default."
-	elog "Set the BROWSER environment at your discretion."
-}
diff --git a/dev-java/jclasslib/jclasslib-4.3.1.ebuild b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
index 79ad0e367e27..65b964da4d76 100644
--- a/dev-java/jclasslib/jclasslib-4.3.1.ebuild
+++ b/dev-java/jclasslib/jclasslib-4.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
index 649d226c823b..0cf061e42ec7 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
@@ -23,17 +23,17 @@ S="${WORKDIR}/mysql-connector-j-${PV}"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/c3p0:0
 	<dev-java/protobuf-java-3.26.0:0
 	dev-java/slf4j-api:0
 "
-DEPEND=" ${CP_DEPEND}
+DEPEND="${CP_DEPEND}
 	>=virtual/jdk-1.8:*
 "
-RDEPEND=" ${CP_DEPEND}
+RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*
 "
 
diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
index c0083bb42fce..79f141edeb94 100644
--- a/dev-java/jflex/jflex-1.6.1-r3.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( ant-task )"
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 7c157778f793..014914194795 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,5 @@
 DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
 DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
+DIST junit-5.10.3.tar.gz 2944861 BLAKE2B 38ca01363ecd1a2bb1b66d93bbc8a6e34c94ee574fd44857239223f6253051c355572ac8ecece21610ea8afeabdc62df30caab1994ae9bbfa9fa9c71097ac956 SHA512 8d3621b6da6e70017957e280fd2848fdc77136497bf4399a1690f2db0f53b1b079f85ec19b6d3115cc01fe24454e118548944d45e1c23f2a404b640e587b0771
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
diff --git a/dev-java/junit/files/junit5-java18-compatibility.patch b/dev-java/junit/files/junit5-java18-compatibility.patch
new file mode 100644
index 000000000000..8015d4658b7b
--- /dev/null
+++ b/dev-java/junit/files/junit5-java18-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the latest version of Java
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
++++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+@@ -316,7 +316,7 @@
+ 		}
+ 
+ 		@SuppressWarnings("unchecked")
+-		private SerializedForm(ObjectInputStream.GetField fields) throws IOException {
++		private SerializedForm(ObjectInputStream.GetField fields) throws ClassNotFoundException, IOException {
+ 			this.uniqueId = (String) fields.get("uniqueId", null);
+ 			this.parentId = (String) fields.get("parentId", null);
+ 			this.displayName = (String) fields.get("displayName", null);
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 6a2ce43fc405..50aa3c3c6763 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -44,7 +44,8 @@ src_prepare() {
 src_test() {
 	cd "${JAVA_TEST_SRC_DIR}" || die
 
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars \
+		--build-only ${JAVA_TEST_GENTOO_CLASSPATH})"
 
 	ejavac -cp "${CP}" -d . $(find * -name "*.java")
 	# pom.xml lines 264-268
diff --git a/dev-java/junit/junit-5.10.3.ebuild b/dev-java/junit/junit-5.10.3.ebuild
new file mode 100644
index 000000000000..ed6b7657fa56
--- /dev/null
+++ b/dev-java/junit/junit-5.10.3.ebuild
@@ -0,0 +1,349 @@
+# 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 ~arm ~arm64 ~ppc64 ~x86"
+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/lucene/lucene-2.4.1-r4.ebuild b/dev-java/lucene/lucene-2.4.1-r4.ebuild
deleted file mode 100644
index c69bb031e695..000000000000
--- a/dev-java/lucene/lucene-2.4.1-r4.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
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 verify-sig
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
-	verify-sig?	( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="~amd64 ~x86"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
-
-# Restricting to jdk:1.8 since it fails to build with openjdk-17
-# BUILD FAILED
-# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \
-# rmic does not exist under Java 15 and higher,
-# use rmic of an older JDK and explicitly set the executable attribute
-DEPEND="
-	dev-java/javacc:0
-	virtual/jdk:1.8
-	test? (
-		>=dev-java/ant-1.10.14-r3:0[junit]
-		dev-java/junit:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}/lucene-2.4.1-skipFailingTest.patch"
-	"${FILESDIR}/lucene-2.4.1-javacc.home.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	java-pkg_clean
-
-	cat > build.properties <<-EOF || die
-		junit-location.jar=$(java-pkg_getjars --build-only junit)
-		javacc.home=${EPREFIX}/usr/share/javacc/lib/
-	EOF
-	# stop scrambling the build.xml
-	touch "${T}/java-ant-2_src_configure-run"
-
-	rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length
-	rm docs/images/instruction_arrow.png || die #: broken IDAT window length
-}
-
-src_compile() {
-	eant javacc
-
-	eant \
-	-Dversion=${PV} \
-	jar-core \
-	jar-demo \
-	$(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	eant test-core
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
-	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
-
-	if use doc; then
-		dodoc -r docs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild
new file mode 100644
index 000000000000..2a1641800238
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild
@@ -0,0 +1,83 @@
+# 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 verify-sig
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
+	verify-sig?	( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \
+# rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+	dev-java/javacc:0
+	virtual/jdk:1.8
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit]
+		dev-java/junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/lucene-2.4.1-skipFailingTest.patch"
+	"${FILESDIR}/lucene-2.4.1-javacc.home.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	cat > build.properties <<-EOF || die
+		ant.build.javac.source=$(java-pkg_get-source)
+		ant.build.javac.target=$(java-pkg_get-target)
+		javac.source=$(java-pkg_get-source)
+		javac.target=$(java-pkg_get-target)
+		javacc.home=${EPREFIX}/usr/share/javacc/lib/
+		junit-location.jar=$(java-pkg_getjars --build-only junit)
+	EOF
+
+	rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length
+	rm docs/images/instruction_arrow.png || die #: broken IDAT window length
+}
+
+src_compile() {
+	eant javacc
+
+	eant -Dversion=${PV} jar-core jar-demo
+	use doc && eant -Dversion=${PV} javadocs-core javadocs-demo
+}
+
+src_test() {
+	# we found that running tests with eant creates completely different output than
+	# runnning with ant. no idea what exactly is causing that difference,
+	ant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
index 457503f62795..69fdbc631122 100644
--- a/dev-java/miglayout/metadata.xml
+++ b/dev-java/miglayout/metadata.xml
@@ -9,6 +9,6 @@
 For Java developers writing GUI layouts by hand that wants simplicity, power and automatic per platform fidelity, that are dissatisfied with the current layout managers in Swing, JavaFX and SWT, MigLayout solves your layout problems. User interfaces created with MigLayout is easy to maintain, you will understand how the layout will look like just by looking at the source code.
   </longdescription>
   <upstream>
-    <remote-id type="github">mikaelgrev/miglayout</remote-id>	
+    <remote-id type="github">mikaelgrev/miglayout</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 6513dd221b48..5340ebc92a15 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,3 +1,3 @@
-DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7
+DIST mill-bin-0.11.12 62116087 BLAKE2B e64e2ec1a2c89e780ada3b779104826398e9ab12801aea937302d71be190dd6caea6c64045e878f202b631c7647d8897054fd120c11f576ed301ffc02e8f7c8e SHA512 920de40ca5d8178d33ce439cc6a48ad4ec5665fa248af24122f7869ef5ddfa21f643fbf9a4bfa0dda40b8c994e088b7e4089c534d809a7a31cd6ca764fb5e741
 DIST mill-bin-0.11.6 52778046 BLAKE2B 5f05b14cafba4e6b40b89572310a2b06ddbf1839a2da0dbdfe73a63606c9b1262fed686f7ffb17dc178072242136a4b334a2ae89b2fdc7274bffee928ff3c5fe SHA512 9f187b00d37f8d0bb97b7cd08c57e59e081c835e25f83e6c65bf2ca425f4325a6c641f7082ef700dac30ab6d4f59da5492136eeab21c898f11a259b89d55e9b8
 DIST mill-bin-0.11.7 59806165 BLAKE2B bc97d64a692a33a482752828a703cb22d44bafeeb3aa329136d601058b56bf94703f97047be416bcbcfeb9633288f31e5715646aad359be59deffc957fc15b7c SHA512 c7c2cecd5cec6aab735e36182fade4e7360684795af42b528c1a7e5b0a0dc89dc4c68d47400d46121854c455f72e47f51c73ac4f8e70339ce5a7d18ae8b088de
diff --git a/dev-java/mill-bin/mill-bin-0.11.12.ebuild b/dev-java/mill-bin/mill-bin-0.11.12.ebuild
new file mode 100644
index 000000000000..3534e0b8c898
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.11.12.ebuild
@@ -0,0 +1,25 @@
+# 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://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 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/mill-bin/mill-bin-0.11.5.ebuild b/dev-java/mill-bin/mill-bin-0.11.5.ebuild
deleted file mode 100644
index b2461d64d37b..000000000000
--- a/dev-java/mill-bin/mill-bin-0.11.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 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 ~x86"
-
-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.11.7.ebuild b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
index 5b24c097e25e..95f583ce077d 100644
--- a/dev-java/mill-bin/mill-bin-0.11.7.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.11.7.ebuild
@@ -8,7 +8,7 @@ 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 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 8c256c8c15b4..25258df079e6 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -3,31 +3,18 @@ DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_8-ea.tar.gz 214372109 BLAKE2B 891f3b1a
 DIST OpenJDK-jdk_riscv64_linux_hotspot_24_8-ea.tar.gz 210709698 BLAKE2B a612df8e357a930ae1bc6f54a5f0f0c55f8fec279ce7ea7f52ff45a097badd1a848dbdad5778adf2a13e622c7ff63b6c10b6feb7e3f8de75016eb9bf404f03d4 SHA512 1c4d93def2a92de4e1a1a8f6ab624de542c4fc177b9d66815d50b1cac823ca6295a4a702402ae09b8b9662ea40c56da836d6a962af8a2fbd7bf6576a3036187e
 DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_8-ea.tar.gz 215051746 BLAKE2B b58ad14f0faa0940621245eeca212ed6112352c9e52833fc5dd2aa740956bce85d69f8d30aa923bc0fe0a0d81ed8dc4d4c9d8cfea5132de03d34d6c40bb7f3c8 SHA512 610a2bc5df2670a214ce39ec426428c3dfca47e5c4c04ed3bfe92fe48ec944324208f4edbb242842508a1964b97bf1085aaadec14d5fe8c4cf7bde57e20d505b
 DIST OpenJDK-jdk_x64_linux_hotspot_24_8-ea.tar.gz 214855714 BLAKE2B 4230cd14375499463872f9c9e879b27ffcff602ca2401634fa0ae1dbfbc9a7aabff67f6f99b7a2e5ce409eabef962775706785268b8bdce8cd3f40dc76042b83 SHA512 55ff9c22d61815e7b4cdf8bdadc75d6ab16c0a6d6a559a71bb11ae9ac3236e4305b9928981d489ca71078e64bb647f8731534d093e1c81249e32d7c168cc9df3
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz 192013902 BLAKE2B 6a4b47b9a3397d3436bd55a16a459a3cab3f8a2a7dc3285b3bde8db13f0e66d5e094803df0c5901a17272e6378161caada6f27845184e2efd17a6761661299c8 SHA512 90e53418efc7c34d7cf0691d566f07a84f02bd2d34cdee0c9c343e27c8d9bfd4d1bf86f104ae33a47274932ab8ba6ec8071a35e7d613129d03e439ae3382452c
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz 192087968 BLAKE2B 12659ef10cf2728ca5eba2b4eed5f592a5bbff5065f33309498e7a465661957e0e8191bb691a89934a8221e26ae7265f0aca059ba59731b5d9a80e7f6cc55206 SHA512 84dbb810134199cb2f0278ccbcfca2d1abe32bf65bbb399e99c2ea9a027e21c2ace5685adae98930be4a185970640626b5bbbf822d499f815d803fa4485134f7
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz 182785851 BLAKE2B 453ca29859e749a9050f8b6627696ab6d38ee5e83ab69b1d159eb3b7c0bae68104cf68ca21b87123b4fc61059e528ba4ed0ee29fa4759f33a3cf46182f52a48a SHA512 af8ed3659f8ff07f5e5c135d96a7368d326f5b19e3d73077a3fa701716f6e415d4a784ff6c5f81267eb1b3d2e171a688126253f1c3197fc80ea260826ebad5a0
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz 182800065 BLAKE2B 50158e8e84637ab841226da590f53ef3d0f18aa2dc4ce5c2fabc2260d864a1de65a3021e380fa9a1af1aec92177c2618790ced8c7f12f449fd7ab4851bf37ac0 SHA512 893ab22f39f102724e7b77b7a06e09b33ee0551b166c0154ce19d4e6abd7e346d0a8314fe2e675e102febf93e001679a1c7c665f6b131c04a453cfbfbabb5003
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz 177453532 BLAKE2B aa98f381f2ac4f208ced4dac4f4b01d20cfd27c8ccc75a0c41db6a57b67ca11d87b8133cb0af96283f646e5e90612f9ad69db5129e6f50518ad2eb0a53c86db1 SHA512 c590fa032593db48531d49977c95d1f884fe751472d927d0d0bc15f36ec35f71ea53c9acafa3dc00c4b25e88d4c18ab590b42f8057a277e16947c3ce31362381
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz 177494491 BLAKE2B acc6c4893a57250284b7be0fe98d6ea3b44f42227174050ac3d035ff68e482a61aeb32b38f1404f597c47dc3090fa49aa27401c6903367cc938b1f4041cb714b SHA512 88d8e3eee4af1f3578ee001516fd9a2a71af6317af404e39b64365ac780f89455dbbac1eccf50aa6d09cb879a79da88e720c344cc527d7313d6abfb8b148c3ae
-DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz 193956832 BLAKE2B bc334b59bbb021812ee7064b1915b6106923d41a74a3acf5b5d8fbcf50f6e0d467a96da22f996252422b08f5c7864418c552a102a18f3bd9cb14e5b4904656e5 SHA512 f0992a7fdb1acadf8cb19a94822e7a75f7453033cc0a3432f9efface7827b4a7ebb1ff67a81774da83844afdb046461415f50ddf11192863e88ab06889c86836
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz 193983794 BLAKE2B 1e2c87450db7dc12c634ae5d12f3a5c0ca9406d85c01e4b5953921b54a144d868b4f5b8fda17865ee42c7ad082177770286367b8ca38e7faaf30a80f438caab1 SHA512 1e55b979254f2ca7c1b53496471a089538fc6c31bb9a40dc1cab5e09f42b0ae23b383f768c2614421868d16d8eb2f3fcb5768fa24a944a8296439fbc31d7f841
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz 195220527 BLAKE2B b2f024fdd2d72e78c86f562fbd37684c9d9639472d66e15b4b882c35241c500c09467e97440249bf69f4e63ef99d3f057b0e79852b67d55c5518d041cba2d657 SHA512 ccccb5003b78cff0cbf471d9b885ebd5805b5a21dd71afdb03a0d447cd6715e781dbf01f11970f7632b8181147fe0090f7fe8fc46c8732d2b17f0978f01934a4
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz 195251808 BLAKE2B 920459ebe96477e79fa3e933958c3fdfac476231dbcd7473ef9fdcab0691e807e67bd94b92fe43dfcd66c401b62da0a450892d5561530c17c5f159d44f537f3f SHA512 91e20884152a5d670c05e83e0b2b875b324af2683bbfb063015cfef4956e1ef4f3051955222f854753ea4144d99b30f3f9bd1b5220204f9a9bdc51ef461a1590
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz 187689918 BLAKE2B c1ccebd2bfeccdf64f1ab0c781e4ba5f2701f6c70de81486c6b4d91bb1d1df367f58fa66bf8f073ed47413649905a306ad3f75c6696e1d0510ce02fe3453d255 SHA512 93974938c10d58b182a7bda49e21e26806a01a03fe72915ca559df3e02c694b3b88ed11c49987bc2ca7c1acabda0892d8c22a4ab19ed8b796dd02f29c44dbff0
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz 187710109 BLAKE2B 7565adb6e64d2c53ffed1d64b8e23ac02b82f4feeb9315327c9825d1b134cd476d3331f64def991b23b5b568379c9e31dfdfd97fe87b6caad7eea039a47b652a SHA512 91d8da2812f8f709916de9f2fd90afbe2caec38c1ca0da2d3ed50d79663aa274126c010c1c19f841845b493c7efb57307b74b28e2f89789ba52c0dd80dd54e04
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz 191052267 BLAKE2B 837cd3f3e9cdff7b66d1a8e10e2e8ebb9db1168fad2982fd523eb8067ca017efdc05e577b93af74623558d04a8458dc1d790c9626e7ed2d6568bf7fc22a44925 SHA512 eeeacbd0f8daa1d62663f7ec95fb7dd3ff855a0187347e3c1ddb4a5d13e494c1a940b43b5fdf75480963d65dd4d94330570b751fa7cde540124ed2164c176870
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz 191121494 BLAKE2B 92b72ef8fc0ecc6bd4fa785baf6b799db48de5e82e12a09ec630de854b19a0b17ad2408a7cf8d1cea9a663ddd062e88026bb91ca1d7cbaf51c261e189ece697e SHA512 662ffbeb67238612d56ad5e53abfc11738aef595f96bb8775819c7d78cbcc6888755baeafa9695c1673c1833ea328de67d6d0e4c6736c7e3006b0a886108de9d
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz 178367345 BLAKE2B 7f1c8f77ab8ce9ce401947e51cc3051491df1579409f7ecb73107f091b58d6e7fce2004604951dfad019cd60e8da84fd4ee9f8987f92c9363889b310ee098e54 SHA512 0283452e56b3fbd85af33a7939ec8ae69624241ef07224152de55c5aafb1a5cb8423b8a211b5fadf8f5ea50aa0e5ed8211d02abf1398473ddf3ef13f2ba3f1c4
 DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz 178427485 BLAKE2B a2ceda0b6b2abd5643517f53bf8e89c7ccbaf1c29d784e8dc4de568a534fff8564561fc48ca64183205754ae453b5fe2027c7881c8904a126f420cb76745bec2 SHA512 2ddb35fa6214f29c254e0f27f401bd7da1f85ff7bb171b12fa477321883b0c31ce6a6f0713c76df2ced18884a0b8261b8772d9c7f6382cb08625aea36e8a3824
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz 189349607 BLAKE2B 2508ca965c27b1cf6457a595418ee9cd0450f9633a2fb80605a58a4bb7546cebb95b04c0d66bb14107c75fdff9fb678d78cdb879316929a3da6863579d4df9dd SHA512 bb76dcc65f65bbd3a256a54cea00eddb25312f1a1e2ed30fd3088bd44e9f8db7bb2ff3a6776b5ff6733ea7afc02928ef9e2bae296325fb1b8eb9b66b4e6f4a87
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz 189408363 BLAKE2B c6569c14d010262b29c1d4b879f9384028c6a6be71fb29fb2cff1407fdd3bace0f22e20af0cec7fbf1277ad4d75000d32a0357776a32ed4166de64630847c59c SHA512 85368a3c6f60847dc1c55f29c8d465e87ec64a690198f68ae9022cf897671fbb2c5f0b509adf90d541ac7ce48f2f7d8159070b64bc5bc7b652e52c95cf20f10a
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78a0a64bf936bf85a4f9fe1c9299d1db4773e10cd308afa5167d61ce35ea7415d2a94a1dc160345fa5aa3d3a7b730235801789db147d62dae621572ca060fe7 SHA512 9ae308f12b5c74b48aed4ef2312d7e0b23e9fa73b7d78eb3576037b0fcbcfc3a5381ebc448fb41279e770d5994c46bdda6822b97181fa3d3365da63c8b0ecadf
 DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz 191814558 BLAKE2B 326e3bea419e404be9b8c33640355d7f94e07068779edcebdc59370410e1944d0e4681fc3966b4bc4871989900c296149d82b331061424223f9fbf0c08616f75 SHA512 bcd5a53f82a6dc84aa069651228cf7be3de69195f58954230b34e575be62fe3ed403d57a7870b88ae930fadeda6e29d6af27e3ec7e5bf862e434df0c627985cf
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851
 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz 191681951 BLAKE2B 40548a12e485b36700726d7fe0826d716feca2d7db9bed403a6b61a13ee929a4ded93d85acdc2cc2170b8d01daf616a9ac7faa7e673ca37484b1f408b201af48 SHA512 28720148b92c7dd0649921a46dcb81aa05203e309ea851bcd41990fe59bc3566cbedb07ef08d7aff5f7399f063a05d56048798b99bb60a6a7b69533a44ca152f
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz 192452655 BLAKE2B 1b38d3aa527b585f931235b737e0628fc74e0f1b996dc64b9c3cb84598c66f28d908ca550786f691912ecd03473d43bc87309a479442d4c4de85a67298a69fcd SHA512 59db63a7b25f851153bdf3aef81acae6b7de88eff14d481f14c346d894bd7e3899c40224e51049047687330e1c43a8c23c45bd375966ad9992d4ab538a08aeb1
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1
 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz 180640890 BLAKE2B 23b97b0bae054210155663e5d92fe6868827d353aa9ee6a0fa46cc53d41e43ba5378ac7901dfa4a323a2aad541a45ecbb2dbf7e4ac367cf58908203c7b216c5b SHA512 06ee1f7d0d3b346cc5c72534f7d00f53d02260d8d41672a94228de805eb0c38b1afa8947504ebf740dea2646f45c5868983c82a6ddb800a577d305a56200d13a
 DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz 205835448 BLAKE2B 12aecce2bde9d78c721a378554de5132a5e4fcd3bf95edf7178b7ad837cf4873717a7c8fc9611a811840f32fb4b2a794c4ad80fe19ed42a55f94430240fc19f9 SHA512 d349ea6ca15f8be8818283ebb11c4eddef57a7d1cc98bcfbaf885366ea44ecf520d2deaef43c7d9443a00dc8eb8b3d0821c1dbf4eff886199ad9f484c3b2fc04
 DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz 205880079 BLAKE2B 995b78580e88b922852d3f3ef59e40d11e4c7666790a1590f3672f1fb22f8b58e3a2965507cdd85d75b3bbe03e4daa603519e5d00933b86abbeeddffd5c2475d SHA512 e5f263007f3aa10fb6f4c80ccec503ca08e62bf220d5c90a206edba99e8b9d2c4585dbef7f7a84c3abeeef80a964ac171f11eaa40e5eb9b06310974dd57c42cc
@@ -35,15 +22,9 @@ DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz 207691025 BLAKE2B 5413
 DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz 203854772 BLAKE2B acecfba0619cd5856f2e2c835240729f5d70a1f4fc373c99e7dec2aadc701d5779c8b42b804337653d6e8b99089fcd1622f48232a9a36bd25b4e4b7016ce68e6 SHA512 92a12dad45b80ee25b555b26456a592db65e5cf2373984e7102ee0527a923cc1d015fba0a75177f3f0063c5d1843f4999fb6627b506cd506571b9625871dc892
 DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz 208015131 BLAKE2B b143b83ff40affffd0be90cc19fec59777a80f783c6a4d9d1161d5205dee9a50f88d89fc21e402a14a1849d2dfefb780935acb47b7366b8fb07a3cd10f9ca65b SHA512 9cf65b7ea2cc4e7a21c5832c3522211c53b55fb6f0d4ec4deecb94744dafbf1412c17508ed1c21cb06b03c5bcf8212a0e5d6f2804663833735a1ac2f77dae7a2
 DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz 207789015 BLAKE2B da61c96f082f18bbb64e543b96972d0cf812cbd64ac970a45000506e41f9f54628453d4a24b4090271dc267e21bfe285a04173c106259e67dc72246c43edbe32 SHA512 7675079ac1ed0c0428f806908b21c58549df7fc18043d26c011e063b58772ddb1c1c9648a46ab7d5204d47c2af5d3f08eace30028113d64e09cadc69c4fd0def
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz 102116126 BLAKE2B 19f8deee04fe5521323ead5193ff7b383979afa32c4375bdef7ce53b868dd7cb317bcd208b94d373c353f5480433cb3a28beeacbb7f42b501058acdfe6917079 SHA512 e2c5e17eda6a25b8f12c8fe5a50b5c58a9b52bf9cdac7213e2b0eb7ea0c99ba0d3c31ecbaea834443fac12adacfe506ecbe3a487abd16846c6619678ac24c4ee
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz 102132553 BLAKE2B b59a2d99f9999f86eac2ab15617ee7c58d179a7db2e3606b3296b4bee8bbfaaee2f3cd1f441d90b7462ef9a502f4f351bdb4acc8e723d6b16f208827b813e8a7 SHA512 3856d2e711fd0f93f5efb73ffe5dc115d03dbd0cd015e903b7c2d02b6a3940b10793243edd6a372d7f84306f10c7a41cf13d7b787a33d525f1e86e9975453d06
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz 98318417 BLAKE2B 11ec1cb2e793da8252511dee62ad193b67b3bc5c8aa91dbd6b1e8aa2d2f7e2e342528d145e0eb9e26b17b7e81c9ff17586f068b4d146f6789b157026aff67099 SHA512 84eab7b032fb55e02870013f9a87d0898ece12c52c560c0600d8d2ecb4901cc64e6e5cd44375ec6785a5c8f139263e8b6b32d348149e22200c962438fabea9fe
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz 98342561 BLAKE2B e34d6c959a2100b7c1817ad0fa213331e1cca75229edccf68ed4fcbd3b9bdeb0852dfdf59dac3e9cdae0179af38edc64ff7329af9f44fadcfaa7cf301f8f4e13 SHA512 a667d531b3318e7f75d3d4d9a32248c5c9ae7c1d4bd9bfcbcb5f11418016c1faa179ed748c3eae09c8693885a9401a80de8f3530891883b9f6e9de0b50002ed5
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz 100529230 BLAKE2B 1498ff1c4d89f65a41a565cf3d6949f715bc8783a33b70e6cf7b44e513ddf7ade1242e2a0a95b582813ab212fb2367a5f17f794f54b5e458f0e23dd22e74123d SHA512 cf80eb66063559d4fbe062d8a198490468e4936c9e0b27ffe04912b4468a2d1f4d12fffe5df5fede38b44870b65a7f0cd85545f7031957b12a7d1a368a7770c6
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz 100533202 BLAKE2B b83b926e5bf0fe45bce9a79489422b96c6ab321227a56d8b3c683a26e5b71cbf9ec80a4dc2706aa4853095a4ee3174591cba8725b9e1b645f4c275137a97abee SHA512 e345de1325f9807d1cc3e4b043d650d655ad8a3672edec304023af54c7dd1d8fea0e671781ed46e6d7459909afedb2458c1b45966b55957389ec62449aec6469
-DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz 100923084 BLAKE2B 9c9b0d7f95983a44f040efa83c69100163b1450d04102000d4f75361e9164024697380c055fdb31bac2ef4dabc05df592bbf342e716d8f438954b89236ff0986 SHA512 07b721e57225165d3dbc51c1d8f79f269e75fa3fe946ab76e933d1d3645dd19b3e7e8ea924d4f510382b5bcebbf073e262010c0e4655e0282379cce9d411eeab
 DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz 100948020 BLAKE2B db92e2d9ef5bd15816d2fb3cd6a6dc0accd250fa16ec9b3eea9b23a72e73a32be43527d8f520f39aea1b7a84723e07d24e3de136b6888b869d8e75e446fc04cd SHA512 20b47a527c1b19d6f2779e619507a250316ee3d95d7ad7b5fa45c86e26e90515cace468a0ec6fd37be108f473f92d70eadd0a61ee901594ff0309272af4f61e5
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c160d723df67700363ed6f40f3308a7625635b5afcb1656c77c9f78cc2796c5878aac0bda6cbde8d6551371ed15223de6aa8e75c01ba3e4848285a88eb SHA512 6f7df3fbb34c5971b7bbc4bafbe0179983abfa0aee212cc810e2656697cf0a7f4736cbbf6755cc88cc885d7beb5c15482a21d5287c52bae560988cf80908ca05
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz 103022651 BLAKE2B e144aee88326b4ed539324d8dfa35db461a3595c23a3bfdf0af557b4402ac4dd65d9000fa875b6570d7475ca7fef90d2e7021938f04918d40a04c04029e2e1bf SHA512 d44bdb72e616771d6b465abb66228f08968afdc0e8e40f73e892ea5c5c441f554d793f1e1643f1f682e0c0f4e25d24ee3f9ddec8c6191c43e77a3820c9f3d2a1
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz 109522911 BLAKE2B 37472be9a5f061ade8e27318ef2a7782f0fd4aa38362c2d19eae47cf18ac0d4085a84aab4630b97e0162d6b8288e3bcce2b1fb1a8f1bc25e8a129137f5407657 SHA512 e6718c635d42d2662a404ac71f5c4cae45714f7e1e7f92af28191dfb5f01ac3c4c9c5335073386a7cf7a0c628d9dd0ae211fc4e9c0bc953e3827362f1fc39344
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild
deleted file mode 100644
index 879465da18c0..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.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 java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
-	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${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 x64-macos)
-	$(abi_uri x64 amd64 musl)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
-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="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-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-11.0.24_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
index 602158ffbaf9..2602fad82147 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.24_p8.ebuild
@@ -42,7 +42,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT=$(ver_cut 1)
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
deleted file mode 100644
index 43345bca275a..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.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${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
-	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${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri aarch64 arm64-macos)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri x64 x64-macos)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
-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="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-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-17.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
index 79896f0974c5..beedcb4f53a4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.12_p7.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT=$(ver_cut 1)
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
deleted file mode 100644
index f93a2a4afad5..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.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 java-vm-2
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}"
-	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${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT=$(ver_cut 1)
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri x64 x64-macos)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
-
-IUSE="alsa cups examples headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		arm? ( dev-libs/libffi-compat:6 )
-		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 strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_unpack() {
-	default
-	# 753575
-	if use arm; then
-		mv -v "${S}"* "${S}" || die
-	elif [[ ${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#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# 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
-		# this does not exist on arm64 hence -f
-		rm -fv jre/lib/*/libfreetype.so* || die
-
-		if ! use alsa ; then
-			rm -v jre/lib/*/libjsoundalsa.so* || die
-		fi
-
-		if ! use examples ; then
-			rm -vr sample || die
-		fi
-
-		if use headless-awt ; then
-			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-				{,jre/}bin/policytool bin/appletviewer || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	rm -v jre/lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
index f362abc652e7..b8735214d026 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.422_p05.ebuild
@@ -42,7 +42,7 @@ S="${WORKDIR}/jdk${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT=$(ver_cut 1)
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 8a000540d5c9..f4853c22935b 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,10 +1,7 @@
 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
-DIST openjdk-11.0.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d
 DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
-DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9
 DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
 DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76
-DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572
 DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
 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/metadata.xml b/dev-java/openjdk/metadata.xml
index 543587cc5399..095cbbb07ad6 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -21,7 +21,7 @@
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
 		<flag name="source">Install JVM sources</flag>
 		<flag name="system-bootstrap">Bootstrap using installed openjdk</flag>
-		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTap/DTrace tracing</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">openjdk/jdk8u</remote-id>
diff --git a/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild
deleted file mode 100644
index 7b836738329f..000000000000
--- a/dev-java/openjdk/openjdk-11.0.23_p9-r1.ebuild
+++ /dev/null
@@ -1,311 +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
-
-# 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.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# 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-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk11u/archive/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-		$(bootstrap_uri x86 ${X86_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-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}[gentoo-vm(+)]
-			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		)
-	)
-"
-
-# 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}"
-
-	if use system-bootstrap; then
-		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
-	fi
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-11.0.18-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# Work around stack alignment issue, bug #647954.
-	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
-		--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-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-jvm-features=shenandoahgc )
-
-	use lto && myconf+=( --with-jvm-features=link-time-opt )
-
-	if use javafx; then
-		# this is not useful for users, just for upstream developers
-		# build system compares mesa version in md file
-		# https://bugs.gentoo.org/822612
-		export LEGAL_EXCLUDES=mesa3d.md
-
-		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
-
-	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 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
index 7a870e1198b5..fdf4cbbec3a1 100644
--- a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
@@ -163,6 +163,11 @@ src_configure() {
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	fi
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
 	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
diff --git a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
deleted file mode 100644
index 0bd209de601f..000000000000
--- a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
+++ /dev/null
@@ -1,320 +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
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# 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"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-	)
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-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 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
-
-	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-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
index 1c4f51f66acd..46a240264a9a 100644
--- a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
@@ -177,6 +177,11 @@ src_configure() {
 		export JDK_HOME
 	fi
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
diff --git a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
index 943ac23576da..2d2f4a5ddf98 100644
--- a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
@@ -46,9 +46,10 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap"
+# 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 )
@@ -174,6 +175,11 @@ src_configure() {
 		export JDK_HOME
 	fi
 
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
 	# Work around stack alignment issue, bug #647954. in case we ever have x86
 	use x86 && append-flags -mincoming-stack-boundary=2
 
@@ -225,7 +231,11 @@ src_configure() {
 
 	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
 
-	use lto && myconf+=( --with-jvm-features=link-time-opt )
+	# 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"
diff --git a/dev-java/openjdk/openjdk-8.412_p08.ebuild b/dev-java/openjdk/openjdk-8.412_p08.ebuild
deleted file mode 100644
index d006b5c56f80..000000000000
--- a/dev-java/openjdk/openjdk-8.412_p08.ebuild
+++ /dev/null
@@ -1,283 +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
-
-# 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.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-X86_XPAK="8.402_p06"
-PPC64_XPAK="8.402_p06"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri x86 8.402_p06)
-# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.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-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/openjdk/jdk8u/archive/jdk${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-	)
-"
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="${PV%%[.+]*}"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# 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/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
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-PATCHES=(
-	"${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch"
-	"${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch"
-)
-
-# 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 debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 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}"
-
-	if use system-bootstrap; then
-		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
-	fi
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# general build info found here:
-	# https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# -Wregister use (bug #918655)
-	append-cxxflags -std=gnu++14
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Strip lto related flags, no support in this version.
-	# https://bugs.gentoo.org/833097
-	# https://bugs.gentoo.org/833098
-	filter-lto
-	filter-flags -fdevirtualize-at-ltrans
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--disable-freetype-bundling
-			--disable-precompiled-headers
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
-			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
-			--with-giflib="${XPAK_BOOTSTRAP:-system}"
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--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-zlib="${XPAK_BOOTSTRAP:-system}"
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${BROOT}/bin/bash"
-		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 images)
-	)
-	emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	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/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.422_p05.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild
index 6280651782d6..d006b5c56f80 100644
--- a/dev-java/openjdk/openjdk-8.422_p05.ebuild
+++ b/dev-java/openjdk/openjdk-8.422_p05.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
 
 COMMON_DEPEND="
diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest
index dd48bd1c2464..8d2641eca5a8 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1 +1,2 @@
 DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
+DIST opentest4j-1.3.0.tar.gz 89527 BLAKE2B f8ac763c3ec1b1617c38c3744a8fac82e0d93ff4ff409a00e3e22d343fc873aa4129bee3d906de0e13cc78450a1c67cdcffebed91d00c9758f20113a68a76dc7 SHA512 6141fed5230d1195eee137031fc6cf8e3df0b857f2fd341ba823d5aeb92d86e56262b57b93a901a4e00f6000920b67f28e02e04f404df7df8e62be9d60c3e79d
diff --git a/dev-java/opentest4j/opentest4j-1.3.0.ebuild b/dev-java/opentest4j/opentest4j-1.3.0.ebuild
new file mode 100644
index 000000000000..646ec2c91a4e
--- /dev/null
+++ b/dev-java/opentest4j/opentest4j-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-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.opentest4j:opentest4j:1.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-r${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
diff --git a/dev-java/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest
index 5e218dde6c1d..d809ac37efab 100644
--- a/dev-java/owasp-java-encoder/Manifest
+++ b/dev-java/owasp-java-encoder/Manifest
@@ -1,2 +1,2 @@
-DIST owasp-java-encoder-1.2.3.tar.gz 134303 BLAKE2B 76b9652863fcdfdce82bd26062fa500bb92b21ba6edff7b3f409a1375e135176f826dca4bb02b4dd48905112ae20a0af0a1f09cb4e21ea41c672a44c52fea209 SHA512 19c13894ce68325553bdbee41190cb113d698c79ec74885604fd9db4f083efe0fcdc4313b7191014bfd972d0ee52f0fbe0621d7bb407745bd1feeb2ac9e49783
 DIST owasp-java-encoder-1.3.0.tar.gz 150029 BLAKE2B 31e350f02a7374f809e435d90ee9b4b1424cd9cb2da7d4062dfe0fc5898e02623496e464483bafd550b82b926260ab4df918f9be776e47f66587c6bc3829ebba SHA512 0ccdd6ae63e657ee28a4d9de7664269eff57802bddb03c7163fdb27326668256573d995b0111dc83cc1e5a6acc247e03da443f4b34c08cf99b085ec0a383a439
+DIST owasp-java-encoder-1.3.1.tar.gz 150103 BLAKE2B 6fc372364a13df497b1f5380d1d9b1c90e0981bfa059c31f2d138a3d0db3210105d0055b2a39a341cb3374b8149c5d61e1f967677e1159e843bb0143713e58b2 SHA512 9a75dea53e2859a4a213e2a511440c1bcbaea6c7a13fece674d155bc859f049fd45bbbd83fd6869a792af3b0e3f447e90ab450545684aa5ccc5b88a051114cdc
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild
deleted file mode 100644
index 482d2d258e37..000000000000
--- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.owasp.encoder:encoder:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OWASP Java Encoder"
-HOMEPAGE="https://owasp.org/www-project-java-encoder/"
-SRC_URI="https://github.com/OWASP/owasp-java-encoder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/core"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-PATCHES=( "${FILESDIR}/owasp-java-encoder-1.2.3-BenchmarkTest.patch" )
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
index 84640fdb1e59..d97245755a5f 100644
--- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
new file mode 100644
index 000000000000..84640fdb1e59
--- /dev/null
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2023-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.owasp.encoder:encoder:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OWASP Java Encoder"
+HOMEPAGE="https://owasp.org/www-project-java-encoder/"
+SRC_URI="https://github.com/OWASP/owasp-java-encoder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/core"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+# skipping 10 tests because they seem to be unreliable depending on hardware used
+# as some of them fail on some setups because the benchmark results don't align
+# with the hardcoded value 200 for the expected results. here are some examples:
+# Benchmarked Encode.forJavaScript: 442,382250 ns/op (+253,85% on baseline)
+# Benchmarked Encode.forCssString: 446,929231 ns/op (+257,49% on baseline)
+# Benchmarked Encode.forJava: 409,038065 ns/op (+227,18% on baseline)
+JAVA_RM_FILES=( src/test/java/org/owasp/encoder/BenchmarkTest.java )
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 9057f75a73c0..d98aa33f1abc 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1 +1,3 @@
 DIST poi-src-5.2.3-20220909.tgz 117839114 BLAKE2B 8b62f212dbbb6c7c20900dad97eaee20d416129d1529f42d3f3d15c42dd737af389f3d46c0891f733ba6ce143fa30c73aa921a2f007e68ecbfcd2a61da27baec SHA512 15d1d9387a3003fa30dc77cb42721daefb07a0f8ef1a69873107fd2266d66ae5c0138f47f2867d49154bbde4f28939ac1aa1b49e367230408e67c05099addc1c
+DIST poi-src-5.2.5-20231118.tgz 120325373 BLAKE2B a998b874040ac2fb136b9ffa59d30cf5939434efe59d51fc2e79c63f6fd1f3ad1679b532840f0e1975aa0fe79368951ecf2ddc0259e3dfce9fc2c34d95cb7216 SHA512 d46e94cfadc3a843d8e06033a618098dde738830f20146c6e39abd8f467aa88987719363ee2b91ecf6812e604cdc72a5c0a799676e264a6f9d3799aa4639a6c9
+DIST poi-src-5.2.5-20231118.tgz.asc 488 BLAKE2B 634ed5e3bacd71213a96b9da147348deb3dd2837f6cf47f4d76c254442504815e41b1d9a3facfaa27c927f11f1ba552acf4dc94c4ffbfd11cc70eefd054a1523 SHA512 3588d60ad1c5e59540f19e345f2cfd6600a592fda313ab53bfd280599906e9d3c44aedae8fb72409ebae67c0285b257290bdca9128a632379db894143585dd1e
diff --git a/dev-java/poi/poi-5.2.5.ebuild b/dev-java/poi/poi-5.2.5.ebuild
new file mode 100644
index 000000000000..7320886dbe8a
--- /dev/null
+++ b/dev-java/poi/poi-5.2.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.poi:poi-main:${PV}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Maven build of Apache POI for Sonar checks"
+HOMEPAGE="https://poi.apache.org/"
+RELEASE_DATE="20231118"
+SRC_URI="https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz
+	verify-sig? ( https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz.asc )"
+S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/poi.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-poi )"
+DEPEND="
+	dev-java/commons-codec:0
+	dev-java/commons-collections:4
+	dev-java/commons-io:1
+	dev-java/commons-math:3
+	dev-java/log4j-api:2
+	>=dev-java/sparsebitset-1.3:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.poi.poi"
+JAVA_CLASSPATH_EXTRA="
+	commons-codec
+	commons-collections-4
+	commons-io-1
+	commons-math-3
+	log4j-api-2
+	sparsebitset
+"
+JAVA_RESOURCE_DIRS="poi/src/main/resources"
+JAVA_SRC_DIR=( poi/src/main/java{,9} )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	sed \
+		-e "s:@VERSION@:${PV}:g" \
+		-e "s:@DSTAMP@:${RELEASE_DATE}:g" \
+		poi/src/main/version/Version.java.template \
+		> poi/src/main/java/org/apache/poi/Version.java || die
+	# log4j-api does not provide Automatic-Module
+	sed \
+		-e '/org.apache.logging.log4j/d' \
+		-i poi/src/main/java9/module-info.java || die
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index daaf17389176..0c7a76328656 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,3 @@
-DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
 DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6394254c73e3c9b2729bce643f8cbfb5a1bd18b30abf3003b9fbfd24c074cea4085a6ccf14fdb6a3aeac9efcb89 SHA512 b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild
deleted file mode 100644
index 6059bd156b76..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.23.0-r1.ebuild
+++ /dev/null
@@ -1,146 +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:3.23.0"
-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 3.23.0 from the 23.0 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${PV#3.}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-		)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="
-	>=dev-cpp/abseil-cpp-20230125.2
-	<dev-cpp/abseil-cpp-20240116.2
-"
-
-PATCHES=(
-	"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
-)
-
-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() {
-	"${BUILD_DIR}"/protoc $1
-}
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L43-L62
-	PROTOS=(  $(sed \
-		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
-		"${S}/java/core/pom.xml") ) || die
-	pushd src > /dev/null || die
-		cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
-	popd > /dev/null || die
-
-	# https://github.com/protocolbuffers/protobuf/blob/v23.0/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.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"
-
-	# https://github.com/protocolbuffers/protobuf/blob/v23.0/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
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	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() {
-	# https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L63-L71
-	jar cvf testdata.jar \
-		-C src google/protobuf/testdata/golden_message_oneof_implemented \
-		-C src google/protobuf/testdata/golden_packed_fields_message || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
-	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"
-
-	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-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
index ae709f9e7ea1..d9f5c30a30db 100644
--- a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/protobuf-${PV#3.}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="system-protoc"
 
 BDEPEND="
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 85413229dd93..b9d0d34f0f66 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,2 +1,3 @@
+DIST jflex-1.6.1.jar 1050749 BLAKE2B 71c68bf368a239217cbf928a7c6fbf7325cc069beddfaf92fbad3f0542bf83aa5606b2e15cfb4bdbd62a54c53d8439773ba3a7f60370ef5e2501ffe2561f9945 SHA512 882e73231b6e4f12e746282bac894e79dd3ee6fcfd0317a988709f3a3b472634415031209aa96c200c65ce382c90b5dff3f6d31d5e39c2feaff90dcf30a142f4
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa
diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
new file mode 100644
index 000000000000..a06037118b89
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r6.ebuild
@@ -0,0 +1,114 @@
+# 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.thoughtworks.qdox:qdox:1.12.1"
+
+inherit java-pkg-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz
+	x86? ( https://repo1.maven.org/maven2/de/jflex/jflex/1.6.1/jflex-1.6.1.jar )"
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="ant-task"
+REQUIRED_USE="test? ( ant-task )"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/byaccj:0
+	dev-java/jmock:1.0
+	!x86? ( dev-java/jflex:0 )
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+	test? ( dev-java/junit:0 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+"
+
+PATCHES=(
+	"${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	use x86 && cp "${DISTDIR}/jflex-1.6.1.jar" "${WORKDIR}"
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	if ! use test ; then
+		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
+		rm -rf src/java/com/thoughtworks/qdox/junit
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/778416 - for x86 we provide the precompiled jflex
+	if use x86; then
+		"$(java-config -J)" -cp "${WORKDIR}/jflex-1.6.1.jar" jflex.Main \
+			src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	else
+		jflex \
+			src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	fi
+	byaccj -v -Jnorun \
+		-Jnoconstruct \
+		-Jclass=Parser \
+		-Jsemantic=Value \
+		-Jpackage=com.thoughtworks.qdox.parser.impl \
+		src/grammar/parser.y || die
+	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	# create jar
+	mkdir -p build/classes || die
+
+	local cp="$(java-pkg_getjars --build-only jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	fi
+
+	if use ant-task ; then
+		cp="${cp}:$(java-pkg_getjars --build-only ant)"
+	else
+		rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die
+	fi
+
+	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
+		$(find . -name "*.java") || die "Cannot compile sources"
+
+	mkdir dist || die
+	cd build/classes || die
+	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
+	fi
+}
+
+src_test() {
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant,junit,jmock-1.0) \
+		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
index 0588a2ec7649..f046b3330bd9 100644
--- a/dev-java/qdox/qdox-2.0.1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,11 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Parser for extracting class/interface/method definitions"
 HOMEPAGE="https://github.com/paul-hammant/qdox"
 SRC_URI="https://github.com/paul-hammant/qdox/archive/qdox-${PV}.tar.gz"
+S="${WORKDIR}/qdox-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0
@@ -28,8 +29,6 @@ DEPEND="
 RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND="dev-java/byaccj:0"
 
-S="${WORKDIR}/qdox-${P}"
-
 JAVA_AUTOMATIC_MODULE_NAME="com.thoughtworks.qdox"
 JAVA_SRC_DIR="src/main/java"
 JAVA_CLASSPATH_EXTRA="jflex"
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
index 366bb78c2cba..9ed045fef250 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
@@ -16,10 +16,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9
 
 Bug: https://bugs.gentoo.org/831394
 
----
-Description: Fixes the build failure with Java 10
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -111,11 +111,6 @@
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
index a00ed96f7e5a..b734ac7ffd25 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
@@ -5,12 +5,6 @@ Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors
 
 Bug: https://bugs.gentoo.org/642030
 Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/gnu/io/RXTXPort.java | 50 ++++++++++++++++++++++------------------
- 1 file changed, 27 insertions(+), 23 deletions(-)
-
-diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java
-index 622a6a8..77a23ea 100644
 --- a/src/gnu/io/RXTXPort.java
 +++ b/src/gnu/io/RXTXPort.java
 @@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
index 1337cce3c546..2d060c338429 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
@@ -4,11 +4,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9
 
 Bug: https://bugs.gentoo.org/550534
 
----
-From: tony mancill <tmancill@debian.org>
-Forwarded: no
-Description: use format specifiers in fprintf statements for hardening flags
-
 --- a/src/SerialImp.c
 +++ b/src/SerialImp.c
 @@ -5108,7 +5108,7 @@
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
index 1e4ff4af57b7..9a69c64029db 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
@@ -1,5 +1,5 @@
---- src/lfd/lockdaemon.c.orig	2007-04-26 06:26:07.000000000 +0100
-+++ src/lfd/lockdaemon.c	2016-02-17 20:41:09.137509089 +0000
+--- src/lfd/lockdaemon.c.orig
++++ src/lfd/lockdaemon.c
 @@ -69,6 +69,7 @@
  #include <errno.h>
  #include <signal.h>
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
new file mode 100644
index 000000000000..b56fe43092d0
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/SerialImp.c
++++ b/src/SerialImp.c
+@@ -146,6 +146,7 @@
+ #ifdef LIBLOCKDEV
+ #include	<lockdev.h>
+ #endif /* LIBLOCKDEV */
++#include <sys/sysmacros.h>
+ 
+ extern int errno;
+ 
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 2d39447cb63b..460474c3ba23 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,6 +46,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-format-security.patch"
 	eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch"
 	eapply "${FILESDIR}/${P}-fix-for-java-10+.patch"
+	eapply "${FILESDIR}/${P}-missing-include.patch"
 	eapply_user
 
 	rm acinclude.m4 || die
diff --git a/dev-java/saxon/files/9.2-build.xml b/dev-java/saxon/files/9.2-build.xml
deleted file mode 100644
index 3bd9a64d4fe5..000000000000
--- a/dev-java/saxon/files/9.2-build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- simple generic build file -->
-
-<project name="saxon" default="all" basedir=".">
-
-  <!-- Properties -->
-
-  <property name="name" value="saxon"/>
-  <property name="src" value="src"/>
-  <property name="build" value="build"/>
-  <property name="build.classes" value="${build}/classes"/>
-  <property name="build.doc" value="${build}/api"/>
-  <property name="build.lib" value="${build}/lib"/>
-  <property name="j2se.javadoc" value="http://java.sun.com/javase/@JDK@/docs/api"/>
-  <property name="jdom.javadoc" value="/usr/share/jdom-@JDOM@/api"/>
-
-  <!-- Targets -->
-
-  <!-- Prepare build directories -->
-  <target name="prepare">
-    <mkdir dir="${src}"/>
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.lib}"/>
-    <mkdir dir="${build.doc}"/>
-    <copy todir="${src}">
-      <fileset dir="." includes="com/**,org/**,net/**"/>
-    </copy>
-  </target>
-
-  <!-- Kill all the created directories -->
-  <target name="clean">
-    <delete dir="${build}"/>
-    <delete dir="${src}"/>
-  </target>
-
-  <!-- Build classes -->
-  <target name="classes" depends="prepare">
-    <javac srcdir="${src}" destdir="${build.classes}" encoding="ISO-8859-1"/>
-  </target>
-
-  <!-- Build jar archives -->
-
-  <target name="jar" depends="classes">
-    <jar jarfile="${build.lib}/${name}.jar"
-         basedir="${build.classes}">
-      <manifest>
-        <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <!-- Build the full JavaDocs -->
-  <target name="javadoc" depends="prepare">
-    <javadoc sourcepath="${src}"
-            destdir="${build.doc}"
-            doctitle="${name} JavaDoc"
-            windowtitle="${name} JavaDoc"
-            package="true"
-            author="true"
-            version="true"
-            packagenames="net.sf.saxon.*,org.w3c.xsl.*"
-            encoding="ISO-8859-1"
-      >
-      <link href="${j2se.javadoc}"/>
-      <link href="${jdom.javadoc}"/>
-    </javadoc>
-  </target>
-
-  <!-- Build everything -->
-  <target name="all" depends="jar,javadoc"/>
-
-</project>
diff --git a/dev-java/saxon/files/9.2-edition.properties b/dev-java/saxon/files/9.2-edition.properties
deleted file mode 100644
index bb5acee0b19c..000000000000
--- a/dev-java/saxon/files/9.2-edition.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-config=net.sf.saxon.Configuration
-platform=net.sf.saxon.java.JavaPlatform
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 43d2b697dd11..4c6584dcde5b 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,6 +1,9 @@
 DIST scala-cli-amd64-1.2.2.gz 33871512 BLAKE2B ef9328b26afb52ada07739539d560239d6ce2ffd72d1e353ce94d45c7358b6789aa0019804e249584ca497d5d15c96caab12eb31fab5b84a14162c00ca30c181 SHA512 02da0915ee140a129f622f973291c98c7dd7b7f16f5a2a5250ac825e09876b616a315fe5e6af43691f43870fa68234efeff73eadd4f6060d2d90fe937302eae7
-DIST scala-cli-amd64-1.4.2.gz 34238180 BLAKE2B 90cb8af5561bf5324e4fef3183b301d15839ac188f8ba7154e65306333d765429243591fc17a33f48e4b8a48c43034782643ba4014bfed3719c5037805c58878 SHA512 12ff3eff0117df6d9ae526203724a8261150fbd5436f61beeda33a5f4292b7a71196e2ee762d4e005f827ac2f104d3c5d2a657abc0a63a2b66e526d18ef2887a
+DIST scala-cli-amd64-1.4.3.gz 34238734 BLAKE2B ac40427ebd664c147f3134d067143207a024f2fa96be06f452d3b037a5f9866f6d6624c31a5a6045e5d1b6d087c87a14d2a376e050e6d23a10ce66de544b5969 SHA512 09b2ca1615a3c090a195f41237aa448d3535555c976ff4abdade1b8569126794009fcab11bde2087fcfe72c5a7a72b7b74bea647eef3a941bd1af4fb584b5f9b
+DIST scala-cli-amd64-1.5.0.gz 34334438 BLAKE2B 2369f8e4a27975e3bc3a646e9637f885016a7df08c1cbfd1874b2f07037b1452df5eda16fd64bc9182611aaa37e903392764a3cff19439e864cc3ee510e1c163 SHA512 53ec0a5a9079b40189391a7e2e6ef3d8bcf40ebe05af807fbe4bb3b8116975c21266d88eff87b5fc841dfd8584bb6fe8320583f19dbe1e24d0c550bdc086aea5
 DIST scala-cli-arm64-1.2.2.gz 33766128 BLAKE2B d5b2d7ab8157f3874b1cfe0b0647ab30f5dd191337e575056eb758d52eda30871c54b20a08a1cda3e28c51afd744b4b8320aee6aef056b39b98f2534184739ba SHA512 004ca188e4ddd01c0e46277fa514b1c9bd061ea26d4318b8daff3ffaae5bb7cc9f4746509401da19774537c7e56f8a5a7da846cd4b5f90c61a3ab1f8d3ed0493
-DIST scala-cli-arm64-1.4.2.gz 34142373 BLAKE2B d7c2d87503e0c8916902e293d5d16e59b7ec80c942b72307667a0e8c16635e4d2e9839bf20a4284a1ffaf2eef001db4801bdc62afe9600babd1abd915783ba09 SHA512 10dcc3991d4e9951d688f907da38683701f8ff4784e86dcd1fd7441c79f70bdfef7d8022d98e247914800312b4eb37670a99059f77c045fd66f6d34e92179e5c
+DIST scala-cli-arm64-1.4.3.gz 34137841 BLAKE2B 0e8ed1f1777ac507315b7e8136b85fa1486c5817f8ae49205a7e53eebc15be0f3c90123418890ce1c96110534a962ead961aad0c6fd9230df0a5a6a70147cca3 SHA512 c81a3be8fdb2b396252f5c31b5fd9182864e6bfda14ab3a119d9922ef1e1834521781eaf935ba91d74ba24388e9bf9617e82ad2d61dfe88f845426a16b7b4e7f
+DIST scala-cli-arm64-1.5.0.gz 34240198 BLAKE2B aadb5203d2b2e93e27b4408724c5ebfbfa3a1e14b9bd3f78ccefbd961063451dc16fc0374430088d981208614de82ddf538c0e04975adba46f997fbf71c0d915 SHA512 d5025e91057ba72e9a2aed177356c04c08cc10745c8614db44e7843e6825ec14c619d7c8e24154c168e485bb98ebfb234179fa4a50989c162bcf92d096413379
 DIST scala-cli-non-native-1.2.2 7837019 BLAKE2B 799ed83805ba767b687cf9a041a3e23f008e20e3ca55b8c52a9361c0b2465141abb7c17ca7dca59c9307af5a5a07a0cfe0d8035eea14a2adf2580913d67d6a10 SHA512 40aa43ee601c52238989a81884b6acc7a023599abb561bed1c9d31dff6053eff0f3477097a228bc30aab4df22d81b10fbbb64b5557d3067b4715c821c4eacb3e
-DIST scala-cli-non-native-1.4.2 8004132 BLAKE2B 5254d25395080a26598bb4445c2200100b1c511e928774d5d52f5174b43d3fd9cd2b58ae97033a25e45495273bbf0717abccccbe84c5d4a8bb70a3c9f42f5b7e SHA512 002d052ec4b2409ede4da6cfda86ff638534d702a934d679aac0d18dab4c6c69ac8d9d8e67a8e9a410af8c8d0c19f1c864247b0d790e6f040976f4fb3dcabfe5
+DIST scala-cli-non-native-1.4.3 8004147 BLAKE2B 79b37e21b4aa1335a766ff7a735cf6fd0ae47b054c246371cfe57dca601de9309abc92df60ccba9873bf112f03d61081397eb859754b3287d2f6712946988ab5 SHA512 6c032330c01b2f2730390ea83fbcd9259e498b65cb182c2cf20cec2674f3dac2262d746a8addbe8b856c34bded0805c23b9a6a59e345037ea0b546681ddc7596
+DIST scala-cli-non-native-1.5.0 8117168 BLAKE2B 9b55dec1e329c7242ff5cdcad65a77686498c6c5bf5b872473d18609e4fed59353121fc4e3df4d8c7466daa1590bb09b4c6fdbf5bddd80bcaeab541e31d426a1 SHA512 badf719bdd3d9a289ca1436ca83433ecd49ab9908158188b68682e2c8bcee9e69c0bf73d1791656ecc2d01fe560cc754ef0f5e965ea25a520d73c7f98db266b0
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.4.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild
index e89ddb52ce30..e89ddb52ce30 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.4.2.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.4.3.ebuild
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild
new file mode 100644
index 000000000000..e89ddb52ce30
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+UPSTREAM_PV=${PV/_/-}
+UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
+
+DESCRIPTION="CLI to interact with Scala and Java"
+HOMEPAGE="https://scala-cli.virtuslab.org/"
+SRC_URI="
+	!amd64? ( !arm64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
+			-> scala-cli-non-native-${UPSTREAM_PV}
+	) )
+	amd64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
+			-> scala-cli-amd64-${UPSTREAM_PV}.gz
+	)
+	arm64? (
+		https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
+			-> scala-cli-arm64-${UPSTREAM_PV}.gz
+	)
+"
+
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# A JRE is not strictly required if native images of scala-cli are used
+# (amd64, arm64). However we may want a system JRE anyway, and having JRE
+# in RDEPEND reduces the chances that scala-cli needs to install one
+# for the user.
+RDEPEND="
+	>=virtual/jre-11
+	sys-libs/zlib
+"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
+	elif use arm64; then
+		mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
+	else
+		mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
+	fi
+
+	chmod +x scala-cli || die
+}
+
+src_compile() {
+	for shell in bash zsh; do
+		./scala-cli install-completions \
+					--shell ${shell} \
+					--env \
+					--output "${S}" \
+					> ${shell}-completion || die
+	done
+}
+
+src_install() {
+	dobin scala-cli
+
+	newbashcomp bash-completion scala-cli
+
+	insinto /usr/share/zsh/site-functions
+	doins zsh/_scala-cli
+}
diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest
index 170900e3d8e7..e1a04093f54e 100644
--- a/dev-java/sparsebitset/Manifest
+++ b/dev-java/sparsebitset/Manifest
@@ -1 +1,2 @@
+DIST SparseBitSet-1.3.tar.gz 1670241 BLAKE2B e9d8ff537b65e4c2be68d66f02595048381c4a2574e3bdc5d05602d440a57a6c7a96edb23581741a6800516e3d571dce8e016e0ce477300ce7ad08c3e81bcad2 SHA512 6851613df21bcdccb28c24535fac886d6ad74d6feb37dea477dff1711218ecf30093d90ff78becb1159c6bd570a7afbd8c86482d72a5af8f0864d6e443cd603b
 DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
diff --git a/dev-java/sparsebitset/sparsebitset-1.3.ebuild b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
new file mode 100644
index 000000000000..06c06a825139
--- /dev/null
+++ b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
@@ -0,0 +1,28 @@
+# 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.zaxxer:SparseBitSet:1.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An efficient sparse bitset implementation for Java"
+HOMEPAGE="https://github.com/brettwooldridge/SparseBitSet"
+SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/SparseBitSet-${PV}.tar.gz"
+S="${WORKDIR}/SparseBitSet-SparseBitSet-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.zaxxer.sparsebitset"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 4b202bf1b541..b8af1b64ed64 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,8 +1,4 @@
-DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
-DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5
 DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f
 DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1
-DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
-DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605
 DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702
 DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
deleted file mode 100644
index d560c27c933d..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
+++ /dev/null
@@ -1,86 +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"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	# Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
-	sed \
-		-e '/String testFile =/s&test/&../test/&' \
-		-i ../test/org/apache/tomcat/jni/TestFile.java || die
-
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
index f3d7eb0760fe..f4e9d9bd6779 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P}-src/native
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild
deleted file mode 100644
index 9507ee4750e0..000000000000
--- a/dev-java/tomcat-native/tomcat-native-2.0.7.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
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
index 8bddbdc05820..7dbe994033c0 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P}-src/native
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index 47e6dc2239af..e3c52c83c178 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,2 +1,3 @@
+DIST java-cup-bin-11b-20160615.tar.gz 144985 BLAKE2B fba4109a4999d6f5a678265d2374bc305fc9fe8b724a0af5fb60402d612904447ebe9285e8672652c492cd2e630752eb9ffeb8017be1dea081ddcb30f815a687 SHA512 edba197bfe0638838ad2e9cb7342ffcbbec4f2a71436fc4bf82ff0e1987fe9f490849c644945cf7e7deade9f12f458e019410a2d9c1f22c0182137fe5ad2349f
 DIST xalan-j_2_7_3-src.tar.gz 13686458 BLAKE2B e19373aa22dad13945917d8f041f56e6ff9cc434a70e88b96764e0547a0a122a9197eeb23bb7757a5483beead334f4af62e7e1b70531b23c31199ec4733756ef SHA512 fe4b2b9471f95a2cd3607550a6c97b46b7d2576d1e814305f4564df88aaf4fdc9f88ba43dad4a5741521b2c2f5137e3e70d2d4e31b232d403a66dc1e889c8b6b
 DIST xalan-j_2_7_3-src.tar.gz.asc 849 BLAKE2B 623fefefa3ab88bfdef5376101f26a9c6602c30a34c0db369159bdb7af34ccb2602011071dd3e79304e6dd4e8b8a198729347f5dbee9a06ae12af12d351de82a SHA512 5c7ed7e71f8a0c2739a64f9ba34edb28d749924d1a581b9963bed3376151a090c2c1af2b1111612822cf20d27a814e22917660f034912e8e5fa913b434e66bf2
diff --git a/dev-java/xalan/xalan-2.7.3-r2.ebuild b/dev-java/xalan/xalan-2.7.3-r2.ebuild
new file mode 100644
index 000000000000..a46680273ed9
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.3-r2.ebuild
@@ -0,0 +1,78 @@
+# 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="xalan:xalan:2.7.3"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
+HOMEPAGE="https://xalan.apache.org/"
+SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )
+	x86? ( https://www2.cs.tum.edu/projects/cup/releases/java-cup-bin-11b-20160615.tar.gz )"
+
+S="${WORKDIR}/xalan-j_${PV//./_}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# https://bugs.gentoo.org/936274 - for x86 we provide the precompiled java-cup
+COMMON_DEPEND="
+	!x86? ( dev-java/javacup:0 )
+"
+
+CP_DEPEND="
+	dev-java/bcel:0
+	~dev-java/xalan-serializer-${PV}:${SLOT}
+	dev-java/xerces:2
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc"
+
+JAVA_MAIN_CLASS="org.apache.xalan.xslt.Process"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached \
+			"${DISTDIR}/xalan-j_${PV//./_}-src.tar.gz" \
+			"${DISTDIR}/xalan-j_${PV//./_}-src.tar.gz.asc"
+	fi
+	unpack "xalan-j_${PV//./_}-src.tar.gz"
+	use x86 && unpack java-cup-bin-11b-20160615.tar.gz
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# serializer is packaged separately
+	rm -r src/org/apache/xml/serializer || die "cannot remove serializer"
+	use !x86 && JAVA_GENTOO_CLASSPATH="javacup"
+	use x86 && JAVA_GENTOO_CLASSPATH_EXTRA="${WORKDIR}/java-cup-11b-runtime.jar:${WORKDIR}/java-cup-11b.jar"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	if use x86; then
+		java-pkg_newjar "${WORKDIR}/java-cup-11b-runtime.jar" java-cup-runtime.jar
+		java-pkg_newjar "${WORKDIR}/java-cup-11b.jar" java-cup.jar
+		java-pkg_regjar "${ED}/usr/share/${PN}/lib/java-cup-runtime.jar"
+		java-pkg_regjar "${ED}/usr/share/${PN}/lib/java-cup.jar"
+	fi
+}
diff --git a/dev-lang/algol68g/Manifest b/dev-lang/algol68g/Manifest
index 797c24a47845..51b070cfecfd 100644
--- a/dev-lang/algol68g/Manifest
+++ b/dev-lang/algol68g/Manifest
@@ -1,4 +1,2 @@
-DIST algol68g-3.5.1.tar.gz 661670 BLAKE2B ec0aa47f367af621f3cf8ebad81bd501bac31238b4a918943917fec4d9f66cf57f98f5bd4c4c02d315a8f1ac2fd789aafb6e331289fac417abf9301a2a5d339d SHA512 764038c7db567d5fc130d4c324b74f43d7dbcfd89efb7b12b1a6983314a7e13f17e105fa783fb3397fff3773b69699ca3f5fd3be873229db9bf91582f7bf52f4
-DIST algol68g-3.5.2.tar.gz 664147 BLAKE2B 894d19a01a68613b2d4f3f5aeb10e1a72a87b50ee044c7791880f2e1ac7ef067377e7790009d339941fea3f6c93a13b3d85aac907789fecb5b9044e493d7dcfe SHA512 3bd46d1034cd771086981bc2e2004cca199cf13e8840fb867d66fe8ac63af06bbc8976decd46dea1bec9b64b38bbdb878582c5244fcd893695da19a5f84d924f
-DIST algol68g-3.5.3.tar.gz 664147 BLAKE2B d7052104650fdbbed6014f7a1b01d7bc037d44061ebbf91a46abc6d7bab5865c94a254881bb3915e59676b0fee98dd378a1d90f5cd39ea2369433ad7c425ebb8 SHA512 64758bffaa3275b20ea6a078f1db0a29527030e5dd069fba03a1dc8b3c51c6dc8bb0ad53317c66aaf5904b4c3aed3246dc4edd6ee7a1f0a38c61def5c397c52c
 DIST algol68g-3.5.4.tar.gz 664208 BLAKE2B b8e2bcc53cf3cc7254da37f1d5655ddc4f79564c51608fea374da25bc828c34056284f2a48e4ada92202f866c38326c1323aa9803bbbb0be22d3a682767c24fa SHA512 0cedce2c2cb4c8d7de91ef022ade38c2040d8fcd02c747226721a016f1c5ae9a9249314370ac6466be2fdba34f7602ab0954e05dbf20d7af1e68a04059270a5c
+DIST algol68g-3.5.5.tar.gz 664205 BLAKE2B 1ac99c1723e45ff69a72592c0209716409c35ce208e79682ed77a972b08cab49b78b735f1b585640c9a8b5d59853cafb601d8a049bc33bfa42f6a37c93848285 SHA512 5c671e1b7f90a6a0197afd0efdae737d409d0db98b4f62e2a958ecbec5d731cb68896e8c14e975d4d569e399a79ee12be3269c6ab2e9c6a34f2cb6d9a1e5a273
diff --git a/dev-lang/algol68g/algol68g-3.5.1.ebuild b/dev-lang/algol68g/algol68g-3.5.1.ebuild
deleted file mode 100644
index 3b5c40da8f55..000000000000
--- a/dev-lang/algol68g/algol68g-3.5.1.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
-
-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/algol68g/algol68g-3.5.2.ebuild b/dev-lang/algol68g/algol68g-3.5.2.ebuild
deleted file mode 100644
index 3b5c40da8f55..000000000000
--- a/dev-lang/algol68g/algol68g-3.5.2.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
-
-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/algol68g/algol68g-3.5.3.ebuild b/dev-lang/algol68g/algol68g-3.5.5.ebuild
index 6689c5616025..6689c5616025 100644
--- a/dev-lang/algol68g/algol68g-3.5.3.ebuild
+++ b/dev-lang/algol68g/algol68g-3.5.5.ebuild
diff --git a/dev-lang/boogie/boogie-3.2.1.ebuild b/dev-lang/boogie/boogie-3.2.1.ebuild
index baa291441b16..cfadd672d17a 100644
--- a/dev-lang/boogie/boogie-3.2.1.ebuild
+++ b/dev-lang/boogie/boogie-3.2.1.ebuild
@@ -210,7 +210,7 @@ else
 	SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-lang/boogie/boogie-3.2.3.ebuild b/dev-lang/boogie/boogie-3.2.3.ebuild
index baa291441b16..cfadd672d17a 100644
--- a/dev-lang/boogie/boogie-3.2.3.ebuild
+++ b/dev-lang/boogie/boogie-3.2.3.ebuild
@@ -210,7 +210,7 @@ else
 	SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-lang/clojure/clojure-1.11.4.ebuild b/dev-lang/clojure/clojure-1.11.4.ebuild
index f098da23c778..bf6697d19753 100644
--- a/dev-lang/clojure/clojure-1.11.4.ebuild
+++ b/dev-lang/clojure/clojure-1.11.4.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 25a6d333589f..4d8ee2ba9376 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,6 +1,4 @@
-DIST crystal-1.12.2-1-linux-x86_64.tar.gz 47042270 BLAKE2B 17c29658fba1e32eafc0716f34d96f080b8500ef81d573719a3944873fbd16521ef2e3c0b6f3ea2753f67e96fe6cbf361df03233aa9e3eea19b87850b8d38089 SHA512 33d40b003481f56c1a3dcefb586e45326629455faad0adc6fce60f4fe91b586f01f997665aa535286b6909b5a4e0c05db3577b3eb8b36f6864f80d576ddd1d39
-DIST crystal-1.12.2.tar.gz 3655994 BLAKE2B d5de81445e3e81352ae821cdf91863464f70466674f541e2b9e499610e0d68b4aac3af6e2688870be8b2ccd84c9da78734e0e8f5f8be070192bd7d7342d77853 SHA512 b972015fa17da19bcb649a4e0387e709b4a792c8e9279898e48fb82f8840e92f35492df9cce1ec2487724ee460d3ab9099144f6bd25a091a725578ec3fb0fbd6
-DIST crystal-1.13.0-1-linux-x86_64.tar.gz 51652465 BLAKE2B 21f390f19b53249c9d5dfce5fb754ba2f45f0ddabf191098146f6eb89c7bee6432a4c9b127585eb924864dea78c6f90463baff806ecbe544b35677fe9aee1acb SHA512 4754e3b41eeea073e406e40636aa97146f3227cd6538b9080b4190b6ddacf98eeb9b877fb1e367630a208e8fe66d9d458bc8d03f8916bf521ca546ae1ed98337
-DIST crystal-1.13.0.tar.gz 3687491 BLAKE2B 7ced8216f1777cd5b1fa831ccb1591a0f06b9451476eb70ff5f389600a4f85a24b7eb8730eda4726f0d61e72581817f0b946a5483175f2fe4193a0d186baeed5 SHA512 7b6cb45f78bf3827a23fb4a3299873848ee2548fe7887c84832fe4735bf5e39c41980731e92e89170774f8d632f77124cdd814edd0be9a36ef5b85a05bc13454
 DIST crystal-1.13.1-1-linux-x86_64.tar.gz 51651920 BLAKE2B 304203d7f46653c7c687e0d96ab8ff63798cc1e8f43ffcb9d3fd12c04e5ac35d058d6964e8d6e8f407b579e1bc80daa88dc0d9463cc7dc558055b36e96f75799 SHA512 d79555b3f79b0e9ad48ae08b1566c0ac2c1097ae28c434af43d869916b5a4b81383491492f548fec2bd662ff29231c83c14f10bacbb85bc9741a1903e3f331f2
 DIST crystal-1.13.1.tar.gz 3686680 BLAKE2B 8032895933d98bc8e3168a9ef1749e0b8c45e5f6501e70a4680a400d842999c2861e3d8064e457a81050f6c4dedc4ca5c968dca0ce593ff38e4091d5a45b7d40 SHA512 62e8d12d8b6fff4a8602e7b04a57b49dd17350585fa13fd015e649cae28affc134a38ec2852b07172c682affb50210df2bc26f707795a4c3483d9522272990db
+DIST crystal-1.13.2-1-linux-x86_64.tar.gz 51650862 BLAKE2B d8812a0a3e327c9aabfea982b36b7ece906ac8f5ceafccdfdebae0ea41c7e8b8989009d30f6535f069711ef0bbfb47430dbeb12fc246e1bf00663c43e54df85b SHA512 694aec1ad5b2bb89dc4adb9f6a78e73e4e2c7ff68c77fda61cc6d1efa2a309932f0634986d4da2db3e05f3f4f1991610c2f6961df0d657376b8343a0c4e2ea30
+DIST crystal-1.13.2.tar.gz 3687101 BLAKE2B 31375ea3648433e88a4813b39f25f72221c4a6d3d9346324467e79d84f43794ce3b0dfe49ec8478d6d96f9971dd8373abd4297b3310c072694be395a04042f91 SHA512 5f4add6066d22d38e59587c32c43c7a3c4bc4615f80f991af75277780efa95f359c40e6da5fe7e3f8ac7eda21f75982e3eb08cbff0702f58cc14c3b432ad7019
diff --git a/dev-lang/crystal/crystal-1.12.2.ebuild b/dev-lang/crystal/crystal-1.12.2.ebuild
deleted file mode 100644
index 92f5bc42f945..000000000000
--- a/dev-lang/crystal/crystal-1.12.2.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
-
-BV="${PV}-1"
-BV_AMD64="${BV}-linux-x86_64"
-
-LLVM_MAX_SLOT=17
-
-inherit bash-completion-r1 llvm 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"
-
-# Upstream test suite not reliable
-RESTRICT="test"
-
-DEPEND="
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/gmp:=
-	dev-libs/libatomic_ops:=
-	dev-libs/libevent:=
-	dev-libs/libpcre2:=[unicode]
-	dev-libs/pcl:=
-	llvm-libunwind? (
-		sys-libs/llvm-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 "${LLVM_MAX_SLOT}")/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.13.0.ebuild b/dev-lang/crystal/crystal-1.13.0.ebuild
deleted file mode 100644
index 02631f5f838f..000000000000
--- a/dev-lang/crystal/crystal-1.13.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
-
-BV="${PV}-1"
-BV_AMD64="${BV}-linux-x86_64"
-
-LLVM_MAX_SLOT=17
-
-inherit bash-completion-r1 llvm 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"
-
-# Upstream test suite not reliable
-RESTRICT="test"
-
-DEPEND="
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/gmp:=
-	dev-libs/libatomic_ops:=
-	dev-libs/libevent:=
-	dev-libs/libpcre2:=[unicode]
-	dev-libs/pcl:=
-	llvm-libunwind? (
-		sys-libs/llvm-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 "${LLVM_MAX_SLOT}")/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.13.2.ebuild b/dev-lang/crystal/crystal-1.13.2.ebuild
new file mode 100644
index 000000000000..7d2cade29207
--- /dev/null
+++ b/dev-lang/crystal/crystal-1.13.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 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=( {16..18} )
+
+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"
+
+# Upstream test suite not reliable
+RESTRICT="test"
+
+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 '
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+	llvm-libunwind? (
+		sys-libs/llvm-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/cxprolog/cxprolog-0.98.2-r1.ebuild b/dev-lang/cxprolog/cxprolog-0.98.2-r1.ebuild
deleted file mode 100644
index c6949fbe3d57..000000000000
--- a/dev-lang/cxprolog/cxprolog-0.98.2-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
-
-WX_GTK_VER="3.2-gtk3"
-VIRTUALX_REQUIRED="manual"
-
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="A WAM based Prolog system"
-HOMEPAGE="http://ctp.di.fct.unl.pt/~amd/cxprolog"
-SRC_URI="http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/${P}.src.tgz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples java +readline test wxwidgets"
-RESTRICT="!test? ( test )"
-
-RDEPEND="readline? ( sys-libs/readline:= )
-	java? ( >=virtual/jdk-1.8:= )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-
-DEPEND="${RDEPEND}
-	test? (
-		java? ( ${VIRTUALX_DEPEND} )
-		wxwidgets? ( ${VIRTUALX_DEPEND} )
-	)"
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-portage.patch
-	eapply "${FILESDIR}"/${P}-printf-musl.patch
-	eapply "${FILESDIR}"/${P}-test-io.patch
-	eapply_user
-
-	sed -i -e "s|lib/cxprolog|$(get_libdir)/cxprolog|" "${S}"/src/FileSys.c || die
-	cp "${FILESDIR}"/build.xml "${S}"/build.xml || die
-	cp "${FILESDIR}"/cx_dev_boot.pl "${S}"/cx_dev_boot.pl || die
-	rm -f "${S}"/pl/test_file_io_1.txt
-
-	use wxwidgets && setup-wxwidgets
-}
-
-src_compile() {
-	local CX_EXT_DEFINES
-	local CX_EXT_CFLAGS
-	local CX_EXT_LDFLAGS
-	local CX_EXT_LIBS
-
-	if use readline; then
-		CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_READLINE"
-		CX_EXT_LIBS="$CX_EXT_LIBS -lreadline"
-	fi
-
-	if use java; then
-		local java_arch
-		use x86 && java_arch=i386
-		use amd64 && java_arch=amd64
-		local CX_JVM
-		for i in jre/lib/${java_arch}/server lib/server; do
-			[[ -f ${JAVA_HOME}/${i}/libjvm.so ]] && CX_JVM=${JAVA_HOME}/${i}
-		done
-		CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_JAVA"
-		CX_EXT_CFLAGS="$CX_EXT_CFLAGS $(java-pkg_get-jni-cflags)"
-		CX_EXT_LDFLAGS="$CX_EXT_LDFLAGS -Wl,-rpath,${CX_JVM}"
-		CX_EXT_LIBS="$CX_EXT_LIBS -L${CX_JVM} -ljvm"
-	fi
-
-	if use wxwidgets; then
-		CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_WXWIDGETS"
-		CX_EXT_CFLAGS="$CX_EXT_CFLAGS $(${WX_CONFIG} --cflags)"
-		CX_EXT_LIBS="$CX_EXT_LIBS $(${WX_CONFIG} --libs)"
-	fi
-
-	emake lib \
-		PREFIX=/usr \
-		TMP_DIR="${S}/tmp" \
-		CC="$(tc-getCC)" \
-		CPP="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		EXT_DEFINES="${CX_EXT_DEFINES}" \
-		EXT_CFLAGS="-Wall ${CX_EXT_CFLAGS}" \
-		EXT_LDFLAGS="${CX_EXT_LDFLAGS}" \
-		EXT_LIBS="${CX_EXT_LIBS}"
-
-	if use java; then
-		JAVA_SRC_DIR="${S}/lib/cxprolog/java"
-		eant jar
-	fi
-}
-
-cxprolog_src_test() {
-	cd "${S}"/pl
-
-	if use java; then
-		local test_javadir="${S}"/pl/$(get_libdir)/cxprolog/java
-		mkdir -p "${test_javadir}" || die
-		ln -s "${S}"/dist/prolog.jar "${test_javadir}"/prolog.jar || die
-	fi
-
-	LD_LIBRARY_PATH="${S}" \
-		"${S}"/cxprolog_shared \
-		--boot "${S}"/cx_dev_boot.pl \
-		--script "${S}"/pl/test_all.pl \
-		| tee "${S}"/cxprolog_test.log
-}
-
-src_test() {
-	if use java || use wxwidgets; then
-		virtx cxprolog_src_test
-	else
-		cxprolog_src_test
-	fi
-
-	grep -q "ALL THE TESTS PASSED" "${S}"/cxprolog_test.log \
-		|| die "cxprolog unit tests failed"
-}
-
-src_install() {
-	newbin cxprolog_shared cxprolog
-	dolib.so libcxprolog.so
-
-	insinto /usr/$(get_libdir)/cxprolog
-	doins lib/cxprolog/lib.pl
-
-	insinto /usr/share/${PN}/pl
-	doins pl/*.{pl,txt}
-
-	if use java; then
-		insinto /usr/$(get_libdir)/cxprolog/java
-		doins dist/prolog.jar
-	fi
-
-	dodoc ChangeLog.txt MANUAL.txt README.txt
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lang/cxprolog/cxprolog-0.98.2-r2.ebuild b/dev-lang/cxprolog/cxprolog-0.98.2-r2.ebuild
new file mode 100644
index 000000000000..32ad5e2f536a
--- /dev/null
+++ b/dev-lang/cxprolog/cxprolog-0.98.2-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+VIRTUALX_REQUIRED="manual"
+
+inherit flag-o-matic java-pkg-opt-2 java-pkg-simple toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="A WAM based Prolog system"
+HOMEPAGE="http://ctp.di.fct.unl.pt/~amd/cxprolog/"
+SRC_URI="http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/${P}.src.tgz"
+S="${WORKDIR}"/${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples java +readline test wxwidgets"
+RESTRICT="!test? ( test )"
+
+COMMON_DEP="
+	readline? ( sys-libs/readline:= )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.8:* )
+	test? (
+		java? ( ${VIRTUALX_DEPEND} )
+		wxwidgets? ( ${VIRTUALX_DEPEND} )
+	)"
+
+RDEPEND="${COMMON_DEP}
+	java? ( >=virtual/jre-1.8:* )"
+
+DOCS=( ChangeLog.txt MANUAL.txt README.txt )
+PATCHES=(
+	"${FILESDIR}"/${P}-portage.patch
+	"${FILESDIR}"/${P}-printf-musl.patch
+	"${FILESDIR}"/${P}-test-io.patch
+)
+
+src_prepare() {
+	default #780585
+	use java && java-pkg-opt-2_src_prepare && java-pkg_clean
+
+	sed -i -e "s|lib/cxprolog|$(get_libdir)/cxprolog|" "${S}"/src/FileSys.c || die
+	cp "${FILESDIR}"/cx_dev_boot.pl "${S}"/cx_dev_boot.pl || die
+	rm -f "${S}"/pl/test_file_io_1.txt
+
+	use wxwidgets && setup-wxwidgets
+}
+
+src_compile() {
+	local CX_EXT_DEFINES
+	local CX_EXT_CFLAGS
+	local CX_EXT_LDFLAGS
+	local CX_EXT_LIBS
+
+	if use readline; then
+		CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_READLINE"
+		CX_EXT_LIBS="$CX_EXT_LIBS -lreadline"
+	fi
+
+	if use java; then
+		local java_arch
+		use x86 && java_arch=i386
+		use amd64 && java_arch=amd64
+		local CX_JVM
+		for i in jre/lib/${java_arch}/server lib/server; do
+			[[ -f ${JAVA_HOME}/${i}/libjvm.so ]] && CX_JVM=${JAVA_HOME}/${i}
+		done
+		CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_JAVA"
+		CX_EXT_CFLAGS="$CX_EXT_CFLAGS $(java-pkg_get-jni-cflags)"
+		CX_EXT_LDFLAGS="$CX_EXT_LDFLAGS -Wl,-rpath,${CX_JVM}"
+		CX_EXT_LIBS="$CX_EXT_LIBS -L${CX_JVM} -ljvm"
+	fi
+
+	if use wxwidgets; then
+		CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_WXWIDGETS"
+		CX_EXT_CFLAGS="$CX_EXT_CFLAGS $(${WX_CONFIG} --cflags)"
+		CX_EXT_LIBS="$CX_EXT_LIBS $(${WX_CONFIG} --libs)"
+	fi
+
+	emake lib \
+		PREFIX=/usr \
+		TMP_DIR="${S}/tmp" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		EXT_DEFINES="${CX_EXT_DEFINES}" \
+		EXT_CFLAGS="-Wall ${CX_EXT_CFLAGS}" \
+		EXT_LDFLAGS="${CX_EXT_LDFLAGS}" \
+		EXT_LIBS="${CX_EXT_LIBS}"
+
+	if use java; then
+		JAVA_SRC_DIR="${S}/lib/cxprolog/java"
+		java-pkg-simple_src_compile
+	fi
+}
+
+cxprolog_src_test() {
+	cd "${S}"/pl
+
+	if use java; then
+		local test_javadir="${S}"/pl/$(get_libdir)/cxprolog/java
+		mkdir -p "${test_javadir}" || die
+		ln -s "${S}"/cxprolog.jar "${test_javadir}"/prolog.jar || die
+	fi
+
+	LD_LIBRARY_PATH="${S}" \
+		"${S}"/cxprolog_shared \
+		--boot "${S}"/cx_dev_boot.pl \
+		--script "${S}"/pl/test_all.pl \
+		| tee "${S}"/cxprolog_test.log
+}
+
+src_test() {
+	if use java || use wxwidgets; then
+		virtx cxprolog_src_test
+	else
+		cxprolog_src_test
+	fi
+
+	grep -q "ALL THE TESTS PASSED" "${S}"/cxprolog_test.log \
+		|| die "cxprolog unit tests failed"
+}
+
+src_install() {
+	newbin cxprolog_shared cxprolog
+	dolib.so libcxprolog.so
+
+	insinto /usr/$(get_libdir)/cxprolog
+	doins lib/cxprolog/lib.pl
+
+	insinto /usr/share/${PN}/pl
+	doins pl/*.{pl,txt}
+
+	if use java; then
+		java-pkg_jarinto /usr/$(get_libdir)/cxprolog/java
+		java-pkg_newjar cxprolog.jar prolog.jar
+	fi
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-lang/dafny/Manifest b/dev-lang/dafny/Manifest
index d1aec9b0a014..d9cb981fdd37 100644
--- a/dev-lang/dafny/Manifest
+++ b/dev-lang/dafny/Manifest
@@ -1,35 +1,36 @@
 DIST bignumber.js-9.1.2.tgz 79226 BLAKE2B 3d2ff19d73a6fcfbcc0d03d1e9808796baae639e19973cbe0c26af4b514abc299129b8a7bc3e4e803c61af44b76f4381b1965d8fa331ea43e8a4c8fc7f98d8e7 SHA512 dbf98ac991fd2bce5bcce11f8570c11594c6775093b3ee481e9785428f65ba2046ee1821742f39d4f8f658085be84dd1e9bf6d663fd72a16e0e1fba6f8a7a9ba
-DIST boogie.abstractinterpretation.3.1.3.nupkg 29640 BLAKE2B 6ebadfc92014018649ba1998f878ca8d8cda2df25d8b7f5243becd27bcafbcc166c071769adabdc99098b4fbf4aee8a6de8be9f8da43b3a3e1511dba96bbf2d1 SHA512 b950ceab224aca2a6d9a0202d2f79dc59f5e8f18f710933d843e8eb6dae9badadf6f78e79297f74bbe35a9d9170f2c928174c93a6edfd70e79aa282348b4be58
 DIST boogie.abstractinterpretation.3.1.6.nupkg 31060 BLAKE2B 232350ede99fdfe5eafccfe1975d69dec478e353041cfdf85f66b9ef6080b9530c3ce3e1caf9cdadb72dc7238dc0730fe689cd97014f0ca6e7a0721ef5906e51 SHA512 8d1d2d9fa70e3428ae5be04f13498492e3075eef4c51162b265a30361496acf173c1d6ee8d875fc29e1b5bab58d899a351b3fa07c9321c2f30641efaa61391f5
-DIST boogie.basetypes.3.1.3.nupkg 25710 BLAKE2B e45663df336757dcc448f2ebe4f150948504047a1d5e4814fba81b0c08d7480aa717a42ebaa1ef9714276093a0d2755780669d0af410dda4806181c513874bf0 SHA512 ce3bbdf67d1332a51dbfffc21f12cde720b6583638dd7b6bc1fb68e5e6a7d1d6f0a191e795728b79adc1f113102996475c0290afb7062bd1122a17c1d6d1605f
+DIST boogie.abstractinterpretation.3.2.3.nupkg 31090 BLAKE2B aee6df566f9d40c958bb04cbb81f5f7b588f5facdb2bc211f41181bdf0e94f30d00c71202faab9eafafc865cb4d1c073798257f64ec25091fb14e9948b3c4a9b SHA512 dee7af159ac9de16a87cf9636e798d5489ba75815cfa5c911ed1473b4c4a80b1ac0f450efcd73a4e1aded2b89632b8512ab619c9b8ed11bd870d6a9f29bf1693
 DIST boogie.basetypes.3.1.6.nupkg 27130 BLAKE2B 34a2c49a31c3582011934b6fccede103858e6c117d3ad07c0bf07bf95b6899b8274184e615369ea16b5d309273402a3876147ad54cdc3076cbbf6f65603ccc67 SHA512 41365c6b02cf0cc333f2bba5a282f17c061cb9ffeccfaad50888f4ae40571226fbccab5ad4b4ce77d5abea6dfc20d33490006a8694f66a82d6f8fd1cc79f3f4b
-DIST boogie.codecontractsextender.3.1.3.nupkg 17458 BLAKE2B 2005168450015740d0afd9415c47674bb55f99b2a717ad03f56e0571be1f5532a9abb0a662b3b3f785dab32914684dc0046854c4286ea9be338aa0dcad0e4618 SHA512 1508e11342e88ef0fe3a6f7dc758924987b6edcc30f62d0a7e43aaba09cc14b26b999eb0d59faa13e26f246e91b9c176f4c983fdeb653892cff655f40b5bd24f
+DIST boogie.basetypes.3.2.3.nupkg 27125 BLAKE2B c83f69ae6e6be944848c2e2280a97c0a8fce63c89f2af3511406731e83ce516d456b5f829b9b41d4188f96632b2321c448274b24c90fe92ba44c12ca11db80af SHA512 2825119e1eaf57c9070ed09ee722e7b10f05450861734edbba3163dd6b4d3d775a4b5ff31e65644a23b525eb5e59db7a36b3dcfc394a81bf820bd8366b52fb12
 DIST boogie.codecontractsextender.3.1.6.nupkg 18878 BLAKE2B 8b1b92b1bf916ccd5dabe99102ee1d5feea10fe4cb9aca7926bc1ab7f17e5c626e72f71f9aba33b4a8076760323f8fecc115d7f5d111437c8af0ce51ae97c413 SHA512 7675cf3e961ac3e323fc39fe39e1ed1a955aa2ce651302729c8d1a6a4f015315f3e5fd3cfe79888bc4b2e7b6be4a9fab5febacf7f12b814e3f980f42d99fdea4
-DIST boogie.concurrency.3.1.3.nupkg 92168 BLAKE2B 81ff170058924043a10c83aed60ea38951bca7ff35de3d8be29fcf68fea9da2d658ba0abf36f0fa93e4c9f96b0a81f96b550396ca55e3ac204b4e21e49d112bd SHA512 069c34b152ccfa9ab8903b6beda6090fcbfbad243d79dc473c01e30d19a6a5ed15528120180ad271d28b43eb520dae6e221a9256680b7e241a6bb83415988d93
+DIST boogie.codecontractsextender.3.2.3.nupkg 18877 BLAKE2B b5a05599b2d0d9e63b6599b7eac34f97dda4b1ab4cc1816e9daa646843d3c5ecf4e8a42fbb4f4629805fb331b73e16ac440db8db520323c9c8420b29571a73f8 SHA512 368f3b6273bb4c24e66ddde7ebf3623a5a35bfe57e21e651cd448a80fa62d2376a2c06702938348e86d7b86004f912a9ca86e774cf5bfb6bdbb3ce7146dbf12e
 DIST boogie.concurrency.3.1.6.nupkg 92317 BLAKE2B 174a2ed0ae2e4141e9f4a4dba6d2498bb7b56babcc25a103a4a77d8fce9b5d7d41e26df16dca3b9f1f64e503d377b9b3b41484be01d80bb820c468bf87f7601e SHA512 c4a62941db25677f45dde8657d3c917a1845e51d3fde13dee40a9446ee30f5a533392b333989864439b29c8278b256b71f0d8eb7d118f1152c7ab514d29103c8
-DIST boogie.core.3.1.3.nupkg 208304 BLAKE2B c3affd650c0c81c61e39e5bba0e3f88684fe43169c59b60aa15ef532747ed624d3b4d2a1ebf1fef6d216bb380b535c62a48cce072bf4a3ff57feea907c48ca8c SHA512 ae611fe91b8189ba55315db75be7fd927d08ae096305d099aa5b51ef692b4c5f4633c7cdcc95f9344791f7e11414e4078a8640127e2442f667594b335338eb1e
+DIST boogie.concurrency.3.2.3.nupkg 97612 BLAKE2B 77239e015b92346d31c315e80dcddda8f439ec7238ea10c0f11020eb67cc3ed04363c50a81194321769cdb99b75f37e95acdddbf4f824ece4ba866c8607743a5 SHA512 5924fba9164bbe18aa3b76742d7ad2cc6f12e6744304a7d15e0d55778b8da71bb63ad83bbfce02101302173ada146e1369274d81fc500e0517fa1454bffa1d55
 DIST boogie.core.3.1.6.nupkg 209262 BLAKE2B 42160fee38ba905ef76ee63e6384b6be8e248302cca8f6fc9784ae822e2d55200a1e54b38c399d616aff2adc47bf7cb34713cff0b11da36c453b47b9b901b8fd SHA512 14f2680defcc7db41698b9e959fb554ea15ab1752dfc238124c535e406029dd29305f26173d7084d98cac235385bc0d8552e16bb2455e6d7ebe687e164b06c1d
-DIST boogie.executionengine.3.1.3.nupkg 85951 BLAKE2B 4dc3e7c442d2fc8f79b8f17c5139bf28453205f7fbb22caf35cdff40ff5294e940820e44029669e4f2103ae4dda56ad34b5d3d76dc73327d8925e6c5384859af SHA512 d06372aa80356ee5b07dd6cd30495246a5d900727fd7c6bba52faef25aabc191b5d89f479ba3c936a2a31a0045c8c195e9099d4c87231c14705ff00ac37b8c84
+DIST boogie.core.3.2.3.nupkg 211644 BLAKE2B 175ed102138abed57b0efe41fa340866b9286c2fc1702d35941ba53307c604329bc41838fed5f4aefc9e878741db325621ac5f5a019681d7055f7ec39b4548df SHA512 1f9fc1d698c248efe4fce7a2fe43d75ccafe1c85c311468343e24ba595ae4cc9a8007fc804572238639e55b43ab980728c5ce52572294223e10f6de4d8feacd7
 DIST boogie.executionengine.3.1.6.nupkg 88418 BLAKE2B 98e49c3c54af899e5e70d39c083fa62fba395aaa5a8abc04362e98bb9ab109cdc854072d0609d30da319373ac66de54e0640d29c8579ac38da91a5104ac926d5 SHA512 7628e192df3914da874ff774419d88a9d684ef500bb74ae0c5cb484438b02c9bf1dd73d814848aac781ca9c236518f71cad07ddb87486ad373d5caccd2bcd6c1
-DIST boogie.graph.3.1.3.nupkg 27927 BLAKE2B 66694f02030c943892514881969c05be58d2a9cc4e4ca44a7b6115908a2e04e104350b706b19346e5ea7d659101532ffba2cf0ac919157102c7832185f4cf112 SHA512 f50c932d6ca907f359f698c02cdf857cf21b47ec6671ec917f4ae5a03db5b02cfdf3bc075b4ad840ab31c44db343aac2fe0d623d555f17e3ce2d9cf0f5efe9e3
+DIST boogie.executionengine.3.2.3.nupkg 88881 BLAKE2B f94d2403a9f62601b865c77a008e0cc6f1284b2666de51b5c977d480a65e39c4bd4895f1181b66fc04297d4081c12eca34e978b1a53fb03ec991a12ee95c58b7 SHA512 d80544fe9952b1000c89844c57244e14181e407cc9325778afdf9c95eff18fbe166eb14d24a1ca1376ecc1428c8d88a69bf6881132c6649a9e4cf69f2c137b20
 DIST boogie.graph.3.1.6.nupkg 29347 BLAKE2B f96ff7e145cd7b5897a984b5d0109783e7e18e74e0a8185816cd80bb4fc53537a16b14f9e0ec98ce90db9f26eed32c8b23420cbf8343b21837e0aa369f6d2354 SHA512 4f385c6941637d456d921ea4247cbdf4eb8e5d470fbf1f1f35972358851fe45f7f925c3fd2f436468e133531174d71aefeb178de30c527fd56388ae89b212056
-DIST boogie.houdini.3.1.3.nupkg 52727 BLAKE2B 4a37e98bc0ab9bc8956e81df2541bf1bcfb50c32258b94818a5c8cafbcc74c76d4cfc5432a2e1ee94db5fc503dddd020123cc4f5f4a47c6b3bc8743b47784a04 SHA512 0f83ea50aa6f453d741cc7ff28a00ab9e9205a90caecaf7ccbd49d5b9217ec3bf9f5e1a7e9cce83314f48f25ee32c682c9509d00ed7bdcee602827f78712ce31
+DIST boogie.graph.3.2.3.nupkg 29420 BLAKE2B c686a976ca8761d6ba311d9a7c285a393fc7966d991dac4e6c6890432fd29e102b1badab61249275dddb57caa4319069a5d466e7ed7219aabbf8a35343d62714 SHA512 39ff97c48ce7dfaebcc601d866d040f5a5d4d1de44121cdde03c1557c90f8a00a11c9c2670f66b12fc210af2bc58fa5804657c8978cd1130d7b67a8c56024742
 DIST boogie.houdini.3.1.6.nupkg 54144 BLAKE2B 4b1571a49818ef03d30a87eb6326c33ec7d693fe31eed4ab4f636dd50ba6015b5594cdb89024943f9beb1322edb4a3813629421609417d6308513e5a0c7a71ff SHA512 608a293d03927b7fc5d3a0cdd364bcbffa7b11bd8443f13afff58aa8dfb4cf0c0c8615786c50e16560df5ee968b41477bf27033d0f48bb518d19a2cecc0c0a19
-DIST boogie.model.3.1.3.nupkg 26902 BLAKE2B f384227782a32efa4083412a0820343e301337df11bcf4dc4611ce9022a63387b66a350d921dab484230d29f6a33006e1e56ebbd1818e8d5a4b0b34e61912211 SHA512 f6e52696ded95d9be9ec4046917c171cddda7429f63d2a0f188b960950bd9684285ce6eb21d1181b4f582b2d400117bf810a8b5a11a654f43a40c22fef4abbf4
+DIST boogie.houdini.3.2.3.nupkg 54152 BLAKE2B 7af01af66224141598d60a847bb2bf2e6e68d049992fc838d75397e216f504e4b140d5a94b459332b6f35628070a9960708ba324c645c8b425fa4bde661cfb44 SHA512 dcdb9a53be6587b03e134a56d931f4b1fed974bdb3d32a0d6dde12a4398ee430dde49d6cbbe1e206e9d4452f6c168aea5805bc8fcf2e0883046350e9b3d8b3f7
 DIST boogie.model.3.1.6.nupkg 28325 BLAKE2B 11a0a9cf0931e246fc5ac7b2f7598033dff11e92cc7f505616e3af95260c08b65e9ab9bdcf794231240da4a341ce5c88cdfd9ed84b54641c83e0344fd454de0e SHA512 d638cf7c495d26e1edb6ac82d83a6dfa756121098a538ece663095c08ec9f623c57bcf7b34c492889a85e28e928d0f77cc55fc49aa04c9da21ab32220bc15b39
+DIST boogie.model.3.2.3.nupkg 28314 BLAKE2B bd5c01968ec6f021646c5ea987d238d76d0303ca59045436614e9564586a698b489997f9d36722763d47b12413bffe60674bd45d539a48f80c381ac191b14dd6 SHA512 0df754580b51b5bdc4a26b8b55f17cdabf224e8db37427e212a896c3f4f05478627428224302ad222fecbcd1b75a7875ce32359649ad571996e78519829fee13
 DIST boogie.provers.leanauto.3.1.6.nupkg 30068 BLAKE2B a8a751bc5df775c0ae5b6254734120b2a094c6713618f8854ef785fc02f0774fe6727b930df945b63282e45dbdc2e472fd5508281b9ed5304ad1ac4c1b1bd13a SHA512 37da67c1e202f4b9aac420171d83fd96add2ecce51f69f83901a57151420fc32bdb98e18f31b98e140d881bc1f10cfa19ffcb2ca3c57c0db79a38af42febb7b7
-DIST boogie.provers.smtlib.3.1.3.nupkg 70581 BLAKE2B ade8aaf77a42dc7aa8ab7a7dcf2eacd00db612b032a7e62d2ddb5f96431e43ac16df282e55fe2cc46b104b721bb1183421b98a22e8823746c6f655c7f7789fc6 SHA512 50368434be8277c5dd84edce72fcb1ba107737cedcac0f6ff7cbad32b44bc749912b576e4c1076a840239cf5f84d93354fc8a5fe649121f5ff339316cd53c1c4
+DIST boogie.provers.leanauto.3.2.3.nupkg 30083 BLAKE2B 13cdcfc94a6576eb0bf184f669c0a166e75893a626284872ed029c37a687ac6a585d62db2e239a63fd957738d9cbbab6d9d71baacabc8b9c4c6ead60c97bd9c9 SHA512 39b7edbc94d374dee9ba3aadbe09bc7cb7671271668abdaf8821a6299b58fae8cf4bc07c33b917a7f650abdbcf313d98af43dc6a432f0edeb354cdeacd27fa35
 DIST boogie.provers.smtlib.3.1.6.nupkg 71966 BLAKE2B 7879b4893bf8f24486648f73aa21f9a5046e04a1ab765ecccc5ae66a5000170eb733949567a52f3c3a46246739976290d6180936a30d6fa4a83966957115d556 SHA512 2edcb1ed93c6d6a4f457785a1cced9d655b8afcfec04558fc189ae9a08ea64036bfdea646366c06ed9eeb5ed34d1ba542d4f88ae716a5fc766f10d6578e51d7c
-DIST boogie.vcexpr.3.1.3.nupkg 74142 BLAKE2B d523aecb82111a712fe619a69c159213ee4bef8182b1dd5708ff2b84ecd7690bceed5eaa825f8735c373ae7d3cf5ba4385e552f4a332d68fa5740cf862992bce SHA512 540e15a2830b739921e72165a39633bbc5b0a820463d79d7a2a915d2d902d242d9221e12026b6c8f6796d2309f5bff672dae50ff9d27834f2660fb433ce5809b
+DIST boogie.provers.smtlib.3.2.3.nupkg 71925 BLAKE2B cedaa456e389c50543a18377243217ecb75a92c6800bad359cbd83d5da1ab216c4becee5bc4b55219fe6798ee8bd57057fc340c84b97ef4b99938f86574e88f6 SHA512 1c23cdeee2b4a4a47ce2b4e80bc1fefd1d42f3798582bf8179778b461d63614474cbca9f46e2ddc82990a4d25f134dcc25b738075f76d03f08bf048e217ce030
 DIST boogie.vcexpr.3.1.6.nupkg 75557 BLAKE2B 8fce1d8b05a18bc55c80259e9a856df7c4b0631eca4f19b050bc13405773e4b9f7072e32dba67378eb63e137d1dcd4988b868b57ae2f41c9735ee6dbd9bba274 SHA512 b9bc0d6148bca1010161442ec800a798bd5a5c6748e9b3e41cd8608ecf7020d97c2d111317764dc404f547ce5ed974a7945f8d2e9d948259b0a0f6fb1bf2e327
-DIST boogie.vcgeneration.3.1.3.nupkg 90517 BLAKE2B d5f0271491a37f7ba806c2a46894c474b0c65d5bc66a659241e9ebffbf63c77a75a3533a615957ced4af1ee0363a34fd2c6803beca59e1fe656a1ba29c5fb309 SHA512 e402de9912b9d788520ef615fd80b8dba2eca9938f8321fb9e3f53bf158baedfd4c69f3aa4eaa3fe8f685d3ed9556982001117014279f9440605bac368b521c5
+DIST boogie.vcexpr.3.2.3.nupkg 75389 BLAKE2B 01f0cb6081152993a2da928045524b2092a509109caf3ba3b3e76a9dca391a402e962c227aa4c93c8a368fe4502311874be3f545a5cbec08e522091c8a408393 SHA512 89cb65dc0459e9017923febf2c09bc8a93f7fd6480cb2010f4db84bbe3c745134a50df6f1b4f486619d3b336a59c76bd2455f61774176a484f41ed6a7731342d
 DIST boogie.vcgeneration.3.1.6.nupkg 91911 BLAKE2B 405a1995a6438953ab44d912dc633024fb564eb95d258e0d360a13b6b29075eb283da95f02f157fca740b86d499e25c43f98af96664b837cdf13ea496e53b813 SHA512 be76b5c721c42a301bd553b205868328b855e23463e2c728d6780919b2bc09481e3fa5c5abdcd7673b3a9ce48f1675da9fbc120b8bfc978dbccb5b048ea7c55a
+DIST boogie.vcgeneration.3.2.3.nupkg 95225 BLAKE2B a2325e9f05240140c4ae8a369281b5482b9f16d80b499d8a2c7552c5f87a27c3e0cb5afd012d0499205bdb9e2dc916a513c38a872d17198bd12a36c8e40bd253 SHA512 a4eccf1dc4bf173a441858747f6b6ee0accfc6bd8c46efd97f8e6bc896fa648db6eda896b17031436cf37e3abbd22930839f0ff48d540e43eeddc46a0c496f49
 DIST castle.core.4.4.0.nupkg 916004 BLAKE2B 7404f946c140bc4c22132282a4a12694328bac2f37f3cae06c595076068dbedc808465e352f083450cea3e3869698f91b7a5b2b55c08f29f4a9feba7f15abf74 SHA512 7626c347f82038bc29b0b2ae399937047aead260ed85ff8c107d36adbe901d729be59cd89a5f98ef45da2d1883c8374b6f286c81c044a5a2b69ab4b5dde9ce98
 DIST commandlineparser.2.8.0.nupkg 475554 BLAKE2B e55eda3a96441169220e5b081f432d8445d719cbcf8e86527920d44085e6e97934e20aa0266bc5dbdc16ba1a6daa6ece55bc2c63266c9d733ab4992f2fe3e0a1 SHA512 8c276513dfe91e5bc72cfb3b96a0d24411ee3bd2e9832d423f6ade3f3964a011dbb977ca90601750fa133a0a25fe72f66955be7f69a72f5d6b73c7f313094b5f
 DIST commandlineparser.2.9.1.nupkg 496069 BLAKE2B e2c4b38841f83d6bc10432b8055af90369f1fe0a10105a58b51b44cd48e5d84cb0b5e4b19f444d8c81b38646a62c7c4d11cbd710e92fea68be3ebea6ab98e3f1 SHA512 4f364e45c9668c7e7cc6a922b488f3fa523033c20d7a432694f0a6af05ce528ea0481d8375e2f4f1032c6990347b4803ce9a0e48068c6fe15ec46fb1254f085d
 DIST coverlet.collector.3.2.0.nupkg 2209480 BLAKE2B 175bcfcb9d6e5177d44f2d607f2411cbe77d6009d096bbc84372e33d7be972d3e39ec39d7f2669b4b91f4bcf44f6ddd46bc91541c0cc4843426e2dd1073bf5c2 SHA512 b63d02a5d3233805b42f0b8cc76f40c8d9f5a0117beb6bdb2ab147f5521bb99919b29d51ff91767ce0bfcab92d25fc8fe794133cadc60da3e009ae18d10fc920
-DIST dafny-4.6.0.tar.gz 6373177 BLAKE2B 9348a9b170dd694885efe4682f05abe60240e6f7df7bde7bb53e8955c1c75a332ca6e7d6d6f38eb1aa9a83a9a5dfccea13b7683e99873c1fce12181d47679548 SHA512 abac500a27a811b434d32036ff7d877dd337a0a5917a07a7ac1fceffb1dd5d493bd07b7d518875243674b7919862a25f628fe62052983a8ff8f1450669c49b69
 DIST dafny-4.7.0.tar.gz 6538682 BLAKE2B 92597a70055ab599bdc8495de9e00a441112098b990372d40515cafc191fff0b63e835aad0a94fdef363436ea06e012dfdfca76ade5b7271386a0293a9471729 SHA512 4fca7fab490df1a075c70f4c2b3f62d77c7194224b34de954e5195477b08f30d4ec9562defa9dc3756039b217bf758f86d212f4c71a644ac43069d829d5b2eb2
+DIST dafny-4.8.0.tar.gz 6615281 BLAKE2B d891a1955554b194e7af231eff9368549bd2686b43dc1aca8034df4502b7b57297a8384db990ca3268bf992ce2ea562d02d936617b0788a58705d2b0cd91aa98 SHA512 8194f2544b411e00874b174ae4036d6ff21e516e342b3ddd9bc00e70a8140037e5a35f10ef797336b1d4f471ea1596829f0d5446d6a93e436690753dc9b19a31
 DIST diffplex.1.7.0.nupkg 69699 BLAKE2B 9c7d6eab09e7df1d791183bbfc4cc46b7bea8dd4b5d09fd3e7e3dc1734e6a8973f92a34387e1a2a0e3a4cbf11ffb89f8138844b2b46d2e94010932ed47158911 SHA512 a0f7a30c59889d71eba97db9bda2efbf1b458ca439d129b52ba3eae32626325e73ec13d46018603a81a33cf18a25a5b08a1b2e6a89c7e716faa47eb9db6d6474
 DIST humanizer.core.2.2.0.nupkg 104728 BLAKE2B 6c383abbbed9250f2a7eeec4478ead8f23ad53aa62a5b0f22e71fed9157aa6644a9a7518842d637885b7b63a4300754e1a7e9f3f9968725607ad30bf18e27a21 SHA512 e232459f914c8e7fc3f8dee69a85e66beb8c44515d4c83a976ee24084a91f32aae61c6f845ff38edcae02d0bcab44f9ec253277dccf2f4ae7e82235047bc6ade
 DIST jetbrains.annotations.2021.1.0.nupkg 122595 BLAKE2B 59b994b58df9c4ef12d130543ae85ae0a368b92fae8c1d106675bcb4a55da9a13ee6da5fd5940b51c2a101470226007b05a1670b085d0f2f0b66f143e67f3051 SHA512 3b17599f6fc4413dd3811a32216f742596da5c6d8709134d85d292cd28ace7dc72aecef8a2bf64a5dfd31796787468e70e3936ea2eb9ed0505c7c6130d66db17
diff --git a/dev-lang/dafny/dafny-4.6.0.ebuild b/dev-lang/dafny/dafny-4.6.0.ebuild
deleted file mode 100644
index 0ca08b0d4f0f..000000000000
--- a/dev-lang/dafny/dafny-4.6.0.ebuild
+++ /dev/null
@@ -1,630 +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} )
-
-DOTNET_PKG_COMPAT=6.0
-NUGETS="
-boogie.abstractinterpretation@3.1.3
-boogie.basetypes@3.1.3
-boogie.codecontractsextender@3.1.3
-boogie.concurrency@3.1.3
-boogie.core@3.1.3
-boogie.executionengine@3.1.3
-boogie.graph@3.1.3
-boogie.houdini@3.1.3
-boogie.model@3.1.3
-boogie.provers.smtlib@3.1.3
-boogie.vcexpr@3.1.3
-boogie.vcgeneration@3.1.3
-castle.core@4.4.0
-commandlineparser@2.8.0
-commandlineparser@2.9.1
-coverlet.collector@3.2.0
-diffplex@1.7.0
-humanizer.core@2.2.0
-jetbrains.annotations@2021.1.0
-mediatr@8.1.0
-microsoft.bcl.asyncinterfaces@1.1.1
-microsoft.bcl.asyncinterfaces@5.0.0
-microsoft.bcl.asyncinterfaces@6.0.0
-microsoft.build.framework@17.0.0
-microsoft.build.locator@1.4.1
-microsoft.build.tasks.core@17.0.0
-microsoft.build.utilities.core@17.0.0
-microsoft.build@17.0.0
-microsoft.codeanalysis.analyzers@3.0.0
-microsoft.codeanalysis.analyzers@3.3.2
-microsoft.codeanalysis.common@3.7.0
-microsoft.codeanalysis.common@4.0.1
-microsoft.codeanalysis.csharp.workspaces@4.0.1
-microsoft.codeanalysis.csharp@3.7.0
-microsoft.codeanalysis.csharp@4.0.1
-microsoft.codeanalysis.visualbasic.workspaces@4.0.1
-microsoft.codeanalysis.visualbasic@4.0.1
-microsoft.codeanalysis.workspaces.common@4.0.1
-microsoft.codeanalysis.workspaces.msbuild@4.0.1
-microsoft.codeanalysis@4.0.1
-microsoft.codecoverage@16.11.0
-microsoft.codecoverage@16.9.4
-microsoft.codecoverage@17.1.0
-microsoft.csharp@4.0.1
-microsoft.dotnet.platformabstractions@2.0.4
-microsoft.extensions.configuration.abstractions@2.0.0
-microsoft.extensions.configuration.abstractions@5.0.0
-microsoft.extensions.configuration.binder@2.0.0
-microsoft.extensions.configuration.binder@5.0.0
-microsoft.extensions.configuration.commandline@5.0.0
-microsoft.extensions.configuration.fileextensions@5.0.0
-microsoft.extensions.configuration.json@5.0.0
-microsoft.extensions.configuration@2.0.0
-microsoft.extensions.configuration@5.0.0
-microsoft.extensions.dependencyinjection.abstractions@2.0.0
-microsoft.extensions.dependencyinjection.abstractions@5.0.0
-microsoft.extensions.dependencyinjection@2.0.0
-microsoft.extensions.dependencyinjection@5.0.0
-microsoft.extensions.dependencymodel@2.0.4
-microsoft.extensions.fileproviders.abstractions@5.0.0
-microsoft.extensions.fileproviders.physical@5.0.0
-microsoft.extensions.filesystemglobbing@5.0.0
-microsoft.extensions.logging.abstractions@2.0.0
-microsoft.extensions.logging.abstractions@5.0.0
-microsoft.extensions.logging.configuration@5.0.0
-microsoft.extensions.logging.console@5.0.0
-microsoft.extensions.logging@2.0.0
-microsoft.extensions.logging@5.0.0
-microsoft.extensions.options.configurationextensions@2.0.0
-microsoft.extensions.options.configurationextensions@5.0.0
-microsoft.extensions.options@2.0.0
-microsoft.extensions.options@5.0.0
-microsoft.extensions.primitives@2.0.0
-microsoft.extensions.primitives@5.0.0
-microsoft.net.stringtools@1.0.0
-microsoft.net.test.sdk@16.11.0
-microsoft.net.test.sdk@16.9.4
-microsoft.net.test.sdk@17.1.0
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.platforms@2.1.2
-microsoft.netcore.platforms@3.0.0
-microsoft.netcore.platforms@3.1.0
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.targets@1.1.0
-microsoft.netframework.referenceassemblies.net452@1.0.2
-microsoft.netframework.referenceassemblies@1.0.2
-microsoft.testplatform.extensions.trxlogger@17.9.0
-microsoft.testplatform.objectmodel@16.11.0
-microsoft.testplatform.objectmodel@16.9.4
-microsoft.testplatform.objectmodel@17.1.0
-microsoft.testplatform.objectmodel@17.9.0
-microsoft.testplatform.testhost@16.11.0
-microsoft.testplatform.testhost@16.9.4
-microsoft.testplatform.testhost@17.1.0
-microsoft.testplatform.testhost@17.9.0
-microsoft.visualstudio.threading.analyzers@16.7.56
-microsoft.visualstudio.threading@16.7.56
-microsoft.visualstudio.validation@15.5.31
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@4.3.0
-microsoft.win32.registry@4.6.0
-microsoft.win32.systemevents@4.7.0
-microsoft.win32.systemevents@6.0.0
-moq@4.16.1
-nerdbank.streams@2.6.81
-netstandard.library@1.6.1
-netstandard.library@2.0.3
-newtonsoft.json@11.0.2
-newtonsoft.json@13.0.1
-newtonsoft.json@9.0.1
-nuget.frameworks@5.0.0
-nuget.frameworks@5.11.0
-omnisharp.extensions.jsonrpc.generators@0.19.5
-omnisharp.extensions.jsonrpc.testing@0.19.5
-omnisharp.extensions.jsonrpc@0.19.5
-omnisharp.extensions.languageclient@0.19.5
-omnisharp.extensions.languageprotocol.testing@0.19.5
-omnisharp.extensions.languageprotocol@0.19.5
-omnisharp.extensions.languageserver.shared@0.19.5
-omnisharp.extensions.languageserver@0.19.5
-rangetree@3.0.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.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.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@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
-serilog.extensions.logging@3.0.1
-serilog.settings.configuration@3.1.0
-serilog.sinks.debug@2.0.0
-serilog.sinks.file@5.0.0
-serilog.sinks.inmemory@0.11.0
-serilog@2.12.0
-system.appcontext@4.1.0
-system.appcontext@4.3.0
-system.buffers@4.3.0
-system.buffers@4.4.0
-system.codedom@4.4.0
-system.collections.concurrent@4.3.0
-system.collections.immutable@1.5.0
-system.collections.immutable@1.7.0
-system.collections.immutable@1.7.1
-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.primitives@4.3.0
-system.componentmodel.typeconverter@4.3.0
-system.componentmodel@4.3.0
-system.composition.attributedmodel@1.0.31
-system.composition.convention@1.0.31
-system.composition.hosting@1.0.31
-system.composition.runtime@1.0.31
-system.composition.typedparts@1.0.31
-system.composition@1.0.31
-system.configuration.configurationmanager@4.7.0
-system.configuration.configurationmanager@6.0.0
-system.console@4.3.0
-system.diagnostics.debug@4.0.11
-system.diagnostics.debug@4.3.0
-system.diagnostics.diagnosticsource@4.3.0
-system.diagnostics.tools@4.0.1
-system.diagnostics.tools@4.3.0
-system.diagnostics.tracesource@4.3.0
-system.diagnostics.tracing@4.3.0
-system.drawing.common@4.7.0
-system.drawing.common@6.0.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.compression.zipfile@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.pipelines@4.7.3
-system.io.pipelines@5.0.1
-system.io@4.1.0
-system.io@4.3.0
-system.linq.async@6.0.1
-system.linq.expressions@4.1.0
-system.linq.expressions@4.3.0
-system.linq@4.1.0
-system.linq@4.3.0
-system.memory@4.5.3
-system.memory@4.5.4
-system.net.http@4.3.0
-system.net.nameresolution@4.3.0
-system.net.primitives@4.3.0
-system.net.sockets@4.3.0
-system.net.websockets@4.3.0
-system.numerics.vectors@4.4.0
-system.objectmodel@4.0.12
-system.objectmodel@4.3.0
-system.private.uri@4.3.0
-system.reactive@4.4.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.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@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.caching@6.0.0
-system.runtime.compilerservices.unsafe@4.4.0
-system.runtime.compilerservices.unsafe@4.5.2
-system.runtime.compilerservices.unsafe@4.7.0
-system.runtime.compilerservices.unsafe@4.7.1
-system.runtime.compilerservices.unsafe@5.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.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.6.0
-system.security.accesscontrol@4.7.0
-system.security.accesscontrol@6.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.cng@4.7.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.pkcs@4.7.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.protecteddata@4.7.0
-system.security.cryptography.protecteddata@6.0.0
-system.security.cryptography.x509certificates@4.3.0
-system.security.cryptography.xml@4.7.0
-system.security.permissions@4.7.0
-system.security.permissions@6.0.0
-system.security.principal.windows@4.3.0
-system.security.principal.windows@4.6.0
-system.security.principal.windows@4.7.0
-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.json@4.7.0
-system.text.json@5.0.2
-system.text.regularexpressions@4.1.0
-system.text.regularexpressions@4.3.0
-system.threading.channels@4.7.1
-system.threading.tasks.dataflow@4.9.0
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.extensions@4.3.0
-system.threading.tasks.extensions@4.5.3
-system.threading.tasks.extensions@4.5.4
-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
-system.windows.extensions@4.7.0
-system.windows.extensions@6.0.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
-tomlyn@0.16.2
-validation@2.4.18
-xunit.abstractions@2.0.2
-xunit.abstractions@2.0.3
-xunit.analyzers@0.10.0
-xunit.analyzers@1.0.0
-xunit.assert@2.4.1
-xunit.assert@2.4.2
-xunit.assertmessages@2.4.0
-xunit.core@2.4.1
-xunit.core@2.4.2
-xunit.extensibility.core@2.4.0
-xunit.extensibility.core@2.4.1
-xunit.extensibility.core@2.4.2
-xunit.extensibility.execution@2.4.0
-xunit.extensibility.execution@2.4.1
-xunit.extensibility.execution@2.4.2
-xunit.runner.visualstudio@2.4.3
-xunit.runner.visualstudio@2.5.1
-xunit.skippablefact@1.4.8
-xunit@2.4.1
-xunit@2.4.2
-"
-
-inherit check-reqs dotnet-pkg edo java-pkg-2 multiprocessing python-any-r1 optfeature
-
-DESCRIPTION="Dafny is a verification-aware programming language"
-HOMEPAGE="https://dafny.org/
-	https://github.com/dafny-lang/dafny/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/dafny-lang/${PN}.git"
-else
-	SRC_URI="https://github.com/dafny-lang/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+="
-	${NUGET_URIS}
-	test? ( https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-lang/dafny-bin
-	>=virtual/jre-1.8:*
-	sci-mathematics/z3
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-BDEPEND="
-	${RDEPEND}
-	dev-dotnet/coco
-	test? (
-		${PYTHON_DEPS}
-		dev-go/go-tools
-		dev-lang/boogie
-		dev-lang/go
-		dev-python/OutputCheck
-		dev-python/lit
-		dev-python/psutil
-		net-libs/nodejs[npm]
-	)
-"
-
-CHECKREQS_DISK_BUILD="2G"
-DOTNET_PKG_PROJECTS=(
-	"${S}/Source/Dafny/Dafny.csproj"
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.12.0-DafnyCore-csproj.patch"
-	"${FILESDIR}/${PN}-3.12.0-DafnyRuntime-csproj.patch"
-	"${FILESDIR}/${PN}-4.5.0-lit-config.patch"
-)
-
-DOCS=(
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	NOTICES.txt
-	README.md
-	RELEASE_NOTES.md
-	docs/DafnyCheatsheet.pdf
-	docs/DafnyRef/out/DafnyRef.pdf
-)
-
-TEST_S="${S}/Source/IntegrationTests/TestFiles/LitTests/LitTest"
-
-pkg_setup() {
-	# Clean the environment.
-	unset NPM_CONFIG_USERCONFIG
-
-	if [[ -n "${_JAVA_OPTIONS}" ]] ; then
-		ewarn "Cleaning _JAVA_OPTIONS because when set compile and test may fail"
-
-		unset _JAVA_OPTIONS
-	fi
-
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-	java-pkg-2_pkg_setup
-
-	# We need to set up Python only for running test tools (called via lit).
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Using "for-each-compiler" will fail because of Cargo requiring network access.
-	while read -r test_file ; do
-		if grep "// RUN: %testDafnyForEachCompiler" "${test_file}" >/dev/null ; then
-			rm "${test_file}" || die "failed to remove test ${bad_test}"
-		fi
-	done < <(find "${TEST_S}" -type f -name "*.dfy")
-
-	# Remove bad tests (recursive).
-	local -a bad_tests=(
-		# Following tests fail:
-		VSComp2010/Problem2-Invert.dfy
-		auditor/TestAuditor.dfy
-		benchmarks/sequence-race/SequenceRace.dfy
-		c++/extern.dfy
-		c++/functions.dfy
-		c++/tuple.dfy
-		cli/runArgument.dfy
-		comp/CoverageReport.dfy
-		concurrency/06-ThreadOwnership.dfy
-		dafny0/Fuel.legacy.dfy
-		dafny0/Stdin.dfy
-		dafny1/MoreInduction.dfy
-		dafny4/Lucas-up.legacy.dfy
-		dafny4/Primes.dfy
-		examples/Simple_compiler/Compiler.dfy
-		git-issues/git-issue-2026.dfy
-		git-issues/git-issue-2299.dfy
-		git-issues/git-issue-2301.dfy
-		git-issues/git-issue-505.dfy
-		metatests/InconsistentCompilerBehavior.dfy
-		metatests/TestBeyondVerifierExpect.dfy
-		separate-verification/assumptions.dfy
-		server/counterexample_none.transcript
-		triggers/emptyTrigger.dfy
-		unicodechars/DafnyTests/RunAllTestsOption.dfy
-		verification/isolate-assertions.dfy
-		verification/progress.dfy
-		vstte2012/Combinators.dfy
-		wishlist/exists-b-exists-not-b.dfy
-
-		# Following tests are very slow:
-		DafnyTests/RunAllTests/RunAllTestsOption.dfy
-		VSI-Benchmarks/b4.dfy
-		blogposts/TestGenerationNoInliningEnumerativeDefinitions.dfy
-		comp/BranchCoverage.dfy
-		comp/CompileWithArguments.dfy
-		comp/Extern.dfy
-		comp/MainMethod.dfy
-		comp/Print.dfy
-		comp/SequenceConcatOptimization.dfy
-		comp/compile1quiet/CompileRunQuietly.dfy
-		comp/compile1verbose/CompileAndThenRun.dfy
-		comp/compile3/JustRun.dfy
-		comp/manualcompile/ManualCompile.dfy
-		comp/replaceables/complex/user.dfy
-		concurrency/07-CounterThreadOwnership.dfy
-		concurrency/08-CounterNoTermination.dfy
-		concurrency/09-CounterNoStateMachine.dfy
-		concurrency/10-SequenceInvariant.dfy
-		concurrency/12-MutexLifetime-short.dfy
-		dafny0/RlimitMultiplier.dfy
-		dafny1/SchorrWaite.dfy
-		dafny2/SnapshotableTrees.dfy
-		dafny4/git-issue250.dfy
-		git-issues/git-issue-Main4.dfy
-		git-issues/git-issue-MainE.dfy
-		unicodechars/comp/CompileWithArguments.dfy
-	)
-	local bad_test
-	for bad_test in "${bad_tests[@]}" ; do
-		if [[ -f "${TEST_S}/${bad_test}" ]] ; then
-			rm "${TEST_S}/${bad_test}" || die "failed to remove test ${bad_test}"
-		else
-			ewarn "Test file ${bad_test} does not exist"
-		fi
-	done
-
-	dotnet-pkg_src_prepare
-
-	# Update lit's "lit.site.cfg" file.
-	local dotnet_exec="${DOTNET_PKG_EXECUTABLE} exec ${DOTNET_PKG_OUTPUT}"
-	local lit_config="${TEST_S}/lit.site.cfg"
-
-	sed -i "${lit_config}" \
-		-e "/^defaultDafnyExecutable/s|=.*|= '${dotnet_exec}/Dafny.dll '|" \
-		-e "/^dafnyExecutable/s|=.*|= '${dotnet_exec}/Dafny.dll '|" \
-		-e "/^defaultServerExecutable/s|=.*|= '${dotnet_exec}/DafnyServer.dll'|" \
-		-e "/^serverExecutable/s|=.*|= '${dotnet_exec}/DafnyServer.dll'|" \
-		-e "s|dotnet run |${DOTNET_PKG_EXECUTABLE} run |g" \
-		|| die "failed to update ${lit_config}"
-}
-
-src_compile () {
-	einfo "Building DafnyRuntimeJava JAR."
-	local dafny_runtime_java="${S}/Source/DafnyRuntime/DafnyRuntimeJava"
-	mkdir -p "${dafny_runtime_java}/build/libs/" || die
-	pushd "${dafny_runtime_java}/build" || die
-
-	ejavac -d ./ $(find "${dafny_runtime_java}/src/main" -type f -name "*.java")
-	edo jar cvf "DafnyRuntime-${PV}.jar" dafny/*
-
-	cp "DafnyRuntime-${PV}.jar" "${dafny_runtime_java}/build/libs/" || die
-	popd || die
-
-	# Build main dotnet package.
-	dotnet-pkg_src_compile
-
-	if use test ; then
-		# Build "TestDafny" without saving artifacts.
-		edotnet build										\
-				--configuration Debug						\
-				--no-self-contained							\
-				-maxCpuCount:$(makeopts_jobs)				\
-				"${S}/Source/TestDafny/TestDafny.csproj"
-	fi
-}
-
-src_test() {
-	# Dafny GOLang transpiler tests need "goimports" from "/usr/lib/go/bin".
-	local -x PATH="${EPREFIX}/usr/lib/go/bin:${PATH}"
-
-	einfo "Installing bignumber.js package required for tests using NodeJS."
-	local -a npm_opts=(
-		--audit false
-		--color false
-		--foreground-scripts
-		--offline
-		--progress false
-		--verbose
-	)
-	edob npm "${npm_opts[@]}" install "${DISTDIR}/bignumber.js-9.1.2.tgz"
-
-	einfo "Starting tests using the lit test tool."
-	local -a lit_opts=(
-		--order=lexical
-		--time-tests
-		--timeout 1800          # Let one test take no mere than half a hour.
-		--verbose
-		--workers="$(makeopts_jobs)"
-	)
-	edo lit "${lit_opts[@]}" "${TEST_S}"
-}
-
-src_install() {
-	dotnet-pkg-base_install
-
-	local -a dafny_exes=(
-		Dafny
-		DafnyDriver
-		DafnyLanguageServer
-		DafnyServer
-		TestDafny
-	)
-	local dafny_exe
-	for dafny_exe in "${dafny_exes[@]}" ; do
-		dotnet-pkg-base_dolauncher "/usr/share/${P}/${dafny_exe}" "${dafny_exe}"
-	done
-
-	dosym -r /usr/bin/Dafny /usr/bin/dafny
-	dosym -r /usr/bin/DafnyServer /usr/bin/dafny-server
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "Dafny GO language backend" dev-go/go-tools
-	optfeature "Dafny Rust language backend" virtual/rust
-}
diff --git a/dev-lang/dafny/dafny-4.8.0.ebuild b/dev-lang/dafny/dafny-4.8.0.ebuild
new file mode 100644
index 000000000000..ea302738e8dd
--- /dev/null
+++ b/dev-lang/dafny/dafny-4.8.0.ebuild
@@ -0,0 +1,671 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+DOTNET_PKG_COMPAT=6.0
+NUGETS="
+boogie.abstractinterpretation@3.2.3
+boogie.basetypes@3.2.3
+boogie.codecontractsextender@3.2.3
+boogie.concurrency@3.2.3
+boogie.core@3.2.3
+boogie.executionengine@3.2.3
+boogie.graph@3.2.3
+boogie.houdini@3.2.3
+boogie.model@3.2.3
+boogie.provers.leanauto@3.2.3
+boogie.provers.smtlib@3.2.3
+boogie.vcexpr@3.2.3
+boogie.vcgeneration@3.2.3
+castle.core@4.4.0
+commandlineparser@2.8.0
+commandlineparser@2.9.1
+coverlet.collector@3.2.0
+diffplex@1.7.0
+humanizer.core@2.2.0
+jetbrains.annotations@2021.1.0
+mediatr@8.1.0
+microsoft.bcl.asyncinterfaces@1.1.1
+microsoft.bcl.asyncinterfaces@5.0.0
+microsoft.bcl.asyncinterfaces@6.0.0
+microsoft.build.framework@17.0.0
+microsoft.build.locator@1.4.1
+microsoft.build.tasks.core@17.0.0
+microsoft.build.utilities.core@17.0.0
+microsoft.build@17.0.0
+microsoft.codeanalysis.analyzers@3.0.0
+microsoft.codeanalysis.analyzers@3.3.2
+microsoft.codeanalysis.common@3.7.0
+microsoft.codeanalysis.common@4.0.1
+microsoft.codeanalysis.csharp.workspaces@4.0.1
+microsoft.codeanalysis.csharp@3.7.0
+microsoft.codeanalysis.csharp@4.0.1
+microsoft.codeanalysis.visualbasic.workspaces@4.0.1
+microsoft.codeanalysis.visualbasic@4.0.1
+microsoft.codeanalysis.workspaces.common@4.0.1
+microsoft.codeanalysis.workspaces.msbuild@4.0.1
+microsoft.codeanalysis@4.0.1
+microsoft.codecoverage@16.11.0
+microsoft.codecoverage@16.9.4
+microsoft.codecoverage@17.1.0
+microsoft.csharp@4.0.1
+microsoft.dotnet.platformabstractions@2.0.4
+microsoft.extensions.configuration.abstractions@2.0.0
+microsoft.extensions.configuration.abstractions@5.0.0
+microsoft.extensions.configuration.binder@2.0.0
+microsoft.extensions.configuration.binder@5.0.0
+microsoft.extensions.configuration.commandline@5.0.0
+microsoft.extensions.configuration.fileextensions@5.0.0
+microsoft.extensions.configuration.json@5.0.0
+microsoft.extensions.configuration@2.0.0
+microsoft.extensions.configuration@5.0.0
+microsoft.extensions.dependencyinjection.abstractions@2.0.0
+microsoft.extensions.dependencyinjection.abstractions@5.0.0
+microsoft.extensions.dependencyinjection@2.0.0
+microsoft.extensions.dependencyinjection@5.0.0
+microsoft.extensions.dependencymodel@2.0.4
+microsoft.extensions.fileproviders.abstractions@5.0.0
+microsoft.extensions.fileproviders.physical@5.0.0
+microsoft.extensions.filesystemglobbing@5.0.0
+microsoft.extensions.logging.abstractions@2.0.0
+microsoft.extensions.logging.abstractions@5.0.0
+microsoft.extensions.logging.configuration@5.0.0
+microsoft.extensions.logging.console@5.0.0
+microsoft.extensions.logging@2.0.0
+microsoft.extensions.logging@5.0.0
+microsoft.extensions.options.configurationextensions@2.0.0
+microsoft.extensions.options.configurationextensions@5.0.0
+microsoft.extensions.options@2.0.0
+microsoft.extensions.options@5.0.0
+microsoft.extensions.primitives@2.0.0
+microsoft.extensions.primitives@5.0.0
+microsoft.net.stringtools@1.0.0
+microsoft.net.test.sdk@16.11.0
+microsoft.net.test.sdk@16.9.4
+microsoft.net.test.sdk@17.1.0
+microsoft.netcore.platforms@1.0.1
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@2.1.2
+microsoft.netcore.platforms@3.0.0
+microsoft.netcore.platforms@3.1.0
+microsoft.netcore.targets@1.0.1
+microsoft.netcore.targets@1.1.0
+microsoft.netframework.referenceassemblies.net452@1.0.2
+microsoft.netframework.referenceassemblies@1.0.2
+microsoft.testplatform.extensions.trxlogger@17.9.0
+microsoft.testplatform.objectmodel@16.11.0
+microsoft.testplatform.objectmodel@16.9.4
+microsoft.testplatform.objectmodel@17.1.0
+microsoft.testplatform.objectmodel@17.9.0
+microsoft.testplatform.testhost@16.11.0
+microsoft.testplatform.testhost@16.9.4
+microsoft.testplatform.testhost@17.1.0
+microsoft.testplatform.testhost@17.9.0
+microsoft.visualstudio.threading.analyzers@16.7.56
+microsoft.visualstudio.threading@16.7.56
+microsoft.visualstudio.validation@15.5.31
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@4.3.0
+microsoft.win32.registry@4.6.0
+microsoft.win32.systemevents@4.7.0
+microsoft.win32.systemevents@6.0.0
+moq@4.16.1
+nerdbank.streams@2.6.81
+netstandard.library@1.6.1
+netstandard.library@2.0.3
+newtonsoft.json@11.0.2
+newtonsoft.json@13.0.1
+newtonsoft.json@9.0.1
+nuget.frameworks@5.0.0
+nuget.frameworks@5.11.0
+omnisharp.extensions.jsonrpc.generators@0.19.5
+omnisharp.extensions.jsonrpc.testing@0.19.5
+omnisharp.extensions.jsonrpc@0.19.5
+omnisharp.extensions.languageclient@0.19.5
+omnisharp.extensions.languageprotocol.testing@0.19.5
+omnisharp.extensions.languageprotocol@0.19.5
+omnisharp.extensions.languageserver.shared@0.19.5
+omnisharp.extensions.languageserver@0.19.5
+rangetree@3.0.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.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.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@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
+serilog.extensions.logging@3.0.1
+serilog.settings.configuration@3.1.0
+serilog.sinks.debug@2.0.0
+serilog.sinks.file@5.0.0
+serilog.sinks.inmemory@0.11.0
+serilog@2.12.0
+system.appcontext@4.1.0
+system.appcontext@4.3.0
+system.buffers@4.3.0
+system.buffers@4.4.0
+system.codedom@4.4.0
+system.collections.concurrent@4.3.0
+system.collections.immutable@1.5.0
+system.collections.immutable@1.7.0
+system.collections.immutable@1.7.1
+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.primitives@4.3.0
+system.componentmodel.typeconverter@4.3.0
+system.componentmodel@4.3.0
+system.composition.attributedmodel@1.0.31
+system.composition.convention@1.0.31
+system.composition.hosting@1.0.31
+system.composition.runtime@1.0.31
+system.composition.typedparts@1.0.31
+system.composition@1.0.31
+system.configuration.configurationmanager@4.7.0
+system.configuration.configurationmanager@6.0.0
+system.console@4.3.0
+system.diagnostics.debug@4.0.11
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@4.3.0
+system.diagnostics.tools@4.0.1
+system.diagnostics.tools@4.3.0
+system.diagnostics.tracesource@4.3.0
+system.diagnostics.tracing@4.3.0
+system.drawing.common@4.7.0
+system.drawing.common@6.0.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.compression.zipfile@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.pipelines@4.7.3
+system.io.pipelines@5.0.1
+system.io@4.1.0
+system.io@4.3.0
+system.linq.async@6.0.1
+system.linq.expressions@4.1.0
+system.linq.expressions@4.3.0
+system.linq@4.1.0
+system.linq@4.3.0
+system.memory@4.5.3
+system.memory@4.5.4
+system.net.http@4.3.0
+system.net.nameresolution@4.3.0
+system.net.primitives@4.3.0
+system.net.sockets@4.3.0
+system.net.websockets@4.3.0
+system.numerics.vectors@4.4.0
+system.objectmodel@4.0.12
+system.objectmodel@4.3.0
+system.private.uri@4.3.0
+system.reactive@4.4.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.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@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.caching@6.0.0
+system.runtime.compilerservices.unsafe@4.4.0
+system.runtime.compilerservices.unsafe@4.5.2
+system.runtime.compilerservices.unsafe@4.7.0
+system.runtime.compilerservices.unsafe@4.7.1
+system.runtime.compilerservices.unsafe@5.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.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.6.0
+system.security.accesscontrol@4.7.0
+system.security.accesscontrol@6.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.cng@4.7.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.pkcs@4.7.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@4.7.0
+system.security.cryptography.protecteddata@6.0.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.cryptography.xml@4.7.0
+system.security.permissions@4.7.0
+system.security.permissions@6.0.0
+system.security.principal.windows@4.3.0
+system.security.principal.windows@4.6.0
+system.security.principal.windows@4.7.0
+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.json@4.7.0
+system.text.json@5.0.2
+system.text.regularexpressions@4.1.0
+system.text.regularexpressions@4.3.0
+system.threading.channels@4.7.1
+system.threading.tasks.dataflow@4.9.0
+system.threading.tasks.extensions@4.0.0
+system.threading.tasks.extensions@4.3.0
+system.threading.tasks.extensions@4.5.3
+system.threading.tasks.extensions@4.5.4
+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
+system.windows.extensions@4.7.0
+system.windows.extensions@6.0.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
+tomlyn@0.16.2
+validation@2.4.18
+xunit.abstractions@2.0.2
+xunit.abstractions@2.0.3
+xunit.analyzers@0.10.0
+xunit.analyzers@1.0.0
+xunit.assert@2.4.1
+xunit.assert@2.4.2
+xunit.assertmessages@2.4.0
+xunit.core@2.4.1
+xunit.core@2.4.2
+xunit.extensibility.core@2.4.0
+xunit.extensibility.core@2.4.1
+xunit.extensibility.core@2.4.2
+xunit.extensibility.execution@2.4.0
+xunit.extensibility.execution@2.4.1
+xunit.extensibility.execution@2.4.2
+xunit.runner.visualstudio@2.4.3
+xunit.runner.visualstudio@2.5.1
+xunit.skippablefact@1.4.8
+xunit@2.4.1
+xunit@2.4.2
+"
+
+inherit check-reqs dotnet-pkg edo java-pkg-2 multiprocessing python-any-r1 optfeature
+
+DESCRIPTION="Dafny is a verification-aware programming language"
+HOMEPAGE="https://dafny.org/
+	https://github.com/dafny-lang/dafny/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/dafny-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/dafny-lang/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+="
+	${NUGET_URIS}
+	test? (
+		https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-lang/dafny-bin
+	>=virtual/jre-1.8:*
+	sci-mathematics/z3
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+BDEPEND="
+	${RDEPEND}
+	dev-dotnet/coco
+	test? (
+		${PYTHON_DEPS}
+		>=dev-lang/boogie-3.1.6
+		dev-go/go-tools
+		dev-lang/go
+		dev-python/OutputCheck
+		dev-python/lit
+		dev-python/psutil
+		net-libs/nodejs[npm]
+	)
+"
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=( "${S}/Source/Dafny/Dafny.csproj" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.12.0-DafnyCore-csproj.patch"
+	"${FILESDIR}/${PN}-3.12.0-DafnyRuntime-csproj.patch"
+	"${FILESDIR}/${PN}-4.5.0-lit-config.patch"
+)
+
+DOCS=(
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	NOTICES.txt
+	README.md
+	RELEASE_NOTES.md
+	docs/DafnyCheatsheet.pdf
+	docs/DafnyRef/out/DafnyRef.pdf
+)
+
+TEST_S="${S}/Source/IntegrationTests/TestFiles/LitTests/LitTest"
+
+pkg_setup() {
+	# Clean the environment.
+	unset NPM_CONFIG_USERCONFIG
+
+	if [[ -n "${_JAVA_OPTIONS}" ]] ; then
+		ewarn "Cleaning _JAVA_OPTIONS because when set compile and test may fail"
+
+		unset _JAVA_OPTIONS
+	fi
+
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+	java-pkg-2_pkg_setup
+
+	# We need to set up Python only for running test tools (called via lit).
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# Unpack manually to skip additional archives, eg "bignumber.js".
+
+	nuget_link-system-nugets
+	nuget_link-nuget-archives
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	else
+		unpack "${P}.tar.gz"
+	fi
+}
+
+src_prepare() {
+	# Using "for-each-compiler" will fail because of Cargo requiring network access.
+	while read -r test_file ; do
+		if grep "// RUN: %testDafnyForEachCompiler" "${test_file}" >/dev/null ; then
+			rm "${test_file}" || die "failed to remove test ${bad_test}"
+		fi
+	done < <(find "${TEST_S}" -type f -name "*.dfy")
+
+	# Remove bad tests (recursive).
+	local -a bad_tests=(
+		# Unsupported test build (and those that need network access):
+		comp/rust
+
+		# Following tests fail:
+		VSComp2010/Problem2-Invert.dfy
+		ast/function.dfy
+		auditor/TestAuditor.dfy
+		benchmarks/sequence-race/SequenceRace.dfy
+		c++/extern.dfy
+		c++/functions.dfy
+		c++/tuple.dfy
+		cli/measure-complexity.dfy
+		cli/projectFile/projectFile.dfy
+		cli/runArgument.dfy
+		comp/CoverageReport.dfy
+		comp/Libraries/consumer.dfy
+		concurrency/06-ThreadOwnership.dfy
+		dafny0/CoinductiveProofs.dfy
+		dafny0/Fuel.legacy.dfy
+		dafny0/Stdin.dfy
+		dafny0/SubsetTypes.dfy
+		dafny1/MoreInduction.dfy
+		dafny4/Lucas-up.legacy.dfy
+		dafny4/Primes.dfy
+		doofiles/allowWarningsDoo.dfy
+		doofiles/semanticOptions.dfy
+		doofiles/standardLibraryOptionMismatch.dfy
+		examples/Simple_compiler/Compiler.dfy
+		exports/ExportRefinement.dfy
+		exports/IncludeSkipTranslate.dfy
+		git-issues/git-issue-2026.dfy
+		git-issues/git-issue-2299.dfy
+		git-issues/git-issue-2301.dfy
+		git-issues/git-issue-3855.dfy
+		git-issues/git-issue-505.dfy
+		gomodule/multimodule/DerivedModule.dfy
+		gomodule/singlemodule/dafnysource/helloworld.dfy
+		lambdas/MatrixAssoc.dfy
+		metatests/InconsistentCompilerBehavior.dfy
+		metatests/TestBeyondVerifierExpect.dfy
+		printing/ModulePrint.dfy
+		pythonmodule/multimodule/DerivedModule.dfy
+		pythonmodule/nestedmodule/SomeTestModule.dfy
+		pythonmodule/singlemodule/dafnysource/helloworld.dfy
+		separate-verification/assumptions.dfy
+		server/counterexample_none.transcript
+		triggers/emptyTrigger.dfy
+		unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy
+		unicodecharsFalse/comp/Print.dfy
+		verification/isolate-assertions.dfy
+		verification/outOfResourceAndIsolateAssertions.dfy
+		verification/progress.dfy
+		vstte2012/Combinators.dfy
+		wishlist/exists-b-exists-not-b.dfy
+
+		# Following tests are very slow:
+		DafnyTests/RunAllTests/RunAllTestsOption.dfy
+		VSI-Benchmarks/b4.dfy
+		blogposts/TestGenerationNoInliningEnumerativeDefinitions.dfy
+		comp/BranchCoverage.dfy
+		comp/CompileWithArguments.dfy
+		comp/Extern.dfy
+		comp/ExternCtors.dfy
+		comp/MainMethod.dfy
+		comp/Print.dfy
+		comp/SequenceConcatOptimization.dfy
+		comp/compile1quiet/CompileRunQuietly.dfy
+		comp/compile1verbose/CompileAndThenRun.dfy
+		comp/compile3/JustRun.dfy
+		comp/manualcompile/ManualCompile.dfy
+		comp/replaceables/complex/user.dfy
+		concurrency/07-CounterThreadOwnership.dfy
+		concurrency/08-CounterNoTermination.dfy
+		concurrency/09-CounterNoStateMachine.dfy
+		concurrency/10-SequenceInvariant.dfy
+		concurrency/12-MutexLifetime-short.dfy
+		dafny0/ModuleInsertion.dfy
+		dafny0/NoTypeArgs.dfy
+		dafny0/RlimitMultiplier.dfy
+		dafny1/ExtensibleArray.dfy
+		dafny1/ExtensibleArrayAuto.dfy
+		dafny1/SchorrWaite.dfy
+		dafny2/SnapshotableTrees.dfy
+		dafny4/git-issue250.dfy
+		git-issues/git-issue-Main4.dfy
+		git-issues/git-issue-MainE.dfy
+		separate-verification/app.dfy
+		unicodecharsFalse/comp/CompileWithArguments.dfy
+		unicodecharsFalse/expectations/Expect.dfy
+		unicodecharsFalse/expectations/ExpectAndExceptions.dfy
+		unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy
+		verification/filter.dfy
+	)
+	local bad_test
+	for bad_test in "${bad_tests[@]}" ; do
+		if [[ -e "${TEST_S}/${bad_test}" ]] ; then
+			rm -r "${TEST_S}/${bad_test}" || die "failed to remove test ${bad_test}"
+		else
+			ewarn "Test file ${bad_test} does not exist"
+		fi
+	done
+
+	dotnet-pkg_src_prepare
+
+	# Update lit's "lit.site.cfg" file.
+	local dotnet_exec="${DOTNET_PKG_EXECUTABLE} exec ${DOTNET_PKG_OUTPUT}"
+	local lit_config="${TEST_S}/lit.site.cfg"
+
+	sed -i "${lit_config}" \
+		-e "/^defaultDafnyExecutable/s|=.*|= '${dotnet_exec}/Dafny.dll '|" \
+		-e "/^dafnyExecutable/s|=.*|= '${dotnet_exec}/Dafny.dll '|" \
+		-e "/^defaultServerExecutable/s|=.*|= '${dotnet_exec}/DafnyServer.dll'|" \
+		-e "/^serverExecutable/s|=.*|= '${dotnet_exec}/DafnyServer.dll'|" \
+		-e "s|dotnet run |${DOTNET_PKG_EXECUTABLE} run |g" \
+		|| die "failed to update ${lit_config}"
+}
+
+src_compile () {
+	einfo "Building DafnyRuntimeJava JAR."
+	local dafny_runtime_java="${S}/Source/DafnyRuntime/DafnyRuntimeJava"
+	mkdir -p "${dafny_runtime_java}/build/libs/" || die
+	pushd "${dafny_runtime_java}/build" || die
+
+	ejavac -d ./ $(find "${dafny_runtime_java}/src/main" -type f -name "*.java")
+	edo jar cvf "DafnyRuntime-4.6.0.jar" dafny/*
+
+	cp "DafnyRuntime-4.6.0.jar" "${dafny_runtime_java}/build/libs/" || die
+	popd || die
+
+	# Build main dotnet package.
+	dotnet-pkg_src_compile
+
+	# Build "TestDafny" without saving artifacts.
+	if use test ; then
+		local build_test_opts=(
+			--configuration Debug
+			--no-self-contained
+			-maxCpuCount:$(makeopts_jobs)
+		)
+		edotnet build "${build_test_opts[@]}" "${S}/Source/TestDafny/TestDafny.csproj"
+	fi
+}
+
+src_test() {
+	# Dafny GOLang transpiler tests need "goimports" from "/usr/lib/go/bin".
+	local -x PATH="${EPREFIX}/usr/lib/go/bin:${PATH}"
+
+	einfo "Installing bignumber.js package required for tests using NodeJS."
+	local -a npm_opts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--offline
+		--progress false
+		--verbose
+	)
+	edob npm "${npm_opts[@]}" install "${DISTDIR}/bignumber.js-9.1.2.tgz"
+
+	einfo "Starting tests using the lit test tool."
+	local -a lit_opts=(
+		--order=lexical
+		--time-tests
+		--timeout 1800          # Let one test take no mere than half a hour.
+		--verbose
+		--workers="$(makeopts_jobs)"
+	)
+	edo lit "${lit_opts[@]}" "${TEST_S}"
+}
+
+src_install() {
+	dotnet-pkg-base_install
+
+	local -a dafny_exes=(
+		Dafny
+		DafnyDriver
+		DafnyLanguageServer
+		DafnyServer
+		TestDafny
+	)
+	local dafny_exe
+	for dafny_exe in "${dafny_exes[@]}" ; do
+		dotnet-pkg-base_dolauncher "/usr/share/${P}/${dafny_exe}" "${dafny_exe}"
+	done
+
+	dosym -r /usr/bin/Dafny /usr/bin/dafny
+	dosym -r /usr/bin/DafnyServer /usr/bin/dafny-server
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "Dafny GO language backend" dev-go/go-tools
+	optfeature "Dafny Rust language backend" virtual/rust
+}
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 1cdc4f07da79..d50572be0f1c 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,4 +1,3 @@
-DIST eisl-4.00.tar.gz 2299966 BLAKE2B fe2d4e486d459866870b0baa23d2eb32890e1661460116508bd18aa401ec71cb68395bf857c98ba749005dcfd0985ab628274800a32e749abf27a767a2ce8615 SHA512 0b4d225f6068a9ff05c6483663b68ae920a1f63e30b47e7350243a70902ae7f5818cf4713fdd45c223e858a4e435d5e93f0944965af1db3f8d9d48f0e2db8239
-DIST eisl-5.00.tar.gz 2995464 BLAKE2B ecfc577df2e2b470845a0f3cbaa646408b8d5ec72c0b0e86263c443d6cf0aad0401d7f70e826db71ba824f7659fb4620a83aa81840e2c1b7822c97ada5212d86 SHA512 c82aaac0a9878f33abfe5edd54a37884965a00e6f37e901f81e49537afe8a4891343096d6089058c8ce0df4e8cc89f1f6c179f97eb950e45b949e95d9e094ddf
 DIST eisl-5.10.tar.gz 2994605 BLAKE2B 6e877db145fe086118975f1c81537e6c2e6dc28c24a59a155c4549e99a72e554f03c8167610564292446e44e3882a176a69fee681c6c3dc3adebe5b775ad321c SHA512 b600946df1472ea632d497ddd4cd58fb5940da4a917652c792460cb3d3fa4390c3b80457afd46bceefe2873691d885c92bdb931df8579d4b24b948ae4e504d05
 DIST eisl-5.25.tar.gz 3091474 BLAKE2B 61a41005481b604d130261b14418c464418f4e2db92f507e6f9f91b7af84555130ac1cf886e8ae72d12827a95423e5a000ac20e8ccabd7de412b42a1ddcacf3d SHA512 1e18024b9bc2dd9964cb37a6ad645dd2af9c913f5d217a75384a8fe60aca910b3421380004d9cb51fbaf8f3439493a1626cabc2076471758737bd2edf07e55c9
+DIST eisl-5.30.tar.gz 3134700 BLAKE2B b4879e63ca3f2e11385973a3534110ffa8388e7db63d862b443077cd3c3ad71c80b08f14b10605e1ba504de880eb4f2b57f4dfcff1d0910fbea3dc35af9626e6 SHA512 b306ac92b6c807fa3240507d3c80d0e844a1f6141dfcdd42b6b1e2da8efee2940f517b390624b36ddb2f08e804375b95db6b2d45a4bbb0a9486651b4f2f576f4
diff --git a/dev-lang/eisl/eisl-4.00.ebuild b/dev-lang/eisl/eisl-4.00.ebuild
deleted file mode 100644
index 1e6288f65690..000000000000
--- a/dev-lang/eisl/eisl-4.00.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.00.ebuild b/dev-lang/eisl/eisl-5.00.ebuild
deleted file mode 100644
index 1e6288f65690..000000000000
--- a/dev-lang/eisl/eisl-5.00.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.10.ebuild b/dev-lang/eisl/eisl-5.10.ebuild
index 0ef48728bee1..1e6288f65690 100644
--- a/dev-lang/eisl/eisl-5.10.ebuild
+++ b/dev-lang/eisl/eisl-5.10.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-lang/eisl/eisl-5.30.ebuild b/dev-lang/eisl/eisl-5.30.ebuild
new file mode 100644
index 000000000000..0ef48728bee1
--- /dev/null
+++ b/dev-lang/eisl/eisl-5.30.ebuild
@@ -0,0 +1,52 @@
+# 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/execline/Manifest b/dev-lang/execline/Manifest
index bf54495faacb..c666e1526d7a 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,2 +1 @@
-DIST execline-2.9.5.1.tar.gz 110874 BLAKE2B bef3cb560f00c01c96065429220017315edc8378403c73e4a0edba67ee248f76ca849cd8a107756251db9844d3ac650259b33db2f93abc1c7aa4f68995b5b624 SHA512 11bfd825b0b72cba118eff9ecb97672d0c015e0bd50c7c8f83e101ee41c323b3a3c82e42fed75b6bc65ab6edb85a8bbeef8900b594cf651825b6313a5123c88f
 DIST execline-2.9.6.0.tar.gz 111660 BLAKE2B 42baed36228b1e6a370d6d4c18829be7f517812ce9e3838e5b102d0fe58ac48ecd84f17caef89e9a07b3b149ed9b38b3b00f7eef810c231995c8e5ecbf07a770 SHA512 1c5233b0f17b4c92ab2e9e8700b47c8429ad97962bcb7c83190d0b3251b26584e591d77418eca77e8112cdecd24eec50aaca7da1dbb506120931bbda39f2b7cb
diff --git a/dev-lang/execline/execline-2.9.5.1.ebuild b/dev-lang/execline/execline-2.9.5.1.ebuild
deleted file mode 100644
index 25e4a9c495bd..000000000000
--- a/dev-lang/execline/execline-2.9.5.1.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 toolchain-funcs
-
-DESCRIPTION="A non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2).4"
-KEYWORDS="~alpha amd64 arm ~mips ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	optfeature "man pages" app-doc/execline-man-pages
-}
diff --git a/dev-lang/fuzion/Manifest b/dev-lang/fuzion/Manifest
index 9be9a00de6dc..429e6db3ff78 100644
--- a/dev-lang/fuzion/Manifest
+++ b/dev-lang/fuzion/Manifest
@@ -1,2 +1,3 @@
 DIST fuzion-0.086.tar.gz 994894 BLAKE2B e698ea7b8de215c55e84e0f55f405156d5c386c1001c7b29e0c7c49e7a7e7babf7cb64cf30726a24aa7b6ccdc0eaf01cc543867361e2554f258d76be1fc08b97 SHA512 6d2df12d1dced9c5a61bb183767fc205ddbc0d04db8cae3f5e3eabd9ab60f18b3c2b3fa8f57702dc792882b1a6f79da1cfcb7801d84ecc2cff1844a4bc226f67
 DIST fuzion-0.088.tar.gz 1123270 BLAKE2B 3d68c136a862c02955b4a15e6cfe4d41a63a106c47289f7fdfe0af2b0119ebe26cbd9c6920c8b5311c756264bdd33d46f4b1108869427f83d55a350c2ab52e6f SHA512 b0fb1ea4175912684b4759ec58a91bc25d963fa2fa6234116fa91a63d757d9af5da9e20a3fdcc340fe956c01026d4b74c7a12dac40a0b7826d74c567b4e3383a
+DIST fuzion-0.089.tar.gz 1235399 BLAKE2B b6814b9032e06481c4801c4519423f5019febb46390596941d3811fd053ceab66b3612cd6185fbda71eb14a6b1299bca80b572f27f90729a3713aad3ec1f675d SHA512 4eb7389c4346f15a8a75344d448f6ec35ae91615daba57a8cc2f220a7f6827fcf1de569da2dcf573f8a645640e3f2cb8e2c2a4acd9ad83fd83deca2addd75bdc
diff --git a/dev-lang/fuzion/fuzion-0.089.ebuild b/dev-lang/fuzion/fuzion-0.089.ebuild
new file mode 100644
index 000000000000..92e01df35d36
--- /dev/null
+++ b/dev-lang/fuzion/fuzion-0.089.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A language with a focus on simplicity, safety and correctness"
+HOMEPAGE="https://fuzion-lang.dev/
+	https://github.com/tokiwa-software/fuzion/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/tokiwa-software/${PN}.git"
+else
+	SRC_URI="https://github.com/tokiwa-software/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/jre-21:*
+	dev-libs/boehm-gc
+"
+DEPEND="
+	virtual/jdk:21
+"
+BDEPEND="
+	test? (
+		sys-devel/clang:*
+	)
+"
+
+DOCS=( README.md release_notes.md )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Remove bad tests.
+	local -a bad_tests=(
+		basicIntegers
+		nom
+		onesCount
+		process
+		reg_issue3178
+		sockets
+	)
+	local bad_test
+	for bad_test in "${bad_tests[@]}" ; do
+		rm -r "${S}/tests/${bad_test}" || die "failed to remove test ${bad_tests}"
+	done
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 run_tests_parallel
+}
+
+src_install() {
+	# Remove unnecessary files from build directory. bug #893450
+	local toremove
+	local toremove_path
+	for toremove in tests run_tests.{failures,results} ; do
+		toremove_path="${S}/build/${toremove}"
+
+		if [[ -e "${toremove_path}" ]] ; then
+			rm -r "${toremove_path}" || die "failed to remove ${toremove_path}"
+		fi
+	done
+
+	insinto "/usr/share/${PN}"
+	doins -r build/.
+	insopts -m755
+	doins -r build/bin
+
+	local exe
+	for exe in fz fzjava ; do
+		dosym -r "/usr/share/${PN}/bin/${exe}" "/usr/bin/${exe}"
+	done
+
+	einstalldocs
+}
diff --git a/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild b/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild
index 9762d540b63f..cb842b4a31b1 100644
--- a/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild
+++ b/dev-lang/gprolog/gprolog-1.5.0-r1.ebuild
@@ -16,9 +16,11 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug doc examples"
 
 PATCHES=(
+	# https://github.com/didoudiaz/gprolog/commit/0ba64c81255e910d68be2191fd1e688801320db8
 	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${P}-links.patch
 	"${FILESDIR}"/${P}-destdir.patch
+
 	"${FILESDIR}"/${P}-llvm-as.patch
 )
 
@@ -30,6 +32,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# src/EnginePl/wam_archi.h:64:33: error: global register variable follows a function definition
+	# https://bugs.gentoo.org/855599
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68384
+	filter-lto
+
 	CFLAGS_MACHINE="$(get-flag -march) $(get-flag -mcpu) $(get-flag -mtune)"
 
 	use debug && append-flags -DDEBUG
diff --git a/dev-lang/jimtcl/jimtcl-0.82.ebuild b/dev-lang/jimtcl/jimtcl-0.82.ebuild
index fab5f1582f64..1c673257d9a8 100644
--- a/dev-lang/jimtcl/jimtcl-0.82.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.82.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/msteveb/jimtcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~m68k ~mips ~s390 x86"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/dev-lang/julia/julia-1.8.3-r4.ebuild b/dev-lang/julia/julia-1.8.3-r4.ebuild
index c21a564cc460..997f4870446f 100644
--- a/dev-lang/julia/julia-1.8.3-r4.ebuild
+++ b/dev-lang/julia/julia-1.8.3-r4.ebuild
@@ -88,6 +88,10 @@ src_unpack() {
 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
@@ -106,9 +110,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #855602
-	filter-lto
-
 	# 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
diff --git a/dev-lang/julia/julia-1.8.5-r1.ebuild b/dev-lang/julia/julia-1.8.5-r1.ebuild
index c38278524dae..5c62824bd624 100644
--- a/dev-lang/julia/julia-1.8.5-r1.ebuild
+++ b/dev-lang/julia/julia-1.8.5-r1.ebuild
@@ -121,6 +121,10 @@ src_unpack() {
 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
@@ -146,9 +150,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #855602
-	filter-lto
-
 	# 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
diff --git a/dev-lang/julia/julia-1.9.0.ebuild b/dev-lang/julia/julia-1.9.0.ebuild
index 6dfef422bd55..d1c6e722a101 100644
--- a/dev-lang/julia/julia-1.9.0.ebuild
+++ b/dev-lang/julia/julia-1.9.0.ebuild
@@ -101,6 +101,10 @@ src_unpack() {
 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
@@ -126,9 +130,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #855602
-	filter-lto
-
 	# 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
diff --git a/dev-lang/julia/julia-1.9.4.ebuild b/dev-lang/julia/julia-1.9.4.ebuild
index 82e0fb7987d9..9a747305e8d0 100644
--- a/dev-lang/julia/julia-1.9.4.ebuild
+++ b/dev-lang/julia/julia-1.9.4.ebuild
@@ -91,6 +91,10 @@ src_unpack() {
 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
@@ -109,9 +113,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #855602
-	filter-lto
-
 	# 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
diff --git a/dev-lang/kotlin-bin/Manifest b/dev-lang/kotlin-bin/Manifest
index a7bd4fa9f2e4..323e2b9451f3 100644
--- a/dev-lang/kotlin-bin/Manifest
+++ b/dev-lang/kotlin-bin/Manifest
@@ -1,2 +1,2 @@
-DIST kotlin-compiler-2.0.0.zip 83767523 BLAKE2B 4627ec2ccf0751baee141a980f14bace98a96b4f826b72f001dc2e27afe1fa60b3967e533e775f7dd81a5e682670cd38c02378884a2d543caca050aee519e765 SHA512 ca723146188a60a995089d4b06bb23c83bfb2dbaabbbad632921601babbccddf4e3f0519692018480b7a0a7a1d0ce3002dcb6f4a445dc2dfa2a2b8f4e39364c7
 DIST kotlin-compiler-2.0.10.zip 83745882 BLAKE2B acd359e348fdb8fbb339a2fcd5fedb165990cc366f0c717644360267aa161e96b8813e0569a0ebc8f2d5de65f25c780c733b6b50c14e8b943344c31a492f0534 SHA512 ba0eac447eb62726604fe9f0d563b1fa8d23001f3ed6053954269e3f342886533a1fa2a8fc4d8f1e7aaae7b94db96a72f195f2b886eb7a50d1e6c25ac80ba106
+DIST kotlin-compiler-2.0.20.zip 86110157 BLAKE2B 601e6d8b0ac3af3b8b0b2ddc87bb8ab2d69769e9f3d217c1be317874bfd77a8b767fd84c315637b48782393326bc3b1abc875d1293b3766dc03a0216d26cddf0 SHA512 07bb47339813d127783b2ddfd52635dd483744f1821c8b95075698f37c506e0b66c7abb3d9ab183ba957fe07b4ce1a34b9be2c4477ca0e9115feacab8380bba7
diff --git a/dev-lang/kotlin-bin/kotlin-bin-2.0.0.ebuild b/dev-lang/kotlin-bin/kotlin-bin-2.0.20.ebuild
index 7e3629cfadfc..7e3629cfadfc 100644
--- a/dev-lang/kotlin-bin/kotlin-bin-2.0.0.ebuild
+++ b/dev-lang/kotlin-bin/kotlin-bin-2.0.20.ebuild
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index c8ba66d29edc..33ca431b04d2 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,3 +1 @@
-DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a SHA512 4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff
-DIST luajit-2.1.0_beta3_p20220613.tar.gz 1074088 BLAKE2B dbcfd4efcffb9b659a85af753017da5ca9b95e89a03dfe4e594513f2ad09b08e19a862527d41bd5adf8473afd022a471176ff5412975af47bdd785b9b9cfd43b SHA512 e4fc6ebde9cd9efc5e9936416526a0f581186bf0661eca60a50bcf5048312e02f66dc905308d63abda03380c33aa2e64ceddd87527d59a4488ae7f4aeaf36dfe
 DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a SHA512 6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
deleted file mode 100644
index ceef227070dc..000000000000
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=1d7b5029c5ba36870d25c67524034d452b761d27
-
-# Upstream don't make releases anymore and instead have a (broken) "rolling git tag"
-# model.
-#
-# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583
-# https://www.freelists.org/post/luajit/LuaJIT-uses-rolling-releases
-#
-# Regular snapshots should be made from the v2.1 branch.
-
-inherit pax-utils toolchain-funcs
-
-MY_PV="$(ver_cut 1-5)"
-MY_PV="${MY_PV/_beta/-beta}"
-MY_P="LuaJIT-${MY_PV}"
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="https://luajit.org/"
-# SRC_URI="https://luajit.org/download/${MY_P}.tar.gz"
-SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2/${PV}"
-KEYWORDS="amd64 arm arm64 -hppa ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat static-libs"
-
-S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
-
-_emake() {
-	emake \
-		Q= \
-		PREFIX="${EPREFIX}/usr" \
-		MULTILIB="$(get_libdir)" \
-		DESTDIR="${D}" \
-		CFLAGS="" \
-		LDFLAGS="" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \
-		HOST_LDFLAGS="${BUILD_LDFLAGS}" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
-		TARGET_LDFLAGS="${LDFLAGS}" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		BUILDMODE="$(usex static-libs mixed dynamic)" \
-		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-		"$@"
-}
-
-src_compile() {
-	tc-export_build_env
-	_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
-}
-
-src_install() {
-	_emake install
-	dosym luajit-2.1.0-beta3 /usr/bin/luajit
-	pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
-
-	HTML_DOCS="doc/." einstalldocs
-}
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
deleted file mode 100644
index 01c4aca8c65c..000000000000
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=0065cff7e0222c234b75a71e72b8883df5d000c2
-
-# Upstream don't make releases anymore and instead have a (broken) "rolling git tag"
-# model.
-#
-# https://github.com/LuaJIT/LuaJIT/issues/665#issuecomment-784452583
-# https://www.freelists.org/post/luajit/LuaJIT-uses-rolling-releases
-#
-# Regular snapshots should be made from the v2.1 branch.
-
-inherit pax-utils toolchain-funcs
-
-MY_PV="$(ver_cut 1-5)"
-MY_PV="${MY_PV/_beta/-beta}"
-MY_P="LuaJIT-${MY_PV}"
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="https://luajit.org/"
-# SRC_URI="https://luajit.org/download/${MY_P}.tar.gz"
-SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat static-libs"
-
-S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
-
-src_configure() {
-	tc-export_build_env
-
-	# You need to use a 32-bit toolchain to build for a 32-bit architecture.
-	# Some 64-bit toolchains (like amd64 and ppc64) usually have multilib
-	# enabled, allowing you to build in 32-bit with -m32. This won't work in all
-	# cases, but it will otherwise just break, so it's worth trying anyway. If
-	# you're trying to build for 64-bit from 32-bit, then you're screwed, sorry.
-	# See https://github.com/LuaJIT/LuaJIT/issues/664 for the upstream issue.
-	if tc-is-cross-compiler && [[ $(tc-get-build-ptr-size) != 4 && $(tc-get-ptr-size) == 4 ]]; then
-		BUILD_CFLAGS+=" -m32"
-		BUILD_LDFLAGS+=" -m32"
-	fi
-}
-
-_emake() {
-	emake \
-		Q= \
-		PREFIX="${EPREFIX}/usr" \
-		MULTILIB="$(get_libdir)" \
-		DESTDIR="${D}" \
-		CFLAGS="" \
-		LDFLAGS="" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \
-		HOST_LDFLAGS="${BUILD_LDFLAGS}" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
-		TARGET_LDFLAGS="${LDFLAGS}" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		BUILDMODE="$(usex static-libs mixed dynamic)" \
-		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-		"$@"
-}
-
-src_compile() {
-	_emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
-}
-
-src_install() {
-	_emake install
-	dosym luajit-2.1.0-beta3 /usr/bin/luajit
-	pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
-
-	HTML_DOCS="doc/." einstalldocs
-}
diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml
index edeaec8f16f2..9aaf0f2d3ecc 100644
--- a/dev-lang/luajit/metadata.xml
+++ b/dev-lang/luajit/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!-- maintainer-needed -->
   <use>
     <flag name="lua52compat">
       Enable some upwards-compatible features
diff --git a/dev-lang/luau/Manifest b/dev-lang/luau/Manifest
index 2d919016e42d..5f5a12dbde7f 100644
--- a/dev-lang/luau/Manifest
+++ b/dev-lang/luau/Manifest
@@ -1,5 +1,4 @@
-DIST luau-0.632.tar.gz 1740751 BLAKE2B e6a6da0dd8b599d0c77d01976e58239234deb9ff577d20cc77017e90731b254d5b516032c7927d0dc6d52047259e0715fdbe2c4e888cca775aa0303da9d52e87 SHA512 1fa204965ceea94a96dd879431d10ab33de16ab2d8ebb2d73d866d213246acb2ae9aad0126511c7f4b3a965c115bf3e68d7069b021718d784170acadb20cf645
-DIST luau-0.634.tar.gz 1741026 BLAKE2B ec61c08b8165aca085f9743deee620c2dfb289e59a2c7aa9bb5dd441eaab8a6bfd38eb9295192ace96558e2f209e47752eb7405e9a5c7c645d21694569a0ce7c SHA512 a58e1c1a0eb56d0bd9d656e0420735fa30b58283c4c9f704404db5a51b66361a3ffa98600e6b6d68a6b9e30ccf0879ad43935f9d73295c06ab947dcd2c4d2ac5
 DIST luau-0.635.tar.gz 1748762 BLAKE2B 84d12c0cfc2d70f1a6a029de5c42c3781b9786c8d7994bc4b8c0f762e7f40b805af0e02ad3cb1b2098d3c8f133554b43496d67202515d7b23b1d9fe68cd62e9e SHA512 b574e3a6e466f994772b3dcbc8eced19c2c29ddb4d4195276a1b708bab8c81555e6a78d97f426937062c6ced2c28cdc57ffe60ed1e10f9cba07a3ada35fcf91c
 DIST luau-0.636.tar.gz 1757794 BLAKE2B 3e2e55dbae17c61d34fe2ca81c7198d5e9d5637b9360831361287de6ff21eca60761f6d2c827d9826393f6d5468228eb8a34537318eb042043cd2bd147376a7b SHA512 55899c5132541e5f79232ef083b79d3b7ac8b51a937496a729da4b2bcd2b8cdea1c881529a776a524037f29ea878dc1b97c0dccabef38e8e26fd4426b6d562fd
 DIST luau-0.637.tar.gz 1764323 BLAKE2B 7d02ba7641b576ccadb3ff233d73d6887f26d5c1e812fa3f74fbcdf9d8ead01f13a4a9147469d37b27fdcacc39169b1a139328a1aa6c49325585be5aa3582c0b SHA512 a7e0b6bf57770f026f59d66c1f424a9f292850076a07e203f7ab1296c229cb1541aee556bbc3833adc79f5a77520b4575539ffbd1422c044f59d60886feb917d
+DIST luau-0.640.tar.gz 1769411 BLAKE2B 5ddf7891fff6006a7fcfe796c753b4ad1cd4a926820cb6a1e34a6f9384b0449ec6b8853c7c0951610bb6cc9f4c0f35f58a42a0faa6a15fb44257acd93fa91d96 SHA512 d7298c4e5a0c0fd7481d83aa179e364f5b6491773677a43b3554e171d47d55f43c8c89049e5ec3a4737f255c4b4902c808a4bfb7559d9e311798dca3043afff1
diff --git a/dev-lang/luau/luau-0.632.ebuild b/dev-lang/luau/luau-0.632.ebuild
deleted file mode 100644
index ba40b86df707..000000000000
--- a/dev-lang/luau/luau-0.632.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 cmake
-
-DESCRIPTION="Gradually typed embeddable scripting language derived from Lua"
-HOMEPAGE="https://luau-lang.org/
-	https://github.com/luau-lang/luau/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/luau-lang/${PN}.git"
-else
-	SRC_URI="https://github.com/luau-lang/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DOCS=( CONTRIBUTING.md README.md SECURITY.md )
-
-src_test() {
-	"${BUILD_DIR}/Luau.UnitTest" || die
-	"${BUILD_DIR}/Luau.Conformance" || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe "${BUILD_DIR}"/luau{,-analyze,-ast,-compile,-reduce}
-
-	einstalldocs
-}
diff --git a/dev-lang/luau/luau-0.634.ebuild b/dev-lang/luau/luau-0.634.ebuild
deleted file mode 100644
index ba40b86df707..000000000000
--- a/dev-lang/luau/luau-0.634.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 cmake
-
-DESCRIPTION="Gradually typed embeddable scripting language derived from Lua"
-HOMEPAGE="https://luau-lang.org/
-	https://github.com/luau-lang/luau/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/luau-lang/${PN}.git"
-else
-	SRC_URI="https://github.com/luau-lang/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DOCS=( CONTRIBUTING.md README.md SECURITY.md )
-
-src_test() {
-	"${BUILD_DIR}/Luau.UnitTest" || die
-	"${BUILD_DIR}/Luau.Conformance" || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe "${BUILD_DIR}"/luau{,-analyze,-ast,-compile,-reduce}
-
-	einstalldocs
-}
diff --git a/dev-lang/luau/luau-0.635.ebuild b/dev-lang/luau/luau-0.635.ebuild
index ff2804b115f7..ba40b86df707 100644
--- a/dev-lang/luau/luau-0.635.ebuild
+++ b/dev-lang/luau/luau-0.635.ebuild
@@ -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/luau/luau-0.637.ebuild b/dev-lang/luau/luau-0.637.ebuild
index ff2804b115f7..ba40b86df707 100644
--- a/dev-lang/luau/luau-0.637.ebuild
+++ b/dev-lang/luau/luau-0.637.ebuild
@@ -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/luau/luau-0.640.ebuild b/dev-lang/luau/luau-0.640.ebuild
new file mode 100644
index 000000000000..ff2804b115f7
--- /dev/null
+++ b/dev-lang/luau/luau-0.640.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Gradually typed embeddable scripting language derived from Lua"
+HOMEPAGE="https://luau-lang.org/
+	https://github.com/luau-lang/luau/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/luau-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/luau-lang/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DOCS=( CONTRIBUTING.md README.md SECURITY.md )
+
+src_test() {
+	"${BUILD_DIR}/Luau.UnitTest" || die
+	"${BUILD_DIR}/Luau.Conformance" || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "${BUILD_DIR}"/luau{,-analyze,-ast,-compile,-reduce}
+
+	einstalldocs
+}
diff --git a/dev-lang/mlton/metadata.xml b/dev-lang/mlton/metadata.xml
index b6e787edaff3..4b9fb56b4de7 100644
--- a/dev-lang/mlton/metadata.xml
+++ b/dev-lang/mlton/metadata.xml
@@ -14,5 +14,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mlton</remote-id>
+		<remote-id type="github">MLton/mlton</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index 22cd719e8d45..44e66eaa657c 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs multibuild pax-utils
+inherit check-reqs flag-o-matic multibuild pax-utils
 
 DESCRIPTION="Standard ML optimizing compiler and libraries"
 BASE_URI="https://downloads.sourceforge.net/${PN}"
@@ -172,6 +172,10 @@ src_prepare() {
 }
 
 mlton_src_compile() {
+	# produces invalid codegen for twelf
+	# https://bugs.gentoo.org/863266
+	filter-lto
+
 	if [[ ${MULTIBUILD_VARIANT} == $(mlton_bootstrap_variant) ]]; then
 		emake -j1 \
 			"bootstrap-smlnj" \
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 213a514588f1..72da53b8ad76 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,3 +1,3 @@
-DIST MoarVM-2024.02.tar.gz 14951164 BLAKE2B 9416cea0b454b29c6d5662090428d790ea437bca1814a084a2c1478268c0eb74764205bca892b5e8de820b2201df154b92503e6243eb4a927a822374a5c09f86 SHA512 e629edb3fb365fd4cd988d9c08d46ecaf002156452e22c3a0c716641eeadb5b7f0434de4e2ec3ce9c8dc354280dc419d716382c160d400ba3970decffc996ed8
 DIST MoarVM-2024.04.tar.gz 14953770 BLAKE2B d6ea26bb98a1a6b2c3e6f0184a70c670830eb0872238779e9ce763f8c798bce803db4c5ba488c3f18bf5cf65a8d529fea9268a270458a33fff21ce10c74ee206 SHA512 874b22347fce3018884733ef734db0f09faae89191c2d37d7a15a897f8ce88ed9fbbd69768267492e6d1f019035ad224eef844b75e0fc1634cffd4b059314af1
 DIST MoarVM-2024.05.tar.gz 14956570 BLAKE2B b4a6516dacf871e8c0fb9eb7813322310f038394225f574bd69096c14448f53c5be82eb8b4207361f55c804e165c17b9d63f78efa821d523e3195a31239a8c9f SHA512 703c1418ebf587bf16173e5711f41d8079ea605731505f5699590d3b355e3a54921a7cbab1bd22a2253ba4c79ef4b92f9989646b065239fb9e8450c352fd4f2e
+DIST MoarVM-2024.08.tar.gz 14993560 BLAKE2B 0e37a13fbb7fe4ef0959b64615b99d94721873d7257e7a26dd49013523a3956e83e12a33468560155b37446b859c0d77f87f1cb816de469d9916b1c4e57f3af5 SHA512 b1e3d0b067d4e685d4978962f9008d28e0cad960f55b373f6f3a13df35b8865da9301f0a2b67f9a0d8222a6d5500fce474168ecdf2837c3dc21e04fcb3211bfc
diff --git a/dev-lang/moarvm/moarvm-2024.02.ebuild b/dev-lang/moarvm/moarvm-2024.08.ebuild
index e437c851b138..e437c851b138 100644
--- a/dev-lang/moarvm/moarvm-2024.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2024.08.ebuild
diff --git a/dev-lang/mozart-stdlib/Manifest b/dev-lang/mozart-stdlib/Manifest
deleted file mode 100644
index 740685a3e6ac..000000000000
--- a/dev-lang/mozart-stdlib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mozart-stdlib-2.0.1-gentoo-patchset-0.tar.gz 1237 BLAKE2B c18fbaba2860faed1ab1b53cc9ead90af338da8fc673c08e167463c784e1b31ec9b6edadb1a55cf70d25f545e88fa226ccec313df09f1ecaa16eb619f9242b8d SHA512 84f2c44124901f63ee11706cdd573b2f6a4eb8427d12560be8f0772bb872ca9f5a14ad3f047ce64da8060188f21ccf774b1866ecc439381294822c6d9a41f2eb
-DIST mozart2-stdlib-2.0.1.tar.gz 1315353 BLAKE2B b2bd25634dc9194af6dc5e23da369515b3a55e0b23bf6d1bf312d0b8eb9f92eee732ea9cf14ebd659e0e296f77c1b1cffa13a74885279bfc5fc0be5d583fd8c3 SHA512 8bb481b00cd9b62aef348dba9e905b3210d1a2fd219cf561d7d243dc0ead135d3ca53378a5945deedfc67ae076ca72008dd098f4a326f00992764123b682f79c
diff --git a/dev-lang/mozart-stdlib/metadata.xml b/dev-lang/mozart-stdlib/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/dev-lang/mozart-stdlib/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-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
deleted file mode 100644
index 933aec7b6d3d..000000000000
--- a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=mozart2-stdlib
-inherit cmake
-
-PATCHSET_VER="0"
-
-DESCRIPTION="The Mozart Standard Library"
-HOMEPAGE="http://mozart2.org/"
-SRC_URI="https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${MY_PN}-${PV}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="Mozart"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mozart-2.0.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	cmake_src_prepare
-}
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
deleted file mode 100644
index 15998cc09177..000000000000
--- a/dev-lang/mozart/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mozart-2.0.1-gentoo-patchset-2.tar.gz 39435 BLAKE2B 18fe6f6e0d81d3b7901c73df567d79b6d8d8564bc49eb10dace2669de1448672a48dc0c509afbb5c506e8af65902ce36cb30f48c7fa26b6aa49cc09988218d42 SHA512 407da6fae39734097ab22fec5bc97ad1beb9103b13484ee0429a40a8f5803f6ed2abd2a64cfb56ccdddf9f82a2d9cd0883fe0a8f8a94bee963590606e1667127
-DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4
diff --git a/dev-lang/mozart/files/50mozart-gentoo.el b/dev-lang/mozart/files/50mozart-gentoo.el
deleted file mode 100644
index 3533d49d693b..000000000000
--- a/dev-lang/mozart/files/50mozart-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; mozart site-lisp configuration
-
-(or (getenv "OZHOME")
-    (setenv "OZHOME" "/usr"))
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'run-oz' "oz" "Start Mozart as a sub-process" t)
-(autoload 'oz-mode "oz" "Major mode for editing Oz code." t)
-(autoload 'oz-gump-mode "oz"
-  "Major mode for editing Oz code with embedded Gump specifications." t)
-(autoload 'ozm-mode "mozart" "Major mode for displaying Oz machine code." t)
-(add-to-list 'auto-mode-alist '("\\.oz$" . oz-mode))
-(add-to-list 'auto-mode-alist '("\\.ozg$" . oz-gump-mode))
-(add-to-list 'auto-mode-alist '("\\.ozm$" . ozm-mode))
diff --git a/dev-lang/mozart/metadata.xml b/dev-lang/mozart/metadata.xml
deleted file mode 100644
index 16ef0f221f64..000000000000
--- a/dev-lang/mozart/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-needed -->
-	<upstream>
-		<remote-id type="github">mozart/mozart2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-lang/mozart/mozart-2.0.1-r1.ebuild b/dev-lang/mozart/mozart-2.0.1-r1.ebuild
deleted file mode 100644
index a575d07c66a9..000000000000
--- a/dev-lang/mozart/mozart-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake elisp-common java-pkg-2 java-ant-2
-
-PATCHSET_VER="2"
-
-DESCRIPTION="Advanced development platform for intelligent, distributed applications"
-HOMEPAGE="http://mozart2.org/"
-SRC_URI="https://github.com/mozart/mozart2/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-S="${WORKDIR}/${PN}2-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/gmp:0
-	dev-lang/tcl:0
-	dev-lang/tk:0
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-# https://bugs.gentoo.org/916882 restrict to <=virtual/jdk-17:*
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.10.14-r3:0
-	<=virtual/jdk-17:*
-	dev-lang/scala:2.12
-	test? ( dev-cpp/gtest:= )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-
-	touch stdlib/CMakeLists.txt || die
-	touch vm/vm/test/gtest/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZART_BOOST_USE_STATIC_LIBS=OFF
-		-DEMACS=$(usex emacs "/usr/bin/emacs" "")
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH="scala:2.12"
-	pushd bootcompiler > /dev/null || die
-	ANT_OPTS="-Xss2M" eant jar
-	popd > /dev/null || die
-
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_build vmtest platform-test
-	cmake_src_test -V
-}
-
-src_install() {
-	cmake_src_install
-
-	dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so
-	dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so
-
-	if use emacs; then
-		elisp-install ${PN} "${S}"/opi/emacs/*.el
-		elisp-site-file-install "${FILESDIR}"/"${SITEFILE}" \
-			|| die "elsip-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		elisp-site-regen
-	fi
-}
diff --git a/dev-lang/mujs/mujs-1.3.5.ebuild b/dev-lang/mujs/mujs-1.3.5.ebuild
index d60978857d66..324a9ff6f664 100644
--- a/dev-lang/mujs/mujs-1.3.5.ebuild
+++ b/dev-lang/mujs/mujs-1.3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz"
 LICENSE="ISC"
 # The subslot matches the SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="sys-libs/readline:="
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/nim/files/nim-2.0.4-testament-skipfile.txt b/dev-lang/nim/files/nim-2.0.4-testament-skipfile.txt
deleted file mode 100644
index 0e209464c4fb..000000000000
--- a/dev-lang/nim/files/nim-2.0.4-testament-skipfile.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- conf -*-
-# broken, bug https://bugs.gentoo.org/930542
-tests/c/temit.nim
-tests/ccgbugs/t10964.nim
-tests/niminaction/Chapter3/ChatApp/src/client.nim
-tests/niminaction/Chapter3/various3.nim
-tests/niminaction/Chapter6/WikipediaStats/concurrency.nim
-tests/niminaction/Chapter6/WikipediaStats/concurrency_regex.nim
-tests/niminaction/Chapter6/WikipediaStats/parallel_counts.nim
-tests/niminaction/Chapter8/sdl/sdl_test.nim
-tests/parallel/tdeepcopy.nim
-tests/parallel/tdeepcopy2.nim
-tests/parallel/tflowvar.nim
-tests/parallel/tlet_spawn.nim
-tests/parallel/tpi.nim
-tests/parallel/tsysspawn.nim
-tests/parallel/twaitany.nim
-tests/stdlib/thttpclient_ssl.nim
-tests/stdlib/tthreadpool.nim
-# broken
-tests/assert/tassert_c.nim
-tests/async/tasync_traceback.nim
-tests/coroutines/twait.nim
-tests/errmsgs/t14444.nim
-tests/errmsgs/tcall_with_default_arg.nim
-tests/errmsgs/tproper_stacktrace.nim
-tests/errmsgs/tproper_stacktrace2.nim
-tests/errmsgs/tproper_stacktrace3.nim
-tests/exception/t13115.nim
-tests/js/tmangle.nim
-tests/js/twritestacktrace.nim
-tests/lent/tbasic_lent_check.nim
-tests/misc/trunner.nim
-tests/misc/tstrace.nim
-tests/misc/twarningaserror.nim
-tests/parser/t20922.nim
-tests/pragmas/thintprocessing.nim
-tests/pragmas/tused.nim
-tests/pragmas/twarning_off.nim
-tests/stdlib/tos.nim
-tests/stdlib/tstackframes.nim
-tests/stdlib/tstats.nim
-tests/system/talloc.nim
-tests/testament/tshould_not_work.nim
-# broken on musl + llvm
-tests/coroutines/tgc.nim
-tests/coroutines/twait.nim
-tests/misc/t18077.nim
-tests/misc/temit.nim
-tests/nimdoc/t15916.nim
-tests/nimdoc/trunnableexamples.nim
-tests/nimdoc/trunnableexamples2.nim
-tests/objects/tobjcov.nim
-tests/objects/toop1.nim
-tests/stdlib/tencodings.nim
-tests/stdlib/tgetaddrinfo.nim
-tests/stdlib/tstdlib_various.nim
-tests/stdlib/tstreams.nim
-tests/stdlib/ttimes.nim
-tests/vm/tvmmisc.nim
-# require network
-tests/stdlib/thttpclient.nim
-tests/stdlib/tnetconnect.nim
-tests/stdlib/tssl.nim
-# don't work without megatest
-tests/misc/tjoinable.nim
-tests/testament/tjoinable.nim
-# don't work with "--hint:all:off" hack
-tests/concepts/t3330.nim
-tests/stylecheck/t20397_2.nim
-tests/stylecheck/treject.nim
-tests/stylecheck/tusages.nim
-# need external dependencies
-tests/manyloc/keineschweine/keineschweine.nim
-tests/manyloc/nake/nakefile.nim
-tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
-# need functional valgrind
-tests/destructor/tnewruntime_strutils.nim
-tests/destructor/tv2_raise.nim
-tests/views/tsplit_into_openarray.nim
diff --git a/dev-lang/nim/nim-2.0.8.ebuild b/dev-lang/nim/nim-2.0.8.ebuild
index 6e94be9723b5..02819c44e274 100644
--- a/dev-lang/nim/nim-2.0.8.ebuild
+++ b/dev-lang/nim/nim-2.0.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="test-js test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index a4891ee68459..2eb8a7e40f48 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -1 +1,3 @@
 DIST nprolog-1.94.tar.gz 128172 BLAKE2B b3a2de8e5e247bce55fc6eabbd06dddee1d42d8d993b38a2effb505647e5a4a60f89f85f14be4e469d81b5488b4494e0a45c2672b2ba00b8f06ae0545951d08e SHA512 7db39847ecfa91b65fad1e035ddb9267856726adc9741a76fdd088c8f678ba8e98eef3890283b543d345a9441dabada4038984e12709898c6887a186a19136c9
+DIST nprolog-2.50.tar.gz 229903 BLAKE2B 1ddc782ddb8e5dff49c4abeb75b34607ff4ed766b98aebf7dba4a799f353649ac942c504363d7dec17c03fc17d01d45b33efcf6f8a76158d5366e30b7647462d SHA512 f37accf8fb156a306ff2aefd11e655fbbdd4e7f02030a9762e25676cc6e88eaa31f7600f421d7ea982e7f0dd47519b0475f4c93dfcb67f1b1d41211d31107163
+DIST nprolog-3.10.tar.gz 582817 BLAKE2B c32ded1a80dd3a32b587685a9e803c1e785433b655cdd6cdba66a0e933376cd354be06b8b7fa2fd626839ee9ed07b0a8464c7ee3bf582a6e9a91130d71b1d56f SHA512 ab5afc6fb8ed861e2dcab9cd3d9e3f9d9d5be8c443855b2090cf1b2233c6d6edbbe56e7f895d0665e57b4d021895a17ff7839f30b318c89e9ac4c527af2fb7ac
diff --git a/dev-lang/nprolog/nprolog-2.50.ebuild b/dev-lang/nprolog/nprolog-2.50.ebuild
new file mode 100644
index 000000000000..40d3b000da40
--- /dev/null
+++ b/dev-lang/nprolog/nprolog-2.50.ebuild
@@ -0,0 +1,39 @@
+# 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 to be compatible with Arity/Prolog32"
+HOMEPAGE="https://github.com/sasagawa888/nprolog/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+	SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+DOCS=( README{,-ja}.md document )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe npl
+
+	insinto "/usr/share/${PN}"
+	doins -r example library
+
+	einstalldocs
+}
diff --git a/dev-lang/nprolog/nprolog-3.10.ebuild b/dev-lang/nprolog/nprolog-3.10.ebuild
new file mode 100644
index 000000000000..40d3b000da40
--- /dev/null
+++ b/dev-lang/nprolog/nprolog-3.10.ebuild
@@ -0,0 +1,39 @@
+# 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 to be compatible with Arity/Prolog32"
+HOMEPAGE="https://github.com/sasagawa888/nprolog/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+	SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+DOCS=( README{,-ja}.md document )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe npl
+
+	insinto "/usr/share/${PN}"
+	doins -r example library
+
+	einstalldocs
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 99cfa21db808..05fc11101a64 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,3 +1,3 @@
-DIST nqp-2024.02.tar.gz 6041352 BLAKE2B cdf1863f80d3a2d64fea3d6b783c91ad3fec44866d0b5a1967e0ac682ef3942a3361c4a4f355a11af938846ef47404df4a5d39fe46ebfef121ab2118d1444e64 SHA512 4dd943920900f0b58385b0a1b7dcc732557a0215975868f322860ec204cbc43d081ce292beb4b2bce70863684d3ec1d981fb809c4558755e791dd7cb0208e05b
 DIST nqp-2024.04.tar.gz 9726771 BLAKE2B 5582aed194438bc57b862e6b1f14b8fdf1548c5e0048e69315e411913b049fec6df640b95bbd0df3e5b541554473fe207c81dbd083d477f12194c22d22119be3 SHA512 988518e5db2d7bdee6ed55bb337e640d091f404d6cc2b2687e9b542cc91ea755add415b40e8b3ac9ef501e150d2026867d0f1f1bfa32f1767e01ec30ae050dd0
 DIST nqp-2024.05.tar.gz 9727311 BLAKE2B 13303d2fa598628ab3cdcfb2a4a9a34b16aa1b6b7c73883114b23f1d969fc0bbadeb8ce692ddfaadb082c625be9d6cf8a291500fd953b2f43efd2995cd91a1cf SHA512 82b6277ac728b89f3c4548c735484aac21851140613471ba559a13db96fc90c13701ece0689ebd548f4ec91f3b1fca3e92f7a6772d7872c3943d5695222c235b
+DIST nqp-2024.08.tar.gz 9726756 BLAKE2B c84854252d75c1518950d86e6b1cc48249454e473553602ef23a7489838cc2e05d57dc614573ccf5b5cfe0c8cd6cd3136836b3d03f4ebe62c07b92cdc02e94d8 SHA512 525f386d919556b2bd0b889b74ac5435e781c3aeb21651fc350033d52b85b05d3af803953c8bd968161d71ecf43bb82be0bd1919dafbdf619696f1a1d26ec0d9
diff --git a/dev-lang/nqp/nqp-2024.02.ebuild b/dev-lang/nqp/nqp-2024.08.ebuild
index efed9b5e0109..efed9b5e0109 100644
--- a/dev-lang/nqp/nqp-2024.02.ebuild
+++ b/dev-lang/nqp/nqp-2024.08.ebuild
diff --git a/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch b/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch
new file mode 100644
index 000000000000..3362947876b1
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/939014
+https://github.com/Perl/perl5/pull/22569
+
+From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001
+From: Andrei Horodniceanu <a.horodniceanu@proton.me>
+Date: Wed, 4 Sep 2024 12:46:44 +0300
+Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale
+
+Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -103,6 +103,7 @@ Andreas König                  <a.koenig@mind.de>
+ Andreas Marienborg             <andreas.marienborg@gmail.com>
+ Andreas Schwab                 <schwab@suse.de>
+ Andreas Voegele                <andreas@andreasvoegele.com>
++Andrei Horodniceanu            <a.horodniceanu@proton.me>
+ Andrei Yelistratov             <andrew@sundale.net>
+ Andrej Borsenkow               <Andrej.Borsenkow@mow.siemens.ru>
+ Andrew Bettison                <andrewb@zip.com.au>
+--- a/locale.c
++++ b/locale.c
+@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+      * categories into our internal indices. */
+     if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) {
+ 
++#    ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT
+         /* Use this array, initialized by a config.h constant */
+         int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT;
+         STATIC_ASSERT_STMT(   C_ARRAY_LENGTH(lc_all_category_positions)
+@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+             map_LC_ALL_position_to_index[i] =
+                               get_category_index(lc_all_category_positions[i]);
+         }
++#    else
++        /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and
++         * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on
++         * systems with only a C locale during ./Configure.  Assume that this
++         * can only happen as part of some sort of bootstrapping so allow
++         * compilation to succeed by ignoring correctness.
++         */
++        for (unsigned int i = 0;
++             i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index);
++             i++)
++        {
++            map_LC_ALL_position_to_index[i] = 0;
++        }
++#    endif
++
+     }
+ 
+     LOCALE_UNLOCK;
diff --git a/dev-lang/perl/perl-5.40.0.ebuild b/dev-lang/perl/perl-5.40.0.ebuild
index be1251b4c5a1..92d162e038f9 100644
--- a/dev-lang/perl/perl-5.40.0.ebuild
+++ b/dev-lang/perl/perl-5.40.0.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 ~ia64 ~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 ~ia64 ~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"
@@ -81,6 +81,10 @@ PDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-compilation-in-eprefix-bug-939014.patch"
+)
+
 # bug 390719, bug 523624
 # virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index fee962609255..1450f8797ac1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,7 +1,11 @@
 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.14.tar.xz 19600188 BLAKE2B a9e65fff590d56848f55f2d93d8a1c631bb8135617112997fbaea9fc45db1d5e2ce39f00cb29c9428542e523fdf48064bdb9aea144acb7aa7cfe71990b8e949e SHA512 adee638aeca898743da4b8245c0fa1e9b94b516f22e716e60c99038f0bb3dcbf726317aa86656404be1719b5a7c58eb09533720ebc0badbb04bd9a534dd48fef
-DIST Python-3.10.14.tar.xz.asc 833 BLAKE2B a8ff46628d72540d0cbfbca91742e0901d7679229d873c3c92fd06d3b45a057daa5b70eb5f026db89d498cb84c10b8c477e79b012582c9fa2bf9d514637c2de7 SHA512 821046b8eb559c3ef800f26739c995e7a71469a1e765ee7d516690236e16d2637ada7b2f9535b8c0dceaacf243e7b059f6f106b4a25faae365aa2099d1ff538c
+DIST Python-3.10.14.tar.xz.asc 833 BLAKE2B 945ada655532d578beba9fdd882cc9cc247e24f7efd68ce172766a8adcb3c8d76bc1f229402405e607004ae0f9bb8e55e4b01867ca712700106d8ec42212cb2c SHA512 450f910a91dd0fb66f99245828983a9234c4a67ea7e653404efa06ce5da1c6667a46329a2d1e276c5a956d2c32d8ae6d8c497a1892102f4a360dae33b135c372
+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.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.9.tar.xz 20175816 BLAKE2B 4e7cd2c42ee39b5ef9624ebd1798320957e948cb4f23f17fd1530814c60126dbf988846928d4d7d4b9d2174029ab8d4dbaf19e6203da237da4c3212ddebd5803 SHA512 2b0a1d936b4ef8376f9655797aece8ffdff75031ad7bfa840f330cac2aed189aecc80c163edc12ea772851d7a011f3fc1960470a73d9d4290cf3ab8ad6ed7e6a
 DIST Python-3.11.9.tar.xz.asc 833 BLAKE2B fa29f632bae0bee7db946038ee3529bc3bfbe1b2e755b21394f67a3c80911ce8079aaab43a16d88e614a8bfc01fb5105ce3f61c59a5ca44470b0f59787c707b3 SHA512 b18b50e7168b2ca5376a1fa75e50e8baae2026d4f11d4cf613d758f3f17df4610fe4653fb2ac0c5c4ec0f6e630dc6490ad1ff32a2fd0ebd60f9f3bd136207ffc
 DIST Python-3.12.3.tar.xz 20625068 BLAKE2B fc4f57ae50183db4c8cb37d94c37a7e58da5d031e03866841a678b986f01bbb8afdefb38124ba82b0a4988445b647214be43338dea13b0f063d3c2bf81c48c0b SHA512 4a2213b108e7f1f1525baa8348e68b2a2336d925e60d0a59f0225fc470768a2c8031edafc0b8243f94dbae18afda335ee5adf2785328c2218fd64cbb439f13a4
@@ -10,39 +14,42 @@ DIST Python-3.12.4.tar.xz 20659356 BLAKE2B 4255171ef8ee1777bab829be7bbaf28a9d507
 DIST Python-3.12.4.tar.xz.asc 963 BLAKE2B d4f62dca1de5f4e4b2581fc49ca55b1d87abe7c4ceb2c9087efe4b92d9e9b3bdd25949bbf82fd771b4b60bc3690be982c2f25b810d87592665f0728fbe08be9d SHA512 1102b17f395e0ec5de5368d04a4dceb8cc98dd408b68b53998071cf129eb9a6c259316a416128f1dfa37a739f86e599507502a98430348da2272442ce1b7059e
 DIST Python-3.12.5.tar.xz 20422396 BLAKE2B f127d1e12d12be84d5837282757787be8a0cf702adce29b93622f91f45ba2d8cc0f5db2e8277c86b098623951b302015febd28bdabaff66b30cb06a5ef2b4a24 SHA512 7a1c30d798434fe24697bc253f6010d75145e7650f66803328425c8525331b9fa6b63d12a652687582db205f8d4c8279c8f73c338168592481517b063351c921
 DIST Python-3.12.5.tar.xz.asc 963 BLAKE2B 238167f6b4012136bc4274eee0dd4d958c4ee02d2505f9f64e5bcad15e84a9e9e12a9fc907651083543f1fce93579b752d4ccdf60c8cc421cb43e9034877bf1c SHA512 65ce92272a38cc6bf8bf56fa2a99a830cf5b33b811b1788508e7b6f8b5d3e93e0b143412f829271be40cbb4e7c154f84499239b3e8ab63b2ccf0a5a22d2f84ee
-DIST Python-3.13.0b1.tar.xz 21054240 BLAKE2B fba108b2971fe188a05340753a48379c9a829ce680f13dc50d95d889ef5ee833b82be157d1b011ba841c149d633e8eb64b07098bf03a2adcf711b3f688465050 SHA512 81cc1d8691bfcc8f8bb232ea15c18039d0df036f5cbc1667fec3b6c34cdf198bed97418ec775c037778c250b7bc4f35bd5fb938dd478cc17fc48c74b8a2b2d19
-DIST Python-3.13.0b1.tar.xz.asc 963 BLAKE2B 1b038d2b73fdbe11a1ada18ceab4a174ae52aab68ae9c3a9952ee60a16ce3e08e54c13e0c47264442415f70bd39a06c2b0f97c3cef31330f51102dad6d4a837b SHA512 c10832b5016ad9a9588b7efd29a35272c1c07b444df116c397fed82d66f30150687d68a6853637094be2fe1d8ed0928a9cd151617c91d9eb9938ba1385bd7143
-DIST Python-3.13.0b2.tar.xz 21089692 BLAKE2B 3cc77e9b7abcd8c9797a40b2a1f5ff6562a1841dd44c4785a57941b1eb4d70d20a3dc5bcf8cbfe3d1b2c7f846d7da7fd89758e113542820945da996d2c6a68af SHA512 3a37c8137958a6ebaf06f5a03b28c7817f359f346d820a9989932b1a716478647e8d1b94c1a08197bcabf68cd90443a08ab9454af9151eace52401d8b60d0c35
-DIST Python-3.13.0b2.tar.xz.asc 963 BLAKE2B 2acab01cd8b2b5072e87f0c697767e9cec6a73cd6afae38f066a3bfa14798d10e01c03e806a1a90d1db3e5d91dea090d9dd37d1884bef3291783e6163e3d8906 SHA512 17091aba45ebd8c8feb3e9c54854e20dcd44fec4a1c08c9c0c4593166c407c4ad2b245a0e0893afc83a43e8b461a557fa1d6691c87a6a5ebc97ea448a9201c87
-DIST Python-3.13.0b3.tar.xz 20841504 BLAKE2B 92760124355483da082ac9fdc7a72eb6739e99acd97521a8c9a60bb73a25e26bcb8bdc9e911ee91667244320b742a9572c1e12229eb1c0d97ef5794493abac0f SHA512 1f0ef2d6f5d450664ad4104b92193b5a2dbe9c79add0a79c35ad9508f9fc7f1a5561efd5e4367defddf45457291524d353705d9a60b3550065920e204c77357d
-DIST Python-3.13.0b3.tar.xz.asc 963 BLAKE2B 784df664961ea36cb570d685c0cf6e8fe7159161c38103f217303bc0264c73a9904021cca297a180c7dd712d4e7fcee161d741919bee49eff962a25d14568d41 SHA512 3d8bdc8c26441a12518940d264e93a8897042e297ccf9cd2ddec725716a58486475be9462582ee489bd189a4d028b43504f979298174c1b008d521b7ab5fbf1b
-DIST Python-3.13.0b4.tar.xz 20876136 BLAKE2B b3a7b42b03320df618af18844a8b0f1c4b88b9bcd581cacd2d40d3ecec7d0f11aac36e54913f64541a2287d7a5052aa69f8e8d0379d6bbb4fba78600bf484f75 SHA512 e556f7a4e54b688d0424b0bd84f9849b52f4f7e04c68d4d5b877d86b4f9ded92c9efaa2b7ab33f345235f35e8d544833542f7a4cb100d0ff15b7d98b8367b935
-DIST Python-3.13.0b4.tar.xz.asc 963 BLAKE2B 0d9c7baa1eedce684e73359682f63c2aa6e7abc7cc77ee7fcf6d9658e93221c02412aa55f22d16337b72a680f10c70520742292da1138228f9257f81bc57d328 SHA512 243637efff94965aa4d997fe26c91a7c1aa7dcfdf7f78d35d6f4fc408b654dfa9d075d1c73bc5a90d145f6e5029ee395a86faf7e027c24a55fabfea6ca20fbd4
+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.13.0rc1.tar.xz 20881016 BLAKE2B 3971a233e9c3c782973e0276740f00f8f2072eeda914663cdf7fa6c5de2437c60c441184344a64e25cab5c71a02c47cf4602dd08f127f310c885386cd887fec4 SHA512 fce7664f3298cfd191a7dc20b7b47acafdc50d058a2814312c94c30b65291395957d701e4661b9bb760417942acb5d27e5b8bb479bcda9a82cf29f53772a2daf
 DIST Python-3.13.0rc1.tar.xz.asc 963 BLAKE2B 1c292362cd133dbbb1df1e0cf440e8adde2bc8db9174e550d5b76a09e80d0dbc11a0250e6f041e54fe58f25dc05f071c7af1aa910ae56ece5eb430502a2ba67c SHA512 3613829d9631f46b1b1ce11bfe5bb7fbfa49d97b639bb883c86737ea6ae8d15c24c526083cafb916011bd6d0b3b5fab2b17afd367edbdce99b32e0b4b845fd22
+DIST Python-3.13.0rc2.tar.xz 21055084 BLAKE2B 017ac82c1938d1fea0a501efb9d1848115648f0472b7cbaa4eac65cf085c3c6410ea83aab2e935952ca1b415d603f4c5680fec7a15ce5b40794b2fdcef662666 SHA512 85e6e6e80970ca38119e4f95880fb12e2d1548e6d60235cfcd7f6aaf08588c483469e43dda0f004b95455c2fb88ca736c313b22ae37eb0d4e6460ef521855c8d
+DIST Python-3.13.0rc2.tar.xz.asc 963 BLAKE2B bb75db12c424b7a05c8c0082f79c1ab6e2ad04440a27d2c964edc073fbdc1c0ac442b0b2a0719a33f8058bc7bc9097eb22e031299f8de5b6d88b74e4e5ece8a8 SHA512 6d80d089b55910628744d21b0382b6441d0550c139dbee71d68a7cd9e494bff1c8235a2a894f3c7a52f9af312480a4001f333e04c9054f32db7eefd2a7d39263
 DIST Python-3.8.19.tar.xz 18975156 BLAKE2B 57b241aeb8f99a8c30590dcb9402abbcf573f00d06e807846bc9135c0a8a4af896c4d772d34abc3c292339953f4974a203bff61a78641d91b1826770226cd7e9 SHA512 1d2a57fa15ccdaec8cdca508ba2ffb01e1ae053a3446ac709bc334480f8e913070899f01ed680cce6dc7ddfddcb27ef402fe206562249fa4c4e87be21ece0625
 DIST Python-3.8.19.tar.xz.asc 833 BLAKE2B a11705011e9ea2bd6cbabc2b4c896ba94675341188eb483b881c2cb25c932e9ff25f9f589f930605b0442ff93a1f54532608b111c8ace715a406ce10809af671 SHA512 efdaae5462badcf4b98625ce8ab0e34756acea9539416e6ec428725b04539f8c38c1978de346510d669e93bbeef3ae20b1534e4c6582f89c7dc56a04c7cae140
+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.19.tar.xz 19682840 BLAKE2B a12256663f0ff3b799c2193c5877aa89a434340dfa01e655f790abea70af0709b54577e1c2590add241308a8581fd6f45a22aed450bd5db2bf9fa35c4a9d619b SHA512 5577830c734e63a70bbc62cd33d263b9aa87c4381b49cb694c3559067c4c682a55506b65ec5514a8e0a5abf6294dc728e909385d449ae1c388e62f83cea9bb89
 DIST Python-3.9.19.tar.xz.asc 833 BLAKE2B b48b58b8ccf4d6ba8d0d7120f04bebf59f843ffecf5fde4c3989fd9c26e3d3d1ccf4e5688f7024ae94775c8731e9ffa56799fca8596289edf93e4aac5480aaad SHA512 f7f4946243dfc56de2c84f50276b088d347f17054f50e3331d1e312e2a8e2c6ed1b4b4a807202b51137fd2af3fc9218cafa42ed348a954ace896d9a432e2defd
+DIST Python-3.9.20.tar.xz 19648968 BLAKE2B 80a337ff406130599b8320068d11bc275d23473cedd7c85fcb9e40134f0f2d533be6e712139e788a6423cdc74cea938f306aa37c2a5099e3051f3e390159279c SHA512 c828f33edf1704e3149499d6d34e89264cb5cdb2b09ff05561641b359716d7996f0fe928629e09f006b1fd7850fdaf937275919c7fdd83f5efc32707c64d814b
+DIST Python-3.9.20.tar.xz.asc 833 BLAKE2B bcd5a612281bf8e057e19db9105b199cb7e44050441b19832843e8149088d277f4b625421099b09d4ed6fac5578505f46dbfea13b041d157d695eaf668c3a7de SHA512 f21c012f4f642542479ba329da9654589e5a7f7305c39fb1b6f136b578316bdb115cef9773c9a9fe4e195677af01cb80af05780613cca83f42fae131862a9584
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
 DIST python-gentoo-patches-3.10.14_p1.tar.xz 15836 BLAKE2B a850e4ad4f025fa9d38ccba937f1b3ee8443ed186c22ede58b4c7324a8541cf724590686671a9aa9194662303ce75bc80aac8ee6f9da34b793876817b6f593ff SHA512 5d969f5e5126ee675a062924a5f403de142fc5bfe4a931fd3576bcc6298a855419d305d4b1ffedacb429783a05324b36eef4c45c861c47bada0bdd840de2bca3
 DIST python-gentoo-patches-3.10.14_p2.tar.xz 19564 BLAKE2B 2ad1398e0679e73028a0614e8c4ef6bc76928f6c1d0e93c39c3bf2c23201904ee677377abb120444995154bda4251cb8f0aabafca5e6c82601a6270d0e62bf67 SHA512 6d4194b85a176a1a0f7acc3eab48829d504e66381f3008821a9a433e63f5188b444321192ad536d8219a1c3ca56dbdb5c39439401cbbb30f35a606e2b6617624
+DIST python-gentoo-patches-3.10.14_p3.tar.xz 22080 BLAKE2B f45ebe4df3dc39a842c93d741ef66fd0f9f7d1c6453d499d59b62eda41f01bc17e109205fedc506963d1f21eb3fbf9478564ff5e1a11c10336f855069a642ceb SHA512 db268f1482e5c46a71ce3aef2c2ab6d458cc5263aec360e61c6aff97f119f4f100becefbb575156b1b0239e591a496cb62a136597fadae8a5b630c7233c0040a
+DIST python-gentoo-patches-3.10.15.tar.xz 15896 BLAKE2B f908b409dbcedeb4e2fa7255d9dedfb8f86f39b9b12612d45662d2305012692753874befa5377e1bcb2e8fc04b54bf206948e12eb7bc357a764c1b1e496e5997 SHA512 a647882ede8d7b97e301e472e91f4573dce9f8bf4e408449444625fdf79859a54fd828daa60c7960721f34c3d6d82e2e45db2c55f2fc093097a0db42f7363b8c
+DIST python-gentoo-patches-3.11.10.tar.xz 8484 BLAKE2B 844aa7a855e3ab5a6307c6bfac9d58faad249ce550d21e8526125dc56b9665dc6fa00530a60efe8f851397d368057400851906e59fec10f6325bd83a51e39317 SHA512 bb602b80eed62ca8477b05665267ec3729fd9a85d9b709f844ad729f496d008a529d05d2ebfe8acb5db5ccb99005260bfe458f6ce0d9d358530670e0970e415e
 DIST python-gentoo-patches-3.11.9.tar.xz 8456 BLAKE2B 4e62837f17c1d056460df417b056a79ad78dbcdd3454761c7cda68ffe6faf8f4d4f04d5539e0ba94332fe19a751f7d5ff2c35ff969a6aa09a2c72d2ce5efbff1 SHA512 a288aa8d1d15e906e0f1762602a2122f9dc91bbd6b72123ac5d00ce55b3af324a4e8280b600fc0fb630e489e57ee1547d7595a4ede7a70e4b26d6686a8414997
 DIST python-gentoo-patches-3.11.9_p1.tar.xz 12348 BLAKE2B 885c18eb52d299c8da43fe48106a2464ce594822e8ed362150c98f749065447b7438741cacf82a71db102434a5b2a2e91778aca8609fd7ede7898f9e57a82d49 SHA512 2ed8a97692a8980e565038ad095dad8ed3daf1f8c5c5e042a0bc278c320e099962ad13b5ff919ae334674a4828c5e8f3b9c3af6b3c37e93a42374284f5ea2243
+DIST python-gentoo-patches-3.11.9_p2.tar.xz 14916 BLAKE2B a910eae412fc1ce3657272c3c2ea9ef95b8d5711ed4c85b93a35f4ab757b1134bff0f8c8a0071e8e06aac784d0b51e36cd9271f892098cba272da4a4e73317d1 SHA512 5c055186b3a8376f4f602ec5d1f8e7bf0f067bc67295c1cdaa68ce1fb6fb21cda75e22705b8a5a2a6525af67f3b36a82fde5ba6ae9b097a5914ab79a2f1a0fad
 DIST python-gentoo-patches-3.12.3.tar.xz 6028 BLAKE2B 7953a48a1d95a6a33bd88060fbcac463a5469371aa0c882c3945f1fea64a63c4d45fca8451f51f4eaeea00a04267ad2e54e4cc720c95e8bb5a3477e00263b80a SHA512 4779bab2b24e59e4a77987ce3e9611d99e87c9c4d016309758c26a65fe2e11ef04d48d5af628c02b1552dc1f31b768f87448f8e19e716b4fe372941e6dacac3f
-DIST python-gentoo-patches-3.12.4_p1.tar.xz 7088 BLAKE2B 450b95539aaf7c8c052ca1bbcab3b1a8f1c33e8007b6c66cc290c33d88cac8bad346e13cf96508834599a59ccb6548e6dd8cbfb1e24d84539f502101b04299d0 SHA512 df874cb1d8d0f5df60fca82daa2a59cbcfeba6be72b021101a753306a09bb19ee268681b3fdb39659be923d868c727bf7aabbe8173cfd48a329c66f4727353c7
-DIST python-gentoo-patches-3.12.4_p2.tar.xz 11124 BLAKE2B 8e49af60b1e514de9b77c562a8df5ae7d6caf0045e631fcf85a8f91335cf18f1df2ac611ea73d26e5b70c2537beb423a9303dcce41c2c2e2b049ee9f1e537b53 SHA512 df1d49e60d23f5f09144c57034c86f81f8d185f65c3a93bbb2b386977638bd525b45fe1dff8c7202d60ca3a5fdf96b94a492b076072713565e7449b679fde7b5
 DIST python-gentoo-patches-3.12.4_p3.tar.xz 14796 BLAKE2B 68f5235ef434f9db16e7bc635ff51b6607cfb9be713fdc3c0ef624ec0f513345f6e02e27b8ebc2b3c8a5fcd4f4f5161024407ae364bdffd3b22a7a9d3a509b30 SHA512 8e337a7234b8ad64dd82435dcda0ef4e90c21214bd7b13a83fe9ba700d5b07ce11fb33b7d34d808132120b4a077fde26278b87116bb02ccef50470c046a66d2b
 DIST python-gentoo-patches-3.12.5.tar.xz 6056 BLAKE2B d9b85d98a75f6365c63ddabb8f25db3be11e7e4de22ec9426bb24160efcca25c75e3e19beec9fc2f8f8fe273c145f825c6f27ece2fca83d44cf2dbdfacae918d SHA512 72949ae8a1c796cb57e8b43d259037a723482b5a3849823c1cdc58acc012177a0ec836a4dd6ad656fe57ee1d84491c03ed9109667a953aa52bf5df7640de969f
-DIST python-gentoo-patches-3.13.0b1_p3.tar.xz 11056 BLAKE2B ef932bac59d2316ee8fe638a3d34ce247ff587915546038627674cd4c03179998a58336f8ebae45f1fcc94c8059d61ff6f22693f25ace1462bce275f50bfb48f SHA512 956e3da7376d60d7a593af50fff9842016a3b193180e93ab8298756c9eedfb2aaf8c1287bb75111e6340b5bac20a12dcb00ef51ecf0e12ef9ae5c98202fb071b
-DIST python-gentoo-patches-3.13.0b2_p9.tar.xz 11288 BLAKE2B e46bac845ce54e32446316b8a5e055905f023e88ad7fb9cfed101f0fccf6c0fef2fb9fd5b7dc4b15ec1e6c075ceaa9f07777c3cfede0f88412871beac0a54e47 SHA512 4148342d649acd98cce1f3d3c7bdbf4adad069ba555624882ddb69f00ee0e64641014086b5e60d97eac809ccb1e3e782a112eb58d7bb83bcfa3222811cbb8682
-DIST python-gentoo-patches-3.13.0b3.tar.xz 5704 BLAKE2B 665f60d0a440c63ca6bbc1615333e01e0b9d3c5cd8c871157866dd70146a9afb71aecdb6f72f75de2fd8c163d011c8df538c8b278ad6a91079f3300bd05fead3 SHA512 959826aaf467235c8a144a2b94137113b273f79febd30fee0556b718132bb89b5ba97bc01a3718771cade099777f131b322682f336dfaabe18cd5838a75318fa
-DIST python-gentoo-patches-3.13.0b3_p1.tar.xz 8716 BLAKE2B 25b2d9f059c6f31a354b19833a3dfaab446a43ca00bbaa415e38c3ede6c4a738046469ca4ef6e184a5d7df33a8a1c5209271a1eb0728c3791e6630953bcd798f SHA512 57bbe0470e3356cef3b1880cedd18d4e84d6f64d1f398ce3e3e729744ac5f7a4dc4144333e2355f9ecf41c58382ab5708e7dbf7d480dbf797caa460862aee3bd
-DIST python-gentoo-patches-3.13.0b4.tar.xz 5700 BLAKE2B cc3e6d899dc51dc4a0f4b57fb5a891a61e5ba5a943edd31b55b6540f1d52a61f2a80f8ac1cdbc36ce155a83ab3942b8991fad0e83baab4c0a1080e62b30e16df SHA512 bf236ed221512a032a057f8b89b29a28e84cfaba56f58c2eaacee846db636089b2ae4534dc55ff3389cfbf1a4485e1cc2049a5cdb98ec1cd31eef71de60596c1
-DIST python-gentoo-patches-3.13.0rc1.tar.xz 5696 BLAKE2B c34beb06ea6052b297e1bc5ec790f712a6d8acfa23b16b44dd8a7fc2788a4ba266da21cc2f463e79f10749e2f4752ae34c7074a0e588e84614020e6acd86403b SHA512 a6a2e8dc2a35a76b265788658cd8ecf2f5b7f466701cf4599df300eb8914435198f26789dafa309a7dc4c23e0da2aeb905c8175611f6fa50f622e70016212202
-DIST python-gentoo-patches-3.13.0rc1_p1.tar.xz 9840 BLAKE2B f8f52be8fde89793e5692a4693c030980a32651626cc6184f962d7d9dc9209ce6593f127ff279b71fda4fafeec148af80971bdb6dcaf129f63cc52238a34630f SHA512 e0d3aaf528ffeed8335f98dd4bfd43da8274757b0ae9f6a473134e9b57eafe12b870e41e1aafa52c2bd96de1b7ab9b9f225ddf8e87eec51f088b5484b3c92852
+DIST python-gentoo-patches-3.12.5_p1.tar.xz 8632 BLAKE2B 13570bb465002cea3590b06d055b936ac0fcc68f6f258aca99a67f02f0b1cd28396424b686c5e080f593a74a744ff449e7220f51f167a858b2313be4c8b64b19 SHA512 eb9fb2d48236a9f7941fb8938310cc32d216eb01e19277175223b8b1fe1bfd606bde9a3c8bc66ad2e494fb87ce23b0d1acd359c375e4a11a5caae25450c11360
+DIST python-gentoo-patches-3.12.6.tar.xz 6048 BLAKE2B 577032d7aa4bab423781bffad8e64f56b492dc31fbd20acd91f3d28356bd697603dfd47a3a9051538dde2af942ae513727ecea415d82f5082a992bd22b8cb2dd SHA512 6f1037e97bb362a3d04c3ec080dc062c5de6e4b779cda0d88f684422d757acd6fc6f971c7004a3f50bbc0161dd28c3146672f74e0e598066f9a8ba4e0eb2627e
 DIST python-gentoo-patches-3.13.0rc1_p2.tar.xz 12748 BLAKE2B 851d16e16d2a98fde62c38054d9bedf3538d88a59e19dcfd8ee7d86f3f67a3b66105664da9181dbfb9ad16aa0042815ccf469225348fb0ba8854337b0a736d33 SHA512 8264aa65bf71e97a4afe47a9fba58815163bc950ea70ff708c5f265722c5b4b8af19fbbe8a9c3673957a6de3af8307a9ba0ed9f4e42472ca24c5ed930682a038
+DIST python-gentoo-patches-3.13.0rc1_p3.tar.xz 15148 BLAKE2B 668060644372e8ddf2d9686796ec304ae7689f5c10ecbc6862f054f96504c418b0e4df28675e4fbb610889f9a665a7a54f23633036b0df35f19f40ef8e6bab32 SHA512 c0cbdf9e0fe2ad29175302e548ebfda1d2af42af0ffeb363eb8b0dc53e1059f5abd7dcd02fd8e9eb9ba7bef2b34b7693633f0a62dc1ab933f43077feacf00fbc
+DIST python-gentoo-patches-3.13.0rc2.tar.xz 5696 BLAKE2B 4e716d1d6225e811b598d029ef1dbdc413df614ef00ab8051ea697e633477a0114a3660cae037bdf4142f76c9f2efdefc25b604af11c31eb77d6d98d8f932cff SHA512 c20b53772bd7d305562657722aec70de78fffbf8ab7939f59d496e06c21b31fcd7b4a92573b1000d3bee4d90fd8b7422543f9cfdad15d60bc9a7ecf2a2259599
 DIST python-gentoo-patches-3.8.19_p2.tar.xz 35524 BLAKE2B a6b81e6ae907b60eea676cb65a9c693e62453dc44616baaadb294c5782a195c20eff6c2869b38ea110fe06e9e511468f4ab0c3d1811b16e0ab2833f9dc09b25b SHA512 9944c330b6062c2ac6e13fcfbc1c8835dfd078f6744cdfbc03ba787ae97c08bdae559cefadafe9dfe9be9c31f8c15ee895599b266d870f73c06a2f4b15c78dc3
 DIST python-gentoo-patches-3.8.19_p3.tar.xz 39392 BLAKE2B 451765c7546831c35f52e2772b8b43b6515f66cace2d13ed473228bf2d2b18f49b938a61d4cdf1be0fecbebfac1fc8d3d95f7597eb9d877c0b2ce495e8d419c1 SHA512 76e405ddfd3ee98dbd077f6ec83ae93d0506ddbc3b2b8884a0f38c6269ea982b635b0eb7820f6f9b2f81eb0ef514b93a5eb10437414cde4de2bfb7ea37764b3c
+DIST python-gentoo-patches-3.8.19_p4.tar.xz 41888 BLAKE2B 8f5fcf8b6d925c9f668a1f8ac22d4b8c2ff7b4d90103606afc37eef735d5ed0fe7288469fb18e08bc31165c16c9877977610e5a6af9e385518028baed34fde2f SHA512 4440725419af3bc5c4f1719dd39605df28e2bca625c3a822082e4541db9479dc6fcf8c2d6fc777292b75f70669ab7e010df105b2b580865a442df76c0f83ebbc
+DIST python-gentoo-patches-3.8.20.tar.xz 34380 BLAKE2B 1fea8e65f7db809a716376a3062a730321f68e711837c400fecffc27273754bb9aef3ed98651bce412596d35674f0b0813f7a722c1e2fe22954922c17846de37 SHA512 3070a0b3cb91129ffcada6052e50d779ea6b5480a3b4edc3e3f1c9d3b683ec1866168255db84b86f0a4dedb4a23949cda8f474d320db34d7511e9ede9a0342d9
 DIST python-gentoo-patches-3.9.19_p3.tar.xz 28240 BLAKE2B 35c70b1f9a590abe9a74795f478ab788cd72c96e9d84f2756685e61324dc4203148e71b00a236bb4af8fb8315e3582ecec255b39749a653e0511d4a9f9fef725 SHA512 6b8f4dab4aa7d4d646ee4091b5cf76bbc8896d4299a3623660a2c5fec06c0cf56c0a50ac87604885cd155141bc85e0e80acdbedb7b34a813901aad021b9b8ab2
 DIST python-gentoo-patches-3.9.19_p4.tar.xz 32048 BLAKE2B 9595d508304baf36a2c8daa2ae15d3596fdfb5fed5c531fc379ee347d5b165885ade1842f094184fb7bd81a6385e45f9b77ba7bfa4334ea30292c0bc59b373e2 SHA512 5713c69ee3745246a570e0f05ac8f45baa8f9fa8a2154c930f1ddcf827a2a790cb5e308f5ff9452d3ffda5d60c167a02429af773eebf13dcb6463793cd448500
+DIST python-gentoo-patches-3.9.19_p5.tar.xz 34548 BLAKE2B 6ad49bba626932b3ba1b781fe5762882aa90b552bedc0f1b8fe0921c7e4ad1bd67ddbc2c11c969fae53fd2b6189dd1b1506da87c123c055ec3df023950bd1938 SHA512 d66a2d6012d98edde4a9eb52cd8a06f0338a25f44e299713abd970884c7b1d457c6a09a1e27035841eae3a4844bbec1b4d2a4b691bbf519867a6ed58f251e633
+DIST python-gentoo-patches-3.9.20.tar.xz 26992 BLAKE2B d77861cb99c5b0f76482c7250d45ab0726e9745929a2098724ba528034b7787e12be2505c3d2479f3b5e1760b8e4046d89ad6d5e4af200c4116c348c663792ba SHA512 132f1d731b671fbddf89a3af49c6887f3f8414f0f0df6769f243eab056e214ef3b2427075de10384cc4f6df2fd3140fb6321ad3e271539da9cb6846ba26e935e
diff --git a/dev-lang/python/python-3.10.14_p3-r1.ebuild b/dev-lang/python/python-3.10.14_p3-r1.ebuild
new file mode 100644
index 000000000000..084f87cb4097
--- /dev/null
+++ b/dev-lang/python/python-3.10.14_p3-r1.ebuild
@@ -0,0 +1,542 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.14_p3.ebuild b/dev-lang/python/python-3.10.14_p3.ebuild
new file mode 100644
index 000000000000..7e6b195229c8
--- /dev/null
+++ b/dev-lang/python/python-3.10.14_p3.ebuild
@@ -0,0 +1,542 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" 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,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.10.15.ebuild b/dev-lang/python/python-3.10.15.ebuild
new file mode 100644
index 000000000000..084f87cb4097
--- /dev/null
+++ b/dev-lang/python/python-3.10.15.ebuild
@@ -0,0 +1,542 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.11.10.ebuild b/dev-lang/python/python-3.11.10.ebuild
new file mode 100644
index 000000000000..62a5f03d7370
--- /dev/null
+++ b/dev-lang/python/python-3.11.10.ebuild
@@ -0,0 +1,573 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.9_p2-r1.ebuild b/dev-lang/python/python-3.11.9_p2-r1.ebuild
new file mode 100644
index 000000000000..62a5f03d7370
--- /dev/null
+++ b/dev-lang/python/python-3.11.9_p2-r1.ebuild
@@ -0,0 +1,573 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.9_p2.ebuild b/dev-lang/python/python-3.11.9_p2.ebuild
new file mode 100644
index 000000000000..44b2d6980033
--- /dev/null
+++ b/dev-lang/python/python-3.11.9_p2.ebuild
@@ -0,0 +1,573 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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}" 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,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
+}
+
+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.12.4_p1.ebuild b/dev-lang/python/python-3.12.4_p1.ebuild
deleted file mode 100644
index a2461c6b3906..000000000000
--- a/dev-lang/python/python-3.12.4_p1.ebuild
+++ /dev/null
@@ -1,558 +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 ~ia64 ~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
-
-	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
-
-			-x test_gdb
-			-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
-		)
-
-		# musl-specific skips
-		use elibc_musl && profile_task_flags+=(
-			# 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 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}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	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=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_concurrent_futures
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# musl-specific skips
-	use elibc_musl && test_opts+=(
-		# 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
-	)
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${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}" 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,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.12.4_p2.ebuild b/dev-lang/python/python-3.12.4_p2.ebuild
deleted file mode 100644
index a2461c6b3906..000000000000
--- a/dev-lang/python/python-3.12.4_p2.ebuild
+++ /dev/null
@@ -1,558 +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 ~ia64 ~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
-
-	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
-
-			-x test_gdb
-			-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
-		)
-
-		# musl-specific skips
-		use elibc_musl && profile_task_flags+=(
-			# 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 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}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	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=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_concurrent_futures
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# musl-specific skips
-	use elibc_musl && test_opts+=(
-		# 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
-	)
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${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}" 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,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.12.5_p1-r1.ebuild b/dev-lang/python/python-3.12.5_p1-r1.ebuild
new file mode 100644
index 000000000000..9ed954d067c0
--- /dev/null
+++ b/dev-lang/python/python-3.12.5_p1-r1.ebuild
@@ -0,0 +1,558 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.5_p1.ebuild b/dev-lang/python/python-3.12.5_p1.ebuild
new file mode 100644
index 000000000000..8abad23ce720
--- /dev/null
+++ b/dev-lang/python/python-3.12.5_p1.ebuild
@@ -0,0 +1,558 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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}" 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,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.12.6.ebuild b/dev-lang/python/python-3.12.6.ebuild
new file mode 100644
index 000000000000..9ed954d067c0
--- /dev/null
+++ b/dev-lang/python/python-3.12.6.ebuild
@@ -0,0 +1,558 @@
+# 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 ~ia64 ~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
+
+	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
+
+			-x test_gdb
+			-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
+		)
+
+		# musl-specific skips
+		use elibc_musl && profile_task_flags+=(
+			# 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 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# musl-specific skips
+	use elibc_musl && test_opts+=(
+		# 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
+	)
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.13.0_beta1_p3.ebuild b/dev-lang/python/python-3.13.0_beta1_p3.ebuild
deleted file mode 100644
index c7e6f46cf053..000000000000
--- a/dev-lang/python/python-3.13.0_beta1_p3.ebuild
+++ /dev/null
@@ -1,668 +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
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
-inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
-	jit? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/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}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-
-	if ! use gil || use jit; then
-		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
-		ewarn "them 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[gil,-jit].  Instead,"
-		ewarn "please consider reporting freethreading / JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	use jit && llvm-r1_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=(
-		# failures
-		-x test_concurrent_futures
-		-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
-			)
-			;;
-		ia64*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-			)
-			;;
-		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_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
-			--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
-		)
-
-		# 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
-				)
-				;;
-			ia64*)
-				profile_task_flags+=(
-					-x test_signal
-				)
-				;;
-			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 gil)
-		$(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}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addwrite "/usr/lib/python${PYVER}/site-packages"
-	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[@]}"
-	)
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${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}" 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,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
-	# pydoc
-	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.13.0_beta2_p9.ebuild b/dev-lang/python/python-3.13.0_beta2_p9.ebuild
deleted file mode 100644
index 87d11b2c5374..000000000000
--- a/dev-lang/python/python-3.13.0_beta2_p9.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
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
-inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
-	jit? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/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}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-
-	if ! use gil || use jit; then
-		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
-		ewarn "them 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[gil,-jit].  Instead,"
-		ewarn "please consider reporting freethreading / JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	use jit && llvm-r1_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=(
-		# failures
-		-x test_concurrent_futures
-		-x test_gdb
-		# test_asyncio_repl_is_ok is flaky
-		# https://github.com/python/cpython/issues/119909
-		-x test_repl
-	)
-
-	# 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
-			)
-			;;
-		ia64*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-			)
-			;;
-		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_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
-			--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
-		)
-
-		# 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
-				)
-				;;
-			ia64*)
-				profile_task_flags+=(
-					-x test_signal
-				)
-				;;
-			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 gil)
-		$(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}" 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,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
-	# pydoc
-	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.13.0_beta2; then
-			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.13.0_beta3.ebuild b/dev-lang/python/python-3.13.0_beta3.ebuild
deleted file mode 100644
index 87d11b2c5374..000000000000
--- a/dev-lang/python/python-3.13.0_beta3.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
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
-inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
-	jit? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/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}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-
-	if ! use gil || use jit; then
-		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
-		ewarn "them 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[gil,-jit].  Instead,"
-		ewarn "please consider reporting freethreading / JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	use jit && llvm-r1_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=(
-		# failures
-		-x test_concurrent_futures
-		-x test_gdb
-		# test_asyncio_repl_is_ok is flaky
-		# https://github.com/python/cpython/issues/119909
-		-x test_repl
-	)
-
-	# 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
-			)
-			;;
-		ia64*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-			)
-			;;
-		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_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
-			--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
-		)
-
-		# 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
-				)
-				;;
-			ia64*)
-				profile_task_flags+=(
-					-x test_signal
-				)
-				;;
-			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 gil)
-		$(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}" 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,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
-	# pydoc
-	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.13.0_beta2; then
-			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.13.0_beta3_p1.ebuild b/dev-lang/python/python-3.13.0_beta3_p1.ebuild
deleted file mode 100644
index 87d11b2c5374..000000000000
--- a/dev-lang/python/python-3.13.0_beta3_p1.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
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
-inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
-	jit? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/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}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-
-	if ! use gil || use jit; then
-		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
-		ewarn "them 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[gil,-jit].  Instead,"
-		ewarn "please consider reporting freethreading / JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	use jit && llvm-r1_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=(
-		# failures
-		-x test_concurrent_futures
-		-x test_gdb
-		# test_asyncio_repl_is_ok is flaky
-		# https://github.com/python/cpython/issues/119909
-		-x test_repl
-	)
-
-	# 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
-			)
-			;;
-		ia64*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-			)
-			;;
-		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_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
-			--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
-		)
-
-		# 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
-				)
-				;;
-			ia64*)
-				profile_task_flags+=(
-					-x test_signal
-				)
-				;;
-			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 gil)
-		$(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}" 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,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
-	# pydoc
-	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.13.0_beta2; then
-			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.13.0_beta4.ebuild b/dev-lang/python/python-3.13.0_beta4.ebuild
deleted file mode 100644
index 20a8761fa612..000000000000
--- a/dev-lang/python/python-3.13.0_beta4.ebuild
+++ /dev/null
@@ -1,658 +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
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
-inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
-	jit? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/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}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-
-	if ! use gil || use jit; then
-		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
-		ewarn "them 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[gil,-jit].  Instead,"
-		ewarn "please consider reporting freethreading / JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	use jit && llvm-r1_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=(
-		# failures
-		-x test_concurrent_futures
-		-x test_gdb
-		# flaky: https://github.com/python/cpython/issues/121973
-		-x test_pyrepl
-	)
-
-	# 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
-			)
-			;;
-		ia64*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-			)
-			;;
-		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_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
-			--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
-		)
-
-		# 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
-				)
-				;;
-			ia64*)
-				profile_task_flags+=(
-					-x test_signal
-				)
-				;;
-			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 gil)
-		$(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}" 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,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
-	# pydoc
-	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.13.0_beta2; then
-			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.13.0_rc1.ebuild b/dev-lang/python/python-3.13.0_rc1.ebuild
deleted file mode 100644
index ba7b05698742..000000000000
--- a/dev-lang/python/python-3.13.0_rc1.ebuild
+++ /dev/null
@@ -1,658 +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
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
-inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_}
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
-	jit? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}
-			sys-devel/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}
-# false positives -- functions specific to *BSD
-QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-
-	if ! use gil || use jit; then
-		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
-		ewarn "them 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[gil,-jit].  Instead,"
-		ewarn "please consider reporting freethreading / JIT problems upstream."
-	fi
-}
-
-pkg_setup() {
-	use jit && llvm-r1_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=(
-		# failures
-		-x test_concurrent_futures
-		-x test_gdb
-		# flaky: https://github.com/python/cpython/issues/121973
-		-x test_pyrepl
-	)
-
-	# 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
-			)
-			;;
-		ia64*)
-			COMMON_TEST_SKIPS+=(
-				-x test_ctypes
-				-x test_external_inspection
-			)
-			;;
-		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_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
-			--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
-		)
-
-		# 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
-				)
-				;;
-			ia64*)
-				profile_task_flags+=(
-					-x test_signal
-				)
-				;;
-			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 gil)
-		$(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}" 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,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
-	# pydoc
-	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.13.0_beta2; then
-			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.13.0_rc1_p3-r1.ebuild b/dev-lang/python/python-3.13.0_rc1_p3-r1.ebuild
new file mode 100644
index 000000000000..f8efac0844bc
--- /dev/null
+++ b/dev-lang/python/python-3.13.0_rc1_p3-r1.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2024 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 llvm-r1 multiprocessing
+inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_}
+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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +debug +ensurepip examples gdbm +gil 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/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
+	jit? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+			sys-devel/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}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+
+	if ! use gil || use jit; then
+		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
+		ewarn "them 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[gil,-jit].  Instead,"
+		ewarn "please consider reporting freethreading / JIT problems upstream."
+	fi
+}
+
+pkg_setup() {
+	use jit && llvm-r1_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=(
+		# failures
+		-x test_concurrent_futures
+		-x test_gdb
+		# flaky: https://github.com/python/cpython/issues/121973
+		-x test_pyrepl
+		# flaky: https://github.com/python/cpython/issues/122136 (bug #936314)
+		-x test_asyncio
+	)
+
+	# 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
+			)
+			;;
+		ia64*)
+			COMMON_TEST_SKIPS+=(
+				-x test_ctypes
+				-x test_external_inspection
+			)
+			;;
+		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_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
+			--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
+		)
+
+		# 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
+				)
+				;;
+			ia64*)
+				profile_task_flags+=(
+					-x test_signal
+				)
+				;;
+			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 gil)
+		$(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 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
+	# pydoc
+	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.13.0_beta2; then
+			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
+		fi
+	done
+}
diff --git a/dev-lang/python/python-3.13.0_rc1_p1.ebuild b/dev-lang/python/python-3.13.0_rc1_p3.ebuild
index a7d766ef12e0..a7d766ef12e0 100644
--- a/dev-lang/python/python-3.13.0_rc1_p1.ebuild
+++ b/dev-lang/python/python-3.13.0_rc1_p3.ebuild
diff --git a/dev-lang/python/python-3.13.0_rc2.ebuild b/dev-lang/python/python-3.13.0_rc2.ebuild
new file mode 100644
index 000000000000..c5c03a0077dc
--- /dev/null
+++ b/dev-lang/python/python-3.13.0_rc2.ebuild
@@ -0,0 +1,659 @@
+# Copyright 1999-2024 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 llvm-r1 multiprocessing
+inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_}
+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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +debug +ensurepip examples gdbm +gil 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? (
+		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
+	jit? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+			sys-devel/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}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+
+	if ! use gil || use jit; then
+		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
+		ewarn "them 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[gil,-jit].  Instead,"
+		ewarn "please consider reporting freethreading / JIT problems upstream."
+	fi
+}
+
+pkg_setup() {
+	use jit && llvm-r1_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
+	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=(
+		# failures
+		-x test_concurrent_futures
+		-x test_gdb
+		# flaky: https://github.com/python/cpython/issues/121973
+		-x test_pyrepl
+		# flaky: https://github.com/python/cpython/issues/122136 (bug #936314)
+		-x test_asyncio
+	)
+
+	# 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
+			)
+			;;
+		ia64*)
+			COMMON_TEST_SKIPS+=(
+				-x test_ctypes
+				-x test_external_inspection
+			)
+			;;
+		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_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
+			--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
+		)
+
+		# 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
+				)
+				;;
+			ia64*)
+				profile_task_flags+=(
+					-x test_signal
+				)
+				;;
+			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 gil)
+		$(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 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
+	# pydoc
+	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.13.0_beta2; then
+			ewarn "Python 3.13.0b2 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.13 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.13/site-packages"
+		fi
+	done
+}
diff --git a/dev-lang/python/python-3.8.19_p4.ebuild b/dev-lang/python/python-3.8.19_p4.ebuild
new file mode 100644
index 000000000000..c76844d652c6
--- /dev/null
+++ b/dev-lang/python/python-3.8.19_p4.ebuild
@@ -0,0 +1,432 @@
+# 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 ~ia64 ~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
+
+	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
+
+	# 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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.ebuild b/dev-lang/python/python-3.8.20.ebuild
new file mode 100644
index 000000000000..7e418d6a23b3
--- /dev/null
+++ b/dev-lang/python/python-3.8.20.ebuild
@@ -0,0 +1,432 @@
+# 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 ~ia64 ~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
+
+	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
+
+	# 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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.19_p5.ebuild b/dev-lang/python/python-3.9.19_p5.ebuild
new file mode 100644
index 000000000000..0054d85150ea
--- /dev/null
+++ b/dev-lang/python/python-3.9.19_p5.ebuild
@@ -0,0 +1,492 @@
+# 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 ~ia64 ~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
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-x test_dtrace
+			-u-network
+
+			# 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
+		)
+
+		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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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.ebuild b/dev-lang/python/python-3.9.20.ebuild
new file mode 100644
index 000000000000..e501ebb6d652
--- /dev/null
+++ b/dev-lang/python/python-3.9.20.ebuild
@@ -0,0 +1,492 @@
+# 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 ~ia64 ~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
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-x test_dtrace
+			-u-network
+
+			# 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
+		)
+
+		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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 10d1387742e7..1671d1ad2f1c 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,3 +1,3 @@
-DIST rakudo-2024.02.tar.gz 6879828 BLAKE2B aa361c9e21c34cc5c737390ab6b1b8828afaa6aafaa604dbde273d68084cd0cebaf9c8bd796a394844f05b7bafc4f5d2db8a80a7bc1be8baab52b7a7f858bfa2 SHA512 b9bfdcbaf7daa80e6dfe1fb96e68482d2b110cca03067ef4e3e12270897ef0d53710d90fda97254c4cc012b3cdc4ec0c5d4a25facc5a0224a7579b96f9cd7aa3
 DIST rakudo-2024.04.tar.gz 6908669 BLAKE2B 681a13e0fcefd8a0187f99a4bd92f72833a74870933497f6cb8de0b2ab3ddf07ee4c492760c53cd623f6d7afd3593194748882400ea94e703363c58fc4ea3d2c SHA512 98b4dd35456df1774a320dbd53ffecc72323d91c260ce1264b2056624e8cdf8a47cfcd89b775411f8bf3fb1f1b4725e2b75c7724c5891a4d366e5ba3f2a11cd4
 DIST rakudo-2024.05.tar.gz 6923643 BLAKE2B 9ec3796a2638489dea1bea510e1fdb6b1877011944dd50e2a8211f5b2d564ae7767dac3dc6510ce281c0df840aea3c1888b1d13cac461ecf3c5b031e6d6d27da SHA512 12b0c61c3c13fbb80bc281c4fa2c9e2ecc2b9f24b11501ff05fe82f3208c8b2adec94f2181ca0926f40da4f27d611aa2420304c837d03a9f597925b78f837b82
+DIST rakudo-2024.08.tar.gz 6956638 BLAKE2B e3d063589be0a39557f0cd3cfeceb3cb97a88db7906a64f5ba37dc6099faaff7f451fff34a9abac1b8c64fe2959eddfa62218423f7684c71b4d3ce7c3286d947 SHA512 302b232b469e7ea5a38afec900746876a01bf6efc9ca8957e2f6a9328dccad81ec988feb2d0bf2a50ecd4c654624a819d0721a6da4a02653054558f1533bf308
diff --git a/dev-lang/rakudo/rakudo-2024.02.ebuild b/dev-lang/rakudo/rakudo-2024.08.ebuild
index 2af8fe10b2b6..2af8fe10b2b6 100644
--- a/dev-lang/rakudo/rakudo-2024.02.ebuild
+++ b/dev-lang/rakudo/rakudo-2024.08.ebuild
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index dd089eb96693..b3f0adeabee5 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -6,3 +6,4 @@ DIST ruby-3.2.4.tar.xz 15175656 BLAKE2B 9c2300a958b03528d51f0d74a069c8c538ca4009
 DIST ruby-3.2.5.tar.xz 15189072 BLAKE2B a37c92a0f751e81dcae328b8944c4ecf10f6aee4f4468d6d08bb924c9808c8556c5febb71a825dd62dbcccf56385138e6e306bf3efae3589bdf0512d16d99d1a SHA512 092348b84b513aec62e63ec10b326370d0e3d1fa3126c59c03c84f28e2d7741a4772c461b077ec6a7dac3964a20f434655729e1acd50a3438755d7ad64073305
 DIST ruby-3.3.2.tar.xz 16349500 BLAKE2B 2a474df10363555e8f0b9ad73bb854ad34f3d1485b8bdde833c999b20bc2c17282d2097d887d10f454bbd4dfdf08f04bb644a7e41d0b4a0ff0e9eb144339b5e8 SHA512 70dd8eb933956f894c52a8ede42e8ee74ff0e062bd8134a0bfb6bffc83a2848a658b62c8df5530b4dd64087b2d5373909c48917528facb1e6f4e99e79b6ad449
 DIST ruby-3.3.4.tar.xz 16366580 BLAKE2B e10b81ad7838e3d443ce0b12b8372faebb001f00a32dc0fa1f5e37c46baae99ea714e7f2a8741f0294255312030e844f32fc5d1c3695545cf8303e85b3255f21 SHA512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb
+DIST ruby-3.3.5.tar.xz 16403660 BLAKE2B 4fa242ceeaf0dbf0d048b3f116f149f299c1a0ccca500a47929344da523cd3c49365381777e56546fe94003ee90ccc1f2cc957697eb82cd8beb7311b0b00287c SHA512 dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index cf9a21622439..628c6c4c66b0 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <use>
     <flag name="rdoc">Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.</flag>
-    <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+    <flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
   </use>
   <upstream>
     <remote-id type="github">ruby/ruby</remote-id>
diff --git a/dev-lang/ruby/ruby-3.1.4-r3.ebuild b/dev-lang/ruby/ruby-3.1.4-r3.ebuild
index c75cb26915d4..d001f2f4830a 100644
--- a/dev-lang/ruby/ruby-3.1.4-r3.ebuild
+++ b/dev-lang/ruby/ruby-3.1.4-r3.ebuild
@@ -140,6 +140,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.1.5.ebuild b/dev-lang/ruby/ruby-3.1.5.ebuild
index 7c501cfa9b7f..e99079d0b503 100644
--- a/dev-lang/ruby/ruby-3.1.5.ebuild
+++ b/dev-lang/ruby/ruby-3.1.5.ebuild
@@ -149,6 +149,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
index 8ee6c384862b..9d129e2534a8 100644
--- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
@@ -159,6 +159,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.2.3.ebuild b/dev-lang/ruby/ruby-3.2.3.ebuild
index 1acabf564cb0..71fb23fe30c0 100644
--- a/dev-lang/ruby/ruby-3.2.3.ebuild
+++ b/dev-lang/ruby/ruby-3.2.3.ebuild
@@ -160,6 +160,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.2.4-r1.ebuild b/dev-lang/ruby/ruby-3.2.4-r1.ebuild
index 9a34253b7286..7152cb0f52fc 100644
--- a/dev-lang/ruby/ruby-3.2.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4-r1.ebuild
@@ -165,6 +165,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4.ebuild
index b6930b6a74e1..524d5af27834 100644
--- a/dev-lang/ruby/ruby-3.2.4.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4.ebuild
@@ -161,6 +161,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.2.5.ebuild b/dev-lang/ruby/ruby-3.2.5.ebuild
index cbd46d6f96c4..213e5f3d18a4 100644
--- a/dev-lang/ruby/ruby-3.2.5.ebuild
+++ b/dev-lang/ruby/ruby-3.2.5.ebuild
@@ -165,6 +165,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.3.2.ebuild b/dev-lang/ruby/ruby-3.3.2.ebuild
index 02b05be1c6ca..5c94ac824b14 100644
--- a/dev-lang/ruby/ruby-3.3.2.ebuild
+++ b/dev-lang/ruby/ruby-3.3.2.ebuild
@@ -162,6 +162,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.3.4-r1.ebuild b/dev-lang/ruby/ruby-3.3.4-r1.ebuild
index 0ef34173c25d..8cf5cb51be15 100644
--- a/dev-lang/ruby/ruby-3.3.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.3.4-r1.ebuild
@@ -168,6 +168,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.3.4.ebuild b/dev-lang/ruby/ruby-3.3.4.ebuild
index e96e95a64f16..fac732e48cf1 100644
--- a/dev-lang/ruby/ruby-3.3.4.ebuild
+++ b/dev-lang/ruby/ruby-3.3.4.ebuild
@@ -167,6 +167,11 @@ src_configure() {
 	# 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
diff --git a/dev-lang/ruby/ruby-3.3.5.ebuild b/dev-lang/ruby/ruby-3.3.5.ebuild
new file mode 100644
index 000000000000..8cf5cb51be15
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.3.5.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-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="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? ( >=virtual/rust-1.58.1 )
+	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.1[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.3[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-imap-0.4.9[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby33(-)]
+	>=dev-ruby/net-smtp-0.4.0[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.2.8[ruby_targets_ruby33(-)]
+	>=dev-ruby/rss-0.3.0[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.1[ruby_targets_ruby33(-)]
+	>=dev-ruby/rdoc-6.6.2[ruby_targets_ruby33(-)]
+	xemacs? ( app-xemacs/ruby-modes )
+"
+
+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
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+
+			# disable using security framework (GCC barfs on those headers)
+			sed -i \
+				-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
+				random.c || die
+		fi
+	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
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" 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}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		local -x DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+	fi
+
+	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 4317496e2762..659cab6b5687 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,40 +1,3 @@
-DIST rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz 209991076 BLAKE2B 1400684c4bd3349dd73c5941e8edb1ba3d334522651d8c8fc614528197ad661d99e58165ab6dc0c384b1b918161602baf068a2b199c103cd17b6c8082fa22b62 SHA512 2a99e296f973f7eb91814debe376b3eb30c0950032c8ed8894d23b0509d2e0b9a2da4aa149dd809139bbd5625a2ae917b71a34f485ac78f07a8b83037b5983f8
-DIST rust-1.71.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 98c26527bb54799e76ffcb637e4c8a5e1e84115bc2aa1f918e1db5b626c6b76a5b3ae86ee6f622ed2050f5685c59dc35f43f3430e8db121396d780b917a9e049 SHA512 66bf98344620b917992b6b6ca35f7ddfb5d20cbe59eaae9ab05d2b8a6badb1a44a4c4e0a18859d2c5b0ccb3e782c9d8a215f6765072ca488943e7055e62e45c9
-DIST rust-1.71.0-aarch64-unknown-linux-musl.tar.xz 193402460 BLAKE2B 7f637ceebf6319b79d61a93a5fbcf70f10783fb9d049a0273f7fe2b38a4802e53e115e3b058aa240cea81ff8f8ccea714bfdb07ecbef3b53b1cccf33c4a6700e SHA512 2bd95b6036680d9e8890e6a1e141c4df6b70e24e4a7c3ea47d02cc0895c6c4693198ecc7a793363fe18a9fc6fd665c4b52e7a315fd3a75883011c1bf874b5c3f
-DIST rust-1.71.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 56484d4d5486627f358f83d895a1314b8652a8bca9d1b09f6328421ac4e32ae2d975859c5ee3d68ec1ef1275a3d69a0b3d37d9d9665e658725dac0c33444333c SHA512 d4bb8be012ca57b5ff11b945e0208a13a823025a3e8c3c8cf6c924a812e9556d1db7a61588beac7839504eee1714e1f15503ebad1f7558be32f339bdfe3a6fd4
-DIST rust-1.71.0-arm-unknown-linux-gnueabi.tar.xz 173764116 BLAKE2B 6ca4784b4a844b799d36800fd88126f4fc1d6f2a9599d8e5d9c72a008c06770d0d7ae474306870d83e64373f4adf6a5f87894351cc5780cfb66084eb82b11b21 SHA512 e9b54549e6ac416ee3c261c9779c7e970d99279b4dfe4a032c438f4d854fd7392453873adcc3d6e4d138e0240dea2351d3c08698b00edc5858fc17951df0cc09
-DIST rust-1.71.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B f8170dc6faf26f85259a4ded0cc462e9d59c5884ce0943efa185d5a4bfeb1fb9de1c254ceafdf86e7ddb2c4ec1417142667e52c58b18c9932cfebfd9adafca23 SHA512 e0380cbe0dc2af9ff0664c59c17c8e9c521bbfbd09f2af9ae7d24ecda2128a8f260515831c08ee1220bde36fbf24c3a0f4b251376c5a143c20a868d0bfe13307
-DIST rust-1.71.0-arm-unknown-linux-gnueabihf.tar.xz 174050576 BLAKE2B ea0698a4073cd288f4da89ffabd2c9e28999578918e224891115c48539bcb465aad693f7efe0d26592e35da23a43c1689130126d89ea3c33e74efd4e10375660 SHA512 34322d585707e60c5896752b7181efc9e0904869ae24a1228ad243b8e693687785ad6321f93e9d4695e491a614c9ad2d8619f977e85904b0b47f0239fc4d59cc
-DIST rust-1.71.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 8d2176f2921601b46fa31884dfe8ea4c2676ed5d0beda839216d3686fc6b02b0d35a17b0f6a3c410672ca11f488d3f1254fbefdab96e062e93900d19cccd1c8a SHA512 5df4b6c60a132cc05abc121f25db1f04cf7de3c14a46490dd103d72b59e5619b1d3b4de0caa00997861d719f8d12ff2aee661358052cdb9e60e269f59cfa44b5
-DIST rust-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz 178354684 BLAKE2B d0f98052377d3a6359c00ae9aa716240f2a73b41a6078acf855f7518f124ba69a07add924772159b566c16b6aea7be3fdba414377b552a1283f203794a7de526 SHA512 34324db7d5a06c6d57a954aa30da70d8d16b1ef90b0681e0bde8c55dc4ba208125a7b2f969462853c11145152f9add706e61a6cf91afbc4316762a7cb236196f
-DIST rust-1.71.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 26eaa3a0a2643db61aa7e9f08513d0b76edc4963de2ad52003eda2af26f33597a4a68a211e0579c324fe55bb0404a45473b1f762b13c0ea2ed22657b78c922ea SHA512 41c8ee305e0ca0e703da55c1e101088ca7efb2d7713f3745ee02473c77c2e6fb1ecee53e206fa5bf22823486fbbd3c13a108ac072d0acc18fd5bb1bcd09dcaaf
-DIST rust-1.71.0-i686-unknown-linux-gnu.tar.xz 202182092 BLAKE2B a00b28125209bda56b2cff4dbece301dda405d3181eb081df8fd57bcb7722900f709ef4dfb3130d4a85e252f17cea7cc489de691199316a9652357b5a2857a63 SHA512 a6eedbc044d59e13d79a251c5cef250c41db1680179a7011682a5401e0fc26afeafa50c91a0fba43b723ebda29498579eedfa5f7b1f69df4c540076c835bec72
-DIST rust-1.71.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9876a0aee36b98c160b16eb89b3d51488b780f937681dd7b530469f5f0ddee9e8212048fbfb28f902f4ecbf2ffc667d4214c114f9689af20aec9e908679119b8 SHA512 51ef8bd55e656179d70c33f49387e94dc9d1083630166eb1cfd646b0601c3abb97ec2f244c5445a5612bdcd14d84ee82523db9367d896e4c3e5795b31385973c
-DIST rust-1.71.0-loongarch64-unknown-linux-gnu.tar.xz 157813464 BLAKE2B f5891e63685d5d3087820190ececffcda16ac1030a8bc26845b6c7c944040b676adcaebde2003407dec9994bf2dae6be16277a0d3ca0c7f47e1ef744caca90ae SHA512 1872cb88ef536609323cd40acc40473f295699a8d008ed6f9aaa3c2f6993f61d17f798d64ff071f1b4ad8d2574eaac5e88fe431dab35304aefbfa72b83faf4db
-DIST rust-1.71.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f799bb6a169dfe5f681bd8535ff34d3b42bd0085aba7491a64ba16b3e65475e5ee9c9f35347be6af9bf35f2f40beefa7af45c79db6b52f7f5192b63b8715cf3d SHA512 84468e736a7cd1d16d7ba065f8162e34b277459d76f47204dc8e086dcc994f0d1b155ef6784018017d7cd92c118c4f5f768d2b8660b388b531f7d6b53367dd36
-DIST rust-1.71.0-mips-unknown-linux-gnu.tar.xz 152295116 BLAKE2B a3d08447b652a2738bf04f15349c6f733290920375e78be905f26e53e6b85811f9d1b0bba3cabf3994470a101cd607b162bb8f60220f258ce17cbc01bafa5902 SHA512 418bcc86c93806dc51f7da54ac5907f53b84381209fe02dc276bcb378a120332ea0df154e5fb4b28aaf425abba047e1265ca888533e3fa55683a402dfc877be1
-DIST rust-1.71.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fc5f101c57de8de6fa69a125ff0fd5f26cf59e5521c566047acf626c4dd3fcaff347636af97441e77ac5edde7da41720a4c4d381cd62e5aa5c7026f19c97e195 SHA512 930467025f3a626e3f439eeb61cc8b873985a52fbeccbe853f67cbcae197be8c7b1a204b433b0dbce35c8f873b54730f427bf97e9cef4c3ac66abead25300d11
-DIST rust-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz 150684312 BLAKE2B ecb130f57b555990dccdddb861b56522605eb3e7552f5eaf8ae4bc93056746fe540bf30468fc03cfd86d3daa9cf437f1e245c28f5ef6392a8e1ff8ccb7418e90 SHA512 029b897ad026f03faf1d73565963c4f1013f996143ba72de06118aee960c176d0320dbf81964bbfa0fe2f50771b5afc156db353a318abd9f0e8dbb5a5b4dd46b
-DIST rust-1.71.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 5f72f40cd2d5e5d0bce8d7efd612fb315e2102dee6a4feaac6340047f7fea369956948939cda6632948e778cc41c9794e11a25f5a814b5bfe2037ad157fff660 SHA512 54bfe40e378d565bdee3628e87b8e4facfebf2d88ee4a9ae64fedaeef14399348b9d710cb770c2c36c6fca9831488371078d6560b9e641619775eb931558a5fd
-DIST rust-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz 154483548 BLAKE2B 8cf96a0636b55c037869f944250bdec80b968f396cdce7398dccdbe691fdeb545218e899774e7386e6f0cb7ce5cfde8d1ce6b538fa887e5db7d675dcce6a592f SHA512 db86f3fe6c7df7ea0e49d75a44baed9cf3219fc967edba16be583b1b3fa9815eca84d302e2e01bd1d86339fbef7d2b4b3fc4a154fc07b6d0a9477a7891c54be7
-DIST rust-1.71.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 6b1cc481b0dc991134bdd97dbf27e5b7ba2b0c51055755f835ccf6062c265c7bcf5c50a9edf67aeb2220bac6ae6ce1d9540893ae26a7fe3ec19353829b3b409f SHA512 a34f37e79bac3f09e1042a330e039f52c9ac4c7dad501072555728fdc6825a5faf33b87ef72f5756e26c952360b211f2d0f9fb00935b9cbd5bfa9e052b2d7f86
-DIST rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz 156128712 BLAKE2B 29c995bbb9b6fa5f110fb3fb1d12018084b229d913ee4b6b30549081e8f6eba3984c1aaee50e82f4b41c379476736a580805bf1c74c10888e67ab6bf839207d2 SHA512 6779c9b7f75328a07eaf1c358c2ddd46f9e17b15e667e0b668422b398be70343f1ec49237d9e3de47e144ad13b49006b80ed0945a81cad18c7cbc63119755e4c
-DIST rust-1.71.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d0c4948f3e46a215069fe58575ac7ada4a1ff93f5efa85046099c908779b3eba52cd5120554ee92bfe014c681fcd6efa6992b74b8dd6dc00ef5143a056704185 SHA512 ab931513befb14061f2de18f7ea901058c1991deacfef0518156bec8915bcf10502711b106147e65b3ebe1097fe5a088e0bd1d2f0159fcc8fd716faef5e086c0
-DIST rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz 173001556 BLAKE2B 15273f254ae7d60cfe2209edcd9e9c08c317caeac5d35b899a86c84dafa97af154e95d0abc73b0cb72539057b68faf1fcaf5e96483060692163fab04375bda9e SHA512 dd402332f949599440ab2c3d7e1335ce3191d07aa3c4aa36b96e48ee61ea720d1a81d707e89de8717bd76a21b39b300de92ebe97c83421b15ccb4c7c3a5c07c3
-DIST rust-1.71.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 08f7a28a99927e957abedb7a56b23624e5d84eacfcd6f95538c2e20575b7da0a64c51453aff85a2a715aa5d3542a23cea666eaa2682e94242e9747f8c2925d2d SHA512 ccfde9ed8c614aa315dd3ebba5a55a08510b1e04d256a0ff37150cf2b6bb30a6750aa7eed72ed66b49b85c8ae3dd88b579052ab8bbc579e9fac102fcb1dfc5a7
-DIST rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz 172593332 BLAKE2B 82eeebf794b989441fc5a9c18ff1165b36de3f29412f973af4a229475f50e7ac477a004b96605d2267a1bc0f56c8bd4fe66f22e360fbe4a071eab137afcb16cf SHA512 ac3d27414d23dc2755f5683f09f73b1a36e35b7cf77edc746a62c76ef0a83361e8c074db37b716f5cfc843264651ac7bfdd7faae3d8225ef9177bac5975bf331
-DIST rust-1.71.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 1e034a4bea8c037ea22c87255c8ae91d338e8dab5830f7aa1138aad32742f97e42a64892f2d9b7b967ce192925c95d75a1a0f5dbc575bf443dd38e353742f5ab SHA512 c068875df6654db7305ba520e75c4ddf766a23905a4206a7a9ae0d414cb493a6c427c3f5f4bfc2111209e42b390bb54bd0eff7ec6b257165d1cbb42f47057b36
-DIST rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz 184310820 BLAKE2B 8a619e8fdfd8310edad2604285ba307124d6a91c46ad6a2449188a50df0dfc7f3aed1140e3da7ee1d589710386b166018bb1a207befb456d9dd0b98c1903f4dd SHA512 841b3aede46a20fdf8a9abe7178fb314ddaa6ed568f3eee9ba085d5a8e9ed320ca8096f8c864a81a524e7978856538bdbc21e2031534f2f72943bcc137c700f3
-DIST rust-1.71.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 74acdcddf4861469ad955f2aeb6feefb2eb07beec2d781cab1ee5b567572b2c9af0d5f06dde4448288e15ca86c2a7c80777a79f4b1df2a592d0158b9d46b22f9 SHA512 6d237e26f9dc6ad350d582173cf96b2e4e495d0cce033b6a2e9481f2a6facb533f5f422753bf826d44e8c43d87cf048a5431e18f64755b4ffa493dbcb9a5662e
-DIST rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz 164997272 BLAKE2B 816cd02dcab4128faa8321f7134188231983a7c67f5cbb52fa6d1be5370a8acd7ac01123223a342952b30339219dc4ec6f58383dd98b955f7d5809af8e918592 SHA512 3bcf6520781b70d38762af142e99844f575887116da8f7f117e4f9e1b568f85a2d997e66457c64ca7e274598454e26f2eba2cfcf395fcbc083097115763a0b03
-DIST rust-1.71.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6ccdf48a7e345367bc847e05861c75561511092ad3459fa15515b500536b36d2d94555cb130dc405fb2fbc49c00fe18c20fc27b24c5c52d066c4314e321622ba SHA512 4fc85f2169b9a3db7747736837668d07d8ef17cb701a6300297ccd20700fb538687897f8c8967926ee06c21bdbfff37eaa3a527b9a0ed111bbec4914d6461b4d
-DIST rust-1.71.0-s390x-unknown-linux-gnu.tar.xz 195655276 BLAKE2B bb5ca6d712fd109478f1fb33fc224ca2dc6b2d2f32bf14892e21b1918d8a201d815cd899210cec546763b07612a0fa7d734704ce968d96b51feae430eae2fd97 SHA512 f3128d9dfec1ee3c18815b2b26213dbb6624e7f0094b4dd8a259e12e1482eb5a984ea90bbfe287caf1bd749cc30e6fa3cdf25978ba76edc99e58deba7a7de9f4
-DIST rust-1.71.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 54e1f18d7130c7759e0327dd46361ab9755ddcb2738d1ba74b0fea622a7aa0bcee27221bb6c5acf7c6ec4da79d1879ff581e9f87dac94d649cb86f8269a7d332 SHA512 0241b9f02635211434b174532899351d2d273529c67e4f7e94b690247c4a3fed542ac97d269666e1fbf4e5a4297bd68f3206b1c42a980543f84b279a0aec34e0
-DIST rust-1.71.0-sparc64-unknown-linux-gnu.sam.tar.xz 57339712 BLAKE2B f4cd9826be28e9ed449f9bea8e6be70d0b453ad687e29db3770a92474901e43b8925afebd611a402e3bd67c9d7e54234b02868427fb10d7b05d7a9e8b984cb32 SHA512 62c1fc936bbe5989adb97bb001050f00b47342c318b2f534a4bf90e872cb8eaca1244bdb44f20bb9ee210d69fd9ba09936aafc63972ecb5a09eac0367c334b28
-DIST rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz 161430980 BLAKE2B dcafde40a19b0ee40f45d627e063deab934ef3d537f07fca1eaa9b0ebd01bb16a3f6531b50f7967e8fb6216f446016f73095f28bd57487a7f4676bd91097257e SHA512 fcd8a5ae5bc28bf691d37b1abb9574d98a8daca73ef6e1853363baa545f317910230fcd655d4bd4116b93a58959544728f96f785dc9fb9bda109767e1fa54c42
-DIST rust-1.71.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3878bb57f44a1d08b6bf9d61b69d9ea1107e0d2d8de51298f2be892e62eec60788ffa1c135cea4a53dee4564cf31aea61f8fef9a3bfdb7451094955a51d5abd2 SHA512 053f7e253f0c15a98491544a27172c0b7bbc160c169c42629d29acbfbc3be6c94a0483b6b8efc2bbb19b258571e02fcafa33cf19fa316a51f99a94d120b0bd45
-DIST rust-1.71.0-x86_64-unknown-linux-musl.tar.xz 232159228 BLAKE2B fe57a684cd3b5cf0d20e62faf8589308f80342353e80c17dca76da7772a7c1b2debbad7d6b8453d92af306f3adea97f85d7a15b858dd51ea237a41748243c49c SHA512 3bbedf056e176a2a00b8d151b0ec245e18ff109816a665a2b913c1e715815cbdbbe42fe470e8f78e0eb7ae0302f41cef4132cd02e58b550695476a2bb4f49979
-DIST rust-1.71.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 48edbb815080eb34dabe8361e05b0ad73fd7d5c96eb277ef4dbea397a4b78124d8ebdf680da1c45ffce58b0b8ea635d7fecd04c0e70fa5dc61030bb76315c890 SHA512 2beff44790ccba5c6fb414038e05846285f3f62f23b880454e414b449a442c7e09c54fbf9c3b4cb5265b13c18647144d73f3a9e90b4c64323a2b0be42df2f5eb
 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
@@ -72,35 +35,6 @@ DIST rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz 161080376 BLAKE2B 40bf80551c032
 DIST rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ce029d9af59f26535a3fa121f20672f7eaad5019934457ac7ddc059dafcb2c3a37e5683923d4bba3f3a735805f11092189cf84d0a6352a5f9f475bd3eb00cdf5 SHA512 0376b16b9c845738c3c291ab2a73a3ecb20cbb8bdd0820568a0683c84b211e639413b3046d756e607a0f1b23695c9dcb351711fcc474e6faa8fe3098b1fefefd
 DIST rust-1.71.1-x86_64-unknown-linux-musl.tar.xz 232096648 BLAKE2B 7f4deafa57baa300f037ce3d9dbd101d5d28cf29368c4b2fc8e51799e59382155076aa0a3c0b6fa0c076693fd43dfaf80ad7685cd44233d7c31037c091a90224 SHA512 55b507a30d62a36aece4a2c2cab985e09d9552ae331c1cab51d949777261600e61d4f05ca1e81fe8b37591fb91939b1cdb55e6930d70e5126eea1a78caa74eb4
 DIST rust-1.71.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B d4a9f89274bf4b0004248764c07c7f82f8708f81a826d7509611b75e51d280707a75ff2c9d6b372e79259f7086b3e962afe51c3f0b98dd3fdd4feb683783c9fb SHA512 8be13b63b48740bec80772a826f06a012de58b1294f87374d7b4c844c90f3093ffe86bd3f1d989987696aa095302cc4644e3137fa2c9e1363c9ae8c3e1a05268
-DIST rust-1.73.0-aarch64-unknown-linux-gnu.tar.xz 216033148 BLAKE2B 78bac094c78d68102cd5ca6a7bc9ac8a51ecd3e14cc5c66fefca0a0597b5ba439c22d69a323a6e7cafdfec60cadf0672c91ca5f85065ac8d7913c83437ec0256 SHA512 58198ebecaa4652e0477eed6ad2c29524e7a3e991ed437775281ce526c8485b2a1a49c75ac6fd5bdcc6cb997cee4d1b4d82fba49c03ad38bcafa764f5a9bdfb1
-DIST rust-1.73.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d4b85efab3aef10fd6940630ed3cbf6cca12961228482ce42cdbd4c0c185c55b9ccecb1ca386e7a5c02fa33b77685dc8e2d619ecdec0cb5afc7a01402be5a22e SHA512 b7392e301c00e2ee1be692e6b5a44fdadc4b442979bf8f09fe71f80d82b6f395d0505621ba8eb54fe6145812f7f9c0d2b278e474d6edde51a2318cf27f5080bc
-DIST rust-1.73.0-aarch64-unknown-linux-musl.tar.xz 197525740 BLAKE2B ed84c438426bb0fc9a5a320731ae448f242b70a764d67e46e53a37f0e76262a183886e83fb27166e030740a27e6a79ef1c8f50bfc4a2c9c5d915ee5fa74a251f SHA512 b1a3007217dbb771e459b92a2ce0efca3babb34e9901cd44006d7c8ca92f48f67bdb877d3ec4710c58ad1645da4830a52cc2062b6b5a9827b8d57d508f4029a6
-DIST rust-1.73.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 2e2a965b37bdeec12fbe3f605c4bd10bb51adc7dd1c2e2d185b7306e8c75415d678b1bd83eb68e8a05099eb77958a928e867f87b0a4f05b5315b89869f120a64 SHA512 b65b08a68571cd0cf17f4469c1eb95868e00e6244e30ac0d3c30e0ad6abcaed143a7389002c0f90b2ddbd79b9c9c3856d66387f701a8d0eb9f1683ce456e4910
-DIST rust-1.73.0-arm-unknown-linux-gnueabi.tar.xz 180327600 BLAKE2B f28725f19259806f934298d2b6dde6bf59e5f8bc3ee0ad9b1cf0565a5383a31189170f26495b3103bbc9d86d2ac9b83147b3803508a53b96eebd214d2b0aff90 SHA512 27900c5faa9076db40cc85d973274a09ff44a76936312f905a3d9751d0b7480dc260ed3cec91a65bb78382c67208b28978e2079e28a47a25aa6279d09adcc045
-DIST rust-1.73.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 03ad365e06dbaf30d4ca2d8d2d3066d4f956ba5426f2c5b601c3830d9b0741b3655d26eafb3853b41ab01dc377065ca330f9d6fcf89de066c50adb0c9c9fe3bd SHA512 ecef5fe8359d8dbf23337398c1cb90a269ae169a1cd08525361d6f39e0a24dd22c1819c7ee0fe3828431ad492af89d19bf8c3c7b111f7925831362e2050d1040
-DIST rust-1.73.0-arm-unknown-linux-gnueabihf.tar.xz 180870680 BLAKE2B fea49832d8eefa7545b76114874de3d653ed888f753b68cd7636b7a1462bb564e19bbe37a5f3b94cf9a06640bf81f6fcc97f224f0f3e1745eb19f99ae193d3af SHA512 3648672256182cf6c73e31a05af3084b996bf25e1ccad8b96d68501e57a4ae4cf57befdf84db27e3e1a9fa3af051117e94ffcefd14246794e7528020bc26f4d5
-DIST rust-1.73.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 7046fad305aabf192a1084328d739754bf76c27fd3f1efcc4be36047ef6c4bf899ef8ae7e3cb359e23578af4c9a25d4e1f453ed8695ba33c630d46351234de69 SHA512 7e046b79d4d0a1bee3c7c5f6b8e3020a342a39e9913a24ef672aa1d197e63905653acc24652b720a4b996029661503e2dfc3b678f297ce15c548281ed772ac23
-DIST rust-1.73.0-armv7-unknown-linux-gnueabihf.tar.xz 184898496 BLAKE2B d0b2ce03ce7ab5e2c843989958a00524fc59000f62dc07f9783f4b9f22c734b67b33e403e3300fe3350322e1ad2b59e64e41b339d5f5c258b29dcdd98dec9c61 SHA512 ca48bb9b683058321b0ae770faf2fd607e03ff5e9291626ccbeba707f5ef8c211c29b9ddf52dfa11958691a127f95dedb742010018bbd6be2fc1d7ddced44190
-DIST rust-1.73.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 12e19ff5f586a7f67bf7e4f6ee96d919293500bbfb3bec306b412a423a3dafe94fe63939f371a644e1d3a1575a6a21df78f11ee63a8dbae9af3a2ce6b03d5104 SHA512 9e1f316abb8f7861fe1188aba1880732b957514fe58de3f10e340c430c1ce64e9627feec1a655335d33605cc6f5ee32830159a8215c5a233f25ebff18e2c7bf7
-DIST rust-1.73.0-i686-unknown-linux-gnu.tar.xz 209918920 BLAKE2B 545c48dce0e275228e260669d0f5b93977a9c7a02237d4ae9d84ed69236f5e412c5980e2c5823478949214c2b775c89c836bbd43e25406c20fbdc52cee328240 SHA512 a80742d14acc1d018ac35b77abba4491b5eafe28bc3173527c865b0e930572f2a92d4fc459db51c34600f8288b20b5790346b5f8e6fbdfcb080f1f14f44a2db4
-DIST rust-1.73.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9800a96cf8484b0370f343c2fdda0762bab534fa7551a7716e7665bc90b651207c471ef5e06b2d7acb766959155b5d593b375487b01cf65e980ebc721c3a4042 SHA512 dc0c25c270701ff6509bbff3fd173178ec8aa3e5cf606fe87b803e6f1279dde3571d22cf0c7f28bb0ba5410c08a491f9b9b937d0aa796c0ba30fe43f7e381c1e
-DIST rust-1.73.0-loongarch64-unknown-linux-gnu.tar.xz 161763960 BLAKE2B 1ae7019055a4fb457733826750d2c20708e7d8bfeb8532ac1af5027387bd1f992c2ab1fe08d088b07581b0a81d7ea7ac8e44ff077887297a4d4da2a633089de0 SHA512 9840e1454506e3f0880e8113040eecd1b363bb78371386aa069271e18e70600f81e19358539785a3bd1ada7244b4830362e6f0b466798cda7647ed795072342d
-DIST rust-1.73.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B cacbbd7793d6f693cf2c1211529cb4a0c888f3ed4d8674f610e034a7216fcf7f4ecc85331aaeaa89ec02c1412a62fdbda29a3bca6faa64dee0f8d419d055b41d SHA512 64b8594f2f19151927f5b74584822a78b15da97fc8f5e4823dfc222056a203ed68ced70cca915e1694ea6b36fdef5697e5b56062cb761a0d9557e5c08ec8ea07
-DIST rust-1.73.0-powerpc-unknown-linux-gnu.tar.xz 176694620 BLAKE2B e8b43ea4b9ad78ece530985afdeb140e0e960213272857cedcfe4e9262c190c7d26ce77d46fd113d2742cb159442c256a081bb6cf23e6977fa5ca8c6cf21ec30 SHA512 03f889dad45d1bd9ee4af52209af3d763ad5362cf1a617c86b050e0d2fe00c39edc716fc32a83c6e45c118b97d828c32f682ffec5b32f215d6694509a885772f
-DIST rust-1.73.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e63cf87a2fb0584f2fc5c01a98dbb12bd9a7f4aace54a08505a0b4f9e7141705409d8bff1cd3a2d7cf40504ea274f29e11624ba050d56e4ec2a4e794fdf188f1 SHA512 a86db43be2a2fd92638e6355ac4117e707073fbb98631a8b41064e5b01e12bc1d2c594547778d9c99ec3e24c5c4dce6603cbfcb3715b11aef9d2c2758ee8b7d6
-DIST rust-1.73.0-powerpc64-unknown-linux-gnu.tar.xz 176165132 BLAKE2B 3750ef413de00047fa957ecc6c832995e072b58b78f994bdd6b8291583acd0a4ab54634d4e4778456bce6420135c83e9961aef5e615fd62806531686e33a31d8 SHA512 9f1a669f7d532a831df76292916493e1bcd4a56d95d3819c477898eb0510bc8760d008fc1e7d383927f8afbeff826b0598f9bc4067f692f530856c8e444f44df
-DIST rust-1.73.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a1c1db86107b48a554d815811b518f7b28abac90cd08920362643a538670e7859ce43d179de24551b5e4409e0a421029e66b8374b27ddd699ca68fe0f47b8904 SHA512 04604baa0f13693d4bc7a0729df7041a55c0cb9efa11ef511d29d2b5a50c3575867c1ecbb6a23a030dc014876bc9c02e370c8d0eb531249833fbb52dd964f2b4
-DIST rust-1.73.0-powerpc64le-unknown-linux-gnu.tar.xz 187628140 BLAKE2B 1ab716a7d2e536ca3447fc0aa2751d774259ea2e39ee3cc150bfe11967e57bd85b484cf050a39cba717a0552dabe6d1aa79ca7dc24abe4b43d4802fb9cc1bc85 SHA512 d6566978f47067b84715ef39756721ced5f5430d5c92f51b673db39d1e1666a8dd933e998d4fe3ccbc36ec47c62b4fe7e335c4e3b830d27571dcf9e534446d0d
-DIST rust-1.73.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6b3a29cf580d750a17436036d6bdb2457cafde123c289205aa239457afa4de10b4b97c9f3ccc23cd296a1a388802ac4f696c71e45a2ff7c97d15d63f2a04cba3 SHA512 5840b7986e9472a4907ae01eee0c4a40664ce1a29ff159557766bcf50da773d246a74ffed2bc5bc735d255514e0daba55d10bdbf7d8d2c3a6aeebd704f3009b3
-DIST rust-1.73.0-riscv64gc-unknown-linux-gnu.tar.xz 182202208 BLAKE2B 836d89e6ce276d100edce8016f5a466b99e8aff2646be7e58dea2f38678e4fdb9b93fff1126573a112e19cdb32ee5290fa58df0e5cbb1c309e65927ae1439b52 SHA512 c49031996ecde5dfda4b8bf3869b37ecb51c89e3fb8f69d3d43d865bf2ed6dfa928f0239460f0f3c7b7168eedee9b5a957d956f39ad42fc7276fe64a649ee501
-DIST rust-1.73.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 119d6cf2b0b4f8950d51aac6eb865619412e513c6c87f31702572cb2120a20cb23133a763036cbac0a9977a20dccfb58a8b034d19d13892ffbde05c01970ec92 SHA512 578c2576f66d0ad344549a94cf83f80551dbec7ecf2ff8616d81cd1eb3a7154b89701a05caf6a21649361ccdd1abfd37b33de935e91dba02dd914945de3930b5
-DIST rust-1.73.0-s390x-unknown-linux-gnu.tar.xz 201224624 BLAKE2B 5f9f28c5f511a3bd119233e4a2b882119b18a42a8c235bafc57f35e365496fe9d6d88c6278e014345f76a98a235ecec31335178a6b047e5b2188d391ba465e70 SHA512 e946192961623be1e3ab4b3e2c86f16f9fd716ee3ccf88137e6ed7ca92b9e8376552a9b46b48c127f6be76a1fc7b240d9b8db568390fd7d81605634ebb431ea4
-DIST rust-1.73.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d05fc43c55e47b3a32e8be8f97b072961e920ed09d368968d1121dfaa0dc36e11ca61a0b03df2f708d0eff31a80367b5d465434b851da4c8ff00ce9ecd577bce SHA512 5950cfd08f49bfd0f1277e2f07e333e7188d65d6a61d738dbe586bde8f3647862ef6d6ca5f52d74f357ae3997f1554a2c7cd0399392cde7ec32b1f2aaf8a4c6b
-DIST rust-1.73.0-sparc64-unknown-linux-gnu.tar.xz 56696716 BLAKE2B 82527d43276edea2e0660172c000b214090ef7b1ee75783fb24e9db864285bdbbd6a364361ecb6fe6af0c32d16d0283a9dde7078f55ff9290ce6859460b8ea42 SHA512 eba763109d84c32c6fb5fb1a8dc9e11a1f83bd48d3779e0a7aa2edf97c3fa4b6353a978395409ae3f1c78910084203763aed67b42000c77b5003f8cf67101dac
-DIST rust-1.73.0-x86_64-unknown-linux-gnu.tar.xz 161588916 BLAKE2B 10c1c57641e2ae076c55826985d8ef43034a3e4b6fd15d109f949e8bc655dfb16d45ce86482992cc2aa3f4000f3432b8be17019f9f5d29a92fb42c37cd7df72e SHA512 b70886b5ecac41a7e6ea85d1b2d1aa557a0395d3f8abe4b8d1ad91f3b32ac9ae73bebfd7a9c48ebef4141be041cf5bdfab8bdb78e1b4969afb439daca203d5a3
-DIST rust-1.73.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 22e68ec4e6bfa49c15344675abd20ef9449d928943dafc64bfa1cf78dd36ccbce4802af8d4adb84762194dabc512efa74655a93785c127e6942ebeca8f6e3303 SHA512 56e53a1047a23a7f37250a785de2422ee2a3a72fdedb9a02530b3cc1cd978370cbbfc0e67d75f3d537f48c6c78f91d3de949ac2c9392a79404609b169cedaa40
-DIST rust-1.73.0-x86_64-unknown-linux-musl.tar.xz 236190528 BLAKE2B 062b54b31742bc846bdff63fb38be3a3a1f6d2f061da26cee6a0b089feee995fe3dbea536675495ed75d47d657c3d4bf04e36f6752f59f8308f7eb9a397d6e38 SHA512 abd01e0c98a8aa447d01613e24302ca81a8cce7d41179ed60834a39ed1942de0459add3c498a63f94bb1ee8662a2750b375b49894e3108da45f47d3a643cfdba
-DIST rust-1.73.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 9822879d0f14eb5387a623d111ed7a3b1ff038522c071608bd254c4b3479da8a1e9ed78c69c267c1156c45a9cbb2f7db00d123b85f28021a743d392d1cb65c75 SHA512 ff65fd3ca47afeb10f7434d8d4f91b6649739167639c3eadf178aa1339553c5316bd0bb393cd53fcce17c126dcf8db1f1dca6e87044b14762bb20ed8f5a500b7
 DIST rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz 216291888 BLAKE2B 522c2f2b27f9ff81968d7aa536d2f909bca4e4ca6bb341c08227c87e7f25d9808ea6da74ae1bcf3a7bce4165f1d374fef21d352bff37b7241d19d50a624a08e2 SHA512 57486ce7f4ab8fa6f8091817790396df5b9cd31b4c9901b9969fe5407908458fb384423097ee27485c03dbd30d0cb15c3e8f0e5c15ef4ad17662d91685e8caad
 DIST rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a60c4878f4441029f1f23e6a9a29046fa2d62c1aa8bf33c5ae4c0e986d67ea64688a3fd22bfdc01e99635cc567d87a94fc9ccdb8e512cc4dc8f0378d22eabbfc SHA512 3b2c3d1ccbe5d18c4b8bad62337ddec6306bc0ab654fd75962403f79b86f669ede6f8754327f8375cd4a12f74f3f4df4e183a85f8459de015e6543e17ca80767
 DIST rust-1.74.1-aarch64-unknown-linux-musl.tar.xz 196804076 BLAKE2B c866cef7698da867e8389bc6d460f67486e52822bec516256a8170380d8a2693732c18cc18729b980278fbe3c6fd2d21f1470fea449e66458d5481ac00728824 SHA512 54b9574f624dbb1b8399747e855eccca38dee76c2b59d71fbe41bfb05c1a784bc38d383e7aff0ffb0b8c2c5878bd0f8806e03d1a3c2a6bc4a1a9483d711641ce
@@ -159,35 +93,6 @@ DIST rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz 156249584 BLAKE2B e6ac90854f589
 DIST rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6614cb3ef782c917e8f7fdc990c5b82e8fcffa71e075f10f9726f405ff566fd963bec64cde4dd7252d9d78e09a184b8ba22d15cc87662ad987cdd37c881d8288 SHA512 bfaeef4cd7643879991955fd33f4cdc4c34afb1202cb77c0736434fb735bd215d18d1a11c25f04a7f2514640858a36832e5805a5f85e92d8b7076aa18607ffc3
 DIST rust-1.75.0-x86_64-unknown-linux-musl.tar.xz 234151836 BLAKE2B 9461afbdf26dea19e118b35ea7ef1ee60c22f601501ae6a08950658598a74a6b3179cbdfd9dc4748a0c2485af721b371e5fb523f27e7d7d702f94b532a70437f SHA512 7d650a29c5d14023a3d7d606b7bac4be6ef7988a82525f02d7af9cf3895bb88284442b8042d27be69689f4bddaa5c5370ef7609d18849986860eafcdf89d2d69
 DIST rust-1.75.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c222d0989518602c0ecde9d21dbca97e9e60d81083804d1d8b2c6bffc8114af78570fd384eb58e5dba1bf249b99300e7f3f4067c1a66c0cd9fac60443f56f751 SHA512 6f78913e34402cedb37f4a54491c65a8bfe79e535e4e40516f2381bc27783cc7655e9252e7701813578c8ffcaf6b301e61ad32917a475d4388fa472733b21b12
-DIST rust-1.76.0-aarch64-unknown-linux-gnu.tar.xz 217392212 BLAKE2B aa587d69b5acc389a8d1431875f10f6261bbedb259a9009092e663a345fb0ac0cf3ad3459ca549a496853b8d760c7fc56b797ee269bcd15d54bc735cd1100fbf SHA512 ad95566ca7597ef64a03f614cc20b9c8d9b2fe67f33141b817973fa160c2be978511509fee79bdbfc74c50076a607e8543ad5bb4b56723704df27b5573b8d606
-DIST rust-1.76.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 86834b999cb0ad9de02a32a79f801d28268c986c830ad3f16274cd4c404a4305267c90b677f7a8637f2de08c766ad3555945f77da181906358e3d51b35e258b1 SHA512 79c1b258267d6feaecba18648a7eb620a570c99fb75e422d0a5b946a66f3a5bf6d2b41dca89b4ae79feed704d498674f36de368e4b228b1e38e3499ac8cd4f21
-DIST rust-1.76.0-aarch64-unknown-linux-musl.tar.xz 197852572 BLAKE2B 93985909e049957f80d4a14842c85dd14e5eec6d74e4e439479f353b44b123947c782856de86555262829d755a344ad01a94c41e8852818e727fba74620e1d68 SHA512 1f36245932d3b9bab0b99604085d886d9fd2e575e896e1c28b1771ae916466c060f4d70486e47200d58947147eb5571b922e175b1a450a36388c3c95e6537655
-DIST rust-1.76.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 50326fb881308300aa01f3783ec6856b7ab9ef80e986cc4e64fc5d6d0bcd246add9330ee5459a3ab5c0bd417d75c2b9486bdbdc19edf5a899dfd9e1ecf31028e SHA512 0e775d73bee5cfc70035db1d0fc4506d022d593cf847e01c3f09ddc48a02c4eb24eabd42391c3241cc05ca49b15e38eea0f56786a4f800df724753ee7c557ab4
-DIST rust-1.76.0-arm-unknown-linux-gnueabi.tar.xz 181085440 BLAKE2B 024b82d285208635dda1c6dd66f634d1b921657d3921c402b7adeb7ac9b495628c31b248ed480d4e52e55293815a686f9ee52a84c2407763de5b961962ca9cc4 SHA512 c6840b3368bed511976c32dd3b22a8d1341c002843958a8cc8666c4f19547eb71d8a90946c1c075cf8af50187c1f14fcad2df488d186941d00cfd6b638b27dde
-DIST rust-1.76.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 71f2d3a9de1343eb96a75a7eec3d8d4ca9a02e7ed01a1cd2f4f352855dc6d58cae5ffbd70944d7d1e0c7559c74f8d8a25f3c1c3a14c2f00e5797d0f142b25a12 SHA512 b3dcd4b3e2fb5e5039b7fe654421f7a2f72ec5ebfa841589be715bf0a8ff4ff0a3c46a25d0978b4206678a2f2410c5ca69146f6e3eaa4b02a6231589bb099ed7
-DIST rust-1.76.0-arm-unknown-linux-gnueabihf.tar.xz 181168340 BLAKE2B 8d48ed7c79f87aeb91676c3f90877fbd396341130276e27adf42a0a0e5d3f7ded34a271cca34f1c0fa7f37d5666ba3f2f16eeccd91aa37859adc34077dd2a000 SHA512 6beba28be79a563eab4567ca33dbcaa7cba5f4389fa480ef4e16e528fcdc1ed6a2c7ccce1ee527afbaaa43545bfd80fa47ccd3ca2ea4c38ca2b397bdbee47a3a
-DIST rust-1.76.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 534e5f05848e5f6c05f2de69e0c974f5e4860c9ab4501491a651f5d2200aff69c9ece29010aa732d0eac3173b1f148afc3096b5f05146f7be7df14e5d9ecc44f SHA512 fba15a41ffc9202ae27a6c2884bac7367219fc5b1892287a599a1c8d2251bbe763df07da4b9719d73bb6d93fbac3dd1b8c4d8af75acb942200c9d7b1050be009
-DIST rust-1.76.0-armv7-unknown-linux-gnueabihf.tar.xz 184387332 BLAKE2B 7b9b03332f19859d43629d4e65815619fab1845c129a254643f164c025c5d574e71f6001899deec470e93c97fa6ac8c9d71cde5320b6f4cd822c2ab113e4b827 SHA512 3fbb7300e4dbe855207671ad309b71cdbad9cdc41b1c8144734f9de85c904918b137a2fe7284e9046f00526c7fce8b68dcbb40ab8d6543ef31ca0bbbfb396431
-DIST rust-1.76.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 050c4eead78d8161d46acd4ae47b69612706d8053bdfb5e4cfc0fe20ccbf4544643c1850f14cf93f7d17602849770857551b64c7f8f8db45594b7dbe267ecb41 SHA512 32e72430c4c9a5970994bcc6034d3be1a2a915adc6aa45a0c1cba403f6c44206af3e024afc42fe39a8501322fe46deea9921c9760f8e1f65422960baa88abafb
-DIST rust-1.76.0-i686-unknown-linux-gnu.tar.xz 211679020 BLAKE2B 06c9e52a1b6c802be3c4b0cb424dcf243f08fd5345e4b3977cca82093839cec885f6f491179e9e1f8e64c971bd7bfdbb6c551e463874b44c8b89ea649e8c9f40 SHA512 64605e0c981df2c805ba8cb31a89fabd00332faeea6d04ac57cb4898b7cedc66e4043ca3eeca799a204ffb93ecfa770150f09b99da3a7dc913d4e97331554e8f
-DIST rust-1.76.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 72d87215c5ddf03ed0cab99adb97b6f15fa8048fca68b44bdb77cd0df09cb1784cecb80f6618ad43d1b6f41a5848ddc84126ad576ff1ff08a3928cec9811a4d2 SHA512 a6d52e452a7afabb329b75155db9da91d51f809e913b19cde1c51c4d0f79831e962e698cf8e86079649e31a662d13743da23b13d16df6530427eec3e4269be7a
-DIST rust-1.76.0-loongarch64-unknown-linux-gnu.tar.xz 162940496 BLAKE2B 4c3b66199339262ea93de6785980795e493ce4e7de9d7ddf3e7c9fe38ad404f980abf408e979780905c149bb3de65d26cdc654f8b3ad0823a3d5067809fc4944 SHA512 64fac030d7edf9677757b883d1664b7e06ab9d5007d87a78d449acac359d7d6ba694bf4a6635c8bca51f274f842dad0612377aef655bb430f6290459343aa6e2
-DIST rust-1.76.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f52e951657308df5a944d35e2f9c19278f6f250474c070593f3b2072f372b8f6c32d379d144c8ae5a3ee31f7de21c00ec1da097f2c8c9a54759d9440ec5eb822 SHA512 d5ed37fd844715daa5d9901b388cbf39854fce3408c1d572f18e83d6207a20345e5e2c2b49b9c1523097245c73e1a448df8ecef2ae5b344e57bbe646b1266af6
-DIST rust-1.76.0-powerpc-unknown-linux-gnu.tar.xz 176795548 BLAKE2B 77e102e4d3821557895f3e24059b65847dc46ce3b81ce73f15063e9a6d383ba12f4c905fcbc85b79c39f00e9cb011fd2831737bb3ee9bb53103b4a7361aa312b SHA512 05ccb4294d788e948b69c9e38abf28454604f6b5bdd04704d6dd5231445e2f791cb18ea5149b4324a152ce9ae356b55036d2f74a5d9dc3aaaa05f5c7e4e69e1f
-DIST rust-1.76.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6d2fe65e5840cd7ddbf1b18ef89cd337b16e3424b6e20d21e199b274fbbc4d9fd88406c2a119d5b0bd48fc9e47145dade3f37bbf99faff68905e57bd41937c1a SHA512 a1e45e41f901513e97956d336910927d7357cb8c2362be69989528fa5ae7087da409853adfd86354b4b7faec3e8542e400838df1d195843c030d9c6fffed7557
-DIST rust-1.76.0-powerpc64-unknown-linux-gnu.tar.xz 177409476 BLAKE2B 7c9829c8e8ecf2a162663a2c382bff49739ca2bb02b785ffdbcf632edf55a3ea37ea3be09298b0a0a984512aef290123d3b0ca9ae0d088a2a816f38778aec79b SHA512 1f29f66d8e64d4c191bc90b05d791f08317aeec042ced815fd353beef6a7a4f6d5f91755481114e707728bd9a02ed9094b2a75d91d61ddb12748d9d40b211e17
-DIST rust-1.76.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3087eda9eec862455906510d38f43b81644243ff7afbd5ddf221cfb2c12408b8ac9a0bd2a269a9499776e04b56b3d52c890e056af544aa56cc06b399614f83b5 SHA512 8a90d5acea677a02b2c5eec93157ee2c47bab895e16408123a0e2c3d44b0f9a9d95fe56dfa903fa1cd2fd298f17050110793e94d60510283c8e3cc120770ce9d
-DIST rust-1.76.0-powerpc64le-unknown-linux-gnu.tar.xz 187967776 BLAKE2B 0ffbbb4e4ca44285d8387fa66c58df72971bba6410faa96f6cfd80c223f4996285fac27672104f25ae2a20cb81a0ec6be0bea1d6893d95eab0d017fbae896509 SHA512 eb8be647651b02f1e9287d075d76c288e34e66514305a68ac118ef41dc14a16e5e1a3f2c5cb8512c4565a2eef3e5063dc4eb11272fa91c01d8313a323c20755c
-DIST rust-1.76.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5f41ec8841f4004df7b65b50a451027489e303bb2863ece09a14900a229d3180ba23bbf5c770c2939399eb157e97b4a08ccc0632a66eca5ca5cf4c29a1523186 SHA512 929e415a66d8777e2509c25a780b4963b8991adb905a9841dca19a5412a5f86326fd73c43f79c304a48a2898f863b76024b0144109343933a0c5f3f1fb8ed287
-DIST rust-1.76.0-riscv64gc-unknown-linux-gnu.tar.xz 183161264 BLAKE2B 9a0b579bc076b8cc55414c95456caa2146fd0597091d2332c1033d03ac7495684b7b7989ec6a8a108953c681ed88d4b62a9a7fbb39c0300128189a91b035d2df SHA512 29fe21df7b99b9a9483af6f2370e2b5a403c12aee94a1285bfb2d2efa631f9d284c70caf863247843ab1418bc78a26c6f6d5de4e8606456a9ebd265ea3bb504f
-DIST rust-1.76.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7a380f9d2f2f7083afe7abcd81a15d34df703f076c2c842fee2433c6c40d629bc5b0818fc186b462d653aafeb1fe767de3c01b7a014ec3220d77725bf1074fed SHA512 53e4942d74f42f4a7c35ef4a33833d23a955af157d80588c277f32f30cae63e8543fd4ffb569693ad00a6a20ebdb2d8422ca078ebc85bbf98814815e32791894
-DIST rust-1.76.0-s390x-unknown-linux-gnu.tar.xz 202133724 BLAKE2B d6d68392b9b9b69914cb6986cc1501246e0461a6eb5d18eb0ffe71e0a2a7be20d27e90b117c520723254b4709d08c4fb33d145e5ab559802ba6592dfabf81317 SHA512 fa74e1605eea945445f8ea621a667d50907d8b3ceed700e6b05dbcbf58dc7fec62c1e50247ad9688a5b9c5b78c4a140d93557d494260f8a21b1eb25baa315bec
-DIST rust-1.76.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 574df1144e6e79710a73962511fc73215b3a4d1c3b6623190180c7ec13aa8295e13329c4bc66710013f874054dd756e02bfb2c5f6ce1fc8a07ae0717f958b244 SHA512 17938b3f4671127c9c46a5c51703d430938b73b2e30cd497cbc159ed372889af42e651479d1ca69c000974e21d4d34cfb9e3cf28b79ec8e35540ac319e1b8b9d
-DIST rust-1.76.0-sparc64-unknown-linux-gnu.tar.xz 60517788 BLAKE2B 014a5900dba8e1c283089d8df2e7eb90b3438ceb4f93d11fe66a2d58ead0638f47f1af2e3e89785b55c9963acdda2b41aaf6a0231bdd808d6e552c8140624373 SHA512 4c3e2db0e636ea022fad74285090efe0389ceafb7f4e3c4193d9c5f143644b2b06d22209b4361655c72e4a771dc3ba17afc11fa3b39f9954462716d9f3ac3fab
-DIST rust-1.76.0-x86_64-unknown-linux-gnu.tar.xz 159385660 BLAKE2B 0846999358aba95a2bebd2ff35ccc9e1954ff4fca66227d1c8c1985c08e91159f2acaa1357544b81e92065a2f9ddf6aee41a2d9199d71d8de1655f9b16ba2ed3 SHA512 1cf0ffb44aee4da9768e27daf5ab3b20e67fc9e8eba5a1718b700c85ecdb61cdef129cb571633294f9c826b6e7bd2958086eec371922ca31af332266d3632609
-DIST rust-1.76.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 88e6b124812b409372ee05e2872cb4dfacbc638f8e3b4fb0d5fa4ea63f4594333a9788732502f8bd41e34b5cbc404d7ac08e7690d095a6c37c80b0043dd2be88 SHA512 f7ddca81da468d5617f48240b6d3e8d7d09336ac58f515acd3a20f2d315468ba1d53508dd3264a088ffc0141cb3fbcd8d3c17379f9628270d39c7d44f7727291
-DIST rust-1.76.0-x86_64-unknown-linux-musl.tar.xz 237333892 BLAKE2B e95b92c68e3c2df49fa0d5d84e35f6575fb80571db290b5969441cc09b6c07dee6b2b887f41a2b1ff1e3c099cda2ce2a4a8c05afbcf9f4dc8acbaed5245b69e4 SHA512 04bbbb9a6891c3bb7a20845010029e6ca979548ff70324c08d3162ebc1fa3a84e8c7e2d453495edd34aba19b7a685f048d5047993103bbf221c88ea36350370c
-DIST rust-1.76.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B cd4334fecc17cf03b7333659393004fed4bb895f9b75f93520d1c3e3ee0ce4fcd17d75d748c4a35d31984215c7aec8904ebe3a4ad8bafcd625aef30688a473f7 SHA512 a458372b41c2833bdbd3d6678c35fc23397817b406c409d1ba5e19b4c6246072afff3f938f111382de56f7ff57e660c3eaf3fea0e54871d9af50b52a54f39e41
 DIST rust-1.77.1-aarch64-unknown-linux-gnu.tar.xz 214607592 BLAKE2B 6ebeef47a62eea181808cb2df8d4d01bf1804189bc67e95f1e2091b4c95a7a6d26c4f4c822c312c9e5686e9a15b425f74e345f26e962045b7844b90154a56f53 SHA512 8a3114dbe43744bfec68e24f0f302704e887587b4ff8d22bfc59067f5e952f7ff1984b8f4a663ed8f89001629b82d620fa6b79bc316a6778c968767a12dda592
 DIST rust-1.77.1-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0d0878a65ac1d2bf84cb614d56ad45e6d18a12ea6ec009839711074e64f9a42825163996ab370456d62005457441b6270c0cf995a0b7f7d32adf718442bff72e SHA512 70f2912c72af705a71d3402e755a8fd2fa8d3a21c2577b8e804a5f35ded57b93520a8c155542acf27022325e2cd7357c0dcf465627934fb23e731c961ca28123
 DIST rust-1.77.1-aarch64-unknown-linux-musl.tar.xz 195295732 BLAKE2B 9a1f0a9de62102dcfe17140cc181f960bfd80f4f84aa6b6f33fe7ec53db20f3819fe27381dbf2cd173db04111a6bee1c062edcfb186ecdddafe4692b5a3e5e63 SHA512 50ebc645127bc3503b97a74343f588bc70c8d24faa553390bd4849570be45dea7f113bbf28da70520bc33ef0be987d4390e6c5eb0955578530cda94c8334cb59
@@ -221,40 +126,6 @@ DIST rust-1.77.1-x86_64-unknown-linux-gnu.tar.xz 159040536 BLAKE2B ccfc6a96f1a40
 DIST rust-1.77.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 1adeaa22c0a80e6b9132fe290272c7713fe03902649fd6a41ccf46fbaa4d6a986540defa7bf34b2b0456bd8eab28a088a30fa23abb82a2cf110d1338aa6a623c SHA512 1d4ad50a386c3f03214439bc8067f2a721c30b9d4aa47a4494f0db32e242293dbf19ae1c5388315eccf377cfa947b2b40084bcba48fbc55a55be673b74074d5d
 DIST rust-1.77.1-x86_64-unknown-linux-musl.tar.xz 234990960 BLAKE2B badccc8785af974d02b63998ff7b4f4b9235cb181cfa44ec35ad682a5c741d3621f4306ad874f11ac14301079558c162088da85414f335b67760f22475d67c2c SHA512 addb62f012787b391403bb25297c0b620c6beb431bd8ef3287a547ba7c31b4e3ccb29decddddf8a34ae849433f64334309b574dcd8743bf8da0efa38feda771f
 DIST rust-1.77.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B f1e69cba4d762b98e615b6ddee831193ee915b8a797c48395bff7af3abe13a791267f2fb3b1e1b7df06e6e89497606064dc2fa60ec417bcb67ccc4de7cf5900b SHA512 1aa346a14b8a357b7f747a56d2e718fc15ef3a5095ec6dcaf3381b2d57b170e8b0b604d885d54cd39fad4602928612ddb8754010b4e27060123c67a23def4bd3
-DIST rust-1.78.0-aarch64-unknown-linux-gnu.tar.xz 223523772 BLAKE2B 734416f447462f2778b74f12ffdda13374c95cc399e8728afbeb61b06c0db2e522e760a257d2ce26ce8190cb9c8292880bf02da52df04c3cf205841b95825767 SHA512 80adc842a56ac95d472dcd94aab199dbcfb3d3a5e7a8cb32b8334b038c58a66b8d4f3848ab62a3e799d7c35e6a32abb1f2738a784da8cfa3272ea299c528d5cd
-DIST rust-1.78.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b6cf17229559a845cf63a22043b1ecb9d7e142b536d0fdb0b44f36f05fe1238096c48dd61becac58275d60401a4f0ce623fed9593290d1f659d31976bb0c42ab SHA512 d03a380d0481b4ec19cfd8026d262ed19b7f6f4f40287b0e23127460029b30c47336232a488dc8d19d22df98f356cbd62d7d44f4a3e1cabb6f575531be8916f7
-DIST rust-1.78.0-aarch64-unknown-linux-musl.tar.xz 204806408 BLAKE2B 08abcef8a38d2d1e463971613481806e897ad4aa48a6e3306c23cf7b906807c944809ec60647c5a80e80978cf8aa8bb1b8e990d69769f94f44022b0f764cead4 SHA512 4ec03b17e2f016fc5449431c4d81d113c12227e6e11553f9fb4fb61e4ba3ca4216aad776e7e3c1e88ac42b797c07f5daa23cac90c3eaebc6d360602f026f9dac
-DIST rust-1.78.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 1b51cb7337d71930d4d455d7d018a32de858b6627f0ca3cd636420bfdf0d608f550d41985a93b09575e5ac853361c3362a5c0b85366ff19712a4488b79b706c8 SHA512 a9e28326f91009ca248297ba1b099b718f577c030ae3c75daaeb4798cec4e4de585f1652f18ac170228c32e3784d38e328c3821d6735ea1c083bc4d5b80c426f
-DIST rust-1.78.0-arm-unknown-linux-gnueabi.tar.xz 188301776 BLAKE2B e227ecff233f42b9b8dd7b5807de8fbc972107e7099612986b275ba0391c8fc074344db0764d96d00c34a099380354ddc5e7beaad1d5444fc3300481f7504a2e SHA512 624eef628d9ac6e1eaa376677296cda0cecf4ff7efd4763e40735ec69788fcd34b4a4e05c34046e2b57b916285acdfa04f5b122142ed661032e9c0d713e8fd37
-DIST rust-1.78.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 43df87950eb9a8a0d2410c861e08ccb90a28c815d50cffbc310fef063e5b6b8b3246f5dc96ad34343a7107b025e863a87021e6d59e0826386e4864b68e3d693a SHA512 85f8822c493a1499e6404400b4c9ac293266533c49c5b0b4fab470d2acaf93078aff4d0c3cc59b9117ae9dcd4c47291a1197de44b56214146fd06e708479a191
-DIST rust-1.78.0-arm-unknown-linux-gnueabihf.tar.xz 188746984 BLAKE2B 567ba5298d6b5a4734d126e0b9e5df24460f6204b32ecf3892b45a26689bafe7ccf15f4a6a098a6a6ec7c3f15cf80d314e682f2d8c784a60d9847056be1885e1 SHA512 f9b5b48042868e91d73e3466f7529e2bb2b72d2489b2d0ff1fc83ec1b1cb035c88e57d48b0ed7298d5f50db0cf9da2681e9a4862c185a2bd241356632516c93a
-DIST rust-1.78.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 4d4e6f113e18870a654bc175eba1ea8ae0129803503deba03d144be4f434b1b5651288e8e1cfaa51bf603f5bf51a959b584e2932c025c3474575dc282ec14d84 SHA512 6c682f710fc26e94f233ae27dab6be27fc132825c3604789671170c040b689bc1871d9a74436832fd07a0da50654d06f0c2b31dd8dd9787f1563e2085a51c14e
-DIST rust-1.78.0-armv7-unknown-linux-gnueabihf.tar.xz 194117584 BLAKE2B 5a62e628f06ba370b5ca2b11d8c657fe9c0885e4d36b14f49ab0b7759af0317f1c79ae92dbd5685c57de58c4f6c31fbe3f1c8b4e1721c91d67ed45232dbed5a8 SHA512 877c13fc97c5ed0785dd005c34e5d37763cee9b7c0b5c2217246d173d952301b1b6b590c3ca441269ec8d341a0cf5f2eb83db63517385bbecb0cf08167a3948e
-DIST rust-1.78.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B a3ba9914c74373835ea6900f97100f631d0d5133adf6f1f938734be0d58484c72372b933e9c42fa37856efc6ade7650d969b412d66edd854ffff4918e8aecfed SHA512 6df8b791841f7bac8539e2ba9fd8d22d516a5906152861baef8ac3256136ef72f8fdb7cc9f843127311a8eeeb7911d058fb377db52ef4fe9a3cdc21396495ea6
-DIST rust-1.78.0-i686-unknown-linux-gnu.tar.xz 219666344 BLAKE2B 9302eae6c99af5598f9952255ca8bb3f0288a03b385f77b79323e725bbe398e722baf5ed2de7fd74caa452248800948aad33954a82cbdab97d1935785e6d4437 SHA512 15b6ab20665af6ac7df6e9c9078b9565b3f2e0d493c0b58cb06c682d9368917b2dbc509dfd23fac09dfddc9c60c5f89bdd8321dbada77958ca5a6261ec54d203
-DIST rust-1.78.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 8c23ee14f8db7c4a776f4b5b986384c9e2c79e6449e019c67b526ec219e92e35be5c46a4a2d8187aee0ab958c7ba5f2e10ae40f4c7cd083cbef59bbfc96b0c13 SHA512 ea13084528d4b8d558309a0d5c392c734140a854d9543beb0c9b3c5bd2fb530ba154c608920ad125683e1e9888228422352c3b1c1fdfa9d70df1bd4728193944
-DIST rust-1.78.0-loongarch64-unknown-linux-gnu.tar.xz 170256096 BLAKE2B 07507d4517a9e421bcaa763cc93956d5c57d458f7b20f97f186f902702675b305e79c89142f5c9774b11e0842a82c8cb63247b71dacf1c362c0588b52dd86d3d SHA512 fc21d32b4ec72a3a5a353cbabb902df2676e3341a1f38ee45654eaf960bc677b0316af0474e5ce9d346d285a6f7f03ebeda7302b49650cd1ff8371c27166fd25
-DIST rust-1.78.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f99580babc5356c579b81fc0a4168dc1a57432d898e8e2422f00f9027477d704421cb217b5d56fa15a6fe9c01cbf8d4a727c6b01eedddbbcfe9d78e3cdfd24b5 SHA512 ab1ac741f6d71517a510a48fff1b903f325a35b83e35b7b73f4751c1f22e6944044d7a46f21e018659d7cf4ab5b430f6a4ff79971712af46a0d7705faf60e506
-DIST rust-1.78.0-mips-unknown-linux-gnu.tar.xz 70122976 BLAKE2B 78cd77109402f9121539db99bb263f37b9e8dbcd7d0fa102bd40437c4c051bb66d426fd223f062bd9715ce19f8b5f49ecc28ce59c0647dd4a29d9bc91fa68269 SHA512 85e8bdbfb750a20ce56756034f5b8a9a063baf38462ee9c47d0f495e09838b3d51db5428f56e4ca29f0d8bf5d8d7aac6508fbbefbc21b144230111683e2623ef
-DIST rust-1.78.0-mips64-unknown-linux-gnuabi64.tar.xz 71942612 BLAKE2B 5735673c7c02f49193d69d02276f7eb1f380f487777a6e8751012ceec1a690dadd88e4b51ef6e393a7bcc066968eb306f4ad1df206bc48e0aab7bea40fc7373e SHA512 1cf95c52279b7ee3a003e2667004494f90d50ef84f57930b6682588c502c9ac1e441e9521d0888e3286cc97628fc0445fb5e5adb8c03ff1da9aca7a10a172d62
-DIST rust-1.78.0-mips64el-unknown-linux-gnuabi64.tar.xz 71921684 BLAKE2B 3aacca634a1749e43ec3d84c5388a16cfc0bef94e27c3221c40b43a296e0a79044af314b1704638f8f8ee9a03cc3f8a3932a252a19c7b91bd43b8b8e4f50dab3 SHA512 1fa047f55f4539fd16110525dbf94b3121e05513f25d81c6e95a30b2f6b099e30292545808a861816c779f060cf7ee9235b11311d1b0005e1c54ed1dc2dbd005
-DIST rust-1.78.0-mipsel-unknown-linux-gnu.tar.xz 71388596 BLAKE2B b0d87f4297f2b1fed10308ceb8809aec9323c2754212481ecf7c080ce993f485612ab5c82625feac644f14499c38780b3d1ea5af7c85f0167c26de5cda461332 SHA512 12a5955673f17243ada754bac4afdadc8ab6d3d6e4fc157328ab0067372d4206ace6ad99c168033cba23481167c24bdc4eafa0de24fd033ff7cf6ba1e16baa21
-DIST rust-1.78.0-powerpc-unknown-linux-gnu.tar.xz 183422544 BLAKE2B a37b4b4c3ba381e0456f46ac7d311ff6b11701026d568653f86d08e5170f9f21177e87efe329ea8fe259a6ab7991f096bb716af2bf3000569c9797db61a41c72 SHA512 eacce0850bbd9dd9a8a94177234d867dcf8d94c7c2e9f4260207b25364abffc8523e2b85e868b9dd9d4bd02ea4be06fb0c5fbcf5621ace2c0e93041a96cf7ad3
-DIST rust-1.78.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ad0201eb1760590381c0e7ee30f612a44157e10a634eb585f253788702653b3658c636c3f8c971a0c96de8944cb4c6960fd555f35dc1ee45fad18c7410ab4b7d SHA512 de5026257f1bd95146cb8057569d643a79ba440aab21efb4ea7df985a527654234c499f16cf75a29eb29cf9d7771893f0d4cfabc3483435ab73ce781aa573ebd
-DIST rust-1.78.0-powerpc64-unknown-linux-gnu.tar.xz 181366112 BLAKE2B c6edeeddc3934e6b93e65776a01c7f19c5e560716490eac2f52b56ba0ff58b974ee2be8e858265c4242d017106880a368244f5565e6f0438258b0cb0bfaa9a0e SHA512 7e0182680d216757d62627b07041d1e36eaae47ed341a548e29d6fe192f5e99a7f933461da025f4341d4c9b816ed3d8d3224bee12e29a0e7fc8bcd9a93c5069c
-DIST rust-1.78.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B eb94775f878935e94b7a678d4588dd586de8ddd47120670326b6b9ed891edb009d637a2c99b0548e8d74d07960a02558f8421e0754d487e93b57bc2bfc19f052 SHA512 490b0ff842eafdf23adf754051c0f4abec2bfda438bc2e3f57cfe5232f1358318c31bcf6a9ea89284f26389f2f1212dc3ad467b14da465d655bbc6974981cd58
-DIST rust-1.78.0-powerpc64le-unknown-linux-gnu.tar.xz 192130524 BLAKE2B ca961dcd50d9071f0bf7b8f354aa0e78b4e3d4c9bd0b6c72f7a712bbe906833aa8982eb87d9065644c65e57e395ab09ed85bd24cf43477071e0c5cd8ed8590e7 SHA512 c890386b3a82ea36aca2f8753b0fc81a956ce3157b89ccd573403ec99b257299f84c976dc7972278371cca1b3945b21a50d276e10b4cd42647a9d26e0ebdd947
-DIST rust-1.78.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 2bf8596c462d1231ad884a417c5b676447b8474023b5769343ec5a7788cb42c89b937987226db9bd526b3f4ff0a39648e4ee1136c3733d316e35b8ff7295b6ea SHA512 6bc9965d32420bd86422e4d5fefd82a46a169d5d80d298ccca08fb421858d5bc077f785a52f3404f29f394f2dc471a747fec208931d19358aebadab6d9952e0f
-DIST rust-1.78.0-riscv64gc-unknown-linux-gnu.tar.xz 194762504 BLAKE2B b3a802e4b6efcd6c0c3155258b57483c24731e0564d0077f65706ac46898828c4e4d612996c16b63f9dbd5770ac6ab05cad27a27f1083f431e13aeb68e1e77be SHA512 530e5409755dcef86a9d074a3d387dedb5966689d7f47706e43daa5a9a8c65249f4d2b42916363b14924c11e1a5f5d934e9a1d9b47b1ed7206e85496fee27604
-DIST rust-1.78.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6b8f4a535ae61cf04523254267c2f816e51e459a670b5c2aaa1a28d44092745d7c64baa399583a18cf84e03df2a910409cf99140e3337654a1a051e84d3865a1 SHA512 b226ead3b0dd067eea71d3b5088925f0cfa381aaab6f809e58dff83d00c17da4d99a9d241d49eb66e5db381cd9c63a21c2f5be3ab85658b0bf00b91e970c271a
-DIST rust-1.78.0-riscv64gc-unknown-linux-musl.tar.xz 79587932 BLAKE2B ef34a7416459f50e9d8e6c8dc7f07435eb9bb93b8e07ba2211d539f9955b102c85a591706bc332127e246eeb842d1308a0568147ea3ba10463a6eb27a1fcb075 SHA512 53b28404505217a80369631e8630df21058f4d0eca4e9503f817b7960ddab95245303c571c0ec03208e5f550f239b247354a63b32c07eb6856e78ee70a02661a
-DIST rust-1.78.0-s390x-unknown-linux-gnu.tar.xz 207632244 BLAKE2B dd548d618a050991121afe1d8ec7d9fa5eab19d9fead94440f34627562bda9b5f544cbb03a06cd6e85eec4c8d5279b4237cd14c9754f95795e7a26f0b20036e6 SHA512 f17a472ba144efd41f791854931e1e2eb566f126037a1f234b0b54191941a77d8c340687c4c47e0bd4fbe306079cddb36637e998439845ec82206e4c567979af
-DIST rust-1.78.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5ea16c70fbdcce4cc17c37e9c3b642fc6deae9e2033821d21d3598652b8ed2dbab58cf09dec4e5b2f913cb9fb25820ccf3511af5eb84441e9bee6ba702005def SHA512 8384b20c9f9b6654fd69e90a91aa8572d22b4abbf83ca3b349b7672a5d8db131053ad1b6f8a48881be0060d3db2eaef52075d3a9b15a3c9ef9bb366d592fbcf0
-DIST rust-1.78.0-sparc64-unknown-linux-gnu.tar.xz 61524980 BLAKE2B 382473f85771b60201a27d4a7812b7a76953f800fb780f415cdedc1e183d6142f4e2cca6d0ad7718c80cd7a181652b175e6c2b51f8f0f303db6fe58b59afaa40 SHA512 0049d8262cd426f1f368919f13969f57ea724ceb15f257c71af7d831e607de874344b3be8a38c10f0d87a4fb72b6b69b77459a63f72ae5e1acbb5c601f30eaff
-DIST rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz 163959816 BLAKE2B 1987a6a0ea169d67214bf403cb1e6ada022eed163be6ac72e6e46d1596eba6f282cf87e0581e9ac1b264dee4c59edececc9085b0d16cacabc79f9375da652a24 SHA512 6bb0481804a1de8ee9fde7d4793d45e80f071534f2c3756867d95e99bfc4766de2618b5fd6b1d5e8f4794e54c7056124538fd301c5ec20351f8dada54ef4c20b
-DIST rust-1.78.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 1b6b8e54c0eebbde2a803d14db3d75363c306c621845cad89c927a51a5df0ccb5d1406c8806a82d5d611d0a12c6d6c5ed0f113fe802e4b6a8e504e64562e168c SHA512 10072d0684b40a71176f36ad85b7161e1392b3f52c035bfd0c6bbf5889599234a7201d85a13f04de0269ef9d8e0c51d15a4e9a9151b3fa27cf9a6e8663203786
-DIST rust-1.78.0-x86_64-unknown-linux-musl.tar.xz 245914600 BLAKE2B 66cc40b70ca70eebee5c173eefb07758a8a7421cbf421329b3b405bdab1651334a5ff1202b450139c89039a4c3fd6ecf8b78ed218c62e81c983e6bb7353a335c SHA512 21190a0034aab2757cdcbc2e456fdacc972634f25f5c75daa089030a82b407037d3c7d3528c8d126d48d2a6840edf97526007bef41689a86ef1eec8f8c569f08
-DIST rust-1.78.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 2ebc83f961f3bb1681bfd2e3f08b2c394bd8701c68b873eb524a9f9a79f3d3858ae75f76c0e0bc452cbdde9466b1d1b2723d04a8d41f68902355150c86d41042 SHA512 a32e7706ab9483a464e3001aebda8975ced4ef66a64f534d67c0a0e2b508f8db0523cfef4a66bb2b264bad486566c7f684d01ba96055133eccf0e9da4abfa46e
 DIST rust-1.79.0-aarch64-unknown-linux-gnu.tar.xz 224366944 BLAKE2B bd890cfad2348f7bf1d97adde1a5ab244665474ea4d77dfc2cec60679829f84c30378f2a979acc3dddc51ce563b03ff86d04903602a079a85684d98a86ffa4ce SHA512 0cf80ea35cb501f406323a438ecca348fb957cd4a57a4c7ff42bbaa0c736d16a99187b821e29d2e51519e1cb76e533af7c5893c6204fc0736f8e2186235742e3
 DIST rust-1.79.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c249d0badfd29130477841602b385e1d152488d43799e9e3b77cf92234b197501182edf59536f77b02b49f806a7dcd748f352458f97f15af6c8f0580659d3eb4 SHA512 2cd2fdde6ad1acd769af2a3ca97bff3e4cf3b57a3a7d1890ab592d2abb85be17f7c3f27cc1b994e70f9f6cd52e8e44314d1d182aafbf68fea4d52df1c9482afd
 DIST rust-1.79.0-aarch64-unknown-linux-musl.tar.xz 205404384 BLAKE2B 21dd98d62bc965e24b3a60c0e48fdc907e2bd6919a90923f26cb833218d6e1f23d3385c7e67d96d7651d65ef963f668abd9f1c9e4d3e80aeb726b50d09a2ca80 SHA512 358e8b8a76e1a48d6829735f04b2d3cd3ddae86684ba10c778a9f96ce4bb0f080c0d706bcf5c6d141d1d52685a8e92a48d8020008320ec8aa158fa911745678a
@@ -325,13 +196,9 @@ DIST rust-1.80.1-x86_64-unknown-linux-gnu.tar.xz 167553060 BLAKE2B abc6430cfbbea
 DIST rust-1.80.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B bb52100a14bfa2775ca7cab5cd0f9dbc489ec3b26a8687876c97b666435c44ce58d86fd9f11d4f4832e79c05fa3ddefd7157edc91a3da25ffeba07da61fbddf9 SHA512 08aad912e47341bff29ee1d1b52cd02df8e609747f7061e61ed6a401d798140a8587378aa992b0d52af955a44d2284eefa00f27a6e94b4ed561c06eed60ad6fe
 DIST rust-1.80.1-x86_64-unknown-linux-musl.tar.xz 248220632 BLAKE2B 7f0954379658df0a5cb0bb4bd49fdd1d216bfa5a200789124667d13ad97f0a5278f57e5b6278a969558c834de43a5d7e3f5ad3e331cc5a4c428dc097453a9394 SHA512 079cd3384c0b7f85d5fb2f02f27febe423ff533d71463097fbaa90449a955699fc25d8e4ae16489f7d7920c34c318c0f2e8185eeb9c6fd64c0851e4366c5eca2
 DIST rust-1.80.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B bad9fdebe33c251b8802ecb0150a074e86becac00874137f793b1805bf36373903fbcfd4744b1086851fd1357c6c81262a7eb321685640d856dc2ee3a37917a7 SHA512 405de0a8676755a63a4fc1e61dd358960efc90e4fd2417cfb4311bfaab5a744397e1f751afbe6a9515c1d92626a79fc782272261eed2f72b37b88fd77a84d7c0
-DIST rust-src-1.71.0.tar.xz 2460128 BLAKE2B 3ab6c6cb76a7e18eb0ba085c45f8b1a8bba16e2569962c27187bb415c54d3c5c1032ce4552c52f93bd4ec2512634d8899fd35fbf1a035298a9b621b5af125971 SHA512 fd59a1ced7e950fa14fd7ec9c978043b99e678bda54338f60faaacced36110630385a2bb62af19670ef27db1144810ff60b03dde542273557473b9bb521bcf49
 DIST rust-src-1.71.1.tar.xz 2460244 BLAKE2B e3a5b5bfb808310f96e760aab55310c7a790fa551d248c9c5dbb407e0a80653563d8df73a9e0973aa63d3286aad6c755b78098dd8db2dc1a2ed3cadb926b40e1 SHA512 659cc46e1ece2ddbcf5ab748bae48843bd36353cc633b59e4ac062d843af66919e8d5c39ccb72ebdbf94a0e26a8056ade6bd1c8fe9a936469bd405122a8ae35d
-DIST rust-src-1.73.0.tar.xz 2512888 BLAKE2B 367b68ec0775f49844408d602164634a0bd526dfe1e469b1c8ba9ae5604cbbff2566eb770b7bfb81b2dae892ed1ae16b7441e438726198610ce181c98540955e SHA512 49f493ffd119a0b8b9f7b7f7e049543787eaf96d9beb272d46f2758a35fd648f6523c2edb28864a33fc66337aa07e80a6464ec806307da441a899be4f71bb554
 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
-DIST rust-src-1.76.0.tar.xz 2590884 BLAKE2B d1a6215dab34d7b10c3177d2b248f997d3a846388f3442567572880aa5c5bc51b56398f5d4dc32727cee7c9dbef494430d6534a76b66c4ae5ac4fed07266644d SHA512 39d2fe58fae8c8c5a6cb3fb1ef2a1c7548c018fef6ccea531659fdfecd68a4aa77125299d2cbe5b58e500337b4d074928318fa9ebce358af500d0ef27260e3ca
 DIST rust-src-1.77.1.tar.xz 2618128 BLAKE2B d36f74d3b826a071de8e8a92cfab65348bf1ed7f5fbcabf1994b5e2c99d1fd6d2a936e49aaabb59c44e664a4559cc3c062291cbb381462b9c516fa7ed9d6107d SHA512 a719435636a52b4436afd6dafad7b8112c94b097e2c632fde536155b9977bbffffa8fcb90c6c53675c4d793225917087e5637d36fe250c539e3d7463d90ce28a
-DIST rust-src-1.78.0.tar.xz 2662668 BLAKE2B 131e9616d6f72e87fec6e06735c3ae203fd8b8c2fbe650c23892c3419b057c99d9fd0a6278773addfcb46ac0c9c4eacd905a1122a79d110afa0fb1e4bca8aeca SHA512 ecd1b29ae24ab2978de6b2d6587ebae334cf827cfdc3b1fe3c9dbd068d7e2fc780ac05c50433857ad36e980fc44e2ba0f031e311834355898a9cb7b274b82bfd
 DIST rust-src-1.79.0.tar.xz 2855740 BLAKE2B 2701e3de018e044b5cc83b8d1b8e509127e3603654ad4893cb22a4701ccb19b2305d22382286e40171c8b8188804136156c0ff2c4c67714b53269067cd17fda2 SHA512 a4489864ab4a0fc05210365be02cc2cdf9f52b20513b57fafc93f025bc1ea5d7df9a4ee0dd23aa02dba1510c5d2cff7269071aa5cb17a946dcb913e0ea35e1aa
 DIST rust-src-1.80.1.tar.xz 2870456 BLAKE2B 9096fab01b38cc3ea2a32a2ab2e9052e5988d25e92965ebf174c4823c7b3c722196ca25e0dabcfc6db208d1c07434f06594d85fc673b6b9d4e0070ed445215e2 SHA512 bb9fdc593f33c6d94c28569a1820f0fd2413c31e650ddf82903214845adec664cac9d7b10b07e096a36432dd815de96c6aec81709ed13e99f381cd53cb87fd89
diff --git a/dev-lang/rust-bin/rust-bin-1.71.0.ebuild b/dev-lang/rust-bin/rust-bin-1.71.0.ebuild
deleted file mode 100644
index 28c5fc7d0f1c..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.71.0.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-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%/}/2023-07-13/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
-
-DESCRIPTION="Language empowering everyone to build reliable and efficient software"
-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 -> ${MY_P}-sparc64-unknown-linux-gnu.sam.tar.xz ) "
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	dev-libs/openssl
-	sys-apps/lsb-release
-	sys-devel/gcc:*
-"
-
-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
-
-	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"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(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
-
-	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.71.1.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1.ebuild
index 9a215ca8726c..f33217b15132 100644
--- a/dev-lang/rust-bin/rust-bin-1.71.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.71.1.ebuild
@@ -119,7 +119,7 @@ multilib_src_install() {
 		|| die
 
 	if use prefix; then
-		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		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
diff --git a/dev-lang/rust-bin/rust-bin-1.73.0.ebuild b/dev-lang/rust-bin/rust-bin-1.73.0.ebuild
deleted file mode 100644
index 471fb310cfbf..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.73.0.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-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%/}/2023-10-05/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
-
-DESCRIPTION="Language empowering everyone to build reliable and efficient software"
-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 )
-#	)
-#)"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT="stable"
-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"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	dev-libs/openssl
-	sys-apps/lsb-release
-	sys-devel/gcc:*
-"
-
-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
-
-	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"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(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
-
-	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.74.1.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1.ebuild
index fa8a5ce43aff..d2bd0f6eb5a1 100644
--- a/dev-lang/rust-bin/rust-bin-1.74.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.74.1.ebuild
@@ -129,7 +129,7 @@ multilib_src_install() {
 		|| die
 
 	if use prefix; then
-		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		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
diff --git a/dev-lang/rust-bin/rust-bin-1.76.0.ebuild b/dev-lang/rust-bin/rust-bin-1.76.0.ebuild
deleted file mode 100644
index 51d5cfccb56a..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.76.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-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%/}/2024-02-08/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
-
-DESCRIPTION="Language empowering everyone to build reliable and efficient software"
-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 )
-#	)
-#)"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	dev-libs/openssl
-	sys-apps/lsb-release
-	sys-devel/gcc:*
-"
-
-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 profiler && components="${components},rust-demangler-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
-
-	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 profiler && symlinks+=( rust-demangler )
-	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"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(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 profiler; then
-		echo /usr/bin/rust-demangler >> "${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
-
-	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.78.0.ebuild b/dev-lang/rust-bin/rust-bin-1.78.0.ebuild
deleted file mode 100644
index 3b5c48b65017..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.78.0.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
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-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%/}/2024-05-02/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 )
-)"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
-SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	dev-libs/openssl
-	sys-apps/lsb-release
-	sys-devel/gcc:*
-"
-
-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 profiler && components="${components},rust-demangler-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
-
-	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 profiler && symlinks+=( rust-demangler )
-	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"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(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 profiler; then
-		echo /usr/bin/rust-demangler >> "${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
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 9feed34ddf31..90b2fb8d0d22 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -32,34 +32,6 @@ DIST rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz 163456784 BLAKE2B 49a8397a7129a
 DIST rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e5fae8b3c87f54b39d922fe0c7694e0ba115ae34a668cc873390fc9e4638baaff5b6d1b4c67228c6bfc57b4da9bf77d6a452ca12bf6653d5610895b8ba19d64d SHA512 352749df741287107b966fd603113c51e82a426a7151e224e3a8d1cc7bd4658ef86147f6fce62caccd7b5779d9961be72cbb618db79a2850e8a8c4b0bc229ad3
 DIST rust-1.70.0-x86_64-unknown-linux-musl.tar.xz 233692884 BLAKE2B 295e815bbee6dc135ad17dd78801999afa7880a7a8f5ad4932a7580f1b03d50b850bcc3eb68e9d679e0a2d68392d446423ea752e47bb22d64823bf3222e0b377 SHA512 5e42224e109d525a321c107005660059ddcb0414392abc660b80fb09a55c936c79215989646be0aff6b0427b2f5d82a2a19ec3bd3235883a2037575808aeb69b
 DIST rust-1.70.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 7c5be81109607f191f339cfef87c736e2d35d4a045511036ee6e9bd68f22fbaae825ad5c463b0a5bf29606a8b9cf488172d1338aa4d034767b0f59243613c250 SHA512 241863164ee1a0d702080c9967e2ec5bb7af9222236316c8857b89b517fcbdc362b26ff3e362c4be7fd2989d3fd2aad0a0476feacecd2604855dfa53f5f1af27
-DIST rust-1.72.0-aarch64-unknown-linux-gnu.tar.xz 212153292 BLAKE2B 2896fb7c195bfb0b1b8313c390458c86e18986e2c1fcd973380e26ed78ea955c20c37475c9788fe9b23435020393fd8408566091c2974ba439b86f3b34676100 SHA512 7843b39ac259267c276834c66bb139f0548e5ee2dd1bf9e3830b07cf687e15f4b27f343dc13ff155bd86c8f0580f7f16576bb6731b782447fd0f0511f8c75e95
-DIST rust-1.72.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B aa8b2eac07010a0e564d6681831f99e3379ab5a2520c3fc29cc67803afdcb8952b596b653d8bd8e15305f1ce5b9c97ec611a3d3e8f4f3ab2dd2dd066c0401218 SHA512 308f82d5acdd18469b751d97d89617502ba554e6dfe72cc38cbcda0abb5705dc667f0c18a69aa1260143cfb4a93ce7c77726a917ab2060f7cd7d4a071387fc28
-DIST rust-1.72.0-aarch64-unknown-linux-musl.tar.xz 195414824 BLAKE2B 0bcd33b23ab927c36d2fe4eeca98edf421824d1ac9d88593bfd29476c8faec6fd7deddf0e6efad38faa0000986b234c7f5aed8d15eab9ca37569a434ddfddbf3 SHA512 7ab0adfabe9e5e3226add9fcc34445fecf9bea270cacf5e87c13edfa240c2b26f34cf035386ccd9b8c1edcbd74285d903d3dd7a96f6f1a928f4f60c6e619324d
-DIST rust-1.72.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 243c5108f2f56f742d589a3d510758c7377e5ff2625e1414f6cf5340c111780ad6397305fb01d28af50a9484662777c70328f9b2f490f3e2e3f934a4ff133604 SHA512 49289ccbc79f022d23eaa9d4d9e551365be6cd348e23f01ac099e103cc6cd2508b30494057e181a8246d7c9fe1d7fefb6ff473608e3d8835d098ad6c00dc02a5
-DIST rust-1.72.0-arm-unknown-linux-gnueabi.tar.xz 175875544 BLAKE2B 20dc09b8e2cc48a7a52f184baac30c523cd180524b178a91a72c6b7bc91e8ce0fe3e4d2605b1f9b5aa1535daf29a8e92328bd919a9f5913002086726f5e6d8b7 SHA512 2b8da66ec7575fe4e77d34247cbd91b376f5f00039c02855964883fe0e3610c47f087ff3486b36181ab7724dcecec78762636c9c9fd17a2e9410bee5f7efc84f
-DIST rust-1.72.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 8a5cbed0df91a723f3c96b612c2eeb2580073fc895467a051b714b8d29956caee3199422686ebdeec6f38c8b0b05e5ef7a79f4a5ba92d77ed500ffcc4e3532f9 SHA512 a3259d475ad2722319a15ebcdc5c5c7a74b38813d7ee2de5d1d69e7ddcb9cd2bd3144655df73e1f5736262de5166d444a4aa9ec638ab4e2228de0e5b91fc46e0
-DIST rust-1.72.0-arm-unknown-linux-gnueabihf.tar.xz 176030324 BLAKE2B 8285f86700cd5dfb7ad2bdd70fc58a5222e64d7bb70aa51984001ce379b4fc7117e90faba1c3465357a27691231aab1c601f9b603418fb2004a4b2a8ed74a083 SHA512 9f810fd926b7d425c14ae40f8e47f59609fb18618ff4b16f26cc42904f9797a9633852a6747c2a7ecc130adada08ded4c99565a53d563b17ad04350d15145666
-DIST rust-1.72.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 6465556de7829ac1c02fc8cf6f9f394d87d8af9326710c100f24de5cdca62c3a6dcb831177d98d9b060a6e4338985513072f3430418e4378c1988509d8f10528 SHA512 3a85a1a7111fc86a5974700de196f716c6cef0436a7bbf791be7ec5eed3252ae654d48f60c5056e5d5000196b34d7cd32d821670677363aa9a94200ff269d6d7
-DIST rust-1.72.0-armv7-unknown-linux-gnueabihf.tar.xz 180272644 BLAKE2B e3c1d8cfdb4a3ed8e445ea1814d62f1d072de67f0c217908c7cdbffb30614cabcf8582e393a62ac43624e0d131bde1c51426ca04d9dfbbec265887b674863b83 SHA512 36f7d44e52668e4e67700834d0614d7f37f3b7219eecd1008ff9660f79226a011bac75402ecd43ae12ef5479d2e2187b10691057c188fc5046cb79138bf6e521
-DIST rust-1.72.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 09ed6107a45ffc61a80dd2ef21a286d184f0a2c8c57a8c0e41fa1eca786941cef06b66b5035eefade29781912118ff1da11a7f7fbb3ab3b4873d8cd2249e3f03 SHA512 7735c460247df0a6536561967090eeb5784a44d1a1cabbefd6d57a0afd74bbaeec96f65e206388f7958b32568997ecadaf83c9e75451986e70fb05167584bae4
-DIST rust-1.72.0-i686-unknown-linux-gnu.tar.xz 203434692 BLAKE2B 2affd5b42c664939ea0c15837baf51c9f315aa456c41e916300b45a3eb06c26995394d292380470442f0fd4b187fb58a1730ecbe9a4928837a7ccc0d59d8ed2b SHA512 fc8ed251d6c9888894b168506e5980cb9802b43485de5c9145d128257b1b60d363612115149f39cc13a9e18929422deb8285dd999abdcdb089d2318dec8ec606
-DIST rust-1.72.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 16048265dcb012b67fe9de44c11353a2506b314c45482721648358ee84dd500d13c30ab55e14f0cbc6837761924904355f02a0001a042819201c096965c8bc74 SHA512 5f16000c95372d9799787c3bb0f4d948cca18ab806e368ccee17d4bddb20352492906d54cd56fa3d50545374a70e42a893c37463baaccd1e612358a7c809a9e6
-DIST rust-1.72.0-loongarch64-unknown-linux-gnu.tar.xz 160819080 BLAKE2B 66b5f34f9dbbc633fc240a240d5b0555ac55c5cfddbadeb22168ab90be83410a75a9fbb154fd1aeec2ba8447ff76ed2984966c7352b46afb52fdb2eae82b02a1 SHA512 fdebcca89a65d5cfa6c9d65f89a34989af0b8c5c1396dc182ff6d4ce320111ae6b23c2e06786ebefd8dc40dc391342d38fed38a193daf0b42b6dac64cd79d36e
-DIST rust-1.72.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d7e483773ee6c105829d7b711904dd14194c9e69d6ad1271c45ff826d78cd23da3e8f5dfea688adb157a9c2697d3c36b1e88e7ee2789d571bc90e41701e46540 SHA512 0644e4d76dda08cd95bc45c5797252b26318841844f4d0baa49212c1121c773b64d2a4ea993c83d412e33433e604b1cbdb86ff60f8328cad2f5c741ebfc24a42
-DIST rust-1.72.0-powerpc-unknown-linux-gnu.tar.xz 175099316 BLAKE2B 7eaa2dc7816f63a9a4288d852b2ba7b3e13c5155f5f9a8a6ebb4a2d20f03e900b52054689958a07e7f52918835536ce92a117f8ffa014196040c3bf340d33b78 SHA512 f2e87a12a2d5146011fd9df5532df06b7a936c2ee4866b95d0d484099240df9aa13597877d8f1ef56537928b196dfb89d2b2084784ff9b2f86eb37407661bc4a
-DIST rust-1.72.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 681fae9a730a7f8006e30d05378ca518abd8514edbf69d82e6485f11a8a98f14c819f63618412fbb4c525a4b60367498d79c0b935f6be5c7b8a59f4e60775bfd SHA512 c4f5020297ff35043c1985e04ef5322b18283d1ee24a84cc29fef3f3e48e87612bece6ea5e86a5573b86133fb1cda7402aae98c897062b18d3ab71da48e3b68b
-DIST rust-1.72.0-powerpc64-unknown-linux-gnu.tar.xz 174927468 BLAKE2B 2b7c0d3b22a6b6b80f2f9771a6a6ef678575d94c2dd0dffcde0ab572507a09b663a5a4106f72865b57da37c9e710f75d38882fa0345a73f6f1498566a77e52de SHA512 c7b7f9c2b525c8ea1ec9f9c0090a8a4c098f5680b22b04b30ac86da29586b04d2a901498035ffdb94793b2732ee985c71137c63c1f7b938496568ce8b82d678f
-DIST rust-1.72.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5b9a6805c0ca7af4931d47c9950358b896689b452b898f0ae5d21a4c4027c20c321ce6cb2b150ac3b2508ccf0a3a430124a44974cb011572a126594374e9c182 SHA512 239bb2ae442d2b7d970bcbab4bfca77e09ae17d2caf4a2cdcc231d1c9f1aceb4b98a050eb3f3fae3184c2b6f451d32cafdd0d1e11c2714e180f3e3769b9a1b42
-DIST rust-1.72.0-powerpc64le-unknown-linux-gnu.tar.xz 185829712 BLAKE2B 305af3179f7a66e6fd7b8886e9f86e4fd4d2d71654658f0804182bf7ba1a5da6c71903fd89e899eebb74ccae366ada580a7b4a33436b3b82af928ff5d081fce9 SHA512 2401d3490c1e3ec32d185f7f5886c355384ba2cf28c5d14ace0d2b8d14eb5c5cdf4c507c67c104849decc23bdeb7223a151214e11b67c2276dc8f795878c76cb
-DIST rust-1.72.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 10bd90f3e07d892adcc04d9ca43454a78a5e260dc0e90978ebd50d48aaab488466584180324970f790eb181165f2d3961c515225c95efa55ee3d53d4a8f831a8 SHA512 e72d4482171090bd1e801a94b7ddf7002555e37aea9e9543e3d7f263df938ff223c0980dbae4b56665ea42e2c352e94f0f18c418fad02cd68d3b6d7f087f4e7a
-DIST rust-1.72.0-riscv64gc-unknown-linux-gnu.tar.xz 167275368 BLAKE2B 0e77dadf640c0fae29f720458caffb3dfe1d9a6514526676e1da333098341eba20d2df9b191005e5d66e6396b9e12c25520692f862ad84c1fc91eb1a6a71c470 SHA512 157da3684962c3145206910627bebc9fc5f01fc8d7e56477bae2796bc8fafdcc504dcb77cbdcc96cb2288b0cb019452116df7740fae3a87b5274d103da7f3a41
-DIST rust-1.72.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e660968bd401882034d63884e60ddf0e50a42c1e17a517aaf153731a0d319d9de5c074381fd1e56b535e1a870afe2b17b7dbfbbef33463a6bf4ac0a78226abdd SHA512 87bb2b30710a4159d1b2b87dffd45be772dfaf58218459109c8279da21440ce423cf5ee28fee0281c3b2b9eb433880c0f63177b0b775027b15095c9b6ea99bd0
-DIST rust-1.72.0-s390x-unknown-linux-gnu.tar.xz 197718192 BLAKE2B 465815892d2c4c76978fb3f14fae021f95007f17e3b6937ac64f22432aed808e77eda6081f0918d7fd48e00364099ea147e21dd80ffe93600088d7d1b39ae9fb SHA512 5ba7b7fe39fdf9a542040807283ded3271e37a8576e387c7d5333936623f688192902686027e491a6c5405906102afc0dfd465fd4093956b88942d54e5974e45
-DIST rust-1.72.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B cdf0ee76397801ac561e39cddd1eb1ee94454ff52df8e117a35aec010d4534b1ec024e1e1981579924bd976a1a48bc1217c990adb307a2c4fdf618c85801cd0e SHA512 a333a1ecd37aedb9f32365396dcf69e235a3c084bdb34b656929ce38ad78b5a26092ece2b81380efb32544ba578a657615132c02c7f4491855c9ca90d77fb863
-DIST rust-1.72.0-x86_64-unknown-linux-gnu.tar.xz 163402880 BLAKE2B 0f498510f8bbaba4b36e9e1cdc8e1e0482b4f26bc7f42a600b3e3f2294490f230a87d955c4f79c53ce277163660752a39889456d743c74adb2659cde536e09bc SHA512 f02fc82181fe2665aa66ca4948b66abf031c9ca273bb11ba69d1e99bf5bd1707010c4baaa04d8c83e9e97e7bb60440e3562380077903a459f689ef5dbac3ff40
-DIST rust-1.72.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 51083330fef8b0e9f4fafe71e3a08891bec9be8e1c2e64ef37cba463e99c13f44639981c8aae6c86d50c6a23c4846a4f056535dbcbf39a2d9096615862feff87 SHA512 284b74f87e192451ba95cc423089d64334f43da8c221f45acb683a088e7dfd783c488c7ed3fe68619aff4c245271cdcf4b1b8c5f0bef1f8c3d3af0ca13d394c4
-DIST rust-1.72.0-x86_64-unknown-linux-musl.tar.xz 234831716 BLAKE2B 3ee1a5727ad120bcf173dcee3770e342f107777984b06782f5ae588a58e5da94ad4550b00c168ddbe84350605100558bc01e139763b5734cdea32545ee6ee41e SHA512 62d5967669164ce7e8b6815298d79380ca96cce5a6c8a67db84cd3d5fdb6825ba9d2a91d59c2185a93b1c26030ef017c63942dc7a363e742d0abf356bca6f1f5
-DIST rust-1.72.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B e04731dd5edfe93d17cb032d772917d49bd46f195738cefe2e685f42b9ba5148d120e8d71c627cae46a665235f14ac0b35aff58498ff92da7edfdc5d6e562773 SHA512 2ed245aa779c594f8d9cbcbf63e7c68165d600408a25288163ceebf78946210a36958a3df80c50b2006e11930e09ecec0eee233ff659a9d2ffc78c1b55d3b0fc
 DIST rust-1.73.0-aarch64-unknown-linux-gnu.tar.xz 216033148 BLAKE2B 78bac094c78d68102cd5ca6a7bc9ac8a51ecd3e14cc5c66fefca0a0597b5ba439c22d69a323a6e7cafdfec60cadf0672c91ca5f85065ac8d7913c83437ec0256 SHA512 58198ebecaa4652e0477eed6ad2c29524e7a3e991ed437775281ce526c8485b2a1a49c75ac6fd5bdcc6cb997cee4d1b4d82fba49c03ad38bcafa764f5a9bdfb1
 DIST rust-1.73.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d4b85efab3aef10fd6940630ed3cbf6cca12961228482ce42cdbd4c0c185c55b9ccecb1ca386e7a5c02fa33b77685dc8e2d619ecdec0cb5afc7a01402be5a22e SHA512 b7392e301c00e2ee1be692e6b5a44fdadc4b442979bf8f09fe71f80d82b6f395d0505621ba8eb54fe6145812f7f9c0d2b278e474d6edde51a2318cf27f5080bc
 DIST rust-1.73.0-aarch64-unknown-linux-musl.tar.xz 197525740 BLAKE2B ed84c438426bb0fc9a5a320731ae448f242b70a764d67e46e53a37f0e76262a183886e83fb27166e030740a27e6a79ef1c8f50bfc4a2c9c5d915ee5fa74a251f SHA512 b1a3007217dbb771e459b92a2ce0efca3babb34e9901cd44006d7c8ca92f48f67bdb877d3ec4710c58ad1645da4830a52cc2062b6b5a9827b8d57d508f4029a6
@@ -116,34 +88,6 @@ DIST rust-1.74.0-x86_64-unknown-linux-gnu.tar.xz 155920616 BLAKE2B 6213da724e505
 DIST rust-1.74.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9d81f9c2861963a34b0bf9bb15a584db502d388b15f73ce98f78cae6bea0357403d9bd0e6f8ea427a9f4db5946ba7dbb4242e7fb4400b561b7431235f0dbe2d5 SHA512 e1e5e3850715379d30c557791a4eeba2bea090ac85e09a982579a703b2582eddfbc060e21420f418cb492e8d4abe87d5bd81b5acf6ee8bd17b80bb6e0f65b721
 DIST rust-1.74.0-x86_64-unknown-linux-musl.tar.xz 235589268 BLAKE2B d695695ebbb3bf0dea28b9d337f82d5828e6ee70cf7220c849a6008b32f2b590ff57ee35efd58d9a38cd17e0f77ac1187765e8fd6470e0ee2c6cf75f3e3f1489 SHA512 3a8d4cb87d1295b07f0ed48f6e01e69801be3c93744948ef0145217b0cb17581c11c618a07b72edb0945c2ffbe85c59ec1cfd99ef6a60c2e96486f9d5d04d38a
 DIST rust-1.74.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 0ba1390f67b88fc694df26df22c99ae40f56ccdffb479d9228a17a153de965f8c31dfb4d2c65dad4819d42a0b66b96ff9d3e2c404848dd91141220fdce40710f SHA512 efc779bd0e6fb41297a67efdf731abe3857dace889be284d8ac1e6c239a35749185ad5ac3b82c3b2e55edab3f0e51754c8e53e07d207cf8b4b68ede20cdb8591
-DIST rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz 215543948 BLAKE2B 6d5de2260e4720275bc8c0ce23865840886e27a3cc539ff90c7b8c3a9c04368f2c2a2955dd7c3fe2fe5471492a7ecdf4c2e5a749789a059ad8178a0d70dc32f1 SHA512 7ccd4d605c97cc5a7dfc443ecaee23b4d7c58b0e9673ebd0f9174a4a123639213eb85ed25f19479ea6a818859190e673e0479ee80235a7e35a2d971a636872be
-DIST rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ee4d716d905f654932ef70d65c3e83c573d9076c447b4e5831d1dd657be407621890d7a9858fee1ca8ab869420edd267f71d73948abc5861315ed4dc0880d18c SHA512 007e9b45b3b3957a8da7d01c45c5cc7d2d49942dac39067038e74b414ff32e810fd902b8dc7f7563b18c565c782b4e701f23f6d1cea397959241d3cdfd6421fd
-DIST rust-1.75.0-aarch64-unknown-linux-musl.tar.xz 195703332 BLAKE2B a662f9402ede618e78c9899c9b01c2138b927286c0269e847ff4fd389a07029eaa4dd5242576457c8ed67b6b46eef26396d079d1dc2749884cb05334676435b9 SHA512 eceececb90e3c2fb19866e58619237b416777399c6212362bc09f784138df83edd9160dd29906ed928a50e0359b2d9471868b594d765d35c1c7d8d22760c4f1e
-DIST rust-1.75.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c37dd733fdd13617f6c4be580631dc78e40684c4f47d1e90f575e8aa1c122b36c1fd7182773944cf8cd873c84299a484c9f50a48ff70c7cf54e4b5becb6355cf SHA512 5c35f04cc4a58cd29c1d6e9a5616937492f584fca29db099ed1d59442e76700b83583b1d41e7ce4815187c7092af2eb6f307a959e8b7a647818c9ebe84cf4c8a
-DIST rust-1.75.0-arm-unknown-linux-gnueabi.tar.xz 179835780 BLAKE2B c532fc00e99c6428947e5335efe73fb979e66fd8d52f60e9cac7040d253ef15543171f74c4841ad740d2d334c0b2305f59925e42420ea0658307ad434186a715 SHA512 9d2b398cf97ccf8b70a82c1d03322c1e432f9bd4885d8a42ec26d0d6d6095b783630d83b8a9287c77d8d57b7bc648410273460ed6339e9d254d1bcb81191a578
-DIST rust-1.75.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 5ab700ba8898ab1211b20bf1d1a89bf3e4223eccad6b0e816b113254f7d44f23a03cb7fa9fe68386b0b18ca57d71f39b28b4328f072037058c301526d760b063 SHA512 12d5791f0c1d092b52862786ba6b80031607ed819568734d904e553bc24677b583c64e93cc0cd05fad2eddc7357b21c5d15ef68d720b0ab037c7787f2a47eea0
-DIST rust-1.75.0-arm-unknown-linux-gnueabihf.tar.xz 179907476 BLAKE2B 6ed49db0214fd8b35e4d184337b38dc8393f8baf2958bb62308125e6f8e2126f0aa19c8d44fed3475b7818b001447d69267504ab3c96136e257c37db5d2c2285 SHA512 61d555d9c33c8e1647338fdfe24fdfbb42e194ce4995939a58bda6c46f4b857a058e344e714b88435a7bdcc5ee4a086bbaa9c670bc01de45249ca8376ec47c80
-DIST rust-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 9d5ae3c83985aafdfd1dda6c1db4bf849b4ebaf91ca71ac7249cc8c89de2b3135e752c21850b20c45c5570bb188db1f8513e1df072ebbdd700c37b3ef5f22051 SHA512 6481cfbf21e108d440c8836963d752496eebdf6018b7439459ea079ca82fa05bfc0bd423594e3537c7b522dce05546e59c125eb0cb24ef4db13ed36413c2c1e3
-DIST rust-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz 184210428 BLAKE2B ef329f05d143590d91cba77e7b9a90a977c316e9ae2d8593e7f0247a5db00ca0115c6d468da5394b36e6ce64b2716a51827f39fdc4a34dc16c9220bf5690f042 SHA512 77bfae1f170cd4b2e85a6cc0e02c6f9d621f386a4c0709a2e99c4383479f8979e067d0e92ee7d267150bbf36bc7134bc053afdff7dc0ad66f289aa182755b1d6
-DIST rust-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B d0a3ebb883641272211478bec1a8089929be0107b05b0f499d71f96515941f7d1e18870c8685f77ef2375251e6f1484f675bd04d5fc0d544854f15ba6402f0e6 SHA512 79e631dd0c44905732ee312486a7c8233440120abeaf40172172e9d5ef0c9687469bac2693ccc2aeb63030590167d88e0fb7d912663dbef655e54ee4cbe9a323
-DIST rust-1.75.0-i686-unknown-linux-gnu.tar.xz 209938900 BLAKE2B 0c9afda24a93f3f35dd779c08d65d6c2366c916a8a3ce6633cd5502bcdbbba537743d95b76daa29d0b4ed3a822915cd5516e864b911bf354e7436745d5a17021 SHA512 242775555d7d38d9aed83018f0d0f8f5f03347c07ee92751de445826c08bc66c24f8601d83eb79729d001d63e81a5b1e27dbb5fac724d80d49e6430685052ba5
-DIST rust-1.75.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9b7d778b75c2d0a6f43f48345cb4735a9d00d457a1b4d868f777eb16db040daf246459620ec478b0632ee0428e6215e5c39d819608ca800dd065b6e95b13a77d SHA512 f307db41c5e380dd023cfa3e91eda98dd1af8004d062fcaa759c4913464ee01abcf168f19a9fdbdda6dec7f718083f4765eb4296614de4c1fb6fa06144116297
-DIST rust-1.75.0-loongarch64-unknown-linux-gnu.tar.xz 160649540 BLAKE2B c96a90d28e6b71e2e5a5bea8f591e6b472f63bbcc59f181800e87d4400e647c8a18110ec50c7d6d10c8f460589386e1fbde6273ccbccea9373813c80f6612a2b SHA512 04b601e96e1fa6a7bc00c7d8463e7ad1fc4fb1bb46383e797189ecb972e23535ff864e5379c56fac400dcaf4c42923b8a5c4fd9aa08adb52bc1db8341f5254f1
-DIST rust-1.75.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9da9a6da9b631e72484a3360d692860e98dc77b74e55cf24d6a6a271e9eaa4787ea2f30c38dba483b18890500704319c1dd34b185adf2cf6aee6730bda8d239f SHA512 d6e20fca261aa2c81c019fffe46c7708b58146f9488041419b84a381761a2cd27606d78fd0f6b5e5e79945e1dd76776d54c335ddb453172deab8bac2c3fdf904
-DIST rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz 174918688 BLAKE2B ff7c03e23f8d21dd8f4e0ebaa958fb97ac7779459ad318304070da0c1d98d832200d20d9331f758a33d6131da387af830392e8b34c33c4d220ae49bc93d7c060 SHA512 7a836a7d2ba883388025693044e59af34b2c41a4ffe93def5ed161bf012fbcba7da81cb521217da142852da05503b18df9a965537ba6ba33ef92f52cada8b7d6
-DIST rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B aa30bfeea014f600b1e3c387476a28af619bd8d63f5b6f10801cc15ee42deca5ab34d3470ec4f07fdfe2b8548f580ff6a63a89c74e1c53c7ef8cd73ddfb69272 SHA512 7efb2c4540a4be9f712698e7a9a905462b2fec70ddd65b9a6ffd28119eb595514366451932c888abe1ffbf93aa8b05c33bb0560c47b478f5122bc87be1c3bd96
-DIST rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz 174640484 BLAKE2B 768ae78a073b1a7614594ec1f6c381d7a4a9b4be14e548cd5031ea011600755c1934c442795e05f95a720a38c155cd18be188cf7e4b6417d924edc9c2a9076aa SHA512 f83ee23aa8eb7a511984b096876cce60415943d729c77ef4b4cdf0b0f9f8088082058d10881d5866d81a0e94c8515b3966de5a41dc8916d75392650715a844c0
-DIST rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 2bcdf4419fbf491fedcb32a7b54bf2ceb2aaffe0319d9e15f7eb07997646e11283535c5b2024f2785398bbdcaf586aee0ada7128a47b9b8fbd8ffa9e7d0607b5 SHA512 89a0eb5762d49351cfbadcbe098243095a62d41381ea48ebe8a3bf322998c6a46a59ea30da29c03291738fb3d04cafb3c1f57ad1e9ffedd68b4bc1516fdef66f
-DIST rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz 186507032 BLAKE2B 49bfbc50e087874b844a7292fefabc0df5217751e2391c44827baf3e83bc0e6a6ce9b392cca58c5b8df6f7f8503110609667fcd9b34e84122016fd0d8df29058 SHA512 536210c00f9cf4bcdcd5bac308954afa4a1e7145844914a5b614745a9023c04273a58ba4ef83214663d69a0a6fc941cd4011349d54e55d84bc090628a7624874
-DIST rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b7a48197f9159a6c5d46306808d4ebd17b492669745a941b5db380d76d5ca78095f4bf396804caf7b55bdf47d79b5e88fa2f74aad999306f586e62851d7de029 SHA512 27d86a35df7985a626b64ae7ec05b803a7ef5feefad476c3eddc2d89fad44fe4e520ab29bb27cac8be0a0f3aff7da85e45ae8fef15f2afceeed4962933869e0d
-DIST rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz 179877936 BLAKE2B 210b84fe6b0729f52c2dde492b4408f33a7661ea9a40daeb1b2b312788f2c4dc80ce54ca72f08098e8575215e7fa7500694142c0448460bf8a82b2761c236290 SHA512 7cc11f07552cc50e78a2e90c0d0da1a62fb0547f56aa6facac4791ef81e7d62a2d66f3cd079cda91e0db1564c2931074ae40c8c142dc9cede1f9c374379fe49c
-DIST rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 8230c219c9cc22c93fc25f023729e87bf5e725f0613cc0a1a205a671c24beecc48997f824e128b56e4242369328666e355fb5e630cefa6339b39ddab61ca273f SHA512 75820f06aea67b3731777d5b7a0cb907a829b65dcabb4ce2fd55bff52837f6929239be6f8c6b303b86a352ecab16d38afde3ef9683cf7d5c4b4046231c9988c0
-DIST rust-1.75.0-s390x-unknown-linux-gnu.tar.xz 199359500 BLAKE2B fffc6c690c4ad8a9985ce8d2b3e6518787b474e47cf1d5a634f38b5d9d4017ac8f5f69206a9229298dd504d2ed2648dacd2d09a8512c008678033608231c2d7c SHA512 bae263c19a59347705959bf2d285420d2074836adcb92a74d2ec922be2ce2f8aff6f758509701a2136473301654bf528b7c1c2522fd7388f5669d1ed94324c50
-DIST rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 74cca56622367225f8326b60540c3738adb2ab12a5e320bc85b448e1cd2111983a0816188dd8767d2f20db0f9120d5d1bcc5393548f1a18c828a55f99e4c50e6 SHA512 00e0181fbf6ea1ba2035b368f3ea143f270f8a3c5e41e441593cf3cf072c31b3874146de8c2c51e3eef5c8f0ce8594132a39516d3f614d8d5f0863b546dfb746
-DIST rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz 156249584 BLAKE2B e6ac90854f589c2fb15144bb4db07a9b05b72196febd07c9de223c74c05c2637c832505f1135faceed14fe8c8bcad0a5205005540faa2bdf0f42949d934107c5 SHA512 86d1a5686f826c8f43f876c4cef42e9483785a37b1aaead73dc64a1ff64e7a025a6771d2e642771c6c847d717c25c6bd2560a2b8b59516a55dece589580b2534
-DIST rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 6614cb3ef782c917e8f7fdc990c5b82e8fcffa71e075f10f9726f405ff566fd963bec64cde4dd7252d9d78e09a184b8ba22d15cc87662ad987cdd37c881d8288 SHA512 bfaeef4cd7643879991955fd33f4cdc4c34afb1202cb77c0736434fb735bd215d18d1a11c25f04a7f2514640858a36832e5805a5f85e92d8b7076aa18607ffc3
-DIST rust-1.75.0-x86_64-unknown-linux-musl.tar.xz 234151836 BLAKE2B 9461afbdf26dea19e118b35ea7ef1ee60c22f601501ae6a08950658598a74a6b3179cbdfd9dc4748a0c2485af721b371e5fb523f27e7d7d702f94b532a70437f SHA512 7d650a29c5d14023a3d7d606b7bac4be6ef7988a82525f02d7af9cf3895bb88284442b8042d27be69689f4bddaa5c5370ef7609d18849986860eafcdf89d2d69
-DIST rust-1.75.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c222d0989518602c0ecde9d21dbca97e9e60d81083804d1d8b2c6bffc8114af78570fd384eb58e5dba1bf249b99300e7f3f4067c1a66c0cd9fac60443f56f751 SHA512 6f78913e34402cedb37f4a54491c65a8bfe79e535e4e40516f2381bc27783cc7655e9252e7701813578c8ffcaf6b301e61ad32917a475d4388fa472733b21b12
 DIST rust-1.76.0-aarch64-unknown-linux-gnu.tar.xz 217392212 BLAKE2B aa587d69b5acc389a8d1431875f10f6261bbedb259a9009092e663a345fb0ac0cf3ad3459ca549a496853b8d760c7fc56b797ee269bcd15d54bc735cd1100fbf SHA512 ad95566ca7597ef64a03f614cc20b9c8d9b2fe67f33141b817973fa160c2be978511509fee79bdbfc74c50076a607e8543ad5bb4b56723704df27b5573b8d606
 DIST rust-1.76.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 86834b999cb0ad9de02a32a79f801d28268c986c830ad3f16274cd4c404a4305267c90b677f7a8637f2de08c766ad3555945f77da181906358e3d51b35e258b1 SHA512 79c1b258267d6feaecba18648a7eb620a570c99fb75e422d0a5b946a66f3a5bf6d2b41dca89b4ae79feed704d498674f36de368e4b228b1e38e3499ac8cd4f21
 DIST rust-1.76.0-aarch64-unknown-linux-musl.tar.xz 197852572 BLAKE2B 93985909e049957f80d4a14842c85dd14e5eec6d74e4e439479f353b44b123947c782856de86555262829d755a344ad01a94c41e8852818e727fba74620e1d68 SHA512 1f36245932d3b9bab0b99604085d886d9fd2e575e896e1c28b1771ae916466c060f4d70486e47200d58947147eb5571b922e175b1a450a36388c3c95e6537655
@@ -172,34 +116,6 @@ DIST rust-1.76.0-x86_64-unknown-linux-gnu.tar.xz 159385660 BLAKE2B 0846999358aba
 DIST rust-1.76.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 88e6b124812b409372ee05e2872cb4dfacbc638f8e3b4fb0d5fa4ea63f4594333a9788732502f8bd41e34b5cbc404d7ac08e7690d095a6c37c80b0043dd2be88 SHA512 f7ddca81da468d5617f48240b6d3e8d7d09336ac58f515acd3a20f2d315468ba1d53508dd3264a088ffc0141cb3fbcd8d3c17379f9628270d39c7d44f7727291
 DIST rust-1.76.0-x86_64-unknown-linux-musl.tar.xz 237333892 BLAKE2B e95b92c68e3c2df49fa0d5d84e35f6575fb80571db290b5969441cc09b6c07dee6b2b887f41a2b1ff1e3c099cda2ce2a4a8c05afbcf9f4dc8acbaed5245b69e4 SHA512 04bbbb9a6891c3bb7a20845010029e6ca979548ff70324c08d3162ebc1fa3a84e8c7e2d453495edd34aba19b7a685f048d5047993103bbf221c88ea36350370c
 DIST rust-1.76.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B cd4334fecc17cf03b7333659393004fed4bb895f9b75f93520d1c3e3ee0ce4fcd17d75d748c4a35d31984215c7aec8904ebe3a4ad8bafcd625aef30688a473f7 SHA512 a458372b41c2833bdbd3d6678c35fc23397817b406c409d1ba5e19b4c6246072afff3f938f111382de56f7ff57e660c3eaf3fea0e54871d9af50b52a54f39e41
-DIST rust-1.77.0-aarch64-unknown-linux-gnu.tar.xz 214505028 BLAKE2B 125cad238e23c31373bfa7f02bd09eb35c3fb9425f517d1c74eb34b667fa1cf8a0e36b879ee1ab90c5ab95a8ea499f0a46ece894dc45cdcecc52831c9720b860 SHA512 aa01ef526b8ddc84fc5fd1ef747d94c0a80250606fc9c871a52a6556989b86231ea0706139480b7579f4f817dd17171ad18edd6a6a73c5640aa5a20daec8c9ee
-DIST rust-1.77.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f6af9150b43c206e626b9bbb6d31a18b8d04b99f24ff131668045cfcd80a616302954e74f41397dd5772c761a7f8ce1a14c15f1da509d13d64ffde2684f9c3dd SHA512 cfa3d76d441ced70c9991aadfe144c12d56e6bc908882b84965ce1f13373c73199569b87609fd362a09484a95936151e036088def72061b78ea3c13ab36178fb
-DIST rust-1.77.0-aarch64-unknown-linux-musl.tar.xz 194482084 BLAKE2B b079e5c09c1c528b35451918ed03ec3788d0a8f5de099c3fe3aeaa815dd0a26e3106a2dc0c55462f752949e8ee50913e1cd1bf97235459ae5175847babd27d30 SHA512 6e3fe34512279138b15547e09fac8ccab49fc9a6e5c8faa010067c601aad284522dda67dcd5901bb153fbfa4b06e819be36e9a06b1061c702418b39f8f351fd2
-DIST rust-1.77.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c4a523203247096500797238f7473b36c39017aaf1c231713cd2d87379f973a7a464e864952b8dc1575ad91ffc210ff2291f88b77db24ca3e5f18ecebdfc23da SHA512 6fc6655a4da63ebe56af5e34569ae74f3c7daec550249269d4499a7f6d116f01e722f29ac95cbd8c0df60c0135db03ae50436650e8c04ef2ea685344e1ad61e2
-DIST rust-1.77.0-arm-unknown-linux-gnueabi.tar.xz 179351340 BLAKE2B 51571532f1a5a70139acc91d17f6aa06537e32c60aedf5448ae73efbc5b028c54b098ba1c1820bd21ebc4b7fc8bfd35b786610074b7e8e86f2b4a561613c16fc SHA512 cd8de4f9f42d5c210334f7c1e110a9abd571ff6cee39d08582cffb89828fdb4d05cd83cb597f89b5fe2ef56571cae7c087cf5751f0a9ea4836b157e076537b5d
-DIST rust-1.77.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B dec3c7d773b61eca698a8efa9138bbd58341b48e391b5898ead2f6739a3e9088820ce8749b0a7016fc2092a7aad3db7bfbd778ee5b56847b6f98a9bf7251af9d SHA512 0a2b1a6eeac880dc3ded3ac28c31413b857bbd0bc68f87d7bb26936b00827d45a72d96d35ed69c6c981f4b9c2ea2d31aef9c82bedb0ab557176246f327f162a5
-DIST rust-1.77.0-arm-unknown-linux-gnueabihf.tar.xz 179479060 BLAKE2B e3a6b29b916a39233e8ae4f6b190479adc19184776f3961373e54d14cd2732ce3561cb08061520c6161c62222b7d2be2027fd826722aef4b128e26c00165ab20 SHA512 695553505af721af3d6d6341230906a707301c41d491118ff3e1c64a9f7e648c6480f8b9c0e786ce3266f2ece266e0805681bc2c23c7bb12ed2a7347b384cba2
-DIST rust-1.77.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 6f456f02b2af2b972dda67a5be9af53576878fe6e434d3385cabb6f6a62728682ed6fa5493dbb8629a861b25b8f722efaaeaeaad5ee20dee55a2567ac6003406 SHA512 a9f97671077b24043aa21b242112e86036ac8acedc719d0e87860a909d734d109db138e5bb7dd8ed2735662bf63ef2310bb8277b280bfa918dbf6c0bf69ee3a1
-DIST rust-1.77.0-armv7-unknown-linux-gnueabihf.tar.xz 181508844 BLAKE2B 78305dd8cb11538c3c5de3883dbae2a7fc08470f940f786fb4e8b5125f57ea119d19cfb11fa55b6ff67fe3c5a03757c10cee6baeae229bbbbcd85f265ebcac85 SHA512 42ac807befa5a56244e892eced3e6771f9bf2cb4cf5df28dc00581916bf655840bf4685c1499fb0a9fbeb40160836f8ec2959526d32b872845f72ce48de93a5f
-DIST rust-1.77.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 39a3ff2c0b7088ccb7c16c87f3abed37cb9d4ca8f48c77f6c2964b28d7a1eec4df09ae5f19fa6a2abd636436f3886b7097edf90d2f7cbf0ba0fa93a2dcf37a28 SHA512 83bde08a5b5f34afec0e4b0ad6c58e7d485a0729743a67e0ca09cf475cae194b549c05e1af0667dcaeb8a6e3807e2b20ffe8e7bf7272187ab9da0093278d61be
-DIST rust-1.77.0-i686-unknown-linux-gnu.tar.xz 209041428 BLAKE2B 83c5329fdb91f14d0083115209359aa1fba0425e9746cd07f76bf820d7b13c339279f39f0c05d1d2e2049c9acad9a48b4d93c97fb26593bf66d95e9434d1a6fa SHA512 8b546847afcc0860e3617df5006633d7c12adfc7f985ad5c0c2b5a83b9f47e9ad3b0c1917a66d313a4bf370d37e959129a807e957f4cda95efe2ce03d5acefbc
-DIST rust-1.77.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f7955963b450f3db22d62bf9cebec16ee2eb2ea32f13b377b240b7d7bdd54da590bbd5d69ae1df02b3dc4f35a35724d41004cc2b23e5f0001b609f086e8028a3 SHA512 927de4072f4d5c461131b1b4f5a1573d96d4da1a2b23060bf375bd5da00fb962e9eab6094f3677f9f8bb7270b54c30a0c5404fc18b2641407b34740583a7402e
-DIST rust-1.77.0-loongarch64-unknown-linux-gnu.tar.xz 161969048 BLAKE2B 0eef0100389715b68def1a491918d0796cc4bb18a481bc8084a96ffb930f7018cea8fdd77e762fd1af18acd81f5fd666f48965e9b72f191588a0c4ed78c975d6 SHA512 8be1eba5615b29d9167e1ad49be301e277f2fc78c6779915dd25b3da395d3933f4ea2c0b4e17d848f580c813c26335285d20ca0c2f966d2248593f04bd8ef1ee
-DIST rust-1.77.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e1463e570c719881b2394b5f92856cbeec33a5fd0dd326c97f6064b52ed1decc0b7d33ac3b3606754264faa67b6aeb718c1d3f8f7982ab6024acceecb9d0985e SHA512 03cc2bfdeec9c80128f7e7a5d5f0874df7eb9a22b5da19f9ca1a685a9c52830de5093b7b72c614839da14b7eb76ad3dbed92c233d6d9cf0dbccb458e1fed174a
-DIST rust-1.77.0-powerpc-unknown-linux-gnu.tar.xz 176187556 BLAKE2B acdb1d1f95591dfb167bd87a2b7390554f96d148f6df01c7a1254d590f79302a233e1561446bb8a7f344e6801506c183221bad431fe40b6e8e1854b920641b41 SHA512 baf226c192c5a6ee44d5c7e32f0d63d48b89fa43db1c9966d04d94bfb7a4bba3dc069719109a9c3cf601f6ef7b3d2c320e75cfded5916f6169f4c19a16665301
-DIST rust-1.77.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e8053f9b897dbdba5b175c56ad9cb9c278e968c65cde4f8ccc4d15f1df9f26a2be3418040cc5a6cfd6984ce9b0b3703b98976944eb6523ba45a0fd45e6fc31c8 SHA512 d0a8b2e18e59e55819d64f5622a7fc7a15ebfe05d0946f23ee42dd6c75307e9c2f20541c5b344a3bd97e9e9d93b54d6a85ffd7c783492b9c46f819f91c68af61
-DIST rust-1.77.0-powerpc64-unknown-linux-gnu.tar.xz 176156772 BLAKE2B b5910f75e945f5ecebb988ef02485e3535e3f8d10f6c7acf3190c6dfe22e0125a637c8c4dcae3b6655ba0ec19f1ffa2f8ccca67d9fa3b2a8a8dc584e52d2eaac SHA512 403f1898930367a59a54c1a254cb991aa23e3bfccf9ed3da9c992877bab3b33806e374dd97cbf9650109dcecdb6b72e5f4c7fa664bf44d5880f8c75d3698f27d
-DIST rust-1.77.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3d96ad842e8e4189c2cceebe885ccdf3aaf986a3e7835cc02165a76d12fa2da1b3cba9bbf1213cd7cc68a95cc612b735e409d8cf23dd1f252c1d0ab72a09d756 SHA512 26b73b5ac0216b994ee887021dcd6c5562aadeddce8b227a064ae40a19bb80de7d1278c9192833e2d2ff227884524f742c49b52ad5b64e576d3f87d86f7be536
-DIST rust-1.77.0-powerpc64le-unknown-linux-gnu.tar.xz 187190912 BLAKE2B b203cf8e70a952e137f17d4dfd77bfa201970fa6a9d936b62cadaf4db1fcaa3e51f6a320351ca0bccd96bf6bd5e38f5f859080e7154f23bb277dde21969f562e SHA512 5a68cba4de547e7060d7be6260f450a328c0505be35f175f65435c83c13520b10b6d5e6aed3c52ae8b61215a4ba47cdc1bf9ceb2f454f3415d5115efbdc05bbc
-DIST rust-1.77.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7ddd306273a444bb238ef3f7eb9dc88c0f2895bce506e7708c56d31c252c91a20258d6d7fd609c76054872f1e983454d35b985b5dac6775a8e423d9fc5c3d3d4 SHA512 3c4df1c5bf1dbcbf127bb3615e307faabf252c40655bde6ec3afe3179e44629155fb3b549bf983ffc942c464462a601c08f66d6bfc93b033c61d3b69005005b4
-DIST rust-1.77.0-riscv64gc-unknown-linux-gnu.tar.xz 182245920 BLAKE2B 7365f2de5a6e5927536f8b03b2f9b1cd9605e515e4323b279f35ff9c940d23d4f7539abd1f9da25086b85e695e111440d0d1990ce933080385c750d61307bd7b SHA512 39a9d98cbbb1c0247e80a6ed3635833f0ae95e24f7e62286b7c76b2f8f4a06715e324872a67693c97eba7715f868db8af3652e809112c9621c30a1885dd1a029
-DIST rust-1.77.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 08128f5df77ea42af1d48a40884e1c7f8f50b8cc16354b9b099694a017d243068c9cfb9a0e096b5147b58eb5e2f9283d0e2be4c607c75f8b110e2cf84eda74d6 SHA512 430fb9105a4bc16edc0b9c4a59d124e2891935f7970efa823461d86945bf163ecb043f72fa11453415642672162978ed4446beb71dad041c9ca48a9ae0440aa1
-DIST rust-1.77.0-s390x-unknown-linux-gnu.tar.xz 198606604 BLAKE2B c102856588697aa08f9c0e3095ef9d0e17df0931a3416ca7b0a0ef4a6182d1ce6367040f8ac19b19f1d0cee6c70b64cf6f653c44684fa137acf5d606db82f23b SHA512 0ba59b16309393945a73615ecf5d10d31d082ea3e21357267fce08c9ddcb64c0ba0da7595747577d400d6549df51d95798ecac43931ebc75f9d57d3107fca11b
-DIST rust-1.77.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 2574c4757e0b63c5cfe35a58ab2aa175f024de79abcf36e623ee7b925a528decb7f22df89d16ba20cbc1218a056c1c37b154b33d2dad223604cbd3222017919c SHA512 baabe009b58993fe5f62940c51c0811e9309d5a7f9d33819906241ec38ece45a3420a2ab80d972cb2cb184e965154e50feee85ff4719c3d10851fbc040f6f9a8
-DIST rust-1.77.0-x86_64-unknown-linux-gnu.tar.xz 158351120 BLAKE2B 454e8667ea8899cb915680c0c39e5f7831450604a11a3bc9b7d8a897ef6e723edd382c171f292b5e89a406c823735d86ce96d94d08fda53336f806f83b3fad79 SHA512 462df108a811aa628ebf20cd3ad88dcfedbbe4529929abf86e65cbf02d4157ec56c8b9c424b9b9f6930852ccc972fd9970ceea522eeceb79c6acf5cfb7cf08f5
-DIST rust-1.77.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 627ab5e55ae8095b2dfd1559c798376a5e6efe751f3c7e74540c9dc1ad8d889fe6c4c2190914506829e50f2fd7de022584b9d3bc3c2aab4e8bf3126dc4306c31 SHA512 24ee5edfb675f7598366edd9390d7a6044830c31ba7c9bc729e987a5c9bbc8cc7a6beddaef7cc9b1718d0ef4dc5f6568e0ca1504a23d82328536dd478dc391e6
-DIST rust-1.77.0-x86_64-unknown-linux-musl.tar.xz 235071684 BLAKE2B 556a5c8aff20b1314dfc6c767adc9b4ac1a70a5976b49e4550247082eadb76622dfdab253ec853d38807990d7c9f46503060675187a589da91ae2f093d5be4c5 SHA512 073c8b4c92f3d6444ea4fd599281c262fdac7fd4589aee0a0f0ec8bae2e6a315578b2fb3ac768579946cf4bfd77b0e440bceb0d3523598cbda7fdb2ac59c98e1
-DIST rust-1.77.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B e049d7c7d25af1074420117b8a984ff585c85808e17b60285b4ae288216dc2ff3f6b08707157b5e9a7778abc312525e755b70fe38f1b0a23fbaeaa9a52305be4 SHA512 c9b54e5ee181dd217b36e258cc0e72c9acd17ccd4f99430ac4a473e898cb3a3cc16f79609e7233649bd8126119da1e2a99f6b7cbf8864dbae5b02746468ace06
 DIST rust-1.78.0-aarch64-unknown-linux-gnu.tar.xz 223523772 BLAKE2B 734416f447462f2778b74f12ffdda13374c95cc399e8728afbeb61b06c0db2e522e760a257d2ce26ce8190cb9c8292880bf02da52df04c3cf205841b95825767 SHA512 80adc842a56ac95d472dcd94aab199dbcfb3d3a5e7a8cb32b8334b038c58a66b8d4f3848ab62a3e799d7c35e6a32abb1f2738a784da8cfa3272ea299c528d5cd
 DIST rust-1.78.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b6cf17229559a845cf63a22043b1ecb9d7e142b536d0fdb0b44f36f05fe1238096c48dd61becac58275d60401a4f0ce623fed9593290d1f659d31976bb0c42ab SHA512 d03a380d0481b4ec19cfd8026d262ed19b7f6f4f40287b0e23127460029b30c47336232a488dc8d19d22df98f356cbd62d7d44f4a3e1cabb6f575531be8916f7
 DIST rust-1.78.0-aarch64-unknown-linux-musl.tar.xz 204806408 BLAKE2B 08abcef8a38d2d1e463971613481806e897ad4aa48a6e3306c23cf7b906807c944809ec60647c5a80e80978cf8aa8bb1b8e990d69769f94f44022b0f764cead4 SHA512 4ec03b17e2f016fc5449431c4d81d113c12227e6e11553f9fb4fb61e4ba3ca4216aad776e7e3c1e88ac42b797c07f5daa23cac90c3eaebc6d360602f026f9dac
@@ -256,22 +172,14 @@ DIST rust-1.79.0-x86_64-unknown-linux-gnu.tar.xz 165014992 BLAKE2B abd9f73c8439f
 DIST rust-1.79.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9cd1a51580d9f70f96c83b603716a5edbd8e1c4d4c2f53c07aa9d37c6c47f3bd252c0a1cf26b77bcd60842fb83ed74cd7b6e4ab3a039c3938423372485f8c1f4 SHA512 b65621f91085f4a5c6f84ed5e530fe56502ca12c5b18486afb1197156c5f6087110578647d428a58a1a6c04765569a28c38ae40a14c72fd41f39948349e8115d
 DIST rust-1.79.0-x86_64-unknown-linux-musl.tar.xz 247326760 BLAKE2B 36bf6787c69971ba7c445d1895001c005af0aeb48aaa3309e971237125a2b6de3ef5f1534572f8a3f4c1bc024962a8fd030e91b63c02f03444b5aec1a3ed2e5a SHA512 02e5c2a67f5470f3320b04e7c4f0a6f5dbd361d5a97aee7e5860d04224683166b21375794c94ae040a2cc6fc119380be9d3465b8c5e1798abd4142d621cf9f99
 DIST rust-1.79.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 6dde2d3096f7e47d31b1e13e7e5f41cf278e770dcb8a222d76ab5b93b2ca8a6d9e5b45515e097e5285bd2d76130546b3eb302a8391102460c4564e654c88f03c SHA512 4618852fdd81684ddf5bd8758d2551f1c800ef1614fed8ba91a9a1d29b3b51a0b9bf169c499dd8890347f999d002e5aba7b49a98eb819f20bdfe82fa375ed45a
-DIST rustc-1.71.0-src.tar.xz 151962928 BLAKE2B da8d83cd6621947816630ae487efe7d087266c1352949cedbbd441ba7c7f7c7beb13b9470e66e2f3359c37a050d0e44d22481c418532d3ebb339a456ab092648 SHA512 2c93bafdd248563765a285add48ca77c1e4bad4d5431675ae6a5cdee4cfe7a41e6bcc880a489ca1069a307fd9a005f2d5f8e230dfc95b4a69152b4f9ca49ac44
-DIST rustc-1.71.0-src.tar.xz.asc 801 BLAKE2B e5ddc4b18a6caeeb63c5aed5b5d15989d086f408787d2e603e50e7b8548dc078683062627280fd2a0393bec01c314eb1cc59f9b0e3146abf07b8365a0b44c640 SHA512 cb1b208c8b2bfccf02c73c4246fb238edb0dd10e292c1ef781920964e54e40add3089d988769982c0ce06b719014685b1c37daa2d08b513d86ad73808f4ce3ac
 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.73.0-src.tar.xz 154319536 BLAKE2B 077bdedb36fdbc30db3c6331ac6014615eb79393ad42e38488d037ba38eaa6542467d39b2a14228d0bf6717110f915bf6fdcf0074c6293f413720cc748316eff SHA512 75c59680a82cb9d076b9434744a1c65908524ef769293952f5d9c5779d9a9c6fa4d9aa0c7e7d6b7566a21a50a27cd6ae452b5283a4d4606b2fa1acc24dfd8e0c
-DIST rustc-1.73.0-src.tar.xz.asc 801 BLAKE2B fac2f8652e9a103e8a678b30222e1a505671253827d1d092c4964230a535a85e21cedf00b70f108ac5cb2db961b50e482223e8eaa5b0d585777dd43d80c5931e SHA512 e80ef6280c50522a575f040610184fcf5f45444db2534c6a334e66a69f3338b43d8b34cf035685f28d0e8f006427bbe413611c49fe028c9f72810d74ccfab15e
 DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
 DIST rustc-1.74.1-src.tar.xz.asc 801 BLAKE2B ddf73175b164233babf31ca3a381b03e20c0f36d017c1d5f85d6ab11f0986d861ab23b11c061e6b2444ced70c3d6a494cc3de4ec86f0deb221a805491bd75420 SHA512 9a96ff9ba9a4e2af4e267b2ec126fc0675c78d0eb767703daa2f28491c3d85c2ab00fbd8584390bf658812ec6c4ab6c57e43b386db59fd505bd3134a8873a09e
 DIST rustc-1.75.0-src.tar.xz 159624388 BLAKE2B 8937b80585eddaa3e1f1ef948899d14a170308518c6fef9fe569560cdd870053776956743f796055f2119399b9ca6c0df12fedd789ae46324d071e5126c4e495 SHA512 7b0f25d91b1b5c317980fc88e059200bd43b56a70b445fbc72fb9b96e09775bfd3a98e9bd9d662af80f0ce3aef527c777ee82777e96ca876f47a972d63da8606
 DIST rustc-1.75.0-src.tar.xz.asc 801 BLAKE2B 434da96b1dc93a5aeed07f4961b087fdd15870e407283ecc00df08dbc1e9f6c65fe459b3a25d39ee55900d53ee583207098ecf3d63f5d6ea114ef0b8398b6a63 SHA512 a0e948553af77ca6e2daa82c69d79079ef7d4ec61957bdff99efd73748200d6c7caa9282daeb3fe3ef849d81a48e66a25336df4c7b6f62f975266aa8b9b93d3a
-DIST rustc-1.76.0-src.tar.xz 162267908 BLAKE2B 0cf726841a837d9906d82a6216e65edad1e3e4a798ccd1ca3824c2098d0c45473854b8bf183c6e9ca70ba095752e77c4f5ef575d98c07243d609857214175f5e SHA512 92e16cfdeb91bde341fe6c2774d92868275b07aa1d46d870ddc9291eadfe4ea9af93e06586fa7d6b8d60534903945cbbe706d354c90272712989c58d2bf174bf
-DIST rustc-1.76.0-src.tar.xz.asc 801 BLAKE2B eadb2f54fceb9c1ac60af72407a2957e37e1ba134a696675a1e9dcf23a2958b41d7f5aa1f75156e4843cefc387cdc9c909e364c3bfcabecc6bfbe262d9c6e8af SHA512 d35c010a5a129580746bcec5c0dad1b0bc1b7864a69505c7c0ccfad436fdfbdf33f87518965a09de187d6a70fb8867dc6a20037c648861031a17501577855120
 DIST rustc-1.77.1-src.tar.xz 162796048 BLAKE2B 18a9fd095808ba78bf50ec94f7fd4087a1033ec79750aa593bacf64219c77ef90c030d41a7d8bc43f7ec8eb30b316c225024be4aeb517100ff6723487f8bb282 SHA512 e057ae638e4c3e54fdb367d48f4b85458121cee0d0ee1ed72f346940b8acad2f16cd9cc8abc16fcf4a17bf244b3300bb56a7e7be3bd0c23b034692c983b84fe8
 DIST rustc-1.77.1-src.tar.xz.asc 801 BLAKE2B 175a551abdb970295d37a0797cf262ac43055a3cb75b23845dbb8696d04b7705b7a2908b82fcbce7cd7dec2e05c382d06622013b9d4aa19fab7f651f7e00bb73 SHA512 eb24976ae97d2980d4c547bcf27d815f4b98b8aa45441a7201a849ee37e0ef15671732c9916d33964b8e802a87ede758daaadf84901bd569527c8b6c48efff23
-DIST rustc-1.78.0-src.tar.xz 159181212 BLAKE2B dedae58e413689de258f852c988a9a91d4cf14c9525f2619ca6155006ddc9b2262c8141ff995e4fc6ecceec383470e50d2fa0952d933db9b3957ce5c5b96f62e SHA512 d2fb9881e28849d871fda71b1b51652be3839b3283f0d32163f258c5c707a9fb7b589da8dc03bca2fefee1abdd2b44a5f17e85d8c6df7bea119d1e8d22371941
-DIST rustc-1.78.0-src.tar.xz.asc 801 BLAKE2B a40b0eab4e9263694e79f21d92652402579f4a0587fa48b4043211bc645d4303f9af7629e9c8361938748163e99fa7cd04108156780f23f9c8600361785e834b SHA512 ef16c9eed79f36576517e9dd77b56aa767ae9dc745f5df1839e24b76084ac791b27926f3d608b41695ae6022aa10cbdd3650cad163f35037c60d3bd0427b3cbd
 DIST rustc-1.79.0-src.tar.xz 162359512 BLAKE2B 753c0e9c537644d1a12b4d38024c22952a19513791c3da6f955690c544e58964bacbdb579f94cd05910697fc31f77ed6553e5ad3b111bbdfebeea8d2a4fa19f5 SHA512 99d7f276292e5c270648473ff73e9888413a3325ef3a4d7a45f8ce77a42ac87996905f1d875888ce084b621f642017bc9e31a00da1439108dbe19b85d0eab085
 DIST rustc-1.79.0-src.tar.xz.asc 801 BLAKE2B 860283021f513f5d4c81ea1f8d9567f0a052cc53a1d51d7fd9a804a39b855e24e06ea4c73db53176c1cf846910147de6bbc26da35755f3d0d4b296503e691e64 SHA512 51eec85d71817fe21073502c1d18e44ce694dc11b1c181e82462b529a24a610c8e215e6f2640e8b6d80f028207a360e43354cafa863f49a12c547b4c5f52d7e7
 DIST rustc-1.80.1-src.tar.xz 199234944 BLAKE2B 39891362f2a4bc249f5d943e3ded48d2add9cd9c0ee3c085d7fbefbfbc784f1e029308d9486cd35a6c03b77243077dc1196c75980faeea0d4319cee057509b6a SHA512 3c746108a86eeb734c1a8c8f63ba1a45e2cb03a8cb553395a167d07dc3ce5d8d9ea365ddd95533b6952d915069b86cad7ad218d27861e0889f8e878136bd32ab
diff --git a/dev-lang/rust/rust-1.71.0.ebuild b/dev-lang/rust/rust-1.71.0.ebuild
deleted file mode 100644
index 15142ee80ec7..000000000000
--- a/dev-lang/rust/rust-1.71.0.ebuild
+++ /dev/null
@@ -1,748 +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 bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
-	multilib multilib-build python-any-r1 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"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Language empowering everyone to build reliable and efficient software"
-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 )
-	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
-"
-
-# keep in sync with llvm ebuild of the same version as bundled one.
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai LoongArch Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ VE WebAssembly X86 XCore )
-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 UoI-NCSA"
-
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# List all the working slots in LLVM_VALID_SLOTS, newest first.
-LLVM_VALID_SLOTS=( 16 )
-LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
-
-# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
-# (-) usedep needed because we may build with older llvm without that target
-LLVM_DEPEND="|| ( "
-for _s in ${LLVM_VALID_SLOTS[@]}; do
-	LLVM_DEPEND+=" ( "
-	for _x in ${ALL_LLVM_TARGETS[@]}; do
-		LLVM_DEPEND+="
-			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )
-			wasm? ( sys-devel/lld:${_s} )"
-	done
-	LLVM_DEPEND+=" )"
-done
-unset _s _x
-LLVM_DEPEND+=" )
-	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
-"
-
-# to bootstrap we need at least exactly previous version, or same.
-# most of the time previous versions fail to bootstrap with newer
-# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
-# but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
-RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
-RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
-BOOTSTRAP_DEPEND="||
-	(
-		=dev-lang/rust-"${RUST_DEP_PREV}"
-		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
-		=dev-lang/rust-"${RUST_DEP_CURR}"
-		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
-	)
-"
-
-BDEPEND="${PYTHON_DEPS}
-	app-eselect/eselect-rust
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
-	!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? ( sys-libs/llvm-libunwind:= )
-	)
-	!system-llvm? (
-		!llvm-libunwind? (
-			elibc_musl? ( sys-libs/libunwind:= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	app-eselect/eselect-rust
-	sys-apps/lsb-release
-"
-
-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.71.0-fix-bashcomp-installation.patch
-	"${FILESDIR}"/1.71.0-lint-docs-libpath.patch
-	"${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch
-	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
-	"${FILESDIR}"/1.67.0-doc-wasm.patch
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "${1}" true false
-}
-
-bootstrap_rust_version_check() {
-	# never call from pkg_pretend. eselect-rust may be not installed yet.
-	[[ ${MERGE_TYPE} == binary ]] && return
-	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
-	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
-	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
-	rustc_version=${rustc_version[0]#rust-bin-}
-	rustc_version=${rustc_version#rust-}
-
-	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
-	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
-		eerror "Rust >=${rustc_wanted} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too old"
-	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
-		eerror "Rust <${rustc_toonew} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too new"
-	else
-		einfo "Using rust ${rustc_version} to build"
-	fi
-}
-
-pre_build_checks() {
-	local M=8192
-	# 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 system-bootstrap 0 1024) + ${M} ))
-	M=$(( $(usex doc 256 0) + ${M} ))
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-llvm_check_deps() {
-	has_version -r "sys-devel/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
-
-	use system-bootstrap && bootstrap_rust_version_check
-
-	if use system-llvm; then
-		llvm_pkg_setup
-
-		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		export LLVM_LINK_SHARED=1
-		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
-	fi
-}
-
-esetup_unwind_hack() {
-	# https://bugs.gentoo.org/870280
-	# this is a hack needed to bootstrap with libgcc_s linked tarball on llvm-libunwind system.
-	# it should trigger for internal bootstrap or system-bootstrap with rust-bin.
-	# the whole idea is for stage0 to bootstrap with fake libgcc_s.
-	# final stage will receive -L${T}/lib but not -lgcc_s args, producing clean compiler.
-	local fakelib="${T}/fakelib"
-	mkdir -p "${fakelib}" || die
-	# we need both symlinks, one for cargo runtime, other for linker.
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so.1" || die
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so" || die
-	export LD_LIBRARY_PATH="${fakelib}"
-	export RUSTFLAGS+=" -L${fakelib}"
-	# this is a literally magic variable that gets through cargo cache, without it some
-	# crates ignore RUSTFLAGS.
-	# this variable can not contain leading space.
-	export MAGIC_EXTRA_RUSTFLAGS+="${MAGIC_EXTRA_RUSTFLAGS:+ }-L${fakelib}"
-}
-
-src_prepare() {
-	if ! use system-bootstrap; then
-		has_version sys-devel/gcc || esetup_unwind_hack
-		local rust_stage0_root="${WORKDIR}"/rust-stage0
-		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
-		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
-			--without=rust-docs-json-preview,rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
-	fi
-
-	default
-}
-
-src_configure() {
-	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/wasm_base.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 profiler && tools+=',"rust-demangler"'
-	use rustfmt && tools+=',"rustfmt"'
-	use rust-analyzer && tools+=',"rust-analyzer"'
-	use rust-src && tools+=',"src"'
-
-	local rust_stage0_root
-	if use system-bootstrap; then
-		local printsysroot
-		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
-		rust_stage0_root="${printsysroot}"
-	else
-		rust_stage0_root="${WORKDIR}"/rust-stage0
-	fi
-	# 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)"
-
-	local cm_btype="$(usex debug DEBUG RELEASE)"
-	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 = $(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"
-		CMAKE_C_FLAGS_${cm_btype} = "${CFLAGS}"
-		CMAKE_CXX_FLAGS_${cm_btype} = "${CXXFLAGS}"
-		CMAKE_EXE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
-		CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
-		CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
-		CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = "${ARFLAGS}"
-		[build]
-		build-stage = 2
-		test-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 = $(toml_usex profiler)
-		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 = $(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
-		lto = "$(usex lto fat 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 "${LLVM_MAX_SLOT}")/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
-			_EOF_
-		fi
-	done
-	if use wasm; then
-		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 "${LLVM_MAX_SLOT}")/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
-
-	# 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
-	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
-
-	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 profiler && symlinks+=( rust-demangler )
-	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}"
-	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"
-		MANPATH="${EPREFIX}/usr/lib/rust/man"
-	_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/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-		/usr/lib/rustlib
-		/usr/lib/rust/lib
-		/usr/lib/rust/libexec
-		/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 profiler; then
-		echo /usr/bin/rust-demangler >> "${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}"
-
-	if use dist; then
-		insinto "/usr/lib/${PN}/${PV}/dist"
-		doins -r "${S}/build/dist/."
-	fi
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	if has_version dev-debug/gdb || has_version dev-debug/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.73.0.ebuild b/dev-lang/rust/rust-1.73.0.ebuild
deleted file mode 100644
index 1e990608a39c..000000000000
--- a/dev-lang/rust/rust-1.73.0.ebuild
+++ /dev/null
@@ -1,759 +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 bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
-	multilib multilib-build python-any-r1 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"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Language empowering everyone to build reliable and efficient software"
-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 )
-	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
-"
-
-# 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"
-
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind +lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# List all the working slots in LLVM_VALID_SLOTS, newest first.
-LLVM_VALID_SLOTS=( 17 )
-LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
-
-# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
-# (-) usedep needed because we may build with older llvm without that target
-LLVM_DEPEND="|| ( "
-for _s in ${LLVM_VALID_SLOTS[@]}; do
-	LLVM_DEPEND+=" ( "
-	for _x in ${ALL_LLVM_TARGETS[@]}; do
-		LLVM_DEPEND+="
-			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )
-			wasm? ( sys-devel/lld:${_s} )"
-	done
-	LLVM_DEPEND+=" )"
-done
-unset _s _x
-LLVM_DEPEND+=" )
-	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
-"
-
-# to bootstrap we need at least exactly previous version, or same.
-# most of the time previous versions fail to bootstrap with newer
-# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
-# but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
-RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
-RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
-BOOTSTRAP_DEPEND="||
-	(
-		=dev-lang/rust-"${RUST_DEP_PREV}"
-		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
-		=dev-lang/rust-"${RUST_DEP_CURR}"
-		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
-	)
-"
-
-BDEPEND="${PYTHON_DEPS}
-	app-eselect/eselect-rust
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
-	!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? ( sys-libs/llvm-libunwind:= )
-	)
-	!system-llvm? (
-		!llvm-libunwind? (
-			elibc_musl? ( sys-libs/libunwind:= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	app-eselect/eselect-rust
-	sys-apps/lsb-release
-"
-
-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.72.0-bump-libc-deps-to-0.2.146.patch
-	"${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch
-	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
-	"${FILESDIR}"/1.67.0-doc-wasm.patch
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-clear_vendor_checksums() {
-	sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die
-}
-
-toml_usex() {
-	usex "${1}" true false
-}
-
-bootstrap_rust_version_check() {
-	# never call from pkg_pretend. eselect-rust may be not installed yet.
-	[[ ${MERGE_TYPE} == binary ]] && return
-	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
-	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
-	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
-	rustc_version=${rustc_version[0]#rust-bin-}
-	rustc_version=${rustc_version#rust-}
-
-	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
-	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
-		eerror "Rust >=${rustc_wanted} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too old"
-	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
-		eerror "Rust <${rustc_toonew} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too new"
-	else
-		einfo "Using rust ${rustc_version} to build"
-	fi
-}
-
-pre_build_checks() {
-	local M=8192
-	# 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 system-bootstrap 0 1024) + ${M} ))
-	M=$(( $(usex doc 256 0) + ${M} ))
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-llvm_check_deps() {
-	has_version -r "sys-devel/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
-
-	use system-bootstrap && bootstrap_rust_version_check
-
-	if use system-llvm; then
-		llvm_pkg_setup
-
-		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		export LLVM_LINK_SHARED=1
-		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
-	fi
-}
-
-esetup_unwind_hack() {
-	# https://bugs.gentoo.org/870280
-	# this is a hack needed to bootstrap with libgcc_s linked tarball on llvm-libunwind system.
-	# it should trigger for internal bootstrap or system-bootstrap with rust-bin.
-	# the whole idea is for stage0 to bootstrap with fake libgcc_s.
-	# final stage will receive -L${T}/lib but not -lgcc_s args, producing clean compiler.
-	local fakelib="${T}/fakelib"
-	mkdir -p "${fakelib}" || die
-	# we need both symlinks, one for cargo runtime, other for linker.
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so.1" || die
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so" || die
-	export LD_LIBRARY_PATH="${fakelib}"
-	export RUSTFLAGS+=" -L${fakelib}"
-	# this is a literally magic variable that gets through cargo cache, without it some
-	# crates ignore RUSTFLAGS.
-	# this variable can not contain leading space.
-	export MAGIC_EXTRA_RUSTFLAGS+="${MAGIC_EXTRA_RUSTFLAGS:+ }-L${fakelib}"
-}
-
-src_prepare() {
-	# Clear vendor checksums for crates that we patched to bump libc.
-	for i in addr2line-0.20.0 bstr cranelift-jit crossbeam-channel elasticlunr-rs handlebars icu_locid libffi \
-		terminal_size tracing-tree; do
-		clear_vendor_checksums "${i}"
-	done
-
-	if ! use system-bootstrap; then
-		has_version sys-devel/gcc || esetup_unwind_hack
-		local rust_stage0_root="${WORKDIR}"/rust-stage0
-		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
-		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
-			--without=rust-docs-json-preview,rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
-	fi
-
-	default
-}
-
-src_configure() {
-	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/wasm_base.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 profiler && tools+=',"rust-demangler"'
-	use rustfmt && tools+=',"rustfmt"'
-	use rust-analyzer && tools+=',"rust-analyzer"'
-	use rust-src && tools+=',"src"'
-
-	local rust_stage0_root
-	if use system-bootstrap; then
-		local printsysroot
-		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
-		rust_stage0_root="${printsysroot}"
-	else
-		rust_stage0_root="${WORKDIR}"/rust-stage0
-	fi
-	# 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)"
-
-	local cm_btype="$(usex debug DEBUG RELEASE)"
-	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 = $(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"
-		CMAKE_C_FLAGS_${cm_btype} = "${CFLAGS}"
-		CMAKE_CXX_FLAGS_${cm_btype} = "${CXXFLAGS}"
-		CMAKE_EXE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
-		CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
-		CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
-		CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = "${ARFLAGS}"
-		[build]
-		build-stage = 2
-		test-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 = $(toml_usex profiler)
-		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 = $(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
-		lto = "$(usex lto fat 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 "${LLVM_MAX_SLOT}")/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
-			_EOF_
-		fi
-	done
-	if use wasm; then
-		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 "${LLVM_MAX_SLOT}")/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
-
-	# 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
-	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
-
-	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 profiler && symlinks+=( rust-demangler )
-	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}"
-	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"
-		MANPATH="${EPREFIX}/usr/lib/rust/man"
-	_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/libexec
-		/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 profiler; then
-		echo /usr/bin/rust-demangler >> "${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}"
-
-	if use dist; then
-		insinto "/usr/lib/${PN}/${PV}/dist"
-		doins -r "${S}/build/dist/."
-	fi
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	if has_version dev-debug/gdb || has_version dev-debug/lldb; then
-		elog "Rust installs a helper script for calling GDB and LLDB,"
-		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-	fi
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.74.1.ebuild b/dev-lang/rust/rust-1.74.1.ebuild
index a01e857d2535..21458614c151 100644
--- a/dev-lang/rust/rust-1.74.1.ebuild
+++ b/dev-lang/rust/rust-1.74.1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	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 ppc ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-lang/rust/rust-1.75.0-r1.ebuild b/dev-lang/rust/rust-1.75.0-r1.ebuild
index 0edae23c64ed..a3663c0fb051 100644
--- a/dev-lang/rust/rust-1.75.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	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 ppc ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-lang/rust/rust-1.76.0-r1.ebuild b/dev-lang/rust/rust-1.76.0-r1.ebuild
deleted file mode 100644
index a325d44301e2..000000000000
--- a/dev-lang/rust/rust-1.76.0-r1.ebuild
+++ /dev/null
@@ -1,787 +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 bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
-	multilib multilib-build python-any-r1 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"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Language empowering everyone to build reliable and efficient software"
-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 )
-	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
-"
-
-# 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"
-
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# List all the working slots in LLVM_VALID_SLOTS, newest first.
-LLVM_VALID_SLOTS=( 17 )
-LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
-
-# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
-# (-) usedep needed because we may build with older llvm without that target
-LLVM_DEPEND="|| ( "
-for _s in ${LLVM_VALID_SLOTS[@]}; do
-	LLVM_DEPEND+=" ( "
-	for _x in ${ALL_LLVM_TARGETS[@]}; do
-		LLVM_DEPEND+="
-			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )
-			wasm? ( sys-devel/lld:${_s} )"
-	done
-	LLVM_DEPEND+=" )"
-done
-unset _s _x
-LLVM_DEPEND+=" )
-	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
-"
-
-# to bootstrap we need at least exactly previous version, or same.
-# most of the time previous versions fail to bootstrap with newer
-# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
-# but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
-RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
-RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
-BOOTSTRAP_DEPEND="||
-	(
-		=dev-lang/rust-"${RUST_DEP_PREV}"
-		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
-		=dev-lang/rust-"${RUST_DEP_CURR}"
-		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
-	)
-"
-
-BDEPEND="${PYTHON_DEPS}
-	app-eselect/eselect-rust
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
-	!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? ( sys-libs/llvm-libunwind:= )
-	)
-	!system-llvm? (
-		!llvm-libunwind? (
-			elibc_musl? ( sys-libs/libunwind:= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	app-eselect/eselect-rust
-	sys-apps/lsb-release
-"
-
-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.75.0-musl-dynamic-linking.patch
-	"${FILESDIR}"/1.74.1-cross-compile-libz.patch
-	#"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch  # pending refresh
-	"${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch
-	"${FILESDIR}"/1.67.0-doc-wasm.patch
-	"${FILESDIR}"/1.75.0-handle-vendored-sources.patch  # remove for >=1.77.0
-	"${FILESDIR}"/1.76.0-loong-code-model.patch  # remove for >=1.78.0
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-clear_vendor_checksums() {
-	sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die
-}
-
-toml_usex() {
-	usex "${1}" true false
-}
-
-bootstrap_rust_version_check() {
-	# never call from pkg_pretend. eselect-rust may be not installed yet.
-	[[ ${MERGE_TYPE} == binary ]] && return
-	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
-	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
-	local rustc_version=( $(eselect --brief --root="${BROOT}" rust show 2>/dev/null) )
-	rustc_version=${rustc_version[0]#rust-bin-}
-	rustc_version=${rustc_version#rust-}
-
-	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
-	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
-		eerror "Rust >=${rustc_wanted} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too old"
-	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
-		eerror "Rust <${rustc_toonew} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too new"
-	else
-		einfo "Using rust ${rustc_version} to build"
-	fi
-}
-
-pre_build_checks() {
-	local M=8192
-	# 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 system-bootstrap 0 1024) + ${M} ))
-	M=$(( $(usex doc 256 0) + ${M} ))
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-llvm_check_deps() {
-	has_version -r "sys-devel/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
-		export PKG_CONFIG_ALLOW_CROSS=1
-		export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
-		export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
-		export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
-		use system-bootstrap || die "USE=system-bootstrap is required when cross-compiling"
-		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
-
-	use system-bootstrap && bootstrap_rust_version_check
-
-	if use system-llvm; then
-		llvm_pkg_setup
-
-		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		export LLVM_LINK_SHARED=1
-		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
-	fi
-}
-
-esetup_unwind_hack() {
-	# https://bugs.gentoo.org/870280
-	# this is a hack needed to bootstrap with libgcc_s linked tarball on llvm-libunwind system.
-	# it should trigger for internal bootstrap or system-bootstrap with rust-bin.
-	# the whole idea is for stage0 to bootstrap with fake libgcc_s.
-	# final stage will receive -L${T}/lib but not -lgcc_s args, producing clean compiler.
-	local fakelib="${T}/fakelib"
-	mkdir -p "${fakelib}" || die
-	# we need both symlinks, one for cargo runtime, other for linker.
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so.1" || die
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so" || die
-	export LD_LIBRARY_PATH="${fakelib}"
-	export RUSTFLAGS+=" -L${fakelib}"
-	# this is a literally magic variable that gets through cargo cache, without it some
-	# crates ignore RUSTFLAGS.
-	# this variable can not contain leading space.
-	export MAGIC_EXTRA_RUSTFLAGS+="${MAGIC_EXTRA_RUSTFLAGS:+ }-L${fakelib}"
-}
-
-src_prepare() {
-	# Clear vendor checksums for crates that we patched to bump libc.
-	# NOTE: refresh this on each bump.
-	#for i in addr2line-0.20.0 bstr cranelift-jit crossbeam-channel elasticlunr-rs handlebars icu_locid libffi \
-	#	terminal_size tracing-tree; do
-	#	clear_vendor_checksums "${i}"
-	#done
-
-	if ! use system-bootstrap; then
-		has_version sys-devel/gcc || esetup_unwind_hack
-		local rust_stage0_root="${WORKDIR}"/rust-stage0
-		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi "${CBUILD}")"
-
-		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
-			--without=rust-docs-json-preview,rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
-	fi
-
-	default
-}
-
-src_configure() {
-	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 profiler && tools+=',"rust-demangler"'
-	use rustfmt && tools+=',"rustfmt"'
-	use rust-analyzer && tools+=',"rust-analyzer"'
-	use rust-src && tools+=',"src"'
-
-	local rust_stage0_root
-	if use system-bootstrap; then
-		local printsysroot
-		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
-		rust_stage0_root="${printsysroot}"
-	else
-		rust_stage0_root="${WORKDIR}"/rust-stage0
-	fi
-	# 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
-		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 = $(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 = $(toml_usex profiler)
-		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 "${LLVM_MAX_SLOT}")/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
-			_EOF_
-		fi
-	done
-	if use wasm; then
-		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 "${LLVM_MAX_SLOT}")/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
-
-	# 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
-	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
-
-	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 profiler && symlinks+=( rust-demangler )
-	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}"
-	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"
-		MANPATH="${EPREFIX}/usr/lib/rust/man"
-	_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/libexec
-		/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 profiler; then
-		echo /usr/bin/rust-demangler >> "${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}"
-
-	if use dist; then
-		insinto "/usr/lib/${PN}/${PV}/dist"
-		doins -r "${S}/build/dist/."
-	fi
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	if has_version dev-debug/gdb || has_version dev-debug/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.77.1.ebuild b/dev-lang/rust/rust-1.77.1.ebuild
index 7a7bd02afe98..b69b63f5e0ef 100644
--- a/dev-lang/rust/rust-1.77.1.ebuild
+++ b/dev-lang/rust/rust-1.77.1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	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 ppc ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-lang/rust/rust-1.78.0.ebuild b/dev-lang/rust/rust-1.78.0.ebuild
deleted file mode 100644
index d5761df73c02..000000000000
--- a/dev-lang/rust/rust-1.78.0.ebuild
+++ /dev/null
@@ -1,788 +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 bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
-	multilib multilib-build python-any-r1 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"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-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 )
-	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
-"
-
-# 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"
-
-IUSE="big-endian clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind lto miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# List all the working slots in LLVM_VALID_SLOTS, newest first.
-LLVM_VALID_SLOTS=( 18 )
-LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
-
-# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
-# (-) usedep needed because we may build with older llvm without that target
-LLVM_DEPEND="|| ( "
-for _s in ${LLVM_VALID_SLOTS[@]}; do
-	LLVM_DEPEND+=" ( "
-	for _x in ${ALL_LLVM_TARGETS[@]}; do
-		LLVM_DEPEND+="
-			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )
-			wasm? ( sys-devel/lld:${_s} )"
-	done
-	LLVM_DEPEND+=" )"
-done
-unset _s _x
-LLVM_DEPEND+=" )
-	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
-"
-
-# to bootstrap we need at least exactly previous version, or same.
-# most of the time previous versions fail to bootstrap with newer
-# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
-# but it fails to bootstrap with 1.48.x
-# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
-RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
-RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
-BOOTSTRAP_DEPEND="||
-	(
-		=dev-lang/rust-"${RUST_DEP_PREV}"
-		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
-		=dev-lang/rust-"${RUST_DEP_CURR}"
-		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
-	)
-"
-
-BDEPEND="${PYTHON_DEPS}
-	app-eselect/eselect-rust
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
-	!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? ( sys-libs/llvm-libunwind:= )
-	)
-	!system-llvm? (
-		!llvm-libunwind? (
-			elibc_musl? ( sys-libs/libunwind:= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}
-	app-eselect/eselect-rust
-	sys-apps/lsb-release
-"
-
-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"
-
-S="${WORKDIR}/${MY_P}-src"
-
-# 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.74.1-cross-compile-libz.patch
-	#"${FILESDIR}"/1.72.0-bump-libc-deps-to-0.2.146.patch  # pending refresh
-	"${FILESDIR}"/1.78.0-ignore-broken-and-non-applicable-tests.patch
-	"${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
-}
-
-bootstrap_rust_version_check() {
-	# never call from pkg_pretend. eselect-rust may be not installed yet.
-	[[ ${MERGE_TYPE} == binary ]] && return
-	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
-	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
-	local rustc_version=( $(eselect --brief --root="${BROOT}" rust show 2>/dev/null) )
-	rustc_version=${rustc_version[0]#rust-bin-}
-	rustc_version=${rustc_version#rust-}
-
-	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
-	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
-		eerror "Rust >=${rustc_wanted} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too old"
-	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
-		eerror "Rust <${rustc_toonew} is required"
-		eerror "please run 'eselect rust' and set correct rust version"
-		die "selected rust version is too new"
-	else
-		einfo "Using rust ${rustc_version} to build"
-	fi
-}
-
-pre_build_checks() {
-	local M=8192
-	# 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 system-bootstrap 0 1024) + ${M} ))
-	M=$(( $(usex doc 256 0) + ${M} ))
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-llvm_check_deps() {
-	has_version -r "sys-devel/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
-		export PKG_CONFIG_ALLOW_CROSS=1
-		export PKG_CONFIG_PATH="${ROOT}/usr/$(get_libdir)/pkgconfig"
-		export OPENSSL_INCLUDE_DIR="${ROOT}/usr/include"
-		export OPENSSL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-
-		use system-bootstrap || die "USE=system-bootstrap is required when cross-compiling"
-		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
-
-	use system-bootstrap && bootstrap_rust_version_check
-
-	if use system-llvm; then
-		llvm_pkg_setup
-
-		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		export LLVM_LINK_SHARED=1
-		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
-	fi
-}
-
-esetup_unwind_hack() {
-	# https://bugs.gentoo.org/870280
-	# this is a hack needed to bootstrap with libgcc_s linked tarball on llvm-libunwind system.
-	# it should trigger for internal bootstrap or system-bootstrap with rust-bin.
-	# the whole idea is for stage0 to bootstrap with fake libgcc_s.
-	# final stage will receive -L${T}/lib but not -lgcc_s args, producing clean compiler.
-	local fakelib="${T}/fakelib"
-	mkdir -p "${fakelib}" || die
-	# we need both symlinks, one for cargo runtime, other for linker.
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so.1" || die
-	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so" || die
-	export LD_LIBRARY_PATH="${fakelib}"
-	export RUSTFLAGS+=" -L${fakelib}"
-	# this is a literally magic variable that gets through cargo cache, without it some
-	# crates ignore RUSTFLAGS.
-	# this variable can not contain leading space.
-	export MAGIC_EXTRA_RUSTFLAGS+="${MAGIC_EXTRA_RUSTFLAGS:+ }-L${fakelib}"
-}
-
-src_prepare() {
-	# Clear vendor checksums for crates that we patched to bump libc.
-	# NOTE: refresh this on each bump.
-	#for i in addr2line-0.20.0 bstr cranelift-jit crossbeam-channel elasticlunr-rs handlebars icu_locid libffi \
-	#	terminal_size tracing-tree; do
-	#	clear_vendor_checksums "${i}"
-	#done
-
-	if ! use system-bootstrap; then
-		has_version sys-devel/gcc || esetup_unwind_hack
-		local rust_stage0_root="${WORKDIR}"/rust-stage0
-		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi "${CBUILD}")"
-
-		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
-			--without=rust-docs-json-preview,rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
-	fi
-
-	default
-}
-
-src_configure() {
-	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 profiler && tools+=',"rust-demangler"'
-	use rustfmt && tools+=',"rustfmt"'
-	use rust-analyzer && tools+=',"rust-analyzer","rust-analyzer-proc-macro-srv"'
-	use rust-src && tools+=',"src"'
-
-	local rust_stage0_root
-	if use system-bootstrap; then
-		local printsysroot
-		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
-		rust_stage0_root="${printsysroot}"
-	else
-		rust_stage0_root="${WORKDIR}"/rust-stage0
-	fi
-	# 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
-		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 = $(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 = $(toml_usex profiler)
-		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 "${LLVM_MAX_SLOT}")/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
-			_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 "${LLVM_MAX_SLOT}")/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
-
-	# 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
-	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
-
-	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 profiler && symlinks+=( rust-demangler )
-	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}"
-	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"
-		MANPATH="${EPREFIX}/usr/lib/rust/man"
-	_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/libexec
-		/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 profiler; then
-		echo /usr/bin/rust-demangler >> "${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}"
-
-	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_postinst() {
-	eselect rust update
-
-	if has_version dev-debug/gdb || has_version dev-debug/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/scala/Manifest b/dev-lang/scala/Manifest
deleted file mode 100644
index 3c7a3439e3cc..000000000000
--- a/dev-lang/scala/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-DIST scala-2.12.10-gentoo-binary.tar.xz 79479656 BLAKE2B 2d75552ba960a1f1cda5f678f1ba6ca01d5a41b813c098ceacdea93f8a3ea3f7c45d18a94f7be891f22d01fc9fc9a14b0c077723056e859ade327f973c545572 SHA512 f9eee5667bd31e1d90da2a95ffde9f894bef557dcebd6db9e882baed9b9ba6a9d290cdb34688307467578fdc8e20993911d64bd5d442e0a7198e4889edb80a2b
-DIST scala-2.12.10-ivy2-deps.tar.xz 76800392 BLAKE2B 4290f8f3a2f0122620e5c459e23fece319168c1c7807c93ec731b99d89ec2ffb19591c3e01d2827e984f46214895dac7c68456f92241afb165a0cb6088ac33d6 SHA512 71870332e8488de99d0e8dc11c8afe009152b83feef1912c91c7ca6201de67c96b9760ee039ce0449d5893da0c2086e5c9f7819ad8008e899ab49508a1de1e99
-DIST scala-2.12.10-sbt-deps.tar.xz 34944260 BLAKE2B a42a320340f180c60ae2f5e908eb5fabd3cd4d4e9218c724ec74a79f288b4145445de7ccf91cc2dea3ab1bb128beffbbaeedfb1ed4e44f9c0ad66b16fba4741b SHA512 08bb9eea27ac3603bf4772d29235bf076bf7bb5433fc13d2faf85d7362b4a80176651457851c4eefb41a0169ce1204e634f44e22e5d6ac83777c11c90d9a8aae
-DIST scala-2.12.10.tar.gz 6725873 BLAKE2B 5534baed3c51d8234b67cec79d8f6859bde403e79e557a0d50019d834c9f448398b507ad90aca522437f870a2f4cbdf56a2b7c5bee67a95c1e96b237bebcefc6 SHA512 30079ee83e89c189e84e94068f261aafe1fd7fe0cb4177e2802ac85372c4c2272c5af2b57424ab90e5236cbaca2f30936635f8f3bb4bfb2c748483e9c52ae96e
-DIST scala-2.12.4-annotations.jar 2242 BLAKE2B 0c731c25eaa407bdfb51d749f688062a33bd7f2815e8303ba5c56532027350f58d5ab364f2428547c2a99e2032ba0d0d20d4d50cc27dc5c42946e7842111547d SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd
-DIST scala-2.12.4-ant-contrib.jar 224277 BLAKE2B f43bfe3da05decbcf4ec9d2f48bface141907abfbe5b17532e970dbb660e0e1ffae9807c12da38cd6dc8e57c2605c6ec86ad11a99331e73edd3e4418656ab27e SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83
-DIST scala-2.12.4-ant-dotnet-1.0.jar 57795 BLAKE2B 1f04f20739a231816a6d9c81ac0ba23f155ebdb467f466640b18ba2b4f125a6171bcf420c42f71fcfa2c13293a5241e200d0d908bd460ca3ae0342b13747aaad SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867
-DIST scala-2.12.4-ant.jar 1506140 BLAKE2B 790d0f38316e0772b2f315220bbf70328e1e136bccb99bd2f2b2986b33aed60da5ca699c11eeaf653c64f4d07505e168442eea0711b6c627ee97b661d3933584 SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c
-DIST scala-2.12.4-code.jar 683 BLAKE2B b19a34aacc82dcc6bf4efb5556896521ce606cbd72a36ca5c2a019d3aec294172b13968e506373afdd1328668190f60ed337431def7744269cef024e5f82825a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767
-DIST scala-2.12.4-enums.jar 1372 BLAKE2B d3fc4941297344cd42c515ac6564092be7f80676aaf83029ebbcabbcce5ccfb71c008cc56a6fadadb0869d7f53e49a1f85c42e74c7b688acf43f677aa566dd82 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc
-DIST scala-2.12.4-genericNest.jar 1136 BLAKE2B 7ae0cbd5445d5d504738a00fce77ce411ac7371c48b742ea2ec1f686298eeb891e33cc74eb6ccffd15753a11ed0eb3aa0b3859ba7a18566e9021d64124a2d7b5 SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6
-DIST scala-2.12.4-gentoo-binary.tar.xz 78241224 BLAKE2B 5caefb6c057b18cffdeb39440cabe14499d9f760a36ee9f1bd671c20f1961d463e13d8f81f2eb237a299cc4bd6e7f06cacad41b667ff7ccc20d439886f804af9 SHA512 dcf0ffa9eddf5d76d38b4078fe82715b667a0905273a5fe433e752e34a099c4aec4d53bc542a3be341b849857945f698cca384f824a4dae6406243eca36c5e1c
-DIST scala-2.12.4-instrumented.jar 31725 BLAKE2B 5dc07140fbdd895512b41ebdacd56763f99ff0043f39652b0bce510fdc61c7c75fc5babb977c03b01cc7913339a4623fa698a513eb32a2c4b1314d033b74cb7e SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39
-DIST scala-2.12.4-ivy2-deps.tar.xz 66284364 BLAKE2B 83f3d0d6735afa801345c93d5b468d1c9fceba23526628a534fe3e9b1f301cbc561844fe1e30d0015bd3b705bcc15095649265e0927cf70d955980658a50eeba SHA512 c890a3f85734b35b398d5266f4507284e7474bac6018a34945d858ebebefa225a00238bd3a82e99ab83e344e98f6b14f6c2852a6b05eb5d7ef2094039d53a6d7
-DIST scala-2.12.4-jsoup-1.3.1.jar 133835 BLAKE2B 0e57e44ff0283f18e07e05feb22ee8d5d8edb575c85a6cb42dc2c866e0dd4752a2bd0a5318bf5fc3764c9c408b89d690bfb6f3b1b4754a50397f229543d30591 SHA512 365e43b6d8ba14ae32607241481f7c0e6393268f5c3faef860be7674150edece2c30376108e54f307df6a266a91100a1c7dbc2f28b4207b5227bc1bec6e1106d
-DIST scala-2.12.4-macro210.jar 2065 BLAKE2B d1194e28fe0d2740a370e343bed3e5084d69c2dedfbe0e0c135f16ce6a3c3467277084f003d567e93aaeb445e8f6140287c58a5ea01960d03aabad31f5f567bd SHA512 13c119afc4400f1531cad0cf38ab1652fce641090c11bff8f044a0d7f99df90412241ae78d5c623b7ecff1ce4720ae51fca4324f51bde0331e12f2e6e9898dd0
-DIST scala-2.12.4-maven-ant-tasks-2.1.1.jar 1314262 BLAKE2B 9dc8e5fbab52d8cf97287e9696181ea3a86e8915b152d8be56fc5e1f7a4c75c066f350a0dab7b957269cc6a8a9d6ed42ca37bfcc20ad61b2f32ac9e348009e99 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68
-DIST scala-2.12.4-methvsfield.jar 609 BLAKE2B 56a86d8409af806474a46d9f2c5afa8533e0689b4d238258be986ac308a6a060e6d66e3d594ad8d7658b539cdc0b96e442b79279c4e71f27924fcfcf1c94cd16 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71
-DIST scala-2.12.4-nest.jar 2920 BLAKE2B 3c48a2ea7501be03ede0fd9c1f907508491299cd68051e283fcce5576c1dde1032afa766e48529d4ce33e0f9ffe6f18d20e7341776e857f991969fe713a382ea SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38
-DIST scala-2.12.4-sbt-deps.tar.xz 34841672 BLAKE2B 0f1577bba65eb5863013014b16627c28934f13e84a6ed0a52748e2007417ae074bcb4b68650993d870f4ada872248d489f84ea02ee19521dd9ce8faae963e221 SHA512 74455451e77f0d935c8027e67b898e5eec9e984158292a37a4362072f4922eb53dfe9ddd5d52da8066fb8949c6469bff70405df8581633a49a37c8b900c6885e
-DIST scala-2.12.4-vizant.jar 15910 BLAKE2B 393ddd38ff2528b9c54fbb2b79111858a2dfeab66e4b10daf4e23d113963edb3002db8c9415fe47557736a63ecef4b198bd90b87a54240a9a43823fdab0f3082 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390
-DIST scala-2.12.4.tar.gz 5999529 BLAKE2B 5dfeadb9ac9562dd825f6a41f9cabdd353f669a58dc3aaec714d6155e9e598296c1e31dcc8956a24a97103e3449fb8f8c3a9ebe5e52dd405572d59ccae89c5e6 SHA512 cad6d54777a3ad4d26df5b4d5cecbbdb4a91ecb17cbf791fe259735221d33f9dd17a14e86f5e3520464078ad9ef68581e722e3c0d7494436bf356c79a9d31697
diff --git a/dev-lang/scala/files/scala-2.12.10-no-git.patch b/dev-lang/scala/files/scala-2.12.10-no-git.patch
deleted file mode 100644
index 017cb983b59b..000000000000
--- a/dev-lang/scala/files/scala-2.12.10-no-git.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- scala-2.12.10-orig/project/VersionUtil.scala	2019-09-05 01:01:59.000000000 +1000
-+++ scala-2.12.10/project/VersionUtil.scala	2019-09-12 11:00:05.525154568 +1000
-@@ -2,7 +2,7 @@
- 
- import sbt.{stringToProcess => _, _}
- import Keys._
--import java.util.{Date, Locale, Properties, TimeZone}
-+import java.util.{Calendar, Date, Locale, Properties, TimeZone}
- import java.io.{File, FileInputStream}
- import java.text.SimpleDateFormat
- 
-@@ -65,18 +65,13 @@
-     val log = sLog.value
-     val (dateObj, sha) = {
-       try {
--        // Use JGit to get the commit date and SHA
--        import org.eclipse.jgit.storage.file.FileRepositoryBuilder
--        import org.eclipse.jgit.revwalk.RevWalk
--        val db = new FileRepositoryBuilder().findGitDir.build
--        val head = db.resolve("HEAD")
--        if (head eq null) {
--          log.info("No git HEAD commit found -- Using current date and 'unknown' SHA")
--          (new Date, "unknown")
--        } else {
--          val commit = new RevWalk(db).parseCommit(head)
--          (new Date(commit.getCommitTime.toLong * 1000L), commit.getName.substring(0, 7))
--        }
-+        val commit = "61701c22900f14676fa181500722b64330eb2605"
-+        val cal = Calendar.getInstance();
-+        cal.set(Calendar.YEAR, 2019);
-+        cal.set(Calendar.MONTH, Calendar.SEPTEMBER);
-+        cal.set(Calendar.DAY_OF_MONTH, 5);
-+        val date = cal.getTime();
-+        (date, commit.substring(0, 7))
-       } catch {
-         case ex: Exception =>
-           log.error("Could not determine commit date + SHA: " + ex)
diff --git a/dev-lang/scala/files/scala-2.12.4-no-git.patch b/dev-lang/scala/files/scala-2.12.4-no-git.patch
deleted file mode 100644
index 0114e1d42b9e..000000000000
--- a/dev-lang/scala/files/scala-2.12.4-no-git.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/project/VersionUtil.scala
-+++ b/project/VersionUtil.scala
-@@ -2,7 +2,7 @@
- 
- import sbt.{stringToProcess => _, _}
- import Keys._
--import java.util.{Date, Locale, Properties, TimeZone}
-+import java.util.{Calendar, Date, Locale, Properties, TimeZone}
- import java.io.{File, FileInputStream}
- import java.text.SimpleDateFormat
- 
-@@ -65,18 +65,13 @@
-     val log = sLog.value
-     val (dateObj, sha) = {
-       try {
--        // Use JGit to get the commit date and SHA
--        import org.eclipse.jgit.storage.file.FileRepositoryBuilder
--        import org.eclipse.jgit.revwalk.RevWalk
--        val db = new FileRepositoryBuilder().findGitDir.build
--        val head = db.resolve("HEAD")
--        if (head eq null) {
--          log.info("No git HEAD commit found -- Using current date and 'unknown' SHA")
--          (new Date, "unknown")
--        } else {
--          val commit = new RevWalk(db).parseCommit(head)
--          (new Date(commit.getCommitTime.toLong * 1000L), commit.getName.substring(0, 7))
--        }
-+        val commit = "c2a5883891a68180b143eb462c8b0cebc8d3b02"
-+        val cal = Calendar.getInstance();
-+        cal.set(Calendar.YEAR, 2017);
-+        cal.set(Calendar.MONTH, Calendar.OCTOBER);
-+        cal.set(Calendar.DAY_OF_MONTH, 11);
-+        val date = cal.getTime();
-+        (date, commit.substring(0, 7))
-       } catch {
-         case ex: Exception =>
-           log.error("Could not determine commit date + SHA: " + ex)
diff --git a/dev-lang/scala/metadata.xml b/dev-lang/scala/metadata.xml
deleted file mode 100644
index b109f86671ec..000000000000
--- a/dev-lang/scala/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">scala/scala</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-lang/scala/scala-2.12.10-r2.ebuild b/dev-lang/scala/scala-2.12.10-r2.ebuild
deleted file mode 100644
index 0568eda4cfce..000000000000
--- a/dev-lang/scala/scala-2.12.10-r2.ebuild
+++ /dev/null
@@ -1,190 +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 check-reqs java-pkg-2
-
-SV="$(ver_cut 1-2)"
-SBTV="0.13.18"
-
-# Note: to bump scala, some things to try are:
-# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.gz
-# and https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.gz from
-# SRC_URI
-# 2. try emerge scala, with network-sandbox disabled:
-# FEATURES="noclean -network-sandbox" emerge dev-lang/scala
-# Check if it downloads more stuff in src_compile to
-# ${WORKDIR}/.ivy2 or ${WORKDIR}/.sbt or /root/.ivy2 or /root/.sbt
-# 3. tar up all the .ivy2 and .sbt junk into ${P}-ivy2-deps.tar.xz and
-# ${P}-sbt-deps.tar.xz and add them to SRC_URI, in ${WORKDIR}:
-# XZ_OPT=-9 tar --owner=portage --group=portage \
-# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache
-# XZ_OPT=-9 tar --owner=portage --group=portage \
-# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt
-# 4. Add these tar files to SRC_URI (undo step 1).
-# 5. Try emerging it again, with network-sandbox, and create the bianry
-# tar archive:
-# FEATURES="noclean network-sandbox -test" USE="doc source" emerge dev-lang/scala
-# cd $WORDKIR
-# XZ_OPT=-9 tar --owner=portage --group=portage \
-# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz .ivy2/local \
-# ${P}/build/pack/bin ${P}/build/quick/classes/scala-dist/man/man1 \
-# ${P}/src/library ${P}/src/library-aux ${P}/src/reflect ${P}/doc/README \
-# ${P}/build/scaladoc
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="https://www.scala-lang.org/"
-SRC_URI="
-	!binary?  (
-		https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
-		https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
-	)
-	binary? (
-		https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz
-	)"
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="binary emacs"
-
-COMMON_DEP=">=dev-java/ant-1.10.14-r3:0
-	dev-java/jline:2"
-
-DEPEND="${COMMON_DEP}
-	!binary? (
-		>=dev-java/sbt-${SBTV}-r1:0
-		media-gfx/graphviz
-	)
-	<=virtual/jdk-11:*
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-CHECKREQS_MEMORY="1536M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-pkg_pretend() {
-	if ! use binary; then
-		check-reqs_pkg_pretend
-	fi
-}
-
-src_unpack() {
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-src_prepare() {
-	java-pkg_getjars ant,jline-2,sbt
-
-	if ! use binary; then
-		local a
-		for a in "${JURI[@]}"
-		do
-			echo "${a}"
-			local g="${a/* -> /}"
-			echo "${g}"
-			local j="${a/ -> */}"
-			echo "${j}"
-			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
-		done
-
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		eapply "${FILESDIR}/${PN}-2.12.10-no-git.patch"
-
-		cat <<- EOF > "${S}/sbt"
-			#!/bin/bash
-			gjl_package=sbt
-			gjl_jar="sbt-launch.jar"
-			gjl_java_args="-Dsbt.version=${SBTV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
-			source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
-		EOF
-		chmod u+x "${S}/sbt" || die
-
-		sed -e 's@-Xmx1024M@-Xmx1536M@' \
-			-i "${S}/build.sbt" \
-			|| die "Could not change increase memory size in ${S}/build.sbt"
-	fi
-
-	default
-}
-
-src_compile() {
-	if ! use binary; then
-		export PATH="${EROOT}/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
-		export LANG="en_US.UTF-8"
-		einfo "=== scala compile ..."
-		"${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed"
-		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
-		"${S}"/sbt -Dsbt.log.noformat=true publishLocal \
-			|| die "sbt publishLocal failed"
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	if ! use binary; then
-		"${S}"/sbt -Dsbt.log.noformat=true test || die "sbt test failed"
-	else
-		einfo "Skipping tests, USE=binary is set."
-	fi
-}
-
-src_install() {
-	pushd build/pack || die
-	local SCALADIR="/usr/share/${PN}-${SV}"
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "${SCALADIR}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-	popd || die
-	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print)
-
-	pushd build/quick/classes/scala-dist/man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd || die
-
-	#sources are .scala so no use for java-pkg_dosrc
-	pushd src || die
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins -r library library-aux reflect
-	fi
-	popd || die
-
-	local DOCS=( "doc/README" )
-	local HTML_DOCS=( "build/scaladoc" )
-	use doc && einstalldocs
-}
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
deleted file mode 100644
index 58851200267d..000000000000
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit check-reqs java-pkg-2 versionator
-
-SV="$(get_version_component_range 1-2)"
-
-# Note: to bump scala, some things to try are:
-# 1. update all the sha1s in JURI
-# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.gz
-# and https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.gz from
-# SRC_URI
-# 3. try emerge scala.  Check if it downloads more stuff in src_compile to
-# ${WORKDIR}/.ivy2 or ${WORKDIR}/.sbt or /root/.ivy2 or /root/.sbt
-# 4. tar up all the .ivy2 and .sbt junk into ${P}-ivy2-deps.tar.xz and
-# ${P}-sbt-deps.tar.xz and add them to SRC_URI:
-# XZ_OPT=-9 tar --owner=portage --group=portage \
-# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache
-# XZ_OPT=-9 tar --owner=portage --group=portage \
-# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt
-
-# creating the binary:
-# FEATURES="noclean -test" USE="doc source" emerge dev-lang/scala
-# cd $WORDKIR
-# XZ_OPT=-9 tar --owner=portage --group=portage \
-# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz .ivy2/local \
-# ${P}/build/pack/bin ${P}/build/quick/classes/scala-dist/man/man1 \
-# ${P}/src/library ${P}/src/library-aux ${P}/src/reflect ${P}/doc/README \
-# ${P}/build/scaladoc
-
-# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
-# to search for .desired.sha1 files, which contain sha1 hashes that are appended
-# to ${BURI} along with the subdirectory and filename to form the list of jar files
-# listed in SRC_URI.  The output of this find command can be hacked into the desired format:
-# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
-# After editing it into the desired format: sort -t / -k 3 file
-
-BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
-
-declare -a JURI=(
-	"${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar"
-	"${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar"
-	"${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar"
-	"${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar"
-	"${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar"
-	"${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> ${P}-code.jar"
-	"${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar"
-	"${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar"
-	"${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar"
-	"${BURI}/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> ${P}-jsoup-1.3.1.jar"
-	"${BURI}/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> ${P}-macro210.jar"
-	"${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar"
-	"${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar"
-	"${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar"
-)
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="https://www.scala-lang.org/"
-SRC_URI="
-	!binary?  (
-		https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
-		https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
-		${JURI[@]} )
-	binary? (
-		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )"
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="binary emacs"
-
-COMMON_DEP="dev-java/ant-core:0
-	dev-java/jline:2"
-
-DEPEND="${COMMON_DEP}
-	!binary? (
-		=virtual/jdk-1.8*
-		>=dev-java/sbt-0.13.13
-		media-gfx/graphviz
-	)
-	>=virtual/jdk-1.8
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-CHECKREQS_MEMORY="1536M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-src_prepare() {
-	java-pkg_getjars ant-core,jline-2
-
-	if ! use binary; then
-		local a
-		for a in "${JURI[@]}"
-		do
-			echo "${a}"
-			local g="${a/* -> /}"
-			echo "${g}"
-			local j="${a/ -> */}"
-			echo "${j}"
-			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
-		done
-
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		eapply "${FILESDIR}/${PN}-2.12.4-no-git.patch"
-
-		local SBT_PVR="$(java-config --query=PVR --package=sbt)"
-		sed -e "s@sbt.version=0.13.11@sbt.version=${SBT_PVR}@" \
-			-i "${S}/project/build.properties" \
-			|| die "Could not set sbt.version=${SBT_PVR} in project/build.properties"
-
-		cat <<- EOF > "${S}/sbt"
-			#!/bin/bash
-			gjl_package=sbt
-			gjl_jar="sbt-launch.jar"
-			gjl_java_args="-Dsbt.version=0.13.13 -Dfile.encoding=UTF8 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}""
-			source "${EPREFIX}"/usr/share/java-config-2/launcher/launcher.bash
-		EOF
-		chmod u+x "${S}/sbt" || die
-
-		sed -e 's@-Xmx1024M@-Xmx1536M@' \
-			-i "${S}/build.sbt" \
-			|| die "Could not change increase memory size in ${S}/build.sbt"
-	fi
-
-	default
-}
-
-src_compile() {
-	if ! use binary; then
-		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
-		einfo "=== scala compile ..."
-		"${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed"
-		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
-		"${S}"/sbt -Dsbt.log.noformat=true publishLocal \
-			|| die "sbt publishLocal failed"
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	if ! use binary; then
-		"${S}"/sbt -Dsbt.log.noformat=true test || die "sbt test failed"
-	else
-		einfo "Skipping tests, USE=binary is set."
-	fi
-}
-
-src_install() {
-	pushd build/pack || die
-	local SCALADIR="/usr/share/${PN}-${SV}"
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "${SCALADIR}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-	popd || die
-	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print)
-
-	pushd build/quick/classes/scala-dist/man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd || die
-
-	#sources are .scala so no use for java-pkg_dosrc
-	pushd src || die
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins -r library library-aux reflect
-	fi
-	popd || die
-
-	local DOCS=( "doc/README" )
-	local HTML_DOCS=( "build/scaladoc" )
-	einstalldocs
-}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 99f61672d290..04d551837d62 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -2,6 +2,7 @@ DIST firefox-102.15.0esr.source.tar.xz 486592324 BLAKE2B b70727fa91d0d270673374b
 DIST firefox-102esr-patches-13.tar.xz 22212 BLAKE2B 02e9edd071a99abbac02faa11ffce061d5d12d8baa9ce54b51d6bfdbf8160022a1565902d65ca30fe51b5670e509fa921b11a460989933cbb797fcd59d635125 SHA512 8b8b0f3789978447a1293fd9acb5c2db3d7e9f724357a0d762b54f7e34d28f11655997ffeafccfe8001a01dd595848d257f90cb983462c405d434cc794216520
 DIST firefox-115.13.0esr.source.tar.xz 510571488 BLAKE2B e2b00965a92cd11da6c81daa8b6c652dfccc9f0f7d066bc17ae5fa3ac3aaaa021c4489a9f653127f5516e3d77cd7174de328343e22c4edab438e3fcb9a859178 SHA512 799cdf2d0494003a5addd0da703f53deb9c9d6bb6f6c95d40026363382803e2d086039c7798940a1f35f4cba111f2e8e21bde8ac2eac29fd9bd6876dd8d3a85f
 DIST firefox-115.14.0esr.source.tar.xz 507310580 BLAKE2B ffca6b7dce6ae6a470c9d5506b4236077b2151732bff811aa0bf0367be80aec5ea4918ee5dcd611b0e19a025156def3e9524a4f5d741343e9fda5a2e693e15fa SHA512 dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54
+DIST firefox-115.15.0esr.source.tar.xz 507920832 BLAKE2B 997a3148b7019fbec95e1e003561a1135c27a769ff92a675debff540b20213a21cf96f9f2e9cb1db4e8c81702b7fcf7e1ba35045dc7dfd705957d099350ea9f3 SHA512 0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba
 DIST firefox-115esr-patches-10.tar.xz 17256 BLAKE2B 0f6265d6e12f55e9b5128f2f261ba3785b80563e049d2441fde09dedf419c6086c9d994d2b44d1aab35af64cde375bdc254206da9ef148fc20fa90da0417606d SHA512 a1f0012420593a1c1b38dba1785ee9092e0923f56458c38f003cca4ebaac30a73fe3d1f5806a5795c76b2b8d729f8184372e63681daa450c3bb8e5afbe9e2e4f
 DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f SHA512 186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90
 DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6cee9647459d2b02b0be5bdb289d457e5dbdb06ceac7a3082fc2f5836e991a4ac4486d73330b0276a466b5c528dab226a27829c SHA512 d2b8e32dac87d60a00fd93479dc34d8adab4feec24a38591cebeb4cf271aa2fd964f4dc26e67ebfb127a47bc8f684d50b32b2cff18ed5286701a04a289058185
diff --git a/dev-lang/spidermonkey/spidermonkey-115.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-115.15.0.ebuild
new file mode 100644
index 000000000000..2bdbe0e3afc7
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-115.15.0.ebuild
@@ -0,0 +1,509 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-115-patches-01.tar.xz"
+
+LLVM_MAX_SLOT=18
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,ssl,xml(+)"
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+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}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+SLOT="$(ver_cut 1)"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+#RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	|| (
+		(
+			sys-devel/llvm:18
+			clang? (
+				sys-devel/lld:18
+				sys-devel/clang:18
+				virtual/rust:0/llvm-18
+			)
+		)
+		(
+			sys-devel/llvm:17
+			clang? (
+				sys-devel/lld:17
+				sys-devel/clang:17
+				virtual/rust:0/llvm-17
+			)
+		)
+		(
+			sys-devel/llvm:16
+			clang? (
+				sys-devel/lld:16
+				sys-devel/clang:16
+				virtual/rust:0/llvm-16
+			)
+		)
+		(
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/lld:15
+				sys-devel/clang:15
+				virtual/rust:0/llvm-15
+			)
+		)
+	)
+	!clang? ( virtual/rust )
+	!elibc_glibc? (
+		|| (
+			dev-lang/rust
+			<dev-lang/rust-bin-1.73
+		)
+	)
+	test? (
+		$(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-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then
+		einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+			einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/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 "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/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
+}
+
+python_check_deps() {
+	if use test ; then
+		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="4000M"
+	else
+		CHECKREQS_DISK_BUILD="3600M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="4000M"
+		else
+			CHECKREQS_DISK_BUILD="3600M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	if ! use ppc64; then
+		rm -v "${WORKDIR}"/firefox-patches/*ppc64*.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"
+		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"
+
+	# use prefix shell in wrapper linker scripts, bug #789660
+	hprefixify "${S}"/../../build/cargo-{,host-}linker
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	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
+
+	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"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+
+		--disable-ctype
+		--disable-jemalloc
+		--disable-smoosh
+		--disable-strip
+
+		--enable-project=js
+		--enable-readline
+		--enable-release
+		--enable-shared-js
+
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if use debug; then
+		myeconfargs+=( --disable-optimize )
+		myeconfargs+=( --enable-debug-symbols )
+		myeconfargs+=( --enable-real-time-tracing )
+	else
+		myeconfargs+=( --enable-optimize )
+		myeconfargs+=( --disable-debug-symbols )
+		myeconfargs+=( --disable-real-time-tracing )
+	fi
+
+	# We always end up disabling this at some point due to newer rust versions. bgo#933372
+	myeconfargs+=( --disable-rust-simd )
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		if use clang ; then
+			if tc-ld-is-mold ; then
+				myeconfargs+=( --enable-linker=mold )
+			else
+				myeconfargs+=( --enable-linker=lld )
+			fi
+			myeconfargs+=( --enable-lto=cross )
+
+		else
+			myeconfargs+=( --enable-linker=bfd )
+			myeconfargs+=( --enable-lto=full )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-lto
+
+	# Use system's Python environment
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/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_failures.list || die
+
+	if use sparc ; then
+		echo "non262/Array/regress-157652.js" >> "${T}"/known_failures.list
+		echo "non262/regress/regress-422348.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js" >> "${T}"/known_failures.list
+	fi
+
+	if use x86 ; then
+		echo "non262/Date/timeclip.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/Date/UTC/fp-evaluation-order.js" >> "${T}"/known_failures.list
+		echo "test262/language/types/number/S8.5_A2.1.js" >> "${T}"/known_failures.list
+		echo "test262/language/types/number/S8.5_A2.2.js" >> "${T}"/known_failures.list
+	fi
+
+	${EPYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		${EPYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || 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/tuprolog/files/build-3.x.xml b/dev-lang/tuprolog/files/build-3.x.xml
deleted file mode 100644
index 3b6f5818eaa6..000000000000
--- a/dev-lang/tuprolog/files/build-3.x.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" ?><project default="jar" name="tuprolog">
-
-	<!-- some properties -->
-	<property name="src.dir" value="src"/>
-	<property name="build.dir" value="build"/>
-	<property name="docs.dir" value="docs"/>
-	<property name="dist.dir" value="dist"/>
-	<property name="test.dir" value="test"/>
-	<property name="test.build.dir" value="test.build"/>
-	<property name="jarfile" value="${ant.project.name}.jar"/>
-	<property file="build.properties"/>
-
-	<path id="compile.classpath">
-		<fileset dir="lib" includes="*.jar"/>
-		<pathelement path="${gentoo.classpath}"/>
-	</path>
-
-	<!-- init -->
-	<target name="init">
-		<tstamp/>
-		<mkdir dir="${dist.dir}"/>
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${docs.dir}"/>
-		<mkdir dir="${test.build.dir}"/>
-	</target>	
-
-	<!-- compile everything -->
-	<target depends="init" name="compile">
-		<javac deprecation="off"
-			destdir="${build.dir}"
-			encoding="ISO-8859-1"
-			srcdir="${src.dir}"
-			source="1.8"
-			target="1.8">
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</javac>
-		<copy todir="${build.dir}">
-			<fileset dir="${src.dir}">
-				<exclude name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- build the jar file -->
-	<target depends="compile" name="jar">
-		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
-		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
-			<manifest>
-				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
-				<attribute name="Class-Path" value="."/>
-			</manifest>
-			<zipgroupfileset dir="lib" includes="*.jar"/>
-		</jar>
-	</target>
-
-	<!-- generate javadocs -->
-	<target depends="init" name="javadoc">
-		<javadoc
-			author="false"
-			destdir="${docs.dir}"
-			encoding="ISO-8859-1"
-			breakiterator="yes"
-			packagenames="alice.*"
-			sourcepath="${src.dir}"
-			use="true"
-			version="true"
-			verbose="no"
-			windowtitle="${ant.project.name} API">
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</javadoc>
-	</target>
-
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}"/>
-		<delete dir="${dist.dir}"/>
-		<delete dir="${docs.dir}"/>
-		<delete dir="${test.build.dir}"/>
-	</target>
-
-	<!-- run testsuite -->
-	<target name="test">
-		<path id="dist.classpath">
-			<fileset dir="${dist.dir}">
-				<include name="*.jar"/>
-			</fileset>
-		</path>
-		<javac classpathref="dist.classpath"
-			deprecation="off"
-			destdir="${test.build.dir}"
-			encoding="ISO-8859-1"
-			srcdir="${test.dir}/unit"
-			source="1.8"
-			target="1.8"/>
-		<junit fork="yes" failureproperty="test.failed" printsummary="yes">
-			<classpath>
-				<path refid="dist.classpath"/>
-				<pathelement path="${test.build.dir}"/>
-			</classpath>
-			<formatter type="xml"/>
-			<test name="alice.tuprolog.TuPrologTestSuite" todir="${test.build.dir}"/>
-			<test name="alice.tuprolog.ExceptionsTestSuite" todir="${test.build.dir}"/>
-		</junit>
-		<fail message="Test failure(s) detected" if="test.failed" />
-	</target>
-</project>
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
index 492f5bf80081..b96aae2347cf 100644
--- a/dev-lang/typescript/Manifest
+++ b/dev-lang/typescript/Manifest
@@ -1,4 +1,2 @@
-DIST typescript-5.4.5.tgz 5825770 BLAKE2B aea24c0924b2a0b0d01face2ce6be4e7fac85c2205cb0ecde492c5301f83d55fd8cd501326bd47f90cd78abf48c7aaf0381b13fc8242f3d2f9235e6051860b2b SHA512 bdc23852946083cd68211505c11d164881cab75d6727b48056560d22ef90a6a7b25cffa0a50272fd9e3e174686c5213832ac23c97bd6fd3ce090b031d80187c1
-DIST typescript-5.5.2.tgz 4040998 BLAKE2B 3b1b8ea1c124c24b327111a69eaeaf470364090f3a613c5ead225d9a5502ad2473ea156d203ee73cae9a8ff470d21ddc5e729935a72560c2ffad18edff4b754d SHA512 35c46d3c43ac3c51568e86c912d7e28642c26425d9b7fa2cdf37fc9d3c63547dd1bd34b18eb09a989a5b1311af60e17eb451dcde903ae6aa5dc0f6f38e88617b
-DIST typescript-5.5.3.tgz 4041052 BLAKE2B e30ca285fdedfefc8ebac28310dc4d4834efefc9c25d36ca5be43c0ed81e91698b879565c47651402a90b16ba4d30895d00bcee5a752ad538b4d9f2e2327ad49 SHA512 fe1adec84ba3681d30efaccaa3aef5ee5dcbd28fea114b5181dbd406f96486859e39532332e1cd1e4d01441ce2933b860ea3663d06e0e627cc12ab072e221471
 DIST typescript-5.5.4.tgz 4043150 BLAKE2B 6171a4bafcb7d9dff4cd603846980bcfa599c4ee13d585760af572dc410a584f729485bc2aaf5cb5e3721d37b7cf8d4f54eaf9abda86eba04bf54b50ac80db9c SHA512 32dab6f6c28300460feda963460b4f3a94ef39f6f0456952e9d3d1cf08dd13e0b44786eb5ff194ca11d279c6c73052cd04b70920fb7d9e5f721b94d9d70787f9
+DIST typescript-5.6.2.tgz 4174769 BLAKE2B dad7a57b0caf704e8723021b83c53b392d945b0ac529a1be568297875eceecedbd84f5d1bb967313284d8ce8195b6f2b61c19ca0da79f22a27846cf944057f83 SHA512 356f01ca874248d0b065e8218cdde8f895f93851f43a383ab1a76310a63886e679d93a9b2532670e8e7e4f0f7c952cbadcd66f8b89fe7b3e66daee5de0f919cb
diff --git a/dev-lang/typescript/typescript-5.4.5.ebuild b/dev-lang/typescript/typescript-5.4.5.ebuild
deleted file mode 100644
index 761177a3441e..000000000000
--- a/dev-lang/typescript/typescript-5.4.5.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
-
-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 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.5.3.ebuild b/dev-lang/typescript/typescript-5.5.3.ebuild
deleted file mode 100644
index ebdd7db72e65..000000000000
--- a/dev-lang/typescript/typescript-5.5.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.5.4.ebuild b/dev-lang/typescript/typescript-5.5.4.ebuild
index 242c85963aec..ebdd7db72e65 100644
--- a/dev-lang/typescript/typescript-5.5.4.ebuild
+++ b/dev-lang/typescript/typescript-5.5.4.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/package"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 RDEPEND="
 	net-libs/nodejs
diff --git a/dev-lang/typescript/typescript-5.5.2.ebuild b/dev-lang/typescript/typescript-5.6.2.ebuild
index 242c85963aec..242c85963aec 100644
--- a/dev-lang/typescript/typescript-5.5.2.ebuild
+++ b/dev-lang/typescript/typescript-5.6.2.ebuild
diff --git a/dev-lang/zig-bin/Manifest b/dev-lang/zig-bin/Manifest
index beafee5ec4cb..20d7959e1acc 100644
--- a/dev-lang/zig-bin/Manifest
+++ b/dev-lang/zig-bin/Manifest
@@ -1,48 +1,22 @@
 DIST zig-linux-aarch64-0.10.1.tar.xz 40321280 BLAKE2B 39abefb80d540d52333ec76203893630ac5df2a784684397033e9ac766f67c4512be71513ebb80faac6c5ebaa2a737859b7bc27b82797232cf97d87d91e8492e SHA512 44dd15b1b2d7bc85a4f8e8171ae5c51122be352249273091b499de5a392c72e262585f981908afd1718a41fa7e67b36f1b65c6cacbf8e9f226a687bd85b7edc6
 DIST zig-linux-aarch64-0.10.1.tar.xz.minisig 326 BLAKE2B f20178d19a0a3415af5557787ba5380b6502771b1df858a03812d47f5602c6cf4bb9c1d7f854ea086a45a7c05a4fb0d6df42e05e3c9e383918195bc3843a88a6 SHA512 ffff297e3946b0bc5c8da6377360764f37ad9a088672c0ba32327cac60379bc5dcba37265e3e9c92ae17073bb8f26f67466c9ac9fd6151c72e62b76214432d0f
-DIST zig-linux-aarch64-0.11.0.tar.xz 41492432 BLAKE2B fd4e1f242475bfdc94f418817d2f1b256ebdc7e29b94e7629f54c241b7a1df273a2c776ab29dad645af041b5cfb0e7d1b0a922bb04a82553604076d36e957580 SHA512 07a026958cac0f1674496f8a1fd3a3dfcd79274d1a25c87e4123b74a437f332bbea4097320da7f83d67626fb9d6e9fe1d78e917522debb8873f7c40938031e63
-DIST zig-linux-aarch64-0.11.0.tar.xz.minisig 326 BLAKE2B 2b9d4aac400789019430fc4a2e28a255cf259730c2f3f6b18129cd2b43465ef513931e827c58bd5170dfe519f602840892e201b9a66ba013384d1e4f18d3ea92 SHA512 0bb645a52704ecad1b98d91659468a0b8a29c3cc4db8fb2c9bb43cee17ba2cb7227222b0ea81e081cc13772ed2bf1a5253a7f3d7204b2a8166451f4384d7963c
-DIST zig-linux-aarch64-0.12.0.tar.xz 41849060 BLAKE2B a12a6c946a365b391b323f51c7b25f855dddaed7a768067da0abfb64ca2440a3ba36b6b5987d5129485e506f45e7f90e98ef29f9242aa71b1dc286426fbc8403 SHA512 6fba718ff4cdf58f9a9db9183b9d436eedea3317c7e91dfa495b47f0dc95d2042784d4692cb65907cb9c3c74484b4e15adeeefd0c1ac462064848bdad4d6e4c4
-DIST zig-linux-aarch64-0.12.0.tar.xz.minisig 326 BLAKE2B 9cf7cdd6a1029e61c695610a4b77aafd915c23108c7a2315b51a2115b1b9f6e944d72fea84dbcc87f0e2e7eab2180ed095434b834a1a87f1c0424a8800db27c8 SHA512 7d0468fa56f6fcc8960a1dba43be6695fb7231e1de8b07f8d4c8b3d4ec8917e3c0cb19b7539db8e316b993bf5396197ab2d16e357fa5d541c7f88da2d7429038
 DIST zig-linux-aarch64-0.13.0.tar.xz 43090688 BLAKE2B 658376ddd6f74ced4e8d875573e53e236ce65d11bf098db7fc1c6a119b88dc97c45212101e0b3a4cfb7d0f4481d696fbb65b765344f44451d20c5bfb36cfbc14 SHA512 0e36c26da0088aec54939af0cbe5219132d56cb8bb1f298ca50e1a628d3fbdfd401441695013b6d3fd282905bb273ccc160b4f0dbced236aa1408278f532d99a
 DIST zig-linux-aarch64-0.13.0.tar.xz.minisig 326 BLAKE2B 2f4008c036a309bf3efdfa719a7e4cca0c13c0c5a93e6a8c2e9c75cff7ea9a000cc52f695487c1b1199eebece4853b11ca4d3a22935f12b6d07b9f465da01c2e SHA512 a5635610a17f61e8608379bee0e10c8a43a565ddf22394da214e28b6a84fadd6809bdcdb7996ebc2bc2bfa6d1fa4a5e47191f6aa8536450b01cae03871145679
 DIST zig-linux-armv7a-0.10.1.tar.xz 50718132 BLAKE2B 76ef431ef8957272b992f6b861913a961d348120106a7f4b77d1f6b2a042dd8904a1ac744ab6b02b78681eef68af4143372e5315cd113d40711bd26fc78e6632 SHA512 4ec3ccd7ac980bfd9fc7a2f6b2301051d3df43b00143914d869389fc44b48916820d996e27cb922dac152228c4b04a0cce51f7b125317de85440a5479fe8ff7d
 DIST zig-linux-armv7a-0.10.1.tar.xz.minisig 325 BLAKE2B 675416641adfa9a1cdc6797dd310a7cdd83dda20cf73b5d3dafd616d3686ab72f00d735576c3d6839c9b7a92869ce058dd532beec27e5ec0a7b7d4f94008d592 SHA512 7f7be843ce7718294816f5c8dc349386cd76d9e7ad0a96d74bfe09d7361e864f275593fbd92b44091c5cdd5fcb0d9e8e07683c96585ac932b5f80e7c7356e6cc
-DIST zig-linux-armv7a-0.11.0.tar.xz 42240664 BLAKE2B 0d301c1a2fa2ddcddccf37333418ceea06b48539548e533a20c098021fba12c1bfe467d0c8dd3d9207c6d129e4de8c47c436a39f7fd6165a0c6ad5a679ca5f50 SHA512 f4235418b3251d03727ba85a6002f6561f20b095a9fddf92ff126a20f49d17533d15d7e0f570ea734e40a1a76dd1b8a4bca78ad6ab3846aeb5f90dc812586008
-DIST zig-linux-armv7a-0.11.0.tar.xz.minisig 325 BLAKE2B 4f8c686969a3f74c91906a1a9b79bef16b8695caf3829b6550d9c3a7b3c92703cad6e5d45e8260fb13b2be1947fe1f0adfc71afcaa6f28b6fd42364a706272dc SHA512 8ae13173ef26d97ff6dfb019f709020d3dd6112dae75ff7e7ba34e53d582f62e37ce2ff16574cfd4a061f0ac16a067eba80639beda1bc319920837321299c9fd
-DIST zig-linux-armv7a-0.12.0.tar.xz 42638808 BLAKE2B 58e905a5519729ae8e549be354558d2df72c4d07fafb00c2e78a2b92cf562fe4cabe826992cc0b3165fded1d7e7bffac23af13256aa3cba9497f6561b819e531 SHA512 9cf8afa94afd47a54131e80fad8dc2852cfd2243e33d06eb2ba607cd7de186f7f1245a84efce8556e180fbee6a3c05448b3ab568d93233a16f398b258526867f
-DIST zig-linux-armv7a-0.12.0.tar.xz.minisig 325 BLAKE2B 47de3ac2f3abaabae21060a85ffbccb9db1b8df4c67ca02ea9208913c2ec765d6e7b713a8863358cb0a00519397445f269db6c70622fe658bcb7ef34922ba5b0 SHA512 c51884ea6d0849cf97d9e4a206af64a33a66bab5feac610f61ed5239c2122c40a33589fbed5e07d7baefa5e8181dc914a946fb4cfba91480f7581cb56ba358eb
 DIST zig-linux-armv7a-0.13.0.tar.xz 43998916 BLAKE2B 5ab0f39209d900690f28a73bade854aecbd77d6d7bccfdca97d49e5fc40d198023f2f9b1e96eaa9afa6a368c6f35575aeac52422d486a691dd4779ca118836ca SHA512 d93005a14dae40e6de66ad0e3150ac15284c01839ae0a19531a4e2f54a628b9fe3bcb08b6d526b96ba9d79d232c5c0c2b813877359c76b927435085671c57ab6
 DIST zig-linux-armv7a-0.13.0.tar.xz.minisig 325 BLAKE2B 3b1fa76b70cf364f218af9299812ec175d03d0b4bf3d6748737d26fc9ef55b97f24b1ce34c62e16fb44e72b16659d2f41069d59e662ae4a95d461fe1f25132fc SHA512 68c822bf8718cf547d20ef0cff16343ac9a99b27738ac81bd660b8d55f69c4ac5666b0a4766b18acbc391923784a0bddf67c504ffae13b8f6219e59244aa665b
 DIST zig-linux-i386-0.10.1.tar.xz 48367388 BLAKE2B 482ec9e42d9036177f41c459faf82c79ba525f35ed14150d97af9110efab3e9894b8c64f92f9257b224893179134e43306c985ad6a04ae6a7d427d14ef4e7a3f SHA512 97345a8f7f15a83e51635ec667e869833a597511a1b004fa4ab19d78ad234e05e8344823e0c623510c7c5dbeef447d13636223e8d339f6d53f2eca053852a8d3
 DIST zig-linux-i386-0.10.1.tar.xz.minisig 323 BLAKE2B e25778cf26696ae0450186b6173dc69cfc9eb165903d5c4b1bcb9d01b55646f1af5047e129a1241200b7d7bd041bc9aa85841eee3a9366b7e88a2eccce3dae88 SHA512 52e66eb9a486e853330f125bad2baf63b87e3544ef1cc12cd59889f3c3a8a7ada5363307eb29d797c54202ebc5a3edb87452d6b09f53f099f51f79c053cf8b7d
-DIST zig-linux-powerpc-0.11.0.tar.xz 44539972 BLAKE2B b713c23f537c8f47be7aae7bf0609d056dc6817aac207ba39df0a53d1c391f1c64bc05edbb53fb5584c60cd6963f35fa56448440c5065dc21b5cf978fbb0bbb4 SHA512 faabbbae501b56c91fec036c209a6d6aea0c974749a777eb13f273e06fde960c7b2a2b29caf83a43fef740652db313933b3eeb72a9c0445ad412a7f8023da3af
-DIST zig-linux-powerpc-0.11.0.tar.xz.minisig 326 BLAKE2B ddf87eece5a2238a72d672af245de57ec3163d6849b84a72375dd08e12b9f4d068fd1584abfe0d9dbf449b802383e522bef1a4e21217788ca5638b885c1030c0 SHA512 c762e4a2414aee08fa4a7afd26660cf43c81478fa1a154cd7e7ecdcff15aa3d4ab8263fabe271ce9bd5191a1564b38bb7f96ee7afc2317f71d60c0fd527e32f6
-DIST zig-linux-powerpc64le-0.11.0.tar.xz 44656184 BLAKE2B 597947c4bee73847abf0941819477bf8a47a4d019a8060e79133e3d01b43325c0acfae7a8d57a4d84e1cd9dfe63b3439fac4e4372d6b538e9992a9364d65ee73 SHA512 fc1dbe9115e2f92f03a6934d32c65d1de4cbe0cf070d6f468632c906966048400a806d8ec8540fde7a1b195a8ae8238fde5ddd94c2d54a0af70d9060d006cf89
-DIST zig-linux-powerpc64le-0.11.0.tar.xz.minisig 330 BLAKE2B 4a657d18c184bd37b1d3e3ab50b096b2594e204c5bdfe5f94c5543051823b43c7014e99b8b51718513006b4391b400df67ace22a86111a863373f34c526d0f94 SHA512 093f957cfea8605452d52f402371caa4552e10f612fb71240d34d905f7a86271b767163af15e3969f33fadd5d385164e87d944c48cc96cfdc6de00877b239476
-DIST zig-linux-powerpc64le-0.12.0.tar.xz 45216736 BLAKE2B 4da27f58536c311ee5585c3e411ea230459ef5ad3006d381fe75e04c3088735a57eac8fc83856e9182585b5ee27f00026ba393741c55e5b4ed069760c8839d10 SHA512 9c44db49dc5e698bd19ef7341927216d88a813cee03eb5057a9b17b33c4750d6c28aab0befdb4cb2066e7a84befa3e237475a1fdeba672748940e972b27822c0
-DIST zig-linux-powerpc64le-0.12.0.tar.xz.minisig 330 BLAKE2B f43ba19e848ad3777d257d03304cd26a8cf317032b85f3841434fe4d9f70099b053d4b97b09e7b9fc13bb7f403c69f7aac41d0f522ba0aca4de70a3db0c83a94 SHA512 3629f18568066a59b8cfa2026b86e291b742739101df2b0914e935aa5c008ee8fd66c1cb11b961a0acba75eb5e56ba002578a94e4ebbd4b21071fe7e7faebeeb
 DIST zig-linux-powerpc64le-0.13.0.tar.xz 46574596 BLAKE2B ac21b1d8317177682e7aab53b3b8f4884ae1c6e52b25d30a8acd9c345c97c49d55a9652eec205fc5c2a510c840c947eb1967fdaa36b3a29fc712ca11702c0b77 SHA512 ef9fce45ffaaef9902ee35010dd7ef372b14d5cc82b6ff653e9b5f91a9da15542f5f2410620c239415d051876091d17be4a4d610ab59a89e02e7609b9ef304b2
 DIST zig-linux-powerpc64le-0.13.0.tar.xz.minisig 330 BLAKE2B 164a5857ad9ffa323fcd27fd2d9cd0c4202d8e1fc1bc968341eadb14157271e10f8f4bc544dcbe738720a99767291d9882b956478bee3b08b1fb28ea57c4d529 SHA512 04f480145c676dc8a4ba369594af41a84f3fa2686e194df88d546fe9f989b03f3f1aee291bcad07a0e7e81495b69a5cf182a1454ab21fd043faa1bb2a68edb68
 DIST zig-linux-riscv64-0.10.1.tar.xz 42196008 BLAKE2B a7ae37b1d1db1281b09bbd7e35ecaf390bbe28774bd1a4fa76b4468255be19b07fb514326d48576946f3c4eb04dcef34d6ab14f550407aa33803754fabbd848c SHA512 1a1da96924fa4a16a53721017eadc3363859a4f53671e27b11588200d0302d9065de9ba517ad40940aad98725e617cf853f2e83f732a4e23c33deacb99487ad0
 DIST zig-linux-riscv64-0.10.1.tar.xz.minisig 326 BLAKE2B ebe0b448aa59fb1f63ad8a5320207bfb139f7b55af8b4d1d3347580093f0adad31957647b40b296414876c2cc013d6c701ebfe3d95c91240322602bef693ebf8 SHA512 7cb59ebbaeb33be1c743509564478b9d2f513e6142c0b80380be4c70f1b203818330fd3a9322f0dc93cb21121dd4e1bd153225804e467cd13f28f4ff73a4bd2f
-DIST zig-linux-riscv64-0.11.0.tar.xz 43532324 BLAKE2B f82a7a32b94a084767fa205bf8b66371bfebd4753f647930a5689d727a2211c9cd37f76a855732356a220a64515f8146c5b450207be59854f08132ccf178d23c SHA512 f2ab35c6a7c3452a5dd825d03fa8b5329786a705dbc04260980fefc64e24f4d61cb22c95c10b9952cbc58bdd8741503aa98ad8ed4a8c0a0e856a0e8ba9eb1ca7
-DIST zig-linux-riscv64-0.11.0.tar.xz.minisig 326 BLAKE2B 01a6c8fd20e757fa4f238b676fd6d85c94295929bf0e944b90a307f1579a74840cd100dd28fc56b47ffa77a1fde9b73fed5047a96f55521a671fbf4b2bc9a6ae SHA512 e226ba090392aece2d4d7287e49ad389f11c799d29b528015a180764ee5d64f739011bc0ac649641127feffa017a4f7052ca30107d326e7d50cdb279134faad7
-DIST zig-linux-riscv64-0.12.0.tar.xz 43917444 BLAKE2B 1d06f543f8cc8b4ec2d2cfb0f11e3096effc7f458ff2b9e380a22c8213f9898ae28fdbb09da23f83d5d01f65b174a3461a08fe1af142289016e7c230a0aa0f06 SHA512 f02aff638a46a9a491aeb386e71b3c0c1e536893b1f61348599df9a903dabadb7c21ddff810160f00ce505944e3941ec82f4222bed355accf24fb3dd929f3ce9
-DIST zig-linux-riscv64-0.12.0.tar.xz.minisig 326 BLAKE2B bc8a550010af06d45a8186b0a47370f6b8dcdeb48f503ebe49caef8e2e075c0034e5184fb65c289cdbd17c23a89d9a4a42b25bc7cbde6f709e990a8f9dc521da SHA512 bab7b063452d73d647a65898ffcb65c65171a798333a28cbbac04af12d21303c5a4e185af04df3286c099d7a7194a5d96f57d8bff977796e56cc6a561dcbd40c
 DIST zig-linux-riscv64-0.13.0.tar.xz 45540956 BLAKE2B 879d9cb16a2912fa770f65b82b898ac8705f8de461745bc92adb43a201dcd86f3697d5464742b4cd1ab252ccab14f619fccf87a197b8ec6f209870ffdf560fad SHA512 7c7867aab96c862b0b1faa8db872e45503a36eed2a234e2e52b86bd0d334a232c1bb966e23079d30a57fde2f4b5d5c8fe215181a380b4e277242f4ec5261a5e9
 DIST zig-linux-riscv64-0.13.0.tar.xz.minisig 326 BLAKE2B c93a653ba1634a445b365d6690f0f54e15fac964b85e24a6f3a2e89750adfd389630aea0483cb8e77254d02fad5137ae428110b384ad8120c01cb9dbea87efe2 SHA512 5687e6d398d0115658c00eee47e0047a0da0f4e8002c96cab9844032b5925f46a139239cac8b5e1464a2ff3460219602cec79aebd5e5599972c7dbda0112c044
-DIST zig-linux-x86-0.11.0.tar.xz 49824456 BLAKE2B 4a9b4c9551ffe555d1283c9d5aab6649fc5ea5807b9465d18c10cae622beca23df114ab4f503b9d86e14ce26cbf6ac07df8e60521fbc2c3784c9d25eeabf852d SHA512 aaa2adb128ae0cc8e6f43323b78dc60699b80f56b0e1be7524ac7e9ac71513229c4224d2ef7d63fedb74c513c31d5614fe34cbcfb0cc4bb268952427d082594f
-DIST zig-linux-x86-0.11.0.tar.xz.minisig 322 BLAKE2B 6d967e2bce7b0c3b891ab91ce6e777f9ded2f13d736215608e5d2f4458eeb5789c628e0cf0ceb516ae9fe6562484fde9dfff73126f460ceac4284717eef484d3 SHA512 a993dce9d4568709c73742530a3892f2e4e5e8a4302b26b88a0480fbcdb50e3333ac109e9b127b4a07fdf16c5e96ce68fda160a8fe6d16dd4d8159145906e7f1
-DIST zig-linux-x86-0.12.0.tar.xz 50498940 BLAKE2B 1d86022cb51ef737d8994c5854cc3bc7051907be33bbc2f52b5d395a9fc1c206ee24d62d1e4323d808b3242888d2179e5e2bc6d913de845ebf64468aff04af4a SHA512 2a2c462553a79635f13c6931eb1aae61f3c6ad8190794686711d4a0c33039f3c2e609d96bd7e8e420111d6369dabbe17f5a394d504cf702df5b97e5c15c9943b
-DIST zig-linux-x86-0.12.0.tar.xz.minisig 322 BLAKE2B 1cb63844ed396f698419f40cd86eef584f660be00c45f706f3887b1239eefe859572a5325a92620792351707647d2d98d0b5bdaa86200ba2fc78bb0c3c07493a SHA512 b1b8ae28c26ebee7323ab1c6638270e1f138bbf557a26fa931cdc877ef203e77f7f80f8f1d83a4da7f6786be5257f64961adbc8dd957571e074d21e520f04cef
 DIST zig-linux-x86-0.13.0.tar.xz 52062336 BLAKE2B 5f05db0719affaf17e3b6a7c5f87304f884736fbfa006ff1020254f8381d9f268b406d7f8d33e8a94a0533d40202a26b3fbfc6ae11bbe1b71319ba5d9d4d2a89 SHA512 f3db718d2a499a88ab9e497fb3995f3fdb0711842513697c609e3b8f2e835676854964dcfb77bc253158f278a9d21d158e2957e3dbaedce8dd0f948f09eaacdf
 DIST zig-linux-x86-0.13.0.tar.xz.minisig 322 BLAKE2B b95347c6899e064c77d1cbdafb18c705c6eb2c642d46965eb3953ae7f4515eee7d0b058fbbc24ce2f63d8e2ab124196170c850103f73cba2e54da03b24d0fe54 SHA512 e10f1598a68064137c669c7622ac06772b33a5fd17ea4fa65bb4ecd8b8c4f34a2a46ee397215bf82a3202cfffced91cd01fa3a52e0bba84829ff94aac3de1947
 DIST zig-linux-x86_64-0.10.1.tar.xz 44085596 BLAKE2B d689a469dbbe790593a561dd4df01c506212754c48be7de03773c7e690cbab197af10d639e80148f3343204ddf9ecfe09a88a62fb6ef63a262bcc2dd79fecd34 SHA512 1cf88a492b1a47800e213b8801477f4ffabf269f960d27d1849c5aec805b5db3768c83d4daa4a738532b1b7367e8c6812e3eea47c205ea732d7a6269a47e16dc
 DIST zig-linux-x86_64-0.10.1.tar.xz.minisig 325 BLAKE2B 41cf60ae99405ed55449c35e76a3de761e5de75bf07d8500fe64bf2e45b0dc5f63a929ff6bf47233ea0472f167d9e2305d66c48fbe3da66b6f1223d83ed6fa2b SHA512 309fe97b56673e4f111e2408aa1162194d77cd6976cf7ae491d3a035ef0319b8b634c59977dbc18466182b37d4a12f294d8c258d2d793a3aa3eced448f06e30e
-DIST zig-linux-x86_64-0.11.0.tar.xz 44961892 BLAKE2B b0780573dbd372c7a9efec32e6860050b15603a80e00e64757a6c09a02757febc14d3df32ff089f418996fb55bf6fb50774393037f86cbecd49f06c250e5bbe3 SHA512 992e49a28edc9bed44c124a887c4700e707c2eef6a6f3adb551c568103242c3a5304af00d95994a511670c2099f476aa5068eef538f6065afe9bc149c88887b9
-DIST zig-linux-x86_64-0.11.0.tar.xz.minisig 325 BLAKE2B 0278fff974f16bb871d75cfec796852cfe8102204467c3f9d55579534d3061b3048b295e6dcf1f69da806b6a7782fea8667995f11ad2e9e92070e136a954d6d3 SHA512 919badc20197be66be0d728a9f94f3adee67f262ddb626bcba5051fc01f521ae65ebc3c29ff96fd0c3fcf2ddf59e5f9c8a7a80a18db4f6e743601389e434faa5
-DIST zig-linux-x86_64-0.12.0.tar.xz 45480516 BLAKE2B 0529796b90dc1b8020327855c42d62d5eb58567f3f0fac42aa2b6c7c938c79455c8527d5d2fee33cd78a6815b55f8c61c554332ed1043c3ec87f0e20a89179f4 SHA512 f596bb1e5294edefcdfb31799b426714b18ca39dd3e058acade90590bd20598115ca0fae612f69892e2b66abf288964a442ea988bae69473168162ef72fc13ac
-DIST zig-linux-x86_64-0.12.0.tar.xz.minisig 325 BLAKE2B 4531c46c2fbdc43ed48c949e632023b20f5cc226f56529aef944770e8fde8d7a37c2332b44d5d5666c02bf36a0f14f187953a084a3e252057d32b9e2782dd687 SHA512 f61e9310cd75938e889a7c9f7c6bb5cfd1dd9d23c60c1033e48e95219c3dd15962c6686c60283997e3e83870f22a24c12e58381cf4e9fece37a0dcb4f62f9874
 DIST zig-linux-x86_64-0.13.0.tar.xz 47082308 BLAKE2B 587565eaac53f0137bdfb4c58e51ee290a9f582c103957bc1d6183e7f53f6ce459c204fd0197c0e36d3de08a48fc68412a7fc84cf9cd77c8be918a9390d492b9 SHA512 97ca9b91c6c025cc1746036239063df45bab6aafbe72a861acd266019a11d154b4710b310224c860c6515f09436ca0ff796546aa45cba5d1dc7b3b669dfcdf36
 DIST zig-linux-x86_64-0.13.0.tar.xz.minisig 325 BLAKE2B 9161b9b36c38c2b388a0850011bcc22119bb7b0333615914780fe63fb741298524be196db07277771b6f3f053079c7f95b5786dbb9059c4a627a9786752ebe4e SHA512 279cf9abb3b86893a3fd4ac124e954d8f01d6823831591cf2c869538bce4b2cbfcdb67279b9875bfe3a865841ca976b9fb7b4c4c63fe2b56937d3023664e81c6
diff --git a/dev-lang/zig-bin/files/zig-0.11.0-first-try-getconf.patch b/dev-lang/zig-bin/files/zig-0.11.0-first-try-getconf.patch
deleted file mode 100644
index 5a63e9e74ad9..000000000000
--- a/dev-lang/zig-bin/files/zig-0.11.0-first-try-getconf.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Eric Joldasov <bratishkaerik@getgoogleoff.me>
-
-Based on https://github.com/ziglang/zig/pull/12567 and https://github.com/ziglang/zig/pull/17671
-with small fixes, all ported to 0.11.0.
-
-First try `getconf GNU_LIBC_VERSION` to detect glibc version,
-If there are any errors, skip to the upstream logic.
-
-Also fix glibc version parsing: if version string does not contain third (patch) component, "std.SemanticVersion.parse" returns parsing error.
-For example, this currently happens with "GLIBC_2.37" or "glibc 2.37" inputs.
-To fix this, we use copy-pasted "std.zig.CrossTarget.parse" function here, that sets omitted patch component to 0.
-
-After applying this patch, both `zig build-exe --show-builtin` and `zig env` show correct version on my default/linux/amd64/17.1/desktop/plasma :
-glibc 2.37.
-
-Bug: https://bugs.gentoo.org/914731
-Bug: https://bugs.gentoo.org/914101
-
-diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig
-index 99a1a8f2e..0250db968 100644
---- a/lib/std/zig/system/NativeTargetInfo.zig
-+++ b/lib/std/zig/system/NativeTargetInfo.zig
-@@ -19,6 +19,32 @@ dynamic_linker: DynamicLinker = DynamicLinker{},
-
- pub const DynamicLinker = Target.DynamicLinker;
-
-+// Copy-pasted from `std.zig.CrossTarget.parse` to avoid introducing unexpected new public function as part of standard library.
-+/// Parses a version with an omitted patch component, such as "1.0",
-+/// which SemanticVersion.parse is not capable of.
-+fn parseWithOptionalPatchField(ver: []const u8) error{ InvalidVersion, Overflow }!std.SemanticVersion {
-+    const parseVersionComponent = struct {
-+        fn parseVersionComponent(component: []const u8) !usize {
-+            return std.fmt.parseUnsigned(usize, component, 10) catch |err| {
-+                switch (err) {
-+                    error.InvalidCharacter => return error.InvalidVersion,
-+                    error.Overflow => return error.Overflow,
-+                }
-+            };
-+        }
-+    }.parseVersionComponent;
-+    var version_components = mem.splitScalar(u8, ver, '.');
-+    const major = version_components.first();
-+    const minor = version_components.next() orelse return error.InvalidVersion;
-+    const patch = version_components.next() orelse "0";
-+    if (version_components.next() != null) return error.InvalidVersion;
-+    return .{
-+        .major = try parseVersionComponent(major),
-+        .minor = try parseVersionComponent(minor),
-+        .patch = try parseVersionComponent(patch),
-+    };
-+}
-+
- pub const DetectError = error{
-     FileSystem,
-     SystemResources,
-@@ -307,6 +333,39 @@ fn detectAbiAndDynamicLinker(
-     }
-     const ld_info_list = ld_info_list_buffer[0..ld_info_list_len];
-
-+    if (is_linux and !os_is_non_native and cross_target.glibc_version == null) try_getconf: {
-+        var buf: [4096]u8 = undefined;
-+        var fba = std.heap.FixedBufferAllocator.init(&buf);
-+        const allocator = fba.allocator();
-+
-+        const getconf = std.process.Child.exec(.{
-+            .allocator = allocator,
-+            .argv = &.{ "getconf", "GNU_LIBC_VERSION" },
-+            .max_output_bytes = 1024,
-+        }) catch break :try_getconf;
-+        if (!std.mem.startsWith(u8, getconf.stdout, "glibc ")) break :try_getconf;
-+        const version_string = std.mem.trim(u8, getconf.stdout["glibc ".len..], &std.ascii.whitespace);
-+        const glibc_version = parseWithOptionalPatchField(version_string) catch break :try_getconf;
-+
-+        var os_with_glibc = os;
-+        os_with_glibc.version_range.linux.glibc = glibc_version;
-+
-+        const target: Target = .{
-+            .cpu = cpu,
-+            .os = os_with_glibc,
-+            .abi = .gnu,
-+            .ofmt = cross_target.ofmt orelse Target.ObjectFormat.default(os_with_glibc.tag, cpu.arch),
-+        };
-+        const result: NativeTargetInfo = .{
-+            .target = target,
-+            .dynamic_linker = if (cross_target.dynamic_linker.get() == null)
-+                target.standardDynamicLinkerPath()
-+            else
-+                cross_target.dynamic_linker,
-+        };
-+        return result;
-+    }
-+
-     // Best case scenario: the executable is dynamically linked, and we can iterate
-     // over our own shared objects and find a dynamic linker.
-     const elf_file = blk: {
-@@ -563,7 +622,7 @@ fn glibcVerFromSoFile(file: fs.File) !std.SemanticVersion {
-     while (it.next()) |s| {
-         if (mem.startsWith(u8, s, "GLIBC_2.")) {
-             const chopped = s["GLIBC_".len..];
--            const ver = std.SemanticVersion.parse(chopped) catch |err| switch (err) {
-+            const ver = parseWithOptionalPatchField(chopped) catch |err| switch (err) {
-                 error.Overflow => return error.InvalidGnuLibCVersion,
-                 error.InvalidVersion => return error.InvalidGnuLibCVersion,
-             };
-@@ -586,7 +645,7 @@ fn glibcVerFromLinkName(link_name: []const u8, prefix: []const u8) !std.Semantic
-     }
-     // chop off "libc-" and ".so"
-     const link_name_chopped = link_name[prefix.len .. link_name.len - suffix.len];
--    return std.SemanticVersion.parse(link_name_chopped) catch |err| switch (err) {
-+    return parseWithOptionalPatchField(link_name_chopped) catch |err| switch (err) {
-         error.Overflow => return error.InvalidGnuLibCVersion,
-         error.InvalidVersion => return error.InvalidGnuLibCVersion,
-     };
diff --git a/dev-lang/zig-bin/zig-bin-0.11.0-r1.ebuild b/dev-lang/zig-bin/zig-bin-0.11.0-r1.ebuild
deleted file mode 100644
index eb8f8fb3b0c7..000000000000
--- a/dev-lang/zig-bin/zig-bin-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_METHOD=minisig
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
-inherit verify-sig
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-SRC_URI="
-	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
-	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
-	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
-	ppc? ( https://ziglang.org/download/${PV}/zig-linux-powerpc-${PV}.tar.xz )
-	ppc64? ( https://ziglang.org/download/${PV}/zig-linux-powerpc64le-${PV}.tar.xz )
-	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
-	x86? ( https://ziglang.org/download/${PV}/zig-linux-x86-${PV}.tar.xz )
-	verify-sig? (
-		amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz.minisig )
-		arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz.minisig )
-		arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz.minisig )
-		ppc? ( https://ziglang.org/download/${PV}/zig-linux-powerpc-${PV}.tar.xz.minisig )
-		ppc64? ( https://ziglang.org/download/${PV}/zig-linux-powerpc64le-${PV}.tar.xz.minisig )
-		riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz.minisig )
-		x86? ( https://ziglang.org/download/${PV}/zig-linux-x86-${PV}.tar.xz.minisig )
-	)
-"
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc"
-
-BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
-IDEPEND="app-eselect/eselect-zig"
-
-# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
-# and all other Zig libraries are meant to be consumed in source form,
-# because they can use compile-time mechanics (and it is easier for distributions to patch them)
-# Here we use this feature for fixing programs that use standard library
-# Note: Zig build system is also part of standard library, so we can fix it too
-PATCHES=(
-	"${FILESDIR}/zig-0.11.0-first-try-getconf.patch"
-)
-
-QA_PREBUILT="opt/${P}/zig"
-
-src_unpack() {
-	verify-sig_src_unpack
-
-	mv "${WORKDIR}/"* "${S}" || die
-}
-
-src_install() {
-	insinto /opt/
-
-	use doc && local HTML_DOCS=( "doc/langref.html" "doc/std/" )
-	einstalldocs
-	rm -r ./doc/ || die
-
-	doins -r "${S}"
-	fperms 0755 "/opt/${P}/zig"
-	dosym -r "/opt/${P}/zig" "/usr/bin/zig-bin-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset
-}
-
-pkg_postrm() {
-	eselect zig update ifunset
-}
diff --git a/dev-lang/zig-bin/zig-bin-0.12.0.ebuild b/dev-lang/zig-bin/zig-bin-0.12.0.ebuild
deleted file mode 100644
index 4c4e910205e9..000000000000
--- a/dev-lang/zig-bin/zig-bin-0.12.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
-
-VERIFY_SIG_METHOD=minisig
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
-inherit verify-sig
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-SRC_URI="
-	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
-	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
-	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
-	ppc64? ( https://ziglang.org/download/${PV}/zig-linux-powerpc64le-${PV}.tar.xz )
-	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
-	x86? ( https://ziglang.org/download/${PV}/zig-linux-x86-${PV}.tar.xz )
-	verify-sig? (
-		amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz.minisig )
-		arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz.minisig )
-		arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz.minisig )
-		ppc64? ( https://ziglang.org/download/${PV}/zig-linux-powerpc64le-${PV}.tar.xz.minisig )
-		riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz.minisig )
-		x86? ( https://ziglang.org/download/${PV}/zig-linux-x86-${PV}.tar.xz.minisig )
-	)
-"
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
-IDEPEND="app-eselect/eselect-zig"
-
-# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
-# and all other Zig libraries are meant to be consumed in source form,
-# because they can use compile-time mechanics (and it is easier for distributions to patch them)
-# Here we use this feature for fixing programs that use standard library
-# Note: Zig build system is also part of standard library, so we can fix it too
-PATCHES=()
-
-DOCS=( "README.md" )
-HTML_DOCS=( "doc/langref.html" )
-
-QA_PREBUILT="opt/${P}/zig"
-
-src_unpack() {
-	verify-sig_src_unpack
-
-	mv "${WORKDIR}/"* "${S}" || die
-}
-
-src_install() {
-	insinto /opt/
-
-	einstalldocs
-	rm README.md || die
-	rm -r ./doc/ || die
-
-	doins -r "${S}"
-	fperms 0755 "/opt/${P}/zig"
-	dosym -r "/opt/${P}/zig" "/usr/bin/zig-bin-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset
-
-	elog "Starting from 0.12.0, Zig no longer installs"
-	elog "precompiled standard library documentation."
-	elog "Instead, you can call \`zig std\` to compile it on-the-fly."
-	elog "It reflects all edits in standard library automatically."
-	elog "See \`zig std --help\` for more information."
-	elog "More technical details here: https://github.com/ziglang/zig/pull/19208"
-}
-
-pkg_postrm() {
-	eselect zig update ifunset
-}
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 538062fe0caf..6ab62b044f50 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,6 +1,2 @@
-DIST zig-0.11.0.tar.xz 15275316 BLAKE2B 603e4995a36d214ba71cf05b719a04732c8927995c8207ab8fdd574dca3410cdc5ccc8f6aa9964807afc04a5cbce1a3910a6cde4cf12e585cdf7684833217eb2 SHA512 c19a8ae6d440a16dd5e77941fc77c036d1f284f1784376625e63b65f30b4acad62f9f4217bc818c401f88c2c33f8722f26fc467c3e23c29a89178c4b1882d1c4
-DIST zig-0.11.0.tar.xz.minisig 312 BLAKE2B 8df407f07dde36280c945300fd8b803e6e59c026eb7a3eb56e6d2f4fe1047672e17946a3bbe23ccfe9be07b65331e17690e95fd348353be22f7b6d9b73b3f9ca SHA512 565dd1eacb7dd697e6b1ff54517adc1e4775d2523afaeb4f9a3dd404df871b187862211ecbbcf90b42e3a03853677fc1603e7fc8fc5ba7126a054679faa601ca
-DIST zig-0.12.0.tar.xz 17099152 BLAKE2B 2a1248302868156c4ddcb154d075af29886a95a4c29de02ff0981e76a85f5d4109dd5c38f95c2c16f5c942bab7d120ae068c1e122ab8ad421c0213b7e996956c SHA512 0c3d9396fea4905245c7e32ce6bd9b4ff140f061cd8a957929e4c84cf105f5bbcbf2e7c030013ac649edb569e909f65d928b3e8a86f35c9076fb62e996feea14
-DIST zig-0.12.0.tar.xz.minisig 312 BLAKE2B 4b3d1ae45d3b6d81054a39255c0892d9376d05da9ff1076bcf740310c9650b0154ddc39f19caee9dae293719d58a63764e43b694b83fe7031c87ab434aa377f5 SHA512 6e14c1e1926beeb249cb88fb2247ff401f679b64785c3ec8a924e33c894174deb77b48286469a863761bce0ca57524f904995eacf544919dda387c140e6e829e
 DIST zig-0.13.0.tar.xz 17220728 BLAKE2B f4bbacc2012950c556bebc28fc322fc6424bf20fe118e8362373336b6460e514028978584087f6e7f25ed8b8e6991610edce625676a1dd80c1975c5f9ef48775 SHA512 6f5f31f4ba71a11d8b16c7a5a613e124095e503fa6b02d2b77e5b177674c739287e81d98d96dc261fed24bc836caf196f71c3fcc7a6518387df86ba9e03df4dd
 DIST zig-0.13.0.tar.xz.minisig 312 BLAKE2B 2d061257c9c75f9c36b01cfb08dcd2040538a125b9ea2cae8617ae5496e685b165933ce8981494419522b7e19b51fc69a651ecaa4a8930753acf2e4ae3d6e00f SHA512 21c6139c06cba6c5e23a3305fed0c0f1b9b32d9140bd686c26365ce0279d5f53cd081894eaba29f0c1ed51b2e831edf7bd4ae6a7eaee5018a252e312e9b65507
diff --git a/dev-lang/zig/files/zig-0.11.0-first-try-getconf.patch b/dev-lang/zig/files/zig-0.11.0-first-try-getconf.patch
deleted file mode 100644
index 5a63e9e74ad9..000000000000
--- a/dev-lang/zig/files/zig-0.11.0-first-try-getconf.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Eric Joldasov <bratishkaerik@getgoogleoff.me>
-
-Based on https://github.com/ziglang/zig/pull/12567 and https://github.com/ziglang/zig/pull/17671
-with small fixes, all ported to 0.11.0.
-
-First try `getconf GNU_LIBC_VERSION` to detect glibc version,
-If there are any errors, skip to the upstream logic.
-
-Also fix glibc version parsing: if version string does not contain third (patch) component, "std.SemanticVersion.parse" returns parsing error.
-For example, this currently happens with "GLIBC_2.37" or "glibc 2.37" inputs.
-To fix this, we use copy-pasted "std.zig.CrossTarget.parse" function here, that sets omitted patch component to 0.
-
-After applying this patch, both `zig build-exe --show-builtin` and `zig env` show correct version on my default/linux/amd64/17.1/desktop/plasma :
-glibc 2.37.
-
-Bug: https://bugs.gentoo.org/914731
-Bug: https://bugs.gentoo.org/914101
-
-diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig
-index 99a1a8f2e..0250db968 100644
---- a/lib/std/zig/system/NativeTargetInfo.zig
-+++ b/lib/std/zig/system/NativeTargetInfo.zig
-@@ -19,6 +19,32 @@ dynamic_linker: DynamicLinker = DynamicLinker{},
-
- pub const DynamicLinker = Target.DynamicLinker;
-
-+// Copy-pasted from `std.zig.CrossTarget.parse` to avoid introducing unexpected new public function as part of standard library.
-+/// Parses a version with an omitted patch component, such as "1.0",
-+/// which SemanticVersion.parse is not capable of.
-+fn parseWithOptionalPatchField(ver: []const u8) error{ InvalidVersion, Overflow }!std.SemanticVersion {
-+    const parseVersionComponent = struct {
-+        fn parseVersionComponent(component: []const u8) !usize {
-+            return std.fmt.parseUnsigned(usize, component, 10) catch |err| {
-+                switch (err) {
-+                    error.InvalidCharacter => return error.InvalidVersion,
-+                    error.Overflow => return error.Overflow,
-+                }
-+            };
-+        }
-+    }.parseVersionComponent;
-+    var version_components = mem.splitScalar(u8, ver, '.');
-+    const major = version_components.first();
-+    const minor = version_components.next() orelse return error.InvalidVersion;
-+    const patch = version_components.next() orelse "0";
-+    if (version_components.next() != null) return error.InvalidVersion;
-+    return .{
-+        .major = try parseVersionComponent(major),
-+        .minor = try parseVersionComponent(minor),
-+        .patch = try parseVersionComponent(patch),
-+    };
-+}
-+
- pub const DetectError = error{
-     FileSystem,
-     SystemResources,
-@@ -307,6 +333,39 @@ fn detectAbiAndDynamicLinker(
-     }
-     const ld_info_list = ld_info_list_buffer[0..ld_info_list_len];
-
-+    if (is_linux and !os_is_non_native and cross_target.glibc_version == null) try_getconf: {
-+        var buf: [4096]u8 = undefined;
-+        var fba = std.heap.FixedBufferAllocator.init(&buf);
-+        const allocator = fba.allocator();
-+
-+        const getconf = std.process.Child.exec(.{
-+            .allocator = allocator,
-+            .argv = &.{ "getconf", "GNU_LIBC_VERSION" },
-+            .max_output_bytes = 1024,
-+        }) catch break :try_getconf;
-+        if (!std.mem.startsWith(u8, getconf.stdout, "glibc ")) break :try_getconf;
-+        const version_string = std.mem.trim(u8, getconf.stdout["glibc ".len..], &std.ascii.whitespace);
-+        const glibc_version = parseWithOptionalPatchField(version_string) catch break :try_getconf;
-+
-+        var os_with_glibc = os;
-+        os_with_glibc.version_range.linux.glibc = glibc_version;
-+
-+        const target: Target = .{
-+            .cpu = cpu,
-+            .os = os_with_glibc,
-+            .abi = .gnu,
-+            .ofmt = cross_target.ofmt orelse Target.ObjectFormat.default(os_with_glibc.tag, cpu.arch),
-+        };
-+        const result: NativeTargetInfo = .{
-+            .target = target,
-+            .dynamic_linker = if (cross_target.dynamic_linker.get() == null)
-+                target.standardDynamicLinkerPath()
-+            else
-+                cross_target.dynamic_linker,
-+        };
-+        return result;
-+    }
-+
-     // Best case scenario: the executable is dynamically linked, and we can iterate
-     // over our own shared objects and find a dynamic linker.
-     const elf_file = blk: {
-@@ -563,7 +622,7 @@ fn glibcVerFromSoFile(file: fs.File) !std.SemanticVersion {
-     while (it.next()) |s| {
-         if (mem.startsWith(u8, s, "GLIBC_2.")) {
-             const chopped = s["GLIBC_".len..];
--            const ver = std.SemanticVersion.parse(chopped) catch |err| switch (err) {
-+            const ver = parseWithOptionalPatchField(chopped) catch |err| switch (err) {
-                 error.Overflow => return error.InvalidGnuLibCVersion,
-                 error.InvalidVersion => return error.InvalidGnuLibCVersion,
-             };
-@@ -586,7 +645,7 @@ fn glibcVerFromLinkName(link_name: []const u8, prefix: []const u8) !std.Semantic
-     }
-     // chop off "libc-" and ".so"
-     const link_name_chopped = link_name[prefix.len .. link_name.len - suffix.len];
--    return std.SemanticVersion.parse(link_name_chopped) catch |err| switch (err) {
-+    return parseWithOptionalPatchField(link_name_chopped) catch |err| switch (err) {
-         error.Overflow => return error.InvalidGnuLibCVersion,
-         error.InvalidVersion => return error.InvalidGnuLibCVersion,
-     };
diff --git a/dev-lang/zig/zig-0.11.0-r1.ebuild b/dev-lang/zig/zig-0.11.0-r1.ebuild
deleted file mode 100644
index 8114e11a4f79..000000000000
--- a/dev-lang/zig/zig-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-inherit edo cmake llvm check-reqs toolchain-funcs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	VERIFY_SIG_METHOD=minisig
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
-	inherit verify-sig
-
-	SRC_URI="
-		https://ziglang.org/download/${PV}/${P}.tar.xz
-		verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
-	"
-	KEYWORDS="~amd64 ~arm ~arm64"
-
-	BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
-fi
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-
-IDEPEND="app-eselect/eselect-zig"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
-
-# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
-# Zig uses self-hosted compiler only
-CHECKREQS_MEMORY="4G"
-
-PATCHES=(
-	"${FILESDIR}/zig-0.11.0-first-try-getconf.patch"
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-ctarget_to_zigtarget() {
-	# Zig's Target Format: arch-os-abi
-	local CTARGET="${CTARGET:-${CHOST}}"
-
-	local ZIG_ARCH
-	case "${CTARGET%%-*}" in
-		i?86)		ZIG_ARCH=x86;;
-		sparcv9)	ZIG_ARCH=sparc64;;
-		*)		ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
-	esac
-
-	local ZIG_OS
-	case "${CTARGET}" in
-		*linux*)	ZIG_OS=linux;;
-		*apple*)	ZIG_OS=macos;;
-	esac
-
-	local ZIG_ABI
-	case "${CTARGET##*-}" in
-		gnu)		ZIG_ABI=gnu;;
-		solaris*)	ZIG_OS=solaris ZIG_ABI=none;;
-		darwin*)	ZIG_ABI=none;;
-		*)		ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
-	esac
-
-	echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
-
-get_zig_mcpu() {
-	local ZIG_DEFAULT_MCPU=native
-	tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
-	echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
-}
-
-get_zig_target() {
-	local ZIG_DEFAULT_TARGET=native
-	tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
-	echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	# Useful for debugging and a little bit more deterministic.
-	export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
-	export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
-
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_SHARED_LLVM=ON
-		-DZIG_TARGET_TRIPLE="$(get_zig_target)"
-		-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-		-DZIG_USE_LLVM_CONFIG=ON
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	"${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
-
-	if use doc; then
-		cd "${BUILD_DIR}" || die
-		edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
-		edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
-		-Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
-	local ZIG_TEST_STEPS=(
-		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
-		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
-		test-run-translated-c test-std
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
-	done
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
-	cmake_src_install
-
-	cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
-	mv lib/zig/ lib2/ || die
-	rm -rf lib/ || die
-	mv lib2/ lib/ || die
-	dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset
-}
-
-pkg_postrm() {
-	eselect zig update ifunset
-}
diff --git a/dev-lang/zig/zig-0.12.0.ebuild b/dev-lang/zig/zig-0.12.0.ebuild
deleted file mode 100644
index 2b89e41832af..000000000000
--- a/dev-lang/zig/zig-0.12.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=17
-inherit edo cmake llvm check-reqs toolchain-funcs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	VERIFY_SIG_METHOD=minisig
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
-	inherit verify-sig
-
-	SRC_URI="
-		https://ziglang.org/download/${PV}/${P}.tar.xz
-		verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
-	"
-	KEYWORDS="~amd64 ~arm ~arm64"
-
-	BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
-fi
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-
-IDEPEND="app-eselect/eselect-zig"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
-
-# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
-# Zig uses self-hosted compiler only
-CHECKREQS_MEMORY="4G"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-ctarget_to_zigtarget() {
-	# Zig's Target Format: arch-os-abi
-	local CTARGET="${CTARGET:-${CHOST}}"
-
-	local ZIG_ARCH
-	case "${CTARGET%%-*}" in
-		i?86)		ZIG_ARCH=x86;;
-		sparcv9)	ZIG_ARCH=sparc64;;
-		*)		ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
-	esac
-
-	local ZIG_OS
-	case "${CTARGET}" in
-		*linux*)	ZIG_OS=linux;;
-		*apple*)	ZIG_OS=macos;;
-	esac
-
-	local ZIG_ABI
-	case "${CTARGET##*-}" in
-		gnu)		ZIG_ABI=gnu;;
-		solaris*)	ZIG_OS=solaris ZIG_ABI=none;;
-		darwin*)	ZIG_ABI=none;;
-		*)		ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
-	esac
-
-	echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
-
-get_zig_mcpu() {
-	local ZIG_DEFAULT_MCPU=native
-	tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
-	echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
-}
-
-get_zig_target() {
-	local ZIG_DEFAULT_TARGET=native
-	tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
-	echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	# Useful for debugging and a little bit more deterministic.
-	export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
-	export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
-
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_SHARED_LLVM=ON
-		-DZIG_TARGET_TRIPLE="$(get_zig_target)"
-		-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-		-DZIG_USE_LLVM_CONFIG=ON
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	"${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
-
-	if use doc; then
-		cd "${BUILD_DIR}" || die
-		edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
-		edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \
-		-Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
-	local ZIG_TEST_STEPS=(
-		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
-		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
-		test-run-translated-c test-std
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
-	done
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
-	cmake_src_install
-
-	cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
-	mv lib/zig/ lib2/ || die
-	rm -rf lib/ || die
-	mv lib2/ lib/ || die
-	dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset
-}
-
-pkg_postrm() {
-	eselect zig update ifunset
-}
diff --git a/dev-libs/appstream/appstream-1.0.3.ebuild b/dev-libs/appstream/appstream-1.0.3.ebuild
index e59ebce431a1..054b35ba7728 100644
--- a/dev-libs/appstream/appstream-1.0.3.ebuild
+++ b/dev-libs/appstream/appstream-1.0.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 8018bcb43871..2f651ffe3950 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1 +1,2 @@
 DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
+DIST apr-1.7.5.tar.bz2 898264 BLAKE2B 1feacb24e213843c4d3312806abf698e332c45557b7cfd74c9c654d4f9d835dd3a8bf4f9a3bb8328483dcc244948ca118ed6fab9655e482ac6fb53cc7fd92908 SHA512 d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b
diff --git a/dev-libs/apr/apr-1.7.5.ebuild b/dev-libs/apr/apr-1.7.5.ebuild
new file mode 100644
index 000000000000..a7f6b6d58e1d
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.5.ebuild
@@ -0,0 +1,163 @@
+# 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="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom valgrind"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+	virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-base-policy )
+"
+DEPEND+=" valgrind? ( dev-debug/valgrind )"
+BDEPEND="
+	>=dev-build/libtool-2.4.2
+	doc? ( app-text/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
+	"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+	"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+	"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+	"${FILESDIR}"/${PN}-1.7.4-config-cross.patch
+	"${FILESDIR}"/${PN}-1.7.4-config-libdir.patch
+	"${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+	tc-export AS CC CPP
+
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	export CONFIG_SHELL="${EPREFIX}"/bin/bash
+	export ac_cv_path_SED="sed"
+	export ac_cv_path_EGREP="grep -E"
+	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+	export ac_cv_path_FGREP="grep -F"
+	export ac_cv_path_GREP="grep"
+	export ac_cv_path_lt_DD="dd"
+
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		$(use_with valgrind)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	if use old-kernel; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_mmap__dev_zero="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	# Avoid libapr containing undefined references (underlinked)
+	# undefined reference to `__sync_val_compare_and_swap_8'
+	# (May be possible to fix via libatomic linkage in future?)
+	# bug #740464
+	append-atomic-flags
+	if use x86 || [[ ${LIBS} == *atomic* ]] ; then
+		myconf+=( --disable-nonportable-atomics )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake all $(usev doc dox)
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
diff --git a/dev-libs/argtable/argtable-2.13-r3.ebuild b/dev-libs/argtable/argtable-2.13-r3.ebuild
deleted file mode 100644
index bbd3be201745..000000000000
--- a/dev-libs/argtable/argtable-2.13-r3.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
-
-MY_PV="$(ver_rs 1 '-')"
-MY_P=${PN}${MY_PV}
-
-DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss"
-HOMEPAGE="https://argtable.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="doc debug examples static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.13-Fix-implicit-function-declaration.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/
-
-	if use doc ; then
-		cd "${S}"/doc || die
-		dodoc *.pdf *.ps
-		docinto html
-		dodoc *.html *.gif
-	fi
-
-	if use examples ; then
-		cd "${S}"/example || die
-		docinto examples
-		dodoc Makefile *.[ch] README.txt
-	fi
-
-	find "${ED}" -name "*.la" -delete || die "failed to delete .la files"
-}
diff --git a/dev-libs/ayatana-ido/Manifest b/dev-libs/ayatana-ido/Manifest
index 899dbf27f4e3..00451e0ccc98 100644
--- a/dev-libs/ayatana-ido/Manifest
+++ b/dev-libs/ayatana-ido/Manifest
@@ -1,2 +1,3 @@
 DIST ayatana-ido-0.10.2.tar.gz 137434 BLAKE2B dee5d048c05ea7eced96896abd0bdad804b6d2f9f7b03b01b8839a433bec7bb7da64c57f2ce2128e4d6044d3608b73ba6ed984f464a436ba6f8ac4cc8a949025 SHA512 c4d143a93331984758755b3c8b2c5dc92a07bccf8994ebaa24688ceec52b32049677144045817686210594df961e49eee90ff0ede5905153950eb2a9d20605c5
+DIST ayatana-ido-0.10.4.tar.gz 137966 BLAKE2B 02b7de508de1e5463895fe7bed002e1cdb2b9c6a5142f240cfa7cd7dfa6b4f404f3fdb5f063352be3338ddac2e890eea2cec67b4a1cf0811b9d915231f23d2d2 SHA512 a36b67cb505b9340a8193e281c72831b56d6a620054e99e1032145ec0d8d26fe4768402b36ee4d7e115dbbd6fb393cc15c3d71c15d040f5eb22d3d2114f80536
 DIST ayatana-ido-0.9.3.tar.gz 122912 BLAKE2B 80c07c6f90b7e2b6d68c2629990918f091abdc85616cbf472dbcc1bbea87dabb9649d8da4d676f1acbc65c34e5a5b53143449759a0d65661352898199c1ea592 SHA512 61c9fe35be9dceabba3d61add0fa51cf0447572dbedf48f710b79cf9c4fed2a049f6d2c0069ae8499aa41f008e736e257da47c6b07fd4e20778689c9ab6853d4
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild
index 9ba002fe8538..b0ff811aa2bf 100644
--- a/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild
+++ b/dev-libs/ayatana-ido/ayatana-ido-0.10.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58:2
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild
new file mode 100644
index 000000000000..5514c4a19f1c
--- /dev/null
+++ b/dev-libs/ayatana-ido/ayatana-ido-0.10.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake vala virtualx
+
+DESCRIPTION="Ayatana Application Indicators (Shared Library)"
+HOMEPAGE="https://github.com/AyatanaIndicators/ayatana-ido"
+SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.24:3[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	vala_setup
+}
+
+src_configure() {
+	local mycmakeargs+=(
+		-DVALA_COMPILER="${VALAC}"
+		-DVAPI_GEN="${VAPIGEN}"
+		-DENABLE_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild b/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..9ffb25cf41d1
--- /dev/null
+++ b/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bitshuffle C library"
+HOMEPAGE="https://github.com/kiyo-masui/bitshuffle"
+SRC_URI="https://github.com/kiyo-masui/bitshuffle/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	app-arch/lz4
+"
+
+RDEPEND="
+	app-arch/lz4
+"
+
+src_prepare() {
+	cp "${FILESDIR}/${P}-Makefile" "Makefile" || die "Failed to copy Makefile"
+	default
+}
+
+src_configure() {
+	tc-export CC
+	export PACKAGE_VERSION="${PV}"
+}
+
+src_install() {
+	local prefix="${EPREFIX}/usr"
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${prefix}" \
+		LIBDIR="${prefix}/$(get_libdir)" \
+		install
+}
diff --git a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild b/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
deleted file mode 100644
index 964fad44dbd0..000000000000
--- a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Bitshuffle C library"
-HOMEPAGE="https://github.com/kiyo-masui/bitshuffle"
-SRC_URI="https://github.com/kiyo-masui/bitshuffle/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	app-arch/lz4
-"
-
-src_prepare() {
-	cp "${FILESDIR}/${P}-Makefile" "Makefile" || die "Failed to copy Makefile"
-	default
-}
-
-src_configure() {
-	tc-export CC
-	export PACKAGE_VERSION="${PV}"
-}
-
-src_install() {
-	local prefix="${EPREFIX}/usr"
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${prefix}" \
-		LIBDIR="${prefix}/$(get_libdir)" \
-		install
-}
diff --git a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
index f38d0cc5f149..6ccea469dbae 100644
--- a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
+++ b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile
@@ -26,8 +26,10 @@ OBJS = \
 	src/bitshuffle_core.o \
 	src/iochain.o
 
+LIBS := -llz4
+
 $(SOFILE): $(OBJS)
-	$(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^
+	$(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^ $(LIBS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -Isrc -c $< -o $@
diff --git a/dev-libs/blake3/blake3-1.5.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild
index 0909ad2023ce..abcd89da9ef0 100644
--- a/dev-libs/blake3/blake3-1.5.1.ebuild
+++ b/dev-libs/blake3/blake3-1.5.1.ebuild
@@ -12,4 +12,4 @@ S="${WORKDIR}/BLAKE3-${PV}/c"
 
 LICENSE="|| ( CC0-1.0 Apache-2.0 )"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-libs/blake3/blake3-1.5.3.ebuild b/dev-libs/blake3/blake3-1.5.3.ebuild
index db981ccc1f0b..0ba7393b5b61 100644
--- a/dev-libs/blake3/blake3-1.5.3.ebuild
+++ b/dev-libs/blake3/blake3-1.5.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/BLAKE3-${PV}/c"
 
 LICENSE="|| ( CC0-1.0 Apache-2.0 )"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PATCHES=( "${FILESDIR}/${PN}-1.5.3-backport-pr405.patch" )
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 48f0e20f3193..47f740ee7fe7 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,2 +1,3 @@
 DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497
 DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0
+DIST boost_1_86_0.tar.bz2 126220652 BLAKE2B de3d262e3dc174813e8e9abc8fb083ae101949dbd3b818b1114457497607085dc998f6f0fdd095a87c38c90700761c825ce239b082144389507c0fec77d527dd SHA512 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75
diff --git a/dev-libs/boost/boost-1.86.0.ebuild b/dev-libs/boost/boost-1.86.0.ebuild
new file mode 100644
index 000000000000..b07536311205
--- /dev/null
+++ b/dev-libs/boost/boost-1.86.0.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on both of these after releases for patches:
+# * https://www.boost.org/patches/
+# * https://www.boost.org/users/history/version_${MY_PV}.html
+# (e.g. https://www.boost.org/users/history/version_1_83_0.html)
+# Note that the latter may sometimes feature patches not on the former too.
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy:=[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-build/b2-5.0.0"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
+	"${FILESDIR}"/${PN}-1.85.0-bcp-filesystem.patch
+	"${FILESDIR}"/${PN}-1.85.0-python-numpy-2.patch
+)
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	compiler="gcc"
+	compiler_version="$(gcc-version)"
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CPPFLAGS} ${CFLAGS}" <cxxflags>"${CPPFLAGS} ${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
+		${mpi_configuration}
+	__EOF__
+
+	if multilib_native_use python; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if multilib_native_use python && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if multilib_native_use python; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	# We don't want to end up with -L/usr/lib on our linker lines
+	# which then gives us lots of
+	#   skipping incompatible /usr/lib/libc.a when searching for -lc
+	# warnings
+	[[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off')
+		$(usev !mpi --without-mpi)
+		$(usev !nls --without-locale)
+		$(usev !context '--without-context --without-coroutine --without-fiber')
+		$(usev !stacktrace --without-stacktrace)
+		--boost-build="${BROOT}"/usr/share/b2/src
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=shared
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+		boost.stacktrace.from_exception=off
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++17 globally as of 1.80
+	append-cxxflags -std=c++17
+
+	if [[ ${CHOST} != *-darwin* ]]; then
+		# On modern macOS, file I/O is already 64-bit by default,
+		# there's no support for special options like O_LARGEFILE.
+		# Thus, LFS must be disabled.
+		#
+		# On other systems, we need to enable LFS explicitly for 64-bit
+		# offsets on 32-bit hosts (#894564)
+		append-lfs-flags
+	fi
+}
+
+multilib_src_compile() {
+	ejam \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if multilib_native_use tools; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	if multilib_native_use tools; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				# these paths look like this:
+				# bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/
+				#  threadapi-pthread/threading-multi/visibility-hidden/
+				#  libboost_thread.dylib
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					# strip path prefix from references, so we obtain
+					# something like libboost_thread.dylib.
+					local r_basename=${r##*/}
+
+					ebegin "    correcting reference to ${r_basename}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r_basename}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+pkg_preinst() {
+	# Yay for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the Boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild
index c438862e8a0c..cb6cc74043db 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.15.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test +zlib +zstd"
 REQUIRED_USE="test? ( zlib zstd )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 0262b03d1652..1084fc4eb661 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1 +1,2 @@
 DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0 SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
+DIST capstone-5.0.3.tar.gz 7650875 BLAKE2B 3750964a95cbaba685dfb5cf511f12d18f2c157fb622a15c4615734987b8a49ffacf021457f36302606ccf9055e45a7fc56af000b8f09df467922896b431537c SHA512 2fd3194dd37065e6091d208c7670b12c0ca6872931eef794bd6b2dd624601c843e8ee6c5714eae0372e394e91a9bc1e4de7dfea6b1087542dd461226569101de
diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild b/dev-libs/capstone/capstone-5.0.1.ebuild
index b16146234667..0f09dd8b9584 100644
--- a/dev-libs/capstone/capstone-5.0.1.ebuild
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
diff --git a/dev-libs/capstone/capstone-5.0.3.ebuild b/dev-libs/capstone/capstone-5.0.3.ebuild
new file mode 100644
index 000000000000..010a1343b07a
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="https://www.capstone-engine.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git"
+	EGIT_REPO_BRANCH="next"
+else
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+BDEPEND="${DISTUTILS_DEPS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.2-tests.patch"
+)
+
+if [[ ${PV} == *_rc* ]]; then
+	# Upstream doesn't flag release candidates (bug 858350)
+	QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+	local phase=$1
+	shift
+
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${phase} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	tc-export RANLIB
+	cmake_src_prepare
+
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCAPSTONE_BUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_test() {
+	cmake_src_test
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	wrap_python ${FUNCNAME}
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
+
+python_test() {
+	emake check
+}
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
index ae151ecdb8fb..ce469dd82485 100644
--- a/dev-libs/capstone/capstone-9999.ebuild
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
@@ -21,7 +21,7 @@ else
 	MY_PV="${PV/_rc/-rc}"
 	SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-libs/capstone/files/capstone-5.0.2-tests.patch b/dev-libs/capstone/files/capstone-5.0.2-tests.patch
new file mode 100644
index 000000000000..37ec431fb70b
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-5.0.2-tests.patch
@@ -0,0 +1,17 @@
+From b77714b446e93a0ab997b125ef1fb3ad9bc4bb9b Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Wed, 14 Aug 2024 23:28:45 +0200
+Subject: [PATCH] Fix 'make check' for python tests
+Upstream: https://github.com/capstone-engine/capstone/pull/2439
+
+--- a/bindings/python/Makefile
++++ b/bindings/python/Makefile
+@@ -41,7 +41,7 @@ TESTS += test_lite.py test_iter.py test_customized_mnem.py test_alpha.py
+ check:
+ 	@for t in $(TESTS); do \
+ 		echo Check $$t ... ; \
+-		./$$t > /dev/null; \
++		./tests/$$t > /dev/null; \
+ 		if [ $$? -eq 0 ]; then echo OK; else echo FAILED; exit 1; fi \
+ 	done
+ 
diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest
index 4efa452541be..0575492df556 100644
--- a/dev-libs/castxml/Manifest
+++ b/dev-libs/castxml/Manifest
@@ -1,2 +1 @@
-DIST CastXML-0.6.7.tar.gz 122608 BLAKE2B 04d10c34131fac97382fe33b1cfd8e65d62ce1339cb8eb253d867500f777346f352dfb9ff061c8e18be961ea9b7aeb86aef1d9c35d8f7e78687124e560bef435 SHA512 31acd05e15e44f64a92c47bbef13115d26e17488a111e5b2bb32bf6191c4555e8f7e380489ab9d6e52060285e25088f41253ba46f4eb95b6ec11e5c63412442f
 DIST CastXML-0.6.8.tar.gz 122609 BLAKE2B 3266535a2f08e4aa3c344f2d26cb0b98ba5d3736036ba95face5a603bbc9547a53647892e1f11cf748d954c556bec2099a734a9b9e566254186e9765c0410413 SHA512 7645286ef7fe89ebd1d582a289f9446a96f9aa6db89539314cc2a77bd005ca203d0346f5b4f7d14b83baefc41e0a2a8e55585b429985777cff6c3c0ffc1ef6ce
diff --git a/dev-libs/castxml/castxml-0.6.7.ebuild b/dev-libs/castxml/castxml-0.6.7.ebuild
deleted file mode 100644
index 4334249f655f..000000000000
--- a/dev-libs/castxml/castxml-0.6.7.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
-
-LLVM_COMPAT=( {17..19} )
-
-inherit cmake llvm-r1
-
-MY_P=CastXML-${PV}
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="
-	https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
-	')
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	man? ( dev-python/sphinx )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCastXML_INSTALL_DOC_DIR="share/doc/${PF}"
-		-DCastXML_INSTALL_MAN_DIR="share/man"
-		-DSPHINX_MAN="$(usex man)"
-		-DSPHINX_HTML=OFF
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# Regex doesn't match the full build path
-		cmd.input-missing
-		cmd.rsp-missing
-
-		# Gets confused by extra #defines we set for hardening etc (bug #891813)
-		cmd.cc-gnu-src-cxx-E
-		cmd.cc-gnu-src-cxx-cmd
-		cmd.cc-gnu-c-src-c-E
-		cmd.cc-gnu-c-src-c-cmd
-	)
-
-	cmake_src_test
-}
diff --git a/dev-libs/castxml/castxml-0.6.8.ebuild b/dev-libs/castxml/castxml-0.6.8.ebuild
index 894410252a94..4334249f655f 100644
--- a/dev-libs/castxml/castxml-0.6.8.ebuild
+++ b/dev-libs/castxml/castxml-0.6.8.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="+man test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index bb5ecf9baa14..d2251d98c4d6 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/cgreen/metadata.xml b/dev-libs/cgreen/metadata.xml
index 57fde7f7698b..096360b6ba9f 100644
--- a/dev-libs/cgreen/metadata.xml
+++ b/dev-libs/cgreen/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>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">cgreen-devs/cgreen</remote-id>
 	</upstream>
diff --git a/dev-libs/confuse/confuse-3.3-r1.ebuild b/dev-libs/confuse/confuse-3.3-r1.ebuild
deleted file mode 100644
index 9d7232703654..000000000000
--- a/dev-libs/confuse/confuse-3.3-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=7
-inherit multilib-minimal flag-o-matic
-
-DESCRIPTION="a configuration file parser library"
-HOMEPAGE="https://github.com/libconfuse/libconfuse"
-SRC_URI="https://github.com/libconfuse/libconfuse/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/2.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-IUSE="nls static-libs"
-
-BDEPEND="
-	app-alternatives/lex
-	dev-build/libtool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# https://github.com/libconfuse/libconfuse/pull/167
-	append-lfs-flags
-
-	# examples are normally compiled but not installed. They
-	# fail during a mingw crosscompile.
-	local ECONF_SOURCE=${BUILD_DIR}
-	econf \
-		--enable-shared \
-		--disable-examples \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	doman doc/man/man3/*.3
-	dodoc -r doc/html
-
-	docinto examples
-	dodoc examples/*.{c,conf}
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild
deleted file mode 100644
index 9d524b6a484b..000000000000
--- a/dev-libs/confuse/confuse-3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="a configuration file parser library"
-HOMEPAGE="https://github.com/libconfuse/libconfuse"
-SRC_URI="https://github.com/libconfuse/libconfuse/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/2.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-IUSE="nls static-libs"
-
-BDEPEND="
-	app-alternatives/lex
-	dev-build/libtool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# examples are normally compiled but not installed. They
-	# fail during a mingw crosscompile.
-	local ECONF_SOURCE=${BUILD_DIR}
-	econf \
-		--enable-shared \
-		--disable-examples \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	doman doc/man/man3/*.3
-	dodoc -r doc/html
-
-	docinto examples
-	dodoc examples/*.{c,conf}
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/crypto++/crypto++-8.9.0.ebuild b/dev-libs/crypto++/crypto++-8.9.0.ebuild
index f8876e39738b..ff53d102d69b 100644
--- a/dev-libs/crypto++/crypto++-8.9.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,11 @@ DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="
 	https://www.cryptopp.com/cryptopp${PV//.}.zip
-	verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )
+	https://github.com/weidai11/cryptopp/releases/download/CRYPTOPP_${PV//./_}/cryptopp${PV//.}.zip
+	verify-sig? (
+		https://cryptopp.com/cryptopp${PV//.}.zip.sig
+		https://github.com/weidai11/cryptopp/releases/download/CRYPTOPP_${PV//./_}/cryptopp${PV//.}.zip.sig
+	)
 "
 
 S="${WORKDIR}"
diff --git a/dev-libs/cudnn-frontend/Manifest b/dev-libs/cudnn-frontend/Manifest
index 87fb519735df..5abdb5da3981 100644
--- a/dev-libs/cudnn-frontend/Manifest
+++ b/dev-libs/cudnn-frontend/Manifest
@@ -3,3 +3,4 @@ DIST cudnn-frontend-0.7.3.tar.gz 18685637 BLAKE2B 77ce32fb84cca43a431c6ad0d7be96
 DIST cudnn-frontend-0.9.2.tar.gz 18582081 BLAKE2B d8611231f73f3716bca8c2d851439355121ca2460dd46cf8149632fa53094b7b2a2e9d6840dfcd2c1da113f8b6f06c15559c90c6c5333b36d5c29bd9997733e1 SHA512 0cc326e8395183ab3bc2d90a2155a80318daa9c1d6b30522efc42716bd7000ba036d802a8080a1a6a1f3c017a514f2bed936df57a7cab92c8fcd0136f4312912
 DIST cudnn-frontend-1.0.3.tar.gz 423596 BLAKE2B a7bf970dac5e9977a1c80609cdd169ec5764f366880030329372ec0ac49668ddf67ee33a4a19df6b9f799832fa857f62f94e27ea055f3549ac209ab9f564c28a SHA512 2ad346c52e03589e9edcc0ef8ee0fe48fdc6f73aa8136f9f3729796d5ce60718b486fc8a1036fbdcee2cc899c633a11f1fce9204417a0fb14333a4b51a749db0
 DIST cudnn-frontend-1.1.2.tar.gz 436616 BLAKE2B 9749219fd176fa8eba50e3ab6c63940dce95a095a850bfd9747f47cc91e077792c184d8d0629be31865eab6d6cda627c948de744d5f6d6d9522c1a91931d26f5 SHA512 88407f75ec82c2e04fe72148090f0f56a56a088dccd6beab850df6f761ad8ed7527391c80e667dd2073b8313d0416dbd28eca92dd18a538a3fdbc420c13f552c
+DIST cudnn-frontend-1.4.0.tar.gz 607171 BLAKE2B 2c90239d7aad6a346c40c4a41b2bdfacc4717df020b9e845135068eec8f2043a6096b2d398d8ee46e05e5936ab5c4fe2529a5432083cdf00456ed11842591b43 SHA512 36026e4d2da2d7287dcdd4a4e0c9516ecc6b954a0dc11f115678e85280a223f557b420f1760ed6efa85acf3b0c3bcba82befb3d8c761a4989e73ddcdbbef8e79
diff --git a/dev-libs/cudnn-frontend/cudnn-frontend-1.4.0.ebuild b/dev-libs/cudnn-frontend/cudnn-frontend-1.4.0.ebuild
new file mode 100644
index 000000000000..10648668e6c9
--- /dev/null
+++ b/dev-libs/cudnn-frontend/cudnn-frontend-1.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A c++ wrapper for the cudnn backend API"
+HOMEPAGE="https://github.com/NVIDIA/cudnn-frontend"
+SRC_URI="https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/8"
+KEYWORDS="~amd64"
+
+RDEPEND="=dev-libs/cudnn-8*"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /opt/cuda/targets/x86_64-linux
+	doins -r include
+}
diff --git a/dev-libs/cxxopts/cxxopts-3.2.0-r1.ebuild b/dev-libs/cxxopts/cxxopts-3.2.0-r1.ebuild
index 4bc7e2b2a15f..bc1006c6538a 100644
--- a/dev-libs/cxxopts/cxxopts-3.2.0-r1.ebuild
+++ b/dev-libs/cxxopts/cxxopts-3.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="icu test"
 
 RESTRICT="
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild
index 395775bc63fb..974da3e78d17 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild
@@ -60,6 +60,9 @@ src_prepare() {
 src_configure() {
 	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
+	# Fails with C23 because of decls
+	append-flags -std=gnu17
+
 	# -Werror=lto-type-mismatch
 	# https://bugs.gentoo.org/894684
 	# https://github.com/cyrusimap/cyrus-sasl/pull/771
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
new file mode 100644
index 000000000000..865f1a93f44c
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use systemd toolchain-funcs tmpfiles
+
+SASLAUTHD_CONF_VER="2.1.26"
+MY_PATCH_VER="${PN}-2.1.28-r4-patches"
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~grobian/distfiles/${MY_PATCH_VER}.tar.xz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+REQUIRED_USE="ldapdb? ( openldap )"
+
+# See bug #855890 for sys-libs/db slot
+DEPEND="net-mail/mailbase
+	virtual/libcrypt:=
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:4.8[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+	pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sasl )"
+BDEPEND="virtual/libcrypt
+	berkdb? ( >=sys-libs/db-4.8.30-r1:4.8 )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+	"${WORKDIR}"/${MY_PATCH_VER}/
+)
+
+src_prepare() {
+	default
+
+	# Use plugindir for sasldir
+	# https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think)
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28)
+	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# Fails with C23 because of decls
+	append-flags -std=gnu17
+
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/894684
+	# https://github.com/cyrusimap/cyrus-sasl/pull/771
+	#
+	# Fixed upstream in git master but not released.
+	use srp && filter-lto
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# getpassphrase is defined in /usr/include/stdlib.h
+		append-cppflags -DHAVE_GETPASSPHRASE
+	else
+		# this horrendously breaks things on Solaris
+		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+		# replaces BSD_SOURCE (bug #579218)
+		append-cppflags -D_DEFAULT_SOURCE
+	fi
+
+	multilib-minimal_src_configure
+
+	if ( use berkdb || use gdbm ) && tc-is-cross-compiler ; then
+		mkdir -p "${WORKDIR}"/${P}-build || die
+		cd "${WORKDIR}"/${P}-build || die
+		# We don't care which berkdb version is used as this build is only
+		# temporary for generating an empty sasldb2 later.
+		ECONF_SOURCE="${S}" econf_build \
+			--with-dblib=$(usex berkdb berkeley gdbm)
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2"
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		--with-sphinx-build=no
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}/usr/$(get_libdir)/postgresql")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)")
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myeconfargs+=( --enable-sql )
+	else
+		myeconfargs+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myeconfargs+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myeconfargs+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myeconfargs+=( --with-dblib=none )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if ( use berkdb || use gdbm ) && tc-is-cross-compiler ; then
+		emake -C "${WORKDIR}"/${P}-build
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		dosbin saslauthd/testsaslauthd
+		keepdir /etc/sasl2
+
+		if use berkdb || use gdbm ; then
+			einfo "Generating an empty sasldb2 ..."
+			tc-is-cross-compiler && { cd "${WORKDIR}"/${P}-build || die; }
+			export SASL_PATH=./plugins/.libs
+
+			./utils/saslpasswd2 -f "${ED}"/etc/sasl2/sasldb2-empty -p login <<< p \
+				|| die "Failed to generate sasldb2"
+
+			./utils/saslpasswd2 -f "${ED}"/etc/sasl2/sasldb2-empty -d login \
+				|| die "Failed to delete temp user"
+
+			fowners root:mail /etc/sasl2/sasldb2-empty
+			fperms 0640 /etc/sasl2/sasldb2-empty
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	doman man/*
+
+	# Reset docinto to default value (bug #674296)
+	docinto
+	dodoc AUTHORS ChangeLog doc/legacy/TODO
+	newdoc pwcheck/README README.pwcheck
+
+	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
+	edos2unix "${ED}"/usr/share/doc/${PF}/release-notes
+
+	docinto html
+	dodoc doc/html/*.html
+
+	if use pam; then
+		newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd
+	fi
+
+	newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck
+	systemd_dounit "${FILESDIR}"/pwcheck.service
+
+	newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd
+	newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd
+	systemd_dounit "${FILESDIR}"/saslauthd.service
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	# The get_modname bit is important: do not remove the .la files on
+	# platforms where the lib isn't called .so for cyrus searches the .la to
+	# figure out what the name is supposed to be instead
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	if ( use berkdb || use gdbm ) && [[ ! -f ${EROOT}/etc/sasl2/sasldb2 ]] ; then
+		cp -av "${EROOT}"/etc/sasl2/sasldb2{-empty,} || die
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
deleted file mode 100644
index 24adb05a6cde..000000000000
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a C++ API for D-BUS"
-HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/"
-SRC_URI="https://downloads.sourceforge.net/dbus-cplusplus/lib${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="doc ecore glib test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	ecore? ( dev-libs/efl )
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-util/cppunit[${MULTILIB_USEDEP}]"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )"
-
-S="${WORKDIR}/lib${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
-	"${FILESDIR}"/${PN}-gcc7.patch #622790
-)
-
-multilib_src_configure() {
-	# TODO : add ecore multilib support if/when it is multilibified
-	ECONF_SOURCE="${S}" econf \
-		--disable-examples \
-		--disable-static \
-		$(multilib_native_use_enable doc doxygen-docs) \
-		$(multilib_native_use_enable ecore) \
-		$(use_enable glib) \
-		$(use_enable test tests) \
-		PTHREAD_LIBS=-lpthread
-	# ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
-
-	if multilib_is_native_abi; then
-		# docs don't like out-of-source builds
-		local d
-		for d in img html; do
-			ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( doc/html/. )
-	einstalldocs
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 210d4c6e24f8..1a69fd6a88bf 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,2 +1,2 @@
 DIST dqlite-1.16.4.tar.gz 499174 BLAKE2B 3a5f28dd352ada1d0866d3563c450aad10413118a30fc9369aaadc5f46acefaa8f28e21118e71ef3eb801c51c9946664882d82a15eff71eefbbd51f6fd68c4b3 SHA512 164a63ce9224b9a4f10d2312ac03e98ccdec8c6c4fe22e6fc595dc792f9a7c75317cf8e839eb31a8db2501a094d67053300532a92bca26c86ef5097dd3c06a2b
-DIST dqlite-1.16.6.tar.gz 528753 BLAKE2B ce189198bd1edd311bd76f50d780af63cabaecc0c0f6c5ba49d3d3e04cafcfcb215c0297bba8d86db83f1457dad71fa0c7c018af076ccbf7c647918c10265399 SHA512 c71c9da8c0a0ed2ea70d2a2a8eb45470818b1cc80126483fefbcdf84a77dddd2dbc85ed38fe0e860e6e085ad11356981375c41626888a53ea20cc4a00d840774
+DIST dqlite-1.16.7.tar.gz 528738 BLAKE2B 868e2317df85eb6f3e866851c0bab4b0b5fbc4eb80d687bb687349e398e93ce9d5bab79aa3fdf62aa0bfd9f9938feaa77d477ff977681bc6a6172dd164deb2e9 SHA512 ee63ac49355e3be1e70608e6f20863d365ab7983e704134b6c881312cba16f7cb137835492f6869f216795d166c0e54880aca6ff29000633350fe3835564029a
diff --git a/dev-libs/dqlite/dqlite-1.16.6.ebuild b/dev-libs/dqlite/dqlite-1.16.7.ebuild
index 11256abc34ee..11256abc34ee 100644
--- a/dev-libs/dqlite/dqlite-1.16.6.ebuild
+++ b/dev-libs/dqlite/dqlite-1.16.7.ebuild
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index 2be27262b1d5..fad9428866b1 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1 +1,2 @@
 DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
+DIST eb-4.4.3.tar.bz2 505510 BLAKE2B cb7476331498cc70c47406aa89833fdc8dd71b3bfd4d72d2878e9bb773d4f16a35e3b7235a3a1bf426e0b021b07874d13d1e87affbb77b545f8797523fb1f30c SHA512 29578223e9bf0e8475cf0518c4e319d8440eb9dc2b819ea7de6e90d67824eb7ac9f5a29cf1baa9b6e947840de17ad2182d1ea6ee4816df84e7baf025149bbbf2
diff --git a/dev-libs/eb/eb-4.4.3.ebuild b/dev-libs/eb/eb-4.4.3.ebuild
new file mode 100644
index 000000000000..21c8b4a69be1
--- /dev/null
+++ b/dev-libs/eb/eb-4.4.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="EB is a C library and utilities for accessing CD-ROM books"
+HOMEPAGE="https://web.archive.org/web/20120330123930/http://www.sra.co.jp/people/m-kasahr/eb/"
+SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="nls threads"
+
+RDEPEND="
+	sys-libs/zlib
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README )
+
+PATCHES=(
+	"${FILESDIR}/eb-4.4-gcc14-iconv.patch" #920641
+	"${FILESDIR}/eb-4.4.3-fix-threads.patch" #https://github.com/gentoo/gentoo/pull/37731#pullrequestreview-2218229971
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ipv6
+		$(use_enable nls)
+		$(use_enable threads pthread)
+		--with-pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/eb/files/eb-4.4-gcc14-iconv.patch b/dev-libs/eb/files/eb-4.4-gcc14-iconv.patch
new file mode 100644
index 000000000000..ac17c585e7d6
--- /dev/null
+++ b/dev-libs/eb/files/eb-4.4-gcc14-iconv.patch
@@ -0,0 +1,13 @@
+diff --git a/libebutils/puts_eucjp.c b/libebutils/puts_eucjp.c
+index 678b296..d4c41b6 100644
+--- a/libebutils/puts_eucjp.c
++++ b/libebutils/puts_eucjp.c
+@@ -94,7 +94,7 @@ fputs_eucjp_to_locale(const char *string, FILE *stream)
+ 	out_p = buffer;
+ 	out_left = buffer_size;
+ 
+-	if (iconv(cd, &in_p, &in_left, &out_p, &out_left) != -1)
++	if (iconv(cd, (char **)&in_p, &in_left, &out_p, &out_left) != -1)
+ 	    break;
+ 	if (errno == E2BIG) {
+ 	    /*
diff --git a/dev-libs/eb/files/eb-4.4.3-fix-threads.patch b/dev-libs/eb/files/eb-4.4.3-fix-threads.patch
new file mode 100644
index 000000000000..7c1e15be2119
--- /dev/null
+++ b/dev-libs/eb/files/eb-4.4.3-fix-threads.patch
@@ -0,0 +1,13 @@
+diff --git a/eb/readtext.c b/eb/readtext.c
+index 6e3c218..e4dcf95 100644
+--- a/eb/readtext.c
++++ b/eb/readtext.c
+@@ -1560,7 +1560,7 @@ eb_is_text_stopped(EB_Book *book)
+ {
+     int is_stopped = 0;
+ 
+-    eb_lock(book);
++    eb_lock(&book->lock);
+     LOG(("in: eb_is_text_stopped(book=%d)", (int)book->code));
+ 
+     if (book->subbook_current != NULL) {
diff --git a/dev-libs/elfutils/elfutils-0.191-r1.ebuild b/dev-libs/elfutils/elfutils-0.191-r1.ebuild
index e33417f6c8bc..eeac99a7062e 100644
--- a/dev-libs/elfutils/elfutils-0.191-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.191-r1.ebuild
@@ -4,32 +4,46 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg
-inherit autotools flag-o-matic multilib-minimal verify-sig
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://sourceware.org/elfutils/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/elfutils.git"
+	inherit git-r3
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	inherit verify-sig
+	SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )"
+fi
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd"
+IUSE="bzip2 debuginfod lzma nls test +utils valgrind zstd"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!dev-libs/libelf
-	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	debuginfod? (
 		app-arch/libarchive:=
 		dev-db/sqlite:3=
 		net-libs/libmicrohttpd:=
 
-		net-misc/curl[static-libs?,${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
 	)
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 	elibc_musl? (
 		dev-libs/libbsd
 		sys-libs/argp-standalone
@@ -39,13 +53,12 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
 "
-BDEPEND="
-	app-alternatives/lex
+BDEPEND+="
 	sys-devel/m4
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )
 "
 
 PATCHES=(
@@ -57,10 +70,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-
 	eautoreconf
 
 	# https://sourceware.org/PR23914
@@ -78,10 +87,13 @@ src_configure() {
 }
 
 multilib_src_configure() {
+	unset LEX YACC
+
 	local myeconfargs=(
 		$(use_enable nls)
 		$(multilib_native_use_enable debuginfod)
 		$(use_enable debuginfod libdebuginfod)
+		$(use_enable valgrind valgrind-annotations)
 
 		# explicitly disable thread safety, it's not recommended by upstream
 		# doesn't build either on musl.
@@ -97,6 +109,8 @@ multilib_src_configure() {
 		$(use_with zstd)
 	)
 
+	[[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode )
+
 	# Needed because sets alignment macro
 	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
 	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
@@ -115,8 +129,8 @@ multilib_src_install_all() {
 
 	dodoc NOTES
 
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
+	# These build quick, and are needed for most tests, so we don't
+	# disable building them when the USE flag is disabled.
 	if ! use utils; then
 		rm -rf "${ED}"/usr/bin || die
 	fi
diff --git a/dev-libs/elfutils/elfutils-0.191-r2.ebuild b/dev-libs/elfutils/elfutils-0.191-r2.ebuild
new file mode 100644
index 000000000000..917e0ffdca15
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.191-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2003-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/elfutils.gpg
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://sourceware.org/elfutils/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/elfutils.git"
+	inherit git-r3
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	inherit verify-sig
+	SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )"
+fi
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+IUSE="bzip2 debuginfod lzma nls static-libs test +utils valgrind zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-libs/libelf
+	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	debuginfod? (
+		app-arch/libarchive:=
+		dev-db/sqlite:3=
+		net-libs/libmicrohttpd:=
+
+		net-misc/curl[static-libs?,${MULTILIB_USEDEP}]
+	)
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	elibc_musl? (
+		dev-libs/libbsd
+		sys-libs/argp-standalone
+		sys-libs/fts-standalone
+		sys-libs/obstack-standalone
+	)
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND+="
+	sys-devel/m4
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch
+	"${FILESDIR}"/${PN}-0.191-musl-macros.patch
+	"${FILESDIR}"/${PN}-0.191-avoid-overriding-libcxx-system-header.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	# bug #407135
+	use test && append-flags -g
+
+	# bug 660738
+	filter-flags -fno-asynchronous-unwind-tables
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	unset LEX YACC
+
+	local myeconfargs=(
+		$(use_enable nls)
+		$(multilib_native_use_enable debuginfod)
+		$(use_enable debuginfod libdebuginfod)
+		$(use_enable valgrind valgrind-annotations)
+
+		# explicitly disable thread safety, it's not recommended by upstream
+		# doesn't build either on musl.
+		--disable-thread-safety
+
+		# Valgrind option is just for running tests under it; dodgy under sandbox
+		# and indeed even w/ glibc with newer instructions.
+		--disable-valgrind
+		--program-prefix="eu-"
+		--with-zlib
+		$(use_with bzip2 bzlib)
+		$(use_with lzma)
+		$(use_with zstd)
+	)
+
+	[[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode )
+
+	# Needed because sets alignment macro
+	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
+	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	dodoc NOTES
+
+	# These build quick, and are needed for most tests, so we don't
+	# disable building them when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild
new file mode 100644
index 000000000000..250038f6f588
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-9999.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2003-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/elfutils.gpg
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="https://sourceware.org/elfutils/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/elfutils.git"
+	inherit git-r3
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	inherit verify-sig
+	SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )"
+fi
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+IUSE="bzip2 debuginfod lzma nls static-libs test +utils valgrind zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-libs/libelf
+	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	debuginfod? (
+		app-arch/libarchive:=
+		dev-db/sqlite:3=
+		net-libs/libmicrohttpd:=
+
+		net-misc/curl[static-libs?,${MULTILIB_USEDEP}]
+	)
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] )
+	elibc_musl? (
+		dev-libs/libbsd
+		sys-libs/argp-standalone
+		sys-libs/fts-standalone
+		sys-libs/obstack-standalone
+	)
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND+="
+	sys-devel/m4
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch
+	"${FILESDIR}"/${PN}-0.191-musl-macros.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	# bug #407135
+	use test && append-flags -g
+
+	# bug 660738
+	filter-flags -fno-asynchronous-unwind-tables
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	unset LEX YACC
+
+	local myeconfargs=(
+		$(use_enable nls)
+		$(multilib_native_use_enable debuginfod)
+		$(use_enable debuginfod libdebuginfod)
+		$(use_enable valgrind valgrind-annotations)
+
+		# explicitly disable thread safety, it's not recommended by upstream
+		# doesn't build either on musl.
+		--disable-thread-safety
+
+		# Valgrind option is just for running tests under it; dodgy under sandbox
+		# and indeed even w/ glibc with newer instructions.
+		--disable-valgrind
+		--program-prefix="eu-"
+		--with-zlib
+		$(use_with bzip2 bzlib)
+		$(use_with lzma)
+		$(use_with zstd)
+	)
+
+	[[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode )
+
+	# Needed because sets alignment macro
+	is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address )
+	is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	dodoc NOTES
+
+	# These build quick, and are needed for most tests, so we don't
+	# disable building them when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 1245aecbac06..22f6b4e66b18 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,2 +1,4 @@
 DIST ell-0.66.tar.xz 570708 BLAKE2B 64beecc2dfc5a1b0feccc415801aee71e20a1fd115eadc950c7c85b5b8ba52fca57f029799291dbf75106987870f2d82a9dfdb80d2f5cf22d31c06151b43c491 SHA512 e2d18a41ff6e7cf2fa55309abfa55b64a126979ade81c3af6d9f1c2ea7976e5667914fa6d61754f6c4646aff5719110e0fd03bcaeaa1780ca2fe2b170202cfbc
 DIST ell-0.67.tar.xz 570720 BLAKE2B 27b886de9d4d4d812cf724e3a45f1bcb1cf021e0f88661357b14b643916c36ec6e0bdb8cbb177e33ff991483815af2176139c9bbad8645533aaa15830ce765a9 SHA512 a241c5f05bdff908d4c7a477d16f4d8857a725b3f1da5b08ecf031f73d1ebd80c6717dd99efbbf662a8801f10496249bc707d8dc17be88e63d0deb5418b3786a
+DIST ell-0.68.tar.xz 573704 BLAKE2B 742f097f5adbaab790320ce509851b8baac8b0929194f319d7c9889fe0da1f3461a1fffba50fd93c7706d41f52220e0ea094488c4ea58bd9eb127b511a628912 SHA512 dc604015151e1bc5945c08e31fcf35a679264be13e31b4ee0e297defb7452b3bc6bf44b7e1c07177ff172708b099e2a2940b68ceb9937a1c285f3af01e64bc2c
+DIST ell-0.69.tar.xz 574172 BLAKE2B 3d28392b6cb378a8512667172598ec3cf9b5eeb5f68c65b43a939636a23a03d8f168b500171c4e1224e97bc072e88e9d57e5f02a9d5cbf489d684537070cfeef SHA512 9631b364ba48f984b104cf1091a4dbf10f675b04f58b555f55249d3fec6610c3ccf6e1b0197e807e843b179a39f22c33b8e2a58c4dbcff91bb8c6ce628618f65
diff --git a/dev-libs/ell/ell-0.68.ebuild b/dev-libs/ell/ell-0.68.ebuild
new file mode 100644
index 000000000000..975d6b799e59
--- /dev/null
+++ b/dev-libs/ell/ell-0.68.ebuild
@@ -0,0 +1,59 @@
+# 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 ~ia64 ~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.69.ebuild b/dev-libs/ell/ell-0.69.ebuild
new file mode 100644
index 000000000000..975d6b799e59
--- /dev/null
+++ b/dev-libs/ell/ell-0.69.ebuild
@@ -0,0 +1,59 @@
+# 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 ~ia64 ~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/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 63c44c31efbd..1733362b2b75 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/$(ver_cut 1-2)/eventlog
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CREDITS ChangeLog NEWS PORTS README )
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index d78c6592adc9..5d7d530e8311 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -2,3 +2,4 @@ DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6
 DIST expat-2.6.0.tar.xz 483448 BLAKE2B 2f0117317bde4e03d8662bcac1ff6c2bbb1af694846b21a82ac12d11ccd43032b481af72fa35298c3cb19b7426dba6a67e703904ca7b05663ffd854a42348bd0 SHA512 d6f1c4a1a2ec8ffc04c04d6767cc8dd7dea3d132d10b8a2c45c5bfb405893c75db032b87a56cc88300b61c961dd7f9782b93aa74dddc7e66f25acb0c6c82b1fd
 DIST expat-2.6.1.tar.xz 484000 BLAKE2B 21a177ae8d70ca1bf41cae75c299a3021a9fc1b9d5eb01eb2945b16d7b24dcbeabad855379bdd8a14de804e1a1648105ce03b505f68c2beb4096a81020e35848 SHA512 fcd7e04e9411799c48b7d08ea07808a0809d034453a0649d9a79ed09000f1a11e5082a034089fc0c0acd2789e85bdf1deb2a94d8e3e33791bbfed66ce7207bcc
 DIST expat-2.6.2.tar.xz 485236 BLAKE2B aae019270e1ab233fe8480b7eaa77f648f23ef3383dc772dc946cb13163067431716dc5446862eb502315fd089f2f52f3d476589b74a97e462575cd54df44db4 SHA512 47b60967d6346d330dded87ea1a2957aa7d34dd825043386a89aa131054714f618ede57bfe97cf6caa40582a4bc67e198d2a915e7d8dbe8ee4f581857c2e3c2e
+DIST expat-2.6.3.tar.xz 485600 BLAKE2B b8e0a0e779f0f136eaca91115cbbcf5a5cca457cab1cca6f8d6141151d19f8ef2dccb41b0e9134459c1e7d99cb2e0b4ce3922d2bd9221002ec43fe9d53a0084a SHA512 e02c4ad88f9d539258aa1c1db71ded7770a8f12c77b5535e5b34f040ae5b1361ef23132f16d96bdb7c096a83acd637a7c907916bdfcc6d5cfb9e35d04020ca0b
diff --git a/dev-libs/expat/expat-2.6.3.ebuild b/dev-libs/expat/expat-2.6.3.ebuild
new file mode 100644
index 000000000000..c3b58eddf197
--- /dev/null
+++ b/dev-libs/expat/expat-2.6.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+AUTOTOOLS_AUTO_DEPEND=no
+inherit autotools multilib-minimal
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples static-libs test unicode"
+RESTRICT="!test? ( test )"
+BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+
+DOCS=( README.md )
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# https://bugs.gentoo.org/906384
+	arc4random
+	arc4random_buf
+)
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	doman doc/xmlwf.1
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/fddl/fddl-20111124-r1.ebuild b/dev-libs/fddl/fddl-20111124-r1.ebuild
deleted file mode 100644
index adf229a08483..000000000000
--- a/dev-libs/fddl/fddl-20111124-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=7
-
-inherit cmake vcs-snapshot
-
-DESCRIPTION="Free Decision Diagram Library"
-HOMEPAGE="https://itval.sourceforge.net/ https://github.com/atomopawn/FDDL"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=( AUTHORS ChangeLog INSTALL RELEASE )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove references to files that were not shipped,
-	# prefer dynamic linking
-	sed -i \
-		-e 's|unaryoperation.cpp||g' \
-		-e 's|unaryoperation.h||g' \
-		-e 's|binaryoperation.cpp||g' \
-		-e 's|binaryoperation.h||g' \
-		-e '/add_library/s/FDDL /FDDL SHARED /' \
-		-e '/add_library/s/FDDL /FDDL SHARED /' \
-		-e "/^install/s:DESTINATION lib:DESTINATION $(get_libdir):" \
-		src/CMakeLists.txt || die
-	# Do not build tests that depend on above files
-	sed -i   \
-		{,tests/}CMakeLists.txt \
-		-e '/test_unaryop/d' \
-		-e '/test_binaryop/d' \
-		|| die
-}
diff --git a/dev-libs/fddl/fddl-20111124-r2.ebuild b/dev-libs/fddl/fddl-20111124-r2.ebuild
index 97af9c72f804..041845ae39b0 100644
--- a/dev-libs/fddl/fddl-20111124-r2.ebuild
+++ b/dev-libs/fddl/fddl-20111124-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( AUTHORS ChangeLog INSTALL RELEASE )
 
diff --git a/dev-libs/gdl/gdl-3.40.0.ebuild b/dev-libs/gdl/gdl-3.40.0.ebuild
index 6ed8a7bafa1a..58da366631e3 100644
--- a/dev-libs/gdl/gdl-3.40.0.ebuild
+++ b/dev-libs/gdl/gdl-3.40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 7db83ba1feba..54cd3034916a 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,2 +1,3 @@
 DIST girara-0.4.0.tar.xz 60804 BLAKE2B 4653986945b89c87c597f20425c0009473679578b9a92fd3f4480aa2decc5dcbb2c1a2b0db07bef67c818c2e2940b6c363da0020fa24e7001be13cb68e2ba945 SHA512 a8753231cb9de7d60ddaf6e7b19537f23ce447be5885725c982e395068466089fca46980d413cc4ea8e4a8059ccd4615366297600bcf7ef5bddf02d649703dec
 DIST girara-0.4.2.tar.xz 61468 BLAKE2B 7be287045c269c8a1f2b51b14f0b7f840d7d5929f81c27410a86653943f73b07a1ce16c5a5fe420e7df6f02d4f426b48a622d4cf483dc5065cd8551e273d8fcf SHA512 70dddf8998e37acce25325ddeb5a9b5c5844669b51320733d9d7a572831f28c72207aa6d608b7a856969d7fd0785cbab076596b814eb2e9ef37bf49bb5d476ae
+DIST girara-0.4.4.tar.gz 74211 BLAKE2B d73914011fb62e29ed9510f081cd6d85b5d0dfdf28b2b6ca9847f146ce5861836ace26043fcd54396c5b23509c14a943fc526ee11d3d91b8a13c559837e0a52f SHA512 4c106c2156ff397caad2c173cbfb5f2dc8f4574a59c70e7d04e941fd5273948c7e2cc4662b91a489dc689e6537b72bdb1771849cf7775d6afa167f2616a3d4c7
diff --git a/dev-libs/girara/girara-0.4.4.ebuild b/dev-libs/girara/girara-0.4.4.ebuild
new file mode 100644
index 000000000000..3c3053168e30
--- /dev/null
+++ b/dev-libs/girara/girara-0.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0/4.4"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-accessibility/at-spi2-core
+	>=dev-libs/glib-2.72:2
+	dev-libs/json-glib:=
+	media-libs/harfbuzz:=
+	x11-libs/cairo[glib]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.24:3
+	x11-libs/pango
+	libnotify? ( x11-libs/libnotify )
+"
+# Tests are run under virtx
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-libs/check
+		x11-base/xorg-proto
+		x11-libs/gtk+:3[X]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_configure() {
+	local -a emesonargs=(
+		-Djson=enabled
+		$(meson_feature doc docs)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# TODO: run test on wayland
+	virtx meson_src_test
+}
diff --git a/dev-libs/gjs/gjs-1.78.5.ebuild b/dev-libs/gjs/gjs-1.78.5.ebuild
index 0266c267beac..0010942dd45e 100644
--- a/dev-libs/gjs/gjs-1.78.5.ebuild
+++ b/dev-libs/gjs/gjs-1.78.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples readline sysprof test"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.80.2.ebuild b/dev-libs/gjs/gjs-1.80.2.ebuild
index 13f066ff2ada..a8f7db81a5f7 100644
--- a/dev-libs/gjs/gjs-1.80.2.ebuild
+++ b/dev-libs/gjs/gjs-1.80.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gjs"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+cairo examples readline sysprof test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild
index 356bd10b8796..9f9236bbcf7e 100644
--- a/dev-libs/glib/glib-2.76.4.ebuild
+++ b/dev-libs/glib/glib-2.76.4.ebuild
@@ -197,6 +197,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild
index 356bd10b8796..9f9236bbcf7e 100644
--- a/dev-libs/glib/glib-2.78.3.ebuild
+++ b/dev-libs/glib/glib-2.78.3.ebuild
@@ -197,6 +197,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild
index f3dbbeb1f18b..6155dc22b039 100644
--- a/dev-libs/glib/glib-2.78.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.78.4-r1.ebuild
@@ -206,6 +206,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild
index 4cb3fb6b75e4..084d5059aa14 100644
--- a/dev-libs/glib/glib-2.78.6.ebuild
+++ b/dev-libs/glib/glib-2.78.6.ebuild
@@ -205,6 +205,17 @@ multilib_src_configure() {
 		$(meson_native_use_feature elf libelf)
 		-Dmultiarch=false
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild
index 1a20959666c2..e67299e0d365 100644
--- a/dev-libs/glib/glib-2.80.4.ebuild
+++ b/dev-libs/glib/glib-2.80.4.ebuild
@@ -186,6 +186,7 @@ multilib_src_configure() {
 	#fi
 
 	use debug && EMESON_BUILD_TYPE=debug
+
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
@@ -205,6 +206,17 @@ multilib_src_configure() {
 		-Dmultiarch=false
 		$(meson_native_use_feature introspection)
 	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
 	meson_src_configure
 }
 
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
new file mode 100644
index 000000000000..712fafe27946
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.80.1-setuptools-74.patch
@@ -0,0 +1,101 @@
+From a2139dba59eac283a7f543ed737f038deebddc19 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Wed, 28 Aug 2024 21:26:02 +0200
+Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler
+
+It was removed with setuptools 74.0.0. Since we still depend on the
+MSVCCompiler class use new_compiler() to get it some other way.
+
+Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
+which we no longer support anyway.
+
+Fixes #515
+---
+ giscanner/ccompiler.py    |  7 +++----
+ giscanner/msvccompiler.py | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index d0ed70a3c..9a732cd5e 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -26,7 +26,6 @@ import tempfile
+ import sys
+ import distutils
+ 
+-from distutils.msvccompiler import MSVCCompiler
+ from distutils.unixccompiler import UnixCCompiler
+ from distutils.cygwinccompiler import Mingw32CCompiler
+ from distutils.sysconfig import get_config_vars
+@@ -167,7 +166,7 @@ class CCompiler(object):
+         # Now, create the distutils ccompiler instance based on the info we have.
+         if compiler_name == 'msvc':
+             # For MSVC, we need to create a instance of a subclass of distutil's
+-            # MSVC9Compiler class, as it does not provide a preprocess()
++            # MSVCCompiler class, as it does not provide a preprocess()
+             # implementation
+             from . import msvccompiler
+             self.compiler = msvccompiler.get_msvc_compiler()
+@@ -460,7 +459,7 @@ class CCompiler(object):
+             return self.compiler.linker_exe
+ 
+     def check_is_msvc(self):
+-        return isinstance(self.compiler, MSVCCompiler)
++        return self.compiler.compiler_type == "msvc"
+ 
+     # Private APIs
+     def _set_cpp_options(self, options):
+@@ -486,7 +485,7 @@ class CCompiler(object):
+                     # macros for compiling using distutils
+                     # get dropped for MSVC builds, so
+                     # escape the escape character.
+-                    if isinstance(self.compiler, MSVCCompiler):
++                    if self.check_is_msvc():
+                         macro_value = macro_value.replace('\"', '\\\"')
+                 macros.append((macro_name, macro_value))
+             elif option.startswith('-U'):
+diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
+index 0a5439820..e333a80f5 100644
+--- a/giscanner/msvccompiler.py
++++ b/giscanner/msvccompiler.py
+@@ -19,30 +19,30 @@
+ #
+ 
+ import os
+-import distutils
++from typing import Type
+ 
+ from distutils.errors import DistutilsExecError, CompileError
+-from distutils.ccompiler import CCompiler, gen_preprocess_options
++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
+ from distutils.dep_util import newer
+ 
+ # Distutil's MSVCCompiler does not provide a preprocess()
+ # Implementation, so do our own here.
+ 
+ 
++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
++
++
+ def get_msvc_compiler():
+     return MSVCCompiler()
+ 
+ 
+-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
++class MSVCCompiler(DistutilsMSVCCompiler):
+ 
+     def __init__(self, verbose=0, dry_run=0, force=0):
+-        super(distutils.msvccompiler.MSVCCompiler, self).__init__()
++        super(DistutilsMSVCCompiler, self).__init__()
+         CCompiler.__init__(self, verbose, dry_run, force)
+         self.__paths = []
+         self.__arch = None  # deprecated name
+-        if os.name == 'nt':
+-            if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
+-                self.__version = distutils.msvc9compiler.VERSION
+         self.initialized = False
+         self.preprocess_options = None
+         if self.check_is_clang_cl():
+-- 
+GitLab
+
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
new file mode 100644
index 000000000000..47d0dfe21616
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.75.0:2
+	dev-libs/libffi:=
+	<dev-python/setuptools-74
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
new file mode 100644
index 000000000000..c0dcfeffdea9
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.75.0:2
+	dev-libs/libffi:=
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+	"${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild
deleted file mode 100644
index dd5dc146ec03..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.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_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.75.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not app-alternatives/yacc
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	app-alternatives/lex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
new file mode 100644
index 000000000000..899547ef007e
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r1.ebuild
@@ -0,0 +1,84 @@
+# 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="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		<dev-python/setuptools-74[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests-py312.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
new file mode 100644
index 000000000000..2387e4af0ab7
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.78.1-r2.ebuild
@@ -0,0 +1,88 @@
+# 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="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests-py312.patch"
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+	"${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild
deleted file mode 100644
index b9506b1ab48c..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.78.1.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://gi.readthedocs.io"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.$(($(ver_cut 2) - 1)).0:2
-	dev-libs/libffi:=
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' 3.12)
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not app-alternatives/yacc
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	app-alternatives/lex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests-py312.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
new file mode 100644
index 000000000000..0fb774a4c879
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r1.ebuild
@@ -0,0 +1,85 @@
+# 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="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.79.0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		<dev-python/setuptools-74[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		-Dbuild_introspection_data=true
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
new file mode 100644
index 000000000000..92368b5dd6c0
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.80.1-r2.ebuild
@@ -0,0 +1,90 @@
+# 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="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://gi.readthedocs.io/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.79.0:2
+	dev-libs/libffi:=
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	app-alternatives/lex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
+	"${FILESDIR}/${PN}-1.80.1-setuptools-74.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		-Dbuild_introspection_data=true
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.80.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.80.1.ebuild
deleted file mode 100644
index a6d1be4002fe..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.80.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://gi.readthedocs.io/"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.79.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not app-alternatives/yacc
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	app-alternatives/lex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		-Dbuild_introspection_data=true
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild b/dev-libs/grantlee/grantlee-5.3.0.ebuild
index e44ee2d5e392..47ba36990ff5 100644
--- a/dev-libs/grantlee/grantlee-5.3.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.3.0.ebuild
@@ -15,7 +15,7 @@ SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="debug doc test"
 
-RESTRICT="!test? ( test )"
+RESTRICT="test" # bug 874627
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/dev-libs/hidapi/hidapi-0.14.0.ebuild b/dev-libs/hidapi/hidapi-0.14.0.ebuild
index 8713c3db7850..3208e04b1603 100644
--- a/dev-libs/hidapi/hidapi-0.14.0.ebuild
+++ b/dev-libs/hidapi/hidapi-0.14.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-libs/hiredis/hiredis-1.2.0.ebuild b/dev-libs/hiredis/hiredis-1.2.0.ebuild
index 10071f0716a4..0029a1d3a112 100644
--- a/dev-libs/hiredis/hiredis-1.2.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.2.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 # Always check "Upgrading from ..." in README
 # e.g. https://github.com/redis/hiredis#upgrading-to-110
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/hyprland-protocols/Manifest b/dev-libs/hyprland-protocols/Manifest
index 9fc1c3932385..57a0c446e1d5 100644
--- a/dev-libs/hyprland-protocols/Manifest
+++ b/dev-libs/hyprland-protocols/Manifest
@@ -1,2 +1 @@
-DIST hyprland-protocols-0.2.gh.tar.gz 6342 BLAKE2B a5179bc465156043903a5f17b1a4593ca15694ef22c52b1ba8a306d3680f1443a3c2ccf5947ace533244cc5b19ce02e8f3014053984f121f8e049882c1e21fa0 SHA512 cd1f9309a69236d6fd2ffc1a09f5f8a1196f357367779c08f30aeaaca7646be364c40fa8c207751012873085d24581fe7b7252c825e89958c20adfb48b029274
 DIST hyprland-protocols-0.3.0.gh.tar.gz 7423 BLAKE2B 1ecc6625152e9bd530490d8321dcbe41396dd7306066f6cd6d97c22a0ebb2c914348b6829e8d5e210f07807a7df282a1cc63fa44a93bd08df22987850bd27a3a SHA512 15bb0c45eed1949d888d228c671139fefd48e32d634823ed8041a4901e15e73409b0fd368d4c1f6197bd6980e723b20303697ad46b1171330cfd27821118ba32
diff --git a/dev-libs/hyprland-protocols/hyprland-protocols-0.2-r1.ebuild b/dev-libs/hyprland-protocols/hyprland-protocols-0.2-r1.ebuild
deleted file mode 100644
index 0de43fcf06fb..000000000000
--- a/dev-libs/hyprland-protocols/hyprland-protocols-0.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Wayland protocol extensions for Hyprland"
-HOMEPAGE="https://github.com/hyprwm/hyprland-protocols"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~riscv"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
diff --git a/dev-libs/hyprland-protocols/metadata.xml b/dev-libs/hyprland-protocols/metadata.xml
index 1273be6af080..6897d8b89d20 100644
--- a/dev-libs/hyprland-protocols/metadata.xml
+++ b/dev-libs/hyprland-protocols/metadata.xml
@@ -5,6 +5,10 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>johnmh@johnmh.me</email>
+		<name>John M. Harris, Jr.</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/dev-libs/hyprlang/Manifest b/dev-libs/hyprlang/Manifest
index f26f252d45e6..d47ef0c2903f 100644
--- a/dev-libs/hyprlang/Manifest
+++ b/dev-libs/hyprlang/Manifest
@@ -1,3 +1,2 @@
-DIST hyprlang-0.5.0.gh.tar.gz 54809 BLAKE2B d5d83188b4cce021901182d94bcc6466949e6504053217cbf3324f7362e8a9d7cef2040949a172a35b41d9c0de981618d343edd21a70ab8a8005b573f5799e05 SHA512 9e80b936d977d46f9c1a0fc4733c89fb1cf521c767295891427f1ab358f8373839db3fad823f8abfca9d344350813361504f70aa3f6e109b523ab8ec2c3fa833
 DIST hyprlang-0.5.1.gh.tar.gz 56237 BLAKE2B 1d93362d4e121dc0d6e18d27456be71bed088d79646a92a74e41af7ebefd511cef05c12034eb679fd1849c3c95e50e425a52a42da75f274bf39d2956d6bd6d5e SHA512 92bf1e79c41c33e09de25f45e8abfe753736521be06fee298875a68072761bf0254d06d2d312a12b2ae750d8710f50d1666f1b3fbbb95c338398f2b9e80ce454
 DIST hyprlang-0.5.2.gh.tar.gz 56383 BLAKE2B 0d7708532e5169b0b0c2d5f88927ead24941af157c668832bdc67f4e87da1737d9f17d6d26b2424519bce4b54e4912c44ef879546d699ba03e270cab73652a89 SHA512 df330da11da317ff6aac2eb4a65c81b6cf4fc85e79f117e3fc3ef6e06d4c857d03134be9fcdc4e33f4974a4b2181e45b6009dba70ed047cda38e32df289b60a7
diff --git a/dev-libs/hyprlang/hyprlang-0.5.0.ebuild b/dev-libs/hyprlang/hyprlang-0.5.0.ebuild
deleted file mode 100644
index 9884a4ce9a12..000000000000
--- a/dev-libs/hyprlang/hyprlang-0.5.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Official implementation library for the hypr config language"
-HOMEPAGE="https://github.com/hyprwm/hyprlang"
-SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
diff --git a/dev-libs/hyprlang/hyprlang-0.5.2.ebuild b/dev-libs/hyprlang/hyprlang-0.5.2.ebuild
index 4c7b562223db..9884a4ce9a12 100644
--- a/dev-libs/hyprlang/hyprlang-0.5.2.ebuild
+++ b/dev-libs/hyprlang/hyprlang-0.5.2.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
diff --git a/dev-libs/hyprlang/metadata.xml b/dev-libs/hyprlang/metadata.xml
index 9cd0a7a6e284..b7b7d38ebeda 100644
--- a/dev-libs/hyprlang/metadata.xml
+++ b/dev-libs/hyprlang/metadata.xml
@@ -5,6 +5,10 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>johnmh@johnmh.me</email>
+		<name>John M. Harris, Jr.</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/dev-libs/imath/imath-3.1.11-r1.ebuild b/dev-libs/imath/imath-3.1.11-r1.ebuild
index a15ba7642035..64c6c851e510 100644
--- a/dev-libs/imath/imath-3.1.11-r1.ebuild
+++ b/dev-libs/imath/imath-3.1.11-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="3/29"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/dev-libs/imath/imath-3.1.11.ebuild b/dev-libs/imath/imath-3.1.11.ebuild
index 6da867303ab9..79345be46be9 100644
--- a/dev-libs/imath/imath-3.1.11.ebuild
+++ b/dev-libs/imath/imath-3.1.11.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="3/29"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/dev-libs/immer/immer-0.8.1-r1.ebuild b/dev-libs/immer/immer-0.8.1-r1.ebuild
index 65da2ecbf6f6..c8dc26c2312f 100644
--- a/dev-libs/immer/immer-0.8.1-r1.ebuild
+++ b/dev-libs/immer/immer-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/iniparser/iniparser-3.1-r3.ebuild b/dev-libs/iniparser/iniparser-3.1-r3.ebuild
index 4e8762123d45..6b278cbc664a 100644
--- a/dev-libs/iniparser/iniparser-3.1-r3.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples"
 # the tests are rather examples than tests, no point in running them
 RESTRICT="test"
diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild
index 0540dd973ed7..94fa730c0cc7 100644
--- a/dev-libs/iniparser/iniparser-4.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-libs/iniparser/iniparser-4.2.2.ebuild b/dev-libs/iniparser/iniparser-4.2.2.ebuild
index 6dc8e4eab972..942e52d72bea 100644
--- a/dev-libs/iniparser/iniparser-4.2.2.ebuild
+++ b/dev-libs/iniparser/iniparser-4.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/iniparser-v${PV
 S="${WORKDIR}/${PN}-v${PV}"
 LICENSE="MIT"
 SLOT="4"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 179814b4987e..f0c3ced84d0a 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1 +1,2 @@
 DIST intel-compute-runtime-24.22.29735.21.tar.gz 7083856 BLAKE2B dbb31259b3a4305e42d4dce685ce3f98b3b308451d2b1061c6fcba5cc2b2aaf6862eaa326619f8b073478c64fc45994adc261583c0070464b027fda46028afa5 SHA512 64cbfdab69c595c118e37526be744bad95cf11e1c9de34aaec308cead5346d802e98e67f155da03fd174e51e7f78a38b3b6f48ba6e004f3181b533c8d31e851e
+DIST intel-compute-runtime-24.31.30508.7.tar.gz 7323254 BLAKE2B 2fbd1e52e7c25b1180aba7ddc0ebc0aadeb20c78c464ad72c5e9cd88799e181db979ac55bea215390d968d7eb128d9f96a71acebed3430916e318d3c55fbbae2 SHA512 31e35f82a16f3e6961afa12ae5307617cc4114a04a27260caa86d9eff5683df6171df6d3efc83b0a94f3bd80417cc0a2b6a0085d761aa58242d0fd018e35c4a9
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.31.30508.7.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.31.30508.7.ebuild
new file mode 100644
index 000000000000..f52e95b87bac
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.31.30508.7.ebuild
@@ -0,0 +1,84 @@
+# 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 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/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	>=dev-util/intel-graphics-compiler-1.0.17537.1
+	>=media-libs/gmmlib-22.3.19:=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/intel-metrics-discovery:=
+	dev-libs/intel-metrics-library:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-system-controller-0.8.16:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.17.28:= )
+	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_DISABLE_LTO="ON"
+		-DNEO_DISABLE_LD_GOLD="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/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 32bbef99f8fd..44699d7bdf27 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1 +1,2 @@
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
+DIST jsoncpp-1.9.6.tar.gz 212682 BLAKE2B efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild
new file mode 100644
index 000000000000..8c2311382da0
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild
@@ -0,0 +1,51 @@
+# 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-multilib python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/25"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson-multilib_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
+
+multilib_src_test() {
+	# increase test timeout due to failures on slower hardware
+	meson_src_test -t 2
+}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
new file mode 100644
index 000000000000..0063c6350e4b
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
@@ -0,0 +1,51 @@
+# 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-multilib python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson-multilib_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
+
+multilib_src_test() {
+	# increase test timeout due to failures on slower hardware
+	meson_src_test -t 2
+}
diff --git a/dev-libs/kdiagram/kdiagram-3.0.1.ebuild b/dev-libs/kdiagram/kdiagram-3.0.1.ebuild
index 8ec47c4432e1..88a157465471 100644
--- a/dev-libs/kdiagram/kdiagram-3.0.1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-3.0.1.ebuild
@@ -17,7 +17,7 @@ https://www.kdab.com/development-resources/qt-tools/kd-chart/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2" # TODO CHECK
diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
index 1d7dcfa84e12..17e8f739c4a8 100644
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kd
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index 2c67fe8c2a15..99f2f203e41a 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="+introspection"
 
 RDEPEND="x11-libs/gtk+:3[X]
diff --git a/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild b/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild
index 87b191f14ac2..5c6459c64529 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-1.4.0.ebuild
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Visual end user components for Kirigami-based applications"
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index dc504edcf0ae..604ef47b0389 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1 +1 @@
-DIST kopeninghours-24.05.2.tar.xz 74584 BLAKE2B 54ec52b2f59f714794f35d2e4b131beeb931b4a9d248afbcc49b0d0708c98c91501e782433cd4bcffd61b81a4d0bfd551b216c4886f8ec72cf79321840b7b5d2 SHA512 72f2276d9e48836dda32320695ab35e333336c8204d8bc84f8c777a81ebf5ff0a4a83e87375b5af9458ab46755a2456a54451fd2f50cfe4ff3d7d4067d30297a
+DIST kopeninghours-24.08.0.tar.xz 74612 BLAKE2B 66bf4bbc405e53746679ddb00aa3ab481e43ca041658bcf62875057881d079fc698563bcad49cd4c0a03f31fa9a3b8c027b3ff69d1fb6052cc73d2bffc539538 SHA512 a5f71f6c95d9a4ef9c78148ef960893240707a73faa917510a52fe821789cf88cc7bd46af43d9d46f83e36129e13ab4de42fa080198e36c49e6a84830ce39f9a
diff --git a/dev-libs/kopeninghours/kopeninghours-24.05.2.ebuild b/dev-libs/kopeninghours/kopeninghours-24.05.2.ebuild
deleted file mode 100644
index 4e0fba0806c9..000000000000
--- a/dev-libs/kopeninghours/kopeninghours-24.05.2.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.3.0
-QTMIN=6.6.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.08.0.ebuild b/dev-libs/kopeninghours/kopeninghours-24.08.0.ebuild
new file mode 100644
index 000000000000..1084d8654d19
--- /dev/null
+++ b/dev-libs/kopeninghours/kopeninghours-24.08.0.ebuild
@@ -0,0 +1,63 @@
+# 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.5.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 34a6e4cd20e6..5a8eb6bd159b 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1 +1 @@
-DIST kosmindoormap-24.05.2.tar.xz 647752 BLAKE2B 9464b424669a412b4b32958ced91c0dae9980e9387cc97b823bcdaecffca850d29f25e9b437fc1d3b4d8b0d8022c6fc7b0a8e176a20f72ee2714da1691207838 SHA512 2bf2998be61893d651dbd1a9a0e509c6cf83a122e9ee95c265bf0507706c77b20b7e64d462840d76c7b1aa6f9d884305812e32dc4058c09a0f724994d2e073b1
+DIST kosmindoormap-24.08.0.tar.xz 691616 BLAKE2B f325622978ac6054b4523cb90e692087005412fd5e420e2e1e8f1940bd71bbc49a9777e5d2b66b7d995c024819f5f368e3111f9ae807182f86a5dbc18fbbf4db SHA512 926561007d47ec4ba60d488431785762f78835f0202c6f87b1ca7e5f0d38c6928a56181dd79d852140f1d54cae6d9f964ffa8c518f587c3b29a8c9f11ef61c25
diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch b/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch
deleted file mode 100644
index 77d51d1da9be..000000000000
--- a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 88cdec4c0bc40f4e98105a0b69c968fdd94ac7f4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 30 Jun 2024 23:17:00 +0200
-Subject: [PATCH 1/3] Fix/simplify BUILD_STANDALONE_APP decisionmaking
-
-BUILD_STANDALONE_APP=ON guarantees Qt::Widgets so no need for this check.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 79f07df..cdd99e1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,7 +10,7 @@ if (TARGET Qt::Quick)
-     add_subdirectory(map-quick)
-     add_subdirectory(map-publictransport-integration)
- endif()
--if ((NOT ANDROID AND TARGET Qt::Widgets) OR BUILD_STANDALONE_APP)
-+if (BUILD_STANDALONE_APP)
-     add_subdirectory(app)
- endif()
- if (NOT CROSS_COMPILING)
--- 
-2.45.2
-
-
-From 09d0bda83e6de957ad8883926d8b9f9b3adfe762 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 30 Jun 2024 23:23:22 +0200
-Subject: [PATCH 2/3] Use more QT_MIN_VERSION
-
-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 bbf417f..6da25de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,7 +54,7 @@ if (NOT BUILD_TOOLS_ONLY)
- endif()
- 
- if (BUILD_TESTING)
--    find_package(Qt6 6.5 REQUIRED COMPONENTS Test Widgets)
-+    find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test Widgets)
- endif()
- 
- if (BUILD_STANDALONE_APP)
--- 
-2.45.2
-
-
-From 74c3516e698a4fc53e45585a5846a170a8f25e2f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 30 Jun 2024 23:25:46 +0200
-Subject: [PATCH 3/3] Add missing KF6I18n dependency for BUILD_STANDALONE_APP
-
-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 6da25de..dd55077 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,7 +61,7 @@ if (BUILD_STANDALONE_APP)
-     if (NOT ANDROID)
-         find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets)
-     else()
--        find_package(KF6 REQUIRED COMPONENTS Kirigami2)
-+        find_package(KF6 6.3 REQUIRED COMPONENTS I18n Kirigami)
-         find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS QuickControls2 Svg)
-         find_package(OpenSSL REQUIRED)
-         if (NOT DEFINED BREEZEICONS_DIR AND EXISTS ${CMAKE_SOURCE_DIR}/../breeze-icons)
--- 
-2.45.2
-
diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild
deleted file mode 100644
index 5dc6d3d36d64..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-24.05.2.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_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.3.0
-QTMIN=6.6.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
-"
-
-# Pending: https://invent.kde.org/libraries/kosmindoormap/-/merge_requests/40
-PATCHES=( "${FILESDIR}/${PN}-24.05.1-cmake.patch" )
-
-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.08.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.08.0.ebuild
new file mode 100644
index 000000000000..917524a82c30
--- /dev/null
+++ b/dev-libs/kosmindoormap/kosmindoormap-24.08.0.ebuild
@@ -0,0 +1,48 @@
+# 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="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/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index 6c31d775ba6f..9eebe9d8fad7 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1 +1 @@
-DIST kpublictransport-24.05.2.tar.xz 662684 BLAKE2B eb331cfa35f41992182df54e051de18608ccb6b6650f83c5c2ed8382dc5f945579b237a6c64bc1ba820d1906715b42493258f8f7f2006bd49734a9aa303c5561 SHA512 5bb89da0039e372ae8b6b6dfb33850517ca9d71bc32540e5b4dc19ce89b5910a57aff6f4f7182544f90ad89da4eceaad0bc9438bc1958887158fe8f0afabaf59
+DIST kpublictransport-24.08.0.tar.xz 734560 BLAKE2B efcf887f1d72f29235a8466e8d36d6c2caa69d754a06973d68deec176038e856770d512c60fa158cb2c39437215b59e7fc3084a91dca4583b9b8d7f05a814b76 SHA512 7b05e717132a236ec53951fc27be8ad07e8c3bf74c78ef7e30d14f10ff08efb2d4c9a62549b52398a84a8d92f17efa14e19b4ce13b27842b46ade413aa130c56
diff --git a/dev-libs/kpublictransport/kpublictransport-24.05.2.ebuild b/dev-libs/kpublictransport/kpublictransport-24.05.2.ebuild
deleted file mode 100644
index 4a96d36d5103..000000000000
--- a/dev-libs/kpublictransport/kpublictransport-24.05.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
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.6.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.08.0.ebuild b/dev-libs/kpublictransport/kpublictransport-24.08.0.ebuild
new file mode 100644
index 000000000000..0a6316ec8c3d
--- /dev/null
+++ b/dev-libs/kpublictransport/kpublictransport-24.08.0.ebuild
@@ -0,0 +1,39 @@
+# 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.5.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/ktextaddons/ktextaddons-1.5.4.ebuild b/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild
index 91e82c8d59c3..5a371b605683 100644
--- a/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild
+++ b/dev-libs/ktextaddons/ktextaddons-1.5.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/libraries/ktextaddons"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="LGPL-2+"
diff --git a/dev-libs/kweathercore/Manifest b/dev-libs/kweathercore/Manifest
index c9ad5a139be3..ff5125bfd5a3 100644
--- a/dev-libs/kweathercore/Manifest
+++ b/dev-libs/kweathercore/Manifest
@@ -1,2 +1,3 @@
 DIST kweathercore-0.7.tar.xz 57016 BLAKE2B c9fb519e681b5570a60daf224b75f98616a406b1fbdfff49baa771d55031a8f893fdac9cbfed71dedac8f06dc9a11033171f2e22bfc15285e323185a46149c83 SHA512 385514d6ca499db12f243c443e6815b1a5458f4a87da962ea73c5f324c58614fbc854d21d6e5359ee69e7766e75c9144966fd953639a51a09f56a8461d158da8
 DIST kweathercore-0.8.0.tar.xz 76420 BLAKE2B ea0ec5ab24196ce5fa10811c9e54722606121a2176f354320b29121987905d9f6c25f1c332573d8cc2ee3c1bd324fd30d3c94644963431a77dcca3606487992a SHA512 eed813f528422969aed17b831bf6153e49595cf148bb9bda477acdf76d41922eededa55f312d075ccf7bece9e8291dddc0efc92713073fc3c99f438cc0844b69
+DIST kweathercore-24.08.0.tar.xz 75336 BLAKE2B 8ab1639cc1a35407b1ff8bf3fc210574e19a72b5e34fa60a0191b69f46eef22e3729bff9c1e5aa7eb524fa9ae71249f04f5325b4e8ab63fe9518e0bd7eab6612 SHA512 50379a36e2fc6a8ec8937f4e95caedb418891feb475530699f7931f12309d46a2f8da5c95ffd39e55a29b8e14b3b3d31af625c6a939f4805b0e45478772f78c5
diff --git a/dev-libs/kweathercore/kweathercore-0.8.0.ebuild b/dev-libs/kweathercore/kweathercore-0.8.0.ebuild
index 54a4ceb5cc19..188e81a05203 100644
--- a/dev-libs/kweathercore/kweathercore-0.8.0.ebuild
+++ b/dev-libs/kweathercore/kweathercore-0.8.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for retrieval of weather information including forecasts an
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 fi
 LICENSE="LGPL-2+"
 SLOT="6"
diff --git a/dev-libs/kweathercore/kweathercore-24.08.0.ebuild b/dev-libs/kweathercore/kweathercore-24.08.0.ebuild
new file mode 100644
index 000000000000..84cb17ab0481
--- /dev/null
+++ b/dev-libs/kweathercore/kweathercore-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/lager/lager-0.1.1-r1.ebuild b/dev-libs/lager/lager-0.1.1-r1.ebuild
index 720534be9154..76f20f1d7ed8 100644
--- a/dev-libs/lager/lager-0.1.1-r1.ebuild
+++ b/dev-libs/lager/lager-0.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index e815255d25cc..66791131cc50 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,2 +1,2 @@
 DIST level-zero-1.17.19.tar.gz 1150799 BLAKE2B 6c6077424c503b194b93801f0c1a4cab10e53d845ef88d75fae22d8c4ebd91387e03b1e9b37f6dfa43603216f64f20095b43b6b8331e282470c7c7ab1e49204e SHA512 bc5f65180c399a0fb9504db2f3db65c04e32e9fbedd6b0c4ae9eabd77c3586eb5116e553e2a6eab85f738d7a95a2f976062d2f7216fa0c239efb6661c2b6dd2c
-DIST level-zero-1.17.6.tar.gz 1136720 BLAKE2B 89aae9aad33f2aaebb1231dd0cd6aadde692f390fbbfd59933e8df06dc1c5bdd190cdf2887f1f43915f68da130e80e9451359269f8bec6f546f6004214552c13 SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e
+DIST level-zero-1.17.28.tar.gz 1151085 BLAKE2B e47c8821063f7ebe03ba8af601518a9e0f97550299edac5749a4f142c4b3edfe83fd81fda2af02df5089947d6138a9b7ebf3ee7e0eed6db8b8a80eeca4c48a40 SHA512 0498ec279ab73a61ccd4a2c27a8c3837090004e0730c01e92ef6e91f32000ca9e91167b87fbec66668674d86b5dede51470ce4c77dafb58f8b4d982db8b6e490
diff --git a/dev-libs/level-zero/level-zero-1.17.19.ebuild b/dev-libs/level-zero/level-zero-1.17.19.ebuild
index 4034c8711d28..68249c1101f3 100644
--- a/dev-libs/level-zero/level-zero-1.17.19.ebuild
+++ b/dev-libs/level-zero/level-zero-1.17.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/spdlog:="
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/level-zero/level-zero-1.17.28.ebuild b/dev-libs/level-zero/level-zero-1.17.28.ebuild
new file mode 100644
index 000000000000..4034c8711d28
--- /dev/null
+++ b/dev-libs/level-zero/level-zero-1.17.28.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="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/level-zero/level-zero-1.17.6.ebuild b/dev-libs/level-zero/level-zero-1.17.6.ebuild
deleted file mode 100644
index 7b8d9c05924c..000000000000
--- a/dev-libs/level-zero/level-zero-1.17.6.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
-
-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"
-
-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
-}
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
index 16db90846d23..42f465d696ea 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
deleted file mode 100644
index ba1472b33390..000000000000
--- a/dev-libs/libappindicator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
deleted file mode 100644
index c21d074835d9..000000000000
--- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools multilib-minimal vala
-
-DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
-HOMEPAGE="https://launchpad.net/libappindicator"
-
-MY_PV="${PV%_p*}"
-PATCH_VERSION="${PV#*_p}"
-SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSION}.1.orig.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.35.4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}"
-# dev-util/gtk-doc needed for eautoreconf
-BDEPEND="
-	introspection? ( $(vala_depend) )
-	>=dev-util/gtk-doc-1.14
-	>=dev-build/gtk-doc-am-1.14
-	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )
-"
-
-S="${WORKDIR}"
-
-# FIXME: tests keep trying to access dirs they don't have access, feel free
-# to report a bug about how to avoid that
-RESTRICT="test"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Disable MONO for now because of https://bugs.gentoo.org/382491
-	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
-		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-static \
-		--with-gtk=3 \
-		$(multilib_native_use_enable introspection)
-}
-
-multilib_src_compile() {
-	# Was initially reported in 638782, then fixed, and then fix disappeared.
-	# But I facing it every time I (mva) trying to rebuild it on my machine even now (Sep'21)
-	emake -j1
-}
-
-multilib_src_test() {
-	# Prevent tests from trying to write on /dev/fuse
-	GVFS_DISABLE_FUSE=1 dbus-run-session emake check
-}
-
-multilib_src_install() {
-	# Fails in parallel, bug #795444
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libappindicator/metadata.xml b/dev-libs/libappindicator/metadata.xml
deleted file mode 100644
index 77ed12f2f4b4..000000000000
--- a/dev-libs/libappindicator/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-needed -->
-	<upstream>
-		<remote-id type="launchpad">libappindicator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.93.ebuild b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.93.ebuild
index 0173fcfafe1a..8e77dc99fc96 100644
--- a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.93.ebuild
+++ b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3 LGPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.4.ebuild b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.4.ebuild
index 861050f48658..f0833f5254f5 100644
--- a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.4.ebuild
+++ b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild
index 11e8cf11ea37..30e9060ca9c0 100644
--- a/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild
+++ b/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 761865c04ae0..bd0172ca539f 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,2 +1 @@
-DIST libbson-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 DIST libbson-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936
diff --git a/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch b/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch
deleted file mode 100644
index d33fba105ab0..000000000000
--- a/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3371dae..a6edf0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -380,10 +380,6 @@ if (ENABLE_MONGOC)
- 
- endif ()
- 
--install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
--   DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver
--)
--
- if (ENABLE_UNINSTALL)
-    if (WIN32)
-       if (ENABLE_MONGOC)
diff --git a/dev-libs/libbson/libbson-1.18.0.ebuild b/dev-libs/libbson/libbson-1.18.0.ebuild
deleted file mode 100644
index 6d3d8b168b13..000000000000
--- a/dev-libs/libbson/libbson-1.18.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~loong ~ppc ~riscv ~sparc x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-python/sphinx"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
-)
-
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_BSON=ON
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libbson/examples/*.c
-	fi
-
-	cmake_src_install
-}
diff --git a/dev-libs/libbson/libbson-1.24.4.ebuild b/dev-libs/libbson/libbson-1.24.4.ebuild
index 4df0fa69f628..0c735ab9b739 100644
--- a/dev-libs/libbson/libbson-1.24.4.ebuild
+++ b/dev-libs/libbson/libbson-1.24.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~hppa ~loong ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~ppc ~riscv ~sparc x86"
 IUSE="examples static-libs"
 
 BDEPEND="dev-python/sphinx"
diff --git a/dev-libs/libburn/libburn-1.5.6-r1.ebuild b/dev-libs/libburn/libburn-1.5.6-r1.ebuild
index eb026ac0af78..86d587ecf366 100644
--- a/dev-libs/libburn/libburn-1.5.6-r1.ebuild
+++ b/dev-libs/libburn/libburn-1.5.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libcdada/Manifest b/dev-libs/libcdada/Manifest
index a36a36eac009..26770a9acfd3 100644
--- a/dev-libs/libcdada/Manifest
+++ b/dev-libs/libcdada/Manifest
@@ -1,2 +1 @@
-DIST libcdada-0.4.0.tar.gz 1777257 BLAKE2B 26e24fa513ab4a290a7632b4f56c102dc45cd9d34d4a7b7464f58aaee596b5ac3c8172080144d3f3c5cbcf5790f29e74b020f11cea943223e5933c2a7db66f8b SHA512 370a40a070df6783b5f44373bd09751660d51698095fa0ace38943a0331f90a55d131de50180b9ca9597361b7712dbcb350fde77a0e0489c47e4358fec61458b
 DIST libcdada-0.6.1.tar.gz 1780134 BLAKE2B 8b9d4ab481db4460f5b5426f9f46120649ce5d71fdc322cc32ed17df97add0ce54896c8d304d7c735a79abce02e62b499fff85473e940451a145e8aaf5277234 SHA512 d2ce7f2f98520d49f75bd97624f6f765e47edeccaf6f6a7e61cbea6ef2516b8ee8110e0f1d83d6220d050ac746f2d43cf443f1f70b7c20e03a25f6e98d3f5d51
diff --git a/dev-libs/libcdada/libcdada-0.4.0.ebuild b/dev-libs/libcdada/libcdada-0.4.0.ebuild
deleted file mode 100644
index 754eed86424d..000000000000
--- a/dev-libs/libcdada/libcdada-0.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-any-r1
-
-DESCRIPTION="Basic data structures in C"
-HOMEPAGE="https://github.com/msune/libcdada"
-SRC_URI="https://github.com/msune/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.4-Werror.patch
-	"${FILESDIR}"/${PN}-0.3.5-respect-CFLAGS.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with test tests)
-
-		# Needed for tests. We throw them away in src_install anyway.
-		--enable-static
-
-		--disable-valgrind
-		--without-examples
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/dev-libs/libclc/libclc-19.1.0_rc2.ebuild b/dev-libs/libclc/libclc-19.1.0_rc4.ebuild
index 2b8c5e63c257..2b8c5e63c257 100644
--- a/dev-libs/libclc/libclc-19.1.0_rc2.ebuild
+++ b/dev-libs/libclc/libclc-19.1.0_rc4.ebuild
diff --git a/dev-libs/libclc/libclc-20.0.0_pre20240808.ebuild b/dev-libs/libclc/libclc-20.0.0_pre20240830.ebuild
index 2b8c5e63c257..2b8c5e63c257 100644
--- a/dev-libs/libclc/libclc-20.0.0_pre20240808.ebuild
+++ b/dev-libs/libclc/libclc-20.0.0_pre20240830.ebuild
diff --git a/dev-libs/libclc/libclc-20.0.0_pre20240815.ebuild b/dev-libs/libclc/libclc-20.0.0_pre20240910.ebuild
index 2b8c5e63c257..2b8c5e63c257 100644
--- a/dev-libs/libclc/libclc-20.0.0_pre20240815.ebuild
+++ b/dev-libs/libclc/libclc-20.0.0_pre20240910.ebuild
diff --git a/dev-libs/libconfig/libconfig-1.7.3.ebuild b/dev-libs/libconfig/libconfig-1.7.3.ebuild
index 449f75c98860..36cad66a2189 100644
--- a/dev-libs/libconfig/libconfig-1.7.3.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
 HOMEPAGE="
@@ -26,9 +26,14 @@ DEPEND="
 
 src_prepare() {
 	default
+
+	# Fails with c23 b/c old decls
+	append-cflags -std=gnu17
+
 	sed -i \
 		-e '/sleep 3/d' \
 		configure.ac || die
+
 	eautoreconf
 	multilib_copy_sources
 }
diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest
index 5963ebd2359d..f83536124af8 100644
--- a/dev-libs/libcpuid/Manifest
+++ b/dev-libs/libcpuid/Manifest
@@ -1,2 +1,3 @@
 DIST libcpuid-0.6.4.tar.gz 338722 BLAKE2B ad23c13c48b0244f401a60d07fb569712f24b4d1f2bcd16f8d0240c6a39f8afae8944c9d3b4f486d3e1727157d642915c794fc89f9af315a2c4daf64625fdf25 SHA512 5396301d2a5485c6cf15a2fa8eab0ce28d967fe0dcf0776fec3618b963bc786499032150037f6b9123738e094d41583a331bcea25e502b5025ec6f03d318f77e
 DIST libcpuid-0.6.5.tar.gz 370297 BLAKE2B 56394c0f99ee514bad115e614a27e3771e3ab0a27c7e980ed50419f6b22c268461db97aed8c879a66894ea34c788ed7a154ea403ec07a552fb524e321aa931e0 SHA512 c38381e0f768a2cd2a5df601cbcc50d1cb93a276c477bc09e69ff61de01aef30c0b3163f4a0c8e7641caa3cf692d468410ebc90a3cad93e0476cddeb0c444d7b
+DIST libcpuid-0.7.0.tar.gz 442324 BLAKE2B fb3248227ac43fe536b66ee0b13dcb514aeb5be43d09b5a3ada5d944b869b9e6d311b4f1046869aa1f1b00c5c5a7254eeb8206094af1cd6487cefa2aafe78458 SHA512 26353763461cbbe664ddaa6933cbd9016e3b11d8a056bc8c2b92818dfe3a43fcda76a92270f716eeb00ae61b75288c7079add8d7ac2290a0a0d5c3bd7d898d44
diff --git a/dev-libs/libcpuid/libcpuid-0.7.0-r1.ebuild b/dev-libs/libcpuid/libcpuid-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..a336c5daa7e3
--- /dev/null
+++ b/dev-libs/libcpuid/libcpuid-0.7.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{9..12})
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
+HOMEPAGE="http://libcpuid.sourceforge.net/"
+SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/17"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_enable static-libs static)"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild b/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild
index b73abc7975a2..52fb056c3e85 100644
--- a/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.ebuild
+++ b/dev-libs/libdbusmenu-lxqt/libdbusmenu-lxqt-0.1.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libei/libei-1.2.1.ebuild b/dev-libs/libei/libei-1.2.1.ebuild
index 74c5bdf82a84..df7a97ef7977 100644
--- a/dev-libs/libei/libei-1.2.1.ebuild
+++ b/dev-libs/libei/libei-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> mun
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="elogind systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libei/libei-1.3.0.ebuild b/dev-libs/libei/libei-1.3.0.ebuild
index a5ffa4411a13..11ad5e2def0b 100644
--- a/dev-libs/libei/libei-1.3.0.ebuild
+++ b/dev-libs/libei/libei-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> mun
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="elogind systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 2e3e4325cba5..afdb2cef1b53 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,2 +1,2 @@
-DIST libevdev-1.13.1.tar.xz 455484 BLAKE2B 063eefeebebf5253ce23666e31d67d7268ad97e09f84e0e3a02b1024a92f68e1a4f1fc2508304abf49ab05dba4961b49463b640a18c79ea38ca0c5a9d8bf3e9c SHA512 9b75bad4bc13948854c8dff7a7a46aca6c06d1410ccb000f881bf76055ccac040595c3b24fb1a574be875b5c262eb86820b9ec3383752641bc2047135e5a412f
 DIST libevdev-1.13.2.tar.xz 460456 BLAKE2B bdb71525600e2aa3aa264da322e1d7e93270790a48b62baf3df51cf23a6ddf7371cb9de157dd430e632514d1cb3d3b076f8710c43fac4f99e42e7ca503061bee SHA512 558267df0e45d8641a58dddb9fe30e2235ce247d96710189b09512d19d691afbd25189d188bb26bb5092fbbe249fbc7ca60a9e6af4fab535a946d5a3e030a21f
+DIST libevdev-1.13.3.tar.xz 460660 BLAKE2B d4a808ad13e7e5b818bde0b885eb53e109afb0d0ec9b72a80a05a36135c3db955efd092b8f91f0f2393a1f717e2517ed916326dbb32eae13275b89ee0f40003a SHA512 24330c7f6f003c95da97dcb66fcc750437db59ac9049415c35cbcaa1612845363a59180da6b3120c81d7d3f969adb139fa023ed765223e185fb68465d45a0fd2
diff --git a/dev-libs/libevdev/libevdev-1.13.1-r1.ebuild b/dev-libs/libevdev/libevdev-1.13.1-r1.ebuild
deleted file mode 100644
index 300b0dba54e8..000000000000
--- a/dev-libs/libevdev/libevdev-1.13.1-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
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-text/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libevdev/libevdev-1.13.2.ebuild b/dev-libs/libevdev/libevdev-1.13.2.ebuild
index 02e52e0d2c65..4b99687c62a0 100644
--- a/dev-libs/libevdev/libevdev-1.13.2.ebuild
+++ b/dev-libs/libevdev/libevdev-1.13.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevdev/libevdev-1.13.3.ebuild b/dev-libs/libevdev/libevdev-1.13.3.ebuild
new file mode 100644
index 000000000000..41612867b124
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.13.3.ebuild
@@ -0,0 +1,50 @@
+# 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-multilib python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-text/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index f50543480cab..359c2cbc567e 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="6" # libffi.so.6
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
index 8ff355662171..53905933afe6 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${PV}/libffi-${PV}.
 
 LICENSE="MIT"
 SLOT="7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.4.6.ebuild b/dev-libs/libffi/libffi-3.4.6.ebuild
index 999a90fa9eaa..3713aa894046 100644
--- a/dev-libs/libffi/libffi-3.4.6.ebuild
+++ b/dev-libs/libffi/libffi-3.4.6.ebuild
@@ -18,7 +18,7 @@ LICENSE="MIT"
 # Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users
 # with FEATURES="-preserved-libs" or another package manager if SONAME changes.
 SLOT="0/8" # SONAME=libffi.so.8
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug exec-static-trampoline pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild b/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild
index b37fe02a5ea4..d6b3f908352b 100644
--- a/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild
+++ b/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
deleted file mode 100644
index 01f2a6f1a330..000000000000
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Make fuzzy comparisons of strings and byte arrays"
-HOMEPAGE="http://fstrcmp.sourceforge.net/"
-
-LICENSE="GPL-3+"
-IUSE="doc static-libs test"
-SLOT="0"
-
-SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-DEPEND="
-	sys-apps/groff
-	doc? ( app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )
-"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	emake all-bin
-	use doc && emake all-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-bin install-include install-libdir install-man
-	find "${D}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${D}" -name '*.a' -delete || die
-	fi
-	use doc && emake DESTDIR="${D}" install-doc
-	einstalldocs
-}
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
index 658767df2545..bb4f66c93e58 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/fstrcmp-${PV}.D001"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="doc static-libs test"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 BDEPEND="
 	sys-apps/groff
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
deleted file mode 100644
index 91ebc6ed8a52..000000000000
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Make fuzzy comparisons of strings and byte arrays"
-HOMEPAGE="http://fstrcmp.sourceforge.net/"
-
-LICENSE="GPL-3+"
-IUSE="doc test"
-SLOT="0"
-
-SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	sys-apps/groff
-	doc? ( app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )
-"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	emake all-bin
-	use doc && emake all-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-bin install-include install-libdir install-man
-	use doc && emake DESTDIR="${D}" install-doc
-	einstalldocs
-}
diff --git a/dev-libs/libg15/libg15-3.0.7.ebuild b/dev-libs/libg15/libg15-3.0.7.ebuild
index 0a74e03e1c6a..61a2d8a6b216 100644
--- a/dev-libs/libg15/libg15-3.0.7.ebuild
+++ b/dev-libs/libg15/libg15-3.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15.git"
 else
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild b/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild
index bdf4d4d973fc..5b55ccb59b62 100644
--- a/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild
+++ b/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
 else
 	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index 2ee712b6b33c..8e488e4fbb32 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="11" # soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
 	!dev-libs/libgcrypt:0/11
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index d1a9a822a089..ca3ee2ff7a3e 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,2 +1 @@
-DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860
 DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8
diff --git a/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch b/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch
deleted file mode 100644
index aded0c047674..000000000000
--- a/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnt-2.14.0/meson.build
-+++ libgnt-2.14.0/meson.build
-@@ -231,4 +231,6 @@
- 
- subdir('wms')
- subdir('test')
--subdir('doc')
-+if get_option('doc')
-+    subdir('doc')
-+endif
---- libgnt-2.14.0/meson_options.txt
-+++ libgnt-2.14.0/meson_options.txt
-@@ -0,0 +1,2 @@
-+option('doc', type : 'boolean', value : true,
-+       description : 'build documentation with gtk-doc')
diff --git a/dev-libs/libgnt/libgnt-2.14.2.ebuild b/dev-libs/libgnt/libgnt-2.14.2.ebuild
deleted file mode 100644
index b5bce4a12ebd..000000000000
--- a/dev-libs/libgnt/libgnt-2.14.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
-
-inherit meson
-
-DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
-HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
-SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!<net-im/pidgin-2.14.0
-	dev-libs/glib:2
-	dev-libs/libxml2
-	sys-libs/ncurses:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
-	"${FILESDIR}/${PN}-2.14.0-tinfo.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch b/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch
deleted file mode 100644
index efab5084ec8e..000000000000
--- a/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b10af6b0173e647b54834edff087a5811b6bcfe1 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 20 Mar 2024 06:49:57 -0700
-Subject: [PATCH] bindings: cxx: link using the libtool archives
-
-When linking with internal dependencies that were built with libtool the
-most reliable method is to use the libtool archive (.la) files.
-
-When building with slibtool it fails when it doesn't find the -lgpiod
-linker flag, but if libgpiod is already installed to the system it will
-be built using the system version instead of the newly built libraries.
-
-Link: https://bugs.gentoo.org/913899
-Signed-off-by: orbea <orbea@riseup.net>
-[Bartosz: fix a typo in tests Makefile]
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
----
- bindings/cxx/Makefile.am          | 2 +-
- bindings/cxx/examples/Makefile.am | 2 +-
- bindings/cxx/tests/Makefile.am    | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am
-index 1eafaa2c..e2a89cf4 100644
---- a/bindings/cxx/Makefile.am
-+++ b/bindings/cxx/Makefile.am
-@@ -24,8 +24,8 @@ libgpiodcxx_la_CXXFLAGS = -Wall -Wextra -g -std=gnu++17
- libgpiodcxx_la_CXXFLAGS += -fvisibility=hidden -I$(top_srcdir)/include/
- libgpiodcxx_la_CXXFLAGS += $(PROFILING_CFLAGS)
- libgpiodcxx_la_LDFLAGS = -version-info $(subst .,:,$(ABI_CXX_VERSION))
--libgpiodcxx_la_LDFLAGS += -lgpiod -L$(top_builddir)/lib
- libgpiodcxx_la_LDFLAGS += $(PROFILING_LDFLAGS)
-+libgpiodcxx_la_LIBADD = $(top_builddir)/lib/libgpiod.la
- 
- include_HEADERS = gpiod.hpp
- 
-diff --git a/bindings/cxx/examples/Makefile.am b/bindings/cxx/examples/Makefile.am
-index 64ced200..eca4d64a 100644
---- a/bindings/cxx/examples/Makefile.am
-+++ b/bindings/cxx/examples/Makefile.am
-@@ -3,7 +3,7 @@
- 
- AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
- AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17
--AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
-+LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
- 
- noinst_PROGRAMS = \
- 	async_watch_line_value \
-diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am
-index 02b5b6de..fbf80a10 100644
---- a/bindings/cxx/tests/Makefile.am
-+++ b/bindings/cxx/tests/Makefile.am
-@@ -4,9 +4,9 @@
- AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
- AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/
- AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS)
--AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
--AM_LDFLAGS += -lgpiosim -L$(top_builddir)/tests/gpiosim/
--AM_LDFLAGS += -pthread
-+AM_LDFLAGS = -pthread
-+LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
-+LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la
- 
- noinst_PROGRAMS = gpiod-cxx-test
- 
diff --git a/dev-libs/libgudev/libgudev-238-r2.ebuild b/dev-libs/libgudev/libgudev-238-r2.ebuild
index 7e9eb935f5a6..648f593bddb0 100644
--- a/dev-libs/libgudev/libgudev-238-r2.ebuild
+++ b/dev-libs/libgudev/libgudev-238-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild
index f4d947713309..eca82a53fd97 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="gtk +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
deleted file mode 100644
index a88a7b7ef548..000000000000
--- a/dev-libs/libindicator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
deleted file mode 100644
index dcbf50b43151..000000000000
--- a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-https://bugs.gentoo.org/698774
---- a/libindicator/Makefile.am
-+++ b/libindicator/Makefile.am
-@@ -57,7 +57,7 @@ libindicator_la_CFLAGS = \
- 	$(LIBINDICATOR_CFLAGS) \
- 	$(COVERAGE_CFLAGS) \
- 	-DG_LOG_DOMAIN=\"libindicator\" \
--	-Wall -Werror
-+	-Wall
- 
- libindicator_la_LIBADD = \
- 	$(LIBINDICATOR_LIBS)
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -38,7 +38,7 @@ test_loader_SOURCES = \
- 	test-loader.c
- 
- test_loader_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
- 	-DBUILD_DIR="\"$(builddir)\""
- 
-@@ -57,7 +57,7 @@ test_desktop_shortcuts_SOURCES = \
- 	test-desktop-shortcuts.c
- 
- test_desktop_shortcuts_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	-DSRCDIR="\"$(srcdir)\"" \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
- 	-DBUILD_DIR="\"$(abs_builddir)\""
-@@ -91,7 +91,7 @@ libdummy_indicator_blank_la_SOURCES = \
- 	dummy-indicator-blank.c
- 
- libdummy_indicator_blank_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_blank_la_LIBADD = \
-@@ -111,7 +111,7 @@ libdummy_indicator_null_la_SOURCES = \
- 	dummy-indicator-null.c
- 
- libdummy_indicator_null_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_null_la_LIBADD = \
-@@ -131,7 +131,7 @@ libdummy_indicator_signaler_la_SOURCES = \
- 	dummy-indicator-signaler.c
- 
- libdummy_indicator_signaler_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_signaler_la_LIBADD = \
-@@ -151,7 +151,7 @@ libdummy_indicator_simple_la_SOURCES = \
- 	dummy-indicator-simple.c
- 
- libdummy_indicator_simple_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_simple_la_LIBADD = \
-@@ -172,7 +172,7 @@ libdummy_indicator_entry_func_la_SOURCES = \
- 	dummy-indicator-entry-func.h
- 
- libdummy_indicator_entry_func_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_entry_func_la_LIBADD = \
-@@ -192,7 +192,7 @@ libdummy_indicator_visible_la_SOURCES = \
- 	dummy-indicator-visible.c
- 
- libdummy_indicator_visible_la_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- libdummy_indicator_visible_la_LIBADD = \
-@@ -214,7 +214,7 @@ service_shutdown_timeout_SOURCES = \
- 	service-shutdown-timeout.c
- 
- service_shutdown_timeout_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_shutdown_timeout_LDADD = \
-@@ -240,7 +240,7 @@ service_manager_no_connect_SOURCES = \
- 	service-manager-no-connect.c
- 
- service_manager_no_connect_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_no_connect_LDADD = \
-@@ -272,7 +272,7 @@ service_manager_connect_SOURCES = \
- 	service-manager-connect.c
- 
- service_manager_connect_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_connect_LDADD = \
-@@ -286,7 +286,7 @@ service_manager_connect_service_SOURCES = \
- 	service-manager-connect-service.c
- 
- service_manager_connect_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_connect_service_LDADD = \
-@@ -319,7 +319,7 @@ service_version_manager_SOURCES = \
- 	service-version-manager.c
- 
- service_version_manager_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_manager_LDADD = \
-@@ -334,7 +334,7 @@ service_version_bad_service_SOURCES = \
- 	service-version-bad-service.c
- 
- service_version_bad_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_bad_service_LDADD = \
-@@ -349,7 +349,7 @@ service_version_good_service_SOURCES = \
- 	service-version-good-service.c
- 
- service_version_good_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_good_service_LDADD = \
-@@ -376,7 +376,7 @@ service_version_multiwatch_manager_SOURCES = \
- 	service-version-multiwatch-manager.c
- 
- service_version_multiwatch_manager_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_multiwatch_manager_LDADD = \
-@@ -391,7 +391,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \
- 	service-version-multiwatch-manager-impolite.c
- 
- service_version_multiwatch_manager_impolite_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_multiwatch_manager_impolite_LDADD = \
-@@ -406,7 +406,7 @@ service_version_multiwatch_service_SOURCES = \
- 	service-version-multiwatch-service.c
- 
- service_version_multiwatch_service_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_version_multiwatch_service_LDADD = \
-@@ -432,7 +432,7 @@ service_manager_nostart_connect_SOURCES = \
- 	service-manager-nostart-connect.c
- 
- service_manager_nostart_connect_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
- 
- service_manager_nostart_connect_LDADD = \
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -17,7 +17,7 @@ indicator_loader_SOURCES = \
- 	indicator-loader.c
- 
- indicator_loader_CFLAGS = \
--	-Wall -Werror \
-+	-Wall \
- 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
- 	-DBUILD_DIR="\"$(builddir)\""
- 
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
deleted file mode 100644
index eac1e73aa288..000000000000
--- a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/777087
-https://bugs.launchpad.net/libindicator/+bug/1502925
-Thanks-to: orbea <orbea@riseup.net>
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
- 
- AM_MAINTAINER_MODE([enable])
- 
--AM_SILENT_RULES([yes])]
-+AM_SILENT_RULES([yes])
- 
- # Check for programs
- AC_PROG_CC
-@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
- AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
- 
- LT_LIB_M
--LIBINDICATOR_LIBS+="$LIBM"
-+LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
- 
- ##############################
- # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
deleted file mode 100644
index e5cd461a3d61..000000000000
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic virtualx multilib-minimal
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="https://launchpad.net/libindicator"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )
-"
-
-PATCHES=(
-	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
-	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
-	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-flags -Wno-error
-
-	local myconf=(
-		--disable-static
-		--with-gtk=2
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# bug #391179
-	virtx emake
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	rm -vf \
-		"${ED}"/usr/lib*/libdummy-indicator-* \
-		"${ED}"/usr/share/${PN}/*indicator-debugging \
-		|| die
-}
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
deleted file mode 100644
index ffc9b7d517bd..000000000000
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic virtualx multilib-minimal
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="https://launchpad.net/libindicator"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )"
-
-PATCHES=(
-	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
-	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
-	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-flags -Wno-error
-
-	local myconf=(
-		--disable-static
-		--with-gtk=3
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	# bug #391179
-	virtx emake
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libindicator/metadata.xml b/dev-libs/libindicator/metadata.xml
deleted file mode 100644
index 38903ed6bdfb..000000000000
--- a/dev-libs/libindicator/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-needed -->
-	<upstream>
-		<remote-id type="launchpad">libindicator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ff29a4109c4d..3cd8898c6d7b 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,2 +1,2 @@
-DIST libinput-1.25.0.tar.bz2 812020 BLAKE2B 03034b6315c281d7eee6a7bc1f4c799c2c7f74add7a195501de75feb6b98fa8dc601b7573da5586b2b2882c3cfaddfad62f5c1b836402dce1f463bdb2884945d SHA512 b9dc3f3b5f34c82399dfb7ccb5f65d19a596c415f0198b39e3f360f5b87c42124a5355c8d9f6f42cc9ae2d4f9a90fe5da6260136fa83d278048392f93381a84b
 DIST libinput-1.26.1.tar.bz2 823409 BLAKE2B c9b807d40bb247330c31769cbcff1a2a506504ac952841463e5fb67717b5d002de204caa8be3298d3920c20a85c55b453a6d63a8940a6b0f088cb474f4fe73c0 SHA512 d4611fc75ee6091f3139134f348db79d710560c27a936c7a8c0dc50657d6e1bdbdb1b44fb4c2c668a5b45934d91d3aef336d4096806807354472b25e298cdab6
+DIST libinput-1.26.2.tar.bz2 824312 BLAKE2B df463f377cf2f246f6b5b35bdc69039830b4eb5b836a8df9698330140b1bc4b31c7dd50d8ffdec7c935e8b14909d98436ce8f1f9a6d0120e4b72f29381f9b697 SHA512 51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6
diff --git a/dev-libs/libinput/libinput-1.25.0.ebuild b/dev-libs/libinput/libinput-1.25.0.ebuild
deleted file mode 100644
index 00fdfcb82be1..000000000000
--- a/dev-libs/libinput/libinput-1.25.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2014-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 ~ia64 ~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/libinput/libinput-1.26.2.ebuild b/dev-libs/libinput/libinput-1.26.2.ebuild
new file mode 100644
index 000000000000..aa30dda6ab5c
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.26.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2014-2024 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 ~ia64 ~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/libisoburn/libisoburn-1.5.6-r1.ebuild b/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild
index 9da120f44b7a..15eaeafd009d 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild b/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild
index 8a18790d28c3..aebfee7bfe70 100644
--- a/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.6_p1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libjodycode/libjodycode-3.1.1.ebuild b/dev-libs/libjodycode/libjodycode-3.1.1.ebuild
index 6cfd69fbba48..70e921414c10 100644
--- a/dev-libs/libjodycode/libjodycode-3.1.1.ebuild
+++ b/dev-libs/libjodycode/libjodycode-3.1.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 # missing test script
 # https://github.com/jbruchon/jdupes/issues/191
diff --git a/dev-libs/libkdumpfile/Manifest b/dev-libs/libkdumpfile/Manifest
new file mode 100644
index 000000000000..14ac192613b4
--- /dev/null
+++ b/dev-libs/libkdumpfile/Manifest
@@ -0,0 +1 @@
+DIST libkdumpfile-0.5.4.tar.bz2 623108 BLAKE2B 17a425c2a0545f60574255d5ec139f60a59dd2c9c047a89f9d021afe31cae959c691b550d9ad4e10c88a11f5f1bab1a4d94dab025060dcd2598837442281b3b9 SHA512 6cdd77e3460b324f4e0641fc8f4cf1dcd8b7de4ec82a37ca11e4edfa7730f90305c2724825f8b1cf8ac2e8ad104fee1b6a36775287b084db802ae2f44a55cd85
diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch
new file mode 100644
index 000000000000..4b5c0cb4c8fc
--- /dev/null
+++ b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-32-bit-tests.patch
@@ -0,0 +1,73 @@
+https://github.com/ptesarik/libkdumpfile/commit/16c73b83a78c1bfb55f3e9823b09fce549c8ec11
+
+From 16c73b83a78c1bfb55f3e9823b09fce549c8ec11 Mon Sep 17 00:00:00 2001
+From: Petr Tesarik <petr@tesarici.cz>
+Date: Thu, 23 May 2024 13:01:17 +0200
+Subject: [PATCH] Fix file cache test for 32-bit architectures
+
+If 64-bit file offsets are selected with _FILE_OFFSET_BITS on a 32-bit
+architecture, the default mmap() call takes a 64-bit off_t, but dlsym()
+returns a pointer to a function that takes a 32-bit off_t.
+
+To fix it:
+
+- always call original mmap64() if it is available,
+- use XSTRINGIFY(mmap) instead of "mmap".
+
+The latter is needed, because some systems define mmap as a macro which
+expands to another identifier.
+
+Fixes: #80
+Signed-off-by: Petr Tesarik <petr@tesarici.cz>
+---
+ configure.ac                |  2 ++
+ src/kdumpfile/test-fcache.c | 13 ++++++++++++-
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 04d1c6fa..93ebb39d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,6 +61,8 @@ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(off_t)
+ AC_SUBST(SIZEOF_OFF_T, $ac_cv_sizeof_off_t)
+ 
++AC_CHECK_FUNCS(mmap64)
++
+ dnl This makes sure pkg.m4 is available.
+ m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
+ 
+diff --git a/src/kdumpfile/test-fcache.c b/src/kdumpfile/test-fcache.c
+index 1ed57447..604ed540 100644
+--- a/src/kdumpfile/test-fcache.c
++++ b/src/kdumpfile/test-fcache.c
+@@ -64,9 +64,20 @@ static char *mmapbuf;
+ 
+ static int failmmap;
+ 
++#ifdef HAVE_MMAP64
++
++#define STR_MMAP	XSTRINGIFY(mmap64)
++static void* (*orig_mmap)(void *addr, size_t length, int prot, int flags,
++			  int fd, off64_t offset);
++
++#else
++
++#define STR_MMAP	XSTRINGIFY(mmap)
+ static void* (*orig_mmap)(void *addr, size_t length, int prot, int flags,
+ 			  int fd, off_t offset);
+ 
++#endif
++
+ void *
+ mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+ {
+@@ -445,7 +456,7 @@ main(int argc, char **argv)
+ 		return TEST_ERR;
+ 	}
+ 
+-	orig_mmap = dlsym(RTLD_NEXT, "mmap");
++	orig_mmap = dlsym(RTLD_NEXT, STR_MMAP);
+ 	if (!orig_mmap) {
+ 		fprintf(stderr, "Cannot get original mmap() address: %s\n",
+ 			dlerror());
diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch
new file mode 100644
index 000000000000..959af60454ef
--- /dev/null
+++ b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-c99.patch
@@ -0,0 +1,48 @@
+https://github.com/ptesarik/libkdumpfile/commit/3682f5cad70146ab35d05af251d4461ef650b4b5
+
+From 3682f5cad70146ab35d05af251d4461ef650b4b5 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 4 Jan 2024 12:36:53 +0100
+Subject: [PATCH] Python 3 does not have a tp_print member in PyTypeObject
+
+This avoids an int-conversion compiler error with current
+compilers:
+
+./kdumpfile.c:1449:9: error: initialization of 'long int' from 'int (*)(PyObject *, FILE *, int)' {aka 'int (*)(struct _object *, FILE *, int)'} makes integer from pointer without a cast
+ 1449 |         attr_dir_print,                 /* tp_print*/
+      |         ^~~~~~~~~~~~~~
+
+
+In Python 3.11, the field at this position is called tp_vectorcall_offset
+and has type Py_ssize_t, hence the error.
+--- a/python/kdumpfile.c
++++ b/python/kdumpfile.c
+@@ -1143,7 +1143,6 @@ attr_dir_repr(PyObject *_self)
+ 	Py_XDECREF(colon);
+ 	return result;
+ }
+-#endif
+ 
+ static int
+ attr_dir_print(PyObject *_self, FILE *fp, int flags)
+@@ -1214,6 +1213,7 @@ attr_dir_print(PyObject *_self, FILE *fp, int flags)
+ 	kdump_attr_iter_end(ctx, &iter);
+ 	return -1;
+ }
++#endif
+ 
+ static PyObject *
+ attr_iterkey_new(PyObject *_self)
+@@ -1446,7 +1446,11 @@ static PyTypeObject attr_dir_object_type =
+ 	sizeof(char),			/* tp_itemsize*/
+ 	/* methods */
+ 	attr_dir_dealloc,		/* tp_dealloc*/
++#if PY_MAJOR_VERSION < 3
+ 	attr_dir_print,			/* tp_print*/
++#else
++	0,
++#endif
+ 	0,				/* tp_getattr*/
+ 	0,				/* tp_setattr*/
+ 	0,				/* tp_compare*/
+
diff --git a/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch
new file mode 100644
index 000000000000..5748a27e1e81
--- /dev/null
+++ b/dev-libs/libkdumpfile/files/libkdumpfile-0.5.4-disabled-compression-tests.patch
@@ -0,0 +1,68 @@
+https://github.com/ptesarik/libkdumpfile/commit/d529a573ab2cdbda501309e377007812e6de3351
+
+From d529a573ab2cdbda501309e377007812e6de3351 Mon Sep 17 00:00:00 2001
+From: Stephen Brennan <stephen.s.brennan@oracle.com>
+Date: Fri, 19 Jan 2024 11:52:24 -0800
+Subject: [PATCH] tests: skip tests which apply to disabled compression
+
+If configured --without-libzstd, for example, the diskdump-basic-zstd
+test will return an ERROR code, causing "make check" to fail. Even using
+XFAIL_TESTS will not resolve the error, because the return code is
+ERROR, not FAIL.
+
+Instead, conditionally include the tests based on whether we are
+compiling with each compression format. This way, we don't test
+unsupported features.
+
+Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
+---
+ m4/compression.m4 |  1 +
+ tests/Makefile.am | 17 +++++++++++++----
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/m4/compression.m4 b/m4/compression.m4
+index 6755ef13..8cb7ce2d 100644
+--- a/m4/compression.m4
++++ b/m4/compression.m4
+@@ -32,4 +32,5 @@ AC_SUBST([$2][_REQUIRES])
+ AC_SUBST([$2][_CFLAGS])
+ AC_SUBST([$2][_LIBS])
+ AC_SUBST([$2][_PC_LIBS])
++AM_CONDITIONAL(HAVE_$2, test "x$have_$1" = xyes)
+ ])
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 0c03b20b..8ac90b39 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -196,10 +196,6 @@ test_scripts = \
+ 	diskdump-empty-s390x \
+ 	diskdump-empty-x86_64 \
+ 	diskdump-basic-raw \
+-	diskdump-basic-zlib \
+-	diskdump-basic-lzo \
+-	diskdump-basic-snappy \
+-	diskdump-basic-zstd \
+ 	diskdump-flat-raw \
+ 	diskdump-multiread \
+ 	diskdump-excluded \
+@@ -331,6 +327,19 @@ test_scripts = \
+ 	xlat-xen-x86_64-4.6-bigmem \
+ 	zero-size
+ 
++if HAVE_ZSTD
++test_scripts += diskdump-basic-zstd
++endif
++if HAVE_ZLIB
++test_scripts += diskdump-basic-zlib
++endif
++if HAVE_LZO
++test_scripts += diskdump-basic-lzo
++endif
++if HAVE_SNAPPY
++test_scripts += diskdump-basic-snappy
++endif
++
+ dist_check_DATA = \
+ 	addrmap-single-begin.expect \
+ 	addrmap-single-middle.expect \
+
diff --git a/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild b/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..a0f045ef6f41
--- /dev/null
+++ b/dev-libs/libkdumpfile/libkdumpfile-0.5.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Kernel coredump file access"
+HOMEPAGE="https://github.com/ptesarik/libkdumpfile"
+SRC_URI="https://github.com/ptesarik/libkdumpfile/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="lzo snappy zlib zstd"
+
+DEPEND="
+	lzo? ( dev-libs/lzo )
+	snappy? ( app-arch/snappy:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c99.patch
+	"${FILESDIR}"/${P}-disabled-compression-tests.patch
+	"${FILESDIR}"/${P}-32-bit-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# Can drop on next release >0.5.4
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# The Python bindings within libkdumpfile are deprecated
+		# and don't work w/ PEP517. There's a new CFFI bindings
+		# project we can use if anyone asks for them.
+		--without-python
+		$(use_with lzo lzo2)
+		$(use_with snappy)
+		$(use_with zlib)
+		$(use_with zstd libzstd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libkdumpfile/metadata.xml b/dev-libs/libkdumpfile/metadata.xml
new file mode 100644
index 000000000000..57d3a905a40e
--- /dev/null
+++ b/dev-libs/libkdumpfile/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>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ptesarik/libkdumpfile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index f994b75503da..d6ef406bec42 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,4 @@
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609
 DIST libtool-2.5.1.tar.xz 1043544 BLAKE2B ae1e45c9d56a94980549476ed5abb7d617491360ff23ce88da9e884630280004152a9f5a96267be710930f14917bf7b00ab212acd4c65ceba1e201d2f01809e0 SHA512 ac0a6a8570ff81099585f6c3bf5a8f94851457a068b808e505422276a22638b1912a81f94e185bc2f8661b7abe2f2b2482b1af2cf42307787cbbd71d1b1612da
+DIST libtool-2.5.2.tar.xz 1046372 BLAKE2B 12e3d1f948f64031519ad5619573593b2518ec63cb8e3d69487a4b6104f5ee385c2123d3163c036fe10ca7214ba7558b6bd7fb56d22f1e249945a50091e18862 SHA512 cd6eb8ea470dd5bbfdfcfb06f31b36c84962f09c7155ca8175bc340b0a0289ca85dc9ea6e49c02e6876630913031739ef71dae231bc76c44f0c24e1be09d8cee
diff --git a/dev-libs/libltdl/libltdl-2.5.2.ebuild b/dev-libs/libltdl/libltdl-2.5.2.ebuild
new file mode 100644
index 000000000000..0dc5df4fd2b2
--- /dev/null
+++ b/dev-libs/libltdl/libltdl-2.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-build/libtool.
+
+inherit multilib-minimal flag-o-matic
+
+MY_P="libtool-${PV}"
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+if ! [[ $(( $(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 ~ia64 ~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
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+# libltdl doesn't have a testsuite.  Don't bother trying.
+RESTRICT="test"
+
+BDEPEND="app-arch/xz-utils"
+
+multilib_src_configure() {
+	# bug #907427
+	filter-lto
+
+	append-lfs-flags
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-ltdl-install \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. # bug #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+}
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index fd28ca8653f6..a0be7271c178 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,2 +1 @@
-DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
 DIST liblzw-0.3.tar.xz 901084 BLAKE2B 4aa9689f82567b5ad1ac399eed8f58dfb1964f91c74cba2b291458dac89b0c4ce6a110b24b5a8f69bbcddfb0cf14fa0f80107275c16b7553375bbf38e035262a SHA512 d7fcb5c424c87a3692a8a18cd9f4cf57a7faa4f59f01cfdeff335633fb3be6c577409d996d59273f4453eb157dd9bc8fa6ec2868dbca635147d27d3fd00016f9
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
deleted file mode 100644
index 0ee10d1aacfb..000000000000
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="small C library for reading LZW compressed files (.Z)"
-HOMEPAGE="https://github.com/vapier/liblzw"
-SRC_URI="https://downloads.sourceforge.net/freestdf/${P}.tar.lzma"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k ~s390 x86"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblzw/liblzw-0.3-r1.ebuild b/dev-libs/liblzw/liblzw-0.3-r1.ebuild
new file mode 100644
index 000000000000..97079daf6d78
--- /dev/null
+++ b/dev-libs/liblzw/liblzw-0.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="small C library for reading LZW compressed files (.Z)"
+HOMEPAGE="https://github.com/vapier/liblzw"
+SRC_URI="https://github.com/vapier/liblzw/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~x86"
+IUSE="static-libs"
+
+src_configure() {
+	econf --disable-werror $(use_enable static{-libs,})
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild
index 811df19604d7..87835daac897 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
index 70f48ed9e326..d72f30847556 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
index 9290dd9b018c..2e90a097a56d 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libmspack/libmspack-0.11_alpha.ebuild b/dev-libs/libmspack/libmspack-0.11_alpha.ebuild
index 2a4ad5dfcc64..90c8ab2d131f 100644
--- a/dev-libs/libmspack/libmspack-0.11_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.11_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libnl/libnl-3.9.0.ebuild b/dev-libs/libnl/libnl-3.9.0.ebuild
index 157fe4e901fc..516e08b45d19 100644
--- a/dev-libs/libnl/libnl-3.9.0.ebuild
+++ b/dev-libs/libnl/libnl-3.9.0.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 	S="${WORKDIR}/${LIBNL_P}"
 fi
diff --git a/dev-libs/liboil/liboil-0.3.17-r5.ebuild b/dev-libs/liboil/liboil-0.3.17-r5.ebuild
index cc494faf3d93..9d58b155b859 100644
--- a/dev-libs/liboil/liboil-0.3.17-r5.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
index 720feb445c04..3e0f2e9729b2 100644
--- a/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.44-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
 REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 5bc7edb2faf3..f2c0dc48bcbf 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,3 +1,2 @@
-DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
 DIST libpfm-4.12.0.tar.gz 1109288 BLAKE2B 035133d98305317b8331de9f3d986bf37b290cc80d2b944e9bac1c48a8659984ac190a0af1abe64bd9e0fee465f31ca11e3a35702f8a8da8a8a480a1aa625ac7 SHA512 dc47d862d619241db4a077a98b3f71a68f04be1be41e10c7b7dd2e596e6c79e9e0ff1d1028798dfb280553f98296b4b57339b4e6675749e1497dc1c9de06d9f8
 DIST libpfm-4.13.0.tar.gz 1128221 BLAKE2B 71fddec8993acec5c14d140d80804d41a12ae2fe22368b74bf94f10f95f51946bf9150b4329ca481756228366fc86b1ff5f795a97de181d211dc175c374a5653 SHA512 e61b210aa2ce80f0e47603c88eee2e4f2fe30ca2c0e194a5472b6a8de3bf9dc1085e5261bbb9ddbe5b6531c4b391fb34f20d038e5ebd8e6f4c14c2112aee508f
diff --git a/dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch b/dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch
new file mode 100644
index 000000000000..f5225bbc7f71
--- /dev/null
+++ b/dev-libs/libpfm/files/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/935529
+
+__WORDSIZE__ is used for getting correct ABI struct sizes, its undeclared on musl unless you include the bits/reg.h header.
+
+--- a/include/perfmon/pfmlib.h    2023-03-29 02:44:33.000000000 +0300
++++ b/include/perfmon/pfmlib.h  2024-08-24 12:45:29.084265290 +0300
+@@ -38,6 +38,9 @@
+ #include <unistd.h>
+ #include <inttypes.h>
+ #include <stdio.h>
++#ifndef __GLIBC__
++#include <bits/reg.h>
++#endif
+ 
+ #define LIBPFM_VERSION         (4 << 16 | 0)
+ #define PFM_MAJ_VERSION(v)     ((v)>>16)
+
diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild
deleted file mode 100644
index 3c2d5ee9c217..000000000000
--- a/dev-libs/libpfm/libpfm-4.11.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=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hardware-based performance monitoring interface for Linux"
-HOMEPAGE="https://perfmon2.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-
-	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
-		-i lib/Makefile || die
-	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
-		-i config.mk || die
-}
-
-src_compile() {
-	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" DBG=
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install
-	dodoc README
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libpfm/libpfm-4.13.0.ebuild b/dev-libs/libpfm/libpfm-4.13.0.ebuild
index b6fa60319c8d..cc9298b12519 100644
--- a/dev-libs/libpfm/libpfm-4.13.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.13.0.ebuild
@@ -11,9 +11,13 @@ SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-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="static-libs"
 
+PATCHES=(
+	"${FILESDIR}"/libpfm-4.13.0-musl-WORDSIZE_undeclared.patch
+)
+
 src_prepare() {
 	default
 
@@ -29,8 +33,7 @@ src_compile() {
 }
 
 src_test() {
-	cd tests || die
-	./validate || die
+	./tests/validate -A || die
 }
 
 src_install() {
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 8f48c9c2aeef..b233cc526d66 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1 +1,2 @@
 DIST libpipeline-1.5.7.tar.gz 977735 BLAKE2B b8f9ff6886f8df12e3fefbfaa0cbcb1e07d7baaa8a1dfcf4bc01c17c6632b8c6a40e55395f1e4870ca391eefb1535ebbc3931fcdee51cf5f4293741e437a2f25 SHA512 bb3be954f5d826cef805f85d65759fb197c31adf80d92360c7d0caa486e0d4877510681390ca01c028b6e805f968f14e8bf4b3eca02e429529031787e7f14d84
+DIST libpipeline-1.5.8.tar.gz 1070254 BLAKE2B 1feb1a9493fd0850b4e3e446619e7e042bd97d8c0bbb3e13a91d90d6cde3ca2c17fb8a3ca256f65291dadc4d8703ad5d3a795839bf8280adc4547b3ec3d2da7d SHA512 0ae94df4bd508f0e664fa5430687d64904c60d69d9565c18cacb70251f8653cb7c571325d1406c859fdd149048adce8c4b3bf028573064496d7da3436e27b9b0
diff --git a/dev-libs/libpipeline/libpipeline-1.5.8.ebuild b/dev-libs/libpipeline/libpipeline-1.5.8.ebuild
new file mode 100644
index 000000000000..996db35e8502
--- /dev/null
+++ b/dev-libs/libpipeline/libpipeline-1.5.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A pipeline manipulation library"
+HOMEPAGE="https://libpipeline.nongnu.org/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libqtxdg/libqtxdg-4.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-4.0.0.ebuild
index 224fc7c6f982..a2af811db096 100644
--- a/dev-libs/libqtxdg/libqtxdg-4.0.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-4.0.0.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 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
index 86c99f805fc2..166326818146 100644
--- a/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-2.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PYTHON_COMPAT=( python3_{9..12} )
 
-inherit python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 DESCRIPTION="Apache Kafka C/C++ client library"
 HOMEPAGE="https://github.com/confluentinc/librdkafka"
@@ -66,6 +66,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# error: unknown register name ‘%edx’ in ‘asm’
+	# https://bugs.gentoo.org/895464
+	# https://github.com/confluentinc/librdkafka/issues/2426
+	filter-lto
+
 	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
 
 	local myeconf=(
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 7e43e656f67d..ac713a928e4e 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,2 +1 @@
-DIST librelp-1.10.0.tar.gz 543414 BLAKE2B 3c7bace3c7892755c943dc4fc9bee7962e6891f5200ac184555da5f552d19d65f5604c745653d06a87210152af9b57f7234636e59257dd29dc83b5dc566c9680 SHA512 a38840231902bec034edb497166deded7577c989e4f735e406c8488384972925de1ca6132b3080472f7919d2439559c8774c02a49c356e90ad791dfbba2a4865
 DIST librelp-1.11.0.tar.gz 546841 BLAKE2B 3645675f7300cca72847973e2414c7ead560f4dcf6d3eb92ae53ce2b279d6a19b792f6fa6b4e9f837710681f0a224c4a85f90091dd45d46aae5ef16180f4a1ee SHA512 e93cbc12fb6e596762c351cdfa3293fea89dd8cf90de4f890771216b56c3f66e3578fefea447d4ca9f754f146712481e7bab9a831f16fcf0cd15b10d475925bc
diff --git a/dev-libs/librelp/librelp-1.10.0-r1.ebuild b/dev-libs/librelp/librelp-1.10.0-r1.ebuild
deleted file mode 100644
index 5aac6f9418b9..000000000000
--- a/dev-libs/librelp/librelp-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,72 +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 python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-# subslot = soname version
-SLOT="0/0.5.1"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv sparc x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:= )
-		openssl? ( dev-libs/openssl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-Werror
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.11.0.ebuild b/dev-libs/librelp/librelp-1.11.0.ebuild
index 6f4cf576be1a..82d43eb4adcc 100644
--- a/dev-libs/librelp/librelp-1.11.0.ebuild
+++ b/dev-libs/librelp/librelp-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools python-any-r1
 
 DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
+HOMEPAGE="
+	https://www.rsyslog.com/librelp/
+	https://github.com/rsyslog/librelp
+"
 SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ doc? ( FDL-1.3 )"
diff --git a/dev-libs/librelp/metadata.xml b/dev-libs/librelp/metadata.xml
index f0df933ee186..0bfd3eff873b 100644
--- a/dev-libs/librelp/metadata.xml
+++ b/dev-libs/librelp/metadata.xml
@@ -6,4 +6,7 @@
 		<flag name="gnutls">Use GnuTLS</flag>
 		<flag name="openssl">Use OpenSSL</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">rsyslog/librelp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
index 2de7d3048000..56ad3d926ecf 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
index 6893461f6422..6db6d3460677 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm ecdh +experimental +extrakeys gmp lowmem +recovery +schnorr test test-openssl valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
index 61e3902587f1..79a0e0645c56 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
index 61e3902587f1..79a0e0645c56 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
index 8a347f00c909..2dec25ffea39 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
index a5459332d0dc..aaaa18bf272d 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
index fcf78c907148..192acd0850fc 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
index 8552fa52421f..8fe239598e0a 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
index f048f1b97499..55280246676e 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
index d66e76e13da1..cedf74a5353d 100644
--- a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -6,7 +6,7 @@ EAPI="8"
 inherit autotools
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/dev-libs/libserialport/libserialport-9999.ebuild b/dev-libs/libserialport/libserialport-9999.ebuild
index e1d11628901a..1f0cccb8afa6 100644
--- a/dev-libs/libserialport/libserialport-9999.ebuild
+++ b/dev-libs/libserialport/libserialport-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/dev-libs/libsodium/libsodium-1.0.20.ebuild b/dev-libs/libsodium/libsodium-1.0.20.ebuild
index 35a5bc16739b..5cf379643c92 100644
--- a/dev-libs/libsodium/libsodium-1.0.20.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.20.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+asm static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 55f6d02f827d..87b4a02c4105 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1 +1,2 @@
 DIST libthreadar-1.4.0.tar.gz 445672 BLAKE2B ce4165bfa507f27ea071dab067e1cda61e0812fd106ab80f0ef04a53ac68ce866a3d7c5ce6a26d6e9fc2c2085de7b8636492711a15a7103cc16b773d0a87aebe SHA512 3665817cf6327d4d24792d8cc2bd0a458bda1651b471e3440c1f63c22f397cfb4c8d81482f937e13f67f5ff1414662b1f69d9c311362a0a7a9249e8bc0236751
+DIST libthreadar-1.5.0.tar.gz 460637 BLAKE2B 41ac9ae8bea6d9ae695b9c8984c842de8863ebd946ad424027a43e04ace7244e8a9414b28470d509c4567ec60a816835f6ad3a52ec9d2d8906fe09e48c720587 SHA512 b54b8f25be350d9262123413b0850c147a00684605f5394b27afea9b14d282fdfc2bd74abefa67e61f14fc2a28da7fa1eba78266f05a51b1ea5193f99ae51909
diff --git a/dev-libs/libthreadar/libthreadar-1.5.0.ebuild b/dev-libs/libthreadar/libthreadar-1.5.0.ebuild
new file mode 100644
index 000000000000..8f5114cc1805
--- /dev/null
+++ b/dev-libs/libthreadar/libthreadar-1.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Threading library used by dar archiver"
+HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
+SRC_URI="https://downloads.sourceforge.net/libthreadar/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_prepare() {
+	default
+
+	# don't build examples, they are not installed
+	sed -i -e '/^SUBDIRS =/d' doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-build-html
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+	rm -r "${ED}"/usr/share/doc/${PF}/html || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtracecmd/Manifest b/dev-libs/libtracecmd/Manifest
index 1f926db9b119..9c95f72138d9 100644
--- a/dev-libs/libtracecmd/Manifest
+++ b/dev-libs/libtracecmd/Manifest
@@ -1 +1,2 @@
 DIST libtracecmd-1.5.1.tar.gz 357041 BLAKE2B 84410dda0f50d536606727b9c99cd094aad3efbb0410fa78b1973dce4c3c2c7e8fef46614a210b22daa88f56a410b9216acf4d247c054c8c948b4716cb0d7aa5 SHA512 0fa0b6a912164284e6db3c95d99c46e0f6726021fa7f76e531871d6424c0a5d8f316244f75a5c85b06b1cd5aa7349dcb286185fa3a0b36a08c8b7eac38ad8192
+DIST libtracecmd-1.5.2.tar.gz 363431 BLAKE2B c21523f3b487ed742cc3fa67ccfdeca89ea3f571aef1240e3c6dea55588661752dee772948376e5d5612de588aae5dd02f9c407a30e6c5fb537a71fbeaad473b SHA512 aaaa65fde06d71bf0e2199bf32a767f900b68c1bf5adc726adad5b76123daf0c9118ef10a5d276fcc375b63614a11428998c837a8c7e01c78c0411087a095f2f
diff --git a/dev-libs/libtracecmd/libtracecmd-1.5.1.ebuild b/dev-libs/libtracecmd/libtracecmd-1.5.1.ebuild
index 69dba2023131..876509600048 100644
--- a/dev-libs/libtracecmd/libtracecmd-1.5.1.ebuild
+++ b/dev-libs/libtracecmd/libtracecmd-1.5.1.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit meson
 
 DESCRIPTION="Linux kernel tracecmd library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/trace-cmd/trace-cmd.git/"
+HOMEPAGE="https://www.trace-cmd.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${P}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libtracecmd/libtracecmd-1.5.2.ebuild b/dev-libs/libtracecmd/libtracecmd-1.5.2.ebuild
new file mode 100644
index 000000000000..3402e3716f6e
--- /dev/null
+++ b/dev-libs/libtracecmd/libtracecmd-1.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Linux kernel tracecmd library"
+HOMEPAGE="https://www.trace-cmd.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+S="${WORKDIR}/trace-cmd-${P}/lib"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+RDEPEND="
+	!<dev-util/trace-cmd-3.2
+	dev-libs/libtraceevent
+	dev-libs/libtracefs
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+"
+BDEPEND="app-text/asciidoc"
+
+src_configure() {
+	local emesonargs=(
+		-Dasciidoctor=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
index 268f70c14099..c22691f37393 100644
--- a/dev-libs/libtraceevent/Manifest
+++ b/dev-libs/libtraceevent/Manifest
@@ -1,2 +1,3 @@
 DIST libtraceevent-1.7.3.tar.gz 152363 BLAKE2B dcbca01f2246045f4f2377f91118e2468bca4344686b9e0349d04270543fea5648d5c227bdaf6e716d623bab8d03cec7a869bf67d03ca6a7836014854bbe40b8 SHA512 81302cb24a3fc71e8bd6a0ba975a2699eaa629ac0e90837bf8fc8e23e04156827d19b25544cdb506b0bf76d5f08699264c9ecb979f9218bdee6b0b0e7339b1e0
 DIST libtraceevent-1.8.2.tar.gz 155682 BLAKE2B afadd9f559bdc071b3741ce42b8bf0c320523f2b39c437bcf4180f277eb804c33b2feac447fae15a869164475fb5f019ef171b69be32c46b74e5f22a3ed3808b SHA512 52b7a23e8bf04feaa568199c99c98217fcb8df1b99d46197ef9edcea19b42e71ff9d2e6c45ebf5335ec782d636ad3d14be4acae5a9e5158650f5f62813081fa2
+DIST libtraceevent-1.8.3.tar.gz 156029 BLAKE2B 91df67b7ba2bb76f594b9b6ab457394d3fad8e1db5ec2206e58c821ebf8101c4e1c87adb00aa7c59520d1ac2b0820f43ebe01a062e5c0bb586a4f99078c1b3f4 SHA512 25aebdd3f8bd5f9e0fadf4f03af73effdfe6e40c5667dfbe5011f4bfaf536657dde1c085e7c26d13a9da04fa8ce2d7c27210a5d3ab8aabc7e7a485a46a4456ea
diff --git a/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild b/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild
index e19e80f863c1..d0704b3afcca 100644
--- a/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild
+++ b/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit meson
 
 DESCRIPTION="Linux kernel trace event library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+HOMEPAGE="https://www.trace-cmd.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
diff --git a/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild b/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild
index 4fa3852012cb..04f59e41b8e7 100644
--- a/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild
+++ b/dev-libs/libtraceevent/libtraceevent-1.8.2.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit meson
 
 DESCRIPTION="Linux kernel trace event library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+HOMEPAGE="https://www.trace-cmd.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
diff --git a/dev-libs/libtraceevent/libtraceevent-1.8.3.ebuild b/dev-libs/libtraceevent/libtraceevent-1.8.3.ebuild
new file mode 100644
index 000000000000..04f59e41b8e7
--- /dev/null
+++ b/dev-libs/libtraceevent/libtraceevent-1.8.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Linux kernel trace event library"
+HOMEPAGE="https://www.trace-cmd.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<dev-util/trace-cmd-3.0
+"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	test? ( dev-util/cunit )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dasciidoctor=false
+		-Ddoc=$(usex doc true false)
+	)
+
+	# TODO: get docs & tests optional upstream
+	meson_src_configure
+}
+
+src_install() {
+	# TODO: get docs & tests optional upstream
+	meson_src_install
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index fcc9ea55ab68..666668a135ed 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -1,2 +1,3 @@
 DIST libtracefs-1.7.0.tar.gz 205716 BLAKE2B 7e11ed75e65ddfb6e95fa67db2d3a3000e722108b6cb9d8efe7f057bf96afa608f0452e42090dab077b59044d3cbaebf2e4361812b994943964ea611b0ec6a49 SHA512 8b95c798a9013c0278da1c68ab4625446e1cc9d437eed91a6ce16660e7787f0af04ab65ce0dba536039f2facca39c50df5e45335b1af630e7bcce70b584e2f0c
 DIST libtracefs-1.8.0.tar.gz 224662 BLAKE2B 06ee6872ec5cd6c671ee2ddd3de19356ffa560b3ae20318e36be6a95bfe37bf61233841e32c530ab0a3463d13dd57ff1b09bba296663b25d76da2a2ea3e89f51 SHA512 2d9728186de63f03a2222d56efe6b373c038519ad1e81dd10d97640c296696df6b0661743dcd9e851edda5225342ea10a8746434439f7ad878e26780b797eb6c
+DIST libtracefs-1.8.1.tar.gz 225995 BLAKE2B cb4f491464d54f1271591cdc5ed61fa67f49e63b94ff91162e3b4f59387d3f27d866e288b69dacdbea7c145989d50e8c00e3f63b066eef93164a8748c535420d SHA512 1d8775cf511982a99e2dd17afcf48da272ff8ec189710a27420befe8765155ed21fd62db8fb2b75a0965e0a52ef810459c826f9b4989093c6a64d0cb7894cfca
diff --git a/dev-libs/libtracefs/libtracefs-1.7.0.ebuild b/dev-libs/libtracefs/libtracefs-1.7.0.ebuild
index 4102ebe264f6..6fa7cdc9b508 100644
--- a/dev-libs/libtracefs/libtracefs-1.7.0.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.7.0.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit meson
 
 DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+HOMEPAGE="https://www.trace-cmd.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
diff --git a/dev-libs/libtracefs/libtracefs-1.8.0.ebuild b/dev-libs/libtracefs/libtracefs-1.8.0.ebuild
index b1d311a9f1cc..b80b464bf14d 100644
--- a/dev-libs/libtracefs/libtracefs-1.8.0.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.8.0.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit meson
 
 DESCRIPTION="Linux kernel trace file system library"
-HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+HOMEPAGE="https://www.trace-cmd.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
diff --git a/dev-libs/libtracefs/libtracefs-1.8.1.ebuild b/dev-libs/libtracefs/libtracefs-1.8.1.ebuild
new file mode 100644
index 000000000000..6753872cebc4
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.8.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Linux kernel trace file system library"
+HOMEPAGE="https://www.trace-cmd.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# Please double check the minimum libtraceevent version!
+RDEPEND="
+	>=dev-libs/libtraceevent-1.8.1
+"
+DEPEND="${RDEPEND}"
+# source-highlight is needed, see bug https://bugs.gentoo.org/865469
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-util/source-highlight
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dasciidoctor=false
+		-Ddoc=false
+	)
+
+	# TODO: get docs & tests optional upstream
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index d74b4cc231c5..fe7b9a6298de 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,3 +1 @@
-DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1 SHA512 a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5
 DIST libucl-0.9.2.tar.gz 2044512 BLAKE2B c0290584517df16ea0e06aa8b5e8c62e8d4f883242a06bec0c385e4d0f5fe8092e076dcb80754963bfca38a9dff62744946096ae16eb547bfc61ffb158951ac4 SHA512 4df54788406baf81c80156cadd938b33aa9a16859981aaa4f82ff447183d87016f647ed22fcdf29fda51b25a58f99f7a1892305aff7c97615f05c125f5966066
diff --git a/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch b/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch
deleted file mode 100644
index f10f882acc6b..000000000000
--- a/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/797364
-https://github.com/vstakhov/libucl/commit/c7141327180cff73904b28f04cfdb604fc7d0773
-
-From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
-From: Alexandru Guzinschi <alex@gentle.ro>
-Date: Fri, 11 Sep 2020 11:41:54 +0300
-Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
-
-In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
-functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
-Because a check for `EVP_MD_CTX_create()` was in place inside
-configure.am, building with newer OpenSSL versions could not be done.
-
-Checking for `EVP_MD_CTX_create` function from configure.am was
-replaced with a check for `CRYPTO_new_ex_data()` function.
-
-Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
-no code changes are necessary.
-
-Fixes: #203
-
-[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
- AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
- 
- AS_IF([test "x$enable_signatures" = "xyes"], [
--	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
-+	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
- 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
- 		LIBCRYPTO_LIB="-lcrypto"
- 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
--		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
-+		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
- ])
- AC_SUBST(LIBCRYPTO_LIB)
- AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
-
diff --git a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch b/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch
deleted file mode 100644
index 9ec9105276c1..000000000000
--- a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Merged as: https://github.com/vstakhov/libucl/commit/708f5e21e3d85f56cdcbcbc418d8725f53bf390b
-From: Vsevolod Stakhov <vsevolod@rspamd.com>
-Date: Tue, 6 Feb 2024 15:59:48 +0000
-Subject: [PATCH] Fix lua compile issues
-
-Issue: #282
---- a/lua/lua_ucl.c
-+++ b/lua/lua_ucl.c
-@@ -406,7 +406,6 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
-
- 	/* Table iterate */
- 	if (is_array) {
--		int i;
-
- 		if (!is_implicit) {
- 			top = ucl_object_typed_new (UCL_ARRAY);
-@@ -416,7 +415,7 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
- 			top = NULL;
- 		}
-
--		for (i = 1; i <= max; i ++) {
-+		for (size_t i = 1; i <= max; i ++) {
- 			lua_pushinteger (L, i);
- 			lua_gettable (L, idx);
-
-@@ -886,8 +885,8 @@ lua_ucl_parser_parse_text (lua_State *L)
- 		t = lua_touserdata (L, 2);
- 	}
- 	else if (lua_type (L, 2) == LUA_TSTRING) {
--		const gchar *s;
--		gsize len;
-+		const char *s;
-+		size_t len;
- 		static struct _rspamd_lua_text st_t;
-
- 		s = lua_tolstring (L, 2, &len);
diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
deleted file mode 100644
index 7452ade35ada..000000000000
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-inherit lua-single autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
-else
-	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="lua +regex sign urls +utils static-libs test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="!!dev-libs/ucl
-	lua? ( ${LUA_DEPS} )
-	urls? ( net-misc/curl )
-	sign? ( dev-libs/openssl:0= )
-"
-BDEPEND="${DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-openssl-1.1.1.patch
-)
-
-pkg_setup() {
-	use lua && lua_pkg_setup
-}
-
-src_prepare() {
-	default
-	rm tests/schema/{definitions,ref{,Remote}}.json || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"$(use_enable lua)"
-		"$(use_enable regex)"
-		"$(use_enable sign signatures)"
-		"$(use_enable urls)"
-		"$(use_enable utils)"
-	)
-	use lua && myeconfargs+=(
-		LUA_INCLUDE="$(lua_get_CFLAGS)"
-		LIB_LIBS="$(lua_get_LIBS)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use lua && DOCS+=( "doc/lua_api.md" )
-	einstalldocs
-	if ! use static-libs; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
-			die "error while deleting static library"
-	fi
-}
diff --git a/dev-libs/libucl/libucl-0.9.0.ebuild b/dev-libs/libucl/libucl-0.9.0.ebuild
deleted file mode 100644
index 86d714ebb85a..000000000000
--- a/dev-libs/libucl/libucl-0.9.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
-
-LUA_COMPAT=( lua5-{1..3} )
-inherit lua-single autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
-else
-	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/9"
-IUSE="lua +regex sign urls +utils static-libs test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="!!dev-libs/ucl
-	lua? ( ${LUA_DEPS} )
-	urls? ( net-misc/curl )
-	sign? ( dev-libs/openssl:0= )
-"
-BDEPEND="${DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gchar-compile.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"$(use_enable lua)"
-		"$(use_enable regex)"
-		"$(use_enable sign signatures)"
-		"$(use_enable urls)"
-		"$(use_enable utils)"
-	)
-	use lua && myeconfargs+=(
-		LUA_INCLUDE="$(lua_get_CFLAGS)"
-		LIB_LIBS="$(lua_get_LIBS)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use lua && DOCS+=( "doc/lua_api.md" )
-	einstalldocs
-	if ! use static-libs; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
-			die "error while deleting static library"
-	fi
-}
diff --git a/dev-libs/libunique/libunique-1.1.6-r3.ebuild b/dev-libs/libunique/libunique-1.1.6-r3.ebuild
index ed73d65d71df..ce319d1af5a4 100644
--- a/dev-libs/libunique/libunique-1.1.6-r3.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r2.ebuild b/dev-libs/libunique/libunique-3.0.2-r2.ebuild
index 8d2bab6fbd94..cc61dcac9a2a 100644
--- a/dev-libs/libunique/libunique-3.0.2-r2.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libusbhp/libusbhp-1.0.2-r1.ebuild b/dev-libs/libusbhp/libusbhp-1.0.2-r1.ebuild
index 9f881e3540b9..09ba2c58e108 100644
--- a/dev-libs/libusbhp/libusbhp-1.0.2-r1.ebuild
+++ b/dev-libs/libusbhp/libusbhp-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.aasimon.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND=">=virtual/libudev-147"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libwacom/libwacom-2.12.2.ebuild b/dev-libs/libwacom/libwacom-2.12.2.ebuild
index ef7e7831e546..3d5873ab9ce1 100644
--- a/dev-libs/libwacom/libwacom-2.12.2.ebuild
+++ b/dev-libs/libwacom/libwacom-2.12.2.ebuild
@@ -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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libx86emu/Manifest b/dev-libs/libx86emu/Manifest
index 5d5926c5b067..f62861582911 100644
--- a/dev-libs/libx86emu/Manifest
+++ b/dev-libs/libx86emu/Manifest
@@ -1,2 +1 @@
-DIST libx86emu-1.1-9.8.src.rpm 59517 BLAKE2B 6ae5b7792b9b67b93d12e9908e9941417e4149ed6289e0d02b23710ae4295d74aae806d85b0a0aa719eee6d63725b161dd8870d92b5352383a0beee5ce7827c9 SHA512 cb44306bb76feb47d46f1f3dd92cc6bf694dcc2c42d191fd9ff9f0b68744aeb25e99b29336e5ffe67e9a3d02c51d56690429b892d7fd26438dcc1d6603e18bcb
 DIST libx86emu-3.5.tar.gz 144969 BLAKE2B 3bba65ca6b42e92ad578a1bdacc94b5aad1f38f51d1e1fde1db65590db9611823a9e750675feb9c20fc7706e19181fe334e127a9c861159cea03aa5ea33d90a7 SHA512 079a8b5a7166802cd9bf781436dccc36a064c7e05c199bb41cc4d225e43afad4cc99654b3cb58389f7f806ffa625b5d793468064fdd9fa758ae0415496b18a9e
diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
deleted file mode 100644
index 6e565340e67b..000000000000
--- a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,15 +1,4 @@
--ARCH	:= $(shell uname -m)
--ifneq ($(filter i386 i486 i586 i686, $(ARCH)),)
--ARCH	:= i386
--endif
--
--CC	= gcc
--CFLAGS	= -g -O2 -fPIC -fomit-frame-pointer -Wall
--ifneq ($(filter x86_64, $(ARCH)),)
--LIBDIR	= /usr/lib64
--else
--LIBDIR	= /usr/lib
--endif
-+CFLAGS	+= -fPIC -Wall
- LIBX86	= libx86emu
- 
- VERSION		:= $(shell cat VERSION)
-@@ -24,9 +13,6 @@
- 
- .PHONY: all shared install test clean
- 
--%.o: %.c
--	$(CC) -c $(CFLAGS) $<
--
- all: shared
- 
- shared: $(LIB_NAME)
-@@ -38,13 +24,15 @@
- 	install -m 644 -D include/x86emu.h $(DESTDIR)/usr/include/x86emu.h
- 
- $(LIB_NAME): .depend $(OBJS)
--	$(CC) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
-+	ln -snf $(LIB_NAME) $(LIB_SONAME)
-+	ln -snf $(LIB_SONAME) $(LIBX86).so
- 
--test:
--	make -C test
-+check:
-+	$(MAKE) -C test
- 
- clean:
--	make -C test clean
-+	$(MAKE) -C test clean
- 	rm -f *.o *~ include/*~ *.so.* .depend
- 
- ifneq "$(MAKECMDGOALS)" "clean"
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -1,9 +1,10 @@
--CC         = gcc
--CFLAGS     = -g -Wall -fomit-frame-pointer -O2
-+CFLAGS	 += -fPIC -Wall
-+CPPFLAGS += -I../include
- TST_FILES  = $(wildcard *.tst)
- INIT_FILES = $(addsuffix .init,$(basename $(wildcard *.tst)))
- RES_FILES  = $(addsuffix .result,$(basename $(wildcard *.tst)))
- TEST_OPTS  = --verbose --show code,regs,data,acc,io,ints,attr,time
-+LDLIBS = -L.. -lx86emu
- 
- .PHONY: all test clean
- .SECONDARY: $(INIT_FILES)
-@@ -12,13 +13,12 @@
- 
- all: x86test
- 	@./prepare_test *.tst
--	@./x86test $(TEST_OPTS) *.init
-+	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) *.init
- 
--x86test: x86test.c
--	$(CC) $(CFLAGS) $< -lx86emu -o $@
-+x86test: x86test.o
- 
--%.result: %.init
--	@./x86test $(TEST_OPTS) $<
-+%.result: %.init x86test
-+	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) $<
- 
- %.init: %.tst
- 	@./prepare_test $<
diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
deleted file mode 100644
index 8d69e874523d..000000000000
--- a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/ops.h
-+++ b/include/ops.h
-@@ -39,8 +39,8 @@
- #ifndef __X86EMU_OPS_H
- #define __X86EMU_OPS_H
- 
--void (*x86emu_optab[0x100])(u8 op1) L_SYM;
--void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
-+extern void (*x86emu_optab[0x100])(u8 op1) L_SYM;
-+extern void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
- 
- void decode_cond(int type) L_SYM;
- 
diff --git a/dev-libs/libx86emu/libx86emu-1.1-r1.ebuild b/dev-libs/libx86emu/libx86emu-1.1-r1.ebuild
deleted file mode 100644
index d9350ff29d80..000000000000
--- a/dev-libs/libx86emu/libx86emu-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm toolchain-funcs
-
-DESCRIPTION="A library for emulating x86"
-HOMEPAGE="https://www.opensuse.org/"
-SRC_URI="https://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-9.8.src.rpm"
-
-LICENSE="HPND"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-fix-makefile.patch
-	"${FILESDIR}"/${PN}-1.1-gcc10-fno-common.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	dodoc Changelog README
-}
diff --git a/dev-libs/libzia/libzia-4.61.ebuild b/dev-libs/libzia/libzia-4.61.ebuild
index 7bc214eded10..44c174497d96 100644
--- a/dev-libs/libzia/libzia-4.61.ebuild
+++ b/dev-libs/libzia/libzia-4.61.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
index 9d9d1f79ba11..cff5e25d1994 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND=">=dev-db/m17n-db-${PV}
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 6e587ffcb945..47f2023b5fad 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_EXT=1
 
@@ -16,9 +17,7 @@ fi
 
 DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
 HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
+if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -30,6 +29,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="python? (
 		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)"
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 7731d92f28e3..45c481f3fb3a 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_EXT=1
 
@@ -16,20 +17,18 @@ fi
 
 DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
 HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
+if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS=""
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="python? (
 		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
 		dev-lang/swig
 	)"
 DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild b/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild
index 6fb61bb7e9a4..4e09e5c8d56b 100644
--- a/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7-r1.ebuild
@@ -19,7 +19,7 @@ DOCS_S="${WORKDIR}/MathJax-docs-${DOCS_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
deleted file mode 100644
index 0232c759f19b..000000000000
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vcs-clean
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="https://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/MathJax-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples"
-
-RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
-
-RESTRICT="binchecks strip"
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	default
-	egit_clean
-}
-
-src_install() {
-	local DOCS=( README.md )
-	if use doc; then
-		dodir /usr/share/doc/${P}
-		dosym ../${PN}-docs-${SLOT}/html /usr/share/doc/${P}/html
-	fi
-
-	default
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins -r test/*
-	fi
-	rm -r test docs LICENSE README.md || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-3.2.2-r1.ebuild b/dev-libs/mathjax/mathjax-3.2.2-r1.ebuild
deleted file mode 100644
index 33154f783bc5..000000000000
--- a/dev-libs/mathjax/mathjax-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vcs-clean
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="https://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/MathJax-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="doc? ( ~app-doc/mathjax-docs-${PV} )"
-
-src_prepare() {
-	default
-	egit_clean
-}
-
-src_install() {
-	local DOCS=( CONTRIBUTING.md README.md )
-	default
-
-	if use doc; then
-		# We need best_version to determine the right revision for
-		# app-doc/mathjax-docs.
-		local docsPF=$(best_version app-doc/mathjax-docs)
-
-		# Strip the (known) category from the best_version output.
-		docsPF=${docsPF#app-doc/}
-
-		dosym "../${docsPF}/html" "/usr/share/doc/${PF}/html"
-	fi
-
-	insinto "/usr/share/${PN}"
-
-	# Start the install beneath the "es5" directory for compatibility with
-	# Arch, Solus, and Void Linux, but leave a fake "es5" symlink for
-	# packages (like doxygen) that expect it.
-	doins -r es5/*
-	dosym -r "/usr/share/${PN}" "/usr/share/${PN}/es5"
-}
diff --git a/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild b/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild
index 91d608be4711..687576e1a67d 100644
--- a/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild
+++ b/dev-libs/mathjax/mathjax-3.2.2-r2.ebuild
@@ -22,7 +22,7 @@ DOCS_S="${WORKDIR}/MathJax-docs-${DOCS_COMMIT}"
 LICENSE="Apache-2.0"
 # Some applications need to know which mathjax version they built against.
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index d6d924ff87a7..96d86092e6f8 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,2 +1 @@
-DIST metee-4.1.0.tar.gz 84498 BLAKE2B 321c56dff18c649ae171409ee2caa4d2e59a337495b07d540ec2c873d08a002ce006834e0f6c9e6e76d666c67a11d6a5ac04e43f623fde9544cb474972e62e34 SHA512 700c6b4fa40ba88f73b3117b4ba81a5a0856266c25f5b3dcc0d3e1f07f7beede2cf6da543d925b97a49c620d86d837e6793e2bcee32a5c9715ac8f9a10a65fb1
 DIST metee-4.2.0.tar.gz 100680 BLAKE2B 3852ea36f48f3d06bad3154c4089519fad44b991bc4f05870815b1bdad86bef070cdb4033404f63a8a3cb34b815421da846a04838517b31a1c4a090667fd7764 SHA512 0a479a57396ee82eb84836d8d97013bea5c9968be9de506cf378c58121a7c681c742f700ab3241804da17ccb118bd3a6c928893dc4e11cb5be2faad47dfb7dc0
diff --git a/dev-libs/metee/metee-4.1.0.ebuild b/dev-libs/metee/metee-4.1.0.ebuild
deleted file mode 100644
index 99ec0b02543e..000000000000
--- a/dev-libs/metee/metee-4.1.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
-
-inherit cmake
-
-DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-HOMEPAGE="https://github.com/intel/metee"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-src_prepare() {
-	default
-	cmake_src_prepare
-
-	# Respect users CFLAGS
-	sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_SAMPLES="NO"
-		-DBUILD_SHARED_LIBS="YES"
-		-DBUILD_TEST="NO"
-		-DCONSOLE_OUTPUT="NO"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/metee/metee-4.2.0.ebuild b/dev-libs/metee/metee-4.2.0.ebuild
index eb83679eaa02..99ec0b02543e 100644
--- a/dev-libs/metee/metee-4.2.0.ebuild
+++ b/dev-libs/metee/metee-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-libs/mimalloc/mimalloc-2.1.6.ebuild b/dev-libs/mimalloc/mimalloc-2.1.6.ebuild
index 164388f44adf..41d87f29aa29 100644
--- a/dev-libs/mimalloc/mimalloc-2.1.6.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 IUSE="hardened test valgrind"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 2e83e1e3a78a..2c0f873b0ad4 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,2 +1 @@
-DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
 DIST mongo-c-driver-1.24.4.tar.gz 7916661 BLAKE2B e361b52bf16eed7437428b0481d792ecf2f9cc283fdd6f23916d4a3ffb1b7d7c9ea7a7c4cf5f369e21fb6d4f564b91e07ac2ee44656855993218593dc4f1c166 SHA512 3563c061565d17a76581e188f6e184d7e41f2729812c8815afd34e03ebe6c1d25d7498a2cb1b599a09d24f6268c36473ef5113a14c7585a1532c9abf2e56e936
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
deleted file mode 100644
index d33fba105ab0..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3371dae..a6edf0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -380,10 +380,6 @@ if (ENABLE_MONGOC)
- 
- endif ()
- 
--install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
--   DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver
--)
--
- if (ENABLE_UNINSTALL)
-    if (WIN32)
-       if (ENABLE_MONGOC)
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch
deleted file mode 100644
index 47cce862c8bb..000000000000
--- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-enable-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1a2b7ba..26fbe9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,8 +161,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
-    endif ()
- 
-    message ("--   libbson found version \"${bson-1.0_VERSION}\"")
--   message ("--   disabling test-libmongoc since using system libbson")
--   SET (ENABLE_TESTS OFF)
- 
-    if (ENABLE_STATIC MATCHES "ON|AUTO")
-       set (MONGOC_ENABLE_STATIC ON)
-@@ -174,7 +172,7 @@ if (ENABLE_BSON STREQUAL SYSTEM)
-    endif ()
-    set (BSON_LIBRARIES mongo::bson_shared)
-    if (NOT TARGET mongo::bson_static)
--           message (FATAL_ERROR "System libbson built without static library target")
-+	   message (STATUS "System libbson built without static library target")
-    endif ()
-    set (BSON_STATIC_LIBRARIES mongo::bson_static)
- endif ()
-diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
-index c949d22..4d5a47f 100644
---- a/src/libbson/tests/test-bson.c
-+++ b/src/libbson/tests/test-bson.c
-@@ -17,7 +17,7 @@
- 
- #include <bson/bson.h>
- #include <bson/bcon.h>
--#include <bson/bson-private.h>
-+#include "bson/bson-private.h"
- #include <fcntl.h>
- #include <time.h>
- 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild
deleted file mode 100644
index e2bf1455e790..000000000000
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.18.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Client library written in C for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
-SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~riscv x86"
-IUSE="debug examples icu sasl ssl static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-# No tests on x86 because tests require dev-db/mongodb which don't support
-# x86 anymore (bug #645994)
-RESTRICT="x86? ( test )
-	!test? ( test )"
-
-RDEPEND="app-arch/snappy:=
-	app-arch/zstd:=
-	>=dev-libs/libbson-${PV}[static-libs?]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/mongodb
-		dev-libs/libbson[static-libs]
-	)"
-BDEPEND="
-	dev-python/sphinx
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
-	"${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# sphinx's -Werror
-	sed -i -e 's:-qEW:-qE:' build/cmake/SphinxBuild.cmake || die
-
-	# copy private headers for tests since we don't build libbson
-	if use test; then
-		mkdir -p src/libbson/tests/bson || die
-		cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
-		-DENABLE_BSON=SYSTEM
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_ICU="$(usex icu ON OFF)"
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=SYSTEM
-		-DENABLE_ZLIB=SYSTEM
-		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
-		-DENABLE_SSL="$(usex ssl OPENSSL OFF )"
-		-DENABLE_STATIC="$(usex static-libs ON OFF)"
-		-DENABLE_TESTS="$(usex test ON OFF)"
-		-DENABLE_TRACING="$(usex debug ON OFF)"
-		-DENABLE_UNINSTALL=OFF
-		-DENABLE_ZSTD=ON
-	)
-
-	cmake_src_configure
-}
-
-# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
-src_test() {
-	local PORT=27099
-	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
-		--dbpath="${T}" --logpath="${T}/mongod.log" || die
-	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
-	kill $(<"${T}/mongod.lock")
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc src/libmongoc/examples/*.c
-	fi
-
-	cmake_src_install
-}
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild
index c729f7abecc7..195ec1ab6c69 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~riscv x86"
 IUSE="debug examples icu sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 21d62df6542b..19202e21b33c 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1 +1,2 @@
 DIST ncnn-20240410.tar.gz 12835689 BLAKE2B b4c2ffdf525719dca81d020695f03cd963c3a1f1a0ecc61b6e08c75da212d280210bf1be9b54343a771661fef747675e7f08d0dd9e3ea942adfda1e07d1f6868 SHA512 61865af26aecc6b0eccdfd46c5b3f6e4dd06d7409298051c91d141e64b8c15690f2f982c0aeb3a11d3a575061ab7606710cb0e710f4cb6539c7a14ff440aaaf7
+DIST ncnn-20240820.tar.gz 12963701 BLAKE2B cf92ac70fb0256ae4b78f03d5a670622071f6f0e9b4ad1ee6a18238852f66b3d6b0456d33b2cf2eb691c351b1e8c7b0a8427fb20342029c79f33626f09d9bba5 SHA512 cbef59021231df7409c73a270f147e72daefa1230ccc072aec7225078097ec8e99d4dd82e8aaa93665361c4c24b3812e05f08da5c9a82a575ef2aad70c0828fe
diff --git a/dev-libs/ncnn/ncnn-20240820.ebuild b/dev-libs/ncnn/ncnn-20240820.ebuild
new file mode 100644
index 000000000000..3ca6898ed9c5
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20240820.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="High-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn/"
+SRC_URI="
+	https://github.com/Tencent/ncnn/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD ZLIB"
+SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
+KEYWORDS="amd64 ~x86"
+IUSE="openmp tools +vulkan"
+
+# Need the static library to run tests + skip vulkan / GPU:
+# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF
+RESTRICT="test"
+
+RDEPEND="
+	tools? (
+		dev-cpp/abseil-cpp:=
+		dev-libs/protobuf:=
+	)
+	vulkan? (
+		dev-util/glslang:=
+		media-libs/vulkan-loader
+	)
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( README.md docs/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DNCNN_BUILD_EXAMPLES=no
+		-DNCNN_BUILD_TOOLS=$(usex tools)
+		-DNCNN_OPENMP=$(usex openmp)
+		-DNCNN_PYTHON=no # todo if something needs it
+		-DNCNN_SHARED_LIB=yes
+		-DNCNN_SIMPLEVK=no
+		-DNCNN_SYSTEM_GLSLANG=yes
+		-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d using build date
+		-DNCNN_VULKAN=$(usex vulkan)
+	)
+
+	# temporary workaround due to a >=clang-18 regression (bug #929228)
+	tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
+		mycmakeargs+=( -DNCNN_AVX512BF16=no )
+
+	cmake_src_configure
+}
diff --git a/dev-libs/nettle/nettle-3.10.ebuild b/dev-libs/nettle/nettle-3.10.ebuild
index 08c8eb463c22..52f51dfba2af 100644
--- a/dev-libs/nettle/nettle-3.10.ebuild
+++ b/dev-libs/nettle/nettle-3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 # Subslot = libnettle - libhogweed soname version
 SLOT="0/8-6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
 # The arm64 crypto option controls AES, SHA1, and SHA2 usage.
 REQUIRED_USE="
diff --git a/dev-libs/newt/newt-0.52.24.ebuild b/dev-libs/newt/newt-0.52.24.ebuild
index 35ed84283890..4279f2d57028 100644
--- a/dev-libs/newt/newt-0.52.24.ebuild
+++ b/dev-libs/newt/newt-0.52.24.ebuild
@@ -15,7 +15,7 @@ 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 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"
 
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 6e83a9465555..0da1d8cb733c 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="hppa"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/npth/npth-1.6-r2.ebuild b/dev-libs/npth/npth-1.6-r2.ebuild
deleted file mode 100644
index 71d952cdae8c..000000000000
--- a/dev-libs/npth/npth-1.6-r2.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 autotools flag-o-matic
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	econf $(use_enable test tests)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/nss-pem/nss-pem-1.1.0.ebuild b/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
index 06f5e614872a..c38e8232f1c0 100644
--- a/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 DEPEND="dev-libs/nss
 	dev-libs/nspr"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index eb875c8644e1..3e42ef462e53 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,6 +1,7 @@
 DIST nss-3.101-cacert-class1-class3.patch 21925 BLAKE2B 2b37f6b69e0541f31087ff0401b195c035f4b607865c4d29976e4ad2c8143321d65b41b996e922362e076aa8259304ed67b0c4a1f8df2fdfdb1d893319f5d5e7 SHA512 19438aefbb361881c1b4620d8b1b5e7d2bf5afb44900858d3728ff6999a792bf6fe073a11f591ab70461bee8c54fdfb097e4084b402842bc49d2139897de304d
 DIST nss-3.101.2.tar.gz 76462495 BLAKE2B 3a0dfd7aa68bc11f332decfc9cb7003b8d8fa6a9dad556ad736229d7d3847e68aeaf5b74e68989a0483bd1b9e2e3afd3bdf8df3d428ebc815eda9a255f5695aa SHA512 65ac338ee1b13ecc2b190f1ea39c987110a06f3b67610e094ffc1ef4117d487c34af1e11b90de0c28035bfc5cb10ca7996ed991d9afce7985973fabb48cd7ac8
-DIST nss-3.102.1.tar.gz 76460182 BLAKE2B 47e61d13bf4d6615ecc830d7c745a7a736fe5f1b4de7375f4cf9274db8f42b5ea7cd737e03f6a83e26579cfec1ff1b349e24e548a57fd2d0950b955bfd208851 SHA512 1df10aab1f37c1d00dc3b81aaa341f99c2bac22997aae412ee639e0959ffa37e35cbc21b0f90c2612401aadb119bab4202209186f54fb8d58cf7c3123456e90f
 DIST nss-3.103.tar.gz 76470174 BLAKE2B 0d57ad2479f26d0ff8f3021b435ee936e82408e5f3f213804397934f1d01c2178f641247cfc84de36616eb92d06fb002fb77a4285ff84a86a3217e960d175475 SHA512 bc7680fc34d84de7953b27f1a220681f3f5c5a501a82be210ec6134894313f6a2c9bfcc350f4802152a5e3a1fc2defc74d700445ade338d6c86a923ac8b4dc75
+DIST nss-3.104-cacert-class1-class3.patch 22038 BLAKE2B 66e2dd47230d6aa58a767e35c9c069fa29f3111d470345e0f69486d1eead3cd1741939ac394f6b9b637e79a10d658cfb1a9da4387953b8968a9001bab94d4de0 SHA512 bafc4212e0e0ca3eb129a5b88767727159c6ec3da450c7625d0b282f82699378d64eaa2c3fecb72c61000ec9b6d3c24f20bc7defdac6edc673e0fbb26e0c1f7e
+DIST nss-3.104.tar.gz 76468542 BLAKE2B 78bce851b831aee0e105a4bf2f3ff965dda5dcefc0988272298596ecf1c0fa03eb2059b2cf261536fc221fb5a620c0397dd9c1a53cc13e5dd339981ac0f9d665 SHA512 ec6eb32847da544ff5a2947360d9343f9b2cfea83b86cb8d7fdbacd9d97329f02de4844084c4bcbc4ebceb666d7c23bd3aa1a73a092e10792742e7b9aa7b98e8
 DIST nss-3.90.2.tar.gz 72215444 BLAKE2B 74b8eebf5f053dcebd9c6e6ef17c6113ac42a01f910f4ba621dadb09739d5a6090d022800d2c3a4bc0c58413f03512ca611ead1098488d303f1ee1e4bca5c222 SHA512 048a0c0a06fef8cd9c363ac511b9d6125ec131a306c5e093525a937f9e8740f1a2163f274c9a3907ed38331b2fb99b22b528b5e89da1e186c9ba9473d959ef4a
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
diff --git a/dev-libs/nss/nss-3.102.1.ebuild b/dev-libs/nss/nss-3.102.1.ebuild
deleted file mode 100644
index 84a8b5aed29e..000000000000
--- a/dev-libs/nss/nss-3.102.1.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.35"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~juippis/mozilla/patchsets/nss-3.101-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
-RESTRICT="!test? ( test )"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
-)
-
-src_prepare() {
-	default
-
-	if use cacert ; then
-		eapply -p2 "${DISTDIR}"/nss-3.101-cacert-class1-class3.patch
-	fi
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
-	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
-	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
-
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		*86*-pc-solaris2*) echo "i86pc"   ;;
-		aarch64*)          echo "aarch64" ;;
-		hppa*)             echo "parisc"  ;;
-		i?86*)             echo "i686"    ;;
-		x86_64*)           echo "x86_64"  ;;
-		*)                 tc-arch ${t}   ;;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	# TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file -S "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-		disable_ckbi=0
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
-
-	# Include exportable custom settings defined by users, #900915
-	# Two examples uses:
-	#   EXTRA_NSSCONF="MYONESWITCH=1"
-	#   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
-	# e.g.
-	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
-	# or
-	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
-	# etc.
-	if [[ -n "${EXTRA_NSSCONF}" ]]; then
-		ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs."
-		read -a myextranssconf <<< "${EXTRA_NSSCONF}"
-
-		for (( i=0; i<${#myextranssconf[@]}; i++ )); do
-			export "${myextranssconf[$i]}"
-			echo "exported ${myextranssconf[$i]}"
-		done
-	fi
-
-	# explicitly disable altivec/vsx if not requested
-	# https://bugs.gentoo.org/789114
-	case ${ARCH} in
-		ppc*)
-			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
-			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
-			;;
-	esac
-
-	use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
-	use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-			${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-multilib_src_test() {
-	einfo "Tests can take a *long* time, especially on a multilib system."
-	einfo "30-45+ minutes per lib configuration. Bug #852755"
-
-	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
-	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
-	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
-	export BUILD_OPT=1
-	export HOST="localhost"
-	export DOMSUF="localdomain"
-	export USE_IP=TRUE
-	export IP_ADDRESS="127.0.0.1"
-
-	# Only run the standard cycle instead of full, reducing testing time from 45 minutes to 15
-	# per lib implementation.
-	export NSS_CYCLES=standard
-
-	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
-
-	cd "${BUILD_DIR}"/tests || die
-	# Hack to get current objdir (prefixed dir where built binaries are)
-	# Without this, at least multilib tests go wrong when building the amd64 variant
-	# after x86.
-	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
-
-	# Can tweak to a subset of tests in future if we need to, but would prefer not
-	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.104.ebuild b/dev-libs/nss/nss-3.104.ebuild
new file mode 100644
index 000000000000..4b2df22baf4f
--- /dev/null
+++ b/dev-libs/nss/nss-3.104.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~juippis/mozilla/patchsets/nss-3.104-cacert-class1-class3.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/nss-3.103-gentoo-fixes-add-pkgconfig-files.patch
+	"${FILESDIR}"/nss-3.21-gentoo-fixup-warnings.patch
+	"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-3.104-cacert-class1-class3.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
+	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	# TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file -S "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# Include exportable custom settings defined by users, #900915
+	# Two examples uses:
+	#   EXTRA_NSSCONF="MYONESWITCH=1"
+	#   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
+	# e.g.
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
+	# or
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
+	# etc.
+	if [[ -n "${EXTRA_NSSCONF}" ]]; then
+		ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs."
+		read -a myextranssconf <<< "${EXTRA_NSSCONF}"
+
+		for (( i=0; i<${#myextranssconf[@]}; i++ )); do
+			export "${myextranssconf[$i]}"
+			echo "exported ${myextranssconf[$i]}"
+		done
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
+	use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+			${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "~10 minutes per lib configuration with only 'standard' tests,"
+	einfo "~40 minutes per lib configuration with 'full' tests. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	# Only run the standard cycle instead of full, reducing testing time from 45 minutes to 15
+	# per lib implementation.
+	export NSS_CYCLES=standard
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
index a62de3eaf749..bce9b15c531b 100644
--- a/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
+++ b/dev-libs/openspecfun/openspecfun-0.5.5.ebuild
@@ -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 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sci-libs/openlibm:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
index 97604a0d3850..e3253c9ccdee 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
@@ -34,7 +34,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression"
 
 RESTRICT="!bindist? ( bindist )
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
index 49b04530e1d4..a65872c626ca 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="$(ver_cut 1-3)"
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/openssl-3.0.14.ebuild b/dev-libs/openssl/openssl-3.0.14.ebuild
index 2a3a9723b5e3..e7ad25cf9b87 100644
--- a/dev-libs/openssl/openssl-3.0.14.ebuild
+++ b/dev-libs/openssl/openssl-3.0.14.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/openssl/openssl-3.3.1-r3.ebuild b/dev-libs/openssl/openssl-3.3.1-r3.ebuild
index ebcca4d12f99..dc14ae4b9b07 100644
--- a/dev-libs/openssl/openssl-3.3.1-r3.ebuild
+++ b/dev-libs/openssl/openssl-3.3.1-r3.ebuild
@@ -25,7 +25,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~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"
 	fi
 fi
 
diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest
index 661455e14046..6f5cf45db24e 100644
--- a/dev-libs/papi/Manifest
+++ b/dev-libs/papi/Manifest
@@ -1 +1,2 @@
 DIST papi-6.0.0.1.tar.gz 4665285 BLAKE2B 5b6b2de8c16510a05a57159ceba591625c78f2a6d4ea62979fea4dd3e72bce73138e36480d82e13713c9ff2298e00330619fa57fdc7f81d75e1ce519b6f600ae SHA512 54c37b49858e921bd1357d8b0bba12c27e40e89b1354d89e5a85672ef3e6d3a4784212079098004256369a172d744580fb283741e7b4ac2d6fa5642bc42ea2ad
+DIST papi-7.1.0.tar.gz 5701396 BLAKE2B 66a781552ee6a20daa98e39b5a4385efbc3703e9f633c087f101260c8b3543bc5e8afb9f160b7450fde74ec0322ad632d5aa54b0a9c8d672f6a36b63901b3e50 SHA512 6e427505b9237a2165dee8c198708a26f4b366ca31a424340206d29c56d04b13405d20a734f311a1f18cbbbc1b940eb5c93535cd734b0c796459623e93624219
diff --git a/dev-libs/papi/metadata.xml b/dev-libs/papi/metadata.xml
index bef24d2c2337..ec5448654a7c 100644
--- a/dev-libs/papi/metadata.xml
+++ b/dev-libs/papi/metadata.xml
@@ -1,5 +1,9 @@
 <?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">icl-utk-edu/papi</remote-id>
+		<changelog>https://github.com/icl-utk-edu/papi/wiki/PAPI-Releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/papi/papi-6.0.0.1-r2.ebuild b/dev-libs/papi/papi-6.0.0.1-r2.ebuild
index b9e9db7b2516..60412b6cb2fe 100644
--- a/dev-libs/papi/papi-6.0.0.1-r2.ebuild
+++ b/dev-libs/papi/papi-6.0.0.1-r2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit autotools fortran-2 toolchain-funcs
+inherit autotools flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Performance Application Programming Interface"
-HOMEPAGE="https://icl.cs.utk.edu/papi/"
-SRC_URI="https://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://icl.utk.edu/papi/"
+SRC_URI="https://icl.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
 S="${WORKDIR}/${P}/src"
 
 LICENSE="BSD"
@@ -33,6 +33,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/855983
+	# https://github.com/icl-utk-edu/papi/issues/218
+	filter-lto
+
 	tc-export AR
 
 	# TODO: Could try adding
diff --git a/dev-libs/papi/papi-7.1.0.ebuild b/dev-libs/papi/papi-7.1.0.ebuild
new file mode 100644
index 000000000000..f7cc2137abaf
--- /dev/null
+++ b/dev-libs/papi/papi-7.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Performance Application Programming Interface"
+HOMEPAGE="https://icl.utk.edu/papi/"
+SRC_URI="https://icl.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/libpfm-4.13.0[static-libs]
+	virtual/mpi
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/855983
+	# https://github.com/icl-utk-edu/papi/issues/218
+	filter-lto
+
+	tc-export AR
+
+	# TODO: Could try adding
+	# --with-static-user-events=no
+	# --with-static-papi-events=no
+	# --with-static-lib=no
+	# --with-static-tools=no
+	# but this requires fixing the homebrew configure logic for
+	# little gain
+	local myeconfargs=(
+		--with-perf-events
+		--with-pfm-prefix="${EPREFIX}/usr"
+		--with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc ../RE*
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 7312966b6f99..fefd9ccb26cb 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,4 +1,2 @@
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
-DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
-DIST pegtl-3.2.5.tar.gz 248904 BLAKE2B 008f7b058c5a62910911815bee671baead509e673ce8f67bebc4244edd1abed4c2467a03cb47e55e75c3be17b937834915f568a0a47066ba80949b868aa69494 SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
 DIST pegtl-3.2.7.tar.gz 249394 BLAKE2B d095ef337e1ff9e01692f07d0b110a685cbe447c36d7d294d0f18a15e076d15112b300232c5b4872b4a0b51d375799fc73261bff31c5b970a3d05b90b0ae6062 SHA512 e996be569e1c25377b13870c4f3e59f1935bbf24bb7c6edca0edc85b304fbe3d05db52a303839b0bd50c78769b773fc2237814787a703c58de8a79398210ee34
diff --git a/dev-libs/pegtl/pegtl-3.2.1.ebuild b/dev-libs/pegtl/pegtl-3.2.1.ebuild
deleted file mode 100644
index 09fd47749d97..000000000000
--- a/dev-libs/pegtl/pegtl-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^^}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
-		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/pegtl/pegtl-3.2.5.ebuild b/dev-libs/pegtl/pegtl-3.2.5.ebuild
deleted file mode 100644
index bde3df726470..000000000000
--- a/dev-libs/pegtl/pegtl-3.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^^}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
-		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/ppl/ppl-1.2-r5.ebuild b/dev-libs/ppl/ppl-1.2-r5.ebuild
index 70d986e738f2..5b4720211a8a 100644
--- a/dev-libs/ppl/ppl-1.2-r5.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
 IUSE="cdd +cxx doc lpsol pch test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx(+)]
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index af1849aaafc2..00ff3f3c1399 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -5,5 +5,8 @@ DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1
 DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6394254c73e3c9b2729bce643f8cbfb5a1bd18b30abf3003b9fbfd24c074cea4085a6ccf14fdb6a3aeac9efcb89 SHA512 b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
 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-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-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5f1edfccebcc8ee7c9e0e74d06e5e6dbad741fd89f6a4502c1cb246a973fd60c035ccdbf89700b7baff49e2a65e SHA512 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
diff --git a/dev-libs/protobuf/files/FindJsonCpp.cmake b/dev-libs/protobuf/files/FindJsonCpp.cmake
new file mode 100644
index 000000000000..8fff5336ce46
--- /dev/null
+++ b/dev-libs/protobuf/files/FindJsonCpp.cmake
@@ -0,0 +1,40 @@
+find_path(JsonCpp_INCLUDE_DIR "json/json.h"
+  PATH_SUFFIXES "jsoncpp"
+  DOC "jsoncpp include directory")
+mark_as_advanced(JsonCpp_INCLUDE_DIR)
+
+find_library(JsonCpp_LIBRARY
+  NAMES jsoncpp
+  DOC "jsoncpp library")
+mark_as_advanced(JsonCpp_LIBRARY)
+
+if (JsonCpp_INCLUDE_DIR AND EXISTS "${JsonCpp_INCLUDE_DIR}/json/version.h")
+  file(STRINGS "${JsonCpp_INCLUDE_DIR}/json/version.h" _JsonCpp_version_lines
+    REGEX "JSONCPP_VERSION_[A-Z]+")
+  string(REGEX REPLACE ".*# *define +JSONCPP_VERSION_MAJOR +([0-9]+).*" "\\1" _JsonCpp_version_major "${_JsonCpp_version_lines}")
+  string(REGEX REPLACE ".*# *define +JSONCPP_VERSION_MINOR +([0-9]+).*" "\\1" _JsonCpp_version_minor "${_JsonCpp_version_lines}")
+  string(REGEX REPLACE ".*# *define +JSONCPP_VERSION_PATCH +([0-9]+).*" "\\1" _JsonCpp_version_patch "${_JsonCpp_version_lines}")
+  set(JsonCpp_VERSION "${_JsonCpp_version_major}.${_JsonCpp_version_minor}.${_JsonCpp_version_patch}")
+  unset(_JsonCpp_version_major)
+  unset(_JsonCpp_version_minor)
+  unset(_JsonCpp_version_patch)
+  unset(_JsonCpp_version_lines)
+endif ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JsonCpp
+  REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR
+  VERSION_VAR JsonCpp_VERSION)
+
+if (JsonCpp_FOUND)
+  set(JsonCpp_INCLUDE_DIRS "${JsonCpp_INCLUDE_DIR}")
+  set(JsonCpp_LIBRARIES "${JsonCpp_LIBRARY}")
+
+  if (NOT TARGET JsonCpp::JsonCpp)
+    add_library(JsonCpp::JsonCpp SHARED IMPORTED)
+    set_target_properties(JsonCpp::JsonCpp PROPERTIES
+      IMPORTED_LOCATION "${JsonCpp_LIBRARY}"
+      IMPORTED_IMPLIB "${JsonCpp_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${JsonCpp_INCLUDE_DIR}")
+  endif ()
+endif ()
diff --git a/dev-libs/protobuf/files/protobuf-27.4-findJsonCpp.patch b/dev-libs/protobuf/files/protobuf-27.4-findJsonCpp.patch
new file mode 100644
index 000000000000..6ce98f758ec8
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-27.4-findJsonCpp.patch
@@ -0,0 +1,33 @@
+From e3138533bf97e1133371944b28e65bae5e8ae95c Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sat, 10 Aug 2024 13:43:28 +0200
+Subject: [PATCH] fix JsonCPP name
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ cmake/conformance.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/conformance.cmake b/cmake/conformance.cmake
+index c5d8c7c..2e059ea 100644
+--- a/cmake/conformance.cmake
++++ b/cmake/conformance.cmake
+@@ -9,7 +9,7 @@ if (protobuf_JSONCPP_PROVIDER STREQUAL "module")
+             "  cmake -Dprotobuf_BUILD_CONFORMANCE=OFF\n")
+   endif()
+ elseif(protobuf_JSONCPP_PROVIDER STREQUAL "package")
+-  find_package(jsoncpp REQUIRED)
++  find_package(JsonCpp REQUIRED)
+ endif()
+ 
+ file(MAKE_DIRECTORY ${protobuf_BINARY_DIR}/conformance)
+@@ -140,5 +140,5 @@ if(protobuf_JSONCPP_PROVIDER STREQUAL "module")
+     target_link_libraries(conformance_test_runner jsoncpp_static)
+   endif()
+ else()
+-  target_link_libraries(conformance_test_runner jsoncpp)
++  target_link_libraries(conformance_test_runner JsonCpp::JsonCpp)
+ endif()
+-- 
+2.46.0
+
diff --git a/dev-libs/protobuf/files/protobuf-28.0-disable-test_upb-lto.patch b/dev-libs/protobuf/files/protobuf-28.0-disable-test_upb-lto.patch
new file mode 100644
index 000000000000..0a9ed5e8e67c
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-28.0-disable-test_upb-lto.patch
@@ -0,0 +1,23 @@
+From 14fe043db8162df9ddc2308437cace6434c67bd9 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 30 Aug 2024 03:22:16 +0200
+Subject: [PATCH] disable test_upb
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/cmake/tests.cmake b/cmake/tests.cmake
+index c8ae114..eac821c 100644
+--- a/cmake/tests.cmake
++++ b/cmake/tests.cmake
+@@ -175,7 +175,7 @@ add_test(NAME full-test
+   COMMAND tests ${protobuf_GTEST_ARGS}
+   WORKING_DIRECTORY ${protobuf_SOURCE_DIR})
+ 
+-if (protobuf_BUILD_LIBUPB)
++if (protobuf_BUILD_LIBUPB AND FALSE)
+   set(upb_test_proto_genfiles)
+   foreach(proto_file ${upb_test_protos_files} ${descriptor_proto_proto_srcs})
+     foreach(generator upb upbdefs upb_minitable)
+-- 
+2.46.0
+
diff --git a/dev-libs/protobuf/protobuf-22.5-r1.ebuild b/dev-libs/protobuf/protobuf-22.5-r1.ebuild
index ff2783d5e7ce..ca830b5f58c8 100644
--- a/dev-libs/protobuf/protobuf-22.5-r1.ebuild
+++ b/dev-libs/protobuf/protobuf-22.5-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips 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"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
diff --git a/dev-libs/protobuf/protobuf-23.3-r4.ebuild b/dev-libs/protobuf/protobuf-23.3-r4.ebuild
index 17092c5a48c6..6a47828975bb 100644
--- a/dev-libs/protobuf/protobuf-23.3-r4.ebuild
+++ b/dev-libs/protobuf/protobuf-23.3-r4.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~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"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
diff --git a/dev-libs/protobuf/protobuf-25.4.ebuild b/dev-libs/protobuf/protobuf-25.4.ebuild
new file mode 100644
index 000000000000..158b36af6308
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-25.4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2008-2024 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.9[${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_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-26.1-r1.ebuild b/dev-libs/protobuf/protobuf-26.1-r1.ebuild
deleted file mode 100644
index 534834edca75..000000000000
--- a/dev-libs/protobuf/protobuf-26.1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib elisp-common toolchain-funcs
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://protobuf.dev/"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2).0"
-IUSE="emacs examples test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="
-	>=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}]
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	>=dev-cpp/abseil-cpp-20230125.3:=[${MULTILIB_USEDEP}]
-	emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-32-bit-tests.patch"
-	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
-)
-
-DOCS=( CONTRIBUTORS.txt README.md )
-
-src_configure() {
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_DISABLE_RTTI=ON
-		-Dprotobuf_BUILD_EXAMPLES=$(usex examples)
-		-Dprotobuf_WITH_ZLIB=$(usex zlib)
-		-Dprotobuf_BUILD_TESTS=$(usex test)
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	use test && mycmakeargs+=(-Dprotobuf_USE_EXTERNAL_GTEST=ON)
-
-	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
-	cmake-multilib_src_test
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
-		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
-			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${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.2.ebuild b/dev-libs/protobuf/protobuf-27.2.ebuild
index e6c26cbfee3a..1e406912d89b 100644
--- a/dev-libs/protobuf/protobuf-27.2.ebuild
+++ b/dev-libs/protobuf/protobuf-27.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common toolchain-funcs
+inherit cmake-multilib elisp-common toolchain-funcs multilib
 
 ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
 
@@ -18,7 +18,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	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
 
@@ -127,9 +127,9 @@ src_test() {
 multilib_src_install_all() {
 	find "${ED}" -name "*.la" -delete || die
 
-	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+	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.so.${SLOT#*/}"
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
 		die "Please update SLOT variable"
 	fi
 
diff --git a/dev-libs/protobuf/protobuf-27.4.ebuild b/dev-libs/protobuf/protobuf-27.4.ebuild
new file mode 100644
index 000000000000..30ab416efd86
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-27.4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2008-2024 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-28.0.ebuild b/dev-libs/protobuf/protobuf-28.0.ebuild
new file mode 100644
index 000000000000..30ab416efd86
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-28.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2008-2024 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-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index c2a90ff0480c..30ab416efd86 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
-inherit cmake-multilib elisp-common toolchain-funcs
+inherit cmake-multilib elisp-common multilib
 
-ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
+# 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//_/}"
@@ -17,8 +18,8 @@ if [[ "${PV}" == *9999 ]]; then
 
 	inherit git-r3
 else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	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
 
@@ -27,7 +28,7 @@ HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
 SLOT="0/${MY_SLOT}.0"
-IUSE="conformance emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
 
 REQUIRED_USE="
 	|| (
@@ -48,14 +49,14 @@ BDEPEND="
 "
 
 COMMON_DEPEND="
-	dev-libs/jsoncpp
+	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.9[${MULTILIB_USEDEP}] )
+	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -65,22 +66,16 @@ 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"
 )
 
 DOCS=( CONTRIBUTORS.txt README.md )
 
-# src_prepare() {
-# 	rm "${S}/third_party/utf8_range/" -rf || die
-# 	cmake_src_prepare
-# }
+src_prepare() {
+	cmake_src_prepare
 
-src_configure() {
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	cmake-multilib_src_configure
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
 }
 
 multilib_src_configure() {
@@ -104,7 +99,8 @@ multilib_src_configure() {
 		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
 
 		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
-		-Dprotobuf_VERBOSE="yes"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
 	)
 	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
 
@@ -120,16 +116,26 @@ src_compile() {
 }
 
 src_test() {
-	local -x srcdir="${S}"/src
+	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.so.${SLOT#*/}" ]]; then
+	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.so.${SLOT#*/}"
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
 		die "Please update SLOT variable"
 	fi
 
diff --git a/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild b/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
index 2d6c10b669a2..dd118783947b 100644
--- a/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
+++ b/dev-libs/qcoro/qcoro-0.10.0-r1.ebuild
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="C++ Coroutine Library for Qt"
diff --git a/dev-libs/rccl/rccl-6.1.1.ebuild b/dev-libs/rccl/rccl-6.1.1.ebuild
index 35783657a50d..8b583cb22096 100644
--- a/dev-libs/rccl/rccl-6.1.1.ebuild
+++ b/dev-libs/rccl/rccl-6.1.1.ebuild
@@ -48,6 +48,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	# https://github.com/llvm/llvm-project/issues/71711 - fix issue of clang
 	append-ldflags -Wl,-z,noexecstack
 
@@ -59,7 +61,7 @@ src_configure() {
 		-Wno-dev
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
index 04fd989b95cb..bd28fb96d253 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LLVM_COMPAT=( 18 )
-inherit cmake llvm-r1
+inherit cmake flag-o-matic llvm-r1
 
 MY_P=llvm-project-rocm-${PV}
 components=( "amd/device-libs" )
@@ -66,12 +66,17 @@ 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)"
 	)
-	# 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
-	CC="$(get_llvm_prefix)/bin/clang" CXX="$(get_llvm_prefix)/bin/clang++" cmake_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild
index a6d5dd67438b..a19a93f076ef 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LLVM_COMPAT=( 18 )
-inherit cmake llvm-r1
+inherit cmake flag-o-matic llvm-r1
 
 MY_P=llvm-project-rocm-${PV}
 components=( "amd/device-libs" )
@@ -67,12 +67,17 @@ 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)"
 	)
-	# 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
-	CC="$(get_llvm_prefix)/bin/clang" CXX="$(get_llvm_prefix)/bin/clang++" cmake_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 718356e50168..b7882fecd346 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,3 +1,4 @@
+DIST simdjson-3.10.1.gh.tar.gz 2652674 BLAKE2B 3ccfc55d5bf8ce6a7e8be1b6cb28ed7b6289e23b1d4fe8505e35a42f4ff32a0ee7f500402828164bdeacae1b72e238413575288082151723d6d0c87dcefd1fa0 SHA512 b19fde8d81eaff34b83bb41028d7ee3a408ae5bc896277148e96879b1cba1a7cfc4af0064973bcb07e2b56e0955c3a3a581910d7af23d68510374e7f297c3b7c
 DIST simdjson-3.6.3.gh.tar.gz 2302220 BLAKE2B c46eeb8a07460cc5427fc35714fd262069cd3d913732e6037d808281d0fed0e82e0423dfd16abaeb515264559fe4454c42f81211354723eb21b212decfe7834b SHA512 b9fa7e554ded4e6cbe9d70ee29aa5b582e58b8b2ada1a781e58746082bb7d31791a4e2ea8b43d9391d783e61e489554f260448029c0b7e730cc69dc44f4aa86a
 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
diff --git a/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch
new file mode 100644
index 000000000000..cd735888b232
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,20 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index b9802392..056a0635 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -146,15 +146,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 5965670)
+-  add_dependency(cxxopts)
+-endif()
diff --git a/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch b/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch
new file mode 100644
index 000000000000..a5eade492ec6
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca23a8a0..0bf54dd6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -303,12 +303,11 @@ endif()
+ #
+ # 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/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+index 54b74afb..b14567d3 100644
+--- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt
++++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+@@ -13,6 +13,7 @@ function(add_dual_compile_test TEST_NAME)
+   target_compile_definitions(${TEST_NAME}_should_not_compile PRIVATE COMPILATION_TEST_USE_FAILING_CODE=1)
+ endfunction(add_dual_compile_test)
+ 
++target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized)
+ add_dual_compile_test(iterate_object)
+ add_dual_compile_test(iterate_array)
+ add_dual_compile_test(iterate_char_star)
diff --git a/dev-libs/simdjson/simdjson-3.10.1.ebuild b/dev-libs/simdjson/simdjson-3.10.1.ebuild
new file mode 100644
index 000000000000..5dcfb21d04d3
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.10.1.ebuild
@@ -0,0 +1,102 @@
+# 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/23"
+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-3.10.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
+	"${FILESDIR}/simdjson-3.10.1-tests.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/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 0606edda9cd9..71281ffaf89d 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,2 +1 @@
-DIST skalibs-2.14.1.1.tar.gz 237220 BLAKE2B 880f40a640e7680f847f8d9eb5e90ca472583d0badfbf233707be9bf64e2eb172543fdc9b663c99c3a5839ed58dbf7befebf9aa75820c9be9d70cd0c37959665 SHA512 01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9
 DIST skalibs-2.14.2.0.tar.gz 242763 BLAKE2B 5a172245ae27eeb6a41f943e285f3e40d66324a60a1190afbbb4cdbc3fbbd0cace0feac9666c02c2adddbbac477741e578d2a3d4af707799704ed8050245783b SHA512 b96491e6429cc69bc75f50be99b7b18769cb756c1a82f698994c23aefb16bc68ee5558076993b948a6674203ecd82a454a978c89f450c219cc2728d52b7f5656
diff --git a/dev-libs/skalibs/skalibs-2.14.1.1.ebuild b/dev-libs/skalibs/skalibs-2.14.1.1.ebuild
deleted file mode 100644
index 1740c9906c0f..000000000000
--- a/dev-libs/skalibs/skalibs-2.14.1.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--sysdepdir="/usr/$(get_libdir)/${PN}"
-		--sysconfdir=/etc
-
-		--disable-static
-		--enable-clock
-		--enable-ipv6
-		--enable-shared
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-libs/sleef/Manifest b/dev-libs/sleef/Manifest
index 7ca5bfa2e46b..7036f919d1c4 100644
--- a/dev-libs/sleef/Manifest
+++ b/dev-libs/sleef/Manifest
@@ -1 +1,2 @@
 DIST sleef-3.5.1.tar.gz 1210108 BLAKE2B e10e23cb830252dd2ed34e24bfd79b5e812640572afedad899cccd462019c7a4e41c7b3b9f0ff5a77549fc45dbc51ae0ebeeada4c38f011cdac0262d2982ade8 SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128
+DIST sleef-3.6.1.tar.gz 1628079 BLAKE2B b4d0c25d1f1425da8cc7ea038810b5bd9601502678c2e53695ff6b38aa2a8522f3f69eb5f949ff60b9e800935e7ab586005dc704c6337f257fa11f9c0569b2b5 SHA512 05ec78763fc89a0ad782b442aad643b75da8787bd7a69e3a2a55ece7883baa1d88a1a342768ccba46997f20eca976d625f24a8c424376d21d84aaa595804fba5
diff --git a/dev-libs/sleef/files/sleef-3.6.1-musl.patch b/dev-libs/sleef/files/sleef-3.6.1-musl.patch
new file mode 100644
index 000000000000..9fc5ca865b89
--- /dev/null
+++ b/dev-libs/sleef/files/sleef-3.6.1-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/libm-tester/tester2simdsp.c	2024-09-09 18:40:10.340986358 +0200
++++ b/src/libm-tester/tester2simdsp.c	2024-09-09 18:40:43.240620974 +0200
+@@ -892,7 +892,7 @@
+       double u0 = countULPsp(t = vget(xacoshf(vd), e), frx);
+       
+       if ((fabs(d) < sqrt(FLT_MAX) && u0 > 1.0001) ||
+-	  (d >=  sqrt(FLT_MAX) && !(u0 <= 1.0001 || (isinff(t) && t > 0))) ||
++	  (d >=  sqrt(FLT_MAX) && !(u0 <= 1.0001 || (isinf(t) && t > 0))) ||
+ 	  (d <= -sqrt(FLT_MAX) && !isnan(t))) {
+ 	printf(ISANAME " acoshf arg=%.20g ulp=%.20g\n", d, u0);
+ 	fflush(stdout); ecnt++;
diff --git a/dev-libs/sleef/sleef-3.6.1-r1.ebuild b/dev-libs/sleef/sleef-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..528aaaa29e8b
--- /dev/null
+++ b/dev-libs/sleef/sleef-3.6.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implements vectorized versions of C standard math functions"
+HOMEPAGE="https://sleef.org/"
+SRC_URI="https://github.com/shibatch/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( >=dev-libs/mpfr-4.2 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSLEEF_DISABLE_FFTW=ON
+		-DSLEEF_BUILD_QUAD=ON
+		-DSLEEF_BUILD_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+
+	local myctestargs=(
+		-E "iut(y)?purec(fma)?_scalar"
+	)
+	cmake_src_test
+}
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
deleted file mode 100644
index dc8c0e0ad289..000000000000
--- a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="gost migration-tool test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	migration-tool? ( dev-db/sqlite:3= )
-	dev-libs/openssl:=
-	!~dev-libs/softhsm-2.0.0:0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gcc:=[cxx]
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )
-"
-
-DOCS=( NEWS README.md )
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-crypto-backend=openssl \
-		--disable-p11-kit \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-ecc \
-		$(use_enable gost) \
-		$(use_with migration-tool migrate)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	keepdir /var/lib/softhsm/tokens
-}
diff --git a/dev-libs/spdlog/spdlog-1.14.1.ebuild b/dev-libs/spdlog/spdlog-1.14.1.ebuild
index df8bbe09c730..ea456cab74a0 100644
--- a/dev-libs/spdlog/spdlog-1.14.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.14.1.ebuild
@@ -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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tllist/tllist-1.1.0.ebuild b/dev-libs/tllist/tllist-1.1.0.ebuild
index facaeaaf4c59..907c9f41ff7a 100644
--- a/dev-libs/tllist/tllist-1.1.0.ebuild
+++ b/dev-libs/tllist/tllist-1.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64 ~riscv"
 
 src_install() {
 	meson_src_install
diff --git a/dev-libs/tlsh/tlsh-4.8.2-r2.ebuild b/dev-libs/tlsh/tlsh-4.8.2-r2.ebuild
index a6fbd70ae4c4..818323b1cfa8 100644
--- a/dev-libs/tlsh/tlsh-4.8.2-r2.ebuild
+++ b/dev-libs/tlsh/tlsh-4.8.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-big-endian.patch
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 6f64ba4a02ea..2ecb5a8807e3 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-build/libtool"
 
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index a9d7f4e84baa..f93c5c8f2dc8 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,4 +1,2 @@
-DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
-DIST tree-sitter-bash-0.20.4-2.tar.gz 444183 BLAKE2B 31016de876ed84ab991ebc1e531dd750c416a86db5f91097db54e7362de673ea89bbf8863a9df487f75386f19a7e8ddde48a2e727af918d1beea8acad3ce67c6 SHA512 074f659ea475c7a442957a3df234f967ae9a6ace885ecfad6548a1d0f2af7535e5460d81bcd160a04bda1b902af0a9f741fc0c7b22309cd1d11ab2bc33ff0a22
-DIST tree-sitter-bash-0.20.5.tar.gz 525750 BLAKE2B 2508ede3ac6b0a7bac3f46af35ea018916b5cf6b0acf593e546146277c1a619dba52eac6064e3e0431e0f5e41bc80b441e0ac8886287ccce5bdabe3924a036e8 SHA512 bc1c4ec816183b4a4990decd45f3c46a424e29d4c417b762f3f761b6396faa984c6eb05237cb4921070e0b478485146889176a862b0935b4b345a704675bef22
 DIST tree-sitter-bash-0.21.0.tar.gz 557096 BLAKE2B bfbdb4db0f75c292567043a47d32e26c6ec119ed70fa9b77675eb57e686c072315fc114befecc430730c8eec20238544d13836402f2264a1b6657e0387d4987c SHA512 9585ea80f85bc7010444a91142bc943486ade68982c7ca367a6cbe65619af2bdaa1acd8b6ee698cdf74b84d62a7f44acc4676ddb4b6007035eb9eea4768f122d
+DIST tree-sitter-bash-0.23.1.tar.gz 542859 BLAKE2B fbcc788a241b740e128d1ac7dac6292411121c67239c2656a74514f016b89882e4bd6371fc287b9d94b4b78f2b8e968ba3029de67e1c307e99ecce95bfe83dc5 SHA512 1ab59105a5f0a74a17b415420fb8da072cdd2765f776a4f1b0297ca4a4637055d625753c502b96928e9cdf56fd9f175589da4acdeb338daa9113df94c4aa6581
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
deleted file mode 100644
index bf87fe76c9f8..000000000000
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Bash grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
deleted file mode 100644
index 8d2e42a385d4..000000000000
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Bash grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# Override eclass SRC_URI as 0.20.4 was bumped incorrectly.
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
-	-> ${P}-2.tar.gz"
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.5.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.5.ebuild
deleted file mode 100644
index fa2574fde717..000000000000
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.5.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Bash grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.1.ebuild
new file mode 100644
index 000000000000..bb660768a312
--- /dev/null
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Bash grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter-c-sharp/Manifest b/dev-libs/tree-sitter-c-sharp/Manifest
index e8c40083b407..2b9943346022 100644
--- a/dev-libs/tree-sitter-c-sharp/Manifest
+++ b/dev-libs/tree-sitter-c-sharp/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-c-sharp-0.19.1.tar.gz 842687 BLAKE2B 741a6be6052d739b9aa066adce84b492aa48726653a03e7b58bfc6b5e35d6b928b02deb32b568500a156466d39fd430abe1a452d24213ca4f999d01ddc081bd6 SHA512 74b91086d2aeaba5be7932cc2a479040291db754bdca46bd59cb3af8e42b38e9113d99de3b88d4c1dc41227e2e84ee18715a01709af72c374f0b6c8f36cd94eb
-DIST tree-sitter-c-sharp-0.20.0.tar.gz 1050470 BLAKE2B 2ee76331cffcc60729537a72c0e9e9d1fd65ff9292724371354085c1eec03769b1664a09dc75bfd2abdd16b4ef2c12006bec3acfe7b4f31fd59afab1b8167cee SHA512 31530ff57d02b84c8e7e7183abb927c40839500afc225cfdbe685495962c3f129ea459efaf73abbb76951bfc14b890cbdfa9a847b3ae92c8db495d173d0e0e08
 DIST tree-sitter-c-sharp-0.21.1.tar.gz 1576411 BLAKE2B c89cd47c93ff96a01fdcf5d55971bb49326ec4cb4f37438247f0c5a0a7a083e62265f07fdb3a6b7d18f2ac13e8afa5705a5092cf7ff90f92f8fa0b9d9073a3e3 SHA512 43fe2c31ae73efff91af15d40f9b3d4b468c5b118de7b029c5c2338885bc27fedca21fe6361700012a1d5c80ff7426ef9ce2f7226da44be8302d727858e7aebb
+DIST tree-sitter-c-sharp-0.23.0.tar.gz 1559431 BLAKE2B b24828f6abc371bd6397933b6b3cd586fc60f2c03c5d8607e0526e419b673667e12a697d21b1fbbbf2a2492986d7b2c81bc5c300db103467356375f1503b9465 SHA512 998d15ac285f000bc96227853933f7518ce6250dbb04cf44f7859be8dd29226ca1340e46aac51f3ef7b9d8bca385bd88001789081801bf4a8428ee5195064a5d
diff --git a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
deleted file mode 100644
index e7c1c44ee2dd..000000000000
--- a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.19.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C# grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.20.0.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.20.0.ebuild
deleted file mode 100644
index c54d7faffe49..000000000000
--- a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C# grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.23.0.ebuild b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.23.0.ebuild
new file mode 100644
index 000000000000..c1e7e5bd3167
--- /dev/null
+++ b/dev-libs/tree-sitter-c-sharp/tree-sitter-c-sharp-0.23.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C# grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c-sharp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index bee156c91aa2..17f7ef304091 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,5 +1,2 @@
-DIST tree-sitter-c-0.20.6.tar.gz 337801 BLAKE2B 96dfe37535aca85d2bae15af0a2d59a99bd6861a9a32957b6ae9a4fe02ac1a8e8c4f649760e5eccf68f224b30992aa1656a8b3e11da8a3bb43e07c62f4b26063 SHA512 047b47ef9190f3894083be2b8b26dd33c06d87bba6b960e63e9787112b374a76e2239171b89bb346a27b886396c2054a4ecc1e42d4f83a23ab62060907fe2198
-DIST tree-sitter-c-0.20.7.tar.gz 377856 BLAKE2B c18e23d010a6d2db9c6171134ae536c299e6fdb51b1d4c8693475b1249e6f1420a352d8e1aa3e10281a230acf4953196ab0e59248da7f9ab9995c8e9576da1e8 SHA512 42199156796dc6fb427b57c67c1fc5105c315b812a5ade813466dddd76b1b5c37957c071b52a58e4f46b5a55f189de13eab92ff8b6adea45ce07aa2322c5c357
-DIST tree-sitter-c-0.21.0.tar.gz 426566 BLAKE2B dbd2cf89d2ac79e5c6ec7b6e16e588d74b6ed0b467beb411fa32643ed70434193a155510d1649cd074efc98d4e04acdb1a3799c99c8cc6e836bacc444836fff0 SHA512 1ed2b48b6adda606c7074da650c089040e04873bfb666ab08f4c7f67e8077de3760e0b1610c2519d69d3eb48c101cf8e441d2b29622a075b4a6992efbc324abb
-DIST tree-sitter-c-0.21.1.tar.gz 367056 BLAKE2B 062bfcc3c5a8a2db00423592186ca8b4d0928bdcd00bcd086386cffa4ce906c3ad098725f2e3632f941c47ddc8a21015ccfc9d5e3547399582d4932c4ae4b640 SHA512 d8eee9ee78434809068f7030e9f5c27d425d746b877d70b0f7680b4349577a155b13a03bdf9e4c37e927af33a0d4e4d14672ab5fd86a27bfe1fc18b300eb5fcd
 DIST tree-sitter-c-0.21.4.tar.gz 362462 BLAKE2B d3c37bc04e344df7b13d06e941cdc3d0dc6fa871ad02c090fb786086cd561429cb439335a7ea2745746b4e0e4ba938ed07e8fccb9313a2af0cee63b18dd89bb4 SHA512 941117c22b2a1dd46b7e8a9a0552fc3d28d21c22c44687dc67487ab7b136f8f5fcb05c8dc1429e4c56f619c52f7496ba6e07280751e49d8c5e2d36e2a807e19b
+DIST tree-sitter-c-0.23.0.tar.gz 370699 BLAKE2B 261b7ef1e7ebe1dc49780a95679b921bb7c67cfac6f0eba057199c0e3c9e833a40cc871fdc170ac4689aa19f65feed3c122cf5a6681ec22c619e1129eb26cae8 SHA512 9e4b453c64cc3ce8e6d060ceda1fa579e0339bbddcef7192c3f8bc0cddd6df76286d126e3e3cba476cc1f98d7f84e8b7b896837da8ac0646e3d6f95f6c78bccb
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild
deleted file mode 100644
index 2a9f71629a50..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.7.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.7.ebuild
deleted file mode 100644
index f3801303a1d1..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.7.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.0.ebuild
deleted file mode 100644
index 7acbae161e6d..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.ebuild
deleted file mode 100644
index 7acbae161e6d..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.1.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.4.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.4.ebuild
index 21cb9b0c4c49..a6c4e647f205 100644
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.21.4.ebuild
+++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.21.4.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.23.0.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.23.0.ebuild
new file mode 100644
index 000000000000..21cb9b0c4c49
--- /dev/null
+++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-libs/tree-sitter-cmake/Manifest b/dev-libs/tree-sitter-cmake/Manifest
index 510af67381d0..ea6a2e62baf0 100644
--- a/dev-libs/tree-sitter-cmake/Manifest
+++ b/dev-libs/tree-sitter-cmake/Manifest
@@ -1,2 +1 @@
-DIST tree-sitter-cmake-0.1.0.tar.gz 42425 BLAKE2B a6d609b9baf297265bee4355c2f8d11853d393461e708475c53ce8ee067f668550a31cc75142d5ddd8e34160a03308388f01661b13fdb8a22a0c3cf95a0105a6 SHA512 5d228fde691b7ef9f4043ad41a852541551c31392ad5beb21580e6902039c5fa1adc2a42642644603871e373011ef3c9f4264bfc40e33fd0d3071a716b5d61cf
 DIST tree-sitter-cmake-0.4.1.tar.gz 50091 BLAKE2B a91fdeedca3bad83b1e8006ff464a09d761ba9d46601216f21885062c3559891837fcf0db7960b69382b117073a3ff937ea26e2861922133c8660e5c2043b6c2 SHA512 25318e305aa42bfaa6fd09fb515988a31a00247f535e4d881573226d862d72a74eb30dfdfb3bd2b985a9be96cdf6da6a8a9b945d9c256870755015ae573edd9c
diff --git a/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild b/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild
deleted file mode 100644
index 4ac4989f45df..000000000000
--- a/dev-libs/tree-sitter-cmake/tree-sitter-cmake-0.1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="CMake grammar for tree-sitter"
-HOMEPAGE="https://github.com/uyha/tree-sitter-cmake"
-SRC_URI="https://github.com/uyha/tree-sitter-cmake/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest
index 2c0fb8d16747..74eb712ce970 100644
--- a/dev-libs/tree-sitter-cpp/Manifest
+++ b/dev-libs/tree-sitter-cpp/Manifest
@@ -1,5 +1,2 @@
-DIST tree-sitter-cpp-0.20.3.tar.gz 1056333 BLAKE2B 3b1fc2509da265b2f49ec1a9bef7b005b06eba0311432af9e2e97977ec3a568a8ee531375f5330e624675f5b12711c4cf3306959ec82d21f1017380fb6e28b7a SHA512 62630953cb873dccbf6203b90ac6bd62fb596a615c71603c93b4fdc1e21d456c8f6ba74576e9e86732dbce2b7deaa082ea35eddf7fd7387d1ba13236757dfaab
-DIST tree-sitter-cpp-0.20.5.tar.gz 1442677 BLAKE2B ee9e058cca7727d567869d58568b3808efad7b1f4059089682b31ac39fd623213111078250eb034fb66be51f502f693f65686fb89ba8865866ded7ed1f195b5a SHA512 0afe19dc868bce8fef7114c0553ed3af2c479fc84257959a617dd6acf695fb13a91468a3daddafd39cac11f7d5a72ba988bd29d7d7f1987d7486ae4d1dc7f746
-DIST tree-sitter-cpp-0.21.0.tar.gz 1482410 BLAKE2B b15467c3525416fcc925fd8c3480200362ee8ae41528757cebc113090d5678dcfa47bac4b54e32e791dba954de15fd3bba68e6ecdedbc55bb61095487de386c4 SHA512 70be7b446e5acf0f439fbf1d4c9d649e8e8bc8ea044d0d3f3644e3047eaa5468eabefd5552f98fa39d34030cce654db25371008ddbc27a64d3df14611ac3061c
-DIST tree-sitter-cpp-0.22.0.tar.gz 1253356 BLAKE2B 6834cba10f8f5f0981620d69c3ebe2b4efe6815bfd35e00ef333ef96900d418b0204375b93f84989e826c225849cd6f7e8520bd8c2f4195f6e2ed8db41dc1b6d SHA512 68ec7378a6abc3154090bf7f14b95f646c44ac09e309ec5161906f42641e568171412fd4c30360680982af5e621cac4d51a1cfe03695117560a3a5eeed73d22d
 DIST tree-sitter-cpp-0.22.2.tar.gz 1064580 BLAKE2B c51d848f27eb7aaee9e23da6ff375eec9da0fc17c0ce6dd7b128003703a37cbdc8e66664558892629da76a5889a60f77988fa1846e45085441da69f6ab62a833 SHA512 33a885e43ad578697087ffc6af35366f9a7ad8d46e9b10fa3190bb02368d978fa432d56a5e1d8e66858fa6c79f5ff614b1cd2bbefd58eef2532bf88988c14373
+DIST tree-sitter-cpp-0.23.0.tar.gz 1091170 BLAKE2B 30e5aec24424afabcbeda237012e3e2e9f2d01650bb27621277c27a8ac7f7de3d18018149f1a640d62a35b192f85e6c2b28b5e88d1ee440de393b22d7be7ee89 SHA512 bf0a141f3fca00df59881836072d0db171ad9cca72a473d4527e6e59c3b5a5811c00b4345bda4da1817f95410808c5e56e886396e8301a8f95667ca4cc7329b7
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild
deleted file mode 100644
index 18804881eaed..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.ebuild
deleted file mode 100644
index 6fa20973c00b..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.5.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.ebuild
deleted file mode 100644
index 18804881eaed..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.21.0.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.0.ebuild
deleted file mode 100644
index 40d03e0e7ae2..000000000000
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C++ grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-# requires test data from tree-sitter-c
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.2.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.2.ebuild
index 011d04ce711e..40d03e0e7ae2 100644
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.2.ebuild
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.22.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
 
 # requires test data from tree-sitter-c
 RESTRICT="test"
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.23.0.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.23.0.ebuild
new file mode 100644
index 000000000000..011d04ce711e
--- /dev/null
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.23.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C++ grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+
+# requires test data from tree-sitter-c
+RESTRICT="test"
diff --git a/dev-libs/tree-sitter-css/Manifest b/dev-libs/tree-sitter-css/Manifest
index 020fecc893b6..9789200b395b 100644
--- a/dev-libs/tree-sitter-css/Manifest
+++ b/dev-libs/tree-sitter-css/Manifest
@@ -1,2 +1,2 @@
-DIST tree-sitter-css-0.20.0.tar.gz 93887 BLAKE2B 5f5962de37fa6a65dd531a54515b24ccb78932f17d15884adfe00cb1098a86ece3894c2e7f54a8936ad7fa1c76e5dcb89453999e3ffd3f3d894c9e112407e4a2 SHA512 0b4c45de304a5a18834a85665b5da5eaf7adc968c509de6cb95b98a08b2987be7b13f2cbb7181da04cf23e199942d9daf788a12cd2f4b8d85767ef1250196825
 DIST tree-sitter-css-0.21.0.tar.gz 114817 BLAKE2B 6a1acfd884e764903155fae31921fccd878ed858f73eae799d25c603c7740aaa908b5d746f66c429940c55818c279bba21ded5638999c7c96229f4adbbfd8d6e SHA512 2f653e74293516d950ced883ece1ed3f6ceb7e895e54207a561c3ae61e63284a4001ae138aaf75afb46fc2efe8e50e3e551c469cd7f675f8cfcc3415e89d07d0
+DIST tree-sitter-css-0.23.0.tar.gz 118618 BLAKE2B f47f345a5892fa98b44466fa667d25dfe3ae5ec6eb974e1a4751bba733a985c1eb2dfc69f974076709c7b3e0f5024fc3ced655a74455b822665c72879abfbb3c SHA512 a78e18bb6036cd9183525671decd45911887db6acf449d4965e20ab1607df616bfa028d5d84a33ba2b87757e16b4c0dd672c8981a53bf286d81b8dc412512725
diff --git a/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild b/dev-libs/tree-sitter-css/tree-sitter-css-0.20.0.ebuild
deleted file mode 100644
index 632f1a55a2fa..000000000000
--- a/dev-libs/tree-sitter-css/tree-sitter-css-0.20.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="CSS grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-css"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-PATCHES=(
-	# https://bugs.gentoo.org/928010
-	# Test name beginning with :: is incompatible with tree-sitter >0.22
-	"${FILESDIR}"/${PN}-0.20.0-test-selector.patch
-)
diff --git a/dev-libs/tree-sitter-css/tree-sitter-css-0.23.0.ebuild b/dev-libs/tree-sitter-css/tree-sitter-css-0.23.0.ebuild
new file mode 100644
index 000000000000..195fe7aaff43
--- /dev/null
+++ b/dev-libs/tree-sitter-css/tree-sitter-css-0.23.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="CSS grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-css"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	# https://bugs.gentoo.org/928010
+	# Test name beginning with :: is incompatible with tree-sitter >0.22
+	"${FILESDIR}"/${PN}-0.20.0-test-selector.patch
+)
diff --git a/dev-libs/tree-sitter-embedded-template/Manifest b/dev-libs/tree-sitter-embedded-template/Manifest
index d5f87881520d..0005cb33d2b3 100644
--- a/dev-libs/tree-sitter-embedded-template/Manifest
+++ b/dev-libs/tree-sitter-embedded-template/Manifest
@@ -1,2 +1 @@
-DIST tree-sitter-embedded-template-0.19.0.tar.gz 11228 BLAKE2B 31d2e6afb4ec82db57266f642c8e7ec1794dc74e2b86853f069dc0673b3651a736bf5b86916b00be2bd4ee3e1ae75375b994c46fac5c00a732cee43aa315be4b SHA512 960db15be1e740908e1ee623de1371a82ca13a240cd7dff9f4e8490cad5168252880a2f4cf432e8537fa826585a55a0f1032c1becbea868a6b1971ac480cf839
 DIST tree-sitter-embedded-template-0.20.0.tar.gz 11679 BLAKE2B 552c64a499b80f1648cd568fd87d5f2774a28cb3d2a61bfc0ec1f9a73910df41921e06c8f94ac5500a3a5b7668a2b8fe641b2ecf13a9b06b7a119daeef4e3b1a SHA512 1c4a63f85fae1ebb9fa90674a4c27d4402ae0957268faa08dd77c5ec6103720c80befd009d04090a80d994377676b103e2efcc25bd291186efc0c1f4962be086
diff --git a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild b/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild
deleted file mode 100644
index e158f8374e1f..000000000000
--- a/dev-libs/tree-sitter-embedded-template/tree-sitter-embedded-template-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Embedded template languages (like ERB, EJS) grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-embedded-template"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest
index 939f1d87e1d4..0e6c22595905 100644
--- a/dev-libs/tree-sitter-go/Manifest
+++ b/dev-libs/tree-sitter-go/Manifest
@@ -1,2 +1,2 @@
-DIST tree-sitter-go-0.20.0-2.tar.gz 195753 BLAKE2B eca2965c0d7bba3c639e092845ac98d05936e9d87290dca2a283dcd6afb1151f8d63aba907337fee79e9fd9b0d901edfda62ec936ef948f57dc663c9d906715b SHA512 ff438a6c84454f38cdefe506f5da787007cb50b3d41bcb9c7f26ed7d951a3268e6bf0b32f2e750d0e4233516c1e4a827c24af831020f81f268fe825adcd5f836
 DIST tree-sitter-go-0.21.0.tar.gz 210048 BLAKE2B 3589922c610d6a8f32fb753cb91f2c925a2bd4d63dc5b32cc37bb7723b7b6eb7339135cc2dd1629c6aa42684c4fe376dd1364bd928fc8c48100471203b68b627 SHA512 c12725c85ab6836fc6554edc64bc2f005d62e45c3d69d07811138cd09d29635399f70ba5837ead05f5827a327a1666bb4134475c99e2f8da81bd3412e4946a59
+DIST tree-sitter-go-0.23.1.tar.gz 202860 BLAKE2B 2b23ae0e186bc8e7e1d266cbfa616f5d377bd3f50f26d7a9a5bd4f62fe7a361199d4a5156b319d78f08d35810661076fb5ac56459d62c73f34a383f10b418126 SHA512 843bd5a462105f840f266f4c3250f06c0557fe6a875c886f3dd30ba9f0716f7962ac6a1a900bd340d675a9ed93970970312a68e4597ed3a1f61d9094188d9f07
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
deleted file mode 100644
index 1d5e61986362..000000000000
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Go grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-# Override eclass SRC_URI as 0.20.0 was bumped incorrectly.
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
-	-> ${P}-2.tar.gz"
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.23.1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.23.1.ebuild
new file mode 100644
index 000000000000..322cb405b4be
--- /dev/null
+++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.23.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Go grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-go"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-haskell/Manifest b/dev-libs/tree-sitter-haskell/Manifest
index c31f35b4a5f5..631964667da0 100644
--- a/dev-libs/tree-sitter-haskell/Manifest
+++ b/dev-libs/tree-sitter-haskell/Manifest
@@ -1,2 +1,3 @@
-DIST tree-sitter-haskell-0.13.0_p20211114.tar.gz 834925 BLAKE2B d7cadc960ddb49efa6c439dfc13b674d398a4576fb85fd5ef12b4015049fd629722fe0d2788ab4c0052f1a3a6baa9fe5de925d86f7098495429190871340823b SHA512 db3f2ddd20195521a5a03d6ecf1305dc222343ba54ebdabf0cc68db680553908ce6d0ccba4fdcf9073e4f5187b2a6fae6364bda935167ca8d4e421500a86fdfa
 DIST tree-sitter-haskell-0.15.0.tar.gz 1574593 BLAKE2B 47559f768d3c03da63d74b02aba9cb788a1f20223187d2ba67730b3cf2921036ccf9f3df22d82a958adb1b46022f76f148dd251f7fe0483e482bd877d789a9bf SHA512 22368c46cd6e0652ed717c954b55f582125489a410bfe17027b7d0d0d7854789c342140e4908080ad5bd177e14ded928215daf514b7954bc6a31ab7fa19016f0
+DIST tree-sitter-haskell-0.21.0.tar.gz 1026868 BLAKE2B d8a8759edce95dff41d5e6def0f1324e38c9a7b6e1db80752ca73d4c4a72531cc2201b5235a8ec3b763be7cbfc5e0dd3e09fa09bd3c485cc43eb7e399efaf8d0 SHA512 c1a34bb15553598055306f168504c4e091ed822f9b798fb1fe2a7d9d79ae56a69751379a02f9f59fed6ed514381133d195f83d8f11d3cccc96aca15f34af542d
+DIST tree-sitter-haskell-0.23.0.tar.gz 1007195 BLAKE2B 11a16675503ca25b33b9d37e3bd666a91ee102810f7b6dc9b5bc2e88f5e6b179732d49d12db88a5e948a3d97068d02efc47d7d4f13e69cd12a93ade315f7c4e1 SHA512 22a3996bdfc06929caa91e6e6a1430a052fddba6efa89721cd357d6a2a15670be09b66b7e8057981d5fe781c3d72f21ddc8ed3b2022b6faa4588215347545e0d
diff --git a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild
deleted file mode 100644
index b025bcb78ec8..000000000000
--- a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.13.0_p20211114.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_PV="d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02"
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Haskell grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-haskell"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.21.0.ebuild b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.21.0.ebuild
new file mode 100644
index 000000000000..f94388adb390
--- /dev/null
+++ b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.21.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Haskell grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-haskell"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.23.0.ebuild b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.23.0.ebuild
new file mode 100644
index 000000000000..f94388adb390
--- /dev/null
+++ b/dev-libs/tree-sitter-haskell/tree-sitter-haskell-0.23.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Haskell grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-haskell"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-html/Manifest b/dev-libs/tree-sitter-html/Manifest
index 53427fc68a48..24ff0bca3373 100644
--- a/dev-libs/tree-sitter-html/Manifest
+++ b/dev-libs/tree-sitter-html/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-html-0.19.0.tar.gz 18785 BLAKE2B 40a2f8a1b4d9943ed15003073e8499fb58aea00979359f793c30c4e7d431905620c20f8e77286a56dbc040642081effa61a7ed9fdd3d61d44bfadfb327793ed1 SHA512 7816e5f4e74c7a64a4fb715000123f5350dc3c6ebfbf5d71ea6dd660cd58a7b4327413ef3e8efa8c177c7308f43bb8b4d60fddbcf518a99841148a37aba95b71
-DIST tree-sitter-html-0.20.2.tar.gz 28880 BLAKE2B 0c17bb4a29174535cc0789221b631889122bc89e9a3883d53501acadade7723bafd15aae8373fb9c6135c0fea485202ea68ec45a855e21c2d7b7eda3fe0e0c58 SHA512 4ebdc4cdff525e54d774bde6b53ced5d8d0e2fea5cd54f006c39354544752856c520ce7b53eb268b6ef60185236102b8003b5de389fdb85454126b6ee689bb61
 DIST tree-sitter-html-0.20.3.tar.gz 45084 BLAKE2B fca267fca9ddfb0651b1e596f422d9093852e0b06391f192f9b525df379048d2e74fab472bd4ecfb0fa229ff34546d648a644bfc3f746e8ecb24ad8b4558419c SHA512 572cbdeca6c57d8fc389b8736acfb6a4ac2b3bd8704445ca7a006d75e0a3c37faa9abd75ead54d586e25b5550f72324c407271b451dd5ed94fafb09e8a6ad352
+DIST tree-sitter-html-0.23.0.tar.gz 48671 BLAKE2B 2cb04036ec9c69a93a90e79eabbb7cf684d94c5c8bd6db8124ec54d2040acbf94b787e146d38902fa865851b1d7ce33d1510b036bb4e88180d29a498930d9719 SHA512 6ddbe3cf5c978f3a525c04fa82029eab522dee86b088375e3062ecaa70c2a9920b22c4e1021ca55c180c160919180c36f7e961acda3c8e7ea867214eb161f19a
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild
deleted file mode 100644
index 6a8921210e57..000000000000
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="HTML grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.ebuild
deleted file mode 100644
index 55a42a78b64c..000000000000
--- a/dev-libs/tree-sitter-html/tree-sitter-html-0.20.2.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="HTML grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-html/tree-sitter-html-0.23.0.ebuild b/dev-libs/tree-sitter-html/tree-sitter-html-0.23.0.ebuild
new file mode 100644
index 000000000000..09d198cb3b8a
--- /dev/null
+++ b/dev-libs/tree-sitter-html/tree-sitter-html-0.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="HTML grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
index 9a93dd4f91c9..930719eea7c9 100644
--- a/dev-libs/tree-sitter-java/Manifest
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -1,2 +1,2 @@
-DIST tree-sitter-java-0.20.2.tar.gz 200727 BLAKE2B 03c9b805ad94b852fc9e02f1e266cae9010636cd33ffd2a7f3da1076843aced2358f95022476476edd0b201efb87b164f31bdd610654f182cc627fd762c39cb8 SHA512 188b4d4c5aad6367ab25e5bbc3b7f56fe1b6108ee1dbe072d71a7376e52793364fad004e2f79d1aa6e18176d5642afef982a40b8da127d4252f2ea10d4bf874c
 DIST tree-sitter-java-0.21.0.tar.gz 218672 BLAKE2B 8138dbfdb76aebd1067be3a6c97543c71d601b3b5475e14b050251e163a0f1fff97003505ef4c3f997b34f588470acd5e46df70e54afead8dc2f80b020cb41a3 SHA512 236159990182f2cab0fd50ab1f43898f021243a37e7517f7c8df039296f08e1fe615889a0fd0677eae3abd6a495333ed56be5164f43855cb9ef8e0cc4f2b70c9
+DIST tree-sitter-java-0.23.2.tar.gz 212482 BLAKE2B 78beabf585033b1de42e4d85c1be802e5918d6885dcc3028be38662ef16acebbf0a3fc7c7f9b94ac314691e7b17244bbbbfaeedd5bfa8081c351a0240f11e6af SHA512 745dac6b5c6512777d3dc8f8652f967461e0a5354e18318851ff9e37d934552c6fd528a617fd795f201e3e4e2c8cd1eee1fb86efce2e0bcadceeda200c6d0c78
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.2.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.20.2.ebuild
deleted file mode 100644
index 21de8dbc5b4e..000000000000
--- a/dev-libs/tree-sitter-java/tree-sitter-java-0.20.2.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Java grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-java/tree-sitter-java-0.23.2.ebuild b/dev-libs/tree-sitter-java/tree-sitter-java-0.23.2.ebuild
new file mode 100644
index 000000000000..e09c03cd7396
--- /dev/null
+++ b/dev-libs/tree-sitter-java/tree-sitter-java-0.23.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Java grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-java"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest
index c46994c8c152..c7cf76739f00 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-javascript-0.20.1-2.tar.gz 371027 BLAKE2B 5bd9b11f1e10ff37950b2142031bebd3b5f6111818a21bf5a7d97a8a27a5340bd09cd139d76846141ed64a824f82f1e1394b90d8622192524d7db9a02ed95223 SHA512 5341311b419cf763c0a6d23348eba0e38b417ba07c2def341027223347d850c28b86db6add136dbf73cd5296133823a4548493ee649e09247dfbe5bcbaaab76d
-DIST tree-sitter-javascript-0.20.4.tar.gz 396452 BLAKE2B b33c4c44fb59985af7809ef9bd015d12dac185999993570164de4ac87a60cde28cf4c1232a06dd3e312ce256f2b021ef5fa500fd9e0772a3fb657f74256500a4 SHA512 65171e5af35c9c5cc9a6c54792d2194b197e130ec277b35e67e04b654082bcb1b98cb9bbe497bbe1dde69f582e5cdca01cba4f40682b7b587fd19e89b88f3dd6
 DIST tree-sitter-javascript-0.21.0.tar.gz 367344 BLAKE2B 7698b918db7fb49bd73ee03757fa17d5f6c0adc14a279410e2bc924123b1a187e6018b534bc1d2b6cbc41e5f42f7b4b6541c65d4f70d6345dda31c719bf479c6 SHA512 c83d7525e3639e237b9f81cac38d0290a3257aa98dba62f079abfb234f3cbd3de23e0b275da85878d3ab4b8de03384dc4e8a8512641b17ff0aca2e3a722947a6
+DIST tree-sitter-javascript-0.23.0.tar.gz 292398 BLAKE2B 6826656b359484a9d4edaf6ad4911002c74a6bc2735c38d1e6fc548ce95d45ef0e1add93d95c2b50a4d73f154d54470d14ca2c4ee8ca3cb47242426658d439ea SHA512 fd116f00a694b18f67143df57b80ce29547c5bebc64e02b11f5a2d0c1c01347b68a963830e5bad837856fab1437faddd14c09f63733b52cf00d44825451ca110
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
deleted file mode 100644
index e1d5ee9003fe..000000000000
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JavaScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Override eclass SRC_URI as 0.20.1 was bumped incorrectly.
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
-	-> ${P}-2.tar.gz"
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.ebuild
deleted file mode 100644
index ec9248a60d3d..000000000000
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.4.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JavaScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.23.0.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.23.0.ebuild
new file mode 100644
index 000000000000..79446ab32826
--- /dev/null
+++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="JavaScript grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-javascript"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest
index fccaf007e65b..50a2a10c7ff0 100644
--- a/dev-libs/tree-sitter-json/Manifest
+++ b/dev-libs/tree-sitter-json/Manifest
@@ -1,4 +1,2 @@
-DIST tree-sitter-json-0.19.0.tar.gz 11102 BLAKE2B 8530b53dffa59fcc844501dcbfc9fc8a39a4d4fda6653e02b17261c23da43c8f3dd2bcb1e312a58861ea9af7835d4f2b9208e7960bfaec8ffeecd754e04416d0 SHA512 f4ef90d1ff7cb96093e7b54fb0b4904f7c19256c2e0938c03f81d89f3699f0c0922da54d1d770aa786b9cf10b08f9afa762771a207546a29cf7ff7f1710dadb6
-DIST tree-sitter-json-0.20.1.tar.gz 15576 BLAKE2B d6b9d3c931453440c2557814184b629640e4a0dd9b763ba8aec51aeb8322b021d0bfd8e4385445ef527100f67db507d3c934480457a7a5ed60a2d035fda44f13 SHA512 30ae91cec4c9e63acfd2bd0c62b313d48a50ec722ff5c793b8b51910a02a9c6f8697a866ec7bbde3c7f14b2bdcfc12be3650d7a8e6f23fde80527cc235a3768e
-DIST tree-sitter-json-0.20.2.tar.gz 15647 BLAKE2B 524933bf7af4df87d78497912c7865c20b2cc3e9b099401aac612c8c6d382fbc8f8704515abcb1e579fbac7734d23545f91ac7600e978a2924567998e5166834 SHA512 511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5
 DIST tree-sitter-json-0.21.0.tar.gz 34737 BLAKE2B 104229cd039b41fb79ccdab3b30e0e59a96a3aa46c060bf50cc093acfe4510150ad5caaf39f49045d478d9f67f863ff6289ba7ab59aaa27871ebb77ffc66a453 SHA512 37ee6a511e15eeb832c7a49d74d977724fecfe24943472047e2100aa18bf4e64f297b1a8e8e37f1d2223614dd9ceec038abd84b5f1fcc00bb67289b70de2ebd2
+DIST tree-sitter-json-0.23.0.tar.gz 38503 BLAKE2B 5b196d82e7b1d10fd65e106a14754c04c64e9486ff97015d8f39028099c2ac609a8ca0dd353b88aae9945332ad672896629082c78a20041f77a57995d2c3f2b4 SHA512 eca9fad305306762b6095fac0e20915300760fbd45bb86d224bf8e6efa3c207418ab9cffa59bbfbb6018e5d1a8d9a2262b82a5687c261c1dfbf573a5e2d4df58
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild
deleted file mode 100644
index 6e3dc239628c..000000000000
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JSON grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.1.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.20.1.ebuild
deleted file mode 100644
index bc7df5806d4d..000000000000
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.1.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JSON grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.ebuild
deleted file mode 100644
index bc7df5806d4d..000000000000
--- a/dev-libs/tree-sitter-json/tree-sitter-json-0.20.2.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="JSON grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-json/tree-sitter-json-0.23.0.ebuild b/dev-libs/tree-sitter-json/tree-sitter-json-0.23.0.ebuild
new file mode 100644
index 000000000000..75d5e2c77ce7
--- /dev/null
+++ b/dev-libs/tree-sitter-json/tree-sitter-json-0.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="JSON grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-json"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
index 8f235382ff54..6b715c4cc926 100644
--- a/dev-libs/tree-sitter-julia/Manifest
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -1,3 +1 @@
-DIST tree-sitter-julia-0.19.0.tar.gz 591870 BLAKE2B 0a15485ce7eb87f080add5b2dae19004349f3c79a048b77552915ae776860d722d6d6e07422ab82fb932f795285b545fe1b6579824a8f4905fbbdd4b96f16ea4 SHA512 ee3943683413e3d16d60ec1bf1f3cc816011c4d458b5c44d7ce42e5f14c8aa22e35ce07747f0737c9b514fa7ea8b866d4fa6af5c53069b755e0d6d3f7bcc8e2a
-DIST tree-sitter-julia-0.20.0.tar.gz 4032821 BLAKE2B eac1ec80509c8dfb75a68f507a615eaf69366e42fdf2ff9a74fb7acc8281f55fa5ba45cd4a1b050e5277614a14b5bd39145115c74de83ffb7669701ed709c04d SHA512 173e990ba6353e8b3f124fb3b1e1e5c281882d7fd6f7d53b3f40304db0f5361c0220017af51dbc569ddc2debf494ae8325877fc3c5de60239da942299a054b3d
 DIST tree-sitter-julia-0.22.0.tar.gz 2792109 BLAKE2B d661b9d84b9d1903d7fae9e4073fcc1fd52030e7a264929cf6eb3aa33745cc51c094beb6e4ddcfd11725989fc82a5e21b20a66b01bc60c8f06c522f732bcff6a SHA512 9687875f641eb0f599a15a5c9ced0a873c81a2d6ad36528f2c29120126a92ca5d6a51c97f736c1c1e46cd8af32e7c5739c694b0372fa62ca840f39f0fbd6a387
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
deleted file mode 100644
index a98d5d0a3b62..000000000000
--- a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Julia grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.20.0.ebuild b/dev-libs/tree-sitter-julia/tree-sitter-julia-0.20.0.ebuild
deleted file mode 100644
index bdfad03a9860..000000000000
--- a/dev-libs/tree-sitter-julia/tree-sitter-julia-0.20.0.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Julia grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-julia"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-lua/tree-sitter-lua-0.1.0.ebuild b/dev-libs/tree-sitter-lua/tree-sitter-lua-0.1.0.ebuild
index bb6ffb4aa4d1..e8b94ff74639 100644
--- a/dev-libs/tree-sitter-lua/tree-sitter-lua-0.1.0.ebuild
+++ b/dev-libs/tree-sitter-lua/tree-sitter-lua-0.1.0.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-libs/tree-sitter-markdown-inline/tree-sitter-markdown-inline-0.2.3.ebuild b/dev-libs/tree-sitter-markdown-inline/tree-sitter-markdown-inline-0.2.3.ebuild
index 93acb40275e4..5307c0a799fd 100644
--- a/dev-libs/tree-sitter-markdown-inline/tree-sitter-markdown-inline-0.2.3.ebuild
+++ b/dev-libs/tree-sitter-markdown-inline/tree-sitter-markdown-inline-0.2.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}/${MY_PN}-inline
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Running the tests requires extensions to be enabled, but the parser
 # generated by upstream does not include the extensions.
diff --git a/dev-libs/tree-sitter-markdown/tree-sitter-markdown-0.2.3.ebuild b/dev-libs/tree-sitter-markdown/tree-sitter-markdown-0.2.3.ebuild
index 7e985af8ed8d..d5c17521edfb 100644
--- a/dev-libs/tree-sitter-markdown/tree-sitter-markdown-0.2.3.ebuild
+++ b/dev-libs/tree-sitter-markdown/tree-sitter-markdown-0.2.3.ebuild
@@ -12,4 +12,4 @@ S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r4.ebuild b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r4.ebuild
deleted file mode 100644
index 7f7a837988eb..000000000000
--- a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r4.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
-
-DESCRIPTION="Metapackage for Tree Sitter packages"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/tree-sitter
-	dev-libs/tree-sitter-bash
-	dev-libs/tree-sitter-c
-	dev-libs/tree-sitter-cmake
-	dev-libs/tree-sitter-cpp
-	dev-libs/tree-sitter-c-sharp
-	dev-libs/tree-sitter-css
-	dev-libs/tree-sitter-embedded-template
-	dev-libs/tree-sitter-gleam
-	dev-libs/tree-sitter-go
-	dev-libs/tree-sitter-haskell
-	dev-libs/tree-sitter-html
-	dev-libs/tree-sitter-java
-	dev-libs/tree-sitter-javascript
-	dev-libs/tree-sitter-jsdoc
-	dev-libs/tree-sitter-json
-	dev-libs/tree-sitter-julia
-	dev-libs/tree-sitter-ocaml
-	dev-libs/tree-sitter-php
-	dev-libs/tree-sitter-python
-	dev-libs/tree-sitter-ql
-	dev-libs/tree-sitter-regex
-	dev-libs/tree-sitter-ruby
-	dev-libs/tree-sitter-rust
-	dev-libs/tree-sitter-scala
-	dev-libs/tree-sitter-tsq
-	dev-libs/tree-sitter-typescript
-"
diff --git a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r5.ebuild b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r5.ebuild
index 092bfd72b39a..7b2bb673a688 100644
--- a/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r5.ebuild
+++ b/dev-libs/tree-sitter-meta/tree-sitter-meta-1-r5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/tree-sitter
diff --git a/dev-libs/tree-sitter-ocaml/Manifest b/dev-libs/tree-sitter-ocaml/Manifest
index 29c9ee5bb16d..4d55a29a8ecc 100644
--- a/dev-libs/tree-sitter-ocaml/Manifest
+++ b/dev-libs/tree-sitter-ocaml/Manifest
@@ -1,3 +1 @@
-DIST tree-sitter-ocaml-0.19.0.tar.gz 1314747 BLAKE2B 8bceac43a40b11b27395a52a450ab734312fbb43cd4b711ca27e629f16599a04cbb55b13a05540ad20f7aa00f068ef57752b7ba42c45bbc75fc87c344133a743 SHA512 897ce5fcb58241c8ec123536ce52eba64698cb5da08403801f4d1760fab1addaced0b3cda5c24460cf2b4531215becf3a6b29c34ba871370b02b467a13b171ba
-DIST tree-sitter-ocaml-0.20.1.tar.gz 1509589 BLAKE2B 965980ce37b27bde9771308eeabe5117bc7997f3a5429e9774eeb885b81199e5d8ebc471bc5cd10d3e15e2cbcffdf6f887f0623b61c3595deca06492d22c78a8 SHA512 c3a070367ddce3186ea09c705f4c08279f0fbf890669ce6486eef5b9564ea2c3a88041b3227ac9210fdb9257d4971697e6ceebea672fe37e7fce038cd9a09838
 DIST tree-sitter-ocaml-0.20.4.tar.gz 2849217 BLAKE2B e96ffaa2bd72b849f215a9d843fc8b27003917878a32eb5471a3ee4547a931a5dd4b991872d913f514d6519b9bf78b7b57bc501c89f360265a36abb695ed229d SHA512 517f1bf1ff989be4c0853eae20f3c7bc51ef3f68bce1a850d80c6ba150cccac820b6ead00c45e53acb2dd06e9b2e7646dda219353ffdad16be3329f2bd33593c
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
deleted file mode 100644
index afc9708cb318..000000000000
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="OCaml grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ocaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
deleted file mode 100644
index afc9708cb318..000000000000
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="OCaml grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ocaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index 0bffd60882fe..a2a63f12bc55 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,4 +1,2 @@
-DIST tree-sitter-php-0.20.0.tar.gz 290518 BLAKE2B 5ba7dabf79665ceb2be737906493bf774e51a0233a62bdb89d84a6a9204745a99679322e047a9115d95e92c3dbb34c5da591497223bb580522b587bedc933d10 SHA512 0ce3e8b2a7cb26b8fa2210e2ac8b133c0ea8450b7504f93422a7baa0ee6f5217c72b9ce0cbdc5ac1e85deb2ab08fc6b968e74f124dce13ebfb8ad9b0af2afb8f
-DIST tree-sitter-php-0.22.2.tar.gz 541599 BLAKE2B 5e98d7d9226900c16b8681ec408bafb6a4c4c281fa0d97b3b9c06b58657f69166df6700ecd127406efff430c0f79a56ff08cc45ca48b483ecd6579cfe7263a05 SHA512 0592d145f92f9f93524b5d6b341b8141234784c03d9e0384311cd735f4b8216e0dd3d5ff27daef6127d3a079b16043b3957e7fd0f8759e90924539bb42f4f306
-DIST tree-sitter-php-0.22.4.tar.gz 555466 BLAKE2B c95870d3079053cf8ff0ce07ce3019a4c33712f1be21734ddf52b9c47f2721387c4c024c4e53855c7449cff386fd46924a5fccf149437a06263e732378e8b0d7 SHA512 5baf5f454769407789ad2e84065088da2aa4a404ac518ba77078d421c38a08a622884c6c6a8e2e77d38c441de36d6e778a5073cb575fe649ab92e9f7420a32b3
 DIST tree-sitter-php-0.22.5.tar.gz 553995 BLAKE2B 63d786c34d5629181dd3a32a3f76a4fcb0c82f2c104e080e35f6f8241dcb6c35cb782510f0b09d7ef0dae295879675ee3e0a82557dd1ed4271b20aaff14079b9 SHA512 ad8492e9e371d21aa00f0a0cfa3f704042661d7f96e736dbcd44b8a1f738d9de2eed14d5be4c7fdfdea9a82256339f5e0b03bdc3f77cb185dd6c660aa8a394df
+DIST tree-sitter-php-0.23.2.tar.gz 580616 BLAKE2B b8055ee6b2a5104d4b4a00c45d702cb8d6479cc32c3e195c47ee8d16543f0234df703a4c33687af9a076bd10eca4166a20e16fbe44b1dba9ec45b80fb1a36275 SHA512 ed8c8fddeb6a8f5304cd7419af67a41c94f5d2ad6ee259428eb34109e8afc54a41b1076cfaabe93d311cbc53c82048b98737281816058e6be02077d086f84fe5
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.ebuild
deleted file mode 100644
index e331a8f2ea6c..000000000000
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.20.0.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="PHP grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.ebuild
deleted file mode 100644
index 75450e8ef333..000000000000
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.2.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="PHP grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
-S="${WORKDIR}"/${P}/php
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.ebuild
deleted file mode 100644
index 75450e8ef333..000000000000
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.4.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="PHP grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
-S="${WORKDIR}"/${P}/php
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild
index 13dc08afbb50..75450e8ef333 100644
--- a/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.22.5.ebuild
@@ -11,4 +11,4 @@ S="${WORKDIR}"/${P}/php
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-php/tree-sitter-php-0.23.2.ebuild b/dev-libs/tree-sitter-php/tree-sitter-php-0.23.2.ebuild
new file mode 100644
index 000000000000..13dc08afbb50
--- /dev/null
+++ b/dev-libs/tree-sitter-php/tree-sitter-php-0.23.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="PHP grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-php"
+S="${WORKDIR}"/${P}/php
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index c0dfa6788d6a..3ef4c1e2bd8e 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
-DIST tree-sitter-python-0.20.4.tar.gz 249840 BLAKE2B 563895c46ca1de400d51168473cceaed61b3df486cbf9f33ae9f63acc16268b9147917f0bc0f18d3c8cad0ab0684b4c51900a7e1c6b898735621676353630650 SHA512 2cfd327a1c0033ebb5bc1a4efe4f8b7a776ad45da6b12ad3d496fe3500e2a99ac0ecefbc6eec81d724bcdb060a0ebb8a24496dee23c83c7802e0226f495751d3
 DIST tree-sitter-python-0.21.0.tar.gz 275770 BLAKE2B c595476144931fbb08c404fd72d981ad8170333fcbec98cb4b7637932860dea3967abee712ce6afe1c6454ca02cd67e6c84e969ca0b5f593d6822ec1ee623afe SHA512 02410d235473a3e9a108b7820f146cdf8df5794814ff1e2ce8ccac1e38a727fa3e133bcac6718ade2a0d0f0965e879bb3cb9652d1d30f738969f458add53dc50
+DIST tree-sitter-python-0.23.2.tar.gz 266482 BLAKE2B 1f91086f2ba5ab98eaac262745a7cd9d9965bb5fdc5e585cf1ce35e175eecd1ad0a462395351c1a5bfd82e89a09af469f217acdef0f69ac27d2748ec62ead831 SHA512 784e1157de886044bf0e3bfae1a12bc5fefc0316ca2e7d5cafef4c9cbdff7f2e6c376b838e0319dbb45eb51661bb9d30b8f8feba5b8575bd40858a3cdd6e58de
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
deleted file mode 100644
index 57ccd11b1fcc..000000000000
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Python grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.4.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.20.4.ebuild
deleted file mode 100644
index 5cec91fee1f7..000000000000
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.20.4.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Python grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.23.2.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.23.2.ebuild
new file mode 100644
index 000000000000..a1824f941b83
--- /dev/null
+++ b/dev-libs/tree-sitter-python/tree-sitter-python-0.23.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Python grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-query/Manifest b/dev-libs/tree-sitter-query/Manifest
index c96c89bd30ac..5ea8c28570e6 100644
--- a/dev-libs/tree-sitter-query/Manifest
+++ b/dev-libs/tree-sitter-query/Manifest
@@ -1,2 +1 @@
-DIST tree-sitter-query-0.3.0.tar.gz 43274 BLAKE2B 59bf626d2a90c4f4296424a0858f99dd482c5ff730b1564d78eb462d155cc8265cbcd7eb0f64b16794b4e35cbf37ca12a20602ec82b679268fc323211f57c08b SHA512 aa7ae99da889c707ec8d0369cf832f407cebde3795cddeb942e3159e4a15f0e7978f0a2ff5d0c0a71f34b0c98e2cdac551e571a14a206acbda0fa035cc29c85a
 DIST tree-sitter-query-0.4.0.tar.gz 42944 BLAKE2B f323ae7a7443dd7deffd08c54e36e542578405ae93a4b028705dd36b33b6fe4e78a519ea6cfc1495fc7c3c89f83105d8b6d47f69ab98176223d4564acd831048 SHA512 e5c771c9e519b2cf3ecf99a5708d2389d63366183d877ad2ddd396ab5cde1b4a2e57837924da3f32fd050bd70f20e2445fbd414b0f82b0a8ce112f8466cbccca
diff --git a/dev-libs/tree-sitter-query/tree-sitter-query-0.3.0.ebuild b/dev-libs/tree-sitter-query/tree-sitter-query-0.3.0.ebuild
deleted file mode 100644
index 50cac920993c..000000000000
--- a/dev-libs/tree-sitter-query/tree-sitter-query-0.3.0.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Tree-sitter query grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter-grammars/tree-sitter-query"
-SRC_URI="https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-query/tree-sitter-query-0.4.0.ebuild b/dev-libs/tree-sitter-query/tree-sitter-query-0.4.0.ebuild
index 27dddad45b5d..c79d7acabdc7 100644
--- a/dev-libs/tree-sitter-query/tree-sitter-query-0.4.0.ebuild
+++ b/dev-libs/tree-sitter-query/tree-sitter-query-0.4.0.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v${PV
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-libs/tree-sitter-regex/Manifest b/dev-libs/tree-sitter-regex/Manifest
index 64fa25dce9bb..f341b687e214 100644
--- a/dev-libs/tree-sitter-regex/Manifest
+++ b/dev-libs/tree-sitter-regex/Manifest
@@ -1,2 +1,2 @@
-DIST tree-sitter-regex-0.19.0.tar.gz 17452 BLAKE2B a1a4db494b685c9e4df3dba790b8d4938d604c02c419c040d783aa11093fb1d988f807d002b798ff53e6b64f294df6b24b6774642bb331ad0dc2a9a61f2ad88c SHA512 d2ecc9637f7e130b16103b375592e449f3b58afcce7d284e269ba7a20e96ca5d6c118a8c99819e7c9d0f8d4ceeb139ba493fcf6e001da25610a70030db599991
 DIST tree-sitter-regex-0.20.0.tar.gz 20283 BLAKE2B b5c71d9956736c913d995631e3051ff20594b059d5fd736d57ce3ae29499b9dc41127f25fd88f7d9c81702e74383157554eb418f8aad88d6e8f46ae4b9f2a6d3 SHA512 35c8e51539ae8135f7a3ef7c3b5c736e0ef7dfcaf7a97417c0228e47fb2500833e1e585805dfe7a4552b5ddd2cc6bba394aee34845cf419f467747ab10f94988
+DIST tree-sitter-regex-0.21.0.tar.gz 42108 BLAKE2B 3407ffdcaef634044889d3ed9354ea029a917d939915b15fa0902b20f97459f98b45c9bccf3bced16f78440dbb9863fcf9b283fc8578a4e5c00339f40e9bf16c SHA512 cd4c7e754dd9a6cfb001f2770f9103cac06ac4938118041037e48d0a924768350930b1d936fadb06c966fbd5b47c4bff2311c21b9e29e57d79d101da755f0383
diff --git a/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild b/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
deleted file mode 100644
index 8c5c1cd0a4e6..000000000000
--- a/dev-libs/tree-sitter-regex/tree-sitter-regex-0.19.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Regular Expressions grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-regex"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-regex/tree-sitter-regex-0.21.0.ebuild b/dev-libs/tree-sitter-regex/tree-sitter-regex-0.21.0.ebuild
new file mode 100644
index 000000000000..3c6eb1ce69ea
--- /dev/null
+++ b/dev-libs/tree-sitter-regex/tree-sitter-regex-0.21.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Regular Expressions grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-regex"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
index 20c1e7a8b49f..a9ce14a4ec6e 100644
--- a/dev-libs/tree-sitter-ruby/Manifest
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-ruby-0.20.0_pre20221101.tar.gz 575761 BLAKE2B 17daf39dfd812ab0993cd2a3ad728603d629c2e177261fa60d237a1dfd504b2a087611824cdffb03e95c0b304d9f6991ccf36aad1f18db4aa3177c082c6e275e SHA512 ff6eb4a28e5313cbdebca0f939d209d7c15016fef4ed864e64ce2e6f30023e15a88483c5bc90673fcee42df75c6e003b69fc2e5f81b72ecf1a506c836eebeba4
-DIST tree-sitter-ruby-0.20.1.tar.gz 601038 BLAKE2B 29174a74a96f0b93d803eb9455ae1ceb7e4ca78be215c062ca341485c19f595a29cafe7c9ee75b95239045497e8d4695648c3ab1503d96039ec7c5a3c64c9883 SHA512 96d68cb7c557d341def9cbb9a51ecf12b7572bb46b9588bd3dab6f2598b6ce73df2fbbae8f0aa08737b34bda55e98eff8499921ea68f7389a7237fa32f62793b
 DIST tree-sitter-ruby-0.21.0.tar.gz 618006 BLAKE2B d296dd901e426642383594f9bd45cabb8cff3193b5e83ab17f5c199e954b912da4b398ff57337b9439780bff7565bd4b396cf5bba69587e4714d5563fbcebb02 SHA512 d8f2059f60dde221466b1428bca11aa815129c9247789ba7de79f837050225687699cd9a3316e3bd8b1f28da339b68a4f73c5765710c238d88a213521297e604
+DIST tree-sitter-ruby-0.23.0.tar.gz 627423 BLAKE2B 6da63076e0f0652c2be9173bfaab8010e69bf119157a6376b9bf1c12bffef1e5f4435fe955b72b7036b5c00fede09c61ea7949ade210a39466cae862136042d2 SHA512 bd6a0d72613e923ce262519f32524ae79abf7d8e66a8877ea7c1e21e0056d65fb28255b62ecd78f86081d2e71f6142efa1a851bc9107af359b65a71d536c2516
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
deleted file mode 100644
index c0e7e24609c7..000000000000
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.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
-
-# https://github.com/tree-sitter/tree-sitter-ruby/issues/232
-MY_COMMIT=c91960320d0f337bdd48308a8ad5500bd2616979
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Ruby grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
-SRC_URI="https://github.com/tree-sitter/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.ebuild
deleted file mode 100644
index ef5a0db4369b..000000000000
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.1.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Ruby grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Highlight tests failing in upstream ci too. The parser works, and
-# we do not currently install the highlight queries.
-#
-# https://bugs.gentoo.org/923987
-# https://github.com/tree-sitter/tree-sitter-ruby/issues/253
-RESTRICT="test"
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.23.0.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.23.0.ebuild
new file mode 100644
index 000000000000..ee3d1223746f
--- /dev/null
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Ruby grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index db118c56a1cf..5e7231bc67e3 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,5 +1,2 @@
-DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07
-DIST tree-sitter-rust-0.20.3.tar.gz 325621 BLAKE2B b5d2f15df3550e22e380c26a3fa6270a897f4555efb2778e54ef9262145ca919bf933ee739674e02a2086f58d707174c3a2cfb545d879a2c67decf508793af47 SHA512 9732a6e9782538c1a7f7a265e185aece659e164284eac61f65f3d174845aafc697ec2758d6dddb52c8a6ee3856be67493339d680f963ee383894f1d3789d96d5
-DIST tree-sitter-rust-0.20.4.tar.gz 358924 BLAKE2B 16c7918d352163ebb866f34865c68f5d9e19bbc3ffcec0f0c61ba38a8c828cee3eb50c97ddaea01d7575e23496bca18dc5161daee8bbdaa075ba75de608be999 SHA512 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d
-DIST tree-sitter-rust-0.21.0.tar.gz 448170 BLAKE2B ecf13ff1358a64383feaa973332be7ff7d7551c414fef9bb3773f1ca975db97f6e0e6076ea572094771c25c59641a58aeec70c41fea65533b59fc436fd143938 SHA512 f9cd32e43b544a18eddfc0b6f8210f1fbc3e7a5d6e9b72c482a536df1e215ceadb41545a65f0c6fc791f6063adbe51957d4e20f7c8fa07a5079a4338a0351bf3
 DIST tree-sitter-rust-0.21.2.tar.gz 433742 BLAKE2B d929baa23ef85bdf0b22ea1878699ef8b788ce43ebba93552f473fb695502d6e8bde5f378ef053702ecfaba2e859143d093f3f7b46e302160212eee89f6cbac6 SHA512 304b232683ded9973a94ec872401151a5900e3423c7bff966b3f5ec4a71122405fb3790f71f5fb445b8af72a31176349cb3ea8bc7d1b1a042ee574420472e19e
+DIST tree-sitter-rust-0.23.0.tar.gz 434858 BLAKE2B 05dd1878652ce9bbef5e4c5bb252b6bf1a55005e39042d9297cd070e6bff24c034b4ba61cd2645e44794ef01f3fb893b935d50f6754908c4a3a540af1cd90ed4 SHA512 2f683ea8c4c194c7dbdd1a1e78343ae908175d403c2cf2fd4d6ab318f7383a8fcb5760f6ae55ed7ed2123a93f4cf93912c759f2d39eb7d75c3e54cd89390c91a
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild
deleted file mode 100644
index 36fca638c421..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild
deleted file mode 100644
index 7c4fec4db433..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.4.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.4.ebuild
deleted file mode 100644
index 91e3f0de8370..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.4.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.0.ebuild
deleted file mode 100644
index e602dda97d5d..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.21.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.23.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.23.0.ebuild
new file mode 100644
index 000000000000..4277cfc5dd1d
--- /dev/null
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.23.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TS_BINDINGS=( python )
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Rust grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/tree-sitter-scala/Manifest b/dev-libs/tree-sitter-scala/Manifest
index 5a8367249478..79fdf2dc6ef6 100644
--- a/dev-libs/tree-sitter-scala/Manifest
+++ b/dev-libs/tree-sitter-scala/Manifest
@@ -1,2 +1,2 @@
-DIST tree-sitter-scala-0.20.2.tar.gz 1305216 BLAKE2B 6fdfd74975f60794ca27b986250fdbb196b08892d48aca4fe034e8d2f9a18c1244538e03bd6f5618372ffdba64299c8431ce2bdf95d27578fa262c75516163b1 SHA512 7dba7733c126877c26a4da82420cd6fe8bb933d7694dfbc7a64a9195b33014ab6fd74de6a659ed79eb48dd46767874611713dbad8cea1e7b2fc13a124e7e4e38
 DIST tree-sitter-scala-0.21.0.tar.gz 1339069 BLAKE2B ae3406b49da3c7d349b0689b1f6d1ef037f5c6e5326016b64abef00174da0b1fe489579939150bd065fa82546a5782c04232ac144eb596855b59e263afe72ed0 SHA512 4d76e496c68993babe3c11315d6ce2c2a15cf576f55197358d718b0d16d1ee2c7e498ee45f793729b03faef7f35b8dbbe4d3692e4255f9aedb9ef69d49cdb189
+DIST tree-sitter-scala-0.23.0.tar.gz 1240380 BLAKE2B cbe0774baf0fb46a50bce4f49d0506ea8d5c1d7454c116935937a213e6e2496a56815bbadb7465d74ac8a43ace6e3d97a9b5d8d3cebcf99935083316a2e33c16 SHA512 e47263a8c77108ea348ef8d4d0d34cf37330df2c54471f98767dc085f8839836662bcbe2b9495fbce8ff21e75845c88e4c9cc8496aa016c351af00fc0607b520
diff --git a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.20.2.ebuild b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.20.2.ebuild
deleted file mode 100644
index d19d0d446e2d..000000000000
--- a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.20.2.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Scala grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-scala"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.0.ebuild b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.0.ebuild
new file mode 100644
index 000000000000..847f1680606f
--- /dev/null
+++ b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Scala grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-scala"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	default
+
+	# Fix incorrect paths
+	sed -i -e 's:queries/scala:queries/:' package.json || die
+}
diff --git a/dev-libs/tree-sitter-tsx/Manifest b/dev-libs/tree-sitter-tsx/Manifest
index 7c87e8b973db..c25147b54e9f 100644
--- a/dev-libs/tree-sitter-tsx/Manifest
+++ b/dev-libs/tree-sitter-tsx/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-tsx-0.20.6.tar.gz 1564217 BLAKE2B bc4d26bd8e4e9ca14ddf4b175cc2a2e7a81dac67e114a6e01f59ff55c5ecd63a0a359e03d78928aa965363e9c4db154a9b1917cf3aafce9fdaca3a58d60bfcc1 SHA512 f30f38aa269302eee5f738422626187111c14c7ba07982d619b200a58a20a08849f8a0e79358cad331d689afd5ab389a88b246bda30031ae354f93433e85b763
 DIST tree-sitter-tsx-0.21.1.tar.gz 1566667 BLAKE2B c6c24a60b97c092189dc54ceb12b75ee28085eb7f2cdd38673b7107db1fb57e6282e7a5254a26f6bd352195a23da43d3a36df756ef78c959e037f9e696a02f4f SHA512 8768b8bd17d90b26de4bc20c3aae34141eec87ace0a4de3a6c39ee9654954fe4ec0d6ef829edddd48ccced5e4f92e3e886870f6bdc50b6ebe6ca568d980b5f97
-DIST tree-sitter-tsx-0.21.2.tar.gz 1057030 BLAKE2B bbb16ab56123e6fa7bded8db8a5b076cd7a291578fb6f9437538c7132fbe3a01ca7ea5c01c8cf9d87f74a72c5512696d90fb1f5e8553b90fac7dcebf748d002e SHA512 8c1ea600da6b34054f486554d82982f62802a5d6f050a0001632a84c51c0e544554ddafed48e09af4cae1b77def11a7a77fd3a9bc191db40daf9a89e88e5c2e7
+DIST tree-sitter-tsx-0.23.0.tar.gz 1028628 BLAKE2B 3a849d1a9ece7c1246ae8e43727faecd5fc7a4cf61d6570fd05740b8a0c91fe3cf84d0ca0d4336693bfa9915036b0d54bd470a61db13b6e2da7551595165c7e6 SHA512 5ce5c7cf70c40027ac957a47756896fbdc3936593471d959459860a750fe8d47877f4d8be21140edcd49d9daa4fe715af15545ace5dabf3d2b399d380172d37f
diff --git a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.1.ebuild b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.1.ebuild
index 0eb1d05722cb..5dd1f992de12 100644
--- a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.1.ebuild
+++ b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}/tsx
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	# fix test corpus path
diff --git a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.2.ebuild b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.2.ebuild
deleted file mode 100644
index 0eb1d05722cb..000000000000
--- a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.21.2.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
-
-inherit tree-sitter-grammar
-
-MY_P=${P/tsx/typescript}
-MY_PN=${PN/tsx/typescript}
-
-DESCRIPTION="TSX grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-SRC_URI="https://github.com/tree-sitter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}/tsx
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_prepare() {
-	# fix test corpus path
-	ln -s ../common test || die
-
-	tree-sitter-grammar_src_prepare
-}
diff --git a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.20.6.ebuild b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.23.0.ebuild
index 0eb1d05722cb..0eb1d05722cb 100644
--- a/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.20.6.ebuild
+++ b/dev-libs/tree-sitter-tsx/tree-sitter-tsx-0.23.0.ebuild
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index c077958053be..238a9aecd996 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,3 +1,2 @@
-DIST tree-sitter-typescript-0.20.3.tar.gz 843881 BLAKE2B a8b01a6fef435ac089ff716be400e6f55b89256a0b170cef3d6103eeca301f076d909180db61534dcf58bcf703d607871193f0a517d34398d81131c6dcb0e977 SHA512 6dacfe3d329acfbc80dd798bc900798cf3bad06441ece0964adb51117876b8c54be7d88303deb3abf139d7241b60d45c458a66f6079a149c010a3cd55581065b
-DIST tree-sitter-typescript-0.20.5.tar.gz 1556573 BLAKE2B ae4d71cc8e4745a3b6899f3f28fb31f0d31b0b1f749a73485b5f0b9e81257bde1b3338650e72e7c0082386cabb3b04bfc6bf8a603305aa8fa44c1e08e3843aab SHA512 5b0f9b5725766069d1535e39f3a4658b5200a2a33c3b4881f4876b741a6c13f9140429b73621949e2bd1e06ab0ee147893fffcd3c5349df337eb923a649b8867
 DIST tree-sitter-typescript-0.20.6.tar.gz 1564217 BLAKE2B bc4d26bd8e4e9ca14ddf4b175cc2a2e7a81dac67e114a6e01f59ff55c5ecd63a0a359e03d78928aa965363e9c4db154a9b1917cf3aafce9fdaca3a58d60bfcc1 SHA512 f30f38aa269302eee5f738422626187111c14c7ba07982d619b200a58a20a08849f8a0e79358cad331d689afd5ab389a88b246bda30031ae354f93433e85b763
+DIST tree-sitter-typescript-0.23.0.tar.gz 1028628 BLAKE2B 3a849d1a9ece7c1246ae8e43727faecd5fc7a4cf61d6570fd05740b8a0c91fe3cf84d0ca0d4336693bfa9915036b0d54bd470a61db13b6e2da7551595165c7e6 SHA512 5ce5c7cf70c40027ac957a47756896fbdc3936593471d959459860a750fe8d47877f4d8be21140edcd49d9daa4fe715af15545ace5dabf3d2b399d380172d37f
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
deleted file mode 100644
index 3826613aff5d..000000000000
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="TypeScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${P}/typescript
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
deleted file mode 100644
index 3ab5b3028d0d..000000000000
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.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
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="TypeScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${P}/typescript
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.23.0.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.23.0.ebuild
new file mode 100644
index 000000000000..ac1c2721a6f8
--- /dev/null
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.23.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="TypeScript grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
+S="${WORKDIR}"/${P}/typescript
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	# fix test corpus path
+	ln -s ../common test || die
+
+	tree-sitter-grammar_src_prepare
+}
diff --git a/dev-libs/tree-sitter-vim/tree-sitter-vim-0.4.0.ebuild b/dev-libs/tree-sitter-vim/tree-sitter-vim-0.4.0.ebuild
index 732edc29386e..1583992339e3 100644
--- a/dev-libs/tree-sitter-vim/tree-sitter-vim-0.4.0.ebuild
+++ b/dev-libs/tree-sitter-vim/tree-sitter-vim-0.4.0.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/tree-sitter-grammars/tree-sitter-vim/archive/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-libs/tree-sitter-vimdoc/Manifest b/dev-libs/tree-sitter-vimdoc/Manifest
index b9d0e0f92e36..d43c794460cb 100644
--- a/dev-libs/tree-sitter-vimdoc/Manifest
+++ b/dev-libs/tree-sitter-vimdoc/Manifest
@@ -1,2 +1 @@
-DIST tree-sitter-vimdoc-2.5.1.tar.gz 57430 BLAKE2B a493b738744d198d36932cbcdd7a7ec3d5ea379eac175ded9541e830e0bb3dd68bf545715d65cb096a13c54d561fe04a8a7d37d1fae00a5245d734f3467445a7 SHA512 26d4f2c88709914947e855df96f17366bd04d1a10356e2f5b093135498210dad831015bbd4e251d32fd31c1e90af829e6941ee8e9243ec13517b1f17e4a89962
 DIST tree-sitter-vimdoc-3.0.0.tar.gz 58110 BLAKE2B 21713b7c75e988be0c92f181dc33bd4616346a618f11d34a90e26b39c0a6fd7b97f18154982fb41287258fbe436522e04753f9f19d6e61cdc9405057ae247142 SHA512 2305127de360a34f10706002793ffc52d220b950105dcb1d54afa1f291e86be7a9188390de9b92a1edc8083a8d270a9e8b641b15b43e161f29c1117f93589763
diff --git a/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-2.5.1.ebuild b/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-2.5.1.ebuild
deleted file mode 100644
index 80b5c046b96a..000000000000
--- a/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-2.5.1.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
-
-TS_BINDINGS=( python )
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Vimdoc grammar for Tree-sitter"
-HOMEPAGE="https://github.com/neovim/tree-sitter-vimdoc"
-SRC_URI="https://github.com/neovim/tree-sitter-vimdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-3.0.0.ebuild b/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-3.0.0.ebuild
index 1557c60f5d2c..ac76dfa792c9 100644
--- a/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-3.0.0.ebuild
+++ b/dev-libs/tree-sitter-vimdoc/tree-sitter-vimdoc-3.0.0.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/neovim/tree-sitter-vimdoc/archive/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 0f5e9cfb1dc8..164082689279 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,4 +1,2 @@
-DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856
-DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36
-DIST tree-sitter-0.22.5.tar.gz 3035094 BLAKE2B f54b16e2421ad68fd34b5bada767010be4224652f5a138f7afcdbc15ebaae98dfe3cc8ac77e5e8e5ab12cef516464d29e38a23fc895fa966d5a03a9569fa5ffc SHA512 cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c
 DIST tree-sitter-0.22.6.tar.gz 3036954 BLAKE2B f109a738214882e63a721e8db384fa42a624af78d42ceb9ab7a45135b36cf3bbbd2554f470ca5038404365f5b9dbf9979c4d26309e123a9d9533feb1f0a3f724 SHA512 bf0b87bb9ce16b049824e53933986ac451a7b7f432df39ee9d4546627d740ae689af9e838a53cc50e29d66d6d85d51dab7490d66a429a14bcc9d0b8e2935a63a
+DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f0bdb17c5fde796d8d65f8bc84a6e054d86c18a42e66e8effef865f95013c38ff6bd6ab5498a680ae172d7d57020604e SHA512 ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
deleted file mode 100644
index 66553bca39a7..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Bump tree-sitter-cli at the same time.
-
-EAPI=8
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="test" # tests are for CLI and not the lib
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-}
-
-pkg_postinst() {
-	optfeature "building and testing grammars" dev-util/tree-sitter-cli
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild
deleted file mode 100644
index d9718e3f31d5..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.4-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
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-fi
-
-LICENSE="MIT"
-# soname is .0, but abi was broken unexpectedly
-# Bug #930039
-SLOT="0/1"
-RESTRICT="test" # tests are for CLI and not the lib
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="" # bug 930020
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		  PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		  install
-}
-
-pkg_postinst() {
-	optfeature "building and testing grammars" dev-util/tree-sitter-cli
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.5.ebuild
deleted file mode 100644
index 15f132d978a3..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.22.5.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 optfeature toolchain-funcs
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-LICENSE="MIT"
-# ABI is not stable. Revisit after tree-sitter-1.0.
-# https://bugs.gentoo.org/930039
-# https://github.com/tree-sitter/tree-sitter/pull/3302
-SLOT="0/${PV}"
-RESTRICT="test" # tests are for CLI and not the lib
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="" # bug 930020
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		  PREFIX="${EPREFIX}/usr" \
-		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		  install
-}
-
-pkg_postinst() {
-	optfeature "building and testing grammars" dev-util/tree-sitter-cli
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild
index c3ae4d33678e..a358fddea76f 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tree-sitter/tree-sitter-0.23.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.23.0.ebuild
new file mode 100644
index 000000000000..e8a13d2615fa
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.23.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+# ABI is not stable. Revisit after tree-sitter-1.0.
+# https://bugs.gentoo.org/930039
+# https://github.com/tree-sitter/tree-sitter/pull/3302
+SLOT="0/${PV}"
+RESTRICT="test" # tests are for CLI and not the lib
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.22.2-no-static.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="" # bug 930020
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
+}
+
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}
diff --git a/dev-libs/univalue/univalue-1.0.5.ebuild b/dev-libs/univalue/univalue-1.0.5.ebuild
index e760de84d571..8eabe1e857b3 100644
--- a/dev-libs/univalue/univalue-1.0.5.ebuild
+++ b/dev-libs/univalue/univalue-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/univalue/univalue-9999.ebuild b/dev-libs/univalue/univalue-9999.ebuild
index db6b468aa088..a161fe8e30c5 100644
--- a/dev-libs/univalue/univalue-9999.ebuild
+++ b/dev-libs/univalue/univalue-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index bb9ddf3d1c66..032a94cf1b09 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,2 +1,3 @@
 DIST userspace-rcu-0.13.2.tar.bz2 611448 BLAKE2B 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f SHA512 e5097a7f653f51b3a47a09f79e7a153aab8fd22c0504a1127a9b33d093a9ae6a941b97c0fe175ee168e2976097aefdcdf8d5ce030afbe565c1b72f64d6f5b60a
 DIST userspace-rcu-0.14.0.tar.bz2 661322 BLAKE2B ba9fa4c6dec693d2616234187db531f00fc0ade65f7e2a57182d9441728ddfa6f3e9d4544b824ca5edf7c027a43c9231d998a309c01f4bbab1eeefe856344f77 SHA512 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f
+DIST userspace-rcu-0.14.1.tar.bz2 669999 BLAKE2B 6ae6a98020f731b5dc3bef5e7cf1a0b590087dbaff8836a4d2b694ad8d0d76b298261d99bea4281907cb516980b69c673d80baac17ae244e2f4fe690fc539293 SHA512 46137525854164df05326202909689b62f8f3aa6e04127eb9157a83aed8180f35a68332ec66e4e4fc9b0c046b64c64b492caed4b64f86f87a31579e4209ec345
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.14.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.14.1.ebuild
new file mode 100644
index 000000000000..aed78ed9c98c
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.14.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Userspace RCU (read-copy-update) library"
+HOMEPAGE="https://liburcu.org/"
+SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( sys-process/time )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for tests patch
+	# ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
+	# ... and for build on loong (see https://github.com/gentoo/gentoo/pull/25189)
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+
+	emake -C tests/regression regtest
+
+	# We don't run the benchmark tests.
+	rm tests/benchmark/test-suite.log || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/uthash/uthash-2.3.0-r1.ebuild b/dev-libs/uthash/uthash-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..05c456d3d563
--- /dev/null
+++ b/dev-libs/uthash/uthash-2.3.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy-to-use hash implementation for C programmers"
+HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
+SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_test() {
+	emake -C tests
+}
+
+src_install() {
+	doheader src/*.h
+	dodoc doc/*.txt
+}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 58bc798ee75b..4b8696e3b2f3 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1 +1,2 @@
 DIST wayland-protocols-1.36.tar.xz 95512 BLAKE2B 6c460106a2069ff9ce0b6c8221f85462e74d726ead69f6918417aac0cd24567251873ea05ec111a90f3385f4128e7e8d76aca42c7b1f89a070943c604b87573c SHA512 5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0
+DIST wayland-protocols-1.37.tar.xz 100356 BLAKE2B f341bdb50f4169112a89b1d834a4b62b59ab7c5d9b7640a3bb5a7d84dc055f390429b171de2038a70ec564c1431ecb95a036b053f18353f3ff936651240050de SHA512 57936a23d08957afa9563b51b2b195aa10410fa74176c0503f83b1544e243d4e5b99c3daf5fc14c0a68a78d3f5759e1a5ca9fe4ba22220cbf5328168903c7575
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.37.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.37.ebuild
new file mode 100644
index 000000000000..7310be696158
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.37.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( dev-libs/wayland )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 95b73bb0bdfe..f60d83496dc1 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,2 +1,2 @@
-DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
 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
new file mode 100644
index 000000000000..8dc80d3c8fe8
--- /dev/null
+++ b/dev-libs/wayland/files/wayland-1.23.0-c23-clang-fix.patch
@@ -0,0 +1,146 @@
+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.22.0.ebuild b/dev-libs/wayland/wayland-1.22.0.ebuild
deleted file mode 100644
index 2a397f4586d1..000000000000
--- a/dev-libs/wayland/wayland-1.22.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
-
-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 ~ia64 ~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}"
-
-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/wayland/wayland-1.23.0-r1.ebuild b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
new file mode 100644
index 000000000000..e14f79317a73
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.23.0-r1.ebuild
@@ -0,0 +1,70 @@
+# 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 ~ia64 ~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/wayland/wayland-1.23.0.ebuild b/dev-libs/wayland/wayland-1.23.1.ebuild
index 7361890a730d..7361890a730d 100644
--- a/dev-libs/wayland/wayland-1.23.0.ebuild
+++ b/dev-libs/wayland/wayland-1.23.1.ebuild
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index a95d2f4929c6..4dc524fdf4d3 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,2 +1,3 @@
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 DIST weston-13.0.3.tar.xz 1986952 BLAKE2B cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd75256d851129e0d29cc0079cbaf4e35eb40b302f557ffe7b89edbc094b1823d667a54d44a9af765945e3ca541068fc SHA512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb
+DIST weston-14.0.0.tar.xz 2043020 BLAKE2B 1a92e3b04677f3ba1f2c02f15aba64511774dd08738c2a490135a1ca7200a846c1b5102349a36c76e2dd6a9e39bd041cd25c2552958741e96f8291fd3029046e SHA512 8bdeed91befd5cbb0bde0f1860ff7775c1835a5fa8c3bf26e99d2f0c16e81255fcf35bf338ae02d7826463d0efdf41ba3fe78e38e4c27787831dfa331acafc08
diff --git a/dev-libs/weston/files/weston-kiosk-test.patch b/dev-libs/weston/files/weston-kiosk-test.patch
new file mode 100644
index 000000000000..7fe340a75bb3
--- /dev/null
+++ b/dev-libs/weston/files/weston-kiosk-test.patch
@@ -0,0 +1,53 @@
+From 4d5224027c941224eb9a7aaa71c949558f2b4796 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 6 Sep 2024 23:15:05 +0100
+Subject: [PATCH] tests: Make the kiosk test dependent on the shell-kiosk
+ option
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ tests/meson.build | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 45b475c3..4b52cb29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -180,14 +180,6 @@ tests = [
+ 			input_timestamps_unstable_v1_protocol_c,
+ 		],
+ 	},
+-	{
+-		'name': 'kiosk-shell',
+-		'sources': [
+-			'kiosk-shell-test.c',
+-			xdg_shell_client_protocol_h,
+-			xdg_shell_protocol_c,
+-		],
+-        },
+ 	{
+ 		'name': 'linux-explicit-synchronization',
+ 		'sources': [
+@@ -427,6 +419,19 @@ if get_option('shell-ivi')
+ 	]
+ endif
+ 
++if get_option('shell-kiosk')
++	tests += [
++		{
++			'name': 'kiosk-shell',
++			'sources': [
++				'kiosk-shell-test.c',
++				xdg_shell_client_protocol_h,
++				xdg_shell_protocol_c,
++			],
++		},
++	]
++endif
++
+ test_config_h = configuration_data()
+ test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH', meson.current_source_dir() + '/reference')
+ test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)
+-- 
+2.46.0
+
diff --git a/dev-libs/weston/weston-13.0.0-r3.ebuild b/dev-libs/weston/weston-13.0.0-r3.ebuild
deleted file mode 100644
index 2ab5833684f4..000000000000
--- a/dev-libs/weston/weston-13.0.0-r3.ebuild
+++ /dev/null
@@ -1,151 +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/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless lcms xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp vnc wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-1.2.0
-	>=dev-libs/wayland-1.22.0
-	=media-libs/libdisplay-info-0.1*:=
-	media-libs/libpng:0=
-	sys-auth/seatd:=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.108
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	drm? (
-		>=media-libs/mesa-17.1[gbm(+)]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? ( sys-apps/systemd )
-	vnc? (
-		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.8*
-		sys-libs/pam
-	)
-	webp? ( media-libs/libwebp:0= )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xwayland
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-		>=x11-libs/xcb-util-cursor-0.1.4
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use pipewire backend-pipewire)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use vnc backend-vnc)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use kiosk shell-kiosk)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-	addwrite /dev/dri/
-
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-13.0.0-r4.ebuild b/dev-libs/weston/weston-13.0.0-r4.ebuild
new file mode 100644
index 000000000000..a3c477a7802b
--- /dev/null
+++ b/dev-libs/weston/weston-13.0.0-r4.ebuild
@@ -0,0 +1,151 @@
+# 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/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		=media-libs/libdisplay-info-0.1*
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.24
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-13.0.3-r1.ebuild b/dev-libs/weston/weston-13.0.3-r1.ebuild
deleted file mode 100644
index b03a284e1eac..000000000000
--- a/dev-libs/weston/weston-13.0.3-r1.ebuild
+++ /dev/null
@@ -1,152 +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/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless lcms xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp vnc wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-1.2.0
-	>=dev-libs/wayland-1.22.0
-	=media-libs/libdisplay-info-0.1*:=
-	media-libs/libpng:0=
-	sys-auth/seatd:=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.108
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	drm? (
-		>=media-libs/mesa-17.1[gbm(+)]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? ( sys-apps/systemd )
-	vnc? (
-		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.8*
-		sys-libs/pam
-	)
-	webp? ( media-libs/libwebp:0= )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xwayland
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-		>=x11-libs/xcb-util-cursor-0.1.4
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
-	"${FILESDIR}"/${PN}-musl-basename.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use pipewire backend-pipewire)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use vnc backend-vnc)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use kiosk shell-kiosk)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-	addwrite /dev/dri/
-
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-13.0.3-r2.ebuild b/dev-libs/weston/weston-13.0.3-r2.ebuild
new file mode 100644
index 000000000000..13dab3d0aebf
--- /dev/null
+++ b/dev-libs/weston/weston-13.0.3-r2.ebuild
@@ -0,0 +1,147 @@
+# 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/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		=media-libs/libdisplay-info-0.1*
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.24
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+	"${FILESDIR}"/${PN}-musl-basename.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-13.0.3.ebuild b/dev-libs/weston/weston-13.0.3.ebuild
deleted file mode 100644
index cbc58686914c..000000000000
--- a/dev-libs/weston/weston-13.0.3.ebuild
+++ /dev/null
@@ -1,151 +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/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless lcms xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm headless rdp vnc wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-1.2.0
-	>=dev-libs/wayland-1.22.0
-	media-libs/libpng:0=
-	sys-auth/seatd:=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.108
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	drm? (
-		>=media-libs/mesa-17.1[gbm(+)]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? ( sys-apps/systemd )
-	vnc? (
-		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.8*
-		sys-libs/pam
-	)
-	webp? ( media-libs/libwebp:0= )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xwayland
-		x11-libs/cairo[X,xcb(+)]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-		>=x11-libs/xcb-util-cursor-0.1.4
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
-	"${FILESDIR}"/${PN}-musl-basename.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use pipewire backend-pipewire)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use vnc backend-vnc)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use kiosk shell-kiosk)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		$(meson_use examples demo-clients)
-		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-	addwrite /dev/dri/
-
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-14.0.0.ebuild b/dev-libs/weston/weston-14.0.0.ebuild
new file mode 100644
index 000000000000..8ec8a16498ea
--- /dev/null
+++ b/dev-libs/weston/weston-14.0.0.ebuild
@@ -0,0 +1,147 @@
+# 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/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		<media-libs/libdisplay-info-0.3.0:=
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/libglvnd )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.33
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-kiosk-test.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		$(meson_use test tests)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 84ea1f937e3b..d64755bcdb23 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
@@ -41,7 +41,6 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libinput-1.2.0
 	>=dev-libs/wayland-1.22.0
-	=media-libs/libdisplay-info-0.1*:=
 	media-libs/libpng:0=
 	sys-auth/seatd:=
 	>=x11-libs/cairo-1.11.3
@@ -50,13 +49,14 @@ RDEPEND="
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
 	drm? (
+		<media-libs/libdisplay-info-0.3.0:=
 		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	gles2? ( media-libs/libglvnd )
 	jpeg? ( media-libs/libjpeg-turbo:0= )
 	lcms? ( >=media-libs/lcms-2.9:2 )
 	pipewire? ( >=media-video/pipewire-0.3:= )
@@ -85,19 +85,14 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
+	>=dev-libs/wayland-protocols-1.33
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
@@ -126,6 +121,7 @@ src_configure() {
 		$(meson_use examples demo-clients)
 		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
+		$(meson_use test tests)
 		-Dtest-junit-xml=false
 		"${myconf[@]}"
 	)
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index bbd937c2b8d7..6486c5f899a6 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1 +1,2 @@
 DIST xapian-bindings-1.4.25.tar.xz 1076644 BLAKE2B 190c560d341039c68b35421c1a75e791537f9c2c353a5f0871d45055909e2863cd4ede3062a6b641e1572b74db8c049a0266a6c305e7d41bfb5d5c63057ef3e3 SHA512 119f62b53d487319e33aaf0c473e479a52b3831a46b23724188dada13f341e08facc7b79641c00ba7b0507c22b55c7b700182e65b5a195cd322be2098bcca183
+DIST xapian-bindings-1.4.26.tar.xz 1114580 BLAKE2B 997d997ce382364749822c93ce9ff03d21dba9657ba07b039e0ea330cce4e47eb285f7fcb97a79931ca4a2448edae48c863dc7e1ca429f3e4ea76ac65789dc4d SHA512 9ab6c8f7092c6d353341a2de565501ba4eadd47c78a472c54c9f41de08ac5b42382236a4b66f03257cd505464e1b6e9eaf2ab05c1d6e984cc641738dd43b3314
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild
index d99912763f30..6b28d4536553 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.25.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P}" # need this here, some inherited eclasses change it
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="
 	|| ( java lua mono perl php python ruby tcl )
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.26.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.26.ebuild
new file mode 100644
index 000000000000..b3258973c6b8
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.26.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php8-1 php8-2"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby31 ruby32"
+RUBY_OPTIONAL="yes"
+
+inherit autotools java-pkg-opt-2 lua multibuild php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${P}" # need this here, some inherited eclasses change it
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua perl php python ruby tcl"
+REQUIRED_USE="
+	|| ( java lua perl php python ruby tcl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )
+"
+
+COMMON_DEPEND="
+	~dev-libs/xapian-${PV}
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.22-remove-precompiled-python.patch
+	"${FILESDIR}"/${PN}-1.4.22-fix-java-installation.patch
+)
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like lua, php, python and ruby are
+	return $(use java || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eautoreconf
+
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use lua; then
+		lua_copy_sources
+	fi
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Needed to get e.g. test failure details
+	MAKEOPTS+=" VERBOSE=1"
+
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with java)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-csharp
+			--without-lua
+			--without-php
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	lua_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-csharp
+			--without-java
+			--without-perl
+			--without-tcl
+			--without-php
+			--without-python
+			--without-python3
+			--without-ruby
+			--with-lua
+		)
+
+		local -x LUA_INC="$(lua_get_include_dir)"
+		local -x LUA_LIB="$(lua_get_cmod_dir)"
+
+		econf "${myconf[@]}"
+
+	}
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+			--with-php
+		)
+		local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-ruby
+			--without-tcl
+			--with-python3
+		)
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		java-pkg_doso java/.libs/libxapian_jni.so
+	fi
+
+	if use lua; then
+		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		find "${ED}"/usr/share/doc/${PF}/ruby/rdocs/js -name \*.gz -delete || die
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index ba492762f95a..1a5bab911f22 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1 +1,2 @@
 DIST xapian-core-1.4.25.tar.xz 3205904 BLAKE2B 7b03a8fabc3c688f58b3451541dedb664de0a02d7c46a4e8eac080c004232575c00428110eaab0ea463df5c3f43f2b4cebfbe6754f897e55f113683c1db43b2b SHA512 e8069f2cb75554978716a99580fb57fc73bbdd607c82394f53d07205d8c78fb59265004be0c676a6806bb2840a3933499dfc867e36a28855278569a0676d469d
+DIST xapian-core-1.4.26.tar.xz 3246304 BLAKE2B f68b25741de821ef6de2ae5127f09f69a68c435dd224b796d92fc18769db3e3307a0a3aadc98cf26adc966eb063fdbd3ee612ec725020cfc79bdfa041675794b SHA512 ecd94d410dc94b6510c6729f276606987f9dd955cfb0520e62d46fa71645f5b140d474cda0d77078e64ee7cf9c0cd00f3aefe0e1b087739582e64bbcb9fabd4b
diff --git a/dev-libs/xapian/xapian-1.4.26.ebuild b/dev-libs/xapian/xapian-1.4.26.ebuild
new file mode 100644
index 000000000000..25f4dd84a037
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.26.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="${PN}-core-${PV}"
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug static-libs"
+
+DEPEND="
+	sys-libs/zlib:=
+	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux ) )
+	elibc_SunOS? ( sys-libs/libuuid )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS HACKING PLATFORMS README NEWS )
+
+src_configure() {
+	tc-export_build_env BUILD_CC
+	local -x CC_FOR_BUILD="${BUILD_CC}"
+
+	# skip certain autoconf checks
+	local -x VALGRIND=
+	local -x EATMYDATA=
+
+	local -a myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--disable-werror
+		--enable-backend-chert
+		--enable-backend-glass
+		--enable-backend-inmemory
+		--enable-backend-remote
+		--program-suffix=
+		$(use_enable debug assertions)
+		$(use_enable debug log)
+		$(use_enable static-libs static)
+	)
+
+	if use cpu_flags_x86_sse2; then
+		myconf+=( --enable-sse=sse2 )
+	elif use cpu_flags_x86_sse; then
+		myconf+=( --enable-sse=sse )
+	else
+		myconf+=( --disable-sse )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake -Onone check
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/yaz/yaz-5.32.0.ebuild b/dev-libs/yaz/yaz-5.32.0.ebuild
index 1b8c5ff2c9e8..2fa26dc6c553 100644
--- a/dev-libs/yaz/yaz-5.32.0.ebuild
+++ b/dev-libs/yaz/yaz-5.32.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/indexdata/yaz.git"
 else
 	SRC_URI="https://ftp.indexdata.com/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD GPL-2"
diff --git a/dev-libs/yaz/yaz-5.34.0.ebuild b/dev-libs/yaz/yaz-5.34.0.ebuild
index 1e2b41c93c32..454bdf1effa7 100644
--- a/dev-libs/yaz/yaz-5.34.0.ebuild
+++ b/dev-libs/yaz/yaz-5.34.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/indexdata/yaz.git"
 else
 	SRC_URI="https://ftp.indexdata.com/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD GPL-2"
diff --git a/dev-libs/yyjson/yyjson-0.10.0.ebuild b/dev-libs/yyjson/yyjson-0.10.0.ebuild
index 8cf40aaa1dd9..954e81a58ff4 100644
--- a/dev-libs/yyjson/yyjson-0.10.0.ebuild
+++ b/dev-libs/yyjson/yyjson-0.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibireme/yyjson/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="MIT test? ( BSD )"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="doc test"
 
diff --git a/dev-libs/zix/zix-0.4.2.ebuild b/dev-libs/zix/zix-0.4.2.ebuild
index 23580187808d..612d68a614ee 100644
--- a/dev-libs/zix/zix-0.4.2.ebuild
+++ b/dev-libs/zix/zix-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.drobilla.net/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/zug/zug-0.1.1-r1.ebuild b/dev-libs/zug/zug-0.1.1-r1.ebuild
index 6cccaf41364f..e4460dfc0aba 100644
--- a/dev-libs/zug/zug-0.1.1-r1.ebuild
+++ b/dev-libs/zug/zug-0.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arximboldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index f540610a296e..651c611fdbe1 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -14,7 +14,7 @@ DIST sbcl-2.3.4-x86-64-linux-binary.tar.bz2 11783208 BLAKE2B 40e77c69a3df7674994
 DIST sbcl-2.3.5-source.tar.bz2 7474392 BLAKE2B 0b4f678dccbb18c18d59709aa2ce9facec3ada9f32cf1d398e1686f63615ab82781da68d6b5914294adab88e18501945d57b6d630507e02a8d89351379f769f3 SHA512 89635b6ebd18a481c56bb40b69ef58f13b2e2ebdb6b1244a1eea3b0d9e85dc1659391754b7c8ba533455575e91989889fe41be05314297f8e49bf11170001004
 DIST sbcl-2.4.3-source.tar.bz2 8126417 BLAKE2B 11c304c4f28e41940e2981e6f9f3401dbc0352e8572cdcd42fddaa1387e19eb35760d8e2b734544953eaa4058f8a867b3a6e492f9d13770b80de376191ce10d1 SHA512 ac61e02af16b81cb25a806b44272956dd72875ae884a04b075c983881be70b618908bad7ebddb763358401f7207c05adde932e4a845e5b8cffccc0c7b76e7557
 DIST sbcl-2.4.3-x86-64-linux-binary.tar.bz2 12003023 BLAKE2B a833630bf3c8ceac1aab64d351d7a19b73cac4906c60c6344ba2222c17831da749bc3b5d0d5fa3246c9c2a847c60e9c78567845efdd9cba50d59f2dfaef1b186 SHA512 c884d04b317b1a7ebd4c5f00b17058819d32c59e3cab437296868bc132a77e34bb6e286e7378c7d27f2b07055f879171533273978bbda84d7de9618638219088
-DIST sbcl-2.4.6-source.tar.bz2 8078027 BLAKE2B 2d2bcaad4cf480e3b6ba14db8ce574a88b12a81f18da85d3485cd14affd3f936e8beaf25c808a95f57c3ca36d8dd9e0a1d7c838cc0e2dc364811fdf8aca37496 SHA512 8d74b601762ddc65b2b0f1a7b18119642f38438d7b847c2078513b849327507ce48297eb58c98a9a09e4746a2f109665c3a49c11d8ea2aae4bdc6669755e28b5
-DIST sbcl-2.4.6-x86-64-linux-binary.tar.bz2 11488134 BLAKE2B a552266914e75ea536de09457f2e92d3ab8661470ce79225ba2eff4d72b74d0f27ef7d1fa96f74225904553b499d0cbda3212cbdc463294b482e0acb167b663b SHA512 d7ef12bf855b08164aa3400bca5ecd36244e369a349aed665b6d66cc46052850b73c185ed07abc988a190ce47c92e7edee85c4b8d87241615376c7ebef779032
 DIST sbcl-2.4.7-source.tar.bz2 8088819 BLAKE2B 340265ffc34891c448c08c48e8b72b25a8dfa1e01c7d3ca4f16f165d84cde46c4ae172ee50caaeb4ad3af5bbcae07f9ef9c24d2e2ac3c3256ef14406a031081e SHA512 9d0cdcceb1fcb35292e15bc6eb41c5e20323bd90777b5c8daf0f584ac20f7ce346ca464ba42c71402425f8b73cb82eb1be4452e45a6058e43c96efb6ce61dce5
 DIST sbcl-2.4.7-x86-64-linux-binary.tar.bz2 11308219 BLAKE2B 6bb2d3b5ed26eb242224be1b63dba74c03caa794641df040f020403c8b07b51bc38238014713e5756e15e12bc525910cbe132e9ebeaf3d9624543c55a418eb9e SHA512 42bddfdfd9f7ee14d8e8f641432db08d1889fd87e8c85be665c7508ad047d73d51720687a095dc168c9b8b18b90501ad71d110e8e2710c2abc4bd99fe031ad6c
+DIST sbcl-2.4.8-source.tar.bz2 8106067 BLAKE2B 184bfbd686864618f33c673d171b81bab34bdc6ccb70fa98f5f78cfcf8de8a8a1a6db617b68578d32b8d80cb923cc6f8f9fcb0b05a5958887b8ce9439498130f SHA512 a958aa2284fba737ad8724b35a5de9871a1354515852d962650083afab45ac5202e5b7daee3c26d6c70f92d7da708d4de37a79d8f37414b03c5d9474d2f25e40
+DIST sbcl-2.4.8-x86-64-linux-binary.tar.bz2 11326290 BLAKE2B 7be0469c9eef1f9ff155f5e6329448c7e8a991ed72b567fea794506b661e822367aae7c0f57b0843b347beef159ef1b2fcfa71454e5fba2de8c4bb62522c35d8 SHA512 6c4193f19ba6200cd28347cc6ab47e69cc0746df6851906f954a96119a42f721ebe534c1267d52b2f1de70a35fdc73dc659c6ca186e1bcf0110212769f115504
diff --git a/dev-lisp/sbcl/sbcl-2.4.6.ebuild b/dev-lisp/sbcl/sbcl-2.4.6.ebuild
deleted file mode 100644
index 71383a25b480..000000000000
--- a/dev-lisp/sbcl/sbcl-2.4.6.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.4.6
-BV_PPC=1.2.7
-BV_PPC64LE=1.5.8
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=2.3.3
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="https://www.sbcl.org/ https://sbcl.sourceforge.net/"
-BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch
-SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
-	https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz
-	!system-bootstrap? (
-		x86? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-		amd64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-		ppc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-		ppc64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 )
-		sparc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-		alpha? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-		arm? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-		arm64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-		x64-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-		ppc-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-		x64-solaris? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	)"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
-
-CDEPEND=">=dev-lisp/asdf-3.3:= \
-	prefix? ( dev-util/patchelf )"
-# bug #843851
-BDEPEND="${CDEPEND}
-		dev-debug/strace
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-		system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )"
-RDEPEND="${CDEPEND}
-		zstd? ( app-arch/zstd )
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zstd)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	if ! use system-bootstrap ; then
-		mv sbcl-*-* sbcl-binary || die
-	fi
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH}
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-	# Use ${PV} as build-id, bug #797574
-	eapply "${FILESDIR}"/build-id-2.4.3.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/917557
-	# https://bugs.launchpad.net/gentoo/+bug/2072800
-	filter-lto
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# set interpreter for Prefix
-	if use prefix ; then
-		patchelf --set-interpreter \
-			"${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \
-			"${WORKDIR}"/sbcl-binary/src/runtime/sbcl
-	fi
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-	local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger"
-
-	if use system-bootstrap ; then
-		if has_version "dev-lisp/sbcl" ; then
-			bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger"
-		else
-			bootstrap_lisp="clisp"
-		fi
-	fi
-
-	# Bug #869434
-	append-cppflags -D_GNU_SOURCE
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \
-		GNUMAKE=make PV=${PV} ./make.sh \
-		"${bootstrap_lisp}" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-		for d in contrib/*/; do
-			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
-		done
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.4.8.ebuild b/dev-lisp/sbcl/sbcl-2.4.8.ebuild
new file mode 100644
index 000000000000..a03b716360b0
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.4.8.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic pax-utils toolchain-funcs
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=2.4.8
+BV_PPC=1.2.7
+BV_PPC64LE=1.5.8
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=2.3.3
+BV_ARM64=1.4.2
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="https://www.sbcl.org/ https://sbcl.sourceforge.net/"
+BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch
+SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
+	https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz
+	!system-bootstrap? (
+		x86? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+		amd64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+		ppc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+		ppc64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 )
+		sparc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+		alpha? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+		arm? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+		arm64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+		x64-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+		ppc-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+		x64-solaris? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	)"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
+
+CDEPEND=">=dev-lisp/asdf-3.3:= \
+	prefix? ( dev-util/patchelf )"
+# bug #843851
+BDEPEND="${CDEPEND}
+		dev-debug/strace
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )"
+RDEPEND="${CDEPEND}
+		zstd? ( app-arch/zstd )
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zstd)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	if ! use system-bootstrap ; then
+		mv sbcl-*-* sbcl-binary || die
+	fi
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
+	# bugs #486552, #527666, #517004
+	eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH}
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch
+	# bug #767742
+	eapply "${FILESDIR}"/etags-2.1.0.patch
+	# Use ${PV} as build-id, bug #797574
+	eapply "${FILESDIR}"/build-id-2.4.3.patch
+
+	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# set interpreter for Prefix
+	if use prefix ; then
+		patchelf --set-interpreter \
+			"${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \
+			"${WORKDIR}"/sbcl-binary/src/runtime/sbcl
+	fi
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+	local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger"
+
+	if use system-bootstrap ; then
+		if has_version "dev-lisp/sbcl" ; then
+			bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger"
+		else
+			bootstrap_lisp="clisp"
+		fi
+	fi
+
+	# Bug #869434
+	append-cppflags -D_GNU_SOURCE
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \
+		GNUMAKE=make PV=${PV} ./make.sh \
+		"${bootstrap_lisp}" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+		for d in contrib/*/; do
+			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
+		done
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index ef58ad92dd6f..35f039c13dfb 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1 +1 @@
-DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
+DIST lpeg-1.1.0.zip 78933 BLAKE2B 90895d74088d59529229825dd0058f69d0cb035d0b5ef9be49d9643c02e7b37ffcf358daa6b7129ff8df2247946dd12627d2ed1be23f61c51112303b702842b1 SHA512 5be6d3d9608881d044185e4e9cb5a7577d94b82276f4273f5dda7e2da93e13b926eaced9fc577dd83a4af231224c85a0336ddb920d94fbb334f8f55f7f21f8b4
diff --git a/dev-lua/lpeg/files/lpeg-1.1.0-makefile.patch b/dev-lua/lpeg/files/lpeg-1.1.0-makefile.patch
new file mode 100644
index 000000000000..afef6f6c05b5
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-1.1.0-makefile.patch
@@ -0,0 +1,31 @@
+Respect user CFLAGS and LDFLAGS.
+
+--- lpeg-1.1.0/makefile
++++ lpeg-1.1.0/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2 -DNDEBUG
++COPT = -DNDEBUG
+ # COPT = -O0 -DLPEG_DEBUG -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,7 +22,7 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+@@ -36,7 +36,7 @@
+ 	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
deleted file mode 100644
index cb9aa50746f3..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua flag-o-matic toolchain-funcs
-
-DESCRIPTION="Parsing Expression Grammars for Lua"
-HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
-SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="test debug doc"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-DOCS=( HISTORY )
-HTML_DOCS=( lpeg.html re.html )
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
-
-lua_src_prepare() {
-	if ! test -d "${S}.${ELUA}/" ; then
-		cp -ral "${S}/" "${S}.${ELUA}/" || die
-	fi
-}
-
-src_prepare() {
-	default
-	use debug && append-cflags -DLPEG_DEBUG
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		append-ldflags "-undefined dynamic_lookup"
-	fi
-
-	lua_foreach_impl lua_src_prepare
-}
-
-lua_src_compile() {
-	cd "${S}.${ELUA}/" || die
-	emake CC="$(tc-getCC)" \
-		LUADIR="${EPREFIX}/$(lua_get_include_dir)"
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	cd "${S}.${ELUA}/" || die
-	${ELUA} test.lua || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	cd "${S}.${ELUA}/" || die
-	local instdir
-	instdir="$(lua_get_cmod_dir)"
-	exeinto "${instdir#${EPREFIX}}"
-	doexe lpeg.so
-	instdir="$(lua_get_lmod_dir)"
-	insinto "${instdir#${EPREFIX}}"
-	doins re.lua
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local luav=$(lua_get_version)
-		# we only want the major version (e.g. 5.1)
-		local luamv=${luav:0:3}
-		local file="lua/${luamv}/lpeg.so"
-		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
-	fi
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-	cd "${S}" || die
-	use doc && einstalldocs
-}
diff --git a/dev-lua/lpeg/lpeg-1.1.0.ebuild b/dev-lua/lpeg/lpeg-1.1.0.ebuild
new file mode 100644
index 000000000000..2f1e3a74056c
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.1.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="https://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="https://luarocks.org/manifests/gvvaughan/${P}-1.src.rock -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="test debug doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	app-arch/unzip
+	test? ( ${RDEPEND} )
+"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-makefile.patch
+)
+
+src_unpack() {
+	unpack "${P}.zip" || die
+	unpack "${WORKDIR}/${P}.tar.gz" || die
+}
+
+lua_src_prepare() {
+	if ! test -d "${S}.${ELUA}/" ; then
+		cp -ral "${S}/" "${S}.${ELUA}/" || die
+	fi
+}
+
+src_prepare() {
+	default
+	use debug && append-cflags -DLPEG_DEBUG
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-ldflags "-undefined dynamic_lookup"
+	fi
+
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	cd "${S}.${ELUA}/" || die
+	emake CC="$(tc-getCC)" \
+		LUADIR="${EPREFIX}/$(lua_get_include_dir)"
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	cd "${S}.${ELUA}/" || die
+	${ELUA} test.lua || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	cd "${S}.${ELUA}/" || die
+	local instdir
+	instdir="$(lua_get_cmod_dir)"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe lpeg.so
+	instdir="$(lua_get_lmod_dir)"
+	insinto "${instdir#${EPREFIX}}"
+	doins re.lua
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local luav=$(lua_get_version)
+		# we only want the major version (e.g. 5.1)
+		local luamv=${luav:0:3}
+		local file="lua/${luamv}/lpeg.so"
+		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" \
+			"${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
+	fi
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	cd "${S}" || die
+	use doc && einstalldocs
+}
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index dcb3ae88b9c8..c200d587e296 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -1 +1,2 @@
+DIST lua_cliargs-3.0.2.tar.gz 31302 BLAKE2B 7ddfd44844f750b943de4d3f8efd90d535f99b959c89e3f29638b456e7f0d8e281489f84e92147800eab80bc0aa8520cb4456ddd7a73863e10eb6a75b55d68ad SHA512 3d9dac4723e8a41284eb28a7d1b5c400add91de055eb59645406929f5091c52bd71640b5f4914597b222b5ce7b43bbc918e4a34a69ce7bae726638bd2447abf8
 DIST lua_cliargs-3.0_p2.tar.gz 30435 BLAKE2B 8edf60870e0d91593064876a225ef7fbe638425da13b458d6356eaa0636482ca904f9355fd15314d4893e6f5346a6faa30fb6078d191a29aa14e26aa5d74a4be SHA512 e7a475f1d41249b0a35f021a6ccca46078f5b689c1927a4dd4cab80b2e4d291babaab35cf7d64fad3ebf68d871fb5177f030c7a2b28d9f55fbeb4dd26021d024
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0.2.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0.2.ebuild
new file mode 100644
index 000000000000..a4364fda890f
--- /dev/null
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+MY_PV="${PV/_p/-}"
+
+inherit lua
+
+DESCRIPTION="A command-line argument parsing module for Lua"
+HOMEPAGE="https://github.com/amireh/lua_cliargs"
+SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/." )
+
+lua_src_install() {
+	insinto $(lua_get_lmod_dir)
+	doins -r src/.
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	use examples && dodoc -r examples
+	einstalldocs
+}
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index 91eb77c1403b..42613a329eb6 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,5 +1,3 @@
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
 DIST luasystem-0.3.0.tar.gz 19607 BLAKE2B 82dd54dab61045d25d9d1dc074526c2443b9732adf27da052f65702f0941a04dce65582091b5ecb802e5aed9baa2f4dbd53e4cd1b624426341a83fbcb0109378 SHA512 1adf1167767d7d8233ed2c90c106b050dc2370e891465eeb13f16ebc96e8f467d67a89a40173064112117ac9db2451aa73fde0d11fab01f6d2c56bdef50cb6ac
-DIST luasystem-0.4.0.tar.gz 74560 BLAKE2B 3ca3ef54572c3aca7ac465b4e93c0ae14ce33d9e278b504c7d6be209d9d26c3f21d6bb342da8c0ab7b008d366313fec436c6c7a8bd9e3246a3f2bfd6f2213214 SHA512 2b117e20955dac74b850363d88a08ca75e085e8078824b0f0a43deb29aad92e1f6a3687e6b504caf241a5353a59a96555964b3b0d6ff623c5680c005e65b294a
-DIST luasystem-0.4.1.tar.gz 74722 BLAKE2B e9d471291ddd4a89d0ac1a02459a84850749a3be1c22bfd3376ddb2886ca34d1f8db364dfb1376df072616072c45b0810886d93d2a9a87d25b123c162c07bd21 SHA512 ba98735007a81d3db2ac901283970b2d7c7db0c0b3d7098a2ff65e994f8fba4cbd0af20e7676e4e986e6c44c23e717dc0587eb9ee89760056cc4aaba173b9578
 DIST luasystem-0.4.2.tar.gz 74837 BLAKE2B 09d307ab2764bc68eb0fe3aae2c556ca70490e738e3ffcd620f4b43d00c22f19d47c67014b7f14ae1d561a4a2bee8d4b79dee3a76a47c832af602cbe8f9186f0 SHA512 98681005dfcab3807a794eec78550903a2f39de59de39c92016bbd690215946f22c17fb802b40c7e12ad19ab846a118414ab082408b11559030c35fd69ac9314
diff --git a/dev-lua/luasystem/luasystem-0.4.0.ebuild b/dev-lua/luasystem/luasystem-0.4.0.ebuild
deleted file mode 100644
index 3bfbf46ba5c8..000000000000
--- a/dev-lua/luasystem/luasystem-0.4.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
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PV="${PV/_p/-}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Platform independent system calls for Lua"
-HOMEPAGE="https://github.com/lunarmodules/luasystem"
-SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/lua_cliargs[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2.1_p0-fix-makefile.patch )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install () {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
-		"INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)"
-		"LUA_INC=${ED}/$(lua_get_include_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	insinto $(lua_get_lmod_dir)/system
-	doins system/init.lua
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasystem/luasystem-0.4.1.ebuild b/dev-lua/luasystem/luasystem-0.4.1.ebuild
deleted file mode 100644
index 3bfbf46ba5c8..000000000000
--- a/dev-lua/luasystem/luasystem-0.4.1.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
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PV="${PV/_p/-}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Platform independent system calls for Lua"
-HOMEPAGE="https://github.com/lunarmodules/luasystem"
-SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/lua_cliargs[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2.1_p0-fix-makefile.patch )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install () {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
-		"INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)"
-		"LUA_INC=${ED}/$(lua_get_include_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	insinto $(lua_get_lmod_dir)/system
-	doins system/init.lua
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
index 7214b8587bf0..f18cfd470d36 100644
--- a/dev-lua/messagepack/Manifest
+++ b/dev-lua/messagepack/Manifest
@@ -1 +1 @@
-DIST messagepack-0.5.2_p20201025.tar.gz 19652 BLAKE2B 5f85081daf2ab7f57399cb47782fbde0dfd2afe9514fdb652da1ba0eacd832e5c0924258b788d919b0a07e227f37ee58a239004086e7d6759b4727922ea57d76 SHA512 245790163ec819438fd3426f59ab2e5672864be647748dace35155be712ad4eaf78f8d7228d5a0ce94bfb92f6a1d1071cf871483bf99e02ba18872c31b3d0682
+DIST messagepack-0.5.4.tar.bz2 18952 BLAKE2B f2632c4402b8a333deb4773543c60c7b7fd2a07601212b958b673fb4f10a603bbc6d3aa01b2674c0f23ff92ec6097473ae98deeb11c1c305bb31b10c06c7d0b8 SHA512 f40501beaa56b02a80070c8dc30ea49ae4e4ba9f6dd4a7d628c8c670915da3840c96d16451ab363b34fee239d00be41c9cee659b67b670f961bc59b99b945b53
diff --git a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
deleted file mode 100644
index d8f3db4f202c..000000000000
--- a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="18f316b3f62c02bf2b7a3096701780f78a4d2c67"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PN="lua-MessagePack"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-
-inherit lua
-
-DESCRIPTION="pure Lua implementation of the MessagePack serialization format"
-HOMEPAGE="https://fperrad.frama.io/lua-MessagePack"
-SRC_URI="https://framagit.org/fperrad/${MY_PN}/-/archive/${EGIT_COMMIT}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# Needed 'lua-TestMore' Lua module not in tree
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-src_compile() {
-	:;
-}
-
-lua_src_install() {
-	local myemakeargs=(
-		"LIBDIR=${ED}/$(lua_get_lmod_dir)"
-		"LUAVER=$(ver_cut 1-2 $(lua_get_version))"
-	)
-
-	emake "${myemakeargs[@]}" install
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/messagepack/messagepack-0.5.4.ebuild b/dev-lua/messagepack/messagepack-0.5.4.ebuild
new file mode 100644
index 000000000000..41b7e3cc57d7
--- /dev/null
+++ b/dev-lua/messagepack/messagepack-0.5.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+MY_PN="lua-MessagePack"
+MY_P="${MY_PN}-${PV}"
+
+inherit lua
+
+DESCRIPTION="pure Lua implementation of the MessagePack serialization format"
+HOMEPAGE="https://fperrad.frama.io/lua-MessagePack"
+SRC_URI="https://framagit.org/fperrad/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# Needed 'lua-TestMore' Lua module not in tree
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+src_compile() {
+	:;
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		"LIBDIR=${ED}/$(lua_get_lmod_dir)"
+		"LUAVER=$(ver_cut 1-2 $(lua_get_version))"
+	)
+
+	emake "${myemakeargs[@]}" install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild
index 81cf455621fd..ceba74ce980b 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild
index 64641f012733..0b156607191c 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild
index b3c8eb765030..d9e1974d1574 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-4.12-r2.ebuild b/dev-ml/camlp4/camlp4-4.12-r2.ebuild
index 64641f012733..0b156607191c 100644
--- a/dev-ml/camlp4/camlp4-4.12-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-4.13-r2.ebuild b/dev-ml/camlp4/camlp4-4.13-r2.ebuild
index 64641f012733..0b156607191c 100644
--- a/dev-ml/camlp4/camlp4-4.13-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild
index 9f7b215b7642..c907ba571e35 100644
--- a/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.14_p1-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/_p/-}
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="=dev-lang/ocaml-4.14*:=[ocamlopt?]"
diff --git a/dev-ml/camlpdf/Manifest b/dev-ml/camlpdf/Manifest
index fce797256b8e..33040fb870b6 100644
--- a/dev-ml/camlpdf/Manifest
+++ b/dev-ml/camlpdf/Manifest
@@ -1 +1,2 @@
 DIST camlpdf-2.3.1.tar.gz 601531 BLAKE2B 9534baf9165e7dc48ae37a3fcaabb236e437845ef4e0a60a1c08874a2b240c9b1e96de5bbd6028a3ca87992221773dea34c31b0fa24e9c143632756954baf132 SHA512 0b8d91b6090221f996aee52f22f153a4b74cb85a127bbd5f84492ede8a0a581971a2349281b3879d6c37f4d5d267da583e7e8871372d97a3d636abc3231cb007
+DIST camlpdf-2.7.1.tar.gz 841886 BLAKE2B 30215949fab2517e00cf520ef4f79a6fbf49173e7e2643ac1a47d0dd945063908de2928f7181d2182ad4fe51945bb3f6a89a54aa236a889ea392cd126ef856c8 SHA512 2480a282a6ce09444ed14a3f41561375ecf7e3c57f7559a48ad9791d9f824e59820bfd39aa36910ff6bdc9b160cef76ab90dbbfe628c836c3f5c5081dfd5e452
diff --git a/dev-ml/camlpdf/camlpdf-2.7.1.ebuild b/dev-ml/camlpdf/camlpdf-2.7.1.ebuild
new file mode 100644
index 000000000000..1aada1b8ee02
--- /dev/null
+++ b/dev-ml/camlpdf/camlpdf-2.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="OCaml library for reading, writing, and modifying PDF files"
+HOMEPAGE="https://github.com/johnwhitington/camlpdf/"
+SRC_URI="https://github.com/johnwhitington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# technically LGPL-2.1+ with linking exception
+LICENSE="LGPL-2.1-with-linking-exception LGPL-2.1+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	# parallel make bugs
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+	dodoc Changes README.md
+
+	if use doc ; then
+		dodoc introduction_to_camlpdf.pdf
+		dodoc -r doc/camlpdf/html
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-ml/camlpdf/metadata.xml b/dev-ml/camlpdf/metadata.xml
index fce9dcd784fb..930714b49b52 100644
--- a/dev-ml/camlpdf/metadata.xml
+++ b/dev-ml/camlpdf/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>ivan.lloro.boada@gmail.com</email>
+    <name>Ivan Lloro</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">johnwhitington/camlpdf</remote-id>
   </upstream>
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index b1a8f56fd48a..11a5b6eec098 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,8 +1,3 @@
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de
-DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4
-DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
-DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
-DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
diff --git a/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.10.0.ebuild
deleted file mode 100644
index 61c47864a4a6..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-3.10.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
-
-inherit dune multiprocessing
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# This enables dune-configurator to use the vendored csexp module
-	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
-		vendor/csexp/src/dune || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-configurator/dune-configurator-3.11.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.11.1.ebuild
deleted file mode 100644
index 14b792f18034..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-3.11.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
-
-inherit dune
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# This enables dune-configurator to use the vendored csexp module
-	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
-		vendor/csexp/src/dune || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/dune-configurator/dune-configurator-3.13.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.13.1.ebuild
deleted file mode 100644
index 14b792f18034..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-3.13.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
-
-inherit dune
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# This enables dune-configurator to use the vendored csexp module
-	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
-		vendor/csexp/src/dune || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild
deleted file mode 100644
index 8b85e3fa414c..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-3.6.1.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
-
-inherit dune multiprocessing
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# This enables dune-configurator to use the vendored csexp module
-	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
-		vendor/csexp/src/dune || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-configurator/dune-configurator-3.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.7.1.ebuild
deleted file mode 100644
index 07cd96f97d34..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-3.7.1.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
-
-inherit dune multiprocessing
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# This enables dune-configurator to use the vendored csexp module
-	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
-		vendor/csexp/src/dune || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 4f329369c670..11a5b6eec098 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,9 +1,3 @@
-DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de
-DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4
-DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
-DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
-DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
deleted file mode 100644
index 17169982c7f9..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	~dev-ml/dune-${PV}
-	test? (
-		dev-ml/core_bench
-		dev-ml/menhir
-		dev-ml/opam
-		dev-ml/ppx_expect
-	)
-"
-DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
-	dev-ml/findlib:=[ocamlopt?]
-	>=dev-lang/ocaml-4.09:=
-"
-RDEPEND="${DEPEND}"
-
-# TODO for test deps:
-# Add cram?
-# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
-# Add coq?
-
-src_prepare() {
-	default
-
-	# Keep this list in sync with dev-ml/dune-configurator
-	local bad_tests=(
-		# List of tests calling git, mercurial, etc
-		test/blackbox-tests/test-cases/dune-project-meta/main.t
-		test/blackbox-tests/test-cases/meta-template-version-bug.t
-		test/blackbox-tests/test-cases/subst/project-name-restriction.t
-		test/blackbox-tests/test-cases/subst/with-opam-file.t
-		test/blackbox-tests/test-cases/subst.t
-		test/blackbox-tests/test-cases/subst/unicode.t
-		test/blackbox-tests/test-cases/subst/from-project-file.t
-		test/blackbox-tests/test-cases/trace-file.t
-		otherlibs/build-info/test/run.t
-		test/expect-tests/vcs_tests.ml
-
-		# Strange failures, seemingly from newer versions of deps
-		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
-		test/blackbox-tests/test-cases/merlin/merlin-tests.t
-		test/blackbox-tests/test-cases/merlin/github4125.t
-		test/blackbox-tests/test-cases/install-dry-run.t
-		test/blackbox-tests/test-cases/c-flags.t
-		test/blackbox-tests/test-cases/install-libdir.t
-		test/blackbox-tests/test-cases/dune-cache/trim.t
-
-		# Strange failures about opam not being initialised
-		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
-		test/blackbox-tests/test-cases/merlin/symlinks.t
-		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
-		test/blackbox-tests/test-cases/merlin/per-module-pp.t
-		test/blackbox-tests/test-cases/merlin/server.t
-		test/blackbox-tests/test-cases/github1946.t
-		test/blackbox-tests/test-cases/github759.t
-
-		# Wants nodejs!
-		test/blackbox-tests/test-cases/jsoo/simple.t
-		test/blackbox-tests/test-cases/jsoo/inline-tests.t
-		test/blackbox-tests/test-cases/jsoo/github3622.t
-		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
-		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
-
-		# Wants coq which doesn't build for me right now
-		test/blackbox-tests/test-cases/coq/rec-module.t
-		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
-		test/blackbox-tests/test-cases/coq/native-compose.t
-		test/blackbox-tests/test-cases/coq/base-unsound.t
-		test/blackbox-tests/test-cases/coq/base.t
-		test/blackbox-tests/test-cases/coq/native-single.t
-		test/blackbox-tests/test-cases/coq/compose-simple.t
-		test/blackbox-tests/test-cases/coq/ml-lib.t
-		test/blackbox-tests/test-cases/coq/extract.t
-		test/blackbox-tests/test-cases/coq/compose-plugin.t
-
-		# Unpackaged dependencies (a rabbit hole for now)
-		# utop -> lambda-term, zed
-		test/blackbox-tests/test-cases/utop/github3188.t
-		test/blackbox-tests/test-cases/utop/utop-simple.t
-		test/blackbox-tests/test-cases/utop/utop-default.t
-		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
-		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
-		# ocamlformat
-		test/blackbox-tests/test-cases/formatting.t
-		# mdx
-		test/blackbox-tests/test-cases/mdx-stanza.t
-		# odoc
-		test/blackbox-tests/test-cases/odoc/odoc-simple.t
-		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
-		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
-		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
-		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
-		test/blackbox-tests/test-cases/odoc/warnings.t
-	)
-
-	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
-}
-
-src_configure() {
-	:
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.10.0.ebuild
deleted file mode 100644
index b8d5b743c22b..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.10.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
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.11.1-r3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.11.1-r3.ebuild
deleted file mode 100644
index b8de85c41fbe..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.11.1-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}
-	!dev-ml/stdune
-	!dev-ml/dyn
-	!dev-ml/ordering
-"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ordering dyn stdune ${PN}
-}
-
-src_install() {
-	dune-install ordering dyn stdune ${PN}
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.13.1-r3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.13.1-r3.ebuild
deleted file mode 100644
index b8de85c41fbe..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.13.1-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}
-	!dev-ml/stdune
-	!dev-ml/dyn
-	!dev-ml/ordering
-"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ordering dyn stdune ${PN}
-}
-
-src_install() {
-	dune-install ordering dyn stdune ${PN}
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild
deleted file mode 100644
index 771cab1c65a7..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild
deleted file mode 100644
index d78578db0848..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest
index 2b3b5583f199..0c7a900e152e 100644
--- a/dev-ml/dune-site/Manifest
+++ b/dev-ml/dune-site/Manifest
@@ -1,7 +1,2 @@
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de
-DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4
-DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
-DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
-DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
diff --git a/dev-ml/dune-site/dune-site-3.10.0.ebuild b/dev-ml/dune-site/dune-site-3.10.0.ebuild
deleted file mode 100644
index 026b796bf660..000000000000
--- a/dev-ml/dune-site/dune-site-3.10.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 dune multiprocessing
-
-DESCRIPTION="Embed locations informations inside executable and libraries"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die
-}
diff --git a/dev-ml/dune-site/dune-site-3.11.1.ebuild b/dev-ml/dune-site/dune-site-3.11.1.ebuild
deleted file mode 100644
index 189a22209544..000000000000
--- a/dev-ml/dune-site/dune-site-3.11.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
-
-inherit dune
-
-DESCRIPTION="Embed locations informations inside executable and libraries"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/dune-site/dune-site-3.13.1.ebuild b/dev-ml/dune-site/dune-site-3.13.1.ebuild
deleted file mode 100644
index c4983f46bea7..000000000000
--- a/dev-ml/dune-site/dune-site-3.13.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
-
-inherit dune
-
-DESCRIPTION="Embed locations informations inside executable and libraries"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-ml/dune-3.5
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/dune-site/dune-site-3.6.2.ebuild b/dev-ml/dune-site/dune-site-3.6.2.ebuild
deleted file mode 100644
index d93c7b05f97d..000000000000
--- a/dev-ml/dune-site/dune-site-3.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Embed locations informations inside executable and libraries"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die
-}
diff --git a/dev-ml/dune-site/dune-site-3.7.1.ebuild b/dev-ml/dune-site/dune-site-3.7.1.ebuild
deleted file mode 100644
index 77728bf4e61b..000000000000
--- a/dev-ml/dune-site/dune-site-3.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Embed locations informations inside executable and libraries"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die
-}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 41b50422137b..90b337f874e8 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,10 +1,5 @@
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de
-DIST dune-3.11.1.tar.gz 2753844 BLAKE2B de80e4be355fe7c6f04f0004fbf28dac18c803fb055bd74a1c30a8983f8a234a487244561bd622f3330cfb55670163355c2a1647e847d2e3966690a62a10b644 SHA512 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4
 DIST dune-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
-DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
-DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
-DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
diff --git a/dev-ml/dune/dune-3.10.0.ebuild b/dev-ml/dune/dune-3.10.0.ebuild
deleted file mode 100644
index 7ce496828320..000000000000
--- a/dev-ml/dune/dune-3.10.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
-
-inherit multiprocessing elisp-common
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="emacs"
-RESTRICT="strip test"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/dune"
-
-BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# This allows `dune --version` to output the correct version
-	# instead of "n/a"
-	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
-}
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/doc \
-		--etcdir=/etc \
-		--datadir=/usr/share \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		|| die
-}
-
-src_compile() {
-	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
-	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
-		-j $(makeopts_jobs) --display short || die
-
-	use emacs && elisp-compile editor-integration/emacs/*.el
-}
-
-src_install() {
-	# OCaml generates textrels on 32-bit arches
-	if use arm || use ppc || use x86 ; then
-		export QA_TEXTRELS='.*'
-	fi
-	default
-
-	dodir /usr/share/doc
-	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/doc || die
-
-	if use emacs ; then
-		elisp-install ${PN} editor-integration/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
diff --git a/dev-ml/dune/dune-3.11.1.ebuild b/dev-ml/dune/dune-3.11.1.ebuild
deleted file mode 100644
index e2e51c3abce7..000000000000
--- a/dev-ml/dune/dune-3.11.1.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 multiprocessing elisp-common
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="emacs"
-RESTRICT="strip test"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/dune"
-
-BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# This allows `dune --version` to output the correct version
-	# instead of "n/a"
-	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
-}
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
-		--etcdir=/etc \
-		--datadir=/usr/share \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		|| die
-}
-
-src_compile() {
-	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
-	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
-		-j $(makeopts_jobs) --display short || die
-
-	use emacs && elisp-compile editor-integration/emacs/*.el
-}
-
-src_install() {
-	# OCaml generates textrels on 32-bit arches
-	if use arm || use ppc || use x86 ; then
-		export QA_TEXTRELS='.*'
-	fi
-	default
-
-	mv "${ED}"/usr/share/doc/dune "${ED}"/usr/share/doc/${PF} || die
-
-	if use emacs ; then
-		elisp-install ${PN} editor-integration/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
diff --git a/dev-ml/dune/dune-3.6.2.ebuild b/dev-ml/dune/dune-3.6.2.ebuild
deleted file mode 100644
index fdcf2b0e013d..000000000000
--- a/dev-ml/dune/dune-3.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing elisp-common
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="emacs"
-RESTRICT="strip test"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/dune"
-
-BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# This allows `dune --version` to output the correct version
-	# instead of "n/a"
-	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
-}
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/doc \
-		--etcdir=/etc \
-		--datadir=/usr/share \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		|| die
-}
-
-src_compile() {
-	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
-	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
-		-j $(makeopts_jobs) --display short || die
-
-	use emacs && elisp-compile editor-integration/emacs/*.el
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc
-	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/doc || die
-
-	if use emacs ; then
-		elisp-install ${PN} editor-integration/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
diff --git a/dev-ml/dune/dune-3.7.0.ebuild b/dev-ml/dune/dune-3.7.0.ebuild
deleted file mode 100644
index fdcf2b0e013d..000000000000
--- a/dev-ml/dune/dune-3.7.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing elisp-common
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="emacs"
-RESTRICT="strip test"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/dune"
-
-BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# This allows `dune --version` to output the correct version
-	# instead of "n/a"
-	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
-}
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/doc \
-		--etcdir=/etc \
-		--datadir=/usr/share \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		|| die
-}
-
-src_compile() {
-	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
-	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
-		-j $(makeopts_jobs) --display short || die
-
-	use emacs && elisp-compile editor-integration/emacs/*.el
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc
-	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/doc || die
-
-	if use emacs ; then
-		elisp-install ${PN} editor-integration/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
diff --git a/dev-ml/dune/dune-3.7.1.ebuild b/dev-ml/dune/dune-3.7.1.ebuild
deleted file mode 100644
index 794b4c3542f2..000000000000
--- a/dev-ml/dune/dune-3.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing elisp-common
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="emacs"
-RESTRICT="strip test"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/dune"
-
-BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# This allows `dune --version` to output the correct version
-	# instead of "n/a"
-	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
-}
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir=/usr/share/man \
-		--docdir=/usr/doc \
-		--etcdir=/etc \
-		--datadir=/usr/share \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		|| die
-}
-
-src_compile() {
-	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
-	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
-		-j $(makeopts_jobs) --display short || die
-
-	use emacs && elisp-compile editor-integration/emacs/*.el
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc
-	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/doc || die
-
-	if use emacs ; then
-		elisp-install ${PN} editor-integration/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
diff --git a/dev-ml/labltk/labltk-8.06.10-r1.ebuild b/dev-ml/labltk/labltk-8.06.10-r1.ebuild
index e6d19e54776b..af13980e03aa 100644
--- a/dev-ml/labltk/labltk-8.06.10-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-warnings
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.11-r1.ebuild b/dev-ml/labltk/labltk-8.06.11-r1.ebuild
index 12f8405e4461..8ea74b4dcc2a 100644
--- a/dev-ml/labltk/labltk-8.06.11-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
index 4086f1f797c1..010fd3a179b9 100644
--- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.14.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild
index 230eca287bba..912cef12ae8e 100644
--- a/dev-ml/labltk/labltk-8.06.14.ebuild
+++ b/dev-ml/labltk/labltk-8.06.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/labltk/labltk-8.06.7-r1.ebuild b/dev-ml/labltk/labltk-8.06.7-r1.ebuild
index 58a37bddca04..7d8be420df66 100644
--- a/dev-ml/labltk/labltk-8.06.7-r1.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.1.0_rc4.ebuild
index 36b3716c0372..36b3716c0372 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.1.0_rc4.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240808.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240830.ebuild
index 36b3716c0372..36b3716c0372 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240808.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240830.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240815.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240910.ebuild
index 36b3716c0372..36b3716c0372 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240815.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20240910.ebuild
diff --git a/dev-ml/mccs/mccs-1.1.17.ebuild b/dev-ml/mccs/mccs-1.1.17.ebuild
index c79dd4b5d25c..1aaea5e5d372 100644
--- a/dev-ml/mccs/mccs-1.1.17.ebuild
+++ b/dev-ml/mccs/mccs-1.1.17.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/ocaml-${PN}-$(ver_rs 2 '-')
 
 LICENSE="|| ( LGPL-2.1 BSD GPL-3 )"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/memtrace/memtrace-0.2.3.ebuild b/dev-ml/memtrace/memtrace-0.2.3.ebuild
index 69511ccb9837..a67584bb3de2 100644
--- a/dev-ml/memtrace/memtrace-0.2.3.ebuild
+++ b/dev-ml/memtrace/memtrace-0.2.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit dune
 
-DESCRIPTION="Streaming client for OCaml's Memprof "
+DESCRIPTION="Streaming client for OCaml's Memprof"
 HOMEPAGE="https://github.com/janestreet/memtrace/"
 
 if [[ "${PV}" == *9999* ]] ; then
diff --git a/dev-ml/memtrace/metadata.xml b/dev-ml/memtrace/metadata.xml
index 52496b943271..7cafa41116e6 100644
--- a/dev-ml/memtrace/metadata.xml
+++ b/dev-ml/memtrace/metadata.xml
@@ -7,7 +7,7 @@
     <name>ML</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://gitlab.com/janestreet/memtrace/issues/</bugs-to>
+    <bugs-to>https://github.com/janestreet/memtrace/issues/</bugs-to>
     <remote-id type="github">janestreet/memtrace</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild
index 99a412886ea8..b8a10c761b57 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 RESTRICT="test"  # Tests fail
 
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild
index 43c87eabc97a..699348fbaa8d 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 RESTRICT="test"  # Tests fail
 
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
index 43c87eabc97a..699348fbaa8d 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 RESTRICT="test"  # Tests fail
 
diff --git a/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-installer/opam-installer-2.1.6.ebuild b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
index 559a13abee70..930678168270 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 RESTRICT="test" # sandbox not working
 
diff --git a/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
deleted file mode 100644
index a8af27416df1..000000000000
--- a/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 28 Feb 2021 19:27:24 +0100
-Subject: Port to Dose3 6.0.1
-
----
- src/client/opamAdminCheck.ml       | 2 ++
- src/client/opamAdminRepoUpgrade.ml | 2 ++
- src/solver/opamBuiltinMccs.ml.real | 2 +-
- src/solver/opamCudf.ml             | 5 ++++-
- src/solver/opamCudf.mli            | 4 ++--
- src/solver/opamCudfSolver.ml       | 4 ++--
- src/solver/opamSolver.ml           | 4 +++-
- 7 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
-index 05543a2..f23bfc4 100644
---- a/src/client/opamAdminCheck.ml
-+++ b/src/client/opamAdminCheck.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamPackage.Set.Op
- 
-diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
-index 0be53b2..635e792 100644
---- a/src/client/opamAdminRepoUpgrade.ml
-+++ b/src/client/opamAdminRepoUpgrade.ml
-@@ -8,6 +8,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamProcess.Job.Op
- open OpamStd.Option.Op
-diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
-index ab39ab3..2b41982 100644
---- a/src/solver/opamBuiltinMccs.ml.real
-+++ b/src/solver/opamBuiltinMccs.ml.real
-@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
-       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
-       ?timeout criteria cudf
-   with
--  | None -> raise Common.CudfSolver.Unsat
-+  | None -> raise Dose_common.CudfSolver.Unsat
-   | Some (preamble, univ) -> Some preamble, univ
-   | exception Mccs.Timeout -> raise Timeout
- 
-diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
-index e07ff54..ad7293c 100644
---- a/src/solver/opamCudf.ml
-+++ b/src/solver/opamCudf.ml
-@@ -9,6 +9,9 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Common = Dose_common
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- 
-@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
-       let r =
-         Algo.Depsolver.check_request_using
-           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
--          ~criteria ~explain:true cudf_request
-+          ~explain:true cudf_request
-       in
-       log "Solver call done in %.3f" (chrono ());
-       r
-diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
-index cb8158d..c928ccf 100644
---- a/src/solver/opamCudf.mli
-+++ b/src/solver/opamCudf.mli
-@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
- module Graph: sig
-   (** Graph of cudf packages *)
- 
--  include module type of Algo.Defaultgraphs.PackageGraph.G
-+  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
- 
-   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
-       the dependency, which is the reverse of what happens in the action
-@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
- 
- val make_conflicts:
-   version_map:int package_map -> Cudf.universe ->
--  Algo.Diagnostic.diagnosis -> ('a, conflict) result
-+  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
- val cycle_conflict:
-   version_map:int package_map -> Cudf.universe ->
-   string list list -> ('a, conflict) result
-diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
-index 03486f1..2651373 100644
---- a/src/solver/opamCudfSolver.ml
-+++ b/src/solver/opamCudfSolver.ml
-@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-     in
-     OpamFilename.remove solver_in;
-     if not (OpamFilename.exists solver_out) then
--      raise (Common.CudfSolver.Error "no output")
-+      raise (Dose_common.CudfSolver.Error "no output")
-     else if
-       (let ic = OpamFilename.open_in solver_out in
-        try
-@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
-          i = "FAIL"
-        with End_of_file -> close_in ic; false)
-     then
--      raise Common.CudfSolver.Unsat
-+      raise Dose_common.CudfSolver.Unsat
-     else
-     let r =
-       Cudf_parser.load_solution_from_file
-diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
-index 3748e75..bbf995f 100644
---- a/src/solver/opamSolver.ml
-+++ b/src/solver/opamSolver.ml
-@@ -9,6 +9,8 @@
- (*                                                                        *)
- (**************************************************************************)
- 
-+module Algo = Dose_algo
-+
- open OpamTypes
- open OpamTypesBase
- open OpamPackage.Set.Op
-@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
-     pmap OpamPackage.Map.empty
- 
- let name_to_cudf name =
--  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
-+  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
- 
- let constraint_to_cudf version_map name (op,v) =
-   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam/opam-2.1.6.ebuild b/dev-ml/opam/opam-2.1.6.ebuild
index 67f9d32f48f5..58aca89af1dc 100644
--- a/dev-ml/opam/opam-2.1.6.ebuild
+++ b/dev-ml/opam/opam-2.1.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 RESTRICT="test" #see bugs 838658
 
diff --git a/dev-perl/AnyEvent-I3/AnyEvent-I3-0.190.0.ebuild b/dev-perl/AnyEvent-I3/AnyEvent-I3-0.190.0.ebuild
index c14663b7d339..a909f25511a6 100644
--- a/dev-perl/AnyEvent-I3/AnyEvent-I3-0.190.0.ebuild
+++ b/dev-perl/AnyEvent-I3/AnyEvent-I3-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module virtualx
 DESCRIPTION="Communicate with the i3 window manager"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-perl/AnyEvent
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 067da3f44a8d..513616b4426c 100644
--- a/dev-perl/DBD-MariaDB/DBD-MariaDB-1.230.0.ebuild
+++ b/dev-perl/DBD-MariaDB/DBD-MariaDB-1.230.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="+mariadb mysql minimal"
 REQUIRED_USE="^^ ( mysql mariadb )"
 
diff --git a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild
index 54a9458d7ea6..719969229b52 100644
--- a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild
+++ b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.120.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Configure-time utilities for using C headers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-ExtUtils-CBuilder
diff --git a/dev-perl/File-pushd/File-pushd-1.16.0.ebuild b/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
index 3e26cc9db5a9..0dda07951de9 100644
--- a/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0-r1.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0-r1.ebuild
deleted file mode 100644
index bf34c5bc0494..000000000000
--- a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=MONSIEURP
-DIST_VERSION=0.200000
-inherit perl-module
-
-DESCRIPTION="Tool to merge PRs from the Gentoo Github repository"
-HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	dev-vcs/git
-	virtual/perl-Encode
-	dev-perl/File-Which
-	dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	virtual/perl-File-Temp
-	virtual/perl-HTTP-Tiny
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor
-	!app-portage/pram
-"
-BDEPEND="${RDEPEND}
-	dev-perl/Module-Build-Tiny
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Gentoo-App-Pram/Manifest b/dev-perl/Gentoo-App-Pram/Manifest
deleted file mode 100644
index c8be169cbb9c..000000000000
--- a/dev-perl/Gentoo-App-Pram/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Gentoo-App-Pram-0.200000.tar.gz 13061 BLAKE2B 783c50954f3936bc2dbae4d0db0baf52d5a7ecbdd576ada75e1c183816432a09059e1712b337fd1b7ae79dd774242ac684a0e8bea26a90424458ed35de523209 SHA512 90f82400de8ff6afc56ee6c66394188bb0b9aedd584879588f8ba5555b6ffad60de109e91a2d223593e2c78b21754957110718a7fba0cf76050c79cc823d505a
diff --git a/dev-perl/Gentoo-App-Pram/metadata.xml b/dev-perl/Gentoo-App-Pram/metadata.xml
deleted file mode 100644
index ddf58747bfba..000000000000
--- a/dev-perl/Gentoo-App-Pram/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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">Gentoo-App-Pram</remote-id>
-    <remote-id type="cpan-module">Gentoo::App::Pram</remote-id>
-    <remote-id type="github">monsieurp/Gentoo-App-Pram</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.14.0.ebuild b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.14.0.ebuild
index 17de12a368fd..3e1e4a5f8b28 100644
--- a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.14.0.ebuild
+++ b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Minimalist HTTP user agent cookie jar"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild
index 275d950dbbe7..8fa19e11eb7e 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.200.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
index 27361717e503..e2964f2daab1 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Combines many List::* utility modules in one bite-sized package"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 LICENSE="Artistic-2"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild
index 065a3633f5eb..462d3d12d190 100644
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Higher-order list utility functions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
index 739ad3a8db1a..4a817fa379c7 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Definition of MIME types"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	virtual/perl-File-Spec
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 08023529f5a7..394184106f1f 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-2023 Gentoo Authors
+# Copyright 1999-2024 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 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-1.441.300
diff --git a/dev-perl/Module-Refresh/Module-Refresh-0.180.0.ebuild b/dev-perl/Module-Refresh/Module-Refresh-0.180.0.ebuild
index ea6e7b799658..096b658c9077 100644
--- a/dev-perl/Module-Refresh/Module-Refresh-0.180.0.ebuild
+++ b/dev-perl/Module-Refresh/Module-Refresh-0.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Refresh %INC files when updated on disk"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	dev-perl/Module-Install
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.340.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.340.0.ebuild
index f53d3b16723e..7997fccb37a0 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.340.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.340.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively scan Perl code for dependencies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.6.ebuild b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.6.ebuild
index 0f34ccfe6e44..52a7785e4e96 100644
--- a/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.6.ebuild
+++ b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Get a domain name's public suffix via the Mozilla Public Suffix List"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Net-Netmask/Net-Netmask-2.0.200-r1.ebuild b/dev-perl/Net-Netmask/Net-Netmask-2.0.200-r1.ebuild
index 015de9119daf..bf609062e32c 100644
--- a/dev-perl/Net-Netmask/Net-Netmask-2.0.200-r1.ebuild
+++ b/dev-perl/Net-Netmask/Net-Netmask-2.0.200-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, manipulate and lookup IP network blocks"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="minimal"
 
 RDEPEND="
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 0edf4b87874e..aff63cdc3939 100644
--- a/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
+++ b/dev-perl/PAR-Dist/PAR-Dist-0.530.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create and manipulate PAR distributions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild
index 72159b6685d3..4d1bcb7af666 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	!<net-fs/samba-4.10.6
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
index 0457380e5aad..6dbe452915b4 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer to gzip/gunzip"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
diff --git a/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild b/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
index 8f723568b2fc..9f704f83f6dc 100644
--- a/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
+++ b/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-perl/Module-Build-Tiny-0.35.0
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
index 9940210c3258..06f111f19397 100644
--- a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
+++ b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild b/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild
index c5a658528e40..5ccd86b22a90 100644
--- a/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild
+++ b/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Regular expression for IPv6 addresses"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index 0155453310ec..6a8e7a42182d 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -1,3 +1,5 @@
 DIST Sys-Virt-v10.1.0.tar.gz 175345 BLAKE2B 19f5620f546b1ea0f6dda0126b56735102f7513b9c41b86e1892f846a84fdfac0f1296a4d1238c7f1cc5c1e5704d5fb8f8dc81cc3961ca59acca5403fa580701 SHA512 6b20573e953bd99e547da683cfc587dd132f8b7921ae76289aad9891179b7d068c96a0c67f90b6daa7c5bf0156de02b3a85f7ec538ee47ca4f81547f03256003
 DIST Sys-Virt-v10.2.0.tar.gz 175575 BLAKE2B 2950f991be8ae130788b1b03c1f898fb778b67765aa93732540a1fe5057a66e7a4efb7c7792327b81816281d7ba910466b24a50ec36165e554f1cb481693fba4 SHA512 c362e37511aff879b08a67b6337cee6d20c197fea2bb7f6ce023eafa642f53029744d704250533772fd48448ff39ea49027b83563cd9821dcd22d3621b2372ef
+DIST Sys-Virt-v10.5.0.tar.gz 167433 BLAKE2B 261ce83a06909bb713253ee01549c8c6165e0d76c218e33eb7180972c08ede43431c57c6e4d6e6b907942b6926172e6255527d9d1d9e64572ffadc04e169ae33 SHA512 7c203b2c905c8bfd0861ccd95fecadc54fdbbfc3ba360398f908143d0139935c3df1539f27468daa5b81f982e611aa66ce92ad13bfea9d3c89f14e76c7b4931b
+DIST Sys-Virt-v10.6.0.tar.gz 167553 BLAKE2B 82c587140c4e44bff7dac83bf64cf0039f846a6beaa5b422070fce8e380cfed6c1cf5b8d5c52dfe6d96d8568c0bdb08e4a7ec6c8f7a38a7b3292b4f9b13ddf97 SHA512 95c5c602c8cb788a8c1af4a7b513934746f89390ae0e7a5f7bba782a145ffa6a0734fcfa24b8b33ed1f0f43367b13ddecfbceb7a63280c981f6655b5404d82e1
 DIST Sys-Virt-v9.7.0.tar.gz 174737 BLAKE2B 676be20e39102f92b9b1d3cc703479c67f43d7007f01f9cfb725d13002ba0abdb3123ac756ace666ffd3c67224943281ad79b840c50afbfd4e8f7f9c5ca4be27 SHA512 211cc36536ec8538e096d36bca568b0362a2c84fe78322acb34a473a91128f46251503db14e38b63cd865a2f16b5c021e6e75ec1832368ae26480bb7e32180d4
diff --git a/dev-perl/Sys-Virt/Sys-Virt-10.5.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-10.5.0.ebuild
new file mode 100644
index 000000000000..16cad8c07a60
--- /dev/null
+++ b/dev-perl/Sys-Virt/Sys-Virt-10.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+DIST_AUTHOR=DANBERR
+DIST_VERSION=v${PV}
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="API for using the libvirt library from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-emulation/libvirt-${PV}
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	dev-perl/Module-Build
+	virtual/pkgconfig
+	test? (
+		dev-perl/CPAN-Changes
+		dev-perl/Test-More-UTF8
+		dev-perl/Test-Pod-Coverage
+		dev-perl/XML-XPath
+		virtual/perl-Test-Simple
+		virtual/perl-Time-HiRes
+	)"
+DEPEND="
+	>=app-emulation/libvirt-${PV}
+"
diff --git a/dev-perl/Sys-Virt/Sys-Virt-10.6.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-10.6.0.ebuild
new file mode 100644
index 000000000000..16cad8c07a60
--- /dev/null
+++ b/dev-perl/Sys-Virt/Sys-Virt-10.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+DIST_AUTHOR=DANBERR
+DIST_VERSION=v${PV}
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="API for using the libvirt library from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-emulation/libvirt-${PV}
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	dev-perl/Module-Build
+	virtual/pkgconfig
+	test? (
+		dev-perl/CPAN-Changes
+		dev-perl/Test-More-UTF8
+		dev-perl/Test-Pod-Coverage
+		dev-perl/XML-XPath
+		virtual/perl-Test-Simple
+		virtual/perl-Time-HiRes
+	)"
+DEPEND="
+	>=app-emulation/libvirt-${PV}
+"
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
index bf3c837e695a..c2f4f24c6022 100644
--- a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
+++ b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	virtual/perl-Test-Simple
diff --git a/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild b/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild
index 96475f1fff9a..7b982bcf0b26 100644
--- a/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild
+++ b/dev-perl/Test-TCP/Test-TCP-2.220.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Testing TCP program"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/WebService-MusicBrainz/Manifest b/dev-perl/WebService-MusicBrainz/Manifest
index 052a66510d9c..8bbaf9038980 100644
--- a/dev-perl/WebService-MusicBrainz/Manifest
+++ b/dev-perl/WebService-MusicBrainz/Manifest
@@ -1,2 +1 @@
-DIST WebService-MusicBrainz-1.0.6.tar.gz 10018 BLAKE2B f7a1e038ae60c44193c4551b2acc135e8f54fd4b7c4c7de68390c63b5b81b3c14585eaa0163de699a9bb440736570fdacd30fda194086a1c52bff787c318aabb SHA512 b9cb8a4873c0a32575afbeaa57068a2b533dd3213d747b3577a378da2844b325e9b50477ccb3c5461b34a319078a59cf802be93f1cc094cb6f12c13c92c9611a
 DIST WebService-MusicBrainz-1.0.7.tar.gz 10045 BLAKE2B 4e6e745c1d71abebd7aa55ecbba8dac8adb155dd9afbc108718e8aa48b3cd7f9b91d28913c832eec6d63fe1963bb7247118c4addd08983f211c9acb6d5def539 SHA512 9515de4949f365cc4ab3619433392c33dbeab9137c27788705eb852c7a31b4052843d3f541f814e31dbacbb10e3f524181e29ce4d177ba8753a1270dbde5229e
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.6.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.6.ebuild
deleted file mode 100644
index 63c268dd016e..000000000000
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=BFAIST
-inherit perl-module
-
-DESCRIPTION="Web service API to MusicBrainz database"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-perl/Mojolicious-7.130.0
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-"
-
-PATCHES=( "${FILESDIR}/1.0.2-no-network-testing.patch" )
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.7.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.7.ebuild
index 63197d8aa541..5b9eb265c099 100644
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.7.ebuild
+++ b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.7.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Web service API to MusicBrainz database"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-perl/Mojolicious-7.130.0
diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
index 61c60e271dfb..ad41f943900f 100644
--- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
+++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,6 @@ DESCRIPTION="Scintilla source code editing component for wxWidgets"
 LICENSE+=" HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-perl/Alien-wxWidgets
@@ -29,6 +28,9 @@ BDEPEND=${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.34-flags.patch
 	"${FILESDIR}"/${PN}-0.39-gcc6.patch
+	"${FILESDIR}"/${PN}-0.39-respect-user-flags.patch
+	"${FILESDIR}"/${PN}-0.39-force-c++11.patch
+	"${FILESDIR}"/${PN}-0.39-scrub-gtk2.patch
 )
 
 src_configure() {
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch
new file mode 100644
index 000000000000..92a5af0c4892
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-force-c++11.patch
@@ -0,0 +1,13 @@
+Uses std::auto_ptr which has been officially removed in C++17.
+While GCC still has it present LLVM has explicitly removed it.
+
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -50,6 +50,7 @@
+ 		'-o ' . $object_name,
+ 		'-O2',
+ 		'-Wall',
++		'-std=c++11',
+ 		$object_name !~ /((Plat|Scintilla)WX|scintilla)\.o/
+ 		? '-Wno-missing-braces -Wno-char-subscripts'
+ 		: '',
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch
new file mode 100644
index 000000000000..e92e644a7956
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-respect-user-flags.patch
@@ -0,0 +1,18 @@
+--- a/inc/Module/Build/Scintilla.pm
++++ b/inc/Module/Build/Scintilla.pm
+@@ -89,7 +89,7 @@
+ 
+ sub stc_ldflags {
+ 	my $self = shift;
+-	return Alien::wxWidgets->link_flags;
++	return Alien::wxWidgets->link_flags . $Config{ldflags};
+ }
+ 
+ sub stc_defines {
+@@ -119,6 +119,7 @@
+ 	my $flags   = qx($command);
+ 	chomp($flags);
+ 	$flags .= ' ' . Alien::wxWidgets->c_flags;
++	$flags .= ' ' . $Config{ccflags};
+ 	return $flags;
+ }
diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch
new file mode 100644
index 000000000000..8c025f399926
--- /dev/null
+++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch
@@ -0,0 +1,35 @@
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -63,32 +64,6 @@
+ 	$self->_run_command( \@cmd );
+ }
+ 
+-sub stc_prebuild_check {
+-	my $self      = shift;
+-	my $ld        = Alien::wxWidgets->linker;
+-	my $libstring = $self->stc_extra_scintilla_libs;
+-	my $outfile   = 'stc_checkdepends.out';
+-	my $command   = qq($ld -fPIC -shared $libstring -o $outfile);
+-	if ( system($command) ) {
+-		unlink($outfile);
+-		print qq(Check for gtk2 development libraries failed.\n);
+-		print qq(Perhaps you need to install package libgtk2.0-dev or the equivalent for your system.\n);
+-		print qq(You can ofcourse uninstall it later after the installation is complete.\n);
+-		print qq(The build cannot continue.\n);
+-		exit(1);
+-	}
+-	unlink($outfile);
+-	return 1;
+-}
+-
+-sub stc_extra_scintilla_libs {
+-	my $self   = shift;
+-	my $extras = '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 ';
+-	$extras .= '-lgdk_pixbuf-2.0 -lm -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 ';
+-	$extras .= '-lgmodule-2.0 -lgthread-2.0 -lglib-2.0';
+-	return $extras;
+-}
+-
+ sub stc_link_scintilla_objects {
+        my ( $self, $shared_lib, $objects ) = @_;
+
diff --git a/dev-perl/Wx/Wx-0.993.200-r3.ebuild b/dev-perl/Wx/Wx-0.993.200-r3.ebuild
index 9c2559675aa1..abf2f39974bc 100644
--- a/dev-perl/Wx/Wx-0.993.200-r3.ebuild
+++ b/dev-perl/Wx/Wx-0.993.200-r3.ebuild
@@ -7,7 +7,7 @@ WX_GTK_VER="3.2-gtk3"
 DIST_AUTHOR=MDOOTSON
 DIST_VERSION=0.9932
 DIST_EXAMPLES=("samples/*")
-inherit wxwidgets virtualx perl-module
+inherit toolchain-funcs wxwidgets virtualx perl-module
 
 DESCRIPTION="Perl bindings for wxGTK"
 HOMEPAGE="https://wxperl.sourceforge.net/ https://metacpan.org/release/Wx"
@@ -50,10 +50,17 @@ src_prepare() {
 	dos2unix MANIFEST || die
 	dos2unix typemap || die
 
-	setup-wxwidgets
 	perl-module_src_prepare
 }
 
+src_configure() {
+	# xspp sets CC to a c++ compiler but the eclass overrides it
+	# https://bugs.gentoo.org/931939
+	export CC="$(tc-getCXX)"
+	setup-wxwidgets
+	perl-module_src_configure
+}
+
 src_test() {
 	# the webview/t/03_threads.t test tends to hang or crash in weird
 	# ways depending on local configuration. eg, backtraces involving
diff --git a/dev-perl/local-lib/local-lib-2.0.29.ebuild b/dev-perl/local-lib/local-lib-2.0.29.ebuild
index 36574ef81a04..f9ddbb90f517 100644
--- a/dev-perl/local-lib/local-lib-2.0.29.ebuild
+++ b/dev-perl/local-lib/local-lib-2.0.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Create and use a local lib/ for perl modules with PERL5LIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=virtual/perl-CPAN-1.820.0
diff --git a/dev-python/Babel/Babel-2.15.0.ebuild b/dev-python/Babel/Babel-2.15.0.ebuild
deleted file mode 100644
index bc931d617229..000000000000
--- a/dev-python/Babel/Babel-2.15.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=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-# see scripts/download_import_cldr.py
-CLDR_PV=44.0
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="
-	https://babel.pocoo.org/
-	https://pypi.org/project/Babel/
-	https://github.com/python-babel/babel/
-"
-SRC_URI+="
-	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
-BDEPEND="
-	app-arch/unzip
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm babel/locale-data/*.dat || die
-	rm babel/global.dat || die
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -f babel/global.dat ]]; then
-		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
-	fi
-}
-
-python_test() {
-	local -x TZ=UTC
-	epytest
-}
diff --git a/dev-python/Babel/Babel-2.16.0.ebuild b/dev-python/Babel/Babel-2.16.0.ebuild
index de9cf564abe0..41d2c8912244 100644
--- a/dev-python/Babel/Babel-2.16.0.ebuild
+++ b/dev-python/Babel/Babel-2.16.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
 BDEPEND="
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 952d2a99dabf..2516de2e668a 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,4 +1,2 @@
-DIST babel-2.15.0.tar.gz 9390000 BLAKE2B 9cd99524dbb191b5b8835452118b57b23abc89123e358a29de2375263a0264a1ea4c71324632eff8711cab7dbb40a20e97acd8e0faa448872353852b064ca524 SHA512 8cff4dbbe84047f7e8b625772036d2a23b6f7dfc36aa15332e581d4331fdac1d0308341294741afc43f3180368a7cc7675f68f28bbf94a621c693a822d4a2028
 DIST babel-2.16.0.tar.gz 9348104 BLAKE2B e8b674312140dca805b3faf4531493d613b663d4a04aa42a86438d49dd547b598eec9e3c3ca79d715d1c1589f7d416073fcf7e58df468e7c449fa05c70e7b776 SHA512 c80b52cd38eb2fb34b1d19ef3b6c50c16b129a4137d42eba900e3f77e81a5ad03ca319aa37dbdfd3bb7cbe31adbfa6007413962c348912dc9dca09d55fa4438b
-DIST cldr-common-44.0.zip 31750682 BLAKE2B a6f708d6c5bd02efc1e0672250b181542fb0f91d48bbaabddfc3b6b9e21201e3c9e6d09222cbc929b4ae654d2a0804a90f77f384df93577af188a907ce20bd61 SHA512 f2cd8733948caf308d6e39eae21724da7f29f528f8969d456514e1e84ecd5f1e6936d0460414a968888bb1b597bc1ee723950ea47df5cba21a02bb14f96d18b6
 DIST cldr-common-45.0.zip 31812363 BLAKE2B 031d08f2db4a6c75585488faf43196a912e348edc9ff582e9c507c8f1c8ae2cf7c86aaa8265a8fa60540c2b3f4844d0aa01dad516344195bd4d40926d65a48fc SHA512 638123882bd29911fc9492ec152926572fec48eb6c1f5dd706aee3e59cad8be4963a334bb7a09a645dbedc3356f60ef7ac2ef7ab4ccf2c8926b547782175603c
diff --git a/dev-python/Events/Events-0.5.ebuild b/dev-python/Events/Events-0.5.ebuild
new file mode 100644
index 000000000000..a61cda0c7710
--- /dev/null
+++ b/dev-python/Events/Events-0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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="Bringing the elegance of C# EventHandler to Python"
+HOMEPAGE="
+	https://pypi.org/project/Events/
+	https://github.com/pyeve/events
+"
+# No sdist in pypi as of PV=0.5
+SRC_URI="https://github.com/pyeve/events/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${P,,}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests unittest
diff --git a/dev-python/Events/Manifest b/dev-python/Events/Manifest
new file mode 100644
index 000000000000..89f6288ca703
--- /dev/null
+++ b/dev-python/Events/Manifest
@@ -0,0 +1 @@
+DIST Events-0.5.gh.tar.gz 13200 BLAKE2B c55361a0a31c0f01ae7c9e49ceb2ad6900384b0164d9ac8a5e289a8a80d9ab07f6439ee85f4ec77f0ae639b46e7c69c0f4b54341f9edfff05f865e0738315ff7 SHA512 3eb067bb2a8441eaf4801f25ced65afd7f6c253461c61a2e9bbdd87645718c72a7c13a66e46a6a48ef5b5857993f23a462a286937dc93a259bd02887a3dda6c6
diff --git a/dev-python/Events/metadata.xml b/dev-python/Events/metadata.xml
new file mode 100644
index 000000000000..6838d44b4c71
--- /dev/null
+++ b/dev-python/Events/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Events</remote-id>
+		<remote-id type="github">pyeve/events</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/Faker/Faker-26.0.0.ebuild b/dev-python/Faker/Faker-26.0.0.ebuild
deleted file mode 100644
index 630ce3773f17..000000000000
--- a/dev-python/Faker/Faker-26.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-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=( 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 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${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-26.1.0.ebuild b/dev-python/Faker/Faker-26.1.0.ebuild
deleted file mode 100644
index d05cd1263fd7..000000000000
--- a/dev-python/Faker/Faker-26.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-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=( 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${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-26.2.0.ebuild b/dev-python/Faker/Faker-26.2.0.ebuild
deleted file mode 100644
index d05cd1263fd7..000000000000
--- a/dev-python/Faker/Faker-26.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-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=( 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${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-26.3.0.ebuild b/dev-python/Faker/Faker-26.3.0.ebuild
deleted file mode 100644
index d05cd1263fd7..000000000000
--- a/dev-python/Faker/Faker-26.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-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=( 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${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-27.0.0.ebuild b/dev-python/Faker/Faker-27.0.0.ebuild
index ba0bb04960f1..ce5439e552ee 100644
--- a/dev-python/Faker/Faker-27.0.0.ebuild
+++ b/dev-python/Faker/Faker-27.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Faker-28.1.0.ebuild b/dev-python/Faker/Faker-28.1.0.ebuild
new file mode 100644
index 000000000000..ba0bb04960f1
--- /dev/null
+++ b/dev-python/Faker/Faker-28.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-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="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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${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-28.4.1.ebuild b/dev-python/Faker/Faker-28.4.1.ebuild
new file mode 100644
index 000000000000..ba0bb04960f1
--- /dev/null
+++ b/dev-python/Faker/Faker-28.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-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="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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${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/Manifest b/dev-python/Faker/Manifest
index 898ecefa1f8a..2e08e232d513 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,5 +1,3 @@
-DIST Faker-26.0.0.tar.gz 1763318 BLAKE2B 63cf76993c3e4fc229d5d80f3cd03d964f5f7f6fc7f9cb1aa272c075360ebec57289139d09d11d181436b30cdb5abc7fe7d7e5cc11d63e12b0e8746605f85d6a SHA512 ea09d4222b258f52e9d9b2c315ee46f42beb624c038f63d4a82baadafbf4a9cc382b92076bb7c421026c1761cadb246364bfc71a05177458a8e23d2eca2fd6e6
-DIST Faker-26.1.0.tar.gz 1763636 BLAKE2B 997d2449c70fd179a7bea5be93e05a916804b552bd7ac19360d99c9ec56f96a28838ccd854aa846842fed7d7cb83c6ed013d73696a551444a0f81a9236403f24 SHA512 8e2df35549c52f86cbca6f75629227bba45026b2174ba3757b9c80350b8e48674bd71412552db9133020f0b93065940fcbefbbc37d391cdddcddc6344fc1431b
-DIST Faker-26.2.0.tar.gz 1764867 BLAKE2B aa1a5bdb5b9867c3fced1b9fdcb53f600d7311b27122d0c7895c419c18e3c04d48ba07897e9052f99583f8319bad4b2262925b54dbe6434ca193c085c2c93bae SHA512 f5d1bb832f3f4e21b694ea77e941b6862066514a2970c665e36b1bfec76b3b05a19d7bfb0a962b08bb39cae53a3ed57b329a7a8f447d9f327ecf1bfd61e99d6d
-DIST Faker-26.3.0.tar.gz 1765030 BLAKE2B d255c03774adb173aaf1d004c96d5c2cbcd3d22e3c8ed0ea55cb93a2671ea1bd6fbe243f82b31d0ad96ff613bab3d452b3af806179aaf3b185ec027dc4a2d311 SHA512 71e63ebffe0c6c0a4761612adceac18bec8c6e8cb57e2ecbcbe91da6b6d7700d69c4417d45e9d3ec13d75b5c6d0aaaa0ee948d27a60e62dd9b644f69d21e1090
 DIST faker-27.0.0.tar.gz 1764992 BLAKE2B 4ddb83d76abd29eb2281bc27122632e098d3a09bb220881df60d9b67806f58d3c356229035f5316a3fe5dbab70db667d7b8d28d828b4585fc75736ecbc9f0186 SHA512 90b1b76f94066d6d27c4e857297b55b3675f96226cdbefd1bdd99a28599343ffee2b64edd3b15c6cb893ee2b4df446f079269609787a7ef054af3c6a03cca8a1
+DIST faker-28.1.0.tar.gz 1781898 BLAKE2B 4c18e70992e89b4638815afcd2be4a409e9caeb7e32f8903964491e4f687f25b0184dd3e4e9cd605e3fd0cdc33bd3b9be6573e60f98efaf18b0ddecdbf9355b1 SHA512 a312ccce960ee01452329bdf47289f8b4fc9362b1a10a445d93583eefae7c8aa94af363733babe56dd3c7df4a1e585c8a4f84e86d811fa2e1a6d050924c9ae95
+DIST faker-28.4.1.tar.gz 1794640 BLAKE2B 96a2f16b1d1906c1ae5263f8a2e782417fa6fb8062881d3700bf31b25892f27c612ebb64be925548c848e75e2e90d5761cc20a7b7bdb74119c95dfe3e5b871e5 SHA512 376b8e97ef654477ba549f0de50ef02979bf2595051f1a41b353a44bb734aa75171afa633ea76d3f02cf72f84dd12d268e28a4baba55fcb728fb4cd988b57e6a
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 15cdd1811bea..f9f0ce51c6cc 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,3 +1,2 @@
-DIST Nuitka-2.4.4.tar.gz 3719076 BLAKE2B 513a84e9b8ec222f14df253eab53c82edf2a663e97ac4b272481f2c3df306ad4d9c7b7785295718c68aadb02b04c8a31b0dc58f9ed0418ad2e530dbcff1f1cbf SHA512 9cdcb377d3e7c0a64e7bb76fa3b1ca7ef6b1590c91bae82e34638fd2bab8e1497a6683c4db243e51e4653b105af43dd86e071c5c33c3baf15e58ee81e1388ca0
-DIST Nuitka-2.4.5.tar.gz 3718921 BLAKE2B 23549ef422c635c644ff65e2a7f63729d538b6d7149d31b31251cc84232d8069be616a2cdf6878f0c54876dce1296afecdc6b76b0046bdec3c62a24bd5145cf0 SHA512 f582c9b28e673fd152e9a2cc567457412d7d0da64be94d466933c68e50464346657ed107f4042060eb837a8b1d1f0b182c50bd3e665ffe47b636f467a81a5a82
 DIST Nuitka-2.4.7.tar.gz 3719215 BLAKE2B afe2aa119db21d36377f41cbd8a20bdfb732ca5dc111ebc4156c9f4e12f3828d8d17ceb5423e49829fa2554a0e8416822af7148efb1efa14b49628f03b9791fc SHA512 08ab175180ed21ae0341cc88c9644351137054476fba00ee0c857c3c30f1a1da6c240fc9af873a9bc92faee657af11bd4108613a9c721ff27c6d73a603021ad0
+DIST Nuitka-2.4.8.tar.gz 3720021 BLAKE2B f3e89107e25baf0490e8dccba9c5e3e167fbdba395d21c8f9666a4f3e094c72fc295a7c57536deabaeb04dc0cb6682dcdf675f1305d5974e49e989c643aa6769 SHA512 da36c84e295f313c76d955498c8d4b46a57c162366dc9374188ae4bf236ad27df8a034c7942f089e1f4e196f44de27ab9d8dedeae991d9c29a51e86018eadb6f
diff --git a/dev-python/Nuitka/Nuitka-2.4.5.ebuild b/dev-python/Nuitka/Nuitka-2.4.5.ebuild
deleted file mode 100644
index 274aff9ae3b5..000000000000
--- a/dev-python/Nuitka/Nuitka-2.4.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_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-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}]
-"
-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.4.4.ebuild b/dev-python/Nuitka/Nuitka-2.4.8.ebuild
index 274aff9ae3b5..274aff9ae3b5 100644
--- a/dev-python/Nuitka/Nuitka-2.4.4.ebuild
+++ b/dev-python/Nuitka/Nuitka-2.4.8.ebuild
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index c597c0851392..c989642ae11f 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1 +1,2 @@
 DIST PyGithub-2.3.0.tar.gz 3455482 BLAKE2B 3638d5a101dcc41196a54f1a1e36dbc2dd53ab21fc2edd1945a036527979939da53dbf1cdd462622e851e891eae1264231b42c9f8a561740087d602a966d11b2 SHA512 7964b8ab1ad989e48b7d4cda42e7690cdd99c7f8d199e0eaa5ff5b2986592cef135e252253bef4f425cf04946ea18d8c83bcce4253914113fc9a21e83dc31166
+DIST pygithub-2.4.0.tar.gz 3476673 BLAKE2B 4f07b68c529d6eb3936768bd64ff3790f794c9c37d0aa1f34496d17f0423ac9501248874ffb954bc8a38c1fe04f43aa040e6cb151f00464effe6b98669459f04 SHA512 647ccc56d6108a5c08321c75552b59e5d7120fd3f45587579384f3a3a1cf500aceadf4e302ccf19d8655645be5d6a76263ec5f337b08b24d94c432bbe1cb5848
diff --git a/dev-python/PyGithub/PyGithub-2.4.0.ebuild b/dev-python/PyGithub/PyGithub-2.4.0.ebuild
new file mode 100644
index 000000000000..aa72bfba2f1b
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-2.4.0.ebuild
@@ -0,0 +1,43 @@
+# 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 library to access the Github API v3"
+HOMEPAGE="
+	https://github.com/PyGithub/PyGithub/
+	https://pypi.org/project/PyGithub/
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# cryptography via pyjwt[crypto]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/httpretty-1.0.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild
index ddd2a7ebcb51..4fbb1030c5f6 100644
--- a/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild
+++ b/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild
@@ -18,4 +18,4 @@ HOMEPAGE="https://github.com/Python-SIP/sip/"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index e9d3f8bb89cf..25840d70f239 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,2 +1 @@
-DIST PyQt6-6.7.0.tar.gz 1050408 BLAKE2B 30dc8a2762cb5a149c401d497af714bb9209bc46847c0699522ee60080c46f0b1d4da854e70151a508c90820a2aa32da422bfd20c4320bcc9b5d5f92fd9e8677 SHA512 619210d2de3e149b55e2d45cbd8ec2113b3effcaccd25eef6067ea99b82e250f1ce288b38136604536053690071f8c843339b934b5ce5e539a5dfdecc26f44d2
 DIST PyQt6-6.7.1.tar.gz 1051212 BLAKE2B 9c1c619b08cc14e0a92ea22812c14d5a3cb47e45eea917d50ab63918d8433d54b354f26b885f2567b9c6e2f0380e819972d055d1a1751f6646ebb5e6cf72b228 SHA512 1e0fec009e1823b06460fd96eddc00ed31388c20f6d832aa0ebaa130baf06d83514df43af7961c3cb2872570d27e539d6db7bf6143ccdfd61a19da7521be2c7e
diff --git a/dev-python/PyQt6/PyQt6-6.7.0.ebuild b/dev-python/PyQt6/PyQt6-6.7.0.ebuild
deleted file mode 100644
index feeb9ad16db7..000000000000
--- a/dev-python/PyQt6/PyQt6-6.7.0.ebuild
+++ /dev/null
@@ -1,180 +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
-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 ~ppc64 ~riscv"
-# 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 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 )
-	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] )
-	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.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.8[${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)
-		--disable=QtRemoteObjects # not packaged
-		$(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/PyQt6/PyQt6-6.7.1-r1.ebuild b/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild
index 22b44e005afe..547e2b8dcd27 100644
--- a/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
 # 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="
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 2ccfe14c06f4..3325b09b9312 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,2 +1 @@
-DIST PyQtWebEngine-5.15.6.tar.gz 48871 BLAKE2B af7c30a0d2e65e12a6eb4a2d3a40d72f94f16a5b4e509f9366be4bfb7d4358b27b3f9c0a7e4a2e7254d38950cbbd6bd4eb88e321949d4d9a44e6ea7e06c2f902 SHA512 f744fb0468ccbc79aad23d941c8e96d537ceeedfae215c7095dbf36b04b3dd042f0ff80aeca25a23715964b7d6db3bc80513f509d15c6dd6bd51e42a1a4e1975
 DIST PyQtWebEngine-5.15.7.tar.gz 32223 BLAKE2B 81c318e9117ccfad9f883e9282cdb93d936c7ee4def1ab927af2d1090e79f513f24e91455fa5b769fd5bb1094061e10a7f001f9c6172e51df4f50efac16a77e3 SHA512 0eede365bd0fa6eb60aa09443298a7afdb94497960ae31bf050311aec919c02a17ea13e57abe37e55f74d458acf34a6c3ab7f5895914742adc90e90a8c0eb442
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6-r1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6-r1.ebuild
deleted file mode 100644
index cd00a8de9888..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6-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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=sip
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	>=dev-python/PyQt5-5.15.5[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtwebengine:5[widgets]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-"
-
-python_configure_all() {
-	append-cxxflags ${CPPFLAGS} # respect CPPFLAGS notably for DISTUTILS_EXT=1
-
-	DISTUTILS_ARGS=(
-		--jobs="$(makeopts_jobs)"
-		--qmake="$(qt5_get_bindir)"/qmake
-		--qmake-setting="$(qt5_get_qmake_args)"
-		--verbose
-		$(usev debug '--debug --qml-debug --tracing')
-	)
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.7.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.7.ebuild
index 0db9a0ff2568..1e65c6b12cfb 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.7.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild
index dcb0869e1c15..2ff25b29dadf 100644
--- a/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/aiodns/aiodns-3.2.0.ebuild b/dev-python/aiodns/aiodns-3.2.0.ebuild
index 5af90048db85..444a647f57a7 100644
--- a/dev-python/aiodns/aiodns-3.2.0.ebuild
+++ b/dev-python/aiodns/aiodns-3.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/aiohappyeyeballs/Manifest b/dev-python/aiohappyeyeballs/Manifest
index a9d972e82c73..62e214942730 100644
--- a/dev-python/aiohappyeyeballs/Manifest
+++ b/dev-python/aiohappyeyeballs/Manifest
@@ -1,2 +1 @@
-DIST aiohappyeyeballs-2.3.6.gh.tar.gz 55205 BLAKE2B 7359b17a21e33247ea60a21c3303464e92841b8a6dbfb7c75380ce7bcc708f2f71e1041c6d976f467f99e16e55a22f516701a5439809dec4b6910b6a70c0d119 SHA512 637ac7f0fd5433f3f01b3289924fec53742d60f7b87696d2614c34e463324165135fe4111b2afb4499ed76d08a6759721aad5a2a6e62b227f1ff38cc936e0719
-DIST aiohappyeyeballs-2.3.7.gh.tar.gz 55283 BLAKE2B 4c8167fb646ed4f1b7472d170e75027abbf0b08908d4bb45d1d167403e8ff35382d654de7684750495305b09158ee3aa8951639d7c5e104ba2b4d22132c498f2 SHA512 c432e9cd9165f1f125280a78f616b09e276bfcb52ed76d498920bf0534450657f60061f4098df55dc2f9a27043ac094ce2f1431b328507173b6b35bd226a48db
+DIST aiohappyeyeballs-2.4.0.gh.tar.gz 55452 BLAKE2B 11e34818ed652b2904e78c7a48726d68118a6ecb811be8dcd5008acefd96093b8a2bf25bf92ebb79cdac4735100cec9ca05c856034900f8cda93f45be4f4d627 SHA512 8c2e931fa8b0423e1958a45ac5a040f35e9c0c4df7e4bd6662b5c0288fd25f64cce556cb386b27d07c7438b901a3468fa993c929a3b9c221fb5a318e7809db5a
diff --git a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.6.ebuild b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.6.ebuild
deleted file mode 100644
index 05fb16344a39..000000000000
--- a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.6.ebuild
+++ /dev/null
@@ -1,36 +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="Happy Eyeballs for pre-resolved hosts"
-HOMEPAGE="
-	https://pypi.org/project/aiohappyeyeballs/
-	https://github.com/aio-libs/aiohappyeyeballs/
-"
-SRC_URI="
-	https://github.com/aio-libs/aiohappyeyeballs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.23.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -o addopts=
-}
diff --git a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.7.ebuild b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.7.ebuild
deleted file mode 100644
index 05fb16344a39..000000000000
--- a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.7.ebuild
+++ /dev/null
@@ -1,36 +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="Happy Eyeballs for pre-resolved hosts"
-HOMEPAGE="
-	https://pypi.org/project/aiohappyeyeballs/
-	https://github.com/aio-libs/aiohappyeyeballs/
-"
-SRC_URI="
-	https://github.com/aio-libs/aiohappyeyeballs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.23.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -o addopts=
-}
diff --git a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.4.0.ebuild b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.4.0.ebuild
new file mode 100644
index 000000000000..df9b8d5d7cf4
--- /dev/null
+++ b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.4.0.ebuild
@@ -0,0 +1,36 @@
+# 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="Happy Eyeballs for pre-resolved hosts"
+HOMEPAGE="
+	https://pypi.org/project/aiohappyeyeballs/
+	https://github.com/aio-libs/aiohappyeyeballs/
+"
+SRC_URI="
+	https://github.com/aio-libs/aiohappyeyeballs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/pytest-asyncio-0.23.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio -o addopts=
+}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
index ced5f10eb24a..8bf06e127691 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 941f34bcbd70..83e49df98eef 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,2 +1 @@
-DIST aiohttp-socks-0.8.4.gh.tar.gz 13568 BLAKE2B a99513b4dd7ca75aca36979c0ace84adcabdc2fb1104d38ae49d07944fa1fb17a2a8da24fa395a33dabc00bc444710d23e911db427c895ec144ac1600d3d5983 SHA512 09a0ca9267ad822546bd47066b2f1b5f15364913da609fa5a2ebd0b0a8fd2f74e7413ab7e2f0970a777c5b853cc2fcae83e7af4eaa7cb4508d7644479ba8afd1
 DIST aiohttp-socks-0.9.0.gh.tar.gz 13590 BLAKE2B 1fb13b8607a9245d872d0ad45f50860492132c661d1a0f52fb846e56568d784f1545abab8f08bb2bd633460033f85982c80979c880841ccc40bcc0b2ae3f2ba4 SHA512 c19b8325270cbb660d9200e84c34a4c753097cdb282397bc31261c7082e184c947cab7821f63d326881f0ac4bb4104a813ebb8fc2b3df663f8891da246f0c789
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.8.4.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.8.4.ebuild
deleted file mode 100644
index db59f041a4ea..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.8.4.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-2.3.2[${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.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.9.0.ebuild
index e6948c7e7e8e..55bc1af8d1c5 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.9.0.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 0cd0e8a80955..1e1ca709506f 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,2 @@
-DIST aiohttp-3.10.1.tar.gz 7517572 BLAKE2B 4400cbda0997f3602ace4aae7ba153dcb515d49d8d3431fab087ebba3126d8fa82121998b1d8e36e2b86c9144a5c124ac16c12520cd47fea7956e6c04e2b4e55 SHA512 59f743ce7821b46da531eb576bbf20409407726b6ba78be9615f715ab2404cc3668120d2ec1566dcab7017ba36bf1753a3365b81097da53685c93ba013c3c94a
-DIST aiohttp-3.10.2.tar.gz 7520621 BLAKE2B a8e44ba6292e614ac9a7b15649a9838e354ca17bb14df61ccf9b1f2c0ce647e5786933701c85105a493b11e6a4c3edcb80e6ba43a501c4600a3b7b699c5c64f6 SHA512 61baa7a264a2bf38624a339b8e0ddc066aba7cb3da13d8e24fc705d4bf098796f198354c7b913a12ee3c8bc0c5468313432dad51f343c8dfc8efef020b385c88
-DIST aiohttp-3.10.3.tar.gz 7521618 BLAKE2B 2b5ff621d5b58f5c09060ee2e245fc758dde81741fa98ea9ee2215ea7f0f511f2732111af84df5d14075284376a619c3025fd6790d9a7c460d7e0b9a2cb8d8f2 SHA512 fabf06bb8556b5870be37c76c50664289227d79a0f322aef830ebbcbdd2429d4499a767c74f53c83b1622cbb8278c36294777baae84ee5b86fab652d7fcd5c7c
-DIST aiohttp-3.10.4.tar.gz 7524267 BLAKE2B dc79b89c215ea7c9dcaca674f84b1c13787e80bf32f791439958ad021a2abc650d3e69fef7cc6bad9455a82222ae4abed2392c8d4b3a98fb5fcb1e7c8242bcb8 SHA512 060286794f09e38dda3d5bdb6f5c0bd4cf8bc1eaaf58bf403a526f8afb50f53cb880d9ece1de70f4fb88d5e72357beceba86f33b9e77e748425ae636552406b8
+DIST aiohttp-3.10.5.tar.gz 7524360 BLAKE2B 57ca70d1a075ae7f9ba9b86a19be52e05e88518e28baefb16e852ce83707bfbad9cb06af08a2cea3371349649e85ab6dfb3426ee2759a4e84456041373575a8b SHA512 bb932d24b3ce332d8a232ef3bf1fbe9b0a7df9986ad5e81d5f41bc31a81204653e5250c4f0ee77a9eeb53d404bd907b12977d31caae54c00ef0146350629e750
 DIST aiohttp-3.9.5.tar.gz 7504841 BLAKE2B f051ee88d45952219f72d542f1c6d0cc33c699c6c5fb5dbe3bc054ee4d0e03121b219c8c8524fd1236a8b878329b0997b8afe07d6c66074102d4a2052a8738ff SHA512 da11468a2f131275593395b052700a99cf79055a32d48327dca0f58547ad30add8cd0a375dbd831e2f06fe7a739183251e4ad69c16f3d141799bbed45a8a5dc4
diff --git a/dev-python/aiohttp/aiohttp-3.10.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.10.1-r1.ebuild
deleted file mode 100644
index 3a7db9402219..000000000000
--- a/dev-python/aiohttp/aiohttp-3.10.1-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
-
-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="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="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.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="
-	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() {
-	local PATCHES=(
-		# https://github.com/aio-libs/aiohttp/pull/8623
-		# https://github.com/aio-libs/aiohttp/pull/8648
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	# 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_all() {
-	# 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
-}
-
-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
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			# upstream unconditionally blocks building C extensions
-			# on PyPy3 but the test suite needs an explicit switch,
-			# sigh
-			local -x AIOHTTP_NO_EXTENSIONS=1
-			;;
-	esac
-
-	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.10.2.ebuild b/dev-python/aiohttp/aiohttp-3.10.2.ebuild
deleted file mode 100644
index 47c2e84f4087..000000000000
--- a/dev-python/aiohttp/aiohttp-3.10.2.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
-
-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="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="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.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="
-	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_all() {
-	# 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
-}
-
-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
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			# upstream unconditionally blocks building C extensions
-			# on PyPy3 but the test suite needs an explicit switch,
-			# sigh
-			local -x AIOHTTP_NO_EXTENSIONS=1
-			;;
-	esac
-
-	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.10.3.ebuild b/dev-python/aiohttp/aiohttp-3.10.3.ebuild
deleted file mode 100644
index 47c2e84f4087..000000000000
--- a/dev-python/aiohttp/aiohttp-3.10.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
-
-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="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="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.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="
-	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_all() {
-	# 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
-}
-
-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
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			# upstream unconditionally blocks building C extensions
-			# on PyPy3 but the test suite needs an explicit switch,
-			# sigh
-			local -x AIOHTTP_NO_EXTENSIONS=1
-			;;
-	esac
-
-	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.10.4.ebuild b/dev-python/aiohttp/aiohttp-3.10.4.ebuild
deleted file mode 100644
index 47c2e84f4087..000000000000
--- a/dev-python/aiohttp/aiohttp-3.10.4.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
-
-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="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="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.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="
-	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_all() {
-	# 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
-}
-
-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
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			# upstream unconditionally blocks building C extensions
-			# on PyPy3 but the test suite needs an explicit switch,
-			# sigh
-			local -x AIOHTTP_NO_EXTENSIONS=1
-			;;
-	esac
-
-	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.10.5.ebuild b/dev-python/aiohttp/aiohttp-3.10.5.ebuild
new file mode 100644
index 000000000000..f744effd16d0
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.10.5.ebuild
@@ -0,0 +1,112 @@
+# 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+IUSE="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.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="
+	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_all() {
+	# 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
+}
+
+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
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			# upstream unconditionally blocks building C extensions
+			# on PyPy3 but the test suite needs an explicit switch,
+			# sigh
+			local -x AIOHTTP_NO_EXTENSIONS=1
+			;;
+	esac
+
+	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/files/aiohttp-3.10.1-py313.patch b/dev-python/aiohttp/files/aiohttp-3.10.1-py313.patch
deleted file mode 100644
index 03299a43a3c5..000000000000
--- a/dev-python/aiohttp/files/aiohttp-3.10.1-py313.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 02961d854c8f4277219699cd66970d1e90b371d4 Mon Sep 17 00:00:00 2001
-From: Steve Repsher <steverep@users.noreply.github.com>
-Date: Wed, 7 Aug 2024 07:51:50 -0400
-Subject: [PATCH] Fix monkey patches for pathlib changes in Python 3.13 (#8619)
-
-(cherry picked from commit d1c8dfbb11ea9989446e295fcee350255d5461c0)
----
- CHANGES/8551.contrib.rst        | 1 +
- tests/test_web_urldispatcher.py | 8 ++++----
- 2 files changed, 5 insertions(+), 4 deletions(-)
- create mode 100644 CHANGES/8551.contrib.rst
-
-diff --git a/tests/test_web_urldispatcher.py b/tests/test_web_urldispatcher.py
-index a799f4ba146..de44ea0648c 100644
---- a/tests/test_web_urldispatcher.py
-+++ b/tests/test_web_urldispatcher.py
-@@ -434,10 +434,10 @@ def mock_iterdir(self: pathlib.Path) -> Generator[pathlib.Path, None, None]:
-             raise PermissionError()
-         return real_iterdir(self)
- 
--    def mock_is_dir(self: pathlib.Path) -> bool:
-+    def mock_is_dir(self: pathlib.Path, **kwargs: Any) -> bool:
-         if my_dir.samefile(self.parent):
-             raise PermissionError()
--        return real_is_dir(self)
-+        return real_is_dir(self, **kwargs)
- 
-     monkeypatch.setattr("pathlib.Path.iterdir", mock_iterdir)
-     monkeypatch.setattr("pathlib.Path.is_dir", mock_is_dir)
-@@ -554,8 +554,8 @@ async def test_access_mock_special_resource(
-     real_result = my_special.stat()
-     real_stat = pathlib.Path.stat
- 
--    def mock_stat(self: pathlib.Path) -> os.stat_result:
--        s = real_stat(self)
-+    def mock_stat(self: pathlib.Path, **kwargs: Any) -> os.stat_result:
-+        s = real_stat(self, **kwargs)
-         if os.path.samestat(s, real_result):
-             mock_mode = S_IFIFO | S_IMODE(s.st_mode)
-             s = os.stat_result([mock_mode] + list(s)[1:])
-From 75ff8e12d0c95af9347bb16de785d028930f7228 Mon Sep 17 00:00:00 2001
-From: Steve Repsher <steverep@users.noreply.github.com>
-Date: Thu, 8 Aug 2024 10:55:35 -0400
-Subject: [PATCH] Fix response to circular symlinks with Python v3.13 (#8642)
-
-Co-authored-by: J. Nick Koston <nick@koston.org>
-(cherry picked from commit e494277110e40fb5c1cc65a1558dfea7d8ae7ca8)
----
- CHANGES/8565.bugfix.rst      | 1 +
- aiohttp/web_fileresponse.py  | 4 +++-
- aiohttp/web_urldispatcher.py | 9 +++++----
- 3 files changed, 9 insertions(+), 5 deletions(-)
- create mode 100644 CHANGES/8565.bugfix.rst
-
-diff --git a/aiohttp/web_fileresponse.py b/aiohttp/web_fileresponse.py
-index 7fc5b3d787f..d8bbbe08993 100644
---- a/aiohttp/web_fileresponse.py
-+++ b/aiohttp/web_fileresponse.py
-@@ -191,7 +191,9 @@ async def prepare(self, request: "BaseRequest") -> Optional[AbstractStreamWriter
-             file_path, st, file_encoding = await loop.run_in_executor(
-                 None, self._get_file_path_stat_encoding, accept_encoding
-             )
--        except FileNotFoundError:
-+        except OSError:
-+            # Most likely to be FileNotFoundError or OSError for circular
-+            # symlinks in python >= 3.13, so respond with 404.
-             self.set_status(HTTPNotFound.status_code)
-             return await super().prepare(request)
- 
-diff --git a/aiohttp/web_urldispatcher.py b/aiohttp/web_urldispatcher.py
-index 688946626fd..558fb7d0c9b 100644
---- a/aiohttp/web_urldispatcher.py
-+++ b/aiohttp/web_urldispatcher.py
-@@ -80,9 +80,9 @@
-     BaseDict = dict
- 
- CIRCULAR_SYMLINK_ERROR = (
--    OSError
-+    (OSError,)
-     if sys.version_info < (3, 10) and sys.platform.startswith("win32")
--    else RuntimeError
-+    else (RuntimeError,) if sys.version_info < (3, 13) else ()
- )
- 
- YARL_VERSION: Final[Tuple[int, ...]] = tuple(map(int, yarl_version.split(".")[:2]))
-@@ -694,8 +694,9 @@ def _resolve_path_to_response(self, unresolved_path: Path) -> StreamResponse:
-             else:
-                 file_path = unresolved_path.resolve()
-                 file_path.relative_to(self._directory)
--        except (ValueError, CIRCULAR_SYMLINK_ERROR) as error:
--            # ValueError for relative check; RuntimeError for circular symlink.
-+        except (ValueError, *CIRCULAR_SYMLINK_ERROR) as error:
-+            # ValueError is raised for the relative check. Circular symlinks
-+            # raise here on resolving for python < 3.13.
-             raise HTTPNotFound() from error
- 
-         # if path is a directory, return the contents if permitted. Note the
diff --git a/dev-python/aioitertools/Manifest b/dev-python/aioitertools/Manifest
index e7e9c654ffe1..d2328ef1a247 100644
--- a/dev-python/aioitertools/Manifest
+++ b/dev-python/aioitertools/Manifest
@@ -1 +1,2 @@
 DIST aioitertools-0.11.0.tar.gz 32053 BLAKE2B 1dea436f26f738b72aa2a2085d102b7228250f463cbc0cc45d8875a3a78e5468b3d3e7149f2df8754dbc6611f4f62e79ad263669a1f228e576fc2807d2f2f135 SHA512 ed2ca827ad72eadb541eab6621bb3d4a654f5f35a8ec185906aac558e2f7b7d6956e24b57b8540d48fdf48e6f630547ec0cc83627307c227bfc33bf1bf44c451
+DIST aioitertools-0.12.0.tar.gz 19369 BLAKE2B c19cc1590ecef5889bf48045a2ad342bab2c5e57615dc3bbdc6f786db240eade5adb6bc4187084c1b88ac66f30c51e9bc46c17672a953e2c4e4926762fa53c8a SHA512 759db7a6f1158f829ed1c8d80fe9c7951b15cb6eaa4560b2c7d6df52fc4bc4d3c8ef4dd2468fef2a61292176b229076f4a57ed025b815ce9720f286dbd10e131
diff --git a/dev-python/aioitertools/aioitertools-0.12.0.ebuild b/dev-python/aioitertools/aioitertools-0.12.0.ebuild
new file mode 100644
index 000000000000..57160f74075f
--- /dev/null
+++ b/dev-python/aioitertools/aioitertools-0.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="itertools and builtins for AsyncIO and mixed iterables"
+HOMEPAGE="
+	https://aioitertools.omnilib.dev/
+	https://github.com/omnilib/aioitertools/
+	https://pypi.org/project/aioitertools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+python_test() {
+	"${EPYTHON}" -m aioitertools.tests || die
+}
diff --git a/dev-python/aiosignal/aiosignal-1.3.1.ebuild b/dev-python/aiosignal/aiosignal-1.3.1.ebuild
index 5a8d09aa4cc9..082a19dd0bbe 100644
--- a/dev-python/aiosignal/aiosignal-1.3.1.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
index b6cdd1ffb285..0fe574c996f3 100644
--- a/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
+++ b/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/atpublic-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 4f51b4fdfad9..631883ed7489 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1 +1,2 @@
-DIST ansible-compat-24.7.0.gh.tar.gz 74311 BLAKE2B 8f534989f4ef88aa48379cdf3a8df83f9d51b4d18d2bfdea8b7d2aac19bd0a6d2c52f3382e774a29bb02e1460b316fbf7c97efeb7105a0a05614b318763cc79d SHA512 5c0ad52adf346d0b3c3fda38d24f05beefef478414c0d7b418cb2768f0237c8155f260e8be2d8ca16097955159095348d31966b5f10b33198d83b24fe5d42251
+DIST ansible-compat-24.8.0.gh.tar.gz 74341 BLAKE2B ce6edf8ed532815f2e307ac51eef0ac694805b0d5f8cad78c75c57478a21eb443348d636ca0e405fe63d32daf0f426c20e0f97183082f0eba3dd4b889fb8be80 SHA512 07da3a5d4f6eaa6edec3a03107d6e751e9754a84420a9839239d17811de01e8c70bed84e8c23a1308d18e8388581b0e269ae03c235bbc244e95a29c3be25567b
+DIST ansible-compat-24.9.0.gh.tar.gz 75290 BLAKE2B 0482d9eba967d4d846e35f3a2754410e1f42d34e451b2cf42bcbb88155fdf90859b9fbf6ead28a6e8c252d3a37522c1d1c903a38d4e47ba427678bc39d3c8e9c SHA512 e6803e598fabb1097bf0f10a7b9592af97152d108bc89a29547546de0eaa87ebba9232e78aeababb3ffd94c58af8b93499de9c059a6c42d04179d02b50d92a0f
diff --git a/dev-python/ansible-compat/ansible-compat-24.7.0.ebuild b/dev-python/ansible-compat/ansible-compat-24.8.0.ebuild
index 46709b728469..46709b728469 100644
--- a/dev-python/ansible-compat/ansible-compat-24.7.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-24.8.0.ebuild
diff --git a/dev-python/ansible-compat/ansible-compat-24.9.0.ebuild b/dev-python/ansible-compat/ansible-compat-24.9.0.ebuild
new file mode 100644
index 000000000000..18c39cfc27c2
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-24.9.0.ebuild
@@ -0,0 +1,57 @@
+# 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..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+# We normally use PyPI here but 4.1.12 has never been uploaded there for some reason
+SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.14[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.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_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
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/apprise/Manifest b/dev-python/apprise/Manifest
index dac209227bae..c5ccd1905d8b 100644
--- a/dev-python/apprise/Manifest
+++ b/dev-python/apprise/Manifest
@@ -1 +1,2 @@
 DIST apprise-1.8.1.tar.gz 1696426 BLAKE2B ddc8966716e89a3e18995370e90f20c080a1249faccdbcf5f28fb22a89dc3f415c33208a5c98352307a28a65b45e305d1b9c3e2df52f6f6f017197a6f893a101 SHA512 b0e5d760ad8fcbecaa51de8e398abbb8766ef8a52bbd9cbd7f77156e4e00194adc1e18e0b6a95c611863ae72162041971408744348a7ea9e6579f4f4aae15f04
+DIST apprise-1.9.0.tar.gz 1753505 BLAKE2B 83dda79cb585387ba3fa0405126274c35bee20e40a91e699441f56341f411e16dd62ff73115e6cde42e0184afffcaa4cb0783e082d0b2c1ed59a58839cfe9c73 SHA512 9b1ebc18f1662cea35186ddf28182e5507d7faf6e13770a4d6448f129c9d4659665ddf502e0cc7e6bd2e67cda41ee94cd0898f53b986af0daae5f905ccdab2eb
diff --git a/dev-python/apprise/apprise-1.9.0.ebuild b/dev-python/apprise/apprise-1.9.0.ebuild
new file mode 100644
index 000000000000..d6fb609e2b6c
--- /dev/null
+++ b/dev-python/apprise/apprise-1.9.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 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 ad0fba9c1b09..42e1c2457df9 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1 +1,2 @@
 DIST apsw-3.46.0.1.gh.tar.gz 912632 BLAKE2B b2c89def11102a00dde64fa7d7546f50e302dfe4219394d3d6ddd7f66fec455a60689db61a94230f7ef9578069b08ecd826de82b4e8b019107b9a0b6a36c4271 SHA512 894cf6c49d608d9d8eff369dcf42dd3b2f5174cd98a2c471f41773e2c1474c13d31f08402d053fd0869acb5c038e26543caa345d205c46bd3b3ec6aaecda5089
+DIST apsw-3.46.1.0.gh.tar.gz 913223 BLAKE2B c0ad61e61a97471ef677ffe80f3f91e6520c95f8cece225a8086884f34de497714892e4ce0ca375f2ec66f48b8ecb4d38dd5ebdb57cd94050ef5eaee20d5d3ee SHA512 3cd81ceab03dadf10d9c10d645d33b962ba9ec55075bb193eb076f458dde11d5c5c6ec087ec31fc96d011ca1b339a9ffe07cb5d660b8205f6f156baaa0b18c81
diff --git a/dev-python/apsw/apsw-3.46.1.0.ebuild b/dev-python/apsw/apsw-3.46.1.0.ebuild
new file mode 100644
index 000000000000..7b49484a85a9
--- /dev/null
+++ b/dev-python/apsw/apsw-3.46.1.0.ebuild
@@ -0,0 +1,51 @@
+# 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/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 0741c0f41e79..da657160e57f 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,2 +1 @@
-DIST argcomplete-3.4.0.tar.gz 82275 BLAKE2B 18b81aa5ee0c148a3b935f157f4c39b0ade79b36c8e3aa94aa7af8a424a08793a4cf661cb2431c201d5eead02e12c35b78d351310ff4e4e750bf7d7dc702ca89 SHA512 bd619a34edf1f1d05bdfab7fa830d1fc5375bc292dc95b95ddc4d3bfaced5728067e6ad0a901f672b7e0d5a550c10b00e0851f83cf9b358301c037da256a4a56
 DIST argcomplete-3.5.0.tar.gz 82237 BLAKE2B 7a5acd6f1311ec153333363e207037634b6901cca1415bd68d8e009888fa8cdfdfc3a50189f14c5da4bddfa5c861bbc009cf0d34248ff168caaa6ebad6ad8a7d SHA512 89c305a97b0808301976a48f9c8cb914e7cc12e33540cebd1c6514bbed8017db27b2232e3526abb74fe4f152f23c211be5a48aeafd63bbfca2dcc42f92b4877e
diff --git a/dev-python/argcomplete/argcomplete-3.4.0.ebuild b/dev-python/argcomplete/argcomplete-3.4.0.ebuild
deleted file mode 100644
index 2ffbb53fef53..000000000000
--- a/dev-python/argcomplete/argcomplete-3.4.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..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 ~ia64 ~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.0.ebuild b/dev-python/argcomplete/argcomplete-3.5.0.ebuild
index 645def2f41b7..2ffbb53fef53 100644
--- a/dev-python/argcomplete/argcomplete-3.5.0.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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/astroid/Manifest b/dev-python/astroid/Manifest
index 4a50ba467d9d..1056af689daf 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,3 +1,2 @@
 DIST astroid-3.2.4.gh.tar.gz 465788 BLAKE2B 745a860b7bacb45cb86e9b232fe3a37cdac40cb471b00832a7dd7da4c3374760749cebe8c8688748e750cc3639554515a7a9e24f5f4d2ebac10af2c906fa04a9 SHA512 e48289794f67cf53bb8a2dcf357c1e892140a0a625c2e19601cf5ad579aaa33a94f0e052915fa6e854bc0a2e626f41b2d13773aa2b2af2412efeb33d030ed2b6
-DIST astroid-3.3.1.gh.tar.gz 464132 BLAKE2B 011b61777ce4f3900ed1c23a664b7ae0c16e364f61cd664078d78bf6a90097f423afe03579e151439a9b02874e2fa12844f0587632e1bf1f40b428d2d99cc6da SHA512 992f80c30fdb02d283e73d1329a58ddd10a4f800e74b4697086b194a329ff6ae7ae026c907317e9604371a60cb814f243f2506d921d196214f11741f098485c1
 DIST astroid-3.3.2.gh.tar.gz 464183 BLAKE2B a891a57ce697e539b865ead8f1a1a42aa57962d1ac3cb39624f3c8cac1a233ce5ed207a87f6b8ef0b2fcacc296610819d5612262a6fbfe08eed20a2955b168c4 SHA512 dc9777e701f0bf3dc5367da8e7c79eeba18f485ad1425f8e3e50814efef9f8fd0e11f30363d1c602cfd05c51b2b2e9749989da1413db59c9f648fbc47cfbc8ae
diff --git a/dev-python/astroid/astroid-3.3.1.ebuild b/dev-python/astroid/astroid-3.3.1.ebuild
deleted file mode 100644
index 8e3e4ee5cfc6..000000000000
--- a/dev-python/astroid/astroid-3.3.1.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 ~ia64 ~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.2.ebuild b/dev-python/astroid/astroid-3.3.2.ebuild
index 8e3e4ee5cfc6..b93d44fd7e2a 100644
--- a/dev-python/astroid/astroid-3.3.2.ebuild
+++ b/dev-python/astroid/astroid-3.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/async-timeout/async-timeout-4.0.3.ebuild b/dev-python/async-timeout/async-timeout-4.0.3.ebuild
index 74991e5d0711..74dfcd491b01 100644
--- a/dev-python/async-timeout/async-timeout-4.0.3.ebuild
+++ b/dev-python/async-timeout/async-timeout-4.0.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest
index eefc2782e1b2..c0aa16273a9e 100644
--- a/dev-python/asyncssh/Manifest
+++ b/dev-python/asyncssh/Manifest
@@ -1,2 +1,2 @@
-DIST asyncssh-2.15.0.tar.gz 516935 BLAKE2B 0e67dc6c2d7814479241d81e06d6a5290a99802490c097769137673980b798122718a3af99c6d71a3fb08b37d4e3e0c4cfc2fb69523b2b76c88cdbf638fd42ee SHA512 51f43bfcf27dadd9e79d7b306b11f6dc196d2de65a60663aa6e59f1b1246a6467a6324209bfb0607a9d2902ef8dde51cd172f9e32e36168954c67b8fcd7e1dd6
 DIST asyncssh-2.16.0.tar.gz 520697 BLAKE2B 113e079045dd0543966cc9de86c6de453f0da0803955a69948368f015e340f801a99db3cc15c97eaf0030c36edf92ad40071dcfbcd80f6243f8467ba311bb979 SHA512 d47a0450709e48cc781f03dc2fc1f153f4fd59bce59354085ff36ef3af37223071566136d5a48211024db41400e7b82b918921942d8f5df203b98275e6fd460a
+DIST asyncssh-2.17.0.tar.gz 515658 BLAKE2B a07cfab65b0d2df09b1a6b93d81f9385571da154953bddefe5e45b8b1c1800c5ad765030f11154de85f03ff946d2b58954ea0dbd15fb468215482c6a9be6168c SHA512 be4d25185008dacde8369249ae8321c403590423dd6f088ca6568333be9e96a93509f9663e5292d5bbe27ea20064bc530f0867dd05aef2a453bc1f8eeff1ed40
diff --git a/dev-python/asyncssh/asyncssh-2.15.0.ebuild b/dev-python/asyncssh/asyncssh-2.17.0.ebuild
index 8dd7162e4b4b..8dd7162e4b4b 100644
--- a/dev-python/asyncssh/asyncssh-2.15.0.ebuild
+++ b/dev-python/asyncssh/asyncssh-2.17.0.ebuild
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index b35edc94b279..36f7a47e196b 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,2 +1,2 @@
-DIST asyncstdlib-3.12.3.tar.gz 47118 BLAKE2B 83967dc89c0a5fab13ff5f3cebec739644ba16479bf661447c179b491897be0a5933f6ae724f942643d349cef8eaff66cf621c565459b1b8774e93bc51e472ee SHA512 239f0741a694f58e359422bce1e54f6f7e3b1522f10ed4cfd137f4cd8c9861156744d7efa98ab155dd0aa489dbdc452c095d60b77922c6b53177708a65a26d86
 DIST asyncstdlib-3.12.4.tar.gz 47279 BLAKE2B 855f4ebb5619ab4aec429b551fb410855da150916416636737c980712e981a8f3b7339f7691d4fa1ee3439911d6e0733ff2431a520d515b836b183848cfb3013 SHA512 33da70653166525009680cd78e6bb7dabb8518babb73caac26dbea9dbd0b73898d1ffe17755f1505dde1c6a3407c0a31743ea60a66af1b30a587ec39fc4014ff
+DIST asyncstdlib-3.12.5.tar.gz 49063 BLAKE2B d956683758b605323e9c4c12b401e2f123c4ad7677e8b64fd3909a95d1f973b0eb1a6116cf01231b92209f0d75dac3ef6806f6938fc9e59e4d1e860ecc7e7f71 SHA512 cf93bb6f867ac7cbea7cb707d491bfbb4da3c09eb6916cdd383a896d3e9cec64a23216129a54e1b87796cdff7ae539a340d726c58b160175a745d98466e66c05
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.12.3.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.12.3.ebuild
deleted file mode 100644
index b9853014080d..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.12.3.ebuild
+++ /dev/null
@@ -1,45 +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 pypi
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/maxfischer2781/asyncstdlib/issues/144
-				# (already skipped upstream)
-				'unittests/test_functools_lru.py::test_method_discard[classmethod_counter-3]'
-				'unittests/test_functools_lru.py::test_method_discard[classmethod_counter-10]'
-				'unittests/test_functools_lru.py::test_method_discard[classmethod_counter-None]'
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.12.5.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.12.5.ebuild
new file mode 100644
index 000000000000..a2eea4011b68
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.12.5.ebuild
@@ -0,0 +1,32 @@
+# 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 pypi
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/atpublic/atpublic-5.0.ebuild b/dev-python/atpublic/atpublic-5.0.ebuild
index e26cab09e31b..669d6f169a5e 100644
--- a/dev-python/atpublic/atpublic-5.0.ebuild
+++ b/dev-python/atpublic/atpublic-5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index b2a3940b7a81..df232cb3bd3b 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,3 +1 @@
-DIST attrs-23.2.0.tar.gz 780820 BLAKE2B a06f4f17a81fc173c37661bcf518367a1cdc9a333d2783bd2cd1ac5f0a72bd20ec1afdd964e10255624bcfa027e3a152375cd21472c177428d29bd06b29984a1 SHA512 d8b178072a028b95d8424cd3ce0c8b4e6da8558fbcbcaaef91fbd03cf51e6190aa248aa0bff853e6f7c9595bbd5a8eef9d6f68ae2830cc1cc6d826ab0dda2378
-DIST attrs-24.1.0.tar.gz 792572 BLAKE2B ece012327c6fd5de771376dd70a5a739a282c22cf7fe536d943072193dc45cc5efcf492fe40c46e837bd036109ca01073dd10aec6e116efa668af0872cc51a3a SHA512 dd84da9b06f5da2724d834c1b8b3ffb5d745d49c8a168e0503ca7572561b2021562b5bbfeea133a7d097fc9423a05494f372e72a9fcc25ada2f745c34a80fdab
 DIST attrs-24.2.0.tar.gz 792678 BLAKE2B f5110f5bf4b848a929a3766985fc49ee8da346398c26d0f786a12d89e7596ec7165bdefaae4b2716003c4b3ad7fcc619ec2f5e0d184df899318a7bb02c9919a4 SHA512 fcd14ff79a09a0b2b56734c460b5c43836999b6ed27665038ff7a146f53891b31ab3da07df05f1686474507f342bfce09bc0a6a60865c241e58f7ce8423dc968
diff --git a/dev-python/attrs/attrs-23.2.0.ebuild b/dev-python/attrs/attrs-23.2.0.ebuild
deleted file mode 100644
index 96b89f367504..000000000000
--- a/dev-python/attrs/attrs-23.2.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=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 ~ia64 ~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
-
-PATCHES=(
-	# https://github.com/python-attrs/attrs/pull/1249
-	"${FILESDIR}/${P}-pytest-8.patch"
-	# https://github.com/python-attrs/attrs/pull/1255
-	"${FILESDIR}/${P}-py313.patch"
-)
diff --git a/dev-python/attrs/attrs-24.1.0.ebuild b/dev-python/attrs/attrs-24.1.0.ebuild
deleted file mode 100644
index d4334e9fcb82..000000000000
--- a/dev-python/attrs/attrs-24.1.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 ~ia64 ~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.2.0.ebuild b/dev-python/attrs/attrs-24.2.0.ebuild
index d4334e9fcb82..1cd57aa59c5f 100644
--- a/dev-python/attrs/attrs-24.2.0.ebuild
+++ b/dev-python/attrs/attrs-24.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-python/hatch-fancy-pypi-readme-23.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/attrs/files/attrs-23.2.0-py313.patch b/dev-python/attrs/files/attrs-23.2.0-py313.patch
deleted file mode 100644
index f7ea8f5e659f..000000000000
--- a/dev-python/attrs/files/attrs-23.2.0-py313.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From f9ff9135b472c78a7333d6272c62b92217897464 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
- <frenzy.madness@gmail.com>
-Date: Thu, 7 Mar 2024 10:23:46 +0100
-Subject: [PATCH] Fix test_ne in test_cmp.py for Python 3.13 (#1255)
-
-* Fix test_ne in test_cmp.py for Python 3.13
-
-Compiler in Python 3.13+ strips indents from docstrings
-so they need to be compared without it for new Pythons.
-
-Fixes: https://github.com/python-attrs/attrs/issues/1228
-
-* [pre-commit.ci] auto fixes from pre-commit.com hooks
-
-for more information, see https://pre-commit.ci
-
----------
-
-Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
----
- src/attr/_compat.py |  1 +
- tests/test_cmp.py   | 11 +++++++----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/attr/_compat.py b/src/attr/_compat.py
-index 46b05ca..9010047 100644
---- a/src/attr/_compat.py
-+++ b/src/attr/_compat.py
-@@ -14,6 +14,7 @@ PY_3_8_PLUS = sys.version_info[:2] >= (3, 8)
- PY_3_9_PLUS = sys.version_info[:2] >= (3, 9)
- PY310 = sys.version_info[:2] >= (3, 10)
- PY_3_12_PLUS = sys.version_info[:2] >= (3, 12)
-+PY_3_13_PLUS = sys.version_info[:2] >= (3, 13)
- 
- 
- if sys.version_info < (3, 8):
-diff --git a/tests/test_cmp.py b/tests/test_cmp.py
-index 07bfc52..b84b66f 100644
---- a/tests/test_cmp.py
-+++ b/tests/test_cmp.py
-@@ -4,10 +4,10 @@
- Tests for methods from `attrib._cmp`.
- """
- 
--
- import pytest
- 
- from attr._cmp import cmp_using
-+from attr._compat import PY_3_13_PLUS
- 
- 
- # Test parameters.
-@@ -54,6 +54,9 @@ order_ids = [c[0].__name__ for c in order_data]
- cmp_data = eq_data + order_data
- cmp_ids = eq_ids + order_ids
- 
-+# Compiler strips indents from docstrings in Python 3.13+
-+indent = "" if PY_3_13_PLUS else " " * 8
-+
- 
- class TestEqOrder:
-     """
-@@ -325,7 +328,7 @@ class TestDundersUnnamedClass:
-         method = self.cls.__ne__
-         assert method.__doc__.strip() == (
-             "Check equality and either forward a NotImplemented or\n"
--            "        return the result negated."
-+            f"{indent}return the result negated."
-         )
-         assert method.__name__ == "__ne__"
- 
-@@ -393,7 +396,7 @@ class TestDundersPartialOrdering:
-         method = self.cls.__ne__
-         assert method.__doc__.strip() == (
-             "Check equality and either forward a NotImplemented or\n"
--            "        return the result negated."
-+            f"{indent}return the result negated."
-         )
-         assert method.__name__ == "__ne__"
- 
-@@ -465,7 +468,7 @@ class TestDundersFullOrdering:
-         method = self.cls.__ne__
-         assert method.__doc__.strip() == (
-             "Check equality and either forward a NotImplemented or\n"
--            "        return the result negated."
-+            f"{indent}return the result negated."
-         )
-         assert method.__name__ == "__ne__"
- 
--- 
-2.45.0
-
diff --git a/dev-python/attrs/files/attrs-23.2.0-pytest-8.patch b/dev-python/attrs/files/attrs-23.2.0-pytest-8.patch
deleted file mode 100644
index 68e4c86c1315..000000000000
--- a/dev-python/attrs/files/attrs-23.2.0-pytest-8.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b9084fab02c009a593b604562a69f36a5915c8e5 Mon Sep 17 00:00:00 2001
-From: Denis Laxalde <denis@laxalde.org>
-Date: Sat, 2 Mar 2024 07:40:36 +0100
-Subject: [PATCH] Remove pytest.deprecated_call() in TestAssoc::test_unknown
- (#1249)
-
-assoc() no longer raises a deprecation warning since commit
-22ae8473fb88d6e585b05c709e81e1a46398a649 but the 'with
-pytest.deprecated_call():' in that test was not removed then (in
-contrast with other test cases).
-
-Maybe this got unnoticed due to a pytest bug?
-In any case, using pytest 8+ (and keeping deprecated_call()) shows that
-no warning is raised and the test fails.
-
-Removing the upper bound on pytest in dev dependencies as tests now
-pass with pytest 8.0.
-
-Fix #1233.
-
-Co-authored-by: Hynek Schlawack <hs@ox.cx>
----
- pyproject.toml      | 3 +--
- tests/test_funcs.py | 4 +---
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_funcs.py b/tests/test_funcs.py
-index 044aaab..398ba35 100644
---- a/tests/test_funcs.py
-+++ b/tests/test_funcs.py
-@@ -600,9 +600,7 @@ class TestAssoc:
-         AttrsAttributeNotFoundError.
-         """
-         # No generated class will have a four letter attribute.
--        with pytest.raises(
--            AttrsAttributeNotFoundError
--        ) as e, pytest.deprecated_call():
-+        with pytest.raises(AttrsAttributeNotFoundError) as e:
-             assoc(C(), aaaa=2)
- 
-         assert (f"aaaa is not an attrs attribute on {C!r}.",) == e.value.args
--- 
-2.44.0
-
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 67a71d3d4c1e..46a04a288686 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,2 +1 @@
-DIST Automat-22.10.0.tar.gz 59099 BLAKE2B 509e64b1312f87f09a60243a00b832c8b3da4b09ef75151e82c8c406faabd24a56378baade87bd98685fa22922d1892ec20d81579eaf13e0315af68bb7909ac4 SHA512 5819cfe0687bf391949891562f3657f449cf9a8e8ea90c1537e89509dc618da1160856f92ab52dc450e0a7d51d0e4644bfe2db3d4108126a42ee1bea2f06bb7a
-DIST automat-24.8.0.tar.gz 128649 BLAKE2B 99ac2470cde44237dc4a0efee0bc962e5b2cd8a8caa9082e75d5a89799da8b39320e08e714a1a1e538468eb1366d426aa55503168385a78ead18aedd6233bafb SHA512 8cc93d3783a23e716aef099c359ecbf7f4feb34e875752a74cd8dfed410412ddffaa84d1939672a8605b6f77925402c6e518c04c6029dc6f0b33fa925fdda0b7
+DIST automat-24.8.1.tar.gz 128679 BLAKE2B 17da0371ac3b7fc46f1521b4ee646395c82838dd811971fcc30e0baf5176686dd914fcbc18be56401e3cbbd92400398c70c46c686b7f9aa26fa2917d70938f28 SHA512 f42344a665f7cf31cf53274e4371c06b008818373a666ab3dfd2874bd9cf9a842c5999f1fa21978e7ccd583ddcadecbf9515d1d1d9b60744164cdc58717fb339
diff --git a/dev-python/automat/automat-22.10.0.ebuild b/dev-python/automat/automat-22.10.0.ebuild
deleted file mode 100644
index 5c0effe3f064..000000000000
--- a/dev-python/automat/automat-22.10.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_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="
-	https://github.com/glyph/automat/
-	https://pypi.org/project/Automat/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	benchmark
-)
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install both these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/automat-24.8.0.ebuild b/dev-python/automat/automat-24.8.0.ebuild
deleted file mode 100644
index 609c8cc0eae3..000000000000
--- a/dev-python/automat/automat-24.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=setuptools
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="
-	https://github.com/glyph/automat/
-	https://pypi.org/project/Automat/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	benchmark
-)
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install both these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/automat-24.8.1.ebuild b/dev-python/automat/automat-24.8.1.ebuild
new file mode 100644
index 000000000000..beb63a8d1e8c
--- /dev/null
+++ b/dev-python/automat/automat-24.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="
+	https://github.com/glyph/automat/
+	https://pypi.org/project/Automat/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	benchmark
+)
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install both these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index eed4497fb734..f9877e17e0bd 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1 @@
-DIST serverless-application-model-1.89.0.gh.tar.gz 5659213 BLAKE2B 1b8128c904ee1db34e722e0e4d5e7a0b16685dfbc589c390e34679b75481afad963a30f40d18bedb29010f62a338d1818da957ce6b58b7ee63d83444dccfc8ac SHA512 899fe08f3a16669de86ad3861d1072017af5fb3d2254583e502970c77e280d0ccb39b6a8f7e647acb94fb0cc6305aba35a98663427114764300d69f9c3b5e2fe
-DIST serverless-application-model-1.90.0.gh.tar.gz 5707682 BLAKE2B c587baee9e3a17a98eef7098d24f2f5d5ba0bf1e965a3ee9ad3d93f855134f99b46bbe7e0e065270e3e227f526f7e09e73894672a3e639e6a6a76a881a7e782d SHA512 b99d6ac8cbebca191cf1a46041c4a599ba6bf26f0c373243760bd5034dcb9e09e1754e5c9aa0132abb364111aa209ad784987bc533a9644de332ce91ff881f46
+DIST serverless-application-model-1.91.0.gh.tar.gz 5710886 BLAKE2B 29d5825610e8e3253cd9d5659a65659f39c3a423061eb0e6ac754fcf3a943aa87799653e26dd901ae94b71c7290f791f6a8b16d089fa43c9f0cd3f3bbf973a34 SHA512 04cb4f61673005928b2361a8c9d304c5d29719a32dd962da0c34d3685d8bc4c8282d7fb61f6d228e3de6a5a037405a8ecacdc020bc9ace229fcbdb22ad99902e
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.90.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.90.0.ebuild
deleted file mode 100644
index d44f5d73eece..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.90.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
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 multiprocessing
-
-MY_P=serverless-application-model-${PV}
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	<dev-python/pydantic-3[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# so much noise...
-	sed -i -e '/log_cli/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AWS_DEFAULT_REGION=us-east-1
-	epytest -o addopts= -o filterwarnings= \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.89.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.91.0.ebuild
index 98b4f74477da..98b4f74477da 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.89.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.91.0.ebuild
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
new file mode 100644
index 000000000000..23990ee86a4a
--- /dev/null
+++ b/dev-python/backports-ssl-match-hostname/Manifest
@@ -0,0 +1 @@
+DIST backports.ssl_match_hostname-3.7.0.1.tar.gz 5722 BLAKE2B fcacafd3963070adb3593003244cb5b64ba5dcf3f623afccb689ffa6546b59ac858b60a7c240b3074927974460746e3396e4c61ce61e1aad0c6bbf0b80dc2f61 SHA512 9048ed093dc8a166a80d16a9aa0e06d36ea43ce7d324818608d25b1ef5057b1c66dd3514f9b35ab13bc60b2e5a3de29e690607e928fac2c9df16506759bd14dd
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.7.0.1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.7.0.1.ebuild
new file mode 100644
index 000000000000..216dc83cbc23
--- /dev/null
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.7.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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 pypi distutils-r1
+
+MY_PN=${PN/-/.}
+MY_PN=${MY_PN//-/_}
+DESCRIPTION="The ssl.match_hostname() function from Python 3.7"
+HOMEPAGE="
+	https://pypi.org/project/backports.ssl_match_hostname/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}" "${PV}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+python_prepare_all() {
+	sed -e 's:from distutils.core:from setuptools:' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backports-ssl-match-hostname/metadata.xml b/dev-python/backports-ssl-match-hostname/metadata.xml
new file mode 100644
index 000000000000..9e6f1b35e1aa
--- /dev/null
+++ b/dev-python/backports-ssl-match-hostname/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>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports-ssl-match-hostname</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index 82c521af62f8..1cc5c4c21723 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,4 +1,4 @@
-DIST bareos-22.1.4.tar.gz 14747141 BLAKE2B 1b155c35f22120b07151a54ef314c6f8f42ea14c3f194d787a58ece41f8de148f0b34d0cc6a54f578b1bb5c4d3ae2a7736829f6d2cd642d8e001f1797a18052a SHA512 4285f0f524c6f30ae8f7dd67e2a732cf983663f56b053968a7f10d753e38bc2ee1e2673d1fb6a9b516994b51b45215fac153e301b893c9cb31a164ebff0d4c85
 DIST bareos-22.1.5.tar.gz 14747894 BLAKE2B 560bc1ceb34fccfb370e8643d24917e24b2440158dd267532c2cb7e4a543d29b81b033e7a34c46eda4c6d71165e48da9332605c3bcd073fbafa38f3ba8be69a2 SHA512 8138f2142f705e2448f8bc2e00f39fe4f734ce8fe687e3cf00c9ff9bda9a3df73ebd7fb86d850ba755588cdaca324e1ba9034987ecb975ce47dd279395ee03b4
-DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
+DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
 DIST bareos-23.0.3.tar.gz 14744648 BLAKE2B be31a4284ff2ff97ace51f895637cfafac666d4e9d95524e5e03d22798427ff551419422fb41783d3fda7288a0cd982c8dde751a15428346c61e3fa64bfa80c0 SHA512 42ede6976c894f89836ae272598edce8b3dadbdceb3b429724ea4c01a980470c161f03e54b58b17bd3fa3a7f750b4a79e5f96070fee5aae4b4fe73e79b2d8b61
+DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
diff --git a/dev-python/bareos/bareos-22.1.4.ebuild b/dev-python/bareos/bareos-22.1.4.ebuild
deleted file mode 100644
index 59d31548b8d2..000000000000
--- a/dev-python/bareos/bareos-22.1.4.ebuild
+++ /dev/null
@@ -1,18 +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} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="python bindings for bareos network backup suite"
-HOMEPAGE="https://www.bareos.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror test"
diff --git a/dev-python/bareos/bareos-22.1.6.ebuild b/dev-python/bareos/bareos-22.1.6.ebuild
new file mode 100644
index 000000000000..41dd5692bc06
--- /dev/null
+++ b/dev-python/bareos/bareos-22.1.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-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
+inherit distutils-r1
+
+DESCRIPTION="python bindings for bareos network backup suite"
+HOMEPAGE="https://www.bareos.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror test"
diff --git a/dev-python/bareos/bareos-23.0.2.ebuild b/dev-python/bareos/bareos-23.0.2.ebuild
deleted file mode 100644
index 59d31548b8d2..000000000000
--- a/dev-python/bareos/bareos-23.0.2.ebuild
+++ /dev/null
@@ -1,18 +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} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="python bindings for bareos network backup suite"
-HOMEPAGE="https://www.bareos.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror test"
diff --git a/dev-python/bareos/bareos-23.0.4.ebuild b/dev-python/bareos/bareos-23.0.4.ebuild
new file mode 100644
index 000000000000..41dd5692bc06
--- /dev/null
+++ b/dev-python/bareos/bareos-23.0.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-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
+inherit distutils-r1
+
+DESCRIPTION="python bindings for bareos network backup suite"
+HOMEPAGE="https://www.bareos.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror test"
diff --git a/dev-python/beartype/Manifest b/dev-python/beartype/Manifest
index ac4e1728b94e..1d5b0b7f9647 100644
--- a/dev-python/beartype/Manifest
+++ b/dev-python/beartype/Manifest
@@ -1 +1,2 @@
 DIST beartype-0.18.5.tar.gz 1193506 BLAKE2B 497de6f326a3b600992748db8b74ba80d4a14003a0cc484b3eeaf48f0f808864fe64462ef3315d421dc4b5fe5d7060b48585ee00eb822c9f124612f394ab93bb SHA512 114b256619c6c7fc48fbe28db00ae5a8ddea4ce11c5394a06fa026f0317a34907ff12ef0c0009cff7a7b83742e6b66bc8b503b4c0e382c0b6cf79d43780bda5b
+DIST beartype-0.19.0rc1.tar.gz 1281359 BLAKE2B df124c838891e5bbce62ac8116968631887dc5e5918a1b6a7c46c1705d05fcacf5f4cc4034b39a6d8565a78e2edd99686643a0d1d8c22586cfd797ceb8085b29 SHA512 630fd68a55ab379aca7b49b72161b732e0790835d7f62568239fb53f719fc8295bbe3c942058ab6dfad3226060a5a11820bc87080a2dcfb46c482e1877f775b7
diff --git a/dev-python/beartype/beartype-0.19.0_rc1.ebuild b/dev-python/beartype/beartype-0.19.0_rc1.ebuild
new file mode 100644
index 000000000000..000466fffd5b
--- /dev/null
+++ b/dev-python/beartype/beartype-0.19.0_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..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/mypy[${PYTHON_USEDEP}]
+		dev-python/numpy[${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/black/black-24.8.0.ebuild b/dev-python/black/black-24.8.0.ebuild
index 41319715b8dc..f91ff2cf9b66 100644
--- a/dev-python/black/black-24.8.0.ebuild
+++ b/dev-python/black/black-24.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boltons/boltons-24.0.0.ebuild b/dev-python/boltons/boltons-24.0.0.ebuild
index 41ad93998b08..461698c2a419 100644
--- a/dev-python/boltons/boltons-24.0.0.ebuild
+++ b/dev-python/boltons/boltons-24.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://boltons.readthedocs.io/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b6bd57012bef..fb2b74ff9608 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,6 @@
-DIST boto3-1.34.153.gh.tar.gz 847038 BLAKE2B f29aec887fd57d2bc4b6be125787384438e0dba65dd01effcc91016b9301be2fdde315a2fbdc8f122350ae52f904ba1c281aee9a5dc52994ddd11b45ead3f8a3 SHA512 a8d8f75ef48ad8418aafddbdea4fb021f64b041e7beabf68a0c2f6c461c3aa0b3f2f20c33122ac87d57296fd0d14ee8834b96257085c522b556f6aa1d99ea0d1
-DIST boto3-1.34.158.gh.tar.gz 848930 BLAKE2B 5db04b9eee08f5418a595e736f075fbe22b92adada9219e8a8cf2299c723d09e2edf88e5ebb3d09c1613a01e5d0d5c837e9545c6ee3110c430c521da10fa2bde SHA512 03f532e78a1a2b8ec01396f0b7f7bae7059165e35440eda47f4393e99d2a8ded229470cf3269a71c746b8a66dccd8626444f1e429e561df1dc1ec0f6b8653272
-DIST boto3-1.35.0.gh.tar.gz 851637 BLAKE2B 485b17616fed53a88280aad92d2e4219d8bcbf469b42cff6113f9596c6b245fad39b403b4fb29ed99b50955baa50940091e9c0f88cc6e350b44c69c4b1df5fdc SHA512 0236748c667ef1baf7484d4808083cb517c19ceae672973ac0cf9ce509a9e4a965c15349876807dc320fc96210ba6c5d16ea66545de19eed33dace058392d85d
+DIST boto3-1.35.10.gh.tar.gz 856679 BLAKE2B 03e7be74455b487a79188405796fc08bd940962ca4ef8c36398ee8f955c2677e57a528626ef31e5e54ce2c1b96c82cef857b54dcc16248178c60c14fd14de3f9 SHA512 99c0e0b67a590a06713eeb98eb485b055ee6fa1bd181f996d24bdf88698d7885efe0a5f1e9883083655b12a474112a03f8561c66c4c5b5a0e6db56d5733db77b
+DIST boto3-1.35.14.gh.tar.gz 859166 BLAKE2B eb201a319453097068b4711356ea930de739ff8874da7441fa3b931434c8a82a1692a5f67b10f06eaf7644335033e302f733fcc2267b782398e9edd28c32a613 SHA512 ade4b6bc0c816244d5335b1669090d8a5e3c8dcc8802b0aa10498ce8c5fe8e456958ff3bfd73a5c9376ce1658f9c2a90d5470c86c2b3399d7198bacd09764619
+DIST boto3-1.35.15.gh.tar.gz 859778 BLAKE2B f704c28f5510c0f495bbfd2e09ea303efedbcd96fc0d4a76ce2790c0e9e4814a678f30812d6b2c70225e0dd78ad7a38a2148aa7245d65a642409c9e693f39030 SHA512 d34ad96c6cc0e8ff29dc2b74872bf20cc69618cba72f3429425f5ad922bc669427ea709aa03642ced59b7acfd446e243067aa773930be1ff3dfe9fa8b7b9c2a4
+DIST boto3-1.35.16.gh.tar.gz 860020 BLAKE2B 2368b713cd51fd61596f50849e68f82188156a9ba80cf2b7608536f67ff9e57cb7e5cbd5529ab573d0fe1441d9572d3e8d2e6d0cd41e82237d968284c14247aa SHA512 5f5cf28b8dda8f1a136101095232346eafad886cea4ea5184295e7dd5233a18c04d51bd0398fc340d4092a916bdecfec0b7b71e009ec5e33dec86c445fcd05ac
+DIST boto3-1.35.17.gh.tar.gz 860345 BLAKE2B 7c12c48a9f72eb278ec3ab4416770a9314b6c2177329c5ed6213e19464efe8c7979f4ef7ab821085a06f6ca8b46317a08a571ba9bcf98c157ab81022a6f889e0 SHA512 bb83a4b4f5738001ca51817f7557d7e71bd214028ab509e16f9e6743d7f108b524cf994ff659ab5a9bae0285924d36eaed18ce5381da1d7aefb1dfec03588b97
+DIST boto3-1.35.5.gh.tar.gz 854016 BLAKE2B f94d738e310725cd5f9c7b405a094155f3ecf640f02045662ed94ab3689ea549fde7eee19ae2be450768560ad705b8740fda78b79ed42cf536231626d247e09a SHA512 fc1106abbb306bacb80dce825bf71303e71b0d0698d7e3bb4dcaca4ea6e4f7a97e70753367200294f334b351e764bca57f2316afec854d2e46db4644dfefc25b
diff --git a/dev-python/boto3/boto3-1.34.158.ebuild b/dev-python/boto3/boto3-1.35.10.ebuild
index 8cba6d95740e..8cba6d95740e 100644
--- a/dev-python/boto3/boto3-1.34.158.ebuild
+++ b/dev-python/boto3/boto3-1.35.10.ebuild
diff --git a/dev-python/boto3/boto3-1.35.0.ebuild b/dev-python/boto3/boto3-1.35.14.ebuild
index 8cba6d95740e..8cba6d95740e 100644
--- a/dev-python/boto3/boto3-1.35.0.ebuild
+++ b/dev-python/boto3/boto3-1.35.14.ebuild
diff --git a/dev-python/boto3/boto3-1.35.15.ebuild b/dev-python/boto3/boto3-1.35.15.ebuild
new file mode 100644
index 000000000000..8cba6d95740e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.15.ebuild
@@ -0,0 +1,53 @@
+# 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.16.ebuild b/dev-python/boto3/boto3-1.35.16.ebuild
new file mode 100644
index 000000000000..8cba6d95740e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.16.ebuild
@@ -0,0 +1,53 @@
+# 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.17.ebuild b/dev-python/boto3/boto3-1.35.17.ebuild
new file mode 100644
index 000000000000..8cba6d95740e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.17.ebuild
@@ -0,0 +1,53 @@
+# 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.34.153.ebuild b/dev-python/boto3/boto3-1.35.5.ebuild
index 54e9299b7dca..54e9299b7dca 100644
--- a/dev-python/boto3/boto3-1.34.153.ebuild
+++ b/dev-python/boto3/boto3-1.35.5.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d07d74e04fbc..6f62d53d7b9c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,6 @@
-DIST botocore-1.34.153.gh.tar.gz 13269606 BLAKE2B 1b2ec1af3b699c18c5761fe72b8488361f843e1b2abc5f311736e7c93a52574738a8e72708791657d0d86586d64ee3c85804514779c6dc75c6c2e37035517be1 SHA512 9a7b3359f4304bcb4d3605e2516514360e8898d7b8b1fdee8fab5dc6026a7d8197b09199da4e9aefcf1ab0b094a2e0e336ad13942ce0364f7b5ac87d86fdc4fd
-DIST botocore-1.34.158.gh.tar.gz 13282704 BLAKE2B c244a36093cdaf57ac82dc11a3e9d4268d7cce36b8119674530228825f6ec4053abbc909dd664a1ea10ec48e0c418b90803275aabc89a41a99eaba6e138a5a17 SHA512 b60c743bfd1a1f3806c6ae71158a998587b8e87f43bdbe88c960cee19bcef41a4b3fd2fe5f50408abc97b22200a689990f79cbb6e952347c747e4bc8c21ae368
-DIST botocore-1.35.0.gh.tar.gz 13294975 BLAKE2B a0cbafd1b0da5cd7150ea7a2e21b1209b206b7afcb86ad3ff004ca1c96f47da34eff29a43568f0e9a2dca3443516fdb6adf7bd3778835b908fa5fb3a8d22f79a SHA512 7d0c9815703ef49a8958ed1a5159018320108ae86efe20e6dff182db24ceeb67968db7027ee75809a1ebd1c835709d0d758b0699742bca2e435888dbe5e15a97
+DIST botocore-1.35.10.gh.tar.gz 13328544 BLAKE2B cecad54696210597a09f4316a88b8335bc441a6429ddbc7f3c6e539a1aaee4312b855ec93b99971c8241b2431a920085f4f3b38545d607609a8d6a94d36676d8 SHA512 cf6bb103aea0af9ed2e43762848438eef89ab5bf8eec856cb8cd70204dd36f143ab9b8defd6ecd849a542332351feb499d8c34e7382bde558eac3ad19b1c5757
+DIST botocore-1.35.14.gh.tar.gz 13340768 BLAKE2B 4ba023dbfc9e632d86028100910544e192a5b2d70ec76a21dfc5003c767a6043a144385561c35f4d7b4bfefbf4a1f3a38ef2845e323f93868e1f5ad86ae1f12b SHA512 c0dfdec80a45cf11796496bc2bef575a567368be3f29267b4d411d0615e6c8536036e47a5de11fb8f4626590dca051e891bb9430ed1ea80dfab2f43f070209d2
+DIST botocore-1.35.15.gh.tar.gz 13343518 BLAKE2B 7eef64c875cc175aa94271b72a300908dc0f1c19504b0088acd5cf97224a4793bdc1bb5adc38e763359eb54892636feb2833726d217eb0a5f998c451e8de484e SHA512 305d16f4aad9832a6b405d2aa44805a89d70b57c74d0b4a25068801615cbdd9e6e223e804f1fd2c057ae3cc6515f0a20cab8adfda421e8c29ba911707fef0820
+DIST botocore-1.35.16.gh.tar.gz 13347546 BLAKE2B c6acfbab36b849ac0dcac177b4c6edf0acade33eac6c2215eea66df2d63307bdc9c130fee42f4e62385eb52fde6578d8a185a9be30dc3fde378242182636eb76 SHA512 e5c016a0107db1977f72497361f0b5f4755c4a8c25a9e715b556c17ac93af7a5d88c2a771814a80eda634b9b551d07da187f6d2a3107c53aed44fbcbe459a041
+DIST botocore-1.35.17.gh.tar.gz 13365877 BLAKE2B d442565f443cff97387e82bd68ad18dc437f46e733bd43996e10e0df5afb48c50fa0adc3f51a30df2d991844c69d1625c3bf1c6bd46dd7864e2bca1dc9f483c7 SHA512 ffd155a63bdf669af505db1f3e8f9dd23bde5772c14f2b9f4a6801395f6714cce059b996bd8aff62c7cdbb14e244eed86a69174a9f60e26c9d680a0943a8ac26
+DIST botocore-1.35.5.gh.tar.gz 13303437 BLAKE2B 0a95351fbc93074bb0398871773120a194fe581a26f9a74c1101a5ea57bb3acb9a33937fc2d5a39a065988cdcc6dbe253bd2227cf93e670602ccc67ab82d8845 SHA512 5527420017a4a23d5593f5b3a0eb8caf15357642ed90cd73e0fe22774cc8f9f3637028286063e3e2810e5dafe52e882928269e5c82f6369be9af99bef18fb365
diff --git a/dev-python/botocore/botocore-1.34.158.ebuild b/dev-python/botocore/botocore-1.35.10.ebuild
index 4f1ad852bdc1..4f1ad852bdc1 100644
--- a/dev-python/botocore/botocore-1.34.158.ebuild
+++ b/dev-python/botocore/botocore-1.35.10.ebuild
diff --git a/dev-python/botocore/botocore-1.35.0.ebuild b/dev-python/botocore/botocore-1.35.14.ebuild
index 4f1ad852bdc1..4f1ad852bdc1 100644
--- a/dev-python/botocore/botocore-1.35.0.ebuild
+++ b/dev-python/botocore/botocore-1.35.14.ebuild
diff --git a/dev-python/botocore/botocore-1.35.15.ebuild b/dev-python/botocore/botocore-1.35.15.ebuild
new file mode 100644
index 000000000000..4f1ad852bdc1
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.15.ebuild
@@ -0,0 +1,76 @@
+# 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
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# memory use tests, probably fragile
+				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.35.16.ebuild b/dev-python/botocore/botocore-1.35.16.ebuild
new file mode 100644
index 000000000000..4f1ad852bdc1
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.16.ebuild
@@ -0,0 +1,76 @@
+# 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
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# memory use tests, probably fragile
+				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.35.17.ebuild b/dev-python/botocore/botocore-1.35.17.ebuild
new file mode 100644
index 000000000000..4f1ad852bdc1
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.17.ebuild
@@ -0,0 +1,76 @@
+# 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
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# memory use tests, probably fragile
+				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.34.153.ebuild b/dev-python/botocore/botocore-1.35.5.ebuild
index e3f2c4490826..e3f2c4490826 100644
--- a/dev-python/botocore/botocore-1.34.153.ebuild
+++ b/dev-python/botocore/botocore-1.35.5.ebuild
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index f3903aaa686c..99a6c9a88ec9 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1 +1,3 @@
 DIST bottle-0.12.25.tar.gz 74231 BLAKE2B 2856d94e1525f21e272d70ca3101188ea65417179342d7b3e971c5d1a3be77265e4197e5d29764a5739adbd984883ed121524f29e6a5933b8681e2c34b511a57 SHA512 14b8ed1ffd58f9667d451872ccf73a6f4bf8f7ffb9329f55314f90c770630cfe3f9956f786bcc7fd5f67fde22d14961952969af405912ebe71f019ca6599c975
+DIST bottle-0.13.0.tar.gz 99295 BLAKE2B ad97db9c0d9313d836fc166809205b0b812e1d7ac3de05b5610aada01a19e8c785ccf8254304223fa77606f283d2e4621c5db2c5f36e950756c5ffef0bda4fa9 SHA512 17951d723c960ed045500c3721b0cccb3015c69f9e3cd2813e29984dbc16cffa63b108f18f36e0b3cf32b25bf9d900603f58569e1ab65bf53096c056d6ea6714
+DIST bottle-0.13.1.tar.gz 836422 BLAKE2B 8160de68b04cab8b3fe86dfc4b9f354ff2de523eae79277b91889e634629e9b462f9013c9821409ad3b43aa329c02ddce66bde45bc1c650a2826e641236b2fe7 SHA512 504704d20712723436c61712e8aa41e603a0f66f74927b4d4122aaea3a090ab910d5daa12217d48b803a66fc3d96d491c2a0b30df236aff50520adb8c115609f
diff --git a/dev-python/bottle/bottle-0.13.0.ebuild b/dev-python/bottle/bottle-0.13.0.ebuild
new file mode 100644
index 000000000000..617c841c54a0
--- /dev/null
+++ b/dev-python/bottle/bottle-0.13.0.ebuild
@@ -0,0 +1,42 @@
+# 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 optfeature pypi
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="
+	https://bottlepy.org/
+	https://github.com/bottlepy/bottle/
+	https://pypi.org/project/bottle/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/legacy-cgi[${PYTHON_USEDEP}]
+	' 3.13)
+"
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bottle/bottle-0.13.1.ebuild b/dev-python/bottle/bottle-0.13.1.ebuild
new file mode 100644
index 000000000000..e4376f17d3e4
--- /dev/null
+++ b/dev-python/bottle/bottle-0.13.1.ebuild
@@ -0,0 +1,37 @@
+# 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 optfeature pypi
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="
+	https://bottlepy.org/
+	https://github.com/bottlepy/bottle/
+	https://pypi.org/project/bottle/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 9a8c075971e8..e3a4394e51f0 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,2 +1 @@
-DIST bracex-2.4.tar.gz 26588 BLAKE2B 99a3a846c1b427e11fd9fe05389d20c81126c5f9a23cb86961265fb1ea4ec51a48e1afa5e40f569b52533732784b00f2b504637efd4d19286a4bb603b1db76cd SHA512 14e520aad81b65df5047374b1920c7202bc62d4524fba4ae82ca7e92e18ae4e0f5d6a184fd772da0cafc3e891f45bab53ad31f6b444d914c3469969b33fa1a28
 DIST bracex-2.5.tar.gz 26622 BLAKE2B d86e133ab0b8033f94c238afab4c1e023d648e512dbd2759a9cb756322e317132d51c33b9826bc5cb20d715557abae1470a1d6212f6e103164a30618bf1e5b20 SHA512 e738ea7b45b17bbbc9a64e1782653ed69d56a94ef8c83f538d19319ed3ad23ec96037d22af0b00796bf5cb2fca3f75c8c2770ddfa9ef60536fd435de594aaae4
diff --git a/dev-python/bracex/bracex-2.4.ebuild b/dev-python/bracex/bracex-2.4.ebuild
deleted file mode 100644
index 396b3efd6c52..000000000000
--- a/dev-python/bracex/bracex-2.4.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-pymdownx-material-extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs pypi
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex/
-	https://pypi.org/project/bracex/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/bracex/bracex-2.5.ebuild b/dev-python/bracex/bracex-2.5.ebuild
index 765de6c20619..396b3efd6c52 100644
--- a/dev-python/bracex/bracex-2.5.ebuild
+++ b/dev-python/bracex/bracex-2.5.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 382461784c1b..b8adf02034d7 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,2 +1 @@
-DIST braintree_python-4.28.0.gh.tar.gz 227282 BLAKE2B cb811005eaecb380befa99a2721f421e1a1d43417afd2ab243cc83654b2823d50d40c8780a2406c415ec54d683925d45a4900e227a3fed2d6192db80bef92a4a SHA512 872195ed3183e248f6b9127ddcbfe62f5305141806f2af31cf62425d4a76184d8ef7eab5a346818db6fdcbbc01a03979662b379fe8f7f17571d84b127dc0e3f1
 DIST braintree_python-4.29.0.gh.tar.gz 229814 BLAKE2B d4d33aaa8073ec129d4ed791912ebf1ff6ed5c602ec9c91917d493dd0060e59dcc9ae830f2efc9c009036b64bb0f55b3f4476c6c6bf91c6076c8fec9de9c042f SHA512 da2e8daba61c0a9cf76929e5edcb05859f7072e9c13b9bc97556fd370a9f7fbd396513505d3e93617132bfbbb95c6f8cfa4343072e7c16ecdcd30d8c59a7dbff
diff --git a/dev-python/braintree/braintree-4.28.0.ebuild b/dev-python/braintree/braintree-4.28.0.ebuild
deleted file mode 100644
index a2dc87534d6c..000000000000
--- a/dev-python/braintree/braintree-4.28.0.ebuild
+++ /dev/null
@@ -1,39 +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} )
-
-inherit distutils-r1
-
-MY_P=braintree_python-${PV}
-DESCRIPTION="Braintree Python Library"
-HOMEPAGE="
-	https://developer.paypal.com/braintree/docs/reference/overview/
-	https://github.com/braintree/braintree_python/
-	https://pypi.org/project/braintree/
-"
-# no tests in sdist, as of 4.19.0
-SRC_URI="
-	https://github.com/braintree/braintree_python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-0.11.1[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.md )
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests/unit
-}
diff --git a/dev-python/btrfsutil/Manifest b/dev-python/btrfsutil/Manifest
index e35d2c597415..2343cf118064 100644
--- a/dev-python/btrfsutil/Manifest
+++ b/dev-python/btrfsutil/Manifest
@@ -1,8 +1,4 @@
 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.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09
-DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46
 DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55683008b1585a26f38aef6cceb1afd5e80c9611518d6bd92dc1167798d4012c4bcab2f9bda752c459d94cfa6f3c477 SHA512 3fb04e1894e231abde388a39d2f0c90f43c1a1494622c2158fab9b94bb340e064404bcf96e24d913c60aaf5e06ade42fbb91a479949109b329682bb089f66bf2
 DIST btrfs-progs-v6.9.2.tar.xz 2661684 BLAKE2B 38ab189ac8271ba8d68b74e82569159c671cca1cb946f56ccab28b6b206cb6ee5b330d83afc3536b7e0d7399da3fb01e368809c1ef4a64b843ea88796ebd28bd SHA512 1df9d5456d07a035c38c17795996a4fc621eeaa244ef54383d4387205826d2a6e971910e55031d20bb1baf23193efa7439e110312ffd8471f07aaf8c0baca20a
-DIST btrfs-progs-v6.9.tar.sign 566 BLAKE2B a2e26047775bcc407b8f5aa8b08b0708a01c84a8cd649e50a935e15d04e2ee917010fc98df0dfb80320ee25a8dbfbbbabbb1f155489f32391544100956ba9636 SHA512 1e8304b3df013a841e82a8656361946914d35f680b5bc547c1599fdd98a75b66e2b1f869c8b043d7532182318c2183e699a9d6101ab4b1544618d2c8a25362e1
-DIST btrfs-progs-v6.9.tar.xz 2663052 BLAKE2B 9fad691327b6290b3ba0e1a638576b65e4e4d6c8f32549ea0f10188fdb40028315abf5e330976ff7a5efb6a258d0008e7602ae81ba0339888f474dc056791798 SHA512 e97907b377040371f4742a45345ec720e0cb8e0cf9ee5fdc60618ce2bc76f572725ec32e1a178fd57534f73affd3eeb5e6cfebf23734f04583bbbef858d913b2
diff --git a/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild b/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild
deleted file mode 100644
index 29bf098bb9e0..000000000000
--- a/dev-python/btrfsutil/btrfsutil-6.8.1.ebuild
+++ /dev/null
@@ -1,44 +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 ~ia64 ~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() {
-	if use verify-sig ; then
-		verify-sig_verify_detached \
-			<(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
-			"${DISTDIR}"/${MY_P}.tar.sign
-	fi
-	default
-}
diff --git a/dev-python/btrfsutil/btrfsutil-6.9.ebuild b/dev-python/btrfsutil/btrfsutil-6.9.ebuild
deleted file mode 100644
index ea175591c6b1..000000000000
--- a/dev-python/btrfsutil/btrfsutil-6.9.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 ~ia64 ~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 -x))
-		assert "Unpack failed"
-	else
-		default
-	fi
-}
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index a04380e8892d..5d4f391d9d20 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1 +1,2 @@
 DIST build-1.2.1.gh.tar.gz 47394 BLAKE2B d38a138dee5065ff0faee453bdc608fc519bc4b4a3cec8b60cf4f745288f8238dd7e9334f75bdd67765037a62b220079ce924c6581f745eb3750e732b2184d48 SHA512 77003e16d3776c3a4be920251bf14650eea112b92d94116cb1893195b8e16aae57321206ae63267119247f2794f220c891b7d913e07a8258b313d34c07d54fe9
+DIST build-1.2.2.gh.tar.gz 48587 BLAKE2B 308faba9fca554fc2ea347d20ee2f2a460060922c028d7ae37648290f4caa374616105d740ed285729204028d40bfb838b4de59ae20eaa8db1c0924f0d1cd8a8 SHA512 91e14208680915414a87bd3ba31229510a78d82d5504efc40cf7f9c6a7a698cfa4ff523f85c2dd6a56b5e313fae57134f64f2c328c88cd40efe40236b0b661cc
diff --git a/dev-python/build/build-1.2.2.ebuild b/dev-python/build/build-1.2.2.ebuild
new file mode 100644
index 000000000000..f248710de670
--- /dev/null
+++ b/dev-python/build/build-1.2.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, correct PEP517 package builder"
+HOMEPAGE="
+	https://pypi.org/project/build/
+	https://github.com/pypa/build/
+"
+SRC_URI="
+	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/packaging-19.1[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/filelock-3[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-xdist-1.34[${PYTHON_USEDEP}]
+			>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+			>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+			test-rust? (
+				!s390? ( !sparc? ( dev-python/uv ) )
+			)
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# broken by the presence of flit_core
+		tests/test_util.py::test_wheel_metadata_isolation
+		# broken by the presence of virtualenv (it changes the error
+		# messages, sic!)
+		'tests/test_main.py::test_output[via-sdist-isolation]'
+		'tests/test_main.py::test_output[wheel-direct-isolation]'
+		# broken when built in not normal tty on coloring
+		tests/test_main.py::test_colors
+		'tests/test_main.py::test_output_env_subprocess_error[color]'
+		# Internet
+		'tests/test_main.py::test_verbose_output[False-0]'
+		'tests/test_main.py::test_verbose_output[False-1]'
+		# broken by uv being installed outside venv
+		tests/test_env.py::test_external_uv_detection_success
+		# broken by unbundled pip (TODO: fix pip eventually)
+		'tests/test_projectbuilder.py::test_build_with_dep_on_console_script[False]'
+	)
+
+	if ! has_version "dev-python/uv"; then
+		EPYTEST_DESELECT+=(
+			tests/test_env.py::test_uv_impl_install_cmd_well_formed
+			'tests/test_env.py::test_venv_creation[uv-venv+uv-None]'
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_XDIST=1
+	epytest -m "not network" -p pytest_mock -p rerunfailures
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 56170c8f65d8..20436ced6685 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,2 +1 @@
-DIST cachetools-5.4.0.tar.gz 26975 BLAKE2B cdceb90771686dfee1be9117b3d12fd60e832683be7dd1825f2c430eb9f897d0565cac12b9238090e56391ea2cb097762b7c43726602ec82ffe7fcdf4885aa3c SHA512 ee45747725bed2e3f06b493cf052896af48485907792f1a8331b1dcfca8a52942d2a49eb8c2bf4942ef749f4266d239e95d4165fb681a74fa57d0fe126fc4397
 DIST cachetools-5.5.0.tar.gz 27661 BLAKE2B b46cdaeb2e2589eecedd2add633d92901be317120f70fbc04b6f552ce87d0cad9fe8e1e561e96a7f76d3617b02f5e02c0a1162a6a267f1ba6a8dbb283e7d8585 SHA512 fac6516880b83e0722e52037bed66c9a2b7ed683ccabca953ab82a27c47ae85a76a8abdc35e584c2c46ed194c1fbb8e3e5d6680235e0c4450d89a95c46904f51
diff --git a/dev-python/cachetools/cachetools-5.4.0.ebuild b/dev-python/cachetools/cachetools-5.4.0.ebuild
deleted file mode 100644
index b581588689f8..000000000000
--- a/dev-python/cachetools/cachetools-5.4.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.5.0.ebuild b/dev-python/cachetools/cachetools-5.5.0.ebuild
index daf8295984af..b581588689f8 100644
--- a/dev-python/cachetools/cachetools-5.5.0.ebuild
+++ b/dev-python/cachetools/cachetools-5.5.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index a1333f1e47f1..ff8bd6eb8828 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,2 +1,4 @@
 DIST cattrs-23.2.3.gh.tar.gz 612120 BLAKE2B a227cc50cb23a76931562f17444fcfb4a5532cac74f80b478a8abb6d113cbb0a06c471c3ca7ee256f74640486464762f4a13387ccfc1cd144cfd1a9bfecddd8e SHA512 76a75ea0893bb1549dd5178436c4823ae5b918c16f0d8195203c48e894438ec792cee77698d783f7e43c07445c46a6041a309c3d3bbcadcff95d9c4079e3d622
+DIST cattrs-24.1.0.gh.tar.gz 428347 BLAKE2B 21bb94de02b6fce1c456e0d66dbd38defdd1171d4eb815e92ddc9777b12a108e099a5ce0dce4e51c1175cc1771d517ae0d201ac7ff537fbddf2329dce6f88f51 SHA512 879fd9edef39ad325237439915aa2d92c346c9896d463a4c3835335c3b9fb8bc572834a7d7731ccf6b805e59dec481cfdfed50ae8d4899fa31118b6ac6926c1a
+DIST cattrs-24.1.1.gh.tar.gz 428539 BLAKE2B f0fe5afc56bc49da62942b553ea752c0fdffb6670a19eba5810826e81f066f1d4a08684509c682ae9b43601f8d2f4e18dd4e55f62a7316a10870625ee7d9ecaa SHA512 bc141a30976b022931289f37f9630ced7f309ddce7a42abf7114b49c6eef26bfe861fa239dc4df7524549b35cc8a7765ca265ad9d516f59f42c32f30733dd77f
 DIST cattrs-6290cacdb7f9d195b4f96ce0ab036c8eebf35d94.gh.tar.gz 426769 BLAKE2B 61851be04434e55d627aac6fd73d72d9d4d8a150bedb6110f4b99068dd58ed29fd23ff083c595eb508b144546d8e4d1e926831dc51985775773ab86a86d98815 SHA512 f1034ae0c57a0618c6568ebac0696928e125121431e965c0ceeda82070a21b448630e3188cc03a8d7a44447126a4a2623b8604ef856a89268e1c0802761d89b9
diff --git a/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild b/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild
index 92b15ea9501b..69ded594038b 100644
--- a/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild
+++ b/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild
@@ -73,6 +73,15 @@ python_test() {
 		tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides
 		tests/test_preconf.py::test_msgspec_json_unions
 		tests/test_preconf.py::test_msgspec_json_converter
+
+		# tests need updating for attrs-24*
+		# https://github.com/python-attrs/cattrs/issues/575
+		tests/test_baseconverter.py
+		tests/test_converter.py
+		tests/test_gen_dict.py::test_individual_overrides
+		tests/test_gen_dict.py::test_nodefs_generated_unstructuring_cl
+		tests/test_gen_dict.py::test_unmodified_generated_structuring
+		tests/test_structure_attrs.py::test_structure_simple_from_dict_default
 	)
 
 	if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then
diff --git a/dev-python/cattrs/cattrs-24.1.0.ebuild b/dev-python/cattrs/cattrs-24.1.0.ebuild
new file mode 100644
index 000000000000..f517b1a20aca
--- /dev/null
+++ b/dev-python/cattrs/cattrs-24.1.0.ebuild
@@ -0,0 +1,106 @@
+# 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="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/
+"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/cbor2-5.4.6[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.54.5[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.18[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.11.4[${PYTHON_USEDEP}]
+		>=dev-python/ujson-5.4.0[${PYTHON_USEDEP}]
+		test-rust? (
+			$(python_gen_cond_dep '
+				>=dev-python/orjson-3.5.2[${PYTHON_USEDEP}]
+			' 'python*')
+		)
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/python-attrs/cattrs/pull/543
+	"${FILESDIR}/${PN}-23.2.4_pre20240627-py313.patch"
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# requires msgspec
+		tests/preconf/test_msgspec_cpython.py
+	)
+	local EPYTEST_DESELECT=(
+		# these require msgspec
+		tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides
+		tests/test_preconf.py::test_msgspec_json_unions
+		tests/test_preconf.py::test_msgspec_json_converter
+
+		# tests need updating for attrs-24*
+		# https://github.com/python-attrs/cattrs/issues/575
+		tests/test_baseconverter.py
+		tests/test_converter.py
+		tests/test_gen_dict.py::test_individual_overrides
+		tests/test_gen_dict.py::test_nodefs_generated_unstructuring_cl
+		tests/test_gen_dict.py::test_unmodified_generated_structuring
+		tests/test_structure_attrs.py::test_structure_simple_from_dict_default
+	)
+
+	if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_preconf.py::test_orjson
+			tests/test_preconf.py::test_orjson_converter
+			tests/test_preconf.py::test_orjson_converter_unstruct_collection_overrides
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/preconf/test_pyyaml.py::test_pyyaml
+				tests/preconf/test_pyyaml.py::test_pyyaml_converter
+				tests/test_converter.py::test_simple_roundtrip
+				tests/test_gen_dict.py::test_unmodified_generated_structuring
+				tests/test_generics.py::test_unstructure_deeply_nested_generics_list
+				tests/test_unstructure_collections.py::test_collection_unstructure_override_mapping
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= tests
+}
diff --git a/dev-python/cattrs/cattrs-24.1.1.ebuild b/dev-python/cattrs/cattrs-24.1.1.ebuild
new file mode 100644
index 000000000000..f517b1a20aca
--- /dev/null
+++ b/dev-python/cattrs/cattrs-24.1.1.ebuild
@@ -0,0 +1,106 @@
+# 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="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/
+"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/cbor2-5.4.6[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.54.5[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.18[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.11.4[${PYTHON_USEDEP}]
+		>=dev-python/ujson-5.4.0[${PYTHON_USEDEP}]
+		test-rust? (
+			$(python_gen_cond_dep '
+				>=dev-python/orjson-3.5.2[${PYTHON_USEDEP}]
+			' 'python*')
+		)
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/python-attrs/cattrs/pull/543
+	"${FILESDIR}/${PN}-23.2.4_pre20240627-py313.patch"
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# requires msgspec
+		tests/preconf/test_msgspec_cpython.py
+	)
+	local EPYTEST_DESELECT=(
+		# these require msgspec
+		tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides
+		tests/test_preconf.py::test_msgspec_json_unions
+		tests/test_preconf.py::test_msgspec_json_converter
+
+		# tests need updating for attrs-24*
+		# https://github.com/python-attrs/cattrs/issues/575
+		tests/test_baseconverter.py
+		tests/test_converter.py
+		tests/test_gen_dict.py::test_individual_overrides
+		tests/test_gen_dict.py::test_nodefs_generated_unstructuring_cl
+		tests/test_gen_dict.py::test_unmodified_generated_structuring
+		tests/test_structure_attrs.py::test_structure_simple_from_dict_default
+	)
+
+	if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_preconf.py::test_orjson
+			tests/test_preconf.py::test_orjson_converter
+			tests/test_preconf.py::test_orjson_converter_unstruct_collection_overrides
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/preconf/test_pyyaml.py::test_pyyaml
+				tests/preconf/test_pyyaml.py::test_pyyaml_converter
+				tests/test_converter.py::test_simple_roundtrip
+				tests/test_gen_dict.py::test_unmodified_generated_structuring
+				tests/test_generics.py::test_unstructure_deeply_nested_generics_list
+				tests/test_unstructure_collections.py::test_collection_unstructure_override_mapping
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= tests
+}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index efae992cee86..1a055ef42bd2 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,4 +1,5 @@
 DIST cffi-1.16.0.tar.gz 512873 BLAKE2B 9e8d107b3124a072e559c4a536b54a172e90f9fe51d8184dacc2914a8ffa84f2682eee9c90401325dfb0f36f3f8ea0456afc93e2b85a4fef5f07ae4475e0a76b SHA512 fd2588115092202aa9289c9d4e0a0b3e264b5e9ec1dc192950f31aeb412fd9f9d4e5c96a3f9c6762987b58ccc1e229f2012ddda89211797104df672d8ed51152
 DIST cffi-1.17.0.tar.gz 516073 BLAKE2B e050689b58b4a34e3f605f84b3b6a59ec44359bfb042796f82e1acb6349b65ca37f9fb7a0d4ffc7fe40b85416288dcc1f3496968c4fb3f36cdd2c0042658f7b1 SHA512 8516abe177c2acfc31ede401287956cc4dc486b26ed9c4752811be71dc6bc94af3adf1f1f685a94e7242f052b74768bfbbb30ce41a3c23b9259c91449347566e
 DIST cffi-1.17.0rc1.tar.gz 516063 BLAKE2B 02f25fde28a070c314deb5870d2285a0cfd2fd10d0136b3c5459d4bb11454722d61dfe0e5f27a7268a4aca8cadb2a9df045340094bcf98f1692f54ddea6df714 SHA512 757ccaf09a745cd04a31d0b2fcc46f438269b79b88c4a89aa7dd2f0dd1bc1b64fb9f9fde2461407e1c0482c1c64e837283e21d0b46dbcb0c4ccd5e54a8319a0e
+DIST cffi-1.17.1.tar.gz 516621 BLAKE2B 902844a14c0765ada6adf5054a9462a195b49b2ea4d7441deeff97dd6d9209accd29257697002ee1bad7e143ebf983a2d98077b17e08b060dd1ee75dc682e3d8 SHA512 907129891d56351ca5cb885aae62334ad432321826d6eddfaa32195b4c7b7689a80333e6d14d0aab479a646aba148b9852c0815b80344dfffa4f183a5e74372c
 DIST cffi-d7f750b1b1c5ea4da5aa537b9baba0e01b0ce843.gh.tar.gz 523050 BLAKE2B 498085e9bc497eb1abf2d2e26e2cdb9d7544509b2c1686b306930c2da8a39a5ef133b77302761b44d5231c5255ef30cbd22579c79921dc2dc71e723ff5624939 SHA512 a0d1eb7bf8df12331d3493d86894ba062f7a15f4e7421863d44e264d4ca40ef864c7574d42cb7a4f2ea44ab80242942d6f4c8772c64b8dd0789aeb9f1908fc89
diff --git a/dev-python/cffi/cffi-1.17.0.ebuild b/dev-python/cffi/cffi-1.17.0.ebuild
index 70749e8b0345..3f6a11f2cec8 100644
--- a/dev-python/cffi/cffi-1.17.0.ebuild
+++ b/dev-python/cffi/cffi-1.17.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/cffi/cffi-1.17.1.ebuild b/dev-python/cffi/cffi-1.17.1.ebuild
new file mode 100644
index 000000000000..70749e8b0345
--- /dev/null
+++ b/dev-python/cffi/cffi-1.17.1.ebuild
@@ -0,0 +1,71 @@
+# 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_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 toolchain-funcs pypi
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="
+	https://cffi.readthedocs.io/
+	https://pypi.org/project/cffi/
+"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Needs recent libffi for HPPA fixes
+DEPEND="
+	>=dev-libs/libffi-3.4.4-r1:=
+"
+# setuptools as a modern distutils provider
+RDEPEND="
+	${DEPEND}
+	dev-python/pycparser[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Don't obsessively try to find libffi
+		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# these tests call pip
+		testing/cffi0/test_zintegration.py
+	)
+
+	"${EPYTHON}" -c "import _cffi_backend as backend" || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest src/c testing
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 415ed2c4a0f5..45a4cb4a2446 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,10 +1,6 @@
-DIST cfn_lint-1.10.0.tar.gz 2415724 BLAKE2B cf7193d56bd5a6957e6f76574bb9fa0b678a2629791787d19cd4fe5d192c2cb4e2814154534aa3eb01bd61cff6e608ef113e0daf3d5c187aa12fdfee50e11678 SHA512 3690f7deef98897a2da3f9cfcc5495fdc3b90e0b685a628d67625f4d75114975ee0d9c1117a54578df274d0223cf393fa04dbab79abe266dbdcba43843fd6616
-DIST cfn_lint-1.10.1.tar.gz 2415680 BLAKE2B 17b9216da0af3409b69ecea3222b65e414fd850cb603a9e274e3c90140a0287fe20d42330df1e704779693097676ee1e2ad16929b89d0de61093fd5f3d0a9889 SHA512 13de688bb8b08e592f4be82f62ddd2be76c8f373d7e7e38e42ee38c0e3f579a34b153954e13d7916d72461806847a5e7494af7b786080cdd4266f683728f4f9b
-DIST cfn_lint-1.10.2.tar.gz 2417546 BLAKE2B 3074651be3334ae396367c60d7fef78cc8978a84405b9e5e5c17283450620988b8b027048e0c2422d6bbff0abf285beab3731e643e2bc0013032d7a4c19b04c4 SHA512 f1476364edd1997f795d7185ee99b1dc462f7f266e1c0d9bfa50bf8cff0d85f77a615c367cc98238ec57124e4098d5a894f91cc7f6c5cdfd1d7b9d07735391b3
 DIST cfn_lint-1.10.3.tar.gz 2418034 BLAKE2B f889112d5572401dd5333d1a9edcb277c6150bc58ba8d6e64322d4eb732be706386b795cb4abb4ec7a03855394b7c95f1f7048d2cd499fd2717f5cbe4458ee32 SHA512 b81a8afef2c2b5fcc3e9e5557908bd6510714421cae9e0a1319019ca23ba41b904e69888b9f84dcc5f612dfacf745071a79251c773b816b9e7d7b347e4e26586
-DIST cfn_lint-1.8.2.tar.gz 2377269 BLAKE2B 8f4266c6d90f50f614f203a4b34ffc15397c973e8af07510c64e21bd80f1c4dd0f5bf6283268cbc69fbe505d6c945cc058ec0f06b05e868b3149941ab28b3948 SHA512 2605c5880960e3bce2822f2d9b9bd221d4ab7d77a4d9a1bcbdbf6df8f50492877daf704f84157946519a9da96f9d3de5ed5e65629d259726a10e1fb38c963950
-DIST cfn_lint-1.9.3.tar.gz 2562556 BLAKE2B c8816021cfb83e2c0d915cc58e7c099bf8ff0640b0562ddf3a7bcfca250e7d4fa03480ff99b5eef4fb103a77aca9a2b3c5266a30b19cddc899f7c0ccb3ca88d6 SHA512 fd75a60b7249bb3f0865d4a37b70d5f64012879b332dfe240f7d7eddc5ae48674e7372b959dd6964f8d0c028c0b75dc78c25caf0ebb3e5186bb6b2b7004e1212
-DIST cfn_lint-1.9.4.tar.gz 2563835 BLAKE2B 50694ee3982cda4e6df6aa2e8be2c0ae3182899947897d71764426f7fa14225ce44248af42e3d74e1b0159f216a02bc41f6675ab04dd09210bc66419913a5fdb SHA512 345d3aaa1dc6dfa1049061b4563c0f705510e69058e2184e7220f3dba776522967115a273e5044032a02b96c985a71acd4c1c31f7a71d819309d74dd60242456
-DIST cfn_lint-1.9.5.tar.gz 2457425 BLAKE2B 37a065cc7e0462feae7d4fc0b599bf9e2c96a88010690d1440de0f45c829d75c4df98eb7513e3a4992bd7769795351e5022f23925aae84f262183afb474fb59d SHA512 b793271a4b0d5febc4eb1f4411daf5ba3e17cb864ce63e143963c55becc3dbd11617eae8e66c4299f906c1ac4aadf8361c9082e6dd5e1fa11663ddad09f1618a
-DIST cfn_lint-1.9.6.tar.gz 2519342 BLAKE2B 17d14674853cae9a8eb0c3dfc05486a42e9f5a6e435fbfdf9e34e6ba8cb59c5b508e395a46c788fbc220a0f3918bc5156eb69be6ac6f3c429f78cff474625eec SHA512 2e9cf33e333d3eb098525fe7c54db0f76c68e08a50a2b02a023798d8f4b33041a6e92790a93a6b13a7a10933911512ef1d49718577af49df049567499862cd4b
-DIST cfn_lint-1.9.7.tar.gz 2519610 BLAKE2B a454027a85bb55770b91ab4d801ffad807a2b9200e88872e2149485bb17196e050e0eea02db9be6bd705f7b427d825b5510cd0e78ff4d0db2cefa988be138782 SHA512 b6fff3b56f78b85d7335d33fa93e41003311c60f008ce56ae3f373ec32b2105ad40bc68210bd15ee88cc4bcb9f6cd61bfb1367773ff870cc4ec1807aec011100
+DIST cfn_lint-1.11.1.tar.gz 2415408 BLAKE2B c164f6cd520e4106ff9cfaaffdcb66860c3e66060aad484a488f22a304c56c5a365389e63f948d647e37e10ead5f6c8e5bb435c842377e4db122805d7bab218c SHA512 c8295874345b2a561e521b732031558ff4d1de11fcd912940955301f0c4d1923d11d7d8f2cf5a90c3c540d3b28dbcd9f18fb01778fa9678e3fe6722d732d4014
+DIST cfn_lint-1.12.1.tar.gz 2614931 BLAKE2B d72638fdce0a5f72778979bf4ef1fc809a48e4d8bad2daf98bd6d5ebf323360e900f5b8900117999ebf6d89bedfe15667cf2a2a1e31be5b72af1e34a65d15b88 SHA512 9a0e9124536b13dbc24e8e60228ae2afac853560ac0f2cda394b4c6a65bb43e2f8f5319148c5c5f4902109d75d90a5e45197503bbb5f78904eec4604123dbe8f
+DIST cfn_lint-1.12.2.tar.gz 2615220 BLAKE2B 1037d7f5c8c598eec52570821f9f8bc1458321ea54af46a695fbf29dffb27e34cb4ee92ca982fa646cebf5b47d89ae8f093224951b501f2958d4aec07839a983 SHA512 6aaae4e0003e7547903d3bddd9a5ebd0600f245456ba00967a903658d761c7efe696c18bcb9f092ee6b88053b7665c1822e20933e0f6bd6931a09dbb7e520230
+DIST cfn_lint-1.12.3.tar.gz 2616778 BLAKE2B bb17cb966103680ea0bb0cd18719ef7988e2d0e442d1c001338451eda806d1262a790fcf732ffdeda4455fb0ffc8a614cba9c03f78e75916675c55f51d6002e4 SHA512 11aea72628a5b7ad7e2521379a0c63fab44704ad57ddacb593337007814ce7ef6b3d22db3c3fe13eb7fc4d96a42db1dad01a392ef865331168f2bcc8e0c3c4d6
+DIST cfn_lint-1.12.4.tar.gz 2870663 BLAKE2B 90b1c2682a143108f077b1239171cb410657a33f1970e1f9fbc06774d1301ad0c28e364d7cf60163cb1d62a3c24221595e722db1fda5b79aebfd4fb321008396 SHA512 04092142a5de5da4cf2e94fe425c696cee3fd438fb569faa16bd390f3f3b8bfee63397a2aeedca99950eb656916b04456d59f2069c8479ce4c8acdffae01018a
diff --git a/dev-python/cfn-lint/cfn-lint-1.10.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.10.0.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.10.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.10.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.10.1.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.10.1.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.10.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.10.2.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.10.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild b/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild
index 4ec420c8b216..067ed8be2ab7 100644
--- a/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild
@@ -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.89.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild
new file mode 100644
index 000000000000..086f03ea08df
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.91.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.12.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.12.1.ebuild
new file mode 100644
index 000000000000..086f03ea08df
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.12.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.91.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.12.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.12.2.ebuild
new file mode 100644
index 000000000000..086f03ea08df
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.12.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.91.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.12.3.ebuild b/dev-python/cfn-lint/cfn-lint-1.12.3.ebuild
new file mode 100644
index 000000000000..086f03ea08df
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.12.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.91.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.12.4.ebuild b/dev-python/cfn-lint/cfn-lint-1.12.4.ebuild
new file mode 100644
index 000000000000..086f03ea08df
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.12.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cfn-lint/cfn-lint-1.8.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.8.2.ebuild
deleted file mode 100644
index 067ed8be2ab7..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.8.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.9.3.ebuild b/dev-python/cfn-lint/cfn-lint-1.9.3.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.9.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.9.4.ebuild b/dev-python/cfn-lint/cfn-lint-1.9.4.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.9.4.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.9.5.ebuild b/dev-python/cfn-lint/cfn-lint-1.9.5.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.9.5.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.9.6.ebuild b/dev-python/cfn-lint/cfn-lint-1.9.6.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.9.6.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.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.9.7.ebuild b/dev-python/cfn-lint/cfn-lint-1.9.7.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.9.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/dev-python/clang-python/clang-python-19.1.0_rc2.ebuild b/dev-python/clang-python/clang-python-19.1.0_rc4.ebuild
index 7f3de6814bbb..7f3de6814bbb 100644
--- a/dev-python/clang-python/clang-python-19.1.0_rc2.ebuild
+++ b/dev-python/clang-python/clang-python-19.1.0_rc4.ebuild
diff --git a/dev-python/clang-python/clang-python-20.0.0_pre20240808.ebuild b/dev-python/clang-python/clang-python-20.0.0_pre20240830.ebuild
index 7f3de6814bbb..7f3de6814bbb 100644
--- a/dev-python/clang-python/clang-python-20.0.0_pre20240808.ebuild
+++ b/dev-python/clang-python/clang-python-20.0.0_pre20240830.ebuild
diff --git a/dev-python/clang-python/clang-python-20.0.0_pre20240815.ebuild b/dev-python/clang-python/clang-python-20.0.0_pre20240910.ebuild
index 7f3de6814bbb..7f3de6814bbb 100644
--- a/dev-python/clang-python/clang-python-20.0.0_pre20240815.ebuild
+++ b/dev-python/clang-python/clang-python-20.0.0_pre20240910.ebuild
diff --git a/dev-python/cli-ui/Manifest b/dev-python/cli-ui/Manifest
new file mode 100644
index 000000000000..00fdc0b2f69f
--- /dev/null
+++ b/dev-python/cli-ui/Manifest
@@ -0,0 +1 @@
+DIST cli-ui-0.17.2.tar.gz 13366 BLAKE2B b5dbccf136dad09bf213e199050c31cce545a44dd46b61f8eaad8b40679203da5b742a1deefc0f934bbbab286c101892d5b5e93c45624631f778245c4724ddcb SHA512 ea38c3c39b24f322b58f8e95e43609a22657018d36fd28d5dfa7887295eb4ad374032fdd2330762ed50826211ed11fa6a6356d93d09b2135264cf59f13749993
diff --git a/dev-python/cli-ui/cli-ui-0.17.2.ebuild b/dev-python/cli-ui/cli-ui-0.17.2.ebuild
new file mode 100644
index 000000000000..be3d46adfd91
--- /dev/null
+++ b/dev-python/cli-ui/cli-ui-0.17.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="poetry"
+PYPI_NO_NORMALIZE="1"
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for better command line interfaces"
+HOMEPAGE="https://your-tools.github.io/python-cli-ui/
+	https://github.com/your-tools/python-cli-ui/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/your-tools/python-cli-ui.git"
+else
+	inherit pypi
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cli-ui/metadata.xml b/dev-python/cli-ui/metadata.xml
new file mode 100644
index 000000000000..bf5bc3d28120
--- /dev/null
+++ b/dev-python/cli-ui/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/your-tools/python-cli-ui/issues/</bugs-to>
+    <remote-id type="github">your-tools/python-cli-ui</remote-id>
+    <remote-id type="pypi">cli-ui</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/click-option-group/click-option-group-0.5.6.ebuild b/dev-python/click-option-group/click-option-group-0.5.6.ebuild
index 10f02af114bb..a337ad9aea30 100644
--- a/dev-python/click-option-group/click-option-group-0.5.6.ebuild
+++ b/dev-python/click-option-group/click-option-group-0.5.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
index 8f0be216f15a..4ea753abf16f 100644
--- a/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0-r2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/test[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 4b2c0a5102ae..884a0b6777aa 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1 +1,2 @@
 DIST configshell-fb-1.1.30.gh.tar.gz 33179 BLAKE2B 8664ec42727fb9bd41600c2844b9b59423c21040e6efc201f40b54abf6d788fa5237d38e2795d0d19706303d99e7ea859b399fd5f122cb04effc643a33b264ac SHA512 b3189130ac047fe28ea987391591b7886f7234864d455a8423d1d65b02a514511e2a32dce1429a6b71cedbc0b7cb6e6e10f29d240b746d222c285f0baa6b46b0
+DIST configshell_fb-2.0.0.tar.gz 33794 BLAKE2B 7bb46a19b58107c7e4d0f7a4dde9520cdd31b85238ad7579f85c30f855c7fb90736470419e7f6882bbeed89d9d55091b92f7a3f1e4bbff5e5a9eae813c148756 SHA512 3e0c0c3fda661cd09d80cd07e32cc942aa804fde49c00cfed5234671b1005f8126264c39a72aec466b3b9324366faa83828eee74f8b541d6f8bc628548d31a9e
diff --git a/dev-python/configshell-fb/configshell-fb-2.0.0.ebuild b/dev-python/configshell-fb/configshell-fb-2.0.0.ebuild
new file mode 100644
index 000000000000..dc77fba66ca9
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="
+	https://github.com/open-iscsi/configshell-fb/
+	https://pypi.org/project/configshell-fb/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${EPYTHON}" examples/myshell || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index b85d4878838b..ec22239f2293 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1 +1,2 @@
 DIST contourpy-1.2.1.gh.tar.gz 13440991 BLAKE2B 2e792ca990244f7890462b84a2f23e4fbc31fd8ce0a18bc8724767dfa4b5fc0a4271dc6989531423db58d567706a28ce95e680372dbf64bae93a09914353f3ac SHA512 2bb2ac7436cbee1ebc69e6edaf3166e294de32711cec506ce9a3132f1cf20ff8de70af27b432b81abb582c9fe30239f8724f68936908bdbf6348eb249eaae4d5
+DIST contourpy-1.3.0.gh.tar.gz 13445333 BLAKE2B d49131f0d46f4000ecbd9caf7cf63c3089085cb6ce85f745ba737f0c3a430e8f5594205dd6be0e5fcc1ae8572594825b363b07c01feabe8ef13641eacc4a9ac0 SHA512 aa16e87879f3513219b1c1f4e001e99c9842248baebd2b1632b3177b141c16ed7d28efcd96bb33bddf941fa1613887691f4c293262c1fe7f82d12c0713fe852b
diff --git a/dev-python/contourpy/contourpy-1.3.0.ebuild b/dev-python/contourpy/contourpy-1.3.0.ebuild
new file mode 100644
index 000000000000..f727168c7b42
--- /dev/null
+++ b/dev-python/contourpy/contourpy-1.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022-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=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for calculating contours in 2D quadrilateral grids"
+HOMEPAGE="
+	https://pypi.org/project/contourpy/
+	https://github.com/contourpy/contourpy/
+"
+SRC_URI="
+	https://github.com/contourpy/contourpy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/wurlitzer[${PYTHON_USEDEP}]
+	)
+"
+
+DISTUTILS_ARGS=(
+	-Dwerror=false
+)
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# linters
+		tests/test_codebase.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild b/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild
index a086dee59df6..8ac268b1aadc 100644
--- a/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild
+++ b/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/coverage/coverage-7.6.1.ebuild b/dev-python/coverage/coverage-7.6.1.ebuild
index 17b43f197092..306dd457ced7 100644
--- a/dev-python/coverage/coverage-7.6.1.ebuild
+++ b/dev-python/coverage/coverage-7.6.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cramjam/Manifest b/dev-python/cramjam/Manifest
index 27f2ff5df8f6..e6480bcef5b7 100644
--- a/dev-python/cramjam/Manifest
+++ b/dev-python/cramjam/Manifest
@@ -1,4 +1,5 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb3d7c2f362cce23eb29b4ea836451372d6d88552a4435ae29bb41d6230d55f625a4359eace680b9b771d0ad SHA512 12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
 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
@@ -10,9 +11,14 @@ DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc
 DIST assert_cmd-1.0.8.crate 27830 BLAKE2B 68fc42953decc5a39a2a850750348da087a2df29e9e15dcb3f0319088ba8ca399f8db05cda3de693925dcbf147b2a031b0e0ddb6993f25b8b96f464f792cc499 SHA512 78c5aa45289f1f69891001b73f7da32ef61a371a2fa9abe15822406abe4a8df48004b475a00aacd36c2e808539041fc0d3034c367a27de6b539c72e929e42e4d
 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 bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
+DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST blosc2-rs-0.2.6+2.14.3.crate 1017747 BLAKE2B 9af97508e8c91aaa915c125286f78bf85219860334f2f4431080b3584fba7836e740124726d7c44d4efbf4fc6885834bc7b222b32f856a371576168d628a8b3b SHA512 2a99cbd47e9134545326b5e435a55a0a84ee15c85037b6e1849646dfc3bfeb7289fd60f0c7f740990bbb3ab0fa3f3144e78b90be0791587451e851705cabc081
+DIST blosc2-sys-0.2.6+2.14.3.crate 2686603 BLAKE2B 36b744413590e86d131a5390c20f65be26dfc647c1abe66099e326ed19e03a8b0fc4fd1ecd0c6a34f95773249938d30184ae32fa44dfcf1730ecbf07e0156fee SHA512 107ead1745377df59c03506c9a561e3a8736e364965bece259ebd2755efa7a1b4197463f509b6efd6a49639e273ca9626d7205880fc7cc87813e954814ea7e25
 DIST brotli-3.4.0.crate 1362057 BLAKE2B 43655242020a6782f7507e928218b8375ac6ffda758689c72f68342a94a7d94cef2d1f10c035f952a243328d03c17b1b5b027dbe7abd1fcfdea9354d218c4d1c SHA512 4f08f274f1fa00d8b40b713e4deeff0eafdbfe8621c5478777df6efd72690cb214974fc9f8fd3f070b3f587c99e3f4396c2409f7c7289f6c7225238e1f14b302
+DIST brotli-3.5.0.crate 1390231 BLAKE2B 40a2f9c045ec2ab23d54efab7c2a0336183c53c8369d6bc5d37309619768cb1dbba55dea19232523826e04d234eb7730fedd4a25f613a649a0717bec54f2074e SHA512 e6d5b3e59606dfd76cc8638895fbf03f36a19750faff6fb8ceca0a091c620ca1082b99fd89390d74c212f1103f24edd6d8fc08724898d695020cf5de66cffd56
 DIST brotli-decompressor-2.5.1.crate 193087 BLAKE2B c7f2e2ffd7d23662e4b9fd9a0555ccd524304aee6bcfb6ae8e450fcc91f654671b5e72096e6c1dfebd3afa04d3f854b5aefaf7140e8c112f6eb43c0ed5a1aacb SHA512 b8ff328669cfbdc2f74203b782cf7842659d93a1f71bac25650852be7ffe3bde08b6fc821ae91419672399f0ee3bf1c09aedf1858fd55a5cc9082c4a7d54b7aa
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bytesize-1.3.0.crate 10164 BLAKE2B 049f292705082dbd3b2f0abb6f153023613107949f4849154aadce2181f4568ea1b3c12f00b6ad56146f8a4f3b07b7025498e0c989ac6561ac7255720b85ffab SHA512 c718af51b0da2979b70142012544fde6bbf8639cd4fde66a8066b138f7f58dce019209e27566027dc0ec5a7fc1d2ee17b9b6366cc7a5f95a6419e29a0ffedab5
@@ -20,6 +26,7 @@ DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed74045
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST cbindgen-0.24.5.crate 196574 BLAKE2B 306028d377907f704c1926a989457126fc3928e6780da64672650090f837c25c5496fc72a5c8408c599aa76352f2a625ffe926af5dfc51bf890b6e66e4c44406 SHA512 16eb2267f6f75599d8cc4adc05a1387b8b95e595427bfee852f1746402a9609520f364b0fd443ce780f44a61f5b4b3518f2b021a4ff08d1f160afcb0a3bccecb
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
+DIST cc-1.1.16.crate 83180 BLAKE2B ece068be561b8000ae82d77d084d34db2be8db6af2fb86fd2cdf25e7c313d4905c093d604aeed53d9268a927a4236a7a4c1d54c06721683b43f00835be93f798 SHA512 0f53ea7363e2e225b7c61339b217adee84f17d9b04123c4492ed2cf722fa0fa3308ca5b8ddcb249785772926d70aafb2eb793ce4abdcf9482b87c0667a5fe8c3
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
 DIST clap-4.5.2.crate 55385 BLAKE2B abcd6b7ee876dbaafd446e0bb9e18297cabd6776f003fb79732584d15eea58d9b8550891b0818f9670fde63c36f51e797d2e3788ff6a493708d8cabd494b5a67 SHA512 c74752b5a161ed5a48cc5f2ac3bf15325cc955aeb828273fe8b7be00c0e5bdd09ca6043c95c9d2908a1e44e447886859fd2a79e0014f508bc03b3b01f4567759
@@ -27,84 +34,128 @@ DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e
 DIST clap_derive-4.5.0.crate 29042 BLAKE2B 80a7646b2e30432008d52e27494e2563637e408a90557e5b0009a9db6a39abfdc79c04139f99caedd433a94b45f7d95fa11b49cfd33d203fbc4bc911fad4f9d1 SHA512 0a9d79f957067b929f8e1340b0e0623f78808c5d287cae252e6508fe8e07c4f11bfa39b1d3b60bb6a531d888d809c43ad3f6a491a7dd1e3d3ce89af7e1b670f6
 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
+DIST cmake-0.1.51.crate 17566 BLAKE2B cf16dd1356ac8253bd2cdc40f9c622cb011bc24090dbd8c41e881814c982cabad67d60650b3e35e8efe1278b6323336181a32829c4692a1fe5eae8cc888c802e SHA512 fe3bfc37b704eeda8ecd3d220cd8bba8d2a79d6358bdb06da0f5f3317d6e34b3ea66989c86e1b79820e046449a4f715cfa65b7d57299cf5aff2326569d5d3726
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST copy_dir-0.1.3.crate 5831 BLAKE2B de7e655e9716500db72cdb16394cf76a50f7b9861b9df6e0bd0a450b9475112f7e3ba3bc53ffde2c74ce540f4a48e2703f8e5ce83ad8cbfae06e51c16b2cdc63 SHA512 cd83244960be0bae32ab0480d1057c8a99e4bfd1c4622eb0b85692f2255ccac38678e608c663cf76ccf11d8c0d2415b15ebfd8328efdfbb37bca448245338fa2
 DIST cramjam-2.8.3.gh.tar.gz 1083223 BLAKE2B e388c82054938cda08ab465a7a6f94fb1d91b39245f06333747c10ef3d5807e61b8b05cbdaabc7f0f6994385fca7c316b1241b3d8bb04843b1e71418709e29bf SHA512 26e85bcc09eeef9623bf69f0659e33310c6a0152c3b89572db7e7584319790b682af65733bb863e69204ce1cea37b30de530bb7f1c686e98217f2bf52b81f9d4
+DIST cramjam-2.8.4rc3.tar.gz 56129927 BLAKE2B e12519f8607e1dca6d48c1e2add40e6e05e54a07a7dbb8a15bd0e8a428db9f5480b1118ff10ba3cff2e1d30354ce1affcb5bdf25f749f2ac9754d08e457b13b7 SHA512 21d6703881227f9c513e68a6878e34c04c586674b096690749d61510c7f60cc4e8d3c08e4cb711e06aee0655d4006ad2604a3876fa59d4e8c771629dc84a60c7
 DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
+DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
+DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
+DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a574c7d28e11d15e6c3c4686c42ba98b5769a08c21f3b9c6ffe7140196c3e7001153ff5a046ee7af40f7f6d965 SHA512 59a871137518586f1d66810528595acad5ca763ec5acc100098a372194f55f33b48e59c0806fd237c644a6d797b5deb26c541fa871a1194ee3ac725da3b6d134
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 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.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
+DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST inline-c-0.1.7.crate 108174 BLAKE2B 45494da78b1db077740eebeafe7bb1802209e713daae82ca1ec021e5821dceab101a0e01f371b3f7afb51d2231444acec11a67a075017ba0b920460da56e730b SHA512 adc775e1249f9fe8d574e91921a3973078fb621c20f4ffe22b99577e6c67203bcbba326abe49af78f9035b05f498fe5f4070571c3ac01f72c28350334dcfa49a
 DIST inline-c-macro-0.1.5.crate 2449 BLAKE2B 85d6260607c883c7c1587a79cb1b1cb18768a4929ca4d39fe14037f6dfd25d335fa30ae4441745b4c4a010e1e831210329161f4d997093712c078fe5921a8f37 SHA512 309f5aa8fca172bd17c9998820a1d05e9113b3388bfc1d96678d20b5c35b01d0c337785d07004191e153fede9a2735a3561769fc3719675eb4625336f9763f6c
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jobserver-0.1.28.crate 25543 BLAKE2B 90fb1d8696b575b16b5b12d6fa4e7bc7890f5f09110b147d65eef8888a16ace1446a789f8079a3706f0252be8a04061d989bc8fc53e6c004d6b8a4094baf1642 SHA512 8ffb33b8c162935de1226e0ca4048f36e6e90bd1731cc7f06110bc97e2adef904f777df0ca4ed48b3b8ee4f2c243b2f883f6897427867904aa3385098abcbcee
+DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 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.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libcramjam-0.2.0.crate 10406 BLAKE2B 7431bb2a68756692a48470459f56ba9907e1d4196b0e4f3f95f5a8c735cd851a928f45c27666a12c613a9c05baa3fe63410fac661892d0c87007d9f36e13ad3a SHA512 4cdaa885d944e918ef12b0e7c8e557faf5d509810c0e7183f319d70171f9b0baea62c02a90fcb13d8e05f26e371ee86b2906d68c92bc05c4fafd275c83fa5b69
 DIST libcramjam-0.3.0.crate 11329 BLAKE2B 784b9594fec2ea5e9724f1d32b707e7334e667377534998105f951d88d900c51544b24446fa05abd21cb070463e181927ddae3ce23c3d738be54717894e18247 SHA512 65573147003e4ae1abf513d8783362590cc9fa21d8a6f29b903f571e7f71c17339b52f25be940a98a5a2de0e87e1ffb49557794f593cc7c99810dd004521c0af
+DIST libcramjam-0.4.2.crate 15041 BLAKE2B 7bb2613847c185ba4fb72c413b6749f457e391d417c1d714ff12aeccefdd661802dfb4956045288177f6c8b5f135e3cb77ad7b5050721953894adf617d03c5e7 SHA512 286452c39fa8ed51b9ce8dd4cbe8f12374b17c2b07d0fa37b7a63186e91d3cf976dc0a62335e3f484a8ee06438ec9a9012f194cba0609b7a596bd1abab16147a
 DIST libdeflate-sys-1.19.3.crate 192512 BLAKE2B b8417cc872e5038e9177179dde7f8c5eafdcbba273ff0c1fd107ec286cd54f4a0e3c3e4b3df55db5364d39d49f803539ee5b649526cd5e057a3d2d4beee42fed SHA512 c1b708672f6ce85579e5dda2537fe6804e73d92053a08387b2ec09388f0697fa3230298931116f482ae4242a0bf7afda9d8f309a13222ef5dee94f56a009890e
 DIST libdeflater-1.19.3.crate 24046 BLAKE2B cc6a1824ca9f51e7c4f01fad9e433e8ef509078252d8fd7167e1fbdcab604a23f90d7cc593ac1dd15623454c4818d16e60c722397f537a0cae57a67f3ddf25b8 SHA512 b6bd4c8cb7d56771f92fd1491fec2a8a7cb1493b3e86866bd5e029c9b8a55fbc343433a5ae6f575adbb0774767aa7224e714d3db27b14557683e2ffb97e2a4c6
 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 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 lz4-1.24.0.crate 13361 BLAKE2B e0ebfab2aceb6817fea87d703b9c63d7248156d6ff4a051b4d41beceb0462551e9b4b7250a1bba8724fafbb90ab3618aed115d3f2f90cf184013d4eac76e93d4 SHA512 971e6265f12306ad228841ab5b72cfb80f001e57c2e3a815a8fe4a343ee2d93cfef6155ad4ff019873555b7e843ddffb1b70e22a057bb79b4688903c9407bcbc
+DIST lz4-1.26.0.crate 13582 BLAKE2B fcd08f9c45d28b74b133ea75e401002d0293607097301b4c1904563d32fd28809ac8b897d541412b24ad5047fdb46a4d2058946595976cee97bae8c9eaf69fc5 SHA512 d7df36012fb69198c80bd914fd6bfd7469e35cded512efbc0406361a427b3f107cc5bda830f68f5a9d7ef8d1026017b55723f9f5644cdd3170227d4e8463eb9d
+DIST lz4-sys-1.10.0.crate 355645 BLAKE2B 1921d745a93b0f5236fbf5d6bf6da3aae9874fa33a2e5f3020560fba3a5490c33ba1a81bf59902b1e52b26d1d5a1c3032a849b5bf1fdc7ecb45ebdf782cca365 SHA512 9e65fa47b8740dcdc3956f92f8056997a1e37a4bd80a50e60a9d33883a910d31d7e31c7c43e50e09bc191f6f669a0dfe621dc5866d8cf93cbd4d88a2ee23f0ca
 DIST lz4-sys-1.9.4.crate 354842 BLAKE2B ced6f5f681003284d6720f3bf4af4089b991320fc1ba52a445d67ae118a573edbba9dac656a4f04dab50e3d4ea8c1b32339f3413a5e590a597c2407a963da646 SHA512 a0cd903494db1089965f5316694eb23e219002c147aad68794d57e7206aff641824e54f25f7c4cbe08bb06a63e6f5ee4c44447aa7f7057c8467872d69c6f0b06
 DIST lzma-sys-0.1.20.crate 760045 BLAKE2B 1f66d32008178c218575fba12df95a2cdc448e080c0a81ef4617f35dde09f0d56c86c28050db61c2ae7b464d0eaed7dd8c59a1fa605b39ff8c329e49165cd922 SHA512 393908b4e3006e4d9948a077d84ba7f5004765c4cc0f854e04847e504a246ab9a8e761fa48d4f211a7ac08dc119d950481da1ed1a480778d6b6e9b446a697279
 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
+DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
+DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST os_str_bytes-6.6.1.crate 27643 BLAKE2B 8440a196a3d3d9c3a584562b6c2a1033f5606998e8851f8ccaeababe58022a42e65510e12ebdbcc7b24d0fcdcf111d68bf00d89b8665ad5cee49180db853789d SHA512 977c0fe9891c021914153d6a081c3789018fcd1830224f5c6768d0c75ac8ac4919638bb0a41949710fd5e699b162d9290a5379cc6251535a127e212f5b86932d
 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 pest-2.7.8.crate 118214 BLAKE2B 8f3fb4b712c866247ba90a5518fb90c0b117fb742b250c72c43b02a8f71b6ff8bed1d61124f872401b3451a31ca22106d3eca721a5fb2ab3a2337cd787783e8d SHA512 0c4e70e57b60aa25226d045777538f0d1703b7ea847da276e0b2ba7077269df6248294675aaeb65fbe913c54cfdd17dffeb02a6fc3b3221ca378ae31b6f7d20a
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
+DIST portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f909405090318a9d6189fc18683ed21074e9360f213b44c5213f3561e3dd1f642547c2c2e6682b9e1efa63243c1f12636bb11bd15dbe SHA512 0849edaa7a1f9ea66182443e31691e7839c857240916521bbd6009b5e692b13f5b315df36e656134651386bc50d895ecf6155a906750009514cad8bfc7e57fe2
 DIST predicates-2.1.5.crate 24165 BLAKE2B a0eb1aa0f26d51140155b8b5e7141a253e298ac2197e59c7023ecc693d68cba01d645792c57467741ee074891438fba2f1439c79a4cef27f3d02eaec8f1d0b10 SHA512 d4b555d7f57ccec5788a957d4a3e130f5549a9333a47654baaef098bb284c64bd5c662677ba7e659b4563b3d0146914f1235e0caa2274af8787d9777141f4dd4
 DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
 DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
 DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
+DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST pyo3-0.20.3.crate 434673 BLAKE2B 1dcb881fd1fe5c76e9b4951f4d95fcd1daa1845c226a4ab1db4283cabe67bda822ff03e3cc85d797fe4665a1614229e7406dea65ec5e99ce4aac96b973a7f55d SHA512 77cce558fa60bbd8d9981ff5e62fdfa9bac94bd650b287fbf14ac93ef1c326c8ae7fda82d744e3582df03cab8adf490e0f2752fabd9ae3de044e7d80984e0350
+DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
 DIST pyo3-build-config-0.20.3.crate 30060 BLAKE2B ef122b0b7d840d5362928bac76e1299b333775ec5c49a3bf23a19eccec074917931356bbf719c6d700999941bb6a396948ee7f8761e685c8e9251af07ba0cadc SHA512 70685415bba443787dabb9c61ca3702aefbcacb0705471b496b4f01efe34291735321d91243355b4be9aed8b243e393c09fb65556f1b926ac7f22f64560bd927
+DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
 DIST pyo3-ffi-0.20.3.crate 65024 BLAKE2B 33e79a02c7ab85f4767e02a39d8553ddc015c80d13bea674885ad8a18d89bd90f866cc39d81ecbf56270ebe87d29bca48f635c4e73ec99df02ce425f1427cb31 SHA512 3d1ced58e243be7cee4a3ca831dc08a1631fcd511c707dd3bada87d7662807dea2d88393d76e56ff19a6d1c2804d93b5b6b7b5efd36b9c275d66fa1bb1bfc384
+DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
 DIST pyo3-macros-0.20.3.crate 7920 BLAKE2B 0510accf51cd83390cbb7b6ba4ec9f4610e3dbb7448d1213994013487ae81bb087df1ba0076a3862e5ecfd172b7846f9439a2d86950a93b016aae565ced4f03b SHA512 454f3c0c054aa131ffe955e4be1af061005b9c81b4d80702827e19b983224c118dfea474da515d5fc2c79cfd3fa21204ed4af2d9e81427123e0a78bd246a23f8
+DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
 DIST pyo3-macros-backend-0.20.3.crate 49797 BLAKE2B 59c55d482577ce105db3e19a1db794eaab8221d7de01197716b75d5d2602e0f27c86aaae527eae7098eafad311144550bd597efe8cd6560c82dc435021f3428f SHA512 e177ee0d6a538a555fbe9108e3e2c20102622b2c9b9696ae309189e5c4d068efad2132afd4a97d734ebabb4d7146980a26cb68dc05d5eb88f338be2ad0cd651f
+DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
+DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 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.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
 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-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST rustc_version-0.3.3.crate 12119 BLAKE2B a8cfe3dcbaf436b74e9798ee1296ea7aa372cfa26788b7a84c9ce7ab3de5c5e00c6962e4310aed9bef8584e3c30298bf1bec1ac23c3b70c6aea32394359712e8 SHA512 37732b3b28eca41de205db34479c75b31af4ddd811f0f1606933eb31e25e5ed3966a41a8b7d338be20fcf47540629824c41a267436c185a98f8acfdce608b5cf
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST rustix-0.38.36.crate 370932 BLAKE2B 0c4b963c9045fbb6fd2e4fc91888f574de531074a4a131aec9d8d2f44f3839778bce601050848d9edb2ce4019a94d3226835f7a776af682daf73e5cc52eb6f5b SHA512 2874bbb5fbba8b9fe883cdf21e9662e84f32a3fdf50c8662a908754436d16d177c4c01810fd08a01b2690c79bfeaf8abf29e5efa0987348d93671499cb2fd550
 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 scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
+DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
 DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
+DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST snap-1.1.1.crate 33763 BLAKE2B 97e8dfffd23684539e4788740a5cbe35ed8808886087188106c2c9f0d5ffd45057dc5c5a1f1664c2b654bd2924580cd8880a09706813afd4b00d916463f17095 SHA512 8bdd04c555ff3b60ffed9fc6e0ea38168e60d0d340f488950d25164c69e274bcfe832d2db1142ee8c4758e6e2a0b72b5f4b89a267ec9778a64ae8366a2cd472f
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0e15b07101a680394204af2df8897ba784dbe57b95c4fa9e732439d0f5aabb090b1b1c81f066bfa125919419 SHA512 ef4165dabaf8cbdd6c58420043cff9c0d1f4bc3ed53de5973b654bd71ac7d462fecaa6e1b750fbcbb8e19b35f6e6b73641a17656b20f5562b6ba7d84e69de226
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.52.crate 254728 BLAKE2B 1e56e49de8fee8ed47e89a0791bb0188ee8f0dac127f6e17a1c91a3cb8744a61a6e3b8d3a7fa5cc450a453e9ba7c9ed844302d23cb6e6cd8ca8c624ca475b32e SHA512 a0fb277a4d4611c465d76adf83040a6ac4375275d9f9414fddb34f577573b0f5890b94773bd57660e9af4b65778888ddf34c99d829fe4f58a966484cd8dd9b05
+DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 DIST target-lexicon-0.11.2.crate 21796 BLAKE2B 254923a6dafd0727bbb3626cebc4d16a6f6deead7a9f43e7f8b34debe66c02400ba614a5414202768d89a5c4c4f3cc10d91eae3b52dcce436ac1b085072a6128 SHA512 46d2cab7682787b1ae5024b07823ee706e9f86d08f5ebdfadf308a209ce672a9693c737d1cc9e318bdbb151d22075a93c1a8c7320ba532ae3768fdd1dc5f1578
 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 tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
+DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
 DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
@@ -116,28 +167,43 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 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.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.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.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.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.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.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.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e
+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.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.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.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST xz2-0.1.7.crate 23892 BLAKE2B fd4b65cc82405f28a3d9fcc3db9dbffac41ae8ec7e767f3405bc9c7e45000b529cd571f72a76e41f2fb9866e7af8ab37d9f1ab8e6f14652495d306ba0a745879 SHA512 9969ae958b157f3d49708bd00640e57fe7c3826add2871575bdac03e6064aabd28392e3062bfbb833752df374195c50b19dc6b6c08ac41455c492213fb91fc74
 DIST zstd-0.13.0.crate 28911 BLAKE2B c2045cb42d2ac27af4231cc9b6a1734a8ec44121e91ccf3672fe11acba7627986705816fbfb0228121276b1557e7c96a6a44a89716e979f699b069154256b1c0 SHA512 daab48e7479826dbc14e7594b3c97c06eb2903f2ef94af419f0f5bb201931ecd917935d27049da363c9edca7cbc3b5d0ad3dbf3805376627df63862c658d17cd
+DIST zstd-0.13.2.crate 30251 BLAKE2B 7a13a094791b13b9215cce3aae5f99b86dc76ff271324a67170747f56b97df514762a0c097e6376752d2a5b35f9ef03d76e0c362e34e15ca02fa3644cc933131 SHA512 9cc3584f74da6da6920b74a7125b4eee9133ae00776aff3c77404fb438e05831f654fce46f7ebab442b04f20f84c11ca58f7ebfe7ff506833c38e919ee3f8572
 DIST zstd-safe-7.0.0.crate 20463 BLAKE2B 8c4cb034d1a12ae54abeeb8f12101f09ef82115ec26630103e7fad29ce1d0045e59dbd8ae301dbe8f47c90515ab9575288137ced98aea667a9cdd7ad0e2a6234 SHA512 2f0d66c874f7880d05fce39f4bdec5e217e8e18b44bfe97b4ea33c7d5c8719c5bd9615f7274f0b19734a465eb2477993fb8ae8d60abc7da36eac361e8fc4a437
+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
 DIST zstd-sys-2.0.9+zstd.1.5.5.crate 728791 BLAKE2B f08f8730d9cc1efc5520f223e9bfb0854b3a67a2907e47c38e0572d8eca688c1bae61560e11e664834dbff1bed3d40608b23d08f102ce6cd7f1af72b48446e4c SHA512 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa
diff --git a/dev-python/cramjam/cramjam-2.8.3.ebuild b/dev-python/cramjam/cramjam-2.8.3.ebuild
index 9ecf01a66f3b..73bb943dde59 100644
--- a/dev-python/cramjam/cramjam-2.8.3.ebuild
+++ b/dev-python/cramjam/cramjam-2.8.3.ebuild
@@ -204,12 +204,6 @@ src_test() {
 }
 
 python_test() {
-	local EPYTEST_DESELECT=(
-		# random health check failures
-		# https://github.com/milesgranger/cramjam/issues/141
-		tests/test_variants.py::test_variants_different_dtypes
-	)
-
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest tests
 }
diff --git a/dev-python/cramjam/cramjam-2.8.4_rc3.ebuild b/dev-python/cramjam/cramjam-2.8.4_rc3.ebuild
new file mode 100644
index 000000000000..682c6159f6fc
--- /dev/null
+++ b/dev-python/cramjam/cramjam-2.8.4_rc3.ebuild
@@ -0,0 +1,198 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: you need to use top-level Cargo.lock to generate the crate list.
+CRATES="
+	adler2@2.0.0
+	alloc-no-stdlib@2.0.4
+	alloc-stdlib@0.2.2
+	atty@0.2.14
+	autocfg@1.3.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	blosc2-rs@0.2.6+2.14.3
+	blosc2-sys@0.2.6+2.14.3
+	brotli-decompressor@2.5.1
+	brotli@3.5.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	cbindgen@0.24.5
+	cc@1.1.16
+	cfg-if@1.0.0
+	clap@3.2.25
+	clap_lex@0.2.4
+	cmake@0.1.51
+	copy_dir@0.1.3
+	crc32fast@1.4.2
+	errno@0.3.9
+	fastrand@2.1.1
+	flate2@1.0.33
+	hashbrown@0.12.3
+	heck@0.4.1
+	heck@0.5.0
+	hermit-abi@0.1.19
+	indexmap@1.9.3
+	indoc@2.0.5
+	itoa@1.0.11
+	jobserver@0.1.32
+	libc@0.2.158
+	libcramjam@0.4.2
+	libdeflate-sys@1.19.3
+	libdeflater@1.19.3
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	lz4-sys@1.10.0
+	lz4@1.26.0
+	lzma-sys@0.1.20
+	memchr@2.7.4
+	memoffset@0.9.1
+	miniz_oxide@0.8.0
+	once_cell@1.19.0
+	os_str_bytes@6.6.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	pkg-config@0.3.30
+	portable-atomic@1.7.0
+	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
+	python3-dll-a@0.2.10
+	quote@1.0.37
+	redox_syscall@0.5.3
+	rustix@0.38.36
+	ryu@1.0.18
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.128
+	shlex@1.3.0
+	smallvec@1.13.2
+	snap@1.1.1
+	strsim@0.10.0
+	syn@1.0.109
+	syn@2.0.77
+	target-lexicon@0.12.16
+	tempfile@3.12.0
+	termcolor@1.4.1
+	textwrap@0.16.1
+	toml@0.5.11
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	walkdir@2.5.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.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
+	xz2@0.1.7
+	zstd-safe@7.2.1
+	zstd-sys@2.0.13+zstd.1.5.6
+	zstd@0.13.2
+"
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Thin Python bindings to de/compression algorithms in Rust"
+HOMEPAGE="
+	https://github.com/milesgranger/cramjam/
+	https://pypi.org/project/cramjam/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/libdeflate:=
+	app-arch/lz4:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+	dev-libs/c-blosc2:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/cramjam/cramjam.*.so"
+
+src_prepare() {
+	sed -i -e '/strip/d' pyproject.toml || die
+	distutils-r1_src_prepare
+	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+
+	# strip all the bundled, old, broken C libraries
+	find "${ECARGO_VENDOR}"/*-sys-* -name '*.c' -delete || die
+
+	# https://github.com/10XGenomics/lz4-rs/pull/39
+	pushd "${ECARGO_VENDOR}"/lz4-sys* >/dev/null || Die
+	eapply -p2 "${FILESDIR}/lz4-sys-unbundle-lz4.patch"
+	popd >/dev/null || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	pushd "${ECARGO_VENDOR}"/libcramjam* >/dev/null || Die
+	eapply "${FILESDIR}/libcramjam-unbundle.patch"
+	popd >/dev/null || die
+
+	# unpin C library versions
+	sed -i -e '/exactly_version/d' \
+		"${ECARGO_VENDOR}"/{blosc2,libdeflate}-sys-*/build.rs || 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
+
+	DISTUTILS_ARGS=(
+		--features=use-system-blosc2
+	)
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests
+}
diff --git a/dev-python/cramjam/files/libcramjam-unbundle.patch b/dev-python/cramjam/files/libcramjam-unbundle.patch
new file mode 100644
index 000000000000..d64d6b0ec36a
--- /dev/null
+++ b/dev-python/cramjam/files/libcramjam-unbundle.patch
@@ -0,0 +1,29 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 1e1e774..451f687 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -63,6 +63,7 @@ optional = true
+ [dependencies.libdeflate-sys]
+ version = "<1.20.0"
+ optional = true
++features = ["dynamic"]
+ 
+ [dependencies.libdeflater]
+ version = "^1"
+@@ -78,7 +79,6 @@ optional = true
+ 
+ [dependencies.xz2]
+ version = "0.1.7"
+-features = ["static"]
+ optional = true
+ 
+ [dependencies.zstd]
+@@ -89,7 +89,7 @@ optional = true
+ version = "^0.24"
+ 
+ [features]
+-blosc2 = ["blosc2-static"]
++blosc2 = ["blosc2-shared"]
+ blosc2-shared = [
+     "dep:blosc2-rs",
+     "blosc2-rs/shared",
diff --git a/dev-python/cramjam/files/lz4-sys-unbundle-lz4.patch b/dev-python/cramjam/files/lz4-sys-unbundle-lz4.patch
new file mode 100644
index 000000000000..27739f3c6e6f
--- /dev/null
+++ b/dev-python/cramjam/files/lz4-sys-unbundle-lz4.patch
@@ -0,0 +1,41 @@
+diff --git a/lz4-sys/Cargo.toml b/lz4-sys/Cargo.toml
+index 033f2eddc..4001ecd66 100644
+--- a/lz4-sys/Cargo.toml
++++ b/lz4-sys/Cargo.toml
+@@ -13,3 +13,5 @@ libc = "0.2.44"
+ 
+ [build-dependencies.cc]
+ version = "1.0.25"
++[build-dependencies.pkg-config]
++version = "0.3.9"
+diff --git a/lz4-sys/build.rs b/lz4-sys/build.rs
+index c69d25716..32a69f418 100644
+--- a/lz4-sys/build.rs
++++ b/lz4-sys/build.rs
+@@ -15,6 +15,18 @@ fn main() {
+ }
+ 
+ fn run() -> Result<(), Box<dyn Error>> {
++    let target = get_from_env("TARGET")?;
++
++    if !target.contains("windows")
++        && pkg_config::Config::new()
++            .print_system_libs(false)
++            .cargo_metadata(true)
++            .probe("liblz4")
++            .is_ok()
++    {
++        return Ok(());
++    }
++
+     let mut compiler = cc::Build::new();
+     compiler
+         .file("liblz4/lib/lz4.c")
+@@ -24,7 +36,6 @@ fn run() -> Result<(), Box<dyn Error>> {
+         // We always compile the C with optimization, because otherwise it is 20x slower.
+         .opt_level(3);
+ 
+-    let target = get_from_env("TARGET")?;
+     if target.contains("windows") {
+         if target == "i686-pc-windows-gnu" {
+             // Disable auto-vectorization for 32-bit MinGW target.
diff --git a/dev-python/crc32c/Manifest b/dev-python/crc32c/Manifest
index 6aabad8ac867..a9cdd4f15cc5 100644
--- a/dev-python/crc32c/Manifest
+++ b/dev-python/crc32c/Manifest
@@ -1,3 +1,2 @@
-DIST crc32c-2.4.1.tar.gz 38277 BLAKE2B 3d4a0eeb5811e8bc46df30b8890ab409de92dc3cfe2c5c3ab355df3394e56812c19ac26523be2cf9c33bb5825fb6e080b6f27ea77bed5c38d98fbe6c247653fb SHA512 005f95f66e97f552a83b5c94b706224f44280895d70c348fee86943bf1589a94b57eeddde5e18499fea9c77cbcbcfd5691d9d4b33ed788dc885a1333b6db476b
-DIST crc32c-2.5.tar.gz 41514 BLAKE2B a9424ef917f3c89f3b8b3881ccd5d59cb8a634d6177260ce9e7300e151e68e97e55b74448dd4cd545d2d66d2e2d8e70a085578719f768662542e43f06e914d20 SHA512 446f2290706eae8a625590c6b314d8422938dd9b8bffcf5e4dd6d3d260932548dbc5d9a9b6e7e5eaaaaac8dce424876f4e4acc9b0b1ea2b7cdc6ddd101228cfd
 DIST crc32c-2.6.tar.gz 42985 BLAKE2B 0193b26a56c6a2ec071231815cfcdf8ab3ce58de98e2948ab68c8ccd5779772923c8fd1464c70376ade8d4a6a38a575f8330791b7cda8de82d001a869b22e7e2 SHA512 7ca2614994b558c0f9b12fb743b0dadcfd6e6e3ab71c7550fd892324a91a90816b2dadf9c9946078e0ee2cd4abe14fdca385421bcd9468e41fd656a080b4d52e
+DIST crc32c-2.7.post1.tar.gz 45229 BLAKE2B 37276efdeb3a3e23bd57795db775441b04d3a72db69dc3a5e9649404c5297ba2d3de39612f906e88f79d1fb39e83cd8a6b5d2d18dda23e6d5c1ccb4779edc557 SHA512 d529de2ec37c8fb4742db515d51d1dde4344617477d2a0c602baeb5f38446a7adda77fa63e3ff1a7e50a25dde147b86fd63a1d83f8f76bbbdf047280799cf360
diff --git a/dev-python/crc32c/crc32c-2.5.ebuild b/dev-python/crc32c/crc32c-2.5.ebuild
deleted file mode 100644
index 73c73f15b871..000000000000
--- a/dev-python/crc32c/crc32c-2.5.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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CRC32c algorithm in hardware and software"
-HOMEPAGE="
-	https://github.com/ICRAR/crc32c/
-	https://pypi.org/project/crc32c/
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
-# NB: these don't affect the build, they are only used for tests
-IUSE="cpu_flags_arm_crc32 cpu_flags_x86_sse4_2"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x CRC32C_SW_MODE
-
-	# force = run "software" code (i.e. unoptimized)
-	# none = run "hardware" code (i.e. SSE4.2 / ARMv8 CRC32)
-	for CRC32C_SW_MODE in none force; do
-		if [[ ${CRC32C_SW_MODE} == none ]]; then
-			if ! use cpu_flags_arm_crc32 && ! use cpu_flags_x86_sse4_2; then
-				continue
-			fi
-
-			# the test suite just skips all tests, so double-check
-			"${EPYTHON}" -c "import crc32c" ||
-				die "Importing crc32c failed (accelerated code path broken?)"
-		fi
-
-		einfo "Testing with CRC32C_SW_MODE=${CRC32C_SW_MODE}"
-		epytest
-	done
-}
diff --git a/dev-python/crc32c/crc32c-2.4.1.ebuild b/dev-python/crc32c/crc32c-2.7_p1.ebuild
index 73c73f15b871..73c73f15b871 100644
--- a/dev-python/crc32c/crc32c-2.4.1.ebuild
+++ b/dev-python/crc32c/crc32c-2.7_p1.ebuild
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 3ff9b3036af9..b2ad66332012 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -6,7 +6,9 @@ DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2
 DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1dd8515ff5ec43abd1da75bbb400460a43a252c93dd0a597c2e44c8e899a376d963f0d3727db7ca2c24 SHA512 ea8bd8150042268092360e6396226ee5e83ba154eae99d299c897ed16e8543fcfe3179e22b50b0497bcf065a16933f4ebf7edcae7e6fc8be3788f0ae7f61c000
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cryptography-43.0.0.tar.gz 686873 BLAKE2B 09e1f73ed47a3ab03b49e6a65eceb0ee506b4e1c50b44cd0f971243159b27ea5f725350fcf2c702945438545a89d96ec026441b6b6151a9022bd61b926ca26cd SHA512 0a93a217bf09afca32df5ed6792b8e9de210ca4143697b8b97aa2c41b8e8382ffdce1bae47bf51a6319f03d9ec70933218030ab21d642a0ef907cac3e816929c
+DIST cryptography-43.0.1.tar.gz 686927 BLAKE2B 5abc6fd0f06fdca735455c812b089f864457c379ae9a4d646b0a5633285be692e1b17eab0ec50e99b41d1c1238a4f81a4b2b0801777e8e41e25a4faa9285af15 SHA512 db33cc8930492ccdf1aa6466026e4a3ab50382c863fa2c3c454a554cd53f74592e06fb021b2bd6bc16981c8230089c7a076a352a9d7d982a824ef4c7b1895414
 DIST cryptography_vectors-43.0.0.tar.gz 35306242 BLAKE2B d1dceec0dbe02ad500c73bd94791c6b47320534268cc4fffdb799a632f37b27bd3de837a725c79f733f86eda813a1a512778615c62144275ca5e7aaaa3d65d08 SHA512 ca5221a390ebea4eda5d72f9ac9632849ce2174db51385405b1b41b702c0dcd2f24f7fbfaa027bb6eb8c63588ac1eae5fdc7978a08c1561dcaaaaa998b67eaef
+DIST cryptography_vectors-43.0.1.tar.gz 35306252 BLAKE2B 0ff68e6c1088656491e474f8770f61c0a2c45a318e565325c9259ffd938a765ea9306f13ba25d5e2097d7d113d8a4556914aa07e016ee90ae78d7157cf6d5e6a SHA512 934c4fadba915b10f3216c08cdb862968d138a40c0a3ea2aed6605685730d1d2b60767660356236b519ff98d52c2f21bf9ead4bc247eab80db27257d671037f2
 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 heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
diff --git a/dev-python/cryptography/cryptography-43.0.1.ebuild b/dev-python/cryptography/cryptography-43.0.1.ebuild
new file mode 100644
index 000000000000..cca4942c8c11
--- /dev/null
+++ b/dev-python/cryptography/cryptography-43.0.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	asn1@0.16.2
+	asn1_derive@0.16.2
+	autocfg@1.3.0
+	base64@0.22.1
+	bitflags@2.6.0
+	cc@1.1.6
+	cfg-if@1.0.0
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	heck@0.5.0
+	indoc@2.0.5
+	libc@0.2.155
+	memoffset@0.9.1
+	once_cell@1.19.0
+	openssl-macros@0.1.1
+	openssl-sys@0.9.103
+	openssl@0.10.66
+	pem@3.0.4
+	pkg-config@0.3.30
+	portable-atomic@1.7.0
+	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.36
+	self_cell@1.0.4
+	syn@2.0.71
+	target-lexicon@0.12.15
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	vcpkg@0.2.15
+"
+
+inherit cargo distutils-r1 flag-o-matic multiprocessing pypi
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+	test? (
+		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
+	)
+"
+
+LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+# XXX: Drop explicit >=virtual/rust-1.56.0 dep once that's the minimum in cargo.eclass
+# and replace it with ${RUST_DEPEND}
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=virtual/rust-1.56.0
+	test? (
+		dev-python/certifi[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_configure_all() {
+	filter-lto # bug #903908
+
+	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cypari2/cypari2-2.2.0.ebuild b/dev-python/cypari2/cypari2-2.2.0.ebuild
index 1f98ecf02515..eacae043f849 100644
--- a/dev-python/cypari2/cypari2-2.2.0.ebuild
+++ b/dev-python/cypari2/cypari2-2.2.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/sagemath/cypari2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
 
 DEPEND="sci-mathematics/pari[gmp,doc]
 	dev-python/cysignals[${PYTHON_USEDEP}]"
diff --git a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
index 2a6950c539cd..7940ad35c445 100644
--- a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
+++ b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 # setup.py has "or later"
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 DEPEND="
 	sci-mathematics/pari:=
diff --git a/dev-python/cython/cython-3.0.11.ebuild b/dev-python/cython/cython-3.0.11.ebuild
index a1665cc41419..9b055a2ee5de 100644
--- a/dev-python/cython/cython-3.0.11.ebuild
+++ b/dev-python/cython/cython-3.0.11.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/deepdiff/Manifest b/dev-python/deepdiff/Manifest
index 3a6e7680a331..8e3f48391611 100644
--- a/dev-python/deepdiff/Manifest
+++ b/dev-python/deepdiff/Manifest
@@ -1 +1,2 @@
 DIST deepdiff-7.0.1.tar.gz 421718 BLAKE2B b6441b9c035db0cc6e4fa83811999e8a83b3faed2ea95bcbdad158486e583ea9d707595d2342f83d0c25f6a5c086a8070c714253e2db09fcaf43de1616d46cda SHA512 facc15beb82744a1b8baf29e0d8f06625e8d4ee4ed7ab5f1b131ad9d44134215651d1c6b19493c83532f612d81752df14aec2dbccc73cb5b994e0bafcaf5bbc2
+DIST deepdiff-8.0.1.tar.gz 427721 BLAKE2B 0725a87ef17f9e1984594ccca7d954d608cfa0a6ea2c17b03d679bf5cd67135a1c5e3f21d749c18f1f91a5537e9ddaf179fb5b0a5ea135776415f5c0d82be274 SHA512 240662fb3e2408383fae4f6d4e5707357285e0058828d754dd09a94d1ccc29b854381a542dc2042842c79a57307b02d9ad009cc3106b35b0058612fabc0bcf96
diff --git a/dev-python/deepdiff/deepdiff-8.0.1.ebuild b/dev-python/deepdiff/deepdiff-8.0.1.ebuild
new file mode 100644
index 000000000000..f86520659dd2
--- /dev/null
+++ b/dev-python/deepdiff/deepdiff-8.0.1.ebuild
@@ -0,0 +1,68 @@
+# 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="A library for comparing dictionaries, iterables, strings and other objects"
+HOMEPAGE="
+	https://github.com/seperman/deepdiff/
+	https://pypi.org/project/deepdiff/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
+	>=dev-python/orderly-set-5.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/tomli-w[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unpin deps
+	sed -i -e 's:==:>=:' requirements.txt || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# benchmarks
+		tests/test_lfucache.py::TestLFUcache::test_lfu
+		# requires polars
+		tests/test_hash.py::TestDeepHashPrep::test_polars
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# changed exception message
+				"tests/test_command.py::TestCommands::test_diff_command[t1_corrupt.json-t2.json-Expecting property name enclosed in double quotes-1]"
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 2cccb5f1ce08..4b67774e9aba 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-1.1.1.gh.tar.gz 15605 BLAKE2B ef6fbd30185a2990c72d6de0950275dd6f9f3e61c0c9c969fd69dab2123025d016ade98d42f09b30328b3cb5659b29b2d07836db4657acde97d9a2cc40c07039 SHA512 8ba4a225d588c96c3c852783774d5d690c5dd0caa1988f5969ce6446a11ba6035667baeda7e419cae40c4c1dcf7a15ee7149a10c1e33dba6b7775ddbad41130d
+DIST deepmerge-2.0.gh.tar.gz 16810 BLAKE2B bfc2803f0a955d83bf8e1fee380066475bf61962e640272b00e4df899ccdb62c7796e7717b761ee5f8f4659c53a048fcb6f519eaec0b5f54a03ade8991e783d1 SHA512 9580220d941226b7d5b27f8efe2f7caeea58da6d3aa48f2a20f54add75fb1f2802b17e16794f5e05f28c3943cf34ccbcb622c2073533201c5c66a4c44d0e4547
diff --git a/dev-python/deepmerge/deepmerge-2.0.ebuild b/dev-python/deepmerge/deepmerge-2.0.ebuild
new file mode 100644
index 000000000000..a6fd6b3bc8e3
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-2.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Tools to handle merging of nested data structures in python"
+HOMEPAGE="
+	https://deepmerge.readthedocs.io/en/latest/
+	https://github.com/toumorokoshi/deepmerge/
+	https://pypi.org/project/deepmerge/
+"
+SRC_URI="
+	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/dep-logic/Manifest b/dev-python/dep-logic/Manifest
index 3b725a41bdfe..1ecae4cbf8fc 100644
--- a/dev-python/dep-logic/Manifest
+++ b/dev-python/dep-logic/Manifest
@@ -1,3 +1,3 @@
-DIST dep_logic-0.4.2.tar.gz 34743 BLAKE2B e3d520f935034c5dacf3dbe123eacb2adb45a3b6d6e13c23d3c21c9d36af56093f504660c621ba586335930963243298d5284b41a29247fb9904bff13da7c724 SHA512 7a522e74cf6537ff644e785489c9a17108910d42769abfbc31dcdffde1d36e79c0cc76c98cd289982877296aab451a6963ee039dd258be67e0e82d2c81fd219b
-DIST dep_logic-0.4.3.tar.gz 34793 BLAKE2B abbaa23d39d258b10912844cb28ca279efe7475e419f8c7be7a1119ed636d60bed851ae7fe47cf04f2caa391d933f8a2c5d404db6e8a8c7cf55224224b6a228c SHA512 4800e9cbd9f2479ebb2a2052361f385b68b1ec5ea3f308378dbef199e61a0443c0e28e4f4f7df8a444a4bd50edd25c7168428812543edc0bb0209d2fc5e0dfac
 DIST dep_logic-0.4.4.tar.gz 34883 BLAKE2B e28bf4cf3b4f3ff02af53d99bd9007ee5774c4e64d01386c9a736414420da6799f3f681c2f7934e9002ecff3ff87186ff9ec78bf5a18d225cfa32b0d31477468 SHA512 b22ac38a75d52f497cddc96ca2d571f036e0c3abde81b023f6348af4a606c966170e7609a4364425a410172f3e911b053d09aeb3fd0b124d7cb9b32b691e8bb1
+DIST dep_logic-0.4.5.tar.gz 34903 BLAKE2B b9f26fb62e89540ccaa9501770aa20e37121110c3bf200bfa91ebf63f4adca9af81febe5d7ca5e1e322ff038d099310b8ed55229637eb9c15e4d790fcd7d1aca SHA512 a98e2fbf9a72f6e055374f101356ddaed36560e175b674cd0e304daf06dd008e91d80684bb8e290a018ee466088b4faecc4790db2a304b218733c8013a02f59c
+DIST dep_logic-0.4.6.tar.gz 35010 BLAKE2B 180d977bcd3ffb6b0c47c4260318f5cc7457644d97352e0c7b6906a249e80ad3a1f3a5c9558cba4d10e6352babfdd1b0b3ee2ae2d3cd25cd2796ab3bc130ad8d SHA512 668b00661af185d558929f1cb0d2c281c9af112ead23866359683fe505f25a512c4acb5f6aaa0d7a855f1c5b3c6c16b8d969de043cfceeab196304b0a8452e18
diff --git a/dev-python/dep-logic/dep-logic-0.4.2.ebuild b/dev-python/dep-logic/dep-logic-0.4.5.ebuild
index cf3afe5c232e..cf3afe5c232e 100644
--- a/dev-python/dep-logic/dep-logic-0.4.2.ebuild
+++ b/dev-python/dep-logic/dep-logic-0.4.5.ebuild
diff --git a/dev-python/dep-logic/dep-logic-0.4.3.ebuild b/dev-python/dep-logic/dep-logic-0.4.6.ebuild
index cf3afe5c232e..cf3afe5c232e 100644
--- a/dev-python/dep-logic/dep-logic-0.4.3.ebuild
+++ b/dev-python/dep-logic/dep-logic-0.4.6.ebuild
diff --git a/dev-python/dict2xml/Manifest b/dev-python/dict2xml/Manifest
index 5011bac1eb4a..a518441c886d 100644
--- a/dev-python/dict2xml/Manifest
+++ b/dev-python/dict2xml/Manifest
@@ -1,2 +1 @@
-DIST dict2xml-1.7.5.tar.gz 14958 BLAKE2B 1907003e3a27a8e1c1a0e7ab1d5c72b310c46e7af7d51f6a1743ca018fb6a070b0b54b4b24afd8c78dd18f83f9f6950031c0076eae83ccc309a341a0df153708 SHA512 88a77fcdc2ec320ba1668b27da4aacfcfc817090aebabc01fce76bff51b316166a0cc1f053884e8012a28e7118449f901465703869245dc662f29cee9665157e
 DIST dict2xml-1.7.6.tar.gz 15210 BLAKE2B 86ed48b2dc857efd58294c23f0708102ac66dab50e7f50ae149185f3fb707f72ef67008921ea641ed1bd96a91b25b39a92ddc796eadb64560ff29b82cd1ef07e SHA512 54e8330a556e7576d100fbbc036e8c9627872c4c1cbebcaedf137f2b8ad8e197e49b2e699c284f9c8a3d9874fea83eac80d129f67ea426e807e5699f8811b933
diff --git a/dev-python/dict2xml/dict2xml-1.7.5-r1.ebuild b/dev-python/dict2xml/dict2xml-1.7.5-r1.ebuild
deleted file mode 100644
index 419d7ff938c8..000000000000
--- a/dev-python/dict2xml/dict2xml-1.7.5-r1.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small utility to convert a python dictionary into an XML string"
-HOMEPAGE="
-	https://github.com/delfick/python-dict2xml/
-	https://pypi.org/project/dict2xml/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="
-	dev-python/noseofyeti[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dict2xml/dict2xml-1.7.6.ebuild b/dev-python/dict2xml/dict2xml-1.7.6.ebuild
index c5eca0ddf13b..419d7ff938c8 100644
--- a/dev-python/dict2xml/dict2xml-1.7.6.ebuild
+++ b/dev-python/dict2xml/dict2xml-1.7.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	dev-python/noseofyeti[${PYTHON_USEDEP}]
diff --git a/dev-python/dirty-equals/Manifest b/dev-python/dirty-equals/Manifest
index e8967bc377b3..fe8aea7fde90 100644
--- a/dev-python/dirty-equals/Manifest
+++ b/dev-python/dirty-equals/Manifest
@@ -1,2 +1 @@
-DIST dirty-equals-0.7.1.gh.tar.gz 49000 BLAKE2B 06c9a7522f1dda95ff682dc9c28207b29754d11b4afe7eeacd5439a9ae9f34ce0a2f5724703129aa90b5577f36646deafa5428120e823502aae616d57b3d8f0d SHA512 c50a15e4cee77b3db1b07ef9f7d1eb5b3ab6bed6d914ac5c9e2982f8cf9432beaecb5fd7997d46a94f405e0c932ea5a8d72f1c1d4b6dda86161c22cc772ab4d7
 DIST dirty-equals-0.8.0.gh.tar.gz 50468 BLAKE2B 5d5c58807c0ef26db80895a26b5246a0305ab55389f95d7e13586cad2adc4edd17d24905fad5e462c2bafb59cad7453b55400e4576e0f845ec75d617405f67bb SHA512 8fc6ee0eefe700c89acf5b2181e502422835a89e8f0bb771b07133bda48b804f09b18e452919c8eb7d50e579b032732edad3e9ec150cd7bc7a33a4db77d9ab5c
diff --git a/dev-python/dirty-equals/dirty-equals-0.7.1.ebuild b/dev-python/dirty-equals/dirty-equals-0.7.1.ebuild
deleted file mode 100644
index 0d180b265c74..000000000000
--- a/dev-python/dirty-equals/dirty-equals-0.7.1.ebuild
+++ /dev/null
@@ -1,53 +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=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Doing dirty (but extremely useful) things with equals"
-HOMEPAGE="
-	https://dirty-equals.helpmanual.io/
-	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 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-2.4.2[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${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/dirty-equals/dirty-equals-0.8.0.ebuild b/dev-python/dirty-equals/dirty-equals-0.8.0.ebuild
index 4ad91cb194b4..0425f709d428 100644
--- a/dev-python/dirty-equals/dirty-equals-0.8.0.ebuild
+++ b/dev-python/dirty-equals/dirty-equals-0.8.0.ebuild
@@ -21,7 +21,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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
index da1cd37dcbe8..44baaf4a04ce 100644
--- a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
index b6c11305a595..2158d12db266 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
index 2889667c9787..5652ec0da182 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
@@ -17,4 +17,4 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
index 15e3196f57ed..b2c49b580ce7 100644
--- a/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/django-configurations/django-configurations-2.5.1.ebuild b/dev-python/django-configurations/django-configurations-2.5.1.ebuild
index f68cf68518bb..f49240d83fae 100644
--- a/dev-python/django-configurations/django-configurations-2.5.1.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.5.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index b777ff3681e6..467edec8855a 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,2 +1,2 @@
-DIST django_otp-1.5.1.tar.gz 73275 BLAKE2B 45a4691a1d9aad6416c28d6aa7b7850890bff19385bb7283019272c836e6cd83c55ba590e57e335131a99e98a17bf49c2418fe69a132b91a182e43c0a33cf863 SHA512 4d2af0a009fe945e136d91404bfa3977783ac681126ffeaa7ebfaacd85764afa07a568284ed1ba9d2c81ef472490df98585e78a1a36c81212b7363362db10f93
-DIST django_otp-1.5.2.tar.gz 73778 BLAKE2B 290afbb0a9f2f6ad41ecdb3d65003b0abf4838776241b00957bdbe7303335a33f99eb9e4c23454500fc92d03595a6fb393dd18ba6341e8dde789e21cfabda114 SHA512 5fa8ce6652b6849a7bc347e34addf2b4f694d0116d8c9574fa12d5f2e9313240b69fe4e9058317e202750e453af2882eb24d33d39a7104c458f2337c921901ee
+DIST django_otp-1.5.3.tar.gz 73785 BLAKE2B 0f69539b271c7ed4cac55e6f52c4f8b67761731df14eef7594d3430b89e44c3b4314084a6ddeb02b85b4b576fffe2c20097e5bad291de2020f2314042d374348 SHA512 c101996982182736743cb14f44cc055722cc510e2082ee312f91b79cf9d87b50aaa1eeec489649723514e7150469be9c7f4f2d71758a7a72d0dffe04f4f875a9
+DIST django_otp-1.5.4.tar.gz 74334 BLAKE2B 1d93c329441fcd237411b625618a85a9b93383fb6f2137ebbec74fb6efa13bdae4777c5a2e12188c919400be08a5c9562c4d5c03eda2aee26668ae10791dfa11 SHA512 fb4d642009256f543e2ea8d2f78e144cbb8186f3a878bffbe1bbf5c7c9712effcb52dcaa9bb37474e769c6c83f2ad94f680a083857ce59b4d97824c57641e068
diff --git a/dev-python/django-otp/django-otp-1.5.1.ebuild b/dev-python/django-otp/django-otp-1.5.3.ebuild
index 3dc062125747..3dc062125747 100644
--- a/dev-python/django-otp/django-otp-1.5.1.ebuild
+++ b/dev-python/django-otp/django-otp-1.5.3.ebuild
diff --git a/dev-python/django-otp/django-otp-1.5.2.ebuild b/dev-python/django-otp/django-otp-1.5.4.ebuild
index 3dc062125747..3dc062125747 100644
--- a/dev-python/django-otp/django-otp-1.5.2.ebuild
+++ b/dev-python/django-otp/django-otp-1.5.4.ebuild
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index d840caeb0eb2..385fd7e38358 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,2 +1 @@
-DIST django-timezone-field-6.1.0.gh.tar.gz 36029 BLAKE2B 5177b440e0537fbde12e0dd4bf92e65c983996f7ef1393212b0f4c24efecfc0d4d24e1bbc8447295b565d8b9921c0c05f6cc4baa11db3ccc9b60c33c48e76fb2 SHA512 b070e55a2a5196de1fcae4bd19979caf9d84c234a4e379d82dab843541cf99a0acced9a6996e35afe6b40d1bf737d522d34b91df10596e7365f85cfbe0597015
 DIST django-timezone-field-7.0.gh.tar.gz 37416 BLAKE2B a0420ccbcb9d7d834e65d0cc89fd83662bd4b3773f1443f05866381d6bbeacba86bdd2e6078a3819bdbf6c174e3ede08e4b9d307838d5082e7bef037ff751681 SHA512 9a96b65a7dce48f58c3915e835e92b8d884f6b15f8314f5d6f1a34bc75ad4bc8f0c33035a4844b5906b7d6bc468cf364be8c82843f3af714a59dc9a40e71f9af
diff --git a/dev-python/django-timezone-field/django-timezone-field-6.1.0.ebuild b/dev-python/django-timezone-field/django-timezone-field-6.1.0.ebuild
deleted file mode 100644
index a51019e8569a..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-6.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-fixture[${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 3e1b4e225a62..fa577129d814 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,8 @@
-DIST Django-4.2.15.checksum.txt 2418 BLAKE2B 06338f990952736d1368c11bc0a14df4fcb756c7e33b0a843d692c1ca23a9bf5073c552513cf2846c16da24da475ff122f59122f90da528c2cb8875072fa7748 SHA512 b4e8eb163a889c2aa556217b2ba6280916c891b2f8af862d66e09b5ec643dee9281e58e2382fdfdee1d0e1a9a80267c93993374ae3e0f33f3ec5051bae69f145
-DIST Django-4.2.15.tar.gz 10418066 BLAKE2B 4abf7205995fbc8dd90ca43aadfdd6737c5f731fea4054f987ae851e0b6f0a5f0f799441f94ca322e31c07c2a810903a00b4432b71a7517b2a261c4844ddba90 SHA512 8f334dcaa36b3bce5184ddf1a1508bf42614be6ab486c9e0d87e9bfd212511c43081ad5fb02d2dd7b54f8236fc1f7ee9cd7b7f6f94ac8edc1cb52d1c0c698880
-DIST Django-5.0.8.checksum.txt 2408 BLAKE2B 18751733d7abaa4e98039bf0cfa3773a999df4351371939803ec77850c25d75392abc7e4136e8c4a79620017c224bafcd8552c2446ee0817249abebcc3b0e1bb SHA512 c05027bdec0928dd51239ba5c72b97b737ad73dbbdbdc1c4bef2b9faf8afc188cd854e1dcd3b5ffbdc9c3a30dea5a27e4b899f9d257bcee6f80fbfdfd30e7a20
-DIST Django-5.0.8.tar.gz 10630791 BLAKE2B 0a5408b46b69b701f3ff88717b41b22cd4abd776a0b46f46025febd423e4b9c5f395da50a5be9e479bc0047405330231da400f3f2324bbb69ca5ab07966bc168 SHA512 b835d01f76f0e0082f299c2b15483aa3a8aef79f873b09dac546d3b4ecfa8a6fb84d9377e06e18a858bd24bcdd2db89c4cf05811b3af133b7da6609f6c2d917c
-DIST Django-5.1.checksum.txt 2551 BLAKE2B bec3fb2608b4152667420951ea7ba34cdbf416b30c0d03508917c0f41b914d6f55b69b209da308407659d93c1a23ecac33272969ad042c7bb8c1e8ac1c19527f SHA512 70f9dce04687c01b641b5c07ce8476db15231a82262015fb18a97b90b3caac11cb7d50cd7a749a80321af9a04bfce212ed9400be0fd114cb8d37f82193396161
-DIST Django-5.1.tar.gz 10681050 BLAKE2B 1cded54e573d7a75ff246523235a1e17b6900000ef428f02ddf1f17fb0146449cef28da9207cfb3a0a888def86620a755cb62dba033c15501dc9125d6164f462 SHA512 4c34df7adf2a151488d8595551fe6e8eb90fdef9d7592ce1d8c8b0663fe4d876614f5dde4df1dd648153d4df6246ae39dbb33a66b1c3d2f60bd46595e0efb396
+DIST Django-4.2.16.checksum.txt 2584 BLAKE2B c4808af742372d281b391a511fd32904cf56b87603fea5b8ee03e48b1c55d64f03c196fbfbee5b652ef08be6304cd7d2ab9b11535f3d368fbe03f6b8e3cc1b40 SHA512 f031b4beb360ba5184bdb8fa5ee35c0c7b779abb08ecb61b175965450345d3fa3d99f2862b5be7a0b5887ef42c7e65dde0506ede855cdd25e1992cea50847d1a
+DIST Django-4.2.16.tar.gz 10436023 BLAKE2B 67a35f9f625d10fe4bdaff8365532468a76a37ce04a9baf4b6140092b2fb5e2dcb164dbd70e313db3ab567ebd44ebaf3f55a47e12c50c765cf5518968ad63f67 SHA512 a4abe599af711f745f24a559943f67a168cd40f6c7345f2188817e748f9a463e434c463426ca99b80fdaa5580423248c35ff4fcfd35f3364abdf5279094e3f5c
+DIST Django-5.0.9.checksum.txt 2574 BLAKE2B e3bef5a7fdfa8a383cc1d185dff3e8818dee0005f6cd8e16866bee6990c8b3687c31ca2df67be29033b706e1dea86495b0e74c18d3cb0c6fec563085ffaa3497 SHA512 00e16ce374ebb02966bc7b00a207a5635c36173950ef230f3f8c70a2ddfa59d9a8dd6827f3dbb1c7aeb0da5f14dd39430a2d1bacd00fa80d02e2610ad76a7bbe
+DIST Django-5.0.9.tar.gz 10646283 BLAKE2B 898e7af1cde9c48589019c095a554f07ee3b92b2d26ff9d960a5cec05347664de608d8c12831f187fc8172e7f5dce947164419e937b26754691da4fec602ee2e SHA512 7d27bfdc07a79abe2a82a5579f27241384e507649006951a8e7d59d8ea627f6b240a13671ed4e61be58402a07d7b3359ca6df1ad69cc00876135810a543b249a
+DIST Django-5.1.1.checksum.txt 2574 BLAKE2B 4e03b7742dd3e67f08c63ebced58bf56b0dd216d81e433ece1512c9aeebd117193349a400841d7bb6407ed8d760c0703522ec7611cd6bb6e1b87e5e6f8d5803f SHA512 f15a4d1554a265c040f78b609ef9a71605ca3c5c40042cabfdcf1aa57534c4f79ea77c793045c8ebd3f950380fff4d511837096e02281d97385c0c6f6ba48b38
+DIST Django-5.1.1.tar.gz 10675933 BLAKE2B b07311a3f9387b31d842a6840fae796629740a12ae23900849317d36575f47b0c4c91aca6cbdac67069f21466fbdfbd11ee16893143d0b4aa5db05594498827c SHA512 c5c75f0b36ef4316c4b7306ec4f8cb612ec554c79f1ac2346b56485ca025b1ca7c048a294568b71f989f2f19cb2c3849f01e5fe62dad00b6591989f274ec8c5b
 DIST django-4.2.8-pypy3.patch.xz 5900 BLAKE2B b7dc5c5fc162817a218ee6d025ed8a65559b80e4506e49ac393428c26e2621f9e7c5010b36f2412dea8194a9f1086ab21f97286eabd696c6a786285eb07393cf SHA512 f953b5adbd1364f1d84dde55087ccb493256b1327701275fd2fe99f3cd41751d18e002b6e21afc96892e1671428a6b8f3c2e4b88252c3c278f1a79e286bb73e3
 DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b
diff --git a/dev-python/django/django-4.2.15.ebuild b/dev-python/django/django-4.2.15.ebuild
deleted file mode 100644
index bd2335231db9..000000000000
--- a/dev-python/django/django-4.2.15.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.8-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/jinja[${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.8-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.16.ebuild b/dev-python/django/django-4.2.16.ebuild
new file mode 100644
index 000000000000..0d0c1e3d6c0f
--- /dev/null
+++ b/dev-python/django/django-4.2.16.ebuild
@@ -0,0 +1,103 @@
+# 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.8-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/jinja[${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.8-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.8.ebuild b/dev-python/django/django-5.0.8.ebuild
deleted file mode 100644
index 2357d8dbed8b..000000000000
--- a/dev-python/django/django-5.0.8.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/jinja-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.9.ebuild b/dev-python/django/django-5.0.9.ebuild
new file mode 100644
index 000000000000..29fcd562b6c8
--- /dev/null
+++ b/dev-python/django/django-5.0.9.ebuild
@@ -0,0 +1,105 @@
+# 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/jinja-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.1.ebuild b/dev-python/django/django-5.1.1.ebuild
new file mode 100644
index 000000000000..bd9babed87a6
--- /dev/null
+++ b/dev-python/django/django-5.1.1.ebuild
@@ -0,0 +1,100 @@
+# 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.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/jinja-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.ebuild b/dev-python/django/django-5.1.ebuild
deleted file mode 100644
index 1a52c318f46b..000000000000
--- a/dev-python/django/django-5.1.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
-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.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/jinja-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
-	# 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/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 6eb4dacc10d9..0269341b8b83 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1 +1,2 @@
 DIST dns-lexicon-3.17.0.gh.tar.gz 6200497 BLAKE2B 8f423d4d44517b3186ec7f5cfc5d1e0560d4c98360f8a9d6caab429e0b0e5abe8ee42545b0d7c4cdaf1e2a6a9af41b095198144fda386a207f4f98c7693bb2ba SHA512 1bc182f5881d6acfac72b84331ba50da1219178d274c92e532ed11e73aa79696681d28a002cd1e23f48590953f48e50b62c2ef2db020a07ecf88547717508c0c
+DIST dns-lexicon-3.18.0.gh.tar.gz 6216871 BLAKE2B df41467a253cf56c2dd5c127c431973fc80bdca4c174fe84649227d897d7b4612219ca5dc2ad66ae7dc75f626ddfd32aaa950b5cea699bfbb7f05c9a5bda7f40 SHA512 da2804caeef6cd96eb53f7414833757905afa269f328271fccbdb06d988fb46695a0cb917b8dbdfb66579b01cc98d07de8eb7e1cb132c47d49fe05e2ebe18127
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.18.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.18.0.ebuild
new file mode 100644
index 000000000000..aa26fc580959
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.18.0.ebuild
@@ -0,0 +1,72 @@
+# 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} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="
+	https://github.com/AnalogJ/lexicon/
+	https://pypi.org/project/dns-lexicon/
+"
+SRC_URI="
+	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	>=dev-python/pyotp-2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/boto3-1.25[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	tests/test_client.py::test_client_init_when_missing_action_should_fail
+)
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	tests/providers/test_transip.py
+	# Requires the "oci" module
+	tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	tests/providers/test_auto.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 510c83beecc5..bd4cfddbd0f3 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1 +1,2 @@
 DIST doc8-1.1.1.tar.gz 26514 BLAKE2B 847e34081f4e00698cbe3ca9b7325de2995c45bd02b2f443459050a2801a5b476222c345c4ba06463fc6ff489c3c59e5b6e7abbd7b98af740f09d5b04771a4b2 SHA512 7ec21c2483f7ebf2a7e1fef6677c6051ac253da6014354a968b8a107d8097f986b6b162850561fd6a103e93d157b2c849554aabe2484a49c4a3726c8e2083a89
+DIST doc8-1.1.2.tar.gz 27030 BLAKE2B 76c02acb4165bc70a5f84a68c44a1560ca2fe7eae97efe12e93f48922439ca5141028be4be78f3edaff5e25757bf668e567b77ca2f46c0844a54b085da9e3e1e SHA512 77e6dd1abe99ae993138653093458672e8af281e9c195696b67e2ba1a2d0ef4f1b77dd9f24077f159d0b6d9dbb2c78b5b24fc1a6121e2a199fe72528e3926072
diff --git a/dev-python/doc8/doc8-1.1.2.ebuild b/dev-python/doc8/doc8-1.1.2.ebuild
new file mode 100644
index 000000000000..e07ea6f14043
--- /dev/null
+++ b/dev-python/doc8/doc8-1.1.2.ebuild
@@ -0,0 +1,40 @@
+# 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="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/PyCQA/doc8/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# unpin docutils
+	sed -i -e '/docutils/s:,<=[0-9.]*::' pyproject.toml || die
+}
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index b14b7b5b37c5..ae9379965592 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1,2 +1 @@
-DIST elastic-transport-python-8.13.1.gh.tar.gz 76370 BLAKE2B 7f4584953c243547a73ee48c9033dc212a837bf0977f1a2329365805705ce1317bc9fa6e35f22affe9cc8f9b3fd6725b44c8a45dde02ac835195d4a6d33964b1 SHA512 a025b80e86163ee25798aba7ebf75f4c481c4f6cbcda0542ab80c0c9899988fc608ad41a2593a2f0371eb6cde2ca8da8c72dd843a03f9b2312d65bddc903dec4
 DIST elastic-transport-python-8.15.0.gh.tar.gz 76595 BLAKE2B 93330c4e1e2de407c75d34074cd3e0406df80071abc60dee99ef0da8774229f2aeee58b5811aa362a2bee1268a3dea453fdb5bc942eb728af038f6c789cd1e98 SHA512 de1182713e212635bd8536403ffd51dae0c24eba857476dafcc0374b89bf06874068b8907ceeb513068066172ea55c1a27062329441bf624459d6ef188ff66bb
diff --git a/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
deleted file mode 100644
index 8ae43202d660..000000000000
--- a/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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/mock[${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=(
-		# Fails in upstream CI as well as of 8.13.1
-		# https://github.com/elastic/elastic-transport-python/commit/39488817cd5da824101322e40652d17938f0acac
-		tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-2.badssl.com:1012-772-RequestsHttpNode]
-		# 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
-	epytest -p asyncio -o addopts=
-}
diff --git a/dev-python/elastic-transport/elastic-transport-8.15.0.ebuild b/dev-python/elastic-transport/elastic-transport-8.15.0.ebuild
index ca7d8ebbd930..8411bae5d924 100644
--- a/dev-python/elastic-transport/elastic-transport-8.15.0.ebuild
+++ b/dev-python/elastic-transport/elastic-transport-8.15.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 10c39ab009e2..2b16c77b327e 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/dev-python/elasticsearch/elasticsearch-8.15.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.15.0.ebuild
index 741cff10115f..dc051ed81435 100644
--- a/dev-python/elasticsearch/elasticsearch-8.15.0.ebuild
+++ b/dev-python/elasticsearch/elasticsearch-8.15.0.ebuild
@@ -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/elasticsearch/elasticsearch-8.15.1.ebuild b/dev-python/elasticsearch/elasticsearch-8.15.1.ebuild
new file mode 100644
index 000000000000..741cff10115f
--- /dev/null
+++ b/dev-python/elasticsearch/elasticsearch-8.15.1.ebuild
@@ -0,0 +1,76 @@
+# 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/elementpath/Manifest b/dev-python/elementpath/Manifest
index b87441466f5a..a17aab9a1ea0 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1 +1,2 @@
 DIST elementpath-4.4.0.tar.gz 330008 BLAKE2B 059b67c246052676b9514808dedad3b7dfa21a6e9291a52c9a56abb2d51e12fdf1271cd70978c83f861f76fc6d02a6b73180df7fb2e36a9c443ff344d13eb127 SHA512 ffa91ff55f893efed50620a0eae97dd0360f9eb80f264bd421a26215fe8fbcea715c1635465be3169c4d2be503a875f469b8507d12f8d44cb64f398accfd2750
+DIST elementpath-4.5.0.tar.gz 338727 BLAKE2B d05f98c509fb7d6fc2db73880963e8f77fbc4643907b6de37771bd52faaf054dddd9bfc35e238e4f8f7b4e0d3c033f4be9297e93b91462cd21664e16661739c4 SHA512 dafd480778d9d4e9fec1dc11d298590d460ad6b26f3683dea301b650da1b1ddcf03a68af6f3fa947b78a528f458ecf655e6ec172fd6ff194890c3f8fa28f37ca
diff --git a/dev-python/elementpath/elementpath-4.4.0.ebuild b/dev-python/elementpath/elementpath-4.4.0.ebuild
index 67f73a2518b7..f6724319f048 100644
--- a/dev-python/elementpath/elementpath-4.4.0.ebuild
+++ b/dev-python/elementpath/elementpath-4.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/elementpath/elementpath-4.5.0.ebuild b/dev-python/elementpath/elementpath-4.5.0.ebuild
new file mode 100644
index 000000000000..c1ffc06d9ea7
--- /dev/null
+++ b/dev-python/elementpath/elementpath-4.5.0.ebuild
@@ -0,0 +1,33 @@
+# 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${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/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 26548197729e..3b110444691b 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,2 +1,2 @@
-DIST setuptools-72.1.0-py3-none-any.whl 2337965 BLAKE2B 88954b396a47b4223b73313100b9ae0782a16f755660da1abed31316f056beca78401b151f1bec39a791b1c556da09479e527b2316f5d1391e6996f5433c0bc3 SHA512 ef9f855c8ca4d7f6e5eb79f3d40b44830eede4664ec5667415fc676a0b8230a64fb62fda49c1eef6a9c3f89d4724b0717e7d702be99ab61f8763d91feb9a6ea1
-DIST setuptools-72.2.0-py3-none-any.whl 2336658 BLAKE2B d46adb6be347ee6107ca90850ad1c8df60723e1cb93e402b53c02316a07b7cb71dd8d657cb3beb8c926fa23308d4e8fca7221b52e5f59fbfa744d6758b603343 SHA512 e7730427e7ff342a52f638fe1d457cdb906971f33dd87bb01a26b2d01b134f561397b7a6ffbe078ba5867306ba14bd8316995ab823f9b1c806646c2f242209c6
+DIST setuptools-73.0.1-py3-none-any.whl 2346588 BLAKE2B 74c84539d1c3592aca5678ecf3c7c71c57fffa877fc5dcc42701c7b2f58613d3767ca10b190c37b30dc24ca9a6b67b76e1e70f63b188d9228f1b73b17f4a3198 SHA512 cef43928c8eebc673ca1befb1df1dc230eab8cf10fc66b06f02a0d459e78701457b8024bdc4ac33082e85e07dd5a63e031fcbf13e0b94d6bc9ccc90931060841
+DIST setuptools-74.1.2-py3-none-any.whl 1262071 BLAKE2B 4cee06ae5a71241deda83ecdd3a6ee806d67dddac56cc3f19cf58e6b7e9e5c9e441187a82d17674fa91d172496291ad9482e1b458e1f0968cb62ece3f62278bd SHA512 90eaf02616d82b22a69310d772f6737f4ba807ad7d53e371235fcf4f21c4034ea78d4a5ff0e2e93fd0623b0adc43208f427df91551d4a9bb3c94e08d1ae8394f
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-72.1.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-73.0.1.ebuild
index 6e384d8b8a5b..6e384d8b8a5b 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-72.1.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-73.0.1.ebuild
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-72.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.2.ebuild
index 97aca4a61872..97aca4a61872 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-72.2.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.2.ebuild
diff --git a/dev-python/ensurepip-wheel/Manifest b/dev-python/ensurepip-wheel/Manifest
index 3e2845e11102..dedd653079c4 100644
--- a/dev-python/ensurepip-wheel/Manifest
+++ b/dev-python/ensurepip-wheel/Manifest
@@ -1,2 +1 @@
-DIST wheel-0.43.0-py3-none-any.whl 65775 BLAKE2B ae972f78acaf10c074dcfcc208aeb523f932564a9008612c7071b2bc4edae3a9a25f5c93bff37a39e6fd2f8e790db8bc2f500045e3141c8279fb329e8fff45b8 SHA512 5a637264ee0eba127aa72a372b111fe8a61f454fbd3fc02b39590fd2c6bf6f5e9ac4b0e18fd16ff5fdbb9f4b046c9237fd56b055c4cb595fb042e5aa94b336c5
 DIST wheel-0.44.0-py3-none-any.whl 67059 BLAKE2B e02afce5ad38a1cccc19b67acca74d3c43e0b45f52f334d28102d71ed8ffff5f0749f0ffa49c26d8eb89ce63f0a240c33117593b7807c6797fffd1e6daf6fc87 SHA512 98209d3ff1a04fd50ae256b94a648deb9ff29114e90a632c0fc34304c9f8a904b000f66019c684e228f56900e51105fe8678dc9c1bbcdd9ec69dd28d8e98058a
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.43.0.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.43.0.ebuild
deleted file mode 100644
index ec34d0093984..000000000000
--- a/dev-python/ensurepip-wheel/ensurepip-wheel-0.43.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared wheel wheel for use in pip tests"
-HOMEPAGE="https://pypi.org/project/wheel/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild
index dc4dfd13326e..ec34d0093984 100644
--- a/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild
+++ b/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 8ba7530c201b..e2e7180fa798 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,2 +1,3 @@
 DIST executing-2.0.1.gh.tar.gz 837355 BLAKE2B 7d38890eb322809c2b705f51731fe7537f81a0775d99bebb4b4ae67453930daedd947b249385babbc2373969344b643f288441fc28f3588264e4ebc23e1c389d SHA512 8a753aab42ea2d3b61764ee77de3bb52ea7fcc2818298281180ffc47c7b22ee84974ee98b2137250f722ad559be92e72e8fc01d7b2d38ab6a01512618b65d4f3
+DIST executing-2.1.0.gh.tar.gz 980727 BLAKE2B 0d7a3f0a7e83a1607fdc5bd618b7484bd2eb27443568ee6542d7caad050ff7f5a2ddf71518d434059bdc5f17bff81badf393b91628754b5d6b8ec5a4dbe8146a SHA512 0918ed3eca37d55a1c19b20a959538c46d65688979e0808270b7060a25d3db44bb593d2f8de202740af9f008f273e1e7565ba5b20b90c678e070b52a12bed4cd
 DIST executing-b3821ddf99132b61d8d32adfdae450e2418610ca.gh.tar.gz 983168 BLAKE2B 6f305aff1ff027efc5dc18288a1373623dc8e87f0a66f35ad6c92954fa1e6fc2422d50aaec128216efd1e090f1f69428447700b0adc8d4b61f40a777b3768c29 SHA512 049f95e363660052538b9d4c07123705663680d1c415ee43895678e4b740b3b2697c62c78e150fd14f75836727512e138c312ece7a48b2d3d11393f522b2ce60
diff --git a/dev-python/executing/executing-2.1.0.ebuild b/dev-python/executing/executing-2.1.0.ebuild
new file mode 100644
index 000000000000..d883aa2e3471
--- /dev/null
+++ b/dev-python/executing/executing-2.1.0.ebuild
@@ -0,0 +1,60 @@
+# 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 optfeature
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/
+"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/asttokens-2.1.0[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				"tests/test_main.py::test_small_samples[22bc344a43584c051d8962116e8fd149d72e7e68bcb54caf201ee6e78986b167.py]"
+				"tests/test_main.py::test_small_samples[46597f8f896f11c5d7f432236344cc7e5645c2a39836eb6abdd2437c0422f0f4.py]"
+			)
+			;;
+	esac
+	if ! has_version "dev-python/ipython[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_ipython.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "getting node's source code" dev-python/asttokens
+}
diff --git a/dev-python/expandvars/expandvars-0.12.0.ebuild b/dev-python/expandvars/expandvars-0.12.0.ebuild
index b8c4dc9e786e..e3270d4bbdcf 100644
--- a/dev-python/expandvars/expandvars-0.12.0.ebuild
+++ b/dev-python/expandvars/expandvars-0.12.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index ee08a8e69b04..ccc68d0f0cd0 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,3 @@
-DIST fakeredis-2.23.3.tar.gz 133000 BLAKE2B 7a7b352fb99541871476f75c0a84550a1e91d4eefa0c6edf060f06483cbcc69091b2fb017dfd0c8a142484324fb71c7b0c54263d7c908d3a12e77fa7907adc8b SHA512 0230774d5d4dba55cf0d8a875eda9992ffb7dd26e0078382756515b38c63eb9664ca293135b49c0c8cddcf0971f7e0e109e131a26150a8e2b2bbc0dc453fb79a
-DIST fakeredis-2.23.4.tar.gz 132561 BLAKE2B 50f5772a8b5c3ac087b822be10c4b7e35bfe4d74c0114d483116fefcd3dd81ffc10f6e63a795d88165d8d167aa7fdb82b85f1362d60c81c370276d14ca34bced SHA512 4b8bdfbfd4ba785769197274776ea472444c28590f80f20b4f52962f81559fea7c081878373110e9f6d52d2ac65e6c941f30463328c1b83915a415c81490363b
 DIST fakeredis-2.23.5.tar.gz 132797 BLAKE2B 1314ad46b310d4c1661b86593057afb3d1e9d0e4412146c1b883a17802c681e68062cb89dd89bc7cf3dfaac1eaf713fad7d4860986f50ed585a281208db0778a SHA512 e402cdd881872dc9af2e2b555d89329ba0eea0773f3924936774fc5a3a49d5fc9cba121f9bcddecc6d203f50bb2966aa7576496345966d415852ed8ed96cc8d4
+DIST fakeredis-2.24.0.tar.gz 143594 BLAKE2B d14a163f9997b61bfcc156ffc47d5f18c94db9226e961c2bda7d4160d4c80e19db0a3c6a500511ad80f950e0c6ebd6ab160cf11cf6097ca3b26223183a54e889 SHA512 13a42750afd4f6432904aa01a841d7f3d2e8512955751fdf8f638b5e207039fa1b5e07bdcd28b7b9d1c1461a85a0c12cf7a1d663dd287220850575af097d2271
+DIST fakeredis-2.24.1.tar.gz 143606 BLAKE2B 1f89aed8f7a66c9100748946441d6a6876f1e0795337368fc34a9c89f1c256ddebcbd9b9597f4ff75703c78c3bc60031530423ce358dcc95c1567acec1b9856a SHA512 737ccfee02d05325e752d7cac8fb405937406acac9090709ead76ed8db2e1912f1c0d128a8ea354e78acfae317ec6bccb931f784720a3cd4c84693f9f3607a17
diff --git a/dev-python/fakeredis/fakeredis-2.23.3.ebuild b/dev-python/fakeredis/fakeredis-2.23.3.ebuild
deleted file mode 100644
index 79980da8bf31..000000000000
--- a/dev-python/fakeredis/fakeredis-2.23.3.ebuild
+++ /dev/null
@@ -1,89 +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.2[${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
-
-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
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	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.23.4.ebuild b/dev-python/fakeredis/fakeredis-2.23.4.ebuild
deleted file mode 100644
index 5bf1b6f5ea36..000000000000
--- a/dev-python/fakeredis/fakeredis-2.23.4.ebuild
+++ /dev/null
@@ -1,89 +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.2[${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
-
-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
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	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.23.5.ebuild b/dev-python/fakeredis/fakeredis-2.23.5.ebuild
index 5bf1b6f5ea36..79980da8bf31 100644
--- a/dev-python/fakeredis/fakeredis-2.23.5.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.23.5.ebuild
@@ -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/fakeredis/fakeredis-2.24.0.ebuild b/dev-python/fakeredis/fakeredis-2.24.0.ebuild
new file mode 100644
index 000000000000..bc4af7542c89
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.24.0.ebuild
@@ -0,0 +1,97 @@
+# 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.2[${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=6380
+
+	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.24.1.ebuild b/dev-python/fakeredis/fakeredis-2.24.1.ebuild
new file mode 100644
index 000000000000..bc4af7542c89
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.24.1.ebuild
@@ -0,0 +1,97 @@
+# 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.2[${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=6380
+
+	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/filebytes/filebytes-0.10.2.ebuild b/dev-python/filebytes/filebytes-0.10.2.ebuild
index ef64076096e4..d7a86490fd24 100644
--- a/dev-python/filebytes/filebytes-0.10.2.ebuild
+++ b/dev-python/filebytes/filebytes-0.10.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/filebytes/filebytes-9999.ebuild b/dev-python/filebytes/filebytes-9999.ebuild
index 6f4e7944a745..21b8aecc4927 100644
--- a/dev-python/filebytes/filebytes-9999.ebuild
+++ b/dev-python/filebytes/filebytes-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index a51ef64148ba..869364d90493 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1 +1,2 @@
 DIST filelock-3.15.4.tar.gz 18007 BLAKE2B bf64d43b189453c8c1fcf258edefb2df340d20578d942d147197423c433cd6629d5e73615201d7ef84857450d7a4cf1375d0dfc69a422c4319a76f2dc157442f SHA512 d809df84f321ab9d99f46609cc664af2d9b73161906308e1a9f949c745694577901def228c40a860c606d652f9ecefe9014159eeea92266f94e981eecc4fe103
+DIST filelock-3.16.0.tar.gz 18008 BLAKE2B 076880fb7c3db622b8391a89dd9bf85acaeec39abe7f189c65dfc72d6a6742727c9fd3cac727f397097e9688d9fc1c21a0e28334689db92091b66454c312464a SHA512 bda22692d3a6b034a825fff6917b0c12614ef2615ff52fd78072b1c76c1d1e6019d9d503faa0edf54efc39566279a941b19f34e9e87ccabb7fc8fadb1b3aa825
diff --git a/dev-python/filelock/filelock-3.16.0.ebuild b/dev-python/filelock/filelock-3.16.0.ebuild
new file mode 100644
index 000000000000..6e7072b2fa9c
--- /dev/null
+++ b/dev-python/filelock/filelock-3.16.0.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 9d626586d654..520aaf1979ca 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,2 +1 @@
-DIST flake8-7.1.0.gh.tar.gz 138600 BLAKE2B df6781e676d4eccf296d5fc3d767643956799d1c99adccb32d0005951f0aca13b7e99ff7506f7026e9ed6c2dd78d5bdd02d9a25aaf64a1353097b8a9c02c5739 SHA512 0e970bdb0facff3a6e2ee33a74fe77ee1f7c80fbc517125df34d831ff897e222d0955d56fa9e9eedef83ccdc4e92aa7bbc583517d7b19a8cf1041790a225693a
 DIST flake8-7.1.1.gh.tar.gz 138915 BLAKE2B 5c00c4a95f0757f7d3716270ca1de91580cb1731c700227d563c08798981c124c5789f40a5965ad49450a77601ab9638d04cb32ef9c13418720c4123ba2a7932 SHA512 310457e3c701f746d812cc76664bcb79c7cbc320af9d757ebbc13c847f2c3864770d9b945694b4b6abb773ae636e19175222c3dab74d34559beaa7835f1d9931
diff --git a/dev-python/flake8/flake8-7.1.0.ebuild b/dev-python/flake8/flake8-7.1.0.ebuild
deleted file mode 100644
index 32744afd4140..000000000000
--- a/dev-python/flake8/flake8-7.1.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="
-	https://github.com/PyCQA/flake8/
-	https://pypi.org/project/flake8/
-"
-SRC_URI="
-	https://github.com/PyCQA/flake8/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	=dev-python/pyflakes-3.2*[${PYTHON_USEDEP}]
-	=dev-python/pycodestyle-2.12*[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	=dev-python/mccabe-0.7*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-prompt \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails if additional flake8 plugins are installed
-		tests/integration/test_plugins.py::test_local_plugin_can_add_option
-	)
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# problem with pypy3.10 in dev-python/pyflakes
-			# https://github.com/PyCQA/pyflakes/issues/779
-			tests/integration/test_main.py::test_malformed_per_file_ignores_error
-			tests/integration/test_main.py::test_tokenization_error_but_not_syntax_error
-			tests/integration/test_main.py::test_tokenization_error_is_a_syntax_error
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/flake8/flake8-7.1.1.ebuild b/dev-python/flake8/flake8-7.1.1.ebuild
index da524270c22d..32744afd4140 100644
--- a/dev-python/flake8/flake8-7.1.1.ebuild
+++ b/dev-python/flake8/flake8-7.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	=dev-python/pyflakes-3.2*[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 20195edb349a..f8c6e71aa80a 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1 +1,2 @@
 DIST flask-cors-4.0.1.gh.tar.gz 32226 BLAKE2B f6301842b20175587be43d3c1f22fb341463f25d21fcae9b6463e8c48b149ab7ddf000d5541645f217755bc43863ef060cf1e2f6e57941632db420efb1cd223e SHA512 51dd7c50d5db6a6b6985a32f08f9512603e64199bf90dd22349cd1dbff94f1706b1e26cbe7765fb6dc6310fce86ac470896b127dc83cc740436e1ae11c11f7eb
+DIST flask-cors-5.0.0.gh.tar.gz 32891 BLAKE2B 0315f37fdd10d6000c8b5613a9b8616df5db1009e23614a68e430979888ead49c20174cde0e4f1a1019b455cac868b113bf09f0c004552cc452a12e1840764d3 SHA512 36cff5f9d9a3692a794510b431ad1889931e9d09c569078ab604e4b6b0777139afb10063f851f2e64d76ae6441444ada4a04855f8578a78bb5d3aabdf346e0de
diff --git a/dev-python/flask-cors/flask-cors-5.0.0.ebuild b/dev-python/flask-cors/flask-cors-5.0.0.ebuild
new file mode 100644
index 000000000000..0486dac2f707
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-5.0.0.ebuild
@@ -0,0 +1,43 @@
+# 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
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/corydolphin/flask-cors.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/corydolphin/flask-cors/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="
+	https://github.com/corydolphin/flask-cors/
+	https://pypi.org/project/Flask-Cors/
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinxcontrib-httpdomain
diff --git a/dev-python/fpylll/fpylll-0.6.1.ebuild b/dev-python/fpylll/fpylll-0.6.1.ebuild
index c0729e05aaed..078836f19aaa 100644
--- a/dev-python/fpylll/fpylll-0.6.1.ebuild
+++ b/dev-python/fpylll/fpylll-0.6.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 # setup.py says "or later"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/freetype-py/Manifest b/dev-python/freetype-py/Manifest
index 88af5581d48f..c7d9c5515723 100644
--- a/dev-python/freetype-py/Manifest
+++ b/dev-python/freetype-py/Manifest
@@ -1 +1,2 @@
 DIST freetype-py-2.4.0.zip 832493 BLAKE2B f5753b2cd29aa4441cd2eed5ff421815b543826cdfb6984ad8953377f6497bcd915128a7bf5b40ceb8060257624a75e5e0262276d892139b288da424553d77c1 SHA512 f9ddde5c9a96f75df96b13f7d021916b748c625c876b4f752fe28d93c1a5ceffea514e120f3f9a98955b89bb01d9892b1c38a3cee79737c0fb61a857c055b012
+DIST freetype-py-2.5.1.zip 851738 BLAKE2B 0dcb5b277a536a07bb232a9cf7332727166fe6724cba32b185ca85649fa7503654464797b9fcf514cd6d4c6260692f4ecf83a043c330f100c32940b4ff4d0fe2 SHA512 aef857c96080486f3ec06b0d246c86c6d5eccb3f85743e25944da9bcaa632e0e084b2e711a58ad510b1715cdff562eb063fc04ca2b1c2a70981df0373991d64a
diff --git a/dev-python/freetype-py/freetype-py-2.5.1.ebuild b/dev-python/freetype-py/freetype-py-2.5.1.ebuild
new file mode 100644
index 000000000000..4017152792da
--- /dev/null
+++ b/dev-python/freetype-py/freetype-py-2.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="FreeType Python bindings"
+HOMEPAGE="
+	https://github.com/rougier/freetype-py/
+	https://pypi.org/project/freetype-py/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN}" "${PV}" .zip)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-libs/freetype
+"
+BDEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests
+}
diff --git a/dev-python/frozenlist/frozenlist-1.4.1.ebuild b/dev-python/frozenlist/frozenlist-1.4.1.ebuild
index 42b6ee7b5b7d..35acb9fc5c7d 100644
--- a/dev-python/frozenlist/frozenlist-1.4.1.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.4.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index 56a23a10e154..ff8edc2c8f5f 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,2 +1 @@
-DIST furo-2024.7.18-py3-none-any.whl 340824 BLAKE2B 619e7183541921ec31f5a7e7ebcbc86f0507e04bf7e5c9e308a3b6a6b580cf734fe46b641b3bcaaeeaba39516ca27b49ef8faadd0d9d5864343aafc15a05037d SHA512 62c047742a0a851e5faf56013751d05a411920ca7659ef42fc06bcce6766a6605734b370a636f4b1c2805def42881c273a2b5eb6704484571d76a44145b0a346
 DIST furo-2024.8.6-py3-none-any.whl 341333 BLAKE2B e0cf87a69b35a0a48eb54eb9530ec92f5fa06882b4c4a9bf306a3b1eee7af8510e37dfd1b612fe747856e48eada1eed05ae8e5e270616bf9b5fd5a70705a9c53 SHA512 e9e32eb26659b710836c86bd881c07625d14a10000674d488da2dc71e5cbb7ba6ce4494892f731dbcf288af11bcf6870f9f97f70364425cca4a00f7edda01d48
diff --git a/dev-python/furo/furo-2024.7.18.ebuild b/dev-python/furo/furo-2024.7.18.ebuild
deleted file mode 100644
index f6d61e40cff6..000000000000
--- a/dev-python/furo/furo-2024.7.18.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sphinx-theme-builder is completely unusable, as it requires pinning
-# to a very-specific nodejs version number, and ofc loves fetching
-# everything from the Internet
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Clean customisable Sphinx documentation theme"
-HOMEPAGE="
-	https://pypi.org/project/furo/
-	https://github.com/pradyunsg/furo/
-"
-SRC_URI="$(pypi_wheel_url)"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinx-basic-ng[${PYTHON_USEDEP}]
-"
-
-src_unpack() {
-	if [[ ${PKGBUMPING} == ${PVR} ]]; then
-		unzip "${DISTDIR}/${A}" || die
-	fi
-}
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/${P}-py3-none-any.whl"
-}
diff --git a/dev-python/furo/furo-2024.8.6.ebuild b/dev-python/furo/furo-2024.8.6.ebuild
index 9afc06b408f3..f6d61e40cff6 100644
--- a/dev-python/furo/furo-2024.8.6.ebuild
+++ b/dev-python/furo/furo-2024.8.6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/gdb-pt-dump/Manifest b/dev-python/gdb-pt-dump/Manifest
index b69b7da870f8..429ef6b178d7 100644
--- a/dev-python/gdb-pt-dump/Manifest
+++ b/dev-python/gdb-pt-dump/Manifest
@@ -1 +1,2 @@
 DIST gdb-pt-dump-0.0.0_p20231111.gh.tar.gz 386894 BLAKE2B 31c15a7574ac37e859831e6b17d27ce47bc6aed4d3bb81a01c8492b803cd71ba28379777bd9c221c9f81585811bba4952fb8e5349104ff36e88efe3996715937 SHA512 c94cce47754b634a2fda267f715cdd7957ec0714c4ac96d6b9e20fa4cfdf6c026a3e0b351bf0e041ea0c2dbf253f547ede3d2b13b83c6316ef6222bac0e4b61b
+DIST gdb-pt-dump-0.0.0_p20240401.gh.tar.gz 406426 BLAKE2B 9b50d600df72eec81b2d146dc972a2096ce6d8a085b79360dfefc3d45a733e29008ca3986496811532e541deec46d71410191869cd9643c603a3955d683e6ff7 SHA512 bb521868ccfbae8a411bc57e067cdda227b113cb20bc97eefad77a693f66d00d20debbce51f69c8daf86128bbf938cd3304ea97992aa817a608ce65f80173e10
diff --git a/dev-python/gdb-pt-dump/gdb-pt-dump-0.0.0_p20240401.ebuild b/dev-python/gdb-pt-dump/gdb-pt-dump-0.0.0_p20240401.ebuild
new file mode 100644
index 000000000000..3c950733ea16
--- /dev/null
+++ b/dev-python/gdb-pt-dump/gdb-pt-dump-0.0.0_p20240401.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examine the address space of a QEMU-based virtual machine"
+HOMEPAGE="https://github.com/martinradev/gdb-pt-dump"
+
+GDB_PT_DUMP_COMMIT="50227bda0b6332e94027f811a15879588de6d5cb"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/martinradev/gdb-pt-dump.git"
+else
+	SRC_URI="https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${GDB_PT_DUMP_COMMIT}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-debug/gdb[python,${PYTHON_SINGLE_USEDEP}]
+"
diff --git a/dev-python/gdb-pt-dump/gdb-pt-dump-9999.ebuild b/dev-python/gdb-pt-dump/gdb-pt-dump-9999.ebuild
index 306e29d54100..5bb5e7fcecfd 100644
--- a/dev-python/gdb-pt-dump/gdb-pt-dump-9999.ebuild
+++ b/dev-python/gdb-pt-dump/gdb-pt-dump-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/martinradev/gdb-pt-dump.git"
 else
 	SRC_URI="https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${GDB_PT_DUMP_COMMIT}"
 fi
 
diff --git a/dev-python/gmpy/gmpy-2.2.1.ebuild b/dev-python/gmpy/gmpy-2.2.1.ebuild
index 129514138749..609d63784d17 100644
--- a/dev-python/gmpy/gmpy-2.2.1.ebuild
+++ b/dev-python/gmpy/gmpy-2.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index fa801e06b6cb..e1fe714bb572 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1 +1,2 @@
 DIST python-api-core-2.19.1.gh.tar.gz 212130 BLAKE2B b68482540dfb896129d903d49623db88661652db9eef6d3bd0615746fe64bdcd1d83a3d284110cb7f617ae89ffbe47257d2db7a0fdc84c984c6321a51499d116 SHA512 0f4ffcfd2bf5458ebe942d2a601d8568026b280373538d2362379cc86200f5762eb9eb978a7f9cb5c8014d549c8e48d4acd6114ce54f90fe01f09814c720f589
+DIST python-api-core-2.19.2.gh.tar.gz 212969 BLAKE2B 6ecb63085b9108cb0755dc3bdd31d328de948ede85e2f1e62dae92bd9c12d6d90d4ef24f57a7a953567e6f9e8d105ffbde8bd99d8a42081190f95f2a48b6504c SHA512 76a890ebaaecfd4d913e4e1d3d370e81e655eb5e8192a10292a7a792f6a9287dde7dea43f27a70edcc7430f71346e52f2719393b54cfd7c4223eeba3c28d37e4
diff --git a/dev-python/google-api-core/google-api-core-2.19.2.ebuild b/dev-python/google-api-core/google-api-core-2.19.2.ebuild
new file mode 100644
index 000000000000..61fa5cb4fa0b
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.19.2.ebuild
@@ -0,0 +1,64 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/proto-plus-1.22.3[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_test() {
+	rm -rf google || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio tests
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 31506f1b0f6e..63937aa5c29e 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,4 @@
-DIST google_api_python_client-2.138.0.tar.gz 11595036 BLAKE2B 554abf4e58264d60a5a09174b7199f31ac6cf31bd024add66ff73a71992e9da077c8046abfd8d9400d1b17fa0ccd27ca484ae62dca8b6900bbad42e2a26af9ee SHA512 f9e7501a289e96aebe8db78e32dc30771a860af34808d1bc6d6192c4511ecbbf871cbbf8cdf50daeeb865908a86236400d651e159d913b415b1f2fdf8eb045ab
-DIST google_api_python_client-2.139.0.tar.gz 11606939 BLAKE2B 9ad0cd36a913235e8c7b5afe2f4334399deb662d2d6287a64d98b02d890368839b345dba5e64aad3c852d655e99a04f8eb6902498664c4efa3a693ae2a2c6aeb SHA512 b6235f866a402ebde20fc8cfce41ad5bd0b8034311ab5b4f1b4cc88cea03f52021ee23264a32e9577ee1fa5bcbbb07af1c4e6d5e3f85bc53c0e6760654543b34
-DIST google_api_python_client-2.140.0.tar.gz 11618875 BLAKE2B 0d156fa072b302c0410f8e70681556ee146d8d8951576b1890e429b40363661d263554ad61157256feebee9a45afdf3dcdbb287b7c1dc367a6b6940ec488a645 SHA512 168e75ea734edbf0182078fad27d30f8dd56b07a8c7056973c7df99fb7faff83034901b6742aab8e03c833b73a5fd31a92455105ccc6f0f5b741fadb66715f30
-DIST google_api_python_client-2.141.0.tar.gz 11652283 BLAKE2B 23209b950bb0712890f5c6b2dd0f238b8397a3084a9d61d6423b6d7275faa719d788551868037ab3c4a8ec8d0e37cff96859a1b933e395ef5feadae711c79be9 SHA512 c8d0f879ce9466e3c93e36f263ad9185bc844dae229ed1791068025dd200f21d67d0c87a5ee8ca8b6b0d71c7aad10b6a97dcfc7e7fed20017f992f5bdc7ea225
+DIST google_api_python_client-2.142.0.tar.gz 11680160 BLAKE2B 660e61509969fc6d6d5235163cdede57011150f8932bb4bfccbae19ae020367a34b9ee103b5ec788bbe22580ca60ff242bf3734ce0f81cc20a64e80d57e7628d SHA512 ede409d7f46fb06aaaf3cf2c850259cc8e7e7d2b4a8469323118f2774c31f52f9a11a8fac68d3e2ea27e9425badb5ca08c2b432321d23b6b0b460dafb0e652ce
+DIST google_api_python_client-2.143.0.tar.gz 11695158 BLAKE2B bff768420c0303403268aff68059e81852da89e1a353bae23c86f17314842e17986b39d5c2410adc8991d3966b1c718e88a49a22ed0e222758928928c519077b SHA512 c977599521402fa3b63c432d8e058a4c5a2ac5cf15eadcba7d43200a2c5eb246bdd25a7fecb98ba3c2791d0d566a518d8274f9f77561d0fc7c78c7378a0b05c5
+DIST google_api_python_client-2.144.0.tar.gz 11688778 BLAKE2B 98ca8b9d389876abf16c809f72a6ed907676ae6607acc82aa4656f8c05757459a478f820db6dc364eb7484a839f402c43c50136e254e5d0501eeeba1a1274a67 SHA512 3e6a9a59408f994dd8b5fa6ef5e49b069d907006a29c6631fdc25d6f2cc885cb919387b1cc385d6ecfccab450b4a4787787e401be9b2d7d97ba455595d72d297
+DIST google_api_python_client-2.145.0.tar.gz 11714260 BLAKE2B eb672bdf74519f7dfd984412348ee0c62aa6a942acbb3182648bce2018af72ba6737924cb82c754a94c02f5b749c1bfdd07edb66bb2294b98e2b636cac7c2107 SHA512 33452e866798cd82f79e4d9a8708b4ca32a1e3118e37fbfe5b6e8b8b431167560c4175a5155499bca864fbdb59623368663e0025f71e8bd64b44e365ac889ad8
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.138.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild
index 56cf84636d29..56cf84636d29 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.138.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.139.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
index 58a0eb467bad..58a0eb467bad 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.139.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.140.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.144.0.ebuild
index 58a0eb467bad..58a0eb467bad 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.140.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.144.0.ebuild
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.141.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.145.0.ebuild
index 58a0eb467bad..58a0eb467bad 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.141.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.145.0.ebuild
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 75b582c86f67..be404a9ad906 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1 @@
-DIST google_auth-2.32.0.tar.gz 254614 BLAKE2B fc419f1d751cf99497fb00c4cc5b8ff25380a3341970aa31bebadc5f0a84efd8b9d806f939c9137fd872063d6b3cd06eff0629beab8194e0bf6f7323124f8f90 SHA512 d72d9c367a47b3496dcaae9deec29315c65e43ddf9b3ee2838232ed2ac8aabdf5c91978a6d66700b5e9e77a0de8820ecf12b798fb65383600e08d47b732d1981
-DIST google_auth-2.33.0.tar.gz 257157 BLAKE2B c0071ba0fe5710b9bad3c0fc256b1709478635f2e8123a2bd6cb985cde7c38604b6fa0fcab24a694884d37eef8a15b2d72a6e0f3994bb39aa1d46b1e3e279ce9 SHA512 18d05525147d0da8815213d9f2d19595abaa79daff373ddfb59373e493a6a324dd55e766afa50cc03bccb4a5daf5f93b6fa168ed628f490f0d33b1b050cdb7f7
 DIST google_auth-2.34.0.tar.gz 257875 BLAKE2B 3ebd19aff528673e2240769b606cc6c88cead7dad4beafd58966fe4534a7a5b016daac448658992d5210a69749968975bfb9de462fa8de5891f1412c141b2cad SHA512 fd023bb3d8803e267a7c50536a30e749cfe388e95bd580556e9a60c88c093eb70b93493c4d277dcc77588a43644d90a0c5b80cab946b29f37af99ee913571b8b
diff --git a/dev-python/google-auth/google-auth-2.32.0.ebuild b/dev-python/google-auth/google-auth-2.32.0.ebuild
deleted file mode 100644
index 87a5c2d69d55..000000000000
--- a/dev-python/google-auth/google-auth-2.32.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
-
-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-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
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.33.0.ebuild b/dev-python/google-auth/google-auth-2.33.0.ebuild
deleted file mode 100644
index 5778ba5b4f5d..000000000000
--- a/dev-python/google-auth/google-auth-2.33.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.34.0.ebuild b/dev-python/google-auth/google-auth-2.34.0.ebuild
index 5778ba5b4f5d..dc9a27d8e5d6 100644
--- a/dev-python/google-auth/google-auth-2.34.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.34.0.ebuild
@@ -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}]
diff --git a/dev-python/google-i18n-address/Manifest b/dev-python/google-i18n-address/Manifest
index deeba94c3d0a..32a0f7b9bda3 100644
--- a/dev-python/google-i18n-address/Manifest
+++ b/dev-python/google-i18n-address/Manifest
@@ -1 +1,2 @@
 DIST google-i18n-address-3.1.0.gh.tar.gz 726728 BLAKE2B ef41b285aecea0b3e11b08c0815d57a2c3816c59fe01fab64fd75913b0f870e42fbcd0ed76b201c6cd47e4b249c03689b54c648468c3a2cf3d3cb67e2be7ab03 SHA512 b47b5eeaf214a04614ed0976055d25fbce2d298c45db4bfe31b369cd27dc1e097b14d4fae62b5f8dd95be5693d2fda12d0b618029dc1f3ed2784e28b60c43ef9
+DIST google-i18n-address-3.1.1.gh.tar.gz 726391 BLAKE2B 5c77c059a61cd4f8d56bf25d95f9672c3c8185348239a5aafe54b955cc13b84f56d2143db3bb201024d459cd932bc8efe9828c1e77fa1fb2c9b4293efd2d9225 SHA512 7df537ec2f2f06246e1f77dc2eccb87aca30fb9251a3f32acb154b6ab5754f0525d8a06f1adee210f98bd49ace25b1e78075f5ef378ea0c410fcf08c3addd0b1
diff --git a/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild b/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild
new file mode 100644
index 000000000000..b71b9386ff07
--- /dev/null
+++ b/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google's i18n address metadata repository"
+HOMEPAGE="
+	https://github.com/mirumee/google-i18n-address/
+	https://pypi.org/project/google-i18n-address/
+"
+# Using the github release, as it contains the tests (unlike the pypi artifact).
+SRC_URI="
+	https://github.com/mirumee/google-i18n-address/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 7ea7a283bffd..16f32a93c7d1 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1 +1,3 @@
 DIST googleapis-common-protos-1.63.2.tar.gz 112890 BLAKE2B c6b5262435e7458721fe63fcdc9f8c6485fda27b417619f597d662624b1be13380669d5467427e3f70755f64a187b320cf5954adc307242ae937830c3774aab9 SHA512 ec987acb6ead40771d69e851ca679e7985532a39821d5a2318f9e5ccfce17b9e6f9d4339266b77cb2e55f2c0de0256c80321677d026f4f2c830bdb435aeff676
+DIST googleapis_common_protos-1.64.0.tar.gz 113350 BLAKE2B 79f578c079956926215489353c5b75542f0a44a27f41d8f36a7459357e4d425dc361cfa437d1dc5bbe3338b9ed8a70667c18fd718b962b41e6489b107fb05222 SHA512 3757083840f1a1a6645836f64be350fd0a7378c97f72ab540342a9cdc733d427179dc49a73b0a97e0ab75544ef1e4f81292b0a83e375829c6082de76a6d02fab
+DIST googleapis_common_protos-1.65.0.tar.gz 113657 BLAKE2B a74f10ce3fd1d7eb1805174157ef751ffedc6042f27c11c2e9febbc2a91de7c963fe266beb51f44445bdf6eb8a7237f86902ca670a875ea87fe24782dc8fc79d SHA512 5c62ee5ff6b6d39dc7053031a17be88300888ca3f91e8743ab11deab9b571d40371c12332dbd5bd906941e7917aca36ed28a19d7af619afd305e0649aaeab85d
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.64.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.64.0.ebuild
new file mode 100644
index 000000000000..22f6d27fa091
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.64.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	https://pypi.org/project/googleapis-common-protos/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
new file mode 100644
index 000000000000..08022aeae1e8
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
@@ -0,0 +1,31 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	https://pypi.org/project/googleapis-common-protos/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 5cd84aac0f1e..3c3a5bd50f17 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1 +1,2 @@
 DIST greenlet-3.0.3.tar.gz 182013 BLAKE2B 34ba9f13dd01f5bacedb69952b4d3d08e55eba82d94c5d95cf8bfeb0f1ce94dbde9d62f5e56c33cbf2467d82f6ffd8d05a37048d0292102b1dbb68c67e9398f4 SHA512 20d8818376a200332cbc2c85968317ddf828d2adf3fcc3c53623cd1504ec9a4e4e987e841bd2fe65e934e2b8a5e73a7205847526f0bd196e7afcdf3ae40e9d9b
+DIST greenlet-3.1.0.tar.gz 183954 BLAKE2B 30bc17bd449cbffba5a4a3b988de86c14335a6fc2311626f6f295f2c1434070ce3b9118341e328bc9a70904a3f6da6b527c28b0494371f58b50251db593f3ba4 SHA512 2c0d97848757e6346933426e3f6feb18120b3a63695a746acddbb467e01503174c46aea9b62e7507e8700f3450581ff2460f45700331368333977abebeb805eb
diff --git a/dev-python/greenlet/greenlet-3.0.3-r1.ebuild b/dev-python/greenlet/greenlet-3.0.3-r1.ebuild
index bc243d801fe9..c5e18bb398f3 100644
--- a/dev-python/greenlet/greenlet-3.0.3-r1.ebuild
+++ b/dev-python/greenlet/greenlet-3.0.3-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/greenlet/greenlet-3.1.0.ebuild b/dev-python/greenlet/greenlet-3.1.0.ebuild
new file mode 100644
index 000000000000..1c39226c825e
--- /dev/null
+++ b/dev-python/greenlet/greenlet-3.1.0.ebuild
@@ -0,0 +1,48 @@
+# 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
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="
+	https://greenlet.readthedocs.io/en/latest/
+	https://github.com/python-greenlet/greenlet/
+	https://pypi.org/project/greenlet/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/furo
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# patch cflag manipulations out
+	sed -i -e 's:global_compile_args[.]append.*:pass:' setup.py || die
+	# broken assertions on py3.12+
+	# https://github.com/python-greenlet/greenlet/issues/368
+	sed -e 's:test_trace_events_multiple_greenlets_switching:_&: ' \
+		-i src/greenlet/tests/test_tracing.py || die
+}
+
+python_test() {
+	eunittest greenlet.tests
+}
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index 642968b24974..d5113e60291e 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,2 @@
-DIST griffe-1.0.0.gh.tar.gz 378841 BLAKE2B a71007a09585b1ef0b17c867177f01e0e38984075f1450a6957a65427c3b9fb2486bbf7fa0b41f3c8ce289003e514eeaaefe0b679181d843a8b57befca39a8b4 SHA512 5a286c293f39b0df185345c00954d61e130cf3942aa8dede56180330dff5150043d77bf48ef14bc01c8b1af0af19de8651344d3f3a8fbf850ece1c4c04d17513
-DIST griffe-1.1.0.gh.tar.gz 379874 BLAKE2B 452d98f1248866ee159229aec84bc99f7f83bc9c22505c809ea0de2b9bf6342ffddae42f694c30a2b696de081a34d886e42270a1c6a68aedc5a9f544112889da SHA512 a443c3094c4044b58537b5fa781610d99e26be195df216b74a097257596f52ecc7021ba5fb504c82f7960154b8d3a00fa05cc63526e538291486e915ef44cc51
+DIST griffe-1.2.0.gh.tar.gz 382642 BLAKE2B a9db18e6cca59d85f8af61cde0fe5bf622d8804a6fa12d4128b4b52dbf8d7478b06aa5b746ce97cd3398550a926029fcc7096e5ae95f918e652a8295d9fb60e7 SHA512 334d4d08dfab5d8b24020e2901ab71a624478d1d84025123e85dc9ea6768bd51681788983c2328e2c9296fe36b9304512657577c7c12b6a6196363eb965b473d
+DIST griffe-1.3.0.gh.tar.gz 383337 BLAKE2B e1908e68f812b9227f4ba7249a8f20ae1d75cac3237ca90c5f47adb51a8d0efcd31b016f30f9f9e0af2a2292b86cf5fb08d9314e72ca4282bd36cafce19030ac SHA512 839d0bb8fc36f5552d50721f72905d533849d9b7258ba1ed1eabc783dddc4aee87ea612605bd23268f4282c06e71e010e76dfebce0951ef92917abc80211e7d1
diff --git a/dev-python/griffe/griffe-1.0.0.ebuild b/dev-python/griffe/griffe-1.2.0.ebuild
index b3ab8d048238..b3ab8d048238 100644
--- a/dev-python/griffe/griffe-1.0.0.ebuild
+++ b/dev-python/griffe/griffe-1.2.0.ebuild
diff --git a/dev-python/griffe/griffe-1.1.0.ebuild b/dev-python/griffe/griffe-1.3.0.ebuild
index b3ab8d048238..b3ab8d048238 100644
--- a/dev-python/griffe/griffe-1.1.0.ebuild
+++ b/dev-python/griffe/griffe-1.3.0.ebuild
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index 3ea7ca0ce492..491953d67415 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,2 +1,2 @@
-DIST gsd-3.2.1.tar.gz 108463 BLAKE2B d944a1a7f991e0894bfa1e42aa891ed02f0bbbf91efda39ab45b87f21c17bcc16251a51a34682efb67b6b85cf7fc9d6d92108d85d9643ab8e19aed584397779f SHA512 e889b72d3857d41e68d9515d5857d99f8f6ceead4b8a43019ddf11c4600054c7af3e046792ce154031bfb439c57ecd9d0e553a574cbbf7bce2578b90da631230
-DIST gsd-3.3.0.tar.gz 108961 BLAKE2B 1f734534717af776ebb5a62ddf67eabcc5bc99a814e48ac8d962fc034f24e4eb87a3e45087f3e2f7db757bfd57e44668e41a3ca1fccf406d964024a3a2d399ae SHA512 f01017f46626d19ae5e5bf683c719d6f74b0f3a9d295cd2e54d736f8ca9c25740389b9701b636b2513039919d52e6a6193215cdf759c1f5d3e686071c3888c27
+DIST gsd-3.3.1.tar.gz 108613 BLAKE2B fdfc1e0e70f9b3d804ec5b7a76263b077609af811c9bb1cddf304ff46701d710fead5f103b712cd408cf3c4aa19b91e5af208d586e8a9ca81b56452e2ba32587 SHA512 84a131e4ac6baa7258ed7be5886b99fb34421e919eeaddadf658c3d0a40e2c3667b7ecee8c10a4e3b264538ebfd34c5b97090b23c72c7f9ada5c6b76985b894d
+DIST gsd-3.3.2.tar.gz 108492 BLAKE2B cc585c4de8462891fbedd5a15bbfa5c531ee31cf2082b32600098d7ef8291a7067a195338384e4c42d0f64536d3feb5dc98b5099dc2bfe0ffd328447fc54389b SHA512 1ba704e5cbee3a1b9c2f8ac1b4f6d1afb9819d66b10b069965e25ad6b30f3143cdc721be204a4c34ecd0bf2ddc7eb65a1421f754cafdcc17fac2edad4fc58911
diff --git a/dev-python/gsd/gsd-3.2.1.ebuild b/dev-python/gsd/gsd-3.3.1.ebuild
index a16117a836ec..a16117a836ec 100644
--- a/dev-python/gsd/gsd-3.2.1.ebuild
+++ b/dev-python/gsd/gsd-3.3.1.ebuild
diff --git a/dev-python/gsd/gsd-3.3.0.ebuild b/dev-python/gsd/gsd-3.3.2.ebuild
index a16117a836ec..a16117a836ec 100644
--- a/dev-python/gsd/gsd-3.3.0.ebuild
+++ b/dev-python/gsd/gsd-3.3.2.ebuild
diff --git a/dev-python/hcloud/Manifest b/dev-python/hcloud/Manifest
index 289b837cd4d7..1c1a296a8b13 100644
--- a/dev-python/hcloud/Manifest
+++ b/dev-python/hcloud/Manifest
@@ -1,2 +1 @@
-DIST hcloud-python-2.1.1.gh.tar.gz 118633 BLAKE2B 0072f8a6615ea917336429ef2b56840f1be8906bed9bd0793b47c4faa557e10bda368f8c3edcbc1b8ede6c39b384062038f665ae3e6beb589c747f1238a94572 SHA512 b98b62c99ffa31537baad35d0de0bee99a90dce95ecabfec8500e2172d520a3d819b870f001924cebeee7475905452ec2d5cc0bad15f763d16a423ddbe0171f8
-DIST hcloud-python-2.2.0.gh.tar.gz 119610 BLAKE2B 2b2bdc7416bc08464a7d6456cd935002f43b84d3728fb54ca3b132ac50959151a5c9c4ed75e256ca1dfa40a225cd8e4b0d54a4885497925e5222b00e5ccd5e1f SHA512 88b3ac155d7ee64ba41c1dced6546061287f2cd576c1f4bd95f46d1337c25efb4e25d0856a0c92cec1e97a133aafda8c024a79ef04df90bd29a1cd1318319166
+DIST hcloud-python-2.2.1.gh.tar.gz 119705 BLAKE2B 585602989a834696354257cd26ad135b78d9cb4fbb9362948c8349eabb5a8a78158ae5d750d0ecabfc2dadbcb7f23a49f3ac41a67a7c91a55f4a9495435be5c5 SHA512 32ac9da7e88817ee16bfa31eef51404c7e973511f00950c575a857722418a29641d852dffec9554185a39999dd3951c7c7fddc3f4df2d3f9b5b614426c9d7e78
diff --git a/dev-python/hcloud/hcloud-2.2.0.ebuild b/dev-python/hcloud/hcloud-2.2.0.ebuild
deleted file mode 100644
index 64eceb0a363c..000000000000
--- a/dev-python/hcloud/hcloud-2.2.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
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud/hcloud-2.1.1.ebuild b/dev-python/hcloud/hcloud-2.2.1.ebuild
index dbe97c818fe5..dbe97c818fe5 100644
--- a/dev-python/hcloud/hcloud-2.1.1.ebuild
+++ b/dev-python/hcloud/hcloud-2.2.1.ebuild
diff --git a/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch b/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch
index d4695173dad5..b9f5cc6f8469 100644
--- a/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch
+++ b/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch
@@ -34,15 +34,13 @@ index a82c1b8..77576a4 100644
  
  from . import filters
  from .helpers import (
-@@ -165,7 +168,10 @@ swagger_config = {
+@@ -165,7 +168,8 @@ swagger_config = {
      "specs_route": "/",
  }
  
 -swagger = Swagger(app, sanitizer=NO_SANITIZER, template=template, config=swagger_config)
 +if Swagger is not None:
 +    swagger = Swagger(app, sanitizer=NO_SANITIZER, template=template, config=swagger_config)
-+else:
-+    app.logger.warning("Swagger not found, legacy index will be used.")
  
  # Set up Bugsnag exception tracking, if desired. To use Bugsnag, install the
  # Bugsnag Python client with the command "pip install bugsnag", and set the
diff --git a/dev-python/httpbin/httpbin-0.10.2.ebuild b/dev-python/httpbin/httpbin-0.10.2-r1.ebuild
index cf036cbb5bba..cf036cbb5bba 100644
--- a/dev-python/httpbin/httpbin-0.10.2.ebuild
+++ b/dev-python/httpbin/httpbin-0.10.2-r1.ebuild
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 6dfbfb2e792e..307d6da6aa25 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1 +1,2 @@
 DIST httpx-0.27.0.gh.tar.gz 2168004 BLAKE2B 2bfe58ffa9bd75b602acf844967d399c2173499981e73296bfc0726ee738219031ac3ac04517dd027f769966b77bf225287490c55435a53aec44b9784a0c4b2e SHA512 9db19cced6554effdb5fb0b442cbe05dc66cbfbdb23e8fbc19f43e1acc81028bca9e0fba5d2dae617b19be9f64baa0f02e727e92fef3f3f1288aa19ae07f35c6
+DIST httpx-0.27.2.gh.tar.gz 2185609 BLAKE2B 7e77cab0e9bda032cd595549e43dfc102f90bb8668b62f6b1f0df6bce6b6358f34aa1f51457a315eb774dde8c76083d180c02ff45283dd348c39b4a659307713 SHA512 c7852ae3e982bacee1587b66aed506f3f7e12caf296e651d3cdd9c111a7d737af49473be455bcabccc8e52487ad18b4821ea56b39500c3b77ed2325fc55505ae
diff --git a/dev-python/httpx/httpx-0.27.2.ebuild b/dev-python/httpx/httpx-0.27.2.ebuild
new file mode 100644
index 000000000000..ed4220d25c32
--- /dev/null
+++ b/dev-python/httpx/httpx-0.27.2.ebuild
@@ -0,0 +1,95 @@
+# 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 ~ia64 ~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/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 78eaa5f3bb82..0bc4f96c5d70 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1 +1,2 @@
+DIST huawei-lte-api-1.10.gh.tar.gz 43853 BLAKE2B 568da364ecc709716a040a5f6c32f79b028ceca42ffce29949d064115279a4653544df50e30ac07ad873a1e98ba203093fcf000bca65b4b1ea6f4f009217d4c8 SHA512 7ffe128817bf38d60ee5dcbdb6668516a3ab47a02d34868ab9c9cc6b26cfae10c334a779b4ba63f0ec635b834fce46b12409b913f7c9b45a746ff5ba875e1758
 DIST huawei-lte-api-1.9.3.gh.tar.gz 41344 BLAKE2B 3812c2dd5404320eb24bbe6e1e5819effad06641e96289ac279e5fe96add8880d837bf6770816f1bdce553cbf1aad73d370377c7f0713428d6ac46906d88602c SHA512 4f5f00dd416b017422753940ae69a1c24b424692fdf9e6ea29073035d381b5434462b022ebe44bf4d911eafe07f9ff57b8d349bf7140e0f33daba6384a73cd24
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.10.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.10.ebuild
new file mode 100644
index 000000000000..4315d293fdf2
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.10.ebuild
@@ -0,0 +1,40 @@
+# 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="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="
+	https://github.com/Salamek/huawei-lte-api/
+	https://pypi.org/project/huawei-lte-api/
+"
+SRC_URI="
+	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index c9670ca932db..4b1a644d6e50 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,11 +1,4 @@
-DIST hypothesis-6.107.0.gh.tar.gz 9470192 BLAKE2B 721d9ee1281600bca8387e396c1d79316db3130061ac40635f8cb8ba3cf91ad0417debe1276efb21cadf5e5f8ae856d13b82fc674313a21549adff645ce07b1f SHA512 13403073167d24e80fec4ed256a60e696b79b900a45dbd9f349b123fbefe3c7fa5daac6f35200d5198d4565033b65792cd1fd8a7816955aeddbbc0c7bb93d578
-DIST hypothesis-6.108.4.gh.tar.gz 9472674 BLAKE2B 88983672fc7161ce44c88cd47cfb0fd44a66dcb6c6245e0f1d38e4811b11ff844022515e0655d61a40e9c0f195b930cc1c3ca0cee54a443e07b163bd276147d1 SHA512 cba9a16713ae4d646e4e9db0711191157580776327e590785be86d59863c843649a06535b3e3b766c4aef6344d6046879cf69e224d4a6c9fab0ec7dcda17063d
-DIST hypothesis-6.108.5.gh.tar.gz 9473125 BLAKE2B fa72dd3958970308bbd656643343d522f0f6f2df28131c97024f79f619ecf19c0e92f09b7611b8846fff802a658bd1b018f6237ccdbfa0c9c31f7e49d2356e3f SHA512 595e95e8f790a1d8148e9a626eb388dbe0c8d17359dae6f6aa182abf833b5e7af1ba113430bd18f0d4ec43be3a32a435f0abd4ca0e1a1e02afc2e19aeebdcdd5
-DIST hypothesis-6.108.8.gh.tar.gz 9474435 BLAKE2B fd199019fdbc945c3fec0d9349f443ede307ee155cbb6f01e30f8ce888805b4f37754af9c675112b0f0ca30146d4a5dd45915be66194c677a72a7b2f71979605 SHA512 62090fc72e8f563c59a93b27a2febf0e68e30e2ef322f85ef6abca9a21d182105ea2210b47e4590a752a365d79328d758d0077d50f5857cbeb336ca6ce1e1c1b
-DIST hypothesis-6.108.9.gh.tar.gz 9474517 BLAKE2B c5f10dcc096e7c410444bc609ef8d2c05177f38b4fba79205913db014839da44f25b0ad76758bb31a4ba3c6d6fed25ebb80d66d833842044644b0638feb19afa SHA512 ae0e4963d304cf41900c3ad23f4839d49cfb74edb4d27aae7317e3a8ecd23ca965bd002766228012407b8297828e1d1304719875b4ffd04c6a21d0249cdf2fe2
-DIST hypothesis-6.109.0.gh.tar.gz 9475581 BLAKE2B 2e523b35745b7d1062c17093cf8b80da746574b985653f8f3e83880e5e2f3a3671a7b264b071c8c45394ce190154cc6f6b5f8ae508a9eb6c5911a836753497a4 SHA512 da8ff55e3661bc7f4cb9e5378ae37284af8b246d9fc5162363ba67c8ab4147f3c6d0feff7afa9d7deaeab3ab4cde6ba972c6b1d6464602eb78dcd33f67094113
-DIST hypothesis-6.110.0.gh.tar.gz 9476232 BLAKE2B 69ba7c4872608a69ae18e35fa895cec6fc4fa2dc426a0f876d41d5e85eec061962d98edeaaefeddd5244423923231316dc29ce4eba3a639e533bd61a52d6425c SHA512 45fa3bcb59e9e7f173b153b56888d69df2650f5382226c92f1f67ae9c9ad7e3fff383cb27c9862c7ea103c1b059c8de9d04c66cbaaf7a2a5b529044b3a31ed41
-DIST hypothesis-6.110.1.gh.tar.gz 9476363 BLAKE2B c5d14004658c05626b6f673ad41657c209df0efb13d865cdaf35c7480561bbbb407fb998b64a2750e47c360e44d61dad6fe81cbcb26b33319b536f0d9ca0bb72 SHA512 a070a0ef3c18f2e40b55e3192b7ce033d729c46b4c0328a98cbeb2495a5b224689e44d61f5bf0b4d1d27548f65a00b7e5e9127b803ec2c70ee4f4f05e2925075
 DIST hypothesis-6.110.2.gh.tar.gz 9476926 BLAKE2B 8fb0b250e9c49f56d9b0d077db6305ab86c21eed4739605d3a45423cc0d5695be0e27cab351263f7c3526b26453aee38d6b794464052be6154b4158a776cc873 SHA512 2386f75b91e42e20babf5fc78fcc1ed22391bfa144f318074b0efdb4a1575a6db597aa3c00e756ddea24b792f49d9d6269b6aebb8f8aa8c497e98d3bf2771749
-DIST hypothesis-6.111.0.gh.tar.gz 9478014 BLAKE2B 2ca3f9b1f01105b57e0a4636e7d8308914a3673ee044612c3307392e1f2ec81370cef93b08d52fa940165607c81a8362ef40240c8911dee1ca3b66c6b043745c SHA512 efd2ee38b95cbb435aa2c613f023b4219019ec3bf29c19245c72c352251e6736de0a9d0e90d84e2817275989825a169ab8f64c74e85c6abd20853196df3c74a4
 DIST hypothesis-6.111.1.gh.tar.gz 9475914 BLAKE2B 90604318db1a47db4eea8376c943c077058f3158c6c5220aa5f60575cc85c8cf97ed2ad435c7351141939e5b6773d013cf27e4ef9ee64bea2705596b3e4fecc7 SHA512 40e73843ba4477a9bd75087b42f92b6e483beac72dc8684a3d20e90b764f2c0773479a44b6107b237bcf17d347aad45a0ecb23ec54e19da08860e1fa86e5e772
+DIST hypothesis-6.111.2.gh.tar.gz 9475843 BLAKE2B 69a436586184a205fcb6b4c053e3c5f53a0c19344b2ffbe697d1cc8bcec62815e680783287f857cc64b9e9b66415670185b38405601a09f93e4c325561e567f2 SHA512 405d0a7545d216082f5b75d8b90bf53169481a96a23f8a40685165610dffe2fa2d47397abda98a90db4d281d274a35a201fbbae191fe264cba6be5deb0709042
+DIST hypothesis-6.112.0.gh.tar.gz 9476351 BLAKE2B 1886389d51f09af3127fbeb81ff62618d67203f9ced47507a1c8fdcc90ea1331d37f6937f62f255b47b339c81f686eb1e3e4d9fd496c14565e692fec73b850bd SHA512 9210a611bb5bd02b855057d72565fca1aae72807788433a03ebdddfbe9d44fc454ecd57ebeeb2a9f2d201580929aa44d585615465bde770ccb95aaf1ca1a4239
diff --git a/dev-python/hypothesis/hypothesis-6.107.0.ebuild b/dev-python/hypothesis/hypothesis-6.107.0.ebuild
deleted file mode 100644
index e5f588dc4dcf..000000000000
--- a/dev-python/hypothesis/hypothesis-6.107.0.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.108.8.ebuild b/dev-python/hypothesis/hypothesis-6.108.8.ebuild
deleted file mode 100644
index d401f55b2788..000000000000
--- a/dev-python/hypothesis/hypothesis-6.108.8.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.108.9.ebuild b/dev-python/hypothesis/hypothesis-6.108.9.ebuild
deleted file mode 100644
index d401f55b2788..000000000000
--- a/dev-python/hypothesis/hypothesis-6.108.9.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.109.0.ebuild b/dev-python/hypothesis/hypothesis-6.109.0.ebuild
deleted file mode 100644
index d401f55b2788..000000000000
--- a/dev-python/hypothesis/hypothesis-6.109.0.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.110.0.ebuild b/dev-python/hypothesis/hypothesis-6.110.0.ebuild
deleted file mode 100644
index d401f55b2788..000000000000
--- a/dev-python/hypothesis/hypothesis-6.110.0.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.110.1.ebuild b/dev-python/hypothesis/hypothesis-6.110.1.ebuild
deleted file mode 100644
index d401f55b2788..000000000000
--- a/dev-python/hypothesis/hypothesis-6.110.1.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.110.2.ebuild b/dev-python/hypothesis/hypothesis-6.110.2.ebuild
index d401f55b2788..e5f588dc4dcf 100644
--- a/dev-python/hypothesis/hypothesis-6.110.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.110.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.111.0.ebuild b/dev-python/hypothesis/hypothesis-6.111.0.ebuild
deleted file mode 100644
index d401f55b2788..000000000000
--- a/dev-python/hypothesis/hypothesis-6.111.0.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
-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 ~ia64 ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.108.4.ebuild b/dev-python/hypothesis/hypothesis-6.111.2.ebuild
index d401f55b2788..d401f55b2788 100644
--- a/dev-python/hypothesis/hypothesis-6.108.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.111.2.ebuild
diff --git a/dev-python/hypothesis/hypothesis-6.108.5.ebuild b/dev-python/hypothesis/hypothesis-6.112.0.ebuild
index d401f55b2788..d401f55b2788 100644
--- a/dev-python/hypothesis/hypothesis-6.108.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.112.0.ebuild
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index ca35c4d0d260..1c45df586a23 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1 +1 @@
-DIST idna-3.7.tar.gz 189575 BLAKE2B b604f5e69775b6052e3358a31ea0154832264979a992db51130a0f0e7c5ef9163e97e15956cfd599212ba233c789706a4a2ea8051c3baeda5abc3657bdf40902 SHA512 b50e5ae117b67c7076125d6943e3436200676f85d7dd1b5a5414e217e73904ef077f0b1108d9781ab4afe2a66f7c9e1ce8262ce51edeb2d29e4c504147b6c4cc
+DIST idna-3.8.tar.gz 189467 BLAKE2B e70c754f3a76807d2df9df09b19ec9ea8e98de19f81741dfbb2f828ebd0ac6385e2c0d2fab83206b4c592b40f0b785ed0078eafc0d0339cd9ff53440051c511d SHA512 5ea57a0e21621722375b8b3b90831c1e367f738d7d96d27143990d25ef26d374bcd306956a785ebe6283445642c39b8f655ab4de4b407055e350d11012acdb62
diff --git a/dev-python/idna/idna-3.7.ebuild b/dev-python/idna/idna-3.8.ebuild
index 9188787397d2..9188787397d2 100644
--- a/dev-python/idna/idna-3.7.ebuild
+++ b/dev-python/idna/idna-3.8.ebuild
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 333420fa3359..337922b8a2fb 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,3 +1,2 @@
-DIST iminuit-2.26.0.tar.gz 2945757 BLAKE2B 361c84731ab3ddb01d940d5082b7170cde73ee1f1015724ea78e8dc9d910dcf4614c2ac7eb508a7efaed2abc259b5ffe09103ba921cd3f29c56daf227226e54f SHA512 6caa59c1dd3446f650bae490ef2c24b3f512284745d75e1acf714a3c440964017a68455fcc008b4176c5cbb9a4fadfc699bc01c7734a5b94ff521fe24a1b579a
-DIST iminuit-2.27.0.tar.gz 3265513 BLAKE2B 838c54e0215fa959ca3d2bb46fb3bb24c52ff61369a84de6e1b6c22f1a511db9cfc9d0de5934ac85507b11807128f3a16f0acceafb93a164459e43e61f72da22 SHA512 9d50c51a1e65565bef032e583a4ae529f6f8fcb7c8968eafdf07f96006b56c09632e2738531b64e5518ee69a9b8c6f146313405895750573bf1b792ff8148a56
 DIST iminuit-2.28.0.tar.gz 3268211 BLAKE2B bdc790602daf7df6bb98d4d341aacab2583d3feebd82cc71bce573e83a680da5394c32918038f60cc1e3ad1a0dae15ce0c46fba5e56fdece3b3cfbcb59a3aa08 SHA512 9674d57dff8682367a75d6a3b338f92e9171a507b9e51d1b2eef9c2feaeb1cccb60e2d39f0d6cd3feda9265050333a7814bad939207d4c653f53eecdb3b95955
+DIST iminuit-2.29.1.tar.gz 1833873 BLAKE2B 18d7d9f61125fb34eed24e4c7949e8dc1b62df20fcdf238e25ab2c87935d456c6c53ac4126e9ca9e7127b7bcaa80405072bede9502e8be4e750c74fc973458c9 SHA512 853c3ec4b3a454ebe94929fc04df50f24179e069a8ce7ab34b8a33a349adc4092ebbc563975211b9f5109e5d4524e386c2f02ff095d892bd878ba7958399d771
diff --git a/dev-python/iminuit/iminuit-2.26.0.ebuild b/dev-python/iminuit/iminuit-2.26.0.ebuild
deleted file mode 100644
index c9795273e9af..000000000000
--- a/dev-python/iminuit/iminuit-2.26.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=scikit-build-core
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake distutils-r1 virtualx pypi
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="
-	https://github.com/scikit-hep/iminuit/
-	https://pypi.org/project/iminuit/
-"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/pybind11-2.12[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/annotated-types[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# precision error
-		tests/test_cost.py::test_Template_with_model_2D
-
-		# TODO
-		tests/test_describe.py::test_with_pydantic_types
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/iminuit/iminuit-2.27.0.ebuild b/dev-python/iminuit/iminuit-2.27.0.ebuild
deleted file mode 100644
index c9795273e9af..000000000000
--- a/dev-python/iminuit/iminuit-2.27.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=scikit-build-core
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake distutils-r1 virtualx pypi
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="
-	https://github.com/scikit-hep/iminuit/
-	https://pypi.org/project/iminuit/
-"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="
-	>=dev-python/pybind11-2.12[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/annotated-types[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# precision error
-		tests/test_cost.py::test_Template_with_model_2D
-
-		# TODO
-		tests/test_describe.py::test_with_pydantic_types
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/iminuit/iminuit-2.29.1.ebuild b/dev-python/iminuit/iminuit-2.29.1.ebuild
new file mode 100644
index 000000000000..22953bd65422
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.29.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-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
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake distutils-r1 virtualx pypi
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="
+	https://github.com/scikit-hep/iminuit/
+	https://pypi.org/project/iminuit/
+"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="
+	>=dev-python/pybind11-2.12[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/annotated-types[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# do not force LTO
+	sed -i -e '/INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# precision error
+		tests/test_cost.py::test_Template_with_model_2D
+
+		# TODO
+		tests/test_describe.py::test_with_pydantic_types
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 7ee3cc5b8858..16872b0761f3 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,2 +1,3 @@
 DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
-DIST importlib_metadata-8.2.0.tar.gz 53907 BLAKE2B 3864e1fcea4f0c30134c401f787b83500b8c13860a69784f769a67d1db1d4345c8a289fec2a21812f29dc3f07c522836dc1271f33eaf4592bcb709561f0adbe6 SHA512 cc0467f5ac95503b4fcbce6bf0b4211a5bf9ba8389a714c6d0cb3f35756b7c5bcb6359873cfeb1dbd068b0a41ddf57b27a564aeaad9bc17cb8a5e4d71fa12e8a
+DIST importlib_metadata-8.4.0.tar.gz 54320 BLAKE2B fc8912dd432e05c5ad82428f47b6265588d6b20c364321bea5ffb1653f2f9d6b2aff3d35b399d1d8237d328414bc77697bd4dcbd56611f39fd002779328c78b6 SHA512 97d904225f478bf9877a62e2d1a43dc88e2d9d74ac4488ddbdd2371066b08429d11e10a5a9bb484a93e86a01f13404b57e0350726c1c13c6cb1b2424970da2be
+DIST importlib_metadata-8.5.0.tar.gz 55304 BLAKE2B 801d7edaed5a42ef5c871830286e698620cd06cde43178c1ab65a5d35f6055fdd2a02b0f14bada94704a13a6708ea3091e634548e534df2df92d942c83192c3b SHA512 86ceb3ff408705565628b71a740a9e9123eee4b49e2ad029b9ee204548a78257dfefe9756194ce660939806f75983dd4b858dacd642b40fddc4188e699ef4e19
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.2.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.4.0.ebuild
index fe401ea3a89b..fe401ea3a89b 100644
--- a/dev-python/importlib-metadata/importlib-metadata-8.2.0.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-8.4.0.ebuild
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.5.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.5.0.ebuild
new file mode 100644
index 000000000000..8eddbf7d33bb
--- /dev/null
+++ b/dev-python/importlib-metadata/importlib-metadata-8.5.0.ebuild
@@ -0,0 +1,51 @@
+# 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=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 ~ia64 ~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 6d473e835ce5..a7fbab598ae4 100644
--- a/dev-python/importlib-resources/Manifest
+++ b/dev-python/importlib-resources/Manifest
@@ -1,3 +1,4 @@
-DIST importlib_resources-6.4.0.tar.gz 42040 BLAKE2B 55b52a42051c6900af7b5b70783476a48398ae02539871a3f508df08fd5b4ec03bbe40980de8cd49a60cc022905a4ffdfd95b55d70e0cfb5d64497b02cc9b88f SHA512 c600e7ba96431f15a929e5acda89a262ceef33a3f44ae361fad4201dde8033dd8f0f2bcb856619fd5e21209a5d17cf9ae3610e65c3e6ecd0e36545437d0064b9
 DIST importlib_resources-6.4.2.tar.gz 41629 BLAKE2B 21bfb0af9421f49acce3209ec93016b69626a179d65f48066abea8792292506b739460675cc9c0ce552d11db261af409d5aa2bab2b7b16c3daab133873d3a353 SHA512 e3bb0e1ccf35fe36f805a97ff71cd82d9e55547baf1c6083bec07c2528cb1f11497926f76917cfba3924c04d6fd5753ccfbb912fdf08174c5b63f5f1a198acf5
 DIST importlib_resources-6.4.3.tar.gz 42026 BLAKE2B 8a88825467bf558b4232ce4f1600ceda56b67283d93182d0144b5cabe6227bdf79e24a8fb6cef47d7cc59cc9cc293e70c7a2cd7ab1512a523f04cf167ac27cdb SHA512 23b6e8d37d2317cfe9d465f8083b6fa8826c34ec114844993556657b943ecca3b3d6e5f4ca958787d980ebd451e174b8e134f35445bdef085ca29b71c76e248e
+DIST importlib_resources-6.4.4.tar.gz 42721 BLAKE2B 4e38bba910e2de9e53297151f6fd9a839534b7aca1a98c4c053c420eba4b137b7ca60a32dce84f3ed5c558e3bfbf3f90fea48f3e6e7e8921c2961756ef96eb04 SHA512 ffdd2cbe56ae308392e9fcadbd5822b68afd5737a78b04416e84a1ca294ce33f4f0df5ff5ee4e403f43064c9bf33df3d2742809d651295b536d0036f7359580c
+DIST importlib_resources-6.4.5.tar.gz 43372 BLAKE2B 8ab9cb9f2e693de87d6d3c2696e660ae067ad00d725db542fbbd9b916cedfc8246c45285e728d352f02e4b7a56cc7d8f360f324af9a65cfdb935e7c20f753206 SHA512 e5949475a27220b101d0ba57b091a3d56a2e1092ca3102d9e260561742289ee32e2bfe17738304a72507314fc46a151f3cadcce06e71781d20bbedf7057a6366
diff --git a/dev-python/importlib-resources/files/importlib-resources-6.4.0-be.patch b/dev-python/importlib-resources/files/importlib-resources-6.4.0-be.patch
deleted file mode 100644
index a4c20249af4f..000000000000
--- a/dev-python/importlib-resources/files/importlib-resources-6.4.0-be.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3167e4b9de35ea3010d84429b7eafb9a7c2afbb4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 10 Jul 2024 07:33:47 +0200
-Subject: [PATCH] Fix functional API tests to be endian-agnostic
-
-Fix the "backslashreplace" tests for the functional API to be
-endian-agnostic.  The tests used to rely on `.encode("utf-16")`
-producing the same data as found in the test file.  However, on big
-endian platforms it would produce a big endian encoding, while the test
-file is little endian.  To avoid the problem, explicitly specify
-`utf-16-le` encoding.  Since this meant that the BOM is no longer
-produced, explicitly include it in input.
-
-Fixes #312
----
- importlib_resources/tests/test_functional.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/importlib_resources/tests/test_functional.py b/importlib_resources/tests/test_functional.py
-index 69706cf..255bd13 100644
---- a/importlib_resources/tests/test_functional.py
-+++ b/importlib_resources/tests/test_functional.py
-@@ -82,7 +82,7 @@ def test_read_text(self):
-                 'utf-16.file',
-                 errors='backslashreplace',
-             ),
--            'Hello, UTF-16 world!\n'.encode('utf-16').decode(
-+            '\ufeffHello, UTF-16 world!\n'.encode('utf-16-le').decode(
-                 errors='backslashreplace',
-             ),
-         )
-@@ -130,7 +130,7 @@ def test_open_text(self):
-         ) as f:
-             self.assertEqual(
-                 f.read(),
--                'Hello, UTF-16 world!\n'.encode('utf-16').decode(
-+                '\ufeffHello, UTF-16 world!\n'.encode('utf-16-le').decode(
-                     errors='backslashreplace',
-                 ),
-             )
diff --git a/dev-python/importlib-resources/importlib-resources-6.4.0.ebuild b/dev-python/importlib-resources/importlib-resources-6.4.0.ebuild
deleted file mode 100644
index da08cc37d4f0..000000000000
--- a/dev-python/importlib-resources/importlib-resources-6.4.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
-# 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 ~ia64 ~loong 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 unittest
-
-PATCHES=(
-	# https://github.com/python/importlib_resources/pull/313
-	"${FILESDIR}/${P}-be.patch"
-)
diff --git a/dev-python/importlib-resources/importlib-resources-6.4.2.ebuild b/dev-python/importlib-resources/importlib-resources-6.4.2.ebuild
index 0621ce95769b..8166d13b49ef 100644
--- a/dev-python/importlib-resources/importlib-resources-6.4.2.ebuild
+++ b/dev-python/importlib-resources/importlib-resources-6.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild b/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild
new file mode 100644
index 000000000000..adb91b7a3d32
--- /dev/null
+++ b/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 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 ~ia64 ~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/importlib-resources/importlib-resources-6.4.5.ebuild b/dev-python/importlib-resources/importlib-resources-6.4.5.ebuild
new file mode 100644
index 000000000000..adb91b7a3d32
--- /dev/null
+++ b/dev-python/importlib-resources/importlib-resources-6.4.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 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 ~ia64 ~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 3e069c9b0baa..82a8bd5d24de 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1 +1,2 @@
 DIST inflect-7.3.1.tar.gz 71980 BLAKE2B efb1224ec0514403db5db7cc572335a7f3dab09e7fe57559df736fee4598782c12fc9ae1d3ade89b41acc492996c7a93f04eff86c712b1c3f98f9404694f643c SHA512 562107d500ee488a35d809e4b7888af31fb90d7b07b9f6c328f66d8723a171227e639e0cbf43cb9610227faff6690a8af7205bc509f6764c9e22e9160f7ba5e1
+DIST inflect-7.4.0.tar.gz 72730 BLAKE2B eaaaa46a1f710f5b05165f3f894eb5a2437908299146369a2537a675a1d50facba56c7a9efa2e459b7cfb95a4f2c5f615d64948fb278a4a990423b40414f701a SHA512 fe3658a2f4c9303db90604268a525112c6a67f66ed37f6fbe76cd04a008658362e682413297dc1fcae6e6a0415098f3adaf0f205b781e1e24a050f59c9dc9021
diff --git a/dev-python/inflect/inflect-7.4.0.ebuild b/dev-python/inflect/inflect-7.4.0.ebuild
new file mode 100644
index 000000000000..d1cdcca00005
--- /dev/null
+++ b/dev-python/inflect/inflect-7.4.0.ebuild
@@ -0,0 +1,29 @@
+# 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/ipython/Manifest b/dev-python/ipython/Manifest
index 4deaec7642df..6aa5e3555e17 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1 +1,2 @@
 DIST ipython-8.26.0.tar.gz 5493422 BLAKE2B 2d05630d64d932190bf07c233e4241f5ce4830e62a3fb3551a93d9bfa83545de8090902a0528004b8233169d20652b7a3bbf1913ce078254246002956b1e44e1 SHA512 05f331cd39b75aed78bb06460f56145d9cefa2d65d818ae0fd25b3739d2c11830e3d6c427206787d3b3efec10de8ed4c966c25a70e4b7a7e1c914cfe8fba6a70
+DIST ipython-8.27.0.tar.gz 5494984 BLAKE2B c896fec5d63bd2c587b218e86dc3be80e125b87c4abb30d5d4b465233a014aa1b94939e293517e1e8eb93ca8098d304872e94a32454f636f6652494e16b4352a SHA512 0bc38bb182fd3342306ed8b9057873eed0554d8cd98ed03be1eb94ff885a39e977d12ceb4eac33fca06229cf7883a7a28f7570f9e698de7554c0533ad094c560
diff --git a/dev-python/ipython/ipython-8.27.0.ebuild b/dev-python/ipython/ipython-8.27.0.ebuild
new file mode 100644
index 000000000000..b492448b16c1
--- /dev/null
+++ b/dev-python/ipython/ipython-8.27.0.ebuild
@@ -0,0 +1,161 @@
+# 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 ~ia64 ~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}]
+	)
+"
+
+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/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 6566d8777047..885650768ae2 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1 +1 @@
-DIST ipywidgets-8.1.3.tar.gz 116515 BLAKE2B b7a11e7078ddbd99b8713fc3aa63c78118bf00b64c376412c608a622fda1e7d0430accb0959a56a474d2eeba4b5ce531255b52bba591f2806833644e47f2a7bd SHA512 3722e3716f367c6dce88c6ec401d23240c214793672ae76a12b672f77c7c801775d3253e1202749e54832d9dc13e4bb5984ec57e21607f12c22aced8874538db
+DIST ipywidgets-8.1.5.tar.gz 116723 BLAKE2B fb616c368e75efd6a88dc1c586f16a33a0a725193e0765b0b0ec4a24764b1e8eb33e85b439a33716806e6eda4038674be8059f450695c87a88c5283d425d80b6 SHA512 b4030cc511f759db75417139575f85a797588fe48e17e7ac7debe7bff3f62ebe14dca86a21599be52b7cc6622fe7bb8e8a3dc41d0fffcabe7f77f15735cd5629
diff --git a/dev-python/ipywidgets/files/ipywidgets-8.1.3-py313.patch b/dev-python/ipywidgets/files/ipywidgets-8.1.3-py313.patch
deleted file mode 100644
index c8bd3e22a8a6..000000000000
--- a/dev-python/ipywidgets/files/ipywidgets-8.1.3-py313.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From acfa9a3539648a04b11331ad07cab4393069f87f Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Tue, 18 Jun 2024 11:58:07 +0200
-Subject: [PATCH] Make tests compatible with Python 3.13
-
-Python compiler newly removes indent from docstrings
-https://github.com/python/cpython/issues/81283
----
- python/ipywidgets/ipywidgets/widgets/tests/test_docutils.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ipywidgets/widgets/tests/test_docutils.py b/ipywidgets/widgets/tests/test_docutils.py
-index 1f8b09aa34..462293326c 100644
---- a/ipywidgets/widgets/tests/test_docutils.py
-+++ b/ipywidgets/widgets/tests/test_docutils.py
-@@ -15,7 +15,7 @@ def test_substitution(self):
-         def f():
-             """ Docstring with value {key} """
- 
--        assert f.__doc__ == " Docstring with value 62 "
-+        assert "Docstring with value 62" in f.__doc__
- 
-     def test_unused_keys(self):
-         snippets = {'key': '62', 'other-key': 'unused'}
-@@ -24,4 +24,4 @@ def test_unused_keys(self):
-         def f():
-             """ Docstring with value {key} """
- 
--        assert f.__doc__ == " Docstring with value 62 "
-+        assert "Docstring with value 62" in f.__doc__
diff --git a/dev-python/ipywidgets/files/ipywidgets-8.1.3-pytest-8.patch b/dev-python/ipywidgets/files/ipywidgets-8.1.3-pytest-8.patch
deleted file mode 100644
index 0294ec1ce604..000000000000
--- a/dev-python/ipywidgets/files/ipywidgets-8.1.3-pytest-8.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From bbc6c064aa797eb21bd5a9b441dbbc76925a72db Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Thu, 11 Apr 2024 11:40:15 +0200
-Subject: [PATCH] Fix compatibility with pytest 8
-
-Resolves: https://github.com/jupyter-widgets/ipywidgets/issues/3883
----
- .../ipywidgets/ipywidgets/widgets/tests/test_interaction.py | 2 --
- python/ipywidgets/ipywidgets/widgets/tests/test_link.py     | 1 -
- .../ipywidgets/ipywidgets/widgets/tests/test_send_state.py  | 2 +-
- .../ipywidgets/ipywidgets/widgets/tests/test_set_state.py   | 2 +-
- python/ipywidgets/ipywidgets/widgets/tests/utils.py         | 6 +++---
- 5 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/ipywidgets/widgets/tests/test_interaction.py b/ipywidgets/widgets/tests/test_interaction.py
-index 0dc7e5fcfc..feb1afe50c 100644
---- a/ipywidgets/widgets/tests/test_interaction.py
-+++ b/ipywidgets/widgets/tests/test_interaction.py
-@@ -19,8 +19,6 @@
- # Utility stuff
- #-----------------------------------------------------------------------------
- 
--from .utils import setup, teardown
--
- def f(**kwargs):
-     pass
- 
-diff --git a/ipywidgets/widgets/tests/test_link.py b/ipywidgets/widgets/tests/test_link.py
-index 0c92dfdcb2..9301764d40 100644
---- a/ipywidgets/widgets/tests/test_link.py
-+++ b/ipywidgets/widgets/tests/test_link.py
-@@ -4,7 +4,6 @@
- import pytest
- 
- from .. import jslink, jsdlink, ToggleButton
--from .utils import setup, teardown
- 
- def test_jslink_args():
-     with pytest.raises(TypeError):
-diff --git a/ipywidgets/widgets/tests/test_send_state.py b/ipywidgets/widgets/tests/test_send_state.py
-index ec18ae4af1..98465b9b7d 100644
---- a/ipywidgets/widgets/tests/test_send_state.py
-+++ b/ipywidgets/widgets/tests/test_send_state.py
-@@ -3,7 +3,7 @@
- 
- from traitlets import Bool, Tuple, List
- 
--from .utils import setup, teardown, DummyComm
-+from .utils import setup
- 
- from ..widget import Widget
- 
-diff --git a/ipywidgets/widgets/tests/test_set_state.py b/ipywidgets/widgets/tests/test_set_state.py
-index 82ecbd9311..22ec54d90f 100644
---- a/ipywidgets/widgets/tests/test_set_state.py
-+++ b/ipywidgets/widgets/tests/test_set_state.py
-@@ -6,7 +6,7 @@
- 
- from traitlets import Bool, Tuple, List, Instance, CFloat, CInt, Float, Int, TraitError, observe
- 
--from .utils import setup, teardown
-+from .utils import setup
- 
- import ipywidgets
- from ipywidgets import Widget
-diff --git a/ipywidgets/widgets/tests/utils.py b/ipywidgets/widgets/tests/utils.py
-index 260485e3f8..8dbbcb355b 100644
---- a/ipywidgets/widgets/tests/utils.py
-+++ b/ipywidgets/widgets/tests/utils.py
-@@ -12,7 +12,7 @@
-     NEW_COMM_PACKAGE = False
- 
- import ipykernel.comm
--
-+import pytest
- 
- class DummyComm():
-     comm_id = 'a-b-c-d'
-@@ -87,10 +87,10 @@ def teardown_test_comm():
-             setattr(Widget, attr, value)
-     _widget_attrs.clear()
- 
-+@pytest.fixture(autouse=True)
- def setup():
-     setup_test_comm()
--
--def teardown():
-+    yield
-     teardown_test_comm()
- 
- def call_method(method, *args, **kwargs):
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
deleted file mode 100644
index 2d8b2a1677c2..000000000000
--- a/dev-python/ipywidgets/ipywidgets-8.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipywidgets.readthedocs.io/
-	https://github.com/jupyter-widgets/ipywidgets/
-	https://pypi.org/project/ipywidgets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-4.0.11[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-widgets-3.0.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/ipython-6.1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/jupyter-widgets/ipywidgets/pull/3903
-	"${FILESDIR}/${P}-pytest-8.patch"
-	# https://github.com/jupyter-widgets/ipywidgets/pull/3924
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/pypy/pypy/issues/4892
-				ipywidgets/widgets/tests/test_interaction.py::test_interact_noinspect
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.5.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.5.ebuild
new file mode 100644
index 000000000000..5554ff1c4c94
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-8.1.5.ebuild
@@ -0,0 +1,57 @@
+# 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="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipywidgets.readthedocs.io/
+	https://github.com/jupyter-widgets/ipywidgets/
+	https://pypi.org/project/ipywidgets/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-4.0.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-widgets-3.0.12[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/ipython-6.1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# https://github.com/pypy/pypy/issues/4892
+				ipywidgets/widgets/tests/test_interaction.py::test_interact_noinspect
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 81f7518a5e1f..b9721c8b8240 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1 +1,2 @@
 DIST jaraco.collections-5.0.1.tar.gz 17990 BLAKE2B a78de1a3222492dde34271edd8032dc5b8737dc428c1aa6b55ebda799ef4ff986cb0cf495bdbc35f9c776e1d576c2970ae6736ba8d8aa7f2fcc2e6766aefbbc3 SHA512 88b0f261acd91d585e643b810818762af7165eaf505099701b99ee3be6955eebcfd1c95690faa3ecb56b25f6982a8cee242e687e50ead56a557a5b2b72ec6dfe
+DIST jaraco_collections-5.1.0.tar.gz 19026 BLAKE2B b0ecae5ddfabe22aca0fb0cb4ef6c07dd0c6b56cfd6920787779eb47631c3b4001f35a97f040a71495975fce40d5ec509799d19e23b81ccbf4afbae461cf0624 SHA512 b03b247657ad25df0b86ad125728e37c8123fdd1834adfc16c7e41fb9c31b9d4c1b168ed40614b965caafc7dd55fd14bba8c355648c8b5cca13b50736bc32883
diff --git a/dev-python/jaraco-collections/jaraco-collections-5.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-5.1.0.ebuild
new file mode 100644
index 000000000000..c19508cdbc4c
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-5.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.collections/
+	https://pypi.org/project/jaraco.collections/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index ecd56663a6b7..162d7ccb4b2f 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1 +1 @@
-DIST jaraco.context-5.3.0.tar.gz 13345 BLAKE2B d2f429335ea80a6b50ea9574adc45c25c0fc78e8ebb5edde218bcbbe7a2b27ae6b5c17453e71904240d0d873ebef36f7c7aeda4424d3fea2dd9aaf01af6fb4c5 SHA512 f63bf272c45ff5c43499621651b78841259040ac98d67c9db75fadebb1c497c1156e05f23bf7c91df3e91f1e070acb9f7dc665e7b242ba7b1ac1cf99a619494d
+DIST jaraco_context-6.0.1.tar.gz 13912 BLAKE2B e249916d41e936c4f261e5e4330f3d6b26b159772a1284521168313f41ef296ca82930e46837ae8ea7c895f7471bc039d5b42a8d4eceb0718056ff4b82d79cba SHA512 5711f581a616a18f7b7dbac65550255c7eecfae39df04b675817b16fbc5d61b833617d853c40f0b910c0ba5d144baf4c4b2add155c9b91001209b27da594a801
diff --git a/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild b/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild
deleted file mode 100644
index 8cb625122fb3..000000000000
--- a/dev-python/jaraco-context/jaraco-context-5.3.0.ebuild
+++ /dev/null
@@ -1,58 +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=flit
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Context managers by jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.context/
-	https://pypi.org/project/jaraco.context/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/backports-tarfile[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	test? (
-		dev-python/portend[${PYTHON_USEDEP}]
-	)
-"
-
-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 setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.context"
-		version = "${PV}"
-		description = "Context managers by jaraco"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-context/jaraco-context-6.0.1.ebuild b/dev-python/jaraco-context/jaraco-context-6.0.1.ebuild
new file mode 100644
index 000000000000..c742d44c9a52
--- /dev/null
+++ b/dev-python/jaraco-context/jaraco-context-6.0.1.ebuild
@@ -0,0 +1,62 @@
+# 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=flit
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Context managers by jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.context/
+	https://pypi.org/project/jaraco.context/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-tarfile[${PYTHON_USEDEP}]
+	' 3.10 3.11)
+"
+BDEPEND="
+	test? (
+		dev-python/portend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	jaraco/context/__init__.py::jaraco.context.repo_context
+)
+
+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 = "jaraco.context"
+		version = "${PV}"
+		description = "Context managers by jaraco"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
+}
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 4c94de7835b1..e9f6aa17b032 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1 +1 @@
-DIST jaraco.path-3.7.0.tar.gz 11039 BLAKE2B d861cf9af9723d0dd59dff61242c7a5e7de439d0156e4fcc024c30c5cde2773ca0b501527fbade2cae84cc236f74d0e242179a4f51775dbde92cc0c9bed5b267 SHA512 22eba78273da9b354153bb45b2d62d9ba35466f78ad2bf728f4c284d19572443e7267c39008b3fd43b975c9dc258cddf3a3287adddd243e1031d182e6562072a
+DIST jaraco_path-3.7.1.tar.gz 11771 BLAKE2B 25ba1ff90514984be0885c0507ebe554372f4fa32aadda1a1bda8bde1781d60e81726fa899e863bf0d34ec49a79c57052b2b5b4035cd2655cdbb513df54da626 SHA512 aa002c649b4d0d4dbfc7bd3fe25b4ef71ca3c92d200029c282453002c75d3c642630b4ba4bfd0355a6311c72407fc874b3a092daa94ed99824f129119dd464d0
diff --git a/dev-python/jaraco-path/jaraco-path-3.7.0.ebuild b/dev-python/jaraco-path/jaraco-path-3.7.0.ebuild
deleted file mode 100644
index b0fdda03077b..000000000000
--- a/dev-python/jaraco-path/jaraco-path-3.7.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=setuptools
-PYPI_NO_NORMALIZE=1
-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 ~ia64 ~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.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.7.1.ebuild
new file mode 100644
index 000000000000..554609045799
--- /dev/null
+++ b/dev-python/jaraco-path/jaraco-path-3.7.1.ebuild
@@ -0,0 +1,30 @@
+# 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 ~ia64 ~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-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 162ce0772cd6..f027cad296c8 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1 +1 @@
-DIST jaraco.stream-3.0.3.tar.gz 8877 BLAKE2B 85289efe8e04e93cbceb0053f5025cad3d073deeb113806e25ca06fb88a9b082de6805305de85d1f17b77f61d2d0f4683b2b21f670102b03112b8f7a3fdafd91 SHA512 fe50c21b26e734c9c2d0b7cf8a1c8cc8bab80417adf073a4ae213ba4067aa33e2f6c8886aac996971d2f98aacd295d9999aa3ac7dba24dd952cc27d15bef22e2
+DIST jaraco_stream-3.0.4.tar.gz 10744 BLAKE2B dab536ba2927c361deb86500d2ac294351c18098f2f69b6f40f54a68ae438dad094ee5075ab6d1c73a7ccd6a05bf98edbbc5cf2441ecd68cef0c4129e94aa47f SHA512 f17647fd2dd1fcdc04d6ef62a95fe63d3f1c7e3acbc72600a414930c4b5d781b4148aff4bda94a47f6ece5c9666b976b321647e3f07c37ffb1ee2003bb075b07
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
deleted file mode 100644
index 1ead9f9f6404..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3-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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.stream/
-	https://pypi.org/project/jaraco.stream/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.4.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.4.ebuild
new file mode 100644
index 000000000000..72daf5311129
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.4.ebuild
@@ -0,0 +1,29 @@
+# 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=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.stream/
+	https://pypi.org/project/jaraco.stream/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~riscv x86"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-test/jaraco-test-5.4.0.ebuild b/dev-python/jaraco-test/jaraco-test-5.4.0.ebuild
index ad20feadc830..62457c9b071d 100644
--- a/dev-python/jaraco-test/jaraco-test-5.4.0.ebuild
+++ b/dev-python/jaraco-test/jaraco-test-5.4.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/jaraco-collections[${PYTHON_USEDEP}]
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/test[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-vcs/Manifest b/dev-python/jaraco-vcs/Manifest
index 7f3d0fc7e033..5ae1f03a9967 100644
--- a/dev-python/jaraco-vcs/Manifest
+++ b/dev-python/jaraco-vcs/Manifest
@@ -1,2 +1 @@
-DIST jaraco_vcs-2.3.1.tar.gz 16957 BLAKE2B eeabf6b99d85a708ef3e5b012ea793e5f1923e0630ce3072b0e47d07401b4f98927397037438a167535ad510b37e106dc3dd6c19a76bd20373e8ef4533289054 SHA512 b6591fd17b4323c10d1e762b8efce71e127396a4922c148458ac12214feff62219511b92723c822807f4344b169a88f814fe15e23dcf14bc85f88926554d5822
 DIST jaraco_vcs-2.4.0.tar.gz 17233 BLAKE2B 5e97b2fb83fa19936c1fd04dcf50b5ca3cb8d91424c65094c61e30491ff72920482aa51edf6402998284b2df1cc7804db90c35b80c83d12f8be80f69e1a4661c SHA512 8be749129a4c40882ac82ea017f1e616dd7995a1185e858229650c38d13833c75b2c60f854ad004797934b2f49a4264096f7eb2580630b2b6f3b2f7a9706070a
diff --git a/dev-python/jaraco-vcs/jaraco-vcs-2.3.1.ebuild b/dev-python/jaraco-vcs/jaraco-vcs-2.3.1.ebuild
deleted file mode 100644
index 7f92cf3cb43b..000000000000
--- a/dev-python/jaraco-vcs/jaraco-vcs-2.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Facilities for working with VCS repositories"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.vcs/
-	https://pypi.org/project/jaraco.vcs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-versioning[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-path[${PYTHON_USEDEP}]
-		dev-python/pytest-home[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# assumes running inside the git repo
-	jaraco/vcs/__init__.py::jaraco.vcs
-)
diff --git a/dev-python/jaraco-vcs/jaraco-vcs-2.4.0.ebuild b/dev-python/jaraco-vcs/jaraco-vcs-2.4.0.ebuild
index b43fd6c3c6a3..6fcc655a12fd 100644
--- a/dev-python/jaraco-vcs/jaraco-vcs-2.4.0.ebuild
+++ b/dev-python/jaraco-vcs/jaraco-vcs-2.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index 69b225dd45d4..d9b831766eae 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,2 +1 @@
-DIST jq.py-1.7.0.gh.tar.gz 1953673 BLAKE2B 861dcb706ef801ff3abb47a6b85fb8aad03988c717a67063d737667ce6853c89dbe10bf61dac517701b8b3e3af6b97d12a15ed03aa0d5a6e6d0d3fa2697e9284 SHA512 918e4537eacf55d0cce888b1946b13acb6d177906d704c99e0b1cc88a55a2929fbeccef7d3fa61daaf0290a97afec581d23a641bdbfc0c700744422135fbcad6
 DIST jq.py-1.8.0.gh.tar.gz 1954418 BLAKE2B e823ab01a7ce42abc542b58bb1f966e6447b85d66c7b72e8b0765a65f6ae510cf5c6045e14c802237360c2108f84428dc9b18a452e1334ba5ee709a4c835e5bd SHA512 83e9a7599518b5281f25954d5fc66de488678ef86982964bc04ae3739d4627220a9ec92570810f9cf235a8e5351284ac430053e6f826ca42f831d837b4750d83
diff --git a/dev-python/jq/jq-1.7.0.ebuild b/dev-python/jq/jq-1.7.0.ebuild
deleted file mode 100644
index ba3780636e9d..000000000000
--- a/dev-python/jq/jq-1.7.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-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="jq.py-${PV}"
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="
-	https://github.com/mwilliamson/jq.py/
-	https://pypi.org/project/jq/
-"
-# pypi sdist is missing .pyx
-SRC_URI="
-	https://github.com/mwilliamson/jq.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# Minimum versions of jq + onigurama are from setup.py's bundled versions
-DEPEND="
-	>=app-misc/jq-1.7.1:=
-	>=dev-libs/oniguruma-6.9.8:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local -x JQPY_USE_SYSTEM_LIBS=1
-
-	# Cython compilation isn't part of setup.py, so do it manually
-	"${EPYTHON}" -m cython -3 jq.pyx -o jq.c || die
-	distutils-r1_python_compile
-}
diff --git a/dev-python/jq/jq-1.8.0.ebuild b/dev-python/jq/jq-1.8.0.ebuild
index d3a413969cd1..ba3780636e9d 100644
--- a/dev-python/jq/jq-1.8.0.ebuild
+++ b/dev-python/jq/jq-1.8.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Minimum versions of jq + onigurama are from setup.py's bundled versions
 DEPEND="
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index c3bf78f00cff..dd132e0a5662 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1 +1,2 @@
 DIST jsondiff-2.2.0.gh.tar.gz 22672 BLAKE2B 64af3c3f0aa9c7c6380af30ae303c230a04ba02d9e97d25b46348134312ea53d869e74c24a1b0d72983d731dda6d74a3fee3d89df6e9a6ef083321fe9b501ec3 SHA512 a1da92a1a38047947c2ee6057c641930c1b141889f992723c250a4444871170e2b10c892595a3bce026339b1d03c91d157cdf918fb36d4b916131bee5db969e5
+DIST jsondiff-2.2.1.gh.tar.gz 22715 BLAKE2B 598d999d6d2dd9a3a6abd8b34145420b2ee9c6b5bf4a686e1c4fe605d68c3ee588efda4db0a0127a13f10e4639b43661f297e83a314ee8a0c12e9408c8dfdcbb SHA512 e10ed1f1b11b877223936586c1805cb8b8ae3f487f913f4d33030ae6e87a06a54f1f9adfb2b50485d72123f2feb6b40aa019851a6c9fd83575cc0f0b814484f7
diff --git a/dev-python/jsondiff/jsondiff-2.2.1.ebuild b/dev-python/jsondiff/jsondiff-2.2.1.ebuild
new file mode 100644
index 000000000000..1f6ddda4fc90
--- /dev/null
+++ b/dev-python/jsondiff/jsondiff-2.2.1.ebuild
@@ -0,0 +1,41 @@
+# 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="Diff JSON and JSON-like structures in Python"
+HOMEPAGE="
+	https://github.com/xlwings/jsondiff/
+	https://pypi.org/project/jsondiff/
+"
+SRC_URI="
+	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild
index 189e023d4ea4..3315ab7f9121 100644
--- a/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild
+++ b/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ply[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index ad17d8f010d8..f43e0e28f98d 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1 +1,2 @@
 DIST jsonpickle-3.2.2.gh.tar.gz 321994 BLAKE2B 1e126e0f1f336e5b64631a874c379b39665b324ccbc4c87d7becba302568f61df2d576732ea9165514791e6b2dd122e7008d43090d634d4d30fdde5c7d0600f9 SHA512 20e28885e637f8dba5965e22dc9960acb7c10fb25d78f2ba9bf6fb94d55a968e2245d577dbe19a32153e12af2ffa7dad6ae3e1897c426c25fa544796606736a6
+DIST jsonpickle-3.3.0.gh.tar.gz 324099 BLAKE2B e2c922df65f497b80ae78258024342de763d7585ce391f076e9e8a2f1da73e5c755b977be069a9778c85721b2fdcfcde70034374c7f38f001486a41742e9a488 SHA512 b796c2263ccb38e9e9191d9519ac044defa5df8a2b34bc8002f4de59397056048e037ae12f3e5ca46061febb81a7b35cfec11335926c893357f0c22e9b1b6d85
diff --git a/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
new file mode 100644
index 000000000000..2ff464c9795a
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
@@ -0,0 +1,69 @@
+# 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/gmpy[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pandas[${PYTHON_USEDEP}]
+		' 3.{10..12})
+		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/gmpy[${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/jupyterlab-widgets/Manifest b/dev-python/jupyterlab-widgets/Manifest
index 5c493a3b3e9a..62298a2596f1 100644
--- a/dev-python/jupyterlab-widgets/Manifest
+++ b/dev-python/jupyterlab-widgets/Manifest
@@ -1 +1 @@
-DIST jupyterlab_widgets-3.0.11.tar.gz 203538 BLAKE2B 8208afd3dc9e8dd36a6ab77ac20d935b53a8c200401e9e423ca154e87c50379cced5ff785dc625ead7f09aaffd9af5835151a853224abce6e7c84c6ce199259e SHA512 27e8fec4817d3e37e1976c30db21f914b11dc3bb1e0aa7c584c811b3f9a54422136c7702bd32f7494851d87108182a8a9fe11686d515f4da19ee2a8f7a930755
+DIST jupyterlab_widgets-3.0.13.tar.gz 203556 BLAKE2B 24b0988f70e820990f0c8a0f46e40f2aad8cc925c5c43b11382f626ca6c01fd1ef0e63672a99257552f502ebd8c3ebf8696124226e646dd5f8f653cc58f4c8da SHA512 3cf4f406947b80367f822a8268212a339a259b1ca31d7a284950fe00f2aef9d48be0137f4a12380eebfe48ae1a82420a758d9005d0ffb10ed85eefb9080d57c4
diff --git a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.13.ebuild
index b67d02e57296..b67d02e57296 100644
--- a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
+++ b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.13.ebuild
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index e490452ca451..58eb8ec8938a 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab-4.2.4.tar.gz 21506914 BLAKE2B b130f91807c96d57d01127a37dcac1589422ef36023e9b02a32ade9c2ceedf128fce49d1a11dfbb5836dd5f40a0828e32f625cb3d99eb0098785b5be6b56eeba SHA512 2327c7d7b63185c9e1a90acfcac4b31224835601ed8e0bb545077e0c68f6cbb612af884fef288b7e28245b83a035542590cbd721b0f9e44af27bb4aa8a00acab
+DIST jupyterlab-4.2.5.tar.gz 21508698 BLAKE2B 9222972e40e60549360d80221b97806e47b70592ffa9a63b3cb030e4b4ad061a8f8eadf295d76ae0302efb3bbf854cde9f5dfcacb6df3c6ad1994bf6ab66d1cc SHA512 7c5c3aab1bf86da0e49742630ece8a311ec351be99bfce3e35b5e92e06e858296e882a47f7a1abe9ab1c63cc92062f21d557f4f6237846a3c8377fc6288bf298
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
new file mode 100644
index 000000000000..70f94aa414ed
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
@@ -0,0 +1,81 @@
+# 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..12} )
+
+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[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-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.0.1[${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
+"
+
+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/keystoneauth1/Manifest b/dev-python/keystoneauth1/Manifest
index e4af4b8d6fd5..ee31b50c0045 100644
--- a/dev-python/keystoneauth1/Manifest
+++ b/dev-python/keystoneauth1/Manifest
@@ -1 +1,2 @@
 DIST keystoneauth1-5.7.0.tar.gz 275942 BLAKE2B 71e94ed879cb79b65ea19cb06718c10268979a4f271e04314b24db648eccf3b0003826e71942854360d3df7563c893ee73590a826337fe1c0aafb67245f58f2e SHA512 529a831b6ec51e780fae09d6368d32eabfc843d019a16101c66a6cf2b8ed6b246e1d9e8def5ed11154115b460e806f29a47cb419e1c72da43b7348480843255b
+DIST keystoneauth1-5.8.0.tar.gz 278617 BLAKE2B 93437140316d1f353c42f3e8face97d9510c4a795f5c5c7c29b7dbd7c66887a819d71a66f35ebbda3851174cc9c738f53d8edc35a940e4c06a0b4cec19db36d8 SHA512 a427c9a6339cce57e53b78ee3e33276a87753e4cee44fe5dfbc85c7d54bc95bbc1e4536a26c8d1be1ef5a392e9095d529fd64df0ce61f1a4a4c0ba8078b2cddd
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild
new file mode 100644
index 000000000000..825474f59123
--- /dev/null
+++ b/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild
@@ -0,0 +1,60 @@
+# 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="This package contains tools for authenticating to an OpenStack-based cloud"
+HOMEPAGE="
+	https://opendev.org/openstack/keystoneauth/
+	https://github.com/openstack/keystoneauth/
+	https://pypi.org/project/keystoneauth1/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fragile to test runner name
+	keystoneauth1/tests/unit/test_session.py::SessionTests::test_user_agent
+	# broken betamax
+	keystoneauth1/tests/unit/test_betamax_fixture.py::TestBetamaxFixture::test_keystoneauth_betamax_fixture
+)
+
+EPYTEST_IGNORE=(
+	# require hacking
+	keystoneauth1/tests/unit/test_hacking_checks.py
+)
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index cead14b39286..4f5d8eb1a23a 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1 +1,2 @@
 DIST kiwi-1.4.5.gh.tar.gz 91741 BLAKE2B cebdf8269b063d10f85a303cf5fa850f87c911aff9be37ae2b6762f021ea25b8b8cb3759e7e4292bc8c2fdbdf5d73ef6295263f541adb283969509cc11d8428a SHA512 889e106c27915cb773bc13969605812c1ca01a139e992d2b3517eb20989ae41392bfdcdd63184a7777b13eff5109d167869087ea09149b1527e56a3455213b14
+DIST kiwi-1.4.7.gh.tar.gz 91607 BLAKE2B 560b811ad16e7063581c6a448460035a8b880a9ed11e0be0da8f587dfc88d9f8c8341aca9fa26920be8d7478a0920cd0597f045b5d2efa80982b56800ddbcf35 SHA512 74e9b78980a348314b569cc8f922e7bddbafc3798c23526eb1746d4a5d0ae17681cd291c8ebeedbe9e7af25b4d0b32980e0c63c40a070f617cca9dd5915ea668
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild
new file mode 100644
index 000000000000..ced573e41477
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild
@@ -0,0 +1,41 @@
+# 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=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="
+	https://github.com/nucleic/kiwi/
+	https://pypi.org/project/kiwisolver/
+"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+COMMON_DEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/setuptools-scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
index 73ba79dedc7a..02541fbeaa77 100644
--- a/dev-python/klein/Manifest
+++ b/dev-python/klein/Manifest
@@ -1,2 +1 @@
-DIST klein-23.12.0.tar.gz 103287 BLAKE2B ee6afe720a8cb68a28dd0dfc666de713c2188efbd92d31a669ac2db0c49afa3b61860bd2db216d0f846fb5d273105a18b8d443813c8e5d0e970ae9bece66e521 SHA512 2833d3b4ea53ccb62eccf72051b66867ca73c43dee0eb84aac9bd4ec4ba04b1b00acc5391863f0960eda2e5c329fc5b9537603997b9fa703750a3906febbbf72
 DIST klein-24.8.0.tar.gz 104368 BLAKE2B d88dbc298f2a4f749066ed0666baaa7b8c5230ae53381b25b40cc8ea7130cd0620f829826ba7cfacb3cbabb2e1f6a3d891b0d83acd133b32e36f5f37a2cb3db0 SHA512 8354ef193d5ad1d4bb8f2dd279d17fb0e3bcf99521c744d14c65f15d87c7b8e5e9a0ca159f3ace7df070316a42d3f6918246a6ee9ac6ac3162a2dce75ba429e4
diff --git a/dev-python/klein/klein-23.12.0-r1.ebuild b/dev-python/klein/klein-23.12.0-r1.ebuild
deleted file mode 100644
index c9b9f089e88f..000000000000
--- a/dev-python/klein/klein-23.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Micro-framework for developing production-ready web services with Python"
-HOMEPAGE="
-	https://pypi.org/project/klein/
-	https://github.com/twisted/klein/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	<dev-python/attrs-24[${PYTHON_USEDEP}]
-	dev-python/hyperlink[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/tubes[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/treq[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/klein/klein-24.8.0.ebuild b/dev-python/klein/klein-24.8.0.ebuild
index fc6e03e439c4..72025544865e 100644
--- a/dev-python/klein/klein-24.8.0.ebuild
+++ b/dev-python/klein/klein-24.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 049e1bcdbdc7..63d610e6477c 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,2 +1,2 @@
-DIST kombu-5.3.7.tar.gz 439344 BLAKE2B 9443cb7d9d03ca7ed49b1e2c5a413e5d5633ccaf8cb2b8545b4bd0a7a7699f7fc773f735e6b26abf582502f1dbf11b088c612d749f09cab99950e145e8ee82e0 SHA512 48104d61a7c38a211ec378f90aade09d682a99d4f8b3d18b4bce49b51c80be794ab4b012d2974893fbc630a37c52dad10fb57f8335238b3002a64e025a148ee2
 DIST kombu-5.4.0.tar.gz 442120 BLAKE2B 138fc4287f98179166973da019cb5d2536ec2daeb995e1ec94972c95dd3d42c33d97e4e0ed79eedda75e5668c789f463bc115638d8774bcee7018821de9ca3a5 SHA512 fd9b47018a6bb95067486858ee90c052dc497ae4625884521c37b0b18a226de52bee84599b7f7e4aa9ee956e1c648a2672e8c6dda4deaf493b20ffe30fca13bb
+DIST kombu-5.4.1.tar.gz 442786 BLAKE2B b9772bd3a2ebabc4424b029ef72b7378dc2c4f4b0f6002732e5466910589d2c056317bc49ee7c9b3bc8dd02a820614eaf75dfcdebdade84d58fe919b5d11126a SHA512 e0ccab1037e840f11bbdd1f7055df4b25e09c5a00716b1b6b1d754fe7e73b21cc1f85062cb544321eb87bf3eb294837373496e1dca6266c9bc27ed68f7e2c1d8
diff --git a/dev-python/kombu/files/kombu-5.3.7-py313.patch b/dev-python/kombu/files/kombu-5.3.7-py313.patch
deleted file mode 100644
index 7a359db0e022..000000000000
--- a/dev-python/kombu/files/kombu-5.3.7-py313.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d26e891025f55ecbdc577fcbd4bc1f19c9e020d9 Mon Sep 17 00:00:00 2001
-From: Roman Inflianskas <rominf@pm.me>
-Date: Fri, 5 Jul 2024 21:44:58 +0300
-Subject: [PATCH] Add support for Python 3.13
-
-Fixes https://github.com/celery/kombu/issues/2051.
----
- .github/workflows/ci.yaml              | 16 ++++++++++++++--
- kombu/transport/redis.py               |  2 +-
- requirements/extras/confluentkafka.txt |  2 +-
- requirements/extras/zstd.txt           |  2 +-
- t/unit/transport/test_redis.py         | 15 ++++++++++-----
- tox.ini                                | 18 ++++++++++--------
- 6 files changed, 37 insertions(+), 18 deletions(-)
-
-diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
-index 515d6f7d7..29909dbe5 100644
---- a/kombu/transport/redis.py
-+++ b/kombu/transport/redis.py
-@@ -89,7 +89,7 @@
- 
- 
- logger = get_logger('kombu.transport.redis')
--crit, warn = logger.critical, logger.warn
-+crit, warn = logger.critical, logger.warning
- 
- DEFAULT_PORT = 6379
- DEFAULT_DB = 0
diff --git a/dev-python/kombu/kombu-5.3.7.ebuild b/dev-python/kombu/kombu-5.3.7.ebuild
deleted file mode 100644
index 8d4a9966b9e7..000000000000
--- a/dev-python/kombu/kombu-5.3.7.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..13} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="
-	https://github.com/celery/kombu/
-	https://pypi.org/project/kombu/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/amqp-5.1.1[${PYTHON_USEDEP}]
-	<dev-python/amqp-6.0.0[${PYTHON_USEDEP}]
-	dev-python/vine[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.22.2[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-freezer[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/redis-4.2.2[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-celery
-
-PATCHES=(
-	# https://github.com/celery/kombu/pull/2052
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		t/unit/transport/test_redis.py::test_Channel::test_connparams_health_check_interval_supported
-	)
-	local EPYTEST_IGNORE=(
-		# obsolete Pyro4
-		t/unit/transport/test_pyro.py
-		# unpackaged azure
-		t/unit/transport/test_azurestoragequeues.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-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
-}
-
-pkg_postinst() {
-	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
-	optfeature "Etcd backend" dev-python/python-etcd
-	optfeature "MongoDB backend" dev-python/pymongo
-	optfeature "Redis backend" dev-python/redis
-	optfeature "sqlalchemy backend" dev-python/sqlalchemy
-	optfeature "yaml backend" dev-python/pyyaml
-	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
-	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
-}
diff --git a/dev-python/kombu/kombu-5.4.1.ebuild b/dev-python/kombu/kombu-5.4.1.ebuild
new file mode 100644
index 000000000000..5b95ce34649e
--- /dev/null
+++ b/dev-python/kombu/kombu-5.4.1.ebuild
@@ -0,0 +1,83 @@
+# 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="AMQP Messaging Framework for Python"
+HOMEPAGE="
+	https://github.com/celery/kombu/
+	https://pypi.org/project/kombu/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/amqp-5.1.1[${PYTHON_USEDEP}]
+	<dev-python/amqp-6.0.0[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.22.2[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
+		dev-python/pytest-freezer[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/redis-4.2.2[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-celery
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		t/unit/transport/test_redis.py::test_Channel::test_connparams_health_check_interval_supported
+	)
+	local EPYTEST_IGNORE=(
+		# obsolete Pyro4
+		t/unit/transport/test_pyro.py
+		# unpackaged azure
+		t/unit/transport/test_azurestoragequeues.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+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
+}
+
+pkg_postinst() {
+	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
+	optfeature "Etcd backend" dev-python/python-etcd
+	optfeature "MongoDB backend" dev-python/pymongo
+	optfeature "Redis backend" dev-python/redis
+	optfeature "sqlalchemy backend" dev-python/sqlalchemy
+	optfeature "yaml backend" dev-python/pyyaml
+	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
+	optfeature "brotli compression" "app-arch/brotli[python]"
+	optfeature "zstd compression" dev-python/zstandard
+}
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index ba11d3afddbb..d5a1ca33b94f 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,2 +1 @@
-DIST lark-1.1.9.tar.gz 255451 BLAKE2B 0bdb34a75c17800cc6819413011de879a163317c7414b260e1a4a0ccc4b40d11636fad1ae84946e0408096525b6cfeb6f725c95caed8043d3dff3e318d15be1f SHA512 4d711451f129312a28cff84239a2928fdff96df1445f77ae7a9d882d13791a58e44663ef70fd064df954094878214611ee1313ce9315c8dcfb0833b003a3774f
 DIST lark-1.2.2.tar.gz 252132 BLAKE2B 175f51930972f17051af6fefdf71ef4602f126d373888f30a630a703d038abe9bb2706da80564c72f19273f7d0bfbe351ab34e9d72fa1ad9dd7181232eefe61e SHA512 77cf3abf26b827cb60eae4c193de0c98780df7dfa3daa1c21ca5d73bc16387d77561d57e8a20c69ceaeb35531b7191fe765b9834587972e2697f3f07def96b6c
diff --git a/dev-python/lark/lark-1.1.9.ebuild b/dev-python/lark/lark-1.1.9.ebuild
deleted file mode 100644
index 6cccd93b1cec..000000000000
--- a/dev-python/lark/lark-1.1.9.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 pypi
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-# dev-python/regex doesn't support pypy
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	epytest
-}
diff --git a/dev-python/lark/lark-1.2.2.ebuild b/dev-python/lark/lark-1.2.2.ebuild
index 61cdd4674361..6cccd93b1cec 100644
--- a/dev-python/lark/lark-1.2.2.ebuild
+++ b/dev-python/lark/lark-1.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 # dev-python/regex doesn't support pypy
 BDEPEND="
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index 9e7551f1078f..06abc4ac9224 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -1,2 +1,3 @@
 DIST leechcorepyc-2.17.4.tar.gz 180273 BLAKE2B 09c6d8b4bba14d645c1718f6fd5c32d08715e2f8bc0b065ff08823bb95d2aad025452388f4d26b2b61c703a8a796d1b8999f1461b1a8ae5c7479e60e204a8489 SHA512 6948f09d53e3d2a47611f7d414c06712850427aecd43035c571daad61bdff2cd5f0c9799b7bf74b042ad66d7686258210a3bc7bb29af0b632025fbf8ca458cb0
 DIST leechcorepyc-2.18.0.tar.gz 234411 BLAKE2B ebf2dba7cc20bdf8fdcac65d889fe3fab0e5c5b11509468f2733ef6a20bc0ccf6e0fc6788ac6ec62101a996ae983b3dbbab3afde1573b76d84ee4e0bd224e749 SHA512 c85fbc2eb2a62929f232f0657944406cc3918320a11fb3824fbe60889ff3c61796a99c39d7083b895868a0bbf2d2dacc473db59d9e4c183aeae3528bb03a0b4f
+DIST leechcorepyc-2.18.7.tar.gz 234929 BLAKE2B 5e785ec50975fdf3f943a18a09bdae6308e8426691ee5f1eb11d0db9534126b39d009946b8ff2f02783d6e97e2d45e2cf9cddd1cc7882a1569412dc50d08694f SHA512 8938ff389aed0b49df4c0f3c9f00838a418784dd21d019f6c821fc4d1561414d17ac4f59702cb54f4e1584f39d48bcd3bbd8247e8eed2bd38ec6941524948ffa
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild
new file mode 100644
index 000000000000..594aa6daeab7
--- /dev/null
+++ b/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 toolchain-funcs pypi
+
+DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library"
+HOMEPAGE="https://github.com/ufrisk/LeechCore"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# leechcorepyc ships with a bundled version of the LeechCore library. So we
+# don't depend on the library here. But we must be aware this module doesn't
+# use the system library.
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.16.9-respect-CC.patch"
+)
+
+src_prepare() {
+	default
+
+	# Avoid redefining _FORTIFY_SOURCE. See #893824, #906715.
+	sed -i -e 's/ -D_FORTIFY_SOURCE=2 / /g' leechcore/Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+
+	distutils-r1_src_configure
+}
diff --git a/dev-python/libcst/Manifest b/dev-python/libcst/Manifest
index cdda2f319f33..41a7e9512e1a 100644
--- a/dev-python/libcst/Manifest
+++ b/dev-python/libcst/Manifest
@@ -40,7 +40,6 @@ DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f
 DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
 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.3.1.tar.gz 765034 BLAKE2B 0a7a4b26402d0f7cae851eb2d5a45b845ce42878a30cd9608eec85d637e43874f4d2ba591486684da1bca4711b08046e518892a5a1864a91af9fc17d5108eb53 SHA512 c5ac467bab0ff2808db4510620444cb7705d1af88f0e3f41c43c9ab493206d58561ca2ffb9ee98f14286ee182b4271103d9ca3c3935fef5a8f8dcf60dfae5b50
 DIST libcst-1.4.0.tar.gz 771364 BLAKE2B 8ff1eac643b78e25e295d878bb4c74b503911083f4781fb3be162ad679fb92dbfcb77d85d3dde9413bf041f2fc73d5c1b5a293e167df753ae54781e6e6e4de95 SHA512 4f83f072d5adf120be80713b9553261fcd40842fdca4eb29a5d2beb2d6581f02d7c7eb77770845f183860b23f91482907df847e276d385f19e802088568eadce
 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
diff --git a/dev-python/libcst/libcst-1.3.1.ebuild b/dev-python/libcst/libcst-1.3.1.ebuild
deleted file mode 100644
index 19fd96d2908f..000000000000
--- a/dev-python/libcst/libcst-1.3.1.ebuild
+++ /dev/null
@@ -1,187 +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=( pypy3 python3_{10..12} )
-
-CRATES="
-	aho-corasick@1.0.4
-	anes@0.1.6
-	annotate-snippets@0.6.1
-	anstyle@1.0.2
-	autocfg@1.1.0
-	bitflags@1.3.2
-	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-channel@0.5.5
-	crossbeam-deque@0.8.1
-	crossbeam-epoch@0.9.9
-	crossbeam-utils@0.8.10
-	difference@2.0.0
-	either@1.6.1
-	errno-dragonfly@0.1.2
-	errno@0.3.2
-	glob@0.3.0
-	half@1.8.2
-	heck@0.4.1
-	hermit-abi@0.1.19
-	hermit-abi@0.3.2
-	indoc@2.0.4
-	instant@0.1.12
-	is-terminal@0.4.9
-	itertools@0.10.5
-	itertools@0.11.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
-	lock_api@0.4.7
-	log@0.4.17
-	memchr@2.5.0
-	memoffset@0.6.5
-	memoffset@0.9.0
-	num-traits@0.2.15
-	num_cpus@1.13.1
-	once_cell@1.16.0
-	oorandom@11.1.3
-	parking_lot@0.11.2
-	parking_lot_core@0.8.5
-	paste@1.0.9
-	peg-macros@0.8.1
-	peg-runtime@0.8.1
-	peg@0.8.1
-	plotters-backend@0.3.2
-	plotters-svg@0.3.1
-	plotters@0.3.1
-	proc-macro2@1.0.70
-	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.33
-	rayon-core@1.11.0
-	rayon@1.7.0
-	redox_syscall@0.2.13
-	regex-automata@0.3.6
-	regex-syntax@0.7.4
-	regex@1.9.3
-	rustix@0.38.19
-	ryu@1.0.10
-	same-file@1.0.6
-	scopeguard@1.1.0
-	serde@1.0.145
-	serde_derive@1.0.145
-	serde_json@1.0.81
-	smallvec@1.8.1
-	syn@1.0.109
-	syn@2.0.41
-	target-lexicon@0.12.4
-	termcolor@1.1.3
-	thiserror-impl@1.0.37
-	thiserror@1.0.37
-	tinytemplate@1.2.1
-	toml@0.5.9
-	trybuild@1.0.71
-	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
-"
-
-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 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-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_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
-	)
-
-	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/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 8e28cc93f790..6193749c7ef7 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -8,6 +8,8 @@ DIST libvirt-python-10.3.0.tar.gz 238840 BLAKE2B 35f4b15609550f9f255ee046fda4df2
 DIST libvirt-python-10.3.0.tar.gz.asc 833 BLAKE2B 75f38beedc069543f634f0b880e439a6dbc4aea6eec29bbc229a5169f09aa55c5207a3f445f5e70da2b4cb94e7397bdd937f7d5088f7cd7b4f57d3d57e6196c1 SHA512 adeb63e8ecbdbac498d0971bea837f6a8ef5fa673bbade52a623e2f7a70600c443b87ca32cfe9c61c33f9f785eb1215815bf12fbd3cc4d9d4f60a3b898bb3cfb
 DIST libvirt-python-10.5.0.tar.gz 240191 BLAKE2B d4f801f89f1db1b84c565d53b048b9ae8b61127d6c99e0d463fd7cd7d666cc108e4157cdd483e33d3716db14e29ebdcbea82b4196b9c9bd6e9092233a54a267e SHA512 1114405f52c9bfcfd733a26d7d2a51439fca6012313c22f40c4b488f55690d2564a26ab9376c285245e9899ef68fa136bb943ebb3702aa679874d0b98f3cebd7
 DIST libvirt-python-10.5.0.tar.gz.asc 833 BLAKE2B 88bacd298472f540b9a099a2c8600964df4460ec31b7b614441c98801b40c4fb72d168fd12862fcf286650aa87532a6c2f5dccfca40658e48855201434943693 SHA512 06eebf7f869a67b0bd9d64bbcf8df5ed339c2650525464bc579ffc53a9f84a146fbd83027bbbf30bab7b3d46de360a3a73941f752a4f000194a1d806be9ea837
+DIST libvirt-python-10.6.0.tar.gz 240216 BLAKE2B e1300bdf124132bbb2c17649974633fc28e27044bec20aea0c563e793b3f4e83197292d3820f6f8a39b5d47165c455f40321c333976b86119a0b9504ffffe7af SHA512 01e49babbcef5b2a12cb773e0b5e36b15d9b27890192f29ebf4cd0189e5a6383d5c51e1eda542c2724ff402cd2cffa5ee7448cf133efc1af9ba924745969da04
+DIST libvirt-python-10.6.0.tar.gz.asc 833 BLAKE2B 58d263a211c68e2a3c811ac9952977fd05a42f9f8b910746fae35c69925a8a5783a9c0796390875a8b8036c315404a08ae826fe2306c8d63a8479f883f96760a SHA512 b9d42be07925345e9183180301013f43169b0d00c1e97f78742b23fd7d97977e0437471b122518702e8fa59fd30674f6b8d5bf03cda6de746018afa5c1ef75cd
 DIST libvirt-python-9.8.0.tar.gz 246277 BLAKE2B c333909d1f4fd32f9e05d42e468b3808971360bb8aaf35934ec25f8155f0231b2ff3bfd90944a50cf13e09cec3cf35fdf41fb5869b1683c1cd36b4767f2b3dd1 SHA512 c9871ca2fa9d18ae42c4aa76e9a7ba9f0a026061b058072c862c8fe402c2d2325189687e1490718360a9b8f6c13d8ae2adfbe54f79a367fb6be9fbde381f4901
 DIST libvirt-python-9.8.0.tar.gz.asc 833 BLAKE2B 78e6556031c325674d26322d0a6a4dfc391dd050223bd6d939d30328fc7bb1a2f8671aae95eb3a37b916311e6f4c44a4c1929093844347e06dffa23480793e34 SHA512 b999d442f8e22d91ccf9988f53603159406b3aacd3469fd613ed24afd67722206eb2b319a1518bc7aa8cc12684f84685de885bd40c9ba7d9a94ef16cf03f6065
 DIST libvirt-python-9.9.0.tar.gz 246357 BLAKE2B d2e6bc9f8ae3c722ffa18772e40965e7ef1acfb36a863d764ac39c694f687a078b6433cb780a27696f63c698c3e63d203ae1609b48ee31ea5cd95a21a3947666 SHA512 5a09b23b843080f2e55a7b00dc225e0bf23c9c23cac42ce4ffaff725020303745185482c2cc781d519020f50a335d4fa72a7a618bb2c1d0eb0845781d1b22ab7
diff --git a/dev-python/libvirt-python/libvirt-python-10.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-10.6.0.ebuild
new file mode 100644
index 000000000000..9b1751db4dfd
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-10.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:="
+else
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# setuptools is broken for C extensions, bug #907718
+	distutils-r1_python_compile -j1
+}
+
+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/license-expression/Manifest b/dev-python/license-expression/Manifest
index 5075621a7623..a87eaed34f8c 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,2 +1 @@
-DIST license-expression-30.3.0.gh.tar.gz 170159 BLAKE2B 6db3c9c3a1c6551fd22a338c74b75b595df5fe59fcde526baf2ddc52329b20cc4fd9848b986acc62709054c8d1f297879d0636e0c75ec30112cc654c41c7efec SHA512 10e141c9f7d05353ff2d76053497a72aebee6bbda6f263cb4fa69d1ab0ada8331bd0a126558b89bd7db428fc55a87bb5c88f1d5217cfb9640dbd10c1975bd08c
 DIST license-expression-30.3.1.gh.tar.gz 170363 BLAKE2B a40882d006c92f6327b710529bfa8225d8565d17aeb977ba7b05970f620dd7f801c855c4198928be92109ef7727d92578b18add0afc44a08625f9a989693be5e SHA512 c5093cfd5dac3ba202610d9794368c5c93380927d7bc8bf57c93bd14bb91b62d1dcff56157a8994a94ca2d66e7a2cf3956cb931a7fa86cb46a04844db3ed7c65
diff --git a/dev-python/license-expression/license-expression-30.3.0.ebuild b/dev-python/license-expression/license-expression-30.3.0.ebuild
deleted file mode 100644
index f882561e93d0..000000000000
--- a/dev-python/license-expression/license-expression-30.3.0.ebuild
+++ /dev/null
@@ -1,34 +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=( 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/nexB/license-expression/
-"
-SRC_URI="
-	https://github.com/nexB/license-expression/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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/license-expression/license-expression-30.3.1.ebuild b/dev-python/license-expression/license-expression-30.3.1.ebuild
index b434099e5604..882957cd1173 100644
--- a/dev-python/license-expression/license-expression-30.3.1.ebuild
+++ b/dev-python/license-expression/license-expression-30.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/dev-python/lit/lit-19.1.0_rc2.ebuild b/dev-python/lit/lit-19.1.0_rc4.ebuild
index d862b4f8cd03..d862b4f8cd03 100644
--- a/dev-python/lit/lit-19.1.0_rc2.ebuild
+++ b/dev-python/lit/lit-19.1.0_rc4.ebuild
diff --git a/dev-python/lit/lit-20.0.0_pre20240808.ebuild b/dev-python/lit/lit-20.0.0_pre20240830.ebuild
index d862b4f8cd03..d862b4f8cd03 100644
--- a/dev-python/lit/lit-20.0.0_pre20240808.ebuild
+++ b/dev-python/lit/lit-20.0.0_pre20240830.ebuild
diff --git a/dev-python/lit/lit-20.0.0_pre20240815.ebuild b/dev-python/lit/lit-20.0.0_pre20240910.ebuild
index d862b4f8cd03..d862b4f8cd03 100644
--- a/dev-python/lit/lit-20.0.0_pre20240815.ebuild
+++ b/dev-python/lit/lit-20.0.0_pre20240910.ebuild
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 90ce40f8ed31..3a04228425db 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1 +1,2 @@
 DIST llfuse-1.5.0.tar.gz 869259 BLAKE2B 2a3eee64718f4a73b8dd51ccaeedd7b1b700f734b10daa864d2ca04da5f38ed6a514c4ae8b541000c4d4a3042dcd95533ff7c1df655d7b57ec89120a97d8a9b6 SHA512 bb84c697658e7cd39eb6af3a4a6085c3bc3295e5f0b4f35adf6565ecff5077acb27ecd92f7c6420aa06dab36d9b54915bce65e4ec3d011047a0a15cdccbbb284
+DIST llfuse-1.5.1.tar.gz 959557 BLAKE2B 0484c1b71b1293f4577039ff150bbf870350e25c091363affa99ca4c33dc4db72d7ff48747076707ca2de605c0ae15adaa49cfbcef3a52630e92b9f5bc717743 SHA512 c4dc25bb3cfe9abd0d7f6885a73f1b3e21a834554206cc6fdf6ba3f7e03f5f4f6c1117161528f4ea2bb93013abbcba0c87ce7fef3368ac147e4d15fe1c5dd113
diff --git a/dev-python/llfuse/llfuse-1.5.1.ebuild b/dev-python/llfuse/llfuse-1.5.1.ebuild
new file mode 100644
index 000000000000..01254a43809b
--- /dev/null
+++ b/dev-python/llfuse/llfuse-1.5.1.ebuild
@@ -0,0 +1,58 @@
+# 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 bindings for the low-level FUSE API"
+HOMEPAGE="
+	https://github.com/python-llfuse/python-llfuse/
+	https://pypi.org/project/llfuse/
+"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=sys-fs/fuse-2.8.0:0
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
+)
+
+distutils_enable_sphinx rst
+distutils_enable_tests pytest
+
+src_prepare() {
+	# force regen
+	rm src/llfuse.c || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ! -f src/llfuse.c ]]; then
+		esetup.py build_cython
+	fi
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lxml-html-clean/Manifest b/dev-python/lxml-html-clean/Manifest
index 36ffee2de7a7..6201d9c26e42 100644
--- a/dev-python/lxml-html-clean/Manifest
+++ b/dev-python/lxml-html-clean/Manifest
@@ -1 +1,2 @@
 DIST lxml_html_clean-0.2.0.tar.gz 15438 BLAKE2B 570ac3e0a5861692a439fc2a52ee34e40c659ee3c6bf1b990b1e9dc47f25feedd654cf8f4f1f4c27a49e00c6a8be7940492405d5ad61920c29c1c464609848f6 SHA512 67908512294932454ae461d6371c5dd525e2c21b67b6fd437f4a4ecda7bbb6c617526f9541d4ad0fe624e3f8506ed8a391cd766167f2054a685d96ef18b7e53f
+DIST lxml_html_clean-0.2.2.tar.gz 19619 BLAKE2B 4317ba3e3ae05603f5e2e53561ea7bf2c2d291ac7c87eb2d4afeaca89ccb13b63dd4a85c9a9e4d5feb3bc6773d27618d2057983b933b3b17e26c319003b3bb7c SHA512 c40aac3453e822c5659252a271071b1e3b61622ce3af78e27763c771147a22a9894ef2512ca38f1d0e67be1d21ce5b860641a2a067e94837cfdcb318610720eb
diff --git a/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild b/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild
new file mode 100644
index 000000000000..8523f79facae
--- /dev/null
+++ b/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Separate project for HTML cleaning functionalities copied from lxml.html.clean"
+HOMEPAGE="
+	https://github.com/fedora-python/lxml_html_clean/
+	https://pypi.org/project/lxml-html-clean/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/lxml-5.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest
+	"${EPYTHON}" -m doctest -v tests/*.txt ||
+		die "Doctests failed on ${EPYTHON}"
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 8e6b184f8dd6..a9206fd64600 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1 +1,2 @@
 DIST lxml-5.2.2.gh.tar.gz 950650 BLAKE2B d9e3bd96f386a808eca58ffa9a6b5a79e43102b7161fac9b97905de2bd22d21feaddb093e27463f597ef5378d754011c2999a38953e6288595b8dd171976688b SHA512 20b87a2d6e7ac82b6979d6fd18ecd5c224fec6eeee6b69d47a5bf2947ce53e6a517d1b86ab68836a5974f78ce86551ddc2317c1a7255932b418b98dc64d59376
+DIST lxml-5.3.0.gh.tar.gz 951199 BLAKE2B 8317179c524856593b323f665c288ddddd8af7e716e1ddf1222a857c8466cfc62a6c20b21744ca418f809a3c8492216c5c9c38cfa62f2e7d51daea7343b6810b SHA512 514477bf4c865541233d73f20de816b51d265dbd75c56a0d13779e14527c73e85ca890718d06c08728da228d410459016e9cb8abdad4d03b44a81a04a198fb54
diff --git a/dev-python/lxml/files/lxml-5.3.0-pypy.patch b/dev-python/lxml/files/lxml-5.3.0-pypy.patch
new file mode 100644
index 000000000000..c83c73c81934
--- /dev/null
+++ b/dev-python/lxml/files/lxml-5.3.0-pypy.patch
@@ -0,0 +1,177 @@
+From b6ba59657c8c7e169e8eeb763d85ca6136df3eea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 29 Mar 2024 16:22:00 +0100
+Subject: [PATCH] skip tests that are broken on pypy
+
+---
+ src/lxml/tests/test_http_io.py   |  3 ++-
+ src/lxml/tests/test_nsclasses.py |  3 ++-
+ src/lxml/tests/test_objectify.py | 37 ++++++++++++++++++++++++++++++--
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
+index 8385e393..0b259299 100644
+--- a/src/lxml/tests/test_http_io.py
++++ b/src/lxml/tests/test_http_io.py
+@@ -10,3 +10,3 @@ import gzip
+ 
+-from .common_imports import etree, HelperTestCase, BytesIO, _bytes
++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY
+ from .dummy_http_server import webserver, HTTPRequestCollector
+@@ -14,2 +14,3 @@ from .dummy_http_server import webserver, HTTPRequestCollector
+ 
++@unittest.skipIf(IS_PYPY, "broken on pypy")
+ class HttpIOTestCase(HelperTestCase):
+diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
+index 0c33f20c..08540001 100644
+--- a/src/lxml/tests/test_nsclasses.py
++++ b/src/lxml/tests/test_nsclasses.py
+@@ -8,3 +8,3 @@ import unittest
+ 
+-from .common_imports import etree, HelperTestCase, _bytes, make_doctest
++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY
+ 
+@@ -45,2 +45,3 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_ns_classes(self):
+diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
+index 39fe0098..92c857f8 100644
+--- a/src/lxml/tests/test_objectify.py
++++ b/src/lxml/tests/test_objectify.py
+@@ -10,3 +10,4 @@ import unittest
+ from .common_imports import (
+-    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO
++    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO,
++    IS_PYPY
+ )
+@@ -383,2 +384,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_setattr(self):
+@@ -818,2 +820,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_build_tree(self):
+@@ -847,2 +850,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool(self):
+@@ -884,2 +888,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str(self):
+@@ -891,2 +896,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_intliteral(self):
+@@ -898,2 +904,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_floatliteral(self):
+@@ -905,2 +912,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_mul(self):
+@@ -917,2 +925,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_add(self):
+@@ -992,2 +1001,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr(self):
+@@ -999,2 +1009,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_intliteral(self):
+@@ -1006,2 +1017,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_floatliteral(self):
+@@ -1013,2 +1025,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_mul(self):
+@@ -1025,2 +1038,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_add(self):
+@@ -1050,2 +1064,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int(self):
+@@ -1066,2 +1081,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float(self):
+@@ -1082,2 +1098,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision(self):
+@@ -1101,2 +1118,3 @@ class ObjectifyTestCase(HelperTestCase):
+   
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision_consistency(self):
+@@ -1187,2 +1205,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_unregistered(self):
+@@ -1349,2 +1368,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_cmp(self):
+@@ -1376,2 +1396,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int_cmp(self):
+@@ -1398,2 +1419,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool_cmp(self):
+@@ -2067,2 +2089,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_registered_type_stringify(self):
+@@ -2537,2 +2560,3 @@ class ObjectifyTestCase(HelperTestCase):
+     # type-looked-up as ObjectifiedElement (no annotations)
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_int(self):
+@@ -2542,2 +2566,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_float(self):
+@@ -2547,2 +2572,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_str(self):
+@@ -2552,2 +2578,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_unicode(self):
+@@ -2557,2 +2584,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_bool(self):
+@@ -2562,2 +2590,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_none(self):
+@@ -2567,2 +2596,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_value_concatenation(self):
+@@ -2577,2 +2607,3 @@ class ObjectifyTestCase(HelperTestCase):
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_nested(self):
+@@ -2745,3 +2776,5 @@ def test_suite():
+     suite.addTests(doctest.DocTestSuite(objectify))
+-    suite.addTests([make_doctest('objectify.txt')])
++    if not IS_PYPY:
++        suite.addTests([make_doctest('objectify.txt')])
++        suite.addTests([make_doctest('../../../doc/objectify.txt')])
+     return suite
+-- 
+2.46.0
+
diff --git a/dev-python/lxml/lxml-5.3.0.ebuild b/dev-python/lxml/lxml-5.3.0.ebuild
new file mode 100644
index 000000000000..324b1faf7bfd
--- /dev/null
+++ b/dev-python/lxml/lxml-5.3.0.ebuild
@@ -0,0 +1,119 @@
+# 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 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="
+	https://lxml.de/
+	https://pypi.org/project/lxml/
+	https://github.com/lxml/lxml/
+"
+SRC_URI="
+	https://github.com/lxml/lxml/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+DEPEND="
+	>=dev-libs/libxml2-2.10.3
+	>=dev-libs/libxslt-1.1.38
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-python/cssselect[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.3.0-pypy.patch"
+)
+
+python_check_deps() {
+	use doc || return 0
+	python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local DISTUTILS_ARGS=(
+		# by default it adds -w to CFLAGS
+		--warnings
+	)
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	cp -al "${BUILD_DIR}"/{install,test} || die
+	cp -al src/lxml/tests "${dir}/" || die
+	cp -al src/lxml/html/tests "${dir}/html/" || die
+	mkdir "${dir}"/../../doc || die
+	# this one needs to be copied, because upstream uses doc/../../../doc
+	cp -r "${S}"/doc "${dir}"/../../ || die
+	ln -s "${S}"/doc "${dir}"/../../../../ || die
+
+	"${EPYTHON}" test.py --no-src -vv --all-levels -p ||
+		die "Tests fail on ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+	optfeature "Support for lxml.html.clean sanitizer" dev-python/lxml-html-clean
+}
diff --git a/dev-python/m2crypto/m2crypto-0.42.0.ebuild b/dev-python/m2crypto/m2crypto-0.42.0.ebuild
index b7a299e25b71..9769cd6de708 100644
--- a/dev-python/m2crypto/m2crypto-0.42.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.42.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 # openssl via src/SWIG/_lib11_compat.i
 LICENSE="MIT openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="abi_mips_n32 abi_mips_n64 abi_mips_o32"
 
 DEPEND="
diff --git a/dev-python/mapbox-earcut/Manifest b/dev-python/mapbox-earcut/Manifest
index ff69070fef8a..c7575c52fe81 100644
--- a/dev-python/mapbox-earcut/Manifest
+++ b/dev-python/mapbox-earcut/Manifest
@@ -1,2 +1 @@
-DIST mapbox_earcut_python-1.0.1.gh.tar.gz 11794 BLAKE2B c54c2333ac08f551737ff6ba0e5179464c0330fefeb11e5cff9ad6d3927e8a5d5323cbceffd271a25103e75da44f2a4efa17b8c338f888f69f71ee7bc1e21682 SHA512 cdb32585cbaf74c15e59af0ae70d983dd2f9bc9cfe1b59b3eadc4d442f7d962241854b589a035deae67cacd9334833b911d0981f0d417fe587348fc7d24f0c0a
 DIST mapbox_earcut_python-1.0.2.gh.tar.gz 12488 BLAKE2B c5a3f30f5044380979aa579caef3d1bbe55c650bb04740979723561985d7cddb7e10b85b214363b701a5d0ac0135cc646186d35da9f1b1cac2bcd67374121745 SHA512 5d5a4ceebc2cd7cd6492253445ac1f0cb5d0435d58fd0b08c4d4ba7e33643bdfd4d7db5171eac3ae4ece678957cee61c4c09fd4af0ab8fa500681493bfa36894
diff --git a/dev-python/mapbox-earcut/mapbox-earcut-1.0.1-r1.ebuild b/dev-python/mapbox-earcut/mapbox-earcut-1.0.1-r1.ebuild
deleted file mode 100644
index abcd6023943f..000000000000
--- a/dev-python/mapbox-earcut/mapbox-earcut-1.0.1-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
-
-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[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild b/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild
index 31c30e838c06..588c246f5c74 100644
--- a/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild
+++ b/dev-python/mapbox-earcut/mapbox-earcut-1.0.2.ebuild
@@ -20,7 +20,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/markdown/Manifest b/dev-python/markdown/Manifest
index c16c88f81b68..a449cee89ba7 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,2 +1 @@
-DIST Markdown-3.6.tar.gz 354715 BLAKE2B bd8cb489fb20c0d8416361c435113a6057ced5f4baceba8665e1afc70efcbd6a52153785a436c94ff9d68571d668b7898c6717851b10814d89e46e2b9daba3e7 SHA512 a523f75ea72fa71f4f0f1a59523bb1a6c5c7605ba5a0be4dc37aa5bd5c87e32563f5253404485c99c13caa27501c9003aea524154a7999a22e6497829492b997
 DIST markdown-3.7.tar.gz 357086 BLAKE2B 6b022c247d499939d1c8daffd947b788645ccbe25ad861b60dd5906bc762b1ab50f09d48edc829bc7ed6f2598398e6bce3a7cd177ca899159744ea4c54b8bb2e SHA512 9152ae942dfe5c93f29d4f083d7b04fa86f042a816b7a1360f6088cd5ea0fc730e14915a8fc48f6d36f74bc311ddc35dbfe1f78ef85779f285aa35a1e56caae1
diff --git a/dev-python/markdown/markdown-3.6.ebuild b/dev-python/markdown/markdown-3.6.ebuild
deleted file mode 100644
index a3c2cd9bfff5..000000000000
--- a/dev-python/markdown/markdown-3.6.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
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.7.ebuild b/dev-python/markdown/markdown-3.7.ebuild
index 44f392be6135..2b453576bdee 100644
--- a/dev-python/markdown/markdown-3.7.ebuild
+++ b/dev-python/markdown/markdown-3.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 9e56b67589b9..d9207dba98be 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,2 +1,2 @@
-DIST marshmallow-3.21.2.gh.tar.gz 183818 BLAKE2B 01e14514d836c36c9f24a6e0a527271bd17ea5ce1ce35cabb6200a886c85ef970e7d54191307d1580568f05b501ec6028c7f126475ac64c160fec75c247a4c20 SHA512 b151f7e712dc5dd5d7f592942a6a4b09d462b684f542406c8bc57237e4b2402eb287d02e4ca2ef65e10dccb1e200b9ff8ae24f69160af1c6aa02fc5dfdc9eeba
 DIST marshmallow-3.21.3.gh.tar.gz 183813 BLAKE2B c5b0165be783e87149c1f1b7f0e370c0c0b33cd5e34b0a91b1510b81e840ca1f87c34b13f00e0c22b5a34d8fec62bba4a66f889a450a4f03fda7a85a63bf71bf SHA512 522d015d4207b1258ef92901f106f94bd412e011c26ad074ca9ee3156e51a1d873063f0ebd24b613cd95f34397f29e79358bb420ee0eef51095e6e8858d61fca
+DIST marshmallow-3.22.0.gh.tar.gz 184804 BLAKE2B b877ad2b2bc1ad0c54c2a8fa9dd9eba393455dd8ce68fce574ffd11ec1e1cc0935c8296ddff9b53fb4f9e7618a8f4c2a13716e1c4a7c8bb1b1f17aa967d29009 SHA512 a4359eb2490e2bb8be6d0e31e1d8eabd2ebc19fa91d024335d2483dca77bb79848d4be13f1775fdabf97c6156a981260693234be45dd1ccd3567e9c79b981deb
diff --git a/dev-python/marshmallow/marshmallow-3.21.2.ebuild b/dev-python/marshmallow/marshmallow-3.22.0.ebuild
index f7d269422f0f..f7d269422f0f 100644
--- a/dev-python/marshmallow/marshmallow-3.21.2.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.22.0.ebuild
diff --git a/dev-python/matplotlib/matplotlib-3.9.2.ebuild b/dev-python/matplotlib/matplotlib-3.9.2.ebuild
index 57aa2cc322bf..8eb1d9c5ee79 100644
--- a/dev-python/matplotlib/matplotlib-3.9.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.9.2.ebuild
@@ -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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
 
 DEPEND="
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index b52e68f41f37..1918606106e5 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1 +1,2 @@
 DIST mdit-py-plugins-0.4.1.gh.tar.gz 63342 BLAKE2B 3db6312e4d36cd7e870a707cbd2b99a4c954e40da2c34711a4b1f1fbd4086231f8e6013c99abdf3dc294acdfdc2706f2353151d2766223e141a0c6aa90e27996 SHA512 d2f5c59bf2a17ce441de18f815624cb6f61202f111176c5f1c7745e430d59e8690ce8a5f9da2402bd34dcc5cf4dc38377990df649fbf3256216bc82cdfc6333a
+DIST mdit-py-plugins-0.4.2.gh.tar.gz 64576 BLAKE2B 30b2594db09c15362c7800a3cf2219d2f1ab1d43678f7fe6a33c699027bea446657708e2ec08a0dc03fe6b644f8a5ac4c02c63cca2738488eff8027faf976f0c SHA512 203a0243968eb9240436c992b70ad0a4b13a747af9ec1799408975cf430d908e8c161cc6810385e21e09eb2d50aeae73f0aed11790898e5d6291b0d4c20521cd
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.2.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.2.ebuild
new file mode 100644
index 000000000000..e02bf33f47e6
--- /dev/null
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of plugins for markdown-it-py"
+HOMEPAGE="
+	https://pypi.org/project/mdit-py-plugins/
+	https://github.com/executablebooks/mdit-py-plugins/
+"
+SRC_URI="
+	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/markdown-it-py-4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/memory-allocator/memory-allocator-0.1.4.ebuild b/dev-python/memory-allocator/memory-allocator-0.1.4.ebuild
index 35542831649a..64b6ebbfe4b2 100644
--- a/dev-python/memory-allocator/memory-allocator-0.1.4.ebuild
+++ b/dev-python/memory-allocator/memory-allocator-0.1.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-autorefs/Manifest b/dev-python/mkdocs-autorefs/Manifest
index 2be334e063bb..88599132298b 100644
--- a/dev-python/mkdocs-autorefs/Manifest
+++ b/dev-python/mkdocs-autorefs/Manifest
@@ -1 +1,3 @@
 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
diff --git a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild
new file mode 100644
index 000000000000..97383ef46311
--- /dev/null
+++ b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# 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.2.0.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.2.0.ebuild
new file mode 100644
index 000000000000..97383ef46311
--- /dev/null
+++ b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# 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-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index d979150ad392..84805724f386 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1 +1,2 @@
-DIST mkdocs-git-revision-date-localized-plugin-1.2.6.gh.tar.gz 377371 BLAKE2B a24dc76fcaa8e38f20ed751cb3976ef3b1a6898c1b4c52631e1b2f87119ee6ca448413d7e45bb312a64075534973b4b9c649a770cec1281f5cbe9783c112c7f2 SHA512 a230f3e3e6aba437f42eda16e577d6f6dd13ac693e801d4e77c2261f8ed6efba3317803f566581d2cb2f847bbc5d23750f5bc932bd881f892b34484d6448e661
+DIST mkdocs-git-revision-date-localized-plugin-1.2.7.gh.tar.gz 377565 BLAKE2B 5af96b8775d605329a4156ed72d7ba4987e109e93035a12ca90ac74723d46529312113dad5a19084648e84bfde8f392f6617db95d0f1842e009d780e0e27fa1f SHA512 70f459fdbae7a8e5dc7649bec91c397059aabb4ff2da440be8a040b5c058052db27025a851344cf2853450041c0f18a2ec23e705f6d75bc2870c134a8952f756
+DIST mkdocs-git-revision-date-localized-plugin-1.2.8.gh.tar.gz 377738 BLAKE2B 32a6d3d0f084ddf411a33572743cc04ca57d9dde6a690dbf6cd7a6d1773e839f1422334fa4a54eb6d3bd17645492e4525efe6cd2ed281600e0ed57e44161d691 SHA512 0c5451ba169025eab6ed85beb6ca9af337dd1476c93c3f4009900dd7678caf98f85801e43edac84fc48b0e5ae7186fcee2f49dd3c51d34a29cc88260f933d93e
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.6.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.7.ebuild
index 9eb735876697..9eb735876697 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.6.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.7.ebuild
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.8.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.8.ebuild
new file mode 100644
index 000000000000..f8706543cd4a
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{10..13} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/regex
+	dev-python/mkdocs-static-i18n
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+	dev-python/mkdocs-git-revision-date-localized-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="
+	https://github.com/timvink/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocs-static-i18n[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "larry@gentoo.org" || die
+		git config --global user.name "Larry the Cow" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index bda81ba22b9c..9f76e7a05aad 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1 +1,2 @@
-DIST mkdocs-material-9.5.31.gh.tar.gz 14926142 BLAKE2B ae47e54eaaea55885d5161c1e3435a2feb96f8495487ddb13c9bbb57c8ceb8d961c30d66a4ec51cf4212892724395b64d46d47c3e9547b8256d0fb17b4d1843a SHA512 ee74d6ab05d16fad3545c39efaed196242a68479a6a8286dcd96c1a61ec2d1fbd2a2678b7a3edea50bf8784d3c986060ce5abe5490f53a1d584c0954733134c2
+DIST mkdocs-material-9.5.33.gh.tar.gz 14905512 BLAKE2B 474852be4b975a72a2429ab1b072eadea9b3e6549f0132e307da03aed657924d928391205b6953e445590bf53a79b8c405116b93eed099a9a9a174f9b66f5d3a SHA512 2a414c0e5c3160224ec445d7ed6b366ea18667a31110be1b310b5487abdf1b3d3a4b6f44b3d2ccae401f9d850a847a85ae3e3ef2a41ebe5f62f5c5a955a9713a
+DIST mkdocs-material-9.5.34.gh.tar.gz 14766308 BLAKE2B 62371c082fe6d1d42d01cc315f2e0e5a0de24ee3faff173d940b797ca7f43f20985e4025e90ba385dbf38ef7ff2b76bbae0831558d07dcafd5a5493597e223ed SHA512 ac6e2fcf96a0591513222a81046d66547cdf3a9b64acf29e7482aa93be3d7a2ceeb8ad779e9bcbd12ae9fc527414ae11cd70f07ae85b4c2b0104cade29ebe646
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.31.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.33.ebuild
index d79902da91b8..d79902da91b8 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.31.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.33.ebuild
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild
new file mode 100644
index 000000000000..0aabdac3ae43
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild
@@ -0,0 +1,67 @@
+# 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/jinja-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/Manifest b/dev-python/mkdocs/Manifest
index 85bbbffbd546..57858cb1b568 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-1.6.0.gh.tar.gz 4494411 BLAKE2B 2a0d55c54509827fcff39c04812be6cff6b1ccbf823cc05a48fa154745a49aed08d811147fc5f64db138ede952dc89241b156f8e0e01e42a468f73309eece0fb SHA512 330dfb7cd390b320ca9c2bfd2dc248d877b95713ec3c1d2c9d5b28be52a42276c58412bc77527a492e4b1b31608e3093dbad2a983bfe6396577ec7464e274609
+DIST mkdocs-1.6.1.gh.tar.gz 4495216 BLAKE2B f04b038482a4d1469dcff2db263135764d7c4d6e34e01675899fc0763da698027116ca738fc0d3ffbf71bbb7ba7a3d48dd41bdcb0d62a69546a30abccfcca490 SHA512 e37bcefc87fecba9329001a45f712c205b7a2fba8584a40fbe44409c06547602c104551481d42503358bbb22ba85d4371c0f1934d4d01fc9ff1ec2559222eac6
diff --git a/dev-python/mkdocs/mkdocs-1.6.1.ebuild b/dev-python/mkdocs/mkdocs-1.6.1.ebuild
new file mode 100644
index 000000000000..46c0d5058326
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.6.1.ebuild
@@ -0,0 +1,86 @@
+# 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
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="
+	https://www.mkdocs.org/
+	https://github.com/mkdocs/mkdocs/
+	https://pypi.org/project/mkdocs/
+"
+SRC_URI="
+	https://github.com/mkdocs/mkdocs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+
+# https://bugs.gentoo.org/873349
+# Building documentation requires packaging: callouts and mkdocs-autorefs
+#
+# IUSE="doc"
+#
+# BDEPEND="
+# 	doc? (
+# 		$(python_gen_any_dep '
+# 			dev-python/mdx-gh-links[${PYTHON_USEDEP}]
+# 			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+# 		')
+# 	)
+# "
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.3.6[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-env-tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-get-deps-0.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Tests fails if additional themes are installed
+	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes
+	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_error
+	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_warning
+
+	# Does not work in emerge env
+	mkdocs/tests/config/config_options_tests.py::ListOfPathsTest::test_paths_localized_to_config
+
+	# TODO
+	mkdocs/tests/build_tests.py::testing_server
+	mkdocs/tests/livereload_tests.py::testing_server
+)
+
+python_compile_all() {
+	default
+# 	if use doc; then
+# 		# cannot just do mkdocs build, because that fails if
+# 		# the package isn't already installed
+# 		python -m mkdocs build || die "Failed to make docs"
+# 		# Colliding files found by ecompress:
+# 		rm site/sitemap.xml.gz || die
+# 		HTML_DOCS=( "site/." )
+# 	fi
+}
+
+python_test() {
+	epytest '-opython_files=*tests.py' mkdocs/tests
+}
diff --git a/dev-python/mkdocstrings-python/Manifest b/dev-python/mkdocstrings-python/Manifest
index a6d07345b488..96bdeb0424c4 100644
--- a/dev-python/mkdocstrings-python/Manifest
+++ b/dev-python/mkdocstrings-python/Manifest
@@ -1,3 +1,3 @@
-DIST mkdocstrings-python-1.10.5.gh.tar.gz 157091 BLAKE2B 1f0685fc8b04ea4e5f33e3e4ca9637d590bd45b5be85d856ea0f6693d3be2a7d215751b68f811ca73afec078ffa5cc1acf88ab1907bd9842c6e390eb14fd71c0 SHA512 0bc3b103a99add6d38621243d2a21339efd837fb3476feb13bc55afabcee481d45ea7b410f8d16312583f308ee9f36f387762cdd1ef1e9758ecdb5b1be9dcb9e
-DIST mkdocstrings_python-1.10.7.tar.gz 161638 BLAKE2B f62bd6b8f04223ba3ae479b04928888770cad02f5a060fcd39e5f20ddf80d88ff267f9826644cf80704a10f2f98320d1a5784c5bada43e845c07ab9c8a2d0d05 SHA512 1df467957e138f7fa474c2799b1cf254994b11b75217d90ff9c8a1f2d4c72817ecab80724c9da84721dbbde52c7074833534cde0ce8f50de6aae09b6edb25e03
 DIST mkdocstrings_python-1.10.8.tar.gz 161724 BLAKE2B 1720bd166c8b924f3d024ffbdaa46383a68ddbb4db1aff6d588049272f8e34046ac7ae62a6d9739dca029794e42afa0415179c978874b6012ace4842978184de SHA512 da179fc31af4bc6dba62b050c26736b313859dac6b8c29c877126081d6bb228255be626af09a61ae2a5b449dd0a1a19d41b1313dc9d1fd10e001e16a423c485c
+DIST mkdocstrings_python-1.10.9.tar.gz 162070 BLAKE2B a939f662ae33eba397260589f634ea6a2acaeecb1acd0711eefc65cbce09e5fbfc03aab19c6daa960d853a4387f09699a6fd32bf73f39d6d8c95732cb6d3cad9 SHA512 4f6729506208409ed9936e663dc1514457dbb0977408949d2f4121440e33084b7f152c21138f99332b18825425432f85cf2300e9b14dd6d9e36a9f50e52abd7a
+DIST mkdocstrings_python-1.11.1.tar.gz 166890 BLAKE2B 47241f180421e3b535a58801363907d85eb9550593b849f7210a4584e5b1fafbf261feec2a3d9f5f88b0d25d5f6ae8a824c561718a2729a9cd2ada72a31f9fa8 SHA512 224210247e277b626916cebba816e2cf78ce1af8338c5bae783aa3550352e121dfe8a27ccb61258ee3723c46c6e36e74bd129ed5ae2297ff7bb451c27f9faef7
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild
deleted file mode 100644
index 6be494880e25..000000000000
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python handler for dev-python/mkdocstrings"
-HOMEPAGE="
-	https://mkdocstrings.github.io/python/
-	https://github.com/mkdocstrings/python/
-	https://pypi.org/project/mkdocstrings-python/
-"
-# Tests need files absent from the PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/griffe-0.47[${PYTHON_USEDEP}]
-	>=dev-python/mkdocstrings-0.25.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.7.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.7.ebuild
deleted file mode 100644
index c226feabda3a..000000000000
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.7.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_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python handler for dev-python/mkdocstrings"
-HOMEPAGE="
-	https://mkdocstrings.github.io/python/
-	https://github.com/mkdocstrings/python/
-	https://pypi.org/project/mkdocstrings-python/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=dev-python/griffe-0.48[${PYTHON_USEDEP}]
-	>=dev-python/mkdocstrings-0.25.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.9.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.9.ebuild
new file mode 100644
index 000000000000..b5288389ebcb
--- /dev/null
+++ b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.9.ebuild
@@ -0,0 +1,35 @@
+# 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 pypi
+
+DESCRIPTION="Python handler for dev-python/mkdocstrings"
+HOMEPAGE="
+	https://mkdocstrings.github.io/python/
+	https://github.com/mkdocstrings/python/
+	https://pypi.org/project/mkdocstrings-python/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/griffe-0.49[${PYTHON_USEDEP}]
+	>=dev-python/mkdocstrings-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-autorefs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.11.1.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.11.1.ebuild
new file mode 100644
index 000000000000..840fb3d9e876
--- /dev/null
+++ b/dev-python/mkdocstrings-python/mkdocstrings-python-1.11.1.ebuild
@@ -0,0 +1,35 @@
+# 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 pypi
+
+DESCRIPTION="Python handler for dev-python/mkdocstrings"
+HOMEPAGE="
+	https://mkdocstrings.github.io/python/
+	https://github.com/mkdocstrings/python/
+	https://pypi.org/project/mkdocstrings-python/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/griffe-0.49[${PYTHON_USEDEP}]
+	>=dev-python/mkdocstrings-0.26.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-autorefs-1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings/Manifest b/dev-python/mkdocstrings/Manifest
index ab24442c604f..2a87a85487d3 100644
--- a/dev-python/mkdocstrings/Manifest
+++ b/dev-python/mkdocstrings/Manifest
@@ -1,2 +1,2 @@
-DIST mkdocstrings-0.25.1.gh.tar.gz 89869 BLAKE2B 248436eeabafbb7cbee27362b43d2feadeadda7692b5843621bd97261e17a93783c38f37850700c6e79b7f23f15fdc8f21567329afba9b4fb0618f277acc1865 SHA512 155dc5d15fd71f9c5dbd5d5f70f380ad5197fc0c1dc0fe722205b30decbd19307daa631d3a4a40206cdf36981f414ea1a4c001d8cef517ffed569e96ea0e8302
-DIST mkdocstrings-0.25.2.tar.gz 91796 BLAKE2B d666d402fc94f00df107f54ae6057fbdaba2a2da20c283fe5f1bfb33cf4cca4dc882e9132156434439560848dfea224916c96450a759924175fe6244e75dac43 SHA512 ad1d771ffbbb04bfa9b8a4190c41303fe6d78f9bb07fe3236ccb284836886d759a9031c42192e2608fc3941a0a59c149c241d193cbc2fe96462605b4f37b2545
+DIST mkdocstrings-0.26.0.tar.gz 92218 BLAKE2B 6eee2a080b568ccb90d8ac122da9bb9c1d35088e4f3d43f98da287e581f549f25b6da9dd7f0fbe9dffcaeea8acc1143cd77b4e2fb5d208d592242954724f98e3 SHA512 b1e63fae1e22f0fd1977e7274b94bf3f50ab673d6e3c77d291095bf3503fff8afde08d29917fdbddd00ac716ac048248362dbc526446924592b57f2ea339caf8
+DIST mkdocstrings-0.26.1.tar.gz 92677 BLAKE2B 010464f8af2b741fb74cae7140c8552ee05e84a275952701bc29f8f4d057fd4f82a6129da070cb1ae41f0a1e407b8cce6dda4a924650bb83f41c9bf5caf208e4 SHA512 75c1b794dc816523b1c0202304146a986e87403f65e1ed728ed585eb6d78f9ae5fe1ab97798fa8d9ad24f41ec590ad3bb31dec2d420f6312da126b55540301da
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.25.1.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.25.1.ebuild
deleted file mode 100644
index aca612affa27..000000000000
--- a/dev-python/mkdocstrings/mkdocstrings-0.25.1.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
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatic documentation from sources, for MkDocs"
-HOMEPAGE="
-	https://mkdocstrings.github.io/
-	https://github.com/mkdocstrings/mkdocstrings/
-	https://pypi.org/project/mkdocstrings/
-"
-# Tests require files absent from PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/mkdocstrings/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-1.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-autorefs-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-6.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/markdown-exec[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocstrings-python[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-# mkdocstrings documentation generation requires several currently
-# unpackaged mkdocs extensions and plug-ins, and this test
-# makes use of mkdocs configuration
-EPYTEST_DESELECT=(
-	tests/test_plugin.py::test_disabling_plugin
-	# WTF, it tries to unlink installed files from installed package?!
-	tests/test_handlers.py::test_extended_templates
-	# Needs unpackaged mkdocs-callouts, mkdocs-literate-nav, and possibly more
-	tests/test_inventory.py::test_sphinx_load_mkdocstrings_inventory_file
-	# Internet
-	tests/test_inventory.py::test_load_inventory
-)
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.25.2.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.25.2.ebuild
deleted file mode 100644
index 4100955b993d..000000000000
--- a/dev-python/mkdocstrings/mkdocstrings-0.25.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_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatic documentation from sources, for MkDocs"
-HOMEPAGE="
-	https://mkdocstrings.github.io/
-	https://github.com/mkdocstrings/mkdocstrings/
-	https://pypi.org/project/mkdocstrings/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-1.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-autorefs-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-6.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/markdown-exec[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocstrings-python[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-# mkdocstrings documentation generation requires several currently
-# unpackaged mkdocs extensions and plug-ins, and this test
-# makes use of mkdocs configuration
-EPYTEST_DESELECT=(
-	tests/test_plugin.py::test_disabling_plugin
-	# WTF, it tries to unlink installed files from installed package?!
-	tests/test_handlers.py::test_extended_templates
-	# Needs unpackaged mkdocs-callouts, mkdocs-literate-nav, and possibly more
-	tests/test_inventory.py::test_sphinx_load_mkdocstrings_inventory_file
-	# Internet
-	tests/test_inventory.py::test_load_inventory
-)
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.26.0.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.26.0.ebuild
new file mode 100644
index 000000000000..0738246d3fd9
--- /dev/null
+++ b/dev-python/mkdocstrings/mkdocstrings-0.26.0.ebuild
@@ -0,0 +1,56 @@
+# 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 pypi
+
+DESCRIPTION="Automatic documentation from sources, for MkDocs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/
+	https://github.com/mkdocstrings/mkdocstrings/
+	https://pypi.org/project/mkdocstrings/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-1.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-autorefs-1.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-6.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/markdown-exec[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocstrings-python[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+# mkdocstrings documentation generation requires several currently
+# unpackaged mkdocs extensions and plug-ins, and this test
+# makes use of mkdocs configuration
+EPYTEST_DESELECT=(
+	tests/test_plugin.py::test_disabling_plugin
+	# WTF, it tries to unlink installed files from installed package?!
+	tests/test_handlers.py::test_extended_templates
+	# Needs unpackaged mkdocs-callouts, mkdocs-literate-nav, and possibly more
+	tests/test_inventory.py::test_sphinx_load_mkdocstrings_inventory_file
+	# Internet
+	tests/test_inventory.py::test_load_inventory
+)
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.26.1.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.26.1.ebuild
new file mode 100644
index 000000000000..0738246d3fd9
--- /dev/null
+++ b/dev-python/mkdocstrings/mkdocstrings-0.26.1.ebuild
@@ -0,0 +1,56 @@
+# 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 pypi
+
+DESCRIPTION="Automatic documentation from sources, for MkDocs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/
+	https://github.com/mkdocstrings/mkdocstrings/
+	https://pypi.org/project/mkdocstrings/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-1.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-autorefs-1.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-6.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/markdown-exec[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocstrings-python[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+# mkdocstrings documentation generation requires several currently
+# unpackaged mkdocs extensions and plug-ins, and this test
+# makes use of mkdocs configuration
+EPYTEST_DESELECT=(
+	tests/test_plugin.py::test_disabling_plugin
+	# WTF, it tries to unlink installed files from installed package?!
+	tests/test_handlers.py::test_extended_templates
+	# Needs unpackaged mkdocs-callouts, mkdocs-literate-nav, and possibly more
+	tests/test_inventory.py::test_sphinx_load_mkdocstrings_inventory_file
+	# Internet
+	tests/test_inventory.py::test_load_inventory
+)
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index f6fa4c97d9c7..5da9f7940bb9 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1,2 @@
-DIST more-itertools-10.3.0.tar.gz 118147 BLAKE2B 7205050f4cb3e705e3ad7f477baba0e3976b7b48fae44622014efb56fbae85efc1abfee5f6c3075326b53ffbae2bf1e626a524d2cb9241e033a75525e8b747d4 SHA512 fed7c1b085aafd5c50bbc5304f29a098d4ba96e4b253c2e5ab7fd995e895f5cdf63edada93f039b1a71e0f913c0902d8836f73de270bd1048a5fd8ed4f3d45a4
 DIST more-itertools-10.4.0.tar.gz 120755 BLAKE2B 26950158c03c3d05cf5e6983941bf087e7799c90aff2928b20cfa9efc80a890f85a9616e95e363c4151d2233fa49b0dfaa381ab6e27d188573162887226ccdff SHA512 03f1a2390cac259138c96b4bd53712f14b8ee09dc83fe32f237835e7cac59ed22d48f6bc97d1734e06fb0fb44511abf72bf5d30b72e757ab2c62ee0b0f02ffb1
+DIST more-itertools-10.5.0.tar.gz 121020 BLAKE2B 16ab278873f4d7de97f61a2e865ff8561baa0aacd743c7483138c3dc7c8a219609ae80a0ff30bfc22f7064bfed45d764f17e35c2780ac6caf3a24231ab544e9b SHA512 fdb56b6bce26b335da61ae3a4bd0154a78389786132f62eaea53f0e8ee603c5609e35c69baccaac57935e81f839409b70f94cb8bbab9d541b0964a2c929c8168
diff --git a/dev-python/more-itertools/more-itertools-10.3.0.ebuild b/dev-python/more-itertools/more-itertools-10.3.0.ebuild
deleted file mode 100644
index 36b8551dc13b..000000000000
--- a/dev-python/more-itertools/more-itertools-10.3.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=flit
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} 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 ~ia64 ~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/more-itertools/more-itertools-10.4.0.ebuild b/dev-python/more-itertools/more-itertools-10.4.0.ebuild
index 2190b92689f0..36b8551dc13b 100644
--- a/dev-python/more-itertools/more-itertools-10.4.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-10.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/more-itertools/more-itertools-10.5.0.ebuild b/dev-python/more-itertools/more-itertools-10.5.0.ebuild
new file mode 100644
index 000000000000..2190b92689f0
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-10.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 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} 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 ~ia64 ~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 dd035c410109..42fe35fc016a 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.11.tar.gz 5295376 BLAKE2B c2077e020918940ee3642b7b0a8c467df48122e3ef8317a9c13b038fa01fe724efb0ebb44c8bb095fa9071dfb0dde85d8be6fef99929add2ae532615c22803cf SHA512 6d4515918d9192b7f308f18a975e435712912a5d1a856b314d538cb4b7f4c3127407ddff2130ea28488a30d35f25ab0341d4c7d752fef22692de302b5dda71cd
 DIST moto-5.0.12.tar.gz 5345173 BLAKE2B 89bc77ab9409b6ccacbab350c77d3074c0adadf796b262d64e3a6ea11377b6e21f72a5223de6d34ab4d810fe6d80f3ed0beccc46a735d72bca344445b55300c0 SHA512 662843971f8c0c9169679097428d690a51ce70157738aadd6dca05cdf13643702a2ae0760865a4d6872b0e8585b06bc21369030b4b4ebbd285a1df8a765cd411
 DIST moto-5.0.13.tar.gz 5389183 BLAKE2B 9428f5857ccf9082a985c90281267cde65f15fc970cbc43e00d6a38663c6786d1d8cd5aede4f01a0bb69c65bfa156e7b12336f19e0e2ff9da44291a367583eb0 SHA512 5fd3fcf4404e61056170eb187c4f9acb42b4178ad56ee44a74fdf423c061aa7455fb1ce4f34e0517e7eadeb2ffb32ea9485c100772fd89d4c12bb8956b2797c0
+DIST moto-5.0.14.tar.gz 5436824 BLAKE2B 9bcab90605a73c9b03c09285a00055c552437545b6d524377cec816ac569e4a1e399d84ccdd54ac0c1ac00ae253f8849bb5c3892e8d95021d31fa5c05705b3ba SHA512 063fe3b518263f0dfb9d0dc569d537bcbaba4a439e4945806c641cd7b0bc32e7431972ae800d4d581b1ae200122f5d22870faf8ce025377c174360cad2896aa5
diff --git a/dev-python/moto/files/moto-5.0.13-date-fmt.patch b/dev-python/moto/files/moto-5.0.13-date-fmt.patch
new file mode 100644
index 000000000000..5f9750656e9e
--- /dev/null
+++ b/dev-python/moto/files/moto-5.0.13-date-fmt.patch
@@ -0,0 +1,48 @@
+From 3bbc65d23cb58904f8cc79676e4fb079d9f6f37b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 7 Sep 2024 20:20:42 +0200
+Subject: [PATCH] [transfer] Fix date_imported to use a correct ISO 8601 date
+
+Fix `date_imported` key to use a proper ISO 8601 format (with hyphens
+and colons) rather than concatenated numbers.  Botocore expects
+the former rather than the latter, and when given a bare number it
+incorrectly interprets it as UNIX timestamp rather than `%Y%m%d%H%M%S`
+date.
+
+This can particularly be seen on systems with 32-bit time_t, where
+the resulting timestamp overflows (it would correspond to year 643378
+today), and causes `tests/test_transfer/test_transfer.py` failures
+such as:
+
+```
+E       RuntimeError: Unable to calculate correct timezone offset for "20240907201715"
+```
+
+When using `%Y-%m-%d %H:%M:%S` format, the relevant tests pass both
+on systems with 64-bit and 32-bit time_t.
+---
+ moto/transfer/models.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/moto/transfer/models.py b/moto/transfer/models.py
+index ca9f5e69ec9..599a6f5e2ea 100644
+--- a/moto/transfer/models.py
++++ b/moto/transfer/models.py
+@@ -167,7 +167,7 @@ def create_user(
+             }
+             user.posix_profile = posix_profile
+         if ssh_public_key_body is not None:
+-            now = datetime.now().strftime("%Y%m%d%H%M%S")
++            now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+             ssh_public_keys = [
+                 {
+                     "date_imported": now,
+@@ -205,7 +205,7 @@ def import_ssh_public_key(
+             raise ServerNotFound(server_id=server_id)
+         for user in self.servers[server_id]._users:
+             if user.user_name == user_name:
+-                date_imported = datetime.now().strftime("%Y%m%d%H%M%S")
++                date_imported = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                 ssh_public_key_id = (
+                     f"{server_id}:{user_name}:public_key:{date_imported}"
+                 )
diff --git a/dev-python/moto/moto-5.0.11.ebuild b/dev-python/moto/moto-5.0.11.ebuild
deleted file mode 100644
index cd245fbbcae9..000000000000
--- a/dev-python/moto/moto-5.0.11.ebuild
+++ /dev/null
@@ -1,197 +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/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${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/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		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
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
-		tests/test_batch/test_batch_jobs.py::test_failed_job
-		tests/test_batch/test_batch_jobs.py::test_submit_job_array_size
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_terminate_nonexisting_job
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_core/test_docker.py::test_docker_is_running_and_available
-		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
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-		# TODO
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
-		# 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
-		No
-		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
-		No
-		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
-		# TODO
-		tests/test_dynamodb/test_dynamodb_import_table.py
-		# hangs
-		tests/test_core/test_account_id_resolution.py::TestAccountIdResolution::test_environment_variable_takes_precedence
-	)
-	local EPYTEST_IGNORE=(
-		# require joserfc
-		tests/test_cognitoidp/test_cognitoidp.py
-		# require antlr4 (which doesn't support py3.12)
-		tests/test_stepfunctions/parser
-	)
-
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		einfo "time_t is at least 64-bit long"
-	else
-		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
-
-	local serial_tests=(
-		# these tests set up credentials that are needed by the tests below
-		tests/test_core/test_importorder.py
-		# these tests apparently rely on some other test setting credentials
-		# up for them, so they need to be run separately, after the above
-		tests/test_awslambda_simple/test_lambda_simple.py::test_run_function{,_no_log}
-		tests/test_dynamodb/exceptions/test_dynamodb_exceptions.py
-		tests/test_dynamodb/exceptions/test_dynamodb_transactions.py::test_transaction_with_empty_key
-		tests/test_dynamodb/test_dynamodb.py::test_transact_write_items_failure__return_item
-		tests/test_dynamodb/test_dynamodb.py::test_transact_write_items_put_conditional_expressions
-		tests/test_dynamodb/test_dynamodb_update_expressions.py::test_update_different_map_elements_in_single_request
-		tests/test_events/test_events.py::test_start_replay_send_to_log_group
-		tests/test_lakeformation/test_resource_tags_integration.py
-		tests/test_redshiftdata
-		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
-		tests/test_s3/test_s3.py::test_delete_bucket_cors
-		tests/test_s3/test_s3.py::test_delete_objects_percent_encoded
-		tests/test_s3/test_s3.py::test_delete_versioned_bucket_returns_metadata
-		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args
-		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args__using_multipart
-		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
-		tests/test_s3/test_s3_list_object_versions.py
-		tests/test_s3/test_s3_tagging.py
-		tests/test_s3control/test_s3control_access_points.py::test_delete_access_point
-		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
-		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable
-	)
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT+=(
-		"${EPYTEST_DESELECT[@]}"
-		"${serial_tests[@]}"
-	)
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				tests/test_ses/test_ses_boto3.py::test_send_raw_email
-				tests/test_ses/test_ses_boto3.py::test_send_raw_email_validate_domain
-				tests/test_ses/test_ses_boto3.py::test_send_raw_email_without_source
-				tests/test_sesv2/test_sesv2.py::test_send_raw_email
-				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_specific_message
-				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_to_address_display_name
-			)
-			;;
-	esac
-
-	epytest -m 'not network'
-}
diff --git a/dev-python/moto/moto-5.0.12.ebuild b/dev-python/moto/moto-5.0.12.ebuild
index 2cef6b06581b..f2d7e4fa33f0 100644
--- a/dev-python/moto/moto-5.0.12.ebuild
+++ b/dev-python/moto/moto-5.0.12.ebuild
@@ -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.13-r1.ebuild b/dev-python/moto/moto-5.0.13-r1.ebuild
new file mode 100644
index 000000000000..ec44ed098013
--- /dev/null
+++ b/dev-python/moto/moto-5.0.13-r1.ebuild
@@ -0,0 +1,201 @@
+# 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/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/jsonpath-ng[${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/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/getmoto/moto/pull/8095
+	"${FILESDIR}/${P}-date-fmt.patch"
+)
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		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
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch/test_batch_jobs.py::test_submit_job_array_size
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_terminate_nonexisting_job
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_core/test_docker.py::test_docker_is_running_and_available
+		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
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# 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
+		No
+		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
+		No
+		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
+		# TODO
+		tests/test_dynamodb/test_dynamodb_import_table.py
+		# hangs
+		tests/test_core/test_account_id_resolution.py::TestAccountIdResolution::test_environment_variable_takes_precedence
+	)
+	local EPYTEST_IGNORE=(
+		# require joserfc
+		tests/test_cognitoidp/test_cognitoidp.py
+		# require antlr4 (which doesn't support py3.12)
+		tests/test_stepfunctions/parser
+	)
+
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		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
+
+	local serial_tests=(
+		# these tests set up credentials that are needed by the tests below
+		tests/test_core/test_importorder.py
+		# these tests apparently rely on some other test setting credentials
+		# up for them, so they need to be run separately, after the above
+		tests/test_awslambda_simple/test_lambda_simple.py::test_run_function{,_no_log}
+		tests/test_dynamodb/exceptions/test_dynamodb_exceptions.py
+		tests/test_dynamodb/exceptions/test_dynamodb_transactions.py::test_transaction_with_empty_key
+		tests/test_dynamodb/test_dynamodb_update_expressions.py::test_update_different_map_elements_in_single_request
+		tests/test_events/test_events.py::test_start_replay_send_to_log_group
+		tests/test_lakeformation/test_resource_tags_integration.py
+		tests/test_redshiftdata
+		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
+		tests/test_s3/test_s3.py::test_delete_bucket_cors
+		tests/test_s3/test_s3.py::test_delete_objects_percent_encoded
+		tests/test_s3/test_s3.py::test_delete_versioned_bucket_returns_metadata
+		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args
+		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args__using_multipart
+		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
+		tests/test_s3/test_s3_list_object_versions.py
+		tests/test_s3/test_s3_tagging.py
+		tests/test_s3control/test_s3control_access_points.py::test_delete_access_point
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable
+	)
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT+=(
+		"${EPYTEST_DESELECT[@]}"
+		"${serial_tests[@]}"
+	)
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/test_ses/test_ses_boto3.py::test_send_raw_email
+				tests/test_ses/test_ses_boto3.py::test_send_raw_email_validate_domain
+				tests/test_ses/test_ses_boto3.py::test_send_raw_email_without_source
+				tests/test_sesv2/test_sesv2.py::test_send_raw_email
+				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_specific_message
+				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_to_address_display_name
+			)
+			;;
+	esac
+
+	epytest -m 'not network and not requires_docker'
+}
diff --git a/dev-python/moto/moto-5.0.13.ebuild b/dev-python/moto/moto-5.0.13.ebuild
index b33b97897416..e83ad2d84c5d 100644
--- a/dev-python/moto/moto-5.0.13.ebuild
+++ b/dev-python/moto/moto-5.0.13.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.14.ebuild b/dev-python/moto/moto-5.0.14.ebuild
new file mode 100644
index 000000000000..64fecc28b9e6
--- /dev/null
+++ b/dev-python/moto/moto-5.0.14.ebuild
@@ -0,0 +1,196 @@
+# 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/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/jsonpath-ng[${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/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		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
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch/test_batch_jobs.py::test_submit_job_array_size
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_terminate_nonexisting_job
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_core/test_docker.py::test_docker_is_running_and_available
+		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
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# 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
+		No
+		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
+		No
+		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
+		# TODO
+		tests/test_dynamodb/test_dynamodb_import_table.py
+		# hangs
+		tests/test_core/test_account_id_resolution.py::TestAccountIdResolution::test_environment_variable_takes_precedence
+	)
+	local EPYTEST_IGNORE=(
+		# require joserfc
+		tests/test_cognitoidp/test_cognitoidp.py
+		# require antlr4 (which doesn't support py3.12)
+		tests/test_stepfunctions/parser
+	)
+
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		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
+
+	local serial_tests=(
+		# these tests set up credentials that are needed by the tests below
+		tests/test_core/test_importorder.py
+		# these tests apparently rely on some other test setting credentials
+		# up for them, so they need to be run separately, after the above
+		tests/test_awslambda_simple/test_lambda_simple.py::test_run_function{,_no_log}
+		tests/test_dynamodb/exceptions/test_dynamodb_exceptions.py
+		tests/test_dynamodb/exceptions/test_dynamodb_transactions.py::test_transaction_with_empty_key
+		tests/test_dynamodb/test_dynamodb_update_expressions.py::test_update_different_map_elements_in_single_request
+		tests/test_events/test_events.py::test_start_replay_send_to_log_group
+		tests/test_lakeformation/test_resource_tags_integration.py
+		tests/test_redshiftdata
+		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
+		tests/test_s3/test_s3.py::test_delete_bucket_cors
+		tests/test_s3/test_s3.py::test_delete_objects_percent_encoded
+		tests/test_s3/test_s3.py::test_delete_versioned_bucket_returns_metadata
+		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args
+		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args__using_multipart
+		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
+		tests/test_s3/test_s3_list_object_versions.py
+		tests/test_s3/test_s3_tagging.py
+		tests/test_s3control/test_s3control_access_points.py::test_delete_access_point
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable
+	)
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT+=(
+		"${EPYTEST_DESELECT[@]}"
+		"${serial_tests[@]}"
+	)
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/test_ses/test_ses_boto3.py::test_send_raw_email
+				tests/test_ses/test_ses_boto3.py::test_send_raw_email_validate_domain
+				tests/test_ses/test_ses_boto3.py::test_send_raw_email_without_source
+				tests/test_sesv2/test_sesv2.py::test_send_raw_email
+				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_specific_message
+				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_to_address_display_name
+			)
+			;;
+	esac
+
+	epytest -m 'not network and not requires_docker'
+}
diff --git a/dev-python/mpmath/mpmath-1.3.0-r1.ebuild b/dev-python/mpmath/mpmath-1.3.0-r1.ebuild
index d32b7d9264f8..814e9686c59d 100644
--- a/dev-python/mpmath/mpmath-1.3.0-r1.ebuild
+++ b/dev-python/mpmath/mpmath-1.3.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild
index 9af7399b58f0..ecc2eea4819e 100644
--- a/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild
+++ b/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild
@@ -17,21 +17,23 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/gmpy[${PYTHON_USEDEP}]
 		' 'python3*')
-		$(python_gen_cond_dep '
-			dev-python/ipython[${PYTHON_USEDEP}]
-		' 3.{10..12})
+		!mips? (
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			$(python_gen_cond_dep '
+				dev-python/ipython[${PYTHON_USEDEP}]
+			' 3.{10..12})
+		)
 	)
 "
 
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 9568215623f3..9ee781cdfb6e 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,2 +1,3 @@
 DIST msgpack-1.0.7.tar.gz 166311 BLAKE2B 8ddf2acf6bf81498d981c3ec83cbdffde1b1611f8ac23d3377f3f1541e679eda288b40b949bd586ca24a7059da3a0f73fa797a661375135ec092f408521c8527 SHA512 0ebd36f45b73106a4272588b55d55e72b6b8441be652b16f63f5547ae7ff1bc517a6b4549ef999ee63deb2856354a71ef37fd8d8829e516232518b046cf589c5
 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.1.0.ebuild b/dev-python/msgpack/msgpack-1.1.0.ebuild
new file mode 100644
index 000000000000..774c70c44923
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.1.0.ebuild
@@ -0,0 +1,59 @@
+# 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 ~ia64 ~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.c || 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_configure() {
+	if [[ ${EPYTHON} == python* && ! -f msgpack/_cmsgpack.c ]] &&
+		use native-extensions
+	then
+		cython -v msgpack/_cmsgpack.pyx || die
+	fi
+}
+
+python_test() {
+	rm -rf msgpack || die
+	epytest
+}
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 0289532bf4e6..a24ed7b85a9a 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1 +1,2 @@
 DIST mss-9.0.1.tar.gz 87504 BLAKE2B 445392b65b62e67802397e708781cbf1b3409303c68d863c4f44b0f32026b196faba1a6bb960110917ea6cf2b34b43d61d4e069fac6f6926af3e6a0b5fbab800 SHA512 22c4aa56eaf5d3c6ca752a8c966908b35256056a23f5f707d2ccd5acfbefecec6b6b8bff5d8c18024ef94f365a6ce1433aafddfdf9f7f30180af5dbd8a1f8eb7
+DIST mss-9.0.2.tar.gz 82514 BLAKE2B 9f5bec89fbe2405265070f5be03fe55ed496dddb6f28493ae2b88f131c6a6b2ed8c65969cf4b7b4256b492c8bc321e1548e5f355d802084880ff32e1eb9fcd28 SHA512 b4a9a6dd97810eb56d91c9ba65ac5e628c554e2cd038e830d87e583aa35cecf19cce337e61da814f10f8278017dca758c92c18220167f3660e322a7fba05488c
diff --git a/dev-python/mss/mss-9.0.2.ebuild b/dev-python/mss/mss-9.0.2.ebuild
new file mode 100644
index 000000000000..ca4af3147f7d
--- /dev/null
+++ b/dev-python/mss/mss-9.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes"
+HOMEPAGE="
+	https://github.com/BoboTiG/python-mss/
+	https://pypi.org/project/mss/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' pyproject.toml || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# upstream tests for self-build, apparently broken by setuptools
+		# issuing deprecation warnings
+		src/tests/test_setup.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# unreliable `lsof -U | grep ...` tests
+		src/tests/test_leaks.py
+		# frequently crashing, known upstream, not a regression
+		# https://github.com/BoboTiG/python-mss/issues/251
+		src/tests/test_implementation.py::test_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p rerunfailures
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 5de60752053a..97b9fcd930e5 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1 +1,2 @@
 DIST multidict-6.0.5.gh.tar.gz 72819 BLAKE2B 668b5db8174c0dbc6651eae281f777d5c1dfb59a4f4d9d5301355148bf40063e33e26844d2f8ff543ebe7b9c91cf7fffb4abd57ca6786684757f50af27b7df56 SHA512 500d3b2a139d40442462a2b49f9dd0c01631643ef9905367d8b7c472a1030437c26a042a28e11ba94058a17821628d96f19ec6ca479d5831e2f1263ff0069871
+DIST multidict-6.1.0.gh.tar.gz 73800 BLAKE2B 9e3531633b0a35bbb8a97ec2dfe040080fe67efae3b3a16436b0984d6c3a4dc38df1cf5b91bd7b1f750f7a27bd2726667935fa30eefa7b070534fd70f390ee8a SHA512 48e97f442c28c2dfc0b5e19376ae9c8c46b20939ac4f72c07b650450286156dcbe03166f7d238d7a77b438a154022e9d98a38a4c0596aefab7d40fbdda0687dc
diff --git a/dev-python/multidict/multidict-6.0.5.ebuild b/dev-python/multidict/multidict-6.0.5.ebuild
index a189c70f9a80..15674686ce0a 100644
--- a/dev-python/multidict/multidict-6.0.5.ebuild
+++ b/dev-python/multidict/multidict-6.0.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/multidict/multidict-6.1.0.ebuild b/dev-python/multidict/multidict-6.1.0.ebuild
new file mode 100644
index 000000000000..1d82b4eb7cfc
--- /dev/null
+++ b/dev-python/multidict/multidict-6.1.0.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="
+	https://github.com/aio-libs/multidict/
+	https://pypi.org/project/multidict/
+"
+SRC_URI="
+	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="+native-extensions"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't enable coverage or other pytest settings
+	sed -i -e '/cov/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! use native-extensions || [[ ${EPYTHON} == pypy3 ]]; then
+		local -x MULTIDICT_NO_EXTENSIONS=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	rm -rf multidict || die
+
+	local cext=--c-extensions
+	if ! use native-extensions || [[ ${EPYTHON} == pypy3 ]]; then
+		cext=--no-c-extensions
+	fi
+	epytest "${cext}"
+}
diff --git a/dev-python/musicbrainzngs/Manifest b/dev-python/musicbrainzngs/Manifest
index 594037489815..b3e2179897db 100644
--- a/dev-python/musicbrainzngs/Manifest
+++ b/dev-python/musicbrainzngs/Manifest
@@ -1,2 +1 @@
 DIST python-musicbrainzngs-0.7.1.gh.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
-DIST python-musicbrainzngs-0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
diff --git a/dev-python/musicbrainzngs/musicbrainzngs-0.7.1-r1.ebuild b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1-r1.ebuild
index a16aafd961ff..ba5de176e7c3 100644
--- a/dev-python/musicbrainzngs/musicbrainzngs-0.7.1-r1.ebuild
+++ b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 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-2 ISC"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-python/musicbrainzngs/musicbrainzngs-0.7.1.ebuild b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1.ebuild
deleted file mode 100644
index f1467c24aa57..000000000000
--- a/dev-python/musicbrainzngs/musicbrainzngs-0.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit distutils-r1
-
-MY_P=python-musicbrainzngs-${PV}
-DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
-HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
-SRC_URI="
-	https://github.com/alastair/python-musicbrainzngs/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2 ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/^ *'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-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/mypy/Manifest b/dev-python/mypy/Manifest
index f59f48d16bb7..765d78bb5b14 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1 +1,2 @@
 DIST mypy-1.11.1.gh.tar.gz 3122001 BLAKE2B 6b4db9a363190177b96ea807538f1582071b213eae816ff55723c22de098e7ff2745e433a8a174fe3ebb6a9ed66f8ac75917883dfa027bdd7bca750a7517478e SHA512 8baa916ffe7e37c54c6dac98241441cc615ea8f847ebe3d12f41912d4a596ca47068d4fb0460e3bfc4b020ad7d2580814422b9dc3a22830c9031cec4111e3aab
+DIST mypy-1.11.2.gh.tar.gz 3122502 BLAKE2B 228127662f4c607aacf3ee37410d0fa039a225fdbf2fec27eefab4aaabf4b68fa33499bb978aa5f06e24b45b525ce524decfa84f4d7d6bb7961724db92a4589b SHA512 c25584db08adcf7693944e5a6a41743101e80a0ff03f36f0353a07674ad4e2d63dbd4ff3fa0e307c19d63bc5aac9f7523340bd5a7cb3661642f3fb33759aafd0
diff --git a/dev-python/mypy/mypy-1.11.2.ebuild b/dev-python/mypy/mypy-1.11.2.ebuild
new file mode 100644
index 000000000000..81a7e950a754
--- /dev/null
+++ b/dev-python/mypy/mypy-1.11.2.ebuild
@@ -0,0 +1,126 @@
+# 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 ~arm64 ~loong ~ppc64 ~riscv ~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
+
+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
+		# 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
+		mypy/test/teststubtest.py::StubtestUnit::test_runtime_typing_objects
+	)
+	case ${EPYTHON} in
+		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
+			)
+			;;
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# https://github.com/mypyc/mypyc/issues/1056
+				mypyc/test
+				# requires typeshed update
+				mypy/test/teststubtest.py::StubtestUnit::test_type_alias
+			)
+			;;
+	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/myst-parser/myst-parser-4.0.0.ebuild b/dev-python/myst-parser/myst-parser-4.0.0.ebuild
index 12bf4ead7924..2cc8d133eabf 100644
--- a/dev-python/myst-parser/myst-parser-4.0.0.ebuild
+++ b/dev-python/myst-parser/myst-parser-4.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.18[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index c47739c63c17..d4135e471c52 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1 SHA512 df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3
+DIST nbdime-4.0.2.tar.gz 9452967 BLAKE2B c9c390f9165d0b8b3277c7bd93e5a90f4ac23cf0d084ed8ba166254bfbfe9cc0e9f0bc35c2a86b39d84167e78639cb2ed69f6cda5da02bb113f7323a86d745a6 SHA512 1e923b7f719d6a33f1dc06e06511a6d48bb8bfef7d8f7676da2520edd2914014eb88f70eaaeec27af6b03f1cefbd9a3e6854a7c0dec7f76f211d750b3fd90894
diff --git a/dev-python/nbdime/nbdime-4.0.2.ebuild b/dev-python/nbdime/nbdime-4.0.2.ebuild
new file mode 100644
index 000000000000..db11041f30e0
--- /dev/null
+++ b/dev-python/nbdime/nbdime-4.0.2.ebuild
@@ -0,0 +1,63 @@
+# 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbdime/
+	https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter-server[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	# user.email and user.name are not configured in the sandbox
+	git config --global user.email "larry@gentoo.org" || die
+	git config --global user.name "Larry the Cow" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p timeout -o tmp_path_retention_policy=all
+}
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}"{/usr,}/etc || die
+}
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index dc5807b08219..aa0c5fbc0981 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,2 +1 @@
-DIST nbsphinx-0.9.4.tar.gz 179315 BLAKE2B 727e2d6e70bec199159940afdfc92409124d940e4a1bcfd0288e779c5ac9be41802e5f347d486df0ec54a641cc82b6e5cfecbdcf4dc3dbacf74d0a8c884b3018 SHA512 b643d749eef8ec8ac63594f75d38d13c7b623203f7a46d7190b5da2cc3a7882623a8cf54f240678488db1cf5e37091473002510079f7294a0bc5780982661c86
 DIST nbsphinx-0.9.5.tar.gz 179599 BLAKE2B ca7ec2a4b9665fe189c5c8020c345abbf60cff72b7434365359bf6ae1f569570bfb0928072a6d01227f685cc837d9fc75b31b1a2361788c6fa45a075c9d1f23c SHA512 2b1a1575af9ad462888992f3bc6792c014536e7abba5c4b20a1e36da385eae87b23a79e74d9e02cb122dfccfb93e15a817b794565371b5d69d857ca19d163a9c
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.4.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.4.ebuild
deleted file mode 100644
index 31c5a6eb5d22..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.9.4.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/jinja[${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.5.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
index bb191b4769e1..31c5a6eb5d22 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.5.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/notebook/Manifest b/dev-python/notebook/Manifest
index 4d38801a4682..564d6424ece4 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1 +1,2 @@
 DIST notebook-7.2.1.tar.gz 4946671 BLAKE2B 2f78c497b1527c29a911fd0a057df41f3e522e426e3eae940d9adea9f1df982b14c5bb61210357dfc271df51d2534f97408790bffb4e02ff2f12b33769f9836e SHA512 e11415139a21a7dd8692673c2011d11621881cd4b99f69de5f32c23161734b1620560f57654b2e57177cb3ba01152bb76e0c9f79c2f7924b0d8424c21c219677
+DIST notebook-7.2.2.tar.gz 4948876 BLAKE2B 2f145ee832e9eff647f7c736d116cbf684ae63948d8e2e1da2a1d8f2d1d3df23d198719bde9f8a705eb5b77b62dbd654e16ac4de658fbd4a9a809e37d3add8e4 SHA512 b18348e898f6135bea72e759a8137bf32f6ea79619388bd8b3627bd497746a233de69e1b7865bec473a7c49d65f22bc5755afbf79eeb1b4dbb7e0e3e8afe8e7f
diff --git a/dev-python/notebook/notebook-7.2.2.ebuild b/dev-python/notebook/notebook-7.2.2.ebuild
new file mode 100644
index 000000000000..49097b1c08f3
--- /dev/null
+++ b/dev-python/notebook/notebook-7.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+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.2.0[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.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/notebook-shim-0.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${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/numpy/Manifest b/dev-python/numpy/Manifest
index 815a058b7246..9ce92a6eb887 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,4 +1,7 @@
 DIST numpy-1.26.4.tar.gz 15786129 BLAKE2B ee759d3a857111bc494d5e989a7b005375d942b2a89cda69be4a3bd7c6cb195003fd2a8a0535f1858d8977ff688b0ec36360dcba9c3160206eedce5e28f191ef SHA512 f7121ab4099fa0686f9c095d456baa4a5869d651d7b7a06385f885f329cf08f11024b5df5e7b4ee705970062a8102ec4f709512eabbfd5c9fccce4ef83b9c208
 DIST numpy-2.0.0.tar.gz 18326228 BLAKE2B e3d1084b79e0e55cd9087bb34dc116e6c9d6ab14a416a07f727b9f5d5a9db236ecf74a53b7e758d078781c5e565e5557912962f2ddbfff7251ec5b231fabe01d SHA512 cd5612ce2db4be87afa8479c508c256c9ff7f1b15a6b010eb06ba962759cc26552b512ec82711680bab1ebedeb06dfc8d7bff9cec63c94efacaadd719448b287
 DIST numpy-2.0.1.tar.gz 18872007 BLAKE2B dd1d4658466057892f10cdc29a764b324dbf5ef800b8e9781ce7131935d12ddefbc9fa691021cc06a7efd5ec5874113e6f1d5616eb1a7a833c0f63a0e7a5e534 SHA512 4f638c17b44317b0000000b729726a5a4e9519af11d254b0e2daf32c6ff0cfdd56723a9cbee67c9145088f429f1f0cce79240f968211c2fb5ac08378e86dccfe
+DIST numpy-2.0.2.tar.gz 18902015 BLAKE2B 63f993e3429bff1dac1ff79fad23a36a2493fd2c8a825ef96b6b87d82b0e68393d2829c5ecd9065df345c8bfbb1f8f385077f154264f7d2810d311d1d6672bd7 SHA512 d769fd4f07e082fae1661c6856d6d726e189f6931f3028c6819f9806aa9dfd15ab2b49c48b94bfd925eb3f74fddb6f044c9ba93bbb785b5476440dd1cf0b4999
+DIST numpy-2.1.0.tar.gz 18868922 BLAKE2B 3255ae5e077fec597935d0719b2d82b4f654bf3acf927d502d37e205995468a6fb9713563d437f90b00dafc061cf68d623517fd175a7bcc2c9a151d6e589cf97 SHA512 d0948aa8bb7406b91d79cdd1d5019632e00c60aefbbf5c0884dd91ec8dda6a5369538ab20ef6a201595eeba98bf3a19a407e58a3d4e4e2f412420e65400d7bdd
 DIST numpy-2.1.0rc1.tar.gz 18868567 BLAKE2B 1100dfa558ce6cfe608fc792c692c40b61d31854560d18cb6ea4a32b3e03179bb3d81cd080a56683cd00e5e5d073e4628f7daf75635bc0830af76749fd30d34c SHA512 cdf6df68ffbf256215114e48064088c71cb1a0522ab6d29eb1adf45760d6b58a3852755f2ab005e78ad8cbe2fb331fa7362d404150b68425d38e68a5e851d492
+DIST numpy-2.1.1.tar.gz 18874860 BLAKE2B c828f2106e32429831aa8c64b3b94dfda1b097bcb7f3475b33306bed0b03c2aeb0af4e43ea47c6b3d5e6387b37e3f9ecdf6ae2a3fd4f526da5d121931b9521f1 SHA512 94843f88a32cc1df3e572ac13f294e49201a1f50fbd28707a500839cdff61958823c5b8748a7a54cd866a1acc9bd11efde53042141a81cca44393ee7cee78cdc
diff --git a/dev-python/numpy/numpy-2.0.2.ebuild b/dev-python/numpy/numpy-2.0.2.ebuild
new file mode 100644
index 000000000000..0b037d283fb4
--- /dev/null
+++ b/dev-python/numpy/numpy-2.0.2.ebuild
@@ -0,0 +1,132 @@
+# 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} 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 ~ia64 ~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="+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/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+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
+		lib/tests/test_io.py::TestSaveTxt::test_large_zip
+		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
+
+		# Precision problems
+		_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# Runs the whole test suite recursively, that's just crazy
+		core/tests/test_mem_policy.py::test_new_policy
+
+		typing/tests/test_typing.py
+		# Uses huge amount of memory
+		core/tests/test_mem_overlap.py
+		'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+	)
+
+	if [[ $(uname -m) == armv8l ]]; then
+		# Degenerate case of arm32 chroot on arm64, bug #774108
+		EPYTEST_DESELECT+=(
+			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				_core/tests/test_nditer.py::test_iter_refcount
+				_core/tests/test_limited_api.py::test_limited_api
+			)
+			;&
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# flaky
+				f2py/tests/test_crackfortran.py
+				f2py/tests/test_data.py::TestData::test_crackedlines
+				f2py/tests/test_data.py::TestDataF77::test_crackedlines
+				f2py/tests/test_f2py2e.py::test_gen_pyf
+				f2py/tests/test_f2py2e.py::test_gh22819_cli
+			)
+			;;
+	esac
+
+	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
+		# depends on importing numpy.random from system namespace
+		EPYTEST_DESELECT+=(
+			'random/tests/test_extending.py::test_cython'
+		)
+	fi
+
+	rm -rf numpy || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs numpy
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-2.1.0.ebuild b/dev-python/numpy/numpy-2.1.0.ebuild
new file mode 100644
index 000000000000..600343fdf194
--- /dev/null
+++ b/dev-python/numpy/numpy-2.1.0.ebuild
@@ -0,0 +1,132 @@
+# 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} 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 ~ia64 ~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="+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/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+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
+		lib/tests/test_io.py::TestSaveTxt::test_large_zip
+		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
+
+		# Precision problems
+		_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# Runs the whole test suite recursively, that's just crazy
+		core/tests/test_mem_policy.py::test_new_policy
+
+		typing/tests/test_typing.py
+		# Uses huge amount of memory
+		core/tests/test_mem_overlap.py
+		'core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+	)
+
+	if [[ $(uname -m) == armv8l ]]; then
+		# Degenerate case of arm32 chroot on arm64, bug #774108
+		EPYTEST_DESELECT+=(
+			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				_core/tests/test_nditer.py::test_iter_refcount
+				_core/tests/test_limited_api.py::test_limited_api
+				f2py/tests/test_f2py2e.py::test_gh22819_cli
+			)
+			;&
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# flaky
+				f2py/tests/test_crackfortran.py
+				f2py/tests/test_data.py::TestData::test_crackedlines
+				f2py/tests/test_data.py::TestDataF77::test_crackedlines
+				f2py/tests/test_f2py2e.py::test_gen_pyf
+			)
+			;;
+	esac
+
+	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
+		# depends on importing numpy.random from system namespace
+		EPYTEST_DESELECT+=(
+			'random/tests/test_extending.py::test_cython'
+		)
+	fi
+
+	rm -rf numpy || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs numpy
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-2.1.1.ebuild b/dev-python/numpy/numpy-2.1.1.ebuild
new file mode 100644
index 000000000000..394b1fa13835
--- /dev/null
+++ b/dev-python/numpy/numpy-2.1.1.ebuild
@@ -0,0 +1,144 @@
+# 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} 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 ~ia64 ~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="+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/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+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
+		'numpy/core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+	)
+
+	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 ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				numpy/_core/tests/test_nditer.py::test_iter_refcount
+				numpy/_core/tests/test_limited_api.py::test_limited_api
+				numpy/f2py/tests/test_f2py2e.py::test_gh22819_cli
+			)
+			;&
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# flaky
+				numpy/f2py/tests/test_crackfortran.py
+				numpy/f2py/tests/test_data.py::TestData::test_crackedlines
+				numpy/f2py/tests/test_data.py::TestDataF77::test_crackedlines
+				numpy/f2py/tests/test_f2py2e.py::test_gen_pyf
+			)
+			;;
+	esac
+
+	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
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index db9965b10791..845c3cd8bd3f 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,3 +1 @@
-DIST numpydoc-1.7.0.gh.tar.gz 87818 BLAKE2B b31e9478324bc45d78904c16330c9ed1513eca5668f20472faf9e2a36c0ed7eb03b18cf1c314180ec35716a26bd05357d5ef93025efbb8fb09c885a614ac7ea9 SHA512 0858d7eaafdd93d5a0894bb107b8238f75bd7cd34afa64fee38effcf4bebf9b4db957768143a46eec46023e69b53599a79b07a39640887f3a0471b5996022247
 DIST numpydoc-1.8.0.gh.tar.gz 90624 BLAKE2B 112274fa185bd48909a3fbe0cd2a98465f94b30207060234a396278e1802058224164fb6f3c492a6b1e76b7e0f7966ecaf6c592c96675e6e45fae044414f62c7 SHA512 d7ea64f1140395815e0d95697d1b855ba0a5f63fc99e8cf1fb7d240cd799be1958c2efd034cbec64c8b3b1742076c8b7db5a0ddc54af3ef39fc341ea0e3ec586
-DIST numpydoc-1.8.0rc2.gh.tar.gz 90642 BLAKE2B cf47c0a2865ab5579c7f095607a58fe3db4e64ccf521e052797e4286d74351017ebe9c300b968f3f2f799fc0fc07f3d8eebbef59e1f1aab269ededf6d0a8bd12 SHA512 f323ca5fc62ba37af10a8d892b22a348ca3b2ecd9faa3bd885f0b233f51e169e8d86eb364bd0155bb8c9daee9185866f962e586123758555dae03ef46f437450
diff --git a/dev-python/numpydoc/numpydoc-1.7.0.ebuild b/dev-python/numpydoc/numpydoc-1.7.0.ebuild
deleted file mode 100644
index 7181e5ae6da1..000000000000
--- a/dev-python/numpydoc/numpydoc-1.7.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
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="
-	https://numpydoc.readthedocs.io/en/latest/
-	https://github.com/numpy/numpydoc/
-	https://pypi.org/project/numpydoc/
-"
-SRC_URI="
-	https://github.com/numpy/numpydoc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/sphinx-6[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.10[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-		# TODO
-		numpydoc/tests/test_validate.py::test_extract_ignore_validation_comments
-	)
-	epytest -o addopts= --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.8.0.ebuild b/dev-python/numpydoc/numpydoc-1.8.0.ebuild
index 14e88a8725d4..84ffafa7586c 100644
--- a/dev-python/numpydoc/numpydoc-1.8.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.8.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/sphinx-6[${PYTHON_USEDEP}]
diff --git a/dev-python/numpydoc/numpydoc-1.8.0_rc2.ebuild b/dev-python/numpydoc/numpydoc-1.8.0_rc2.ebuild
deleted file mode 100644
index 14e88a8725d4..000000000000
--- a/dev-python/numpydoc/numpydoc-1.8.0_rc2.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
-
-MY_P=${P/_}
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="
-	https://numpydoc.readthedocs.io/en/latest/
-	https://github.com/numpy/numpydoc/
-	https://pypi.org/project/numpydoc/
-"
-SRC_URI="
-	https://github.com/numpy/numpydoc/archive/v${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/sphinx-6[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.10[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-		# TODO
-		numpydoc/tests/test_validate.py::test_extract_ignore_validation_comments
-	)
-	epytest -o addopts= --pyargs numpydoc
-}
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
index cb28205b9acc..9a3c7ea985a0 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,4 +1,2 @@
-DIST oct2py-5.6.0.tar.gz 437965 BLAKE2B e22aca80608e1132f2cb8936e9dac7c97bd8e5463b6997dd80f0ed567af2a59a28b4c58995b11e2c1a970bc0bde81afda432d8ce5306b2eb5417b1f75b8b4b19 SHA512 d5eae408812358e48c9a72e823dc06a7556c09176170def00c53aacba75c6568357afe8e9a079c02e08c88ee1e7f1aa4284508471680b5542894745b19e7af36
-DIST oct2py-5.6.1.tar.gz 440686 BLAKE2B 5255b0413a655f74db243d8d3a338a8468400af0c392a7ae5c6ac894edd8fa526acda5c8dbad7c5d8414dc9de3f4fa8c4aa055a396238464556186edd9500b1b SHA512 2485c7434666f8d580396759024e4f807c6e14f5d0f30a0f2449373488735c6ee91b6a8bdde8d951e0371790cd7673710986f6e3b6af0c77b3a36e92bb1c1285
-DIST oct2py-5.7.0.tar.gz 441233 BLAKE2B 601eadd10898d4b522c23d3df86aef26b2783cdb66f3942ddb568c65d828aea1a4e82c755e547ac1940c4fc449856c955b0f9931488472fb63330ca2b96e31ad SHA512 fe45b421593ef0b1257d704c0d43e89425054a6fac1c784bd66ad404e0f28d328fc4a3a7f82e589d43c2860e95a6a6b54898ef5a378362b8914f47b097c705e9
 DIST oct2py-5.7.1.tar.gz 441250 BLAKE2B b0eca421b297ca5495508cfcb75e8c3bd0f53f12ab3c367bfedfd2f0064c7d9874c6cbefa0d9fc7bea3c21865993136707dab3deb8cd442090bc1c9cc5786527 SHA512 e8018b88119a5275061e315ecd37d07284ba674d64d778215378f0f6b60d4a33e503f0d26e1d23fb054974673ade9eeae5b292498f158e0a6d476c0998da5e6e
+DIST oct2py-5.7.2.tar.gz 441373 BLAKE2B afa7a98f6d38120e8028438d243fb2baefaf3cacc00b576f32fbf666f193dad95e8468847859e8405b7796ec2132b99e347f9ea466400307d1d23ce46f9489fc SHA512 f01263d210eab9adb3f69025a2a22efebd0b1a4dff040620fd382752159992d9907451ec7a72c75f211a9a8e18a1d1c53ff5d3512d8bd807afc737b50fcae178
diff --git a/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch b/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch
deleted file mode 100644
index c233b45ec2c7..000000000000
--- a/dev-python/oct2py/files/oct2py-5.2.0-mask-pkg-load-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/oct2py/tests/test_usage.py
-+++ b/oct2py/tests/test_usage.py
-@@ -338,6 +338,7 @@
-         with pytest.raises(Oct2PyError, match=exp):

-             self.oc.pyeval_like_error3(1)

- 

-+    @pytest.mark.skip(reason="requires octave 'signal' package to be installed")

-     def test_pkg_load(self):

-         self.oc.eval('pkg load signal')

-         t = np.linspace(0, 1, num=100)

diff --git a/dev-python/oct2py/oct2py-5.6.0.ebuild b/dev-python/oct2py/oct2py-5.6.0.ebuild
deleted file mode 100644
index f10a1aac5a11..000000000000
--- a/dev-python/oct2py/oct2py-5.6.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="
-	https://github.com/blink1073/oct2py
-	https://blink1073.github.io/oct2py/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
-	>=dev-python/octave-kernel-0.34.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-0.17[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)"
-
-EPYTEST_DESELECT=(
-	# No graphics toolkit available: 743589
-	"oct2py/ipython/tests/test_octavemagic.py::OctaveMagicTest::test_octave_plot"
-)
-
-distutils_enable_sphinx docs/source \
-	dev-python/numpydoc \
-	dev-python/sphinx-bootstrap-theme \
-	dev-python/sphinx-rtd-theme \
-	dev-python/myst-parser
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-5.2.0-mask-pkg-load-test.patch )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/oct2py/oct2py-5.6.1.ebuild b/dev-python/oct2py/oct2py-5.6.1.ebuild
deleted file mode 100644
index 482fbfd11055..000000000000
--- a/dev-python/oct2py/oct2py-5.6.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="
-	https://github.com/blink1073/oct2py
-	https://blink1073.github.io/oct2py/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
-	>=dev-python/octave-kernel-0.34.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-0.17[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)"
-
-EPYTEST_DESELECT=(
-	# No graphics toolkit available: 743589
-	"oct2py/ipython/tests/test_octavemagic.py::OctaveMagicTest::test_octave_plot"
-)
-
-distutils_enable_sphinx docs/source \
-	dev-python/numpydoc \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst-parser \
-	dev-python/sphinxcontrib-spelling
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/oct2py/oct2py-5.7.0.ebuild b/dev-python/oct2py/oct2py-5.7.0.ebuild
deleted file mode 100644
index 482fbfd11055..000000000000
--- a/dev-python/oct2py/oct2py-5.7.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="
-	https://github.com/blink1073/oct2py
-	https://blink1073.github.io/oct2py/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
-	>=dev-python/octave-kernel-0.34.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-0.17[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-	)"
-
-EPYTEST_DESELECT=(
-	# No graphics toolkit available: 743589
-	"oct2py/ipython/tests/test_octavemagic.py::OctaveMagicTest::test_octave_plot"
-)
-
-distutils_enable_sphinx docs/source \
-	dev-python/numpydoc \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst-parser \
-	dev-python/sphinxcontrib-spelling
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/oct2py/oct2py-5.7.2.ebuild b/dev-python/oct2py/oct2py-5.7.2.ebuild
new file mode 100644
index 000000000000..79f44327ad13
--- /dev/null
+++ b/dev-python/oct2py/oct2py-5.7.2.ebuild
@@ -0,0 +1,55 @@
+# 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python to GNU Octave bridge"
+HOMEPAGE="
+	https://github.com/blink1073/oct2py
+	https://blink1073.github.io/oct2py/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/numpy-1.12[${PYTHON_USEDEP}]
+	>=dev-python/octave-kernel-0.34.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-0.17[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# No graphics toolkit available: 743589
+	"oct2py/ipython/tests/test_octavemagic.py::OctaveMagicTest::test_octave_plot"
+)
+
+distutils_enable_sphinx docs/source \
+	dev-python/numpydoc \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst-parser \
+	dev-python/sphinxcontrib-spelling
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/olefile/olefile-0.47.ebuild b/dev-python/olefile/olefile-0.47.ebuild
index 7ff45a2fcaf9..582ca976dfb9 100644
--- a/dev-python/olefile/olefile-0.47.ebuild
+++ b/dev-python/olefile/olefile-0.47.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 740322ea03e6..2b249b6a1e44 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1,2 @@
-DIST openapi_core-0.19.2.tar.gz 108121 BLAKE2B 0873ba33c0270babb3c3e626e942fd22fc066f8ef408c6f1cadab8140fdb6284d21a1cb5ed767c7f0f370112a1bb263ac50b340cccfe1cba6da1a0f15a73bbde SHA512 cab2343c61bbb8de048b5e3a53c2d753468f6707f3b4b40ddfee7c3ea6eb0f3beff0aebcad632200a5a4b08e93c620aceda659297756d4f587d11039ede0eefa
 DIST openapi_core-0.19.3.tar.gz 109026 BLAKE2B e7725fd14069599a3f4f0d976452fca9b12acd39c2a0fb7b448ee862d9fa973c520b1e428e017a7f246c7110b56d58c299aa35c8f387cf43af6e9a53da2f1418 SHA512 87db8e0a1c5998fb4dbe3bfaf5c33b526e291ad96bb4a679fcb68ce21b003a66b40db14c4784f80104d4462c1e958a1b7776fb3d952e68eb4a7308999896c08b
+DIST openapi_core-0.19.4.tar.gz 109095 BLAKE2B 85cb1733beeb5d18251a071c6123e5f395242a5d124a0fc40caec9090f98485ed1dfca4ccc76c2457b9a9d39bb07920770d7d0bc978f815af95f235d7a17de7d SHA512 b21223e6fcea7deb95863335abc7b5079dace585d6418514df9d9e947ac7e7e9d88fc618aeeca3008551838c6fc018f03469722a3b325ad8b0766c422954b4a5
diff --git a/dev-python/openapi-core/openapi-core-0.19.2.ebuild b/dev-python/openapi-core/openapi-core-0.19.2.ebuild
deleted file mode 100644
index ca1feba09eaf..000000000000
--- a/dev-python/openapi-core/openapi-core-0.19.2.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_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-path-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-path-0.3.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.8[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.7.1[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		>=dev-python/aioitertools-0.11.0[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# missing dependendencies
-	tests/integration/contrib/falcon
-	tests/integration/contrib/fastapi
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.19.3.ebuild b/dev-python/openapi-core/openapi-core-0.19.3.ebuild
index c847f13acce7..ca1feba09eaf 100644
--- a/dev-python/openapi-core/openapi-core-0.19.3.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.19.3.ebuild
@@ -16,7 +16,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/asgiref-4[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-core/openapi-core-0.19.4.ebuild b/dev-python/openapi-core/openapi-core-0.19.4.ebuild
new file mode 100644
index 000000000000..c847f13acce7
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.19.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022-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="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-path-0.4[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-path-0.3.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.8[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.7.1[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
+		>=dev-python/aioitertools-0.11.0[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# missing dependendencies
+	tests/integration/contrib/falcon
+	tests/integration/contrib/fastapi
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/opensearch-py/Manifest b/dev-python/opensearch-py/Manifest
index 9dea46936495..61b1e5e9472d 100644
--- a/dev-python/opensearch-py/Manifest
+++ b/dev-python/opensearch-py/Manifest
@@ -1 +1,2 @@
 DIST opensearch-py-2.3.0.gh.tar.gz 392631 BLAKE2B b2e88c98676c8c035f8c295b12b8cd8a7b8f4d6e4b1b4dca76f2417cf9d8c01b16bc36b3bed7f64d91d643aa2ceba681af6eac9b4d1a3d3bfa1a2cb13a53f167 SHA512 8be82ff19b4aa3d44dba8dd3b56676241de1999d6ae91c8414528132a6ed450850bf3b544a858c9fe0a5b188cd0da1196a524f9515e90369f5232c3ca7244d22
+DIST opensearch-py-2.7.1.gh.tar.gz 479006 BLAKE2B 17203e9c65e9bc2ec0b73b3b2f1ccdf0ad053ebf5173aa5b21423e607b68c1c0e4349b99be593eb982cb6cb9cfa2331a30668b9a74ce425591d966728d86254d SHA512 84041a075667b54b0afeae11221bb56d41a86d7bf4b3fae3f9406822bb8c8f55a6ba67c4ca1a2cfea70d3ed6e089b0921a535b32fccc04a1016549bcf66ac03c
diff --git a/dev-python/opensearch-py/opensearch-py-2.7.1.ebuild b/dev-python/opensearch-py/opensearch-py-2.7.1.ebuild
new file mode 100644
index 000000000000..d5d5b0a46f50
--- /dev/null
+++ b/dev-python/opensearch-py/opensearch-py-2.7.1.ebuild
@@ -0,0 +1,44 @@
+# 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
+
+DESCRIPTION="Python client for OpenSearch"
+HOMEPAGE="
+	https://pypi.org/project/opensearch-py/
+	https://github.com/opensearch-project/opensearch-py
+"
+SRC_URI="
+	https://github.com/opensearch-project/opensearch-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# Uses 156 GB of RAM for the test suite, needs more work.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/urllib3-1.26.19[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/Events[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index bd23e2b87cba..e466e5756b34 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1 +1,2 @@
 DIST openstackdocstheme-3.2.0.tar.gz 1256119 BLAKE2B b4e0536d9846270597f9456998a9e38d728acee1f992793354dd814596dbc8b189e7e86d1aab4d85b97abdf9a0a502cdef884447fe66b8b57836cf07bec26f67 SHA512 8a9cff0ef68c78917a8a18653567683dda269ea1c4c915d183324ad28ecdfc111083c94082b4e47a88f46f8990a20e3d277478ac02febb3ea0c31067069f315b
+DIST openstackdocstheme-3.3.0.tar.gz 1256566 BLAKE2B d69f9edae656de888cb06b9a4c42ece7c615976d8e454b5b391772a19958366ed14c57b55a3e8514052a845eaf5f9774e5415e71c0d16e44dab1c7285c66be45 SHA512 b49be9d4b7deccbdf6f9c398ddd1e763572dadfecdc228fe6956aab5fdb5588a4d20aaa1e445b2de66e99fe0953f753c2734bb6bc2211836f5bf4b0567ba7deb
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.3.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.3.0.ebuild
new file mode 100644
index 000000000000..58be7bf77227
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.3.0.ebuild
@@ -0,0 +1,29 @@
+# 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 ~ia64 ~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/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 5d3ad4c1a812..2a252d8d6cf0 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1 +1,2 @@
 DIST openstacksdk-3.3.0.tar.gz 1229640 BLAKE2B f807493c8db39121599124389f330316edb0d183a7bbf9219b6e75eb6c871d3bf55207a7de7270635e4a154b9e30e2365122eab2ea28634c8f003371dccaed03 SHA512 cccfd6f28de9c617ccf9e8d0476a884a63ac0e15707ac446f0aa56f22eaefabcff07ab7aa3d46484fe0c7c5a565d000f72407250e1365202af4bbc8787fbad18
+DIST openstacksdk-4.0.0.tar.gz 1228578 BLAKE2B 84b4b82a7b6d35b377d6c05d9d2e33069f76f848f79876c4d8ee940e9b6b8849acd60a1b7bea7d0fea1e9483c64ecdf6d48d5e4b68062f48d7f106c9cf250091 SHA512 bb0ebd32c442b84c8cbcfbcc7d271739814811ee5b0f61459b515bb22b00f7bb600399a7f055209bbb5001053d05133b82de2cb2a7dcc2a081cd3ce2a7c1b64a
diff --git a/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild b/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild
new file mode 100644
index 000000000000..39d1d164ab65
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="
+	https://opendev.org/openstack/openstacksdk/
+	https://github.com/openstack/openstacksdk/
+	https://pypi.org/project/openstacksdk/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.21[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+	sed -e 's:test_servers:_&:' \
+		-i openstack/tests/unit/test_stats.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	# fragile warning-based tests
+	sed -e 's:test_unsupported_version_override:_&:' \
+		-i openstack/tests/unit/test_missing_version.py || die
+	sed -e 's:test_create_unknown_proxy:_&:' \
+		-i openstack/tests/unit/test_connection.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/orderly-set/Manifest b/dev-python/orderly-set/Manifest
new file mode 100644
index 000000000000..358b3bb944d6
--- /dev/null
+++ b/dev-python/orderly-set/Manifest
@@ -0,0 +1 @@
+DIST orderly-set-5.2.2.gh.tar.gz 21460 BLAKE2B 5660d7550d5c79351fcc66e611ba776d6340d0fc1f3a5344f308cbc00a7b2c47045a1cfe8c6ac76c7976a65b17953362e91d60d87a7fbb02f36a5d67f074dfe9 SHA512 d480677c04f32e69cc9361dff383765fe2c9df971ad77cdcbab3b650a0bad27b9bd99144cd406d5185440d674bc838acb1c2ba3a4b115fcff2eba34c19589637
diff --git a/dev-python/orderly-set/metadata.xml b/dev-python/orderly-set/metadata.xml
new file mode 100644
index 000000000000..7d4c31d1ff3b
--- /dev/null
+++ b/dev-python/orderly-set/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">seperman/orderly-set</remote-id>
+		<remote-id type="pypi">orderly-set</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/orderly-set/orderly-set-5.2.2.ebuild b/dev-python/orderly-set/orderly-set-5.2.2.ebuild
new file mode 100644
index 000000000000..8b0953ce7def
--- /dev/null
+++ b/dev-python/orderly-set/orderly-set-5.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 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="A package containing multiple implementations of Ordered Set"
+HOMEPAGE="
+	https://github.com/seperman/orderly-set/
+	https://pypi.org/project/orderly-set/
+"
+# incomplete test directory
+# https://github.com/seperman/orderly-set/pull/3
+SRC_URI="
+	https://github.com/seperman/orderly-set/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditional mypy dep for a test that is not even run
+	# https://github.com/seperman/orderly-set/pull/5
+	sed -i -e '/mypy\.api/d' tests/*.py || die
+}
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index b51ad507035d..8c71a9530219 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -3,13 +3,10 @@ DIST associative-cache-2.0.0.crate 13960 BLAKE2B d0089d97ffd7bf1db65489501b53ad5
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST beef-0.5.2.crate 15275 BLAKE2B 95d60fb1840ca26581841ad65a4e8f3f99d5f8d44c569219f4d06ce441bb3a4ba558e231e73a51cd1c6b4d9e4cc6a07942115c134289fb1982dace03049d3a1e SHA512 755fc588acbf730bc9c80dbfc20cd0ef81f792a94da0dd28379ad83a7359ddd4c7b136ba8048dd460bb8652475db3d12814fcbd04eff4ebe8ec8a1bcd024c2aa
 DIST bytecount-0.6.8.crate 14694 BLAKE2B f534fadb45ce25036313c0c4d54ecfd2091069d5402e02606da36d73696c74e3162990dfdbc95dca4424b498983bf04019234af6eb71e38ca28fb7da61d181fb SHA512 5984dbb71fe22371db00ca56675f409cefcf7c093f406ce1abc330a0b1535f30a43a520fb64d66c04a181a4f05d956300e35f77b43aceeb161eaf8a2c64df614
-DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4
 DIST castaway-0.2.3.crate 11509 BLAKE2B bbecba400bf98ef4158581f3b1673ca77dbec3ad754d3749f0e9342a47d1fa9f638c1388f0762413277b73251854ade26e08dd85b7d7133c73a5750d4dbf7d92 SHA512 2565a4e5709a25118462ac25b9f741e92456c81ddbf7c4e791d8c647f2ca5227b2f59ffac108f9d32c77cedc12219c517218c51a78b1d22a1baef1bf2c16e0a9
-DIST cc-1.0.104.crate 79710 BLAKE2B 67248278ef46eada183d63377fc66ad83244c906b4a7d26a8363cc1e88dabb13e894ceaeb1c02f0444a0d7d2d2bc92075689b17de990348ec61e855ac473e97f SHA512 b8c9a3dcc685fd7c962f59ff96e1d60ee0bce290d9019d9d3035f49ac4d2806708a3266985e8d2e6fa8c9b36bcde8272b5ed7a6b258cbb8dc4cebeed69eb3b15
 DIST cc-1.1.8.crate 81843 BLAKE2B cdfa667bcfaca1e0c3719dc85a9a11525a6ee9bcbc8bfb32a99482c40c460b640f1ed1b61e25c076d87cfe4e98f40ce58a5e7ffd992d7a5bfe8cbfdf2dedd3eb SHA512 c5f98f6691dd4478551546687ef008027af315e18e6aeac482bd06848c8a5ecb4e564760f15790ff399d2e23b0ba31f53c27d36c2767de521961aeb85dfe0ef5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.34.crate 228932 BLAKE2B a2feab8d8b079209f8661fd8c5069f2a5fc3e5b0a6233187ace16f8f2ad8b4a147253e47af306cb31aacd82bdf490a8c8a171ad702b8dc22f9b934205d080c55 SHA512 2aaccde5e5ecaec744613429f807b3c34b92632973de7fdbdafd7ca510b917a23a0abc92a6497754d0d3368d684305648aec1fa2a0a61c88a100a20fab2348f1
-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 crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
@@ -22,32 +19,22 @@ DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e322
 DIST no-panic-0.1.30.crate 11789 BLAKE2B 11c9978e79fc55a259f4a6b16dc5df9b46e722301970722f9ede1133f3907e0d6c474eda5071f619f52e578c9afafcb94a80c3aa67843f0360db9d70d41f8a7e SHA512 c357be0341e7008662a79b1f3c8b749f90074553002dfa5177089116f4cceaeb062c1a2953acc91d63079d95a70fe550f1f02f47a96d7b09858d60e72be26bb0
 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 orjson-3.10.6.tar.gz 4939742 BLAKE2B 89a862ccf4c9de04513d608ca60cdbf493d580b75c2cff53168302a2ee50178a1ac140231637ae7b38052e6b6c8a624f2eda2d2724feb6ea06ed6cb17922e954 SHA512 a3b6bfe4c9611ae62476490ccf9378135df2a714743df2252d247c8bf5724943d5717d2821d22305a854426e2be38cb9d40067aa892035414e8db5b26f1d90fb
 DIST orjson-3.10.7.tar.gz 5056450 BLAKE2B 81561f31e485e8479d407c5312a44509594a0cd50c09fa0d7013eb02794e358658f8abfaf22a930da8275d7cedf570539b6599fdba655c03a1e56f1e85027824 SHA512 3940b76039d6494626e69f9a2a0373779827c6686ab1321411f3b3a5056e0df227b68c9555796ce45f3952fe597c50740934d764f30dcf8bc1c84b2baf4b6631
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-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-ffi-0.22.0.crate 67420 BLAKE2B 65e4ed1a1ce854f37380aa23637a494226b98941b9e3f13eae8f627db0fea248c3cc93c7e594090407ab169cfdb27ab20c47f7004f2b4646103ee34da9a55f31 SHA512 cede32dc8025badcdd6d00b4a1204c6ceb5ad30fa0b637deecca669f2ee2b8961f88d9d867caa8cae59f498dc4e1c15f3b4049c5f47615e215b0f289fc560bce
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
-DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.205.crate 78248 BLAKE2B c50ae85cc9fc922ea868cc6137e18885cdecdb58fe7ed6980cbed30209180dce17173254ec1bf238150720389c0ba6ef8bbb309a371455fa6ddfcdbb07664e70 SHA512 1ce1b680f573e0d9d15c7ee243f36cff3d425560d62c0ba50201e0e76aeb5390a17122bbd95440d9ed60d83a056a2c08d49c046fb989af063e754fd501500bf3
-DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.205.crate 55886 BLAKE2B 3744050608d782ac8250ad94f3b16bbf7b44690a691a062caad1943823c9af1207c83e09a3848b6c4f492a0fae4b031b68bc2a5b93931a265a2c4e6bff274401 SHA512 4b5999eaf8990c98c273cbd9b283eba45eb9a1b1a0dffa7e51608ba6328ac623af4cfefdca8b7154dbd754d6b56163ee79b1e8d93c14f4d33fd21c1df4738d74
-DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
 DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160
 DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
 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.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
-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 unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unwinding-0.2.2.crate 26818 BLAKE2B 14e918929cb6d7f2d0e1698ab425658353549d83a66733f05d172344a5b6b319c977576d48601ab5f363f5f7b552ec6049a4f291382885f295a1549c0b043ae0 SHA512 0fb87c31dcf607a01f6600fee2a4c87e8d2864603b71b060e3cfcc14f96ffd351e39e8217e8c8a39ef3e550dbe923befa5294367c64edf42bebb3df6878047dd
-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 xxhash-rust-0.8.10.crate 20066 BLAKE2B 5fca80ff05e00d5f78c2655093a963b08a16d2bd40e74e53c9e48e9812f81d668f9d60cd23872cb76ecb643cd381eddb841da5ba93a5f9fc92e42e6d8bb7e871 SHA512 c5a66c4c7a30dffe9d925dbfa8d0b5ae5b825770cb5d52a0d5de2eadf24c9af1b08b11b2e7a94ce60a30dabb2ce61cd3066cc781d05c90bc6a9d46daa2e04b71
 DIST xxhash-rust-0.8.12.crate 21329 BLAKE2B e9596bb83cd0f0465c279deecaf4dd87aac05db1c8c7d3aed4f0689022c5a0522d976379fb3dcf6cfe1c18452c87890e95f3d17998c777d92f5cbe58119a20a9 SHA512 6fd17ec65be94b58f109b6aa9bb283e51092621e8af624f8c2c2c95558a3d0461d743cb8a65a0da5853ff7fd98273daec0dcc5b632440868524f99894beeff3d
diff --git a/dev-python/orjson/orjson-3.10.6.ebuild b/dev-python/orjson/orjson-3.10.6.ebuild
deleted file mode 100644
index e80372103b31..000000000000
--- a/dev-python/orjson/orjson-3.10.6.ebuild
+++ /dev/null
@@ -1,91 +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=( python3_{10..13} )
-
-CRATES="
-	arrayvec@0.7.4
-	associative-cache@2.0.0
-	autocfg@1.3.0
-	beef@0.5.2
-	bytecount@0.6.8
-	castaway@0.2.2
-	cc@1.0.104
-	cfg-if@1.0.0
-	chrono@0.4.34
-	compact_str@0.7.1
-	crunchy@0.2.2
-	encoding_rs@0.8.34
-	gimli@0.30.0
-	half@2.4.1
-	itoa@1.0.11
-	itoap@1.0.1
-	libc@0.2.155
-	no-panic@0.1.30
-	num-traits@0.2.19
-	once_cell@1.19.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.0
-	pyo3-ffi@0.22.0
-	quote@1.0.36
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.120
-	simdutf8@0.1.4
-	smallvec@1.13.2
-	static_assertions@1.1.0
-	syn@2.0.68
-	target-lexicon@0.12.14
-	unicode-ident@1.0.12
-	unwinding@0.2.2
-	version_check@0.9.4
-	xxhash-rust@0.8.10
-"
-
-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-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	>=virtual/rust-1.72
-	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.7.ebuild b/dev-python/orjson/orjson-3.10.7.ebuild
index 743e8e21d6e7..ad2febde0e89 100644
--- a/dev-python/orjson/orjson-3.10.7.ebuild
+++ b/dev-python/orjson/orjson-3.10.7.ebuild
@@ -66,7 +66,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	>=virtual/rust-1.72
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 0f05f548d9c5..267a25b734bb 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1 +1 @@
-DIST oslo.concurrency-6.0.0.tar.gz 60373 BLAKE2B 24002c424894826f86d9fa7601d107ab04159ace9388944b615d4c1e35f54d5d8438b1a5021a3c3b0ef755d9b92382b9804fe8f7a84075feb7d7d523a4d1cbe9 SHA512 6a706e0590f6e29ab560e4133ffdb8dbd6c2cb2dc7cd16acd803ca93800a38223f57eec8c79698c9fe5bf47b1cdcbb89e1a98d3ea36f03a9ccee9da9ab39a0d9
+DIST oslo.concurrency-6.1.0.tar.gz 60320 BLAKE2B a1f4303b10e6e736395ee1597a35a26e7c959dc32895121e0576ddd4216b2edc5cd5383e7bedb776885f7d451e9232e08517b9b2bc92c0bfe8bef3c67541d3c7 SHA512 dfee864dae2f69d5e1ae32213bf09bffdd492131a04ba3df9ec9c9a793f2b1b6f4cae809977bf732bb310009116d762768adac4946afcfef49bd8dc993eee777
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-6.0.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-6.1.0.ebuild
index 51aad141098b..51aad141098b 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-6.0.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-6.1.0.ebuild
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 16dd266ea64e..ddaed0ef51d9 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1 +1,2 @@
 DIST oslo.config-9.5.0.tar.gz 161655 BLAKE2B 7844729658ddd13ff89b4c14983cfeeb3f6352f99a190058bd924592d9183459ea2da5caead7a77ed6c4a4e395aac2dd53f56847d81ce911ce76a04fa69f5b7d SHA512 517bb9fe416451eb791087216facd8643d77affb738aa2623817302dfc9dbd242d1aa2ba8c542fee437f91b2049129fa097fe37fec8c6a28e0092fc4d64c0c4f
+DIST oslo.config-9.6.0.tar.gz 164859 BLAKE2B 251e75d3ed919f2fce1efcd3aa5695da6e7911972ac89065813ef0c5b2b96fc02c436362875bf965b70e149d4436080ab23092f8f17568324e30eec7befe25cb SHA512 ebf31035bdf6f4ac8a9ce6bef14ca52fcad4418696520f0c199058211dbaa37723273a7c07eded03b139426392d7df6b192381af23e2324a92632029b1031292
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
new file mode 100644
index 000000000000..f105b7719199
--- /dev/null
+++ b/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 000000000000..764961e742d4
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
@@ -0,0 +1,63 @@
+# 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-context/Manifest b/dev-python/oslo-context/Manifest
index fc7816b78973..96630e99ad41 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1 +1 @@
-DIST oslo.context-5.5.0.tar.gz 34832 BLAKE2B 5131efed421d925ae311a31dba9b39cb881195493524e1ca9562aaef4b7bd81700cc23f004c04797dea59d136d274aca71e0d0a9377e133edfe0f51f0fca2341 SHA512 89b6aff1f0b01b64e3c7aa4e03e3a633a4b722514ac23d9b261449fd0cf0950077d801bbeae8c8542634c7336577dfbcad81bec8fad5e00a8c34d3a32412cb8c
+DIST oslo.context-5.6.0.tar.gz 34632 BLAKE2B 2aace96e2ac59fa50411d692b555e3f895288075f61f2221de9204e2f3a3e68a8aad6bb77affde12f239550f204abc44593e9bece5f7f8214980e74a4901f6df SHA512 2c4bb27fe12bf13ca11e23dcc1f1c4456fa0052956c357d5ef369f3775ccc0c1517c365ce898c21435876086118da10149e07cb540cb3f48e6dc008642d6d841
diff --git a/dev-python/oslo-context/oslo-context-5.5.0.ebuild b/dev-python/oslo-context/oslo-context-5.6.0.ebuild
index 936d37d3bcde..936d37d3bcde 100644
--- a/dev-python/oslo-context/oslo-context-5.5.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-5.6.0.ebuild
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 2d67e2ff6f68..0591ef387e5a 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1 +1 @@
-DIST oslo.i18n-6.3.0.tar.gz 48207 BLAKE2B 20a882516dd45da8dda34127ba422a619decd982f01adeee5909b8646d49c8609ecb6adad4fc48ab32e820c4dcf4a42d4baf7e776983daf4586ae944b738bb6e SHA512 483ff39425b3fc5c6c54a3502a78a53406ccb3cdb7aff0836b9c2a49b8146fd931e2b4f3133d708d33d16bd99155f8cbcf8505491d74de5016da5e647a069a15
+DIST oslo.i18n-6.4.0.tar.gz 48196 BLAKE2B 14a366d1042f288133a3a15ca14264446a6775318ab7347331b91fe4f36149c1592d920e6ce309a0db2ba8bb76209f2b6c917b4de8733427f3f9afd46bd7a295 SHA512 f68f5fb731175086f99f8a74e734f81fab4a19de3ce087279a55b7ec6df9a30a2eb70325faf2f3228fe11bb808d11b5f87eef93cc55e5b33ce4ed4e881d3915b
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.3.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.4.0.ebuild
index b5c37b7e4247..b5c37b7e4247 100644
--- a/dev-python/oslo-i18n/oslo-i18n-6.3.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-6.4.0.ebuild
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index cefdf3cec287..8ce2d916d187 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1 +1 @@
-DIST oslo.log-6.1.1.tar.gz 95558 BLAKE2B 04897e2f568dc634ee49a0980aa19ebd967dfb758840bdf3029c52d00481492ee43b7dc93a427de2c61edf8ef2f7819344263c282068acec835ea8c669d9e0a0 SHA512 2e5692dd3b59711139a3e049e5f167c456a6779f6eacb540d70ae7f2347062d6d635e5f9fa893919205b842958bcb3767e8a644466b06928623f8a569f2274e8
+DIST oslo.log-6.1.2.tar.gz 95653 BLAKE2B 2cbac1274b8409faeefe2dc1d070acb264a9f1089369eb11bd16dd2f62d978f060c4845b76e38fb9c18cd832d06f18ecfc60098adc28cd98693271d1584b1816 SHA512 5eaf8ac49a7658e60116cea20207687050c911e2d93361942fd33d4bc321f67e4cb48d47e15faba95e0e31f945b5d6b46442ae8b2d39c8603879677e8f2dad09
diff --git a/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch b/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch
deleted file mode 100644
index 916c6b132c2d..000000000000
--- a/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1bd9d229824c16f521fb1d3ba306fe8cb2a5aada Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny@gentoo.org>
-Date: Wed, 12 Jun 2024 11:22:48 +0200
-Subject: [PATCH] Fix test time mocking for Python 3.13
-
-Fix test_rfc5424_isotime_format_no_microseconds() to mock time.time_ns(),
-logging uses that function rather than tiem.time() in logging.
-
-Change-Id: I0cc429e2ea8ee7fef3b0a5662d584dac65d657ad
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
-
-diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
-index d17d20a..0580908 100644
---- a/oslo_log/tests/unit/test_log.py
-+++ b/oslo_log/tests/unit/test_log.py
-@@ -991,6 +991,8 @@
-                 get_fake_datetime(
-                     datetime.datetime(2015, 12, 16, 13, 54, 26)))
-     @mock.patch("time.time", new=mock.Mock(return_value=1450274066.000000))
-+    @mock.patch("time.time_ns",
-+                new=mock.Mock(return_value=1450274066000000000))
-     @mock.patch("dateutil.tz.tzlocal", new=mock.Mock(return_value=tz.tzutc()))
-     def test_rfc5424_isotime_format_no_microseconds(self):
-         self.config(logging_default_format_string="%(isotime)s %(message)s")
diff --git a/dev-python/oslo-log/oslo-log-6.1.1.ebuild b/dev-python/oslo-log/oslo-log-6.1.1.ebuild
deleted file mode 100644
index 0715254b3851..000000000000
--- a/dev-python/oslo-log/oslo-log-6.1.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=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
-
-PATCHES=(
-	# https://review.opendev.org/c/openstack/oslo.log/+/921842
-	"${FILESDIR}/${PN}-6.1.0-py313.patch"
-)
-
-src_test() {
-	# requires eventlet
-	rm oslo_log/tests/unit/test_pipe_mutex.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/oslo-log/oslo-log-6.1.2.ebuild b/dev-python/oslo-log/oslo-log-6.1.2.ebuild
new file mode 100644
index 000000000000..bd790bf13830
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-6.1.2.ebuild
@@ -0,0 +1,52 @@
+# 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="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/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 90b520ae0918..5a3f45fdda60 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,2 +1 @@
-DIST oslo.serialization-5.4.0.tar.gz 35070 BLAKE2B 2a6af45234083f57d964f18d36eb00b59ce6f32927fd93696bbfaa705b574a8c335db9583b2d6fb72d8b6712b1b5e6b30c943a4130b5ff3fc5766c3fce09e4a5 SHA512 00c9dae7cf254fe0fba49b25bb2d150902bd3a0a88cff922853358374bc855e8b79bef111065aaf62966c98a97605d0a0f18b5d007f36a943d9bdeb8ca69783b
 DIST oslo.serialization-5.5.0.tar.gz 35102 BLAKE2B 7ac9ef1d35c3f1a7396456bc9b29d8c3100d9c62e72e90dd9e75bfe27e7416bc9c31ed41155bd5197e95536400b409d7f878819535511b2c805d2bb4111ea880 SHA512 51043ae3d27c5a9dc482234a95a175722d56dc35294cb34845e8d34e6de5d1b49a16a1cd5c84a4d51b595be77c76e9bb322054f61d6e5e5948f8fc48a8dd3294
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.4.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.4.0.ebuild
deleted file mode 100644
index 2d202085c00c..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-5.4.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
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.serialization/
-	https://github.com/openstack/oslo.serialization/
-	https://pypi.org/project/oslo.serialization/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
-
-python_prepare_all() {
-	# remove spurious rdep on pbr
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild
index d14414d55783..2d202085c00c 100644
--- a/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 4770ec0ef2bf..54efb3df4df9 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1 +1 @@
-DIST oslo.utils-7.2.0.tar.gz 104768 BLAKE2B 0972bd65eb4619af96a8a15a48429abf20987449ab4e480adecd3260b1440d8911bc68464c98e8020113dfe6039e409b60be22f56de43a4aa80ba98953dea93e SHA512 3f8d7dd8e629b13c8491b4a3498ecce27937d904ca3de4df9a9e3c638fc1ce894ae29e0797c25de0886f2c9b471feabd4ff09380ba71bd6c28f0d543e489f654
+DIST oslo.utils-7.3.0.tar.gz 132561 BLAKE2B 98533d7b4e3111a548bfab4cb97854acb4485d84d89eed40fec713fcb14a63deedbf5c019f4ed44d9be535034f3323e96b9b9f5d30467899ea8cd1bdc217200b SHA512 71dcf6fe25cc4c0a2580c32b4a4ceaa22fa1046f84bebc2cbf2c3148379b569638c2e2cce3b7a9bb1bbb87660034baa199bd4a831baa4608ef2f4bbc1d39edb6
diff --git a/dev-python/oslo-utils/oslo-utils-7.2.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.2.0.ebuild
deleted file mode 100644
index 84903761f712..000000000000
--- a/dev-python/oslo-utils/oslo-utils-7.2.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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.utils/
-	https://github.com/openstack/oslo.utils/
-	https://pypi.org/project/oslo.utils/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	<dev-python/netaddr-1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# require eventlet
-	rm oslo_utils/tests/test_eventletutils.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/oslo-utils/oslo-utils-7.3.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.3.0.ebuild
new file mode 100644
index 000000000000..a0114e628296
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-7.3.0.ebuild
@@ -0,0 +1,56 @@
+# 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 Utility library"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.utils/
+	https://github.com/openstack/oslo.utils/
+	https://pypi.org/project/oslo.utils/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	<dev-python/netaddr-1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	dev-python/tzdata[${PYTHON_USEDEP}]
+"
+# qemu needed for qemu-img
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		app-emulation/qemu
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# require eventlet
+	rm oslo_utils/tests/test_eventletutils.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/paginate/Manifest b/dev-python/paginate/Manifest
index 2289fdca573a..c0603a99ca12 100644
--- a/dev-python/paginate/Manifest
+++ b/dev-python/paginate/Manifest
@@ -1 +1,2 @@
 DIST paginate-0.5.6.gh.tar.gz 15567 BLAKE2B c5b60ad43c61a918c618668b345cae82e5e61516aa73130339830db8b8d1d49d271ed24bf9379c570ef8ae9de0844ff8e088820c7e128e1e6e77a03427c06596 SHA512 64d7d1a9952dc8ae5894113c381a9cdca5395477091d794774ed770f1e1dfb6a5d88a7bd07cc4fca0c0c8f708656261f3160b315af6f86ecc5b7f46e1d639150
+DIST paginate-0.5.7.gh.tar.gz 16751 BLAKE2B bc109607876b214572707cbfda25e35b57c80fc6947838ff31feab9299f3a51ad91df44dc5b5040583084a64609cb3156c9c344906f3b719cf55832a2bbe348d SHA512 f0e1957ff7b9177f052ae985e103b93acd55c9390bc06479926ccdc288343720214a02d2de46700caceb07d934d33baabdc364fc8cbd997a29fb433383892405
diff --git a/dev-python/paginate/paginate-0.5.7.ebuild b/dev-python/paginate/paginate-0.5.7.ebuild
new file mode 100644
index 000000000000..e89c4cd893d9
--- /dev/null
+++ b/dev-python/paginate/paginate-0.5.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023-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="Divides large result sets into pages for easier browsing"
+HOMEPAGE="
+	https://github.com/Pylons/paginate/
+	https://pypi.org/project/paginate/
+"
+SRC_URI="
+	https://github.com/Pylons/paginate/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		python3.13)
+			;&
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# these tests assume that dict is not sliceable
+				# https://github.com/Pylons/paginate/issues/19
+				tests/test_paginate.py::test_wrong_collection
+				tests/test_paginate.py::TestCollectionTypes::test_unsliceable_sequence3
+			)
+			;;
+	esac
+
+	epytest
+}
diff --git a/dev-python/parse-type/Manifest b/dev-python/parse-type/Manifest
new file mode 100644
index 000000000000..a30d1098240c
--- /dev/null
+++ b/dev-python/parse-type/Manifest
@@ -0,0 +1,2 @@
+DIST parse_type-0.6.2.tar.gz 69720 BLAKE2B 76deaacc1824f701db74fbdd971b1dd8131f6d45f329e64f6eae993d6a41cebebb44c0653813bcb625e335bae5a81853c8c3704c0f102ebad96a38f43826059c SHA512 d614b105696baf135a7f8c84f751a2491dc7558cadf1c3891f1223f6196a7b041c499f3df4902b04daca5e6507522ec0f99533b6b1d027773a15f7738a574958
+DIST parse_type-0.6.3.tar.gz 78224 BLAKE2B 079930e12abbc5e01ad29a92dfd4eabcd4ab80803084875cf63e8812e75ec4d469496e0416c5699da89e8c4da56c1a3ab10a48f9920a926aa6ab988ca52131e9 SHA512 babcc8e47cb1933fcd07e1860b07cdefe2e236c2900b1a3eac7982d32b0320b02647a813d4d20def7df1fab8ba9621d5a5c02fa2147f6fff880d1449f61ef38f
diff --git a/dev-python/parse_type/metadata.xml b/dev-python/parse-type/metadata.xml
index ccc39e8d1dad..ccc39e8d1dad 100644
--- a/dev-python/parse_type/metadata.xml
+++ b/dev-python/parse-type/metadata.xml
diff --git a/dev-python/parse_type/parse_type-0.6.2.ebuild b/dev-python/parse-type/parse-type-0.6.2.ebuild
index f54fa6807930..f54fa6807930 100644
--- a/dev-python/parse_type/parse_type-0.6.2.ebuild
+++ b/dev-python/parse-type/parse-type-0.6.2.ebuild
diff --git a/dev-python/parse-type/parse-type-0.6.3.ebuild b/dev-python/parse-type/parse-type-0.6.3.ebuild
new file mode 100644
index 000000000000..26c1e370f536
--- /dev/null
+++ b/dev-python/parse-type/parse-type-0.6.3.ebuild
@@ -0,0 +1,31 @@
+# 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 pypi
+
+DESCRIPTION="Extension to the parse module"
+HOMEPAGE="https://pypi.org/project/parse-type/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DOCS=( CHANGES.txt README.rst )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# disable unnecessary html test report and its pytest-html dependency
+	sed -i '/^addopts/,/report.xml$/d' pytest.ini || die
+}
diff --git a/dev-python/parse_type/Manifest b/dev-python/parse_type/Manifest
deleted file mode 100644
index eb79399eb3d8..000000000000
--- a/dev-python/parse_type/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST parse_type-0.6.2.tar.gz 69720 BLAKE2B 76deaacc1824f701db74fbdd971b1dd8131f6d45f329e64f6eae993d6a41cebebb44c0653813bcb625e335bae5a81853c8c3704c0f102ebad96a38f43826059c SHA512 d614b105696baf135a7f8c84f751a2491dc7558cadf1c3891f1223f6196a7b041c499f3df4902b04daca5e6507522ec0f99533b6b1d027773a15f7738a574958
diff --git a/dev-python/paste/paste-3.10.1.ebuild b/dev-python/paste/paste-3.10.1.ebuild
index 6479167f15c5..208d2e29bc96 100644
--- a/dev-python/paste/paste-3.10.1.ebuild
+++ b/dev-python/paste/paste-3.10.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/pastedeploy/pastedeploy-3.1.ebuild b/dev-python/pastedeploy/pastedeploy-3.1.ebuild
index 022df87711bb..e4765663111b 100644
--- a/dev-python/pastedeploy/pastedeploy-3.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-3.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	!dev-python/namespace-paste
diff --git a/dev-python/patatt/Manifest b/dev-python/patatt/Manifest
index e81c25d6431c..e3d63302a3a9 100644
--- a/dev-python/patatt/Manifest
+++ b/dev-python/patatt/Manifest
@@ -1,2 +1 @@
-DIST patatt-0.6.2.tar.gz 34852 BLAKE2B 2dceb179dcb96d33f7ed3bfcdd96b69520cd413ee79bed4ecd09c6385b46a9b0c32fedf74d582d1aa7fb7aeb5d4e212a96c139b62a8ae155933271d7a2d8b493 SHA512 53140c71818fd0f101a0628b770e557a3c177cd0e7207d5933eb9e73b296dd870e9bb2ff9e77fd0b25652d937d98bb07a1413e555d466f3d108c01ddfdb06f3a
 DIST patatt-0.6.3.tar.gz 34827 BLAKE2B ff9ac8bf9fd6c8b950bac1a97a57e5d413a579e004d690d17d6a1dff107f284e1abc51e649b14ff148c5cbb0816838c66bd3e33313deb2d1d05d18da174bc843 SHA512 c8947f5d2351a06f544e88aa334294f28b6cfb51302009dd6f462579b98f154e7d6e49197b49e2545e93d6b8339bd72408e79a998d934ebde42dda44c4c4cbf8
diff --git a/dev-python/patatt/patatt-0.6.2.ebuild b/dev-python/patatt/patatt-0.6.2.ebuild
deleted file mode 100644
index f28ca2403e7e..000000000000
--- a/dev-python/patatt/patatt-0.6.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021-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 pypi
-
-DESCRIPTION="A simple library to add cryptographic attestation to patches sent via email"
-HOMEPAGE="https://pypi.org/project/patatt/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/pynacl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pathvalidate/Manifest b/dev-python/pathvalidate/Manifest
index c0fa5e10012e..bc5035f9febf 100644
--- a/dev-python/pathvalidate/Manifest
+++ b/dev-python/pathvalidate/Manifest
@@ -1 +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
diff --git a/dev-python/pathvalidate/pathvalidate-3.2.1.ebuild b/dev-python/pathvalidate/pathvalidate-3.2.1.ebuild
new file mode 100644
index 000000000000..36de8aba0354
--- /dev/null
+++ b/dev-python/pathvalidate/pathvalidate-3.2.1.ebuild
@@ -0,0 +1,31 @@
+# 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="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/pbr/Manifest b/dev-python/pbr/Manifest
index 3d2779411bd6..4dc76d64f6bf 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1 +1,2 @@
 DIST pbr-6.0.0.tar.gz 123150 BLAKE2B ed41fcf9febc11fe664d3045a8ac01f7a549f770e359b29045508653bffa838d91797c4aec5d5d1eba97907e83fb199f78afa4fd6f0b6be6b93b2e5f781d4425 SHA512 35cb184b02c9bc38e839e652d1f114197b2a82255f824253e156666a07dee1d19823ab4f2fb17b1f4376c775295f533e006cb58136ee978f9989e98a3f782120
+DIST pbr-6.1.0.tar.gz 124032 BLAKE2B 640c39d75329e4a1c28623439fd1466de3e491bb043abc1c62c68a9e19c6bc5523fca8ad18c4d6246fe2973af5ee6076c1e74e0967b9adb096ec31970fcf8491 SHA512 30478fa3146abdbc1da35ba950dcc3ead04e26060e0926a7a28390cc33cfae5acbb9a2385535bac43cb40830ef7cfa83be8bf963a6ee135a54d696c27b20a962
diff --git a/dev-python/pbr/pbr-6.1.0.ebuild b/dev-python/pbr/pbr-6.1.0.ebuild
new file mode 100644
index 000000000000..ec6ff6fedc93
--- /dev/null
+++ b/dev-python/pbr/pbr-6.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="
+	https://opendev.org/openstack/pbr/
+	https://github.com/openstack/pbr/
+	https://pypi.org/project/pbr/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and
+# https://bugs.gentoo.org/show_bug.cgi?id=561038 docutils is needed for sphinx
+# exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 stestr is run as
+# external tool.
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# TODO: investigate
+	sed -e 's:test_console_script_develop:_&:' \
+		-e 's:test_console_script_install:_&:' \
+		-e 's:test_setup_py_keywords:_&:' \
+		-i pbr/tests/test_core.py || die
+	# network
+	rm pbr/tests/test_wsgi.py || die
+	# installs random packages via pip from the Internet
+	sed -e 's:test_requirement_parsing:_&:' \
+		-e 's:test_pep_517_support:_&:' \
+		-i pbr/tests/test_packaging.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Testing on ${EPYTHON} is not supported at the moment"
+		return
+	fi
+
+	eunittest -b
+}
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index 03de50b2b8da..2ddb522a6b5c 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,2 +1,2 @@
-DIST pdm-2.18.0.tar.gz 2628627 BLAKE2B a2f7b8ec5a53667e4eaab5f57a583727141000d8cb83be72fc2e2e1045a984eecc4f1611e683096e03283b9630d970cd3654b7b2c5c305e74f8d901b0b3eaa07 SHA512 106b9872435b85a9342d9b60531512d25cdd1c02c9a6b27d06b3f88cdc7803152180221e601d6fa6982fa0c5d735bd159fa1a163ada152e5909d1df63b2bf399
 DIST pdm-2.18.1.tar.gz 2629023 BLAKE2B e1d165d7e00c28cd9153492c66fba108b3e200226c94db77f12cfd8896eb07f76f9ecdb734dbbcdc840648ed0ad9749556efe61db98cfcc2ae395f5788f9aabf SHA512 06751e71a514b4c8ea18abade7fa216ede454a772f5fff371af776222ac288c43365d1758ad52ceaa65734de2308e96560b1ac1a9f67586d93f6c70550b0e49e
+DIST pdm-2.18.2.tar.gz 2629592 BLAKE2B 74b128e60409ab7d374a195f30124802af7cdd1c2857d2b925e633a974e752706236570b6ec1fa0827a081427156e7bb858a0385696ce6fe49ace83cd5aea95f SHA512 87187e0b036e7f462bd23e92a4dbf402a3b9ced6679acc08b0645369d463d2bb257853858f7e7bc2416749dd2233e94aaaa206febe0aa35b80e6d23dde88b7b8
diff --git a/dev-python/pdm/pdm-2.18.0.ebuild b/dev-python/pdm/pdm-2.18.0.ebuild
deleted file mode 100644
index 12cd48bf7b07..000000000000
--- a/dev-python/pdm/pdm-2.18.0.ebuild
+++ /dev/null
@@ -1,119 +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/blinker[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/truststore[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/hishel[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.16.0[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	dev-python/installer[${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
-
-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.18.2.ebuild b/dev-python/pdm/pdm-2.18.2.ebuild
new file mode 100644
index 000000000000..603ffb324045
--- /dev/null
+++ b/dev-python/pdm/pdm-2.18.2.ebuild
@@ -0,0 +1,119 @@
+# 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/blinker[${PYTHON_USEDEP}]
+	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/hishel[${PYTHON_USEDEP}]
+	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
+	<dev-python/findpython-1[${PYTHON_USEDEP}]
+	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/installer[${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
+
+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/pefile/Manifest b/dev-python/pefile/Manifest
index c776143f6b89..9bbd3bcb3026 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1 +1,2 @@
 DIST pefile-2023.2.7.gh.tar.gz 74852 BLAKE2B ddca4b8ef37af829bb1757eb4c4ba9f46c3914e05e6c13e13a8e5a3c88a608aba486deec9338400fddae4591867c0c7dcf7325cee14d42b1bb724751a3a2a7f0 SHA512 241d9846954f094ed39e61d80e7d8c1612829ec909650175e75657f9cf69c9bef9e2a115d4106bb14757125c0ffaa3e93abfb2f078e80326e78ac5818c7c2fd3
+DIST pefile-2024.8.26.gh.tar.gz 76008 BLAKE2B 7f21d07bbe9a08239739f589e35d0ef4b5172e26b2a90acdbedc7792be70fdb0d4ee01888d674384fb011f3c716406c1b1a23b29fa412ce01863cae89acbc4bc SHA512 62781f2ab84040a13304ce550dd1e943991df152c5f2951281906e837b1659694051a074ff49cd08d5d508e9b70009b56418a4237511c4464c4eba9bda4bccf7
diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild
index 2f55fd3023a6..8f961570806a 100644
--- a/dev-python/pefile/pefile-2023.2.7.ebuild
+++ b/dev-python/pefile/pefile-2023.2.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit distutils-r1
 
 DESCRIPTION="Module to read and work with Portable Executable (PE) files"
diff --git a/dev-python/pefile/pefile-2024.8.26.ebuild b/dev-python/pefile/pefile-2024.8.26.ebuild
new file mode 100644
index 000000000000..3eecccc699f3
--- /dev/null
+++ b/dev-python/pefile/pefile-2024.8.26.ebuild
@@ -0,0 +1,27 @@
+# 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="Module to read and work with Portable Executable (PE) files"
+HOMEPAGE="https://github.com/erocarrera/pefile"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
+# suite inside the release files. The test fixtures in the source repo is
+# encrypted so that only their CI pipeline is able to run the tests.
+RESTRICT="test"
diff --git a/dev-python/pefile/pefile-9999.ebuild b/dev-python/pefile/pefile-9999.ebuild
index 7f530f4c4bec..3eecccc699f3 100644
--- a/dev-python/pefile/pefile-9999.ebuild
+++ b/dev-python/pefile/pefile-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit distutils-r1
 
 DESCRIPTION="Module to read and work with Portable Executable (PE) files"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
@@ -24,3 +24,4 @@ SLOT="0"
 # Unfortunately there is nothing we can test here. Upstream doesn't ship a test
 # suite inside the release files. The test fixtures in the source repo is
 # encrypted so that only their CI pipeline is able to run the tests.
+RESTRICT="test"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 0e2e92616217..ba9fffe598f9 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,3 @@
-DIST python-phonenumbers-8.13.40.gh.tar.gz 4914854 BLAKE2B eab8e8e28a5895f9eb92ce9198a77a4d9bfd6f3d58f17c5a7909913ea43af2efd1dcff84c9d517c5f4f17ba87ce68786ab64f523b10ddf6aa3354801021843d3 SHA512 ef2199d86998201485d48cf4d5d56baa82476dbe41b2b4f89aebfcbf840af0ae35a78308a0f74b2daad58a2c330e10444c93ffb59a402d5fe5cc5baff78fdcb2
-DIST python-phonenumbers-8.13.42.gh.tar.gz 4915152 BLAKE2B 4abdd4e583e09f7915203f8b9a7908eeae7c57910b21e3fd2d8bccef4ba799ddb13299ff0a9fa307665c08955923f3f56a56893b5fa1ec0ccb102feda286aeed SHA512 21cb0093486d3f29f1ed7b9ce9a0caa06df854ef2f4120c345f07ad7a73e374bf94e8f7844e29f71157f5b645423385ae39d3ec6a0ea6bd35a77881e76b9afb9
 DIST python-phonenumbers-8.13.43.gh.tar.gz 4916529 BLAKE2B 78f904af583fe4390ddd0d8f0838634a1e898ee93187a676b9bf409301c03e392d6e7404f30ae5d3b36d36809db647f749d48ea5e0b48f2db904a47513952433 SHA512 80df3d5bdb4ad7a32d4e1c1b3f7a4db473e21b9ff7e260fba5bc814e96067e042c81e805c3eb8494b31d2ecf3a0a73689ba2fc9714a9e8e7fe8098a7d13beb5b
+DIST python-phonenumbers-8.13.44.gh.tar.gz 4912993 BLAKE2B d579e9c17e8c78390ce93832d53a50e9aaed0c186a1430119c54a22ef6af65ad2bac42cd082278bdca0f0e32762c7d0b7e90d28f1998fdf8b5cc2544b241e7f0 SHA512 64eec22c997d1f0d775445a829d63c7568e943411522f4d55fdf4fd18b1c680c48396b056492f27f6275e83c7bcd53ecc5c6258beeb24d5a7e218011c50b5a35
+DIST python-phonenumbers-8.13.45.gh.tar.gz 4913395 BLAKE2B 78cf1a38dba34f4c989b39b676fcb0e78369a41cb7882fe59e48b9c36af9471082153a194ba75b72e7b25515eb0bcb7749eb0af78175f49c2933e17efc13c263 SHA512 28abdd0ae5f28b38c5279a850ee36812ddcd8eed6f57c9f1e816406c25896e6fdc547d7802ddd4b97a9253c3962946a8c17aa4c96e6a62823a9ae80c74a16024
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.40.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.40.ebuild
deleted file mode 100644
index 154cbd60212d..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.40.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..12} )
-
-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[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.42.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.42.ebuild
deleted file mode 100644
index 2fc9bdbaa7c9..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.42.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..12} )
-
-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[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
index 43eeff396e3d..ac05eba6ee74 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
new file mode 100644
index 000000000000..43eeff396e3d
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+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[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
new file mode 100644
index 000000000000..43eeff396e3d
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+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[${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 f3fa1e18bdc3..87e130bf2762 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,4 @@
-DIST pikepdf-8.11.2.tar.gz 2870263 BLAKE2B 6cf3666baca5d20b125efc3f6d8cfe7f96b9334b8a39da67fe3f4185f41232d8a18bf902f21bfe33e4259b7fb61e7dc462a247c76bf4564a3bdf0ea987119d91 SHA512 57bf5d16aaf9367eef9407f7f406a5ee74f2060d276ab861379c74c2193d02b2e3cca0925ee29813791bb36fae8dbbba4a9b16a7f4c2d19c67c21bbe7bb3f80f
-DIST pikepdf-8.14.0.tar.gz 2870612 BLAKE2B be0fd5a8d48fccc7695c45acc28cbda8252529d0687197c261e077e8c3a63e3597e504bf2aae2ab09648c0f127228d517bfa630ed77ea90bc28c8f3463854779 SHA512 f0e073df952cd850e0529fa798743a09f249a998450be1393b109b21850cf86b80c8813b55db778dc4e265df48af7619fccfac30ec9195c3ac724b8c7724e858
-DIST pikepdf-8.15.1.tar.gz 2870723 BLAKE2B 958bb2a417e2f1c9e5e4448b47cdadffb10e82841cc8173503881a86e92e85c05f800a8ad6936f32ee53e6f7a8cd62ee9e28e251de1f32a7cdce055139ec5fa3 SHA512 ae6b0b8bdf7e395943caf503f1d498861bd2719185e6382a522b8c0d4e38413a1b070e912367852bc5735d29b8453d05c57ff384ede825830722470445a534f6
-DIST pikepdf-8.4.1.tar.gz 2853305 BLAKE2B 2298514159db17ba49b8e2fa2407d60de50273bea111ece704251d99193bdc4c8ed77f624237a49c3f4f129e3b14ac4ddd1006cf3024bcbf822bc5523e0fee35 SHA512 6989e8a3888f612e453ec1ea8425c0ca35ccfee19ae5e8c32df136ebc3fbb7728d9fe5beaacb4e392a20c9037a1009fc8f8d53d73634427fb0df9103626e34fa
-DIST pikepdf-9.0.0.tar.gz 2868331 BLAKE2B 6735938fd2c0e8bb6a5fb40896350a2caa2ee20f8982010574a4e682c8ff19d01bc6773d30f78e2d4a5d58496de9dfa8fe9584f1c954205ed4832753addbd373 SHA512 15248d523cebdfbfcd7a5f8b6144b7dc8371612bd77ba3847af1ce626b5d87780911346d3c61bfe7cef545a19f1863c1a4048b35ace56f2cb62dcb962272829d
-DIST pikepdf-9.1.0.tar.gz 2869103 BLAKE2B 39750e280caa2393b69a5c3c841afa9cbb0d5701a20ae9ca4e9a57088cae47e2dd33ca8b605b0b096df131b578a4cdc71eb8696d12b2817426b35a8b13668460 SHA512 0fbf1ca151b6a234cd23a5148c9e8e4e033c5da5c935b4786fe6167555da7016c55b124dd2f9e8dc414c9782829f38412227820229a8459cc9dbe03220620fae
 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.2.0.tar.gz 2905389 BLAKE2B f38335075db489007eba582d57a72fd5fa268f89105dc528131c14d53547673cbffa96b376ba27e9b04dac3bab6770e80bb0ac865e7549eb1c00e4ea4eb3ba27 SHA512 0e2c5e647ccb24691c11eeb41569a8f7250fb8ca55a5c76aa1ae250c9fc49cd2bfe73db6f599928b14d46a678ef71b6e6f430e134d9891139176b90a2f853e17
+DIST pikepdf-9.2.1.tar.gz 2905740 BLAKE2B cee801fcb231f2537ce75555b10d68de9acc62e7824c26a00960293d056ae08dfd79607115ca110204af95bee99b57040ba408d47453636413c1291ba4e8e7cf SHA512 5b99272c3a98499770bb3120ead62ebdda731210e0305ec143809fcea7f978bf5dd4f4f7b90b6392af40b1e2c6e79a83e6a67d54a238fc398e38cf2bd675bc30
diff --git a/dev-python/pikepdf/files/pikepdf-9.0.0-py313.patch b/dev-python/pikepdf/files/pikepdf-9.0.0-py313.patch
deleted file mode 100644
index d0415daec69c..000000000000
--- a/dev-python/pikepdf/files/pikepdf-9.0.0-py313.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6831e87bb94322b7ca53964a57ba575861b5916c Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Wed, 19 Jun 2024 18:35:06 -0400
-Subject: [PATCH] Fix tests with Python 3.13
-
-The exception message changed to:
-```
-property '' of 'Page' object has no deleter
-```
----
- tests/test_page.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_page.py b/tests/test_page.py
-index 3e5cc345..05455a93 100644
---- a/tests/test_page.py
-+++ b/tests/test_page.py
-@@ -293,7 +293,7 @@ def test_page_attrs(graph):
- 
-     del graph.pages[0].Resources
-     with pytest.raises(
--        AttributeError, match=r"can't delete|property of 'Page' object has no deleter"
-+        AttributeError, match=r"can't delete|property( '')? of 'Page' object has no deleter"
-     ):
-         del graph.pages[0].obj
-     del graph.pages[0]['/Contents']
diff --git a/dev-python/pikepdf/pikepdf-8.11.2-r1.ebuild b/dev-python/pikepdf/pikepdf-8.11.2-r1.ebuild
deleted file mode 100644
index bbd2842097b5..000000000000
--- a/dev-python/pikepdf/pikepdf-8.11.2-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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} 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 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
-
-# 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.7.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}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-		media-libs/tiff[zlib]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fragile to system load
-	tests/test_image_access.py::test_random_image
-)
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
diff --git a/dev-python/pikepdf/pikepdf-8.14.0-r1.ebuild b/dev-python/pikepdf/pikepdf-8.14.0-r1.ebuild
deleted file mode 100644
index 342767bd45fb..000000000000
--- a/dev-python/pikepdf/pikepdf-8.14.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} 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 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
-
-# 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}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-		media-libs/tiff[zlib]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fragile to system load
-	tests/test_image_access.py::test_random_image
-)
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
diff --git a/dev-python/pikepdf/pikepdf-8.15.1-r1.ebuild b/dev-python/pikepdf/pikepdf-8.15.1-r1.ebuild
deleted file mode 100644
index c889e6cca1d6..000000000000
--- a/dev-python/pikepdf/pikepdf-8.15.1-r1.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} 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 ~ia64 ~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
-
-EPYTEST_DESELECT=(
-	# fragile to system load
-	tests/test_image_access.py::test_random_image
-)
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
diff --git a/dev-python/pikepdf/pikepdf-8.4.1-r1.ebuild b/dev-python/pikepdf/pikepdf-8.4.1-r1.ebuild
deleted file mode 100644
index 96db3b598947..000000000000
--- a/dev-python/pikepdf/pikepdf-8.4.1-r1.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} 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 ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# 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/deprecation[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9.0[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}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.{8..10})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fragile to system load
-	tests/test_image_access.py::test_random_image
-)
-
-src_prepare() {
-	sed -e '/-n auto/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-9.0.0.ebuild b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
deleted file mode 100644
index 0ffb2c3ac36f..000000000000
--- a/dev-python/pikepdf/pikepdf-9.0.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
-
-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 ~ia64 ~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
-
-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
-)
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/pikepdf/pikepdf/commit/6831e87bb94322b7ca53964a57ba575861b5916c
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	sed -e '/-n auto/d' -i pyproject.toml || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
diff --git a/dev-python/pikepdf/pikepdf-9.1.0.ebuild b/dev-python/pikepdf/pikepdf-9.1.0.ebuild
deleted file mode 100644
index 83a7ea2c9370..000000000000
--- a/dev-python/pikepdf/pikepdf-9.1.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 ~ia64 ~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.1.1.ebuild b/dev-python/pikepdf/pikepdf-9.1.1.ebuild
index 83a7ea2c9370..e104fff9ae40 100644
--- a/dev-python/pikepdf/pikepdf-9.1.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-9.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
diff --git a/dev-python/pikepdf/pikepdf-9.1.2.ebuild b/dev-python/pikepdf/pikepdf-9.1.2.ebuild
new file mode 100644
index 000000000000..d9e18f34377a
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-9.1.2.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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.2.0.ebuild b/dev-python/pikepdf/pikepdf-9.2.0.ebuild
new file mode 100644
index 000000000000..4a41378388c9
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-9.2.0.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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.2.1.ebuild b/dev-python/pikepdf/pikepdf-9.2.1.ebuild
new file mode 100644
index 000000000000..4a41378388c9
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-9.2.1.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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-10.4.0.ebuild b/dev-python/pillow/pillow-10.4.0.ebuild
index f775161172b0..379545ad4d09 100644
--- a/dev-python/pillow/pillow-10.4.0.ebuild
+++ b/dev-python/pillow/pillow-10.4.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
index 17f6956620cf..ae24d0d4ee6c 100644
--- a/dev-python/pipdeptree/Manifest
+++ b/dev-python/pipdeptree/Manifest
@@ -3,3 +3,4 @@ DIST pipdeptree-2.21.0.tar.gz 39119 BLAKE2B 15f37f997b89477a9e1815a2bf120ce5251e
 DIST pipdeptree-2.22.0.tar.gz 39555 BLAKE2B 6aae7c6a22176dbfcc5184086c37b0237629f48702e1e2484457a6b3eca9442732279c85c3d806cff14edbbea9180d0ed3005c9744780016ee9949a0b530e3aa SHA512 9775d19cc353eae79e6fbe779471998a8368a932f380f34587950a6f4ef62d9185e77764c12cd122029c8690931a5a5939d57a9b1801db9556708676096c2efe
 DIST pipdeptree-2.23.0.tar.gz 39737 BLAKE2B 79fe45880f2942b2ded1d16e2767c4005aca52e0768a5723f37f764c7a60a8104a237ffe2a559f631bf760310143814b0e4afbaf1e5f3ef927828036c320da43 SHA512 9c5fdf7c6d3e519357d4aeb40f4aa2807dfec8fb387114cf40d99469becc68c5042af09f2cdebcca868dd78f3a3c1602b349dfe6cb581758c5c73efc3f6e52c6
 DIST pipdeptree-2.23.1.tar.gz 39883 BLAKE2B 63b578cc466871dda284f66bacc7e262b18157e5fb98e3a884c5e3eddd6945ad3d41a95e2e24fc23d0917e902f0e9ead152259d5ddc919e77e2940c2e2933119 SHA512 bc62c9cf6ee01bb8167477a21c70a7dd4ae1141c1c0690a1e95aea49cd4cb7d7e18bf076a532b00b79014a23c069df8aa09ac1bfd2d328b57e444192f1b10e5d
+DIST pipdeptree-2.23.3.tar.gz 39804 BLAKE2B deabb55937cca02bad8040c6625cbe2e1688af9fa349d7e74923d73c484022818a28074921d5811f0d8e9189184185829ea4dc4e3004ed5456fcc9ed340de2f5 SHA512 26b5d08a24e297d6f30f3a479ae7f93a71b12cf4bc5ae25ff907f96bf7bef8e5403654b359d79e81aed79fec7961e2b8c4db984e5222f677a33839a125e59343
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch b/dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch
deleted file mode 100644
index 5cc4b1ca580d..000000000000
--- a/dev-python/pipdeptree/files/pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/tox-dev/pipdeptree/pull/302
-
-From 8a2ccfe062d8978f010e2e4bd3f8e8b9e46ecbce Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 14 Nov 2023 08:36:09 +0200
-Subject: [PATCH] Expect hpy in pypy versions >= 7.3.3
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/tests/test_non_host.py
-+++ b/tests/test_non_host.py
-@@ -33,7 +33,11 @@ def test_custom_interpreter(
-     if implementation == "CPython":
-         expected = {"pip", "setuptools", "wheel"}
-     elif implementation == "PyPy":
--        expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
-+        # hpy added in 7.3.2, enabled in 7.3.3
-+        if sys.pypy_version_info >= (7, 3, 3):
-+            expected = {"cffi", "greenlet", "hpy", "pip", "readline", "setuptools", "wheel"}
-+        else:
-+            expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
-     else:
-         raise ValueError(implementation)
-     if sys.version_info >= (3, 12):
--- 
-2.42.1
-
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch b/dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch
deleted file mode 100644
index 3718174d0af6..000000000000
--- a/dev-python/pipdeptree/files/pipdeptree-2.13.2-fix-pypy-7.3.14.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/923893
-
-From 5d111ebe3bb1d24baa314b615d67d3e3928297ca Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Wed, 7 Feb 2024 08:47:03 +0200
-Subject: [PATCH] Use json output for test which parses installed packages
-
-* pypy bundles hpy which has a dependency on setuptools, therefore
-  breaking non-json output due sub-dependency pretty printing.
-* Using json makes parsing dependencies straight forward.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/tests/test_non_host.py
-+++ b/tests/test_non_host.py
-@@ -1,5 +1,6 @@
- from __future__ import annotations
- 
-+import json
- import sys
- from platform import python_implementation
- from typing import TYPE_CHECKING
-@@ -25,10 +26,10 @@ def test_custom_interpreter(
-     monkeypatch.chdir(tmp_path)
-     py = str(result.creator.exe.relative_to(tmp_path))
-     cmd += [f"--python={result.creator.exe}"] if args_joined else ["--python", py]
--    monkeypatch.setattr(sys, "argv", cmd)
-+    monkeypatch.setattr(sys, "argv", [*cmd, "-j"])
-     main()
-     out, _ = capfd.readouterr()
--    found = {i.split("==")[0] for i in out.splitlines()}
-+    found = {i["package"]["package_name"] for i in json.loads(out)}
-     implementation = python_implementation()
-     if implementation == "CPython":
-         expected = {"pip", "setuptools", "wheel"}
--- 
-2.43.0
-
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.3.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.3.ebuild
new file mode 100644
index 000000000000..108d23b345f5
--- /dev/null
+++ b/dev-python/pipdeptree/pipdeptree-2.23.3.ebuild
@@ -0,0 +1,56 @@
+# 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 pypi optfeature
+
+DESCRIPTION="Utility for displaying installed packages in a dependency tree"
+HOMEPAGE="
+	https://github.com/tox-dev/pipdeptree/
+	https://pypi.org/project/pipdeptree/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# upstream lower bounds are meaningless
+	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock -p console-scripts
+}
+
+pkg_postinst() {
+	optfeature \
+		"visualising the dependency graph with --graph-output" \
+		dev-python/graphviz
+}
diff --git a/dev-python/pipx/Manifest b/dev-python/pipx/Manifest
index 34cc341788fc..ad65ee5494b7 100644
--- a/dev-python/pipx/Manifest
+++ b/dev-python/pipx/Manifest
@@ -1,3 +1,6 @@
 DIST pip-23.3.2-py3-none-any.whl 2109393 BLAKE2B 278b9941f93951508ae2f508b1b5a9fddd4ca11fac1d5b0c2ac994f8e8457226a4e8c4501078776476e0bae56fd82b989ebaf4f5f484ffe7b0ee79789e34aca8 SHA512 a1449fe400787f73ac26cb48acaae71208a2e696f9ce4992b44e11da29646b018c2f6c27a95b12e42531236fe658e0605e20d5dfa740c43e005c01da3db802da
+DIST pip-24.0-py3-none-any.whl 2110226 BLAKE2B 6a0c8c9796cd574ef1d709de40a8530a15e50158143e332b79e5ad3edceda6ce93c5ef4df49b169062598618dcc6967c2115ac2c10b05abf345318204f1eeffc SHA512 5d7462a584105bccaa9cf376f5a8c5827ead099c813c8af7392d478a4398f373d9e8cac7bbad2db51b335411ab966b21e119b1b1234c9a7ab70c6ddfc9306da6
 DIST pipx-1.6.0-test-shim.tar.xz 71508 BLAKE2B f6625796b733911aeee7157d726888ef251ef43a806008a07dadcc290a22d331494ab6906ab1f5e06bf11180d295c1c6445c1a3c4d20eafb0f19fdacef02becb SHA512 a30adb15c78c8f6f9febedf4a899c665bd185ae0e9dbb5278b962fab9d47164601e7f354f61dd600df856a16d9620a586f9f5795a2985172f938fc376c840a6c
 DIST pipx-1.6.0.gh.tar.gz 389164 BLAKE2B 07b603202a44136892e196066fa6d1b85fce2c7d91d798f75edf3f2a18e2924e55487dbd63747948cfc82ea3ca600bdd09e6995a9ee5954c1f4287a4f255a43b SHA512 ae241bb518b240348b5811ee9d278c927cc0e703e6cd0da6225b2e47d727ac1ab54b5ac8fc207da849afc383cfe77ca6a95a62efcb33edc238bb607eada8b00b
+DIST pipx-1.7.1-test-shim.tar.xz 72696 BLAKE2B 276db812b311774d1ad5177402084eec5d3287f72416a8bd67db99530b0ee3ba538e196b8f6ce4ade8bd73b81be238d656366c2048abb90e584be1565b25e33b SHA512 e7c6d604487e1d9a7a7b5c1cd35e758e056d7cc8f9ca4a79ad45617d44d0e857ef336cf012ea08a7e0aa0773ca4c3f9995fe3bdcd3baff048281473464c39256
+DIST pipx-1.7.1.gh.tar.gz 391902 BLAKE2B eb2801c8b2a12a8096ff2fb6882b970cce154cf3f65a87e59ab321d36ce05a9bba03ac818e2148136e00e86fe44d6efd5a39d1c535e4e135feb48b7487f1dde3 SHA512 6375d413974477f488eb8c8d95594f39cf7c54e4c09639c95cb82ed58467266c0124259b1a1fc07596ac0fbffc9fd2ff2fffe58083d78e67ca9f056f2353852f
diff --git a/dev-python/pipx/pipx-1.7.1.ebuild b/dev-python/pipx/pipx-1.7.1.ebuild
new file mode 100644
index 000000000000..d2da505c182f
--- /dev/null
+++ b/dev-python/pipx/pipx-1.7.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2023-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
+
+# To update test shim, use https://github.com/projg2/pipx-repack-wheels
+TEST_SHIM=pipx-1.7.1-test-shim
+DESCRIPTION="Install and Run Python Applications in Isolated Environments"
+HOMEPAGE="
+	https://pipx.pypa.io/stable/
+	https://pypi.org/project/pipx/
+	https://github.com/pypa/pipx/
+"
+# no tests in sdist
+SRC_URI="
+	https://github.com/pypa/pipx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_SHIM}.tar.xz
+		$(pypi_wheel_url pip 23.3.2)
+		$(pypi_wheel_url pip 24.0)
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/userpath-1.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	if use test; then
+		cp -vs "${BROOT}"/usr/lib/python/ensurepip/{pip,setuptools,wheel}-*.whl \
+			"${WORKDIR}/${TEST_SHIM}/" || die
+		# needed for pinned pin version test
+		cp -vs "${DISTDIR}"/pip-23.3.2-py3-none-any.whl \
+			"${WORKDIR}/${TEST_SHIM}/" || die
+		cp -vs "${DISTDIR}"/pip-24.0-py3-none-any.whl \
+			"${WORKDIR}/${TEST_SHIM}/" || die
+		mkdir -p .pipx_tests/package_cache || die
+
+		> scripts/update_package_cache.py || die
+		# sigh
+		sed -e 's:server = str.*:server = "pypi-server":' \
+			-i tests/conftest.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if use test; then
+		local v=$(
+			"${EPYTHON}" - <<-EOF
+				import sys
+				print(".".join(str(x) for x in sys.version_info[:2]))
+			EOF
+		)
+		if [[ ! -e .pipx_tests/package_cache/${v} ]]; then
+			ln -s "${WORKDIR}/${TEST_SHIM}" \
+				".pipx_tests/package_cache/${v}" || die
+		fi
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_run.py::test_run_ensure_null_pythonpath
+		tests/test_run.py::test_run_script_from_internet
+		'tests/test_install.py::test_install_package_specs[pycowsay-git+https://github.com/cs01/pycowsay.git@master]'
+		tests/test_install.py::test_force_install_changes
+		'tests/test_install.py::test_install_package_specs[nox-https://github.com/wntrblm/nox/archive/2022.1.7.zip]'
+		tests/test_interpreter.py::test_fetch_missing_python
+		tests/test_list.py::test_list_standalone_interpreter
+		tests/test_standalone_interpreter.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o tmp_path_retention_policy=all
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index a448dfefe952..638987ca8833 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1 +1,3 @@
 DIST platformdirs-4.2.2.tar.gz 20916 BLAKE2B d7c551a950118a127664b8210f33497760ce06381ac6a4ea098d1a1c60605507b5e2a9762d5f7d112332d3cebd63cb642b25e93a8b67dd2a1ee7cca189f3555f SHA512 e67aff332a6c84669d77a68e7d5546bfd14e08dcf61681b03447bf6381c0d981c63be0f87fd63bc99f0a51c92bf960902ded83ba8872801c14755ab163d45a0f
+DIST platformdirs-4.3.1.tar.gz 21236 BLAKE2B 852d402831ad6060c6efc3841dd56a8484aca547e820ad9b46cc838d92f560407a769a01942bf03c31949e4b37240d292358617afdfa0dd7ea03eeba6bc62086 SHA512 6d4cd808190808bab5a90f44d9fe2fda0d624c7a76faf9f4a4a6093cd098a28b79782dbf895dcd0eeb82778aa094deeb0959fcbe25bdd93818a47b9e197b6299
+DIST platformdirs-4.3.2.tar.gz 21276 BLAKE2B 9bd9a2b3258e2fe411062895bbcc5036c77d95e092df81c9b9b113f64b4568ee44623a747048c9011e9465fb22600db9256e4900c7710a75fc27cf19c07732c7 SHA512 0bad11558f3d60f1476cdcd36a405c7218b9ce68342e3a78f95936356d91fcaaa869549503cc35055d9ce3b3eec219a980ba35e814dd3706fb4b7812aff04dd4
diff --git a/dev-python/platformdirs/metadata.xml b/dev-python/platformdirs/metadata.xml
index f801eabb6b23..2ef15d7c6c90 100644
--- a/dev-python/platformdirs/metadata.xml
+++ b/dev-python/platformdirs/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">platformdirs/platformdirs</remote-id>
+		<remote-id type="github">tox-dev/platformdirs</remote-id>
 		<remote-id type="pypi">platformdirs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/platformdirs/platformdirs-4.3.1.ebuild b/dev-python/platformdirs/platformdirs-4.3.1.ebuild
new file mode 100644
index 000000000000..32509a291570
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-4.3.1.ebuild
@@ -0,0 +1,54 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/tox-dev/platformdirs/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "hatchling' 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 = "${PN}"
+		version = "${PV}"
+		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
+	EOF
+	# sigh
+	cat > src/platformdirs/version.py <<-EOF || die
+		__version__ = version = '${PV}'
+		__version_tuple__ = version_tuple = (${PV//./, })
+	EOF
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/platformdirs/platformdirs-4.3.2.ebuild b/dev-python/platformdirs/platformdirs-4.3.2.ebuild
new file mode 100644
index 000000000000..32509a291570
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-4.3.2.ebuild
@@ -0,0 +1,54 @@
+# 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/tox-dev/platformdirs/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "hatchling' 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 = "${PN}"
+		version = "${PV}"
+		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
+	EOF
+	# sigh
+	cat > src/platformdirs/version.py <<-EOF || die
+		__version__ = version = '${PV}'
+		__version_tuple__ = version_tuple = (${PV//./, })
+	EOF
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index ad54745a49ac..e20cd129ec8a 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1 +1,2 @@
 DIST plotly.py-5.23.0.gh.tar.gz 31606651 BLAKE2B f34d1df464cac49ab834674be8815b97535d8f59e4263d8f68d82f2c2c52976a26b13fe9275f4a90fe0c0848449807dcd8342c0e5309d4b39d61b39cb31d8db5 SHA512 96573bf5952b29a75d2c87029c1041f05d08f4f891d63d5999372d64c211abc5982308dcfbf7590981cd0666ae84ccbee8c9a22e8e2b97571fc8c6a4e634cdbc
+DIST plotly.py-5.24.0.gh.tar.gz 32084853 BLAKE2B 87371902c0f654a16e0d2b97655614b99e05511a298839b244d3147bd2330b70275d1235f4b75eb3bb1dc13289e4d6dab71ec68710d59f1cec467e05e998c609 SHA512 42071af552f666dcc98efe4995a156212971ca92a6320e18861c6e804ab5cd0641c8b772958d3080780aab48e779fc02a13c327c18b36c5077cd137f59f86aff
diff --git a/dev-python/plotly/plotly-5.24.0.ebuild b/dev-python/plotly/plotly-5.24.0.ebuild
new file mode 100644
index 000000000000..1c80d1f50eae
--- /dev/null
+++ b/dev-python/plotly/plotly-5.24.0.ebuild
@@ -0,0 +1,119 @@
+# 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
+
+MY_P=plotly.py-${PV}
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="
+	https://plotly.com/python/
+	https://github.com/plotly/plotly.py/
+	https://pypi.org/project/plotly/
+"
+SRC_URI="
+	https://github.com/plotly/plotly.py/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/packages/python/plotly"
+# The tests are not included in the PyPI tarball, to use the GitHub tarball
+# we have to skip npm, which means that the resulting install will
+# unfortunately lack the jupyterlab extension.
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/jupyter[${PYTHON_USEDEP}]
+		dev-python/jupyterlab[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		dev-python/scikit-image[${PYTHON_USEDEP}]
+	)
+"
+
+# There are sphinx docs but we are missing a bunch of dependencies.
+# distutils_enable_sphinx ../../../doc/apidoc
+distutils_enable_tests pytest
+
+# README ends up a broken symlink
+DOCS=()
+
+python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/plotly/plotly.py/pull/4622
+		"${FILESDIR}/${PN}-5.23.0-numpy-2.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	# unbundle versioneer
+	rm versioneer.py || die
+	# Do not try to fetch stuff with npm
+	export SKIP_NPM=1
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# kaleido not packaged
+		plotly/tests/test_optional/test_kaleido
+
+		# plotly-orca not packaged
+		plotly/tests/test_orca
+	)
+
+	local EPYTEST_DESELECT=(
+		# kaleido not packaged
+		plotly/tests/test_orca/test_to_image.py::test_bytesio
+
+		# fails in non-isolated env
+		test_init/test_dependencies_not_imported.py::test_dependencies_not_imported
+		test_init/test_lazy_imports.py::test_lazy_imports
+
+		# Minor matplotlib incompatibility
+		plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots
+		plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle
+
+		# TODO
+		plotly/tests/test_io/test_to_from_plotly_json.py::test_sanitize_json
+
+		# two subtests that require 'vaex' and 'polars' respectively
+		plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_from_vaex_and_polars
+		plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_with_hover_data_from_vaex_and_polars
+
+		# the usual recursion problem
+		plotly/tests/test_optional/test_utils/test_utils.py::test_masked_constants_example
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mv "${ED}"/{usr/etc,etc} || die
+}
diff --git a/dev-python/pplpy/pplpy-0.8.10.ebuild b/dev-python/pplpy/pplpy-0.8.10.ebuild
index dd2eef3bce6e..4cadab58c1f5 100644
--- a/dev-python/pplpy/pplpy-0.8.10.ebuild
+++ b/dev-python/pplpy/pplpy-0.8.10.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 LICENSE="GPL-3+"
 # API/ABI changes in point releases
 SLOT="0/${PV}"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index faa183a08cd5..f6f368460af1 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,2 +1 @@
-DIST prettytable-3.10.2.tar.gz 56415 BLAKE2B 0deb8132124f9c19ecaeea46749dda834c758378163646e16e0553b75ad6842b44fe5904ba181d6a2b0c3a822f23cd569977a8168d9245b2e9f08ed16da0089e SHA512 6a71f7d7b6fddca75e4b1bfd96ca6e26301c0c231be4703fe9c59e1c13a1482f814fbbfd661d1fc6bb37346f55a7488b794d5041016faf68711297a8cbdbe5c5
 DIST prettytable-3.11.0.tar.gz 57527 BLAKE2B 494f3ff0802b29a419f58310a0ad50ccd1ae39845ad5167956f68ab674a2b357d098e28426c8df6a889026eaf397593018070d441cff20f0a01b76c51470a482 SHA512 3da3dcaeef1f8ce224381a6a12e56a7220e7bf7bc6a99402cd0ae68703d0630beb42f6575c86981f1ff5f592283a990398d6dd1bbdcc21074f77cab4739683b7
diff --git a/dev-python/prettytable/prettytable-3.10.2.ebuild b/dev-python/prettytable/prettytable-3.10.2.ebuild
deleted file mode 100644
index 1c36c1c01f48..000000000000
--- a/dev-python/prettytable/prettytable-3.10.2.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=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="
-	https://github.com/jazzband/prettytable/
-	https://pypi.org/project/prettytable/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prettytable/prettytable-3.11.0.ebuild b/dev-python/prettytable/prettytable-3.11.0.ebuild
index 21f867b499ce..1c36c1c01f48 100644
--- a/dev-python/prettytable/prettytable-3.11.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index b5d609fac57c..c2a5750a2dd1 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1 +1,2 @@
 DIST progressbar2-4.4.2.tar.gz 101342 BLAKE2B 67625a794bd19a4ed78be25789980038c69a6590277f085befeef805397972ff1160543814523c425218e019647f1c1641451198e2dd08a5f8eacd9e507a04af SHA512 705383badb3943d3d339854d02ee4114f0e76261373deb8f9aff00fe6aae7f37bacccbbc673c2cb36114c7f8ebbafa96a06408ce6e90c3d26a2e2c65ece86958
+DIST progressbar2-4.5.0.tar.gz 101449 BLAKE2B 3c4adc503d1b6e0121dd579719aa6758a52459cf7c2d63016032edd89d9f22918b1e0b497237b1658f703d790273feb64818e420b752a5f0e04e99e75042fc1d SHA512 84d13cce516aebc184285479849a1f4d16d16bbd48c7eab55c28ce131f5c770d97368df1ca57499a59e4d2994bce5a0cef7cc3d7c3a358b2dd6beba785f5db33
diff --git a/dev-python/progressbar2/progressbar2-4.5.0.ebuild b/dev-python/progressbar2/progressbar2-4.5.0.ebuild
new file mode 100644
index 000000000000..35fd688e6504
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-4.5.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Text progressbar library for python"
+HOMEPAGE="
+	https://progressbar-2.readthedocs.io/
+	https://github.com/WoLpH/python-progressbar/
+	https://pypi.org/project/progressbar2/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-utils-3.8.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/dill-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	local -x PYTHONDONTWRITEBYTECODE=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 2a124bbb3c74..fb851d0bf1d3 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -4,3 +4,5 @@ DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
 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
+DIST protobuf-python-5.28.0.tar.gz 422388 BLAKE2B 208f92bdb2bc0b92dca76de4d13eda0c98bc4784cb2ce9d57690682d9327fb2a66646241ecc02e96be602b6763b177b3192ca457732540d1fa8c33afecd8d76f SHA512 91f05915ace778ee76a07856049410c48c02a665f6c4665df9ac3e32992a67235a93fb4e19c9f991821652f236b87749c3d79cfabd8c6508fdc17a2ee612cee5
diff --git a/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild b/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild
index b5b33871343e..a186181fd7f9 100644
--- a/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
 			-> ${PARENT_P}.tar.gz
 	"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~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"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
diff --git a/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild b/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild
index b0d4a3ec76a7..926cf1fdc77f 100644
--- a/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild
@@ -27,4 +27,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-python/protobuf-python-5.27.4.ebuild b/dev-python/protobuf-python/protobuf-python-5.27.4.ebuild
new file mode 100644
index 000000000000..b0d4a3ec76a7
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-5.27.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2008-2024 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}.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-python/protobuf-python-5.28.0.ebuild b/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild
new file mode 100644
index 000000000000..b0d4a3ec76a7
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2008-2024 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}.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/pulsectl-asyncio/Manifest b/dev-python/pulsectl-asyncio/Manifest
index fb2b24db043b..bd9d822b3bb4 100644
--- a/dev-python/pulsectl-asyncio/Manifest
+++ b/dev-python/pulsectl-asyncio/Manifest
@@ -1 +1,2 @@
 DIST pulsectl-asyncio-1.2.0.gh.tar.gz 19517 BLAKE2B 919909acfabfefa1dbea99cef6285483652649c111df6f3f6719d92e35ea548b54e6c0a60e4277b69610ee9a58c2c29c3355b7f2fe2780d773aa2c89513ce9a1 SHA512 b560c38b6d18a4c73551ae4ba34243f0043dc18426141c128c6ca3e8bd30f4d94d8718c3003ae506be038bc645ee569b77e6289b97ac913daa1e42e6b9aef03b
+DIST pulsectl-asyncio-1.2.1.gh.tar.gz 19531 BLAKE2B 4a3275d75602907f91b3a0979ff8908f4fa23bcf5d1d04068f878fc477011258180cec8ef16b6e6ebe6cc1713ff493841686cc67c4990222c061aa1b722199ff SHA512 b22d0a634433d558860ff1590020ba7272412be97da478a8b00ec457506cb58353b645537ae26591f1aed300cacc14fd0f50c8a3a0c7d650d610b24cc52248ee
diff --git a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
new file mode 100644
index 000000000000..8b6cfcbfc7dc
--- /dev/null
+++ b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
@@ -0,0 +1,41 @@
+# 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
+
+DESCRIPTION="Asyncio frontend for pulsectl, Python bindings of libpulse"
+HOMEPAGE="
+	https://github.com/mhthies/pulsectl-asyncio/
+	https://pypi.org/project/pulsectl-asyncio/
+"
+# sdist is missing examples that are used in tests
+SRC_URI="
+	https://github.com/mhthies/pulsectl-asyncio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pulsectl-23.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		media-sound/pulseaudio-daemon
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:,<=[0-9.]*::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index 272844960854..b5e815ff0d0b 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1 +1,2 @@
 DIST pulsectl-24.4.0.tar.gz 41166 BLAKE2B 3b2d41b3077f050104e7b416cb8dbba47f4282bb90ee58c855f4f5a1e1b1183b131879e6965edf8d8b5a2466ce3381e45c7a6b92f2b64fc336d311d3d7625440 SHA512 b17fd577f9c336f762925bd423fdca665afa92a88b0dae076ca016d7c5b2b3d9ef11efd27f7339031accadef00d513f972c216a23f26cfd049516f3dbcc63d01
+DIST pulsectl-24.8.0.tar.gz 41171 BLAKE2B 58a16b07fcec68f21fd573cf781f2ac09ccdf2faa3e7afa84a4f8cf9f28111e94bf41e0f8a8740434edeace78156f56ac428a87d669cbc947e331b8d555dd2e1 SHA512 4638bb41611e8d7a00f2daeec7e7783789d5d1d94841206b4052e53897e6547c21f8410c3400e1bd301e237b3a72143fb6ff3d67cbafd06bada0a1d0da007c96
diff --git a/dev-python/pulsectl/pulsectl-24.8.0.ebuild b/dev-python/pulsectl/pulsectl-24.8.0.ebuild
new file mode 100644
index 000000000000..693b086854aa
--- /dev/null
+++ b/dev-python/pulsectl/pulsectl-24.8.0.ebuild
@@ -0,0 +1,30 @@
+# 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/pure-eval/Manifest b/dev-python/pure-eval/Manifest
index 429c6ba56260..f27351ab82b5 100644
--- a/dev-python/pure-eval/Manifest
+++ b/dev-python/pure-eval/Manifest
@@ -1,2 +1 @@
-DIST pure_eval-0.2.2.tar.gz 19395 BLAKE2B 19f86a1436e5f1a026a24f62c435e8970d84960f4cde1de80c58949b1aede6aa7562e8430e10e3f7171212c31d5699a3321fad5fb2ea1eed961a30d43a632a79 SHA512 35d20cbbfd513b7ac341759e619401a5f57b7b9df8abd09ce6414d4ee6bfa45dcadbad7529d067e81ad7ea2107c14fd03783a3a77f8074dad30d2e5161656804
 DIST pure_eval-0.2.3.tar.gz 19752 BLAKE2B 18ed36bf045ddcd351a8dd82079df409e26ed745e3c326a7743536bc3e74a880830f55fa1252113aa03b9830b5cac63601335cb6b877994861efb0b9b54a07d9 SHA512 8575f54aa7e522a3db86b80fdbe1f8518ef4ef17a160b2541f74d0853e123cffcbc9f04df9faeddfc7ed92bb6b1d27fb7b3ce2de1c66b6b13e453b7b2bf72052
diff --git a/dev-python/pure-eval/files/pure-eval-0.2.2-py313.patch b/dev-python/pure-eval/files/pure-eval-0.2.2-py313.patch
deleted file mode 100644
index 9ec2d680b616..000000000000
--- a/dev-python/pure-eval/files/pure-eval-0.2.2-py313.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 42e8a1f4a41b60c51619868f543e7b3ee82ac42f Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Wed, 15 May 2024 10:14:31 +0200
-Subject: [PATCH] Fix compatibility of check_copy_ast_without_context with Py
- 3.13b1
-
-Resolves: https://github.com/alexmojaki/pure_eval/issues/16
----
- tests/test_utils.py | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 172f50e..3a9cc9b 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -58,7 +58,16 @@ def check_copy_ast_without_context(tree):
-     dump1 = ast.dump(tree)
-     dump2 = ast.dump(tree2)
-     normalised_dump1 = re.sub(
--        r", ctx=(Load|Store|Del)\(\)",
-+        # Two possible matches:
-+        # - first one like ", ctx=…" where ", " should be removed
-+        # - second one like "(ctx=…" where "(" should be kept
-+        (
-+            r"("
-+                r", ctx=(Load|Store|Del)\(\)"
-+            r"|"
-+                r"(?<=\()ctx=(Load|Store|Del)\(\)"
-+            r")"
-+        ),
-         "",
-         dump1
-     )
-From 89645cfd19d1480d586af50842f0ac264a036fa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Sun, 9 Jun 2024 21:45:31 +0200
-Subject: [PATCH] Explicitly remove the ctx attribute in
- copy_ast_without_context
-
-Python 3.13.0b2+ defaults to Load when we don't pass ctx
-See https://github.com/python/cpython/pull/118871
----
- pure_eval/utils.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pure_eval/utils.py b/pure_eval/utils.py
-index a8a3730..19ead65 100644
---- a/pure_eval/utils.py
-+++ b/pure_eval/utils.py
-@@ -184,7 +184,12 @@ def copy_ast_without_context(x):
-             if field != 'ctx'
-             if hasattr(x, field)
-         }
--        return type(x)(**kwargs)
-+        a = type(x)(**kwargs)
-+        if hasattr(a, 'ctx'):
-+            # Python 3.13.0b2+ defaults to Load when we don't pass ctx
-+            # https://github.com/python/cpython/pull/118871
-+            del a.ctx
-+        return a
-     elif isinstance(x, list):
-         return list(map(copy_ast_without_context, x))
-     else:
diff --git a/dev-python/pure-eval/pure-eval-0.2.2-r1.ebuild b/dev-python/pure-eval/pure-eval-0.2.2-r1.ebuild
deleted file mode 100644
index 3268f08fd3f0..000000000000
--- a/dev-python/pure-eval/pure-eval-0.2.2-r1.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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Safely evaluate AST nodes without side effects"
-HOMEPAGE="
-	https://github.com/alexmojaki/pure_eval/
-	https://pypi.org/project/pure-eval/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/alexmojaki/pure_eval/commit/42e8a1f4a41b60c51619868f543e7b3ee82ac42f
-	# https://github.com/alexmojaki/pure_eval/pull/18
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/alexmojaki/pure_eval/issues/15
-				tests/test_getattr_static.py::TestGetattrStatic::test_custom_object_dict
-				tests/test_utils.py::test_safe_name_samples
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/pure-eval/pure-eval-0.2.2.ebuild b/dev-python/pure-eval/pure-eval-0.2.2.ebuild
deleted file mode 100644
index 2e9546fd7db9..000000000000
--- a/dev-python/pure-eval/pure-eval-0.2.2.ebuild
+++ /dev/null
@@ -1,37 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Safely evaluate AST nodes without side effects"
-HOMEPAGE="
-	https://github.com/alexmojaki/pure_eval/
-	https://pypi.org/project/pure-eval/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/alexmojaki/pure_eval/issues/15
-				tests/test_getattr_static.py::TestGetattrStatic::test_custom_object_dict
-				tests/test_utils.py::test_safe_name_samples
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/pure-eval/pure-eval-0.2.3.ebuild b/dev-python/pure-eval/pure-eval-0.2.3.ebuild
index 5402bfb5358f..c2a1591db028 100644
--- a/dev-python/pure-eval/pure-eval-0.2.3.ebuild
+++ b/dev-python/pure-eval/pure-eval-0.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
index 32fc82f8be70..6977e55dacca 100644
--- a/dev-python/puremagic/Manifest
+++ b/dev-python/puremagic/Manifest
@@ -1,2 +1 @@
-DIST puremagic-1.26.gh.tar.gz 310727 BLAKE2B ccb07fc646c90778bea98adc4bb63bcb24dd7e588134d12fae02b846e532ec3cfa0f29037ee9143ebdd9baf71703c73b1447886b86f4d7ca5a5b4097988a3570 SHA512 b081ab7b7ddc5ecfcf9b3f2a19535222ace2eed4e88872580eaae69f9635f59357d49ddcb01e7d88fa46556320e9c8906e7a44cb614288c88266f5f7d0109d49
 DIST puremagic-1.27.gh.tar.gz 311630 BLAKE2B f2856a138600ae8d9592870080c04ca15b2eefbb774f1156f52327d6a0fe26f419ade498a8ee08c02b0f09f4ea6427ce595de8b478d2e17fd00f5f7263364051 SHA512 56365dc122160d306704290a054afa7be5007ca3634275fab168e1ea8bc29356477c5455abba3d84c9e229dc9ce3a21df58ed7e6ff216fe0c60d7257e4b02584
diff --git a/dev-python/puremagic/puremagic-1.26.ebuild b/dev-python/puremagic/puremagic-1.26.ebuild
deleted file mode 100644
index db55407e2eb2..000000000000
--- a/dev-python/puremagic/puremagic-1.26.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of magic file detection"
-HOMEPAGE="
-	https://github.com/cdgriffith/puremagic/
-	https://pypi.org/project/puremagic/
-"
-SRC_URI="
-	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/puremagic/puremagic-1.27.ebuild b/dev-python/puremagic/puremagic-1.27.ebuild
index 7a5fd34c2d27..db55407e2eb2 100644
--- a/dev-python/puremagic/puremagic-1.27.ebuild
+++ b/dev-python/puremagic/puremagic-1.27.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DOCS=( CHANGELOG.md README.rst )
 
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index b92348d03ce4..d52d2aebc230 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyasn1-modules</remote-id>
-		<remote-id type="github">etingof/pyasn1-modules</remote-id>
+		<remote-id type="github">pyasn1/pyasn1-modules</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild
index d3538c0b729a..61fa98f058d4 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 pypi
 DESCRIPTION="pyasn1 modules"
 HOMEPAGE="
 	https://pypi.org/project/pyasn1-modules/
-	https://github.com/etingof/pyasn1-modules/
+	https://github.com/pyasn1/pyasn1-modules/
 "
 
 LICENSE="BSD-2"
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index c99d554b0346..de01614000df 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -8,6 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyasn1</remote-id>
-    <remote-id type="github">etingof/pyasn1</remote-id>
+    <remote-id type="github">pyasn1/pyasn1</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyasn1/pyasn1-0.6.0.ebuild b/dev-python/pyasn1/pyasn1-0.6.0.ebuild
index e72d6b06866e..5b65522271db 100644
--- a/dev-python/pyasn1/pyasn1-0.6.0.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.6.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 pypi
 DESCRIPTION="ASN.1 library for Python"
 HOMEPAGE="
 	https://pypi.org/project/pyasn1/
-	https://github.com/etingof/pyasn1/
+	https://github.com/pyasn1/pyasn1/
 "
 
 LICENSE="BSD-2"
diff --git a/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild b/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild
index ba48e9e8acdc..3ba1840d14aa 100644
--- a/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild
+++ b/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild
@@ -17,10 +17,17 @@ HOMEPAGE="
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pyasyncore-1.0.2[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/test[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild b/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild
index 0cb8d3d610b3..ce24a3a3dd8c 100644
--- a/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild
+++ b/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild
@@ -17,6 +17,14 @@ HOMEPAGE="
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/test[${PYTHON_USEDEP}]
+	)
+"
 
 python_test() {
 	# Can't use d_e_t unittest (bug #926964)
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 78422af427a6..93cdae699900 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -3,3 +3,4 @@ DIST pybind11-2.12.0.gh.tar.gz 771004 BLAKE2B df95d12cd005c85434ba8a4d80740f437f
 DIST pybind11-2.13.1.gh.tar.gz 789821 BLAKE2B b1634878a9a772d1200c79a5e7554a16a9ec76a57cbe4fc6fa86c70f9e383ebeb2b2ced7006392dbb1196144fb02f2415ff511e2b041a6fa3fe63b7c511c98f9 SHA512 97d7a2892af67adad16b6ff0fb3e6324c88d1dd931dfa0d34cf6d181baec05ed791f0980abf2174db22aabaa382fd5b5f00cb287cf6477a4786c999f29719717
 DIST pybind11-2.13.3.gh.tar.gz 793263 BLAKE2B ba295fb0dbbeacd5d2b9fa335cf91c4e4b9daee29c7b994f8878b8078d18a18ee48874a3264f5bff280257cf677339324f7875d2f1bb8b855c6097982a71cdcd SHA512 76629d4ad5b91975bbf3fb05580403915f096a4d91b37d947fdbcb3b44783b3f0c9e5a4e289da222902e6b458e29893521523f41d9eb99da7e4890261be00947
 DIST pybind11-2.13.4.gh.tar.gz 793802 BLAKE2B efa1bf0d244cd9692e750524b841a884601c121f631fd721d64f192c49ff6ead4eaa4bb13cace42b98673cfd038583fc3716a298b041efd148e992c07b9ee5c3 SHA512 5938c758da5450be645b366190579aa7943294471a0c639c2aeb9d8e9d201ef4fb4dfd0cb1db91390f74dc59f175f6cf47b0c45c20d45ab9f3eeb1a834886de7
+DIST pybind11-2.13.5.gh.tar.gz 794599 BLAKE2B 57bf05040902fc1f85cb4661672426a5c9de701157308e2dd0740f3b7eac878bad0f389b08c2b22b52c94766fa1ae0b0da8aa45353b9cbb95c54afbb0282a786 SHA512 bf9ebfbd8e694fbb421d8bdb5362a207a3782685d48988e77aed98363b2fa302e7384b570b02b117d45d5509b1633b096d4fc1ef16f65e6cc8c888b863c1e2cb
diff --git a/dev-python/pybind11/pybind11-2.13.5.ebuild b/dev-python/pybind11/pybind11-2.13.5.ebuild
new file mode 100644
index 000000000000..2d72a47d2e67
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.13.5.ebuild
@@ -0,0 +1,75 @@
+# 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 cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="
+	https://pybind11.readthedocs.io/en/stable/
+	https://github.com/pybind/pybind11/
+	https://pypi.org/project/pybind11/
+"
+SRC_URI="
+	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3:0
+		>=dev-cpp/catch-2.13.9:0
+		dev-libs/boost
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DHAS_FLTO=OFF
+		# https://github.com/pybind/pybind11/issues/5087
+		-DPYBIND11_FINDPYTHON=OFF
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build cpptest test_cmake_build
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${BUILD_DIR}/tests" || die
+	epytest -p rerunfailures --reruns=5 "${S}/tests"
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 3618823a63a2..c95b04ce7722 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,2 +1,3 @@
 DIST pycairo-1.26.0.tar.gz 346850 BLAKE2B da6c35c929d372764280e8963a8b66ba533ccb99be9ee2bfa10859c635dd16cc087d542607be9ec6a9ffb942feb892100d4b9017d832d478b35c434aa05b9bb9 SHA512 5313f0d408a6e6ce6e70ac92291be5dd8651e01fbf9411d0467061afa21849cde27db273f2a13b4c3c931183f63f75f31fc0f0d3283b8f339ba88e71eab432f1
 DIST pycairo-1.26.1.tar.gz 346882 BLAKE2B 52e92b3b7e6ffda89a01b293f0bc6c5da5018ba77dce92d30b221fbf1f8c1b253f5ae279d64a517810b6efe4d7d282c21dbc15e5ef8e372204095c773b12de52 SHA512 4f63fc4fb2b6bf65d8a1cbbeaf4d982c5eb2271309763522ee6f763f691428b3e420434382e8a3e1d6b841821940f44f4bc6f51724eb4474494d60b7ff1c9031
+DIST pycairo-1.27.0.tar.gz 661450 BLAKE2B cc1ef54057d02f3e25fed010c995e4fe400ccdf3a5d2f241c029ded167c5db2560a4d9c8cb09b2f0519e674b5962f2244f0570401f45743fe1ec61d5a8982227 SHA512 1b077917b1d99262da1c1d2ff85ae841dd0ff715925a5a20032162aa876576d966fc6b30c154343cc45f104cce243887de9b5f14af1e15775cb71b6c11e553a6
diff --git a/dev-python/pycairo/pycairo-1.27.0.ebuild b/dev-python/pycairo/pycairo-1.27.0.ebuild
new file mode 100644
index 000000000000..9f44293d3716
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.27.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit meson distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="
+	https://www.cairographics.org/pycairo/
+	https://github.com/pygobject/pycairo/
+	https://pypi.org/project/pycairo/
+"
+SRC_URI="
+	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/cairo-1.15.10[svg(+)]
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_compile() {
+	local emesonargs=(
+		# TODO: move that to the eclass?
+		-Dpython.bytecompile=2
+		-Dtests="$(usex test true false)"
+	)
+
+	meson_src_configure
+	meson_src_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install() {
+	meson_src_install
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycares/pycares-4.4.0.ebuild b/dev-python/pycares/pycares-4.4.0.ebuild
index 6a60b1be40e8..6b466caa6012 100644
--- a/dev-python/pycares/pycares-4.4.0.ebuild
+++ b/dev-python/pycares/pycares-4.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index a1e2f04fd241..73ccc9f253ed 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,2 +1 @@
-DIST pycodestyle-2.12.0.gh.tar.gz 80226 BLAKE2B be53b0909182259543bd388945e865cdb383005722afee58977559adb05ce108f764dfc0951a22db79a3abe84d6d5e90a24ee1524c1ad65fe887876c5002400a SHA512 903dd24113c1757826e31564ebac0ac97ad457b84d292f2f1e798df8e68a3847ff6fed0739430d29becc4a52ba4032d873b0212c13d007695df601637b69bdba
 DIST pycodestyle-2.12.1.gh.tar.gz 80518 BLAKE2B e64dda57d1c349228f8ffeced4061d278b342af7db152377e34b3fad626db52f7eef4668df60d323196f1844e8fa28d9e231cc216145b2ea1da6ae32bc1f341f SHA512 7709c0611812c3294a55a5e6dde00d5affc67c4273ab1d37dec507a424b618b2736a6976d27872903fa448f208fe2ba4529f2bfbefc2902dcf947cb6bca5b09a
diff --git a/dev-python/pycodestyle/pycodestyle-2.12.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.12.0.ebuild
deleted file mode 100644
index 3a2339f9a698..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="
-	https://pycodestyle.pycqa.org/en/latest/
-	https://github.com/PyCQA/pycodestyle/
-	https://pypi.org/project/pycodestyle/
-"
-# 2.11.0 broke sdist
-# https://github.com/PyCQA/pycodestyle/issues/1183
-SRC_URI="
-	https://github.com/PyCQA/pycodestyle/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild
index e23f446e7b74..3a2339f9a698 100644
--- a/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.12.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest
index d8ddc058cbca..e3c0a7ac8e7f 100644
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,2 +1,3 @@
 DIST pycpio-1.2.1.tar.gz 18512 BLAKE2B e835e3810d174d8f4cd5afc2984c0d84d55f9492725c16afdcd1b760dc8c58b4b83a1d13c0b266c8ec9407ab5c1114fe95468d742b202ba99e3c4a76a69dff15 SHA512 4611829339a45a848deb0c5c35098215ac7c378714e4fb1e10975e00b386e5e6bcd295fde83f361998f234f506276b906a4424a7d4aa925fe2bd92a0d7311d86
 DIST pycpio-1.3.1.tar.gz 22457 BLAKE2B de24a569d7114e31e9093d05f7b3651e9ee1e77c233d46114bd53e0821b1c7bbaac61691dd8abfb0ade23bdc15c8e5f35f2c8c7cb8e1160b82450dcc7e8280bc SHA512 5672ed515434e94c4812532d4405db172eaa54ed9ef497b31fe354eb374157b070ab50481cc852e04312d01aa821fe0c4aeb2824cfc246c68c841288a92a25d9
+DIST pycpio-1.3.2.tar.gz 22449 BLAKE2B 9f183ccb44552295c1ddf83102865b59f00f387302cbfcdf4cf226bd72a7e6b49883db8c0fece50904c4dc4891f8ee2b513e3192d95f74dd673e3c71e13817dc SHA512 d5e7f4f59e91944bf3c49cb3da79e34b11167a39374036906a3c1fb2230992ec31c1c51880cf26ef3682a58a5082627635576bd697a4b972edd9d62ade7e9130
diff --git a/dev-python/pycpio/pycpio-1.3.2.ebuild b/dev-python/pycpio/pycpio-1.3.2.ebuild
new file mode 100644
index 000000000000..837c98d10d5d
--- /dev/null
+++ b/dev-python/pycpio/pycpio-1.3.2.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+DESCRIPTION="Python CPIO library"
+HOMEPAGE="https://github.com/desultory/pycpio"
+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=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest tests/
+}
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 8f4ce216bd91..1905fdd8c3eb 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -8,7 +8,6 @@ DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cb
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
-DIST cc-1.0.100.crate 78474 BLAKE2B acadea935c2a44b7a3de105b068ac73b6497ba41118ad7b0263f13f8c123a8e7df178fe7441bca76b6d76e263bfde5ee20c4f130521ae08de6a1f3fce395dc9d SHA512 7609e635a565afa41bb057d9f0bbb2e019069e314c738dd500e3a86678145786fbcef2654ed553e82387f8739d87597e7b3302c376d8766cecdaa67aaa9baccf
 DIST cc-1.0.101.crate 79446 BLAKE2B fbecc04723577abd209d16c34269b5ac2652fbd5385838190c744abf573912fa7a062e2fcf1dc76486c5b61677225a826a65dbd6eca58398ff60ddd1e47a3caf SHA512 6edaf3dcc2e58dffd7221a6b457057c83bdec03b6fad9cbd2d702af6820fd8354fdb3960cd78d8b38568ef408171354f0313f17a32f0caa64f97736c0840a148
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -36,6 +35,7 @@ DIST icu_provider-1.5.0.crate 52722 BLAKE2B b1e53ac677e2db5870df0a91de405ebbc635
 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.1.crate 142718 BLAKE2B 0c3d1cc6b6dd9bf8ba1ef559b03581271e772c1b0a1cf208191e6a5510cf7230faefaf5ef402fb0fd7ed2ea5715d7beedb37c4fb558d1840f1ca38c889e11fb5 SHA512 a4979a4aae733b06650ae0d395f68373ba4025cb5db28a8fac8d02ef3544198fb4d716c85e6c80943e7ad56ab891394c1f8821c44c5db1c853373c79248a9e2b
+DIST idna-1.0.2.crate 142869 BLAKE2B d37c0c6937671750c1f3a682e829e870c01e025c453cb9d5e32e532aaeb1cbe5c70bcee26395b25480563466b209e598d73fc4484a514bd2e3876df6daa31319 SHA512 41a27ff65e606d4ad5cfb149962bf9b0d3aa60a0a582b269b9311f05135890e1dbe9f613dc5b0860549f458399dcd66061f4536eeafc2d9aa8925a70a13b437a
 DIST indexmap-2.2.2.crate 76160 BLAKE2B 1b020e3e33204e9e0cf15e0b91a600296147432002e94ae1061f1d7511e3435a29c1c0c438933eb6a56c7c522cbdfff29a106622041815cbd706b9515e2ab82d SHA512 814cffe0e586940c82c152536a970917ec8702a9b946151ccc8574188fa2cb0fab094888c0e910917c99e37f5f53723ab799999fab4bee395bca7d45adeed40c
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
@@ -56,7 +56,6 @@ DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e322
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST num-bigint-0.4.4.crate 99369 BLAKE2B 09a44754e3a3d4f949b3714d96ddd7f3915164d611036675e3df421d6c0863e368eb0180978a4ec27fbfff529b4999d2593e411903516670c24c08fbed6a79de SHA512 0dcef3344a933509fdfe87d6adb0bb1bf67af3c692ccaeec5663a8f18ad0a251199ef9c7a24c25b95d1b255b413947e70f0a205669d549b13e54b6f4864ab3b5
-DIST num-bigint-0.4.5.crate 102281 BLAKE2B a25880f907caeb948d0a8619180be7e1e66d0644819a842fd1413a1ecc8d7cd873b4a55a684e8a98f6bc1b74612e20d3d01389c6753389cd9f4cf7f754125fdd SHA512 0d3b1da7f37a441cae0bc276b5b9b8aaad2f5a7ddc3a1c9b6c6e09be70147f7430604c74c57a79dce12d32c242393c8031ec7bbe9b1cc6fb6e496d6fd151474e
 DIST num-bigint-0.4.6.crate 102801 BLAKE2B 0460e7dfdbd44b6c68fc8ead6bff4353e549127158dab8bb5d217ee33104fe9ad5f58b63a01d56fffa8d7c4df1a87dcf5b536e436a0ef98dc4418a4690c4cc15 SHA512 19d14a7755de2b559026547d9e3e1775e636781bdfdd418f2e1d962c51411a0973a46d84d0356e30c0f708a7c7b2097926611960043f71391919cab1aeb6aa04
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae
@@ -71,11 +70,11 @@ DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa
 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 pydantic_core-2.18.4.tar.gz 385098 BLAKE2B 6bea502397c327f38a000e9ea3b59b7d7f9fde5336562a081c6cdf88d92fe5e420eecec696ee432f1c6c5ec5dad8173f250897c4ae681a367ad28617724843f0 SHA512 01bdf79a79468e2a6a66f41830b98dc0adfb6d87b221e57e1da5a27b4068dea906aa987b9a7eca3bdc107e97e6bfa9ea164c527bbe2ceb683419ef147747b786
-DIST pydantic_core-2.19.0.tar.gz 385827 BLAKE2B 353c01dcef56709259e679d10d6b2397e5f90d4c734bbd31bfb6bddfd6011a2f74df4bcabb2a1a3f6a7ba9d0b54d693260d445d8ab6795e28185f7d66c823567 SHA512 779e31900ed80c922c7e168f1906795d5073f5aae86abd74af8cf54a53fc366504d42b6779665e59f0f29ea3f4005ed134403bbb5726f90b44b165118ce569bb
-DIST pydantic_core-2.20.0.tar.gz 388463 BLAKE2B 8ce5fe944ad143cc05b6a69a48b75a69f474674d1f92fa7614d509b0365e197c19b486c6fa6953fa64527fb3520e63e157175fc74cd4e38d0a2685bb00216fbf SHA512 decff9e19daeab168ef3494d0864df0c958ac9932f0c6ea8ed965dca0070ae0c4c9fe717210f69f94c26c815e964ecceb531e552217e8cc9755173899edb131b
 DIST pydantic_core-2.20.1.tar.gz 388371 BLAKE2B d8c66cddd93fe4a56a901e5f06fe86c0c87b11397567e5400bf89e5884e13c98d37bbdc42ccd0bdd67c552370c17ed26d9a7897303544a816022d8a47ee8bc18 SHA512 fb5362a07282a54be9cbcf0773b5492dc1773c71d96979586885d920d794b13860a32a8165e7b5e023f9f0f7a3c85aa5098dc66d6626d5d290d3ab63fa70453f
-DIST pydantic_core-2.21.0.tar.gz 392334 BLAKE2B 799f57258b122ac13e411473a3019678357608d200dbc530bd41339bbf59fde7e1eef84249e504ce7181730ff73ca3b84e6cf33ed7c05ad75efe454ef4d973bf SHA512 dfd6e4d9e779d5a93ac97176029b75444685fc4dee6b989830bce56b3033853a4716cfaa334a54b90918c28bb74cc8f910917497661133ba2ef8ed5fcdd36b4d
-DIST pydantic_core-2.22.0.tar.gz 398575 BLAKE2B bcd5523aec8a35db184b8a701dbaed3b29e4332ec6e2be336f4567a938cf1a87a06ef23afef059f5c1cac32d4d26669a15e776987af6a729f2b7f941047bad81 SHA512 1f3f374b4f3a406c7119bcaf79a49589184dde580d44f002821788e25d93339be507c4cc70a44aa670be07914038f538299d459c9e404ad959af318daa186c7c
+DIST pydantic_core-2.23.0.tar.gz 398665 BLAKE2B 4d62c6956f8309d8e03d3838dd9da7045b64f69836117b82bc0453ca2765053f37e8760076dcb9163729fcca7cfa36b2c7750031d4b5df7eda8234e99485c0f0 SHA512 84e7f5d8c2e1085575284d9d386194abe959b09c1b3bd6f16b79ac06b2a9104b52e01d1758f6a056590e138e2a33e73eaaf9539cb24a4ffbd1916e41cf8b81b8
+DIST pydantic_core-2.23.1.tar.gz 399302 BLAKE2B 36dbdb817ae44aa19572c85f380499ae60e5722863de728b5b67c11627b352ac9dd14120cbb471f9dbd3ba8e8ad20a0356d52e950d4d6df2b01996c3fa95f97a SHA512 d09bec6d1452a6cc6b947cea7744a49860bde00b9481c37dc5c72b0ba4426fa0cd6eb73e080cdc4d69c986094d5ad0c02171d23b3199ba7ad60aafe205bc2a97
+DIST pydantic_core-2.23.2.tar.gz 401901 BLAKE2B 5cb8bd0a52cb32a226d7dc711bc6db1b33d8e5236069cc3f8881123cc0387e37c88aa6d898c434490c97814dc2df0296979d6abac52714f883159984d2f215bc SHA512 65ac846c6028e77cf53a95be2d45ffc1ef8bd691d1738c13f96b1823853f282bf64e876cc1e02ae99a967076578b0ba3c73572b441034850e9d49a1242e1bfa1
+DIST pydantic_core-2.23.3.tar.gz 402277 BLAKE2B 4418f6972e3d31d1428a5ed6a653d0eac6cb5067c102327268ab0f72b23410927990274aa9fa1c2ea8e14deb4dcd689a559f99edfeffdef2b05e0404dd51c1f6 SHA512 216ad4b2d32276ef89da842271bc9a6149e98782391e2a4159983b48377dd56960021bf89eea62e9a82e2bafa9eff1dc500ddf14699fa727f868284579a38334
 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
 DIST pyo3-0.22.0.crate 535742 BLAKE2B 772a4f8b718bbec32faa3dac4cad07a5b452fb366280753c3316d932663bf367192483fb5cd0bd405321128e67157b982eaa89264685739a141e021f0f7e2b72 SHA512 44e0237fd3a8d4c7b082c48a5c8a52d8f4cc4673d134f680e29504bb46d870015fa210da34de4c1998defbcd4afdf2aaea4e148fbe093e4b2c8b0d064cd48da4
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
@@ -99,6 +98,7 @@ DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0e
 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 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.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
@@ -110,12 +110,14 @@ DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
+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_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
+DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
 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_json-1.0.118.crate 146962 BLAKE2B b85f17cbef0cb9fcc8af5d8d18a74850804de631f8ac94193bdb0ff8c95d4c8507876e4802005e0bc8fc4745d52c79be153d825e106090b680b620acc5b1add4 SHA512 1fa7e01d849684e3ed6f9bd67ba9862f822dcecdcb9110a43182367225f559416f855d59f2b8bd943756957932710b930244963a1f47a3d7d530be19dd412f20
 DIST serde_json-1.0.121.crate 147137 BLAKE2B 87c9bcf5a76a1fc3eb85f964caf386428207cffc895833befe746bef34df6aa4a66961e6770bcbe20e15b9843493bf23634142744d3805d25f5afed45d3dcd79 SHA512 a7f22e49405c05c93dcb715dd1137c7a2c563b60cb4ca0811d328d65f9c31e740d5cbd332e59b416585d84e9de4590cbaa06b6bc62efd394978aff03ad9d86a1
+DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST speedate-0.14.0.crate 31499 BLAKE2B e5a63d989feafcb5183e010a431976095bce6492817e0d163e8b0fe3d640e5ef87d11569e5094d788ad7cb113c2fe7b822cbf266027095fc6f2d61ba36e8d38e SHA512 55f8f9de2767e7a4aa8f355f9a781adb7c8fbef072393d13092afc9941dde4a1d706b02d908fc82cdffffa876a87e7a336340320908899774c83c76e743e1107
 DIST speedate-0.14.4.crate 33077 BLAKE2B 001a3329e90cf3dc5d8c4db870c3b5339e189190c8b7a89c262bb19efec02c9e42eeba0dd5d12a940a6fb3f8b10385aa05a72ea6f98230c989c68e0be4fe8959 SHA512 13ff498cb0885ecbe7a6fef96c48bca166a560598206b16b003e1237eafc525a0cbb6b401d060b4431a50a9638df88b7ae6834d8980f6474aea88cfc827ec329
@@ -147,8 +149,8 @@ DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb7
 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 uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
 DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
-DIST uuid-1.9.0.crate 47394 BLAKE2B 491fb0a074ef59b24df724d4d22b03ba90a7b15ac5611ef6316d81cb6ed81281d6a548ad4dbddd7039884cad20225c0d014eaa2918cb97da548c26c84325ae12 SHA512 d04b525d6f2452c2aeaa15de7b754a3ca9867ffb27f1d94df22ce5ba024996c890e06f4c69a9104399b364c7292570359f922ad7e6980f477b6b336c8ad5557a
 DIST uuid-1.9.1.crate 47492 BLAKE2B 195f14f6ed60809c5be69a7bf5905fea0ed36588563f741d3100aaf2837dd5db26bc8557f239dfccbc27b92f806eb7fc03d365dcd7444437882e7bbca3aa2138 SHA512 4d2a728155eea2fb065f72df36bf88092d0f7edb4d1a1472e380943ceba9cf7b396364238fbf33d5f8d7891664c94daa56f3dd58148258644ffb539d5804111e
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
diff --git a/dev-python/pydantic-core/pydantic-core-2.19.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.19.0.ebuild
deleted file mode 100644
index 878eefe9c51b..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.19.0.ebuild
+++ /dev/null
@@ -1,155 +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..12} )
-
-CRATES="
-	ahash@0.8.10
-	aho-corasick@1.0.2
-	autocfg@1.1.0
-	base64@0.21.7
-	bitflags@1.3.2
-	bitvec@1.0.1
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.13
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	funty@2.0.0
-	getrandom@0.2.10
-	hashbrown@0.14.3
-	heck@0.4.1
-	idna@0.5.0
-	indexmap@2.2.2
-	indoc@2.0.4
-	itoa@1.0.8
-	jiter@0.4.1
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	lock_api@0.4.10
-	memchr@2.6.3
-	memoffset@0.9.0
-	num-bigint@0.4.4
-	num-integer@0.1.45
-	num-traits@0.2.16
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	percent-encoding@2.3.1
-	portable-atomic@1.6.0
-	proc-macro2@1.0.76
-	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
-	python3-dll-a@0.2.9
-	quote@1.0.35
-	radium@0.7.0
-	redox_syscall@0.3.5
-	regex-automata@0.4.5
-	regex-syntax@0.8.2
-	regex@1.10.4
-	rustversion@1.0.13
-	ryu@1.0.14
-	scopeguard@1.1.0
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.116
-	smallvec@1.13.2
-	speedate@0.14.0
-	static_assertions@1.1.0
-	strum@0.25.0
-	strum_macros@0.25.3
-	strum_macros@0.26.1
-	syn@2.0.48
-	tap@1.0.1
-	target-lexicon@0.12.9
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.10
-	unicode-normalization@0.1.22
-	unindent@0.2.3
-	url@2.5.0
-	uuid@1.8.0
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-	wyz@0.5.1
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-"
-
-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-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${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
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.20.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.20.0.ebuild
deleted file mode 100644
index c9f9b02b0636..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.20.0.ebuild
+++ /dev/null
@@ -1,142 +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.21.7
-	bitvec@1.0.1
-	cc@1.0.100
-	cfg-if@1.0.0
-	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.4.1
-	heck@0.5.0
-	idna@0.5.0
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.5.0
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-bigint@0.4.5
-	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.0
-	pyo3-ffi@0.22.0
-	pyo3-macros-backend@0.22.0
-	pyo3-macros@0.22.0
-	pyo3@0.22.0
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.5
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.117
-	smallvec@1.13.2
-	speedate@0.14.0
-	static_assertions@1.1.0
-	strum@0.25.0
-	strum_macros@0.25.3
-	strum_macros@0.26.4
-	syn@2.0.68
-	tap@1.0.1
-	target-lexicon@0.12.14
-	tinyvec@1.6.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
-	uuid@1.9.0
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	wyz@0.5.1
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-"
-
-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-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${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
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.22.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.22.0.ebuild
deleted file mode 100644
index 6fc8b0f8c4b3..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.22.0.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.1
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.5.0
-	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.2
-	pyo3-ffi@0.22.2
-	pyo3-macros-backend@0.22.2
-	pyo3-macros@0.22.2
-	pyo3@0.22.2
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.5
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.204
-	serde_derive@1.0.204
-	serde_json@1.0.121
-	smallvec@1.13.2
-	speedate@0.14.4
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@2.0.68
-	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.9.1
-	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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${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
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.21.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.23.0.ebuild
index 6fc8b0f8c4b3..6fc8b0f8c4b3 100644
--- a/dev-python/pydantic-core/pydantic-core-2.21.0.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.23.0.ebuild
diff --git a/dev-python/pydantic-core/pydantic-core-2.23.1.ebuild b/dev-python/pydantic-core/pydantic-core-2.23.1.ebuild
new file mode 100644
index 000000000000..6c5c58be8e4e
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.23.1.ebuild
@@ -0,0 +1,167 @@
+# 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.1
+	indexmap@2.2.6
+	indoc@2.0.5
+	itoa@1.0.11
+	jiter@0.5.0
+	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.2
+	pyo3-ffi@0.22.2
+	pyo3-macros-backend@0.22.2
+	pyo3-macros@0.22.2
+	pyo3@0.22.2
+	python3-dll-a@0.2.10
+	quote@1.0.36
+	radium@0.7.0
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.5
+	rustversion@1.0.17
+	ryu@1.0.18
+	serde@1.0.204
+	serde_derive@1.0.204
+	serde_json@1.0.121
+	smallvec@1.13.2
+	speedate@0.14.4
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@2.0.68
+	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.9.1
+	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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${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.23.2.ebuild b/dev-python/pydantic-core/pydantic-core-2.23.2.ebuild
new file mode 100644
index 000000000000..6c5c58be8e4e
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.23.2.ebuild
@@ -0,0 +1,167 @@
+# 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.1
+	indexmap@2.2.6
+	indoc@2.0.5
+	itoa@1.0.11
+	jiter@0.5.0
+	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.2
+	pyo3-ffi@0.22.2
+	pyo3-macros-backend@0.22.2
+	pyo3-macros@0.22.2
+	pyo3@0.22.2
+	python3-dll-a@0.2.10
+	quote@1.0.36
+	radium@0.7.0
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.5
+	rustversion@1.0.17
+	ryu@1.0.18
+	serde@1.0.204
+	serde_derive@1.0.204
+	serde_json@1.0.121
+	smallvec@1.13.2
+	speedate@0.14.4
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@2.0.68
+	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.9.1
+	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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${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.23.3.ebuild b/dev-python/pydantic-core/pydantic-core-2.23.3.ebuild
new file mode 100644
index 000000000000..3717897afb88
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.23.3.ebuild
@@ -0,0 +1,167 @@
+# 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.5.0
+	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.2
+	pyo3-ffi@0.22.2
+	pyo3-macros-backend@0.22.2
+	pyo3-macros@0.22.2
+	pyo3@0.22.2
+	python3-dll-a@0.2.10
+	quote@1.0.36
+	radium@0.7.0
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	rustversion@1.0.17
+	ryu@1.0.18
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.128
+	smallvec@1.13.2
+	speedate@0.14.4
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@2.0.68
+	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.10.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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${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/Manifest b/dev-python/pydantic/Manifest
index 41468fad2cd1..448301d0989a 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,4 +1,5 @@
 DIST pydantic-2.7.4.tar.gz 714127 BLAKE2B c9d6df84799d1c8a69bf7d203609db3ba533380919d1f47ae84eb83186ef9ffbbab5bea9b9c4918c65d35d4b2103107df3c7e5e314195bd84807d216226490b6 SHA512 9a36041a24306761f2528aaca196d0b3e160cf46d71596fcd3df0169b9dd68ce810b88bcbe15dc9c0126551d0d7e33e4c3014b97daaf5d68ce68c0f8d6ffaf81
-DIST pydantic-2.8.0.tar.gz 738772 BLAKE2B d3a490afdc1fa9e6baf5b63a4760d98043c7d0b7bc46018af5701acbfeecae0e08ab171f386f817bfd0a36b702228bcd5c92bf8de36de2f36a7b87e181736129 SHA512 aa703ad04698f476b4a7d69f0a58e36cd8064c64e30e33e03a375d4986049e841abf24e5ef53f192101e484b645a12879087f171346d30747e2c35ebc763aa4e
-DIST pydantic-2.8.0b1.tar.gz 738470 BLAKE2B 13d9e19ea6cd78849b6ed507b20daf36c941e790d5cd291999755d00b0d4a289658b6b92316663205c893da0e41ea49073bda597f811592543ad1c30bcf9b4ee SHA512 9047543d8d281e3b9e18daff087c8cc8ba632392c9df9a1c2543c6d2d2eb1488c22a9c363417f64e2deaa576659254a2c2267241bfda7a4b5bf466377df8cd64
 DIST pydantic-2.8.2.tar.gz 739834 BLAKE2B d0168db26e02ac9fcf01fe85cd70c982e74f185dfce5075d4b365dba510d871550478ae98550882c425cdecfa3e31e674076906d8f71d1de947cc8d2cb55d3b8 SHA512 9d3b795ee43ccc4976a07c3770769758f023cc6763b8ef9ce4475d22c49d4dba80c8326d42106075b54a5d82c84722735e6017644755672b0f1cb0a4b624340a
+DIST pydantic-2.9.0.tar.gz 768298 BLAKE2B f196274c37af4b14b0ee17a5274d784a56ad2b2721ca022f572209348edb7e342ace1744e980ac5a8df0d8d7f9642d3157297f3cad24073b133ebb328b589673 SHA512 e4e2b961e831c1461446c1914176a5fca4b573ed5df7a4e5f1fe956b94568bf982e0ed0ee3ab8e08b518817b40dc76a24aaff95453a25e736890e5f0b30549d9
+DIST pydantic-2.9.0b2.tar.gz 767194 BLAKE2B 407bbadc4cb8f962cb331a9ccdfa70dd96729830a4c5532962105889536ac436f50552d3d6bac4e6840d44fc7c0ef2e94e1cab4b54be1565ac636436ca8a9b0a SHA512 a0d2491c14f58bbd376545551b128c0c396713a4a73786ac004ee4a0ff9b65a220c22f93aaa11239181bd87a600bc9b10c7d594b23286b909e8e6ea397eea81c
+DIST pydantic-2.9.1.tar.gz 768511 BLAKE2B 37d840042933a3fc3976ada31c2c1a26a127f64fd928ac8014c9e5047d5c30f29ab23a0f023c2d19c9daec7976c6f66c8dd1d0bd5f2507cff26f7aa0f103a30a SHA512 b35241a0956f41bfcb9f61f34a5fead2c88a266a721d0dea584068f58c72fceda1a70236ca1f3c242c9ef22ac8f7e444b48e212088a3e7e7754008652a028664
diff --git a/dev-python/pydantic/pydantic-2.8.0.ebuild b/dev-python/pydantic/pydantic-2.8.0.ebuild
deleted file mode 100644
index d6a74874e59a..000000000000
--- a/dev-python/pydantic/pydantic-2.8.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=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.4.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/cloudpickle[${PYTHON_USEDEP}]
-		' 3.{10..12})
-		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/pytest-mock[${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.8.0_beta1.ebuild b/dev-python/pydantic/pydantic-2.8.0_beta1.ebuild
deleted file mode 100644
index d6a74874e59a..000000000000
--- a/dev-python/pydantic/pydantic-2.8.0_beta1.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=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.4.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/cloudpickle[${PYTHON_USEDEP}]
-		' 3.{10..12})
-		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/pytest-mock[${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.9.0.ebuild b/dev-python/pydantic/pydantic-2.9.0.ebuild
new file mode 100644
index 000000000000..71f250503608
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.9.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="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.4.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.23.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}]
+	)
+"
+
+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.9.0_beta2.ebuild b/dev-python/pydantic/pydantic-2.9.0_beta2.ebuild
new file mode 100644
index 000000000000..df46d14b9d31
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.9.0_beta2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="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.4.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.23.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}]
+	)
+"
+
+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.9.1.ebuild b/dev-python/pydantic/pydantic-2.9.1.ebuild
new file mode 100644
index 000000000000..c0437592e002
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.9.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="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.23.3[${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}]
+	)
+"
+
+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/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 2b0b79ec29f6..29a408ed3e1e 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1 +1,2 @@
 DIST pyftpdlib-1.5.10.tar.gz 204487 BLAKE2B 7c611498dc2d11f752bf6a0ada01d906fca5c28e93b21bbcaaa76fafc88dcfe7afe616eb06f102123e614e061db2b6b62766f5036d749f8bd2b6d5cc35fc52e8 SHA512 c8c28d7aab13f2aab222ae038bde96f17abefd461830813ca00b621a6ee3e809c59ed135149ba735e7e92a6722aecfaf7095ccbacd7b3e17a16ee69fe1668766
+DIST pyftpdlib-2.0.0.tar.gz 196108 BLAKE2B bec261eac70a93092055413fca67dd4a480e492481f027b32508dcee8b479dbc0ec84c56d972dca63f2fbf4e3240e02b1c2877105cf77130bf75b64c9785993e SHA512 c154127771b949854c05f87a7b77f1cf144e2756cb0709c44cd0921c2ac415e7c6336c6dca1982b762087a42fc1408e26fbb2ebecbf9255d6f2d6019af14ccfe
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
new file mode 100644
index 000000000000..72e399571136
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
@@ -0,0 +1,65 @@
+# 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="ssl(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="
+	https://github.com/giampaolo/pyftpdlib/
+	https://pypi.org/project/pyftpdlib/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples ssl"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pyasynchat[${PYTHON_USEDEP}]
+		dev-python/pyasyncore[${PYTHON_USEDEP}]
+	' 3.12 3.13)
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_test() {
+	rm -rf pyftpdlib || die
+	# Some of these tests tend to fail
+	local EPYTEST_DESELECT=(
+		# fail because they process sys.argv and expect program args
+		# rather than pytest args, sigh
+		test/test_misc.py
+		# TODO
+		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
+	)
+	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
+	local -x TZ=UTC+1
+	# Skips some shoddy tests plus increases timeouts
+	local -x TRAVIS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs pyftpdlib
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfuse3/Manifest b/dev-python/pyfuse3/Manifest
index 4b6c7350f565..bc025ba7f1f3 100644
--- a/dev-python/pyfuse3/Manifest
+++ b/dev-python/pyfuse3/Manifest
@@ -1 +1,2 @@
 DIST pyfuse3-3.3.0.tar.gz 867765 BLAKE2B 29a871bbd4c82298231eac0c8d4b668a75a9ea748c3dd15f093a369770fbfe080620b6209c79ce934880757764c946c3216b558dcc63cd1d1a7ef03e124174c2 SHA512 b23116104fc78e9d6688e05f495a1cc48ff2c0af03a537c1f2743f84a596ba36b59e1ccba2e8272a0483c083479df91be2ccd49bd2e0cb160ff02a74ad623d18
+DIST pyfuse3-3.4.0.tar.gz 962992 BLAKE2B 44bacb061a29034ac02879ace6d727fb99e5341b59233788575b9d460bbef93152d4c29f855fa82966490d228f4c0e7f829d43940d3a36d963618276c5ba9bd1 SHA512 44220578d411abd8c75f9f3a88671dad96407ad261942f7ceb1e86454c9c0ed49cb5e8a8f533c8bddadf189382a75475e4641b2917dd83110cd5e2f6bd733db1
diff --git a/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild b/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild
new file mode 100644
index 000000000000..00e4368cc5d5
--- /dev/null
+++ b/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild
@@ -0,0 +1,40 @@
+# 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="Python 3 bindings for libfuse 3 with asynchronous API"
+HOMEPAGE="
+	https://github.com/libfuse/pyfuse3/
+	https://pypi.org/project/pyfuse3/
+"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	sys-fs/fuse:3
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/trio[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_configure() {
+	esetup.py build_cython
+}
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 55bfe93265da..721afccd8121 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,2 +1 @@
-DIST pygal-3.0.4.gh.tar.gz 3575681 BLAKE2B 1d7b487d17e754323a54a8840f15f722186d4a782883a65f75886e4cd063e20bf0239ef1f1a3ed619f42a83a3fff21ecf9f3613564b716a2765604d64ca0f98c SHA512 5e7e4e7eb5d4a8ccd08fc90ae68bcb7c24f6c1fa36cbe64130f2eda03ff2d3f1caab853691d0e67a02de6b4f64a530f3c5c6ae69815d248819c44923b634e8dd
 DIST pygal-3.0.5.gh.tar.gz 3569999 BLAKE2B bbaffabf2da2aecd4745db0f6b3911495d825b7d5e5fb570052d1d742251836a4bfb079c8242dde74e7b62b6738f89ff1b3cc049debe64299440ba10a74cc5ae SHA512 08aa7d83d7db59f9e088cb3ad661105b52fded9a66f51c80b151656b3b6e28a83564829f32dbfe6e56a81006510fea87ed937f12e290ae897ca70ec54d9aa9d3
diff --git a/dev-python/pygal/pygal-3.0.4-r1.ebuild b/dev-python/pygal/pygal-3.0.4-r1.ebuild
deleted file mode 100644
index 81f86869ec86..000000000000
--- a/dev-python/pygal/pygal-3.0.4-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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="
-	https://github.com/Kozea/pygal/
-	https://pypi.org/project/pygal/
-"
-SRC_URI="
-	https://github.com/Kozea/pygal/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		media-gfx/cairosvg[${PYTHON_USEDEP}]
-	)
-"
-
-# CHANGELOG is a symlink to docs/changelog.rst
-DOCS=( docs/changelog.rst README.md )
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Not actually required unless we want to do setup.py test
-	# https://github.com/Kozea/pygal/issues/430
-	sed -i -e "/setup_requires/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "improving rendering speed" "dev-python/lxml"
-	optfeature "png rendering" "dev-python/cairosvg"
-}
diff --git a/dev-python/pygal/pygal-3.0.5.ebuild b/dev-python/pygal/pygal-3.0.5.ebuild
index 0371adddd640..81f86869ec86 100644
--- a/dev-python/pygal/pygal-3.0.5.ebuild
+++ b/dev-python/pygal/pygal-3.0.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/importlib-metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/pygame/pygame-2.6.0.ebuild b/dev-python/pygame/pygame-2.6.0.ebuild
index 19632cccbe57..6fbaccbb4435 100644
--- a/dev-python/pygame/pygame-2.6.0.ebuild
+++ b/dev-python/pygame/pygame-2.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch b/dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch
new file mode 100644
index 000000000000..5a65fd826fff
--- /dev/null
+++ b/dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch
@@ -0,0 +1,107 @@
+diff --git a/unittests/test_cpp_standards.py b/unittests/test_cpp_standards.py
+index eb28418..7c76c73 100644
+--- a/unittests/test_cpp_standards.py
++++ b/unittests/test_cpp_standards.py
+@@ -23,7 +23,8 @@ class Test(parser_test_case.parser_test_case_t):
+         if "gccxml" in self.config.xml_generator:
+             return True
+ 
+-        parser.parse(["cpp_standards.hpp"], self.config)
++        parser.parse(["cpp_standards.hpp"], self.config,
++        parser.COMPILATION_MODE.ALL_AT_ONCE)
+ 
+         if platform.system() != 'Windows':
+             self.config.cflags = "-std=c++98"
+@@ -33,7 +34,8 @@ class Test(parser_test_case.parser_test_case_t):
+             parser.parse(["cpp_standards.hpp"], self.config)
+ 
+         self.config.cflags = "-std=c++11"
+-        parser.parse(["cpp_standards.hpp"], self.config)
++        parser.parse(["cpp_standards.hpp"], self.config,
++        parser.COMPILATION_MODE.ALL_AT_ONCE)
+ 
+         # This is broken with llvm 3.6.2 (the one from homebrew)
+         # It should work with never llvms but I keep the test disabled
+diff --git a/unittests/test_non_copyable_recursive.py b/unittests/test_non_copyable_recursive.py
+index cd78a9a..e18d58f 100644
+--- a/unittests/test_non_copyable_recursive.py
++++ b/unittests/test_non_copyable_recursive.py
+@@ -27,7 +27,7 @@ class Test(parser_test_case.parser_test_case_t):
+         RuntimeError: maximum recursion depth exceeded while
+         calling a Python object
+         """
+-        decls = parser.parse([self.header], self.config)
++        decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+         global_ns = declarations.get_global_namespace(decls)
+ 
+         # Description of the problem (before the fix):
+@@ -52,7 +52,7 @@ class Test(parser_test_case.parser_test_case_t):
+         RuntimeError: maximum recursion depth exceeded while
+         calling a Python object
+         """
+-        decls = parser.parse([self.header], self.config)
++        decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+         global_ns = declarations.get_global_namespace(decls)
+ 
+         # Real life example of the bug. This leads to a similar error,
+diff --git a/unittests/test_null_comparison.py b/unittests/test_null_comparison.py
+index 51caf4a..787ae79 100644
+--- a/unittests/test_null_comparison.py
++++ b/unittests/test_null_comparison.py
+@@ -22,7 +22,7 @@ class Test(parser_test_case.parser_test_case_t):
+         Test for None comparisons with default arguments
+         """
+ 
+-        decls = parser.parse([self.header], self.config)
++        decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+         global_ns = declarations.get_global_namespace(decls)
+ 
+         ns = global_ns.namespace("ns")
+diff --git a/unittests/test_overrides.py b/unittests/test_overrides.py
+index 9204efc..5ac1b25 100644
+--- a/unittests/test_overrides.py
++++ b/unittests/test_overrides.py
+@@ -23,7 +23,7 @@ class Test(parser_test_case.parser_test_case_t):
+     def setUp(self):
+ 
+         if not self.global_ns:
+-            decls = parser.parse([self.header], self.config)
++            decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+             Test.global_ns = declarations.get_global_namespace(decls)
+             Test.xml_generator_from_xml_file = \
+                 self.config.xml_generator_from_xml_file
+diff --git a/unittests/test_pattern_parser.py b/unittests/test_pattern_parser.py
+index 00a6805..4882c26 100644
+--- a/unittests/test_pattern_parser.py
++++ b/unittests/test_pattern_parser.py
+@@ -27,7 +27,7 @@ class Test(parser_test_case.parser_test_case_t):
+         if self.config.xml_generator == "gccxml":
+             return
+ 
+-        decls = parser.parse([self.header], self.config)
++        decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+ 
+         for decl in declarations.make_flatten(decls):
+             if "myClass" in decl.name:
+@@ -44,7 +44,7 @@ class Test(parser_test_case.parser_test_case_t):
+         if self.config.xml_generator == "gccxml":
+             return
+ 
+-        decls = parser.parse([self.header], self.config)
++        decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+         global_ns = declarations.get_global_namespace(decls)
+         criteria = declarations.declaration_matcher(name="myClass")
+         _ = declarations.matcher.find(criteria, global_ns)
+diff --git a/unittests/test_smart_pointer.py b/unittests/test_smart_pointer.py
+index e9183b7..4a85860 100644
+--- a/unittests/test_smart_pointer.py
++++ b/unittests/test_smart_pointer.py
+@@ -22,7 +22,7 @@ class Test(parser_test_case.parser_test_case_t):
+     def setUp(self):
+         if self.config.xml_generator == "gccxml":
+             return
+-        decls = parser.parse([self.header], self.config)
++        decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE)
+         self.global_ns = declarations.get_global_namespace(decls)
+ 
+     def test_is_smart_pointer(self):
diff --git a/dev-python/pygccxml/pygccxml-2.5.0.ebuild b/dev-python/pygccxml/pygccxml-2.5.0.ebuild
index ba61c6612e8e..f9950b4f3f47 100644
--- a/dev-python/pygccxml/pygccxml-2.5.0.ebuild
+++ b/dev-python/pygccxml/pygccxml-2.5.0.ebuild
@@ -40,6 +40,7 @@ EPYTEST_DESELECT=(
 
 python_prepare_all() {
 	local PATCHES=(
+		"${FILESDIR}/${PN}-2.5.0-fix-tests.patch"
 		"${FILESDIR}/${PN}-2.4.0-doc.patch"
 		# https://github.com/CastXML/pygccxml/pull/179
 		"${FILESDIR}/${P}-which.patch"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 52f491d02dff..5a4333b9eb7a 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,2 +1,2 @@
-DIST pyghmi-1.5.69.tar.gz 257074 BLAKE2B af1b93bda37aa078c4a04f68970f86a2f6b7c005ed762977d8297bdb4ff8e89c972ec24342ccb226a6cb43d6085f89f23e4e8547e1632275accea0fc5f5558ff SHA512 ad6837b61748ff045196109050fc743e0335b9037e06c723be86e12c42569f6e46b2c004148b4ce4416d0e67967bf6b7596bc10bca30323e2eca11da54067f21
-DIST pyghmi-1.5.70.tar.gz 257192 BLAKE2B cf1ed047bf40e6ed81d322c091141b8012d7550afeba06fb5bed313ce37e2c5d79674a2d9deb1ade741488342d5e3d89ab3b65dfeb15e46aca52ebc3ca5b4dcc SHA512 61d6488034778a51e7a3ed34dadf758a98ed9670f079f6b90b4266191abd48aae5646e497b8ea9616eb1bce03f358b0017c7da1daea61e8be97d42bb1bfe1f18
+DIST pyghmi-1.5.71.tar.gz 258623 BLAKE2B 1032101d1c8b145896a6ccb99a66830c5327fa71c991be95fc6af0fca87f2a3491ae04195d10e2696f67285f79c96750413cfd1050297c1e1340a49f67694ba2 SHA512 77aa8f05bf003b4be803a6c74e1c0040a23a0270094c72ba58aaab0b56e7fdd68691c0c642d7116a62a3a66fafb0bf67d718373b7e67c7b6c6165dec78884d4d
+DIST pyghmi-1.5.72.tar.gz 260374 BLAKE2B e68420c86e98de450ddc873bd29bfb64b9651b5b4dc14990b7147ab7973d1b9ee1d4fc6ce4ebdcf460b0ff8d8575ac8f7db77caabff40fe984d7ca5eb03dccf4 SHA512 c9cc5486d6bea6e9ef60f4b98328f42690350432c5b742adb8f69e136a1f001bd47c078ac52a4d147d636e694e4a1efb9a9fe1b704559afe9303020bb0c86d73
diff --git a/dev-python/pyghmi/pyghmi-1.5.69.ebuild b/dev-python/pyghmi/pyghmi-1.5.69.ebuild
deleted file mode 100644
index f4adcb0eed3b..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.69.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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/pyghmi/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyghmi/pyghmi-1.5.70.ebuild b/dev-python/pyghmi/pyghmi-1.5.71.ebuild
index 60628881477b..60628881477b 100644
--- a/dev-python/pyghmi/pyghmi-1.5.70.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.5.71.ebuild
diff --git a/dev-python/pyghmi/pyghmi-1.5.72.ebuild b/dev-python/pyghmi/pyghmi-1.5.72.ebuild
new file mode 100644
index 000000000000..60628881477b
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.72.ebuild
@@ -0,0 +1,33 @@
+# 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 pure python implementation of IPMI protocol"
+HOMEPAGE="
+	https://opendev.org/x/pyghmi/
+	https://pypi.org/project/pyghmi/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyglet/pyglet-2.0.17.ebuild b/dev-python/pyglet/pyglet-2.0.17.ebuild
index 5993f74d2714..8b6381b24b5f 100644
--- a/dev-python/pyglet/pyglet-2.0.17.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.17.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pygobject/pygobject-3.46.0-r1.ebuild b/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
index e4aa1faf8753..ef9fe0879cb0 100644
--- a/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/pygobject-3.46.0.ebuild b/dev-python/pygobject/pygobject-3.46.0.ebuild
deleted file mode 100644
index 99eb180556b9..000000000000
--- a/dev-python/pygobject/pygobject-3.46.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit gnome.org meson virtualx xdg distutils-r1
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="
-	https://pygobject.readthedocs.io/
-	https://gitlab.gnome.org/GNOME/pygobject/
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/gobject-introspection-1.64:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=app-accessibility/at-spi2-core-2.46.0[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-python_configure() {
-	local emesonargs=(
-		$(meson_feature cairo pycairo)
-		$(meson_use test tests)
-		-Dpython="${EPYTHON}"
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-	meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
-}
-
-python_install() {
-	meson_src_install
-	python_optimize
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 24d15a7c8f7e..9f93d8a3a528 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1 +1,2 @@
 DIST pylint-3.2.6.gh.tar.gz 1447684 BLAKE2B 22ec600b327b405dfdd7a9ffe94b20faeed6cca92dbfff8e96baa6bebe5c049b90da55f16e84e53d4a22fdbcb5a8caf7719038935522235ccf3364fe2492c16c SHA512 ba7e87f3eaca088b88cec35ae8d1dbd15ec2167a615638b1fe7c1abb711d54742e5fb2d2c9c2836294c464b98ec32d53efaf5afb170d4cb73dacf966dddca62c
+DIST pylint-3.2.7.gh.tar.gz 1448329 BLAKE2B 4ec4a0e2a886e7acc4694582e7f7902b6806750a12286986533a4e57c68eeac96bec43bb4cef2de6ec0a7811cde5ec2cc03226b2213d1b2107aafe73db03c32d SHA512 66dbf0f05aa7aac59f43cab6a1f23c29a3a37d9a19f2c54af0e0aa6f2630fc74d7602a6b6a250e1e02a24723d0513c54a7ee704026af16c8acc50b843708fd98
diff --git a/dev-python/pylint/pylint-3.2.7.ebuild b/dev-python/pylint/pylint-3.2.7.ebuild
new file mode 100644
index 000000000000..0cd2ec935a5d
--- /dev/null
+++ b/dev-python/pylint/pylint-3.2.7.ebuild
@@ -0,0 +1,93 @@
+# 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 )
+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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-3.3[${PYTHON_USEDEP}]
+	>=dev-python/astroid-3.2.4[${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[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${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[recursion_error_3159]'
+		'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/pyopengl/pyopengl-3.1.7-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.7-r1.ebuild
index 586b19b8525e..54da47bbaf46 100644
--- a/dev-python/pyopengl/pyopengl-3.1.7-r1.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.7-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index e2b8f6579057..f0f79efecdda 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1 +1,2 @@
 DIST pyparsing-3.1.2.tar.gz 889571 BLAKE2B 69dc249c8760470e9611c367255176afcbfdf299b739c8e191f71b88653e0d35db3a20d156ae6507a1748f775b0853c127986d9de2124edc12e22453a75b908d SHA512 1134949f3576edbec4438eefe952eb5cc6e734fb060905d714b6a77f71e90d364b01345df5e7b8fb5ffa798c530be9c65f6d152b3f591cba787660c4dd8894d2
+DIST pyparsing-3.1.4.tar.gz 900231 BLAKE2B 121092316528a69f79a8fac5e903de513c4193bd00d5ef7e98dfcb09f3a48eb3384217ede39b0f954f58bdade8644931ce8cef41729539fc1be3dfb910b90be7 SHA512 b475e5571510cd7b07fecbc8ae583b1e75a6308b64018d2884570dfa461e0529b96d02d11403cecac41f92b5d802a5dd4bbf9f8321d58ffa2d24cb89b86652e1
diff --git a/dev-python/pyparsing/pyparsing-3.1.4.ebuild b/dev-python/pyparsing/pyparsing-3.1.4.ebuild
new file mode 100644
index 000000000000..f97642f139e3
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-3.1.4.ebuild
@@ -0,0 +1,47 @@
+# 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 ~ia64 ~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
+
+EPYTEST_IGNORE=(
+	# railroad-diagrams not packaged (and not suitable for packaging yet)
+	tests/test_diagram.py
+)
+
+EPYTEST_DESELECT=(
+	# also railroad-diagrams
+	tests/test_examples.py::TestExamples::test_range_check
+	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
+)
+
+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/pypiserver/pypiserver-2.1.1.ebuild b/dev-python/pypiserver/pypiserver-2.1.1.ebuild
index d3d76d83fd1d..f8fc1b55dd34 100644
--- a/dev-python/pypiserver/pypiserver-2.1.1.ebuild
+++ b/dev-python/pypiserver/pypiserver-2.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/bottle[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6.ebuild
index 7a06a39df7e1..3a270dc74904 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6.ebuild
@@ -143,7 +143,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.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/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index b86f69ef4f9d..c2d3df247513 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -2,3 +2,4 @@ DIST pyproject_fmt-2.1.3.tar.gz 9016 BLAKE2B 742d29283f883f36a6705b7461345593205
 DIST pyproject_fmt-2.1.4.tar.gz 9023 BLAKE2B 1a44332ea829efb22d7b561abef1f362f7eb6ca4682586511e4a87c8f26f55a510f2a1f5e065ec21208c04f754dd729133c859f5d388b0af94578c53bab55d1e SHA512 95e4f99c2ded8f69dca4bbca208512ca17e6fc1e7e13a247f2932c7539ff802a4ed6a822c4ffbada749d4eef15aafd7189f85d722e41360b3523c2b633e15d99
 DIST pyproject_fmt-2.2.0.tar.gz 9135 BLAKE2B e4ea7a11168257978fb607a7c1dcb6e9450d139c7db5f2e45fe065ddbd5e6edfca97b4f7dd80bd7cd632068ae86cca7ef7efbd2850cac4237065319f554c5366 SHA512 97d4e8e881b39fd47f0b2b96b413e6f4462bf35e4a9797811487931188bbfcb971e744012ebee545ede0ff94d7ebf2abee0b97b965ed452628c49c69fd47070e
 DIST pyproject_fmt-2.2.1.tar.gz 9175 BLAKE2B 8968163f175c22a7532a8f582d522708a4c5740a682a617fd8539009a5409d0d6f6f5679c754ac6023047923837675191c35906d0876b4e728d00e135cfd3c5a SHA512 ac2dea741cff18e0a12daf6e0076b1fc42bdb097f10a8f49a8d131fc37e4c16f811b95fb537e0c0a852eaa6fcc8c6efd9331be3087748720fc436daee0c7285d
+DIST pyproject_fmt-2.2.3.tar.gz 9157 BLAKE2B a9cc1771c05d504fa0e7321f1c97cfd09f44a39ec7bdadbbba31f0fbe62b955a1689aa2ff8edb0274e5f352cca872591babd7f6c62189cf5bee1567ffb1f306d SHA512 404b038aa7d189d17e2c1df873e4bc50a199dcb193c064e19eb54a5f671fdcdc2c51ce9b19dff10e6c0dda089aee7070f7408892b6ca393abc2ed5b5ff666812
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.2.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.2.1.ebuild
index 9bc087b77648..99508eb2bf87 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.2.1.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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"
 
 RDEPEND="
 	~dev-python/pyproject-fmt-rust-1.1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.2.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.2.3.ebuild
new file mode 100644
index 000000000000..6596694032a6
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.2.3.ebuild
@@ -0,0 +1,36 @@
+# 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 pypi
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	~dev-python/pyproject-fmt-rust-1.1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${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
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 99f05463c4e2..cfb7f821ecac 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -6,3 +6,11 @@ DIST pypy-exe-7.3.16-1.ppc64le-musl.gpkg.tar 6707200 BLAKE2B 3d3a3d0c0fef3a69c6c
 DIST pypy-exe-7.3.16-1.ppc64le.gpkg.tar 11038720 BLAKE2B 1a7aa31d9ec59a3aeb57c254d2b9efde9d02aba1663683999f1ebae95b2ad0c68a2fc8e4806420b1ad9f45ce4767f8e048b9607d1f124291770a99b423ae799f SHA512 5659cdb5a4a001d9c878670b0f5e7d06e6aa55d8fab403ab80a98e6b362bb8185b01fe4af092cc9042a1762ca52cc0ce81937c84240d08ebb84071cd860559e2
 DIST pypy-exe-7.3.16-1.x86-musl.gpkg.tar 9912320 BLAKE2B c6a42ce64cfda1a148af49e0876b640fb3ecaa7e70b5d5b22e58b9796c11b0e4d9fb5536927b7b20b05b9eaa2210333cb1b1be81581483a21a7a3699e5721e01 SHA512 8964ece7482218e06ab65b790f8f1fcf15a94c270daa9a2381b35ae335717a02f0b32947578fa03f0905a0783cb5fcf3ef03cb87a7ceaa7110c8593e483a971e
 DIST pypy-exe-7.3.16-1.x86.gpkg.tar 9861120 BLAKE2B b83fa9e3c3bbbd7c49ea2fdceabd7125e0db36ee20c2b71969833512f69070e07a1485ab830261f34e2571dbd48b9b65ffb580e9f8ae4b667626ca81b560c493 SHA512 eb2be6886126c675fc85458d34a0bcdd1da1415c843448e39d413b80d363698cb48b3b68bf8869b5ef898f0543966ab501bd4db545d7659705c279bf4de29ae6
+DIST pypy-exe-7.3.17-1.amd64-musl.gpkg.tar 12974080 BLAKE2B 965c086bb660e50c8c58a2c4ffdb9d762d7d99a4c2bc619af4c7b5916dce263170809f75af24f34f7ea8d60f4c1aea8dace5102493363e0fc4d55bd994234cf5 SHA512 731c5f4f9680466e848ee08e3e459773fef5d36622092b4479852aed3ef069a0a544a7711312b65b2c40e3cb96e56037301d09b51ec775842d67e8416ea0200c
+DIST pypy-exe-7.3.17-1.amd64.gpkg.tar 12881920 BLAKE2B ade52bb94ef78629ca6154b8e149e4cb1af72efae3c1f30217659532b68aac50e083c378d029c25f9ec5c6d7323467fcba91af1c1d1d9f6ba375669b2df9099a SHA512 4d4861858daa9046fb036cd489dd6a13e5490034aadc60bdc49e05a3edee4b95578a41b635bc3b95a7eb5ff59375585a44956914a9003765fab2585750118848
+DIST pypy-exe-7.3.17-1.arm64-musl.gpkg.tar 10977280 BLAKE2B fc56e03dc73a2c1881f6adcfa30eee3069a3ffc7b7efc77e85703bb831f2b183f794104f39934e78b29f4e1fea42f520200e456fe9902fe13efdfcaaba5dba67 SHA512 28af13342a8f0d9c435106b0f7c991ddaecdd995ff1f3c84cdc85ae78d69e6d7088e488776eb10f933aec20b0ce0522a2c4b2ef6efddff6fdab5a5e6c3e80d63
+DIST pypy-exe-7.3.17-1.arm64.gpkg.tar 10905600 BLAKE2B f6eafea6599d466f7acf8296ef59b3b2e8ca55b9dee69088dcd13067b3b0ceeca7baeff9ebf1b316b8db8f041046f9989c37b3ce26b194cce76e702fd4957872 SHA512 e44012949a4ac94b5d5b70577de531e0c52faed280c5c4666d2fb398f24458241117fa4844b323446e4df3801e2fa16fa252f729d25e5cd4ca5adc32a995dd21
+DIST pypy-exe-7.3.17-1.ppc64le-musl.gpkg.tar 6696960 BLAKE2B 805d8fb087b8123437fc1bda16c6686d36cf51a574e3a5dd2d245a42f5bc3574315875f84bf4cb88c9c388d1cd8879332d76913228619900643b4beb592efe87 SHA512 cb886d1f14cd01f53deb5a6f80d7ee0f0298722fd43c897970179165c8aecede86526f77ad185558e9bb2fe8384d88f16d1a75d45e50f1a4f35448c545fb4dac
+DIST pypy-exe-7.3.17-1.ppc64le.gpkg.tar 11110400 BLAKE2B b8e3f503f448226c7d59942281cb64fe4bd648a5777ec483de0f549221ddcf71f347f88b9c11070f8875657851e07cfdf4e9ef634e811c0a3dda664cd04543ca SHA512 e4e2f16e2eed8946a1ad07ba3d4ba8677beeda3731b46838a5284e6309b3966ddf8fa9992c4519b19797f633d2288d4f231fc41e992e83683de0ad7b239c5d22
+DIST pypy-exe-7.3.17-1.x86-musl.gpkg.tar 9891840 BLAKE2B 3391ad3558baa88741a38549e12666ee669d5949f234e104e5687001928aaf7836573192ded6342fd690337589da10d4f45389c02d15cf3bc10ebc4a7de2d12c SHA512 cf30b7c8f779317126ced75d84b383644a4d90cc65a9d2e75019dd68bb29079fdb0e96312c26ee3f7185f6c64e3a7a0c21d66fdcf18a5c68ce87936dd49d6043
+DIST pypy-exe-7.3.17-1.x86.gpkg.tar 9850880 BLAKE2B 08487e276cf616c5c9191a0a29cc6a297f9eab5ce8382d591b01e7da3239b4bef482bba1566b17ca85f3729b4d5ae6bef6d13940b5e7b1dcd9a7b03d7eaec2ac SHA512 70f6660321483361a1de6e5ccf2854daf892282858d2a0a00ce3055103d7f90f1788cea4b5b18913f11c17ce0f6c999551ee5374f897717d33eb06e913310960
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.17.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.17.ebuild
new file mode 100644
index 000000000000..c45dc2f35843
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.17.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy-exe:${SLOT}
+"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}
+"
+
+src_install() {
+	insinto /
+	doins -r */image/usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 07bbe9c11ef5..70f1cb0dfe14 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,2 +1,4 @@
 DIST pypy2.7-gentoo-patches-7.3.16.tar.xz 5312 BLAKE2B b265dd7afee097ad66bacd9df01514eed6bb30afe19410b2594ee7c2d61ababc67e11c0dd0392a0b1f81e0bc609963cde044834ab24e67d007d101b8aa8052cb SHA512 0d0309f3ed7314f6d310b0e34eedbbfdcc5a75d9bbd59b9071e567968bb10925549435776fab5bc7ec97e2b3422921dc282619427f930d89df6c7bc98ea701c1
+DIST pypy2.7-gentoo-patches-7.3.17.tar.xz 5324 BLAKE2B 866f172a6df6f0e94a98c611b37ae58635623e33a47619a5e44658d3908337a3f9029ff7de6997f760c3f1679fc83bfc6ddfb66852c492a581b3336b5eec3ed2 SHA512 6ce5266d0748f3c18a5546aa2bd8479ecb45923eb7df8a140a195e7f7b44999b9167ffdd44f7fd789ddd3a62cd77cb917863b0144180a1127befce1f290e650a
 DIST pypy2.7-v7.3.16-src.tar.bz2 19843601 BLAKE2B 9c37a03561fcdf742eccde760f6cadcbc2e1b140dd6d3e67856cc072e0c3db85759c398f590ed44fb4e4ed2f5f7745d5589cb9a95cefcbec79f3b1be6c4956e1 SHA512 131635433e53d4d86730a3daf1ad81799a7dd1117511618cc2607ac7234ce3aa5c833400df09cbd3376a391e125d6d2ec3471f120f81a6d53700f5c3d087793c
+DIST pypy2.7-v7.3.17-src.tar.bz2 19907140 BLAKE2B de62ebc4e8102867effdecddca64c19c40458b112a6a56ac0c95247047b9f5437a5da68dffb51c14c21bce463c2ca489c6e6a4f86e8cc597b57df2eca707081e SHA512 82b2b9dbf0ea32c405ddc53d98a3a7a153f494d286e8719a0c40960168aadc0f49c3b313416488338f7f51c8fdb58120de41b1d47a8c8eda7db6d4ec4273b4eb
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.17.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.17.ebuild
new file mode 100644
index 000000000000..1d0e028d87c8
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.17.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+RDEPEND="
+	${DEPEND}
+	!dev-python/pypy-exe-bin:${PYPY_PV}
+"
+# don't enforce the dep on dev-python/pypy with USE=low-memory
+# since it's going to cause circular dep with unhelpful error message
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)
+"
+
+check_env() {
+	if ! has_version -b dev-python/pypy; then
+		if use low-memory; then
+			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
+			eerror "installed."
+		else
+			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
+			ewarn "recommends using (a prior version of) dev-python/pypy instead."
+		fi
+		elog "You can install a prebuilt version of PyPy first using e.g.:"
+		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+
+		if use low-memory; then
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+	fi
+
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp
+	if use low-memory || has_version -b dev-python/pypy; then
+		einfo "Using already-installed PyPy to perform the translation."
+		interp=( pypy )
+		if use low-memory; then
+			local -x PYPY_GC_MAX_DELTA=200MB
+			interp+=( --jit loop_longevity=300 )
+		fi
+	else
+		einfo "Using CPython 2.7 to perform the translation."
+		interp=( python2.7 )
+
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 07bbe9c11ef5..70f1cb0dfe14 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,2 +1,4 @@
 DIST pypy2.7-gentoo-patches-7.3.16.tar.xz 5312 BLAKE2B b265dd7afee097ad66bacd9df01514eed6bb30afe19410b2594ee7c2d61ababc67e11c0dd0392a0b1f81e0bc609963cde044834ab24e67d007d101b8aa8052cb SHA512 0d0309f3ed7314f6d310b0e34eedbbfdcc5a75d9bbd59b9071e567968bb10925549435776fab5bc7ec97e2b3422921dc282619427f930d89df6c7bc98ea701c1
+DIST pypy2.7-gentoo-patches-7.3.17.tar.xz 5324 BLAKE2B 866f172a6df6f0e94a98c611b37ae58635623e33a47619a5e44658d3908337a3f9029ff7de6997f760c3f1679fc83bfc6ddfb66852c492a581b3336b5eec3ed2 SHA512 6ce5266d0748f3c18a5546aa2bd8479ecb45923eb7df8a140a195e7f7b44999b9167ffdd44f7fd789ddd3a62cd77cb917863b0144180a1127befce1f290e650a
 DIST pypy2.7-v7.3.16-src.tar.bz2 19843601 BLAKE2B 9c37a03561fcdf742eccde760f6cadcbc2e1b140dd6d3e67856cc072e0c3db85759c398f590ed44fb4e4ed2f5f7745d5589cb9a95cefcbec79f3b1be6c4956e1 SHA512 131635433e53d4d86730a3daf1ad81799a7dd1117511618cc2607ac7234ce3aa5c833400df09cbd3376a391e125d6d2ec3471f120f81a6d53700f5c3d087793c
+DIST pypy2.7-v7.3.17-src.tar.bz2 19907140 BLAKE2B de62ebc4e8102867effdecddca64c19c40458b112a6a56ac0c95247047b9f5437a5da68dffb51c14c21bce463c2ca489c6e6a4f86e8cc597b57df2eca707081e SHA512 82b2b9dbf0ea32c405ddc53d98a3a7a153f494d286e8719a0c40960168aadc0f49c3b313416488338f7f51c8fdb58120de41b1d47a8c8eda7db6d4ec4273b4eb
diff --git a/dev-python/pypy/pypy-7.3.17.ebuild b/dev-python/pypy/pypy-7.3.17.ebuild
new file mode 100644
index 000000000000..6b22f2365c0c
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.17.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy-c - <<-EOF
+			import sysconfig
+			print sysconfig.get_config_var("SOABI")
+		EOF
+	)
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	if use full-stdlib; then
+		# Generate Grammar and PatternGrammar pickles.
+		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+			import lib2to3.pygram
+			import lib2to3.patcomp
+			lib2to3.patcomp.PatternCompiler()
+		EOF
+
+		# Generate cffi modules
+		# Please keep in sync with pypy/tool/build_cffi_imports.py!
+		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+		use gdbm && cffi_targets+=( gdbm )
+		use ncurses && cffi_targets+=( curses )
+		use sqlite && cffi_targets+=( sqlite3 )
+		use tk && cffi_targets+=( tkinter/tklib )
+
+		local t
+		# all modules except tkinter output to .
+		# tkinter outputs to the correct dir ...
+		cd lib_pypy || die
+		for t in "${cffi_targets[@]}"; do
+			# tkinter doesn't work via -m
+			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		done
+
+		# Verify that CFFI module list is up-to-date
+		local expected_cksum=-7df4eab0
+		local local_cksum=$(
+			../pypy-c - <<-EOF
+				import binascii
+				import json
+				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+				print("%08x" % (binascii.crc32(json.dumps(x)),))
+			EOF
+		)
+		if [[ ${local_cksum} != ${expected_cksum} ]]; then
+			die "Please verify cffi_targets and update checksum to ${local_cksum}"
+		fi
+
+		# Cleanup temporary objects
+		find -name "_cffi_*.[co]" -delete || die
+		find -type d -empty -delete || die
+	fi
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+
+		# broken by expat-2.4.5
+		--ignore=lib-python/2.7/test/test_minidom.py
+		--ignore=lib-python/2.7/test/test_xml_etree.py
+		--ignore=lib-python/2.7/test/test_xml_etree_c.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	if use full-stdlib; then
+		doins -r include lib_pypy lib-python
+
+		# replace copied headers with symlinks
+		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+		done
+
+		if ! use gdbm; then
+			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+		fi
+		if ! use sqlite; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+				"${ED}${dest}"/lib_pypy/_sqlite3.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+		fi
+		if ! use tk; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+				"${ED}${dest}"/lib_pypy/_tkinter \
+				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+		fi
+	else
+		# install only the absolutely minimal subset of modules needed
+		# for pypy3 build
+		local lib_py_modules=(
+			# base modules needed to even start pypy (and import site)
+			codecs.py
+			copy_reg.py
+			encodings
+			genericpath.py
+			linecache.py
+			os.py
+			pkgutil.py
+			posixpath.py
+			re.py
+			runpy.py
+			site.py
+			sre_compile.py
+			sre_constants.py
+			sre_parse.py
+			stat.py
+			string.py
+			sysconfig.py
+			traceback.py
+			warnings.py
+			UserDict.py
+
+			# needed for python_optimize
+			compileall.py
+			getopt.py
+			py_compile.py
+			struct.py
+
+			# needed for rpython
+			argparse.py
+			atexit.py
+			base64.py
+			bdb.py
+			bisect.py
+			cmd.py
+			code.py
+			codeop.py
+			collections.py
+			colorsys.py
+			contextlib.py
+			copy.py
+			ctypes
+			dis.py
+			fnmatch.py
+			functools.py
+			gettext.py
+			hashlib.py
+			heapq.py
+			inspect.py
+			io.py
+			json
+			keyword.py
+			locale.py
+			logging
+			new.py
+			opcode.py
+			optparse.py
+			pdb.py
+			pickle.py
+			platform.py
+			pprint.py
+			random.py
+			repr.py
+			shlex.py
+			shutil.py
+			StringIO.py
+			subprocess.py
+			tempfile.py
+			textwrap.py
+			threading.py
+			tokenize.py
+			weakref.py
+			zipfile.py
+		)
+
+		local distutils_modules=(
+			# needed by site
+			__init__.py
+			errors.py
+			sysconfig.py
+			sysconfig_cpython.py
+			sysconfig_pypy.py
+		)
+
+		local lib_pypy_modules=(
+			# needed by site
+			_sysconfigdata.py
+
+			# needed by rpython
+			cffi
+			_ctypes
+			_ffi.py
+			_functools.py
+			_sha.py
+			_sha256.py
+			_sha512.py
+
+			# NB: we're deliberately skipping _hashlib to avoid some deps
+		)
+
+		cd lib-python/2.7 || die
+		insinto "${dest}/lib-python/2.7"
+		doins -r "${lib_py_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib-python/2.7/distutils || die
+		insinto "${dest}/lib-python/2.7/distutils"
+		doins -r "${distutils_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib_pypy || die
+		insinto "${dest}/lib_pypy"
+		doins -r "${lib_pypy_modules[@]}"
+		cd - >/dev/null || die
+	fi
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	"${PYTHON}" -m compileall \
+		-x 'bad_coding|badsyntax|make_ssl_data|lib2to3/tests/data' \
+		-q -f -d "${dest}" "${ED}/${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index 922f8a45d05d..edfebd49d8c1 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -8,4 +8,10 @@
 	<upstream>
 		<remote-id type="heptapod">pypy/pypy</remote-id>
 	</upstream>
+	<use>
+		<flag name="test-install">
+			Install the test suite packages, that are required to run
+			tests in a few reverse dependencies.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/pypy3/pypy3-7.3.17-r1.ebuild b/dev-python/pypy3/pypy3-7.3.17-r1.ebuild
new file mode 100644
index 000000000000..1539b0b89ab8
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.17-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYVER=3.10
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+S=${WORKDIR}
+
+LICENSE="MIT"
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+gdbm ncurses sqlite +test-install tk"
+
+RDEPEND="
+	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,test-install(+)?,tk?]
+"
+
+src_install() {
+	dodir /usr/bin
+	dosym pypy${PYVER} /usr/bin/pypy3
+}
diff --git a/dev-python/pypy3/pypy3-7.3.17.ebuild b/dev-python/pypy3/pypy3-7.3.17.ebuild
new file mode 100644
index 000000000000..4aa3928c48c5
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYVER=3.10
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+S=${WORKDIR}
+
+LICENSE="MIT"
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+gdbm ncurses sqlite tk"
+
+RDEPEND="
+	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,tk?]
+"
+
+src_install() {
+	dodir /usr/bin
+	dosym pypy${PYVER} /usr/bin/pypy3
+}
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index ed0d59b28191..79545ff9e64a 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -6,3 +6,11 @@ DIST pypy3_10-exe-7.3.16-1.ppc64le-musl.gpkg.tar 6819840 BLAKE2B a3ae523a26a187b
 DIST pypy3_10-exe-7.3.16-1.ppc64le.gpkg.tar 10352640 BLAKE2B 53d2804ef1a95de1edf4765261deb4c53accf59b8b2d827b2dec24a279424629322a701bd3942d05e4e13f52e796c119c237d32bf334287daad8664e1e76e67a SHA512 8016ed28f076936e3477d75d47e20af79fb97d138f924c514fcd32a02ad4b9bf3eb0d09a82d08f99843b102b4a048b78a694963e223a936b029ab903a5c60a21
 DIST pypy3_10-exe-7.3.16-1.x86-musl.gpkg.tar 9093120 BLAKE2B 56a349615ce67c3e581da65ac3b52cdc412760aea689d4b8bf6b9f5d2a4285ac67557ee6791363a0faaa1ba10f20b9d761529f278f3737b304e79682353bf1fc SHA512 cf9a8e4475c2d3c8d7c3756c7b4a61fd4effde3010b33f67aa40354658952dcf2ee7d05f6db7912bf8015dd76cf7bb08bfc7d9aea2f168bec23acab9a9068239
 DIST pypy3_10-exe-7.3.16-1.x86.gpkg.tar 9093120 BLAKE2B ef908156f0dd9376495330fe0278aa2565c5428bfe46aaeb9f11dabee2ee998969028296cef3e5b71e6d8963bd7573ddded8583e3410f4c66b7b1f17a9cb52aa SHA512 d65132d4a89f7f0764095fee1a3f10d4b7821ba45745a3576179ff2e74f24f38538fe5df6812e654cecc71fe7feecec4e2b9518c8b51aea9b66d43dca935949e
+DIST pypy3_10-exe-7.3.17-1.amd64-musl.gpkg.tar 12103680 BLAKE2B 4b542d95bf6a3bc214b4e8adcde98d49b717676f7e22f1347b976570cc852fc70a832224fdae8093cb5b2c47b2aa3075c65dc6bba93720fd2146c6670cf97eea SHA512 b0782c86646f24856c9868a493b19fc9af3596bc703504f09c153f1d11938a6dcded68664459d4043b86638b0e30440ac272bf13b85fd91021112dc663b56c9a
+DIST pypy3_10-exe-7.3.17-1.amd64.gpkg.tar 12134400 BLAKE2B e7ddd040e6f7d0b76aeb6dce53e86924e5e72d5ea7928aba103613dd40cd7c8e4d6fb3837437b3ffd2467b117c4851a84db2e4f5eeda36c26a6450d26e7ef20c SHA512 674be340c85e23a18c5b2a7af05093949606a314042fa282b4ea2b8c8c0c99d57a511ea8623a9d2eab23be711db8fdcd3ff5dc71a71b8c59288a861e6e43aae1
+DIST pypy3_10-exe-7.3.17-1.arm64-musl.gpkg.tar 10229760 BLAKE2B c25bd05035b225b09c59ecac3c24e4c770f254b2286be4967a2e7f674c0d524e55fe66fad76ae18d1a8b2297c0d06d9757590e69900028bdbf299037327f83f1 SHA512 0f5be025d421dc822235ff0ad9c317f22671d6b20fb3ea2bdd860ca48306a854e94469f7aeaf4ca395e6ea01e6ef1969b7cae6ae311db1823b4fae1616a8c2c0
+DIST pypy3_10-exe-7.3.17-1.arm64.gpkg.tar 10229760 BLAKE2B a670d2328d248fe3c897c59af4f5b5b4e2ab86966332232053bba1585377a824a1b69b7f4608e4ac96effb17edffe00c54d00a4aada74301cb720cde7cf9ce51 SHA512 590bae38189f42a708573a6194bd074d54f2b8794d5ba0fb9139130e285528e1cf922e4f3969b17d5aff7e4f5b56809622ea145a8eb32d6fa6e1740deb00dc99
+DIST pypy3_10-exe-7.3.17-1.ppc64le-musl.gpkg.tar 6819840 BLAKE2B 1cc0c5c2c82f831526480b78dc8230305b531908c7ddb7590e07769de602b8aaa3448bc221fa8b824e6dd6a0af7d2d0be5583451004150476f71730d42462251 SHA512 65d85f8c2c4c3997dc15723b7c857fb9f781e6fb992ab18f53e49f812dea63b7e70695364abda7a866d3304e84a5c59797881b9ec5159eb86acb7e44ad31bf9a
+DIST pypy3_10-exe-7.3.17-1.ppc64le.gpkg.tar 10393600 BLAKE2B da4c97f4d5ee546d776ba937d3736033ded7f5cc0a17e39fd657952b834fe6c002d3c33cfc7b16572f07dd0421040d4bb82e897a101ac129a6082961d0d02c7d SHA512 c49c67eee76f604146aadfcc600312e028bb9f6a24560eefd1dec7e9e0c7304e0a1ce89fdf6229b50b51cd17fb50b89815d937ccac3ef5fcc1ef8ff99af5f237
+DIST pypy3_10-exe-7.3.17-1.x86-musl.gpkg.tar 9103360 BLAKE2B 80202a4f66bec51176c29f2506a28ac296e63dd89102c68f62cfb868f455ac51a1e49557962c271e2a99b41001ad21b56790bb05aead361d59b7bea2c526721f SHA512 d7345e886c0ab4c8de987f5daaaddaa9983864e6343f3f64e85607ed897530f19fae653d412eb076b232ff6e7d52fdda4da0b05b4b4767ac1ac669a512e6fe6c
+DIST pypy3_10-exe-7.3.17-1.x86.gpkg.tar 9154560 BLAKE2B c388c0bed60fafddf5edc2f0bae19e04e643cc1ca44bd99f2b7b84c8b71d1a685faa48886aab3b5b2137b90ae3ebfa7b41fc6f98bcd99203f7997299ec52f274 SHA512 5c2ab169b5ece9c7c8fb9972ac74cf2aa8c5f385fd805800183ed8c0845540185065aff388b2d0ad56d901365454979c9051e70ec5ff2a9f7059b2812555f8ff
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.17.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.17.ebuild
new file mode 100644
index 000000000000..19930957bb48
--- /dev/null
+++ b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.17.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+PYVER=3.10
+MY_P=pypy3_10-exe-${PV}-1
+
+DESCRIPTION="PyPy3.10 executable (pre-built version)"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy3_10-exe:${SLOT}
+"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy${PYVER}-c-${PYPY_PV}
+"
+
+src_install() {
+	insinto /
+	doins -r image/usr
+	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index 98534aa04e78..5a7987243a23 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,2 +1,4 @@
 DIST pypy3.10-gentoo-patches-7.3.16.tar.xz 4752 BLAKE2B a5cd87f30c0b20bf5d49c3b5c979c12231d6b67750e777d4488093094d5998e6f0d9adba51c04704eb31d621089aeb12ee5a6b0a58dad0ecda0d60d2ecbdab6d SHA512 e2779841a3e56e384134416ce2a10e1e00a11d7c720023506370fb9f54363da6b7300b4019c121aa1874152b62d9679ebcd3dd679fd0dbd2bf524520990b6f38
+DIST pypy3.10-gentoo-patches-7.3.17.tar.xz 10340 BLAKE2B a9d7dc6a578dc50339574b2fcfff19e390293adfc8412592e4683fdd3ff415ed8da3ff809b00037659a6e218dc0b26efead7a2ae3c54b2c3487222144d5d9633 SHA512 b192685cc100cfb723492d29e89a522bb4ff041c78cbdfd170414e19713cf2a21c39ab8d4e1e9ca47da2559b2fed6df14f1122f96bc50dd117550c357046889a
 DIST pypy3.10-v7.3.16-src.tar.bz2 23358556 BLAKE2B 4eddae47dea1005b9450b9d3d23bd90782dffecdc252eff4fd3195a61e0e7ebbdafaf4c4b5d318c88534f152c1110c3bc4f76f43a7e711a859dd4330841a0e0b SHA512 5b941e3b5c7b0c7a50413e16122bad3e167dcc4ee159ce53e9716e9d5af79d600823f3d7442b7562bb568ff027723e22904fc0840dc06bd26e3da38c93cc5b94
+DIST pypy3.10-v7.3.17-src.tar.bz2 23350562 BLAKE2B 0a7a091976b352de61057f238fa386f767dd4d2fbcdcc0b4376066c20c2ad35d3818fa6e9e163ab5fd341856802e8ad1e2891decf5948c13cdb26726cd42019e SHA512 46e30845bbc73cf56f5033a24d3583253ce198522f3a28ae4e789884063ba167d401fc08ae7fc8c7769feed9cd942a8ab38961c8b8794d7fae8f9955479faa96
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.17.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.17.ebuild
new file mode 100644
index 000000000000..4f66473fa95e
--- /dev/null
+++ b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.17.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV}"
+
+DESCRIPTION="PyPy3.10 executable (build from source)"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libintl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3_10-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/pypy
+	virtual/pkgconfig
+"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	# Yes, yuck, but it's being worked on upstream (bug #918971).
+	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
+	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+		--withmod-bz2
+		$(usex ncurses --with{,out}mod-_minimal_curses)
+	)
+
+	local interp=( pypy )
+	if use low-memory; then
+		local -x PYPY_GC_MAX_DELTA=200MB
+		interp+=( --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
+	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 854cda346ab1..7d54999c4a36 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,3 +1,7 @@
 DIST pypy3.10-gentoo-patches-7.3.16.tar.xz 4752 BLAKE2B a5cd87f30c0b20bf5d49c3b5c979c12231d6b67750e777d4488093094d5998e6f0d9adba51c04704eb31d621089aeb12ee5a6b0a58dad0ecda0d60d2ecbdab6d SHA512 e2779841a3e56e384134416ce2a10e1e00a11d7c720023506370fb9f54363da6b7300b4019c121aa1874152b62d9679ebcd3dd679fd0dbd2bf524520990b6f38
 DIST pypy3.10-gentoo-patches-7.3.16_p1.tar.xz 7696 BLAKE2B d51dd45ec0fd2fd2d8e8f6afb6fdb227268d86ca03885991c085aa3b374bdbe01c909cd9c25981a89955c3fcfaf258f09470b5a5649b9235a74f37dadb9a891e SHA512 b71168518a103cccff4740efb51dfad4eaaf647d81aff727805f5ee9e2fdc6971749b69c17c72e7fd04c97bbf37777180870eb17077fb742f20130b4b00ed712
+DIST pypy3.10-gentoo-patches-7.3.16_p2.tar.xz 10348 BLAKE2B 93b2672e935e4a23e9fff70848f377211b4a0aff55384ffac59ba3b376af9d1ab1d1b3529a5148490dd6e8da55cc038390efa7e4120c60c7ea77d158da88b5bf SHA512 0bff294d8a0ed576204c00ef7befec0c960cef50eaf1130056aaed2a5dac63a8045db977c5fb4ff9c5eb1863e8df2cb9f4d608ab88cd6ffcc8bd4ab13f5d6ab2
+DIST pypy3.10-gentoo-patches-7.3.17.tar.xz 10340 BLAKE2B a9d7dc6a578dc50339574b2fcfff19e390293adfc8412592e4683fdd3ff415ed8da3ff809b00037659a6e218dc0b26efead7a2ae3c54b2c3487222144d5d9633 SHA512 b192685cc100cfb723492d29e89a522bb4ff041c78cbdfd170414e19713cf2a21c39ab8d4e1e9ca47da2559b2fed6df14f1122f96bc50dd117550c357046889a
+DIST pypy3.10-gentoo-patches-7.3.17_p1.tar.xz 18104 BLAKE2B 4b6c8c012d34b7ead8f7499edbe4292f21d2d7437694341de0bfb5f74d0717a11eb1c302a60baeb3ab123851a2436657458dad47c2b86a81218eea12d6aa9344 SHA512 73e0733f07be79f444b2fbf18ca7dcad6a76368cb8c185eb630d82e6886ed909548bc1779bf618588e34a572b5d48be0f9a86fc5758d302cf3ff0e94649b4815
 DIST pypy3.10-v7.3.16-src.tar.bz2 23358556 BLAKE2B 4eddae47dea1005b9450b9d3d23bd90782dffecdc252eff4fd3195a61e0e7ebbdafaf4c4b5d318c88534f152c1110c3bc4f76f43a7e711a859dd4330841a0e0b SHA512 5b941e3b5c7b0c7a50413e16122bad3e167dcc4ee159ce53e9716e9d5af79d600823f3d7442b7562bb568ff027723e22904fc0840dc06bd26e3da38c93cc5b94
+DIST pypy3.10-v7.3.17-src.tar.bz2 23350562 BLAKE2B 0a7a091976b352de61057f238fa386f767dd4d2fbcdcc0b4376066c20c2ad35d3818fa6e9e163ab5fd341856802e8ad1e2891decf5948c13cdb26726cd42019e SHA512 46e30845bbc73cf56f5033a24d3583253ce198522f3a28ae4e789884063ba167d401fc08ae7fc8c7769feed9cd942a8ab38961c8b8794d7fae8f9955479faa96
diff --git a/dev-python/pypy3_10/metadata.xml b/dev-python/pypy3_10/metadata.xml
index 2a6a5bdac475..53e7be1f01ea 100644
--- a/dev-python/pypy3_10/metadata.xml
+++ b/dev-python/pypy3_10/metadata.xml
@@ -14,5 +14,9 @@
 			to bootstrap pip and setuptools (if disabled, it will
 			be only possible to use venv `--without-pip`)
 		</flag>
+		<flag name="test-install">
+			Install the test suite packages, that are required to run
+			tests in a few reverse dependencies.
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.16_p2.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.16_p2.ebuild
new file mode 100644
index 000000000000..5e7deb31db00
--- /dev/null
+++ b/dev-python/pypy3_10/pypy3_10-7.3.16_p2.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.17-r1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.17-r1.ebuild
new file mode 100644
index 000000000000..0771425196e7
--- /dev/null
+++ b/dev-python/pypy3_10/pypy3_10-7.3.17-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite +test-install tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use test-install; then
+		rm -r "${ED}${dest}"/{ctypes,sqlite3,tkinter,unittest}/test \
+			"${ED}${dest}"/{distutils,lib2to3}/tests \
+			"${ED}${dest}"/idlelib/idle_test || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	# remove test last since we have some file removals above
+	if ! use test-install; then
+		rm -r "${ED}${dest}"/test || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.17.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.17.ebuild
new file mode 100644
index 000000000000..8b160362ba6a
--- /dev/null
+++ b/dev-python/pypy3_10/pypy3_10-7.3.17.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.17_p1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.17_p1.ebuild
new file mode 100644
index 000000000000..0771425196e7
--- /dev/null
+++ b/dev-python/pypy3_10/pypy3_10-7.3.17_p1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite +test-install tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use test-install; then
+		rm -r "${ED}${dest}"/{ctypes,sqlite3,tkinter,unittest}/test \
+			"${ED}${dest}"/{distutils,lib2to3}/tests \
+			"${ED}${dest}"/idlelib/idle_test || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	# remove test last since we have some file removals above
+	if ! use test-install; then
+		rm -r "${ED}${dest}"/test || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3_9/Manifest b/dev-python/pypy3_9/Manifest
index 6ede3b808949..007ae09b8f73 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,3 +1,4 @@
 DIST pypy3.9-gentoo-patches-7.3.16.tar.xz 5764 BLAKE2B 094740bc594bc63648bba997e2a8a8eddd857e6f63594fc3d5f3bca9e74bce101ab56ddf59afd75d62e91c17d89271d7f8b52da6b19adf480dd9fab9f0c6dc2c SHA512 efbe3ac941be19b270336e7b31999114d4334cfd3cc0ab5f2499e41825a51bc7c005e10302114813741772ae0412466c000ab33b64f01d639d5689460f8befcb
 DIST pypy3.9-gentoo-patches-7.3.16_p1.tar.xz 8688 BLAKE2B 8ce6eb88aaf4c6bb53046d819e641836441ba6a5d33aeaabc0cb9081f4de4be9a65997bf31ec1f4cf6fc139eb1d2deae9521d4023f0a166b1755096ef3518c7f SHA512 e6e7d3a95a8acd262f9ecd0741a2ed05efca1e4896ca3607dc63c1f74ce8179b64d0a8134dc378009ac47e1d560431ba60e944af631029262ce4300c90f5b1c1
+DIST pypy3.9-gentoo-patches-7.3.16_p2.tar.xz 11304 BLAKE2B 50c7eaf3263a66e1a9dbad9187fc83959a47a846c69ced71530ddcf853b1bc2227defb8324ee849836af701292c7742c68834f77dbe017a6c9d0c3d9e955f5f2 SHA512 cb0f911cdaf0ef1230e8bf08f9beecd64d25a383b6b0fe47217e3c1eeb0c74dc4a3080cdc4ac7fce38457620d575c408151f46258ac377dfcc38ca0fa4e60791
 DIST pypy3.9-v7.3.16-src.tar.bz2 23686849 BLAKE2B 736b173d8bd6b19785e64827d289feb39e30e93caaef3071a5185cc5cbaab4aed23b9da89e34a464dad0c0d5142db9dc238a1dd221aea299f95bea2e47299a81 SHA512 bd13cddb0b4cab4e200d2eafd8239c76209a49f8e847193c5ed0fe446ca46271446fc762cafd2aa8f410d022bc65abcd48ba7148502b70b901565e187058310d
diff --git a/dev-python/pypy3_9/pypy3_9-7.3.16_p2.ebuild b/dev-python/pypy3_9/pypy3_9-7.3.16_p2.ebuild
new file mode 100644
index 000000000000..cd6b3d3e3ed8
--- /dev/null
+++ b/dev-python/pypy3_9/pypy3_9-7.3.16_p2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.9
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://github.com/pypy/pypy/
+"
+SRC_URI="
+	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy39-pp73-336"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index a6fa9d25b0f1..820978103d0f 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1 +1,2 @@
 DIST pyquery-2.0.0.tar.gz 45210 BLAKE2B 2c1d052d310541b36f526e72906681ea03e0d55be16202c98ab5d5b9f5fc408b7612a353100937381639a03f8871b8bf691c6b0d5ad09dec8cc6f2e2ced7944d SHA512 316a479acd23e371b6e70550681527b15203e7ab62f4722375335180f13d9b48d9170abf308bb26b6180d954de4f8dfea5f90426cb820c5e888cc56f8a99ba33
+DIST pyquery-2.0.1.tar.gz 44999 BLAKE2B 704e3410bf06ed06d899dab4811fbb6e2869589a5f59a4eb32800a71580e98cdb6bdac1ca3d675d8e1ccacc162ac4ba75bf15f69355658ee2aede12d0e8d50d6 SHA512 c3db13b884beb3a4b2f77b3369c7a2256eee77102a41482f73c1c663778620bc6728d500ba47b51baa3f8c47d80325622a2bac54e5d7aecf1de7679577aa5e85
diff --git a/dev-python/pyquery/pyquery-2.0.0-r1.ebuild b/dev-python/pyquery/pyquery-2.0.0-r1.ebuild
index 1b6ac5c30771..c5d7af9e40f5 100644
--- a/dev-python/pyquery/pyquery-2.0.0-r1.ebuild
+++ b/dev-python/pyquery/pyquery-2.0.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyquery/pyquery-2.0.1.ebuild b/dev-python/pyquery/pyquery-2.0.1.ebuild
new file mode 100644
index 000000000000..65c1c9743097
--- /dev/null
+++ b/dev-python/pyquery/pyquery-2.0.1.ebuild
@@ -0,0 +1,48 @@
+# 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 optfeature pypi
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="
+	https://github.com/gawel/pyquery/
+	https://pypi.org/project/pyquery/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-1.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# needs network
+		tests/test_pyquery.py::TestWebScrappingEncoding::test_get
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
+}
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 1439bcd9e2aa..4049481a75b3 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1 +1,3 @@
 DIST pyscard-2.0.10.tar.gz 153351 BLAKE2B fb600032321ac0bd372c7aa8fcdd82273af9edcfb51eb5d455296a2a685a291e442209d5c59d60b81cdd8cb3b0699f733e41528fe06ed827558146ba4085c97d SHA512 231d5abc0ad31ae7f0e394f928045346323f1040b313394a3d235282feb79bfec0d124ebde84017178dfa1983beadfb245a33bfa6a75b4fab9e65c3090b9e9cb
+DIST pyscard-2.1.0.tar.gz 153511 BLAKE2B 072fb49ab17bdb32cf3381b9e769125b1c934f5830af6e33547a083025019c01cf61e077a1b4c5883572aa6db1e006f4a320fe07e097e6687dca45996aa1c6a2 SHA512 de0c26108751cc2b674968982f7982ad971c93890c32a0731394074dabe72805399755ed9f042aa4bc019e95b705d4394e0ac844699bbf8192ab5e779e43f2fe
+DIST pyscard-2.1.1.tar.gz 153537 BLAKE2B 60c6d8acae5f707f84f8dfa775b2bfc74e4c6075b10a64c5ba1854b7c4e6cd03e2fa8db337b48ec5a167b834a4b22f5ae182ec4e78463b549aa8f4980295dbfd SHA512 854d52fde447e972545761ce8f2c1262d5e454c942fc68f2be09d0b62cc453aa5ef793e899f283fe5f53db59ef0714252090b8f5335dcd1b40ed28506965f371
diff --git a/dev-python/pyscard/pyscard-2.1.0.ebuild b/dev-python/pyscard/pyscard-2.1.0.ebuild
new file mode 100644
index 000000000000..2efc6e371faa
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..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 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	sys-apps/pcsc-lite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
+}
+
+python_test() {
+	cd test || die
+	eunittest
+}
diff --git a/dev-python/pyscard/pyscard-2.1.1.ebuild b/dev-python/pyscard/pyscard-2.1.1.ebuild
new file mode 100644
index 000000000000..2efc6e371faa
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..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 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	sys-apps/pcsc-lite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
+}
+
+python_test() {
+	cd test || die
+	eunittest
+}
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 5550566f7aa1..984e774ee43a 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1 +1,3 @@
 DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
+DIST pysmi-1.4.4.tar.gz 117164 BLAKE2B 2ef1c2fc58ee90ad052fec5f0aa08fc128cc041e24dc74d8942ff81912e7e45b480e5a125e412e0c52818670dafbd9bee310a863f9a5b898c8a67a18492897ae SHA512 9ce5665d1db147cb80fe7ef17981a4231a25a8b25cfafb14784acc0355fbd0296070a7da67a7f6b1e738e0f5f1249f871ee29a72da546e639ad4d2f2e8b00c43
+DIST pysmi-1.5.0.tar.gz 124064 BLAKE2B 763501b0fd575e356944372f0f173857d8a982a1cc7342636807d7147f7b6615d9c9518f099fb3071356957f0775e7bbd6b5f37d2110947ad22585cc44dff461 SHA512 f99fbc186b2fd481b16269e5b3622821b932459ec97023968ce8e0ae5c2d863702122a44fafb26d901b8a0b03c02f97e60c6999bdde0f19d551a61daf4e926b5
diff --git a/dev-python/pysmi/files/pysmi-1.5.0-py313.patch b/dev-python/pysmi/files/pysmi-1.5.0-py313.patch
new file mode 100644
index 000000000000..bebd360593f1
--- /dev/null
+++ b/dev-python/pysmi/files/pysmi-1.5.0-py313.patch
@@ -0,0 +1,36 @@
+From 1e9c2f7a3cc2ee78caa79d0602f3afe2030dcf5e Mon Sep 17 00:00:00 2001
+From: David van Moolenbroek <david.vanmoolenbroek@aimvalley.com>
+Date: Tue, 3 Sep 2024 07:54:12 +0000
+Subject: [PATCH] Fix unit test for Python 3.13
+
+As of Python 3.13, tabs in docstrings are expanded to spaces, thereby
+breaking one of the unit tests. This commit fixes the unit test. Note
+that neither the problem nor this fix affect the main pysmi code.
+---
+ tests/test_moduleidentity_smiv2_pysnmp.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_moduleidentity_smiv2_pysnmp.py b/tests/test_moduleidentity_smiv2_pysnmp.py
+index 8c181a8..eeee0f5 100644
+--- a/tests/test_moduleidentity_smiv2_pysnmp.py
++++ b/tests/test_moduleidentity_smiv2_pysnmp.py
+@@ -157,7 +157,7 @@ class ModuleIdentityTextTestCase(unittest.TestCase):
+     organization"
+      CONTACT-INFO "WG-email:\\n   agentx@dorothy.bmc.com\\"
+      DESCRIPTION  "
+-    A\tdescription with\\n
++    A<TAB>description with\\n
+       various characters: 0~`!@#$%^&*()-_=+[]{}\\|;:'<>,.?/
+     and a very long line that must not be wrapped despite exceeding the threshold of default word wrap filters.
+ 
+@@ -170,7 +170,9 @@ class ModuleIdentityTextTestCase(unittest.TestCase):
+     """
+ 
+     def setUp(self):
+-        docstring = textwrap.dedent(self.__class__.__doc__)
++        # As of Python 3.13, tabs are expanded in docstrings, so we have to use
++        # a placeholder and replace it with real tab here.
++        docstring = textwrap.dedent(self.__class__.__doc__.replace("<TAB>", "\t"))
+         ast = parserFactory()().parse(docstring)[0]
+         mibInfo, symtable = SymtableCodeGen().genCode(ast, {}, genTexts=True)
+         self.mibInfo, pycode = PySnmpCodeGen().genCode(
diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
index ee80585a75ed..07a2a81636a7 100644
--- a/dev-python/pysmi/metadata.xml
+++ b/dev-python/pysmi/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pysmi</remote-id>
-		<remote-id type="github">etingof/pysmi</remote-id>
+		<remote-id type="github">lextudio/pysmi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysmi/pysmi-1.4.4.ebuild b/dev-python/pysmi/pysmi-1.4.4.ebuild
new file mode 100644
index 000000000000..dd807749cdf6
--- /dev/null
+++ b/dev-python/pysmi/pysmi-1.4.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2017-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="Pure-Python implementation of SNMP/SMI MIB parsing and conversion library"
+HOMEPAGE="
+	https://github.com/lextudio/pysmi/
+	https://pypi.org/project/pysmi/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pysnmp-5.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: doc
+# distutils_enable_sphinx docs/source dev-python/sphinx-copybutton dev-python/sphinx-sitemap
diff --git a/dev-python/pysmi/pysmi-1.5.0.ebuild b/dev-python/pysmi/pysmi-1.5.0.ebuild
new file mode 100644
index 000000000000..8a27a701a3fe
--- /dev/null
+++ b/dev-python/pysmi/pysmi-1.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2017-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="Pure-Python implementation of SNMP/SMI MIB parsing and conversion library"
+HOMEPAGE="
+	https://github.com/lextudio/pysmi/
+	https://pypi.org/project/pysmi/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pysnmp-5.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+# TODO: doc
+# distutils_enable_sphinx docs/source dev-python/sphinx-copybutton dev-python/sphinx-sitemap
+
+PATCHES=(
+	# https://github.com/lextudio/pysmi/pull/4
+	"${FILESDIR}/${P}-py313.patch"
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index d56fe16d8e24..f718d6d2fe49 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1 +1,2 @@
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
+DIST pysnmp-7.0.3.tar.gz 427830 BLAKE2B 5855095c40ca63bfb705293d33d061d94ad0958ab854863fb73468d6aee846ea2fd843f4444eb93a29cb8c1ec3043e1d90445628e66392b04d43d2c027c4ce79 SHA512 9c23ab7073b40ae43a6c56b81c05ef6639f99f44153dcb2f97a455402495cfb5dc8f70025331d5461e6e18a66e1de8246506947bc80465df67cba2381d0d891d
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index 0640054adfe6..6e5f3b18b770 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -27,6 +27,6 @@
 	<upstream>
 		<remote-id type="pypi">pysnmp</remote-id>
 		<remote-id type="sourceforge">pysnmp</remote-id>
-		<remote-id type="github">etingof/pysnmp</remote-id>
+		<remote-id type="github">lextudio/pysnmp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild
index 51959b8d4515..f02b6c629fd6 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "Example programs using pysnmp" dev-python/pysnmp-apps
+	optfeature "Example programs using pysnmp" net-analyzer/snmpclitools
 	optfeature "IETF and other mibs" dev-python/pysnmp-mibs
 	optfeature "Dump MIBs in python format" dev-python/pysmi
 }
diff --git a/dev-python/pysnmp/pysnmp-7.0.3.ebuild b/dev-python/pysnmp/pysnmp-7.0.3.ebuild
new file mode 100644
index 000000000000..145d170a0ab7
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-7.0.3.ebuild
@@ -0,0 +1,42 @@
+# 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} )
+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/pyasn1-0.4.8[${PYTHON_USEDEP}]
+	>=dev-python/pysnmpcrypto-0.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pysmi-1.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pysmi-1.3.0[${PYTHON_USEDEP}]
+		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() {
+	mibdump NET-SNMP-EXAMPLES-MIB || die
+	epytest
+}
diff --git a/dev-python/pysnmpcrypto/Manifest b/dev-python/pysnmpcrypto/Manifest
new file mode 100644
index 000000000000..da1aa7eeea51
--- /dev/null
+++ b/dev-python/pysnmpcrypto/Manifest
@@ -0,0 +1 @@
+DIST pysnmpcrypto-0.0.4.tar.gz 7244 BLAKE2B 305177bb2cae41859ea1a8dde21879a0e5c75c02b1c00593ceb719394bdadb119b67a652d5f7ea7c80c384f8bab81ab795db747548db8e4a4f1fa96bca291b07 SHA512 ee293ecc787ac24bf7d88966e72f5104d0bf1d7458947c50607051706edb847ac5ca806ace9ef4ae5066576b6610a7eae840a0682fe830515d5024ee2a955ed5
diff --git a/dev-python/pysnmpcrypto/metadata.xml b/dev-python/pysnmpcrypto/metadata.xml
new file mode 100644
index 000000000000..9e998bc84397
--- /dev/null
+++ b/dev-python/pysnmpcrypto/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">lextudio/pysnmpcrypto</remote-id>
+		<remote-id type="pypi">pysnmpcrypto</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild b/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild
new file mode 100644
index 000000000000..5e0e4e99a2a2
--- /dev/null
+++ b/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 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="Strong cryptography support for PySNMP (SNMP library for Python)"
+HOMEPAGE="
+	https://pypi.org/project/pysnmpcrypto/
+	https://github.com/lextudio/pysnmpcrypto
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pysubs2/pysubs2-1.7.2.ebuild b/dev-python/pysubs2/pysubs2-1.7.2.ebuild
index 7e320c75c063..7ddb7e4dcc43 100644
--- a/dev-python/pysubs2/pysubs2-1.7.2.ebuild
+++ b/dev-python/pysubs2/pysubs2-1.7.2.ebuild
@@ -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/pytesseract/Manifest b/dev-python/pytesseract/Manifest
index a02f26658f2d..0451c2b491a0 100644
--- a/dev-python/pytesseract/Manifest
+++ b/dev-python/pytesseract/Manifest
@@ -1,2 +1 @@
-DIST pytesseract-0.3.12.gh.tar.gz 1099117 BLAKE2B 07fa50a552347a0f6be536933b98056c78d96e7317a9eb325faa5b4a1a2ef66bd2936ab17ca0abe2e56a0c1da75ca675f2a3c5260fc2882072d6535b78b519dc SHA512 931fcd03a7682cbebc42b1452519ef05ef4c931a47a4364841e0fc5861c9dd9f90ffe38f3211ed3846788dc29eefbc9aba2bbf2af30fb3816abdfcaaa6757365
 DIST pytesseract-0.3.13.gh.tar.gz 1099109 BLAKE2B 72bd060c070471cd85ef467c4ba339c0e88c151d2af768212071a35e79169f718907a2dbedb53f10821ce69302253e01181bfa29b1e9b4af1847dac5453c7aba SHA512 da5edaaca8a0c796c2a47777e4b894824b16522d7d3a0e8f669a183bcbdfdf0d0412de4ca53d5bef082fd2b627356e7fd21f86e3107525a99a011fcaba5adacf
diff --git a/dev-python/pytesseract/pytesseract-0.3.12.ebuild b/dev-python/pytesseract/pytesseract-0.3.12.ebuild
deleted file mode 100644
index 81f9b8b28baf..000000000000
--- a/dev-python/pytesseract/pytesseract-0.3.12.ebuild
+++ /dev/null
@@ -1,38 +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
-
-DESCRIPTION="Optical character recognition (OCR) tool"
-HOMEPAGE="
-	https://github.com/madmaze/pytesseract/
-	https://pypi.org/project/pytesseract/
-"
-SRC_URI="
-	https://github.com/madmaze/pytesseract/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	app-text/tesseract
-"
-BDEPEND="
-	test? (
-		app-text/tesseract[jpeg,png,tiff,webp]
-		media-libs/leptonica[gif,jpeg2k]
-		app-text/tessdata_fast[l10n_fr]
-		dev-python/pillow[jpeg,zlib]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytesseract/pytesseract-0.3.13.ebuild b/dev-python/pytesseract/pytesseract-0.3.13.ebuild
index 0d3ddecce9b2..81f9b8b28baf 100644
--- a/dev-python/pytesseract/pytesseract-0.3.13.ebuild
+++ b/dev-python/pytesseract/pytesseract-0.3.13.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 75d4db52d8e8..81dbaa127c28 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,2 @@
 DIST pytest_asyncio-0.23.8.tar.gz 46920 BLAKE2B 6b7a66e6ef28f2c7a874a115e0346b3803051df5d57e5b8ba35480982231a804adfbe8a4a2c605847730ea940fafe9df2aa94f5081b43aa753b64c3e2ea027a5 SHA512 68f23458c5f22bdb75a6a0a12f185b1f22c5231c0cdcd84806781419f5c866844e851398d771c5932af4a42b5dfdcce6624181f2c0d2f70187bb5feed0ba7c97
-DIST pytest_asyncio-0.24.0a0.tar.gz 49299 BLAKE2B 2bc9f0a85169db463f344ed1f42dd954599c6e50a3fa3d7bf95bddb3eb162c4ddf454f512d7b1577e0d394174f52dd63664e4eec32a6106a7c2779cf955cb79a SHA512 109ff55bb3f742a246463ed650a6568833e70cd0b4ed30507efb62cf3c9eb5aa9caed960b3b1c9b92c1cb30025436e9e98e33135243a5763b2614632cbae5c8e
-DIST pytest_asyncio-0.24.0a1.tar.gz 49212 BLAKE2B d65eb2587ef865d62a8f3469165da58ca9db0ffe98b4ba02b3be36811f635aeac01457b0931fda4653ec7e8634d3dfe70e7e3b5a40be5ae7018bb8f7317fef95 SHA512 33a84c17a853a5b3c4153a178e70fa04ce3494d6f316f0a141b4d945c5052c6c336f55f7ca691423ce448d1e7535d84bc69d939cfc4544076e704a7e5b4509f7
+DIST pytest_asyncio-0.24.0.tar.gz 49855 BLAKE2B 55813b655252f2c1fbe1658a0a2d739bb03a56794297dde9cf598b8200c0d3aa7437af7a241a821eff47ffe57841142adb93c6434c920cbd1d26b33a8ac8fe96 SHA512 abf2442afb9f5933b223e920c0b107d5781350f2a9c2e58ca141494a4f391acf97f2e377db1fc67b5213031bf371f222dc9c4718ff3c6b5985f5e49913f03cb7
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.24.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0.ebuild
new file mode 100644
index 000000000000..14fdecf0f2a2
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-asyncio/
+	https://pypi.org/project/pytest-asyncio/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on precise warning counts
+		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
+		tests/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.24.0_alpha0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha0.ebuild
deleted file mode 100644
index ccbee1a2f1c6..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha0.ebuild
+++ /dev/null
@@ -1,51 +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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
-		tests/modes/test_legacy_mode.py
-		tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_fixture
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-		tests/test_pytest_min_version_warning.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-
-		# TODO
-		tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha1.ebuild
deleted file mode 100644
index ef22178cd3b7..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha1.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 ~ia64 ~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-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
-		tests/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/pytest-bdd-7.2.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
index 88ef967028eb..8123e325faa8 100644
--- a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
+++ b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse_type[${PYTHON_USEDEP}]
+	dev-python/parse-type[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 70bfe4e5dd87..494e49b3fd84 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1 +1,3 @@
 DIST pytest_check-2.3.1.tar.gz 28674 BLAKE2B 732538aec690d121132a0594a49b77658eb8be79d6e59bacae1d13ea38e59dd3e4b55c62fc07741e08621dda271d7d2284f825770a2acef7d5b0c80c80e79beb SHA512 b4a2805b7dc3dfe9f56db6f27a9e4927de070d57bf3906f303c611021081d7b638d9ee58de744491005e10541f527f1bfddaf51be64f2def8a1190cfd1abd43a
+DIST pytest_check-2.4.0.tar.gz 28965 BLAKE2B 1c87ffa59f6c2497c933822463fd20b36f1653db7fd6cf3e56e6722df4488bd2efbdd05d9251bc97f900fa49a06696c37a6186942891a5fbf3ff3a5b59fa2cb0 SHA512 68f3eb02be3a1ad68db9f7f0d5043297d708e2ac0fdeced50cd657426e307df785909a91f1bcb002cb17b3198aaa595404189c83b4ee1bca268f6a4096e5a90f
+DIST pytest_check-2.4.1.tar.gz 28933 BLAKE2B 47ab104426e9c967ba7ad82cb76663803ce55133ca868369ff466def35ad0ea64ef7872464de8184ee985cc938265f0efc586212a9e6be0b0879d955dcd29e10 SHA512 a334425d5aba77b574bcddad8d9a15ffac1638df1ab3b2aeceb4c1580a3871a36431a7d287e1cc1d272bd57b92c1f6e65c3976fdd1793935bfc357916b15b11a
diff --git a/dev-python/pytest-check/pytest-check-2.4.0.ebuild b/dev-python/pytest-check/pytest-check-2.4.0.ebuild
new file mode 100644
index 000000000000..cc8edbab54a3
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-2.4.0.ebuild
@@ -0,0 +1,26 @@
+# 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 pypi
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="
+	https://github.com/okken/pytest-check/
+	https://pypi.org/project/pytest-check/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-2.4.1.ebuild b/dev-python/pytest-check/pytest-check-2.4.1.ebuild
new file mode 100644
index 000000000000..cc8edbab54a3
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-2.4.1.ebuild
@@ -0,0 +1,26 @@
+# 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 pypi
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="
+	https://github.com/okken/pytest-check/
+	https://pypi.org/project/pytest-check/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index d7ff8ae7054b..7a3c405f645a 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1 +1,2 @@
 DIST pytest-django-4.8.0.gh.tar.gz 77646 BLAKE2B 206357110066d233c103755cfd6324e8042d9c93442c25db17a13f02132eab60a315856441e26d43a3c493cf72ce39ef51163ccc5368941875e63656bf9122a7 SHA512 8f7ba6b28cc4c0347876beb85247ccd021767811b9122c8cd0fb5d051df4ae76267b27a3fee5c36882a40716bdcbaab43abf71ef8dd61757087b12fd141632aa
+DIST pytest-django-4.9.0.gh.tar.gz 78407 BLAKE2B 0ab7dd12494fdb5c66ceabc67c793f7d970258a1a1b7cd3f7b31b6ee5087436396936a0a1672d77ab3c7e391f00bc63060e137ee9399a52940ebbc2ba25e253e SHA512 ec4cb8e9220cd21d96b72c1f09cfdd023700831ed583fe79d84a85f8d24eeaf3f111580d672950feecad69455078f0c73879f0d73364e74a4577352a4d8a1d4d
diff --git a/dev-python/pytest-django/pytest-django-4.8.0.ebuild b/dev-python/pytest-django/pytest-django-4.8.0.ebuild
index e9f8ef79b886..8ecffef4a793 100644
--- a/dev-python/pytest-django/pytest-django-4.8.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.8.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-django/pytest-django-4.9.0.ebuild b/dev-python/pytest-django/pytest-django-4.9.0.ebuild
new file mode 100644
index 000000000000..08cc58692195
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-4.9.0.ebuild
@@ -0,0 +1,51 @@
+# 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="A Django plugin for pytest"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.io/
+	https://github.com/pytest-dev/pytest-django/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-1.11.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/django-configurations-2.0[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE
+	local -x PYTHONPATH=${PWD}
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_django.plugin,xdist.plugin
+	for DJANGO_SETTINGS_MODULE in pytest_django_test.settings_sqlite{,_file}; do
+		einfo "Testing ${DJANGO_SETTINGS_MODULE}"
+		epytest tests
+	done
+}
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 15b015fec5c5..a69c5d927b62 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1 +1,2 @@
 DIST pytest_env-1.1.3.tar.gz 8627 BLAKE2B 04aee8a84b2224ce1f0bb018d0d5a8f8542d32aa3e3da0ed03afdace2562b1643f712152128f7d673e118a4db9ab10c7440f44728ba774519ceb989b4c9be7f2 SHA512 c38371a272987757774bed6b566b55ba2304ca37e69f3f5671fb03735bbdfe5e51c3b03cd885d6bdbd73496daa95a57d79e03bf5d9171f0e9c5c0ae38492b304
+DIST pytest_env-1.1.4.tar.gz 8898 BLAKE2B 8e6d9af2de86af47b5429e64112f7bbd4824fa54a7ffd2a7deb63da2032f6104587594a9efcddfc56a4dd7ef969b1a6cb4150906c029437c960ad02b0e215513 SHA512 9cde819b4f68f1a19de58c86651427c608b160bdfb6b6e12c6f4b90f195a759573e442d92df08f70b807282d4b47a7c078fa0b4674433d8778a9b8fb5552209e
diff --git a/dev-python/pytest-env/pytest-env-1.1.4.ebuild b/dev-python/pytest-env/pytest-env-1.1.4.ebuild
new file mode 100644
index 000000000000..bfda9aab1b32
--- /dev/null
+++ b/dev-python/pytest-env/pytest-env-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pytest plugin that allows you to add environment variables"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-env/
+	https://pypi.org/project/pytest-env/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# upstream lower bounds are meaningless
+	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
index edb7415b41b3..d85ce8c04a99 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0.ebuild
deleted file mode 100644
index 1a7562c8814a..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.0.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
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="
-	https://github.com/kevin1024/pytest-httpbin/
-	https://pypi.org/project/pytest-httpbin/
-"
-SRC_URI="
-	https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/httpbin[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	tests/test_server.py::test_redirect_location_is_https_for_secure_server
-	# minor exception message mismatch on pypy3
-	# https://github.com/kevin1024/pytest-httpbin/issues/77
-	tests/test_server.py::test_dont_crash_on_handshake_timeout
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index 743b6eb51cd4..e8e81459dae2 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,2 +1 @@
-DIST pytest_httpserver-1.0.12.tar.gz 66948 BLAKE2B b50871038b1c313db76c456e86bfe82046bcb8207cb72126db18bde5dea4e3cabb6740a19d27eba672967078f60978c1b20946bf502837e0859d957d0318afeb SHA512 fd3d290b23137d0c2893672611e7087e86ed47ccda865779304d177ac2ef6e0068321eb42f42ec89db859fb66910ad68399d3a4aefde250bd207ab9ff4666e3e
 DIST pytest_httpserver-1.1.0.tar.gz 67210 BLAKE2B 2965ad0f33a4312439b6af57cb4f53586e6707fbb9f55db1f766b147118a646aa3f0a338c2b693f44b9ae5a5184c94aea245f0af868d929770b54138edf7b70b SHA512 3e707be45d2e29ef213b42e7447ec35599ff1ca6ab7e193a9dee643979d2cd3d9a5a549cd8ff3c313eb2056845ca831c11492f8118e465ce98f0854042b37e27
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.ebuild
deleted file mode 100644
index f6b937f9a051..000000000000
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.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=poetry
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP server for pytest to test HTTP clients"
-HOMEPAGE="
-	https://github.com/csernazs/pytest-httpserver/
-	https://pypi.org/project/pytest_httpserver/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests from building release artifacts
-		tests/test_release.py
-	)
-
-	epytest -p no:localserver
-}
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.1.0.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.1.0.ebuild
index 7c488288d502..f6b937f9a051 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.1.0.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 5a14b26ec6f7..634c9fd38131 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,2 +1 @@
-DIST pytest-localserver-0.8.1.tar.gz 29088 BLAKE2B 9872d9992a7a19af03bfd7fe748c42cee1daaf7789d4984582c901471eaeab7f1bcf5c21f8eed364c71805fe776f1e4053c6044cd00c333d213ef523b6d0bac4 SHA512 d0707d70b3c5caf346c7461cfca203f903277458596839cc2b1d1d48b6d1e6252e51ebcb9c21dc28fd3b98ce8368cb38e771c2a4226a5fc1dec4007f0b243cc2
 DIST pytest_localserver-0.9.0.tar.gz 30222 BLAKE2B b452ef71045c8a157035d56a17f1debee15ee63ca3912d44c90e691b744216a2375980f728bb1d33ee41c527c7115ea975299d7d567b23a1ca1c5ce2dcf41dd7 SHA512 15aa2db9d5a9ca841499d455de7002cd2cb6288c165605f44bb88d5ce3e06b9ce02eacd226853734017fe41075e1cfcdd5cd5c422ee240086ef0cf95fc450011
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.8.1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.8.1.ebuild
deleted file mode 100644
index 84c4098a7717..000000000000
--- a/dev-python/pytest-localserver/pytest-localserver-0.8.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin to test server connections locally"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-localserver/
-	https://pypi.org/project/pytest-localserver/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires aiosmtpd that is dead and broken beyond repair
-	tests/test_smtp.py
-)
-
-src_prepare() {
-	# remove aiosmtpd dep
-	sed -e '/aiosmtpd/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.9.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.9.0.ebuild
index 4b5bc4f214e2..5b6b6fa718bf 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.9.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-order/Manifest b/dev-python/pytest-order/Manifest
index 13647a70ed85..5f96713abd24 100644
--- a/dev-python/pytest-order/Manifest
+++ b/dev-python/pytest-order/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-order-1.2.0.tar.gz 44307 BLAKE2B 82611b713c9ae064c41e966d503c649c130d5a1df520594f513e9ab3d1cf6890fba65afa860822aedcee1a95617d3cd9010f5189d158cd76b2a4b9d25dd7d916 SHA512 f615dd57546e90c614af35fd79e7e579d48a5e709af3324f476d347e191606b81698bde619a2d0c7181e6f3b1a3c41121c1b06b5de87e66ac2caa77b5ea11ad9
 DIST pytest-order-1.2.1.tar.gz 44726 BLAKE2B b0365a6c7d420e5997ca67fc3de3d46a02a085f024ba2777c480f4c9da7e90ac3dd3b533d67e43934429f3a1ace1725171c56ad59eeb598c06bbe4dbbc5f71e0 SHA512 2ea89f05e6dcf82a6df596feeb1e25b634e48c4c6219b5320b662e88b5ee2473062f3bf1d38696dac2e045fdf51a118b7907c4a06a90e6e256b4d21bd156be18
+DIST pytest_order-1.3.0.tar.gz 47544 BLAKE2B 9f061910babc8f9ffe25180cc3d4c708c97fbd6afd167ce5d937b57977de1694c2be2abf1995ad91d6aa15c2593d14e39576ada3dfc4e33132cc1a813ea44d5e SHA512 e6accdf49fee88b4911eca991a404e00071a58291bdd564a361640ede68e4c3f80ad79522075258f9e7451dd704627c2950922015f66068dd4969e9da20caef9
diff --git a/dev-python/pytest-order/pytest-order-1.2.0.ebuild b/dev-python/pytest-order/pytest-order-1.2.0.ebuild
deleted file mode 100644
index f861ccc1aacd..000000000000
--- a/dev-python/pytest-order/pytest-order-1.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin to run your tests in a specific order"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-order/
-	https://pypi.org/project/pytest-order/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.4.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# these require pytest-dependency
-	tests/test_dependency.py::test_order_dependencies_no_auto_mark
-	tests/test_dependency.py::test_order_dependencies_auto_mark
-	tests/test_order_group_scope_dep.py::test_class_group_scope_module_scope
-	tests/test_order_group_scope_named_dep.py::test_class_group_scope_module_scope
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_order.plugin,xdist.plugin,pytest_mock
-	epytest
-}
diff --git a/dev-python/pytest-order/pytest-order-1.3.0.ebuild b/dev-python/pytest-order/pytest-order-1.3.0.ebuild
new file mode 100644
index 000000000000..97143ae16e02
--- /dev/null
+++ b/dev-python/pytest-order/pytest-order-1.3.0.ebuild
@@ -0,0 +1,47 @@
+# 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="pytest plugin to run your tests in a specific order"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-order/
+	https://pypi.org/project/pytest-order/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-6.4.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require pytest-dependency
+		tests/test_dependency.py::test_order_dependencies_no_auto_mark
+		tests/test_dependency.py::test_order_dependencies_auto_mark
+		tests/test_order_group_scope_dep.py::test_class_group_scope_module_scope
+		tests/test_order_group_scope_named_dep.py::test_class_group_scope_module_scope
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_order.plugin,xdist.plugin,pytest_mock
+	epytest
+}
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 057a06f646b9..2df0205fbd5e 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1 +1,2 @@
 DIST pytest-shell-utilities-1.9.0.gh.tar.gz 79526 BLAKE2B e17b3903b8b3b9c2a8b3d708a1031c5b18beb4741006cec5cf2b8586fb1a86c0034e374927f09786dd036d01ae8811f4eacdaa28053d3205d19bb122211b6437 SHA512 532d82754d0133cc49e8f88e700b1e7469e32a829079536b886358ba15caa18ff30a8ed88e258116ce4302c4220dc986c0f254cef10561ffee81d1e399107dbf
+DIST pytest-shell-utilities-1.9.3.gh.tar.gz 79651 BLAKE2B 1506f7d2fb3b988d55006a8429b6428cb73e969ec72eac5baf944d7e4fc708aaa8e474493ac3e226608c43ece75d2f6070d094f3b656a49bde11bf46a81998d1 SHA512 5ff40043d4f597623bcc61b2c87f00a59fc1882ae6ecda223c82fadc64ae8b5670d07e8e2df54cfcb8b3bdb9483f331a314f4a683760e5ebe843d68ae4067895
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild
new file mode 100644
index 000000000000..6a16f052360e
--- /dev/null
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild
@@ -0,0 +1,41 @@
+# 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
+
+DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
+HOMEPAGE="
+	https://pypi.org/project/pytest-shell-utilities/
+	https://github.com/saltstack/pytest-shell-utilities/
+"
+SRC_URI="
+	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-22.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.4.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index d48baf75e0c2..830a3c2d8ab5 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,2 +1 @@
-DIST pytest-skip-markers-1.5.1.gh.tar.gz 73219 BLAKE2B f8f23bf64dfc23263ee58397fa8571bf76a77820230f8f27003f72f0a26cbb19ae76185ed203e5b516326a40a355c2d006101f2eb7cd4df40f4a4d80e8e7c629 SHA512 4221e39ab472a88c4f6d0cf2fbf0de1568f99f5ca9962e4afab060b6cfd8365d106583cf818a98bbc7f8f4d5192c7fc9678e4e0da2b6c1082c26ee2e049b0004
 DIST pytest-skip-markers-1.5.2.gh.tar.gz 73513 BLAKE2B 51eb60d13a4b91030f68cf95cf1cb1987cc77bc105355fbceb289e73412f577347ba0340403e32b7930c08945b4d0292b7eededc84e8a5932c457073c823be1e SHA512 631cc632dc3d56cc9a62253f50897b98305402516faa2cf10fce8099069618bc82d281ddf1bf5e89ce8e62b798a8391a09132ec493199f3a86e8681c7062b58f
diff --git a/dev-python/pytest-skip-markers/metadata.xml b/dev-python/pytest-skip-markers/metadata.xml
index ff23c8505554..3968dc3142c9 100644
--- a/dev-python/pytest-skip-markers/metadata.xml
+++ b/dev-python/pytest-skip-markers/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">saltstack/pytest-skip-markers</remote-id>
 		<remote-id type="pypi">pytest-skip-markers</remote-id>
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.1.ebuild
deleted file mode 100644
index df299f464d59..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.1.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=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-skip-markers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytestskipmarkers.plugin,pyfakefs.pytest_plugin
-	epytest
-}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild
index 0d34f17d609b..df299f464d59 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-twisted/Manifest b/dev-python/pytest-twisted/Manifest
index 4dd9a8e86275..af4d369a51b9 100644
--- a/dev-python/pytest-twisted/Manifest
+++ b/dev-python/pytest-twisted/Manifest
@@ -1 +1,2 @@
 DIST pytest-twisted-1.14.2.gh.tar.gz 17120 BLAKE2B d12c00c5a01c8219626f5a85d5cee4b2f0fc27d4dbea5c38e4fa7e374d1ca04098b1e8bc453ff1391415b2999eb1bb1f0472cef85bb4b4b2e50a1d2632cb6177 SHA512 51c915dfba829442b68c981f80d42cc22ece12a81388f239211ca73bb76dbfadeec76722df44b2e6b6473a4a3886031846a47b855ef217ed240a7c28d20f6160
+DIST pytest-twisted-1.14.3.gh.tar.gz 17412 BLAKE2B 00516995770e338ffcbd611d31e96576489cc188aba778913938c0fee511e24df887dc1ba41f5ac63cd85e9efec41a78242dd90705a9769bf7c37130749646c2 SHA512 fce003bdf7684a3a3f3bc45d0d7adfbb6350ee7b2f69a35c2ddbd66073e2a993a127fef24008d8300493334543baaf902033316e2c923c6b827a26d0a7356bb6
diff --git a/dev-python/pytest-twisted/pytest-twisted-1.14.3.ebuild b/dev-python/pytest-twisted/pytest-twisted-1.14.3.ebuild
new file mode 100644
index 000000000000..c6585205c277
--- /dev/null
+++ b/dev-python/pytest-twisted/pytest-twisted-1.14.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A pytest plugin for testing Twisted framework consumers"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-twisted/
+	https://pypi.org/project/pytest-twisted/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-twisted/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# If we let pytest-twisted autoload everywhere, it breaks tests in
+	# packages that don't expect it. Apply a similar hack as for bug
+	# #661218.
+	sed -e 's/"pytest11": \[[^]]*\]//' -i setup.py || die
+
+	# https://github.com/pytest-dev/pytest/issues/9280
+	sed -e '/^pytest_plugins =/d' -i testing/conftest.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_twisted
+
+	epytest -p pytester
+}
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild
index 4f09bfae28da..d343380ff98b 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild
@@ -1,20 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="tk"
-
 inherit distutils-r1 pypi
 
 DESCRIPTION="Pytest plugin to run Xvfb for tests"
-HOMEPAGE="
-	https://github.com/The-Compiler/pytest-xvfb/
-	https://pypi.org/project/pytest-xvfb/
-"
+HOMEPAGE="https://github.com/The-Compiler/pytest-xvfb/"
 
 LICENSE="MIT"
 SLOT="0"
@@ -31,5 +27,6 @@ distutils_enable_tests pytest
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x PYTEST_PLUGINS=pytest_xvfb
+
 	epytest --runpytest=subprocess
 }
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index afe2ed9a7571..2aaf9801f4ad 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,3 +3,4 @@ DIST pytest-8.0.2.tar.gz 1396924 BLAKE2B ad95d246f5592cfe54faea6c96e38cb60d3e271
 DIST pytest-8.1.2.tar.gz 1410060 BLAKE2B 1379047c5ba434e98a383756c53a9cf31dc3bd3abcc49820f872b9110ec70906ca14080ce17ed2770b71195fbd79627a0eb16ee00429e165368144b20153a02b SHA512 a6ffae29da98ee4c357ebb03f00c4bc1a33f093ef867ad118841695548468c7f229eaa2c029a2ce3b158bbb0a65be5014e91555a223d04c1c72e614cb1d00546
 DIST pytest-8.2.2.tar.gz 1427980 BLAKE2B 7f343e5ff05e4d26f816595ad1c52ee2b79d38029e75e3641ed0bbb7477e0a47e5ae48ebc3058a8e9f374cd1a391d360d9eda73eca2e41d8b533eda7948aedcb SHA512 896192f0d41f3fef49915dfea6ae33dbb939f6bbe54de27861bf1554bf87f910702169293e923af9bc40466e7f806aa19ca54cbe41a848c233f70b52bb86a63c
 DIST pytest-8.3.2.tar.gz 1439314 BLAKE2B a8edbd9d0eef59e1277d88ef657c4720b79ada68c51b1a30af81ae5652e1bc6c30bf6723472729015446da7815d8b3a7c73af4f5a49664d96beeedc96bbb3d54 SHA512 df4df6603f89658c1d814e209ec71a29606b2c015e58f139e3154b2092b08d369d4660401ed0ea9f04c3c6cdc86357a5279ad01e102a3b81e2cbf6e1572ca007
+DIST pytest-8.3.3.tar.gz 1442487 BLAKE2B a7b262806ac2ef8700034f9d6239ef1f69c865c100a3d2b00c07adb5957e59b664cf2d39b5d2c1352f28fdd8045e8a2bf193543ba67f67c4853b21f95e4f0a6a SHA512 7cdf76e33f20b1b2323de7341c203caa8d7b5505b5e774c55c6e30876e5b6f1405e12d54e7f1f0a1b15dbc0392bd83c7bb1928d25f06db3a15498c9d4cb4658b
diff --git a/dev-python/pytest/pytest-8.3.3.ebuild b/dev-python/pytest/pytest-8.3.3.ebuild
new file mode 100644
index 000000000000..a6ff2735eb2d
--- /dev/null
+++ b/dev-python/pytest/pytest-8.3.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="
+	https://pytest.org/
+	https://github.com/pytest-dev/pytest/
+	https://pypi.org/project/pytest/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-2[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1[${PYTHON_USEDEP}]
+	' 3.10)
+	!!<=dev-python/flaky-3.7.0-r5
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/xmlschema[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
+
+	local EPYTEST_DESELECT=(
+		# broken by epytest args
+		testing/test_warnings.py::test_works_with_filterwarnings
+
+		# tend to be broken by random pytest plugins
+		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
+		testing/test_helpconfig.py::test_version_less_verbose
+		testing/test_helpconfig.py::test_version_verbose
+		testing/test_junitxml.py::test_random_report_log_xdist
+		testing/test_junitxml.py::test_runs_twice_xdist
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
+		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
+		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
+		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
+
+		# unstable with xdist
+		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
+
+		# TODO (XPASS)
+		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
+		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
+		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
+
+		# setuptools warnings
+		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
+
+		# PDB tests seem quite flaky (they time out often)
+		testing/test_debugging.py::TestPDB
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# regressions on pypy3.9
+				# https://github.com/pytest-dev/pytest/issues/9787
+				testing/test_skipping.py::test_errors_in_xfail_skip_expressions
+				testing/test_unraisableexception.py
+			)
+			;;
+	esac
+
+	local EPYTEST_XDIST=1
+	epytest
+}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 9cf073b3e82a..1941b96886d4 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1 +1,2 @@
 DIST python-cinderclient-9.5.0.tar.gz 236811 BLAKE2B 60d450ea31357d366c0c18b6715a36f51a9700393c2e5bb0967cd86706dd552fb2deaee428816019e87bd2c272b2f9342118b1f770370ce5aba062d3ebd292ce SHA512 efcc0f4b32e1d6f8d696137c416aeed6fc4f2a69b6fa59d47f0c46dc7d38d1f2bbc5ea35d1bcbac0604e9db8b75d256d47a76d17d040b6e84fca6069a65df8d8
+DIST python-cinderclient-9.6.0.tar.gz 237239 BLAKE2B 34080bcc739db3df9fbf2b45115726df6c435ade39b9d92b8752db06a661db8d6ad92005d1358ae4f0bb313db663bbb1e6e7fc1fde0373941eee39921b22a9b3 SHA512 f2dec3927063c40046c72e090f95f996a16582c09cca8de320fedf80037e4c8dea231c8b48d3fc1ad085b89f43afc413c477e162f231940616f3373d4f86d4ee
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild
new file mode 100644
index 000000000000..cab20f180eb5
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild
@@ -0,0 +1,48 @@
+# 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="
+	https://opendev.org/openstack/python-cinderclient/
+	https://github.com/openstack/python-cinderclient/
+	https://pypi.org/project/python-cinderclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/oslo-serialization[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b cinderclient/tests/unit
+}
diff --git a/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild b/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild
index 9cd13e324c80..5a6a7be64ca1 100644
--- a/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild
@@ -22,8 +22,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 BDEPEND="
 	test? (
 		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
 		>=dev-python/sh-2[${PYTHON_USEDEP}]
+		!mips? ( dev-python/ipython[${PYTHON_USEDEP}] )
 	)
 "
 
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 69d943393d4b..e73f5c9d63b6 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1 +1 @@
-DIST python-glanceclient-4.6.0.tar.gz 206480 BLAKE2B 302414b0fcf85ec9a8e53e9bf43c5801df82826524780249e9c4b46b44ca2e53c1c5d63f6e80c73dee2a59009a3e0aa1df591ecb2a4d000b74ee078b4810de2c SHA512 ed9d554d40a03134bc8871fbf712dd4bb2aab5e18854fd9c07df0d20dead1a9f3473bc4253ba4dd8c87cf7227148c637718461d45cd01bd9aaf673f7fc7ee9fc
+DIST python-glanceclient-4.7.0.tar.gz 208314 BLAKE2B 97a157781efc0fc67d67f25119edea2a3f85344447e4614f41c73a3f9abda1c9ba646ca7f8d7b2b315b4572997ec730e6eef1782852590e7021f69c61b02920b SHA512 5fff50d499b7fe439cb43c7d396a7dd28439f45cfc157e4fdefb029e7db4cc9955911aae9c4d748fc19bd10ad66d299e26a1178a63a866fef7fb60164467c79d
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.6.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.6.0.ebuild
deleted file mode 100644
index b1ca97d43703..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-4.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-glanceclient/
-	https://github.com/openstack/python-glanceclient/
-	https://pypi.org/project/python-glanceclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	# combined patch for urllib3-2 and py3.12 test failures
-	# https://bugs.launchpad.net/python-glanceclient/+bug/2069684
-	# https://bugs.launchpad.net/python-glanceclient/+bug/2069682
-	"${FILESDIR}/${P}-test.patch"
-
-	# py3.13 added close() to mock_open calls
-	# https://review.opendev.org/c/openstack/python-glanceclient/+/923628
-	"${FILESDIR}/${P}-test-py3.13.patch"
-)
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b glanceclient/tests/unit
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.7.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.7.0.ebuild
new file mode 100644
index 000000000000..935bb896e697
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-4.7.0.ebuild
@@ -0,0 +1,62 @@
+# 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="A client for the OpenStack Glance API"
+HOMEPAGE="
+	https://opendev.org/openstack/python-glanceclient/
+	https://github.com/openstack/python-glanceclient/
+	https://pypi.org/project/python-glanceclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	# combined patch for urllib3-2 and py3.12 test failures
+	# https://bugs.launchpad.net/python-glanceclient/+bug/2069684
+	# https://bugs.launchpad.net/python-glanceclient/+bug/2069682
+	"${FILESDIR}/${PN}-4.6.0-test.patch"
+
+	# py3.13 added close() to mock_open calls
+	# https://review.opendev.org/c/openstack/python-glanceclient/+/923628
+	"${FILESDIR}/${PN}-4.6.0-test-py3.13.patch"
+)
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b glanceclient/tests/unit
+}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 1b3278f47937..1ca5bc349e6b 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,2 +1,3 @@
 DIST python-ironicclient-5.6.0.tar.gz 229569 BLAKE2B 2db608463479fc5bb7061562d8617d96244e80276790ae2829373d9ba02412027658c33c5f22d6fd921bf84599584c588c462b4480d294e288dc063f7c73e274 SHA512 133de151e5a884c0c9840b72236f5d99e5e197889ed2e80545174d8754b09e65c370c6a97c367ed4c4ca76f593e665e6481cd45c266fdf3ba7fc348307539907
 DIST python-ironicclient-5.7.0.tar.gz 230550 BLAKE2B a4571693ce95608d7403113e56df62961eb040ee924ff8d45ebacf41a924cb489157a48043d768e4e5691477bd2dbf24a658a59703e84c61871be5f4d9700dbf SHA512 f819a2be1301da821eb340da789dd188dea33fb48b2ea2f3ec740eb04b66cf121fc1f72f592e3f17cd38be30b9afedf4209dbe725eaa772938a9977a83e84506
+DIST python-ironicclient-5.8.0.tar.gz 235768 BLAKE2B 254e70bf1a007bcc1fbd5c13f8a650c473f294ab218c01b8b69b66a4518fdbd35b4dd1cdda808342efde92ebebbe25e7221b0e97492b0c2d6095d0107f05d0d7 SHA512 fa96807bb17907f9ae9a761c9dcd4e87e5fed5d73a978da0e0e8536574277032c52fd96675bf7738271616e3f2897b67dba4d8ac3731ff0785ed2b8a91acb900
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.8.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.8.0.ebuild
new file mode 100644
index 000000000000..036a407a0b35
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-5.8.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=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-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index beb90557e4f3..9f25c32dcfbe 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1 +1,2 @@
 DIST python-keystoneclient-5.4.0.tar.gz 324151 BLAKE2B a086432c7fe81e6b39661f2e582e5c81efde88f04ba9e8e4fca17d4d217cb67a9a7cc38087e41a2b47e5b4540245a2586436c31e9596a2c520ad3e3219ff9b0f SHA512 496c321cc68efc3f7eaacfcef39ce3a4e669ab816245e6d4afb8e06a97490eafa6f16135a2c957bfdaecf9fe12577f0ecb6a97185844d376e41d22beee190475
+DIST python-keystoneclient-5.5.0.tar.gz 324070 BLAKE2B e901a44285b6962ff7cfa499460bc93ad58263c9f033c39eee3a6f241592e46b3078bf180b3581f2a6ecf126fe052bce862b45c84a169370c11847720f6299f1 SHA512 f9e6300af0fcae0a1eef6b964a81ab16cc164afc51c5b6f2dcb2d391f7934b2a937554af20985311f7e74d6794e69059dce4ba0e2cf972b6f47a76272a274ed8
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild
new file mode 100644
index 000000000000..4ad8f7c3e138
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild
@@ -0,0 +1,56 @@
+# 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="Client Library for OpenStack Identity"
+HOMEPAGE="
+	https://opendev.org/openstack/python-keystoneclient/
+	https://github.com/openstack/python-keystoneclient/
+	https://pypi.org/project/python-keystoneclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${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/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest keystoneclient/tests/unit
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 40b8902654af..e85f72192110 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1 +1,2 @@
 DIST python-lsp-server-1.11.0.tar.gz 113347 BLAKE2B d8417fb63447c5130d88dd6583ef0dc0c724076b22006a59da914a10440e67a4fc2362fd677a45b257fcca804c965920d54ff47568ad607e49f05d13d6d3e1ee SHA512 bd96850b822dc3c2e97d5ee38f25c9f7731dc68b31fedcc2d3e0ff373bc3ad8a989f1a4b85527477bbbc875e853d5513d8583bc3cdc22a3c0545716e68382093
+DIST python_lsp_server-1.12.0.tar.gz 114328 BLAKE2B 3c94642be615822058debda5cb9de07529e7d269938029d66ade7eb7db801e7db90ae724f449e1133a813967e94bcfc71247f0392db1c495af5fff89ae66bd03 SHA512 74cbd8012f5e027fb117105302ba92e142900e88565d7f95d2dad72f2624048fff3c2c85085b648bd1ff86f6f6eb679aa34d5f6d9ae54b80e96b6ed472785b32
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
new file mode 100644
index 000000000000..a0372d60453a
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
@@ -0,0 +1,88 @@
+# 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-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index d854705f9cec..68ee0bf84526 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1 +1,2 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
+DIST python_mimeparse-2.0.0.tar.gz 7162 BLAKE2B c87e391a87d06a0c967f51df4c9010c8f415a6a96d7b10f58ede9fb225ebabb9f85b42c22fef9ef583537e86341c9050527b1f8d38eec2c78cc1cf3f56f443ac SHA512 02fd28d6a5b1754ab9317571037b38dae94309694bc5d758c189acdda596a5e1e9c4cb2439abb9e932ddf1d6926930874f00d3c685a7edf568d339f9fe0c712a
diff --git a/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild b/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
new file mode 100644
index 000000000000..a797008b33c0
--- /dev/null
+++ b/dev-python/python-mimeparse/python-mimeparse-2.0.0.ebuild
@@ -0,0 +1,23 @@
+# 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="Basic functions for handling mime-types in python"
+HOMEPAGE="
+	https://github.com/falconry/python-mimeparse/
+	https://pypi.org/project/python-mimeparse/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+python_test() {
+	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 362d9a04b26e..503c2477aa17 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1 +1,2 @@
 DIST python-novaclient-18.6.0.tar.gz 339868 BLAKE2B 069d7b213c8dc8b8061cc70ea49f9f7f7599aab1daead5b7e54423133f0765df32924ce05f1d2c00833e5ea177f6ffa9311055328246137bc134f3a162ef9fa4 SHA512 a2f93f063bc22b12294664edd37187a0edc80e01b62802d59a5603c11cba8154300e5206c9f835a0a0b6a00adb2b281271b6f8a1f50379668d88f4c5222d55b9
+DIST python-novaclient-18.7.0.tar.gz 340344 BLAKE2B c21122bef909453ee33e4fda3a49349dc228759012f2ed627a07d4abf6a83eeee83d12b3cef6a4adb6fdefa69f416b0e6248baab63c8c7f46c5a461ec0437901 SHA512 32ff8e3bb6b2c91d9d6fc157147e2e44cb2e1efd1da31407c6de2f504498aa896d76157907c784ee3c8b3b1cb6f5030880fecc42d5f3437f0ae8968bb7e5cf4f
diff --git a/dev-python/python-novaclient/python-novaclient-18.7.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.7.0.ebuild
new file mode 100644
index 000000000000..bb3df127025f
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-18.7.0.ebuild
@@ -0,0 +1,62 @@
+# 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="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-glanceclient[${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-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 825b7e9ed330..a10662b27b00 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,4 @@
 DIST python-openstackclient-6.6.0.tar.gz 917251 BLAKE2B 9f11b357bdeede556e106a21b2c7bbd86804251612cd676525a8817b693733dfe72388213cfa16517b3b75725702090fa3e728ec6986dcda196aa1e8aac9fd0a SHA512 7b073263fe9d905b3c10b2a4dcfa7156c9cd5ae453d792e1dcf3be278de0abc25c931388c8cabff6b11b61174acf79c87951028626af1e1b9f0dd09f38b7900a
 DIST python-openstackclient-6.6.1.tar.gz 917516 BLAKE2B da771630628444d02b6937d6138e83416f982d70c57211c90d648bff000692de3acc1594268e9dd8b9521165508c063dbaba3e740c6fef874645af0b9fc89248 SHA512 e59d2fbf1bb5b4e9080aa7b81c110876c444052b3e57037a520995b273712b2a30f56f25937c524fe62889c49f72c5a3cc14e83ebc77886cae23c3e23a071158
 DIST python-openstackclient-7.0.0.tar.gz 946254 BLAKE2B 4120797686453671ae47a0ce57856ec8424da7a38df3f478b1fb455a4af9dbdee6365dc9efbe750e8062f87f9a8fa218ed04de75bdc97af5cee763e31338199f SHA512 9e541b33abf5b3fad6f05782f1c16377b497b099a227490d9405da5140f11a73abba75c9a7021df7d129a4653316b742e16b4c049ef1f26b961d35a281618ebc
+DIST python-openstackclient-7.1.0.tar.gz 946758 BLAKE2B 459a926d27fbbe7a9ffd72e49721559bee537afa44ba032ab0c9ed3875036dbff621d028c29449ef93708da40bfc09829ed0528b08a3f6c080201f31c5d95192 SHA512 7d1b006756446dbf96bf2cdcb17a46dffac1c27fd3cb73168c731f6e90f5ef157e36448ce6d788c37472b0d335989318ec64864f700250d5a0468f3d116b5055
diff --git a/dev-python/python-openstackclient/python-openstackclient-7.1.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-7.1.0.ebuild
new file mode 100644
index 000000000000..5b00c3719889
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-7.1.0.ebuild
@@ -0,0 +1,61 @@
+# 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..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="
+	https://opendev.org/openstack/python-openstackclient/
+	https://github.com/openstack/python-openstackclient/
+	https://pypi.org/project/python-openstackclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.27.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Depends on a specific runner
+	sed -e 's/test_command_has_logger/_&/' \
+		-i openstackclient/tests/unit/common/test_command.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstackclient/tests/unit
+}
diff --git a/dev-python/python-snappy/Manifest b/dev-python/python-snappy/Manifest
index b3376162bec1..783fff3df541 100644
--- a/dev-python/python-snappy/Manifest
+++ b/dev-python/python-snappy/Manifest
@@ -1 +1,2 @@
 DIST python_snappy-0.7.2.tar.gz 9108 BLAKE2B a0f23b286f97de2d61afc51dcba188d77d0c0099b7cba26c7a0e2bc4da41045fc6a4a95d3adf3ef80d16300a7d35a66955552cf5693c0a0a38b73478b864d266 SHA512 c585e9e953c2bf2cb7d3f24ae9745d267b334d681ca44b7d842de2405df19b24af0f6915f0274de2a86e74fdcfef3715e5c27765243d84459216476c31aaa437
+DIST python_snappy-0.7.3.tar.gz 9337 BLAKE2B fbc0afbf01cb97b00855e94d3f13b8a3c92dc4a6ed6f078f1838ebb90c6643548477a880c910b07a2d5a7ee59d260be6a9dfb53719c34b7884b2071724154d85 SHA512 bb4cf220a3819622038e7aebf5100ac5126b9d42db15f4e89bd123088d1e62bab56488969adccea3a45719d760b1ed77f493051859f90fb8fc397cfe0661dd74
diff --git a/dev-python/python-snappy/python-snappy-0.7.3.ebuild b/dev-python/python-snappy/python-snappy-0.7.3.ebuild
new file mode 100644
index 000000000000..44d2eee97a7e
--- /dev/null
+++ b/dev-python/python-snappy/python-snappy-0.7.3.ebuild
@@ -0,0 +1,25 @@
+# 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 the snappy compression library from Google"
+HOMEPAGE="
+	https://github.com/intake/python-snappy/
+	https://pypi.org/project/python-snappy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/cramjam-2.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 815fc5a9be22..078d977efae8 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1 +1 @@
-DIST python-socks-2.5.0.gh.tar.gz 32293 BLAKE2B 20eaa8b27d695116f9d03bfa1807496c789a43804c06f441f7961d928095d169f9b581120c29d188e0eda39d15b517012647e6f6f682a29c260179dca422b0dc SHA512 d59a3eb851c80556e08513ae417a109da6670b81858df365818ca187d14b57719ee86c6a65d9e8a8366ad3c7a2516a10cabcbf9895d8456b5f188c80dae74eee
+DIST python-socks-2.5.1.gh.tar.gz 32387 BLAKE2B a0f488a146b09433bee39382ace3143a31a55d3fccd2db5e5ca6c2a08f3e17abee5839a266f8dc1b1b3ac6add7584cfba988aacba575ed5d21a464f8a2f1464f SHA512 6f2491272d201abc06a0d0a4fae242899ed28f9caeb7bea42c33946daec3280b48a956319b82a89ebeb8ea61ab9c290f9360d6ea85eb4d654525b95faa3ffce0
diff --git a/dev-python/python-socks/python-socks-2.5.0.ebuild b/dev-python/python-socks/python-socks-2.5.1.ebuild
index 2b88d418ab9c..2b88d418ab9c 100644
--- a/dev-python/python-socks/python-socks-2.5.0.ebuild
+++ b/dev-python/python-socks/python-socks-2.5.1.ebuild
diff --git a/dev-python/python-tests/Manifest b/dev-python/python-tests/Manifest
new file mode 100644
index 000000000000..f6af53db9fce
--- /dev/null
+++ b/dev-python/python-tests/Manifest
@@ -0,0 +1,24 @@
+DIST Python-3.10.14.tar.xz 19600188 BLAKE2B a9e65fff590d56848f55f2d93d8a1c631bb8135617112997fbaea9fc45db1d5e2ce39f00cb29c9428542e523fdf48064bdb9aea144acb7aa7cfe71990b8e949e SHA512 adee638aeca898743da4b8245c0fa1e9b94b516f22e716e60c99038f0bb3dcbf726317aa86656404be1719b5a7c58eb09533720ebc0badbb04bd9a534dd48fef
+DIST Python-3.10.14.tar.xz.asc 833 BLAKE2B 945ada655532d578beba9fdd882cc9cc247e24f7efd68ce172766a8adcb3c8d76bc1f229402405e607004ae0f9bb8e55e4b01867ca712700106d8ec42212cb2c SHA512 450f910a91dd0fb66f99245828983a9234c4a67ea7e653404efa06ce5da1c6667a46329a2d1e276c5a956d2c32d8ae6d8c497a1892102f4a360dae33b135c372
+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.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.9.tar.xz 20175816 BLAKE2B 4e7cd2c42ee39b5ef9624ebd1798320957e948cb4f23f17fd1530814c60126dbf988846928d4d7d4b9d2174029ab8d4dbaf19e6203da237da4c3212ddebd5803 SHA512 2b0a1d936b4ef8376f9655797aece8ffdff75031ad7bfa840f330cac2aed189aecc80c163edc12ea772851d7a011f3fc1960470a73d9d4290cf3ab8ad6ed7e6a
+DIST Python-3.11.9.tar.xz.asc 833 BLAKE2B fa29f632bae0bee7db946038ee3529bc3bfbe1b2e755b21394f67a3c80911ce8079aaab43a16d88e614a8bfc01fb5105ce3f61c59a5ca44470b0f59787c707b3 SHA512 b18b50e7168b2ca5376a1fa75e50e8baae2026d4f11d4cf613d758f3f17df4610fe4653fb2ac0c5c4ec0f6e630dc6490ad1ff32a2fd0ebd60f9f3bd136207ffc
+DIST Python-3.12.5.tar.xz 20422396 BLAKE2B f127d1e12d12be84d5837282757787be8a0cf702adce29b93622f91f45ba2d8cc0f5db2e8277c86b098623951b302015febd28bdabaff66b30cb06a5ef2b4a24 SHA512 7a1c30d798434fe24697bc253f6010d75145e7650f66803328425c8525331b9fa6b63d12a652687582db205f8d4c8279c8f73c338168592481517b063351c921
+DIST Python-3.12.5.tar.xz.asc 963 BLAKE2B 238167f6b4012136bc4274eee0dd4d958c4ee02d2505f9f64e5bcad15e84a9e9e12a9fc907651083543f1fce93579b752d4ccdf60c8cc421cb43e9034877bf1c SHA512 65ce92272a38cc6bf8bf56fa2a99a830cf5b33b811b1788508e7b6f8b5d3e93e0b143412f829271be40cbb4e7c154f84499239b3e8ab63b2ccf0a5a22d2f84ee
+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.13.0rc1.tar.xz 20881016 BLAKE2B 3971a233e9c3c782973e0276740f00f8f2072eeda914663cdf7fa6c5de2437c60c441184344a64e25cab5c71a02c47cf4602dd08f127f310c885386cd887fec4 SHA512 fce7664f3298cfd191a7dc20b7b47acafdc50d058a2814312c94c30b65291395957d701e4661b9bb760417942acb5d27e5b8bb479bcda9a82cf29f53772a2daf
+DIST Python-3.13.0rc1.tar.xz.asc 963 BLAKE2B 1c292362cd133dbbb1df1e0cf440e8adde2bc8db9174e550d5b76a09e80d0dbc11a0250e6f041e54fe58f25dc05f071c7af1aa910ae56ece5eb430502a2ba67c SHA512 3613829d9631f46b1b1ce11bfe5bb7fbfa49d97b639bb883c86737ea6ae8d15c24c526083cafb916011bd6d0b3b5fab2b17afd367edbdce99b32e0b4b845fd22
+DIST Python-3.13.0rc2.tar.xz 21055084 BLAKE2B 017ac82c1938d1fea0a501efb9d1848115648f0472b7cbaa4eac65cf085c3c6410ea83aab2e935952ca1b415d603f4c5680fec7a15ce5b40794b2fdcef662666 SHA512 85e6e6e80970ca38119e4f95880fb12e2d1548e6d60235cfcd7f6aaf08588c483469e43dda0f004b95455c2fb88ca736c313b22ae37eb0d4e6460ef521855c8d
+DIST Python-3.13.0rc2.tar.xz.asc 963 BLAKE2B bb75db12c424b7a05c8c0082f79c1ab6e2ad04440a27d2c964edc073fbdc1c0ac442b0b2a0719a33f8058bc7bc9097eb22e031299f8de5b6d88b74e4e5ece8a8 SHA512 6d80d089b55910628744d21b0382b6441d0550c139dbee71d68a7cd9e494bff1c8235a2a894f3c7a52f9af312480a4001f333e04c9054f32db7eefd2a7d39263
+DIST python-gentoo-patches-3.10.14_p3.tar.xz 22080 BLAKE2B f45ebe4df3dc39a842c93d741ef66fd0f9f7d1c6453d499d59b62eda41f01bc17e109205fedc506963d1f21eb3fbf9478564ff5e1a11c10336f855069a642ceb SHA512 db268f1482e5c46a71ce3aef2c2ab6d458cc5263aec360e61c6aff97f119f4f100becefbb575156b1b0239e591a496cb62a136597fadae8a5b630c7233c0040a
+DIST python-gentoo-patches-3.10.15.tar.xz 15896 BLAKE2B f908b409dbcedeb4e2fa7255d9dedfb8f86f39b9b12612d45662d2305012692753874befa5377e1bcb2e8fc04b54bf206948e12eb7bc357a764c1b1e496e5997 SHA512 a647882ede8d7b97e301e472e91f4573dce9f8bf4e408449444625fdf79859a54fd828daa60c7960721f34c3d6d82e2e45db2c55f2fc093097a0db42f7363b8c
+DIST python-gentoo-patches-3.11.10.tar.xz 8484 BLAKE2B 844aa7a855e3ab5a6307c6bfac9d58faad249ce550d21e8526125dc56b9665dc6fa00530a60efe8f851397d368057400851906e59fec10f6325bd83a51e39317 SHA512 bb602b80eed62ca8477b05665267ec3729fd9a85d9b709f844ad729f496d008a529d05d2ebfe8acb5db5ccb99005260bfe458f6ce0d9d358530670e0970e415e
+DIST python-gentoo-patches-3.11.9_p2.tar.xz 14916 BLAKE2B a910eae412fc1ce3657272c3c2ea9ef95b8d5711ed4c85b93a35f4ab757b1134bff0f8c8a0071e8e06aac784d0b51e36cd9271f892098cba272da4a4e73317d1 SHA512 5c055186b3a8376f4f602ec5d1f8e7bf0f067bc67295c1cdaa68ce1fb6fb21cda75e22705b8a5a2a6525af67f3b36a82fde5ba6ae9b097a5914ab79a2f1a0fad
+DIST python-gentoo-patches-3.12.5_p1.tar.xz 8632 BLAKE2B 13570bb465002cea3590b06d055b936ac0fcc68f6f258aca99a67f02f0b1cd28396424b686c5e080f593a74a744ff449e7220f51f167a858b2313be4c8b64b19 SHA512 eb9fb2d48236a9f7941fb8938310cc32d216eb01e19277175223b8b1fe1bfd606bde9a3c8bc66ad2e494fb87ce23b0d1acd359c375e4a11a5caae25450c11360
+DIST python-gentoo-patches-3.12.6.tar.xz 6048 BLAKE2B 577032d7aa4bab423781bffad8e64f56b492dc31fbd20acd91f3d28356bd697603dfd47a3a9051538dde2af942ae513727ecea415d82f5082a992bd22b8cb2dd SHA512 6f1037e97bb362a3d04c3ec080dc062c5de6e4b779cda0d88f684422d757acd6fc6f971c7004a3f50bbc0161dd28c3146672f74e0e598066f9a8ba4e0eb2627e
+DIST python-gentoo-patches-3.13.0rc1_p3.tar.xz 15148 BLAKE2B 668060644372e8ddf2d9686796ec304ae7689f5c10ecbc6862f054f96504c418b0e4df28675e4fbb610889f9a665a7a54f23633036b0df35f19f40ef8e6bab32 SHA512 c0cbdf9e0fe2ad29175302e548ebfda1d2af42af0ffeb363eb8b0dc53e1059f5abd7dcd02fd8e9eb9ba7bef2b34b7693633f0a62dc1ab933f43077feacf00fbc
+DIST python-gentoo-patches-3.13.0rc2.tar.xz 5696 BLAKE2B 4e716d1d6225e811b598d029ef1dbdc413df614ef00ab8051ea697e633477a0114a3660cae037bdf4142f76c9f2efdefc25b604af11c31eb77d6d98d8f932cff SHA512 c20b53772bd7d305562657722aec70de78fffbf8ab7939f59d496e06c21b31fcd7b4a92573b1000d3bee4d90fd8b7422543f9cfdad15d60bc9a7ecf2a2259599
diff --git a/dev-python/python-tests/metadata.xml b/dev-python/python-tests/metadata.xml
new file mode 100644
index 000000000000..bb7bb559e7ef
--- /dev/null
+++ b/dev-python/python-tests/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>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">python/cpython</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-tests/python-tests-3.10.14_p3.ebuild b/dev-python/python-tests/python-tests-3.10.14_p3.ebuild
new file mode 100644
index 000000000000..75e28e00a29b
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.10.14_p3.ebuild
@@ -0,0 +1,65 @@
+# 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 ~ia64 ~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_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.ebuild b/dev-python/python-tests/python-tests-3.10.15.ebuild
new file mode 100644
index 000000000000..5092db1ea390
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.10.15.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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.11.10.ebuild b/dev-python/python-tests/python-tests-3.11.10.ebuild
new file mode 100644
index 000000000000..ae123c85e095
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.11.10.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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.9_p2.ebuild b/dev-python/python-tests/python-tests-3.11.9_p2.ebuild
new file mode 100644
index 000000000000..b768d7a57587
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.11.9_p2.ebuild
@@ -0,0 +1,65 @@
+# 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 ~ia64 ~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_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.12.5_p1.ebuild b/dev-python/python-tests/python-tests-3.12.5_p1.ebuild
new file mode 100644
index 000000000000..bad3e554ac7e
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.12.5_p1.ebuild
@@ -0,0 +1,60 @@
+# 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 ~ia64 ~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_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.ebuild b/dev-python/python-tests/python-tests-3.12.6.ebuild
new file mode 100644
index 000000000000..8fd2057cc669
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.12.6.ebuild
@@ -0,0 +1,69 @@
+# 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 ~ia64 ~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_rc1_p3.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc1_p3.ebuild
new file mode 100644
index 000000000000..49858db603f9
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.13.0_rc1_p3.ebuild
@@ -0,0 +1,60 @@
+# 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 ~ia64 ~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_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_rc2.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc2.ebuild
new file mode 100644
index 000000000000..03c0f6e0cd59
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.13.0_rc2.ebuild
@@ -0,0 +1,69 @@
+# 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 ~ia64 ~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/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index ff10cf341c24..dbe4721ad376 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,2 +1 @@
-DIST python3-xapp-2.4.1.tar.gz 21181 BLAKE2B 460aba09d147d64c8102f66d059c6ab1f7c39893ce98844e59ab5954b690d81ab4b253cb6a17f9b3c781dfb5e965d1a4de859aaeff5ef65ab3f67a86a4c6e6c2 SHA512 97045061aa5965adcfe7301774dbd35a226fa9b846e31a7c097229cc417ff4008e518ebd5b600d4ce6a46daa39d51de70d391b6b0a7c78490419d3a96daca6a9
 DIST python3-xapp-2.4.2.tar.gz 21482 BLAKE2B bacea6a626efa8ee60a4f91923e48e0e9e49d08ca0c9a5998b724284edc353912099f2deafc6eb7cf6a42a983f97f8cc03fe86c18338c89823f103e413685637 SHA512 04f995986eabaf613d166ae31bd36eda2b3563ea58aded64b132940430db9d59f9525eb562b0ad8d7649844adbaf28332c4f51fa633610b102feae97bc1bfc9f
diff --git a/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch b/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch
deleted file mode 100644
index cdc6988934b9..000000000000
--- a/dev-python/python3-xapp/files/python3-xapp-configurable-python-target.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 70966ad200bf2a5e5769a2ac5f1d4da0a4a3aa51 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Tue, 2 Jan 2024 22:19:46 -0500
-Subject: [PATCH] Make python installation configurable for distro packaging.
-
----
- meson.build       | 2 +-
- meson_options.txt | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index a9b67ca..a930803 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,7 +1,7 @@
- project('python-xapp', version: '2.4.1', meson_version: '>=0.47.0')
- 
- pymod = import('python')
--python3 = pymod.find_installation('python3')
-+python3 = pymod.find_installation(get_option('python_target'))
- 
- subdir('xapp')
- 
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..689a9c9
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1 @@
-+option('python_target', type: 'string', value: 'python3', description: 'Python installation to target')
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild
deleted file mode 100644
index 46d9df3aeab8..000000000000
--- a/dev-python/python3-xapp/python3-xapp-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapp"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=x11-libs/xapp-2.8.1[introspection,${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# Make python installation configurable for distro packaging
-	# https://github.com/linuxmint/python3-xapp/pull/23
-	"${FILESDIR}"/${PN}-configurable-python-target.patch
-)
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			-Dpython_target="${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/python3-xapp/python3-xapp-2.4.2.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild
index b6181624fc4e..cb18f9836057 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/dev-python/pythran/pythran-0.16.1-r2.ebuild b/dev-python/pythran/pythran-0.16.1-r2.ebuild
new file mode 100644
index 000000000000..3fa68c4a517a
--- /dev/null
+++ b/dev-python/pythran/pythran-0.16.1-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2021-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/_p/.post}
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/
+"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86"
+
+RDEPEND="
+	dev-libs/boost
+	dev-cpp/xsimd
+	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
+	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	|| (
+		<dev-python/setuptools-73[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-73.0.1[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	test? (
+		dev-libs/boost
+		dev-cpp/xsimd
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
+		!!dev-python/setuptools-declarative-requirements
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_configure() {
+	# vendored C++ headers -- use system copies
+	rm -r pythran/{boost,xsimd} || die
+
+	if use test ; then
+		# https://bugs.gentoo.org/916461
+		sed -i \
+			-e 's|blas=blas|blas=cblas|' \
+			-e 's|libs=|libs=cblas|' \
+			pythran/pythran-*.cfg || die
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=80
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		pythran/tests/test_numpy_ufunc_unary.py::TestNumpyUFuncUnary::test_signbit0
+	)
+
+	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
+		case ${EPYTHON} in
+			pypy3)
+				EPYTEST_DESELECT+=(
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_bdist_install3
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_build3
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install2
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install3
+					pythran/tests/test_exception.py::TestException::test_multiple_tuple_exception_register
+					pythran/tests/test_ndarray.py::TestNdarray::test_ndarray_fancy_indexing1
+					pythran/tests/test_numpy_fft.py::TestNumpyFFTN::test_fftn_1
+					pythran/tests/test_numpy_func0.py::TestNumpyFunc0::test_ravel0
+					pythran/tests/test_numpy_func3.py::TestNumpyFunc3::test_list_imag0
+					pythran/tests/test_numpy_random.py::TestNumpyRandom::test_numpy_uniform_size_int
+					pythran/tests/test_set.py::TestSet::test_fct_symmetric_difference_update
+				)
+				;;
+			python3.13)
+				EPYTEST_DESELECT+=(
+					# repr() differences?
+					pythran/tests/test_xdoc.py::TestDoctest::test_tutorial
+					pythran/tests/test_xdoc.py::TestDoctest::test_utils
+				)
+		esac
+	fi
+
+	epytest
+}
diff --git a/dev-python/pythran/pythran-0.16.1.ebuild b/dev-python/pythran/pythran-0.16.1.ebuild
deleted file mode 100644
index b93681c29f4f..000000000000
--- a/dev-python/pythran/pythran-0.16.1.ebuild
+++ /dev/null
@@ -1,107 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Ahead of Time compiler for numeric kernels"
-HOMEPAGE="
-	https://pypi.org/project/pythran/
-	https://github.com/serge-sans-paille/pythran/
-"
-SRC_URI="
-	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-libs/boost
-	dev-cpp/xsimd
-	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
-	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-cpp/xsimd
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/cblas
-		!!dev-python/setuptools-declarative-requirements
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_configure() {
-	# vendored C++ headers -- use system copies
-	rm -r pythran/{boost,xsimd} || die
-
-	if use test ; then
-		# https://bugs.gentoo.org/916461
-		sed -i \
-			-e 's|blas=blas|blas=cblas|' \
-			-e 's|libs=|libs=cblas|' \
-			pythran/pythran-*.cfg || die
-	fi
-}
-
-python_test() {
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		pythran/tests/test_numpy_ufunc_unary.py::TestNumpyUFuncUnary::test_signbit0
-	)
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		case ${EPYTHON} in
-			pypy3)
-				EPYTEST_DESELECT+=(
-					pythran/tests/test_distutils.py::TestDistutils::test_setup_bdist_install3
-					pythran/tests/test_distutils.py::TestDistutils::test_setup_build3
-					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install
-					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install2
-					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install3
-					pythran/tests/test_exception.py::TestException::test_multiple_tuple_exception_register
-					pythran/tests/test_ndarray.py::TestNdarray::test_ndarray_fancy_indexing1
-					pythran/tests/test_numpy_fft.py::TestNumpyFFTN::test_fftn_1
-					pythran/tests/test_numpy_func0.py::TestNumpyFunc0::test_ravel0
-					pythran/tests/test_numpy_func3.py::TestNumpyFunc3::test_list_imag0
-					pythran/tests/test_numpy_random.py::TestNumpyRandom::test_numpy_uniform_size_int
-					pythran/tests/test_set.py::TestSet::test_fct_symmetric_difference_update
-				)
-				;;
-			python3.13)
-				EPYTEST_DESELECT+=(
-					# repr() differences?
-					pythran/tests/test_xdoc.py::TestDoctest::test_tutorial
-					pythran/tests/test_xdoc.py::TestDoctest::test_utils
-				)
-		esac
-	fi
-
-	epytest
-}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index a9a76de2cc2c..689679864fb3 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,3 @@
-DIST pytools-2024.1.11.tar.gz 81917 BLAKE2B 197481c41ddf589c46e7f5470de6122f13aa1b69fab46342e20b30e51cc0f5a54cfc240522e16daaea941f4492eb9dd858de66255fba4ddbec8bd763a4f87069 SHA512 03521c3e6473e5e26c329ddeb596548c11a814c65a45b9d5a925346b7cdd9332ec0968cf80c350310955288e703c2e3d914a24253d34546a6ee814b07d373ae6
-DIST pytools-2024.1.12.tar.gz 82577 BLAKE2B 7463a8c8f5644cf2f3c0d1326cc353c111fe87230727149881a1f68a8fce046049c54ae3d414a8d60adec66cccefbd133ab446a65bf35cdb21f08a383f7571e2 SHA512 c234a55493e6dcb1b26a18f666a9e3892d2e6d3eb76cda24db97231c1a1b6fff796780ac0c6776a00a3e2d21fc6e56364879e3d39de3fcf5173c6cf7a183a3a2
 DIST pytools-2024.1.13.tar.gz 82559 BLAKE2B c9b2d43a9538eb4a0daaf623345961e839cd227de22dc141923129418315947dc813b67d78c39d84062ef712842dfad63ef7d519d672960f25594e7f8bd5b0e5 SHA512 dc5d8e9ef291afc9cfab39450ecd886c3ca5776cb9f29b675ae7459a5ef2bdf29cc9978fe3991ef86b11516902d04c7de861947ea9f2d261735d52db2bfefc5c
+DIST pytools-2024.1.14.tar.gz 83715 BLAKE2B 7670a6876f908097b07322fcce1acbebce9d4cbb9a955425544fe9f456895606629b84df894eb156eced9990f2f033301b48ebd511ee7dcbc06d1558dba4847a SHA512 07a4b2066553e0f2db5227e7f55db749e38c77afd566dcb45c65665a444451e8209ef028b7fdd3f855447bbac712e290211f3908b72335099057ff11371efe4a
 DIST pytools-2024.1.6.tar.gz 81344 BLAKE2B ff68e2606170bf54e3f609ee7f4cfe58e063f43dcfb2706d5ed7659ea2fde863e6315d0d81dff2e62a3378f195413561a927b0c1e7bedc06388cf4893c07b873 SHA512 a9e934f1cbaf0ace32420f9b74224a06ce8421ee291b837292133969c6788c4cc8bea01446cd4d1505aca9fa81e8ae0d3eacf60d3285186e66d67d5abe10ce3e
diff --git a/dev-python/pytools/pytools-2024.1.11.ebuild b/dev-python/pytools/pytools-2024.1.11.ebuild
deleted file mode 100644
index 286373743ec2..000000000000
--- a/dev-python/pytools/pytools-2024.1.11.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} )
-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}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-	' 3.{10..12})
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2024.1.13.ebuild b/dev-python/pytools/pytools-2024.1.13.ebuild
index 05030eb43d28..286373743ec2 100644
--- a/dev-python/pytools/pytools-2024.1.13.ebuild
+++ b/dev-python/pytools/pytools-2024.1.13.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 # NB: numpy & siphash24 are an "extra" (optional) deps
 RDEPEND="
diff --git a/dev-python/pytools/pytools-2024.1.12.ebuild b/dev-python/pytools/pytools-2024.1.14.ebuild
index 05030eb43d28..05030eb43d28 100644
--- a/dev-python/pytools/pytools-2024.1.12.ebuild
+++ b/dev-python/pytools/pytools-2024.1.14.ebuild
diff --git a/dev-python/pytrie/pytrie-0.4.0-r1.ebuild b/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
index f3773320e270..8b5ff7e5375e 100644
--- a/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
+++ b/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
@@ -19,9 +19,16 @@ HOMEPAGE="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/test[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 6bc7f0a173bf..74ae7e39f041 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1 +1,2 @@
 DIST pytz-2024.1.tar.gz 316214 BLAKE2B 1047e11c41d3abeb10cdf55021c8702fbbb0c0dbcafc63c8c044ecf73dda2ac9344fc66e0a239302a0fd12856bbb3a7d49745eae671fac35db9c83fa502e7cf8 SHA512 cc1e4c9b34c62791cea277a0ce188d975e62135cb15bccfb49dc1a9366c7697ead9c67956846699f18b90db4c66e6c5fe1a91a524d01ae821c0eaa613550ea74
+DIST pytz-2024.2.tar.gz 319692 BLAKE2B 631e87978eddee62c7189515b019038b44d8600e3aad51afcb7c6ffb70d6cdf44942fb8c2ff63bf179be0d42e1337cd1b723c809c5711d86f7e370404e3f8a86 SHA512 140a34f51044188420ac3bfbaa5ece91ea0fe4faf7a247c01312265b63b4aa8d2b389219234e173eca0343d0463aef9d6472ee803915ead989594896567c593e
diff --git a/dev-python/pytz/pytz-2024.2.ebuild b/dev-python/pytz/pytz-2024.2.ebuild
new file mode 100644
index 000000000000..07ae54157e80
--- /dev/null
+++ b/dev-python/pytz/pytz-2024.2.ebuild
@@ -0,0 +1,51 @@
+# 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 pypi
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="
+	https://pythonhosted.org/pytz/
+	https://github.com/stub42/pytz/
+	https://pypi.org/project/pytz/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		>=sys-libs/timezone-data-2023b
+		sys-libs/glibc[vanilla]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle timezone-data
+	rm -r pytz/zoneinfo || die
+	# remove hardcoded list of all timezones but leave subjective set
+	# of "common timezones"
+	sed -i -e '/^_all_timezones_unchecked/,/^all_timezones_set/d' pytz/__init__.py || die
+	eapply "${FILESDIR}"/pytz-2023.2-system-tzinfo.patch
+}
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index b2322adc55a9..874c438f922a 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1 +1,2 @@
 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/files/pyudev-0.24.3-tests.patch b/dev-python/pyudev/files/pyudev-0.24.3-tests.patch
new file mode 100644
index 000000000000..a21327df2394
--- /dev/null
+++ b/dev-python/pyudev/files/pyudev-0.24.3-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py
+index 71b3a7a..9136cea 100644
+--- a/tests/_device_tests/_attributes_tests.py
++++ b/tests/_device_tests/_attributes_tests.py
+@@ -49,7 +49,7 @@ def test_getitem(self, a_context, device_datum):
+         device = Devices.from_path(a_context, device_datum.device_path)
+         assert all(
+             isinstance(device.attributes.get(key), bytes)
+-            for key in device_datum.attributes.keys()
++            for key in device_datum.attributes.keys() if key is not None
+         )
+ 
+     @given(strategies.sampled_from(_DEVICES))
diff --git a/dev-python/pyudev/pyudev-0.24.3.ebuild b/dev-python/pyudev/pyudev-0.24.3.ebuild
new file mode 100644
index 000000000000..29d6755427f4
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.24.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..13} )
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
+SRC_URI="https://github.com/pyudev/pyudev/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~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 )
+
+PATCHES=(
+	"${FILESDIR}/pyudev-0.24.3-tests.patch"
+)
+
+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
+
+	# remove GUI tests that require a display server
+	rm tests/test_observer.py tests/test_observer_deprecated.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# tests that require root access
+		tests/test_device.py::TestAttributes::test_asint
+		tests/test_device.py::TestAttributes::test_asbool
+		tests/test_device.py::TestAttributes::test_getitem
+		tests/test_device.py::TestAttributes::test_asstring
+
+		# tests don't work on systems that differ from the upstream CI
+		tests/test_monitor.py::TestMonitorObserver::test_deprecated_handler
+		tests/test_monitor.py::TestMonitorObserver::test_fake
+	)
+	epytest tests
+}
+
+pkg_postinst() {
+	optfeature "PyQt5 bindings" "dev-python/PyQt5"
+}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 0d1e7dff5af7..1a1b9f0615a8 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,3 +1,2 @@
-DIST pyyaml-6.0.1.gh.tar.gz 120376 BLAKE2B c34f2169f6eb6aa718aeb53dbfaf02590e11e504d16cc85a802e1a1191f296ef9aa2501db683e1a48173ce6adeaeca09f2ab989581dcf1c1ba4004831bb4cf47 SHA512 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0
 DIST pyyaml-6.0.2.gh.tar.gz 123883 BLAKE2B 16ea7f376e45caccb461a18d4347fb06ffaf0dfd65b18e5bd7e74a14ffdce05c9c016c54bd6a501b444bd813f1bfc78999f212ca72cfabf3b125f5ab2f37167e SHA512 c72665131296762521d9ae4fc1c8619946f46ea16ad98b6b8e995828f2cdbd1ed61741fc2d646753f71d95a352b36562a1302f0cb646d5705652cd24b2f10b16
 DIST pyyaml-6.0.2rc1.gh.tar.gz 123879 BLAKE2B 9d983338c4e61fa6f5056aa7733dadc854a859baffe3ad5a353d6fc0525b6c5788df7e85ab40514ad8bdeffbccf10417701fdaac4d0985e0a20b300867b89f4f SHA512 4eac37f3b367099e93c53f327f5f838d5f2f06fa636ea08f277a6cf4f570b7dc9870b35057a889d0895c2abd1bfc121d624f282610dcf90e68727973573267ef
diff --git a/dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch b/dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch
deleted file mode 100644
index 346339916f17..000000000000
--- a/dev-python/pyyaml/files/pyyaml-6.0.1-cython3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/898680
-https://github.com/yaml/pyyaml/pull/731
-
-From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Fri, 21 Jul 2023 09:50:00 -0400
-Subject: [PATCH] Fix builds with Cython 3
-
-This is a *de minimis* fix for building with Cython 3. Recent Cython<3
-releases provided `Cython.Distutils.build_ext` as an alias to
-`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this
-alias and instead uses a wholly new `Cython.Distutils.build_ext` that
-does not provide the `cython_sources` function used in `setup.py`.
-
-Explicitly importing `old_build_ext` preserves the existing behavior for
-recent Cython<3 and uses the correct behavior for Cython 3. Should the
-import fail (*e.g.*, because the version of Cython available predates
-the availability of `old_build_ext`), the import falls back to just
-`Cython.Distutils.build_ext`.
-
-Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
---- a/setup.py
-+++ b/setup.py
-@@ -82,7 +82,11 @@
-     with_cython = True
- try:
-     from Cython.Distutils.extension import Extension as _Extension
--    from Cython.Distutils import build_ext as _build_ext
-+    try:
-+        from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
-+    except ImportError:
-+        from Cython.Distutils import build_ext as _build_ext
-+
-     with_cython = True
- except ImportError:
-     if with_cython:
diff --git a/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild
deleted file mode 100644
index 68bb7965f6a5..000000000000
--- a/dev-python/pyyaml/pyyaml-6.0.1-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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="
-	https://pyyaml.org/wiki/PyYAML
-	https://pypi.org/project/PyYAML/
-	https://github.com/yaml/pyyaml/
-"
-SRC_URI="
-	https://github.com/yaml/pyyaml/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples"
-
-DEPEND="
-	dev-libs/libyaml:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.1-cython3.patch
-)
-
-distutils_enable_tests setup.py
-
-src_configure() {
-	export PYYAML_FORCE_CYTHON=1
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-6.0.2.ebuild b/dev-python/pyyaml/pyyaml-6.0.2.ebuild
index 9be8de2241fe..ba68778ac165 100644
--- a/dev-python/pyyaml/pyyaml-6.0.2.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DEPEND="
@@ -38,6 +38,8 @@ BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+distutils_enable_tests pytest
+
 src_configure() {
 	export PYYAML_FORCE_CYTHON=1
 }
@@ -47,11 +49,7 @@ python_test() {
 	local -x PYTHONPATH="tests/legacy_tests:${PYTHONPATH}"
 	# upstream indicates testing may pollute the package
 	cp -a "${BUILD_DIR}"/{install,test} || die
-	"${BUILD_DIR}"/test/usr/bin/python <<-EOF || die "Tests failed on ${EPYTHON}"
-		import sys
-		import test_all
-		sys.exit(0 if test_all.main() else 1)
-	EOF
+	epytest
 }
 
 python_install_all() {
diff --git a/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild b/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
index e0d131f54408..44e7d34b2356 100644
--- a/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.2_rc1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index aadef1d0e395..e13ae5564ea9 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -2,3 +2,5 @@ DIST pyzmq-25.1.2.gh.tar.gz 391272 BLAKE2B 80814704e7ea08d407859c1d71338f6ea283e
 DIST pyzmq-26.0.2.gh.tar.gz 267895 BLAKE2B c71a0149cb6c596dfcbc760376aa14afa69bd927fcc739698f7d2ea44579dc8437ae605745b383a9b317ff66c092a4f963671e7933cf19f3f73acac16ac06daa SHA512 5772743e71810f9a0c332dcf16f04237eeb0a34ef2efdd22b63258ebe93e6b493a79845090e677a33582a9a80e7bee773160ec7ecfdaf240b655f3819e5b67a5
 DIST pyzmq-26.0.3.gh.tar.gz 268927 BLAKE2B 7504a45776e8c618833702563b50f672a3ecabb3353551ea61d2d2343dd9e955d1d2938046c2f90d115255482b9b6b2c0f1817b238e591b9319ac92a4341c04a SHA512 f4a32164daf9d9521be83008a94089406078779b9e0e56812a826df1fb295cc03781566825697313aa0c2b36b85b0bb760b8fb90959a856a0542b9072cde78c9
 DIST pyzmq-26.1.0.gh.tar.gz 272153 BLAKE2B d99bbdabfb93641361daadbe1ee8d4e5c578ef9faabf4c0457078082bb77d094040da43396e34d48cb2341491460ff39ebc8e5f3a19be2172e73df9fe6655e5c SHA512 288b6799cdc2b77f2972e928558ae74871054809075b534f33af876983da3b1cea35d6fd0fbfcb7caa8f3a458ae00da10935e31791c5c650c5589bfd5db577b0
+DIST pyzmq-26.1.1.gh.tar.gz 272236 BLAKE2B 49ec3c97b3d1b3e943522891ef067c6e4fdd1f5a2fd46f8c2927ba529f97ee8d177253f1a76fc1dd45813832827c8b35a1fc8fba42cf53eac37b59ec40a39251 SHA512 6e9ff9c021696935cb0513edc5eef8a130c56f3c95156a9805acfc174438fab5aaa356779308791b53dc01a166d41e094102ff445959515739102258c8d4e0de
+DIST pyzmq-26.2.0.gh.tar.gz 272883 BLAKE2B a43365afdc49ae845f1e6611bd463e90dbd133867d82c2bfdd3d9431238f68d80bb8073a4406110a91bf6f72cc6d66987a477673277c2b099d74c78f24b49d81 SHA512 ef069f5e71ad1cd39fdf4d5c2ede411752685af2d69ea8ad477c70e51ab011ece492ab25d06feefa7b7c7daefc5fc822d0f87199df2216865ece254c5724c423
diff --git a/dev-python/pyzmq/pyzmq-25.1.2.ebuild b/dev-python/pyzmq/pyzmq-25.1.2.ebuild
index 7a6aa2779167..a679e83e60bd 100644
--- a/dev-python/pyzmq/pyzmq-25.1.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-25.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-26.0.2.ebuild b/dev-python/pyzmq/pyzmq-26.0.2.ebuild
index 2e3555948fec..d714995819af 100644
--- a/dev-python/pyzmq/pyzmq-26.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.0.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-26.0.3.ebuild b/dev-python/pyzmq/pyzmq-26.0.3.ebuild
index 19f47060d59e..fecda1ca8106 100644
--- a/dev-python/pyzmq/pyzmq-26.0.3.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.0.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-26.1.0.ebuild b/dev-python/pyzmq/pyzmq-26.1.0.ebuild
index 7edbff75d517..796b256b6684 100644
--- a/dev-python/pyzmq/pyzmq-26.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.1.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/pyzmq/pyzmq-26.1.1.ebuild b/dev-python/pyzmq/pyzmq-26.1.1.ebuild
new file mode 100644
index 000000000000..796b256b6684
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-26.1.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=scikit-build-core
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/
+"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="drafts"
+
+# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts=]
+"
+# It uses cffi backend for pypy, cython backend for cpython
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: Package enum_tools
+# distutils_enable_sphinx docs/source \
+# 	dev-python/numpydoc \
+# 	dev-python/sphinx-rtd-theme \
+# 	dev-python/myst-parser
+
+src_configure() {
+	DISTUTILS_ARGS=(
+		-DZMQ_DRAFT_API="$(usex drafts)"
+	)
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Avoid dependency on mypy
+		tests/test_mypy.py
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# not implemented in cffi variant?
+				tests/test_draft.py::TestDraftSockets
+			)
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf zmq || die
+	# avoid large to reduce memory consumption
+	epytest -p asyncio -p rerunfailures tests -m "not large"
+}
diff --git a/dev-python/pyzmq/pyzmq-26.2.0.ebuild b/dev-python/pyzmq/pyzmq-26.2.0.ebuild
new file mode 100644
index 000000000000..07ff08786216
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-26.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-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
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/
+"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="drafts"
+
+# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts=]
+"
+# It uses cffi backend for pypy, cython backend for cpython
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: Package enum_tools
+# distutils_enable_sphinx docs/source \
+# 	dev-python/numpydoc \
+# 	dev-python/sphinx-rtd-theme \
+# 	dev-python/myst-parser
+
+src_configure() {
+	DISTUTILS_ARGS=(
+		-DZMQ_DRAFT_API="$(usex drafts)"
+	)
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# often crashes zmq?
+		tests/test_log.py::TestPubLog
+	)
+	local EPYTEST_IGNORE=(
+		# Avoid dependency on mypy
+		tests/test_mypy.py
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# not implemented in cffi variant?
+				tests/test_draft.py::TestDraftSockets
+			)
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf zmq || die
+	# avoid large to reduce memory consumption
+	epytest -p asyncio -p rerunfailures tests -m "not large"
+}
diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest
index 01caeb503da1..412a6e7e07b3 100644
--- a/dev-python/qiskit-aer/Manifest
+++ b/dev-python/qiskit-aer/Manifest
@@ -1 +1,2 @@
 DIST qiskit-aer-0.14.2.gh.tar.gz 7132159 BLAKE2B bc684f7acca071866bc6413d5fb881cf131fe212be7294922a6861dc526d77d0cfb906d9c2ea57236e42e8a99e137ee0ac5f0c1e11fd027122983ad3d8992f73 SHA512 75a2fadb413fc557f98043cc028b28f6cae65b983fd0f32f1e8b8eda6d5cbc6d9d528c38f765d14ede5909045cef914335a483f762c20c4dd85754449d63371c
+DIST qiskit-aer-0.15.gh.tar.gz 7133462 BLAKE2B 3a72d5e1c97e54dd9090bbd072ca52c03bc90d53ec13bdb52b20112adebde6ef4e85a5d3761d5cc9fab7bc8d41651865e538eaad591dad266533441114ae1ddc SHA512 ce70755fa26150e8ce870a5f80c7f37a8e09f02ac4dbcfe52de2153b8af6f92764ac6866b1fffb75db6e1ae1b31815432ffca54f2f916337f640c14007a682f3
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.15.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.15.ebuild
new file mode 100644
index 000000000000..06def0bfe1d8
--- /dev/null
+++ b/dev-python/qiskit-aer/qiskit-aer-0.15.ebuild
@@ -0,0 +1,119 @@
+# 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} )
+
+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/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index c83cba115af0..7139ee89bd60 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1 +1,2 @@
 DIST qtconsole-5.5.2.tar.gz 439219 BLAKE2B f354d3e6132142a3da52a1cb6b290d0a07b13920bc9f33f7fb29eb307cc5b653beccc5d28e53f7cbe7483147adb6e34ffc584718a79b814c9ce2c37b57a768fc SHA512 f79e51903fe5a1164a90c0905c308d2bce066bef2c61fed2b5bb7e757a9cf56875cdd14665df9284317497cd73bb544ae09e0b23c63b527bbd4bc90b874009f6
+DIST qtconsole-5.6.0.tar.gz 440531 BLAKE2B f8d9e1ec45f310152b2c779df71c048ce6f704f8a9f366b6ed415a3dc8988553f45c4ac63fa08425e22124048e7946a4b40aedbbb15e90306bca5138426d91fe SHA512 ccd8f7b87d218237827bd52afc160cc8c00e9feecf90cde39aff55509831bdc9c4799499c91ed13538ce52a4011ed289f194662eef55b98efe09a2b9a5bd5427
diff --git a/dev-python/qtconsole/qtconsole-5.6.0.ebuild b/dev-python/qtconsole/qtconsole-5.6.0.ebuild
new file mode 100644
index 000000000000..c9b6137a741c
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.6.0.ebuild
@@ -0,0 +1,65 @@
+# 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="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/qtconsole/
+	https://pypi.org/project/qtconsole/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.2.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.4.0[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+
+PDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO; expects exact HTML, so perhaps fragile
+		qtconsole/tests/test_jupyter_widget.py::TestJupyterWidget::test_other_output
+	)
+	local -x QT_API
+	for QT_API in pyqt5 pyqt6 pyside2 pyside6; do
+		if has_version "dev-python/QtPy[${QT_API}]"; then
+			local -x PYTEST_QT_API=${QT_API}
+			einfo "Testing with ${QT_API}"
+			nonfatal epytest ||
+				die "Tests failed with ${EPYTHON} / ${QT_API}"
+		fi
+	done
+}
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 4a036d67ff41..79c32e71b701 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1 +1,2 @@
 DIST python-quantities-0.15.0.gh.tar.gz 91327 BLAKE2B b75371e99b0f270d97cf6e9b80df1e7a0afa8ae8eb5d18750196e9b874737d58d3e3189ef9fdca4b312d24a19b406fe21f7eb304f0c1f11987873528190ca2e4 SHA512 987fb30d25a7b14e681d6eb963fc2cc68f954d017eca256739e897062249fce606adcb3224e3c8f0d371e49904caef7171a9a8ba4a7e60baa2fe063004846439
+DIST python-quantities-0.16.0.gh.tar.gz 92228 BLAKE2B 2570b50a983cf1e84fc6df0590a2de251f671d15af06191c4fbf673c7bb75ec419e04f7bcc1a1730f87ed2269b40d707aa6a1103d1238421c19b939f2bbc7f2b SHA512 592001add7201868844197e67ac3a200d4a82c11f02c0d2ce4f007bda5b8c66c29c0f30563da7fd214c3aede4564590b1de9e29b2e9dac0a77a1db0b410e750d
diff --git a/dev-python/quantities/quantities-0.16.0.ebuild b/dev-python/quantities/quantities-0.16.0.ebuild
new file mode 100644
index 000000000000..e30d4a40296f
--- /dev/null
+++ b/dev-python/quantities/quantities-0.16.0.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_P="python-quantities-${PV}"
+DESCRIPTION="Support for physical quantities with units, based on numpy"
+HOMEPAGE="
+	https://github.com/python-quantities/python-quantities/
+	https://pypi.org/project/quantities/
+"
+SRC_URI="
+	https://github.com/python-quantities/python-quantities/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/numpy-1.20[$PYTHON_USEDEP]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest --pyargs quantities.tests
+}
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index d1d4d202eee0..aeacfac51ea5 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,3 +1,2 @@
-DIST rapidfuzz-3.9.4.tar.gz 1595863 BLAKE2B ba835b6d1c5bc7da99ae7202ae469d9a1d069ea0351b732a701abbadfbe1539a389efb051cd58e462505ebcf6020b60ec6413d9f44bbfd63a0dc8419cded9722 SHA512 4494d86f17e7b4ae51639f1d2941d4e313c26739787f3a47261a5d5bf26da4091d918e1603e2199774edd5e1b91d67446b762a81e6b98496d67fbddb93effe21
-DIST rapidfuzz-3.9.5.tar.gz 1595894 BLAKE2B ce46f5fdc15e3c4aeef801055569f5452512bd2b0d85a9c738672e4f98a7ca8de9b4ca451da4e031ffbd661075bcd00e8929ad46b6990a693e1aa137d8097c7b SHA512 ddbb9b70ac9d3a0dce3d2632ee97bdb10afef5b33e73bb14ff51b70eb7c7e94dbc46132867a8279df4c15bddf6a85c0fa705f0d13bb157456b1e6dbc59e64a8f
 DIST rapidfuzz-3.9.6.tar.gz 1596107 BLAKE2B e108320e05ad3ad194b1ffa05d5fddc5bb6080e73ecb031117a0552d5685734870af4a87503022fceadf3fd38b31e71f85c05483b4aaaf4a9d7358d4566699b4 SHA512 015b947dcfd12ee48c7592ac2fc204833d8aa8e43110dab12dff7650e9f309a9a2017d2faf89b3c154cead23d9dc7fc1658f0ff5d2f8b5b3c73b2c97f021c7d9
+DIST rapidfuzz-3.9.7.tar.gz 1596228 BLAKE2B ba3188748dc408cbe91718e890fd67e9ee47feacfe2b307038d7bfc6ffdb7aebb016b2276b591a1fd3a5c59df29a1b55a9555505f938638907d11deec9575f98 SHA512 b1a50f3ff0af044e0aa57a053bcefb3227dce2ed17b94ed82afe72203c6e858221c5ca955e4f190a0cb7adaeada11fab7fa5958e1c439deec60d96899207269d
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.9.4.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.9.4.ebuild
deleted file mode 100644
index 1cdc7dce3c36..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-3.9.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-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 ~ia64 ~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.0.5
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.16.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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\.7\.0::' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-
-	export RAPIDFUZZ_BUILD_EXTENSION=1
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# scikit-build is broken and reuses the same build
-	# https://github.com/scikit-build/scikit-build/issues/633
-	rm -r _skbuild || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.9.5.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.9.5.ebuild
deleted file mode 100644
index b3c5052459ea..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-3.9.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-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 ~ia64 ~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.0.5
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.16.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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\.7\.0::' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-
-	export RAPIDFUZZ_BUILD_EXTENSION=1
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# scikit-build is broken and reuses the same build
-	# https://github.com/scikit-build/scikit-build/issues/633
-	rm -r _skbuild || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.9.6.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.9.6.ebuild
index 000e71d2c36c..1cdc7dce3c36 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.9.6.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.9.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild
new file mode 100644
index 000000000000..000e71d2c36c
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+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 ~ia64 ~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.0.5
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.16.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${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\.7\.0::' CMakeLists.txt || die
+
+	distutils-r1_src_prepare
+
+	export RAPIDFUZZ_BUILD_EXTENSION=1
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# scikit-build is broken and reuses the same build
+	# https://github.com/scikit-build/scikit-build/issues/633
+	rm -r _skbuild || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/recurring-ical-events/Manifest b/dev-python/recurring-ical-events/Manifest
index 422fa97146f4..5f4104ff821b 100644
--- a/dev-python/recurring-ical-events/Manifest
+++ b/dev-python/recurring-ical-events/Manifest
@@ -1,3 +1,3 @@
-DIST python-recurring-ical-events-2.2.1.gh.tar.gz 332458 BLAKE2B 337823e2a98c43015ffd7e848ab4fe43429f787ceb8ff262dca9d73668a785d6245f9e64779c900f1a84a2d7713832621d42044309f38c44bba79fc2853d066f SHA512 1bd6337b5b8670b2c587d54eae26291c381adba76c38e21a937db8a16480d9b4c6eaddda6660fd0c345f67e38ed4f7cfe9e528ecce3686bce9659f4ef30d278c
-DIST python-recurring-ical-events-2.2.2.gh.tar.gz 335683 BLAKE2B 1cad8f90f5dcf9e84ac7688e15b8535aaef0c00a0e65a036ef7f38e1b030cc4c017247149d8ef9d099a28a919d015603ebb71c18a44b8bbf26f3f4c3eefbf942 SHA512 0429a344c70c1a844ed2705112776971413e4ed61a54ccb665f0246b208416ad2ce855ff31766bd628439d08432bf4fea8cbf43f878c35835ba6b137bffa3b85
-DIST python-recurring-ical-events-2.2.3.gh.tar.gz 337134 BLAKE2B 6a119c427e176c92f822186aa910eb133f04157069f7a4e632c0b784ab5e71ae37584ceaddf1d0a6d533854d790322130964222eaa00948c6af2bae89491ef00 SHA512 569a21056947d19d85cbf93e02b3fb9236163535d478188a6cdb5b5d7a5e3b460ecf41ac3a2b858e446273aba5d8c5a9b69eebbb3f32ce453e2ee90a31ed1acf
+DIST python-recurring-ical-events-3.1.1.gh.tar.gz 438998 BLAKE2B 9a141e697444278fd5f41e94e3ab2b12308b38f9c7aaca264e65ffccf9328a36cb67a0e2ed4dbf7dd3abccabf400762184570b62185d39428b0d6c11682d7305 SHA512 3ea995bd56430f9322d888559567dc809552cb6752f4a2acc4e33e385d730b91aa4a2d2389f3ab1ac9dfb5c7eb09327cfc9e858dd06671f7a1c30d39a30e7767
+DIST python-recurring-ical-events-3.2.0.gh.tar.gz 439359 BLAKE2B 10b72e24d97dff1b7d0883a2da632facf1d89945447540acbb64e1f61c490870458bd5c9d389484fbc1be562a88232baf9817dce5be3adc5628e7367b5bef5c5 SHA512 27b9e4e5ed84ad94a1ca12c03995a17ff9db933d98c38f9c34c9cd33fe524e80b55a1507f0e2800b9d027e8030904a06ce05aee596d6d93d2d69ed8ab1ea9046
+DIST python-recurring-ical-events-3.3.0.gh.tar.gz 472075 BLAKE2B 70f531550a8d766e027fb9416883880385731c8b72a4115e2311024bfc4eac8fc7e8b06dc079309430e8d9da6d725c3e2efce8ce7e1ae93ca7f1d1cd288ff41b SHA512 d414d2b035c80d46fa7ea63c9df995edf632841b4f2bd9072d9004a2aaf8a9468de276330c5f939f172a93121577bfd1402606b9fab525af9aa662cd49c16501
diff --git a/dev-python/recurring-ical-events/recurring-ical-events-2.2.1.ebuild b/dev-python/recurring-ical-events/recurring-ical-events-2.2.1.ebuild
deleted file mode 100644
index 71560d4ad7a9..000000000000
--- a/dev-python/recurring-ical-events/recurring-ical-events-2.2.1.ebuild
+++ /dev/null
@@ -1,46 +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
-
-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-6[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-5.0.9[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2023.3[${PYTHON_USEDEP}]
-	<dev-python/x-wr-timezone-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/x-wr-timezone-0.0.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	test/test_readme.py
-)
-
-EPYTEST_DESELECT=(
-	# a test checking if tzdata package is installed that is apparently
-	# needed for other tests, except it isn't
-	test/test_zoneinfo_issue_57.py::test_zoneinfo_must_be_installed_if_it_is_possible
-)
diff --git a/dev-python/recurring-ical-events/recurring-ical-events-2.2.2.ebuild b/dev-python/recurring-ical-events/recurring-ical-events-3.1.1.ebuild
index 6c85248725e5..6c85248725e5 100644
--- a/dev-python/recurring-ical-events/recurring-ical-events-2.2.2.ebuild
+++ b/dev-python/recurring-ical-events/recurring-ical-events-3.1.1.ebuild
diff --git a/dev-python/recurring-ical-events/recurring-ical-events-2.2.3.ebuild b/dev-python/recurring-ical-events/recurring-ical-events-3.2.0.ebuild
index 6c85248725e5..6c85248725e5 100644
--- a/dev-python/recurring-ical-events/recurring-ical-events-2.2.3.ebuild
+++ b/dev-python/recurring-ical-events/recurring-ical-events-3.2.0.ebuild
diff --git a/dev-python/recurring-ical-events/recurring-ical-events-3.3.0.ebuild b/dev-python/recurring-ical-events/recurring-ical-events-3.3.0.ebuild
new file mode 100644
index 000000000000..6c85248725e5
--- /dev/null
+++ b/dev-python/recurring-ical-events/recurring-ical-events-3.3.0.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+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-5.0.9[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	<dev-python/x-wr-timezone-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/x-wr-timezone-0.0.5[${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/regex/Manifest b/dev-python/regex/Manifest
index 71e4affdaf42..bd088510bf5d 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,2 +1,2 @@
-DIST regex-2024.5.15.tar.gz 394856 BLAKE2B 8990bbc78f7f9c6a4dc07d913ec5557a4cd1bac022bc71093e3d8083b5d547182e08f2e8189c3808d8e368ed42530578df9951367b59dc3450bb09458b57f496 SHA512 7e465987bff529a6895cd6606b5a188c0fb2cdf333de108a4e3e37c7badeea146fd23d1d757f47b65d4facdc30cbdb0ca3c0df2395124c8e3e6946a98f52f413
 DIST regex-2024.7.24.tar.gz 393485 BLAKE2B d2a46fe2039f78fc3f1e8cda1b7b1808b160018d8e0c1b880bb1a573b36a3e1e7c7ccfa238f99719b5a484fa3b7457109f9e8668fbf16cbaef52006e0e6f6f89 SHA512 7b9efc5bdefa6610862be06831404380939dfffad6e2a488d362f4a247356eb0739c2b9078f41e554eca21d64fd4b1b145291ca8140f18d1586328f7d19cefc9
+DIST regex-2024.9.11.tar.gz 399403 BLAKE2B 6ddf11954723183aa2cf15568592e0466a072897f7d69a22139c3db08fbf113a5b5df5df8b7982e4dc1987be836bbd323612549ba4723408cc235b36c21ae7b1 SHA512 5fec15361d19df69445093a3e4ef59e66d72c5c0a661d83640877850e31d874827aab5ebece2004a93534d7c4cc6084f76f76dda5db8ca3196f9f0a5f98a0043
diff --git a/dev-python/regex/regex-2024.5.15.ebuild b/dev-python/regex/regex-2024.5.15.ebuild
deleted file mode 100644
index 120bb6f979d8..000000000000
--- a/dev-python/regex/regex-2024.5.15.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2024.7.24.ebuild b/dev-python/regex/regex-2024.7.24.ebuild
index 328a69012a2f..120bb6f979d8 100644
--- a/dev-python/regex/regex-2024.7.24.ebuild
+++ b/dev-python/regex/regex-2024.7.24.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
 distutils_enable_tests unittest
diff --git a/dev-python/regex/regex-2024.9.11.ebuild b/dev-python/regex/regex-2024.9.11.ebuild
new file mode 100644
index 000000000000..1857c471aed9
--- /dev/null
+++ b/dev-python/regex/regex-2024.9.11.ebuild
@@ -0,0 +1,32 @@
+# 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
+# pypy isn't supported upstream because of its UTF8 representation for strings
+# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="
+	https://github.com/mrabarnett/mrab-regex/
+	https://pypi.org/project/regex/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="doc"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r4.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r4.ebuild
index c2a089e9fb6d..0ef80681cb26 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r4.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index f37f2db2d0c5..18e5efadf16a 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,2 +1,3 @@
-DIST rich-13.4.2.gh.tar.gz 15063000 BLAKE2B f65079440bc7d89a3ff03be01fa71e076493ae50f22ae8781be2448a7ff2769c174d6654db3a835d34720c34cd8cbecfdd6b13e3064cf7fdcade71806563309d SHA512 17052a9fb0e1d89b31a00d8a719214719891d048fd805185b2d4258c8766130f44bf2280c9567bc162f3b34d9bf2eb7d747d6a37d910c81cd53d3003b51f70bd
 DIST rich-13.7.1.gh.tar.gz 15058064 BLAKE2B 6fad18bf0a4e4f72e530c78db7a498f27dd8c9a7b9b17ca5ef12a94bbe513857f3c42d4903f8ebbfe8907727cddaf290f08862c27efb29db8aaf70c7bcb13ace SHA512 0c69101bc6c2a238a4c516812cda08299115b903b8282ee348b45b212a88fcbfbf69d11a3705a97bdb6192988ee3047804bb5b52b7950d860542cde8ce2d4bd2
+DIST rich-13.8.0.gh.tar.gz 15062770 BLAKE2B e319018387ff27f4ec2bce1d272ff7fe676d224a14798fa585c0d72fcdedd084c3e1d4b73d3d2db45a113e0c5433c7103382c7134ff6e1c8e580ff2c3fa444ae SHA512 d20545689b6acd14a5010f0dbb38a2dbc1fd551619198d098e6bf68628e194f3b5450c11b77feb190ea4b4bb2c22a9a6b619b17c9f7815a4e69e1c431750ab60
+DIST rich-13.8.1.gh.tar.gz 15062921 BLAKE2B 6df186dee1eccabbb28ef4bcd3bbceac335fbe39cf1ff6318726146f3eead9033fe362ca3c363c057c9b898ebb824d55f13454d68cb917dfc82e07e1e0038fa4 SHA512 d84d05fcc657fbcbcca09c22856c36fb945fde481111565292b13a9c5472cc1cf7e6266069f80b48821f7307a1479edc65a48d3b8a96334922b151d93b402daa
diff --git a/dev-python/rich/rich-13.4.2.ebuild b/dev-python/rich/rich-13.4.2.ebuild
deleted file mode 100644
index 7d07d7e5e93f..000000000000
--- a/dev-python/rich/rich-13.4.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} 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 ~ia64 ~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}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	# 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.12)
-			EPYTEST_DESELECT+=(
-				tests/test_inspect.py::test_inspect_builtin_function_except_python311
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-				tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above
-				tests/test_pretty.py::test_attrs_broken
-			)
-			;;
-	esac
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.8.0.ebuild b/dev-python/rich/rich-13.8.0.ebuild
new file mode 100644
index 000000000000..79a9b784235e
--- /dev/null
+++ b/dev-python/rich/rich-13.8.0.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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.8.1.ebuild b/dev-python/rich/rich-13.8.1.ebuild
new file mode 100644
index 000000000000..79a9b784235e
--- /dev/null
+++ b/dev-python/rich/rich-13.8.1.ebuild
@@ -0,0 +1,74 @@
+# 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 ~ia64 ~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/rpds-py/Manifest b/dev-python/rpds-py/Manifest
index c8e852b16db3..db8464eb236a 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -1,65 +1,26 @@
 DIST archery-1.2.0.crate 22842 BLAKE2B 018539188a76836c35834d948f64e51888083021a90bfd56229e3cf9cba2f12db289a248d2602a71431a04a09c4a9194d11530ec769fa85eaeff239388d00a44 SHA512 82c51b29984ebf611597ef530af2b04aa4046f7e532276612f7ad8485d79cea675f70a7ca60ce65f87114abb72ad6984b2c48c2f257957ba53a05a61537531ea
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
-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.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
-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.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
-DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-DIST pyo3-0.20.3.crate 434673 BLAKE2B 1dcb881fd1fe5c76e9b4951f4d95fcd1daa1845c226a4ab1db4283cabe67bda822ff03e3cc85d797fe4665a1614229e7406dea65ec5e99ce4aac96b973a7f55d SHA512 77cce558fa60bbd8d9981ff5e62fdfa9bac94bd650b287fbf14ac93ef1c326c8ae7fda82d744e3582df03cab8adf490e0f2752fabd9ae3de044e7d80984e0350
-DIST pyo3-0.22.1.crate 536682 BLAKE2B 5c30834d5d30c2745d9133993039f9f88cf969ecee1119a4a82c8b5b5afa4b4d677c940666d250ac6769efb0d6bd767d2717d7eb6b65a93aee7c58e8e6cad88d SHA512 184829a31dad378d9d2e73e0cb3242d2113935e80f7f5289c89029f55c6b41d707b9e8ae631a5f04287f74b211a302d745003afe4e59c6cd027ffac5baf652ef
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
-DIST pyo3-build-config-0.20.3.crate 30060 BLAKE2B ef122b0b7d840d5362928bac76e1299b333775ec5c49a3bf23a19eccec074917931356bbf719c6d700999941bb6a396948ee7f8761e685c8e9251af07ba0cadc SHA512 70685415bba443787dabb9c61ca3702aefbcacb0705471b496b4f01efe34291735321d91243355b4be9aed8b243e393c09fb65556f1b926ac7f22f64560bd927
-DIST pyo3-build-config-0.22.1.crate 31205 BLAKE2B 5f2f09cd97643c0b3af372b24c07b65860eb3d502978fdd066c58641af207ed7e26a2a6b1b7855490dc7bf39920c990a17f260f1d91addcc8020df67cac4ea70 SHA512 4033d54c6ebe1ecd685bb4cf6b8440b56d700c7714296001129278c590cdb8007709558443863bfbd5a633df6d1d8997e4b643e92bf42fa2650e547c8f818108
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
-DIST pyo3-ffi-0.20.3.crate 65024 BLAKE2B 33e79a02c7ab85f4767e02a39d8553ddc015c80d13bea674885ad8a18d89bd90f866cc39d81ecbf56270ebe87d29bca48f635c4e73ec99df02ce425f1427cb31 SHA512 3d1ced58e243be7cee4a3ca831dc08a1631fcd511c707dd3bada87d7662807dea2d88393d76e56ff19a6d1c2804d93b5b6b7b5efd36b9c275d66fa1bb1bfc384
-DIST pyo3-ffi-0.22.1.crate 67422 BLAKE2B 5dae443139a2223dbb4c29357ece0f730b9b01f92b0da61acf3993b840e410fcc0a8bf4384953283536e9174c52240ab12a2a6537ef3ddc613aa7cef0aaf5756 SHA512 ea77aa12d0d2d96c25c260bef26ec1ef38bd22a30a513f10b2bd95f27cbce50f21b46b7c1ecee7874d2fedd79607283c6798ec17ada5de009ec64c07f0e7ac95
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
-DIST pyo3-macros-0.20.3.crate 7920 BLAKE2B 0510accf51cd83390cbb7b6ba4ec9f4610e3dbb7448d1213994013487ae81bb087df1ba0076a3862e5ecfd172b7846f9439a2d86950a93b016aae565ced4f03b SHA512 454f3c0c054aa131ffe955e4be1af061005b9c81b4d80702827e19b983224c118dfea474da515d5fc2c79cfd3fa21204ed4af2d9e81427123e0a78bd246a23f8
-DIST pyo3-macros-0.22.1.crate 8029 BLAKE2B 5ecd6f26cea60539134e2ad29620227cdf3a189566518020b00e7d362f87754a5ce793359e770f09532f7c4bdf65cd53d05b9fb488cfc320ffa89dbd3e7b0757 SHA512 230a1440e89f0fc9413515f5552495c94576c3cd6d243bf3a304a476d6a24843a18bd37bcff9d1f3569c733c1e3663829c2a8a92a5b19b691cbd049a2beb8d8c
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
-DIST pyo3-macros-backend-0.20.3.crate 49797 BLAKE2B 59c55d482577ce105db3e19a1db794eaab8221d7de01197716b75d5d2602e0f27c86aaae527eae7098eafad311144550bd597efe8cd6560c82dc435021f3428f SHA512 e177ee0d6a538a555fbe9108e3e2c20102622b2c9b9696ae309189e5c4d068efad2132afd4a97d734ebabb4d7146980a26cb68dc05d5eb88f338be2ad0cd651f
-DIST pyo3-macros-backend-0.22.1.crate 65589 BLAKE2B 9cd0bcf4e30a60a00a8645c6b3deedd9cd3202dbfc783940993c9af5b4e21eaa04747bbe7a7647dd707c48c14d255b07e961121486f8c5ee84c4ce134229ac47 SHA512 4d79a4edae12e73fb22e66100be0d7774279515ff5b3de43c4301162fb697bc8ef11fa035f5da6d4363b08e61d6da7382bac6a6b455b4295e5b8d0fca332db70
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
 DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
-DIST quote-1.0.31.crate 27881 BLAKE2B 47c8ac1051f7fa03d002420ade3cb18bf2aedc6ba922d13b117c016ee89c3326bea5cad32ec2f0e5ac1afcce68982f20b3f973914c205e6d6f426487989c6ec4 SHA512 8b2ec131937ce53f3fa01e68fb9261ed6442222e513cbe86f62b6da3cf3051cda0d134dc8028bc6c992fa63735ef3507490a169f8b4af1d6fc17058c6d2faaab
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
-DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST rpds-1.1.0.crate 69493 BLAKE2B f2d02c758de1abd46ff133965e0491a0276e4a95be5b64b6c83947bf8b3718896781eb96cf96d4abac84aba0c7caaa5e95abf1364ab2ffd65d573d0af212e058 SHA512 b24640e34c2f88ecfff5efb1581941eb02987bb7b342dc439513e8d7c8ee0afa63949f8dee09bf8f445ec6f3b3ec22d2927d3d03be05fee3c651b29c924a6b3e
-DIST rpds_py-0.18.1.tar.gz 25388 BLAKE2B 9f843e7530062c0564a67bae8d8ec15155f0a68cd53b69a52906ba3176d97fc1388d599fddc7bb804a88c77bd5b57fd0f54ed718558355a59100ce3b85b851fe SHA512 3ad144fe399eab121fe6b6ac4fa0a711dc1cc63763705534606d125c66f0e1b68955e53789ec885d217848d1a0c52c8a069905abdcc24d207d16ee65f4050886
-DIST rpds_py-0.19.0.tar.gz 24613 BLAKE2B 9c6e06a4e68747b58d623d17379c2bbe4210f66735b3b39f5c7163491c86ad6125d4134c4227b85add9a52a785378196814cd3994af0e7d4c77a463db68da82d SHA512 fccdf7a43c6319ec950ae3f58eb8c7c45f0fb838607512f6724ecc0b9ca2a6c5c97239af67fbd18980d926b636b3514fa1d2bd7b4cfd009aacd1596d91b4ce23
 DIST rpds_py-0.19.1.tar.gz 25022 BLAKE2B f0ca3173d5afa5c44a67a9012be234eb143a3bd6e1a89b1bd3a0e7f23d31999017ed5d5359c01ea33f4a28b2eab655113b03d9cfbb5880488bbd66a50c206db5 SHA512 dfb0b7180c5fbd77108e2a90d0b664d6410d3f3d00efcb9b7a79291ac736668f3cd3d7dec12292d30ae4bd445f909563e35aaa841814075b2b020863f2e49f3c
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
-DIST syn-2.0.32.crate 242504 BLAKE2B 2c2938c0d711c684c9baf95538e2e76220418646590474b2b654d9242d2818aa7c3e5990208fe231ef64903df17edbbf6cc930e6224c964cad4eae5aeaeae781 SHA512 609f125f8138d17b1185760b1a63f3713079f5214fb56c23012229a56d10ac1c12654466c9ad1ecd6b2aff1126d125abfb0a42bd7f669635e5024b962b0cb0af
 DIST syn-2.0.69.crate 265441 BLAKE2B b01576c2c86426d2bbb2c9553dc1dce6a309d9922c35167ee6a718ad08cf3d0a22f0aed4d4c547cdbed85b47283e5b60a128fd1bbb230a6687f0c28af3a9c228 SHA512 fddc0f1ffa3e68ce57833c6ff18382296838287dd98f9f77f679ced471c3f801af30376363a870232f337bda27b3ba6ea93074f8e3c05ee390bcc024e3690bea
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
-DIST target-lexicon-0.12.9.crate 24532 BLAKE2B 7f09be1827a5f9563b842c38aff659432ec61b66b814ebf4cc8a963daf6c93e7dc453a6966aa02d3a886007506d2b993e16ceb047bd34f6d206de76a39d08dfe SHA512 62033617d4587fb9d4b3159c78dbb628041d7ba6c5849c27a5755f173a7279aa4a03e56d31e03f87adfae50cef49eb6f0bc5eea1f6a131b87c618330d19d61d5
 DIST triomphe-0.1.13.crate 29568 BLAKE2B f0450292e3a4c2df6b400621bada57c099e5779cd3659c6171e452b552d2acaedbb2c0cd074c8f2144fbba9dc095648ba1c43a3fdcfe6fe3e01efe2561f6971d SHA512 e8364bf262d41aaf23de5c519c0303fd6ad928d8691843c7e0eda26b530c746c458837b08421559c50edf1cb8b9a2a216d7c32f5ea50be1543a2dec2cc60dd6a
-DIST triomphe-0.1.9.crate 26674 BLAKE2B 5c553d84da71c8a6fd6c65d1c0736864a2e8ad3842878402c7cc6023f88e72b849921d9337d5edf12d9f080b4f4d6e993e2f0f80f36683e51e293f6c26648adc SHA512 9dc43f449352944479dd147ab07f22fb185f713f1b81437ae55363870b0aa86cb9c250e132f16d4f60603f55e3388855a1dac3b80f6012aeea8cbce13cfd6756
-DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
-DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2
-DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
-DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
-DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
-DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
-DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
-DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
-DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
diff --git a/dev-python/rpds-py/rpds-py-0.18.1.ebuild b/dev-python/rpds-py/rpds-py-0.18.1.ebuild
deleted file mode 100644
index 58f2742cde47..000000000000
--- a/dev-python/rpds-py/rpds-py-0.18.1.ebuild
+++ /dev/null
@@ -1,72 +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="
-	archery@1.2.0
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.147
-	lock_api@0.4.10
-	memoffset@0.9.0
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	portable-atomic@1.6.0
-	proc-macro2@1.0.66
-	pyo3-build-config@0.20.3
-	pyo3-ffi@0.20.3
-	pyo3-macros-backend@0.20.3
-	pyo3-macros@0.20.3
-	pyo3@0.20.3
-	quote@1.0.31
-	redox_syscall@0.3.5
-	rpds@1.1.0
-	scopeguard@1.1.0
-	smallvec@1.11.0
-	static_assertions@1.1.0
-	syn@2.0.32
-	target-lexicon@0.12.9
-	triomphe@0.1.9
-	unicode-ident@1.0.11
-	unindent@0.2.3
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
-HOMEPAGE="
-	https://github.com/crate-py/rpds/
-	https://pypi.org/project/rpds-py/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
-
-distutils_enable_tests pytest
-
-export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
diff --git a/dev-python/rpds-py/rpds-py-0.19.0.ebuild b/dev-python/rpds-py/rpds-py-0.19.0.ebuild
deleted file mode 100644
index e28966aade46..000000000000
--- a/dev-python/rpds-py/rpds-py-0.19.0.ebuild
+++ /dev/null
@@ -1,59 +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="
-	archery@1.2.0
-	autocfg@1.3.0
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.5
-	libc@0.2.155
-	memoffset@0.9.1
-	once_cell@1.19.0
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.1
-	pyo3-ffi@0.22.1
-	pyo3-macros-backend@0.22.1
-	pyo3-macros@0.22.1
-	pyo3@0.22.1
-	quote@1.0.36
-	rpds@1.1.0
-	static_assertions@1.1.0
-	syn@2.0.69
-	target-lexicon@0.12.14
-	triomphe@0.1.13
-	unicode-ident@1.0.12
-	unindent@0.2.3
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
-HOMEPAGE="
-	https://github.com/crate-py/rpds/
-	https://pypi.org/project/rpds-py/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND=">=virtual/rust-1.76.0"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
-
-distutils_enable_tests pytest
-
-export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
diff --git a/dev-python/rpds-py/rpds-py-0.19.1.ebuild b/dev-python/rpds-py/rpds-py-0.19.1.ebuild
index 2828cf5261da..28d2cfbee5ee 100644
--- a/dev-python/rpds-py/rpds-py-0.19.1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.19.1.ebuild
@@ -50,7 +50,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
 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="
 	>=virtual/rust-1.76.0
diff --git a/dev-python/sabctools/Manifest b/dev-python/sabctools/Manifest
index deb34950b42d..348322f7c2a4 100644
--- a/dev-python/sabctools/Manifest
+++ b/dev-python/sabctools/Manifest
@@ -1,4 +1,3 @@
-DIST sabctools-8.1.0.gh.tar.gz 8963885 BLAKE2B 36d6bbc34f636ac4e892f941eb6e583166ee1f5f740440b3f07faacddf7715d8b4c642a4e6252ece1bdef69017be3d04ce5d6c8e36479bb176e4cd0635f1567d SHA512 862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6
 DIST sabctools-8.2.3.gh.tar.gz 8974172 BLAKE2B 15b15cb1a5b7e923cc43e5e619e02f09d34f69d05d692b11bf3de8b12a1f33efcf6cf8cd8b251c646f1e2be7e2941c755e2e30a205b9e066d280038b287b262d SHA512 7bf1b0e9f55d9f6384166cca911c0d1dd79b3d4d1c33effe295fe4e053394a674a36548e5241a86817ce109a1165e0814954550436f5381daddfc8c1a7c188e5
 DIST sabctools-8.2.4.gh.tar.gz 8974209 BLAKE2B ddea09ec8a0a4b34779f1e8fe5fc4712ce7dd311ded308c77fb7925b8236e740bb8c345998f7e8e92837c7c19e9c4bbaf0bd0c2ac2b967cf98aa660105814d59 SHA512 2e79a7b854be51b04a91fffb3401a4bd2e7c6d74d1815d1228a9fca97b79c599463a062386f85555ba6ce9a3e8130a1615a3c576fe5411b7dff48c37eaf6b34b
 DIST sabctools-8.2.5.gh.tar.gz 8974284 BLAKE2B acc5dcbeaa20e916a8fc8691bd389c8f60c9a9d2eca9dff2fb7dd4da4abee9ad7dcd9003eeb5f37b51f3ec5c7041517ebf60679373bd101b9546d0de7de2ac0e SHA512 8e3ed65ca4cb8879e07a48033bc6b7efd6bbd4f5a7df43db8fa28719dde194aa55a53709c9d4c29ac273369ceeb845188f1b8a0cde6904962148e6352acb40fa
diff --git a/dev-python/sabctools/sabctools-8.1.0.ebuild b/dev-python/sabctools/sabctools-8.1.0.ebuild
deleted file mode 100644
index daa91eaf56e0..000000000000
--- a/dev-python/sabctools/sabctools-8.1.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_PN="sabctools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
-HOMEPAGE="
-	https://github.com/sabnzbd/sabctools/
-	https://pypi.org/project/sabctools/
-"
-SRC_URI="
-	https://github.com/sabnzbd/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.md doc/yenc-draft.1.3.txt )
-
-distutils_enable_tests pytest
diff --git a/dev-python/sabctools/sabctools-8.2.5.ebuild b/dev-python/sabctools/sabctools-8.2.5.ebuild
index 5660f5098ba9..00b70ffc3d4e 100644
--- a/dev-python/sabctools/sabctools-8.2.5.ebuild
+++ b/dev-python/sabctools/sabctools-8.2.5.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index 6ea3b98d44fb..1f307d869836 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,6 +1,5 @@
-DIST scikit_build_core-0.10.1.tar.gz 251300 BLAKE2B 2727e70c4bfe4e4cf558aaedd3a00eb07268c3e160c6fdfcceb8212842ee1e7e4a6a606c7d1670d25ee1fd45cadf2e40dee847fd5eb627bcf144f239f1ab0f0a SHA512 eebe14d79d339f4c39ab60b05fc6b92f1cd181b6e7ccef74e6976fb990dc51a2db6e6f72c830f6285ca700a48dd3e2ccfc87dafaad9ce26aa32d02fa1795a2b9
-DIST scikit_build_core-0.10.2.tar.gz 251394 BLAKE2B 2eb6101ef7558a16ea574a648b1643bd9c701791d9956a865b4c0c0665890c4ee4c945b20638afa339fc1f5fdee1df9671f78a8d459fc09961d6c9e75d263c52 SHA512 8a51401b276073c70a85fd9c44df81eba171edf99af7a3d88b606225abcc83dcd6c2d29170f54bfd521e1141c37fa624292d3e43dccad6a3f6a60b94bf6fda69
-DIST scikit_build_core-0.10.3.tar.gz 251493 BLAKE2B a6616e2e5b997bdf9711cb5afe82a831b8cf960a31c6ca61a2b5c9e39141fe9dbc5698ba1a4002864e40af7ad07d9e627b0cdeaee2866e1a96e00d6732ff9fe4 SHA512 0bbf57555dd0487085940e6c3ac5aa531fada8505b7014353e55d1397ecd1706f87e6c7689c051ada8d2cf20074e0b55e3eb72995faa139719b8fed440dca8c7
+DIST scikit_build_core-0.10.4.tar.gz 252954 BLAKE2B 5d6bf7c7a462a80ee78b1c93a27b7f63443f1acf9bac8918d48882d644de4f11d3532e8afd542a06b24605120d18ab8e094ce9f3997ffd3f8047dcedb97712f9 SHA512 6858a7716f081fc5d40da7b974568855571f7cbc5e8eafdab2547bb6d2abc5445e682d7d7b1f6157e38ecbaad676b90fe1a2b152dcb89331f646180ecb3c6c26
+DIST scikit_build_core-0.10.5.tar.gz 253285 BLAKE2B 6bbd5a92987fcbf9880df902784c9ee1a53d3f58b935b0c43ceb9bb8be0c32878845dd4c35fd03569fdc74d053866ff5e93b8eb96b058623fb357351a16919ec SHA512 283a50b4ff99e9c99fd92f0198231d0c8b68dcfc47ca5a782d7d604d9a313225f9f4e3dbc9490d9cd04f4d66cb79a4f793fb416763717474e83a3fea356b9bac
+DIST scikit_build_core-0.10.6.tar.gz 254624 BLAKE2B da23ecf36e16f2d8f1b4daeb41c3cd7ca5af1cd0a4eff324765920a53410b9a6d5c7456247dd310b67ac0fc9a96547f1aa6f019e7d7527b603184a9199c863d2 SHA512 e3ee9aff752d2531c3bc44f8288a4619637e89d4a0edea3aef012153ba31af9a86929437e9d11b1d1a6d85a60a9a4da34cc347c203b80cca3caee05fb3e832da
 DIST scikit_build_core-0.9.10.tar.gz 230104 BLAKE2B e3c4605b4b33260d8deac2cedb7bbb20a08729a36214b13c6071fe9b12f9bddc882c18da0e1ee14d7f1b4845ca0dd02b1c2d5c30c43b96a420c35a8b5cbd2d5e SHA512 0e1cb649f9965f4b13093432a2e36ea9be532ba3b7447c36f898284571dcbcf266b7012a445b464ac9129ec2b91e4155016be1fbab52fc2a979e440b0ea73cac
 DIST scikit_build_core-0.9.8.tar.gz 229845 BLAKE2B 419d8891dd3f95bee7f8f7dcc1addb94d2698f8ff392eef19a67e851f57b58d09b9878705d0e8d728d3c6f2b316d538c76471164781fcd1fb5d02dfbfd9d7a85 SHA512 f1206715eef1bdeccddc5987cae4f455522c4ef4dbca305ad7d3772c61f5615c5742b109c5527a5ad5e25a2348abff69ea5ae7153ac18c43cca63783872aa3d5
-DIST scikit_build_core-0.9.9.tar.gz 229971 BLAKE2B 2e41f59e053a44db07c84df4a03aab7c574b658d51f4b4517228ef0e12618f8de879e3ef704b7be398b5378e1f19b0a8c8dafcd20e3bd15dece9d387306427ac SHA512 c4b826353be3b34dc7f37f571088b7674f6ad8c984fd9985feb4e1b611c503dbf1a5c0e4e8ad1123c9f2e9538572da319f9104145abd598817ca3e29824cc61d
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.3.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.3.ebuild
deleted file mode 100644
index 49c374cbe912..000000000000
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2023-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="Build backend for CMake based projects"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build-core/
-	https://pypi.org/project/scikit-build-core/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# we always want [pyproject] extra
-RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local _EPYTEST_DESELECT=(
-		# TODO / we don't package validate_pyproject anyway
-		tests/test_schema.py::test_compare_schemas
-		# setuptools now respects PEP 625
-		tests/test_setuptools_pep517.py::test_pep517_sdist
-	)
-	local EPYTEST_IGNORE=(
-		# needs unpackaged validate_pyproject
-		tests/test_schema.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest-subprocess -m "not isolated and not network"
-}
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.1.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.4.ebuild
index 49c374cbe912..49c374cbe912 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.1.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.10.4.ebuild
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.5.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.5.ebuild
new file mode 100644
index 000000000000..baf8df2e03d6
--- /dev/null
+++ b/dev-python/scikit-build-core/scikit-build-core-0.10.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2023-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="Build backend for CMake based projects"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build-core/
+	https://pypi.org/project/scikit-build-core/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+
+# we always want [pyproject] extra
+RDEPEND="
+	app-alternatives/ninja
+	dev-build/cmake
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
+		dev-python/fastjsonschema[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local _EPYTEST_DESELECT=(
+		# TODO / we don't package validate_pyproject anyway
+		tests/test_schema.py::test_compare_schemas
+		# setuptools now respects PEP 625
+		tests/test_setuptools_pep517.py::test_pep517_sdist
+	)
+	local EPYTEST_IGNORE=(
+		# needs unpackaged validate_pyproject
+		tests/test_schema.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest-subprocess -m "not isolated and not network"
+}
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.2.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild
index 49c374cbe912..49c374cbe912 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.2.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.10.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.10.ebuild
index b1c039417db4..f5d934492aff 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.10.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.9.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.9.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.9.ebuild
deleted file mode 100644
index 5998fa0264bf..000000000000
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2023-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="Build backend for CMake based projects"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build-core/
-	https://pypi.org/project/scikit-build-core/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# we always want [pyproject] extra
-RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local _EPYTEST_DESELECT=(
-		# TODO / we don't package validate_pyproject anyway
-		tests/test_schema.py::test_compare_schemas
-		# setuptools now respects PEP 625
-		tests/test_setuptools_pep517.py::test_pep517_sdist
-	)
-	local EPYTEST_IGNORE=(
-		# needs unpackaged validate_pyproject
-		tests/test_schema.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest-subprocess -m "not isolated and not network"
-}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 0285d4720969..1250f0524af1 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,2 +1,3 @@
 DIST scikit_build-0.17.6.tar.gz 272208 BLAKE2B 9e3f908041eca89182f798c54a1a248934dc026816f7cd041a8debc97be27096942dda42a0ae63e87b9337304a478d6f520edcd5ea7a45aae6a195d1f769eed2 SHA512 92b97146f40d8222bd8415ef8439497d5075b72e5bafc40aba0a3e2911d269a118f2f7d41f468f7add8949f550b1fd7d5a9113d249e42dfac431108182ca9198
 DIST scikit_build-0.18.0.tar.gz 273824 BLAKE2B 2eac991ea22948e900c4485783f5bcbb8b87bd5858bbe7ade99b2a67c16a9a035e04c53b2d9b94422a5eff36f33c11cf297198bce520ba818b7355386977a8a1 SHA512 a374f86c69a288ddcfe8e8d95b594b2bf94365b4d6d4d25a7912cf871f12dfb1866b1d74694c919ef8e4fef3d166b7afe9de3b32b56add33173840a9bb917c71
+DIST scikit_build-0.18.1.tar.gz 274171 BLAKE2B af82af368f883450c98670e26c414181ab60ef04615986843967f537e206e6c64901c9eace8f12af12f067178cad14886d853d230200463b00452f7ec550436f SHA512 872f4bc4c313459842b537ded5503799da5b5e02a8e403eb3095edd719ea7be32942ce4e9c7cd55a4f78c2f032627f7398e99db6be19b711c8e1d906264dba48
diff --git a/dev-python/scikit-build/scikit-build-0.18.1.ebuild b/dev-python/scikit-build/scikit-build-0.18.1.ebuild
new file mode 100644
index 000000000000..4e9e8d953cd4
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.18.1.ebuild
@@ -0,0 +1,73 @@
+# 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="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/build-0.7[${PYTHON_USEDEP}]
+		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-issues
+# note: tests are unstable with xdist
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# no "library" in (our install of) pypy3
+				tests/test_cmaker.py::test_get_python_library
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock \
+		-m "not isolated and not nosetuptoolsscm" \
+		-o tmp_path_retention_count=1
+	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
+}
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index c5d0c26e1a8b..e49bdf20e2a3 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1 +1,2 @@
 DIST scikit-learn-1.5.1.gh.tar.gz 6944196 BLAKE2B 65ed2016e1caf12e9a347e133b6b3be29b234de7ee8e374859a7235da3ede67a1b4c37a253b62ceb85a1ae3a1e6bc5afea2a0f07f4a7c81f59965614bde52b8c SHA512 f04c988490436d46d8210e68e41969af689810eff3e57098694768d3ccb7c4b919aecb13f36af1534745e56785fbf55c3dc3614497765d5b2f7c5e7e8dfbae05
+DIST scikit-learn-1.5.2.gh.tar.gz 6982418 BLAKE2B f1fdc37cdbc7625f5240b565b37b8213e1f6a21cb04886efaa2f9dad598eaa3c9bf567000cb51bcb78057172131ab3534134bb7382ed0b1df5037919d45fd65e SHA512 ed014858a9dd75765b761df03782048035228f012773d70ca3355d049d096707286b8b3d0139b88268266e8f0a6b4d430968495a87636975d094b161b9f0d712
diff --git a/dev-python/scikit-learn/scikit-learn-1.5.2.ebuild b/dev-python/scikit-learn/scikit-learn-1.5.2.ebuild
new file mode 100644
index 000000000000..5b97f0b548d5
--- /dev/null
+++ b/dev-python/scikit-learn/scikit-learn-1.5.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2020-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
+
+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
+	)
+
+	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 1e6b60d8065c..6416455905f3 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,2 +1,3 @@
 DIST scipy-1.14.0.tar.gz 58618870 BLAKE2B bf9ed05628b02dc058555402995caae722cf6802bde80387d4e4477ec533589a66ca70b5dd44a32ddac652c7c69300406434b80e7cbc9aee2a78ae6b26ee4c2b SHA512 6579d988a2093602f5fc82203bbb5dc5690a95032484b5d5bd843d1e7995b3b89d802c7b38ec0345c1f3d8e22c98fb92b3982a1eadfcdf63607f929a52b56abf
+DIST scipy-1.14.1.tar.gz 58620554 BLAKE2B 5cb383648a5f3b8d0d321efcd66992212c59ce3fc3dbf812a2fa97c09cb18831b280af6c7689553644f83c531a266e9152e2a139a12aed08307e1ed64deea78e SHA512 20e3cf13590f76dfdc40ca8f90e6d5a68502e74415f37fa24fdb8169098e1d7f0aa631ae742c8c3e9573fa7d63da61986d51f35f090a3785873ae0761f7fcfa6
 DIST scipy-html-1.14.0.zip 65723829 BLAKE2B ba47dbf00a5d2a53a9addc5ea68ab18b42f211a018b89aa4b0b57ff0dee02e410a3effc59ddf8fbbc5aa33075d45d86880aed3a14068da5bd7b62ee526199967 SHA512 93be0bafcc64cea1ba130bbcc77c0741acc4f819c84a5030391a22657a1bc63abe8434a2723f66b7ad04c0809dc6d02e3a97ffb8d94bd3d4a4bb759ee796b475
diff --git a/dev-python/scipy/scipy-1.14.1.ebuild b/dev-python/scipy/scipy-1.14.1.ebuild
new file mode 100644
index 000000000000..2e1ec6ce7593
--- /dev/null
+++ b/dev-python/scipy/scipy-1.14.1.ebuild
@@ -0,0 +1,161 @@
+# 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.12.0[${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
+	epytest scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/seedir/seedir-0.5.0.ebuild b/dev-python/seedir/seedir-0.5.0.ebuild
index 3f6abb80a1cc..1255ab3d1715 100644
--- a/dev-python/seedir/seedir-0.5.0.ebuild
+++ b/dev-python/seedir/seedir-0.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index b0ee912e9113..611e5ce4b32b 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,2 +1,4 @@
 DIST selenium-4.23.1.tar.gz 945830 BLAKE2B 7931156bc8b79484433cb6a9bd7d49852981e3662a8e75f1f48d683644bac1c78e616e33965c611f50203a6a6f0f5bd09501c16816afe7a7c27b2a9e72a10a14 SHA512 3f9cda92c606ce7a32ecb6f1ef434501368fdab8673a0f23a39d78b80e80b732fafb6e29842ab5301d31cd8eaa907561b91a96cf67e181daeae3378e6a0e9a5b
+DIST selenium-4.24.0.tar.gz 952221 BLAKE2B b3336b41219884625885b3066a17ad5a45da9c28635ae20f7635fdedd0cda3a61f19f71ce151dc7bb1ed7338927eedc8492011871b225296bc57b21084d64855 SHA512 77508e4200e399a7b7c5c03d91d9c8fde97f733c4611bd98385bde1623ab2df91cc52168a8ff19a0ac99da95e2b96321d4d1cefecce2af30f3f0b54d90b9b2a5
 DIST selenium-selenium-4.23.1-python.gh.tar.gz 77116002 BLAKE2B dad444b109d2494b3442c81187fa6c9d3db2565183304f76d2badf2444e0545727c6f4bf08be0a5102692b9c018b3354a4063758253275624f9f4d6ff6d49254 SHA512 e7d4dc8f14fe9cae3d8e362a03b5068536d64e8484e151187ae9c917350e1f299977fb1521066998fba5cd845c5167a8440d02b15547d066a40d3e79cac1f50d
+DIST selenium-selenium-4.24.0.gh.tar.gz 77126013 BLAKE2B a909714b93b0cfc92a9d70d8cf20609eec65ebce3470fe487a23c86ac4f6f3dbf2e2ef88e00883999fe8b5e2842a05039fec94f6617961c436649baa618c59f8 SHA512 bc6f8066efba5a4f5a27abcc37eefa303e9efd89423729fedb4f466d98ed57e68c8593248206e4fc13cebd3446fa25a5a856d5f4c1d05940d73cecc920b4c522
diff --git a/dev-python/selenium/selenium-4.23.1-r1.ebuild b/dev-python/selenium/selenium-4.23.1-r1.ebuild
index 7bc62b25286b..addd8770289a 100644
--- a/dev-python/selenium/selenium-4.23.1-r1.ebuild
+++ b/dev-python/selenium/selenium-4.23.1-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~loong ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/selenium/selenium-4.24.0.ebuild b/dev-python/selenium/selenium-4.24.0.ebuild
new file mode 100644
index 000000000000..546d13f5cd0c
--- /dev/null
+++ b/dev-python/selenium/selenium-4.24.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13 )
+
+inherit distutils-r1 pypi
+
+# upstream sometimes tags it as ${P}, sometimes as ${P}-python, sigh
+TEST_TAG=${P}
+TEST_P=selenium-${TEST_TAG}
+
+DESCRIPTION="Python language binding for Selenium Remote Control"
+HOMEPAGE="
+	https://www.seleniumhq.org/
+	https://github.com/SeleniumHQ/selenium/tree/trunk/py/
+	https://pypi.org/project/selenium/
+"
+SRC_URI+="
+	test? (
+		https://github.com/SeleniumHQ/selenium/archive/${TEST_TAG}.tar.gz
+			-> ${TEST_P}.gh.tar.gz
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}]
+	<dev-python/trio-1[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.17[${PYTHON_USEDEP}]
+	<dev-python/trio-websocket-1[${PYTHON_USEDEP}]
+	>=dev-python/trio-websocket-0.9[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.9[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-2[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-1.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		test-rust? (
+			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-util/selenium-manager
+			net-misc/geckodriver
+			|| (
+				www-client/firefox
+				www-client/firefox-bin
+			)
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# do not build selenium-manager implicitly
+	sed -e '/setuptools_rust/d' \
+		-e '/rust_extensions/,/\]/d' \
+		-i setup.py || die
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# expects vanilla certifi
+		test/unit/selenium/webdriver/remote/remote_connection_tests.py::test_get_connection_manager_for_certs_and_timeout
+	)
+	local pytest_args=(
+		# https://github.com/SeleniumHQ/selenium/blob/selenium-4.8.2-python/py/test/runner/run_pytest.py#L20-L24
+		# seriously?
+		-o "python_files=*_tests.py test_*.py"
+		-p pytest_mock
+	)
+	if use test-rust; then
+		local -x PATH=${T}/bin:${PATH}
+		local -x SE_MANAGER_PATH="$(type -P selenium-manager)"
+
+		local EPYTEST_XDIST=1
+		pytest_args+=(
+			-p rerunfailures --reruns=5
+
+			--driver=firefox
+			--browser-binary="$(type -P firefox || type -P firefox-bin)"
+			--driver-binary="$(type -P geckodriver)"
+			--headless=true
+		)
+
+		EPYTEST_DESELECT+=(
+			# expects prebuilt executables for various systems
+			test/selenium/webdriver/common/selenium_manager_tests.py::test_uses_windows
+			test/selenium/webdriver/common/selenium_manager_tests.py::test_uses_linux
+			test/selenium/webdriver/common/selenium_manager_tests.py::test_uses_mac
+			test/selenium/webdriver/common/selenium_manager_tests.py::test_errors_if_invalid_os
+
+			# TODO: these don't respect --*-binary and try to fetch versions
+			test/selenium/webdriver/firefox
+			test/selenium/webdriver/marionette/mn_context_tests.py::test_context_sets_correct_context_and_returns
+			test/selenium/webdriver/marionette/mn_context_tests.py::test_context_sets_correct_context_and_returns
+			test/selenium/webdriver/marionette/mn_options_tests.py::TestIntegration::test_we_can_pass_options
+			test/selenium/webdriver/marionette/mn_set_context_tests.py::test_we_can_switch_context_to_chrome
+
+			# TODO
+			test/selenium/webdriver/common/bidi_script_tests.py
+			test/selenium/webdriver/marionette/mn_options_tests.py::TestUnit::test_binary
+			test/selenium/webdriver/marionette/mn_options_tests.py::TestUnit::test_ctor
+			test/selenium/webdriver/marionette/mn_options_tests.py::TestUnit::test_prefs
+			test/selenium/webdriver/marionette/mn_options_tests.py::TestUnit::test_to_capabilities
+		)
+	else
+		EPYTEST_DESELECT+=(
+			test/selenium
+		)
+	fi
+
+	cd "${WORKDIR}/${TEST_P}/py" || die
+	rm -rf selenium || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest "${pytest_args[@]}"
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 872ac8609f44..d46aab4bac78 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,2 @@
 DIST sentry-python-1.45.1.gh.tar.gz 474940 BLAKE2B ae3195bceee5beb79d36958b79992fc8433d5315052e7cb4dde2dad4a21482549b28325329a9bd6cc44376acff69ca41b1506e7341c17314318cc93360b5fbcd SHA512 15c42187ef1a9ec1515e23e4e49980e8aecec4bd1f63866bc793bbaf75d9663a636d34c1fcc46faec839685d50366e0a2c9a2e735780d8a1f47f5986bf9fc6a6
-DIST sentry-python-2.12.0.gh.tar.gz 537094 BLAKE2B cb009c4569e5defae8cfb44bbc1260d63554dc0f002675910e8be0b9d0259f89a860d2852d9f9af8460c76d2eb311339f40847d94bc05fb06fbd677cad3d46e3 SHA512 61cdd006792dbcf4cb77f1dd3935d1ba1232361aa2e7b48f2b423873fec88c6d01c24c52cc4520989a501d372ee1d22a580ef89887c454045f6d5ce20e2e2c32
 DIST sentry-python-2.13.0.gh.tar.gz 549156 BLAKE2B 2d9a009b53c0ada24c84a1deaf442c25a573d3e7df031bab143ab650937ce7e9f6e4e75f9427b50f2e0ddf196c816b89e81cd67cacbc6c301f854f92d59ba5ac SHA512 4dd48d8acd1a132d93e08bb44028b7ec88b75bb821acbc3376391527e113c38abd74b4bc535b9a1f79fa3647bbafb22de85a6a553dc2c61fbd6095ffb39c6f32
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.12.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.12.0.ebuild
deleted file mode 100644
index 3eb4aba5de5c..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-2.12.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: most of them hang
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-		# requires AWS access
-		tests/integrations/aws_lambda
-		# requires quart_auth
-		tests/integrations/quart
-		# TODO: require opentelemetry (with py3.10)
-		tests/integrations/opentelemetry
-		# broken (incompatible rq version?)
-		tests/integrations/rq
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
-		# broken teardown?
-		tests/test_client.py::test_uwsgi_warnings
-		# too many dependencies installed, sigh
-		tests/test_new_scopes_compat_event.py
-		# Internet
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
-		tests/integrations/aiohttp/test_aiohttp.py::test_span_origin
-		tests/integrations/stdlib/test_httplib.py::test_span_origin
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_span_origin
-		# TODO
-		tests/integrations/aiohttp/test_aiohttp.py::test_basic
-		tests/integrations/django
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
-		tests/integrations/threading/test_threading.py
-		tests/integrations/wsgi/test_wsgi.py
-		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_utils.py::test_default_release
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
-		tests/utils/test_contextvars.py::test_leaks
-		# pointless, fragile to packages being installed in parallel
-		tests/test_utils.py::test_installed_modules
-		# TODO
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop
-		tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required
-		tests/profiler/test_transaction_profiler.py::test_profile_captured
-		tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate
-		tests/profiler/test_transaction_profiler.py::test_profiles_sampler
-		tests/new_scopes_compat/test_new_scopes_compat_event.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked -o addopts=
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.13.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.13.0.ebuild
index ee64a08f826c..2b6f2c07a5f2 100644
--- a/dev-python/sentry-sdk/sentry-sdk-2.13.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-2.13.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/setproctitle-1.3.3.ebuild b/dev-python/setproctitle/setproctitle-1.3.3.ebuild
index 85d0afb6dcbf..2c2d496eee4e 100644
--- a/dev-python/setproctitle/setproctitle-1.3.3.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.3.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 2f5e1719ec76..1ac3615ee82a 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -1,59 +1,35 @@
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
-DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
 DIST cssparser-0.27.2.crate 56792 BLAKE2B 06b2c5692526fa8aabf158fdf4c05e77a6c30f33c631a735256da6eb50bca93031dd7899f484e482ced7377fcf433b30e6a0ed458b27401e183f9f80af897007 SHA512 7ab205b05112deffb5c50586106c6f04932a8b5aa1bc3224062abfb65136884f20189ffb1b2402aca5c29cc52c3315492db5c05ac052a70ddea88eb6683df295
-DIST cssparser-macros-0.6.0.crate 6684 BLAKE2B 6b012e881c8a26a398ce62432b9b9d79bbddae4e6e7a1c9883fec19f0b63ba935102bb4443ff542d0cefab2ec6af0cdad3d5249afacac574da71fedf1af925e9 SHA512 9b0aa19d46efe600fbb8b4763639affa5491727ae05312f5c7fb9c5c4d29971c33cb9afcee5001c7d0aec8677d36b5763986783ce8c897de892411f1bdb9a4ea
 DIST cssparser-macros-0.6.1.crate 7914 BLAKE2B e754cdabbf678d3f9efab469e72cacd05e2635352c4a3f4c40971772550c3bd48315a65cd121a79542ffcea642cc0868c41cef1c7ad5a31da92ba21a02c41530 SHA512 21d2f8bcaad0a8fff865b23bb2b59dcc5165f8861c4b9d7d70e9f302b58e2cc5ef8555bcab97889bfe81889a2b27863c755494baa64a52c65cd74687fe58b124
 DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf
-DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST dtoa-1.0.9.crate 17002 BLAKE2B 0b658c6af9a82f7b6ddfeec4f7c2fe21b8ae65e25674c4bb15d5c39c62a0afd9461e37d01074a0e3cef9085732c95cc1c12a09e2f91e508be80f2b22743413a2 SHA512 996814e68f67c77d68a0e3195241f7034575453401370a1842c94232a35aa41c832f788720ee68947662ae0e8c7595df736810a2b392871f57e6ccb47f55a4b9
-DIST dtoa-short-0.3.3.crate 8198 BLAKE2B aaece640d0f8b231081bb1534c3188dd4f9780e590f204697e2b8c21c33d348b40310790fd1b72d50a8c58c1d56ae2d6cb0dd24eb37e5ffae12a014da9bb2fb6 SHA512 92fce043874f589155e7e2f14f91a51e876bf0003d1eaccaa1e20026c041f7f84398e82937d6d0e834b0d671d2b7ca307111ddc085508573dac9298469488a4b
 DIST dtoa-short-0.3.4.crate 8276 BLAKE2B a0642c3016a22d7737fd664480b13015549cfbea01e0dd3b58883e02cf4da68b6ba271062fab2d890ce82c69392905e1fcb39a32cad67f3d1f6c4f4f0a223ab0 SHA512 1df9db497daf36af46444d55b3d9b1d9607afba56fdf7e959fdd3b41be7c3c190522ff1cabbba20a896eee4cbd54c84be22a0fe4a7ebcd5ac7141fff1ad86035
 DIST futf-0.1.5.crate 11344 BLAKE2B 2cc5e5f5d4ace47e9273546e46c500432da47f246cee18f24607432305dec9481ec3d02b8a9bff4724efe05ea1d235294c52ee4eeb2f5f285ce56c2987b62d24 SHA512 4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3
 DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
-DIST html5ever-0.25.1.crate 73165 BLAKE2B 70bee0c77337b2fee3fedda6fc475969b5e9a20342bf6890819fa9a69be8cac66e0dfc0a608f5cd6ba789a780f403ee736dbde1af52cb800a599b0113801dc99 SHA512 2b946224a0c5859436a57a507a89601adeffc12092376fe47429c5c5a61bd1d00b3271f0be7dea82ba1dce93a1cb820f72df8ba4c90fd13bd1ec408cff6ca660
 DIST html5ever-0.25.2.crate 72780 BLAKE2B b9dc442ab8b6e502eac5bffde57d7fd85f8da2f13276705e53f1e08c4f653b6207dabfcec5d121c55a8227f0cfffc1c662e3aede885a3473293783672fe9ed1f SHA512 08042721c9db82ab45c98c8f1e5a1d3359906c829ad17ebefb1b933553786c6e7c3b7cad400ea382feb5f0187060a2ba4f1a271c25a870a90cb5c596ac6daf0f
-DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST kuchiki-0.8.1.crate 22153 BLAKE2B f5e887c70e755f99faba569a2ceb3e9942d4dff50e884af1764b6cb557b90d4d89c8a800dd397898fd87c4f9e5d7a6b162b2964c8518a397e38c3919689efcf3 SHA512 68f668032cd6e1152e3eab196d7bdbc0a835daabb0de6b7ced7f463ea56224c35bdb18cc0dd7e57a90461d1ee5e0349e8488df7390580e7eea570997fb4029e3
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
-DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
-DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
-DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
 DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
 DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d
-DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
-DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST new_debug_unreachable-1.0.6.crate 2582 BLAKE2B 2ac3dd86f1a532832a40ccfda95654e43709a62faebb8182c87309827afdd23e6d3f250f2345f044cb789015c30b7907be63253b487d368e68c4fdbc7de20492 SHA512 73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48
 DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
-DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-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 parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
-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_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
-DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
 DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
 DIST phf_codegen-0.8.0.crate 3192 BLAKE2B 65c733fb896fa034c97482d122a2ed4c39d763cbb65ee48a229cdb320910aefeef125674bb1305a4a12f5fccefd71f859e33cb26c3e6be09ed8f776f9ff9b463 SHA512 6649779b50683b1b83c89da921ee52963fd517660540148e9ba4b59f9639c705e08400c4da972880ed161564816c7ad45704d6bd51d1429717137de8f46cb941
 DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
@@ -62,26 +38,15 @@ DIST phf_macros-0.8.0.crate 5814 BLAKE2B 39f40a52c177da227b3bf54d0fe4f05a2d6c382
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
-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 precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
-DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro-hack-0.5.20+deprecated.crate 15045 BLAKE2B fb7b9fa57ad64f2920e801482bfccc762bb7b2c8c1db7da32f393c7b47414fab37234c8a408a4ca9d7072a541df22b07775fc509f76f352fb6be9fe822f84dfd SHA512 278e786f8e0c93e346de900666b3d55d366324167a2e5e553565870c4444bfe661cf8c151a29cbd3176a4905ec49d69cffb81ae1e4a129f30404f930972c4b43
-DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
-DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST proc-macro2-1.0.82.crate 48452 BLAKE2B c01f60b788c1395d1041d7eb55fe9519ae4e78f86e3dfa732458747767ff801fcdd5a19a81ee9a8d8cd2457eb0a2bb7cec118299a5a9a64d65b5cf06b9d81165 SHA512 3726463868483243adce01c319c1deb1ab153188f1adcb083b53bff838fa80371091bb8e20ce88709ea850ab3ef74dcd99ca5aa95fa375b330841fd4230c842d
-DIST pyo3-0.20.3.crate 434673 BLAKE2B 1dcb881fd1fe5c76e9b4951f4d95fcd1daa1845c226a4ab1db4283cabe67bda822ff03e3cc85d797fe4665a1614229e7406dea65ec5e99ce4aac96b973a7f55d SHA512 77cce558fa60bbd8d9981ff5e62fdfa9bac94bd650b287fbf14ac93ef1c326c8ae7fda82d744e3582df03cab8adf490e0f2752fabd9ae3de044e7d80984e0350
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
-DIST pyo3-build-config-0.20.3.crate 30060 BLAKE2B ef122b0b7d840d5362928bac76e1299b333775ec5c49a3bf23a19eccec074917931356bbf719c6d700999941bb6a396948ee7f8761e685c8e9251af07ba0cadc SHA512 70685415bba443787dabb9c61ca3702aefbcacb0705471b496b4f01efe34291735321d91243355b4be9aed8b243e393c09fb65556f1b926ac7f22f64560bd927
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
-DIST pyo3-ffi-0.20.3.crate 65024 BLAKE2B 33e79a02c7ab85f4767e02a39d8553ddc015c80d13bea674885ad8a18d89bd90f866cc39d81ecbf56270ebe87d29bca48f635c4e73ec99df02ce425f1427cb31 SHA512 3d1ced58e243be7cee4a3ca831dc08a1631fcd511c707dd3bada87d7662807dea2d88393d76e56ff19a6d1c2804d93b5b6b7b5efd36b9c275d66fa1bb1bfc384
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
-DIST pyo3-macros-0.20.3.crate 7920 BLAKE2B 0510accf51cd83390cbb7b6ba4ec9f4610e3dbb7448d1213994013487ae81bb087df1ba0076a3862e5ecfd172b7846f9439a2d86950a93b016aae565ced4f03b SHA512 454f3c0c054aa131ffe955e4be1af061005b9c81b4d80702827e19b983224c118dfea474da515d5fc2c79cfd3fa21204ed4af2d9e81427123e0a78bd246a23f8
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
-DIST pyo3-macros-backend-0.20.3.crate 49797 BLAKE2B 59c55d482577ce105db3e19a1db794eaab8221d7de01197716b75d5d2602e0f27c86aaae527eae7098eafad311144550bd597efe8cd6560c82dc435021f3428f SHA512 e177ee0d6a538a555fbe9108e3e2c20102622b2c9b9696ae309189e5c4d068efad2132afd4a97d734ebabb4d7146980a26cb68dc05d5eb88f338be2ad0cd651f
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
-DIST quote-1.0.32.crate 28037 BLAKE2B 7b243ac7929f3b2e1d91a51a2dc2b11dd29bc017be9db588c83bd137609e2f991a4f3ff8682c7c11c177153e517c4f818285cce3237f435aa43ad0126c4bab6d SHA512 13cae36920dcbd0ad1978be63f20b35b8424d02b4d9992032fa78c7770d61d1fa7ec1532a48793cab48e703236b7bee7843041253b9e83700903228078b4c025
-DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -91,74 +56,36 @@ DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9ab
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
-DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
-DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4c64f59f71cd0095d87a20bb13c69b6a5271ff7951f9a67934ced5ca0d3fda684c99727ab90b637c0af170e012e SHA512 af2f4ba87c7a52291bc7f5276c4ebcc7689724d95972ac8d162e0f4007a6f0a47ee1aa6095b3b80441924f990b2d147bc4e3e65a7dec164d95742977ca792b04
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
-DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde-1.0.200.crate 77611 BLAKE2B 57f4a76cf534ffda009a5441e694b0ac87b30e470c97d77bfd572eb54f039c3cec56f9bf5e035e4b3b257ddb341cb4b7fdb85ca3c4684167220dbb98d1e6a762 SHA512 d4d01d62e7338b147f83bdbe358813e70b7ac218ddbdeab534926d205d46f86e2086f73a01f453c9d4a3bfed07e10d57ebd1f86bdafd4fe96c6298f1e527b8eb
 DIST serde_derive-1.0.200.crate 55785 BLAKE2B 45eca5504aff6bd099a42dfc794cf732c7e76e5ed362d16082ac069d29e1e6c22bb3e13dede4bc498df8f008bdba15479de618380f37c9742a34d97c9ca12efe SHA512 e70f0e092d81542a96b33610da8ddbf04023d8ecc1fa4a4f31978699c118f096e8534f9e3e4e479ee74280efb86d752dd1fce038ef2def329fdcc10c1aa50942
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
-DIST setuptools-rust-1.10.0.gh.tar.gz 303846 BLAKE2B 33fd4bef8f3fffd76230211c1d419bce3eb0dc3729fa82ec37025e2779996b7a13826517d4f8bc955c79a05a04628962ab3553beebe0954a6acba4135274d5dc SHA512 dc1e4d6cc6094d54c993c13b41c6ea63a84772733640b17e7287c3f7fc144ef747d0807ea2ea134f833d2c2a74a1f8e5385aa700b0787383e1d0bc4f39be3e09
 DIST setuptools-rust-1.10.1.gh.tar.gz 303851 BLAKE2B 09ede3e017fb3c7202a6e4426f3ac401234ae306e93b88dc6c7364e0718ccb0ce2f1b863c3a41f1158b85cb24e3a4c3ea4ba8ef5e6fa16e4768f9ac42c89aa71 SHA512 9fff3f5a8f1808da4a588ab2e3684b0d279c7813fbcb994a98996a5f20bbe9f5e26e2ad3235f35baac727106ea5023e744015f238b22436bbf3a3f6e0e8b9c2f
-DIST setuptools-rust-1.9.0.gh.tar.gz 305578 BLAKE2B 5267a3ec9f816522feceee0e09f833d493e5a401b654a86269e8b8969b16313ed672ce35e1ef7023704ca1d084aa9d393cf2d115fff2e3f7fd1a68992fdd0dcf SHA512 874bb632a2847cd5febeaa766765ee58432b1a0b96fddfe0fb779f9d7965b726a7c7836e3de6700d801aca1b00a64326ca3de63027069c4a047800bd5d64dfcc
-DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
-DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
-DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
-DIST string_cache-0.8.3.crate 16261 BLAKE2B 6c94d4158c095bbb82bc2daf071a698e4dd900b5a8dbce21f7a7020005d614e8d5156cd32d4118670d85168b0faa835c54026729285cb4feb7ed8a0551e9ff20 SHA512 337f1c95393c719d96d9dc7c552b744271f89c4ccb70efada8a48331eb619cbd761eee5a6f13c41b214449fd9ff29439473d33ffe3eda57d78ec90dd9aad88dd
 DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
-DIST string_cache_codegen-0.5.1.crate 8243 BLAKE2B 3ce7bd89edfdd58260fb58e7b954eec503dab2562d13274f401a0af5f7e5152a660298e9884f578e361557225c67c80c0342e5c71d47aad7ec43a47ea91c617c SHA512 c3aeb752cbdbcb78cee6156b726264d182e77b3d6ac89066c366d87d8bdffc32d83e6e59a40471f07d7c827717db25fa6fb489dbd3a650f2fc252a7c85f4ecae
 DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45ee88dba9756449f3ef4c4884e491b7810e1c9f10b58012244dafa4422d5589502876f30a43940ee9754ef7b9952ebe4bb41 SHA512 01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-1.0.89.crate 235966 BLAKE2B 8f0e5be9f04f5faeb080fc94d13df0926f03a15ff702a2a88e5eb3194215441882c6f2795506ea05cbafc66f6844de3dc61aef720495932f4675c34be0ef6ee0 SHA512 6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a
-DIST syn-2.0.32.crate 242504 BLAKE2B 2c2938c0d711c684c9baf95538e2e76220418646590474b2b654d9242d2818aa7c3e5990208fe231ef64903df17edbbf6cc930e6224c964cad4eae5aeaeae781 SHA512 609f125f8138d17b1185760b1a63f3713079f5214fb56c23012229a56d10ac1c12654466c9ad1ecd6b2aff1126d125abfb0a42bd7f669635e5024b962b0cb0af
-DIST syn-2.0.38.crate 243284 BLAKE2B 660de454989016dbb352c262d5d066ddc663eafcb928a2f62f61e6faf14cceed5cfbc37559e3795e1ce7886c78842be71eaa82ddced0cd6dd99ad99f95ab8ca4 SHA512 84fd4f4bc6de97cdb63a1ee9161daf8fb8fd1fa0f3c3bba4a29c463cd62cffd292c45b8cf17fd0911e580098cadc7b167e4e686595d31d72e7b53ee7df6d5f04
 DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
-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.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
 DIST thin-slice-0.1.1.crate 4484 BLAKE2B 7efcd3c30dd24c22641139288b0c530ffe56dd82f26c2c31f557f1fa09ced695cf12b645fa6bc4c12324af0b9b05792a9cff422b6deee3bbb06b57a7cec06f47 SHA512 27b9e6b2a8485b3f89f659d80d67ccb96370f3371996e39f97784c40bdd7fef5429fb96f48d9c045eec5906051708f169fe4ca8f5f546a25e5f6859cafa42925
-DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
 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 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-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2
-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.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.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
-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.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
-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.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.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.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
-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.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
-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.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
-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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
diff --git a/dev-python/setuptools-rust/files/setuptools-rust-1.9.0-delay-non-stdlib-imports.patch b/dev-python/setuptools-rust/files/setuptools-rust-1.9.0-delay-non-stdlib-imports.patch
deleted file mode 100644
index ea36c235beea..000000000000
--- a/dev-python/setuptools-rust/files/setuptools-rust-1.9.0-delay-non-stdlib-imports.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 06d236045b6a69c94c68f255dc683219ec833c83 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 7 Jun 2024 00:15:26 -0400
-Subject: [PATCH 1/2] Delay imports of non-stdlib dependencies until time of
- use
-
-This is a bit of a hack, but we do this to ensure that when setuptools
-loads entrypoint based hooks it cannot (will not?) crash.
-
-The issue is that setuptools plugins are autoloaded, whether any given
-project uses them at all or not. So if setuptools-rust is installed,
-setuptools always tries to use it, and crashes if setuptools-rust is
-broken.
-
-Of course, setuptools-rust can't be broken, because it's a wonderful
-project.
-
-BUT.
-
-As it happens, third-party vendors providing setuptools-rust can get
-into a situation where multiple packages need to be installed, including
-setuptools-rust, and also build yet other packages from source. In the
-middle of this, setuptools-rust itself could be installed but in
-"half-configured" state, i.e. its dependencies were queued for
-afterwards due to complicated dependency graph magic.
-
-In such a scenario, it should be nominally all right to have an inert
-package installed, since if nothing actually uses setuptools-rust it
-doesn't need to *work* yet. And in fact, it is all right, as long as
-setuptools can import the autoloaded plugin hooks (and do nothing with
-them).
-
-Bug: https://bugs.gentoo.org/933553
-Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
----
- setuptools_rust/extension.py  | 7 ++++++-
- setuptools_rust/rustc_info.py | 8 ++++++--
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/setuptools_rust/extension.py b/setuptools_rust/extension.py
-index 2d6e5aa..9ba1cf5 100644
---- a/setuptools_rust/extension.py
-+++ b/setuptools_rust/extension.py
-@@ -1,3 +1,5 @@
-+from __future__ import annotations
-+
- import json
- import os
- import re
-@@ -14,11 +16,13 @@ from typing import (
-     NewType,
-     Optional,
-     Sequence,
-+    TYPE_CHECKING,
-     Union,
-     cast,
- )
- 
--from semantic_version import SimpleSpec
-+if TYPE_CHECKING:
-+    from semantic_version import SimpleSpec
- 
- from ._utils import format_called_process_error
- 
-@@ -185,6 +189,7 @@ class RustExtension:
-         if self.rust_version is None:
-             return None
-         try:
-+            from semantic_version import SimpleSpec
-             return SimpleSpec(self.rust_version)
-         except ValueError:
-             raise SetupError(
-diff --git a/setuptools_rust/rustc_info.py b/setuptools_rust/rustc_info.py
-index 070be0c..d1d4748 100644
---- a/setuptools_rust/rustc_info.py
-+++ b/setuptools_rust/rustc_info.py
-@@ -1,15 +1,19 @@
-+from __future__ import annotations
-+
- import subprocess
- from setuptools.errors import PlatformError
- from functools import lru_cache
--from typing import Dict, List, NewType, Optional
-+from typing import Dict, List, NewType, Optional, TYPE_CHECKING
- 
--from semantic_version import Version
-+if TYPE_CHECKING:
-+    from semantic_version import Version
- 
- 
- def get_rust_version() -> Optional[Version]:  # type: ignore[no-any-unimported]
-     try:
-         # first line of rustc -Vv is something like
-         # rustc 1.61.0 (fe5b13d68 2022-05-18)
-+        from semantic_version import Version
-         return Version(_rust_version().split(" ")[1])
-     except (subprocess.CalledProcessError, OSError):
-         return None
--- 
-2.44.2
-
-
-From a98e8a8d31d30c5d304e9ee7b48ba739946dea6f Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 7 Jun 2024 00:34:59 -0400
-Subject: [PATCH 2/2] Try extra hard to pick up an existing tomli library from
- setuptools
-
-Since setuptools-rust already depends on setuptools, it is reasonable to
-assume that even if tomli isn't installed, setuptools is. And setuptools
-includes a vendored copy of tomli.
-
-If the copy in setuptools has been devendored, it will be available via
-"tomli". If it isn't devendored, it will be available via
-"setuptools.extern.tomli" unless setuptools changes their vendoring
-approach which has lasted many years so far. Either way, we are sure to
-have a fallback tomli without explicitly depending on one, which means
-one less dependency to install in the common case.
-
-Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
----
- pyproject.toml                    | 1 -
- setuptools_rust/setuptools_ext.py | 5 ++++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index cae0536..148d85b 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -26,7 +26,6 @@ classifiers = [
- dependencies = [
-     "setuptools>=62.4",
-     "semantic_version>=2.8.2,<3",
--    'tomli>=1.2.1; python_version<"3.11"'
- ]
- 
- [project.entry-points."distutils.commands"]
-diff --git a/setuptools_rust/setuptools_ext.py b/setuptools_rust/setuptools_ext.py
-index d4a0204..0ea6f58 100644
---- a/setuptools_rust/setuptools_ext.py
-+++ b/setuptools_rust/setuptools_ext.py
-@@ -26,7 +26,10 @@ except ImportError:
- if sys.version_info[:2] >= (3, 11):
-     from tomllib import load as toml_load
- else:
--    from tomli import load as toml_load
-+    try:
-+        from tomli import load as toml_load
-+    except ImportError:
-+        from setuptools.extern.tomli import load as toml_load
- 
- 
- logger = logging.getLogger(__name__)
--- 
-2.44.2
-
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.10.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.10.0.ebuild
deleted file mode 100644
index ff8031b5fb46..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.10.0.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-CRATES="
-	autocfg@1.3.0
-	bitflags@1.3.2
-	bitflags@2.5.0
-	byteorder@1.5.0
-	cfg-if@1.0.0
-	convert_case@0.4.0
-	cssparser-macros@0.6.1
-	cssparser@0.27.2
-	derive_more@0.99.17
-	dtoa-short@0.3.4
-	dtoa@1.0.9
-	futf@0.1.5
-	fxhash@0.2.1
-	getrandom@0.1.16
-	getrandom@0.2.15
-	heck@0.5.0
-	html5ever@0.25.2
-	indoc@2.0.5
-	itoa@0.4.8
-	kuchiki@0.8.1
-	libc@0.2.154
-	lock_api@0.4.12
-	log@0.4.21
-	mac@0.1.1
-	markup5ever@0.10.1
-	matches@0.1.10
-	memoffset@0.9.1
-	new_debug_unreachable@1.0.6
-	nodrop@0.1.14
-	once_cell@1.19.0
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	phf@0.8.0
-	phf_codegen@0.8.0
-	phf_generator@0.10.0
-	phf_generator@0.8.0
-	phf_macros@0.8.0
-	phf_shared@0.10.0
-	phf_shared@0.8.0
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.17
-	precomputed-hash@0.1.1
-	proc-macro-hack@0.5.20+deprecated
-	proc-macro2@1.0.82
-	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.36
-	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
-	rand_pcg@0.2.1
-	redox_syscall@0.5.1
-	rustc_version@0.4.0
-	scopeguard@1.2.0
-	selectors@0.22.0
-	semver@1.0.23
-	serde@1.0.200
-	serde_derive@1.0.200
-	servo_arc@0.1.1
-	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@1.0.109
-	syn@2.0.61
-	target-lexicon@0.12.14
-	tendril@0.4.3
-	thin-slice@0.1.1
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	utf-8@0.7.6
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasi@0.9.0+wasi-snapshot-preview1
-	windows-targets@0.52.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnu@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_msvc@0.52.5
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? ( ${CARGO_CRATE_URIS} )
-"
-
-# crates are used at test time only, update via pycargoebuild -L -i ...
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local -x UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.10.1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.10.1.ebuild
index ff8031b5fb46..674e4ab204b9 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.10.1.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.10.1.ebuild
@@ -116,7 +116,7 @@ SRC_URI="
 # crates are used at test time only, update via pycargoebuild -L -i ...
 LICENSE="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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.9.0-r1.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.9.0-r1.ebuild
deleted file mode 100644
index 60e8ded0ded3..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	byteorder@1.4.3
-	cfg-if@1.0.0
-	convert_case@0.4.0
-	cssparser-macros@0.6.0
-	cssparser@0.27.2
-	derive_more@0.99.17
-	dtoa-short@0.3.3
-	dtoa@0.4.8
-	futf@0.1.5
-	fxhash@0.2.1
-	getrandom@0.1.16
-	heck@0.4.1
-	html5ever@0.25.1
-	indoc@2.0.4
-	instant@0.1.12
-	itoa@0.4.8
-	kuchiki@0.8.1
-	lazy_static@1.4.0
-	libc@0.2.121
-	libc@0.2.147
-	lock_api@0.4.10
-	lock_api@0.4.6
-	log@0.4.14
-	mac@0.1.1
-	markup5ever@0.10.1
-	matches@0.1.9
-	memoffset@0.9.0
-	new_debug_unreachable@1.0.4
-	nodrop@0.1.14
-	once_cell@1.10.0
-	once_cell@1.18.0
-	parking_lot@0.11.2
-	parking_lot@0.12.1
-	parking_lot_core@0.8.5
-	parking_lot_core@0.9.8
-	phf@0.8.0
-	phf_codegen@0.8.0
-	phf_generator@0.8.0
-	phf_macros@0.8.0
-	phf_shared@0.10.0
-	phf_shared@0.8.0
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.16
-	precomputed-hash@0.1.1
-	proc-macro-hack@0.5.19
-	proc-macro2@1.0.66
-	proc-macro2@1.0.69
-	pyo3-build-config@0.20.3
-	pyo3-ffi@0.20.3
-	pyo3-macros-backend@0.20.3
-	pyo3-macros@0.20.3
-	pyo3@0.20.3
-	quote@1.0.32
-	quote@1.0.33
-	rand@0.7.3
-	rand_chacha@0.2.2
-	rand_core@0.5.1
-	rand_hc@0.2.0
-	rand_pcg@0.2.1
-	redox_syscall@0.2.11
-	redox_syscall@0.3.5
-	rustc_version@0.4.0
-	scopeguard@1.1.0
-	scopeguard@1.2.0
-	selectors@0.22.0
-	semver@1.0.6
-	serde@1.0.136
-	servo_arc@0.1.1
-	siphasher@0.3.10
-	smallvec@1.11.0
-	smallvec@1.8.0
-	stable_deref_trait@1.2.0
-	string_cache@0.8.3
-	string_cache_codegen@0.5.1
-	syn@1.0.89
-	syn@2.0.32
-	syn@2.0.38
-	target-lexicon@0.12.11
-	target-lexicon@0.12.3
-	tendril@0.4.3
-	thin-slice@0.1.1
-	unicode-ident@1.0.11
-	unicode-ident@1.0.12
-	unicode-xid@0.2.2
-	unindent@0.2.3
-	utf-8@0.7.6
-	wasi@0.9.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-targets@0.48.1
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.0
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.0
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.0
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.0
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? ( ${CARGO_CRATE_URIS} )
-"
-
-# crates are used at test time only, update via pycargoebuild -L -i ...
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-delay-non-stdlib-imports.patch
-)
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local -x UNSAFE_PYO3_SKIP_VERSION_CHECK=1
-
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 75aeb906c128..a12a4d6a276e 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,2 +1,2 @@
-DIST setuptools-72.1.0.tar.gz 2419487 BLAKE2B df05affc48f8909b6b3b9dc30ef33e31c4b3781e747fea7d23b855d0294976f563e25b268666bfd2c758be66eca00e3e850463ff3d6f26b891185a2a15c8d31c SHA512 d0a34f16dfa6bb9a6df39076cd43528cf854d343f6f801c448ea0ebab2a259aec3d03571e2a26709df6082ed2fcb6c43b86448be556fd559b6af41831b4f38e0
-DIST setuptools-72.2.0.tar.gz 2419230 BLAKE2B f04c196d13f62302e7c6f30a1021598fe22955cc8c980ddf22efa65f4d398c25273552b1a19b8719e2fee722dc44e9f1a2e339c5b6da8f4ca4ae8399cd27b2e1 SHA512 029c711be2953cc7fd88b6a0a00715e05ac04414e085e0b2387d58757c970a3316afb6e13426fa10dcc53785b98c8543ba48d49acf223a6332399a39a4924732
+DIST setuptools-73.0.1.tar.gz 2526506 BLAKE2B 766453a7f6f3e34bdc63628b8c0321730c66381cc6048d01fbf9dbf76eb9900cd5cfa6dbd7c55c95ada3e01065d43bf7cd9029793e0735cae989b3cb1b95287c SHA512 5def2d817329524e610c7981fc3a84687ea4d2e0a72799341a706a16ec61df3efc16c4622f8b88746ad4cb52f92f2493c23a99a21cf3607ed48da480dedd200b
+DIST setuptools-74.1.2.tar.gz 1356467 BLAKE2B bc625e323f94ba9166f2c9747610d71c0ef7ad2a07f6b3e0cedabcbac67bba6d05679a7bce3c3e761807727c10e111801d486c01f3cdb7e22ca4324370c2cfb9 SHA512 581cc51bf70fe378ca8dcdb2cbed6056de4c335c7e997ed126cc707a84c52571dfa0379f34e2f8bebf50ab27f4c20c718dd854f1378e3c6d4cf75a094e57a77c
diff --git a/dev-python/setuptools/setuptools-72.1.0.ebuild b/dev-python/setuptools/setuptools-72.1.0.ebuild
deleted file mode 100644
index 54bceb617bc6..000000000000
--- a/dev-python/setuptools/setuptools-72.1.0.ebuild
+++ /dev/null
@@ -1,124 +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
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{10..13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~ia64 ~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-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-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.2.0[${PYTHON_USEDEP}]
-			dev-python/jaraco-test[${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.7.2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor setuptools/_distutils/_vendor || die
-
-	find -name '*.py' -exec sed \
-		-e 's:from [.]_vendor[.]:from :' \
-		-i {} + || 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
-	)
-
-	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-72.2.0.ebuild b/dev-python/setuptools/setuptools-72.2.0.ebuild
deleted file mode 100644
index b861cccb6b65..000000000000
--- a/dev-python/setuptools/setuptools-72.2.0.ebuild
+++ /dev/null
@@ -1,126 +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
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{10..13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~ia64 ~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-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-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.2.0[${PYTHON_USEDEP}]
-			dev-python/jaraco-test[${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.7.2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor setuptools/_distutils/_vendor || die
-
-	find -name '*.py' -exec sed \
-		-e 's:from [.]_vendor[.]:from :' \
-		-i {} + || 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
-	)
-
-	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-73.0.1.ebuild b/dev-python/setuptools/setuptools-73.0.1.ebuild
new file mode 100644
index 000000000000..d4ada967a518
--- /dev/null
+++ b/dev-python/setuptools/setuptools-73.0.1.ebuild
@@ -0,0 +1,125 @@
+# 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
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+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 ~ia64 ~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-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+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.2.0[${PYTHON_USEDEP}]
+			dev-python/jaraco-test[${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.7.2[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# breaks tests
+	sed -i -e '/--import-mode/d' pytest.ini || die
+
+	# remove bundled dependencies
+	rm -r */_vendor setuptools/_distutils/_vendor || die
+
+	find -name '*.py' -exec sed \
+		-e 's:from [.]_vendor[.]:from :' \
+		-i {} + || 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
+	)
+
+	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-74.1.2.ebuild b/dev-python/setuptools/setuptools-74.1.2.ebuild
new file mode 100644
index 000000000000..21479a9f0955
--- /dev/null
+++ b/dev-python/setuptools/setuptools-74.1.2.ebuild
@@ -0,0 +1,126 @@
+# 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
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+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 ~ia64 ~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-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${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.2.0[${PYTHON_USEDEP}]
+			dev-python/jaraco-test[${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.7.2[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# 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/shapely/Manifest b/dev-python/shapely/Manifest
index f44b571338bb..105e057787b0 100644
--- a/dev-python/shapely/Manifest
+++ b/dev-python/shapely/Manifest
@@ -1 +1 @@
-DIST shapely-2.0.5.gh.tar.gz 333029 BLAKE2B c618d0eddc53bf1b4f423b18eaeaf26ab7a1c1a8d32905e56a23387da9e4b4df610222bf58b85e095b0a0b9cece226fbae9fdf1e3689f71eb8d95d0b607b5109 SHA512 2f0364bb4480c971bd8a4f78ee1ac1cb014bf335e676b9531a092f30d522a9a34b670f96f3f92d7ea91a1da5043510f33a50fd4332ad5cdef1d19799122685a6
+DIST shapely-2.0.6.gh.tar.gz 333201 BLAKE2B 91e5f9552c6b0c33e87e91eebd848fb9a054d963e6e850d541ed65a4ad5b803d4959b1f8f89feb080824cd12299ca1a70ccfe17fb292469a0bd627257d06d1e4 SHA512 fedd3e43b7cdf011f19ab89bd27982520689c34d8c924b684441cefa9543a2feabbf856981f934b5935971fd805aae92fbe70e7414e4c9b5753f30eb750e03e0
diff --git a/dev-python/shapely/shapely-2.0.5.ebuild b/dev-python/shapely/shapely-2.0.6.ebuild
index ac8859ac4f41..ac8859ac4f41 100644
--- a/dev-python/shapely/shapely-2.0.5.ebuild
+++ b/dev-python/shapely/shapely-2.0.6.ebuild
diff --git a/dev-python/simplejson/simplejson-3.19.3.ebuild b/dev-python/simplejson/simplejson-3.19.3.ebuild
index c61dabcb3d8e..6b74f885de6c 100644
--- a/dev-python/simplejson/simplejson-3.19.3.ebuild
+++ b/dev-python/simplejson/simplejson-3.19.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/simsimd/Manifest b/dev-python/simsimd/Manifest
index 9027a8b8eec0..adabc923e763 100644
--- a/dev-python/simsimd/Manifest
+++ b/dev-python/simsimd/Manifest
@@ -1,3 +1,3 @@
-DIST SimSIMD-4.3.1.gh.tar.gz 105424 BLAKE2B b5886261ad8290662325321816cf9e7eeb7059b58e3e2352f341345667393d4ee009a840061768666234ae2619bbd4c7522726a2efc4f60935309a393649fd22 SHA512 722a8ae473d4526130a0d80bd6074ba6cee7a2566414505b7db8cd4d63efade2470153e4364a9cff140780fc839264c7ccb6580983170d25ff3bbb4a00d78155
-DIST SimSIMD-5.0.0.gh.tar.gz 120734 BLAKE2B 40a51018334e81ada820f394a2bc1f7560b00a339c4b43a23e071a492129375af2d7155205ad3b1b0f6915579a49f10ed839b132f9f2297991a776e3f7643932 SHA512 25125d213eb773e453aafb0e2332a9a2a0798c16c01c954a5f84354c5f20a9cd9b512fda37c4cceffdbae1c2cdb9571ffbdf32ea3f0cfa6f60192f0a3d3e5c7e
 DIST SimSIMD-5.0.1.gh.tar.gz 120754 BLAKE2B 35094cf15aad8f2325706a604eb7036e3edc18828c2341d9921b76077d7d7de9028177277ea32a144fa7edd98ee2b83d83506e632f95889c2290102c9638df9e SHA512 0dde560764e4d267e7b3387e8c7e24a44da02362f651b9ea48d44f91908135d107080c8b7db2fb3578f5ebfa67082694eb2907d82ceef841271f0debf42f1a8a
+DIST SimSIMD-5.1.3.gh.tar.gz 149123 BLAKE2B 1ac5d4245486a45ab73efe58733c22b9928beca09117d9c7a30ff920f595d7d5a315caa4e71ca951651462c77b794c7157add4783bede40c63d8ca1783365912 SHA512 707ce791c4e5cf866a690f6003ae64a052dfecb26c103d84dbe6fb43e35364b1d1fcf7a49dd1445063e471d06c760a432847c45476767b26b7ca11bcc4c555b0
+DIST SimSIMD-5.1.4.gh.tar.gz 149847 BLAKE2B 49aa9cfcee079b415d504989345be48c0b055e34dabd69240fdc02a35f51da81f25ab78fa27831e411d3853bca8b586314eae6840068715ec6a9c76c874162d6 SHA512 a656a71076d35c62cebe3d0cb2fc5eae87d9f13cb7a4427d74cb2959e813b4ff387ec30fe9a68e72e529fd0a76de468178652da1bba3b164eeb9f34df7d5d410
diff --git a/dev-python/simsimd/simsimd-4.3.1.ebuild b/dev-python/simsimd/simsimd-4.3.1.ebuild
deleted file mode 100644
index ede8569c67d3..000000000000
--- a/dev-python/simsimd/simsimd-4.3.1.ebuild
+++ /dev/null
@@ -1,64 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 toolchain-funcs
-
-MY_P=SimSIMD-${PV}
-DESCRIPTION="Fastest SIMD-Accelerated Vector Similarity Functions for x86 and Arm"
-HOMEPAGE="
-	https://github.com/ashvardanian/SimSIMD/
-	https://pypi.org/project/simsimd/
-"
-# no sdist, as of 4.3.1
-# https://github.com/ashvardanian/SimSIMD/issues/113
-SRC_URI="
-	https://github.com/ashvardanian/SimSIMD/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="openmp"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-repeat[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-src_prepare() {
-	# https://github.com/ashvardanian/SimSIMD/pull/115
-	sed -i -e '/-O3/d' -e 's:-lgomp:-fopenmp:' setup.py || die
-	if ! use openmp; then
-		sed -i -e '/-fopenmp/d' setup.py || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p repeat python/test.py
-}
diff --git a/dev-python/simsimd/simsimd-5.0.0.ebuild b/dev-python/simsimd/simsimd-5.0.0.ebuild
deleted file mode 100644
index ede8569c67d3..000000000000
--- a/dev-python/simsimd/simsimd-5.0.0.ebuild
+++ /dev/null
@@ -1,64 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 toolchain-funcs
-
-MY_P=SimSIMD-${PV}
-DESCRIPTION="Fastest SIMD-Accelerated Vector Similarity Functions for x86 and Arm"
-HOMEPAGE="
-	https://github.com/ashvardanian/SimSIMD/
-	https://pypi.org/project/simsimd/
-"
-# no sdist, as of 4.3.1
-# https://github.com/ashvardanian/SimSIMD/issues/113
-SRC_URI="
-	https://github.com/ashvardanian/SimSIMD/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="openmp"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-repeat[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-src_prepare() {
-	# https://github.com/ashvardanian/SimSIMD/pull/115
-	sed -i -e '/-O3/d' -e 's:-lgomp:-fopenmp:' setup.py || die
-	if ! use openmp; then
-		sed -i -e '/-fopenmp/d' setup.py || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p repeat python/test.py
-}
diff --git a/dev-python/simsimd/simsimd-5.1.3.ebuild b/dev-python/simsimd/simsimd-5.1.3.ebuild
new file mode 100644
index 000000000000..944fe4d547ec
--- /dev/null
+++ b/dev-python/simsimd/simsimd-5.1.3.ebuild
@@ -0,0 +1,63 @@
+# 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=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 toolchain-funcs
+
+MY_P=SimSIMD-${PV}
+DESCRIPTION="Fastest SIMD-Accelerated Vector Similarity Functions for x86 and Arm"
+HOMEPAGE="
+	https://github.com/ashvardanian/SimSIMD/
+	https://pypi.org/project/simsimd/
+"
+# no sdist, as of 4.3.1
+# https://github.com/ashvardanian/SimSIMD/issues/113
+SRC_URI="
+	https://github.com/ashvardanian/SimSIMD/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openmp"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-repeat[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+	fi
+}
+
+src_prepare() {
+	sed -i -e '/-O3/d' setup.py || die
+	if ! use openmp; then
+		sed -i -e '/-fopenmp/d' setup.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p repeat python/test.py
+}
diff --git a/dev-python/simsimd/simsimd-5.1.4.ebuild b/dev-python/simsimd/simsimd-5.1.4.ebuild
new file mode 100644
index 000000000000..57068eba549d
--- /dev/null
+++ b/dev-python/simsimd/simsimd-5.1.4.ebuild
@@ -0,0 +1,63 @@
+# 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=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 toolchain-funcs
+
+MY_P=SimSIMD-${PV}
+DESCRIPTION="Fastest SIMD-Accelerated Vector Similarity Functions for x86 and Arm"
+HOMEPAGE="
+	https://github.com/ashvardanian/SimSIMD/
+	https://pypi.org/project/simsimd/
+"
+# no sdist, as of 4.3.1
+# https://github.com/ashvardanian/SimSIMD/issues/113
+SRC_URI="
+	https://github.com/ashvardanian/SimSIMD/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openmp"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-repeat[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+	fi
+}
+
+src_prepare() {
+	sed -i -e '/-O3/d' setup.py || die
+	if ! use openmp; then
+		sed -i -e '/-fopenmp/d' setup.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p repeat python/test.py
+}
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index cc388b414df1..c2c3cde3fd9c 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1 @@
-DIST soupsieve-2.5.gh.tar.gz 104832 BLAKE2B 8f3f2079e3ac758bb4459529e92015348e628be37f828c14d6729505097f208a2d88c2d315e0ff8c33ff3fcec7fc670df38c0a685dfb492c8f40d5a95d5f9d18 SHA512 5b3bb1f8ea84c69a97b273c87f385513baf9f0c49f5cf822120e4a73c16801ad8eb65f7ac32f83091b3efac716b3a7097b7511273e7fb8079f49ca6caa238656
 DIST soupsieve-2.6.gh.tar.gz 105495 BLAKE2B 0d84abf1bdb5dde8884b1594cc588d4ccfa9df486149cf2f44784bfd86a6dd3a645e1ad319283837cc11d9c9bcdc8fa190b9315d0d2565c7ea0ebb5a887562fa SHA512 ee30c999721b93b3812270ed713d3450f460deac285472f939669bfa607dd195a1325e2e8cb86e233b693f7ff01a77eaf81035a1d4e7cd06a2ceb7db4ae88ea5
diff --git a/dev-python/soupsieve/soupsieve-2.5.ebuild b/dev-python/soupsieve/soupsieve-2.5.ebuild
deleted file mode 100644
index bf71993e5753..000000000000
--- a/dev-python/soupsieve/soupsieve-2.5.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
-
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="
-	https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/
-"
-SRC_URI="
-	https://github.com/facelessuser/soupsieve/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.6.ebuild b/dev-python/soupsieve/soupsieve-2.6.ebuild
index 21f240fe8095..bf71993e5753 100644
--- a/dev-python/soupsieve/soupsieve-2.6.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 04447c744e8b..ab1f34910969 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1 +1,3 @@
 DIST sphinx-autoapi-3.2.1.gh.tar.gz 68891 BLAKE2B b31db0f584498a96d3bf7e57fa92abd884d3b8bb8812236a8491685f0fc81d212e114ae1663e316ba7ba14dee082dd4aeab19941f3d6ab85de95399f3736f596 SHA512 e1920a79ce8954a9da1d33fd46e5c1968990e5cfd960a8c97ac344d3d6dd97c06dbbafb3144e67d223f6504b233e0cf59328f015d918264df12b00aed8e34f8f
+DIST sphinx-autoapi-3.3.0.gh.tar.gz 70367 BLAKE2B 8e4efd0722b8ffff31816839b88fc1dadd0bbb10143a2361cd040f5bafa806d128b288a0acd77b9cc881c7e45a47e2802f666486f07f705d0aa0312ae840da9c SHA512 fec162717137ff71d196feeecdb84a3fa953471c06a0bf8a586cc5d5f6ecece09b6ac20928039e8cfbd4eeb060e6cf0c1e633ffed2509ad760f1796bd1e10a47
+DIST sphinx-autoapi-3.3.1.gh.tar.gz 71304 BLAKE2B 0570a26bb22d8a2a37484e28e8d0ff6be9673a49cf8a569ea1808a0a04c6b061c740e0562de8ad351d56966c1e942624486e126f9a1adca0b6790eee2363e79e SHA512 322cba62d37d74ee5ed22787fad2959fbac0885b3066f5213fa57985ba062dfb0be7248356aef695beea371d4090bb591bf604fc0df2e3c56e835fcb6937e3dc
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.0.ebuild
new file mode 100644
index 000000000000..2dfb0a4c4c8b
--- /dev/null
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.0.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="A new approach to API documentation in Sphinx"
+HOMEPAGE="
+	https://sphinx-autoapi.readthedocs.io/
+	https://github.com/readthedocs/sphinx-autoapi/
+	https://pypi.org/project/sphinx-autoapi/
+"
+# sdist is missing docs, as of 2.1.0
+SRC_URI="
+	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND+="
+	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGELOG.rst )
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/python/test_pyintegration.py::TestPEP695::test_integration
+		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
+		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
+	)
+
+	distutils-r1_python_test
+}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
new file mode 100644
index 000000000000..2dfb0a4c4c8b
--- /dev/null
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="A new approach to API documentation in Sphinx"
+HOMEPAGE="
+	https://sphinx-autoapi.readthedocs.io/
+	https://github.com/readthedocs/sphinx-autoapi/
+	https://pypi.org/project/sphinx-autoapi/
+"
+# sdist is missing docs, as of 2.1.0
+SRC_URI="
+	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND+="
+	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGELOG.rst )
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/python/test_pyintegration.py::TestPEP695::test_integration
+		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
+		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
+	)
+
+	distutils-r1_python_test
+}
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 9b1aa0833b4a..d824597d6c2a 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1 +1,3 @@
 DIST sphinx_autodoc_typehints-2.2.3.tar.gz 40394 BLAKE2B eece3fd99898bf6c93561b0269a7cae2d9b5bd7868ef3d9cd61868b57b9435ef255731db7fdbde2cf05b1f1ed1c8864060fd15ad5b44bbd122f2c2d4fd264aeb SHA512 8a39129ae3e90703c7de8d25c7616256b4d203f6e3c6971f382265361236e7606fa16169e189ca47cd4f1dfdf27a98a16c7b92ce409e2431886e4dacd0159fcf
+DIST sphinx_autodoc_typehints-2.3.0.tar.gz 40709 BLAKE2B ef1b606cf6a643f87271fb033bac4d06f83b2be9f73b765064757ff0c1dceb2124841b2f6bb674deb20e39a4d19386fea8c85f0cdb417eeb3d84da19e2bf609e SHA512 f4ee3e0eb51fd63d4cf31f2eed9b9d06cc2dc48a3f3427763e86dba8910ea02c9e31bd8d30e8d0b3494e71fb104d51904400ce96d71270e1e422f44a317de80a
+DIST sphinx_autodoc_typehints-2.4.0.tar.gz 40568 BLAKE2B 7b56f034db042d027cb7ccfa3d1ef4f13fa22b22c536cebe42ec3f6da648c2d0578021b89fe4058326254a5900b6e6c9f5455cfcb9ea05cb1e7f6ec6adb0033d SHA512 eb3b11c4fcb1e12048662eec8179d877598f0ec2f34c15efcb4989a905c53442223f7265251f2be8afe5de151f09c342ccbc04f8392eb03bef41c98f1467ea30
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.3.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.3.0.ebuild
new file mode 100644
index 000000000000..f6053e2167f7
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
+"
+# skipping optional test dep on dev-python/nptyping as that package
+# is horribly broken and on its way out
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# this package is addicted to Internet
+		tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.0.ebuild
new file mode 100644
index 000000000000..f6053e2167f7
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
+"
+# skipping optional test dep on dev-python/nptyping as that package
+# is horribly broken and on its way out
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# this package is addicted to Internet
+		tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index e8adf338376c..70844fb77ceb 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1 @@
-DIST sphinx_gallery-0.16.0.tar.gz 432247 BLAKE2B 130800616a29be2daedb77404f79ca8d1543ecd391f45f8f19cbcf46ce742d02725d9b087be337d11496021b5c486c6c24b35f22b2c7d4cb575cb2c217d328db SHA512 b45e9141d64b1e277d75f501f2cc40979942953cd8412716e5af64917a3b9adc0a746fbd6249c3636c3db222c1e438ee7f9a9ad93f57b2f05f9ec80a562796c3
-DIST sphinx_gallery-0.17.0.tar.gz 461588 BLAKE2B 2f95724b184a2fe6359cf90c5200cebb80da8bd47160eb801069a396ddc6d889bd84a088899c2e0b461e81a6bf31ebbcebd4b555b83a3a5eebd11e48048ca2a3 SHA512 969bedefdb9231fd9fd92f1a8eb4488dbf6c8b68175e6869d0e893f1a6674bbf7b6e2b0281e54b929a3b2ca1d2928f75f00cb307100391656b6ebd62e8046b7a
 DIST sphinx_gallery-0.17.1.tar.gz 464013 BLAKE2B 42a0d6e9fca934bfaf234710acc800229ee2dfc4844d17a5c1774ee5e36f6e2f1fe2a0f636035a58b4f2ea5bf0643abf9f018026a1d3b552093f1814c7f7cbe3 SHA512 7d580e3e603f6778dbf47e3f46ade2e612596337e432ee0ca5b603c7e002f43b65e0258dda04d427613b2a3331466b7c852287937c4706fe0bdafa1e7804f9fa
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.16.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.16.0.ebuild
deleted file mode 100644
index 2d76d2361dbd..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.16.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://github.com/sphinx-gallery/sphinx-gallery/
-	https://sphinx-gallery.github.io/
-	https://pypi.org/project/sphinx-gallery/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
-		sphinx_gallery/tests/test_full.py::test_run_sphinx
-		sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
-		# require jupyterlite_sphinx
-		sphinx_gallery/tests/test_full.py
-		sphinx_gallery/tests/test_full_noexec.py
-		sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents
-		sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_non_default_contents
-		sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_with_jupyterlite_disabled_via_config
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.17.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.17.0.ebuild
deleted file mode 100644
index 5f967116b733..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.17.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://github.com/sphinx-gallery/sphinx-gallery/
-	https://sphinx-gallery.github.io/
-	https://pypi.org/project/sphinx-gallery/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
-		sphinx_gallery/tests/test_full.py::test_run_sphinx
-		sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
-		# require jupyterlite_sphinx
-		sphinx_gallery/tests/test_full.py
-		sphinx_gallery/tests/test_full_noexec.py
-		sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents
-		sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_non_default_contents
-		sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_with_jupyterlite_disabled_via_config
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.17.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.17.1.ebuild
index 5f967116b733..e641b83bfaea 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.17.1.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.17.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 0199b5855a29..71b542fcd68f 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,2 +1 @@
-DIST sphinx-prompt-1.8.0.gh.tar.gz 38424 BLAKE2B c469e2acfdad076afd472c30380a59aae4d719edce653794fd4d09a2c8008b7f67642ce2a740fb1408987243ba5d520e28b3dc4d7ec34899de6fcf57f2171456 SHA512 1acaa18066537adaab71eb900f0b0fb8041f8f25a9079e171b98b98106d5b7d1885e23bae2c1fd278bbf22c66d17238fbf386cb61fc5725475862aaf86d5701e
 DIST sphinx-prompt-1.9.0.gh.tar.gz 39458 BLAKE2B 16b646bd0e288da3d2f401650c3131c7c6b9fb27023617717821927c7bd8b8d031f14d82b7dd02c6603f3ece084e766a28022cc418867646d770886cdce538ce SHA512 f9ee34b86ead0eda791ba7d648ae54785c09ca276279197c4632963892a03080e547d1930743d81ddb3b327c912c70a58dea968b1da763c4875ec84014b207f8
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.8.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.8.0.ebuild
deleted file mode 100644
index f508d7f45965..000000000000
--- a/dev-python/sphinx-prompt/sphinx-prompt-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
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx directive to add unselectable prompt"
-HOMEPAGE="
-	https://github.com/sbrunner/sphinx-prompt/
-	https://pypi.org/project/sphinx-prompt/
-"
-SRC_URI="
-	https://github.com/sbrunner/sphinx-prompt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# version number relies on git repo, sigh
-	# also all dependencies are pinned to exact versions, sigh
-	# also huge hack to install package as "sphinx-prompt", sigh
-	sed -i \
-		-e "/^version =/s:[0-9.]\+:${PV}:" \
-		-e '/^\[tool\.poetry\.dependencies\]$/,$s:"[0-9.]\+:"*:' \
-		-e '/include.*sphinx-prompt/d' \
-		pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.9.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.9.0.ebuild
index 6daa0821df96..f508d7f45965 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.9.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch b/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch
deleted file mode 100644
index cb70e2cf89fc..000000000000
--- a/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ce86026f3b667949ef39f7fdab9a40941d99c5ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 11 May 2024 18:31:02 +0200
-Subject: [PATCH] DEPS: Lazy import `defusedxml` only when necessary (#12362)
-
-The `defusedxml` dependency was added to `sphinx.testing` in sphinx 7.3,
-but it is not part of the core sphinx dependencies, and not strictly necessary for the running of the pytest plugin.
-This commit moves the import into the only function which uses it,
-so that the pytest plugins can be used again without this dependency.
----
- sphinx/testing/util.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py
-index d1de8ea2b7..b2df709eea 100644
---- a/sphinx/testing/util.py
-+++ b/sphinx/testing/util.py
-@@ -11,7 +11,6 @@
- from types import MappingProxyType
- from typing import TYPE_CHECKING
- 
--from defusedxml.ElementTree import parse as xml_parse
- from docutils import nodes
- from docutils.parsers.rst import directives, roles
- 
-@@ -73,6 +72,8 @@ def assert_node(node: Node, cls: Any = None, xpath: str = "", **kwargs: Any) ->
- # keep this to restrict the API usage and to have a correct return type
- def etree_parse(path: str | os.PathLike[str]) -> ElementTree:
-     """Parse a file into a (safe) XML element tree."""
-+    from defusedxml.ElementTree import parse as xml_parse
-+
-     return xml_parse(path)
- 
- 
diff --git a/dev-python/sphinxcontrib-apidoc/Manifest b/dev-python/sphinxcontrib-apidoc/Manifest
index 30448b550920..3a78f521f7b0 100644
--- a/dev-python/sphinxcontrib-apidoc/Manifest
+++ b/dev-python/sphinxcontrib-apidoc/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-apidoc-0.4.0.tar.gz 15958 BLAKE2B 9cd806eb36cd2aa35c797b35e8e699c4a918e8e3d19e36ea9d79eb73dfce301a24ee33bc647ba180283837488aa00628b4882d08c3d492b196a4f663cad26f48 SHA512 1e33fd6df91adfb65ea511fe5ee55ccff9a237488cca406f46b33a2bf8eb69b884b274e9c94bfd868fef67b2e0dfbb19f5e2d62486c54a85755a9034ca5c715c
 DIST sphinxcontrib-apidoc-0.5.0.tar.gz 16117 BLAKE2B f486cfdf2cbf74c2ac35e688671f64d7e8a8d5b30c5e932036d1dcb2c58bd32b4bfeb14680311cf3dd1345b0548b0b083a1d30a667f934c08a2c2e431bdc2cdc SHA512 36858dab0915f4aac48b2bab1aeea830e35e1e865ff5f4726df0c9f9c2917d450ed1e27b1db9d143fade09369201b1b6b72f0264e674130f62a67df494c8f646
diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.4.0.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.4.0.ebuild
deleted file mode 100644
index 78b537d913ed..000000000000
--- a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2023 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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension for running sphinx-apidoc on each build"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-apidoc/
-	https://github.com/sphinx-contrib/apidoc/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/sphinx-5.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
index 352fb9ab8afb..c1c688cfae9e 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 9f723c1b75bf..a3cbe2ea28c6 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,2 +1,2 @@
 DIST spyder_kernels-2.5.2.tar.gz 99972 BLAKE2B 178f175fe03fd2b7871681ae30d10b62a4daf9ee606477eab4f88a4d81d2692b80cdcf4f9b6d46c4cfc0394b98d798e93dda870a3f1cbe6f77e243fd2b06d97c SHA512 4cf5462d6a6e72bf13f9890fbc5a4008788e132ee3315b0ad01a00beff6b78c63f47b7b5d19be601b64984196cc1a5c4706a4c5bbe878d938e487ae9ddd9f1fc
-DIST spyder_kernels-3.0.0b8.tar.gz 240231 BLAKE2B 65d37fcf58d9e5636b1f3463f51087f2157d0f50d0e57245e32f294a9986f1eb22a1f74418cb6e6e6f5f3b1e4960b1360da9eb331036790172e6a7acc44bcd0a SHA512 5ca4d8697a07f21a423a4f1cb222e34d0740c3f7f743241bd0d1a593e8a465bced847d86ff59587f3d39c17116518d5b41d9bfd3e84a7de75d63f65080c442a1
+DIST spyder_kernels-3.0.0.tar.gz 242868 BLAKE2B 7cf667ce42d9f0a1c6b0df337c98a702588c546eeedfeb8150cea560c7ba5f0049ccb76f1342584f7a6cf9bf400ed2d1dbbad12f5b39ae3a3343e3449aed3414 SHA512 42c176d6c8c410b375342c2fed07dd5ff6440e857dac06097d55c1f3d34bed6d51873833523b798316f100d3f226f78cf76d661a30c7e968683eaad622d5c994
diff --git a/dev-python/spyder-kernels/spyder-kernels-3.0.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-3.0.0.ebuild
new file mode 100644
index 000000000000..0ff0db0d70d8
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-3.0.0.ebuild
@@ -0,0 +1,92 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.29.3[${PYTHON_USEDEP}]
+	<dev-python/ipython-9[${PYTHON_USEDEP}]
+	>dev-python/ipython-8.13.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-client-9[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.9[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/h5py[${PYTHON_USEDEP}]
+			dev-python/pandas[${PYTHON_USEDEP}]
+			dev-python/xarray[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# we no longer package distributed, and also removed dependency on dask
+		spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+
+		# RuntimeError: There is no current event loop in thread 'MainThread'.
+		# https://bugs.gentoo.org/834893
+		spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
+		spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
+		spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
+		spyder_kernels/console/tests/test_console_kernel.py::test_runfile
+		spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
+		spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
+		spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
+
+		# pydicom only packaged in ::sci at the moment
+		spyder_kernels/utils/tests/test_iofuncs.py::test_load_dicom_files
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			# require pandas
+			spyder_kernels/utils/tests/test_nsview.py
+		)
+	fi
+
+	if ! has_version "dev-python/h5py[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			# require hdf5
+			spyder_kernels/utils/tests/test_iofuncs.py::test_save_load_hdf5_files
+			spyder_kernels/utils/tests/test_dochelpers.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/spyder-kernels/spyder-kernels-3.0.0_beta8.ebuild b/dev-python/spyder-kernels/spyder-kernels-3.0.0_beta8.ebuild
deleted file mode 100644
index 5f91c6584c02..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-3.0.0_beta8.ebuild
+++ /dev/null
@@ -1,86 +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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.29.3[${PYTHON_USEDEP}]
-	<dev-python/ipython-9[${PYTHON_USEDEP}]
-	>dev-python/ipython-8.13.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-client-9[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.9[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/h5py[${PYTHON_USEDEP}]
-			dev-python/pandas[${PYTHON_USEDEP}]
-			dev-python/xarray[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# we no longer package distributed, and also removed dependency on dask
-	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
-
-	# RuntimeError: There is no current event loop in thread 'MainThread'.
-	# https://bugs.gentoo.org/834893
-	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
-	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
-	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
-	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
-	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
-
-	# pydicom only packaged in ::sci at the moment
-	spyder_kernels/utils/tests/test_iofuncs.py::test_load_dicom_files
-)
-
-python_test() {
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_IGNORE=(
-			# requires pandas
-			spyder_kernels/utils/tests/test_nsview.py
-		)
-		EPYTEST_DESELECT+=(
-			# requires hdf5
-			spyder_kernels/utils/tests/test_iofuncs.py::test_save_load_hdf5_files
-			spyder_kernels/utils/tests/test_dochelpers.py
-		)
-	fi
-	distutils-r1_python_test
-}
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
index f9874ec5bd9d..0eb74801ffca 100644
--- a/dev-python/spyder-line-profiler/Manifest
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -1 +1,2 @@
 DIST spyder-line-profiler-0.3.2.gh.tar.gz 88725 BLAKE2B 9e15a9b88d1b36a39428e7eccafb7a2c3d3609aece2c6e5c2f379c9f9180093863472bd1e071b12bf313e7cb6ccd4993bb407785716cab2dda871a1ebd527d41 SHA512 fb2e86cc640c7cd32567852063845567634e7cec365f7f5f5f3d770316b9adabc0447d3ad8334411fe3894aeb086cde4f14b77fd3483c099296db7df15f0b46b
+DIST spyder-line-profiler-0.4.0.gh.tar.gz 89222 BLAKE2B 7b4b7d2e884c6843c03289fde1351640fa768d1ede3cb7287859968c81a2207864f8039dff68d4bdf5e5d1fbb622d67ed9b5c90efeb615f8eb6bd6ed37cbd1df SHA512 4210a5ce58f11fb6d1453c29c0b363b111e73e01feb58593d9a4b0e31c3ae8d158a4ae052e633f23ac4b78cb116b68610a2b38e7d686d8cc6ec183723f91ffe1
diff --git a/dev-python/spyder-line-profiler/spyder-line-profiler-0.4.0.ebuild b/dev-python/spyder-line-profiler/spyder-line-profiler-0.4.0.ebuild
new file mode 100644
index 000000000000..c06691818746
--- /dev/null
+++ b/dev-python/spyder-line-profiler/spyder-line-profiler-0.4.0.ebuild
@@ -0,0 +1,42 @@
+# 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 virtualx
+
+DESCRIPTION="Plugin to run the python line profiler from within the spyder editor"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-line-profiler/
+	https://pypi.org/project/spyder-line-profiler/
+"
+SRC_URI="
+	https://github.com/spyder-ide/spyder-line-profiler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/line-profiler[${PYTHON_USEDEP}]
+	dev-python/qtawesome[${PYTHON_USEDEP}]
+	>=dev-python/spyder-6[${PYTHON_USEDEP}]
+	<dev-python/spyder-7[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index d66a6430ff82..12e21c7932ba 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1 +1,2 @@
 DIST spyder-notebook-0.5.1.tar.gz 5546854 BLAKE2B ccdc93c948e6b4db005cf2433794008c65e9a56574db15cd5627f44938bcc2c865341f2417bcf000e27e3d19fe11b6eb6340e6225a682bf32b2cb06ca8f4605a SHA512 daf91361344f96db0ac855b80d17388bda7bf96eab280fba7ac406915dc9b5283c09e914c07342154ed2d0d23420b5e16923cf4ccddb090364db43cf606319f3
+DIST spyder_notebook-0.6.1.tar.gz 7118143 BLAKE2B d1893d96f91fb192eba13342edf67089ffa664b152b7777f3e626f8541ea2a2b7a20f1b73d72b55c2107abe02870cb63ee17b535dd13a3db882971b8c11eac33 SHA512 2bb7e4d1c4255cfb385e80bb46b3de7ae6c7fd4d4cdc27188cd530699cbc4654d2ace6e8341bc47b029d3e757dd860e2b0a65c2f00a91ae589032de86330cd84
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.6.1.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.6.1.ebuild
new file mode 100644
index 000000000000..8ef64dc0b0a0
--- /dev/null
+++ b/dev-python/spyder-notebook/spyder-notebook-0.6.1.ebuild
@@ -0,0 +1,58 @@
+# 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 virtualx
+
+DESCRIPTION="Jupyter notebook integration with Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/notebook-7.2[${PYTHON_USEDEP}]
+	<dev-python/notebook-8[${PYTHON_USEDEP}]
+	dev-python/qdarkstyle[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-6[${PYTHON_USEDEP}]
+	<dev-python/spyder-7[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( "README.md" "CHANGELOG.md" )
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Hangs
+	spyder_notebook/widgets/tests/test_main_widget.py::test_save_notebook
+	spyder_notebook/widgets/tests/test_main_widget.py::test_new_notebook
+	# Fails in sandbox
+	spyder_notebook/tests/test_plugin.py::test_open_console_when_no_kernel
+	spyder_notebook/widgets/tests/test_main_widget.py::test_shutdown_notebook_kernel
+	spyder_notebook/widgets/tests/test_main_widget.py::test_file_in_temp_dir_deleted_after_notebook_closed
+	# Some missing file
+	spyder_notebook/widgets/tests/test_main_widget.py::test_open_notebook_in_non_ascii_dir
+	spyder_notebook/widgets/tests/test_main_widget.py::test_close_nonexisting_notebook
+)
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2-r1.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..a9a34bd20851
--- /dev/null
+++ b/dev-python/spyder-terminal/spyder-terminal-1.2.2-r1.ebuild
@@ -0,0 +1,25 @@
+# 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
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Run system terminals inside Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
+
+LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-6[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.13.1[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
deleted file mode 100644
index 50e769c11544..000000000000
--- a/dev-python/spyder-terminal/spyder-terminal-1.2.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-inherit distutils-r1 pypi
-
-DESCRIPTION="Run system terminals inside Spyder"
-HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
-
-LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/coloredlogs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.13.1[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 0734087a0fe5..f09e83f417bd 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1 +1,2 @@
 DIST spyder-unittest-0.6.0.gh.tar.gz 105932 BLAKE2B b7a39e5756d27325bbe0dff32fb3922f667cdd1eb2c3a6d9e5eceb89abd921244fdf1685706bff181c75c59f86f92e405a1d08c5e86d7f15a27bfd46d32048ea SHA512 304843dcf6b51033a6acbc81a0ed274736d36967d95866075bb06a23487f29556256e39c213f685f5a6622743bba568814b5c099fa143e849fdb5608687f1c5c
+DIST spyder-unittest-0.7.0.gh.tar.gz 106314 BLAKE2B 7bb3cab3f0a405ccf292a9dc92038ab22bd7be322933c0e39ee26deb4dbbe4b3f038d4d104e566e48f46d98e502e129490529608aaa46e2f1e95c9141f795ae6 SHA512 3c404d9e5e6c7cb3a861c24b2cfa55077040bc95b7d9a8c84531e47d3fe7490cd84c6c713e302839b4fb715d6256e59f512e952b9781d9cbf31ee509f567d695
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.7.0.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.7.0.ebuild
new file mode 100644
index 000000000000..2b8efeaeda75
--- /dev/null
+++ b/dev-python/spyder-unittest/spyder-unittest-0.7.0.ebuild
@@ -0,0 +1,82 @@
+# 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 virtualx
+
+DESCRIPTION="Plugin for Spyder to run tests and view the results"
+HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/spyder-6[${PYTHON_USEDEP}]
+	<dev-python/spyder-7[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Hangs
+	spyder_unittest/widgets/tests/test_datatree.py::test_contextMenuEvent_calls_exec
+	# clicked() does not seem to work in emerge env
+	spyder_unittest/widgets/tests/test_confpage.py::test_unittestconfigpage
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_forwards_sig_edit_goto
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_set_config_emits_newconfig
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_set_config_does_not_emit_when_invalid
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_config_with_unknown_framework_invalid
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_process_finished_updates_results
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_replace_pending_with_not_run
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_tests_collected
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_tests_started
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_tests_collect_error
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_tests_yield_results
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_set_message
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_tests_starts_testrunner
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_tests_with_pre_test_hook_returning_true
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_tests_with_pre_test_hook_returning_false
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_process_finished_updates_status_label
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_process_finished_abnormally_status_label
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_unittestwidget_handles_sig_single_test_run_requested
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_tests_and_display_results
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_tests_using_unittest_and_display_results
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_tests_with_print_using_unittest_and_display_results
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_run_with_no_tests_discovered_and_display_results
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_stop_running_tests_before_testresult_is_received
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_show_versions
+	spyder_unittest/widgets/tests/test_unittestgui.py::test_get_versions
+
+	# Broken in Pyside2
+	spyder_unittest/tests/test_unittestplugin.py::test_menu_item
+	spyder_unittest/tests/test_unittestplugin.py::test_pythonpath_change
+	spyder_unittest/tests/test_unittestplugin.py::test_default_working_dir
+	spyder_unittest/tests/test_unittestplugin.py::test_plugin_config
+	spyder_unittest/tests/test_unittestplugin.py::test_go_to_test_definition
+
+	# Don't depend on nose2
+	spyder_unittest/backend/workers/tests/test_print_versions.py::test_get_nose2_info
+)
+
+EPYTEST_IGNORE=(
+	# Example test that somehow gets picked up
+	doc/example/test_foo.py
+)
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 761695c421c7..3b3e5cd9684b 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-5.5.5.gh.tar.gz 16258487 BLAKE2B 3fa3ea611fc3267918e4314027c0825905f256a7fe070534c7608a4a42938c3934f34f4dc06fe0cfc0ac32e03fbdc294974672b010aaf9bc32512b817af62e6b SHA512 5f5d25822f20f8ae8767402b037cca78b760768b9bc53ef74ed95839aa59e1c24206457fd4c71003bb9ebffe8daf8ad3bda8dd40e71cc15d3d3ee2030b284b42
-DIST spyder-6.0.0_rc1.gh.tar.gz 15673894 BLAKE2B a9cd90bb12ec4d11b6a92185b2ff115f9d94e015a354022452d3592c53170fa59826f95d33709041c947ce780fa5368cb45cda3e8e04900f2bcd235706456c8f SHA512 2870f12bd830d1f4e6ff5c8af3cfce670c7134ea975b7e09d6f1e69ec0ca32357150fc2da69fcc7ed29bd7bfc504b211bc9faaea0f7fdcbb161e528baf7c70f9
-DIST spyder-docs-32efdaebc11dab0b8e0767717342b7d306dc06ea.gh.tar.gz 94897009 BLAKE2B 30e0b42e34bddb60d8fc986183a363b71455067bc7f4411cb75a00c5758e87501ee07ad0b484caed2aa3cf91153be814c7faf935be8665b6984bce38ebcd0be2 SHA512 9f9aa56ab27aed8d27c3d653119d5c5454b4317a78a7ff27715d91cac9dec79143db85d4f1c87b10fa821eb33abc043912df308fa6c84ade59539bd633eefbd2
+DIST spyder-5.5.6.gh.tar.gz 16304234 BLAKE2B 9d14b96901276ced1644eef8dd57539036aecb067ee361b6581368b371d56b2008350969224992a35fe10ee177babca7f3e941f43b4cc3f432f6d0dec9104ead SHA512 93ce6ac2e71bd4e81ca4a630a6fe152d1bf3c83d6e5c01dda8f3e5ad2735de1948a86642f5bc589c90616935e997526b26367ce178905ad2b80faf81f36f9164
+DIST spyder-6.0.0.gh.tar.gz 15687128 BLAKE2B 23319f167eb61fecc477dd3b3deab2d62a1c12109033f262ba31e349b26ba92524bde0399ca2f8ae6ff6bbcbf400360882b92b888644b9d9767f5d894e5c06b6 SHA512 3445481df35707e103646ada5fb7eef94b1b36fdbec31e15d3cb7608f637fcf21238fec0f5747f8c7a1b5bb9770ed5355b4f0fab0f9db57bc888306c6a14c003
+DIST spyder-docs-6951e02799fc7cd1f29456f1d93cfdcb570dad27.gh.tar.gz 93033557 BLAKE2B 395dd2a8ddb6e1b1408ba46cbe0fa452c1f2e69da1f3b6176401ff7395ace1463e63c696e13ee0b79f992b0ceca86228ad113f95ed7873db1b970452bc679f89 SHA512 c631e720e3ca49413482df294fb032285cf217ba94de299c37cb073e4e2bdeb629d16a139db17c569c74c628c50789c90d6085383886d32fa26b942711ccedc0
diff --git a/dev-python/spyder/spyder-5.5.5.ebuild b/dev-python/spyder/spyder-5.5.5.ebuild
deleted file mode 100644
index 4361d553e778..000000000000
--- a/dev-python/spyder/spyder-5.5.5.ebuild
+++ /dev/null
@@ -1,193 +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 optfeature virtualx xdg
-
-# Commit of documentation to fetch
-DOCS_PV="32efdaebc11dab0b8e0767717342b7d306dc06ea"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/python-lsp-black-3[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-3.2[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.3[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
-	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},pyqt5,svg,webengine]
-	>=dev-python/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.5.2[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-order[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP},pyside2,pyqt5]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-lsp-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
-	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
-	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
-	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
-	# Do not depend on ipython, this dependency is carried in spyder-kernels
-	# The explicit version requirements only make things more complicated, if e.g.
-	# pyls-spyder gains compatibility with a newer version of python-lsp-server
-	# in a new release it will take time for this information to propagate into
-	# the next spyder release. So just remove the dependency and let the other
-	# ebuilds handle the version requirements to speed things up and prevent
-	# issues such as Bug 803269.
-	sed -i \
-		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
-		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
-		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
-		-e "/'parso[ 0-9<=>.,]*',/d" \
-		-e "/'jedi[ 0-9<=>.,]*',/d" \
-		-e "/'pylint[ 0-9<=>.,]*',/d" \
-			setup.py || die
-		# -e "/'ipython[ 0-9<=>.,]*',/d" \
-
-	sed -i \
-		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
-		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
-		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
-		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
-		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
-			spyder/dependencies.py || die
-		# -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
-
-	# do not check deps, fails because we removed dependencies above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly somehow passes the pytest arguments to spyder
-# causing an invalid argument error
-python_test() {
-	virtx "${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	# Plugins with no release yet:
-	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
-	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
-}
diff --git a/dev-python/spyder/spyder-5.5.6.ebuild b/dev-python/spyder/spyder-5.5.6.ebuild
new file mode 100644
index 000000000000..adff8e0dbaa0
--- /dev/null
+++ b/dev-python/spyder/spyder-5.5.6.ebuild
@@ -0,0 +1,193 @@
+# 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 optfeature xdg #virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="6951e02799fc7cd1f29456f1d93cfdcb570dad27"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-lsp-black-3[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-3.2[${PYTHON_USEDEP}]
+	<dev-python/qdarkstyle-3.3[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
+	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},pyqt5,svg,webengine]
+	>=dev-python/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.5.2[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+# BDEPEND="
+# 	test? (
+# 		dev-python/cython[${PYTHON_USEDEP}]
+# 		dev-python/flaky[${PYTHON_USEDEP}]
+# 		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+# 		dev-python/pandas[${PYTHON_USEDEP}]
+# 		dev-python/pillow[${PYTHON_USEDEP}]
+# 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+# 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+# 		dev-python/pytest-order[${PYTHON_USEDEP}]
+# 		dev-python/pytest-qt[${PYTHON_USEDEP}]
+# 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+# 		dev-python/pyyaml[${PYTHON_USEDEP}]
+# 		dev-python/QtPy[${PYTHON_USEDEP},pyside2,pyqt5]
+# 		dev-python/scipy[${PYTHON_USEDEP}]
+# 		dev-python/sympy[${PYTHON_USEDEP}]
+# 	)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+# distutils_enable_tests pytest
+# TODO: Package sphinx-design
+# distutils_enable_sphinx docs/doc \
+# 	dev-python/sphinx-panels \
+# 	dev-python/pydata-sphinx-theme \
+# 	dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# Do not depend on ipython, this dependency is carried in spyder-kernels
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
+		# -e "/'ipython[ 0-9<=>.,]*',/d" \
+
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+		# -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
+
+	# do not check deps, fails because we removed dependencies above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly somehow passes the pytest arguments to spyder
+# causing an invalid argument error
+# python_test() {
+# 	virtx "${EPYTHON}" runtests.py
+# }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
+	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	# Plugins with no release yet:
+	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
+	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
+}
diff --git a/dev-python/spyder/spyder-6.0.0.ebuild b/dev-python/spyder/spyder-6.0.0.ebuild
new file mode 100644
index 000000000000..14599f036609
--- /dev/null
+++ b/dev-python/spyder/spyder-6.0.0.ebuild
@@ -0,0 +1,195 @@
+# 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 optfeature xdg #virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="6951e02799fc7cd1f29456f1d93cfdcb570dad27"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}]
+	>=dev-python/asyncssh-2.14.0[${PYTHON_USEDEP}]
+	<dev-python/asyncssh-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyGithub-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-lsp-black-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyuca-1.2[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-3.2.0[${PYTHON_USEDEP}]
+	<dev-python/qdarkstyle-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
+	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.4.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/superqt-0.6.2[${PYTHON_USEDEP}]
+	<dev-python/superqt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.9.4[${PYTHON_USEDEP}]
+"
+
+# BDEPEND="
+# 	test? (
+# 		dev-python/cython[${PYTHON_USEDEP}]
+# 		dev-python/flaky[${PYTHON_USEDEP}]
+# 		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+# 		dev-python/pandas[${PYTHON_USEDEP}]
+# 		dev-python/pillow[${PYTHON_USEDEP}]
+# 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+# 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+# 		dev-python/pytest-order[${PYTHON_USEDEP}]
+# 		dev-python/pytest-qt[${PYTHON_USEDEP}]
+# 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+# 		dev-python/pyyaml[${PYTHON_USEDEP}]
+# 		dev-python/QtPy[${PYTHON_USEDEP}]
+# 		dev-python/scipy[${PYTHON_USEDEP}]
+# 		dev-python/sympy[${PYTHON_USEDEP}]
+# 	)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+# distutils_enable_tests pytest
+# TODO: Package sphinx-design
+# distutils_enable_sphinx docs/doc \
+# 	dev-python/sphinx-panels \
+# 	dev-python/pydata-sphinx-theme \
+# 	dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# Do not depend on ipython, this dependency is carried in spyder-kernels
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
+		# -e "/'ipython[ 0-9<=>.,]*',/d" \
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+		# -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
+
+	# do not check deps, fails because we removed dependencies above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly somehow passes the pytest arguments to spyder
+# causing an invalid argument error
+# python_test() {
+# 	virtx "${EPYTHON}" runtests.py
+# }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
+	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	# Plugins with no release yet:
+	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
+	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
+}
diff --git a/dev-python/spyder/spyder-6.0.0_rc1.ebuild b/dev-python/spyder/spyder-6.0.0_rc1.ebuild
deleted file mode 100644
index 8a3dcedc74eb..000000000000
--- a/dev-python/spyder/spyder-6.0.0_rc1.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..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 optfeature virtualx xdg
-
-# Commit of documentation to fetch
-DOCS_PV="32efdaebc11dab0b8e0767717342b7d306dc06ea"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV//_rc/rc}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${PV//_rc/rc}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	>=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}]
-	>=dev-python/asyncssh-2.14.0[${PYTHON_USEDEP}]
-	<dev-python/asyncssh-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyGithub-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/python-lsp-black-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyuca-1.2[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-3.2.0[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
-	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.4.0[${PYTHON_USEDEP},svg,webengine]
-	>=dev-python/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-3.0.0_beta8[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-3.0.0_beta9[${PYTHON_USEDEP}]
-	>=dev-python/superqt-0.6.2[${PYTHON_USEDEP}]
-	<dev-python/superqt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.9.4[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-order[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-lsp-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
-	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
-	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
-	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
-	# Do not depend on ipython, this dependency is carried in spyder-kernels
-	# The explicit version requirements only make things more complicated, if e.g.
-	# pyls-spyder gains compatibility with a newer version of python-lsp-server
-	# in a new release it will take time for this information to propagate into
-	# the next spyder release. So just remove the dependency and let the other
-	# ebuilds handle the version requirements to speed things up and prevent
-	# issues such as Bug 803269.
-	sed -i \
-		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
-		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
-		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
-		-e "/'parso[ 0-9<=>.,]*',/d" \
-		-e "/'jedi[ 0-9<=>.,]*',/d" \
-		-e "/'pylint[ 0-9<=>.,]*',/d" \
-			setup.py || die
-		# -e "/'ipython[ 0-9<=>.,]*',/d" \
-	sed -i \
-		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
-		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
-		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
-		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
-		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
-			spyder/dependencies.py || die
-		# -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
-
-	# do not check deps, fails because we removed dependencies above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly somehow passes the pytest arguments to spyder
-# causing an invalid argument error
-python_test() {
-	virtx "${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	# Plugins with no release yet:
-	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
-	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 307ff3edc45b..403e79435a28 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,5 @@
-DIST SQLAlchemy-1.4.52.tar.gz 8514200 BLAKE2B b41fccb885ce6761e29621a654c97537610a1875d66302ba56fac560f5c85db35b14595efd903aebfd0186ee39b75a8666e1304cdee6a6ec6eb9923bc602b9e5 SHA512 afda6a3503c9d2baba8c1dd9e7216d5ac1561f52f5f11009c41a1a98ac998643c980c60cf8ba4d84c4af8808be26ead9fd2e7a2c8bf15b2fdb521b4e5de7748e
 DIST SQLAlchemy-1.4.53.tar.gz 8468030 BLAKE2B fd03cd7a1a8f26b22d33cee038e6e15c59ba24e32a4465e3e3cda74583a333e627b732f5532aaa2c0fc3356a96dab8efbc4f6a51275315f78451d63a4ec20bbf SHA512 2a33b2c0348efbf312994394da3dac0f86be60e9e0929ce96117a02f49d9e06388ec5b016c1bf229f89d5ee561cbdcf8526b9c33428b7041923cd5d73d87a88c
-DIST SQLAlchemy-2.0.29.tar.gz 9543967 BLAKE2B 04425618b6e0bcf98a7a32a4a6b1c092120a9f3eb55761879b072ac3a3e08c8f1b97fb4d2df4b35b2fd810e11146f4d83cf67cd8ec23fb4d96c5d6cfff7657af SHA512 d1143c65fb26335d652083b9a90afaecf78ed312cea5c26f989380204e909c341c1bc3bb1e07274353e1c409d21737fad4d7391f186b2d2373814582d3baaf78
-DIST SQLAlchemy-2.0.30.tar.gz 9579500 BLAKE2B 3c1711ee72a355eb5e6a71d6581d951ffe3ddab459ac4bb4c36a8640ed5f6298a80847e9bb66dd700622fa9275bf77c4c18be5e324092a576d1b35983371730a SHA512 b39275a7312609fd0a78ac5bb4fb0f29f2948d7fc81007587c01f38849ff28bff273182a06c8ec830b7e1ba4cd30aea2cd7214bbf971a61125c9b56c6ddbbe52
-DIST SQLAlchemy-2.0.31.tar.gz 9524110 BLAKE2B 521137ceaedd91a063bd336001e25a2946a3fefbc61c619b9b18c32f6e4dd2ff541e7cf3f0e0144024c0a6fe2c7aec743d1315b66c7da752d47abd81a6ab8ab4 SHA512 2e5f559ee2d1f28003a7436a6cb1997f22348447765422f4847adb3c5fc20b759d8c5c99ad4dae1c1f7863f3bc72f699e19b48d7797917a9a64ff4050e61d3d1
 DIST SQLAlchemy-2.0.32.tar.gz 9546691 BLAKE2B b6b28fa513e9dc6066db210cee8cbc94dd7c5dfd4f391d4a0ac6987241213afa547458b99df6373b2d1771e264fcedd1186fbd5a483382a7d09185f0f2fa9052 SHA512 12ac1804ba2ad9218d5307f4da87bf7c78b75525bd4b32770e77326eff6fc2ea679e595a1d367f8def3ab7e02ca954622ff16490c277ba6b8edca21efda7da62
+DIST sqlalchemy-1.4.54.tar.gz 8470350 BLAKE2B 0d97beb4edde38455c03dfc1238655d1cb63aa6e042b941913ec68dca3654de07087ab967f208fda495f048a5068ced70d642c4b8b80ab32e5346fcefa3bf9bc SHA512 e7ea4920d81914d362134a3c6fd4a2dd4fdb75f6ce17358528d568e2b2ac0ee711a71f6beb894e61d6d1e4e5833034ebde651d73a13f873c682f780e1831b427
+DIST sqlalchemy-2.0.33.tar.gz 9555649 BLAKE2B cc76c9cd61805089bc32d49c183a4b8d2be1f8def08fdbf7c516174c3bae7baf8fa6c99e5e059e93f6c1b76244b3e319e3aa2e65f38a8ebb2378d21e02cd6f27 SHA512 d6b830897216cab8df4f337e21634b7df9aa722294ee9945a28a549d8c423716146b2f7b9bb23c276f413c3b8c388c3502fa6301fe4d1cedc5266a687e571a47
+DIST sqlalchemy-2.0.34.tar.gz 9556527 BLAKE2B cefe606a05f99cc1f4522022969c503b46192092602ce26474f09bf3710d98618876aa34ffbb6da4e1bf4c3d11e9bb6ca58eac7a04ecae7f26c58427e482f503 SHA512 fd585ed9a78a86deaab1f84b5ff29f37120c08f3c8c93566786b73d74ce67f1f71097e43d42b0999be1aca493ae1c55d5a0c2d49386b65dcca566c036401232b
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-2.0.30-py313.patch b/dev-python/sqlalchemy/files/sqlalchemy-2.0.30-py313.patch
deleted file mode 100644
index 6c519d2a205e..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-2.0.30-py313.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
-index c97fa7d..9a02e7d 100644
---- a/lib/sqlalchemy/util/langhelpers.py
-+++ b/lib/sqlalchemy/util/langhelpers.py
-@@ -1657,6 +1657,8 @@
-         items: List[symbol]
-         cls._items = items = []
-         for k, v in dict_.items():
-+            if re.match(r"^__.*__$", k):
-+                continue
-             if isinstance(v, int):
-                 sym = symbol(k, canonical=v)
-             elif not k.startswith("_"):
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.52.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.52.ebuild
deleted file mode 100644
index f49b7af7463a..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.52.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-
-		# TODO
-		'test/orm/test_cache_key.py::EmbeddedSubqTest::test_cache_key_gen[memory-_exclusions1]'
-
-		# deprecations
-		test/engine/test_parseconnect.py::TestRegNewDBAPI::test_wrapper_hooks
-		test/engine/test_parseconnect.py::URLTest::test_component_set
-		test/engine/test_parseconnect.py::URLTest::test_password_custom_obj
-		test/engine/test_parseconnect.py::URLTest::test_update_query_dict
-		test/engine/test_parseconnect.py::URLTest::test_update_query_string
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
-		test/orm/test_query.py::YieldTest_sqlite+pysqlite_${sqlite_version//./_}::test_yield_per_close_on_interrupted_iteration_legacy
-	)
-	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::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	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
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	# note that we can't use xdist because it causes nodes to randomly
-	# crash on init
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-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/sqlalchemy/sqlalchemy-1.4.53.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.53.ebuild
index 74ef3364ffbd..c0eebfd288af 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.53.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.53.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
new file mode 100644
index 000000000000..fe97a2309bc3
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
@@ -0,0 +1,105 @@
+# 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=SQLAlchemy
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+
+		# TODO
+		'test/orm/test_cache_key.py::EmbeddedSubqTest::test_cache_key_gen[memory-_exclusions1]'
+
+		# deprecations
+		test/engine/test_parseconnect.py::TestRegNewDBAPI::test_wrapper_hooks
+		test/engine/test_parseconnect.py::URLTest::test_component_set
+		test/engine/test_parseconnect.py::URLTest::test_password_custom_obj
+		test/engine/test_parseconnect.py::URLTest::test_update_query_dict
+		test/engine/test_parseconnect.py::URLTest::test_update_query_string
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
+		test/orm/test_query.py::YieldTest_sqlite+pysqlite_${sqlite_version//./_}::test_yield_per_close_on_interrupted_iteration_legacy
+	)
+	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::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	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
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+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/sqlalchemy/sqlalchemy-2.0.29.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.29.ebuild
deleted file mode 100644
index 7d275169242d..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.29.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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
-			)
-			;;
-	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 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-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/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
deleted file mode 100644
index 894015ec114c..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
+++ /dev/null
@@ -1,124 +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} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://gerrit.sqlalchemy.org/c/sqlalchemy/sqlalchemy/+/5308
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	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
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# deprecated and broken with py3.13
-				test/ext/test_serializer.py
-				# TODO
-				test/orm/test_mapper.py::MapperTest::test_synonym_nonexistent_attr
-			)
-			;;
-	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 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-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/sqlalchemy/sqlalchemy-2.0.30.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.30.ebuild
deleted file mode 100644
index 0ea36df4e9dc..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.30.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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
-			)
-			;;
-	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 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-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/sqlalchemy/sqlalchemy-2.0.31.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.31.ebuild
deleted file mode 100644
index 51f822e582d8..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.31.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
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-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 ~ia64 ~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
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# deprecated and broken with py3.13
-				test/ext/test_serializer.py
-				# TODO
-				test/orm/test_mapper.py::MapperTest::test_synonym_nonexistent_attr
-			)
-			;;
-	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/sqlalchemy/sqlalchemy-2.0.32.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.32.ebuild
index 14b52790ee8b..422e1d2def55 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.32.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.32.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.33.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.33.ebuild
new file mode 100644
index 000000000000..c0927a51cf26
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.33.ebuild
@@ -0,0 +1,109 @@
+# 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=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 ~ia64 ~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/sqlalchemy/sqlalchemy-2.0.34.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.34.ebuild
new file mode 100644
index 000000000000..c0927a51cf26
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.34.ebuild
@@ -0,0 +1,109 @@
+# 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=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 ~ia64 ~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 fd646b4cedf3..3aa61c0c06d6 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -19,8 +19,9 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
-DIST sqlglot-25.12.0.tar.gz 19158536 BLAKE2B 33c6fee914163c7de2c3ec4b478463d31daee8090718563c0878377204d4a831e44fea5eea30ec34e1ebba22c0e4bdcb3f75783aefc010717fd10dfb27bf78b9 SHA512 51f2a637018b5f92aaf6829569977a55f0471e37e71428b5630e88f775e610d93c43b0b8978720589da5087175c38b87355c932a9da926b2b6e8cde6054efe5c
-DIST sqlglot-25.13.0.tar.gz 19167499 BLAKE2B 0d54e5f1902ccbf93be372d6017f616add8285f0f02e5d56bd0deabbebe812012d6f582e4176683b786ac9bdc258450a6d25675ede4423dce894f69d387e9c6a SHA512 f242135d6df8c220ab3b569ebd80d4bfad27c95f92aeff28c87ba6e0a2488ab924198a4eaf9c50ad6dd675ae3f529f49416bfb6d8c3634629f6aabc02002edcd
+DIST sqlglot-25.18.0.tar.gz 19311133 BLAKE2B 7dee7eab72ae3918fd7f72dfc6b7037b4883e0cb746b04009b3cfda115fc9af72acc1cabdafeb693a26c21831afbaaf8c4e303aa73953299e68c9f111724adff SHA512 5e56c79a63a429bcbfc11397d4ba629223bdf69ac9935da2c8ea68a1829ea73b521d97f87364860eb0638b1711305e42186955b763692d3e77749f2b10008a21
+DIST sqlglot-25.19.0.tar.gz 19341617 BLAKE2B cd8d3a844dd15e573f4a918fbe6149f0a1b69ce24601b04e4c17afc60d6fd6d6ecdbfc799f0b4197d6d9b1d5e2ef1b15a567654a6eb666fd6b45f6138425affb SHA512 4b24a710d5c044f9f70440515dc6861363344009962463202141132740840e22ac872e239454e09ea90ed176bcaf4a192d4876c489f3457f67b1b00734f5365e
+DIST sqlglot-25.20.1.tar.gz 19429085 BLAKE2B 65162c038fc19fe28e6cbd278d963477f5726967290d832e4e3bfad3ed2e2a38fa99aa08a0d6da31e924aa194473e5528b9566f6a34ac680d2e4483d69004f3f SHA512 9be8eae145a62723e83b2d2143578589d97ead26ccfd2e339f1de18d44fb808e6a9dca86bca5804f2d721bec586c0a7a31c56342a35c28cfd679990afd1f4e54
 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
 DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
diff --git a/dev-python/sqlglot/sqlglot-25.12.0.ebuild b/dev-python/sqlglot/sqlglot-25.12.0.ebuild
deleted file mode 100644
index 3ecfcc322a3e..000000000000
--- a/dev-python/sqlglot/sqlglot-25.12.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.13.0.ebuild b/dev-python/sqlglot/sqlglot-25.13.0.ebuild
deleted file mode 100644
index 3ecfcc322a3e..000000000000
--- a/dev-python/sqlglot/sqlglot-25.13.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.18.0.ebuild b/dev-python/sqlglot/sqlglot-25.18.0.ebuild
new file mode 100644
index 000000000000..456b6e98cfce
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-25.18.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+CARGO_OPTIONAL=1
+CRATES="
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	heck@0.4.1
+	indoc@2.0.4
+	libc@0.2.150
+	lock_api@0.4.11
+	memoffset@0.9.0
+	once_cell@1.19.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	proc-macro2@1.0.70
+	pyo3-build-config@0.20.0
+	pyo3-ffi@0.20.0
+	pyo3-macros-backend@0.20.0
+	pyo3-macros@0.20.0
+	pyo3@0.20.0
+	quote@1.0.33
+	redox_syscall@0.4.1
+	scopeguard@1.2.0
+	smallvec@1.11.2
+	syn@2.0.41
+	target-lexicon@0.12.12
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+"
+
+inherit cargo distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="MIT"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
+LICENSE+=" )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	# remove fragile timing check
+	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use native-extensions; then
+		local DISTUTILS_USE_PEP517=maturin
+		cd sqlglotrs || die
+		distutils-r1_python_compile
+		cd - >/dev/null || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_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-25.19.0.ebuild b/dev-python/sqlglot/sqlglot-25.19.0.ebuild
new file mode 100644
index 000000000000..456b6e98cfce
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-25.19.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+CARGO_OPTIONAL=1
+CRATES="
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	heck@0.4.1
+	indoc@2.0.4
+	libc@0.2.150
+	lock_api@0.4.11
+	memoffset@0.9.0
+	once_cell@1.19.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	proc-macro2@1.0.70
+	pyo3-build-config@0.20.0
+	pyo3-ffi@0.20.0
+	pyo3-macros-backend@0.20.0
+	pyo3-macros@0.20.0
+	pyo3@0.20.0
+	quote@1.0.33
+	redox_syscall@0.4.1
+	scopeguard@1.2.0
+	smallvec@1.11.2
+	syn@2.0.41
+	target-lexicon@0.12.12
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+"
+
+inherit cargo distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="MIT"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
+LICENSE+=" )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	# remove fragile timing check
+	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use native-extensions; then
+		local DISTUTILS_USE_PEP517=maturin
+		cd sqlglotrs || die
+		distutils-r1_python_compile
+		cd - >/dev/null || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_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-25.20.1.ebuild b/dev-python/sqlglot/sqlglot-25.20.1.ebuild
new file mode 100644
index 000000000000..456b6e98cfce
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-25.20.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+CARGO_OPTIONAL=1
+CRATES="
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	heck@0.4.1
+	indoc@2.0.4
+	libc@0.2.150
+	lock_api@0.4.11
+	memoffset@0.9.0
+	once_cell@1.19.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	proc-macro2@1.0.70
+	pyo3-build-config@0.20.0
+	pyo3-ffi@0.20.0
+	pyo3-macros-backend@0.20.0
+	pyo3-macros@0.20.0
+	pyo3@0.20.0
+	quote@1.0.33
+	redox_syscall@0.4.1
+	scopeguard@1.2.0
+	smallvec@1.11.2
+	syn@2.0.41
+	target-lexicon@0.12.12
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+"
+
+inherit cargo distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="MIT"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
+LICENSE+=" )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	# remove fragile timing check
+	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use native-extensions; then
+		local DISTUTILS_USE_PEP517=maturin
+		cd sqlglotrs || die
+		distutils-r1_python_compile
+		cd - >/dev/null || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_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/srt/srt-3.5.3.ebuild b/dev-python/srt/srt-3.5.3.ebuild
index 0f624a0b9fb9..3f0538248b18 100644
--- a/dev-python/srt/srt-3.5.3.ebuild
+++ b/dev-python/srt/srt-3.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="!dev-python/pysrt"
 BDEPEND="
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index f17d3e6dd416..991c6c7af7d2 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1 +1,3 @@
 DIST starlette-0.38.2.gh.tar.gz 2847558 BLAKE2B 8416b4c0ab06be3cd0a90916cbd6682f28f4f09ed38bac0558fd6293bc4e1069c5d09a2a3e6ecc62522290db1dd05e4828eaceab96d547947bffb6d464364aa5 SHA512 5594f2f073662250cd7ca47bf835af09b77decd78b5e2f2a5e25fc87e3e59ccc61e6c07ad854feda11b1af8535744557d70778d2c57d01554756f8da10678a97
+DIST starlette-0.38.4.gh.tar.gz 2571795 BLAKE2B 0a4d9856b3bf51a2d86b36bec74df7845209d0e6b0cc5865180d498e60b5d29ad8fe32e5137c3b7f6e69ee805f3fa2544c338715401fcb6cb46aaf7030e3334f SHA512 853b1562f90f487306c23753b4ec41f099b3115bdc64a5b87d0db43374ce86a6546c4845fcd924965a7566ca7b52e6ab768825bb05830967f7f860e3a32a00ac
+DIST starlette-0.38.5.gh.tar.gz 2569392 BLAKE2B 9ad32478b22cc743652eda43ad71e6b43af9a1c9b42614a16b5fbae282cfdf5e1c092717bb35711d256e75249cf8705d3545289236c78382673f87a9706b7599 SHA512 1ad5ddb497eb35c8b0b2569218b7e98cb4bee0fc2497912aa86bc75fd894264f8d30c886313cc4aa6dd02a24197d71dbd0640b7e2f0a472ce1002ee5cba5ae59
diff --git a/dev-python/starlette/starlette-0.38.4.ebuild b/dev-python/starlette/starlette-0.38.4.ebuild
new file mode 100644
index 000000000000..41aa434becfa
--- /dev/null
+++ b/dev-python/starlette/starlette-0.38.4.ebuild
@@ -0,0 +1,56 @@
+# 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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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/jinja[${PYTHON_USEDEP}]
+	>=dev-python/python-multipart-0.0.7[${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.38.5.ebuild b/dev-python/starlette/starlette-0.38.5.ebuild
new file mode 100644
index 000000000000..41aa434becfa
--- /dev/null
+++ b/dev-python/starlette/starlette-0.38.5.ebuild
@@ -0,0 +1,56 @@
+# 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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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/jinja[${PYTHON_USEDEP}]
+	>=dev-python/python-multipart-0.0.7[${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/stevedore/Manifest b/dev-python/stevedore/Manifest
index d9d4b9225c92..b95d33200c53 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1 +1 @@
-DIST stevedore-5.2.0.tar.gz 513817 BLAKE2B 598e479c18a01fb315f43d0257d555ab7d5c3a67833d3af1f38ac2d0e911e14c3927381b50827d40ae63bdd189c0095daec73daa8bd3cf815aacc6b2d6c813c6 SHA512 ab7afe7d238b7cf1ecdc0cce0b60f0bddc1b59c28c126006bc49c7dbdfa7991fc3813822502ecb4952226b9caf5a80a2809f3b5bd910525c1feab336a5017d26
+DIST stevedore-5.3.0.tar.gz 513768 BLAKE2B 7220e422b4b84bfc236d77707ff79eefab3724f98f253f9d94761941cdc7d47f7a2a9cd428810d16189bf1bbd51f899c3c5d6492f06397a422efc4067fdd0558 SHA512 b08ba776a03ea5776d73ff6ef2aa0bca7de05c3228172bcec6eb438cec8f64ff821d7fe5b34873822522d51f71532ba9c182a396a915459966ffdbc3cada20bb
diff --git a/dev-python/stevedore/stevedore-5.2.0.ebuild b/dev-python/stevedore/stevedore-5.3.0.ebuild
index 6438a098ad6e..6438a098ad6e 100644
--- a/dev-python/stevedore/stevedore-5.2.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.3.0.ebuild
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 2ac79458bbd2..1e59c10afe2e 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1,3 @@
-DIST stripe-10.5.0.tar.gz 1301564 BLAKE2B 5cc9175c52bfadb0fc05528b406090f72215d2b27eefa51336508a74dd348d37d51b93e0e898ba22b1102316b95643bad6b0ca0e1ef84c8053b98a34ed496698 SHA512 c320c9f6b77ce38ef4182607168c811d512ba12d080c8f1c4f61fbdef6adaa2c955078e333715343e0bf796826e9d303a45765e1e67aee518a3cd6ffbfb801b4
-DIST stripe-10.6.0.tar.gz 1306235 BLAKE2B 0dbedd05118c31452e50f24fc92afb4f21a129ea1b47054d4c79bb48d6ea520ba34bc9b694c4919037488ad316180f793be0aa84068ed30c0c8bd7092841c4d7 SHA512 745aeedec3a666850afd77925c15599a74c73142808ee3cc9835e1853ece7c4fbb68c556f02b92d7265d638ed6fe39f254ccf3fb62cadeccc2e2bc57c57a9a7d
-DIST stripe-10.7.0.tar.gz 1311319 BLAKE2B c593f9478e180b8965e6d4c93c58f0e539c0821b79c48893d65fa59f4a31d29eece26ab74113f251fa5da0620358bb45e9030e1a64aa17d189974f7c6250cfcf SHA512 2f0c6082cf292068a8790c7080e60c2b7fef2a16b5cf9fd31dabd1e7428b6317941cb64b32c7710d165a5b6b2da1c5899e5cfa88e354bc88c49c9513c25c58a4
+DIST stripe-10.10.0.tar.gz 1313050 BLAKE2B 6a37c70d8faab0a23a52505edf722cbdb8b40f89fc2bfd9d73ce94c3c40877ca6080ac4f8973d9ac01fd7a1d67f8e62366b3dd498673fadbd29e8dbd3a0c1d8d SHA512 1049a27f07c0fb870735786cf8e971cf91095f3799e094cf81e3529839f1710f10133ccd20d2cfe249c460ee7753cb255e876e864e56ac1bea7f280771df197c
 DIST stripe-10.8.0.tar.gz 1312236 BLAKE2B 72c8c111f86388a0e19ed5c5688ac8c8e5437251b1972aa4316dadccbecad03ad7db625c73110d6c617553eae15e1a5a7c571ff209ffa1ca4fa40f091c171361 SHA512 520df4a0866defc2efdaf4ad0aa5351df04669e9283298ff862a78f4d5894e5422eba48b4bb0654e1a1a41973dcd245bc4e37c3166210135c5864470fc0f7db8
+DIST stripe-10.9.0.tar.gz 1312738 BLAKE2B 6be3b40695842c164620a8abab4a8753c44cb68dcd39b7e8f62e5a359ae5ffa0faa6a8890a1b0965dd1b1f32c95fa857abe44003c94043d2e76c59a9d52fc152 SHA512 39946c7efcf7597347835495f80810987f6812be337b2f9d84bebe029b2f6d326c9a73ef0c06f3c86786f59a1fb7d227e6a0cb800b8101216df6d0fb05709ea8
diff --git a/dev-python/stripe/stripe-10.10.0.ebuild b/dev-python/stripe/stripe-10.10.0.ebuild
new file mode 100644
index 000000000000..dce53ce91aee
--- /dev/null
+++ b/dev-python/stripe/stripe-10.10.0.ebuild
@@ -0,0 +1,92 @@
+# 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.188.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]"
+	)
+
+	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-10.5.0.ebuild b/dev-python/stripe/stripe-10.5.0.ebuild
deleted file mode 100644
index 69608023dddf..000000000000
--- a/dev-python/stripe/stripe-10.5.0.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 )
-
-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.186.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]"
-	)
-
-	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-10.6.0.ebuild b/dev-python/stripe/stripe-10.6.0.ebuild
deleted file mode 100644
index 8ff27b618e7e..000000000000
--- a/dev-python/stripe/stripe-10.6.0.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 )
-
-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.186.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]"
-	)
-
-	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-10.7.0.ebuild b/dev-python/stripe/stripe-10.7.0.ebuild
deleted file mode 100644
index 8770600be4b0..000000000000
--- a/dev-python/stripe/stripe-10.7.0.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 )
-
-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.187.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]"
-	)
-
-	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-10.8.0.ebuild b/dev-python/stripe/stripe-10.8.0.ebuild
index dce53ce91aee..ffd0cdf1d337 100644
--- a/dev-python/stripe/stripe-10.8.0.ebuild
+++ b/dev-python/stripe/stripe-10.8.0.ebuild
@@ -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/stripe/stripe-10.9.0.ebuild b/dev-python/stripe/stripe-10.9.0.ebuild
new file mode 100644
index 000000000000..dce53ce91aee
--- /dev/null
+++ b/dev-python/stripe/stripe-10.9.0.ebuild
@@ -0,0 +1,92 @@
+# 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.188.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]"
+	)
+
+	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/suds-community/Manifest b/dev-python/suds-community/Manifest
index ecae0d478968..73c8293a3177 100644
--- a/dev-python/suds-community/Manifest
+++ b/dev-python/suds-community/Manifest
@@ -1 +1 @@
-DIST suds-community-1.1.2.tar.gz 285409 BLAKE2B 6cf047bb6fa6aed147fa519fee4300f52195c94a409aaa769feffaaf4d43552a566efb0162e440092c3dcb8ec21cf441325db449e5417b81a5f859133a078b83 SHA512 9f26ebbf36fcbd915281f3c3afd4ea776ca409ede4ba9e487b746ef4e527171ee2fdb44075100d52b5bba0658fafec817eea2cbf64b8d2851bdc974aee430d57
+DIST suds_community-1.2.0.tar.gz 271408 BLAKE2B 4699ee3bc28f758484425cda5c9a6e6d036d7bc364f0456ec2180726269afcb8c2f62004d2d9441ebb6aec0fea3f4b83d19f5a0df736be2e6bf61a15951f3290 SHA512 8955ad288fbd9d472b8aa4b4a016da66616436bb41b44d7935f4c14ae897c127e0d6c14457f2303ead671f92edc51454701c9658aec32f6af44882526ed86aeb
diff --git a/dev-python/suds-community/suds-community-1.1.2.ebuild b/dev-python/suds-community/suds-community-1.1.2.ebuild
deleted file mode 100644
index 6f77197c4f43..000000000000
--- a/dev-python/suds-community/suds-community-1.1.2.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
-PYPI_NO_NORMALIZE=1
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Lightweight SOAP client"
-HOMEPAGE="
-	https://github.com/suds-community/suds/
-	https://pypi.org/project/suds-community/
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README.md notes/. )
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/suds-community/suds-community-1.2.0.ebuild b/dev-python/suds-community/suds-community-1.2.0.ebuild
new file mode 100644
index 000000000000..10ed11dc06e0
--- /dev/null
+++ b/dev-python/suds-community/suds-community-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Lightweight SOAP client"
+HOMEPAGE="
+	https://github.com/suds-community/suds/
+	https://pypi.org/project/suds-community/
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+
+DOCS=( README.md notes/. )
+
+distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-6.1.1.ebuild b/dev-python/sybil/sybil-6.1.1.ebuild
index 826e4341cda0..dc21f4fc3b22 100644
--- a/dev-python/sybil/sybil-6.1.1.ebuild
+++ b/dev-python/sybil/sybil-6.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 5730bd3ad453..9b42f9be6868 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,2 +1 @@
-DIST sympy-1.13.1.gh.tar.gz 8130206 BLAKE2B 92ecaccddc5e48ac8e338488ff67cd0b6fdd9b40105334a82fc81c2ae4e6162a369ce142c6a61041698378d2c08eb5f95595702c35219a90d797485176f6fb23 SHA512 3e742ec74b6f774660a43b93c8b8a14ad97fbcf998c2ce15a6512ced5003804f4dec34f8beb3ad1f45f0f0a701110d1a81d6855075db03436cc77c101b33d7ea
 DIST sympy-1.13.2.gh.tar.gz 8141028 BLAKE2B 7a51fa75f1733364d467b79174b71ba866751399d311212144fdc3abdc8cea99618baf0b0fe3f2fe4cb9ab7153ecae4fe4bf00716e97ea4466637633f5618089 SHA512 87f7da425ed577e78392671cb635c99a11f3d6431b8c49a41611f4d2be5da1cadd8d07e0e684f2674792a2ee750b4031baec53156e7192d4c47714d4537c3222
diff --git a/dev-python/sympy/sympy-1.13.1.ebuild b/dev-python/sympy/sympy-1.13.1.ebuild
deleted file mode 100644
index a178ec16d6e5..000000000000
--- a/dev-python/sympy/sympy-1.13.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="
-	https://www.sympy.org/
-	https://github.com/sympy/sympy/
-	https://pypi.org/project/sympy/
-"
-# pypi sdist misses some files, notably top-level conftest.py, as of 1.12.1_rc1
-SRC_URI="
-	https://github.com/sympy/sympy/archive/${PV/_/}.tar.gz
-		-> ${P/_/}.gh.tar.gz
-"
-S=${WORKDIR}/${P/_/}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine texmacs"
-
-RDEPEND="
-	>=dev-python/mpmath-1.1.0[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-	)
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require old version of antlr4
-		sympy/parsing/tests/test_autolev.py
-		sympy/parsing/tests/test_latex.py
-		# crash due to assertions in sys-devel/llvm[debug]
-		sympy/parsing/tests/test_c_parser.py
-
-		# TODO: pytest?
-		sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_check
-		sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_dsolve_dotprodsimp
-
-		# either very slow or hanging
-		sympy/solvers/ode/tests/test_systems.py::test_linear_new_order1_type2_de_lorentz_slow_check
-		sympy/integrals/tests/test_failing_integrals.py::test_issue_15227
-		sympy/matrices/tests/test_matrices.py::test_pinv_rank_deficient_when_diagonalization_fails
-		sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type1
-		sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type3
-
-		# known broken
-		# https://github.com/sympy/sympy/issues/26321
-		sympy/solvers/tests/test_simplex.py::test_lp
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest --veryquickcheck ||
-		die -n "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.13.2.ebuild b/dev-python/sympy/sympy-1.13.2.ebuild
index 58f56c5e97db..fa04751c3c68 100644
--- a/dev-python/sympy/sympy-1.13.2.ebuild
+++ b/dev-python/sympy/sympy-1.13.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine texmacs"
 
 RDEPEND="
diff --git a/dev-python/tables/tables-3.10.1.ebuild b/dev-python/tables/tables-3.10.1.ebuild
index 938b6a5b517d..185836214d6a 100644
--- a/dev-python/tables/tables-3.10.1.ebuild
+++ b/dev-python/tables/tables-3.10.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cpudetection examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tblib/tblib-3.0.0.ebuild b/dev-python/tblib/tblib-3.0.0.ebuild
index 9fd0ce148cf8..f84fa981eebf 100644
--- a/dev-python/tblib/tblib-3.0.0.ebuild
+++ b/dev-python/tblib/tblib-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index 9651149319c4..315f197e2065 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,3 +1,2 @@
-DIST tekore-5.3.1.tar.gz 270742 BLAKE2B 08fd8a4deeaa5024f5bb138c4f9bc3fae25f5a2b21c4298bf5d12932793b33e778dd2b15cbdbeec2f62cba841f55a59e6f2c43d51f968d01603dcadd5883d91a SHA512 8d81af1528bedcc4d76ee96f2b310d0522262b0466bbc30bf3849eb7b936067e42311acf9fe724377ec801f2863fa50de61f409363d00486c6d596ab01acb09e
-DIST tekore-5.4.0.tar.gz 270967 BLAKE2B 6cfaa8a113707e6944c445f3fda4d55a66fe9719870ce97a7e8f1a5f556ba9fa3a2ee09ff4e98a1e976cbeedbed23dd6268dfd47d06c159f29d30eb5d3fb041b SHA512 a2b943c066ad344a247b5861719965a57f151bdadd50c660a789f59a60bebd82ccbe88fc19cff4d50d21675f35d98c131069f700ff88952b58fe989d098242b5
 DIST tekore-5.5.0.tar.gz 270803 BLAKE2B 37b7410e701b67917af76bac07499a9a910916eed8e9dd87e394e420309ed9a3094a6cf600182db084523eeb6942c6a9ebfdda108f8b1f5ef848be4a02a32f6a SHA512 b78eea1fafd27bbeb230f9b697783e3b8cd1aebc93633f168dba07d94bee80ddefedf792ea7870b258757559256424db74d21f3e14201e8c3df801fac4d12067
+DIST tekore-5.5.1.tar.gz 270328 BLAKE2B 44a03289ff908b97da7ef089513156b00b8858d99172139981ce6b618074a628796f3f965a1180f7ee0cb2c23e5c97fd0f7ce1ea9da3d6352102e2da3406b1cf SHA512 aec3eddadfd27098a4608a193750bb521d1e4c5c786c09b98e4295ed167dc3ac88b9382528778513a8b2143153950a02b7cbbdbbae1775259ab29c3df17abe05
diff --git a/dev-python/tekore/tekore-5.3.1.ebuild b/dev-python/tekore/tekore-5.3.1.ebuild
deleted file mode 100644
index 34aae5f71d45..000000000000
--- a/dev-python/tekore/tekore-5.3.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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io/
-	https://github.com/felix-hilden/tekore/
-	https://pypi.org/project/tekore/
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/httpx[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package sphinx_codeautolink
-# distutils_enable_sphinx docs/src \
-# 	dev-python/sphinx-rtd-theme \
-# 	dev-python/sphinx-tabs \
-# 	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-)
-
-src_prepare() {
-	# unpin dependencies
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tekore/tekore-5.4.0.ebuild b/dev-python/tekore/tekore-5.5.1.ebuild
index 1f28340fe779..1f28340fe779 100644
--- a/dev-python/tekore/tekore-5.4.0.ebuild
+++ b/dev-python/tekore/tekore-5.5.1.ebuild
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index ada01c488068..6df52ea819d6 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1 +1,2 @@
 DIST tempest-39.0.0.tar.gz 1156891 BLAKE2B 8f4d4026f3b304b713d97a511ba85363ed39dde22ef6c529b75ba35d01619eca925cc759d899f16b791784cd0c1d7acaa78e8361189dd5167de8300e26d5e74e SHA512 4e60b7fe90b7943cb9208cab72188f3f3668fdc4fd90b4667e5f578f979f66dbc6e9a2486c47fb7f0f608ac8197b726da1fd6b7ded169d804705dc4e58eed256
+DIST tempest-40.0.0.tar.gz 1149624 BLAKE2B e75db763090738032699c35477a5bc5d877c44aed1ed4e9fe7b878af116dc6d53dd7b64cf58be55cd3448f5ebdf8e9a44e3f4deb215f535784a33abfc79fde9d SHA512 12227d4f20045f60e56db7bc1de3e117ddbc3d4b3e30aa26239795675023b23facf15646f1c048b75f43dd9c0ba5e7d475e8ad1c483b2d0e32ef9d8d50e62dfc
diff --git a/dev-python/tempest/tempest-40.0.0.ebuild b/dev-python/tempest/tempest-40.0.0.ebuild
new file mode 100644
index 000000000000..c8907a75cbcb
--- /dev/null
+++ b/dev-python/tempest/tempest-40.0.0.ebuild
@@ -0,0 +1,75 @@
+# 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/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/test/metadata.xml b/dev-python/test/metadata.xml
new file mode 100644
index 000000000000..6ef265a39adb
--- /dev/null
+++ b/dev-python/test/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>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/test/test-0.ebuild b/dev-python/test/test-0.ebuild
new file mode 100644
index 000000000000..d236bc07147c
--- /dev/null
+++ b/dev-python/test/test-0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit python-r1
+
+DESCRIPTION="Virtual to install 'test' package from stdlib"
+HOMEPAGE="https://docs.python.org/3/library/test.html"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_impl_dep 'test-install(+)' pypy3)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/python-tests:3.10
+			<dev-lang/python-3.10.14_p3-r1:3.10
+		)
+	' python3_10)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/python-tests:3.11
+			<dev-lang/python-3.11.9_p2-r1:3.11
+		)
+	' python3_11)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/python-tests:3.12
+			<dev-lang/python-3.12.5_p1-r1:3.12
+		)
+	' python3_12)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/python-tests:3.13
+			<dev-lang/python-3.13.0_rc1_p3-r1:3.13
+		)
+	' python3_13)
+"
diff --git a/dev-python/testfixtures/testfixtures-8.3.0.ebuild b/dev-python/testfixtures/testfixtures-8.3.0.ebuild
index 775a139ae59c..419dd6df3685 100644
--- a/dev-python/testfixtures/testfixtures-8.3.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-8.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 7dc5e24d7d9c..009b081428b0 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,2 +1,2 @@
-DIST tifffile-2024.7.24.gh.tar.gz 350866 BLAKE2B f978e93c308bd7813d2cb6d0c48686ff75cdf8702aaa6888a4a9b50b3dcd60edb15f8a1404b8468aa38e4fefc0161a49448bfd57a5d7719ac7a8372a5a72dc00 SHA512 ad2ca4412a11f3afa175811651f85b2b9ff3da3d1382633ca9b50530fe976050e56abf7c2333660e07230f826fb8af152df355ee211a2409408be6084137647b
-DIST tifffile-2024.8.10.gh.tar.gz 350933 BLAKE2B 72cbb36f9ee169e337235b9f9790c11ac92fcff0c46dd791c551bc91d080d05b237ab5d2f4d7cf55744af3a7b04e22cc952d643898527157fa16880272256118 SHA512 59edbecf3ab762d24f1f560dcd471036989003f9385b8d6e0480882df2cfbf81ef5ecc6c41d098e832227717d866e31d158129e17cb1f68bc3d8cf02e1944f90
+DIST tifffile-2024.8.28.gh.tar.gz 351568 BLAKE2B 4ee3c41f5ebb31b35e230c9784c89a43735d27b67e16d48a58ff2ee5ff0a28f3f84c2e02fd25ea1879b4adda0d70aae723a6ec93cb8f8b54e47680fb773c4d11 SHA512 5710de50e303f4012cd6bfdbbc4f6d4045b2917236dd268124df7326f36ef43b004bb4bed1b2d3b9444b55b2947b48a3882b6db2cb75582a990100e58c7d1105
+DIST tifffile-2024.8.30.gh.tar.gz 353606 BLAKE2B 866248a948e141d7feb0770d51ec0cef5ba8e6474eb1238cde877b0e04525ac9126e4e0b11f1f64811c6a81a7084f6382a0f35f5e35e54862331f979ce5faf70 SHA512 f81e93c55cc982e12c9f0872b8099cb5e1dc6f4a3d18411a1d0f073080e20bf35a89d7115f4c8617f83c923e04c371a0db64d10b121a254db86b78c8a55d6d08
diff --git a/dev-python/tifffile/tifffile-2024.7.24.ebuild b/dev-python/tifffile/tifffile-2024.8.28.ebuild
index a9bd677f4e53..a9bd677f4e53 100644
--- a/dev-python/tifffile/tifffile-2024.7.24.ebuild
+++ b/dev-python/tifffile/tifffile-2024.8.28.ebuild
diff --git a/dev-python/tifffile/tifffile-2024.8.10.ebuild b/dev-python/tifffile/tifffile-2024.8.30.ebuild
index a9bd677f4e53..a9bd677f4e53 100644
--- a/dev-python/tifffile/tifffile-2024.8.10.ebuild
+++ b/dev-python/tifffile/tifffile-2024.8.30.ebuild
diff --git a/dev-python/time-machine/time-machine-2.15.0.ebuild b/dev-python/time-machine/time-machine-2.15.0.ebuild
index 1087552cdae0..d6a9b23c565c 100644
--- a/dev-python/time-machine/time-machine-2.15.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.15.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/tokenize-rt/Manifest b/dev-python/tokenize-rt/Manifest
index b3d0c155191a..5bc1b707a647 100644
--- a/dev-python/tokenize-rt/Manifest
+++ b/dev-python/tokenize-rt/Manifest
@@ -1,2 +1 @@
-DIST tokenize-rt-5.2.0.gh.tar.gz 7239 BLAKE2B a81251b6b8b336a6b1b1095e0b31456e834196fc2174958299ac293e5fc979dcdd2b4fc9c7e2e231e73fd09e116d0538dadf9436b4efdcf1390b2db9a025a4b8 SHA512 4288d474dfa260dea710bfbf529c722215bf8883360d281f41a456c79d4aa029bff9fa22a89e11d83c4095a43738f0751416a53c7e116a484a32937b58c20ff1
 DIST tokenize-rt-6.0.0.gh.tar.gz 7509 BLAKE2B e652a394062fa9965e525430e021a36c9411848dcc1e7283d64692cb349eb5714fd8bce6db0098cd01461a75e638141a18a918befee80a01764ba9d152d1d1da SHA512 40a98a2a6090afa095b4933c63e4ac9dd5b4643a1e804f9ec31956cfc1cff0100a884d62c52c4c769a5810e72ab83b62f5c76cb030e48eced67670b408429cd0
diff --git a/dev-python/tokenize-rt/tokenize-rt-5.2.0.ebuild b/dev-python/tokenize-rt/tokenize-rt-5.2.0.ebuild
deleted file mode 100644
index 6eb3c3d3b85d..000000000000
--- a/dev-python/tokenize-rt/tokenize-rt-5.2.0.ebuild
+++ /dev/null
@@ -1,25 +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
-
-DESCRIPTION="A wrapper around the stdlib 'tokenize' which roundtrips"
-HOMEPAGE="
-	https://github.com/asottile/tokenize-rt/
-	https://pypi.org/project/tokenize-rt/
-"
-SRC_URI="
-	https://github.com/asottile/tokenize-rt/archive/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/tokenize-rt/tokenize-rt-6.0.0.ebuild b/dev-python/tokenize-rt/tokenize-rt-6.0.0.ebuild
index f234745b1e29..6eb3c3d3b85d 100644
--- a/dev-python/tokenize-rt/tokenize-rt-6.0.0.ebuild
+++ b/dev-python/tokenize-rt/tokenize-rt-6.0.0.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 5c0dbabf5fe2..59800bcee3bb 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,3 +1 @@
-DIST tomlkit-0.13.0.tar.gz 191792 BLAKE2B f5f865b49f9850281d01de2c2ba9c2d8685a10a5cd0f17c475d120978472485a5bd607dc4b283221eab69fc6e214259feafdbe85c8237fe9c80b49007523bb69 SHA512 46c5a771ff401e0b300dbd13708d78b63415653b87eb649898bf0bd58cedeb110622ff2f0ade0ad1cd517610229ba0f59b4d520cf2fa1eea6522ea0bc042317e
-DIST tomlkit-0.13.1.tar.gz 192625 BLAKE2B 1f1ebc96819eb742429d7d8a71b8f3aecdd964f0700052bb2f71ede866c5f97b25745bf95898d7b1005c881d3fdbb36c4cb872126a3be8192cb9c859eb153fbe SHA512 32023020de48d0eacd0ce886870b9a53defdb403b396eb03d0c026c221460eeede1f018586ae141d690722485446be0215582182809c590d1af9825e840b58ad
 DIST tomlkit-0.13.2.tar.gz 192885 BLAKE2B c95d24e0ec61cb90dfdd3fe7a07f8187fdfdee1b60d6d3e5a1af08e6d319e24c2447107cd3e49455a3f1cd29a50bde2e09f3a57708ce7349d1e9bd6957e46c9d SHA512 65b45468de25a6b9f22c3fe3468301902e1e439de580e74f15f5a24985546a4bfe47642b6014a25590eb176fedbe468828d7bc84c9c3b65ab418c071f0902957
diff --git a/dev-python/tomlkit/tomlkit-0.13.0.ebuild b/dev-python/tomlkit/tomlkit-0.13.0.ebuild
deleted file mode 100644
index 6b58c7cec345..000000000000
--- a/dev-python/tomlkit/tomlkit-0.13.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
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/python-poetry/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "poetry' 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 = "tomlkit"
-		version = "${PV}"
-		description = "Style preserving TOML library"
-	EOF
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/tomlkit/tomlkit-0.13.1.ebuild b/dev-python/tomlkit/tomlkit-0.13.1.ebuild
deleted file mode 100644
index 32ec3c8a18ae..000000000000
--- a/dev-python/tomlkit/tomlkit-0.13.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
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/python-poetry/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "poetry' 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 = "tomlkit"
-		version = "${PV}"
-		description = "Style preserving TOML library"
-	EOF
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/tomlkit/tomlkit-0.13.2.ebuild b/dev-python/tomlkit/tomlkit-0.13.2.ebuild
index 32ec3c8a18ae..6b58c7cec345 100644
--- a/dev-python/tomlkit/tomlkit-0.13.2.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.13.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 7acc0d37c12e..ffb41ba35f44 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1 +1 @@
-DIST towncrier-24.7.1.gh.tar.gz 73189 BLAKE2B 711dec1f859c481e049d0b2ce7332ec3f0cb71d11a184b237c35d40a1a1d1e331efda31d18d2452ad743ec94f2c79a386d5a1154b7eab1a0dbd232567a1b7cef SHA512 3a57dc9766eb8a09d584382f5998dc296daeacb64fd41f9ae342fb94131dd039896a32c994abb3346722fc0329632c0806f01ddd8a4aa93724e0e2978f47001d
+DIST towncrier-24.8.0.gh.tar.gz 74612 BLAKE2B 257ce077a212648177514f87f15274415a343fd16105dd2d94935b86ff53552b47554584efcc73810ac5ccc0f67196845838ee83b6f43580dd9d9a4eee782da7 SHA512 6e4db4713aa35d7daee2296433ee1c1093ef6a56831128f3b068ea5c7be167c9ba83a97e1ea17e94bd3ef80ec1c715c0a57484f4159538de6105052830798698
diff --git a/dev-python/towncrier/towncrier-24.7.1.ebuild b/dev-python/towncrier/towncrier-24.8.0.ebuild
index b3c323c2e9c5..b3c323c2e9c5 100644
--- a/dev-python/towncrier/towncrier-24.7.1.ebuild
+++ b/dev-python/towncrier/towncrier-24.8.0.ebuild
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 00183ef382a0..2aa3132907a5 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,4 +1,2 @@
-DIST tox-4.16.0.tar.gz 179738 BLAKE2B 24ab57b05504ca8d4ef39c164604e5cc8150d722d0d0258bac8fe35b0dcf7ee31625734c65cabb26b4c49f377fe9b2be65f8d84481f7aee7307f9499e6498929 SHA512 b3d65c5b4f086f1f0474d6cb08d3d4bcdf81735376a94e97997ab5dee5c726e71e8b9a1117eda59f9afd61be0bff38a9533faf16e76b78b504ff6de0f2ddfde0
-DIST tox-4.17.0.tar.gz 179927 BLAKE2B 07e98d42248482ba0bf77080ea32ab5ccca937f1a8788a80d3e8f24a62f71553669bbcaaab4570f8d0ec4c6eecef3b0f812c00e9a31f212cb13bc16568408993 SHA512 8debbd10beca8d54135b11e88fdf8189389ec883f201bb3ef3b8418cd07f3247332cda4e0a82ee79ec9eadd09068bfd6bf0880ab22c88d82507dbf1c1650cedd
-DIST tox-4.17.1.tar.gz 180242 BLAKE2B 7b0a9964b359500bac47547530edf4e62fb8f39a52e10987959945e993f55f62f5ffed4db0c482c881348af5366c723be431ad9ded2d3642806c71ce62de0799 SHA512 51041bc7f09de1fdf4cfdc9c25ed2a4add2984a8612d4d43ce4740e7920d8fa984c1c64d0d6a45947d1891de6fa35507b1ca14afa641bc5af184ad97ba6df640
 DIST tox-4.18.0.tar.gz 180782 BLAKE2B dc9832ad75c3e8564317bd618fa644ff2f393e507d7ff03292f65f0b10884d010708820768b6acd403783fd78868eddedb1ce931280d1e06e8d83214d85d4879 SHA512 4934b6d9406cc4500e75da76157ceb2dd9d7d0fd5e803fcd2c2bc9b5d2837678eead5af21dd6eb82ae7fe04c90aef78cc3db445daeed194a444ad88687ec1eeb
+DIST tox-4.18.1.tar.gz 181159 BLAKE2B db9b2233363b6214b1c0bae2c0319b72a7ef4a7f833628833fecb7a8d04eef0594f1a93e17f8273d45873c2130e96b7adad8afe69662cb8fe37251028ba1581f SHA512 289ee3e8b7c941dbeb94adea24442169b33cfe3ae2c4d6eadd12974ee01488325d05beb92cc3b3d5aa1f795f9d3ffe65ed3da81bc62b0527edf56f5ddb9ceb32
diff --git a/dev-python/tox/tox-4.16.0.ebuild b/dev-python/tox/tox-4.16.0.ebuild
deleted file mode 100644
index afd9e40bb1d9..000000000000
--- a/dev-python/tox/tox-4.16.0.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/tox-dev/tox/issues/3290
-				'tests/config/loader/test_str_convert.py::test_str_convert_ok_py39[1,2-value1-Optional]'
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.17.1.ebuild b/dev-python/tox/tox-4.17.1.ebuild
deleted file mode 100644
index 44a2547684f8..000000000000
--- a/dev-python/tox/tox-4.17.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
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/tox-dev/tox/issues/3290
-				'tests/config/loader/test_str_convert.py::test_str_convert_ok_py39[1,2-value1-Optional]'
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.18.0.ebuild b/dev-python/tox/tox-4.18.0.ebuild
index 44a2547684f8..afd9e40bb1d9 100644
--- a/dev-python/tox/tox-4.18.0.ebuild
+++ b/dev-python/tox/tox-4.18.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/tox-4.17.0.ebuild b/dev-python/tox/tox-4.18.1.ebuild
index 44a2547684f8..44a2547684f8 100644
--- a/dev-python/tox/tox-4.17.0.ebuild
+++ b/dev-python/tox/tox-4.18.1.ebuild
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 7578be764996..e26838b80b21 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,2 +1 @@
-DIST tqdm-4.66.4.tar.gz 169392 BLAKE2B 6d8e3e9775d93d9c064289b8a830b4f541a753a48044ec65fcee9c8d158d423e362d06c3404efce67de28fab2c3f1fb3d8aaa0fdec33b4d040ad1f2aec97fde2 SHA512 fdafa64784564f7f400f29ffa75ba564a3c9bc6d935a1ccd82260d4a1f4431792a9dae2d5c6ed69cc265f078f674081589a040d47b8745a500870d27670feadc
 DIST tqdm-4.66.5.tar.gz 169504 BLAKE2B 9868bcfb4f3fc22aedfbb848d383055ef6ef9795982cd7877e620dba5391ffee369c375b27555c302d1fc6fb27ddacf8d3874daeffa62e5e8699e1124fbf96af SHA512 8e2c35f02fe365063a325d8a1d3e525870d522fab465e1a86764b8716ff32c039db463fe5e74a5f080ced40851d49b1e4273126074d62f14ed1935a96e0afb8a
diff --git a/dev-python/tqdm/files/tqdm-4.66.4-py313.patch b/dev-python/tqdm/files/tqdm-4.66.4-py313.patch
deleted file mode 100644
index 9417ce91a55a..000000000000
--- a/dev-python/tqdm/files/tqdm-4.66.4-py313.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eafdd306861f531c443885048f0abdaa6bc45f8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 27 Jun 2024 18:30:55 +0200
-Subject: [PATCH] cli: Fix docstring processing with Python 3.13+
-
-Fix docstring processing code to reindent the docstrings if using Python
-3.13 or newer.  Starting with this version, all docstrings are
-automatically dedented by Python, which causes the regular expression to
-fail to match.
-
-Fixes #1585
----
- tqdm/cli.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tqdm/cli.py b/tqdm/cli.py
-index 7284f28..1bbce6d 100644
---- a/tqdm/cli.py
-+++ b/tqdm/cli.py
-@@ -4,6 +4,7 @@ Module version for monitoring CLI pipes (`... | python -m tqdm | ...`).
- import logging
- import re
- import sys
-+import textwrap
- from ast import literal_eval as numeric
- 
- from .std import TqdmKeyError, TqdmTypeError, tqdm
-@@ -177,7 +178,11 @@ def main(fp=sys.stderr, argv=None):
-     logging.basicConfig(level=getattr(logging, logLevel),
-                         format="%(levelname)s:%(module)s:%(lineno)d:%(message)s")
- 
--    d = tqdm.__doc__ + CLI_EXTRA_DOC
-+    d = tqdm.__doc__
-+    if sys.version_info >= (3, 13):
-+        # Python 3.13+ automatically dedents docstrings
-+        d = textwrap.indent(d, "    ")
-+    d += CLI_EXTRA_DOC
- 
-     opt_types = dict(RE_OPTS.findall(d))
-     # opt_types['delim'] = 'chr'
--- 
-2.45.2
-
diff --git a/dev-python/tqdm/tqdm-4.66.4.ebuild b/dev-python/tqdm/tqdm-4.66.4.ebuild
deleted file mode 100644
index 2dca9f1051c0..000000000000
--- a/dev-python/tqdm/tqdm-4.66.4.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=( pypy3 python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1 pypi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="
-	https://github.com/tqdm/tqdm/
-	https://pypi.org/project/tqdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/tqdm/tqdm/pull/1594
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-EPYTEST_IGNORE=(
-	# Skip unpredictable performance tests
-	tests/tests_perf.py
-)
-
-python_install_all() {
-	doman tqdm/tqdm.1
-	newbashcomp tqdm/completion.sh tqdm
-	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/tqdm/tqdm-4.66.5.ebuild b/dev-python/tqdm/tqdm-4.66.5.ebuild
index 8928bc3c752e..479eb20ca532 100644
--- a/dev-python/tqdm/tqdm-4.66.5.ebuild
+++ b/dev-python/tqdm/tqdm-4.66.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 5ed1bd757a9d..0c1917a9b33a 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,2 +1 @@
-DIST transitions-0.9.1.gh.tar.gz 1124905 BLAKE2B 6d8700c9b2b2d200c8377e698f4057caa78908ee7156daa3fce1f49d86c6bc9afd45fe7af4122c2e124681c3c581e98f657e39444595f97ed7fb3c64f57d70fd SHA512 8e946ee9b8e3ed0629381514b4af4446625de0cea7cc8780326829ad987b4c0f9402484ed98ca66b12e95c8da79f77c62aba9f000dbe42779f158529cde3f279
 DIST transitions-0.9.2.gh.tar.gz 1133297 BLAKE2B 9acb83355236941d49bbdc1877e352e1f86d2b95302455fc5ea2e13d9014f8e6c9dc67e04b70c03c40e3d10b9bcae97900420bfb7549decd7c2186284d9f7389 SHA512 7fa392b185b001b0224b449d65b345f71afa27f80a88d862456f637e5876644f09ca861ce8bd2ff93f91a7846e337a996f256645140a0892b526cd6c1f58ce7f
diff --git a/dev-python/transitions/transitions-0.9.1.ebuild b/dev-python/transitions/transitions-0.9.1.ebuild
deleted file mode 100644
index a353fdacea25..000000000000
--- a/dev-python/transitions/transitions-0.9.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_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
-HOMEPAGE="https://github.com/pytransitions/transitions"
-SRC_URI="
-	https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	|| (
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/graphviz[${PYTHON_USEDEP}]
-	)
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# magic to ignore async tests sometimes, breaks EPYTEST_IGNORE
-	[[ ${PV} != 0.9.1 ]] && die "Remove this hack"
-	rm conftest.py || die
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# pycodestyle, mypy, etc.
-		tests/test_codestyle.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc examples/*.ipynb
-}
diff --git a/dev-python/transitions/transitions-0.9.2.ebuild b/dev-python/transitions/transitions-0.9.2.ebuild
index 4143ab7b275a..236ef554c3ff 100644
--- a/dev-python/transitions/transitions-0.9.2.ebuild
+++ b/dev-python/transitions/transitions-0.9.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 7b1d3bdbcdd2..6649713796d3 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1 @@
-DIST translate-3.12.2.gh.tar.gz 1202828 BLAKE2B fdfc6ea91d0e0fe9f36e1352247463fe04ff3f4cdd13dd969077ccf0dde984250303872f6bb605dcd1628a1089d81dd98b36dfd68e92c3030c740d65899a70ba SHA512 7488f45521f1744d8d457ce5f74a4955a0e4468af8b3f5be06410667f2c1e52a3dacd3b959330e6c2eb5b3a443c1e2c761538896352576f5090ce27dbfc8edab
-DIST translate-3.13.0.gh.tar.gz 1171837 BLAKE2B 9c6212d26749eac652369e94d2b653f67b364afc9f9125c5125d19e3cabc1bb36bd27bc172ad93d28cb6cdf57ed2b245336664b6b4954db9bbbfb4a8ad92b3f9 SHA512 7c6f87ec32c81a14d1775dc24d43e49b79fdf8473a4380c93a2af1532bed32a9733ee755641ce26852b1bd63acffa2110598c5fc3010bbf9de40e8a0f32af308
-DIST translate-3.13.1.gh.tar.gz 1172830 BLAKE2B 9ca2a3a30a6266a9f713fdb1e504a45263763bce2107196d2091d216db079e16eb03f4dab87627692253c64177e7c6ca9b70bc9a82b719c94fdea984adb66efb SHA512 afa0b98235cf1bc9fc5ffe50057851495e35f6acaa2ba0858fce7d01207929590112e5e5c06452b3ca2cb14a63fdaa2a66d8afe53e29112f5970680935378af7
-DIST translate-3.13.2.gh.tar.gz 1172735 BLAKE2B b4109d16e367dc42a16d26542759aecce66c3eb6bae019e24cb64940cf864620fe6c59cdd03bab7f6ebb2386bfd46b1988c18bf0c73a400389521a1968ceb8d2 SHA512 ea9772a9d010a9097c1cadc91b9c33cee241d61a25210abe5442644cea648bd0940f42aab4327b4057df128ccc16a011fa00c180b60a5ecf4357774f97272cd6
 DIST translate-3.13.3.gh.tar.gz 1172858 BLAKE2B e7b2f711faec3876fdc082aae02716beaa45934f2ad308433c20020e69b72850e0a9d32c7cb57e32b4fdc8b39334a358b8f289c83744882728616122f07cf8f7 SHA512 f435306b34a2a200df5b648a1354444ac5fd76872f36062704b2c8abf52b8b1e1d570afbcf4b50cb1d815abfcf85b05630e8bc02f908a83f3fea90188c76c6f7
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.12.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.12.2.ebuild
deleted file mode 100644
index 0e75f48593c6..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.12.2.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=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}]
-	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.13.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.0.ebuild
deleted file mode 100644
index 0e75f48593c6..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.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=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}]
-	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.13.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.1.ebuild
deleted file mode 100644
index 384bc7109a3a..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.1.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=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}]
-	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.13.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.2.ebuild
deleted file mode 100644
index 84540c3968c4..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.2.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/wcwidth-0.2.10[${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.13.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
index 84540c3968c4..525771d408ee 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
@@ -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/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 32ba7543cb3c..2cbbb592013b 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,5 +1,6 @@
 DIST tree-sitter-0.21.3.gh.tar.gz 38504 BLAKE2B dd8ed0047763d92babbdb3fd34a6fe6b7a9299b99067600f473bf16b9754a98ada141d96f9b6b26abcb2ff178dd4ec34da547c9cdb7b3449f7b98a44ad10476e SHA512 61f3d4cb15a4106eb350be2adc6ad39de31bd5b2656f35acf2cdf828ababac37b6197d5565ee74b0b2c3a161619163bb98c38108ca3db616fee633e6e2a835a7
 DIST tree-sitter-0.22.3.gh.tar.gz 164914 BLAKE2B 7ab97203fed17fc8d18c40d5a24ff60cea4757353a4124c832cc52bff93ed8af913dbbab682225eac309762a26e90c216d2e1058dcaeb860ebd467b4c9655939 SHA512 8ac729b90f942eef07de97c4ebd070c1040f338c1f57a2203b6aa4f3f8db863fdb5183c9b27d5be2ec270d7eefba7665800d6cc4e9265cbd4b4715af4c4d3921
+DIST tree-sitter-0.23.0.gh.tar.gz 167761 BLAKE2B 694e90f608f51fe4f9add476cd5ebcd0ce04a7b027efc4948ce49a6cc0f05ebf4f15e0fe3f365f89f3e04cfec542cb3f1db1e5b05ff7ca23d3134561ea3dcf36 SHA512 67a6f3359c6283c58afcdbe5b6a521cdfcf2585a5361fb69a55eff82941726a143528a402e6d609286d8846c77e20d0a38551525d761e35abb21045ad9c5a2f8
 DIST tree-sitter-embedded-template-6d791b897ecda59baa0689a85a9906348a2a6414.tar.gz 12420 BLAKE2B 9b9c6dd135cef4490e145657c5eeeb1fd470faee3846007638d8247daf07227029c6e7e323a0ed30c5cf6d35602be6bfb62dc1c22076fd4a0e76b161d55cca38 SHA512 7744852711cb1659607298fa373ce3ef79de3212ff55c0fb4e9aebcb715548934065ee3b5b12e9d08169a6207879e154a94c9de8bff892c32729c35d49964736
 DIST tree-sitter-html-b5d9758e22b4d3d25704b72526670759a9e4d195.tar.gz 26609 BLAKE2B 223fe82ea18bf61b2b7ec664ad68ec1f324c9e0a1c78578db6063b9037c62be2bb762a9e47d0af81f7f244889f1f72683da3751c1d1c609c4a27fdcd0dc008b8 SHA512 15fd961c18d55a20487f48ef6a6f1822f9033baba8995f2e00cf8db1750036d69e19607f578fe90676aab30a173874969c69b91605b6073eb298f32f5f24f81d
 DIST tree-sitter-javascript-de1e682289a417354df5b4437a3e4f92e0722a0f.tar.gz 396570 BLAKE2B d80cecb070bd1c82737ee1d38fff293ac4c96fde02563ecc910d30c920b902bd5c25a7ac50585f8cb7a26203d98f4a9e6feeebd4ac0d54bede9486ff642e03be SHA512 4a509a886ebeae0d960360113aff89fb56090f1fe4bb5a7866952736a04838a8b6421cc7d19473acc48b135bca4615325c59c0f0f7f3734f23a78fff9cc2050e
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.3.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
index b1aa4f8a573d..b1aa4f8a573d 100644
--- a/dev-python/tree-sitter/tree-sitter-0.22.3.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
diff --git a/dev-python/tree-sitter/tree-sitter-0.23.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.23.0.ebuild
new file mode 100644
index 000000000000..e92fdc14a478
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.23.0.ebuild
@@ -0,0 +1,64 @@
+# 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 bindings to the Tree-sitter parsing library"
+HOMEPAGE="
+	https://github.com/tree-sitter/py-tree-sitter/
+	https://pypi.org/project/tree-sitter/
+"
+SRC_URI="
+	https://github.com/tree-sitter/py-tree-sitter/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/py-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# setuptools is needed for distutils import
+DEPEND=">=dev-libs/tree-sitter-0.23.0:="
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' 3.12)
+"
+BDEPEND="
+	test? (
+		>=dev-libs/tree-sitter-html-0.20.4[python,${PYTHON_USEDEP}]
+		>=dev-libs/tree-sitter-javascript-0.21.0[python,${PYTHON_USEDEP}]
+		>=dev-libs/tree-sitter-json-0.20.3[python,${PYTHON_USEDEP}]
+		>=dev-libs/tree-sitter-python-0.23.0[python,${PYTHON_USEDEP}]
+		>=dev-libs/tree-sitter-rust-0.21.2[python,${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.22.2-unbundle.patch
+)
+
+src_unpack() {
+	default
+	rmdir "${S}/tree_sitter/core" || die
+}
+
+src_prepare() {
+	default
+
+	sed -i tree_sitter/binding/query.c -e 's/_PyErr_FormatFromCause/PyErr_Format/' || die
+}
+
+src_test() {
+	rm -r tree_sitter || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 6c7cf0ae67b6..27d08356f23b 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,2 @@
-DIST trimesh-4.4.3.gh.tar.gz 13606522 BLAKE2B d59c59e11b67c301c0171dc911cf1e518b57f9b3e9d0d4410130922eb0fc5b190ec5d8088e43d35fb7b09687a2698fe41342ce492fafc7bb050431cf43624c9b SHA512 b93ed203589a5467116c942b6d02db7eb4c130b7f110ea2612a2cf4d86d9f7943b949dd62d2229762a2a14f796041aa6a4294857a8fcc3b96d470a6925b9d568
-DIST trimesh-4.4.4.gh.tar.gz 13606701 BLAKE2B 52df2a318adbc1ef263734d1ecc55121c486a8d546a5e3452d38f6e580e89dabe72eb8f437e023391bf5ae10a145d453ef1b3309af8d7a8fd37d20aa14f92832 SHA512 afeeca5532208bacca9e5539d894f72c7e93975c9f932487a852033ed75d20fe29a66880c62d3daf1ff328c198e40464ad3751c69e190994fd0ccc19da5723cf
-DIST trimesh-4.4.6.gh.tar.gz 13606676 BLAKE2B 8183a757067d531bac4a959d770e619b6b9ccfc629e39a8b7ee9cc372aec518a056c7d0c27016103b2e535174046a4387e9719d0e9b749a8c4ee32b610f82211 SHA512 33b4ae7b5c5336140be7eedff82f112e3830bbddf835042b1ea7b95e643fe7e8943c38e80518778be122c1ec76d151af870df9afbce011438b38c13f967d4e4a
+DIST trimesh-4.4.7.gh.tar.gz 13606593 BLAKE2B 1847d601711df60257a8f1248cdea66fcc6489b570606c9ab1d360db2742a9e7c1f0d6093924afa7105a5a272e80c291b1c3568b041db2ee4d144e72ab44fbd8 SHA512 b3e1a670b8dec26df3357cad4205431e94fc2b59b87af976b0754ac8e46f4f930f768322f0aa236a6205c289b9037f2343ec6aaeb0e281f021a03d3147be3d20
+DIST trimesh-4.4.9.gh.tar.gz 13612220 BLAKE2B 9ee21f8a3f0db041133b2843948a00e8ee6bf52e3de1d2ca9ac88391ef1c07a4b540c75b439da3e137923f0822399cdf759072729363253ad8137a06cb208791 SHA512 3b58a0378231dd1111ac4ffe030b1dd18d24647e22fe815bc411a7854f83e12a9482cb0b48d5333be9f6f6ebf622c15e29c446531ce27ff12c1835a6f25cc51a
diff --git a/dev-python/trimesh/trimesh-4.4.6.ebuild b/dev-python/trimesh/trimesh-4.4.6.ebuild
deleted file mode 100644
index 37fd5b19ad93..000000000000
--- a/dev-python/trimesh/trimesh-4.4.6.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=( python3_{10..13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	dev-python/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mapbox-earcut[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=1800
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require pyinstrument
-		tests/test_sweep.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox-earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.4.3.ebuild b/dev-python/trimesh/trimesh-4.4.7.ebuild
index 98c2977bc8ed..98c2977bc8ed 100644
--- a/dev-python/trimesh/trimesh-4.4.3.ebuild
+++ b/dev-python/trimesh/trimesh-4.4.7.ebuild
diff --git a/dev-python/trimesh/trimesh-4.4.4.ebuild b/dev-python/trimesh/trimesh-4.4.9.ebuild
index 37fd5b19ad93..37fd5b19ad93 100644
--- a/dev-python/trimesh/trimesh-4.4.4.ebuild
+++ b/dev-python/trimesh/trimesh-4.4.9.ebuild
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 03b2f5e1bac7..c43070718208 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1 @@
-DIST trio-0.26.0.gh.tar.gz 609710 BLAKE2B ec263e5db731760472111b8eb6a7d6ebdc476f8dc0976787692289caa5d5361a1a3db03d4713f14ee3198ad45dcec19c6c672af4af3860c3cd7ad5ff3e13bc8a SHA512 9a51f4e71795083ffd4a606e989583b1a93e45dc32f93d2d03bccaf32ca62a82daaf964676636363711b7ea1675dddd3eac1acae1be73b0fc570baef3c37c748
-DIST trio-0.26.1.gh.tar.gz 610304 BLAKE2B 3bd9cd09cef7fe5484025ff2532c45a4a38f1c19b64ae833ecac5eda61463184a18020215dc569e40d1ec9950a860cf371ea461ac4d5b2dfc0f611d093c1ae7d SHA512 415bb701183e1a38574770e94c30fe4893a5f0be80291decf4524fc27677c12455124b3f7a03c37be89d42cb67b75e3315322f0cbf23264947d51ae251b3204e
 DIST trio-0.26.2.gh.tar.gz 610516 BLAKE2B dfb62a4024f2e42243dff6bea97ee3657c1975ff8d081010efe1b0fd3962a3b1c4847341df1028e2c902a043d0b43b6190ccdd72d5bfdb6e650912034ee56c28 SHA512 0b6fda127937de5c13eb12aea4ad5f95b4bfcb839c1a65c25a563aef6450bfb35c24af3509043eb389472e414549fbc9d40e64c8aff068cb34ffaf8b29fe9c67
diff --git a/dev-python/trio/trio-0.26.0.ebuild b/dev-python/trio/trio-0.26.0.ebuild
deleted file mode 100644
index d7a0315ad2ad..000000000000
--- a/dev-python/trio/trio-0.26.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.26.1.ebuild b/dev-python/trio/trio-0.26.1.ebuild
deleted file mode 100644
index 01b349cf4ec8..000000000000
--- a/dev-python/trio/trio-0.26.1.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.26.2.ebuild b/dev-python/trio/trio-0.26.2.ebuild
index 01b349cf4ec8..d7a0315ad2ad 100644
--- a/dev-python/trio/trio-0.26.2.ebuild
+++ b/dev-python/trio/trio-0.26.2.ebuild
@@ -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/truststore/Manifest b/dev-python/truststore/Manifest
index af44aab4a86c..e623e6922217 100644
--- a/dev-python/truststore/Manifest
+++ b/dev-python/truststore/Manifest
@@ -1 +1 @@
-DIST truststore-0.9.1.gh.tar.gz 26720 BLAKE2B e5bf3905367f75cdfd9314f1c544f004e62c2ddcde97f83bfe5ddc2d7606d44df5fc352811c8c42423be2da46e5f7b9642a2aeebe61436669c4cd9265ddbec96 SHA512 38567198a3b0d4e9c0b3df72674f3e1fef0614ef0afa80bd7276f98c2e7ef2dc00cca92184b80a1dfe535c5d2508ebdb775e389576c2f07536838f67de1958ca
+DIST truststore-0.9.2.gh.tar.gz 27256 BLAKE2B 0f03da308697a6bcf8def97b875a962f484418dc6b54d6795a9de5dc68b949f145e6611aa6b4bebcde3f03693bbdfaaa238a9d32b5f9b2d635b4e3075420f239 SHA512 e2d9da3d22a2f06d83dd9c7c9014dd689d8e915c7c8b8b33a3526859d15e9a5d4e86162f51f22b566e844a0c6a5b16fa3ab6907a56ce11c4fcc27444493a5970
diff --git a/dev-python/truststore/truststore-0.9.1.ebuild b/dev-python/truststore/truststore-0.9.2.ebuild
index 717a39611ce3..717a39611ce3 100644
--- a/dev-python/truststore/truststore-0.9.1.ebuild
+++ b/dev-python/truststore/truststore-0.9.2.ebuild
diff --git a/dev-python/twisted/twisted-24.7.0.ebuild b/dev-python/twisted/twisted-24.7.0.ebuild
index 061915621947..c8ea06995968 100644
--- a/dev-python/twisted/twisted-24.7.0.ebuild
+++ b/dev-python/twisted/twisted-24.7.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
@@ -56,6 +56,8 @@ RDEPEND="
 	)
 "
 IDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-5[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/txaio/txaio-23.1.1.ebuild b/dev-python/txaio/txaio-23.1.1.ebuild
index 8a0c0e58ed8c..75eb9f611886 100644
--- a/dev-python/txaio/txaio-23.1.1.ebuild
+++ b/dev-python/txaio/txaio-23.1.1.ebuild
@@ -17,6 +17,14 @@ HOMEPAGE="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/test[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_sphinx docs \
 	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index a86c5713e677..6da9256048af 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -1 +1,2 @@
 DIST txtorcon-23.11.0.gh.tar.gz 395211 BLAKE2B 156c1c1d7e1d88939051ea19f4cd955e3a329dd1a550ea1a35d6c984db66d9b8e7fff35b2aa5caa12589273b46c1ce65d802fe89ce2a57443e0b5ce592247ee0 SHA512 815aecd8b6f3d12be1f903ba4dbb037e5f5920d925ca06c9f92a040d8258c4c1182ae5fca0be26fd2adb529c1726ad9ee080ddcada56e3e8b9922f7295731df3
+DIST txtorcon-24.8.0.gh.tar.gz 395135 BLAKE2B 14e800e64788fac8d840ee00f2032d697227d568ec671a040ae63d95849fc50d17e602bcac625251094237ef642dc1f05032735b06b52053a05fde33d41acc0d SHA512 b5e3d8f470dd2561b3291349d2d7b60bcc78b6f4eae7cc98e400cdbe57ff8dc5a5f7c59b3068a221faf60715296af1dd2587663c32d40ac70f37ddaa94cdd940
diff --git a/dev-python/txtorcon/txtorcon-24.8.0.ebuild b/dev-python/txtorcon/txtorcon-24.8.0.ebuild
new file mode 100644
index 000000000000..b6603c67b705
--- /dev/null
+++ b/dev-python/txtorcon/txtorcon-24.8.0.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted-based Tor controller client, with state-tracking abstractions"
+HOMEPAGE="
+	https://txtorcon.readthedocs.org/
+	https://github.com/meejah/txtorcon/
+	https://pypi.org/project/txtorcon/
+"
+SRC_URI="
+	https://github.com/meejah/txtorcon/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/automat[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[ssl,${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		sys-process/lsof
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/types-docutils/Manifest b/dev-python/types-docutils/Manifest
index bbadaf1d6bf0..cc20a7415130 100644
--- a/dev-python/types-docutils/Manifest
+++ b/dev-python/types-docutils/Manifest
@@ -1,3 +1,2 @@
-DIST types-docutils-0.21.0.20240710.tar.gz 19813 BLAKE2B ffe7a9605faf155ad968e6bf190fb2cfec4e09ce09c8b2c9346710c9065e18f169682122c9ba83acd331f166dc9ed925be55626be4320553de2f1f467d2a0e67 SHA512 f870c692666c9966cba11fec7c441cbdf0f5510d586ebea467880bdec859783aeb23a3621dc14fc65021ec3cd917c929116642901048249ea8549ede4ff1c02b
-DIST types-docutils-0.21.0.20240711.tar.gz 19857 BLAKE2B db38ce7230323b6710ca0f183eb77d700f6fc895af5956abde65f85e976dc15db920eab6b69483fa7ad3361fef0286069875ec02564d4a855244cdb255e039c0 SHA512 770aa29d2e0fb51c35924239e636ec5d31fe6a9986f3842afd6e7a6414e2ae281d1e88bbce1343d69f9d596381bee056f7471566e051025fb2dd9ad93b188786
 DIST types-docutils-0.21.0.20240724.tar.gz 20175 BLAKE2B a21715a3f24c120e58b4d542e97de8f0a580ad40fe9f7d451b9e2b2072f4eb552d750662d198d8afcd8a6f7e0be3605b727ac014f229214849d9ba3757feb7d8 SHA512 5fc881f945a0755d38cc36ed2134303e421f4f19016517ffb88f39a7f29d2075eaf4d5691c1280a90597fa87478c9eed747ad7a40df210ce0ab3af7ed36e6281
+DIST types-docutils-0.21.0.20240907.tar.gz 20273 BLAKE2B 8f90b7362a0b7a5d6b7e8d83b24e7fc03254425bb49e8f9bebc376ea85baf826f9da1ef0f03dfce0b54ef5de3d939e9209f3cbd7f947e1b5de3aa0b72cd417b4 SHA512 fa668508108411b00d46a5c4f781c42b0e245fc375ff4090a1441afad972f6b57147f04eae5b1713d0f51b74c1d8939cd064fa3a956a956cff9c3b06bc09eb1e
diff --git a/dev-python/types-docutils/types-docutils-0.21.0.20240711.ebuild b/dev-python/types-docutils/types-docutils-0.21.0.20240711.ebuild
deleted file mode 100644
index f42134c19384..000000000000
--- a/dev-python/types-docutils/types-docutils-0.21.0.20240711.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-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="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.21.0.20240710.ebuild b/dev-python/types-docutils/types-docutils-0.21.0.20240907.ebuild
index f42134c19384..f42134c19384 100644
--- a/dev-python/types-docutils/types-docutils-0.21.0.20240710.ebuild
+++ b/dev-python/types-docutils/types-docutils-0.21.0.20240907.ebuild
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index e81553954283..5cfcbe7e27c3 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,2 +1,3 @@
 DIST types-psutil-5.9.5.20240516.tar.gz 14771 BLAKE2B 9d163a5909b79a1d775f5edb557fa9e047b2874a3def37ca9277f446ee83b4ded8776c2d231142ee72cf80f7a48c7ebafbe03794d0d3192f762f14692559b16b SHA512 831ffcf2031f3d40d591c7660c38e469114867b53990739130098db571f6369877ee534388ad87f178f1b689c8a66bf020e5b5b2a141aa81485324b370b7473f
 DIST types-psutil-6.0.0.20240621.tar.gz 14857 BLAKE2B 1529a89f836d4ec9fb3707143caecd770a6820f9cd3af02ddf6dd8583eadbbe9c7c10d21fc97eb77f07990f80e43cf6da6bb00e9ca3c881a92dad097e7748eaa SHA512 4799a22db15052e32ab3016829514c425615deaa587ce7436f6978a1bd58ae812608bc4865d57910303bda907322348a6e2cd3ae4d45999f473440d2cff813fb
+DIST types-psutil-6.0.0.20240901.tar.gz 15117 BLAKE2B 1cdcdcb2fe5b67c482b479ab470d2b6fceac324bd059fbe856c228b55040a1b3beabc0dfc7c11febecf19f58fb2ea486b11f442ab87529f8475fb8649dd0d3de SHA512 05a686d3c16b356da056be565f7a77bd6c2c5161e75229bcda80b0b22c6c51407ce5b7c39c8d7c2a6684a98decb92cde3d6dee53265778613b46da499524ac03
diff --git a/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild b/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild
new file mode 100644
index 000000000000..ef07b6767439
--- /dev/null
+++ b/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023-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="Typing stubs for psutil"
+HOMEPAGE="https://pypi.org/project/types-psutil/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index b8c66e9d602d..d6b486884797 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,2 +1,3 @@
-DIST types-setuptools-71.1.0.20240813.tar.gz 42178 BLAKE2B 8978a2279ea1996d4261662e99d0bb29bf308e19c32b056177269e684d4d8dbca022ce1d9d038f0c1abba3ab8fa2d7494c279ed8e922f470d626d9b56d832e86 SHA512 cf8e4e2d70b637c4d876b93e9fda9331a56de902178fae050f1af1f17394eeeb571ee979cc87dc0e7495883b4aaee03b22b09237073a6c595aada20b7e06e44c
-DIST types-setuptools-71.1.0.20240818.tar.gz 42224 BLAKE2B f882b03087e5ba489429334829c14c0a5c01f6fe772f95a33416a40b6e76a5ba130dd370ac3184192977b9a8af20eb1a09b7e819dd28706d4ba1c3a630cddde0 SHA512 b8632bc721452394878eca94f3fe32624c126056e908711f4d87560afd6018de0230e9295aea486ee07ec859528924f2e5c4e649903b515d4db68507a8a2b058
+DIST types-setuptools-73.0.0.20240822.tar.gz 42177 BLAKE2B 71b6edc781ee90d02e0a14b47aaf130a1ef5d07a081047af130593569c60904a19d0979ccc46a1e0b0efa1b0892e653a9bd0232a8b90b0977500f16817b7f0de SHA512 57c0c807f0d10a92c8bf3a0f07cd506706e2c0924f16e12a77b9a8720f732861abdce03c17cdf3825e185fef120667e694cf651d074623f3a1dc364d94079e5a
+DIST types-setuptools-74.0.0.20240831.tar.gz 41726 BLAKE2B 2f69d9d6fd82b5e514ef789028e45305068dce801082e9247d8761e68090c8e232ae377ebcfeb082b718f9ac882ec4aa0ae34ef53ed4dff240da859c28e9cfcf SHA512 35fe7e34cd65ae8dae67cd23668221ae0ac1e9c73f422ae6f03e5a101aa1c6af66d3b1f396b0c8fa88c69b07eab3ae5483964969e786d15f82983cedac7cf2fe
+DIST types-setuptools-74.1.0.20240907.tar.gz 42970 BLAKE2B 06ceaba13ee061d231a0c02196fc97b3e64a7a13d9a728ab0cb5cab728d8944b2ebbb73d77b6c5d805f7fe1cc5f2b34dcae2bf62a12e27d265cd03507092d31e SHA512 623e5904e3d102a603feaa88ac7a4558a06cfc8e25888c013352d3016efdc296fd7dd343466cd646ccc41d9d6c65e789467eb309a5946b282110550589d1126f
diff --git a/dev-python/types-setuptools/types-setuptools-71.1.0.20240813.ebuild b/dev-python/types-setuptools/types-setuptools-73.0.0.20240822.ebuild
index ee31e761550d..ee31e761550d 100644
--- a/dev-python/types-setuptools/types-setuptools-71.1.0.20240813.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-73.0.0.20240822.ebuild
diff --git a/dev-python/types-setuptools/types-setuptools-71.1.0.20240818.ebuild b/dev-python/types-setuptools/types-setuptools-74.0.0.20240831.ebuild
index a4b37c5506f0..a4b37c5506f0 100644
--- a/dev-python/types-setuptools/types-setuptools-71.1.0.20240818.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-74.0.0.20240831.ebuild
diff --git a/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild b/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild
new file mode 100644
index 000000000000..a4b37c5506f0
--- /dev/null
+++ b/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023-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="Typing stubs for setuptools"
+HOMEPAGE="https://pypi.org/project/types-setuptools/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index 938d632930c7..427cbd179973 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -1,4 +1,2 @@
-DIST unearth-0.15.5.tar.gz 283787 BLAKE2B 2910be23141eb0a683766e83eae1cd35a074b98aaba7c25f49f06a321c261583a65bcb2cbd56c129efc1551e2f421e29dde784d3689c0dfc45d420c870a9b112 SHA512 84851788cd6bf6743307bb5a49fff1b6eeadd3f73605f4b2f7ffe1720d50713971d7cf020e17f34bbe755f523400a6149ace9add1c680bb955f6b46e8e092cba
-DIST unearth-0.16.0.tar.gz 283848 BLAKE2B e94989b643450b0e1a12c4bcd65339c1e52acd04a447616779f085297fa13bc09e25527b858383ef2b8d645304ea42f43c41415c930064e0515569a5836cd1fb SHA512 b129c546bdd8b1f364404ad4db8e43d471a1f9e3a2cbc99775a6c3aa5bce99ed127d1cbd859c69f8c2bae7f7c8b907426c2597d27323c6b6f408df047de2410e
-DIST unearth-0.16.1.tar.gz 283913 BLAKE2B 91f599fd21e6100be7e3f3d422d595e4402a652057b327ec2f6baa45f30301ea7571473e17d202017d7d7a92f7b11acdc42d1c655865499b9eeb8bfb1f7c00a3 SHA512 2819c4da65d0bb9492546531012699fa4554d309930de4b9cc8a5319edc19c1863993badaa53c8f646b152abf133043b2d3d3816f2adb9827ed7f25541e5d603
-DIST unearth-0.17.0.tar.gz 284068 BLAKE2B b37c1e9e626f3d6409fb0a22baebedc210df2c76afcb41f12730a5c9ff714bcf94cf7e78b97851676d45a73feec40d630ab5993cad44fabedcec5a771cb78c9f SHA512 2b9ba4d4262baac448b4507547a5887d5a50254e02f050576e68efeb952a57e2e38f93b440a753263abeca4ae062c07d9b702f10d29ff9252af13cfc16978c3d
+DIST unearth-0.17.1.tar.gz 284159 BLAKE2B 55b8f18f06613f0398316bbcadee6b928e6f20fdc978bdde6c0c1ce3b75a46e1cd2734d036302b8b5a98e9ec5a92aa7d00b00ff01ae815149d507cdab2f6dd5f SHA512 3e451d6f40b16520d4a6e1f4ca6f3997bc346f189330c7373089701d9203543f159b5af843aa8144c2b0ca871a84909292b34b5a666e3a0b541fdbc643340050
+DIST unearth-0.17.2.tar.gz 284430 BLAKE2B ca55cd4feb50a3803400bc70f499cfb26c6dd951966f0a37cddde5c186a1f91aa3d041f504d1b85cf632478caaf33a9b4da472070fce1e7b51ea1436d1b7b95a SHA512 927ba9004d8e893bb461a0dd8741476e39cabefca47885708b5d155514726946898dd9eb9870d86982b191aeb189490310108fbb2a70e8983dae4974d711384b
diff --git a/dev-python/unearth/unearth-0.16.1.ebuild b/dev-python/unearth/unearth-0.16.1.ebuild
deleted file mode 100644
index a135cb39bbf1..000000000000
--- a/dev-python/unearth/unearth-0.16.1.ebuild
+++ /dev/null
@@ -1,42 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/httpx-1[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.27.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver -p pytest_mock
-}
diff --git a/dev-python/unearth/unearth-0.17.0.ebuild b/dev-python/unearth/unearth-0.17.0.ebuild
deleted file mode 100644
index a135cb39bbf1..000000000000
--- a/dev-python/unearth/unearth-0.17.0.ebuild
+++ /dev/null
@@ -1,42 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/httpx-1[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.27.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver -p pytest_mock
-}
diff --git a/dev-python/unearth/unearth-0.15.5.ebuild b/dev-python/unearth/unearth-0.17.1.ebuild
index a135cb39bbf1..a135cb39bbf1 100644
--- a/dev-python/unearth/unearth-0.15.5.ebuild
+++ b/dev-python/unearth/unearth-0.17.1.ebuild
diff --git a/dev-python/unearth/unearth-0.16.0.ebuild b/dev-python/unearth/unearth-0.17.2.ebuild
index a135cb39bbf1..a135cb39bbf1 100644
--- a/dev-python/unearth/unearth-0.16.0.ebuild
+++ b/dev-python/unearth/unearth-0.17.2.ebuild
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index d4735f1b0d1f..26c9a5705f4c 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,10 +1,11 @@
-DIST pubgrub-2fac39371a47e7cb821e510aaa4de25405413d29.gh.tar.gz 86987 BLAKE2B cbb08901aca46816279ca748a2d96e841b7a570cd674e4d96ef907a968050f5919a2d41fef240bb715050cf8df7dd6755e3d7f74fc79085bfc1ac2daf0665b09 SHA512 eda3539933dab8961120f1989365f8d5b5900aac5dc22606169e3f5d726bea54d3e8179377884d581941baf6bc57c2d41590477d9d3051923504d3b67824a17f
-DIST pubgrub-3f0ba760951ab0deeac874b98bb18fc90103fcf7.gh.tar.gz 87050 BLAKE2B d76bc40a71ead4c535eff493901247f2ee2f0a213d12db17bf96c89008be482829ff9b0d47196bb04ffc8c20842f15a2c7a4aa663d4c3f6c3eb82461250853ce SHA512 cd55d4512590eb86628d933598bd3f276a09018dce8dd720496f4314872afe1ad8d0b79d16f1b358e4a77a8613c1d06c742117d3a2a9c39e4f34d0ccd86eb536
-DIST reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.gh.tar.gz 39176 BLAKE2B 00b2d0f51e4bbe29649fea50a8cc41c7b4d534f87440dd0bf487e8f7104077ad2cde824673b6624ff71924512b8a6b33ed4ac548f64bfbf78a5e0fb1366a446f SHA512 29f80816d054838af330a0ccfb8509ab22469aaecdb369d4a63c03eb3ed2aea3cc113458dd29c649e5bf7c33dbf5ef8b1e5d5a89e1cca72f9eab212f000c594f
+DIST pubgrub-388685a8711092971930986644cfed152d1a1f6c.gh.tar.gz 87945 BLAKE2B 7c10db2eff97656a379e8beff9f77bf09b4ab2fdd0d5c171e36babc6f3bff08d05774c55a51a23d79144c4110a942764cefa8a1baf7c36174809d2e648f2d12d SHA512 15539076de8fe9a459f70efcf07ccb7f61ced2be9832c4eb7123e7baa2bb85f3263fd4cb5d8b277c28a70ba316d5128d74d59d6f1de96b6e55ef04321a42c4dc
+DIST reqwest-middleware-5e3eaf254b5bd481c75d2710eed055f95b756913.gh.tar.gz 40049 BLAKE2B d284947a108e2d3233a4fa7c9eb5e1a959bc5b569e754861daef076672672b0500cb737b85871d1fc0587bdbf6d5020e03e7c906cb5de34ff2f81c05b66918d1 SHA512 540a71e59a8b57e5e0bd7fad18fed265552bdae4518690a9823c94dcf23ee1d436f91b9cecf21129917b25e78b91d8d7290760edaea68053666e28af7223476e
 DIST rs-async-zip-011b24604fa7bc223daaad7712c0694bac8f0a87.gh.tar.gz 51706 BLAKE2B 354eb52c95ea355521e1e6a7c841102424c47c156fdb0efb62e3cac666ecf289806aeefab8a0273a7c3283429ac81502283bdb5424d5f925621e5c2b1430fd4d SHA512 6650eef354e84daf41a8572b98b29f2873b7f071dd1d6983292c70b2f580fdc50cd26762d2228a70c2b200eae2f40476e6604702aa62cc97558301195bf19eb8
-DIST rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz 96766 BLAKE2B f9efab73c65394e33e090a6292875ebf35e6669b15c356f102eb109784a4503606ae39106cd0ebe3d7d479cb0b30806d7baaaebf22d826836a24f7ed49100934 SHA512 3b845b05d97c5ab5cea286a7c11846838b40bb1fac98a51782600849a53231be8fa205094c6bdd00f6e193c807b10b28f947698696382be99cae0a8d681dabdc
-DIST uv-0.2.29-crates.tar.xz 48592012 BLAKE2B 57492ede8b970171fc00c4f07ff3e9cb39dcd8bbf52433ed966963838bb9af14bfc9fc52ef5ec7e7a01af74598f066bfb5461d683a69390256fab3b69f08360a SHA512 aef3ee357dfc66a2b04967cd4526a5f07ce09e6ea949641ef1934fb774133b93b106c8e5f255bba92fd375b3f1996b7b016682e9e8f1c9afa871781af163e095
-DIST uv-0.2.29.gh.tar.gz 1468793 BLAKE2B b69397a9fa0fb855a876d5c0322c53c01c400f023bae681e9347a5dde13e5d844da06b9016af5aab7ccc1e3482f2a2004f5efcad4887291ee28c455f6198ac31 SHA512 83b34496868cdd903122140ed28d8cf4e503f7be1848ce711aa98e9019a62ce82607b9a7eba189194024f21e376f61805e42d6b8c4544ff7d1a14212e99f5bc1
-DIST uv-0.2.30.gh.tar.gz 1475670 BLAKE2B f497c59a79d50d3a189621139923914dc83a230ae519c93ea5084ed0e01a1caefaa1052d0609f8583deb2192a4f5220d4df72755e7ea95ffbbe96601d56edd14 SHA512 67871699365e38c17dc7a2b10973f5e07a214c48f38187d6cf28541ca650d5107da1049aa1c9eea01ee7ba4acafb3493e175ed3246abb6b5b21838699669e5f2
-DIST uv-0.2.36-crates.tar.xz 49805804 BLAKE2B d9f71866b180e45ddad94432c5e1aad51d3ab82101899a32cb2c571882a7497cca8135f14bc6e5b6e7fc508774e81b525015a445fbda0f880f194e0cd49a4e87 SHA512 34860fc8cc17a959d9d556e25cf134f18a1e9f00f2db604a7225c1f22b6e5051e4dadb502582b3fa03b3ae1be6e4a70ebdd94c08f4a1f18baef8c44b32932123
-DIST uv-0.2.36.gh.tar.gz 2301352 BLAKE2B 93476b89a0896efa87ebf9f49e6c225750ec9cc900dde253edb6f6070cc9ac3f71c7c1f9fd81e09ebe7bb6287a5881e78a63a87c0eeb469bdf3d75f3b77f96a0 SHA512 84de22e464b8e467588ceebdda23089233d42e3080090b2fc0fd7aec2f4b76eee1788f8b23b6e7b9c4e99182ca3ea175b76fb5dedf87767fe3ec534b3264c9b6
+DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
+DIST uv-0.4.2-crates.tar.xz 46277420 BLAKE2B 9f516f586a5e46bbd6c09e116f91e90b563b4de89b2d2dac50f208e4116583ba05418baa998a74f6d31503ec56cb5ff5966cdf579d026c53bcfc500b5e4fb15c SHA512 b30b70225eae9a5970dd18d383d9129b5161cb66942af8796220fe7a58cd3357308111374193d8fc4e1c7fde8a0b62f44e8efd76603411d882df016afecbc69f
+DIST uv-0.4.6.gh.tar.gz 2553065 BLAKE2B f793c01042db0a45b53a57157852ed5035a96bfc58c2cf81eb3d6a59b9eb6315dbd675817e1bca0a34f9d348d10c0668f9213fd11f230f606386405ee4d51c31 SHA512 79b50783596c6307934c378f7f7b60628de3edd8fe75f6675efd406e7e4cb7cd049a3966eefcb2708f8ab925ee5b5e315f6540f2c25693ffe1ee29f2d501523c
+DIST uv-0.4.7.gh.tar.gz 2558161 BLAKE2B 5508af9b6e0d04d165aa3b120be138fb4ccfddd643395175e5d31618ec34a5139567c0162b0ce1c741fed551397d1ec9d9693ce0397d1f0346a5c1df13c20b8d SHA512 8395f96eb36c2131b203de9991b994532047b7928ac1765a426accdaae4ed3a242a8b9554808123f5359d41778d3e7783606265b60d372bed2a0a76fea027e3e
+DIST uv-0.4.8-crates.tar.xz 46272636 BLAKE2B 467c146c8598863c62a7a210f3c20a6a73dc318651d730803eddd5e1ae54eb815b0487e991cc4e2d493813ea6e6e8622ed503d952a63ce7ee3aa9cfbe4d36439 SHA512 b207acd6fa7d7e95d7e0b3201d9d0ae2457d427f866eb292c6e097444e6d596455e1478813cfcf6851abbe936709d4afa155e0c55367a3f9fb25d4387990a84d
+DIST uv-0.4.8.gh.tar.gz 2569754 BLAKE2B 413121093c1a30e75afa62f5dd6496e3686c06e956ef1d633740d498387a7b0c5272b811daf3efe10d5ba95fd628f29ff3e7ee914df03069bff287dce0c96caa SHA512 e1a728d25ca9400ddf7a005da94d217631ee2a1a2b6b2b8421496496ac9379993dc81d8603f523308a9d232a1c20058149868cc413511ef7d3c7a57bd9354938
+DIST uv-0.4.9-crates.tar.xz 46250584 BLAKE2B 6beb0a00885b674f3d8e35c67372d4ba04c6512306f78522fac2ff170d7cc6cb6c0702546da1d1de3dc84397f04258c56558c666b8f935130a0fea1debce01d0 SHA512 676f6a197af92bc9f6716c0e1df1f87d81b1b07dc81c591b94b34b985bbe4a49fb0b319fe8fba7f83d158124af84f64ebefe1ce0119e6238f9ae837e4652c5c0
+DIST uv-0.4.9.gh.tar.gz 2580667 BLAKE2B baadc0d950d57e224d7d4980424ab58c4e278c2d67a06e9d83d778ac5a6b561cdadfc514c5068ce365dbdb4da3b5165e4180567f7abe90f46d5597fce144b91d SHA512 d7746d71f1429df7d39c3f03c02934792124318f92d2eda03b68a255586567d053349e6d294da0910351d976844aee564334540563435d0e60f6a3792088f416
diff --git a/dev-python/uv/uv-0.2.29.ebuild b/dev-python/uv/uv-0.2.29.ebuild
deleted file mode 100644
index f3cf0860cc38..000000000000
--- a/dev-python/uv/uv-0.2.29.ebuild
+++ /dev/null
@@ -1,109 +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;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;3f0ba760951ab0deeac874b98bb18fc90103fcf7;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-retry'
-)
-
-inherit cargo check-reqs
-
-CRATE_PV=0.2.29
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-BDEPEND="
-	>=virtual/rust-1.77
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_prepare() {
-	default
-
-	# remove patch.* that breaks GIT_CRATES
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe/reqwest-middleware\" }@" Cargo.toml || die
-
-	# https://github.com/vorot93/tokio-tar/pull/23
-	# (fortunately uv already depends on portable-atomic, so we don't
-	# have to fight Cargo.lock)
-	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
-	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.2.30.ebuild b/dev-python/uv/uv-0.2.30.ebuild
deleted file mode 100644
index f3cf0860cc38..000000000000
--- a/dev-python/uv/uv-0.2.30.ebuild
+++ /dev/null
@@ -1,109 +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;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;3f0ba760951ab0deeac874b98bb18fc90103fcf7;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-retry'
-)
-
-inherit cargo check-reqs
-
-CRATE_PV=0.2.29
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-BDEPEND="
-	>=virtual/rust-1.77
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_prepare() {
-	default
-
-	# remove patch.* that breaks GIT_CRATES
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe/reqwest-middleware\" }@" Cargo.toml || die
-
-	# https://github.com/vorot93/tokio-tar/pull/23
-	# (fortunately uv already depends on portable-atomic, so we don't
-	# have to fight Cargo.lock)
-	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
-	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.2.36.ebuild b/dev-python/uv/uv-0.2.36.ebuild
deleted file mode 100644
index 742fb33a526d..000000000000
--- a/dev-python/uv/uv-0.2.36.ebuild
+++ /dev/null
@@ -1,109 +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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;2fac39371a47e7cb821e510aaa4de25405413d29;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe;reqwest-middleware-%commit%/reqwest-retry'
-)
-
-inherit cargo check-reqs
-
-CRATE_PV=${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-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-BDEPEND="
-	>=virtual/rust-1.80
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_prepare() {
-	default
-
-	# remove patch.* that breaks GIT_CRATES
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe/reqwest-middleware\" }@" Cargo.toml || die
-
-	# https://github.com/vorot93/tokio-tar/pull/23
-	# (fortunately uv already depends on portable-atomic, so we don't
-	# have to fight Cargo.lock)
-	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
-	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.4.6.ebuild b/dev-python/uv/uv-0.4.6.ebuild
new file mode 100644
index 000000000000..3990f1fa30dc
--- /dev/null
+++ b/dev-python/uv/uv-0.4.6.ebuild
@@ -0,0 +1,114 @@
+# 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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.4.2
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+BDEPEND="
+	>=virtual/rust-1.80
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# remove patch.* that breaks GIT_CRATES
+	local reqmw=${GIT_CRATES[reqwest-middleware]}
+	reqmw=${reqmw#*;}
+	reqmw=${reqmw%;*}
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/uv/uv-0.4.7.ebuild b/dev-python/uv/uv-0.4.7.ebuild
new file mode 100644
index 000000000000..0f6e94f4f948
--- /dev/null
+++ b/dev-python/uv/uv-0.4.7.ebuild
@@ -0,0 +1,142 @@
+# 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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.4.2
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.80
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# remove patch.* that breaks GIT_CRATES
+	local reqmw=${GIT_CRATES[reqwest-middleware]}
+	reqmw=${reqmw#*;}
+	reqmw=${reqmw%;*}
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	pushd "${ECARGO_VENDOR}/tokio-tar-0.3.1" >/dev/null || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+	popd >/dev/null || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
+	# 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_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=
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/uv/uv-0.4.8.ebuild b/dev-python/uv/uv-0.4.8.ebuild
new file mode 100644
index 000000000000..891f045cb8b8
--- /dev/null
+++ b/dev-python/uv/uv-0.4.8.ebuild
@@ -0,0 +1,142 @@
+# 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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.4.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-DFS-2016
+"
+# 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="
+	>=virtual/rust-1.80
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# remove patch.* that breaks GIT_CRATES
+	local reqmw=${GIT_CRATES[reqwest-middleware]}
+	reqmw=${reqmw#*;}
+	reqmw=${reqmw%;*}
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	pushd "${ECARGO_VENDOR}/tokio-tar-0.3.1" >/dev/null || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+	popd >/dev/null || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
+	# 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_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=
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/uv/uv-0.4.9.ebuild b/dev-python/uv/uv-0.4.9.ebuild
new file mode 100644
index 000000000000..ae16e664c50f
--- /dev/null
+++ b/dev-python/uv/uv-0.4.9.ebuild
@@ -0,0 +1,135 @@
+# 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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.4.9
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.80
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# remove patch.* that breaks GIT_CRATES
+	local reqmw=${GIT_CRATES[reqwest-middleware]}
+	reqmw=${reqmw#*;}
+	reqmw=${reqmw%;*}
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
+	# 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_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=
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 79617b86cdd5..0e8b8104d1c5 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1 @@
-DIST uvicorn-0.30.3.gh.tar.gz 723748 BLAKE2B 8191491ebbccf8586e668bc6c14ce0a526d958ee1bf618cbf714bcb0932c36e14bfa4365a3ce88129180dcb0a2ac62b65fd977262f936b31a84267e3d41a971e SHA512 de6299c4b93bb14ea5ef466d2ebb91e24c2b9ae3e47158e924ae8c1f1e58a3fffd39e3e001e647afa47512f9481f5a3e2cce613427600200bcf27c4143c4e608
-DIST uvicorn-0.30.5.gh.tar.gz 723960 BLAKE2B 462cdbe47f035a6b100908e5fa533a9afa7be3232ce79fda372686de54a14ca13771245a98c53b7ad729ba3119cd83b9d4acd5ab4069064f6c9fee3542f7b0be SHA512 9752b415159e152264d0d9a9a93cd82ec3b6ab08fe115698e54ecf5e2534c7c2368e05dfd21486c8711808482a85c563ecf1d5027c09587872aced4f7023a3dc
 DIST uvicorn-0.30.6.gh.tar.gz 724296 BLAKE2B c95ee6764947e51958da2e62627d20bfbef48f065832f6214c7c05b9daf344b76eb6b0ec4ccbc3ebc2502b9f2cc77157dcf90e824cec0a8adc62601ceb4abf0c SHA512 d4c4410648509b14e18c3c86a33df4152e951703d287153a26ad35f4dce35eb594b940d3773cb444119b9bfa72ae3885c54d84b1a09c0c6069b80941f453c2e8
diff --git a/dev-python/uvicorn/uvicorn-0.30.3.ebuild b/dev-python/uvicorn/uvicorn-0.30.3.ebuild
deleted file mode 100644
index 6ca97c2d20bf..000000000000
--- a/dev-python/uvicorn/uvicorn-0.30.3.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=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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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/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/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
-	)
-	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.30.5.ebuild b/dev-python/uvicorn/uvicorn-0.30.5.ebuild
deleted file mode 100644
index 9511a7d54223..000000000000
--- a/dev-python/uvicorn/uvicorn-0.30.5.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=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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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/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/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
-	)
-	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.30.6.ebuild b/dev-python/uvicorn/uvicorn-0.30.6.ebuild
index 9511a7d54223..6ca97c2d20bf 100644
--- a/dev-python/uvicorn/uvicorn-0.30.6.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.30.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/uvloop/uvloop-0.20.0.ebuild b/dev-python/uvloop/uvloop-0.20.0.ebuild
index e644e65585bc..4989ede20d83 100644
--- a/dev-python/uvloop/uvloop-0.20.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.20.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.19.0-cython3.patch.xz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 -riscv sparc x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 8e563f79af98..41fe307b9ff4 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1 +1,2 @@
 DIST validators-0.33.0.tar.gz 70741 BLAKE2B e999d1ea14e2240523537804931fc91f5eb02d4ff35b22e8a292ff8785493ce48cd14ccf0d87ce945739c3e65a79b3a7654a66412bcc41e4e37e0fd87eefad72 SHA512 611844e182319209a2f6305daf3fcfc1801d9ad32179eaa9651844df37bd3d1d42bfd1e69be1e2c4fcd811a231228bc748a12dd6583248d5b572394cb9c9d858
+DIST validators-0.34.0.tar.gz 70955 BLAKE2B 5c757c3b2a0e3557663a0eee5a08fbc43087362f492629cd9fba6f7ea7d5e99544de1a82159338d02af40f434345c3170e9b19873a890690fb0d94526e495892 SHA512 d49df68ef60734d8462c37aea7b7d274ebe4b31d768761c3da6d219d59574bb6efc444e5501073fcddffcdb3752766d19d231a63da682bf02f82739526de884a
diff --git a/dev-python/validators/validators-0.34.0.ebuild b/dev-python/validators/validators-0.34.0.ebuild
new file mode 100644
index 000000000000..ee697b081282
--- /dev/null
+++ b/dev-python/validators/validators-0.34.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021-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 Data Validation for Humans"
+HOMEPAGE="
+	https://github.com/python-validators/validators/
+	https://pypi.org/project/validators/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires eth-hash
+	tests/crypto_addresses/test_eth_address.py
+)
diff --git a/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild b/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild
index b82fe8880935..6cea83071ba0 100644
--- a/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild
+++ b/dev-python/vcrpy/vcrpy-6.0.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-6.0.1.ebuild b/dev-python/vcrpy/vcrpy-6.0.1.ebuild
deleted file mode 100644
index f65324722b8e..000000000000
--- a/dev-python/vcrpy/vcrpy-6.0.1.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
-
-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 ~ia64 ~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[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/kevin1024/vcrpy/pull/823
-	"${FILESDIR}/${P}-httpbin-compat.patch"
-)
-
-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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# SSL problems, might be weak bundle in pytest-httpbin
-				# https://github.com/kevin1024/vcrpy/issues/848
-				"tests/integration/test_urllib2.py::test_cross_scheme"
-				"tests/integration/test_urllib2.py::test_decorator[https]"
-				"tests/integration/test_urllib2.py::test_get_data[https]"
-				"tests/integration/test_urllib2.py::test_post_data[https]"
-				"tests/integration/test_urllib2.py::test_post_decorator[https]"
-				"tests/integration/test_urllib2.py::test_post_unicode_data[https]"
-				"tests/integration/test_urllib2.py::test_response_code[https]"
-				"tests/integration/test_urllib2.py::test_response_headers[https]"
-			)
-			;;
-	esac
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest -m 'not online'
-}
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index fdd656fe9063..d0f158740393 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1 +1,2 @@
 DIST vdirsyncer-0.19.2.tar.gz 123389 BLAKE2B 35cf5e52f669307c7bc545404135bfb5ded3ca6a1b151735ddacd73835054a2e0ab518201ad206929ca845c2a2828c025a918bba54b739db3fa0a8e4e9f5de33 SHA512 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce
+DIST vdirsyncer-0.19.3.tar.gz 125478 BLAKE2B ead135f6906a869c1bd0956723d8ed42740c27aa100afec172a98b8f639f5ccf2240c40054d4a3f1b73d37d429b00f743831b074bdc2aa5daa630be6eb672dd4 SHA512 8651282302ad62b2bb6f7655429492dcff959cedc25e932d2e72deb2bb54406c6b5333fecdb14ae8c08ba3c20602856e8466198e24caee298fc9a08545fd3751
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.3.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.3.ebuild
new file mode 100644
index 000000000000..ca3933ff6329
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 pypi systemd
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="
+	https://github.com/pimutils/vdirsyncer/
+	https://pypi.org/project/vdirsyncer/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
+	dev-python/aiohttp-oauthlib[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/aioresponses[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:, *<[0-9.]*::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/system/utils/test_main.py::test_request_ssl
+	)
+
+	epytest -o addopts= -p asyncio
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_douserunit contrib/vdirsyncer.{service,timer}
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 5c9f8a4026ae..e6393305798c 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1 +1,2 @@
 DIST virtualenv-20.26.3.tar.gz 9057588 BLAKE2B 74268cab291e7f1e3db6a4c56f0ede1d7995069cb5594341d9af0609196a8154e9153f920043b48100c2263b7020c819135e29532483b233f3c37bf3b780592f SHA512 0cd3b4dc082d071305b44dd2aba2b28527e630b6b4bf28b7b6c59f3e061b01c1dfcfb64293f2b1904109e9e27b70a873cc8c3f1a3cde73bfee114943cef92ca7
+DIST virtualenv-20.26.4.tar.gz 9385017 BLAKE2B a9b7f2dd105e6d7e5c85456351fc85fd6b4daa697574b6c1c8d51139d0b64f06fff024d721c4182cadb7c207c03b5f8877917dc79eb6102373503479a9f70215 SHA512 afce31d4bea624c98893d2ab5d7ea02e87e1ea18ae25195864b32c8d127d44fe7e1d07c24949138496f571b71d745d2f571c0b2a895d2282bef04dfe496fcd93
diff --git a/dev-python/virtualenv/virtualenv-20.26.4.ebuild b/dev-python/virtualenv/virtualenv-20.26.4.ebuild
new file mode 100644
index 000000000000..ad9030250af1
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.26.4.ebuild
@@ -0,0 +1,118 @@
+# 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 ~ia64 ~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/waitress/waitress-3.0.0.ebuild b/dev-python/waitress/waitress-3.0.0.ebuild
index cc8fd57bfedb..f00238e95f02 100644
--- a/dev-python/waitress/waitress-3.0.0.ebuild
+++ b/dev-python/waitress/waitress-3.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 21e3d17957ab..802441651452 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,2 +1,5 @@
 DIST watchdog-4.0.1.tar.gz 126583 BLAKE2B fb2499181b466d50e46b4cc18f78bbee0234d4ca533e92d006411475b6795a90e184335a8523d6b08dbf40d65c4c7807484791d6f243206d046dfad7139bd797 SHA512 0d759d1f9e97a6bc4b5578dbee5cdee01fc3a0f684ac1cb9e3f14c9b5f9a1353b992d690e3ac9801d73f2425b48b1320b20ee0b4d1101f0e80a9f6a7a25da01d
 DIST watchdog-4.0.2.tar.gz 126587 BLAKE2B 7de82f861f16a23ca9d6d7dfd32df7a2498fd0cf82e24077d3a21b998e2e5ff789ce60b20d5491a93e63018050714a3815bb7f2fba75aec2efd25a1b36e6255f SHA512 9fe63309ae818ac37d44a75f8635691621da49d95d1ec5d7cdab044f2fd296eb9e970cb5e46ad92029533ab384e3e3d7f5d297ca25c9c9dd99aec96efa3ecb94
+DIST watchdog-5.0.0.tar.gz 127192 BLAKE2B 956009f661cc2a1c604799e3d3c727750bf6d65cf418edcfca268bfefd94ceaf251d18f175f69e0a23ec50ab2349f86706a1a6f1691345968a60d8217609cdc3 SHA512 0dc96f1c89ddc196e54dcaaff2c55c78aa856138fe7a27be5f7aceb7b13c825c4e83e07575fe0fd22aa233be57acbedb5f5dc0d5cd12654fe01815e36d3a3383
+DIST watchdog-5.0.1.tar.gz 127394 BLAKE2B 92397ff7cc9b4af3c3d99c02fcc8f5ae8d757dbefa7e6f91fa0ce0781ee07d9807f3015c31e3073c1d5c8327b7385503f650375a90a8c3d1ad5f48e23201e3be SHA512 643137f6dd569e51662c075a7fa968c3826bb575f109f42643111a0434d52bf533f00fa0b7a7682760c069cef3df67e305cfee568d187df1621f8eba322db9b2
+DIST watchdog-5.0.2.tar.gz 127779 BLAKE2B 91aacf654774ec128594abb0c8127642dbdb6109f5beb4957e65cccc3ad6e338a69141298cddf97ef171fd6d013bc052402011883be4c146f1d8854da48af18d SHA512 ebacbeb0c48b5117500cc3479677dff2982dcbc0792c459f3bda14f56bd0c028cdaee15a8cca9dee06c650a04e290a7850a5abcc9c48995767b1f0ef7fca7ce3
diff --git a/dev-python/watchdog/watchdog-4.0.2.ebuild b/dev-python/watchdog/watchdog-4.0.2.ebuild
index 70fd40c4187a..ef2d65a5fa4d 100644
--- a/dev-python/watchdog/watchdog-4.0.2.ebuild
+++ b/dev-python/watchdog/watchdog-4.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/watchdog-5.0.0.ebuild b/dev-python/watchdog/watchdog-5.0.0.ebuild
new file mode 100644
index 000000000000..70fd40c4187a
--- /dev/null
+++ b/dev-python/watchdog/watchdog-5.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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 optfeature pypi
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# known flaky
+		tests/test_emitter.py::test_close
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -o addopts= -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-5.0.1.ebuild b/dev-python/watchdog/watchdog-5.0.1.ebuild
new file mode 100644
index 000000000000..70fd40c4187a
--- /dev/null
+++ b/dev-python/watchdog/watchdog-5.0.1.ebuild
@@ -0,0 +1,45 @@
+# 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 optfeature pypi
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# known flaky
+		tests/test_emitter.py::test_close
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -o addopts= -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-5.0.2.ebuild b/dev-python/watchdog/watchdog-5.0.2.ebuild
new file mode 100644
index 000000000000..f2759e9ca8d6
--- /dev/null
+++ b/dev-python/watchdog/watchdog-5.0.2.ebuild
@@ -0,0 +1,45 @@
+# 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 optfeature pypi
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# known flaky
+		tests/test_emitter.py::test_close
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -o addopts= -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 128cb149adad..d458990ee737 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -1,73 +1,79 @@
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 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 cc-1.0.96.crate 76576 BLAKE2B e0171d68b04bf2435a858b3d50376580f0740588770064bb695ba49b6827bf1f92aa4e973c8dc55e1622e795d23fa8fe42abd122d5d016e800dd5ea86c4ceb3d SHA512 a3e8058165e61020bb10491dae50fcbffbb411d27d6dc44997a931f424e88cb36d89004165aae9c531244a7026920804222c819d12b1be3e3db571bec181d8a3
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c
 DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
+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 instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9
 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 lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+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 notify-0f87ab12707d231fa44180454d59478d3992eb59.gh.tar.gz 96557 BLAKE2B 6365bff1c274d26cf333af40d6fbe66d6ae661e24f67e955cb4c8d00555ca813226e40684129902c248eb557de300424776576204218fbbcb8333b9384ec010e SHA512 3f100ea3fd443c616d8bcdbebe0d69626bb0f1e5dacdc4798db036f6f657e7684924bbaa1cd83ae958b6b93a47988939243d3987bea2cd72133cd2196b5bec7f
 DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST parking_lot-0.12.2.crate 41723 BLAKE2B 7c9a4f483b09f4e4bb25fc758c80e8259cb02960b791695a061fe595cd6ed9b13f62903513cefb595bd633488b23254dee054a98282162fc4664301ce04853c0 SHA512 42794b06d410771d1ffdfdd4a9cab136cfb80cf95385876a580fc45739fa41f0769adfbf16be54a9a931632e02d2464278c5395092a1d6107703875e9ad112b2
-DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
-DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
-DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
-DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
-DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
-DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
 DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
-DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 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.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 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 wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST watchfiles-0.22.0.gh.tar.gz 46036 BLAKE2B 505d67974bab8a0a14f25f64ebbe1013b4966ebd5531701b5f0297703692603120a034b09a3f17754b4c5de04605432006437eaabd6ed43ddddc11bf28a422fc SHA512 6d3a4478ff90697323e84428fa16db4b8355c7c637e4faa00a025ff1e03fe8f44914fedb2943a6b6b6cad13bdf50bb6e5712de9caa34b66eb64193923eed6504
 DIST watchfiles-0.23.0.gh.tar.gz 45634 BLAKE2B c413955207007cd461e8bc420a00a624c132216ff13599d342f20c10e0ba60a45a723758d8669c216054cc7d7a4057750ad11b919026849f943cab67fcf93d96 SHA512 a36ff033e4493f262a7e0a0eca2d193548d21a647668379bbbfbcb30352d6498f86e9cb27743d852657d02d1cd8bc57bb28b1055f81a76e1c9995310375c3ccc
+DIST watchfiles-0.24.0.gh.tar.gz 46019 BLAKE2B 96d8707327d41e3a9410c291c557641e111d91ca90ec945fc05d4ec2ebab9290a65044024a324bbb1e92f99900e9bd7098933061ddc95369c33226c8aed7924b SHA512 28490350806ca5115ff026223b9ff4f72f2abb9fa2e148ce0ce3f2ffdaa2758b4af5522ec8786bf729560478010260a2fde25c2565aa5a7c2d40594fd5096331
 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 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.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.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.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.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.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.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.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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
diff --git a/dev-python/watchfiles/watchfiles-0.22.0.ebuild b/dev-python/watchfiles/watchfiles-0.22.0.ebuild
deleted file mode 100644
index 0030336939ba..000000000000
--- a/dev-python/watchfiles/watchfiles-0.22.0.ebuild
+++ /dev/null
@@ -1,133 +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=( python3_{10..13} pypy3 )
-
-CRATES="
-	autocfg@1.3.0
-	bitflags@1.3.2
-	bitflags@2.5.0
-	cc@1.0.96
-	cfg-if@1.0.0
-	crossbeam-channel@0.5.12
-	crossbeam-utils@0.8.19
-	filetime@0.2.23
-	fsevent-sys@4.1.0
-	heck@0.4.1
-	indoc@2.0.5
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	libc@0.2.154
-	lock_api@0.4.12
-	log@0.4.21
-	memoffset@0.9.1
-	mio@0.8.11
-	notify@6.1.1
-	once_cell@1.19.0
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	portable-atomic@1.6.0
-	proc-macro2@1.0.81
-	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
-	python3-dll-a@0.2.9
-	quote@1.0.36
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	same-file@1.0.6
-	scopeguard@1.2.0
-	smallvec@1.13.2
-	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.8
-	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
-"
-
-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 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
-
-	# fix version number
-	sed -i -e "/^version/s:0\.0\.0:${PV}:" Cargo.toml || die
-
-	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/watchfiles/watchfiles-0.23.0.ebuild b/dev-python/watchfiles/watchfiles-0.23.0.ebuild
index 29d76b28ac88..7566d6a68321 100644
--- a/dev-python/watchfiles/watchfiles-0.23.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.23.0.ebuild
@@ -87,7 +87,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions CC0-1.0 ISC MIT Unicode-DFS-2016
 "
 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/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/watchfiles/watchfiles-0.24.0.ebuild b/dev-python/watchfiles/watchfiles-0.24.0.ebuild
new file mode 100644
index 000000000000..d11306fff855
--- /dev/null
+++ b/dev-python/watchfiles/watchfiles-0.24.0.ebuild
@@ -0,0 +1,134 @@
+# 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=( 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.154
+	libredox@0.1.3
+	log@0.4.22
+	memoffset@0.9.1
+	mio@0.8.11
+	once_cell@1.19.0
+	portable-atomic@1.6.0
+	proc-macro2@1.0.81
+	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
+	python3-dll-a@0.2.10
+	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.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
+"
+
+declare -A GIT_CRATES=(
+	[notify-types]='https://github.com/samuelcolvin/notify;0f87ab12707d231fa44180454d59478d3992eb59;notify-%commit%/notify-types'
+	[notify]='https://github.com/samuelcolvin/notify;0f87ab12707d231fa44180454d59478d3992eb59;notify-%commit%/notify'
+)
+
+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
+
+	# fix version number
+	sed -i -e "/^version/s:0\.0\.0:${PV}:" Cargo.toml || die
+
+	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/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 577ddec60efd..90c3ad7335ee 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,2 +1 @@
-DIST wcmatch-8.5.2.gh.tar.gz 117532 BLAKE2B f01ce989d1580da6575535a3c025aa50defe779ca723359dab379dda1c4c98d812343773d0130c56f8ebf74dae4472caa188b4b7b323f2df09686ebba297fa9a SHA512 1a79940bc54996f587dda6aacefee212adb4d527be68cc7b762e7e16c0796ebd833bdeb5abe6f48fa3d6d82f720ade054633ce28ee506b17c4d89cccffaa8e70
 DIST wcmatch-9.0.gh.tar.gz 116090 BLAKE2B 6d33886a9f1f0f53c95dcd8adcebffcd50075c54f8a6398d22e372b811dab33a09152c98d982ed817c9230ae0f200e74dac209da785979365aa38a511b790965 SHA512 638a59b70729eeb39a9bc059d08271b8cfe924a9fce4317718b3cc38e057f1176ec87b033f9f30494fce5c1d24560ef22cd0d9e2a4df12c2b765c3e1358756d6
diff --git a/dev-python/wcmatch/wcmatch-8.5.2.ebuild b/dev-python/wcmatch/wcmatch-8.5.2.ebuild
deleted file mode 100644
index 3316e513d847..000000000000
--- a/dev-python/wcmatch/wcmatch-8.5.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} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	>=dev-python/mkdocs-pymdownx-material-extras-2.0
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/
-"
-SRC_URI="
-	https://github.com/facelessuser/wcmatch/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "larry@gentoo.org" || die
-		git config --global user.name "Larry the Cow" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-9.0.ebuild b/dev-python/wcmatch/wcmatch-9.0.ebuild
index 31f842037d84..3316e513d847 100644
--- a/dev-python/wcmatch/wcmatch-9.0.ebuild
+++ b/dev-python/wcmatch/wcmatch-9.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 87f098e314cb..4fec61e42046 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,2 +1 @@
-DIST webcolors-24.6.0.tar.gz 41449 BLAKE2B dd1a0bb3c2efd8b9dae4ab48b38796f9798ab8883d3466039dfd9739dcc65acd7de37c0629996844d486871958b58196e46d04d43b31106d8462abdeb34c8e2e SHA512 22b4eda3c6b0c06c6cb5873f22b63227db4d1f87c8c673556be8a2f58ea4b27aedd1b115b882602a07d997066c973c1b64ba8162abf538fae96ff54e00f699a5
 DIST webcolors-24.8.0.tar.gz 42392 BLAKE2B fafc144aafddeeff00c9614cf3877890012a64c6c1e095f88b3ec6405f13fd274d5c3eafcdaed8d35d453534dac0010e76c19c86cea535c9342456e70cf4b81e SHA512 9a008261fe5283a90d4986a77463ac2614585c421d4ba7c19d99d98f7d13be6cf53f9ef3916a7b5b4af5ebadbbb0ba2fee266b419706f181acbd6a4c012cc5cb
diff --git a/dev-python/webcolors/webcolors-24.6.0.ebuild b/dev-python/webcolors/webcolors-24.6.0.ebuild
deleted file mode 100644
index 32afb009b75e..000000000000
--- a/dev-python/webcolors/webcolors-24.6.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="
-	https://github.com/ubernostrum/webcolors/
-	https://pypi.org/project/webcolors/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-distutils_enable_tests unittest
diff --git a/dev-python/webcolors/webcolors-24.8.0.ebuild b/dev-python/webcolors/webcolors-24.8.0.ebuild
index 79c4c8ebedc0..32afb009b75e 100644
--- a/dev-python/webcolors/webcolors-24.8.0.ebuild
+++ b/dev-python/webcolors/webcolors-24.8.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/webob/webob-1.8.8.ebuild b/dev-python/webob/webob-1.8.8.ebuild
index e905cdfda13e..3b3fe1ffcb9c 100644
--- a/dev-python/webob/webob-1.8.8.ebuild
+++ b/dev-python/webob/webob-1.8.8.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 0583165f45d3..8ab7d72100ec 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/dev-python/websockets/websockets-13.0.1.ebuild b/dev-python/websockets/websockets-13.0.1.ebuild
new file mode 100644
index 000000000000..b2b7fbf0c631
--- /dev/null
+++ b/dev-python/websockets/websockets-13.0.1.ebuild
@@ -0,0 +1,60 @@
+# 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 ~ia64 ~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 e6746eb0179d..270b5b8df17d 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1 +1,2 @@
 DIST WebTest-3.0.0.tar.gz 75871 BLAKE2B e97d050c1077d74e463e3409580d021424f755933bb9d5ac5e119c70c76890d5632e565f03a02f3497e21fed95158c56b199a877fc4575968f6b4af2655db8b6 SHA512 b97a6311d7e3bf653bec93c2390fb75c991d0dea6148680d8b6ff87861c130518a5d150dd157eab9b032b278566ad12c0ac8f5fc2ddbeba31e35de1e1f06f747
+DIST webtest-3.0.1.tar.gz 79278 BLAKE2B 3466e0d291cc8b02f5f11c8174dcf99cf56696d394de195fce721bb4f01cb76140bf39a955a264f84daad091ad8c37b6302e39c351373b77c4ec0d8a40d74575 SHA512 58417f2d533bd8339258f756d16d1f1cf26f89d8bc387cc7a7ba8fa2b30346454c053b531f79238939112b318fe1972d960d681c605e178d223acc53a8784be4
diff --git a/dev-python/webtest/webtest-3.0.0-r1.ebuild b/dev-python/webtest/webtest-3.0.0-r1.ebuild
index f5f6f9fd2d33..3c3e407db9c9 100644
--- a/dev-python/webtest/webtest-3.0.0-r1.ebuild
+++ b/dev-python/webtest/webtest-3.0.0-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/paste[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-3.0.1.ebuild b/dev-python/webtest/webtest-3.0.1.ebuild
new file mode 100644
index 000000000000..7f4c0e248189
--- /dev/null
+++ b/dev-python/webtest/webtest-3.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 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 ~ia64 ~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-0.8.5[${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/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 4f56da93bbe8..2f6e1debcde4 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1 +1 @@
-DIST werkzeug-3.0.3.tar.gz 803342 BLAKE2B 8c47d3131abeb8ce2d92291e08b603152210c44c40156b5399d24b167d0a02daf6adbeafec43e8b33dff940271feec95e9333e637e825f511cd5d03686c1e02e SHA512 fc771c161b37a376a86930c29c8b8052f81fb869cedea8c3c83af1e8b1aba271358c918e3067f3b0ac6d4a1689c8c355bff410d521c73a1909fd0ffc90fee6c6
+DIST werkzeug-3.0.4.tar.gz 803966 BLAKE2B 56e992c61ed977a677ae4ca403adfb335457df2f096eed3589d74f5539282b144e70895e4d403c9fb72621bc145c91315fab0d3ddca5afcc0040c0e582cf05ec SHA512 40ca7a6c54ba5593a854d6fda6c6b0fed08f03aa970ac83c86aa16b434b6f24f204ca425a0fae3f42610ce6e7ff9220224cc927018a7181d673b48b71b848422
diff --git a/dev-python/werkzeug/werkzeug-3.0.3.ebuild b/dev-python/werkzeug/werkzeug-3.0.4.ebuild
index b4d41ca18a50..b4d41ca18a50 100644
--- a/dev-python/werkzeug/werkzeug-3.0.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-3.0.4.ebuild
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 28543063e41e..a6de1d3543f7 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,2 +1 @@
-DIST wheel-0.43.0.tar.gz 99109 BLAKE2B 49e77ba84fb0a9b3bd177d994b9b33f8e5fa2bb8528fe1216fd55e6d749e201ac9a76ff24c8178485bff94d0f7840d42e0aa8f940fc3fe7d91c41411fa1cd907 SHA512 b6213c05263026884c07bdc4d529252f0be013c3fc6d0558008b7130ba90d4ef11e57f155f62f5e2528ddcd78d188530b2b7c78acc15b8168f64935fe6e6393b
 DIST wheel-0.44.0.tar.gz 100733 BLAKE2B 6beefa0875be52fb2dff2921cb87063bcafdf2e31c43963676fbae8aef4e68ea21675aa715f94052edc9f5e8dbbd5e2afe3abc17f521eb36b24fa628b0522bbe SHA512 f0a1efbf70e8a2eebdf7564932bdfa3892940a3fbfc00f256f61be03a51ff9cc5a55570d1d3f5878670be84ab233483453ce754ea46c508574fcf4ec61d480c8
diff --git a/dev-python/wheel/wheel-0.43.0.ebuild b/dev-python/wheel/wheel-0.43.0.ebuild
deleted file mode 100644
index a8b3a7d1ade4..000000000000
--- a/dev-python/wheel/wheel-0.43.0.ebuild
+++ /dev/null
@@ -1,40 +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=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="
-	https://github.com/pypa/wheel/
-	https://pypi.org/project/wheel/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle packaging
-	rm -r src/wheel/vendored || die
-	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
-	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/wheel/wheel-0.44.0.ebuild b/dev-python/wheel/wheel-0.44.0.ebuild
index 61f54c9d7369..705373fb4f70 100644
--- a/dev-python/wheel/wheel-0.44.0.ebuild
+++ b/dev-python/wheel/wheel-0.44.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 5a8c5b582a1a..ffdc88fa9aa9 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1 +1 @@
-DIST widgetsnbextension-4.0.11.tar.gz 1164354 BLAKE2B 85a96be89592ad08c8722c389d8848126da0e9fc235a126c44779aa1188aeeb1cc9e23c5e4f447562f8660dc637947da3410f7068d14949b337ef8d652705b01 SHA512 22b2bea35633212635718a49b33e219dac7688190c2e9c3b0eb560d830c984e7250d357c14e8b13102f493977863722e18cd77dc43dd7e309aa03006d63072cb
+DIST widgetsnbextension-4.0.13.tar.gz 1164730 BLAKE2B c38793d92f9d6877b73b73054974ef4613a3b39e4228b00eae40542178fc4822f5b4e318907d539e9193f9e8428231cdb887513006ff82c3402aba82971909bf SHA512 1e3bc74456da9169a3600b3c1f3f5601afd849e1c989b3c5a57780ff3d4303d6681813646f9343e7261a465292d926bc176e52ac477c0c1bf464263022bfc64b
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.13.ebuild
index 73af9d432021..73af9d432021 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.13.ebuild
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
index f3ad51a5c97d..94253b33e7ed 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 982b0ec3b8de..7632bcdb19e9 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/dev-python/xarray/xarray-2024.9.0.ebuild b/dev-python/xarray/xarray-2024.9.0.ebuild
new file mode 100644
index 000000000000..f6bca7dcdce1
--- /dev/null
+++ b/dev-python/xarray/xarray-2024.9.0.ebuild
@@ -0,0 +1,109 @@
+# 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-2.1[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.24[${PYTHON_USEDEP}]
+	>=dev-python/pandas-2.1[${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/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 79b83abd3c89..86e73dd060b5 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,2 +1,3 @@
 DIST xdoctest-1.1.5.gh.tar.gz 230382 BLAKE2B 0bbcd09464cc48d6450c746fc341892401bfa91a18be45ab340d291a4001a71f6d5a0fca6b3a7e869c2c34ce008e992fdac62fdd898a941659017e9bf68b7ae9 SHA512 6664eef216f7e83236673542bcdd75276c14260dd94026575e4e72ff41c6b4249909659e54a46fda84c49e22954fb169d23a1baf439823d28337731232803781
 DIST xdoctest-1.1.6.gh.tar.gz 230764 BLAKE2B 9a46f5339e5e7c1904f71f80eecfa385d78775aea896cf86b26288f3fdc63045e17b3d420c48a0f53c57c8992d048d2b7610f09276d772c26e147f492a71d3ad SHA512 9d33e315cde68f1731cff8b4311c941a30aba0718a94f81ca198a2efe760c829f6d4984f0d1c273c554aef938d445d2556d78d7f06fbe4160efe5d94acea9a53
+DIST xdoctest-1.2.0.gh.tar.gz 231269 BLAKE2B 5593bfa8a2d4ff6ff13db592e83325c6bd30e6614db969aec7b4072ec788a203024a0e4066b69a34782cc99252d0601a0a3db0c2b70cf5b7f58e9f6dad2de89d SHA512 a33509e494919bbcb630307b0a71f784d7e2be1d1c6422e49c2286218f21202088faa4baabc5e33a836225ca1fd0c12937de15a9a5b90ac4a80f35c8218b0071
diff --git a/dev-python/xdoctest/xdoctest-1.2.0.ebuild b/dev-python/xdoctest/xdoctest-1.2.0.ebuild
new file mode 100644
index 000000000000..70d8909b5a6b
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-1.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="
+	https://github.com/Erotemic/xdoctest/
+	https://pypi.org/project/xdoctest/
+"
+SRC_URI="
+	https://github.com/Erotemic/xdoctest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/test_pytest_cli.py::test_simple_pytest_import_error_cli
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdoctest.plugin
+
+	epytest --pyargs tests xdoctest
+}
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild
index 112f78686dfa..7aed91f78afa 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/xmlschema/xmlschema-3.3.2.ebuild b/dev-python/xmlschema/xmlschema-3.3.2.ebuild
index fb81dec32918..e85c33afb8c7 100644
--- a/dev-python/xmlschema/xmlschema-3.3.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-3.3.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index dbed3a0fbfef..24e3121be2b4 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,2 +1 @@
-DIST xxhash-3.4.1.tar.gz 84220 BLAKE2B 9bf0bc3ea15adbcf9c1b0dd526f406bd20ca11b6c25c2c771e34952d9bd3d2e85d121304bebfe47590573b4da73acf28d1726d0c628239ec9591738462cee3c0 SHA512 ab3c1fa5ce3ebefa13f87c60a700a897a080c576f1ce492bae9c47eb24a9d182cc8e71bfed81c8f0413ee261fd5522bdf44187043c9703958b72fa77e46a8953
 DIST xxhash-3.5.0.tar.gz 84241 BLAKE2B efe3fcfa02b15afd1539aa8667878868430337a9fe1decca03ae402893c743fd6f2e8dbbfae747e54a9bc6b65ba5cf5f4d2170181b88a820e9d4615b2b902ec7 SHA512 0242589264cba67eb535a0fffbfa8f171fe8c1991b8a90a1484311f283c9f49c81cae8a86552c43232aa9ac7ba66c989fda0a21bb403b3e8219b32db53941b2e
diff --git a/dev-python/xxhash/xxhash-3.4.1.ebuild b/dev-python/xxhash/xxhash-3.4.1.ebuild
deleted file mode 100644
index caed6a5e8a64..000000000000
--- a/dev-python/xxhash/xxhash-3.4.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python binding for the xxHash library"
-HOMEPAGE="
-	https://github.com/ifduyue/python-xxhash/
-	https://pypi.org/project/xxhash/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-DEPEND="
-	>=dev-libs/xxhash-0.8.0
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-python_configure_all() {
-	export XXHASH_LINK_SO=1
-}
-
-python_test() {
-	cd tests || die
-	eunittest
-}
diff --git a/dev-python/xxhash/xxhash-3.5.0.ebuild b/dev-python/xxhash/xxhash-3.5.0.ebuild
index 733105cff70f..caed6a5e8a64 100644
--- a/dev-python/xxhash/xxhash-3.5.0.ebuild
+++ b/dev-python/xxhash/xxhash-3.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	>=dev-libs/xxhash-0.8.0
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 5fc801df3ff9..f1dda7826fcc 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1 +1,5 @@
+DIST yarl-1.10.0.tar.gz 158919 BLAKE2B 07560c311c6388555fa10b94490576a0a5352be0ab511173624ca89322ad28281f7995593bc57c195a181dc4b80a5e3866b029294d9ce1d8ab0100036105636b SHA512 8854d04c5beb0cca37b32f0dec370ecf1309fc4f13f6c1c7da02bd9c49d9a8f95cb24218d3ba4e06bbf3d62226d69c87cf8ec8af71506a5680fb837dafba4d24
+DIST yarl-1.11.0.tar.gz 160812 BLAKE2B 166b919d866b2f224517a3b6ad728627aee2171b10f4b53e6a04ab2379cfcbe0105e5c1d4f43b5946b52164b5d8be6a6394a0468a6a9b06507603c4f65c5963b SHA512 826825786a6d8fd9de628fb89b053024e455a3c6fa8e56e059214b7bcdffc41451d8ac6b3d89fc123c3657287d3f8c3d475cb8ea733353bf9c2794b7e79b7bdf
+DIST yarl-1.11.1.tar.gz 162095 BLAKE2B 2fc83033411ec3c1d2a8c4f6b2cbd1fab977a7dd58d4e736e8ecd2a0ddc75ca6db76aa6b7b63ced7b8a29e213caa93ba2858557f1455be705926b8d6efb6e1eb SHA512 a64bc1d9fa93029c54c359cf3667cf2fc1cf35cbea69911521af998bf43852a092844fa206bf3b31d38d2c8ad14f9eab7358020350cda22826486c317abf09f1
+DIST yarl-1.9.11.tar.gz 156445 BLAKE2B a5af473f7e66b1a4e9f97a4ff4e323764a05289e899926c803af16df985d47bdce7aa87d0099015c3a6033eb5cb942feab9879ea135076fdecdfc3d0afa98b94 SHA512 226a357f202693bece39136d595a444221fdde2727bc9d5fe392ccd80e86c6a35cee7d0882c66649b288efae5b3ae4ba1bcabb9844b8f47654c9ccbacc8337c0
 DIST yarl-1.9.4.tar.gz 141869 BLAKE2B 367eac4674bf1190122f10bb1dc1c4f3d5e4263e1d95ff2b871067d55a894dc19a6bb5a6c673d1bed28b3c5f77c704799568edfe639d50f0ae10313eb847352d SHA512 e4f7917f1625b40125abae9a13d61795f97e8cf489735e15cf58476e97c3bcf840b1452482f1f7a737fbb2bdd1dc7bbcfa882d0a7f76a27dfb3aea72b7a66c82
diff --git a/dev-python/yarl/yarl-1.10.0.ebuild b/dev-python/yarl/yarl-1.10.0.ebuild
new file mode 100644
index 000000000000..1655b47881fa
--- /dev/null
+++ b/dev-python/yarl/yarl-1.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-python/yarl/yarl-1.11.0.ebuild b/dev-python/yarl/yarl-1.11.0.ebuild
new file mode 100644
index 000000000000..1655b47881fa
--- /dev/null
+++ b/dev-python/yarl/yarl-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-python/yarl/yarl-1.11.1.ebuild b/dev-python/yarl/yarl-1.11.1.ebuild
new file mode 100644
index 000000000000..1655b47881fa
--- /dev/null
+++ b/dev-python/yarl/yarl-1.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-python/yarl/yarl-1.9.11.ebuild b/dev-python/yarl/yarl-1.9.11.ebuild
new file mode 100644
index 000000000000..4f3c2c57410d
--- /dev/null
+++ b/dev-python/yarl/yarl-1.9.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-python/yattag/Manifest b/dev-python/yattag/Manifest
index 6b18dd3f42c6..878de7a43261 100644
--- a/dev-python/yattag/Manifest
+++ b/dev-python/yattag/Manifest
@@ -1,2 +1 @@
-DIST yattag-1.15.2.tar.gz 28653 BLAKE2B c567390d204e6edc9b90ffdc5b406f9e4bdcf568148ed44dd202176ba31943c32154c4560e8c421c341fcd5fc1fc223451e15edebd249c369b1d779270e00034 SHA512 224fa56f3604bb65513f589ad449b98e00ef19c8503e7f57484e12de1c916d44d56b057d093af899bcc1d9aa1c77ca3a64c4facd97adf4ef2b7e99a5ff19f910
 DIST yattag-1.16.0.tar.gz 29052 BLAKE2B 48c24c7f510e23ce153e9ebf544b023eff0da4938621977fe22c23950643777e9c8adad860c6f80a53001cf65a2932dfaa1963249691d23f2879982a2db1114a SHA512 1cc16a94f162bbef9874dad1adf2a048042379909996a06506494373317f36df247b17feb95693a27643d8bb0440a96892197113b043a12f5701ffb2722d3dad
diff --git a/dev-python/yattag/yattag-1.15.2.ebuild b/dev-python/yattag/yattag-1.15.2.ebuild
deleted file mode 100644
index af0e56587b9e..000000000000
--- a/dev-python/yattag/yattag-1.15.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=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library to generate HTML or XML in a readable, concise and pythonic way"
-HOMEPAGE="
-	https://www.yattag.org/
-	https://github.com/leforestier/yattag/
-	https://pypi.org/project/yattag/
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd test || die
-	eunittest
-}
diff --git a/dev-python/yattag/yattag-1.16.0.ebuild b/dev-python/yattag/yattag-1.16.0.ebuild
index 13a29b4c8f8a..af0e56587b9e 100644
--- a/dev-python/yattag/yattag-1.16.0.ebuild
+++ b/dev-python/yattag/yattag-1.16.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 5cc835485be8..323e80748e03 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1 +1,2 @@
 DIST ytmusicapi-1.8.0.tar.gz 283301 BLAKE2B aa0d0a8b30b75873865360dfe7b0aec436debf5b2e0f96f2d4008f5234d42802a3a84acd55f83244c03995d605718139f30cda21a798d23c841cc4f9a395d4a5 SHA512 5b7d3fef54eef586b007b6bb6f5c81aaf068302de2493fff8e6ce6bdd9387836615bfa9ecd10ce2516effe1707d11de55ad8a967562e8d6faa527c7e808c377a
+DIST ytmusicapi-1.8.1.tar.gz 283291 BLAKE2B e6894c0bede054e41c485ffa86eb6217d09cc3d619d9ec89777f3575325152acfce98467695dcc95d07e8bb4e3cd8de7c93ee9872373db1958eeb1cabe0ead3c SHA512 37b166e550ead565b752e466ab0ec0fd238474f669b79596a3d16626ed2480ecfe0066715c685f39376ed2ea528993ca2a0330b3c4eac9d4fcd096c8d4c20884
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild
new file mode 100644
index 000000000000..b1568c0ab835
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild
@@ -0,0 +1,24 @@
+# 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="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/zenlib/Manifest b/dev-python/zenlib/Manifest
index 2e332f312337..5cb7f0bf7ced 100644
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1,3 +1,3 @@
 DIST zenlib-2.1.2.tar.gz 17293 BLAKE2B 3d5067b9796f31d28d0ca04c842b4ef1807e0557a77c5b6ec5798cfa2aa04ee5e7eafa3549df6add4228e7c3014ca33eb1584c0aee6db9c0acc882f170972b36 SHA512 a0a53ed63a3efe83dc8f49fd512685b82ed383494f404072a47734c02a1955e0a4c9a6c9df48503419c82cb7479783669b6de8deef174a597ab73cad61da5c3e
 DIST zenlib-2.2.0.tar.gz 17727 BLAKE2B 073bbaa252ab000a30602e0a603a8293b8c3a322374ad4172758a6c95d52483b03cc84d4b72aa868168bde03796defb3efca85682ca8f7b7fce6243d8112198f SHA512 4b324e1b56d757536a80d4d5fe31d4087ee8e1a0aa1ff8a19a43252033ea6e5115c55c5c6d69bcae8594bc36c84625b75df2ce93a2f49f7b885179aa05b45d80
-DIST zenlib-2.2.2.tar.gz 17766 BLAKE2B 14f797f8c8779e4a29c2bd36af179823d8c569ca9af6562514601a37c201e5a3204736206f4dab93555b0092231e8af8954d6be31f250f7ca9bb5538987ceefa SHA512 a95d169bc56ae22b6e4dc4c994adb179a53912cdcd1dba70c09be348245badd75ab1d11c6e1095f846d298a46bc9581b14902dd8f29cb7fce22bece410f91c69
+DIST zenlib-2.2.4.tar.gz 17734 BLAKE2B 9c054eafaa8a70231f9ffca241aad0fdd49257f77de02d47ca0fed7636c06a95923b1398ce8b11de7e690aa7be6762e4e0576b82edae15977f6f0b20a7c31c10 SHA512 ad1be96b6cd4f46e342e012cbd93b76fd051b7cd2d03d23b0065978b1d0a15a751ad5866322fd69b70890ed18f154355556b9b8402e6f19d17175340c1b5a0d3
diff --git a/dev-python/zenlib/zenlib-2.2.2.ebuild b/dev-python/zenlib/zenlib-2.2.4.ebuild
index 901021ca3bc9..901021ca3bc9 100644
--- a/dev-python/zenlib/zenlib-2.2.2.ebuild
+++ b/dev-python/zenlib/zenlib-2.2.4.ebuild
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index b74d654ade46..ba082c4d934c 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1 +1,3 @@
 DIST zeroconf-0.132.2.tar.gz 170698 BLAKE2B 7c76e2a00571a19b23f288dc1183da6ce274ebdf3f64f323e282f444011f7cbf90a63e02a991936a2cfa2d227568b31444b8f61f1110588638d4e888dd8749a6 SHA512 686cdfd2f32c6bad03fb5fd287b1e22f2f0b5099a8971dcff1d9fca7e63bc8069b195feb97be710c20fae8c524ab92143e395cdfec26ede103295d1aa4d32a8f
+DIST zeroconf-0.133.0.tar.gz 171328 BLAKE2B 2a32186bf17120d2448383af252a4a47e83c5900187e841974fa7b1fc4ae70b1227cf5baf556f7d24650f75e6f27a6a4a5b4f2f797b47c55d5016d20a1263c1e SHA512 06ec5f4face3578a16a38ebd750c9f74cc38932e840c8615d597807a3b5781adf9bd5bf2f8b438df165993de4f429c45efe9f4751baf7d00b4ebabc348984b41
+DIST zeroconf-0.134.0.tar.gz 171689 BLAKE2B feac4312bc418ff8e703afe4248a2639d55c829ad4ff817d2b07da4b5e486ae4e4c09949522f0241831712b1217496155aae5a523797f78d5d9dea6ec784aca7 SHA512 1d0d9f4a55555f3a1c28ae5c446d6a284a29e35e0cae51d0c2ef7d86f9f55c5b175d644a086adbcc9594d2aa9875d41e9601668514f4b91ff251a77926ee25ee
diff --git a/dev-python/zeroconf/zeroconf-0.133.0.ebuild b/dev-python/zeroconf/zeroconf-0.133.0.ebuild
new file mode 100644
index 000000000000..42ef77fc404f
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.133.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 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
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zeroconf/zeroconf-0.134.0.ebuild b/dev-python/zeroconf/zeroconf-0.134.0.ebuild
new file mode 100644
index 000000000000..42ef77fc404f
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.134.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 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
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 02c296f3185e..b7eba9136534 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,2 @@
-DIST zipp-3.19.2.tar.gz 22922 BLAKE2B 8f4a115079b6faa730a3502592983c13b2db27541cdbd91723fd20f320d22678f3740b01f24b46f7049607c49953ea64fa8e4855d26f28f0683d330b625a2d0b SHA512 3f1b663c4befef774e076845a8a2d2fc414cb768af0e3bccc57b6b694e9ef28e8dd8ae59b596b269f610b082e9c7a92ec3dcd465aad4e5ebe250ea96df89b2cf
-DIST zipp-3.19.3.tar.gz 23169 BLAKE2B be8ab50de2edb2262e78a7047fd06a10a31414b534a649b0ae3297d4ed843fb33141d1fc563accb4dd71b23b7ef7d161f16045139a90349dc757a72d1cf9320a SHA512 a76d50e6405b40dab4806662a26aaf0cff096a8d2462e0da9d81abd1675d64d8c520391277e8225e912a220f1e7965c754e8db24e9917343f2a0808b51a4f69e
 DIST zipp-3.20.0.tar.gz 23244 BLAKE2B cc7d336089b4659ac884658f93246045a617d223cc3db538160cef1d705e781d341f6384ab32928e7ef2c6644cf6a0656f2b6fa23077da5df0ec66d9b2337b8f SHA512 c141c4b8bdaf2ff7639cfb85ba36735da1ca33e68b9fdcb7f350e5bd677ca39def00178aa3d481c733162beed4aa70f93525800f1af0618529ff36ca7e32327e
+DIST zipp-3.20.1.tar.gz 23848 BLAKE2B 53c29d156bc3be25c59057079f26e9a02b426c5d8424ef721c6cebe4927ede8f1c5aadb405c70f57635fc1ad3abe5d511b2cdab32415c47e8faf13162ac72b5d SHA512 ed89c46d39ce703e233929146ce78332bfdd40cfad204c070247882f144fd0ec370c7499ce682ede938593b18870fa1dce8d746a0457e93c38be485378d6b546
diff --git a/dev-python/zipp/zipp-3.19.2.ebuild b/dev-python/zipp/zipp-3.19.2.ebuild
deleted file mode 100644
index 217e9c381f22..000000000000
--- a/dev-python/zipp/zipp-3.19.2.ebuild
+++ /dev/null
@@ -1,53 +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=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="
-	https://github.com/jaraco/zipp/
-	https://pypi.org/project/zipp/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# big_o is only used in test_complexity, that we ignore
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/jaraco-test[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# performance tests are flaky by design
-	tests/test_complexity.py
-)
-
-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 = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.20.0.ebuild b/dev-python/zipp/zipp-3.20.0.ebuild
index 56691701c850..217e9c381f22 100644
--- a/dev-python/zipp/zipp-3.20.0.ebuild
+++ b/dev-python/zipp/zipp-3.20.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # big_o is only used in test_complexity, that we ignore
 BDEPEND="
diff --git a/dev-python/zipp/zipp-3.19.3.ebuild b/dev-python/zipp/zipp-3.20.1.ebuild
index 56691701c850..56691701c850 100644
--- a/dev-python/zipp/zipp-3.19.3.ebuild
+++ b/dev-python/zipp/zipp-3.20.1.ebuild
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 8ba8be0e1f6c..2b534b41cb48 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1 +1,2 @@
 DIST zope.interface-6.4.post2.tar.gz 294539 BLAKE2B c6d892357e2ead04841cc5dde924b560e0cd968d84c607e3d1d2ebd804c2d1fbc764a721e8182ffd373a6339967b5230153e3e4934359028e98a0ad4e26c92a9 SHA512 da53c2136a6057de49374a428e855ad731288e45f27787d255073adb188680cb46a7b493258da01d6bbce5d7c7181306b64eb90609520aab361ac07dfba00d4b
+DIST zope.interface-7.0.3.tar.gz 252504 BLAKE2B 958605f010f7d282c8850160322bcc8ae4343508ff56d4ae2547815ac5dee76b39d9f7296402d1ccb9d410c64eabf5001be3df59d3768f9a400eaf0f4c94f1ad SHA512 fd086290943b6748b451ea0d375cd9d11a94a1d13c734cbd2834b062600400b5f7381e2b00fcdf6abbaaabf1abf687d15d44e81dd6967c39cbd19f9833b6c4dc
diff --git a/dev-python/zope-interface/zope-interface-7.0.3.ebuild b/dev-python/zope-interface/zope-interface-7.0.3.ebuild
new file mode 100644
index 000000000000..2dd576235243
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-7.0.3.ebuild
@@ -0,0 +1,48 @@
+# 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
+PYPI_PN=${PN/-/.}
+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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -e "/'setuptools'/d" -i 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-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 328e0964f1e4..4bf80b646983 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1 @@
-DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
-DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc
 DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176 SHA512 5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a
diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
new file mode 100644
index 000000000000..e296f5bf68be
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/937600
+
+qt-creator has a workaround for clang (formerly) lacking an implementation
+for __cpp_template_template_args, but the workaround causes issues now that
+it is available.
+
+https://github.com/llvm/llvm-project/pull/89807
+https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1
+--- a/src/libs/utils/algorithm.h
++++ b/src/libs/utils/algorithm.h
+@@ -259,5 +259,5 @@
+          typename ResultContainer = C<Result>>
+ Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
+-#ifdef Q_CC_CLANG
++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
+ // "Matching of template template-arguments excludes compatible templates"
+ // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0)
+@@ -810,5 +810,5 @@
+ }
+ 
+-#ifdef Q_CC_CLANG
++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
+ template<template<typename, typename> class C, // result container type
+          typename SC,                          // input container type
diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
new file mode 100644
index 000000000000..29e600ca33ef
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/938486
+https://bugs.gentoo.org/937600
+https://bugs.gentoo.org/936924
+https://bugreports.qt.io/browse/QTCREATORBUG-31517
+https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f
+https://codereview.qt-project.org/c/qt-creator/qt-creator/+/587620
+--- a/src/libs/3rdparty/sol2/include/sol/sol.hpp
++++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp
+@@ -6818,7 +6818,8 @@
+ 			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+ 
+ 			*this = nullopt;
+-			this->construct(std::forward<Args>(args)...);
++			new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
++			return **this;
+ 		}
+ 
+ 		/// Swaps this optional with the other.
diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
deleted file mode 100644
index ee0fcd198e6e..000000000000
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ /dev/null
@@ -1,268 +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.2.0:6 # IDE_QT_VERSION_MIN
-
-# := 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 'sys-devel/clang:${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/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
-)
-
-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_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
-		-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_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_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
-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:
-- 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-14.0.0.ebuild b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
deleted file mode 100644
index a04b85dcdd48..000000000000
--- a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
+++ /dev/null
@@ -1,268 +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 '
-			sys-devel/clang:${LLVM_SLOT}=
-			sys-devel/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/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
-)
-
-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_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:
-- 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-14.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
index a04b85dcdd48..57312a5304e4 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -25,7 +25,7 @@ else
 	[[ ${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"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
@@ -91,6 +91,8 @@ BDEPEND="
 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.1-sol2-clang19-gcc15.patch
 )
 
 pkg_setup() {
diff --git a/dev-qt/qt3d/qt3d-6.8.9999.ebuild b/dev-qt/qt3d/qt3d-6.8.9999.ebuild
index 5e1b7809f57e..c67d6bef95e6 100644
--- a/dev-qt/qt3d/qt3d-6.8.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.8.9999.ebuild
@@ -30,7 +30,6 @@ 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.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
index 5e1b7809f57e..c67d6bef95e6 100644
--- a/dev-qt/qt3d/qt3d-6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -30,7 +30,6 @@ 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/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
new file mode 100644
index 000000000000..02219feaf681
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000000..353383921b7f
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.7.2-qwindowprivate-crash.patch
@@ -0,0 +1,28 @@
+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.8.0-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch
new file mode 100644
index 000000000000..e5f14e0a1c73
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/938475
+https://codereview.qt-project.org/c/qt/qtbase/+/585668
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Aug 2024 17:34:22 +0100
+Subject: [PATCH] QContiguousCache: fix include for qMin
+
+Include `<QtCore/qminmax.h>` for `qMin`. This came up downstream
+in Gentoo at https://bugs.gentoo.org/938475.
+--- a/src/corelib/tools/qcontiguouscache.h
++++ b/src/corelib/tools/qcontiguouscache.h
+@@ -10,2 +10,3 @@
+ #include <QtCore/qtcoreexports.h>
++#include <QtCore/qminmax.h>
+ #include <QtCore/qttypetraits.h>
diff --git a/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild
deleted file mode 100644
index 68a5c8f9e4fa..000000000000
--- a/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild
+++ /dev/null
@@ -1,359 +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="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc 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
-				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
-)
-
-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() {
-	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
-		')
-		# bug #914033
-		$(usev sparc '
-			tst_qbuffer
-			tst_qtconcurrentiteratekernel
-		')
-		# 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.2-r4.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
new file mode 100644
index 000000000000..e7e909a26a94
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild
@@ -0,0 +1,368 @@
+# 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 ~sparc 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
+)
+
+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
+		')
+		# bug #914033
+		$(usev sparc '
+			tst_qbuffer
+			tst_qtconcurrentiteratekernel
+		')
+		# 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.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index e4a66f7137f8..85c2de60245c 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -99,7 +99,7 @@ COMMON_DEPEND="
 			cups? ( net-print/cups )
 			gtk? (
 				x11-libs/gdk-pixbuf:2
-				x11-libs/gtk+:3
+				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
 				x11-libs/pango
 			)
 		)
@@ -145,7 +145,7 @@ PATCHES=(
 	"${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-gcc15-odr.patch
+	"${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch
 )
 
 src_prepare() {
@@ -166,6 +166,12 @@ src_prepare() {
 }
 
 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
 
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 9af015d9b088..0f983d79ae6f 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -99,7 +99,7 @@ COMMON_DEPEND="
 			cups? ( net-print/cups )
 			gtk? (
 				x11-libs/gdk-pixbuf:2
-				x11-libs/gtk+:3
+				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
 				x11-libs/pango
 			)
 		)
@@ -145,7 +145,7 @@ PATCHES=(
 	"${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-gcc15-odr.patch
+	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
 )
 
 src_prepare() {
@@ -166,6 +166,12 @@ src_prepare() {
 }
 
 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
 
@@ -297,6 +303,8 @@ src_test() {
 		# may randomly hang+timeout, perhaps related to -j as well
 		tst_qprocess #936484
 		tst_qtimer
+		# haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+		tst_qlatin1stringmatcher
 		# 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)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 9af015d9b088..3c595f73638f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit qt6-build toolchain-funcs
+inherit flag-o-matic qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -99,7 +99,7 @@ COMMON_DEPEND="
 			cups? ( net-print/cups )
 			gtk? (
 				x11-libs/gdk-pixbuf:2
-				x11-libs/gtk+:3
+				>=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
 				x11-libs/pango
 			)
 		)
@@ -145,7 +145,6 @@ PATCHES=(
 	"${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-gcc15-odr.patch
 )
 
 src_prepare() {
@@ -166,6 +165,12 @@ src_prepare() {
 }
 
 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
 
@@ -297,6 +302,8 @@ src_test() {
 		# may randomly hang+timeout, perhaps related to -j as well
 		tst_qprocess #936484
 		tst_qtimer
+		# haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+		tst_qlatin1stringmatcher
 		# 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)
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild
index da4242aa89dc..c9923654ba1c 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+bluetooth nfc smartcard"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
index 9f8e25a38f2c..ed26392897ad 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+bluetooth neard nfc smartcard"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
index 9f8e25a38f2c..ed26392897ad 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+bluetooth neard nfc smartcard"
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
new file mode 100644
index 000000000000..d364699fc401
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
@@ -0,0 +1,42 @@
+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/qtmultimedia-6.7.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild
deleted file mode 100644
index f86755c55902..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild
+++ /dev/null
@@ -1,121 +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 )
-	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
-)
-
-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.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
new file mode 100644
index 000000000000..75aefa2fa156
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
@@ -0,0 +1,122 @@
+# 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.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index 3b8589664575..2921a408326e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -11,15 +11,20 @@ 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"
+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 )
-	vaapi? ( ffmpeg opengl )
+	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? (
@@ -37,8 +42,12 @@ RDEPEND="
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
+		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 )
@@ -61,6 +70,7 @@ CMAKE_SKIP_TESTS=(
 	# tries to use real alsa or pulseaudio and fails in sandbox
 	tst_qaudiosink
 	tst_qaudiosource
+	tst_qmediacapture_gstreamer
 	tst_qmediacapturesession
 	tst_qmediaplayerbackend
 	tst_qsoundeffect
@@ -81,7 +91,13 @@ src_configure() {
 		$(cmake_use_find_package qml Qt6Qml)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
+		$(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)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index fe60a09af174..abc7252aee13 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -18,7 +18,7 @@ IUSE="
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl )
+	eglfs? ( ffmpeg opengl qml )
 	screencast? ( ffmpeg )
 	test? ( qml )
 	vaapi? ( ffmpeg opengl )
@@ -76,7 +76,9 @@ CMAKE_SKIP_TESTS=(
 	# tries to use real alsa or pulseaudio and fails in sandbox
 	tst_qaudiosink
 	tst_qaudiosource
+	tst_qmediacapture_gstreamer
 	tst_qmediacapturesession
+	tst_qmediaframeinputsbackend
 	tst_qmediaplayerbackend
 	tst_qsoundeffect
 	# may try to use v4l2 or hardware acceleration depending on availability
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index fe60a09af174..abc7252aee13 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -18,7 +18,7 @@ IUSE="
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl )
+	eglfs? ( ffmpeg opengl qml )
 	screencast? ( ffmpeg )
 	test? ( qml )
 	vaapi? ( ffmpeg opengl )
@@ -76,7 +76,9 @@ CMAKE_SKIP_TESTS=(
 	# tries to use real alsa or pulseaudio and fails in sandbox
 	tst_qaudiosink
 	tst_qaudiosource
+	tst_qmediacapture_gstreamer
 	tst_qmediacapturesession
+	tst_qmediaframeinputsbackend
 	tst_qmediaplayerbackend
 	tst_qsoundeffect
 	# may try to use v4l2 or hardware acceleration depending on availability
diff --git a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
index b668e25bbabd..1b13d4434223 100644
--- a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild
index b668e25bbabd..1b13d4434223 100644
--- a/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtspeech/qtspeech-6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
index b668e25bbabd..1b13d4434223 100644
--- a/dev-qt/qtspeech/qtspeech-6.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild
index fd8e80ea6380..da97fd670c79 100644
--- a/dev-qt/qttools/qttools-6.7.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.7.9999.ebuild
@@ -36,8 +36,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
 	clang? (
 		$(llvm_gen_dep '
 			sys-devel/clang:${LLVM_SLOT}=
@@ -45,12 +45,12 @@ RDEPEND="
 		')
 	)
 	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
+		~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[gles2-only=,vulkan=] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
 	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="
diff --git a/dev-qt/qttools/qttools-6.8.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild
index 5ad1c0f2b81d..22ec0d708b1f 100644
--- a/dev-qt/qttools/qttools-6.8.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.8.9999.ebuild
@@ -37,8 +37,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
 	clang? (
 		$(llvm_gen_dep '
 			sys-devel/clang:${LLVM_SLOT}=
@@ -46,13 +46,13 @@ RDEPEND="
 		')
 	)
 	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
+		~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?] )
 	qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
 	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="
@@ -93,8 +93,6 @@ src_configure() {
 		# QtHelp into another package so that qtdeclarative can depend on it
 		# without a circular dependency with qttools
 		$(cmake_use_find_package qmlls Qt6QmlLSPrivate)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 5ad1c0f2b81d..22ec0d708b1f 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -37,8 +37,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
 	clang? (
 		$(llvm_gen_dep '
 			sys-devel/clang:${LLVM_SLOT}=
@@ -46,13 +46,13 @@ RDEPEND="
 		')
 	)
 	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
+		~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?] )
 	qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
 	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="
@@ -93,8 +93,6 @@ src_configure() {
 		# QtHelp into another package so that qtdeclarative can depend on it
 		# without a circular dependency with qttools
 		$(cmake_use_find_package qmlls Qt6QmlLSPrivate)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 4315b3198309..49de5422603a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -203,8 +203,8 @@ src_configure() {
 		# 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)
+		# 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)
@@ -243,16 +243,7 @@ src_configure() {
 		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 '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 937f5ca9c883..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
 	x11-libs/libxshmfence
 	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -128,7 +127,7 @@ qtwebengine_check-reqs() {
 		ewarn "If run into issues, please try disabling before reporting a bug."
 	fi
 
-	local CHECKREQS_DISK_BUILD=8G
+	local CHECKREQS_DISK_BUILD=9G
 	local CHECKREQS_DISK_USR=360M
 
 	if ! has distcc ${FEATURES}; then #830661
@@ -192,7 +191,8 @@ src_configure() {
 		$(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
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
 		-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
 		# 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)
+		# 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)
@@ -217,6 +217,7 @@ src_configure() {
 			minizip opus poppler snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
 	)
 
@@ -243,16 +244,7 @@ src_configure() {
 		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 '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
@@ -277,6 +269,7 @@ src_test() {
 
 	local CMAKE_SKIP_TESTS=(
 		# fails with network sandbox
+		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 937f5ca9c883..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
 	x11-libs/libxshmfence
 	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -128,7 +127,7 @@ qtwebengine_check-reqs() {
 		ewarn "If run into issues, please try disabling before reporting a bug."
 	fi
 
-	local CHECKREQS_DISK_BUILD=8G
+	local CHECKREQS_DISK_BUILD=9G
 	local CHECKREQS_DISK_USR=360M
 
 	if ! has distcc ${FEATURES}; then #830661
@@ -192,7 +191,8 @@ src_configure() {
 		$(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
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
 		-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
 		# 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)
+		# 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)
@@ -217,6 +217,7 @@ src_configure() {
 			minizip opus poppler snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
 	)
 
@@ -243,16 +244,7 @@ src_configure() {
 		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 '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
@@ -277,6 +269,7 @@ src_test() {
 
 	local CMAKE_SKIP_TESTS=(
 		# fails with network sandbox
+		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/actioncable/actioncable-7.1.4.ebuild b/dev-ruby/actioncable/actioncable-7.1.4.ebuild
new file mode 100644
index 000000000000..2a23b3ae5ec6
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+	)"
diff --git a/dev-ruby/actioncable/actioncable-7.2.1.ebuild b/dev-ruby/actioncable/actioncable-7.2.1.ebuild
new file mode 100644
index 000000000000..0525d06bf7c6
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.2.1.ebuild
@@ -0,0 +1,56 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="-Ilib test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		|| ( dev-ruby/rack:3.1 dev-ruby/rack:3.0 dev-ruby/rack:2.2 )
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/pg-1.1:1
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for unpackaged dependencies: websocket-client-simple
+	rm -f test/client_test.rb || die
+
+	# Avoid tests for dependencies that require additional setup or network
+	rm -f test/javascript_package_test.rb test/subscription_adapter/redis_test.rb || die
+}
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.1.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.1.4.ebuild
new file mode 100644
index 000000000000..aaf83b522d6a
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.1.4.ebuild
@@ -0,0 +1,65 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/minitest:5
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(cable\|doc\|job\|lint\|mdl\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.2.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.2.1.ebuild
new file mode 100644
index 000000000000..9e382eb45cfc
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.2.1.ebuild
@@ -0,0 +1,65 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.8.0:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/minitest:5
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\|httpclient\|prism\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(cable\|doc\|job\|lint\|mdl\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/actionmailer/actionmailer-7.1.4.ebuild b/dev-ruby/actionmailer/actionmailer-7.1.4.ebuild
new file mode 100644
index 000000000000..b1b4a4eff17d
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.1.4.ebuild
@@ -0,0 +1,54 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+	>=dev-ruby/rails-dom-testing-2.2:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -e '/\/load_paths/d' \
+		-e '3irequire "ostruct"' \
+		-e '3igem "actionpack", "~> 7.1.0"; gem "activejob", "~> 7.1.0"' \
+		-i test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-7.2.1.ebuild b/dev-ruby/actionmailer/actionmailer-7.2.1.ebuild
new file mode 100644
index 000000000000..547e66b12570
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.2.1.ebuild
@@ -0,0 +1,54 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.8.0
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+	>=dev-ruby/rails-dom-testing-2.2:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -e '/\/load_paths/d' \
+		-e '3irequire "ostruct"' \
+		-e '3igem "actionpack", "~> 7.2.0"; gem "activejob", "~> 7.2.0"' \
+		-i test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/actionpack/actionpack-7.0.8.4.ebuild b/dev-ruby/actionpack/actionpack-7.0.8.4.ebuild
index bf3a73b339b6..77e3d254bd73 100644
--- a/dev-ruby/actionpack/actionpack-7.0.8.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-7.0.8.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-7.1.4.ebuild b/dev-ruby/actionpack/actionpack-7.1.4.ebuild
new file mode 100644
index 000000000000..94a5fc62544a
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.1.4.ebuild
@@ -0,0 +1,73 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+	>=dev-ruby/rack-2.2.4
+	>=dev-ruby/rack-session-1.0.1
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/bundler
+		>=dev-ruby/capybara-3.26
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		dev-ruby/selenium-webdriver:4
+		www-servers/puma
+		dev-ruby/minitest:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Fix errors loading rack/session with rack 3.0 and missing OpenStruct
+	sed -e '2igem "rack-session"; require "ostruct"' \
+		-e '3igem "railties", "~> 7.1.0"; gem "activemodel", "~> 7.1.0"' \
+		-i test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests that fail with a fixed cgi.rb version
+	sed -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-7.2.1.ebuild b/dev-ruby/actionpack/actionpack-7.2.1.ebuild
new file mode 100644
index 000000000000..2de56f980add
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.2.1.ebuild
@@ -0,0 +1,73 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+	dev-ruby/racc
+	|| ( dev-ruby/rack:3.1 dev-ruby/rack:3.0 >=dev-ruby/rack-2.2.4:2.2 )
+	>=dev-ruby/rack-session-1.0.1
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+	>=dev-ruby/useragent-0.16:0
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/bundler
+		>=dev-ruby/capybara-3.26
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		dev-ruby/selenium-webdriver:4
+		www-servers/puma
+		dev-ruby/minitest:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Fix errors loading rack/session with rack 3.0 and missing OpenStruct
+	sed -i -e '2igem "rack-session"; require "ostruct"' test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests that fail with a fixed cgi.rb version
+	sed -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/actiontext/actiontext-7.1.4.ebuild b/dev-ruby/actiontext/actiontext-7.1.4.ebuild
new file mode 100644
index 000000000000..8cbcb5a53e47
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.1.4.ebuild
@@ -0,0 +1,64 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/importmap-rails-1.2.3
+	dev-ruby/minitest:5
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/cssbundling-rails/ s:^:#:' \
+		-e '/tailwindcss-rails/,/dartsass-rails/ s:^:#:' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|lint\|mdl\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-7.2.1.ebuild b/dev-ruby/actiontext/actiontext-7.2.1.ebuild
new file mode 100644
index 000000000000..72affcc6154f
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.2.1.ebuild
@@ -0,0 +1,64 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/importmap-rails-1.2.3
+	dev-ruby/minitest:5
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\|httpclient\|prism\)/ s:^:#:" \
+		-e '/stimulus-rails/,/cssbundling-rails/ s:^:#:' \
+		-e '/tailwindcss-rails/,/dartsass-rails/ s:^:#:' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|lint\|mdl\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/actionview/actionview-7.0.8.4.ebuild b/dev-ruby/actionview/actionview-7.0.8.4.ebuild
index a50a2fd90ad1..daba3bf4c529 100644
--- a/dev-ruby/actionview/actionview-7.0.8.4.ebuild
+++ b/dev-ruby/actionview/actionview-7.0.8.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-7.1.4.ebuild b/dev-ruby/actionview/actionview-7.1.4.ebuild
new file mode 100644
index 000000000000..fb3cb5feef80
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.1.4.ebuild
@@ -0,0 +1,77 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.11:0
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/capybara
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+		dev-ruby/minitest:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+
+	sed -e '3irequire "ostruct"' \
+		-e '3igem "railties", "~> 7.1.0"; gem "activerecord", "~> 7.1.0"' \
+		-i test/abstract_unit.rb || die
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-7.2.1.ebuild b/dev-ruby/actionview/actionview-7.2.1.ebuild
new file mode 100644
index 000000000000..8ff948034e09
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.2.1.ebuild
@@ -0,0 +1,87 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.11:0
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/capybara
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+		dev-ruby/minitest:5
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+
+	sed -e '3irequire "ostruct"' \
+		-i test/abstract_unit.rb || die
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
+
+each_ruby_prepare() {
+	# The new prism parser is currently unpackaged and only included with ruby33.
+	case ${RUBY} in
+		*ruby31|*ruby32)
+			sed -e '/prism/ s:^:#:' \
+				-e '/PrismRubyTrackerTest/,/^end/ s:^:#:' \
+				-i test/template/dependency_tracker_test.rb || die
+			;;
+	esac
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/activejob/activejob-7.0.8.4.ebuild b/dev-ruby/activejob/activejob-7.0.8.4.ebuild
index f936f6ce2b63..717af8827259 100644
--- a/dev-ruby/activejob/activejob-7.0.8.4.ebuild
+++ b/dev-ruby/activejob/activejob-7.0.8.4.ebuild
@@ -39,7 +39,9 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+	sed -e '/load_paths/d' \
+		-e '2igem "activesupport", "~> 7.0.0"' \
+		-i test/helper.rb || die "Unable to remove load paths"
 
 	# Remove all currently unpackaged queues.
 	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
diff --git a/dev-ruby/activejob/activejob-7.1.4.ebuild b/dev-ruby/activejob/activejob-7.1.4.ebuild
new file mode 100644
index 000000000000..f936f6ce2b63
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.1.4.ebuild
@@ -0,0 +1,49 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/zeitwerk
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+	rm -f test/cases/delayed_job_adapter_test.rb || die
+}
diff --git a/dev-ruby/activejob/activejob-7.2.1.ebuild b/dev-ruby/activejob/activejob-7.2.1.ebuild
new file mode 100644
index 000000000000..b5900204d70f
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.2.1.ebuild
@@ -0,0 +1,49 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/zeitwerk
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+	rm -f test/cases/delayed_job_adapter_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/activemodel/activemodel-7.0.8.4.ebuild b/dev-ruby/activemodel/activemodel-7.0.8.4.ebuild
index 7e7a70d84a6e..45b1361204b2 100644
--- a/dev-ruby/activemodel/activemodel-7.0.8.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-7.0.8.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-7.1.4.ebuild b/dev-ruby/activemodel/activemodel-7.1.4.ebuild
new file mode 100644
index 000000000000..9dcfabb7d352
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.1.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+		dev-ruby/minitest:5
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -e '/load_paths/d' \
+		-e '2igem "activesupport", "~> 7.1.0"; gem "railties", "~> 7.1.0"' \
+	   -i test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-7.2.1.ebuild b/dev-ruby/activemodel/activemodel-7.2.1.ebuild
new file mode 100644
index 000000000000..e9b1b16cf5ad
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+		dev-ruby/minitest:5
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/activerecord/activerecord-7.0.8.4.ebuild b/dev-ruby/activerecord/activerecord-7.0.8.4.ebuild
index a54e5f49a275..0d7a333f6c54 100644
--- a/dev-ruby/activerecord/activerecord-7.0.8.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.0.8.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="mysql postgres sqlite test"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/activerecord-7.1.4.ebuild b/dev-ruby/activerecord/activerecord-7.1.4.ebuild
new file mode 100644
index 000000000000..047b6bfb8b3a
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.1.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/timeout-0.4.0
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/benchmark-ips
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activejob-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+	sed -e '3igem "activejob", "~> 7.1.0"; gem "activemodel", "~> 7.1.0"; gem "railties", "~> 7.1.0"' \
+		-i test/cases/helper.rb || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test requiring specific locales
+	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die
+
+	# Avoid test not compatible with new sqlite versions
+	sed -e '/test_strict_strings_by_default/askip "Fails with newer sqlite"' \
+		-i test/cases/adapters/sqlite3/sqlite3_adapter_test.rb || die
+
+	# Avoid tests requiring a full Rails setup
+	rm -f test/cases/adapters/sqlite3/dbconsole_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activerecord/activerecord-7.2.1.ebuild b/dev-ruby/activerecord/activerecord-7.2.1.ebuild
new file mode 100644
index 000000000000..35342f898b62
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.2.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/timeout-0.4.0
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/benchmark-ips
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activejob-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test requiring specific locales
+	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die
+
+	# Avoid test not compatible with new sqlite versions
+	sed -e '/test_strict_strings_by_default/askip "Fails with newer sqlite"' \
+		-i test/cases/adapters/sqlite3/sqlite3_adapter_test.rb || die
+
+	# Avoid tests requiring a full Rails setup
+	rm -f test/cases/adapters/sqlite3/dbconsole_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/activestorage/activestorage-7.1.4.ebuild b/dev-ruby/activestorage/activestorage-7.1.4.ebuild
new file mode 100644
index 000000000000..06e227f4428b
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.1.4.ebuild
@@ -0,0 +1,74 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( >=app-text/mupdf-1.23.7 media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/marcel:1.0
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/minitest:5
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sprockets-rails
+		>=dev-ruby/sqlite3-1.6.6
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|webrick\|propshaft\|sprockets-export\|rack-test\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|job\|lint\|mdl\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Use mini_magick since vips is not packaged on Gentoo
+	sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
+	# Avoid vips-specific tests
+	sed -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' \
+		-i test/models/variant_test.rb || die
+
+	# Avoid test where different ffmpeg versions apply different rounding for the duration.
+	sed -i -e '/1.022000/ s:^:#:' test/analyzer/video_analyzer_test.rb || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
diff --git a/dev-ruby/activestorage/activestorage-7.2.1.ebuild b/dev-ruby/activestorage/activestorage-7.2.1.ebuild
new file mode 100644
index 000000000000..bec893851e65
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.2.1.ebuild
@@ -0,0 +1,74 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( >=app-text/mupdf-1.23.7 media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/marcel:1.0
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/minitest:5
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sprockets-rails
+		>=dev-ruby/sqlite3-1.6.6
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|webrick\|propshaft\|sprockets-export\|rack-test\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\|httpclient\|prism\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|job\|lint\|mdl\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Use mini_magick since vips is not packaged on Gentoo
+	sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
+	# Avoid vips-specific tests
+	sed -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' \
+		-i test/models/variant_test.rb || die
+
+	# Avoid test where different ffmpeg versions apply different rounding for the duration.
+	sed -i -e '/1.022000/ s:^:#:' test/analyzer/video_analyzer_test.rb || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 3b0a85069247..6ca0cd7d0706 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -4,4 +4,6 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
 DIST rails-7.2.0.tgz 11064433 BLAKE2B 6d5a24f381e81809a030d2bdabfe0b4af68a5407558c3b60c4562c86277c6e823bc9435b3103b5a5f919410ced576e90f0ce83a8d5c5e1002c30f2b16c2f834f SHA512 7f116221f074bc300355985126a32d34eb8a57e90805b1c412eec0aaf02a546f974329b10a3ec21eae2bcb02cca1709fa0a7ee4c145b44eb27e7c67269faa0e5
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/activesupport/activesupport-7.1.4.ebuild b/dev-ruby/activesupport/activesupport-7.1.4.ebuild
new file mode 100644
index 000000000000..64d60202c313
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.1.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+msgpack test"
+REQUIRED_USE="test? ( msgpack )"
+
+PATCHES=( "${FILESDIR}/${PN}-7.1.1-backport-pr50097.patch" )
+
+RUBY_S="rails-${PV}/${PN}"
+
+# bigdecimal and mutex_m are bundled with ruby as default gems
+ruby_add_rdepend "
+	dev-ruby/base64
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/connection_pool-2.2.5
+	dev-ruby/drb
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	dev-ruby/tzinfo:2
+	msgpack? ( >=dev-ruby/msgpack-1.7.0 )
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack:3.0
+	dev-ruby/rexml
+	dev-ruby/mocha
+	>dev-ruby/minitest-5.15.0:*
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|execjs\|jquery-rails\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\|web-console\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/^group :test/,/^end/ s:^:#:' \
+		-e '/^\s*group :\(db\|doc\|rubocop\|job\|cable\|lint\|mdl\|storage\|ujs\|test\|view\) do/,/^\s*end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+
+	# Avoid test where the result varies with specific ruby releases.
+	rm -f test/core_ext/object/duplicable_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.2.1.ebuild b/dev-ruby/activesupport/activesupport-7.2.1.ebuild
new file mode 100644
index 000000000000..224d37048f84
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+msgpack test"
+REQUIRED_USE="test? ( msgpack )"
+
+PATCHES=( "${FILESDIR}/${PN}-7.1.1-backport-pr50097.patch" )
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	dev-ruby/bigdecimal
+	>=dev-ruby/concurrent-ruby-1.3.1:1
+	>=dev-ruby/connection_pool-2.2.5
+	dev-ruby/drb
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	>=dev-ruby/securerandom-0.3
+	>=dev-ruby/tzinfo-2.0.5:2
+	msgpack? ( >=dev-ruby/msgpack-1.7.0 )
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack:3.0
+	dev-ruby/rexml
+	dev-ruby/mocha
+	>dev-ruby/minitest-5.15.0:*
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|execjs\|jquery-rails\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\|web-console\|error_highlight\|jbuilder\|httpclient\|prism\|useragent\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/^group :test/,/^end/ s:^:#:' \
+		-e '/^\s*group :\(db\|doc\|rubocop\|job\|cable\|lint\|mdl\|storage\|ujs\|test\|view\) do/,/^\s*end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+
+	# Avoid test where the result varies with specific ruby releases.
+	rm -f test/core_ext/object/duplicable_test.rb || die
+}
diff --git a/dev-ruby/addressable/addressable-2.8.6.ebuild b/dev-ruby/addressable/addressable-2.8.6.ebuild
index dabe11654b68..512d06c44034 100644
--- a/dev-ruby/addressable/addressable-2.8.6.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/public_suffix:5"
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index d2e3d2579c06..1e23f16376da 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,3 +1,4 @@
 DIST airbrussh-1.5.0.tar.gz 1450385 BLAKE2B bc3d2be21fd6ad3e3524fcd10f0a36c9c97bd55a14c422a80b604312fd040821c9c59ca3b034acd834c9c636f99297b5f7c9b04c54edb9fb6c73c7c13fcf8e94 SHA512 540b98ec60f639cd70c705b1cd47eb4246fd49d3dfa4f0ba5163edfb72d76aab63728a2cdfa80f07c1eb7b159e4167de5392e0bb7129b58031e1a6c0733fb559
 DIST airbrussh-1.5.1.tar.gz 1450388 BLAKE2B 34bfc20db10e32f5523916cc503147283b8aee71064e197931f0774932e7c197f765a1ceca78135642e6758efe2d115b1c1da2572171b06fa622d5313710a6ac SHA512 5c34b0491432a20b4c0d30613669ffe21d431296b69ebd1eccf786d515c80067a5b6776a2b4055ea442fce61f89c130531ce4ad177f97950d9bf7ec479fb5bed
 DIST airbrussh-1.5.2.tar.gz 1450058 BLAKE2B 1e3d6957a47c1e823f5352404a55796e7e834d637c13027deac01bf38be06557dc1819f3f0c623a67e0036cd9ba6a0c9f8739a5fa6a56b6a9f003f1edcfdac13 SHA512 fe15bca2b4f922a07d69026c5b93d820943b1d2cec69ffc0190cf09eff87c2ec2cfe13c24bb7174fc9b534a64493abae1344accf91a85a5ddadcee0bd266ef44
+DIST airbrussh-1.5.3.tar.gz 1450342 BLAKE2B 323b720ed92bc7758921999c2b63593e134ad2e0bed66c469af5fb8342b33c0da46c2d8814e9f1a638f8e01445b6c15877b40f01fb7e968a8db1340070130e6e SHA512 2a68a6034ae73cd3f3a4e070e1d4bfc4942ff183ed0aa9707df38268e6e0080065f3866c1afc168fd7ead9ecd35408d4ef69242e5d186aced305fcb980ed2a81
diff --git a/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild b/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild
index 840bb1e7fc0c..89fcf4553f97 100644
--- a/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
 
diff --git a/dev-ruby/airbrussh/airbrussh-1.5.3.ebuild b/dev-ruby/airbrussh/airbrussh-1.5.3.ebuild
new file mode 100644
index 000000000000..840bb1e7fc0c
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.5.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Add missing require
+	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/appraisal/appraisal-2.5.0.ebuild b/dev-ruby/appraisal/appraisal-2.5.0.ebuild
index 662516cce005..bd13711f8478 100644
--- a/dev-ruby/appraisal/appraisal-2.5.0.ebuild
+++ b/dev-ruby/appraisal/appraisal-2.5.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/thoughtbot/appraisal"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index fc69e00d8029..c87c573ef0c3 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1 +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
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.15.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.15.0.ebuild
new file mode 100644
index 000000000000..fa148647b710
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.15.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 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.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", "<7.2"' \
+		-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/backports/backports-3.25.0.ebuild b/dev-ruby/backports/backports-3.25.0.ebuild
index a0163970763a..c4dc540eaaed 100644
--- a/dev-ruby/backports/backports-3.25.0.ebuild
+++ b/dev-ruby/backports/backports-3.25.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86"
 
 all_ruby_prepare() {
 	# Avoid activesupport test that no longer works in Rails 5. This also avoids
diff --git a/dev-ruby/base64/base64-0.2.0.ebuild b/dev-ruby/base64/base64-0.2.0.ebuild
index 8cecfd8aee84..28d7236af07a 100644
--- a/dev-ruby/base64/base64-0.2.0.ebuild
+++ b/dev-ruby/base64/base64-0.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.1.ebuild
index ce318b891e44..d43ed5b00f2d 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.1.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 virtual/ruby-ssl )"
diff --git a/dev-ruby/benchmark-ips/Manifest b/dev-ruby/benchmark-ips/Manifest
index 180ffe448ddf..2b6aefc79d83 100644
--- a/dev-ruby/benchmark-ips/Manifest
+++ b/dev-ruby/benchmark-ips/Manifest
@@ -1,2 +1,3 @@
 DIST benchmark-ips-2.12.0.tar.gz 20676 BLAKE2B 1473fb8cc42d62cf6b7206d91c9d959707109e3ade9d712d82ab5ccfdcc48bb4874bae4c37370561aa60fe8c99078564a22a5a216daa6b870015329db1094af1 SHA512 ad4a7133b73d3ead583513704cbf00ef858b7fc5477686d3841614f05a83f3b4551b1fcab78e9a8affe7c8487112d9fde5012bf8a8e13621d289d792ff27c061
 DIST benchmark-ips-2.13.0.tar.gz 20781 BLAKE2B 61a04395559a75b012c168345926f0f92954453081da4a0280b99f95f91c66633b04f99caf485a2b35036428719149154792e463cf7b4f6ab57c176506456235 SHA512 a167dbd4ecaf233c36da7cbfb2283447124ef190b174dc4f9f3281bf4de01b86044e55972fd25560b2612b1eed329e6f2d737f16d2e0961e04fce861b64a747f
+DIST benchmark-ips-2.14.0.tar.gz 22007 BLAKE2B c313ac8f3100e35bbe4b179948be249e689b830bc6072897671d9e658bd3b4b58d8c49d6eed3131e9bbb5e3d22249bc91889c584c6f0a6a9775a7789bda43b49 SHA512 fadea7a0a3a040d90f8b4d085e6a416c0f61f83cfbfd6d62a3d0bbb91309f615f30ec616761b1fe6c52114b7d65de07d8f35049281cec6c7de93854a974678a7
diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.14.0.ebuild b/dev-ruby/benchmark-ips/benchmark-ips-2.14.0.ebuild
new file mode 100644
index 000000000000..cfd793ca72c1
--- /dev/null
+++ b/dev-ruby/benchmark-ips/benchmark-ips-2.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="benchmark-ips.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A iterations per second enhancement to Benchmark"
+HOMEPAGE="https://github.com/evanphx/benchmark-ips"
+SRC_URI="https://github.com/evanphx/benchmark-ips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '1i require "tempfile"' test/test_benchmark_ips.rb || die
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild
index 7118109e8889..bdcc78c45ec2 100644
--- a/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild
+++ b/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ruby/bigdecimal"
 SRC_URI="https://github.com/ruby/bigdecimal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
index 920fd15d981e..3615673d0a2d 100644
--- a/dev-ruby/brotli/Manifest
+++ b/dev-ruby/brotli/Manifest
@@ -1,2 +1,3 @@
 DIST brotli-0.4.0.tar.gz 9460 BLAKE2B b5d5e490c3ab086d6817c1ecc9143aefe88487d65d6774bda939b25bdb6aaaea4e28d99e01d49b90dbbccceba6643c0b5fdab0cea930eaf1661454996e61fab7 SHA512 7d1d2a1343aec11e840d840358d7d27b4ef93954bc17170d581b16d46191902b6fdf6380344f0d172e5e7f3fc0948146312659a44dc95973ec30ac3344f4a656
 DIST brotli-0.5.0.tar.gz 9449 BLAKE2B daf34e3b3bc175d883a844a9fedbbe686b2b103db9249bd47d616aafd75682d381b54de9b248ef3c44ac35e4873c7046332a2c177815f597ed6f527928728c1c SHA512 ac2b9594f4a6be95417bc1d84529e2df2cd97f23a0da77ac4fa4a0253af9dc89deae8adc226609ed7dd735b899ddcc1cafeba916a7ed928484796e16b276e010
+DIST brotli-0.6.0.tar.gz 9546 BLAKE2B 82e6bf5d49466b1f08c3ffdf6d4607e9af33d2e5ae8b1e006c518a1effadd294068aac94ac2566a81930168525c0e55ffc6274c5a90d7429be6599734b948fa5 SHA512 b48dad753d823a4a26ca98614a681ac14b2191b0d4ea3be2a8bdc3f457ddf21504ad1703ab307821d408785301e1554ac91f8ffed35609c89a9e9a38b1640760
diff --git a/dev-ruby/brotli/brotli-0.6.0.ebuild b/dev-ruby/brotli/brotli-0.6.0.ebuild
new file mode 100644
index 000000000000..618565fa2ca5
--- /dev/null
+++ b/dev-ruby/brotli/brotli-0.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/brotli/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Brotli compressor/decompressor"
+HOMEPAGE="https://github.com/miyucy/brotli"
+SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+RDEPEND=" >=app-arch/brotli-1.1.0"
+DEPEND=" >=app-arch/brotli-1.1.0"
+
+# Depends on the test data in app-arch/brotli
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z -- spec/find spec -print0/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index 4345b954f07c..45fa9787efec 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1 +1,2 @@
 DIST bundler-audit-0.9.1.gem 49152 BLAKE2B a4942a84e8b39b6087960a2c611d5473e41076587a020aadae982c9096f91b0681f312bdbc00d73db1ba034d65e05c970532246deebd4119911ed6abfc6655d6 SHA512 86060dd95669e358d7267799b48a179469fa8aec6d97ce3d3316c974be7aa4652958ad72e5302770e3dd372026bc1054438877f1741a82a63ac6fb0fc14628f0
+DIST bundler-audit-0.9.2.gem 49664 BLAKE2B f03ded734e1a71db8536a267f61a7ca37ad68b87b4970a0fab9c0ef811c0e6a872aac6861818184f3a3eb6170c4ef583a823fae919575a72bc79af3e7b26163a SHA512 d4b1b82ca5557b159904e2c41b21cb3d9f3e65688986277dd446e27b61201ad0bb50d53f036e3b4d9438fb04e0d005befab108bd8f63b48cd59473bac03e511a
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild
new file mode 100644
index 000000000000..cdce4cce4ea2
--- /dev/null
+++ b/dev-ruby/bundler-audit/bundler-audit-0.9.2.ebuild
@@ -0,0 +1,38 @@
+# 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"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides patch-level verification for Bundled apps"
+HOMEPAGE="https://github.com/rubysec/bundler-audit"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+#tests are trying to download files
+RESTRICT=test
+
+ruby_add_rdepend "
+	dev-ruby/thor:1
+	dev-ruby/bundler:2
+"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that require network access via 'bundle install'
+	rm spec/{integration,scanner}_spec.rb || die
+
+	# Avoid specs that only work when the source is a git repository
+	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
+		-e '/describe "update!"/,/^  end/ s:^:#:' \
+		spec/database_spec.rb || die
+}
diff --git a/dev-ruby/bundler/bundler-2.5.11.ebuild b/dev-ruby/bundler/bundler-2.5.11.ebuild
index 0f2887eda1e6..255a46a23d27 100644
--- a/dev-ruby/bundler/bundler-2.5.11.ebuild
+++ b/dev-ruby/bundler/bundler-2.5.11.ebuild
@@ -22,7 +22,7 @@ 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"
+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
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index bde96d57582a..83e73f290043 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,3 +1,4 @@
+DIST capistrano-2.15.11.gem 132608 BLAKE2B fa516191f2167c8215523d73ea1a8768c89d9a4432074a01fc157df56c8bd1dd19116ae812b25d9a31bb76b757a70c1440dd3f8cd23f4d3640fabd83bd61e633 SHA512 6889471a1a47149aba3e44e3f27ebe543745749ca266d854014ea220bdcdaf366329234a1c46914daafb12c0ec666250995d0cb36cb8d1b71e53e6b3c082dc4f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.17.3.gem 70144 BLAKE2B d8bd93bb41a41196394b0959fa0bdf17609c9c53771bbfbf87cbc02b169177ad7cc18613a18d362a7fc775c91a382071d2384262d5cb49b1534678aac575dc55 SHA512 b7b85ebf7309d93aed83f68dc897e5a6cb4c8a929f4427c8a29db2ef6f857ee110256ba80c2fe0ae15f8008597c47be5ec60c192f3268d0df66f761b90d0758f
 DIST capistrano-3.18.0.gem 69632 BLAKE2B 679005f347eba2bad71e49b0c591c6179edc566d342b43652dc1be6949589d3bc58b78c91cccc564e6d8bb1f541066917164e000fe41a6997a3d6d12ab9b5e7b SHA512 126abb8934bed1bd1c58f53c1e8cd0ead99499d7e99d09e51290df4619a2f570a3f2f1a5cbdb683f1286a2b9aa7b0a2690a4c165d07705c5157ebf3ed1118f3e
diff --git a/dev-ruby/capistrano/capistrano-2.15.11.ebuild b/dev-ruby/capistrano/capistrano-2.15.11.ebuild
new file mode 100644
index 000000000000..0f50c99ed00a
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-2.15.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.0.14:*
+	>=dev-ruby/net-sftp-2.0.2
+	>=dev-ruby/net-scp-1.0.2
+	>=dev-ruby/net-ssh-gateway-1.1.0:*
+	>=dev-ruby/highline-1.2.7"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha:0.14 )"
+
+PATCHES=( "${FILESDIR}/${PN}-2.15.5-sudo-cleanup.patch" )
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile test/utils.rb || die
+	sed -i -e '/pry/ s:^:#:' -e '4igem "mocha", "~>0.14.0"' test/utils.rb || die
+
+	# Avoid copy strategy tests since these fail in some cases due to
+	# complicated (aka unknown) interactions with other parts of the
+	# test suite.
+	rm test/deploy/strategy/copy_test.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper cap /usr/bin/cap-2 'gem "capistrano", "~>2.0"'
+}
diff --git a/dev-ruby/contracts/contracts-0.17-r1.ebuild b/dev-ruby/contracts/contracts-0.17-r1.ebuild
index ff23eed1eef7..d1d2337065f5 100644
--- a/dev-ruby/contracts/contracts-0.17-r1.ebuild
+++ b/dev-ruby/contracts/contracts-0.17-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-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"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ruby32.patch
diff --git a/dev-ruby/crack/crack-0.4.6.ebuild b/dev-ruby/crack/crack-0.4.6.ebuild
index 35dc1d9d010c..b87f928bf157 100644
--- a/dev-ruby/crack/crack-0.4.6.ebuild
+++ b/dev-ruby/crack/crack-0.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/rexml"
diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index 01817cec391d..e97083c5b14c 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,3 +1,2 @@
-DIST css_parser-1.16.0.tar.gz 39719 BLAKE2B 19c6e741bdfac308ea2b2edc557fbbe79580cb44f7a8e8538a3fbb55dcc02a76a56ec151d26ee2af887624fbe348a29c1acfbca30f17e0f2c73850ed7d3808af SHA512 d21f07da73ec3d164f766a392d88053fb156eb15645c4dbf3e4b70b73fdfad6c0b715368d9b000e668cf40dc338611be946064d586f4efcf7e13f261df74b6fa
-DIST css_parser-1.17.0.tar.gz 39746 BLAKE2B c94f0b03d3e5e54ff390f83bc87c2bc9cd1aa0426898361d3f61fc36263fbb19251cccf346767e8d844b49471186051ffcadb3b87ad3092aa403ef02764a5e5a SHA512 9097b13c578727a7ab918be9b54f846d3f85bb666a54416f54bf509efebfbaf64dd22ec827adef61ba2fd8b46abc81cc302ba3bba35e7d87dee181d21f4cf578
 DIST css_parser-1.17.1.tar.gz 39809 BLAKE2B c8d0a05d4264432a6614cf834aeef7685710d50f44b99c2989a0e431b6894b8c1ac7ddc4f9617632f3da4a0d479acb02ef4bdb1b0ede6f098cdfbeb37c0db624 SHA512 bc22ff1be8daf72b76f611c5be27ee52a197b8e7810c61321ae7e994db771dec01b5c4725b656119d3b610214bc06d08e79bbacc1d2c4294d8ad2cd915edb2fb
+DIST css_parser-1.19.0.tar.gz 41264 BLAKE2B e1ebc2c1f56354b50cbc1f89552e7c5fda3b10a719379b355743e4310e85f37159b59a79cb847a9633da6b9eea4b1dc7224eb8e78987211b584e6912af242441 SHA512 a8405a30ef6b399b381478d39711949031316532e43583e69b60f25dca39da822bcdf1e3de3f0fceebbf07a79046e5771a4fe4b2b6db69582616559f0a0294b1
diff --git a/dev-ruby/css_parser/css_parser-1.16.0.ebuild b/dev-ruby/css_parser/css_parser-1.16.0.ebuild
deleted file mode 100644
index 220acb7872bb..000000000000
--- a/dev-ruby/css_parser/css_parser-1.16.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
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest dev-ruby/webrick )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/css_parser/css_parser-1.17.0.ebuild b/dev-ruby/css_parser/css_parser-1.17.0.ebuild
deleted file mode 100644
index 220acb7872bb..000000000000
--- a/dev-ruby/css_parser/css_parser-1.17.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
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest dev-ruby/webrick )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/css_parser/css_parser-1.19.0.ebuild b/dev-ruby/css_parser/css_parser-1.19.0.ebuild
new file mode 100644
index 000000000000..81a02ea3e988
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.19.0.ebuild
@@ -0,0 +1,43 @@
+# 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_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="https://github.com/premailer/css_parser/"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	# get rid of bundler usage
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+	sed -i -e '/bundler/d' test/test_helper.rb || die
+	# Avoid tests using the network.
+	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 546be9fd6f08..ecb4fca25af8 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1 +1,2 @@
 DIST curb-1.0.5.gem 92160 BLAKE2B 395cdbb3255d5a38dfd472787785738dfff8ec7eed69e7b93ae2d993c90635d427a6275cd3510b406fccc7b999bdedf544cb4177132cc890f0473452ad1984c9 SHA512 0b90da7757ee37bd542e2ab31407235788f103e67c987fd820073eb70ecae7cea55cc5ecdc354145ead58cb9762db0f8f27416301fbca93bc0f7a7966a5d8a63
+DIST curb-1.0.6.gem 92160 BLAKE2B b764611321981e1b5706c51400c3b08f1bd9a73ee1df56f3fa818ac0d7074be6e7b77969794cd1452f2d6f5685f29e772383913276cb4c81576760057f278584 SHA512 24c0e65a88bda3dd20a4d9386be22a6f09aa9a86f37c0f462048e621e95567bb3f825e41c41889a1699a966a6943ce1ce9c380287ecb120eef7e268f598a2de7
diff --git a/dev-ruby/curb/curb-1.0.6.ebuild b/dev-ruby/curb/curb-1.0.6.ebuild
new file mode 100644
index 000000000000..a9010ffe5093
--- /dev/null
+++ b/dev-ruby/curb/curb-1.0.6.ebuild
@@ -0,0 +1,50 @@
+# 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="rake"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=" net-misc/curl[ssl] test? ( net-misc/curl )"
+RDEPEND=" net-misc/curl[ssl]"
+
+ruby_add_bdepend "test? ( dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	# fix tests when localhost is also ::1
+	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+	# avoid tests making outside network connections
+	rm tests/bug_postfields_crash.rb || die
+	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
+		-i tests/tc_curl_easy.rb || die
+	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+		-i tests/tc_curl_multi.rb || die
+
+	# Fix test that expects wrong output
+	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+	# avoid failing tests where failure condition seems weird, no
+	# upstream travis so not clear if the test is indeed broken.
+	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+
+	# avoid test requiring ntlm support on curl which is no longer available in gentoo
+	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
+
+	# Skip tests with currently unpackaged ruby_memcheck
+	sed -i -e '/ruby_memcheck/ s:^:#: ; /RubyMemcheck/,/^end/ s:^:#:' Rakefile
+}
diff --git a/dev-ruby/drb/drb-2.2.0.ebuild b/dev-ruby/drb/drb-2.2.0.ebuild
index b2d9094d48d8..2b24b20afb6d 100644
--- a/dev-ruby/drb/drb-2.2.0.ebuild
+++ b/dev-ruby/drb/drb-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ruby2_keywords"
diff --git a/dev-ruby/drb/drb-2.2.1.ebuild b/dev-ruby/drb/drb-2.2.1.ebuild
index 27f2d5424e9f..fd99bba22b79 100644
--- a/dev-ruby/drb/drb-2.2.1.ebuild
+++ b/dev-ruby/drb/drb-2.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+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_rdepend "dev-ruby/ruby2_keywords"
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 9449e14a4b43..b75213002355 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -3,3 +3,4 @@ DIST elasticsearch-ruby-7.17.11.tar.gz 1033022 BLAKE2B 77fb6b37d447af88a6b093bf3
 DIST elasticsearch-ruby-8.12.2.tar.gz 1908814 BLAKE2B f3caffe7336a63547ba0d44a3239fb6b71ed7fb46b1136114a87e7e5f69608d69b14d12f568b6e945db0917a6913a10407cf7cae3137605adaaac5fb7fd9439b SHA512 08fe791ee20cbe9f6ad9aee1b7d9c02813895add4bb0ff7b4e063051b42e62e037d71217521f6a9cb0076c51e8f7160bad52798741435164451806932488d17c
 DIST elasticsearch-ruby-8.13.0.tar.gz 1918145 BLAKE2B ded410c9e77876dc61a942ab1de7945d28aa1c06cd7079f693119812128fdfd38c206d9644aadb79fb8c9b48e12d77fec6c313434cfb58510bc48fecc905106b SHA512 8babc5797802ae256b41a00927cd1688c2d3d90770d8a867a9b96a7a115f537f1ca301b2d6b73107995b23578abc755d7bf7dc03075520fa857dda22e6a2d32b
 DIST elasticsearch-ruby-8.14.0.tar.gz 1918771 BLAKE2B 1824edd7ae6ade20b58cb56dfa01b9e9d5d833918cddbba49f7f0d258eff6a19c55f112d7dd70f9457274b457851b59a208db3b1e69c1f12867951b960333c99 SHA512 36fb8fb18e410df7f2c4c46e2ffaed0ea591879ad4e753d178513281be5de78bd7ee1cda5cbbf02313cd255ad85e010f92bc5690f16f2ab91fd38bb0d17f8dbc
+DIST elasticsearch-ruby-8.15.0.tar.gz 1935690 BLAKE2B 380eebdb9fdcce1600051d9078d8af90789fa4f0b91266fe2297092aa32eed96dabe591fad69f8f4a37f56f15dbbe32a79d07c25693cc83907ba52eb10a77c32 SHA512 011f01914e457959f9737a65cc1fc09e0c31f70c4c4976a14b2506a2b66f4ffbaadc8fb643db10ec90b70a7cc0012c7752aecd598a76a9281cf12586e27fb08a
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.15.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.15.0.ebuild
new file mode 100644
index 000000000000..1d03ce30f109
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-8.15.0.ebuild
@@ -0,0 +1,65 @@
+# 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_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/ansi
+		dev-ruby/elasticsearch
+		dev-ruby/elastic-transport
+		dev-ruby/mocha:2
+		dev-ruby/patron
+		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 -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/Manifest b/dev-ruby/elasticsearch/Manifest
index 9449e14a4b43..b75213002355 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -3,3 +3,4 @@ DIST elasticsearch-ruby-7.17.11.tar.gz 1033022 BLAKE2B 77fb6b37d447af88a6b093bf3
 DIST elasticsearch-ruby-8.12.2.tar.gz 1908814 BLAKE2B f3caffe7336a63547ba0d44a3239fb6b71ed7fb46b1136114a87e7e5f69608d69b14d12f568b6e945db0917a6913a10407cf7cae3137605adaaac5fb7fd9439b SHA512 08fe791ee20cbe9f6ad9aee1b7d9c02813895add4bb0ff7b4e063051b42e62e037d71217521f6a9cb0076c51e8f7160bad52798741435164451806932488d17c
 DIST elasticsearch-ruby-8.13.0.tar.gz 1918145 BLAKE2B ded410c9e77876dc61a942ab1de7945d28aa1c06cd7079f693119812128fdfd38c206d9644aadb79fb8c9b48e12d77fec6c313434cfb58510bc48fecc905106b SHA512 8babc5797802ae256b41a00927cd1688c2d3d90770d8a867a9b96a7a115f537f1ca301b2d6b73107995b23578abc755d7bf7dc03075520fa857dda22e6a2d32b
 DIST elasticsearch-ruby-8.14.0.tar.gz 1918771 BLAKE2B 1824edd7ae6ade20b58cb56dfa01b9e9d5d833918cddbba49f7f0d258eff6a19c55f112d7dd70f9457274b457851b59a208db3b1e69c1f12867951b960333c99 SHA512 36fb8fb18e410df7f2c4c46e2ffaed0ea591879ad4e753d178513281be5de78bd7ee1cda5cbbf02313cd255ad85e010f92bc5690f16f2ab91fd38bb0d17f8dbc
+DIST elasticsearch-ruby-8.15.0.tar.gz 1935690 BLAKE2B 380eebdb9fdcce1600051d9078d8af90789fa4f0b91266fe2297092aa32eed96dabe591fad69f8f4a37f56f15dbbe32a79d07c25693cc83907ba52eb10a77c32 SHA512 011f01914e457959f9737a65cc1fc09e0c31f70c4c4976a14b2506a2b66f4ffbaadc8fb643db10ec90b70a7cc0012c7752aecd598a76a9281cf12586e27fb08a
diff --git a/dev-ruby/elasticsearch/elasticsearch-8.15.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.15.0.ebuild
new file mode 100644
index 000000000000..28b77e676fba
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-8.15.0.ebuild
@@ -0,0 +1,55 @@
+# 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_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/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
index ffaa3c209a61..f036d4f2f216 100644
--- a/dev-ruby/faraday-net_http/Manifest
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -2,3 +2,4 @@ DIST faraday-net_http-1.0.1.tar.gz 8436 BLAKE2B 16feb3c79af7db3b69373826a2fc55a8
 DIST faraday-net_http-2.1.0.tar.gz 9061 BLAKE2B 00e461718f4a92ff424e28074aa62d79c4ebfc9ca3a22036eef28c57fe90199b6fb49f5f9a02ff89cfc701b07c5fbb798446f1cc7ebf860dfeab9208e61b92d8 SHA512 797aa930d33a372fccb6fc497fe504f15b63a2fd87aa2301b84098a23de321fe60b6af43f35d9ed670705e90284096a21e9e83c80abe800c81240dec937a27d8
 DIST faraday-net_http-3.1.0.tar.gz 8975 BLAKE2B 254f0f3eac4361866b4e8a0b2461fa4e2fb76cfbcd145e122fdbfd65a4565ffd176375fd962dbb1ec899c3be993526d3232e166105840f43af1027220d9cd245 SHA512 dfab2515f7d567d34fd11c4a5ceff2ad41399a6ff262dc4bc52349d4229cdd8d9563c31d4dee1acfcb185a5bcf647e574758965cb6324c024244c9e48a42568f
 DIST faraday-net_http-3.1.1.tar.gz 9012 BLAKE2B e37f08ca50185c5809ed2ad0fb9430ca0ee0ac1aaf0a87c846238bab96de15a4870a1efd2a666be4b63740b19ec19c8b82e42ce0b665c8087c9b338f669138ff SHA512 707ccbc19c3d8795c1952421573c6816f5ebe247e0728d7849aac24609619416c80c6cf10aff19f40a57c7f53170463df67bd0163e47f18bd072cad6e79f9e5e
+DIST faraday-net_http-3.2.0.tar.gz 9232 BLAKE2B 07ada54d9430d5255d7683d6eec0b86967657d9eceff631a343a49a943ed2fad4168a48f0faf1ddef7d680ec1d11f34c2a560272bd9701c8e0be89dfb43ce082 SHA512 27966aaa0da55d398869fede0196de9859750227189564480f6129684a76fe617a477142559a717d5431c568aeea8357474f89ae8226f2398f3a4372001e8554
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-3.2.0.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-3.2.0.ebuild
new file mode 100644
index 000000000000..2780a3d11576
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-3.2.0.ebuild
@@ -0,0 +1,32 @@
+# 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="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+# net-http is a default gem
+
+ruby_add_bdepend "test? ( >=dev-ruby/faraday-2.5 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index baa39ab5ae22..64757c7cfe22 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,6 +1,5 @@
 DIST faraday-1.10.3.tar.gz 835008 BLAKE2B 5b2cff7877cd1e73dc52830aed67988eb5ed33a5ea1378d995f9e48bb69b8d20163a9faa69d65c9c99fddaa79e80bacee04b15141859dd81678a374b592557d1 SHA512 58b288a4d44424075f447fea982618db76b47f30e9fad69e5300b757f819bcf3cd48502b35851d186e103839538be0e52b7c222076f1399c3491335c2fe5b2c8
 DIST faraday-2.10.0.tar.gz 1031426 BLAKE2B b532fdaf9e13d29554b45d6a99d6eaedfa815a9681684727b31c66e80a6d0fea86f3883aba2a374e4c9dbb5033dbf92b189f57867b7c9616c2a414ff06814732 SHA512 30399c03b44c64fb50b327c61b190ae178447f1831f5916f6f396740af80b929f2a5191d75ab563017172c986d379dcd0395b43ac127a772443eb321bfbc6b1f
 DIST faraday-2.10.1.tar.gz 1033252 BLAKE2B 2df625d91cedcfc3f78b97570e0a87404db74728f82e7c77776f806a0e388d629cb1fe0b35157c4b300db93db056a9c2bd1aff90f39a9dc326c6cae76e37fc0e SHA512 21a1777e1bb2f7b62963ad9063bc5ac373a9d1c6e827cf346630ea9dc1bd8f09009a554363dc92e030ce07bca002a24e10dce2736f43414e4e20bd394e55cdb4
-DIST faraday-2.9.0.tar.gz 1030759 BLAKE2B 450ca700ccf624115aaa6c5ffc873e926884ff27a520aecd890f7156f20f829a802cece461327205930dfc53d06fd837adb1bb989e9603f369f61606640acddf SHA512 f534cd0903bc5ee83a355b09c886dfdf593b842fc85863877c9e0217ba797b027acce6d36674579053ac24e180d71afe4d879cb52cadd1da803b609f2da407c3
-DIST faraday-2.9.1.tar.gz 1031030 BLAKE2B 1980fc9215e2ffaeafd920162b520bfb6731df5a5fec7d95ac9b17b62e6a7945e864d771f44acd2d43684f1953a61298d097bde469c36a195626101a26267e59 SHA512 424597b7d4e5f6c57651fd801c766b324d49a6081807578be9ce5dfc93b033f418924d05e7c73a3fd323d8b4677a0dd2a9c483a87f3c5321d26b93038675ee78
+DIST faraday-2.11.0.tar.gz 1033671 BLAKE2B a8db332300353afaaac62667cd70c5e3fcc812022aba3e76309b01122b65f7ff052cb114e72deebf72c3857fd2d9618ac901c16a489a331953e034c30d79ddc3 SHA512 1b38efb37869a37efc89eb56961f5cee4ecd4a815b1e4b30dcdc1157d210291078b408025ee5e22e0adc328c730cb70741e8840d749681fed1bd031b4db132cf
 DIST faraday-2.9.2.tar.gz 1031072 BLAKE2B 78a30d62bde0146274cc0c47a8f504d695fbdae0be50b49b92fdeb2e0fb83501b30a0a60c8d098d56f70263322fae5763b17dd2e8c6eea121b48cd4143034d9d SHA512 5f6af1a79f082e17113939282fdadae5ab2bba167f8d109b8f64b53ca3819d138f6e8a090c9d30036ab796a53ae53f4ecf2fd8c645e59a2aec025430b2c0e803
diff --git a/dev-ruby/faraday/faraday-2.11.0.ebuild b/dev-ruby/faraday/faraday-2.11.0.ebuild
new file mode 100644
index 000000000000..eb85fdf0765f
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.11.0.ebuild
@@ -0,0 +1,60 @@
+# 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_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	|| ( <dev-ruby/faraday-net_http-3.4:3 dev-ruby/faraday-net_http:2 )
+	dev-ruby/logger
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:3.0
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday/faraday-2.9.0.ebuild b/dev-ruby/faraday/faraday-2.9.0.ebuild
deleted file mode 100644
index 8bea12238d76..000000000000
--- a/dev-ruby/faraday/faraday-2.9.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend "
-	dev-ruby/base64
-	|| ( <dev-ruby/faraday-net_http-3.2:3 dev-ruby/faraday-net_http:2 )
-	>=dev-ruby/ruby2_keywords-0.0.4
-"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-		dev-ruby/rack:2.2
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	# Avoid loading all lib files since some of them require unpackaged dependencies.
-	sed -e '/[Cc]overall/ s:^:#:' \
-		-e '/lib\/\*\*/ s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/end/ s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-e '3igem "rack", "~> 2.2"' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/git ls-files/ s:^:#:' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-}
diff --git a/dev-ruby/faraday/faraday-2.9.1.ebuild b/dev-ruby/faraday/faraday-2.9.1.ebuild
deleted file mode 100644
index 79002b7c3924..000000000000
--- a/dev-ruby/faraday/faraday-2.9.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend "
-	|| ( <dev-ruby/faraday-net_http-3.2:3 dev-ruby/faraday-net_http:2 )
-	>=dev-ruby/ruby2_keywords-0.0.4
-"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-		dev-ruby/rack:3.0
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	# Avoid loading all lib files since some of them require unpackaged dependencies.
-	sed -e '/[Cc]overall/ s:^:#:' \
-		-e '/lib\/\*\*/ s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/end/ s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/git ls-files/ s:^:#:' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-}
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 9a01b6a4a1f7..10d51e510384 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,3 +1,4 @@
 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
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild
index 67479c606646..4fb4f7e42d72 100644
--- a/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT BSD-2"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="test"
 
 ruby_add_depend "dev-ruby/prime"
diff --git a/dev-ruby/fast_gettext/fast_gettext-3.1.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-3.1.0.ebuild
new file mode 100644
index 000000000000..a2f8fdc3d20d
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-3.1.0.ebuild
@@ -0,0 +1,54 @@
+# 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/fiber-local/fiber-local-1.1.0.ebuild b/dev-ruby/fiber-local/fiber-local-1.1.0.ebuild
index 7f0d2873f3e1..497fe360c504 100644
--- a/dev-ruby/fiber-local/fiber-local-1.1.0.ebuild
+++ b/dev-ruby/fiber-local/fiber-local-1.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/fiber-local/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 
 ruby_add_rdepend "dev-ruby/fiber-storage"
 
diff --git a/dev-ruby/fiber-storage/fiber-storage-0.1.2.ebuild b/dev-ruby/fiber-storage/fiber-storage-0.1.2.ebuild
index 37823e4f140f..494051f194ac 100644
--- a/dev-ruby/fiber-storage/fiber-storage-0.1.2.ebuild
+++ b/dev-ruby/fiber-storage/fiber-storage-0.1.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ioquatix/fiber-storage/archive/refs/tags/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 
 all_ruby_prepare() {
 	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index b6e56539878f..274e3dfce670 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1,2 +1,3 @@
 DIST flexmock-2.3.6.tar.gz 91601 BLAKE2B f2888891820f13f4a9812ffdfe042ccd266b0b5166fa538aba96e2c865ba55d3689d077e73fb9aa238455e90b8ea97aa60f8649c08823a753b6af8c0f550cbed SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc
 DIST flexmock-2.3.8.tar.gz 92170 BLAKE2B 583dff030e0c828dedfbd1188a3bcca45b53d327fc9cfc5e43370c10bc6683819aa0d11e7aad0b8d26fe7576cc8a804f2103b5fa065f57381285d5de27c99ff9 SHA512 e055b5fc503967df47fcb4c5724f79efac9cebfab76a3784cf27e194c12316c4863a29c47b46256146cf2aa2f76afcd92849297310c71ac584ef8a5cc9cb40a0
+DIST flexmock-2.4.0.tar.gz 92776 BLAKE2B 4579fcfa174cafe3ebfc2fe97cfc37323299a10be1c0bfd5bfae5399857700f0eef22e5d2ee9f60bdf5fdae48c985711a3ecd39a0b9ae53b24ce8d7ab8a69fd3 SHA512 eea0766bdab53dc0292519fe27784bc6a094ccf7ac374aeafda06ce3819726d310fbf69a7e1deaf584d6eedc03004e90695d2bda1aee5982443fbbeb4dc7d6e6
diff --git a/dev-ruby/flexmock/flexmock-2.3.8.ebuild b/dev-ruby/flexmock/flexmock-2.3.8.ebuild
index 76e598d0464d..651a83293f6b 100644
--- a/dev-ruby/flexmock/flexmock-2.3.8.ebuild
+++ b/dev-ruby/flexmock/flexmock-2.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="flexmock"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/flexmock-2.3.6-ruby30-{1,2,3}.patch )
diff --git a/dev-ruby/flexmock/flexmock-2.4.0.ebuild b/dev-ruby/flexmock/flexmock-2.4.0.ebuild
new file mode 100644
index 000000000000..e53f9ce3a649
--- /dev/null
+++ b/dev-ruby/flexmock/flexmock-2.4.0.ebuild
@@ -0,0 +1,44 @@
+# 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_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="flexmock.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mock object library for Ruby unit testing"
+HOMEPAGE="https://github.com/doudou/flexmock"
+SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="flexmock"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}"/flexmock-2.3.6-ruby30-{1,2,3}.patch )
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/rspec:3
+	)"
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 390fa429054a..97ba72065a2b 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,3 +1,4 @@
-DIST git-1.18.0.tar.gz 175341 BLAKE2B 5a8dee1fef79c0386c59d37f37f2249c72600f2f11dbf2cc2c5bf63ff91f068c9c3164d24c2670585e8261d890f07b998255ddb80ce35ce53de09f402a4ec9e3 SHA512 520886b23758229cf25bfdd17e9d86e53d62feb6b2b3c155efe493db42d2f247a29bd629ff6c80ffa599ad429bcb6f09e44b015eeeecf9d9a5f4ee6ab3f1a265
 DIST git-1.19.1.tar.gz 177887 BLAKE2B 0da2a829679fd4e2d4b3aec5e88f421d221593729b827f2207bc3d26ce290ee2a41e8dde33b81138cf9df75fa1d1316fa5c69318a1247c627889f5c6971b8fd6 SHA512 4fb27cc2c59d15b0424ac16accc13d2310fec0710815b8deee399767b3cd9707cdf767a301cae271b4cd1ff6718cb955a6c86a9ea99076aaffbbadf595c64c0c
 DIST git-2.1.1.tar.gz 189005 BLAKE2B 8c273d28bc0b8ccc1a1ac74242086e56941fb6827e39d358adab0e645d080eaf5e4727b0a9aa131ea068efbd77c1ff645b55ddf69d615d13b972566f964aca06 SHA512 4815dff308a32b4b1d4984ea8b96e3cf2870412771afa7b56c74031f66d1eba607506587bf7de740091c285b84c3f4fa1929523d653870679ea317e8933c6b4a
+DIST git-2.2.0.tar.gz 192227 BLAKE2B 9c3ff354c0484863991a83d4ccba68181e64311bcde7699ac4c211ab1fe92fba7ad108f179b88e61c73681bd1e0b3e7b67f53ab33224a0fc4a00b10201beb608 SHA512 f8da84b8ba0bc9adb2b20eb33ef92f3050941297bf0fe0983d387a150c4cfd1b3342b61417bb1ee732e310c203de2acdca4cc3dad5b1a5f2a08556e19c905905
+DIST git-2.3.0.tar.gz 194653 BLAKE2B a82ea8c7b8cd239de2cb4dd08f013412efcc7dfcd4c85839ff145b2998df4cf4da6cbf7b5942592b086741ed1fca0a3678bfb4ce5ab45c7c4a3259ce9c3c8d94 SHA512 6ca0a9f33fe4cb24b69035d80f689664558d3ebe868604e8592da225e14102fc572b472e7fd8db697c4338569a560ba012694a637d1dd9622fd33d06e9f55780
diff --git a/dev-ruby/git/git-1.18.0.ebuild b/dev-ruby/git/git-1.18.0.ebuild
deleted file mode 100644
index a697294543e8..000000000000
--- a/dev-ruby/git/git-1.18.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/ruby-git/ruby-git"
-SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/git/git-2.1.1.ebuild b/dev-ruby/git/git-2.1.1.ebuild
index b09921a3b99e..d6ddf32da8ee 100644
--- a/dev-ruby/git/git-2.1.1.ebuild
+++ b/dev-ruby/git/git-2.1.1.ebuild
@@ -18,7 +18,7 @@ RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 IUSE="test"
 
 DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar )"
diff --git a/dev-ruby/git/git-2.2.0.ebuild b/dev-ruby/git/git-2.2.0.ebuild
new file mode 100644
index 000000000000..626852e98276
--- /dev/null
+++ b/dev-ruby/git/git-2.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="test"
+
+DEPEND="test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar )"
+RDEPEND=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5.0:*
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/process_executer-1.1:1
+	>=dev-ruby/rchardet-1.8:1
+"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitar-0.9 >=dev-ruby/mocha-2.1:2 dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't use deprecated key type that is removed from openssh
+	sed -i -e 's/-t dsa/-t rsa/' tests/units/test_signed_commits.rb || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/git/git-2.3.0.ebuild b/dev-ruby/git/git-2.3.0.ebuild
new file mode 100644
index 000000000000..ddb8abb8b33d
--- /dev/null
+++ b/dev-ruby/git/git-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64"
+IUSE="test"
+
+DEPEND="test? ( >=dev-vcs/git-1.6.0.0 net-misc/openssh app-arch/tar )"
+RDEPEND=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5.0:*
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/process_executer-1.1:1
+	>=dev-ruby/rchardet-1.8:1
+"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitar-0.9 >=dev-ruby/mocha-2.1:2 dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't use deprecated key type that is removed from openssh
+	sed -i -e 's/-t dsa/-t rsa/' tests/units/test_signed_commits.rb || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index f8340b20971a..54da6d766493 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,3 +1,6 @@
 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-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
+DIST protobuf-27.4.tar.gz 9156456 BLAKE2B 004427f4923e523bf77298600bf91a8fe4ca8be4bd6da5b7efcfe9186a032155e525426f83f683e1bed1e799ed1e62d250053386c1463cbd0c062bd05da786d0 SHA512 d076ce7e075096d0dba7ee2314b12e3223c4239c019e25670636a0ef812ddf0ce3f1fd9b9fe8517319db87b14bbdb2653cc4e06023f90032dfedb014457b2863
+DIST protobuf-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5f1edfccebcc8ee7c9e0e74d06e5e6dbad741fd89f6a4502c1cb246a973fd60c035ccdbf89700b7baff49e2a65e SHA512 8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild
index 701738e78dc1..7d2cbd74c1f7 100644
--- a/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild
+++ b/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ SLOT="3"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
-DEPEND+=" >=dev-libs/protobuf-3.21.0"
+DEPEND+=" >=dev-libs/protobuf-3.21.0[protoc(+)]"
 
 all_ruby_prepare() {
 	sed -e '/extensiontask/ s:^:#:' \
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild
index e259959da05c..7d2cbd74c1f7 100644
--- a/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild
+++ b/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild
@@ -23,7 +23,7 @@ SLOT="3"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
-DEPEND+=" >=dev-libs/protobuf-3.21.0"
+DEPEND+=" >=dev-libs/protobuf-3.21.0[protoc(+)]"
 
 all_ruby_prepare() {
 	sed -e '/extensiontask/ s:^:#:' \
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.25.4.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.25.4.ebuild
index e940d72afe23..8ab535e9f330 100644
--- a/dev-ruby/google-protobuf/google-protobuf-3.25.4.ebuild
+++ b/dev-ruby/google-protobuf/google-protobuf-3.25.4.ebuild
@@ -22,7 +22,7 @@ LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~amd64 ~arm64"
 
-DEPEND=" >=dev-libs/protobuf-3.25.0"
+DEPEND=">=dev-libs/protobuf-3.25.0[protoc(+)]"
 
 all_ruby_prepare() {
 	sed -e '/extensiontask/ s:^:#:' \
diff --git a/dev-ruby/google-protobuf/google-protobuf-4.26.1.ebuild b/dev-ruby/google-protobuf/google-protobuf-4.26.1.ebuild
new file mode 100644
index 000000000000..f77e320a3a57
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-4.26.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="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.4.ebuild b/dev-ruby/google-protobuf/google-protobuf-4.27.4.ebuild
new file mode 100644
index 000000000000..f77e320a3a57
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-4.27.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="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.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-4.28.0.ebuild
new file mode 100644
index 000000000000..f77e320a3a57
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-4.28.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="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/grpc/grpc-1.54.0.ebuild b/dev-ruby/grpc/grpc-1.54.0.ebuild
index 934ddf075b4a..931429078487 100644
--- a/dev-ruby/grpc/grpc-1.54.0.ebuild
+++ b/dev-ruby/grpc/grpc-1.54.0.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_EXTENSIONS=(src/ruby/ext/grpc/extconf.rb)
 RUBY_FAKEGEM_EXTRAINSTALL="etc src"
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
-inherit ruby-fakegem
+inherit multiprocessing ruby-fakegem
 
 DESCRIPTION="Send RPCs from Ruby using GRPC"
 HOMEPAGE="https://github.com/grpc/grpc"
@@ -23,6 +23,12 @@ ruby_add_rdepend "
 	>=dev-ruby/google-protobuf-3.24.4
 "
 
+each_ruby_configure() {
+	export GRPC_RUBY_BUILD_PROCS="$(makeopts_jobs)"
+
+	each_fakegem_configure
+}
+
 each_ruby_install() {
 	# Remove all the "src" bits that are not needed
 	rm -rf src/core src/ruby/spec src/ruby/ext/grpc/{libs,objs} || die
diff --git a/dev-ruby/grpc/grpc-1.59.2.ebuild b/dev-ruby/grpc/grpc-1.59.2.ebuild
index 934ddf075b4a..931429078487 100644
--- a/dev-ruby/grpc/grpc-1.59.2.ebuild
+++ b/dev-ruby/grpc/grpc-1.59.2.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_EXTENSIONS=(src/ruby/ext/grpc/extconf.rb)
 RUBY_FAKEGEM_EXTRAINSTALL="etc src"
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
-inherit ruby-fakegem
+inherit multiprocessing ruby-fakegem
 
 DESCRIPTION="Send RPCs from Ruby using GRPC"
 HOMEPAGE="https://github.com/grpc/grpc"
@@ -23,6 +23,12 @@ ruby_add_rdepend "
 	>=dev-ruby/google-protobuf-3.24.4
 "
 
+each_ruby_configure() {
+	export GRPC_RUBY_BUILD_PROCS="$(makeopts_jobs)"
+
+	each_fakegem_configure
+}
+
 each_ruby_install() {
 	# Remove all the "src" bits that are not needed
 	rm -rf src/core src/ruby/spec src/ruby/ext/grpc/{libs,objs} || die
diff --git a/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild b/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild
index 6695a2a04986..200adb36f96e 100644
--- a/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 66e01b3c4d30..ea9f79d8ed85 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,3 +1,4 @@
 DIST highline-2.1.0.tar.gz 234116 BLAKE2B e1e899093de7e162e83f4d2e694e5841cedc336063a4410cab392702241136d5eec258b53065ffcded567f0af163d04a25bbdfd0767211b059980e9e5effe7c9 SHA512 b763428d67b1eb77762b54b8e2dd39bda720589e7030db8694e793bb432fa94caa2848b23358e7eaea0ccb22d8a93e0a64aeef3865f7e9fec348bbebee19d713
 DIST highline-3.0.1.tar.gz 236149 BLAKE2B 0aaa40ca678dc88934f55d5df9b970d8cd61e507bb4e967c72de10c5bcce94dfc5d6e4085d753124a62d46a285a096302ad127214f2aea28fa0397f40d3c6902 SHA512 e19724a473756faf57d989944b1e5cd86b97049a16ae0c33f25462f6f3d7f9948064f8e08d0b51d3a6f978acaf93c62b4965be5af829d3c07b123c96490a28b2
 DIST highline-3.1.0.tar.gz 236286 BLAKE2B 18a8250f180fbf5da73888c399b9b5aa80c216eb22f472a7e9924fa14886f82331e48557da974549a4dc61d7df7dcf023e8a9eb89994b3b100d8c35a9d73f545 SHA512 5346947a865ae21c6b3c97400c144f62197ed2f2802c81e7f3cfa276ec36f96cdffad9decc1f8a28f6108543b5ba0067fd09d8ec5daaacdf403f28df9c25d723
+DIST highline-3.1.1.tar.gz 237291 BLAKE2B e0e4bce282bb1ab87e803864882db1b8d59872ede17fc606573f3238971b1f986a9bdc4f4679e9e2a346510dac6e4716bc2a43f5a70a10016a6b9cb0374a5009 SHA512 f3f9ed1cd0658bdbf95913c75cfbaf2e69e31dc49d846c715b0ede1a0fcd2fc7ed9efb06bcc7e42bd262ccd626a3a87c49a00cfeeb4384af182c9c45a9b21085
diff --git a/dev-ruby/highline/highline-3.1.1.ebuild b/dev-ruby/highline/highline-3.1.1.ebuild
new file mode 100644
index 000000000000..bb616ed3e3a3
--- /dev/null
+++ b/dev-ruby/highline/highline-3.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="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/irb/irb-1.13.2.ebuild b/dev-ruby/irb/irb-1.13.2.ebuild
index 578774e8bd35..c840f8885d5c 100644
--- a/dev-ruby/irb/irb-1.13.2.ebuild
+++ b/dev-ruby/irb/irb-1.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/irb/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"
+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"
 
 # Ensure a new enough eselect-ruby is present to avoid clobbering the
diff --git a/dev-ruby/json/json-2.7.2-r1.ebuild b/dev-ruby/json/json-2.7.2-r1.ebuild
index e0ef6a572308..8b209fce5e5d 100644
--- a/dev-ruby/json/json-2.7.2-r1.ebuild
+++ b/dev-ruby/json/json-2.7.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD-2 Ruby )"
 
 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"
+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"
 
 DEPEND="dev-util/ragel"
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
index caebfeb6f041..21a0972a4cce 100644
--- a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
+++ b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A kramdown parser for the GFM dialect of Markdown"
 HOMEPAGE="https://github.com/kramdown/parser-gfm"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE="doc"
 
diff --git a/dev-ruby/logger/Manifest b/dev-ruby/logger/Manifest
index 398f0ec1d788..bfb83f1e3afb 100644
--- a/dev-ruby/logger/Manifest
+++ b/dev-ruby/logger/Manifest
@@ -1 +1,2 @@
 DIST logger-1.6.0.tar.gz 18954 BLAKE2B 6368cd85cc36819ec3b98719befbea84ed3bbf9866ddb06ea946e6cdd0109e7c771fda673f688566f22b9654bb2ace4e196d9385b645c1d5efaeb6f708cdee29 SHA512 e2aa950132f2bd2ae4b2f0f911d84eb8843c4403028c5ef4ed5e752f397263fe251fb6296b1d5b3eea26ed79fce5bcb0e1cb8dbdc3cf24cd954522f394f5ad6d
+DIST logger-1.6.1.tar.gz 19719 BLAKE2B 68e711550c0323614ee32fc0589c17d987be1cd65c7ed5721357465e57a7a07521e1c77ad20eb4f8e7dc37e9132888883bb1022bd7db73280cb8a0b4be7bbac9 SHA512 f77f594a507495643540e30c9e76c4edd191387f738a2e2cffede983f1be9419f0991bb20b0c5319fc6c26bbfdc20d350ff2c05ae1fa8ca313de8595b779a1be
diff --git a/dev-ruby/logger/logger-1.6.1.ebuild b/dev-ruby/logger/logger-1.6.1.ebuild
new file mode 100644
index 000000000000..00cc9eb96d87
--- /dev/null
+++ b/dev-ruby/logger/logger-1.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_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 ~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/mechanize/files/mechanize-2.9.1-libxml2-1.patch b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch
deleted file mode 100644
index e2b72f2d8adf..000000000000
--- a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 762df0c71705d1c054aca4abd95a638774a47242 Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Wed, 7 Jun 2023 10:30:37 -0400
-Subject: [PATCH] test: work around libxml2 encoding changes
-
-versions 2.11.0..2.11.4 do not recover from encoding errors. upcoming
-release will change the encoding of the resulting doc as a result of
-recovery changes in libxml2.
-
-See https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 for more
-context.
----
- test/test_mechanize_page_link.rb | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb
-index 5e77dcc0..988328cc 100644
---- a/test/test_mechanize_page_link.rb
-+++ b/test/test_mechanize_page_link.rb
-@@ -1,5 +1,7 @@
- # coding: utf-8
- 
-+puts "Nokogiri::VERSION_INFO: #{Nokogiri::VERSION_INFO}"
-+
- require 'mechanize/test_case'
- 
- class TestMechanizePageLink < Mechanize::TestCase
-@@ -111,11 +113,15 @@ def test_encoding_charset_after_title
-   def test_encoding_charset_after_title_bad
-     skip_if_nkf_dependency
- 
-+    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
-+    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
-+    expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
-+
-     page = util_page UTF8
- 
-     assert_equal false, page.encoding_error?
- 
--    assert_equal 'UTF-8', page.encoding
-+    assert_equal expected_encoding, page.encoding
-   end
- 
-   def test_encoding_charset_after_title_double_bad
-@@ -131,6 +137,10 @@ def test_encoding_charset_after_title_double_bad
-   def test_encoding_charset_bad
-     skip_if_nkf_dependency
- 
-+    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
-+    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
-+    expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
-+
-     page = util_page "<title>#{UTF8_TITLE}</title>"
-     page.encodings.replace %w[
-       UTF-8
-@@ -139,7 +149,7 @@ def test_encoding_charset_bad
- 
-     assert_equal false, page.encoding_error?
- 
--    assert_equal 'UTF-8', page.encoding
-+    assert_equal expected_encoding, page.encoding
-   end
- 
-   def test_encoding_meta_charset
diff --git a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch
deleted file mode 100644
index 3fcd8a270b16..000000000000
--- a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0ba09f46be6f1ce4adb94baca9867ed769f6535a Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Fri, 11 Aug 2023 09:29:06 -0400
-Subject: [PATCH] test: work around libxml2 encoding changes
-
-Related to 762df0c7, we're seeing the upstream fixes did not ship in
-v2.11.5 so let's change the version test to assume it won't land until
-v2.12.0.
----
- test/test_mechanize_page_link.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb
-index 988328cc..04294420 100644
---- a/test/test_mechanize_page_link.rb
-+++ b/test/test_mechanize_page_link.rb
-@@ -114,7 +114,7 @@ def test_encoding_charset_after_title_bad
-     skip_if_nkf_dependency
- 
-     # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
--    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
-+    skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"])
-     expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
- 
-     page = util_page UTF8
-@@ -138,7 +138,7 @@ def test_encoding_charset_bad
-     skip_if_nkf_dependency
- 
-     # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
--    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
-+    skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"])
-     expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
- 
-     page = util_page "<title>#{UTF8_TITLE}</title>"
diff --git a/dev-ruby/method_source/method_source-1.1.0.ebuild b/dev-ruby/method_source/method_source-1.1.0.ebuild
index 7037fba7a3a0..0878195820fa 100644
--- a/dev-ruby/method_source/method_source-1.1.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.1.0.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://github.com/banister/method_source"
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 4a975179b5d1..2c0b3a23f694 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,3 +1,4 @@
-DIST mime-types-data-3.2023.0218.1.gem 201216 BLAKE2B 3ccd9fcdc70fe9b09f0e9ca61356dd4c2563ac7fe32d75fdbdbaace9ba0757b274fec98c56cfdcae7f2f9f0840cc83a7ea9f3c9e420b3c8de076c87abb1621d9 SHA512 db0c4fddfcdd21ed1d8bd05039a14406600611be7fabd5d0021e8972d89e85ef2dd2d4e75bafb4e9ac7cf15606b4d4f67d6c6760fca6569fb2e2d6ba0d3f8145
 DIST mime-types-data-3.2024.0702.gem 207872 BLAKE2B ce913874a94f3e055e2fe041ce8ccaf578569b58434f20234bcb07498b17fac0c8687f00f7bc490a64314a28c8571fcc3ee9e39994cd433c78110580d6980697 SHA512 495b5eec22a75e485579e8832d818414e4ebc4a3347795ea3736610eaba8c5ff324c09caaec4f60663403f1363e77973241d8a5a0330f0ab631b367495bc89d0
 DIST mime-types-data-3.2024.0806.gem 208384 BLAKE2B 5e27bbe3da16d4abce29ba70124ec4eb7821b70da55fa748282bd2069b4be93cb2c6ea5fb842f1bec310039cf7f64e7b9977b34da9f95e245fe214a911aa8556 SHA512 ef2c358a9e6bb52af608f81bfde5d09a6e3e075ad340781ffb8d705ce8fa2d9b49b53d5a6e6f08ddb69fa59868084bb0aea88944a07cec4807d6ca76c05c1d1d
+DIST mime-types-data-3.2024.0820.gem 208384 BLAKE2B dcd57461730f88d8892b7d139d8d19ca21b7c13da2f1558d12761cea9fa5705d3edee35e8d77ed4e2f27ee79937d4e69419e958d91924379c4e5201ce5a18140 SHA512 90561ecb9afe91f4758604e601d54dba2f6078d6bf32b2040a89f73585586e58b05422e4c6d0a9a2e2cc192171e62b194fe610ccc3b94259c9deb27d3080a61a
+DIST mime-types-data-3.2024.0903.gem 209408 BLAKE2B c16d6bd517a3a70268eff9e6eff8f239db6e766cb49e57a24571671a92063037109603bab86625ded4393675c16e514fb29a1d28125c02dc30180ae041f59756 SHA512 546bf3a301c16ae37adabf0a0a0b1a2f1e96ac77fae8ce1947b48bc2fbdc34c9af82849fa5b7905930570522c7878cfa1836ccda960bdea5c3d72a70270b5271
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2023.0218.1.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2023.0218.1.ebuild
deleted file mode 100644
index b7863e0edc3a..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2023.0218.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="History.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"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2024.0820.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2024.0820.ebuild
new file mode 100644
index 000000000000..122dc1ac578e
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2024.0820.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.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/mime-types-data/mime-types-data-3.2024.0903.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2024.0903.ebuild
new file mode 100644
index 000000000000..122dc1ac578e
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2024.0903.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.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/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 7b359464a7ef..5eef5b7edc02 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild b/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild
index 26598e37d533..323f31688be1 100644
--- a/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild
@@ -27,8 +27,8 @@ 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] )"
+RDEPEND="media-gfx/imagemagick"
+DEPEND="test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
 
diff --git a/dev-ruby/mini_magick/mini_magick-4.13.2.ebuild b/dev-ruby/mini_magick/mini_magick-4.13.2.ebuild
index 26598e37d533..323f31688be1 100644
--- a/dev-ruby/mini_magick/mini_magick-4.13.2.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.13.2.ebuild
@@ -27,8 +27,8 @@ 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] )"
+RDEPEND="media-gfx/imagemagick"
+DEPEND="test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
 
diff --git a/dev-ruby/mini_magick/mini_magick-5.0.1.ebuild b/dev-ruby/mini_magick/mini_magick-5.0.1.ebuild
new file mode 100644
index 000000000000..c6ca8f7af3cc
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-5.0.1.ebuild
@@ -0,0 +1,50 @@
+# 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_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/minitar/Manifest b/dev-ruby/minitar/Manifest
index 10a61594ff2f..b26d3037c12c 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1 +1,2 @@
+DIST minitar-0.12.1.tar.gz 33096 BLAKE2B 2277a21f7f29c52b54c26c19960970faa4a892fdb2eb3cf8825b1e668de16b2b1afe2d61dc092e56e65064f9df00945bb408c7b38499e057efc3a2c4cf9b6656 SHA512 7bd79f4a98add766e4391e1db43745c746e138ac7857bb771d8f00b4051025afcdf76af02085f601b5ad92c6c43205bd5f51a80289db14ba72f050faf5d0168e
 DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
diff --git a/dev-ruby/minitar/minitar-0.12.1.ebuild b/dev-ruby/minitar/minitar-0.12.1.ebuild
new file mode 100644
index 000000000000..dabb510d538b
--- /dev/null
+++ b/dev-ruby/minitar/minitar-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="minitar.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
+HOMEPAGE="https://github.com/halostatue/minitar"
+SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minitar-${PV}"
+
+LICENSE="|| ( BSD-2 Ruby-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"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
+
+all_ruby_prepare() {
+	sed -e '/focus/ s:^:#:' \
+		-i test/minitest_helper.rb || die
+
+	# Fix spec broken not casting write input to strings
+	sed -e '/def write/adat = dat.to_s' \
+		-i test/test_tar_writer.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 2804c3944a0f..da0100b4195e 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,3 +1,4 @@
 DIST mustermann-3.0.0.gem 50176 BLAKE2B fc77327de469f0886de782c577ac164b222bbe18074f1ec63c35a08344cfcdf9a2cb44b453c594e2b153db3055ff1e7bcf969240ade04e70be5cb85a73e486a3 SHA512 c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82b387bbe551019fc115675634d932a8e56b070c3a06a85d830c982a103e6c5193aff8647f599be6e3
 DIST mustermann-3.0.1.gem 50176 BLAKE2B 4bbc549b1bd614aa4ec68ad60d0cfb85094bfe4e3d500b69be9f666e4d961d53c368ba513c89f252a47878349943afb5c2dfc757e51112fb42974bc314adebab SHA512 886cc49dd1acbf2af76faa4dfc0309841666438a1a53bbf69ed215ddd16fad2126033b571f6c95c2002e2a443479ac52f6d7750b0f7117daac3221a9b04dc011
 DIST mustermann-3.0.2.gem 50176 BLAKE2B 5cd977e3b35b5652f8d0d59e724a5310345a22d79f542ecc795fb28e15f6ec9ae6c31921e9b1d170b1d4cbc069d18673438f89d6abac87a9209c67f23bbef6ae SHA512 f20f2058a3277c86c97e57593771ff81d6b275d53744f59953ac33e90ab9ede9f600f8517b8623718a8881c5077e854f070f24c08953cf4e634531860b6a1d5a
+DIST mustermann-3.0.3.gem 50176 BLAKE2B 0b6ec3b836a06931942d8f5ff293b30f60795ca3bc0ab73a07d6b03bbaade562c4e5da3676ed79ccc85ee3c89ce5e7f49758f1bc7f1ee6bed358118edba700f4 SHA512 d205985a5da83d83248899642ed359056b0cdb511e77d51309319c2f8d8b6c84040e9e1d3a56b7f83a0b26aed4b344f4df371b310e419c20170f0a486e89ba6f
diff --git a/dev-ruby/mustermann/mustermann-3.0.3.ebuild b/dev-ruby/mustermann/mustermann-3.0.3.ebuild
new file mode 100644
index 000000000000..dbdc7c474bb2
--- /dev/null
+++ b/dev-ruby/mustermann/mustermann-3.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# There are specs but they depend heavily on unpackaged code.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library implementing patterns that behave like regular expressions"
+HOMEPAGE="https://github.com/sinatra/mustermann"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "=dev-ruby/ruby2_keywords-0.0*"
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index d8ca2a7f1e94..b4a057bbc827 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -3,3 +3,5 @@ DIST net-imap-0.4.11.tar.gz 243069 BLAKE2B 7d8eb7ae4604358c408d855c731d4a99a4383
 DIST net-imap-0.4.12.tar.gz 243885 BLAKE2B d3ccd6f799671f2101c38fcba437ae3962a61a2fe4b73545fbeee5f10ad035c0819afb25e7617fdcfce88337b4c99c3c4d98eeae914a1fc77a90519430b4e889 SHA512 ad3b030ba5a7daf8831a34a0e0effe0780134d7c81aeb4025adb39f11dd97ba57bcddd555b9038a34bdcc809ea722d778e0368a26d04739e084f6d4b7714aed8
 DIST net-imap-0.4.13.tar.gz 247862 BLAKE2B a5bf43e86dade15e03c070ec9771c21ace8dc04504393fe768c289089e1891be4789475e45839ea5f1a2ae2257434dca394495f91340daf44e1610adf3f23d4b SHA512 7bb04fea8e4b322e685a5233b0cf6da9e7b32a87297c075e46d9681d46c9bf52228295590f53cb00012a29bd8ebf488eaca748c312da674787c38e32d6555d6a
 DIST net-imap-0.4.14.tar.gz 251100 BLAKE2B 577eb64bbbb2de8ae25b6840e88153f7398a86795ee26bb0900838ffc0a5c5d5962e3e51af3a4e40be77d25c7782d37d4380bb10c128b27ff7d459c0974c581e SHA512 dba93392fb12870b10e6bd351091dfdd77f66a8e63b1ad9ef20e59a701194636ba44d91277fb105f24780677191637c122785599e880e7c175259f114edd4ae5
+DIST net-imap-0.4.15.tar.gz 251828 BLAKE2B 0f02b9bea1b4268e5806fa6b19ba0da4151a045556b661142cbaeb770275504287991b95fd095626d6c78726ba2ce1fd0c3b95c63038dd07e446c3b3db18acc5 SHA512 a06455e425a8750c7fc730b8feed041d49964bb14abf2c0c6ad6cde829dff26fee792ed2aa286a3d7abb7dc56b34b663e629e95482c443cd14f67e45db4bbb60
+DIST net-imap-0.4.16.tar.gz 251944 BLAKE2B 46260bb2f9225da91189b17160c18f82f9b1f4442f1dc7fd85fb901684e61da466cefa0faf004dc76f1c8f882e978aff3003e97bae4d76bb7c4595088ef86874 SHA512 de1a6afba0276f42b51c0f670a356ad22889f2058bb6183c3c9b2ef387c08b7a1e577668506d7ec3b103eb3ad6a945352483c8673147125572af468ad84d5202
diff --git a/dev-ruby/net-imap/net-imap-0.4.15.ebuild b/dev-ruby/net-imap/net-imap-0.4.15.ebuild
new file mode 100644
index 000000000000..78de90b9b8ae
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.4.15.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/digest
+	dev-ruby/strscan
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-imap/net-imap-0.4.16.ebuild b/dev-ruby/net-imap/net-imap-0.4.16.ebuild
new file mode 100644
index 000000000000..78de90b9b8ae
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.4.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/digest
+	dev-ruby/strscan
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild b/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
index 3d9b5e520a7c..b10c25218c7a 100644
--- a/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="chacha20 ed25519 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/open4/open4-1.3.4-r1.ebuild b/dev-ruby/open4/open4-1.3.4-r1.ebuild
index d98a59d38683..cf8bab8e1beb 100644
--- a/dev-ruby/open4/open4-1.3.4-r1.ebuild
+++ b/dev-ruby/open4/open4-1.3.4-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 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"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 2e7a0f50bcfc..763ba5f60049 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -2,3 +2,4 @@ DIST parser-3.3.3.0.tar.gz 330893 BLAKE2B dd730e39a82dfb5d97bc11ce9814a5106fc608
 DIST parser-3.3.4.0.tar.gz 330963 BLAKE2B fbac9486cdf08701a0fba0f24f35c42347e29d74ea203764445fe973e65c93ea801fd986a28e448c080c92a1b104e2692f3d5ed21d76543423cb0fbe5726a6bf SHA512 882330a6e0de62f19a452e587a32eb16732ffb4233e6664d5c90e3030857d4baab33b838489b4a3d122b48b21849ccf2ab291b0cafea6b728423f328a4ec9fe2
 DIST parser-3.3.4.1.tar.gz 331115 BLAKE2B 35417751702bda1ac4fd9240dd453e6c8271ba0443e81a71aacac3375b83e1587333d71fc29395f1f65dba2408351fd19df950c2e6196c1b7b8dd2148de578aa SHA512 5696b9446d7e3b05debc621085b16a4d7e052e32892e82e16e7608a6c14fd58f2d4d977be32e1a9ee1cc930cdd52589f85b77781dc84028e3b0af53bbbc4f693
 DIST parser-3.3.4.2.tar.gz 331155 BLAKE2B 8070f7359d9e29470e3d9bb132c4a6e2682b4aa4f8d62287f0230c53935445e0514f7ebd3753c1f9c70e661c01c5d465c7ada5fe0730a60ae8899fa933d62c93 SHA512 ccf9aba5ab642a42acc1246741123825d4c8346af7494ef12c16a3d15aa4f71701dbe4b121be5b48c3bfbacb75a1e8601d554282b46c1d369f518109be27d106
+DIST parser-3.3.5.0.tar.gz 331207 BLAKE2B cd60df47b165d88e4e8fa5154ab41d3021f14f41bf0ecb73f0fcfa0762d4956954ce73b5a9e9a7376a9ecfd97c36e1887afa15c91dc1436b8de1e4d2468a4eb4 SHA512 00951144e3539730a9f2b02c9435f23716993e75f51db8f2bddc216d5e25902dad56d574af470190a0a9f91a93a09ef034fbc0fb030ce1a65d23c43e09bcab7b
diff --git a/dev-ruby/parser/parser-3.3.5.0.ebuild b/dev-ruby/parser/parser-3.3.5.0.ebuild
new file mode 100644
index 000000000000..0d50425d80a7
--- /dev/null
+++ b/dev-ruby/parser/parser-3.3.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_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/pg/Manifest b/dev-ruby/pg/Manifest
index 54c6c2161b4b..0bc5e13e8dd9 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -3,3 +3,4 @@ DIST pg-1.5.4.tar.gz 298368 BLAKE2B 1028fac00371f9f769ee6c484a518149dc7c89e78ee8
 DIST pg-1.5.5.tar.gz 299336 BLAKE2B 40410091a24929ee79c14cae8ec6e526a8db569f3f0d5c0637389a099caf8085189bec3fee69c52a07097e1aec62d8da0ee87cdc11118be5c7daefebd9e0019e SHA512 4cd12f2b30d9f853f9707d3329eda0999a7ed0f5ebdbbcb3110996db6d80ef6bb4331b3f6648b19f6fd3f63d928552b58190b34808ca714cbd72c54aeed43478
 DIST pg-1.5.6.tar.gz 300559 BLAKE2B 5430789943f107e18f9b509ab7963d6a5dc702782c30a218f5e648397ccc9f07128bae1beccf47172860fe97ae935308841876f26dad0d9ac223adb96722a302 SHA512 5c4cda39699f17864b3dc4daed4ab2096d64245fc2262b948a94c3269b0572a9fab2a42dcba692daf6eeba3354d6a0b05eb5db0f0ca5382b0f8315c1837a0206
 DIST pg-1.5.7.tar.gz 302055 BLAKE2B 2d8fbf2f60ee5c2e14a8ab0b649c5f8305fa34423923316f2e05252f31cc98b9f248586c3ad4b4c5d8d0765d1ab96b46e847a42a2d2bebaac68c318435e3d940 SHA512 6546d53e7264bb235c4f6de4b3b3a811f55ca072055dba1f2ab2c783c33f60d137c4f1f40b17711e2805c6c91bdeea90e9774ff56856bc2070ae1d98adb033fc
+DIST pg-1.5.8.tar.gz 303150 BLAKE2B 4fe9abe9441366440ac1b0d481311507e9dea80c882102bcc3a5c564b8007618693944b4be21a5c0a730ca6697b7ffcf33487caa7872c75947ca87c6ad87beaa SHA512 668071787fa89cbd453ca3b65dbd28a166b23d59a25a64f9cc2143909ff870c9ef749238fc81fb38fda757330f19ec24db4a0aae2fad5e93bc38b68f816f2baa
diff --git a/dev-ruby/pg/pg-1.5.7.ebuild b/dev-ruby/pg/pg-1.5.7.ebuild
index 6b02627b3d74..646942dcd4aa 100644
--- a/dev-ruby/pg/pg-1.5.7.ebuild
+++ b/dev-ruby/pg/pg-1.5.7.ebuild
@@ -23,8 +23,8 @@ SLOT="1"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
-RDEPEND=" dev-db/postgresql:*"
-DEPEND=" dev-db/postgresql
+RDEPEND="dev-db/postgresql:*"
+DEPEND="dev-db/postgresql
 	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/pg/pg-1.5.8.ebuild b/dev-ruby/pg/pg-1.5.8.ebuild
new file mode 100644
index 000000000000..d9f63c712110
--- /dev/null
+++ b/dev-ruby/pg/pg-1.5.8.ebuild
@@ -0,0 +1,71 @@
+# 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_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.md History.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-db/postgresql:*"
+DEPEND="dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Don't allow sudo calls that try to tinker with /etc/hosts (bug #933234)
+	sed -e '/sudo/ s:^:#:' -i spec/helpers.rb || die
+	sed -e '/refreshes DNS address while conn.reset/ s/it/xit/' \
+		-i spec/pg/connection_spec.rb || die
+	sed -e '/doesn.t duplicate hosts in conn.reset/ s/it/xit/' \
+		-i spec/pg/connection_async_spec.rb || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Fails with network-sandbox
+	sed -i -e '/connects using without host but envirinment variables/askip "gentoo"' spec/pg/scheduler_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/process_executer/process_executer-1.1.0.ebuild b/dev-ruby/process_executer/process_executer-1.1.0.ebuild
index 055bbd48a767..2a820905c3fc 100644
--- a/dev-ruby/process_executer/process_executer-1.1.0.ebuild
+++ b/dev-ruby/process_executer/process_executer-1.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/main-branch/process_executer/archive/refs/tags/v${PV
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 
 all_ruby_prepare() {
 	sed -e '/simplecov/ s:^:#:' \
diff --git a/dev-ruby/pry/pry-0.14.2.ebuild b/dev-ruby/pry/pry-0.14.2.ebuild
index de5957ae6f8e..958d8b05f1c2 100644
--- a/dev-ruby/pry/pry-0.14.2.ebuild
+++ b/dev-ruby/pry/pry-0.14.2.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="ruby19"
 
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coderay-1.1:0
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index 7e1e05257b60..1b1c9f0c8937 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,3 +1,2 @@
-DIST pundit-2.3.0.gem 27136 BLAKE2B 651f008426ce010c8a5be8543cde5c91f1bb8c6513e08cde4c4fda965fa95647f130d0a68094107be0b0c639ab520a74da0c2a50715ec5bd86a7a9243cf53686 SHA512 5a2c8563ab8402d3454afae499368b06d0a7ce23b59fdade3034da06604b025a567c4f9bc745bbc8a51226d768fad99b9057ff38c2930258d943265053a09636
-DIST pundit-2.3.1.gem 27648 BLAKE2B f81bececa11fb4df90779e7a92abb3854f77e47207afb162fdbaac1b23448018b04a35808bac7857e4f766eab949802a58b16ba8ed2331ccd3457a88826fda0d SHA512 dc919a8879aa613efa1b3ebf0c9a3673a060d50814a5ec6b3cc4120dceda407e483d9c265d08d5bf4a1cbe56a0ea698ecbc485f24fe0325a9b90635bc1cc125a
 DIST pundit-2.3.2.gem 30720 BLAKE2B 44745ef190e6cc2b503b5d6d341eafa8bc8325dcda0ed83c3c111e67ebfc27683c8918ab29eec625f04f88d206586429cce862b76115d0cf770f73d165cdd9ff SHA512 8415b4f334ec0a97309aed4da4e36ece2a5705c64bd05ca7583367f53a7987a8bddb8ba3ac3e18febec1f023be703e5014d42cd258d42d7c7f535829c4a53cf8
+DIST pundit-2.4.0.gem 32256 BLAKE2B e027ac82d5d58be1cb2cbf0460c507805beb2ad366f7ed89d1f1179dd469349727f88d0b045d7a5d88b02df802d376bf643cdff71bba07ce33235cd1fea975e8 SHA512 4fef014fa392b6db61ae6e4a0bce44cf54569cf026db6825acddc8eb4b52bd48ea60cb56c84e8f9321948efbc4d3caafc77334bc25fce28c07ee56f40a25d492
diff --git a/dev-ruby/pundit/pundit-2.3.0.ebuild b/dev-ruby/pundit/pundit-2.3.0.ebuild
deleted file mode 100644
index 4c7a17a0feb1..000000000000
--- a/dev-ruby/pundit/pundit-2.3.0.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="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0
-	>=dev-ruby/railties-3.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' -e '2igem "rack", "~> 2.0"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pundit/pundit-2.3.1.ebuild b/dev-ruby/pundit/pundit-2.3.1.ebuild
deleted file mode 100644
index 4c7a17a0feb1..000000000000
--- a/dev-ruby/pundit/pundit-2.3.1.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="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0
-	>=dev-ruby/railties-3.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' -e '2igem "rack", "~> 2.0"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pundit/pundit-2.4.0.ebuild b/dev-ruby/pundit/pundit-2.4.0.ebuild
new file mode 100644
index 000000000000..951d72e8c91f
--- /dev/null
+++ b/dev-ruby/pundit/pundit-2.4.0.ebuild
@@ -0,0 +1,32 @@
+# 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"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Object oriented authorization for Rails applications"
+HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/actionpack-3.0.0
+	>=dev-ruby/activemodel-3.0.0
+	>=dev-ruby/railties-3.0.0
+)"
+
+all_ruby_prepare() {
+	sed -e "/pry/ s:^:#:" \
+		-e '3irequire "ostruct"' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest
index b28767b3c872..0d884db51545 100644
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@@ -1,3 +1,2 @@
-DIST puppet_forge-5.0.1.gem 774144 BLAKE2B 2770c0609d93b3518017b36344025dbd7ab51360fea4af8f7ee610f4117f31de25698ad192ab00755564f0a57d9e6b041a7568440dbc5b47e2830a8cb00cd8f8 SHA512 3d29c166e1c22d7b4d45251866fbd8e6756a3026be5e17b1abe8cd6baaa7af4ddde7f2d07b75c21c5716c545cc6df82e36b1070a43a3d3c363214d3a5102843b
-DIST puppet_forge-5.0.2.gem 774144 BLAKE2B 6b01872246dc4791f78cefcb9df213df5768df483c8fac4bad12ddf358210ecb2b827ad129790e37d636ce4d7d0abb381097ffd2ee518a8472b067f5ba6de0a5 SHA512 861ac99a3e5234a8555fe37329b621135140d41c0fbad69648f56b901b10254d0474494c64525ebc4a0b730dfa91e9889ea4cf6ca7e2d5e40453221dd2e7370d
 DIST puppet_forge-5.0.3.gem 776704 BLAKE2B 2ea9e6a17fb5231629551b4dc2ca02f4843d67ded114f43a9891dba6a7ce03ab0b1b8ed38b434e8bcdfc73e940a263964a8254ba18493a137bd14600c3251a18 SHA512 17cb9aaf9c911608b90f2eb3e2561d94bffdfec559cb22bb0fa53d799f4a53f77c332ec261270135a924a4996d35b39945a4a94f7163b44dd9bb10f6ea72366f
+DIST puppet_forge-5.0.4.gem 776704 BLAKE2B 5b9969ad88f279d1fac639ae28ed1202dc3daf3ab6c07caa60144080e54bf2d075a88381877c97e71e44df520c04780fdec8096ef896685c938ba399851b3ced SHA512 95c90d79b5c3b7c9f3e3775782357550c69599d7134c599daf1bb81d37e26d32ade7e065f6fe45e97dc535d7755ea3ae302025cc475c95dfb0d98af6ff8efd54
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild
deleted file mode 100644
index dc80c18aca40..000000000000
--- a/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +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_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-typhoeus.patch" )
-
-ruby_add_rdepend "
-	dev-ruby/faraday:2
-	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild
deleted file mode 100644
index 642b012de688..000000000000
--- a/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild
+++ /dev/null
@@ -1,37 +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_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${PN}-5.0.1-typhoeus.patch" )
-
-ruby_add_rdepend "
-	dev-ruby/faraday:2
-	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.4.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.4.ebuild
new file mode 100644
index 000000000000..1fa7e7bf7d74
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-5.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.1-typhoeus.patch" )
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
+	dev-ruby/minitar:0
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rack-session/rack-session-2.0.0.ebuild b/dev-ruby/rack-session/rack-session-2.0.0.ebuild
index 36fd355742dd..e5fc3e31f80d 100644
--- a/dev-ruby/rack-session/rack-session-2.0.0.ebuild
+++ b/dev-ruby/rack-session/rack-session-2.0.0.ebuild
@@ -16,16 +16,20 @@ SRC_URI="https://github.com/rack/rack-session/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
+IUSE="test"
 
 ruby_add_rdepend ">=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/Manifest b/dev-ruby/rails/Manifest
index 2ec8a6ff714a..845a878d2afc 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.gem 7168 BLAKE2B c92e4144d2ac2bfdf37f61bc2715ab5cb920669afe1d
 DIST rails-7.0.8.4.gem 7168 BLAKE2B 12e0b4efed9458db27a9db2de69fa00d0ba2a7f78c85d71c0d6cb125f60f54e0aed7f4709e0440be7f83610b33201a1e943ff243ac9a35c2241354e0d75a0a43 SHA512 f2a05a6a13846dbb3ea7e010805a16fb9c59ca121186353127bd6ac349d26f7d5e3572c4807081ba16a6c92f710545bcfe4ba59d7d340716add9d4fef8bcc49c
 DIST rails-7.1.3.3.gem 7168 BLAKE2B 3c297b1074b563457d14b39e6ea5c342652dd6bb46e07634407e8824ea57e08844f9ef67be4ceaaf5bae3567204929beb559647c348a07309c4c969888a8c685 SHA512 bbafdbe3feb4992dff3901d4ad26a70328321bed4a91d2574fc2ff805f2e2b5648d8f1bbdaac26d2a22ea08b1e3ee2806ddc2b3647e1f3e20f01c296d458fa9b
 DIST rails-7.1.3.4.gem 7168 BLAKE2B b7a976fbc57f414140016c1cd7650f36779abe46d18c997d8126d5f6bf922400240c2f08a8bf0427c8b7361df08e42143d793f0931e2dcd31b4cf45736612ba9 SHA512 d012dac18ca10621bc8902d9ac291f6a5c64d40d1dfe85c9b320c62710357dd314dcf720f63bb9e60087d15152a2cfaf05ea62278aa9666085aafe20a9edd2e8
+DIST rails-7.1.4.gem 7168 BLAKE2B 3ad6aa2feaab930b6aee2b76b56c57e88c4d6ccd6507617b74445107cf0e8488bbaff2440fd1fc245afaf7b044970f5a12a237149a7f3c5da4e30b876b3a966a SHA512 0a51768227a601f760917b407d08941ce1e0169402c80d8815e811f3377904c2d1a701ba571a15d1b4d04a8dbefc6ea8fe5fa3edbbf0f682e1aef14ef1a678d9
+DIST rails-7.2.1.gem 7168 BLAKE2B caa9a817a91a3998d4f591619fb19c0d1534233e47c8b58e5add31eee5f4113e9c59b1221962920163a9da90283ad2459717855f26e64f1f40c404dc65ea90a2 SHA512 71e44ba307e11cf5665d00d6debfa466e3627f7aea39ace871d414a5f6a18e5b2875aa8315e8729506e320776c0bc17fc1317932b4ce4e33f8614bc04572aeba
diff --git a/dev-ruby/rails/rails-7.1.4.ebuild b/dev-ruby/rails/rails-7.1.4.ebuild
new file mode 100644
index 000000000000..4b56ab4ab897
--- /dev/null
+++ b/dev-ruby/rails/rails-7.1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	~dev-ruby/railties-${PV}
+"
diff --git a/dev-ruby/rails/rails-7.2.1.ebuild b/dev-ruby/rails/rails-7.2.1.ebuild
new file mode 100644
index 000000000000..65f1d45eed4b
--- /dev/null
+++ b/dev-ruby/rails/rails-7.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	~dev-ruby/railties-${PV}
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 07f91732212c..2220a7bf4296 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -4,3 +4,5 @@ DIST rails-7.0.8.3.tgz 11080686 BLAKE2B 2d13559e7b7ab752af4fee480ee51f73b4d1f392
 DIST rails-7.0.8.4.tgz 11082427 BLAKE2B 2ca521ad92b7a33fa2160b4cfbc1aac826641d2aac7a8751b6acaed1b7fc42bb860b4ade3f973eb51dc17d20fa4c97b02e8d6b970ae63b042cd58ab2f6cfc797 SHA512 e6628e901fcdcd4b9101cdae0cd556569fc7b577466a15f99d1e221c1c0059287dce87c1362df8b23ded992e96c551b35c0c789e683f080079e678555b7a79e6
 DIST rails-7.1.3.3.tgz 10905515 BLAKE2B b2be6d8922d15478136875ac80d65fdc54bdf4a03ec17cddc20c20ae847f08fd52a2b1110ed27feb0217f4aa8dd827a8d95847e32eceaf8f5979843312f12a2a SHA512 0d108654a9ab2a9321822742906c4848508e0e4e09600c01bd5a86deeb324540bbae520a954499c4cc83bfe1246f929a581d1667f2b50c463d0bf8187f603df9
 DIST rails-7.1.3.4.tgz 10917333 BLAKE2B 3266de2a86f8b107b18117c06115db14791bb98d672403eff28673e9d98df5e2c9a6c30f72d4141cd1f051054f2d5e1f636a93de9b14114cefef384fded7942a SHA512 4c303be256707b5bbedc05bf5bac7c60ff03cb8a14fa3d709a495d07ad1745d6c6f4d5dceb9860afff46f95f3f9fc525d1bcb75894a5b31a9d35f1aa6b105c5e
+DIST rails-7.1.4.tgz 10926853 BLAKE2B e1e62f95453fa0137337f40291614265ae4d8e6bedf496e0402f160ce938418760dcd850c37e82a7c9dd530dfe442b0f9b22d122dc80f1ff61c5c76244999416 SHA512 67770018663d930cb710fb08358c7d9c9d391a4c721212c55b60c4827f8cbdb38e55ee551b598e93244beba18f9c4c21dfdf6000e67880ac95345a70ff2e0841
+DIST rails-7.2.1.tgz 11065899 BLAKE2B 7858184a6e5ed07af56566e84d9ccdacf9d37ae3cb0a60ce09f632db782b5f97b3298c1a48147c2cb94b420e8186721ca00d9eff25ecee33f03c5348923e5fa5 SHA512 3ba68311f5b15fac647047d5e2bdbf0bf088ee4bd1208f3a47064cc7bc10794bf28f94aaabf410b773c6ff90638c8f08ebb74297855a303d080ffea9e96d25ef
diff --git a/dev-ruby/railties/railties-7.0.8.4-r1.ebuild b/dev-ruby/railties/railties-7.0.8.4-r1.ebuild
index 40662c9295e3..80708d143fd7 100644
--- a/dev-ruby/railties/railties-7.0.8.4-r1.ebuild
+++ b/dev-ruby/railties/railties-7.0.8.4-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/railties/railties-7.1.4.ebuild b/dev-ruby/railties/railties-7.1.4.ebuild
new file mode 100644
index 000000000000..97367488d2f7
--- /dev/null
+++ b/dev-ruby/railties/railties-7.1.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND=">=app-eselect/eselect-rails-0.27"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activesupport-${PV}
+	dev-ruby/irb
+	>=dev-ruby/rackup-1.0.0
+	>=dev-ruby/rake-12.2
+	>=dev-ruby/thor-1.2.2:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/railties/railties-7.2.1.ebuild b/dev-ruby/railties/railties-7.2.1.ebuild
new file mode 100644
index 000000000000..a81518c19710
--- /dev/null
+++ b/dev-ruby/railties/railties-7.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND=">=app-eselect/eselect-rails-0.28"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activesupport-${PV}
+	dev-ruby/irb
+	>=dev-ruby/rackup-1.0.0
+	>=dev-ruby/rake-12.2
+	>=dev-ruby/thor-1.2.2:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 86cd622620c4..64c61a581aad 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -3,3 +3,4 @@ DIST rbs-3.0.4.tar.gz 1123563 BLAKE2B 335ba5d438b74ef36a65c1bd5d41508bb4d89a5273
 DIST rbs-3.4.4.tar.gz 1236977 BLAKE2B 19b95e7b162714738c37d9d8f740d11e5e4694f6e2c7e9ba9f01c74d8d318d0b848251276e421a80d8a5680ed60fa510d04d4a57ac72d0c376f1e9cfef2fe773 SHA512 c6be887af1c89e7b9d8f01e248a24f571c189fc81f55d1625957434a3d1e74c5d23f9ba2089750cb742a82560165d9bab309cff8cdb6c9e455076051301c7dd4
 DIST rbs-3.5.1.tar.gz 1253359 BLAKE2B c30ae04d32390c415de8b6e5b58006e5ac916ffd451df82d020c72f14ce510f4a4a792b3baff7e674452fdaa6dd9aa816f5248882d6cd82aed70b921bf6dac23 SHA512 aab98a8b79c50570eb666861fc75d33c66af0504edb2c36543d32020eb04c3b5e1d227dada73e61d67a5cf64e9e613ff55218267c3f54f0f65fdf22b1dfaff4d
 DIST rbs-3.5.2.tar.gz 1254235 BLAKE2B bb0b6f752c8b4d19491fce19ac34cdb0bbbd00dd570ae8c155674cb337a21672c6db1a5a9475b43aa0b9fe3bac3517ad484a1539fcb7f069c50f0edb8af9878f SHA512 2a94f0fff502ec389c3da7f6164b86cfcc6bcbb5afb3ef22b917d17f9c211e492d37e37669d5d41f157a6e9e256125682d8e6bb634d0918b3a19987774914a07
+DIST rbs-3.5.3.tar.gz 1254332 BLAKE2B fe82805b727112ecc61fc581601fbb82e0c8a18a79dd6e724b91c4c14c6cc18f89c7dca8f3d734b06c40a1ec6bde42d203aa8400ddd2b48b24a9ef660d80aa8a SHA512 8bf2645ae076562fa5197495c32ffd76472295cbe32bb49bfd5f8c4194e9444f2193d365cbc62c3b732e0b4f106563c03fba6aaaff7e11853adc317af1970662
diff --git a/dev-ruby/rbs/rbs-3.5.3.ebuild b/dev-ruby/rbs/rbs-3.5.3.ebuild
new file mode 100644
index 000000000000..7aebee8de87b
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.5.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD 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_rdepend "dev-ruby/logger"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid test that depends on rspec to avoid a huge dependency tree
+	# for dev-lang/ruby. This test is automagic but can still cause
+	# breakage when rspec is not properly installed, bug 935259
+	sed -e '/test_is_double/aomit "Avoid rspec dependency"' -i test/rbs/test/type_check_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_\(method\|paths\)/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index ed7234f15020..bc3471591ff2 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,3 +1,4 @@
 DIST recog-2.3.23.gem 392704 BLAKE2B 6b7ccfa2921fb7d643531c66970e757a01478b3990bbb2d05687a5364ed8b57317d16d0b116c2175cf0e667b12ea7a978c947b73d04db16fbd1a9db651ba4abf SHA512 34cb222dbc25f5da0581cb85aa92a3e6fa67b9af9d0b7b99cb3e358b1be5d71a25f582a669a06f4cadd4b6ac464c7f3d2b3856c24d5ecea0d1d6027758905774
+DIST recog-3.1.10.gem 392704 BLAKE2B be12a147dab2a811b18627eed08893fdf37103e2478a1593fc66cfa3db296709ac4dc1915fac4063dff4c4223cebd48b79139043578dae6c29eea5d6c9b624f7 SHA512 64f8f1bcde648d50e2058bcc18e2efb111212341ee2ebbfd8b9fa90d58889299c2ffcab6218029a4d2ad9ede2f811f187f1639d47fec187a976ab83c31dbf8a7
 DIST recog-3.1.8.gem 376832 BLAKE2B b4cc90697e8a0be77207deef5a79e0faa79b459ec4873f6dc00132dece0b12b173ba116c83ede45aeca9a8b8ca63d8c005f5769fe80261cd197a21b13568ca64 SHA512 1e1f5c7207f9a0442e30e1b8f0307836b7789cfcc56343abd3052eb7f58046038964ad13f3eea23faef08304ab048fbdfc2f8bed4f3d73fe44f88a632b6dd5a6
 DIST recog-3.1.9.gem 392704 BLAKE2B fd7fb0267242e9eb1f9e7244494363490b197c7bc283e4a9249a7ffe36ca66c808acbdab38039c265440bd2dedcbfa7a7e309aefcf8c68e6326b83eaaa51ae81 SHA512 8710228b316df2d5232bde9838557ffdd22dfefe0d3f79c27de40fb332f6296b7b298abb590e8b43e11cf928acbade62555ae5e53e61cfb8d14d7403bca35be3
diff --git a/dev-ruby/recog/recog-3.1.10.ebuild b/dev-ruby/recog/recog-3.1.10.ebuild
new file mode 100644
index 000000000000..35ef2a4232d6
--- /dev/null
+++ b/dev-ruby/recog/recog-3.1.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="recog"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/reline/Manifest b/dev-ruby/reline/Manifest
index cfe0b9c5d635..2beb44dff448 100644
--- a/dev-ruby/reline/Manifest
+++ b/dev-ruby/reline/Manifest
@@ -1,6 +1,4 @@
 DIST reline-0.4.3.tar.gz 93606 BLAKE2B 9faf8e2db40e75285163a6b8d587198b96faa67284b276e2a96d03b074d2f1abed01aa49a770bad96e066d0d6214319fb84b09a07754b93e2298896641babd73 SHA512 7a6c054dd187ed804ea730845af1eaace094d25e5fc5a9c02395e3886f493a79922cb624dd16d9000f193baf2d3cb147a57737235b289e1382a92e34c59d7dfe
-DIST reline-0.5.5.tar.gz 91888 BLAKE2B a1d01ffebcb18fe2eda9836672378fe5feb5b9b30c0d2bc61889ffad95e05c68998fe79d6fbe3742791b8c71ba52fe17b8ade4e8ecc8c14fa91deac3d06854cd SHA512 160c8c5ed670476607ea0e3f0f1edc0ae557fe9bb3f1eb5e3c744a3965864227f8804ff23004b9fb264c9b67740e5697b64d52bfac6b82aab5aee9daa349291f
-DIST reline-0.5.6.tar.gz 91809 BLAKE2B 50b5473ab328fba4a552e8817d3048244144e014c9d6f7970c8bb1936329d34598667a752e66529d47facb5d2d15fac36154fe5b5f28f2301024c26b6387cace SHA512 755d23ccd6b5ba53cb357ce84a45d6f36eb1458c0c59e7ef77b585e53f2d3b393930fa076e8f5a1e49aa28a10156cf1926abf4ec691d88394f64a4a2a50af6e5
-DIST reline-0.5.7.tar.gz 92492 BLAKE2B 7559cf463873f9cf12b8e0f63cc4494a1b24c897a224dbf5b38486787d51ba9134302434c7e79ecfbd54d68e2f2323deb0dd2185d2680b541958c13a6da3c44e SHA512 e79fe0a5a18cc11e9ff286f16c1bd9d8024bbb09c04dc3d47adfc901c85a13737362849d1bef82e47e4c6eeaa82c13a26aaecbcf6f9d493286105aa3cbfc8532
+DIST reline-0.5.10.tar.gz 90708 BLAKE2B 1afd7a928adbc9f8f531234ef927109e1a466bed35ae704e926b0fa32d66e41f7aac13d2e9e5ee637b039f9ac0bc183271239fc7470c9d8107a22b4aa36c7173 SHA512 76ab8fc14e4ffbc2dadfa119ad58e1447068909c388bb9f0148a186b5e0a625ed71091e588fc034064a0d36309eda0bd568ffe9088c4162d9e6e1d03dc526303
 DIST reline-0.5.8.tar.gz 92936 BLAKE2B 549ceb0e81ea0bc4e201d3b45538e2878c1ecfa70ba1e31e1161ae8e80fbedccbc1988999485544de107b857bdd7e14d58d6b31ed125917a7d61ffd6ddfea1cb SHA512 64d4358af20691af3ccefbb64e9c048b14b93508e0fefa9b2c9ac9bf1eeb3d86137039988a7f23ad2860106778bbd7ea366d865c7236a9f98eca72631751ffaa
 DIST reline-0.5.9.tar.gz 92647 BLAKE2B aa544ac997aea6e1c9d58678e8a7a979b93a7c403f3b785a1c505f60030903ba7679c1b30457c1233a904e25de599b4322ddeb761532ff1b1db7f424b5ce8bf9 SHA512 14c8ea83e86cd11f1b80d63cf8644b0d411f86f4483015191847fd0f5b464ea9d610d6f5dbaf44b01df0c183ee8d8bd7e1cabba762e00e4cdcbe2afe60fccd8a
diff --git a/dev-ruby/reline/reline-0.5.5.ebuild b/dev-ruby/reline/reline-0.5.10.ebuild
index a779c43093ce..a779c43093ce 100644
--- a/dev-ruby/reline/reline-0.5.5.ebuild
+++ b/dev-ruby/reline/reline-0.5.10.ebuild
diff --git a/dev-ruby/reline/reline-0.5.6.ebuild b/dev-ruby/reline/reline-0.5.6.ebuild
deleted file mode 100644
index a779c43093ce..000000000000
--- a/dev-ruby/reline/reline-0.5.6.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
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
-RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Alternative readline implementation in pure Ruby"
-HOMEPAGE="https://github.com/ruby/reline"
-SRC_URI="https://github.com/ruby/reline/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"
-
-ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
-
-all_ruby_prepare() {
-	sed -e "s:_relative ':'./:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/reline/reline-0.5.7.ebuild b/dev-ruby/reline/reline-0.5.7.ebuild
deleted file mode 100644
index a779c43093ce..000000000000
--- a/dev-ruby/reline/reline-0.5.7.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
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
-RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Alternative readline implementation in pure Ruby"
-HOMEPAGE="https://github.com/ruby/reline"
-SRC_URI="https://github.com/ruby/reline/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"
-
-ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
-
-all_ruby_prepare() {
-	sed -e "s:_relative ':'./:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/reline/reline-0.5.9.ebuild b/dev-ruby/reline/reline-0.5.9.ebuild
index a779c43093ce..167ea55c6f7e 100644
--- a/dev-ruby/reline/reline-0.5.9.ebuild
+++ b/dev-ruby/reline/reline-0.5.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/reline/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"
+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/io-console-0.5.0:0"
 
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index 2a6bf80f2806..77249db2ff4e 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,7 +1,5 @@
 DIST rexml-3.2.8.tar.gz 460176 BLAKE2B 25b7563c1bc6eacf1b39106fde09c20d34040e5b99d7a38502d4e71cf96fffa08772cdf6def0c50d9e2d116af70a6bd0469aa1dd0512d7c5eca043b9e71979b7 SHA512 255bd834f5c7584a87979a8896fef761ada8d0beb5458cc86b16df59d8634bf1446a0fb679935c003a9a5be7a03ffcb2bf86d08e0f26b0d0f7a3dfbaa87da325
-DIST rexml-3.2.9.tar.gz 461496 BLAKE2B 9e379b7ad3808461bc738c66c84c0654c256d790bc2d9ad6b23f3da71b4d12bb198349b93c580fd7f44384fbabe3604d041db96c8a94181abc7fb153f0ff1099 SHA512 9feba575fb9c8f7bb9f2d2d03fa67a011c0d52604630ab3b9f6acd99a86d2f520647d58134ae5cf2068e1f87e9c4ba9b98814e437c158bab0f7a4f368e4be486
-DIST rexml-3.3.0.tar.gz 461623 BLAKE2B d741310000bf06276f7e424fc9a01cf20657d857b79ab80937537f5853cdfd59de86d81547dbc5298de48b63a683a1c09f617923ce123872610641ad08a6aa09 SHA512 b5edd8d06cd404dcd3d39c124ad1ed96a30d1185c9cf045bfcce73d1f71424b05986dc66f8b4701c20b940f78bae640ee46601334f1cbb304537c549ce099afc
-DIST rexml-3.3.1.tar.gz 462490 BLAKE2B 2332c3233bfdd5bec067c548016dd20e8bd97e82e6c924f418242827503221a5ce01f81d9b747967bb984d9768f0652e6402dff41c358f95a643b3783b18e564 SHA512 df35a2481743ac4f857ba1ba6396c37de26e9a306abe763dba943a464be9d5e063e0618182446b6f51011eb04aa6cf094b17e24d9826dd294e02596d5033ac83
-DIST rexml-3.3.2.tar.gz 464607 BLAKE2B 44fc74d6fbdbe213c1bdcb97cb54a5cc74bbc1a74ef2531bb5c3c10c94e5fe061e18c096974e2a94c03918ff5e8d40f5d191d473ae3c49ae0a94a58fd8f641b6 SHA512 fd374b2a2b1751f3762ca95d5d2355e64f8fa0de7fa8c4106f36f700e26dfcb8dad8b239399859fef5268195a3d07a19367afea5f01014ab3122e316d4f2168a
 DIST rexml-3.3.4.tar.gz 467302 BLAKE2B d8b86d51233ae277eaa25a796a4c895f4cf4d8e49dbc623990596e001c0404fc1cfafbdf5e87773fd773bbd6894511625d26b6ef9f94f75560849006c39a8a37 SHA512 928fbd0df229118c180791e75c7b86d4c9a937c92ba1161db1692ac3cc332bd5c241e4fc1d0d67be9bf97796dfbabe90fb19085a849130dcf7b53274145d784d
 DIST rexml-3.3.5.tar.gz 467588 BLAKE2B e32270fa6411f776e2e325f942a235eea6ee6cd72e33bf28cea69eeb6dbd40cc334f84d30c962093dd5644fb6c2cb77589229b415ae23e31d3899ae26f325f12 SHA512 401441a7c54533a0e01607af62c142cd9d767aa46dbadc5d18dc57e7542ff4518eba4c77206ff6c4ed6113eba87f30730b96469f64701efb5cb08cb578cd5a48
+DIST rexml-3.3.6.tar.gz 468635 BLAKE2B ce8e4dfb455fb284fdbd2dd11e452190f4eff94665041aadf0211da339d54ff4978101164a85a108cfa5f4c857f0e4c92629bb5464f38b4110d36bb5b4284173 SHA512 02b4555bd8d1474a123f617d2bd5d23a6769ab97ceb672abfec5244e189a4222ab662e509d064e66d91b5f60443d23b1bdf11c334598f203082617d2cd031fae
+DIST rexml-3.3.7.tar.gz 468887 BLAKE2B ed13b7ad00dd756e4d3736247101a512503d9c756e772990457db13e1fdc46a21973228f63ee30ab31e8fd684910549fdf3a08670d9cc2b9bf78623f36ba23f0 SHA512 4f54996306869076ef7f2c0a2bd1dfe6f20a28580158236f335a8e9f41a035d864420777042d12379cfa18b460c1b14865924e0718e8042568d1a864da1d6ecb
diff --git a/dev-ruby/rexml/rexml-3.2.9.ebuild b/dev-ruby/rexml/rexml-3.2.9.ebuild
deleted file mode 100644
index 2e93e18cce62..000000000000
--- a/dev-ruby/rexml/rexml-3.2.9.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-SLOT="3"
-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/strscan-3.0.9"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Ensure we use the (new enough) gem version of strscan. The
-	# versions bundled with ruby up to at least 3.3.1 are all too old.
-	sed -e '3igem "strscan"' \
-		-i test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.3.1.ebuild b/dev-ruby/rexml/rexml-3.3.1.ebuild
deleted file mode 100644
index 802c814bb1f9..000000000000
--- a/dev-ruby/rexml/rexml-3.3.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-SLOT="3"
-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/strscan"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Ensure we use the (new enough) gem version of strscan. The
-	# versions bundled with ruby up to at least 3.3.1 are all too old.
-	sed -e '3igem "strscan"' \
-		-i test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.3.2.ebuild b/dev-ruby/rexml/rexml-3.3.2.ebuild
deleted file mode 100644
index 802c814bb1f9..000000000000
--- a/dev-ruby/rexml/rexml-3.3.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-SLOT="3"
-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/strscan"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Ensure we use the (new enough) gem version of strscan. The
-	# versions bundled with ruby up to at least 3.3.1 are all too old.
-	sed -e '3igem "strscan"' \
-		-i test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.3.4.ebuild b/dev-ruby/rexml/rexml-3.3.4.ebuild
index ddfec322279a..f429114a34ab 100644
--- a/dev-ruby/rexml/rexml-3.3.4.ebuild
+++ b/dev-ruby/rexml/rexml-3.3.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 
 SLOT="3"
-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"
+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/strscan"
 
diff --git a/dev-ruby/rexml/rexml-3.3.6.ebuild b/dev-ruby/rexml/rexml-3.3.6.ebuild
new file mode 100644
index 000000000000..f429114a34ab
--- /dev/null
+++ b/dev-ruby/rexml/rexml-3.3.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML toolkit for Ruby"
+HOMEPAGE="https://github.com/ruby/rexml"
+SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+SLOT="3"
+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/strscan"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Ensure we use the (new enough) gem version of strscan. The
+	# versions bundled with ruby up to at least 3.3.1 are all too old.
+	sed -e '3igem "strscan"' \
+		-i test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run.rb || die
+}
diff --git a/dev-ruby/rexml/rexml-3.3.0.ebuild b/dev-ruby/rexml/rexml-3.3.7.ebuild
index 802c814bb1f9..802c814bb1f9 100644
--- a/dev-ruby/rexml/rexml-3.3.0.ebuild
+++ b/dev-ruby/rexml/rexml-3.3.7.ebuild
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 63df550819d0..ff757973a289 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1 +1,2 @@
 DIST rjb-1.6.9.gem 74752 BLAKE2B c8264fd0401044d9099717ae8770a30ce6bdfd12c3acfc2024b21330e3fdb07604bba69600a8808aa179c6459eb2d140e7b5822cbf58c3ea8ce47569bc92463b SHA512 c1ccae10361be881af4a129c0640ced00d00e909442b517150036cd44d5927cf24dc87bc0c30f3703f96955f114e0c0a5ff2d0f5fc555b71ade0f98e6b388426
+DIST rjb-1.7.3.gem 76800 BLAKE2B 83bf6208e332fe1a339e74ae46bcacb4366c02fc089a5f2e463e6a53eb707203a59c50aaaaffe36bee984ca5bf0a06a501e3e31f1ea0cb35647ce0ceceadf495 SHA512 ea0b0a233a9e8a8030c382582f81776254d261d025310b468e01f5efab6978710b5eedb1a15acd2fb9cc57e083aa8a65a82137ea81ba9c061d999dcf82c35f9d
diff --git a/dev-ruby/rjb/rjb-1.7.3.ebuild b/dev-ruby/rjb/rjb-1.7.3.ebuild
new file mode 100644
index 000000000000..ef80fb653497
--- /dev/null
+++ b/dev-ruby/rjb/rjb-1.7.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit java-pkg-2 ruby-fakegem
+
+DESCRIPTION="Rjb is a Ruby-Java software bridge"
+HOMEPAGE="https://github.com/arton/rjb"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples hardened"
+
+DEPEND="|| ( virtual/jdk:17 virtual/jdk:11 virtual/jdk:1.8 )
+	hardened? ( sys-apps/paxctl )"
+RDEPEND="|| ( virtual/jre:17 virtual/jre:11 virtual/jre:1.8 )"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+all_ruby_prepare() {
+	# The console is not available for testing.
+	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
+
+	# Avoid encoding tests since not all locales may be available.
+	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
+
+	# Fix build on openjdk-11
+	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
+}
+
+each_ruby_prepare() {
+	#dev-lang/ruby might need the "hardened" flag to enforce the following:
+	if use hardened; then
+		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
+	fi
+	# force compilation of class file for our JVM
+	rm -rf data
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	if use examples; then
+		dodoc -r samples
+	fi
+}
+
+each_ruby_test() {
+	if use hardened; then
+		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
+		if [ $? = 0 ]; then
+			${RUBY} -C test -I../lib:.:../ext test.rb || die
+		else
+			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
+		fi
+	else
+		${RUBY} -C test -I../lib:.:../ext test.rb || die
+	fi
+}
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 1ec4e86ef42c..00eac6e0181d 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,3 +1,2 @@
-DIST rmagick-4.3.0.tar.gz 1986554 BLAKE2B bf6afb0b19a98f45dd9f3a8261b67ad05ed774784e9fb19009a83c266c16362b4938acd8b0af6a07d3a37fb255fb5bee7a33b7f26c2c49460d546665a98a7871 SHA512 1b108d61b836bf382c9776badc45614ff88ca74176595765c3caba00cc6af0f955dd6f7649a9f97698832193d85292bc22ff0bf290d0bfbf9e8faa58b99b0b1c
 DIST rmagick-5.5.0.tar.gz 2045116 BLAKE2B 018d4e940043210238b6026a8bc0b65656633aaaf559954b666c75dda74c0f0fd33319a13fd6c494a6a51a3cfac67aac283e3e79d06dc90b6d4581464805e476 SHA512 f813104c347867b14281b044135fd626805d35d2afa3167c25d5e31179b31e985c5cc75deb630f8a64d20b877d8c42ce13e31e137f573467d3c5f3f2453d514f
 DIST rmagick-6.0.1.tar.gz 2045860 BLAKE2B e36ed9c2719df593cce32591111010a8d64e54ff4348ed22ebf9d840ca6f7ceec91b8097b5258bb0a195db63c422373e408f5995cef8944eac42e71d6fd00c4e SHA512 a6fdecd4ad6d17045438a9a14fc6c0a8b9d18224d6d3d0af2ade6fcba1bd0c889710f03d8b2f9738214023d87c504f7a7017f49b467a778fa3d97a14aa2bfeb3
diff --git a/dev-ruby/rmagick/rmagick-4.3.0.ebuild b/dev-ruby/rmagick/rmagick-4.3.0.ebuild
deleted file mode 100644
index d49338658934..000000000000
--- a/dev-ruby/rmagick/rmagick-4.3.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_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="4"
-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] media-fonts/dejavu )"
-
-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:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-
-	# Update version number hardcoded in tests
-	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.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/rr/Manifest b/dev-ruby/rr/Manifest
index 2c6f1034cecc..c0ed75f0dbe1 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1 +1,2 @@
 DIST rr-3.1.0.tar.gz 140388 BLAKE2B 0994ae589d1d9ebe6b4a334c1e93f959b63280beff8f2a6b1696722ac908ac5a21954e65d20216c239587abdbff3a1b3110f6f1eb3f17bd5e0f169a4892e750c SHA512 d05d8421d5cd6e9225cbf5ca183c54cc510a3212f0629f7cee60887b18c874618cb67836503aed7665cef8443cc579306b84e030ae1ec0834f56298f5044a2fa
+DIST rr-3.1.1.tar.gz 141316 BLAKE2B 7bed228a5d3b454f8141b48bc3841a168dae81aba970d674a53466c4237cc85cdf817e5265a767a6290a98756b78a82bd9fcf39a22ca65964418c058270f2bca SHA512 3b359db98e90e9be788f1da7baa9e58e74b91345c2c569ea7b3b354b4ab567f2b9f2dbe189323f3b0d1d0c61cfa3715fa423bc37ddba755256390c011365093f
diff --git a/dev-ruby/rr/rr-3.1.1.ebuild b/dev-ruby/rr/rr-3.1.1.ebuild
new file mode 100644
index 000000000000..a59e05489de1
--- /dev/null
+++ b/dev-ruby/rr/rr-3.1.1.ebuild
@@ -0,0 +1,31 @@
+# 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="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr/"
+SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest
+		dev-ruby/diff-lcs
+		dev-ruby/test-unit-rr )"
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 4f88efb198e9..d33d45b0f265 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,3 +1,4 @@
 DIST rspec-core-3.12.2-git.tgz 409039 BLAKE2B 087b08b6a5231a050d89dc8ec1648509b47078b54c05e5effc02cfcdd0f4cae9fa85f7dc02d643a6e81eb9e4c1dca54d6f4e0b0f79a5d91072c1934fddac9169 SHA512 6ecd39355a5060dbf820b89f2f5958b7e75a185e003036cb0ceb8dd6021d79fa14495a300acdc019b55e174bf8a6be42022bfeb0f22a35c461c0f81cd1a742fd
 DIST rspec-core-3.12.3-git.tgz 409316 BLAKE2B 7d7ab38346895499403ff5ce7770f7605ebefa9ffcdb3feee4a01df27731fea3d98f22481a242f3799ff104c040312cbb7794b947b6f95ba69e8b571971e056b SHA512 d2e6ee6638dacc629e6f772840e2d384e07408e2d459dbd8c68404398df466afad9df1929b6a4e23ca10beab22b7f24efa725806bb9a6dd855adc5ad3eb17c4e
 DIST rspec-core-3.13.0-git.tgz 412734 BLAKE2B a3808e96fa58250f606aab757d0b09dc8bd06c9cc7ce375b5ffb97f4a0fbde456f4d3b3f190b1f70393ae6765c2f29dbd7876c92d9e19318460b8956772f04bd SHA512 4d84384c8a8d22b72d1cdab40f1fe43dec7a5c0dd1ab2ce11739e1a52510c6deea6417130bf100d582cae7293aabee6217f21cd80d4b92f976119bba465650bb
+DIST rspec-core-3.13.1-git.tgz 414144 BLAKE2B 390b6bd1a487ed85862c3a7099706ce4333b5961cbd5d0ecb8ef5a2cd4621fbd92da1effd1262c418ad840980b76e05df63deca06431a9dcbd3c281f47044a07 SHA512 48c1cb928b1157f4e8ecf412b3bc8bf71f1bb8b5e00891ad76fefb70ff7c19e5b7c6f6e93e4332f3268c2cff290ed7689e13692bf58e07a366e0685c4870afbc
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.1.ebuild
new file mode 100644
index 000000000000..13e66548c64d
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.13.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="highlight test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+DEPEND+="test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' \
+		-i spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+
+	# Avoid old regression check (already fixed upstream)
+	sed -i -e '/uses only one thread local variable/askip "old safety check"' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index ac17f36f5896..19978d2e9a7c 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -2,3 +2,5 @@ DIST rspec-expectations-3.12.3-git.tgz 218754 BLAKE2B be6c6c50115bec39758f792030
 DIST rspec-expectations-3.12.4-git.tgz 219529 BLAKE2B 8858b586cb2b50f06c93530304ca554ddff9f3fe7078e1e2f263ab352e8315d3529bd8028b835d8b83d49bc06345a0723d2fbf31849552ef53567f2162eb503c SHA512 9317d91fb5fb02c1319010517df6f28bc117cccb3b8fd4226bd1adde00fbf13d1505be89cd036bd1849b9a142e24ec966afa536144e384700f8d11e640e2eaf9
 DIST rspec-expectations-3.13.0-git.tgz 220792 BLAKE2B 526282d357f47d82163b8a44f5fffc0ce24f0fef0d0f5c5f33da93c91680ae704a065c4903a8b7eb3b619d3910314ff137d1c7b636207c0a3383ed0520e2ffaa SHA512 9e1e502d12704fd7573a57b7f01cf4ffe97e2eefe83dc3144842f460165304dc234a1b1946147f2cbcae105d755c8b42b25aec815f9af0c67844baf858c0a6c7
 DIST rspec-expectations-3.13.1-git.tgz 220834 BLAKE2B db01c826c4606ac4be8fe3a991342297bf4b97cced4d83f3287b84b7f05c429050629723452c0785121170fa951649fb75faebdc84e828b9381569600c9df829 SHA512 2076b6985c0ab41e14097b38081dfa9df81d498e9abb5434cf26c791b5e7c9f5e395c14908abdddcb1ab8568fa41fee4d4eb018e515a3801167e8bebdda11ce5
+DIST rspec-expectations-3.13.2-git.tgz 223286 BLAKE2B d6debf352133a1eb666df85f45736fed24d8d1ddafd67f78931f57ded1536f3c8c4ca18515bae6763565f4e70fa25a0b51cc399831771f808da58f993990314d SHA512 890f9bae150ebfac84e096b311040ba02d773926f68f5ba4c68af4a022be5738b040dac0614c0d5fa90158b358ea5cb8e268a9e7f5805e2e408e21550ca856c2
+DIST rspec-expectations-3.13.3-git.tgz 223417 BLAKE2B c246789687c9b09b715093d0e730a76d04f009866e2886c9d2ee189015c93456cbb046cde72d2775d23978d5410e3e0f1b0337d7bbee7645319f14fe7375f6e8 SHA512 919e01204264611c77fddcf2e6c0e1707f95707ef3b04c40241951d732118e72ab9b7ad860f6f5639da631fb844ca76f512283a988b6561bd23ec6ae95aa013e
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.2.ebuild
new file mode 100644
index 000000000000..96e2fb7e5b11
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.2.ebuild
@@ -0,0 +1,50 @@
+# 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="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' spec/rspec/expectations/minitest_integration_spec.rb || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild
new file mode 100644
index 000000000000..96e2fb7e5b11
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.3.ebuild
@@ -0,0 +1,50 @@
+# 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="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' spec/rspec/expectations/minitest_integration_spec.rb || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
index 4d3c3a18ab54..657cfbeaa1b2 100644
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
+++ b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.3"
diff --git a/dev-ruby/ruby-augeas/Manifest b/dev-ruby/ruby-augeas/Manifest
index aa9c5499a559..9aeaf1d4d041 100644
--- a/dev-ruby/ruby-augeas/Manifest
+++ b/dev-ruby/ruby-augeas/Manifest
@@ -1 +1,2 @@
 DIST ruby-augeas-0.5.0.gem 24064 BLAKE2B 7ee13cfed3e38bbcb7445305323d44f519239e177a9a0e2e98ee362629f6fa0166338e128ab31f48ffc3a37095ba450433128779be006a8add26eb0523e76142 SHA512 523742368543c617baa2b393e4682451d7fe20aecbcf9ab50fed0f5575119b3fbc06f79f0894cca728d2fee7d441cdd9f075dbcf81628835ba870930c3d2ac8d
+DIST ruby-augeas-0.6.0.gem 31232 BLAKE2B 241dd36c2a0831d396f14dcfaec0ba20ae7fbb9088e1e2057ccaa8d0039f5809dbc28fea882cd20d7ee3944ed27a531c33607f950e2f0ad1088fb94ae545a244 SHA512 a0f921bec025d73c171791549407883f90119bba2c7a1731641a78b7d3b4d08129cb92a23238256936fe8176205fd4926f2a170d7f278faf4e86c0508037a305
diff --git a/dev-ruby/ruby-augeas/files/ruby-augeas-0.5.0-gcc14.patch b/dev-ruby/ruby-augeas/files/ruby-augeas-0.5.0-gcc14.patch
new file mode 100644
index 000000000000..498ae9a992eb
--- /dev/null
+++ b/dev-ruby/ruby-augeas/files/ruby-augeas-0.5.0-gcc14.patch
@@ -0,0 +1,27 @@
+From 9f1f9df48ef8c6f62349eccb90dc54a3c3d75e3f Mon Sep 17 00:00:00 2001
+From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
+Date: Wed, 31 Jan 2024 12:52:45 +0100
+Subject: [PATCH] Remove unused sibling argument from augeas_rm
+
+This makes the function match the method definition. There was already a
+warning about this, but Fedora 40 applies more hardening and it's a
+fatal error.
+
+Fixes: e6b57c58d24b ("Initial ruby bindings, written by Bryan Kearney")
+---
+ ext/augeas/_augeas.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/augeas/_augeas.c b/ext/augeas/_augeas.c
+index f9b49d1..7ef0d7d 100644
+--- a/ext/augeas/_augeas.c
++++ b/ext/augeas/_augeas.c
+@@ -184,7 +184,7 @@ VALUE augeas_mv(VALUE s, VALUE src, VALUE dst) {
+  *
+  * Remove path and all its children. Returns the number of entries removed
+  */
+-VALUE augeas_rm(VALUE s, VALUE path, VALUE sibling) {
++VALUE augeas_rm(VALUE s, VALUE path) {
+     augeas *aug = aug_handle(s);
+     const char *cpath = StringValueCStr(path) ;
+ 
diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r6.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r6.ebuild
new file mode 100644
index 000000000000..57614c50b3de
--- /dev/null
+++ b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r6.ebuild
@@ -0,0 +1,26 @@
+# 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_DOCDIR="doc/site/api"
+RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/augeas/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Augeas"
+HOMEPAGE="https://augeas.net/"
+SRC_URI="http://download.augeas.net/ruby/${P}.gem"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=app-admin/augeas-1.1.0"
+DEPEND="${RDEPEND}
+		dev-libs/libxml2"
+
+PATCHES=( "${FILESDIR}/${P}-gcc14.patch" )
diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.6.0.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.6.0.ebuild
new file mode 100644
index 000000000000..ad7bf7477769
--- /dev/null
+++ b/dev-ruby/ruby-augeas/ruby-augeas-0.6.0.ebuild
@@ -0,0 +1,24 @@
+# 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_DOCDIR="doc/site/api"
+RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/augeas/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Augeas"
+HOMEPAGE="https://augeas.net/"
+#SRC_URI="http://download.augeas.net/ruby/${P}.gem"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=">=app-admin/augeas-1.1.0"
+DEPEND="${RDEPEND}
+		dev-libs/libxml2"
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index 405fba9c45f8..03bfdca98128 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,2 +1,2 @@
-DIST ruby-oembed-0.16.1.tar.gz 4547399 BLAKE2B 929d0a63aa0bd8acb005630c3f774a56e5fffed83b8e6c80c491dbf93df1b85b555b37ef8dedc77428cfcc8ad00c9eee54e49c8e31467efb8a8eae28e25397a7 SHA512 71241c818478c4321844276e4ba5e726536fb40f35c18b0ff9ead46e7d8b2ec1b58ba6738b179e62164c352005fff947baa156ac48bf6c021e29da8be3f2ad38
 DIST ruby-oembed-0.17.0.tar.gz 4548719 BLAKE2B d91c4321b745b5c96f866468f8985ec5a27b8318450b14b92f4c7456cea3dea048fb66d5d1c93a3ebd7b12d52a5ea6b2a543987f9d83d35b64521f46bf204d05 SHA512 ec130cca009dd63d18ff3498be2bd05eacdef28c3e7dbae9a373da7700949a18184714dfb3b942154b5af0e305ccdcaf7d18652f36236599d04f0ba531d8aca4
+DIST ruby-oembed-0.18.0.tar.gz 8018574 BLAKE2B fa78c6d84b5f2d479d094091642aa8bcfcbc3d1687e9f6d498ced3090ad86a64f7c1ff61a6ce53c0e7353680ed307c9bceece8321419a260baa7651efe1794cc SHA512 6ab69c4e3d887a919047026194f470057563238962b8de05d594c2f37898603aa6991b79ce188fbeef13a2e272bd091229d76e0b1adf8774b007ea786f2f8497
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
deleted file mode 100644
index 0de3d697de69..000000000000
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.16.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
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-RUBY_FAKEGEM_GEMSPEC="ruby-oembed.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An oEmbed consumer library written in Ruby"
-HOMEPAGE="https://github.com/ruby-oembed/ruby-oembed"
-SRC_URI="https://github.com/ruby-oembed/ruby-oembed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test?
-	(
-		dev-ruby/json
-		dev-ruby/vcr:6
-		dev-ruby/xml-simple
-		dev-ruby/nokogiri
-		dev-ruby/webmock:3
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler but keep vcr version requirement
-	rm -f Gemfile || die
-	sed -i -e '1igem "vcr", "~> 6.0"' spec/spec_helper.rb || die
-
-	# Avoid development dependencies
-	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix kwargs expectations for ruby30
-	sed -e '455 s/:format => @default/{format: @default}/' \
-		-e '460 s/:format=>:xml/{format: :xml}/' \
-		-e '465 s/:format=>:json/{format: :json}/' \
-		-e '477 s/:format => @default/{format: @default}/' \
-		-i spec/provider_spec.rb || die
-}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.18.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.18.0.ebuild
new file mode 100644
index 000000000000..e37354c36dee
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.18.0.ebuild
@@ -0,0 +1,41 @@
+# 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_EXTRADOC="CHANGELOG.rdoc README.md"
+RUBY_FAKEGEM_GEMSPEC="ruby-oembed.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby"
+HOMEPAGE="https://github.com/ruby-oembed/ruby-oembed"
+SRC_URI="https://github.com/ruby-oembed/ruby-oembed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:6
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 6.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index c4653945419e..3642a00490e8 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,6 +1,5 @@
 DIST selenium-webdriver-4.1.0.gem 153088 BLAKE2B f437b5e6c19b9a2b7d0393646b11bcaa0808fb9981c847ca0d86bd55ef04fc109d439eb0f41fce543ea121fde096fe3e72c56d1db861b6554f673a3de07bdff8 SHA512 9760c6a96dbef25f558216986a9cedcb00fe19313273ea5c3a4866d5afae327fbe3895e3e2ee405714f8a9410c290b0e51352b68465cb0df9ff31b6d2749b174
 DIST selenium-webdriver-4.10.0.gem 5803008 BLAKE2B 898e795bbad23aca1343fa49c059963a9c3b0d3ab27b3e9521381cb70259ef76fa81bf9063ad82f7348266f20fed05352be2450be4e4356515b4a05e015c21a7 SHA512 9217022b0af08d5d4b24d412bea4423afd327314e260de0449d723a9232c4f0895a36626da009ce51c304bedc933195b434a9dc620da8daffc736b5fc9842f33
 DIST selenium-webdriver-4.11.0.gem 6300672 BLAKE2B bedbc18c14ab67c1bde05a35b5b66f1fb6da576d616a40d5293358efc51dfaa00f816d70e92578b1bee82de0a17ee39950eb69542ef2e661bd6a015f5f01032a SHA512 6f24440c44eb9a1276e1d016788b14bdf41fd466ed688ca7dbdc19b0e7163ff2354a508733f0903ede70fc6b49fbd05bd2ec9c5d0e0b70567823c4d07e3d1a9d
-DIST selenium-webdriver-4.14.0.gem 9017344 BLAKE2B 03e211398b79849c42e18928897f9ed847905d3e92edac35ba0ca1e4b7afa67ffa860a8c27617f8f06b4244fb6d637073a305b72b5422b3a3a372631c766f759 SHA512 72c8b68e387c0b02f3b4de617989eb813a67eb66457fcf3b6d098579c54aaba476aead5ba52bf86870ca857071da0d095b1fd97613bb961636a0f9ea8969e795
-DIST selenium-webdriver-4.15.0.gem 9260544 BLAKE2B 9d00b65bfb3e705e81de81057c860cc9ffd8e0da21e901187bf2951c14857c9358b6b20248c1f26ee16c26d5bf051a309534a28148b443a2da2b7fc97f5d5ed9 SHA512 e5aa61cdc82fd9a9eb9a56a83387f86cbd1918b2b7387bb7c201960ee033875208892eca4d9833018be8ee7e8937f0fe542d4eac6bd1330cf7f0a11fec61ce4a
 DIST selenium-webdriver-4.23.0.gem 8482816 BLAKE2B a66609869c937c0bf1aba2a6a172321500dd44a9a0c29d72c56bafbfea62b5981e17e6d1fdbd81a64801945dee8477c5eae3ba11c9b45efbfb8a359b2ad026af SHA512 569e0119c8bd84e9d0d23e0e276071391353e7c7fa83c0cef54c6e07ccdbb64450a1a1af78d1937905a0bce6b0d1d1b678489556a4a3c521c5f6a5ce2c5037e2
+DIST selenium-webdriver-4.24.0.gem 8609280 BLAKE2B 629846a239f65a37ff093014e39a7da79832cbd1f1031cdf7a3a4d94eccad9082d70cc3d7cb62c673a6dd60eaeb80160229cdba0699d6124b539925dade1b7f9 SHA512 5d12c65296a80e9a109376025f8a5c404af2b35cef6f232ca18e0c925ca7008b55726cd0fde2fadd5b560d3df1b7417a574aee012da97504b32c1a4f49807a5f
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.14.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.14.0.ebuild
deleted file mode 100644
index 27f311e8c8f2..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-4.14.0.ebuild
+++ /dev/null
@@ -1,38 +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_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" >=dev-util/selenium-manager-$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	>=dev-ruby/rexml-3.2.5:3
-	>=dev-ruby/rubyzip-1.2.2:*
-	dev-ruby/websocket:0
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.13.1-selenium-manager.patch" )
-
-all_ruby_prepare() {
-	# Remove the pre-compiled selenium-manager executables
-	rm -fr bin || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.15.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.15.0.ebuild
deleted file mode 100644
index 2706840797ff..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-4.15.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
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND+=" >=dev-util/selenium-manager-$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	>=dev-ruby/rexml-3.2.5:3
-	>=dev-ruby/rubyzip-1.2.2:*
-	dev-ruby/websocket:0
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.13.1-selenium-manager.patch" )
-
-all_ruby_prepare() {
-	# Remove the pre-compiled selenium-manager executables
-	rm -fr bin || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.24.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.24.0.ebuild
new file mode 100644
index 000000000000..da1af878d1e7
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.24.0.ebuild
@@ -0,0 +1,44 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=" >=dev-util/selenium-manager-$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	>=dev-ruby/base64-0.2 =dev-ruby/base64-0*
+	>=dev-ruby/logger-1.4:0
+	>=dev-ruby/rexml-3.2.5:3
+	dev-ruby/rubyzip:2
+	dev-ruby/websocket:0
+"
+
+all_ruby_prepare() {
+	# Remove the pre-compiled selenium-manager executables
+	rm -fr bin || die
+}
+
+pkg_postinst() {
+	ewarn "This package now uses the SE_MANAGER_PATH environment "
+	ewarn "variable to locate selenium-manager.  This variable is"
+	ewarn "provided by the selenium-manager package but may not be"
+	ewarn "available yet directly after the update."
+}
diff --git a/dev-ruby/sequel/Manifest b/dev-ruby/sequel/Manifest
index 513d86848d84..71fc47e50e56 100644
--- a/dev-ruby/sequel/Manifest
+++ b/dev-ruby/sequel/Manifest
@@ -1,3 +1,4 @@
 DIST sequel-5.78.0.tar.gz 1765505 BLAKE2B 5841d1eeb6065188855f40ff8f1812f694c5d2851a30911265eeb37d111e7df442e3888d22567470569bd0c7d0fced4bdb8b778a14a69f643b42ce2d7b6efb94 SHA512 f706e57cd9dfcb1ea304abe47d2eed40ad412767f3ac58b83e4904e38cb7e970faabe3e40c5c34a44369a7e8b9e526fa06b566eb3768eedd245c0878246a0b8e
 DIST sequel-5.81.0.tar.gz 1772506 BLAKE2B 45ae3cb98210818aa14ac6c540859f49e34b5ae79795fce1bbc81d2327c2086c5f8c87f40ded98fc25ecdcf123c25ef65450a124926faecf258f74962e1e7e6a SHA512 1b534ebb0346a0b0140e30975c7eebee4ae4eaed3e05fd9b2914e55b484cdc30e902821ef3092b20603d825989b72b7b767704a2c2936480d75893a2ba9f19ed
 DIST sequel-5.82.0.tar.gz 1775084 BLAKE2B 628f1af27bba70f166437f70e6ffb2a45c40ed1dc3cc4893aa74e603b54d15f1160b5d958cb44e9297ac41c2c4005ae099c879a94a86cbf46da088016d4257b2 SHA512 59b4aaaad757a1f0164695ae3faf59a10e511745e55bb84e83354a9f299b60342b8e7c2fdc2504ea1a47323b41816d01cb001621837317721090a78beff8d6c7
+DIST sequel-5.84.0.tar.gz 1783312 BLAKE2B 6567fcaa2227c6382101f7d16869c9380c976ce973733222b06a7856613ea4d839616a025d985e5127c6f440f44b76792eaccb9a687e6f139fcee27431f657ac SHA512 b51cdf8f2f5e9a48d9aea4081ffd28df338a6cdde5e0e982a39dc8278ec338f0c54371fd4110e45828469f106cc04963e700477b2ab8424b24940ea86479a5e2
diff --git a/dev-ruby/sequel/sequel-5.84.0.ebuild b/dev-ruby/sequel/sequel-5.84.0.ebuild
new file mode 100644
index 000000000000..79946a650e04
--- /dev/null
+++ b/dev-ruby/sequel/sequel-5.84.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="sequel.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight database toolkit for Ruby"
+HOMEPAGE="https://sequel.jeremyevans.net/"
+SRC_URI="https://github.com/jeremyevans/sequel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal"
+
+ruby_add_bdepend "test? (
+	dev-ruby/activemodel
+	dev-ruby/minitest
+	dev-ruby/minitest-global_expectations
+	dev-ruby/minitest-hooks
+	dev-ruby/nokogiri
+	dev-ruby/tzinfo
+)"
diff --git a/dev-ruby/simplecov-html/Manifest b/dev-ruby/simplecov-html/Manifest
index 1a3d8a02a52c..c2b6e6e9543f 100644
--- a/dev-ruby/simplecov-html/Manifest
+++ b/dev-ruby/simplecov-html/Manifest
@@ -1 +1,2 @@
 DIST simplecov-html-0.12.3.gem 336896 BLAKE2B 94cfbae7085163ba714b2bdf14b7c5eb1a4bc5fcf39d7e99689d74bb1e693d5b534ca067ba5609f6cfecdba64667dc514b4f5dede020aea176ae2328d1806ea0 SHA512 7fd6dad02b16f512d7fb859f62e5e8bd0a277af103c7829143795ccae60a9a057c323728ac36a1c42dbd143a2f0d175648f6e223e6e7e3e6394a52491d3733af
+DIST simplecov-html-0.13.1.gem 133632 BLAKE2B ec7ab56a9cd9381fa5c756f6b31a40a21295161409a3cd49d99db85d704dd4fda00ded05b3196588c8f60bb7c2ed8b6674b7530f0cdf6c5d7bdfb0ff326abb28 SHA512 8d3af10289f9435c9b50ed887627d5df0dbba1eec38f47bf2e7d4c85a2993e3a3651a38e80e00587641b7722af16a0432f7f131ae056fa8266faa78f4c7a292a
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.13.1.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.13.1.ebuild
new file mode 100644
index 000000000000..091a3128a648
--- /dev/null
+++ b/dev-ruby/simplecov-html/simplecov-html-0.13.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="public views"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
+HOMEPAGE="https://github.com/simplecov-ruby/simplecov-html"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc"
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 8ac33029bb43..c8db7cd3ab1a 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,2 +1,2 @@
-DIST sqlite3-1.6.7.gem 3249664 BLAKE2B 021edaa3d1a9d4cd8eeaaf3354e6e5aab047d8e61abbd5416ae50b2a7e426e5a6c1a484bc9f0c47a838b006b37eb3b41d7c51c200851f9d7bf0525b9dc91b597 SHA512 83455e533bbe84c71045b28ec6262b50804e774f3de4811e123cdb780ea4989227c01a8b6939179813ae3b59e1261e2d694830cc10ca05e7789dc635ff4d9b97
 DIST sqlite3-1.7.3.gem 3307008 BLAKE2B 0df742c7cb4a8f920196106b5701eae07e60e668f040ca6e3276afdd0dfdeed3fb19ed455425f332e13082ca740f42d914536ccdf565ed151b6eb0f6ccd7c676 SHA512 b6ed36a5618134ca1f993b21a351ac279ebb7e1370be521eae67ed9224a1fac11d71ddd7573b3b14da47657756cb68b3eab0164b6e6ed058d3f64fa95699bc2f
+DIST sqlite3-2.0.4.tar.gz 82136 BLAKE2B 636e4e246e1a572a975b4df4a1ed82da6924934ee59a48ad0bac98b7e5c76f4342ad1bc91f794179e2954acebcd00d3ec30872441957fcaed5d36218b6167a80 SHA512 3bdf8733b119f8fb71ab2e60667f2ca9c9c8be6d01e02509ed93e1bb1c525408d93c888f5291b464eecb6ab150d940d357d7abf913b32dc253768bf6fc33d168
diff --git a/dev-ruby/sqlite3/sqlite3-1.6.7.ebuild b/dev-ruby/sqlite3/sqlite3-1.6.7.ebuild
deleted file mode 100644
index 856f3aa51cab..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.6.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE=""
-
-# We track the bundled sqlite version here
-RDEPEND+=" >=dev-db/sqlite-3.43.2:3"
-DEPEND+=" >=dev-db/sqlite-3.43.2:3"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
-
-	# Remove the runtime dependency on mini_portile2. We build without
-	# it and it is not a runtime dependency for us.
-	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sqlite3/sqlite3-2.0.4.ebuild b/dev-ruby/sqlite3/sqlite3-2.0.4.ebuild
new file mode 100644
index 000000000000..8db3a4eff475
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-2.0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+RUBY_FAKEGEM_GEMSPEC="sqlite3.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+SRC_URI="https://github.com/sparklemotion/sqlite3-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="sqlite3-ruby-${PV}"
+LICENSE="BSD"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+# We track the bundled sqlite version here
+RDEPEND=" >=dev-db/sqlite-3.46.1:3"
+DEPEND=" >=dev-db/sqlite-3.46.1:3"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/minitest:5 )
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
+
+	# Remove the runtime dependency on mini_portile2. We build without
+	# it and it is not a runtime dependency for us.
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid a failing spec for reprepares stats. Upstream indicates that
+	# the stats data should not be relied on other than for human
+	# debugging.
+	sed -e '/def test_stat_reprepares/askip "Fails on Gentoo"' \
+		-i test/test_statement.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild
index c0f8d56e19a1..748d3f1f35ab 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.9.0.ebuild
@@ -17,7 +17,7 @@ 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"
+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"
 
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 07df0399921a..3c1a10c41ee7 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,3 +1,4 @@
 DIST thor-git-1.2.2.tgz 98213 BLAKE2B e71ee51eb5c982c585cf9bd9dffda8933975c9d0df8096015d125eefd0597a653887db1acfc132ce1f5a2e8ce4ab71c790a6c0bf39edd7c5e4c85a75de963944 SHA512 2c8af5d59f33691af63e813ba8dfe3392c279593f3e3ccf0ab2d6eb2ccce4220d93b7cb3413ad853e4bba14f4e2182c54caaf4944627cbcbefa31cdc0fabefc7
 DIST thor-git-1.3.0.tgz 102884 BLAKE2B f3f5a27ccfdbe7de6bbec71e1ae36e522d49ceec223e1d86a028898403e4e56722703dc847b4a850c46301fdeea429e70e73b7888089c35138d455c094678c02 SHA512 f561f9d05264cf0d2cd836dfb689539b645fa02a39ea8d10923001bb3d510ad6b4bcbb6551739d453e7d9ac05562bc0f454b581926becbc784c0604c5449c27e
 DIST thor-git-1.3.1.tgz 103008 BLAKE2B 790f83c74bcaff08c65934e1fdf14d41e9d7bf5f51d94419513b45c3263beeae0fd239d848206e7f71a59dceb2ad9719131bc81baf23ac42e797cb430186490d SHA512 5ecfa8c7cdf3c10006b9f50de633b6f07c7ed9a3ad3807cc6d07adbb38b9d64fd0d17aea06a5e8e928ea4abf6cf2042af55e1e87416e7c0ce5ab0a721f546a04
+DIST thor-git-1.3.2.tgz 103619 BLAKE2B 31c23b549a79ec796d0de40c392d32a2621106ad44ffb0389358fbdb170b283867ab544c5f6bcfd437da0396a3193ff4b93100eee5c446c01760f07be73e2b79 SHA512 fb2aff3cf8c14f1a8b38db77579e4b27292f9578c7abf8fb892da888bee7e24412c4bdbf85ce9e43982348f72e038cacc856500268fc204e44fa61f3f9405c32
diff --git a/dev-ruby/thor/thor-1.3.2.ebuild b/dev-ruby/thor/thor-1.3.2.ebuild
new file mode 100644
index 000000000000..72a512352149
--- /dev/null
+++ b/dev-ruby/thor/thor-1.3.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2000-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_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities"
+HOMEPAGE="http://whatisthor.com/"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="doc"
+
+# For initial target porting (new rubies), we can make these test deps
+# conditional with:
+# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ...
+# 2. skip logic in each_ruby_test
+USE_RUBY="ruby31 ruby32 ruby33" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require "simplecov"/,/^end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	#sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+
+	# Avoid specs depending on git, bug 724058
+	rm -f spec/quality_spec.rb || die
+
+	# Avoid currently broken readline specs (already fixed upstream)
+	rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
+
+	# Avoid spec failing on whitespace difference in error message
+	sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby34)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/time/Manifest b/dev-ruby/time/Manifest
index 5f2a62e3f9fb..6e9340d03a90 100644
--- a/dev-ruby/time/Manifest
+++ b/dev-ruby/time/Manifest
@@ -1,2 +1,3 @@
 DIST time-0.2.2.tar.gz 26129 BLAKE2B 9d7c507c06fca17c9a2734f1116524344518635562b0ba924cdf5e0b0b52cb31f6dffa7aa3c8c06e0d2f5f2c1ffdcef2a92756cd915822be6a1510f08fa91c56 SHA512 4866cd7df233222ed76cf3b35c842b6e1652b429aa15609bfe40f89683ad5df2ce7f37f41dfb0e85f610f2ebf4e431ea8046d67c3aed7aa345d928fe33ba1ae3
 DIST time-0.3.0.tar.gz 15520 BLAKE2B 05d30c8dd6da8544fe89e1f92a94d91adf198712acc236703947abef86c9ceefeedc2bc78150d3d1918b29972509c927510fea2e4bfec0a01ad12aa751e27fc2 SHA512 17483eebbddd3be40f83b35813ef5faa3b3fe695e3c13e4cc6d13579b64fd5d1637e2aca2f5e60192b4de6ae761efaa76aa6a6cbbcce7bade31f5f415f224b70
+DIST time-0.4.0.tar.gz 16721 BLAKE2B d1f86380c7c79b05f9174bb103c5c69d3abdd9c65b60c65ea4de0d93715a5dc7b2f4cdb8cce9a2d75512c00485b687bbc79bba45389ea12a78ca3776512e45dc SHA512 c95c1167a305fbdf6d138143afc2b822972614b26d87c323d62e663994beb80d12e26e17dc33fe515b65076c50aa05c1d80bc13b6bc83b481d967c796b7c84be
diff --git a/dev-ruby/time/time-0.4.0.ebuild b/dev-ruby/time/time-0.4.0.ebuild
new file mode 100644
index 000000000000..c531ce86a0c3
--- /dev/null
+++ b/dev-ruby/time/time-0.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="time.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends the Time class with methods for parsing and conversion"
+HOMEPAGE="https://github.com/ruby/time"
+SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/date"
+
+ruby_add_bdepend "test? ( 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
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/useragent/useragent-0.16.10-r1.ebuild b/dev-ruby/useragent/useragent-0.16.10-r1.ebuild
index ce53080a3635..b265a57bc9a0 100644
--- a/dev-ruby/useragent/useragent-0.16.10-r1.ebuild
+++ b/dev-ruby/useragent/useragent-0.16.10-r1.ebuild
@@ -17,4 +17,4 @@ SRC_URI="https://github.com/gshutler/useragent/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index b7c876dce84a..32cde3404784 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -1,3 +1 @@
-DIST vagrant_cloud-3.0.5.tar.gz 34844 BLAKE2B 2624219c470ed62e60056c825dc40611bf1bd2d1e822cc40e1592f8473517df53d814934f4426ef61d9adabbf89112bc1c44b61ee7129c4270e67b468fcf87cb SHA512 e3b138584baa956de30be5b307b7a05a728a9c84e5c4c831d9a703f0367886b82905057c8d6dda5e337b7b4256704d22a60869710e98493da8eea2074df70995
-DIST vagrant_cloud-3.1.0.tar.gz 62991 BLAKE2B 264c262d8d1fe4f3de93d1a463520bf6ec460c7a946067c4add71ad5bc0d971c078abe32148b35416ee01335eaf9fa95bacba58bc76d3d891158f979d10c7775 SHA512 90a0ac7047e1f3693c542ef633c77866821ba607e2c3d059ce297895217d22854f275ee61e6d17f9703bda2f9b67bf467bc55aed805840ee8fe913cb285d02d6
 DIST vagrant_cloud-3.1.1.tar.gz 63633 BLAKE2B e2d6db7079eef43441427a0288fb33a37da530276592b95698e610043b70b59020f5ba7e393f85a2455fda62cf80729e946b07103d0d8a54143211688b1974f6 SHA512 957b35111a530baabccd337c94009cc643322ca64d4c8b1874672eee292d77db9741d67d209391503ecbc45e2b9c6cd298409405183a2cd04a0c935d04e0c316
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5-r1.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5-r1.ebuild
deleted file mode 100644
index 9c8b674c0db5..000000000000
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Vagrant Cloud API Library"
-HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/excon-0.73
-	>=dev-ruby/log4r-1.1.10
-"
-ruby_add_bdepend ">=dev-ruby/rake-12.3
-	test? (
-		>=dev-ruby/webmock-3.0
-	)
-"
-
-all_ruby_prepare() {
-	# # loosen dependencies
-	sed -e 's:require_relative ":require "./:' \
-		-e '/excon/s/~>/>=/' \
-		-e '/log4r/s/~>/>=/' \
-		-e '/rake/s/~>/>=/' \
-		-e '/rspec/s/~>/>=/' \
-		-e '/webmock/s/~>/>=/' \
-		-i ${PN}.gemspec || die
-}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.0.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.0.ebuild
deleted file mode 100644
index c220002e1052..000000000000
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Vagrant Cloud API Library"
-HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/excon-0.73
-	>=dev-ruby/log4r-1.1.10
-	>=dev-ruby/rexml-3.2.5 =dev-ruby/rexml-3.2*
-"
-ruby_add_bdepend ">=dev-ruby/rake-12.3
-	test? (
-		>=dev-ruby/webmock-3.0
-	)
-"
-
-all_ruby_prepare() {
-	# # loosen dependencies
-	sed -e 's:require_relative ":require "./:' \
-		-e '/log4r/s/~>/>=/' \
-		-e '/rake/s/~>/>=/' \
-		-e '/rspec/s/~>/>=/' \
-		-e '/webmock/s/~>/>=/' \
-		-i ${PN}.gemspec || die
-}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.1-r1.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..0bcaa24fc724
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+	>=dev-ruby/rexml-3.2.5:3
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-e '/rexml/ s/3.2.5/3.2/' \
+		-i ${PN}.gemspec || die
+}
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index cb91f378343a..e72638423072 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1 +1,2 @@
 DIST vcr-6.2.0.tar.gz 154715 BLAKE2B 5d6054c81106a1498c91a578347d1c092908d98d79e58303b5718620ef699705d33bfa1ea4ea8fd37653298cc18812a84d8125b79ad5fab746277ecf27725afc SHA512 516e7a8acb06872e111f20e07f3b95713a8e2cf7b5f6939ae1b643cafa8e87488a98ee5d0cf1ec0e150c128e19241c2e6d0c4ab8e811584d9f8ed05e8f93a691
+DIST vcr-6.3.1.tar.gz 155338 BLAKE2B 2ce48ae9abcec56a5e55f03f53dcceff9dabfa119ee8dfd2aa7a483b048cb8ebe60c6a39436ac639e1a94b11119369ba43b4531d99538f854e3a2f213def56c0 SHA512 903132c5686c086069875209ebdf4bc1251725567dbeab6a62b35a6091f2231446c26455ba5409d2ad3f67b04695cf8f48abf2496df0b90d3462d8a47aeba890
diff --git a/dev-ruby/vcr/vcr-6.3.1.ebuild b/dev-ruby/vcr/vcr-6.3.1.ebuild
new file mode 100644
index 000000000000..0d8d68d0e4b6
--- /dev/null
+++ b/dev-ruby/vcr/vcr-6.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
+
+RUBY_FAKEGEM_GEMSPEC="vcr.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
+HOMEPAGE="https://github.com/vcr/vcr/"
+SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE="json test"
+
+# Tests require all supported HTTP libraries to be present, and it is
+# not possible to avoid some of them without very extensive patches.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	json? ( dev-ruby/json )
+"
diff --git a/dev-ruby/webmock/webmock-3.23.0.ebuild b/dev-ruby/webmock/webmock-3.23.0.ebuild
index 475a1b5900b6..44334c44fef0 100644
--- a/dev-ruby/webmock/webmock-3.23.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.23.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/bblimke/webmock/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index a9a042e008a6..f37d720fc452 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1 +1,2 @@
 DIST yard-0.9.36-git.tgz 938567 BLAKE2B 8672b94149b4bbecd3fb80c1d386e3cdfd4013ad88969958269abd480426e41990067df0e5352df1a983a1572129b91a31129a71eae872cc00712e6e992a07c5 SHA512 09639d7ac6fed28906b40e08c16e305f44416206f67947fbdedf4adbb0be92d1e15ade9a04509f2847063b39baaa7a5bcbd585031808baaaf5acf14f06b471d5
+DIST yard-0.9.37-git.tgz 941020 BLAKE2B 40c9ad5be234d00d84fd3187271357691841a2b57fd37ee9fc346e8d8c91c54f751d6ad46df988f6d40e3a1c3c4d644cfdce825579e7294b23ec52f28489e45d SHA512 f48a25df1fba7cdde7388842c6bce63ab149e613921cca8c809adb2a3bd7edce49c573c8867e62a3cb33c8cb3868dd67bd87f34c65ffce1e66c1353a2f93f9ca
diff --git a/dev-ruby/yard/yard-0.9.37.ebuild b/dev-ruby/yard/yard-0.9.37.ebuild
new file mode 100644
index 000000000000..5d1f8575ffe4
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.37.ebuild
@@ -0,0 +1,72 @@
+# 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_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates .yardopts"
+
+RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lacks the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+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="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.34-beginless-range.patch"
+)
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 >=dev-ruby/rspec-3.11.0 dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '3igem "rack", "~> 2.2.0"' spec/spec_helper.rb || die
+
+	sed -i -e '/samus/I s:^:#:' Rakefile || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
+		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
+		-i spec/config_spec.rb || die
+
+	# Avoid specs making assumptions about how rubygems works internally
+	sed -i -e '/searches for .gem file/askip "rubygems internals"' spec/cli/diff_spec.rb || die
+
+	# Fix broken spec
+	sed -i -e '/:exist?/aallow(File).to receive(:exist?).and_call_original' spec/i18n/locale_spec.rb || die
+
+	# Avoid ruby31 failure on whitespace-only differences
+	sed -i -e '/shows a list of nodes/askip "Whitespace differences on ruby31"' spec/parser/ruby/ast_node_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+
+	# Avoid asciidoc-specific spec that is not optional
+	sed -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' \
+		-i spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 5717f2cc8212..d6a2277a5252 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,4 +1,5 @@
 DIST zeitwerk-2.6.15.tar.gz 129919 BLAKE2B 2a49464a99c97ac1f927d462d87d531e61667e029d4735eb6ac6e8a4c30ab8f542affa4125a0aa768bdedd3c7b5cb75c57a5e1b1cbb0da8f5c5d898f482b240c SHA512 c83bfe793fa4853df461160376fe41359f96bca41d943f77714d69368004373dce007c8aa2f3bb1f796f4036e6a0bc51c670b6b85c137dd0c01919314f56d6ca
 DIST zeitwerk-2.6.16.tar.gz 130657 BLAKE2B a51226a252d13b12f7ec91d0edfaeb814c8de574ab923b98f78058ed1e9c11758abebfbc1896c7cf792b0094dafa49a066de5ba3cd8faa480a83fd68da29f30c SHA512 420b053d3ab09443e67e1b386b61d9fbbd1362740fbe155d817f998d8197fec7fa9e5206eecb47a81a9ebeebd65830023b0f86fa05f19db22761c9d931ff83fd
 DIST zeitwerk-2.6.17.tar.gz 130738 BLAKE2B cdd81b295108102f83364e1f1c30b58ae56227fd3bcce9c5580ed678009654ce406f02435df254dd20074a9425f7c85ebca4b86f0b6cc9ee673fb9cd3912bad8 SHA512 7bb4e40023e2e7a9283dffd0fb3a0d1792cf2efbc03f8a8a4c2536d4041101f4c1aea12ada76ae0f3c919a81d08b4f1f5bd49390d25f4695b3d17d8a7b2d217b
+DIST zeitwerk-2.6.18.tar.gz 130995 BLAKE2B 05dc3f5deb1c7e3d9967a473a9672b943605ae66e93e2b2201f4d51dac6fc168c5966785f9b911b76afe5523c0d48f203e10d157e7250ec8a3a1d6e59683de56 SHA512 4d2f8338d2ed2a91178345fb1d4b7b1a9f5317d6b1ca538bf6824cbb76951d20f3e44df5e5ad9274900787662f3efce657f15f617e1639f06b3430344d927281
 DIST zeitwerk-2.6.8.tar.gz 124209 BLAKE2B 7274b0e9cd55d48fa619d1e9da44074268186c119584fdc3ba18656db33884ec2e24a76ace863d18b0ec51601cde5a3cb9ed35889dcfd3f619960ddfcb1465c6 SHA512 b0609f7d38572d95bdf1a065a9051a7c39b15a7910e354981c991862692e2535477b4abd0a3c623a5d37e53622d95566ecf0d0243ca96fef59f0135693731a71
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.18.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.18.ebuild
new file mode 100644
index 000000000000..eb0be93eb354
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
+	# It's more of a quality check for the tests themselves rather than a test
+	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 68d80784a7f0..01a563d2274c 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1 +1,2 @@
 DIST chicken-5.3.0.tar.gz 4069549 BLAKE2B 7e1fb8c844542927eec53df751014f718b8c96fb6cf390d6464d7d55467c7320346be9ed05202b9c5c96548f274243ae52fead488981d7c207bec2c001db7cd7 SHA512 8fcc08a1ba44cde42c95820695a11858a3b7ff39a4b577bc5afb894c53513661aab2dc5b8e608e1d9d26648e314551052041626c4c8e519fcb9f8af324386e02
+DIST chicken-5.4.0.tar.gz 4109135 BLAKE2B 75dda6891992a7eeae8ac7624678c62c9aff61a712c9b8812b008f3369b11297019eaed259c28999a8e4f9aa587583cdef4284b5ada2bc971ef823ffa5508b35 SHA512 21f5dc4abcfce7be2d8eb6728061728a4a695ac88860e94e114c2bf2839a8a47bbdc368330913edc83d5b81b6b2499c608e47e6659fa7651c82d133abb7e4e3c
diff --git a/dev-scheme/chicken/chicken-5.4.0.ebuild b/dev-scheme/chicken/chicken-5.4.0.ebuild
new file mode 100644
index 000000000000..15244570240f
--- /dev/null
+++ b/dev-scheme/chicken/chicken-5.4.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="https://www.call-cc.org/"
+SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+src_prepare() {
+	default
+
+	# because chicken's upstream is in the habit of using variables that
+	# portage also uses :( eg. $ARCH and $A
+	sed -i \
+		-e "s/A\([[:space:]]*?=\|)\)/z&/" \
+		-e "s/ARCH/z&/" \
+		-e "/LICENSE /d" \
+		Makefile.* {defaults,rules}.make || die
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		-e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
+		defaults.make || die
+
+	sed -i \
+		-e "/\$(CHICKEN_DO_PROGRAM)\$(EXE):/,/^$/s/\(\$<\)/\$(LINKER_OPTIONS) \1/" \
+		rules.make || die
+
+	use doc || sed -i "/\$(SEP)manual/d" rules.make || die
+}
+
+src_compile() {
+	emake -j1										\
+		PLATFORM="linux"							\
+		PREFIX="${EPREFIX}/usr"						\
+		C_COMPILER="$(tc-getCC)"					\
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}"	\
+		CXX_COMPILER="$(tc-getCXX)"					\
+		HOSTSYSTEM="${CBUILD}"						\
+		LINKER_OPTIONS="${LDFLAGS}"
+}
+
+src_test() {
+	cd tests && ./runtests.sh || die
+}
+
+src_install() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	find "${ED}" -name '*.a' -delete || die
+
+	# let portage track this file (created later)
+	touch "${ED}"/usr/$(get_libdir)/${PN}/11/modules.db || die
+}
+
+pkg_postinst() {
+	# create modules.db file in ${ROOT}
+	chicken-install -update-db || die
+}
diff --git a/dev-scheme/slib/slib-3.3.1-r100.ebuild b/dev-scheme/slib/slib-3.3.1-r100.ebuild
index b1b5e37bde1a..bb816cbbac26 100644
--- a/dev-scheme/slib/slib-3.3.1-r100.ebuild
+++ b/dev-scheme/slib/slib-3.3.1-r100.ebuild
@@ -54,7 +54,7 @@ src_compile() {
 }
 
 _new_catalog() {
-	if [[ ${1} != @(guile|scm) ]] then
+	if [[ ${1} != @(guile|scm) ]] ; then
 		echo -n "(load \"${ROOT}/usr/share/slib/${1}.init\")" || die
 	fi
 	echo " (require 'new-catalog) (slib:report-version)" || die
diff --git a/dev-tcltk/snack/snack-2.2.10-r11.ebuild b/dev-tcltk/snack/snack-2.2.10-r11.ebuild
deleted file mode 100644
index 1c38016a77ef..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r11.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=yes
-
-inherit distutils-r1 flag-o-matic toolchain-funcs virtualx
-
-DESCRIPTION="The Snack Sound Toolkit (Tcl)"
-HOMEPAGE="http://www.speech.kth.se/snack/"
-SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
-
-S="${WORKDIR}/${PN}${PV}/unix"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alsa examples python vorbis"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	alsa? ( media-libs/alsa-lib )
-	python? ( ${PYTHON_DEPS} )
-	vorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-	${PYTHON_DEPS}
-	${DISTUTILS_DEPS}
-)"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}"/alsa-undef-sym.patch
-	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
-	"${FILESDIR}"/${P}-debian-args.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${PN}${PV}-seektell-fix.patch
-	"${FILESDIR}"/tcl-${P}-python3.patch
-	"${FILESDIR}"/${P}-lto.patch
-	"${FILESDIR}"/${P}-configure-clang16.patch
-	"${FILESDIR}"/${P}-implicit.patch
-	"${FILESDIR}"/${P}-parallelMake.patch
-)
-
-HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"
-
-src_prepare() {
-	# adds -install_name (soname on Darwin)
-	[[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch )
-
-	sed \
-		-e "s:ar cr:$(tc-getAR) cr:g" \
-		-e "s|-O|${CFLAGS}|g" \
-		-i Makefile.in || die
-
-	cd ..
-
-	default
-
-	sed \
-		-e 's|^\(#define roundf(.*\)|//\1|' \
-		-i generic/jkFormatMP3.c || die
-	rm tests/{play,record}.test || die
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	# For Clang 16, bunch of -Wimplicit-int, etc
-	append-flags -std=gnu89
-
-	local myconf=""
-
-	use alsa && myconf+=" --enable-alsa"
-
-	if use vorbis; then
-		myconf+=" --with-ogg-include="${EPREFIX}"/usr/include"
-		myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)"
-	fi
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--includedir="${EPREFIX}"/usr/include \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		$myconf
-	if use python; then
-		cd ../python
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd ../python
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	TCLLIBPATH=${S} virtx default | tee snack.testResult
-	grep -q FAILED snack.testResult && die
-}
-
-src_install() {
-	default
-
-	if use python ; then
-		cd "${S}"/../python || die
-		distutils-r1_src_install
-	fi
-
-	cd "${S}"/.. || die
-
-	if use examples ; then
-		docinto examples
-		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
-		dodoc -r demos/tcl
-
-		use python && dodoc -r demos/python
-	fi
-}
diff --git a/dev-tex/biber/metadata.xml b/dev-tex/biber/metadata.xml
index 38b762a0360b..7cecd3f90a96 100644
--- a/dev-tex/biber/metadata.xml
+++ b/dev-tex/biber/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<name>Jonas Licht</name>
-		<email>jonas.licht@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>tex@gentoo.org</email>
 		<name>Gentoo TeX Project</name>
diff --git a/dev-tex/glossaries/glossaries-4.53.ebuild b/dev-tex/glossaries/glossaries-4.53.ebuild
index b8f38fbc7875..cdc581f3000d 100644
--- a/dev-tex/glossaries/glossaries-4.53.ebuild
+++ b/dev-tex/glossaries/glossaries-4.53.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~flow/distfiles/glossaries/${P}.zip"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r3.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r3.ebuild
index c10f3c83704d..8fc52d03db61 100644
--- a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r3.ebuild
+++ b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r3.ebuild
@@ -204,7 +204,7 @@ DESCRIPTION="TeXLive TeX auxiliary programs"
 
 LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-3 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2023
 "
diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r4.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r4.ebuild
index 342efc33ca51..802f420bcb21 100644
--- a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r4.ebuild
+++ b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r4.ebuild
@@ -202,7 +202,7 @@ DESCRIPTION="TeXLive TeX auxiliary programs"
 
 LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-3 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2023
 "
diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild
index 8571f9f36623..12bde684ff0d 100644
--- a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild
+++ b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild
@@ -202,7 +202,7 @@ DESCRIPTION="TeXLive TeX auxiliary programs"
 
 LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-3 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2023
 "
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2023_p69752-r4.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2023_p69752-r4.ebuild
deleted file mode 100644
index 9b08d29c8003..000000000000
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2023_p69752-r4.ebuild
+++ /dev/null
@@ -1,3994 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TEXLIVE_MODULE_CONTENTS="
-	collection-latexextra.r69752
-	2up.r55076
-	a0poster.r54071
-	a4wide.r20943
-	a5comb.r17020
-	abraces.r64967
-	abspos.r64465
-	abstract.r15878
-	accessibility.r55777
-	accsupp.r53052
-	achemso.r69638
-	acro.r62925
-	acronym.r54758
-	acroterm.r61719
-	actuarialangle.r67201
-	actuarialsymbol.r67201
-	addfont.r58559
-	addlines.r49326
-	adjmulticol.r63320
-	adjustbox.r64967
-	adrconv.r46817
-	advdate.r20538
-	affilauthor.r68996
-	akktex.r26055
-	akletter.r15878
-	alchemist.r66924
-	alertmessage.r38055
-	alnumsec.r15878
-	alphalph.r53087
-	alterqcm.r59265
-	altfont.r15878
-	altsubsup.r62738
-	amsaddr.r64357
-	animate.r67401
-	anonchap.r17049
-	answers.r35032
-	anyfontsize.r17050
-	appendix.r53718
-	appendixnumberbeamer.r46317
-	apptools.r28400
-	arabicfront.r51474
-	arcs.r15878
-	argumentation.r69023
-	arraycols.r68277
-	arrayjobx.r18125
-	arraysort.r31576
-	arydshln.r50084
-	asciilist.r49060
-	askinclude.r54725
-	assignment.r20431
-	assoccnt.r38497
-	association-matrix.r64845
-	atenddvi.r56922
-	atendofenv.r62164
-	attachfile.r42099
-	aurl.r41853
-	authoraftertitle.r55889
-	authorarchive.r65777
-	authorindex.r51757
-	autofancyhdr.r54049
-	autonum.r36084
-	autopdf.r32377
-	autopuncitems.r63045
-	avremu.r35373
-	awesomebox.r57349
-	axessibility.r57105
-	background.r42428
-	bankstatement.r38857
-	bashful.r25597
-	basicarith.r35460
-	bchart.r43928
-	beamer-rl.r69254
-	beamer2thesis.r27539
-	beamerappendixnote.r55732
-	beameraudience.r23427
-	beamerauxtheme.r56087
-	beamercolorthemeowl.r40105
-	beamerdarkthemes.r55117
-	beamerposter.r54512
-	beamersubframe.r23510
-	beamertheme-arguelles.r68659
-	beamertheme-cuerna.r42161
-	beamertheme-detlevcm.r39048
-	beamertheme-epyt.r41404
-	beamertheme-focus.r69742
-	beamertheme-light.r49867
-	beamertheme-metropolis.r43031
-	beamertheme-npbt.r54512
-	beamertheme-phnompenh.r39100
-	beamertheme-pure-minimalistic.r56934
-	beamertheme-rainbow.r67542
-	beamertheme-saintpetersburg.r45877
-	beamertheme-simpledarkblue.r60061
-	beamertheme-simpleplus.r64770
-	beamertheme-tcolorbox.r67000
-	beamertheme-trigon.r65985
-	beamertheme-upenn-bc.r29937
-	beamerthemeamurmaple.r69742
-	beamerthemeconcrete.r69528
-	beamerthemejltree.r21977
-	beamerthemelalic.r58777
-	beamerthemenirma.r20765
-	beamerthemenord.r56180
-	bearwear.r54826
-	beaulivre.r68376
-	beautybook.r68438
-	beton.r15878
-	bewerbung.r61632
-	bez123.r15878
-	bhcexam.r64093
-	bibletext.r45196
-	bigfoot.r38248
-	bigints.r29803
-	bilingualpages.r59643
-	biochemistry-colors.r54512
-	bithesis.r68634
-	bizcard.r15878
-	blindtext.r25039
-	blkarray.r36406
-	block.r17209
-	blowup.r67640
-	bnumexpr.r59244
-	boites.r32235
-	bold-extra.r17076
-	book-of-common-prayer.r62240
-	bookcover.r65394
-	bookest.r15878
-	booklet.r15878
-	bookshelf.r55475
-	boolexpr.r17830
-	bophook.r17062
-	boxedminipage.r54827
-	boxhandler.r28031
-	bracketkey.r17129
-	braket.r17127
-	breakurl.r29901
-	bubblesort.r56070
-	bullcntr.r15878
-	bxcalc.r56431
-	bxdpx-beamer.r41813
-	bxdvidriver.r43219
-	bxenclose.r40213
-	bxnewfont.r44173
-	bxpapersize.r63174
-	bxpdfver.r63185
-	bxtexlogo.r63231
-	calcage.r27725
-	calctab.r15878
-	calculator.r64424
-	calrsfs.r17125
-	cals.r43003
-	calxxxx-yyyy.r69266
-	cancel.r32508
-	canoniclayout.r64889
-	capt-of.r29803
-	captcont.r15878
-	captdef.r17353
-	carbohydrates.r39000
-	cases.r54682
-	casyl.r15878
-	catchfile.r53084
-	catchfilebetweentags.r21476
-	catechis.r59998
-	catoptions.r68982
-	cbcoptic.r16666
-	ccaption.r23443
-	cclicenses.r15878
-	cd.r34452
-	cd-cover.r17121
-	cdcmd.r60742
-	cdpbundl.r61719
-	cellprops.r67201
-	cellspace.r61501
-	censor.r67293
-	centeredline.r64672
-	centerlastline.r56644
-	changebar.r69367
-	changelayout.r16094
-	changelog.r65861
-	changepage.r15878
-	changes.r67201
-	chappg.r15878
-	chapterfolder.r15878
-	cheatsheet.r45069
-	checkend.r51475
-	chet.r45081
-	chextras.r27118
-	childdoc.r49543
-	chkfloat.r27473
-	chletter.r20060
-	chngcntr.r47577
-	chronology.r67973
-	circ.r62977
-	circledsteps.r67889
-	circledtext.r63166
-	classics.r53671
-	classpack.r55218
-	clefval.r55985
-	cleveref.r61719
-	cleveref-usedon.r66915
-	clicks.r64602
-	clipboard.r47747
-	clistmap.r61811
-	clock.r15878
-	clrdblpg.r47511
-	clrstrip.r60363
-	cmdstring.r15878
-	cmdtrack.r28910
-	cmsd.r18787
-	cnltx.r55265
-	cntformats.r34668
-	cntperchap.r37572
-	codebox.r61771
-	codedescribe.r69343
-	codedoc.r17630
-	codehigh.r65787
-	codepage.r51502
-	codesection.r34481
-	collcell.r64967
-	collectbox.r64967
-	colophon.r47913
-	color-edits.r56707
-	colordoc.r18270
-	colorframed.r64551
-	colorinfo.r15878
-	coloring.r41042
-	colorist.r68440
-	colorspace.r50585
-	colortab.r22155
-	colorwav.r67012
-	colorweb.r31490
-	colourchange.r21741
-	combelow.r18462
-	combine.r19361
-	comma.r18259
-	commado.r38875
-	commedit.r50116
-	comment.r41927
-	commonunicode.r62901
-	competences.r47573
-	concepts.r29020
-	concprog.r18791
-	conditext.r55387
-	constants.r15878
-	continue.r49449
-	contour.r18950
-	contracard.r67201
-	conv-xkv.r43558
-	cooking.r15878
-	cooking-units.r65241
-	cool.r67013
-	coolfn.r69007
-	coollist.r67048
-	coolstr.r67015
-	coolthms.r29062
-	cooltooltips.r60201
-	coop-writing.r61607
-	coordsys.r15878
-	copyedit.r37928
-	copyrightbox.r24829
-	coseoul.r23862
-	counterz.r67335
-	counttexruns.r27576
-	courseoutline.r15878
-	coursepaper.r15878
-	coverpage.r63509
-	cprotect.r21209
-	cprotectinside.r63833
-	crbox.r29803
-	create-theorem.r67712
-	creationboites.r68087
-	crefthe.r68813
-	crossreference.r15878
-	crossreftools.r55879
-	crumbs.r64602
-	csquotes.r64389
-	css-colors.r54512
-	csvmerge.r51857
-	csvsimple.r69494
-	cuisine.r34453
-	currency.r48990
-	currfile.r64673
-	curriculum-vitae.r68211
-	currvita.r15878
-	customenvs.r68637
-	cutwin.r60901
-	cv.r15878
-	cv4tw.r34577
-	cweb-latex.r28878
-	cyber.r46776
-	cybercic.r37659
-	darkmode.r64271
-	dashbox.r23425
-	dashrule.r29579
-	dashundergaps.r58150
-	dataref.r62942
-	datatool.r52663
-	datax.r61772
-	dateiliste.r27974
-	datenumber.r61761
-	datestamp.r61719
-	datetime.r36650
-	datetime2.r63102
-	datetime2-bahasai.r46287
-	datetime2-basque.r47064
-	datetime2-breton.r52647
-	datetime2-bulgarian.r47031
-	datetime2-catalan.r47032
-	datetime2-croatian.r36682
-	datetime2-czech.r47033
-	datetime2-danish.r47034
-	datetime2-dutch.r47355
-	datetime2-en-fulltext.r36705
-	datetime2-english.r52479
-	datetime2-esperanto.r47356
-	datetime2-estonian.r47565
-	datetime2-finnish.r47047
-	datetime2-french.r56393
-	datetime2-galician.r47631
-	datetime2-german.r67201
-	datetime2-greek.r47533
-	datetime2-hebrew.r47534
-	datetime2-icelandic.r65213
-	datetime2-irish.r47632
-	datetime2-it-fulltext.r54779
-	datetime2-italian.r37146
-	datetime2-latin.r47748
-	datetime2-lsorbian.r47749
-	datetime2-magyar.r48266
-	datetime2-norsk.r48267
-	datetime2-polish.r48456
-	datetime2-portuges.r48457
-	datetime2-romanian.r56394
-	datetime2-russian.r49345
-	datetime2-samin.r49346
-	datetime2-scottish.r52101
-	datetime2-serbian.r67201
-	datetime2-slovak.r52281
-	datetime2-slovene.r52282
-	datetime2-spanish.r45785
-	datetime2-swedish.r36700
-	datetime2-turkish.r52331
-	datetime2-ukrainian.r47552
-	datetime2-usorbian.r52375
-	datetime2-welsh.r52553
-	dblfloatfix.r28983
-	dbshow.r61634
-	debate.r64846
-	decimal.r23374
-	decimalcomma.r69251
-	decorule.r55230
-	defoldfonts.r68234
-	delimtxt.r16549
-	democodetools.r64314
-	denisbdoc.r66137
-	diabetes-logbook.r54810
-	diagbox.r54080
-	diagnose.r19387
-	dialogl.r28946
-	dichokey.r17192
-	dimnum.r58774
-	dinbrief.r15878
-	directory.r15878
-	dirtytalk.r20520
-	dlfltxb.r17337
-	dnaseq.r17194
-	doclicense.r68441
-	docmfp.r15878
-	docmute.r25741
-	docshots.r69676
-	doctools.r34474
-	documentation.r34521
-	docutils.r56594
-	doi.r48634
-	dotarrow.r15878
-	dotlessi.r51476
-	dotseqn.r17195
-	download.r52257
-	dox.r46011
-	dpfloat.r17196
-	dprogress.r15878
-	drac.r15878
-	draftcopy.r15878
-	draftfigure.r44854
-	draftwatermark.r57099
-	dtk.r69504
-	dtxdescribe.r69507
-	ducksay.r64655
-	duckuments.r52271
-	dvdcoll.r15878
-	dynamicnumber.r38726
-	dynblocks.r35193
-	ean13isbn.r57514
-	easy.r19440
-	easy-todo.r32677
-	easybook.r69747
-	easyfig.r64967
-	easyfloats.r57204
-	easyformat.r44543
-	easylist.r32661
-	easyreview.r38352
-	ebezier.r15878
-	ecclesiastic.r38172
-	econlipsum.r58390
-	ecv.r24928
-	ed.r25231
-	edichokey.r56223
-	edmargin.r27599
-	eemeir.r15878
-	efbox.r33236
-	egplot.r20617
-	ehhline.r54676
-	einfart.r68376
-	elements.r61792
-	ellipsis.r55418
-	elmath.r15878
-	elocalloc.r42712
-	elpres.r60209
-	elzcards.r51894
-	emarks.r24504
-	embedall.r51177
-	embedfile.r65528
-	embrac.r57814
-	emo.r66944
-	emotion.r69752
-	emptypage.r18064
-	emulateapj.r28469
-	endfloat.r57090
-	endheads.r43750
-	endnotes.r53319
-	endnotes-hy.r54758
-	engpron.r16558
-	engrec.r15878
-	enotez.r61490
-	enumitem.r51423
-	enumitem-zref.r21472
-	envbig.r15878
-	environ.r56615
-	envlab.r61937
-	epigraph.r54857
-	epigraph-keys.r61719
-	epiolmec.r15878
-	eq-pin2corr.r59477
-	eqell.r22931
-	eqlist.r32257
-	eqnalign.r43278
-	eqname.r20678
-	eqparbox.r45215
-	errata.r42428
-	erw-l3.r61799
-	esami.r67707
-	esdiff.r21385
-	esieecv.r59638
-	esindex.r52342
-	esint.r52240
-	esint-type1.r15878
-	etaremune.r15878
-	etextools.r20694
-	etl.r60998
-	etoc.r69343
-	eukdate.r15878
-	eulerpx.r63967
-	europasscv.r56829
-	europecv.r69661
-	everyhook.r35675
-	everypage.r56694
-	exam.r67600
-	exam-lite.r65754
-	exam-n.r64674
-	exam-randomizechoices.r61719
-	examdesign.r15878
-	example.r33398
-	examplep.r55265
-	examz.r67303
-	exceltex.r26313
-	excludeonly.r17262
-	exercise.r35417
-	exercisebank.r50448
-	exercisepoints.r49590
-	exercises.r55188
-	exesheet.r69688
-	exframe.r53911
-	exp-testopt.r15878
-	expdlist.r15878
-	export.r27206
-	exsheets.r67300
-	exsol.r69343
-	extract.r52117
-	facsimile.r21328
-	factura.r61697
-	fail-fast.r67543
-	familytree.r63739
-	fancyhandout.r46411
-	fancylabel.r46736
-	fancynum.r15878
-	fancypar.r58895
-	fancyqr.r64182
-	fancyslides.r36263
-	fancytabs.r41549
-	fancytooltips.r68931
-	fbox.r69041
-	fcolumn.r67729
-	fetchcls.r45245
-	fewerfloatpages.r58058
-	ffcode.r69706
-	ffslides.r38895
-	fgruler.r63721
-	fifo-stack.r33288
-	figsize.r18784
-	filecontents.r66740
-	filecontentsdef.r52208
-	filedate.r29529
-	fileinfo.r28421
-	filemod.r64967
-	fink.r24329
-	finstrut.r21719
-	fistrum.r66461
-	fithesis.r64135
-	fixcmex.r51825
-	fixfoot.r17131
-	fixme.r63708
-	fixmetodonotes.r30168
-	fjodor.r53207
-	flabels.r17272
-	flacards.r19440
-	flagderiv.r15878
-	flashcards.r62104
-	flashmovie.r25768
-	flexipage.r66614
-	flipbook.r25584
-	flippdf.r56782
-	floatbytocbasic.r67945
-	floatflt.r25540
-	floatrow.r15878
-	floatrowbytocbasic.r67946
-	flowfram.r35291
-	fmp.r15878
-	fmtcount.r53912
-	fn2end.r15878
-	fnbreak.r66615
-	fncychap.r20710
-	fncylab.r52090
-	fnpara.r25607
-	fnpct.r62248
-	fnumprint.r29173
-	foilhtml.r61937
-	foliono.r58877
-	fontaxes.r55920
-	fontsetup.r69390
-	fontsize.r60161
-	fonttable.r44799
-	footmisc.r69729
-	footmisx.r42621
-	footnotebackref.r27034
-	footnoterange.r66149
-	footnpag.r15878
-	forarray.r15878
-	foreign.r27819
-	forloop.r67017
-	formlett.r21480
-	forms16be.r51305
-	formular.r15878
-	fragments.r15878
-	frame.r18312
-	framed.r26789
-	frankenstein.r15878
-	frege.r27417
-	froufrou.r67201
-	ftcap.r17275
-	ftnxtra.r29652
-	fullblck.r25434
-	fullminipage.r34545
-	fullwidth.r24684
-	functional.r65485
-	fundus-calligra.r26018
-	fundus-cyr.r26019
-	fundus-sueterlin.r26030
-	fvextra.r69001
-	fwlw.r29803
-	g-brief.r50415
-	gatherenum.r67201
-	gauss.r32934
-	gcard.r15878
-	gcite.r15878
-	gender.r36464
-	genealogy-profiles.r69580
-	genmpage.r15878
-	gensymb.r64740
-	getfiledate.r16189
-	getitems.r39365
-	gindex.r52311
-	ginpenc.r24980
-	gitfile-info.r51928
-	gitinfo.r34049
-	gitinfo2.r38913
-	gitlog.r38932
-	gitstatus.r64662
-	gitver.r63920
-	globalvals.r49962
-	gloss.r15878
-	glossaries-danish.r35665
-	glossaries-dutch.r35685
-	glossaries-english.r35665
-	glossaries-estonian.r49928
-	glossaries-extra.r68409
-	glossaries-finnish.r54080
-	glossaries-french.r42873
-	glossaries-german.r35665
-	glossaries-irish.r35665
-	glossaries-italian.r35665
-	glossaries-magyar.r35665
-	glossaries-norsk.r67141
-	glossaries-nynorsk.r67201
-	glossaries-polish.r35665
-	glossaries-portuges.r36064
-	glossaries-serbian.r35665
-	glossaries-slovene.r51211
-	glossaries-spanish.r35665
-	gmdoc.r21292
-	gmdoc-enhance.r15878
-	gmiflink.r15878
-	gmutils.r24287
-	gmverb.r24288
-	grabbox.r65223
-	gradient-text.r65567
-	grading-scheme.r62505
-	graphbox.r46360
-	graphicscache.r65318
-	graphicx-psmin.r56931
-	graphicxbox.r32630
-	graphpaper.r63116
-	grayhints.r49052
-	grfpaste.r17354
-	grid.r61719
-	grid-system.r32981
-	gridpapers.r58723
-	gridset.r53762
-	gridslides.r54512
-	gs1.r59620
-	guitlogo.r55741
-	ha-prosper.r59651
-	hackthefootline.r46494
-	halloweenmath.r52602
-	handin.r48255
-	handout.r43962
-	handoutwithnotes.r62140
-	hang.r43280
-	hanging.r15878
-	hardwrap.r21396
-	harnon-cv.r26543
-	harpoon.r21327
-	hc.r15878
-	he-she.r41359
-	hep-acronym.r67632
-	hep-float.r67632
-	hep-math.r67632
-	hep-text.r67632
-	hep-title.r67632
-	hereapplies.r68638
-	hhtensor.r54080
-	hideanswer.r63852
-	highlightlatex.r58392
-	highlightx.r68756
-	histogr.r15878
-	hitec.r15878
-	hitreport.r58357
-	hletter.r30002
-	hobsub.r52810
-	homework.r68773
-	hpsdiss.r15878
-	href-ul.r69359
-	hrefhide.r66189
-	huawei.r68336
-	hvextern.r69651
-	hvindex.r46051
-	hvlogos.r69581
-	hvpygmentex.r62405
-	hvqrurl.r69723
-	hwemoji.r65001
-	hypdestopt.r56253
-	hypdoc.r68661
-	hypdvips.r53197
-	hyper.r17357
-	hyperbar.r48147
-	hypernat.r17358
-	hyperxmp.r68251
-	hyphenat.r15878
-	identkey.r61719
-	idxcmds.r54554
-	idxlayout.r25821
-	iexec.r69420
-	ifallfalse.r60027
-	iffont.r38823
-	ifmslide.r20727
-	ifmtarg.r47544
-	ifnextok.r23379
-	ifoddpage.r64967
-	ifthenx.r25819
-	iitem.r29613
-	image-gallery.r15878
-	imakeidx.r42287
-	import.r54683
-	incgraph.r60810
-	indextools.r68555
-	inline-images.r61719
-	inlinedef.r15878
-	inlinelabel.r63853
-	inputenx.r52986
-	inputtrc.r28019
-	interactiveworkbook.r15878
-	interfaces.r21474
-	intopdf.r63987
-	inversepath.r15878
-	invoice.r48359
-	invoice-class.r49749
-	invoice2.r67327
-	ipsum.r68861
-	iso.r15878
-	iso10303.r15878
-	isodate.r16613
-	isodoc.r59709
-	isonums.r17362
-	isopt.r45509
-	isorot.r15878
-	isosafety.r68801
-	isotope.r23711
-	issuulinks.r25742
-	iwonamath.r68144
-	jlabels.r24858
-	jmsdelim.r62630
-	jobname-suffix.r64797
-	joinbox.r68003
-	jslectureplanner.r57095
-	jumplines.r37553
-	jvlisting.r24638
-	kalendarium.r48744
-	kantlipsum.r68983
-	kerntest.r15878
-	keycommand.r18042
-	keyfloat.r69399
-	keyindex.r50828
-	keyparse.r60277
-	keyreader.r28195
-	keystroke.r17992
-	keyval2e.r23698
-	keyvaltable.r65416
-	kix.r21606
-	knowledge.r61991
-	koma-moderncvclassic.r25025
-	koma-script-sfs.r26137
-	komacv.r57721
-	komacv-rg.r49064
-	korigamik.r68204
-	ktv-texdata.r27369
-	l3build.r69748
-	labbook.r15878
-	labels.r15878
-	labels4easylist.r51124
-	labelschanged.r69400
-	lambdax.r60278
-	lastpackage.r34481
-	lastpage.r68557
-	latex-amsmath-dev.r68730
-	latex-base-dev.r68730
-	latex-bin-dev.r66186
-	latex-context-ppchtex.r66687
-	latex-firstaid-dev.r68730
-	latex-graphics-dev.r68730
-	latex-lab-dev.r68730
-	latex-tools-dev.r68730
-	latex-uni8.r49729
-	latex2pydata.r68919
-	latexcolors.r49888
-	latexdemo.r67201
-	latexgit.r54811
-	layouts.r42428
-	lazylist.r17691
-	lccaps.r46432
-	lcd.r16549
-	lcg.r31474
-	leading.r15878
-	leaflet.r56878
-	lebhart.r68376
-	lectures.r53642
-	lectureslides.r62292
-	leftidx.r15878
-	leftindex.r69660
-	leipzig.r52450
-	lengthconvert.r55064
-	lettre.r54722
-	lettrine.r69508
-	lewis.r15878
-	lhelp.r23638
-	libgreek.r65004
-	limap.r44863
-	linegoal.r21523
-	linop.r41304
-	lipsum.r60561
-	lisp-on-tex.r38722
-	listing.r17373
-	listingsutf8.r53097
-	listlbls.r67215
-	listliketab.r15878
-	listofsymbols.r16134
-	litesolution.r69115
-	litetable.r69678
-	lkproof.r20021
-	lmake.r25552
-	locality.r20422
-	logbox.r24499
-	logical-markup-utils.r15878
-	logoetalab.r68916
-	logpap.r15878
-	longfbox.r39028
-	longfigure.r34302
-	longnamefilelist.r27889
-	loops.r30704
-	lsc.r15878
-	lstaddons.r64967
-	lstfiracode.r49503
-	lt3graph.r45913
-	lt3rawobjects.r66619
-	ltablex.r34923
-	ltabptch.r17533
-	ltxdockit.r21869
-	ltxguidex.r50992
-	ltxkeys.r28332
-	ltxnew.r21586
-	ltxtools.r24897
-	lua-check-hyphen.r47527
-	lua-physical.r59138
-	luatodonotes.r53825
-	macrolist.r60139
-	macroswap.r31498
-	magaz.r24694
-	magicnum.r52983
-	magicwatermark.r63656
-	mailing.r15878
-	mailmerge.r15878
-	makebarcode.r15878
-	makebase.r41012
-	makebox.r15878
-	makecell.r15878
-	makecirc.r15878
-	makecmds.r15878
-	makedtx.r46702
-	makeglos.r15878
-	makelabels.r60255
-	makerobust.r52811
-	mandi.r68950
-	manfnt.r54684
-	manuscript.r36110
-	manyind.r49874
-	marginfit.r48281
-	marginfix.r55064
-	marginnote.r68204
-	markdown.r66954
-	mathalpha.r61089
-	mathastext.r69237
-	mathexam.r15878
-	mathfam256.r53519
-	mathfont.r68241
-	maybemath.r15878
-	mcaption.r15878
-	mceinleger.r15878
-	mcexam.r60481
-	mcite.r18173
-	mciteplus.r31648
-	mdframed.r31075
-	media4svg.r64686
-	media9.r64047
-	medstarbeamer.r38828
-	meetingmins.r31878
-	memexsupp.r15878
-	memory.r30452
-	mensa-tex.r45997
-	menu.r15878
-	menucard.r55643
-	menukeys.r64314
-	metalogox.r69601
-	metanorma.r55010
-	metastr.r56246
-	method.r17485
-	metre.r18489
-	mfirstuc.r64743
-	mftinc.r15878
-	mi-solns.r49651
-	midpage.r17484
-	mindflow.r65236
-	minibox.r30914
-	minidocument.r43752
-	minifp.r32559
-	minimalist.r68552
-	minipage-marginpar.r15878
-	minitoc.r61719
-	minorrevision.r32165
-	minutes.r42186
-	mla-paper.r54080
-	mleftright.r53021
-	mlist.r15878
-	mmap.r15878
-	mnotes.r63406
-	moderncv.r62128
-	modernposter.r47269
-	moderntimeline.r55518
-	modref.r15878
-	modroman.r29803
-	modular.r44142
-	moloch.r69579
-	monofill.r28140
-	moodle.r65672
-	moreenum.r24479
-	morefloats.r37927
-	morehype.r38815
-	moresize.r17513
-	moreverb.r22126
-	morewrites.r69679
-	movement-arrows.r67270
-	movie15.r26473
-	mparhack.r59066
-	mpostinl.r49559
-	msc.r67718
-	msg.r49578
-	mslapa.r54080
-	mtgreek.r17967
-	multenum.r21775
-	multiaudience.r60688
-	multibbl.r15878
-	multicap.r15878
-	multicolrule.r56366
-	multidef.r40637
-	multienv.r64967
-	multiexpand.r45943
-	multifootnote.r63456
-	multilang.r49065
-	multiple-choice.r63722
-	multirow.r58396
-	mversion.r29370
-	mwe.r64967
-	mycv.r26807
-	mylatex.r56751
-	mylatexformat.r21392
-	nag.r24741
-	nameauth.r69758
-	namespc.r15878
-	ncclatex.r15878
-	ncctools.r51810
-	needspace.r29601
-	nestquot.r27323
-	newenviron.r29331
-	newfile.r15878
-	newlfm.r15878
-	newspaper.r15878
-	newunicodechar.r47382
-	newvbtm.r23996
-	newverbs.r64833
-	nextpage.r15878
-	nfssext-cfr.r43640
-	nicefilelist.r65842
-	niceframe.r36086
-	nicetext.r38914
-	nidanfloat.r48295
-	ninecolors.r62006
-	nlctdoc.r68448
-	noconflict.r30140
-	noindentafter.r59195
-	noitcrul.r15878
-	nolbreaks.r26786
-	nomencl.r61029
-	nomentbl.r16549
-	non-decimal-units.r69742
-	nonfloat.r17598
-	nonumonpart.r22114
-	nopageno.r18128
-	normalcolor.r40125
-	notebeamer.r68871
-	notes.r42428
-	notespages.r41906
-	notestex.r45396
-	notoccite.r18129
-	nowidow.r24066
-	nox.r30991
-	ntheorem.r27609
-	numberedblock.r33109
-	numname.r18130
-	numprint.r27498
-	numspell.r61132
-	ocg-p.r28803
-	ocgx.r54512
-	ocgx2.r65292
-	ocr-latex.r15878
-	octavo.r15878
-	oldstyle.r15878
-	onlyamsmath.r42927
-	opcit.r15878
-	opencolor.r66363
-	optidef.r50941
-	optional.r18131
-	options.r39030
-	orcidlink.r69253
-	orientation.r57390
-	outline.r18360
-	outliner.r21095
-	outlines.r25192
-	outlining.r45601
-	overlays.r57866
-	overpic.r69343
-	padcount.r47621
-	pagecolor.r66885
-	pagecont.r15878
-	pagegrid.r64470
-	pagelayout.r69486
-	pagenote.r63708
-	pagerange.r16915
-	pageslts.r39164
-	palette.r60119
-	pangram.r66300
-	paper.r34521
-	papercdcase.r15878
-	papermas.r66835
-	papertex.r19230
-	paracol.r49560
-	parades.r40042
-	paralist.r43021
-	paresse.r59228
-	parnotes.r51720
-	parsa.r54840
-	parselines.r21475
-	pas-cours.r55859
-	pas-cv.r32263
-	pas-tableur.r66860
-	patchcmd.r41379
-	pauldoc.r16005
-	pawpict.r21629
-	pbalance.r67201
-	pbox.r24807
-	pbsheet.r24830
-	pdf14.r17583
-	pdfannotations.r68958
-	pdfcol.r64469
-	pdfcolmk.r52912
-	pdfcomment.r49047
-	pdfcprot.r18735
-	pdfmarginpar.r23492
-	pdfoverlay.r64210
-	pdfpagediff.r37946
-	pdfpc.r68610
-	pdfpc-movie.r67201
-	pdfprivacy.r45985
-	pdfrender.r69058
-	pdfreview.r50100
-	pdfscreen.r42428
-	pdfslide.r15878
-	pdfsync.r20373
-	pdfwin.r68667
-	pdfx.r50338
-	pecha.r15878
-	perltex.r52162
-	permute.r15878
-	petiteannonce.r25915
-	pgfmath-xfp.r59268
-	phfcc.r60731
-	phfextendedabstract.r60732
-	phffullpagefigure.r41857
-	phfnote.r60733
-	phfparen.r41859
-	phfqit.r60734
-	phfquotetext.r41869
-	phfsvnwatermark.r41870
-	phfthm.r60735
-	philex.r36396
-	phonenumbers.r63774
-	photo.r18739
-	photobook.r68313
-	picture.r54867
-	piff.r21894
-	pkgloader.r47486
-	placeins.r19848
-	plantslabels.r29803
-	plates.r15878
-	plweb.r15878
-	pmboxdraw.r53046
-	polynom.r44832
-	polynomial.r15878
-	polytable.r55837
-	postcards.r21641
-	poster-mac.r18305
-	postnotes.r69102
-	powerdot.r59272
-	ppr-prv.r15878
-	ppt-slides.r69568
-	practicalreports.r52312
-	precattl.r63967
-	prelim2e.r57000
-	preprint.r30447
-	pressrelease.r35147
-	prettyref.r15878
-	prettytok.r66884
-	preview.r69470
-	printlen.r19847
-	probsoln.r44783
-	profmaquette.r69526
-	program.r44214
-	progress.r19519
-	progressbar.r33822
-	projlib.r69689
-	proofread.r61719
-	properties.r15878
-	prosper.r33033
-	protex.r41633
-	protocol.r25562
-	psfragx.r26243
-	pstool.r46393
-	pstring.r42857
-	pxgreeks.r21838
-	pygmentex.r64131
-	python.r60162
-	pythonimmediate.r69487
-	q-and-a.r69164
-	qcm.r63833
-	qstest.r15878
-	qsymbols.r15878
-	quicktype.r42183
-	quiz2socrative.r52276
-	quotchap.r56926
-	quoting.r32818
-	quotmark.r15878
-	ran_toks.r59515
-	randexam.r69690
-	randtext.r15878
-	rccol.r15878
-	rcs-multi.r64967
-	rcsinfo.r15878
-	readablecv.r67986
-	readarray.r60540
-	realboxes.r64967
-	recipe.r54080
-	recipebook.r37026
-	recipecard.r15878
-	rectopma.r19980
-	refcheck.r29128
-	refenums.r44131
-	reflectgraphics.r40612
-	refman.r15878
-	refstyle.r69680
-	regcount.r19979
-	regexpatch.r58668
-	register.r54485
-	regstats.r66795
-	relenc.r22050
-	relsize.r30707
-	repeatindex.r24305
-	repltext.r56433
-	rescansync.r63856
-	resmes.r65375
-	responsive.r69147
-	returntogrid.r48485
-	rgltxdoc.r53858
-	rjlparshap.r15878
-	rlepsf.r19082
-	rmpage.r54080
-	robust-externalize.r69459
-	robustcommand.r15878
-	robustindex.r49877
-	romanbar.r25005
-	romanbarpagenumber.r36236
-	romanneg.r20087
-	romannum.r15878
-	rorlink.r67461
-	rotfloat.r18292
-	rotpages.r18740
-	roundbox.r29675
-	rterface.r30084
-	rtkinenc.r20003
-	rulerbox.r50984
-	rulercompass.r32392
-	runcode.r69471
-	rvwrite.r19614
-	sanitize-umlaut.r67126
-	sauerj.r15878
-	saveenv.r65346
-	savefnmark.r15878
-	savesym.r31565
-	savetrees.r40525
-	scale.r15878
-	scalebar.r15878
-	scalerel.r42809
-	scanpages.r42633
-	schedule.r51805
-	schooldocs.r69659
-	scontents.r62902
-	scrambledenvs.r60615
-	scrlayer-fancyhdr.r63844
-	scrlttr2copy.r56733
-	scrwfile.r66872
-	sdaps.r65345
-	sdrt.r15878
-	secdot.r20208
-	secnum.r61813
-	sectionbox.r37749
-	sectionbreak.r50339
-	sectsty.r15878
-	seealso.r43595
-	selectp.r20185
-	selinput.r53098
-	semantex.r65679
-	semantic.r15878
-	semantic-markup.r53607
-	semesterplanner.r56841
-	semioneside.r15878
-	semproc.r37568
-	semtex.r56530
-	sepfootnotes.r41732
-	seqsplit.r15878
-	sesstime.r49750
-	setspaceenhanced.r68493
-	sf298.r41653
-	sffms.r15878
-	sfmath.r15878
-	shadethm.r53350
-	shadow.r20312
-	shadowtext.r26522
-	shapepar.r69343
-	shdoc.r41991
-	shipunov.r52334
-	shorttoc.r15878
-	show2e.r15878
-	showcharinbox.r29803
-	showdim.r28918
-	showexpl.r57414
-	showlabels.r63940
-	sidecap.r65618
-	sidenotes.r54524
-	sidenotesplus.r69176
-	silence.r27028
-	sillypage.r66349
-	sim-os-menus.r68843
-	simplecd.r29260
-	simplecv.r35537
-	simpleinvoice.r45673
-	simplivre.r68376
-	sitem.r22136
-	skb.r22781
-	skdoc.r56950
-	skeldoc.r57922
-	skeycommand.r24652
-	skeyval.r30560
-	skills.r56734
-	skrapport.r52412
-	slantsc.r25007
-	smalltableof.r20333
-	smart-eqn.r61719
-	smartref.r20311
-	smartunits.r39592
-	snapshot.r56735
-	snaptodo.r61155
-	snotez.r61992
-	soulpos.r60772
-	spacingtricks.r69048
-	spark-otf.r62481
-	sparklines.r42821
-	sphack.r20842
-	splitindex.r39766
-	spot.r22408
-	spotcolor.r15878
-	spreadtab.r68256
-	spverbatim.r15878
-	srbook-mem.r45818
-	srcltx.r15878
-	sseq.r31585
-	sslides.r32293
-	stack.r15878
-	stackengine.r60019
-	standalone.r64677
-	starray.r69002
-	stdclsdv.r15878
-	stdpage.r15878
-	stealcaps.r64967
-	stex.r68569
-	storebox.r64967
-	storecmd.r24431
-	stringstrings.r57097
-	sttools.r60736
-	stubs.r69128
-	studenthandouts.r43516
-	styledcmd.r65262
-	subdepth.r15878
-	subdocs.r51480
-	subeqn.r15878
-	subeqnarray.r15878
-	subfigmat.r20308
-	subfigure.r15878
-	subfiles.r56977
-	subfloat.r29349
-	substr.r16117
-	supertabular.r53658
-	suppose.r59281
-	svg.r57010
-	svgcolor.r15878
-	svn.r15878
-	svn-multi.r64967
-	svn-prov.r64967
-	svninfo.r62157
-	swfigure.r63255
-	swungdash.r64204
-	syntax.r15878
-	syntrace.r15878
-	synttree.r16252
-	tabbing.r59715
-	tabfigures.r25202
-	tableaux.r42413
-	tablefootnote.r32804
-	tableof.r59837
-	tablists.r15878
-	tabls.r17255
-	tablvar.r69212
-	tabstackengine.r46848
-	tabto-ltx.r54080
-	tabu.r61719
-	tabularborder.r17885
-	tabularcalc.r15878
-	tabularew.r15878
-	tabularray.r66276
-	tabulary.r34368
-	tagging.r52064
-	tagpair.r42138
-	tagpdf.r69703
-	talk.r42428
-	tamefloats.r27345
-	tangocolors.r66733
-	tasks.r61541
-	tcldoc.r22018
-	tcolorbox.r69370
-	tdclock.r33043
-	technics.r29349
-	ted.r15878
-	templatetools.r67201
-	termcal.r22514
-	termlist.r18923
-	termsim.r61414
-	testhyphens.r38928
-	testidx.r60966
-	tex-label.r16372
-	tex-locale.r48500
-	texlogos.r19083
-	texmate.r15878
-	texments.r15878
-	texpower.r29349
-	texshade.r69371
-	texsurgery.r59885
-	textcsc.r67193
-	textfit.r20591
-	textmerg.r20677
-	textpos.r63967
-	textualicomma.r67201
-	texvc.r46844
-	theoremref.r54512
-	thinsp.r39669
-	thmtools.r67018
-	threadcol.r28754
-	threeparttable.r17383
-	threeparttablex.r34206
-	thumb.r16549
-	thumbs.r33134
-	thumby.r16736
-	ticket.r42280
-	tipauni.r65817
-	titlecaps.r63020
-	titlefoot.r15878
-	titlepic.r43497
-	titleref.r18729
-	titlesec.r68677
-	titling.r15878
-	to-be-determined.r64882
-	tocbibind.r20085
-	tocdata.r69512
-	tocloft.r53364
-	tocvsec2.r33146
-	todo.r17746
-	todonotes.r69319
-	tokcycle.r60320
-	tokenizer.r15878
-	toolbox.r32260
-	topfloat.r19084
-	topiclongtable.r54758
-	totalcount.r67201
-	totcount.r21178
-	totpages.r15878
-	tramlines.r65692
-	translations.r61896
-	transparent.r64852
-	trfsigns.r15878
-	trimspaces.r15878
-	trivfloat.r15878
-	trsym.r18732
-	truncate.r18921
-	tucv.r20680
-	turnthepage.r29803
-	tutodoc.r69343
-	twoinone.r17024
-	twoup.r15878
-	txgreeks.r21839
-	type1cm.r21820
-	typed-checklist.r63445
-	typeface.r27046
-	typoaid.r44238
-	typogrid.r24994
-	uassign.r38459
-	ucs.r68759
-	uebungsblatt.r15878
-	umoline.r19085
-	underlin.r15878
-	underoverlap.r29019
-	undolabl.r65846
-	uni-titlepage.r68917
-	unicode-math-input.r69591
-	unicodefonttable.r67066
-	unifront.r67054
-	unisc.r63178
-	unitconv.r55060
-	units.r42428
-	unravel.r69308
-	updatemarks.r68163
-	upmethodology.r64613
-	upquote.r26059
-	uri.r48602
-	ushort.r32261
-	uspace.r63123
-	utf8add.r61074
-	uwmslide.r27354
-	variablelm.r60014
-	varindex.r32262
-	varsfromjobname.r44154
-	varwidth.r24104
-	vcell.r59039
-	vdmlisting.r56905
-	verbasef.r21922
-	verbatimbox.r67865
-	verbatimcopy.r15878
-	verbdef.r17177
-	verbments.r23670
-	verifiche.r69726
-	verifycommand.r69389
-	version.r21920
-	versions.r21921
-	versonotes.r69249
-	vertbars.r49429
-	vgrid.r32457
-	vhistory.r61719
-	vmargin.r15878
-	volumes.r15878
-	vpe.r26039
-	vruler.r21598
-	vtable.r51126
-	vwcol.r36254
-	wallcalendar.r45568
-	wallpaper.r15878
-	warning.r66616
-	warpcol.r15878
-	was.r64691
-	webquiz.r58808
-	widetable.r53409
-	widows-and-orphans.r66753
-	williams.r15878
-	willowtreebook.r60638
-	withargs.r52641
-	wordcount.r46165
-	wordlike.r15878
-	worksheet.r48423
-	wrapfig.r61719
-	wrapfig2.r69513
-	wrapstuff.r64058
-	writeongrid.r68863
-	wtref.r69214
-	xargs.r15878
-	xassoccnt.r61112
-	xbmks.r53448
-	xcntperchap.r54080
-	xcolor-material.r42289
-	xcolor-solarized.r61719
-	xcomment.r20031
-	xcookybooky.r36435
-	xcpdftips.r50449
-	xdoc.r15878
-	xellipsis.r47546
-	xfakebold.r68929
-	xfor.r15878
-	xhfill.r22575
-	xifthen.r38929
-	xint.r63562
-	xkcdcolors.r67895
-	xkeymask.r69223
-	xltabular.r56855
-	xmpincl.r60593
-	xnewcommand.r15878
-	xoptarg.r15878
-	xpatch.r54563
-	xpeek.r61719
-	xprintlen.r35928
-	xpunctuate.r67918
-	xsavebox.r64049
-	xsim.r61988
-	xstring.r68015
-	xtab.r23347
-	xurl.r61553
-	xwatermark.r61719
-	xytree.r15878
-	yafoot.r48568
-	yagusylo.r29803
-	yaletter.r42830
-	ycbook.r46201
-	ydoc.r64887
-	yplan.r34398
-	zebra-goodies.r66630
-	zed-csp.r17258
-	zennote.r65549
-	ziffer.r32279
-	zref.r68278
-	zref-check.r68846
-	zref-clever.r68846
-	zref-vario.r68846
-	zwgetfdate.r15878
-	zwpagelayout.r63074
-"
-TEXLIVE_MODULE_DOC_CONTENTS="
-	2up.doc.r55076
-	a0poster.doc.r54071
-	a4wide.doc.r20943
-	a5comb.doc.r17020
-	abraces.doc.r64967
-	abspos.doc.r64465
-	abstract.doc.r15878
-	accessibility.doc.r55777
-	accsupp.doc.r53052
-	achemso.doc.r69638
-	acro.doc.r62925
-	acronym.doc.r54758
-	acroterm.doc.r61719
-	actuarialangle.doc.r67201
-	actuarialsymbol.doc.r67201
-	addfont.doc.r58559
-	addlines.doc.r49326
-	adjmulticol.doc.r63320
-	adjustbox.doc.r64967
-	adrconv.doc.r46817
-	advdate.doc.r20538
-	affilauthor.doc.r68996
-	akktex.doc.r26055
-	akletter.doc.r15878
-	alchemist.doc.r66924
-	alertmessage.doc.r38055
-	alnumsec.doc.r15878
-	alphalph.doc.r53087
-	alterqcm.doc.r59265
-	altfont.doc.r15878
-	altsubsup.doc.r62738
-	amsaddr.doc.r64357
-	animate.doc.r67401
-	anonchap.doc.r17049
-	answers.doc.r35032
-	anyfontsize.doc.r17050
-	appendix.doc.r53718
-	appendixnumberbeamer.doc.r46317
-	apptools.doc.r28400
-	arabicfront.doc.r51474
-	arcs.doc.r15878
-	argumentation.doc.r69023
-	arraycols.doc.r68277
-	arrayjobx.doc.r18125
-	arraysort.doc.r31576
-	arydshln.doc.r50084
-	asciilist.doc.r49060
-	askinclude.doc.r54725
-	assignment.doc.r20431
-	assoccnt.doc.r38497
-	association-matrix.doc.r64845
-	atenddvi.doc.r56922
-	atendofenv.doc.r62164
-	attachfile.doc.r42099
-	aurl.doc.r41853
-	authoraftertitle.doc.r55889
-	authorarchive.doc.r65777
-	authorindex.doc.r51757
-	autofancyhdr.doc.r54049
-	autonum.doc.r36084
-	autopdf.doc.r32377
-	autopuncitems.doc.r63045
-	avremu.doc.r35373
-	awesomebox.doc.r57349
-	axessibility.doc.r57105
-	background.doc.r42428
-	bankstatement.doc.r38857
-	bashful.doc.r25597
-	basicarith.doc.r35460
-	bchart.doc.r43928
-	beamer-rl.doc.r69254
-	beamer2thesis.doc.r27539
-	beamerappendixnote.doc.r55732
-	beameraudience.doc.r23427
-	beamerauxtheme.doc.r56087
-	beamercolorthemeowl.doc.r40105
-	beamerdarkthemes.doc.r55117
-	beamerposter.doc.r54512
-	beamersubframe.doc.r23510
-	beamertheme-arguelles.doc.r68659
-	beamertheme-cuerna.doc.r42161
-	beamertheme-detlevcm.doc.r39048
-	beamertheme-epyt.doc.r41404
-	beamertheme-focus.doc.r69742
-	beamertheme-light.doc.r49867
-	beamertheme-metropolis.doc.r43031
-	beamertheme-npbt.doc.r54512
-	beamertheme-phnompenh.doc.r39100
-	beamertheme-pure-minimalistic.doc.r56934
-	beamertheme-rainbow.doc.r67542
-	beamertheme-saintpetersburg.doc.r45877
-	beamertheme-simpledarkblue.doc.r60061
-	beamertheme-simpleplus.doc.r64770
-	beamertheme-tcolorbox.doc.r67000
-	beamertheme-trigon.doc.r65985
-	beamertheme-upenn-bc.doc.r29937
-	beamerthemeamurmaple.doc.r69742
-	beamerthemeconcrete.doc.r69528
-	beamerthemelalic.doc.r58777
-	beamerthemenirma.doc.r20765
-	beamerthemenord.doc.r56180
-	bearwear.doc.r54826
-	beaulivre.doc.r68376
-	beautybook.doc.r68438
-	beton.doc.r15878
-	bewerbung.doc.r61632
-	bez123.doc.r15878
-	bhcexam.doc.r64093
-	bibletext.doc.r45196
-	bigfoot.doc.r38248
-	bigints.doc.r29803
-	bilingualpages.doc.r59643
-	biochemistry-colors.doc.r54512
-	bithesis.doc.r68634
-	bizcard.doc.r15878
-	blindtext.doc.r25039
-	blkarray.doc.r36406
-	block.doc.r17209
-	blowup.doc.r67640
-	bnumexpr.doc.r59244
-	boites.doc.r32235
-	bold-extra.doc.r17076
-	book-of-common-prayer.doc.r62240
-	bookcover.doc.r65394
-	bookest.doc.r15878
-	booklet.doc.r15878
-	bookshelf.doc.r55475
-	boolexpr.doc.r17830
-	bophook.doc.r17062
-	boxedminipage.doc.r54827
-	boxhandler.doc.r28031
-	bracketkey.doc.r17129
-	braket.doc.r17127
-	breakurl.doc.r29901
-	bubblesort.doc.r56070
-	bullcntr.doc.r15878
-	bxcalc.doc.r56431
-	bxdpx-beamer.doc.r41813
-	bxdvidriver.doc.r43219
-	bxenclose.doc.r40213
-	bxnewfont.doc.r44173
-	bxpapersize.doc.r63174
-	bxpdfver.doc.r63185
-	bxtexlogo.doc.r63231
-	calcage.doc.r27725
-	calctab.doc.r15878
-	calculator.doc.r64424
-	calrsfs.doc.r17125
-	cals.doc.r43003
-	calxxxx-yyyy.doc.r69266
-	cancel.doc.r32508
-	canoniclayout.doc.r64889
-	capt-of.doc.r29803
-	captcont.doc.r15878
-	captdef.doc.r17353
-	carbohydrates.doc.r39000
-	cases.doc.r54682
-	casyl.doc.r15878
-	catchfile.doc.r53084
-	catchfilebetweentags.doc.r21476
-	catechis.doc.r59998
-	catoptions.doc.r68982
-	cbcoptic.doc.r16666
-	ccaption.doc.r23443
-	cclicenses.doc.r15878
-	cd.doc.r34452
-	cd-cover.doc.r17121
-	cdcmd.doc.r60742
-	cdpbundl.doc.r61719
-	cellprops.doc.r67201
-	cellspace.doc.r61501
-	censor.doc.r67293
-	centeredline.doc.r64672
-	centerlastline.doc.r56644
-	changebar.doc.r69367
-	changelayout.doc.r16094
-	changelog.doc.r65861
-	changepage.doc.r15878
-	changes.doc.r67201
-	chappg.doc.r15878
-	chapterfolder.doc.r15878
-	cheatsheet.doc.r45069
-	checkend.doc.r51475
-	chet.doc.r45081
-	chextras.doc.r27118
-	childdoc.doc.r49543
-	chkfloat.doc.r27473
-	chletter.doc.r20060
-	chngcntr.doc.r47577
-	chronology.doc.r67973
-	circ.doc.r62977
-	circledsteps.doc.r67889
-	circledtext.doc.r63166
-	classics.doc.r53671
-	classpack.doc.r55218
-	clefval.doc.r55985
-	cleveref.doc.r61719
-	cleveref-usedon.doc.r66915
-	clicks.doc.r64602
-	clipboard.doc.r47747
-	clistmap.doc.r61811
-	clock.doc.r15878
-	clrdblpg.doc.r47511
-	clrstrip.doc.r60363
-	cmdstring.doc.r15878
-	cmdtrack.doc.r28910
-	cmsd.doc.r18787
-	cnltx.doc.r55265
-	cntformats.doc.r34668
-	cntperchap.doc.r37572
-	codebox.doc.r61771
-	codedescribe.doc.r69343
-	codedoc.doc.r17630
-	codehigh.doc.r65787
-	codepage.doc.r51502
-	codesection.doc.r34481
-	collcell.doc.r64967
-	collectbox.doc.r64967
-	colophon.doc.r47913
-	color-edits.doc.r56707
-	colordoc.doc.r18270
-	colorframed.doc.r64551
-	colorinfo.doc.r15878
-	coloring.doc.r41042
-	colorist.doc.r68440
-	colorspace.doc.r50585
-	colortab.doc.r22155
-	colorwav.doc.r67012
-	colorweb.doc.r31490
-	colourchange.doc.r21741
-	combelow.doc.r18462
-	combine.doc.r19361
-	comma.doc.r18259
-	commado.doc.r38875
-	commedit.doc.r50116
-	comment.doc.r41927
-	commonunicode.doc.r62901
-	competences.doc.r47573
-	concepts.doc.r29020
-	concprog.doc.r18791
-	conditext.doc.r55387
-	constants.doc.r15878
-	continue.doc.r49449
-	contour.doc.r18950
-	contracard.doc.r67201
-	conv-xkv.doc.r43558
-	cooking.doc.r15878
-	cooking-units.doc.r65241
-	cool.doc.r67013
-	coolfn.doc.r69007
-	coollist.doc.r67048
-	coolstr.doc.r67015
-	coolthms.doc.r29062
-	cooltooltips.doc.r60201
-	coop-writing.doc.r61607
-	coordsys.doc.r15878
-	copyedit.doc.r37928
-	copyrightbox.doc.r24829
-	coseoul.doc.r23862
-	counterz.doc.r67335
-	counttexruns.doc.r27576
-	courseoutline.doc.r15878
-	coursepaper.doc.r15878
-	coverpage.doc.r63509
-	cprotect.doc.r21209
-	cprotectinside.doc.r63833
-	crbox.doc.r29803
-	create-theorem.doc.r67712
-	creationboites.doc.r68087
-	crefthe.doc.r68813
-	crossreference.doc.r15878
-	crossreftools.doc.r55879
-	crumbs.doc.r64602
-	csquotes.doc.r64389
-	css-colors.doc.r54512
-	csvmerge.doc.r51857
-	csvsimple.doc.r69494
-	cuisine.doc.r34453
-	currency.doc.r48990
-	currfile.doc.r64673
-	curriculum-vitae.doc.r68211
-	currvita.doc.r15878
-	customenvs.doc.r68637
-	cutwin.doc.r60901
-	cv.doc.r15878
-	cv4tw.doc.r34577
-	cweb-latex.doc.r28878
-	cyber.doc.r46776
-	cybercic.doc.r37659
-	darkmode.doc.r64271
-	dashbox.doc.r23425
-	dashrule.doc.r29579
-	dashundergaps.doc.r58150
-	dataref.doc.r62942
-	datatool.doc.r52663
-	datax.doc.r61772
-	dateiliste.doc.r27974
-	datenumber.doc.r61761
-	datestamp.doc.r61719
-	datetime.doc.r36650
-	datetime2.doc.r63102
-	datetime2-bahasai.doc.r46287
-	datetime2-basque.doc.r47064
-	datetime2-breton.doc.r52647
-	datetime2-bulgarian.doc.r47031
-	datetime2-catalan.doc.r47032
-	datetime2-croatian.doc.r36682
-	datetime2-czech.doc.r47033
-	datetime2-danish.doc.r47034
-	datetime2-dutch.doc.r47355
-	datetime2-en-fulltext.doc.r36705
-	datetime2-english.doc.r52479
-	datetime2-esperanto.doc.r47356
-	datetime2-estonian.doc.r47565
-	datetime2-finnish.doc.r47047
-	datetime2-french.doc.r56393
-	datetime2-galician.doc.r47631
-	datetime2-german.doc.r67201
-	datetime2-greek.doc.r47533
-	datetime2-hebrew.doc.r47534
-	datetime2-icelandic.doc.r65213
-	datetime2-irish.doc.r47632
-	datetime2-it-fulltext.doc.r54779
-	datetime2-italian.doc.r37146
-	datetime2-latin.doc.r47748
-	datetime2-lsorbian.doc.r47749
-	datetime2-magyar.doc.r48266
-	datetime2-norsk.doc.r48267
-	datetime2-polish.doc.r48456
-	datetime2-portuges.doc.r48457
-	datetime2-romanian.doc.r56394
-	datetime2-russian.doc.r49345
-	datetime2-samin.doc.r49346
-	datetime2-scottish.doc.r52101
-	datetime2-serbian.doc.r67201
-	datetime2-slovak.doc.r52281
-	datetime2-slovene.doc.r52282
-	datetime2-spanish.doc.r45785
-	datetime2-swedish.doc.r36700
-	datetime2-turkish.doc.r52331
-	datetime2-ukrainian.doc.r47552
-	datetime2-usorbian.doc.r52375
-	datetime2-welsh.doc.r52553
-	dblfloatfix.doc.r28983
-	dbshow.doc.r61634
-	debate.doc.r64846
-	decimal.doc.r23374
-	decimalcomma.doc.r69251
-	decorule.doc.r55230
-	defoldfonts.doc.r68234
-	delimtxt.doc.r16549
-	democodetools.doc.r64314
-	denisbdoc.doc.r66137
-	diabetes-logbook.doc.r54810
-	diagbox.doc.r54080
-	diagnose.doc.r19387
-	dialogl.doc.r28946
-	dichokey.doc.r17192
-	dimnum.doc.r58774
-	dinbrief.doc.r15878
-	directory.doc.r15878
-	dirtytalk.doc.r20520
-	dlfltxb.doc.r17337
-	dnaseq.doc.r17194
-	doclicense.doc.r68441
-	docmfp.doc.r15878
-	docmute.doc.r25741
-	docshots.doc.r69676
-	doctools.doc.r34474
-	documentation.doc.r34521
-	docutils.doc.r56594
-	doi.doc.r48634
-	dotarrow.doc.r15878
-	dotlessi.doc.r51476
-	dotseqn.doc.r17195
-	download.doc.r52257
-	dox.doc.r46011
-	dpfloat.doc.r17196
-	dprogress.doc.r15878
-	drac.doc.r15878
-	draftcopy.doc.r15878
-	draftfigure.doc.r44854
-	draftwatermark.doc.r57099
-	dtk.doc.r69504
-	dtxdescribe.doc.r69507
-	dtxgallery.doc.r49504
-	ducksay.doc.r64655
-	duckuments.doc.r52271
-	dvdcoll.doc.r15878
-	dynamicnumber.doc.r38726
-	dynblocks.doc.r35193
-	ean13isbn.doc.r57514
-	easy.doc.r19440
-	easy-todo.doc.r32677
-	easybook.doc.r69747
-	easyfig.doc.r64967
-	easyfloats.doc.r57204
-	easyformat.doc.r44543
-	easylist.doc.r32661
-	easyreview.doc.r38352
-	ebezier.doc.r15878
-	ecclesiastic.doc.r38172
-	econlipsum.doc.r58390
-	ecv.doc.r24928
-	ed.doc.r25231
-	edichokey.doc.r56223
-	edmargin.doc.r27599
-	eemeir.doc.r15878
-	efbox.doc.r33236
-	egplot.doc.r20617
-	ehhline.doc.r54676
-	einfart.doc.r68376
-	elements.doc.r61792
-	ellipsis.doc.r55418
-	elmath.doc.r15878
-	elocalloc.doc.r42712
-	elpres.doc.r60209
-	elzcards.doc.r51894
-	emarks.doc.r24504
-	embedall.doc.r51177
-	embedfile.doc.r65528
-	embrac.doc.r57814
-	emo.doc.r66944
-	emotion.doc.r69752
-	emptypage.doc.r18064
-	emulateapj.doc.r28469
-	endfloat.doc.r57090
-	endheads.doc.r43750
-	endnotes.doc.r53319
-	endnotes-hy.doc.r54758
-	engpron.doc.r16558
-	engrec.doc.r15878
-	enotez.doc.r61490
-	enumitem.doc.r51423
-	enumitem-zref.doc.r21472
-	envbig.doc.r15878
-	environ.doc.r56615
-	envlab.doc.r61937
-	epigraph.doc.r54857
-	epigraph-keys.doc.r61719
-	epiolmec.doc.r15878
-	eq-pin2corr.doc.r59477
-	eqell.doc.r22931
-	eqlist.doc.r32257
-	eqnalign.doc.r43278
-	eqparbox.doc.r45215
-	errata.doc.r42428
-	erw-l3.doc.r61799
-	esami.doc.r67707
-	esdiff.doc.r21385
-	esieecv.doc.r59638
-	esindex.doc.r52342
-	esint.doc.r52240
-	esint-type1.doc.r15878
-	etaremune.doc.r15878
-	etextools.doc.r20694
-	etl.doc.r60998
-	etoc.doc.r69343
-	eukdate.doc.r15878
-	eulerpx.doc.r63967
-	europasscv.doc.r56829
-	europecv.doc.r69661
-	everyhook.doc.r35675
-	everypage.doc.r56694
-	exam.doc.r67600
-	exam-lite.doc.r65754
-	exam-n.doc.r64674
-	exam-randomizechoices.doc.r61719
-	examdesign.doc.r15878
-	examplep.doc.r55265
-	examz.doc.r67303
-	exceltex.doc.r26313
-	excludeonly.doc.r17262
-	exercise.doc.r35417
-	exercisebank.doc.r50448
-	exercisepoints.doc.r49590
-	exercises.doc.r55188
-	exesheet.doc.r69688
-	exframe.doc.r53911
-	exp-testopt.doc.r15878
-	expdlist.doc.r15878
-	export.doc.r27206
-	exsheets.doc.r67300
-	exsol.doc.r69343
-	extract.doc.r52117
-	facsimile.doc.r21328
-	factura.doc.r61697
-	fail-fast.doc.r67543
-	familytree.doc.r63739
-	fancyhandout.doc.r46411
-	fancylabel.doc.r46736
-	fancynum.doc.r15878
-	fancypar.doc.r58895
-	fancyqr.doc.r64182
-	fancyslides.doc.r36263
-	fancytabs.doc.r41549
-	fancytooltips.doc.r68931
-	fbox.doc.r69041
-	fcolumn.doc.r67729
-	fetchcls.doc.r45245
-	fewerfloatpages.doc.r58058
-	ffcode.doc.r69706
-	ffslides.doc.r38895
-	fgruler.doc.r63721
-	fifo-stack.doc.r33288
-	figsize.doc.r18784
-	filecontents.doc.r66740
-	filecontentsdef.doc.r52208
-	filedate.doc.r29529
-	fileinfo.doc.r28421
-	filemod.doc.r64967
-	fink.doc.r24329
-	finstrut.doc.r21719
-	fistrum.doc.r66461
-	fithesis.doc.r64135
-	fixcmex.doc.r51825
-	fixfoot.doc.r17131
-	fixme.doc.r63708
-	fixmetodonotes.doc.r30168
-	fjodor.doc.r53207
-	flabels.doc.r17272
-	flacards.doc.r19440
-	flagderiv.doc.r15878
-	flashcards.doc.r62104
-	flashmovie.doc.r25768
-	flexipage.doc.r66614
-	flipbook.doc.r25584
-	flippdf.doc.r56782
-	floatbytocbasic.doc.r67945
-	floatflt.doc.r25540
-	floatrow.doc.r15878
-	floatrowbytocbasic.doc.r67946
-	flowfram.doc.r35291
-	fmp.doc.r15878
-	fmtcount.doc.r53912
-	fn2end.doc.r15878
-	fnbreak.doc.r66615
-	fncychap.doc.r20710
-	fncylab.doc.r52090
-	fnpara.doc.r25607
-	fnpct.doc.r62248
-	fnumprint.doc.r29173
-	foilhtml.doc.r61937
-	foliono.doc.r58877
-	fontaxes.doc.r55920
-	fontsetup.doc.r69390
-	fontsize.doc.r60161
-	fonttable.doc.r44799
-	footmisc.doc.r69729
-	footmisx.doc.r42621
-	footnotebackref.doc.r27034
-	footnoterange.doc.r66149
-	footnpag.doc.r15878
-	forarray.doc.r15878
-	foreign.doc.r27819
-	forloop.doc.r67017
-	formlett.doc.r21480
-	forms16be.doc.r51305
-	formular.doc.r15878
-	fragments.doc.r15878
-	frame.doc.r18312
-	framed.doc.r26789
-	frankenstein.doc.r15878
-	frege.doc.r27417
-	froufrou.doc.r67201
-	ftcap.doc.r17275
-	ftnxtra.doc.r29652
-	fullblck.doc.r25434
-	fullminipage.doc.r34545
-	fullwidth.doc.r24684
-	functional.doc.r65485
-	fundus-calligra.doc.r26018
-	fundus-sueterlin.doc.r26030
-	fvextra.doc.r69001
-	fwlw.doc.r29803
-	g-brief.doc.r50415
-	gatherenum.doc.r67201
-	gauss.doc.r32934
-	gcard.doc.r15878
-	gcite.doc.r15878
-	gender.doc.r36464
-	genealogy-profiles.doc.r69580
-	genmpage.doc.r15878
-	gensymb.doc.r64740
-	getfiledate.doc.r16189
-	getitems.doc.r39365
-	gindex.doc.r52311
-	ginpenc.doc.r24980
-	gitfile-info.doc.r51928
-	gitinfo.doc.r34049
-	gitinfo2.doc.r38913
-	gitlog.doc.r38932
-	gitstatus.doc.r64662
-	gitver.doc.r63920
-	globalvals.doc.r49962
-	gloss.doc.r15878
-	glossaries-danish.doc.r35665
-	glossaries-dutch.doc.r35685
-	glossaries-english.doc.r35665
-	glossaries-estonian.doc.r49928
-	glossaries-extra.doc.r68409
-	glossaries-finnish.doc.r54080
-	glossaries-french.doc.r42873
-	glossaries-german.doc.r35665
-	glossaries-irish.doc.r35665
-	glossaries-italian.doc.r35665
-	glossaries-magyar.doc.r35665
-	glossaries-norsk.doc.r67141
-	glossaries-nynorsk.doc.r67201
-	glossaries-polish.doc.r35665
-	glossaries-portuges.doc.r36064
-	glossaries-serbian.doc.r35665
-	glossaries-slovene.doc.r51211
-	glossaries-spanish.doc.r35665
-	gmdoc.doc.r21292
-	gmdoc-enhance.doc.r15878
-	gmiflink.doc.r15878
-	gmutils.doc.r24287
-	gmverb.doc.r24288
-	grabbox.doc.r65223
-	gradient-text.doc.r65567
-	grading-scheme.doc.r62505
-	graphbox.doc.r46360
-	graphicscache.doc.r65318
-	graphicx-psmin.doc.r56931
-	graphicxbox.doc.r32630
-	graphpaper.doc.r63116
-	grayhints.doc.r49052
-	grfpaste.doc.r17354
-	grid.doc.r61719
-	grid-system.doc.r32981
-	gridpapers.doc.r58723
-	gridset.doc.r53762
-	gridslides.doc.r54512
-	gs1.doc.r59620
-	guitlogo.doc.r55741
-	ha-prosper.doc.r59651
-	hackthefootline.doc.r46494
-	halloweenmath.doc.r52602
-	handin.doc.r48255
-	handout.doc.r43962
-	handoutwithnotes.doc.r62140
-	hang.doc.r43280
-	hanging.doc.r15878
-	hardwrap.doc.r21396
-	harnon-cv.doc.r26543
-	harpoon.doc.r21327
-	hc.doc.r15878
-	he-she.doc.r41359
-	hep-acronym.doc.r67632
-	hep-float.doc.r67632
-	hep-math.doc.r67632
-	hep-text.doc.r67632
-	hep-title.doc.r67632
-	hereapplies.doc.r68638
-	hhtensor.doc.r54080
-	hideanswer.doc.r63852
-	highlightlatex.doc.r58392
-	highlightx.doc.r68756
-	histogr.doc.r15878
-	hitec.doc.r15878
-	hitreport.doc.r58357
-	hletter.doc.r30002
-	hobsub.doc.r52810
-	homework.doc.r68773
-	hpsdiss.doc.r15878
-	href-ul.doc.r69359
-	hrefhide.doc.r66189
-	huawei.doc.r68336
-	hvextern.doc.r69651
-	hvindex.doc.r46051
-	hvlogos.doc.r69581
-	hvpygmentex.doc.r62405
-	hvqrurl.doc.r69723
-	hwemoji.doc.r65001
-	hypdestopt.doc.r56253
-	hypdoc.doc.r68661
-	hypdvips.doc.r53197
-	hyper.doc.r17357
-	hyperbar.doc.r48147
-	hypernat.doc.r17358
-	hyperxmp.doc.r68251
-	hyphenat.doc.r15878
-	identkey.doc.r61719
-	idxcmds.doc.r54554
-	idxlayout.doc.r25821
-	iexec.doc.r69420
-	ifallfalse.doc.r60027
-	iffont.doc.r38823
-	ifmslide.doc.r20727
-	ifmtarg.doc.r47544
-	ifnextok.doc.r23379
-	ifoddpage.doc.r64967
-	ifthenx.doc.r25819
-	iitem.doc.r29613
-	image-gallery.doc.r15878
-	imakeidx.doc.r42287
-	import.doc.r54683
-	incgraph.doc.r60810
-	indextools.doc.r68555
-	inline-images.doc.r61719
-	inlinedef.doc.r15878
-	inlinelabel.doc.r63853
-	inputenx.doc.r52986
-	inputtrc.doc.r28019
-	interactiveworkbook.doc.r15878
-	interfaces.doc.r21474
-	intopdf.doc.r63987
-	inversepath.doc.r15878
-	invoice.doc.r48359
-	invoice-class.doc.r49749
-	invoice2.doc.r67327
-	ipsum.doc.r68861
-	iso.doc.r15878
-	iso10303.doc.r15878
-	isodate.doc.r16613
-	isodoc.doc.r59709
-	isonums.doc.r17362
-	isopt.doc.r45509
-	isorot.doc.r15878
-	isosafety.doc.r68801
-	isotope.doc.r23711
-	issuulinks.doc.r25742
-	iwonamath.doc.r68144
-	jlabels.doc.r24858
-	jmsdelim.doc.r62630
-	jobname-suffix.doc.r64797
-	joinbox.doc.r68003
-	jslectureplanner.doc.r57095
-	jumplines.doc.r37553
-	jvlisting.doc.r24638
-	kalendarium.doc.r48744
-	kantlipsum.doc.r68983
-	kerntest.doc.r15878
-	keycommand.doc.r18042
-	keyfloat.doc.r69399
-	keyindex.doc.r50828
-	keyparse.doc.r60277
-	keyreader.doc.r28195
-	keystroke.doc.r17992
-	keyval2e.doc.r23698
-	keyvaltable.doc.r65416
-	kix.doc.r21606
-	knowledge.doc.r61991
-	koma-moderncvclassic.doc.r25025
-	koma-script-sfs.doc.r26137
-	komacv.doc.r57721
-	komacv-rg.doc.r49064
-	korigamik.doc.r68204
-	ktv-texdata.doc.r27369
-	l3build.doc.r69748
-	labbook.doc.r15878
-	labels.doc.r15878
-	labels4easylist.doc.r51124
-	labelschanged.doc.r69400
-	lambdax.doc.r60278
-	lastpackage.doc.r34481
-	lastpage.doc.r68557
-	latex-amsmath-dev.doc.r68730
-	latex-base-dev.doc.r68730
-	latex-bin-dev.doc.r66186
-	latex-context-ppchtex.doc.r66687
-	latex-firstaid-dev.doc.r68730
-	latex-graphics-dev.doc.r68730
-	latex-lab-dev.doc.r68730
-	latex-tools-dev.doc.r68730
-	latex-uni8.doc.r49729
-	latex2pydata.doc.r68919
-	latexcolors.doc.r49888
-	latexdemo.doc.r67201
-	latexgit.doc.r54811
-	layouts.doc.r42428
-	lazylist.doc.r17691
-	lccaps.doc.r46432
-	lcd.doc.r16549
-	lcg.doc.r31474
-	leading.doc.r15878
-	leaflet.doc.r56878
-	lebhart.doc.r68376
-	lectures.doc.r53642
-	lectureslides.doc.r62292
-	leftidx.doc.r15878
-	leftindex.doc.r69660
-	leipzig.doc.r52450
-	lengthconvert.doc.r55064
-	lettre.doc.r54722
-	lettrine.doc.r69508
-	lewis.doc.r15878
-	lhelp.doc.r23638
-	libgreek.doc.r65004
-	limap.doc.r44863
-	linegoal.doc.r21523
-	linop.doc.r41304
-	lipsum.doc.r60561
-	lisp-on-tex.doc.r38722
-	listing.doc.r17373
-	listingsutf8.doc.r53097
-	listlbls.doc.r67215
-	listliketab.doc.r15878
-	listofsymbols.doc.r16134
-	litesolution.doc.r69115
-	litetable.doc.r69678
-	lkproof.doc.r20021
-	lmake.doc.r25552
-	locality.doc.r20422
-	logbox.doc.r24499
-	logical-markup-utils.doc.r15878
-	logoetalab.doc.r68916
-	logpap.doc.r15878
-	longfbox.doc.r39028
-	longfigure.doc.r34302
-	longnamefilelist.doc.r27889
-	loops.doc.r30704
-	lsc.doc.r15878
-	lstaddons.doc.r64967
-	lstfiracode.doc.r49503
-	lt3graph.doc.r45913
-	lt3rawobjects.doc.r66619
-	ltablex.doc.r34923
-	ltabptch.doc.r17533
-	ltxdockit.doc.r21869
-	ltxguidex.doc.r50992
-	ltxkeys.doc.r28332
-	ltxnew.doc.r21586
-	ltxtools.doc.r24897
-	lua-check-hyphen.doc.r47527
-	lua-physical.doc.r59138
-	luatodonotes.doc.r53825
-	macrolist.doc.r60139
-	macroswap.doc.r31498
-	magaz.doc.r24694
-	magicnum.doc.r52983
-	magicwatermark.doc.r63656
-	mailing.doc.r15878
-	mailmerge.doc.r15878
-	makebarcode.doc.r15878
-	makebase.doc.r41012
-	makebox.doc.r15878
-	makecell.doc.r15878
-	makecirc.doc.r15878
-	makecmds.doc.r15878
-	makecookbook.doc.r49311
-	makedtx.doc.r46702
-	makeglos.doc.r15878
-	makelabels.doc.r60255
-	makerobust.doc.r52811
-	mandi.doc.r68950
-	manfnt.doc.r54684
-	manuscript.doc.r36110
-	manyind.doc.r49874
-	marginfit.doc.r48281
-	marginfix.doc.r55064
-	marginnote.doc.r68204
-	markdown.doc.r66954
-	mathalpha.doc.r61089
-	mathastext.doc.r69237
-	mathexam.doc.r15878
-	mathfam256.doc.r53519
-	mathfont.doc.r68241
-	maybemath.doc.r15878
-	mcaption.doc.r15878
-	mceinleger.doc.r15878
-	mcexam.doc.r60481
-	mcite.doc.r18173
-	mciteplus.doc.r31648
-	mdframed.doc.r31075
-	media4svg.doc.r64686
-	media9.doc.r64047
-	medstarbeamer.doc.r38828
-	meetingmins.doc.r31878
-	memexsupp.doc.r15878
-	memory.doc.r30452
-	mensa-tex.doc.r45997
-	menu.doc.r15878
-	menucard.doc.r55643
-	menukeys.doc.r64314
-	metalogox.doc.r69601
-	metanorma.doc.r55010
-	metastr.doc.r56246
-	method.doc.r17485
-	metre.doc.r18489
-	mfirstuc.doc.r64743
-	mftinc.doc.r15878
-	mi-solns.doc.r49651
-	midpage.doc.r17484
-	mindflow.doc.r65236
-	minibox.doc.r30914
-	minidocument.doc.r43752
-	minifp.doc.r32559
-	minimalist.doc.r68552
-	minipage-marginpar.doc.r15878
-	minitoc.doc.r61719
-	minorrevision.doc.r32165
-	minutes.doc.r42186
-	mla-paper.doc.r54080
-	mleftright.doc.r53021
-	mlist.doc.r15878
-	mmap.doc.r15878
-	mnotes.doc.r63406
-	moderncv.doc.r62128
-	modernposter.doc.r47269
-	moderntimeline.doc.r55518
-	modref.doc.r15878
-	modroman.doc.r29803
-	modular.doc.r44142
-	moloch.doc.r69579
-	monofill.doc.r28140
-	moodle.doc.r65672
-	moreenum.doc.r24479
-	morefloats.doc.r37927
-	morehype.doc.r38815
-	moresize.doc.r17513
-	moreverb.doc.r22126
-	morewrites.doc.r69679
-	movement-arrows.doc.r67270
-	movie15.doc.r26473
-	mparhack.doc.r59066
-	mpostinl.doc.r49559
-	msc.doc.r67718
-	msg.doc.r49578
-	mslapa.doc.r54080
-	mtgreek.doc.r17967
-	multenum.doc.r21775
-	multiaudience.doc.r60688
-	multibbl.doc.r15878
-	multicap.doc.r15878
-	multicolrule.doc.r56366
-	multidef.doc.r40637
-	multienv.doc.r64967
-	multiexpand.doc.r45943
-	multifootnote.doc.r63456
-	multilang.doc.r49065
-	multiple-choice.doc.r63722
-	multirow.doc.r58396
-	mversion.doc.r29370
-	mwe.doc.r64967
-	mycv.doc.r26807
-	mylatex.doc.r56751
-	mylatexformat.doc.r21392
-	nag.doc.r24741
-	nameauth.doc.r69758
-	namespc.doc.r15878
-	ncclatex.doc.r15878
-	ncctools.doc.r51810
-	needspace.doc.r29601
-	newcommand.doc.r18704
-	newenviron.doc.r29331
-	newfile.doc.r15878
-	newlfm.doc.r15878
-	newspaper.doc.r15878
-	newunicodechar.doc.r47382
-	newvbtm.doc.r23996
-	newverbs.doc.r64833
-	nfssext-cfr.doc.r43640
-	nicefilelist.doc.r65842
-	niceframe.doc.r36086
-	nicetext.doc.r38914
-	nidanfloat.doc.r48295
-	ninecolors.doc.r62006
-	nlctdoc.doc.r68448
-	noconflict.doc.r30140
-	noindentafter.doc.r59195
-	noitcrul.doc.r15878
-	nolbreaks.doc.r26786
-	nomencl.doc.r61029
-	nomentbl.doc.r16549
-	non-decimal-units.doc.r69742
-	nonfloat.doc.r17598
-	nonumonpart.doc.r22114
-	nopageno.doc.r18128
-	normalcolor.doc.r40125
-	notebeamer.doc.r68871
-	notes.doc.r42428
-	notespages.doc.r41906
-	notestex.doc.r45396
-	notoccite.doc.r18129
-	nowidow.doc.r24066
-	nox.doc.r30991
-	ntheorem.doc.r27609
-	numberedblock.doc.r33109
-	numname.doc.r18130
-	numprint.doc.r27498
-	numspell.doc.r61132
-	ocg-p.doc.r28803
-	ocgx.doc.r54512
-	ocgx2.doc.r65292
-	ocr-latex.doc.r15878
-	octavo.doc.r15878
-	oldstyle.doc.r15878
-	onlyamsmath.doc.r42927
-	opcit.doc.r15878
-	opencolor.doc.r66363
-	optidef.doc.r50941
-	optional.doc.r18131
-	options.doc.r39030
-	orcidlink.doc.r69253
-	orientation.doc.r57390
-	outline.doc.r18360
-	outliner.doc.r21095
-	outlines.doc.r25192
-	outlining.doc.r45601
-	overlays.doc.r57866
-	overpic.doc.r69343
-	padcount.doc.r47621
-	pagecolor.doc.r66885
-	pagecont.doc.r15878
-	pagegrid.doc.r64470
-	pagelayout.doc.r69486
-	pagenote.doc.r63708
-	pagerange.doc.r16915
-	pageslts.doc.r39164
-	palette.doc.r60119
-	pangram.doc.r66300
-	paper.doc.r34521
-	papercdcase.doc.r15878
-	papermas.doc.r66835
-	papertex.doc.r19230
-	paracol.doc.r49560
-	parades.doc.r40042
-	paralist.doc.r43021
-	paresse.doc.r59228
-	parnotes.doc.r51720
-	parsa.doc.r54840
-	parselines.doc.r21475
-	pas-cours.doc.r55859
-	pas-cv.doc.r32263
-	pas-tableur.doc.r66860
-	patchcmd.doc.r41379
-	pauldoc.doc.r16005
-	pawpict.doc.r21629
-	pbalance.doc.r67201
-	pbox.doc.r24807
-	pbsheet.doc.r24830
-	pdf14.doc.r17583
-	pdfannotations.doc.r68958
-	pdfcol.doc.r64469
-	pdfcolmk.doc.r52912
-	pdfcomment.doc.r49047
-	pdfcprot.doc.r18735
-	pdfmarginpar.doc.r23492
-	pdfoverlay.doc.r64210
-	pdfpagediff.doc.r37946
-	pdfpc.doc.r68610
-	pdfpc-movie.doc.r67201
-	pdfprivacy.doc.r45985
-	pdfrender.doc.r69058
-	pdfreview.doc.r50100
-	pdfscreen.doc.r42428
-	pdfslide.doc.r15878
-	pdfsync.doc.r20373
-	pdfwin.doc.r68667
-	pdfx.doc.r50338
-	pecha.doc.r15878
-	perltex.doc.r52162
-	permute.doc.r15878
-	petiteannonce.doc.r25915
-	pgfmath-xfp.doc.r59268
-	phfcc.doc.r60731
-	phfextendedabstract.doc.r60732
-	phffullpagefigure.doc.r41857
-	phfnote.doc.r60733
-	phfparen.doc.r41859
-	phfqit.doc.r60734
-	phfquotetext.doc.r41869
-	phfsvnwatermark.doc.r41870
-	phfthm.doc.r60735
-	philex.doc.r36396
-	phonenumbers.doc.r63774
-	photo.doc.r18739
-	photobook.doc.r68313
-	picture.doc.r54867
-	piff.doc.r21894
-	pkgloader.doc.r47486
-	placeins.doc.r19848
-	plantslabels.doc.r29803
-	plates.doc.r15878
-	plweb.doc.r15878
-	pmboxdraw.doc.r53046
-	polynom.doc.r44832
-	polynomial.doc.r15878
-	polytable.doc.r55837
-	postcards.doc.r21641
-	poster-mac.doc.r18305
-	postnotes.doc.r69102
-	powerdot.doc.r59272
-	ppr-prv.doc.r15878
-	ppt-slides.doc.r69568
-	practicalreports.doc.r52312
-	precattl.doc.r63967
-	prelim2e.doc.r57000
-	preprint.doc.r30447
-	pressrelease.doc.r35147
-	prettyref.doc.r15878
-	prettytok.doc.r66884
-	preview.doc.r69470
-	printlen.doc.r19847
-	probsoln.doc.r44783
-	profmaquette.doc.r69526
-	program.doc.r44214
-	progress.doc.r19519
-	progressbar.doc.r33822
-	projlib.doc.r69689
-	proofread.doc.r61719
-	properties.doc.r15878
-	prosper.doc.r33033
-	protex.doc.r41633
-	protocol.doc.r25562
-	psfragx.doc.r26243
-	pstool.doc.r46393
-	pstring.doc.r42857
-	pxgreeks.doc.r21838
-	pygmentex.doc.r64131
-	python.doc.r60162
-	pythonimmediate.doc.r69487
-	q-and-a.doc.r69164
-	qcm.doc.r63833
-	qstest.doc.r15878
-	qsymbols.doc.r15878
-	quicktype.doc.r42183
-	quiz2socrative.doc.r52276
-	quotchap.doc.r56926
-	quoting.doc.r32818
-	quotmark.doc.r15878
-	ran_toks.doc.r59515
-	randexam.doc.r69690
-	randtext.doc.r15878
-	rccol.doc.r15878
-	rcs-multi.doc.r64967
-	rcsinfo.doc.r15878
-	readablecv.doc.r67986
-	readarray.doc.r60540
-	realboxes.doc.r64967
-	recipe.doc.r54080
-	recipebook.doc.r37026
-	recipecard.doc.r15878
-	rectopma.doc.r19980
-	refcheck.doc.r29128
-	refenums.doc.r44131
-	reflectgraphics.doc.r40612
-	refman.doc.r15878
-	refstyle.doc.r69680
-	regcount.doc.r19979
-	regexpatch.doc.r58668
-	register.doc.r54485
-	regstats.doc.r66795
-	relenc.doc.r22050
-	relsize.doc.r30707
-	repeatindex.doc.r24305
-	repltext.doc.r56433
-	rescansync.doc.r63856
-	resmes.doc.r65375
-	responsive.doc.r69147
-	returntogrid.doc.r48485
-	rgltxdoc.doc.r53858
-	rjlparshap.doc.r15878
-	rlepsf.doc.r19082
-	rmpage.doc.r54080
-	robust-externalize.doc.r69459
-	robustcommand.doc.r15878
-	robustindex.doc.r49877
-	romanbar.doc.r25005
-	romanbarpagenumber.doc.r36236
-	romanneg.doc.r20087
-	romannum.doc.r15878
-	rorlink.doc.r67461
-	rotfloat.doc.r18292
-	rotpages.doc.r18740
-	roundbox.doc.r29675
-	rterface.doc.r30084
-	rtkinenc.doc.r20003
-	rulerbox.doc.r50984
-	rulercompass.doc.r32392
-	runcode.doc.r69471
-	rvwrite.doc.r19614
-	sanitize-umlaut.doc.r67126
-	sauerj.doc.r15878
-	saveenv.doc.r65346
-	savefnmark.doc.r15878
-	savetrees.doc.r40525
-	scale.doc.r15878
-	scalebar.doc.r15878
-	scalerel.doc.r42809
-	scanpages.doc.r42633
-	schedule.doc.r51805
-	schooldocs.doc.r69659
-	scontents.doc.r62902
-	scrambledenvs.doc.r60615
-	scrlayer-fancyhdr.doc.r63844
-	scrlttr2copy.doc.r56733
-	scrwfile.doc.r66872
-	sdaps.doc.r65345
-	sdrt.doc.r15878
-	secdot.doc.r20208
-	secnum.doc.r61813
-	sectionbox.doc.r37749
-	sectionbreak.doc.r50339
-	sectsty.doc.r15878
-	seealso.doc.r43595
-	selectp.doc.r20185
-	selinput.doc.r53098
-	semantex.doc.r65679
-	semantic.doc.r15878
-	semantic-markup.doc.r53607
-	semesterplanner.doc.r56841
-	semioneside.doc.r15878
-	semproc.doc.r37568
-	semtex.doc.r56530
-	sepfootnotes.doc.r41732
-	seqsplit.doc.r15878
-	sesstime.doc.r49750
-	setspaceenhanced.doc.r68493
-	sf298.doc.r41653
-	sffms.doc.r15878
-	shadethm.doc.r53350
-	shadow.doc.r20312
-	shadowtext.doc.r26522
-	shapepar.doc.r69343
-	shdoc.doc.r41991
-	shipunov.doc.r52334
-	shorttoc.doc.r15878
-	show2e.doc.r15878
-	showcharinbox.doc.r29803
-	showdim.doc.r28918
-	showexpl.doc.r57414
-	showlabels.doc.r63940
-	sidecap.doc.r65618
-	sidenotes.doc.r54524
-	sidenotesplus.doc.r69176
-	silence.doc.r27028
-	sillypage.doc.r66349
-	sim-os-menus.doc.r68843
-	simplecd.doc.r29260
-	simplecv.doc.r35537
-	simpleinvoice.doc.r45673
-	simplivre.doc.r68376
-	sitem.doc.r22136
-	skb.doc.r22781
-	skdoc.doc.r56950
-	skeldoc.doc.r57922
-	skeycommand.doc.r24652
-	skeyval.doc.r30560
-	skills.doc.r56734
-	skrapport.doc.r52412
-	slantsc.doc.r25007
-	smalltableof.doc.r20333
-	smart-eqn.doc.r61719
-	smartref.doc.r20311
-	smartunits.doc.r39592
-	snapshot.doc.r56735
-	snaptodo.doc.r61155
-	snotez.doc.r61992
-	soulpos.doc.r60772
-	spacingtricks.doc.r69048
-	spark-otf.doc.r62481
-	sparklines.doc.r42821
-	sphack.doc.r20842
-	splitindex.doc.r39766
-	spot.doc.r22408
-	spotcolor.doc.r15878
-	spreadtab.doc.r68256
-	spverbatim.doc.r15878
-	srbook-mem.doc.r45818
-	srcltx.doc.r15878
-	sseq.doc.r31585
-	sslides.doc.r32293
-	stackengine.doc.r60019
-	standalone.doc.r64677
-	starray.doc.r69002
-	stdclsdv.doc.r15878
-	stdpage.doc.r15878
-	stealcaps.doc.r64967
-	stex.doc.r68569
-	storebox.doc.r64967
-	storecmd.doc.r24431
-	stringstrings.doc.r57097
-	sttools.doc.r60736
-	stubs.doc.r69128
-	studenthandouts.doc.r43516
-	styledcmd.doc.r65262
-	subdepth.doc.r15878
-	subdocs.doc.r51480
-	subeqn.doc.r15878
-	subeqnarray.doc.r15878
-	subfigmat.doc.r20308
-	subfigure.doc.r15878
-	subfiles.doc.r56977
-	subfloat.doc.r29349
-	substr.doc.r16117
-	supertabular.doc.r53658
-	suppose.doc.r59281
-	svg.doc.r57010
-	svgcolor.doc.r15878
-	svn.doc.r15878
-	svn-multi.doc.r64967
-	svn-prov.doc.r64967
-	svninfo.doc.r62157
-	swfigure.doc.r63255
-	swungdash.doc.r64204
-	syntax.doc.r15878
-	syntrace.doc.r15878
-	synttree.doc.r16252
-	tabbing.doc.r59715
-	tabfigures.doc.r25202
-	tableaux.doc.r42413
-	tablefootnote.doc.r32804
-	tableof.doc.r59837
-	tablists.doc.r15878
-	tabls.doc.r17255
-	tablvar.doc.r69212
-	tabstackengine.doc.r46848
-	tabto-ltx.doc.r54080
-	tabu.doc.r61719
-	tabularborder.doc.r17885
-	tabularcalc.doc.r15878
-	tabularew.doc.r15878
-	tabularray.doc.r66276
-	tabulary.doc.r34368
-	tagging.doc.r52064
-	tagpair.doc.r42138
-	tagpdf.doc.r69703
-	talk.doc.r42428
-	tamefloats.doc.r27345
-	tangocolors.doc.r66733
-	tasks.doc.r61541
-	tcldoc.doc.r22018
-	tcolorbox.doc.r69370
-	tdclock.doc.r33043
-	technics.doc.r29349
-	ted.doc.r15878
-	templatetools.doc.r67201
-	termcal.doc.r22514
-	termlist.doc.r18923
-	termsim.doc.r61414
-	testhyphens.doc.r38928
-	testidx.doc.r60966
-	tex-label.doc.r16372
-	tex-locale.doc.r48500
-	texmate.doc.r15878
-	texments.doc.r15878
-	texpower.doc.r29349
-	texshade.doc.r69371
-	texsurgery.doc.r59885
-	textcsc.doc.r67193
-	textfit.doc.r20591
-	textmerg.doc.r20677
-	textpos.doc.r63967
-	textualicomma.doc.r67201
-	texvc.doc.r46844
-	theoremref.doc.r54512
-	thinsp.doc.r39669
-	thmtools.doc.r67018
-	threadcol.doc.r28754
-	threeparttable.doc.r17383
-	threeparttablex.doc.r34206
-	thumb.doc.r16549
-	thumbs.doc.r33134
-	thumby.doc.r16736
-	ticket.doc.r42280
-	tipauni.doc.r65817
-	titlecaps.doc.r63020
-	titlepic.doc.r43497
-	titleref.doc.r18729
-	titlesec.doc.r68677
-	titling.doc.r15878
-	to-be-determined.doc.r64882
-	tocbibind.doc.r20085
-	tocdata.doc.r69512
-	tocloft.doc.r53364
-	tocvsec2.doc.r33146
-	todo.doc.r17746
-	todonotes.doc.r69319
-	tokcycle.doc.r60320
-	tokenizer.doc.r15878
-	toolbox.doc.r32260
-	topfloat.doc.r19084
-	topiclongtable.doc.r54758
-	totalcount.doc.r67201
-	totcount.doc.r21178
-	totpages.doc.r15878
-	tramlines.doc.r65692
-	translations.doc.r61896
-	transparent.doc.r64852
-	trfsigns.doc.r15878
-	trimspaces.doc.r15878
-	trivfloat.doc.r15878
-	trsym.doc.r18732
-	truncate.doc.r18921
-	tucv.doc.r20680
-	turnthepage.doc.r29803
-	tutodoc.doc.r69343
-	twoinone.doc.r17024
-	twoup.doc.r15878
-	txgreeks.doc.r21839
-	type1cm.doc.r21820
-	typed-checklist.doc.r63445
-	typeface.doc.r27046
-	typoaid.doc.r44238
-	typogrid.doc.r24994
-	uassign.doc.r38459
-	ucs.doc.r68759
-	uebungsblatt.doc.r15878
-	umoline.doc.r19085
-	underlin.doc.r15878
-	underoverlap.doc.r29019
-	undolabl.doc.r65846
-	uni-titlepage.doc.r68917
-	unicode-math-input.doc.r69591
-	unicodefonttable.doc.r67066
-	unifront.doc.r67054
-	unisc.doc.r63178
-	unitconv.doc.r55060
-	units.doc.r42428
-	unravel.doc.r69308
-	updatemarks.doc.r68163
-	upmethodology.doc.r64613
-	upquote.doc.r26059
-	uri.doc.r48602
-	ushort.doc.r32261
-	uspace.doc.r63123
-	utf8add.doc.r61074
-	uwmslide.doc.r27354
-	variablelm.doc.r60014
-	varindex.doc.r32262
-	varsfromjobname.doc.r44154
-	varwidth.doc.r24104
-	vcell.doc.r59039
-	vdmlisting.doc.r56905
-	verbasef.doc.r21922
-	verbatimbox.doc.r67865
-	verbatimcopy.doc.r15878
-	verbdef.doc.r17177
-	verbments.doc.r23670
-	verifiche.doc.r69726
-	verifycommand.doc.r69389
-	version.doc.r21920
-	versions.doc.r21921
-	versonotes.doc.r69249
-	vertbars.doc.r49429
-	vgrid.doc.r32457
-	vhistory.doc.r61719
-	vmargin.doc.r15878
-	volumes.doc.r15878
-	vpe.doc.r26039
-	vruler.doc.r21598
-	vtable.doc.r51126
-	vwcol.doc.r36254
-	wallcalendar.doc.r45568
-	wallpaper.doc.r15878
-	warning.doc.r66616
-	warpcol.doc.r15878
-	was.doc.r64691
-	webquiz.doc.r58808
-	widetable.doc.r53409
-	widows-and-orphans.doc.r66753
-	williams.doc.r15878
-	willowtreebook.doc.r60638
-	withargs.doc.r52641
-	wordcount.doc.r46165
-	wordlike.doc.r15878
-	worksheet.doc.r48423
-	wrapfig.doc.r61719
-	wrapfig2.doc.r69513
-	wrapstuff.doc.r64058
-	writeongrid.doc.r68863
-	wtref.doc.r69214
-	xargs.doc.r15878
-	xassoccnt.doc.r61112
-	xbmks.doc.r53448
-	xcntperchap.doc.r54080
-	xcolor-material.doc.r42289
-	xcolor-solarized.doc.r61719
-	xcomment.doc.r20031
-	xcookybooky.doc.r36435
-	xcpdftips.doc.r50449
-	xdoc.doc.r15878
-	xellipsis.doc.r47546
-	xfakebold.doc.r68929
-	xfor.doc.r15878
-	xhfill.doc.r22575
-	xifthen.doc.r38929
-	xint.doc.r63562
-	xkcdcolors.doc.r67895
-	xkeymask.doc.r69223
-	xltabular.doc.r56855
-	xmpincl.doc.r60593
-	xnewcommand.doc.r15878
-	xoptarg.doc.r15878
-	xpatch.doc.r54563
-	xpeek.doc.r61719
-	xprintlen.doc.r35928
-	xpunctuate.doc.r67918
-	xsavebox.doc.r64049
-	xsim.doc.r61988
-	xstring.doc.r68015
-	xtab.doc.r23347
-	xurl.doc.r61553
-	xwatermark.doc.r61719
-	xytree.doc.r15878
-	yafoot.doc.r48568
-	yagusylo.doc.r29803
-	yaletter.doc.r42830
-	ycbook.doc.r46201
-	ydoc.doc.r64887
-	yplan.doc.r34398
-	zebra-goodies.doc.r66630
-	zed-csp.doc.r17258
-	zennote.doc.r65549
-	ziffer.doc.r32279
-	zref.doc.r68278
-	zref-check.doc.r68846
-	zref-clever.doc.r68846
-	zref-vario.doc.r68846
-	zwgetfdate.doc.r15878
-	zwpagelayout.doc.r63074
-"
-TEXLIVE_MODULE_SRC_CONTENTS="
-	abspos.source.r64465
-	abstract.source.r15878
-	accessibility.source.r55777
-	accsupp.source.r53052
-	achemso.source.r69638
-	acronym.source.r54758
-	acroterm.source.r61719
-	actuarialangle.source.r67201
-	actuarialsymbol.source.r67201
-	addlines.source.r49326
-	adjmulticol.source.r63320
-	adjustbox.source.r64967
-	adrconv.source.r46817
-	alertmessage.source.r38055
-	alnumsec.source.r15878
-	alphalph.source.r53087
-	altfont.source.r15878
-	altsubsup.source.r62738
-	amsaddr.source.r64357
-	animate.source.r67401
-	answers.source.r35032
-	appendix.source.r53718
-	apptools.source.r28400
-	arcs.source.r15878
-	arraycols.source.r68277
-	arraysort.source.r31576
-	arydshln.source.r50084
-	asciilist.source.r49060
-	askinclude.source.r54725
-	atenddvi.source.r56922
-	atendofenv.source.r62164
-	attachfile.source.r42099
-	autonum.source.r36084
-	autopdf.source.r32377
-	avremu.source.r35373
-	axessibility.source.r57105
-	background.source.r42428
-	basicarith.source.r35460
-	beamerappendixnote.source.r55732
-	beamercolorthemeowl.source.r40105
-	beamersubframe.source.r23510
-	beamertheme-cuerna.source.r42161
-	beamertheme-metropolis.source.r43031
-	beamertheme-saintpetersburg.source.r45877
-	beamertheme-trigon.source.r65985
-	bearwear.source.r54826
-	beton.source.r15878
-	bewerbung.source.r61632
-	bez123.source.r15878
-	bigfoot.source.r38248
-	bithesis.source.r68634
-	bizcard.source.r15878
-	blindtext.source.r25039
-	blowup.source.r67640
-	bnumexpr.source.r59244
-	boites.source.r32235
-	bookcover.source.r65394
-	booklet.source.r15878
-	bookshelf.source.r55475
-	boolexpr.source.r17830
-	bophook.source.r17062
-	boxedminipage.source.r54827
-	boxhandler.source.r28031
-	breakurl.source.r29901
-	bubblesort.source.r56070
-	bullcntr.source.r15878
-	calcage.source.r27725
-	calculator.source.r64424
-	cals.source.r43003
-	canoniclayout.source.r64889
-	capt-of.source.r29803
-	captcont.source.r15878
-	catchfile.source.r53084
-	catchfilebetweentags.source.r21476
-	catechis.source.r59998
-	ccaption.source.r23443
-	cclicenses.source.r15878
-	cd.source.r34452
-	cd-cover.source.r17121
-	cdcmd.source.r60742
-	cdpbundl.source.r61719
-	cellprops.source.r67201
-	centerlastline.source.r56644
-	changebar.source.r69367
-	changepage.source.r15878
-	changes.source.r67201
-	chappg.source.r15878
-	chapterfolder.source.r15878
-	cheatsheet.source.r45069
-	chextras.source.r27118
-	childdoc.source.r49543
-	chletter.source.r20060
-	circ.source.r62977
-	classpack.source.r55218
-	clefval.source.r55985
-	cleveref.source.r61719
-	cleveref-usedon.source.r66915
-	clicks.source.r64602
-	clistmap.source.r61811
-	clrdblpg.source.r47511
-	clrstrip.source.r60363
-	cmdtrack.source.r28910
-	codepage.source.r51502
-	codesection.source.r34481
-	collcell.source.r64967
-	collectbox.source.r64967
-	colophon.source.r47913
-	color-edits.source.r56707
-	colordoc.source.r18270
-	colorwav.source.r67012
-	colorweb.source.r31490
-	combine.source.r19361
-	commado.source.r38875
-	commedit.source.r50116
-	competences.source.r47573
-	constants.source.r15878
-	continue.source.r49449
-	contour.source.r18950
-	contracard.source.r67201
-	conv-xkv.source.r43558
-	cooking.source.r15878
-	cooking-units.source.r65241
-	cool.source.r67013
-	coollist.source.r67048
-	coolstr.source.r67015
-	coolthms.source.r29062
-	cooltooltips.source.r60201
-	coop-writing.source.r61607
-	coordsys.source.r15878
-	copyedit.source.r37928
-	counterz.source.r67335
-	counttexruns.source.r27576
-	coverpage.source.r63509
-	cprotect.source.r21209
-	crossreference.source.r15878
-	crumbs.source.r64602
-	csvmerge.source.r51857
-	cuisine.source.r34453
-	currency.source.r48990
-	currfile.source.r64673
-	currvita.source.r15878
-	cutwin.source.r60901
-	cyber.source.r46776
-	cybercic.source.r37659
-	darkmode.source.r64271
-	dashbox.source.r23425
-	dashrule.source.r29579
-	dashundergaps.source.r58150
-	datatool.source.r52663
-	datax.source.r61772
-	dateiliste.source.r27974
-	datenumber.source.r61761
-	datestamp.source.r61719
-	datetime.source.r36650
-	datetime2.source.r63102
-	datetime2-bahasai.source.r46287
-	datetime2-basque.source.r47064
-	datetime2-breton.source.r52647
-	datetime2-bulgarian.source.r47031
-	datetime2-catalan.source.r47032
-	datetime2-croatian.source.r36682
-	datetime2-czech.source.r47033
-	datetime2-danish.source.r47034
-	datetime2-dutch.source.r47355
-	datetime2-en-fulltext.source.r36705
-	datetime2-english.source.r52479
-	datetime2-esperanto.source.r47356
-	datetime2-estonian.source.r47565
-	datetime2-finnish.source.r47047
-	datetime2-french.source.r56393
-	datetime2-galician.source.r47631
-	datetime2-german.source.r67201
-	datetime2-greek.source.r47533
-	datetime2-hebrew.source.r47534
-	datetime2-icelandic.source.r65213
-	datetime2-irish.source.r47632
-	datetime2-it-fulltext.source.r54779
-	datetime2-italian.source.r37146
-	datetime2-latin.source.r47748
-	datetime2-lsorbian.source.r47749
-	datetime2-magyar.source.r48266
-	datetime2-norsk.source.r48267
-	datetime2-polish.source.r48456
-	datetime2-portuges.source.r48457
-	datetime2-romanian.source.r56394
-	datetime2-russian.source.r49345
-	datetime2-samin.source.r49346
-	datetime2-scottish.source.r52101
-	datetime2-serbian.source.r67201
-	datetime2-slovak.source.r52281
-	datetime2-slovene.source.r52282
-	datetime2-spanish.source.r45785
-	datetime2-swedish.source.r36700
-	datetime2-turkish.source.r52331
-	datetime2-ukrainian.source.r47552
-	datetime2-usorbian.source.r52375
-	datetime2-welsh.source.r52553
-	dbshow.source.r61634
-	debate.source.r64846
-	decimal.source.r23374
-	decimalcomma.source.r69251
-	decorule.source.r55230
-	defoldfonts.source.r68234
-	delimtxt.source.r16549
-	denisbdoc.source.r66137
-	diagbox.source.r54080
-	dialogl.source.r28946
-	dimnum.source.r58774
-	dinbrief.source.r15878
-	dirtytalk.source.r20520
-	dnaseq.source.r17194
-	doclicense.source.r68441
-	docmfp.source.r15878
-	docmute.source.r25741
-	docshots.source.r69676
-	doctools.source.r34474
-	documentation.source.r34521
-	dotarrow.source.r15878
-	dotseqn.source.r17195
-	download.source.r52257
-	dox.source.r46011
-	dprogress.source.r15878
-	drac.source.r15878
-	draftcopy.source.r15878
-	draftwatermark.source.r57099
-	dtxdescribe.source.r69507
-	ducksay.source.r64655
-	duckuments.source.r52271
-	dynamicnumber.source.r38726
-	easybook.source.r69747
-	easyfig.source.r64967
-	easyfloats.source.r57204
-	easyreview.source.r38352
-	ebezier.source.r15878
-	ecclesiastic.source.r38172
-	econlipsum.source.r58390
-	ecv.source.r24928
-	ed.source.r25231
-	edmargin.source.r27599
-	eemeir.source.r15878
-	efbox.source.r33236
-	egplot.source.r20617
-	ellipsis.source.r55418
-	elmath.source.r15878
-	elocalloc.source.r42712
-	elzcards.source.r51894
-	emarks.source.r24504
-	embedall.source.r51177
-	embedfile.source.r65528
-	emo.source.r66944
-	emptypage.source.r18064
-	endfloat.source.r57090
-	endheads.source.r43750
-	endnotes-hy.source.r54758
-	engpron.source.r16558
-	engrec.source.r15878
-	enumitem-zref.source.r21472
-	environ.source.r56615
-	envlab.source.r61937
-	epigraph.source.r54857
-	epiolmec.source.r15878
-	eq-pin2corr.source.r59477
-	eqlist.source.r32257
-	eqnalign.source.r43278
-	eqparbox.source.r45215
-	errata.source.r42428
-	erw-l3.source.r61799
-	esdiff.source.r21385
-	esieecv.source.r59638
-	esint.source.r52240
-	etaremune.source.r15878
-	etextools.source.r20694
-	etl.source.r60998
-	etoc.source.r69343
-	eukdate.source.r15878
-	everyhook.source.r35675
-	everypage.source.r56694
-	exam-n.source.r64674
-	examdesign.source.r15878
-	examz.source.r67303
-	exercise.source.r35417
-	exercises.source.r55188
-	exesheet.source.r69688
-	exframe.source.r53911
-	exp-testopt.source.r15878
-	expdlist.source.r15878
-	export.source.r27206
-	exsol.source.r69343
-	extract.source.r52117
-	facsimile.source.r21328
-	factura.source.r61697
-	fail-fast.source.r67543
-	familytree.source.r63739
-	fancylabel.source.r46736
-	fancynum.source.r15878
-	fancypar.source.r58895
-	fancytabs.source.r41549
-	fancytooltips.source.r68931
-	fcolumn.source.r67729
-	fetchcls.source.r45245
-	fewerfloatpages.source.r58058
-	ffcode.source.r69706
-	fgruler.source.r63721
-	fifo-stack.source.r33288
-	filecontents.source.r66740
-	filecontentsdef.source.r52208
-	filedate.source.r29529
-	fileinfo.source.r28421
-	fink.source.r24329
-	finstrut.source.r21719
-	fistrum.source.r66461
-	fithesis.source.r64135
-	fixcmex.source.r51825
-	fixme.source.r63708
-	fixmetodonotes.source.r30168
-	flabels.source.r17272
-	flagderiv.source.r15878
-	flashcards.source.r62104
-	flexipage.source.r66614
-	flippdf.source.r56782
-	floatbytocbasic.source.r67945
-	floatflt.source.r25540
-	floatrow.source.r15878
-	floatrowbytocbasic.source.r67946
-	flowfram.source.r35291
-	fmp.source.r15878
-	fmtcount.source.r53912
-	fnbreak.source.r66615
-	fnumprint.source.r29173
-	foilhtml.source.r61937
-	fontaxes.source.r55920
-	fontsize.source.r60161
-	fonttable.source.r44799
-	footmisc.source.r69729
-	footmisx.source.r42621
-	footnoterange.source.r66149
-	footnpag.source.r15878
-	forarray.source.r15878
-	foreign.source.r27819
-	forloop.source.r67017
-	forms16be.source.r51305
-	formular.source.r15878
-	frankenstein.source.r15878
-	froufrou.source.r67201
-	ftnxtra.source.r29652
-	fullblck.source.r25434
-	fullminipage.source.r34545
-	fundus-calligra.source.r26018
-	fundus-sueterlin.source.r26030
-	fvextra.source.r69001
-	g-brief.source.r50415
-	gatherenum.source.r67201
-	gcite.source.r15878
-	gender.source.r36464
-	genmpage.source.r15878
-	gensymb.source.r64740
-	getitems.source.r39365
-	ginpenc.source.r24980
-	gitfile-info.source.r51928
-	gitstatus.source.r64662
-	glossaries-danish.source.r35665
-	glossaries-dutch.source.r35685
-	glossaries-english.source.r35665
-	glossaries-estonian.source.r49928
-	glossaries-extra.source.r68409
-	glossaries-finnish.source.r54080
-	glossaries-french.source.r42873
-	glossaries-german.source.r35665
-	glossaries-irish.source.r35665
-	glossaries-italian.source.r35665
-	glossaries-magyar.source.r35665
-	glossaries-norsk.source.r67141
-	glossaries-nynorsk.source.r67201
-	glossaries-polish.source.r35665
-	glossaries-portuges.source.r36064
-	glossaries-serbian.source.r35665
-	glossaries-slovene.source.r51211
-	glossaries-spanish.source.r35665
-	gmdoc-enhance.source.r15878
-	grabbox.source.r65223
-	grading-scheme.source.r62505
-	graphbox.source.r46360
-	graphicscache.source.r65318
-	graphicx-psmin.source.r56931
-	graphicxbox.source.r32630
-	graphpaper.source.r63116
-	grayhints.source.r49052
-	grid.source.r61719
-	gridpapers.source.r58723
-	gridset.source.r53762
-	gs1.source.r59620
-	guitlogo.source.r55741
-	ha-prosper.source.r59651
-	halloweenmath.source.r52602
-	handoutwithnotes.source.r62140
-	hanging.source.r15878
-	hardwrap.source.r21396
-	hc.source.r15878
-	hep-acronym.source.r67632
-	hep-float.source.r67632
-	hep-math.source.r67632
-	hep-text.source.r67632
-	hep-title.source.r67632
-	hhtensor.source.r54080
-	histogr.source.r15878
-	hitreport.source.r58357
-	hpsdiss.source.r15878
-	href-ul.source.r69359
-	hrefhide.source.r66189
-	huawei.source.r68336
-	hypdoc.source.r68661
-	hyper.source.r17357
-	hyperbar.source.r48147
-	hyperxmp.source.r68251
-	hyphenat.source.r15878
-	idxlayout.source.r25821
-	iexec.source.r69420
-	ifallfalse.source.r60027
-	iffont.source.r38823
-	ifmtarg.source.r47544
-	ifnextok.source.r23379
-	ifoddpage.source.r64967
-	iitem.source.r29613
-	imakeidx.source.r42287
-	indextools.source.r68555
-	inlinedef.source.r15878
-	inputenx.source.r52986
-	inputtrc.source.r28019
-	interfaces.source.r21474
-	intopdf.source.r63987
-	inversepath.source.r15878
-	invoice2.source.r67327
-	iso.source.r15878
-	iso10303.source.r15878
-	isodate.source.r16613
-	isodoc.source.r59709
-	isorot.source.r15878
-	isosafety.source.r68801
-	isotope.source.r23711
-	issuulinks.source.r25742
-	iwonamath.source.r68144
-	jmsdelim.source.r62630
-	jvlisting.source.r24638
-	kalendarium.source.r48744
-	kantlipsum.source.r68983
-	kerntest.source.r15878
-	keycommand.source.r18042
-	keyfloat.source.r69399
-	keyindex.source.r50828
-	keyparse.source.r60277
-	keyvaltable.source.r65416
-	knowledge.source.r61991
-	komacv.source.r57721
-	komacv-rg.source.r49064
-	ktv-texdata.source.r27369
-	l3build.source.r69748
-	labbook.source.r15878
-	labels.source.r15878
-	labelschanged.source.r69400
-	lambdax.source.r60278
-	lastpackage.source.r34481
-	lastpage.source.r68557
-	latex-amsmath-dev.source.r68730
-	latex-base-dev.source.r68730
-	latex-firstaid-dev.source.r68730
-	latex-graphics-dev.source.r68730
-	latex-lab-dev.source.r68730
-	latex-tools-dev.source.r68730
-	latex2pydata.source.r68919
-	latexcolors.source.r49888
-	latexdemo.source.r67201
-	latexgit.source.r54811
-	layouts.source.r42428
-	lccaps.source.r46432
-	lcd.source.r16549
-	lcg.source.r31474
-	leading.source.r15878
-	leaflet.source.r56878
-	leftidx.source.r15878
-	leipzig.source.r52450
-	lengthconvert.source.r55064
-	lettrine.source.r69508
-	lhelp.source.r23638
-	libgreek.source.r65004
-	limap.source.r44863
-	linegoal.source.r21523
-	lipsum.source.r60561
-	listingsutf8.source.r53097
-	listlbls.source.r67215
-	listliketab.source.r15878
-	listofsymbols.source.r16134
-	lmake.source.r25552
-	locality.source.r20422
-	logbox.source.r24499
-	logpap.source.r15878
-	longfigure.source.r34302
-	longnamefilelist.source.r27889
-	lstaddons.source.r64967
-	lt3rawobjects.source.r66619
-	ltxnew.source.r21586
-	luatodonotes.source.r53825
-	macrolist.source.r60139
-	macroswap.source.r31498
-	magicnum.source.r52983
-	magicwatermark.source.r63656
-	mailing.source.r15878
-	mailmerge.source.r15878
-	makebase.source.r41012
-	makebox.source.r15878
-	makecell.source.r15878
-	makecmds.source.r15878
-	makedtx.source.r46702
-	makelabels.source.r60255
-	mandi.source.r68950
-	manfnt.source.r54684
-	manuscript.source.r36110
-	marginfit.source.r48281
-	marginfix.source.r55064
-	marginnote.source.r68204
-	markdown.source.r66954
-	mathastext.source.r69237
-	mathexam.source.r15878
-	mathfont.source.r68241
-	mcaption.source.r15878
-	mcite.source.r18173
-	mdframed.source.r31075
-	media9.source.r64047
-	meetingmins.source.r31878
-	memory.source.r30452
-	menu.source.r15878
-	menucard.source.r55643
-	menukeys.source.r64314
-	metalogox.source.r69601
-	metastr.source.r56246
-	method.source.r17485
-	metre.source.r18489
-	mfirstuc.source.r64743
-	mftinc.source.r15878
-	mi-solns.source.r49651
-	mindflow.source.r65236
-	minibox.source.r30914
-	minidocument.source.r43752
-	minifp.source.r32559
-	minipage-marginpar.source.r15878
-	minutes.source.r42186
-	mleftright.source.r53021
-	mlist.source.r15878
-	mnotes.source.r63406
-	moderntimeline.source.r55518
-	modref.source.r15878
-	modroman.source.r29803
-	moloch.source.r69579
-	monofill.source.r28140
-	moodle.source.r65672
-	morefloats.source.r37927
-	morehype.source.r38815
-	moresize.source.r17513
-	moreverb.source.r22126
-	morewrites.source.r69679
-	mparhack.source.r59066
-	mpostinl.source.r49559
-	msg.source.r49578
-	mtgreek.source.r17967
-	multiaudience.source.r60688
-	multibbl.source.r15878
-	multicap.source.r15878
-	multicolrule.source.r56366
-	multidef.source.r40637
-	multienv.source.r64967
-	multiexpand.source.r45943
-	multilang.source.r49065
-	multirow.source.r58396
-	mversion.source.r29370
-	mwe.source.r64967
-	mycv.source.r26807
-	mylatexformat.source.r21392
-	nag.source.r24741
-	nameauth.source.r69758
-	namespc.source.r15878
-	ncctools.source.r51810
-	needspace.source.r29601
-	newfile.source.r15878
-	newlfm.source.r15878
-	newspaper.source.r15878
-	newunicodechar.source.r47382
-	newvbtm.source.r23996
-	newverbs.source.r64833
-	nicefilelist.source.r65842
-	niceframe.source.r36086
-	nicetext.source.r38914
-	nidanfloat.source.r48295
-	noindentafter.source.r59195
-	noitcrul.source.r15878
-	nomencl.source.r61029
-	nomentbl.source.r16549
-	nonfloat.source.r17598
-	nonumonpart.source.r22114
-	normalcolor.source.r40125
-	notes.source.r42428
-	notespages.source.r41906
-	nowidow.source.r24066
-	ntheorem.source.r27609
-	numprint.source.r27498
-	ocgx.source.r54512
-	octavo.source.r15878
-	oldstyle.source.r15878
-	onlyamsmath.source.r42927
-	opcit.source.r15878
-	orcidlink.source.r69253
-	outlining.source.r45601
-	overpic.source.r69343
-	padcount.source.r47621
-	pagecolor.source.r66885
-	pagecont.source.r15878
-	pagegrid.source.r64470
-	pagenote.source.r63708
-	pageslts.source.r39164
-	palette.source.r60119
-	pangram.source.r66300
-	paper.source.r34521
-	papercdcase.source.r15878
-	papermas.source.r66835
-	papertex.source.r19230
-	paracol.source.r49560
-	paralist.source.r43021
-	paresse.source.r59228
-	parselines.source.r21475
-	patch.source.r42428
-	patchcmd.source.r41379
-	pauldoc.source.r16005
-	pawpict.source.r21629
-	pbalance.source.r67201
-	pbox.source.r24807
-	pbsheet.source.r24830
-	pdf14.source.r17583
-	pdfcol.source.r64469
-	pdfcprot.source.r18735
-	pdfoverlay.source.r64210
-	pdfpc-movie.source.r67201
-	pdfprivacy.source.r45985
-	pdfrender.source.r69058
-	pdfx.source.r50338
-	perltex.source.r52162
-	permute.source.r15878
-	pgfmath-xfp.source.r59268
-	phfcc.source.r60731
-	phfextendedabstract.source.r60732
-	phffullpagefigure.source.r41857
-	phfnote.source.r60733
-	phfparen.source.r41859
-	phfqit.source.r60734
-	phfquotetext.source.r41869
-	phfsvnwatermark.source.r41870
-	phfthm.source.r60735
-	photo.source.r18739
-	picture.source.r54867
-	plweb.source.r15878
-	pmboxdraw.source.r53046
-	polynom.source.r44832
-	polynomial.source.r15878
-	polytable.source.r55837
-	postnotes.source.r69102
-	powerdot.source.r59272
-	ppr-prv.source.r15878
-	ppt-slides.source.r69568
-	prelim2e.source.r57000
-	preprint.source.r30447
-	pressrelease.source.r35147
-	prettyref.source.r15878
-	preview.source.r69470
-	probsoln.source.r44783
-	projlib.source.r69689
-	proofread.source.r61719
-	protocol.source.r25562
-	psfragx.source.r26243
-	pxgreeks.source.r21838
-	qcm.source.r63833
-	qstest.source.r15878
-	qsymbols.source.r15878
-	quotchap.source.r56926
-	quoting.source.r32818
-	quotmark.source.r15878
-	ran_toks.source.r59515
-	rccol.source.r15878
-	rcs-multi.source.r64967
-	rcsinfo.source.r15878
-	realboxes.source.r64967
-	recipecard.source.r15878
-	reflectgraphics.source.r40612
-	refman.source.r15878
-	refstyle.source.r69680
-	regcount.source.r19979
-	regexpatch.source.r58668
-	register.source.r54485
-	regstats.source.r66795
-	relenc.source.r22050
-	repltext.source.r56433
-	resmes.source.r65375
-	rgltxdoc.source.r53858
-	rjlparshap.source.r15878
-	robustcommand.source.r15878
-	romanbar.source.r25005
-	romanbarpagenumber.source.r36236
-	romannum.source.r15878
-	rorlink.source.r67461
-	rotfloat.source.r18292
-	rtkinenc.source.r20003
-	rulercompass.source.r32392
-	sauerj.source.r15878
-	savefnmark.source.r15878
-	savetrees.source.r40525
-	scale.source.r15878
-	scalebar.source.r15878
-	schedule.source.r51805
-	schooldocs.source.r69659
-	scontents.source.r62902
-	scrambledenvs.source.r60615
-	scrlayer-fancyhdr.source.r63844
-	scrwfile.source.r66872
-	sdaps.source.r65345
-	secnum.source.r61813
-	sectsty.source.r15878
-	seealso.source.r43595
-	selinput.source.r53098
-	semantic.source.r15878
-	semesterplanner.source.r56841
-	semioneside.source.r15878
-	semproc.source.r37568
-	seqsplit.source.r15878
-	sesstime.source.r49750
-	setspaceenhanced.source.r68493
-	sf298.source.r41653
-	sffms.source.r15878
-	shdoc.source.r41991
-	shorttoc.source.r15878
-	show2e.source.r15878
-	showcharinbox.source.r29803
-	showexpl.source.r57414
-	showlabels.source.r63940
-	sidecap.source.r65618
-	sidenotes.source.r54524
-	sidenotesplus.source.r69176
-	silence.source.r27028
-	sillypage.source.r66349
-	simplecd.source.r29260
-	simplecv.source.r35537
-	sitem.source.r22136
-	skb.source.r22781
-	skdoc.source.r56950
-	skrapport.source.r52412
-	slantsc.source.r25007
-	smart-eqn.source.r61719
-	snapshot.source.r56735
-	spacingtricks.source.r69048
-	splitindex.source.r39766
-	spot.source.r22408
-	spverbatim.source.r15878
-	srcltx.source.r15878
-	sseq.source.r31585
-	stack.source.r15878
-	standalone.source.r64677
-	stdclsdv.source.r15878
-	stdpage.source.r15878
-	stealcaps.source.r64967
-	stex.source.r68569
-	storebox.source.r64967
-	stringstrings.source.r57097
-	sttools.source.r60736
-	styledcmd.source.r65262
-	subdepth.source.r15878
-	subeqn.source.r15878
-	subeqnarray.source.r15878
-	subfigure.source.r15878
-	subfiles.source.r56977
-	subfloat.source.r29349
-	supertabular.source.r53658
-	svg.source.r57010
-	svn.source.r15878
-	svn-multi.source.r64967
-	svn-prov.source.r64967
-	svninfo.source.r62157
-	swfigure.source.r63255
-	syntrace.source.r15878
-	synttree.source.r16252
-	tabbing.source.r59715
-	tabfigures.source.r25202
-	tablefootnote.source.r32804
-	tableof.source.r59837
-	tablists.source.r15878
-	tablvar.source.r69212
-	tabu.source.r61719
-	tabularborder.source.r17885
-	tabularew.source.r15878
-	tabulary.source.r34368
-	tagpdf.source.r69703
-	talk.source.r42428
-	tangocolors.source.r66733
-	tcldoc.source.r22018
-	ted.source.r15878
-	templatetools.source.r67201
-	termcal.source.r22514
-	termlist.source.r18923
-	termsim.source.r61414
-	testhyphens.source.r38928
-	testidx.source.r60966
-	tex-label.source.r16372
-	tex-locale.source.r48500
-	texmate.source.r15878
-	texments.source.r15878
-	texpower.source.r29349
-	texshade.source.r69371
-	textfit.source.r20591
-	textmerg.source.r20677
-	textpos.source.r63967
-	textualicomma.source.r67201
-	texvc.source.r46844
-	thmtools.source.r67018
-	threadcol.source.r28754
-	thumb.source.r16549
-	thumbs.source.r33134
-	tipauni.source.r65817
-	titling.source.r15878
-	to-be-determined.source.r64882
-	tocbibind.source.r20085
-	tocdata.source.r69512
-	tocloft.source.r53364
-	tocvsec2.source.r33146
-	todo.source.r17746
-	todonotes.source.r69319
-	toolbox.source.r32260
-	totalcount.source.r67201
-	totcount.source.r21178
-	totpages.source.r15878
-	transparent.source.r64852
-	trfsigns.source.r15878
-	trimspaces.source.r15878
-	trivfloat.source.r15878
-	trsym.source.r18732
-	tucv.source.r20680
-	twoup.source.r15878
-	txgreeks.source.r21839
-	type1cm.source.r21820
-	typed-checklist.source.r63445
-	typeface.source.r27046
-	typogrid.source.r24994
-	ucs.source.r68759
-	umoline.source.r19085
-	underlin.source.r15878
-	undolabl.source.r65846
-	uni-titlepage.source.r68917
-	unicodefonttable.source.r67066
-	unisc.source.r63178
-	units.source.r42428
-	unravel.source.r69308
-	upquote.source.r26059
-	uri.source.r48602
-	ushort.source.r32261
-	varindex.source.r32262
-	verifiche.source.r69726
-	verifycommand.source.r69389
-	versonotes.source.r69249
-	vgrid.source.r32457
-	vmargin.source.r15878
-	volumes.source.r15878
-	vwcol.source.r36254
-	warpcol.source.r15878
-	was.source.r64691
-	widetable.source.r53409
-	widows-and-orphans.source.r66753
-	wordlike.source.r15878
-	wrapfig2.source.r69513
-	wrapstuff.source.r64058
-	xargs.source.r15878
-	xbmks.source.r53448
-	xcolor-material.source.r42289
-	xcolor-solarized.source.r61719
-	xcookybooky.source.r36435
-	xcpdftips.source.r50449
-	xdoc.source.r15878
-	xellipsis.source.r47546
-	xfor.source.r15878
-	xint.source.r63562
-	xmpincl.source.r60593
-	xpatch.source.r54563
-	xpeek.source.r61719
-	xpunctuate.source.r67918
-	xsavebox.source.r64049
-	xtab.source.r23347
-	yafoot.source.r48568
-	yagusylo.source.r29803
-	yaletter.source.r42830
-	ydoc.source.r64887
-	zebra-goodies.source.r66630
-	zref.source.r68278
-	zref-check.source.r68846
-	zref-clever.source.r68846
-	zref-vario.source.r68846
-"
-
-inherit optfeature texlive-module
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-COMMON_DEPEND="
-	>=dev-texlive/texlive-latexrecommended-2023
-	>=dev-texlive/texlive-pictures-2023
-	dev-perl/Spreadsheet-ParseExcel
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-texlive/texlive-xetex-2023
-	>=dev-tex/minted-2.9
-"
-PDEPEND="
-	>=dev-tex/glossaries-4.53
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-texlive/texlive-basic-2023
-	>=dev-texlive/texlive-latex-2023
-"
-
-TEXLIVE_MODULE_BINSCRIPTS="
-	texmf-dist/scripts/authorindex/authorindex
-	texmf-dist/scripts/exceltex/exceltex
-	texmf-dist/scripts/hyperxmp/hyperxmp-add-bytecount.pl
-	texmf-dist/scripts/l3build/l3build.lua
-	texmf-dist/scripts/makedtx/makedtx.pl
-	texmf-dist/scripts/pagelayout/pagelayoutapi
-	texmf-dist/scripts/pagelayout/textestvis
-	texmf-dist/scripts/perltex/perltex.pl
-	texmf-dist/scripts/pygmentex/pygmentex.py
-	texmf-dist/scripts/splitindex/splitindex.pl
-	texmf-dist/scripts/svn-multi/svn-multi.pl
-	texmf-dist/scripts/vpe/vpe.pl
-	texmf-dist/scripts/webquiz/webquiz.py
-	texmf-dist/scripts/wordcount/wordcount.sh
-	texmf-dist/scripts/yplan/yplan
-"
-
-pkg_postinst() {
-	# https://bugs.gentoo.org/928388
-	optfeature "Install for SVG (Scalable Vector Graphics) support" media-gfx/inkscape
-}
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2023_p69752-r5.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2023_p69752-r5.ebuild
new file mode 100644
index 000000000000..bb6acc375721
--- /dev/null
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2023_p69752-r5.ebuild
@@ -0,0 +1,3994 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TEXLIVE_MODULE_CONTENTS="
+	collection-latexextra.r69752
+	2up.r55076
+	a0poster.r54071
+	a4wide.r20943
+	a5comb.r17020
+	abraces.r64967
+	abspos.r64465
+	abstract.r15878
+	accessibility.r55777
+	accsupp.r53052
+	achemso.r69638
+	acro.r62925
+	acronym.r54758
+	acroterm.r61719
+	actuarialangle.r67201
+	actuarialsymbol.r67201
+	addfont.r58559
+	addlines.r49326
+	adjmulticol.r63320
+	adjustbox.r64967
+	adrconv.r46817
+	advdate.r20538
+	affilauthor.r68996
+	akktex.r26055
+	akletter.r15878
+	alchemist.r66924
+	alertmessage.r38055
+	alnumsec.r15878
+	alphalph.r53087
+	alterqcm.r59265
+	altfont.r15878
+	altsubsup.r62738
+	amsaddr.r64357
+	animate.r67401
+	anonchap.r17049
+	answers.r35032
+	anyfontsize.r17050
+	appendix.r53718
+	appendixnumberbeamer.r46317
+	apptools.r28400
+	arabicfront.r51474
+	arcs.r15878
+	argumentation.r69023
+	arraycols.r68277
+	arrayjobx.r18125
+	arraysort.r31576
+	arydshln.r50084
+	asciilist.r49060
+	askinclude.r54725
+	assignment.r20431
+	assoccnt.r38497
+	association-matrix.r64845
+	atenddvi.r56922
+	atendofenv.r62164
+	attachfile.r42099
+	aurl.r41853
+	authoraftertitle.r55889
+	authorarchive.r65777
+	authorindex.r51757
+	autofancyhdr.r54049
+	autonum.r36084
+	autopdf.r32377
+	autopuncitems.r63045
+	avremu.r35373
+	awesomebox.r57349
+	axessibility.r57105
+	background.r42428
+	bankstatement.r38857
+	bashful.r25597
+	basicarith.r35460
+	bchart.r43928
+	beamer-rl.r69254
+	beamer2thesis.r27539
+	beamerappendixnote.r55732
+	beameraudience.r23427
+	beamerauxtheme.r56087
+	beamercolorthemeowl.r40105
+	beamerdarkthemes.r55117
+	beamerposter.r54512
+	beamersubframe.r23510
+	beamertheme-arguelles.r68659
+	beamertheme-cuerna.r42161
+	beamertheme-detlevcm.r39048
+	beamertheme-epyt.r41404
+	beamertheme-focus.r69742
+	beamertheme-light.r49867
+	beamertheme-metropolis.r43031
+	beamertheme-npbt.r54512
+	beamertheme-phnompenh.r39100
+	beamertheme-pure-minimalistic.r56934
+	beamertheme-rainbow.r67542
+	beamertheme-saintpetersburg.r45877
+	beamertheme-simpledarkblue.r60061
+	beamertheme-simpleplus.r64770
+	beamertheme-tcolorbox.r67000
+	beamertheme-trigon.r65985
+	beamertheme-upenn-bc.r29937
+	beamerthemeamurmaple.r69742
+	beamerthemeconcrete.r69528
+	beamerthemejltree.r21977
+	beamerthemelalic.r58777
+	beamerthemenirma.r20765
+	beamerthemenord.r56180
+	bearwear.r54826
+	beaulivre.r68376
+	beautybook.r68438
+	beton.r15878
+	bewerbung.r61632
+	bez123.r15878
+	bhcexam.r64093
+	bibletext.r45196
+	bigfoot.r38248
+	bigints.r29803
+	bilingualpages.r59643
+	biochemistry-colors.r54512
+	bithesis.r68634
+	bizcard.r15878
+	blindtext.r25039
+	blkarray.r36406
+	block.r17209
+	blowup.r67640
+	bnumexpr.r59244
+	boites.r32235
+	bold-extra.r17076
+	book-of-common-prayer.r62240
+	bookcover.r65394
+	bookest.r15878
+	booklet.r15878
+	bookshelf.r55475
+	boolexpr.r17830
+	bophook.r17062
+	boxedminipage.r54827
+	boxhandler.r28031
+	bracketkey.r17129
+	braket.r17127
+	breakurl.r29901
+	bubblesort.r56070
+	bullcntr.r15878
+	bxcalc.r56431
+	bxdpx-beamer.r41813
+	bxdvidriver.r43219
+	bxenclose.r40213
+	bxnewfont.r44173
+	bxpapersize.r63174
+	bxpdfver.r63185
+	bxtexlogo.r63231
+	calcage.r27725
+	calctab.r15878
+	calculator.r64424
+	calrsfs.r17125
+	cals.r43003
+	calxxxx-yyyy.r69266
+	cancel.r32508
+	canoniclayout.r64889
+	capt-of.r29803
+	captcont.r15878
+	captdef.r17353
+	carbohydrates.r39000
+	cases.r54682
+	casyl.r15878
+	catchfile.r53084
+	catchfilebetweentags.r21476
+	catechis.r59998
+	catoptions.r68982
+	cbcoptic.r16666
+	ccaption.r23443
+	cclicenses.r15878
+	cd.r34452
+	cd-cover.r17121
+	cdcmd.r60742
+	cdpbundl.r61719
+	cellprops.r67201
+	cellspace.r61501
+	censor.r67293
+	centeredline.r64672
+	centerlastline.r56644
+	changebar.r69367
+	changelayout.r16094
+	changelog.r65861
+	changepage.r15878
+	changes.r67201
+	chappg.r15878
+	chapterfolder.r15878
+	cheatsheet.r45069
+	checkend.r51475
+	chet.r45081
+	chextras.r27118
+	childdoc.r49543
+	chkfloat.r27473
+	chletter.r20060
+	chngcntr.r47577
+	chronology.r67973
+	circ.r62977
+	circledsteps.r67889
+	circledtext.r63166
+	classics.r53671
+	classpack.r55218
+	clefval.r55985
+	cleveref.r61719
+	cleveref-usedon.r66915
+	clicks.r64602
+	clipboard.r47747
+	clistmap.r61811
+	clock.r15878
+	clrdblpg.r47511
+	clrstrip.r60363
+	cmdstring.r15878
+	cmdtrack.r28910
+	cmsd.r18787
+	cnltx.r55265
+	cntformats.r34668
+	cntperchap.r37572
+	codebox.r61771
+	codedescribe.r69343
+	codedoc.r17630
+	codehigh.r65787
+	codepage.r51502
+	codesection.r34481
+	collcell.r64967
+	collectbox.r64967
+	colophon.r47913
+	color-edits.r56707
+	colordoc.r18270
+	colorframed.r64551
+	colorinfo.r15878
+	coloring.r41042
+	colorist.r68440
+	colorspace.r50585
+	colortab.r22155
+	colorwav.r67012
+	colorweb.r31490
+	colourchange.r21741
+	combelow.r18462
+	combine.r19361
+	comma.r18259
+	commado.r38875
+	commedit.r50116
+	comment.r41927
+	commonunicode.r62901
+	competences.r47573
+	concepts.r29020
+	concprog.r18791
+	conditext.r55387
+	constants.r15878
+	continue.r49449
+	contour.r18950
+	contracard.r67201
+	conv-xkv.r43558
+	cooking.r15878
+	cooking-units.r65241
+	cool.r67013
+	coolfn.r69007
+	coollist.r67048
+	coolstr.r67015
+	coolthms.r29062
+	cooltooltips.r60201
+	coop-writing.r61607
+	coordsys.r15878
+	copyedit.r37928
+	copyrightbox.r24829
+	coseoul.r23862
+	counterz.r67335
+	counttexruns.r27576
+	courseoutline.r15878
+	coursepaper.r15878
+	coverpage.r63509
+	cprotect.r21209
+	cprotectinside.r63833
+	crbox.r29803
+	create-theorem.r67712
+	creationboites.r68087
+	crefthe.r68813
+	crossreference.r15878
+	crossreftools.r55879
+	crumbs.r64602
+	csquotes.r64389
+	css-colors.r54512
+	csvmerge.r51857
+	csvsimple.r69494
+	cuisine.r34453
+	currency.r48990
+	currfile.r64673
+	curriculum-vitae.r68211
+	currvita.r15878
+	customenvs.r68637
+	cutwin.r60901
+	cv.r15878
+	cv4tw.r34577
+	cweb-latex.r28878
+	cyber.r46776
+	cybercic.r37659
+	darkmode.r64271
+	dashbox.r23425
+	dashrule.r29579
+	dashundergaps.r58150
+	dataref.r62942
+	datatool.r52663
+	datax.r61772
+	dateiliste.r27974
+	datenumber.r61761
+	datestamp.r61719
+	datetime.r36650
+	datetime2.r63102
+	datetime2-bahasai.r46287
+	datetime2-basque.r47064
+	datetime2-breton.r52647
+	datetime2-bulgarian.r47031
+	datetime2-catalan.r47032
+	datetime2-croatian.r36682
+	datetime2-czech.r47033
+	datetime2-danish.r47034
+	datetime2-dutch.r47355
+	datetime2-en-fulltext.r36705
+	datetime2-english.r52479
+	datetime2-esperanto.r47356
+	datetime2-estonian.r47565
+	datetime2-finnish.r47047
+	datetime2-french.r56393
+	datetime2-galician.r47631
+	datetime2-german.r67201
+	datetime2-greek.r47533
+	datetime2-hebrew.r47534
+	datetime2-icelandic.r65213
+	datetime2-irish.r47632
+	datetime2-it-fulltext.r54779
+	datetime2-italian.r37146
+	datetime2-latin.r47748
+	datetime2-lsorbian.r47749
+	datetime2-magyar.r48266
+	datetime2-norsk.r48267
+	datetime2-polish.r48456
+	datetime2-portuges.r48457
+	datetime2-romanian.r56394
+	datetime2-russian.r49345
+	datetime2-samin.r49346
+	datetime2-scottish.r52101
+	datetime2-serbian.r67201
+	datetime2-slovak.r52281
+	datetime2-slovene.r52282
+	datetime2-spanish.r45785
+	datetime2-swedish.r36700
+	datetime2-turkish.r52331
+	datetime2-ukrainian.r47552
+	datetime2-usorbian.r52375
+	datetime2-welsh.r52553
+	dblfloatfix.r28983
+	dbshow.r61634
+	debate.r64846
+	decimal.r23374
+	decimalcomma.r69251
+	decorule.r55230
+	defoldfonts.r68234
+	delimtxt.r16549
+	democodetools.r64314
+	denisbdoc.r66137
+	diabetes-logbook.r54810
+	diagbox.r54080
+	diagnose.r19387
+	dialogl.r28946
+	dichokey.r17192
+	dimnum.r58774
+	dinbrief.r15878
+	directory.r15878
+	dirtytalk.r20520
+	dlfltxb.r17337
+	dnaseq.r17194
+	doclicense.r68441
+	docmfp.r15878
+	docmute.r25741
+	docshots.r69676
+	doctools.r34474
+	documentation.r34521
+	docutils.r56594
+	doi.r48634
+	dotarrow.r15878
+	dotlessi.r51476
+	dotseqn.r17195
+	download.r52257
+	dox.r46011
+	dpfloat.r17196
+	dprogress.r15878
+	drac.r15878
+	draftcopy.r15878
+	draftfigure.r44854
+	draftwatermark.r57099
+	dtk.r69504
+	dtxdescribe.r69507
+	ducksay.r64655
+	duckuments.r52271
+	dvdcoll.r15878
+	dynamicnumber.r38726
+	dynblocks.r35193
+	ean13isbn.r57514
+	easy.r19440
+	easy-todo.r32677
+	easybook.r69747
+	easyfig.r64967
+	easyfloats.r57204
+	easyformat.r44543
+	easylist.r32661
+	easyreview.r38352
+	ebezier.r15878
+	ecclesiastic.r38172
+	econlipsum.r58390
+	ecv.r24928
+	ed.r25231
+	edichokey.r56223
+	edmargin.r27599
+	eemeir.r15878
+	efbox.r33236
+	egplot.r20617
+	ehhline.r54676
+	einfart.r68376
+	elements.r61792
+	ellipsis.r55418
+	elmath.r15878
+	elocalloc.r42712
+	elpres.r60209
+	elzcards.r51894
+	emarks.r24504
+	embedall.r51177
+	embedfile.r65528
+	embrac.r57814
+	emo.r66944
+	emotion.r69752
+	emptypage.r18064
+	emulateapj.r28469
+	endfloat.r57090
+	endheads.r43750
+	endnotes.r53319
+	endnotes-hy.r54758
+	engpron.r16558
+	engrec.r15878
+	enotez.r61490
+	enumitem.r51423
+	enumitem-zref.r21472
+	envbig.r15878
+	environ.r56615
+	envlab.r61937
+	epigraph.r54857
+	epigraph-keys.r61719
+	epiolmec.r15878
+	eq-pin2corr.r59477
+	eqell.r22931
+	eqlist.r32257
+	eqnalign.r43278
+	eqname.r20678
+	eqparbox.r45215
+	errata.r42428
+	erw-l3.r61799
+	esami.r67707
+	esdiff.r21385
+	esieecv.r59638
+	esindex.r52342
+	esint.r52240
+	esint-type1.r15878
+	etaremune.r15878
+	etextools.r20694
+	etl.r60998
+	etoc.r69343
+	eukdate.r15878
+	eulerpx.r63967
+	europasscv.r56829
+	europecv.r69661
+	everyhook.r35675
+	everypage.r56694
+	exam.r67600
+	exam-lite.r65754
+	exam-n.r64674
+	exam-randomizechoices.r61719
+	examdesign.r15878
+	example.r33398
+	examplep.r55265
+	examz.r67303
+	exceltex.r26313
+	excludeonly.r17262
+	exercise.r35417
+	exercisebank.r50448
+	exercisepoints.r49590
+	exercises.r55188
+	exesheet.r69688
+	exframe.r53911
+	exp-testopt.r15878
+	expdlist.r15878
+	export.r27206
+	exsheets.r67300
+	exsol.r69343
+	extract.r52117
+	facsimile.r21328
+	factura.r61697
+	fail-fast.r67543
+	familytree.r63739
+	fancyhandout.r46411
+	fancylabel.r46736
+	fancynum.r15878
+	fancypar.r58895
+	fancyqr.r64182
+	fancyslides.r36263
+	fancytabs.r41549
+	fancytooltips.r68931
+	fbox.r69041
+	fcolumn.r67729
+	fetchcls.r45245
+	fewerfloatpages.r58058
+	ffcode.r69706
+	ffslides.r38895
+	fgruler.r63721
+	fifo-stack.r33288
+	figsize.r18784
+	filecontents.r66740
+	filecontentsdef.r52208
+	filedate.r29529
+	fileinfo.r28421
+	filemod.r64967
+	fink.r24329
+	finstrut.r21719
+	fistrum.r66461
+	fithesis.r64135
+	fixcmex.r51825
+	fixfoot.r17131
+	fixme.r63708
+	fixmetodonotes.r30168
+	fjodor.r53207
+	flabels.r17272
+	flacards.r19440
+	flagderiv.r15878
+	flashcards.r62104
+	flashmovie.r25768
+	flexipage.r66614
+	flipbook.r25584
+	flippdf.r56782
+	floatbytocbasic.r67945
+	floatflt.r25540
+	floatrow.r15878
+	floatrowbytocbasic.r67946
+	flowfram.r35291
+	fmp.r15878
+	fmtcount.r53912
+	fn2end.r15878
+	fnbreak.r66615
+	fncychap.r20710
+	fncylab.r52090
+	fnpara.r25607
+	fnpct.r62248
+	fnumprint.r29173
+	foilhtml.r61937
+	foliono.r58877
+	fontaxes.r55920
+	fontsetup.r69390
+	fontsize.r60161
+	fonttable.r44799
+	footmisc.r69729
+	footmisx.r42621
+	footnotebackref.r27034
+	footnoterange.r66149
+	footnpag.r15878
+	forarray.r15878
+	foreign.r27819
+	forloop.r67017
+	formlett.r21480
+	forms16be.r51305
+	formular.r15878
+	fragments.r15878
+	frame.r18312
+	framed.r26789
+	frankenstein.r15878
+	frege.r27417
+	froufrou.r67201
+	ftcap.r17275
+	ftnxtra.r29652
+	fullblck.r25434
+	fullminipage.r34545
+	fullwidth.r24684
+	functional.r65485
+	fundus-calligra.r26018
+	fundus-cyr.r26019
+	fundus-sueterlin.r26030
+	fvextra.r69001
+	fwlw.r29803
+	g-brief.r50415
+	gatherenum.r67201
+	gauss.r32934
+	gcard.r15878
+	gcite.r15878
+	gender.r36464
+	genealogy-profiles.r69580
+	genmpage.r15878
+	gensymb.r64740
+	getfiledate.r16189
+	getitems.r39365
+	gindex.r52311
+	ginpenc.r24980
+	gitfile-info.r51928
+	gitinfo.r34049
+	gitinfo2.r38913
+	gitlog.r38932
+	gitstatus.r64662
+	gitver.r63920
+	globalvals.r49962
+	gloss.r15878
+	glossaries-danish.r35665
+	glossaries-dutch.r35685
+	glossaries-english.r35665
+	glossaries-estonian.r49928
+	glossaries-extra.r68409
+	glossaries-finnish.r54080
+	glossaries-french.r42873
+	glossaries-german.r35665
+	glossaries-irish.r35665
+	glossaries-italian.r35665
+	glossaries-magyar.r35665
+	glossaries-norsk.r67141
+	glossaries-nynorsk.r67201
+	glossaries-polish.r35665
+	glossaries-portuges.r36064
+	glossaries-serbian.r35665
+	glossaries-slovene.r51211
+	glossaries-spanish.r35665
+	gmdoc.r21292
+	gmdoc-enhance.r15878
+	gmiflink.r15878
+	gmutils.r24287
+	gmverb.r24288
+	grabbox.r65223
+	gradient-text.r65567
+	grading-scheme.r62505
+	graphbox.r46360
+	graphicscache.r65318
+	graphicx-psmin.r56931
+	graphicxbox.r32630
+	graphpaper.r63116
+	grayhints.r49052
+	grfpaste.r17354
+	grid.r61719
+	grid-system.r32981
+	gridpapers.r58723
+	gridset.r53762
+	gridslides.r54512
+	gs1.r59620
+	guitlogo.r55741
+	ha-prosper.r59651
+	hackthefootline.r46494
+	halloweenmath.r52602
+	handin.r48255
+	handout.r43962
+	handoutwithnotes.r62140
+	hang.r43280
+	hanging.r15878
+	hardwrap.r21396
+	harnon-cv.r26543
+	harpoon.r21327
+	hc.r15878
+	he-she.r41359
+	hep-acronym.r67632
+	hep-float.r67632
+	hep-math.r67632
+	hep-text.r67632
+	hep-title.r67632
+	hereapplies.r68638
+	hhtensor.r54080
+	hideanswer.r63852
+	highlightlatex.r58392
+	highlightx.r68756
+	histogr.r15878
+	hitec.r15878
+	hitreport.r58357
+	hletter.r30002
+	hobsub.r52810
+	homework.r68773
+	hpsdiss.r15878
+	href-ul.r69359
+	hrefhide.r66189
+	huawei.r68336
+	hvextern.r69651
+	hvindex.r46051
+	hvlogos.r69581
+	hvpygmentex.r62405
+	hvqrurl.r69723
+	hwemoji.r65001
+	hypdestopt.r56253
+	hypdoc.r68661
+	hypdvips.r53197
+	hyper.r17357
+	hyperbar.r48147
+	hypernat.r17358
+	hyperxmp.r68251
+	hyphenat.r15878
+	identkey.r61719
+	idxcmds.r54554
+	idxlayout.r25821
+	iexec.r69420
+	ifallfalse.r60027
+	iffont.r38823
+	ifmslide.r20727
+	ifmtarg.r47544
+	ifnextok.r23379
+	ifoddpage.r64967
+	ifthenx.r25819
+	iitem.r29613
+	image-gallery.r15878
+	imakeidx.r42287
+	import.r54683
+	incgraph.r60810
+	indextools.r68555
+	inline-images.r61719
+	inlinedef.r15878
+	inlinelabel.r63853
+	inputenx.r52986
+	inputtrc.r28019
+	interactiveworkbook.r15878
+	interfaces.r21474
+	intopdf.r63987
+	inversepath.r15878
+	invoice.r48359
+	invoice-class.r49749
+	invoice2.r67327
+	ipsum.r68861
+	iso.r15878
+	iso10303.r15878
+	isodate.r16613
+	isodoc.r59709
+	isonums.r17362
+	isopt.r45509
+	isorot.r15878
+	isosafety.r68801
+	isotope.r23711
+	issuulinks.r25742
+	iwonamath.r68144
+	jlabels.r24858
+	jmsdelim.r62630
+	jobname-suffix.r64797
+	joinbox.r68003
+	jslectureplanner.r57095
+	jumplines.r37553
+	jvlisting.r24638
+	kalendarium.r48744
+	kantlipsum.r68983
+	kerntest.r15878
+	keycommand.r18042
+	keyfloat.r69399
+	keyindex.r50828
+	keyparse.r60277
+	keyreader.r28195
+	keystroke.r17992
+	keyval2e.r23698
+	keyvaltable.r65416
+	kix.r21606
+	knowledge.r61991
+	koma-moderncvclassic.r25025
+	koma-script-sfs.r26137
+	komacv.r57721
+	komacv-rg.r49064
+	korigamik.r68204
+	ktv-texdata.r27369
+	l3build.r69748
+	labbook.r15878
+	labels.r15878
+	labels4easylist.r51124
+	labelschanged.r69400
+	lambdax.r60278
+	lastpackage.r34481
+	lastpage.r68557
+	latex-amsmath-dev.r68730
+	latex-base-dev.r68730
+	latex-bin-dev.r66186
+	latex-context-ppchtex.r66687
+	latex-firstaid-dev.r68730
+	latex-graphics-dev.r68730
+	latex-lab-dev.r68730
+	latex-tools-dev.r68730
+	latex-uni8.r49729
+	latex2pydata.r68919
+	latexcolors.r49888
+	latexdemo.r67201
+	latexgit.r54811
+	layouts.r42428
+	lazylist.r17691
+	lccaps.r46432
+	lcd.r16549
+	lcg.r31474
+	leading.r15878
+	leaflet.r56878
+	lebhart.r68376
+	lectures.r53642
+	lectureslides.r62292
+	leftidx.r15878
+	leftindex.r69660
+	leipzig.r52450
+	lengthconvert.r55064
+	lettre.r54722
+	lettrine.r69508
+	lewis.r15878
+	lhelp.r23638
+	libgreek.r65004
+	limap.r44863
+	linegoal.r21523
+	linop.r41304
+	lipsum.r60561
+	lisp-on-tex.r38722
+	listing.r17373
+	listingsutf8.r53097
+	listlbls.r67215
+	listliketab.r15878
+	listofsymbols.r16134
+	litesolution.r69115
+	litetable.r69678
+	lkproof.r20021
+	lmake.r25552
+	locality.r20422
+	logbox.r24499
+	logical-markup-utils.r15878
+	logoetalab.r68916
+	logpap.r15878
+	longfbox.r39028
+	longfigure.r34302
+	longnamefilelist.r27889
+	loops.r30704
+	lsc.r15878
+	lstaddons.r64967
+	lstfiracode.r49503
+	lt3graph.r45913
+	lt3rawobjects.r66619
+	ltablex.r34923
+	ltabptch.r17533
+	ltxdockit.r21869
+	ltxguidex.r50992
+	ltxkeys.r28332
+	ltxnew.r21586
+	ltxtools.r24897
+	lua-check-hyphen.r47527
+	lua-physical.r59138
+	luatodonotes.r53825
+	macrolist.r60139
+	macroswap.r31498
+	magaz.r24694
+	magicnum.r52983
+	magicwatermark.r63656
+	mailing.r15878
+	mailmerge.r15878
+	makebarcode.r15878
+	makebase.r41012
+	makebox.r15878
+	makecell.r15878
+	makecirc.r15878
+	makecmds.r15878
+	makedtx.r46702
+	makeglos.r15878
+	makelabels.r60255
+	makerobust.r52811
+	mandi.r68950
+	manfnt.r54684
+	manuscript.r36110
+	manyind.r49874
+	marginfit.r48281
+	marginfix.r55064
+	marginnote.r68204
+	markdown.r66954
+	mathalpha.r61089
+	mathastext.r69237
+	mathexam.r15878
+	mathfam256.r53519
+	mathfont.r68241
+	maybemath.r15878
+	mcaption.r15878
+	mceinleger.r15878
+	mcexam.r60481
+	mcite.r18173
+	mciteplus.r31648
+	mdframed.r31075
+	media4svg.r64686
+	media9.r64047
+	medstarbeamer.r38828
+	meetingmins.r31878
+	memexsupp.r15878
+	memory.r30452
+	mensa-tex.r45997
+	menu.r15878
+	menucard.r55643
+	menukeys.r64314
+	metalogox.r69601
+	metanorma.r55010
+	metastr.r56246
+	method.r17485
+	metre.r18489
+	mfirstuc.r64743
+	mftinc.r15878
+	mi-solns.r49651
+	midpage.r17484
+	mindflow.r65236
+	minibox.r30914
+	minidocument.r43752
+	minifp.r32559
+	minimalist.r68552
+	minipage-marginpar.r15878
+	minitoc.r61719
+	minorrevision.r32165
+	minutes.r42186
+	mla-paper.r54080
+	mleftright.r53021
+	mlist.r15878
+	mmap.r15878
+	mnotes.r63406
+	moderncv.r62128
+	modernposter.r47269
+	moderntimeline.r55518
+	modref.r15878
+	modroman.r29803
+	modular.r44142
+	moloch.r69579
+	monofill.r28140
+	moodle.r65672
+	moreenum.r24479
+	morefloats.r37927
+	morehype.r38815
+	moresize.r17513
+	moreverb.r22126
+	morewrites.r69679
+	movement-arrows.r67270
+	movie15.r26473
+	mparhack.r59066
+	mpostinl.r49559
+	msc.r67718
+	msg.r49578
+	mslapa.r54080
+	mtgreek.r17967
+	multenum.r21775
+	multiaudience.r60688
+	multibbl.r15878
+	multicap.r15878
+	multicolrule.r56366
+	multidef.r40637
+	multienv.r64967
+	multiexpand.r45943
+	multifootnote.r63456
+	multilang.r49065
+	multiple-choice.r63722
+	multirow.r58396
+	mversion.r29370
+	mwe.r64967
+	mycv.r26807
+	mylatex.r56751
+	mylatexformat.r21392
+	nag.r24741
+	nameauth.r69758
+	namespc.r15878
+	ncclatex.r15878
+	ncctools.r51810
+	needspace.r29601
+	nestquot.r27323
+	newenviron.r29331
+	newfile.r15878
+	newlfm.r15878
+	newspaper.r15878
+	newunicodechar.r47382
+	newvbtm.r23996
+	newverbs.r64833
+	nextpage.r15878
+	nfssext-cfr.r43640
+	nicefilelist.r65842
+	niceframe.r36086
+	nicetext.r38914
+	nidanfloat.r48295
+	ninecolors.r62006
+	nlctdoc.r68448
+	noconflict.r30140
+	noindentafter.r59195
+	noitcrul.r15878
+	nolbreaks.r26786
+	nomencl.r61029
+	nomentbl.r16549
+	non-decimal-units.r69742
+	nonfloat.r17598
+	nonumonpart.r22114
+	nopageno.r18128
+	normalcolor.r40125
+	notebeamer.r68871
+	notes.r42428
+	notespages.r41906
+	notestex.r45396
+	notoccite.r18129
+	nowidow.r24066
+	nox.r30991
+	ntheorem.r27609
+	numberedblock.r33109
+	numname.r18130
+	numprint.r27498
+	numspell.r61132
+	ocg-p.r28803
+	ocgx.r54512
+	ocgx2.r65292
+	ocr-latex.r15878
+	octavo.r15878
+	oldstyle.r15878
+	onlyamsmath.r42927
+	opcit.r15878
+	opencolor.r66363
+	optidef.r50941
+	optional.r18131
+	options.r39030
+	orcidlink.r69253
+	orientation.r57390
+	outline.r18360
+	outliner.r21095
+	outlines.r25192
+	outlining.r45601
+	overlays.r57866
+	overpic.r69343
+	padcount.r47621
+	pagecolor.r66885
+	pagecont.r15878
+	pagegrid.r64470
+	pagelayout.r69486
+	pagenote.r63708
+	pagerange.r16915
+	pageslts.r39164
+	palette.r60119
+	pangram.r66300
+	paper.r34521
+	papercdcase.r15878
+	papermas.r66835
+	papertex.r19230
+	paracol.r49560
+	parades.r40042
+	paralist.r43021
+	paresse.r59228
+	parnotes.r51720
+	parsa.r54840
+	parselines.r21475
+	pas-cours.r55859
+	pas-cv.r32263
+	pas-tableur.r66860
+	patchcmd.r41379
+	pauldoc.r16005
+	pawpict.r21629
+	pbalance.r67201
+	pbox.r24807
+	pbsheet.r24830
+	pdf14.r17583
+	pdfannotations.r68958
+	pdfcol.r64469
+	pdfcolmk.r52912
+	pdfcomment.r49047
+	pdfcprot.r18735
+	pdfmarginpar.r23492
+	pdfoverlay.r64210
+	pdfpagediff.r37946
+	pdfpc.r68610
+	pdfpc-movie.r67201
+	pdfprivacy.r45985
+	pdfrender.r69058
+	pdfreview.r50100
+	pdfscreen.r42428
+	pdfslide.r15878
+	pdfsync.r20373
+	pdfwin.r68667
+	pdfx.r50338
+	pecha.r15878
+	perltex.r52162
+	permute.r15878
+	petiteannonce.r25915
+	pgfmath-xfp.r59268
+	phfcc.r60731
+	phfextendedabstract.r60732
+	phffullpagefigure.r41857
+	phfnote.r60733
+	phfparen.r41859
+	phfqit.r60734
+	phfquotetext.r41869
+	phfsvnwatermark.r41870
+	phfthm.r60735
+	philex.r36396
+	phonenumbers.r63774
+	photo.r18739
+	photobook.r68313
+	picture.r54867
+	piff.r21894
+	pkgloader.r47486
+	placeins.r19848
+	plantslabels.r29803
+	plates.r15878
+	plweb.r15878
+	pmboxdraw.r53046
+	polynom.r44832
+	polynomial.r15878
+	polytable.r55837
+	postcards.r21641
+	poster-mac.r18305
+	postnotes.r69102
+	powerdot.r59272
+	ppr-prv.r15878
+	ppt-slides.r69568
+	practicalreports.r52312
+	precattl.r63967
+	prelim2e.r57000
+	preprint.r30447
+	pressrelease.r35147
+	prettyref.r15878
+	prettytok.r66884
+	preview.r69470
+	printlen.r19847
+	probsoln.r44783
+	profmaquette.r69526
+	program.r44214
+	progress.r19519
+	progressbar.r33822
+	projlib.r69689
+	proofread.r61719
+	properties.r15878
+	prosper.r33033
+	protex.r41633
+	protocol.r25562
+	psfragx.r26243
+	pstool.r46393
+	pstring.r42857
+	pxgreeks.r21838
+	pygmentex.r64131
+	python.r60162
+	pythonimmediate.r69487
+	q-and-a.r69164
+	qcm.r63833
+	qstest.r15878
+	qsymbols.r15878
+	quicktype.r42183
+	quiz2socrative.r52276
+	quotchap.r56926
+	quoting.r32818
+	quotmark.r15878
+	ran_toks.r59515
+	randexam.r69690
+	randtext.r15878
+	rccol.r15878
+	rcs-multi.r64967
+	rcsinfo.r15878
+	readablecv.r67986
+	readarray.r60540
+	realboxes.r64967
+	recipe.r54080
+	recipebook.r37026
+	recipecard.r15878
+	rectopma.r19980
+	refcheck.r29128
+	refenums.r44131
+	reflectgraphics.r40612
+	refman.r15878
+	refstyle.r69680
+	regcount.r19979
+	regexpatch.r58668
+	register.r54485
+	regstats.r66795
+	relenc.r22050
+	relsize.r30707
+	repeatindex.r24305
+	repltext.r56433
+	rescansync.r63856
+	resmes.r65375
+	responsive.r69147
+	returntogrid.r48485
+	rgltxdoc.r53858
+	rjlparshap.r15878
+	rlepsf.r19082
+	rmpage.r54080
+	robust-externalize.r69459
+	robustcommand.r15878
+	robustindex.r49877
+	romanbar.r25005
+	romanbarpagenumber.r36236
+	romanneg.r20087
+	romannum.r15878
+	rorlink.r67461
+	rotfloat.r18292
+	rotpages.r18740
+	roundbox.r29675
+	rterface.r30084
+	rtkinenc.r20003
+	rulerbox.r50984
+	rulercompass.r32392
+	runcode.r69471
+	rvwrite.r19614
+	sanitize-umlaut.r67126
+	sauerj.r15878
+	saveenv.r65346
+	savefnmark.r15878
+	savesym.r31565
+	savetrees.r40525
+	scale.r15878
+	scalebar.r15878
+	scalerel.r42809
+	scanpages.r42633
+	schedule.r51805
+	schooldocs.r69659
+	scontents.r62902
+	scrambledenvs.r60615
+	scrlayer-fancyhdr.r63844
+	scrlttr2copy.r56733
+	scrwfile.r66872
+	sdaps.r65345
+	sdrt.r15878
+	secdot.r20208
+	secnum.r61813
+	sectionbox.r37749
+	sectionbreak.r50339
+	sectsty.r15878
+	seealso.r43595
+	selectp.r20185
+	selinput.r53098
+	semantex.r65679
+	semantic.r15878
+	semantic-markup.r53607
+	semesterplanner.r56841
+	semioneside.r15878
+	semproc.r37568
+	semtex.r56530
+	sepfootnotes.r41732
+	seqsplit.r15878
+	sesstime.r49750
+	setspaceenhanced.r68493
+	sf298.r41653
+	sffms.r15878
+	sfmath.r15878
+	shadethm.r53350
+	shadow.r20312
+	shadowtext.r26522
+	shapepar.r69343
+	shdoc.r41991
+	shipunov.r52334
+	shorttoc.r15878
+	show2e.r15878
+	showcharinbox.r29803
+	showdim.r28918
+	showexpl.r57414
+	showlabels.r63940
+	sidecap.r65618
+	sidenotes.r54524
+	sidenotesplus.r69176
+	silence.r27028
+	sillypage.r66349
+	sim-os-menus.r68843
+	simplecd.r29260
+	simplecv.r35537
+	simpleinvoice.r45673
+	simplivre.r68376
+	sitem.r22136
+	skb.r22781
+	skdoc.r56950
+	skeldoc.r57922
+	skeycommand.r24652
+	skeyval.r30560
+	skills.r56734
+	skrapport.r52412
+	slantsc.r25007
+	smalltableof.r20333
+	smart-eqn.r61719
+	smartref.r20311
+	smartunits.r39592
+	snapshot.r56735
+	snaptodo.r61155
+	snotez.r61992
+	soulpos.r60772
+	spacingtricks.r69048
+	spark-otf.r62481
+	sparklines.r42821
+	sphack.r20842
+	splitindex.r39766
+	spot.r22408
+	spotcolor.r15878
+	spreadtab.r68256
+	spverbatim.r15878
+	srbook-mem.r45818
+	srcltx.r15878
+	sseq.r31585
+	sslides.r32293
+	stack.r15878
+	stackengine.r60019
+	standalone.r64677
+	starray.r69002
+	stdclsdv.r15878
+	stdpage.r15878
+	stealcaps.r64967
+	stex.r68569
+	storebox.r64967
+	storecmd.r24431
+	stringstrings.r57097
+	sttools.r60736
+	stubs.r69128
+	studenthandouts.r43516
+	styledcmd.r65262
+	subdepth.r15878
+	subdocs.r51480
+	subeqn.r15878
+	subeqnarray.r15878
+	subfigmat.r20308
+	subfigure.r15878
+	subfiles.r56977
+	subfloat.r29349
+	substr.r16117
+	supertabular.r53658
+	suppose.r59281
+	svg.r57010
+	svgcolor.r15878
+	svn.r15878
+	svn-multi.r64967
+	svn-prov.r64967
+	svninfo.r62157
+	swfigure.r63255
+	swungdash.r64204
+	syntax.r15878
+	syntrace.r15878
+	synttree.r16252
+	tabbing.r59715
+	tabfigures.r25202
+	tableaux.r42413
+	tablefootnote.r32804
+	tableof.r59837
+	tablists.r15878
+	tabls.r17255
+	tablvar.r69212
+	tabstackengine.r46848
+	tabto-ltx.r54080
+	tabu.r61719
+	tabularborder.r17885
+	tabularcalc.r15878
+	tabularew.r15878
+	tabularray.r66276
+	tabulary.r34368
+	tagging.r52064
+	tagpair.r42138
+	tagpdf.r69703
+	talk.r42428
+	tamefloats.r27345
+	tangocolors.r66733
+	tasks.r61541
+	tcldoc.r22018
+	tcolorbox.r69370
+	tdclock.r33043
+	technics.r29349
+	ted.r15878
+	templatetools.r67201
+	termcal.r22514
+	termlist.r18923
+	termsim.r61414
+	testhyphens.r38928
+	testidx.r60966
+	tex-label.r16372
+	tex-locale.r48500
+	texlogos.r19083
+	texmate.r15878
+	texments.r15878
+	texpower.r29349
+	texshade.r69371
+	texsurgery.r59885
+	textcsc.r67193
+	textfit.r20591
+	textmerg.r20677
+	textpos.r63967
+	textualicomma.r67201
+	texvc.r46844
+	theoremref.r54512
+	thinsp.r39669
+	thmtools.r67018
+	threadcol.r28754
+	threeparttable.r17383
+	threeparttablex.r34206
+	thumb.r16549
+	thumbs.r33134
+	thumby.r16736
+	ticket.r42280
+	tipauni.r65817
+	titlecaps.r63020
+	titlefoot.r15878
+	titlepic.r43497
+	titleref.r18729
+	titlesec.r68677
+	titling.r15878
+	to-be-determined.r64882
+	tocbibind.r20085
+	tocdata.r69512
+	tocloft.r53364
+	tocvsec2.r33146
+	todo.r17746
+	todonotes.r69319
+	tokcycle.r60320
+	tokenizer.r15878
+	toolbox.r32260
+	topfloat.r19084
+	topiclongtable.r54758
+	totalcount.r67201
+	totcount.r21178
+	totpages.r15878
+	tramlines.r65692
+	translations.r61896
+	transparent.r64852
+	trfsigns.r15878
+	trimspaces.r15878
+	trivfloat.r15878
+	trsym.r18732
+	truncate.r18921
+	tucv.r20680
+	turnthepage.r29803
+	tutodoc.r69343
+	twoinone.r17024
+	twoup.r15878
+	txgreeks.r21839
+	type1cm.r21820
+	typed-checklist.r63445
+	typeface.r27046
+	typoaid.r44238
+	typogrid.r24994
+	uassign.r38459
+	ucs.r68759
+	uebungsblatt.r15878
+	umoline.r19085
+	underlin.r15878
+	underoverlap.r29019
+	undolabl.r65846
+	uni-titlepage.r68917
+	unicode-math-input.r69591
+	unicodefonttable.r67066
+	unifront.r67054
+	unisc.r63178
+	unitconv.r55060
+	units.r42428
+	unravel.r69308
+	updatemarks.r68163
+	upmethodology.r64613
+	upquote.r26059
+	uri.r48602
+	ushort.r32261
+	uspace.r63123
+	utf8add.r61074
+	uwmslide.r27354
+	variablelm.r60014
+	varindex.r32262
+	varsfromjobname.r44154
+	varwidth.r24104
+	vcell.r59039
+	vdmlisting.r56905
+	verbasef.r21922
+	verbatimbox.r67865
+	verbatimcopy.r15878
+	verbdef.r17177
+	verbments.r23670
+	verifiche.r69726
+	verifycommand.r69389
+	version.r21920
+	versions.r21921
+	versonotes.r69249
+	vertbars.r49429
+	vgrid.r32457
+	vhistory.r61719
+	vmargin.r15878
+	volumes.r15878
+	vpe.r26039
+	vruler.r21598
+	vtable.r51126
+	vwcol.r36254
+	wallcalendar.r45568
+	wallpaper.r15878
+	warning.r66616
+	warpcol.r15878
+	was.r64691
+	webquiz.r58808
+	widetable.r53409
+	widows-and-orphans.r66753
+	williams.r15878
+	willowtreebook.r60638
+	withargs.r52641
+	wordcount.r46165
+	wordlike.r15878
+	worksheet.r48423
+	wrapfig.r61719
+	wrapfig2.r69513
+	wrapstuff.r64058
+	writeongrid.r68863
+	wtref.r69214
+	xargs.r15878
+	xassoccnt.r61112
+	xbmks.r53448
+	xcntperchap.r54080
+	xcolor-material.r42289
+	xcolor-solarized.r61719
+	xcomment.r20031
+	xcookybooky.r36435
+	xcpdftips.r50449
+	xdoc.r15878
+	xellipsis.r47546
+	xfakebold.r68929
+	xfor.r15878
+	xhfill.r22575
+	xifthen.r38929
+	xint.r63562
+	xkcdcolors.r67895
+	xkeymask.r69223
+	xltabular.r56855
+	xmpincl.r60593
+	xnewcommand.r15878
+	xoptarg.r15878
+	xpatch.r54563
+	xpeek.r61719
+	xprintlen.r35928
+	xpunctuate.r67918
+	xsavebox.r64049
+	xsim.r61988
+	xstring.r68015
+	xtab.r23347
+	xurl.r61553
+	xwatermark.r61719
+	xytree.r15878
+	yafoot.r48568
+	yagusylo.r29803
+	yaletter.r42830
+	ycbook.r46201
+	ydoc.r64887
+	yplan.r34398
+	zebra-goodies.r66630
+	zed-csp.r17258
+	zennote.r65549
+	ziffer.r32279
+	zref.r68278
+	zref-check.r68846
+	zref-clever.r68846
+	zref-vario.r68846
+	zwgetfdate.r15878
+	zwpagelayout.r63074
+"
+TEXLIVE_MODULE_DOC_CONTENTS="
+	2up.doc.r55076
+	a0poster.doc.r54071
+	a4wide.doc.r20943
+	a5comb.doc.r17020
+	abraces.doc.r64967
+	abspos.doc.r64465
+	abstract.doc.r15878
+	accessibility.doc.r55777
+	accsupp.doc.r53052
+	achemso.doc.r69638
+	acro.doc.r62925
+	acronym.doc.r54758
+	acroterm.doc.r61719
+	actuarialangle.doc.r67201
+	actuarialsymbol.doc.r67201
+	addfont.doc.r58559
+	addlines.doc.r49326
+	adjmulticol.doc.r63320
+	adjustbox.doc.r64967
+	adrconv.doc.r46817
+	advdate.doc.r20538
+	affilauthor.doc.r68996
+	akktex.doc.r26055
+	akletter.doc.r15878
+	alchemist.doc.r66924
+	alertmessage.doc.r38055
+	alnumsec.doc.r15878
+	alphalph.doc.r53087
+	alterqcm.doc.r59265
+	altfont.doc.r15878
+	altsubsup.doc.r62738
+	amsaddr.doc.r64357
+	animate.doc.r67401
+	anonchap.doc.r17049
+	answers.doc.r35032
+	anyfontsize.doc.r17050
+	appendix.doc.r53718
+	appendixnumberbeamer.doc.r46317
+	apptools.doc.r28400
+	arabicfront.doc.r51474
+	arcs.doc.r15878
+	argumentation.doc.r69023
+	arraycols.doc.r68277
+	arrayjobx.doc.r18125
+	arraysort.doc.r31576
+	arydshln.doc.r50084
+	asciilist.doc.r49060
+	askinclude.doc.r54725
+	assignment.doc.r20431
+	assoccnt.doc.r38497
+	association-matrix.doc.r64845
+	atenddvi.doc.r56922
+	atendofenv.doc.r62164
+	attachfile.doc.r42099
+	aurl.doc.r41853
+	authoraftertitle.doc.r55889
+	authorarchive.doc.r65777
+	authorindex.doc.r51757
+	autofancyhdr.doc.r54049
+	autonum.doc.r36084
+	autopdf.doc.r32377
+	autopuncitems.doc.r63045
+	avremu.doc.r35373
+	awesomebox.doc.r57349
+	axessibility.doc.r57105
+	background.doc.r42428
+	bankstatement.doc.r38857
+	bashful.doc.r25597
+	basicarith.doc.r35460
+	bchart.doc.r43928
+	beamer-rl.doc.r69254
+	beamer2thesis.doc.r27539
+	beamerappendixnote.doc.r55732
+	beameraudience.doc.r23427
+	beamerauxtheme.doc.r56087
+	beamercolorthemeowl.doc.r40105
+	beamerdarkthemes.doc.r55117
+	beamerposter.doc.r54512
+	beamersubframe.doc.r23510
+	beamertheme-arguelles.doc.r68659
+	beamertheme-cuerna.doc.r42161
+	beamertheme-detlevcm.doc.r39048
+	beamertheme-epyt.doc.r41404
+	beamertheme-focus.doc.r69742
+	beamertheme-light.doc.r49867
+	beamertheme-metropolis.doc.r43031
+	beamertheme-npbt.doc.r54512
+	beamertheme-phnompenh.doc.r39100
+	beamertheme-pure-minimalistic.doc.r56934
+	beamertheme-rainbow.doc.r67542
+	beamertheme-saintpetersburg.doc.r45877
+	beamertheme-simpledarkblue.doc.r60061
+	beamertheme-simpleplus.doc.r64770
+	beamertheme-tcolorbox.doc.r67000
+	beamertheme-trigon.doc.r65985
+	beamertheme-upenn-bc.doc.r29937
+	beamerthemeamurmaple.doc.r69742
+	beamerthemeconcrete.doc.r69528
+	beamerthemelalic.doc.r58777
+	beamerthemenirma.doc.r20765
+	beamerthemenord.doc.r56180
+	bearwear.doc.r54826
+	beaulivre.doc.r68376
+	beautybook.doc.r68438
+	beton.doc.r15878
+	bewerbung.doc.r61632
+	bez123.doc.r15878
+	bhcexam.doc.r64093
+	bibletext.doc.r45196
+	bigfoot.doc.r38248
+	bigints.doc.r29803
+	bilingualpages.doc.r59643
+	biochemistry-colors.doc.r54512
+	bithesis.doc.r68634
+	bizcard.doc.r15878
+	blindtext.doc.r25039
+	blkarray.doc.r36406
+	block.doc.r17209
+	blowup.doc.r67640
+	bnumexpr.doc.r59244
+	boites.doc.r32235
+	bold-extra.doc.r17076
+	book-of-common-prayer.doc.r62240
+	bookcover.doc.r65394
+	bookest.doc.r15878
+	booklet.doc.r15878
+	bookshelf.doc.r55475
+	boolexpr.doc.r17830
+	bophook.doc.r17062
+	boxedminipage.doc.r54827
+	boxhandler.doc.r28031
+	bracketkey.doc.r17129
+	braket.doc.r17127
+	breakurl.doc.r29901
+	bubblesort.doc.r56070
+	bullcntr.doc.r15878
+	bxcalc.doc.r56431
+	bxdpx-beamer.doc.r41813
+	bxdvidriver.doc.r43219
+	bxenclose.doc.r40213
+	bxnewfont.doc.r44173
+	bxpapersize.doc.r63174
+	bxpdfver.doc.r63185
+	bxtexlogo.doc.r63231
+	calcage.doc.r27725
+	calctab.doc.r15878
+	calculator.doc.r64424
+	calrsfs.doc.r17125
+	cals.doc.r43003
+	calxxxx-yyyy.doc.r69266
+	cancel.doc.r32508
+	canoniclayout.doc.r64889
+	capt-of.doc.r29803
+	captcont.doc.r15878
+	captdef.doc.r17353
+	carbohydrates.doc.r39000
+	cases.doc.r54682
+	casyl.doc.r15878
+	catchfile.doc.r53084
+	catchfilebetweentags.doc.r21476
+	catechis.doc.r59998
+	catoptions.doc.r68982
+	cbcoptic.doc.r16666
+	ccaption.doc.r23443
+	cclicenses.doc.r15878
+	cd.doc.r34452
+	cd-cover.doc.r17121
+	cdcmd.doc.r60742
+	cdpbundl.doc.r61719
+	cellprops.doc.r67201
+	cellspace.doc.r61501
+	censor.doc.r67293
+	centeredline.doc.r64672
+	centerlastline.doc.r56644
+	changebar.doc.r69367
+	changelayout.doc.r16094
+	changelog.doc.r65861
+	changepage.doc.r15878
+	changes.doc.r67201
+	chappg.doc.r15878
+	chapterfolder.doc.r15878
+	cheatsheet.doc.r45069
+	checkend.doc.r51475
+	chet.doc.r45081
+	chextras.doc.r27118
+	childdoc.doc.r49543
+	chkfloat.doc.r27473
+	chletter.doc.r20060
+	chngcntr.doc.r47577
+	chronology.doc.r67973
+	circ.doc.r62977
+	circledsteps.doc.r67889
+	circledtext.doc.r63166
+	classics.doc.r53671
+	classpack.doc.r55218
+	clefval.doc.r55985
+	cleveref.doc.r61719
+	cleveref-usedon.doc.r66915
+	clicks.doc.r64602
+	clipboard.doc.r47747
+	clistmap.doc.r61811
+	clock.doc.r15878
+	clrdblpg.doc.r47511
+	clrstrip.doc.r60363
+	cmdstring.doc.r15878
+	cmdtrack.doc.r28910
+	cmsd.doc.r18787
+	cnltx.doc.r55265
+	cntformats.doc.r34668
+	cntperchap.doc.r37572
+	codebox.doc.r61771
+	codedescribe.doc.r69343
+	codedoc.doc.r17630
+	codehigh.doc.r65787
+	codepage.doc.r51502
+	codesection.doc.r34481
+	collcell.doc.r64967
+	collectbox.doc.r64967
+	colophon.doc.r47913
+	color-edits.doc.r56707
+	colordoc.doc.r18270
+	colorframed.doc.r64551
+	colorinfo.doc.r15878
+	coloring.doc.r41042
+	colorist.doc.r68440
+	colorspace.doc.r50585
+	colortab.doc.r22155
+	colorwav.doc.r67012
+	colorweb.doc.r31490
+	colourchange.doc.r21741
+	combelow.doc.r18462
+	combine.doc.r19361
+	comma.doc.r18259
+	commado.doc.r38875
+	commedit.doc.r50116
+	comment.doc.r41927
+	commonunicode.doc.r62901
+	competences.doc.r47573
+	concepts.doc.r29020
+	concprog.doc.r18791
+	conditext.doc.r55387
+	constants.doc.r15878
+	continue.doc.r49449
+	contour.doc.r18950
+	contracard.doc.r67201
+	conv-xkv.doc.r43558
+	cooking.doc.r15878
+	cooking-units.doc.r65241
+	cool.doc.r67013
+	coolfn.doc.r69007
+	coollist.doc.r67048
+	coolstr.doc.r67015
+	coolthms.doc.r29062
+	cooltooltips.doc.r60201
+	coop-writing.doc.r61607
+	coordsys.doc.r15878
+	copyedit.doc.r37928
+	copyrightbox.doc.r24829
+	coseoul.doc.r23862
+	counterz.doc.r67335
+	counttexruns.doc.r27576
+	courseoutline.doc.r15878
+	coursepaper.doc.r15878
+	coverpage.doc.r63509
+	cprotect.doc.r21209
+	cprotectinside.doc.r63833
+	crbox.doc.r29803
+	create-theorem.doc.r67712
+	creationboites.doc.r68087
+	crefthe.doc.r68813
+	crossreference.doc.r15878
+	crossreftools.doc.r55879
+	crumbs.doc.r64602
+	csquotes.doc.r64389
+	css-colors.doc.r54512
+	csvmerge.doc.r51857
+	csvsimple.doc.r69494
+	cuisine.doc.r34453
+	currency.doc.r48990
+	currfile.doc.r64673
+	curriculum-vitae.doc.r68211
+	currvita.doc.r15878
+	customenvs.doc.r68637
+	cutwin.doc.r60901
+	cv.doc.r15878
+	cv4tw.doc.r34577
+	cweb-latex.doc.r28878
+	cyber.doc.r46776
+	cybercic.doc.r37659
+	darkmode.doc.r64271
+	dashbox.doc.r23425
+	dashrule.doc.r29579
+	dashundergaps.doc.r58150
+	dataref.doc.r62942
+	datatool.doc.r52663
+	datax.doc.r61772
+	dateiliste.doc.r27974
+	datenumber.doc.r61761
+	datestamp.doc.r61719
+	datetime.doc.r36650
+	datetime2.doc.r63102
+	datetime2-bahasai.doc.r46287
+	datetime2-basque.doc.r47064
+	datetime2-breton.doc.r52647
+	datetime2-bulgarian.doc.r47031
+	datetime2-catalan.doc.r47032
+	datetime2-croatian.doc.r36682
+	datetime2-czech.doc.r47033
+	datetime2-danish.doc.r47034
+	datetime2-dutch.doc.r47355
+	datetime2-en-fulltext.doc.r36705
+	datetime2-english.doc.r52479
+	datetime2-esperanto.doc.r47356
+	datetime2-estonian.doc.r47565
+	datetime2-finnish.doc.r47047
+	datetime2-french.doc.r56393
+	datetime2-galician.doc.r47631
+	datetime2-german.doc.r67201
+	datetime2-greek.doc.r47533
+	datetime2-hebrew.doc.r47534
+	datetime2-icelandic.doc.r65213
+	datetime2-irish.doc.r47632
+	datetime2-it-fulltext.doc.r54779
+	datetime2-italian.doc.r37146
+	datetime2-latin.doc.r47748
+	datetime2-lsorbian.doc.r47749
+	datetime2-magyar.doc.r48266
+	datetime2-norsk.doc.r48267
+	datetime2-polish.doc.r48456
+	datetime2-portuges.doc.r48457
+	datetime2-romanian.doc.r56394
+	datetime2-russian.doc.r49345
+	datetime2-samin.doc.r49346
+	datetime2-scottish.doc.r52101
+	datetime2-serbian.doc.r67201
+	datetime2-slovak.doc.r52281
+	datetime2-slovene.doc.r52282
+	datetime2-spanish.doc.r45785
+	datetime2-swedish.doc.r36700
+	datetime2-turkish.doc.r52331
+	datetime2-ukrainian.doc.r47552
+	datetime2-usorbian.doc.r52375
+	datetime2-welsh.doc.r52553
+	dblfloatfix.doc.r28983
+	dbshow.doc.r61634
+	debate.doc.r64846
+	decimal.doc.r23374
+	decimalcomma.doc.r69251
+	decorule.doc.r55230
+	defoldfonts.doc.r68234
+	delimtxt.doc.r16549
+	democodetools.doc.r64314
+	denisbdoc.doc.r66137
+	diabetes-logbook.doc.r54810
+	diagbox.doc.r54080
+	diagnose.doc.r19387
+	dialogl.doc.r28946
+	dichokey.doc.r17192
+	dimnum.doc.r58774
+	dinbrief.doc.r15878
+	directory.doc.r15878
+	dirtytalk.doc.r20520
+	dlfltxb.doc.r17337
+	dnaseq.doc.r17194
+	doclicense.doc.r68441
+	docmfp.doc.r15878
+	docmute.doc.r25741
+	docshots.doc.r69676
+	doctools.doc.r34474
+	documentation.doc.r34521
+	docutils.doc.r56594
+	doi.doc.r48634
+	dotarrow.doc.r15878
+	dotlessi.doc.r51476
+	dotseqn.doc.r17195
+	download.doc.r52257
+	dox.doc.r46011
+	dpfloat.doc.r17196
+	dprogress.doc.r15878
+	drac.doc.r15878
+	draftcopy.doc.r15878
+	draftfigure.doc.r44854
+	draftwatermark.doc.r57099
+	dtk.doc.r69504
+	dtxdescribe.doc.r69507
+	dtxgallery.doc.r49504
+	ducksay.doc.r64655
+	duckuments.doc.r52271
+	dvdcoll.doc.r15878
+	dynamicnumber.doc.r38726
+	dynblocks.doc.r35193
+	ean13isbn.doc.r57514
+	easy.doc.r19440
+	easy-todo.doc.r32677
+	easybook.doc.r69747
+	easyfig.doc.r64967
+	easyfloats.doc.r57204
+	easyformat.doc.r44543
+	easylist.doc.r32661
+	easyreview.doc.r38352
+	ebezier.doc.r15878
+	ecclesiastic.doc.r38172
+	econlipsum.doc.r58390
+	ecv.doc.r24928
+	ed.doc.r25231
+	edichokey.doc.r56223
+	edmargin.doc.r27599
+	eemeir.doc.r15878
+	efbox.doc.r33236
+	egplot.doc.r20617
+	ehhline.doc.r54676
+	einfart.doc.r68376
+	elements.doc.r61792
+	ellipsis.doc.r55418
+	elmath.doc.r15878
+	elocalloc.doc.r42712
+	elpres.doc.r60209
+	elzcards.doc.r51894
+	emarks.doc.r24504
+	embedall.doc.r51177
+	embedfile.doc.r65528
+	embrac.doc.r57814
+	emo.doc.r66944
+	emotion.doc.r69752
+	emptypage.doc.r18064
+	emulateapj.doc.r28469
+	endfloat.doc.r57090
+	endheads.doc.r43750
+	endnotes.doc.r53319
+	endnotes-hy.doc.r54758
+	engpron.doc.r16558
+	engrec.doc.r15878
+	enotez.doc.r61490
+	enumitem.doc.r51423
+	enumitem-zref.doc.r21472
+	envbig.doc.r15878
+	environ.doc.r56615
+	envlab.doc.r61937
+	epigraph.doc.r54857
+	epigraph-keys.doc.r61719
+	epiolmec.doc.r15878
+	eq-pin2corr.doc.r59477
+	eqell.doc.r22931
+	eqlist.doc.r32257
+	eqnalign.doc.r43278
+	eqparbox.doc.r45215
+	errata.doc.r42428
+	erw-l3.doc.r61799
+	esami.doc.r67707
+	esdiff.doc.r21385
+	esieecv.doc.r59638
+	esindex.doc.r52342
+	esint.doc.r52240
+	esint-type1.doc.r15878
+	etaremune.doc.r15878
+	etextools.doc.r20694
+	etl.doc.r60998
+	etoc.doc.r69343
+	eukdate.doc.r15878
+	eulerpx.doc.r63967
+	europasscv.doc.r56829
+	europecv.doc.r69661
+	everyhook.doc.r35675
+	everypage.doc.r56694
+	exam.doc.r67600
+	exam-lite.doc.r65754
+	exam-n.doc.r64674
+	exam-randomizechoices.doc.r61719
+	examdesign.doc.r15878
+	examplep.doc.r55265
+	examz.doc.r67303
+	exceltex.doc.r26313
+	excludeonly.doc.r17262
+	exercise.doc.r35417
+	exercisebank.doc.r50448
+	exercisepoints.doc.r49590
+	exercises.doc.r55188
+	exesheet.doc.r69688
+	exframe.doc.r53911
+	exp-testopt.doc.r15878
+	expdlist.doc.r15878
+	export.doc.r27206
+	exsheets.doc.r67300
+	exsol.doc.r69343
+	extract.doc.r52117
+	facsimile.doc.r21328
+	factura.doc.r61697
+	fail-fast.doc.r67543
+	familytree.doc.r63739
+	fancyhandout.doc.r46411
+	fancylabel.doc.r46736
+	fancynum.doc.r15878
+	fancypar.doc.r58895
+	fancyqr.doc.r64182
+	fancyslides.doc.r36263
+	fancytabs.doc.r41549
+	fancytooltips.doc.r68931
+	fbox.doc.r69041
+	fcolumn.doc.r67729
+	fetchcls.doc.r45245
+	fewerfloatpages.doc.r58058
+	ffcode.doc.r69706
+	ffslides.doc.r38895
+	fgruler.doc.r63721
+	fifo-stack.doc.r33288
+	figsize.doc.r18784
+	filecontents.doc.r66740
+	filecontentsdef.doc.r52208
+	filedate.doc.r29529
+	fileinfo.doc.r28421
+	filemod.doc.r64967
+	fink.doc.r24329
+	finstrut.doc.r21719
+	fistrum.doc.r66461
+	fithesis.doc.r64135
+	fixcmex.doc.r51825
+	fixfoot.doc.r17131
+	fixme.doc.r63708
+	fixmetodonotes.doc.r30168
+	fjodor.doc.r53207
+	flabels.doc.r17272
+	flacards.doc.r19440
+	flagderiv.doc.r15878
+	flashcards.doc.r62104
+	flashmovie.doc.r25768
+	flexipage.doc.r66614
+	flipbook.doc.r25584
+	flippdf.doc.r56782
+	floatbytocbasic.doc.r67945
+	floatflt.doc.r25540
+	floatrow.doc.r15878
+	floatrowbytocbasic.doc.r67946
+	flowfram.doc.r35291
+	fmp.doc.r15878
+	fmtcount.doc.r53912
+	fn2end.doc.r15878
+	fnbreak.doc.r66615
+	fncychap.doc.r20710
+	fncylab.doc.r52090
+	fnpara.doc.r25607
+	fnpct.doc.r62248
+	fnumprint.doc.r29173
+	foilhtml.doc.r61937
+	foliono.doc.r58877
+	fontaxes.doc.r55920
+	fontsetup.doc.r69390
+	fontsize.doc.r60161
+	fonttable.doc.r44799
+	footmisc.doc.r69729
+	footmisx.doc.r42621
+	footnotebackref.doc.r27034
+	footnoterange.doc.r66149
+	footnpag.doc.r15878
+	forarray.doc.r15878
+	foreign.doc.r27819
+	forloop.doc.r67017
+	formlett.doc.r21480
+	forms16be.doc.r51305
+	formular.doc.r15878
+	fragments.doc.r15878
+	frame.doc.r18312
+	framed.doc.r26789
+	frankenstein.doc.r15878
+	frege.doc.r27417
+	froufrou.doc.r67201
+	ftcap.doc.r17275
+	ftnxtra.doc.r29652
+	fullblck.doc.r25434
+	fullminipage.doc.r34545
+	fullwidth.doc.r24684
+	functional.doc.r65485
+	fundus-calligra.doc.r26018
+	fundus-sueterlin.doc.r26030
+	fvextra.doc.r69001
+	fwlw.doc.r29803
+	g-brief.doc.r50415
+	gatherenum.doc.r67201
+	gauss.doc.r32934
+	gcard.doc.r15878
+	gcite.doc.r15878
+	gender.doc.r36464
+	genealogy-profiles.doc.r69580
+	genmpage.doc.r15878
+	gensymb.doc.r64740
+	getfiledate.doc.r16189
+	getitems.doc.r39365
+	gindex.doc.r52311
+	ginpenc.doc.r24980
+	gitfile-info.doc.r51928
+	gitinfo.doc.r34049
+	gitinfo2.doc.r38913
+	gitlog.doc.r38932
+	gitstatus.doc.r64662
+	gitver.doc.r63920
+	globalvals.doc.r49962
+	gloss.doc.r15878
+	glossaries-danish.doc.r35665
+	glossaries-dutch.doc.r35685
+	glossaries-english.doc.r35665
+	glossaries-estonian.doc.r49928
+	glossaries-extra.doc.r68409
+	glossaries-finnish.doc.r54080
+	glossaries-french.doc.r42873
+	glossaries-german.doc.r35665
+	glossaries-irish.doc.r35665
+	glossaries-italian.doc.r35665
+	glossaries-magyar.doc.r35665
+	glossaries-norsk.doc.r67141
+	glossaries-nynorsk.doc.r67201
+	glossaries-polish.doc.r35665
+	glossaries-portuges.doc.r36064
+	glossaries-serbian.doc.r35665
+	glossaries-slovene.doc.r51211
+	glossaries-spanish.doc.r35665
+	gmdoc.doc.r21292
+	gmdoc-enhance.doc.r15878
+	gmiflink.doc.r15878
+	gmutils.doc.r24287
+	gmverb.doc.r24288
+	grabbox.doc.r65223
+	gradient-text.doc.r65567
+	grading-scheme.doc.r62505
+	graphbox.doc.r46360
+	graphicscache.doc.r65318
+	graphicx-psmin.doc.r56931
+	graphicxbox.doc.r32630
+	graphpaper.doc.r63116
+	grayhints.doc.r49052
+	grfpaste.doc.r17354
+	grid.doc.r61719
+	grid-system.doc.r32981
+	gridpapers.doc.r58723
+	gridset.doc.r53762
+	gridslides.doc.r54512
+	gs1.doc.r59620
+	guitlogo.doc.r55741
+	ha-prosper.doc.r59651
+	hackthefootline.doc.r46494
+	halloweenmath.doc.r52602
+	handin.doc.r48255
+	handout.doc.r43962
+	handoutwithnotes.doc.r62140
+	hang.doc.r43280
+	hanging.doc.r15878
+	hardwrap.doc.r21396
+	harnon-cv.doc.r26543
+	harpoon.doc.r21327
+	hc.doc.r15878
+	he-she.doc.r41359
+	hep-acronym.doc.r67632
+	hep-float.doc.r67632
+	hep-math.doc.r67632
+	hep-text.doc.r67632
+	hep-title.doc.r67632
+	hereapplies.doc.r68638
+	hhtensor.doc.r54080
+	hideanswer.doc.r63852
+	highlightlatex.doc.r58392
+	highlightx.doc.r68756
+	histogr.doc.r15878
+	hitec.doc.r15878
+	hitreport.doc.r58357
+	hletter.doc.r30002
+	hobsub.doc.r52810
+	homework.doc.r68773
+	hpsdiss.doc.r15878
+	href-ul.doc.r69359
+	hrefhide.doc.r66189
+	huawei.doc.r68336
+	hvextern.doc.r69651
+	hvindex.doc.r46051
+	hvlogos.doc.r69581
+	hvpygmentex.doc.r62405
+	hvqrurl.doc.r69723
+	hwemoji.doc.r65001
+	hypdestopt.doc.r56253
+	hypdoc.doc.r68661
+	hypdvips.doc.r53197
+	hyper.doc.r17357
+	hyperbar.doc.r48147
+	hypernat.doc.r17358
+	hyperxmp.doc.r68251
+	hyphenat.doc.r15878
+	identkey.doc.r61719
+	idxcmds.doc.r54554
+	idxlayout.doc.r25821
+	iexec.doc.r69420
+	ifallfalse.doc.r60027
+	iffont.doc.r38823
+	ifmslide.doc.r20727
+	ifmtarg.doc.r47544
+	ifnextok.doc.r23379
+	ifoddpage.doc.r64967
+	ifthenx.doc.r25819
+	iitem.doc.r29613
+	image-gallery.doc.r15878
+	imakeidx.doc.r42287
+	import.doc.r54683
+	incgraph.doc.r60810
+	indextools.doc.r68555
+	inline-images.doc.r61719
+	inlinedef.doc.r15878
+	inlinelabel.doc.r63853
+	inputenx.doc.r52986
+	inputtrc.doc.r28019
+	interactiveworkbook.doc.r15878
+	interfaces.doc.r21474
+	intopdf.doc.r63987
+	inversepath.doc.r15878
+	invoice.doc.r48359
+	invoice-class.doc.r49749
+	invoice2.doc.r67327
+	ipsum.doc.r68861
+	iso.doc.r15878
+	iso10303.doc.r15878
+	isodate.doc.r16613
+	isodoc.doc.r59709
+	isonums.doc.r17362
+	isopt.doc.r45509
+	isorot.doc.r15878
+	isosafety.doc.r68801
+	isotope.doc.r23711
+	issuulinks.doc.r25742
+	iwonamath.doc.r68144
+	jlabels.doc.r24858
+	jmsdelim.doc.r62630
+	jobname-suffix.doc.r64797
+	joinbox.doc.r68003
+	jslectureplanner.doc.r57095
+	jumplines.doc.r37553
+	jvlisting.doc.r24638
+	kalendarium.doc.r48744
+	kantlipsum.doc.r68983
+	kerntest.doc.r15878
+	keycommand.doc.r18042
+	keyfloat.doc.r69399
+	keyindex.doc.r50828
+	keyparse.doc.r60277
+	keyreader.doc.r28195
+	keystroke.doc.r17992
+	keyval2e.doc.r23698
+	keyvaltable.doc.r65416
+	kix.doc.r21606
+	knowledge.doc.r61991
+	koma-moderncvclassic.doc.r25025
+	koma-script-sfs.doc.r26137
+	komacv.doc.r57721
+	komacv-rg.doc.r49064
+	korigamik.doc.r68204
+	ktv-texdata.doc.r27369
+	l3build.doc.r69748
+	labbook.doc.r15878
+	labels.doc.r15878
+	labels4easylist.doc.r51124
+	labelschanged.doc.r69400
+	lambdax.doc.r60278
+	lastpackage.doc.r34481
+	lastpage.doc.r68557
+	latex-amsmath-dev.doc.r68730
+	latex-base-dev.doc.r68730
+	latex-bin-dev.doc.r66186
+	latex-context-ppchtex.doc.r66687
+	latex-firstaid-dev.doc.r68730
+	latex-graphics-dev.doc.r68730
+	latex-lab-dev.doc.r68730
+	latex-tools-dev.doc.r68730
+	latex-uni8.doc.r49729
+	latex2pydata.doc.r68919
+	latexcolors.doc.r49888
+	latexdemo.doc.r67201
+	latexgit.doc.r54811
+	layouts.doc.r42428
+	lazylist.doc.r17691
+	lccaps.doc.r46432
+	lcd.doc.r16549
+	lcg.doc.r31474
+	leading.doc.r15878
+	leaflet.doc.r56878
+	lebhart.doc.r68376
+	lectures.doc.r53642
+	lectureslides.doc.r62292
+	leftidx.doc.r15878
+	leftindex.doc.r69660
+	leipzig.doc.r52450
+	lengthconvert.doc.r55064
+	lettre.doc.r54722
+	lettrine.doc.r69508
+	lewis.doc.r15878
+	lhelp.doc.r23638
+	libgreek.doc.r65004
+	limap.doc.r44863
+	linegoal.doc.r21523
+	linop.doc.r41304
+	lipsum.doc.r60561
+	lisp-on-tex.doc.r38722
+	listing.doc.r17373
+	listingsutf8.doc.r53097
+	listlbls.doc.r67215
+	listliketab.doc.r15878
+	listofsymbols.doc.r16134
+	litesolution.doc.r69115
+	litetable.doc.r69678
+	lkproof.doc.r20021
+	lmake.doc.r25552
+	locality.doc.r20422
+	logbox.doc.r24499
+	logical-markup-utils.doc.r15878
+	logoetalab.doc.r68916
+	logpap.doc.r15878
+	longfbox.doc.r39028
+	longfigure.doc.r34302
+	longnamefilelist.doc.r27889
+	loops.doc.r30704
+	lsc.doc.r15878
+	lstaddons.doc.r64967
+	lstfiracode.doc.r49503
+	lt3graph.doc.r45913
+	lt3rawobjects.doc.r66619
+	ltablex.doc.r34923
+	ltabptch.doc.r17533
+	ltxdockit.doc.r21869
+	ltxguidex.doc.r50992
+	ltxkeys.doc.r28332
+	ltxnew.doc.r21586
+	ltxtools.doc.r24897
+	lua-check-hyphen.doc.r47527
+	lua-physical.doc.r59138
+	luatodonotes.doc.r53825
+	macrolist.doc.r60139
+	macroswap.doc.r31498
+	magaz.doc.r24694
+	magicnum.doc.r52983
+	magicwatermark.doc.r63656
+	mailing.doc.r15878
+	mailmerge.doc.r15878
+	makebarcode.doc.r15878
+	makebase.doc.r41012
+	makebox.doc.r15878
+	makecell.doc.r15878
+	makecirc.doc.r15878
+	makecmds.doc.r15878
+	makecookbook.doc.r49311
+	makedtx.doc.r46702
+	makeglos.doc.r15878
+	makelabels.doc.r60255
+	makerobust.doc.r52811
+	mandi.doc.r68950
+	manfnt.doc.r54684
+	manuscript.doc.r36110
+	manyind.doc.r49874
+	marginfit.doc.r48281
+	marginfix.doc.r55064
+	marginnote.doc.r68204
+	markdown.doc.r66954
+	mathalpha.doc.r61089
+	mathastext.doc.r69237
+	mathexam.doc.r15878
+	mathfam256.doc.r53519
+	mathfont.doc.r68241
+	maybemath.doc.r15878
+	mcaption.doc.r15878
+	mceinleger.doc.r15878
+	mcexam.doc.r60481
+	mcite.doc.r18173
+	mciteplus.doc.r31648
+	mdframed.doc.r31075
+	media4svg.doc.r64686
+	media9.doc.r64047
+	medstarbeamer.doc.r38828
+	meetingmins.doc.r31878
+	memexsupp.doc.r15878
+	memory.doc.r30452
+	mensa-tex.doc.r45997
+	menu.doc.r15878
+	menucard.doc.r55643
+	menukeys.doc.r64314
+	metalogox.doc.r69601
+	metanorma.doc.r55010
+	metastr.doc.r56246
+	method.doc.r17485
+	metre.doc.r18489
+	mfirstuc.doc.r64743
+	mftinc.doc.r15878
+	mi-solns.doc.r49651
+	midpage.doc.r17484
+	mindflow.doc.r65236
+	minibox.doc.r30914
+	minidocument.doc.r43752
+	minifp.doc.r32559
+	minimalist.doc.r68552
+	minipage-marginpar.doc.r15878
+	minitoc.doc.r61719
+	minorrevision.doc.r32165
+	minutes.doc.r42186
+	mla-paper.doc.r54080
+	mleftright.doc.r53021
+	mlist.doc.r15878
+	mmap.doc.r15878
+	mnotes.doc.r63406
+	moderncv.doc.r62128
+	modernposter.doc.r47269
+	moderntimeline.doc.r55518
+	modref.doc.r15878
+	modroman.doc.r29803
+	modular.doc.r44142
+	moloch.doc.r69579
+	monofill.doc.r28140
+	moodle.doc.r65672
+	moreenum.doc.r24479
+	morefloats.doc.r37927
+	morehype.doc.r38815
+	moresize.doc.r17513
+	moreverb.doc.r22126
+	morewrites.doc.r69679
+	movement-arrows.doc.r67270
+	movie15.doc.r26473
+	mparhack.doc.r59066
+	mpostinl.doc.r49559
+	msc.doc.r67718
+	msg.doc.r49578
+	mslapa.doc.r54080
+	mtgreek.doc.r17967
+	multenum.doc.r21775
+	multiaudience.doc.r60688
+	multibbl.doc.r15878
+	multicap.doc.r15878
+	multicolrule.doc.r56366
+	multidef.doc.r40637
+	multienv.doc.r64967
+	multiexpand.doc.r45943
+	multifootnote.doc.r63456
+	multilang.doc.r49065
+	multiple-choice.doc.r63722
+	multirow.doc.r58396
+	mversion.doc.r29370
+	mwe.doc.r64967
+	mycv.doc.r26807
+	mylatex.doc.r56751
+	mylatexformat.doc.r21392
+	nag.doc.r24741
+	nameauth.doc.r69758
+	namespc.doc.r15878
+	ncclatex.doc.r15878
+	ncctools.doc.r51810
+	needspace.doc.r29601
+	newcommand.doc.r18704
+	newenviron.doc.r29331
+	newfile.doc.r15878
+	newlfm.doc.r15878
+	newspaper.doc.r15878
+	newunicodechar.doc.r47382
+	newvbtm.doc.r23996
+	newverbs.doc.r64833
+	nfssext-cfr.doc.r43640
+	nicefilelist.doc.r65842
+	niceframe.doc.r36086
+	nicetext.doc.r38914
+	nidanfloat.doc.r48295
+	ninecolors.doc.r62006
+	nlctdoc.doc.r68448
+	noconflict.doc.r30140
+	noindentafter.doc.r59195
+	noitcrul.doc.r15878
+	nolbreaks.doc.r26786
+	nomencl.doc.r61029
+	nomentbl.doc.r16549
+	non-decimal-units.doc.r69742
+	nonfloat.doc.r17598
+	nonumonpart.doc.r22114
+	nopageno.doc.r18128
+	normalcolor.doc.r40125
+	notebeamer.doc.r68871
+	notes.doc.r42428
+	notespages.doc.r41906
+	notestex.doc.r45396
+	notoccite.doc.r18129
+	nowidow.doc.r24066
+	nox.doc.r30991
+	ntheorem.doc.r27609
+	numberedblock.doc.r33109
+	numname.doc.r18130
+	numprint.doc.r27498
+	numspell.doc.r61132
+	ocg-p.doc.r28803
+	ocgx.doc.r54512
+	ocgx2.doc.r65292
+	ocr-latex.doc.r15878
+	octavo.doc.r15878
+	oldstyle.doc.r15878
+	onlyamsmath.doc.r42927
+	opcit.doc.r15878
+	opencolor.doc.r66363
+	optidef.doc.r50941
+	optional.doc.r18131
+	options.doc.r39030
+	orcidlink.doc.r69253
+	orientation.doc.r57390
+	outline.doc.r18360
+	outliner.doc.r21095
+	outlines.doc.r25192
+	outlining.doc.r45601
+	overlays.doc.r57866
+	overpic.doc.r69343
+	padcount.doc.r47621
+	pagecolor.doc.r66885
+	pagecont.doc.r15878
+	pagegrid.doc.r64470
+	pagelayout.doc.r69486
+	pagenote.doc.r63708
+	pagerange.doc.r16915
+	pageslts.doc.r39164
+	palette.doc.r60119
+	pangram.doc.r66300
+	paper.doc.r34521
+	papercdcase.doc.r15878
+	papermas.doc.r66835
+	papertex.doc.r19230
+	paracol.doc.r49560
+	parades.doc.r40042
+	paralist.doc.r43021
+	paresse.doc.r59228
+	parnotes.doc.r51720
+	parsa.doc.r54840
+	parselines.doc.r21475
+	pas-cours.doc.r55859
+	pas-cv.doc.r32263
+	pas-tableur.doc.r66860
+	patchcmd.doc.r41379
+	pauldoc.doc.r16005
+	pawpict.doc.r21629
+	pbalance.doc.r67201
+	pbox.doc.r24807
+	pbsheet.doc.r24830
+	pdf14.doc.r17583
+	pdfannotations.doc.r68958
+	pdfcol.doc.r64469
+	pdfcolmk.doc.r52912
+	pdfcomment.doc.r49047
+	pdfcprot.doc.r18735
+	pdfmarginpar.doc.r23492
+	pdfoverlay.doc.r64210
+	pdfpagediff.doc.r37946
+	pdfpc.doc.r68610
+	pdfpc-movie.doc.r67201
+	pdfprivacy.doc.r45985
+	pdfrender.doc.r69058
+	pdfreview.doc.r50100
+	pdfscreen.doc.r42428
+	pdfslide.doc.r15878
+	pdfsync.doc.r20373
+	pdfwin.doc.r68667
+	pdfx.doc.r50338
+	pecha.doc.r15878
+	perltex.doc.r52162
+	permute.doc.r15878
+	petiteannonce.doc.r25915
+	pgfmath-xfp.doc.r59268
+	phfcc.doc.r60731
+	phfextendedabstract.doc.r60732
+	phffullpagefigure.doc.r41857
+	phfnote.doc.r60733
+	phfparen.doc.r41859
+	phfqit.doc.r60734
+	phfquotetext.doc.r41869
+	phfsvnwatermark.doc.r41870
+	phfthm.doc.r60735
+	philex.doc.r36396
+	phonenumbers.doc.r63774
+	photo.doc.r18739
+	photobook.doc.r68313
+	picture.doc.r54867
+	piff.doc.r21894
+	pkgloader.doc.r47486
+	placeins.doc.r19848
+	plantslabels.doc.r29803
+	plates.doc.r15878
+	plweb.doc.r15878
+	pmboxdraw.doc.r53046
+	polynom.doc.r44832
+	polynomial.doc.r15878
+	polytable.doc.r55837
+	postcards.doc.r21641
+	poster-mac.doc.r18305
+	postnotes.doc.r69102
+	powerdot.doc.r59272
+	ppr-prv.doc.r15878
+	ppt-slides.doc.r69568
+	practicalreports.doc.r52312
+	precattl.doc.r63967
+	prelim2e.doc.r57000
+	preprint.doc.r30447
+	pressrelease.doc.r35147
+	prettyref.doc.r15878
+	prettytok.doc.r66884
+	preview.doc.r69470
+	printlen.doc.r19847
+	probsoln.doc.r44783
+	profmaquette.doc.r69526
+	program.doc.r44214
+	progress.doc.r19519
+	progressbar.doc.r33822
+	projlib.doc.r69689
+	proofread.doc.r61719
+	properties.doc.r15878
+	prosper.doc.r33033
+	protex.doc.r41633
+	protocol.doc.r25562
+	psfragx.doc.r26243
+	pstool.doc.r46393
+	pstring.doc.r42857
+	pxgreeks.doc.r21838
+	pygmentex.doc.r64131
+	python.doc.r60162
+	pythonimmediate.doc.r69487
+	q-and-a.doc.r69164
+	qcm.doc.r63833
+	qstest.doc.r15878
+	qsymbols.doc.r15878
+	quicktype.doc.r42183
+	quiz2socrative.doc.r52276
+	quotchap.doc.r56926
+	quoting.doc.r32818
+	quotmark.doc.r15878
+	ran_toks.doc.r59515
+	randexam.doc.r69690
+	randtext.doc.r15878
+	rccol.doc.r15878
+	rcs-multi.doc.r64967
+	rcsinfo.doc.r15878
+	readablecv.doc.r67986
+	readarray.doc.r60540
+	realboxes.doc.r64967
+	recipe.doc.r54080
+	recipebook.doc.r37026
+	recipecard.doc.r15878
+	rectopma.doc.r19980
+	refcheck.doc.r29128
+	refenums.doc.r44131
+	reflectgraphics.doc.r40612
+	refman.doc.r15878
+	refstyle.doc.r69680
+	regcount.doc.r19979
+	regexpatch.doc.r58668
+	register.doc.r54485
+	regstats.doc.r66795
+	relenc.doc.r22050
+	relsize.doc.r30707
+	repeatindex.doc.r24305
+	repltext.doc.r56433
+	rescansync.doc.r63856
+	resmes.doc.r65375
+	responsive.doc.r69147
+	returntogrid.doc.r48485
+	rgltxdoc.doc.r53858
+	rjlparshap.doc.r15878
+	rlepsf.doc.r19082
+	rmpage.doc.r54080
+	robust-externalize.doc.r69459
+	robustcommand.doc.r15878
+	robustindex.doc.r49877
+	romanbar.doc.r25005
+	romanbarpagenumber.doc.r36236
+	romanneg.doc.r20087
+	romannum.doc.r15878
+	rorlink.doc.r67461
+	rotfloat.doc.r18292
+	rotpages.doc.r18740
+	roundbox.doc.r29675
+	rterface.doc.r30084
+	rtkinenc.doc.r20003
+	rulerbox.doc.r50984
+	rulercompass.doc.r32392
+	runcode.doc.r69471
+	rvwrite.doc.r19614
+	sanitize-umlaut.doc.r67126
+	sauerj.doc.r15878
+	saveenv.doc.r65346
+	savefnmark.doc.r15878
+	savetrees.doc.r40525
+	scale.doc.r15878
+	scalebar.doc.r15878
+	scalerel.doc.r42809
+	scanpages.doc.r42633
+	schedule.doc.r51805
+	schooldocs.doc.r69659
+	scontents.doc.r62902
+	scrambledenvs.doc.r60615
+	scrlayer-fancyhdr.doc.r63844
+	scrlttr2copy.doc.r56733
+	scrwfile.doc.r66872
+	sdaps.doc.r65345
+	sdrt.doc.r15878
+	secdot.doc.r20208
+	secnum.doc.r61813
+	sectionbox.doc.r37749
+	sectionbreak.doc.r50339
+	sectsty.doc.r15878
+	seealso.doc.r43595
+	selectp.doc.r20185
+	selinput.doc.r53098
+	semantex.doc.r65679
+	semantic.doc.r15878
+	semantic-markup.doc.r53607
+	semesterplanner.doc.r56841
+	semioneside.doc.r15878
+	semproc.doc.r37568
+	semtex.doc.r56530
+	sepfootnotes.doc.r41732
+	seqsplit.doc.r15878
+	sesstime.doc.r49750
+	setspaceenhanced.doc.r68493
+	sf298.doc.r41653
+	sffms.doc.r15878
+	shadethm.doc.r53350
+	shadow.doc.r20312
+	shadowtext.doc.r26522
+	shapepar.doc.r69343
+	shdoc.doc.r41991
+	shipunov.doc.r52334
+	shorttoc.doc.r15878
+	show2e.doc.r15878
+	showcharinbox.doc.r29803
+	showdim.doc.r28918
+	showexpl.doc.r57414
+	showlabels.doc.r63940
+	sidecap.doc.r65618
+	sidenotes.doc.r54524
+	sidenotesplus.doc.r69176
+	silence.doc.r27028
+	sillypage.doc.r66349
+	sim-os-menus.doc.r68843
+	simplecd.doc.r29260
+	simplecv.doc.r35537
+	simpleinvoice.doc.r45673
+	simplivre.doc.r68376
+	sitem.doc.r22136
+	skb.doc.r22781
+	skdoc.doc.r56950
+	skeldoc.doc.r57922
+	skeycommand.doc.r24652
+	skeyval.doc.r30560
+	skills.doc.r56734
+	skrapport.doc.r52412
+	slantsc.doc.r25007
+	smalltableof.doc.r20333
+	smart-eqn.doc.r61719
+	smartref.doc.r20311
+	smartunits.doc.r39592
+	snapshot.doc.r56735
+	snaptodo.doc.r61155
+	snotez.doc.r61992
+	soulpos.doc.r60772
+	spacingtricks.doc.r69048
+	spark-otf.doc.r62481
+	sparklines.doc.r42821
+	sphack.doc.r20842
+	splitindex.doc.r39766
+	spot.doc.r22408
+	spotcolor.doc.r15878
+	spreadtab.doc.r68256
+	spverbatim.doc.r15878
+	srbook-mem.doc.r45818
+	srcltx.doc.r15878
+	sseq.doc.r31585
+	sslides.doc.r32293
+	stackengine.doc.r60019
+	standalone.doc.r64677
+	starray.doc.r69002
+	stdclsdv.doc.r15878
+	stdpage.doc.r15878
+	stealcaps.doc.r64967
+	stex.doc.r68569
+	storebox.doc.r64967
+	storecmd.doc.r24431
+	stringstrings.doc.r57097
+	sttools.doc.r60736
+	stubs.doc.r69128
+	studenthandouts.doc.r43516
+	styledcmd.doc.r65262
+	subdepth.doc.r15878
+	subdocs.doc.r51480
+	subeqn.doc.r15878
+	subeqnarray.doc.r15878
+	subfigmat.doc.r20308
+	subfigure.doc.r15878
+	subfiles.doc.r56977
+	subfloat.doc.r29349
+	substr.doc.r16117
+	supertabular.doc.r53658
+	suppose.doc.r59281
+	svg.doc.r57010
+	svgcolor.doc.r15878
+	svn.doc.r15878
+	svn-multi.doc.r64967
+	svn-prov.doc.r64967
+	svninfo.doc.r62157
+	swfigure.doc.r63255
+	swungdash.doc.r64204
+	syntax.doc.r15878
+	syntrace.doc.r15878
+	synttree.doc.r16252
+	tabbing.doc.r59715
+	tabfigures.doc.r25202
+	tableaux.doc.r42413
+	tablefootnote.doc.r32804
+	tableof.doc.r59837
+	tablists.doc.r15878
+	tabls.doc.r17255
+	tablvar.doc.r69212
+	tabstackengine.doc.r46848
+	tabto-ltx.doc.r54080
+	tabu.doc.r61719
+	tabularborder.doc.r17885
+	tabularcalc.doc.r15878
+	tabularew.doc.r15878
+	tabularray.doc.r66276
+	tabulary.doc.r34368
+	tagging.doc.r52064
+	tagpair.doc.r42138
+	tagpdf.doc.r69703
+	talk.doc.r42428
+	tamefloats.doc.r27345
+	tangocolors.doc.r66733
+	tasks.doc.r61541
+	tcldoc.doc.r22018
+	tcolorbox.doc.r69370
+	tdclock.doc.r33043
+	technics.doc.r29349
+	ted.doc.r15878
+	templatetools.doc.r67201
+	termcal.doc.r22514
+	termlist.doc.r18923
+	termsim.doc.r61414
+	testhyphens.doc.r38928
+	testidx.doc.r60966
+	tex-label.doc.r16372
+	tex-locale.doc.r48500
+	texmate.doc.r15878
+	texments.doc.r15878
+	texpower.doc.r29349
+	texshade.doc.r69371
+	texsurgery.doc.r59885
+	textcsc.doc.r67193
+	textfit.doc.r20591
+	textmerg.doc.r20677
+	textpos.doc.r63967
+	textualicomma.doc.r67201
+	texvc.doc.r46844
+	theoremref.doc.r54512
+	thinsp.doc.r39669
+	thmtools.doc.r67018
+	threadcol.doc.r28754
+	threeparttable.doc.r17383
+	threeparttablex.doc.r34206
+	thumb.doc.r16549
+	thumbs.doc.r33134
+	thumby.doc.r16736
+	ticket.doc.r42280
+	tipauni.doc.r65817
+	titlecaps.doc.r63020
+	titlepic.doc.r43497
+	titleref.doc.r18729
+	titlesec.doc.r68677
+	titling.doc.r15878
+	to-be-determined.doc.r64882
+	tocbibind.doc.r20085
+	tocdata.doc.r69512
+	tocloft.doc.r53364
+	tocvsec2.doc.r33146
+	todo.doc.r17746
+	todonotes.doc.r69319
+	tokcycle.doc.r60320
+	tokenizer.doc.r15878
+	toolbox.doc.r32260
+	topfloat.doc.r19084
+	topiclongtable.doc.r54758
+	totalcount.doc.r67201
+	totcount.doc.r21178
+	totpages.doc.r15878
+	tramlines.doc.r65692
+	translations.doc.r61896
+	transparent.doc.r64852
+	trfsigns.doc.r15878
+	trimspaces.doc.r15878
+	trivfloat.doc.r15878
+	trsym.doc.r18732
+	truncate.doc.r18921
+	tucv.doc.r20680
+	turnthepage.doc.r29803
+	tutodoc.doc.r69343
+	twoinone.doc.r17024
+	twoup.doc.r15878
+	txgreeks.doc.r21839
+	type1cm.doc.r21820
+	typed-checklist.doc.r63445
+	typeface.doc.r27046
+	typoaid.doc.r44238
+	typogrid.doc.r24994
+	uassign.doc.r38459
+	ucs.doc.r68759
+	uebungsblatt.doc.r15878
+	umoline.doc.r19085
+	underlin.doc.r15878
+	underoverlap.doc.r29019
+	undolabl.doc.r65846
+	uni-titlepage.doc.r68917
+	unicode-math-input.doc.r69591
+	unicodefonttable.doc.r67066
+	unifront.doc.r67054
+	unisc.doc.r63178
+	unitconv.doc.r55060
+	units.doc.r42428
+	unravel.doc.r69308
+	updatemarks.doc.r68163
+	upmethodology.doc.r64613
+	upquote.doc.r26059
+	uri.doc.r48602
+	ushort.doc.r32261
+	uspace.doc.r63123
+	utf8add.doc.r61074
+	uwmslide.doc.r27354
+	variablelm.doc.r60014
+	varindex.doc.r32262
+	varsfromjobname.doc.r44154
+	varwidth.doc.r24104
+	vcell.doc.r59039
+	vdmlisting.doc.r56905
+	verbasef.doc.r21922
+	verbatimbox.doc.r67865
+	verbatimcopy.doc.r15878
+	verbdef.doc.r17177
+	verbments.doc.r23670
+	verifiche.doc.r69726
+	verifycommand.doc.r69389
+	version.doc.r21920
+	versions.doc.r21921
+	versonotes.doc.r69249
+	vertbars.doc.r49429
+	vgrid.doc.r32457
+	vhistory.doc.r61719
+	vmargin.doc.r15878
+	volumes.doc.r15878
+	vpe.doc.r26039
+	vruler.doc.r21598
+	vtable.doc.r51126
+	vwcol.doc.r36254
+	wallcalendar.doc.r45568
+	wallpaper.doc.r15878
+	warning.doc.r66616
+	warpcol.doc.r15878
+	was.doc.r64691
+	webquiz.doc.r58808
+	widetable.doc.r53409
+	widows-and-orphans.doc.r66753
+	williams.doc.r15878
+	willowtreebook.doc.r60638
+	withargs.doc.r52641
+	wordcount.doc.r46165
+	wordlike.doc.r15878
+	worksheet.doc.r48423
+	wrapfig.doc.r61719
+	wrapfig2.doc.r69513
+	wrapstuff.doc.r64058
+	writeongrid.doc.r68863
+	wtref.doc.r69214
+	xargs.doc.r15878
+	xassoccnt.doc.r61112
+	xbmks.doc.r53448
+	xcntperchap.doc.r54080
+	xcolor-material.doc.r42289
+	xcolor-solarized.doc.r61719
+	xcomment.doc.r20031
+	xcookybooky.doc.r36435
+	xcpdftips.doc.r50449
+	xdoc.doc.r15878
+	xellipsis.doc.r47546
+	xfakebold.doc.r68929
+	xfor.doc.r15878
+	xhfill.doc.r22575
+	xifthen.doc.r38929
+	xint.doc.r63562
+	xkcdcolors.doc.r67895
+	xkeymask.doc.r69223
+	xltabular.doc.r56855
+	xmpincl.doc.r60593
+	xnewcommand.doc.r15878
+	xoptarg.doc.r15878
+	xpatch.doc.r54563
+	xpeek.doc.r61719
+	xprintlen.doc.r35928
+	xpunctuate.doc.r67918
+	xsavebox.doc.r64049
+	xsim.doc.r61988
+	xstring.doc.r68015
+	xtab.doc.r23347
+	xurl.doc.r61553
+	xwatermark.doc.r61719
+	xytree.doc.r15878
+	yafoot.doc.r48568
+	yagusylo.doc.r29803
+	yaletter.doc.r42830
+	ycbook.doc.r46201
+	ydoc.doc.r64887
+	yplan.doc.r34398
+	zebra-goodies.doc.r66630
+	zed-csp.doc.r17258
+	zennote.doc.r65549
+	ziffer.doc.r32279
+	zref.doc.r68278
+	zref-check.doc.r68846
+	zref-clever.doc.r68846
+	zref-vario.doc.r68846
+	zwgetfdate.doc.r15878
+	zwpagelayout.doc.r63074
+"
+TEXLIVE_MODULE_SRC_CONTENTS="
+	abspos.source.r64465
+	abstract.source.r15878
+	accessibility.source.r55777
+	accsupp.source.r53052
+	achemso.source.r69638
+	acronym.source.r54758
+	acroterm.source.r61719
+	actuarialangle.source.r67201
+	actuarialsymbol.source.r67201
+	addlines.source.r49326
+	adjmulticol.source.r63320
+	adjustbox.source.r64967
+	adrconv.source.r46817
+	alertmessage.source.r38055
+	alnumsec.source.r15878
+	alphalph.source.r53087
+	altfont.source.r15878
+	altsubsup.source.r62738
+	amsaddr.source.r64357
+	animate.source.r67401
+	answers.source.r35032
+	appendix.source.r53718
+	apptools.source.r28400
+	arcs.source.r15878
+	arraycols.source.r68277
+	arraysort.source.r31576
+	arydshln.source.r50084
+	asciilist.source.r49060
+	askinclude.source.r54725
+	atenddvi.source.r56922
+	atendofenv.source.r62164
+	attachfile.source.r42099
+	autonum.source.r36084
+	autopdf.source.r32377
+	avremu.source.r35373
+	axessibility.source.r57105
+	background.source.r42428
+	basicarith.source.r35460
+	beamerappendixnote.source.r55732
+	beamercolorthemeowl.source.r40105
+	beamersubframe.source.r23510
+	beamertheme-cuerna.source.r42161
+	beamertheme-metropolis.source.r43031
+	beamertheme-saintpetersburg.source.r45877
+	beamertheme-trigon.source.r65985
+	bearwear.source.r54826
+	beton.source.r15878
+	bewerbung.source.r61632
+	bez123.source.r15878
+	bigfoot.source.r38248
+	bithesis.source.r68634
+	bizcard.source.r15878
+	blindtext.source.r25039
+	blowup.source.r67640
+	bnumexpr.source.r59244
+	boites.source.r32235
+	bookcover.source.r65394
+	booklet.source.r15878
+	bookshelf.source.r55475
+	boolexpr.source.r17830
+	bophook.source.r17062
+	boxedminipage.source.r54827
+	boxhandler.source.r28031
+	breakurl.source.r29901
+	bubblesort.source.r56070
+	bullcntr.source.r15878
+	calcage.source.r27725
+	calculator.source.r64424
+	cals.source.r43003
+	canoniclayout.source.r64889
+	capt-of.source.r29803
+	captcont.source.r15878
+	catchfile.source.r53084
+	catchfilebetweentags.source.r21476
+	catechis.source.r59998
+	ccaption.source.r23443
+	cclicenses.source.r15878
+	cd.source.r34452
+	cd-cover.source.r17121
+	cdcmd.source.r60742
+	cdpbundl.source.r61719
+	cellprops.source.r67201
+	centerlastline.source.r56644
+	changebar.source.r69367
+	changepage.source.r15878
+	changes.source.r67201
+	chappg.source.r15878
+	chapterfolder.source.r15878
+	cheatsheet.source.r45069
+	chextras.source.r27118
+	childdoc.source.r49543
+	chletter.source.r20060
+	circ.source.r62977
+	classpack.source.r55218
+	clefval.source.r55985
+	cleveref.source.r61719
+	cleveref-usedon.source.r66915
+	clicks.source.r64602
+	clistmap.source.r61811
+	clrdblpg.source.r47511
+	clrstrip.source.r60363
+	cmdtrack.source.r28910
+	codepage.source.r51502
+	codesection.source.r34481
+	collcell.source.r64967
+	collectbox.source.r64967
+	colophon.source.r47913
+	color-edits.source.r56707
+	colordoc.source.r18270
+	colorwav.source.r67012
+	colorweb.source.r31490
+	combine.source.r19361
+	commado.source.r38875
+	commedit.source.r50116
+	competences.source.r47573
+	constants.source.r15878
+	continue.source.r49449
+	contour.source.r18950
+	contracard.source.r67201
+	conv-xkv.source.r43558
+	cooking.source.r15878
+	cooking-units.source.r65241
+	cool.source.r67013
+	coollist.source.r67048
+	coolstr.source.r67015
+	coolthms.source.r29062
+	cooltooltips.source.r60201
+	coop-writing.source.r61607
+	coordsys.source.r15878
+	copyedit.source.r37928
+	counterz.source.r67335
+	counttexruns.source.r27576
+	coverpage.source.r63509
+	cprotect.source.r21209
+	crossreference.source.r15878
+	crumbs.source.r64602
+	csvmerge.source.r51857
+	cuisine.source.r34453
+	currency.source.r48990
+	currfile.source.r64673
+	currvita.source.r15878
+	cutwin.source.r60901
+	cyber.source.r46776
+	cybercic.source.r37659
+	darkmode.source.r64271
+	dashbox.source.r23425
+	dashrule.source.r29579
+	dashundergaps.source.r58150
+	datatool.source.r52663
+	datax.source.r61772
+	dateiliste.source.r27974
+	datenumber.source.r61761
+	datestamp.source.r61719
+	datetime.source.r36650
+	datetime2.source.r63102
+	datetime2-bahasai.source.r46287
+	datetime2-basque.source.r47064
+	datetime2-breton.source.r52647
+	datetime2-bulgarian.source.r47031
+	datetime2-catalan.source.r47032
+	datetime2-croatian.source.r36682
+	datetime2-czech.source.r47033
+	datetime2-danish.source.r47034
+	datetime2-dutch.source.r47355
+	datetime2-en-fulltext.source.r36705
+	datetime2-english.source.r52479
+	datetime2-esperanto.source.r47356
+	datetime2-estonian.source.r47565
+	datetime2-finnish.source.r47047
+	datetime2-french.source.r56393
+	datetime2-galician.source.r47631
+	datetime2-german.source.r67201
+	datetime2-greek.source.r47533
+	datetime2-hebrew.source.r47534
+	datetime2-icelandic.source.r65213
+	datetime2-irish.source.r47632
+	datetime2-it-fulltext.source.r54779
+	datetime2-italian.source.r37146
+	datetime2-latin.source.r47748
+	datetime2-lsorbian.source.r47749
+	datetime2-magyar.source.r48266
+	datetime2-norsk.source.r48267
+	datetime2-polish.source.r48456
+	datetime2-portuges.source.r48457
+	datetime2-romanian.source.r56394
+	datetime2-russian.source.r49345
+	datetime2-samin.source.r49346
+	datetime2-scottish.source.r52101
+	datetime2-serbian.source.r67201
+	datetime2-slovak.source.r52281
+	datetime2-slovene.source.r52282
+	datetime2-spanish.source.r45785
+	datetime2-swedish.source.r36700
+	datetime2-turkish.source.r52331
+	datetime2-ukrainian.source.r47552
+	datetime2-usorbian.source.r52375
+	datetime2-welsh.source.r52553
+	dbshow.source.r61634
+	debate.source.r64846
+	decimal.source.r23374
+	decimalcomma.source.r69251
+	decorule.source.r55230
+	defoldfonts.source.r68234
+	delimtxt.source.r16549
+	denisbdoc.source.r66137
+	diagbox.source.r54080
+	dialogl.source.r28946
+	dimnum.source.r58774
+	dinbrief.source.r15878
+	dirtytalk.source.r20520
+	dnaseq.source.r17194
+	doclicense.source.r68441
+	docmfp.source.r15878
+	docmute.source.r25741
+	docshots.source.r69676
+	doctools.source.r34474
+	documentation.source.r34521
+	dotarrow.source.r15878
+	dotseqn.source.r17195
+	download.source.r52257
+	dox.source.r46011
+	dprogress.source.r15878
+	drac.source.r15878
+	draftcopy.source.r15878
+	draftwatermark.source.r57099
+	dtxdescribe.source.r69507
+	ducksay.source.r64655
+	duckuments.source.r52271
+	dynamicnumber.source.r38726
+	easybook.source.r69747
+	easyfig.source.r64967
+	easyfloats.source.r57204
+	easyreview.source.r38352
+	ebezier.source.r15878
+	ecclesiastic.source.r38172
+	econlipsum.source.r58390
+	ecv.source.r24928
+	ed.source.r25231
+	edmargin.source.r27599
+	eemeir.source.r15878
+	efbox.source.r33236
+	egplot.source.r20617
+	ellipsis.source.r55418
+	elmath.source.r15878
+	elocalloc.source.r42712
+	elzcards.source.r51894
+	emarks.source.r24504
+	embedall.source.r51177
+	embedfile.source.r65528
+	emo.source.r66944
+	emptypage.source.r18064
+	endfloat.source.r57090
+	endheads.source.r43750
+	endnotes-hy.source.r54758
+	engpron.source.r16558
+	engrec.source.r15878
+	enumitem-zref.source.r21472
+	environ.source.r56615
+	envlab.source.r61937
+	epigraph.source.r54857
+	epiolmec.source.r15878
+	eq-pin2corr.source.r59477
+	eqlist.source.r32257
+	eqnalign.source.r43278
+	eqparbox.source.r45215
+	errata.source.r42428
+	erw-l3.source.r61799
+	esdiff.source.r21385
+	esieecv.source.r59638
+	esint.source.r52240
+	etaremune.source.r15878
+	etextools.source.r20694
+	etl.source.r60998
+	etoc.source.r69343
+	eukdate.source.r15878
+	everyhook.source.r35675
+	everypage.source.r56694
+	exam-n.source.r64674
+	examdesign.source.r15878
+	examz.source.r67303
+	exercise.source.r35417
+	exercises.source.r55188
+	exesheet.source.r69688
+	exframe.source.r53911
+	exp-testopt.source.r15878
+	expdlist.source.r15878
+	export.source.r27206
+	exsol.source.r69343
+	extract.source.r52117
+	facsimile.source.r21328
+	factura.source.r61697
+	fail-fast.source.r67543
+	familytree.source.r63739
+	fancylabel.source.r46736
+	fancynum.source.r15878
+	fancypar.source.r58895
+	fancytabs.source.r41549
+	fancytooltips.source.r68931
+	fcolumn.source.r67729
+	fetchcls.source.r45245
+	fewerfloatpages.source.r58058
+	ffcode.source.r69706
+	fgruler.source.r63721
+	fifo-stack.source.r33288
+	filecontents.source.r66740
+	filecontentsdef.source.r52208
+	filedate.source.r29529
+	fileinfo.source.r28421
+	fink.source.r24329
+	finstrut.source.r21719
+	fistrum.source.r66461
+	fithesis.source.r64135
+	fixcmex.source.r51825
+	fixme.source.r63708
+	fixmetodonotes.source.r30168
+	flabels.source.r17272
+	flagderiv.source.r15878
+	flashcards.source.r62104
+	flexipage.source.r66614
+	flippdf.source.r56782
+	floatbytocbasic.source.r67945
+	floatflt.source.r25540
+	floatrow.source.r15878
+	floatrowbytocbasic.source.r67946
+	flowfram.source.r35291
+	fmp.source.r15878
+	fmtcount.source.r53912
+	fnbreak.source.r66615
+	fnumprint.source.r29173
+	foilhtml.source.r61937
+	fontaxes.source.r55920
+	fontsize.source.r60161
+	fonttable.source.r44799
+	footmisc.source.r69729
+	footmisx.source.r42621
+	footnoterange.source.r66149
+	footnpag.source.r15878
+	forarray.source.r15878
+	foreign.source.r27819
+	forloop.source.r67017
+	forms16be.source.r51305
+	formular.source.r15878
+	frankenstein.source.r15878
+	froufrou.source.r67201
+	ftnxtra.source.r29652
+	fullblck.source.r25434
+	fullminipage.source.r34545
+	fundus-calligra.source.r26018
+	fundus-sueterlin.source.r26030
+	fvextra.source.r69001
+	g-brief.source.r50415
+	gatherenum.source.r67201
+	gcite.source.r15878
+	gender.source.r36464
+	genmpage.source.r15878
+	gensymb.source.r64740
+	getitems.source.r39365
+	ginpenc.source.r24980
+	gitfile-info.source.r51928
+	gitstatus.source.r64662
+	glossaries-danish.source.r35665
+	glossaries-dutch.source.r35685
+	glossaries-english.source.r35665
+	glossaries-estonian.source.r49928
+	glossaries-extra.source.r68409
+	glossaries-finnish.source.r54080
+	glossaries-french.source.r42873
+	glossaries-german.source.r35665
+	glossaries-irish.source.r35665
+	glossaries-italian.source.r35665
+	glossaries-magyar.source.r35665
+	glossaries-norsk.source.r67141
+	glossaries-nynorsk.source.r67201
+	glossaries-polish.source.r35665
+	glossaries-portuges.source.r36064
+	glossaries-serbian.source.r35665
+	glossaries-slovene.source.r51211
+	glossaries-spanish.source.r35665
+	gmdoc-enhance.source.r15878
+	grabbox.source.r65223
+	grading-scheme.source.r62505
+	graphbox.source.r46360
+	graphicscache.source.r65318
+	graphicx-psmin.source.r56931
+	graphicxbox.source.r32630
+	graphpaper.source.r63116
+	grayhints.source.r49052
+	grid.source.r61719
+	gridpapers.source.r58723
+	gridset.source.r53762
+	gs1.source.r59620
+	guitlogo.source.r55741
+	ha-prosper.source.r59651
+	halloweenmath.source.r52602
+	handoutwithnotes.source.r62140
+	hanging.source.r15878
+	hardwrap.source.r21396
+	hc.source.r15878
+	hep-acronym.source.r67632
+	hep-float.source.r67632
+	hep-math.source.r67632
+	hep-text.source.r67632
+	hep-title.source.r67632
+	hhtensor.source.r54080
+	histogr.source.r15878
+	hitreport.source.r58357
+	hpsdiss.source.r15878
+	href-ul.source.r69359
+	hrefhide.source.r66189
+	huawei.source.r68336
+	hypdoc.source.r68661
+	hyper.source.r17357
+	hyperbar.source.r48147
+	hyperxmp.source.r68251
+	hyphenat.source.r15878
+	idxlayout.source.r25821
+	iexec.source.r69420
+	ifallfalse.source.r60027
+	iffont.source.r38823
+	ifmtarg.source.r47544
+	ifnextok.source.r23379
+	ifoddpage.source.r64967
+	iitem.source.r29613
+	imakeidx.source.r42287
+	indextools.source.r68555
+	inlinedef.source.r15878
+	inputenx.source.r52986
+	inputtrc.source.r28019
+	interfaces.source.r21474
+	intopdf.source.r63987
+	inversepath.source.r15878
+	invoice2.source.r67327
+	iso.source.r15878
+	iso10303.source.r15878
+	isodate.source.r16613
+	isodoc.source.r59709
+	isorot.source.r15878
+	isosafety.source.r68801
+	isotope.source.r23711
+	issuulinks.source.r25742
+	iwonamath.source.r68144
+	jmsdelim.source.r62630
+	jvlisting.source.r24638
+	kalendarium.source.r48744
+	kantlipsum.source.r68983
+	kerntest.source.r15878
+	keycommand.source.r18042
+	keyfloat.source.r69399
+	keyindex.source.r50828
+	keyparse.source.r60277
+	keyvaltable.source.r65416
+	knowledge.source.r61991
+	komacv.source.r57721
+	komacv-rg.source.r49064
+	ktv-texdata.source.r27369
+	l3build.source.r69748
+	labbook.source.r15878
+	labels.source.r15878
+	labelschanged.source.r69400
+	lambdax.source.r60278
+	lastpackage.source.r34481
+	lastpage.source.r68557
+	latex-amsmath-dev.source.r68730
+	latex-base-dev.source.r68730
+	latex-firstaid-dev.source.r68730
+	latex-graphics-dev.source.r68730
+	latex-lab-dev.source.r68730
+	latex-tools-dev.source.r68730
+	latex2pydata.source.r68919
+	latexcolors.source.r49888
+	latexdemo.source.r67201
+	latexgit.source.r54811
+	layouts.source.r42428
+	lccaps.source.r46432
+	lcd.source.r16549
+	lcg.source.r31474
+	leading.source.r15878
+	leaflet.source.r56878
+	leftidx.source.r15878
+	leipzig.source.r52450
+	lengthconvert.source.r55064
+	lettrine.source.r69508
+	lhelp.source.r23638
+	libgreek.source.r65004
+	limap.source.r44863
+	linegoal.source.r21523
+	lipsum.source.r60561
+	listingsutf8.source.r53097
+	listlbls.source.r67215
+	listliketab.source.r15878
+	listofsymbols.source.r16134
+	lmake.source.r25552
+	locality.source.r20422
+	logbox.source.r24499
+	logpap.source.r15878
+	longfigure.source.r34302
+	longnamefilelist.source.r27889
+	lstaddons.source.r64967
+	lt3rawobjects.source.r66619
+	ltxnew.source.r21586
+	luatodonotes.source.r53825
+	macrolist.source.r60139
+	macroswap.source.r31498
+	magicnum.source.r52983
+	magicwatermark.source.r63656
+	mailing.source.r15878
+	mailmerge.source.r15878
+	makebase.source.r41012
+	makebox.source.r15878
+	makecell.source.r15878
+	makecmds.source.r15878
+	makedtx.source.r46702
+	makelabels.source.r60255
+	mandi.source.r68950
+	manfnt.source.r54684
+	manuscript.source.r36110
+	marginfit.source.r48281
+	marginfix.source.r55064
+	marginnote.source.r68204
+	markdown.source.r66954
+	mathastext.source.r69237
+	mathexam.source.r15878
+	mathfont.source.r68241
+	mcaption.source.r15878
+	mcite.source.r18173
+	mdframed.source.r31075
+	media9.source.r64047
+	meetingmins.source.r31878
+	memory.source.r30452
+	menu.source.r15878
+	menucard.source.r55643
+	menukeys.source.r64314
+	metalogox.source.r69601
+	metastr.source.r56246
+	method.source.r17485
+	metre.source.r18489
+	mfirstuc.source.r64743
+	mftinc.source.r15878
+	mi-solns.source.r49651
+	mindflow.source.r65236
+	minibox.source.r30914
+	minidocument.source.r43752
+	minifp.source.r32559
+	minipage-marginpar.source.r15878
+	minutes.source.r42186
+	mleftright.source.r53021
+	mlist.source.r15878
+	mnotes.source.r63406
+	moderntimeline.source.r55518
+	modref.source.r15878
+	modroman.source.r29803
+	moloch.source.r69579
+	monofill.source.r28140
+	moodle.source.r65672
+	morefloats.source.r37927
+	morehype.source.r38815
+	moresize.source.r17513
+	moreverb.source.r22126
+	morewrites.source.r69679
+	mparhack.source.r59066
+	mpostinl.source.r49559
+	msg.source.r49578
+	mtgreek.source.r17967
+	multiaudience.source.r60688
+	multibbl.source.r15878
+	multicap.source.r15878
+	multicolrule.source.r56366
+	multidef.source.r40637
+	multienv.source.r64967
+	multiexpand.source.r45943
+	multilang.source.r49065
+	multirow.source.r58396
+	mversion.source.r29370
+	mwe.source.r64967
+	mycv.source.r26807
+	mylatexformat.source.r21392
+	nag.source.r24741
+	nameauth.source.r69758
+	namespc.source.r15878
+	ncctools.source.r51810
+	needspace.source.r29601
+	newfile.source.r15878
+	newlfm.source.r15878
+	newspaper.source.r15878
+	newunicodechar.source.r47382
+	newvbtm.source.r23996
+	newverbs.source.r64833
+	nicefilelist.source.r65842
+	niceframe.source.r36086
+	nicetext.source.r38914
+	nidanfloat.source.r48295
+	noindentafter.source.r59195
+	noitcrul.source.r15878
+	nomencl.source.r61029
+	nomentbl.source.r16549
+	nonfloat.source.r17598
+	nonumonpart.source.r22114
+	normalcolor.source.r40125
+	notes.source.r42428
+	notespages.source.r41906
+	nowidow.source.r24066
+	ntheorem.source.r27609
+	numprint.source.r27498
+	ocgx.source.r54512
+	octavo.source.r15878
+	oldstyle.source.r15878
+	onlyamsmath.source.r42927
+	opcit.source.r15878
+	orcidlink.source.r69253
+	outlining.source.r45601
+	overpic.source.r69343
+	padcount.source.r47621
+	pagecolor.source.r66885
+	pagecont.source.r15878
+	pagegrid.source.r64470
+	pagenote.source.r63708
+	pageslts.source.r39164
+	palette.source.r60119
+	pangram.source.r66300
+	paper.source.r34521
+	papercdcase.source.r15878
+	papermas.source.r66835
+	papertex.source.r19230
+	paracol.source.r49560
+	paralist.source.r43021
+	paresse.source.r59228
+	parselines.source.r21475
+	patch.source.r42428
+	patchcmd.source.r41379
+	pauldoc.source.r16005
+	pawpict.source.r21629
+	pbalance.source.r67201
+	pbox.source.r24807
+	pbsheet.source.r24830
+	pdf14.source.r17583
+	pdfcol.source.r64469
+	pdfcprot.source.r18735
+	pdfoverlay.source.r64210
+	pdfpc-movie.source.r67201
+	pdfprivacy.source.r45985
+	pdfrender.source.r69058
+	pdfx.source.r50338
+	perltex.source.r52162
+	permute.source.r15878
+	pgfmath-xfp.source.r59268
+	phfcc.source.r60731
+	phfextendedabstract.source.r60732
+	phffullpagefigure.source.r41857
+	phfnote.source.r60733
+	phfparen.source.r41859
+	phfqit.source.r60734
+	phfquotetext.source.r41869
+	phfsvnwatermark.source.r41870
+	phfthm.source.r60735
+	photo.source.r18739
+	picture.source.r54867
+	plweb.source.r15878
+	pmboxdraw.source.r53046
+	polynom.source.r44832
+	polynomial.source.r15878
+	polytable.source.r55837
+	postnotes.source.r69102
+	powerdot.source.r59272
+	ppr-prv.source.r15878
+	ppt-slides.source.r69568
+	prelim2e.source.r57000
+	preprint.source.r30447
+	pressrelease.source.r35147
+	prettyref.source.r15878
+	preview.source.r69470
+	probsoln.source.r44783
+	projlib.source.r69689
+	proofread.source.r61719
+	protocol.source.r25562
+	psfragx.source.r26243
+	pxgreeks.source.r21838
+	qcm.source.r63833
+	qstest.source.r15878
+	qsymbols.source.r15878
+	quotchap.source.r56926
+	quoting.source.r32818
+	quotmark.source.r15878
+	ran_toks.source.r59515
+	rccol.source.r15878
+	rcs-multi.source.r64967
+	rcsinfo.source.r15878
+	realboxes.source.r64967
+	recipecard.source.r15878
+	reflectgraphics.source.r40612
+	refman.source.r15878
+	refstyle.source.r69680
+	regcount.source.r19979
+	regexpatch.source.r58668
+	register.source.r54485
+	regstats.source.r66795
+	relenc.source.r22050
+	repltext.source.r56433
+	resmes.source.r65375
+	rgltxdoc.source.r53858
+	rjlparshap.source.r15878
+	robustcommand.source.r15878
+	romanbar.source.r25005
+	romanbarpagenumber.source.r36236
+	romannum.source.r15878
+	rorlink.source.r67461
+	rotfloat.source.r18292
+	rtkinenc.source.r20003
+	rulercompass.source.r32392
+	sauerj.source.r15878
+	savefnmark.source.r15878
+	savetrees.source.r40525
+	scale.source.r15878
+	scalebar.source.r15878
+	schedule.source.r51805
+	schooldocs.source.r69659
+	scontents.source.r62902
+	scrambledenvs.source.r60615
+	scrlayer-fancyhdr.source.r63844
+	scrwfile.source.r66872
+	sdaps.source.r65345
+	secnum.source.r61813
+	sectsty.source.r15878
+	seealso.source.r43595
+	selinput.source.r53098
+	semantic.source.r15878
+	semesterplanner.source.r56841
+	semioneside.source.r15878
+	semproc.source.r37568
+	seqsplit.source.r15878
+	sesstime.source.r49750
+	setspaceenhanced.source.r68493
+	sf298.source.r41653
+	sffms.source.r15878
+	shdoc.source.r41991
+	shorttoc.source.r15878
+	show2e.source.r15878
+	showcharinbox.source.r29803
+	showexpl.source.r57414
+	showlabels.source.r63940
+	sidecap.source.r65618
+	sidenotes.source.r54524
+	sidenotesplus.source.r69176
+	silence.source.r27028
+	sillypage.source.r66349
+	simplecd.source.r29260
+	simplecv.source.r35537
+	sitem.source.r22136
+	skb.source.r22781
+	skdoc.source.r56950
+	skrapport.source.r52412
+	slantsc.source.r25007
+	smart-eqn.source.r61719
+	snapshot.source.r56735
+	spacingtricks.source.r69048
+	splitindex.source.r39766
+	spot.source.r22408
+	spverbatim.source.r15878
+	srcltx.source.r15878
+	sseq.source.r31585
+	stack.source.r15878
+	standalone.source.r64677
+	stdclsdv.source.r15878
+	stdpage.source.r15878
+	stealcaps.source.r64967
+	stex.source.r68569
+	storebox.source.r64967
+	stringstrings.source.r57097
+	sttools.source.r60736
+	styledcmd.source.r65262
+	subdepth.source.r15878
+	subeqn.source.r15878
+	subeqnarray.source.r15878
+	subfigure.source.r15878
+	subfiles.source.r56977
+	subfloat.source.r29349
+	supertabular.source.r53658
+	svg.source.r57010
+	svn.source.r15878
+	svn-multi.source.r64967
+	svn-prov.source.r64967
+	svninfo.source.r62157
+	swfigure.source.r63255
+	syntrace.source.r15878
+	synttree.source.r16252
+	tabbing.source.r59715
+	tabfigures.source.r25202
+	tablefootnote.source.r32804
+	tableof.source.r59837
+	tablists.source.r15878
+	tablvar.source.r69212
+	tabu.source.r61719
+	tabularborder.source.r17885
+	tabularew.source.r15878
+	tabulary.source.r34368
+	tagpdf.source.r69703
+	talk.source.r42428
+	tangocolors.source.r66733
+	tcldoc.source.r22018
+	ted.source.r15878
+	templatetools.source.r67201
+	termcal.source.r22514
+	termlist.source.r18923
+	termsim.source.r61414
+	testhyphens.source.r38928
+	testidx.source.r60966
+	tex-label.source.r16372
+	tex-locale.source.r48500
+	texmate.source.r15878
+	texments.source.r15878
+	texpower.source.r29349
+	texshade.source.r69371
+	textfit.source.r20591
+	textmerg.source.r20677
+	textpos.source.r63967
+	textualicomma.source.r67201
+	texvc.source.r46844
+	thmtools.source.r67018
+	threadcol.source.r28754
+	thumb.source.r16549
+	thumbs.source.r33134
+	tipauni.source.r65817
+	titling.source.r15878
+	to-be-determined.source.r64882
+	tocbibind.source.r20085
+	tocdata.source.r69512
+	tocloft.source.r53364
+	tocvsec2.source.r33146
+	todo.source.r17746
+	todonotes.source.r69319
+	toolbox.source.r32260
+	totalcount.source.r67201
+	totcount.source.r21178
+	totpages.source.r15878
+	transparent.source.r64852
+	trfsigns.source.r15878
+	trimspaces.source.r15878
+	trivfloat.source.r15878
+	trsym.source.r18732
+	tucv.source.r20680
+	twoup.source.r15878
+	txgreeks.source.r21839
+	type1cm.source.r21820
+	typed-checklist.source.r63445
+	typeface.source.r27046
+	typogrid.source.r24994
+	ucs.source.r68759
+	umoline.source.r19085
+	underlin.source.r15878
+	undolabl.source.r65846
+	uni-titlepage.source.r68917
+	unicodefonttable.source.r67066
+	unisc.source.r63178
+	units.source.r42428
+	unravel.source.r69308
+	upquote.source.r26059
+	uri.source.r48602
+	ushort.source.r32261
+	varindex.source.r32262
+	verifiche.source.r69726
+	verifycommand.source.r69389
+	versonotes.source.r69249
+	vgrid.source.r32457
+	vmargin.source.r15878
+	volumes.source.r15878
+	vwcol.source.r36254
+	warpcol.source.r15878
+	was.source.r64691
+	widetable.source.r53409
+	widows-and-orphans.source.r66753
+	wordlike.source.r15878
+	wrapfig2.source.r69513
+	wrapstuff.source.r64058
+	xargs.source.r15878
+	xbmks.source.r53448
+	xcolor-material.source.r42289
+	xcolor-solarized.source.r61719
+	xcookybooky.source.r36435
+	xcpdftips.source.r50449
+	xdoc.source.r15878
+	xellipsis.source.r47546
+	xfor.source.r15878
+	xint.source.r63562
+	xmpincl.source.r60593
+	xpatch.source.r54563
+	xpeek.source.r61719
+	xpunctuate.source.r67918
+	xsavebox.source.r64049
+	xtab.source.r23347
+	yafoot.source.r48568
+	yagusylo.source.r29803
+	yaletter.source.r42830
+	ydoc.source.r64887
+	zebra-goodies.source.r66630
+	zref.source.r68278
+	zref-check.source.r68846
+	zref-clever.source.r68846
+	zref-vario.source.r68846
+"
+
+inherit optfeature texlive-module
+
+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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+COMMON_DEPEND="
+	>=dev-texlive/texlive-latexrecommended-2023
+	>=dev-texlive/texlive-pictures-2023
+	dev-perl/Spreadsheet-ParseExcel
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	!<dev-texlive/texlive-xetex-2023
+"
+PDEPEND="
+	>=dev-tex/glossaries-4.53
+	>=dev-tex/minted-2.9
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-texlive/texlive-basic-2023
+	>=dev-texlive/texlive-latex-2023
+"
+
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/authorindex/authorindex
+	texmf-dist/scripts/exceltex/exceltex
+	texmf-dist/scripts/hyperxmp/hyperxmp-add-bytecount.pl
+	texmf-dist/scripts/l3build/l3build.lua
+	texmf-dist/scripts/makedtx/makedtx.pl
+	texmf-dist/scripts/pagelayout/pagelayoutapi
+	texmf-dist/scripts/pagelayout/textestvis
+	texmf-dist/scripts/perltex/perltex.pl
+	texmf-dist/scripts/pygmentex/pygmentex.py
+	texmf-dist/scripts/splitindex/splitindex.pl
+	texmf-dist/scripts/svn-multi/svn-multi.pl
+	texmf-dist/scripts/vpe/vpe.pl
+	texmf-dist/scripts/webquiz/webquiz.py
+	texmf-dist/scripts/wordcount/wordcount.sh
+	texmf-dist/scripts/yplan/yplan
+"
+
+pkg_postinst() {
+	# https://bugs.gentoo.org/928388
+	optfeature "Install for SVG (Scalable Vector Graphics) support" media-gfx/inkscape
+}
diff --git a/dev-util/0xtools/0xtools-2.0.3.ebuild b/dev-util/0xtools/0xtools-2.0.3.ebuild
index d73227e1d32b..8f4e383cb9f6 100644
--- a/dev-util/0xtools/0xtools-2.0.3.ebuild
+++ b/dev-util/0xtools/0xtools-2.0.3.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/tanelpoder/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/ROPgadget/ROPgadget-7.4.ebuild b/dev-util/ROPgadget/ROPgadget-7.4.ebuild
index 0d734f8429e0..667abcd9e29b 100644
--- a/dev-util/ROPgadget/ROPgadget-7.4.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-7.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-util/ROPgadget/ROPgadget-9999.ebuild b/dev-util/ROPgadget/ROPgadget-9999.ebuild
index 06e72d3372cb..8442f7b395e0 100644
--- a/dev-util/ROPgadget/ROPgadget-9999.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-util/Tensile/Tensile-6.1.1.ebuild b/dev-util/Tensile/Tensile-6.1.1.ebuild
index c8debc3456c3..7162a0298dcf 100644
--- a/dev-util/Tensile/Tensile-6.1.1.ebuild
+++ b/dev-util/Tensile/Tensile-6.1.1.ebuild
@@ -88,6 +88,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	distutils-r1_src_configure
 	if use client; then
 		local mycmakeargs=(
@@ -97,7 +99,7 @@ src_configure() {
 			-DTensile_LIBRARY_FORMAT=msgpack
 			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		)
-		CXX=hipcc cmake_src_configure
+		cmake_src_configure
 	fi
 }
 
diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
index 155cf7f10a4b..b79b27a92a04 100644
--- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,7 @@ DEPEND="
 	app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	dev-cpp/abseil-cpp:=
 	dev-libs/libpcre2:=
 	>=dev-libs/protobuf-3.0.0:=
 	sys-libs/zlib:=
diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 32ad5c7b7ab0..8cec6941f76e 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 	app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	dev-cpp/abseil-cpp:=
 	dev-libs/libpcre2:=
 	>=dev-libs/protobuf-3.0.0:=
 	sys-libs/zlib:=
diff --git a/dev-util/android-tools/android-tools-35.0.1.ebuild b/dev-util/android-tools/android-tools-35.0.1.ebuild
index 0ff6f3bbb94f..3ffcb47e9012 100644
--- a/dev-util/android-tools/android-tools-35.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-35.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-r1
+inherit cmake flag-o-matic python-r1
 
 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
 HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
@@ -28,6 +28,7 @@ DEPEND="
 	app-arch/brotli:=
 	app-arch/lz4:=
 	app-arch/zstd:=
+	dev-cpp/abseil-cpp:=
 	dev-libs/libpcre2:=
 	>=dev-libs/protobuf-3.0.0:=
 	sys-libs/zlib:=
@@ -54,11 +55,26 @@ src_prepare() {
 	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
 
 	cd "${S}" || die
+
+	# why do we depend on libandroidfw? It is never linked to or used.
+	# https://github.com/nmeum/android-tools/issues/148
+	sed -i '/libandroidfw/d' vendor/CMakeLists.txt || die
+	rm -r vendor/base || die
+
 	rm -r patches || die
 	cmake_src_prepare
 }
 
 src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	#
+	# https://bugs.gentoo.org/858311
+	# https://issuetracker.google.com/issues/347247969
+	#
+	# and in vendored f2fs-tools copy:
+	# https://bugs.gentoo.org/863896
+	filter-lto
+
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
 		-DCMAKE_BUILD_TYPE=Release \
diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
index 60e1bc8dfa54..017966edee0b 100644
--- a/dev-util/android-udev-rules/Manifest
+++ b/dev-util/android-udev-rules/Manifest
@@ -1,2 +1,2 @@
-DIST android-udev-rules-20240221.tar.gz 24770 BLAKE2B 76c69763a173cef28fe8ebf730edc5cd156e60900740752d703b56a8495aa868b9ee91cb5fa98e445420cbe7714b9f474e047d626666c3ea40273e0a19124ecb SHA512 152012c450dfa98b047d43162d15c614f7349c774de36c7ebdd8beff88fcb08e162cb5b8c8ab647b4058c510a3b5f65888d02402e86bea6726159051e0f5bc72
 DIST android-udev-rules-20240625.tar.gz 24970 BLAKE2B 40558ad0d6207efa690c632f76ceb71cbd79c6cff68463857a211f3fe9257bbf1d37260ccfec2d9bafff480b14bbf7b2f47b65852b7cc7aeaefc9e36cc122a95 SHA512 c9d534d7ddc5e290a992773a967f1625241f999c22d1c469e7f88c3c39a3a01da922e42d31b0c8b109dac08400f0cf515177a048a2a0ae27d2158ba265d2649e
+DIST android-udev-rules-20240829.tar.gz 24981 BLAKE2B 8886bb32bd70c4ebb1ce0381ca6799ec12087a59ce7266bfb7cf3a3daba60c4fab854a0a9fa24084acf4db983a1b0f9271b4e1bf32c6b21d21db289281c15f86 SHA512 a75b23ab0ad12d11af3ace9dfbab218fb56ee186a4e69c59358ea77322355150f889a900fd7ae9eb673d3f8ff7acde6262eb8915225df337191d992716665128
diff --git a/dev-util/android-udev-rules/android-udev-rules-20240221.ebuild b/dev-util/android-udev-rules/android-udev-rules-20240221.ebuild
deleted file mode 100644
index 1bfb0238bf5f..000000000000
--- a/dev-util/android-udev-rules/android-udev-rules-20240221.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
-HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
-SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# No tests
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/android
-	virtual/udev
-"
-
-src_prepare() {
-	default
-
-	# Use the pre-existing android group
-	sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
-}
-
-src_install() {
-	udev_dorules 51-android.rules
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-util/android-udev-rules/android-udev-rules-20240625.ebuild b/dev-util/android-udev-rules/android-udev-rules-20240625.ebuild
index b566bb91970c..1bfb0238bf5f 100644
--- a/dev-util/android-udev-rules/android-udev-rules-20240625.ebuild
+++ b/dev-util/android-udev-rules/android-udev-rules-20240625.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # No tests
 RESTRICT="test"
diff --git a/dev-util/android-udev-rules/android-udev-rules-20240829.ebuild b/dev-util/android-udev-rules/android-udev-rules-20240829.ebuild
new file mode 100644
index 000000000000..b566bb91970c
--- /dev/null
+++ b/dev-util/android-udev-rules/android-udev-rules-20240829.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev
+
+DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
+HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
+SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# No tests
+RESTRICT="test"
+
+RDEPEND="
+	acct-group/android
+	virtual/udev
+"
+
+src_prepare() {
+	default
+
+	# Use the pre-existing android group
+	sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
+}
+
+src_install() {
+	udev_dorules 51-android.rules
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-util/aruba/aruba-2.2.0.ebuild b/dev-util/aruba/aruba-2.2.0.ebuild
index 4bc5759f8af9..ce8c3c6b446c 100644
--- a/dev-util/aruba/aruba-2.2.0.ebuild
+++ b/dev-util/aruba/aruba-2.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 DEPEND="${DEPEND} test? ( app-alternatives/bc )"
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 259fc80a29e0..a611d53cfaf1 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,3 +1,5 @@
 DIST astyle-3.4.9.tar.bz2 229873 BLAKE2B f698ec0f3447caf64f324760f9d9feabeb9588f603fb1bfd60b5272cc12525e8c942c084b325f7be1bfe93663de360727ddf8bdc65d38c84512852106cb2f70b SHA512 6538e1e9464564819bd1d8eef041de063a74e8974d2cc5942046a03fa70bd5472c20438bfd270dcf1f00d250d961129ce53b5ad18646505837e176c4e0e3f00a
 DIST astyle-3.4.9.tar.bz2.asc 488 BLAKE2B a5ed720e7c87f3603ba514e0fd15fb3a6687d913ec6cb41323aa5b1b38e76ac4ece310307ad23f8ba4c5d3e7b0cc00b78684d0c219fc50cd9e5db9c327c4f04b SHA512 b9f18e2c20b431b98859b996c52b31edbd9368d3a7ada1324f3139984f5480af860981f3b72802f548f2a73e53232f35fc2256a8a3eb7cc6a31685921682d9e4
+DIST astyle-3.6.1.tar.bz2 230500 BLAKE2B 827bfdc14de670ada49556b564d50cf96e015a7e982e939e564faf7eaee4dfd3698257051b3a43ad0c2933307fa7ede727bf9ed8625b9761e6ae338b4b120a16 SHA512 b62fcedc6afe683fc466e86f572d3b39df59fd03c951406c6efff44b893c26df74ede315ffeec1a336f79773f7e1503361365f61e10fa1e07e97c036bd076320
+DIST astyle-3.6.1.tar.bz2.asc 488 BLAKE2B 9af44cf696b3f7d62649a8f0ce9ae296263e5de5cd5032f96ef90f83fb762c1de92c91e470839e11dda228be14706406eb6eb31cdc06c9e74f42f4edc524ef91 SHA512 b297e6d4cf3fe6599ac25a8d792865f62e4fb5f917101d6615dd18b87840bc52e5e9be83b1fa25e85cc80a2838b28fbefecda2b70c3e73bff650447f3c8a8951
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
diff --git a/dev-util/astyle/astyle-3.6.1.ebuild b/dev-util/astyle/astyle-3.6.1.ebuild
new file mode 100644
index 000000000000..401c4b1a41b8
--- /dev/null
+++ b/dev-util/astyle/astyle-3.6.1.ebuild
@@ -0,0 +1,88 @@
+# 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/andresimon.asc
+
+inherit toolchain-funcs java-pkg-opt-2 verify-sig
+
+DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
+HOMEPAGE="https://astyle.sourceforge.net/ https://gitlab.com/saalen/astyle"
+SRC_URI="
+	https://downloads.sourceforge.net/astyle/${P}.tar.bz2
+	http://www.andre-simon.de/zip/${P}.tar.bz2
+	verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="MIT"
+SLOT="0/3.2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples java static-libs"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-andresimon )"
+
+src_prepare() {
+	if use java ; then
+		java-pkg-opt-2_src_prepare
+		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
+			-e "s:ar crs:$(tc-getAR) crs:" \
+			-i build/gcc/Makefile || die
+	else
+		default
+	fi
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usev java) \
+		$(usev static-libs static)
+}
+
+src_install() {
+	doheader src/${PN}.h
+
+	pushd src/bin >/dev/null || die
+	dobin ${PN}
+
+	local libastylename="lib${PN}.so.${SLOT##*/}.0"
+	local libastylejname="lib${PN}j.so.${SLOT##*/}.0"
+	local libdestdir="/usr/$(get_libdir)"
+
+	dolib.so "${libastylename}"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1 ${SLOT##*/})"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
+	if use java ; then
+		dolib.so "${libastylejname}"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1 ${SLOT##*/})"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
+	fi
+	if use static-libs ; then
+		dolib.a lib${PN}.a
+	fi
+	popd >/dev/null || die
+	if use examples ; then
+		docinto examples
+		dodoc -r file/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+}
diff --git a/dev-util/babeltrace/babeltrace-1.5.11.ebuild b/dev-util/babeltrace/babeltrace-1.5.11.ebuild
index e984eb054474..b2438fc1622f 100644
--- a/dev-util/babeltrace/babeltrace-1.5.11.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.5.11.ebuild
@@ -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 ~ppc ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index c0ded9bb2e07..139806fc60e4 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,3 +1,3 @@
-DIST bcc-0.28.0.tar.gz 6148954 BLAKE2B cfd3c8d63128e050512462449ff7d467f8f809c239ac01ae8e75365e89116ec351641a68682d23472aa3b4e265547bb20ca5572084c532a40ccd3131edf255a2 SHA512 792ce93dba64b1f87390b2602dcaeba04ac8b2863652b06eb9a907b93bc6137a944b856cc6fa9c7a38671c89814740967561ca4f3b29c267babca7dc5e78aa02
 DIST bcc-0.29.1.tar.gz 6778304 BLAKE2B 23df483df59ef7d66117b15628299a32155136aa5254edbf76f7507a972f3ebcba1d4b2aa83c41e8f061eeeb96812f522c34fed27e9a37e5f4ad3478c7cde88f SHA512 9e60130ea602e19e6c6f88a8c17023cea5daf4c5bcc7af8816e9f5c662341136eb449a3fdf870ffad215495ac3bf895115c0d968d92ce79ebe2899b3e2464d24
 DIST bcc-0.30.0.tar.gz 6797246 BLAKE2B 517f4fcce8bcaf4c8c17075f9a906b452ee14a0c46fa500c301521fe46d854fcf4f632e741b34168dfeb819d9b0d64b967e716fa6222ba7dcaeddb03570985e6 SHA512 70478ca8c18e7f106c462513ca9af46f49b4ebcca6380a9393208fca88f83895a7396f918bf5d01dce1bc4a876bccb9b95aa56d426e55d384cf11c9baaa6a89b
+DIST bcc-0.31.0.tar.gz 6807504 BLAKE2B 75739914a18a7952bbefbed6f55b88d3be4f0483d2fd74bf7d6f7a6491d659ab893e7bd6b5e74c7b2239d6a2a9db04522487e3b36e7ddf65b1cc2d8712f786a8 SHA512 a1fe855c316d0508814dc02382b13897ff565bee52de0fc9d7521eabd304227e41bf7d322b10ab29fd5b13aeac85cc75ee76ac348cf1f4bb6499b8853bac10ab
diff --git a/dev-util/bcc/bcc-0.28.0-r1.ebuild b/dev-util/bcc/bcc-0.28.0-r1.ebuild
deleted file mode 100644
index 003d3e90c761..000000000000
--- a/dev-util/bcc/bcc-0.28.0-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..12} )
-LLVM_MAX_SLOT=17
-
-inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+lua test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-1.2.0:=[static-libs(-)]
-	sys-kernel/linux-headers
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	app-arch/zip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
-	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	# bug 811288
-	local script scriptname
-	for script in $(find tools/old -type f -name "*.py" || die); do
-		scriptname=$(basename ${script} || die)
-		mv ${script} tools/old/old-${scriptname} || die
-	done
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-	local -A rename_tools=(
-		[trace]=1
-	)
-
-	local tool name
-	for tool in "${ED}"/usr/share/bcc/tools/*; do
-		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
-		name=${tool##*/}
-		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
-		dosym -r "${tool#${ED}}" /usr/sbin/${name}
-	done
-
-	docompress /usr/share/${PN}/man
-
-	newenvd - "70${P}" <<-_EOF_
-		MANPATH="${EPREFIX}/usr/share/${PN}/man"
-	_EOF_
-}
diff --git a/dev-util/bcc/bcc-0.31.0-r2.ebuild b/dev-util/bcc/bcc-0.31.0-r2.ebuild
new file mode 100644
index 000000000000..f595931e6352
--- /dev/null
+++ b/dev-util/bcc/bcc-0.31.0-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( {15..18} )
+
+inherit cmake linux-info llvm-r1 lua-single distutils-r1 toolchain-funcs
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+lua lzma +python static-libs test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( python ${LUA_REQUIRED_USE} )
+"
+
+# tests need root access
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/zstd:=
+	>=dev-libs/elfutils-0.166:=
+	>=dev-libs/libbpf-1.2.0:=
+	dev-libs/libffi:=
+	sys-kernel/linux-headers
+	sys-libs/ncurses:=[tinfo]
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	python? ( ${PYTHON_DEPS} )
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	app-arch/zip
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
+	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
+	"${FILESDIR}/bcc-0.31.0-no-automagic-deps.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	use python && python_setup
+}
+
+bcc_distutils_phase() {
+	if use python; then
+		local python_phase_func="distutils-r1_${EBUILD_PHASE_FUNC}"
+
+		if declare -f "${python_phase_func}" > /dev/null; then
+			pushd "${S}/src/python" > /dev/null || die
+			MY_S="${S}" S="${S}/src/python" "${python_phase_func}"
+			popd > /dev/null || die
+		else
+			die "Called ${FUNCNAME[0]} called in ${EBUILD_PHASE_FUNC}, but ${python_phase_func} doesn't exist"
+		fi
+	fi
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		mv "${script}" "tools/old/old-${script##*/}" || die
+	done
+
+	sed -i '/#include <error.h>/d' examples/cpp/KModRetExample.cc || die
+
+	use static-libs || PATCHES+=( "${FILESDIR}/bcc-0.31.0-dont-install-static-libs.patch" )
+
+	# use distutils-r1 eclass funcs rather than letting upstream handle python
+	printf '\n' > src/python/CMakeLists.txt || die
+
+	if use python; then
+		for python_file in $(find "${S}/src/python" -name '*.py.in' || die); do
+			sed "s:@REVISION@:${PV%%_*}:" "${python_file}" > "${python_file%.in}" || die
+		done
+	fi
+
+	cmake_src_prepare
+	bcc_distutils_phase
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DENABLE_NO_PIE=OFF
+		-DWITH_LZMA=$(usex lzma)
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DNO_BLAZESYM=ON
+		-Wno-dev
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=ON )
+	fi
+
+	cmake_src_configure
+	bcc_distutils_phase
+}
+
+src_compile() {
+	cmake_src_compile
+	bcc_distutils_phase
+}
+
+bcc_tool_name() {
+	local -A rename_tools=(
+		[trace]=1
+		[profile]=1
+		[inject]=1
+		[capable]=1
+	)
+
+	local name="${1}"
+
+	local name="${name##*/}"
+	name="${name%.py}"
+
+	[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
+
+	printf -- '%s\n' "${name}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_scriptinto /usr/sbin
+
+	local tool
+	for tool in $(grep -Elr '#!/usr/bin/(env |)python' "${MY_S}/tools"); do
+		python_newscript "${tool}" "$(bcc_tool_name "${tool}")"
+	done
+}
+
+src_install() {
+	cmake_src_install
+	bcc_distutils_phase
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+
+	local tool target
+	for tool in "${ED}"/usr/share/bcc/tools/*; do
+		[[ -d ${tool} || ! -x ${tool} || ${tool} =~ .*[.](c|txt) ]] && continue
+		grep -qE '^#!/usr/bin/(env |)python' "${tool}" && continue
+
+		target="/usr/sbin/$(bcc_tool_name "${tool}")"
+		[[ -e ${ED}${target} ]] && continue
+
+		dosym -r "${tool#${ED}}" "${target}"
+	done
+
+	docompress /usr/share/${PN}/man
+
+	newenvd - "70${P}" <<-_EOF_
+		MANPATH="${EPREFIX}/usr/share/${PN}/man"
+	_EOF_
+}
diff --git a/dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch b/dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch
new file mode 100644
index 000000000000..b600f128ebb0
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
+index 104eff0e..e34b911a 100644
+--- a/src/cc/CMakeLists.txt
++++ b/src/cc/CMakeLists.txt
+@@ -179,7 +179,7 @@ target_link_libraries(bcc-shared ${bcc_common_libs_for_s})
+ target_link_libraries(bcc-static ${bcc_common_libs_for_a} bcc-loader-static)
+ set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})
+ 
+-install(TARGETS bcc-shared bcc-static bcc-loader-static bpf-static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${bcc_table_headers} DESTINATION include/bcc)
+ install(FILES ${bcc_api_headers} DESTINATION include/bcc)
+ install(DIRECTORY ${libbpf_uapi} DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h")
diff --git a/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch b/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch
new file mode 100644
index 000000000000..baadf2f7ea6c
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.31.0-no-automagic-deps.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 18407e86..1af91242 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,9 @@ if(NOT PYTHON_ONLY)
+     find_package(FLEX)
+     find_package(LibElf REQUIRED)
+     find_package(LibDebuginfod)
+-    find_package(LibLzma)
++    if(WITH_LZMA)
++        find_package(LibLzma)
++    endif()
+     if(CLANG_DIR)
+       set(CMAKE_FIND_ROOT_PATH "${CLANG_DIR}")
+       include_directories("${CLANG_DIR}/include")
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
index 251c5a7b8c66..4eace497e402 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,6 +8,6 @@ HOMEPAGE="https://bitcoincore.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="~net-p2p/bitcoin-core-${PV}"
diff --git a/dev-util/blueprint-compiler/Manifest b/dev-util/blueprint-compiler/Manifest
index 9f23710e3b52..2939a6e1805e 100644
--- a/dev-util/blueprint-compiler/Manifest
+++ b/dev-util/blueprint-compiler/Manifest
@@ -1 +1,2 @@
 DIST blueprint-compiler-v0.12.0.tar.bz2 90521 BLAKE2B 0c54f287c2d9e6869f323981eaff16785aa4fa7b1c600629bccde059205950f70f2202642130500133c69235ce42abfb5b5492a5727da561db9fe6c865939bb8 SHA512 c1f2f1ab02773b8c9c1d92035a51cd3b5c769a129ea028e02b8d2d88a7a9cb44f14edefd0f8718b90313a22134d8cbab4f699942f7049edd3146b41735e68f56
+DIST blueprint-compiler-v0.14.0.tar.bz2 95515 BLAKE2B e5e4c721f76a9455d0f53b54e5b981cbd918959c206cad2b6fa47ba3a85bb1bcacb11d65b848cbde01ae32faa6f09c1f80cf6150ee436e359e7b1e9044822bb4 SHA512 3c2c422c6c41c408aff2b4342186e7a20eeb37489aff396d48c936f7a856e9d946f3d6fb6ad64a0fd933bdfc6bce546571d67c95b8f01af591c562d531c246c0
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.14.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.14.0.ebuild
new file mode 100644
index 000000000000..0aae97c3e8e7
--- /dev/null
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.14.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit meson python-single-r1 virtualx
+
+DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
+HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+	https://gitlab.gnome.org/jwestman/blueprint-compiler/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/${PN}.git"
+else
+	SRC_URI="https://gitlab.gnome.org/jwestman/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}/${PN}-v${PV}"
+
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/furo[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		gui-libs/gtk:4[introspection]
+		gui-libs/libadwaita:1[introspection]
+	)
+"
+
+DOCS=( CONTRIBUTING.md MAINTENANCE.md NEWS.md README.md )
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_use doc docs)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	use doc && build_sphinx docs
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}/usr/bin"
+	python_optimize
+}
diff --git a/dev-util/bootconfig/bootconfig-6.6.ebuild b/dev-util/bootconfig/bootconfig-6.6.ebuild
index 487db83fc96d..7ac49d14eeda 100644
--- a/dev-util/bootconfig/bootconfig-6.6.ebuild
+++ b/dev-util/bootconfig/bootconfig-6.6.ebuild
@@ -61,9 +61,10 @@ src_unpack() {
 	if [[ -n ${LINUX_PATCH} ]] ; then
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
+		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
+		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
+		test -s ${P}.patch || die "patch is empty?!"
 		eshopts_pop
 	fi
 
diff --git a/dev-util/bootconfig/bootconfig-6.9.ebuild b/dev-util/bootconfig/bootconfig-6.9.ebuild
index 487db83fc96d..7ac49d14eeda 100644
--- a/dev-util/bootconfig/bootconfig-6.9.ebuild
+++ b/dev-util/bootconfig/bootconfig-6.9.ebuild
@@ -61,9 +61,10 @@ src_unpack() {
 	if [[ -n ${LINUX_PATCH} ]] ; then
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
+		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
+		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
+		test -s ${P}.patch || die "patch is empty?!"
 		eshopts_pop
 	fi
 
diff --git a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
index 95dece1442f5..44e89eba098d 100644
--- a/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
+++ b/dev-util/bpftool/bpftool-7.5.0-r1.ebuild
@@ -27,14 +27,14 @@ S="${S_K}/tools/bpf/bpftool"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="caps +llvm"
+IUSE="caps llvm"
 
 RDEPEND="
-	sys-libs/binutils-libs:=
 	sys-libs/zlib:=
 	virtual/libelf:=
 	caps? ( sys-libs/libcap:= )
 	llvm? ( sys-devel/llvm:= )
+	!llvm? ( sys-libs/binutils-libs:= )
 "
 DEPEND="
 	${RDEPEND}
@@ -68,9 +68,9 @@ src_unpack() {
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
 		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
-		test -s ${P}.patch
 		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
+		test -s ${P}.patch || die "patch is empty?!"
 		eshopts_pop
 	fi
 
diff --git a/dev-util/bpftool/metadata.xml b/dev-util/bpftool/metadata.xml
index ddb15174a596..a09ffc7b9425 100644
--- a/dev-util/bpftool/metadata.xml
+++ b/dev-util/bpftool/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="caps">Use <pkg>sys-libs/libcap</pkg> to enable unprivileged run support</flag>
-		<flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
+		<flag name="llvm">Use <pkg>sys-devel/llvm</pkg> instead of libbfd (<pkg>sys-libs/binutils-libs</pkg>) for JIT disassembly</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/bugbite-cli/Manifest b/dev-util/bugbite-cli/Manifest
index e1028ff4cacb..6e2786236cbc 100644
--- a/dev-util/bugbite-cli/Manifest
+++ b/dev-util/bugbite-cli/Manifest
@@ -1 +1 @@
-DIST bugbite-cli-0.0.10.tar.xz 18167676 BLAKE2B 2e193e4bf6eb71bcf349e9ffb11e8816fc6f27b1ae2c174c52a4ccb1f5052760b2f47f3c03a1c7792f2f0d3b63fe7bae2710a112480f7b63e34f5f3aa1dd0e21 SHA512 b481ad5cd22737107084e4a22c866474ef4317572730ce739f4e7f08c2669e9d1bbd0571a0125e30a8a567780545c939d034a53f1589feffe97a08f0cf928c7d
+DIST bugbite-cli-0.0.11.tar.xz 21068652 BLAKE2B a75137923c1578c8411a3b701564ad9883352478ba0467f7202ae3f668ae42d6890075b7a9b1f1d8ae1eb54a4280f3925f13d4b8656056e56c2a32f9f790ccd1 SHA512 b1df78427a3f5d1c44df95d077284fec5112385f31a480c6488fef20b53b43cbf1f80b1dcffd78b40f04d62364f8a8a7fd17f12ca0985d10ad3ee8f23ec3ae59
diff --git a/dev-util/bugbite-cli/bugbite-cli-0.0.10.ebuild b/dev-util/bugbite-cli/bugbite-cli-0.0.11.ebuild
index 54904ffd4168..54904ffd4168 100644
--- a/dev-util/bugbite-cli/bugbite-cli-0.0.10.ebuild
+++ b/dev-util/bugbite-cli/bugbite-cli-0.0.11.ebuild
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 4987faa47e28..f804276df463 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -1,4 +1,5 @@
 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 ahash-0.8.8.crate 43028 BLAKE2B 598a7f2ef74a9470913d2d4e46d1652a8ea7ccd9843778b7f2f4d9f41703ba4cae552aca8205fef6ff8f601d919a5f141391a942e13e5285c7e053cbbbe4afcc SHA512 b54c8c2cfde8115d2108dca36ab698d1b43eb015caa36e6d02288ff21a67ff54144affd406af704107689888f52548203731d3793e5b881bd267b2f803f478cb
 DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
@@ -11,15 +12,20 @@ DIST annotate-snippets-0.11.4.crate 46876 BLAKE2B 87e8a877b472435aec0687a4892b79
 DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163
 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.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 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.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
 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.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.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
 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.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anyhow-1.0.66.crate 43770 BLAKE2B 8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997 SHA512 7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3
 DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011
 DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5
@@ -38,18 +44,22 @@ DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f9
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
 DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
+DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
 DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
+DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
 DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b27023187004c81cd01e5315dcac920ff87a6bb87ccfbb949364f1361dc04d342e24f9f54490b5d44a81d1 SHA512 dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba
 DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST btoi-0.4.3.crate 10007 BLAKE2B 60a4c0511afc23ec3bdd07a905e82b501f1000081e6dbfca9ee6a0d6aad40ade84ab09d740fbc8e9656653a7f5a9a12a68ffa732618e8dc87f9cf00a90b6d3cd SHA512 35d54183a37c8adb11838724a061b38d286a92603a557ee8b4b80dd230649a0ceb165fcab4b6e41402284f2153e18fad5c246f83d99accb2fdaa8f32f854bd22
 DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
 DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8
 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.2.1.crate 54857 BLAKE2B fae7e7b0e8023e4b5a9b7d5a390035dc5ee2b19f1fca03d885ad27611d45bd276c837bb63e9498e3f6d2f00d5573fd01f20115da21ccdf8606ce8d8bf5bd1b7f SHA512 39c19594f52af24b04eab319ab329e8ecb5732e4531184eb376677f57c8a6402c15bd171282498e69a4a472d82e308d0dc8140df0b7d923dca588aec90c4fd31
 DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
 DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8
+DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
 DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
 DIST bytesize-1.3.0.crate 10164 BLAKE2B 049f292705082dbd3b2f0abb6f153023613107949f4849154aadce2181f4568ea1b3c12f00b6ad56146f8a4f3b07b7025498e0c989ac6561ac7255720b85ffab SHA512 c718af51b0da2979b70142012544fde6bbf8639cd4fde66a8066b138f7f58dce019209e27566027dc0ec5a7fc1d2ee17b9b6366cc7a5f95a6419e29a0ffedab5
 DIST cargo-0.66.0.crate 2038772 BLAKE2B 22fe5997b350c1de8db83b739b16fd38f6a8d29ea7c78bc1c84a1f6685fcbbdd2778ad7f662fa63f865dd829ea479e9d7655e5378a0e9ff9b27eb1156168f197 SHA512 e6f56db8f859663cae79850afac4cd569964e732e9ab4a4f9a92aef60950305740cf16eb16f76f1c658cb8896ba22e36b7dc574351afd749ffd7e8acc2723dc7
@@ -57,7 +67,9 @@ DIST cargo-0.77.0.crate 2504468 BLAKE2B 48b51961dc49bd5ae5b3df4d565709db16de2f74
 DIST cargo-0.78.0.crate 2501961 BLAKE2B 277d5690e92c9e3bd2001a9077a74996b90e4967dd1c2d876460c9052d19cbc5791b6a2d5b4ac0138752103b96e1794f044c9722cca53d516d2af46d7c9de54f SHA512 0f0bd74a30162c6e0ea95499b09d940164e2f0b9653d716a8da2e3b4ef3e24517d7585f2c29aa4d4626baa190096af1a872bafb52d27a2a7b8370dc785cbb957
 DIST cargo-0.79.0.crate 2537080 BLAKE2B 867aa05237250a4522d910c9a565bcb629365c194bd984e75aee62fbf51132b8339c6921848515015f7bad82cd9faf12119ad7a7f040122bf5828da12d6457df SHA512 93867f371a57349b2107b99519cc750f52bbe04896165d5b67ffd3ea243aefec80036640c07652e8d7b1d2037dc6a1bc05d0d0ebadbb212e4cc9628e0e0c90ac
 DIST cargo-0.80.0.crate 2565822 BLAKE2B 2f7de9a6b77281628ba5858b9ad5a3172200b542bc86df284b5f30eecbc502270eefe5d792ee880f29cbb1098400e349a49413eb7ed69c8709d27e55dceac019 SHA512 14809109939ee3f5399887794e46f07504f9816829d7ab598b3f2223eaaf768089f8f5a9373ece36211a5231154d51c5edc7ebd73de62ec086af65437d216066
+DIST cargo-0.82.0.crate 2613931 BLAKE2B 2dcad04f09fc58f0e2f1e0e7394e2f03854c58bce574bf735f17013cf10723c22bafc29b2c78f59a2f087e79f7bc026e684b34a063dab505ffc38a43825b41a2 SHA512 ad7a8d42da6cd8934c699dd66a72aae756306ef16f526e541298f763533512242fac720ce43e73a083011c20cf207ba25d473852ff46d3bc43c8bf58c4541517
 DIST cargo-c-0.10.0.tar.gz 32011 BLAKE2B 02c580982b47e9a313e7dca0e3cf990dda43518cdf9f385a7df65ce7ad7666e41b8c9b32d59164c02117a454591b42b73d509cd6c6613e4a738fe369bfa906b6 SHA512 eff73e1fe2404a75e5fbf848abc457ebe82b5a4c1937ec986e0d6419f6e720fe0e60701945d4e85a9190f2ea48e8e3af065487e5e9837af1b5122e9166e7249c
+DIST cargo-c-0.10.4.tar.gz 32474 BLAKE2B a6c40cb734d7e6a0c49bcfd16c82d146e94f93dd6804c7679bc8f9422db33d5f08ce708986468c3a24b8f21dc6a02111c342141363eeba1d1fe90917e42f7af6 SHA512 8ffa9855bc1b005c3f7be1230ce3742a443a9cf9b819fc4116317434014d901785e2d6dba236be02b64dd25b8881e6e585f3ca70d65cb77f37dc7e67f81db7cc
 DIST cargo-c-0.9.14.tar.gz 28957 BLAKE2B 33cdf9de62119750f2a8a26d5d22c882b130b86c349e5b1eda9b5b4674c86f37362211dcfd33f5dcbaeadf52b8eeba404274f3eec99b51b45c5afd21e2754a4a SHA512 ed2aa5d455e2db23f797cc45fad15273b6cd931ad3a566617aa93fcd39e54f4694be7cd450f86fc2f81764af6ecc733208d44bd045ad3afddf87c29b60687bc8
 DIST cargo-c-0.9.30.tar.gz 30493 BLAKE2B 0947ef385c363a678893054e5cd7cb386d396f09151148659f1cf7ce760180968c8c9a2a3841e6ce65cfea3d77917244cad1b470c39a839af582c828897f644f SHA512 7289f6779c020d4c396e01dce573f476e698100d9bdd26e98832e030b64beef2ce06042314bbc137392fe92fd94222c99363daed8fb63f0776b8d75836909769
 DIST cargo-c-0.9.31.tar.gz 30556 BLAKE2B ddd18bffa6a8ddb6a7982f607a186bcd94cfcf62237ae7edd0146adc54c1068bd296ed007e2271b43142dc4d46b490ab153e70b3519b47d8a89e52d1d6d41382 SHA512 12aa5fd857ca6fdba50ffb08d120084ac063b5dfad037b54caf3e28ccaa36bfd07b43e61619ccce72c081655e1759be05f455ea93caebb0e763a63dd4246d0cf
@@ -65,53 +77,65 @@ DIST cargo-c-0.9.32.tar.gz 30611 BLAKE2B 79175c365eddb5428899d131465dd7ade44e23e
 DIST cargo-credential-0.4.2.crate 19409 BLAKE2B 71aedd38b4cab55004d0fd3b73f6fd1f2946ca3af91d59813c7a24b0e7da4a2c7ab93babf1957feec00af62c6463f86618eacf937efb0f164e9a0f0e2249dcbd SHA512 4b99f228adfbdc07c36454c678e352ea01a6d37461949e24acaaf9c4ed66bae73b96e76261471dd14e387a576b713fc56850adcc687156b2316d6417f5f6dc86
 DIST cargo-credential-0.4.4.crate 18906 BLAKE2B f558832174b51446c70f22d8eaf59563bd0e1c3d6ebcfb770fdf9c7ade7c2fa45c20a11ca22a9b7145e2a2a3ae9871fb45b3c23ff116aea120accc328fe45615 SHA512 20b6618ce09b43c76ef817db836ffcc2ca60af59e8468236a85a8fb2bc29834e9fb49208c9b15850b229a0276ecf49d0b8da489f00df23234ade826be8a5e70f
 DIST cargo-credential-0.4.5.crate 19299 BLAKE2B e78fc4f9ab28ad703386886cf267a55f40c4c406fa50087293ac857ff08fca3576fd3afc349e2acc6f4c446d251d6625566c4263b5ad6a561217ed69e5c42c86 SHA512 9a1c641cf4f882dc90cee40b6d0562c77469e8ca8ce604b5a210a87367fc4ef18a633e8057323181492dd39fd0d94c33fd8fc67baf7d2557833c951a50ced235
+DIST cargo-credential-0.4.6.crate 19657 BLAKE2B 181f1544862bc7bb8ca9242d3e69a6eb0d107a73ef1299bf1ff17a62b87504339a9c16ef7b05ae1b4efb0f59762444d800a94e7378206cf7bd2e42247f894dbd SHA512 94da79bdea9389b39945e4cf753badafad5f63d845100d8587ad89a803540c4a52bb7ac93ffdd4ed848e3d36b96078a72a299d97a36ad2acbecf3a752648c86a
 DIST cargo-credential-libsecret-0.4.2.crate 7256 BLAKE2B 29e7d2f32d750d68291572bd496c89f8540af9308b0521ef66b013fd3974e5227c44b3e5827c9df0cba88f1aaa80aca521be71e27dc00a557b77bc5099ca91ee SHA512 a26ab0ba76c7f999c949d2bb16b331d25a26472fd44b2a84677044867f2fdeec6f9ad17d6a7259939af700b42da72ef792dad2f5c8df17bf0d8f7613f692f491
 DIST cargo-credential-libsecret-0.4.3.crate 7282 BLAKE2B 1a964e972ec5b8b886657cdeb4d56f905eceef5f0d16d0cfd6fa717256f9cb233f9a52536d455c685e1f9a97878e28fa17c5adf00dd8bc75f0fa185b2a9c961f SHA512 9f322059652c0b353cd32fb45508899cd8b7f8f8b961b4a6e07ecaf4a26ee8ba22a2692bf2326e4ab801f0dde40a4feef65061602eac9471551c6ca33da49275
 DIST cargo-credential-libsecret-0.4.4.crate 7281 BLAKE2B 649ee11ded55fd3c2b6e9997a7723ebd9221ce44d189111d68a2810d0acb8e47c8483bccb3b0fe3d5a05cae1eb6d3e293d385b6546ef02bd4d7d0d3527b453ef SHA512 d8a3e26b3f29498980d402ab026b3cf7b19ab05676e73552f900998904c91a805681f3ccb14bd71d28b0677fa1b5df38929d221041e116dc1d2fa6e51c865022
 DIST cargo-credential-libsecret-0.4.5.crate 7283 BLAKE2B b1b540aa2331ca64c088f15fa77ef2f682c059b9dde51bfec27f4d9f9b5346d7384db4b8a1a5c7feca657165e9c2582156093cbfc31b309862fc475f5ef30360 SHA512 e36943f8d5cede10687ab1510681d0b5a1e7b57b11087651daa544b866978e57cafbcf26feee740bce4af9bb9071a946a3a6c28bebc5fc8a3fb14429999e824b
+DIST cargo-credential-libsecret-0.4.7.crate 7327 BLAKE2B 9799b83281cb2569ee6dc1359917518a7b11936e2081d945da968fd0ae01a455fad42f5d5bda6e6d52e09bf6ce700b22ee1e2db8b8e76126aa905f157ab5b81b SHA512 1dac378f8c91b0e3b2b5fa18e16962816991e7b8aec4cdd53f770711a5dff7c1a7ce741cdc364305942759609f3d56373fbbbc97c671d05a24f94b4c0f67e8a9
 DIST cargo-credential-macos-keychain-0.4.2.crate 6529 BLAKE2B b6e9d5212c522f44bc008a895b02e12276882e046d07bcef38996f0592be16218da4639bfe94e2d2823b4f20558dce97e5d4fe3ff1de9bf5280b677d0d4d15f8 SHA512 5c9f3ae7ad1309b0ae2fbfa2fe80fc56adb92d1d0d167442db533147ce9fdf9ed35dcb3d962211abbe37466fa4822aa5d9d4d336a3be5ac6629b0c40c8466cad
 DIST cargo-credential-macos-keychain-0.4.3.crate 6551 BLAKE2B e01805737b7ace1a825819eed1466a3f3b92a09820dc0f8c2fa000826c098448f2ab0462a5db9bdbbfe595b608db3bcf0cb9c7f3ddf6eba1cd016ad150f3450f SHA512 59d5ba15771527752ea5aac8b5715968111e55dae370cb59fbae478adf69bffc3d4cb88b5cb5408c1540003eb0c5a2ecf611488066a336d91694a194015c3b5d
 DIST cargo-credential-macos-keychain-0.4.4.crate 6552 BLAKE2B 86bceb5e0d0f476be3e16bd46fbdd9d8545b7b3dda298406e4111a56df71e0216314ca1cc3f909001cab748eb86985391b4f0b5f12d6197e590065ddc5a99c84 SHA512 b6bb702b075d664518798202654661f4a0d21ec19af11a2bb1f454d38d40df0998865f8a0a1837c3187f252edbaf9d42b36bea0860438d921baa267408a0c954
 DIST cargo-credential-macos-keychain-0.4.5.crate 6556 BLAKE2B e6b670843a426d86c641e2eb986444c837f3ba850887f8ebd8ef06501713237e9ad89c484a760d2361645e7820038717021341c7549dce4b97b0da9fc38d76c9 SHA512 587a26b51668d973839e3b5aa1a66c9837888985d472912f0098910d41c90c298065c2b6a6db1ad165eb89a6da5df16860f8c51cd6e81b3f77f4e4aef95bedb8
+DIST cargo-credential-macos-keychain-0.4.7.crate 6588 BLAKE2B e5efb4b81bfec15de1260950dec9f85d5a52af7c727aae76f27154a45937105d897efe0507e537a9d70b3d65c9b9fb78c3ac50f24a32c4cfc0ec231b4cce0d26 SHA512 804c5aa563ad4a974cc97ede6889186b3796f54e7857529b31324b2847dc2536bc386399bf4c2db60c30d19d038ee79025e77a118a45505dd491fb211d31991d
 DIST cargo-credential-wincred-0.4.2.crate 7014 BLAKE2B 52f9e9ab258eebbfec4abd7a238884442e6d05c85debfa7df80840344ebbaefbebd713aea941df607619a195d24408a7d6ad4dbefaaf606f93423c55697a024a SHA512 af2aa892c23ef8193fe8696435cadf5a8237ac33718a2cd1dc50a6d599315555b210580c9e997a9e9718c1b4baced1796ad86707fe0998da6ddd420d3fe6af76
 DIST cargo-credential-wincred-0.4.3.crate 7040 BLAKE2B 964101c6d72a84fab348203f360144babc030609c96a9c1e5f63ab0cb5e99182fc36fe410c451965c540b6737751066ee821a26c0baf31a062c96b46937a925a SHA512 02a77dd55ae52bd6bb6eb77e6ea9f835a838719326a4a7034e09a4f435b3a28eef2124ec8bdbd2dddceac2c342db5061b8ceba2f4c0e289c54078694156f8147
 DIST cargo-credential-wincred-0.4.4.crate 7040 BLAKE2B 8b5fdc1a68310feb4ec47e7c97bb08d3aa806d66504ca534e9e0b22f00377e7fdcb74ebfc3924bd74e462e5b1912ab5214dcb8580825e88006eb83dee5cbb59d SHA512 00db703578a3d24624312ee4269cbcd1e33404167adedbaa0264429ce9d4e62dc6bea72c123236403f9f75e43f7966c330be3341caaa786a483181ccc0012f4f
 DIST cargo-credential-wincred-0.4.5.crate 7041 BLAKE2B 8596cd23b28a26ccd16536c8227220a4b897fce02e43d48a30a3a9c963534cd41c6f87b5b28362309b4914a67a9257238ed7472f99dfbd8637e8bfc1f156eb11 SHA512 208444755c7e7ffcfc670aab30e7e1b8558ff87ee61d987794464b792c1cb7b4893aab3e9e2614b02eaf5ff2732bf4cfde66b1d4d009a67ac803a941346c6447
+DIST cargo-credential-wincred-0.4.7.crate 7084 BLAKE2B a14f4ba6352a343b04d532b5626c3663d9a9dc21f0423ee3e1b743eed2a7e416b1bf942130c9d9ad71ea9ac50655d929e90d369e73e33144fe03fb4eed417fa9 SHA512 aaffe57c987aaceed1b2114b27f33155ca655ef300d55af4584261ea5573a237fc15c44348b11922ba73eeb93f5aadb99e92079cbd2117f70a82273a1a1adcad
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-platform-0.1.7.crate 11819 BLAKE2B d165680a5edf71a40087ea3edb3231185b4f4282989f9e0b59fe968ea16693abb059ee003815bba813bc4ac43cd1fb4c33ed1ac84ccaea5ab4609af537d08b37 SHA512 0cbccbfef8316c925aa2ad40723096925b0218c8cb84dca912d18219c0fa27cb8dfd80c1dee949071781e7f783a7f6fae65fe50a2c4d3e0300fbae466b3b4efb
 DIST cargo-platform-0.1.8.crate 11813 BLAKE2B b074b49e08b2b93e93e08276f2a79546fe1f9ba0a52b3b4ef0ecdd28fa3fe5e842c0291fed158a1a12b90804e0172d5419b7603fd0d5f87f062f44dcaf3428f6 SHA512 187acf1b8cc81078ede3353997bec9010df32aba82f56f9479d4c8eaa13436590a16f3ab6ea11ed2b31d1d1d2299d824d9ad10f04bf5281c92372cc8334b0dd2
 DIST cargo-util-0.2.10.crate 25741 BLAKE2B 2fc849bfdbe3801132f69e980f8de3f0d49a278a683e152b412f46d9ca5efd33413f70555768ba9c83cc1a7154a22a01a55fca1797a6e5c028d9ae99261da7c3 SHA512 981af3e2c1f38b71fb63ea1a71a1701eb838af2a200db196e51067e942e261a426f95640c743f4b4512b6088bd1a5764e8606a0c8a6c3896c3379c1f8ede6115
 DIST cargo-util-0.2.11.crate 25735 BLAKE2B 9b756d5874d18408ce2de6c60a15933c27ae3d7e1c2f1cf7435ecb667a962130d56753a7cc5be8b4751a138eaf68e5efde4d04e7d6c73bc296685788dab7dfa0 SHA512 11e63298373275316c8ecd4d91648b110395281b78b7b98e2697519a9dcbbf817732aee60cd6763769c1ea23f1f02d2e19801270fd5b8eabf205acdd96783a77
 DIST cargo-util-0.2.12.crate 25742 BLAKE2B efd825dda5ce117841b538539781addf90b48c67eee3c4308e0093bb69def86776abba6f98472053485b53e97af034bfeaa9768d21a44a059d9db7f1ed85dd1b SHA512 b44fdc5ee3f5aa34c50cc78bff8cd125424144bd16d2ded2c641d465c7548bcb3c0f7ee3c4239d4ba3c8e66cfdd74385f5d0ddfb1696d5553ee5dcea58ff28ef
+DIST cargo-util-0.2.14.crate 26835 BLAKE2B 690a17097f1aa8c241a48226f94d5952d8ea4158278e28ad743496e71ab0d0c0e9f1037cde20e88cefa0af1f621526fc9d6f1964333e3588ebf8f712284783a3 SHA512 9e700b296548b4b8566d6686da1d695fd2ee55168ee6c9ed6ab03edb81c9b494b6b28486ee50dd4b417e7605584cab5797e23e5b2f976c3b32d13e4dedd24a02
 DIST cargo-util-0.2.2.crate 23867 BLAKE2B b001d08fc9a5bf9b7a4a88dab99cce360e0bae445c2e416933d90fd01fb5054244e159f087a9a634226840878e26173e25b33be09116a54c0bdcf490e554b492 SHA512 f8fb4b3e0a9000e0b3056afc73e2d094af0486af9f0aae7d51dad143a19a11eb19594134e68fe0c176eb20626ca7ceafb14a71d9277dc70636eaa87f2ec3249f
 DIST cargo-util-0.2.9.crate 25648 BLAKE2B 4ba351e64a6030e7b78d3109da943e301db8ab17204d72d36fbe5ef879e5e10c9135cf869e5cfd80c3ce183b2e9e5e682668a1df26b1d856a258a8a28fc82fac SHA512 24921a11855602747543dc84fcbc824d1cacc617b082fafd5fc77b476ddefd17c93affdb6a4ba7b9a5b068c510cb3bb0386a036f2f72896f3f9677f060f83c27
 DIST cargo-util-schemas-0.2.0.crate 23612 BLAKE2B 2f466744fcbf231317d6bb7c1a0f949f7d6c6866349f0e0f1cea86b21685ca9b6889c0e9dbfa14d43f505645fdc0c66799b240781f80482b4c4578500cbdedd6 SHA512 f82abb3f18e703791ee15616956e11e33896b19f9d5d5abd1b9c4d5a7b7923d4fb47290f57a4799249fdcc703ce1085a4e7914d4386f2a819670a53ae621248f
 DIST cargo-util-schemas-0.3.0.crate 24329 BLAKE2B 72bd4c711be523fb880804c3a79cc5e9eea8e296d3e74306d4719ee1b8901854a9abfb1bd90c80d542018e2424103b705335375bd7bfc71325ea1477c7f8f987 SHA512 5ef4687702e7f6d37770bfcd4ddb5b547ef3d4f4eb4713183fe8b74c49651a75d5397d5adda6ed07c6adf2f0cc10117d32a7bdd307a42e9ce6feb6f11a959ad6
 DIST cargo-util-schemas-0.3.1.crate 25602 BLAKE2B a60034d49c013c215545b7e5ee477400a49be5f9b08a6a7f363381fde71a417f58049ad0e473d6fa1f1a7c79390fe035b84b53438e9a7383d55579c1e5ea6638 SHA512 cae07c2e13142aa5314461930ec825ee2044b72ea547d1d308a4c67b7ad5c83f016489bd8f9974f09ca39299164f857ad4a1d776de738bb522f3c0c60c5446e1
+DIST cargo-util-schemas-0.5.0.crate 25773 BLAKE2B b8322692ca2be9cbbcd1b3ec561a446938e3aae6b0bb3be9b336e9f49d0284e5ee26b849061e0933b536ecea1c627a18fc1c20a4960faa4fee1696285963ed38 SHA512 c05b891943d6674a6fe5ffbe26171a99db64d570d383dbe77ff36684db371e5697b201f9c05a99967d8609778bf62cae615d2659841db0ad82ca132331b83a1d
 DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
 DIST cbindgen-0.26.0.crate 206157 BLAKE2B 4c435ccf9d5ab3cc036691cc51c55334e27a0348002b6303b11974c0aa4908b9f902577ca6e50bf241ca75816775e7bb33901f1f81e3d5293ddd2128b458204b SHA512 2de81f46c9c68c985241a349f13125876667d1460d3658ead8c4ee9788cd139c30dbc08bebddc172cf0bd4644f3f17c02cf66f2a3ef706c52366fdaf0f9d8059
+DIST cbindgen-0.27.0.crate 215957 BLAKE2B 4b88f19edd9ac6b862237e4db25e6e6cf989fc1bfaa88c7543b2c687b1c6ca77d2e09e7ac8ef69a960afeb534be37a98c0c62057c1057bfa31191d3e265a80df SHA512 557fe877f95d52feeb9b3bfe427a1b365e8acb3f87a17263917e1fd9b72fef9e8db1b465564c9f213db0d784ec332a27c96ba223ec53ea584fadade1932930b7
 DIST cc-1.0.76.crate 60132 BLAKE2B 9e8dabe8cb64a8ef7bb4a91d4e601a9175712da00644125e0e625b0a10a4815ed1a3c93f32eb773d0c2215c74b8f0d73a35831291195dff65d1ae79b8e423d8a SHA512 9a31f5a78859f7272cba9289d0c1b7fe01cbbe5ccd20a729141a751df7f5a576726e2b7e038cb7142e63c59a5ce7cdb83b93c32d5b5f3f45bb297ecdc1b9e983
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
 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.16.crate 83180 BLAKE2B ece068be561b8000ae82d77d084d34db2be8db6af2fb86fd2cdf25e7c313d4905c093d604aeed53d9268a927a4236a7a4c1d54c06721683b43f00835be93f798 SHA512 0f53ea7363e2e225b7c61339b217adee84f17d9b04123c4492ed2cf722fa0fa3308ca5b8ddcb249785772926d70aafb2eb793ce4abdcf9482b87c0667a5fe8c3
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-3.2.23.crate 219435 BLAKE2B e99a928ef61a7f9f6d7df2c38acd480fc86bfa3885d8b875007aa5bc855396641ca6772387de2eadc1d545dd201434037ea9e7fd138395831e4755ae5a917a7d SHA512 1f1f2ad07a0f8fbe8672f4252edf260ffb5e024a20d6673fb846d59e245a226a43675539ccd3cb252571766b1f6511c68c5cb0f2351c8086955d49c37f87338a
 DIST clap-4.5.0.crate 55379 BLAKE2B cd81a1347f2dbb0fc16ac3263d0dd653d6bd948666c8e05cee9c842550e6dfa2373eb68b16159466ded6c679359421586687204c7945bbd7b7c50fd1fb0e422f SHA512 2956b6e65220188b2d11fc532480b78f0f3574dc4137adbae2519d77b9f581bc89a10ad044e8e533a032633340ff09e21dc35ceba41b8f0f2e2b8917ea00581e
+DIST clap-4.5.17.crate 56802 BLAKE2B fcdd23d66ecd27ee3820c4abe681bc997dd6cfd69948e11603aa8c4ca39513d5de901373959328986ef81c046318f240ea87a2f19b38921faf76b6c93d0e4f67 SHA512 69f0fe213007a2e0a564945bf58794b891a345c34747e92ec16877253ff60c1a30fab24031b5f56d6e31ea7b0d8c9dc0c815fd1489b2c0df1e2d24b4a2be6406
 DIST clap-4.5.3.crate 55388 BLAKE2B c0de02441b38bf4a4c7879997e70a8c0b55d41ac60ea2d918a3eaf7933ac9105a22cd59def6e7260066ab2d12ba32f13b26f4fffaa6303ed4e4f33622ac9c9c8 SHA512 735be90c75211cd8d77f014c8b91782246c652e92da810877a44ab4c9dc0b4ff9637640da04d57a17cd1550df1eba73d91d49d2e7a73815010c5d6a5017aaa9d
 DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
 DIST clap-4.5.7.crate 56343 BLAKE2B e2392ddd11213c8410344c474d84bf40d2d5a0663d25ce8126940ce59085a84334223e92ebd59fc387b4d1334b8f8cd7b76eb15f916adc5ef59b9858929c5787 SHA512 f126132811696d5fcac0242264121a08c1f7c59b4830d73b6b95b8c5b31a2c11928b0d7026151a5d1a0108aa912d7c6157652193ea1ef5a980669bdf388d5bfb
 DIST clap_builder-4.5.0.crate 163521 BLAKE2B 597b64b2bf727186d9bf1c4b55227d96dbb819313ed1f952b2753d24cf6c7737075acdbd0091a919e6e4fdd60bbee4a1e7707bc09860e49068556a1112842204 SHA512 d0df594d0c15687d2b9c19c51f86a9fe1cfb9b8b78a8220d77b0e4d9252a850e217312fd3e1d1aae57703ce973f194241acd4e6ae0c9ab79e45d0c14ea8dae57
+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_builder-4.5.7.crate 163957 BLAKE2B a1d6e728f05b7f7eab8fd9fc8dd0e25f8a066e0ba72ccd6084e747f5833ef90e98b63f4bb0b3af54b74c193df3ceb4eac63a45c9f3222570ef7ec85562346a01 SHA512 df0ef9adabb61538619d94ead0768fb8291cdef48c0cf47b323aa366fa2564d89ddf65cd0ef0b7162ef5e590be26a357cc775ae5278abf8048c05a5fbf58b5cc
 DIST clap_derive-3.2.18.crate 28208 BLAKE2B 05a23083a8e792858819d7eebf057257b1d49b0e8246d3f24c6f812456cbabfc75d9271c295a0d44539bd531ea6808ca7490e787c1fcae63bce045422d33d280 SHA512 d5349b3d5711bd4900173aa5210d7c4aebb0bf70128e11f26b362f5acb43687f6ce5ef73e4d614ce9c1d649d34b68ff15ab8b65fdf1898fd295ee4b4a7523497
 DIST clap_derive-4.5.0.crate 29042 BLAKE2B 80a7646b2e30432008d52e27494e2563637e408a90557e5b0009a9db6a39abfdc79c04139f99caedd433a94b45f7d95fa11b49cfd33d203fbc4bc911fad4f9d1 SHA512 0a9d79f957067b929f8e1340b0e0623f78808c5d287cae252e6508fe8e07c4f11bfa39b1d3b60bb6a531d888d809c43ad3f6a491a7dd1e3d3ce89af7e1b670f6
+DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_derive-4.5.3.crate 29043 BLAKE2B 22001d5b0bd7a53dfa4b146014a668e64411deff0b16f0f4645145855b6d52a0166cb9f01ee8aa434b516a68d487219d133455cec1f57984f2a652b92f4e4db0 SHA512 c9c5357225494d4cd4141dc5e3017c78966c53b04b9f43ea4e42e7d83f2a2b69b2668e2a25572c3957038eacab054524cd9b56044404d74cb7efbb19ceb7bbf2
 DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea42d9df9af26b5234ccde23175180efe21df93513df49f6ba83e46cc85cedcead29c902e426c39b25086c9f79a51c SHA512 670411136c819577c0129c6fcf5a8216cac82a47ae11ce3cd97cffd038644e06c5a21f7a69948628f01fb77f1e656678ffbfe441385866fdf90d247bda036c4d
 DIST clap_derive-4.5.5.crate 30017 BLAKE2B 8525d8adba25ec0165936f72f78dec3cdffedc9de8e537b078944b1830640222013e335e86a2337ae9ea3b07dd655275705eeeb8c2155224dc0950ed00e47f7f SHA512 90c2110445c832d81cf66287ebe32155c6bd72a0a75cdbceef4e411d4b9d83268af244adab6755379b6970b5d40b39a9f89df9ef8786429fe73d95a3eee1c134
 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
 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.1.crate 16507 BLAKE2B 6379e70a2d75530bde76e82c370c4481ce84d8196a395e94b30dddc1126529774e7ac662da2611e4da10cad6dd54fbe55e1bca4d554369ec5f4798bab59a9d53 SHA512 bb9303ea245e3df6321bbf3c4cf9f899648067f8d3950638387badc79ab37e7570ee73c90af96dfe4eefc004d116c5fc77cc8d89a2809defa2107cde530cd192
 DIST clru-0.6.2.crate 16497 BLAKE2B f77d90984f8b030c43380cc8fd80cfde916f8f9fc4b288a340e9c00f0fe177b2918734c7948ab4bc8fd01abf7864488c76e7744c5974ba23f79fcd1b23b6814c SHA512 6dabdbc4b956fffed9c362b6f33b71625ba62651b0820dcc78b61319d981513d479b453906604de173110bcd9a7441451ef10cb0978e5e587cd0df23fec2c4bc
 DIST color-print-0.3.5.crate 11245 BLAKE2B adc6907db10692a18f99967341f2da59ad816d3104408f3942626e72f0f8bb29b778756ae37c664817b016dd7552fcaccff3327bbb00af8fcd4f94f3582675ad SHA512 79819069e71b120bf9f8bc42fa71d902f8dff569988ee4413454cea9b5500fc2c31a493b9fc28795b327e099c09109ff6336219c65c89ce87aea5507982a0a15
@@ -120,6 +144,7 @@ DIST color-print-proc-macro-0.3.5.crate 23434 BLAKE2B 76aa0a806a8737b60e865b6bdd
 DIST color-print-proc-macro-0.3.6.crate 22499 BLAKE2B 23154ff7332e9ffedaef964d4242a922dd381bd3ce611ece52d7833dcb0d114eca32f6ca6e5d33037a4d859c59edf7379bdce4155a89b0b8078030bab95001df SHA512 a7b2719a4eb88d10d0af656bed3b4c690d98ffa3fe9bb373e426ad275b03b1a2088fb243bcb5215339e00f26889cf3f2ccdfe3cd7ec4c90af3df42035200a3ca
 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.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST combine-4.6.6.crate 132428 BLAKE2B fb52e724a52f1a551255591fedc134178080ea5efc0c488efbc369e6272f7f2b87dd7d0ce63361754d8ff0cf1b0a59bbc7b0396c50c53210f3e2c28ac965e0e6 SHA512 ff9ef9329de2cfc103271a25ad1fcb7e478f3328843bd8a65653e80b74112728ad4a33326a58ed7ef8cf39eec7c3b797fc287295ba149ee0dccb1de9721b5819
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
@@ -128,12 +153,15 @@ 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 cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
+DIST cpufeatures-0.2.13.crate 12999 BLAKE2B 4c49e01e91fff33c61bfae48a07a9d76a69565840f5a12399a3515f6e6808743dda0d4c6877feabfd276bdeb05c285daa3bce6062a87cc3da50bbe3b6c0fe1e3 SHA512 e961ccd9fc001cce661b6360b18abc4ce2daa4080eb5fd84dc5704d8d5ddb6ce6cc66b5d42440bffdda03137af9c5ba20b6793130692168e7e28729841c3f352
 DIST crates-io-0.34.0.crate 9543 BLAKE2B 30ef8eacfd84cbb5f4b9aec4fc79d086a281f3fbfccc46b8e8573e74208a1f34d496c0ab00dd9135bd441e85c4e9dc9f07de55b0bd36fffb3a3849bd01174a69 SHA512 14cd86c9b065ae0a76c33e9b9843979a5058a8fbbb91a1c92ae989df3e0e2f5f598d583a1215f005eb0301fccbe2826acfac7aebb91ae90d9484fdf5e3323de0
 DIST crates-io-0.39.2.crate 10502 BLAKE2B a799936e970d1af434b236bd7f80647bfec091e1e6a340cc8000560f7ed8e157c156dbc8f5c1a42505642a36ed98d79b7398f11525e867d64e8bf60a7a48c9bb SHA512 e9d5d1521fbae0833ec6ff2c6f7c6eeb06f056275ddebdef44086652ef6732086644655d9d83a87dfef3ba17cc017809bf513c6bbb0f479e113cf32b8166fb66
 DIST crates-io-0.40.0.crate 10529 BLAKE2B 081fa33c953b61e785b920ea03f827f575edc4df993490bbcc689bb00aeb7d5ee9601765547975ead95ce41755ee25dace5f4dae4f69604bd6d6b50e438eef66 SHA512 b6eca910ac0c82fa9519678a2d7d11cb70628e8fcd3d6ac40e2fad4670553cfbf42c65de1de985c18ddc06aa5bdd6cf55add22f731eb31428a75901973f0ba60
 DIST crates-io-0.40.1.crate 10531 BLAKE2B e24453f8621aa217059f6951d34b7c3c502b9fb6ae29263245137c3cf8660ded7773a791c9c1b5fc5990af1ec2852f0ad14a57e4c7b1b40b070d0b245e5aa93d SHA512 38b29fb4221de2efe8637fe025ee2dd865d4c0ff9f0fac9b30086fd565feb41c82dbed78904a9df01e6952d303c858eeb2287609d401250eb3c5325ca3af8e68
 DIST crates-io-0.40.2.crate 10533 BLAKE2B ac2c706ab53c0dbe737cf1c61be67c7f8515ace63908db7d472b43e492806d0278a71277d7db3c180a4f611c61df9c5f8615a9bd92844f01e56cf8f342bda34f SHA512 c33982c6c1240f11b1ee36027d9dcef9686b9a4c1bfb78c3674930202eeed1cd6c41ea3b5935f224f3f08d18df7efbd23c8269be81ed54aafcad48b3e56ad67e
+DIST crates-io-0.40.4.crate 10560 BLAKE2B a65cda422ee4ea5ba616a845c93ee1a9e4b473f03531699c98b1f76840ea0462fbde6bd5649f845c3194095ed38aed4a3299d74dc12904f61bdbfb7280b41950 SHA512 05ea980bf7ce05fee485e179a916d91b2c7e83924c992cff03480a93ad99a3d33616a883bb7206e22c3e5e4cd9928b7021d020f9f9c5d6b138b1935d54cd7f75
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
@@ -149,22 +177,26 @@ DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
 DIST ct-codecs-1.1.1.crate 5388 BLAKE2B 2c5c8d3264428df7b6576f7c624468584e2aeefab2f35b024d2368f3fc2c77d8d1fc634a9ad5480dd5435d4d7f608434009eed262510608d74d264369e37ad0f SHA512 12538da7e45b46ae52fd5bdffe5608d64141bff9190750f9fd8bf3c0c73889c3477a0c988c37965ab2f9d773df596b5d01d15976268cf9852d0324a9660e2137
+DIST ct-codecs-1.1.2.crate 5451 BLAKE2B ccfafeee9aeddc0133631d30b84826d68286e0387c57c9a99efdde58437144f20d56b82aeba08466f4fa354d8ab37194368718aa5b7dca4499317e974a6caefb SHA512 3ae3f5a321231387d5fc29d0ad9de2d768b2dea8c5de08ffc26752b972d5319e2428fe6578e78bd36bec3f25a4753975a0f36fee9cc371da20f54a862eeea924
 DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5
 DIST curl-0.4.45.crate 94852 BLAKE2B ead351af57c810717f9453de2d9e775ebaca5a739769c74a5c2d03a0a0661b805ae315bc53008754b4ca439716318c40225a7e2bfff1790525d13d42d7f7f794 SHA512 d6c601891e971ed97e7d87b6d7049fe0d329ae036e647abc06e12e3793964b03acc004b40893ab112343ce38f1d3b0ee4606bc07efdf76e697d1da2ceacef7eb
 DIST curl-0.4.46.crate 94864 BLAKE2B bcfc97c19ce299abd3e8a9769a30c0ec5dc6692b5c1d81423f47aeea39066d1840ca7ec1d4713132519f3bea94d43aebd8d733a19028280e2e6c2a8e91eb1948 SHA512 c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336
 DIST curl-sys-0.4.59+curl-7.86.0.crate 2996584 BLAKE2B dd06c7cdf7740049558b8296d16e2485ee1b83692a94bdd2a037ecd45c0ec88c32bf48a26ea985c8de2de84296edf3f52092bfd3ab8338e10066e0a8defdc33d SHA512 048c5dbc3e1870c9b205c107e006c7112d01f4f7f03eb301ad9ca06ef29d03b08a840717ccc45883f19f1f6734958301375365653ccc6e45ff99151bd5e03b3f
 DIST curl-sys-0.4.72+curl-8.6.0.crate 3269599 BLAKE2B 07f7d22f787ba9f329af1e3f477ec877dcebd0c6f0cb32d284cce364c1d3fd4f9eba153753655405e06d0b759eee8ddb0e6f8600864ce8fa18ae727f985927e2 SHA512 d77db758acab7cacbab724bf9d6f5a3a40083be7290c9b6dfdf91370f1d965e21d8ce01f1d3df79eb40da2ec759c2b0609d3c6176a0517acbcdc5a2bbb66a1ce
+DIST curl-sys-0.4.74+curl-8.9.0.crate 1786932 BLAKE2B 47244310d60a9e8ed51ce7acddfa6f3895e199277a3400211b77088382804255a7858b4a4b3d30dc3c54622f514cdff76b539f11dd07d26fbbc8829c1a279266 SHA512 125e01702a85f33a9157d67930c92cd8af619d098c5ca98d820ed308d7931f851c395a278f54f57a243b8ae33305292c15ce9d6397b7e3726c6eefe90d3577f6
 DIST dbus-0.9.7.crate 104206 BLAKE2B f08f72170fbf9af3e525c20f4f11de64368e4a5d010571bc2ed9985c13353d99466f7e98a39ac949787ee9f4d10845d6940d9dbeaf1fae2122d49eeefa5306b1 SHA512 c1557d8be0c5c5623ec6a3928de310c80eef2cdf976d9fcbcc00f08a532af5b8d530f8ee1eba4de12f2df0ff7cf4d21323dfad76be82eeee2f386173991681e5
 DIST der-0.7.8.crate 85085 BLAKE2B 062d494ed32f3c97a6ef4999ef050ee07b26a854bc934304588c0b85b1d312478d1ad1812cd303e4e5aca967a2f4f76ef8ac7dea4ab6909e1a534a7dabcd46c4 SHA512 9cc5995cdb99c376cba473d2db476d81c824cc47c1924cf9c58d37a5508e2d01d3f10a009515d2ab456b1577af8de94e195bb315f61516029307ed860bc403dd
 DIST der-0.7.9.crate 85173 BLAKE2B f2dcf402e3d8b6a7ca818a8f260e0996290c77517b06bba8b22849c4d0e0c8f3dd57d664a06d9a7bfb1da6a39abd0740cd7d9776e75669aa970cc3ef63f924d4 SHA512 6de996346365647ac0da23d3fa9c72100d665c9225dc2f0bf1f553c4f0e7eb5c6acf3f1e36a11a7cc20e8b1c44752997e6f592c1d142755df145c5e302800f5b
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
 DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
+DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
 DIST ecdsa-0.16.9.crate 31406 BLAKE2B f827c0ea9f80555a1c4e37efa3509ef57bcb8c2abbefac29cfd85c3904d82495753bc5917e8e2b8659bd091d73c2d57bc2f6c8477b7d5d44ab858bd3a99229af SHA512 c69f921653a3dd47fede16aa886675c35b082c7b83486a6fea2c39cf2f98535a00263d7f0e68c5593d16b7cbee757ea913060bcaaa4c69884ca6fe2d3b149222
 DIST ed25519-compact-2.1.1.crate 29263 BLAKE2B 5316af7b845ec2c133ac07325d1b78aedc193e331d3809e595f3517d4554754e1abc351ebc3314c071d6c88886cf172740dd711b76a179dda4bcd6cb0cd98096 SHA512 071a4b9245b00ea6b25e2cf940e60eb78a197303e2426ce6fb4524ef138beb9618ff9f6a94cf172ea95be680e01ceaf6a949993ae30d511b7caa119a4d52d5c0
 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 either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
 DIST elliptic-curve-0.13.8.crate 63198 BLAKE2B 542536886019beb276b587f906c5552d88229eb06364d93db5eb6c93f70555e9e38e4636bda14789e5ba5b54321c0c6da85aa8d584e638fccda107e296c4d8f1 SHA512 64ec7868cfd2350f5a0e9f4fa7e2225b7f5532b8514ed6d5b8a7718f252f94caba4acf51b2471ac59717783289c9f2ab35d47881210ffbdeff08a85f68ef3042
 DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
@@ -182,6 +214,7 @@ DIST faster-hex-0.9.0.crate 13053 BLAKE2B 36e07a1b08544f273b30b6c8b79eb97bb0e97e
 DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
 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 ff-0.13.0.crate 17688 BLAKE2B c32379ebfea6cadd162dc169e0b413577fd191620f4f2a1c7d18e50ddfbe561ca865bc3e0fee3be287f43f6c9f2982992cbc56629889689bcbbf652e512da80b SHA512 eab19938f5a2cddb0fcc78b0724efd788aab7f17f04c482e0d06acac4d1cef2bcbfc74d6e4b2d9f535f9c955bf39c2153e010bdd2fa72d6d637d44baf8bf5f63
 DIST fiat-crypto-0.2.6.crate 495387 BLAKE2B 2dacb1cb45435a1a4bf577e3ea2623250ea9c30485a934d7afb63dd81ffdd35c411b04f68e206e9747f572c730ae0f5ebbd696dd45673d3b0429ebfa395eb561 SHA512 810cfcf91d959f7fc765295982b69dee141f4a50facf72a2db1832e1216e8166886c5dc6a92b6703deee27f3a64c7e1f91f7f377ddecf0d6f0ba37f7ab1462c3
 DIST fiat-crypto-0.2.7.crate 495388 BLAKE2B bf3c64cea6e28bff4b21be6bad51e6acd38c5a63e24214ef52feffc43bdcd30e5bf6cf9ed2423026b71b028cea16f949d130c8a570c28e7721043a321401893a SHA512 aba4ec81c04b7dc5358a9cc35b50c2596f46ef9d47d848dee51e1727d82b5cfc2ca9e6de1a45958900f030a5bb4b6a564518193b2ffd4ba85aa6f82aef48d95a
@@ -189,9 +222,11 @@ DIST fiat-crypto-0.2.8.crate 495396 BLAKE2B efdbcd1d5f4c13cde6d790a0fa01f002ac98
 DIST fiat-crypto-0.2.9.crate 495390 BLAKE2B 9201d3faedab8c73b606dce70d65d1138f5fb29e480d56b25cd66a8d2a150fb6d946c9e0ca98eaab0227490cea288b4c78917ccfb6693022d70d74dee94e6e78 SHA512 d916fe8ba3e82a365d20485b93c36994363059dead84c0266b7bfa0bcc74122d71b4a5c8689226c0e1007e7e01fc6f6c76e8687ae14fcc38f6f159287810f510
 DIST filetime-0.2.18.crate 14622 BLAKE2B 736ffe3ebadd458eeb24f8c5970d1350bbe07b179e0ad4f0d5708197bc91378939791cd331326a2cde9e03a84daba5a48a7a4a1001030fec4bcbc8af3741cb31 SHA512 d1631a50d0f1d3f43e316c6348a3595ea4a7d1116e904ac2bf6586b76ea5aef98ba84ff6e6d0b2a08de2515b8ad40f52fb95d6ccfaf1f316cfd7c5f6f8332129
 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.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
@@ -204,19 +239,24 @@ DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384
 DIST git2-0.15.0.crate 198983 BLAKE2B 0e340dedef36339cc6ce4cf9ac79014e7bcbdf9ebf688986d1836c3e2f480998a60a2722017381124682edc5dc511368497f03c9bd9a8c4d0e7690682789bf88 SHA512 8ea32850e592cb9bc8caa0d7a04042e284c11b9d46959807d8e6d496d93946342dc37fcdf1ed354010434798a404f415e8e980fee2ce4f5cb998e0f8736b5bc5
 DIST git2-0.18.2.crate 212536 BLAKE2B fffdea2d9a279ec6c371b03489f85039a50250bed9177ebb82090b74a7deddb988b3456ac7e7323be00822e3c243820839f00bd2478cc4d17d0d5d9ad943b4c6 SHA512 d7b7f61ee2c074da28b85bce8475d1b0b953e047ddea70d834fbcffc58a910f0fee3cb91b6e3a0e6fd14b76d142ea02909330db0266299b73c743463a8443a99
 DIST git2-0.18.3.crate 213009 BLAKE2B f0df4ba154d08f7e7ccd2f5bac9c41c60dd4af7c49d525b0b30fe9fc563c8fe62cf6be833e867f86d61103b946223a7cff9171aad569b8596c340deded56e419 SHA512 f74221d0d96c36d9362c762185b6715f93adc78d5b4db89a3008a2baeb4bb05d5cee2f3c53f59fec97e9a690f82ac3a4f29a1633445f63c6137512255fed48a5
+DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST git2-curl-0.16.0.crate 9289 BLAKE2B 6112a92ab483db1511bebc91ea601bfa0cebc689f7c0d3fedcbc2d4cc04d46ff0a40c6b90522ace541f90bd62febe9ebb1b7ec82a86d216e83eaf48dc1927499 SHA512 37dc34e7f38d44d07a90366624c0549eb172aa4f517893e489ab9a5dbb4aa36177d2b9dc361bde9b503d6d0885710f885667dfa0ba9ac2fd476de32018936aa1
 DIST git2-curl-0.19.0.crate 9544 BLAKE2B cac34b0bede886e77cddb54a092627f7f174fb3337555d4b69c262dcbf8617d6f7e1f20482cc8443e3985551d2f52b656ea9ba77efdd481586c1edde5707a65d SHA512 900c0c9d58517e1ce567ccdc07046fba6b6cadc9ccdbd67ffcf4215b003d137b69020602441579b4243560cd413d3c3c13af4e121af870490b66a793ed6edadb
+DIST git2-curl-0.20.0.crate 9587 BLAKE2B 754dc742a2c68aea90b99905d112435fbf31dc1c14064e62dbc0002b01b8adf630b5a4965526b3a3dc634f873bb3f2fdaf01f8d2b639b71f58df686d814711a1 SHA512 06d704e8f5227418bd0b3379c0dd503d694b4071d00432a1ff7593815e5074e02272a3f4e003d0feb7e9e3e806abdf68a5224a0366124f6a83681a9295f58424
 DIST gix-0.56.0.crate 243862 BLAKE2B 55c68662553f9b33ffbe35ed74f40f7655bdb26bb24993089f81603ea3224abbcdcc0f3f9db757b39251237d462a8ade790e5456f8c1a2832b2080059f898c59 SHA512 7f7326077e0c12b090387174e84c7afae9263c1fff307614e9c4fdb7494260c0228af60fbf6fefec65c0a0c0644e99aff6e0b8ce3243b2bab3d2653e6802632c
 DIST gix-0.57.1.crate 248977 BLAKE2B 5a73fdf067cc3b976a8019756a060db0f2198170941f05e456ebf4f29b4dad9db1dd5c5d503155f6e3b2ae44a2d9c92e35e9025c72035514eef1b5640f9ce8c3 SHA512 bee988b30118a4ab6299a0abce3e6088918fd9450412689ce53cc607cc86fdce5698ba8615f6f9a955a88e81f88bf56221c5c9dd1f2bbb01b9ddef30837e2332
 DIST gix-0.58.0.crate 249656 BLAKE2B e44e5b6b37329af4bf4dcadc12c8db4f74af473e680a867edfc9a06883eb377ec80fa1c7cb8c240a2e739e12c3f9daa6a9ce06996b480635908b9d13e8f4242b SHA512 63d1b683a0cff77dce0e59f70f45cc01a0642830c345b3b08f2c6626079775c44b8903630c00ca3bb9f02fc5b2a9d78bfb7aab36841196f3d674dd2fc81ca5af
 DIST gix-0.63.0.crate 270869 BLAKE2B 834e0f5aecdc5ac391e14550d881d70c1903e3ef96bea3b02372ff82312737bdf571e5907c6c1f06df69a84e8dc6f1aa07c1b6ec471a4425afbcc29dfffdb0fe SHA512 7864cbb80f0c81c3cf8c69f357279c64c3c860d9997a1445b955f32351069d02e66f213cc4b0d5c2631c4bcf0a8ed492f56fda81a7ca9c29c4ec2b7ae47422c5
+DIST gix-0.64.0.crate 273610 BLAKE2B 0f9f006a8874cc1f8c04f538b9ab1ca8304e9f5c2a66e9708523ab00b0cf3969d345d9320e1bfea26709edb754f0820e1f971674952a3eef4f8714dc4e89fa1c SHA512 3a49ef2004c0ef9dc18ffc25cbb57d343ec1adf088b27f42a81e98ff3d29974aa5024adc324c591174a7fffb425479e1a37e193347748bec1a0f246d3b340836
 DIST gix-actor-0.28.1.crate 8927 BLAKE2B 27cb0ee1839da466183a30dded926e46c2ca15a1efafb77647d59278496056df2e6dcc07969205a421b53f7c6a91d1fa6ac64fa737318f289964bffa6a676fbd SHA512 912c81f8e75da59aa9f526049bdb8f1407f74c27033286fce1e38a8c441588a3fc349218bdc8b210bbaf0726c9874a41a1f6c89b2a673f568d3281a51e533bd5
 DIST gix-actor-0.29.1.crate 8932 BLAKE2B 1872ab2c0f7b9aab8a40136e765992de5a86a10829b6e88e8dd461853c3fea14763b90c6d7f4298dba276edcb63de2961ffd6745a262c46bb4de080242e7e81d SHA512 35a4d29a8aab0781123798a52df7c27dbb3592b341361bf8298c23df670327be64740ea7fe8a78ebbb94568a6ee974ea11323b3e4f3b4a16d308dd6671e68b31
 DIST gix-actor-0.30.0.crate 8877 BLAKE2B e1a9ee478b21a8b32e8d808e268ab259dcf91170fb734d644c12408ab4e16464e40102daf55b071aedab70bde8e8956e5e4d4bf1f34a4791c2eb9ebbafbf0491 SHA512 4a8f66abe84053a8884450aa0c0ec0f190eb5abc845a4ffad30d1e9dbb6f380881fd2eee7c3d2faef434a2819e2a179ca0e78fa7c3e068f45e6109597d2f1c77
 DIST gix-actor-0.31.2.crate 8999 BLAKE2B 89858e2b03a8d7ed5980a88e99418c1e59a8bc73afd6a246d1613cfc8e721155329166156945ee864f98e984dcf27d0dec69acc3eaa2547f3a915c2a8e84e93f SHA512 82271347550187d81513e99e08a1cd76ec4542ed3b9bc22517f47da02dacf8c19e6a2fe0782bcfe0939ed866e1379d35211384c967a7844f26ebacc52246bc64
+DIST gix-actor-0.31.5.crate 9335 BLAKE2B 9ee5d90bfbeb465aa42862f4b4badb3e562d5eb8fa464f129f769f2e53fca06585cb8c510fdc438bad12c05e8c30bed3a471bf1b5ee41144055b979b6ae5936e SHA512 ac1a24e789896d573c217ccadbaa8117bccd22961ad4abe598e5b1acc3aa5bea350a0b6def7f3bcd11ca6550a67f82906c854adad058dd584807b7758f7b837f
 DIST gix-attributes-0.20.1.crate 19060 BLAKE2B 0065b1fc3808655827467fa2a624b08d779bdd34d8b798b782259c57665bdb91e909e0df47fc5a5210e6f6f60ceef3e666014f4d791537bdbb7a86a93c25c0c6 SHA512 17b11b7665acb31a27bc60aa9f10271b91e504c24e625c13640a04e20c6e8677d947e5a2fc63369341554a0529f78f0c7c79177bc9662ec6bca6ca07732e5ea9
 DIST gix-attributes-0.21.1.crate 19061 BLAKE2B 751f846f6267b21011c1d4408ba36264b46da9490829c880d9dde0ed3f3bbf122e62caa0db43ec727789363ec56d7180cbdb9f082ccc05245402e4cfc814c939 SHA512 bdcfd9195d0fc344096338504fb9ea49d0b0843c628a09c2cac06bdbf42c9bd75dca1ffd3742664dcca7fff260970b32739301f6fa4e560d93f42e7837ccad78
 DIST gix-attributes-0.22.2.crate 19043 BLAKE2B 0f6043ff1ed46be4cae9f38c57069c7de2424f09757971b38d728f9329f6aceb58e9ee5e1e63203e1cb718c49726dfa786b11dbfa0fdecf013052269fd898ce2 SHA512 2dd8cb1e1b3fdd0bd9f6b6fdfb77a710d81e85d86605a17d4e173de6969013ca954ec7ce255349a6336f76b0c65c9f0ae12fe56fd27d6c817c30f99ebdd6f60d
+DIST gix-attributes-0.22.5.crate 19163 BLAKE2B 0801150a9de71cbaf76ce96dcfb442f4c5f29595af9a21de8a8ceb5e0bd84d8eb3b93b56cf74fb9e136aabd0227286f79bcbb1caddf8280e723e243c172d3c30 SHA512 b72057a5e2d97d3600a18dd0005d25fd8a1bc254524833d76370efcae3cdb81721356db9ff60c6480d8584817653916295203aa2043ade3d1b049e42e0176c80
 DIST gix-bitmap-0.2.10.crate 6998 BLAKE2B 252fb6ea3e2a9b3fbdb6c05c6b1a54794a4fe0d2dca08712cbe6816cf88c6161d58e9a72cdd965a9695d86b76a1235a19bb177a3dc1180ed4697e85181090b8b SHA512 449d9b89cb677bb1267b429870ca38171f01c8ded2bac92b33e77091c3a00e3cb96bf8f7bb0995564531984206c9cfee9709e206bf3a60b5b0d1881376cccc4b
 DIST gix-bitmap-0.2.11.crate 6920 BLAKE2B eebacb07d6150bc16d4068fb0d5d1646f78cac93ab6cc82b64f3fd9d4ec928f5e904a3ab2bb66f697df2ca51c17eb586d873bec73380e894b66f05b94b7ed690 SHA512 889e0195b9c16f6cafe6d66a7d18da1dcc5f3aaebeb63415665102d838bf702eabe142fcbbebc28f3b69372eec5f51a9dace3d333caa6f5fe8158df89eddc40b
 DIST gix-chunk-0.4.7.crate 9411 BLAKE2B 52060f452a432ed4accaa308866b622b243d1d6e26f3b5514476d57fdb7b5fde8a1f904f0e7aed580b73f2700c37026df2429831b43fb33672a65a10ebfb40f8 SHA512 c0a74c5275e103213ea2a3ed517d7eb9d2a79efa89ee38990f701b17355eb759d8e8dd39cdda733f338338fb790510cfca7a56e53900ab6255dac5066809ffd2
@@ -224,58 +264,73 @@ DIST gix-chunk-0.4.8.crate 9358 BLAKE2B 6034c836716906e7b8cf490c9f066ea6a995d384
 DIST gix-command-0.3.4.crate 10668 BLAKE2B 159b1a93e565db1223e1a7f0cc91cf37c59ac723414d6358ab961c96ebee88a801d10865a9b886bec82dffd9c8ba0534019a1e86948ba9edf0273d8d215647c7 SHA512 b9213efbc0ab3d6c19d789dc3128d726d3ed51dac765c9027e9730e72f10aaed5117fead8cd2893922f64a4800385a2112cf1fdf1cf25141e5be4d3e78a35c4c
 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.3.9.crate 10938 BLAKE2B 0f771ad9f51d4203e54984e71e2c29e2ed13f3dc145dc9e157f8cf2f9db604a973932c1379fbfea9d1caa00498bfe6507d6ee231ad72e73781575f705af81630 SHA512 9a42c1513ce33a874bf0a43fded2025fa1040c1235635159d875275df6bdb2c2853ac535483ffd80b07bd849da5bc7f38ba5228b5ed0ac27fba85059d8db83ef
 DIST gix-commitgraph-0.22.1.crate 18108 BLAKE2B 532334aa8cd5f286e58b2bfb5d8c0e58d3062dad3aaa1b6fc7e270ef2608f9a247b3c0a630fea2bec8c2cd72b1cecb8ce32966f5209cc762926b8d80bcbca2bc SHA512 7e97bd7f8df1b6442dfea0ce192058530d2f236437937f353c7c875facaeb02088a61fa6f7aeff556a1a966cd52744d8f82f27101b5fe32ea78efd09a32e4e84
 DIST gix-commitgraph-0.23.2.crate 18185 BLAKE2B f80e5185b89975d98d4648b0a29530cb8a9890db34b24c4309badd92768e70deb43cbc03d3a478af2e3333e5d0c8b7c5a738eed5d5becaae12e510943cf53325 SHA512 908100438794efa59828ced4f8140a78399f1d994a7ea398cce470f3cfba8a1f2ff748aa9cbe42ec88a4e47ed0546b648f29cd14d76669d9e6f6c27dae78296f
 DIST gix-commitgraph-0.24.2.crate 18187 BLAKE2B e536c5abcd1736eb800ce48d4fd6ad919a70aee5d210d086f35d1fd6aba309d3f3446429eb102dd41dedcbe1fe578429fa70a94679c50784490172e4a22a32e6 SHA512 3ddb2e78bf47c1e3d0803d5b7387eefd6c5a0ed046bf042523e49d3bebbf156c9ab213b7b4ad270849a760dddd2d8fb37425dfc0d3250446a368947dfc85185c
+DIST gix-commitgraph-0.24.3.crate 18242 BLAKE2B ef37235c7258ef6603b122f9ac9bb527be29f1b4cf7dfb02a484ad77986220499633789466bef94508949ebfae50568493f216d532fdbbb84861e9f04aefc38f SHA512 270edf30cdd8ff90bab02d941d741ab6cf6a85d6c2adc25b41298637153e641307e15db9ad54fbf0ac4008497c77980202b067f48c2eef88a7fc1673e022ae47
 DIST gix-config-0.32.1.crate 61594 BLAKE2B 306b0d238137f39a30a257105ee433060521970b1d329c9d8f698ca8b9c8c9cdf7a80852df26771ba45365e972133f613afc71a63be72c4707eef58a5511a837 SHA512 915ca9ae0999aa9d6d1aefce8010e801b1ed4694c420f15c095d783451c1b861507a963cb35971e9e3a8282ca8c84e3c645a6c3c685ee08f9d48fae9d60a4989
 DIST gix-config-0.33.1.crate 61713 BLAKE2B 809a63adeda09021ad93e6b9310227e6e314716ce09f97fa9c02b8246e53eaacce18b87a26a48e3512282ece57e11156cb45aa61b4a313dd55d13c766e28ab19 SHA512 002392ff8d63bac79c31fe1094738491022c0dc5aa0c8d054330de9462a973226042f33cfe1d0fc743d52232b07983856210be5c15413a7e03f32288dd4c570e
 DIST gix-config-0.34.0.crate 61671 BLAKE2B 34031e4c06f7d674677dd79a92951863ebad6e16c9f38cc213f82969dba80fa6d12abc2c249ecd07608849996c73a678cad27e3288a685f8a72167393e11ecc8 SHA512 425d3b0994844608559195e41fc1356a9e1f79d362d795c2f93078dddf2ff465556c59876a4ac8ae6630659c1b963daab11b15ad6025dfb8716b3e372a7f2658
 DIST gix-config-0.37.0.crate 61780 BLAKE2B 548ce00ee51a3c7f380aa83fbb98b97e95d03321e0ce2d04498c9774ccc27b5fa3ae61a3495dee6d450bb6218a234241e8830663e15b38ea51b16a1fd84708d2 SHA512 9802f72a467305916f96ca7eb8476edad8d710d54982681d5c88fcf07c12bd6d2433c14d0407abed50cca76c2eb05551ae3f223846f3431014c388b306178c23
+DIST gix-config-0.38.0.crate 63374 BLAKE2B cfe0a813c9900439e2e3e599e289651e94de664ce745ab70e7ffbce1d34a3446f31a674cf15f1044440e64ff490c8d3d696c31f71ba9c44ce2f6646ca995c55a SHA512 0158572e9fff19570e29e209a290b32bc11ca3314b060406c38e4ff126ee9af302bfa454aeb4ebf88779fb090f33bebf34ed279b7d446494c3ede726c74dde46
 DIST gix-config-value-0.14.4.crate 12762 BLAKE2B 56f504edf85f8a31e6a1b3dd216d27cba8c2981ae765734222d972c6e90838a270c96f7ce4415d50b34f4020e449c5fb7e4146c4e9e712893137247e05e467d3 SHA512 c627846c7c02f11165402f6d967c15165ec518fb5606e42b0247d8664a8d7a80af167500fb95fdcf8a9dc962486fad6f88d3f3f04e25357db1d72969024587ba
 DIST gix-config-value-0.14.6.crate 12769 BLAKE2B bd807a037a74905f7575c295567207a5200830fefcc802e11ec271d238af0f391b3f639cd2686e77c267bc4b4d2a15aff290d926bea194a25473f7c87e12dddb SHA512 547d527c248016135504b4544ff8958168279fe20720da9e2ce6e2f148741f8e870875515ce4f069509583186e0c0e9856e8c08ae1e14620a001482fbcc8f8b3
+DIST gix-config-value-0.14.8.crate 12828 BLAKE2B 3d08b92b6a5b9468ed5f6bec47a9a7d968cc0727ea7819e1059d518943ac91c2dd34c9c1cec0f520b6dd2c4dab8d0a5db1683bf0a215dd4c9d6965c6e6c83a2b SHA512 2bc52ecb47aee3178f6ca0d02ab325afe6080fc80f85eb2d7150e72b8b46dc4396ec8a9c70e7dd7bcd901357663962888941de382740313eaf82daaf159c5303
 DIST gix-credentials-0.22.0.crate 19996 BLAKE2B 0e0a58d7ccb1b536eefe11b7a3d07abfcdd8956ab23a21220eed66a78b0efd32fa1050a0fb5d51ca913208e4d4e74d4d437c2d6df9a7eaf8520542f01e63e094 SHA512 1440aa5c69af7382ddf5ee934c2b109a73dd72b4d9befa1b8705793f2cb4aca256c5820e04a3cc747942fa5c24bc629dfb969220e194ce6081ce5a61d73778d1
 DIST gix-credentials-0.23.1.crate 20573 BLAKE2B 496569e39a5703895aeff4178f98e3a5c78582b66d41b3ab011a9693adde57083ead5ffd796d1baf0fb8e2bd74f130ce85c583966b44551c35ce0b233d2eb3eb SHA512 00b3b483c33b951fe52f6a837d5d88dc5266e7b204a005b536bc2784c9a6cea82848ef76cc33767b889dd3977b051309975d21a47bf8bf5d5e35f5fd2482586f
 DIST gix-credentials-0.24.2.crate 20458 BLAKE2B 062e565375d25825b4167f2ca55c5a24f269115fd21d4a292f09af9bcf572e14de936ed11ed90880c655d7459849f1783d094336dfa58e7c3bef697f7e69980d SHA512 2256804b53187cf7acc21e6eab80a0ffec5e303542da7736766f3eabfbd62031e67c92ddabd123d8875f889e09c9905d461e7e4c7aeb24f519c959418c89c627
+DIST gix-credentials-0.24.5.crate 20026 BLAKE2B 062a6d32b1be527a8e8d085099c0dd49acaddf80598a48b61d3b71d674779b66f81d0c94ea61e8e48b1f48c721510acb4b2ca1fcc39d561617e084934c17c286 SHA512 fbd5a2cda803e04645d61aec5fc5df434578ab9fe5740e7c7d308940ddea2eff387eec4a5f76bc4d697e2a55eb949cae82bf8b5dca5c6136540fbfe37068a079
 DIST gix-date-0.8.3.crate 10237 BLAKE2B a6e1a4f9d1c762e280db1684bbf52990edbe2041d8fca565333331dbc312cf66a5640ff94ebc18d0927367c24507946390f65d6c51829b85a621ec62a3d1bd39 SHA512 e75599be5da56838fae0651c399e6aa503783306faed971894a661b4a474a31713d321ddff7698aeca973f8429302ab929d998314bcb1fc40643839d8eeb4dac
 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-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.38.0.crate 32105 BLAKE2B 9cd40895cd0484f2c882cf254cc3a17a3f3b0f379e8ff89da222c327eb9833438f87f49fc1103247c3953e5c87c166cd7fb6e128f367ee73ccc691f26dce3727 SHA512 dc0e42d816290ea420fdf08b8e9f84d32e6844b9f91e719d2cbc87392e92a77754a8929fc112be9da9b246f717e58f0c72edce809b1631eee898748ad203703b
 DIST gix-diff-0.39.1.crate 32114 BLAKE2B 4ad9833f757c5c7c3f8d26458f2e3ff8320ce93b16181a62404a4576a6f55edb5e2760c18424c8c69fe8bd9fba6178c36a53703ac4c06db602f21e08d3fad245 SHA512 d9b69e0f53b0ffd292daa3815ea455512a47ace9d568b6f8ff0bf32ba6d8de6ed77995056e195d1e5838963ad0f3d7fd59aa62099fb3c3731389bacce27bb6ff
 DIST gix-diff-0.40.0.crate 32043 BLAKE2B 8a796de2ae6ba928e9d5cd9ed4af80d0379e3629b683a0f1415ae70fd099a9257dadd2c28f640a19dffd54824d792a1698eab3dd6f0156d0499c59a132a346f0 SHA512 e96271c5e79e2a0b31f4a5f2453fcffde46b9b8314cb73f3c8871e5c4150c5e07572423b81204a6b6f991628b0679f262b59deba8c046c969332d316cdfe101d
 DIST gix-diff-0.44.0.crate 32198 BLAKE2B 569cba509932a93f1a2e47c985e80da68239f7e3cc0928e9846c9485060401c6b5ea9468781e89eb5980ee139f436bd36f2416489576770967984abe99263a00 SHA512 54ffb18f2e0f1047994f26120014b981a1d73213b3481d4de3187318d0582ea2a00513a0eddd9964869dad5518bd2a727a330a72e7b26d03cf6e8d50df52205b
+DIST gix-diff-0.44.1.crate 32197 BLAKE2B 4677617e405c22c4756f993674841838b769ae89f9b6109bf9e34b00001115cb1d8b97fc9b22467d6d0399fbdfa884d6e4e5434f15eb52c461c65d4d1a988407 SHA512 90fc23f9ec343864f51c7c18ed0b2a27445d7eb5473fa64635bab3b307413dd44e861e0ba083456ff05e67911b718320ef497d0faf7a6349b4317f433febf400
 DIST gix-dir-0.5.0.crate 45881 BLAKE2B 2a6f5f1431b8421bee0524d009cd1b16879d88e7907a27783ba1de58eed84f67c280832746436899664aff419d9fa077a3c30069f43300c82441ad57d1ee041a SHA512 c7c02da930eb210d829ab519d129448184bac25865a7940adbec36ac60c07745a796f23b0b3c72067fd254b369c2efa619e3515bef5ade6618a169db4056715b
+DIST gix-dir-0.6.0.crate 47888 BLAKE2B 30843b8d6e95989d023fb7a75555fadf98052ca40cc31890275c7c9cf5ff914de7d773346e5a4bfcba8b89b219c640420b101731f8f6e30f456f7f99a0c419d5 SHA512 046020f3491ddb1e44531c05d64f5e6939b93b295f802ac5a45a312fab5042d763dfa477fdab042d12ead8e5c3337ce64d569860cf3c4d9ccdf86065afdfb5ca
 DIST gix-discover-0.27.0.crate 16442 BLAKE2B 3c4f0f048163a0213da5d6aef1ac8436873f95fa2d9c06a3d6998299b756b764c6a367176d4fd80dd91ee630141de95c38e2351d80b4b3b729c412c07314e112 SHA512 b67db407044cf7d894e853544cd9ba6d642d85a45aa6b707176515e8c47bf9af5a65f9146d7588470fa2ad482152cec462d8418c0ceb2d24b6fcf05c3e7ab92b
 DIST gix-discover-0.28.1.crate 16383 BLAKE2B ccf6988908e5e1e647ff55285dda9c8b1fe68d56bb804c3f0440dd1fd25a9e0937dccb8834b1305e4a6bfd6a6ef83f07b5cd4dc78956598ba9db34a6255ab962 SHA512 493d1583e216c4213d043571a0db17ec32562288ae8e93efc28ed2df759afb4c2889831eea2a519ad475f37f8a1bd4825ae006e206b98945465db9fee188c211
 DIST gix-discover-0.29.0.crate 16617 BLAKE2B 0c4be29f5511969749c8718cb222fd71d5f3661333be781b819f1b16a7f02144877193bec9bd154f9c78925de4bfeb2c3fb6a45e24eec283b7f42b465132d266 SHA512 99727232be65b90d77e1dccfd29e45839934906126c728b4413d425ff89c63df3a5ff0ebfc868b6c8ce53804629a1e450c22dfd614a685da73fcdfdc5c397084
 DIST gix-discover-0.32.0.crate 16630 BLAKE2B 785b22f86fced1c5b27c71ae9c416efb0241376d511574e9333bea0281ce03e8be547d79c8a599701ef63f508bbbfb8a9dfe98e57366ae37005350f156d21c29 SHA512 876127a5272351a1ae218682c34b3fd47fe10e930508e0543f086f4e351e0db1f19bc679ffe4b7515b91013fea67aa766784d7c82eb82e2fcf3634902704e6e6
+DIST gix-discover-0.33.0.crate 16632 BLAKE2B 0f416b93a145ed053e5435b53197815f381da3e1f56734471a434b3ded2cd98e455e29edad52586b9d2629e209c668d215bd642d4fa8390d90edba77cd9d9073 SHA512 aa76b2427366c406294740bb6c5ad93d8c52c3e1aa54a5a48a940e96879741503cbac597ef5888e7812727cabefadc8cfb7b49d917571dcda1977438a9dbbebb
 DIST gix-features-0.35.0.crate 73636 BLAKE2B 47a69da949aa296458d1d37f2033d8ce304c36e1c3b180fe2318393245bb9d62983e26563302722ad454555a51867e7893a97a62bff75ec1b1b8821b371c3328 SHA512 364ffc5ccd46657a2f9e40590f3405da95e69119ff94e85e76307800b374a5cd8ba4b0f30c80bf0a7f90f7f9bf7551f8d72b46e7173ff6560f654f51371f250e
 DIST gix-features-0.36.1.crate 29362 BLAKE2B 13e2aef38ee33dcde780fd2ff68f36c3ee32612f4853f7b56144ff5ec21b50f3d6ad8748a0e0f00289a1e33f861eb23bda8b8aeee7a684848cd003123ba299fa SHA512 558d9ee8d48f3867cc8e4fde8f4a189ea7788b1859c9493a5e87e28c3c545bd4eecd14a23ccfe457858273dac1e59fce6089f554423a815740054c2656875169
 DIST gix-features-0.37.2.crate 29298 BLAKE2B c03e4c14eb349d51154f5a250aecf8bbb2db6bfe22386fc6153192691f1e7653b0e016940f43b9ea9f943927d176406b7aa3c7b305ba6322784cfb0de3fd67a2 SHA512 2ea06a700a991567b82af40ee97d4ccae5ba248d9fec6bb93385f2ecea0cbdb254e2d5111543f22da562729a7d95f1b029777041a9d21caabb46582860a602f4
 DIST gix-features-0.38.1.crate 30596 BLAKE2B 9b0a6957566abdf7a11a9ad9df245f88d1b03cce4d6e23432bf3ed12314043c43518ae0be2048f28dfac1b99b196fb131751949d8ac2d2639f827e3d832f738a SHA512 8a405dca152a4c913153b458646632097edcbb0a57320837f7e7fbb1d6f0e5293e9148f77a65ac19a1869203636c17c1d5aebcfabb5b3f31e8cc6e71da7827ec
 DIST gix-features-0.38.2.crate 30604 BLAKE2B 68bb0154bc444a84dd20bdd1a56d770a8c68a816389dc8ba0a94ae71da9c9955974cf7a154de5548f65e547a5e25303efc19b5e225664ce8f827cdb661bb17d8 SHA512 d82f70bd8831701b2c17a761b306e4b630fd5b558e4b936aa8b2f87440e53127b48f024c392b487af23e0c541de4b064c27c35ee57005a81352eba0e6bcf79a1
 DIST gix-filter-0.11.2.crate 35873 BLAKE2B f78fc41fe532c6f8cecdd4f3470c751457aeb936ccbb262b9411b2097553cc8ea377c5ba7e445b3b9335f4874b79fb932565277984c968b2a74cd3aaee78f422 SHA512 50a57f3f909893f96c947ca4621e9fecf7758b6d7f1e2a0ee105f9469fc13f0ac0fdf6ce1a2e86878faea06d1eb7b9e2b2de92501709250963ef5bc3e99a6da9
+DIST gix-filter-0.11.3.crate 35889 BLAKE2B 77aade805a4476cbaaefd50544c6a5f7781aaa87048da51f2fc06141140c77c0c7c64309ea2e1903ff7c174f59e86c9c3af526a03e60e13c26387e3bf27b19a7 SHA512 b8cdb4a87046f9272408a43ddde61e764a70321b4482300d880ad6245944cc9f535c13077c92ba1a49329547bf12b3f39b67d39275b5f271996957f5ce14e0bc
 DIST gix-filter-0.7.0.crate 34839 BLAKE2B e06fdc586f9fd0697cfa4eb1ed04842516cdf87f49f904848cb5d2efce19b5f87dff2b5ffff6be19a4e5f4101ef5a4c19532fbc317bde3aa823434ddc2326903 SHA512 4961d59081828dc5cf9075199650a328603547bf2f058c1c383c1c9f1d86e8a1b0015aeb6896a0743f24fdb0b4864e077e6e54634f00831e4c9a186a06cde85e
 DIST gix-filter-0.8.1.crate 35718 BLAKE2B 3964188218f65c37ec0095057eb5a1246f13d657119d599b0c761ade80d5500fca76835abc64451bf7cbb752f017669ca240afd1994b8bdfd0d594a200c746e3 SHA512 f03095b27056850c937d852083aadf30f23745ef1c69d729aaa3f5bddde40eed899f7f4821733c8942bbda642660b327f7769122e0360291898c7c68ee8d457b
 DIST gix-filter-0.9.0.crate 35850 BLAKE2B 1b01cda4227d8d1bda207b376f2f05f77cc8b4574a0ddb815c24cf7d6fc9d198c3441f0abcc60dfe45fbc3617dcc71ff2c4506c42dbddfcc8b24585f6cfbf119 SHA512 963008cc0c7be4fcbcdd15016e3d782b5c4eefe8d818b833c1ac266807d52ed23fe082658e3fa4e063f1d388e7624e3d88a9c80143601aa292f47a7e6d47bde4
 DIST gix-fs-0.10.2.crate 14372 BLAKE2B c1b3e570ae948f2857d810f3dd042c1202494ce8254cd97356a0e6697f93bd739c250346a19e516c4204fc50978845da397785f2b65c0bd31649802f49da9dbd SHA512 252260fc66b9a735d9dd9e8a1f5ad95deebb23197ad2933fe9713e6f9a62b2849bb1187141c3c8968b9baa6ca11e8cb972c69367c4e317df62eb7fb25338f7b7
 DIST gix-fs-0.11.1.crate 14922 BLAKE2B cdf873c23589359cfde5fa88e8eec9902bf8b60b15165f8a8364543fa4fb19db81e4c79e8c156b5d092b0692b0b5056fa2d7663d25f9adb9c69771dc44efd52a SHA512 46d64c5771b07fbc3bc661d3b075a2d93fa97fd0c6e4e05e4835bf944ce06228765d38a4cfa0534d1a48e1dfec9373ddad880bcd2f505e6286bd35391e573398
+DIST gix-fs-0.11.3.crate 14867 BLAKE2B 71495a8f84c1dddef477ff6bb19343e58e8f0b0e3786d327750bcec04a1971237ba328061505810943e0c8a864ebfb36fd47c01dd51fc48b9d18e0a0ac329070 SHA512 7d420a8cd322561808f84913c5c6880031a07005f535bf4e379673707feaeb8fcff4c2a41b455fe76ab7af6fdf0a934c471290d828e8416c26ad49cbda1f235f
 DIST gix-fs-0.8.1.crate 13692 BLAKE2B 9b4715d7f3fa24f25fff14eb3ccf9dff35abbb423d69f7ca29c16187451feadd2a711ec91e17d7ad412cf583be8c0be9db22fa0d6e3eef9bc7d172226fea0e6b SHA512 3c85ca7a43c4722e5104748bf22f7e3e115c9823dfcb70463a4020a35f3eac953de119885feca3d6d0e7e54ba9007628abd17cfa0bdd0294165c513132620f25
 DIST gix-fs-0.9.1.crate 13694 BLAKE2B d1e4f39445b419634d5d29f62ca02971815bf166653f34b3330d19abacec34ad2e4392d7548efa809e81c6b8df2024e6601f12f80a3210024e973e740f0c3302 SHA512 a2dd1f430756bb4ae9052970b162bcabc03157c09d9ad91b0bda58eb7788a3876fbc5a7ee8411aa9a398aa8dab8673188f4ac045eada7aba3694404077fdfe12
 DIST gix-glob-0.14.1.crate 13065 BLAKE2B 01b441812daac46c9328231856fe03e75bdcf14277d4766f654589d335a95769807d73fc5ac69ad4a0c86f8916d84d4c33697ba471d49f209252b4090f57bb4f SHA512 6b5749b17ec319ea756a2f185a0e09c386846d4fef5705acf77e1a0aba8bf0b1d70bff27710d91c27e26c5b55f34c34b89a42b3fbdcb91fa029e5efea52f2b75
 DIST gix-glob-0.15.1.crate 13295 BLAKE2B 2ca5c36f7282404a558df01b0a533e4c2554d594efce17d3ece56bed13418144474ce0830f801078349e9620fbce8e2c07f44c653c8a89326751f28a5bbbb6d1 SHA512 d2f4f35a48c5891f382b9fc113377d92a2302d7e2ea5e93585f26930a93a5c16e21c2b0ad7dcc8d427c180aae729fb0fdd9c9cd401e08360946eaf67eb23f70e
 DIST gix-glob-0.16.2.crate 13261 BLAKE2B 9274187d3af9a770abb5b31258182003d44756f0639220c6475098964ba517cb8db651d15ea1ac18c38b2f9d47ae05d589bb7b18e6766717b9b30522a9889477 SHA512 9d540eed9995395f3987831d5d6e8bfc6349c712692cf5aef41d216e923eff84e14f528552d611bdbfe25e9cbf79b34d514ef4e3e98c38dae6244cac66312f07
 DIST gix-glob-0.16.3.crate 13426 BLAKE2B 78aacfc18e4317908b88bc25d614bce539b8995c3570fd46d68a45987c809ef6417a9df1a1bffeae95d62698bc62f8f0b3358623394579f88166ce7fc10c5b72 SHA512 01d33279e8c0c254cef027d5340a4824b47daef0c4af11e51f6c4b65022dda7971cdcd155b60adecf72b0fb647a38a5f3f0ce956510b51dbcb4f84a1b0dedc79
+DIST gix-glob-0.16.5.crate 13425 BLAKE2B 233ebbd4e1993f5139478b1d482f54b47992686ab175bbb01fb95591934735d93681d8b888e85e7e2b6c256afeaedb7f6cd4fd666bb2a3c8f3e206b34e50a29a SHA512 6b8a22c5225a18645ef673fe73f7da73fc519650d03990f7fa43bf8f0df58d4c1a39a0da297ff5e76557b07f89f1aba5955a82a997bc29e52ca9dad808858b2b
 DIST gix-hash-0.13.3.crate 12701 BLAKE2B df1a14b682701abbfdc35f46ce03ae36684685ebc2dd96d596cd5fc5bb68528146c545a424aed733b09ddd93ff02ebf98a5baa57348c8fb98bb110d235aa99ee SHA512 3eb29f0660555b6dfed3f932050b2f0f28c1d1ac9f882b46755b65559b5dba04737fce5111a713c796b33b0d352179547e80e0bfc96df3b45da32794028c3be8
 DIST gix-hash-0.14.2.crate 12759 BLAKE2B 033f46ba342fea5e2a7b5b91eeeac06aabaae527d10ed665ef1d2d7f34362ae7ea27df652012c5ae25872ab18175aefe15de3e981647086d8008a32bdffb2d0e SHA512 32ba5cc7805146fa858501bdf0cd75bd000550aacee258fdd63572323cdd06e54c78b4a71761d410c46471dc1bcf856e5564586f24ca2cca03c60b9e08b4386d
 DIST gix-hashtable-0.4.1.crate 6464 BLAKE2B 09e7878d6fca74e9478e07b4f8406d73f90121fb350a6aae1975701ee7a941170b8c7fadacaa52c7e592ef27aacf71893d97a9eb3459eada869bc18d4b466c59 SHA512 d3fefdf9fc77dcb6463b6800fc1e7b118b1c7a82a572f7245987f2260e153821227bc6e8a2d4fb20f4bd948f756abf476f14abaa6214846c3218b6a7d1d84f08
 DIST gix-hashtable-0.5.2.crate 6421 BLAKE2B 483871bb398815c4be337e494244a9f9f6bfcf2788bcc975c96a5095f213f6b70a19902bf00987d3f16316625617727cb84408431398d32e5bc1fffdeeb84340 SHA512 d3b963cf2e82dd034bfa5912bdd0fa384cdd501efa6a0dacc70838245ad072daaf49e2f7a84d2d41360c0677af9c0162831423b4a903a77f5f7f8027034bc36a
 DIST gix-ignore-0.10.1.crate 8459 BLAKE2B 8d0d0b661c01656abdb36fad1f0ca8601664a3dd53ed6de4f68daed74b360b8915687dbc621f36eede32e7446fe3ea3b8a3a858c1b7c04226121072fec9dfc45 SHA512 a0a7777f67f47bddb6a44b55826ef60b196e803aefa2a99023d7c5f8885052c3b8c4e887ba91cfdfee1cfbeb4a9d15792184c5a6ddb8cebffd30f0be78f1e280
 DIST gix-ignore-0.11.2.crate 9090 BLAKE2B 9b9ceb2679d7d0f500741f481354c66b552bb1a858fa1be2de02eddb3ec751090fcc252ce597e6b8b6ea77e004dacba04b71c7b2097e58f442158d27ce9b4035 SHA512 6ea8f39d50a0ad46f043fbc15c1c7372ecdfcdd75208a71dbae1215e6bc4914e64564e9828c8b4333f3727a49b1141719e015d97c0d7d00a42f32c2764ffa3de
+DIST gix-ignore-0.11.4.crate 9154 BLAKE2B 36b83d845d48c115fa6685632dc197bf665305de63bc81e540b00aad0f4d15fd1cc69d9fa0c1c33b7d647a686f6d65d35767be888090a9315d85d6689ba53f71 SHA512 81995c3660f4a7db91fc3b3f3d00ac92a7fd4490c0b8196656f4684dd3b5323c075d340b9ca7d52dce7896d82ccc06e8c335f2419eaf11f073ce525372c2554d
 DIST gix-ignore-0.9.1.crate 8459 BLAKE2B 9d18de221a360a476bad1f112b41b3d94bae679c5b02ee1d978838d4ab63cd398109617b543c63d6e4a2f4727fb465ca33fd779c1537475bc457f1e072b398d3 SHA512 e3a10bdd77913686ecc50e44fbb3b2fd777ddbf7458cb298cfe4f2cef1437fb7e215cf6005463bcb22015cd16b6cab33fb1531c8f6a5e77693a5b85f49a7a0af
 DIST gix-index-0.27.1.crate 41861 BLAKE2B 4f19ee3477713a7cc38468c9ac892581622a09e0b8dc025524f3db45a4db06e75eb5682fb8d4df13f12e69a4abf2afbad672d318aeb17ed25dcde85678ea0bf1 SHA512 cd1aba9c4a1eb9e501a11151db89ec6985f3cfcb4989de9f2fb49cd96124ad87657e4c1185d0fbad5dc6873edf5d8ee16e380a09261c48a06bcfd90635b19138
 DIST gix-index-0.28.2.crate 43940 BLAKE2B edb16b8285419b997a92bf31f37b6624191dea950499e69dac65d82842c007191a075cd87bdda3daf1c165ccbf7f0bd35282db2f13f9ddef574f6a64534e47f4 SHA512 3df8c1110485813eac67f31fd421b0702b39eb27e02eaa808242172fd8fcfd204e0a7570b1efd436dd32e7dc44c6a8735e70a730d8868a90eef001296851d5e4
 DIST gix-index-0.29.0.crate 43935 BLAKE2B 9ba0286eb91aafe8b0d9475d7571a4ccb8de33e0d03e2b8528c9a7d6018ee81ec984c979332faed7ea81c993e45236cb1178d64115f42f2b0f2aeef5ef7df295 SHA512 c587963ce1835a1514b9deb8dd718e3b8b150eb12eb01d096abccfd8e053eefe98cf54b91bd1fca9e596c7cee32afdb4c1bf5efd39e0ce413ba51c6084332e02
 DIST gix-index-0.33.0.crate 45745 BLAKE2B d08a90c51e0d91f0a26fa01b3957aab356a72f49ce7e99e0b07c1fdf611f1cba62b71017909b38239c4e9bcbf4ce1c9ec18bcb58d2235e747d9ce8c09bef67ed SHA512 2f3685083ef279bb00988b3359e2742e1dbb9dcbcea9173c93010867769dbc83961604eddd8e16b675ea7b17a3e9d89cdb46ba71053e04b2d0eaa8abf6772edb
+DIST gix-index-0.33.1.crate 45861 BLAKE2B fa994405d178307645a3c14858a64a58af340593484221bfb2bb7195752962024de2e2543a615647de3c32dd9370e4197845a2045a78e3386361f3a0f4cdc0a5 SHA512 2713b4b1a02a0f6bfe227dd875903278ce8d7c66fd4ba2bf8dbb8b4d8485c32b6bacddd35544eeee9ac3f7a89a4a2ad91a0cee081d9dacb4d5f02a8ae5e098c3
 DIST gix-lock-11.0.1.crate 9498 BLAKE2B d27c657f568d323f9bc0fa3c8d8cc52993f5720f5da18e18fb09511b938e499ae947afefe87eec6ec83653e8bb1b1afd888dfc69229b49e23ff38931809ccd70 SHA512 a24dc3780e2cebd6b4f94a1221b9809c97c2f413ab9987a0557cbf4f65c3af00a545465ff69edbbc8c459f43134b106828506d0d457ca0675bab39b88a36b330
 DIST gix-lock-12.0.1.crate 9500 BLAKE2B 22fbd986fbbfcf6632ceec8740db2009f97b197b437c2ad44742f4c1f4ef3619d79a322cf72e9625913463c291d340e84873fbbcf658a23f888bd547abe583c5 SHA512 54d32fa2fb236b1fd429c5d5aa088e8e47c58ba88a95a3ae620e3f2df8b29ab395e756b121cfcb9f75f2589155408e09d3eac169fdccfde31965c890847b0373
 DIST gix-lock-13.1.1.crate 9753 BLAKE2B be857e80fd00fc6e365fa796cbf09256748051a01e006b909348b02ebdd1dd3e87a82ba86e6a18ca49013dd69273e8d1d4526704b19b70b6381a8d387de7766a SHA512 1a6bd6f3303fa12591bf1a5e4be56775660435cac27faa88d1f672cdb8c769d925166366c74504a047ae75d5a43a911fd2122776c790c01eefc26c579552c079
@@ -287,56 +342,72 @@ DIST gix-negotiate-0.10.0.crate 9777 BLAKE2B 93bb0dbcf00c674cbccaa5d843d2e239346
 DIST gix-negotiate-0.11.1.crate 9784 BLAKE2B e3e969815171aa25b36deec11a1084673e05f9018dde7ef12e8d32fa8078f582d38e9ed0abedfa7fd585047962c047e1ef7efb86348ed342d1868ba5e0fa256d SHA512 928399725f1291d03fc5c39edddaf8ef675ff2f37229742ccbc0aee817f23bd723e9d9b3529cdb5c2fab3fb8bb5063baf38f59cec4c42b1f3a2467aab92a37c2
 DIST gix-negotiate-0.12.0.crate 9717 BLAKE2B 80cc2a882e1a5013d34f7e53d30716519982b4019d3b7d6508e2f03479eba2d191a418af851b10dce62dd6a547c51e1a2ee519de85fdc8d0e03b67290ab855dc SHA512 4c6810a93d4d49cad120f45244457eac33c29f9a5ef535404082935460a2f5cc8b5c2f26642872394f2e5d2bceab1cd2e35693028ab90e54b18d56d44ccc2594
 DIST gix-negotiate-0.13.1.crate 9762 BLAKE2B 84ce2eceed44650a66abfd59078b281e5dde0db924cdf32c0dc41ff793cf81a4d6e07d06d3ee0aae9e258926cdbe6890945d2f2f9e06ab61a2720fe97bb8d344 SHA512 498cba742db62b6ef607bd130ebc9ebf58952637bc4b0018fca1cd7d4926557a5e32cae303c7445d8f88d0807e5eefa88e4a4952bbc35dcadaddd1853c9c5d84
+DIST gix-negotiate-0.13.2.crate 9770 BLAKE2B 2f0cf1839723c5e18aa039dc1a94d8e7b2916754e179be21252c6c5e0ab71cbe6b0839cacffd456acca18aa146bc7e6f1fe45f1308c49c2d5a46d5b3c96dd6ac SHA512 875e47ad37e993dce1086f301176932b5c8e4e5c9afff3c2071b2eda96f1648a252ca0851ab217aefb907e1c67509b631441d8ea1f63c511e4221d2418222f13
 DIST gix-object-0.39.0.crate 32383 BLAKE2B de136a3d8f75a10b661a369decc0b1f1eeed89c0a209d36868bdd535f78b6beee1a94a5b2f6f53ddc84108212366e4fff9981a2f264daa36d0f9105ee0b1c5b5 SHA512 4425fa00cab0df8f74cd6012f73d1466d3213d85d4e14932a441bbbd0051b2b0f8a9367b5ab4c00a6aa46cc2927f81f520c4aa351f3a9b15fa473bad74214aaf
 DIST gix-object-0.40.1.crate 32398 BLAKE2B 92fbcf91ab2d8b3dfc084cdca96b513d04f02caf059018f8d585f3f389a740adf0baf835eafa2f612c2582cbb2f9eabc7eeeb86b932c7f887944f25a1afcb129 SHA512 f2a9d01bd3b35dcceaffe735d392c94b477a9b4e813a426d422e51bda2b027e5a23e5c826596f9c4bbaf2171ea3baa01a6ef44499389a7c02dab4ce39446cd1b
 DIST gix-object-0.41.0.crate 32330 BLAKE2B fd29b2db2bc1ff5e5e1dbd9d8fe939c3c733faf2940ea7a8117a4ca086418559bd072a5eaaeb12f00bb337662f95d03a1278e68c841afe0de7c1ac01c1ae3388 SHA512 1b4e24cb7d23736cdf98ccdafaba66f361321ac826159366be8b893cf34cf038cba4ffbc06bc722ec8a3c1b9009c8b384a59b08bfd7c58e15e34725636956761
 DIST gix-object-0.42.2.crate 32491 BLAKE2B 0b7e7015ad21149dd674adf96b85d527da7766079baa181cf53f2d53505cd29dcfb1e7e98531814500fecfc67b4ec21f18967f68d20754d9f97e82bef3980a4c SHA512 a3f030acacc6ec6799bd660f8a98a59b51d2366ad9b6fde47a63df472b2a072a03123ddf09734e9197782148a9d0c181bb4a4b9e7e3457f7c6b0aacfc8e0493c
+DIST gix-object-0.42.3.crate 32497 BLAKE2B 72eee3970d4520f3f317330d797671014fe5c768f99d16002e45242ef447e4334b8aa6baef4a2665a2927208b29d8ed896427757ea694b68b5f3aed57f3894aa SHA512 6b890445cf64c1b49ecde30be32d1028b087980567b86bc445426b10d2e4e7a2dbee4464aa601d085827db85a313947cda72ddac8cfbe6959aa4b7a100746bd2
 DIST gix-odb-0.55.0.crate 54097 BLAKE2B b2b744e6740606658fb28efc6a00ea29ee5d978b9a3c978b4d10d55abd12fc3fa916b754bc00697ce2ad55e43b48facb1de582e985ebed131d02f1c6c9f7702b SHA512 8fedb591e60e4323b272c4a52edd92045cf6a98a1f3e4600113cb4fdccb89e77fa14648623793f0dab78dff64c5a1089dcd1914944ec07ad9cec5d0f7edf96e6
 DIST gix-odb-0.56.1.crate 54098 BLAKE2B ea496f6e7b93e2a77f1fdd11e8e2e314fef612d8c3caed9faaf0bd45bef3e85d27d1b802f3dd60f67bc5f501a60992f642f37ccfd707464d977ffeaa0bf77136 SHA512 61c5d6ce2ee4d28b1888b89ed3a5fd0f06fe1517a43018649bedf89c5efb25d205719c5e47c8eb8d3e8681a121507ebc985130e9e788636e073c9e71f275887f
 DIST gix-odb-0.57.0.crate 54101 BLAKE2B 388ebe010a0d1a57cd8a2ce45f9556642964aa0180b1d0b31356975caedc7e5d1e9a63a5f728f2560ff98de5d4aabb9a394a7d4da24a591ce350f2827e30ed82 SHA512 6bfddda3a8ac39d399b631ed2ffc5c8f0e0aa94742e5a07d6497c101aa4e2e85590e25a159210eb9c522a57dd7ed3a54988bb20cbf7b3d547adef3f5c6659c0f
 DIST gix-odb-0.61.0.crate 54300 BLAKE2B 99e9255d900a8bd821ca7afc5786c3bdc752384b2c63b621c68b4388b094a50901ae2b83aa82fffce58c565c79eac7761ab806ba20f264fd301a73e863daec91 SHA512 b7d9ffd59af63b46ff2dc6615c4333cbf9e418ed9dafe5a85bdeb10f8a93ee2469257a7eb5a5e527cebda3bf721aa8e957eeb1ef1ac9214bdb160de482c6dab7
+DIST gix-odb-0.61.1.crate 54308 BLAKE2B 42f77b7ac0f18f4248fb92cfa198eb49e44c9473159ec2d84c08e7e8770739b072b61976746ed20d78cc14e4ff5d16366c74e1282cf962f4d2cf39f370dd3795 SHA512 54046bcfe9c919ded11c3286e5b588ea507b3f028598ec13f18f5d076d454b521a26458c245ab81f81699d223abebcd7ca5318c21f8737309314aed0e472e05e
 DIST gix-pack-0.45.0.crate 93456 BLAKE2B d55ee5997ff55ab195fffca75012df80bcfa07536c9020e508fe1bbe0380ce00d21a71914c0dd7893bcdcfc805d5bb2de16d907b49ea987c5f2743817066a458 SHA512 f566cf08e3d77e67a777c6fcc5e276bcd82401491b356c5a2c3bb9ca8617c0967f6c8965909828ed27daa14a7bf62eed9f9cf8a6f5b05b3947ba78420e4a9b8f
 DIST gix-pack-0.46.1.crate 93478 BLAKE2B 6ee8e21c39a81eb4adc00272345a2b07e1880ebbcb54ac5ce102f94b3ba18293a664a0b3aca9578c40008255ad65a5d4bb3c693891ad078d0e74455b1f63cfc0 SHA512 0b346ea2babe3ce3ff6a18317a712165ea985f79fb2ba43cd2b933e69ea77971053c929c1dabfe124c6adae5130f7950fd0531f0d0316bb90f663d1f00492455
 DIST gix-pack-0.47.0.crate 95762 BLAKE2B 43b5e4b5398940b1116bc7179d5efa1d56c3fbdc013d1da9ed3240cfcf298990ccc577ba67194792cce408517c3ebf1cd5fff759752662c5a8c71f8cf30e44ed SHA512 4eef61fd426b7186d5a7174a3bfeab7275e20dc0896adeb4035ed86244b2b858618f771e84459de992b54165898c68d1a435fcfbf2d2464cdddc3a6104b4b00f
 DIST gix-pack-0.51.0.crate 96495 BLAKE2B b4ed7e194dc89a151f12c3de45492db923a0497d069bb326eb277100dc3a1954453b60b59eb9d16c601d902f73bef1254a4b63ba9e21c7599f0472f7575c9428 SHA512 18d3fe6e0f53d36fc85f8c5672f7e1202d7155f3d2511b034093252d4ca89ede3a0e5b4b9a5af63e9c6e11ba7d9b51712e9ca9cf932156cf67e37603149c30c0
+DIST gix-pack-0.51.1.crate 96737 BLAKE2B ba82d85871651e60884f8a37b34764935ef10e1730079b7ec9ef017b5df2beb3b2f245ef05e4d97b848a7c40e9e92605141b1f677c501d03d4eaaf3a17d36279 SHA512 bad1e67e628100a7511320a3f4118e4f3e7802354fa5f1d6afc6cdace360bd486883f48b61f1aff1b56b55d399811186b0eec0b1f13b761fbe1075d18a90c143
 DIST gix-packetline-0.17.3.crate 20356 BLAKE2B b9f66850122898613543b0a4ac13747ab884f074546334c5c55fbf29da8397e6ce85a8dd484e7d7838ec4850c45ec636cdd7f89080e20206ca66cf9582a3fc1f SHA512 0ff16d984e9faee2713563c32147056ada388d0337214ed3e38d88f9f58c215df565f1e0682876e96a5f6671ee8d05c453031ae0a1da7a0131a620aab6cc2d15
 DIST gix-packetline-0.17.5.crate 20346 BLAKE2B 6d07e9fac6b2b6e98578e12d7be24be73858fd465186184d6c5053573421168378de1e0db748db3ad2f45b23f9d493868287ea72db1b6c374fef661c80f450df SHA512 7ffc14257659a53264bbfcd57925901b1d5fac2d704c29deb2a2c49dd6218d0530a2d9baa294fc45a93bd1b9fddd18d72b332cce8e71a5b246e54a4ab7693c8d
+DIST gix-packetline-0.17.6.crate 20390 BLAKE2B aa1b168fbcc40e593b3b766283f8f0f60dfc5e652339845e05f00c8b0465150fc96da50475399cd567615dad22bdbdfc1f842de6fd1f0b91499768d736b45712 SHA512 1926eab20c069bfb0e20d5f86a0073a16a23d58cca23ab895982444738a9fe6a4ec583a1d1226679a8a55cbadb0d909bbc1293ada3f7b1198ee8ef50553bb046
 DIST gix-packetline-blocking-0.17.3.crate 20044 BLAKE2B 7e18c011b1890ec0fa8e757250ea5058b0ace5c4f9038e0fe12f2580632389bff3150ac60b3fa1a4b9db0b33ab9d18de48a5d5ac08521da88777a478084c631b SHA512 bbeba4fee83371b9a7b2cd14739b3674e1f6c7995063ee4055dd590877e172a0e002c8c9e8f6a1ae8da1aa3d31746df42fadd74fcbacac89b417bfab13b4db60
 DIST gix-packetline-blocking-0.17.4.crate 20176 BLAKE2B 706d03a20e6aaf40817f87df849882855a6995324744a8c389fa16b4f4d26bcefec6dd0e023b844566c78afb01cbe8777ad4dbc70796b7998bb25566127afc1b SHA512 6f072ab298eb0e8acaa2c8616b0141edd3a09480770a21c72958b75f09b6a98d19b1f994b0651a547a69e061c432a28e5c7d5579440d89ae57ffc8d9036be68b
+DIST gix-packetline-blocking-0.17.5.crate 20238 BLAKE2B e7f5e0f742c7fa357ce8fd16c65189af554694719a5a28179e14771208ec750734fc8919562ccdbf17fbbadfd866e48cb7591ad1c563affb06c854d18fef8996 SHA512 b6eed18cf7342164b67718b1682a54e85547c079ab7fb3bf67d84634bcb05eb78ceb5ffdf5938fc3ea61237b2dccbfebe51b4d5dd7a754f3afa07ec9bf33dab1
+DIST gix-path-0.10.10.crate 19714 BLAKE2B 332b2ded54a1355ad1c4f9a36775339bdb1e81e9948b58a39178ece96afe7ff32fb1263337321bb07a6749953c571fa63f047088b6b0d0d5757f812f4de94c57 SHA512 f38c3d12e4be24c7ae436136ad61db2461308dd1a2c58af136b5bd73658c46432faa1d3de88a83ae9763d81a809fb9189a7dbe5e62c9ec4e9954b560e42dc390
 DIST gix-path-0.10.5.crate 13884 BLAKE2B 98d6d25550996a4919d2403b472799cad9d5deffbedffa9430af8455174148e40746facfbe8b20e28a53224fa6d448042ba0b8963c357c31c41f5bc6bdffc8fc SHA512 9bf0cd15768ff04822576f119ad52693cde5b8a2b34dc45cc0a186d44a39ba9bac6721d812a8f22e348326cb6c8f6ee1138a784db8c2f3a5c764c5da9b3cb5c0
 DIST gix-path-0.10.7.crate 14406 BLAKE2B 4c1fa71116d42c75ac0a19c3b9580b20a64eb6c0a100532b97b5202194341600788d14c9d98d36ab22ca56c1279dfb0d61af3ff1fe18d39533b67ce93fc64a8f SHA512 f5aa7af04b98082a2e28545d024196ddfb2fcf0aef8aa3a051e4c9eb35f75217a1716f3323d86c484e522252efa25fea9970afcc1ca81767e886cf4509123c24
 DIST gix-pathspec-0.4.1.crate 16246 BLAKE2B 5d626d8cf792a5984e72e013cbad5ade84c36b6fc82f5136f8494d28d969296823175c3a2ae3fa7bf4691b78173608f676aca7aab6f091318a0c7431003046be SHA512 32b824ab7705d7967aca31033e7b6b684fbec5aeadf996c7cc7c9cdffb2ce10ab4f41c769d9441f98837dd5485997de00b698f5dca0c8dce5d31f9fb28bab751
 DIST gix-pathspec-0.5.1.crate 16256 BLAKE2B 5820c1ad02f42edf4cd3c629eebdbfb80430e65f8fefde1ca2924bd25f6eccdaceed03ef30039969d552ac3c110c290891ec4468be3ae1109ea867060b360747 SHA512 69a96a89ff9138ee8bd39a857aa5354c8585e275d026f0c4e46185376bd2c632f61fb39adc23736e38f00259f26b9f6112ba9d1c0cd0b5fc727c4057dec617a3
 DIST gix-pathspec-0.6.0.crate 16196 BLAKE2B 501e3ba724bb67eb260e82b39e4d0b0b663d69adcb69d014b0c32884e26671c8ca3c08335b689fff8d6c3cd766913dba4da41dcbb0b166d1f952999b09a6e9d4 SHA512 0404fe8769fe3cf2b9b8d89a0beaab06975b58cc513105fd396cd1ca18dad65d9c56dee4701c5158f8856da6ae2d9f6e9033b6733975e28cb1b37bec86da7049
 DIST gix-pathspec-0.7.5.crate 18145 BLAKE2B 0d206a6fb0de9895691aed9a76d63b12d4063a95f906e6cfaf1a297b0d6184da26526cb756c663f9c78a8fba2859f8b6e7aa96184cf4161eb382c58cea99ce3a SHA512 1231ee3f8621d1fe1d26e69fc86d835d9047e84a5f885cd6f716a74b69dae60624a51e7368337d2aa14c5d71529e996df7076243a960c06e62b649904c3d8c2c
+DIST gix-pathspec-0.7.7.crate 18137 BLAKE2B a5654d40e484d7e3f0ba17245edaf1fe04407f2528ab010a83515185ba423ffdac07d859228fdc5d0f1533d4c49fcc7847a29ddc9c6abff5a2f54e97689553f4 SHA512 2a7e8079ad75703dc256ab269cd9cea92d9ac44676be3e1ad31821382d8c893f83c74edf9147af22c3c63312aad0b54f194910d21ef1dfe1c9e52154b54ed0ef
 DIST gix-prompt-0.8.2.crate 13138 BLAKE2B 9ba45ea3983c52191e7c0a5be61612f3978cf2fd8f66e434b04d8d5ac11a2e40e0f9d26603026da91163cd493e5e7d3a58cd123b1f6716bd33c3c1d0f59e08a0 SHA512 4bda305fe3396809c7cba5730a8ba9e7a19acfcdded1174837ba97f8a45751d4ae728b8268b1afc26f08d7ab6d377e83fe8fa5cf8f18667c18e299678499dcf3
 DIST gix-prompt-0.8.4.crate 13083 BLAKE2B 54d987402b5e8d983946c7a127b8adcb73d47fe2c02447ff32317129a095462c2703de9c018f4c22ad1ba144fa3553ae6a8e02eefbbf6778d42aa72e1565509a SHA512 0cc2fd76bbced585a2e63bfcf3237d359f85320906ac7918cf8fe93f366f050d53a3c04927ed49a396e401e4b22d63e21f0440aba2bcb8229c5474250b5185d6
 DIST gix-prompt-0.8.5.crate 13038 BLAKE2B cd0df8ee1ce85a0f4c24e4dbc9b1b8f6f785a77404fcdb2e7de1b2e6937a6db7dd9cd659fcb023450149fff2c45cb106b6d09d5898b04e12c8acfaaa24de5750 SHA512 d34a0e5d3e2791b48aaa3e4432f9b5cbe63d3fc0adca6a477790411184737cb02c43f65fccc592627a408e33b64d60894a3a96f7822f3ef9cf753c6d9fad2726
+DIST gix-prompt-0.8.7.crate 12599 BLAKE2B c4f01157ea504578c657f9692e2c4d2425e05c8896ce0c06caefb6d56a92f95544ddad1bc16461e8122c33aec7a41308415ad01f1cd105c9c3f4baf556bac26f SHA512 734278fada425925cec9a9633ce9790c086394ac98494ba299aa350fc3120cfec658b6c44c03b2b1498ccbbc9684109ae9004d62d34d5569e303662a2d137de1
 DIST gix-protocol-0.42.0.crate 35179 BLAKE2B 40b9178281b1c60a28a197f705c383f1e0811a056b51f71baeaf89fec6d7cba56ce8e21c7f0f11a1c35e9e212b119252ea6a57fb413fae318e285e793d4ec937 SHA512 deefe7bb421f0c5c9d225cab0cfecf984efaf6418a88a0934604592212269b5a4bed5b71253d5230e771edb2e86804fc8651826528d8be77a00b7a73a07e3862
 DIST gix-protocol-0.43.1.crate 35190 BLAKE2B cbc0970b51477a83d455cbd1089f4d272cca05c8ab8bdbe852ba44fccad0df40621c0c5dd2d36de86c148a606a3205fd78e77a43e3fbb4475114a9f937d5d3b3 SHA512 3eceafa13dadcaa789e63d2989cfe0f1a2a0ad0502b45ac3d8e00b42b9f66c17120387b19491f980cc6bc267555430792456baf1b00cd039d6fa9b01eca5a701
 DIST gix-protocol-0.44.2.crate 35138 BLAKE2B 54f01a7b82602a80b2c455eb5bfb8f55326a99b4131ae9b3f62a2210a952136fa4951f1033b22425a172174bc0a8963128653e2302ae9befc81762bcf7e76435 SHA512 3d6b9c80ac5ea497072f02117c6a7df401faa38ea28370fa5fd2160036ea2e66d4ff4dbfb5717d12e64ed5145f0a140aa8ef1506143789187adf9b5bc4af72db
 DIST gix-protocol-0.45.1.crate 35181 BLAKE2B 391827cd7953ec757c724b5737dbbec6813284093359b1378d5200d17b98054c341fab47ce47f6009118cb6b330184a946c305559e4b43dcd2a143106e7efbd3 SHA512 c0945d5b25df79fff4598f1cc194329ed00397baed6408e9791991b31a0347246b43351e26c19a5c97da99009e8f0c0eae84d71913b28b372e6d13640f855f38
+DIST gix-protocol-0.45.3.crate 35179 BLAKE2B 032046041b192dc84b3bbbb25453643455a5b46f955c93ff8713a869a14d68d505f1e49097588967f40730df9d7d87e7f4c580580a9a0f8dec9128d5203e1edc SHA512 3b20d2d802a02b3cdde49c97339d10bcbffa85546051ad2191da4df6d0ded8f3de464998874aed47336d35b80ab57571241242274c878179db747f6064cdb4f4
 DIST gix-quote-0.4.10.crate 7051 BLAKE2B 32723b75c91a8fab5c91384a37a0871b4b48fe8c76e102063a3db80e7e5bf42b480596aec361b6d7f5421b366e27f496558cd7212ff284a9853230eda250e6ad SHA512 e33999669771334d73be92fa56a1b1ee1b538065426826d43dd460f097eebae93dcd42141cddc0de9876600f21f05e6e400dcb7db9828e8e315012cad39bc6d3
 DIST gix-quote-0.4.12.crate 7055 BLAKE2B e3bbcc1bc1ec169a4d9b36b1fa23caf559bf70bef14a485c2652d59b4562c514457c14ee4d2178e0f564560c310e5d304af993c587d6d352d0d6906dde4e4bbf SHA512 904da737aca01dfda12453b3593410e9aa49b852b91a7d25298ca885be0922d9498fd622e36f0601de0fbc7b2706e73e79f8281e74417b3b7084dbcefaa3cbec
 DIST gix-ref-0.39.1.crate 54299 BLAKE2B 439684ac71979997b37f893033a4e405abcae13cf2ff9a5cad81d205cc48ed566fd4ca03862de99ac2536eb937ef5ffcb42691268d72801d0937fd27601eda51 SHA512 81e5522b92d6f7953abc8e15c1684f499068898a51e3a0183ad6d2f44fe334dc05dfd16a16a8425210739916b3ebd4ddb2fd820cb113425eac2cb3d1da93ccc7
 DIST gix-ref-0.40.1.crate 54467 BLAKE2B 0f8a11a92c89a1eda94a46690d5764378e79702aae8bc0e57cad8f3fc2b6190d01e7897c112448466d36b1d5ba26aa2e32da5aa940776bd8c19911e3045b7610 SHA512 5e9dca7beae7f2996809b1060a9954d1742ca3b21898c5ef819f6c6ed3e0c043798bf1efb39e83bbd0fbb712f91a54c1e06bb8c3cf59b5aabee159f562369034
 DIST gix-ref-0.41.0.crate 56090 BLAKE2B d6f6c011246aef5265150e27fc73a4b08f01378acd908b4f3b9b251c0b2eeaa057d42c2e259da19f9901f98eb26f18427e66813a91b7590c38e2d27ccdbdc2e2 SHA512 9232174d25cfce71c439e0b3624c7e8e0feee386f350565e70a672cb84d3b1306989a0da36f46de913c06946d0b84976b7b4104b7b2b6c7005fa1fcea6dca5c6
 DIST gix-ref-0.44.1.crate 56711 BLAKE2B 5268860428e838abe157a51f3cb1e25aac68518031369702faaac8e18465b9fee8dc3d8ab515f58594ef18b5a225b44cc047057ae2f5211140aa58a07355877e SHA512 e2e947f7e80f03cf16c5dd4489ce738ee31b3525d3e46b567aaa1b8a03ad94275706d38bb4a6d748fa1d094bcc0065d63ad7dc90c34d8f1732d4534d4e7dab36
+DIST gix-ref-0.45.0.crate 56670 BLAKE2B a56c2b33a19f1332178edb59b4960c86ae2a913deafff7122c45fa1fe80751e70aa64bb63eb51036904f65e2d83af784756035df0117a1246ae7e90742ad7d98 SHA512 27394a20b41d27d958487f122a8553432c061ab4d70c05e659472968294dea8c5bc5db554957b121f4ff196ed911cc9e9e3a9ec590014eb5c1ac029a1a60ea0a
 DIST gix-refspec-0.20.0.crate 16102 BLAKE2B de7d38a7ef2c26c83e5aa17664e59a7c6034a29aaf8eff2d1ca4a2942c45a6d79407a681213d0bb02d51ca73c5120eaab08eaef43275f68c38d5edb9ea5ddd03 SHA512 f13bd228c483616dbe009d3de541d813c5149a3693da36d963e7599cbd8cd3f355b4a3ff844855ea843b1a71d22e4ba7538f5dbff19868abc73a6f6bf5deb65a
 DIST gix-refspec-0.21.1.crate 16177 BLAKE2B f2c72ae5ef3383e948f283f22eef82edf738bf35a755c4eb163a995fa4d67e6e99db394ce2f29ca691777726566e68190190fbd21f775dbf521c3bc3071c81f8 SHA512 521e207f13b5c2d6a451a414474d9665aff810a448a86bf1069cc86c6e54d23158b690c8810c730d76a2c8d8ec08ba9ef06134876e17a9af6fe6044ccd4685cd
 DIST gix-refspec-0.22.0.crate 16114 BLAKE2B 9f9b3460a9b3af3b8ff6f36bcf57861be87919885c1bde1872a1f6d4737daa1aed37fda7d370c96e0d98d304763636245bfbbb33afe239e632c3e2380a8976cb SHA512 0b7e7be464a78e053cdece4efc446e5dd13fd520706d512303a1e726f70d8827f16674c80417b29c9e0ef0c8ac04b0a30a2c4f357e9f396df0e751e376246975
 DIST gix-refspec-0.23.0.crate 16129 BLAKE2B 36df095d841bf4eaa6c6ea700b493efb35c419fa7f4183a80634850c88f13f2e912cadd9a8aa3755a05efc3184a9cc071202bdaddf3db6803c44de5a3267d212 SHA512 d4649f1046bc8b3ca1a5f5729b515a7e9a442d24defd98b526f6b22c2f36cc73638ab7cd26aec234dcee72ab9621ef3f55fd3c009b2e02635d6b481a699247d3
+DIST gix-refspec-0.23.1.crate 16175 BLAKE2B eb54f73575dcd51d522fb4c288749caf612ea1a362d1edf7cac385d47ae3245c1de0d7042cedaac0d8923cb0bfc51cea920dbafdf5f3cb4d40e2e26e51d26af9 SHA512 f6d9ddd0c7040bd0674d21f66c4459dbde678e89feef0338b5fb30099164acf3f75dfa66ec6777bd503b4bde7ef8425ab4932ad963761926c775416415407381
 DIST gix-revision-0.24.0.crate 19188 BLAKE2B 1b7c607006488b71e33bc33efe1f29ca27e2087686a10c9f47f8c6512720e2012a454c23d8c14983b3109e33c7864be8a79874cad7feecf1b9fbef42fedacc25 SHA512 b756ff26586f19493a87d76c9b8193836ac3878141d8327a31db0b2c0c52b3326a478b2f4386a8ebadb78d8ef9386f7ea8b35049eb5c98378dd6f333ba5ba5ff
 DIST gix-revision-0.25.1.crate 19183 BLAKE2B d358f713e5a81381afe8eb02835337dcce253f346feb224c9544e736e8450db3762017da06845c9d556412c4aa080e2663c8038bb44b2c3cfb102ee1790217b1 SHA512 6ce0c7ec9daaefe7d8ea355b09db53d5438a3b92a212749571be9801cbe0117ff8cfe7c0c27f5abe22d2eaacaec465395ddd1bdf13aa9c2573a61dfd597d2f8e
 DIST gix-revision-0.26.0.crate 19131 BLAKE2B 74f010b23650a1f27737785e9470ac630eb74dc25877c8afe3daa575cd09d3dab44d320651222be4e367d66f82b2698d13d435d2168a6dfa7e095b465f999d25 SHA512 290c18d6dee47e30f496d2abbe03dc1c2321d727aa858f612e16b03e96739756ae26d4456ca40cc031b7472d09c070265ee9127a3025522dbba831a725abf54e
 DIST gix-revision-0.27.1.crate 19171 BLAKE2B 0bd8504bcddd676e362efb981c8e392ec43d811bba1e90bdab0bbfe3a8c8630edf340541e157dad7cb8063b6701cd59db4b53baba63fed5c79ea4e4a8b85b654 SHA512 87ec40a4037da132819c08991f80e8376f0a9ee4b2d05b3019be40184d08c5e75b5888b8712bae915bf134951cfc897e8d29ad90839dd6ab8ef8fda7bdbb1eb4
+DIST gix-revision-0.27.2.crate 19204 BLAKE2B 5eac4e2e661df52884038e147d36afd379c4557823f013ba34c8ca69a6272b3c8e42da4bdc35c367d605630239d3fdce95ba538a3e95ab98436a8f45c742ed53 SHA512 21ce7c3c6a060f4632078aa3be87261fe5992f257179bc3c0e8b68e30d6bd18a8163263b0023832f09477f9400ba450447b0735ee8e8faa50ba91c570cede00d
 DIST gix-revwalk-0.10.0.crate 11829 BLAKE2B c9d5d20e7fde81b052c7e06814bf00d66fb1757f28dbb0f8073b9d49163e4357e170e056dd6ed97d5c88afe54231bed143f3468a1523c072893afb8395d3c4d8 SHA512 77ca7ae282d84c72a9febaa4a512ee1448f03af544a6c8409048dab4cb45548efec341f825285cb6545161ccdba1e4c3c745d892c58fd5dfda046826419be115
 DIST gix-revwalk-0.11.1.crate 11829 BLAKE2B f5035bc04b20471f80e74c11e7295cc9b5d1636f540b3193e0d10f42482cc65fa1241e688058155118b0c7f12111326f53ee03c0e29aba0525620f557f630f18 SHA512 f38c49e6a89bb9ecf92e664e2be14d6f2c7a3203cda20da58f843344820f6afd4554156e61133bc9c1b4f9783e6808c81bd26236d68a16cb47997d14e137571e
 DIST gix-revwalk-0.12.0.crate 11767 BLAKE2B e5b9a665964ffd086ceffee1bba3d0aad2049a74c582830597038353d55f2e478861c885edcf020525b09628b2ab23a612fa141a744397d08cf4a692eecbc38a SHA512 ac2620d30f8af09bbf5745f9888419edc26bc2beb257ca7a9457570956533de810b53ef4d48abe41635dcbc69aa17e17e7010b1b8535ea2ed1bd550397f59ddc
 DIST gix-revwalk-0.13.1.crate 11851 BLAKE2B 10c5d9b27af9cccb77211ab7750ea4508c81ffed1cd62a19c49ab1fd124dd516cf5687940c17b92a21e1dad69c2e55936cd027c2e05fbf84e37630cfd590843f SHA512 a5672bde052c2528ccb253852b163a50ed6827c9cdae4834892d438c06bb176196683ddbc2e1c61c9c1d17baf7096b89b6bbca86c948b0024a182af66e25c631
+DIST gix-revwalk-0.13.2.crate 11854 BLAKE2B ed441e03cf1bdd3239fbbb63665b41d25e7f8556b569bee0123bd6500007ec398d43d80d3886331d60d35790dfc1b0411501591f496b0f7e78d561b67c0566a8 SHA512 aa545ae7130b0d52d93e976620ac8d8bab1e347e0ce6c46cb2b1c91b3eda2814ae4fd21ce8850a85f61d2b3ce5d8759a29bd8e52017f325782f8c14e17c7cb58
 DIST gix-sec-0.10.4.crate 9340 BLAKE2B af427ecea73d1b2c91315fdd3f614f6d08313d4514259a668f54873dae1b35b632f5501e9ed9bb1da8827227ac7300031a4e500a05c1c2709f2b7850dab48b44 SHA512 536d4538086c61b95bf31956b76622b280f5e6d6e2157870e5c81c7236d9284f710283899b2082cda3f996349e18c6db43a45fa3927218abccee7ac4ae0790f3
 DIST gix-sec-0.10.6.crate 9356 BLAKE2B 1892b97a2755d3fe5736db392331c1822c3afcf573c22a67e849ccd7e8c32e01d526062f960fd193aa968317327a7b282c442de02e774b1a729f7e4ade3ea1be SHA512 92240898c2f90f371bbd3dcd3fe6a0e3e6c6e516ce943a531712f391e613445d256bb61d5ef132d9391d58d20a0771c3949008e74cf35404b5d41e69bf5cd9fa
+DIST gix-sec-0.10.8.crate 9400 BLAKE2B 1d7be29c2a510c6c5cad62f54ff1b53fd3f9df5c0075a86cb9e7ad578e8962a9ce6e5ad138873605fe80ef42349ad2cf087988b621bf96dbcbcc63a1f2fe713e SHA512 21d244b71abc5ca3b61b05b60aba61e86d5f674fa738f82ea34e0f04c21462683a505e3d692eb323c60a8c532bc639798b1b1cd7fbbf9cba2636c2efdd40abba
 DIST gix-submodule-0.11.0.crate 12137 BLAKE2B 514e51413aae2f44f5e1f3439396579a9de16f1d665bd46cf920a947118e1e421c60217e195166683f5aabe313e41e601483b50c57c6704b83f3a2b5a57cb1ca SHA512 2d2138a69af63b0541c285c376ab23f81644835b1be0dd3fdf1b83f28d63cd130ff4b96d4ce62ee437b692fc2ee57234c4ca4dc97f14b0f4c6962d8e0b146c6a
+DIST gix-submodule-0.12.0.crate 12151 BLAKE2B da7e1064a2eae5322815325c9fc9e1736a31f5a2dd76244e346d3b59ea76b2dab6894246fa99a20c46e211041e56f151a6a6049241d5fd1486f9c3e3057aaa9c SHA512 401a5023d2cdf436559be0f4c71257823a7084b3c8edf98223230e8c807f951f4b92b4696b13728a7fc07482314adcf99d73aa1d440d86c9d78642b620316e6d
 DIST gix-submodule-0.6.0.crate 12141 BLAKE2B a37cfdb780f1d454373a6a14e02fabb1e88dfe3d6754b4874924ef2357494fd4847f97b9ad37e56a4600c8350c065c0f3a72392b0467c2b8bd888b949083ffcc SHA512 b03d890180cb07c45c1982459ec2166cd3cc34daed9e9e36c1cd561f7d73c58a536aca6a611d5f73db8bd46001171997e87a6b3d2b54461df2aebf55bfe03df3
 DIST gix-submodule-0.7.1.crate 12143 BLAKE2B df197791e01e2adf3fdeedd59de7feab1085870b6135dcc75cc57bb200e3c3923249a59210909fcb5d4e70a452f4062c7bb3dcd3ba7dc4f74260836200a84fe6 SHA512 78cf6f8c30e73d32d1deb2314ed67a88c0d7e0560901e1e09eb78a8fdbfc610209e34c161fa47127b882b1f07116009c300c24852040f97e91134bae60a45171
 DIST gix-submodule-0.8.0.crate 12083 BLAKE2B d8243b5a0af309f3ec08ae40a132ec1ca5739962427f77cee3b685b70c71d5e6812282bc4502c82cbb9bafeccc5e99d12608e94437f6ee3fde52de220140f75f SHA512 59126497b96ef1f9e66181f98abce2d6f32fab82d8d6e9a92dc80003f2d4722b9eddbf0d6bdc45507627d7eeb1ff2faa4e883378f154b7c78c82d3c460f1813e
@@ -344,6 +415,7 @@ DIST gix-tempfile-11.0.1.crate 17170 BLAKE2B 098d8cd6e74a0a2d81eaddaa0a6903a3726
 DIST gix-tempfile-12.0.1.crate 17583 BLAKE2B cdd36455001475a01e731dc535f7e806994dac587f5ce49cc4c22b86469a41ab18961b6870fcbc263deb7ab2103c563cfba6ee687079cdbea130ed869f95b04a SHA512 341e97e2ff3e75362961a773054697db8c62e44cf7fd3f6878b1d771afb6bceedf5ad2ca73964adb4c388ead450911f98224ed31659e78287e999ccd73b4a85f
 DIST gix-tempfile-13.1.1.crate 17852 BLAKE2B 95a2ac6450d3bd81904427d496055219cc4d928d116dc7e8bf04972602463223b8fdf6f013073d8c9f5846d06046c62b2d71aab21758f263252385aa6b99e78d SHA512 9860d52e6f93657afbc862e2d501ec62ed1670e1736c8132da2a777dc1ffe9c7c828a7d8c96e52bfed114075d929352f5e5ae4575f26f83de8b274aff98acbf8
 DIST gix-tempfile-14.0.0.crate 17879 BLAKE2B 155684fb155b4ded036563cf06f3e0d04f5c3a6afa23bf52a62b8be90dbfb5b7b3b425c14bc9fca2e0d19612bab94aa72638ce0ea545ba9deb0f46eda68aa604 SHA512 52ca19d40c07a8f078d62a6aa70611f952dec2c9352bb01d5792cca987dc2725d8e718bc0dff2cdee4034eb4a0ae3a9db21ffb913369d97eecaaf8fc28582ec8
+DIST gix-tempfile-14.0.2.crate 17489 BLAKE2B eb333777a1389e189b1951fdbab987e4e39c44428fdb5a4cf6bd75e1e963ebb9fe47143be4cb4892ae6524c269e58105bed6463f9dd28d8fdfa57ac7e938f38a SHA512 1baf8a34eacf5df9125dcf0a03b804c5d44f12bbaa93498478bec2a99a7fd64d052a69ecd5e568fb88ca0113c3b8c72e1e5cd8ad062acad94e97ee122898c3c8
 DIST gix-trace-0.1.7.crate 9647 BLAKE2B c8b887a0d42bb6786b12f88388e017bd736ea13ad29a47fae36c472a3f750b653cc11bf01460e2ad469204a5c6871c3dc08ee4be4a09c3623029e4941a5c6fa6 SHA512 de4c5f7ee505bd29dcf5da523503eeaf167d6a9c573727032da10f272e3aa47a9dd77ccd393f117ba531c5d6dafc2213eed8ee13670e6ec80dd27cb56b1476bb
 DIST gix-trace-0.1.8.crate 9657 BLAKE2B 357dc34cebb04e7a190bb4d8c348ff535b313ba52dea952b3226af2206a2795b160547759beffa914372ce4e23b3dc5898e62f4266242a0f0eaa24462ae6a099 SHA512 2ab5ce97df70c0eac7cde8c2eb963659d22335f9de9874e61a9cb8491271e170cc014ed18e82ff2f63862ad55a273544b4debeb5687702477a8fb1c7d22c5291
 DIST gix-trace-0.1.9.crate 9659 BLAKE2B ce18f59e91f4fb33346869beb2b6f69721d8b374a3a6f583ff77f27b21126f359c812449ea5fff9da00f688bc59e1f32004564a49c2a179a33d4fc184b8ebd22 SHA512 bbff4a4ec60e639238ab0f2623bca6c56914eefa321c8f45ca37507faa431f15d743832facd026dd3a9e3d9aeaf21aa3dd6987284a1876e20000888243cfc0a9
@@ -351,13 +423,16 @@ DIST gix-transport-0.39.0.crate 49271 BLAKE2B f97cd41f09b0e798e3194a787ffdf04b01
 DIST gix-transport-0.40.1.crate 49292 BLAKE2B d8f2e7ce532b424e8542430a2b3d1f201829dda12fdb638d8536914d1ba4cd64cff32aa2334dd35e7967a5e2963eb5745a5133a6a27860f72b0cbee8d06a1edc SHA512 942c174e2e0c4d57368c22184033ba3d8f3e4539d32099431ea955f52af698ef6149e0e1627ea4cb8343d37eeb23c26b6154392f3a332410a9793c70f2f8945e
 DIST gix-transport-0.41.2.crate 49262 BLAKE2B 60b474f36473162168c7be3a0ff7524249db1b01f9752a2654578f78ba7b107e156927249dc78897738902a0cc8f10ef0180d8796f2467f68bd14bcc920ed87a SHA512 e0f90e7be0d297009cc55e385f111b9988e7e5e8bc4b5b8206b0138f3418e4afa808ec2ec5c456a957aa8e2c9df7937db58bd9c111fe19fa2cd2c0468d23f9d3
 DIST gix-transport-0.42.1.crate 50136 BLAKE2B 9ddb41d859b82813697e0a8be6563119e8b0e5ddbc20aa664a93697c96d5a6d7021d69ae127bbcbd363d400e996eebd5c4d33e03176d00f6e0767a595c313b43 SHA512 7f1a915e6585ca9ebe18e2cee90d374f5b7c345ff1d315c88a673978ed0865f1a2fc24ea9e87f335080d13d8c84309a1e766d4d9e243859c0332ce35af48755e
+DIST gix-transport-0.42.3.crate 50131 BLAKE2B b5aca725acd8352ae70c46c11a7b7ff515d1646fdabe5fb70d19feffc5a68ae1380bc4c61e32965587a68e371557bc1c31a7cb7318118f4e976ecf75f7598b61 SHA512 a8ea8c26182c96d56cc2f2f0cbe1230c4ba8b6c1e0f4ec5896fcda2a947484f6319dd0810ab9aca81910d581c60826d79ee0dc2f5f491bf5c64d2e85b5f997de
 DIST gix-traverse-0.35.0.crate 12516 BLAKE2B cbde022ad41fb8ee8bd3fcc4bdb6e4eb40bfb49fbf8d388f3830056139e06ed7d76516113e4392b8f85455a29b57147a4bb4298d242977fe5fc315b2c1b58534 SHA512 50d036a97160d0fab351d681a0a283e6255947cef078c80471c31f77f7716d823c981f8bce8e3cc8ace9c142a23f7711d2b207cc13f24406b3532f292c4edf13
 DIST gix-traverse-0.36.2.crate 12464 BLAKE2B e0ce608d24be6fd5baaf86433bc1c42893731ca93e0eb51a9cf4d75f72c5a1b8f0733251f8db0e90e0335d6e0a699895dc76dce77a4b77e807f8634a0b05289e SHA512 1214c50769ef92c9661f520e34fe82762cf2652b00fd9d01b786bd448e1897848b421bb3da13bd7c98e29d686684642f31499d32ef4199024573ae13b579917f
 DIST gix-traverse-0.37.0.crate 12462 BLAKE2B f631986b83d29b47cb22187f764bdbcbb251e58116a3774b538d0bc83312a045894f762541b16b8ea2acd14a737fc5ea46bd6e65685a37378df89b7b538d45b0 SHA512 f64acae9ca06c4770a20706c2b8dc6cb77e76bc95c3eaae6b3c18dd4c2736172ed01eb9487549d21d693719c2c7f6a06833d8257854f4ab98b10510f43c6dcb9
 DIST gix-traverse-0.39.1.crate 17286 BLAKE2B 538702f7831ad51aa5753400b2f09f9d5abce50525f3064276e8810e57704381daf20f6087e5cdee6e1a810cd6e05b374f70e91699bdc10c4d604471c1081559 SHA512 33e8fddd7888e465efac875166fea984287ace21e65cd51122652bb56c594937f4b717e850fa2324228ef23f6d7f73710493995a8e202cadd83406e0d457d096
+DIST gix-traverse-0.39.2.crate 17291 BLAKE2B 7d543fa1f438071841597abddcb0944ee912e5ea02390b1c61abb42062315591470d01f80ae9309d15b3512ae6c9ab1e38a47a76b36570d17703c5c24a4c88da SHA512 8e03d9bbf9ab88d2bf1e4a4cd70790811d02f6a347f1781e3bc99e58786b8976ab1a5dfdc2379a0674e97fac0f4e70ae1ff1c348b78577eaf6f7225119bf8dd1
 DIST gix-url-0.25.2.crate 13397 BLAKE2B 3554c667f585298e06bd84d79f0cc4e7f3ca4469e537fe15e76a4b847f845dd7734589892d024af0e7ddd202b0e7b039a50cbb7aa293ad65ea631f4fbdde4fd6 SHA512 2e71f2ceb8de8f850dd8c74f606c6ade4b91352909e1d0c870d10d70591ecc5c139369479cbbe603192c0d2ad18e6518512b9021c60eb15dbb21c1d5c072f8ac
 DIST gix-url-0.26.1.crate 13398 BLAKE2B 1b9c5529b5bc7c2eea1dea5fc69a9d4518e2c4e29897484c4d0d32e5c36e5426387b6a25805301c97755f12f7a0c8cfe082f64a398692299abe99ee3944a0c87 SHA512 997d8f1339a7db36573ca23838c93359a60725eac7eeca018158d2b7eed924cbd701ec320120c389173b3efd75fe7061a014c1932343dc5efba01147d2852b10
 DIST gix-url-0.27.3.crate 14329 BLAKE2B 7f9dce2dc50e05eda35e6942d868ae0352393b4a758c6801a8977680a4f822258ed889a0223d8fbbf39ae7e054e0f95279127134d0df8e32d7798c4c15476ce7 SHA512 acdb1d68590be1f61543535a368d7ea7904d1830998c64cc9b4aeecaa4452b33adb93dbc815a39e0119b0f804fb47e2b67ce79ef38f19a2e8c6605118a600fe0
+DIST gix-url-0.27.5.crate 14367 BLAKE2B bb66a9e9cb4ac227f52aeae0cadc01d53de785fc75b618ef6639ca9cfbacd13a9dd63a8eed8152c4b75bdbb6f9760285b157bd4984ea7e995e3177806177695f SHA512 a007a074ca98dec95ed88e19414e55dbfaf7aa5c7b219af2d54785061c761642a3f88dddc52eed85d2a32e2eb36b371ffc6df16e12de2159c5ef2f20ffb4e85c
 DIST gix-utils-0.1.11.crate 9426 BLAKE2B 9f087b7f62f11b8eee291c3a45fe002ac4a884d9b43e1a295914a9b54e5e32250d3450ff4324c43d71596242ae1d110f7ec3f1b815d84656dc34d0cdcf6a200c SHA512 8335eedda865c4d0057ce01f65a07d23863803c80ce2ae3b656f3b8bb3a14b81977d30b88b34b883f58739bdfee9ab5b9e380577a4d9296259178cbfe1de824e
 DIST gix-utils-0.1.12.crate 9418 BLAKE2B bb51d3d56670350b9512f7ab8e0646a9390fe2da4b4e2888e312c4ee0a5c935d8e2540dab2883159d5bf164276cf29505914451b5761777fc5e770ff2fe403bf SHA512 5cd4a93a6080eca6e84a13f9e2d63c7c6215cc86c6662f1204fb8d6feafd94cdc6b0bb3b6343e24157b10edb9504d89fd479e707a4c7a017372f1f1530e6d672
 DIST gix-utils-0.1.9.crate 7295 BLAKE2B ab86d9f781b2bbf46da03e9260658b2503576f06fa30827839d8debfd2b2b636518e4751994e3c63e395f68dc7849bb06415425539bb72ad0ace66dacab249e9 SHA512 badcb82a60f5ea17dfc3e97a3d0326e89c49882c8b92833db8021203ec8fda469a4e1216e040bbc070b78593202cf23a93125c522dad43b0c53c87d852a543ff
@@ -368,6 +443,7 @@ DIST gix-worktree-0.28.0.crate 16035 BLAKE2B 8c8110d2d5e67158ad267040f3d5141ef95
 DIST gix-worktree-0.29.1.crate 16035 BLAKE2B dc73f77c8f45a1db70d50360ebe2cc837fe6d579795cf40d4caf0bfd0679087f3f277a23d5665acd1381763207ebf2f7cdfeaf9f7fcc2cdc5d0b110c43805480 SHA512 06184669bf45c4b7941b5074498379630d7e95cabedfe186ff4482bb67da79412bf1f0872ce7292257819487ed7a628ae0a6146998932fbb632214db5446e818
 DIST gix-worktree-0.30.0.crate 16224 BLAKE2B 18cd1ba70e1a00d55d4e5ea4ba0e13dcab6ba28e6c7d4fceafcd23548591daa8db546a97a1c4100984c509eaab53bd113db9939e186486cd0353105a1b8b0779 SHA512 7da7553495f4821fd1cc8c0344a4d36664b216d1ba992f3d7976b3a5470dfdaca30570520cdd6a1ea3bcb61eee6fae0f9138ea5515474b20aa9b4682620de0a5
 DIST gix-worktree-0.34.0.crate 16821 BLAKE2B 8f4d21f55b7e9f03904398ac7779cd08e46fe76ab7a8feeffe6fb21ebefa19e89c7e160102af77008d971b6a0036df2119e64f8526290bf651e06b7533041049 SHA512 c31614ca512fc3667fd1f150d6f6bcc3c224cb482cec3c6c74a987a72fd7f17656b60b3c323aa069e6f99b081e2164a881302e612e36e47771e9a27349c36c4d
+DIST gix-worktree-0.34.1.crate 16839 BLAKE2B 3a7e135c41fce381e0f481246d7184c9eff2b9c0fbd6ecd284c55c5ed0c8c4397d5bd16d2bb87f419c04d1e00bcc06377ab45522eb45a1e00ffd356112f27fa6 SHA512 54ea6747128d1781562a5cd06d5f85e5302679d58f672c541cbee3b5a8ea8dc058c1dc4b4e21abeccb826eb99d4f9ee8c252201bce5c253fb0bdd6baef82b812
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
@@ -391,6 +467,7 @@ DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
 DIST home-0.5.4.crate 8538 BLAKE2B 1512afc063cc31104e24a744aefc2a28f07d4ded12b4500480610124289e5b7c7f2fa3f1e66da36832cc45874c4bd2d08c1a584fed25aab4ecc962abc6675e33 SHA512 2494111301bd1281c89dc77f4f78d3bc6e3a04d1969938cf4584d465c01af12ad85022832b4a99a5c0ce6adc31a83c00820df2d513a09bf5c0d4fe44c53812a4
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
+DIST http-auth-0.1.10.crate 41282 BLAKE2B 1751242d5b3fbae435d629c3ad2ded6c683c157e569f25e5750e6cf5e02b0bcd0a68595cb5bdd55fb5f067dfdfd784917144ce2e8e89f7f080494483cf036a34 SHA512 cc76291849b29253f695335e32fe931d3c8c5fe48542b7d3da67d15e3c53e3f52a3a5123b1b14515ff302a7d7c54a2487a91cc242e4c54a017dd2aa3bfed9c05
 DIST http-auth-0.1.9.crate 39318 BLAKE2B 33eb18f36a7accaa9bd5db9fff515e9da7ce24f987c1fe05d9cca093947da2621d59016e1b00bc7a9d43e279cdde384d464c09619356bf62b4e1b1ee7c792143 SHA512 bb3154157db52908f2ead1e7a3b0296ee32061dd8be5d0a030b4fbfdc80bb590e8140476c9cdae9d3066fe54011da12c87a2a10409afe77c9f3f06f1ec69041e
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
@@ -402,35 +479,48 @@ DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.2.2.crate 76160 BLAKE2B 1b020e3e33204e9e0cf15e0b91a600296147432002e94ae1061f1d7511e3435a29c1c0c438933eb6a56c7c522cbdfff29a106622041815cbd706b9515e2ab82d SHA512 814cffe0e586940c82c152536a970917ec8702a9b946151ccc8574188fa2cb0fab094888c0e910917c99e37f5f53723ab799999fab4bee395bca7d45adeed40c
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 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.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 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.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42
+DIST jiff-0.1.12.crate 603829 BLAKE2B 6885d4b0d314ca417c107be5ea23d92171963a2c77c3cd7db1bb28350394947d0d819f92ee6ec7cfb6eb757775e27d0a55f4d2049b5f6aa7f40be7a760326d70 SHA512 8311e6f78e1e5c4f9495cede3ca1856f476096f2db7441b6438e647f3bc82fbede4e44cdc103fa16289a0a473cd2a4c4379975d34d47427cca420cf6029d1d26
+DIST jiff-tzdb-0.1.0.crate 81551 BLAKE2B 2c9018e13f1b641795929611c01ade24754157604d1953b8fab334444c454848d68bc89c07ff9a4d6ca6b4a4d1c94e93de3caf9bfc962f99ab95686aead6a249 SHA512 a8804be90937fc0ee5db685f29403b497ba95354fde06c9984a464eef6edc785c11b4b177f5f05a05b0acecbdfa6163d24f2e2ff60b4144aad976ca2354f8cad
+DIST jiff-tzdb-platform-0.1.0.crate 2949 BLAKE2B 0035af0307068797dcdd2db75f016135ce288ece6a7441009165925242361e5974afcf2c4b16175d2a496d9b4890e2f355682a101b197d3888598fed1b2e7afe SHA512 eaafaeef311538e1162cc9ac2174c31ab56ece0a8e7fcc7de536e66ff1687193dc6f697dae111c60989a230dc303404a3d30dbc11eaee1eb639fce52809e49a4
 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.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b
 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 kstring-2.0.0.crate 22063 BLAKE2B 71e58489a167d57326ce974c8e05dd4d2e18f7fa142249aea86594b56b83d566e14fdd79b7202a20ca9dc9e0911f7f873454925fed642d51241e6fc920775831 SHA512 17cf8f86f0a1df9de75ded552c4bfb9f7f0567802c83c0a8fa71625aa33cc537b498c3a247716a7b91b01c609a3722233d6316322210aa44850fd564ca16f624
+DIST kstring-2.0.2.crate 23044 BLAKE2B d61488bb67b0fbca7f655415b6147dfe003d6df9f746a836c4a29797af2627b2480fa0d4832a8121a04eb23d8623dbe37621a000661a45afc92013e04ac76dec SHA512 b0af4555a20ec30ea4ed03c2bed77b403446ec2dc5eac8064a9629b10f6e961f428d6be65ca1c107a19bee942930fbc08522647401106167feb4856eeb03bdea
 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.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 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 libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libdbus-sys-0.2.5.crate 1557017 BLAKE2B 4528c792d727e71141ee2fb2bc7080b101df650121487c420c7c6f3602d2ac987deed7ad49bab850619128f258c1f3a94364f7658b83fed16167944c4ed12c88 SHA512 94ce1de7e1f1727e923b2042aed6652f9d0e68f27388c186c37f7aa2195fd71cb3c92a2bee7e8628c95f36ba2d2a38d25d9804900bf55eb13af31f790bca2847
 DIST libgit2-sys-0.14.0+1.5.0.crate 1740370 BLAKE2B 0bdcec13f78292ad7849f88bbf21a8168371e9d4b15dcd09863b2ef703caa8e94a33da01164214620e11ff6f75038cf9ee6257c44aed5e07c52af044abca9952 SHA512 b2e1e54b172e6b0c71fdd02da0800e9120a3fe1b9c33b5fee4e667e9aa627979012865397b406fe91437425bf52e52a26245cfb7fa84f3ba64269dbe204582d6
 DIST libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b SHA512 45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
+DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
 DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab
 DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
+DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
 DIST libnghttp2-sys-0.1.10+1.61.0.crate 1967787 BLAKE2B 847a5578efdfbb63f34c10822fb9f9e0aae4ffc530ecd2ab89b4bdccd211f6f47926dfb44512cd722dfa7d464d6c569202b02d29b0bf3a75e5bc3d0d27a8fccf SHA512 acc854982289e13fb46de55a8d35971c0c28c95ce4b2cad54df86c81c0e790701e9e2298df540c04cf1be9bd0bd65fb68779de08282eff5ac1eef28f76275d1a
 DIST libnghttp2-sys-0.1.7+1.45.0.crate 4527090 BLAKE2B 29fa3021361656826d523cfb0312e35980199611887cbc43721a2276ecb3f663ac1283629552721754e256124340650e907293ab43b96e043c7aa87bae979ec4 SHA512 5d7a1e262fc91b654678cef4026886ccf1f55b8238164583ef46de58fbc46034288b198843e2483b1d8fa9070cf6640d83d140c53d780b38527ce68222c94376
 DIST libnghttp2-sys-0.1.9+1.58.0.crate 1901846 BLAKE2B 82777a0a9e4ae3db2f16829a2514062e487230a826c19248a307ac9f1bcfe540a7aa2bc415f35a5a3aeb17a41eaa9d6ff968655640ce37f253246f3428fad9a3 SHA512 654c08682ff6bc9d417e51492cdb96301cdba3b40774bd094fb971449b00f788146612c27f79dfb2cd6c6f1e693862e11c704c727a61fff3281aa6fa31659a19
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST libsqlite3-sys-0.27.0.crate 4948458 BLAKE2B f86b27fc951145b20d4f5ca005f9981d0749be4a3201811b801d042e47064ab2535224ef1c80657ae0d553508b5b586360f533b0a3f84e92ec5eb3c99920ebbc SHA512 34dbe8ef5c2fff5a95cf0c1ed14bbb2e537cf993515cb08edeb90a0590126ded8b0ae42db07047c769f24b23045582d4db1bd5e5ff82135cf8b2e0e5a71e85e9
 DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a7095eea281e1496ffa5b312f632958c751d50d9051f5ad09777e23a18dec08821cf9c43a405c4ac64fbb8719820c12886b54 SHA512 4a3d16eec47c6e3e53e00232501fd50fa77f1ee1370f4ab6c984496f2f897b4acd1c15c697caa8babd635d31a946e147d5d090378615676a3b5c4a9656355016
 DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf
@@ -438,6 +528,7 @@ DIST libssh2-sys-0.3.0.crate 514550 BLAKE2B 55a24d513420e0222c342d252b1699cd583d
 DIST libz-sys-1.1.15.crate 3958887 BLAKE2B 989b33d3a0ce09b0268f81d86c33979c7627379d921fce4be83b8c31419aa0613a9e3d82aea400861090fe6b0bf00612396cfbe0b8eff2cf682576b62f81f807 SHA512 316a3b961d8f9b47ac763365d36a4171afc0fb19a01f9570f1962765da0bf67e7f57b848e16f370d653b40a2526fb8720a4625062cd53d4e4f12e1c69d158097
 DIST libz-sys-1.1.16.crate 3958920 BLAKE2B 1780cfc7181a3c33dd8f693ee93e46bf0f70c1958503e8eb866d6ecb6732c8ab7bec56397c5384d582680fdbd8762ae37ccca7063616f266c59a7eff7801c0db SHA512 1d6b65b5a5293d470cf8ed48293a6f8273828a0cdf096d286e777d438b2c4d076360b5492ee3c2c83b27605d51389e6a3eda7eaebfb09a6041a877a48540aef1
 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 libz-sys-1.1.8.crate 2481844 BLAKE2B e890a3850aed5348afe7558168c7571564687d6a7d3567a4d53ffdf79444d38c4d70d35891e16f496f31169bf73b669534f5fc584f9ec520b518dda05e80b882 SHA512 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
 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
@@ -446,6 +537,7 @@ DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe88
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maybe-async-0.2.10.crate 22107 BLAKE2B 2b8bea636cc271574bad08313b86d5b3a2163199addb0b6320630655a8b238d811db302f1c9c7168bed5963f0b55a90554627c48f59ec2ccfd5674303b1cb344 SHA512 c41fc42385a47706167fa9c51fbd2e4dac74683c362d66f71705de4125dd639a518207a2ae4cc3e5f913279ea205d260b0ed3fe2edbce68f27ddaa9e9989e59b
 DIST maybe-async-0.2.9.crate 21866 BLAKE2B 557cfebae7ed27ce6754eb98259a99ff639f5a7bf65e8f8d47d99686ba7f2829fc6e90cd2240b11ffc2addccf62bbf2e59c26871e564098b7ae64dc540334ea4 SHA512 d237a33e8ed6a98a6c3e984c1aa780bc7986dffa6fe2ad6e83e356f8f767ce725d088ae8c52a3d63bb79e52c96836c87170a7c61367771c19deb1236bf09c3a4
@@ -458,11 +550,13 @@ DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43
 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 miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 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.1.1.crate 19786 BLAKE2B 39c955c41283051e414f8576fdaa51f11f0ab5a23bfb7f6aaaac38fd9474912721c546810c02da335a9095fdd6d8e37ff2f5fad2aa93d93c21b4be76267088fa SHA512 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca
 DIST normpath-1.2.0.crate 20107 BLAKE2B 08a86e545ed8d0f1881645690c45c4a5fff438680a36778d938bda03e489706a1086e91e27429a414b5925b15be93a80d8dd2327cae28bd567a058cbec5b6c3c SHA512 a8e20301909e28d6b46ff388ac77c7b093c3654418f74955aaa185489fb859b79fa75b7cc303c0f6ef93b01efe18fa70628b1e85c123e143cbaee98eeb558e15
+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-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
@@ -474,9 +568,11 @@ DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0
 DIST opener-0.5.0.crate 12350 BLAKE2B 5992f6d564ae14b609aff2d0415c4d7414a8cafebdccb9ac0b66056cd2968f346d63855d8251b153414115c6c8d8cc91134ab53d6b714df78f2c3c858b22cf8a SHA512 4a9be4d280cc5039d080bfaa318b47a80dfa930f3e60068ca10346aeac421abc8575d7eef3649061847e24ad3a6262fb58ab183f6f2704f429e9674f392c30a7
 DIST opener-0.6.1.crate 19173 BLAKE2B c235ccc8ca6f1f87a30bcf94b0014b5e1df99c6dfd942d5c3ab02f351afdc8c8fa3f7074ab87450eea939bf682d31e3a08ce90d18dcce88aefaaa7ea61425785 SHA512 bd56a5c23a3d1fc3d5828bbffc3f7df6f3d92f03cf38665587ebb5b16a716e04395ee30b239acfa8fc95f4daa67807e48d9cfcc79817f2926880832c4ea4ba2c
 DIST opener-0.7.1.crate 19186 BLAKE2B 95336fa130bdadaa6bbd2d623d02ba0eb44d82abd715d5acfb5625384ed127234b5c3ff423db6c1f89bfc0f84815d5f7c7167ac890ebc9dee5750569986db16a SHA512 e58b118ab99bf90f9efaeae09708e91965591ca33fb3706ee3c4b1efab5714670278885b6718ea65ca9a1e9010587426b79a55bf7b96decdc7ab7b64572891ea
+DIST opener-0.7.2.crate 19229 BLAKE2B 73d95b2ca82ad0d21deef1965e0a6ecd88872ba7e73028d694dbcc5759a5088a119abce05f1286b7cfd5aaaa2f69684e8c3d1c7fc62608593be25541493b4e92 SHA512 15e2c6262f887bc53e21f1ba1acf9d3a5c97f011e6b54084274f9f089e658fd747b2c16da0a55cd5f56e9b771306c8f56319939a9e503a6ab5c3b9475808191a
 DIST openssl-0.10.42.crate 225875 BLAKE2B f271b1f2976249354a3fb485635d3c05c4095cea497cde36a88145b33530436cbe60aafb6b8edd0eb48cfaf8668ea65cf6d01c71c3ed1b343449744b8124c329 SHA512 2f23f460518ab2efca867a38b51bb56a87dbd8abd99075eb0d08a82e23d3ebed337c2214eec28636c5c94800532a6a404186889b500f95bf7cb5babf18da2b0d
 DIST openssl-0.10.63.crate 270890 BLAKE2B 0571a214347f823c9079c1f6d204c62469235ced63cbfdb8494427aed8069f45bbb26b81d1edbddb3602c0bffd54d1ca96204aef8cb85aec041edf45d89889db SHA512 47baa5f2e34b622dff0cd475dbbf6772adf48abbcec5be1cbcafe2beb9060ae46a3d873896ee4b5d864da0b132f0efd956596c49f2afc650a44cff6af001aa56
 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.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
@@ -484,8 +580,10 @@ DIST openssl-src-111.24.0+1.1.1s.crate 5106276 BLAKE2B a2da79f567049f5bcb15d15b5
 DIST openssl-src-300.2.2+3.2.1.crate 9584218 BLAKE2B 02d8fde4932f00a4a06693d68832fa47f5c0d8009e36796614355732f58fd72f0f962d3d904875b5f9bf2330fc369de513a4664f34ed0565660fda798fdbdae5 SHA512 3f69a0b9f3decedb8375b67644e24d805d7036c5a813ff5519f1cf7b2a27d1cfa0b4310d20ec9d191bf571427047340a3ab3eef7657c35096dacbb53c55ee305
 DIST openssl-src-300.2.3+3.2.1.crate 9584245 BLAKE2B ebcc3c3892ab7fab3d08f7627f445f6fad66b67d0c8511e012664c5d1a28096c43bec9e452268980613683b15ffe803f36993b6d365d1bcc45ba51ad7b0258b4 SHA512 e853c20aa2fec0f60d7c1e948377b322441e709961178501f535351db7f581dca7c8c3dac8343b9ccbe44b3f4247371ca2e3e691c8ac7bdc67034f86055b79e5
 DIST openssl-src-300.3.1+3.3.1.crate 9783559 BLAKE2B d6717a6d1b09cc277138eb9b9d035cbbe584ef1c6f51c488063ed73f9d8bc20fc15eeab2ed5d5713c6d040f2e2d6f5c31f233b56259ef3b7c4d15b446cc5af32 SHA512 4f90b906dca08664bcf5784c8e4d7111e9f61029f7b9ffc512f3904900d4a29918d14cb6f57845f0c7029ee31e551bd58048c3cdfc8ae5b4c0f2c637075bdc40
+DIST openssl-src-300.3.2+3.3.2.crate 9792821 BLAKE2B 32ad388d7bf8e9f5f22b55956a2d5919a5585fa5daa6379dc319ce98ff0b24db77dc58ff9cb585920dd9ea8aae2fb1e23b28da7eda9da2747ee7d0a61bf15232 SHA512 e18441c995a4a351decea2e6b0dec5409f85dac3e15868b16090883ba9fe12b010fdf5a22dcc2467d774d20ddc0a609e4956b914a8144451ea2a64736ae9e205
 DIST openssl-sys-0.9.101.crate 68568 BLAKE2B ad80cf56a33c71d6889470e4aaa0b314e67f75ac7921a63d87a94becf9203f4980b6e17b230c0954c126ab8df3c499444ab196958fa645ac9248ea8c245fa34a SHA512 33400053919f7fb2298b84bead88d82231640da6db4efe3dd21a837d0ddb50b2bb21be5befe1734bda15107a9e23cc9f8392647413ceb77451bc36034831b684
 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 openssl-sys-0.9.77.crate 60799 BLAKE2B 8a2344c7a579c568a420959eb2710a012af0819c054b190cd2de688defa804bbc735efdfec1a537462feaf9cc1d891c4b53be1910713e06786e811e66c6b1488 SHA512 a31256943e739a4ee500a1080d105d8380a65ff43b88ef5bbdcc164cf97a133ab2926b5f4ab3010bca3c14a09edc7570a2edfcb745fc21169408aadc0eef0fff
 DIST openssl-sys-0.9.99.crate 68158 BLAKE2B 59995535bc24f0ca67ea204193aee4114f88538bbd74ade7c22bc2ea1b0d7e41a79118b6d22917bd1e305a43c16f8aea095c635d27a56fc0481a2baa3092dfa3 SHA512 b91197583135c22d34814e6382dc4ad4be9c3905c979addee8688dbc52ce627815e719b9d0b365195335d4d665eaa79a406f89e4c19cef73988938d51fe2f4ee
 DIST ordered-float-2.10.1.crate 16029 BLAKE2B 7c6920160e52e377ba44ff63ac679208dcb3782c1ffb802707c54fd285ec22bebf80edd036753ee13ac3e577b0b7114241dbd9ce5f018d0d6d31ae21df1cde48 SHA512 bc659ff02660a12c4340889ca7ad99d569d8e7b9043d8e8ffae912da0a5049c1a837c7e4eb0a39e5ee3bbba9fdb498af6236e56af6da841c97c2bd4ca4c39090
@@ -514,6 +612,7 @@ DIST pkg-config-0.3.29.crate 20563 BLAKE2B ed0559b0073890911fb47742743b2586123bf
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 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 primeorder-0.13.6.crate 21296 BLAKE2B 2ba479defa1c26d14f8711f6be5020eee9bb91a39fa7a7c14a93dedc6de920e0ef1c9f6240d308233d0e0d6bce4be9500d0e9cfb01b6c4f9902e0f77a2f97352 SHA512 fdf52b47b36403d5218220b886a3ccec7828731b5a59ea1d48a25fa85de754544fa9c94d51356d2ed904bf2d908bdb4fa87c53e597a3c9f2941d7310f70198ac
 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
@@ -528,6 +627,7 @@ DIST pulldown-cmark-0.9.6.crate 117378 BLAKE2B 39376ce32138115e2def495b6d2761500
 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 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
@@ -536,9 +636,11 @@ DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379
 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 regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
 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.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-1.7.0.crate 239421 BLAKE2B 6e9434bb9835bd8e15c81e817aa64e8443c4188219caf46579078c6b7cbd98ee588af0f526e0fd5a01814762dfaa113ca3d15f7cfa14e969d5acda3a631e9560 SHA512 974c15a593d86c33e0bb34f7a67957fe96dec07b3752f2b6b968d657845f5d2342a5ee9ec1359109c43e4f46c9b2b2b678d59f7b752455a0ab1435c1fa56ca3c
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
@@ -559,9 +661,11 @@ DIST rustfix-0.7.0.crate 19596 BLAKE2B 2c22469f37a64b9ca0b93cb0cc5f513991c80414e
 DIST rustfix-0.8.1.crate 18494 BLAKE2B 81296cc8c24e00dab3a288c2b439123a4f63982845a2c2ef3a060f26a4bc6ab67ad96068e9d943227fa52ea38bd15120eca42c5799773b2b62d1780b1f520856 SHA512 9eae13ef59d0604d5adfa9e96054bb8562e3c660323483057056423f2e890f51812a8bae2e4fb46cfde37f4ddd7bd7f065e9b1a238ecc50315e2314255245a62
 DIST rustfix-0.8.2.crate 18360 BLAKE2B 1e0560e6cfd33670a38e196b1d3e2378d95ca8b365565bb128d4352ffd3c887566d0f5679d1acb21621fc6a19ecf7f37e1eb7220dd0c36de70548368a4283a2d SHA512 ac3fc1a2bcc1f844400297a8ec6880921fbdc3ca560bc025dd9ea01bbfb94c4b0bb6abab56b1e5980ed298f5aca5ae2df33a0647ebd8bb323d266e739c19b077
 DIST rustfix-0.8.4.crate 18482 BLAKE2B 7e23005d18fbc6c98b95fc7642274f8a2878fce9ef3f25ee87777449221823829217aa3ac05e6aeefe8ba5bd1e1c4f3a33d5bbc1e48165d6a6f294c77c8d36f1 SHA512 992644f3bcf76b233cc35e1f60102242a86e17c299efed4ab2c2b2db150174d74ea8fad054391a9fa9f6be413f8f258c2fa3037d0b13bbb8612d51c10e1bc77c
+DIST rustfix-0.8.5.crate 18521 BLAKE2B 4c0b83750aa51b28cb4d271112e474224d548b2025e3eb2cc82e348f9d190fcc2dec55ab912962c12fc6a9eb2dc928c5a96f26ea5673cde4891fff65b04fbbea SHA512 ff45cdce4537c8b1a868df4395d7368e74a6416f14759e3ffa449b1ac8e7751ec5189681633effbda3b48d5feff6e9bfdc4fdddad4368e0eb497fd417ec53587
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
 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.36.crate 370932 BLAKE2B 0c4b963c9045fbb6fd2e4fc91888f574de531074a4a131aec9d8d2f44f3839778bce601050848d9edb2ce4019a94d3226835f7a776af682daf73e5cc52eb6f5b SHA512 2874bbb5fbba8b9fe883cdf21e9662e84f32a3fdf50c8662a908754436d16d177c4c01810fd08a01b2690c79bfeaf8abf29e5efa0987348d93671499cb2fd550
 DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
 DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
 DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
@@ -572,8 +676,10 @@ DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6f
 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.0.crate 80191 BLAKE2B 23515556ff935e7a19f282f7dcdb28bcc93ff1b14fae069d1e1be35abd5651a38c7c71594eae085c8385e48b25fb84b6f5fbc44636b5d1badb15e89ec6acfcbc SHA512 7a1a1d1b807cfcc0c87b27a13aa0007d5c29560a45f20963cc84fc705385554b969b4062c7f8b15fe793291ab624fb2a5257c05d140c53200c2eb344547652be
+DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1
 DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a
 DIST security-framework-sys-2.11.0.crate 18718 BLAKE2B 4fd8e8eabdc910f656cbed6d6f941992eebc2ebe29c1d85e4ee2de5aee2e4840f2952ffa0b0f9ae88329a2b16d66c3575796f476b873c6bb3c3efcc8d119ab6f SHA512 e3848a45391ebd98026ecafb0777852aa826b465613ef184cc33cdbaa75fb91053d46d417dfda6398339abd3b67788a567562e99b3c509b676b7ee5a4372acd8
+DIST security-framework-sys-2.11.1.crate 18755 BLAKE2B 6e4f8617ab92304a435489492f1126eff2913f5332dacb8b48704b5f051e87893e5f4239ee5d6a8e5c350d14cf5226fe57a36d8119b1e150407e9b157e74232d SHA512 8565d7ca296995c2bba78a328758c84c500e95cbafc988cb595e040ce95d4114c1de46fa30224a310981c3dd2a9b7d1d98c87f129d98a0b2fbc44c72f9085d23
 DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
 DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35
@@ -584,6 +690,7 @@ DIST serde-1.0.196.crate 77097 BLAKE2B 22403615511a7621a9d8d54fd2dcc63878cd2de0e
 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
 DIST serde-1.0.201.crate 77725 BLAKE2B 3cef32b1c026215e83d84dc7867e93b3c76dd683be0519ea17de25ea030d8cbda9031a54636f254026ddd30d96033d217cd81a8bf50cd7b3a936000bd47a3736 SHA512 d422f16277b59d756f7e85e6c589a28f4134ee221968eedb48bde430b63c3cf6d379ae8f03249439f984c66e0a9639238159b42879a9fa03fc49b167870ce35d
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde-untagged-0.1.5.crate 15807 BLAKE2B af2ed54cdc483b1c13658a78933e0e1f17882b8f191a916ecc426660457d07ac7222bf9b2602232b387dd7671e1bc8b9e80797c188336609e86c99210328f52e SHA512 0d944ff6968a2e31b47950b2d418363af792119197792876ca6375c31a4289aa99c8903c42ad273358eb739263fe87413b5105b4fa6c201d792a571a5165dffe
 DIST serde-untagged-0.1.6.crate 15741 BLAKE2B 34aaa48e9c5e7d0340275affa4e5bfe333002242f5e2369e9141e7498b3828c3da6dcc38d805b7c21bf395467ce0625b29d4065e76886e08a2ddd4515d378414 SHA512 d1659bc19c1b1fc9febc7948c82379bc10560dabcf92d6bbb9c890b4706eddd78f4dab5d7a0cd1f5efd06ce6c58a77175157ad3c258e332505666221f807e065
 DIST serde-value-0.7.0.crate 10249 BLAKE2B d2d3d687cf490eb0be1910bf82c09334ffe32efc485297ee228363e4dbb536b72e2c37f3d37a5f8fe61af7480fa8975c0a654f761c55e56348082e4605f2288b SHA512 6ca9a73420ca9fb5415730bac4daa30087b1722ed7966ae07f403497b8cab95e1e1da664c0581b9cd170494242d4e01be75e1d5f9b6ce19c538e7323da46bf76
@@ -592,20 +699,25 @@ DIST serde_derive-1.0.196.crate 55775 BLAKE2B 3d06b3896f0cdd1b1acdcd0046bdbfd1e8
 DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
 DIST serde_derive-1.0.201.crate 55865 BLAKE2B 2ab2a02a7819a12ebe44697d97d24ed61cbff872e3a1df7a33671165619619a1826e80a948a85f7508db024d4480ae1e91ead5944eed3d011fb0f449d1983738 SHA512 925b7238cdd833dc3eebab162e4f18eab9fd533178b957a7a3149079a10a0eee598a3048ddab6f16113467e8eef78604e3bdb26ec7e30184aa0202b1f4267cf8
 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_ignored-0.1.10.crate 11789 BLAKE2B 16900f4e424fe522a72158ffeaa1c279ea96d498317215d2da9ffb61963587914965c87c31023d67be67675721db693d9ecaab6f4b0e064ca438ea8087e8c2d2 SHA512 c8a0b55c975446e06ae6a6ed16690a9b0a942f9e43e84149a8d9727660283e7d42c9e0386af60c7186923edffaf1781013f52739bdd9ea0a5e22dbb006f5a413
 DIST serde_ignored-0.1.5.crate 11858 BLAKE2B 82d28254d8f43b29bbc16e5cd860e6c5692fd7b9b91ea7c59719c2961f979d6637df50b664738f32a6c1f7028d99a8d0a175b82da8ed49b3f71108dbcb3e14a3 SHA512 814762f5d624dc34d2ea1756a20e75f648e71ef8489243985088c952ad09e89773133cfe33a205315cd37ba9b40ad16792c44b67f0be90de849bd48ec2338a2e
 DIST serde_json-1.0.113.crate 146970 BLAKE2B 8d80b0fc913ba4f008175c6b89955870af6476dc8bae0cd711b748cd0a2bf67b1299396bbd492a1ae5a4ff8050fddc85f0a0ab54f7b24e27529ead3e3d7c920e SHA512 82571b025cd598fca635f18881b52db2364e07eff1b961ca7e3b0591dd41f95503f7188ef1ee6fbc060b9a2360cacbc8a5b85c01fef7879ae3392b29c0004b34
 DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
 DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056
+DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
 DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
 DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
 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-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 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 sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST signature-2.2.0.crate 15531 BLAKE2B c584d9ad52a1ab3cdc129c36cb2ed6dedc40a8d49f7294352a7df8121dc57de78268f15d9ff9ce076abf1dd3c56773daa26ed5ec39c83a600b6a377b51d4db37 SHA512 673a8f6229c795cc8f640fbfe02cd912b41c6359ca23c5ddeb1679f49784b84f109c6c45e6210201c9ca05e441c1be64ce6537e81ccd3589b37be6d0bf50dca7
 DIST sized-chunks-0.6.5.crate 43628 BLAKE2B 961121bd773ea5f0e6c3210b17191e122e90180cb39b35e501b49c41de69ce17f29bdb09617c22db4b4632f11193b2a97072f493707e66b956dd6dea61d5f310 SHA512 c7496094a6ac45003b31d55c61aa42e649eca40a2540e1acc507d541d3c02e5a1801fb517e2685752b81ef5a8c0ee6efdcc93dae9268f22ac8c6eaf1056e9656
 DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
@@ -622,6 +734,7 @@ DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0
 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.0.crate 14551 BLAKE2B 64943c8ab0d2c09cc99156787eb813275dcdc1b76b8b03675d803d41b3e2697ffa68dad2e831a0675b80b1dc1d635707bf69c51e8e67c34af161b8a805d1b2d5 SHA512 bb6425fc1da3e71e0ed5fcc59f080888fa1683aef8ab499bf5907d66a1e8a528c7cf0957276ab02eac8cce7f416221af1207bb3d2a346ce98a32d987e9a6a62f
+DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST supports-hyperlinks-2.1.0.crate 8035 BLAKE2B e67476d06e32d56c96bd6e2948ebec38baee1b2cf808755fab1e61b14eddf129413f5e5b0fdaec1deb09af194520b1c28aa005e6cf4a9591d36a88d3500ec009 SHA512 7e27519c1e8f49c6ee11094eec18acbb41d481f6be0bd3f5e4e96bd0f1ce5d650c40e75a2190ee767c9c5268cbc6855a986a4751d317668a93e43bd9b3ac8e64
 DIST supports-hyperlinks-3.0.0.crate 8067 BLAKE2B 5fc8fa7f02fe3ba37efe9dd5ea7712ac294cc29d102eebedfcdf3f8c7d50c10a8c308a4858c5f1aecb7047ddff010b240351832a839c67ac66be2ec7d7e66eac SHA512 a64e441dd48a03324fcd159a16d59d1a65bf4745d15e251e315c43a4fe7f27fa15414dfc61616d915e33b1168da304e9163b249d92d2b109bf4f4b0d7ebe48be
 DIST supports-unicode-2.1.0.crate 7698 BLAKE2B 9d54d90ecbf94a767c91874f49c21c62a2124519f34b0bb9a075c972cbaf3ba390a8ea470ca2828410e84f1635b5ee39c310e272d82873cd26043aeb28515cb2 SHA512 802f5afbc4b28820e517ad07a457dd56f8d237c07046ced40f98f8f8c7816bf882dce0e807977b3362444279319590ec77aa83722e3857201709529f9fe0027c
@@ -632,11 +745,13 @@ DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c
 DIST syn-2.0.53.crate 254828 BLAKE2B 4bbff9a430e12baae231eec35dca4a3130e9977c6272dcad4a25266441959461e6e2b69832492a6895948fada9152abf8630c1d011c93912356397360bfb7b8e SHA512 0c3e40e1af47910b59877246700dd695e2bf03c35e036adb99e9756f8e055c8b3421020fc43f71954aa7adfdc56712d58968f3f39ca2e93c0daedfebd8862b9b
 DIST syn-2.0.63.crate 258075 BLAKE2B a6d0c01640925c7fc0513b0e03dadf2439a1fa488177551cb9b894dc1c7c98882287dad1883d6b1e4b22e74ac66c6eab78766f7afd1ab0e2c8aec9ea5cde4249 SHA512 22d82bd1a0206fd326d6004245fe2538db9aed2ccfb58e9dd967030d3c63ca4ee146c501e21ef854910b89bc11d09d953b6d4139df63b53584127c03d9ea6ce2
 DIST syn-2.0.67.crate 265024 BLAKE2B f2d0b1e40347c80fe590debd5d0e6fc6d35a60c9d9c2abbe67810084f7873a0c5188c1d7eb0f3d090f577b07fea1db7df47f809ed64adb3b2ca2b3217c76737d SHA512 f7e832a9c5baa1db1673672a459108eaeec5146c849fe61122ac20e33a972c567d0c19ba5c4967bec8d9423e5d15df1dfe1da34f2aa2297a31c4c9712a4daf7f
+DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 DIST tar-0.4.38.crate 49158 BLAKE2B a344a65951c5c39212ffa3cfdc7dc68c40a85dbc5e4aa08cfe7cf22f0216443fa081ddba5e8fadc48968cc8e70e08d23391a6caefdf359310e5880741c9d6730 SHA512 4b6458734811e1913cb7e348f32db16f9402fd0e0027ae867db81aecac250b35d07d9478cdae4e27a609ce0f29c9d61683934296cfc3b371119df9f2c380a84f
 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.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
+DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
@@ -645,10 +760,12 @@ DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f
 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-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
 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-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
@@ -658,6 +775,7 @@ DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2b
 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 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.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
@@ -665,12 +783,15 @@ DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08
 DIST toml-0.8.10.crate 50667 BLAKE2B 815c850d4e2b8f107729c24ff82a6be81160649fff726f07a2c6e2af0283298fd5eadcc5811ba4ef20ce12914ecb43da79fa1840fea8d1572ca59f02f9e2c310 SHA512 24f3b44244d7e91ae50eaf20bde40c177352592aadd2dac697a831a5de9305ac1c93c8dc407579b9bbd8d9984fe34cfdc42c3243cd0057ad83db14bd899bb546
 DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265
 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.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
+DIST toml_datetime-0.6.8.crate 12028 BLAKE2B 62113366771f22b437b2ed0d3bb2489ae9078cb589cfad2ad2e92c81ddbda48f689e5a573366eea4f54c2b3cbc6b37eaa8b442b6d935b631a992de4917268757 SHA512 d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f
 DIST toml_edit-0.14.4.crate 105387 BLAKE2B 63b364d812969fb206ec8ec38e8c0264bdea3a3e7482e2f253c8b0c4e9903bb5becbea6ec03f38d9236be7cbe8111a437e667b901ed75fe32d6de3f94d3a2790 SHA512 613aefe6b648eb202002d447a63cec1b83aaf6ba04e964491069198a0fc39ad11268509a2ebaddd68ee3253bc28df2a0e771cc2876c57136e517850a3926fa4d
 DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
 DIST toml_edit-0.22.12.crate 104416 BLAKE2B 8f1f670ae986b900e141ed359f8ec1300dd91c3b0c204c8f3d6bcb44bd11ed06dda87535a6a8b94efa604a323e2a714ddfb382633b1ee3605e1f91488d9f2e56 SHA512 723b9cf08b1262c3e28c227ab363fec0122e23c3c9854f428d1aa117dc87564be2e22f368f9ee63cfe7abafa563c2ea51c00909d44eaa067bf1fd8c985d25965
 DIST toml_edit-0.22.14.crate 103761 BLAKE2B 54acbfda77cb071d280790bdf167a9a7a3fc6c8297ef96c5a82d55c93fb036c0ed167fcfd380d558fba3602bfad26080947e6477a6011819795d2debb74e8d14 SHA512 fef6ca35315482f635bfe35c2c6753d09f9bd33681d8f032f448fb9c6f494d30fc5789d96f99657879be9fdd7b35a640d52fce7722fc6ca05d8b9d5ed91903c4
+DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef332645cc0566b2e23af72743cd40e571a74660e8034ddfe75c4ae5b0bac8d9cf2915e8c62c283eb977ed3a43449410 SHA512 f1514cb1c89fd0d89bcf13a448cd8f0a0a31e05b9c483d9167e6890d70594175dab570c267cbc6596382c2300299c8d1677a5a331bc407e80832da5b7a580294
 DIST toml_edit-0.22.4.crate 102719 BLAKE2B 80a2b4d44e6ea894c5b976dbb36fbf2a169326362d11a292ad8101cc56f230489dc24a5ebaac9a809e1da22fac23e0b588b6a11fc2581027f56ff3a5998ba99a SHA512 13a9034cb4af3818d1349c852d2e019985687fe8baebb6e3bbbb4f10074e505df53bc5b856d669535ba4c6a830c0c67f55830c2b1ec46a0832c2db3413a2a404
 DIST toml_edit-0.22.9.crate 104173 BLAKE2B 1d2ae80707a554bfc9b9b66975828cc66e4759e1c2d9475d0ab200710cd9794a2560834802e586a42d8e52eb309497593f6673944101d90948974d21d3f227d7 SHA512 b96b310e18618c5cb75cc827f5bf4565f06e0089577decd38a2669bc51672f3d1500e2ca5e69838ee93d98c966fcaee1584e8fea1fe0b2ae724be0882fd5880e
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
@@ -680,6 +801,7 @@ DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d35935
 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 typeid-1.0.0.crate 7549 BLAKE2B f0d61e26f706a52bf7ef0e0967f0fd1181e70bef58d7d48f478b40883f9d38a0258149233876230fe936d94c8ad9335785bc3329f1ed61645d91a6ba1b4b303c SHA512 d26eb5cdf10eb3d429ac28a842aaa0393de7c949f8ba1bc134e428ffc7327f4bbe054792c7eb333720b17ac507992a8c703154d6217cd5430a8d90f8dfccb734
+DIST typeid-1.0.2.crate 8844 BLAKE2B ec74d365b11f17f63f938bfd8819a29d94eee8a3d938d8e5f6c797c0fc4696c1016e5c900f5874e3df05f6d5650f1b05da9446e240afea6185d16ec958beaa37 SHA512 a056d99db3bc648ea260157335045dba1df96e70cefe65dbeac80d517cf630cf398f86da692180592e99f27ae14eec1d3f658c0d2d039ae353ce56463f7cee40
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
@@ -695,6 +817,7 @@ DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968
 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-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
+DIST unicode-xid-0.2.5.crate 15530 BLAKE2B 99dc8a0f9727c86fe3ec1ee119487ba4cae579d009720556ed598b58c0ec593f32b4f7459df81d4e4d06db351d368d2c565af7b03e15d4e5c984fd50f133cbe4 SHA512 ad8a23407aaf16eae14a44de201c4a0152bb07584bd36a5c460fb744859978cae131424c32033be4ebacc9f9a1dcd611f9ff4a98b84f560109d0c313585ce5ce
 DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
 DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
@@ -704,6 +827,7 @@ DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 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 vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
@@ -712,77 +836,96 @@ 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.91.crate 182689 BLAKE2B 4ee85709546462be3da2a6f1caa02448fa903c7411eb264894aac402979afae4a0d7f3dbb486266b05d8caa911893ae9bfe9921cd36e03eb5147a8d75d6c17d2 SHA512 80e91e5b6094eddadbafd842a4a1b3284de7bb51bbd795e8716a0adac354dc14ceee0593d7c33090de06aadc8bc61b8eeab8851d066cc4ef4661e64adff1988a
 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.91.crate 28345 BLAKE2B 912a0471ac64d61f18d1c1749a3614ab70d08f330fd90b903ce5ef51f18288c7d4ef153f1d8100671c02de8fc499928cf925bdab4da4f0352789268dfae87457 SHA512 7d3c8db4503982fae9c86620c964e8f9a4ce542a79c56f21d9f82d26bb9418e78b7fa9922901663bf78516d58652dc3255ef48d1e1f042d8a3c69210f5804204
 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-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805bf7892c39c5e70257b6d048c2f8cf885f7306f91f3f17de1b63dc740db66d52fe2250ba981077e03dcc731dcf7c80c047c9d SHA512 6b05e0a2657e7e4f313089787b52cc7f59f5a94be6f716ba007fcbc3bf7c38561225ba3f39245d779e28dd30630b2d4c6be12baa6ea1e6cb47e562ccff48372f
 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.91.crate 20091 BLAKE2B 337b1b2a9e9e9c1350267df0d9f041291a847cf4faa3bcd6fcc8a96e66fda54685da72f6e64e57cde0d4609409ebdc7851e96781f599470f8b0545018bdc2166 SHA512 1277682520d88cb9529adbc054590a732a8890debe33d1d64ebce332c66c02f84065c0f643fa45c01de8b80534b2daf8333979601323b3ed50dc49553233c39c
 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.91.crate 7267 BLAKE2B a9dca2db84a33c650a7abbb6dc552bc4bab1446e66aace751d3709d2c63b878b127748a83cb174aae3ff8c5f5ec017b97623e5e9294e6ebf92d669efc618c357 SHA512 97072a8bdfadde104f6e9e760e1ac5ec665fdaff38a93a0bf601c95e652b35403e58a99fa8c0fefea6e47b38fb97f2e1ffcf52736f9ab890b0b9632efb26cb4b
 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 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-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.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 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.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
 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.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
 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.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.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
 DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
 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.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.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
 DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
 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.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.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
 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.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.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
 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.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.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 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.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.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 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.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.39.crate 159300 BLAKE2B 671f588b28d6a11919967d03227395cafd4b2d9afe5e76fb947e4a90937d25c1e8a486d228dd1a6de4ee99e8ff4ffd515b9e8b14fb54a6136b0c9cb3eb4be388 SHA512 76d4762a0258719c2212f0ba1e2a91098548d18b12dc79cf90e99a847eec3eae05e821effd7f5b2e68f482ccebc6ae8d7877e91b3db863886e007631e8af2c83
 DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST winnow-0.6.13.crate 162649 BLAKE2B f088396ccdc6e96e56b822c20ea483eaead57794e101bff3df6ea35fe039fa2dcf2eac98dabebc3decb4129c200490633f05ba5dd4325cec29d28c78887c3de1 SHA512 a8a94c26afc4cc4db6ec2e65e7bff325fbe6816d4a80fb97e2014e202af0f549a77518f0435157985822aa9fd8642b95258b6cf87a9e695f4b9a11b5fe514d86
+DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99
 DIST winnow-0.6.8.crate 159453 BLAKE2B 36ae0b096ab916c1d925d51ce9b4fa072fd687022c3578debf4be852eeed046fd73003c8be2f6e3b0abbd2d3952a23100e79a8e432f516a0ddab2ac7aba4b034 SHA512 64652527221385a1278efb66d25ebbab86cb64d2f71fbf9bc9956dc548ae9d028b998f3aa851a94dba66853da7fbf1bdfcf2dae02ed60b2562869569acf2b583
 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 zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
diff --git a/dev-util/cargo-c/cargo-c-0.10.4.ebuild b/dev-util/cargo-c/cargo-c-0.10.4.ebuild
new file mode 100644
index 000000000000..436b2594d464
--- /dev/null
+++ b/dev-util/cargo-c/cargo-c-0.10.4.ebuild
@@ -0,0 +1,382 @@
+# Copyright 2022-2024 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.18
+	annotate-snippets@0.11.4
+	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
+	arc-swap@1.7.1
+	autocfg@1.3.0
+	base16ct@0.2.0
+	base64@0.22.1
+	base64ct@1.6.0
+	bitflags@2.6.0
+	bitmaps@2.1.0
+	block-buffer@0.10.4
+	bstr@1.10.0
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	bytes@1.7.1
+	bytesize@1.3.0
+	cargo-credential-libsecret@0.4.7
+	cargo-credential-macos-keychain@0.4.7
+	cargo-credential-wincred@0.4.7
+	cargo-credential@0.4.6
+	cargo-platform@0.1.8
+	cargo-util-schemas@0.5.0
+	cargo-util@0.2.14
+	cargo@0.82.0
+	cbindgen@0.27.0
+	cc@1.1.16
+	cfg-if@1.0.0
+	clap@4.5.17
+	clap_builder@4.5.17
+	clap_derive@4.5.13
+	clap_lex@0.7.2
+	clru@0.6.2
+	color-print-proc-macro@0.3.6
+	color-print@0.3.6
+	colorchoice@1.0.2
+	const-oid@0.9.6
+	core-foundation-sys@0.8.7
+	core-foundation@0.9.4
+	cpufeatures@0.2.13
+	crates-io@0.40.4
+	crc32fast@1.4.2
+	crossbeam-channel@0.5.13
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	crypto-bigint@0.5.5
+	crypto-common@0.1.6
+	ct-codecs@1.1.2
+	curl-sys@0.4.74+curl-8.9.0
+	curl@0.4.46
+	dbus@0.9.7
+	der@0.7.9
+	deranged@0.3.11
+	digest@0.10.7
+	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.34
+	equivalent@1.0.1
+	erased-serde@0.4.5
+	errno@0.3.9
+	fallible-iterator@0.3.0
+	fallible-streaming-iterator@0.1.9
+	faster-hex@0.9.0
+	fastrand@2.1.1
+	ff@0.13.0
+	fiat-crypto@0.2.9
+	filetime@0.2.25
+	flate2@1.0.33
+	fnv@1.0.7
+	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.31.5
+	gix-attributes@0.22.5
+	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.38.0
+	gix-credentials@0.24.5
+	gix-date@0.8.7
+	gix-date@0.9.0
+	gix-diff@0.44.1
+	gix-dir@0.6.0
+	gix-discover@0.33.0
+	gix-features@0.38.2
+	gix-filter@0.11.3
+	gix-fs@0.11.3
+	gix-glob@0.16.5
+	gix-hash@0.14.2
+	gix-hashtable@0.5.2
+	gix-ignore@0.11.4
+	gix-index@0.33.1
+	gix-lock@14.0.0
+	gix-macros@0.1.5
+	gix-negotiate@0.13.2
+	gix-object@0.42.3
+	gix-odb@0.61.1
+	gix-pack@0.51.1
+	gix-packetline-blocking@0.17.5
+	gix-packetline@0.17.6
+	gix-path@0.10.10
+	gix-pathspec@0.7.7
+	gix-prompt@0.8.7
+	gix-protocol@0.45.3
+	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.8
+	gix-submodule@0.12.0
+	gix-tempfile@14.0.2
+	gix-trace@0.1.9
+	gix-transport@0.42.3
+	gix-traverse@0.39.2
+	gix-url@0.27.5
+	gix-utils@0.1.12
+	gix-validate@0.8.5
+	gix-worktree@0.34.1
+	gix@0.64.0
+	glob@0.3.1
+	globset@0.4.14
+	group@0.13.0
+	hashbrown@0.14.5
+	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.9
+	http-auth@0.1.10
+	humantime@2.1.0
+	idna@0.5.0
+	ignore@0.4.22
+	im-rc@15.1.0
+	indexmap@2.5.0
+	is_terminal_polyfill@1.70.1
+	itertools@0.13.0
+	itoa@1.0.11
+	jiff-tzdb-platform@0.1.0
+	jiff-tzdb@0.1.0
+	jiff@0.1.12
+	jobserver@0.1.32
+	js-sys@0.3.70
+	kstring@2.0.2
+	lazy_static@1.5.0
+	lazycell@1.3.0
+	libc@0.2.158
+	libdbus-sys@0.2.5
+	libgit2-sys@0.17.0+1.8.1
+	libloading@0.8.5
+	libnghttp2-sys@0.1.10+1.61.0
+	libredox@0.1.3
+	libsqlite3-sys@0.28.0
+	libssh2-sys@0.3.0
+	libz-sys@1.1.20
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	matchers@0.1.0
+	maybe-async@0.2.10
+	memchr@2.7.4
+	memmap2@0.9.4
+	minimal-lexical@0.2.1
+	miniz_oxide@0.8.0
+	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
+	num_threads@0.1.7
+	once_cell@1.19.0
+	opener@0.7.2
+	openssl-macros@0.1.1
+	openssl-probe@0.1.5
+	openssl-src@300.3.2+3.3.2
+	openssl-sys@0.9.103
+	openssl@0.10.66
+	ordered-float@2.10.1
+	orion@0.17.6
+	os_info@3.8.2
+	overload@0.1.1
+	p384@0.13.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	pasetors@0.6.8
+	pathdiff@0.2.1
+	pem-rfc7468@0.7.0
+	percent-encoding@2.3.1
+	pin-project-lite@0.2.14
+	pkcs8@0.10.2
+	pkg-config@0.3.30
+	powerfmt@0.2.0
+	ppv-lite86@0.2.20
+	primeorder@0.13.6
+	proc-macro2@1.0.86
+	prodash@28.0.0
+	quote@1.0.37
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_xoshiro@0.6.0
+	redox_syscall@0.5.3
+	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
+	rusqlite@0.31.0
+	rustfix@0.8.5
+	rustix@0.38.36
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.23
+	scopeguard@1.2.0
+	sec1@0.7.3
+	security-framework-sys@2.11.1
+	security-framework@2.11.1
+	semver@1.0.23
+	serde-untagged@0.1.6
+	serde-value@0.7.0
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_ignored@0.1.10
+	serde_json@1.0.128
+	serde_spanned@0.6.7
+	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.7
+	spki@0.7.3
+	static_assertions@1.1.0
+	strsim@0.11.1
+	subtle@2.6.1
+	supports-hyperlinks@3.0.0
+	supports-unicode@3.0.0
+	syn@2.0.77
+	tar@0.4.41
+	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
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	toml@0.8.19
+	toml_datetime@0.6.8
+	toml_edit@0.22.20
+	tracing-attributes@0.1.27
+	tracing-chrome@0.7.2
+	tracing-core@0.1.32
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing@0.1.40
+	typeid@1.0.2
+	typenum@1.17.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-width@0.1.13
+	unicode-xid@0.2.5
+	url@2.5.2
+	utf8parse@0.2.2
+	valuable@0.1.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.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
+	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.18
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zeroize@1.8.1
+"
+
+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 ISC MIT MPL-2.0 MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/libgit2-1.7:=
+	dev-libs/openssl:=
+	net-libs/libssh2:=
+	net-misc/curl[ssl]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.79.0"
+
+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/ccache/ccache-4.10.1.ebuild b/dev-util/ccache/ccache-4.10.1.ebuild
index 9b08f52780fa..662a6a70978d 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 1ec73774f8a9..30d5343e1cb0 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,4 +1,2 @@
-DIST conan-2.0.16.gh.tar.gz 1000880 BLAKE2B 0ebc7df66e97a8f29ade9d1ffbde5b0f6ed4ac5dd98bab29e9a88d1ae9c864237a396b5c0588f3efb1186f6f22fa1fd0205215b3459fb87fa012febc49ad786a SHA512 bb8d5c1b2df085bc2e1645dd8b14be167b7ed01a47485bbe39994a150ca905de6a194927cb3cecd81d4d7bab613d13ca3779d9aabddf1a2df731bd62ec5bbe39
-DIST conan-2.3.1.gh.tar.gz 1078426 BLAKE2B a3a92342a2cfabc9dd4c22d1665d092dd2a33be8fdd4c3e7243557b845fda8910d713bc34b59d1e4c2b2ead957ef0ff8ad0d23fa80804c9d842b5f9c944323c1 SHA512 405d9979bc79b684509aa756c2aa50decd1b9194e5c7b847b6a9755daed9941c7b9615cf518aedf920eeea0de6dfc194e36b90c2919060a3f276f53692a3fe5c
-DIST conan-2.4.1.gh.tar.gz 1092566 BLAKE2B 7b97f9a274075bf3e9396eba9e3dc4d155c171685fb204c885877ad10dba3f751cab5a28e220d3df3b803aa8f80d080c63c37801ada4b1691724bb8988f34c97 SHA512 b51d491be8202eb7fd60e5d2aef63bd9f43311da73f36edd615210222c32160f35af81ec47351e7762b6583a6d3f6230020130866e0450320d87047439de2767
 DIST conan-2.5.0.gh.tar.gz 1105167 BLAKE2B 2a4a3aba324b3aee968dde721e3659470912ce82eada0c9ffc37c4ff0b4c4b78b2927e3e9cde1f52b1104a3f3e8e32b3d7450643a83c14958c035051a63386a1 SHA512 685cafd0d1ba179d84b7e0e37d0ca5ce95e320e025132e62f3a128a68b085eabeff47bbc0b129d5b8cee17f2955014cb4073b7e648d9f9ccf56c1ee377625e18
+DIST conan-2.6.0.gh.tar.gz 1108424 BLAKE2B d9883900e4c09c2332bc6c3a186c2e010cde237d2b20249317ffaee3bfb182620acac7ab40303fd00810d6420a9676155d09693c89fe5c8a8917144ed654bcac SHA512 7deb8498d992fdebacd8ce8bc77e63089c9389200f010f0e099c73beb22c524c2d288ae643cdddc0cb3ec8494c1f7365fa834ec159c015063cc6fa936e6eb312
diff --git a/dev-util/conan/conan-2.0.16.ebuild b/dev-util/conan/conan-2.0.16.ebuild
deleted file mode 100644
index 41d4ec2a6018..000000000000
--- a/dev-util/conan/conan-2.0.16.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..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/release/2.0/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/release/2.0/conans/requirements_server.txt
-RDEPEND="
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
-"
-
-# Try to fix it if you're brave enough
-# Conan requires noumerous external toolchain dependencies with restricted
-# versions and cannot be managable outside of a pure CI environment.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
-		-e 's:==:>=:g' \
-		conans/requirements{,_server}.txt || die
-}
diff --git a/dev-util/conan/conan-2.3.1.ebuild b/dev-util/conan/conan-2.3.1.ebuild
deleted file mode 100644
index 5562b25af23a..000000000000
--- a/dev-util/conan/conan-2.3.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
-"
-
-# Try to fix it if you're brave enough
-# Conan requires noumerous external toolchain dependencies with restricted
-# versions and cannot be managable outside of a pure CI environment.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
-		-e 's:==:>=:g' \
-		conans/requirements{,_server}.txt || die
-}
diff --git a/dev-util/conan/conan-2.4.1.ebuild b/dev-util/conan/conan-2.6.0.ebuild
index 81aeecdcf691..81aeecdcf691 100644
--- a/dev-util/conan/conan-2.4.1.ebuild
+++ b/dev-util/conan/conan-2.6.0.ebuild
diff --git a/dev-util/cppcheck/cppcheck-2.14.2.ebuild b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
index 088bb97b6b42..efdc1693e60a 100644
--- a/dev-util/cppcheck/cppcheck-2.14.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.14.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="charts gui qt6 htmlreport pcre test"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-util/cproto/cproto-4.7w.ebuild b/dev-util/cproto/cproto-4.7w.ebuild
index 76e369185b61..6d46877f6de7 100644
--- a/dev-util/cproto/cproto-4.7w.ebuild
+++ b/dev-util/cproto/cproto-4.7w.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-alternatives/lex"
 BDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 3693ddc1f984..1231a25a4b2a 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,4 +1,3 @@
-DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8965be5a6d0effad0f85f76c18e62acf7a2de981da05826fbd27c1e55122ba3ca9873729332a9840280d1638838af27c9 SHA512 c7c4de1c53a58b74e632019a9a69b3bac164da72ee3cef839d19c9548707c06ddac5e562013ca86992ca3d78ad96f23521ff69de83b3e9e614a336cc3d6ba9a6
 DIST cucumber-core-11.0.0.tar.gz 202792 BLAKE2B a85074a9bad6b91dcb2b409eee6162efed6890868b762ebd221ea2ab383a029eb7d7f605813e6e73f6bcbf4c526ffb94f26e7338e6cfdd94abf28d631bbd989e SHA512 fd2cb97d72f24e5a5c00336e4243594270546225a027ee23907256d81fdc9be01c017a4d25dea85727ca834a6d3e3fb1ae003357cf530eab9d44fc211d52f331
 DIST cucumber-core-11.1.0.tar.gz 200962 BLAKE2B 5ac40ca2114a925c93f98b363443b560f24f5103c23e6ec3ae429cfdd1c1039367a64212a87c6079aacc94a2da757f2e8f889d57f6a46ceff5ff58810101e86e SHA512 02918828b9f626ac9a6d451b5d8ce4f19df01cd628c008c4a1b2b926f27d6af1353ce4bde5cd05bd1ce560449e37cc2db971049a4b8230f0c85cf0b05d0a462d
 DIST cucumber-core-12.0.0.tar.gz 200773 BLAKE2B f0cc2fbfdd6e79492d95a0ab66c74d1be8c173debeceedaa2b7b563cf0d6c70c86a00e3f2957b238b6d804fc78e2a27ad0003622ba7868be2960fded04f1d456 SHA512 58c0f1f7437aa5f55b3b07b36c66c616fd0c838659f346ed8cfc216fe98bce6d0de2ed52645c7fffa80f2f31c67298b6f4d881ec8d077e2eb33430ef88f0387a
diff --git a/dev-util/cucumber-core/cucumber-core-10.1.1.ebuild b/dev-util/cucumber-core/cucumber-core-10.1.1.ebuild
deleted file mode 100644
index 5764657f5b9c..000000000000
--- a/dev-util/cucumber-core/cucumber-core-10.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-core-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-gherkin-22.0.0:22
-	>=dev-util/cucumber-messages-17.1.1:17
-	>=dev-util/cucumber-tag-expressions-4.0.2:4
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index c74694ef9e4e..d532a1cc6c2d 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,6 +1,5 @@
 DIST cucumber-cucumber-expressions-15.1.1.gem 25088 BLAKE2B bc9990d11994a5c094b23a2d8bccf283d0c035507d7140128acae674faa70d1b8927bce6069b82bc530b28b4867ae6be3f168847e0d6db036211a5fd13defb06 SHA512 ceda830ca22e388169db41c85343f9adbe918ac76a5cfaefd55ca3d2815ec826eb592ba70771f0cf41bfefe8e42d9afbcfeb8c384cfa30687e9c0c023164fbe3
 DIST cucumber-cucumber-expressions-15.2.0.gem 25088 BLAKE2B 3e0a9283cdf1a9488826260a98358612847945e287ed0f4b011c697fa6aabd340974705d5eb338464fdaee938090ea83b8c912820517b9a2b0cfa0c81b554d5c SHA512 c4f72a6e096794598f94318ef21ac7586328229db4ec5d6791abc3d36319e798d3bddc91fdc9d56a3741ae8ce082deeec153b66d8904683e3038b1161b84fcf7
-DIST cucumber-cucumber-expressions-16.1.2.gem 23552 BLAKE2B e578e45901d5212f85e86ce6737c24ecbb0fce5204ed459e89270c27379bb13935ee12b94f618382c1a4c80ccc0cbfb8faea79da105b0f11a35e11c436c37abd SHA512 221b5aee604895dd0835df8ef19363b8060b99341c51f636e35be52ec0bff7100a88ad33a86420b849161b2c62e5d039b1f11d720374544abe9667a8544ee4c5
 DIST cucumber-cucumber-expressions-17.0.1.gem 25088 BLAKE2B 2d85d1ad5498d546df73a919a56f54a566bee0c686d2549bc4efb3e8970a057ef068fe2d498f393367094526afa5c14cbb7d1fbbaa05086801931d9ca99c72bb SHA512 6b89a4aad515cd4894859a549037ac9ea25c470c26106680bd825595e497883177944da7ec35f4f2e8e2c0cd872808ba0ef93133c91e8e889589db96251f74f6
 DIST cucumber-cucumber-expressions-17.0.2.gem 25600 BLAKE2B e8457e48950ca0dae95c6523adff66c2e479eec4ee09210c41b5407a9ef8f19b1c1c7c59ab306f0b8be0bbe4c88cc29ef43ff7514ea5f6ff0ea0c1baa1bd878c SHA512 24cce30d5b6fbf8ac0991c7e04a8fb26a15bc6676a0b9601813053ebd3388641a9dedc55bf45cd09bb7da730f2eba7264cab58d0035afda463c0620861ba07e5
 DIST cucumber-cucumber-expressions-17.1.0.gem 25600 BLAKE2B 76be703f509ffb31304724bc26a45d9b565efeeb5a1fd54e20cf7b4076fd1232630a11e6af3deb602019dd78ee97087036e97692040bee682cd29c1e1d40952a SHA512 3935be2541d874a746713416f43934dafab6b59a9417ce40a9ba038541fa0f8a6b8b5c55e4a97a0b00faa10c29e161e5426a7400ca4e003aff31d954ca263343
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-16.1.2.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-16.1.2.ebuild
deleted file mode 100644
index aa43538dd470..000000000000
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-16.1.2.ebuild
+++ /dev/null
@@ -1,16 +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"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 52eb34ec7ba1..aab93033aa0b 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-html-formatter-19.2.0.gem 478720 BLAKE2B 1f2f6b2f93d63207cb2bb6e23ad14d71eb06a8363c7af7f417e4755ffffb2beabe8502ed5d82a881c072b911a42cb1fc2f1809e7326c223c00c25a36482d052b SHA512 c5f1453677b4df5e9091721bbb15a522f5c91cbcb2cb11a8c1d8f2577d8b3b93810698447a1fe1f2b80dc52a1bf798ffcb876b2c728ceaf109f1997a2fdde249
-DIST cucumber-html-formatter-20.4.0.gem 592896 BLAKE2B 48fcdc7dacf354973b25c745c0f86334f882766e6d3776cdcbdbf574b69bd01550d43417fbb55d99c01f8485d174dd3e64a3b4aaeb33a577c3ab3b87318029c0 SHA512 c60b8a084bd0c05c9659e9cfb327194975d9eabf6dd39e282d3ff343df740f0fd13a2d854d3b095064ea3df04e73ba0324102f5fbd05b3cf98498420a036005e
 DIST cucumber-html-formatter-21.3.1.gem 272384 BLAKE2B cc6dd87f1a3ecf312b0310a032fe26d7177edfd0242e9f98f817e3b11882cf4e5244b6fe43408aee9cec715374c5051087f3eaa9b5b38e5bed4ebec108ffc5f9 SHA512 04fe71ef8dca04491737f61fe0b6858f85ba09cc78a2796f20055612b4125b877faf8b6fc3b0dda2c6e3809ee6360f6bc97c8a7422b8e7beccb67d024b18c894
 DIST cucumber-html-formatter-21.4.1.gem 273920 BLAKE2B c0fb1402118d5aa670346953a5f9322fe848e1006ef8b3cf5e8169d46269d8d15c1d452301c167220fefce1775e311282bbd3d9ede9088440f8148b67ea0e691 SHA512 968b74210c34b227e66b614c613333b683097e425747d54f0cf0f76360cc0f97095022bfb94737bd882b766ba5db1264057c753d341585eedb94f891993e09fb
 DIST cucumber-html-formatter-21.6.0.gem 271872 BLAKE2B dc7ed26539d298e7df5cb7c8809b66a7cde98c596df6537aa19436325d322b49dfc0c17fd899ed072983634f9c3de340a2612ea9221cf25a189bbb7553176eda SHA512 51046ac0dd5ecfe93e89c7b19a211af49c4e93ea613a073711c6a4351e3f2b0f478099c54a6ba60ea2b02aa81905ca0b618980a3058680b179cb32dcde85783a
+DIST cucumber-html-formatter-21.7.0.gem 271872 BLAKE2B 1fd904e5915ce8551b127ae873af9a98e8d48c9832426f60342a12d7a6fbe2c7291bd0703cea99796c958c8ea96a2e1528932fadc4f521f28c17d84b6742df08 SHA512 d5c489d4af2d681f3c43b6ba34f9edca9a23e271c5d7246c3a7e642639c0d274f240f3bdb7abb5cd6498d0f76e42b03e611b6304c4ce070d3adfa4ac93ce3a0c
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-20.4.0-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-20.4.0-r1.ebuild
deleted file mode 100644
index b156812777ec..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-20.4.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
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-19.0.0:19
-	!<dev-util/cucumber-html-formatter-19.2.0-r1
-"
-
-ruby_add_bdepend "
-	test? ( dev-util/cucumber-compatibility-kit:10 )
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>19.0"' spec/*_spec.rb || die
-}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.7.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.7.0.ebuild
new file mode 100644
index 000000000000..6a2e1177674c
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.7.0.ebuild
@@ -0,0 +1,32 @@
+# 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_EXTRAINSTALL="assets"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+
+# Can be used for specs but requires assets to be created from npm
+#SRC_URI="https://github.com/cucumber/html-formatter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+#RUBY_S="html-formatter-${PV}/ruby"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+# Specs are no longer available in the distributed gem
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-util/cucumber-messages:22
+	!<dev-util/cucumber-html-formatter-19.2.0-r1:19
+	!<dev-util/cucumber-html-formatter-20.4.0-r1:20
+"
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
index 4e192a93a3f6..1db57ea08fc7 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 8a1da68118df..c922e1ed4c56 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,4 @@
 DIST diffoscope-266.tar.bz2 3148610 BLAKE2B 28090b8a1e2315f9df43d254d3dbd4ed8f6d4ba4d259c764f53b84137ac0b3dc97b51df56ba595eee950c54974e9b6109c423392d198e277d520f11559ecd78e SHA512 2eb7cbd333b6559ba0f66647184f1747cac52cca6304a27eefe914329797469d5fb9519abe92386d3785f4f2c779f8f5dd95ecc8f54f8b08fd4fc94746bf273d
-DIST diffoscope-268.tar.bz2 3151657 BLAKE2B 2133611135347a9babfb55972ef5d456cc274634facc07ea8dc2c214147507d223a6fd8cf24541c04fc19c3510c7548bdaa5549f5587c9d99de7b61e64bd2f7d SHA512 9a0f3c81e9beb171fdef8282ac3938a5534f894437f898ab1437cdeb30a12c7fb8a1a494479f46c41d65e78fe014b8c1e510a72d0673f3d0d769d71c4af12a5d
-DIST diffoscope-271.tar.bz2 3155727 BLAKE2B fa4ee93158cf41215d071aa3caa1956325fdbb1e4f1a9e392485117cb58b8142ac7f326cd650e72440a2512a08aa2c6a7d9c64a0fa8bf9768c9f0d97a45d872e SHA512 f5688d82313f54a9b9db88c406cdd67f13aeb65a8aa844fa41a944f6beaa0b2189175c891ddaf3b345492141472ce0366fd22691c2c89fd9a3d8c0b8d62f476c
 DIST diffoscope-272.tar.bz2 3155265 BLAKE2B 76f8475993dc8be7297b50a2dda71b965789f6de04143e22b3b28c25e6646d9744088a49181faeb488921eb192b85072d16fee35f41450ba389c491e6a43c7b5 SHA512 f74d0166526da10604f25ba0425d3acc540cb92780776d108b60b07d00fa1039ea5a3fde4fd260497e0cf6ae387457e6fff989c5795bca6ce14199f0c9a15174
-DIST diffoscope-274.tar.bz2 3165288 BLAKE2B 287d4ef0b4ba298a37659cc5599a06d520f3b751bfcf486def6279bbb80e7c72557fcca2ece900d74a8b44c3f9118b7ba8ed2e0933c60671c8c73ae43ea26f30 SHA512 dc0b804fa67bb7e01a3eb1814dbfe25e5d0069c43990b98d6c94dcb40b454e10f5aa20512559fbbd450e6e30f635c6f5dc03afb63e0d25bc04d5e617c7505f0b
+DIST diffoscope-276.tar.bz2 3145876 BLAKE2B 734c35c40f04c843066754e1852f0c2fab90ec90f3700d593bf3439193aea89b747aec2759413eb2e3bdbde49dfdae3cfc6accf4178ec116265454ff75f1db45 SHA512 3891456fbc703b369acfe44daa80b9be68fbe62853c5506617b1f007a8b61e8dd55a7094b9df87c71aedbc2e28f1e5ecc354f51032d8cfe5823a0db29cb284c9
+DIST diffoscope-277.tar.bz2 3143869 BLAKE2B 98f0356060c8430236941ff9ef45c51d34d681a0cb8f8085bf40775aaa98c4c97add603d954b235f8615c539fb591eab3d812261f3b33dbeaee8418fabeeb5af SHA512 7ecc32204ed420ca2547976bd0548f4b9a4dd2cebacbeb2a3faf0fa6ac4015724abb6a764a81f20aea20dafc871b7fb262eeac81b86a1cd9cdfa42353178ea0f
diff --git a/dev-util/diffoscope/diffoscope-268.ebuild b/dev-util/diffoscope/diffoscope-268.ebuild
deleted file mode 100644
index 1761b40e36fc..000000000000
--- a/dev-util/diffoscope/diffoscope-268.ebuild
+++ /dev/null
@@ -1,151 +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..12} )
-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 ~ia64 ~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/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? ( sys-devel/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]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-7zip.patch
-)
-
-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
-
-	# Fails with perl-5.40
-	# https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/377
-	tests/comparators/test_epub.py::test_differences
-	tests/comparators/test_zip.py::test_metadata
-	tests/comparators/test_zip.py::test_extra_fields
-	tests/comparators/test_zip.py::test_commented
-)
-
-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/diffoscope/diffoscope-271.ebuild b/dev-util/diffoscope/diffoscope-271.ebuild
deleted file mode 100644
index 10e254dd5ac3..000000000000
--- a/dev-util/diffoscope/diffoscope-271.ebuild
+++ /dev/null
@@ -1,147 +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..12} )
-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 ~ia64 ~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/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? ( sys-devel/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
-
-	# Fails with perl-5.40
-	# https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/377
-	tests/comparators/test_epub.py::test_differences
-	tests/comparators/test_zip.py::test_metadata
-	tests/comparators/test_zip.py::test_extra_fields
-	tests/comparators/test_zip.py::test_commented
-)
-
-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/diffoscope/diffoscope-272.ebuild b/dev-util/diffoscope/diffoscope-272.ebuild
index 859debdb153f..c22041eee98b 100644
--- a/dev-util/diffoscope/diffoscope-272.ebuild
+++ b/dev-util/diffoscope/diffoscope-272.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~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-274.ebuild b/dev-util/diffoscope/diffoscope-274.ebuild
deleted file mode 100644
index dfbbd82decc6..000000000000
--- a/dev-util/diffoscope/diffoscope-274.ebuild
+++ /dev/null
@@ -1,144 +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} )
-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 ~ia64 ~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/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? ( sys-devel/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]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-new-zipdetails.patch
-)
-
-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/diffoscope/diffoscope-276.ebuild b/dev-util/diffoscope/diffoscope-276.ebuild
new file mode 100644
index 000000000000..fd3be77a70af
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-276.ebuild
@@ -0,0 +1,140 @@
+# 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} )
+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 ~ia64 ~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/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? ( sys-devel/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/diffoscope/diffoscope-277.ebuild b/dev-util/diffoscope/diffoscope-277.ebuild
new file mode 100644
index 000000000000..fd3be77a70af
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-277.ebuild
@@ -0,0 +1,140 @@
+# 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} )
+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 ~ia64 ~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/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? ( sys-devel/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/diffoscope/files/diffoscope-268-7zip.patch b/dev-util/diffoscope/files/diffoscope-268-7zip.patch
deleted file mode 100644
index 4f7464c07a33..000000000000
--- a/dev-util/diffoscope/files/diffoscope-268-7zip.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2a361d7dff135d3e832161f587a55a62fcbec9f2
-
-From 2a361d7dff135d3e832161f587a55a62fcbec9f2 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sat, 25 May 2024 22:41:53 +0100
-Subject: [PATCH] Amend 7zip version test for older 7z versions that include
- "[64]" string. (Closes: #376)
-
-Without the change `7z` test fails with assertion errors:
-
-    FAILED tests/comparators/test_sevenz.py::test_metadata_diff - AssertionError
-
-This happens because version guard did not work for my ancient `7z`:
-
-    $ 7z | head -n2
-
-    7-Zip [64] 17.05 : Copyright (c) 1999-2021 Igor Pavlov : 2017-08-28
-
-THe change attempts to skip `[64]` identifier. Tested on 7z 17.05 only.
----
- tests/comparators/test_sevenz.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/comparators/test_sevenz.py b/tests/comparators/test_sevenz.py
-index 1582a0f4..91974701 100644
---- a/tests/comparators/test_sevenz.py
-+++ b/tests/comparators/test_sevenz.py
-@@ -38,7 +38,12 @@ def sevenz_version():
-         out = subprocess.check_output(["7z"])
-     except subprocess.CalledProcessError as e:
-         out = e.output
--    return out.decode("UTF-8").split()[1].strip()
-+    words = out.decode("UTF-8").split()
-+    # 7zip 17.04 returns version after "[64]" identifier:
-+    #   "7-Zip [64] 17.05 : Copyright (c) 1999-2021 Igor Pavlov : 2017-08-28"
-+    if words[1].startswith("["):
-+        return words[2].strip()
-+    return words[1].strip()
- 
- 
- def test_identification(sevenza):
--- 
-GitLab
diff --git a/dev-util/diffoscope/files/diffoscope-274-new-zipdetails.patch b/dev-util/diffoscope/files/diffoscope-274-new-zipdetails.patch
deleted file mode 100644
index 3ddc99c107fc..000000000000
--- a/dev-util/diffoscope/files/diffoscope-274-new-zipdetails.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/e6ef110086bcb1272c37b44074fcb083ed0c9b41
-
-From e6ef110086bcb1272c37b44074fcb083ed0c9b41 Mon Sep 17 00:00:00 2001
-From: Chris Lamb <lamby@debian.org>
-Date: Tue, 13 Aug 2024 11:13:17 +0100
-Subject: [PATCH] Update test_zip text fixtures and definitions to support new
- IO::Compress changes. (Closes: Debian:#1078050)
-
----
- tests/comparators/test_zip.py            |  8 +++--
- tests/data/zip2_zipdetails_expected_diff | 38 ++++++++++++------------
- 2 files changed, 25 insertions(+), 21 deletions(-)
-
-diff --git a/tests/comparators/test_zip.py b/tests/comparators/test_zip.py
-index 570931ee..303b6f80 100644
---- a/tests/comparators/test_zip.py
-+++ b/tests/comparators/test_zip.py
-@@ -93,6 +93,7 @@ def test_compressed_files(differences):
- 
- 
- @skip_unless_tools_exist("zipinfo", "bsdtar", "zipdetails")
-+@skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
- def test_extra_fields(differences2):
-     assert_diff(differences2[0], "zip_bsdtar_expected_diff")
-     assert_diff(differences2[1], "zip2_zipdetails_expected_diff")
-@@ -148,11 +149,14 @@ def jmod_differences(jmod1, jmod2):
-     return jmod1.compare(jmod2).details
- 
- 
--@skip_unless_tools_exist("zipinfo", "zipdetails")
-+@skip_unless_tools_exist("zipinfo", "zipdetails", "zipnote")
- @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
- def test_jmod_metadata(jmod_differences, jmod1, jmod2):
-+    assert jmod_differences[0].source1 == "zipinfo {}"
-+    assert jmod_differences[1].source1.startswith("zipnote")
-+    assert jmod_differences[2].source1.startswith("zipdetails")
-     assert_diff(jmod_differences[0], "jmod_zipinfo_expected_diff")
--    assert_diff(jmod_differences[1], "jmod_zipdetails_expected_diff")
-+    assert_diff(jmod_differences[2], "jmod_zipdetails_expected_diff")
- 
- 
- def test_encrypted(encrypted_zip1, encrypted_zip2):
-diff --git a/tests/data/zip2_zipdetails_expected_diff b/tests/data/zip2_zipdetails_expected_diff
-index d764a818..291dca88 100644
---- a/tests/data/zip2_zipdetails_expected_diff
-+++ b/tests/data/zip2_zipdetails_expected_diff
-@@ -1,19 +1,19 @@
--@@ -36,16 +36,16 @@
-- 0054 Uncompressed Length   000001BE
-- 0058 Filename Length       0008
-- 005A Extra Length          001C
-- 005C Filename              'XXX/XXXX'
-- 0064 Extra ID #0001        5455 'UT: Extended Timestamp'
-- 0066   Length              0009
-- 0068   Flags               '03 mod access'
---0069   Mod Time            558AB455 'Wed Jun 24 13:44:53 2015'
---006D   Access Time         558AB45F 'Wed Jun 24 13:45:03 2015'
--+0069   Mod Time            41414141 'Fri Sep 10 05:53:05 2004'
--+006D   Access Time         41414141 'Fri Sep 10 05:53:05 2004'
-- 0071 Extra ID #0002        7875 'ux: Unix Extra Type 3'
-- 0073   Length              000B
-- 0075   Version             01
-- 0076   UID Size            04
-- 0077   UID                 000003E8
-- 007B   GID Size            04
-- 007C   GID                 000003E8
-+@@ -44,16 +44,16 @@
-+ #
-+ # WARNING: Offset 0x5C: Filename 'XXXXXXXX'
-+ #          Zero length filename
-+ #
-+ 0064 Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
-+ 0066   Length              0009 (9)
-+ 0068   Flags               03 (3) 'Modification Access'
-+-0069   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
-+-006D   Access Time         558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
-++0069   Modification Time   41414141 (1094795585) 'Fri Sep 10 05:53:05 2004'
-++006D   Access Time         41414141 (1094795585) 'Fri Sep 10 05:53:05 2004'
-+ 0071 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
-+ 0073   Length              000B (11)
-+ 0075   Version             01 (1)
-+ 0076   UID Size            04 (4)
-+ 0077   UID                 000003E8 (1000)
-+ 007B   GID Size            04 (4)
-+ 007C   GID                 000003E8 (1000)
--- 
-GitLab
diff --git a/dev-util/directx-headers/Manifest b/dev-util/directx-headers/Manifest
index 8a8197ebfb0e..3a8619f2cf66 100644
--- a/dev-util/directx-headers/Manifest
+++ b/dev-util/directx-headers/Manifest
@@ -1 +1,3 @@
 DIST directx-headers-1.613.1.tar.gz 449088 BLAKE2B 64e19960029842bd9c3b03b00718b12ab44b2f2b04678e4190b2f03fb57c559b2ce54692dd04278c10aeb5b3c9078a31793ff530c4011691f859ed444c9a9ac5 SHA512 a450b989f1a066f81ef24d269b0415e2f0256bcecb14a4efa75416acb97c56e036faa0db3a0d2dac7fb87d47193adc1a4a34b22c6c0019dfbf89e015d727e374
+DIST directx-headers-1.614.0.tar.gz 458121 BLAKE2B b81c9f904c50178dc794dd57cc5d406340cdbd3f53a9f5f542bd396080adc6cf83d5ed175ba8f2ce70cce9e995e7daa84bed2bfa35181098718808b9d476b605 SHA512 5f78c8d47d02c1620b4ef4b379f0598e000c7aef367d694d37f796978019383911d0778434bff5a635f8d1c688595896337dbd31dacdca3e37af91b51be98b08
+DIST directx-headers-1.614.1.tar.gz 458944 BLAKE2B 7c23727450d98e2dc4dcdc04119c380683c6789bb969bf3a4e29dc1b44479f3cb063238f18805332171227e41f8a8539d6f87ec26ba7a6c8cb3a394f0f818cc2 SHA512 934108052b9aa54b888c301f358a9d5b8f9ce1a5902e33b80c3273c963d10984faa7da167f1fed203462fe016e30443cb5e0d014de63fc9c0a81a674f757a7a9
diff --git a/dev-util/directx-headers/directx-headers-1.614.0.ebuild b/dev-util/directx-headers/directx-headers-1.614.0.ebuild
new file mode 100644
index 000000000000..a206503ba728
--- /dev/null
+++ b/dev-util/directx-headers/directx-headers-1.614.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=DirectX-Headers
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/microsoft/${MY_PN}.git"
+	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"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="DirectX header files and WSL stubs"
+HOMEPAGE="https://github.com/microsoft/DirectX-Headers"
+
+LICENSE="MIT"
+SLOT="0"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dbuild-test=false
+	)
+
+	meson_src_configure
+}
diff --git a/dev-util/directx-headers/directx-headers-1.614.1.ebuild b/dev-util/directx-headers/directx-headers-1.614.1.ebuild
new file mode 100644
index 000000000000..a206503ba728
--- /dev/null
+++ b/dev-util/directx-headers/directx-headers-1.614.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=DirectX-Headers
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/microsoft/${MY_PN}.git"
+	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"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="DirectX header files and WSL stubs"
+HOMEPAGE="https://github.com/microsoft/DirectX-Headers"
+
+LICENSE="MIT"
+SLOT="0"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dbuild-test=false
+	)
+
+	meson_src_configure
+}
diff --git a/dev-util/egypt/Manifest b/dev-util/egypt/Manifest
index 66eb3284c795..0ac1aa2effb6 100644
--- a/dev-util/egypt/Manifest
+++ b/dev-util/egypt/Manifest
@@ -1,2 +1 @@
-DIST egypt-1.10.tar.gz 4670 BLAKE2B 66ec84fec092cc8e0e29a866cca4d574ce069af395a9bdfb05e0124390e0a01907a3fc6a0dc94a1bdc652166c4deafd7b8ef03d9808133c584df3827c1803371 SHA512 81e98b3d379301f1c0919aeb46d45264772b7d9d77277cb842c8ed7b944d61918e530f4e9e2c56451445dc2c6a312fd76086a81e193540baa3d56f3bb56b438d
 DIST egypt-1.11.tar.gz 8808 BLAKE2B 11ce73c0e087c90c8f5fbc0a990c8e33033da2d469de4688a6f5f4eb62ed1e85140d75d0f02774f6b89da0137723a767dc712124bb54b50b526319beba37e698 SHA512 6817ba991c3908f601977499481a1b28a6ab8ce9961749b7c6ef516cc2cd7daf355fc0fd5a4a4577c5d2201fe8e74cda498a6e2083f21f0113f7e7ce69b834e6
diff --git a/dev-util/egypt/egypt-1.10.ebuild b/dev-util/egypt/egypt-1.10.ebuild
deleted file mode 100644
index bbe52b762db3..000000000000
--- a/dev-util/egypt/egypt-1.10.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Devilishly simple tool for creating call graphs of C programs"
-HOMEPAGE="https://www.gson.org/egypt/"
-SRC_URI="https://www.gson.org/egypt/download/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 4a29c8469b00..ae05cf51db20 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -1,2 +1 @@
-DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
 DIST ELFkickers-3.2.tar.gz 108555 BLAKE2B d9ed0c6a2a782e7178480436d526674661af1f625788a28c8e41b97cabb1412f083b492fd36778de17ded7d123003dde878a45af9a63cf7c1e7bff860dc3a0d1 SHA512 ea8b274030880579a44149a1c093e0dce2d9889729f5b4bf1a998d97a78f9bb3cf3fdec807eafda964060fd464a44d4992b35a397737724f7f95732186b8b3ea
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
deleted file mode 100644
index 17da43f9da49..000000000000
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PN=${PN/elf/ELF}-${PV}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips sparc x86"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
-	"${FILESDIR}"/add-freebsd-elf-defs.patch
-	"${FILESDIR}"/${PN}-3.1-AR.patch
-	"${FILESDIR}"/${PN}-3.1-CC.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
-		|| die "sed failed"
-}
diff --git a/dev-util/elfkickers/elfkickers-3.2-r1.ebuild b/dev-util/elfkickers/elfkickers-3.2-r1.ebuild
new file mode 100644
index 000000000000..86fbed24a016
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+
+DESCRIPTION="Collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+S="${WORKDIR}"/${MY_PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~mips sparc x86"
+
+BDEPEND="app-misc/pax-utils"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
+	"${FILESDIR}"/add-freebsd-elf-defs.patch
+	"${FILESDIR}"/${PN}-3.1-AR.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CC
+
+	sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	# bug #795240
+	emake -j1
+}
diff --git a/dev-util/elfkickers/elfkickers-3.2.ebuild b/dev-util/elfkickers/elfkickers-3.2.ebuild
deleted file mode 100644
index 7e2dc5872307..000000000000
--- a/dev-util/elfkickers/elfkickers-3.2.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
-
-inherit toolchain-funcs
-
-MY_PN=${PN/elf/ELF}-${PV}
-
-DESCRIPTION="Collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
-S="${WORKDIR}"/${MY_PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips sparc x86"
-IUSE="doc"
-
-DEPEND="app-misc/pax-utils"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
-	"${FILESDIR}"/add-freebsd-elf-defs.patch
-	"${FILESDIR}"/${PN}-3.1-AR.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
-		|| die "sed failed"
-}
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-CC.patch b/dev-util/elfkickers/files/elfkickers-3.1-CC.patch
deleted file mode 100644
index b1541d5cb179..000000000000
--- a/dev-util/elfkickers/files/elfkickers-3.1-CC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/790611
---- a/elftoc/Makefile
-+++ b/elftoc/Makefile
-@@ -30,7 +30,7 @@ out.o     : out.c out.h gen.h readelf.h pieces.h address.h shdrtab.h \
- elftoc.o  : elftoc.c gen.h readelf.h pieces.h address.h outbase.h out.h
- 
- elfnames.c: mknames
--	echo '#include <elf.h>' | gcc -E -dM -xc /dev/stdin | ./$^ $@
-+	echo '#include <elf.h>' | $(CC) -E -dM -xc /dev/stdin | ./$^ $@
- 
- mknames: mknames.o
- mknames.o: mknames.c
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
deleted file mode 100644
index 846a58aa41a3..000000000000
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool to write command line option parsing code for C programs"
-HOMEPAGE="https://www.gnu.org/software/gengetopt/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="sys-apps/texinfo"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -i configure.ac || die
-	sed -e '/gengetoptdoc_DATA/d' -i Makefile.am || die
-
-	eautoreconf
-}
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 07e4d99dd533..798070a334d4 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -19,6 +19,7 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
 DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16
+DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST bat-0.22.1.crate 1629720 BLAKE2B ae544b309bcd554515bc1af7458532c82889f0dbe5ab57ba19a6ab3ef6fa77958f96539584206c2b595dc6a9cef11fef194b0dd05c305a9f6b3a6d3efd4f2027 SHA512 cec67fd951804746a458c6d90199c65cb110cefe9249d20d7fd1f80a668d5c9bcb26d4115849b498134e3b1243ab25cead662d8a94d077cc064d7971475e91e7
 DIST bat-0.24.0.crate 2575530 BLAKE2B dbc09f6046181f07db2eed7af1e754934be74b25ffa942c9b18ca02d701c50a8adc6a5d1835aac1b8eacb42988a0671db6eea66158e99b3bc18bcc2eb22b359a SHA512 54ab9c32543d678004f757d51a39cf4532c9398f8df751438b1827d5c80c0bfed4244c8cb9896f318492d1df13de93566d732cc441de1b85735d36742a865128
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
@@ -95,10 +96,21 @@ DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc
 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 futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
+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-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-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
+DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
+DIST futures-timer-3.0.3.crate 19739 BLAKE2B b7af71c761197056a6a4db03caa30f31c104de0049c09f52b18b80718ad20c95e0e64bc7a3618c29d1c9a5ef0309379044fdd9c1fee8465930d28b2c58927733 SHA512 c50388e38b45dce2a65a8d7ce56bcd9c3544ae677158c4c10c532136e861c16f0f52df5222a14c0f40ad8e4faf93fde8223affa7fd84d24e95aa6994177e7e76
+DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
 DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST git-delta-0.16.5.tar.gz 506739 BLAKE2B 28e88c84fc299c3b148eb71bcc3de26dfc5d52140e79d188d71d2a8c902485e06ed62c09826cdf22c7d97f6aeab42e5c39d09b26aac49afcacf4cecd0c690ff3 SHA512 76475159ad659261dea3f60e5ee340d64f16031b59387602a6b962f854e5c88e5ad1613715ea0581197d8b829c75326d25c9550d0899957a0ce7e4dd5d3046a9
 DIST git-delta-0.17.0.tar.gz 515536 BLAKE2B 45af5d1391a3623c947ed74bde530fa4511dd16826dea808a3846b11a5da9a737d9768cbc08684010794cf766291100aaaf4cd942907932766ac73a64d9b63eb SHA512 7b3d4aa9bad2f3dc920d9855163e81813ea5467cd92939d4781ed3d896d10bb39110265d5294967c79f8451e8a6d3d4def7e42efb4064f3d5fbc5d99e5c245a6
+DIST git-delta-0.18.1.tar.gz 531491 BLAKE2B 1ee2f6215a2e7db7c0388fceff3e8eee6371a8946a8a100552ba3b0850fcdee2b45b6c1e12dd9902674c92816ca55247f4884ba849d96087214c03feb30f880f SHA512 545d753b5e9981d87f356e123d3e7f99340adbca5b963e67a2fa5291cc4e6a175462554c50733ad30931e39e7e615bcd0cfb1490c26968b12fe172edddf352e7
 DIST git2-0.16.1.crate 199956 BLAKE2B bf187855d683b13ec8ec0e103f6536fc2d8321d2a023eebca907a15f0bba760f833cce4a4b0958804675aeae1ee9d2dc0270edf02c66cc2d7231980ba7ab15d1 SHA512 4963798b6d9fc087a4394515b0f6da0a9e01fcbc220dc3d1880a277ea0487083ac05c0bc3a52a537885eb065a9b2209658a199835457b38c94e45395ad8d6252
 DIST git2-0.18.2.crate 212536 BLAKE2B fffdea2d9a279ec6c371b03489f85039a50250bed9177ebb82090b74a7deddb988b3456ac7e7323be00822e3c243820839f00bd2478cc4d17d0d5d9ad943b4c6 SHA512 d7b7f61ee2c074da28b85bce8475d1b0b953e047ddea70d834fbcffc58a910f0fee3cb91b6e3a0e6fd14b76d142ea02909330db0266299b73c743463a8443a99
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
@@ -120,6 +132,7 @@ DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabe
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600
+DIST insta-1.39.0.crate 87049 BLAKE2B c37b99bb8dde3fcac0b8a41e7e2a76a014fb0919d0cd2eb10b0e4aecd9ee312737313a4c262f8237ca5c9a12ca0c23b5c2ae7bb9ba69c2bb506ab43f382ff108 SHA512 6d50e49af1b76ac53962565d37e05a3fa5b9dae47655529cb675b498a0308ce6008d9c2821e4cc323c2e05560f76539572a7d8881d151e015b32444b02175e5d
 DIST io-lifetimes-1.0.5.crate 35939 BLAKE2B e52a66b90464bc799889c5fe32d8269fa125d5eddec709e2daeb9a0b5db20c5fa5b5f51dcca2b130b75b1980e42e2aa5e892e6133b9d7f8f0b3172856e6808f8 SHA512 73b884426e26c19e65e25bb44c6255f1c46178d946306d39088350151253c2b96760ac9df84a01609f50bbfc79680a58e9a2490a14f2bef2ca7d4c11f4faba2a
 DIST is-terminal-0.4.4.crate 7744 BLAKE2B 051334469f476582dc6443b432bd476e497dcf26ee9d6ed9bd8ab4521ef87184615a5acd2d912ad8ff0cb552ba31c27a706d009c32b62cece180414ddfe27c9a SHA512 7b5906277f65876a6ef66b25b0ad44358a8823c1f69e4700b31418b78ed37398d37bd3e074e82d9fb4dc18863bc316064dbab70b542849fe3c5a079a7334c9c5
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
@@ -132,6 +145,7 @@ DIST js-sys-0.3.66.crate 80765 BLAKE2B 366f2741a1f7bc76f78068e183080bc221d45fb9a
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libgit2-sys-0.14.2+1.5.1.crate 1742257 BLAKE2B 028e6bf6980d7a54b76c918fcd499684869f14cb160e821d6657e59925d142655dae6e018c9f29389de304ef6109197fd71e6e6752d0d0a53152f2c4820ea1a3 SHA512 eb9602706036ea62ecbc08250f297119a1c51ea09ea86ae8630dc6d0521b74db96d8eccc4106343572eb70d9a156415c017c6a91fb5529100fbed091ff8e7921
 DIST libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b SHA512 45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
 DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
@@ -154,6 +168,7 @@ DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a9
 DIST ntapi-0.4.0.crate 126602 BLAKE2B fb6ce09970a93eb45ce0e72d6c79474094aa5cd49feba3d780a00e756a2abc2e57bbf35f9683d09b8be979a6241daa1a84ed8b766c192670e0135438fb05eda5 SHA512 481833f9abebe412912c1228a81f733c64758860a71d300424ed3fbb6863d74af4e3538c14f67b411d4398ab9ef5d549dfcc0ca22b1c49b0a696d1eb4d233703
 DIST ntapi-0.4.1.crate 126552 BLAKE2B ef5291a32f5edab4b29648fcc73df30f993558e45ed862a62a4d7e85f963f195f0a74c9e61eecf928c8966799da45a23694d0c6a1ad5f7d9ab3a8bce86d6d2eb SHA512 8e32d45a508d20f0d3537e056f363270120980dc23564713306e36acbc12a6d379eb3857026fecc16ca75080431e06742e3806801d3e0a848a01f64a8dd4f2d7
 DIST nu-ansi-term-0.49.0.crate 28211 BLAKE2B 057f2d9a3b6fa773e5b8b7b33eb0bd588db3310f01354701832716d77dd6c49ae17f69728582cdf84e8387f7c57b9eb05cc97ee6e14541878f12fb50f93855cc SHA512 8168f44f3574e56fe70ecbc67255556bb92215d3520d1cfca7be918b3d7d54be7aa0d82359f1044eaf66f11ee85fab1f9ccf32b13cdc39139c2facc78b2d8e71
+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-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
@@ -179,17 +194,22 @@ DIST phf_macros-0.11.1.crate 4693 BLAKE2B 291fc890830b3d350b5b36f53b8a761ef0947e
 DIST phf_macros-0.11.2.crate 4748 BLAKE2B 643942f8e83dcf5623f3479d677ee11c7e25a87e9e90f2aa3b43a75398e6d956613257046f5b307476f605b433c5ae443832223ff1319a918fcf3f9602ce291d SHA512 ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c
 DIST phf_shared-0.11.1.crate 10320 BLAKE2B 9a511bdaf3c74c48da231effcf7e65935e7b0ceb9271a3d66f5b15fe13e801b8a7eb10ad5fe1a07913294cd070ee9f9ef942843ddc1a29f51c76e7baa62f8eda SHA512 0e6968aded0535c3430474c49378420fe64809ad436cd39e331c8dcfb1759605df12a9fe78db75bf0761bfbe8beacae4faad2209923327cb41f015f048fd74d1
 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 pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435
 DIST pkg-config-0.3.28.crate 20330 BLAKE2B e38aa3fd2f03bcdca0ca92585ef558841623e38d01cbeb9db988f157ab94a0ad60be2b264dffccd0312594128cdf42fc40b659d1c009265ec274e4ab5801f79d SHA512 1ef92c5cf5320fb2e7d9e337edae08eaef01c762cb18406f732af731e5a94bef95be36cc0e0f5643f47a925aa127c5520a961c034e7b86357715656707a6e0e4
 DIST plist-1.4.1.crate 46130 BLAKE2B a2feb35040dd9c049c3c093aa89bc975946281e74668f0311b45513e0ddd35d043ada8090c7058958fff06c682986748f72ff76c7c4526eca0b23661f00f8ead SHA512 73b10d9e9d956693f2e5b36b714ff86476b7c3e226870036cb49f96420a2fbc54d7233ddc55aa18499cdf38861d3d2c069541c9df8f4cc498ff63ff8a2507c7f
 DIST plist-1.6.0.crate 47932 BLAKE2B 1996f016b12205fee8a22d52e78d5fccd309407728bc7ef516d7c54e998e76051f405032cc9fd72b8f2d81d509ce6e0aff28e088fe97e1f222e5af0f18a43705 SHA512 025f7a04cc0f16a3f44af0c63b5fbad49bcb7227460ba4e7849499a4436836b86d331c81c936ed246ee700fa2556598f9f745c1d2bf5196e0222625db0a2633b
+DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
+DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
 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.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
 DIST proc-macro2-1.0.75.crate 45621 BLAKE2B c6db3fd148b7ae50beb6ee960a9cf06ab4ae65a988b6e7c26fe190c61d34b764b8a076bf0f0deede47c7fba90f3d6e23d92555ad1439c64f4b573df2e0d9c3a7 SHA512 d25e563cd81a5b1a5dbb38835bc5abedcb27f8898f9ce3c72b33ef51f25e5c227944d5551951e5f4aa98044d5659f990c0271a6f3a4a54d2f19c12a8a37ee052
 DIST quick-xml-0.26.0.crate 116260 BLAKE2B 791eacda72e95b7a16009e6ffe0d4ca6a9ad64ac6be5e3a44f793b16d3bd752b5c58795af559617f55c9f516cb439ec2127f255ff9c99f98825cd646cf66835b SHA512 357bf6a70fd822accdaa1a9d86402234da1725c7e9392c64b9dfe92f1f26f39a5b1302462b7ba14bd39a54f7c8e6baa65bbe30aa147e240f8e82997b97a2ce56
 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 quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -205,8 +225,12 @@ DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e3
 DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST relative-path-1.9.3.crate 22400 BLAKE2B c6bd04b060013de042079a741a864150632c02cdc493ca1cfd746bcc12f6ad903f8f0748ec68261c979d833089c0fc091f7c9da2b2936e8f75dad8d4638a7b10 SHA512 fd5c88d370865870570859a110245e009eba557225e4297783a606227b13b42abf0c7e69a4beb5093a5a9dabac1545afd988f4c831abe912c21ccd8013c30382
 DIST rgb-0.8.36.crate 16576 BLAKE2B d1cfe1d22070883ef9313376145f8810dab360259dc2a23b4507ed3eb02b324e1dde46cfceb608ce745a87cd2520b2ce49c1e8827ed07c7c7b9aeb60d64f981d SHA512 e1e812b04e3c6b0ab93f7a10161eef808fe11888a5c1fc0060cd91fa90129c31491d5c64de0cec989acfcf66ce481bd61d9cdcdcb54e5bf2556da0e5c3bb7612
 DIST rgb-0.8.37.crate 16644 BLAKE2B 4f158ac34c03627bae762a3b579901d4737c2b71d9cd96b18024bf7f297169c3edb097d0d67289f8e20b2275a0613a45eedc8fae306437b76435eabaf8cb0793 SHA512 72491fb2c315ee347c7474e6f9b3d6eaaf1db66ddf163214df8466a4a8ccb0aaaed76fc4c72808b70bfbcdf9dc2a109511ccf8e405e4a006b349030e8ad199a8
+DIST rstest-0.21.0.crate 42620 BLAKE2B 0900551b119cfb9e18ea4beada1459b770ef263591a466a2247f27c443d8eb0d9dd508626b1144442f990a42995b0f980ccfd6175f2651fdbf18958ce7d2815f SHA512 baf52d34f47b9e400f35810dea724715cb66c494c44e08cf70c6372bd16d4826ef11e3e5bc8c56871c02d525595fe5198c7e4cfff8f2d1b355a2411d8996bafd
+DIST rstest_macros-0.21.0.crate 54797 BLAKE2B c627a310467fbe13b1a91fafe7d7e6011876f3f73bb53016650123dd75a54a0b9b762256f721ba62cf4535b23527074b11a48ae837e1513cf37ee689b8932377 SHA512 8b1ad5feeb4820e14f64af2d1db081ac98d227a0a9096206c32dbb32501b9a59e44cff0abac605fa6c4a670958477dc95c48796a0dd9c83557acf1e7c08dbd87
+DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustix-0.36.9.crate 293797 BLAKE2B 8313a1eb006c5b3fcfdd3b72b18720a4db8687be2d4bbf866897cbe22e71d4e8980561cf657cebe1ebab3c041f2e412539ef3f0da3e18fd13ae6a2577053911b SHA512 b6e3011805910333315d139d7dbfb28ab4a35d7e0fabc6ff8ca2d8394334f0587a4c26c069550f27c67f3e2823499e6183adb2aff504523249d65acf11d2c02b
 DIST rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6cdc49963277bd7a58ebdccaa59c33710ee625bc0a07fe2102f370e39143adca0651d123a0dfeb562d32e7a537 SHA512 a48c959c0fbc9700294b1ab0fb71a303bcef89a01b4407c2d7dc7c83b35dfbdb69bb6ac9a364ba7d68b4e561445e6c227af586cab15d9799de9e6622e89ada12
 DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
@@ -225,8 +249,10 @@ DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a55
 DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd
 DIST serde_yaml-0.9.30.crate 64831 BLAKE2B b1688fae76bd4b94ca33185901c3241bace33c1d2df04bf7d3d669f19af6f6ac574c53bbb3b0b1c74124b00675503976ae7dbe0d87fd431390cadaa505b68685 SHA512 5490d2af795062263b2daf3613dfc1fbdf259cca2bdcb1395fde1e2e535291035980220ca5aa0e97f99b3041acbcc7fdaea133f3503026be72db3b17fcbafb23
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
+DIST similar-2.5.0.crate 51648 BLAKE2B 43515b3014ff75e2a94debb0e40a081d60dfa371bc3bc3b3a7944cfbf2e326a8a56c6aa26ca2b6f9ab6f32929a89da673ec2fd4f037c07f8ff91ca95a77b1fe1 SHA512 7206380b6e4eb496b1dddc4501ac03d716bd6b5228971a35ca71f507940e799410dffad7e50e52c6f8fcd43c570ecef23220962fb057100665343498a5ce118f
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST smol_str-0.1.24.crate 13351 BLAKE2B 19ea2c1c34eecfb8d2b761a25db4a87c62be619f109e1797ffeab8417606955a6285386558ad2e603532019e4d4f38e1d9c813bba3529e9790325e2ebf56d1ea SHA512 db5f468e15d7c19f751f626b8b91f56532c9fca833f5c8686e778bee5ba85087684521c6d68522ab76caa4eede931065d25fed05ae8ff1dba3608947eecd0391
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
@@ -235,12 +261,15 @@ DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST syntect-5.0.0.crate 809452 BLAKE2B d76194d2234c77decac13d1bd2036862231718ce0ee050469fbbff094a11bc8f4ae2669077f6433d59a113d058c449f6e4d091cf520a985a9ef92dcab058f136 SHA512 b444424ad5f2ff9897707d6c2d0a39cf4e48a8d9a838286fc9f7bd9db6f1b4228bd2a5c985f5f88c014e75a7ee94bffdfee1cca45bd68e6db52e624e71923dc9
 DIST syntect-5.1.0.crate 809732 BLAKE2B 5ffec50e7cc174d7c55cad794c95c3f8c1a4eb3c2648acc750959ed6a072c08ff97043c932eccf13be0e193108f33add1fa4c27e2a33d416b8ca932286c13738 SHA512 aa69ff676e020a45b33c0a8015fdea5f60bf4d17313c01ff955bddb82698d14e940be942a40cf5e279a0b047031ab3ba5d0f2bd25dcbecaf89800d62d4b408da
+DIST syntect-5.2.0.crate 822671 BLAKE2B e288c658900b57fe68801fefea0f988110821e808bb2f3fa15cb7dfca27ddf0788b10db213b8630e13b680de64b1365eba3162a24b86e14af8b39e34de08d4ca SHA512 52780b693e484da02d773e9cca460e6b20d8aee436ba96c2e965a078e24b88dea35a03e692c5f7e3d02c82477093a592078e8686a6c9ccc7a2df9a6e20577c2b
 DIST sysinfo-0.28.2.crate 150323 BLAKE2B f376253c0879957322a1576707b56688625030ca01389b49713f3781cbc0b70b2ca6eb46cf44e3eab19b2c4f5a918e6a700d99d2762f16afa3aee40a0dc0ad5a SHA512 d94194995ed363bf2444c0f68865b5862e3132f0d4093be1b431f37411cfa1402504bdbc7a14150b49055fa15cf75fd4680d1b6535cfd41ca587a8d6492df90a
 DIST sysinfo-0.29.11.crate 156557 BLAKE2B 5bad28b8374e41a9a5d5d0dee774c1455032b8584930bb70d64e175e4679629594371db79f91cd1c8aed8adeb0597d7c4b333e3ce3c8fa587bcd5530078fde5c SHA512 6e338794067d775dfcda4b768abb9f70baf59c1b32d43bfbcc60b9a8a966ff152f3b27fffeabd649f2a35886fbaa1c3238a51583476b312eb1d6e6449777556d
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
 DIST termcolor-1.4.0.crate 18765 BLAKE2B d7286fcc84843296e2edf074e316ee8fcceb018c08deda7f1048e38108bf1a7c5f6b90dd3150078c413322eda08a1c58300b4adb963d9f51f307ecd08b5b7e10 SHA512 36c8550fe85cb90c4fdd1a6e3f60b42b6c71f65b6128da97d5ad6aac8350d907410899ad4a47bb4dc72ea6d00bc69e5a1ccc80ee9b0e80a1a27912e233f3e416
 DIST terminal-colorsaurus-0.3.1.crate 18515 BLAKE2B b705d4fb42771ec9547dea23af3d1684b8133b0820f88849609ca8edc5c21b3ac5a633cdb36072673f7188a7d7d2a80b867649f61fc7e91e69fa0afe77009818 SHA512 b1e63e10b27375528837f31a7caba0f646a91db72c574be74a326708cbbaa211cf3a5913af5a7f09b3e2e69a0ed4eb284bda83ddf25d4a467648157369ebacf1
+DIST terminal-colorsaurus-0.4.3.crate 30369 BLAKE2B fd9e12fc24c9e507feb85822b523d878d4fe9edef0773672db8b8835029fc56ba26f4ba55436ea130a4bff1436b2a532aa68ffab7499ac30b00769605ea76436 SHA512 3f841af917aecfde1e2e800549624b48a1845ec2c6ee33e04307a61d30b7fb85251a13985ff28e90b84b7272a2350e339688d2657f891e96762a1d3569acf256
 DIST terminal-trx-0.2.0.crate 14091 BLAKE2B a597c00adc45176bf232e13b2dc35359b3b69984dbc20b4a9aaa7f34adf2536a3e0671919adaa9eba959213aebf21fcd374d7145e6f7138b7e81683354d8ce29 SHA512 cf1f6d4e5ae77a4f32b9aed36bc76c97c90f4ec013de8b6ba3cb6e290eb0afd1148ca0cf488a6bfdf2da96757d5b86f4cc7549e4eea918588ea1fba27106da53
+DIST terminal-trx-0.2.1.crate 14909 BLAKE2B d9f3027f60512dcdc510d91dba54ed23508cb62825ad08411faf09684e108a3cf8eb7ce0acd68f44568d22d37a6c427f444490c3010aa1dce4b1100b84685003 SHA512 f973800f4d18c4399eed5023140a1ff1d820236fe749f5a14b59477bbd546596d3bc9a109793d8a815dfc566e8fc670a03660406b949b4a18b3342cd4ef2cf42
 DIST terminal_size-0.2.5.crate 10271 BLAKE2B 3ae449296ca82131fd98745fc23bc7d6d4909a0c94999caaf377ab22f78fb30731a480c25839daad6449ffacd8b13c794f3526e9603bcfbcf5975a5c0405db0f SHA512 0f32d8708967e46a5def904d13d49a2496cfbbb9b19ab71aa5b24afcff6ee3677054b1181b529b85cf36cc9e87b9334a93b094dc8b4e236ca92b3e440ff9de54
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
@@ -250,13 +279,17 @@ DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794f
 DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee
 DIST time-0.3.20.crate 111856 BLAKE2B d4fd3d3f9fb164b26317fa26788014419902147c7f17816a09565590245acf72019fb57e88d4f4ad4a399c5dc92247af9e915fc5d2168710f81673ed609a055d SHA512 689099bcd5cfea6b92d88584d92e7c15163f427f621c653026e3b3f8066a3932836de3f8be9716a41b77f1d36a9fa6c3e2a42ab011d21ca38efeb55522a39145
 DIST time-0.3.31.crate 121762 BLAKE2B af9097f5e44bf1a2d3bfd26e094e5c3bd17697b35ace2549167ce9f766e422d34f619b230fa81e5de6296f6d01de74a58923d7e69f7db04d6ad055d21f177bfa SHA512 e1cf8197f1eb9556e6320268eea35ca4e5ef33020fae94b181cc21d97b56c074b87ea783804cd7b7ff072736e498f0890b7af8e16c5492a12a4597a4cf33c4fa
+DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.16.crate 24356 BLAKE2B 807f56609924cf66dd57eba1d39b0b9302dbadff468562bd624c5413e5e9c36c416f670d558d519a89c0399b9b5aeaa41b2fa2bdbac9113e61bc830d7494a470 SHA512 19345f2bdf626cdc8c44bc11fbe9e13466cb7223cae89228c20ae83e7e9d71e8fe6a037b0461c289f9ceb6c8f08885458bc1db09adeeaddbbb0fbfb0dbfbf6c5
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST time-macros-0.2.8.crate 24295 BLAKE2B 6b54c83b11db8c8490383764a0e6f3a2c3f17c44adab2d19e69dc3fc5b27c5a44bd57bd0e6885c54ae493bd5e2c05a6237f72be93a3a2fbf297c47c02d28c61d SHA512 4e604f926a620b1caeba90bc5de1129f6a6bb4548890d6e31306ac419c7b6d421b548b3887a929da3209fad28cba8d57b989503e52f16af243375d545b5aefde
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 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_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
+DIST toml_edit-0.21.1.crate 101661 BLAKE2B e794b6121ba7e2b1b3f50966cd40eebacee6968b6b28986cfe4cb7312b51ffff19f74826910d8e4ce307f74940f11e71e6afdd768ac196427bddf44595bbc797 SHA512 10cd3b16f763f55294923ce8f166f96fbd67a0acc4a93a46fb3044d8a38148097c592ebb405ced87030d35154abfcc971eacf0172b624ab477a11e616efbaa07
 DIST unicode-bidi-0.3.10.crate 43530 BLAKE2B 2bd5ffea133793ed7588ea95b0848adea16e79fc3ce9a159c33c73929a1af90e0578c44980fe114aeec1d6424d294552bcbf4089e3c196c2ed3d0751d992c216 SHA512 70f81dcf3fb3ada1eb503cfda548e083cae6e7001dc445c0a481b8f467025f17dc26ac14e487edcdc2aba8b67f94a35eb4b5083a62d5b954dafca7b734edd3e3
 DIST unicode-bidi-0.3.14.crate 56429 BLAKE2B 8670c2bb1ad98d4540d7837e8b395078b5e0eacc0dcb7ef3ecf6ddaff9d69ce136a883b99cc5bdafd3a3d657834432d0145b11a44ea1d8b776a5394e56ba04f1 SHA512 8793d415e33f1f693ba5928d8aa09ad6dc10bca6d8ad338fca527e5b142d1ea1cb84515459a9fa0a821ae68747cae570bd3872646fcf218ebc7167ad41c97379
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -331,6 +364,7 @@ DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d65
 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.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
+DIST winnow-0.5.40.crate 159316 BLAKE2B aae5076d59b3459c901d918d8aaa97ba8bfcc993b8484344f52e45f1f37deb96d6cd3a1663a67f3c367be2b05d633286f270274c621bda9f3ab72b98bb652cc2 SHA512 525156f08514b0110697360be6e331a68d08f0cb65ee4ba3ac9d101dd2d42a8c89601e7409bdb5652c5b05145626506651010f58a854c47712065334c61ff39c
 DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
 DIST xdg-2.5.2.crate 14394 BLAKE2B 9d7ad2681ba450b73c66aefd8602a1d32e13e0ec751a368188b61000a5efb3fac943f6e5d6875f409aff6eddff3b2ba22631f71dcda4ea44dac080d551053f4a SHA512 12c7f42d2afd63d8d196511fa069519a0c495fc2555c87c059b96b46d7e2a2c51c31836c48fb329806d312a45a2fd67b4243793aa91e2139e2aa3f05230b2edd
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
diff --git a/dev-util/git-delta/git-delta-0.17.0.ebuild b/dev-util/git-delta/git-delta-0.17.0.ebuild
index b9ae6a964001..9b0a9265a036 100644
--- a/dev-util/git-delta/git-delta-0.17.0.ebuild
+++ b/dev-util/git-delta/git-delta-0.17.0.ebuild
@@ -215,7 +215,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/dev-util/git-delta/git-delta-0.18.1.ebuild b/dev-util/git-delta/git-delta-0.18.1.ebuild
new file mode 100644
index 000000000000..90ed9a82db58
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.18.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.2
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	aho-corasick@1.1.2
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	ansi_colours@1.2.2
+	ansi_term@0.12.1
+	anstream@0.6.5
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.4
+	anyhow@1.0.79
+	approx@0.5.1
+	autocfg@1.1.0
+	base64@0.22.1
+	bat@0.24.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.4.1
+	box_drawing@0.1.2
+	bstr@1.9.0
+	bumpalo@3.14.0
+	bytelines@2.5.0
+	bytemuck@1.14.0
+	bytesize@1.3.0
+	cc@1.0.83
+	cfg-if@1.0.0
+	chrono-humanize@0.2.3
+	chrono@0.4.31
+	clap@4.4.13
+	clap_builder@4.4.12
+	clap_complete@4.4.6
+	clap_derive@4.4.7
+	clap_lex@0.6.0
+	clircle@0.4.0
+	colorchoice@1.0.0
+	console@0.15.7
+	content_inspector@0.2.4
+	core-foundation-sys@0.8.6
+	crc32fast@1.3.2
+	ctrlc@3.4.2
+	deranged@0.3.11
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	either@1.9.0
+	encode_unicode@0.3.6
+	encoding_rs@0.8.33
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fast-srgb8@1.0.0
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	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-timer@3.0.3
+	futures-util@0.3.30
+	futures@0.3.30
+	getrandom@0.2.11
+	git2@0.18.2
+	glob@0.3.1
+	globset@0.4.14
+	grep-cli@0.1.10
+	hashbrown@0.14.3
+	heck@0.4.1
+	home@0.5.9
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.59
+	idna@0.5.0
+	indexmap@2.1.0
+	insta@1.39.0
+	itertools@0.10.5
+	itoa@1.0.10
+	jobserver@0.1.27
+	js-sys@0.3.66
+	lazy_static@1.4.0
+	libc@0.2.155
+	libgit2-sys@0.16.2+1.7.2
+	libredox@0.0.1
+	libz-sys@1.1.12
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.4.12
+	log@0.4.20
+	memchr@2.7.1
+	miniz_oxide@0.7.1
+	mio@0.8.11
+	nix@0.27.1
+	ntapi@0.4.1
+	nu-ansi-term@0.49.0
+	num-conv@0.1.0
+	num-traits@0.2.17
+	once_cell@1.19.0
+	onig@6.4.0
+	onig_sys@69.8.1
+	option-ext@0.2.0
+	palette@0.7.3
+	palette_derive@0.7.3
+	path_abs@0.5.1
+	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
+	pin-project-lite@0.2.14
+	pin-utils@0.1.0
+	pkg-config@0.3.28
+	plist@1.7.0
+	powerfmt@0.2.0
+	proc-macro-crate@3.1.0
+	proc-macro2@1.0.75
+	quick-xml@0.32.0
+	quote@1.0.35
+	rand@0.8.5
+	rand_core@0.6.4
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	regex-automata@0.4.3
+	regex-syntax@0.8.2
+	regex@1.10.2
+	relative-path@1.9.3
+	rgb@0.8.37
+	rstest@0.21.0
+	rstest_macros@0.21.0
+	rustc_version@0.4.0
+	rustix@0.38.28
+	ryu@1.0.16
+	same-file@1.0.6
+	semver@1.0.21
+	serde@1.0.194
+	serde_derive@1.0.194
+	serde_json@1.0.111
+	serde_yaml@0.9.30
+	shell-words@1.1.0
+	similar@2.5.0
+	siphasher@0.3.11
+	slab@0.4.9
+	smol_str@0.1.24
+	std_prelude@0.2.12
+	strsim@0.10.0
+	syn@2.0.48
+	syntect@5.2.0
+	sysinfo@0.29.11
+	termcolor@1.4.0
+	terminal-colorsaurus@0.4.3
+	terminal-trx@0.2.1
+	terminal_size@0.3.0
+	thiserror-impl@1.0.56
+	thiserror@1.0.56
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	toml_datetime@0.6.6
+	toml_edit@0.21.1
+	unicode-bidi@0.3.14
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.22
+	unicode-segmentation@1.10.1
+	unicode-width@0.1.11
+	unsafe-libyaml@0.2.10
+	url@2.5.0
+	utf8parse@0.2.1
+	vcpkg@0.2.15
+	walkdir@2.4.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.89
+	wasm-bindgen-macro-support@0.2.89
+	wasm-bindgen-macro@0.2.89
+	wasm-bindgen-shared@0.2.89
+	wasm-bindgen@0.2.89
+	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-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.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	winnow@0.5.40
+	xdg@2.5.2
+	yaml-rust@0.4.5
+"
+
+inherit cargo shell-completion
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="
+	https://github.com/dandavison/delta/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+BDEPEND="virtual/pkgconfig"
+# dev-libs/libgit2:0/1.7
+DEPEND="
+	dev-libs/oniguruma:=
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="usr/bin/delta"
+
+pkg_setup() {
+	# Avoid downgrading the system copy
+	#export LIBGIT2_NO_VENDOR=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+	export RUSTONIG_SYSTEM_LIBONIG=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# Completions
+	newbashcomp "${S}"/etc/completion/completion.bash delta
+	newzshcomp "${S}"/etc/completion/completion.zsh _delta
+	newfishcomp "${S}"/etc/completion/completion.fish delta.fish
+}
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 93e42c18b0b9..bb91a33def45 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -1,14 +1,4 @@
-DIST gitlab-cli-1.28.1-deps.tar.xz 36252544 BLAKE2B 8c7d4ef554bec4c7e8216bffd8ff138dfaa4aca5ede0d8e68d9291f296121f77bb0e607629dbeadd854ddc767ece394e8e22100f52776d704bd1908e1f0ac5e6 SHA512 6e6d2283a19ef1160ac933399cc497ea92075d7fc0bbc2bc998614b5c077b0331796a224f472139a4f6f273a2e1271ac70ea5ab7c0a479bb749055980e31e2e9
-DIST gitlab-cli-1.28.1.tar.bz2 16781342 BLAKE2B 0b59e60d0f8b7f1e95bbdf1aff8c22017dbf54eae2a72848a5416c35bee893341c1606249eeeaee1ffff1aa72500a8fe91389358abdf066339d9218a6ecdc648 SHA512 57b9d6e2b527bcaf227d8c07101129749a80203db061ac757adc84bda72576e35f6404d80972ffcecb6fecd2e9b644b0e5c9a06b6135a7e3a68c46af82de69b1
-DIST gitlab-cli-1.29.4-deps.tar.xz 38656412 BLAKE2B fcbb787a1fb893ae8d3452919e9e540f011ce0d35827a383f083e1492018a335f80089f2f87315329afb42bebdd1014ef6dc59e6673b930d4397edfa57384513 SHA512 12382eb22cf71cf11ebdfacf834dbcd08d6dc5fb02f7f705772240d896b907e8054a1847976a1ba9105b765df194eb5581dbd8d77fc191ac01b63257f1e76370
-DIST gitlab-cli-1.29.4.tar.bz2 16787326 BLAKE2B d0cc93c92cfb9ae01b9acfec04341c1e06a1bce36f666abec46c6bd0eab6700e2b6ea4f8cc27606da499b8246795c145a402dbf32c8f94074c0feaae34b8ec8a SHA512 a212f73fb06849c1d197efac1a7cf33a09fc94a3b8d954de1d442462deb59e52ff1a89c68e6ce4deb0a1472367890947ccabebfd459fd6e172142a9931c68df1
-DIST gitlab-cli-1.31.0-deps.tar.xz 38653264 BLAKE2B 79ebd6c213a03a7c4a45de602f3074098fc9d20fa0359d27608eb345676e02c6d302d11df3486bd275b4b4e826312d3bde80f0aed3aaf6418ad8d176ff0c26fb SHA512 6cdacd95acfc607a49d1b47b3b975c7234a4249a5f544a262d462d222211dca4ba0553f3dc5d9e2c4e025e630aee6cfc972c41f51abc23b3c4fa5e50adfbfa94
-DIST gitlab-cli-1.31.0.tar.bz2 16794522 BLAKE2B 72051d063be5b4108fec878d7b51cfd0680274e6a3e5e1eab3a992dd0838ff00ca19196e80a5651895dc261518bb93a0f0c5c4f2db2a99dc8e7f9b332af7022a SHA512 4020e7e62c7f3b420c0988712b61ca0a89733cfe8c370faf2a5c21d3983bba69283e85dcff98b3c5a8c6cb18319fb85101789490435d2f38a704ae9eed9aedb1
-DIST gitlab-cli-1.32.0-deps.tar.xz 36780836 BLAKE2B 2f83b28fb1096a1eb265100100691ec0e69d9049b4c37fb7a29360dec07eaa05449bf2ae5b7c3dd4f07e5071ee05435f3ef040ce8f7b8607a7d6721027fe21d2 SHA512 b47a487d01ff83775855cb527457bb0245346af3a36c030ce73d6ed228a5a6307369ab562a9ac71525447d23f83458445c817ccfdf2cf2722fe02d9a9e2d887f
-DIST gitlab-cli-1.32.0.tar.bz2 16799762 BLAKE2B 70c0942713fd4449dd0ba5310c012be71c880934abba6d91cb05820cf4905910638fcbf8d577627c4f5867364dafc19e701a2bea2614986231dd06db47be1219 SHA512 1d00495c852c53284f4d6e25d58a0731aa3b2ebeeecdbea0b4c6ce4f75ce552fd5ba5ad5b9c3daacd30e64fec6a9f23b2b27c0c85d22d7ac51cae575cd3b514a
-DIST gitlab-cli-1.35.0-deps.tar.xz 47876656 BLAKE2B b76ba63c98fdbbbbeffe383407227827cdd02a4640cb2cd32b440d6a9f45f26e8d45b78b52c4b14c8834fa895ea15ad3f4b444493286ec5e1f44a85c18f1540a SHA512 666ee00c95e62a8b2f0cea59cb489699eba2649cfb5e85510508cf3721060d3d40db57162413c6d5905a3e3c8a627940a705a6c335ac79735b1fe29820a7c818
-DIST gitlab-cli-1.35.0.tar.bz2 16809995 BLAKE2B d0b90c8dac6f27b21f740c2538b1c9b70af1a0bb29c852233c3b0d8f694e95823c29ed17b2e0f45ca7b27fdd388ebeeb0e8b3574f694d14f0cb5ba9f78b3b571 SHA512 fb462914cd7004508a247a81d52a9812b70ecd51286a1a06aafa6d1c63ed086ae6bff8aa6311d279da6a23a0efff623280abb68df2c2fc91678f877783325249
-DIST gitlab-cli-1.36.0-deps.tar.xz 47874044 BLAKE2B 6d0c2a70a22c4baffe0bd015f10de302e6866e8c05b76aefdcf83123ddd7b8b1f30c3a23474c9364e0ea2bec96f770ab86bf26b3424048750210995ec6cb7a56 SHA512 903aed99128bc4b34cc51125e78cdd28f52ca2468ceaa792d3ce76280631a51078e7ad55198c98aa7ba3d24421ba1faf4a3ebed2b418557a54781423844ea3e0
-DIST gitlab-cli-1.36.0.tar.bz2 16818985 BLAKE2B efae5cd8e9a1851f61259d463b3b772035cbc07c4904b202c259e56af45d22ab5d3ae4865a5d3af781185800f45002249bf2d31065120d36365fdc2942bc6896 SHA512 77114f90f9cc5752761e3dc54590f6886a343484a24738068c78341f4625802e2ae2aea7e183ed568916c5beb9863a09698762945e6b8eb2fca9abc7292a5426
-DIST gitlab-cli-1.41.0-deps.tar.xz 16529512 BLAKE2B 263d605ad70546e47984e2ef229f5ebd1ef2709c6f7e1ccb07f60807c16e0f6cdc6881d698454688718da54eb1b386a3f4eabcd9aa09008cf3eddf2fd34c5f52 SHA512 d6565eaac2dbe443080c6846fe0bbb42214ad52414d6885cfe91ce53c93f6d49e29cd2706d650f3a7c34a7d095d1a23336846571ce903faf292e85d983ae5cf2
-DIST gitlab-cli-1.41.0.tar.bz2 16825512 BLAKE2B bdb6b271ae78b43fb721f48cc5e2ed272b5fc95b0f2f24b83b5816fa73a6eb276b677dca57ce207453fec696d89b6518846b10be9cf8cfb87a0e964a8fcb5bb5 SHA512 349393cc5893d1a703aaa8bcd933fb2981ed56a071fed662fe775524132b8c09326a61fc626b60733694146f0cf42cf71a0f3cfe45161135a15025c1f3d2969f
+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
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.28.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.28.1.ebuild
deleted file mode 100644
index bac5430a1390..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.28.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=815d2622473028a14de7db77728a6d7cda467946
-
-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.29.4.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild
deleted file mode 100644
index 10e6e59a82ab..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.29.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=654ae7c117d2d93fc4621b58a8cfb5388ba485a0
-
-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.31.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild
deleted file mode 100644
index 0562e5401e38..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.31.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=1f8464b403a4611ef689a89893cb700718abdb20
-
-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.32.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.32.0.ebuild
deleted file mode 100644
index 0ea07f8b73f6..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.32.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=9fdb6193c89e86786707279c16472632665f4918
-
-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.35.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.35.0.ebuild
deleted file mode 100644
index d35e08bce252..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.35.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-GIT_COMMIT=3b9454da754254b4a72658f1de84bd3da70f8d67
-
-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.36.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.36.0.ebuild
deleted file mode 100644
index ab6e8625f0f9..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.36.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
-GIT_COMMIT=078e3f1dcb0cd48294f97ed2924b5149bc3874f6
-
-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.41.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.41.0.ebuild
deleted file mode 100644
index 9f497a5929a8..000000000000
--- a/dev-util/gitlab-cli/gitlab-cli-1.41.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
-GIT_COMMIT=3657f322c1dabbbc3b6d31567df8d2c8adf16162
-
-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.44.1.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild
new file mode 100644
index 000000000000..206794345fdb
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.44.1.ebuild
@@ -0,0 +1,32 @@
+# 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
new file mode 100644
index 000000000000..4a336d97ac9f
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.46.0.ebuild
@@ -0,0 +1,32 @@
+# 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"
+
+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-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 09d5f974fc36..542e3ce3b23b 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -2,5 +2,5 @@ DIST gitlab-runner-17.1.1-deps.tar.xz 86652408 BLAKE2B 2dd00989f0b0cf3802ed8c018
 DIST gitlab-runner-17.1.1.tar.bz2 1373122 BLAKE2B 01763963374705f22d1a396785838aa4fdc3eb2a2343264824e4dda606fd190875b34f52e128fd581044fe83689d600c74bf42fedd1347e58dced044f1168462 SHA512 161661fecb415267bb580cba1fb6be12b6adc58a0a6a03e75f7ea8e3dc3f6ca6169ca90e202444e7923444cb17d5e3a7007aec526666ead8ee5c962c04228ce7
 DIST gitlab-runner-17.2.1-deps.tar.xz 86661500 BLAKE2B 96700ef116677e2fa0d2233475906563b54d7d422ff25612439f0b6530592e24f472b9645d4faff4dd2f98ea37d0f8ad1242ee7ef532a6d7204d582925a50ae3 SHA512 f40317a3d3e9c873c8ba486d6b4c82d233166fc175ed7f8e6563d8a217d80b806f730b4f22e5879568528035961a6fc120b87ce8e9ea2eb9232ba8623b7e407e
 DIST gitlab-runner-17.2.1.tar.bz2 1378845 BLAKE2B 649217da0c358e8db87758c72bd69897b1d9edd0b9e9d92c9a42ce7b39b5fa8bef7a07faf107584d90aae8ce292e0625b2a021294cd9b8cff73c02d086a5cda7 SHA512 3c14643da0884bc6bdf1eebfababb1ffa7d2ecf93ec1b0e708aef143b8a9519bc7d27fb6a3fdf6f6fb5b04511a8f1cfd9622c9c5db4365c879dc30c8a4d59cb6
-DIST gitlab-runner-17.3.0-deps.tar.xz 86640820 BLAKE2B e2775c0f370c4dc13053e11b07a0217e76066f760af4499a2c4a439b43d3a931f059b7f8db8a6f99de9776e30d17fc734b87f91295bd098cf51e833fd80dcb23 SHA512 8cfc550044316f7102f92bf207b677d802fd978fbd338c3ee946a2d2f2376aa029ddbe16a61774cbf08cb736c30cab47d1b861b66d76015cda2ca1167e31ba98
-DIST gitlab-runner-17.3.0.tar.bz2 1383866 BLAKE2B 3e13880ca06225834fd4050efd4225034ae865bfe3b80833e2910bf4a5b705795d5af424ce0736af1f8166f95939aa57e1123339336aa9e41404e58aa1060e05 SHA512 f2a9150045a09b2fd746c3ac69d94beabd664d613f9ee539821edfc0c069aa4368f62381ed8c499ddcabf6bb8c8ecde2d23f5e4a26d816f2dd319d76a50f75f0
+DIST gitlab-runner-17.3.1-deps.tar.xz 86653516 BLAKE2B e7ac6d3218528f5a33f727a3e27a435fc2cb676e36e952892e656122f9c9e986806a1023ce8b03e4bb07e5829b7595f8ebc8a184456fe5f067745b55d1550a8b SHA512 c28edf4af1e1cb0966eb45e2d1f3b7b0f1312892e20d2cf87321e29eacbdc37b4e6b3d92f02c7b8a4cd0b4f8fc3e85d58f6ce208e4650400547fd093efa84715
+DIST gitlab-runner-17.3.1.tar.bz2 1382824 BLAKE2B 58086f5964776ecc08d25c817e4460f5874f4b8def14aaab46f7e94157a2b801f42e0656c13190c3272fb43b3213ac253ed329563cf67e292a57f48d1fd0e7ce SHA512 67be67ed3e3c5136f6adad17c85080d6470f8a7082080fe7026609b42868de454dd1f8aa750087ecf23a02fdd1c2d00d7797638d0f9be070103574ea1a1c491b
diff --git a/dev-util/gitlab-runner/gitlab-runner-17.3.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.3.0.ebuild
deleted file mode 100644
index d4d56e244f0e..000000000000
--- a/dev-util/gitlab-runner/gitlab-runner-17.3.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=071ba93d
-
-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.3.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.3.1.ebuild
new file mode 100644
index 000000000000..7edbd2cdc811
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-17.3.1.ebuild
@@ -0,0 +1,62 @@
+# 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=66269445
+
+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/glslang/glslang-1.3.290.0.ebuild b/dev-util/glslang/glslang-1.3.290.0.ebuild
index 17c757b7934a..8fbef8bd3599 100644
--- a/dev-util/glslang/glslang-1.3.290.0.ebuild
+++ b/dev-util/glslang/glslang-1.3.290.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi
 
diff --git a/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild b/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
index ca0eeb20cc2a..d50b6a0df0f5 100644
--- a/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
+++ b/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LLVM_COMPAT=( 18 )
 
-inherit cmake llvm-r1
+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"
@@ -36,6 +36,10 @@ src_prepare() {
 }
 
 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"
 	)
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 020fef1fc012..981b1159f50e 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,2 +1 @@
 DIST howdoi-2.0.20.gh.tar.gz 2516362 BLAKE2B 4b871661e4926ecfc1eadb095301a5c69fb70d80c1d7ca5aa4c2a6fad36a2bfb53469a79da89b1e28a659cdf0493a7ab47b231e391167c80010303684835bc0f SHA512 1efa479a92b85e418ee83e0f25e00fdc276f0ccb504af924106f925b80ce39af2c92a2dc27744e4816d67e764783f98771eb3ea889c08953e0bade17553f12fe
-DIST howdoi-2.0.20.tar.gz 27595 BLAKE2B 30644384dbe4c6073bd380a283f2af38943822480eebecbdfb252ca225c31579905bf023a90ba907be27e59ec4ae422f27accbe33d30340075264264e865d8b7 SHA512 0950a9f2366817646741c554a0f4b7bd1f05f614af9460ccb110dc0d0f68f58dd6437fedb237df4b340b5a4fbc569faf315273937f6520a85060791044b3dadf
diff --git a/dev-util/howdoi/howdoi-2.0.20-r1.ebuild b/dev-util/howdoi/howdoi-2.0.20-r1.ebuild
deleted file mode 100644
index 12c28a11d859..000000000000
--- a/dev-util/howdoi/howdoi-2.0.20-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# bug 818580
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/hyprwayland-scanner/Manifest b/dev-util/hyprwayland-scanner/Manifest
index 1d63927590d9..864f598caa03 100644
--- a/dev-util/hyprwayland-scanner/Manifest
+++ b/dev-util/hyprwayland-scanner/Manifest
@@ -1,5 +1,2 @@
-DIST hyprwayland-scanner-0.3.1.gh.tar.gz 8832 BLAKE2B 2a86fa7e6898a74231836e521b92f6997b18e2ad45973dd60bb3696ca2ee9c348746c4f43299882c12bfc908aae86af19f86c8f404eb2ef26e11fd2a9249e9fa SHA512 bcbaa5952655894d2093df1fd24e4df301c810180d678746f9eb4f420d92461ef7f3ea0cfde1f1d4da48f09b325e8661d4fb1540fe749964cec9b19f19822af0
 DIST hyprwayland-scanner-0.3.10.gh.tar.gz 10039 BLAKE2B 369c2445904480ec9368101056e9712c0583307c1faaea43fed80f17075521371865841c777070a6983d9a84c394c620b0b0ecd53bbd6166f7828e136c0d52eb SHA512 d63f9490d048725a7faa3995e3786190b37db16654293cce16c410c4cfd27e61042a50e6feddc7eda42d67c04bdd7bc19b51f475ddd206ffc5464e762003392b
-DIST hyprwayland-scanner-0.3.4.gh.tar.gz 9610 BLAKE2B 931807bade6186489826fe73ca558c3e4100f0db62c3a07920ad6e173dedc5c4d157b6caf1d5bc75c9b9ef419c8351f9bc06aa84425ffcd506792c8ec7de922b SHA512 1b05a41a19f7d07fdb10e5e72cb6949e1ac811ec0435f49d86376f19c3904660bc2a94b5f2dc75ca45e4243b6009df33682464c24c1bcea65ab16fa4f3a97732
-DIST hyprwayland-scanner-0.3.7.gh.tar.gz 9891 BLAKE2B 587eedabebc775b6d4591b7d0e9517238c18594f397d91d5431368b2f83646ce3b1bfdb07d424410977a8d5afab201f622c0a8de271f9322d250ae7ee621ab4f SHA512 996ef9eaf5b0096a2b01ad8d815584b2c5d6df284e33c2d5a8d07b682df5dc3eff02c3774bc92de57ad014d8414af6bf7bd18a9f212c83d8a0e1e88872f742bc
 DIST hyprwayland-scanner-0.4.0.gh.tar.gz 10990 BLAKE2B f138f74b896d39f12b63ea3cea5a8f456821a6ed9e0e6baefd80f70dffb2f9cd1b650adf59a871f8f8055f8ed7cfb05e4631e96352fc137b8acbf1b6cdd93fae SHA512 1b7b0ddea94bd2679150a7a6d80628d1156ae11d6963fe31fd6d7292cb1d9c273830bb4515032d0645649e56b57c2d64c5312b007ea11480bb798ea43582fe9c
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.1.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.1.ebuild
deleted file mode 100644
index c48449c55b2b..000000000000
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
-HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/hyprwm/hyprwayland-scanner.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=">=dev-libs/pugixml-1.14"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.4.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.4.ebuild
deleted file mode 100644
index c48449c55b2b..000000000000
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
-HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/hyprwm/hyprwayland-scanner.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=">=dev-libs/pugixml-1.14"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.7.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.7.ebuild
deleted file mode 100644
index c48449c55b2b..000000000000
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
-HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/hyprwm/hyprwayland-scanner.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=">=dev-libs/pugixml-1.14"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild
index c48449c55b2b..527981c85db2 100644
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/hyprwayland-scanner/metadata.xml b/dev-util/hyprwayland-scanner/metadata.xml
index f3312ee6fcc4..6af508b3f08e 100644
--- a/dev-util/hyprwayland-scanner/metadata.xml
+++ b/dev-util/hyprwayland-scanner/metadata.xml
@@ -9,6 +9,10 @@
     <email>jethro.rosette@outlook.com</email>
     <name>Jethro Rosettenstein</name>
   </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>johnmh@johnmh.me</email>
+    <name>John M. Harris, Jr.</name>
+  </maintainer>
   <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 06f1ca8ddf2a..f0516efbcb76 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,2 +1,2 @@
-DIST idea-community-2024.2.0.1-aarch64.tar.gz 994025965 BLAKE2B 6012bc2aa93c52d27f24d400f925e53e999a47b3096e988d60c1604dc693aa26f895f301e8bafc74a8b2553c610dbee7ac6862da0f2434d8c5da8d88ddf24e99 SHA512 e0d448df58b5e2cb13cb365bb6935507a6da5d7d559e4401b6540019d91799a31a46d276e8402e183bfe5ec976adea96e4b1cf1478ebbe223ce34fd2738d57a0
-DIST idea-community-2024.2.0.1-amd64.tar.gz 994656215 BLAKE2B 565acec3352000aa2e27f5b67808c91c100a2a04f610336ab1936723ac166daedb2e295419256b5199989474e8d1bd4099f412de50559efbf3d569c6fee17602 SHA512 e853a538d62d0375fcabc27ea0e22951fd11622202f36dbf71caacb1602bcb81ebf53ccbb9114694ff4c729e7afe89958ee9d9ac7245d8f3dd07327d607c2cd6
+DIST idea-community-2024.2.1-aarch64.tar.gz 880188596 BLAKE2B c688414140ca48921e952590b040c7bf1193b4154fdd5a6e99d867de3f547d8c212c7342c37482bf1d60e5eda3953a3d31b245872d4cfa46361eabc687102af2 SHA512 9beac9d5ec3f5a691de14588dd3c55575c2ec5535964f0e5ff3e7fb494d41b2a76268d13cd527c0c1b894eca3214437214ac805518325b85384955575e4082d5
+DIST idea-community-2024.2.1-amd64.tar.gz 880814955 BLAKE2B b644d1f955b5e7ef26c76aee20044fceb50955f7c5ad83d063f24aca4f38289e3885ae722e360e7f053a46591b8ea6d783fda9314e39e291fd542c1ef5a6647c SHA512 393bcdab1d5738822b8433a6b0c54d4da7ea47f3e48b9fe39057e0ef779031eda5fe290e4fb3f03fdd1a5b136041b7e2a08cbfa4b9a24efa41ef05a8cd079edc
diff --git a/dev-util/idea-community/idea-community-2024.2.0.1.ebuild b/dev-util/idea-community/idea-community-2024.2.0.1.ebuild
deleted file mode 100644
index 9590a791d7ba..000000000000
--- a/dev-util/idea-community/idea-community-2024.2.0.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 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"
-
-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
-	dev-libs/libdbusmenu"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-
-QA_PREBUILT="opt/${PN}/*"
-
-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
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-	local dst="${D}${dir}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea,inspect.sh,restarter,fsnotifier}
-	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"
-
-	make_desktop_entry "/opt/idea-community/bin/idea" "IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
-
-	# 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"
-
-	# remove bundled java
-	rm -r ${dst}/jbr || die "Unable to remove bundled java"
-
-}
diff --git a/dev-util/idea-community/idea-community-2024.2.1.ebuild b/dev-util/idea-community/idea-community-2024.2.1.ebuild
new file mode 100644
index 000000000000..b61f2c92242b
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2024.2.1.ebuild
@@ -0,0 +1,135 @@
+# 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-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"
+
+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
+	dev-libs/libdbusmenu"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+
+QA_PREBUILT="opt/${PN}/*"
+
+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
+
+	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 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"
+
+	make_desktop_entry "/opt/idea-community/bin/idea" "IntelliJ Idea Community Edition" "${PN}" "Development;IDE;"
+
+	# 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"
+
+	# remove bundled java
+	rm -r ${dst}/jbr || die "Unable to remove bundled java"
+
+}
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.22.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.22.ebuild
index 88d55bd823a9..2edf57981981 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.22.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 LLVM_MAX_SLOT=18
 
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index cbc063493398..849bf83bbbd6 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,2 +1 @@
-DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
 DIST indent-2.2.13.tar.xz 475360 BLAKE2B 6aad65e966f91c9776d0b3d32f185a6c7b45eabca847c806c1fff935562f6c4512f472ec814dc54d3fc40498f513baee99b5bcfc2ea25fd67fd24b0cd0f9fe1a SHA512 a92028f99cc64b451aac99802de564f2e915e7f0e258df761141f77595c07cc95c3f2c35917618dbc2cfa3aa5b163544e07aa6641c32298aca3a1c5331bb8c69
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
deleted file mode 100644
index 11b20f5a8555..000000000000
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools strip-linguas
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://www.gnu.org/software/indent/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-BDEPEND="app-text/texi2html
-	nls? ( sys-devel/gettext )"
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e '/AM_CFLAGS/s:-Werror::g' src/Makefile.{am,in} || die
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas -i po/
-
-	if use nls; then
-		gl_cv_cc_vis_werror=no \
-		econf $(use_enable nls)
-	else
-		ac_cv_func_setlocale=no \
-		gl_cv_cc_vis_werror=no \
-		econf $(use_enable nls)
-	fi
-}
-
-src_test() {
-	emake -C regression/
-}
-
-src_install() {
-	# htmldir as set in configure is ignored in doc/Makefile*
-	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS NEWS README.md ChangeLog{,-1990,-1998,-2001}
-}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index b462621a28cc..f9cc0e25ef74 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
 DIST intel-graphics-compiler-1.0.17193.2.tar.gz 9647647 BLAKE2B 81e3c159aae3d9966d775bf4844293cbd15dba394906ad7aed6d047ba0f54bc97538e8fde5ff7485b9aee7b604bd7ab3eb7d8cc343f57ea4d7abf62ddc4de3a5 SHA512 48a6986521b85a888dbcebe5a52da328000db3428c2c10590c89e3165b634eb128ac5c550971bb7de86263ab45fca838389f2e3da2b09e3268c5434d337c56a7
+DIST intel-graphics-compiler-1.0.17537.1.tar.gz 10470018 BLAKE2B d1adc0fd566ac431075a2b497820f0def77b30ab38c43c5d686fc81d808e32c2864d311e01ded8c64fb53b7d5ad5eb33f6947caf12bd4aa7fd0098a0aecf083a SHA512 5b51fad56dbd30d8c17343f5d386fb559088ba5e749a0cdfba9562c1788127781f1814affb2da16dacf8329118242d539df1866445b86b7f79e5a4fb7323b086
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.1.ebuild
new file mode 100644
index 000000000000..eb568fc9d09b
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.1.ebuild
@@ -0,0 +1,105 @@
+# 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 )
+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/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:15[${LLVM_USEDEP}]
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		sys-devel/lld:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.18.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 'sys-devel/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 sys-devel/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=(
+		-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="${EPREFIX}/usr/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"
+		$(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_clc/Manifest b/dev-util/intel_clc/Manifest
index 099315026706..5c32dcabd6a2 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -3,5 +3,8 @@ DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 2e8e4ee98f904aa02f304a6c3cbbb81d0480220
 DIST mesa-24.1.4.tar.xz 29106920 BLAKE2B 2109fc604858a0927271d7b1edb76a24514acac6117e564c6999c99f068624964f5cf0b7d022cac5726e432353a32a5278b3aa00b64dd4118bb2f0b7123c3b41 SHA512 0293f1493685888e5d2f0e616645c937e5a9c348fcb654b050b7c42bfdade1518c508920e456cf8be0033dceab4570a916db87dbb454174e425d91e9c05d0748
 DIST mesa-24.1.5.tar.xz 29140156 BLAKE2B ea29b3b8b6f178dd21d7ee3042ea829755e398f8876dfac6c744de77c08d85abb2736add2141204e6d3343de46040f49d96e1ad455714880b4be46d7b36581f1 SHA512 5916cc38c4a17161b012310c473077177887c5fff1bc5cb1f6efdf5da44878c18c99fe0c62318d897798cd4edb0f7206a989198ba085c2d402d49cdd0ee25288
 DIST mesa-24.1.6.tar.xz 29172600 BLAKE2B 295634438e1a2ae64bd1c5b0309a253e72a4d95e559cabad72f94aa2b91e5b05179c69cce5e371b69707419399dae0bfe808cb16b2e9ee112277e18b8f0f31f9 SHA512 2df0c78126f34a9ab7ce4946ed9fcd58d828717ecfd93681d9e136e605e9a8e01428dd632c0125e06d805498ffd75250f0e617f47fbb7e6368e6c8a48f4c4dfc
+DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
 DIST mesa-24.2.0-rc4.tar.xz 29324360 BLAKE2B da26f43fa3e940a406e4987ed311fd22fc7608d4e09fc6cfd6584fe8873b8c5fdbf51d5f32042c46a883739cd22204a3dde2a0a1d6283c3453bc635bfba24ed5 SHA512 5a0b9043e8c3222faeaad31f435f3ea440d670ffa5497340c5809666a857fa4c77288745d52372a2267e9f9be97fc04e0d20b81bc027c1b7a33176a3bfa6b3c6
 DIST mesa-24.2.0.tar.xz 29342732 BLAKE2B dfbd0e5b8de3db475f40a8313ee3013bb513d505541e056efd84aad50d5043414dd2c0b95e6c7336a1b4d29037274dae2fa1fdb9697187bf239a5adb54dd3721 SHA512 a585c788801b5a341d356e44d958b148e6e14f6b3d7224e99a92faa2f004bf0cfc90103c5fdc651afb22f805c6f9dc594f9f3f5ecebcea36f6305b3a6ccb9294
+DIST mesa-24.2.1.tar.xz 29431192 BLAKE2B f4ef9fd08bbf16551498a8edce1e19e594a0b85ee1f05f8f7c80fcf12ec7ac4cb5947b713791f5202201f8cfc48773507d869dbd239e6fc3dcf2c3a621892327 SHA512 3b77e5faec51b67583131123b0cc010b52325ea308e4075323102aa999d9c9fbb65b873eb537ed4f577b5a0811e7f096e7e101510cb50326ea5c439b4b468380
+DIST mesa-24.2.2.tar.xz 29441876 BLAKE2B 14b29989b056c3bc76cb64babef6e93dd31af37ea72674adaad3f7ef7373c004996e375941662b1c3bbacfd707a21e2e3631a116a841130edfa1bfe3450ae5ab SHA512 d9979f7a1ae7bfeb0658d1b6c9021b7d0043c3ca71db9deaa2fc8a3d4c07cd58497b9233737a31fb66ef711a369a859757a63fb86c2aadd859867f9a4eaf16a9
diff --git a/dev-util/intel_clc/intel_clc-24.1.6.ebuild b/dev-util/intel_clc/intel_clc-24.1.6.ebuild
index df38191345d0..4ff279ed0893 100644
--- a/dev-util/intel_clc/intel_clc-24.1.6.ebuild
+++ b/dev-util/intel_clc/intel_clc-24.1.6.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT SGI-B-2.0"
diff --git a/dev-util/intel_clc/intel_clc-24.1.7.ebuild b/dev-util/intel_clc/intel_clc-24.1.7.ebuild
new file mode 100644
index 000000000000..df38191345d0
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.1.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+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-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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-24.2.1.ebuild b/dev-util/intel_clc/intel_clc-24.2.1.ebuild
new file mode 100644
index 000000000000..4acbe36c77e0
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.2.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..18} )
+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-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/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-24.2.2.ebuild b/dev-util/intel_clc/intel_clc-24.2.2.ebuild
new file mode 100644
index 000000000000..4acbe36c77e0
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..18} )
+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-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/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/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 03cb42af3d21..cfbd621ef52d 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,3 +1,4 @@
 DIST jenkins-bin-2.452.4.war 93409695 BLAKE2B 8ae062e00049f0eb2d0a8941919ef4ab23171e8e0bd2535c73518c03655092ae116ef8f4538bce54e1e5e689cabec52c8ebf2af630579f1b1a49deef577222db SHA512 6d96e73bd12d6815e4713d31e0e2983104f4b5d1a7fb2cc7575c540c2c0d6e41717c826553afa9cbbe43bce6e95d792b26c8b250c3e5616da1e7be5813c6e097
 DIST jenkins-bin-2.462.1.war 93287150 BLAKE2B f23f4cf808be5de753ec301b3c49717f0a49cc69335f00df5b3a8f1c1b9b8a42fce30b315a2cf59965ab2ccf79512f16f63997ac58ccc3e86124aa2f21716ef2 SHA512 ffc0adba34a0ca646630c65c8dc61cbea2dc0c633dbfe8b9d1b80b484e3a315840a488c4b8f1e2d6e171491ff48835b755d80b3a7151efd5b48eac85eac17941
+DIST jenkins-bin-2.462.2.war 93344579 BLAKE2B e27067d12935c25ff76b7767c317a617061ae660cbb28a033bf4eb36bf71cba6a9a979e8f0cbccc167f794fb73f518596bc341be85cfdf52b0d36766675e4357 SHA512 a4a8e2948c83d97cc0ee1f7d02983e557c2e288c5a081e1b15ba89a4567c4d2879b96a63227881f34e47b5173b06cb6666aff9a8cf248a21a55b13b4cd6f66dc
 DIST jenkins-bin-2.471.war 98790731 BLAKE2B 2d0ea306c5bd3e05433f1d2262044892bfc5b82534cebc9dc8f5c4067ac14b8bae078e28380bfe68ecd49a4cf114a6ad3354e17f9ca3aad0680754ebca5103cd SHA512 8261fd4169bc163e9ce8e6e2a368c7ce6ae8a1f410f613c0f7a467f86ed9eb2db2edfb279aa4b960db5f1f22ac0a10e1f06574fdc9f515a5815929a8dd15c809
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.462.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.462.2.ebuild
new file mode 100644
index 000000000000..f23cc6f84ea2
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.462.2.ebuild
@@ -0,0 +1,44 @@
+# 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/kcov/files/kcov-remove-failing-test-conflicting-with-sandbox.patch b/dev-util/kcov/files/kcov-remove-failing-test-conflicting-with-sandbox.patch
new file mode 100644
index 000000000000..8229d30be52e
--- /dev/null
+++ b/dev-util/kcov/files/kcov-remove-failing-test-conflicting-with-sandbox.patch
@@ -0,0 +1,51 @@
+From c3c89cfca876b9c56586afc374ea92a7b25998c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?=
+ <beatussum@protonmail.com>
+Date: Sun, 18 Aug 2024 15:18:19 +0200
+Subject: [PATCH] remove failing test conflicting with sandbox
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+sys-apps/sandbox is based on `LD_PRELOAD`; however,
+`--bash-handle-sh-invocation` uses it too. This option seems to conflict with
+the sandbox environment and the associated test fails fails.
+
+Indeed, according to the Kcov man page, this option handles "invocations of
+/bin/sh scripts via using a LD_PRELOADed library that replaces execve (i.e.,
+/bin/sh is executed as /bin/bash)".
+
+Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com>
+---
+ tests/tools/test_bash_linux_only.py | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/tests/tools/test_bash_linux_only.py b/tests/tools/test_bash_linux_only.py
+index d0a46bb..87022e0 100644
+--- a/tests/tools/test_bash_linux_only.py
++++ b/tests/tools/test_bash_linux_only.py
+@@ -2,21 +2,6 @@ import libkcov
+ from libkcov import cobertura
+ 
+ 
+-class bash_sh_shebang(libkcov.TestCase):
+-    def runTest(self):
+-        rv, o = self.do(
+-            self.kcov
+-            + " --bash-handle-sh-invocation "
+-            + self.outbase
+-            + "/kcov "
+-            + self.sources
+-            + "/tests/bash/shell-main"
+-        )
+-
+-        dom = cobertura.parseFile(self.outbase + "/kcov/shell-main/cobertura.xml")
+-        assert cobertura.hitsPerLine(dom, "sh-shebang.sh", 4) == 1
+-
+-
+ class bash_exit_before_child(libkcov.TestCase):
+     def runTest(self):
+         # kcovKcov shouldn't wait for the background process, so call it with kcovKcov = False
+-- 
+2.44.2
+
diff --git a/dev-util/kcov/kcov-43.ebuild b/dev-util/kcov/kcov-43.ebuild
index 2c1f929f9a7a..32f6b0358b92 100644
--- a/dev-util/kcov/kcov-43.ebuild
+++ b/dev-util/kcov/kcov-43.ebuild
@@ -39,6 +39,10 @@ DEPEND="
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-remove-failing-test-conflicting-with-sandbox.patch"
+)
+
 DOCS=(
 	doc/
 	CONTRIBUTING.md
@@ -51,24 +55,26 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake_src_prepare
-
 	if use test; then
 		sed -Ei "/skip_python2/ s/= .+/= True/" tests/tools/test_python.py \
-			|| die
+			|| die "Cannot disable Python 2 tests"
 
-		echo "add_subdirectory (tests)" >> CMakeLists.txt || die
+		cat <<- EOF >> CMakeLists.txt || die "Cannot enable test building"
+		add_compile_options (-g)
+		add_subdirectory (tests)
+		EOF
 	fi
+
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=( -DKCOV_INSTALL_DOCDIR:PATH="share/doc/${PF}" )
-
 	cmake_src_configure
 }
 
 src_test() {
-	PYTHONPATH="${S}/tests/tools" edo python3 -m libkcov \
+	PYTHONPATH="${S}/tests/tools" edo "${PYTHON}" -m libkcov \
 		-v \
 		"${BUILD_DIR}/src/kcov" \
 		"${T}" \
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild
index 2c1f929f9a7a..32f6b0358b92 100644
--- a/dev-util/kcov/kcov-9999.ebuild
+++ b/dev-util/kcov/kcov-9999.ebuild
@@ -39,6 +39,10 @@ DEPEND="
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-remove-failing-test-conflicting-with-sandbox.patch"
+)
+
 DOCS=(
 	doc/
 	CONTRIBUTING.md
@@ -51,24 +55,26 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake_src_prepare
-
 	if use test; then
 		sed -Ei "/skip_python2/ s/= .+/= True/" tests/tools/test_python.py \
-			|| die
+			|| die "Cannot disable Python 2 tests"
 
-		echo "add_subdirectory (tests)" >> CMakeLists.txt || die
+		cat <<- EOF >> CMakeLists.txt || die "Cannot enable test building"
+		add_compile_options (-g)
+		add_subdirectory (tests)
+		EOF
 	fi
+
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=( -DKCOV_INSTALL_DOCDIR:PATH="share/doc/${PF}" )
-
 	cmake_src_configure
 }
 
 src_test() {
-	PYTHONPATH="${S}/tests/tools" edo python3 -m libkcov \
+	PYTHONPATH="${S}/tests/tools" edo "${PYTHON}" -m libkcov \
 		-v \
 		"${BUILD_DIR}/src/kcov" \
 		"${T}" \
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index de7d468f1832..8d6980bced91 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-pg-qt-2.2.2.tar.xz 660708 BLAKE2B 822753315969cf4176ed1a25bb27516661af865a4c337f069a892b008802359f4a933ebc9e9e1ac0c91d2314a6ec5cdcf91db4641e624e07373dfec47a71dcf1 SHA512 e82f2fa2aafa2c9f949e298989de70a0455c30f6bef4a40e38977c23ad645ee49a0a8c57b5c45d0ddfef13ee7b7e4efd2dc2ed3003a456f24108161415700369
 DIST kdevelop-pg-qt-2.3.0.tar.xz 660164 BLAKE2B 4167068e8f8348c428e4260061abbd24a4c490588414a8a566d84b61913bfc6cb06292900cb881327b5ecdd3c0cf92aa02f6361cd870f9d8bc79f8ff295aa89a SHA512 27bd102cf64f9cd7b27940be02cb81b620732a11e2416327104a18edc6990e43b2a57281bec91697466c3ab3ac8d322412dd06673329e04583e3bc90862b43b9
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
deleted file mode 100644
index cba62e3eea64..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.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_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="https://www.kdevelop.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.3.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.3.0.ebuild
index 23f621d53d9a..6b08846e030b 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.3.0.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.3.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 054e2c9828f4..5b387ca64f85 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1 +1 @@
-DIST kdev-php-24.05.2.tar.xz 1090080 BLAKE2B e28eace93c60a7714a15d739120d050aaf112b86ad3605e6d5ca62f319bd023469c8af414ae73a158437cfe7989c4643c88eed3654d96bc32095be87a3970fb6 SHA512 6da350a854786ecebf51425455f0604a886ff467080bd945725a3efb3983ed4f5643cb93688487ce6e553cdf62d5b7494e7f08bd3d6509496fbe7968a8ca43bf
+DIST kdev-php-24.08.0.tar.xz 1093492 BLAKE2B 4ea054a76fc3ea6b750184f700d3adfd9a25463f976bbdb0d298d30ccc0c7f50c7462bfba6c45691e3c9c2ae9fe8fc0288d267a69b126a6fe79a56b8083c36d3 SHA512 0b7e4f47b20a8b73058dceed4ed3529f02adef5781910f6f67ea8c75e740651b8199f1efcba0bcdf2c5f5bbedbe71bfbeec37f876ee9cf70f3f539c11a64baa7
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.05.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.05.2.ebuild
deleted file mode 100644
index d819a70fa339..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-24.05.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-# remaining tests fail for some, bug 668530
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:0
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-util/kdevelop:5[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.08.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.08.0.ebuild
new file mode 100644
index 000000000000..edc439274b77
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-24.08.0.ebuild
@@ -0,0 +1,51 @@
+# 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-python/Manifest b/dev-util/kdevelop-python/Manifest
index 25784959db62..6a8e73db4ea8 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1 +1 @@
-DIST kdev-python-24.05.2.tar.xz 1098280 BLAKE2B 71f3759d45defde73bb2526b33d48641efe2da771a088ad9bc481d24fb59b3a1d890744307340ef648a08fd4a9f1d0bfe52f099c7fcd8e1e19fb59809e9e0aa9 SHA512 d7e5935194e16203479f1cdb32118b383c7f5837306aff1a60eee729e93a6cb3be0427536aa2bcdaa5b5363844571ced056ea74cca02f329ca9ea07c7ac98fd3
+DIST kdev-python-24.08.0.tar.xz 1101512 BLAKE2B 030b40783e882d770cf40873f5da2e7975287541d949f3767ce272e70dfc680193ba45ace52956964eeebae8a64e52c65128eb38d2138c5cec3e128beb807383 SHA512 d971f718ee5e54e9b3d12377ffb225b1b4577f75d7870d5f6408ce52e5ccf4e1e84b22ddf3d5deb23c016838680f9e7833a26c748beefa0cbd186d9b75f03d36
diff --git a/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch b/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
deleted file mode 100644
index 00507fc0de7e..000000000000
--- a/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 26ee370982e7cd7795921e9533b61a5a89d11b6a Mon Sep 17 00:00:00 2001
-From: Bernd Buschinski <b.buschinski@googlemail.com>
-Date: Sat, 8 Jun 2024 16:50:47 +0200
-Subject: [PATCH] initial support for python 3.12
-
----
- CMakeLists.txt                  |  2 +-
- duchain/tests/pyduchaintest.cpp |  5 +++++
- parser/ast.cpp                  |  3 +++
- parser/ast.h                    |  6 ++++++
- parser/astbuilder.cpp           | 15 +++++++++++++--
- parser/asttransformer.cpp       |  6 ++++++
- parser/astvisitor.cpp           |  1 +
- parser/python_grammar.h         | 15 +++++++++++++++
- 8 files changed, 50 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fba20c3..29b83950 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_definitions( -DTRANSLATION_DOMAIN=\"kdevpython\" )
- 
- set(Python3_USE_STATIC_LIBS FALSE)
- set(Python3_FIND_STRATEGY VERSION)
--find_package(Python3 3.4.3...<3.12 COMPONENTS Interpreter Development REQUIRED)
-+find_package(Python3 3.4.3...<3.13 COMPONENTS Interpreter Development REQUIRED)
- 
- configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY)
- 
-diff --git a/duchain/tests/pyduchaintest.cpp b/duchain/tests/pyduchaintest.cpp
-index b0711fd0..8a4a75e4 100644
---- a/duchain/tests/pyduchaintest.cpp
-+++ b/duchain/tests/pyduchaintest.cpp
-@@ -439,6 +439,11 @@ void PyDUChainTest::testCrashes_data() {
- #if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
-     QTest::newRow("except_star") << "try: pass\nexcept* (IndexError, ValueError): pass";
- #endif
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+    QTest::newRow("type_alias") << "type Point = tuple[float, float]";
-+    QTest::newRow("generic_function") << "def func[T](arg: T): pass";
-+    QTest::newRow("generic_class") << "class Bag[T]: pass";
-+#endif
- }
- 
- void PyDUChainTest::testClassVariables()
-diff --git a/parser/ast.cpp b/parser/ast.cpp
-index a63ac231..4a371b10 100644
---- a/parser/ast.cpp
-+++ b/parser/ast.cpp
-@@ -765,6 +765,9 @@ QString TryAst::dump() const
-     return r;
- }
- 
-+TypeAliasAst::TypeAliasAst(Ast* parent): StatementAst(parent, Ast::TypeAliasType)
-+{
-+}
- 
- WhileAst::WhileAst(Ast* parent): StatementAst(parent, Ast::WhileAstType), condition(nullptr)
- {
-diff --git a/parser/ast.h b/parser/ast.h
-index 430b70d6..acaf79f7 100644
---- a/parser/ast.h
-+++ b/parser/ast.h
-@@ -137,6 +137,7 @@ public:
-         ExceptionHandlerAstType,
-         AliasAstType, // for imports
-         IdentifierAstType,
-+        TypeAliasType, // for types
-         LastAstType // the largest one, not valid!
-     };
-     
-@@ -437,6 +438,11 @@ public:
-     QList<Ast*> finally;
- };
- 
-+class KDEVPYTHONPARSER_EXPORT TypeAliasAst : public StatementAst {
-+public:
-+    TypeAliasAst(Ast* parent);
-+};
-+
- class KDEVPYTHONPARSER_EXPORT ImportAst : public StatementAst {
- public:
-     ImportAst(Ast* parent);
-diff --git a/parser/astbuilder.cpp b/parser/astbuilder.cpp
-index 9c9ec056..32ab95c7 100644
---- a/parser/astbuilder.cpp
-+++ b/parser/astbuilder.cpp
-@@ -57,7 +57,16 @@ struct PythonParser : private QMutexLocker
- 
-     PythonParser(QMutex& lock): QMutexLocker(&lock)
-     {
-+#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
-         Py_InitializeEx(0);
-+#else
-+        PyConfig config;
-+        PyConfig_InitPythonConfig(&config);
-+        config.site_import = 0;
-+        config.install_signal_handlers = 0;
-+        Py_InitializeFromConfig(&config);
-+#endif
-+
-         Q_ASSERT(Py_IsInitialized());
-         m_parser_mod = PyImport_ImportModule("ast");
-         Q_ASSERT(m_parser_mod); // parser import error
-@@ -92,9 +101,11 @@ struct PythonParser : private QMutexLocker
- CodeAst::Ptr AstBuilder::parse(const QUrl& filename, QString &contents)
- {
-     qCDebug(KDEV_PYTHON_PARSER) << " ====> AST     ====>     building abstract syntax tree for " << filename.path();
--    
-+
-+#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
-     Py_NoSiteFlag = 1;
--    
-+#endif
-+
-     contents.append('\n');
-     
-     PythonParser py_parser(pyInitLock);
-diff --git a/parser/asttransformer.cpp b/parser/asttransformer.cpp
-index 3884ae13..0c54a498 100644
---- a/parser/asttransformer.cpp
-+++ b/parser/asttransformer.cpp
-@@ -1246,6 +1246,12 @@ Ast* AstTransformer::visitStmtNode(PyObject* node, Ast* parent)
-         }
-         result = v;
-     }
-+#endif
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+    else if (PyObject_IsInstance(node, grammar.ast_TypeAlias)) {
-+        TypeAliasAst* v = new TypeAliasAst(parent);
-+        result = v;
-+    }
- #endif
-     else {
-         qWarning() << "Unsupported _stmt AST type: " << PyUnicodeObjectToQString(PyObject_Str(node));
-diff --git a/parser/astvisitor.cpp b/parser/astvisitor.cpp
-index eda66000..df21cddf 100644
---- a/parser/astvisitor.cpp
-+++ b/parser/astvisitor.cpp
-@@ -104,6 +104,7 @@ void AstVisitor::visitNode(Ast* node)
-         case Ast::LastStatementType:                            Q_ASSERT(false); break;
-         case Ast::LastExpressionType:                           Q_ASSERT(false); break;
-         case Ast::LastPatternType:                              Q_ASSERT(false); break;
-+        case Ast::TypeAliasType:                                break;
-     }
- }
- 
-diff --git a/parser/python_grammar.h b/parser/python_grammar.h
-index 1b30be49..88c68f70 100644
---- a/parser/python_grammar.h
-+++ b/parser/python_grammar.h
-@@ -45,6 +45,10 @@ public:
-     PyObject* ast_Pass;
-     PyObject* ast_Break;
-     PyObject* ast_Continue;
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+    // type
-+    PyObject* ast_TypeAlias;
-+#endif
- 
-     // expr
-     PyObject* ast_expr;
-@@ -330,6 +334,10 @@ public:
-         Py_GRAMMAR_GET(mod, Bytes);
- #endif
- 
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+        Py_GRAMMAR_GET(mod, TypeAlias);
-+#endif
-+
-         Py_DECREF(mod);
-     }
- 
-@@ -472,6 +480,13 @@ public:
-         Py_XDECREF(ast_Str);
-         Py_XDECREF(ast_Bytes);
- #endif
-+
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
-+        Py_XDECREF(ast_TryStar);
-+#endif
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+        Py_XDECREF(ast_TypeAlias);
-+#endif
-     }
- };
- 
--- 
-GitLab
-
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild
deleted file mode 100644
index 07e58dda43be..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}/${PN}-24.05.1-python3.12.patch" ) # bug 929546
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild
new file mode 100644
index 000000000000..75a9f7ad66c7
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild
@@ -0,0 +1,48 @@
+# 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/Manifest b/dev-util/kdevelop/Manifest
index 34bd71bc5c50..75adbd0dff8a 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1 @@
-DIST kdevelop-24.05.2.tar.xz 8763748 BLAKE2B 8a6214aa03cfb507f24cf2bfe615f1a0851e46d4094df1ec1b2341ba468e10d5e955ef27ea4505dabfa9559eb53f94ecd03ef50d0d0bd7fbe1903964ba118bda SHA512 bf262c93bfb19ded1e914732b027275524ca4089f71d72a42ccbf544eb38a15d02051af493d7a545dc37c811b1637459f709c5776e879858640e16b19e0220ae
+DIST kdevelop-24.08.0.tar.xz 8784672 BLAKE2B 3b47231a31c713a355b506aa625a5440d0f5bc1f26cbb9f06b6f4ebea40ad753ed94d6701bda2016248a3025400a89c2dfb3e51430db62ee4631e31d380e8acd SHA512 b5c116cf8dde83e51bcd5c3445129f91233bc0314c18b85d3f5e48f2ac8433930594ef3f9d4d1330fd761beb93d2b91999c2344c3f41241214828a1f20226e6c
diff --git a/dev-util/kdevelop/kdevelop-24.05.2.ebuild b/dev-util/kdevelop/kdevelop-24.05.2.ebuild
deleted file mode 100644
index dafa1873c9f5..000000000000
--- a/dev-util/kdevelop/kdevelop-24.05.2.ebuild
+++ /dev/null
@@ -1,130 +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=5.115.0
-LLVM_COMPAT=( 15 16 17 18 )
-QTMIN=5.15.12
-VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org llvm-r1 optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="gdbui hex plasma +qmake subversion"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${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
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-plasma/libplasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:0 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-build/ninja
-	>=dev-debug/gdb-7.0[python]
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	kde-apps/kapptemplate:*
-	kde-apps/kio-extras:5
-"
-
-pkg_setup() {
-	ecm_pkg_setup
-	llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Purpose=ON
-		-DLLVM_ROOT="$(get_llvm_prefix)"
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		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.08.0.ebuild b/dev-util/kdevelop/kdevelop-24.08.0.ebuild
new file mode 100644
index 000000000000..46c949670673
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-24.08.0.ebuild
@@ -0,0 +1,122 @@
+# 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 'sys-devel/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/metadata.xml b/dev-util/kdevelop/metadata.xml
index 1e372bd1e6cc..ac0fe3203d37 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -10,7 +10,8 @@
 	</upstream>
 	<use>
 		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-		<flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag>
+<!--		<flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag> -->
 		<flag name="qmake">Enable support for QMake build system</flag>
+		<flag name="share">Enable support for patch sharing using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index ea7b9fd73dc6..e7a909bbb8ed 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,2 +1,2 @@
-DIST kdesdk-kio-24.02.2.tar.xz 40468 BLAKE2B 3c835dcf03a2c85d0acef9f38ca463f2b0114c7297759bfac6b6ba7879adb34ec8c68cf0145da66d0089757bc7e72fb6ae9b7fd4556a4d9c661ee2cf26e26db3 SHA512 3c005bbe1868b91997beb464a7ca9ef27beb81e8599127be497957d202be2b526ab4366bf85c1e2c30dfdda995c675a233f6613d8521e82d332a94d735e1f94d
 DIST kdesdk-kio-24.05.2.tar.xz 41144 BLAKE2B d2c87c7e37e5cf795b0d931fed4644fe87fcdffd156044eeb14ed1c2063f5c4f939c2c8c3fd2fc46d49a123a2e8d50ee5e6c798e36eef55178a2d843c418ec9c SHA512 337b3c7b8f06aec472ad01335275ef90831ea2b54210058a3ce9457e4d3fbc642b9a8870cd9e3bc089cf590fa92407bc8ccc7df665a751c2fea278e5a3f83e61
+DIST kdesdk-kio-24.08.0.tar.xz 41772 BLAKE2B 79a1ff45566b03d08298c9c68586aa94e49fe3202294b94a436964395248f86de6ec7e6db620bb665871efe2e9e70d9718053a81893e234eb68d9608e83946ff SHA512 01fc26b2a4d5efc78e19d54977af9701becb091900c0103df1db4b40ea2e9c3f493a8641bcdf9f620dda2da2f5ab7658e9c0b736edf1d3cfb190fe6324e5c2b9
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.02.2.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.02.2.ebuild
deleted file mode 100644
index f6526a61d017..000000000000
--- a/dev-util/kio-perldoc/kio-perldoc-24.02.2.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=5.115.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker interface to browse Perl documentation"
-
-LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
index 3b854d36fb97..fc2748d99a38 100644
--- a/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
+++ b/dev-util/kio-perldoc/kio-perldoc-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KIO worker interface to browse Perl documentation"
 
 LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.08.0.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.08.0.ebuild
new file mode 100644
index 000000000000..a50ec345e017
--- /dev/null
+++ b/dev-util/kio-perldoc/kio-perldoc-24.08.0.ebuild
@@ -0,0 +1,23 @@
+# 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/libabigail/Manifest b/dev-util/libabigail/Manifest
index 0909ffe631c5..29214a007aad 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,7 +1,3 @@
-DIST libabigail-2.2-docs.tar.xz 46776 BLAKE2B 469981ea9879b202bcfd68dfa1d71c25470c6c9b9a8058ff29923a4cb7ecd5cb652b239bf6faa05c6b7e479b425e2fd4327a0d6e1703f3622299d743b72e8b5c SHA512 c06bfa95957390ca7abd1e47a79e2da813fd3bdfb8dcaf23bf81da697c77b67d9cd5457010291e2753fcc74f55803a1c81234aa3b8cb27c6b1ce3991f6ab60ab
-DIST libabigail-2.2.tar.xz 351078692 BLAKE2B fc03b1653fbe94213713e710c358133a2abd51cac46c8d4b5d797715b16e3d9923ddd99f9a2f85352599b6b5628f52e505f0ec2bca6dc3ea118826bbe69ff42b SHA512 c512c4a497ea6bb88283feae6c31cf5fe347c260cf1670fe65296bf158d3a2aa449ca518a4f2780e814ffbe6970c7856d2ab91e15499638db78bc52d67d794ce
-DIST libabigail-2.3-docs.tar.xz 48016 BLAKE2B 5649dec61017cada11fefcb40d71ecf438d3e2753c32cf424514ece2d5b737415f220e7a36b0edc597c3155a954c994256da7745e22318ae63dfb58d8d3bd72b SHA512 8ead43911fcb7cb3c3bc63ef7dea911ff72a4249845e1d79e28a730fb05216088713905daad31b228b5fc2b6f50b492321b68989be50a427f59425006a4ccc6f
-DIST libabigail-2.3.tar.xz 381350984 BLAKE2B 1a580cdc0f60fbf6edbf701e65531fb2b7254232a24edc23600aee49de87eea1c07c4ab93d55c1bce17ce7e0be6e074c7aab83ed6e3aff9076a844c224e52c74 SHA512 fdf0df51e2c262c723c11bef58cd0b89b27e67be196edeb33444fc06e7e61d3c2c227f59cb961aea6fc0c9b7f6f04e08b787a1cbbeb3d5507b968b8ae7630527
 DIST libabigail-2.4-docs.tar.xz 50320 BLAKE2B 6e3cc1a8ffc42d0a1307ed57576ec31254d4831ad785b868504ea67310d9a25633403a87b545ee6bcbedb164c7f2ac7fdef307a15a28520daebc505c7da852eb SHA512 48ede7c3b6bab8b26dfdbe3683f4ec6dd9ef0f4626e8bd7b4bc0242795bcad0f7638ee4dee21a65aa3c8f178514aa42223e67ff5a2804c8167db0bcc5bd4a105
 DIST libabigail-2.4.tar.xz 357840964 BLAKE2B c3d1c23c598fc8754405df10fcd1cfded6fe80e6949ae9d15ee28e99aad571477b331ceac2aeaa5a93f47da77de7ca41a692902b741e3a4aea1d72a7043d4a91 SHA512 f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
 DIST libabigail-2.5-docs.tar.xz 54388 BLAKE2B 5d0cdc349955e7d26c6e8655e124ed2b1961bf6da922ab8e77350fc8b0e52a3975a7873bd2d690cd2a7f4110c1c9938a7c1fecf1255d42a7f7b915511038a76f SHA512 cceb0a27031914fa6b02c73810a792bca35ad7b47b688022aa4d15ccbf81549e320b45871a99e7d81c21e10ed8a37ec4e6795662c0dc86f5d6e81dbb7b630856
diff --git a/dev-util/libabigail/libabigail-2.2.ebuild b/dev-util/libabigail/libabigail-2.2.ebuild
deleted file mode 100644
index 00d89ec11ab2..000000000000
--- a/dev-util/libabigail/libabigail-2.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
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libabigail-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${LIBABIGAIL_DOCS_PREBUILT:=1}
-
-LIBABIGAIL_DOCS_PREBUILT_DEV=sam
-LIBABIGAIL_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-LIBABIGAIL_DOCS_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-if [[ ${PV} == 9999 ]] ; then
-	LIBABIGAIL_DOCS_PREBUILT=0
-	EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
-	inherit git-r3
-else
-	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
-	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBABIGAIL_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs.tar.xz )"
-		LIBABIGAIL_DOCS_USEFLAG="doc"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0"
-IUSE="${LIBABIGAIL_DOCS_USEFLAG} test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/libxml2:2
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-rpm415 \
-		--disable-ctf \
-		--enable-bash-completion \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
-		$(use_enable doc manual)
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
-		doinfo "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/texinfo/*.info
-		doman "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/man/*.[0-8]
-	elif use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	local file
-	for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do
-		dobashcomp bash-completion/${file}
-	done
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.3-r2.ebuild b/dev-util/libabigail/libabigail-2.3-r2.ebuild
deleted file mode 100644
index 268fdce3a7d5..000000000000
--- a/dev-util/libabigail/libabigail-2.3-r2.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
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libabigail-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${LIBABIGAIL_DOCS_PREBUILT:=1}
-
-LIBABIGAIL_DOCS_PREBUILT_DEV=sam
-LIBABIGAIL_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-LIBABIGAIL_DOCS_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-if [[ ${PV} == 9999 ]] ; then
-	LIBABIGAIL_DOCS_PREBUILT=0
-	EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
-	inherit git-r3
-else
-	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
-	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBABIGAIL_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs.tar.xz )"
-		LIBABIGAIL_DOCS_USEFLAG="doc"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0/2"
-IUSE="btf debug ${LIBABIGAIL_DOCS_USEFLAG} test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/libxml2:2
-	btf? ( dev-libs/libbpf:= )
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		--disable-deb
-		--disable-fedabipkgdiff
-		--disable-rpm
-		--disable-rpm415
-		--disable-ctf
-		--disable-debug-ct-propagation
-		# Don't try to run Valgrind on tests.
-		--disable-valgrind
-		--enable-bash-completion
-		--enable-python3
-		$(use_enable debug assert)
-		$(use_enable btf)
-		$(use_enable doc apidoc)
-		$(use_enable doc manual)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
-		doinfo "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/texinfo/*.info
-		doman "${WORKDIR}"/${PN}-${LIBABIGAIL_DOCS_VERSION}-docs/man/*.[0-8]
-	elif use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	local file
-	for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do
-		dobashcomp bash-completion/${file}
-	done
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.5.ebuild b/dev-util/libabigail/libabigail-2.5.ebuild
index 0e0b6d252158..94ba41550820 100644
--- a/dev-util/libabigail/libabigail-2.5.ebuild
+++ b/dev-util/libabigail/libabigail-2.5.ebuild
@@ -16,14 +16,15 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
 
 DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
 HOMEPAGE="https://sourceware.org/libabigail/"
 if [[ ${PV} == 9999 ]] ; then
 	LIBABIGAIL_DOCS_PREBUILT=0
 	EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
-	inherit git-r3
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
 else
 	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
 	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -31,7 +32,7 @@ else
 		LIBABIGAIL_DOCS_USEFLAG="doc"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
@@ -58,9 +59,11 @@ BDEPEND="
 
 src_prepare() {
 	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
+	if [[ ${PV} = 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 my_src_configure() {
diff --git a/dev-util/libabigail/libabigail-9999.ebuild b/dev-util/libabigail/libabigail-9999.ebuild
index 0e0b6d252158..cefba4dd0aab 100644
--- a/dev-util/libabigail/libabigail-9999.ebuild
+++ b/dev-util/libabigail/libabigail-9999.ebuild
@@ -16,14 +16,15 @@ LIBABIGAIL_DOCS_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
+inherit libtool bash-completion-r1 python-any-r1 out-of-source
 
 DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
 HOMEPAGE="https://sourceware.org/libabigail/"
 if [[ ${PV} == 9999 ]] ; then
 	LIBABIGAIL_DOCS_PREBUILT=0
 	EGIT_REPO_URI="https://sourceware.org/git/libabigail.git"
-	inherit git-r3
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
 else
 	SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.xz"
 	if [[ ${LIBABIGAIL_DOCS_PREBUILT} == 1 ]] ; then
@@ -58,9 +59,11 @@ BDEPEND="
 
 src_prepare() {
 	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
+	if [[ ${PV} = 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 my_src_configure() {
@@ -71,7 +74,6 @@ my_src_configure() {
 		--disable-rpm
 		--disable-rpm415
 		--disable-ctf
-		--disable-debug-ct-propagation
 		# Don't try to run Valgrind on tests.
 		--disable-valgrind
 		--enable-bash-completion
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index aa7f7575e68b..8df51ce1e122 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,3 +1,4 @@
 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.10.tar.bz2 350692 BLAKE2B a7596586adb63e3d7cdd849b4e6a4812409749c7e84f081d5367f3d5393884f8ae3e945597500336befac14191e84179decfd5153dff6cdcaed2d041055c268e SHA512 21c21bc186c0cf8465e411fdeeb09ce9f11fc0499915abaa086a2143ddc69905805b83847dad7e7c54aef4e61a9fc5507af5f25e478b2edd387309c7ca525b6f
+DIST lttng-modules-2.13.14.tar.bz2 355555 BLAKE2B 477947e83daf4f838453d82292f73cb24030639b1394fa586271285e0d1604d8098b1869c5cdcf2a1f55f9916e98a2f2e0dd005ca2d17c76db5362e38a29e993 SHA512 521c19cbdfa8e6f9d06f1a06312aee201823e1a7d1987f3de5d9dae08163cc8b51daff1bcbcbe79261ed8ded7232857136e7d0d4ebc05a3380b7377d43c1ee38
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
new file mode 100644
index 000000000000..3309c26ea9f4
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.13.14-r1.ebuild
@@ -0,0 +1,42 @@
+# 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-tools/Manifest b/dev-util/lttng-tools/Manifest
index ab07ce3f261c..37eb8eb98551 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1 +1,2 @@
+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/lttng-tools-2.13.14.ebuild b/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild
new file mode 100644
index 000000000000..5c8ab318c0d8
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.13.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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
+)
+
+src_configure() {
+	# bug 906928
+	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
+	econf $(usex ust "" --without-lttng-ust)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 55abe0bc0280..9cb46eed5c4c 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -2,3 +2,4 @@ DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb
 DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
 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.13.8.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
new file mode 100644
index 000000000000..64e123d94951
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+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"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/userspace-rcu-0.12:=
+	numa? ( sys-process/numactl )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
+
+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
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable examples)
+		$(use_enable numa)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild
index 877b67e0f2b8..fd131f66d2a1 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-2.0.0-r1.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 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index b446d2f15c7f..71a99ab37afe 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,2 +1 @@
-DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-DIST massif-visualizer-0.8.0.tar.xz 274380 BLAKE2B d32e1f3f6229107db731f632fbc44e9a4ca5f0eb537717827e2b2dcf354eadd3b25aa4bf714229d98ecfdb2388a27cbcae5f0188a2effde6ce8c768eaed60f1c SHA512 e5bbcb7e5e0ac073ec292fffe397242b94c98895f3abb28ccf2f9c9727c52e3c6ae333a447b3131daa3164e9409d1dcb6c9852ab48a24985d07b1e32943045ae
+DIST massif-visualizer-24.08.0.tar.xz 279068 BLAKE2B f6e169b6531c942f54003c5c2d0f50dd6139c551c2a3eb68228f54901a5d83f882906ebcda7480a9eea39d7b235bc9b5c69b11294cb05303d30640fe0885bcb6 SHA512 82df818727642dda2d299a9bbe055c903298178ba92e6e461503b4938e97789a2e9da75627ad90297ec6f31f33b5b28dc390dd48e10708ef56f145d429c45199
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
deleted file mode 100644
index 57e27fc9b26b..000000000000
--- a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 51788c6f295651fecd3bb498236bbcf3c263ee84 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Sun, 20 Jan 2019 09:37:43 +0100
-Subject: Fix window icon for non-desktopfile WM to own icon
- "massif-visualizer"
-
----
- app/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/main.cpp b/app/main.cpp
-index c4526ba..21865e0 100644
---- a/app/main.cpp
-+++ b/app/main.cpp
-@@ -50,7 +50,7 @@ int main( int argc, char *argv[] )
-     aboutData.setOrganizationDomain("kde.org");
- 
-     KAboutData::setApplicationData(aboutData);
--    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("office-chart-area")));
-+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("massif-visualizer")));
- 
-     QCommandLineParser parser;
-     parser.addVersionOption();
--- 
-cgit v1.1
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch
deleted file mode 100644
index 252d75ba6a0e..000000000000
--- a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-linking.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d49c8946fea8ce239e258c5e69fefd1cae5cb5fe Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 6 Apr 2021 00:29:33 +0200
-Subject: [PATCH] Add some missing linkages
-
-Currently things work due to transitiveness, but we better not rely on that
----
- massifdata/CMakeLists.txt | 1 +
- test/CMakeLists.txt       | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/massifdata/CMakeLists.txt b/massifdata/CMakeLists.txt
-index a8a7b98..4881a30 100644
---- a/massifdata/CMakeLists.txt
-+++ b/massifdata/CMakeLists.txt
-@@ -21,4 +21,5 @@ LINK_PRIVATE
-     KF5::Archive
-     KF5::KIOCore
-     KF5::I18n
-+    KF5::ConfigCore
- )
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 38c510e..7ccbc2d 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,6 +1,6 @@
- ecm_add_test(datamodeltest datamodeltest.cpp modeltest.cpp
-     TEST_NAME "datamodeltest"
--    LINK_LIBRARIES mv-massifdata mv-visualizer Qt5::Core Qt5::Test KF5::KIOCore
-+    LINK_LIBRARIES mv-massifdata mv-visualizer Qt5::Core Qt5::Test KF5::KIOCore KF5::ConfigCore
- )
- 
- add_executable(massifparser massifparser.cpp)
--- 
-GitLab
-
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch
deleted file mode 100644
index d6333da7185a..000000000000
--- a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-unused-dep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c66b5a33885211da16cd720fd0f6ab5b4abba297 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 28 Oct 2021 00:20:53 +0200
-Subject: [PATCH] Remove unused XmlPatterns
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 569974f..f2f15f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,7 +23,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-     Core
-     Widgets
-     Svg
--    XmlPatterns
-     Test
-     PrintSupport
- )
--- 
-GitLab
-
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
deleted file mode 100644
index da42e66688b4..000000000000
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool visualising massif data"
-HOMEPAGE="https://apps.kde.org/massif-visualizer/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+callgraph"
-
-RDEPEND="
-	dev-libs/kdiagram:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	callgraph? ( media-gfx/kgraphviewer:5 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-window-icon.patch"
-	"${FILESDIR}/${P}-linking.patch"
-	"${FILESDIR}/${P}-unused-dep.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package callgraph KGraphViewerPart)
-	)
-	ecm_src_configure
-}
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.8.0.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.8.0.ebuild
deleted file mode 100644
index e56651cdd870..000000000000
--- a/dev-util/massif-visualizer/massif-visualizer-0.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
-
-ECM_TEST="forceoptional"
-KFMIN=6.1.0
-QTMIN=6.6.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool visualising massif data"
-HOMEPAGE="https://apps.kde.org/massif-visualizer/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-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}
-	!${CATEGORY}/${PN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package callgraph KGraphViewerPart)
-	)
-	ecm_src_configure
-}
diff --git a/dev-util/massif-visualizer/massif-visualizer-24.08.0.ebuild b/dev-util/massif-visualizer/massif-visualizer-24.08.0.ebuild
new file mode 100644
index 000000000000..fa21ff02e143
--- /dev/null
+++ b/dev-util/massif-visualizer/massif-visualizer-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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"
+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 fb40991cf20b..6fe2b3150b23 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -75,6 +75,7 @@ DIST cc-1.0.81.crate 66857 BLAKE2B 1f20aa7fe1e41b7d043242ed2e6b840ef7e764fcd844d
 DIST cc-1.0.82.crate 67879 BLAKE2B 3b06cbe1516d4fe8291e1543b09d32d39a135c2352e545b64bc69fc82a40128a9b1291f20bd4cac6a3c37d9466093f8b63cae20663ad517bd7dbc380bfa87ee7 SHA512 27810ea12401635b0122e5b3a71367a52ca7040f196cb30f709e0b8ec0e717aeb8a89ef4e891b1c7c88f7cc8a1c35e55db132b728b0c499e0b683d5b803a671f
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cc-1.0.88.crate 75288 BLAKE2B 81c512bff79ddc40af633620ea440a73d3f7370c96878b3a84606ac0523f13a9ea756765afedaf2148344ffca3ce928fbb0678977273c918c21b4e3985507938 SHA512 67ca5820d36d1be38e56f54a0292d550c9c129d680611a60fbbfa458b8cb748e5f27c7ed1eb767ac3df41cd4e875160525b81ab624726183b1d298ffdcb87846
+DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1dd8515ff5ec43abd1da75bbb400460a43a252c93dd0a597c2e44c8e899a376d963f0d3727db7ca2c24 SHA512 ea8bd8150042268092360e6396226ee5e83ba154eae99d299c897ed16e8543fcfe3179e22b50b0497bcf065a16933f4ebf7edcae7e6fc8be3788f0ae7f61c000
 DIST cfb-0.9.0.crate 67837 BLAKE2B bab7c813d6636c6e8f371ea8a76ee23361b4f53235cdef2378ebfb9b3df30ddbc6d229a4a904d0711df5dca78711926407a0e2696a4e0d6151b5dcdf8f3067dd SHA512 6bff6dc27f459c7ae15fb537ea0218e17abe2477fa9aafad6b3d0b17773272db61df48ea9cb5055b35459373684b20a0bed031a4a53df42f262c08aa05307d4b
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb662275799f34159dff9c22ca61a71d722f199ed36b2fadebde30b5763cc01d87bd6f27e70ff8ad357df10d6ddb652a8 SHA512 61166acd4fba3330c4c71e101e1993717baa448d91dd9773f7d58ac504fa4025322560ce82bd7de1b5935443f96ba84691658e5c982192196b325f52dc48f4b1
@@ -88,7 +89,9 @@ DIST clap_builder-4.5.7.crate 163957 BLAKE2B a1d6e728f05b7f7eab8fd9fc8dd0e25f8a0
 DIST clap_complete-4.4.9.crate 37659 BLAKE2B 99de16ea4fab3996ed9e7d0855b0184ceb3c5740b690120b48490c1fe78115dcad3d8b52b3ffa31afb2b0e9f8e4c0beb8e331e4cbd5b1f688c1dcd4b49f06ab3 SHA512 79ca2717a7c4752959ca48c60e8e0751de67be1e40717cb336028d5edbeff0650cb3bbab8463dc6f227feeaac3f18acc249f08f26d1855055bae07758b3733d6
 DIST clap_complete-4.5.5.crate 38809 BLAKE2B 943ff061b229d3120368579dec89a3ffc0af592ec7d7d4cbc2260fa5c2435e1e1fb0e50c2f305f50b5899f93bf1d0ecb619602ac36b2790d364c656dc46b2f14 SHA512 b127163fa81c3934436481805179ae198b932ec3fd6bf0453b75c0d3672a7c3aa5d022411e88c7284de843c944da633aa566078714a495233eea9b992de4a609
 DIST clap_complete_command-0.5.1.crate 8273 BLAKE2B 84302d7ffc34d9e947dd141421462b2035f324a77a8c68fa342a49242b0f97e43afc54be90d7cbb2efb311ea7848313af3d98c572402e7b25f83c22ff1fce8c4 SHA512 0cbd75f41349c709440ceee1075cd209f927b928c665b31907caecae91ab0b1e00c0a73f8185df754663e4d079467c6312abdc175bb6f8bd58c6d783b371754c
+DIST clap_complete_command-0.6.1.crate 7959 BLAKE2B 61bb266fdebb625ce3327164ab39d65943406fe9c101f10fa3a1f18d4728e0eeca07dcd8eb4e8f6eb63587cd1af86fb05beedf1c5b2bbaf22356f213ea738c7c SHA512 b364cac56e9604c7c06a84f5d687b62398f92e3c0407123b183d5c3846948a4a0975469326312ad57e2ce936574462f3dde61385062827e48efc3ff813185ef6
 DIST clap_complete_nushell-0.1.11.crate 32198 BLAKE2B 6a704251bfc10fa7fd113f7e82bdeb9655f2e23d851fc3d654332ee196214b179fa83ed6c57b436df247f6eb1d2feb28017090b9087b7b8d92283978e7ce9957 SHA512 04098511e19cb629df43509f2596904ec2a8690fa6bcf160825030c42dad73f77ed184e5a4dce10c8308b9718541540f10277b0ef0fee6b039ac1e7b482d3cf2
+DIST clap_complete_nushell-4.5.2.crate 34391 BLAKE2B ce7a44c4a9e3d577e014c71d6f8f6b16e192ae169f499973316f6f3c7febae59c957ba6acc153802bde423fd58301b5b5ef5b606e275bf8f608ad40fb192338b SHA512 1da7b7f01e948f4c055bb912426d950418f353837dda9e6bb8e249bda4169b29de2291173c9d0193f0c746ec1387ad8a893721f32125f14565948f2e90fddf53
 DIST clap_derive-4.3.12.crate 29052 BLAKE2B 501fb22eddca5b21456bd9911ad1f90ee5d5c918eedd08e2615d22ce58bb0fa5dd626b51a734f20b78411b9a4492ae63629131e0c2e1bd0f3eee21e5da3fb37f SHA512 a58e948fddf45321f0fcfe9d9afbeff42849da472fc4e4b15c31f46ffe55a0dba34d2c1d14e342530c1e4080c43de790595e4f3dca06cbb6a8a60f9e3cab3abc
 DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167
 DIST clap_derive-4.5.5.crate 30017 BLAKE2B 8525d8adba25ec0165936f72f78dec3cdffedc9de8e537b078944b1830640222013e335e86a2337ae9ea3b07dd655275705eeeb8c2155224dc0950ed00e47f7f SHA512 90c2110445c832d81cf66287ebe32155c6bd72a0a75cdbceef4e411d4b9d83268af244adab6755379b6970b5d40b39a9f89df9ef8786429fe73d95a3eee1c134
@@ -229,11 +232,13 @@ DIST mailparse-0.15.0.crate 37293 BLAKE2B 3ef9c0f3e65288066a1a792b3ad5bf4ca08126
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maturin-1.6.0.gh.tar.gz 464510 BLAKE2B dc40df2ae593d57dd8d52526734cf6e8cf01c42de4cd92b5ee0d4a20168367bef6b6fe783dd7e2ba51d96b91510699a207ada15c69f97cc832d34eb5f1028ae2 SHA512 de67ce91200fb17ffe40587ae66b9a39db53ba74512354aa632631097926833be01dd685eefcfc95e9f13535c73ba1dcd166b2111d987769aa109f4a7f8e2c09
 DIST maturin-1.7.0.gh.tar.gz 498922 BLAKE2B 9bfbdc145ffe973ddbbc8cb29ec4b04564cfdb3766ae1211355f3b13abcaee52dd1e8c19e2811fbc7d32e799d659fa8a1b08b509feae25423b0034de1a8b2834 SHA512 3121607866f6338fc13e5a17a1a0bf673e72704acc7f31f2015584af519e96158effecbf8651be614e1faa2c0dc4136966525ae9e4ce04aed9b838ff21abb978
+DIST maturin-1.7.1.gh.tar.gz 505952 BLAKE2B 0b1294277e3e203a38d904782fb9e9fbc8336f50670abd1c68b8c8c2ff2a7dfdcd8fa6e98dfb4b43c625349d01f6b89826b8c9740e7660629671ad4c07ee0fd7 SHA512 7022cb87d5710807f1b8e4e858d19e2dc2e07b02d7f47e9bc6a322686dce90c7aeb8c2f5caf7b5da4ca61cadbede7daf84728ae9f341c38384231872c9be5cb2
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
 DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
+DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST mimalloc-0.1.42.crate 4079 BLAKE2B 9cedd8487f419cf1132828fa798af8eecb587abfe2419aa063a1a4d3e24bd0b3dc5c379a24dec6f83d63d984e2fbe5742c4b968cbbc422724c4f43a8328f265a SHA512 d9d37dc9bdaf5bbd5b28921c2cf8d7fc3bf704c6fda893310f5ad43710f22f3543264fbca122097c90501cb543db73b282ce67aca9dc7ce774121085b1127f80
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
@@ -261,9 +266,11 @@ DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0
 DIST oneshot-uniffi-0.1.6.crate 31794 BLAKE2B d5cbb1ab31f541167692541d8f1f6c75243d5b39ff9c2357d25ca1da5d7eccc3fd2ff7ce4dbaf246e26c6741d2e78bba036388c7c1d63cf024d476737a9bd3ef SHA512 d87a9843546626ae3d0d06f347638b62b4dbd34ae3d1a9651353734d7dde120e474161f8e45bcbed2dc9c9e708cb38e9501d7e40ed62c39f48026009c20adfea
 DIST openssl-0.10.63.crate 270890 BLAKE2B 0571a214347f823c9079c1f6d204c62469235ced63cbfdb8494427aed8069f45bbb26b81d1edbddb3602c0bffd54d1ca96204aef8cb85aec041edf45d89889db SHA512 47baa5f2e34b622dff0cd475dbbf6772adf48abbcec5be1cbcafe2beb9060ae46a3d873896ee4b5d864da0b132f0efd956596c49f2afc650a44cff6af001aa56
 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 openssl-sys-0.9.99.crate 68158 BLAKE2B 59995535bc24f0ca67ea204193aee4114f88538bbd74ade7c22bc2ea1b0d7e41a79118b6d22917bd1e305a43c16f8aea095c635d27a56fc0481a2baa3092dfa3 SHA512 b91197583135c22d34814e6382dc4ad4be9c3905c979addee8688dbc52ce627815e719b9d0b365195335d4d665eaa79a406f89e4c19cef73988938d51fe2f4ee
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
 DIST os_pipe-1.1.5.crate 11430 BLAKE2B 45abc371ddd363d193817a339f9e1894ec6fd275b9c9d190283347bb023ec7686e3ca6a5f2bf09cd7ee6abb8843ae52410c203af2310bf3e35c280c5b9874ea5 SHA512 d862484e9a0594f31e45531fac9a892fe247c1003a9c365a28083c0b5132719fe6fcd7ed996716a4baddf1f8ec4857d62d05663d3fd7ecee5802005c55368048
@@ -279,7 +286,9 @@ DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d
 DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
 DIST path-slash-0.2.1.crate 8821 BLAKE2B b3564d0f689ad1b943d132fd95adf2ff654b61f182082bd22f7b8f11dc9024cae8e1b9f3551c4424509db17aef899efd3df96a67e1cd588ffe0fe385c957b361 SHA512 c046707586f25f13d2f9fa452ea340198f6d2e6333ca3af806b9d2d1a61d46b033fffad60d1632ec16062fa79a3710d695b923b831a7db52602b728ed31fc3ab
 DIST pep440_rs-0.5.0.crate 42582 BLAKE2B 667d172ec08237e40dbdf6e42f4ddf3b018a78e181ff50a0a240c7138f8d414a4390befa6cc7df41f489fad49703bb5e75b78e9be4d4d477b20e552ca8eaf896 SHA512 dccb69fcc8c85c3b02922964f24a0e2200e3b1649600c175d75fbf99d0a858b8d59a21d897429134199a6d2877163dcdbc1613e4eebaa174ccb26824b4458571
+DIST pep440_rs-0.6.0.crate 42496 BLAKE2B 46d1ce98ab48233799acca4e1aab1d4837ad0c4814cafe6d971a39c5d1fefe034896ce1d468ffe77b9a61f3c52fe7a1ee05e590eb4c67c718356e54da9349d50 SHA512 4c50012b5d04227d0dc8cd919b10b774d7c1abcc08bc5d0f9e7817c846ae906b9cb60cf2b0d65c9ca37d3b5b592e50d5847aebbf136366b4032105b287167b8a
 DIST pep508_rs-0.4.2.crate 33741 BLAKE2B 4d80a7872300e364cd78d7d8f635e3bfc8b22113c9a3226b1467f8408e5960b68eb97cc87fe9c90e50dbd93e07fbfc567d5219ddceaa0e1c40aa47544d8a219b SHA512 4b5a437f4dadb391d9afcb7a9dfac786d0dadc9ee87cf9cbb68644243d000e21272839c3e42c0044138afea5c9d20233fe01a3166384b6a54324e03a3169faf1
+DIST pep508_rs-0.6.0.crate 34138 BLAKE2B 3eed7514426f0aa1a17be19727cd0dff745a6f2caaca2beaa29a4a4070722bb7e5aae72d9aa0ff8642e927fa5ba6801cb680f875c9ad5c55b648b503b7f998cc SHA512 fe7acd77ea677b7bf2096d7f9eeddd89478becf87b05bba604344c1ecff876a7c7feb75ac2e1ab1d39b2165905b206fa3877269e69aa6eabf3cf6db1427dbeea
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 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
@@ -290,6 +299,7 @@ DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c4
 DIST platform-info-2.0.2.crate 28443 BLAKE2B f6389f76c04954189a6ee38eca506659b7597b99ccf6c4eda8b9325318de52b40447ed5474062002afc7fdd8411c8a56b9e4a0b03843ed47d54ca9b37e96227c SHA512 06f36f3091baaa502d33322e5e77d4871781144ed4ca33a3097c9611cf78e2e91852b8be59b1869e2e441ba0f8a076d4f25bdab7235e3324247d1b5bf49967da
 DIST platform-info-2.0.3.crate 28454 BLAKE2B 22c60f2db10908c9dd0e07e74ea40823156e2d795bd6e3c279585a424c692762c0d18885c0c5782c3e6caa9a91ee6f3adba2279bb6cd0448041a667a82404fc2 SHA512 305699107d21673ab22e56dc42752f85dae93922dcef93233f355b73838e54c2d157e89db60ffdcfd38f105ca6804f76c524ebb75c4f94845ee0320c46c69d03
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
+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.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
 DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
@@ -303,17 +313,23 @@ DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6
 DIST psm-0.1.21.crate 23126 BLAKE2B 5972b4bad729d3c8842d4d616b1a469fd59ac7cecac5dc5754f084b7f2c623f715f302a9132cd146f48f323982c837a63cddbabfdc97c73ba88ee60df3d036da SHA512 33e34bb30efa5ec700c135e11fe03447d56e6f0dbca5536fa8bf9ca2c605c65e2dfe0a2a79a0bbe08eb2d2a37e569e31def340e1187bc25060c2f0e6537e3e5b
 DIST pyo3-0.21.0.crate 500599 BLAKE2B 8e56a264f6cb8b8e5cfcc1854e3732edecaefe874cbda4db10742c4865a876625b723010ec6d2539ccbb58643b26c5d03522a0f3d03121af09632f3adb1186de SHA512 90b551c6ac4867245b2667fc4a9b74875351aa0417cae6c24ecb4cce1b2d4ecdaa7e23a07bf188490a25b6033985f8598b3ae202917e9bed6f4d72168a5383c2
 DIST pyo3-0.22.0.crate 535742 BLAKE2B 772a4f8b718bbec32faa3dac4cad07a5b452fb366280753c3316d932663bf367192483fb5cd0bd405321128e67157b982eaa89264685739a141e021f0f7e2b72 SHA512 44e0237fd3a8d4c7b082c48a5c8a52d8f4cc4673d134f680e29504bb46d870015fa210da34de4c1998defbcd4afdf2aaea4e148fbe093e4b2c8b0d064cd48da4
+DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
 DIST pyo3-build-config-0.18.3.crate 29137 BLAKE2B 5fa645b64f50a078f38cc10a27ed52bd7e7aadd8a069c05ec2963f0b7c869b94d29eddda97cc31d200cf749ab8e2cd9cd1ea00e75620287e9187745ae0e100a5 SHA512 7ccad5f245e84895e147389f05270f32d12f81aba46bcd0dc184b8d62af2ea579efc50383502efda40601c981c4dbcf911aa7d8192364caa2e177ad939062cdb
 DIST pyo3-build-config-0.21.0.crate 30535 BLAKE2B 71bc1756e1640456cce58190d90f7c1059b9748d9d72a122dd4e28c74ba96cb9fd2bbd80791d3edf313349cc0fbaa669c8e9cecfc925c9828ac794fda17a6ed4 SHA512 ac1ee7389fe267c28ff67f5d6a23bdba57ad2e0dff16e7ef38bc2bc95d0a2a4aca0b1fe4cac8510163c6c5a44bdac128f36d7b34655dff5f8e690db38e5edc6a
 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-ffi-0.18.3.crate 64474 BLAKE2B 32bedfb4c7d88e539e958af0dd48af311934a817282a01f860af7cd824fa1e3825c505463b78cda57541bea8ccbbedacdc0f67bef686e6775fab3787c26c6d2c SHA512 55240c7824ad1e5c69e05a31ec03e2064290c89c4c98f06c3ebc38c311a10b1690571c977a103790ddcc9623ac42fbf525fb028e910baedb9acafe39fd6e4a82
 DIST pyo3-ffi-0.21.0.crate 66158 BLAKE2B 40809352e9df9ed13f833a73c9d50f71e63591a5b4680fbc85b2c10fa5d0ca65b793d6f467723bdc47887a38536fba4c2b2d9ba52f5ee9b2005a23d98778c407 SHA512 4405a6dbb06e739a54056a70b072b94b1181aa5ec06515c32ba76962fe4bce6b2b63cc179b77d3656123eff5f60e650bd6efe026794ad38d37e307f3653a3f96
 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-macros-0.21.0.crate 7917 BLAKE2B 3b7471486cbdfb8a9970f3aba9ad88dae9a2c620993f7a9cb6a3549e170fe9412318020e6c905eb35678d52d65a733e4858c30d33b6928dd1cb1f4f6a037c2c6 SHA512 b842f58813a152055f987ac065d3f38229a209c381b384160a1be49c271792347ffe97fbc6c898b120553e0f6f57743f9488cdc342a5a844fdd89bdd637515f7
 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-backend-0.21.0.crate 57562 BLAKE2B 12a25a2103d1c4c2e8da291ea64f202d3237eadbf55d7ce2bfaa8b6846df098ae5d0456cc9cf409c16fce323de127d60e0f5a458cb387198f604e6eb8e2a9dbe SHA512 e65b2816464ac189616f44065fbe45156f2aa560e880f0c8b49a7d097ac1dd278a9cf0c504b14de3ee550f0604da5ec991be6ee6fabdc53cef54f0a2f0a8d849
 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 pyproject-toml-0.10.0.crate 6072 BLAKE2B 672d391f2510f9eae63431e8d3d09825f103672dacbb51c5997d6d83a229ea3a877a79adfec0924ea48cdf143e915a2ff308a5865f26826d459ee1e7f4796f6b SHA512 9e8bd5572b86b9e9a27aa67a7f6a7eedeb9c3f190512577872cbce4fb52450a3966a3576a695d3e54bbe1005f9f6f1be4d20db3af4b354e294af8e8d50b59095
+DIST pyproject-toml-0.11.0.crate 6083 BLAKE2B 187c00dbf90bb32081088efd986d2072d8f8f35eefec683403f5a0a509e4673f443293051b7d828a1d917fd0f7bc308852a77c8bc9b4832d361e32135e9c0a79 SHA512 05a2529bf3ff5aab74ed86c71e1a0a2e8247404e2fab2dd24c04a7e832325c30da915d43a1c2e47ed5143824c24d4c961e19bf078e60687faedcec3a43e53b08
 DIST python-pkginfo-0.6.0.crate 211883 BLAKE2B 3ab285b3b48961e0bd3bc746673c32217ed548dca163cb1c6ed7fbebb78a152c60eda0573d95add08f149d0279c7abfcc9e8eea2ac07444e7c1afa7926912dc7 SHA512 27c1e1a8176475a4a16517e02ad723669b0be60a7e1ccc38e0461c2143985098386e829a112e61c65f61b09c249dcd26a1b35228041c91e1face325d1d9f097f
 DIST python-pkginfo-0.6.2.crate 211952 BLAKE2B f5663f3850457b4abf04f038ade370838fd32de30362a9880f626fe8e84e56227a868eb0028675ae624af47a169f93f7c199de32d8b31df65bbb160b31713a7f SHA512 bd028bab20cbd57ee0c7d469ceabd923f36bd4fc44116cb0e510c1ee2a1ee6aa8cd4d5efb20ac184c1e9d8a91ffabed1577e76e7c488c6a9aa304d09773219ca
 DIST python3-dll-a-0.2.6.crate 56866 BLAKE2B e8a83d0e02c281d8a626565fe1cde1158726c9ff718afb0888298454762832d47117d7a1bfd4e3e471e82ce684cd8c36d8d7ee036b07748cbf09aa915c2e046f SHA512 f64be4ed3b217d6905df5787afb3d403580eed1bffc17a251e2c8eab61aee6a187460894b568140c4d38369e77fb51c4d49f6df9127786f344b460951df249d5
@@ -438,11 +454,14 @@ DIST syn-2.0.40.crate 245201 BLAKE2B 70876ef8e459f582d8045e46fbee7cc00088693d7d6
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 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.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
 DIST tar-0.4.40.crate 51844 BLAKE2B b51c771611c2c1bc6a36d25493dd775bcb5891a2e4a8ae918781abe66c0335a3da30c5e44281fa5282dace34c09754fd2df840c0d74e5b0b4624a519fd455a8b SHA512 90bde0dfca91b6c304d5bcd4c93c653c066b76592927f5ed3025752d6d0244c0d5786c44af99df94dd6cc7a417663205d86f406a3b60f7307ca3c1757239bc12
 DIST tar-0.4.41.crate 51871 BLAKE2B 7b24e1d923089cff48e7f5be141838f5a3db78477ba58304b7a076d5d2eb31525f307d674546e0023e78836f992566646724870eee556db50e96d5a0c851cbcb SHA512 547d4a10cca5b593a04e3775bfc175a3a4de27f3c4dede305c6d50b63b4eb38152c6f06280098f14c4fadcca4cc9aa98626ea50aebe9bab2cb7b7f4e0c4d2b92
 DIST target-lexicon-0.12.11.crate 24594 BLAKE2B cf06720caecb5b5758f05c6375fa600da9260aac04017458060406a042dc578d51a2c5b6f189345d45dacea42ba01fbe46853d07f70d7b37cba17d87aa101f9a SHA512 f38701a8e9dd17b7db591b1b4c82c3b75d317e003262bb7b09b9cabd3afab5ab79c02a7dd524910b6941ada3a8f1378ea9e199b2b5938f8f01ee75bb0eae8718
 DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
+DIST target-lexicon-0.12.15.crate 26384 BLAKE2B d1ba50aa9d50647c6f778df86b35db1a4dee56fad918e6ef216688d9ac716dc5e8b40bff15aa89a99e4874e74d7e2731ad7fd9ea7094652def8abf57b74f9811 SHA512 32cf3e2da1c28003e1b6347abc8ae4d8182bf5b719ef84772271fc871dbaf96ec98c03b555a748cb8ab76584e67e17532757193d1d84b057cc90bed525727fb3
+DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
 DIST target-lexicon-0.12.7.crate 24402 BLAKE2B 3715b15649566b9f26fe02aad818325a43b54512008e4ea9fcda9ea15a87b8f4baf4ffd7343fc12456c97d8a6b1e121158c4cb61997de0e2d24d1bce93d86850 SHA512 0f3cdbd7515141315934b6ca61c5666f3bf60e259711f68ed3c33468e2bd400cedf824db7158a80fa07e78cc7ac2a0a1eed2df199352176148e9df34b06511a2
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7
diff --git a/dev-util/maturin/maturin-1.6.0.ebuild b/dev-util/maturin/maturin-1.6.0.ebuild
index 0db2445f7122..74050422364e 100644
--- a/dev-util/maturin/maturin-1.6.0.ebuild
+++ b/dev-util/maturin/maturin-1.6.0.ebuild
@@ -466,6 +466,7 @@ BDEPEND="
 		dev-python/boltons[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-vcs/git
+		elibc_musl? ( dev-util/patchelf )
 	)
 "
 RDEPEND+=" ${DEPEND}"
@@ -502,6 +503,9 @@ src_prepare() {
 src_configure() {
 	export OPENSSL_NO_VENDOR=1
 
+	# bug #938847 (TODO?: should probably be an eclass default for musl)
+	use elibc_musl && RUSTFLAGS+=" -C target-feature=-crt-static"
+
 	# https://github.com/rust-lang/stacker/issues/79
 	use s390 && ! is-flagq '-march=*' &&
 		append-cflags $(test-flags-CC -march=z10)
diff --git a/dev-util/maturin/maturin-1.7.0.ebuild b/dev-util/maturin/maturin-1.7.0.ebuild
index f08f88e3b8fa..59cc413d226f 100644
--- a/dev-util/maturin/maturin-1.7.0.ebuild
+++ b/dev-util/maturin/maturin-1.7.0.ebuild
@@ -421,6 +421,7 @@ BDEPEND="
 		dev-python/boltons[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-vcs/git
+		elibc_musl? ( dev-util/patchelf )
 	)
 "
 RDEPEND+=" ${DEPEND}"
@@ -457,6 +458,9 @@ src_prepare() {
 src_configure() {
 	export OPENSSL_NO_VENDOR=1
 
+	# bug #938847 (TODO?: should probably be an eclass default for musl)
+	use elibc_musl && RUSTFLAGS+=" -C target-feature=-crt-static"
+
 	# https://github.com/rust-lang/stacker/issues/79
 	use s390 && ! is-flagq '-march=*' &&
 		append-cflags $(test-flags-CC -march=z10)
diff --git a/dev-util/maturin/maturin-1.7.1.ebuild b/dev-util/maturin/maturin-1.7.1.ebuild
new file mode 100644
index 000000000000..5d09e0929ff8
--- /dev/null
+++ b/dev-util/maturin/maturin-1.7.1.ebuild
@@ -0,0 +1,541 @@
+# Copyright 1999-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
+	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
+	arbitrary@1.3.2
+	autocfg@1.3.0
+	automod@1.0.14
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	bitflags@1.3.2
+	bitflags@2.5.0
+	block-buffer@0.10.4
+	bstr@1.9.1
+	byteorder@1.5.0
+	bytesize@1.3.0
+	bytes@1.6.0
+	bzip2-sys@0.1.11+1.0.8
+	bzip2@0.4.4
+	cab@0.5.0
+	camino@1.1.7
+	cargo-config2@0.1.26
+	cargo-options@0.7.4
+	cargo-platform@0.1.8
+	cargo-xwin@0.16.5
+	cargo-zigbuild@0.18.4
+	cargo_metadata@0.18.1
+	cbindgen@0.26.0
+	cc@1.1.6
+	cfb@0.9.0
+	cfg-if@1.0.0
+	charset@0.1.3
+	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
+	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.3.2
+	dialoguer@0.11.0
+	diff@0.1.13
+	digest@0.10.7
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	displaydoc@0.2.4
+	dissimilar@1.0.9
+	dunce@1.0.4
+	dyn-clone@1.0.17
+	either@1.12.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.8
+	filetime@0.2.23
+	flate2@1.0.30
+	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-timer@3.0.3
+	futures-util@0.3.30
+	futures@0.3.30
+	generic-array@0.14.7
+	getrandom@0.2.15
+	globset@0.4.14
+	glob@0.3.1
+	goblin@0.8.2
+	hashbrown@0.12.3
+	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
+	idna@0.5.0
+	ignore@0.4.22
+	indexmap@1.9.3
+	indexmap@2.2.6
+	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.5
+	libc@0.2.155
+	libmimalloc-sys@0.1.38
+	libredox@0.1.3
+	linux-keyutils@0.2.4
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.21
+	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@1.0.21
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.3
+	msi@0.7.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
+	num_enum@0.7.2
+	num_enum_derive@0.7.2
+	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.0
+	pep508_rs@0.6.0
+	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.0
+	proc-macro2@1.0.85
+	proc-macro-crate@3.1.0
+	psm@0.1.21
+	pyproject-toml@0.11.0
+	python-pkginfo@0.6.2
+	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.5
+	relative-path@1.9.3
+	rfc2047-decoder@1.0.5
+	ring@0.17.8
+	rstest@0.21.0
+	rstest_macros@0.21.0
+	rustc_version@0.4.0
+	rustix@0.38.34
+	rustls-pemfile@2.1.2
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.102.4
+	rustls@0.22.4
+	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.204
+	serde_derive@1.0.204
+	serde_derive_internals@0.29.1
+	serde_json@1.0.120
+	serde_spanned@0.6.6
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	shell-words@1.1.0
+	shlex@1.3.0
+	similar@2.5.0
+	slab@0.4.9
+	smallvec@1.13.2
+	smawk@0.3.2
+	snapbox-macros@0.3.9
+	snapbox@0.6.10
+	socks@0.3.4
+	spin@0.9.8
+	stacker@0.1.15
+	static_assertions@1.1.0
+	strsim@0.11.1
+	subtle@2.5.0
+	syn@1.0.109
+	syn@2.0.66
+	target-lexicon@0.12.15
+	tar@0.4.41
+	tempfile@3.10.1
+	termcolor@1.4.1
+	terminal_size@0.3.0
+	textwrap@0.16.1
+	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
+	tinyvec@1.7.0
+	tinyvec_macros@0.1.1
+	toml@0.5.11
+	toml@0.8.14
+	toml_datetime@0.6.6
+	toml_edit@0.21.1
+	toml_edit@0.22.14
+	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.4
+	twox-hash@1.6.3
+	typenum@1.17.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.13
+	unicode-xid@0.2.4
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.9.7
+	urlencoding@2.1.3
+	url@2.5.2
+	utf8parse@0.2.2
+	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@5.0.0
+	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-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_gnullvm@0.52.5
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.5
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.5
+	winnow@0.5.40
+	winnow@0.6.13
+	winsafe@0.0.19
+	xattr@1.3.1
+	xwin@0.5.1
+	yansi@0.5.1
+	zerocopy-derive@0.7.34
+	zerocopy@0.7.34
+	zeroize@1.8.1
+	zip@0.6.6
+	zip@1.1.4
+"
+# additional crates used by test-crates/* test packages,
+# `grep test-crates tests/run.rs` to see which are needed
+CRATES_TEST="
+	askama@0.12.1
+	askama_derive@0.12.5
+	askama_escape@0.10.3
+	askama_parser@0.2.1
+	autocfg@1.1.0
+	basic-toml@0.1.9
+	bincode@1.3.3
+	cargo_metadata@0.15.4
+	cc@1.0.73
+	cc@1.0.81
+	cc@1.0.83
+	getrandom@0.2.10
+	indoc@2.0.4
+	libc@0.2.134
+	libc@0.2.147
+	libc@0.2.149
+	memchr@2.7.4
+	memoffset@0.9.0
+	memoffset@0.9.1
+	once_cell@1.15.0
+	once_cell@1.18.0
+	portable-atomic@1.7.0
+	proc-macro2@1.0.86
+	pyo3-build-config@0.18.3
+	pyo3-build-config@0.22.0
+	pyo3-build-config@0.22.2
+	pyo3-ffi@0.18.3
+	pyo3-ffi@0.22.0
+	pyo3-ffi@0.22.2
+	pyo3-macros-backend@0.22.0
+	pyo3-macros-backend@0.22.2
+	pyo3-macros@0.22.0
+	pyo3-macros@0.22.2
+	pyo3@0.22.0
+	pyo3@0.22.2
+	python3-dll-a@0.2.6
+	python3-dll-a@0.2.9
+	serde@1.0.203
+	serde_derive@1.0.203
+	serde_json@1.0.118
+	siphasher@0.3.11
+	syn@2.0.68
+	syn@2.0.72
+	target-lexicon@0.12.11
+	target-lexicon@0.12.14
+	target-lexicon@0.12.16
+	unicode-ident@1.0.5
+	unicode-ident@1.0.11
+	uniffi@0.28.0
+	uniffi_bindgen@0.28.0
+	uniffi_build@0.28.0
+	uniffi_checksum_derive@0.28.0
+	uniffi_core@0.28.0
+	uniffi_macros@0.28.0
+	uniffi_meta@0.28.0
+	uniffi_testing@0.28.0
+	uniffi_udl@0.28.0
+	unindent@0.2.3
+	weedle2@5.0.0
+"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+inherit cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+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}) )
+"
+
+# note: 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 ISC MIT MPL-2.0
+	Unicode-DFS-2016
+" # crates
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+IUSE="doc +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)"
+DEPEND="ssl? ( dev-libs/openssl:= )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/mdbook )
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+		elibc_musl? ( dev-util/patchelf )
+	)
+"
+RDEPEND+=" ${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# we build the Rust executable (just once) via cargo_src_compile
+	sed -i -e '/setuptools_rust/d' -e '/rust_extensions/d' setup.py || die
+
+	if use test; then
+		# used to prevent use of network during tests, and silence pip
+		# if it finds unrelated issues with system packages (bug #913613)
+		cat > "${T}"/pip.conf <<-EOF || die
+			[global]
+			quiet = 2
+
+			[install]
+			no-index = yes
+			no-dependencies = yes
+		EOF
+
+		# used by *git_sdist_generator tests
+		git init -q || die
+		git config --global user.email "larry@gentoo.org" || die
+		git config --global user.name "Larry the Cow" || die
+		git add . || die
+		git commit -qm init || die
+	fi
+}
+
+src_configure() {
+	export OPENSSL_NO_VENDOR=1
+
+	# bug #938847 (TODO?: should probably be an eclass default for musl)
+	use elibc_musl && RUSTFLAGS+=" -C target-feature=-crt-static"
+
+	# https://github.com/rust-lang/stacker/issues/79
+	use s390 && ! is-flagq '-march=*' &&
+		append-cflags $(test-flags-CC -march=z10)
+
+	local myfeatures=(
+		# like release.yml + native-tls for better platform support than rustls
+		full
+		password-storage
+		$(usev ssl native-tls)
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+python_compile_all() {
+	cargo_src_compile
+
+	use !doc || mdbook build -d html guide || die
+
+	if ! tc-is-cross-compiler; then
+		local maturin=$(cargo_target_dir)/maturin
+		"${maturin}" completions bash > "${T}"/${PN} || die
+		"${maturin}" completions fish > "${T}"/${PN}.fish || die
+		"${maturin}" completions zsh > "${T}"/_${PN} || die
+	else
+		ewarn "shell completion files were skipped due to cross-compilation"
+	fi
+}
+
+python_test() {
+	local -x MATURIN_TEST_PYTHON=${EPYTHON}
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	# need this for (new) python versions not yet recognized by pyo3
+	local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
+
+	local skip=(
+		# picky cli output test that easily benignly fail (bug #937992)
+		--skip cli_tests
+		# avoid need for wasm over a single hello world test
+		--skip integration_wasm_hello_world
+		# fragile depending on rust version, also wants libpypy*-c.so for pypy
+		--skip pyo3_no_extension_module
+		# unimportant tests that use uv, and it does not seem to be able
+		# to find the system's dev-python/uv (not worth the trouble)
+		--skip develop_hello_world::case_2
+		--skip develop_pyo3_ffi_pure::case_2
+		# fails on sparc since rust-1.74 (bug #934573), skip for now given
+		# should not affect the pep517 backend which is all we need on sparc
+		$(usev sparc '--skip build_context::test::test_macosx_deployment_target')
+	)
+
+	cargo_src_test -- "${skip[@]}"
+}
+
+python_install_all() {
+	cargo_src_install
+
+	dodoc Changelog.md README.md
+	use doc && dodoc -r guide/html
+
+	if ! tc-is-cross-compiler; then
+		dobashcomp "${T}"/${PN}
+		dofishcomp "${T}"/${PN}.fish
+		dozshcomp "${T}"/_${PN}
+	fi
+}
diff --git a/dev-util/maxcso/maxcso-9999.ebuild b/dev-util/maxcso/maxcso-9999.ebuild
index 5ef2e19bfd9f..02c63f9d36a9 100644
--- a/dev-util/maxcso/maxcso-9999.ebuild
+++ b/dev-util/maxcso/maxcso-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="ISC LGPL-2.1+ Apache-2.0"
 SLOT="0"
 
 DEPEND="
-	app-arch/libdeflate[zlib]
+	app-arch/libdeflate[zlib(+)]
 	app-arch/lz4:=
 	dev-libs/libuv:=
 	sys-libs/zlib
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 7c9183d52e6f..307eef7d003d 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,2 +1 @@
-DIST mingw-w64-v11.0.1.tar.bz2 10057401 BLAKE2B 3222eed35522bf95a571b11dc52ea23153068b32497676dbb2837306ba52a78e6d1c9c44a4d64d314e64583b54f6fe86dcff3e467e101acf71cebb7d2a963963 SHA512 568702100bbbb11f7f9c9596dd70df3fb2577492459cf55da38691af1504b91127cb5f3eff268850dcbaa461fdc72e4e2379f7a576fd4a0e537ee1fe42531c01
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
deleted file mode 100644
index 15f76259b1af..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
+++ /dev/null
@@ -1,147 +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
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="https://www.mingw-w64.org/"
-SRC_URI="https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-S=${WORKDIR}/mingw-w64-v${PV}
-
-LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# default-ucrt: enabling requires to be done during the bootstrap process
-# or else will cause e.g. undefined reference to __intrinsic_setjmpex
-# libraries: needs working stage2 compiler (bug #665512)
-IUSE="default-ucrt headers-only idl libraries tools"
-RESTRICT="strip" # portage would use the wrong strip executable
-
-pkg_setup() {
-	target_is_not_host && MW_CROSS=true || MW_CROSS=false
-	[[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] &&
-		die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw"
-}
-
-mingw-foreach_tool() {
-	use !tools || use headers-only && return
-
-	local tool=widl
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		einfo "Skipping widl due to unsupported platform" #853250
-		tool=
-	fi
-
-	for tool in gendef genidl ${tool}; do
-		# not using top-level --with-tools given it skips widl
-		pushd mingw-w64-tools/${tool} >/dev/null || die
-		"${@}"
-		popd >/dev/null || die
-	done
-}
-
-src_configure() {
-	# native tools, see #644556
-	local toolsconf=()
-	# normally only widl is prefixed, but avoids clash with other targets
-	${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
-
-	mingw-foreach_tool econf "${toolsconf[@]}"
-
-	MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
-
-	# likely cross-compiling from here, update toolchain variables
-	if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then
-		unset AR AS CC CPP CXX DLLTOOL LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
-		filter-flags '-fuse-ld=*'
-		filter-flags '-mfunction-return=thunk*' #878849
-	fi
-	local CHOST=${CTARGET}
-
-	# 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,*'
-
-	# -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
-	tc-is-gcc && append-flags -mno-avx
-
-	strip-unsupported-flags
-
-	# Normally mingw64 does not use dynamic linker, but at configure time it
-	# uses LDFLAGS. When -Wl,--hash-style=gnu is passed __CTORS_LIST__ /
-	# __DTORS_LIST__ is misdetected for target and binaries crash at shutdown.
-	# Note: typically also stripped by strip-unsupported-flags, but not during
-	# USE=headers-only and potentially other configurations (kept as safety).
-	filter-ldflags '-Wl,--hash-style=*'
-
-	local prefix=${EPREFIX}/usr
-	${MW_CROSS} && prefix+=/${CTARGET}/usr
-
-	local conf=(
-		--prefix="${prefix}"
-		--libdir="${prefix}"/lib
-		$(use_with !headers-only crt)
-		$(usev default-ucrt --with-default-msvcrt=ucrt)
-
-		# By default configure tries to set --sysroot=${prefix}. We disable
-		# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-		# That way we can cross-build mingw64-runtime with cross-emerge.
-		--with-sysroot=no
-	)
-
-	if use !headers-only; then
-		conf+=(
-			$(use_enable idl)
-			$(use_with libraries)
-		)
-
-		# prefer tuple to determine if should do 32 or 64bits, but fall
-		# back to cpp test if missing (bug #584858, see also #840662)
-		local b32=true
-		case ${CHOST} in
-			x86_64-*) b32=false;;
-			i*86-*) ;;
-			*) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;;
-		esac
-		${b32} &&
-			conf+=( --enable-lib32 --disable-lib64 ) ||
-			conf+=( --disable-lib32 --enable-lib64 )
-
-		# prepare temporary headers install to build against same-version
-		mkdir ../headers || die
-		pushd ../headers >/dev/null || die
-		ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt
-		popd >/dev/null || die
-
-		append-cppflags "-I${T}/root/include"
-	fi
-
-	econf "${conf[@]}"
-}
-
-src_compile() {
-	use headers-only || emake -C ../headers install
-	emake
-	mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	mingw-foreach_tool emake DESTDIR="${D}" install
-
-	if ${MW_CROSS}; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	rm -r -- "${ED}"/usr/share || die
-}
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index d33cfbe97b77..82ac375ad0f5 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,6 +1,3 @@
-DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
-DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
 DIST gcc-14.1.0.tar.xz 92265736 BLAKE2B 7efd6574b8bca081de6e31480ec0565c6d7fb773383e8e1fdcc17e35bba2bf44b3f4f995cdbcccd001689926e96a6563ef3d099902fe3b37ab09dcf553ab0596 SHA512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea
-DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
deleted file mode 100644
index 1e512377b27b..000000000000
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0_p2.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit edo flag-o-matic multilib-build toolchain-funcs
-
-# Pick versions known to work for wine+dxvk, and avoid too frequent updates
-# due to slow rebuilds. Do _p1++ rather than revbump on changes (not using
-# Gentoo patchsets for simplicity, their changes are mostly unneeded here).
-BINUTILS_PV=2.41
-GCC_PV=13.2.0
-MINGW_PV=$(ver_cut 1-3)
-
-DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
-HOMEPAGE="
-	https://www.mingw-w64.org/
-	https://gcc.gnu.org/
-	https://sourceware.org/binutils/
-"
-SRC_URI="
-	https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
-	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
-"
-if [[ ${GCC_PV} == *-* ]]; then
-	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
-else
-	SRC_URI+="
-		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-	"
-fi
-S="${WORKDIR}"
-
-# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
-LICENSE="
-	GPL-3+
-	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
-	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
-"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="+abi_x86_32 custom-cflags debug"
-
-RDEPEND="
-	dev-libs/gmp:=
-	dev-libs/mpc:=
-	dev-libs/mpfr:=
-	sys-libs/zlib:=
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	strerror_r # libstdc++ test using -Wimplicit+error
-)
-
-PATCHES=(
-	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
-	"${FILESDIR}"/gcc-13.2.0-libcxx-17.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	tc-is-cross-compiler &&
-		die "cross-compilation of the toolchain itself is unsupported"
-}
-
-src_prepare() {
-	# rename directories to simplify both patching and the ebuild
-	mv binutils{-${BINUTILS_PV},} || die
-	mv gcc{-${GCC_PV},} || die
-	mv mingw-w64-v${MINGW_PV} mingw64 || die
-
-	default
-}
-
-src_compile() {
-	# not great but do everything in src_compile given bootstrapping
-	# process needs to be done in steps of configure+compile+install
-	# (done modular to have most package-specific things in one place)
-
-	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
-
-	MWT_D=${T}/root # moved to ${D} in src_install
-	local mwtdir=/usr/lib/${PN}
-	local prefix=${EPREFIX}${mwtdir}
-	local sysroot=${MWT_D}${prefix}
-	local -x PATH=${sysroot}/bin:${PATH}
-
-	filter-lto # requires setting up, and may be messy with mingw static libs
-	use custom-cflags || strip-flags # fancy flags are not realistic here
-
-	local multilib=false
-	use abi_x86_32 && use abi_x86_64 && multilib=true
-
-	# global configure flags
-	local conf=(
-		--build=${CBUILD:-${CHOST}}
-		--target=${CTARGET}
-		--{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs
-		MAKEINFO=: #922230
-	)
-
-	# binutils
-	local conf_binutils=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-cet
-		--disable-default-execstack
-		--disable-nls
-		--disable-shared
-		--with-system-zlib
-		--without-debuginfod
-		--without-msgpack
-		--without-zstd
-	)
-	mwt-binutils() {
-		# symlink gcc's lto plugin for AR (bug #854516)
-		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \
-			"${sysroot}"/lib/bfd-plugins || die
-	}
-
-	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
-	local conf_gcc=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-bootstrap
-		--disable-cet
-		--disable-gcov #843989
-		--disable-gomp
-		--disable-libquadmath
-		--disable-libsanitizer
-		--disable-libssp
-		--disable-libvtv
-		--disable-shared
-		--disable-werror
-		--with-gcc-major-version-only
-		--with-system-zlib
-		--without-isl
-		--without-zstd
-	)
-	${multilib} || conf_gcc+=( --disable-multilib )
-	# libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail
-	# (not passed in conf_gcc above given it is lost in sub-configure calls)
-	local -x glibcxx_cv_sys_sdt_h=no
-
-	local conf_gcc_stage1=(
-		--enable-languages=c
-		--disable-libatomic
-		--with-sysroot="${sysroot}"
-	)
-	local -n conf_gcc_stage2=conf_gcc_stage1
-
-	local conf_gcc_stage3=(
-		--enable-languages=c,c++
-		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
-		--with-sysroot="${prefix}"
-		--with-build-sysroot="${sysroot}"
-	)
-
-	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
-	local conf_mingw64=(
-		--prefix="${prefix}"/${CTARGET}
-		--host=${CTARGET}
-		--with-sysroot=no
-		--without-{crt,headers}
-
-		# mingw .dll aren't used by wine and packages wouldn't find them
-		# at runtime, use crossdev if need dll and proper search paths
-		--disable-shared
-	)
-
-	local conf_mingw64_headers=(
-		--enable-idl
-		--with-headers
-	)
-	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
-
-	local conf_mingw64_runtime=( --with-crt )
-	${multilib} ||
-		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
-
-	local conf_mingw64_libraries=( --with-libraries )
-	local conf_mingw64_libraries32=(
-		--libdir="${prefix}"/${CTARGET}/lib32
-		--with-libraries
-		CC="${CTARGET}-gcc -m32"
-		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
-	)
-
-	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
-	local conf_widl=( --prefix="${prefix}" )
-
-	# mwt-build [-x] <path/package-name> [stage-name]
-	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
-	# passes conf, conf_package, and conf_package_stage arrays to configure, and
-	# users can add options through environment with e.g.
-	#	MWT_BINUTILS_CONF="--some-option"
-	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
-	#	MWT_WIDL_CONF="--some-other-option"
-	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
-	mwt-build() {
-		if [[ ${1} == -x ]]; then
-			(
-				# cross-compiling, cleanup and let ./configure handle it
-				unset AR AS CC CPP CXX DLLTOOL LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
-				CHOST=${CTARGET}
-				filter-flags '-fuse-ld=*'
-				filter-flags '-mfunction-return=thunk*' #878849
-
-				# support for stack-protector is still new and experimental
-				# for mingw and issues can also be harder to debug + fix for
-				# upstreams using it, if feeling concerned about security
-				# would advise to either not use wine or at least contain it
-				use custom-cflags || filter-flags '-fstack-protector*' #931512
-
-				# 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,*'
-
-				# -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
-
-				strip-unsupported-flags
-				mwt-build "${@:2}"
-			)
-			return
-		fi
-
-		local id=${1##*/}
-		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
-
-		# econf is not allowed in src_compile and its defaults are
-		# mostly unused here, so use configure directly
-		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-
-		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
-		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
-		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
-
-		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
-		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
-
-		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
-
-		mkdir -p "${build_dir}" || die
-		pushd "${build_dir}" >/dev/null || die
-
-		edo "${conf[@]}"
-		emake MAKEINFO=: V=1
-		# -j1 to match bug #906155, other packages may be fragile too
-		emake -j1 MAKEINFO=: V=1 DESTDIR="${MWT_D}" install
-
-		declare -f mwt-${id} >/dev/null && edo mwt-${id}
-		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
-
-		popd >/dev/null || die
-	}
-
-	# workaround race condition with out-of-source crt build (bug #879537)
-	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
-
-	# build with same ordering that crossdev would do + stage3 for pthreads
-	mwt-build binutils
-	mwt-build mingw64 headers
-	mwt-build gcc stage1
-	mwt-build -x mingw64 runtime
-	mwt-build gcc stage2
-	${multilib} && mwt-build -x mingw64 libraries32
-	mwt-build -x mingw64 libraries
-	mwt-build gcc stage3
-	mwt-build mingw64/mingw-w64-tools/widl
-	# note: /could/ system-bootstrap if already installed, but gcc and
-	# libraries will use the system's older mingw64 headers/static-libs
-	# and make this potentially fragile without more workarounds/stages
-
-	if ${multilib}; then
-		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
-		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
-		# just without 64bit support and would rather not build the toolchain
-		# twice. Dirty but wrap to allow simple interoperability with crossdev.
-		mwt-i686_wrapper() {
-			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
-				> ${bin32} || die
-			chmod +x ${bin32} || die
-		}
-		pushd "${sysroot}"/bin >/dev/null || die
-		local bin bin32
-		for bin in ${CTARGET}-*; do
-			bin32=${bin/x86_64-w64/i686-w64}
-			case ${bin#${CTARGET}-} in
-				as) mwt-i686_wrapper --32;;
-				cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;;
-				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
-				windres) mwt-i686_wrapper --target=pe-i386;;
-				*) ln -s ${bin} ${bin32} || die;;
-			esac
-		done
-		popd >/dev/null || die
-	fi
-
-	# portage doesn't know the right strip executable to use for CTARGET
-	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
-	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
-
-	# ... and instead do it here given this saves ~60MB
-	if use !debug; then
-		einfo "Stripping ${CTARGET} static libraries ..."
-		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
-			-exec ${CTARGET}-strip --strip-unneeded {} + || die
-	fi
-}
-
-src_install() {
-	mv "${MWT_D}${EPREFIX}"/* "${ED}" || die
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that this package is primarily intended for Wine and related"
-		elog "packages to depend on without needing a manual crossdev setup."
-		elog
-		elog "Settings are oriented only for what these need and simplicity."
-		elog "Use sys-devel/crossdev if need full toolchain/customization:"
-		elog "    https://wiki.gentoo.org/wiki/Mingw"
-		elog "    https://wiki.gentoo.org/wiki/Crossdev"
-	fi
-
-	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
-	if has_version ${cross_gcc}; then
-		# encourage cleanup given users may not realize if switch by default
-		ewarn "${cross_gcc} is installed, note that ${PN}"
-		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
-		ewarn "packages and optionally only one needs to be kept."
-	fi
-}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 9d32ba86052f..23b4f30c3ad3 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,3 +4,5 @@ DIST cuda_12.4.0_550.54.14_linux.run 4454353277 BLAKE2B da339a44ac21799a88b4573e
 DIST cuda_12.4.1_550.54.15_linux.run 4454730420 BLAKE2B 643513a673e72aeab2e0268c4f91b504132aee378e5e483c46803ed9b1b109274e23bce0cd1022de1220e81dbfb0442c9d84370ad9c6a17e14fe2aaff23ccf13 SHA512 340fab9aad2f3e03fb773c2ec1d4f2c3b1428b350c2072b02263f68f3c521b7ec42086ae7b5e66594a0b91862cc165d8519e4c92e428268bc1e98adcfe106d42
 DIST cuda_12.5.0_555.42.02_linux.run 4294677299 BLAKE2B ffefb576feb9f8e6ea8975bf74fe7277902364035e5dcb27f7b4bdc1d73ea44ce8e057087d670ec18eb49727a9343484bf3aa234c045b91684c70141cf8162e7 SHA512 84fa3ad278217a0fbea97d2d880f625e7e7074a12e98d50d664daaf8298d7d8dd7b222c6f5815636e484df8f1e75c062c70c09f744d139652d960ca8c064114e
 DIST cuda_12.5.1_555.42.06_linux.run 4311634770 BLAKE2B 3546faeb24687dd11ad0a61a4f02cfbd97119d9e3cd3e24ea294b81ed488de7dfef03607c69d7b5a8087db10cf794205936add7cfa8ccda207e3aca315be48df SHA512 604843e09717c2af0873b2d5a2e242ff1b99122d515b6a7a29e70c55ab605524744359781f5b642059550b4def57877597111914965efe7d3a1a1387c9dbb1a0
+DIST cuda_12.6.0_560.28.03_linux.run 4333105923 BLAKE2B 533e9080dbf087a661ab6e59548e48ca0d2b514f47c3e97ac89b628f79197875a7425ad69c4d271b5fa8243561c1ccba698e3bf322b194b29a5f7fa031ea8f06 SHA512 fe5710c168298d2283a3f636ad5e1e212970fe8d9554ab450aa61d786536f50efb9d9e9396b6ac59638bd4204faadb5a99ec8a8c02e2c57a18f479123aaff3c9
+DIST cuda_12.6.1_560.35.03_linux.run 4345714567 BLAKE2B 147c7f03e0d9ade4c603d93920d0cd6bb1706efc268797ae870b5244feaa8159393015f96e920c6255e93d8040dd5b046075804cfa7c5da18a645800d65b8c3d SHA512 514ec89f847457c3ba78cd0dc22c25aebf2a19a6bbd5a8d071f31519d1007889cde6ba888a01596434216a8a88bfba21059cdc8e3fa9397133c93d2a9f0c015e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild
new file mode 100644
index 000000000000..26415acb96db
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.0.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="560.28.03"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different.
+RDEPEND="
+	<sys-devel/gcc-14_pre[cxx]
+	virtual/libcrypt
+	examples? (
+		media-libs/freeglut
+		media-libs/glu
+	)
+	nsight? (
+		app-crypt/mit-krb5
+		dev-libs/libpfm
+		dev-libs/wayland
+		dev-qt/qtwayland:6
+		>=dev-libs/openssl-3
+		media-libs/tiff-compat:4
+		sys-libs/zlib
+	)
+	rdma? ( sys-cluster/rdma-core )
+	vis-profiler? (
+		>=virtual/jre-1.8:*
+	)"
+BDEPEND="nsight? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="15000M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump, see link below for supported GCC # versions
+	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
+		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
+		builds/nvidia_fs
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
+		eend $?
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
+		fi
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
+		)
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
+		fi
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# fix broken RPATHs
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${ncu_dir}/host/{linux-desktop-glibc_2_11_3-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${nsys_dir}/{host-linux-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	if use examples; then
+		local exes=(
+			extras/demo_suite/bandwidthTest
+			extras/demo_suite/busGrind
+			extras/demo_suite/deviceQuery
+			extras/demo_suite/nbody
+			extras/demo_suite/oceanFFT
+			extras/demo_suite/randomFog
+			extras/demo_suite/vectorAdd
+		)
+
+		# set executable bit on demo_suite binaries
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+	else
+		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
+	fi
+
+	# remove rdma libs (unless USE=rdma)
+	if ! use rdma; then
+		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	# Remove bad symlinks
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
+
+	# Remove dead gdb plugins
+	if use debugger; then
+		rm "${ED}"/${cudadir}/bin/cuda-gdb-python3.{8,9}-tui || die
+	fi
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+
+	# https://bugs.gentoo.org/926116
+	insinto /etc/sandbox.d
+	newins - 80${PN} <<-EOF
+		SANDBOX_PREDICT="/proc/self/task"
+	EOF
+}
+
+pkg_postinst_check() {
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1.ebuild
new file mode 100644
index 000000000000..32ef330046ed
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.1.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="560.35.03"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different.
+RDEPEND="
+	<sys-devel/gcc-14_pre[cxx]
+	virtual/libcrypt
+	examples? (
+		media-libs/freeglut
+		media-libs/glu
+	)
+	nsight? (
+		app-crypt/mit-krb5
+		dev-libs/libpfm
+		dev-libs/wayland
+		dev-qt/qtwayland:6
+		>=dev-libs/openssl-3
+		media-libs/tiff-compat:4
+		sys-libs/zlib
+	)
+	rdma? ( sys-cluster/rdma-core )
+	vis-profiler? (
+		>=virtual/jre-1.8:*
+	)"
+BDEPEND="nsight? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="15000M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump, see link below for supported GCC # versions
+	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+	local cuda_supported_gcc="8.5 9.5 10 11 12 13"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
+		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
+		builds/nvidia_fs
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
+		eend $?
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
+		fi
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+			${nsys_dir}/target-linux-x64/CudaGpuInfoDumper
+		)
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
+		fi
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# fix broken RPATHs
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${ncu_dir}/host/{linux-desktop-glibc_2_11_3-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
+		patchelf --set-rpath '$ORIGIN' \
+		"${ED}"/${cudadir}/${nsys_dir}/{host-linux-x64,target-linux-x64}/{libarrow.so,libparquet.so.500.0.0} || die
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/lib{crypto,ssl}.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/lib{crypto,ssl}.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	if use examples; then
+		local exes=(
+			extras/demo_suite/bandwidthTest
+			extras/demo_suite/busGrind
+			extras/demo_suite/deviceQuery
+			extras/demo_suite/nbody
+			extras/demo_suite/oceanFFT
+			extras/demo_suite/randomFog
+			extras/demo_suite/vectorAdd
+		)
+
+		# set executable bit on demo_suite binaries
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+	else
+		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
+	fi
+
+	# remove rdma libs (unless USE=rdma)
+	if ! use rdma; then
+		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	# Remove bad symlinks
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
+
+	# Remove dead gdb plugins
+	if use debugger; then
+		rm "${ED}"/${cudadir}/bin/cuda-gdb-python3.{8,9}-tui || die
+	fi
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+
+	# https://bugs.gentoo.org/926116
+	insinto /etc/sandbox.d
+	newins - 80${PN} <<-EOF
+		SANDBOX_PREDICT="/proc/self/task"
+	EOF
+}
+
+pkg_postinst_check() {
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/pahole/pahole-1.27-r1.ebuild b/dev-util/pahole/pahole-1.27-r1.ebuild
index 97e2e021ecf9..5babcf05a99a 100644
--- a/dev-util/pahole/pahole-1.27-r1.ebuild
+++ b/dev-util/pahole/pahole-1.27-r1.ebuild
@@ -29,7 +29,7 @@ else
 	fi
 	S="${WORKDIR}"/${MY_P}
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2" # only
diff --git a/dev-util/perf/perf-6.10.4.ebuild b/dev-util/perf/perf-6.10.4.ebuild
index 4c50de412173..df1101c9dc14 100644
--- a/dev-util/perf/perf-6.10.4.ebuild
+++ b/dev-util/perf/perf-6.10.4.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
 REQUIRED_USE="
@@ -155,9 +155,9 @@ src_unpack() {
 		eshopts_push -o noglob
 		ebegin "Filtering partial source patch"
 		xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
-		test -s ${P}.patch
 		assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
 		eend $? || die "filterdiff failed"
+		test -s ${P}.patch || die "patch is empty?!"
 		eshopts_pop
 	fi
 
diff --git a/dev-util/perf/perf-6.10.ebuild b/dev-util/perf/perf-6.10.ebuild
index c26fcdac95df..7668df3a67d1 100644
--- a/dev-util/perf/perf-6.10.ebuild
+++ b/dev-util/perf/perf-6.10.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
 REQUIRED_USE="
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index 63546a59a6ca..9d36b0ce8ca7 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/perf/perf-6.7.ebuild b/dev-util/perf/perf-6.7.ebuild
index f07ddebfbf7d..99074877b2f2 100644
--- a/dev-util/perf/perf-6.7.ebuild
+++ b/dev-util/perf/perf-6.7.ebuild
@@ -33,7 +33,7 @@ S="${S_K}/tools/perf"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
 REQUIRED_USE="
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 3de288330e84..4fbc4dbb0abc 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,5 +1,3 @@
-DIST pkgcheck-0.10.27-git-2.43.2.patch 1193 BLAKE2B a91d51e939e524682eccaedc4489c44661f5ed28e76c7074c16f001bf8a968c0ec4485e2a71504e86e081334ee0de02d70573f6ee910c52d636cda1955747686 SHA512 26c81364f7ef875fe3fb1ff77ccde6bd0892160b0ad8ac929f146950473596be1967883ffc5c25fb05ee4fd19870b470fdcfc536667530b89983ce1035b0007f
-DIST pkgcheck-0.10.27.tar.gz 806381 BLAKE2B f4acf72e85003f4dfa244c843464ab40a93df64a7bec68682cf39413552a51989a3214cab9c340318cebb39a8cf33c497fd72335cd37772f8e4d6e87838e413b SHA512 581109fdc565852d0407d770634864f809c2860ccfa03675afc8273199bc00af1c632c0fca27904c3262b1e851f3b8939cbda466cb3876ac228cddf74016fb32
-DIST pkgcheck-0.10.28.tar.gz 807874 BLAKE2B 12fbbf4a4482af9e27983fe7b32c376542551fdd5512fc13325f42234f714e49944475960cb23fb525c6b7d7637189bbde8a2e288c9ee360b58595dfc8bce5d7 SHA512 fb13d01ee8d29415afcf267635b8eb4e5c16a5f4fc5c83f3d6ce99a5aadb5d2ee4b31bde9de67fad9a093f10f881604cf0f1abff6ed47c35a23ec17527d8e9f6
 DIST pkgcheck-0.10.29.tar.gz 377521 BLAKE2B 91a1a25e6ef173582fc9082b92baa66489fd43c7addfbdd8516b5ea93febbb92b7155de88283ae4a1bb09047a44336ab5c336c5d0808c915eab99e8aa4461576 SHA512 339e332db24ffd716b658a40c66f2a90c6905071827da84ce0d633d882d75cf41bb853725ca30fe2abc8d7535f546925aedc8853fa7f1737854cee251a0ec3ab
 DIST pkgcheck-0.10.30.tar.gz 378098 BLAKE2B f80224d707f7656ca45f58932936e1ce780d670be596312532b88940fbe1cfb1c7e14a877a955fc4f21fb003a2ee5c6095c2c6919475cdc95db9be0736050b50 SHA512 078ba2275e39e645eca22a265c9f06c6dd7d1cb310979ab5e48bb86a374b42edc50c0ca8d0bd671a3b51341b7fae80ff2c9adf2dc2eeabd93a545c84373902b4
+DIST pkgcheck-0.10.31.tar.gz 379079 BLAKE2B b3e308a8d496c954d649677a41394b1fe1fbab43ce6c629616249306fafaad8e5c2cfa38fc9c838117f7abc381a0c04cea60ba5a2b3ab6a1612bbfc68d858832 SHA512 539cf262c950547dbd85441a7b40e76fcdc0810fdd633ab9042a13c7b19db4826c05ea1bbacf64b50c68884e31fff6a88e6b2baf94b2e6a4b2738123441da6ec
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild
deleted file mode 100644
index 458ca1eade32..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.27-r3.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=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	inherit pypi
-	SRC_URI+="
-		https://gitlab.gentoo.org/pkgcore/pkgcheck/-/commit/9103513e26f9f2aeade5b563a49697c0e2665e3e.patch
-			-> ${P}-git-2.43.2.patch
-	"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.21[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter:=
-	>=dev-libs/tree-sitter-bash-0.20.4
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-git-2.43.2.patch
-)
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild
deleted file mode 100644
index ae9618919930..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.28-r2.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=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.7[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.25[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	>=dev-libs/tree-sitter-0.20.9:=
-	>=dev-libs/tree-sitter-bash-0.20.5
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.20.4[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-EPYTEST_DESELECT=(
-	tests/checks/test_git.py::TestGitPkgCommitsCheck::test_missing_move
-)
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild
new file mode 100644
index 000000000000..012ec9c2756e
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.30-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+inherit elisp-common distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
+		https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	inherit pypi
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="emacs"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.8[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.25[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	>=dev-libs/tree-sitter-bash-0.21.0[python,${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.23.0[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
+"
+BDEPEND="${RDEPEND}
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_tests pytest
+
+export USE_SYSTEM_TREE_SITTER_BASH=1
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use emacs ; then
+	   pushd "${S}"/contrib/emacs >/dev/null || die
+	   elisp-compile *.el
+	   popd >/dev/null || die
+	fi
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+	distutils-r1_python_install_all
+
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.30.ebuild
deleted file mode 100644
index 7b1c7d6a3044..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.30.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=standalone
-PYTHON_COMPAT=( python3_{10..13} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.25[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	>=dev-libs/tree-sitter-bash-0.21.0[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
new file mode 100644
index 000000000000..57a2fe564912
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+inherit elisp-common distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
+		https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	inherit pypi
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="emacs"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.8[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.25[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	>=dev-libs/tree-sitter-bash-0.21.0[python,${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.23.0[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.24.0[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
+"
+BDEPEND="${RDEPEND}
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_tests pytest
+
+export USE_SYSTEM_TREE_SITTER_BASH=1
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use emacs ; then
+	   pushd "${S}"/contrib/emacs >/dev/null || die
+	   elisp-compile *.el
+	   popd >/dev/null || die
+	fi
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+	distutils-r1_python_install_all
+
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index cb978064beda..0f33fba99b5f 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	inherit pypi
 fi
 
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.23.0[${PYTHON_USEDEP}]
 	emacs? (
 		>=app-editors/emacs-24.1:*
 		app-emacs/ebuild-mode
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 1061ca87324c..9d5023bab4be 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1 +1,2 @@
 DIST pkgdev-0.2.10.tar.gz 85476 BLAKE2B 2002daa38d445f90cbc2f17ad0e42045b32b5dcefdd85a3485b6e253d9703ad7e59119873718259874de32e7c50e4f5acbacc6c3b40770d55f4d38dbbd7805c4 SHA512 aa9f6465ba44ff67f2b160bc9249583c355e7cc807ce4c797cc8b6d2a4858414a82e702e47ff5b87dc0f6ba70b9c83d515c59a732406437e5325aa3ae7ff95aa
+DIST pkgdev-0.2.11.tar.gz 87611 BLAKE2B ae864535a9ca9b9b69c4b595a67ddef477cfeacefb24a87258d0725cd912cedcad0ad3d1152f776a115b5230d259a58254e988a1db10d39af46a094fcea3219e SHA512 7e0a3ca6c11080874f9c49d708c926e7eed7c6591e07f34130e25bd2b2bd4a272e460537684d270095142eded94ed01ca8b547c340b3d3611208aad0ab432633
diff --git a/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
index 04b9b310c02c..5a2fba112b5e 100644
--- a/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/pkgdev/pkgdev-0.2.10.ebuild b/dev-util/pkgdev/pkgdev-0.2.10.ebuild
deleted file mode 100644
index 857ad4c24c60..000000000000
--- a/dev-util/pkgdev/pkgdev-0.2.10.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=standalone
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_BRANCH="main"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
-		https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	inherit pypi
-	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="doc"
-
-if [[ ${PV} == *9999 ]] ; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.23[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.25[${PYTHON_USEDEP}]
-	"
-fi
-
-RDEPEND+="
-	dev-vcs/git
-"
-BDEPEND="
-	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
-	test? (
-		x11-misc/xdg-utils
-	)
-"
-
-distutils_enable_sphinx doc \
-	">=dev-python/snakeoil-0.10.5" \
-	dev-python/tomli
-distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake PYTHON="${EPYTHON}" man
-
-	sphinx_compile_all # HTML pages only
-}
-
-python_install_all() {
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if use doc || [[ ${PV} != *9999 ]]; then
-		doman build/sphinx/man/*
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "sending email support" x11-misc/xdg-utils
-	optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja"
-}
diff --git a/dev-util/pkgdev/pkgdev-0.2.11.ebuild b/dev-util/pkgdev/pkgdev-0.2.11.ebuild
new file mode 100644
index 000000000000..04b9b310c02c
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_BRANCH="main"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="doc"
+
+if [[ ${PV} == *9999 ]] ; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.23[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.25[${PYTHON_USEDEP}]
+	"
+fi
+
+RDEPEND+="
+	dev-vcs/git
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
+	test? (
+		x11-misc/xdg-utils
+	)
+"
+
+distutils_enable_sphinx doc \
+	">=dev-python/snakeoil-0.10.5" \
+	dev-python/tomli
+distutils_enable_tests pytest
+
+python_compile_all() {
+	use doc && emake PYTHON="${EPYTHON}" man
+
+	sphinx_compile_all # HTML pages only
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc || [[ ${PV} != *9999 ]]; then
+		doman build/sphinx/man/*
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sending email support" x11-misc/xdg-utils
+	optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja"
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 67e6010bb58b..04b9b310c02c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 0659551716d1..6641596d933d 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -1,2 +1,2 @@
-DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373 BLAKE2B 6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64 SHA512 f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
+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_pre20210321.ebuild b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
deleted file mode 100644
index 05d59ffcfd7d..000000000000
--- a/dev-util/plan9port/plan9port-0_pre20210321.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs readme.gentoo-r1
-
-MY_HASH="88a87fadae6629932d9c160f53ad5d79775f8f94"
-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 truetype"
-REQUIRED_USE="?? ( X aqua )"
-
-DEPEND="
-	X? ( x11-apps/xauth )
-	truetype? (
-		media-libs/freetype
-		media-libs/fontconfig
-	)
-"
-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() {
-	local -a myconf=(
-		CC9="$(tc-getCC)"
-		CC9FLAGS="'${CFLAGS} ${LDFLAGS}'"
-	)
-
-	if use X; then
-		myconf+=( WSYSTYPE=x11 )
-	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
-
-	if use truetype; then
-		myconf+=( FONTSRV=fontsrv )
-	else
-		myconf+=( FONTSRV= )
-	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/plan9port/plan9port-0_pre20240617.ebuild b/dev-util/plan9port/plan9port-0_pre20240617.ebuild
new file mode 100644
index 000000000000..effd1d072064
--- /dev/null
+++ b/dev-util/plan9port/plan9port-0_pre20240617.ebuild
@@ -0,0 +1,146 @@
+# 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="a2567fcac9851e5cc965a236679f568b0e79cff2"
+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/pwntools/Manifest b/dev-util/pwntools/Manifest
index e3bf9d0c78b6..208283e4e26d 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -1,4 +1,4 @@
-DIST pwntools-4.11.1.gh.tar.gz 4237695 BLAKE2B 10a0b363d7255e856a33ce972a9eab2ec51d1d5f6ee953ac37796f87cf42b46b1207dc31f64902af704b7f36125c765e0c9328d44c6b0dda34a133238b42cf7f SHA512 f3c9d35ea62215a05a97ca00d908f3aea2188b9b2cbb8baac6b4203ac699e82f3d13b1332007e3b5d46973d609271fdd5e2dbd3aa70f7735f5578a449ca90fe6
 DIST pwntools-4.12.0.gh.tar.gz 4245062 BLAKE2B f4739b659f30b8f8522881cacaceed96e12a8c4c9591c738a3b1b98cbd8ec7ce49d2adbffb099deb470a72d9880c0c2aea2702ec8ea48dfe9894c780d549fa5e SHA512 3034546d32ab81384241d94bfeaec4f54ac134b80a4c466dd3275d72a92d0fc83dd559c210857496cdc97ec86cdf1ad88c7c454ad6257980c58bafa5281a33da
-DIST pwntools-4.12.0_beta1.gh.tar.gz 4245839 BLAKE2B c69c0ff021764451718fb1146e54c0fde3024251a4d20cca97da607e780fa1b956bee9774623e8294a92c832c2ba6dcbdec3cc8848520b7d62a83bb918b46e31 SHA512 3badc20ab858c0b5bec6d76a41691684c566f8dce0576a11929b74e811a3173c8600ffd8ab289a94bf10478bf7a59594373438f63f48e27e1d87e7c04716ad2e
+DIST pwntools-4.13.0.gh.tar.gz 4388643 BLAKE2B 59a50621135e5e0fd247de37f9367d07155ab370fab5e5985a2e5900451d1d52b5b8362da2c1f59aaea36cfec9414345d2697256a4197fb0d31e90b4e58af45b SHA512 23511d60f619f7d6fb0cbe8389069e94c9b4ff33a3454c98e02db7b9ab591395511b56121f5bab7a8edd75ad06ca80154d379cda73acf61758e6d1215e463ed6
 DIST pwntools-4.13.0_beta0.gh.tar.gz 4385937 BLAKE2B 17232ab24139ccc9376f71ea31a1f4ef5a0bbcc0610e868c894c4f79865c44ccd9c029956cf566accddb38b64d2f5a1649113f8163d69fa3c0acf20e21817de7 SHA512 3bed645b6f9e19ef4b625e9a51a33d301e6ad640eeee4d1f647b081d10d34b6eed7f083a89d77da3bd03eac2d9cda462ca380b354de2691e87d0dfc2d74a53da
+DIST pwntools-4.14.0_beta0.gh.tar.gz 4424598 BLAKE2B c4457fbafe8e85a377de36e9889f937310b592f982529f0c6fe79ab2459ffe84aae29e5a2f1d8b8827239607b828eb2c196789b77636ee92d01d0bc45003c6a0 SHA512 eb18d5c6b6008854eeb1698a094c6f42bef0ab07c65e4222dde3ef785c5ea57bd0244038c144f2b597cad83ad173bd73a5af90b7e309a207615976dc8c5c501f
diff --git a/dev-util/pwntools/pwntools-4.11.1.ebuild b/dev-util/pwntools/pwntools-4.11.1.ebuild
deleted file mode 100644
index 3c844a90b542..000000000000
--- a/dev-util/pwntools/pwntools-4.11.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="CTF framework and exploit development library"
-HOMEPAGE="https://github.com/Gallopsled/pwntools"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
-else
-	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
-	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="amd64 ~arm64 ~riscv x86"
-	fi
-	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
-fi
-
-LICENSE="MIT GPL-2+ BSD-2"
-SLOT="0"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}]
-	>=dev-util/ROPgadget-5.3[${PYTHON_USEDEP}]
-	>=dev-util/unicorn-1.0.2[python,${PYTHON_USEDEP}]
-	dev-python/colored-traceback[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyelftools-0.24[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/rpyc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.11.0_update_deps.patch"
-)
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		--only-use-pwn-command
-	)
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	newbashcomp extra/bash_completion.d/pwn pwn
-	newbashcomp extra/bash_completion.d/shellcraft shellcraft
-
-	insinto /usr/share/zsh/site-functions
-	doins extra/zsh_completion/_pwn
-
-	# Disable automatic update check (bug 915496).
-	insinto /etc
-	doins "${FILESDIR}/pwn.conf"
-
-	rm -r "${ED}/usr/pwntools-doc" || die
-}
diff --git a/dev-util/pwntools/pwntools-4.12.0_beta1.ebuild b/dev-util/pwntools/pwntools-4.13.0.ebuild
index 7811e0a1eebf..7811e0a1eebf 100644
--- a/dev-util/pwntools/pwntools-4.12.0_beta1.ebuild
+++ b/dev-util/pwntools/pwntools-4.13.0.ebuild
diff --git a/dev-util/pwntools/pwntools-4.14.0_beta0.ebuild b/dev-util/pwntools/pwntools-4.14.0_beta0.ebuild
new file mode 100644
index 000000000000..3bd677b51569
--- /dev/null
+++ b/dev-util/pwntools/pwntools-4.14.0_beta0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="CTF framework and exploit development library"
+HOMEPAGE="https://github.com/Gallopsled/pwntools"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
+else
+	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
+	if [[ ${PV} != *_beta* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
+fi
+
+LICENSE="MIT GPL-2+ BSD-2"
+SLOT="0"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}]
+	>=dev-util/ROPgadget-5.3[${PYTHON_USEDEP}]
+	>=dev-util/unicorn-1.0.2[python,${PYTHON_USEDEP}]
+	dev-python/colored-traceback[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyelftools-0.29[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/rpyc[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.11.0_update_deps.patch"
+)
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		--only-use-pwn-command
+	)
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp extra/bash_completion.d/pwn pwn
+	newbashcomp extra/bash_completion.d/shellcraft shellcraft
+
+	insinto /usr/share/zsh/site-functions
+	doins extra/zsh_completion/_pwn
+
+	# Disable automatic update check (bug 915496).
+	insinto /etc
+	doins "${FILESDIR}/pwn.conf"
+
+	rm -r "${ED}/usr/pwntools-doc" || die
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 2c029acceeec..8df74b0d62ec 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,3 +1,5 @@
 DIST pycharm-community-2023.1.1.tar.gz 577304778 BLAKE2B c630c4a21edc2c36e972965e35df63500dafe8ecbd5eee9c6246785bf9e6962e048759a8674160fd47de810a75ffcefe0df14149746ca789b8064623551bed19 SHA512 d0c2419b77ca34c04579f8d52a20427a927fc4d7b3edb1e7787ed515cdc3777b19d963c22975c932c3e568c1861ec7806955514921a1156e497b584f816cd6a2
-DIST pycharm-community-2023.3.3.tar.gz 611059375 BLAKE2B 785ef9bef53bbcbbb20200c2d34533a859bf22414ef907b9fb3074e36dbda488f92747d4bafdaa9e37fb6503d78554bbc9071da9377fa7a91bddd805cff57c56 SHA512 7f84903d8e298ef8ddb4107086eab489b242fab8628b03fdf1e259d51d4883b112849058f0da09e1210721fc9f2e904808cee64dd31f6923a73a5e1e71c87649
+DIST pycharm-community-2024.1.4-aarch64.tar.gz 640210318 BLAKE2B 8cba84b4d1a90ccb6ffc1598965f87797e9ea750e0c9101698a392e46a164e628f7fb8995a38adecb0c6dd19d1b486549bebc1c221eb0d378e26bb6cf8589f41 SHA512 bc0d6c4b8a944d51ca55716fcf14095ecdf59b56a20823357ff6003110f2795d960dae9333b8a5603f81f371ae0be20a59d64636e51706409037762500cfe3f2
 DIST pycharm-community-2024.1.4.tar.gz 640191029 BLAKE2B 3d0ebdd8300454c52c50ff5798e49bca22b834c1084da002a97d0fab3a2304765086d2053b25c4285902f05819321ae2060d9109311070493531be8069d2f3c4 SHA512 8ad0600d0efc09c8c7bd95742a0803ea6672a1d547f76d7c4e1c69cd8cdc6efd36529e656e9868ac7618a745ac0e4edf8942670494dc77c9629728c9a78dae6b
+DIST pycharm-community-2024.2.1-aarch64.tar.gz 650975601 BLAKE2B 0cb3ad78e3ce2e8cf1e4a069b32f1b1604981d51a1ae0b8aecc51893254b3591de67703d2d1b46e18aef97fa60d07db8fbf9f378b42bf2887da6cc3d0e189ea0 SHA512 e8e6d46c00e7384d589b1783bf5b3a44d94f236b0594d5eb9086799521744ed75027901c25d663ade9f7b30ff07220544b5609dfeb5ad947576edceb69601578
+DIST pycharm-community-2024.2.1.tar.gz 651275184 BLAKE2B aded074688b368b5d19ad74ff525377a90a64e10a7b61253029ba272923473028a06956a257e0ce255cf00e247de5217f4d6f51396b05eb39622283c8b6da346 SHA512 5bb6d535ca50b293d039a748ad58c301d38c61c93c10b72fb054a2b511f0608f7aa308f1fd8738dc7102de6eacaadbb8a5ad96edd053c9600bfc6d787b7c13e6
diff --git a/dev-util/pycharm-community/pycharm-community-2023.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2023.3.3.ebuild
deleted file mode 100644
index a7d802f5c2db..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2023.3.3.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
-
-inherit desktop readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+bundled-jdk"
-
-BDEPEND="dev-util/patchelf"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	app-arch/brotli
-	app-arch/zstd
-	app-crypt/p11-kit
-	dev-libs/fribidi
-	dev-libs/glib
-	dev-libs/json-c
-	dev-libs/libbsd
-	dev-libs/libdbusmenu
-	dev-libs/nss
-	dev-libs/wayland
-	dev-python/pip
-	media-fonts/dejavu
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2=
-	media-libs/harfbuzz
-	media-libs/libglvnd
-	media-libs/libjpeg-turbo:0=
-	media-libs/libpng:0=
-	net-libs/gnutls
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-RESTRICT="mirror"
-
-QA_PREBUILT="opt/${P}/*"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -vf "${S}"/help/ReferenceCardForMac.pdf || die
-
-	rm -vf "${S}"/bin/phpstorm.vmoptions || die
-
-	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.so || die
-	rm -vf "${S}"/plugins/performanceTesting/bin/*.dll || die
-	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.dylib || die
-	rm -vrf "${S}"/lib/pty4j-native/linux/{aarch64,arm,mips64el,ppc64le,x86} || die
-	rm -vf "${S}"/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.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
-
-	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
-	do
-		if [[ -f "${file}" ]]; then
-			patchelf --set-rpath '$ORIGIN' ${file} || die
-		fi
-	done
-}
-
-src_install() {
-	local DIR="/opt/${PN}"
-	local JRE_DIR="jbr"
-
-	insinto ${DIR}
-	doins -r *
-
-	if ! use bundled-jdk; then
-		rm -r "${JRE_DIR}" || die
-	fi
-
-	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier,inspect.sh,jetbrains_client.sh,ltedit.sh,pycharm.sh,repair,restarter}
-	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,keytool,rmiregistry,serialver}
-	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
-
-	make_wrapper "${PN}" "${DIR}/bin/pycharm.sh"
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /etc/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2024.1.4.ebuild b/dev-util/pycharm-community/pycharm-community-2024.1.4.ebuild
index a7d802f5c2db..f8a59ad68c8b 100644
--- a/dev-util/pycharm-community/pycharm-community-2024.1.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2024.1.4.ebuild
@@ -7,7 +7,11 @@ inherit desktop readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
 HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+SRC_URI="
+	x86? ( https://download.jetbrains.com/python/${P}.tar.gz )
+	amd64? ( https://download.jetbrains.com/python/${P}.tar.gz )
+	arm64? ( https://download.jetbrains.com/python/${P}-aarch64.tar.gz )
+"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
diff --git a/dev-util/pycharm-community/pycharm-community-2024.2.1.ebuild b/dev-util/pycharm-community/pycharm-community-2024.2.1.ebuild
new file mode 100644
index 000000000000..c80a2c6fc51f
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2024.2.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="
+	x86? ( https://download.jetbrains.com/python/${P}.tar.gz )
+	amd64? ( https://download.jetbrains.com/python/${P}.tar.gz )
+	arm64? ( https://download.jetbrains.com/python/${P}-aarch64.tar.gz )
+"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+bundled-jdk"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	app-arch/brotli
+	app-arch/zstd
+	app-crypt/p11-kit
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/json-c
+	dev-libs/libbsd
+	dev-libs/libdbusmenu
+	dev-libs/nss
+	dev-libs/wayland
+	dev-python/pip
+	media-fonts/dejavu
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2=
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo:0=
+	media-libs/libpng:0=
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+RESTRICT="mirror"
+
+QA_PREBUILT="opt/${P}/*"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -vf "${S}"/help/ReferenceCardForMac.pdf || die
+
+	rm -vf "${S}"/bin/phpstorm.vmoptions || die
+
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.so || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/*.dll || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.dylib || die
+	rm -vrf "${S}"/lib/pty4j-native/linux/{aarch64,arm,mips64el,ppc64le,x86} || die
+	rm -vf "${S}"/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.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
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local DIR="/opt/${PN}"
+	local JRE_DIR="jbr"
+
+	insinto ${DIR}
+	doins -r *
+
+	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier,inspect.sh,jetbrains_client.sh,ltedit.sh,pycharm,pycharm.sh,repair,restarter}
+	fperms 755 "${DIR}/${JRE_DIR}"/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,keytool,rmiregistry,serialver}
+	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+	if ! use bundled-jdk; then
+		rm -r "${D}/${DIR}/${JRE_DIR}" || die
+	fi
+
+	make_wrapper "${PN}" "${DIR}/bin/pycharm"
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /etc/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index f1834e3241d5..0431f1ee1f2a 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9 SHA512 27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c
+DIST qbs-src-2.4.1.tar.gz 5739646 BLAKE2B 5455779be27a5eed316372303ec4264a6af8238684e9c4ae46dffcf7f9038b9aaff75dab29c84e761808158ce60f408c46eac829ef226168ad86c85df2fe7cd2 SHA512 caeb9289a208ca227fc2a16c38d88594b3b958c33f9108f74463bfad412a07ac7f7c4f85b6a741d3ee4c842e5a5d980d88b9c279ff8636cb2e98f67a70ee54b3
diff --git a/dev-util/qbs/qbs-2.4.1.ebuild b/dev-util/qbs/qbs-2.4.1.ebuild
new file mode 100644
index 000000000000..45c3e36f74e4
--- /dev/null
+++ b/dev-util/qbs/qbs-2.4.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 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 python-any-r1 toolchain-funcs
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/"
+SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+		')
+		dev-qt/qttools:6[assistant,qdoc]
+	)
+"
+
+CMAKE_SKIP_TESTS=(
+	# QBS does not inherit toolchain/flags knowledge from cmake, and
+	# while can use ${BUILD_DIR}/bin/qbs-config to improve this it
+	# remains very fickle and will fail in varied ways with clang,
+	# musl, -native-symlinks, and libc++. After consideration it feels
+	# not worth worrying about affected tests here (even if notable).
+	tst_api
+	tst_blackbox # also skips blackbox-* (intended)
+	tst_language
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-qtver.patch
+)
+
+python_check_deps() {
+	# _find_python_module in cmake/QbsDocumentation.cmake
+	python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# temporary workaround for musl-1.2.4 (bug #906929), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	# tests build failure w/ gcc:14 + -O3 (bug #933187, needs looking into)
+	use test && tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] &&
+		replace-flags -O3 -O2
+
+	local mycmakeargs=(
+		-DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DQBS_INSTALL_HTML_DOCS=$(usex doc)
+		-DQBS_INSTALL_MAN_PAGE=yes
+		-DQBS_INSTALL_QCH_DOCS=$(usex doc)
+		-DQBS_LIB_INSTALL_DIR="$(get_libdir)"
+		-DQT_VERSION_MAJOR=6 #931596
+		-DWITH_TESTS=$(usex test)
+		-DWITH_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelogs )
+	cmake_src_install
+
+	use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || die
+
+	docompress -x /usr/share/doc/${PF}/qbs.qch
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 8d3920cabb1f..d2cc3c1589ad 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -2,3 +2,4 @@ DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86e
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
 DIST rebar-3.22.1.tar.gz 797521 BLAKE2B 7785dcfb400108324ea5ee351796cfdf7ca8658a93db01d4530e291feb22d64261749142cd74f9fe0dd5c1e53190f191531932315e6dcc4290870f13519b7df2 SHA512 fc41b306ba88ce2fb600763b226850d55f6b85a169d6177cf24c4483effbc6c4c202051b6e0b4d0cd1e06b913fb8597b1517d73d2c1422b573005e51ed81d54e
 DIST rebar-3.23.0.tar.gz 807007 BLAKE2B 97c4bdb2c2fa8d5ad6f3dd7760329ecff801495a3cd3c4e389a9197071fc6e34cc880626e94a30045a4783e0dd240fcd46d32f41a0d83f823daf8d304c02294b SHA512 4da1db8ed830c59fb322c1a652c2efe28d54e09ad74d12a87381ea7a7f13965b91815f383221831fbc14e6deed1a75db1039164f7df128a977d5b64048540cc3
+DIST rebar-3.24.0.tar.gz 821260 BLAKE2B 28db51e93c6d6407dc6a6654837a84d237e187e9ca0b8ea17d4f51ff20900d3fe77860c49bde21fb65d157568821d61bde8aa350bfd92027bc9221cc256c6205 SHA512 f6673d384e9f16b27e940ee738b15088007c1edd4b8cc87e4624ba66aead9fbe790f39797abd3996f4e234ca3536d4d0b9e4166bec6df21ec2ea887cfabcb2a6
diff --git a/dev-util/rebar/rebar-3.24.0.ebuild b/dev-util/rebar/rebar-3.24.0.ebuild
new file mode 100644
index 000000000000..cac74bb37686
--- /dev/null
+++ b/dev-util/rebar/rebar-3.24.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN}3
+MECK_PV=0.8.13 # see rebar.config
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
+SRC_URI="
+	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://repo.hex.pm/tarballs/meck-${MECK_PV}.tar )
+"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="Apache-2.0 MIT BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+# Note: /usr/bin/rebar is a ZIP archive of BEAM files so := is needed
+# see #913601
+RDEPEND="
+	dev-lang/erlang:=[ssl]
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use test; then
+		mkdir "${S}"/vendor/meck || die
+		tar -O -xf "${DISTDIR}"/meck-${MECK_PV}.tar contents.tar.gz |
+			tar -xzf - -C "${S}"/vendor/meck
+		assert
+	fi
+}
+
+src_compile() {
+	./bootstrap || die
+}
+
+src_test() {
+	./rebar3 ct || die
+}
+
+src_install() {
+	dobashcomp apps/rebar/priv/shell-completion/bash/${MY_PN}
+	dobin ${MY_PN}
+	dodoc rebar.config.sample
+	doman manpages/${MY_PN}.1
+
+	# MIX_REBAR3: Used by elixir
+	newenvd - 98rebar3 <<-EOF
+	MIX_REBAR3=${EPREFIX}/usr/bin/${MY_PN}
+EOF
+
+	insinto /usr/share/fish/completion
+	newins apps/rebar/priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins apps/rebar/priv/shell-completion/zsh/_${MY_PN}
+}
diff --git a/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch b/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
deleted file mode 100644
index 27811e9930ee..000000000000
--- a/dev-util/rizin/files/rizin-0.5.2-find-tree-sitter-parser.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/913343
-
->=tree-sitter-0.20.8-r1 doesn't install parser.h anymore because it may be
-mismatched with the version used to build the parser. Use one bundled with
-rizin-shell-parser instead.
-
-This should propagate into rizin-shell-parser when they regenerate
-with a newer tree-sitter release (once one is made).
-
-See also:
-* https://bugs.gentoo.org/912716
-* https://bugs.gentoo.org/913343
-* https://github.com/tree-sitter/tree-sitter/pull/2573
-* https://github.com/tree-sitter/tree-sitter/pull/2574
---- a/subprojects/rizin-shell-parser/src/parser.c
-+++ b/subprojects/rizin-shell-parser/src/parser.c
-@@ -1,4 +1,4 @@
--#include <tree_sitter/parser.h>
-+#include "tree_sitter/parser.h"
- 
- #if defined(__GNUC__) || defined(__clang__)
- #pragma GCC diagnostic push
---- a/subprojects/rizin-shell-parser/src/scanner.c
-+++ b/subprojects/rizin-shell-parser/src/scanner.c
-@@ -1,7 +1,7 @@
- // SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
- // SPDX-License-Identifier: LGPL-3.0-only
- 
--#include <tree_sitter/parser.h>
-+#include "tree_sitter/parser.h"
- #include <ctype.h>
- #include <wctype.h>
- #include <stdio.h>
diff --git a/dev-util/rizin/rizin-0.7.3-r1.ebuild b/dev-util/rizin/rizin-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..9f446bfb76f0
--- /dev/null
+++ b/dev-util/rizin/rizin-0.7.3-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="1203a9a2f51e32337c8434d9f4f7c4543552e271"
+
+inherit flag-o-matic meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+HOMEPAGE="https://rizin.re/"
+
+SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
+	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="test? ( fetch ) !test? ( test )"
+
+# TODO: unbundle dev-libs/blake3
+RDEPEND="
+	app-arch/lz4:0=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	>=dev-libs/capstone-5:0=
+	dev-libs/libmspack
+	dev-libs/libzip:0=
+	dev-libs/openssl:0=
+	dev-libs/libpcre2:0=
+	>=dev-libs/tree-sitter-0.19.0
+	dev-libs/tree-sitter-c
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+)
+
+src_prepare() {
+	default
+
+	local py_to_mangle=(
+		librz/core/cmd_descs/cmd_descs_generate.py
+		sys/clang-format.py
+		test/fuzz/scripts/fuzz_rz_asm.py
+		test/scripts/gdbserver.py
+	)
+
+	python_fix_shebang "${py_to_mangle[@]}"
+
+	# https://github.com/rizinorg/rizin/issues/3459
+	sed -ie '/dyld_chained_ptr_arm64e_auth/d' test/unit/test_bin_mach0.c || die
+
+	if use test; then
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+}
+
+src_configure() {
+	# workaround tree-sitter-c induced underlinking in bug 928301
+	append-ldflags -ltree-sitter
+
+	local emesonargs=(
+		-Dcli=enabled
+		-Duse_sys_capstone=enabled
+		-Duse_sys_libmspack=enabled
+		-Duse_sys_libzip=enabled
+		-Duse_sys_libzstd=enabled
+		-Duse_sys_lz4=enabled
+		-Duse_sys_lzma=enabled
+		-Duse_sys_magic=enabled
+		-Duse_sys_openssl=enabled
+		-Duse_sys_pcre2=enabled
+		-Duse_sys_tree_sitter=enabled
+		-Duse_sys_xxhash=enabled
+		-Duse_sys_zlib=enabled
+
+		$(meson_use test enable_tests)
+		$(meson_use test enable_rz_test)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# We can select running either unit or integration tests, or all of
+	# them by not passing --suite. According to upstream, integration
+	# tests are more fragile and unit tests are sufficient for testing
+	# packaging, so only run those.
+	meson_src_test --suite unit
+}
diff --git a/dev-util/rizin/rizin-0.7.3.ebuild b/dev-util/rizin/rizin-0.7.3.ebuild
deleted file mode 100644
index 5b8d7bfee238..000000000000
--- a/dev-util/rizin/rizin-0.7.3.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="1203a9a2f51e32337c8434d9f4f7c4543552e271"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
-	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="test? ( fetch ) !test? ( test )"
-
-# TODO: unbundle dev-libs/blake3
-RDEPEND="
-	app-arch/lz4:0=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	>=dev-libs/capstone-5:0=
-	dev-libs/libmspack
-	dev-libs/libzip:0=
-	dev-libs/openssl:0=
-	dev-libs/libpcre2:0=
-	>=dev-libs/tree-sitter-0.19.0
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
-)
-
-src_prepare() {
-	default
-
-	local py_to_mangle=(
-		librz/core/cmd_descs/cmd_descs_generate.py
-		sys/clang-format.py
-		test/fuzz/scripts/fuzz_rz_asm.py
-		test/scripts/gdbserver.py
-	)
-
-	python_fix_shebang "${py_to_mangle[@]}"
-
-	# https://github.com/rizinorg/rizin/issues/3459
-	sed -ie '/dyld_chained_ptr_arm64e_auth/d' test/unit/test_bin_mach0.c || die
-
-	if use test; then
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcli=enabled
-		-Duse_sys_capstone=enabled
-		-Duse_sys_libmspack=enabled
-		-Duse_sys_libzip=enabled
-		-Duse_sys_libzstd=enabled
-		-Duse_sys_lz4=enabled
-		-Duse_sys_lzma=enabled
-		-Duse_sys_magic=enabled
-		-Duse_sys_openssl=enabled
-		-Duse_sys_pcre2=enabled
-		-Duse_sys_tree_sitter=enabled
-		-Duse_sys_xxhash=enabled
-		-Duse_sys_zlib=enabled
-
-		$(meson_use test enable_tests)
-		$(meson_use test enable_rz_test)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# We can select running either unit or integration tests, or all of
-	# them by not passing --suite. According to upstream, integration
-	# tests are more fragile and unit tests are sufficient for testing
-	# packaging, so only run those.
-	meson_src_test --suite unit
-}
diff --git a/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch
deleted file mode 100644
index 3f322aef3582..000000000000
--- a/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Detect amdgpu module for amdgpu-builtin kernel
-From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001
-From: YiyangWu <xgreenlandforwyy@gmail.com>
-Date: Sat, 2 Apr 2022 16:40:11 +0800
-Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
-
-Closes: #102
-
-Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
----
- python_smi_tools/rocm_smi.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python_smi_tools/rocm_smi.py b/python_smi_tools/rocm_smi.py
-index 57606ee..35be495 100755
---- a/python_smi_tools/rocm_smi.py
-+++ b/python_smi_tools/rocm_smi.py
-@@ -66,7 +66,7 @@ def driverInitialized():
-     """
-     driverInitialized = ''
-     try:
--        driverInitialized = str(subprocess.check_output("cat /proc/modules|grep amdgpu", shell=True))
-+        driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True))
-     except subprocess.CalledProcessError:
-         pass
-     if len(driverInitialized) > 0:
diff --git a/dev-util/roctracer/roctracer-6.1.1-r1.ebuild b/dev-util/roctracer/roctracer-6.1.1-r1.ebuild
new file mode 100644
index 000000000000..5ac47938ee4d
--- /dev/null
+++ b/dev-util/roctracer/roctracer-6.1.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( 18 )
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic llvm-r1 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}"/roctracer-5.7.1-with-tests.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
+		"dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	llvm-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
+
+	# 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 -i -e 's/-Werror//' 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/roctracer/roctracer-6.1.1.ebuild b/dev-util/roctracer/roctracer-6.1.1.ebuild
deleted file mode 100644
index 61a5b02149f2..000000000000
--- a/dev-util/roctracer/roctracer-6.1.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-LLVM_COMPAT=( 18 )
-ROCM_VERSION=${PV}
-
-inherit cmake prefix python-any-r1 rocm llvm-r1
-
-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}"/roctracer-5.7.1-with-tests.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
-		"dev-python/ply[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	llvm-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
-
-	# 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 -i -e 's/-Werror//' CMakeLists.txt || die
-}
-
-src_configure() {
-	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"
-		-DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix)/bin"
-		-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/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index f08fc347182e..26757e228953 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,2 +1 @@
-DIST rpmdevtools-9.5.tar.xz 96724 BLAKE2B a406581be0286a6cb4b611289820f5a2db4306b731b0963881091e27b04b213c155243aeb95eadb41a27ab7a481bf1464d27d31fb52c6b10c3cedb23c1b22d21 SHA512 d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a
 DIST rpmdevtools-9.6.tar.xz 96956 BLAKE2B 8e6e6db9de7424cb2f6d79cbc8511d635c02167d0ef52d4d2b30fc8f2d0cdb9b8b238450d5c79e0edd4cab16205346f6fce93c4e26c8934345056c6ded94d742 SHA512 691fec8944029dbe60cb3eab0200d1201f5aa3dd11cd49e8313ee7c1fe998237217ea9c5ae7b4a70f61f3c998093f23d26266b23f41607ddca3148d5f6b6ae06
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
deleted file mode 100644
index 21738f869519..000000000000
--- a/dev-util/rpmdevtools/rpmdevtools-9.5.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1
-
-DESCRIPTION="Collection of rpm packaging related utilities"
-HOMEPAGE="https://pagure.io/rpmdevtools"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-	dev-lang/perl:*
-	$(python_gen_cond_dep 'dev-python/progressbar2[${PYTHON_USEDEP}]')
-	$(python_gen_cond_dep 'dev-python/requests_download[${PYTHON_USEDEP}]')
-"
-RDEPEND="${DEPEND}
-	net-misc/curl
-	emacs? ( app-emacs/rpm-spec-mode )
-"
-BDEPEND="sys-apps/help2man"
-
-src_prepare() {
-	default
-	python_fix_shebang rpmdev-{bumpspec,checksig,rmdevelrpms.py,sort,spectool,vercmp}
-}
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index f43189735b67..8a0a082f9bde 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -9,7 +9,6 @@ DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f2
 DIST annotate-snippets-0.6.1.crate 21894 BLAKE2B 4684eb9c7aaaf7e34808338d05c523482709de2c79245df30e1d1148b79de77fc4bff88adefdb85d0675799749c9ed8bd1a14be0d75f68c2c7664ea5db13ec16 SHA512 3354bc87d4ff32f73db98546a6e434f3ecfe6d290f08df5ebaf6afec15dfbe105e6b4e91133f442246a7c2e534730550010ef18ff075f1f7d6267799962e2b23
 DIST annotate-snippets-0.9.2.crate 32065 BLAKE2B ecd635f285ebb3e24f5a37db14d7285e2ae8fec19c1ea53c21377eb65cc76777507bdf93ae23460f44099579b2fc2dcaaf97d7b8530290a8488ecd0feaa194b4 SHA512 668202780b4822d4cbbb654346eba1d36b6b47e0047df55f233768cff73ecd53220c8613179cede942a0bd2373eac753b29803e91924f1037dac1135a0690013
 DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
-DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
 DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
 DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
@@ -28,20 +27,19 @@ DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60
 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
-DIST camino-1.1.7.crate 36204 BLAKE2B ea87922e77401a23f25d66af303f39c568f37377e4f0cd6d206cb7b175a51528680bf67897e3b9830d276acb1b156b7c66e149b75370be202cb99fbbcea54233 SHA512 b82c809bd52549d16e286d514b5dbb1d640633b7ff05412ce3539e543de9c69d99bc3f62597b94fc0cedd7c8034ebf73663a6f647e46409b778baa4877928c45
+DIST camino-1.1.9.crate 37552 BLAKE2B 28b21517730db408598f83e269ee8aa4dc5388c4b491779ebb6e76c478d407f929bda6906d88d429828d7f01be1762c72ecbb6d8c7aa4a1d1906109a17b45df1 SHA512 27a6a3cf72c46f15a6017aea44a048f2a8eb577aa9d2a088141b1cb7479106152ef0bc00a6cea9332c4df4d0c54aa6bd3dc21159f15640e347407c15a1bbf7ea
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST castaway-0.2.3.crate 11509 BLAKE2B bbecba400bf98ef4158581f3b1673ca77dbec3ad754d3749f0e9342a47d1fa9f638c1388f0762413277b73251854ade26e08dd85b7d7133c73a5750d4dbf7d92 SHA512 2565a4e5709a25118462ac25b9f741e92456c81ddbf7c4e791d8c647f2ca5227b2f59ffac108f9d32c77cedc12219c517218c51a78b1d22a1baef1bf2c16e0a9
 DIST cc-1.0.95.crate 76485 BLAKE2B fb86d2c49e9ee73f1a7f9268274a879260b13adafa49c8bd4bcd4acb77861b7b65c5cdda988877e1ad2d4a4eee52308ddc29b545a07cf90cdcf10268ce639986 SHA512 7e19d1c2271a094311db96edc6faa6576366070dc2e77a666ce43016c367d5a94e832724b95b170650bdb16998699699e45d3ac2cd0eda6655c58c1e141d40d1
 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 chic-1.2.2.crate 10269 BLAKE2B 2c792e22b71347e34769e4c43d12dccb92c9c2a3e502f144e5078e71bb6192700d3e783c5c3d6046c0c7070d27f1b19c1dffddd59f4fc4a9b755353c9c0b8340 SHA512 f143424b5d0e5366328a1bea169bd99ab214214c51223974ca847b36e3225f4946a57542a673fb2fb43e0b620782de4e4c87ed4ef22e97905aede4419a8c0603
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 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.13.crate 56267 BLAKE2B 233f2fb4405ee2ff669220214c13b6c94858dbc375c8bf7eb83d7488690d74ebd8e1514679e02d1354b493b6e37fd7ed4b2ae32065d115a7287014aece90c2af SHA512 dd1a42ad3bf39463966c2ef76f3ec2dc5a847160bcd73de1718bd6706790f1ace183e3c9e6ee8d06f6ddea4b9bf30c884fa97d36b44f30dac26a85a52d9a0025
-DIST clap-4.5.15.crate 56612 BLAKE2B f5f34a6d3e84731de7dc1b54d8576e8e9e573fa1381e9bbcba8e2b66f8cc693ce51c7a876c34705ed705de7a793bfd2f4922fb86f8764adb7a4dacd03af06ff7 SHA512 a0bd102065cb29eb565e65408ce5bf37e3404b7496959614d10ff2f9bb2e29c1abf8f5a3716aa85994a49bce4ac12d63586c8ec8187c0d3a6f696a4804fb446b
-DIST clap_builder-4.5.13.crate 164093 BLAKE2B f938635782ba9c1a675bc15a73a36ee7f1cbee501dd10be6f267364fde125c75474e5abe226e0eaf0c9fb224887c65bbc1be4641ca093282d3042f9980f4ab94 SHA512 ab7a29b29a15d22701550fc590ca6ec256edf03828e2b9a87072734a8f66b6e5a1843ac2ee7856c62472960af4e8f40840f840adb78ce5afca918f333e0f623f
+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.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3
 DIST clap_complete_command-0.6.1.crate 7959 BLAKE2B 61bb266fdebb625ce3327164ab39d65943406fe9c101f10fa3a1f18d4728e0eeca07dcd8eb4e8f6eb63587cd1af86fb05beedf1c5b2bbaf22356f213ea738c7c SHA512 b364cac56e9604c7c06a84f5d687b62398f92e3c0407123b183d5c3846948a4a0975469326312ad57e2ce936574462f3dde61385062827e48efc3ff813185ef6
@@ -69,7 +67,7 @@ DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150
 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 crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
-DIST ctrlc-3.4.4.crate 14660 BLAKE2B fe7c2ca8352dbe40e60ad2c63654beafd9ad3f62483b23b3c614a22dacc8ce0edd2b94e9ec3a2472c581f6a1b8befe0952df092b4c7d34ad92414190e285e51b SHA512 c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c
+DIST ctrlc-3.4.5.crate 14592 BLAKE2B 189b026f4061b68848851dc694c71c6ecf87d6c6cdb4518a3aa215ac3d77739db43aa68e3c628e51dad99d7ad089ae6c66a6d03bd912ab9748a0793d09c2333b SHA512 3fca36deead46f3ca586f0a07ace804251d3c3e49a9a63e8c34546e2305d08158770304ebd0c9ad6ed499f811cbbee0b76ffee1858aae60852a61a19024db3e6
 DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3
 DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751
 DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0
@@ -91,7 +89,6 @@ DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53f
 DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a
 DIST fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf
 DIST fern-0.6.2.crate 304626 BLAKE2B 7dbfc8a1cf0adc288732a1dcc23e30bfea6668b01e162b60e867b67b995b7eeea5399b9e9a630510e3f56c8f36b79b34913342b7c8834783ddacb2cd7b94e140 SHA512 f9c44d1387f803b567b7254d91cd942c55d30a1c3cd37786101d7d49d346bc2bbc593fa8a3b2e59711c5320c1496354e8d2f3ecf0967030ac1e5199650523fba
-DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
 DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
 DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -116,7 +113,7 @@ DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e51
 DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
 DIST imara-diff-0.1.7.crate 155688 BLAKE2B 13dd1ee85099d51a858e936e1509969ab81d597c69f58eda9f5d6724c9cf3ce9c0de834d697501ee0632f2fa64c845ff612380eee0bb1c2066cd45603559d622 SHA512 7a728321bdad9341f7d2f8ba0f812bf5212a8bcefe55898c974e59d40fd8add084e132be9c4144d07f954519340a00d1c881a039928114271044ce7bd3174d11
 DIST imperative-1.0.6.crate 13221 BLAKE2B d5d8e0ef53a5f05e42090c8a530bccf6863edf83acc56e58f4d785d6926137daf4d8bde21dadb77db50888580a723b827097ed80751bd63ce39d7a2ca0d917f0 SHA512 b11a6deb6c9e77d853a8b589040ce05f2c33243383811a88ef066ddbb6a4a10c32a08cae941360b56ca0445a0c08f2fbfb7d559585cde1e8c0c47f74d15d77ac
-DIST indexmap-2.3.0.crate 83027 BLAKE2B c42cd83845923e68f9035de2d0645dfd5f37edab8b5f076c5d578867e721403b71cc48c5a68166e03688be96995c73cb81d0f2583aae8e24eb554a432854cf84 SHA512 035f76873c8f94dc0ebf8e2cd29c157135a1a6b5fe042997bd30a928227f6257a19dfbc43ea9b50cee425fabdfbe0ef6704627126ae5cc937855d6c91fca0958
+DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
 DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
@@ -125,7 +122,6 @@ DIST insta-1.39.0.crate 87049 BLAKE2B c37b99bb8dde3fcac0b8a41e7e2a76a014fb0919d0
 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
-DIST is-macro-0.3.5.crate 8936 BLAKE2B d8e9d758319d608385755500c8aade98a8b015ff1e4377f53af0c117d22696e7a2f86b43f707da28a6f9d4420cba0305f15cf2898a123f90e1ce556afbca352c SHA512 aced5c4166287a245a4f6191d6e65c292529533924310caf06f0c0d2adee5cb68724258cd818de2bc32d1fdb10882e915a262c50f62a287ae18b01a59b6b59c5
 DIST is-macro-0.3.6.crate 9068 BLAKE2B f71d613cff0fd7364b82ee5e411ec8f8e0a1c68e98e78c3689eceefc9cb356fdf7079ee3e3fa301aa5b6f63a4c8b4745c74f0be03579d8498d8aec8b1cf929b9 SHA512 d803f8efad46572de59da406c508aa538733ae454919a7f6885e65d5c014982036b0bbea33314f07743ac1e0db188b76c28056e03993f3e95b22992e18cb9727
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049
@@ -134,11 +130,11 @@ DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05
 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
-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 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.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libcst-1.4.0.crate 110834 BLAKE2B 60ccda8ed6fe74415e2d3a453a58eb8ecaa28ddbbecde12720d11557456824d963a8182f678d9af63730bf1df21102084d2dcb96f848a7800c98a22f32ee86d3 SHA512 f960d3c2e4a8f31f65666f3c1e900ab04d5d306f08ed9336e8cdd2f6160a3bf2dde286f4b3f1ee7bd900885d5fbd53a0c903f9746bf9edcd7f33aeae22937e8d
 DIST libcst_derive-1.4.0.crate 9303 BLAKE2B 4f6f05578fd57328b80913cb594b3cc6944b8ac62bbee747598a0502c044dc77e781836ef7b7e01046d92990514b5168c553f87ccafe2197c328bdd833b3c613 SHA512 6095719fbd5931d1e8e9e60ae7c03b03b9110ecc6054396e1a086e7fc7f1642a6085deff0d90d857ae8f0037aa8bf396a9b5a5660941c0de4cc659664a41034a
 DIST libmimalloc-sys-0.1.39.crate 198523 BLAKE2B 371751d8eabd682d879a4d85b163d3c2f3dc3968232241cd2d7b573a5b78164efa6cd90c2b81d350c69354fee5676edb3e37f75f676731fccc913a83878c7358 SHA512 db578da8722b82eafac3b587b2db24cbf95fbd85a25b7ce30286deb9eda6820b5d452ece7c3126a2d8c96400941dc3946b4cb2f46172241861405aa09a3a2451
@@ -154,12 +150,14 @@ DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346f
 DIST matchit-0.8.4.crate 33986 BLAKE2B 4d7b43199552cf01daee7aab49cd5bd114704d14985c1df7a800f2ad7951a7ac2b1047b9ca35e42b8443d701f2e76afb669f383380e442e60ff08f30418f7a41 SHA512 62cd181bb866a874c5d403ed1b14ac54628ccd356d87c5479ea88febdef2ec58e60eb02a42e8eb19cc12f14483e5aef0158608143ac2d78548f1d892910fa8ac
 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
 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 mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
 DIST newtype-uuid-1.1.0.crate 11742 BLAKE2B 4488e28a6a1fd6bad4f935bdfbc636f6372a6deb7e9d7028866fb817d87f9f6e9935e3348aff11fbc826947849ab59d69f2a0246fdd95d2582c7e42e7307d227 SHA512 fc0a3a7cd72ef8d9dc6682c0fad9f8722ce0fee99976a70df1bfbdedef0cff3e110da9e9283d947ed23b72e5354167d443718c7b374a2f521ca6dc181e0e490a
 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 nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
@@ -169,7 +167,7 @@ DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
-DIST ordermap-0.5.1.crate 56684 BLAKE2B 7e6ada824e747d004f21a9a4215dc03c06a7b0e573390a207f16606bfaebfc1c06af5a0ae2dd7e7534f7ea17aba5420f54e55d3dc20b03fa9e94e1fd3a6d4b10 SHA512 6e203b1540b59cbe67e650a439e04806b1e054847ffe44a77d21f82a4fb4f5044874425752f73c97d2435133055f1391dd81f49f071bf6160a941413aaaa1b56
+DIST ordermap-0.5.2.crate 57193 BLAKE2B eb619d12fc2aa86d8ed17fe80497d93e989f8ddfddc99f415960e0e07a10e91222f9e85b9b0983534220fc8b426aa66c412360bfdd2947d7ba6bce83dcc77d37 SHA512 4bcd983c6afd447d013fcf7150dae92c9e8a9273bc9ac32a7af5bf75a9b671cfa46c04a96d04b0e9b993679aee37320fb4d14fa49c63ba4b98325c9eddbc192a
 DIST os_str_bytes-7.0.0.crate 26224 BLAKE2B b375e0b89afed81f2ffba5ee778d368438d5b3f09f09c4cdbff835e95754dac01ad3af14534f54030a43adad924cdf0cbc15045feae2cdd160145e2b5d8e36fe SHA512 aa3d88acd8b4daf094c2500735273db81dec6e827ad7ccd5700963e07149da7136aa14f453e0268b63a574d59700ddd7541579a4eaf08e8f4db81c261d38fae6
 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
@@ -198,8 +196,10 @@ DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aa
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST pyproject-toml-0.9.0.crate 6041 BLAKE2B 43947f872bffbdc37e1be5c8e0654f94ff0339c71244a519ecfaeba47a4204bbb004021bb5ca48cc07bd2be9146c288afdbfba8529b9d461798d235af390eaaa SHA512 d6475d4bed6a74392a0322dcf1d0cce2f8974616afb931270eb410e7c44fc8750acb1bd250b89203eaeda04efd5845e38d7618f762c3946012d5d3e77180b610
 DIST quick-junit-0.4.0.crate 20136 BLAKE2B a5b31361598f2b8edb18730fae091a824079dca4fa657c6482b0fcbc8d5882c1170eed313948a691b8addb0de5bbc44b845381e9b4d0285f523273073b88ce40 SHA512 fbe82e4531e7028d9d10ecdb0f1a2e3baf2231a0f7e7e28ca3dc3920c391b83972b9289a14c7f41695e5568e669164444f3e7ce562f3754a407271dc9aaf82c3
+DIST quick-junit-0.5.0.crate 20994 BLAKE2B 5886dc3d865d2d094542ccf66a5c542ccfadcbf34cd42634ed92e7454d129aae208ccb038e300e2836784fdd3297d24a2de536581c02a8b032d11c3e9395af4e SHA512 4eca172e9abe33210d71a65bd9f1d54333f06e7119879158b4d131f618320236c199b1ab49904d31b5c67d7512649b6ed97b3cf2e0bb0858670b31701b7f275d
 DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de
-DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST quick-xml-0.36.1.crate 185352 BLAKE2B 0ad31fb7210bb9c71ee480d400d10c01e02fdc509ccc275305cdabe29aa7d3816ffc7854371e493d3b4b28d43452bf7ef393f7ba4ca556d311cc83f7887ee802 SHA512 21233a50b5ec45db623d4043e03962a19f10cae36fcf3074c32eec3c007a59310ab884352b6c880632535164745fbbf2985d27cd549d50b509f97395a0d48248
+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
@@ -214,8 +214,8 @@ DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164
 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 ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
-DIST ruff-0.5.7.gh.tar.gz 4970307 BLAKE2B b57370b9107c1c2a37a67ce5a36c337ddb26c93ecd9fcf418d07cd4be899649b31b5d13218f523e37ba463219b7f5a3c4c78c9e30da23672b4836edbec8aafca SHA512 ef61008a854b544a6f666f6c5cef3f19c57fca77dc41314341bca4ea185a5df1a659c50a6d8fe3d12fbdfb830ceedc039aa12ab7e43a5dce417c231364ce7789
-DIST ruff-0.6.1.gh.tar.gz 5008090 BLAKE2B 018934f8b4bc14ffc8cbc919ed0b7f4bd95fada42099dd25fd3494c5ea4e3e43b79f5aa58a9893031d19c37a1d3bffa9e5f938350e8398444d98fc4159cfc05b SHA512 b448c893c17d273edfc71774670726da533a3994b9dabcbe72a301523422af66e87e95cef964d71ebec19f8f5693d6cad17704d332d1c00bc0ab6cbcc497a644
+DIST ruff-0.6.3.gh.tar.gz 5048435 BLAKE2B f77f54461d5fe9ef909641332aed632024c4cadc5748730a971705aa3d262d0e393e25b8e8a5c72372670fc2cb563c0293f19f2c0032e88959a2e82b155c140c SHA512 3c4efadf999253a06aa86a08dffded722ecf1e5939e9eae593e0e89b756f374406d6d0c3840598c4b49098fb9a7cb628f7537521f0445d6e465df517d98a2e94
+DIST ruff-0.6.4.gh.tar.gz 5069433 BLAKE2B 424192d17ba5fe69db4d0ac0867b43958884a532e86c8862fa524b95051c5a8f5765448e0de0b3c82f36c8db51d6e87f69176eeb59f1538f2f6a5fb52986b871 SHA512 eca710f53532e89ea75b9f46449b7b7cb1698e0a553d23282b2d04ea5dc7da0fb235d7da73557137fcae3eb81e74924fc41017d145dc85b170fa2780111aae5d
 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.0.0.crate 12691 BLAKE2B b6a619f681e897c8a9167bb88d6ba78715010ac6c1ef9a7a9e115fe8aab10fcd9d4f5e1893e89a36a59118819dbf67de3d261a190fe37948137f097bc99b3fd2 SHA512 996ad683db2e6839ee28fdc4a31293aecce7baefaf6051220a633a00beddef1be41aef0995d7501e5b92dbc85350ced920bc980d05f5ba235e9a5d1a13464339
@@ -225,24 +225,20 @@ DIST rustls-pki-types-1.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83ed
 DIST rustls-webpki-0.102.5.crate 200431 BLAKE2B b8901610abc6f11ca3022fb004dca836ad351f1c03063c29594a2225a6ecacb8a08493904953e3a36671b241b6ce53deaa684a24dab6cbe75222556662efb991 SHA512 50a72191cbd4797fb083b4a0b64ce12781761f46b86233c34f2af184e5812e2cbd8d2d3c61b6e969feea0e4d812c7744927873762cce0f8f96d5480f2c9d0d28
 DIST rustversion-1.0.15.crate 17406 BLAKE2B ef68a3a83e11f6734be94117e5170f92f9e1211d353a81b45ed11d4c738278c7f519ebfc9896681d564698fbcc579da10f97fddd77d56b14dbb96b90e16ea811 SHA512 e0e37511c25b71a64bd6f91cd8b29e43c4073ef56196de808634f3408cc297fc7fda1316a5adc5fffde9192b7d64f1940deb7cf396277a3805e89e15b2a855da
 DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
-DIST salsa-ece083e15b79f155f9e4368ec1318cec9a08d88b.gh.tar.gz 594211 BLAKE2B 35f69d08095c1ed5fddc5ff5d1f4b6a0f0b055fe304d9d1db6f279e4c88198791be484e0f27de4a14df5f07ae86bd4d46377c5ea48ff8ffcf12a883233034298 SHA512 f92d47b6993139e18aa4bb738d501ad408358a255448f5312824fa9793d675d1c52493d34a2fcbb4e3393605d826ea4e01fcb62c6a58e1392a64c4c58eed2a37
+DIST salsa-f608ff8b24f07706492027199f51132244034f29.gh.tar.gz 594913 BLAKE2B e93b5673d4101ed9e11082c2e7f9d230ff073a6bbb58df41d72052d02452cb0cf97189a4e710ecc10f97355ed84d9ab620cc1e77ba81776e344ce89d2fc538f4 SHA512 ccea030aebb86c6df78e3b41107e6fa4f164d3aa36e99783e79bcaffde87a495946475cb1d3471666c5c1f2d8d1173f961572c6149c3e8a3ca1ae59ca0b7312c
 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
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST seahash-4.1.0.crate 31976 BLAKE2B f553bcff7af9da9b024efd8db4ec8cbe4100dcf4ccd8f627c724fe4a34b678ef0be8da44e92ea55c4622b9f9f37228792a22c8bcdd54e652ca926eb3c7d37655 SHA512 4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b
-DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde-1.0.206.crate 78250 BLAKE2B 004a4e20d1749469772e21948e2818d6c9b138164fb2cb71d112458870cf39bc414f405a01228e193d356dd858e8d05d0866feb515c5cb5770fb6667985f9336 SHA512 f8eeeba71f18e56c6ba93634339eb91b633d49f249d593794987c94a30977c2b55f981cfa7344b2e6f687c63ec5a76da7fe13bd3d758484e81edfa94e5731b15
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde-wasm-bindgen-0.6.5.crate 21098 BLAKE2B 34b7a66752422c21031fb21202c8405c43a1e6758eb067b4fafeb24f812280e70bf16c27bbcfa4b4b5723e369bca81e42020677787a79277f32f71eaab6822fd SHA512 c457b1e8c83760d94eaf8eb49169cd620cc1fd8246af8953503c2bea9c4ae916f3de3b9070bfd4102a713f8d843b6ee96404e27b21a48c589b444aae0f9303b1
-DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_derive-1.0.206.crate 56193 BLAKE2B 3b6e8ab1b57459b181f73df7b53155ce4c197538dd0c9194479b1983a54f0d126f375f05aa8d9e3142fe85a1cc9caeaf8efc07214d808741a13a6620afd83a7f SHA512 8c6bf8905f6cc7fe778bfe9e0532226d683e69f052cfe0797e7d534e4b8353c68dd8520f6e09b8b2bbca7fa32b39d69b4524fee20140b375fd1adc49acef2719
+DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
 DIST serde_derive_internals-0.29.0.crate 26065 BLAKE2B 522b09f139554a52201ac397323f0124b809e9e9ff6329b34afa99f90cdf65fb3cac8370d6ecb712b72dd8b5a1d96f7f7c4ffc9ac6718eaa8a66e1aaaa28d891 SHA512 ee6e53fc58aaefb2ff953bf58ef90af3c74151f5193fe7a75d8afbc6e3dfb83d54c514ee1403b5283bb7d25ff71d24c1d8622bf1bbe940e2ab8821938d4dff21
-DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160
-DIST serde_json-1.0.124.crate 148160 BLAKE2B 3cbac549c58b33a0ce3c8a68626ef96d75a46416a2d5018b3ade952edf001cbf12631ed650fb1650283ac3e506dacbeb564f61d842693d640c7abe34d2ee3984 SHA512 db47594b5030f8aa091d8f84585d87f53b7115888aaa84ac364eec4a8cc46619f42dbc7545908b503191ffc0d422883935243c30ee7d356ad58c84f1c943d4ee
+DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
 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.176.crate 18390 BLAKE2B 2f4bba264e75ce33023fb6d46f59c2a908b57a70b72e13a8d9832d2c15ad5fe17d3013bcc4ccb52f35295b9422bde2acd20c64c1c4cf28be620034bdf4f5266e SHA512 a7d18de55a4b4e6871d62a5df63eb2132caffb7922edcb767a9ed8fad094d9aca16efe8bfa3b625f48a543cd4cb20c13d78e5ca9ed3965cfdeda9c9fa8bc9a0e
 DIST serde_test-1.0.177.crate 18671 BLAKE2B 85efeedf5465ba9258f7138667cf547b4e3934b5b3cf36ceb09be04ec6ab32c77c43e7130cb1302a642586f0554c66ddaa5633f9644f9250c9db0b978993f8c3 SHA512 11be2b5f2f8e18ae5b787f26517cfd0be4750b021f792ec90f74425c54292c7b8e1525758b7fd9459d764fc1c104e6def95c14fe685261425aa162582074bc6c
 DIST serde_with-3.9.0.crate 145089 BLAKE2B a4d5032d864a996c2d6edf0b1ef4657784ab76b9cc437d86214024f6bd77dd59908efa594f24db4d2dca490f4e072d688681eee9d24f92c8a528d8940e991fc4 SHA512 90ae5faa9bdcc2ce2198599c546a0ee9593fffb3271c3fcc07bef5eb39fe7b44697dabdd6eaf059a166a67dc5694c70ae2908ca3f6fc65e25747cd391e3121b1
 DIST serde_with_macros-3.9.0.crate 30865 BLAKE2B 69c764f45180463047045f81106961f274411200ecec6997baad0c8ed0cc25f7550ceccba122fe3fd8d248e3a3a6bc3326f7f9ea0bd3c08e81b93589b75de537 SHA512 451af6f14cac8ead53b9705c530cb6494063ea8f20d1a7ca80561d16334985b98541bd9c3a50857a4cf377ab5d84593baadd5503676540da8212f9c5fea89e90
@@ -259,10 +255,8 @@ DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b
 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.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
-DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
-DIST syn-2.0.74.crate 267998 BLAKE2B f47aa22011b42038a1db1486822335b7c2c2453de04ccd881ade8c17bab192667977b689925c36b3c579bf2086d516f2b26f48e81cdce22ed8798e2664195119 SHA512 c0b602d9ba5342aec609e67a3ecabfaf49cc81be86fb0cc8e576c1a882b36678de5b139fb41981f437fa49012c6493ab0f68a528910a10a3a86c98a22451aa93
+DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36c2f595747edc65c0d2a05e9d8e4e9fb6dbb30da8264c7db36b1cea14110201bb06e40bca69b25c3f79f1c SHA512 c633b9f68e67b3cbf2432d3648e42f8d92403877a0128becd22cb108c0cfab9f1bc6b941b9cde225d8b727890e9f86457fad05b544fd07be4c01c2e60a2cdeaa
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
-DIST tempfile-3.11.0.crate 34153 BLAKE2B 3a89580e05600ff2ef5637d2ed76ad8f1a769f6dae40cbd23f7bc2cb9d0807d03713ce1571df54c866c8fd9a4fb073990e4e98cc8ffee33aa4d8343c2d39733c SHA512 47d4c48c4f90d116a2f7d5ebf29ea623fb0a0fbfb1192aaaa53a83218ac910b6c836d6d4d8233b07d06e14de70fbf30d243152b7ac22a03d180905c53b6ad9e6
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST terminfo-0.8.0.crate 46407 BLAKE2B 8ade6d7b6a1ccb7317f6d30ac5612754c8d324ab4614ab771d6cab692d191d658e9782d2a7f63f12bb30c7164438535b9a7e1cc37fa9daa691634f47c0e5517b SHA512 77b9abe815145962d40a502d04a62c393d97ba8c721c79ebd8f71eb23fc9bc4ab0d6a4b8b8b90ad5b716894ad53249c24270e54a9785f5f66918beb3e656d01d
@@ -302,7 +296,6 @@ DIST unicode_names2-1.2.2.crate 300609 BLAKE2B da243d53e507563335b98f7da478d0bbc
 DIST unicode_names2_generator-1.2.2.crate 14017 BLAKE2B 9ab0d78f21fc51e9a273425a7c53ab80095a2edb577c6ae7a05d995a123f2da1357b19b86616ea51b77329e5c5b7324e2ee99809ab397d3a7011cf6507c6007c SHA512 7bbb67f7ea4d8035e28f83300297557c7efd8aaa96da83f88dfa42c89ea0bc153bcf7fa4b03ed443c040ccf784bc0e2a42df17746e40f667db9b4ab206e25720
 DIST unscanny-0.1.0.crate 10338 BLAKE2B fd725928107d4d2ed2686709335ef01136bcd54d34180189906b7c2436e3f77496328484c623dec4920738f4a07e92be7e7581387c4f5b6996fa34c03efd7b0f SHA512 8267e327e4e852d627d416d58ebad5ba937ab6a2477b265fd5f79a98d43ade2d1780e67696b801cae8a4af10da8f7c0c257d2c878289eb6cf7e711dcf357d87c
 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
-DIST ureq-2.10.0.crate 112894 BLAKE2B e6c9c56cd4790aa842e2a07cbfdaf81d6971bdbc31d924d27eb3839abf7c5261e33aef3aad8b5a2c7f897eb798b107e987e2b64e9df66ca8095885f7e0cb740b SHA512 a04831abe500771bec2394993e79092c37d02106623bd49d45acf18eba51d5324723e1650ec13d2ae20cd23d4f8c2b66ab8cf179e39e81dca6c0cc04208695af
 DIST ureq-2.10.1.crate 113163 BLAKE2B aece4293775ee9bed49dfd7c1761fdee20c92322dedf70431b6214e8a40fd9f63e43d2846c1929135005c5260ffba4a388d779a2cb2808eb892b6b869f65fa08 SHA512 9944f0790b9c342a3584bb9217d0546dc4272b011bdaa47d22b42684dd7f655aad22750d395875c63e7c92d8d44ddf1ef610061b485f9600dfd79b4db5743656
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
@@ -315,14 +308,14 @@ DIST vte-0.11.1.crate 40455 BLAKE2B 7a24759e15a87ec17c9869c02b4875f67651b2b50431
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 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.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 wasm-bindgen-test-0.3.42.crate 17595 BLAKE2B 8db583cefbdcb0489b6fd7596ecdf367c1021c392d6259398f7a17b94f371802963c723cc33de0620a6067d9dac3b047f0eeeaf52cf0ddf1499de0d7f186571b SHA512 1b939195016264f4d888a208f85703107a2dae0de7d9712bbbc0c5a43b2e7c393175cb20a0151430a66b0819981aad51e0e574d1b3841617c61fac939c26e0ef
-DIST wasm-bindgen-test-macro-0.3.42.crate 8573 BLAKE2B 079595bfdd82642b82762c6b8abc7182a90d618e4c1f5efdd2c592c46af4f79e126844800f95f827263ed6443155e6333b4c7cd98b78effaa5a23ca08a0144d6 SHA512 f387033831d686206e13aacf182cbcc06da8084deb1689535c76618589e12f69a6f9dfd9e8740e0f91959bda8ca10bff7638ef08ddbe3779a3141cd6d83b1f6c
+DIST wasm-bindgen-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422
+DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597
+DIST wasm-bindgen-futures-0.4.43.crate 14207 BLAKE2B b7337c1863af9975ef4a10ef64b129cb7b579fa83849ffb8406637c10bd86da4db0709d1af4161c787de986c98acfb9c6b382a4871f53298e0db30cf2c482eb8 SHA512 2499b47329c3dec1d15666eb7307fabaca086881a46e1a53ff2a551df1122eb2b74b18ea1e7620152a35407ad49a93223332e20ac042295799e55f156b7061de
+DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632
+DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8
+DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420
+DIST wasm-bindgen-test-0.3.43.crate 18284 BLAKE2B 84a94f9a79d960702515302210faff92111b2901333d2793ed73fcd1617983b38d22efc0865692f46949d065edc0dbce399d2229729354ef1fea0602c15ba91a SHA512 f94f735fec45cccc35c540aceb49b84a8e2e77842f8dcd7d8d7d045c192e045d0449a4f37c487e5475e10086765e3fe94026c0aca7489f62a892ad69da0e78f7
+DIST wasm-bindgen-test-macro-0.3.43.crate 7828 BLAKE2B 1f6f7862be555786e9fddf84b63de781f003fd60552aac840b5cff17bc6e9669d33f33a7a9033bd504fa81d12ef6f2e57da84b24f99f38cadc39630155a5aa61 SHA512 c7191b72e7f6f1d1032e7f582301c1e8c844e9eec30983f5973946e617e037cb0f3090ac3ab544ceac52efbb40e62c147f259115cd4e6fd07bd432e378355057
 DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
 DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f
 DIST webpki-roots-0.26.1.crate 249748 BLAKE2B 6a2468eb2f868c65c599d2f6664798f75e77cb7a7228a2c7285ee5256cb01d110709474feb389991f12ba0d143211770c6922932c7fab01b4b0e37b612cbd453 SHA512 89ac53267d850953aa78550a60f58f5bcb0f9e885c4c448911dc55bbb8dbc3fb845cd7545fc40ff26998b0c360756de85206adcb148ca6190e50bc2daea7f61f
@@ -337,30 +330,21 @@ 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.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
-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.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.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.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.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.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.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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 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 winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21
diff --git a/dev-util/ruff/ruff-0.5.7.ebuild b/dev-util/ruff/ruff-0.5.7.ebuild
deleted file mode 100644
index 990270c53401..000000000000
--- a/dev-util/ruff/ruff-0.5.7.ebuild
+++ /dev/null
@@ -1,465 +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="
-	Inflector@0.11.4
-	adler@1.0.2
-	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
-	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.6
-	anyhow@1.0.86
-	append-only-vec@0.1.5
-	arc-swap@1.7.1
-	argfile@0.2.1
-	arrayvec@0.7.4
-	autocfg@1.2.0
-	base64@0.22.0
-	bincode@1.3.3
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bstr@1.10.0
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	cachedir@0.3.1
-	camino@1.1.7
-	cast@0.3.0
-	castaway@0.2.3
-	cc@1.0.95
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chic@1.2.2
-	chrono@0.4.38
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	clap@4.5.13
-	clap_builder@4.5.13
-	clap_complete@4.5.2
-	clap_complete_command@0.6.1
-	clap_complete_nushell@4.5.2
-	clap_derive@4.5.13
-	clap_lex@0.7.0
-	clearscreen@3.0.0
-	codspeed-criterion-compat@2.6.0
-	codspeed@2.6.0
-	colorchoice@1.0.0
-	colored@2.1.0
-	compact_str@0.8.0
-	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
-	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
-	ctrlc@3.4.4
-	darling@0.20.8
-	darling_core@0.20.8
-	darling_macro@0.20.8
-	dashmap@5.5.3
-	dashmap@6.0.1
-	diff@0.1.13
-	dirs-sys@0.3.7
-	dirs-sys@0.4.1
-	dirs@4.0.0
-	dirs@5.0.1
-	drop_bomb@0.1.5
-	dyn-clone@1.0.17
-	either@1.11.0
-	encode_unicode@0.3.6
-	env_filter@0.1.0
-	env_logger@0.11.5
-	equivalent@1.0.1
-	errno@0.3.8
-	etcetera@0.8.0
-	fastrand@2.0.2
-	fern@0.6.2
-	filetime@0.2.23
-	flate2@1.0.28
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	fs-err@2.11.0
-	fsevent-sys@4.1.0
-	getopts@0.2.21
-	getrandom@0.2.14
-	glob@0.3.1
-	globset@0.4.14
-	half@2.4.1
-	hashbrown@0.14.5
-	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
-	ident_case@1.0.1
-	idna@0.5.0
-	ignore@0.4.22
-	imara-diff@0.1.7
-	imperative@1.0.6
-	indexmap@2.3.0
-	indicatif@0.17.8
-	indoc@2.0.5
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	insta-cmd@0.6.0
-	insta@1.39.0
-	instant@0.1.12
-	is-docker@0.2.0
-	is-macro@0.3.5
-	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.69
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	lazy_static@1.4.0
-	libc@0.2.155
-	libcst@1.4.0
-	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.13
-	lock_api@0.4.11
-	log@0.4.22
-	lsp-server@0.7.6
-	matchers@0.1.0
-	matches@0.1.10
-	matchit@0.8.4
-	memchr@2.7.4
-	mimalloc@0.1.43
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	natord@1.0.9
-	newtype-uuid@1.1.0
-	nix@0.28.0
-	nom@7.1.3
-	notify@6.1.1
-	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.19.0
-	oorandom@11.1.3
-	option-ext@0.2.0
-	ordermap@0.5.1
-	os_str_bytes@7.0.0
-	overload@0.1.1
-	parking_lot@0.12.3
-	parking_lot_core@0.9.9
-	paste@1.0.14
-	path-absolutize@3.1.1
-	path-dedot@3.1.1
-	path-slash@0.2.1
-	pathdiff@0.2.1
-	peg-macros@0.8.2
-	peg-runtime@0.8.2
-	peg@0.8.2
-	pep440_rs@0.4.0
-	pep440_rs@0.6.6
-	pep508_rs@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-lite@0.2.14
-	pkg-config@0.3.30
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.17
-	pretty_assertions@1.4.0
-	proc-macro2@1.0.86
-	pyproject-toml@0.9.0
-	quick-junit@0.4.0
-	quick-xml@0.31.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_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.6
-	ring@0.17.8
-	rust-stemmers@1.2.0
-	rustc-hash@1.1.0
-	rustc-hash@2.0.0
-	rustix@0.38.34
-	rustls-pki-types@1.7.0
-	rustls-webpki@0.102.5
-	rustls@0.23.10
-	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.204
-	serde_derive@1.0.204
-	serde_derive_internals@0.29.0
-	serde_json@1.0.122
-	serde_repr@0.1.19
-	serde_spanned@0.6.7
-	serde_test@1.0.176
-	serde_with@3.9.0
-	serde_with_macros@3.9.0
-	sharded-slab@0.1.7
-	shellexpand@3.1.0
-	similar@2.5.0
-	siphasher@0.3.11
-	smallvec@1.13.2
-	spin@0.9.8
-	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@2.0.72
-	synstructure@0.13.1
-	tempfile@3.11.0
-	terminal_size@0.3.0
-	terminfo@0.8.0
-	test-case-core@3.3.1
-	test-case-macros@3.3.1
-	test-case@3.3.1
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread_local@1.1.8
-	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
-	tikv-jemallocator@0.6.0
-	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.27
-	tracing-core@0.1.32
-	tracing-flame@0.2.0
-	tracing-indicatif@0.3.6
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing-tree@0.4.0
-	tracing@0.1.40
-	typed-arena@2.0.2
-	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-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-width@0.1.13
-	unicode_names2@1.2.2
-	unicode_names2_generator@1.2.2
-	unscanny@0.1.0
-	untrusted@0.9.0
-	ureq@2.10.0
-	url@2.5.2
-	utf8parse@0.2.1
-	uuid-macro-internal@1.10.0
-	uuid@1.10.0
-	valuable@0.1.0
-	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.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-test-macro@0.3.42
-	wasm-bindgen-test@0.3.42
-	wasm-bindgen@0.2.92
-	web-sys@0.3.69
-	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-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.6.18
-	winsafe@0.0.19
-	yansi-term@0.1.2
-	yansi@0.5.1
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-	zeroize@1.7.0
-	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/MichaReiser/salsa;ece083e15b79f155f9e4368ec1318cec9a08d88b;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/MichaReiser/salsa;ece083e15b79f155f9e4368ec1318cec9a08d88b;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/MichaReiser/salsa;ece083e15b79f155f9e4368ec1318cec9a08d88b;salsa-%commit%'
-)
-
-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-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
-	WTFPL-2
-"
-# ring
-LICENSE+="
-	ISC SSLeay openssl MIT
-"
-# libcst
-LICENSE+="
-	MIT PSF-2 Apache-2.0
-"
-# libcst_derive
-LICENSE+="
-	MIT PSF-2 Apache-2.0
-"
-# salsa-macro-rules
-LICENSE+="
-	|| ( MIT Apache-2.0 )
-"
-
-SLOT="0"
-KEYWORDS="~amd64 ~loong"
-
-BDEPEND="
-	>=virtual/rust-1.76
-"
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/zstd
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	# 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.6.1.ebuild b/dev-util/ruff/ruff-0.6.1.ebuild
deleted file mode 100644
index 68f124d83452..000000000000
--- a/dev-util/ruff/ruff-0.6.1.ebuild
+++ /dev/null
@@ -1,467 +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="
-	Inflector@0.11.4
-	adler@1.0.2
-	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
-	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.86
-	append-only-vec@0.1.5
-	arc-swap@1.7.1
-	argfile@0.2.1
-	arrayvec@0.7.4
-	autocfg@1.2.0
-	base64@0.22.0
-	bincode@1.3.3
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bstr@1.10.0
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	cachedir@0.3.1
-	camino@1.1.7
-	cast@0.3.0
-	castaway@0.2.3
-	cc@1.0.95
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chic@1.2.2
-	chrono@0.4.38
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	clap@4.5.15
-	clap_builder@4.5.15
-	clap_complete@4.5.2
-	clap_complete_command@0.6.1
-	clap_complete_nushell@4.5.2
-	clap_derive@4.5.13
-	clap_lex@0.7.0
-	clearscreen@3.0.0
-	codspeed-criterion-compat@2.6.0
-	codspeed@2.6.0
-	colorchoice@1.0.0
-	colored@2.1.0
-	compact_str@0.8.0
-	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
-	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
-	ctrlc@3.4.4
-	darling@0.20.8
-	darling_core@0.20.8
-	darling_macro@0.20.8
-	dashmap@5.5.3
-	dashmap@6.0.1
-	diff@0.1.13
-	dirs-sys@0.3.7
-	dirs-sys@0.4.1
-	dirs@4.0.0
-	dirs@5.0.1
-	drop_bomb@0.1.5
-	dyn-clone@1.0.17
-	either@1.11.0
-	encode_unicode@0.3.6
-	env_filter@0.1.0
-	env_logger@0.11.5
-	equivalent@1.0.1
-	errno@0.3.8
-	etcetera@0.8.0
-	fastrand@2.0.2
-	fern@0.6.2
-	filetime@0.2.24
-	flate2@1.0.28
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	fs-err@2.11.0
-	fsevent-sys@4.1.0
-	getopts@0.2.21
-	getrandom@0.2.14
-	glob@0.3.1
-	globset@0.4.14
-	half@2.4.1
-	hashbrown@0.14.5
-	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
-	ident_case@1.0.1
-	idna@0.5.0
-	ignore@0.4.22
-	imara-diff@0.1.7
-	imperative@1.0.6
-	indexmap@2.3.0
-	indicatif@0.17.8
-	indoc@2.0.5
-	inotify-sys@0.1.5
-	inotify@0.9.6
-	insta-cmd@0.6.0
-	insta@1.39.0
-	instant@0.1.12
-	is-docker@0.2.0
-	is-macro@0.3.6
-	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.69
-	kqueue-sys@1.0.4
-	kqueue@1.0.8
-	lazy_static@1.4.0
-	libc@0.2.155
-	libcst@1.4.0
-	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.13
-	lock_api@0.4.11
-	log@0.4.22
-	lsp-server@0.7.6
-	matchers@0.1.0
-	matches@0.1.10
-	matchit@0.8.4
-	memchr@2.7.4
-	mimalloc@0.1.43
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	natord@1.0.9
-	newtype-uuid@1.1.0
-	nix@0.28.0
-	nom@7.1.3
-	notify@6.1.1
-	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.19.0
-	oorandom@11.1.3
-	option-ext@0.2.0
-	ordermap@0.5.1
-	os_str_bytes@7.0.0
-	overload@0.1.1
-	parking_lot@0.12.3
-	parking_lot_core@0.9.9
-	paste@1.0.14
-	path-absolutize@3.1.1
-	path-dedot@3.1.1
-	path-slash@0.2.1
-	pathdiff@0.2.1
-	peg-macros@0.8.2
-	peg-runtime@0.8.2
-	peg@0.8.2
-	pep440_rs@0.4.0
-	pep440_rs@0.6.6
-	pep508_rs@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-lite@0.2.14
-	pkg-config@0.3.30
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.17
-	pretty_assertions@1.4.0
-	proc-macro2@1.0.86
-	pyproject-toml@0.9.0
-	quick-junit@0.4.0
-	quick-xml@0.31.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.3
-	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.6
-	ring@0.17.8
-	rust-stemmers@1.2.0
-	rustc-hash@1.1.0
-	rustc-hash@2.0.0
-	rustix@0.38.34
-	rustls-pki-types@1.7.0
-	rustls-webpki@0.102.5
-	rustls@0.23.10
-	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.206
-	serde_derive@1.0.206
-	serde_derive_internals@0.29.0
-	serde_json@1.0.124
-	serde_repr@0.1.19
-	serde_spanned@0.6.7
-	serde_test@1.0.177
-	serde_with@3.9.0
-	serde_with_macros@3.9.0
-	sharded-slab@0.1.7
-	shellexpand@3.1.0
-	similar@2.5.0
-	siphasher@0.3.11
-	smallvec@1.13.2
-	spin@0.9.8
-	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@2.0.74
-	synstructure@0.13.1
-	tempfile@3.12.0
-	terminal_size@0.3.0
-	terminfo@0.8.0
-	test-case-core@3.3.1
-	test-case-macros@3.3.1
-	test-case@3.3.1
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread_local@1.1.8
-	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
-	tikv-jemallocator@0.6.0
-	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.27
-	tracing-core@0.1.32
-	tracing-flame@0.2.0
-	tracing-indicatif@0.3.6
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing-tree@0.4.0
-	tracing@0.1.40
-	typed-arena@2.0.2
-	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-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-width@0.1.13
-	unicode_names2@1.2.2
-	unicode_names2_generator@1.2.2
-	unscanny@0.1.0
-	untrusted@0.9.0
-	ureq@2.10.1
-	url@2.5.2
-	utf8parse@0.2.1
-	uuid-macro-internal@1.10.0
-	uuid@1.10.0
-	valuable@0.1.0
-	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.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-test-macro@0.3.42
-	wasm-bindgen-test@0.3.42
-	wasm-bindgen@0.2.92
-	web-sys@0.3.69
-	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
-	yansi-term@0.1.2
-	yansi@0.5.1
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-	zeroize@1.7.0
-	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/MichaReiser/salsa;ece083e15b79f155f9e4368ec1318cec9a08d88b;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/MichaReiser/salsa;ece083e15b79f155f9e4368ec1318cec9a08d88b;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/MichaReiser/salsa;ece083e15b79f155f9e4368ec1318cec9a08d88b;salsa-%commit%'
-)
-
-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-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
-	WTFPL-2
-"
-# ring
-LICENSE+="
-	ISC SSLeay openssl MIT
-"
-# libcst
-LICENSE+="
-	MIT PSF-2 Apache-2.0
-"
-# libcst_derive
-LICENSE+="
-	MIT PSF-2 Apache-2.0
-"
-# salsa-macro-rules
-LICENSE+="
-	|| ( MIT Apache-2.0 )
-"
-
-SLOT="0"
-KEYWORDS="~amd64 ~loong"
-
-BDEPEND="
-	>=virtual/rust-1.76
-"
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/zstd
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	# 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.6.3.ebuild b/dev-util/ruff/ruff-0.6.3.ebuild
new file mode 100644
index 000000000000..e9854ca9a83a
--- /dev/null
+++ b/dev-util/ruff/ruff-0.6.3.ebuild
@@ -0,0 +1,470 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+	Inflector@0.11.4
+	adler@1.0.2
+	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
+	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.86
+	append-only-vec@0.1.5
+	arc-swap@1.7.1
+	argfile@0.2.1
+	arrayvec@0.7.4
+	autocfg@1.2.0
+	base64@0.22.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bstr@1.10.0
+	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.0.95
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chic@1.2.2
+	chrono@0.4.38
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.16
+	clap_builder@4.5.15
+	clap_complete@4.5.2
+	clap_complete_command@0.6.1
+	clap_complete_nushell@4.5.2
+	clap_derive@4.5.13
+	clap_lex@0.7.0
+	clearscreen@3.0.0
+	codspeed-criterion-compat@2.6.0
+	codspeed@2.6.0
+	colorchoice@1.0.0
+	colored@2.1.0
+	compact_str@0.8.0
+	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
+	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
+	ctrlc@3.4.5
+	darling@0.20.8
+	darling_core@0.20.8
+	darling_macro@0.20.8
+	dashmap@5.5.3
+	dashmap@6.0.1
+	diff@0.1.13
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	drop_bomb@0.1.5
+	dyn-clone@1.0.17
+	either@1.11.0
+	encode_unicode@0.3.6
+	env_filter@0.1.0
+	env_logger@0.11.5
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fastrand@2.0.2
+	fern@0.6.2
+	filetime@0.2.24
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	fsevent-sys@4.1.0
+	getopts@0.2.21
+	getrandom@0.2.14
+	glob@0.3.1
+	globset@0.4.14
+	half@2.4.1
+	hashbrown@0.14.5
+	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
+	ident_case@1.0.1
+	idna@0.5.0
+	ignore@0.4.22
+	imara-diff@0.1.7
+	imperative@1.0.6
+	indexmap@2.4.0
+	indicatif@0.17.8
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	insta-cmd@0.6.0
+	insta@1.39.0
+	instant@0.1.12
+	is-docker@0.2.0
+	is-macro@0.3.6
+	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.70
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.158
+	libcst@1.4.0
+	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.13
+	lock_api@0.4.11
+	log@0.4.22
+	lsp-server@0.7.6
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.8.4
+	memchr@2.7.4
+	mimalloc@0.1.43
+	minicov@0.3.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	natord@1.0.9
+	newtype-uuid@1.1.0
+	nix@0.28.0
+	nix@0.29.0
+	nom@7.1.3
+	notify@6.1.1
+	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.19.0
+	oorandom@11.1.3
+	option-ext@0.2.0
+	ordermap@0.5.2
+	os_str_bytes@7.0.0
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.9
+	paste@1.0.14
+	path-absolutize@3.1.1
+	path-dedot@3.1.1
+	path-slash@0.2.1
+	pathdiff@0.2.1
+	peg-macros@0.8.2
+	peg-runtime@0.8.2
+	peg@0.8.2
+	pep440_rs@0.4.0
+	pep440_rs@0.6.6
+	pep508_rs@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-lite@0.2.14
+	pkg-config@0.3.30
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	pretty_assertions@1.4.0
+	proc-macro2@1.0.86
+	pyproject-toml@0.9.0
+	quick-junit@0.4.0
+	quick-xml@0.31.0
+	quote@1.0.37
+	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.6
+	regex-syntax@0.6.29
+	regex-syntax@0.8.3
+	regex@1.10.6
+	ring@0.17.8
+	rust-stemmers@1.2.0
+	rustc-hash@1.1.0
+	rustc-hash@2.0.0
+	rustix@0.38.34
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.102.5
+	rustls@0.23.10
+	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.209
+	serde_derive@1.0.209
+	serde_derive_internals@0.29.0
+	serde_json@1.0.127
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	serde_test@1.0.177
+	serde_with@3.9.0
+	serde_with_macros@3.9.0
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	similar@2.5.0
+	siphasher@0.3.11
+	smallvec@1.13.2
+	spin@0.9.8
+	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@2.0.76
+	synstructure@0.13.1
+	tempfile@3.12.0
+	terminal_size@0.3.0
+	terminfo@0.8.0
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
+	tikv-jemallocator@0.6.0
+	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.27
+	tracing-core@0.1.32
+	tracing-flame@0.2.0
+	tracing-indicatif@0.3.6
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing-tree@0.4.0
+	tracing@0.1.40
+	typed-arena@2.0.2
+	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-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-width@0.1.13
+	unicode_names2@1.2.2
+	unicode_names2_generator@1.2.2
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.10.1
+	url@2.5.2
+	utf8parse@0.2.1
+	uuid-macro-internal@1.10.0
+	uuid@1.10.0
+	valuable@0.1.0
+	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.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-test-macro@0.3.43
+	wasm-bindgen-test@0.3.43
+	wasm-bindgen@0.2.93
+	web-sys@0.3.69
+	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
+	yansi-term@0.1.2
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zeroize@1.7.0
+	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;f608ff8b24f07706492027199f51132244034f29;salsa-%commit%/components/salsa-macro-rules'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;f608ff8b24f07706492027199f51132244034f29;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;f608ff8b24f07706492027199f51132244034f29;salsa-%commit%'
+)
+
+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-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
+	WTFPL-2
+"
+# ring
+LICENSE+="
+	ISC SSLeay openssl MIT
+"
+# libcst
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# libcst_derive
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# salsa-macro-rules
+LICENSE+="
+	|| ( MIT Apache-2.0 )
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+
+BDEPEND="
+	>=virtual/rust-1.76
+"
+RDEPEND="
+	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/zstd
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	assets
+	docs
+)
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	# 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.6.4.ebuild b/dev-util/ruff/ruff-0.6.4.ebuild
new file mode 100644
index 000000000000..8996ce3dbfc1
--- /dev/null
+++ b/dev-util/ruff/ruff-0.6.4.ebuild
@@ -0,0 +1,470 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+	Inflector@0.11.4
+	adler@1.0.2
+	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
+	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.86
+	append-only-vec@0.1.5
+	arc-swap@1.7.1
+	argfile@0.2.1
+	arrayvec@0.7.4
+	autocfg@1.2.0
+	base64@0.22.0
+	bincode@1.3.3
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bstr@1.10.0
+	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.0.95
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chic@1.2.2
+	chrono@0.4.38
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.16
+	clap_builder@4.5.15
+	clap_complete@4.5.2
+	clap_complete_command@0.6.1
+	clap_complete_nushell@4.5.2
+	clap_derive@4.5.13
+	clap_lex@0.7.0
+	clearscreen@3.0.0
+	codspeed-criterion-compat@2.6.0
+	codspeed@2.6.0
+	colorchoice@1.0.0
+	colored@2.1.0
+	compact_str@0.8.0
+	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
+	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
+	ctrlc@3.4.5
+	darling@0.20.8
+	darling_core@0.20.8
+	darling_macro@0.20.8
+	dashmap@5.5.3
+	dashmap@6.0.1
+	diff@0.1.13
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@4.0.0
+	dirs@5.0.1
+	drop_bomb@0.1.5
+	dyn-clone@1.0.17
+	either@1.11.0
+	encode_unicode@0.3.6
+	env_filter@0.1.0
+	env_logger@0.11.5
+	equivalent@1.0.1
+	errno@0.3.8
+	etcetera@0.8.0
+	fastrand@2.0.2
+	fern@0.6.2
+	filetime@0.2.24
+	flate2@1.0.28
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	fs-err@2.11.0
+	fsevent-sys@4.1.0
+	getopts@0.2.21
+	getrandom@0.2.14
+	glob@0.3.1
+	globset@0.4.14
+	half@2.4.1
+	hashbrown@0.14.5
+	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
+	ident_case@1.0.1
+	idna@0.5.0
+	ignore@0.4.22
+	imara-diff@0.1.7
+	imperative@1.0.6
+	indexmap@2.4.0
+	indicatif@0.17.8
+	indoc@2.0.5
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	insta-cmd@0.6.0
+	insta@1.39.0
+	instant@0.1.12
+	is-docker@0.2.0
+	is-macro@0.3.6
+	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.70
+	kqueue-sys@1.0.4
+	kqueue@1.0.8
+	lazy_static@1.4.0
+	libc@0.2.158
+	libcst@1.4.0
+	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.13
+	lock_api@0.4.11
+	log@0.4.22
+	lsp-server@0.7.6
+	matchers@0.1.0
+	matches@0.1.10
+	matchit@0.8.4
+	memchr@2.7.4
+	mimalloc@0.1.43
+	minicov@0.3.5
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.2
+	mio@0.8.11
+	natord@1.0.9
+	newtype-uuid@1.1.0
+	nix@0.28.0
+	nix@0.29.0
+	nom@7.1.3
+	notify@6.1.1
+	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.19.0
+	oorandom@11.1.3
+	option-ext@0.2.0
+	ordermap@0.5.2
+	os_str_bytes@7.0.0
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.9
+	paste@1.0.14
+	path-absolutize@3.1.1
+	path-dedot@3.1.1
+	path-slash@0.2.1
+	pathdiff@0.2.1
+	peg-macros@0.8.2
+	peg-runtime@0.8.2
+	peg@0.8.2
+	pep440_rs@0.4.0
+	pep440_rs@0.6.6
+	pep508_rs@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-lite@0.2.14
+	pkg-config@0.3.30
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	pretty_assertions@1.4.0
+	proc-macro2@1.0.86
+	pyproject-toml@0.9.0
+	quick-junit@0.5.0
+	quick-xml@0.36.1
+	quote@1.0.37
+	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.6
+	regex-syntax@0.6.29
+	regex-syntax@0.8.3
+	regex@1.10.6
+	ring@0.17.8
+	rust-stemmers@1.2.0
+	rustc-hash@1.1.0
+	rustc-hash@2.0.0
+	rustix@0.38.34
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.102.5
+	rustls@0.23.10
+	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.209
+	serde_derive@1.0.209
+	serde_derive_internals@0.29.0
+	serde_json@1.0.127
+	serde_repr@0.1.19
+	serde_spanned@0.6.7
+	serde_test@1.0.177
+	serde_with@3.9.0
+	serde_with_macros@3.9.0
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	similar@2.5.0
+	siphasher@0.3.11
+	smallvec@1.13.2
+	spin@0.9.8
+	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@2.0.76
+	synstructure@0.13.1
+	tempfile@3.12.0
+	terminal_size@0.3.0
+	terminfo@0.8.0
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tikv-jemalloc-sys@0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7
+	tikv-jemallocator@0.6.0
+	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.27
+	tracing-core@0.1.32
+	tracing-flame@0.2.0
+	tracing-indicatif@0.3.6
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing-tree@0.4.0
+	tracing@0.1.40
+	typed-arena@2.0.2
+	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-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-width@0.1.13
+	unicode_names2@1.2.2
+	unicode_names2_generator@1.2.2
+	unscanny@0.1.0
+	untrusted@0.9.0
+	ureq@2.10.1
+	url@2.5.2
+	utf8parse@0.2.1
+	uuid-macro-internal@1.10.0
+	uuid@1.10.0
+	valuable@0.1.0
+	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.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-test-macro@0.3.43
+	wasm-bindgen-test@0.3.43
+	wasm-bindgen@0.2.93
+	web-sys@0.3.69
+	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
+	yansi-term@0.1.2
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+	zeroize@1.7.0
+	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;f608ff8b24f07706492027199f51132244034f29;salsa-%commit%/components/salsa-macro-rules'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;f608ff8b24f07706492027199f51132244034f29;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;f608ff8b24f07706492027199f51132244034f29;salsa-%commit%'
+)
+
+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-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016
+	WTFPL-2
+"
+# ring
+LICENSE+="
+	ISC SSLeay openssl MIT
+"
+# libcst
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# libcst_derive
+LICENSE+="
+	MIT PSF-2 Apache-2.0
+"
+# salsa-macro-rules
+LICENSE+="
+	|| ( MIT Apache-2.0 )
+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+
+BDEPEND="
+	>=virtual/rust-1.76
+"
+RDEPEND="
+	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/zstd
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	assets
+	docs
+)
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	# 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/selenium-manager/Manifest b/dev-util/selenium-manager/Manifest
index d7c2b6ba1aa1..7ea5131745e3 100644
--- a/dev-util/selenium-manager/Manifest
+++ b/dev-util/selenium-manager/Manifest
@@ -1,289 +1,4 @@
-DIST addr2line-0.19.0.crate 33210 BLAKE2B a6b393dcddfa0f858297efb6b261d3a23f118be45a3211ee15f6c58808f241dbcf5282f4a86be579360513f23ac4035819e923f2587b7499110af42e9ac3ab88 SHA512 18da72e412bb89028e2ccb838192330535e45300f6fd8edc7d1d64397792a3db12418aa24a3312730c5414e2a1b1d65e6b9d5691ba234c9142b5d885523a5e94
-DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aes-0.8.3.crate 124679 BLAKE2B 7a352a9c5452ed91b32ed82a7450013ba0f0db4d990d37bfa78782e9c031d2a33d0b7680625881566ecc4b7048a44854759163d2e5c962783fffed1ca7d38a78 SHA512 89aa691fb6060c37ae8bdc2db8c7ba87a7c5201a776c247bb499fca0fa2b0c062601144af49eb781342a97760a124cc24dbfc38ccecd16493270f47d96282cc0
-DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b
-DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
-DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8
-DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159
-DIST anstyle-0.3.5.crate 14272 BLAKE2B 15bb1487dd8c3d7864611d85f0ed277c9226f5f046ed6508ce1f933cfd38bba870af15fe3d238a0aaf104272be28dbb9d2f3a96e53bf28dddd14d0b4de173d52 SHA512 3075963236b4b7b94b98672481a82ad1ab9d219e583dc5646bc7ebfef35a7bbdcb38c9e12c770a51809fdc4fcc510e781875507446b36bc87a69e4a10e562709
-DIST anstyle-1.0.1.crate 13977 BLAKE2B 35be03a7de78737592528967e8ad4851436a74c7863cae9cf5cf7366d3cce9bbbd255b1a89401051f82fe8569a0ff029dcfe427c14a2e0677890453c6119d241 SHA512 2bf9b83ad9772c6a3ef28239cbb98bd667dc631fd1ef76ec5029825c128f6cb22756bb1548dd991e482f86eb9fd94fae5c648f91de2c0d71754b6dca4ec2362c
-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-1.0.1.crate 11718 BLAKE2B 2500845a23edfb47ecd156424a89789c713a7c367c3fef98d26e4e7b2acb3c6433d39a1c2a59813a98266b0993d4b750e9b6b68b7ced7ec5a04a8b13bad174e7 SHA512 00c380fc0198c49776c40aeef419be2fd2d6809bd2e5d86457f1658c6f4b2e83ebe8feee95855c3bbedd4200a917f582bd41b0ee0cf5d7d1d5017228885a58e6
-DIST anstyle-wincon-3.0.1.crate 11279 BLAKE2B 593de9443b4c612526550285a6c156db26a233815e77a748597c6eea509ae511f41eb8ee736010f8be853695c9f1d94b034a77190e612f0a00bf00385d66ced2 SHA512 75ab14081b09e031ee0f559538976f39092aaeb6f561a56de83d12911cc2b45e28eec21068792c86a61e344021921ab55e7139ca79acec78e7d4a796dfa42a2e
-DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40
-DIST ar-0.9.0.crate 14636 BLAKE2B 969106d12ea0aceeced14f42a6b71dbd10f4216c2111d4ea2d1c2c4d136741ac27ab8b0c59cf8304a33c0e2788321f5ba23b6b053eaf6f6142538714133a4b8c SHA512 437ba014dd01cfb69837a12db2104119ac1c76ffe89436421aa4f671dc109a1f4f39271a12d08979dddeca89ffe8bd967efbd31592f8f3421a0391208a6ea781
-DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
-DIST assert_cmd-2.0.12.crate 25347 BLAKE2B 7ff952782a86203c1dd06611f1c644d8eaa6d85c8aa635bb2cac0423050f0af3c3687dcc82235041fb44e748ed06db16ed7c413d0f31305b6e3d208880494fac SHA512 d14783933521ffbcc0bcad8e52e7e0e4fb58cb609123b2a50e20dbee10d7f2df4eb020cdfde386c8cde6b7e0696a3f98e0dbd698c82c99a2c6903c437ec907e4
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.67.crate 78564 BLAKE2B 8c77d3d182c7e1ec3840fd6c7f4214322e473ba79a71b2d11d98696f8ae4440350f3c84a891b2ec79fffde107fb2ebb99fffca202d6ed235d3abd68215a1089b SHA512 8603a3b63f4f08be315176908134243680bf1a4b0e6cb26ed81f5fc1060279126ca0ef28f209a10289e1a85214b35db6b496affd71ad21524094f3ee3acd31b6
-DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
-DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
-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.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
-DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
-DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
-DIST bstr-1.4.0.crate 345921 BLAKE2B 39a3cb366a7ceb784b7a6626f81338e8047498c5755ed60fce1f6460ea5aa907ab5df4bcf30a07ed699c7af7d2d0dbc48b2c5cb674b863c22fd63b5080b52fae SHA512 98dc7bdcc1a307eae2ed202b2b785a4ad27719c4b3289408edc710beabedb78d16b3042b41de04fca5dbdba19d8567df69c35431e33a3c02924820e1a601df36
-DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
-DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000
-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 cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
-DIST cfb-0.7.3.crate 63277 BLAKE2B 5d0d4124421d26c1e3dbfabaf741c407f346d62147b12bbf889ef5b4c25350c02d09919e332e1ca18ade34a4e6d2895fc835161f7062c0c0bb56f104f94811a6 SHA512 a5c8d5da5ac009dd7d19320237ea516a65c9b1780bec3403fdbfb6ffa13bf7d05a896baeac5760c3e9aead9f4bd66cf969ab12bbd2938cbe479b1d2266e80b8f
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.26.crate 191501 BLAKE2B eae49ee247607995c28463b8c3e2119497141e69d19a756c408f2b72d94bea39397ea2d0d3cd2ccbf1348ef973dd8bae6d29a0d0590e8dd34633f365a9170adb SHA512 2b66faf4d8374cfb0485710ceb2c9c1ce63aa6f9670e405a0810af4aca01c57d8dcd198a1f4cad498d5efd89e00003ba1b4f0bab599422af4f9bd6fb74494c47
-DIST cipher-0.4.4.crate 19073 BLAKE2B 144c45c1bdc5f7aef7f4fc63b6dd85955c453537567d1f1074e436e50d0d61f8413973cf3da207a48f1560ea92f2280fc5880569c78a1dd66bf97fd1d88ccde7 SHA512 1856d8b08bc3dbd2fa5c8b97e9eae43323c7aa19203ef3e80bb49cf15b5ddc832acb7b97121a52032656353e764f1f722200b638f7c28975fec1b5c9dc908846
-DIST clap-4.3.23.crate 55026 BLAKE2B 2ac2592bb2ef0c7e42c14a069fa579f2d1f7d3880e2e369059f0d0ff60f20addc0d42ebd258697a2b25915aafff12dbc2fb922ec48b17887b9900cab63795616 SHA512 ec3a86f376f241230ae597d293b85f06725e9acfd70cfc9df510bf34efd28fe007e960f45b25525dc1a7f33ec282a928370087f4baa83b7c4ecab11929a658b2
-DIST clap-4.4.6.crate 54823 BLAKE2B 0685ecb0fbf3c2c8f5840aabbb5892e88184e866f1afe871b6b75184832f75cb9fc0d43de2f07ef0350cbd290c2cb7c3d86d24120681210af0d2184c91655f98 SHA512 94fb68da3c6b43c90f05dba94339794243a0ab4780feeb27d31f0808e4efd734aa13384fd7e493ab1214ad528134bd23e15ce2e3a9f83075f47a7c856222c6a8
-DIST clap_builder-4.3.23.crate 162380 BLAKE2B 20606c37e14ba00d0555d786a3a22ad5fa333f4b4aa8b3fb1c69f5ea9d104a0e8a2d0e01284feb1bf676c3d04a1d6e906a625f08d58a01bcf96209a7b2c1305e SHA512 084925e76c9f4824503f1154d255d4d4987f0f73ce4c8f2dea4589ba5a83b85747a343a565382bc7e6470f8a0790ade4bd641b9ef782f88103672b8dcd02e360
-DIST clap_builder-4.4.6.crate 162450 BLAKE2B 54ba8e3402c7790ed976b4bc0033fb3a4db00e042a828a563bb49f347a60704a18cd6b77e3827db545217101d7b4f88e7176ec01f1406b7c7ad55130af7e9696 SHA512 d6dde9859015995aefa6c7f45d98928bef5120578460b1c576738e49df5a0e64ac0adae04e0f3d7fce0bc84de8b3dd7632840c61ed46c95855f7f801351c6f56
-DIST clap_derive-4.3.12.crate 29052 BLAKE2B 501fb22eddca5b21456bd9911ad1f90ee5d5c918eedd08e2615d22ce58bb0fa5dd626b51a734f20b78411b9a4492ae63629131e0c2e1bd0f3eee21e5da3fb37f SHA512 a58e948fddf45321f0fcfe9d9afbeff42849da472fc4e4b15c31f46ffe55a0dba34d2c1d14e342530c1e4080c43de790595e4f3dca06cbb6a8a60f9e3cab3abc
-DIST clap_derive-4.4.2.crate 29019 BLAKE2B 9f3dc6f3249566c49b7a169b7b5735493cd3eb1d8211b0e7d35db656716866ed9a82911bbc0e6699eabad6cbd8e28b5e833541444a40f55a87387dc49447f62f SHA512 a111ee62021b3b5176ea4db5d3a30b7b0ce00f074b6a9bcefd1d70bbd147a779c9adb491424013ab021792a5253c33d9e38c0fe9deeb414def7ebeb9e40c2ce7
-DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c4c38f7440d91cb4c58ec887940f0cf500c4c3949c2191399aac3f5cb1ce44868eac587cde90211d3e467b9a2 SHA512 0149ed7c2438a19b4857f895767550d783711078f07bfa9ac8ca531e06f51c7388110f4d558e30bf503536367cc370cb581e8deb6fe51f9b5460a334963daacd
-DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
-DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
-DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
-DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5
-DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396
-DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
-DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b SHA512 adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
-DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST debpkg-0.6.0.crate 119369 BLAKE2B 9c48c976572e1ec071551ea3fd83cb6a508eac5ce5d4fa36cdf400c34908bf2c15095766fa940dc1f93268897391fb544de29184674d9fd4764f0d7f8a6b65e0 SHA512 4cff76a56ca18e0cdd56b29fa6787d9bee8fb293f5f2ae7bb5b999abf436aae6edef2f8f3efb2841db84164868a5860171ea7deff8359ec07f94d954dd379537
-DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
-DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76
-DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
-DIST directories-5.0.1.crate 15833 BLAKE2B 2348af89efae3020f901bc6d97a42028c12d3168ec57a9a19668eacfaed61da95df597a26afeb0faa82c9322fd3772478290f00216acee636694a67441e408e0 SHA512 4ec733bccf79940190b983e022ad4a5741c32136aac7bd942423e63a2e7a7c07b87e2692ae42eb21b7a5cc81c60ad883d55c568e0d6c10a7c7c64652ec0df83e
-DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
-DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
-DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a
-DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b8df5e5d8bd5ffd153aec1648721d8a9606d3f9aa034263651f5182043e08b6cc08d2d29d0a10f6cc61df9949a06 SHA512 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4
-DIST equivalent-1.0.0.crate 6621 BLAKE2B 5e2c461898c2b029430c526db25188ca37b5c1f9f562c1950a7cb26b824c8b06d0ce62542c234e909873c329982641abe091f99074b6e40f13898b39fc4a5a86 SHA512 006fd57e6829b1dd9644abaa6f650098f22302e9882fa5b852c695aecdead8e353426626c56b772ab362303dff23777cc7012ec04f9618403d54f0e03e29278e
-DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
-DIST errno-0.3.1.crate 10348 BLAKE2B 72831d0b69f95884a69918249cc0e814eb5eade3205331bec6d2021f8b01a42c4c9b494f2717033d65a4c5230c8490b6ce250d349c1e8e177b20e7e84a860020 SHA512 00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54
-DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST exitcode-1.1.2.crate 6538 BLAKE2B 3015eb8bf6658336cfe43b4cc59ca95d8fff5380dfa2bb2a3086005b0dde5e6a704c6b62e027bb5c0d6e6103bb5dec4ab4c869ef454361f224d013c267bf4a78 SHA512 fa31817e2bfdafe64faaaa6b32573e01e2ca0db24c6c88c81f43d84a9db66d19db842b61cbd89b8f6e199aad531a1dc0053b2d4166e0f9196f275fe715f28fc3
-DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc
-DIST filetime-0.2.22.crate 15029 BLAKE2B 068f4a84388d04d900bc5518a94895985ecba9c618a47b6483cabc31abd267e37ce69d78c51703ec5745307800d96ac801f37ac9959c60283c3c3d6ccd349c0a SHA512 d40d8baeb57ec85bb9ccf76ff0f898915c4e6cf384020121b53f4a2a1ef2840af5b4c9e8e1ff177034273f4f7a6bf81d2dd7a02cf498b61ea31ceaa30b877067
-DIST filetime_creation-0.1.6.crate 8961 BLAKE2B 9f49771d976f2137b9a2e209c189ce3ebfb789780a0dbda4925cf10f72d8765b74e5770f0465fe92ca978310bba99f7f521963f480912249cb839276f6ad9f8f SHA512 08032353a09ebea4b401f99aa7d3a52a75f488a1261ec8d2cd7c808814e466d936c6761853311de9aec7f34196d22bafdef99acc71219ac53f937a5944350d37
-DIST flate2-1.0.27.crate 73460 BLAKE2B 5603848098ac02c9c83893df79ea9d9ad3df5b7e02ffa155ac74602bda7e28e14e6b7de2ff321b38d24fa3741ccea8a4c811abb47690cc295f90d4cf2bdd0bbf SHA512 e76e76444686433acabd16513e6e5860d4d6fa53a810f37266f36900f154acacac6dcd77b0373599a6d33a09175f5f02146d84726b982c59a78926950e19ff09
-DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
-DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
-DIST futures-0.3.27.crate 52816 BLAKE2B ed8b22ecc68bd4a23c8e89a34fc5e3630073d51f0a19d52913d37cfbb1356dce0de36dd8b1adacdb41d47069a378c63b4fced855aaa0c55ce143ca9a047cbb0d SHA512 2810721213096b37ce557213e655bf2727aec2f4ef57c18ec8eb323de3b9992ddaa354b6654d071c39f05260aee3550ce2f62b885e1b7fc332c1e3137f0f538e
-DIST futures-channel-0.3.27.crate 32278 BLAKE2B 18ebc1d6c8f81aec87a4a6033ffb1427f9f2d353e856e7ae02e7a9ac57b6e0f9435bd871705ecca221a89420777d816af3d50ef8fc66a3440966726b0ffbfdc3 SHA512 940755bd8217f2de2e68f99bd73976e4769e0225d369a681f28d14f5224c7eb07a9d236972016c5e57d8e20c0cbe5f3468368b0b79290ceaec9fc30159392cbb
-DIST futures-core-0.3.27.crate 14709 BLAKE2B 801d2f20dcaef9e2983c3cfd504a4e73a7f0e861b8f76e49edacf8827e584b6ad33f0b358646c5fa93f5a93dc3354258ed630e847841038df30890f1929bd466 SHA512 822ce6b9e38c33eb647960474e0cd700b214fb943ad42a3aa9bff91a23c687e0de14d7daf5dd5b238cb527ebfc950f8c91b83dc39b845a9c13fc0f64e2bb32d6
-DIST futures-executor-0.3.27.crate 17745 BLAKE2B 0a8d626511da8db8853314470effe6fa7dc408a12150cae79bc4478a81d1de3a1744b177016514981b7608a2958bc8feef2886c0d4ac1189ed2268893b29afc2 SHA512 c5e1a1ad5c053ced8743f3d412734ea29471d42e69286f8c61945003777ad9dc63170f371e0d245c8d4bff5735f3952c600f22bd742f4bf78f47577d9bc35ec6
-DIST futures-io-0.3.27.crate 8912 BLAKE2B 5c2c1f10bf7f787c89fec31fad6bae4bbdf6f741c044d3d7b3b3e6e7ce305456f44a5b3ff3aad21380bbe2f2212ce15165647f5ad3fc03c539d245d65d2d62bd SHA512 93e42bb9e0af07ccf8f5ad683193d1992276317d847d76056e95b053732e07b327d2be067ada3a99672eb674ac20f8a1e17344139930e4931b6bc8a0983ff265
-DIST futures-macro-0.3.27.crate 11255 BLAKE2B 549ae3ef6d0eb8a9159ff16d7730a7311274321be9adc321995a3342b141d01d6c76b04e54cd87b121e809c04511ff3165de7d4bf42c6a22add01dc2733b0f01 SHA512 0c7a4985820131cd3bd6f7d1ed89bbe19699d032a4ce4cd594bf02f268cb9bd3d5426f7e1e4eda999fd8ac2572bbd07ee5d399d8a2964d49deda0fe61131e33c
-DIST futures-sink-0.3.27.crate 7853 BLAKE2B 8470779dbfecafc6b19e9c2f61aedd6b25104b45b6aca120c4bb187cad5fe1b561447b40707f3b5255f69892db6038e65917b34444d099428f5baf65b7d93d0e SHA512 b376d3609212c80751de17d9e8cfeb062ee211ee5b126b0ab5ccc4615cc2eede352b4f0aa86e6a6f027df40ba617751e3d4374c2400d8bad3104319f7d5fc2ae
-DIST futures-task-0.3.27.crate 11854 BLAKE2B 2e2ef78b69859ceaf074f292408c2c7ad7845229d688e76931295b97f498eb3bb87fc32352d34082c2b89e7e931ec65991834c7b19e79e13ecf93c8dd4bdc984 SHA512 67f424de561100d1521fefad210151665215ed2c93217f3da441b0dc6e071c2a138c32e9411d3ef1aa34e1391a73eeba7e2a51a277418eebe3c2d61588a3828e
-DIST futures-timer-3.0.2.crate 19879 BLAKE2B 4e25777e567f390799b4b01186d59977f1591f9f8425b6951679226375cf90764bc157dd2271614f16b7b13d3aea67509da0355f3c4de3d323b1bdc668bc7525 SHA512 47cc68f9f134e557d66a003d942d8a4201b1db56f1ed2ae276a2fe6f56b24c06ccd108d9852f9fd9db7d254bf8aefafa56cc0410bea41c3805d7e4bc3dc4d73c
-DIST futures-util-0.3.27.crate 158556 BLAKE2B 419e6fbf60997c3ad5bdf76665062102f977b4e0fc83b110803c426f614cf01f0ac9b926bb3f4a9402c55a3f58ead6f087b3da41e38abe8573fbc30668822df7 SHA512 2d83541a354960653c2f54be5cfefa520611519d564f5e5d5e33752ee263426bf22f4e7a10900f8c0d057357a5afb311686d76794722eefdac8bc404788bdd52
-DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
-DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
-DIST gimli-0.27.3.crate 287904 BLAKE2B 97ba399c72cde7b11f0a103598747b58b242ebb808c60c037292b992e30d8fc5e212e5620c233e485adbca61cfc433a4697de3ca76c183ed517a93cad4f75c25 SHA512 b3782d510bbfcbcfd8801b4343a6864b91cf954808e935745caaf1b7e7b3f2f94814f1543de9a36a8d4e5c29d08d69be9361aa2b31e7a261d5dc6e7b66ef4ccd
-DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
-DIST h2-0.3.17.crate 164526 BLAKE2B a35826c7d53c27938c5458be020ca983bd0f4ff8b8e56ffa8d791f6d6250f55473e8d85e5688c3076956f7721678891db15fe0e29d1c8ff3966727ad3a30d226 SHA512 fbddbd943c619f514615232750ef989fd4d4bf954e0de3ad9f0274622fe04cca0f80716c03c0837954933ebbfe1c26a6434a8a2442a1165609d1cc13b3dac656
-DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.0.crate 116103 BLAKE2B 24bab03e8a8cb7623b92282c83bf8acaf0752c696ee1c010249e3ebb3646e7549d8d6d798b02c9d5b621afbebba7320f8a859d9a1af1523dbd46377b857dbb5f SHA512 f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959
-DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
-DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
-DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9
-DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
-DIST http-0.2.9.crate 100146 BLAKE2B a720a5ea6e59d1bd4e7b422fdaa30b3b9d72a7533c5e91d1c8ee2b1dcd899309b490479ec578aa3b51f1dddeb5c6510f28136e9fd1f04d2af12d2418261f6c03 SHA512 17bbc886d34f5aa4b56d82a605a54e920a244988085d06e70bc416f8e0edfa3356544f29082b3fbf3dcea18e741ade374375dd82ebe2276fd9a9508735a1e03a
-DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5
-DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
-DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd
-DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST hyper-0.14.25.crate 195127 BLAKE2B c2d9b8ef0773e23b7b1746feb5eadc515c5ab63698670c5f0c3fb7de9b511f21ba310c04d66f236c8bdad9262af2e0c2a1b45d1092545276dfe04fc3ca157531 SHA512 abf06e17b1f6f5822c0447d160ab7d218124e27a1dce4b2264b5eb66a3642ce773ed060c59c784a20695c280c81cd4922b23930082945d46f3ac60e3a84965ee
-DIST hyper-rustls-0.24.0.crate 29917 BLAKE2B 0e6da581f510611f78d3ed139366faede86678ae010900dfdf8379799d6a283823206ee8b0745a775f57a42e01056033e9c622fdd699c6d619eef5d9d21d2d48 SHA512 e9e8862dbe0c44a307b16f7b34cc246c159b66ff76528b9cfd001ef510fbea98f0eb5e6b14ccc906e65ea063ea0895d9a57e7e442d7731994e85755249ee2e36
-DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
-DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
-DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
-DIST infer-0.15.0.crate 18734 BLAKE2B f2b4bc69e4b0f9b9d62c46e3661fdd95c858e1fbfa7d3a1696187c624c292ac286db25fa8388f7139951d0031e7f9b6f5df35a4f17d7f48b8cc8a71c9eb6a52c SHA512 711a038094bd05cad192884bcc84e72cf9064548f58865f52cf81f74c34ddfcc86d1a0a8112258dbe61a432c4b8ce490e76272d8ef6d5e3a71f185cd27dfb22d
-DIST infer-0.8.1.crate 17480 BLAKE2B 76fbf580282a0d0bc6561be41fae1cd6e079cfcbb4e39662b8d0f9baa8841fd1e3656ecbb1ecee6e0b483835dff763203a3a5aba7dc712ce5cc5b51c923cf656 SHA512 38341ec1ba8708b633db22bf6a96ca27bbb7df8751cc27046f46fa99f5d2162452195e6e5d301f7519d766bd2e0dc3ccfaf98343e0313d380f860b35f0a25c85
-DIST inout-0.1.3.crate 10743 BLAKE2B ac2fa5cadd98088ea3f6eb94ca46b3a9ceb6547ba49f0de311d86474d71024d1a087ce9b8d44ec808008db69146e9c81446bcfeebeb2fd74d2e8d0ad2c4975ed SHA512 1db5bc2bd87aae145b3b0be6669a9a722df2aac8f970fda210aaf945c372e641b941cee822917926dfa1ab8381c6e99cc7df4b18d2f4e2fbef17fdec36ed2beb
-DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
-DIST ipnet-2.7.1.crate 26989 BLAKE2B 9f581d9e849e332af2c70eca34e85e6d40bcc46ccda3b420058aac315cdfadb90abd08dc926195cd0c4e01027c4d35868b15e4ed1f5aa9579ead012cbb81c232 SHA512 c6ee9002f0500dc1a4820d3f135018694798808354bd4f89f983fe495a27f4d14c538c95c7d8b5e4d17ae6ea1cef3f424e87d80f83f6ea6dad92039e1a3166b4
-DIST is-terminal-0.4.5.crate 7760 BLAKE2B 610fa76b0c2fe72173a769bc5addd19c8b19da2f38bdb06343abe1e9295c146b1b5018e4792f048fe60081c0d6f23aee1a689dbf53715d6983ac5994acd367d1 SHA512 a9ec7469d1ce702d161ff957661f023abde67e128a625515815b92c78420fd950778629c31b78fdc2685ca8bbd8dc870f9f296c0a7a03402b07d4a03d84649b1
-DIST is_executable-1.0.1.crate 9550 BLAKE2B 64fbfd2805b9e7a2498a59bd1ff924f84a42c5f1061ba59e7d3cd72cbecb394272c3f9af101f838c7a6a636746d8ed3b7f698c5720857675c58127cec9846d81 SHA512 677980983db2c8ed72e87a2f2df3bac328dc6ba6dba6c3e8c4e4eaa7b8fee160ef4e81d105f65ed718fb7263137ffdb21d86b148f614f04fb9e24201417c8a29
-DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
-DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31
-DIST jobserver-0.1.26.crate 22645 BLAKE2B 44bcc15330268ea29650e58605c7f21c35108eb64b790c005968955238e948d27b3d12e6bb06bfc0eb4a3fe5f9e5322bc0657200212bf87e08d9e043e008a5a8 SHA512 ad3ebb693018928daf399e918ce35ed0d4e643cfb5c78bde04697e41dc8adf2861023ea1cf2c5033a3026048ca0ebeb7f2f57a966ba8e420558e42dde8d494f7
-DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
-DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
-DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
-DIST linux-raw-sys-0.4.5.crate 1274380 BLAKE2B e15ca5b63cb994e86a8161e3b6e4bd20da8f574d1a470128f9a209a729ff22c86470f4c2b2a8ccbc1e37d6284b026e0805902645ea4b742425fe34491e519638 SHA512 13c36e03cb5bdb2e9f17622e21eda608057fc9d908bc55a829fdeeb77785094769d4f4b4daf376c5509ceb3abfdb3936f668bd6d5b2fd48e21c5c28b6e597e78
-DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
-DIST lzma-rust-0.1.4.crate 31043 BLAKE2B eb330de79d518e71ab12aea7355fc0e4b50f18fa27356d33c3e4d2a7577a5c25ca0349273380289041d4f31faad3f2362ee4fe4f825968ba42dc3c59e0b475fa SHA512 0b2d98945a256917a2b33efe8aebf838bf5bf3fb105d438ac0578aa86f94e0528462295f573c4ae8d684f80fd66c37281d5c411dbcd0b61e0a112e3d0f2e7867
-DIST lzma-rust-0.1.5.crate 31323 BLAKE2B 1054a7ebd9a3f4737597eb806aaf3f7a3f11e8ba3467518cf62d51363a01ed6f9a40eaac858fb61c4e107cb89535c87c73e8f01770741438df864a12916b857d SHA512 de0bd6f99fffe53ace4cbcceede685d98742d83e4ab6817fbfd2b667951ce6d5d6c87177512d18b38bff62181e649223c90d5a642ef86ad120c15dd98c5e3db6
-DIST lzma-sys-0.1.20.crate 760045 BLAKE2B 1f66d32008178c218575fba12df95a2cdc448e080c0a81ef4617f35dde09f0d56c86c28050db61c2ae7b464d0eaed7dd8c59a1fa605b39ff8c329e49165cd922 SHA512 393908b4e3006e4d9948a077d84ba7f5004765c4cc0f854e04847e504a246ab9a8e761fa48d4f211a7ac08dc119d950481da1ed1a480778d6b6e9b446a697279
-DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
-DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
-DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
-DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
-DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e
-DIST nt-time-0.5.3.crate 25333 BLAKE2B fb0f9acd24117f41ce730504c028582bd77d3d26b034b146f926fcc16cc2040c99d86c66a0b3160b285bbddd5deed5fed0fdefb8097095c5d16f589f4b2c6de9 SHA512 17b3b7bb240f28dcf37583bd939ea0d62fc72cef6b7e850c21db886465067d8d99256152b52f9473e34cc6b52d5d17f7aeee99e96ade1b8d1128bcb5caae4e85
-DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94
-DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
-DIST object-0.30.4.crate 259203 BLAKE2B cb997d276f50b40f91dd77bcf975cb151884d11584cb68761b2a0fcf76a8bbe51cd6a986837d20f760af519f3de3b8b4344a8bb2cab396c0280ce69d18294255 SHA512 59043fc98874709978ecc714162e19cc5ab8033a3af6c703a6ee2c49a51df5b4bf9a987c9fce2fe32bde33f709054cf329a5ce3952220fc841575910a28ff577
-DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
-DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
-DIST password-hash-0.4.2.crate 26099 BLAKE2B 3f211d467d43960c1d767111c679d2ee7ca004a14946409e37b4e8ea46848100095bd43ac5d4e4ab31828e6fc09e67eb0b40e677dffb086f711668c4918c8bcb SHA512 f6b7da81fa172ed37229894c426965182be1a445ccaba4351b91ce43ff1ab8cacd205b321721df49dd43ba17dc6a77e9b7cccc3a0c396572aa7ad642af44926d
-DIST pbkdf2-0.11.0.crate 13229 BLAKE2B 33a9fb386ab9550cf5b8b54a48b8ad4582c95c1de7b15e767caf7b08d5996677f0926b57c556e43e90daa099fadfd1f5bcddec3bf4a48a82e7c71228b5398dda SHA512 f900766e8e84d865670977bbe5816b74036f0c2b3a30df4c8ed73680f76f0ae111472af7aed96524cdf7e1092609c2008c5f40efb9a9c65b3a796b7f3415c087
-DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
-DIST pin-project-lite-0.2.12.crate 29073 BLAKE2B ab66a6dad606804eb6121fac25bfbca3ad00e8d80af2e7d1ab38add91c3f76761fd1864f0fb184cb305cd216cc92e81c2f73f0cd2e6f210ede3bde4cbdeff77c SHA512 9d2eb190169819fadece7fcf33d006863ebe2c298066ad97d97ba96ced6229892b4087ec1f364d5c6150cc80b0ded8f431d9d4285adceb5fc9ae1da8e1a6d82e
-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 predicates-3.0.1.crate 22744 BLAKE2B e94b422bcecad4d5b9c37a035ed5180bcd61362672b707367c3171700d3d3e1e283664eaec9f7d230d2e3fc5b4be88b1ce8ac88dc1828887c955314264ecaea7 SHA512 c14985632fb80fcc1c52c926dcec9727fb17426f7bf0f500594e5bdfa5aa1e53d433e49f8b862129df675c1040743cd92b230ffd051fbf87734fe1acb966e1b0
-DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
-DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
-DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
-DIST quote-1.0.31.crate 27881 BLAKE2B 47c8ac1051f7fa03d002420ade3cb18bf2aedc6ba922d13b117c016ee89c3326bea5cad32ec2f0e5ac1afcce68982f20b3f973914c205e6d6f426487989c6ec4 SHA512 8b2ec131937ce53f3fa01e68fb9261ed6442222e513cbe86f62b6da3cf3051cda0d134dc8028bc6c992fa63735ef3507490a169f8b4af1d6fc17058c6d2faaab
-DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
-DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
-DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
-DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
-DIST regex-1.9.3.crate 252676 BLAKE2B dd419b02b7dbd28a71e14c90bc538e98a63c0b9cc2ea01e7d8f6a0075c723c42c3d7bcbb45391431dec3008e6709e9d1d396d8e505f7f8d5d3a629ededf74b4d SHA512 ef5ece7d2b80a136d437ac42c5395cb01f6d357dcc490c8f6c89657f3f97af6befcc699008535c27583d7354e979418d1d933e36e8774ff2bb62750b9009d5d6
-DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-automata-0.3.6.crate 607174 BLAKE2B 6d02512501b45b0e87d8746c894009ec669fbfdeb742966e8ba8960ebf692f3b2c3df44ce5ee03e7d5320136709ad83b532dbc322a779e3c21ff0f65768c0d0e SHA512 ab3da2e63ff2c6a4da2c149dd34e565303f961f38547db7b34fbe984cf90aac107d4ec116111c765c9b71c4bf26022742151e1d4c5d01a6beac0a8a0887e30ce
-DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8
-DIST regex-syntax-0.7.4.crate 343365 BLAKE2B b50c01f02e08729496e8bcf023949d088463bf62348b4a1043fe5205650da37863b2ca51f683662a4df33bd56085e0501e50410106c9c471a0daec4c71dfe945 SHA512 b33713c71f6f753820ca6405e8415e5eeed457efd01e81b0b720e48c135b9bb0973962269587ddca31350233aec6d3f598596cb48310db0633bf67f8970f0e18
-DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
-DIST relative-path-1.9.0.crate 27908 BLAKE2B a55126f66600033a642844a5b5ef2608f388a0596cef8ce39f854b4b274c80a5c7bc84cdc50b51aec3227a706da1ea14151ddb081813e070af1d9d9c6318272f SHA512 67bee40251f33bed1ea84e34dc3d356fa27e3c0578d447c2f1f144ccc6ec55d5124add0e691af403f15e82263a990418d9a8de5c3bebd4025481a1a59f21d425
-DIST reqwest-0.11.19.crate 155083 BLAKE2B 74569b1cef7968d776a6b4276b616eb629d919f52909f98e2ae47dbedae35b64ec411ea349e3ab15ea098e26e7ae994ac4bc3ec1cb658110cf33663cacd326ab SHA512 ae7f7e56592887936b6a62c1810588d2c8a7609112e646f813d14519e0f4ffba0c6d3035101a4216a15bdf065e6819891491a7f23cdff64ee17c976c997fa0f9
-DIST reqwest-0.11.22.crate 156932 BLAKE2B ca25d5ce6c603310a0cae8613e002a158e6deb977b5dfdb4cecd4d313ec90de369b740e806f7cc3d58137c4e72ccc1ad2f96de0f843e4d7da6425f7782cf78e4 SHA512 aaf1218a239a9c979b7a14198bbc1ffada80237a0d05a63242f8486d416c3dce636dbaf205976da4655973ddc5168a3e8d4ad341e2f042c5f239a7af35c7c5d2
-DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
-DIST ring-0.17.3.crate 4146357 BLAKE2B 32e9e6defb181a67ce3ab38eb0b3b988d3dba7b51fca9af521f606e0e596ca2cb6acdc9b853c9345c54f79970c654a13da536b1adab6c35f511a814c5a555f41 SHA512 389a640186adc694ff42d18ca7bb458cdf84aa75505ecbb3ab44a92003bff09602cd33e01463eac764589e82d8a9afaebc14816fc9be4dd6a749b8a7239f231c
-DIST rstest-0.18.2.crate 28868 BLAKE2B 44368c85da79308277d9cad96659520ecdddd767e55acc5a4f35e246af64a29112867c4ed40bded5dc0f9d3230d828f6ca98a73adbc1067b60a9119b3cbdf369 SHA512 b73b902c761717acf5848adf888c27e5c58fe304f235e91e1e543cdcfb4e678472b8fe9930cb559be525c0f1a037bdfb2d77b7a0632b021d51976b85288f459a
-DIST rstest_macros-0.18.2.crate 57534 BLAKE2B d06bb6453eefa572cd784e38ecf9361873a5f3ddd5dc4926728183bc303e28a304030d45304bb287019b42337d78f294d9ae350d4204fee027b68c264272d86a SHA512 614944fbd51de32b5e7ec1b485c12cd68ed9fae6ef296f9a9811de2495bc27887fa5ff8695c619255ac18da5af2b6ef8a557753d96b4c1ec3d711a9036bc7392
-DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
-DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST rustix-0.36.11.crate 294103 BLAKE2B 3c8134940d6e9821414071a2cf90e01c8077864762cc1075722de55688275fd6a58a55570918f619da2855581c73edefe6a6345fd42344442c1a8ff2b03c7c5d SHA512 d747299fdec4b4830fa6935b3dc84900d81cb08b0469c769e503c8e43bb9b4b37b365b3365885c61392a3170d3ad3f2107963fe8a841c0e39a52f79852fad609
-DIST rustix-0.38.8.crate 333258 BLAKE2B bea1e7ce55823650f8d3988c78d6668742230bb22e04c9f5122ef8497a9ca8c5454d48bd3d6e9765b90420ebc097b440968ce9c149d78bf201118630bc3fc17e SHA512 835d6ca0e8d3c95eb1f81f95a5edf3b12614bdffedcefe1c66ef47d6035215d2aafd7a45f12d96ecf7b1b7a0f9ba7e5445069060badbba7f1dcc036a40167c4b
-DIST rustls-0.21.6.crate 282907 BLAKE2B 65b3559d018aff1e4794d6a9607072a8d8d1f6c81708398ba77eefb83e97c0a9bd34e80655d6f11253109e83b37b61a3bfa15103fb0f17b5cf6c89fe877d9631 SHA512 de92ae69d34ca05d83067a2fecf52fa8e5b17e0959cf830103c4c69dc248c1e0d01ff54b833cf7b11730279117d5ea1d4a3986c1a2a1618d25f595b79d770447
-DIST rustls-0.21.9.crate 283537 BLAKE2B 38db2b38f33223591571af2829017b64c1f319d03295281773a70c4419f1072cb4651e0d4969eb19be467fe6f09039eb0ede2b315b4cb047f0dd3ecf9352f8b1 SHA512 b2be86d232ee32855872bf08d17b325c91b90ef7557154cb9042b072060ef2183e3d106420fa20d3887d0981c810094fe801c66aad407d1bd735b1b443625069
-DIST rustls-pemfile-1.0.2.crate 19347 BLAKE2B 3bbbd44a3cf1a414ea536af3b208aff1303229b9b38d57f39b3b164235da06fe9222a4947d6f26168d13539c59ea8a6d00defa515391fab286dfc01225d95cba SHA512 a70f30b23fd73d49527642d050ca6857edceb703e6a202bf80ecf47dd1c6923a9883e1cca8d5be0c7740dd1a43c60e045fe69c43aae9b2865bf11b455953bd10
-DIST rustls-webpki-0.101.4.crate 164324 BLAKE2B 127391b0d209b0ab2bdf1c39481263794becf9e6bae7f19adf0adbecf44a49ce0f3decca6c7b6f33266bd976222f8a08574f86e7018c7f3b475364677eaea29c SHA512 76e1780027469e2b9ab8305bd0242f22764d77094f4283aa78033665b1cc1a04aeecaa1dbbd6a28d95ade752447a2311cf76be16ccc2e87fb514293b57809984
-DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
-DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
-DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
-DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
-DIST selenium-manager-4.14.0.tar.gz 78721372 BLAKE2B f57f5ed30f4439a83308909f5233187f924476de455d9b6504255e56a3217844d206968a96963c0f824c1a7dc5e69a196dde50a0cfb291820e6690be67a87c5e SHA512 b3b3f375ef0589cdc2afb454b50678ebe881d08cea841c697c9a5a4d745fc8ac84f941d2f5bbea9082c6e0c7052b7c5f08207947bb4389b0322c257dc81dcc89
-DIST selenium-manager-4.15.0.tar.gz 78935989 BLAKE2B 5ff5f620d206ece245a3166cbc77813ec8b5cc79942ad7e5b04df6ed02a0039b1b7af2af4b312cbcfd0e998aab25f4659e3c6aff52ac6d112c9440d49076fb69 SHA512 584e1637202681c2d60418a8e0bf7f8d28cf0edf901f076647c44996a589844a80db27ba52f1cdd22e5af5cc2ccfc890c0c6690a15d0656a35c8ebb9c20e5ee9
 DIST selenium-manager-4.23.0-crates.tar.xz 26763004 BLAKE2B b7f584637ae436f0c867ecaef2a04ba4a58178bdffce6f15a702bb6d254368303f7b2d9c1b50e950717deffc8ffe3bbbfc92ff14cd8f472f00387e4c114e924d SHA512 1dd54ae66b7ae93cb061c538140c64062b9185d18801fc759c67945792d59f2c3033f7173216d78f0b493db0000b4efd5cdb0e405b6f7aa242f5fa2472f88811
+DIST selenium-manager-4.24.0-crates.tar.xz 27591764 BLAKE2B 42c120a77df5c48b840200772d3d49aa88c0cbfec67244d13435037631a8f0d67d03249031da44cfc6ecddfb8cd9b90b879df0be896a072141d98f772933aeab SHA512 93943e9cfc54f7e66fc25290c67bb6eee679de5c1a8c1af23c8e79d0ce15aaec4de8a38b8b2346c632ac8e93446cb8c5e37767ba955a3aa5850ad6f4dfdec340
 DIST selenium-selenium-4.23.0.gh.tar.gz 77114209 BLAKE2B ce8b2be71c4bcf83eed5e16d4770f8aa9075cd29c69ab5a019c763e65f1417094bb9e97a2d5ce5bbc773029e187ab3dee4e8296bbef1bbec580e2935b1c8f258 SHA512 0ef7bdba5a1d592e6e9adadd6e3cb0da4949822c61b2787f6d3f282f615f1de692ff775b0ea3e3f179736a685a8543bf6e4790c1a03932ccfe5933719a2bb9a3
-DIST semver-1.0.17.crate 29685 BLAKE2B b9beb685eb9f6cffe557d1185997e1a93d0e50ecd8e9719d9855347f12dd430ed1020df81839b7924a984596437ae7fb2951e7ae44c5540692a7f37b591bee2e SHA512 5199923757e675506d68c252182b10f55955e47054880492e5471a0a0f9ad13ef25d552d2ab9bd68fba37121b8026d9989bf15db67e95265b3aa53d06377fda7
-DIST serde-1.0.185.crate 77337 BLAKE2B 602d8ce302f73327ce0dcfcdc5377408f4805be8a22ef93496fa31be512985188111c131b6dfaf110069ddbc45a9fdcdb8409d14689422fedcffa652e5a5000f SHA512 0c48d6ac7916104e108025c3ddf88a7e98b98ffaa98fcb7ff9eecbc4d3ed5930efbcb0de9e4072f795a3cbfa12aa5e17ee7eeeed948a7c99453c9a9d0c9985c3
-DIST serde-1.0.189.crate 76276 BLAKE2B e4cf8d9608f341007f9a92af434395659511238040ddd2cec137539a51c05b949f79c4965ad9ec25f67a72fe8341573f2d1075766f7ab5842a107b12e0468a3a SHA512 3fb1732f6866db8412cbc4ceb57bc8f90cbee005e2687a388b052e5b94dd464aebff57a91cc8ce5da62508bfbd6cc4e14a524090a5fa60724cc9bd1bb5ea1035
-DIST serde_derive-1.0.185.crate 55569 BLAKE2B 629304ece108ea3549d9ac2284c1432d10686481611e8aeaa1420c9bec32ecccfa3b2132b9192a9a5b49e927080bfc281a9223c94a4fdf068da6939bed4ed908 SHA512 11e61703dc71c9ebf2cbf371f70ff44911899ccf4b98379982250eefb6ad36516959f452939d67c894db5372dcf814f7cf508ae111b1fb56594235635e2fe4ff
-DIST serde_derive-1.0.189.crate 55708 BLAKE2B 6f49c1a8ef5402251d6bdbfcc03fa411c0440d292fb03bbe38e9d4f9eacc128c60a33bbdcdb5fceeb4e0a6f6eace56b8da16f90fffda08c580b87409ac5c3d29 SHA512 54bf81d6a18297d57122d8eca3fa4fd60a13907fe65bb68081c6f9c0f8c13f3f3206f74a0e9e3c3546c8581b8f7d4af92dd74fe4172f039d3022eda031e1e342
-DIST serde_json-1.0.103.crate 146095 BLAKE2B c10ccaef03dc4b0dfdc238e3d3b738faf43cd81cda1bcdc0296aae61a43260314ec03552ae14847bf88163d3c62d564ab563c55c8710f936b86f6f02dd7167ff SHA512 f63cd940426e6f40d999bb53d84122a2a8b87092b24262fd517f149983cde6715df818954baf7d2e7ebfb22d99b6f85042ea24e882b007888473d89c857a82cb
-DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc
-DIST serde_spanned-0.6.3.crate 7737 BLAKE2B 957352cb24d5cb1173613a48de7e411d768c61a73dd57572530490be0569e133e7c8eb62ec34e542a17010871562a53e37b296386c54dee8ea61d175dd0b05e3 SHA512 5c4f4a861dba2af7f0ad0c585859f845a7ea6c0a8ff8b63985503c9da27f313ba15b904b0aa56a59043c44a87c75fd317b23006a3804d332b84855189e436610
-DIST serde_spanned-0.6.4.crate 7756 BLAKE2B 58b8bfa3b39368f4bec795bf1bf1b0e19554efa9cbf44a8f5deaef79c926c8cafb4eabd6230b56acd77c75b924b8642a141e3f7827a5fea16633edb764b54124 SHA512 10a71df5cf84abd5c658de0321a4813ce582735fa5cc349694d979acd8c8228fcf69b3c65bba803d706089b49b053c15a8b1c4fc4c19a586596b8cc58cc2ce04
-DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
-DIST sevenz-rust-0.5.2.crate 529497 BLAKE2B 550ef8489210ed9f594a9ff7b8ae7a661beb95c1797330d31117ebcee1ae829635c80f780bf2b2ac60a5c8acb9dcd5ec65ddd613790071aaa2843c177034bdb5 SHA512 29b8afeab1ef80bedb474c0c602346493a149c1057becca37a19341278d5c04915684bacc654ad3126591d2e58de5f4562c294bf524ce3023933b2be8433d666
-DIST sevenz-rust-0.5.3.crate 529814 BLAKE2B fa67f333393f45b25bf7ac52ec63712731a9dcdd2030667c30365a9f235881442e11c3cfd0c3370de97c866e086873b986828cfc2047bbdcd06161546ed9b32d SHA512 7c38a42f67bd6d0eac03532c289e246674043331348c508d3779f93ed0560db8cf303e9e00845cf6a646b723602840d42772bb7347c530dacdcdb7d952b2b654
-DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b
-DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
-DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
-DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192
-DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f
-DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324
-DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
-DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
-DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.29.crate 241664 BLAKE2B 5b339433249d7ee17b032cc9ecb118169957d91f438619940aeba0003ab0015b01cc6afb00656b5492539a5396325ec16c37e33764b00d6f9b8dc6b5b5e6a9f0 SHA512 a6319ee743a7690c7858da8492ffb6a963d102beba07009e82b08082d33ac8e8ea2675bdfc3ac3684392b3bc3d7f2624983dc508dd8b8f1fb9a57ec8a5b82828
-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 tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f
-DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
-DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
-DIST thiserror-1.0.40.crate 18709 BLAKE2B 8057ebcd11546f8b3ae5d760c1dd1764386f3c29dc43bc7a4aef20604970c65356daef137734e80260051d41e39979943bfda496459696b924a95f455159704c SHA512 db1b1fab3aa61dc6bbc672670eb70cee2f838fa713d3a927022900eddde253108d123bded1aa6df8d314e1aa2f8ff37bc72fc9b0803fe3a56447a64290ab2a91
-DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2
-DIST time-0.3.23.crate 115028 BLAKE2B 2d3782aaad37156d6a51fd98c6f69955410e3bcbd313a4739c4e68260fc0fff4bebb05a02e2a0acc5d68a4f2f9583b0fd8d4d5b7b1cae23fbf99c9eb597fa60a SHA512 cb3671ade408daf3b8f929ec412bc2eaf7cdd2486673269e83c381c277eba8ff04450ebdbc73af35c3abc6a822dde10b767a800434621c697363558a42c88ff3
-DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14
-DIST time-macros-0.2.10.crate 23680 BLAKE2B 44b755081cb2cfe8af1bd4fdcfcedf40e4b37261a9a72a70c45fea72af9eac32dca795002845a0be6b62274ef17fd99ed9a27ffd943b9c9e8b36168949ae0e6a SHA512 b325eaa48c7fcc30a478e05e92b9db15b825e21ae77351941b9557824ffc810aea554c61d4b057fe28f3b209d307e96f1a33dd21b52eefec77857645b88c8654
-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.32.0.crate 725004 BLAKE2B 80dde8073cdd361c8e05a8ef3b0fed0b4ee56c915ed6c0adde4bc2db487e0dd60a3adafa55aa9a763d37ec992a27208063aeee6a95b594b2e5b02e2bf65da9a0 SHA512 c7a64e08b4584b52c98118dd07316ee3bc0c2b405278f37bce58c512072c20268df66a8ab553e4d3bd3470753899ac3b1df4b9b5411743dc0e092fbc2d9b11a2
-DIST tokio-1.33.0.crate 733783 BLAKE2B 6869ecfa08015d61780e0467e4f4063ef14a134d8901c0dbae3ae25fb79a3661916c90b8fd1faa507389abbcb7de4ec493b1c65344b781b2cda48817007a2326 SHA512 49fc49106064a637988619fdc5f949654b64b26e956801cdfcd46d8441bc4825683969bf65421e1466b5e2c8bff7212f738d8d5182980e4133e84d0187999b70
-DIST tokio-macros-2.1.0.crate 11472 BLAKE2B ae03d8812bc2b8f833e0ca77f1df8edeb8e0476c06f8f5104fa632ce77369ec54a80ff3da86439192971bf2e11147eade3765c447d76238b768732702004db95 SHA512 e2a24c1befd512d68b5d8b26a3f1d940dd10bfe0979b5d61a71052478d9fd19b28eb7bcbeaca4cf3c9736fd3da0386c899e3a619f47c2d9f7e6b497140586b9d
-DIST tokio-rustls-0.24.1.crate 33049 BLAKE2B b061bc5895b9d7e5aef96512667673ac6fb813a4524b1f6620af9e2598425662b15b5e07d3896499b8a24d820462d15b71a2b9cc804886d546c8ac5957f28529 SHA512 93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa
-DIST tokio-util-0.7.7.crate 100405 BLAKE2B 97b701985cce390acf3fcfdf4bb761901e8e64ba29fa285a822b97668b4f9a56e13dde3085f7b63025ff58f9ed3726c29a0f8dc412100fa76d7ac5ba75ff24b6 SHA512 d33edfc594dff40a7f76ce84a740eb8901eaa95aa6cb6e2308aaf23b4543dae2ce7f7c8df5f027292777b65aa8b00618ef45dddb34b53b1981ccf1650c01609e
-DIST toml-0.7.6.crate 49220 BLAKE2B 805bd9928fc3d05a1658188d4b858df62347cc93bf870a3846b9509c1dbdfc4123bc29a26019efa04e98699239ca7bb95ce63c802badffd86246266cebc65d7a SHA512 e51c49af63e37d1682892b84e74d48e171591c36dccb26e26bbf136385181ea9cbb94809b8900eae82b15e1cb79f844ae1cf0b00f0a6ac3afd5ebd02d554f9bc
-DIST toml-0.8.4.crate 50297 BLAKE2B 85d7e95d53b37fbd10ea5869f9e7a2320674e695387a84451f2ff29dda6f226b5489d14b883b9896a0cbf284de7e000558e7944683164545632dd943d181c740 SHA512 ced0c5c85e630eb1fc1f74924f07005fe1eb640fa849652877904d4e403ecf5363a2be3c087fbb4471032e8fcb0cc80396fe4c7799fa0932a35c6a9541ce499c
-DIST toml_datetime-0.6.3.crate 10770 BLAKE2B fc1754eb7c3a7073cfe41e5ccba152ff09891a8de8afe38991cf2dd7b93aacf07f1075fd24d7aa643238cf31e3df1fc3162335b2c475438178b4a4d8a2055471 SHA512 cabf5dce24ed3bf4674008743180a21e86286d999cdce79f934de48b1e1fe0f16a7f3d2498bf059acdb823b51bc01986faf47139f8100ae272e6bd19095cfa9b
-DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
-DIST toml_edit-0.19.14.crate 94875 BLAKE2B d11328357d66d4139ac23766ddc84985eb9e2ab7eb5ac5b3639be2098938596cb69c28150589f24bd404c10ec2fe06e0adc207b787c3dc869472eff15ec0fa2e SHA512 87f432e0f6870c2ff1476fd1dbafae8cfd736ab39436c1c60627d60511a65fece8c07bd9834d68a080f6969a256430acb20381f210b775c281764b183ec57411
-DIST toml_edit-0.20.4.crate 99864 BLAKE2B e0d0f2b0610406db56ea8737066c784d8e1c4596a892f91ecf01cd6f49628ed760bf7e8bb2ed7edfa428a671ee922df8ebfd7690e370254f894e239cd39c1d35 SHA512 71912d61a981ed7cffa0107ee62d116337c21fd6969f9812504ea24a1359904ef37f2bc4a7ef8554be3197db009701b94dc14e892d53d616593167dc3174a98a
-DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
-DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
-DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
-DIST try-lock-0.2.4.crate 4467 BLAKE2B 7afbe36d02ccf31351c7c7ca4415578383bb4d0fbf89ba2c5c7835dbf410326fb0f6cb302baf7c1edccc4b193a2ab8079545fd67f26a74457d116204f3c6e745 SHA512 fbd989589eb0a1fb226de65537d51eceab632603e69710b37708d6109ed09c07333189675d5e560e35cc836e5cd211c726d8ce247186b5ea4529328d46c22632
-DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2
-DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
-DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
-DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
-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.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
-DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
-DIST uuid-1.3.0.crate 53736 BLAKE2B 1618c1f43db7673019d804b7419390a4acb62fd234dfe2a36d22cbc33f526f3a7e213e3c98160fb35a713f15e146b0ef89eac9e4e397532073c01229026cce12 SHA512 0914998dc2d516c215b1309a2527af557cecfbbd57f793d416d7ce6520b75dac60951d7e0951d10f251e8bb66733615e502c946acdaa503aba2fc0e3d4a874da
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
-DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
-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-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058
-DIST wasm-bindgen-futures-0.4.34.crate 15117 BLAKE2B 7a6a70d07e021680dad6ae9d4b800d153baa0ff51a2bb7bec59b4c7878335ec3dd9cd4bec1cb7826683e3d91d115671274d45da5148979623dd9e1736a1c7d1c SHA512 6b822fadaadd4b0edd2c9ca264bbc611f67e6d3eccce7034c3ed1a960dc673c591ef1f8407e58ae740dd173a1f1f82d206840f35a10b1f088630b79bcd0dff74
-DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43
-DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5
-DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
-DIST web-sys-0.3.61.crate 706333 BLAKE2B f57cb14032e2ea01b5e0ffcef0988ee3e8227c1da7d27ef8799583f64cddb4bcfbbb145f5ea1889006fc9ff61d42b1c02d4b278d67371c9d914827113f5e4128 SHA512 dd8c93a92295a9cd94a4a4cac4a81d9fa41c2c0bc885c1861eae5cc317a0d55e1a9d34b97b91999bf617a071f7f8acc39bb0d4a684b40543519f0cad6b82a25c
-DIST webpki-roots-0.25.2.crate 250405 BLAKE2B e603f95c1d05a7191b00abff160f52063945ca7cb8159b40da3b6934703ac5cdd5a2ffc36a6437e62c9bcba871331bdd32e2cab606b56617027bce8f66722c10 SHA512 7988580df398bad3d62e6ce9d19afc9af7c7ad9d374533c2c67fccce930243a2712c667da9bf02a7624e88dfb94cd5ea04fcf58eda006976ca27e5c87fcb1002
-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.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
-DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
-DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
-DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2
-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_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_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_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_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_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_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 winnow-0.5.0.crate 142099 BLAKE2B d801e056b583588aec1c0f2c7e056d972a0e0c1b2857209cf87655fb92601a8e0ba0766b877763c1ca6b2a7c282257b617d548249337de93f6cf3e26597f5926 SHA512 f14c01b5e7dd6ea2061496224e00d88a842b39ed7af5e43279f69bd85d1a964d8e64ec05801c74acad58c32ba818a4110faf3cfe7c98d4ad20d1160d25f8e519
-DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
-DIST xattr-1.0.1.crate 12258 BLAKE2B 5f7614de3e7179983c9767953b7713fa387ffb011ced680c93edf4a8ce2b0273a10bac6a968f67d7636beafe3c8ceb3015aa97b2b607d591c7cd68f5eaa07725 SHA512 f26860cf452e158ddded144d96b80614068dc6271f38ec3794ced4272c9ad01b9baf4938cf7a249e9716947b9c1b2700266bbd6ec9bc7645a3a2fbca9ab67c67
-DIST xz2-0.1.7.crate 23892 BLAKE2B fd4b65cc82405f28a3d9fcc3db9dbffac41ae8ec7e767f3405bc9c7e45000b529cd571f72a76e41f2fb9866e7af8ab37d9f1ab8e6f14652495d306ba0a745879 SHA512 9969ae958b157f3d49708bd00640e57fe7c3826add2871575bdac03e6064aabd28392e3062bfbb833752df374195c50b19dc6b6c08ac41455c492213fb91fc74
-DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
-DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c207922c38447459aa291961d3512d7c30016c51ddf49a8dadac0b7b2bf677b6a89d22670ec1e214607b476584a7e1b2dbf36d SHA512 d3f053c4acbdb45f3dadc9590db56095c761f0ff8899d22461f664701de766dde2fac2960a4477cd05d0a9c7ec200caa02ff891eb1f04630734996e0c38d10dd
-DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014
-DIST zstd-sys-2.0.7+zstd.1.5.4.crate 732100 BLAKE2B 1859d1feb7c31d53df56b198b88a391bf09e221d09d449878043dc780ae6e3b3a0ad05fe3fb4980e849ab914f68d281d41f51f7bbceec6e1403d9b4e25572b4c SHA512 dcddc4f0d7486ee144df4e2173536dc02c9714b6f702edb9a9e04b4c02f4d347b5a70fbc020c1d08c079d38a423c4dc8b6b86e7e43ec3ccfcc8e3ff9861be11b
+DIST selenium-selenium-4.24.0.gh.tar.gz 77126013 BLAKE2B a909714b93b0cfc92a9d70d8cf20609eec65ebce3470fe487a23c86ac4f6f3dbf2e2ef88e00883999fe8b5e2842a05039fec94f6617961c436649baa618c59f8 SHA512 bc6f8066efba5a4f5a27abcc37eefa303e9efd89423729fedb4f466d98ed57e68c8593248206e4fc13cebd3446fa25a5a856d5f4c1d05940d73cecc920b4c522
diff --git a/dev-util/selenium-manager/files/selenium-manager-4.15.0-update-ring.patch b/dev-util/selenium-manager/files/selenium-manager-4.15.0-update-ring.patch
deleted file mode 100644
index 7d2180f56ee0..000000000000
--- a/dev-util/selenium-manager/files/selenium-manager-4.15.0-update-ring.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-# Update ring and other required dependencies as old version of ring doesn't support riscv.
-# https://bugs.gentoo.org/918098
-# https://github.com/briansmith/ring/pull/1627
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1372,17 +1372,16 @@ dependencies = [
- 
- [[package]]
- name = "ring"
--version = "0.16.20"
-+version = "0.17.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-+checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e"
- dependencies = [
-  "cc",
-+ "getrandom",
-  "libc",
-- "once_cell",
-  "spin",
-  "untrusted",
-- "web-sys",
-- "winapi",
-+ "windows-sys 0.48.0",
- ]
- 
- [[package]]
-@@ -1458,9 +1457,9 @@ dependencies = [
- 
- [[package]]
- name = "rustls"
--version = "0.21.6"
-+version = "0.21.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
-+checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
- dependencies = [
-  "log",
-  "ring",
-@@ -1479,9 +1478,9 @@ dependencies = [
- 
- [[package]]
- name = "rustls-webpki"
--version = "0.101.4"
-+version = "0.101.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
-+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
- dependencies = [
-  "ring",
-  "untrusted",
-@@ -1504,9 +1503,9 @@ dependencies = [
- 
- [[package]]
- name = "sct"
--version = "0.7.0"
-+version = "0.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
- dependencies = [
-  "ring",
-  "untrusted",
-@@ -1683,9 +1682,9 @@ dependencies = [
- 
- [[package]]
- name = "spin"
--version = "0.5.2"
-+version = "0.9.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
- 
- [[package]]
- name = "strsim"
-@@ -1989,9 +1988,9 @@ dependencies = [
- 
- [[package]]
- name = "untrusted"
--version = "0.7.1"
-+version = "0.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
- 
- [[package]]
- name = "url"
diff --git a/dev-util/selenium-manager/selenium-manager-4.14.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.14.0.ebuild
deleted file mode 100644
index d643e6b8aa63..000000000000
--- a/dev-util/selenium-manager/selenium-manager-4.14.0.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.5.4-r1
-
-EAPI=8
-
-CRATES="
-	addr2line@0.19.0
-	adler@1.0.2
-	aes@0.8.3
-	aho-corasick@1.0.2
-	android-tzdata@0.1.1
-	anstream@0.3.2
-	anstyle@0.3.5
-	anstyle@1.0.1
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@1.0.1
-	anyhow@1.0.75
-	ar@0.9.0
-	arrayvec@0.7.4
-	assert_cmd@2.0.12
-	autocfg@1.1.0
-	backtrace@0.3.67
-	base64@0.21.0
-	base64ct@1.6.0
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.4.0
-	block-buffer@0.9.0
-	block-buffer@0.10.4
-	bstr@1.4.0
-	bumpalo@3.12.0
-	byteorder@1.4.3
-	bytes@1.4.0
-	bzip2@0.4.4
-	bzip2-sys@0.1.11+1.0.8
-	cc@1.0.79
-	cfb@0.7.3
-	cfg-if@1.0.0
-	chrono@0.4.26
-	cipher@0.4.4
-	clap@4.3.23
-	clap_builder@4.3.23
-	clap_derive@4.3.12
-	clap_lex@0.5.0
-	colorchoice@1.0.0
-	constant_time_eq@0.1.5
-	cpufeatures@0.2.5
-	crc@3.0.1
-	crc-catalog@2.2.0
-	crc32fast@1.3.2
-	crossbeam-utils@0.8.15
-	crypto-common@0.1.6
-	debpkg@0.6.0
-	difflib@0.4.0
-	digest@0.9.0
-	digest@0.10.6
-	directories@5.0.1
-	dirs-sys@0.4.1
-	doc-comment@0.3.3
-	either@1.8.1
-	encoding_rs@0.8.32
-	env_logger@0.10.0
-	equivalent@1.0.0
-	errno@0.2.8
-	errno@0.3.1
-	errno-dragonfly@0.1.2
-	exitcode@1.1.2
-	fastrand@2.0.0
-	filetime@0.2.22
-	filetime_creation@0.1.6
-	flate2@1.0.27
-	fnv@1.0.7
-	form_urlencoded@1.1.0
-	futures@0.3.27
-	futures-channel@0.3.27
-	futures-core@0.3.27
-	futures-executor@0.3.27
-	futures-io@0.3.27
-	futures-macro@0.3.27
-	futures-sink@0.3.27
-	futures-task@0.3.27
-	futures-timer@3.0.2
-	futures-util@0.3.27
-	generic-array@0.14.6
-	getrandom@0.2.8
-	gimli@0.27.3
-	glob@0.3.1
-	h2@0.3.17
-	hashbrown@0.12.3
-	hashbrown@0.14.0
-	heck@0.4.1
-	hermit-abi@0.2.6
-	hermit-abi@0.3.1
-	hmac@0.12.1
-	http@0.2.9
-	http-body@0.4.5
-	httparse@1.8.0
-	httpdate@1.0.2
-	humantime@2.1.0
-	hyper@0.14.25
-	hyper-rustls@0.24.0
-	idna@0.3.0
-	indexmap@1.9.2
-	indexmap@2.0.0
-	infer@0.8.1
-	infer@0.15.0
-	inout@0.1.3
-	io-lifetimes@1.0.11
-	ipnet@2.7.1
-	is-terminal@0.4.5
-	is_executable@1.0.1
-	itertools@0.10.5
-	itoa@1.0.6
-	jobserver@0.1.26
-	js-sys@0.3.61
-	libc@0.2.147
-	linux-raw-sys@0.1.4
-	linux-raw-sys@0.4.5
-	log@0.4.20
-	lzma-rust@0.1.4
-	lzma-sys@0.1.20
-	memchr@2.5.0
-	mime@0.3.17
-	miniz_oxide@0.6.2
-	miniz_oxide@0.7.1
-	mio@0.8.6
-	nt-time@0.5.3
-	num-traits@0.2.16
-	num_cpus@1.15.0
-	object@0.30.4
-	once_cell@1.17.1
-	opaque-debug@0.3.0
-	option-ext@0.2.0
-	password-hash@0.4.2
-	pbkdf2@0.11.0
-	percent-encoding@2.2.0
-	pin-project-lite@0.2.12
-	pin-utils@0.1.0
-	pkg-config@0.3.26
-	predicates@3.0.1
-	predicates-core@1.0.6
-	predicates-tree@1.0.9
-	proc-macro2@1.0.66
-	quote@1.0.31
-	rand_core@0.6.4
-	redox_syscall@0.2.16
-	redox_syscall@0.3.5
-	redox_users@0.4.3
-	regex@1.9.3
-	regex-automata@0.1.10
-	regex-automata@0.3.6
-	regex-syntax@0.7.4
-	relative-path@1.9.0
-	reqwest@0.11.19
-	ring@0.16.20
-	rstest@0.18.2
-	rstest_macros@0.18.2
-	rustc-demangle@0.1.23
-	rustc_version@0.4.0
-	rustix@0.36.11
-	rustix@0.38.8
-	rustls@0.21.6
-	rustls-pemfile@1.0.2
-	rustls-webpki@0.101.4
-	ryu@1.0.13
-	same-file@1.0.6
-	sct@0.7.0
-	semver@1.0.17
-	serde@1.0.185
-	serde_derive@1.0.185
-	serde_json@1.0.103
-	serde_spanned@0.6.3
-	serde_urlencoded@0.7.1
-	sevenz-rust@0.5.2
-	sha1@0.10.5
-	sha2@0.9.9
-	sha2@0.10.6
-	slab@0.4.8
-	socket2@0.4.9
-	socket2@0.5.3
-	spin@0.5.2
-	strsim@0.10.0
-	subtle@2.4.1
-	syn@1.0.109
-	syn@2.0.29
-	tar@0.4.40
-	tempfile@3.8.0
-	termcolor@1.2.0
-	termtree@0.4.1
-	thiserror@1.0.40
-	thiserror-impl@1.0.40
-	time@0.3.23
-	time-core@0.1.1
-	time-macros@0.2.10
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio@1.32.0
-	tokio-macros@2.1.0
-	tokio-rustls@0.24.1
-	tokio-util@0.7.7
-	toml@0.7.6
-	toml_datetime@0.6.3
-	toml_edit@0.19.14
-	tower-service@0.3.2
-	tracing@0.1.37
-	tracing-core@0.1.30
-	try-lock@0.2.4
-	typenum@1.16.0
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.8
-	unicode-normalization@0.1.22
-	untrusted@0.7.1
-	url@2.3.1
-	utf8parse@0.2.1
-	uuid@1.3.0
-	version_check@0.9.4
-	wait-timeout@0.2.0
-	walkdir@2.4.0
-	want@0.3.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen@0.2.84
-	wasm-bindgen-backend@0.2.84
-	wasm-bindgen-futures@0.4.34
-	wasm-bindgen-macro@0.2.84
-	wasm-bindgen-macro-support@0.2.84
-	wasm-bindgen-shared@0.2.84
-	web-sys@0.3.61
-	webpki-roots@0.25.2
-	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.45.0
-	windows-sys@0.48.0
-	windows-targets@0.42.2
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.0
-	winnow@0.5.0
-	winreg@0.50.0
-	xattr@1.0.1
-	xz2@0.1.7
-	zip@0.6.6
-	zstd@0.11.2+zstd.1.5.2
-	zstd-safe@5.0.2+zstd.1.5.2
-	zstd-sys@2.0.7+zstd.1.5.4
-"
-
-inherit cargo
-
-DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/SeleniumHQ/selenium"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/SeleniumHQ/selenium/archive/refs/tags/selenium-${PV}.tar.gz -> ${P}.tar.gz
-"
-S="${WORKDIR}/selenium-selenium-${PV}/rust"
-
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-# 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/${PN}"
-
-src_prepare() {
-	default
-
-	# Avoid tests requiring a network
-	rm -f tests/{browser_download,chrome_download,grid}_tests.rs || die
-
-	# Avoid tests requiring a specific browser to be installed to keep
-	# the dependency tree manageable.
-	rm -f tests/{cli,iexplorer,output,safari,stable_browser}_tests.rs || die
-	sed -i -e '/case.*\(chrome\|edge\|iexplorer\)/ s:^://:' tests/{browser,config,exec_driver}_tests.rs || die
-	sed -e '/browser_version_test/,/^}/ s:^://:' \
-		-e '/#\[test\]/,/^}/ s:^://:' \
-		-i tests/browser_tests.rs || die
-}
-
-src_install() {
-	default
-
-	cargo_src_install
-
-	dodoc README.md
-}
diff --git a/dev-util/selenium-manager/selenium-manager-4.15.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.15.0.ebuild
deleted file mode 100644
index 4cb076cb60e4..000000000000
--- a/dev-util/selenium-manager/selenium-manager-4.15.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.5.4-r1
-
-EAPI=8
-
-CRATES="
-	addr2line@0.19.0
-	adler@1.0.2
-	aes@0.8.3
-	aho-corasick@1.0.2
-	android-tzdata@0.1.1
-	anstream@0.6.4
-	anstyle@0.3.5
-	anstyle@1.0.1
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@3.0.1
-	anyhow@1.0.75
-	ar@0.9.0
-	arrayvec@0.7.4
-	assert_cmd@2.0.12
-	autocfg@1.1.0
-	backtrace@0.3.67
-	base64@0.21.0
-	base64ct@1.6.0
-	bit-set@0.5.3
-	bit-vec@0.6.3
-	bitflags@1.3.2
-	bitflags@2.4.0
-	block-buffer@0.9.0
-	block-buffer@0.10.4
-	bstr@1.4.0
-	bumpalo@3.12.0
-	byteorder@1.4.3
-	bytes@1.4.0
-	bzip2@0.4.4
-	bzip2-sys@0.1.11+1.0.8
-	cc@1.0.79
-	cfb@0.7.3
-	cfg-if@1.0.0
-	chrono@0.4.26
-	cipher@0.4.4
-	clap@4.4.6
-	clap_builder@4.4.6
-	clap_derive@4.4.2
-	clap_lex@0.5.0
-	colorchoice@1.0.0
-	constant_time_eq@0.1.5
-	core-foundation@0.9.3
-	core-foundation-sys@0.8.4
-	cpufeatures@0.2.5
-	crc@3.0.1
-	crc-catalog@2.2.0
-	crc32fast@1.3.2
-	crossbeam-utils@0.8.15
-	crypto-common@0.1.6
-	debpkg@0.6.0
-	difflib@0.4.0
-	digest@0.9.0
-	digest@0.10.6
-	directories@5.0.1
-	dirs-sys@0.4.1
-	doc-comment@0.3.3
-	either@1.8.1
-	encoding_rs@0.8.32
-	env_logger@0.10.0
-	equivalent@1.0.0
-	errno@0.2.8
-	errno@0.3.1
-	errno-dragonfly@0.1.2
-	exitcode@1.1.2
-	fastrand@2.0.0
-	filetime@0.2.22
-	filetime_creation@0.1.6
-	flate2@1.0.28
-	fnv@1.0.7
-	form_urlencoded@1.1.0
-	futures@0.3.27
-	futures-channel@0.3.27
-	futures-core@0.3.27
-	futures-executor@0.3.27
-	futures-io@0.3.27
-	futures-macro@0.3.27
-	futures-sink@0.3.27
-	futures-task@0.3.27
-	futures-timer@3.0.2
-	futures-util@0.3.27
-	generic-array@0.14.6
-	getrandom@0.2.8
-	gimli@0.27.3
-	glob@0.3.1
-	h2@0.3.17
-	hashbrown@0.12.3
-	hashbrown@0.14.0
-	heck@0.4.1
-	hermit-abi@0.2.6
-	hermit-abi@0.3.1
-	hmac@0.12.1
-	http@0.2.9
-	http-body@0.4.5
-	httparse@1.8.0
-	httpdate@1.0.2
-	humantime@2.1.0
-	hyper@0.14.25
-	hyper-rustls@0.24.0
-	idna@0.3.0
-	indexmap@1.9.2
-	indexmap@2.0.0
-	infer@0.8.1
-	infer@0.15.0
-	inout@0.1.3
-	io-lifetimes@1.0.11
-	ipnet@2.7.1
-	is-terminal@0.4.5
-	is_executable@1.0.1
-	itertools@0.10.5
-	itoa@1.0.6
-	jobserver@0.1.26
-	js-sys@0.3.61
-	libc@0.2.147
-	linux-raw-sys@0.1.4
-	linux-raw-sys@0.4.5
-	log@0.4.20
-	lzma-rust@0.1.5
-	lzma-sys@0.1.20
-	memchr@2.6.4
-	mime@0.3.17
-	miniz_oxide@0.6.2
-	miniz_oxide@0.7.1
-	mio@0.8.6
-	nt-time@0.5.3
-	num-traits@0.2.16
-	num_cpus@1.15.0
-	object@0.30.4
-	once_cell@1.17.1
-	opaque-debug@0.3.0
-	option-ext@0.2.0
-	password-hash@0.4.2
-	pbkdf2@0.11.0
-	percent-encoding@2.2.0
-	pin-project-lite@0.2.12
-	pin-utils@0.1.0
-	pkg-config@0.3.26
-	predicates@3.0.1
-	predicates-core@1.0.6
-	predicates-tree@1.0.9
-	proc-macro2@1.0.66
-	quote@1.0.31
-	rand_core@0.6.4
-	redox_syscall@0.2.16
-	redox_syscall@0.3.5
-	redox_users@0.4.3
-	regex@1.10.2
-	regex-automata@0.1.10
-	regex-automata@0.4.3
-	regex-syntax@0.8.2
-	relative-path@1.9.0
-	reqwest@0.11.22
-	ring@0.17.3
-	rstest@0.18.2
-	rstest_macros@0.18.2
-	rustc-demangle@0.1.23
-	rustc_version@0.4.0
-	rustix@0.36.11
-	rustix@0.38.8
-	rustls@0.21.9
-	rustls-pemfile@1.0.2
-	rustls-webpki@0.101.7
-	ryu@1.0.13
-	same-file@1.0.6
-	sct@0.7.1
-	semver@1.0.17
-	serde@1.0.189
-	serde_derive@1.0.189
-	serde_json@1.0.107
-	serde_spanned@0.6.4
-	serde_urlencoded@0.7.1
-	sevenz-rust@0.5.3
-	sha1@0.10.5
-	sha2@0.9.9
-	sha2@0.10.6
-	slab@0.4.8
-	socket2@0.4.9
-	socket2@0.5.3
-	spin@0.9.8
-	strsim@0.10.0
-	subtle@2.4.1
-	syn@1.0.109
-	syn@2.0.29
-	system-configuration@0.5.1
-	system-configuration-sys@0.5.0
-	tar@0.4.40
-	tempfile@3.8.0
-	termcolor@1.2.0
-	termtree@0.4.1
-	thiserror@1.0.40
-	thiserror-impl@1.0.40
-	time@0.3.23
-	time-core@0.1.1
-	time-macros@0.2.10
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio@1.33.0
-	tokio-macros@2.1.0
-	tokio-rustls@0.24.1
-	tokio-util@0.7.7
-	toml@0.8.4
-	toml_datetime@0.6.5
-	toml_edit@0.20.4
-	tower-service@0.3.2
-	tracing@0.1.37
-	tracing-core@0.1.30
-	try-lock@0.2.4
-	typenum@1.16.0
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.8
-	unicode-normalization@0.1.22
-	untrusted@0.9.0
-	url@2.3.1
-	utf8parse@0.2.1
-	uuid@1.3.0
-	version_check@0.9.4
-	wait-timeout@0.2.0
-	walkdir@2.4.0
-	want@0.3.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen@0.2.84
-	wasm-bindgen-backend@0.2.84
-	wasm-bindgen-futures@0.4.34
-	wasm-bindgen-macro@0.2.84
-	wasm-bindgen-macro-support@0.2.84
-	wasm-bindgen-shared@0.2.84
-	web-sys@0.3.61
-	webpki-roots@0.25.2
-	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.45.0
-	windows-sys@0.48.0
-	windows-targets@0.42.2
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.42.2
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.42.2
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.42.2
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.42.2
-	windows_x86_64_msvc@0.48.0
-	winnow@0.5.0
-	winreg@0.50.0
-	xattr@1.0.1
-	xz2@0.1.7
-	zip@0.6.6
-	zstd@0.11.2+zstd.1.5.2
-	zstd-safe@5.0.2+zstd.1.5.2
-	zstd-sys@2.0.7+zstd.1.5.4
-"
-
-inherit cargo
-
-DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/SeleniumHQ/selenium"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/SeleniumHQ/selenium/archive/refs/tags/selenium-${PV}.tar.gz -> ${P}.tar.gz
-"
-S="${WORKDIR}/selenium-selenium-${PV}/rust"
-
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-PATCHES=(
-	# bug 918098
-	"${FILESDIR}"/${P}-update-ring.patch
-)
-
-# 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/${PN}"
-
-src_prepare() {
-	default
-
-	# Avoid tests requiring a network
-	rm -f tests/{browser_download,chrome_download,grid}_tests.rs || die
-
-	# Avoid tests requiring a specific browser to be installed to keep
-	# the dependency tree manageable.
-	rm -f tests/{cli,iexplorer,output,safari,stable_browser}_tests.rs || die
-	sed -i -e '/case.*\(chrome\|edge\|iexplorer\)/ s:^://:' tests/{browser,config,exec_driver}_tests.rs || die
-	sed -e '/browser_version_test/,/^}/ s:^://:' \
-		-e '/#\[test\]/,/^}/ s:^://:' \
-		-i tests/browser_tests.rs || die
-}
-
-src_install() {
-	default
-
-	cargo_src_install
-
-	dodoc README.md
-}
diff --git a/dev-util/selenium-manager/selenium-manager-4.24.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.24.0.ebuild
new file mode 100644
index 000000000000..88ab19a1e5fc
--- /dev/null
+++ b/dev-util/selenium-manager/selenium-manager-4.24.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2024 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}
+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/${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-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="telemetry test"
+RESTRICT="!test? ( test )"
+
+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/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/stable_browser_tests.rs || die
+	rm tests/webview_tests.rs || die
+}
+
+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/sh/Manifest b/dev-util/sh/Manifest
index d83812ede7c3..e724fc45efef 100644
--- a/dev-util/sh/Manifest
+++ b/dev-util/sh/Manifest
@@ -2,3 +2,5 @@ DIST sh-3.7.0-deps.tar.xz 9776560 BLAKE2B 2376bba34d0b57897f748ce277b8c40da2ac98
 DIST sh-3.7.0.tar.gz 219380 BLAKE2B 5de1f5576f3e92f5cc892da730b62640b0922f879005e844b3e0b0d84a4e8f1a5f76e89c53152dd3de11c67da20411c5bddd44627ab31b66a72f950b1bf03393 SHA512 5869b68d4bb59907ff7543019e02e8e1efee5963475763b2b2daf0b1ef8621d919d54978a50e52d865b5b76b188c821fecb673e6a9ce42b30cd9907a020e6387
 DIST sh-3.8.0-deps.tar.xz 3129756 BLAKE2B e8a7a6f4a699b55d2b2533065ff0030777fddcb444606889cbf0b811715e89af8f97fb28d1ed71e8bb9ee07517cf71930c03151c2f102c316902e6b55141ee85 SHA512 1bb8776d308aea471051002ba2c426d6a59b354e3615561e33f42938c55472e402b037651db8307d593be0489df30a0d99be3a4e0d75972a85266facebdab32e
 DIST sh-3.8.0.tar.gz 221631 BLAKE2B b2235c88d2601c0c223b8bc55682ee7490da7bf97696fdf3fa32787e5ef123bf4072e281daf29851695b590fe93f7bf180b03558974ad726fab10f799881ec92 SHA512 fbeba1883f9458c480663c31d51beaffb780205f5251cae956f6582d494109e21e062e444f7436db220fb647e833ec48498fa1f75daa7fa7ec88ba1f564d4213
+DIST sh-3.9.0-deps.tar.xz 3099656 BLAKE2B 8ec6608ba97825e9d4589978c76464777c276d02a56d5a27e08469aaa88791e42e633618c6b01025c981e3ef4f819e27cd155765b7dce9547561ceb33dbd57f7 SHA512 78412277e7882b8d68adbc71011646e0b189371bd6e033ed783c4ee7bf48fce5249c5e6fc25b6c700634a000053b92b2e8fb2ebebeb7e8285183e59880fba74e
+DIST sh-3.9.0.tar.gz 224822 BLAKE2B b20e46fdc6db39efe54434a455dbd407af63e9b48dd616a895215047990ffcc42e0fabfd93607a0c4f5f50c64cc789616dfb5c8e685443451091cf2b99c7e64e SHA512 8e1ca255223d34fc5cdf8141b99029f1da5e3cdfdaea0c9838d68ed0eb9418b5bf7d363332919a632592c3d433fc40f1ae0b4df6bbfb20ff62d857325c4f10bf
diff --git a/dev-util/sh/sh-3.9.0.ebuild b/dev-util/sh/sh-3.9.0.ebuild
new file mode 100644
index 000000000000..6aa0a0969770
--- /dev/null
+++ b/dev-util/sh/sh-3.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A shell parser, formatter, and interpreter with bash support"
+HOMEPAGE="https://github.com/mvdan/sh"
+SRC_URI="https://github.com/mvdan/sh/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}/${PN//fmt/}-${PV}"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+BDEPEND="app-text/scdoc"
+
+src_compile() {
+	# Not bothering with gosh for now as it's very new
+	# https://github.com/mvdan/sh#gosh
+	ego build ./cmd/shfmt
+	scdoc <cmd/shfmt/shfmt.1.scd >shfmt.1 || die "conversation of man page failed"
+}
+
+src_test() {
+	cd syntax || die
+	ego test -run=-
+}
+
+src_install() {
+	dobin shfmt
+	doman shfmt.1
+}
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
index d0ba40d7e45e..b7691c9aca78 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.290.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index c9084d446fd0..a012b8faa92a 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -3,3 +3,4 @@ DIST spirv-llvm-translator-16.0.0.tar.gz 1542060 BLAKE2B bee72a776062266e60c5237
 DIST spirv-llvm-translator-17.0.0.tar.gz 1601166 BLAKE2B c3e7a78fa55cd13ba61c024e2d3d82c47ac9dbf8c11bcbcf4ddc34a6838fb948885a263fd9af2d0f404b31f4c6e9226c9582e0f65b3220770e1af07cf85f4dac SHA512 ee54e597c678755cb48d677f81184d66616c7be934b570e04f0106e64c15f1cab124177b757f08a7713fa7fce981c74d61304d4554e6d198e6c14c53abf1e81c
 DIST spirv-llvm-translator-18.1.2.tar.gz 1694843 BLAKE2B 13409096e6ae69509a393741d674a89f5468797fd3ce51c06c69a766f1d34ba952b915013f1bc2aff3ea1524e863a81609d7179096a7b8141ded64a6b366546c SHA512 889cdc0960f6029129dad62f7afe6f61b51bed9d8fb9fa6b743318e2243252dce62cbacf71a2b56decec24ce37746b4b4787dd426ad76e2feb74e1781cb070c8
 DIST spirv-llvm-translator-18.1.3.tar.gz 1700577 BLAKE2B 0d92c6259956db9cb4a49c521dff7cbc0c4353ac779372bb92efb8ff4b1aa61d11ec35b56059e9d4ef22170e6550ba6eadd50f07b97811a65c81113758efeec6 SHA512 b47f4ddd2f404aaaa23e7eabe1450e7cc622809fcb0fb8679647b0f06e6340d36fc63286120580277db59e5a95ad61f086d61072adeeb060a5964436dca97186
+DIST spirv-llvm-translator-18.1.4.tar.gz 1701536 BLAKE2B f9326299bd239721752c2b8dacb7ad5b053e189aae2374848c581e3a6110789c4e4078c1efb69bf8fdd01b30df445821130e92c1285b9cb791dbd290f796d183 SHA512 f0f7e9c3e6544707bb20cbda523f6081be42f5acb513d99b326ed0753f8d285bfb301934fa7ea78fc60bcb5672306f0ffb8a7937cc731c2bb08b72f4b7f5ef61
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.3.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.3.ebuild
index d14939439935..6de5b2b03536 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.3.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.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 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
new file mode 100644
index 000000000000..b397ef0e39b5
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic llvm-r1 multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	sys-devel/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/spirv-headers-1.3.280
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		sys-devel/clang:${SLOT}
+	)
+"
+
+PATCHES=(
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555
+	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
+}
+
+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/spirv-tools-1.3.290.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
index 8c5305b6b291..c4648adad53d 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.290.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 8e0f4ef734a6..3a499bd57a31 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,3 +1 @@
-DIST stripe-mock-0.186.0.tar.gz 1617203 BLAKE2B a98ac19f23e9e15514c221df3e857a14bffc261e3e5d93cd8db1f821fdb37a97b49d74b9cadbcf752412b19a9757eed7c1d0e072b33eff83d40cce5d81f303be SHA512 7003eded0bc88442b3b8d66f6f943a2b438da783f1f3c8bccb1dc3c760f090e64faea08efd5ba544be7dc516657616f50040300c78f7ce10f2095d1e36576cc0
-DIST stripe-mock-0.187.0.tar.gz 1664469 BLAKE2B d6e52fcf8b2c32f9e7203f34b7749a5166eefd3fd5a86a499566a47f149b4a94b2bb6144932324b30ab7781d7827aa71a1c9b9ab7d63be9e8ae4b541dbc74bb1 SHA512 b91eee52baf2952d9766af32af02691107986fdf87676684865161127c7262b3f13914a4a41f2de0b76c77a7ae9777b08a828379b8e7c6bc5521f2058475fa65
 DIST stripe-mock-0.188.0.tar.gz 1667602 BLAKE2B 0a26afc1865c2123f4aca4dc8231b74eef43972e8c1f43cb2196529c72feaa0143239c7c74ef34dc9a1cb543eec6ee328a96e45ca4515f488d89452dfbecefc7 SHA512 aaf2ed6619383d7eecdf43e93306b8523f4699ba6e0971724e69c1c0921d0c691ab5211a9e5efb642a7e7dd51324aef2996b663b622a1c346da9d80241a476ee
diff --git a/dev-util/stripe-mock/stripe-mock-0.186.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.186.0.ebuild
deleted file mode 100644
index c010548e4abc..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.186.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
-
-inherit go-module
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock/"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin stripe-mock
-	einstalldocs
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.187.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.187.0.ebuild
deleted file mode 100644
index 352d14e2ce00..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.187.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
-
-inherit go-module
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock/"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin stripe-mock
-	einstalldocs
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.188.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.188.0.ebuild
index 352d14e2ce00..c010548e4abc 100644
--- a/dev-util/stripe-mock/stripe-mock-0.188.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.188.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 src_compile() {
 	emake build
diff --git a/dev-util/tbump/Manifest b/dev-util/tbump/Manifest
new file mode 100644
index 000000000000..50c1e89755df
--- /dev/null
+++ b/dev-util/tbump/Manifest
@@ -0,0 +1 @@
+DIST tbump-6.11.0.tar.gz 28642 BLAKE2B 2e45fbf1d3e824b0f63f79db0928895488fb06a657c85335235d9aede8576f12bc2e8be58006e2883fb8d639d63029decdc7377dfaeda5d87475e505a4a22fe2 SHA512 3bcd6d34dab2f323dba45dd29053da5a75b5ec9f88aad1d50a2dd1a1d43fe7200bc58742c56249dd167b12e9dc599783eba93adac52e7d87aaa2e7e74f43a532
diff --git a/dev-util/tbump/metadata.xml b/dev-util/tbump/metadata.xml
new file mode 100644
index 000000000000..59e126ffa3be
--- /dev/null
+++ b/dev-util/tbump/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/your-tools/tbump/issues/</bugs-to>
+    <remote-id type="github">your-tools/tbump</remote-id>
+    <remote-id type="pypi">tbump</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/tbump/tbump-6.11.0.ebuild b/dev-util/tbump/tbump-6.11.0.ebuild
new file mode 100644
index 000000000000..b0ca5dc36fb9
--- /dev/null
+++ b/dev-util/tbump/tbump-6.11.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="poetry"
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="tbump helps you bump the version of your project easily"
+HOMEPAGE="https://github.com/your-tools/tbump/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/your-tools/tbump.git"
+else
+	inherit pypi
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/cli-ui[${PYTHON_USEDEP}]
+	dev-python/schema[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	"tbump/test/test_api.py"
+	"tbump/test/test_cli.py"
+	"tbump/test/test_file_bumper.py::test_file_bumper_preserve_endings"
+	"tbump/test/test_file_bumper.py::test_file_bumper_simple"
+	"tbump/test/test_git_bumper.py"
+	"tbump/test/test_hooks.py"
+	"tbump/test/test_init.py"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 35f0014abeb8..ad678171e716 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1 +1,2 @@
 DIST trace-cmd-v3.2.tar.gz 342848 BLAKE2B d82309b72d00ae1b757039c7a358e7703c9e74527112baa05eb44f971067b1189b7833621766fdf8affc812b84b7bcfd071b2946495197d81a8ed8ff7240779e SHA512 6a8474e619b32ccf60217eba1ce472bdf6e77f6aff118b579f329b49eaf1b20c9a7802b539876be7c782f33dc78587cc510c7b4bf12af5707bfa2813e59ae442
+DIST trace-cmd-v3.3.tar.gz 363405 BLAKE2B bc77ced96d47fe8284ad2252b7f6e51ae73b248a41908f255db68277ffccb35b34ede9a5e85f5f284b701c40b009f2d0ca091fb7db554793ae1470d6585e07ed SHA512 0857bea0bceb196bdb44164eefb8a05384c640f5a4d569dcbf26d80302b21bf17880eaba07c3da81c8812abe0f451219c26ba02b7bf9103eb1d0e88f1da84703
diff --git a/dev-util/trace-cmd/trace-cmd-3.3.ebuild b/dev-util/trace-cmd/trace-cmd-3.3.ebuild
new file mode 100644
index 000000000000..707678e7fb7a
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-3.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit linux-info meson python-single-r1
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Tests segfault for now?
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	>=app-arch/zstd-1.4
+	>=dev-libs/libtracefs-1.8
+	>=dev-libs/libtraceevent-1.6.3
+	sys-libs/zlib
+	sys-process/audit
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+"
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
+	linux-info_pkg_setup
+
+	# TODO: Once we have options for doc+tests, we can revisit Python being
+	# single-impl.
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Due to the in-progress meson build transaction, we decide to separate
+	# the libtracecmd as an independent package, see bug #909439
+	# Note: dev-util/trace-cmd still use in-source static libtracecmd duo to
+	# it still use internal private API.
+	sed -i -e "/^libtracecmd_standalone_build/s/true/false/" \
+		"${S}"/lib/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dasciidoctor=false
+		$(meson_use python)
+	)
+
+	# TODO: udis86 isn't wired up to meson at all
+	# TODO: get docs & tests optional upstream
+	# TODO: audit/zstd/zlib lack meson options for now. Previously, the situation
+	# was somewhat automagic, so this isn't a huge loss for now, but we should
+	# upstream some build options for these.
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use python && python_install
+
+	# TODO: fix bash completion name
+	mv "${D}"/usr/share/bash-completion/completions/${PN}.bash \
+		"${D}"/usr/share/bash-completion/completions/${PN} || die
+}
+
+python_install() {
+	python_optimize "${D}$(python_get_sitedir)"
+}
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index d1c1490d67f4..01db623f3bb2 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -1,7 +1,4 @@
-DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95 SHA512 a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856
-DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36
-DIST tree-sitter-0.22.5.tar.gz 3035094 BLAKE2B f54b16e2421ad68fd34b5bada767010be4224652f5a138f7afcdbc15ebaae98dfe3cc8ac77e5e8e5ab12cef516464d29e38a23fc895fa966d5a03a9569fa5ffc SHA512 cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c
 DIST tree-sitter-0.22.6.tar.gz 3036954 BLAKE2B f109a738214882e63a721e8db384fa42a624af78d42ceb9ab7a45135b36cf3bbbd2554f470ca5038404365f5b9dbf9979c4d26309e123a9d9533feb1f0a3f724 SHA512 bf0b87bb9ce16b049824e53933986ac451a7b7f432df39ee9d4546627d740ae689af9e838a53cc50e29d66d6d85d51dab7490d66a429a14bcc9d0b8e2935a63a
-DIST tree-sitter-cli-0.22.2-crates.tar.xz 21937812 BLAKE2B faa8e5d5627397a9f613078ab25bc12a7103ceb16ae195f687c47c222139ca27833d6ed16ffc7bafa30b7eeeb9aa206b23f0e45cd11bf34a265861ec3ea15cd9 SHA512 499dedb899a6fc3847be59d0cf5f81a4c93aacd9a12dc1420a0667842fccae5b2ad3e790e89d9b813b6dba4e1a6d7add3b0c4e7f1590402f3b49bfff07e15999
-DIST tree-sitter-cli-0.22.4-crates.tar.gz 51254931 BLAKE2B 1cc056f503353ce594726af8c5d7aff2e85d8c79ecb691894d371586735b80a3a7fe278516a43597121f6c4613a9d31a2acd85573fe3a0f0719f64ab1829c1bf SHA512 6a031c9ca8b0db10281d59579120b972c9f9d3899762222bfc8018c0d74b5e339bcbb1d5349a95385571aaeb975080470a92ca685d0f9037550f73bdf503d7de
+DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f0bdb17c5fde796d8d65f8bc84a6e054d86c18a42e66e8effef865f95013c38ff6bd6ab5498a680ae172d7d57020604e SHA512 ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9
 DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408dd473d97b2d7a87c9c37a50fb108e164074641e656cc2ca322914f98d627209485cf7b14f92280a50a64cf5136f8375e5870d2b097f SHA512 a3e6eb6585d61c86e32de21c0422c2cd1f95c6116823f5a8ee291f6682658fb7afe5e1369eda4682d4e842d91531b56e6fadb99e4d575230f4c1d65a6b0778ca
+DIST tree-sitter-cli-0.23.0-crates.tar.xz 18131480 BLAKE2B 796a05ed87ce0f248491600bee4af9d14ba6a244ce04d4cda3192226c5063be921e2a4c5e454c91f712f629481c6cca160544a457cf7635c6024d0d10291e3a0 SHA512 98472d6603d973c34f1cafc042219495228693a0fbbe9af920120d8cf27fd78e5263052fb784c79b38e8b27f9b881d18205ebb439de15945c3f10410590ed76a
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2-r1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2-r1.ebuild
deleted file mode 100644
index c3cd05c81b40..000000000000
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2-r1.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
-
-MY_PN=tree-sitter
-MY_P=${MY_PN}-${PV}
-
-CRATES="
-"
-inherit cargo
-
-DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
-	${CARGO_CRATE_URIS}
-	https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
-S="${WORKDIR}"/${MY_P}/cli
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Test seems to require files (grammar definitions) that we don't have.
-RESTRICT="test"
-
-BDEPEND="~dev-libs/tree-sitter-${PV}:="
-RDEPEND="${BDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.4-r1.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.4-r1.ebuild
deleted file mode 100644
index 8d62016ff1f2..000000000000
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.4-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
-
-MY_PN=tree-sitter
-MY_P=${MY_PN}-${PV}
-
-inherit cargo
-
-DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
-	https://dev.gentoo.org/~matthew/distfiles/${P}-crates.tar.gz"
-S="${WORKDIR}"/${MY_P}/cli
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Test seems to require files (grammar definitions) that we don't have.
-RESTRICT="test"
-
-BDEPEND="~dev-libs/tree-sitter-${PV}:="
-RDEPEND="${BDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.ebuild
deleted file mode 100644
index 2cde78e94590..000000000000
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.5.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_PN=tree-sitter
-MY_P=${MY_PN}-${PV}
-
-inherit cargo
-
-DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
-	https://dev.gentoo.org/~matthew/distfiles/${PN}-0.22.4-crates.tar.gz"
-S="${WORKDIR}"/${MY_P}/cli
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Test seems to require files (grammar definitions) that we don't have.
-RESTRICT="test"
-
-BDEPEND="~dev-libs/tree-sitter-${PV}:="
-RDEPEND="${BDEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
new file mode 100644
index 000000000000..1fe76acc30bb
--- /dev/null
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+MY_PN=tree-sitter
+MY_P=${MY_PN}-${PV}
+
+inherit cargo
+
+DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-util/${PN}/${P}-crates.tar.xz"
+S="${WORKDIR}"/${MY_P}/cli
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Test seems to require files (grammar definitions) that we don't have.
+RESTRICT="test"
+
+BDEPEND="~dev-libs/tree-sitter-${PV}:="
+RDEPEND="${BDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index cd14efaa9bfb..5235605626d7 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,2 +1,2 @@
 DIST uglifyjs-3.16.1.tar.gz 519333 BLAKE2B 6e4978aa776256be575ea91fd6cd584fe8885886300db1b77cc889af5112615175cd40d527ac6356d653e60ab3ed404670355f80e0391da538313b494bb1104b SHA512 e0ef3e2b82cb6f211120b1d66132b5b5b13bc48dd946d7e7bbeddd1bee16330c9a3541d07f51b6eddf9036b0e520a527849ddc3cf6de467331b42f1fba37e66e
-DIST uglifyjs-3.19.2.tar.gz 550893 BLAKE2B 54bf9d7a6e2c613bbb8d8508aed68aad94f6583ebe5d5c7d433f55798e57257e8c94fc5bf07894fe2b86663e14ba2c10af349e8c58052dcf021524d91c54cc5b SHA512 3389f94aa31d2666204b144086e325f2da769c0350d5915bb8f9d918bcc9754df4cb3b90636fdcf21b1cea728a69430a2f0c10d9443849817b2c09e290600912
+DIST uglifyjs-3.19.3.tar.gz 551393 BLAKE2B 7be5784b3f32af9074cae3640a60da9074c518dafc79e3caed424cbe7d2f0a89e87558a80a1419943cf625fe0405ba09184ee3ad251392c4b05936fa0fb1e3d0 SHA512 edb271ca1d0dfe1056f066a7bba800c89f466fffbdc742d3ba11843d49bfa15ef1d31719a4cdc04915a26dbee46d329581f4a9e8cba0a2585520b83e7dd629a8
diff --git a/dev-util/uglifyjs/uglifyjs-3.19.2.ebuild b/dev-util/uglifyjs/uglifyjs-3.19.3.ebuild
index 807948cccc88..807948cccc88 100644
--- a/dev-util/uglifyjs/uglifyjs-3.19.2.ebuild
+++ b/dev-util/uglifyjs/uglifyjs-3.19.3.ebuild
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 447002287093..15af8e7a56b3 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,4 +1,3 @@
 DIST nashorn-core-15.4.jar 2167292 BLAKE2B f40349e9f369eed1bb3795622ffe9353c98f35df1d5c2f5f3845d8f1fd5ecea553e11da15d17b9083f6ae2efa4485df131a9a9216499f1c7d440ca4b1d772a2b SHA512 3b560e1ae67d5d5d19250849dee3f813d2c801e56ba85d90439a067378a47f95020910da85b7c8afb6675ea2e25cd274953483efd07e89097656aadc804c8020
 DIST nb190_platform_20231030.zip 26056691 BLAKE2B 7815c08ad60515e8018336452e24c2fb0743d1ef48c58ffd80d371000fa664f8f0053a4c1d56a012b9e50f6714a44c300a915061afebd586f9438abae7867447 SHA512 779256d678c9a13dde4314a5771480c450ae86c49e80ac99eb90a4e9e32e3bc5759128f60a610aecc3ce9e7dbce56b0076b528c8f18a682ebac2dd74cb5a6eea
-DIST visualvm-2.1.8.tar.gz 11630256 BLAKE2B 503866654d969ef127455ce6d3c5d087c7543e100cb8bd8712d15dc3d0530ee3fd31ee571837be9dfe99cb01cbf0ebf7a29084cb16b80d9ebbf5ebc2654f945b SHA512 34329db8be5ab6727d1500e4a7bb07af704c6f815912418bd5fa0a872671f53237054c8fc13129124e5bb8c953bc31a47bb7c857962aa9ed080f16d2b6965331
 DIST visualvm-2.1.9.tar.gz 11781212 BLAKE2B e924134e211a7f0a95d299f21dab2fff35fb0c0f646ea25adc0eb1204628fbec752075380dc6f717ff902f566040cf9ed8186b1470f9277d39742e288142de67 SHA512 ed950c6216185b9d09ed0605729cd02b649df32fef0f204066419bf96f61f63887b7bad082e5434e740f23856270be2b5c0bd35aa825511cb35486059592b3e7
diff --git a/dev-util/visualvm/visualvm-2.1.8.ebuild b/dev-util/visualvm/visualvm-2.1.8.ebuild
deleted file mode 100644
index 8f7769ac553c..000000000000
--- a/dev-util/visualvm/visualvm-2.1.8.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NBV=190
-NBT=20231030
-NBZ=nb${NBV}_platform_${NBT}.zip
-ASM_UTIL_VERSION="9.5"
-ASM_UTIL_FILE="asm-util-${ASM_UTIL_VERSION}.jar"
-FLIGHT_RECORDER_VERSION="8.3.1"
-FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar"
-COMMON_VERSION="8.3.1"
-COMMON_FILE="common-${COMMON_VERSION}.jar"
-ENCODER_VERSION="1.2.3"
-ENCODER_FILE="encoder-${ENCODER_VERSION}.jar"
-LZ4_JAVA_VERSION="1.8.0"
-LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar"
-NASHORN_CORE_VERSION="15.4"
-NASHORN_CORE_FILE="nashorn-core-${NASHORN_CORE_VERSION}.jar"
-
-inherit java-pkg-2 java-ant-2 desktop
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}
-	https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/${NASHORN_CORE_VERSION}/${NASHORN_CORE_FILE}"
-S="${WORKDIR}/${P}/${PN}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="amd64"
-
-COMMON_DEPEND="
-	dev-java/jmc:0
-	dev-java/lz4-java:0
-	dev-java/owasp-java-encoder:0
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-java/asm:9
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/junit:4
-	dev-java/junit:5
-	dev-java/testng:0
-	>=virtual/jre-1.8:*"
-
-# it does not compile with java 11
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/jdk:1.8"
-
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="
-	/usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-	/usr/share/visualvm/platform/modules/lib/libflatlaf-linux-x86_64.so
-	/usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so
-"
-
-EANT_BUILD_TARGET=build
-EANT_EXTRA_ARGS="-Dext.binaries.downloaded=true"
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	unpack ${NBZ}
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-
-	# link in external libraries
-	ln -s "${DISTDIR}/${NASHORN_CORE_FILE}" nashorn.jdk15/external || die "Failed to link nashorn core jar"
-	java-pkg_jar-from --into nashorn.jdk15/external asm-9 asm-util.jar ${ASM_UTIL_FILE} \
-		|| die "Failed to link asm util jar"
-	java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \
-		|| die "Failed to link jmc common jar"
-	java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \
-		|| die "Failed to link jmc flightrecorder jar"
-	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
-		|| die "Failed to link lz4 java jar"
-	java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \
-		|| die "Failed to link owasp-java-encoder jar"
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins launcher/visualvm.conf ${PN}.conf
-	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to update userdir"
-	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to update cachedir"
-	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to set jdk detection"
-
-	# replace bundled stuff
-	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die
-	for name in asm{,-commons,-tree}; do
-		rm ${name}-9.5.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die
-	done
-	popd > /dev/null
-
-	pushd "${ED}/${INSTALL_DIR}/platform/modules/ext" > /dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar || die
-	rm jcommander-1.78.jar && java-pkg_jar-from jcommander jcommander.jar jcommander-1.78.jar || die
-	for name in jna{,-platform}; do
-		rm ${name}-5.12.1.jar && java-pkg_jar-from jna-4 ${name}.jar ${name}-5.12.1.jar || die
-	done
-	rm junit-4.13.2.jar && java-pkg_jar-from junit-4 junit.jar junit-4.13.2.jar || die
-	for name in junit-jupiter-{api,engine,params}; do
-		rm ${name}-5.6.0.jar && java-pkg_jar-from junit-5 ${name}.jar ${name}-5.6.0.jar || die
-	done
-	rm testng-6.14.3.jar && java-pkg_jar-from testng testng.jar testng-6.14.3.jar || die
-	popd > /dev/null
-
-	pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die
-	rm ${ASM_UTIL_FILE} && java-pkg_jar-from asm-9 asm-util.jar ${ASM_UTIL_FILE} || die
-	rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die
-	rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die
-	rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die
-	rm ${ENCODER_FILE} && java-pkg_jar-from owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} || die
-	popd > /dev/null
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.1.9-r1.ebuild b/dev-util/visualvm/visualvm-2.1.9-r1.ebuild
new file mode 100644
index 000000000000..69e6155048e4
--- /dev/null
+++ b/dev-util/visualvm/visualvm-2.1.9-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NBV=190
+NBT=20231030
+NBZ=nb${NBV}_platform_${NBT}.zip
+ASM_UTIL_VERSION="9.5"
+ASM_UTIL_FILE="asm-util-${ASM_UTIL_VERSION}.jar"
+FLIGHT_RECORDER_VERSION="8.3.1"
+FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar"
+COMMON_VERSION="8.3.1"
+COMMON_FILE="common-${COMMON_VERSION}.jar"
+ENCODER_VERSION="1.2.3"
+ENCODER_FILE="encoder-${ENCODER_VERSION}.jar"
+LZ4_JAVA_VERSION="1.8.0"
+LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar"
+NASHORN_CORE_VERSION="15.4"
+NASHORN_CORE_FILE="nashorn-core-${NASHORN_CORE_VERSION}.jar"
+
+inherit java-pkg-2 desktop
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/oracle/${PN}/releases/download/2.1.8/${NBZ}
+	https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/${NASHORN_CORE_VERSION}/${NASHORN_CORE_FILE}"
+S="${WORKDIR}/${P}/${PN}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="
+	app-arch/unzip
+	>=dev-java/ant-1.10.14-r3:0
+"
+
+COMMON_DEPEND="
+	dev-java/jmc:0
+	dev-java/lz4-java:0
+	dev-java/owasp-java-encoder:0
+"
+
+# it does not compile with java 11
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/jdk:1.8
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!dev-util/visualvm:7
+	dev-java/asm:9
+	dev-java/hamcrest-core:1.3
+	dev-java/jcommander:0
+	dev-java/jna:4
+	dev-java/junit:4
+	dev-java/junit:5
+	dev-java/testng:0
+	>=virtual/jre-1.8:*
+"
+
+QA_PREBUILT="
+	/usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
+	/usr/share/visualvm/platform/modules/lib/libflatlaf-linux-x86_64.so
+	/usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so
+"
+
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	unpack ${NBZ}
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+
+	# link in external libraries
+	ln -s "${DISTDIR}/${NASHORN_CORE_FILE}" nashorn.jdk15/external || die "Failed to link nashorn core jar"
+	java-pkg_jar-from --into nashorn.jdk15/external asm-9 asm-util.jar ${ASM_UTIL_FILE} \
+		|| die "Failed to link asm util jar"
+	java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \
+		|| die "Failed to link jmc common jar"
+	java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \
+		|| die "Failed to link jmc flightrecorder jar"
+	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
+		|| die "Failed to link lz4 java jar"
+	java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \
+		|| die "Failed to link owasp-java-encoder jar"
+}
+
+src_compile() {
+	eant -v \
+		-Dext.binaries.downloaded=true \
+		-Dant.build.javac.source="8" \
+		-Dant.build.javac.target="8" \
+		build
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{harness,platform}
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins launcher/visualvm.conf ${PN}.conf
+	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" \
+		"${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
+	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" \
+		"${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
+	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \
+		|| die "Failed to set jdk detection"
+
+	# replace bundled stuff
+	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die
+	for name in asm{,-commons,-tree}; do
+		rm ${name}-9.5.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die
+	done
+	popd > /dev/null
+
+	pushd "${ED}/${INSTALL_DIR}/platform/modules/ext" > /dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar || die
+	rm jcommander-1.78.jar && java-pkg_jar-from jcommander jcommander.jar jcommander-1.78.jar || die
+	for name in jna{,-platform}; do
+		rm ${name}-5.12.1.jar && java-pkg_jar-from jna-4 ${name}.jar ${name}-5.12.1.jar || die
+	done
+	rm junit-4.13.2.jar && java-pkg_jar-from junit-4 junit.jar junit-4.13.2.jar || die
+	for name in junit-jupiter-{api,engine,params}; do
+		rm ${name}-5.6.0.jar && java-pkg_jar-from junit-5 ${name}.jar ${name}-5.6.0.jar || die
+	done
+	rm testng-6.14.3.jar && java-pkg_jar-from testng testng.jar testng-6.14.3.jar || die
+	popd > /dev/null
+
+	pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die
+	rm ${ASM_UTIL_FILE} && java-pkg_jar-from asm-9 asm-util.jar ${ASM_UTIL_FILE} || die
+	rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die
+	rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die
+	rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die
+	rm ${ENCODER_FILE} && java-pkg_jar-from owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} || die
+	popd > /dev/null
+
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
+
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-util/visualvm/visualvm-2.1.9.ebuild b/dev-util/visualvm/visualvm-2.1.9.ebuild
deleted file mode 100644
index 4a81848ea960..000000000000
--- a/dev-util/visualvm/visualvm-2.1.9.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NBV=190
-NBT=20231030
-NBZ=nb${NBV}_platform_${NBT}.zip
-ASM_UTIL_VERSION="9.5"
-ASM_UTIL_FILE="asm-util-${ASM_UTIL_VERSION}.jar"
-FLIGHT_RECORDER_VERSION="8.3.1"
-FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar"
-COMMON_VERSION="8.3.1"
-COMMON_FILE="common-${COMMON_VERSION}.jar"
-ENCODER_VERSION="1.2.3"
-ENCODER_FILE="encoder-${ENCODER_VERSION}.jar"
-LZ4_JAVA_VERSION="1.8.0"
-LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar"
-NASHORN_CORE_VERSION="15.4"
-NASHORN_CORE_FILE="nashorn-core-${NASHORN_CORE_VERSION}.jar"
-
-inherit java-pkg-2 desktop
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/2.1.8/${NBZ}
-	https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/${NASHORN_CORE_VERSION}/${NASHORN_CORE_FILE}"
-S="${WORKDIR}/${P}/${PN}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	app-arch/unzip
-	>=dev-java/ant-1.10.14-r3:0
-"
-
-COMMON_DEPEND="
-	dev-java/jmc:0
-	dev-java/lz4-java:0
-	dev-java/owasp-java-encoder:0
-"
-
-# it does not compile with java 11
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/jdk:1.8
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-java/asm:9
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/junit:4
-	dev-java/junit:5
-	dev-java/testng:0
-	>=virtual/jre-1.8:*
-"
-
-QA_PREBUILT="
-	/usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-	/usr/share/visualvm/platform/modules/lib/libflatlaf-linux-x86_64.so
-	/usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so
-"
-
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	unpack ${NBZ}
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-
-	# link in external libraries
-	ln -s "${DISTDIR}/${NASHORN_CORE_FILE}" nashorn.jdk15/external || die "Failed to link nashorn core jar"
-	java-pkg_jar-from --into nashorn.jdk15/external asm-9 asm-util.jar ${ASM_UTIL_FILE} \
-		|| die "Failed to link asm util jar"
-	java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \
-		|| die "Failed to link jmc common jar"
-	java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \
-		|| die "Failed to link jmc flightrecorder jar"
-	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
-		|| die "Failed to link lz4 java jar"
-	java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \
-		|| die "Failed to link owasp-java-encoder jar"
-}
-
-src_compile() {
-	eant -v \
-		-Dext.binaries.downloaded=true \
-		-Dant.build.javac.source="8" \
-		-Dant.build.javac.target="8" \
-		build
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins launcher/visualvm.conf ${PN}.conf
-	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" \
-		"${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
-	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" \
-		"${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
-	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to set jdk detection"
-
-	# replace bundled stuff
-	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die
-	for name in asm{,-commons,-tree}; do
-		rm ${name}-9.5.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die
-	done
-	popd > /dev/null
-
-	pushd "${ED}/${INSTALL_DIR}/platform/modules/ext" > /dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar || die
-	rm jcommander-1.78.jar && java-pkg_jar-from jcommander jcommander.jar jcommander-1.78.jar || die
-	for name in jna{,-platform}; do
-		rm ${name}-5.12.1.jar && java-pkg_jar-from jna-4 ${name}.jar ${name}-5.12.1.jar || die
-	done
-	rm junit-4.13.2.jar && java-pkg_jar-from junit-4 junit.jar junit-4.13.2.jar || die
-	for name in junit-jupiter-{api,engine,params}; do
-		rm ${name}-5.6.0.jar && java-pkg_jar-from junit-5 ${name}.jar ${name}-5.6.0.jar || die
-	done
-	rm testng-6.14.3.jar && java-pkg_jar-from testng testng.jar testng-6.14.3.jar || die
-	popd > /dev/null
-
-	pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die
-	rm ${ASM_UTIL_FILE} && java-pkg_jar-from asm-9 asm-util.jar ${ASM_UTIL_FILE} || die
-	rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die
-	rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die
-	rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die
-	rm ${ENCODER_FILE} && java-pkg_jar-from owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} || die
-	popd > /dev/null
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/volk/volk-1.3.290.0.ebuild b/dev-util/volk/volk-1.3.290.0.ebuild
index dfe258834e94..444f4ff693fb 100644
--- a/dev-util/volk/volk-1.3.290.0.ebuild
+++ b/dev-util/volk/volk-1.3.290.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild
index 43831b775de1..ffa62447684c 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.290.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
index 1c19288ef980..adffa5d1559b 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.290.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
index 82dd22dc1006..9e52bcfb90cf 100644
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.290.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 95b73bb0bdfe..f60d83496dc1 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,2 +1,2 @@
-DIST wayland-1.22.0.tar.xz 229544 BLAKE2B b0bb366e7f3494813d1574228ae5dd48eccde035120d6dd8709e3a24738681ab9dd9ba6a13924b6a35982d331fa8911fa7346911da9f618be9c9109da0288629 SHA512 fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
 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.22.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
deleted file mode 100644
index f49a052f3c0d..000000000000
--- a/dev-util/wayland-scanner/wayland-scanner-1.22.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 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 ~ia64 ~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-util/wayland-scanner/wayland-scanner-1.23.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
index bea0332f252f..4dcd147d87ce 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.23.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.23.1.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.23.1.ebuild
new file mode 100644
index 000000000000..bea0332f252f
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.23.1.ebuild
@@ -0,0 +1,44 @@
+# 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 ~ia64 ~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-util/weka/weka-3.8.6.ebuild b/dev-util/weka/weka-3.8.6.ebuild
index 035711364244..a548207dc42f 100644
--- a/dev-util/weka/weka-3.8.6.ebuild
+++ b/dev-util/weka/weka-3.8.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P//./-}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/javacup:0"
diff --git a/dev-vcs/git-crypt/Manifest b/dev-vcs/git-crypt/Manifest
index 1dee4d421921..67eb27b5cce9 100644
--- a/dev-vcs/git-crypt/Manifest
+++ b/dev-vcs/git-crypt/Manifest
@@ -1,2 +1 @@
-DIST git-crypt-0.6.0.tar.gz 57584 BLAKE2B 6557121ef4a3f49b2294f7c6268a55323b7ec192b851fac548e76a9301c65655be72f67eecc248205cefcb0184d52a55f8a462ccec0082552fce3115a18b7267 SHA512 06fd9f6dbdc5c9fa9196f3e81a87cd3688089623b2658daf9c98809d5ca14df0b7ca69fdfe8279abf575957c366f2f93bd5a6885092eb533bd0d1ed9fe9dfac5
 DIST git-crypt-0.7.0.tar.gz 57621 BLAKE2B 3307420f2ddeb6742ea53b8e58351dfa68e34e8d83cf6eada626fc9778387c356cd38cfa29f70729ebe39fb9acb9388e489487be7839e40d0a4a47a1b12f4ece SHA512 88eb730f0f0b4622c1a3ce64c62fa97a9a4da0716f4cce86fad8d700e2cb248dae8fc9e92996448564903564dbcddaa1f87201cf7ebc77144660f3044ae92904
diff --git a/dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild b/dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild
deleted file mode 100644
index d1f3a018f685..000000000000
--- a/dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="transparent file encryption in git"
-HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
-SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/openssl:=
-	dev-vcs/git
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	mkdir -p "${D}"/usr/bin || die
-	emake PREFIX="${D}"/usr install
-}
diff --git a/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch b/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch
deleted file mode 100644
index d54c6a7f8223..000000000000
--- a/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/newren/git-filter-repo/issues/523
-https://github.com/newren/git-filter-repo/pull/526
-
-From 1db1650e6e14443a5a8163213434aec5e190f193 Mon Sep 17 00:00:00 2001
-From: Vladimir Petko <vladimir.petko@canonical.com>
-Date: Fri, 8 Dec 2023 15:05:34 +1300
-Subject: [PATCH] support git 2.43
-
-Git 2.43 changes --mark-tags to --[no-]mark-tags and --reencode to --[no-]reencode. Use both options for the detection check.
-
-Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>
---- a/git-filter-repo
-+++ b/git-filter-repo
-@@ -2067,13 +2067,13 @@ EXAMPLES
-     if b'--anonymize-map' not in output: # pragma: no cover
-       global date_format_permissive
-       date_format_permissive = False
--    if b'--mark-tags' not in output: # pragma: no cover
-+    if not any(x in output for x in [b'--mark-tags',b'--[no-]mark-tags']): # pragma: no cover
-       global write_marks
-       write_marks = False
-       if args.state_branch:
-         # We need a version of git-fast-export with --mark-tags
-         raise SystemExit(_("Error: need git >= 2.24.0"))
--    if b'--reencode' not in output: # pragma: no cover
-+    if not any(x in output for x in [b'--reencode',  b'--[no-]reencode']): # pragma: no cover
-       if args.preserve_commit_encoding:
-         # We need a version of git-fast-export with --reencode
-         raise SystemExit(_("Error: need git >= 2.23.0"))
-
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.45.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.45.0.ebuild
index c14b92677a99..e7139cd69a33 100644
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.45.0.ebuild
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.45.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=dev-vcs/git-$(ver_cut 1-2)
+	dev-vcs/git
 "
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-vcs/hg-git/hg-git-1.1.1.ebuild b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
index 3b13b528170f..187e7873942e 100644
--- a/dev-vcs/hg-git/hg-git-1.1.1.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-vcs/mercurial-6.1[${PYTHON_USEDEP}]
diff --git a/dev-vcs/mercurial/files/python3.12.patch b/dev-vcs/mercurial/files/python3.12.patch
new file mode 100644
index 000000000000..ad0e5772739d
--- /dev/null
+++ b/dev-vcs/mercurial/files/python3.12.patch
@@ -0,0 +1,51 @@
+# HG changeset patch
+# User Julien Cristau <jcristau@debian.org>
+# Date 1721983948 -7200
+#      Fri Jul 26 10:52:28 2024 +0200
+# Branch stable
+# Node ID 63ede7a43a3731fecc7e5b535144c6bd59911284
+# Parent  e6508d1e0b47fb5437a36e1f5fe00dc032991b9b
+demandimport: don't delay threading import
+
+A recent cpython change breaks demandimport by importing threading
+locally in importlib.util.LazyLoader.exec_module; add it (plus warnings
+and _weakrefset, which are imported by threading) to demandimport's
+ignore list.
+
+```
+Traceback (most recent call last):
+  File "/usr/bin/hg", line 57, in <module>
+    from mercurial import dispatch
+  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
+  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
+  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
+  File "/usr/lib/python3/dist-packages/hgdemandimport/demandimportpy3.py", line 52, in exec_module
+    super().exec_module(module)
+  File "<frozen importlib.util>", line 257, in exec_module
+  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
+  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
+  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
+  File "/usr/lib/python3/dist-packages/hgdemandimport/demandimportpy3.py", line 52, in exec_module
+    super().exec_module(module)
+  File "<frozen importlib.util>", line 267, in exec_module
+AttributeError: partially initialized module 'threading' has no attribute 'RLock' (most likely due to a circular import)
+```
+
+Ref: https://github.com/python/cpython/issues/117983
+     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076449
+     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076747
+
+diff --git a/hgdemandimport/__init__.py b/hgdemandimport/__init__.py
+--- a/hgdemandimport/__init__.py
++++ b/hgdemandimport/__init__.py
+@@ -58,6 +58,10 @@
+     # setuptools uses this hack to inject it's own distutils at import time
+     'setuptools',
+     '_distutils_hack.override',
++    # threading is locally imported by importlib.util.LazyLoader.exec_module
++    '_weakrefset',
++    'warnings',
++    'threading',
+ }
+ 
+ _pypy = '__pypy__' in sys.builtin_module_names
diff --git a/dev-vcs/mercurial/mercurial-6.5.3-r1.ebuild b/dev-vcs/mercurial/mercurial-6.5.3-r1.ebuild
new file mode 100644
index 000000000000..be2e9ed6132c
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-6.5.3-r1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	adler-1.0.2
+	ahash-0.8.2
+	aho-corasick-0.7.19
+	android_system_properties-0.1.5
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bitmaps-2.1.0
+	block-buffer-0.9.0
+	block-buffer-0.10.3
+	bumpalo-3.11.1
+	byteorder-1.4.3
+	bytes-cast-0.3.0
+	bytes-cast-derive-0.2.0
+	cc-1.0.76
+	cfg-if-1.0.0
+	chrono-0.4.23
+	clap-4.0.24
+	clap_derive-4.0.21
+	clap_lex-0.3.0
+	codespan-reporting-0.11.1
+	convert_case-0.4.0
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.5
+	cpython-0.7.1
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.11
+	crossbeam-utils-0.8.12
+	crypto-common-0.1.6
+	ctor-0.1.26
+	cxx-1.0.81
+	cxx-build-1.0.81
+	cxxbridge-flags-1.0.81
+	cxxbridge-macro-1.0.81
+	derive_more-0.99.17
+	diff-0.1.13
+	digest-0.9.0
+	digest-0.10.5
+	either-1.8.0
+	env_logger-0.9.3
+	fastrand-1.8.0
+	flate2-1.0.24
+	format-bytes-0.3.0
+	format-bytes-macros-0.4.0
+	generic-array-0.14.6
+	getrandom-0.1.16
+	getrandom-0.2.8
+	hashbrown-0.13.1
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.4.3
+	home-0.5.4
+	humantime-2.1.0
+	iana-time-zone-0.1.53
+	iana-time-zone-haiku-0.1.1
+	im-rc-15.1.0
+	instant-0.1.12
+	itertools-0.10.5
+	jobserver-0.1.25
+	js-sys-0.3.60
+	lazy_static-1.4.0
+	libc-0.2.137
+	libm-0.2.6
+	libz-sys-1.1.8
+	link-cplusplus-1.0.7
+	log-0.4.17
+	logging_timer-1.1.0
+	logging_timer_proc_macros-1.1.0
+	memchr-2.5.0
+	memmap2-0.5.8
+	memoffset-0.6.5
+	miniz_oxide-0.5.4
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.14.0
+	once_cell-1.16.0
+	opaque-debug-0.3.0
+	os_str_bytes-6.4.0
+	output_vt100-0.1.3
+	paste-1.0.9
+	pkg-config-0.3.26
+	ppv-lite86-0.2.17
+	pretty_assertions-1.3.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.47
+	python3-sys-0.7.1
+	quote-1.0.21
+	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_distr-0.4.3
+	rand_hc-0.2.0
+	rand_pcg-0.3.1
+	rand_xoshiro-0.6.0
+	rayon-1.7.0
+	rayon-core-1.11.0
+	redox_syscall-0.2.16
+	regex-1.7.0
+	regex-syntax-0.6.28
+	remove_dir_all-0.5.3
+	rustc_version-0.4.0
+	same-file-1.0.6
+	scopeguard-1.1.0
+	scratch-1.0.2
+	self_cell-1.0.0
+	semver-1.0.14
+	sha-1-0.9.8
+	sha-1-0.10.0
+	sized-chunks-0.6.5
+	stable_deref_trait-1.2.0
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.103
+	tempfile-3.3.0
+	termcolor-1.1.3
+	thread_local-1.1.4
+	time-0.1.44
+	twox-hash-1.6.3
+	typenum-1.15.0
+	unicode-ident-1.0.5
+	unicode-width-0.1.10
+	vcpkg-0.2.15
+	vcsgraph-0.2.0
+	version_check-0.9.4
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	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
+	web-sys-0.3.60
+	which-4.3.0
+	whoami-1.4.0
+	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
+	yansi-0.5.1
+	zstd-0.12.3+zstd.1.5.2
+	zstd-safe-6.0.4+zstd.1.5.4
+	zstd-sys-2.0.7+zstd.1.5.4
+"
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+	rust? ( $(cargo_crate_uris ${CRATES}) )"
+
+LICENSE="GPL-2+
+	rust? ( 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+chg emacs gpg test tk rust"
+
+BDEPEND="rust? ( ${RUST_DEPEND} )"
+RDEPEND="
+	app-misc/ca-certificates
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/python3.12.patch" )
+
+src_unpack() {
+	default_src_unpack
+	if use rust; then
+		local S="${S}/rust/hg-cpython"
+		cargo_src_unpack
+	else
+		# Needed because distutils-r1 install under cargo_env if cargo is inherited
+		cargo_gen_config
+	fi
+}
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
+
+	# Build assumes the Rust target directory, which is wrong for us.
+	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
+		Makefile \
+		setup.py \
+		tests/run-tests.py \
+		|| die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	if use rust; then
+		pushd rust/hg-cpython || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	distutils-r1_src_compile
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+	distutils-r1_python_compile build_ext
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use rust; then
+		pushd rust/rhg || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install() {
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+
+	distutils-r1_python_install build_ext
+	python_doscript contrib/hg-ssh
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-make-site-file "${SITEFILE}"
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+	if use rust; then
+		dobin "rust/$(cargo_target_dir)/rhg"
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
+	rm -rf test-removeemptydirs*	# requires access to access parent directories
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	cd tests || die
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-6.5.3.ebuild b/dev-vcs/mercurial/mercurial-6.5.3.ebuild
deleted file mode 100644
index 8c1137cfcd01..000000000000
--- a/dev-vcs/mercurial/mercurial-6.5.3.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-DISTUTILS_USE_PEP517="setuptools"
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	adler-1.0.2
-	ahash-0.8.2
-	aho-corasick-0.7.19
-	android_system_properties-0.1.5
-	atty-0.2.14
-	autocfg-1.1.0
-	bitflags-1.3.2
-	bitmaps-2.1.0
-	block-buffer-0.9.0
-	block-buffer-0.10.3
-	bumpalo-3.11.1
-	byteorder-1.4.3
-	bytes-cast-0.3.0
-	bytes-cast-derive-0.2.0
-	cc-1.0.76
-	cfg-if-1.0.0
-	chrono-0.4.23
-	clap-4.0.24
-	clap_derive-4.0.21
-	clap_lex-0.3.0
-	codespan-reporting-0.11.1
-	convert_case-0.4.0
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	cpython-0.7.1
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.11
-	crossbeam-utils-0.8.12
-	crypto-common-0.1.6
-	ctor-0.1.26
-	cxx-1.0.81
-	cxx-build-1.0.81
-	cxxbridge-flags-1.0.81
-	cxxbridge-macro-1.0.81
-	derive_more-0.99.17
-	diff-0.1.13
-	digest-0.9.0
-	digest-0.10.5
-	either-1.8.0
-	env_logger-0.9.3
-	fastrand-1.8.0
-	flate2-1.0.24
-	format-bytes-0.3.0
-	format-bytes-macros-0.4.0
-	generic-array-0.14.6
-	getrandom-0.1.16
-	getrandom-0.2.8
-	hashbrown-0.13.1
-	heck-0.4.0
-	hermit-abi-0.1.19
-	hex-0.4.3
-	home-0.5.4
-	humantime-2.1.0
-	iana-time-zone-0.1.53
-	iana-time-zone-haiku-0.1.1
-	im-rc-15.1.0
-	instant-0.1.12
-	itertools-0.10.5
-	jobserver-0.1.25
-	js-sys-0.3.60
-	lazy_static-1.4.0
-	libc-0.2.137
-	libm-0.2.6
-	libz-sys-1.1.8
-	link-cplusplus-1.0.7
-	log-0.4.17
-	logging_timer-1.1.0
-	logging_timer_proc_macros-1.1.0
-	memchr-2.5.0
-	memmap2-0.5.8
-	memoffset-0.6.5
-	miniz_oxide-0.5.4
-	num-integer-0.1.45
-	num-traits-0.2.15
-	num_cpus-1.14.0
-	once_cell-1.16.0
-	opaque-debug-0.3.0
-	os_str_bytes-6.4.0
-	output_vt100-0.1.3
-	paste-1.0.9
-	pkg-config-0.3.26
-	ppv-lite86-0.2.17
-	pretty_assertions-1.3.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.47
-	python3-sys-0.7.1
-	quote-1.0.21
-	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_distr-0.4.3
-	rand_hc-0.2.0
-	rand_pcg-0.3.1
-	rand_xoshiro-0.6.0
-	rayon-1.7.0
-	rayon-core-1.11.0
-	redox_syscall-0.2.16
-	regex-1.7.0
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	rustc_version-0.4.0
-	same-file-1.0.6
-	scopeguard-1.1.0
-	scratch-1.0.2
-	self_cell-1.0.0
-	semver-1.0.14
-	sha-1-0.9.8
-	sha-1-0.10.0
-	sized-chunks-0.6.5
-	stable_deref_trait-1.2.0
-	static_assertions-1.1.0
-	strsim-0.10.0
-	syn-1.0.103
-	tempfile-3.3.0
-	termcolor-1.1.3
-	thread_local-1.1.4
-	time-0.1.44
-	twox-hash-1.6.3
-	typenum-1.15.0
-	unicode-ident-1.0.5
-	unicode-width-0.1.10
-	vcpkg-0.2.15
-	vcsgraph-0.2.0
-	version_check-0.9.4
-	wasi-0.9.0+wasi-snapshot-preview1
-	wasi-0.10.0+wasi-snapshot-preview1
-	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
-	web-sys-0.3.60
-	which-4.3.0
-	whoami-1.4.0
-	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
-	yansi-0.5.1
-	zstd-0.12.3+zstd.1.5.2
-	zstd-safe-6.0.4+zstd.1.5.4
-	zstd-sys-2.0.7+zstd.1.5.4
-"
-
-inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
-	rust? ( $(cargo_crate_uris ${CRATES}) )"
-
-LICENSE="GPL-2+
-	rust? ( 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+chg emacs gpg test tk rust"
-
-BDEPEND="rust? ( ${RUST_DEPEND} )"
-RDEPEND="
-	app-misc/ca-certificates
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )"
-
-DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	default_src_unpack
-	if use rust; then
-		local S="${S}/rust/hg-cpython"
-		cargo_src_unpack
-	else
-		# Needed because distutils-r1 install under cargo_env if cargo is inherited
-		cargo_gen_config
-	fi
-}
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
-
-	# Build assumes the Rust target directory, which is wrong for us.
-	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
-		Makefile \
-		setup.py \
-		tests/run-tests.py \
-		|| die
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	if use rust; then
-		pushd rust/hg-cpython || die
-		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
-		popd || die
-	fi
-	distutils-r1_src_compile
-}
-
-python_compile() {
-	filter-flags -ftracer -ftree-vectorize
-	if use rust; then
-		local -x HGWITHRUSTEXT="cpython"
-	fi
-	distutils-r1_python_compile build_ext
-}
-
-python_compile_all() {
-	rm -r contrib/win32 || die
-	if use chg; then
-		emake -C contrib/chg
-	fi
-	if use rust; then
-		pushd rust/rhg || die
-		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
-		popd || die
-	fi
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install() {
-	if use rust; then
-		local -x HGWITHRUSTEXT="cpython"
-	fi
-
-	distutils-r1_python_install build_ext
-	python_doscript contrib/hg-ssh
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	dobin hgeditor
-	if use tk; then
-		dobin contrib/hgk
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-make-site-file "${SITEFILE}"
-	fi
-
-	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
-
-	if use chg; then
-		dobin contrib/chg/chg
-		doman contrib/chg/chg.1
-		RM_CONTRIB+=( chg )
-	fi
-	if use rust; then
-		dobin "rust/$(cargo_target_dir)/rhg"
-	fi
-
-	for f in ${RM_CONTRIB[@]}; do
-		rm -rf contrib/${f} || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-	dodoc CONTRIBUTORS hgweb.cgi
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-largefiles*		# tends to time out
-	rm -f test-https*			# requires to support tls1.0
-	rm -rf test-removeemptydirs*	# requires access to access parent directories
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-convert*
-		rm -f test-lock-badness*
-		rm -f test-permissions*
-		rm -f test-pull-permission*
-		rm -f test-journal-exists*
-		rm -f test-repair-strip*
-	fi
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	cd tests || die
-	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
-		--jobs $(makeopts_jobs) \
-		--timeout 0 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-6.6.2-r1.ebuild b/dev-vcs/mercurial/mercurial-6.6.2-r1.ebuild
new file mode 100644
index 000000000000..f9b1e2544f31
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-6.6.2-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	adler@1.0.2
+	ahash@0.8.2
+	aho-corasick@0.7.19
+	android_system_properties@0.1.5
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitmaps@2.1.0
+	block-buffer@0.9.0
+	block-buffer@0.10.3
+	bumpalo@3.11.1
+	byteorder@1.4.3
+	bytes-cast@0.3.0
+	bytes-cast-derive@0.2.0
+	cc@1.0.76
+	cfg-if@1.0.0
+	chrono@0.4.23
+	clap@4.0.24
+	clap_derive@4.0.21
+	clap_lex@0.3.0
+	codespan-reporting@0.11.1
+	convert_case@0.4.0
+	core-foundation-sys@0.8.3
+	cpufeatures@0.2.5
+	cpython@0.7.1
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.6
+	crossbeam-deque@0.8.2
+	crossbeam-epoch@0.9.11
+	crossbeam-utils@0.8.12
+	crypto-common@0.1.6
+	ctor@0.1.26
+	cxx@1.0.81
+	cxx-build@1.0.81
+	cxxbridge-flags@1.0.81
+	cxxbridge-macro@1.0.81
+	derive_more@0.99.17
+	diff@0.1.13
+	digest@0.9.0
+	digest@0.10.5
+	either@1.8.0
+	env_logger@0.9.3
+	fastrand@1.8.0
+	flate2@1.0.24
+	format-bytes@0.3.0
+	format-bytes-macros@0.4.0
+	generic-array@0.14.6
+	getrandom@0.1.16
+	getrandom@0.2.8
+	hashbrown@0.12.3
+	hashbrown@0.13.1
+	heck@0.4.0
+	hermit-abi@0.1.19
+	hex@0.4.3
+	home@0.5.4
+	humantime@2.1.0
+	iana-time-zone@0.1.53
+	iana-time-zone-haiku@0.1.1
+	im-rc@15.1.0
+	indexmap@1.9.2
+	instant@0.1.12
+	itertools@0.10.5
+	jobserver@0.1.25
+	js-sys@0.3.60
+	lazy_static@1.4.0
+	libc@0.2.137
+	libm@0.2.6
+	libz-sys@1.1.8
+	link-cplusplus@1.0.7
+	log@0.4.17
+	logging_timer@1.1.0
+	logging_timer_proc_macros@1.1.0
+	memchr@2.5.0
+	memmap2@0.5.8
+	memoffset@0.6.5
+	miniz_oxide@0.5.4
+	nom8@0.2.0
+	num-integer@0.1.45
+	num-traits@0.2.15
+	num_cpus@1.14.0
+	once_cell@1.16.0
+	opaque-debug@0.3.0
+	os_str_bytes@6.4.0
+	output_vt100@0.1.3
+	paste@1.0.9
+	pkg-config@0.3.26
+	ppv-lite86@0.2.17
+	pretty_assertions@1.3.0
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.47
+	python3-sys@0.7.1
+	quote@1.0.21
+	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_distr@0.4.3
+	rand_hc@0.2.0
+	rand_pcg@0.3.1
+	rand_xoshiro@0.6.0
+	rayon@1.7.0
+	rayon-core@1.11.0
+	redox_syscall@0.2.16
+	regex@1.7.0
+	regex-syntax@0.6.28
+	remove_dir_all@0.5.3
+	rustc_version@0.4.0
+	same-file@1.0.6
+	scopeguard@1.1.0
+	scratch@1.0.2
+	self_cell@1.0.0
+	semver@1.0.14
+	serde@1.0.152
+	serde_derive@1.0.152
+	serde_spanned@0.6.1
+	sha-1@0.9.8
+	sha-1@0.10.0
+	sized-chunks@0.6.5
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strsim@0.10.0
+	syn@1.0.109
+	tempfile@3.3.0
+	termcolor@1.1.3
+	thread_local@1.1.4
+	time@0.1.44
+	toml@0.6.0
+	toml_datetime@0.5.1
+	toml_edit@0.18.1
+	twox-hash@1.6.3
+	typenum@1.15.0
+	unicode-ident@1.0.5
+	unicode-width@0.1.10
+	vcpkg@0.2.15
+	vcsgraph@0.2.0
+	version_check@0.9.4
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasi@0.10.0+wasi-snapshot-preview1
+	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
+	web-sys@0.3.60
+	which@4.3.0
+	whoami@1.4.0
+	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
+	yansi@0.5.1
+	zstd@0.12.3+zstd.1.5.2
+	zstd-safe@6.0.4+zstd.1.5.4
+	zstd-sys@2.0.7+zstd.1.5.4
+"
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+	rust? ( ${CARGO_CRATE_URIS} )"
+
+LICENSE="GPL-2+
+	rust? (
+		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+chg emacs gpg test tk rust"
+
+BDEPEND="rust? ( ${RUST_DEPEND} )"
+RDEPEND="
+	app-misc/ca-certificates
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/python3.12.patch" )
+
+src_unpack() {
+	default_src_unpack
+	if use rust; then
+		local S="${S}/rust/hg-cpython"
+		cargo_src_unpack
+	else
+		# Needed because distutils-r1 install under cargo_env if cargo is inherited
+		cargo_gen_config
+	fi
+}
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
+
+	# Build assumes the Rust target directory, which is wrong for us.
+	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
+		Makefile \
+		setup.py \
+		tests/run-tests.py \
+		|| die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	if use rust; then
+		pushd rust/hg-cpython || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	distutils-r1_src_compile
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+	distutils-r1_python_compile build_ext
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use rust; then
+		pushd rust/rhg || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install() {
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+
+	distutils-r1_python_install build_ext
+	python_doscript contrib/hg-ssh
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-make-site-file "${SITEFILE}"
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+	if use rust; then
+		dobin "rust/$(cargo_target_dir)/rhg"
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
+	rm -rf test-removeemptydirs*	# requires access to access parent directories
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	cd tests || die
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild
deleted file mode 100644
index ed79e2235c03..000000000000
--- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-DISTUTILS_USE_PEP517="setuptools"
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	adler@1.0.2
-	ahash@0.8.2
-	aho-corasick@0.7.19
-	android_system_properties@0.1.5
-	atty@0.2.14
-	autocfg@1.1.0
-	bitflags@1.3.2
-	bitmaps@2.1.0
-	block-buffer@0.9.0
-	block-buffer@0.10.3
-	bumpalo@3.11.1
-	byteorder@1.4.3
-	bytes-cast@0.3.0
-	bytes-cast-derive@0.2.0
-	cc@1.0.76
-	cfg-if@1.0.0
-	chrono@0.4.23
-	clap@4.0.24
-	clap_derive@4.0.21
-	clap_lex@0.3.0
-	codespan-reporting@0.11.1
-	convert_case@0.4.0
-	core-foundation-sys@0.8.3
-	cpufeatures@0.2.5
-	cpython@0.7.1
-	crc32fast@1.3.2
-	crossbeam-channel@0.5.6
-	crossbeam-deque@0.8.2
-	crossbeam-epoch@0.9.11
-	crossbeam-utils@0.8.12
-	crypto-common@0.1.6
-	ctor@0.1.26
-	cxx@1.0.81
-	cxx-build@1.0.81
-	cxxbridge-flags@1.0.81
-	cxxbridge-macro@1.0.81
-	derive_more@0.99.17
-	diff@0.1.13
-	digest@0.9.0
-	digest@0.10.5
-	either@1.8.0
-	env_logger@0.9.3
-	fastrand@1.8.0
-	flate2@1.0.24
-	format-bytes@0.3.0
-	format-bytes-macros@0.4.0
-	generic-array@0.14.6
-	getrandom@0.1.16
-	getrandom@0.2.8
-	hashbrown@0.12.3
-	hashbrown@0.13.1
-	heck@0.4.0
-	hermit-abi@0.1.19
-	hex@0.4.3
-	home@0.5.4
-	humantime@2.1.0
-	iana-time-zone@0.1.53
-	iana-time-zone-haiku@0.1.1
-	im-rc@15.1.0
-	indexmap@1.9.2
-	instant@0.1.12
-	itertools@0.10.5
-	jobserver@0.1.25
-	js-sys@0.3.60
-	lazy_static@1.4.0
-	libc@0.2.137
-	libm@0.2.6
-	libz-sys@1.1.8
-	link-cplusplus@1.0.7
-	log@0.4.17
-	logging_timer@1.1.0
-	logging_timer_proc_macros@1.1.0
-	memchr@2.5.0
-	memmap2@0.5.8
-	memoffset@0.6.5
-	miniz_oxide@0.5.4
-	nom8@0.2.0
-	num-integer@0.1.45
-	num-traits@0.2.15
-	num_cpus@1.14.0
-	once_cell@1.16.0
-	opaque-debug@0.3.0
-	os_str_bytes@6.4.0
-	output_vt100@0.1.3
-	paste@1.0.9
-	pkg-config@0.3.26
-	ppv-lite86@0.2.17
-	pretty_assertions@1.3.0
-	proc-macro-error@1.0.4
-	proc-macro-error-attr@1.0.4
-	proc-macro2@1.0.47
-	python3-sys@0.7.1
-	quote@1.0.21
-	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_distr@0.4.3
-	rand_hc@0.2.0
-	rand_pcg@0.3.1
-	rand_xoshiro@0.6.0
-	rayon@1.7.0
-	rayon-core@1.11.0
-	redox_syscall@0.2.16
-	regex@1.7.0
-	regex-syntax@0.6.28
-	remove_dir_all@0.5.3
-	rustc_version@0.4.0
-	same-file@1.0.6
-	scopeguard@1.1.0
-	scratch@1.0.2
-	self_cell@1.0.0
-	semver@1.0.14
-	serde@1.0.152
-	serde_derive@1.0.152
-	serde_spanned@0.6.1
-	sha-1@0.9.8
-	sha-1@0.10.0
-	sized-chunks@0.6.5
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strsim@0.10.0
-	syn@1.0.109
-	tempfile@3.3.0
-	termcolor@1.1.3
-	thread_local@1.1.4
-	time@0.1.44
-	toml@0.6.0
-	toml_datetime@0.5.1
-	toml_edit@0.18.1
-	twox-hash@1.6.3
-	typenum@1.15.0
-	unicode-ident@1.0.5
-	unicode-width@0.1.10
-	vcpkg@0.2.15
-	vcsgraph@0.2.0
-	version_check@0.9.4
-	wasi@0.9.0+wasi-snapshot-preview1
-	wasi@0.10.0+wasi-snapshot-preview1
-	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
-	web-sys@0.3.60
-	which@4.3.0
-	whoami@1.4.0
-	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
-	yansi@0.5.1
-	zstd@0.12.3+zstd.1.5.2
-	zstd-safe@6.0.4+zstd.1.5.4
-	zstd-sys@2.0.7+zstd.1.5.4
-"
-
-inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
-	rust? ( ${CARGO_CRATE_URIS} )"
-
-LICENSE="GPL-2+
-	rust? (
-		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+chg emacs gpg test tk rust"
-
-BDEPEND="rust? ( ${RUST_DEPEND} )"
-RDEPEND="
-	app-misc/ca-certificates
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )"
-
-DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	default_src_unpack
-	if use rust; then
-		local S="${S}/rust/hg-cpython"
-		cargo_src_unpack
-	else
-		# Needed because distutils-r1 install under cargo_env if cargo is inherited
-		cargo_gen_config
-	fi
-}
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
-
-	# Build assumes the Rust target directory, which is wrong for us.
-	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
-		Makefile \
-		setup.py \
-		tests/run-tests.py \
-		|| die
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	if use rust; then
-		pushd rust/hg-cpython || die
-		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
-		popd || die
-	fi
-	distutils-r1_src_compile
-}
-
-python_compile() {
-	filter-flags -ftracer -ftree-vectorize
-	if use rust; then
-		local -x HGWITHRUSTEXT="cpython"
-	fi
-	distutils-r1_python_compile build_ext
-}
-
-python_compile_all() {
-	rm -r contrib/win32 || die
-	if use chg; then
-		emake -C contrib/chg
-	fi
-	if use rust; then
-		pushd rust/rhg || die
-		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
-		popd || die
-	fi
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install() {
-	if use rust; then
-		local -x HGWITHRUSTEXT="cpython"
-	fi
-
-	distutils-r1_python_install build_ext
-	python_doscript contrib/hg-ssh
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	dobin hgeditor
-	if use tk; then
-		dobin contrib/hgk
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-make-site-file "${SITEFILE}"
-	fi
-
-	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
-
-	if use chg; then
-		dobin contrib/chg/chg
-		doman contrib/chg/chg.1
-		RM_CONTRIB+=( chg )
-	fi
-	if use rust; then
-		dobin "rust/$(cargo_target_dir)/rhg"
-	fi
-
-	for f in ${RM_CONTRIB[@]}; do
-		rm -rf contrib/${f} || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-	dodoc CONTRIBUTORS hgweb.cgi
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-largefiles*		# tends to time out
-	rm -f test-https*			# requires to support tls1.0
-	rm -rf test-removeemptydirs*	# requires access to access parent directories
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-convert*
-		rm -f test-lock-badness*
-		rm -f test-permissions*
-		rm -f test-pull-permission*
-		rm -f test-journal-exists*
-		rm -f test-repair-strip*
-	fi
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	cd tests || die
-	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
-		--jobs $(makeopts_jobs) \
-		--timeout 0 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-6.7.4-r1.ebuild b/dev-vcs/mercurial/mercurial-6.7.4-r1.ebuild
new file mode 100644
index 000000000000..dcec2faea997
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-6.7.4-r1.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	adler@1.0.2
+	ahash@0.8.2
+	aho-corasick@0.7.19
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitmaps@2.1.0
+	bitvec@1.0.1
+	block-buffer@0.9.0
+	block-buffer@0.10.3
+	bumpalo@3.11.1
+	byteorder@1.4.3
+	bytes-cast@0.3.0
+	bytes-cast-derive@0.2.0
+	cc@1.0.76
+	cfg-if@1.0.0
+	chrono@0.4.34
+	clap@4.0.24
+	clap_derive@4.0.21
+	clap_lex@0.3.0
+	codespan-reporting@0.11.1
+	convert_case@0.4.0
+	core-foundation-sys@0.8.3
+	cpufeatures@0.2.5
+	cpython@0.7.1
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.6
+	crossbeam-deque@0.8.2
+	crossbeam-epoch@0.9.11
+	crossbeam-utils@0.8.12
+	crypto-common@0.1.6
+	ctor@0.1.26
+	cxx@1.0.81
+	cxx-build@1.0.81
+	cxxbridge-flags@1.0.81
+	cxxbridge-macro@1.0.81
+	derive_more@0.99.17
+	diff@0.1.13
+	digest@0.9.0
+	digest@0.10.5
+	either@1.8.0
+	env_logger@0.9.3
+	fastrand@1.8.0
+	flate2@1.0.24
+	format-bytes@0.3.0
+	format-bytes-macros@0.4.0
+	funty@2.0.0
+	generic-array@0.14.6
+	getrandom@0.1.16
+	getrandom@0.2.8
+	hashbrown@0.12.3
+	hashbrown@0.13.1
+	heck@0.4.0
+	hermit-abi@0.1.19
+	hex@0.4.3
+	home@0.5.4
+	humantime@2.1.0
+	iana-time-zone@0.1.53
+	iana-time-zone-haiku@0.1.1
+	im-rc@15.1.0
+	indexmap@1.9.2
+	instant@0.1.12
+	itertools@0.10.5
+	jobserver@0.1.25
+	js-sys@0.3.60
+	lazy_static@1.4.0
+	libc@0.2.137
+	libm@0.2.6
+	libz-sys@1.1.8
+	link-cplusplus@1.0.7
+	log@0.4.17
+	logging_timer@1.1.0
+	logging_timer_proc_macros@1.1.0
+	memchr@2.5.0
+	memmap2@0.5.8
+	memoffset@0.6.5
+	miniz_oxide@0.5.4
+	nom8@0.2.0
+	num-traits@0.2.15
+	num_cpus@1.14.0
+	once_cell@1.16.0
+	opaque-debug@0.3.0
+	os_str_bytes@6.4.0
+	output_vt100@0.1.3
+	paste@1.0.9
+	pkg-config@0.3.26
+	ppv-lite86@0.2.17
+	pretty_assertions@1.3.0
+	proc-macro-error@1.0.4
+	proc-macro-error-attr@1.0.4
+	proc-macro2@1.0.47
+	python3-sys@0.7.1
+	quote@1.0.21
+	radium@0.7.0
+	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_distr@0.4.3
+	rand_hc@0.2.0
+	rand_pcg@0.3.1
+	rand_xoshiro@0.6.0
+	rayon@1.7.0
+	rayon-core@1.11.0
+	redox_syscall@0.2.16
+	regex@1.7.0
+	regex-syntax@0.6.28
+	remove_dir_all@0.5.3
+	rustc_version@0.4.0
+	same-file@1.0.6
+	scopeguard@1.1.0
+	scratch@1.0.2
+	self_cell@1.0.0
+	semver@1.0.14
+	serde@1.0.152
+	serde_derive@1.0.152
+	serde_spanned@0.6.1
+	sha-1@0.9.8
+	sha-1@0.10.0
+	sized-chunks@0.6.5
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strsim@0.10.0
+	syn@1.0.109
+	tap@1.0.1
+	tempfile@3.3.0
+	termcolor@1.1.3
+	thread_local@1.1.4
+	toml@0.6.0
+	toml_datetime@0.5.1
+	toml_edit@0.18.1
+	twox-hash@1.6.3
+	typenum@1.15.0
+	unicode-ident@1.0.5
+	unicode-width@0.1.10
+	vcpkg@0.2.15
+	vcsgraph@0.2.0
+	version_check@0.9.4
+	wasi@0.9.0+wasi-snapshot-preview1
+	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
+	web-sys@0.3.60
+	which@4.3.0
+	whoami@1.4.0
+	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-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
+	wyz@0.5.1
+	yansi@0.5.1
+	zstd@0.12.3+zstd.1.5.2
+	zstd-safe@6.0.4+zstd.1.5.4
+	zstd-sys@2.0.7+zstd.1.5.4
+"
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+	rust? ( ${CARGO_CRATE_URIS} )"
+
+LICENSE="GPL-2+
+	rust? (
+		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+chg emacs gpg test tk rust"
+
+BDEPEND="rust? ( ${RUST_DEPEND} )"
+RDEPEND="
+	app-misc/ca-certificates
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/python3.12.patch" )
+
+src_unpack() {
+	default_src_unpack
+	if use rust; then
+		local S="${S}/rust/hg-cpython"
+		cargo_src_unpack
+	else
+		# Needed because distutils-r1 install under cargo_env if cargo is inherited
+		cargo_gen_config
+	fi
+}
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
+
+	# Build assumes the Rust target directory, which is wrong for us.
+	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
+		Makefile \
+		setup.py \
+		tests/run-tests.py \
+		|| die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	if use rust; then
+		pushd rust/hg-cpython || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	distutils-r1_src_compile
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+	distutils-r1_python_compile build_ext
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use rust; then
+		pushd rust/rhg || die
+		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
+		popd || die
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install() {
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+
+	distutils-r1_python_install build_ext
+	python_doscript contrib/hg-ssh
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-make-site-file "${SITEFILE}"
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+	if use rust; then
+		dobin "rust/$(cargo_target_dir)/rhg"
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
+	rm -rf test-removeemptydirs*	# requires access to access parent directories
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	cd tests || die
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-6.7.4.ebuild b/dev-vcs/mercurial/mercurial-6.7.4.ebuild
deleted file mode 100644
index 6207efb0c49b..000000000000
--- a/dev-vcs/mercurial/mercurial-6.7.4.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-DISTUTILS_USE_PEP517="setuptools"
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	adler@1.0.2
-	ahash@0.8.2
-	aho-corasick@0.7.19
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	atty@0.2.14
-	autocfg@1.1.0
-	bitflags@1.3.2
-	bitmaps@2.1.0
-	bitvec@1.0.1
-	block-buffer@0.9.0
-	block-buffer@0.10.3
-	bumpalo@3.11.1
-	byteorder@1.4.3
-	bytes-cast@0.3.0
-	bytes-cast-derive@0.2.0
-	cc@1.0.76
-	cfg-if@1.0.0
-	chrono@0.4.34
-	clap@4.0.24
-	clap_derive@4.0.21
-	clap_lex@0.3.0
-	codespan-reporting@0.11.1
-	convert_case@0.4.0
-	core-foundation-sys@0.8.3
-	cpufeatures@0.2.5
-	cpython@0.7.1
-	crc32fast@1.3.2
-	crossbeam-channel@0.5.6
-	crossbeam-deque@0.8.2
-	crossbeam-epoch@0.9.11
-	crossbeam-utils@0.8.12
-	crypto-common@0.1.6
-	ctor@0.1.26
-	cxx@1.0.81
-	cxx-build@1.0.81
-	cxxbridge-flags@1.0.81
-	cxxbridge-macro@1.0.81
-	derive_more@0.99.17
-	diff@0.1.13
-	digest@0.9.0
-	digest@0.10.5
-	either@1.8.0
-	env_logger@0.9.3
-	fastrand@1.8.0
-	flate2@1.0.24
-	format-bytes@0.3.0
-	format-bytes-macros@0.4.0
-	funty@2.0.0
-	generic-array@0.14.6
-	getrandom@0.1.16
-	getrandom@0.2.8
-	hashbrown@0.12.3
-	hashbrown@0.13.1
-	heck@0.4.0
-	hermit-abi@0.1.19
-	hex@0.4.3
-	home@0.5.4
-	humantime@2.1.0
-	iana-time-zone@0.1.53
-	iana-time-zone-haiku@0.1.1
-	im-rc@15.1.0
-	indexmap@1.9.2
-	instant@0.1.12
-	itertools@0.10.5
-	jobserver@0.1.25
-	js-sys@0.3.60
-	lazy_static@1.4.0
-	libc@0.2.137
-	libm@0.2.6
-	libz-sys@1.1.8
-	link-cplusplus@1.0.7
-	log@0.4.17
-	logging_timer@1.1.0
-	logging_timer_proc_macros@1.1.0
-	memchr@2.5.0
-	memmap2@0.5.8
-	memoffset@0.6.5
-	miniz_oxide@0.5.4
-	nom8@0.2.0
-	num-traits@0.2.15
-	num_cpus@1.14.0
-	once_cell@1.16.0
-	opaque-debug@0.3.0
-	os_str_bytes@6.4.0
-	output_vt100@0.1.3
-	paste@1.0.9
-	pkg-config@0.3.26
-	ppv-lite86@0.2.17
-	pretty_assertions@1.3.0
-	proc-macro-error@1.0.4
-	proc-macro-error-attr@1.0.4
-	proc-macro2@1.0.47
-	python3-sys@0.7.1
-	quote@1.0.21
-	radium@0.7.0
-	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_distr@0.4.3
-	rand_hc@0.2.0
-	rand_pcg@0.3.1
-	rand_xoshiro@0.6.0
-	rayon@1.7.0
-	rayon-core@1.11.0
-	redox_syscall@0.2.16
-	regex@1.7.0
-	regex-syntax@0.6.28
-	remove_dir_all@0.5.3
-	rustc_version@0.4.0
-	same-file@1.0.6
-	scopeguard@1.1.0
-	scratch@1.0.2
-	self_cell@1.0.0
-	semver@1.0.14
-	serde@1.0.152
-	serde_derive@1.0.152
-	serde_spanned@0.6.1
-	sha-1@0.9.8
-	sha-1@0.10.0
-	sized-chunks@0.6.5
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strsim@0.10.0
-	syn@1.0.109
-	tap@1.0.1
-	tempfile@3.3.0
-	termcolor@1.1.3
-	thread_local@1.1.4
-	toml@0.6.0
-	toml_datetime@0.5.1
-	toml_edit@0.18.1
-	twox-hash@1.6.3
-	typenum@1.15.0
-	unicode-ident@1.0.5
-	unicode-width@0.1.10
-	vcpkg@0.2.15
-	vcsgraph@0.2.0
-	version_check@0.9.4
-	wasi@0.9.0+wasi-snapshot-preview1
-	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
-	web-sys@0.3.60
-	which@4.3.0
-	whoami@1.4.0
-	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-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
-	wyz@0.5.1
-	yansi@0.5.1
-	zstd@0.12.3+zstd.1.5.2
-	zstd-safe@6.0.4+zstd.1.5.4
-	zstd-sys@2.0.7+zstd.1.5.4
-"
-
-inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
-	rust? ( ${CARGO_CRATE_URIS} )"
-
-LICENSE="GPL-2+
-	rust? (
-		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+chg emacs gpg test tk rust"
-
-BDEPEND="rust? ( ${RUST_DEPEND} )"
-RDEPEND="
-	app-misc/ca-certificates
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )"
-
-DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="rust? ( !$(python_gen_useflags 'python3_12') )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-RESTRICT="!test? ( test )"
-
-src_unpack() {
-	default_src_unpack
-	if use rust; then
-		local S="${S}/rust/hg-cpython"
-		cargo_src_unpack
-	else
-		# Needed because distutils-r1 install under cargo_env if cargo is inherited
-		cargo_gen_config
-	fi
-}
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
-
-	# Build assumes the Rust target directory, which is wrong for us.
-	sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \
-		Makefile \
-		setup.py \
-		tests/run-tests.py \
-		|| die
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	if use rust; then
-		pushd rust/hg-cpython || die
-		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
-		popd || die
-	fi
-	distutils-r1_src_compile
-}
-
-python_compile() {
-	filter-flags -ftracer -ftree-vectorize
-	if use rust; then
-		local -x HGWITHRUSTEXT="cpython"
-	fi
-	distutils-r1_python_compile build_ext
-}
-
-python_compile_all() {
-	rm -r contrib/win32 || die
-	if use chg; then
-		emake -C contrib/chg
-	fi
-	if use rust; then
-		pushd rust/rhg || die
-		cargo_src_compile --no-default-features --jobs $(makeopts_jobs)
-		popd || die
-	fi
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install() {
-	if use rust; then
-		local -x HGWITHRUSTEXT="cpython"
-	fi
-
-	distutils-r1_python_install build_ext
-	python_doscript contrib/hg-ssh
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	dobin hgeditor
-	if use tk; then
-		dobin contrib/hgk
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-make-site-file "${SITEFILE}"
-	fi
-
-	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
-
-	if use chg; then
-		dobin contrib/chg/chg
-		doman contrib/chg/chg.1
-		RM_CONTRIB+=( chg )
-	fi
-	if use rust; then
-		dobin "rust/$(cargo_target_dir)/rhg"
-	fi
-
-	for f in ${RM_CONTRIB[@]}; do
-		rm -rf contrib/${f} || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-	dodoc CONTRIBUTORS hgweb.cgi
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-largefiles*		# tends to time out
-	rm -f test-https*			# requires to support tls1.0
-	rm -rf test-removeemptydirs*	# requires access to access parent directories
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-convert*
-		rm -f test-lock-badness*
-		rm -f test-permissions*
-		rm -f test-pull-permission*
-		rm -f test-journal-exists*
-		rm -f test-repair-strip*
-	fi
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	cd tests || die
-	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
-		--jobs $(makeopts_jobs) \
-		--timeout 0 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 547da45e272f..dbcfc3b1067f 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,3 +1 @@
-DIST pre-commit-3.7.0.gh.tar.gz 269999 BLAKE2B 9ca1b2279e1ed753a09c3da83f6de19fc9b36821ba6f642962b9be1da29894e3260c48a2cdb582eb5331543fa6c7e9065d799fde7ab4e84dd54032c2ff84e4a7 SHA512 2a238e74ce2f080914e4403b7ce7b8dbd2a257a736d8292e2ec299c8015d3c4611e51f4be1a95ff2bd29db4888f6997e335346931567e943a8b5d78be7c14725
-DIST pre-commit-3.7.1.gh.tar.gz 270138 BLAKE2B da21e8c05b722985273554bd455d2ea0c113206eb4924c826532b5135805eca143441a237e516fad1275b4c9886d53cb3757d5fefd53613e1f1a1b4da8d7847d SHA512 ffb7606b1706d5e9f46bdffbe20420e6fd4241f6a402740e02f6d8a0e87f29201a20ab92d89fd7ed77f3df31ada6f157837beac9defab7f35ebabf85d47399e8
 DIST pre-commit-3.8.0.gh.tar.gz 270925 BLAKE2B febb7b6bb2e43aec096e454b064b01b0973cd9d04b2d792a4ce7cef9df4f9c9c2e3bf1200f584e163c829c12ca17f57761375b297ab5c3d97dce569d5c219bdd SHA512 b6970ac00c5033938462675c20ea5e13c0439dc4f70cd627f11b22b0f87fb0a3590e9b3e9c677bfb66e4b3420f40de66ca7ccbc969847ee5fa8994532a558cd1
diff --git a/dev-vcs/pre-commit/pre-commit-3.7.0.ebuild b/dev-vcs/pre-commit/pre-commit-3.7.0.ebuild
deleted file mode 100644
index 90ea7eb7e160..000000000000
--- a/dev-vcs/pre-commit/pre-commit-3.7.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
-HOMEPAGE="https://pre-commit.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
-
-RDEPEND="dev-vcs/git
-	$(python_gen_cond_dep '
-		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}]
-	')"
-# coreutils requirement: see Bug #885559
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/pytest-env[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-	')
-	sys-apps/coreutils[-multicall]
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-tests_git_file_transport.patch
-)
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-EPYTEST_DESELECT=(
-	# All of these require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
-	# and while some of them do include "skip if not found" logic, most of them do not.
-	tests/languages/
-	tests/repository_test.py
-	# These three consistently fail with
-	#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
-	# including with the sandbox disabled.
-	tests/main_test.py::test_all_cmds
-	tests/main_test.py::test_hook_stage_migration
-	tests/main_test.py::test_try_repo
-	# These two fail if pre-commit is already installed (Bug #894502)
-	tests/commands/install_uninstall_test.py::test_environment_not_sourced
-	tests/commands/install_uninstall_test.py::test_installed_from_venv
-)
-
-distutils_enable_tests pytest
diff --git a/dev-vcs/pre-commit/pre-commit-3.7.1.ebuild b/dev-vcs/pre-commit/pre-commit-3.7.1.ebuild
deleted file mode 100644
index 078bf861234b..000000000000
--- a/dev-vcs/pre-commit/pre-commit-3.7.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
-
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL="ON"
-DISTUTILS_USE_PEP517="setuptools"
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
-HOMEPAGE="https://pre-commit.com/
-	https://github.com/pre-commit/pre-commit/"
-
-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/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-vcs/git
-	$(python_gen_cond_dep '
-		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}]
-	')
-"
-# coreutils requirement, see bug #885559
-BDEPEND="
-	sys-apps/coreutils[-multicall]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-env[${PYTHON_USEDEP}]
-			dev-python/re-assert[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.1.1-tests_git_file_transport.patch" )
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-EPYTEST_DESELECT=(
-	# All of these require a boatload of dependencies (e.g. Conda, Go, R and
-	# more) in order to run and while some of them do include
-	# "skip if not found" logic, most of them do not.
-	tests/languages/
-	tests/repository_test.py
-
-	# These three consistently fail with
-	#     Calling "git rev-parse" fails with "fatal:
-	#     not a git repository (or any of the parent directories): .git".
-	# including with the sandbox disabled.
-	tests/main_test.py::test_all_cmds
-	tests/main_test.py::test_hook_stage_migration
-	tests/main_test.py::test_try_repo
-
-	# These two fail if pre-commit is already installed (Bug #894502)
-	tests/commands/install_uninstall_test.py::test_environment_not_sourced
-	tests/commands/install_uninstall_test.py::test_installed_from_venv
-)
-
-distutils_enable_tests pytest
diff --git a/dev-vcs/pre-commit/pre-commit-3.8.0-r1.ebuild b/dev-vcs/pre-commit/pre-commit-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..5de721b64f53
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-3.8.0-r1.ebuild
@@ -0,0 +1,76 @@
+# 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="sqlite"
+DISTUTILS_SINGLE_IMPL="ON"
+DISTUTILS_USE_PEP517="setuptools"
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
+HOMEPAGE="https://pre-commit.com/
+	https://github.com/pre-commit/pre-commit/"
+
+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/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-vcs/git
+	$(python_gen_cond_dep '
+		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}]
+	')
+"
+# coreutils requirement, see bug #885559
+BDEPEND="
+	sys-apps/coreutils[-multicall]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest-env[${PYTHON_USEDEP}]
+			dev-python/re-assert[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.1.1-tests_git_file_transport.patch" )
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+EPYTEST_DESELECT=(
+	# All of these require a boatload of dependencies (e.g. Conda, Go, R and
+	# more) in order to run and while some of them do include
+	# "skip if not found" logic, most of them do not.
+	tests/languages/
+	tests/repository_test.py
+
+	# These three consistently fail with
+	#     Calling "git rev-parse" fails with "fatal:
+	#     not a git repository (or any of the parent directories): .git".
+	# including with the sandbox disabled.
+	tests/main_test.py::test_all_cmds
+	tests/main_test.py::test_hook_stage_migration
+	tests/main_test.py::test_try_repo
+
+	# These two fail if pre-commit is already installed (Bug #894502)
+	tests/commands/install_uninstall_test.py::test_environment_not_sourced
+	tests/commands/install_uninstall_test.py::test_installed_from_venv
+)
+
+distutils_enable_tests pytest
diff --git a/dev-vcs/pre-commit/pre-commit-3.8.0.ebuild b/dev-vcs/pre-commit/pre-commit-3.8.0.ebuild
deleted file mode 100644
index 88174070951e..000000000000
--- a/dev-vcs/pre-commit/pre-commit-3.8.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
-
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL="ON"
-DISTUTILS_USE_PEP517="setuptools"
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
-HOMEPAGE="https://pre-commit.com/
-	https://github.com/pre-commit/pre-commit/"
-
-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/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-vcs/git
-	$(python_gen_cond_dep '
-		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}]
-	')
-"
-# coreutils requirement, see bug #885559
-BDEPEND="
-	sys-apps/coreutils[-multicall]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-env[${PYTHON_USEDEP}]
-			dev-python/re-assert[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.1.1-tests_git_file_transport.patch" )
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-EPYTEST_DESELECT=(
-	# All of these require a boatload of dependencies (e.g. Conda, Go, R and
-	# more) in order to run and while some of them do include
-	# "skip if not found" logic, most of them do not.
-	tests/languages/
-	tests/repository_test.py
-
-	# These three consistently fail with
-	#     Calling "git rev-parse" fails with "fatal:
-	#     not a git repository (or any of the parent directories): .git".
-	# including with the sandbox disabled.
-	tests/main_test.py::test_all_cmds
-	tests/main_test.py::test_hook_stage_migration
-	tests/main_test.py::test_try_repo
-
-	# These two fail if pre-commit is already installed (Bug #894502)
-	tests/commands/install_uninstall_test.py::test_environment_not_sourced
-	tests/commands/install_uninstall_test.py::test_installed_from_venv
-)
-
-distutils_enable_tests pytest
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index c5e7e50c5618..a906c397fd34 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,25 +1,21 @@
 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 allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f
 DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
 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.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92
 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
-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.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
-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.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.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce
 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.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5
-DIST anyhow-1.0.82.crate 45361 BLAKE2B 558bac4de847a432fc80427e7be4e78cae4b01c4da852eae2121416af4d7e6ddeaeffd7de9bb69e55340b9a228436b975fdea88e380391a77c782a3776b835dd SHA512 e0d25a8c0b9c45e1db2072618097aff3908f70bfcbf0963d3c9dd9c97be27a85c4a763c5cb74e1ccd1b0a2059360e0879df4be80e10e58e0a5346b65f4fa1a69
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
+DIST anyhow-1.0.87.crate 46831 BLAKE2B 8d277aef9dfb9e28d6fbbb840fc3dde385ae29df8fdaf76913c39ccdfac487c8a7599783c6bf4271cd7466a06bcb4b3b1459b317c0f531634a4b4b8ccc1d6174 SHA512 1ed272eb20bd28d361d71b8dd1279bb3ab3a722c6a68e0f7bf4fb0a196f8a5d9f5ed9874d231ba7cf93e6a6f2551e96411d1fcb26908c79ee76919214637816f
 DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
@@ -30,29 +26,33 @@ DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60
 DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST bzip2-rs-0.1.2.crate 253906 BLAKE2B 75a60bd49deaa8df0a91e291c619a392f55aa56ed8fe8e6f0a1dbd79c14266baf058e4e904cfb64762511f4a9c16c60af3c919a1943a2783907e8eac86f7f0d9 SHA512 00683e16f06a3c5589fbb6cb215ecccba4a8619916de80024a917f98f10bab4c663036fa3f922783ca19bb04a1653ec2ab593c1f36f587e931bd80cb11a79765
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
-DIST cc-1.0.96.crate 76576 BLAKE2B e0171d68b04bf2435a858b3d50376580f0740588770064bb695ba49b6827bf1f92aa4e973c8dc55e1622e795d23fa8fe42abd122d5d016e800dd5ea86c4ceb3d SHA512 a3e8058165e61020bb10491dae50fcbffbb411d27d6dc44997a931f424e88cb36d89004165aae9c531244a7026920804222c819d12b1be3e3db571bec181d8a3
-DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1dd8515ff5ec43abd1da75bbb400460a43a252c93dd0a597c2e44c8e899a376d963f0d3727db7ca2c24 SHA512 ea8bd8150042268092360e6396226ee5e83ba154eae99d299c897ed16e8543fcfe3179e22b50b0497bcf065a16933f4ebf7edcae7e6fc8be3788f0ae7f61c000
+DIST cc-1.1.14.crate 83005 BLAKE2B 777ebbe65b71b62e435b03e1749ebf6ce4664b07dda1635c454a59d3308fca0b27937b53227010ed1a7120ae7b21336e9481a4a08942e5a27e3a74bfbc8380ef SHA512 acc5b071c7be4ea1e70609574582686363f9811e03029857cddb7c6a6d4e01c32fc71bf50ee3d7da8ba88c0ed2ac4da7f66963dde69ee3ecffbf52ae1ba88c4a
+DIST cc-1.1.18.crate 83315 BLAKE2B a97d24ffdf44f80795f67f7721ed4d2524d92342bfb4ba39e00a1d3351945c904ba84cc7e245c637453e70d19b1584a400e8422e185d42c036ef44d3f2135663 SHA512 af525791c6ba731d688d3f5bf898c0ff86bbd81b127454d7f933491cea1e921d171cb819d04e460e759c6ae0f6da2188ede6bbe94c940c47c6d9d9f991925401
 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 clap-4.5.11.crate 56252 BLAKE2B 0d3d7e008e0848cbd66bd1fe347cbbccc77c44db49e1e4179eb0f2c292c87e178424ec82c2becf2e99162f2a199c31c31b54487c7dbfa700feeb082dee15c711 SHA512 96bb7871ef3eb167bf8869e3713d861754cf4716dcff8afe54b3d73ddeb862c75e110e1b759c72edec7cc0e274df5af881aaa8bd275978c55ec8a225c333b098
+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.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
-DIST clap_builder-4.5.11.crate 164100 BLAKE2B 07cadc052133a905e2f16bfdf3c1a0d66a283df5e7bb16eeb40bf1a8a489c24758309039d8a07a0b02cf7702a3a2ba6319115940193e58306df20f53851ec537 SHA512 e647761130263d45d55c507e15893b73f70ff402185cd2ef174f7c4f67cef96c713fa4d4d60244393b9e7628667b79e56dabac0196d014740d81e5b7083ab780
+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.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST clru-0.6.1.crate 16507 BLAKE2B 6379e70a2d75530bde76e82c370c4481ce84d8196a395e94b30dddc1126529774e7ac662da2611e4da10cad6dd54fbe55e1bca4d554369ec5f4798bab59a9d53 SHA512 bb9303ea245e3df6321bbf3c4cf9f899648067f8d3950638387badc79ab37e7570ee73c90af96dfe4eefc004d116c5fc77cc8d89a2809defa2107cde530cd192
 DIST clru-0.6.2.crate 16497 BLAKE2B f77d90984f8b030c43380cc8fd80cfde916f8f9fc4b288a340e9c00f0fe177b2918734c7948ab4bc8fd01abf7864488c76e7744c5974ba23f79fcd1b23b6814c SHA512 6dabdbc4b956fffed9c362b6f33b71625ba62651b0820dcc78b61319d981513d479b453906604de173110bcd9a7441451ef10cb0978e5e587cd0df23fec2c4bc
 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.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST crc32fast-1.4.0.crate 38665 BLAKE2B 77398dedfa5e61357fb9abe3415ee53e45d3f1f7aaee959cbc9774f31a10ed324da2a558d20fd7c0674d450c8985b1e9c78b0b65e6ae2d9da6c873fe631c5ce7 SHA512 3e0bf1d2411ad9c651e0242c574cfda09403db24ab4b55560145ee73b31b08be45e5e12ce2db991d165ff056c7f2f67203fb2c048651f1c66ce90ec3276c455e
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST ctrlc-3.4.4.crate 14660 BLAKE2B fe7c2ca8352dbe40e60ad2c63654beafd9ad3f62483b23b3c614a22dacc8ce0edd2b94e9ec3a2472c581f6a1b8befe0952df092b4c7d34ad92414190e285e51b SHA512 c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c
+DIST ctrlc-3.4.5.crate 14592 BLAKE2B 189b026f4061b68848851dc694c71c6ecf87d6c6cdb4518a3aa215ac3d77739db43aa68e3c628e51dad99d7ad089ae6c66a6d03bd912ab9748a0793d09c2333b SHA512 3fca36deead46f3ca586f0a07ace804251d3c3e49a9a63e8c34546e2305d08158770304ebd0c9ad6ed499f811cbbee0b76ffee1858aae60852a61a19024db3e6
 DIST curl-0.4.46.crate 94864 BLAKE2B bcfc97c19ce299abd3e8a9769a30c0ec5dc6692b5c1d81423f47aeea39066d1840ca7ec1d4713132519f3bea94d43aebd8d733a19028280e2e6c2a8e91eb1948 SHA512 c08f857b385582ba635a76744c940017b74c3f241d28cc7c8c6eeff958c76c01a1a51df41b3a7a6a9a38a31f8cf5b9b3b639eaa163c441fdec29d0b3f14c8336
 DIST curl-sys-0.4.72+curl-8.6.0.crate 3269599 BLAKE2B 07f7d22f787ba9f329af1e3f477ec877dcebd0c6f0cb32d284cce364c1d3fd4f9eba153753655405e06d0b759eee8ddb0e6f8600864ce8fa18ae727f985927e2 SHA512 d77db758acab7cacbab724bf9d6f5a3a40083be7290c9b6dfdf91370f1d965e21d8ce01f1d3df79eb40da2ec759c2b0609d3c6176a0517acbcdc5a2bbb66a1ce
-DIST curl-sys-0.4.73+curl-8.8.0.crate 1759967 BLAKE2B 85a2304632b81cfffa9deb9d90078d6e05587599218d343cba7ec39a0cc4e246815dfec1f747708429146b2c9847db943f49c8ab4a80f2056a0acd074c7f4785 SHA512 7c669747ede48191e6a75f118084bc473fac3ec2fe78882bd13527df3d98a0c26c00b30055230298685afc741aa99e369b8bc2bb6d89712aaa3e5208c7ee9fc0
+DIST curl-sys-0.4.74+curl-8.9.0.crate 1786932 BLAKE2B 47244310d60a9e8ed51ce7acddfa6f3895e199277a3400211b77088382804255a7858b4a4b3d30dc3c54622f514cdff76b539f11dd07d26fbbc8829c1a279266 SHA512 125e01702a85f33a9157d67930c92cd8af619d098c5ca98d820ed308d7931f851c395a278f54f57a243b8ae33305292c15ce9d6397b7e3726c6eefe90d3577f6
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
 DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
+DIST dunce-1.0.5.crate 8244 BLAKE2B 1499ae0bb3d34e8d42e97eaf551308efc95697366b804dc83c51171a939d45bad46fce9f82a39e17b6b92fc833aecc85eabd2104823c7db30396833388125728 SHA512 36d7d75217d629185a9a9187f7d2e2dc346a28be0ad1c21b1b6bcbe3991e9cd11797e53d745c0b3b5ae94cf1e4cf141cdb2322bab86d97cc258b4145e3b97a56
 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 equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
@@ -60,101 +60,104 @@ DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53f
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST faster-hex-0.9.0.crate 13053 BLAKE2B 36e07a1b08544f273b30b6c8b79eb97bb0e97efc29c570f59fbe9fb4c818dfc0cbd9f42ccd4e196845c5d1f39db1a49cf61d1931ea5c1f761da2b0da49b03430 SHA512 7713b0929ffe5596823d001a83a40fe1c4c500b7cc4218921ebb65f69826a9a9fd6e7b948fbd093cb921bea52e9f2cf3285c9d1d11f2a321dcfba0fb3c9aa5d9
 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 filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
+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.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 form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST gix-0.61.0.crate 270542 BLAKE2B b92e232eebc99b21252652bc93825d68c77faf83682bd54449af07a76295cdda1b8460c1877f5833935c691a9733610f6b8fb74bba58bb65408e4078ac3eefdf SHA512 361a751d66f3fe454791e190e5f809f30f255f6ed248cb0b6f12311b296b60f48b925049164f4a00f0ad8e967e1323cac133c11500ceb8286ac586fd52d60b12
-DIST gix-0.62.0.crate 269685 BLAKE2B 9c40acf5953c2fa40881129a958090ba863890d8f0805a3f199cc5dccc3d8683160ef42acb12b803fcd31395fe9930a7e04106a9f04d52741745d0c48fae8d54 SHA512 dc498181b0fbd3b4b38575616772a20897893eae8a6150e43ce7c9584e49959b43a73cf8dd96b5e44dfd179f781645a67ad0986743f985c75047319dde5b1e5b
-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.1.crate 8952 BLAKE2B e582c415e9c7b13f9b92cca97777e2097de6884c2f1c10e71d9076981bfe809d8f46a140d1d2328e443b835fceb7954ff1c5ddc3e807c86a86ea9607e391a17b SHA512 fdf59aad0880ea94e5d9deb4308e2a1ad6e4facb3ec16aef06f04317c01925cd93ffc634803234973c6862ede44d280b3f634570d118763b74f40c73b9eabfaf
-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-command-0.3.6.crate 10757 BLAKE2B eeb6238b355cc8f2e1b285fe3538dde2b8bd3d6a1d65c9ee44de54afd38778bc7689c205a81fc1afd03552ee3a8b0c77ac7f52f4dd5b9556c58a41b7afe3c3ee SHA512 74c5047e1df08deac03638e8905fc83c301ed238455c5926ba74872ab56ff78ffddf94950fbfea3f27e8b7d372e5a13114936f467bd221a874ebc28eb908a0fa
-DIST gix-command-0.3.8.crate 10798 BLAKE2B 1e331d6f1a17ecf49a2107946de276ce571d3b522beee2699c975dc8ac91fc4ca613e7aafdba5ce4652723f4737d35b9dcf30612cc68c6844fef3d0015099de9 SHA512 a94cf618c96a1a9e60b2e21950ff99e266910dc44365afb5fe4d504c1d35fceee9b11edfaea1fb4347422718b997f34bf701065e23a0c1d5dd02f4bfa8be50e1
+DIST gix-command-0.3.9.crate 10938 BLAKE2B 0f771ad9f51d4203e54984e71e2c29e2ed13f3dc145dc9e157f8cf2f9db604a973932c1379fbfea9d1caa00498bfe6507d6ee231ad72e73781575f705af81630 SHA512 9a42c1513ce33a874bf0a43fded2025fa1040c1235635159d875275df6bdb2c2853ac535483ffd80b07bd849da5bc7f38ba5228b5ed0ac27fba85059d8db83ef
 DIST gix-commitgraph-0.24.2.crate 18187 BLAKE2B e536c5abcd1736eb800ce48d4fd6ad919a70aee5d210d086f35d1fd6aba309d3f3446429eb102dd41dedcbe1fe578429fa70a94679c50784490172e4a22a32e6 SHA512 3ddb2e78bf47c1e3d0803d5b7387eefd6c5a0ed046bf042523e49d3bebbf156c9ab213b7b4ad270849a760dddd2d8fb37425dfc0d3250446a368947dfc85185c
 DIST gix-commitgraph-0.24.3.crate 18242 BLAKE2B ef37235c7258ef6603b122f9ac9bb527be29f1b4cf7dfb02a484ad77986220499633789466bef94508949ebfae50568493f216d532fdbbb84861e9f04aefc38f SHA512 270edf30cdd8ff90bab02d941d741ab6cf6a85d6c2adc25b41298637153e641307e15db9ad54fbf0ac4008497c77980202b067f48c2eef88a7fc1673e022ae47
 DIST gix-config-0.36.0.crate 61643 BLAKE2B f1f931bdf0e5d1a7cb71342f73465d414a690206c77c17aae5230e5d1604454a2d6736d1c7053426e7c92875710f52a634bea3b7afc1e184e99cb66bafcbe56d SHA512 ec3998cee2314a0e51421d83fdea904790d9645074b4cbe3b9b76109ad5a210cdfaf7d1ffebe389ee4ffd12c8f5681a4d390786be74076fdee8cfcdfef68f5dd
-DIST gix-config-0.36.1.crate 61754 BLAKE2B 4316550d771964f47369c371483ff7800290262521aaa84d009098c84d7fc1f22d690bec21d0768dcad6a675bc72b74b48e4fca26a6d4c0e80c43a57bd73121d SHA512 f8fe1afce7fd92d50d13787a4a2c66d7433164e73a1dc33510ced0a78a762271036404ecb4caee1479cc6d42eb5e8a9c0065f10e55d0d1abef90ecb2ad90237d
-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.6.crate 12769 BLAKE2B bd807a037a74905f7575c295567207a5200830fefcc802e11ec271d238af0f391b3f639cd2686e77c267bc4b4d2a15aff290d926bea194a25473f7c87e12dddb SHA512 547d527c248016135504b4544ff8958168279fe20720da9e2ce6e2f148741f8e870875515ce4f069509583186e0c0e9856e8c08ae1e14620a001482fbcc8f8b3
-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.5.crate 10185 BLAKE2B 564d90bf3f6c4adc2b731772132ba6e984271d62114c682e66eb49fa3b31e7bead40822901a182e2f25ee9f82303a867bae9052fa5d74d3929e7de2f79899e94 SHA512 f2b7a283f3884ea1a569e02deb10659b80a44e330a9e7b648dc7b3d38bcc54c66d2c5abbb238eaae4e1e7516092379151d43d2b927f4428936b357ce913dfef6
-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.42.0.crate 32151 BLAKE2B 9b35116bfe05089fe50052d03f2e3964d787e8d39370e412194168700b8ed3ffa8ddc7d66c4dcb29b8a4231e7e85f3241fcf6dcf544ef813c0f6e933a50b2924 SHA512 8f953276818965840513127e51e0b12485e41059199ee33dc52dc2b6f40b776de7c89f8b7a21fd4d5530c1ce2c6f9d179d76f897d887cf064c668445928cd4c5
-DIST gix-diff-0.43.0.crate 32154 BLAKE2B a5f7717a304211d340ed7ef9c463fb6be2c389550542ea1380d3e790cd76d26b5ab2a94793b600f954ecd81837f4cdc484414ce1d7dc7e127d06583823de8fef SHA512 050227563c93b15fa491a8bbc95e3d9bf2d89ce8fc5ddfea67195c02730a341f75e5bf66e1b0f784673bd638057be1611d3ca5951d6752eedcf0237dad9741cc
-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.31.0.crate 16644 BLAKE2B ce1de90ebefcd71cf80fc154a156a2f4ed40cf3bab85f1bd1e1d8171962f20c10dc905006486f55479448288a103edc300f2166257795173e45fc37d2adae1ea SHA512 fa2c0f0112384e202f3c4a82a65c27460c5b941b94a67d13e13ecd49ddc0e811f35f2a0121fd24add6acde8d8742f7aa56a173bc6b78e1b5e98db6236157bce5
-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.1.crate 30596 BLAKE2B 9b0a6957566abdf7a11a9ad9df245f88d1b03cce4d6e23432bf3ed12314043c43518ae0be2048f28dfac1b99b196fb131751949d8ac2d2639f827e3d832f738a SHA512 8a405dca152a4c913153b458646632097edcbb0a57320837f7e7fbb1d6f0e5293e9148f77a65ac19a1869203636c17c1d5aebcfabb5b3f31e8cc6e71da7827ec
 DIST gix-features-0.38.2.crate 30604 BLAKE2B 68bb0154bc444a84dd20bdd1a56d770a8c68a816389dc8ba0a94ae71da9c9955974cf7a154de5548f65e547a5e25303efc19b5e225664ce8f827cdb661bb17d8 SHA512 d82f70bd8831701b2c17a761b306e4b630fd5b558e4b936aa8b2f87440e53127b48f024c392b487af23e0c541de4b064c27c35ee57005a81352eba0e6bcf79a1
 DIST gix-fs-0.10.1.crate 14369 BLAKE2B c2ce356b6a578c3503b6cf3f23301bc32dd3837e4995154fee6f0c1e17623e9494db5df2b40e928bf010de80172c3f8adb711667057d79003d1b7fd5538cfe03 SHA512 3a93fb80d9eb331c45d0644b6b120531abadc8ad173c00a214d2e42a99caf614074382fd4819d2a239488797337e0ae519c2c9680fd52cae1516565914f6a14b
-DIST gix-fs-0.10.2.crate 14372 BLAKE2B c1b3e570ae948f2857d810f3dd042c1202494ce8254cd97356a0e6697f93bd739c250346a19e516c4204fc50978845da397785f2b65c0bd31649802f49da9dbd SHA512 252260fc66b9a735d9dd9e8a1f5ad95deebb23197ad2933fe9713e6f9a62b2849bb1187141c3c8968b9baa6ca11e8cb972c69367c4e317df62eb7fb25338f7b7
-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.2.crate 13261 BLAKE2B 9274187d3af9a770abb5b31258182003d44756f0639220c6475098964ba517cb8db651d15ea1ac18c38b2f9d47ae05d589bb7b18e6766717b9b30522a9889477 SHA512 9d540eed9995395f3987831d5d6e8bfc6349c712692cf5aef41d216e923eff84e14f528552d611bdbfe25e9cbf79b34d514ef4e3e98c38dae6244cac66312f07
-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.31.1.crate 44358 BLAKE2B 347fbe9252e4c38f1adc5a137e43952afbd709132d156dfe4a842e7be8aec00ae155264096b812159c49da058d0f9aa6a09e35090326c35b5dde376798fd5314 SHA512 3b79229dacfa293f2de7e2e437f8b0f40752465e774a88fc944e8f30661cb09a50c41481e64c75f06c8809c215e353092335ed9466f8c8ee98569a0dc8ce4b43
-DIST gix-index-0.32.1.crate 44704 BLAKE2B d87242de0270051c22af70f9aac229983f270c778d67adec2be2e2f492f4a6d3e12ae33046febef9888f3479b423ba938247c39215c66d7187a219056129ca9f SHA512 51b6a302440d215f18aa9f199dbbcf032eb44a47deea21fdc6786a877fef08643eca6a30d8c377e544dbd312bd514b1dc9762f88165fc357b9fc61bf4934517b
-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-13.1.1.crate 9753 BLAKE2B be857e80fd00fc6e365fa796cbf09256748051a01e006b909348b02ebdd1dd3e87a82ba86e6a18ca49013dd69273e8d1d4526704b19b70b6381a8d387de7766a SHA512 1a6bd6f3303fa12591bf1a5e4be56775660435cac27faa88d1f672cdb8c769d925166366c74504a047ae75d5a43a911fd2122776c790c01eefc26c579552c079
 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-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.3.crate 32497 BLAKE2B 72eee3970d4520f3f317330d797671014fe5c768f99d16002e45242ef447e4334b8aa6baef4a2665a2927208b29d8ed896427757ea694b68b5f3aed57f3894aa SHA512 6b890445cf64c1b49ecde30be32d1028b087980567b86bc445426b10d2e4e7a2dbee4464aa601d085827db85a313947cda72ddac8cfbe6959aa4b7a100746bd2
+DIST gix-object-0.44.0.crate 32479 BLAKE2B e7656eb7b44a4f555541cabd19b0a04a9f2ac4f0e48ee41dfb49941133c2deec9e6a5682c410b29eb991e12d2480ff3927796391f8eb0c0d83c52b74ec36cfc0 SHA512 8971f0949fad9eae9285e2216b84d90014de55d3459cd0cf0adb5db5019d8b151842efec0499a44e3bee5cd53fb4ed48d742903ce2417da2021bd3bfb7875b36
 DIST gix-odb-0.59.0.crate 54132 BLAKE2B c393e871eae85b28f9525a1ba0923ac87f498e390baae9d0038df4a09912015231a4d160083ec832d1f5272f9aa269080fb125b8363a542eab0e5982edfef08b SHA512 4d6357caef64e7253e9c2046432fe8cacdf1a0d77c0bb6ed6f30ffbc1757fb0c915c75e4d899ce48740b3293ff7654982883b5451fbdfe3572d588185ae39c59
-DIST gix-odb-0.60.0.crate 54133 BLAKE2B 9359b2231d33c8c7290cf118fcc87ab2130d340b7f873a787e58284354ec31373d81d4f2046394ecc5ef8e470dc3c65d65ceeebdaaf2fd5a49167ef036a6d132 SHA512 1ac9046f313a0c5f73623db81d86fba3033ccec1dc003a9cf01456dea4fae4c40c4f703f2b5af76af2b43cc8299184b105cb4697c1ed91e41ba45b9df9976d2f
-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.49.0.crate 96264 BLAKE2B 18ca8b0e1d9f1ff38dcace4b047a5c0432f39fe8eca1f822bd20f2f343b41dac1ee223fda2fa7c99f92b2f80a7a3a49067004954bf2bd2eb82285e92b30d32e4 SHA512 9cffae623b9c404b204f07c846f0bd435b4243bde49f92e33a3cde9cf932262c76aac9880ebbf99168163f5c7cadf8105c1f80edcb5b9e902bf022e9dac4ed7a
-DIST gix-pack-0.50.0.crate 96288 BLAKE2B 9bc523f2ace451d81c264990daeeb317e37faab64d50f987788a982f5423aa745eb7ca5c7f5c47cc35c8c470bdf7add5223f5218d1820e7ef33f77e0587771e9 SHA512 3c39f882745151b6138fe5ba93dc37659290c121844a8848384ca883dfc2c6a4262d225ee5ce29a84363637544cd157a723847d668d93a273e9199174497e32b
-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.10.crate 19714 BLAKE2B 332b2ded54a1355ad1c4f9a36775339bdb1e81e9948b58a39178ece96afe7ff32fb1263337321bb07a6749953c571fa63f047088b6b0d0d5757f812f4de94c57 SHA512 f38c3d12e4be24c7ae436136ad61db2461308dd1a2c58af136b5bd73658c46432faa1d3de88a83ae9763d81a809fb9189a7dbe5e62c9ec4e9954b560e42dc390
+DIST gix-path-0.10.11.crate 22554 BLAKE2B 8b16554acbedff39d7dc83ab0b15c5162377af41ad27a612f1fcc4d55ed5dde5a7c018609c922ff6b928c9c259b29090ec13a8f37ed39dc0207d6ebc6c8b798d SHA512 de21b58ab2a5a0b22175776ae9bc5b313e3fdb4194df74d21bb95f4af68b2df279fccbd6df640fea95d631cf349f8b717afd9056852ab92bf28d6f82153ca191
 DIST gix-path-0.10.7.crate 14406 BLAKE2B 4c1fa71116d42c75ac0a19c3b9580b20a64eb6c0a100532b97b5202194341600788d14c9d98d36ab22ca56c1279dfb0d61af3ff1fe18d39533b67ce93fc64a8f SHA512 f5aa7af04b98082a2e28545d024196ddfb2fcf0aef8aa3a051e4c9eb35f75217a1716f3323d86c484e522252efa25fea9970afcc1ca81767e886cf4509123c24
-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.43.0.crate 55990 BLAKE2B 0286c019294065623ca0ada9de065e4b3f2d22621397ff103eb0b6bea5eef9aa97e356569762cd859fee70d4858c632b17f52c7f5f82e66ae666066f4e9aeb85 SHA512 b035a094f589e3e9a9ea0aea76856843d83948e7def921ff4dde4b9a3025c91ed53fdd4603ab89cc2de8cea2f5836c85cacd79d6f364bd3eab071279afd8ec0b
-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.0.crate 16129 BLAKE2B 36df095d841bf4eaa6c6ea700b493efb35c419fa7f4183a80634850c88f13f2e912cadd9a8aa3755a05efc3184a9cc071202bdaddf3db6803c44de5a3267d212 SHA512 d4649f1046bc8b3ca1a5f5729b515a7e9a442d24defd98b526f6b22c2f36cc73638ab7cd26aec234dcee72ab9621ef3f55fd3c009b2e02635d6b481a699247d3
-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.0.crate 19138 BLAKE2B e0628502830ea9f69ff03151e605c760f6005f01e269b8de772604072d500c9343e412eaadbf5ee103f83f33b8473f2a25ebffef5b94f4cd1638a36c5dfadbfb SHA512 d3a581bc85688a6d802109048863987dc958db298eee3fe38104db1b0c2c66763d3931188662343bde8d590767e924c9ebfcbb07e58903cfee7ebcf343cfbbe2
-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.0.crate 11797 BLAKE2B 70337d619571fc8e0897b5c95eec339cd535ed95dcd1abf0f3ec2d150b82dce6ab6d31b3d4ca1a197b0de1313dd7549a8b0b238fd10c25beac7a8947ed026ee8 SHA512 bc4d5f49ae63f6f037bdb01c2061481294fb2d7b0975a49f4bf21306df11bd7117110380e71f196ddc5d7d3e0c406e9e164c968b5e224352ba11286bd00e7b9d
-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.6.crate 9356 BLAKE2B 1892b97a2755d3fe5736db392331c1822c3afcf573c22a67e849ccd7e8c32e01d526062f960fd193aa968317327a7b282c442de02e774b1a729f7e4ade3ea1be SHA512 92240898c2f90f371bbd3dcd3fe6a0e3e6c6e516ce943a531712f391e613445d256bb61d5ef132d9391d58d20a0771c3949008e74cf35404b5d41e69bf5cd9fa
-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-13.1.1.crate 17852 BLAKE2B 95a2ac6450d3bd81904427d496055219cc4d928d116dc7e8bf04972602463223b8fdf6f013073d8c9f5846d06046c62b2d71aab21758f263252385aa6b99e78d SHA512 9860d52e6f93657afbc862e2d501ec62ed1670e1736c8132da2a777dc1ffe9c7c828a7d8c96e52bfed114075d929352f5e5ae4575f26f83de8b274aff98acbf8
-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.8.crate 9657 BLAKE2B 357dc34cebb04e7a190bb4d8c348ff535b313ba52dea952b3226af2206a2795b160547759beffa914372ce4e23b3dc5898e62f4266242a0f0eaa24462ae6a099 SHA512 2ab5ce97df70c0eac7cde8c2eb963659d22335f9de9874e61a9cb8491271e170cc014ed18e82ff2f63862ad55a273544b4debeb5687702477a8fb1c7d22c5291
 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-traverse-0.39.0.crate 17242 BLAKE2B 2fb5f6183e6e65f0a1f5d7e50fbcba300214af189efbf750b8a039f7b88f1feace26ccc7d10186c28db5ec3f97fd729832a9ef72e6a753a695a8e6a3c6eac523 SHA512 d500fa9feb6500bf92cfcaa1df23cd75e2609909d90df5146ac757df147a2b09046246279f07b78730a339a655620d5f8a0f0fe6b44992e85bc7a8db1ecbdcec
-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.2.crate 13552 BLAKE2B 8e960eef64ea65042676bc3317ab5d4094d1a6b8f142800f94c5dd3147867c38430b20058a6a3c575aa16f7ee2a2189b9a8117e05b02b860f9d52c70eebd7ce5 SHA512 a8482c8d34ac1a0a6b1f7915d0e7f6249e5547e664334ef587b782e26c71c2cd7525b4638c8de80774a91c992e213beaea6ae15148273c257029820029df2c1e
-DIST gix-url-0.27.3.crate 14329 BLAKE2B 7f9dce2dc50e05eda35e6942d868ae0352393b4a758c6801a8977680a4f822258ed889a0223d8fbbf39ae7e054e0f95279127134d0df8e32d7798c4c15476ce7 SHA512 acdb1d68590be1f61543535a368d7ea7904d1830998c64cc9b4aeecaa4452b33adb93dbc815a39e0119b0f804fb47e2b67ce79ef38f19a2e8c6605118a600fe0
-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.11.crate 9426 BLAKE2B 9f087b7f62f11b8eee291c3a45fe002ac4a884d9b43e1a295914a9b54e5e32250d3450ff4324c43d71596242ae1d110f7ec3f1b815d84656dc34d0cdcf6a200c SHA512 8335eedda865c4d0057ce01f65a07d23863803c80ce2ae3b656f3b8bb3a14b81977d30b88b34b883f58739bdfee9ab5b9e380577a4d9296259178cbfe1de824e
 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-validate-0.8.5.crate 10408 BLAKE2B 673f056b674e93fac90e996b7f0e63c419d18eb345587b3f1cb1c1744ee9596e4e6b0540db980f55dff6519fdb94f21d67b4ae6c579159893dc672cc9d500219 SHA512 4e9bc069785d23612b93dadd6a39cf29344ab9526bb31fcd980a6b52a85288cdbeae47adbb8a52bc1615073f696512d5faea9ed7512ddf6345c5fa0aa21913b4
+DIST gix-validate-0.9.0.crate 11204 BLAKE2B 5e6090fde2f6c60233b51f40458a06c8c62eee55d0ad9cd1da5d27ab71959a9b243eab8bc21f02c34c764255094f87b8d3c496231e8405ac8805e6eb19bb9903 SHA512 4f8eb8bd2c08c7ff07f523930f37c29d47be24d921da2d9cbf78364478d2044ff0fde1233d0c5b881a6a2018fb1270121707351f2ba4f630932bac08b596b822
 DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 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 home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
+DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
+DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
-DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6
+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 jiff-0.1.10.crate 597545 BLAKE2B 0c8051630e0500a3a2562049ddf187f7d4e50415313550a3b8e11a68e2020286c51d7e087626b323d13234714889f3e5b6d3295679857dfd8ec82d07cfdc4dc1 SHA512 1ea189b54a6541c0782d250122d86759014c629df13defdc2516e003d0ca1c11cab54540cbe0c9dfc9a8441c5ea68718c1d2ecad04136a49590e93736a9b2131
+DIST jiff-0.1.13.crate 604330 BLAKE2B b49600f8fde014e6705cb792075b1492c816107161af5d74577de5c9f95db4362d2e8e4493969852c665da5dd72de9c05d42e81cd5ed2869a7245997b14a827b SHA512 70025484872505d2ea50e59c463343280cf2ef5041a1a166f499802022d8ebd1f7ad2fc6ed569688a7bea097988941f21ccb1bae690c3924a6828381fe05c35d
+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.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 libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST libz-sys-1.1.16.crate 3958920 BLAKE2B 1780cfc7181a3c33dd8f693ee93e46bf0f70c1958503e8eb866d6ecb6732c8ab7bec56397c5384d582680fdbd8762ae37ccca7063616f266c59a7eff7801c0db SHA512 1d6b65b5a5293d470cf8ed48293a6f8273828a0cdf096d286e777d438b2c4d076360b5492ee3c2c83b27605d51389e6a3eda7eaebfb09a6041a877a48540aef1
-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.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7
 DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
@@ -164,8 +167,9 @@ DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e322
 DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 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.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
+DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6
 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 num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa078265e22d5d7200eca4f96702aad8b537ba772e5d4e680a6e90fa6919fecfcf37a060668b2a618bb01bbabf2a SHA512 60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda
@@ -174,7 +178,6 @@ DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf
 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 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
@@ -182,61 +185,59 @@ DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
 DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f
-DIST proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST prodash-28.0.0.crate 90695 BLAKE2B c4a78e86174003e2aa18899fc9214acfeb04637d2b90d64eed17d5dd2569fdb4a58991c23f6e6fc21549e4412eacfab9dccc50a8e62683e8d91a922075968f4a SHA512 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70
 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 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.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 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 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.36.crate 370932 BLAKE2B 0c4b963c9045fbb6fd2e4fc91888f574de531074a4a131aec9d8d2f44f3839778bce601050848d9edb2ce4019a94d3226835f7a776af682daf73e5cc52eb6f5b SHA512 2874bbb5fbba8b9fe883cdf21e9662e84f32a3fdf50c8662a908754436d16d177c4c01810fd08a01b2690c79bfeaf8abf29e5efa0987348d93671499cb2fd550
 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 schannel-0.1.24.crate 41728 BLAKE2B 37c702a78572c845602e2481946b166b8a9f0bb08c0426f491f02ba98d358539a0039168c2a97a68fc5da2f870057b4ede3ada895b9483f687750319e139c8e9 SHA512 4e8085e9320befa3841981de5b58b214e053933fb5ac507156b1f22fd8e88142aabd42d40f52c3bf7d3864245672dadc4da3d9976ac07c75dcc8172cd9de1335
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 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.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
+DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 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_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
+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_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.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
+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 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 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 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.6.tar.gz 605874 BLAKE2B 24b17dd821da4bd70b47e7b76299c9bc26038f751ed96f98f51f4f14d1ca98952611d7a2585d647899d4a2b0428f377c3296600cb8621975d141e32a550e9298 SHA512 cde49847be79297c9c5ca3fa0f23a28fca8d5cb045a21783ee8cbddf43c32d4d2ec78911b370cf6af20eb3c3844017e52cdc1af6a531eb1115905725e2c6aa94
-DIST stgit-2.4.7.tar.gz 605847 BLAKE2B 7779184962955edaf7f948014f66dc17d31fa84f78140afecc6c85edb3d27ce51ec09e962beef9a1dc1571df5279d8005baf9d33eb1413ef417d340988ab3abe SHA512 855f6bd3319c2be3192fb08168e335ef4210e200197554aaa1f5b99c599a9995ef1b94d377630b65ce52f1dcbd9d72c41d8d5f00e41b4f005ae14ca8557c58f0
-DIST stgit-2.4.9.tar.gz 607055 BLAKE2B e60fb625cf7b177fe297b2ab126ac948d865bb70ab753259df9c3731d2f3745d2ac2250f844fc2ae117705dd69b02626d6791633c1a39e709bd34148300fa133 SHA512 57a8cced5c211041f22fd7aa875ca08954b1b477056f443b4aa6bbe0b67409e8b09cc9521397730e33d9aabe2c365ffd8700550bd09a56a60f0804b9a8805244
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST syn-2.0.58.crate 254920 BLAKE2B 64c3e09adea47f5a5f332416e75ba9e86d1d20e208f859940b80986884b3456130a842685e9002416803d0f8a2b8d61e6d2ec518929c8ebee09a1142d9d77b15 SHA512 168196da11cd854e5dc7e37bfb50b229ecc3a73f7992f36be431dca85a7a1b4ee61b60471be9f6303fd29de6747190701cc475c4b2830fe31f678f102e54d387
-DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d
-DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
+DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36c2f595747edc65c0d2a05e9d8e4e9fb6dbb30da8264c7db36b1cea14110201bb06e40bca69b25c3f79f1c SHA512 c633b9f68e67b3cbf2432d3648e42f8d92403877a0128becd22cb108c0cfab9f1bc6b941b9cde225d8b727890e9f86457fad05b544fd07be4c01c2e60a2cdeaa
+DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 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 termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
-DIST thiserror-1.0.59.crate 21040 BLAKE2B d9ae0b1d810e7631edf072a41267a871c1cd88d71c882c8fb47d65b3dc563ca2addef0ebf9a9cb122fbfdccff5b92815b8f2e0f7c3382963828cb69d21ec8531 SHA512 254b0ad6c4b135234f89db8bd5674fb8c6b633495810140abf93cf06c58e911ad2ebcfdc002e7ce29739e95ea066eeed3fbd7c831e2858822dff620598dd147a
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
-DIST thiserror-impl-1.0.59.crate 15726 BLAKE2B 0e524c851f999f4592e5450d7d8ad45a922c9cc5d2229f4dd106144238c8a0ceaeff5a4d1c7e27cdc53a7eb44e60f890fabe1f43ba3d5b950da9c63e6ddcc9d1 SHA512 75543ad39d1243dab23a4b50075bec337c39045f0271337a1ccc144f25dc1e7fc23b0163f16958ded9a1f44ff359378bd22f4c0f5e095c1823e928fc929457e8
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
-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 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
@@ -255,51 +256,40 @@ DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf
 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.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.6.16.crate 163159 BLAKE2B 41a49df2d6c4d1e18be19f2c07de1756cae233350b1cfcefd2dfd825d74b501dbf2fe63e2fac919e20f4c321f1b35a8262638ba2cc86e31c7bab7c6d02d0135f SHA512 28371fb8b8d169c383bae1fab01edd0bc0fb9768d7aa083dfecba327bf02bdc7eba07bd7cfa875765a53d7c7c4dd175eb2e25d2a86c2974a4e2aee07611e36ce
+DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
 DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99
-DIST winnow-0.6.7.crate 159491 BLAKE2B 1169a7cde2c588bbc86db6a01e145c2af5aaa92b1b6e9f1c7d72faed32972bc2d706e7a900aea495d0fed3dd150f5a5b6bbf75bac203c07e118b449a7a5f07a4 SHA512 b8a0f161f338760dc24da0f8f6706c84dbb9318430556d87cce841a725357dd4800e86552c448f9b521975a716eb80c0e631346073295a11cdea3f59c6207a45
 DIST xattr-1.3.1.crate 12580 BLAKE2B 25c414d761a7fcd23bbe057add62c6da971cf33149066aa024320ab80e0ec8e8e8d5d3d0506e8de954b8f8c178d34c52a00a5fa9aa109510678098a3e3564b7f SHA512 4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280
 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
-DIST zerocopy-0.7.33.crate 151013 BLAKE2B d9f811a98d0565421cfffcd2e36ef4370c8d2b0f364f0ccfe44d63d6bfc0cb302a0a04659a33f43e2b1cf7cd296b5800548f74f1b43ac15c7d7b2830a2521726 SHA512 8c21b9d743369ca1ed9b56e7cf87e20041b5436aa4727c72e5a6763dde15ccd277a4117aac3d37005a7f1a063dce7c44625aa2cf7de435204d13c86aa6c70a58
 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.33.crate 37907 BLAKE2B 9106804643067ca3d21a409fc4dc8f86792a142cd770679d49d29da0fad148de00c105fd18f0ca7a615b4c99ad86242fff17043e0ad4e5c5375fa088e2fac2b0 SHA512 8cdb8164906029da51f604675a7c03ae0b60e7ba43a7273cd93028f814d4fe15b231b65b47df4cae1898c154e9a06701dea81bc82278e1732eae17a422b28229
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
diff --git a/dev-vcs/stgit/stgit-2.4.11.ebuild b/dev-vcs/stgit/stgit-2.4.11.ebuild
new file mode 100644
index 000000000000..4ad2d8e33b6a
--- /dev/null
+++ b/dev-vcs/stgit/stgit-2.4.11.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.1
+
+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.86
+	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.14
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	clap@4.5.16
+	clap_builder@4.5.15
+	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.24
+	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.10
+	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.9
+	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.4.0
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itoa@1.0.11
+	jiff-tzdb-platform@0.1.0
+	jiff-tzdb@0.1.0
+	jiff@0.1.10
+	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.34
+	ryu@1.0.18
+	same-file@1.0.6
+	schannel@0.1.23
+	scopeguard@1.2.0
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.127
+	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.76
+	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.4.12.ebuild b/dev-vcs/stgit/stgit-2.4.12.ebuild
new file mode 100644
index 000000000000..84fa72cec8d1
--- /dev/null
+++ b/dev-vcs/stgit/stgit-2.4.12.ebuild
@@ -0,0 +1,211 @@
+# 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.4.7.ebuild b/dev-vcs/stgit/stgit-2.4.7.ebuild
deleted file mode 100644
index 01bd8dd3f73a..000000000000
--- a/dev-vcs/stgit/stgit-2.4.7.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.1
-
-EAPI=8
-
-CRATES="
-	adler@1.0.2
-	ahash@0.8.11
-	allocator-api2@0.2.18
-	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.82
-	arc-swap@1.7.1
-	autocfg@1.3.0
-	bitflags@1.3.2
-	bitflags@2.5.0
-	bstr@1.9.1
-	bzip2-rs@0.1.2
-	cc@1.0.96
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	clap@4.5.4
-	clap_builder@4.5.2
-	clap_lex@0.7.0
-	clru@0.6.2
-	colorchoice@1.0.1
-	crc32fast@1.4.0
-	ctrlc@3.4.4
-	curl-sys@0.4.72+curl-8.6.0
-	curl@0.4.46
-	deranged@0.3.11
-	dunce@1.0.4
-	encoding_rs@0.8.34
-	equivalent@1.0.1
-	errno@0.3.8
-	faster-hex@0.9.0
-	fastrand@2.1.0
-	filetime@0.2.23
-	flate2@1.0.30
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	gix-actor@0.31.1
-	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.1
-	gix-date@0.8.5
-	gix-diff@0.43.0
-	gix-discover@0.31.0
-	gix-features@0.38.1
-	gix-fs@0.10.2
-	gix-glob@0.16.2
-	gix-hash@0.14.2
-	gix-hashtable@0.5.2
-	gix-index@0.32.1
-	gix-lock@13.1.1
-	gix-macros@0.1.4
-	gix-object@0.42.1
-	gix-odb@0.60.0
-	gix-pack@0.50.0
-	gix-path@0.10.7
-	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-tempfile@13.1.1
-	gix-trace@0.1.9
-	gix-traverse@0.39.0
-	gix-url@0.27.3
-	gix-utils@0.1.12
-	gix-validate@0.8.4
-	gix@0.62.0
-	hashbrown@0.14.5
-	hermit-abi@0.3.9
-	home@0.5.9
-	idna@0.5.0
-	indexmap@2.2.6
-	is-terminal@0.4.12
-	is_terminal_polyfill@1.70.0
-	itoa@1.0.11
-	libc@0.2.154
-	libz-sys@1.1.16
-	linux-raw-sys@0.4.13
-	lock_api@0.4.12
-	memchr@2.7.2
-	memmap2@0.9.4
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	nix@0.28.0
-	nom@7.1.3
-	num-conv@0.1.0
-	num_threads@0.1.7
-	once_cell@1.19.0
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	percent-encoding@2.3.1
-	pkg-config@0.3.30
-	powerfmt@0.2.0
-	proc-macro2@1.0.81
-	prodash@28.0.0
-	quote@1.0.36
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	regex-automata@0.4.6
-	rustix@0.38.34
-	ryu@1.0.17
-	same-file@1.0.6
-	schannel@0.1.23
-	scopeguard@1.2.0
-	serde@1.0.200
-	serde_derive@1.0.200
-	serde_json@1.0.116
-	sha1_smol@1.0.0
-	shell-words@1.1.0
-	smallvec@1.13.2
-	socket2@0.5.7
-	strsim@0.11.1
-	syn@2.0.60
-	tar@0.4.40
-	tempfile@3.10.1
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	thiserror-impl@1.0.59
-	thiserror@1.0.59
-	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-bom@2.0.3
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	url@2.5.0
-	utf8parse@0.2.1
-	vcpkg@0.2.15
-	version_check@0.9.4
-	walkdir@2.5.0
-	winapi-util@0.1.8
-	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.6.7
-	xattr@1.3.1
-	zerocopy-derive@0.7.33
-	zerocopy@0.7.33
-"
-
-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.4.9.ebuild b/dev-vcs/stgit/stgit-2.4.9.ebuild
deleted file mode 100644
index 7ba7006ae587..000000000000
--- a/dev-vcs/stgit/stgit-2.4.9.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.1
-
-EAPI=8
-
-CRATES="
-	adler@1.0.2
-	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.86
-	arc-swap@1.7.1
-	autocfg@1.3.0
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bstr@1.10.0
-	bzip2-rs@0.1.2
-	cc@1.1.6
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	clap@4.5.11
-	clap_builder@4.5.11
-	clap_lex@0.7.2
-	clru@0.6.2
-	colorchoice@1.0.2
-	crc32fast@1.4.2
-	ctrlc@3.4.4
-	curl-sys@0.4.73+curl-8.8.0
-	curl@0.4.46
-	deranged@0.3.11
-	dunce@1.0.4
-	encoding_rs@0.8.34
-	equivalent@1.0.1
-	errno@0.3.9
-	faster-hex@0.9.0
-	fastrand@2.1.0
-	filetime@0.2.23
-	flate2@1.0.30
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	gix-actor@0.31.5
-	gix-bitmap@0.2.11
-	gix-chunk@0.4.8
-	gix-command@0.3.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
-	hashbrown@0.14.5
-	hermit-abi@0.3.9
-	home@0.5.9
-	idna@0.5.0
-	indexmap@2.2.6
-	is-terminal@0.4.12
-	is_terminal_polyfill@1.70.1
-	itoa@1.0.11
-	libc@0.2.155
-	libz-sys@1.1.18
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	memchr@2.7.4
-	memmap2@0.9.4
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.4
-	nix@0.28.0
-	nom@7.1.3
-	num-conv@0.1.0
-	num_threads@0.1.7
-	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
-	powerfmt@0.2.0
-	proc-macro2@1.0.86
-	prodash@28.0.0
-	quote@1.0.36
-	redox_syscall@0.4.1
-	redox_syscall@0.5.3
-	regex-automata@0.4.7
-	rustix@0.38.34
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	scopeguard@1.2.0
-	serde@1.0.204
-	serde_derive@1.0.204
-	serde_json@1.0.120
-	sha1_smol@1.0.1
-	shell-words@1.1.0
-	smallvec@1.13.2
-	socket2@0.5.7
-	strsim@0.11.1
-	syn@2.0.72
-	tar@0.4.41
-	tempfile@3.10.1
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	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.8
-	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_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.16
-	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/svn2cl/svn2cl-0.12.ebuild b/dev-vcs/svn2cl/svn2cl-0.12.ebuild
index d788d5b194c9..36f563bce881 100644
--- a/dev-vcs/svn2cl/svn2cl-0.12.ebuild
+++ b/dev-vcs/svn2cl/svn2cl-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://arthurdejong.org/svn2cl/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxslt
diff --git a/dev-vcs/svn2cl/svn2cl-0.14.ebuild b/dev-vcs/svn2cl/svn2cl-0.14.ebuild
index 94b628285895..d6129d7be766 100644
--- a/dev-vcs/svn2cl/svn2cl-0.14.ebuild
+++ b/dev-vcs/svn2cl/svn2cl-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://arthurdejong.org/svn2cl/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="dev-libs/libxslt
 	dev-vcs/subversion"
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 5a84ffedf71a..07bdb79e08a2 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: apache-module.eclass
@@ -44,14 +44,19 @@
 # </IfDefine>
 # @CODE
 
-case ${EAPI} in
-	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
 
 if [[ -z ${_APACHE_MODULE_ECLASS} ]]; then
 _APACHE_MODULE_ECLASS=1
 
+case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 inherit depend.apache
 
 # ==============================================================================
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 3c9e89bda90e..0571b18ba525 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -13,11 +13,6 @@
 # Note: We require GNU m4, as does autoconf.  So feel free to use any features
 # from the GNU version of m4 without worrying about other variants (i.e. BSD).
 
-case ${EAPI} in
-	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ ${_AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then
 	# See if we were included already, but someone changed the value
 	# of AUTOTOOLS_AUTO_DEPEND on us.  We could reload the entire
@@ -31,6 +26,15 @@ fi
 if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then
 _AUTOTOOLS_ECLASS=1
 
+case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 [[ ${EAPI} == 6 ]] && inherit eqawarn
 
 GNUCONFIG_AUTO_DEPEND=no
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index df1a2a54d39a..be506793ae94 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bash-completion-r1.eclass
@@ -29,7 +29,11 @@ _BASH_COMPLETION_R1_ECLASS=1
 inherit toolchain-funcs
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 4e56db951196..4f7ba663beba 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cdrom.eclass
@@ -15,14 +15,18 @@
 # eclass will require RESTRICT="bindist" but the point still stands.
 # The functions are generally called in src_unpack.
 
-case ${EAPI:-0} in
-	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_CDROM_ECLASS} ]]; then
 _CDROM_ECLASS=1
 
+case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 inherit portability
 
 # @ECLASS_VARIABLE: CDROM_OPTIONAL
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index fac2f4553d74..02ff61187c45 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: check-reqs.eclass
@@ -38,14 +38,18 @@
 # These checks should probably mostly work on non-Linux, and they should
 # probably degrade gracefully if they don't. Probably.
 
+if [[ -z ${_CHECK_REQS_ECLASS} ]]; then
+_CHECK_REQS_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_CHECK_REQS_ECLASS} ]]; then
-_CHECK_REQS_ECLASS=1
-
 # @ECLASS_VARIABLE: CHECKREQS_MEMORY
 # @DEFAULT_UNSET
 # @DESCRIPTION:
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 8f0469931d2c..60926c298f04 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: depend.apache.eclass
@@ -40,12 +40,13 @@
 # }
 # @CODE
 
-case ${EAPI:-0} in
-	6|7|8)
-		;;
-	*)
-		die "EAPI=${EAPI} is not supported by depend.apache.eclass"
+case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
 		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # ==============================================================================
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index 780971342ba1..144514c8f7c2 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: desktop.eclass
@@ -8,7 +8,11 @@
 # @BLURB: support for desktop files, menus, and icons
 
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 0f9dc8d14d5e..5a6ebdcede8a 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1253,7 +1253,9 @@ distutils_pep517_install() {
 	fi
 
 	local cmd=() config_settings=
-	has cargo ${INHERITED} && cmd+=( cargo_env )
+	if has cargo ${INHERITED} && [[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]]; then
+		cmd+=( cargo_env )
+	fi
 
 	case ${DISTUTILS_USE_PEP517} in
 		maturin)
@@ -2109,8 +2111,10 @@ _distutils-r1_post_python_install() {
 		local strays=()
 		local p
 		mapfile -d $'\0' -t strays < <(
+			# jar for jpype, https://bugs.gentoo.org/937642
 			find "${sitedir}" -maxdepth 1 -type f '!' '(' \
 					-name '*.egg-info' -o \
+					-name '*.jar' -o \
 					-name '*.pth' -o \
 					-name '*.py' -o \
 					-name '*.pyi' -o \
diff --git a/eclass/eapi7-ver.eclass b/eclass/eapi7-ver.eclass
index a23e76ad3ee3..85c0856f73b3 100644
--- a/eclass/eapi7-ver.eclass
+++ b/eclass/eapi7-ver.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: eapi7-ver.eclass
 # @MAINTAINER:
 # PMS team <pms@gentoo.org>
diff --git a/eclass/ecm-common.eclass b/eclass/ecm-common.eclass
new file mode 100644
index 000000000000..c0c2b4f7e644
--- /dev/null
+++ b/eclass/ecm-common.eclass
@@ -0,0 +1,401 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: ecm-common.eclass
+# @MAINTAINER:
+# kde@gentoo.org
+# @SUPPORTED_EAPIS: 8
+# @PROVIDES: cmake
+# @BLURB: Standalone CMake calling std. ECM macros to install common files only.
+# @DESCRIPTION:
+# This eclass is used for installing common files of packages using ECM macros,
+# most of the time translations, but optionally also icons and kcfg files. This
+# is mainly useful for packages split from a single upstream tarball, or for
+# collision handling of slotted package versions, which need to share a common
+# files package.
+# Conventionally we will use ${PN}-common for these split packages.
+
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_ECM_COMMON_ECLASS} ]]; then
+_ECM_COMMON_ECLASS=1
+
+inherit cmake
+
+# @ECLASS_VARIABLE: KFMIN
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Minimum version of Frameworks to require.  Default value for kde-frameworks
+# is ${PV} and 6.0.0 baseline for everything else.
+# If set to <5.240, it is assumed dependencies are fulfilled by KF5/Qt5
+# alternatively, thus a block of SLOT=5 shadow dependencies added.
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+	: "${KFMIN:=$(ver_cut 1-2)}"
+fi
+: "${KFMIN:=6.0.0}"
+
+# @ECLASS_VARIABLE: _KFSLOT
+# @INTERNAL
+# @DESCRIPTION:
+# KDE Frameworks main slot dependency for consistently finding all KF5 or KF6
+# in CMakeLists.txt.  Consistency over installed KF packages is established via
+# BDEPEND, then detected in pkg_setup().
+# Is passed as -DQT_MAJOR_VERSION=${_KFSLOT} in src_configure() too.
+_KFSLOT=6
+
+# @ECLASS_VARIABLE: KF5_BDEPEND
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Dynamic KF5 dependency list.
+if [[ ${KF5_BDEPEND} ]]; then
+	[[ ${KF5_BDEPEND@a} == *a* ]] ||
+		die "KF5_BDEPEND must be an array"
+else
+	KF5_BDEPEND=( )
+fi
+
+# @ECLASS_VARIABLE: KF6_BDEPEND
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Dynamic KF6 dependency list.
+if [[ ${KF6_BDEPEND} ]]; then
+	[[ ${KF6_BDEPEND@a} == *a* ]] ||
+		die "KF6_BDEPEND must be an array"
+else
+	KF6_BDEPEND=( )
+fi
+
+# @ECLASS_VARIABLE: ECM_I18N
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Will accept "true" (default) or "false".  If set to "false", do nothing.
+# Otherwise, add kde-frameworks/ki18n:* to BDEPEND, find KF[56]I18n and let
+# ki18n_install(po) generate and install translations.
+: "${ECM_I18N:=true}"
+
+# @ECLASS_VARIABLE: ECM_HANDBOOK
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Will accept "true" or "false" (default).  If set to "false", do nothing.
+# Otherwise, add "+handbook" to IUSE, add kde-frameworks/kdoctools:* to BDEPEND
+# find KF[56]DocTools in CMake, call add_subdirectory(ECM_HANDBOOK_DIRS)
+# and let let kdoctools_install(po) generate and install translated docbook
+# files.
+: "${ECM_HANDBOOK:=false}"
+
+# @ECLASS_VARIABLE: ECM_HANDBOOK_DIRS
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Default is "doc" which is correct for the vast majority of packages. Specifies
+# one or more directories containing untranslated docbook file(s) relative to
+# ${S} to be added via add_subdirectory.
+if [[ ${ECM_HANDBOOK_DIRS} ]]; then
+	[[ ${ECM_HANDBOOK_DIRS@a} == *a* ]] ||
+		die "ECM_HANDBOOK_DIRS must be an array"
+else
+	ECM_HANDBOOK_DIRS=( doc )
+fi
+
+# @ECLASS_VARIABLE: ECM_INSTALL_FILES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <file>:<destination_path> tuples to install by CMake via
+# install(FILES <file> DESTINATION <destination_path>)
+if [[ ${ECM_INSTALL_FILES} ]]; then
+	[[ ${ECM_INSTALL_FILES@a} == *a* ]] ||
+		die "ECM_INSTALL_FILES must be an array"
+fi
+
+# @ECLASS_VARIABLE: ECM_INSTALL_ICONS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <icon>:<icon_install_dir> tuples to feed to ECMInstallIcons
+# via ecm_install_icons(ICONS <icon> DESTINATION <icon_install_dir)
+if [[ ${ECM_INSTALL_ICONS} ]]; then
+	[[ ${ECM_INSTALL_ICONS@a} == *a* ]] ||
+		die "ECM_INSTALL_ICONS must be an array"
+fi
+
+# @ECLASS_VARIABLE: ECM_KCM_TARGETS
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Array of <target>:<subdir> tuples to feed to ECMInstallIcons via
+# ecmcommon_generate_desktop_file(<target> <subdir>), which is this
+# eclass adaptation of kcmutils_generate_desktop_file.
+if [[ ${ECM_KCM_TARGETS} ]]; then
+	[[ ${ECM_KCM_TARGETS@a} == *a* ]] ||
+		die "ECM_KCM_TARGETS must be an array"
+fi
+
+DESCRIPTION="Common files for ${PN/-common/}"
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:*"
+
+case ${ECM_I18N} in
+	true)
+		KF5_BDEPEND+=( "kde-frameworks/ki18n:5" )
+		KF6_BDEPEND+=( "kde-frameworks/ki18n:6" )
+		;;
+	false) ;;
+	*)
+		eerror "Unknown value for \${ECM_I18N}"
+		die "Value ${ECM_I18N} is not supported"
+		;;
+esac
+
+case ${ECM_HANDBOOK} in
+	true)
+		IUSE+=" +handbook"
+		KF5_BDEPEND+=( "handbook? ( kde-frameworks/kdoctools:5 )" )
+		KF6_BDEPEND+=( "handbook? ( kde-frameworks/kdoctools:6 )" )
+		;;
+	false) ;;
+	*)
+		eerror "Unknown value for \${ECM_HANDBOOK}"
+		die "Value ${ECM_HANDBOOK} is not supported"
+		;;
+esac
+
+if [[ ${ECM_KCM_TARGETS} ]]; then
+	KF5_BDEPEND+=( "kde-frameworks/kcmutils:5" )
+	KF6_BDEPEND+=( "kde-frameworks/kcmutils:6" )
+fi
+
+if $(ver_test ${KFMIN} -lt 5.240) && [[ ${KF6_BDEPEND} && ${KF5_BDEPEND} ]]; then
+	BDEPEND+=" || ( ( ${KF6_BDEPEND[*]} ) ( ${KF5_BDEPEND[*]} ) )"
+else
+	BDEPEND+=" ${KF6_BDEPEND[*]}"
+fi
+
+# @FUNCTION: _ecm-common_preamble
+# @INTERNAL
+# @DESCRIPTION:
+# Create a CMakeLists.txt file with minimum ECM setup.
+_ecm-common_preamble() {
+	cat > CMakeLists.txt <<- _EOF_ || die
+		cmake_minimum_required(VERSION 3.16)
+		project(${PN} VERSION ${PV})
+
+		find_package(ECM "${KFMIN}" REQUIRED NO_MODULE)
+		set(CMAKE_MODULE_PATH \${ECM_MODULE_PATH})
+
+		# Set by pkg_setup(); Use this if need to differ between KF5 or KF6
+		set(KFSLOT ${_KFSLOT})
+		set(KDE_INSTALL_DOCBUNDLEDIR "${EPREFIX}/usr/share/help" CACHE PATH "")
+
+		include(KDEInstallDirs)
+		include(ECMOptionalAddSubdirectory) # commonly used
+		include(FeatureSummary)
+	_EOF_
+
+	if [[ ${ECM_INSTALL_ICONS} ]]; then
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			include(ECMInstallIcons)
+		_EOF_
+	fi
+}
+
+# @FUNCTION: _ecm-common_i18n
+# @INTERNAL
+# @DESCRIPTION:
+# Find KF[56]I18n and call ki18n_install(po).
+_ecm-common_i18n() {
+	[[ ${ECM_I18N} == true ]] || return
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KF\${KFSLOT}I18n REQUIRED)
+		ki18n_install(po)
+	_EOF_
+}
+
+# @FUNCTION: _ecm-common_docs
+# @INTERNAL
+# @DESCRIPTION:
+# Find KF[56]DocTools, call kdoctools_install(po) and
+# add_subdirectory(${ECM_HANDBOOK_DIRS})
+_ecm-common_docs() {
+	{ in_iuse handbook && use handbook; } || return
+
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KF\${KFSLOT}DocTools REQUIRED)
+		kdoctools_install(po)
+	_EOF_
+
+	local i
+	for i in "${ECM_HANDBOOK_DIRS[@]}"; do
+		if [[ -d ${i} ]]; then
+			cat >> CMakeLists.txt <<- _EOF_ || die
+				add_subdirectory(${i})
+			_EOF_
+		fi
+	done
+}
+
+# @FUNCTION: _ecm-common_generate_desktop_file
+# @INTERNAL
+# @DESCRIPTION:
+# Find KF[56]KCMUtils and iterate through ECM_KCM_TARGETS to generate
+# desktop files out of json.
+_ecm-common_generate_desktop_file() {
+	[[ ${ECM_KCM_TARGETS} ]] || return
+
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		find_package(KF\${KFSLOT}KCMUtils REQUIRED)
+		# extracted from kcmutils_generate_desktop_file(kcm_target)
+		function(ecmcommon_generate_desktop_file kcm_target subdir)
+			set(IN_FILE \${CMAKE_CURRENT_SOURCE_DIR}/\${subdir}\${kcm_target}.json)
+			set(OUT_FILE \${CMAKE_CURRENT_BINARY_DIR}/\${kcm_target}.desktop)
+			add_custom_target(\${kcm_target}-kcm-desktop-gen ALL
+				COMMAND KF\${KFSLOT}::kcmdesktopfilegenerator \${IN_FILE} \${OUT_FILE}
+				DEPENDS \${IN_FILE})
+			install(FILES \${OUT_FILE} DESTINATION \${KDE_INSTALL_APPDIR})
+		endfunction()
+	_EOF_
+
+	local i
+	for i in "${ECM_KCM_TARGETS[@]}"; do
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ecmcommon_generate_desktop_file(${i%:*} ${i#*:})
+		_EOF_
+	done
+}
+
+# @FUNCTION: _ecm-common_ecm_install_icons
+# @INTERNAL
+# @DESCRIPTION:
+# Installs icons listed in ECM_INSTALL_ICONS using ecm_install_icons
+_ecm-common_ecm_install_icons() {
+	[[ ${ECM_INSTALL_ICONS} ]] || return
+	local i
+	for i in "${ECM_INSTALL_ICONS[@]}"; do
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ecm_install_icons(ICONS ${i%:*} DESTINATION ${i#*:})
+		_EOF_
+	done
+}
+
+# @FUNCTION: _ecm-common_ecm_install_files
+# @INTERNAL
+# @DESCRIPTION:
+# Installs files listed in ECM_INSTALL_FILES using install(FILES ...)
+_ecm-common_ecm_install_files() {
+	[[ ${ECM_INSTALL_FILES} ]] || return
+	local i
+	for i in "${ECM_INSTALL_FILES[@]}"; do
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			install(FILES ${i%:*} DESTINATION ${i#*:})
+		_EOF_
+	done
+}
+
+# @FUNCTION: ecm-common_inject_heredoc
+# @DESCRIPTION:
+# Override this to inject custom Heredoc into the root CMakeLists.txt
+ecm-common_inject_heredoc() {
+	debug-print-function ${FUNCNAME} "$@"
+}
+
+# @FUNCTION: _ecm-common_summary
+# @INTERNAL
+# @DESCRIPTION:
+# Just calls feature_summary
+_ecm-common_summary() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+
+		feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+	_EOF_
+}
+
+# @FUNCTION: _ecm-common-check_deps
+# @INTERNAL
+# @DESCRIPTION:
+# Check existence of requested KF6 dependencies.
+_ecm-common-check_deps() {
+	local chk=0
+	case ${1} in
+		i18n)
+			if [[ ${ECM_I18N} ]]; then
+				chk=$(has_version -b "kde-frameworks/ki18n:6")
+			fi
+			;;
+		doctools)
+			if [[ ${ECM_HANDBOOK} ]] && in_iuse handbook; then
+				if use handbook; then
+					chk=$(has_version -b "kde-frameworks/kdoctools:6")
+				fi
+			fi
+			;;
+		kcmutils)
+			if [[ ${ECM_KCM_TARGETS} ]]; then
+				chk=$(has_version -b "kde-frameworks/kcmutils:6")
+			fi
+			;;
+		*)
+			eerror "Unknown value for _ecm-common-check_deps()"
+			die "Value ${1} is not supported"
+			;;
+	esac
+	return ${chk}
+}
+
+# @FUNCTION: ecm-common-check_deps
+# @DESCRIPTION:
+# Override this to add more KF6 has_version checks to pkg_setup(),
+# corresponding with any additional KF6_BDEPEND defined pre-inherit.
+# If false, we'll assume KF5 dependencies are fulfilled via BDEPEND.
+ecm-common-check_deps() {
+	return 0
+}
+
+# @FUNCTION: ecm-common_pkg_setup
+# @DESCRIPTION:
+# If KFMIN is not lower than 5.240 (default is 6.0.0), do nothing.
+# Otherwise, dDetermine which of KF5 or KF6-based depgraph is complete,
+# preferring KF6.  The result is stored in _KFSLOT, which is then handed
+# to CMakeLists.txt as KFSLOT var for further use.
+ecm-common_pkg_setup() {
+	$(ver_test ${KFMIN} -ge 5.240) && return
+
+	if _ecm-common-check_deps i18n && _ecm-common-check_deps doctools &&
+		_ecm-common-check_deps kcmutils && ecm-common-check_deps
+	then
+		_KFSLOT=6
+	else
+		_KFSLOT=5
+	fi
+}
+
+# @FUNCTION: ecm-common_src_prepare
+# @DESCRIPTION:
+# Wrapper for cmake_src_prepare with a Heredoc replacing the standard
+# root CMakeLists.txt file to only generate and install translations.
+ecm-common_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_ecm-common_preamble
+	_ecm-common_i18n
+	_ecm-common_docs
+	_ecm-common_generate_desktop_file
+	_ecm-common_ecm_install_icons
+	_ecm-common_ecm_install_files
+	ecm-common_inject_heredoc
+	_ecm-common_summary
+
+	cmake_src_prepare
+}
+
+# @FUNCTION: ecm-common_src_configure
+# @DESCRIPTION:
+# Passes -DQT_MAJOR_VERSION=${_KFSLOT} only.
+ecm-common_src_configure() {
+	# necessary for at least KF6KCMUtils
+	local mycmakeargs=( -DQT_MAJOR_VERSION=${_KFSLOT} )
+	cmake_src_configure
+}
+
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index c8731b8c0cff..fbe1a23cf205 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -84,8 +84,8 @@ fi
 
 # @ECLASS_VARIABLE: ECM_HANDBOOK
 # @DESCRIPTION:
-# Will accept "true", "false", "optional", "forceoptional". If set to "false",
-# do nothing.
+# Will accept "true", "false", "optional", "forceoptional", "forceoff".
+# If set to "false" (default), do nothing.
 # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and let
 # KF${_KFSLOT}DocTools generate and install the handbook from docbook file(s)
 # found in ECM_HANDBOOK_DIR. However if !handbook, disable build of
@@ -122,6 +122,15 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : "${ECM_QTHELP:=false}"
 
+# @ECLASS_VARIABLE: ECM_REMOVE_FROM_INSTALL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <paths> to remove from install image.
+if [[ ${ECM_REMOVE_FROM_INSTALL} ]]; then
+	[[ ${ECM_REMOVE_FROM_INSTALL@a} == *a* ]] ||
+		die "ECM_REMOVE_FROM_INSTALL must be an array"
+fi
+
 # @ECLASS_VARIABLE: ECM_TEST
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -233,7 +242,7 @@ case ${ECM_HANDBOOK} in
 		IUSE+=" +handbook"
 		BDEPEND+=" handbook? ( >=kde-frameworks/kdoctools-${KFMIN}:${_KFSLOT} )"
 		;;
-	false) ;;
+	false|forceoff) ;;
 	*)
 		eerror "Unknown value for \${ECM_HANDBOOK}"
 		die "Value ${ECM_HANDBOOK} is not supported"
@@ -446,6 +455,25 @@ ecm_punt_bogus_dep() {
 	fi
 }
 
+# @FUNCTION: _ecm_punt_kdoctools_install
+# @INTERNAL
+# @DESCRIPTION:
+# Disables kdoctools_install(po) call.
+_ecm_punt_kdoctools_install() {
+	sed -e "s/^ *kdoctools_install.*(po.*)/#& # disabled by ecm.eclass/" \
+		-i CMakeLists.txt || die
+}
+
+# @FUNCTION: ecm_punt_po_install
+# @DESCRIPTION:
+# Disables handling of po subdirectories, typically when the package
+# is outsourcing common files to a ${PN}-common split package.
+ecm_punt_po_install() {
+	_ecm_punt_kdoctools_install
+	sed -e "s/^ *ki18n_install.*(po.*)/#& # disabled by ecm.eclass/" \
+		-i CMakeLists.txt || die
+}
+
 # @FUNCTION: ecm_pkg_pretend
 # @DESCRIPTION:
 # Checks if the active compiler meets the minimum version requirements.
@@ -478,13 +506,16 @@ ecm_src_prepare() {
 	fi
 
 	# only enable handbook when required
-	if in_iuse handbook && ! use handbook ; then
+	if [[ ${ECM_HANDBOOK} == forceoff ]] ||
+		{ [[ ${ECM_HANDBOOK} = forceoptional ]] && in_iuse handbook && ! use handbook; }
+	then
+		ecm_punt_kf_module DocTools
+		_ecm_punt_kdoctools_install
+	fi
+	if [[ ${ECM_HANDBOOK} == forceoff ]] ||
+		{ in_iuse handbook && ! use handbook; }
+	then
 		cmake_comment_add_subdirectory ${ECM_HANDBOOK_DIR}
-
-		if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then
-			ecm_punt_kf_module DocTools
-			sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
-		fi
 	fi
 
 	# drop translations when nls is not wanted
@@ -657,9 +688,9 @@ ecm_src_install() {
 
 	cmake_src_install
 
+	local f
 	# bug 621970
 	if [[ -d "${ED}"/usr/share/applications ]]; then
-		local f
 		for f in "${ED}"/usr/share/applications/*.desktop; do
 			if [[ -x ${f} ]]; then
 				einfo "Removing executable bit from ${f#${ED}}"
@@ -694,6 +725,10 @@ ecm_src_install() {
 			popd > /dev/null || die
 		fi
 	fi
+
+	for f in "${ECM_REMOVE_FROM_INSTALL[@]}"; do
+		rm -r "${ED}"${f} || die
+	done
 }
 
 # @FUNCTION: ecm_pkg_preinst
diff --git a/eclass/eqawarn.eclass b/eclass/eqawarn.eclass
index 288976182fb3..df6b13151d74 100644
--- a/eclass/eqawarn.eclass
+++ b/eclass/eqawarn.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: eqawarn.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index c6b1ad80e12e..02cd2dcfc592 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -10,14 +10,18 @@
 # This eclass contains a suite of functions to help developers sanely
 # and safely manage toolchain flags in their builds.
 
+if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
+_FLAG_O_MATIC_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
-_FLAG_O_MATIC_ECLASS=1
-
 inherit toolchain-funcs
 
 [[ ${EAPI} == 6 ]] && inherit eqawarn
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 855dcba59a39..5e2ce1fc68e4 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fortran-2.eclass
@@ -26,14 +26,18 @@
 #
 # FORTRAN_NEED_OPENMP=1
 
+if [[ -z ${_FORTRAN_2_ECLASS} ]]; then
+_FORTRAN_2_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_FORTRAN_2_ECLASS} ]]; then
-_FORTRAN_2_ECLASS=1
-
 inherit toolchain-funcs
 
 # @ECLASS_VARIABLE: FORTRAN_NEED_OPENMP
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 3f8126dd1c01..8089cbb53bf7 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -94,7 +94,6 @@ if $(ver_test -gt 24.01.75); then
 		dragon | \
 		elisa | \
 		eventviews | \
-		ffmpegthumbs | \
 		filelight | \
 		granatier | \
 		grantlee-editor | \
@@ -256,6 +255,7 @@ if $(ver_test -gt 24.04.75); then
 		itinerary | \
 		kio-perldoc | \
 		kolourpaint | \
+		libkcompactdisc | \
 		signon-kwallet-extension)
 			RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
 		*) ;;
@@ -267,7 +267,6 @@ if $(ver_test -gt 24.07.75); then
 	case ${PN} in
 		k3b | \
 		kde-dev-scripts | \
-		kdesdk-thumbnailers | \
 		kdevelop | \
 		kdevelop-php | \
 		kdevelop-python | \
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index fb73087aeacf..afcb8feee04e 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -16,14 +16,18 @@
 # other files that come with automake, e.g. depcomp, mkinstalldirs, etc.
 #
 
-case ${EAPI:-0} in
-	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then
  _GNUCONFIG_CLASS=1
 
+case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @ECLASS_VARIABLE: GNUCONFIG_DEPEND
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
diff --git a/eclass/guile-single.eclass b/eclass/guile-single.eclass
index 41ede32928bc..91f6036139da 100644
--- a/eclass/guile-single.eclass
+++ b/eclass/guile-single.eclass
@@ -2,20 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: guile-single.eclass
-# @PROVIDES: guile-utils
 # @MAINTAINER:
 # Gentoo Scheme project <scheme@gentoo.org>
 # @AUTHOR:
 # Author: Arsen Arsenović <arsen@gentoo.org>
-# Inspired by prior work in the Gentoo Python ecosystem.
-# @BLURB: Utilities for packages that build against a single Guile.
 # @SUPPORTED_EAPIS: 8
 # @PROVIDES: guile-utils
+# @BLURB: Utilities for packages that build against a single Guile.
 # @DESCRIPTION:
 # This eclass facilitates packages building against a single slot of
 # Guile, which is normally something that uses Guile for extending, like
 # GNU Make, or for programs built in Guile, like Haunt.
 #
+# Inspired by prior work in the Gentoo Python ecosystem.
+#
 # These packages should use guile_gen_cond_dep to generate a dependency
 # string for their Guile package dependencies (i.e. other Guile single-
 # and multi-implementation packages).  They should also utilize
diff --git a/eclass/guile-utils.eclass b/eclass/guile-utils.eclass
index 3f122f63a36f..09ca5aabe502 100644
--- a/eclass/guile-utils.eclass
+++ b/eclass/guile-utils.eclass
@@ -6,13 +6,14 @@
 # Gentoo Scheme project <scheme@gentoo.org>
 # @AUTHOR:
 # Author: Arsen Arsenović <arsen@gentoo.org>
-# Inspired by prior work in the Gentoo Python ecosystem.
-# @BLURB: Common code between GNU Guile-related eclasses and ebuilds.
 # @SUPPORTED_EAPIS: 8
+# @BLURB: Common code between GNU Guile-related eclasses and ebuilds.
 # @DESCRIPTION:
 # This eclass contains various bits of common code between
 # dev-scheme/guile, Guile multi-implementation ebuilds and Guile
 # single-implementation ebuilds.
+#
+# Inspired by prior work in the Gentoo Python ecosystem.
 
 case "${EAPI}" in
 	8) ;;
diff --git a/eclass/guile.eclass b/eclass/guile.eclass
index d487d765e86a..9310cd060da9 100644
--- a/eclass/guile.eclass
+++ b/eclass/guile.eclass
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: guile.eclass
-# @PROVIDES: guile-utils
 # @MAINTAINER:
 # Gentoo Scheme project <scheme@gentoo.org>
 # @AUTHOR:
 # Author: Arsen Arsenović <arsen@gentoo.org>
 # Inspired by prior work in the Gentoo Python ecosystem.
 # @SUPPORTED_EAPIS: 8
+# @PROVIDES: guile-utils
 # @BLURB: Utilities for packages multi-implementation Guile packages.
 # @DESCRIPTION:
 # This eclass facilitates building against many Guile implementations,
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index b0d2fb216b10..ef7d306dc9b1 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -10,6 +10,7 @@
 # @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: java-utils-2
 # @BLURB: eclass for ant based Java packages
+# @DEPRECATED: none
 # @DESCRIPTION:
 # Eclass for Ant-based Java packages. Provides support for both automatic and
 # manual manipulation of build.xml files. Should be inherited after java-pkg-2
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index c17a9db26b3b..6da4efd222c2 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-2.eclass
@@ -13,14 +13,18 @@
 # This eclass should be inherited for pure Java packages, or by packages which
 # need to use Java.
 
+if [[ -z ${_JAVA_PKG_2_ECLASS} ]] ; then
+_JAVA_PKG_2_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_JAVA_PKG_2_ECLASS} ]] ; then
-_JAVA_PKG_2_ECLASS=1
-
 inherit java-utils-2
 
 # @ECLASS_VARIABLE: JAVA_PKG_IUSE
@@ -39,12 +43,6 @@ DEPEND="${JAVA_PKG_E_DEPEND}"
 # Nothing special for RDEPEND... just the same as DEPEND.
 RDEPEND="${DEPEND}"
 
-# Commons packages follow the same rules so do it here
-if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then
-	HOMEPAGE="http://commons.apache.org/${PN#commons-}/"
-	SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz"
-fi
-
 
 # @FUNCTION: java-pkg-2_pkg_setup
 # @DESCRIPTION:
@@ -63,6 +61,7 @@ java-pkg-2_src_prepare() {
 
 
 # @FUNCTION: java-pkg-2_src_compile
+# @DEPRECATED: none
 # @DESCRIPTION:
 # Default src_compile for java packages
 #
@@ -98,6 +97,7 @@ java-pkg-2_src_compile() {
 }
 
 # @FUNCTION: java-pkg-2_src_test
+# @DEPRECATED: none
 # @DESCRIPTION:
 # src_test, not exported.
 java-pkg-2_src_test() {
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 9c657cc4c1f9..43d9b749ba3d 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -17,14 +17,18 @@
 # that have optional Java support. In addition you can inherit java-ant-2 for
 # Ant-based packages.
 
+if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then
+_JAVA_UTILS_2_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then
-_JAVA_UTILS_2_ECLASS=1
-
 # EAPI 7 has version functions built-in. Use eapi7-ver for all earlier EAPIs.
 # Keep versionator inheritance in case consumers are using it implicitly.
 [[ ${EAPI} == 6 ]] && inherit eapi7-ver eqawarn multilib versionator
@@ -1140,7 +1144,7 @@ java-pkg_jarfrom() {
 # @USAGE: [--build-only] [--runtime-only] [--with-dependencies] <package1>[,<package2>...]
 # @DESCRIPTION:
 # Get the classpath provided by any number of packages
-# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
+# Among other things, this can be passed to 'javac -classpath'.
 # The providing packages are recorded as dependencies into package.env DEPEND
 # line, unless "--build-only" is passed as the very first argument, for jars
 # that have to be present only at build time and are not needed on runtime
@@ -2250,29 +2254,6 @@ java-pkg_force-compiler() {
 	JAVA_PKG_FORCE_COMPILER="$@"
 }
 
-# @FUNCTION: use_doc
-# @DESCRIPTION:
-#
-# Helper function for getting ant to build javadocs. If the user has USE=doc,
-# then 'javadoc' or the argument are returned. Otherwise, there is no return.
-#
-# The output of this should be passed to ant.
-# @CODE
-# Parameters:
-# $@ - Option value to return. Defaults to 'javadoc'
-#
-# Examples:
-# build javadocs by calling 'javadoc' target
-#	eant $(use_doc)
-#
-# build javadocs by calling 'apidoc' target
-#	eant $(use_doc apidoc)
-# @CODE
-# @RETURN string - Name of the target to create javadocs
-use_doc() {
-	use doc && echo ${@:-javadoc}
-}
-
 
 # @FUNCTION: java-pkg_init
 # @INTERNAL
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index c4f3db0028a9..ce87fd72acdd 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -47,6 +47,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	app-alternatives/cpio
 	app-alternatives/bc
+	dev-lang/perl
 	sys-devel/bison
 	sys-devel/flex
 	virtual/libelf
@@ -167,8 +168,8 @@ kernel-build_pkg_setup() {
 
 # @FUNCTION: kernel-build_src_configure
 # @DESCRIPTION:
-# Prepare the toolchain for building the kernel, get the default .config
-# or restore savedconfig, and get build tree configured for modprep.
+# Prepare the toolchain for building the kernel, get the .config file,
+# and get build tree configured for modprep.
 kernel-build_src_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -243,8 +244,7 @@ kernel-build_src_configure() {
 		MAKEARGS+=( KBZIP2="lbzip2" )
 	fi
 
-	restore_config .config
-	[[ -f .config ]] || die "Ebuild error: please copy default config into .config"
+	[[ -f .config ]] || die "Ebuild error: No .config, kernel-build_merge_configs was not called."
 
 	if [[ -z "${KV_LOCALVERSION}" ]]; then
 		KV_LOCALVERSION=$(sed -n -e 's#^CONFIG_LOCALVERSION="\(.*\)"$#\1#p' \
@@ -296,7 +296,16 @@ kernel-build_src_configure() {
 kernel-build_src_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	emake O="${WORKDIR}"/build "${MAKEARGS[@]}" all
+	local targets=( all )
+
+	if grep -q "CONFIG_CTF=y" "${WORKDIR}/modprep/.config"; then
+		targets+=( ctf )
+	fi
+
+	local target
+	for target in "${targets[@]}" ; do
+		emake O="${WORKDIR}"/build "${MAKEARGS[@]}" "${target}"
+	done
 }
 
 # @FUNCTION: kernel-build_src_test
@@ -306,6 +315,12 @@ kernel-build_src_compile() {
 kernel-build_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local targets=( modules_install )
+
+	if grep -q "CONFIG_CTF=y" "${WORKDIR}/modprep/.config"; then
+		targets+=( ctf_install )
+	fi
+
 	# Use the kernel build system to strip, this ensures the modules
 	# are stripped *before* they are signed or compressed.
 	local strip_args
@@ -313,9 +328,12 @@ kernel-build_src_test() {
 		strip_args="--strip-unneeded"
 	fi
 
-	emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
-		INSTALL_MOD_PATH="${T}" INSTALL_MOD_STRIP="${strip_args}" \
-		modules_install
+	local target
+	for target in "${targets[@]}" ; do
+		emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
+			INSTALL_MOD_PATH="${T}" INSTALL_MOD_STRIP="${strip_args}" \
+			"${target}"
+	done
 
 	kernel-install_test "${KV_FULL}" \
 		"${WORKDIR}/build/$(dist-kernel_get_image_path)" \
@@ -337,6 +355,10 @@ kernel-build_src_install() {
 		targets+=( dtbs_install )
 	fi
 
+	if grep -q "CONFIG_CTF=y" "${WORKDIR}/modprep/.config"; then
+		targets+=( ctf_install )
+	fi
+
 	# Use the kernel build system to strip, this ensures the modules
 	# are stripped *before* they are signed or compressed.
 	local strip_args
@@ -355,9 +377,12 @@ kernel-build_src_install() {
 		)
 	fi
 
-	emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
-		INSTALL_MOD_PATH="${ED}" INSTALL_MOD_STRIP="${strip_args}" \
-		INSTALL_PATH="${ED}/boot" "${compress[@]}" "${targets[@]}"
+	local target
+	for target in "${targets[@]}" ; do
+		emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
+			INSTALL_MOD_PATH="${ED}" INSTALL_MOD_STRIP="${strip_args}" \
+			INSTALL_PATH="${ED}/boot" "${compress[@]}" "${target}"
+	done
 
 	# note: we're using mv rather than doins to save space and time
 	# install main and arch-specific headers first, and scripts
@@ -430,6 +455,7 @@ kernel-build_src_install() {
 			mv "build/vmlinux" "${ED}${kernel_dir}/vmlinux" || die
 		fi
 		dostrip -x "${kernel_dir}/vmlinux"
+		dostrip -x "${kernel_dir}/vmlinux.ctfa"
 	fi
 
 	# strip empty directories
@@ -594,15 +620,22 @@ kernel-build_pkg_postinst() {
 # @FUNCTION: kernel-build_merge_configs
 # @USAGE: [distro.config...]
 # @DESCRIPTION:
-# Merge the config files specified as arguments (if any) into
-# the '.config' file in the current directory, then merge
-# any user-supplied configs from ${BROOT}/etc/kernel/config.d/*.config.
-# The '.config' file must exist already and contain the base
-# configuration.
+# Merge kernel config files.  The following is merged onto the '.config'
+# file in the current directory, in order:
+#
+# 1. Config files specified as arguments.
+# 2. Default module signing and compression configuration
+#    (if applicable).
+# 3. Config saved via USE=savedconfig (if applicable).
+# 4. Module signing key specified via MODULES_SIGN_KEY* variables.
+# 5. User-supplied configs from ${BROOT}/etc/kernel/config.d/*.config.
+#
+# This function must be called by the ebuild in the src_prepare phase.
 kernel-build_merge_configs() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ -f .config ]] || die "${FUNCNAME}: .config does not exist"
+	[[ -f .config ]] ||
+		die "${FUNCNAME}: No .config, please copy default config into .config"
 	has .config "${@}" &&
 		die "${FUNCNAME}: do not specify .config as parameter"
 
@@ -613,30 +646,16 @@ kernel-build_merge_configs() {
 
 	local merge_configs=( "${@}" )
 
-	if [[ ${KERNEL_IUSE_MODULES_SIGN} ]]; then
-		if use modules-sign; then
-			: "${MODULES_SIGN_HASH:=sha512}"
-			cat <<-EOF > "${WORKDIR}/modules-sign.config" || die
-				## Enable module signing
-				CONFIG_MODULE_SIG=y
-				CONFIG_MODULE_SIG_ALL=y
-				CONFIG_MODULE_SIG_FORCE=y
-				CONFIG_MODULE_SIG_${MODULES_SIGN_HASH^^}=y
-			EOF
-			if [[ -n ${MODULES_SIGN_KEY_CONTENTS} ]]; then
-				(umask 066 && touch "${T}/kernel_key.pem" || die)
-				echo "${MODULES_SIGN_KEY_CONTENTS}" > "${T}/kernel_key.pem" || die
-				unset MODULES_SIGN_KEY_CONTENTS
-				export MODULES_SIGN_KEY="${T}/kernel_key.pem"
-			fi
-			if [[ ${MODULES_SIGN_KEY} == pkcs11:* || -r ${MODULES_SIGN_KEY} ]]; then
-				echo "CONFIG_MODULE_SIG_KEY=\"${MODULES_SIGN_KEY}\"" \
-					>> "${WORKDIR}/modules-sign.config"
-			elif [[ -n ${MODULES_SIGN_KEY} ]]; then
-				die "MODULES_SIGN_KEY=${MODULES_SIGN_KEY} not found or not readable!"
-			fi
-			merge_configs+=( "${WORKDIR}/modules-sign.config" )
-		fi
+	if [[ ${KERNEL_IUSE_MODULES_SIGN} ]] && use modules-sign; then
+		: "${MODULES_SIGN_HASH:=sha512}"
+		cat <<-EOF > "${WORKDIR}/modules-sign.config" || die
+			## Enable module signing
+			CONFIG_MODULE_SIG=y
+			CONFIG_MODULE_SIG_ALL=y
+			CONFIG_MODULE_SIG_FORCE=y
+			CONFIG_MODULE_SIG_${MODULES_SIGN_HASH^^}=y
+		EOF
+		merge_configs+=( "${WORKDIR}/modules-sign.config" )
 	fi
 
 	# Only semi-related but let's use that to avoid changing stable ebuilds.
@@ -650,6 +669,27 @@ kernel-build_merge_configs() {
 		merge_configs+=( "${WORKDIR}/module-compress.config" )
 	fi
 
+	restore_config "${WORKDIR}/savedconfig.config"
+	if [[ -f ${WORKDIR}/savedconfig.config ]]; then
+		merge_configs+=( "${WORKDIR}/savedconfig.config" )
+	fi
+
+	if [[ ${KERNEL_IUSE_MODULES_SIGN} ]] && use modules-sign; then
+		if [[ -n ${MODULES_SIGN_KEY_CONTENTS} ]]; then
+			(umask 066 && touch "${T}/kernel_key.pem" || die)
+			echo "${MODULES_SIGN_KEY_CONTENTS}" > "${T}/kernel_key.pem" || die
+			unset MODULES_SIGN_KEY_CONTENTS
+			export MODULES_SIGN_KEY="${T}/kernel_key.pem"
+		fi
+		if [[ ${MODULES_SIGN_KEY} == pkcs11:* || -r ${MODULES_SIGN_KEY} ]]; then
+			echo "CONFIG_MODULE_SIG_KEY=\"${MODULES_SIGN_KEY}\"" \
+				>> "${WORKDIR}/modules-sign-key.config"
+			merge_configs+=( "${WORKDIR}/modules-sign-key.config" )
+		elif [[ -n ${MODULES_SIGN_KEY} ]]; then
+			die "MODULES_SIGN_KEY=${MODULES_SIGN_KEY} not found or not readable!"
+		fi
+	fi
+
 	if [[ ${#user_configs[@]} -gt 0 ]]; then
 		elog "User config files are being applied:"
 		local x
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index bd6141e1ede9..b36b1fd365d3 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -18,6 +18,15 @@ if [[ -z ${_LIBTOOL_ECLASS} ]]; then
 _LIBTOOL_ECLASS=1
 
 case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+case ${EAPI} in
 	6) DEPEND=">=app-portage/elt-patches-20240116" ;;
 	7|8) BDEPEND=">=app-portage/elt-patches-20240116" ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass
index 9911a6ddee12..120fb019d74a 100644
--- a/eclass/linux-mod-r1.eclass
+++ b/eclass/linux-mod-r1.eclass
@@ -121,6 +121,7 @@ DEPEND="
 	virtual/linux-sources
 "
 BDEPEND="
+	dev-util/pahole
 	sys-apps/kmod[tools]
 	modules-sign? (
 		dev-libs/openssl
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 4b49d35a542b..f8953ec11826 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -72,14 +72,11 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 			_LLVM_SOURCE_TYPE=snapshot
 
 			case ${PV} in
-				20.0.0_pre20240815)
-					EGIT_COMMIT=db8ef6188cbbe2125e6d60bdef77a535105772df
+				20.0.0_pre20240910)
+					EGIT_COMMIT=bece0d7517bd0a036dc8a319514e4a8a5c497dee
 					;;
-				20.0.0_pre20240808)
-					EGIT_COMMIT=fd7d7882e7fa5a38d4bfde426120d4663718beb4
-					;;
-				20.0.0_pre20240801)
-					EGIT_COMMIT=130c135689ec12ab78c53645808524a8d28f7cae
+				20.0.0_pre20240830)
+					EGIT_COMMIT=5500e21942f7047344b6fee62d3e08c0ba2f9182
 					;;
 				*)
 					die "Unknown snapshot: ${PV}"
diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass
index 8432df0583bb..ad7075955153 100644
--- a/eclass/lua-single.eclass
+++ b/eclass/lua-single.eclass
@@ -1,10 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua-single.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# Marek Szuba <marecki@gentoo.org>
 # @AUTHOR:
 # Marek Szuba <marecki@gentoo.org>
 # Based on python-single-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 0ff36734dc8f..7272f80d0370 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -1,10 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua-utils.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# Marek Szuba <marecki@gentoo.org>
 # @AUTHOR:
 # Marek Szuba <marecki@gentoo.org>
 # Based on python-utils-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
@@ -144,18 +143,18 @@ _lua_wrapper_setup() {
 		_lua_export "${impl}" ELUA LUA
 
 		# Lua interpreter
-		ln -s "${EPREFIX}"/usr/bin/${ELUA} "${workdir}"/bin/lua || die
+		ln -s "${LUA}" "${workdir}"/bin/lua || die
 
 		# Lua compiler, or a stub for it in case of luajit
 		if [[ ${ELUA} == luajit ]]; then
 			# Just in case
-			ln -s "${EPREFIX}"/bin/true "${workdir}"/bin/luac || die
+			ln -s "${BROOT}"/bin/true "${workdir}"/bin/luac || die
 		else
-			ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die
+			ln -s "${BROOT}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die
 		fi
 
 		# pkg-config
-		ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
+		ln -s "${ESYSROOT}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
 			"${workdir}"/pkgconfig/lua.pc || die
 	fi
 
@@ -264,7 +263,7 @@ _lua_export() {
 				debug-print "${FUNCNAME}: ELUA = ${ELUA}"
 				;;
 			LUA)
-				export LUA="${EPREFIX}"/usr/bin/${impl}
+				export LUA="${BROOT}"/usr/bin/${impl}
 				debug-print "${FUNCNAME}: LUA = ${LUA}"
 				;;
 			LUA_CFLAGS)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index bb2e41ef1061..380ec274167c 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -1,10 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
-# Marek Szuba <marecki@gentoo.org>
 # @AUTHOR:
 # Marek Szuba <marecki@gentoo.org>
 # Based on python-r1.eclass by Michał Górny <mgorny@gentoo.org> et al.
diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass
index 48712587ff3e..02bd7e8dd9be 100644
--- a/eclass/mono-env.eclass
+++ b/eclass/mono-env.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mono-env.eclass
@@ -9,14 +9,18 @@
 # @DESCRIPTION:
 # Set environment variables commonly used by dotnet packages.
 
+if [[ -z ${_MONO_ENV_ECLASS} ]] ; then
+_MONO_ENV_ECLASS=1
+
 case ${EAPI} in
-	6|7) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_MONO_ENV_ECLASS} ]] ; then
-_MONO_ENV_ECLASS=1
-
 SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
 
 mono-env_pkg_setup() {
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index f15d3327c7dd..0677ea346e4c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multibuild.eclass
@@ -13,17 +13,21 @@
 # multiple 'variants' of a package (e.g. multilib, Python
 # implementations).
 
+if [[ ! ${_MULTIBUILD_ECLASS} ]]; then
+_MULTIBUILD_ECLASS=1
+
 case ${EAPI} in
-	6|7|8)
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8)
 		# backwards compatibility for run_in_build_dir
 		inherit out-of-source-utils
 		;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_MULTIBUILD_ECLASS} ]]; then
-_MULTIBUILD_ECLASS=1
-
 # @ECLASS_VARIABLE: MULTIBUILD_VARIANTS
 # @REQUIRED
 # @DESCRIPTION:
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 1774ad057430..22c4a8bb3048 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 2013-2023 Gentoo Authors
+# Copyright 2013-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-build.eclass
@@ -17,14 +17,18 @@
 # dependencies shall use the USE dependency string in ${MULTILIB_USEDEP}
 # to properly request multilib enabled.
 
+if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then
+_MULTILIB_BUILD_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then
-_MULTILIB_BUILD_ECLASS=1
-
 inherit multibuild multilib
 
 # @ECLASS_VARIABLE: _MULTILIB_FLAGS
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index 92968b6cf213..c84fb3781a97 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-minimal.eclass
@@ -23,16 +23,21 @@
 #
 # If you need generic install rules, use multilib_src_install_all function.
 
-case ${EAPI} in
-	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 inherit multilib-build
 
 if [[ ! ${_MULTILIB_MINIMAL_ECLASS} ]]; then
 _MULTILIB_MINIMAL_ECLASS=1
 
+case ${EAPI} in
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+
 multilib-minimal_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index bf9c88f7e6a4..eca8c02d8336 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib.eclass
@@ -9,14 +9,18 @@
 # @DESCRIPTION:
 # This eclass is for all functions pertaining to handling multilib configurations.
 
+if [[ -z ${_MULTILIB_ECLASS} ]]; then
+_MULTILIB_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_MULTILIB_ECLASS} ]]; then
-_MULTILIB_ECLASS=1
-
 inherit toolchain-funcs
 
 # Defaults:
diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass
index 13d6a92f2f2e..f9627de26c3b 100644
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multiprocessing.eclass
@@ -24,14 +24,18 @@
 # }
 # @CODE
 
-case ${EAPI:-0} in
-	[5678]) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then
 _MULTIPROCESSING_ECLASS=1
 
+case ${EAPI} in
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @FUNCTION: get_nproc
 # @USAGE: [${fallback:-1}]
 # @DESCRIPTION:
diff --git a/eclass/out-of-source-utils.eclass b/eclass/out-of-source-utils.eclass
index d68b21088995..55a88127ca71 100644
--- a/eclass/out-of-source-utils.eclass
+++ b/eclass/out-of-source-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: out-of-source-utils.eclass
@@ -12,14 +12,18 @@
 # This eclass provides a run_in_build_dir() helper that can be used
 # to execute specified command inside BUILD_DIR.
 
+if [[ ! ${_OUT_OF_SOURCE_UTILS_ECLASS} ]]; then
+_OUT_OF_SOURCE_UTILS_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_OUT_OF_SOURCE_UTILS_ECLASS} ]]; then
-_OUT_OF_SOURCE_UTILS_ECLASS=1
-
 # @FUNCTION: run_in_build_dir
 # @USAGE: <argv>...
 # @DESCRIPTION:
diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 3830f03df341..a7144278fd9a 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: pax-utils.eclass
@@ -21,14 +21,18 @@
 # To control what markings are made, set PAX_MARKINGS in /etc/portage/make.conf
 # to contain either "PT", "XT" or "none".  The default is none
 
-case ${EAPI:-0} in
-	5|6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_PAX_UTILS_ECLASS} ]]; then
 _PAX_UTILS_ECLASS=1
 
+case ${EAPI} in
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @ECLASS_VARIABLE: PAX_MARKINGS
 # @DESCRIPTION:
 # Control which markings are made:
diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
index 142fdeb8cfbd..d2b6cfb85f73 100644
--- a/eclass/perl-functions.eclass
+++ b/eclass/perl-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: perl-functions.eclass
@@ -17,11 +17,12 @@
 # global scope.
 
 case ${EAPI} in
-	7|8)
-		;;
-	*)
-		die "${ECLASS}: EAPI ${EAPI:-0} not supported"
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
 		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 [[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index 9882c7dcc700..567aa9a8144f 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-pear-r2.eclass
@@ -14,14 +14,18 @@
 # Note that this eclass doesn't handle dependencies of PEAR packages
 # on purpose; please use (R)DEPEND to define them correctly!
 
+if [[ -z ${_PHP_PEAR_R2_ECLASS} ]]; then
+_PHP_PEAR_R2_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_PHP_PEAR_R2_ECLASS} ]]; then
-_PHP_PEAR_R2_ECLASS=1
-
 RDEPEND=">=dev-php/pear-1.8.1"
 [[ ${EAPI} != [67] ]] && IDEPEND=">=dev-php/pear-1.8.1"
 
diff --git a/eclass/plasma-mobile.kde.org.eclass b/eclass/plasma-mobile.kde.org.eclass
index 9fd54100d24e..3349f90745bd 100644
--- a/eclass/plasma-mobile.kde.org.eclass
+++ b/eclass/plasma-mobile.kde.org.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: plasma-mobile.kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 78da440e22dd..926ac8b8b825 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -9,14 +9,18 @@
 # @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds
 
+if [[ -z ${_PORTABILITY_ECLASS} ]]; then
+_PORTABILITY_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_PORTABILITY_ECLASS} ]]; then
-_PORTABILITY_ECLASS=1
-
 # @FUNCTION: treecopy
 # @USAGE: <orig1> [orig2 orig3 ....] <dest>
 # @DESCRIPTION:
diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass
index 8d50d0ba7b6e..e968e8ae8bac 100644
--- a/eclass/prefix.eclass
+++ b/eclass/prefix.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: prefix.eclass
@@ -12,14 +12,18 @@
 # located somewhere in the filesystem.  Prefix ebuilds require
 # additional functions and variables which are defined by this eclass.
 
-case ${EAPI:-0} in
-	[5678]) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_PREFIX_ECLASS} ]]; then
 _PREFIX_ECLASS=1
 
+case ${EAPI} in
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @ECLASS_VARIABLE: EPREFIX
 # @DESCRIPTION:
 # The offset prefix of a Gentoo Prefix installation.  When Gentoo Prefix
diff --git a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass
index 35c65ef4436f..38571447b945 100644
--- a/eclass/preserve-libs.eclass
+++ b/eclass/preserve-libs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: preserve-libs.eclass
@@ -7,14 +7,18 @@
 # @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: preserve libraries after SONAME changes
 
+if [[ -z ${_PRESERVE_LIBS_ECLASS} ]]; then
+_PRESERVE_LIBS_ECLASS=1
+
 case ${EAPI} in
-	5|6|7|8) ;;
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_PRESERVE_LIBS_ECLASS} ]]; then
-_PRESERVE_LIBS_ECLASS=1
-
 # @FUNCTION: preserve_old_lib
 # @USAGE: <libs to preserve> [more libs]
 # @DESCRIPTION:
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 24b857dab53f..3cd8b606c235 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -147,6 +147,9 @@ qt6-build_src_configure() {
 	fi
 
 	local defaultcmakeargs=(
+		# cmake defaults to "STATUS" but Qt changes that to "NOTICE" which
+		# hides a lot of information that is useful for bug reports
+		--log-level=STATUS
 		# see _qt6-build_create_user_facing_links
 		-DINSTALL_PUBLICBINDIR="${QT6_PREFIX}"/bin
 		# note that if qtbase was built with tests, this is default ON
diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass
index 48023d9c049f..3d2d8244687c 100644
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -21,7 +21,11 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then
 _README_GENTOO_ECLASS=1
 
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass
index 7039455dec6b..cf501d5a8861 100644
--- a/eclass/rocm.eclass
+++ b/eclass/rocm.eclass
@@ -15,9 +15,13 @@
 # edit USE flag to control which GPU architecture to compile. Using
 # ${ROCM_USEDEP} can ensure coherence among dependencies. Ebuilds can call the
 # function get_amdgpu_flag to translate activated target to GPU compile flags,
-# passing it to configuration. Function check_amdgpu can help ebuild ensure
+# passing it to configuration. Function rocm_use_hipcc switches active compiler
+# to hipcc and cleans incompatible flags (useful for users with gcc-only flags
+# in /etc/portage/make.conf). Function check_amdgpu can help ebuild ensure
 # read and write permissions to GPU device in src_test phase, throwing friendly
-# error message if unavailable.
+# error message if unavailable. However src_configure in general should not
+# access any AMDGPU devices. If it does, it usually means that CMakeLists.txt
+# ignores AMDGPU_TARGETS in favor of autodetected GPU, which is not desired.
 #
 # @EXAMPLE:
 # Example ebuild for ROCm library in https://github.com/ROCmSoftwarePlatform
@@ -39,14 +43,12 @@
 # "
 #
 # src_configure() {
-#     # avoid sandbox violation
-#     addpredict /dev/kfd
-#     addpredict /dev/dri/
+#     rocm_use_hipcc
 #     local mycmakeargs=(
 #         -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 #         -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 #     )
-#     CXX=hipcc cmake_src_configure
+#     cmake_src_configure
 # }
 #
 # src_test() {
@@ -90,6 +92,8 @@ esac
 if [[ ! ${_ROCM_ECLASS} ]]; then
 _ROCM_ECLASS=1
 
+inherit flag-o-matic
+
 # @ECLASS_VARIABLE: ROCM_VERSION
 # @REQUIRED
 # @PRE_INHERIT
@@ -231,3 +235,27 @@ check_amdgpu() {
 }
 
 fi
+
+# @FUNCTION: rocm_use_hipcc
+# @USAGE: rocm_use_hipcc
+# @DESCRIPTION:
+# switch active C and C++ compilers to hipcc, clean unsupported flags and setup ROCM_TARGET_LST file.
+rocm_use_hipcc() {
+	# During the configuration stage, CMake tests whether the compiler is able to compile a simple program.
+	# Since CMake checker does not specify --offload-arch=, hipcc enumerates devices using four methods
+	# until it finds at least one device. Last way is by accessing them (via rocminfo).
+	# To prevent potential sandbox violations, we set the ROCM_TARGET_LST variable (which is checked first).
+	local target_lst="${T}"/gentoo_rocm_target.lst
+	if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then
+		# Expected no GPU code; still need to calm down sandbox
+		echo "gfx000" > "${target_lst}" || die
+	else
+		printf "%s\n" ${AMDGPU_TARGETS[@]} > "${target_lst}" || die
+	fi
+	export ROCM_TARGET_LST="${target_lst}"
+
+	# Export updated CC and CXX. Note that CC is needed even if no C code used,
+	# as CMake checks that C compiler can compile a simple test program.
+	export CC=hipcc CXX=hipcc
+	strip-unsupported-flags
+}
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 40ff76ce900e..04099a82ef4f 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-fakegem.eclass
@@ -139,7 +139,11 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
 RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}"
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d80ae96dd40b..2ef6d2247435 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-ng.eclass
@@ -67,7 +67,11 @@
 # passed to "grep -E" to remove reporting of these shared objects.
 
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 789f57ce25f6..48a25114b396 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-utils.eclass
@@ -15,13 +15,17 @@
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
 
-case ${EAPI:-0} in
-	[5678]) ;;
+if [[ ! ${_RUBY_UTILS} ]]; then
+
+case ${EAPI} in
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_RUBY_UTILS} ]]; then
-
 # @ECLASS_VARIABLE: RUBY_TARGETS_PREFERENCE
 # @INTERNAL
 # @DESCRIPTION:
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index ad760673cab1..e7d6cd9a9e5f 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Eclass for installing SELinux policy, and optionally
@@ -260,13 +260,9 @@ selinux-policy-2_pkg_postinst() {
 	local COMMAND
 
 	for i in ${POLICY_TYPES}; do
-		if [[ "${MODS}" = "unconfined" ]]; then
-			case ${i} in
-			strict|mcs|mls)
-				einfo "Ignoring loading of unconfined module in ${i} module store.";
-				continue
-				;;
-			esac
+		if [[ "${i}" == "strict" ]] && [[ "${MODS}" = "unconfined" ]]; then
+			einfo "Ignoring loading of unconfined module in strict module store.";
+			continue;
 		fi
 
 		einfo "Inserting the following modules into the $i module store: ${MODS}"
diff --git a/eclass/strip-linguas.eclass b/eclass/strip-linguas.eclass
index 718341b4a626..b31f414c87c3 100644
--- a/eclass/strip-linguas.eclass
+++ b/eclass/strip-linguas.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: strip-linguas.eclass
@@ -9,15 +9,19 @@
 # @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: convenience function for LINGUAS support
 
+if [[ -z ${_STRIP_LINGUAS_ECLASS} ]]; then
+_STRIP_LINGUAS_ECLASS=1
+
 case ${EAPI} in
-	5|6|7|8) ;;
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_STRIP_LINGUAS_ECLASS} ]]; then
-_STRIP_LINGUAS_ECLASS=1
-
-# @FUNCTION: strip-linguas
+# FUNCTION: strip-linguas
 # @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
 # @DESCRIPTION:
 # Make sure that LINGUAS only contains languages that a package can
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 03d6a82fd310..a5f0decde1e3 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -1,4 +1,4 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: systemd.eclass
@@ -25,7 +25,11 @@
 # @CODE
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 39650401a6a0..63889a275fef 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -1,4 +1,4 @@
-# Copyright 2016-2022 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: tmpfiles.eclass
@@ -55,9 +55,13 @@
 if [[ -z ${_TMPFILES_ECLASS} ]]; then
 _TMPFILES_ECLASS=1
 
-case "${EAPI}" in
-5|6|7|8) ;;
-*) die "API is undefined for EAPI ${EAPI}" ;;
+case ${EAPI} in
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS_VARIABLE: TMPFILES_OPTIONAL
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 5e36fa275dcd..66819996ea33 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -13,14 +13,18 @@
 # in such a way that you can rely on the function always returning
 # something sane.
 
+if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then
+_TOOLCHAIN_FUNCS_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then
-_TOOLCHAIN_FUNCS_ECLASS=1
-
 inherit multilib
 
 # tc-getPROG <VAR [search vars]> <default> [tuple]
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ac236f3127f9..c03312be43ad 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -353,6 +353,7 @@ fi
 
 BDEPEND="
 	app-alternatives/yacc
+	sys-devel/binutils:*
 	>=sys-devel/flex-2.5.4
 	nls? ( sys-devel/gettext )
 	test? (
diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index ac94f98221aa..7fd99cbba8b0 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: udev.eclass
@@ -36,14 +36,18 @@
 # }
 # @CODE
 
+if [[ -z ${_UDEV_ECLASS} ]]; then
+_UDEV_ECLASS=1
+
 case ${EAPI} in
-	5|6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_UDEV_ECLASS} ]]; then
-_UDEV_ECLASS=1
-
 inherit toolchain-funcs
 
 if [[ ${EAPI} == [56] ]]; then
diff --git a/eclass/vcs-clean.eclass b/eclass/vcs-clean.eclass
index e4c61ac7164a..719bdec17676 100644
--- a/eclass/vcs-clean.eclass
+++ b/eclass/vcs-clean.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vcs-clean.eclass
@@ -9,14 +9,18 @@
 # @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: helper functions to remove VCS directories
 
+if [[ -z ${_VCS_CLEAN_ECLASS} ]] ; then
+_VCS_CLEAN_ECLASS=1
+
 case ${EAPI} in
-	5|6|7|8) ;;
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_VCS_CLEAN_ECLASS} ]] ; then
-_VCS_CLEAN_ECLASS=1
-
 # @FUNCTION: ecvs_clean
 # @USAGE: [list of dirs]
 # @DESCRIPTION:
diff --git a/eclass/versionator.eclass b/eclass/versionator.eclass
index 8a1066a0fd30..1e491860b6ca 100644
--- a/eclass/versionator.eclass
+++ b/eclass/versionator.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: versionator.eclass
 # @MAINTAINER:
 # Jonathan Callen <jcallen@gentoo.org>
diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index 119ce793071d..f20f7397cf65 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-doc.eclass
@@ -16,13 +16,17 @@
 # DEPEND in vim-plugin or by whatever version of vim is being
 # installed by the eclass.
 
+if [[ ! ${_VIM_DOC_ECLASS} ]] ; then
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_VIM_DOC_ECLASS} ]] ; then
-
 # @FUNCTION: update_vim_helptags
 # @USAGE:
 # @DESCRIPTION:
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index ee4f1b6e0f81..b2ae0cb9e4c3 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-plugin.eclass
@@ -12,14 +12,18 @@
 # which is read automatically by vim.  The only exception is
 # documentation, for which we make a special case via vim-doc.eclass.
 
+if [[ -z ${_VIM_PLUGIN_ECLASS} ]]; then
+_VIM_PLUGIN_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_VIM_PLUGIN_ECLASS} ]]; then
-_VIM_PLUGIN_ECLASS=1
-
 inherit vim-doc
 
 [[ ${EAPI} != [67] ]] && _DEFINE_VIM_PLUGIN_SRC_PREPARE=true
diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass
index 607771ae8035..57bcb0dc8021 100644
--- a/eclass/vim-spell.eclass
+++ b/eclass/vim-spell.eclass
@@ -62,14 +62,18 @@
 # spell files. It's best to let upstream know if you've generated spell files
 # for another language rather than keeping them Gentoo-specific.
 
+if [[ -z ${_VIM_SPELL_ECLASS} ]] ; then
+_VIM_SPELL_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_VIM_SPELL_ECLASS} ]] ; then
-_VIM_SPELL_ECLASS=1
-
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 SLOT="0"
 
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 6e77cd662bdd..07d303899582 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: virtualx.eclass
@@ -9,14 +9,18 @@
 # @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: This eclass can be used for packages that need a working X environment to build.
 
+if [[ -z ${_VIRTUALX_ECLASS} ]]; then
+_VIRTUALX_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_VIRTUALX_ECLASS} ]]; then
-_VIRTUALX_ECLASS=1
-
 # @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -113,6 +117,7 @@ virtx() {
 	export XAUTHORITY=
 
 	einfo "Starting Xvfb ..."
+	addpredict /dev/dri/ # Needed for Xvfb w/ >=mesa-24.2.0
 
 	debug-print "${FUNCNAME}: Xvfb -displayfd 1 ${xvfbargs[*]}"
 	local logfile=${T}/Xvfb.log
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 5b091c84851f..e8bc127e1b96 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: webapp.eclass
@@ -10,14 +10,18 @@
 # The webapp eclass contains functions to handle web applications with
 # webapp-config. Part of the implementation of GLEP #11
 
+if [[ -z ${_WEBAPP_ECLASS} ]]; then
+_WEBAPP_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_WEBAPP_ECLASS} ]]; then
-_WEBAPP_ECLASS=1
-
 # @ECLASS_VARIABLE: WEBAPP_DEPEND
 # @DESCRIPTION:
 # An ebuild should use WEBAPP_DEPEND if a custom DEPEND needs to be built, most
diff --git a/eclass/wrapper.eclass b/eclass/wrapper.eclass
index 8d3d273d81c6..a62bb51d0fe7 100644
--- a/eclass/wrapper.eclass
+++ b/eclass/wrapper.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wrapper.eclass
@@ -7,15 +7,19 @@
 # @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: create a shell wrapper script
 
+if [[ -z ${_WRAPPER_ECLASS} ]]; then
+_WRAPPER_ECLASS=1
+
 case ${EAPI} in
-	5|6|7|8) ;;
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_WRAPPER_ECLASS} ]]; then
-_WRAPPER_ECLASS=1
-
-# @FUNCTION: make_wrapper
+# FUNCTION: make_wrapper
 # @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
 # @DESCRIPTION:
 # Create a shell wrapper script named wrapper in installpath
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index 34535a129e33..84f88eee18fc 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg-utils.eclass
@@ -18,7 +18,11 @@
 #  * XDG mime information database management
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	5|6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
index 14c56047af45..6af4b91875fc 100644
--- a/eclass/xdg.eclass
+++ b/eclass/xdg.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg.eclass
@@ -13,14 +13,18 @@
 # Utility eclass to update the desktop, icon and shared mime info as laid
 # out in the freedesktop specs & implementations
 
+if [[ -z ${_XDG_ECLASS} ]]; then
+_XDG_ECLASS=1
+
 case ${EAPI} in
-	6|7|8) ;;
+	6)
+		ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
+		ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
+		;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_XDG_ECLASS} ]]; then
-_XDG_ECLASS=1
-
 inherit xdg-utils
 
 # Avoid dependency loop as both depend on glib-2
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 82820693349e..ef648a1d8811 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -54,6 +54,7 @@ QT_DEPS="
 		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
 		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
 		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qtnetworkauth-${MIN_QT_5_VERSION}:5
 		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
 		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
 		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
@@ -62,6 +63,7 @@ QT_DEPS="
 	qt6? (
 		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
 		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
+		>=dev-qt/qtnetworkauth-${MIN_QT_6_VERSION}:6
 	)
 "
 
diff --git a/games-arcade/afternoonstalker/Manifest b/games-arcade/afternoonstalker/Manifest
index ddb94dca66bd..4443231e837c 100644
--- a/games-arcade/afternoonstalker/Manifest
+++ b/games-arcade/afternoonstalker/Manifest
@@ -1 +1 @@
-DIST afternoonstalker-1.1.6.tar.gz 186724 BLAKE2B 2915e1ff11f0cdf392a94d515541c25082afbe62547c90a49cdc39ab01bc234ac8098394905a0d1ce3d3a550b5c5096fd64f76db2d8d62b510822a0a59ae8cf6 SHA512 4d823abc5f939bc6322729548abb0adc43b56b5d5e035578f15084f4e8f6ce80bd7b7dc3ffbe71530975b7c02962ea93405e2ad13de8a50303ccfdde543cd6c7
+DIST afternoonstalker-1.2.0.tar.gz 189534 BLAKE2B 8a126d7dc9c224346d1944734512a9edbe4032ef1aa0adc9cb5b28a172dc9c9d8b5eb060829b698ba519cca3a52f0cf49d682bc546f976cab2ae28440f901c89 SHA512 9137bd6a6d2bd0a58b40952d149a8e742d575f61393c2e20b6a18f6a9ed74331cbea7a94280d2fa31e9162e7d9a1d1618e38e81f91e618ee074fd6b846fb74a4
diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild
deleted file mode 100644
index 8968417bb1e6..000000000000
--- a/games-arcade/afternoonstalker/afternoonstalker-1.1.6.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="Clone of the 1981 Night Stalker video game by Mattel Electronics"
-HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/afternoonstalker.html"
-SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.6-autotools.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.2.0.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.2.0.ebuild
new file mode 100644
index 000000000000..6a2349b98cf7
--- /dev/null
+++ b/games-arcade/afternoonstalker/afternoonstalker-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Clone of the 1981 Night Stalker video game by Mattel Electronics"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/afternoonstalker.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-games/flatzebra-0.2.0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2.0-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch b/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch
deleted file mode 100644
index a7c5bc9fe590..000000000000
--- a/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,17 +2,16 @@
- 
- SUBDIRS = src
- 
--man_MANS = doc/$(PACKAGE).6
-+man_MANS = doc/afternoonstalker.6
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- doc_DATA = \
- 	AUTHORS \
--	COPYING \
- 	NEWS \
- 	README \
- 	THANKS
- 
- EXTRA_DIST = \
-+	COPYING \
- 	bootstrap \
- 	autogen.sh \
- 	$(PACKAGE).spec \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -114,13 +114,13 @@
- 	images/digit8.xpm \
- 	images/digit9.xpm
- 
--desktopentrydir = $(datadir)/applications
-+desktopentrydir = $(datarootdir)/applications
- desktopentry_DATA = $(PACKAGE).desktop
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datarootdir)/pixmaps
- pixmap_DATA = images/$(PACKAGE).png
- 
--pkgsounddir = $(datadir)/sounds/$(PACKAGE)
-+pkgsounddir = $(pkgdatadir)/sounds
- pkgsound_DATA = \
- 	sounds/gun-pickup.wav \
- 	sounds/bat-killed.wav \
diff --git a/games-arcade/afternoonstalker/files/afternoonstalker-1.2.0-autotools.patch b/games-arcade/afternoonstalker/files/afternoonstalker-1.2.0-autotools.patch
new file mode 100644
index 000000000000..07d3a2689f14
--- /dev/null
+++ b/games-arcade/afternoonstalker/files/afternoonstalker-1.2.0-autotools.patch
@@ -0,0 +1,42 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,17 +2,16 @@
+
+ SUBDIRS = src
+
+-man_MANS = doc/$(PACKAGE).6
++man_MANS = doc/afternoonstalker.6
+
+-docdir = $(datarootdir)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = \
+ 	AUTHORS \
+-	COPYING \
+ 	NEWS \
+ 	README \
+ 	THANKS
+
+ EXTRA_DIST = \
++	COPYING \
+ 	bootstrap \
+ 	autogen.sh \
+ 	$(PACKAGE).spec \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,7 +42,7 @@
+ pixmapdir = $(datarootdir)/pixmaps
+ pixmap_DATA = images/$(PACKAGE).png
+
+-pkgpixmapdir = $(datarootdir)/pixmaps/$(PACKAGE)
++pkgpixmapdir = $(pkgdatadir)/pixmaps/$(PACKAGE)
+ pkgpixmap_DATA = \
+ 	images/cobweb_tile.xpm \
+ 	images/floor_tile.xpm \
+@@ -122,7 +122,7 @@
+ 	images/digit8.xpm \
+ 	images/digit9.xpm
+
+-pkgsounddir = $(datarootdir)/sounds/$(PACKAGE)
++pkgsounddir = $(pkgdatadir)/sounds/$(PACKAGE)
+ pkgsound_DATA = \
+ 	sounds/gun-pickup.wav \
+ 	sounds/bat-killed.wav \
diff --git a/games-arcade/batrachians/Manifest b/games-arcade/batrachians/Manifest
index dada55c3e402..2b34b854b907 100644
--- a/games-arcade/batrachians/Manifest
+++ b/games-arcade/batrachians/Manifest
@@ -1 +1 @@
-DIST batrachians-0.1.7.tar.gz 206981 BLAKE2B 871fb7e22fb17fdfb0fd32d14a36cf63043e46de5bdabc83594d3d3eb43f616ec703d220ad9cf56e505c31025e76582e52b3a816d932f9fca22a6f070ed3198e SHA512 01c49cf02e3894d43948ba2656713fdd1662f3441c1dfe41b2fc3dc27fc5c4c95ac377a946d647c1c59e201a63d0659bc6fc2bd50132eb2f2b393ed64167e781
+DIST batrachians-0.2.0.tar.gz 204034 BLAKE2B 876e84308b66469d7fa7a970cbf23932dd7e1eda8c07438cbca20414a35117793ea7fef2d6852a1f4d0099a5c2710d8bd3043698bdea101020459dd1c7f20917 SHA512 da0429cd17a6c289f3d5dd1fad11847713c56510d9bdc7e6fa10e0045bb4985662030ea04e49db740eb361e8e016e701736a7ce52501816c68b32f2cd398c189
diff --git a/games-arcade/batrachians/batrachians-0.1.7.ebuild b/games-arcade/batrachians/batrachians-0.1.7.ebuild
deleted file mode 100644
index 059c43550bc8..000000000000
--- a/games-arcade/batrachians/batrachians-0.1.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="A fly-eating frog video game"
-HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
-SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-games/flatzebra-0.1.5
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.7-autotools.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/games-arcade/batrachians/batrachians-0.2.0.ebuild b/games-arcade/batrachians/batrachians-0.2.0.ebuild
new file mode 100644
index 000000000000..fd8cd3f9fd04
--- /dev/null
+++ b/games-arcade/batrachians/batrachians-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Fly-eating frog video game"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-games/flatzebra-0.2.0
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2.0-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch b/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch
deleted file mode 100644
index bc05a7f267c2..000000000000
--- a/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,21 +2,20 @@
- 
- SUBDIRS = src
- 
--man_MANS = doc/$(PACKAGE).6
-+man_MANS = doc/batrachians.6
- 
- RPMBUILD = rpmbuild
- rpm: dist
- 	$(RPMBUILD) -ta $(distdir).tar.gz
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- doc_DATA = \
- 	AUTHORS \
--	COPYING \
- 	NEWS \
- 	README \
- 	THANKS
- 
- EXTRA_DIST = \
-+	COPYING \
- 	bootstrap \
- 	autogen.sh \
- 	$(PACKAGE).spec \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -20,7 +20,7 @@
- 	-DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \
- 	-DPKGSOUNDDIR=\"$(pkgsounddir)\"
- 
--pkgsounddir = $(datadir)/sounds/$(PACKAGE)
-+pkgsounddir = $(pkgdatadir)/sounds
- pkgsound_DATA = \
- 	sounds/game-starts.wav \
- 	sounds/game-ends.wav \
-@@ -29,10 +29,10 @@
- 	sounds/frog-jumps.wav \
- 	sounds/tongue-out.wav
- 
--desktopentrydir = $(datadir)/applications
-+desktopentrydir = $(datarootdir)/applications
- desktopentry_DATA = $(PACKAGE).desktop
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datarootdir)/pixmaps
- pixmap_DATA = images/$(PACKAGE).png
- 
- 
diff --git a/games-arcade/batrachians/files/batrachians-0.2.0-autotools.patch b/games-arcade/batrachians/files/batrachians-0.2.0-autotools.patch
new file mode 100644
index 000000000000..e80792a9df6c
--- /dev/null
+++ b/games-arcade/batrachians/files/batrachians-0.2.0-autotools.patch
@@ -0,0 +1,36 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,20 +1,19 @@
+ SUBDIRS = src
+
+-man_MANS = doc/$(PACKAGE).6
++man_MANS = doc/batrachians.6
+
+ RPMBUILD = rpmbuild
+ rpm: dist
+ 	$(RPMBUILD) -ta $(distdir).tar.gz
+
+-docdir = $(datarootdir)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = \
+ 	AUTHORS \
+-	COPYING \
+ 	NEWS \
+ 	README \
+ 	THANKS
+
+ EXTRA_DIST = \
++	COPYING \
+ 	bootstrap \
+ 	autogen.sh \
+ 	$(PACKAGE).spec \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -20,7 +20,7 @@
+     $(W_SUGGEST_OVERRIDE) \
+ 	$(FLATZEBRA_CFLAGS)
+
+-pkgsounddir = $(datarootdir)/sounds/$(PACKAGE)
++pkgsounddir = $(pkgdatadir)/sounds/$(PACKAGE)
+ pkgsound_DATA = \
+ 	sounds/game-starts.wav \
+ 	sounds/game-ends.wav \
diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
index 05af86cb66e6..aac70471d4ed 100644
--- a/games-arcade/burgerspace/Manifest
+++ b/games-arcade/burgerspace/Manifest
@@ -1 +1 @@
-DIST burgerspace-1.9.3.tar.gz 517492 BLAKE2B 6d3cf554580a1a370720f349ae71edab7228c18426d4ae39a8f5bb9177071204715e527beea52aa6b11b9112db5a168951d92b0de60189cfdb1882c85c79d1f2 SHA512 59629ca497a0a379858ba69bb444182f935b58be6554109fb9b309713bd6bde0d771e63858802f9153a4e46bbfe63b5edf58f857bb94ca337dbba89ff3c610cb
+DIST burgerspace-1.10.0.tar.gz 251038 BLAKE2B 7dd6f0e18c3ff7229b64ad5a833dc9064486e8f5337f4bd37189a8b6a911c5cf062d4cc0ac80b203677d813fca648390f296f92ddfa60762bc964f12f4a11a37 SHA512 7ce6fa48829414ff7a48cb038b87842112c18829769105f34a842bffcfe99072ed6201ba3772f98efd115b8ffd9de0d1d15dc9f8b80a5f978f5763b72a358d8c
diff --git a/games-arcade/burgerspace/burgerspace-1.10.0.ebuild b/games-arcade/burgerspace/burgerspace-1.10.0.ebuild
new file mode 100644
index 000000000000..11adfb6b226c
--- /dev/null
+++ b/games-arcade/burgerspace/burgerspace-1.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # doesn't really test anything
+
+RDEPEND=">=dev-games/flatzebra-0.2.0
+	media-libs/libsdl[joystick]
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild b/games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild
deleted file mode 100644
index 20885e388a68..000000000000
--- a/games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
-HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
-SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="network"
-RESTRICT="test" # doesn't really test anything
-
-RDEPEND=">=dev-games/flatzebra-0.1.7
-	media-libs/libsdl[joystick]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.9.3-autotools.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with network)
-}
diff --git a/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch
deleted file mode 100644
index cd7db7a1d73a..000000000000
--- a/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-* Install "doc/burgerspace-server.6" only when installing the server
-* Use "$datarootdir" for FDO specified paths
-  This is recommended by Debian, as $datadir could be specified to lie
-  on a different file system, whereas icons/desktop/pixmaps are specified
-  by freedesktop.org and are based on $datarootdir
-  -> https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/
-* Do not install LICENSE
-  The fact that the source is licensed under the GPL doesn't require installing
-  the COPYING file along.
-* Nested sound files in "$pkgdatadir", i.e., $(datadir)/$(PACKAGE)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,12 +2,13 @@
- 
- SUBDIRS = src
- 
--man_MANS = doc/burgerspace.6 doc/burgerspace-server.6
-+man_MANS = doc/burgerspace.6
-+if BUILD_NETWORK
-+man_MANS += doc/burgerspace-server.6
-+endif
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- doc_DATA = \
- 	AUTHORS \
--	COPYING \
- 	NEWS \
- 	README \
- 	THANKS
-@@ -17,6 +18,7 @@
- 	$(RPMBUILD) -ta $(distdir).tar.gz
- 
- EXTRA_DIST = \
-+	COPYING \
- 	bootstrap \
- 	autogen.sh \
- 	$(PACKAGE).spec \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -74,10 +74,10 @@
- 	PKGSOUNDDIR=$(srcdir)/sounds ./$(PACKAGE)
- 
- 
--desktopentrydir = $(datadir)/applications
-+desktopentrydir = $(datarootdir)/applications
- desktopentry_DATA = $(PACKAGE).desktop
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datarootdir)/pixmaps
- pixmap_DATA = images/$(PACKAGE).png
- 
- 
-@@ -193,7 +193,7 @@
- 	images/digit8.xpm \
- 	images/digit9.xpm
- 
--pkgsounddir = $(datadir)/sounds/$(PACKAGE)
-+pkgsounddir = $(pkgdatadir)/sounds
- pkgsound_DATA = \
- 	sounds/ingredient-bounces.wav \
- 	sounds/ingredient-in-plate.wav \
diff --git a/games-arcade/burgerspace/metadata.xml b/games-arcade/burgerspace/metadata.xml
index b80ce794cf01..e244e2dd99bb 100644
--- a/games-arcade/burgerspace/metadata.xml
+++ b/games-arcade/burgerspace/metadata.xml
@@ -5,7 +5,4 @@
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
   </maintainer>
-  <use>
-    <flag name="network">Enable client-server support</flag>
-  </use>
 </pkgmetadata>
diff --git a/games-arcade/cosmosmash/Manifest b/games-arcade/cosmosmash/Manifest
index 1ebc55d1d255..31a021e792d1 100644
--- a/games-arcade/cosmosmash/Manifest
+++ b/games-arcade/cosmosmash/Manifest
@@ -1 +1 @@
-DIST cosmosmash-1.4.8.tar.gz 921859 BLAKE2B 601ccf0eaf429bee240a6a07534afc44cb5bac390bedfc2548668048b8a5d93229e36de1c0e73856e3588d35cf7cfc6dbb00ac428fcc42612676281dcfaf0896 SHA512 4b78cac18035ef4bdbdebd2a206ceb3c80646fa030f568e171208af7510a6b1da9ef3fd817f3ebae83fbb42b1ce2900e8f1ff33ec23a8fe735022409ab1120af
+DIST cosmosmash-1.5.0.tar.gz 536986 BLAKE2B 07011857fdee30c104847e9ad2066795116fa2123c38184573d8b5a11154bbebe8991c6c51241658a65f23e20582e9759798bc986a3c4d9dee1c613f8400f333 SHA512 3be4b535d68eca185d3f48ff04c11c912fdcbc17470848650b20410030c7619f9dcffaeaf3bacb3a95eb37c5944724af7fc9978613c3252af1ec725504129c23
diff --git a/games-arcade/cosmosmash/cosmosmash-1.4.8-r1.ebuild b/games-arcade/cosmosmash/cosmosmash-1.4.8-r1.ebuild
deleted file mode 100644
index 3c08d0bb90da..000000000000
--- a/games-arcade/cosmosmash/cosmosmash-1.4.8-r1.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
-
-DESCRIPTION="A space rock shooting video game"
-HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/cosmosmash.html"
-SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # uses the sound card which portage user might not be available.
-
-RDEPEND=">=dev-games/flatzebra-0.1.7
-	media-libs/libsdl[joystick]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die
-
-	eautoreconf
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	einstalldocs
-	doman doc/${PN}.6
-}
diff --git a/games-arcade/cosmosmash/cosmosmash-1.5.0.ebuild b/games-arcade/cosmosmash/cosmosmash-1.5.0.ebuild
new file mode 100644
index 000000000000..5b77da676179
--- /dev/null
+++ b/games-arcade/cosmosmash/cosmosmash-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Space rock shooting video game"
+HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/cosmosmash.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # uses the sound card which portage user might not be available.
+
+RDEPEND=">=dev-games/flatzebra-0.2.0
+	media-libs/libsdl[joystick]
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
+		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
+		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
+		src/Makefile.am \
+		|| die
+
+	eautoreconf
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	einstalldocs
+	doman doc/${PN}.6
+}
diff --git a/games-arcade/sdl-sopwith/Manifest b/games-arcade/sdl-sopwith/Manifest
deleted file mode 100644
index 3d8727fea588..000000000000
--- a/games-arcade/sdl-sopwith/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST sopwith-1.7.5.tar.gz 280883 BLAKE2B 57a2d6cf90d1bba1ac5dedbcebaa7b2f58004cee1ee7682d43be800184809e7949603490e93944d8aa1e4b9e6d33f24a9bdb386dadda945b9f9f3b9c4e8ed48c SHA512 ea78706d0190648be269142a29d10340c5181563959b0a329b802b9d9128a9dcb1e01760737269ec22883adf5b6c02c5049c8fc7b44e4eaa9f381b87abc7acae
-DIST sopwith.png 675 BLAKE2B a380311db8861a75d8cbb035616523d1a21a220be758bda931340f65d658af0e844b0247e478da746d654249cd7a28ab9b681fc82b9798f909b379f38242d03f SHA512 7bcfec11930a623ff9077203640b4415e222570d32ffecdb943f5c78ed8fb11db4fefa42298b895c4aa29b46f963a82cdb90492beaf89a04d119e6e756f5ec57
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
deleted file mode 100644
index a5dbc59f3c72..000000000000
--- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.in.old
-+++ b/configure.in
-@@ -61,11 +61,6 @@
- 	SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl"
- ],)
- 
--PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.0 gtk+-2.0 >= 2.0, [
--	SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith"
--	SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk"
--],)
--
- AC_SUBST(SOPWITH_BINS)
- AC_SUBST(SOPWITH_SUBDIRS)
- 
-@@ -71,7 +71,7 @@
- 
- dnl check for TCPIP support
- 
--AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE(TCPIP),,)
-+AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE([TCPIP], [1], [TCP/IP support]),,)
- 
- dnl generate Makefiles
- 
---- a/src/Makefile.am.old
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- bin_PROGRAMS = @SOPWITH_BINS@
- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
- 
--CFLAGS = @CFLAGS@ -I..
-+AM_CFLAGS = @SDL_CFLAGS@ -I..
- 
- COMMON_SRC =       \
- video.h	    swcollsn.c  swgames.h   swmain.h    swutil.h 	\
---- a/src/sdl/Makefile.am.old
-+++ b/src/sdl/Makefile.am
-@@ -1,4 +1,4 @@
--CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
-+AM_CFLAGS = @SDL_CFLAGS@ -I..
- 
- noinst_LIBRARIES = libsdlsopwith.a
- 
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
deleted file mode 100644
index e9da16c43905..000000000000
--- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream patch: fix segfault while video device detection.
-Discovered here - https://bugs.gentoo.org/show_bug.cgi?id=458504
-
---- a/src/sdl/video.c.orig	2013-02-21 11:48:57.000000000 -0400
-+++ b/src/sdl/video.c	2013-02-21 11:49:35.000000000 -0400
-@@ -364,11 +364,17 @@
- 	int n;
- 	int w, h;
- 	int flags = 0;
-+        int status;
- 
- 	printf("CGA Screen Emulation\n");
- 	printf("init screen: ");
- 
--	SDL_Init(SDL_INIT_VIDEO);
-+	status = SDL_Init(SDL_INIT_VIDEO);
-+        if (status == -1)
-+        {
-+          fprintf(stderr, "Unable to locate video device. Exiting.\n");
-+          exit(1);
-+        }
-
- 	srand(time(NULL));
- 	set_icon(symbol_plane[rand() % 2][rand() % 16]);
diff --git a/games-arcade/sdl-sopwith/metadata.xml b/games-arcade/sdl-sopwith/metadata.xml
deleted file mode 100644
index 00b9db664db9..000000000000
--- a/games-arcade/sdl-sopwith/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sdl-sopwith</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
deleted file mode 100644
index d136074ceffd..000000000000
--- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop toolchain-funcs
-
-MY_P="${P/sdl-/}"
-DESCRIPTION="Port of the classic Sopwith game using LibSDL"
-HOMEPAGE="http://sdl-sopwith.sourceforge.net/"
-SRC_URI="
-	https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz
-	https://src.fedoraproject.org/rpms/sopwith/raw/master/f/sopwith.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.3[video]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm acconfig.h || die
-
-	eapply "${FILESDIR}"/${P}-nogtk.patch
-	# bug 458504
-	eapply "${FILESDIR}"/${P}-video-fix.patch
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt
-	rm -rf "${ED}/usr/share/doc/sopwith"
-
-	newicon "${DISTDIR}"/sopwith.png ${PN}.png
-	make_desktop_entry sopwith "Sopwith" ${PN}
-}
diff --git a/games-arcade/syobon/Manifest b/games-arcade/syobon/Manifest
deleted file mode 100644
index 352fb2ea9f3e..000000000000
--- a/games-arcade/syobon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST syobon_1.0.1_src.tar.gz 2721153 BLAKE2B 4e5dd2689f531478aef2bc5f6723da1b0c2bcf04bd532775f6883660aedcd4226f9f42dc1ce5d19baa0d4544b4ff3084195a06ffef732cc9adbae412f1c7fd6a SHA512 9a8ff389bb23563a16f1b56aefdb93cf0ee5be74c6d48276ce76a17159bc021f517a69eb300a1c17ee81d4112ba26f0d386a1e2e37bced681044c3a3ca4f7ca5
diff --git a/games-arcade/syobon/metadata.xml b/games-arcade/syobon/metadata.xml
deleted file mode 100644
index d28f5ad166f5..000000000000
--- a/games-arcade/syobon/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>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Syobon Action (also known as Cat Mario or Neko Mario) is a platform game with a similar gameplay experience as Super Mario Bros, except it's a lot more difficult.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/syobon/syobon-1.0.1-r1.ebuild b/games-arcade/syobon/syobon-1.0.1-r1.ebuild
deleted file mode 100644
index c0bb5d581bbb..000000000000
--- a/games-arcade/syobon/syobon-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_P="${PN}_${PV}_src"
-
-DESCRIPTION="Syobon Action (also known as Cat Mario or Neko Mario)"
-HOMEPAGE="http://zapek.com/?p=189"
-SRC_URI="http://download.zapek.com/software/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,video,joystick]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake GAMEDATA="/usr/share/${PN}"
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto "/usr/share/${PN}"
-	doins -r BGM SE res
-	einstalldocs
-
-	make_desktop_entry ${PN}
-}
diff --git a/games-arcade/wop/Manifest b/games-arcade/wop/Manifest
deleted file mode 100644
index 39a35cabcaa0..000000000000
--- a/games-arcade/wop/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wop-0.4.3-src.tar.bz2 280974 BLAKE2B 8a24aa604ba0eab141e9a59b595ea882a5b0fb22662bb10752d2fdac79e00be4bce4721cdfca479d8f55bcaee5f1f33e7af57573dbd4c7994c88124ac35fd551 SHA512 259f9f455e6fbfae2ffb6e169dcf1661f1353e28a5e51b6e907f2868a50c5f54982b4d383dcfcec201c9a2d0429fb468c44c974695364c5fd28d25328e10c6b8
-DIST wopdata-2005-12-21.tar.bz2 4217006 BLAKE2B 0ebe5dd4ee8ca2ea026313ec9ee6a283699ad144e39a7d1f6984c37720b0beafb98a8864a0695484427c3398969908f3ca16909ef07601046540accb3cfbe103 SHA512 6ebc264d1811091550d664a77aeae68184a058c666db486e4ae411e0849abbd02dd2037a3a1a9a31a73774e5f616c21840b0c1de58636dde0e59bd0e952cb505
diff --git a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch b/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch
deleted file mode 100644
index 5af16960a95a..000000000000
--- a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-* Remove hardcoded user variables
-* Respect LDFLAGS and CPPFLAGS
-* Fix installation dir for arch-independent files
-
---- a/Makefile
-+++ b/Makefile
-@@ -3,22 +3,22 @@
- sinclude Makefile.local
- 
- all:
--	+cd sdlwidgets; make
--	+cd src; make
-+	$(MAKE) -C sdlwidgets
-+	$(MAKE) -C src
- runc:
--	+cd src; make runc
-+	$(MAKE) -C src runc
- runs:
--	+cd src; make runs
-+	$(MAKE) -C src runs
- doc:
--	cd src; make doc
-+	$(MAKE) -C src doc
- clean:
--	cd sdlwidgets; make clean
--	cd src; make clean
-+	$(MAKE) -C sdlwidgets clean
-+	$(MAKE) -C src clean
- 	cd doc; rm -rf html
- unison:
--	cd src; make unison
-+	$(MAKE) -C src unison
- gunison:
--	cd src; make gunison
-+	$(MAKE) -C src gunison
- snapshot-src:
- 	ln -s . wop;                                           \
- 	tar cjvf wop-`date +%F`.tar.bz2                        \
---- a/sdlwidgets/Makefile
-+++ b/sdlwidgets/Makefile
-@@ -9,16 +9,12 @@
- CXXFLAGS ?= -Wall -Wshadow -Wsign-compare -Wparentheses -Wconversion -g -O3 -ansi
- CXXFLAGS += $(shell sdl-config --cflags)
- 
--CXX = g++
--AR = ar cru
--RANLIB = ranlib
--
- sinclude ../src/Makefile.local
- 
- all: $(TARGET)
- 
- $(TARGET): $(OBJECT_FILES) Makefile
--	$(AR) $(TARGET) $(OBJECT_FILES)
-+	$(AR) cru $(TARGET) $(OBJECT_FILES)
- 	$(RANLIB) $(TARGET)
- 
- %.o: %.cpp Makefile
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,14 +18,13 @@
-             -DUSE_SDL -DNEW=new\(std::nothrow\) \
-             -I../sdlwidgets \
-             $(shell sdl-config --cflags) # -g
--LDFLAGS  = -L../sdlwidgets -lsdlwidgets -lz \
-+LIBS      = -L../sdlwidgets -lsdlwidgets -lz \
-            -lm -lSDL_net -lSDL_mixer -lSDL_ttf -lSDL_image \
-            $(shell sdl-config --libs) # -g
- 
- WOPFLAGS = data=../data
- DOXYGENFLAGS = ../doc/doxygen.rc
- 
--CXX = g++
- DOXYGEN = doxygen
- UNISON_SOURCE = ssh://131.188.67.22//homes/staff/pohlt/wop/.unison_data
- 
-@@ -56,10 +55,10 @@
- 
- $(TARGET): $(OBJECT_FILES) Makefile ../sdlwidgets/libsdlwidgets.a
- 	-mkdir ../bin
--	$(CXX) $(OBJECT_FILES) -o $(TARGET) $(LDFLAGS)
-+	$(CXX) $(LDFLAGS) $(OBJECT_FILES) -o $(TARGET) $(LIBS)
- 
- %.o: %.cpp Makefile
--	$(CXX) $(CXXFLAGS) -c $< -o $@
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- clean:
- 	-rm -f $(TARGET) *.o Makefile.depend*
---- a/woprc
-+++ b/woprc
-@@ -30,7 +30,7 @@
- 
- ## path of the data directory
- ##  - optional, default "./data"
--data = ./data
-+data = /usr/share/wop
- 
- ## server name or IP address
- ##  - optional, default "localhost"
diff --git a/games-arcade/wop/files/wop-0.4.3-gcc43.patch b/games-arcade/wop/files/wop-0.4.3-gcc43.patch
deleted file mode 100644
index d4273f18ff6e..000000000000
--- a/games-arcade/wop/files/wop-0.4.3-gcc43.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/scusibot.cpp
-+++ b/src/scusibot.cpp
-@@ -5,6 +5,7 @@
- #include "stationarygun.hpp"
- #include "global.hpp"
- #include <vector>
-+#include <algorithm>
- 
- ScusiBot::ScusiBot()
- 	: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
---- a/src/gameinfowindow.cpp
-+++ b/src/gameinfowindow.cpp
-@@ -10,6 +10,8 @@
- #include "avatarworm.hpp"
- #include "wopsprites.hpp"
- #include "wopsprites.cpp"
-+#include "spriteset.cpp"
-+#include "spritesequence.cpp"
- #include "scorekeeper.hpp"
- #include "wopgui.hpp"
- 
---- a/src/map.cpp
-+++ b/src/map.cpp
-@@ -9,6 +9,8 @@
- #include "world.hpp"
- #include "wopsettings.hpp"
- #include "objectpaths.hpp"
-+#include "spriteset.cpp"
-+#include "spritesequence.cpp"
- 
- /**********************************************************/
- 
diff --git a/games-arcade/wop/files/wop-0.4.3-gcc6.patch b/games-arcade/wop/files/wop-0.4.3-gcc6.patch
deleted file mode 100644
index 14eea98c1a4e..000000000000
--- a/games-arcade/wop/files/wop-0.4.3-gcc6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/global.cpp
-+++ b/src/global.cpp
-@@ -44,10 +44,10 @@
- #define GREEN(s)                 s
- #define RED(s)                   s
- #else
--#define BLACK(s)                 "\033[0;1m"s"\033[0m"
--#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m"s"\033[0m"
--#define GREEN(s)                 "\033[32m"s"\033[0m"
--#define RED(s)                   "\033[31m"s"\033[0m"
-+#define BLACK(s)                 "\033[0;1m" s "\033[0m"
-+#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m" s "\033[0m"
-+#define GREEN(s)                 "\033[32m" s "\033[0m"
-+#define RED(s)                   "\033[31m" s "\033[0m"
- #endif
- 
- /**********************************************************/
diff --git a/games-arcade/wop/metadata.xml b/games-arcade/wop/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-arcade/wop/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/wop/wop-0.4.3-r2.ebuild b/games-arcade/wop/wop-0.4.3-r2.ebuild
deleted file mode 100644
index a23f9dd06474..000000000000
--- a/games-arcade/wop/wop-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-MY_DATA_V="2005-12-21"
-MY_DATA_P="${PN}data-${MY_DATA_V}"
-
-DESCRIPTION="Worms of Prey - A multi-player, real-time clone of Worms"
-HOMEPAGE="http://wormsofprey.org/"
-SRC_URI="
-	http://wormsofprey.org/download/${P}-src.tar.bz2
-	http://wormsofprey.org/download/${MY_DATA_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	tc-export AR CXX RANLIB
-}
-
-src_install() {
-	dobin bin/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/${MY_DATA_P}"/.
-
-	insinto /etc
-	doins woprc
-
-	newicon "${WORKDIR}/${MY_DATA_P}"/images/misc/icons/wop16.png ${PN}.png
-	make_desktop_entry wop "Worms of Prey"
-
-	dodoc AUTHORS ChangeLog README{,-Libraries.txt} REVIEWS
-}
diff --git a/games-board/megamek/files/megamek-0.34.10-source8.patch b/games-board/megamek/files/megamek-0.34.10-source8.patch
new file mode 100644
index 000000000000..27d4596d8d92
--- /dev/null
+++ b/games-board/megamek/files/megamek-0.34.10-source8.patch
@@ -0,0 +1,22 @@
+diff --git a/build.xml b/build.xml
+index 9d3a7d6..a6732b6 100644
+--- a/build.xml
++++ b/build.xml
+@@ -60,7 +60,7 @@
+ 

+ 	<target name="compile" depends="init" description="Compile java sources into class files">

+ 		<!-- compile -->

+-		<javac debug="true" debuglevel="lines,source" target="1.5" source="1.5" destdir="${builddir}" srcdir="${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true">

++		<javac debug="true" debuglevel="lines,source" destdir="${builddir}" srcdir="${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true">

+ 			<classpath>

+ 				<pathelement location="${basedir}" />

+ 				<fileset dir="${libdir}" includes="*.jar" />

+@@ -208,7 +208,7 @@
+ 

+ 		<!-- compile -->

+ 		<echo message="building MegaMek from svn sources" />

+-		<javac debug="true" debuglevel="lines,source" target="1.5" source="1.5" destdir="${svnbuilddir}" srcdir="${svndir}/${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true">

++		<javac debug="true" debuglevel="lines,source" destdir="${svnbuilddir}" srcdir="${svndir}/${srcdir}" memoryInitialSize="512m" memoryMaximumSize="512m" fork="true">

+ 			<classpath>

+ 				<pathelement location="${svndir}" />

+ 				<fileset dir="${svndir}/${libdir}" includes="*.jar" />

diff --git a/games-board/megamek/megamek-0.34.10-r2.ebuild b/games-board/megamek/megamek-0.34.10-r2.ebuild
deleted file mode 100644
index 213e94a3ce70..000000000000
--- a/games-board/megamek/megamek-0.34.10-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix java-pkg-2 java-ant-2
-
-DESCRIPTION="Unofficial online version of the Classic BattleTech board game"
-HOMEPAGE="https://megamek.org/"
-SRC_URI="
-	https://downloads.sourceforge.net/${PN}/MegaMek-v${PV}.zip
-	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-
-	rm MegaMek.jar || die
-
-	sed -e "s|XmX|Xmx|" \
-		-e "s|/usr/share/java|${EPREFIX}/usr/share/${PN}|" \
-		-e "s|/usr/share/MegaMek|${EPREFIX}/usr/share/${PN}|" \
-		startup.sh > ${PN} || die
-	edos2unix ${PN}
-
-	# workaround encoding issues posing problems with >=jdk-1.8
-	find . -name '*.java' -exec sed -i 's/\xf6/\xc3\xb6/' {} + || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}
-	doins -r MegaMek.jar data docs l10n lib mmconf readme* # readme used at runtime
-
-	dodoc HACKING readme.txt
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} MegaMek
-}
diff --git a/games-board/megamek/megamek-0.34.10-r3.ebuild b/games-board/megamek/megamek-0.34.10-r3.ebuild
new file mode 100644
index 000000000000..1de1e9c1f80e
--- /dev/null
+++ b/games-board/megamek/megamek-0.34.10-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop edos2unix java-pkg-2
+
+DESCRIPTION="Unofficial online version of the Classic BattleTech board game"
+HOMEPAGE="https://megamek.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/megamek/Archived%20Stable/MegaMek%20v${PV}/MegaMek-v${PV}.zip
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+DEPEND="
+	>=dev-java/ant-1.10.14-r3
+	>=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/megamek-0.34.10-source8.patch" )
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	rm MegaMek.jar || die
+
+	sed -e "s|XmX|Xmx|" \
+		-e "s|/usr/share/java|${EPREFIX}/usr/share/${PN}|" \
+		-e "s|/usr/share/MegaMek|${EPREFIX}/usr/share/${PN}|" \
+		startup.sh > ${PN} || die
+	edos2unix ${PN}
+
+	# workaround encoding issues posing problems with >=jdk-1.8
+	find . -name '*.java' -exec sed -i 's/\xf6/\xc3\xb6/' {} + || die
+}
+
+src_compile() {
+	eant \
+		-Dant.build.javac.source="$(java-pkg_get-source)" \
+		-Dant.build.javac.target="$(java-pkg_get-target)"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r MegaMek.jar data docs l10n lib mmconf readme* # readme used at runtime
+
+	dodoc HACKING readme.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} MegaMek
+}
diff --git a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
index c6e2125c4f67..7a3de4849efb 100644
--- a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
@@ -13,7 +13,7 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-	KEYWORDS="-* ~amd64"
+	KEYWORDS="-* amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 511b29de8cd0..299e15cb86fe 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.5.2.tar.xz 21968848 BLAKE2B 5a8c280f262e2d0f47ee5978cfc858ea62481eac838ad691996f359f1c4889499e4c78b5e6a1f2dc998cf0fc89ebbdf79296a25adb411e30e9248cce1b07d3a8 SHA512 b7fd5814c8671e439d4349297cfda0d89eb1f7a0945ec11bdf7a83637371664c9c39c036249e1650911397111e1b5d9e931f221ffd2d4a1f9e80d5ca58357dcf
+DIST devilutionx-1.5.3.tar.xz 22394112 BLAKE2B 1b04c7fe334ddfd6b1eb619b1e86c1e429f6c26c980a16129d8322bb30641409d9d11a203e42ccdbce60a05e00dc49b1a2acbdd1007c5f99e40b88acd1251440 SHA512 619873bb232d1b344f5001c232364af9cfcda72e44f28fd2a15332292fa37c0e64b7fccade3570b96bd648be235ed56e0cc2e3fd8299ac57ef26f2ce844cbc2f
diff --git a/games-engines/devilutionx/devilutionx-1.5.3.ebuild b/games-engines/devilutionx/devilutionx-1.5.3.ebuild
new file mode 100644
index 000000000000..d344483cdb2b
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.5.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="
+	https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
+		-> ${P}.tar.xz
+"
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="Unlicense BSD CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl_audiolib
+	sys-libs/zlib:=
+	sodium? ( dev-libs/libsodium:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+CMAKE_SKIP_TESTS=(
+	# timedemo tests only pass when game assets are available
+	Timedemo.
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=no #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=yes # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=yes
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm -- "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}
diff --git a/games-engines/minetest/Manifest b/games-engines/minetest/Manifest
index 17ce1a1572ff..c4a1c4ab944b 100644
--- a/games-engines/minetest/Manifest
+++ b/games-engines/minetest/Manifest
@@ -1,2 +1 @@
-DIST minetest-5.7.0.tar.gz 10115973 BLAKE2B 0f7e8864188004d57115c83508706b1cf1d6db0cba1a3002d603d4665e6d014ea2ec31df0a77a65da014467e21c331e3a27762018483a5bf4b2e024e3f7bdfc3 SHA512 6a934db5fd2c7c14fcfa87fb306662fa1ccf20a0eee056aea5c4c863986875017a4fa58ddf14319d385ee0400d00fb6a90f68b8f34527c98a746c6410360a529
 DIST minetest-5.8.0.tar.gz 10419348 BLAKE2B efe3edde2d3c57cc296b5f84359c24019583e4f70346eafd418da7cbfc334ecbb32c72df085052beaa28f8f4b4219d7431c150c20d511fc41c0809cdbad227f1 SHA512 0b376ecc051032ccb542f2f76e2b1f5c351b32f1c211027825b1538095f44cb1447cd0976cb85a4cde4ecb53873bcb9f3778799271ed65b038a031dc137c2aba
diff --git a/games-engines/minetest/minetest-5.7.0-r2.ebuild b/games-engines/minetest/minetest-5.7.0-r2.ebuild
deleted file mode 100644
index 391372f68334..000000000000
--- a/games-engines/minetest/minetest-5.7.0-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit cmake flag-o-matic lua-single systemd xdg
-
-DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	|| ( client server )"
-
-RESTRICT="!test? ( test )"
-
-# Use bundled PUC Lua if lua5-1 has been requested requested due to C++
-# interoperability issues, at least until Bug #825766 has been resolved anyway.
-RDEPEND="lua_single_target_luajit? ( ${LUA_DEPS} )
-	app-arch/zstd
-	dev-db/sqlite:3
-	dev-libs/gmp:0=
-	dev-libs/jsoncpp:=
-	sys-libs/zlib
-	client? (
-		~dev-games/irrlicht-mt-1.9.0.10
-		media-libs/freetype:2
-		media-libs/libpng:0=
-		media-libs/libjpeg-turbo
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXxf86vm
-		sound? (
-			media-libs/libvorbis
-			media-libs/openal
-		)
-	)
-	curl? ( net-misc/curl )
-	leveldb? ( dev-libs/leveldb:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	postgres? ( >=dev-db/postgresql-9.5:= )
-	prometheus? ( dev-cpp/prometheus-cpp )
-	redis? ( dev-libs/hiredis:= )
-	server? (
-		acct-group/minetest
-		acct-user/minetest
-		~dev-games/irrlicht-mt-headers-1.9.0.10
-	)
-	spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.0-no_upstream_optflags.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# To avoid TEXTRELs on riscv
-	append-flags -fPIC
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_UNITTESTS=$(usex test)
-		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
-		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
-		-DCUSTOM_MANDIR="${EPREFIX}/usr/share/man"
-		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_CURSES=$(usex ncurses)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GLES=no
-		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
-		-DENABLE_POSTGRESQL=$(usex postgres)
-		-DENABLE_PROMETHEUS=$(usex prometheus)
-		-DENABLE_REDIS=$(usex redis)
-		-DENABLE_SPATIAL=$(usex spatial)
-		-DENABLE_SOUND=$(usex sound)
-		-DENABLE_SYSTEM_GMP=1
-		-DENABLE_SYSTEM_JSONCPP=1
-		-DENABLE_UPDATE_CHECKER=no
-		-DRUN_IN_PLACE=0
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cmake_src_compile doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		keepdir /etc/${PN}
-		fowners root:${PN} /etc/${PN}
-		fperms 2750 /etc/${PN}
-
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-
-		newconfd "${FILESDIR}"/${PN}server.confd ${PN}-server
-		newinitd "${FILESDIR}"/${PN}server.initd ${PN}-server
-
-		systemd_newunit "${FILESDIR}"/${PN}server_default.service ${PN}-server.service
-		systemd_newunit "${FILESDIR}"/${PN}server_template.service ${PN}-server@.service
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}server.logrotate ${PN}-server
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Since 5.7.0-r2 new ${PN} configurations no longer check if newer versions are available upstream,"
-	elog "a feature unnecessary when ${PN} is installed using distro packages."
-	elog "To disable this check for existing configurations open the file ~/.minetest/minetest.conf"
-	elog "in a text editor while ${PN} is not running, locate the keyword 'update_last_checked',"
-	elog "and change that line to say:"
-	elog
-	elog "	update_last_checked = disabled"
-	elog
-}
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index 0136951ebe1a..6f6e586eed16 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1 +1,2 @@
 DIST qtads-3.3.0-source.tar.xz 6085960 BLAKE2B 516d9c38c1bed36d88f60ef746f1f8b7a82db14505e640c0d3024995a74c9efb68e7783111007db6ca7a2b6adbf7e5b96b6b1e7db1c0cce6441436e1ca81381b SHA512 7e2a647fc4bb81e9784a0b05b3fdee3e6306767aebd32466f6451dc8b2e0f61e01a5657d0bfb8ba091bdd8365c9fed4fd2ab5cd2a27bf5403a5192d42472f7b2
+DIST qtads-3.4.0-source.tar.xz 6059316 BLAKE2B 0aa1bd755aed6fe60a712754d5496a464296f990f99bb7fd3cf93e20ce86881837352739f77a0fe9b630cb67fc78f91fbabf3896e8105e2b51ffa7a46be90ce6 SHA512 b4d40ec3f757803beeb7e22afa7b2ae6a612970c11615378ed145870d577e30b5734cd316c4739e4a3726917654e268034e6ecf1132ebbe1e120dc56aa9a2e3b
diff --git a/games-engines/qtads/qtads-3.4.0.ebuild b/games-engines/qtads/qtads-3.4.0.ebuild
new file mode 100644
index 000000000000..63e98570846a
--- /dev/null
+++ b/games-engines/qtads/qtads-3.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Multimedia interpreter for TADS text adventures"
+HOMEPAGE="https://realnc.github.io/qtads"
+SRC_URI="https://github.com/realnc/qtads/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sound"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png]
+	dev-qt/qtimageformats:5[mng]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png]
+	sound? (
+		media-libs/libsdl2[sound]
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/fluidsynth:0=
+		media-sound/mpg123
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${EPREFIX}/usr/share/${PF}" \
+		$(usev !sound CONFIG+=disable-audio) \
+		-after CONFIG-=silent
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
index a7a4ae764174..23c15484cf5e 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1 +1,2 @@
 DIST wtf-20221208.tar.gz 31069 BLAKE2B 70329b6fd2af707a8b1c99d28ceb5de482c8b9414214b624cbe0cad60a5d30aec28230d62251166c3084751af64accc3ee24079eb2c8034ca6d4647d8e39eabb SHA512 2381d352ddd82c34cc23e594452ab6afcb4f5b31ede6656a33ae235b3b32fc868c88a564d01d9eab995ac56e9fc3c9902506f8ad5399c26d3f0667a333991525
+DIST wtf-20230906.tar.gz 31564 BLAKE2B 5b89b0685ac1cb8269ce3e4fab567f65a008730002cf87d54ac63df056b17b4f40f524752837ddb5b52ec18e90450104162b677aa7cdde9e0c8ba7bbb24f04a9 SHA512 7cb6cfc9c0c111b8f9ecff4e893910bc630cb9bb8862ac43ecb55d76c6f34c26fa48a26dd9354abde15900f8c9a042f3583988e07f60c0607268dbb9bd61970e
diff --git a/games-misc/wtf/wtf-20230906.ebuild b/games-misc/wtf/wtf-20230906.ebuild
new file mode 100644
index 000000000000..5ade076d4574
--- /dev/null
+++ b/games-misc/wtf/wtf-20230906.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix
+
+DESCRIPTION="Translates acronyms for you"
+HOMEPAGE="https://netbsd.org/"
+SRC_URI="https://sourceforge.net/projects/bsd${PN}/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="!<=games-misc/bsd-games-3"
+
+src_prepare() {
+	default
+	hprefixify wtf
+}
+
+src_install() {
+	dobin wtf
+	doman wtf.6
+	insinto /usr/share/misc
+	doins acronyms*
+}
diff --git a/games-mud/crystal/Manifest b/games-mud/crystal/Manifest
deleted file mode 100644
index b1199d2ad161..000000000000
--- a/games-mud/crystal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crystal-0.2.4.tar.gz 146962 BLAKE2B 0b98e7db594ea27be26d7391c1f1ee8cdbf3239b9d841ebebf61d1022e492e3791057b70ddbe67f3da2e4a93c5b2d3f390ee2852cb489cbad7426b14661b7de0 SHA512 8493b0d84db610606ce97e918cfa418123c39e5afffb4bf880aa905c46dc13d0b7ff0366b497e020276afadf9db951fcd6fa7aa0e25f5357574fa465ee152916
diff --git a/games-mud/crystal/crystal-0.2.4-r1.ebuild b/games-mud/crystal/crystal-0.2.4-r1.ebuild
deleted file mode 100644
index 4b3e6683c957..000000000000
--- a/games-mud/crystal/crystal-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="The crystal MUD client"
-HOMEPAGE="http://www.evilmagic.org/crystal/"
-SRC_URI="http://www.evilmagic.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-
-	# avoid colliding with xscreensaver (bug #281191)
-	mv crystal.6 crystal-mud.6 || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-scripting
-}
diff --git a/games-mud/crystal/files/crystal-0.2.4-build.patch b/games-mud/crystal/files/crystal-0.2.4-build.patch
deleted file mode 100644
index 1f8917e4056d..000000000000
--- a/games-mud/crystal/files/crystal-0.2.4-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -31,7 +31,9 @@
- AC_PROG_CXX
- AC_CHECK_FUNCS(select socket strerror strstr)
- 
--AC_CHECK_LIB(curses, main, [LIBS=" -lcurses "], AC_CHECK_LIB(ncurses, main, [LIBS=" -lncurses "], AC_MSG_ERROR([No curses])))
-+PKG_CHECK_MODULES([NCURSES], [ncurses])
-+AC_SUBST([NCURSES_CFLAGS])
-+AC_SUBST([NCURSES_LIBS])
- 
- AC_CHECK_LIB(z, main, [LIBS=$LIBS" -lz "; AC_DEFINE(HAVE_ZLIB)], AC_MSG_WARN([No zlib - MCCP support will not be built]))
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,11 @@
- 		common.h crystal.h grid.h io.h telnet.h wcwidth.c \
- 	scripting.cc scripting.h
- 
--man_MANS = crystal.6
-+crystal_CPPFLAGS = $(NCURSES_CFLAGS)
-+
-+crystal_LDADD = $(NCURSES_LIBS)
-+
-+man_MANS = crystal-mud.6
- 
- DEBDIST = README.Debian debian/changelog.real debian/compat debian/control debian/copyright debian/crystal-default.ex debian/crystal.substvars debian/docs debian/rules debian/watch.ex
- 
diff --git a/games-mud/crystal/files/crystal-0.2.4-gcc43.patch b/games-mud/crystal/files/crystal-0.2.4-gcc43.patch
deleted file mode 100644
index dbb4e2a1649f..000000000000
--- a/games-mud/crystal/files/crystal-0.2.4-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common.h
-+++ b/common.h
-@@ -3,6 +3,8 @@
- 
- #include <string>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- #include <curses.h>
- #include <termios.h>
- #include <sys/ioctl.h>
diff --git a/games-mud/crystal/metadata.xml b/games-mud/crystal/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-mud/crystal/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/gmudix/Manifest b/games-mud/gmudix/Manifest
deleted file mode 100644
index 13285c23bff7..000000000000
--- a/games-mud/gmudix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gmudix-1.0.tar.gz 137548 BLAKE2B 5b6b5cb75a41967e8a436651397e2560303006f34a88cf47991b331a60589b9e47835657155bf284f569180169f10a5f8871659d1d380a1cf211b8d853e2c575 SHA512 c22a725af6914d5177a737c1abf1ee38c133854fab8723dc01a89739b58214937008c3931ccc5928e88ee1ecbda385304ff862606eacec377addd6ee8de02b38
diff --git a/games-mud/gmudix/files/gmudix-1.0-as-needed.patch b/games-mud/gmudix/files/gmudix-1.0-as-needed.patch
deleted file mode 100644
index fe1de7b8cbdc..000000000000
--- a/games-mud/gmudix/files/gmudix-1.0-as-needed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -8,7 +8,8 @@
- AC_PROG_MAKE_SET
- 
- dnl Checks for libraries.
--PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= 2.0.0)
-+PKG_CHECK_MODULES(GTK, gtk+-2.0)
-+PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,10 +1,5 @@
- bin_PROGRAMS   = gmudix
- gmudix_SOURCES = alias.c commands.c file.c gui_alias.c gui_capture.c gui_character.c gui_color.c gui_font.c gui_general.c gui_macro.c gui_main.c gui_path.c gui_preferences.c gui_tab.c gui_timer.c gui_trigger.c gui_user.c gui_variable.c history.c log.c macro.c mccp.c mudix.c net.c path.c process.c string.c tabs.c telnet.c timer.c trigger.c user.c variable.c
--INCLUDES = -Wall -I.. -I../include `pkg-config --cflags gtk+-2.0`
--gmudix_LDFLAGS = -lz `pkg-config --libs gtk+-2.0` `pkg-config --libs gthread-2.0`
--
--if DEBUG_SYMBOLS
--CFLAGS := $(CFLAGS) -O2 -g
--else
--CFLAGS := $(CFLAGS) -O2 
--endif
-+AM_CFLAGS = -Wall
-+INCLUDES = -I.. -I../include $(GTK_CFLAGS) $(GTHREAD_CFLAGS)
-+LDADD = -lz $(GTK_LIBS) $(GTHREAD_LIBS)
diff --git a/games-mud/gmudix/files/gmudix-1.0-format.patch b/games-mud/gmudix/files/gmudix-1.0-format.patch
deleted file mode 100644
index 4bb9729840e8..000000000000
--- a/games-mud/gmudix/files/gmudix-1.0-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui_user.c	2016-02-04 21:21:15.141455597 +0100
-+++ b/src/gui_user.c	2016-02-04 21:21:31.016156493 +0100
-@@ -820,7 +820,7 @@
- 
-     dialog = gtk_message_dialog_new(GTK_WINDOW(user->gui_user.g_window), 
-                 GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, 
--                GTK_BUTTONS_CLOSE, msg);
-+                GTK_BUTTONS_CLOSE, "%s", msg);
-                 
-     gtk_window_set_transient_for(GTK_WINDOW(user->gui_user.g_window), 
-                                  GTK_WINDOW(dialog));
diff --git a/games-mud/gmudix/gmudix-1.0-r1.ebuild b/games-mud/gmudix/gmudix-1.0-r1.ebuild
deleted file mode 100644
index b10328d8c127..000000000000
--- a/games-mud/gmudix/gmudix-1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="GTK+ MUD client with many features and an easy scripting language"
-HOMEPAGE="http://dw.nl.eu.org/mudix.html"
-SRC_URI="http://dw.nl.eu.org/gmudix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	rm -f missing || die
-	eautoreconf
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc AUTHORS ChangeLog README TODO doc/*txt
-}
diff --git a/games-mud/gmudix/metadata.xml b/games-mud/gmudix/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-mud/gmudix/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/kildclient/Manifest b/games-mud/kildclient/Manifest
deleted file mode 100644
index 0e41ab953c70..000000000000
--- a/games-mud/kildclient/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kildclient-3.0.1.tar.gz 1838526 BLAKE2B 06243adbd682574f0ff155b9087fa81a35c2b7462b8051a9315d67eeb520dd6211e8c402d7f90a76a04d105f517645e628cec5d355c8f1b6725775fd94eb3911 SHA512 835b31b2e45a5895fd4aefcb662d6c3bf2c888836f12511ef7bc6c15a12dac8563bc9226dbc33fb75915fdf6024ed61a0a05185d0998646ba380410d6e33a706
diff --git a/games-mud/kildclient/files/kildclient-3.0.1-gentoo.patch b/games-mud/kildclient/files/kildclient-3.0.1-gentoo.patch
deleted file mode 100644
index 75b39cfad414..000000000000
--- a/games-mud/kildclient/files/kildclient-3.0.1-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ru kildclient-3.0.1.orig/Makefile.am kildclient-3.0.1/Makefile.am
---- kildclient-3.0.1.orig/Makefile.am	2014-09-07 11:49:16.000000000 -0400
-+++ kildclient-3.0.1/Makefile.am	2015-01-03 22:33:12.578096926 -0500
-@@ -9,11 +9,7 @@
-           share
- endif
- 
--pkgdocdir = $(datadir)/doc/kildclient
--
--pkgdoc_DATA = README AUTHORS NEWS COPYING
--
--appsdir = $(datadir)/applications
-+appsdir = /usr/share/applications
- apps_DATA = kildclient.desktop
- 
- EXTRA_DIST = kildclient.spec \
-diff -ru kildclient-3.0.1.orig/doc/C/Makefile.am kildclient-3.0.1/doc/C/Makefile.am
---- kildclient-3.0.1.orig/doc/C/Makefile.am	2012-02-12 10:48:07.000000000 -0500
-+++ kildclient-3.0.1/doc/C/Makefile.am	2015-01-04 00:11:46.422941983 -0500
-@@ -1,8 +1,8 @@
- SUBDIRS = images
- 
--pkgdocdir = $(datadir)/doc/kildclient
-+pkgdocdir = @docdir@
- 
--manualdir = $(pkgdocdir)/html
-+manualdir = @htmldir@
- 
- #pkgdoc_DATA = kildclient.pdf
- 
-diff -ru kildclient-3.0.1.orig/po/Makefile.in.in kildclient-3.0.1/po/Makefile.in.in
---- kildclient-3.0.1.orig/po/Makefile.in.in	2014-12-13 05:47:22.000000000 -0500
-+++ kildclient-3.0.1/po/Makefile.in.in	2015-01-04 00:13:33.357326034 -0500
-@@ -28,9 +28,8 @@
- datarootdir = @datarootdir@
- datadir = @datadir@
- libdir = @libdir@
--localedir = $(libdir)/locale
--gnulocaledir = $(datadir)/locale
--gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-+localedir = @localedir@
-+gnulocaledir = @localedir@
- subdir = po
- 
- INSTALL = @INSTALL@
-@@ -163,13 +162,6 @@
- 	    fi; \
- 	  fi; \
- 	done
--	if test "$(PACKAGE)" = "glib"; then \
--	  $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
--	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
--	else \
--	  : ; \
--	fi
- 
- # Define this as empty until I found a useful application.
- installcheck:
-@@ -184,9 +176,6 @@
- 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- 	done
--	if test "$(PACKAGE)" = "glib"; then \
--	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
--	fi
- 
- check: all
- 
-diff -ru kildclient-3.0.1.orig/share/Makefile.am kildclient-3.0.1/share/Makefile.am
---- kildclient-3.0.1.orig/share/Makefile.am	2012-02-12 10:48:56.000000000 -0500
-+++ kildclient-3.0.1/share/Makefile.am	2015-01-04 00:14:05.375243115 -0500
-@@ -5,7 +5,7 @@
- 		kildclient.hlp \
- 		kcworld.dtd
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = /usr/share/pixmaps
- pixmap_DATA = kildclient.png kildclient.xpm
- 
- 
-diff -ru kildclient-3.0.1.orig/src/Makefile.am kildclient-3.0.1/src/Makefile.am
---- kildclient-3.0.1.orig/src/Makefile.am	2014-12-13 05:40:02.000000000 -0500
-+++ kildclient-3.0.1/src/Makefile.am	2015-01-04 00:14:47.606814577 -0500
-@@ -84,11 +84,11 @@
- 
- EXTRA_DIST = $(pkgdata_DATA) $(uifiles)
- 
--pkgdocdir = $(datadir)/doc/kildclient
-+pkgdocdir = @docdir@
- 
--manualdir = $(pkgdocdir)/html
-+manualdir = @htmldir@
- 
--localedir = $(datadir)/locale
-+localedir = @localedir@
- 
- kildclient_LDADD = $(GTK_LIBS) $(KILDCLIENT_PERL_LIBS) $(GTKSPELL_LIBS) $(LIBGNUTLS_LIBS) $(INTLLIBS) -lz
- 
-diff -ru kildclient-3.0.1.orig/src/mainwindow.c kildclient-3.0.1/src/mainwindow.c
---- kildclient-3.0.1.orig/src/mainwindow.c	2014-12-13 05:40:02.000000000 -0500
-+++ kildclient-3.0.1/src/mainwindow.c	2015-01-04 00:15:43.877910836 -0500
-@@ -172,9 +172,9 @@
-   window = GTK_WIDGET(gtk_builder_get_object(main_builder, "wndMain"));
- #ifndef __WIN32__
-   gtk_window_set_icon_from_file(GTK_WINDOW(window),
--                                SYSDATADIR "/pixmaps/kildclient.png",
-+                                "/usr/share/pixmaps/kildclient.png",
-                                 NULL);
--  gtk_window_set_default_icon_from_file(SYSDATADIR "/pixmaps/kildclient.png",
-+  gtk_window_set_default_icon_from_file("/usr/share/pixmaps/kildclient.png",
-                                         NULL);
- #endif
- 
diff --git a/games-mud/kildclient/kildclient-3.0.1-r1.ebuild b/games-mud/kildclient/kildclient-3.0.1-r1.ebuild
deleted file mode 100644
index 6a51d9709745..000000000000
--- a/games-mud/kildclient/kildclient-3.0.1-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=6
-inherit autotools
-
-DESCRIPTION="Powerful MUD client with a built-in PERL interpreter"
-HOMEPAGE="http://kildclient.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/kildclient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnutls spell"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Locale-gettext
-	dev-perl/JSON
-	sys-libs/zlib
-	x11-libs/gtk+:3
-	virtual/libintl
-	spell? ( app-text/gtkspell:3 )
-	gnutls? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_with spell gtkspell) \
-		$(use_with gnutls libgnutls) \
-		$(use_with doc docs)
-}
diff --git a/games-mud/kildclient/metadata.xml b/games-mud/kildclient/metadata.xml
deleted file mode 100644
index 785675d1fa17..000000000000
--- a/games-mud/kildclient/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kildclient</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/color-lines/Manifest b/games-puzzle/color-lines/Manifest
deleted file mode 100644
index 5824b1ebe3b5..000000000000
--- a/games-puzzle/color-lines/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lines_0.6.tar.gz 862137 BLAKE2B 11be598d89963b7a32479565538d85531d8bab16e46b8c5851e30cda7fd480a9d40d43b10fd3d74f2d0f820f0606aabe775ff44bbe5dd9f55551095aeb95cb60 SHA512 fe9e96b598fb6cf0980d0970facbc070715b33491a8f0ad979c57332a22e97ab801e85dd17b5d0b2a1b8aba69b48b6c42dc115b01a36654ad05a5e9a06c5405a
diff --git a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
deleted file mode 100644
index 35416f945881..000000000000
--- a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Color lines game written with SDL with bonus features"
-HOMEPAGE="https://github.com/OpenA/color-lines-sdl"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz -> lines_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-RDEPEND="
-	media-libs/libsdl[X,sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[wav,mod]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lines-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}-Makefile.patch"
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Version/d' \
-		-e '/^Icon/s/.png//' \
-		color-lines.desktop.in || die 'sed on color-lines.desktop.in failed'
-}
-
-src_compile() {
-	emake BINDIR="${EPREFIX}/usr/bin/" GAMEDATADIR="${EPREFIX}/usr/share/${PN}/"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r gfx sounds
-
-	domenu ${PN}.desktop
-	doicon icon/${PN}.png
-	einstalldocs
-	dobin ${PN}
-}
diff --git a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
deleted file mode 100644
index bf1339b94a01..000000000000
--- a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.unix.orig	2013-04-12 13:56:42.131113000 +0400
-+++ b/Makefile.unix	2013-04-12 13:57:26.595946027 +0400
-@@ -2,18 +2,18 @@
- VERTITLE := lines-$(VERSION)
- ARCHIVE := lines_$(VERSION).tar.gz
- 
--CFLAGS:=-Wall -O2 $(shell sdl-config --cflags) 
-+CFLAGS += $(shell sdl-config --cflags) 
- #-DMAEMO
- 
--LDFLAGS:=$(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-+LIBS   := -lm $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
- 
- SRC     := board.c graphics.c main.c sound.c
- OBJ     := $(patsubst %.c, %.o, $(SRC))
- 
- all: color-lines
--PREFIX:=/usr/local
-+PREFIX:=/usr
- 
--BINDIR:=$(DESTDIR)/$(PREFIX)/games/
-+BINDIR:=$(DESTDIR)$(PREFIX)/games/bin
- GAMEDATADIR:=$(DESTDIR)/$(PREFIX)/share/games/color-lines/
- 
- svnclean:
-@@ -29,8 +29,7 @@
- 
- color-lines:  $(OBJ)
- 	cat color-lines.desktop.in | sed -e "s|@BINDIR|$(BINDIR)|g" > color-lines.desktop
--	$(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) 
--	strip color-lines
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) $(LIBS)
- 
- clean:
- 	rm -f *.o color-lines
diff --git a/games-puzzle/color-lines/metadata.xml b/games-puzzle/color-lines/metadata.xml
deleted file mode 100644
index ed0ddbb10055..000000000000
--- a/games-puzzle/color-lines/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-needed -->
-	<upstream>
-		<remote-id type="github">OpenA/color-lines-sdl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
deleted file mode 100644
index 585e2006726a..000000000000
--- a/games-puzzle/hangman/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hangman-0.9.2.tar.gz 1023712 BLAKE2B d9d12e02cb48fb80e0cf9c5f9dcb52f57e6305342b41443a791252701758c302bdbfb15dfefcfbbc7c4fc39fe1bfaccd961d1eb3d9a351f937c219ce98c26a26 SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65
diff --git a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
deleted file mode 100644
index abfc77ca017b..000000000000
--- a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="The classic word guessing game"
-HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
-SRC_URI="http://www.shiftygames.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!games-misc/bsd-games
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}
-	sys-apps/miscfiles"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
-		src/hangman.c \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	newicon pics/noose.png ${PN}.png
-	make_desktop_entry ${PN} Hangman
-}
diff --git a/games-puzzle/hangman/metadata.xml b/games-puzzle/hangman/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-puzzle/hangman/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
deleted file mode 100644
index c45f311085ec..000000000000
--- a/games-puzzle/scramble/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scramble-0.9.5.tar.gz 552301 BLAKE2B 9bbdbe1551ba03dc66342eaab9b7e85356ca6fa78f2bbf7423b79a65cfe46711f0818ff41cba81a98b3888c9558692ec9879095e6353216675a869ab4544753f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b
diff --git a/games-puzzle/scramble/metadata.xml b/games-puzzle/scramble/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-puzzle/scramble/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
deleted file mode 100644
index 9158e8985e9a..000000000000
--- a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="Create as many words as you can before the time runs out"
-HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html"
-SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[sound,video]
-	>=media-libs/sdl-mixer-1.2[vorbis]
-	>=media-libs/sdl-image-1.2[png]
-	media-libs/sdl-ttf
-"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-apps/miscfiles
-"
-
-src_prepare() {
-	default
-	pngfix -q --out=pics/background-fixed.png pics/background.png
-	mv -f pics/background-fixed.png pics/background.png
-	append-cflags $(sdl-config --cflags)
-	sed -i -e 's/inline //' src/scramble.c || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon pics/sg_icon.png ${PN}.png
-	make_desktop_entry ${PN} "Scramble"
-}
diff --git a/games-puzzle/skladnik/Manifest b/games-puzzle/skladnik/Manifest
index 52a4803a25c2..6c4412fe2724 100644
--- a/games-puzzle/skladnik/Manifest
+++ b/games-puzzle/skladnik/Manifest
@@ -1,2 +1,2 @@
-DIST skladnik-0.5.1.tar.xz 397604 BLAKE2B 1d99e01a611c819d21a4ef009070a07c64e19499ddb54ce21611850092cc3a2e1877ab034b7b722fe962d641b00d3ac195e541966372cc8518d75a404051f3e6 SHA512 84a8494a679d228a41f559c4d986bf50c7ee287e9af3d400e9cc35347ce4ac72166ee1691bfb6739b9c1923c5d6e3d48c695592dbd12238f10a0977957ad09a6
 DIST skladnik-24.05.2.tar.xz 408008 BLAKE2B 2178a2c54c5bdb4a8f966a8681c509b73dc93ffc7c4a30b08ef59ea16d36b51d193d672749eaf2016d43d51b801cadc67c21ce13e6cb66de8418935a9fae55dc SHA512 75cdb0de9fc703a247c2e3a8a909bc0e7d97b70a09876f7de953955ac43c7e4ce34db3d99f0d273f799b3e6b076d60ce6366b68d9d0496db530dd82a401719b0
+DIST skladnik-24.08.0.tar.xz 409104 BLAKE2B 6073ccc25d3b915e6cb4e124b93ba8ec2bc40d36abc308b5626019c520516c859e3eea13d6f439ecdc52ea8fb8cf8b508501be7980297fd8763fdf0315b539f1 SHA512 d0bd4c4ab4c36a43f7d0fc2c637ec825882376726b921107e72abbadf56dc3817edb3c7649daadcfcc782ef9e7fbfbf6dd386fa5cf125d6efa3236a93b83ab06
diff --git a/games-puzzle/skladnik/skladnik-0.5.1.ebuild b/games-puzzle/skladnik/skladnik-0.5.1.ebuild
deleted file mode 100644
index 32ac7b494dc5..000000000000
--- a/games-puzzle/skladnik/skladnik-0.5.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
-
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="The Japanese warehouse keeper sokoban game"
-HOMEPAGE="https://invent.kde.org/games/skladnik"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkdegames-22.12.0:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="media-gfx/povray"
diff --git a/games-puzzle/skladnik/skladnik-24.05.2.ebuild b/games-puzzle/skladnik/skladnik-24.05.2.ebuild
index 50cdd953154b..669d4a361173 100644
--- a/games-puzzle/skladnik/skladnik-24.05.2.ebuild
+++ b/games-puzzle/skladnik/skladnik-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/skladnik/ https://invent.kde.org/games/skladnik"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
diff --git a/games-puzzle/skladnik/skladnik-24.08.0.ebuild b/games-puzzle/skladnik/skladnik-24.08.0.ebuild
new file mode 100644
index 000000000000..db53201cea58
--- /dev/null
+++ b/games-puzzle/skladnik/skladnik-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/zaz/Manifest b/games-puzzle/zaz/Manifest
deleted file mode 100644
index 23f64a5819d6..000000000000
--- a/games-puzzle/zaz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
diff --git a/games-puzzle/zaz/files/zaz-1.0.0-build.patch b/games-puzzle/zaz/files/zaz-1.0.0-build.patch
deleted file mode 100644
index bef2954bf088..000000000000
--- a/games-puzzle/zaz/files/zaz-1.0.0-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru zaz-0.7.0.orig/Makefile.am zaz-0.7.0/Makefile.am
---- zaz-0.7.0.orig/Makefile.am	2009-10-14 18:20:14.000000000 -0400
-+++ zaz-0.7.0/Makefile.am	2010-05-13 15:49:59.404464060 -0400
-@@ -2,15 +2,6 @@
- 
- SUBDIRS = po src data extra
- 
--dist_doc_DATA = \
--	README\
--	COPYING\
--	AUTHORS\
--	ChangeLog\
--	INSTALL\
--	NEWS
--
--
- EXTRA_DIST = config.rpath m4/ChangeLog\
- 	$(shared_data_DATA) \
- 	zaz.anjuta\
diff --git a/games-puzzle/zaz/metadata.xml b/games-puzzle/zaz/metadata.xml
deleted file mode 100644
index ff599c6d98fb..000000000000
--- a/games-puzzle/zaz/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">zaz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/zaz/zaz-1.0.0-r2.ebuild b/games-puzzle/zaz/zaz-1.0.0-r2.ebuild
deleted file mode 100644
index d029a94a7a34..000000000000
--- a/games-puzzle/zaz/zaz-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic xdg toolchain-funcs
-
-DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
-HOMEPAGE="https://sourceforge.net/projects/zaz/"
-SRC_URI="https://downloads.sourceforge.net/zaz/${P}.tar.bz2"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 OFL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[X,sound,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/libvorbis
-	media-libs/libtheora
-	media-libs/ftgl
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	local x=/usr/share/gettext/po/Makefile.in.in
-	[[ -e $x ]] && cp -f $x po/ #336119
-
-	eapply "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-libs -lvorbis
-	append-cflags $($(tc-getPKG_CONFIG) sdl --cflags)
-	append-cxxflags $($(tc-getPKG_CONFIG) sdl --cflags)
-	econf \
-		--with-applicationdir=/usr/share/applications \
-		--with-icondir=/usr/share/pixmaps \
-		--localedir=/usr/share/locale \
-		$(use_enable nls)
-}
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index d4f0ae718ac3..b410db5df252 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,2 +1,2 @@
 DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd
-DIST tomenet-4.9.1.tar.bz2 5203112 BLAKE2B fa7ade988c94334416101d31fed0538b50a49cc46027d40eef3a85573973cee2b5c70db1815b531137104e4f51d42efc2cdf7bbc76219ee7b89b5d60dd0bea4a SHA512 20c03aea73f6d231a8e3d9bd0426baf5e96582e0df54c907565fbb4214d76eb0d42f59bb3ca1c604ec0e20604877f71b31c821140a8763b22ddcf55ba9c3f9ef
+DIST tomenet-4.9.2.tar.bz2 7601198 BLAKE2B 3b7ac9264973ba04e929bbc29636ccfbd4f3ddc1990e9de50c500b58a8ae2ffd460bbde13656b834853cbbdcc89a399a0620b7069b59aa69e000af98f907ea48 SHA512 efa68b3e0ca4c090659991edf72bade09ed64de34e6dd5c6b9d562d2c24fa3fdad90b8ed5c04deab39820a8430c1149f85b24cc7fc4b943a8b980c15f91de958
diff --git a/games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch
deleted file mode 100644
index 3c2a104a4d11..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.9.1-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/makefile b/makefile
-index cd79e4d4d..4d3c5e53b 100644
---- a/makefile
-+++ b/makefile
-@@ -224,7 +224,7 @@ CPP = cpp
- #thing is, that the correctly transcribed URL will actually make tolua choke.
- #So, -nostdinc will prevent the whole own comment blob of cpp to get generated
- #in the first place, as we never asked for it:
--CPPFLAGS = -C -P -nostdinc
-+CPPFLAGS = -C -P -nostdinc $(GENTOO_CPPFLAGS)
- 
- # gcc variant:
- #CPP = gcc
-@@ -235,6 +235,21 @@ CPPFLAGS = -C -P -nostdinc
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# Defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL -I/usr/local/include/SDL2 -I/usr/include/SDL2 $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL2 -lSDL2_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -DUSE_X11
-+LIBS += -lX11
-+endif
-+
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_DEFAULT_SOURCE -DMEXP=19937 -std=c99
-+LIBS += $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
-+
- 
- # Account editor
- ACCEDIT_LIBS = -lncurses -lcrypt
-@@ -289,12 +304,10 @@ SERVER_EXTRA_LIBS = -lcrypt
- 
- # With SDL2
- #  With sdl2-config
--CFLAGS = -pipe -Wall -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -D_DEFAULT_SOURCE -DACC32 -fPIE -fsigned-char -Wno-format-truncation
- # Note: -fsigned-char is important for ARM64, as there 'char' is by default unsigned, while on x86/AM64 it is by default signed!
- #  With manually set prefix
- #CFLAGS = -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL -I/usr/local/include/SDL2 -I/usr/include/SDL2 -D_REENTRANT -D_DEFAULT_SOURCE -DACC32 -fPIE -Wno-format-truncation
- #  With sdl2-config
--LIBS = -L/usr/pkg/lib -lncurses -lm
- #  With manually set prefix
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lm -L/usr/local/lib -L/usr/lib -pthread -lSDL2 -lSDL2_mixer
- 
diff --git a/games-roguelike/tomenet/files/tomenet-4.9.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.9.2-makefile.patch
new file mode 100644
index 000000000000..8a66a54a29bd
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.9.2-makefile.patch
@@ -0,0 +1,48 @@
+diff --git a/makefile b/makefile
+index 60129a707..45ac2639d 100644
+--- a/makefile
++++ b/makefile
+@@ -226,7 +226,7 @@ CPP = cpp
+ #So, -nostdinc will prevent the whole own comment blob of cpp to get generated
+ #in the first place, as we never asked for it:
+ #CPPFLAGS = -C -P -nostdinc
+-CPPFLAGS = -x c -E -Wp,-C,-P,-nostdinc,-Wno-format-overflow
++CPPFLAGS = -x c -E -Wp,-C,-P,-nostdinc,-Wno-format-overflow $(GENTOO_CPPFLAGS)
+ 
+ # gcc variant:
+ #CPP = gcc
+@@ -237,6 +237,21 @@ CPPFLAGS = -x c -E -Wp,-C,-P,-nostdinc,-Wno-format-overflow
+ # For variations with X11
+ X11BASE = /usr/X11R6
+ 
++# Defines
++ifdef USE_SDL
++CFLAGS += -DSOUND_SDL -I/usr/local/include/SDL2 -I/usr/include/SDL2 $(shell sdl-config --cflags)
++SDL_LIBS = $(shell sdl-config --libs) -lSDL2 -lSDL2_mixer
++endif
++
++ifdef USE_X
++CFLAGS += -DUSE_X11
++LIBS += -lX11
++endif
++
++CFLAGS += -Wall
++CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_DEFAULT_SOURCE -DMEXP=19937 -std=c99
++LIBS += $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
++
+ 
+ # Account editor
+ ACCEDIT_LIBS = -lncurses -lcrypt
+@@ -291,12 +306,10 @@ SERVER_EXTRA_LIBS = -lcrypt
+ 
+ # With SDL2
+ #  With sdl2-config
+-CFLAGS = -pipe -Wall -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -D_DEFAULT_SOURCE -DACC32 -fPIE -fsigned-char
+ # Note: -fsigned-char is important for ARM64, as there 'char' is by default unsigned, while on x86/AM64 it is by default signed!
+ #  With manually set prefix
+ #CFLAGS = -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL -I/usr/local/include/SDL2 -I/usr/include/SDL2 -D_REENTRANT -D_DEFAULT_SOURCE -DACC32 -fPIE -Wno-format-truncation
+ #  With sdl2-config
+-LIBS = -L/usr/pkg/lib -lncurses -lm
+ #  With manually set prefix
+ #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lm -L/usr/local/lib -L/usr/lib -pthread -lSDL2 -lSDL2_mixer
+ 
diff --git a/games-roguelike/tomenet/tomenet-4.9.1.ebuild b/games-roguelike/tomenet/tomenet-4.9.1.ebuild
deleted file mode 100644
index 150a3fa9fbab..000000000000
--- a/games-roguelike/tomenet/tomenet-4.9.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs xdg
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="https://www.tomenet.eu"
-SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client server +sound X"
-REQUIRED_USE="|| ( client server )"
-
-RDEPEND="sys-libs/ncurses:0
-	client? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-DEPEND="${RDEPEND}
-	client? ( sound? ( app-arch/p7zip ) )"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-disable-experimental.patch
-)
-
-src_prepare() {
-	default
-	if ! use server; then
-		rm -r ../lib/{config,data,save} || die
-	fi
-
-	sed \
-		-e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server; then
-		sed \
-			-e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	local mytargets="$(usex client "tomenet" "") $(usex server "accedit tomenet.server" "")"
-	emake \
-		$(usex client "$(usex X "USE_X=1" "")" "") \
-		$(usex client "$(usex sound "USE_SDL=1" "")" "") \
-		CC="$(tc-getCC)" \
-		CPP="$(tc-getCPP)" \
-		GENTOO_CPPFLAGS="${CPPFLAGS}" \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if use client ; then
-		newbin ${PN} ${PN}.bin
-		dobin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server ; then
-		newbin tomenet.server tomenet.server.bin
-		dobin "${T}"/${PN}.server accedit
-	fi
-
-	insinto "/usr/share/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  https://tomenet.eu/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
diff --git a/games-roguelike/tomenet/tomenet-4.9.2.ebuild b/games-roguelike/tomenet/tomenet-4.9.2.ebuild
new file mode 100644
index 000000000000..444f60a88e34
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.9.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
+HOMEPAGE="https://www.tomenet.eu"
+SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client server +sound X"
+REQUIRED_USE="|| ( client server )"
+
+RDEPEND="sys-libs/ncurses:0
+	client? (
+		X? (
+			x11-libs/libX11
+		)
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[vorbis,mp3]
+		)
+	)"
+DEPEND="${RDEPEND}
+	client? ( sound? ( app-arch/p7zip ) )"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${PN}-4.9.1-disable-experimental.patch
+)
+
+src_prepare() {
+	default
+	if ! use server; then
+		rm -r ../lib/{config,data,save} || die
+	fi
+
+	sed \
+		-e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+
+	if use server; then
+		sed \
+			-e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
+			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
+	fi
+
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	local mytargets="$(usex client "tomenet" "") $(usex server "accedit tomenet.server" "")"
+	emake \
+		$(usex client "$(usex X "USE_X=1" "")" "") \
+		$(usex client "$(usex sound "USE_SDL=1" "")" "") \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP)" \
+		GENTOO_CPPFLAGS="${CPPFLAGS}" \
+		-f makefile \
+		${mytargets[@]}
+}
+
+src_install() {
+	dodoc ../TomeNET-Guide.txt
+
+	if use client ; then
+		newbin ${PN} ${PN}.bin
+		dobin "${T}"/${PN}
+
+		doicon -s 48 client/tomenet4.png
+		make_desktop_entry ${PN} ${PN} ${PN}4
+	fi
+
+	if use server ; then
+		newbin tomenet.server tomenet.server.bin
+		dobin "${T}"/${PN}.server accedit
+	fi
+
+	insinto "/usr/share/${PN}"
+	doins -r ../lib/*
+	doins ../.tomenetrc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use sound; then
+		elog "You can get soundpacks from here:"
+		elog '  https://tomenet.eu/downloads.php'
+		elog "They must be placed inside ~/.tomenet directory."
+	fi
+}
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index e84960362563..0b2a7bbb1f1a 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1 +1 @@
-DIST bedrock-server-1.21.3.01.zip 130166595 BLAKE2B 0b8c68582fee20e8cead1d3453688d9e9705d793c329c7e3890530ce7168a8561af8840e160665095a1d8f2ca87a5bf4c7ff995eff01d8f2e86971b207a1cd3e SHA512 4625ac3d5d2a623e584ed800b7b01b0d52adfdcaefd1fd076ad90af23d4b8c46bbe9d1e83dde5514ddc0836396bd4881dd45230af5d5cd758081efb982d6d7cc
+DIST bedrock-server-1.21.20.03.zip 54517989 BLAKE2B 19fb3dee43014f172204834e42e9505403f299bb9284da8a4304d74ffbbdec72a0687260a2b2de6a9e9b4d7e5067235029d38f6cfc8db8f4ec4762755c1c044e SHA512 6c32086edf7fb49e17eba03f821bf965e875603653572b83af6d18dc7ff95a7f104d550b37eee7bad7843457da9ce1f2fec6f1df9c9443d85763a3b40f9c26ed
diff --git a/games-server/bedrock-server/bedrock-server-1.21.3.01.ebuild b/games-server/bedrock-server/bedrock-server-1.21.20.03.ebuild
index 16edcd9b2772..16edcd9b2772 100644
--- a/games-server/bedrock-server/bedrock-server-1.21.3.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.21.20.03.ebuild
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index c33b574db821..3a5d57ae7b68 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1 +1 @@
-DIST minecraft-server-1.21.0.jar 51623779 BLAKE2B 674390383a85d2add9f5dfc20be48d33d8567c5c42745bd742076e16dff9afc194a816b5bed50de0a698d81a88ed68e30433715d6ac06eed5d0565c117aaaa85 SHA512 79467240298364634f31ba74c0c80060ef6af97e5e64680a5664b3739013e5cba9fa7c3e61e66e094031a16a4d6065a7e7e8acba6d57134836d19a2b94f94b8c
+DIST minecraft-server-1.21.1.jar 51627615 BLAKE2B 9a8218911642b589a5030f680efbf9ade8646dde92679d0a02660a8f46baef6f1e409402aeded3bfc78cf96fe4bda2221ab2d1250d1d62a1cb3a2fb5d6400262 SHA512 d45a89a1451ca2982c81ed577b099106baa545779ad7e828dd25399768dc63629687df6498920528978bf09a3ebbc558d39765defdd3a22a70b12262a5033f95
diff --git a/games-server/minecraft-server/minecraft-server-1.21.0.ebuild b/games-server/minecraft-server/minecraft-server-1.21.0.ebuild
deleted file mode 100644
index 64c4261eea71..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.21.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
-
-EGIT_COMMIT="450698d1863ab5180c25d7c804ef0fe6369dd1ba"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://piston-data.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:21
-		dev-java/openjdk-bin:21
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.21.1.ebuild b/games-server/minecraft-server/minecraft-server-1.21.1.ebuild
new file mode 100644
index 000000000000..1f4d1bddf45b
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.21.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="59353fb40c36d304f2035d51e7d6e6baa98dc05c"
+README_GENTOO_SUFFIX="-r1"
+
+inherit readme.gentoo-r1 java-pkg-2 systemd
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://piston-data.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/minecraft
+	acct-user/minecraft
+	app-misc/dtach
+	|| (
+		dev-java/openjdk:21
+		dev-java/openjdk-bin:21
+	)
+"
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
+
+	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+
+	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
+	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
deleted file mode 100644
index 290f892e0618..000000000000
--- a/games-simulation/cannonsmash/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST csmash-0.6.6.tar.gz 1989943 BLAKE2B 723b7accd9a899f6d80df07573f8583684606c6b5bf8f11753902f4db196a9a2738cd11899e0a3b4e5637b04553173d75701edbed6e2d800b7b18edb82b2a10f SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916
-DIST danslatristesse2-48.ogg 1070787 BLAKE2B 91bb5b552a45349d6b34d459f2d5071498b6def76c9b7e7ce1538c29af762698708d4ad6fe780e087f14b6ca42dad258c8ed2a7cd368027a5080aab52d02575a SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
deleted file mode 100644
index 69ca215e63a6..000000000000
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_OGG=danslatristesse2-48.ogg
-DESCRIPTION="3D tabletennis game"
-HOMEPAGE="http://cannonsmash.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/csmash-${PV}.tar.gz
-	vorbis? ( http://nan.p.utmc.or.jp/${MY_OGG} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vorbis nls"
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[vorbis?]
-	media-libs/sdl-image[jpeg,png]
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/csmash-${PV}"
-
-src_unpack() {
-	unpack csmash-${PV}.tar.gz
-}
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-x-inc.patch \
-		"${FILESDIR}"/${P}-sizeof-cast.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-flags.patch
-	if use vorbis ; then
-		sed -i \
-			-e "s:${MY_OGG}:/usr/share/csmash/games/${MY_OGG}:" ttinc.h \
-			|| die "sed failed"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--datadir="/usr/share"
-}
-
-src_compile() {
-	emake \
-		localedir="/usr/share"
-}
-
-src_install() {
-	default
-	if use vorbis ; then
-		insinto /usr/share/games/csmash
-		doins "${DISTDIR}"/${MY_OGG}
-	fi
-	newicon win32/orange.ico ${PN}.ico
-	make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
-}
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
deleted file mode 100644
index c7b3b561d2d1..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.old	2010-10-18 15:05:02.000000000 +0200
-+++ b/configure	2010-10-18 15:05:31.000000000 +0200
-@@ -5516,12 +5516,12 @@
- 
- 
- if test "x$x_includes" != "x"; then
--  CFLAGS="-I $x_includes"
--else
--  CFLAGS=""
--fi
--LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
--CXXFLAGS="$CFLAGS -Wall"
-+  CFLAGS="${CFLAGS} -I $x_includes"
-+else
-+  CFLAGS="${CFLAGS}"
-+fi
-+LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- 
- echo "$as_me:$LINENO: checking for main in -lXmu" >&5
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
deleted file mode 100644
index 6602c2f09304..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/BallView.h.old	2006-04-11 00:10:37.000000000 +0200
-+++ b/BallView.h	2006-04-11 00:10:53.000000000 +0200
-@@ -32,7 +32,7 @@
- 
-   static GLuint m_number[10];
- private:
--  void BallView::DrawTargetCircle();
-+  void DrawTargetCircle();
-   GLUquadricObj *m_quad;
- 
-   void DrawBall();
---- a/matrix.old	2006-04-11 00:13:18.000000000 +0200
-+++ b/matrix	2006-04-11 00:19:34.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- /* __BEGIN__BEGIN__ */
- //__NAMESPACE_BEGIN(ese);
--#if (!defined __GNUG__) || (__GNUC__ == 3)
-+#if (!defined __GNUG__) || (__GNUC__ >= 3)
- template<typename T>
- void swap(T& a, T& b)
- {
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
deleted file mode 100644
index ead10c90400b..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Don't typecast otherwise C++ will fail to match on some arches.
-
-http://bugs.gentoo.org/84187
-
---- a/loadparts.cpp
-+++ b/loadparts.cpp
-@@ -247,3 +247,3 @@
-             // concat next line(s)
--	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
-+	    int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
- 	    fgets(&line[l-2], bufsize, fp);
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
deleted file mode 100644
index e56b51e0b92a..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch by Jason Bucata.
-http://bugs.gentoo.org/84187
-
---- a/configure
-+++ b/configure
-@@ -5515,7 +5515,11 @@
- fi
- 
- 
--CFLAGS="-I $x_includes"
-+if test "x$x_includes" != "x"; then
-+  CFLAGS="-I $x_includes"
-+else
-+  CFLAGS=""
-+fi
- LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
- 
diff --git a/games-simulation/cannonsmash/metadata.xml b/games-simulation/cannonsmash/metadata.xml
deleted file mode 100644
index adbc0279ac0e..000000000000
--- a/games-simulation/cannonsmash/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cannonsmash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 5661707dec8d..6b11d1e4bbdc 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,10 +1,6 @@
-DIST simutrans-src-123-0-1.zip 4771334 BLAKE2B c83edba188225c07bea9aa50d8899a251d3b9f50160aada6839d519bc99f52ef57bd95e7cfdf8db5d6c5efffb9fd421b4b8d8283b7998a352fdd7327332244c4 SHA512 87bc96c201126bc735693dea83a320e79f4b4a0fa6940aa9a6d2f8ef6025788f941a3c816febe3dc8a23ff786a2f016df2ef8a61492bb5ed4a834c721f8fc0a1
-DIST simutrans-src-124-0.zip 5464505 BLAKE2B c50d6dd67dcc8e8166a016e2b7258e8e4aa4c515b08c31b81b239b7bd26013bf23ba9638329e1becf76473a20a1e6280e49a2c2d5af97d16d2f2422317dc9251 SHA512 1d4f00c41061240e1b14e61178640f1b914bb819edfe174210f4f04cfde2b0b1dd414a30ba19618a8362d387b1c7ec9bfe9a64275b3ec2409b6b1d44aee62412
 DIST simutrans-src-124-1.zip 5965405 BLAKE2B 15e9365df40d9e26f50b63d2e2e2d6f4e03bc5111a28ca3fbe454cfd7339ebbbf3fb99f8f060604f7ca6861fb4220aa9aa0bcd275d98abea6825cbb08956e814 SHA512 f2c95e67ed90a44044264d81dbd1b8db7999a3f192bbfb09f775404924b7583bbf12e1a5841c1e8968ed9bba1bdaff0ca4c913aee83eba5b247c8860a3801c0e
-DIST simutrans.svg 2677 BLAKE2B c60f386b13908cda641f8cb41918f8f0b1c70f9104d14ee368d221bf013970de3aee05b009ad56af07710833218d5e15cd24c51da4dae4e964f1c877a820fce0 SHA512 317b9059a1cc863eed778f60d6c3f4569a3cee192fb6f9210aed2cf65f76f098dd5a17020de11d3beb30b9e7a1a49876c0610e7d31e24e141c6ce31747b3809a
-DIST simutrans_language_pack-Base+texts-123.0.1.zip 1228228 BLAKE2B cf7bd6dd40f1c5a79bec73a8f3bd993fdeb8abe725b1294cef7e0fa7fe374aa18a563cfd81907d7b3a67a5898594730448b4f9038515415a8b44d99ecc5eb8ea SHA512 4d6b66f810fedaf50734d178e329592e174c48ca36611b15403075b02a3a626581993093e6fd6e6f297c973c5f928a054a557cd135fa487c79df3c2f1f6e0ea0
-DIST simutrans_language_pack-Base+texts-124.0.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
+DIST simutrans-src-124-2-1.zip 5463858 BLAKE2B 034dabd8a74a9dc9d57f72d92179a27c97a718a27470938d4054283d45e0d6b3a9bb34e31ec3b2574e90e1f9d1ebf27a2343ee760818ebc8b109f758fc45a131 SHA512 e8cd229a08e52542f0760227889f0db30017f43ddf44789770a6d6fe9e76d6b82288d2174381e4ab22391cacad97201dc10bc83d1e51a8947b82c5a013450d35
 DIST simutrans_language_pack-Base+texts-124.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
-DIST simutrans_simupak64-123-0.zip 5209700 BLAKE2B 432985b056d2a6ea30a63bb3ce278b6dfa7b02dde390cdbedea68e87538b6fa1626ebe8c2490d1b6e569b53ffa6952c1d72a1e41789a81f05ba3b4705f3b4c7e SHA512 0814bf1b41f8b9d458ffe124a237499f0d9e8105269b983d75c16eb87e164bfa0cd49ff153f603ed56f98e4a04edd483f765230e6e1a182c52fa09eb41c92b71
-DIST simutrans_simupak64-124-0.zip 5084196 BLAKE2B a306f71a41fce6c0dc7c2bcd80717ffd4de88e021d145321e98c8bc5cab9c5ce92b5cd1c33e06ae660f7b6810963397733c137636aa64d74e3e22df804e18bf0 SHA512 d757e29a311d3a344f9816d4313cadaecf44f196209969be30732bfd51a954e87c9333aab3e4d2eb6ea2bca70e1beb23fa364e51a651316146378b12e4821a3c
+DIST simutrans_language_pack-Base+texts-124.2.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
 DIST simutrans_simupak64-124-1.zip 5095713 BLAKE2B fdb31043917bd9736cacc6f17a06e0b440a79e077491333491d700bb45b0ec4097d8a13ef34b1a94001cb06c4732250e856b59f7b7faf1537c94860367e16a20 SHA512 fb434104aaf485f78becd99e075fa11d58e59b5e2ee5dfc592b21aec6906f01951bce20181fcb1dacb44ea1d390b4241f1935b4b978474292409c6cf1b6bc849
+DIST simutrans_simupak64-124-2.zip 5092179 BLAKE2B d953368405ff560eafc25eaa5412a72f3ad7b2344ee9e3ada09922d0291768fb710c4ec9a4ebc0823ac84a4226178c81befaf11c958d771bb15f6f7c7c344f6d SHA512 f2edd7ca15966d7c0284637c3f90d335fd34202d8120e92297de4cc451a6c9c543532e3d5ea38181f59e70db4a6d0bae4da0c240556391e3d5872e782e6bb73d
diff --git a/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch b/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
deleted file mode 100644
index 05d40c5cd5e0..000000000000
--- a/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 51b78d7e6021ed7787991d6122da52293fbafa89 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Sun, 7 Aug 2022 18:33:46 +0200
-Subject: [PATCH] silence svn and git errors
-
----
- Makefile     | 2 +-
- configure.ac | 9 ++-------
- 2 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 69f2b8a..c683b8a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -254,7 +254,7 @@ else
-   endif
- endif
- 
--GIT_HASH := $(shell git rev-parse --short=7 HEAD 2>/dev/null 1>/dev/null; echo $$?)
-+GIT_HASH := 
- ifneq ($(GIT_HASH),)
-   GIT_HASH := $(shell git rev-parse --short=7 HEAD)
-   $(info Git hash is 0x$(GIT_HASH))
-diff --git a/configure.ac b/configure.ac
-index e776f6b..41cd584 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,13 +141,8 @@ else
- fi
- 
- 
--# are we in a svn?
--if svn info
--then
--	AC_SUBST(svn, 1)
--else
--	AC_SUBST(svn, 0)
--fi
-+# we are not in an svn
-+AC_SUBST(svn, 0)
- 
- 
- #switch off assembler on 64 bit (MISSING: Check for GNU Assembler and i86)
--- 
-2.35.1
-
diff --git a/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild b/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild
deleted file mode 100644
index 4c3b32b2f157..000000000000
--- a/games-simulation/simutrans/simutrans-123.0.1-r2.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 desktop flag-o-matic optfeature toolchain-funcs xdg
-
-MY_PV=${PV//./-}
-MY_PAK_64="simupak64-123-0.zip"
-# Required for network games, published in release announcement.
-MY_SVN_REVISION="10421"
-
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="https://www.simutrans.com/"
-SRC_URI="
-	https://downloads.sourceforge.net/simutrans/simutrans-src-${MY_PV}.zip
-	!minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} )
-	https://tastytea.de/files/simutrans_language_pack-Base+texts-${PV}.zip
-	https://github.com/aburch/simutrans/raw/9c84822/simutrans.svg
-"
-S=${WORKDIR}
-
-# NOTE: Get the latest language pack from:
-# https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="minimal +midi truetype upnp zstd"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libpng:0=
-	media-libs/libsdl2[sound,video]
-	sys-libs/zlib
-	midi? ( media-sound/fluidsynth:=[sdl] )
-	truetype? ( media-libs/freetype )
-	upnp? ( <net-libs/miniupnpc-2.2.8:= )
-	zstd? ( app-arch/zstd )
-"
-RDEPEND="
-	${DEPEND}
-	midi? ( media-sound/fluid-soundfont )
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-RESTRICT="test" # Opens the program and doesn't close it.
-
-PATCHES=( "${FILESDIR}"/${PN}-123.0.1-silence-svn-and-git-errors.patch )
-
-src_unpack() {
-	unpack "simutrans-src-${MY_PV}.zip"
-	use minimal || unpack "simutrans_${MY_PAK_64}"
-
-	# Bundled text files are incomplete, bug #580948
-	cd "${S}/simutrans/text" || die
-	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	strip-flags # bug #293927
-	append-flags -fno-strict-aliasing # bug #859229
-
-	eautoreconf
-
-	# Make it look for the data in the right directory.
-	sed -i -e "s:argv\[0\]:\"/usr/share/${PN}/\":" simmain.cc || die
-}
-
-src_configure() {
-	default
-
-	cat > config.default <<-EOF || die
-		BACKEND=sdl2
-		OSTYPE=linux
-		OPTIMISE=0
-		STATIC=0
-		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 0)
-		USE_FREETYPE=$(usex truetype 1 0)
-		USE_ZSTD=$(usex zstd 1 0)
-		USE_FLUIDSYNTH_MIDI=$(usex midi 1 0)
-		VERBOSE=1
-		FLAGS := -DREVISION="${MY_SVN_REVISION}"
-
-		HOSTCC = $(tc-getCC)
-		HOSTCXX = $(tc-getCXX)
-	EOF
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto usr/share/${PN}
-	doins -r simutrans/*
-	doicon "${DISTDIR}"/${PN}.svg
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature_header "Since 123.0 this ebuild only installs the Pak64 PakSet. You can install"
-	optfeature "other PakSets" games-simulation/simutrans-paksets
-}
diff --git a/games-simulation/simutrans/simutrans-124.0.ebuild b/games-simulation/simutrans/simutrans-124.0.ebuild
deleted file mode 100644
index 897eb3f3b8d1..000000000000
--- a/games-simulation/simutrans/simutrans-124.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop flag-o-matic toolchain-funcs xdg
-
-MY_PV=${PV//./-}
-MY_PAK_64="simupak64-${MY_PV}.zip"
-# Required for network games, published in release announcement on the forums
-MY_SVN_REVISION="11164"
-
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="https://www.simutrans.com/"
-SRC_URI="
-	https://downloads.sourceforge.net/simutrans/simutrans-src-${MY_PV}.zip
-	!minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} )
-	https://tastytea.de/files/gentoo/simutrans_language_pack-Base+texts-${PV}.zip
-"
-S="${WORKDIR}/simutrans"
-
-# NOTE: get the latest language pack from:
-# https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="minimal +midi fontconfig upnp zstd"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/freetype
-	media-libs/libpng:0=
-	media-libs/libsdl2[sound,video]
-	sys-libs/zlib
-	midi? ( media-sound/fluidsynth:=[sdl] )
-	fontconfig? ( media-libs/fontconfig )
-	upnp? ( net-libs/miniupnpc:= )
-	zstd? ( app-arch/zstd )
-"
-RDEPEND="
-	${DEPEND}
-	midi? ( media-sound/fluid-soundfont )
-	!<games-simulation/simutrans-paksets-${PV}
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-RESTRICT="test" # Opens the program and doesn't close it.
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-124.0-disable-svn-check.patch
-	"${FILESDIR}"/${PN}-124.1-fix-miniupnpc-api.patch
-)
-
-src_unpack() {
-	unpack "simutrans-src-${MY_PV}.zip"
-	mv simutrans-Nightly simutrans || die "renaming directory failed"
-	cd simutrans || die "could not cd to ‘simutrans’"
-	use minimal || unpack "simutrans_${MY_PAK_64}"
-
-	# Bundled text files are incomplete, bug #580948
-	cd simutrans/text || die "could not cd to ‘simutrans/text’"
-	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	strip-flags # bug #293927
-	append-flags -fno-strict-aliasing # bug #859229
-
-	eautoreconf
-}
-
-src_configure() {
-	default
-
-	# NOTE: some flags need to be 0, some need to be empty to turn them off
-	cat > config.default <<-EOF || die
-		BACKEND=sdl2
-		OSTYPE=linux
-		OPTIMISE=0
-		STATIC=0
-		WITH_REVISION=${MY_SVN_REVISION}
-		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 '')
-		USE_FREETYPE=1
-		USE_ZSTD=$(usex zstd 1 '')
-		USE_FONTCONFIG=$(usex fontconfig 1 '')
-		USE_FLUIDSYNTH_MIDI=$(usex midi 1 '')
-		VERBOSE=1
-
-		HOSTCC = $(tc-getCC)
-		HOSTCXX = $(tc-getCXX)
-	EOF
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto usr/share/${PN}
-	doins -r simutrans/*
-	doicon src/simutrans/${PN}.svg
-	newmenu src/simutrans/.desktop simutrans.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Since 124.0 simutrans allows you to download PakSets to your home directory,"
-	elog "therefore games-simulation/simutrans-paksets has been deprecated."
-}
diff --git a/games-simulation/simutrans/simutrans-124.2.1.ebuild b/games-simulation/simutrans/simutrans-124.2.1.ebuild
new file mode 100644
index 000000000000..3775cbd70c54
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-124.2.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic toolchain-funcs xdg
+
+MY_PV=${PV//./-}
+MY_PAK_64="simupak64-124-2.zip" # NOTE: usually this is ${MY_PV}
+# Required for network games, published in release announcement on the forums
+# <https://forum.simutrans.com/index.php/board,3.0.html>
+MY_SVN_REVISION="11366"
+
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="https://www.simutrans.com/"
+SRC_URI="
+	https://downloads.sourceforge.net/simutrans/simutrans-src-${MY_PV}.zip
+	!minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} )
+	https://tastytea.de/files/gentoo/simutrans_language_pack-Base+texts-${PV}.zip
+"
+S="${WORKDIR}/trunk"
+
+# NOTE: get the latest language pack from:
+# https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="minimal +midi fontconfig upnp zstd"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/freetype
+	media-libs/libpng:0=
+	media-libs/libsdl2[sound,video]
+	sys-libs/zlib
+	midi? ( media-sound/fluidsynth:=[sdl] )
+	fontconfig? ( media-libs/fontconfig )
+	upnp? ( net-libs/miniupnpc:= )
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="
+	${DEPEND}
+	midi? ( media-sound/fluid-soundfont )
+	!<games-simulation/simutrans-paksets-${PV}
+"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+RESTRICT="test" # Opens the program and doesn't close it.
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-124.0-disable-svn-check.patch
+)
+
+src_unpack() {
+	unpack "simutrans-src-${MY_PV}.zip"
+	cd trunk/simutrans || die "could not cd to ‘simutrans’"
+	use minimal || unpack "simutrans_${MY_PAK_64}"
+
+	# Bundled text files are incomplete, bug #580948
+	cd text || die "could not cd to ‘simutrans/text’"
+	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	strip-flags # bug #293927
+	append-flags -fno-strict-aliasing # bug #859229
+
+	eautoreconf
+}
+
+src_configure() {
+	default
+
+	# NOTE: some flags need to be 0, some need to be empty to turn them off
+	cat > config.default <<-EOF || die
+		BACKEND=sdl2
+		OSTYPE=linux
+		OPTIMISE=0
+		STATIC=0
+		WITH_REVISION=${MY_SVN_REVISION}
+		MULTI_THREAD=1
+		USE_UPNP=$(usex upnp 1 '')
+		USE_FREETYPE=1
+		USE_ZSTD=$(usex zstd 1 '')
+		USE_FONTCONFIG=$(usex fontconfig 1 '')
+		USE_FLUIDSYNTH_MIDI=$(usex midi 1 '')
+		VERBOSE=1
+
+		HOSTCC = $(tc-getCC)
+		HOSTCXX = $(tc-getCXX)
+	EOF
+}
+
+src_install() {
+	newbin build/default/sim ${PN}
+	insinto usr/share/${PN}
+	doins -r simutrans/*
+	doicon src/simutrans/${PN}.svg
+	domenu src/linux/simutrans.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Since 124.0 simutrans allows you to download PakSets to your home directory,"
+	elog "therefore games-simulation/simutrans-paksets has been deprecated."
+}
diff --git a/games-strategy/crimson/Manifest b/games-strategy/crimson/Manifest
deleted file mode 100644
index 73cc6f115cab..000000000000
--- a/games-strategy/crimson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crimson-0.5.3.tar.bz2 882366 BLAKE2B 6faece818105d29dd2d141b925b332cfd5214dd918f5c07cacd2f6cdfcd6a58c86e6ab1cc2fce396fbf24839f5dded619e92a786f03663e78068926a8d0e6be3 SHA512 9632317c4b258ed5e501ad1d058706ed654fc621b07099f65d93e29fe92e53fc8f6bbffa13c70fc2129f30695d3f10e85174234dc96cc171631b3465d2b7cffc
diff --git a/games-strategy/crimson/crimson-0.5.3-r1.ebuild b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
deleted file mode 100644
index df7ee6fe56db..000000000000
--- a/games-strategy/crimson/crimson-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Tactical war game in the tradition of Battle Isle"
-HOMEPAGE="https://crimson.seul.org/"
-SRC_URI="https://crimson.seul.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/sdl-net
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	test? (
-		app-text/docbook-xml-dtd:4.2
-		dev-libs/libxml2
-	)
-"
-
-src_configure() {
-	econf \
-		--enable-sound \
-		--enable-network \
-		$(use_with zlib) \
-		--enable-cfed \
-		--enable-bi2cf \
-		--enable-comet \
-		--enable-cf2bmp
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		pixmapsdir="/usr/share/pixmaps" \
-		install
-	einstalldocs
-	rm -rf "${ED}/usr/share/applications"
-	make_desktop_entry crimson "Crimson Fields"
-}
diff --git a/games-strategy/crimson/metadata.xml b/games-strategy/crimson/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-strategy/crimson/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>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index 12435e199010..848165bb22cf 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1 +1,2 @@
 DIST dopewars-1.6.1.tar.gz 1024168 BLAKE2B 28d650e0d1eccdfa9aa799bb4b35e82facc800ed9cbde9778c7182bd615ad0b1ec7d3fd323473f381f3ed1902b8e305a7994a5e351728aa1028be2e0665bfa57 SHA512 fab27b483b5a24abd95ffe6a52fe92c7179d8ee3e7d27393f0e7c265202781ab6a58e3b3214ff84bbc0e8195644b5c2ec94616b5f63b3fa9dc2ad2f9216e37d1
+DIST dopewars-1.6.2.tar.gz 1030811 BLAKE2B 96d333b7760786b215c3b6079498067149de0784099fd16b30c47a785a0f6d4d1d9030e6654a1d309f59803896d2675181146180411aef558e3cf28b715ac192 SHA512 ce41bc4b7f3a45bc759a76e3f70be84cc6ec1243127a60e8c4c96c908bf70d2d6fbb7d871afbeeec18591dac2cfb5d6d2646e14c7e2771ec02cf7b20e5a25a8f
diff --git a/games-strategy/dopewars/dopewars-1.6.2.ebuild b/games-strategy/dopewars/dopewars-1.6.2.ebuild
new file mode 100644
index 000000000000..cd4655886e70
--- /dev/null
+++ b/games-strategy/dopewars/dopewars-1.6.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs
+
+DESCRIPTION="Re-Write of the game Drug Wars"
+HOMEPAGE="https://dopewars.sourceforge.io/"
+SRC_URI="https://github.com/benmwebb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls ncurses gtk gnome sdl"
+
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	dev-libs/glib:2
+	nls? ( virtual/libintl )
+	sdl? (
+		media-libs/libsdl2
+		media-libs/sdl2-mixer
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README.md TODO doc/example-cfg doc/example-igneous )
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e 's:index.html:html/index.html:' \
+		src/dopewars.c || die
+	sed -i -e "s/\-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" \
+		configure || die
+}
+
+src_configure() {
+	local myservconf
+
+	if ! use gtk ; then
+		myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest"
+	fi
+
+	local myeconfargs=(
+		$(use_enable ncurses curses-client)
+		$(use_enable nls)
+		$(use_with sdl)
+		--without-esd
+		--enable-networking
+		--enable-plugins
+		${myservconf}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -r "${ED}"/usr/share/gnome || die
+	rm -r "${ED}"/usr/share/doc || die
+	make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
+	HTML_DOCS="doc/*html doc/help/"
+	einstalldocs
+}
diff --git a/games-strategy/dopewars/metadata.xml b/games-strategy/dopewars/metadata.xml
index aca5e3fff917..b8a14ab9ab42 100644
--- a/games-strategy/dopewars/metadata.xml
+++ b/games-strategy/dopewars/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dopewars</remote-id>
+		<remote-id type="github">benmwebb/dopewars</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
index dc163477cf80..5e889aa19ca4 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1 +1,2 @@
 DIST endless-sky-0.10.6.tar.gz 256438340 BLAKE2B 39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff SHA512 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530
+DIST endless-sky-0.10.8.tar.gz 257381131 BLAKE2B ea6fe5e4240b9744a9e1d64137a731c8a67f88acbd688fad13f3beab2bb6d16e46b3c85fd1288350917eff18264b5a477ed964729edaa098eff07fef10ca81ee SHA512 d6cfb3efba6214a42b112d315dda945085f6a9f915a22bd3fe0ff78cb628a242aa8c0613165a2e1c67d81f5c32f937c2b73a7851efe3984ebe94af4e456df547
diff --git a/games-strategy/endless-sky/endless-sky-0.10.8.ebuild b/games-strategy/endless-sky/endless-sky-0.10.8.ebuild
new file mode 100644
index 000000000000..d1f1437b24c2
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.10.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake prefix xdg
+
+DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
+HOMEPAGE="https://endless-sky.github.io/"
+SRC_URI="
+	https://github.com/endless-sky/endless-sky/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="
+	GPL-3+
+	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 public-domain
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gles2-only test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo:=
+	media-libs/libmad
+	media-libs/libpng:=
+	media-libs/libsdl2[video]
+	media-libs/openal
+	sys-apps/util-linux
+	gles2-only? ( media-libs/libsdl2[gles2] )
+	!gles2-only? (
+		media-libs/glew:0=
+		media-libs/libsdl2[opengl]
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# no /usr/*games/ on Gentoo, adjust docdir, install even if != Release,
+	# and GLEW is unused if USE=gles2-only (using sed for less rebasing)
+	sed -e '/install(/s: games: bin:' \
+		-e '/install(/s: share/games: share:' \
+		-e "/install(/s: share/doc/endless-sky: share/doc/${PF}:" \
+		-e '/install(/s: CONFIGURATIONS Release::' \
+		-e 's:GLEW REQUIRED:GLEW:' \
+		-i CMakeLists.txt || die
+	sed -i '/PATH/s:share/games:share:' source/Files.cpp || die
+
+	hprefixify -w /PATH/ source/Files.cpp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DES_GLES=$(usex gles2-only)
+		-DES_USE_SYSTEM_LIBRARIES=yes
+		-DES_USE_VCPKG=no
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	gzip -d -- "${ED}"/usr/share/man/man6/${PN}.6.gz || die
+	rm -- "${ED}"/usr/share/doc/${PF}/{copyright,license.txt} || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Endless Sky provides high-res sprites for high-dpi screens."
+		elog "If you want to use them, download:"
+		elog
+		elog "   https://github.com/endless-sky/endless-sky-high-dpi/releases"
+		elog
+		elog "and extract it to ~/.local/share/endless-sky/plugins/"
+	fi
+}
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 9a0035fd6a40..f6921ed2dbf9 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1,2 @@
 DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f SHA512 514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86
+DIST freeciv-3.1.2.tar.gz 127861796 BLAKE2B ab9c1b8ce2f54725505a21570bbadc906cde34db5e6796fd469556a6ee3bf9e0e05387a2da323f4fd18596e5c5fcb9c4448293f3fd989dfcc9251fe7626300a1 SHA512 6be7e3e3bf78d3606476a51a6c0115d3ef0fe0fa1f446496152873d624c9b7c074d7fb63fe23318a9b4ae2c2ce9acb52d19c0f08c060a64c65b1034df9521340
diff --git a/games-strategy/freeciv/freeciv-3.1.2.ebuild b/games-strategy/freeciv/freeciv-3.1.2.ebuild
new file mode 100644
index 000000000000..eca61092a9e5
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-3.1.2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit desktop lua-single meson xdg
+
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeciv/freeciv/"
+else
+	MY_PV="R${PV//./_}"
+	SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	if [[ ${PV} != *_beta* ]]; then
+		KEYWORDS="~amd64 ~ppc64 ~x86"
+	fi
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline rule-editor sdl +server +sound +system-lua web-server"
+
+# I'm pretty sure that you can't build both qt flavours at the same time
+REQUIRED_USE="
+	system-lua? ( ${LUA_REQUIRED_USE} )
+	!dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
+	dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound )
+	qt5?  ( !qt6 )
+	qt6?  ( !qt5 )
+"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-build/libtool
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libpng
+		gtk3? ( x11-libs/gtk+:3 )
+		gtk4? ( gui-libs/gtk:4 )
+		mapimg? ( media-gfx/imagemagick:= )
+		nls? ( virtual/libintl )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,widgets]
+		)
+		sdl? (
+			media-libs/libsdl2[video]
+			media-libs/sdl2-gfx
+			media-libs/sdl2-image[png]
+			media-libs/sdl2-ttf
+		)
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[vorbis]
+		)
+	)
+	json? ( dev-libs/jansson:= )
+	readline? ( sys-libs/readline:= )
+	system-lua? (
+		${LUA_DEPS}
+	)
+"
+DEPEND="${RDEPEND}
+	!dedicated? ( x11-base/xorg-proto )
+"
+# Calls gzip during build
+BDEPEND="
+	app-arch/gzip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's meson.build is not very friendly to our needs
+	sed -i -e "s:doc/freeciv:doc/${PF}:" meson.build || die
+	sed -i -e "/custom_target('gzip_ChangeLog/,+6d" meson.build || die
+	default
+}
+
+src_configure() {
+	# Docs here: https://github.com/freeciv/freeciv/blob/main/doc/INSTALL.meson
+	local myclient=() emesonargs=() myfcmp=()
+
+	# Upstream considers meson "experimental" until 3.2.0 according to their roadmap
+	emesonargs+=( -Dack_experimental=true )
+
+	if use dedicated || use server ; then
+		emesonargs+=( -Dserver=enabled )
+	elif use web-server; then
+		emesonargs+=( -Dserver=freeciv-web )
+	else
+		emesonargs+=( -Dserver=disabled )
+	fi
+
+	# Select any client backends that we want enabled; dedicated server shouldn't build a UI
+	# for sanity we'll build the modpack bin with the same UIs as the client.
+	# 'fcmp' = freeciv modpack (client) - gtk3, qt, cli, gtk4
+	freeciv_enable_ui() {
+				local flag=$1
+				local client_name=${2:-${flag}}
+				local fcmp_name=${3:-${client_name}}
+
+				if use ${flag} ; then
+					myclient+=( ${client_name} )
+					use modpack && myfcmp+=( ${fcmp_name} )
+				fi
+			}
+
+	if ! use dedicated ; then
+		# there's no SDL modpack backend; rather than incidentally pull in GTK3 (as is default)
+		# let's explicitly set the backend to CLI
+		freeciv_enable_ui sdl sdl2 cli
+		freeciv_enable_ui gtk3 gtk3.22 gtk3
+		freeciv_enable_ui gtk4
+		freeciv_enable_ui qt5 qt
+		freeciv_enable_ui qt6 qt
+		use qt5 && emesonargs+=( -Dqtver=qt5 )
+		use qt6 && emesonargs+=( -Dqtver=qt6 )
+	else
+		if use modpack ; then
+			myfcmp+=( cli )
+		fi
+	fi
+
+	# the client and fpmc arrays are now populated (or not for dedicated); let's add them to emesonargs
+	emesonargs+=(
+		-Dclients=$(echo ${myclient[*]} | sed 's/ /,/g')
+		-Dfcmp=$(echo ${myfcmp[*]} | sed 's/ /,/g')
+	)
+
+	# If we're building a live ebuild, we want to include the git revision in the version string
+	if [[ ${PV} == 9999 ]] ; then
+		emesonargs+=( -Dgitrev=true )
+	fi
+
+	# Anything that can be trivially set by meson_use goes here
+	emesonargs+=(
+		$(meson_use json json-protocol)
+		$(meson_use mapimg mwand)
+		$(meson_use nls)
+		$(meson_use readline)
+		$(meson_use rule-editor ruledit)
+		$(meson_use sound audio)
+		$(meson_use system-lua syslua)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+
+	meson_src_install
+	# Create and install the html manual and then cleanup the tool because it's useless.
+	# TODO: for proper localisation this should be run during postinst but
+	# that would require a lot of work to avoid orphan files.
+	# freeciv-manual only supports one ruleset argument at a time.
+	elog "Generating html manual..."
+	for RULESET in alien civ1 civ2 civ2civ3 classic experimental multiplayer sandbox
+	do
+		$(find "${WORKDIR}" -type d -maxdepth 1 -mindepth 1 -iname '*-build')/freeciv-manual -r ${RULESET} || die
+		docinto html/rulesets/${RULESET}
+		dodoc ${RULESET}*.html
+	done
+
+	find "${ED}" -name "freeciv-manual*" -delete || die "Failed to remove freeciv-manual"
+
+	if use dedicated ; then
+		elog "Tidying up dedicated server installation..."
+		find "${ED}"/usr/share/man/man6/ \
+			-not \( -name 'freeciv.6' -o -name 'freeciv-ruledit.6' \
+			-o -name 'freeciv-ruleup.6' -o -name 'freeciv-server.6' \) -mindepth 1 -delete || die
+	else
+		# sdl client needs some special handling
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm "${ED}"/usr/share/man/man6/freeciv-sdl2.6 || die
+		fi
+	fi
+
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "There are a number of supported authentication backends."
+		einfo "sqlite3 is the default, however dedicated servers may wish to"
+		einfo "use another supported backend; please consult the documentation"
+		einfo "to configure freeciv for a particular backend:"
+		einfo "https://github.com/freeciv/freeciv/blob/main/doc/README.fcdb"
+	fi
+}
diff --git a/games-strategy/freeciv/freeciv-9999.ebuild b/games-strategy/freeciv/freeciv-9999.ebuild
index 0b5e2c809016..eca61092a9e5 100644
--- a/games-strategy/freeciv/freeciv-9999.ebuild
+++ b/games-strategy/freeciv/freeciv-9999.ebuild
@@ -90,10 +90,6 @@ pkg_setup() {
 	use system-lua && lua-single_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0_beta4-fix-manpage-install-location.patch
-)
-
 src_prepare() {
 	# Upstream's meson.build is not very friendly to our needs
 	sed -i -e "s:doc/freeciv:doc/${PF}:" meson.build || die
diff --git a/games-strategy/freecol/freecol-1.0.0-r1.ebuild b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..fc11a278a327
--- /dev/null
+++ b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 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 desktop java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="https://www.freecol.org/"
+SRC_URI="https://downloads.sourceforge.net/project/freecol/freecol/freecol-${PV}/freecol-${PV}-src.zip"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:0
+	dev-java/cortado:0
+	dev-java/findbugs-annotations:0
+	dev-java/miglayout:5
+"
+
+DEPEND=">=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+# error: variables in try-with-resources are not supported in -source 8
+RDEPEND=">=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=(
+	CHANGELOG.md
+	COPYING
+	README
+	README.md
+	SECURITY.md
+)
+
+JAVA_JAR_FILENAME="FreeCol.jar"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RUN_ONLY="net.sf.freecol.AllTests"
+JAVA_TEST_SRC_DIR="test/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	cp build/splash.jpg "${JAVA_RESOURCE_DIRS}" || die
+	grep Main-Class src/MANIFEST.MF \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	local datadir=/usr/share/${PN}
+
+	# launcher of java-pkg-simple.eclass seems not to support --pwd
+	java-pkg_dolauncher ${PN} \
+		--pwd ${datadir} \
+		--main net.sf.freecol.FreeCol \
+		--java_args -Xmx2000M
+
+	insinto ${datadir}
+	doins -r data schema
+
+	doicon data/${PN}.png
+	make_desktop_entry ${PN} FreeCol
+}
diff --git a/games-strategy/freecol/freecol-1.0.0.ebuild b/games-strategy/freecol/freecol-1.0.0.ebuild
deleted file mode 100644
index dee9cfdc77bc..000000000000
--- a/games-strategy/freecol/freecol-1.0.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
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="https://www.freecol.org/"
-SRC_URI="https://downloads.sourceforge.net/project/freecol/freecol/freecol-${PV}/freecol-${PV}-src.zip"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/cortado:0
-	dev-java/findbugs-annotations:0
-	dev-java/miglayout:5
-"
-
-DEPEND=">=virtual/jdk-11:*
-	${CP_DEPEND}"
-
-# error: variables in try-with-resources are not supported in -source 8
-RDEPEND=">=virtual/jre-11:*
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=(
-	CHANGELOG.md
-	COPYING
-	README
-	README.md
-	SECURITY.md
-)
-
-JAVA_JAR_FILENAME="FreeCol.jar"
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="src"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RUN_ONLY="net.sf.freecol.AllTests"
-JAVA_TEST_SRC_DIR="test/src"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-pkg_clean
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	cp build/splash.jpg "${JAVA_RESOURCE_DIRS}" || die
-	grep Main-Class src/MANIFEST.MF \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	local datadir=/usr/share/${PN}
-
-	# launcher of java-pkg-simple.eclass seems not to support --pwd
-	java-pkg_dolauncher ${PN} \
-		--pwd ${datadir} \
-		--main net.sf.freecol.FreeCol \
-		--java_args -Xmx2000M
-
-	insinto ${datadir}
-	doins -r data schema
-
-	doicon data/${PN}.png
-	make_desktop_entry ${PN} FreeCol
-}
diff --git a/games-util/antimicrox/antimicrox-3.4.1.ebuild b/games-util/antimicrox/antimicrox-3.4.1.ebuild
index f31267e1fe6f..be69ef5c0939 100644
--- a/games-util/antimicrox/antimicrox-3.4.1.ebuild
+++ b/games-util/antimicrox/antimicrox-3.4.1.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/AntiMicroX/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/games-util/game-device-udev-rules/Manifest b/games-util/game-device-udev-rules/Manifest
index 885d347adfb6..c9b2a0a59394 100644
--- a/games-util/game-device-udev-rules/Manifest
+++ b/games-util/game-device-udev-rules/Manifest
@@ -1,2 +1 @@
-DIST steam-devices-13443480a64fe8f10676606bd57da6de89f8ccb1.tar.gz 2355 BLAKE2B 646094d6c586e3f43cdc39b6c7c9c06af559b867eda80ad913159b5d216990fd508dab71d2ba5c17286472af7e027b01b316854bf9e3cdc7876ba680ab290a21 SHA512 d10b4a2c8c36a3f080a2a90869281b6cf2cfc1614598b30ec5e12b579271c6c8e47fd9ed86dae1095ddeee33401fb8b92b54a9b60bb9a95e44734f3686f57c83
-DIST steam-devices-d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa.tar.gz 2305 BLAKE2B 677cec02dfa1899b9bad9440a5810175b731234db271413c2027a5a1a81dbdaa8c5ccd922478c07304262d5c3bf16891875dcdab08341720b97953035d5ae93d SHA512 54a0a9f293ca03c01c5f3609c08e9e8cc1273a034b1164399623c55ec994414ecacff04d049bc4195da5f0601bb17de52c9e1770a0161caac9bb4b74d921b35b
+DIST steam-devices-e2971e45063f6b327ccedbf18e168bda6749155c.tar.gz 2401 BLAKE2B 0660eec36dbff1d140a991debd2a88c7e2d95abafbf070e8bfb68dbff2fbf005fe2dc59a9a18bb0da3057b2b36db91a4f588d40c6639f5a7a841378354900077 SHA512 6b83e466902eb0baae866da3639724f04f2e1e4d054c97f79f8c750c0836e5c3b8a7e8f6840ec67a22b4bb40f21958de6cb72df2235af8df34f02645d0765c0f
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
deleted file mode 100644
index 8c590397a84e..000000000000
--- a/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-# Although this is mainly a tweaked version of Steam's udev rules, it
-# also has its own rules and more may be added later so we version it
-# independently.
-
-STEAM_COMMIT="d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa"
-MY_P="steam-devices-${STEAM_COMMIT}"
-
-DESCRIPTION="udev rules for various game hardware devices"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games"
-SRC_URI="https://github.com/ValveSoftware/steam-devices/archive/${STEAM_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+acl elogind systemd"
-REQUIRED_USE="acl? ( || ( elogind systemd ) )"
-
-RDEPEND="
-	acl? (
-		elogind? ( sys-auth/elogind[acl] )
-		systemd? ( sys-apps/systemd[acl] )
-	)
-	!acl? (
-		acct-group/input
-	)
-	virtual/udev
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use acl; then
-		elog "Users of game hardware devices must be added to the input group."
-
-		if use elogind || use systemd; then
-			ewarn "It is highly recommended that you enable USE=acl on this package instead"
-			ewarn "when using elogind or systemd as this is more secure and just works."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	local SRC DEST EXTRA
-	for SRC in 60-steam-{input,vr}.rules; do
-		DEST=${SRC//steam/game}
-		EXTRA=${FILESDIR}/${DEST/./-"${PV}".}
-
-		# Make changes in a copy.
-		cp -v "${SRC}" "${DEST}" || die
-
-		# Append our additional rules.
-		if [[ -f ${EXTRA} ]]; then
-			cat "${EXTRA}" >> "${DEST}" || die
-		fi
-
-		# Clear any existing mode settings.
-		sed -i 's/, *MODE="[0-9]*"//' "${DEST}" || die
-
-		if ! use acl; then
-			# Replace uaccess tag with our group+mode if not using ACL.
-			sed -i 's/, *TAG+="uaccess"/, GROUP="input", MODE="0660"/' "${DEST}" || die
-		fi
-	done
-}
-
-src_install() {
-	udev_dorules 60-game-{input,vr}.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20230603.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20230603.ebuild
deleted file mode 100644
index 1ebbb07982f0..000000000000
--- a/games-util/game-device-udev-rules/game-device-udev-rules-20230603.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info udev
-
-# Although this is mainly a tweaked version of Steam's udev rules, it
-# also has its own rules and more may be added later so we version it
-# independently.
-
-STEAM_COMMIT="13443480a64fe8f10676606bd57da6de89f8ccb1"
-MY_P="steam-devices-${STEAM_COMMIT}"
-
-DESCRIPTION="udev rules for various game hardware devices"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games
-	https://github.com/ValveSoftware/steam-devices/"
-SRC_URI="https://github.com/ValveSoftware/steam-devices/archive/${STEAM_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+acl elogind systemd"
-REQUIRED_USE="acl? ( || ( elogind systemd ) )"
-
-RDEPEND="
-	acl? (
-		elogind? ( sys-auth/elogind[acl] )
-		systemd? ( sys-apps/systemd[acl] )
-	)
-	!acl? (
-		acct-group/input
-	)
-	virtual/udev
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="~HIDRAW"
-	linux-info_pkg_setup
-
-	if ! use acl; then
-		elog "Users of game hardware devices must be added to the input group."
-
-		if use elogind || use systemd; then
-			ewarn "It is highly recommended that you enable USE=acl on this package instead"
-			ewarn "when using elogind or systemd as this is more secure and just works."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	local SRC DEST EXTRA
-	for SRC in 60-steam-{input,vr}.rules; do
-		DEST=${SRC//steam/game}
-		EXTRA=${FILESDIR}/${DEST/./-"${PV}".}
-
-		# Make changes in a copy.
-		cp -v "${SRC}" "${DEST}" || die
-
-		# Append our additional rules.
-		if [[ -f ${EXTRA} ]]; then
-			cat "${EXTRA}" >> "${DEST}" || die
-		fi
-
-		# Clear any existing mode settings.
-		sed -i 's/, *MODE="[0-9]*"//' "${DEST}" || die
-
-		if ! use acl; then
-			# Replace uaccess tag with our group+mode if not using ACL.
-			sed -i 's/, *TAG+="uaccess"/, GROUP="input", MODE="0660"/' "${DEST}" || die
-		fi
-	done
-}
-
-src_install() {
-	udev_dorules 60-game-{input,vr}.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20240523.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20240523.ebuild
new file mode 100644
index 000000000000..54ac4c14b4bd
--- /dev/null
+++ b/games-util/game-device-udev-rules/game-device-udev-rules-20240523.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info udev
+
+# Although this is mainly a tweaked version of Steam's udev rules, it
+# also has its own rules and more may be added later so we version it
+# independently.
+
+STEAM_COMMIT="e2971e45063f6b327ccedbf18e168bda6749155c"
+MY_P="steam-devices-${STEAM_COMMIT}"
+
+DESCRIPTION="udev rules for various game hardware devices"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games
+	https://github.com/ValveSoftware/steam-devices/"
+SRC_URI="https://github.com/ValveSoftware/steam-devices/archive/${STEAM_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+acl elogind systemd"
+REQUIRED_USE="acl? ( || ( elogind systemd ) )"
+
+RDEPEND="
+	acl? (
+		elogind? ( sys-auth/elogind[acl] )
+		systemd? ( sys-apps/systemd[acl] )
+	)
+	!acl? (
+		acct-group/input
+	)
+	virtual/udev
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~HIDRAW"
+	linux-info_pkg_setup
+
+	if ! use acl; then
+		elog "Users of game hardware devices must be added to the input group."
+
+		if use elogind || use systemd; then
+			ewarn "It is highly recommended that you enable USE=acl on this package instead"
+			ewarn "when using elogind or systemd as this is more secure and just works."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	local SRC DEST EXTRA
+	for SRC in 60-steam-{input,vr}.rules; do
+		DEST=${SRC//steam/game}
+		EXTRA=${FILESDIR}/${DEST/./-20220311.}
+
+		# Make changes in a copy.
+		cp -v "${SRC}" "${DEST}" || die
+
+		# Append our additional rules.
+		if [[ -f ${EXTRA} ]]; then
+			cat "${EXTRA}" >> "${DEST}" || die
+		fi
+
+		# Clear any existing mode settings.
+		sed -i 's/, *MODE="[0-9]*"//' "${DEST}" || die
+
+		if ! use acl; then
+			# Replace uaccess tag with our group+mode if not using ACL.
+			sed -i 's/, *TAG+="uaccess"/, GROUP="input", MODE="0660"/' "${DEST}" || die
+		fi
+	done
+}
+
+src_install() {
+	udev_dorules 60-game-{input,vr}.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/games-util/gamemode/Manifest b/games-util/gamemode/Manifest
index a0bb96e61c70..9e677943b4ab 100644
--- a/games-util/gamemode/Manifest
+++ b/games-util/gamemode/Manifest
@@ -1,2 +1,2 @@
-DIST gamemode-1.7.tar.xz 73264 BLAKE2B 81957a1989cf49532b0d80fc9b96a75d8205e7f148125309f3cae601f6fe125e8d839d4b92bea418a229a6e2658eaa55db2b3bbdb5e7efb26d278e2b22ab8269 SHA512 1fc91367af37d18e0042831b377cafec122c603ab699ecc314b0ded11410aab1bd739712e7305e497796fda25bee88d34438d5f3751595bf579dcbeb7335d15b
 DIST gamemode-1.8.1.tar.xz 78284 BLAKE2B de78c97b61cebd1f4cc29f0ab5c353e8db668eca3d6d8c65fa0cdbc167b1b172d3371e85bcb4cb193c043f0917127bc3a76ebd7de158555af6d145b1e8eb93d7 SHA512 7bfe7d34b422a87c2f53e69b44649a1aca7eba9fb08daa52e7e2f521fea0744e8f03b666c4dd684ad85ccadde20bc2edfb716d67a103629baa690051b8836554
+DIST gamemode-1.8.2.tar.xz 78724 BLAKE2B e7c0ed0b76231721f851048f77c7148b08cce098ea15232c3e91916a4b3cbe3925186b14e0110ab5773f5db3f4e017fe6930d62169892b048e1d15ae60b0e05a SHA512 eb33f3b7a2d6811aeb13370b0c5ba60fc7630d2f2e59beea059f7d301c57f23b492541c9a128f0e357820ffe5370731d78031df4e392682acba4b232b7778450
diff --git a/games-util/gamemode/files/gamemode-1.7-glibc-2.36.patch b/games-util/gamemode/files/gamemode-1.7-glibc-2.36.patch
deleted file mode 100644
index bb305afd5a35..000000000000
--- a/games-util/gamemode/files/gamemode-1.7-glibc-2.36.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f
-https://bugs.gentoo.org/863995
-
-From: =?UTF-8?q?Nyikos=20Zolt=C3=A1n?= <nyikoszoltan0@gmail.com>
-Date: Wed, 10 Aug 2022 19:56:59 +0200
-Subject: [PATCH] Fix building when pidfd_open is available
-
-On glibc2.36 pidfd_open was made available, but it needs an include
---- a/common/common-pidfds.c
-+++ b/common/common-pidfds.c
-@@ -58,6 +58,8 @@ static int pidfd_open(pid_t pid, unsigned int flags)
- {
- 	return (int)syscall(__NR_pidfd_open, pid, flags);
- }
-+#else
-+#include <sys/pidfd.h>
- #endif
- 
- /* pidfd functions */
-
diff --git a/games-util/gamemode/files/gamemode-1.7-static-libs.patch b/games-util/gamemode/files/gamemode-1.7-static-libs.patch
deleted file mode 100644
index 89fd0ba3d70a..000000000000
--- a/games-util/gamemode/files/gamemode-1.7-static-libs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d339709cc42fe0b78b881d760003845010f5a7c1 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 6 Aug 2022 14:42:27 +0100
-Subject: [PATCH] Don't force installation of static libgamemodeauto
-
-Defining the library with `library` rather than `both_libraries` allows the user
-to choose which type they want to install using `-Ddefault_library`.
-
-Closes: https://github.com/FeralInteractive/gamemode/issues/287
----
- lib/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/meson.build b/lib/meson.build
-index e810509..7cdcf8a 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -25,7 +25,7 @@ gamemode_headers_includes = [
- ]
- 
- # Small library to automatically use gamemode
--libgamemodeauto = both_libraries(
-+libgamemodeauto = library(
-     'gamemodeauto',
-     sources: [
-         'client_loader.c',
--- 
-2.35.1
-
diff --git a/games-util/gamemode/gamemode-1.7.ebuild b/games-util/gamemode/gamemode-1.7.ebuild
deleted file mode 100644
index c54619d5b953..000000000000
--- a/games-util/gamemode/gamemode-1.7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit meson-multilib systemd
-
-DESCRIPTION="Optimise Linux system performance on demand"
-HOMEPAGE="https://github.com/FeralInteractive/gamemode"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/FeralInteractive/gamemode.git"
-	GAMEMODE_GIT_PTR="master"
-	inherit git-r3
-else
-	GAMEMODE_GIT_PTR="${PV}"
-	SRC_URI="https://github.com/FeralInteractive/gamemode/releases/download/${GAMEMODE_GIT_PTR}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="systemd elogind"
-
-REQUIRED_USE="^^ ( systemd elogind )"
-
-RDEPEND="
-	acct-group/gamemode
-	>=dev-libs/inih-53
-	sys-apps/dbus[${MULTILIB_USEDEP},systemd(+)=,elogind(-)=]
-	sys-auth/polkit
-	sys-libs/libcap
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7-static-libs.patch
-	"${FILESDIR}"/${P}-glibc-2.36.patch
-)
-
-DOCS=(
-	CHANGELOG.md
-	LICENSE.txt
-	README.md
-	example/gamemode.ini
-)
-
-pkg_pretend() {
-	elog
-	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Example of a kernel providing that is sys-kernel/pf-sources."
-	elog
-	elog "Support for soft realtime is completely optional. It may provide the"
-	elog "following benefits with systems having at least four CPU cores:"
-	elog
-	elog "  * more CPU shares allocated exclusively to the game"
-	elog "  * reduced input lag and reduced thread latency"
-	elog "  * more consistent frame times resulting in less microstutters"
-	elog
-	elog "You probably won't benefit from soft realtime mode and thus don't need"
-	elog "SCHED_ISO if:"
-	elog
-	elog "  * Your CPU has less than four cores because the game may experience"
-	elog "    priority inversion with the graphics driver (thus heuristics"
-	elog "    automatically disable SCHED_ISO usage then)"
-	elog "  * Your game uses busy-loops to interface with the graphics driver"
-	elog "    but you may still force SCHED_ISO per configuation file, YMMV,"
-	elog "    it depends on the graphics driver implementation, i.e. usage of"
-	elog "    __GL_THREADED_OPTIMIZATIONS or similar."
-	elog "  * If your game causes more than 70% CPU usage across all cores,"
-	elog "    SCHED_ISO automatically turns off and on depending on usage and"
-	elog "    is processed with higher-than-normal priority then (renice)."
-	elog "    This auto-switching may result in a lesser game experience."
-	elog
-	elog "For more info look at:"
-	elog "https://github.com/FeralInteractive/gamemode/blob/${GAMEMODE_GIT_PTR}/README.md"
-	elog
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dwith-systemd-user-unit-dir="$(systemd_get_userunitdir)"
-	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			-Dwith-sd-bus-provider=$(usex systemd systemd elogind)
-			-Dwith-util=true
-		)
-	else
-		emesonargs+=(
-			-Dwith-sd-bus-provider=no-daemon
-			-Dwith-pam-group=gamemode
-			-Dwith-examples=false
-			-Dwith-util=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	elog
-	elog "GameMode has optional support for adjusting nice and ioprio of games"
-	elog "running with it. You may need to adjust your PAM limits to make use"
-	elog "of this. You need to be in the gamemode group for this to work."
-	elog
-	elog "Run the following command as root to add your user:"
-	elog "# gpasswd -a USER gamemode  # with USER = your user name"
-	elog
-	elog "You can run the following command to test your settings:"
-	elog
-	elog "# gamemoded -t"
-	elog
-	elog "GameMode supports GPU optimizations. It defaults to OFF. Any"
-	elog "damage resulting from usage of this is your own responsibility."
-	elog
-	elog "systemd user sessions will automatically run the daemon on demand,"
-	elog "it does not need to be enabled explicitly. Games not supporting"
-	elog "GameMode natively can still make use of it, just add"
-	elog
-	elog "gamemoderun %command%"
-	elog
-	elog "to the start options of any steam game to enable optimizations"
-	elog "automatically as you start the game."
-	elog
-}
diff --git a/games-util/gamemode/gamemode-1.8.2.ebuild b/games-util/gamemode/gamemode-1.8.2.ebuild
new file mode 100644
index 000000000000..fec4b5dee97b
--- /dev/null
+++ b/games-util/gamemode/gamemode-1.8.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit meson-multilib systemd
+
+DESCRIPTION="Optimise Linux system performance on demand"
+HOMEPAGE="https://github.com/FeralInteractive/gamemode"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/FeralInteractive/gamemode.git"
+	GAMEMODE_GIT_PTR="master"
+	inherit git-r3
+else
+	GAMEMODE_GIT_PTR="${PV}"
+	SRC_URI="https://github.com/FeralInteractive/gamemode/releases/download/${GAMEMODE_GIT_PTR}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="systemd elogind"
+
+REQUIRED_USE="^^ ( systemd elogind )"
+
+RDEPEND="
+	acct-group/gamemode
+	>=dev-libs/inih-54
+	sys-apps/dbus[${MULTILIB_USEDEP},systemd(+)=,elogind(-)=]
+	sys-auth/polkit
+	sys-libs/libcap
+"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	CHANGELOG.md
+	LICENSE.txt
+	README.md
+	example/gamemode.ini
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dwith-examples=false
+		-Dwith-pam-limits-dir="${EPREFIX}"/etc/security/limits.d
+		-Dwith-pam-renicing=true
+		-Dwith-privileged-group=gamemode
+		-Dwith-systemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			-Dwith-sd-bus-provider=$(usex systemd systemd elogind)
+			-Dwith-util=true
+		)
+	else
+		emesonargs+=(
+			-Dwith-sd-bus-provider=no-daemon
+			-Dwith-util=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog
+	elog "GameMode requires permissions to adjust your PAM limits and change system"
+	elog "performance settings (overclocking, scheduling, L3 cache usage, mitigations"
+	elog "etc). This permission is granted via the gamemode group."
+	elog
+	elog "Run the following command as root to add your user:"
+	elog "# gpasswd -a USER gamemode  # with USER = your user name"
+	elog
+	elog "You can run the following command to test your settings:"
+	elog
+	elog "# gamemoded -t"
+	elog
+	elog "GameMode supports GPU optimizations. It defaults to OFF. Any damage"
+	elog "resulting from usage of this is your own responsibility.  For safety"
+	elog "reasons, GPU settings are not allowed from \$HOME but only from"
+	elog "administrative directories."
+	elog
+	elog "systemd user sessions will automatically run the daemon on demand, it does"
+	elog "not need to be enabled explicitly. Games not supporting GameMode natively"
+	elog "can still make use of it, just add"
+	elog
+	elog "gamemoderun %command%"
+	elog
+	elog "to the start options of any Steam game to enable optimizations automatically"
+	elog "as you start the game. Similar options exist for other launchers like"
+	elog "Bottles or Lutris."
+	elog
+}
diff --git a/games-util/gamemode/gamemode-9999.ebuild b/games-util/gamemode/gamemode-9999.ebuild
index 746c7b5239eb..fec4b5dee97b 100644
--- a/games-util/gamemode/gamemode-9999.ebuild
+++ b/games-util/gamemode/gamemode-9999.ebuild
@@ -68,7 +68,7 @@ multilib_src_configure() {
 pkg_postinst() {
 	elog
 	elog "GameMode requires permissions to adjust your PAM limits and change system"
-	elog "performance settings (overclocking, scheduling, L2 cache usage, mitigations"
+	elog "performance settings (overclocking, scheduling, L3 cache usage, mitigations"
 	elog "etc). This permission is granted via the gamemode group."
 	elog
 	elog "Run the following command as root to add your user:"
diff --git a/games-util/joycond/joycond-0.1.0_p20220720-r1.ebuild b/games-util/joycond/joycond-0.1.0_p20220720-r1.ebuild
index 108e48aba915..293bbf3b3ce6 100644
--- a/games-util/joycond/joycond-0.1.0_p20220720-r1.ebuild
+++ b/games-util/joycond/joycond-0.1.0_p20220720-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/DanielOgorchock/joycond/archive/${COMMIT}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 DEPEND="
 	dev-libs/libevdev
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index 3b169aae2d7c..13a032bc54f2 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1 +1 @@
-DIST lgogdownloader-3.14.tar.gz 103422 BLAKE2B b5c3347ed18b12a1bb026d17898733e63396b8c9db5eac344740410c8ff7dc603cf752d57a52e5a68c9323d0b37d95de4e53cd13e79be498b662841d17bfeb34 SHA512 ebf199e6bc4588d0accbd31340a77f78681b0e12f51528bc0f52260bd1dce52ca4466ca7a96186742a498c0b9fb1e0e2531cdacb44c10d2a7dc7a4f103b5bf78
+DIST lgogdownloader-3.15.tar.gz 103592 BLAKE2B a3f12662310fa258265ece2b4bf9510f391d08a58b2a9f6770f0408fdee952f45e96f6bdda50d4f8b95ecf19c249ff782d9967ef12da923994b5715b0fae16a6 SHA512 f38980f27701593e8dfd07ce25b0afa1d92813f864e9cdf8f680a57d239eea1fc68c4e8ae2a525230c788280bbfa1dc678292982d8836913bfa36046679d0c27
diff --git a/games-util/lgogdownloader/lgogdownloader-3.14.ebuild b/games-util/lgogdownloader/lgogdownloader-3.14.ebuild
deleted file mode 100644
index 145c43643d6a..000000000000
--- a/games-util/lgogdownloader/lgogdownloader-3.14.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 cmake
-
-DESCRIPTION="Unofficial GOG.com downloader for Linux"
-HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-SRC_URI="https://github.com/Sude-/${PN}/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui qt5 qt6"
-REQUIRED_USE="gui? ( ^^ ( qt5 qt6 ) )"
-
-RDEPEND="
-	>=app-crypt/rhash-1.3.3-r2:0=
-	app-text/htmltidy:=
-	dev-libs/boost:=[zlib]
-	>=dev-libs/jsoncpp-1.7:0=
-	dev-libs/tinyxml2:0=
-	>=net-misc/curl-7.55:0=[ssl]
-	gui? (
-		qt5? ( dev-qt/qtwebengine:5[widgets] )
-		qt6? ( dev-qt/qtwebengine:6[widgets] )
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_GUI=$(usex gui)
-	)
-	use gui && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6=$(usex qt5)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die
-}
diff --git a/games-util/lgogdownloader/lgogdownloader-3.15-r1.ebuild b/games-util/lgogdownloader/lgogdownloader-3.15-r1.ebuild
new file mode 100644
index 000000000000..8e8825bc6865
--- /dev/null
+++ b/games-util/lgogdownloader/lgogdownloader-3.15-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Unofficial GOG.com downloader for Linux"
+HOMEPAGE="https://sites.google.com/site/gogdownloader/"
+SRC_URI="https://github.com/Sude-/${PN}/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui qt6"
+
+RDEPEND="
+	>=app-crypt/rhash-1.3.3-r2:0=
+	app-text/htmltidy:=
+	dev-libs/boost:=[zlib]
+	>=dev-libs/jsoncpp-1.7:0=
+	dev-libs/tinyxml2:0=
+	>=net-misc/curl-7.55:0=[ssl]
+	gui? (
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtnetwork:5
+			dev-qt/qtwebengine:5[widgets]
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[network,widgets]
+			dev-qt/qtwebengine:6[widgets]
+		)
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_GUI=$(usex gui)
+	)
+	use gui && mycmakeargs+=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6=$(usex !qt6)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die
+}
diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
index 5aad60a3ca63..653b4c27add5 100644
--- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
@@ -10,8 +10,7 @@ HOMEPAGE="https://sites.google.com/site/gogdownloader/"
 EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git"
 LICENSE="WTFPL-2"
 SLOT="0"
-IUSE="gui qt5 qt6"
-REQUIRED_USE="gui? ( ^^ ( qt5 qt6 ) )"
+IUSE="gui"
 
 RDEPEND="
 	>=app-crypt/rhash-1.3.3-r2:0=
@@ -21,8 +20,8 @@ RDEPEND="
 	dev-libs/tinyxml2:0=
 	>=net-misc/curl-7.55:0=[ssl]
 	gui? (
-		qt5? ( dev-qt/qtwebengine:5[widgets] )
-		qt6? ( dev-qt/qtwebengine:6[widgets] )
+		dev-qt/qtbase:6[network,widgets]
+		dev-qt/qtwebengine:6[widgets]
 	)
 "
 
@@ -38,9 +37,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT_GUI=$(usex gui)
 	)
-	use gui && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6=$(usex qt5)
-	)
 	cmake_src_configure
 }
 
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
index b063d7051c6f..20c9fa1e3251 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild b/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
index cc5a6bac15d7..802758eb0848 100644
--- a/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/gnome-applets/gnome-applets-3.52.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.52.0.ebuild
index 4a31e291902c..96ed2dd02f7c 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.52.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.52.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
 
 LICENSE="GPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="tracker"
 
 # FIXME: automagic wireless-tools
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.52.1.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.52.1.ebuild
index 40162eac08ab..70ed0077e7e3 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.52.1.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.52.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="elogind systemd"
 REQUIRED_USE="^^ ( elogind systemd )"
 
diff --git a/gnome-base/gnome-panel/gnome-panel-3.52.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.52.0.ebuild
index c821c239f360..bced91271974 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.52.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.52.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
 
 LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="eds elogind systemd"
 REQUIRED_USE="^^ ( elogind systemd )"
 
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..79840ddf943f
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0-r1.ebuild
@@ -0,0 +1,115 @@
+# 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 flag-o-matic gnome2-utils python-any-r1 xdg virtualx
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test wayland"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/libgnomekbd-3.0.0:0=
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	>=gnome-extra/cinnamon-menus-6.2
+	media-libs/fontconfig
+	>=sys-auth/polkit-0.103
+	>=sys-power/upower-0.99.8:=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
+	>=dev-libs/libgudev-232
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.1:=
+	x11-libs/pango
+
+	colord? (
+		>=x11-misc/colord-0.1.14:0=
+	)
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7:=
+		>=x11-libs/libXi-1.2
+	)
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-libs/libnma-1.8.34
+		>=net-misc/networkmanager-1.2.0[modemmanager?]
+
+		modemmanager? (
+			>=net-misc/modemmanager-0.7:=
+		)
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+	)
+	input_devices_wacom? (
+		gnome-extra/cinnamon-settings-daemon[input_devices_wacom]
+	)
+	systemd? (
+		>=sys-apps/systemd-31
+	)
+	!systemd? (
+		app-admin/openrc-settingsd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	python_fix_shebang meson_install_schemas.py
+}
+
+src_configure() {
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	local emesonargs=(
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
+}
+
+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/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.ebuild
deleted file mode 100644
index 7ee5c7dde989..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.2.0.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit meson gnome2-utils python-any-r1 xdg virtualx
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test wayland"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core:2
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/libgnomekbd-3.0.0:0=
-	>=gnome-extra/cinnamon-desktop-6.2:0=
-	>=gnome-extra/cinnamon-menus-6.2
-	media-libs/fontconfig
-	>=sys-auth/polkit-0.103
-	>=sys-power/upower-0.99.8:=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16.0:3[wayland=]
-	>=dev-libs/libgudev-232
-	>=x11-libs/libnotify-0.7.3
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5.1:=
-	x11-libs/pango
-
-	colord? (
-		>=x11-misc/colord-0.1.14:0=
-	)
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=x11-libs/libXi-1.2
-	)
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-libs/libnma-1.8.34
-		>=net-misc/networkmanager-1.2.0[modemmanager?]
-
-		modemmanager? (
-			>=net-misc/modemmanager-0.7:=
-		)
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-
-	colord? (
-		>=gnome-extra/gnome-color-manager-3
-	)
-	input_devices_wacom? (
-		gnome-extra/cinnamon-settings-daemon[input_devices_wacom]
-	)
-	systemd? (
-		>=sys-apps/systemd-31
-	)
-	!systemd? (
-		app-admin/openrc-settingsd
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang meson_install_schemas.py
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord color)
-		$(meson_use modemmanager)
-		$(meson_use networkmanager)
-		$(meson_use input_devices_wacom wacom)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..701215fbc2c5
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0-r1.ebuild
@@ -0,0 +1,105 @@
+# 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 flag-o-matic gnome2-utils python-any-r1 xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[dbus]
+	dev-libs/libgudev
+	>=gnome-base/libgnomekbd-3.6:=
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3,pulseaudio]
+	>=media-libs/libpulse-0.9.16[glib]
+	>=sys-auth/polkit-0.97
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	>=x11-libs/libxklavier-5.0:=
+	>=x11-libs/pango-1.20.0
+	>=sys-power/upower-0.9.11:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? (
+		>=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
+		>=dev-libs/libwacom-0.7:=
+		>=gnome-base/librsvg-2.36.2
+	)
+	!input_devices_wacom? (
+		>=x11-libs/gtk+-3.14.0:3
+	)
+	smartcard? (
+		dev-libs/nspr
+		>=dev-libs/nss-3.11.2
+	)
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? ( sys-auth/elogind )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libxml2:2
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	python_fix_shebang install-scripts
+}
+
+src_configure() {
+	# The only component that uses gdk backends is the wacom plugin
+	if use input_devices_wacom; then
+		# defang automagic dependencies
+		use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+	fi
+
+	# gudev not optional on Linux platforms
+	local emesonargs=(
+		-Duse_gudev=enabled
+		-Duse_polkit=enabled
+		-Duse_logind=enabled
+		$(meson_feature colord use_color)
+		$(meson_feature cups use_cups)
+		$(meson_feature smartcard use_smartcard)
+		$(meson_feature input_devices_wacom use_wacom)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.0.ebuild
deleted file mode 100644
index bf665356ce46..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.2.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit meson gnome2-utils python-any-r1 xdg
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[dbus]
-	dev-libs/libgudev
-	>=gnome-base/libgnomekbd-3.6:=
-	>=gnome-extra/cinnamon-desktop-6.2:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3,pulseaudio]
-	>=media-libs/libpulse-0.9.16[glib]
-	>=sys-auth/polkit-0.97
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14.0:3[wayland=]
-	>=x11-libs/libnotify-0.7.3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	>=x11-libs/libxklavier-5.0:=
-	>=x11-libs/pango-1.20.0
-	>=sys-power/upower-0.9.11:=
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=gnome-base/librsvg-2.36.2 )
-	smartcard? (
-		dev-libs/nspr
-		>=dev-libs/nss-3.11.2
-	)
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? ( sys-auth/elogind )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/libxml2:2
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	python_fix_shebang install-scripts
-}
-
-src_configure() {
-	# gudev not optional on Linux platforms
-	local emesonargs=(
-		-Duse_gudev=enabled
-		-Duse_polkit=enabled
-		-Duse_logind=enabled
-		$(meson_feature colord use_color)
-		$(meson_feature cups use_cups)
-		$(meson_feature smartcard use_smartcard)
-		$(meson_feature input_devices_wacom use_wacom)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e943e83ca6ca..7fc49774105e 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,2 @@
 DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
-DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a
+DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11
diff --git a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
deleted file mode 100644
index faad5075ad15..000000000000
--- a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
+++ /dev/null
@@ -1,206 +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="xml(+)"
-
-inherit meson gnome2-utils pax-utils python-single-r1 xdg
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-6.2:0=
-	>=gnome-extra/cinnamon-menus-6.2
-	>=gnome-extra/cjs-6.2[cairo]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.100[introspection]
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-libs/pango[introspection]
-	>=x11-libs/xapp-2.8.4[introspection]
-	>=x11-wm/muffin-6.2[introspection,wayland?]
-
-	eds? (
-		gnome-extra/evolution-data-server
-	)
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0
-		media-libs/gstreamer:1.0
-	)
-	networkmanager? (
-		net-misc/networkmanager[introspection]
-	)
-"
-# caribou used by onscreen keyboard
-# libtimezonemap used by datetime settings
-# iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="
-	${DEPEND}
-	>=app-accessibility/caribou-0.3
-	dev-libs/keybinder:3[introspection]
-	dev-libs/libtimezonemap
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/python-pam[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss2[${PYTHON_USEDEP}]
-		>=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/libgnomekbd-2.91.4
-	>=gnome-extra/cinnamon-control-center-6.2[networkmanager=,wayland?]
-	>=gnome-extra/cinnamon-screensaver-6.2
-	>=gnome-extra/cinnamon-session-6.2
-	>=gnome-extra/cinnamon-settings-daemon-6.2[wayland?]
-	>=gnome-extra/nemo-6.2[wayland?]
-	media-libs/gsound
-	net-libs/libsoup:3.0[introspection]
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-apps/coreutils
-	sys-apps/pciutils
-	sys-apps/util-linux
-	sys-apps/xdg-desktop-portal-gtk
-	sys-apps/xdg-desktop-portal-xapp
-	sys-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	!internal-polkit? (
-		gnome-extra/polkit-gnome
-	)
-	nls? (
-		>=gnome-extra/cinnamon-translations-6.2
-	)
-"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	"${FILESDIR}/${PN}-3.8.0-gnome-background-compatibility.patch"
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	"${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch"
-
-	# Make wayland optional
-	# https://github.com/linuxmint/cinnamon/pull/12273
-	"${FILESDIR}/${PN}-6.2.0-optional-wayland.patch"
-
-	# Fix path for settings panels on arm64
-	# https://github.com/linuxmint/cinnamon/pull/12278
-	"${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
-)
-
-src_prepare() {
-	if use internal-polkit; then
-		PATCHES+=(
-			# Use internal polkit agent on X11
-			# https://github.com/linuxmint/cinnamon/pull/12272
-			"${FILESDIR}/${PN}-6.2.0-polkit-agent-on-x11.patch"
-		)
-	else
-		# Add polkit agent to required components
-		# https://github.com/linuxmint/Cinnamon/issues/3579
-		sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
-	fi
-
-	default
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3' || die); do
-		python_fix_shebang "${p}"
-	done
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gstreamer build_recorder)
-		$(meson_use gtk-doc docs)
-		$(meson_use wayland)
-		-Ddisable_networkmanager=$(usex networkmanager false true)
-		-Dpy3modules_dir="$(python_get_sitedir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	python_optimize "${D}$(python_get_sitedir)"
-	python_optimize "${ED}"/usr/share/cinnamon/
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}"/usr/bin/cinnamon
-
-	# Doesn't exist by default
-	keepdir /etc/xdg/menus/applications-merged
-
-	if ! use internal-polkit; then
-		# Ensure authentication-agent is started, bug #523958
-		# https://github.com/linuxmint/Cinnamon/issues/3579
-		insinto /etc/xdg/autostart/
-		doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use gstreamer; then
-		if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-		   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-			ewarn "To make use of Cinnamon's built-in screen recording utility,"
-			ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-			ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-		fi
-	else
-		ewarn "Cinnamon's built-in screen recording utility is not installed"
-		ewarn "because gstreamer support is disabled."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
new file mode 100644
index 000000000000..58feebb49cfe
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -0,0 +1,206 @@
+# 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="xml(+)"
+
+inherit meson gnome2-utils pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	>=gnome-extra/cinnamon-menus-6.2
+	>=gnome-extra/cjs-6.2[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection,wayland?,X]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.8.4[introspection]
+	>=x11-wm/muffin-6.2[introspection,wayland?]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		>=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-6.2[networkmanager=,wayland?]
+	>=gnome-extra/cinnamon-screensaver-6.2
+	>=gnome-extra/cinnamon-session-6.2
+	>=gnome-extra/cinnamon-settings-daemon-6.2[wayland?]
+	>=gnome-extra/nemo-6.2[wayland?]
+	media-libs/gsound
+	net-libs/libsoup:3.0[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-apps/coreutils
+	sys-apps/pciutils
+	sys-apps/util-linux
+	sys-apps/xdg-desktop-portal-gtk
+	sys-apps/xdg-desktop-portal-xapp
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	!internal-polkit? (
+		gnome-extra/polkit-gnome
+	)
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.2
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}/${PN}-3.8.0-gnome-background-compatibility.patch"
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch"
+
+	# Make wayland optional
+	# https://github.com/linuxmint/cinnamon/pull/12273
+	"${FILESDIR}/${PN}-6.2.0-optional-wayland.patch"
+
+	# Fix path for settings panels on arm64
+	# https://github.com/linuxmint/cinnamon/pull/12278
+	"${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
+)
+
+src_prepare() {
+	if use internal-polkit; then
+		PATCHES+=(
+			# Use internal polkit agent on X11
+			# https://github.com/linuxmint/cinnamon/pull/12272
+			"${FILESDIR}/${PN}-6.2.0-polkit-agent-on-x11.patch"
+		)
+	else
+		# Add polkit agent to required components
+		# https://github.com/linuxmint/Cinnamon/issues/3579
+		sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+	fi
+
+	default
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		$(meson_use wayland)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+		-Dpy3modules_dir="$(python_get_sitedir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize "${D}$(python_get_sitedir)"
+	python_optimize "${ED}"/usr/share/cinnamon/
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}"/usr/bin/cinnamon
+
+	# Doesn't exist by default
+	keepdir /etc/xdg/menus/applications-merged
+
+	if ! use internal-polkit; then
+		# Ensure authentication-agent is started, bug #523958
+		# https://github.com/linuxmint/Cinnamon/issues/3579
+		insinto /etc/xdg/autostart/
+		doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use gstreamer; then
+		if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+		   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+			ewarn "To make use of Cinnamon's built-in screen recording utility,"
+			ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+			ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+			ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+		fi
+	else
+		ewarn "Cinnamon's built-in screen recording utility is not installed"
+		ewarn "because gstreamer support is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-network-displays/Manifest b/gnome-extra/gnome-network-displays/Manifest
index 45c0b151b044..d0d0f91dea0f 100644
--- a/gnome-extra/gnome-network-displays/Manifest
+++ b/gnome-extra/gnome-network-displays/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-network-displays-0.90.5.tar.xz 594196 BLAKE2B 4affeacc21ff581fb49bf29cd7954be7f3fe3531b904f013335d0b8bc25c0384119523a89b3f5f771eb518dfa82deb71ff22d1d5169d99b0799b4129c8586f70 SHA512 c3d4df7cfaba3482936817ad352e6e7185df4381e119236d6c33093356d5ffb12ade1f2afd4677500fa986fa9cac57df93862ac8366f9606fee169b5f8cb98e0
 DIST gnome-network-displays-0.92.1.tar.xz 647084 BLAKE2B ad3cf6d50b0d34c0d62d606ac7b53211ba157cfb8ff5c7b0c63a42be8f431b84f1ad0a2ac966c2adfde7b06c20668f7a8df7a26d7f7e07e4f51b1be0685d3411 SHA512 2e1bc9afabde8ee11aabab83e2207bd491052ab64a16c8d7fb26e8c759411c39abfd9d3f590b2f3118ec5d7350de6c18cabf7d0442b87628b9e0067a4ce87da4
+DIST gnome-network-displays-0.93.0.tar.xz 653764 BLAKE2B cb2d8f58f385d817d14412ecb147d82a3e2f2a463ef1d4534934dd0e07eea9c4ee88bf3437ee7e4cc9ead77060fa597c0d5a33d87fd7a9a0ec41a801f847ca73 SHA512 accee419f5f527c7f48c738b625536581ebcea32a313ef3579ea263ca3eb174e2d6e1441adc3a9c9670a6562a7c52700da1d86750fc246acf184dc3c21f224e5
diff --git a/gnome-extra/gnome-network-displays/gnome-network-displays-0.93.0.ebuild b/gnome-extra/gnome-network-displays/gnome-network-displays-0.93.0.ebuild
new file mode 100644
index 000000000000..32fa823892b2
--- /dev/null
+++ b/gnome-extra/gnome-network-displays/gnome-network-displays-0.93.0.ebuild
@@ -0,0 +1,71 @@
+# 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 xdg
+
+DESCRIPTION="Stream the desktop to Wi-Fi Display capable devices"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-network-displays"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="firewalld test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:3
+	media-libs/gst-rtsp-server
+	media-libs/libpulse[glib]
+	media-plugins/gst-plugins-faac
+	media-plugins/gst-plugins-x264
+	media-plugins/gst-plugins-ximagesrc
+	>=gui-libs/gtk-4
+	>=net-misc/networkmanager-1.16.0[wifi]
+	>=dev-libs/libportal-0.7[gtk]
+	>=gui-libs/libadwaita-1
+	net-dns/avahi[introspection]
+	net-dns/dnsmasq
+	net-wireless/wpa_supplicant[p2p]
+	sys-apps/xdg-desktop-portal[screencast(+)]
+	firewalld? ( net-firewall/firewalld )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/protobuf-c
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	# https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/272
+	sed -i -e "s/args: \['validate'/args: \['--nonet', 'validate'/" \
+		data/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use firewalld firewalld_zone)
+	)
+	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-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index fa2d5549f9da..90f7a1b528e7 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-extension-alphabetical-grid-38.0.tar.gz 216817 BLAKE2B bfb01e647b8545c70ce9e3b65910701ebce38d110a97c15e0413f10c0b68116b4624e98ad0d34961b701b2f2b43c20f1a15e31219edfb14a79321143be3e2c8d SHA512 4736a5e621c58adf635c468032233f54b9a2f93cdec9e65616a7272ee3368fe901401d051ed13674c815b73fdef9f7a4c38bc9e3e4c19ede7adc6782ae91cff1
-DIST gnome-shell-extension-alphabetical-grid-39.0.tar.gz 216879 BLAKE2B 4fb6aa97f01350dbbe2992f5a45c1e85f1b32456869670261224516de15b7b735500af2e59622bf9a010cf9b1da32ddb5d641143c5b12e4fa51da4ed6449e38e SHA512 046662c32c5b5fdf22b770e437aab1cfc8462798966683749484f199de5c716d72789b0f4928c5d03f5139e5fd8182fee5335f6b50e6c79a32a6f1df7ee2aae8
 DIST gnome-shell-extension-alphabetical-grid-40.0.tar.gz 216967 BLAKE2B 5500f701d3b94cc68cfe2b0bebb7425889c26982ad5d7a11acc278c3fd5b9a90e372ddafa3f920e970ce83f8b497fb0f81de32632d8b804895c00a31372aa34d SHA512 62c22c8a926f446d234efb9363fbf667b1ec8a3967aeac58f3dd8d648945ba98269cde6d46dff47a50dd9c417c92c72ef35f44154773afa45ab56ee5cafc9c82
+DIST gnome-shell-extension-alphabetical-grid-41.0.tar.gz 217552 BLAKE2B e3f2c06a7b64d339f6d143d3e64bd27bae24cb7bd9d94511048e14b156c277a86e5af386e4177c34660e9aca50657e80ca8a90641af00a8a4338e915297d044f SHA512 d1edb66c7ce50714a87753f7ae367ebade5329cdea2f51a329b6129a9739aa702bc4a8610c8a398f07a93bdf08574ec495478d324e66dfba222a5275fbb70090
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-38.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-38.0.ebuild
deleted file mode 100644
index 51d07d2584b1..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-38.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
-inherit gnome2-utils
-
-# Useful specially to prevent
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
-DESCRIPTION="Restore the alphabetical ordering of the app grid"
-HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
-SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-45
-	gui-libs/libadwaita
-"
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/alphabetical-grid-extension-${PV}"
-extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
-
-# Tests are only useful for upstream
-RESTRICT="test"
-
-# Not useful for us
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	mv docs/icon.svg extension || die
-	cd extension || die
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-39.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-39.0.ebuild
deleted file mode 100644
index 50291ca4a9f4..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-39.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
-inherit gnome2-utils
-
-# Useful specially to prevent
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
-DESCRIPTION="Restore the alphabetical ordering of the app grid"
-HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
-SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-45
-	gui-libs/libadwaita
-"
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/alphabetical-grid-extension-${PV}"
-extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
-
-# Tests are only useful for upstream
-RESTRICT="test"
-
-# Not useful for us
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	mv docs/icon.svg extension || die
-	cd extension || die
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-41.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-41.0.ebuild
new file mode 100644
index 000000000000..31617859a0b4
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-41.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+# Useful specially to prevent
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
+DESCRIPTION="Restore the alphabetical ordering of the app grid"
+HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
+SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/alphabetical-grid-extension-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-45
+	gui-libs/libadwaita
+"
+DEPEND="${COMMON_DEPEND}"
+
+extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
+
+# Tests are only useful for upstream
+RESTRICT="test"
+
+# Not useful for us
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	mv docs/icon.svg extension || die
+	cd extension || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas || die
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index b8b5477984bd..0112127238ae 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-shell-extension-appindicator-57.tar.gz 67246 BLAKE2B cdbfce7c2ff731732dea76ce53421424ad887ab7c95b555142f1fccb549723c9f9816cde527dd0dca6b9c6b835d9ec8d255f8350f8d772199920ac69d2d26809 SHA512 256d365a653db40490cb0d4da5ee5f7508298bc9189e0a8e98a4f1c904f5627cd0cb1b5586786005638025e3b8a31bf948d08a69a40977887b5860f8dc5ee53e
 DIST gnome-shell-extension-appindicator-58.tar.gz 68877 BLAKE2B 976310cb6d532adf522c2d51bf04d6c5ee78e76759dbc8ab8965b1c738e5077be26b62e3c25f30b6a6311f98427d88c498ed839c0e401d86f9d701343229ae67 SHA512 94919a1494e354d8ef081fc3b844c092369f0b0928fa94f5677cecede87bff1e8669b6b064e4ed9d40ddb9f536f68075776e5afafb06cc3df33e3b83387ea6f8
+DIST gnome-shell-extension-appindicator-59.tar.gz 69210 BLAKE2B 02d88f1d965edcf5eb04b72a1d51cef6a34485ed78240ea0e15de56b8d8d712a0721f2ba7cc51627a60407573bf7fd073da9f288e50ab6f791e64e72245e4986 SHA512 e85bea82b85369248b8271f32a276f7939bdd0828f4f63cfe0faf7099249cbbd56e2f58460373431602390f88ea97c1375655b454b0ec4c0e52280b6502bbc98
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-57.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-57.ebuild
deleted file mode 100644
index 4c647bcf6f2f..000000000000
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-57.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 gnome2-utils meson
-
-DESCRIPTION="Support legacy, AppIndicators and KStatusNotifierItems in Gnome"
-HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
-SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-45
-"
-BDEPEND="
-	app-misc/jq
-"
-
-src_prepare() {
-	default
-	# https://github.com/ubuntu/gnome-shell-extension-appindicator/issues/419
-	eapply -R "${FILESDIR}/${PN}-53-41a8e9c.patch"
-}
-
-src_install() {
-	meson_src_install
-	rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-59.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-59.ebuild
new file mode 100644
index 000000000000..7090304530b4
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-59.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils meson
+
+DESCRIPTION="Support legacy, AppIndicators and KStatusNotifierItems in Gnome"
+HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
+SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-45
+"
+BDEPEND="
+	app-misc/jq
+"
+
+src_prepare() {
+	default
+	# https://github.com/ubuntu/gnome-shell-extension-appindicator/issues/419
+	eapply -R "${FILESDIR}/${PN}-53-41a8e9c.patch"
+}
+
+src_install() {
+	meson_src_install
+	rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 6c516c8f6940..77336d88e536 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/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">
-		<name>Jonas Licht</name>
-		<email>jonas.licht@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dropbox/nautilus-dropbox</remote-id>
 	</upstream>
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index f3ad50f09818..33b802ff7684 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,2 +1,2 @@
 DIST nemo-6.0.2.tar.gz 1480887 BLAKE2B d1e3892938cb81bcb676626a9ef54362939d522a6d09befe25dd77a236a7eee3e06461da1855317bff2a5f201bc142903ce085bfbafdbddca0700a177221ccdf SHA512 05e8a6ab785f527ad61c1fe57d372ae8ea8f77d27ec8608d38e99f5f0f9065aecef4b84d1b016b682d14320d7099806d5672a101c0a370429d1c3f2a341fed1c
-DIST nemo-6.2.6.tar.gz 1503182 BLAKE2B a8c469a6ebcb297e4cd2f8b3e9a07cb7fe6b7f399747c798a5b23ca930d8375275fc66b6d05ab78b660ec7b250f413ca0a16ba7ccdf46c0e93ad18d19839a969 SHA512 62a0d6a233f57fa3e9a078c3c90f7c735bf58aee4a37cfebdda20569f0b692e33998719152060e963b27dabee5a5a3da1c0d71a2b51dc5bf200331fd16b93135
+DIST nemo-6.2.8.tar.gz 1505198 BLAKE2B fc74ab19e5aef65ba279f212f505cab91aa0dc92b19d31d4ae2f44b3222bd2278fbdf0df0bc36fa3973b91c9c06fab2c211b58c8d840deef5e60d5dbcbfa4dd7 SHA512 cd943603cfb14cc9d50466872607d191a3af7ff61f05549407caa5d9dfe606e080d6eb40d17bbcdf3a9e810bcc493f3be087b1eac6c8272746cd72c9751822af
diff --git a/gnome-extra/nemo/nemo-6.2.6.ebuild b/gnome-extra/nemo/nemo-6.2.6.ebuild
deleted file mode 100644
index 6193e5aae1d7..000000000000
--- a/gnome-extra/nemo/nemo-6.2.6.ebuild
+++ /dev/null
@@ -1,147 +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 meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="exif gtk-doc +nls selinux test tracker wayland xmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# https://github.com/linuxmint/nemo/issues/2501
-RESTRICT="test"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.45.7:2[dbus]
-	>=dev-libs/gobject-introspection-0.9.12:=
-	>=dev-libs/json-glib-1.6.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-extra/cinnamon-desktop-6.2:0=
-	gnome-extra/libgsf:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10.0:3[introspection,wayland=]
-	x11-libs/libX11
-	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapp-2.8.4[introspection]
-
-	exif? (
-		>=media-libs/libexif-0.6.20
-	)
-	selinux? (
-		sys-libs/libselinux
-	)
-	tracker? (
-		app-misc/tracker:3
-	)
-	wayland? (
-		>=gui-libs/gtk-layer-shell-0.8.0
-	)
-	xmp? (
-		>=media-libs/exempi-2.2.0:=
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	x11-themes/adwaita-icon-theme
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-6.2
-	)
-"
-PDEPEND="
-	>=gnome-base/gvfs-0.1.2
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	gtk-doc? (
-		dev-util/gtk-doc
-	)
-"
-
-PATCHES=(
-	# Undo the switch to untex as it's not packaged.
-	"${FILESDIR}/${PN}-5.0.3-use-detex.patch"
-)
-
-DISABLE_AUTOFORMATTING="yes"
-FORCE_PRINT_ELOG="yes"
-DOC_CONTENTS="
-${PN} functionality can be extended by installing other packages.
-
-sys-apps/gnome-disk-utility - Mount archive files
-gnome-extra/nemo-fileroller - Extract/Create archive files
-
-${PN} search capabilities can be extended through external
-helpers. Install any of the following packages to make
-their associated file types searchable.
-
-epub                     - app-arch/unzip and app-text/html2text
-Image metadata           - media-gfx/exif
-MP3 tags                 - media-sound/id3
-Microsoft Office .doc    - app-text/catdoc
-Microsoft Office .xls    - dev-python/xlrd
-OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv
-PDF                      - app-text/poppler[utils]
-PostScript               - app-text/ghostscript-gpl
-TeX                      - app-text/texlive-core
-"
-
-src_prepare() {
-	default
-	python_fix_shebang files/usr/share/nemo/actions install-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif)
-		$(meson_use xmp)
-		$(meson_use selinux)
-		$(meson_use tracker)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use wayland gtk_layer_shell)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/nemo/nemo-6.2.8.ebuild b/gnome-extra/nemo/nemo-6.2.8.ebuild
new file mode 100644
index 000000000000..d2f1b546ca6d
--- /dev/null
+++ b/gnome-extra/nemo/nemo-6.2.8.ebuild
@@ -0,0 +1,146 @@
+# 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 flag-o-matic gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="exif gtk-doc +nls selinux test tracker wayland xmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# https://github.com/linuxmint/nemo/issues/2501
+RESTRICT="test"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=dev-libs/gobject-introspection-0.9.12:=
+	>=dev-libs/json-glib-1.6.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-extra/cinnamon-desktop-6.2:0=
+	gnome-extra/libgsf:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.24.41-r1:3[introspection,wayland?,X]
+	x11-libs/libX11
+	>=x11-libs/pango-1.40.0
+	>=x11-libs/xapp-2.8.4[introspection]
+
+	exif? (
+		>=media-libs/libexif-0.6.20
+	)
+	selinux? (
+		sys-libs/libselinux
+	)
+	tracker? (
+		app-misc/tracker:3
+	)
+	xmp? (
+		>=media-libs/exempi-2.2.0:=
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	x11-themes/adwaita-icon-theme
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-6.2
+	)
+"
+PDEPEND="
+	>=gnome-base/gvfs-0.1.2
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	gtk-doc? (
+		dev-util/gtk-doc
+	)
+"
+
+PATCHES=(
+	# Undo the switch to untex as it's not packaged.
+	"${FILESDIR}/${PN}-5.0.3-use-detex.patch"
+)
+
+DISABLE_AUTOFORMATTING="yes"
+FORCE_PRINT_ELOG="yes"
+DOC_CONTENTS="
+${PN} functionality can be extended by installing other packages.
+
+sys-apps/gnome-disk-utility - Mount archive files
+gnome-extra/nemo-fileroller - Extract/Create archive files
+
+${PN} search capabilities can be extended through external
+helpers. Install any of the following packages to make
+their associated file types searchable.
+
+epub                     - app-arch/unzip and app-text/html2text
+Image metadata           - media-gfx/exif
+MP3 tags                 - media-sound/id3
+Microsoft Office .doc    - app-text/catdoc
+Microsoft Office .xls    - dev-python/xlrd
+OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv
+PDF                      - app-text/poppler[utils]
+PostScript               - app-text/ghostscript-gpl
+TeX                      - app-text/texlive-core
+"
+
+src_prepare() {
+	default
+	python_fix_shebang files/usr/share/nemo/actions install-scripts
+}
+
+src_configure() {
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	local emesonargs=(
+		$(meson_use exif)
+		$(meson_use xmp)
+		$(meson_use selinux)
+		$(meson_use tracker)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
index 7ffe910b59e8..44ec4d658463 100644
--- a/gnustep-apps/gorm/Manifest
+++ b/gnustep-apps/gorm/Manifest
@@ -1,3 +1,2 @@
-DIST gorm-1.2.28.tar.gz 9158263 BLAKE2B 09e49bfb1329a1da0b379987e4b8ce6a69959d83c676b01829c18db543e5fc9c346230deb188153dde4e5257c47ec5e84aee008701a3a4b77bfc3ace132bd662 SHA512 0125e1c86f7158a647f65c3e1d6c9f167b7a58055a87b837ca44a14cc84c02edbc8472ba5362776fc05c000ac010189531738efec3952df7d2edf9a3d0328e6b
 DIST gorm-1.3.1.tar.gz 7090395 BLAKE2B 55abb7a6e367e5e100d30edc3abda0b8e0903ad71d01952131e4ab7b565c8bec944126f3b8932e1cc24a16e76ce0e55291d1bab59ea03b1c41e14dda070de500 SHA512 9c2474e01145cbe8ae97e00baa7aa8c114b2fe3853b44c9e893eeef444dd7e2fe036111a8d09745c3e624383e8e5e692a8d7cc845cc6c85860f111e54f085e00
 DIST gorm-1.4.0.tar.gz 770167 BLAKE2B 38e17454ae1a73dce7818731b4e10b62f2a5b2070b1a111c5d0ffadbb13c753fb077f0ce192e72bc948e10e7299397f165d8074d2707d52cd697181bceda1c1f SHA512 5d816a381759b89465aacadbf0d5f82630201db428e29dd11418f6ad52f3fc2ddc25e907470deffd5e564fb0c56d70d120ab9dea9b6df64cf3e58652025a4dad
diff --git a/gnustep-apps/gorm/gorm-1.2.28.ebuild b/gnustep-apps/gorm/gorm-1.2.28.ebuild
deleted file mode 100644
index fbbe5b24ba78..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.28.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="https://gnustep.github.io/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.22.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		Documentation/GNUmakefile
-
-	default
-}
diff --git a/gnustep-apps/gorm/gorm-1.3.1.ebuild b/gnustep-apps/gorm/gorm-1.3.1.ebuild
index ebd3bfa583e4..cdddcf9f7d5b 100644
--- a/gnustep-apps/gorm/gorm-1.3.1.ebuild
+++ b/gnustep-apps/gorm/gorm-1.3.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
 HOMEPAGE="https://gnustep.github.io/experience/Gorm.html"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
diff --git a/gnustep-apps/gorm/gorm-1.4.0.ebuild b/gnustep-apps/gorm/gorm-1.4.0.ebuild
index a94bb1e8ab39..2db319e7914e 100644
--- a/gnustep-apps/gorm/gorm-1.4.0.ebuild
+++ b/gnustep-apps/gorm/gorm-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
 S=${WORKDIR}/apps-${PN}-${PN}-${PV//./_}
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND=">=gnustep-base/gnustep-gui-0.31.0"
 RDEPEND="${DEPEND}"
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild
index 101a16ea5d2f..66ba6d1bc449 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.31.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild
index 0f916d2105d8..09a2ce32ccce 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.31.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild
index ed780cc2caa2..b87a14ca3217 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.31.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/gnustep-back-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild
index f0eb4a44baa6..6bad8d9e2a71 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.31.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cups icu jpeg png speech"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
index 20b903a1a69c..a38fe3f19ca3 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
@@ -55,7 +55,7 @@ pkg_setup() {
 
 	# For existing installations, determine if we will use another libobjc.so
 	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
+		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' "${EPREFIX}"/usr/share/GNUstep/Makefiles/config.make)"
 		# Old installations did not set this explicitely
 		: ${current_libobjc:=libobjc.so.2}
 
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
index 5466b1f09f8d..05b5dc9bfa83 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
@@ -55,7 +55,7 @@ pkg_setup() {
 
 	# For existing installations, determine if we will use another libobjc.so
 	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
+		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' "${EPREFIX}"/usr/share/GNUstep/Makefiles/config.make)"
 		# Old installations did not set this explicitely
 		: ${current_libobjc:=libobjc.so.2}
 
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.2.ebuild
index 812bfef965c8..a36586138549 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.2.ebuild
@@ -55,7 +55,7 @@ pkg_setup() {
 
 	# For existing installations, determine if we will use another libobjc.so
 	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
+		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' "${EPREFIX}"/usr/share/GNUstep/Makefiles/config.make)"
 		# Old installations did not set this explicitely
 		: ${current_libobjc:=libobjc.so.2}
 
diff --git a/gui-apps/foot/foot-1.18.1.ebuild b/gui-apps/foot/foot-1.18.1.ebuild
index 51e7d44c3c4c..a7d00780fe0d 100644
--- a/gui-apps/foot/foot-1.18.1.ebuild
+++ b/gui-apps/foot/foot-1.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+grapheme-clustering test"
 RESTRICT="!test? ( test )"
 
diff --git a/gui-apps/lavalauncher/Manifest b/gui-apps/lavalauncher/Manifest
index 1c35cb295c91..6e27da6d2696 100644
--- a/gui-apps/lavalauncher/Manifest
+++ b/gui-apps/lavalauncher/Manifest
@@ -1,2 +1 @@
-DIST lavalauncher-2.1.0.tar.gz 101315 BLAKE2B 53dd855bbf2b24228adcda5bbc19b976a20ebb93eeefa953e92e18f010d8be4b29c1c2b053312be2578277645e84530535b820f3b487167886fecf5d137e281e SHA512 44d4ad9dc5a18af9926b93954b675114d95815a847e0f82ae940179138e7fe86243452c7d4287ff8a10e13bde8dded7ab6b551807d924f7b8f855c0c696984e9
 DIST lavalauncher-2.1.1.tar.gz 101263 BLAKE2B 7581176a81f6a076c5075c7b3abdf3fab04f7ca2c3d892b890f79580a4f61305ea55d83d5183002214409225386c4bf4a727523f33b786adf59dc3834ab93414 SHA512 803ada681f91f67e9de415d7ad3ef4f40d646eeeb21fbd784a4500b8d38708819c639ea926bdf4f01c892c116d6dd84d4d84ab97cf6fd371ce977ffa1b328737
diff --git a/gui-apps/lavalauncher/lavalauncher-2.1.0.ebuild b/gui-apps/lavalauncher/lavalauncher-2.1.0.ebuild
deleted file mode 100644
index 050c2dce3451..000000000000
--- a/gui-apps/lavalauncher/lavalauncher-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Simple launcher for wayland"
-HOMEPAGE="https://git.sr.ht/~leon_plickat/lavalauncher"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lavalauncher"
-else
-	SRC_URI="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+svg man"
-
-RDEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	svg? ( gnome-base/librsvg )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-	man? ( >=app-text/scdoc-1.9.3 )
-"
-
-PATCHES=(
-	"${FILESDIR}/lavalauncher-remove-werror.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature man man-pages)
-		$(meson_feature svg librsvg)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/mako/mako-1.9.0.ebuild b/gui-apps/mako/mako-1.9.0.ebuild
index 29e50118f3ba..adea0bc11373 100644
--- a/gui-apps/mako/mako-1.9.0.ebuild
+++ b/gui-apps/mako/mako-1.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
index 5cca97dd40ba..905fe88c908c 100644
--- a/gui-apps/nm-tray/Manifest
+++ b/gui-apps/nm-tray/Manifest
@@ -1 +1,2 @@
 DIST nm-tray-0.5.0.tar.gz 53854 BLAKE2B e83c31606905909a62df57b2e744ff133a5cff91673ff229bd53ca1cca17840989efb6d813053700562dc8b434a6676a9310ff4d50b39fde7daf580986a19cad SHA512 ba118f7fd07a60af5ed6b7b53cf771f339c89f9bef02aeb2f59bfbddd3e896bdc31aa506437e33cb8fe2ef921c595b76527d61cefd202e9e1f5197762b69ab51
+DIST nm-tray-0.5.1.tar.gz 54689 BLAKE2B 29832744b999b874066d32be2df1819a4b12d0c8ab0bcfb49c4e8f6fa93f9a9cf912de499c2c7f80daf321d4bd6b2c879a0e62f9b91c0e86d1510de3c56193ef SHA512 5d280c90cdec68ed6c9b57f25db1558bf3b337d7b450fa53e9b2b393803ab6477e6659ec48152e6b9821c946240bc69b119633b02e4026d91278eb6be432eead
diff --git a/gui-apps/nm-tray/nm-tray-0.5.1.ebuild b/gui-apps/nm-tray/nm-tray-0.5.1.ebuild
new file mode 100644
index 000000000000..7636cd597917
--- /dev/null
+++ b/gui-apps/nm-tray/nm-tray-0.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A simple Qt-based NetworkManager front-end"
+HOMEPAGE="https://github.com/palinek/nm-tray"
+SRC_URI="https://github.com/palinek/nm-tray/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	>=dev-build/cmake-3.10
+"
+RDEPEND="
+	dev-qt/qtbase:6[dbus,gui,network,widgets]
+	kde-frameworks/networkmanager-qt:6
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_TRAY_XDG_AUTOSTART_DIR=/etc/xdg/autostart
+	)
+
+	cmake_src_configure
+}
diff --git a/gui-apps/waypipe/metadata.xml b/gui-apps/waypipe/metadata.xml
index 418f3128fc8e..0c0253d7bce7 100644
--- a/gui-apps/waypipe/metadata.xml
+++ b/gui-apps/waypipe/metadata.xml
@@ -11,7 +11,7 @@
 	<use>
 		<flag name="dmabuf">Use DMABUFs for data exchange and hardware decoding</flag>
 		<flag name="ffmpeg">Link with ffmpeg to allow buffer displays using video streams</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 	</use>
 	<upstream>
 		<remote-id type="freedesktop-gitlab">mstoeckl/waypipe</remote-id>
diff --git a/gui-apps/waypipe/waypipe-0.9.0.ebuild b/gui-apps/waypipe/waypipe-0.9.0.ebuild
index 61ad589c6584..2328492e15e2 100644
--- a/gui-apps/waypipe/waypipe-0.9.0.ebuild
+++ b/gui-apps/waypipe/waypipe-0.9.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
 	S="${WORKDIR}"/${PN}-v${PV}
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/wcm/Manifest b/gui-apps/wcm/Manifest
index d76c7232f96b..4f71bfdfe177 100644
--- a/gui-apps/wcm/Manifest
+++ b/gui-apps/wcm/Manifest
@@ -1 +1,2 @@
 DIST wcm-0.8.0.tar.xz 430960 BLAKE2B 4d845edc631bda6b3fbee181d64897b366f4e73af7fef0e912f0a5dc9c7db4dc731319b6c25ce3e2206cc05c908ee402e01ed914cba4ccc63b0d52b9980b7414 SHA512 43d863cfd44dc10874f6ac0c511cd07d84721c53955315fb6eed54ba5f6ac9ebcdcf19e515639deafb333d8e45d95ce8e5222ce1d3344fc7d72f09b018bf517e
+DIST wcm-0.9.0.tar.xz 434076 BLAKE2B 7f068dda1c256d930db57d8cd299652416c5a2357742e1cc3adddab98b143ff33219dcde7c94f951d456d8a4047ce606fd95ddf1a9b4b33f8e1de8997b67aeb5 SHA512 f6c240c38adcf6c464df2ba07f2cbaeecabaf16fcf6c92fa064e30989d9d9476422e2d58bbdc14c0b2232839b517ee2938cc795200e3cb1549c170c87df8050c
diff --git a/gui-apps/wcm/wcm-0.9.0.ebuild b/gui-apps/wcm/wcm-0.9.0.ebuild
new file mode 100644
index 000000000000..a2161dc88469
--- /dev/null
+++ b/gui-apps/wcm/wcm-0.9.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Wayfire Config Manager"
+HOMEPAGE="https://github.com/WayfireWM/wcm"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/wcm.git"
+	SLOT="0/0.10"
+else
+	SRC_URI="https://github.com/WayfireWM/wcm/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64"
+	SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+
+RESTRICT="test" # no tests
+
+COMMON_DEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0[wayland]
+	dev-libs/glib:2
+	dev-libs/libevdev
+	dev-libs/libsigc++:2
+	dev-libs/libxml2
+	dev-libs/wayland
+	gui-apps/wf-shell:${SLOT}
+	gui-libs/wf-config:${SLOT}
+	gui-wm/wayfire:${SLOT}
+	media-libs/libepoxy
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libxkbcommon
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/wayland-protocols
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed 's/DestkopSettings/DesktopSettings/' -i wayfire-config-manager.desktop
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dwf_shell=enabled
+		-Denable_wdisplays=true
+	)
+
+	meson_src_configure
+}
diff --git a/gui-apps/wcm/wcm-9999.ebuild b/gui-apps/wcm/wcm-9999.ebuild
index d08911344293..a2161dc88469 100644
--- a/gui-apps/wcm/wcm-9999.ebuild
+++ b/gui-apps/wcm/wcm-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/WayfireWM/wcm"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wcm.git"
-	SLOT="0/0.9"
+	SLOT="0/0.10"
 else
 	SRC_URI="https://github.com/WayfireWM/wcm/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64"
@@ -22,19 +22,25 @@ LICENSE="MIT"
 
 RESTRICT="test" # no tests
 
-CDEPEND="
+COMMON_DEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0[wayland]
+	dev-libs/glib:2
 	dev-libs/libevdev
+	dev-libs/libsigc++:2
 	dev-libs/libxml2
 	dev-libs/wayland
-	dev-cpp/gtkmm:3.0[wayland]
-	gui-apps/wf-shell
-	>=gui-libs/wf-config-0.6.0
-	gui-wm/wayfire
+	gui-apps/wf-shell:${SLOT}
+	gui-libs/wf-config:${SLOT}
+	gui-wm/wayfire:${SLOT}
+	media-libs/libepoxy
+	x11-libs/cairo
+	x11-libs/gtk+:3
 	x11-libs/libxkbcommon
 "
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	dev-libs/wayland-protocols
 "
 BDEPEND="
@@ -42,6 +48,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+
+	sed 's/DestkopSettings/DesktopSettings/' -i wayfire-config-manager.desktop
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dwf_shell=enabled
diff --git a/gui-apps/wf-shell/Manifest b/gui-apps/wf-shell/Manifest
index f3a2a29bed5a..0509691cac8b 100644
--- a/gui-apps/wf-shell/Manifest
+++ b/gui-apps/wf-shell/Manifest
@@ -1,2 +1,3 @@
 DIST wf-shell-0.8.0.tar.xz 9100508 BLAKE2B 0867f9968fca25d183fb912e01afc55ae6c9e3a0645eb63b2622ed53bb5d6538827a8e1bb6c68be4885f0c1513e76f0fd8f580402885bfa49dcbc7a0b8b02b49 SHA512 cdaebb4aabcfcb4a4d2ef0f7845348892e5731cc44417861b958d3f067f19b6bab002845d7663ef50f57e462664ff1ca0cdab74257109211db8fa20a47ef53ae
 DIST wf-shell-0.8.1.tar.xz 9161772 BLAKE2B d778b2ed214dbb1b072400a85021d3ef4e590bc707417cf2de486c9211fdf3d1fa1c14d786363bc7dd4daeeb39406d6aa2e2c3c0b607cb9b6c87151d330a3983 SHA512 b0d283dee712ed01bdabb373f8144e6c231aa68669be8851e6603678972d9f2bdcadda773df49510c902f8e8845fdb767f9da65356640fe37843dd92d0c240f2
+DIST wf-shell-0.9.0.tar.xz 9167256 BLAKE2B ea68e110381fa76590f193e6d9035e2ce1ce1a998a4c476785912d5666f42f9976b89ef78511b6d17e36f3dfb7022ed460b8b29a379445c5d41392ec7bb3ad3f SHA512 dceb0234302ceb51ac23576752d65cf122755bd044bc98e4ca92e0b8e6715063cdebdf35e82e5dc033effc288228622886e1a0e25b4bd788f6d32f8b189c1cfe
diff --git a/gui-apps/wf-shell/metadata.xml b/gui-apps/wf-shell/metadata.xml
index c7d4ebcbf6fa..a94610d7cfac 100644
--- a/gui-apps/wf-shell/metadata.xml
+++ b/gui-apps/wf-shell/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
-    <longdescription>
-        Basic desktop environment for use with wayfire
-        which showcases all its plugins and desktop
-        effects. Integrates with other wayland
-        applications to provide a full desktop environment
-    </longdescription>
-    <upstream>
-        <remote-id type="github">WayfireWM/wf-shell</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<longdescription>
+		Basic desktop environment for use with wayfire
+		which showcases all its plugins and desktop
+		effects. Integrates with other wayland
+		applications to provide a full desktop environment
+	</longdescription>
+	<upstream>
+		<remote-id type="github">WayfireWM/wf-shell</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/gui-apps/wf-shell/wf-shell-0.9.0.ebuild b/gui-apps/wf-shell/wf-shell-0.9.0.ebuild
new file mode 100644
index 000000000000..1be6243f8563
--- /dev/null
+++ b/gui-apps/wf-shell/wf-shell-0.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wf-shell"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/wf-shell.git"
+	SLOT="0/0.10"
+else
+	SRC_URI="https://github.com/WayfireWM/wf-shell/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64"
+	SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+IUSE="+pulseaudio"
+
+# no tests
+RESTRICT="test"
+
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0[wayland]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/libsigc++:2
+	dev-libs/libdbusmenu[gtk3]
+	>=gui-libs/gtk-layer-shell-0.6
+	dev-libs/wayland
+	>=gui-libs/wf-config-0.7.0:=
+	gui-wm/wayfire
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	pulseaudio? (
+		media-libs/alsa-lib
+		media-libs/libpulse
+	)
+"
+RDEPEND="${DEPEND}
+	gui-apps/wayland-logout
+"
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure () {
+	local emesonargs=(
+		"$(meson_feature pulseaudio pulse)"
+		-Dwayland-logout=false
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/wf-shell/wf-shell-9999.ebuild b/gui-apps/wf-shell/wf-shell-9999.ebuild
index 11f4142ea117..1be6243f8563 100644
--- a/gui-apps/wf-shell/wf-shell-9999.ebuild
+++ b/gui-apps/wf-shell/wf-shell-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/WayfireWM/wf-shell"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wf-shell.git"
-	SLOT="0/0.8"
+	SLOT="0/0.10"
 else
 	SRC_URI="https://github.com/WayfireWM/wf-shell/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64"
@@ -25,14 +25,22 @@ IUSE="+pulseaudio"
 RESTRICT="test"
 
 DEPEND="
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0[wayland]
+	dev-libs/glib:2
 	dev-libs/gobject-introspection
+	dev-libs/libsigc++:2
 	dev-libs/libdbusmenu[gtk3]
 	>=gui-libs/gtk-layer-shell-0.6
 	dev-libs/wayland
-	>=gui-libs/wf-config-0.7.0
+	>=gui-libs/wf-config-0.7.0:=
 	gui-wm/wayfire
-	pulseaudio? ( media-libs/libpulse )
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	pulseaudio? (
+		media-libs/alsa-lib
+		media-libs/libpulse
+	)
 "
 RDEPEND="${DEPEND}
 	gui-apps/wayland-logout
diff --git a/gui-apps/xwaylandvideobridge/Manifest b/gui-apps/xwaylandvideobridge/Manifest
index 4428e599841f..03a74bd262a9 100644
--- a/gui-apps/xwaylandvideobridge/Manifest
+++ b/gui-apps/xwaylandvideobridge/Manifest
@@ -1,2 +1 @@
-DIST xwaylandvideobridge-0.3.0.tar.xz 35584 BLAKE2B 10d0770efc023a3c52bcc7af119d13cf2d38cd9c6d4d0e7a19a46ae455428a7b2fc03a8b61a8036a15210d699193c71784962c60ad82a65a385414b426c20e78 SHA512 9e86fac3dbed2c2cca1b899a8266c8feda3263544048c3e554e3029f065053637dda84fc0fcc10be5d4856015743b0cdcb8e0e18cd26d14739fb7481850b1392
 DIST xwaylandvideobridge-0.4.0.tar.xz 35668 BLAKE2B c21857821bfc16b5df14feeea2ea188cedb00f1f3634335a359ba0938b8fb50f5ccf914011f6aca5bd527740ea62297ba9e4171604147d10d87725a0b545d96b SHA512 d0352b7ce94f1a355d8fd8f42a45436483a87d90da1904295f984012859651472eabbca39df5107793790d48474b6de1c8766e31461d1548134547cbc7dfd5a4
diff --git a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-no-session-mgmt.patch b/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-no-session-mgmt.patch
deleted file mode 100644
index af7e52b98f68..000000000000
--- a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-no-session-mgmt.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0ca63bfbd8b30dfdb5807f6e4e35ca272d7cdc01 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Fri, 10 Nov 2023 09:52:33 +0100
-Subject: [PATCH] Do not start in an X11 session and opt out of session
- managment
-
-xwaylandvideobridge runs with the Qt xcb backend, this means it
-is also session managed by default. Since it is also autostarted
-on every log a new instance is auotstarted and in addition the
-session manager will start an instance for every one that was
-running. So on second log in you will have 2 running instances,
-on the third three, ...
-Also exit on X11 where it is not needed.
----
- src/main.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 8dda8a5..84e3677 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -11,12 +11,16 @@
- 
- #include <QApplication>
- #include <QCommandLineParser>
-+#include <QSessionManager>
- #include <QIcon>
- #include <KLocalizedString>
- #include <KAboutData>
- 
- int main(int argc, char **argv)
- {
-+    if (qgetenv("XDG_SESSION_TYPE") == "x11") {
-+        return 0;
-+    }
-     qputenv("QT_QPA_PLATFORM", "xcb");
-     qputenv("QT_XCB_GL_INTEGRATION", "xcb_egl");
- 
-@@ -25,6 +29,12 @@ int main(int argc, char **argv)
-     QApplication app(argc, argv); // widgets are needed just for the SNI.
-     app.setAttribute(Qt::AA_UseHighDpiPixmaps);
- 
-+     auto disableSessionManagement = [](QSessionManager &sm) {
-+        sm.setRestartHint(QSessionManager::RestartNever);
-+    };
-+    QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
-+    QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
-+
-     KLocalizedString::setApplicationDomain("xwaylandvideobridge");
-     {
-         KAboutData about("xwaylandvideobridge", i18n("Xwayland Video Bridge"), version, i18n("Offer XDG Desktop Portals screencast streams to X11 apps"),
--- 
-GitLab
-
diff --git a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-skip-switcher.patch b/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-skip-switcher.patch
deleted file mode 100644
index 6c71d238757d..000000000000
--- a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-skip-switcher.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9ee3d7a21ee3069e37a205318914f48b2b597eaa Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Wed, 15 Nov 2023 11:24:10 +0100
-Subject: [PATCH] Also skip the switcher
-
-BUG:477025
----
- src/contentswindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/contentswindow.cpp b/src/contentswindow.cpp
-index addae88..b6d4846 100644
---- a/src/contentswindow.cpp
-+++ b/src/contentswindow.cpp
-@@ -54,9 +54,9 @@ ContentsWindow::ContentsWindow()
-     setFlag(Qt::WindowDoesNotAcceptFocus);
-     setFlag(Qt::WindowTransparentForInput);
- #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
--    KX11Extras::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
-+    KX11Extras::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
- #else
--    KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
-+    KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
- #endif
- 
-     // remove decoration. We can't use the Qt helper as we need our window type to remain something
--- 
-GitLab
-
diff --git a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.3.0-r2.ebuild b/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.3.0-r2.ebuild
deleted file mode 100644
index 2abee612761c..000000000000
--- a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.3.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-KDE_ORG_CATEGORY="system"
-inherit ecm kde.org
-
-DESCRIPTION="Screenshare Wayland windows to XWayland apps"
-HOMEPAGE="https://planet.kde.org/david-edmundson-2023-03-22-fixing-wayland-xwayland-screen-casting/
-https://invent.kde.org/system/xwaylandvideobridge"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-plasma/kpipewire-5.27.4:5
-	media-libs/freetype
-	x11-libs/libxcb:=
-	x11-libs/xcb-util
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-session-mgmt.patch"
-	"${FILESDIR}/${P}-skip-switcher.patch" # KDE-bug 477025
-)
diff --git a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0.ebuild b/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0.ebuild
index 0633fd18a8e2..88a5db22d7a4 100644
--- a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0.ebuild
+++ b/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.4.0.ebuild
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/gui-libs/aquamarine/Manifest b/gui-libs/aquamarine/Manifest
index 572ffb67659e..2ed93b8dbcc7 100644
--- a/gui-libs/aquamarine/Manifest
+++ b/gui-libs/aquamarine/Manifest
@@ -1,3 +1,3 @@
-DIST aquamarine-0.1.1.tar.gz 70241 BLAKE2B 511e03fed61f970b6309f4cc630e6cfee9eabb4b2d95da27699aa9b38e8e20922847272c9bb4467fb59f428b7137196be2e31cf4e34ac0bb61df5e1520c6f27a SHA512 5e51db094d8a30b53f6bd0e8895039adb354f04428c49e6d1b6fdbbc13d9e8ee02d42da1f9d78bb495a0cd8e286888323a5dbdf663ae6df7495072ed6ab4abc2
-DIST aquamarine-0.2.0.tar.gz 71350 BLAKE2B d44df5f3785f381e86e05617741c114be5b3a29dda9995e84853c35753ddbac55f2f59ec4e1074829c2eb60439469b89eb0ffa6ebe98193d3bea2c975a033767 SHA512 2665ecb764f374f22a6cda88b6ede09e48ba76c245b9922a41daa13eed2c0eca51915a553829d4c9ee22d5b84c2ff9af6b8672908ad7c2f3d6d4838437c53de0
 DIST aquamarine-0.3.1.tar.gz 73065 BLAKE2B 9e66d6e6da33e62917b10b395ed1eb9ca6f721b38d787ccd6197f1b14af69cafba42994081d95b13f8dcc311b997d950a8070bca47097020bb4c80c91651b698 SHA512 78428d9571f90f424cb91fa1a1b262e1433fe3b8b2c7c7a1a8799f3346c2e2efa1fd3738903d08aeb776f5ff65f4fbe2ebc3eee1481c3a8067bf163d3cea6efb
+DIST aquamarine-0.3.2.tar.gz 73834 BLAKE2B 6fef169866c4e7dc4df6b3168c2e7c950fe62572979689010934af4c5aea7223734f3be5a85ed0c8884b32e73962d08ceb2a1e745423169642a68439f5c54dc1 SHA512 ed5e17cbbf6bff579db657366e7035b765979821fc2be95c420b290f1f25625d29c25ac30ab49183b58654ae442f18382f8bb0931aae57a796a24a14f4baacea
+DIST aquamarine-0.4.1.tar.gz 74242 BLAKE2B d019e1bfeb70d76f269eddc996957177ece83526382110c0a5e4e9a26716dee4a03b3bce408f667db6a21f1cce5ae4a1ca5d674dbe13d96229631633ce54d627 SHA512 facdfc86761df68369e8e823f87cf84564b861a5d7ceb9fb8930b32b3bfd5e48d77fcc9953553387e4b61e0b24461fd740e249ca8f6a8791d88a9e41e1e47e9f
diff --git a/gui-libs/aquamarine/aquamarine-0.3.1.ebuild b/gui-libs/aquamarine/aquamarine-0.3.1.ebuild
index f6ad41a30f68..1d429af14b19 100644
--- a/gui-libs/aquamarine/aquamarine-0.3.1.ebuild
+++ b/gui-libs/aquamarine/aquamarine-0.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
 else
 	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="BSD"
diff --git a/gui-libs/aquamarine/aquamarine-0.1.1-r2.ebuild b/gui-libs/aquamarine/aquamarine-0.3.2.ebuild
index f6ad41a30f68..f6ad41a30f68 100644
--- a/gui-libs/aquamarine/aquamarine-0.1.1-r2.ebuild
+++ b/gui-libs/aquamarine/aquamarine-0.3.2.ebuild
diff --git a/gui-libs/aquamarine/aquamarine-0.2.0.ebuild b/gui-libs/aquamarine/aquamarine-0.4.1.ebuild
index f6ad41a30f68..f6ad41a30f68 100644
--- a/gui-libs/aquamarine/aquamarine-0.2.0.ebuild
+++ b/gui-libs/aquamarine/aquamarine-0.4.1.ebuild
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 950fd6fe6f35..7d90b2ea9043 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,2 +1,2 @@
 DIST egl-wayland-1.1.13.1.tar.gz 68181 BLAKE2B 12587c24828570b5ad399042bb339b27c4d17e14896398d331970b32020956f12d56155e6b97f82c0e7c5f7aa5ad962b923c37ff1609f5384a99bb83e02c2dd7 SHA512 264373b22bab2a26dcd8391308ae24c0afe31168c318fd8fdf74a9958bc41658f9295645c4d91e395b5ab472cdf9dcf5160c448ba54e0aa8eccf04c294ffdb5b
-DIST egl-wayland-1.1.15.tar.gz 74483 BLAKE2B f457f27a70b132fa753c688711bb03301d7c22bc1bf039fa6dbf87f8a288572fdd4feb9b5da9e5545d06be95b8c3b3259a82189af14a5ae036f72cf0d01a8a1d SHA512 714f3d52dc1a884adc7d4942bc2486774637f61a05e74b3f00cc9389fadb1328b7fc87b31be9f49bd5be65e43bd6e6dc5341e2e7755ff6549dabaafcd2c50a3c
+DIST egl-wayland-1.1.16.tar.gz 74615 BLAKE2B ebb6c5ca00bcf78a2d09bc555da8023c16d340c0793b92833fbcc2b05de5a92e26bc59391af9b42d9ed079290c19e94897cf925bc92a926bd518aa3c1a3ccd38 SHA512 cd32f565c287808ebc9999c46650aecbd023d2df6e1824d30c58822e2f93fe807b37eb87c4626b0874797ad61cfcc75a436f528ec7947dd98c5bae24ca6e7a28
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.15.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.16.ebuild
index 93079328f2a5..93079328f2a5 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.15.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.16.ebuild
diff --git a/gui-libs/eglexternalplatform/Manifest b/gui-libs/eglexternalplatform/Manifest
index 34147eb40e33..c52a50f670e2 100644
--- a/gui-libs/eglexternalplatform/Manifest
+++ b/gui-libs/eglexternalplatform/Manifest
@@ -1 +1,2 @@
 DIST eglexternalplatform-1.1.tar.gz 10372 BLAKE2B f18bd0c5244da34343b3bde8451602b8071972d33139ab4839e7bf68eae6be5fa69a12d5059b4b259bc4eac2e97f46d4d5fa734d48e45b6a6ae69251af86cdf0 SHA512 ee72c928abac060e28515807975a371d3792acd119fa9f9da926ae32105e1e528df8d9a3db57ffac0587b115293ede44997606d9da8e20e7f7061a01dd502748
+DIST eglexternalplatform-1.2.tar.gz 10580 BLAKE2B b3e4971fb7c4496d47c3fef823e1eea32cd6e2f49532a57fcd928c14ccd57a00dcc73b51894ece7651b797a50d6b330d1ecbff1d9a315f80e434f58336266a7d SHA512 7beb43db84320ab9533c2eed4850f8d824cf9b92051e62e33df1cd4fe86f9081377471e0e73146205c136d891d1fdff7b52600b7f63363aee45f6a3c137e9886
diff --git a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
deleted file mode 100644
index f08b0f1981d0..000000000000
--- a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="EGL External Platform interface"
-HOMEPAGE="https://github.com/NVIDIA/eglexternalplatform"
-SRC_URI="https://github.com/NVIDIA/eglexternalplatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-src_prepare() {
-	default
-
-	use !prefix || sed -i "/^inc/s|=|=${EPREFIX}|" eglexternalplatform.pc || die
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins eglexternalplatform.pc
-
-	insinto /usr/include/EGL
-	doins interface/*.h
-
-	einstalldocs
-
-	docinto examples
-	dodoc samples/*.c
-}
diff --git a/gui-libs/eglexternalplatform/eglexternalplatform-1.2.ebuild b/gui-libs/eglexternalplatform/eglexternalplatform-1.2.ebuild
new file mode 100644
index 000000000000..ed2b3aba9691
--- /dev/null
+++ b/gui-libs/eglexternalplatform/eglexternalplatform-1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="EGL External Platform interface"
+HOMEPAGE="https://github.com/NVIDIA/eglexternalplatform/"
+SRC_URI="
+	https://github.com/NVIDIA/eglexternalplatform/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+src_install() {
+	meson_src_install
+
+	# header-only and we need it found for both 32bit and 64bit
+	mv -- "${ED}"/usr/{$(get_libdir),share}/pkgconfig || die
+}
diff --git a/gui-libs/gtk/gtk-4.14.4-r1.ebuild b/gui-libs/gtk/gtk-4.14.4-r1.ebuild
index 00d8f5bbcaa1..7c1ee21f75a6 100644
--- a/gui-libs/gtk/gtk-4.14.4-r1.ebuild
+++ b/gui-libs/gtk/gtk-4.14.4-r1.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	test? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~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="
diff --git a/gui-libs/hyprcursor/Manifest b/gui-libs/hyprcursor/Manifest
index 2c9c4b326e7f..8a4308b2c4a2 100644
--- a/gui-libs/hyprcursor/Manifest
+++ b/gui-libs/hyprcursor/Manifest
@@ -1,4 +1 @@
-DIST hyprcursor-0.1.5.gh.tar.gz 20096 BLAKE2B 31595ca4ffb0e9683d2584dc1e58483435bd19180a4326d741b4093d780b79878e9202153744b54786ed82991469ddd277112a79b3a3a95179195519cdfe9ff9 SHA512 3092b6773a34fa1cab10f83fa48274d79a50cd373dfe8a89d0170a78767a66b5e0cbe57cd1b86bc4bb85371c23ac7425f59e61fb50723a895fef4e7f6039fdfc
-DIST hyprcursor-0.1.7.gh.tar.gz 25670 BLAKE2B 72b4e7a78b832782c2a79e59eadf7e3d94d14377291f3cffd38d59d11ca119eca3ba1febdd36535a16ce6f15c02804f9fe6291ac2d5758cde51090929b17635d SHA512 dd506860fc7a0d5b1f9602330becc7f9a37fda19d92fcc10150e6e23680124d63451b98a92e33b9a820db385fdba29a7f306d0c1639426aa06c749fa1dfad04e
-DIST hyprcursor-0.1.8.gh.tar.gz 25946 BLAKE2B 7f3186f6447553664cf2a2af43426a89f0d64ad05b191720447116e25a22ae562805cd2aa1786a0a40dfa4cbb10629e9cbf1a3def7f0018c3c7680e6346fc0f5 SHA512 f03ead33b37d46f189ec16b6dcebf066a4f531e74a5a71c4aaae90cb09415fd3901793bcdf41d7ce7bd2b5a22856abda360ed63648a19f4aef40dc78ae96963e
 DIST hyprcursor-0.1.9.gh.tar.gz 26111 BLAKE2B 94edd94be6ba29e85074f5dd16a52e7da89d75a2b3c1be06fabf9d0880085b5ec37f507ba100f24b34f8efd8f2f84d5508aa846860ceaa9eb629ee54c58bb5c1 SHA512 39205b0ae4094cf07b19844894e4c7b4dfd2f44e8014e0db77759d880f02c21a2568705fdfae9efb11f05b97a54a9f0c2ffb57045c10a022a1b3ed2a0d2ccca8
diff --git a/gui-libs/hyprcursor/hyprcursor-0.1.5.ebuild b/gui-libs/hyprcursor/hyprcursor-0.1.5.ebuild
deleted file mode 100644
index 79220724856b..000000000000
--- a/gui-libs/hyprcursor/hyprcursor-0.1.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="The hyprland cursor format, library and utilities"
-HOMEPAGE="https://github.com/hyprwm/hyprcursor"
-SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-# Disable tests since as per the documentation, tests require a theme to be installed
-# See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
-RESTRICT="test"
-RDEPEND="
-	>=dev-libs/hyprlang-0.4.2
-	dev-libs/libzip
-	gnome-base/librsvg:2
-	x11-libs/cairo
-"
diff --git a/gui-libs/hyprcursor/hyprcursor-0.1.7.ebuild b/gui-libs/hyprcursor/hyprcursor-0.1.7.ebuild
deleted file mode 100644
index f3af5d8096a0..000000000000
--- a/gui-libs/hyprcursor/hyprcursor-0.1.7.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
-
-inherit cmake
-
-DESCRIPTION="The hyprland cursor format, library and utilities"
-HOMEPAGE="https://github.com/hyprwm/hyprcursor"
-SRC_URI="https://github.com/hyprwm/hyprcursor/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-# Disable tests since as per upstream, tests require a theme to be installed
-# See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/tomlplusplus
-	>=dev-libs/hyprlang-0.4.2
-	dev-libs/libzip
-	gnome-base/librsvg:2
-	x11-libs/cairo
-"
diff --git a/gui-libs/hyprcursor/hyprcursor-0.1.8.ebuild b/gui-libs/hyprcursor/hyprcursor-0.1.8.ebuild
deleted file mode 100644
index 49f4d5143574..000000000000
--- a/gui-libs/hyprcursor/hyprcursor-0.1.8.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
-
-inherit cmake
-
-DESCRIPTION="The hyprland cursor format, library and utilities"
-HOMEPAGE="https://github.com/hyprwm/hyprcursor"
-SRC_URI="https://github.com/hyprwm/hyprcursor/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# Disable tests since as per upstream, tests require a theme to be installed
-# See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/tomlplusplus
-	>=dev-libs/hyprlang-0.4.2
-	dev-libs/libzip
-	gnome-base/librsvg:2
-	x11-libs/cairo
-"
diff --git a/gui-libs/hyprcursor/hyprcursor-9999.ebuild b/gui-libs/hyprcursor/hyprcursor-9999.ebuild
new file mode 100644
index 000000000000..cb5f28fe41d0
--- /dev/null
+++ b/gui-libs/hyprcursor/hyprcursor-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The hyprland cursor format, library and utilities"
+HOMEPAGE="https://github.com/hyprwm/hyprcursor"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+# Disable tests since as per upstream, tests require a theme to be installed
+# See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/tomlplusplus
+	>=dev-libs/hyprlang-0.4.2
+	dev-libs/libzip
+	gnome-base/librsvg:2
+	x11-libs/cairo
+"
diff --git a/gui-libs/hyprcursor/metadata.xml b/gui-libs/hyprcursor/metadata.xml
index 227e37ab55b9..9cc15578ff30 100644
--- a/gui-libs/hyprcursor/metadata.xml
+++ b/gui-libs/hyprcursor/metadata.xml
@@ -5,6 +5,10 @@
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>johnmh@johnmh.me</email>
+		<name>John M. Harris, Jr.</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/gui-libs/hyprutils/Manifest b/gui-libs/hyprutils/Manifest
index 8f5ced60a11f..a6efa76999c8 100644
--- a/gui-libs/hyprutils/Manifest
+++ b/gui-libs/hyprutils/Manifest
@@ -1,3 +1 @@
-DIST hyprutils-0.1.5.gh.tar.gz 17974 BLAKE2B 2992cbc27c908c6ec86210fdd89969d77031d1b146b5607bffbf9fa457e24bee2edbdc52c64972ffc56df98799ffd77eba800892b0c126b1340aec7b03d03775 SHA512 c7ca50507871aacdb9054a308d03bfd666df817f1020a6c8df00cd88d3368ffcda629eb5b3952a4fece4b191f8cf739d8f837b3baf59bc8582c310063b60037a
-DIST hyprutils-0.2.0.gh.tar.gz 19268 BLAKE2B 84afffb7f74f9882c4744963e9979c3035d5dbdc7ba914aee17f0a8968a0e218152830414c37cc760c1d43d580d0a04ca272bbaf04260222c757e3dfb544d299 SHA512 1e78e7c46a028169d65203b00436a62c6822c7a78eb8e1803ae1f681237e73e5b24d68957c64ee8bba47067c05ce3c32f74df951136aa2cfeb2dff9524286052
 DIST hyprutils-0.2.1.gh.tar.gz 19941 BLAKE2B 3d38745450aff38ef28809b22646789003c8f964e6a39083c4353ded62820fe8b447da97b1de37f6a8c9c891de929c0f7c866a1c3962048d0f3267d6e851bb86 SHA512 168b7cf204d9b6b56df3404da52956e38ab56a55a441cf71c531efdad3112724c8df1deda2ea7fadb8ac9b2243dc9933612d4c23cd361d3dc5123485a5a5976a
diff --git a/gui-libs/hyprutils/hyprutils-0.1.5.ebuild b/gui-libs/hyprutils/hyprutils-0.1.5.ebuild
deleted file mode 100644
index 7d91fac34698..000000000000
--- a/gui-libs/hyprutils/hyprutils-0.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Hyprland utilities library used across the ecosystem"
-HOMEPAGE="https://github.com/hyprwm/hyprutils"
-
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
-else
-	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-${PV}"
-
-	KEYWORDS="amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	x11-libs/pixman
-"
-RDEPEND="${DEPEND}"
diff --git a/gui-libs/hyprutils/hyprutils-0.2.0.ebuild b/gui-libs/hyprutils/hyprutils-0.2.0.ebuild
deleted file mode 100644
index 55586fbd00b4..000000000000
--- a/gui-libs/hyprutils/hyprutils-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Hyprland utilities library used across the ecosystem"
-HOMEPAGE="https://github.com/hyprwm/hyprutils"
-
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
-else
-	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-${PV}"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	x11-libs/pixman
-"
-RDEPEND="${DEPEND}"
diff --git a/gui-libs/hyprutils/hyprutils-0.2.1.ebuild b/gui-libs/hyprutils/hyprutils-0.2.1.ebuild
index 55586fbd00b4..7d91fac34698 100644
--- a/gui-libs/hyprutils/hyprutils-0.2.1.ebuild
+++ b/gui-libs/hyprutils/hyprutils-0.2.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-${PV}"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="BSD"
diff --git a/gui-libs/libadwaita/libadwaita-1.5.2.ebuild b/gui-libs/libadwaita/libadwaita-1.5.2.ebuild
index 626c10d94649..9a97a0b33442 100644
--- a/gui-libs/libadwaita/libadwaita-1.5.2.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/vte/vte-0.74.2.ebuild b/gui-libs/vte/vte-0.74.2.ebuild
index 403cbcb761c3..3a088694a946 100644
--- a/gui-libs/vte/vte-0.74.2.ebuild
+++ b/gui-libs/vte/vte-0.74.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
 	vala? ( introspection )
diff --git a/gui-libs/vte/vte-0.76.3.ebuild b/gui-libs/vte/vte-0.76.3.ebuild
index 32ba40bcda9b..972b22ea7726 100644
--- a/gui-libs/vte/vte-0.76.3.ebuild
+++ b/gui-libs/vte/vte-0.76.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
index 65a399352a88..ebc241c61a70 100644
--- a/gui-libs/wayfire-plugins-extra/Manifest
+++ b/gui-libs/wayfire-plugins-extra/Manifest
@@ -1,2 +1,3 @@
 DIST wayfire-plugins-extra-0.8.0.tar.xz 70324 BLAKE2B f8f46782e31f170eb566567f50d302df4db23fbeb29c71569624a7f79c2bbcfcf48b070e7b55bf1880a9cd02afe78783d6680c457e466d765eb0db72f4b1f61b SHA512 8105fea3d8405a88d8c872c1012dadfab55f987a8ff8401f5caeec155214727021cbc7cfaba71c5ee3bc869caf136dcd78c189921c2f41a938b8552962f1597c
 DIST wayfire-plugins-extra-0.8.1.tar.xz 75908 BLAKE2B 65c14281fd9738864f2d63f01250e6384cdf46929ee6df653a5614805b89686f0020799246d6caf16b8d45aa16a66f314e705ae96c37188d892d339875ed4c03 SHA512 ebe12545b0a0ca1c443f334b9bfa31d1f446636dbef2b91c280715ad58d8802ab129f6894959727c0b872558f799c973a158e679683f915a5ef89b67087eed01
+DIST wayfire-plugins-extra-0.9.0.tar.xz 104424 BLAKE2B 8dde47dd40edabb8243c6a4128229baa4d2ff3407eb9cf0ff1699ca49dfaaf16f951f4faf18138824894f94b0ca6884bbc92fab595d4e08b948b67a0a0cf054f SHA512 fb1e02c4284b499a89a8b81e2b9ef283bdde48745c5f4ee500da4d9450bc5c8d94df6b8eba5d6ff3bb05ba3edbbdbd04b3c5551a73f5765ed3406d8227177f78
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.9.0.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.9.0.ebuild
new file mode 100644
index 000000000000..76b93a865547
--- /dev/null
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="extra plugins for wayfire"
+HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
+	SLOT="0/0.10"
+else
+	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64"
+	SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+
+# no tests
+RESTRICT="test"
+
+WAYFIRE_REVDEP="
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	gui-libs/wf-config:=
+	gui-libs/wlroots:=
+	x11-libs/cairo
+"
+
+DEPEND="
+	${WAYFIRE_REVDEP}
+	dev-cpp/glibmm:2
+	dev-cpp/nlohmann_json
+	dev-libs/libevdev
+	dev-libs/wayland
+	>=gui-wm/wayfire-0.9.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.12
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
index 72311100c56b..76b93a865547 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
-	SLOT="0/0.9"
+	SLOT="0/0.10"
 else
 	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64"
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index 9dd8238bdd6b..46036984214c 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1 +1,2 @@
 DIST wf-config-0.8.0.tar.xz 41200 BLAKE2B d56cd04c18c2cd8c0bac86493ad662244bde0e9cce1caf81d0fff34d9f2df2470c1aa8c95fead9e91dd5793d570b01dc6ef99b1986b8658b06ef93156a1526f8 SHA512 79cca2429a39ee81f853043698c57fc08025634926773253cff73fc564dcf203335b4b861d82b60a769bbab7b07be6a7e181c9ea29ad98ce930de20f9723893f
+DIST wf-config-0.9.0.tar.xz 42612 BLAKE2B 5f3b529f829f6fc6bdfe974633467707bba501eddca1a9d32f62c1d4ea6398e74ae9bc6f970de821e81fe7fbc4a26b77611587c637ab1961898084571b073ead SHA512 ac2ca69b7d96b9b145a4789f004705a2d7b323e6724e429a1e5a4544cd56828165a01f48a9863ceb92004c51c8f05729468f4a32c37545716f8d537d39e3236b
diff --git a/gui-libs/wf-config/wf-config-0.9.0.ebuild b/gui-libs/wf-config/wf-config-0.9.0.ebuild
new file mode 100644
index 000000000000..b90440cd81b9
--- /dev/null
+++ b/gui-libs/wf-config/wf-config-0.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="library for managing wayfire configuration files"
+HOMEPAGE="https://github.com/WayfireWM/wf-config"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
+	SLOT="0/0.10"
+else
+	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libevdev
+	dev-libs/libxml2
+	media-libs/glm
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+	test? ( dev-cpp/doctest )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test tests)
+		-Dlocale_test=false # requires de_DE locale to be installed
+	)
+
+	meson_src_configure
+}
diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index d01859840af0..b90440cd81b9 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/WayfireWM/wf-config"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
-	SLOT="0/0.9"
+	SLOT="0/0.10"
 else
 	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
diff --git a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch b/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
deleted file mode 100644
index cff1f72ca5ca..000000000000
--- a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 19 Mar 2022 14:00:43 +0100
-Subject: [PATCH] tinywl: don't crash when there is no keyboard
-
-Running with WLR_BACKENDS=headless, there is no keyboard device.
-Avoid crashes like so:
-
-    ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
-    ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
-    AddressSanitizer:DEADLYSIGNAL
-    =================================================================
-    ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0)
-    ==331107==The signal is caused by a READ memory access.
-    ==331107==Hint: address points to the zero page.
-        #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136
-        #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603
-        #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29
-        #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315
-        #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466
-        #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523
-        #6 0x7f75d5714d49  (/usr/lib/libffi.so.8+0x6d49)
-        #7 0x7f75d5714266  (/usr/lib/libffi.so.8+0x6266)
-        #8 0x7f75d68cb322  (/usr/lib/libwayland-server.so.0+0xd322)
-        #9 0x7f75d68c65cb  (/usr/lib/libwayland-server.so.0+0x85cb)
-        #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9)
-        #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36)
-        #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905
-        #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f)
-        #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0)
-        #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4)
----
- tinywl/tinywl.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
-index dd442aac..8796e9df 100644
---- a/tinywl/tinywl.c
-+++ b/tinywl/tinywl.c
-@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) {
- 	 * track of this and automatically send key events to the appropriate
- 	 * clients without additional work on your part.
- 	 */
--	wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
--		keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+	if (keyboard != NULL) {
-+		wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
-+			keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+	}
- }
- 
- static void keyboard_handle_modifiers(
--- 
-2.36.1
-
diff --git a/gui-libs/wlroots/wlroots-0.18.0.ebuild b/gui-libs/wlroots/wlroots-0.18.0.ebuild
index c10dc7018f2a..8e578393fa3f 100644
--- a/gui-libs/wlroots/wlroots-0.18.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.18.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0.18"
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/releases/${PV}/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 	SLOT="$(ver_cut 1-2)"
 fi
 
diff --git a/gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-1.0.2.ebuild b/gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-1.0.2.ebuild
index 75140bfaf553..a9893827af0f 100644
--- a/gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-1.0.2.ebuild
+++ b/gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-1.0.2.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index e7ecf3f9d006..d3809c7d08e7 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,3 +1,3 @@
 DIST dwl-v0.5.tar.gz 57363 BLAKE2B 6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7 SHA512 7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8
 DIST dwl-v0.6.tar.gz 62677 BLAKE2B 01d010c7e5054c9a8ed0b2b03093e8eee8ff11555296819f2b42a54dd5f07507d9129e6eaf34521d5743bf172309472b52d9a0106b7badd545c75e922a115ef0 SHA512 5e5d7599438d4cdf632e7afaddb1d345c8131c9925e9e4d1b632ad52c4418b1db2c0ff6a2da4b5686607c79cf2598e26e8c7f4c8385be82b2c2355fa28c2e8fb
-DIST dwl-v0.7-rc1.tar.gz 63167 BLAKE2B e581909decd5859702903c01e91af19dbcf394337dc6d1813835b883396eb075a91dcef1bfe0c92b1c0d61fd9303d1263a3ddbac1323c594ce84d628d9f31b66 SHA512 a3214539e3b8f1df3a3fef4dd51506db1ec1c730e793fbd30e2be44a2913b47b0f87d170a4466d61bb05a0822e6c4cab12916ff667db2c8b7e8fcc0beab0a2a1
+DIST dwl-v0.7.tar.gz 63510 BLAKE2B 643d09b805a7c14e486828acbe33f38c31bce2cc31455afb32351f685326016e8d0eddbcba15646d6ec3192c538ffe52dad97693a579ec8125d9537830b681b5 SHA512 d2ec9467bb7758ea52e0face555cb505624062eb66c8959b59e715b7d1c7bb74c649029f365c9bfd07d7b5806fdef018f555d7e64bd62e7e413ead45b5d73986
diff --git a/gui-wm/dwl/dwl-0.7_rc1.ebuild b/gui-wm/dwl/dwl-0.7.ebuild
index 673657f8b653..673657f8b653 100644
--- a/gui-wm/dwl/dwl-0.7_rc1.ebuild
+++ b/gui-wm/dwl/dwl-0.7.ebuild
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index 3870b7141491..cbbbbdb1db0c 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,5 +1,5 @@
-DIST gamescope-3.14.22.tar.gz 536052 BLAKE2B f0d8efbaa02c70c810e59b4bc18e46a01205ccfb190a50796a22aefd19689f796406ff4eafd8974ea805843d08fbf14dabf0441fe83cbcc14ad219a04de1f67a SHA512 7c11f8df21f1938a605b9648187f4a115b89397a1dfb11066af3ffa9fed05b95d9656c5e0794ff8c3f9eddaf05602369e0e5bac803b7655f21135a01cd073ab3
+DIST gamescope-3.15.5.tar.gz 570102 BLAKE2B 2c54af3e90b90cfffc158924d038a76914dc5a3fb51414f275d0478d6fdda4a898b822dba282e11285b0627b6449200acf7de57d238ebf681399abef82c0ca9b SHA512 bff5deaea7764d40e294b38ae210f58e3417faa097afd2b42c336a75914b91bfbeeec09d6af2ce24f2fe3071436c3ad81f8aadc735d7b6814083f990f5c6bcaa
 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
-DIST wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz 620424 BLAKE2B 83630b77983009a36fa4f168bbe2eceb73f634f9dd149cc5e6b18fbf647245a32a5d31dc3fbd0d1bed1d0dafc4cbb2fcea3ee4b4f5660a35ca37eff4679b80a2 SHA512 6857ded750fda91d55e53edfc270eb4e7bf44d7330d17c8fcd13c248c71abba685f34260d1e6d20cdb302a8d4f9158fb43421943cca74630fd780a4048aed07b
+DIST wlroots-4bc5333a2cbba0b0b88559f281dbde04b849e6ef.tar.gz 629328 BLAKE2B c48ff80616a82529ea0b503204557a41be8f8ad8fb60d0f5ae155a237d97117f3551f7992957a03c08fec6374e2087483052712a173fd422c5236f619a16bc64 SHA512 60731f5ce90e061d674168d42c2d4e02766f85b8b1566611022fc930feb181d16906ac23e92f999c90fa6b48c769279520de12a9abeae20c5553b6ccdd31427e
diff --git a/gui-wm/gamescope/gamescope-3.14.22.ebuild b/gui-wm/gamescope/gamescope-3.14.22.ebuild
deleted file mode 100644
index 0a4ac07347a7..000000000000
--- a/gui-wm/gamescope/gamescope-3.14.22.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="a5c9826e6d7d8b504b07d1c02425e6f62b020791"
-	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.21
-	gui-libs/libdecor
-	=media-libs/libdisplay-info-0.1*:=
-	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.15.5.ebuild b/gui-wm/gamescope/gamescope-3.15.5.ebuild
new file mode 100644
index 000000000000..ea1b20937239
--- /dev/null
+++ b/gui-wm/gamescope/gamescope-3.15.5.ebuild
@@ -0,0 +1,149 @@
+# 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/hyprland/Manifest b/gui-wm/hyprland/Manifest
index b4c2dfcc171f..184e9bb82f16 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,3 +1,2 @@
-DIST hyprland-0.41.1.gh.tar.gz 54813832 BLAKE2B 1dd17e7e1f885da91fca596bf8ce9efc76b3110640a9bc11538fabf975eb55d76180c202527e0b0eac300f027adfed815d2a9a5396a48429097ef2a5ffcc4d9e SHA512 fa63e7c429e33535fa30ca70133f6ac8617f2386bdca1e8063628a2895677c9b80965548ee21f897aea2fe6bdcc10d74d8c46989a7563b36504f4a4f43c3eaad
-DIST hyprland-0.41.2.gh.tar.gz 54821598 BLAKE2B 026559e9319690e6b48863ffdc2e059c969ab45e7bfe75578b7e41f1d10b36e720ae0655f7003107a4ff4e94c1e95aba3e8a1af8ed01bae369c571e24d966aec SHA512 5a138d9ad6de2d45d8d0a5cde8c39ba3cd4c6bac61caf5b9f8520d0adcafe6ac1dfec4c529b8a6608133ffe9409935c1414a86d98d743be6766bdbc72641179d
 DIST hyprland-0.42.0.gh.tar.gz 54225438 BLAKE2B a947289c5568408d71383034a290f114b974f442ed1f56ac3ec30e49519ee886ac83e1f2611577a7240a555480a59bc01defb79b2aca2122ef0d81ea007f5486 SHA512 839916957abc867ad9a3a32b6f74830055060b99c4c1de314f71a85f8d55ef051c5adb7c79dd7a7e10f81d1130aa032458bb65ce2454198a79faa719021f66af
+DIST hyprland-0.43.0.gh.tar.gz 54388932 BLAKE2B 610afadde6e56cb576d96c1d704327534d3ab50e69b091e9b44e9f901dbdfcd38f8a3c6a40f7fd3e843e5dda884ea1e93a24e085446861104019be9489a0a666 SHA512 521adcfb9ef55d5ad45192566856c20619942e8229f41400d2534531458dd3e54673b9dd3a0c3360280ccaaf35f5ac48393553a8549f147b701aa26522cec37b
diff --git a/gui-wm/hyprland/hyprland-0.41.1.ebuild b/gui-wm/hyprland/hyprland-0.41.1.ebuild
deleted file mode 100644
index ded707b47007..000000000000
--- a/gui-wm/hyprland/hyprland-0.41.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
-HOMEPAGE="https://github.com/hyprwm/Hyprland"
-
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
-else
-	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-source"
-
-	KEYWORDS="amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="X legacy-renderer systemd"
-
-# hyprpm (hyprland plugin manager) requires the dependencies at runtime
-# so that it can clone, compile and install plugins.
-HYPRPM_RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	dev-build/meson
-	dev-libs/libliftoff
-	dev-vcs/git
-	virtual/pkgconfig
-"
-# bundled wlroots has the following dependency string according to included headers.
-# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
-# enable x11-backend with X and vice versa
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-1.22
-	media-libs/libglvnd
-	|| (
-		>=media-libs/mesa-24.1.0_rc1[opengl]
-		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
-	)
-	>=x11-libs/libdrm-2.4.114
-	x11-libs/libxkbcommon
-	>=x11-libs/pixman-0.42.0
-	media-libs/libdisplay-info
-	sys-apps/hwdata
-	>=dev-libs/libinput-1.14.0:=
-	sys-auth/seatd:=
-	virtual/libudev:=
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-		x11-base/xwayland
-	)
-"
-WLROOTS_RDEPEND="
-	${WLROOTS_DEPEND}
-"
-WLROOTS_BDEPEND="
-	>=dev-libs/wayland-protocols-1.32
-	dev-util/hyprwayland-scanner
-	virtual/pkgconfig
-"
-RDEPEND="
-	${HYPRPM_RDEPEND}
-	${WLROOTS_RDEPEND}
-	dev-cpp/tomlplusplus
-	dev-libs/glib:2
-	dev-libs/libinput
-	>=dev-libs/wayland-1.20.0
-	~gui-libs/hyprcursor-0.1.9
-	media-libs/libglvnd
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	X? (
-		x11-libs/libxcb:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	${WLROOTS_DEPEND}
-	>=dev-libs/hyprland-protocols-0.3
-	>=dev-libs/hyprlang-0.3.2
-	>=dev-libs/wayland-protocols-1.36
-	>=gui-libs/hyprutils-0.1.2
-	x11-libs/xcb-util-errors
-"
-BDEPEND="
-	${WLROOTS_BDEPEND}
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
-	app-misc/jq
-	dev-build/cmake
-	>=dev-util/hyprwayland-scanner-0.3.9
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
-
-src_prepare() {
-	# skip version.h
-	sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature legacy-renderer legacy_renderer)
-		$(meson_feature systemd)
-		$(meson_feature X xwayland)
-		$(meson_feature X wlroots:xwayland)
-		-Dwlroots:backends=drm,libinput$(usev X ',x11')
-		-Dwlroots:xcb-errors=disabled
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	# First install everything except wlroots to avoid conflicts.
-	meson_src_install --skip-subprojects wlroots
-	# Then install development files (mainly wlroots) for bug #916760.
-	meson_src_install --tags devel
-}
diff --git a/gui-wm/hyprland/hyprland-0.41.2.ebuild b/gui-wm/hyprland/hyprland-0.41.2.ebuild
deleted file mode 100644
index 9c3bfc3cf5cb..000000000000
--- a/gui-wm/hyprland/hyprland-0.41.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
-HOMEPAGE="https://github.com/hyprwm/Hyprland"
-
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
-else
-	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-source"
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="X legacy-renderer systemd"
-
-# hyprpm (hyprland plugin manager) requires the dependencies at runtime
-# so that it can clone, compile and install plugins.
-HYPRPM_RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	dev-build/meson
-	dev-libs/libliftoff
-	dev-vcs/git
-	virtual/pkgconfig
-"
-# bundled wlroots has the following dependency string according to included headers.
-# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
-# enable x11-backend with X and vice versa
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-1.22
-	media-libs/libglvnd
-	|| (
-		>=media-libs/mesa-24.1.0_rc1[opengl]
-		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
-	)
-	>=x11-libs/libdrm-2.4.114
-	x11-libs/libxkbcommon
-	>=x11-libs/pixman-0.42.0
-	media-libs/libdisplay-info:=
-	sys-apps/hwdata
-	>=dev-libs/libinput-1.14.0:=
-	sys-auth/seatd:=
-	virtual/libudev:=
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-errors
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-		x11-base/xwayland
-	)
-"
-WLROOTS_RDEPEND="
-	${WLROOTS_DEPEND}
-"
-WLROOTS_BDEPEND="
-	>=dev-libs/wayland-protocols-1.32
-	dev-util/hyprwayland-scanner
-	virtual/pkgconfig
-"
-RDEPEND="
-	${HYPRPM_RDEPEND}
-	${WLROOTS_RDEPEND}
-	dev-cpp/tomlplusplus
-	dev-libs/glib:2
-	dev-libs/libinput
-	>=dev-libs/wayland-1.20.0
-	>=gui-libs/hyprcursor-0.1.9
-	media-libs/libglvnd
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	X? (
-		x11-libs/libxcb:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	${WLROOTS_DEPEND}
-	>=dev-libs/hyprland-protocols-0.3
-	>=dev-libs/hyprlang-0.3.2
-	>=dev-libs/wayland-protocols-1.36
-	>=gui-libs/hyprutils-0.1.5
-"
-BDEPEND="
-	${WLROOTS_BDEPEND}
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
-	app-misc/jq
-	dev-build/cmake
-	>=dev-util/hyprwayland-scanner-0.3.8
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
-
-src_prepare() {
-	# skip version.h
-	sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature legacy-renderer legacy_renderer)
-		$(meson_feature systemd)
-		$(meson_feature X xwayland)
-		$(meson_feature X wlroots:xwayland)
-		-Dwlroots:backends=drm,libinput$(usev X ',x11')
-		-Dwlroots:xcb-errors=disabled
-	)
-
-	meson_src_configure
-}
diff --git a/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
index 0c9148aefe21..5d99847819ad 100644
--- a/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-source"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="BSD"
diff --git a/gui-wm/hyprland/hyprland-0.43.0.ebuild b/gui-wm/hyprland/hyprland-0.43.0.ebuild
new file mode 100644
index 000000000000..dbc6bd85587e
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.43.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
+HOMEPAGE="https://github.com/hyprwm/Hyprland"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-source"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="X legacy-renderer systemd"
+
+# hyprpm (hyprland plugin manager) requires the dependencies at runtime
+# so that it can clone, compile and install plugins.
+HYPRPM_RDEPEND="
+	app-alternatives/ninja
+	dev-build/cmake
+	dev-build/meson
+	dev-vcs/git
+	virtual/pkgconfig
+"
+RDEPEND="
+	${HYPRPM_RDEPEND}
+	dev-cpp/tomlplusplus
+	dev-libs/glib:2
+	dev-libs/libinput
+	>=dev-libs/wayland-1.20.0
+	gui-libs/aquamarine
+	>=gui-libs/hyprcursor-0.1.9
+	media-libs/libglvnd
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/libXcursor
+	X? (
+		x11-libs/libxcb:0=
+		x11-base/xwayland
+		x11-libs/xcb-util-errors
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/hyprland-protocols-0.3
+	>=dev-libs/hyprlang-0.3.2
+	>=dev-libs/wayland-protocols-1.36
+	>=gui-libs/hyprutils-0.2.1
+"
+BDEPEND="
+	|| ( >=sys-devel/gcc-14:* >=sys-devel/clang-18:* )
+	app-misc/jq
+	dev-build/cmake
+	>=dev-util/hyprwayland-scanner-0.3.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
+		eerror "Hyprland requires >=sys-devel/gcc-14 to build"
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile Hyprland!"
+	elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
+		eerror "Hyprland requires >=sys-devel/clang-18 to build"
+		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		die "Clang version is too old to compile Hyprland!"
+	fi
+}
+
+src_prepare() {
+	# skip version.h
+	sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature legacy-renderer legacy_renderer)
+		$(meson_feature systemd)
+		$(meson_feature X xwayland)
+	)
+
+	meson_src_configure
+}
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 087e0987105b..31664e318dd9 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -28,7 +28,6 @@ HYPRPM_RDEPEND="
 	app-alternatives/ninja
 	dev-build/cmake
 	dev-build/meson
-	dev-libs/libliftoff
 	dev-vcs/git
 	virtual/pkgconfig
 "
diff --git a/gui-wm/tinywl/tinywl-0.18.0.ebuild b/gui-wm/tinywl/tinywl-0.18.0.ebuild
index a08f405dff3d..706d1f95c099 100644
--- a/gui-wm/tinywl/tinywl-0.18.0.ebuild
+++ b/gui-wm/tinywl/tinywl-0.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~x86"
 	S="${WORKDIR}/wlroots-${PV}"
 fi
 
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index d2482b440895..74a3981aec2f 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1 +1,2 @@
 DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
+DIST wayfire-0.9.0.tar.xz 875584 BLAKE2B d7f07d7ff8a54437dc5b69e27dcfadecbd3426993e88f68f4af376bbbde08c8ea76646a361d4228ae8ee21e03c3ebe5562b80ec9d3aecde03fb653135fec8645 SHA512 572bfbe1821490842eae33285a0a5607f70b96b0d5b994246ffe6f0bd74ef03d8d699f3f429bff4d376a0a9390312aa67332e8f614fefa2400e0b844b2d74ab9
diff --git a/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
new file mode 100644
index 000000000000..c769a4516c16
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/938288
+https://github.com/WayfireWM/wayfire/pull/2441
+
+--- a/src/api/wayfire/object.hpp
++++ b/src/api/wayfire/object.hpp
+@@ -4,6 +4,7 @@
+ #include <typeinfo>
+ #include <memory>
+ #include <string>
++#include <cstdint>
+ 
+ #include <wayfire/nonstd/observer_ptr.h>
+ 
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
index 886e64833e05..8f2348141cc5 100644
--- a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
+++ b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
@@ -61,6 +61,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch"
+	"${FILESDIR}"/${P}-fix-gcc-15.patch
 )
 
 src_prepare() {
diff --git a/gui-wm/wayfire/wayfire-0.9.0.ebuild b/gui-wm/wayfire/wayfire-0.9.0.ebuild
new file mode 100644
index 000000000000..4d9595e505b1
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.9.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="compiz like 3D wayland compositor"
+HOMEPAGE="https://github.com/WayfireWM/wayfire"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
+	SLOT="0/0.10"
+else
+	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+IUSE="+dbus +gles3 test X"
+RESTRICT="!test? ( test )"
+
+# bundled wlroots has the following dependency string according to included headers.
+# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
+# enable x11-backend with X and vice versa
+CDEPEND="
+	dev-cpp/nlohmann_json
+	dev-libs/glib:2
+	dev-libs/libevdev
+	dev-libs/libinput:=
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.12
+	gui-libs/wf-config:${SLOT}
+	gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?]
+	media-libs/glm
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? ( sys-apps/dbus )
+	X? ( x11-libs/libxcb:= )
+"
+
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-cpp/doctest )
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	local dbusrunsession=$(usev dbus dbus-run-session)
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \
+		"${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:" \
+		"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test tests)
+		$(meson_feature X xwayland)
+		$(meson_use gles3 enable_gles32)
+		-Duse_system_wfconfig=enabled
+		-Duse_system_wlroots=enabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobin "${T}"/wayfire-session
+
+	insinto "/usr/share/wayland-sessions/"
+	insopts -m644
+	doins wayfire.desktop
+	doins "${T}"/wayfire-session.desktop
+
+	insinto "/usr/share/wayfire/"
+	doins wayfire.ini
+
+	insinto "/etc"
+	doins "${FILESDIR}"/wayfire.env
+}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index bce466406ffd..4d9595e505b1 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-	SLOT="0/0.9"
+	SLOT="0/0.10"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
@@ -29,7 +29,7 @@ CDEPEND="
 	dev-cpp/nlohmann_json
 	dev-libs/glib:2
 	dev-libs/libevdev
-	>=dev-libs/libinput-1.7.0:=
+	dev-libs/libinput:=
 	dev-libs/wayland
 	>=dev-libs/wayland-protocols-1.12
 	gui-libs/wf-config:${SLOT}
diff --git a/kde-apps/akonadi-calendar-tools-common/Manifest b/kde-apps/akonadi-calendar-tools-common/Manifest
new file mode 100644
index 000000000000..5516a55e6b5d
--- /dev/null
+++ b/kde-apps/akonadi-calendar-tools-common/Manifest
@@ -0,0 +1 @@
+DIST akonadi-calendar-tools-24.08.0.tar.xz 264900 BLAKE2B 6d8c6dd6ce2a1e92cf36405f81d90e676a31ae01db4ab86047ccba1418098c597021fdf698b46eca514de81dca61b768adf9b255f07b4194b58829bb68bd553e SHA512 a29abacbd77396ed2a9c7fa9e6104e28d6b2c47186e05c91ed8f32abc5451438b74c28ecbea157dcc686853a797b2fffc524857996613d4579d73f5c60070436
diff --git a/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.08.0.ebuild b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.08.0.ebuild
new file mode 100644
index 000000000000..0a0bb03bd6c4
--- /dev/null
+++ b/kde-apps/akonadi-calendar-tools-common/akonadi-calendar-tools-common-24.08.0.ebuild
@@ -0,0 +1,17 @@
+# 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/metadata.xml b/kde-apps/akonadi-calendar-tools-common/metadata.xml
new file mode 100644
index 000000000000..684b4d954c41
--- /dev/null
+++ b/kde-apps/akonadi-calendar-tools-common/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>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/akonadi-calendar-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index c644f6469be0..0f21cb70fced 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-calendar-23.08.5.tar.xz 476140 BLAKE2B dda14574c4bb1845ea2162ae3941e529cf7cbf593da850458d9d028b136876d9f1ce930ba5b7280432fe379fb7cb6db247ebcedef7205fbc36690bd7feab7930 SHA512 28b8bf932f800d2989863bdf169149ac1e5341ffb1255d836c2344968d22e16ecf44610696ccd00ce113293c77e594e96666056ec310d13d3e866b0e928d68fd
 DIST akonadi-calendar-24.05.2.tar.xz 512132 BLAKE2B bc0db73bc8a31b6664680bac9671241112af4400946f8cfb36c859c8694fe0d24a3579a5a40ff90d1b2c057abb7f210ebdfd83e517be6523ebf796928a457f50 SHA512 54f9802e7521a789b4ad492cf4bd6e5d0b0a173109ab26a3fb9394a5909de7d1bc509e730df94eb08ff6495a0e2d63f7a2139bf91b1fa02d0f09d2e03f890e41
+DIST akonadi-calendar-24.08.0.tar.xz 520976 BLAKE2B e93f61985f840113852abd0036b4e5cdac1cb0a857d2ef6b2ba620a311f8bcb778db6c1442acea7e594fd4e0540c3c759b811e70f8009f41f81aaaed2ee191f3 SHA512 d1d9595d82d1780b98788ec4ce2e3ea9b615c985a6f7679677f3711d679330caa26767e5a23073b11453f0d39f4ddf33ad7706543740e3fa52824b5e10f1c155
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.05.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-24.05.2.ebuild
index a8445a29033f..fa45dab57049 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-24.05.2.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-24.08.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-24.08.0.ebuild
new file mode 100644
index 000000000000..6996533b240f
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-24.08.0.ebuild
@@ -0,0 +1,48 @@
+# 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.5.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/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 e1c319a2eff4..4e6adad0fcfc 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-contacts-23.08.5.tar.xz 420904 BLAKE2B 8292b4ed461826a06884a891501e3c58967b1512181688e0bee739ca324bea727c4ea58978b1df51db8647fab5b52acdecaf479f88e12747a586eeefded568bb SHA512 d74eb885d8cfd748337fc7881c6e8bdb5dbd8dddd899fd7ca4e2dd88b3701ff2c0f1e29bd5dde0246b54fa40f6d719814087b898518bed73da264ee402cbb9ad
 DIST akonadi-contacts-24.05.2.tar.xz 427020 BLAKE2B ecfe4415fb52670b751cefa84901d97ddf7e98e902d6ef369319c0c2bcf44aad878ea033fa84102bc2ae38f04afdf0aa38551728cc85361deda98a4ec4d52b4d SHA512 a69fac52195e3385c81ffe055950799b590a04a743e1adb7771e1279a07c1bbfc9be37235e94ca1b5c5420a243eb246c7571839680f63b02b326f733f0f625ac
+DIST akonadi-contacts-24.08.0.tar.xz 432680 BLAKE2B 76dd36c284b45691ab55e95a6232652d26c419feb776efb5e6c1efc2169011b8355045840c93f89f35a962b9af48d8068f6fd4dfa46b2692debedc6067aa8922 SHA512 27f191775dda79a1dbb11a98b844e043666f0f4e94ab67af00a9cb6529f368bb61d104cf8db8481da6e8cc6e340292706b43d27ad9d69cebc3a33e5529a27b9e
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.05.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.05.2.ebuild
index 3942ac803e5b..ec5b6177cbfd 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.05.2.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for akonadi contact integration"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.08.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.08.0.ebuild
new file mode 100644
index 000000000000..dbe59a698051
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.08.0.ebuild
@@ -0,0 +1,44 @@
+# 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.5.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/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 6d320206c376..13ebf4eb7773 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-import-wizard-23.08.5.tar.xz 515068 BLAKE2B 787ce65a7f72902be253d7629adf01fe081ae78537eab7a1d53b2bdab74f91926910c0271995607272dee620f362fc677f0cf26c823e4f176746827b650d62cb SHA512 6fcc714eae5093352a4476938fe7f08698dc712b07d5276a8c491ae367b9cb3dad3f0ba6823696c8902dd665dcebaf64e1754ec85f11a6475df9c6b77cea7eba
 DIST akonadi-import-wizard-24.05.2.tar.xz 488348 BLAKE2B 75f8f809762c8031e73b49f6646ebfa0448c24c72b2c98c0c6d1d548f07d3c957451d1b4fb152d50af31868f0ee0f5f4dad221ab104daf44130fe8e53ed67500 SHA512 9fa285a0ed241d7921c7a69232386a7ed5c5598676127866156ad29adee3b71668ffba04275c5d46134ec2e8c5a49ca669cfc231a7d8e9175e96fb93f3df78b6
+DIST akonadi-import-wizard-24.08.0.tar.xz 489032 BLAKE2B 521f4ad84b5bcbc3f99ae2fdf37c3232565b94c383d0ba6a38428ccfd52fa0f88e769eb99b3cf7cabfdb45479654550fa8960b99f34a8b22497e94439f05388a SHA512 f38c5e8097c976714666e4762e7bfa85d46a953a3f7473fa0b230eac4dd3c9c36d009060d8e26b4f3e1049e0b9ea239b9ffe061d88a202834a2be308d6ad9f92
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.05.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.05.2.ebuild
index cec1fc4368e4..ee4c3c1fd4e4 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.05.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.08.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.08.0.ebuild
new file mode 100644
index 000000000000..8d49951a0f18
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-24.08.0.ebuild
@@ -0,0 +1,42 @@
+# 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="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 605e6d6c9f6b..aaf62dfabb35 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-mime-23.08.5.tar.xz 166996 BLAKE2B 5cb74bf62b08b84f6431d9e2e69f19b76a0c1b4ac7e440093531aa72496865fa4b97b92e81ae6193af864a38ba8381ddade691cf884da7c3e7dc53ff35759417 SHA512 d18d94e8359f734f9b3a1f5beb2c3bd5d23e956c283a3f06252a2c0080e097273c684fc1518611c624890b95afd4fa766843830e506d45c0b1ad1820bcd32619
 DIST akonadi-mime-24.05.2.tar.xz 172352 BLAKE2B b954a7c3cede3fcd39f7bcd394c337b9538cb06ff90f813c351b734cde7e75f7e2fe6b64db20c85e582532b4d6adab37950026478c08ea8fd476e2e8439f82c6 SHA512 4d35456434758d0fd76595247e780dee3066516f74a3f35fa8c914ae63da671f576d00be2f60738f5480d7e9b31dff62644a74136f308a92f7f651c422cf448e
+DIST akonadi-mime-24.08.0.tar.xz 173224 BLAKE2B 6cab725cdf81c9824818b544ff99bdfbdd8454a2a99ff937ed77ac31c8d87d100a621b9440817e16269f08649ef4e5839f5d2426d5eda2c6be7f587f833f1de8 SHA512 e8cc8c420423cf76e5195f02e0d52b0af339ebdbf9bd38ccf39f482e5deb313164dfe5bc631c2fe8beec7a6aaf0798f8e04987db83509fda230dc91aba4f1c09
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.05.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-24.05.2.ebuild
index 5155ef196a67..e3351dd824f8 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-24.05.2.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for akonadi mime types"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-mime/akonadi-mime-24.08.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-24.08.0.ebuild
new file mode 100644
index 000000000000..99db6b690592
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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.5.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-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 4c5516aa4626..96955d904d7d 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-notes-23.08.5.tar.xz 28576 BLAKE2B aff516702fb2605a51da13b679d97d17784d96b95f0ee77a980fe69583ceea3b018131c0b6f1704b984c0e3f4b0f98fc9e35063f6a4bacb13aec49f8c8ee8190 SHA512 d2019ec24e1e9e306e7c449898cc3bb07edf30dbd611efd1f8ed987e9bc44bfa0116e4974fb860d7212052f6b153513d2d4ce53492c078e7599c509ae05c6a50
 DIST akonadi-notes-24.05.2.tar.xz 28364 BLAKE2B 94d97e654f85bddb33494b1c07ac2b974dc2de19d464ed9bd2c6db12d1b6cfc558def379adfd0d99d59ef7e96617aea28b73497ae72ff74d097a3ef2d6ae4ed3 SHA512 d5a08d25a2f32196e53e3bd0a75e8919020b8d52a469438d62b27e0ff782e04d692684395a0664a5c87bba288d3c243f38498fc5494ebf53041baf095a573192
+DIST akonadi-notes-24.08.0.tar.xz 28708 BLAKE2B c65419ef6985f96d5ce5657e3919f169e7515ce2f298709501fb006d044309d73401d62f24a78470eb895381641b0d7146e2dedda8acfa25fe4d787c13952b0c SHA512 ea8deda4440f8cbdfd110a829ca06ac41979fb742df8d6498b616bb2d28fd8e7d9f955eba125fb2eb690e91cd432cdcef2077f2260097a7a018c6022b02837b1
diff --git a/kde-apps/akonadi-notes/akonadi-notes-24.05.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-24.05.2.ebuild
index 461f8e0d4738..35c5e647ff55 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-24.05.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for akonadi notes integration"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-notes/akonadi-notes-24.08.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-24.08.0.ebuild
new file mode 100644
index 000000000000..5ae0f6db0ce0
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-24.08.0.ebuild
@@ -0,0 +1,25 @@
+# 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.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Library for akonadi notes integration"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,xml]
+	>=kde-apps/kmime-${PVCUT}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 952a642ef0f7..216bdadfeeff 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-search-23.08.5.tar.xz 110248 BLAKE2B a3a00b36546a91fc4f7d7337f31fa898568c8093709c442bfda95ea38c186426e4f4ef16ad828f7972e061c64565463709cea3be863bf925bb6b00c55333909b SHA512 e2d6321401eaa1b017061ef90cac080ba06be62868cdbdf65d449eb3e568d2223d7a60ffbe7b7c48c04cfc5e5c8a0cb6d243e4fd0967e575f36e6ae52405f57e
 DIST akonadi-search-24.05.2.tar.xz 112576 BLAKE2B e362e9a699459ce145cdfcf18fe5112f047d0b09f192698bc9f8cf03ff159efd0222928187a1796ef668fe808521395016f40c9d03a049db8955991093357e40 SHA512 1e30877e291f2c57a9b7444ea452353e3d91987d40cdf817e920d0a59c25574b815c1c1e2d9510e8512d3341408cffaaf116f0320afada64f777ebd80badeb41
+DIST akonadi-search-24.08.0.tar.xz 113000 BLAKE2B e641bbee395132b8df9b808388b055133a8916f40fc5f570c6bca1244df0bad27cf14b7aa00842dd99b09cb34a69bac450038b397b2a95582daf96dc9973162a SHA512 11b9e390aa15cace5f28e0ab0d19eecad52ee02356493896f783d82a9131d2a49dc4a00d3ed017929ad670948d2a9a071778dd7afabceb731fd19157fbba3c00
diff --git a/kde-apps/akonadi-search/akonadi-search-24.05.2.ebuild b/kde-apps/akonadi-search/akonadi-search-24.05.2.ebuild
index ca4df9c48f9c..9dfd8ae73518 100644
--- a/kde-apps/akonadi-search/akonadi-search-24.05.2.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi-search/akonadi-search-24.08.0.ebuild b/kde-apps/akonadi-search/akonadi-search-24.08.0.ebuild
new file mode 100644
index 000000000000..6dd9c4ce20a0
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-24.08.0.ebuild
@@ -0,0 +1,54 @@
+# 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.5.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-${PVCUT}:6[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 009f1147b6aa..c074ad723061 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-23.08.5.tar.xz 1662512 BLAKE2B 4e52e2b09e7f0376f7d63fdb590ba0372eb515b7f033d97d8fb76e1e85f9b598775936828d8c9b524807824d88cc9de93ea0efc445009e96f361f754ccd96d44 SHA512 3c1e851b519d8808b7be95b980d362eb525ec61ed06122be3795ba6b6a831aa80c77d799608686a49716a98a8bb9300e70f1c82cfe1de061cdc0af5ad9f30247
 DIST akonadi-24.05.2.tar.xz 1704460 BLAKE2B fd6b37a25d09d4c6b468b81beca0d23f45990debd3f90d594ab357d44111f14c64b5eacce2363c8705ce111a9dd45a97301428645cce31da85d708d59a90c466 SHA512 b161bd826172df4c8eef7ced7f906ac1efc597de5baada90f2bd725818fda89799ef9899da49d666bfe9f3496c91b1bfb647a885f49c3a7a3578ab1d0ce3f690
+DIST akonadi-24.08.0.tar.xz 1702140 BLAKE2B ca0562d073475f8d1c16e5eb5d596a1cc6e30e9fae3f362707e1aff6784a686afec04432f567ff29245e0b925bff84f32d456ef215c27c96312deaa274a7a455 SHA512 e7b54ea48c13569cb293a500ee6ee50026a064c150066554ae092df10796e6c32db1f8d98cda0c927bc59bbd905bba47243c668c9d3c586aecd0f85579af0218
diff --git a/kde-apps/akonadi/akonadi-24.05.2.ebuild b/kde-apps/akonadi/akonadi-24.05.2.ebuild
index 0c28d8b6a4e6..b4e1f82fc457 100644
--- a/kde-apps/akonadi/akonadi-24.05.2.ebuild
+++ b/kde-apps/akonadi/akonadi-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="+mysql postgres sqlite tools +webengine xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
diff --git a/kde-apps/akonadi/akonadi-24.08.0.ebuild b/kde-apps/akonadi/akonadi-24.08.0.ebuild
new file mode 100644
index 000000000000..a5b6fa061b0d
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-24.08.0.ebuild
@@ -0,0 +1,97 @@
+# 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.5.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="+mysql postgres sqlite tools +webengine xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) 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,mysql?,network,postgres?,sql,sqlite?,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.16_p20220803[qt6]
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	ecm_pkg_setup
+}
+
+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
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	ecm_src_install
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index a0d7b0d6e639..ec24bf9cad9f 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1,3 @@
 DIST akonadiconsole-23.08.5.tar.xz 286164 BLAKE2B d98b053e0626272579196b8ba762b51f0734a7a6d40bb7e7fc71fb2752ed986af95e49317eb59159200dab996aa6c53ac2c18532cda378feeee0cf8f47d9e2a2 SHA512 79071e18b0aed574c67b96cdcdc1ce3914ad67fc1e7e87dc77f9cd6396b210034cdc917393fadb918b90ad89bb2326586002fcf711e0432991e59d05bfde8a06
 DIST akonadiconsole-24.05.2.tar.xz 303268 BLAKE2B d0737fcb014b16a0fe3098b5bf7997d44546b64d6d1d2688527c2aa1ef9938ca64ab9259715a488d2bfa6ec548a3a588f7439c38aff6693053b7c5d0aa24e530 SHA512 1dd4ac9975fc9ce16414661d9fdf1d94c92a823ef5ba4ffabb3e12d53f90cb42b2295dc9bb831be1b3600822a112e980f689f201a387a839abecc510b5f4c813
+DIST akonadiconsole-24.08.0.tar.xz 304416 BLAKE2B 170f789c8d7d518163abd4fd002b0931f5534d0ad79f1af6f437226c74b399d58a1ac34816a317437239effc7fcd805b6b542a59ed3fa00cc076b59efe8343f8 SHA512 7d87487dfc7c698c451a1eac467573a4e67d554d35ebe7c4644fe85adbed1bfccb53d2ad7d28749b246c9f8000527bccd97bc4559d05e427dcd16121efe17c46
diff --git a/kde-apps/akonadiconsole/akonadiconsole-24.05.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-24.05.2.ebuild
index 746023238d86..c7b8c587a044 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-24.05.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-24.05.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadiconsole/akonadiconsole-24.08.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-24.08.0.ebuild
new file mode 100644
index 000000000000..250da3df197b
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-24.08.0.ebuild
@@ -0,0 +1,46 @@
+# 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.5.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 ad1e845a49b3..84a342f905e2 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1,3 @@
 DIST akregator-23.08.5.tar.xz 2324604 BLAKE2B e18ddbcb4c45650873cf22667449955226a356f1d4d97dc50f6b6cd5fd40089114decd8890bfcddc3c63b6d9e9a61ba9e595fc2fa5aeb577db0d1e837611cb7d SHA512 5ad1779827d5117d4ee167a02ce77044b9370dde40f2923e52eb85fa33e761f78665644a3a0f5f4cbdb733226127e4db7b2014220b0faee7ca5bd920adb567ed
 DIST akregator-24.05.2.tar.xz 2111264 BLAKE2B 8c4e7e8b3626ce3bec1c7be1a6bde1cd4942db6ddb278336ab1a0abc88e2f275de6dbe8f8ad89f00b56b4f3ea2f9b405875f8e9d5e6a99b6e5ea81f193549107 SHA512 3036e9b17eb57b3dec1160abe756856b98d9f402a661b0d8823b3a9fd000bad15d8a826dc85cf8d944855747b9042dc58cc6c55756c434f96d3bb296d492380d
+DIST akregator-24.08.0.tar.xz 2119540 BLAKE2B 7645b6e301921111cfb5644b8935f9b9d84c656045185f24ba6bb5bab51e92d3beb334b4ac842976d8c070f9554344c49c63481c3dc3cb57f09183eccc507949 SHA512 601b9f2bdce85c2fca9bda56bf99f6f677408985e58d061e093283c173343400f9c1a37d48f4e50610437751b1cbf3ece23db2955c63d71c4ff55097e1414cb3
diff --git a/kde-apps/akregator/akregator-24.05.2.ebuild b/kde-apps/akregator/akregator-24.05.2.ebuild
index db4b5ee59ded..592b7b51fbb7 100644
--- a/kde-apps/akregator/akregator-24.05.2.ebuild
+++ b/kde-apps/akregator/akregator-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/akregator/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="speech telemetry"
 
 RDEPEND="
diff --git a/kde-apps/akregator/akregator-24.08.0.ebuild b/kde-apps/akregator/akregator-24.08.0.ebuild
new file mode 100644
index 000000000000..81da0cfb079f
--- /dev/null
+++ b/kde-apps/akregator/akregator-24.08.0.ebuild
@@ -0,0 +1,61 @@
+# 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="News feed aggregator"
+HOMEPAGE="https://apps.kde.org/akregator/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE="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
+	>=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/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syndication-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(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 88171a637322..de48fadefdae 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,2 +1,2 @@
-DIST analitza-23.08.5.tar.xz 352984 BLAKE2B ac7bb99ddb31fdcd095e0e799ebe215aa115d95560f5aaec16c99136501dd3d68377df402a1fefcedbf096060f2c3f8caaef874005ec2f97befa11aa9f6c46a1 SHA512 6b16a903e1a0579e16dc50b41ba64ea8da47ad7c09faf362c683e8f5b63881c407855c1cd02d8dca231be8387f23a780676315209faf63149b1d3c7c66cd2fcb
 DIST analitza-24.05.2.tar.xz 359956 BLAKE2B 900e577a088b0d520bb6c2ccda52194ec997df2f46e21900a9f877992864a14dc6396b097e04eebfcd93d79cc63f542eae690228bc3c589cbe6fbd115623fa9a SHA512 0466d1339c82ed9a24b6c6880f33dea6108a5797cce257b09387721a4680d4204a0827cd9fb554407bf6332eb9708c83be474c91af2b627996733f3a40196c17
+DIST analitza-24.08.0.tar.xz 359896 BLAKE2B 84b9478998179b1c20ba25e01f6437f4e14cdd9ea91ca524df9745b7df73fd9736c3dcf15b12b4a561e89e127728102f685ce994b9b1e7d54054c6865621bbdf SHA512 f72f2e4c19ea4566a3a1f383e821835ef829c829cee6c65f593b763274cf583e919c93a5b77d1ff95303126c292a564a0275e4ee4cecd9c42a93a05c851b843b
diff --git a/kde-apps/analitza/analitza-23.08.5.ebuild b/kde-apps/analitza/analitza-23.08.5.ebuild
deleted file mode 100644
index 64fde56c2786..000000000000
--- a/kde-apps/analitza/analitza-23.08.5.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"
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE library for mathematical features"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="eigen"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	eigen? ( dev-cpp/eigen:3 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-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/analitza/analitza-24.05.2-r1.ebuild b/kde-apps/analitza/analitza-24.05.2-r1.ebuild
index c60526ffe127..99d99670118b 100644
--- a/kde-apps/analitza/analitza-24.05.2-r1.ebuild
+++ b/kde-apps/analitza/analitza-24.05.2-r1.ebuild
@@ -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.08.0.ebuild b/kde-apps/analitza/analitza-24.08.0.ebuild
new file mode 100644
index 000000000000..e23c1d2a0192
--- /dev/null
+++ b/kde-apps/analitza/analitza-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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="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 5a0f9810dbb5..a850621814eb 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,2 +1,3 @@
 DIST ark-23.08.5.tar.xz 3018696 BLAKE2B 482a17aa9bf72abbaa75510451ba0dd59812d2cd2aca97efda0f4f1c78f98060d9f654efd0387aeae35d5220304f00139520a6836451056b84064cc8d8b12d16 SHA512 8fab4281f5cfe34938f7a958e2889ad4dabff6613b1e3a8fed1efb2039dbf35a71d99494869037fd821515ecfba6e44304bb0907c27afd646fe7496783735336
 DIST ark-24.05.2.tar.xz 3002644 BLAKE2B 9cb3108e528ca1e883445d2160bee25390d2c729cb1057cd48d33b996621421d25ea620380783d3e3b9280e9104f2e16164c6840a43c7e4e08e3ca2df5bb4c7e SHA512 d550c14ee12dc3a20933ee05117839f05f5ff664d63b9570640a1d635ec69cfdccab8f1f25b8a8ee34acd75916f4d8ab60b3c622098432fc276128288e26f534
+DIST ark-24.08.0.tar.xz 3003728 BLAKE2B 0f14e8ce3140aca2b395f6c7914075e375ad5e6f6b120ec9b247e81c75fbd8ad541f58176556e6db0e2153e1c9ffda129de0728403f9871ace0ea4c643c72b76 SHA512 c599c0884d01380dad15b5e320d17be9bf1c823cad7e69a2a1ce829842a2e06facb7fd196d10996c205644b8b372f8cde57f4d1da279c043bd043293311363c4
diff --git a/kde-apps/ark/ark-24.05.2-r1.ebuild b/kde-apps/ark/ark-24.05.2-r1.ebuild
index 54ee01450036..b5c199cc67d3 100644
--- a/kde-apps/ark/ark-24.05.2-r1.ebuild
+++ b/kde-apps/ark/ark-24.05.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="zip"
 
 RDEPEND="
diff --git a/kde-apps/ark/ark-24.08.0.ebuild b/kde-apps/ark/ark-24.08.0.ebuild
new file mode 100644
index 000000000000..74d4475a83cf
--- /dev/null
+++ b/kde-apps/ark/ark-24.08.0.ebuild
@@ -0,0 +1,80 @@
+# 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/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 2f94ca941977..e2024a1c425b 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1 +1,2 @@
 DIST artikulate-24.05.2.tar.xz 1054292 BLAKE2B 0d59199755d6290ae786bbcb4acd0b9c0bf0ec0ebc4750c3be3cea79f85ecee7c6142488f4d41b39f6fe66c017cfd8b6cc6f86957ad73e4366a88bdbde19e371 SHA512 fda74c38ff8f86618745ffa8ec4683522735f95ec38e9d98660ead051140d4f02aa46b2833bdeb80a4bb56f14ca1c15deae79d3c1de7a782c9441c760aadf794
+DIST artikulate-24.08.0.tar.xz 1052184 BLAKE2B 43a2ad47085dfde08d3d7ded488922f7fd3eb201d240d40caa91a205973502f2ca084549d1860c857c60c88d3cecc3763874ca59a6609145f49e15c263552217 SHA512 a633ecd9369941f2d1d4e78f39434c3396d141b7ba23452b0fc6cbc1718e05c276c5998ff69252a87f3a0e53eaa6b65c962d57ebeaeef77d3d602cbbafacfdc7
diff --git a/kde-apps/artikulate/artikulate-24.08.0.ebuild b/kde-apps/artikulate/artikulate-24.08.0.ebuild
new file mode 100644
index 000000000000..c6ef1061765d
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-24.08.0.ebuild
@@ -0,0 +1,46 @@
+# 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/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 840ae930d75e..18bb4e0d91e3 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,2 +1,2 @@
-DIST audiocd-kio-23.08.5.tar.xz 565064 BLAKE2B 6d8997a51b3059d396c9287bb0798c596277cb60fb5b5a53f32516d1c7fa58fb14fbf18820690c1a82604181e3704ac9badb2c4b48b1b19ec4eb78353b5a971f SHA512 33f77983729251b208ed4e1cffd594781c3667d59ccbf07b272fd49bfa8049701965bb9e9b99089c981fcf4cc0bf47cd57ba758febf879592db5ed07636dc391
 DIST audiocd-kio-24.05.2.tar.xz 570468 BLAKE2B c48a7aeec2a4fa4db144975e7ffc38277f636535bf614eb1b48f13223dbfd5e4387e3b5ea231ac7642cd54d6ccfb3e6386a627108e1a6639245c90d4a9aea713 SHA512 42e45c9f6bdd5ff79cee129663d21b5c4862ce927e61e91511abfe96f710f7cd62bcff1671e372da0adc97f8e751595fca491dbe482a21b0a494907f9cb01e71
+DIST audiocd-kio-24.08.0.tar.xz 570536 BLAKE2B e5ca881071c410b33ca6885936a8af95ddbef97b9e76d0e7518df907ddbaa2400a3bd9b28b7b52c4b7587e351742d93b791095c2cd04a607412e5b61b445213a SHA512 cf4382799c6657ef6957bf42575ccc61ccab4e10549b78c333bf6801f96b94a9fd47051c853ce9af066082db8e519bb8efade8cbcf9e2d02442ad7cd5f0e71f4
diff --git a/kde-apps/audiocd-kio/audiocd-kio-23.08.5.ebuild b/kde-apps/audiocd-kio/audiocd-kio-23.08.5.ebuild
deleted file mode 100644
index 8e13278075bb..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-23.08.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
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker for accessing audio CDs"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=kde-apps/libkcompactdisc-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	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.05.2.ebuild b/kde-apps/audiocd-kio/audiocd-kio-24.05.2.ebuild
index 6c7bf675f315..2a8db84ec665 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-24.05.2.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KIO worker for accessing audio CDs"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-24.08.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-24.08.0.ebuild
new file mode 100644
index 000000000000..7c967d61c1fd
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-24.08.0.ebuild
@@ -0,0 +1,48 @@
+# 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
+	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 50174e36504a..f50dcd0f5f3f 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,2 +1,3 @@
 DIST baloo-widgets-23.08.5.tar.xz 276852 BLAKE2B 10ff4484b9e57dcbbaaf0bb37bddca2e47244444f1b2dd6f5d93edfe7dc1f3f68575be8daebed7ed0924d31076d0e9730c37c1ef78b9873f28c06a4554842278 SHA512 8876c93dc119763bd6027cfcd0d122af5a308074743c75b1142a285882ce134f5c9ec9003f103fbd35b038865bba5ab14ab839e1b294834c027157c93e0476d5
 DIST baloo-widgets-24.05.2.tar.xz 277120 BLAKE2B 03f6faace9d623ad085032078c4bae48b1d3ffc4521f69efbce380520555e1d27b34b457ebbcc4d21b7890bc18ef1f5eca1dfff49550f43527617a9c55a98361 SHA512 f15799819eaa2ef679ff97ea46e0e1cb8c91dfbe5c880ec8510c9d50b091e0c7e83473ac9f2debd49ec4d2f94b83beb44287f778b23e798ecee1c4f2a376d466
+DIST baloo-widgets-24.08.0.tar.xz 277236 BLAKE2B a5688d661e39bf7a8757e2997eb656b8c8c79412db725ffd05a23ef9a7decab1a5881f2e4215f287e80b397cdc3ffa7c71c7351592659ad623a1369e0defee3f SHA512 3bb663f20bdded1ecbbe0318feb428b66595c7fe2b714fd6f689d6691a32bc28b828220218c75b10c540b7b18e4afc7ae5f5eb4afa0cae7fc6f0d9109311f940
diff --git a/kde-apps/baloo-widgets/baloo-widgets-24.05.2.ebuild b/kde-apps/baloo-widgets/baloo-widgets-24.05.2.ebuild
index e132e4a9f19e..990932cdbbfe 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-24.05.2.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-24.05.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Widget library for baloo"
 
 LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/baloo-widgets/baloo-widgets-24.08.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-24.08.0.ebuild
new file mode 100644
index 000000000000..2acdd9901ce6
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/blinken/Manifest b/kde-apps/blinken/Manifest
index aafbbc3c1a81..6438ea03887a 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,2 +1,2 @@
-DIST blinken-23.08.5.tar.xz 2725548 BLAKE2B 6a39fcccfb199633fa9e138c91d900f67ae3fce840e99964583e3f46d77e75d5f9632233f1967971ca3cb2926cdd299217d228d30c80941d47927a50b0f3ff8a SHA512 297f2116cf775a6d3bbf1cd4e8e515de5aa5be63a9e66a49fa43874d70ce3e09cb9e0062cf3a1450f14c47d018e65cb31e5f0c7d4a818204bb0d41eb7d8ea226
 DIST blinken-24.05.2.tar.xz 2593812 BLAKE2B cbf8ca0180215fc794c4374e8bf74a85eeb8234336a3154eb629712faf9e96cda330b5a3f893ae7b138a5fd47280dc39994cd55a41fa220accb96cc12e6538b9 SHA512 44a83a807961815228f783bad47d59838d5b448e91aa509b4965cc68f67a6f29c0e1d5b8b7d991c7cd826bc283443e540a0c680fdcbf861101c465c149f53b43
+DIST blinken-24.08.0.tar.xz 2594796 BLAKE2B b25bbb592b5e9e9ad2097f27b8f62877c44ad19f9f699bf2e665342c194c3c3e54894dc1e8594c48fe3ec2d7f457c824e4d8aaac8c9cd6d554ce6f1407070d3e SHA512 fc4a982c2dc2665cc141e9efdbd05a4029e4c953f61e76556033d6ff9586da27ff18c09a57f3815a626b1962357ec06deca12a72723e4d1c7f81b0706e093eaa
diff --git a/kde-apps/blinken/blinken-23.08.5.ebuild b/kde-apps/blinken/blinken-23.08.5.ebuild
deleted file mode 100644
index 0972ecdcd9f7..000000000000
--- a/kde-apps/blinken/blinken-23.08.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Memory enhancement game based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/blinken/ https://edu.kde.org/blinken/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/blinken/blinken-24.05.2.ebuild b/kde-apps/blinken/blinken-24.05.2.ebuild
index 1e1844dc2df6..5d9ebed5179d 100644
--- a/kde-apps/blinken/blinken-24.05.2.ebuild
+++ b/kde-apps/blinken/blinken-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/blinken/ https://edu.kde.org/blinken/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/blinken-24.08.0.ebuild b/kde-apps/blinken/blinken-24.08.0.ebuild
new file mode 100644
index 000000000000..05b25a82fdae
--- /dev/null
+++ b/kde-apps/blinken/blinken-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/ https://edu.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 b77733e370dd..230365c51dde 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,2 +1,3 @@
 DIST bomber-23.08.5.tar.xz 840136 BLAKE2B 44e7dce593e972232512001676cb6edc34abb64a053112a7dc5ef65175c3cf876091e09b5d529bfdf77825215b4afcba456ee6e5af15ce75fa397efcb29eb53a SHA512 094c1528bd2c5fe0ee449622760da66c73a8446e8c349ee777e41e7ae16bb801a5952ca867073662b49ee8343da12066f3e0c6394ef94d53b5d38d37237c9641
 DIST bomber-24.05.2.tar.xz 839820 BLAKE2B 1588727ad29830b7295eb936caf730639739859bd324a87ef31780a5137e9bacb6bd737799cbf5bdbf126a72dd19acb1ad8a03bc3bb3b863b5432b7ec4b421f0 SHA512 fceb48f41b4d94ff49989d88b4fcfcb90b2129e74121406764c3488d6622b94308fb264d232d799356321b93e68d016db9a3ce8e36121274f58bef7b367b55df
+DIST bomber-24.08.0.tar.xz 838480 BLAKE2B 065ff39decc70044883ab5e2fdc8e3f4811c21079e46c5c136df1be94943136e03206f4e97582eefa1a2e3bbd7c01bab433a22b6a5771eed34fae26c85a4f32f SHA512 dd6291e8761bfc645c0774551629a3f6e1a7a789b48b989ab0814446e86d052fb88f0287a4f0ea3b3cb52edf3b8e6a4de23bc66aa3a4fb026e3546b35fb202bd
diff --git a/kde-apps/bomber/bomber-24.05.2.ebuild b/kde-apps/bomber/bomber-24.05.2.ebuild
index fdf01d17227d..c8d337ec4010 100644
--- a/kde-apps/bomber/bomber-24.05.2.ebuild
+++ b/kde-apps/bomber/bomber-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bomber/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/bomber-24.08.0.ebuild b/kde-apps/bomber/bomber-24.08.0.ebuild
new file mode 100644
index 000000000000..ec9924045eb5
--- /dev/null
+++ b/kde-apps/bomber/bomber-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/bovo/Manifest b/kde-apps/bovo/Manifest
index c219634ff2ff..b564aa019cbb 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,2 +1,3 @@
 DIST bovo-23.08.5.tar.xz 216552 BLAKE2B 7be1dc18b3fe952ffe558661f03b73528fdcaf9c7f75d1527cb55d3b7e72a1dd20425607e6a738edec28fb61ae341f791a85c2efdb80a9070d1e9c3cf93ddc71 SHA512 cdfce78158ae60c94f2f9c98028e90d07e07cc3f0371126baae1f15aab9b64ef06e860c89786619259fab73bd709d3af0a6f5f0a1bfeecd45aa75ab01eecf770
 DIST bovo-24.05.2.tar.xz 216216 BLAKE2B 51abc005ddb551dfd1ad4bed41fe910cd1bef635e65dd7cc2fa43324c847ee30ec62cd0c40cd198a973556ca291d29c122db70e502cf631cdb1966d4161cc498 SHA512 41389acf60725a4141fdb1890999af19da6c871e2c574e6f63cdf45be3791e28ef0504bb840f5c2075e62b4d0fdf7bee417ccb8ff5e9f41f9a7ad4fdb28719e1
+DIST bovo-24.08.0.tar.xz 217648 BLAKE2B 0471a3bac76d16c74a1ef320742684dbc4158c062bd56f2546e3936786ccdd3cdf293ae4bd4f669779866d10e510201161214b17c5ff2d1aa3757e41d8395c83 SHA512 3c723e66385afde9df10159b4f747dfc5cc26d17bf4252b996500e46565843ab07b172ea3733b23d009ee5d6b923581c372b23a84f6f46c98b982ef64d4fb9fc
diff --git a/kde-apps/bovo/bovo-24.05.2.ebuild b/kde-apps/bovo/bovo-24.05.2.ebuild
index 70494bb9ee01..48d6d8cdcef5 100644
--- a/kde-apps/bovo/bovo-24.05.2.ebuild
+++ b/kde-apps/bovo/bovo-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bovo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/bovo-24.08.0.ebuild b/kde-apps/bovo/bovo-24.08.0.ebuild
new file mode 100644
index 000000000000..1052502fc3e3
--- /dev/null
+++ b/kde-apps/bovo/bovo-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 75b8bc816bc1..1da3f0ede2c0 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-calendar-tools-23.08.5.tar.xz 255924 BLAKE2B 9270cc942f35b06bcc7f16d28f6c426a35683cf344d1837a5e51542cbd6502256f7ba58f3768b16356e445982e287fada396fd36dba6e9d45fb822fb2947d5a5 SHA512 9dccd51cf1004d639c0f02fc7e5ebed71093ca375a2895a301723762a073644b565930f9ee4cf663195db87370497b976ecf216dcf8c1d67bd00481f9e7a2082
 DIST akonadi-calendar-tools-24.05.2.tar.xz 264420 BLAKE2B a1c50f709ef1faec77b7b7e10e822d794aaff7de41f2c941e87f2cfd760da9be1c7d7048dc6aa305e356016baff55afdd63547962cdad5dfac503a60ec852311 SHA512 1bc632cd7787d5d45f4a0b350e20dd4e36b0a659954c3098ea050cf827ab814f67cf0441e2e4818d225b22fcd2b7c3e51eb08fee823f4333d107d4366e4caed3
+DIST akonadi-calendar-tools-24.08.0.tar.xz 264900 BLAKE2B 6d8c6dd6ce2a1e92cf36405f81d90e676a31ae01db4ab86047ccba1418098c597021fdf698b46eca514de81dca61b768adf9b255f07b4194b58829bb68bd553e SHA512 a29abacbd77396ed2a9c7fa9e6104e28d6b2c47186e05c91ed8f32abc5451438b74c28ecbea157dcc686853a797b2fffc524857996613d4579d73f5c60070436
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.05.2-r1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..ae933e962f4c
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.05.2-r1.ebuild
@@ -0,0 +1,41 @@
+# 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.3.0
+QTMIN=6.6.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}"
+
+PATCHES=( "${FILESDIR}/${P}-loggingcategory.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory doc konsolekalendar
+
+	# delete colliding konsolekalendar translations
+	rm -f po/*/konsolekalendar.po || die
+	rm -rf po/*/docs/konsolekalendar || die
+}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.05.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.05.2.ebuild
deleted file mode 100644
index eee1001db359..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-24.05.2.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" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.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}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	rm -f po/*/konsolekalendar.po || die
-	rm -rf po/*/docs/konsolekalendar || die
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.08.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.08.0.ebuild
new file mode 100644
index 000000000000..4c96cf694ffb
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-24.08.0.ebuild
@@ -0,0 +1,40 @@
+# 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.5.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/files/calendarjanitor-24.05.2-loggingcategory.patch b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
new file mode 100644
index 000000000000..e9796c334280
--- /dev/null
+++ b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
@@ -0,0 +1,50 @@
+From 1c10a1418a063d625dce2fc1a5714b82f9cee728 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Aug 2024 16:02:27 +0200
+Subject: [PATCH] Move ecm_qt_install_logging_categories to konsolekalendar
+ subdir
+
+None is declared in calendarjanitor.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                 | 6 ------
+ konsolekalendar/CMakeLists.txt | 5 +++++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d887d81..f79b923 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,12 +79,6 @@ endif()
+ add_subdirectory(calendarjanitor)
+ add_subdirectory(konsolekalendar)
+ 
+-ecm_qt_install_logging_categories(
+-        EXPORT AKONADICALENDARTOOLS
+-        FILE console.categories
+-        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+-        )
+-
+ add_subdirectory(doc)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+ ki18n_install(po)
+diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt
+index c0b0eab..7e90f6c 100644
+--- a/konsolekalendar/CMakeLists.txt
++++ b/konsolekalendar/CMakeLists.txt
+@@ -44,6 +44,11 @@ target_link_libraries(konsolekalendar
+ 
+ install(TARGETS konsolekalendar  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++ecm_qt_install_logging_categories(
++        EXPORT AKONADICALENDARTOOLS
++        FILE console.categories
++        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
++        )
+ 
+ ########### install files ###############
+ 
+-- 
+2.45.2
+
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 420c19931b87..6cfad86e8ed1 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1,3 @@
 DIST calendarsupport-23.08.5.tar.xz 997896 BLAKE2B 43ad1a0aecc041dc003e0f43454d059ee2933a7906fcd530a7ece5cf99f5a17028773b621005f4a05d4d3773ee115f23ff71e5f0c4a699ef9775d7be7f2c72db SHA512 b356489bad193bfa27f44403faaa0de7beaa4a3559e5f178b20c091274e607ee2c5fa7ef60f18a0c9e4bea5b825229a85bcbaa63204aae835555c367c5e8d1d1
 DIST calendarsupport-24.05.2.tar.xz 1000396 BLAKE2B 22228d427a58b7c08dc383b1c2ccb24f13e5bf13c40e588a077e7b20fa4be42224379133c2bab29bdac8ecd2453ed73ccdee50842dd768b52e9899d3fbc35abe SHA512 7c7672556642339f1de4682192809149daab642f2f4338ed43a10597ebd1df11f0919b9e1ae839e2fc60499d2f4367cd4a999c8b038761cdfde54753a20a2368
+DIST calendarsupport-24.08.0.tar.xz 1000748 BLAKE2B 0aac133fe464b4392e2245daaa955438b725e771915383f3f0042acabffe47715841e900293dd6b0e0e7f2727e7e5cc0c9bf5ea35341853822b3fabf98383a35 SHA512 7e4306e91adf4d3427d20ab1511eeca1a970cc2581e11c139dd089f3e3ef85294b524ec2b8f24ba6607f131bfe449ad6c9fad80bb823af023edcdf1518e41e76
diff --git a/kde-apps/calendarsupport/calendarsupport-24.05.2.ebuild b/kde-apps/calendarsupport/calendarsupport-24.05.2.ebuild
index 390d219f3af2..0ffa251cdf47 100644
--- a/kde-apps/calendarsupport/calendarsupport-24.05.2.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calendar support library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/calendarsupport-24.08.0.ebuild b/kde-apps/calendarsupport/calendarsupport-24.08.0.ebuild
new file mode 100644
index 000000000000..7721a8f73577
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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.5.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/akonadi-notes-${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 02d4f8f82ab0..fd93de3b65eb 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1 +1,2 @@
 DIST cantor-24.05.2.tar.xz 9196572 BLAKE2B fbc2f3a0bd1b527f5a487043ab2c785efd72c81786612abd402d6c6535a38619151741649453788b9243306d282920bf577ff3c8bc0765e1749ce970bf1b85b4 SHA512 de5631ce3723a4853d8cb1a6d3a9eb9ccdd50218d653b4afb9a5b8fdf19e46dc219b921c214f9b99be180e2c800e96382c7897bf9d6175043b6d464b8073137a
+DIST cantor-24.08.0.tar.xz 10846196 BLAKE2B 5a53830fd6be23ed15a9b4918a3b6d03e72a02163fc4634e39683fd3f070129ff674a4706f7f9b554eacd6a9f780fa603c4b63118b7258c0e9d24c47ae24f7fc SHA512 e5e57a67d3b2462cb9da0728c708321e11b2ac2aee8116b008067c0ceda0dd94f93d70ae8a0ccd9f51f3cefb094cf7c9cf1d9d96fd092e45d585d1efafef311a
diff --git a/kde-apps/cantor/cantor-24.08.0.ebuild b/kde-apps/cantor/cantor-24.08.0.ebuild
new file mode 100644
index 000000000000..0db05cdac759
--- /dev/null
+++ b/kde-apps/cantor/cantor-24.08.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 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=5.115.0
+QTMIN=5.15.12
+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/ https://edu.kde.org/cantor/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# TODO: restore +analitza once cantor is ported to Qt6
+IUSE="julia lua postscript python qalculate R"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
+# analitza? ( >=kde-apps/analitza-23.08.4:5 )
+DEPEND="
+	app-text/poppler[qt5]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	julia? ( dev-lang/julia )
+	lua? ( ${LUA_DEPS} )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-qt/qtdbus-${QTMIN}:5
+	)
+	R? ( dev-lang/R )
+"
+# !analitza?
+RDEPEND="${DEPEND}
+	!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=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Analitza5=ON
+		$(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)
+	)
+	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 b5984a08ba3c..580088f4ef5c 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1 +1,2 @@
 DIST cervisia-24.05.2.tar.xz 1809576 BLAKE2B 71a2ac1710f006d7b608718a556fd138397e9b12e7f89ee76257063799284b5c6fdfda325781140ebaee1bbdbf2160f13c4c323bb30412a76196ab534381c461 SHA512 a873b04e3c51818607f22d96f6e257dce5a1982f8b5afd3ef860eb90d278bd72a74f672126b4257c83b2bc22c5af21ee4e11cd4db2b4a218f08d5e159577a9aa
+DIST cervisia-24.08.0.tar.xz 1809712 BLAKE2B df632ed71743ea8eba2fc9216f0574be09299ea8f6d29b0242d06d0711e13b508af888da4c8252dc0d13a0a0936aabe10d4a774f70ba18a185509627f3f4423e SHA512 2ffde343f46dda98d1084438ac566fa1b703f7e792b2eeee3d9d52de80449242e0ac4f5b8d40a98d642428bae2ee29db3efc0163a05f5e7cf3f0af8cfe8ec080
diff --git a/kde-apps/cervisia/cervisia-24.08.0.ebuild b/kde-apps/cervisia/cervisia-24.08.0.ebuild
new file mode 100644
index 000000000000..4e9d09e450d7
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-24.08.0.ebuild
@@ -0,0 +1,42 @@
+# 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/dolphin-plugins-common/Manifest b/kde-apps/dolphin-plugins-common/Manifest
new file mode 100644
index 000000000000..9c8d8d9fd374
--- /dev/null
+++ b/kde-apps/dolphin-plugins-common/Manifest
@@ -0,0 +1 @@
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
diff --git a/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.08.0.ebuild b/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.08.0.ebuild
new file mode 100644
index 000000000000..9205d4a6766c
--- /dev/null
+++ b/kde-apps/dolphin-plugins-common/dolphin-plugins-common-24.08.0.ebuild
@@ -0,0 +1,19 @@
+# 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.05.2-r1
+	!<kde-apps/dolphin-plugins-dropbox-24.05.2-r1
+	!<kde-apps/dolphin-plugins-git-24.05.2-r1
+	!<kde-apps/dolphin-plugins-mercurial-24.05.2-r1
+	!<kde-apps/dolphin-plugins-subversion-24.05.2-r1
+"
diff --git a/kde-apps/dolphin-plugins-common/metadata.xml b/kde-apps/dolphin-plugins-common/metadata.xml
new file mode 100644
index 000000000000..24e0d59c569a
--- /dev/null
+++ b/kde-apps/dolphin-plugins-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=dolphin</bugs-to>
+		<remote-id type="kde-invent">sdk/dolphin-plugins</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index eeed864e73f8..faf47fcdda0a 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
-DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-23.04.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-23.04.3.ebuild
deleted file mode 100644
index cb74108172b7..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-23.04.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
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="dropbox"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-23.08.5.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-23.08.5.ebuild
deleted file mode 100644
index cb74108172b7..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-23.08.5.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="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="dropbox"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# solid, qtdbus only required by mountiso
-	ecm_punt_qt_module DBus
-	ecm_punt_kf_module Solid
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.05.2.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.05.2.ebuild
index ed0cb3e24125..23cf27b60ad8 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.05.2.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.08.0.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.08.0.ebuild
new file mode 100644
index 000000000000..b33625039bc4
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-24.08.0.ebuild
@@ -0,0 +1,56 @@
+# 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 ~x86"
+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 eeed864e73f8..faf47fcdda0a 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
-DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-23.04.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-23.04.3.ebuild
deleted file mode 100644
index b3da4520a71c..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-23.04.3.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="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="git"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Git integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# 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
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-23.08.5.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-23.08.5.ebuild
deleted file mode 100644
index b3da4520a71c..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-23.08.5.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="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="git"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Git integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/git
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# 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
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.05.2.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.05.2.ebuild
index e2a2e76c601b..5724bc5c9c04 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.05.2.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.08.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.08.0.ebuild
new file mode 100644
index 000000000000..f92527544c69
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.08.0.ebuild
@@ -0,0 +1,58 @@
+# 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 ~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 eeed864e73f8..faf47fcdda0a 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
-DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-23.04.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-23.04.3.ebuild
deleted file mode 100644
index 1f09db2d6a06..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-23.04.3.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="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# 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
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-23.08.5.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-23.08.5.ebuild
deleted file mode 100644
index 1f09db2d6a06..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-23.08.5.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="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# 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
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_mountiso=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.05.2.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.05.2.ebuild
index d6c38b5de33e..79733d76944d 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.05.2.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.08.0.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.08.0.ebuild
new file mode 100644
index 000000000000..bd403335c58e
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-24.08.0.ebuild
@@ -0,0 +1,63 @@
+# 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-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index eeed864e73f8..faf47fcdda0a 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
-DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56
+DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild
deleted file mode 100644
index 5cd10696e325..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.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="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/subversion
-	>=kde-apps/kompare-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# 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
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild
deleted file mode 100644
index f245b1086aba..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-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
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/subversion
-	>=kde-apps/kompare-${PVCUT}:*
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-lto.patch" ) # bug 926233
-
-src_prepare() {
-	ecm_src_prepare
-	# 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
-	# delete non-${PN} translations
-	find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_mountiso=OFF
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild
index 0b8ae98d03cb..2c556fdf8c95 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.0.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.0.ebuild
new file mode 100644
index 000000000000..f6fabf71df6f
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.0.ebuild
@@ -0,0 +1,58 @@
+# 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_mountiso=OFF
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch b/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch
deleted file mode 100644
index e2157f00fd34..000000000000
--- a/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 772a4d712abcf1c6c86f25bd306785815132d886 Mon Sep 17 00:00:00 2001
-From: Nikolai Krasheninnikov <nkrasheninnikov@yandex.ru>
-Date: Tue, 2 Apr 2024 09:07:53 +0000
-Subject: [PATCH] svn: Fix gcc-13 One Definition Rule compilation error with
- LTO enabled
-
-columns_t enum defined multiple times in different translation units. Although this
-should not be an error, we move the definition to a separate unnamed namespace.
-
-BUG: 482524
----
- svn/svncommitdialog.cpp | 10 +++++-----
- svn/svnlogdialog.cpp    | 14 +++++++-------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/svn/svncommitdialog.cpp b/svn/svncommitdialog.cpp
-index 41152434..f9a44265 100644
---- a/svn/svncommitdialog.cpp
-+++ b/svn/svncommitdialog.cpp
-@@ -54,6 +54,11 @@ QStringList makeContext(const QStringList &list, const QHash<QString, KVersionCo
-     return ret;
- }
- 
-+enum columns_t {
-+    columnPath,
-+    columnStatus
-+};
-+
- }
- 
- struct svnCommitEntryInfo_t {
-@@ -67,11 +72,6 @@ struct svnCommitEntryInfo_t {
- };
- Q_DECLARE_METATYPE(svnCommitEntryInfo_t);
- 
--enum columns_t {
--    columnPath,
--    columnStatus
--};
--
- SvnCommitDialog::SvnCommitDialog(const QHash<QString, KVersionControlPlugin::ItemVersion> *versionInfo, const QStringList& context, QWidget *parent) :
-     QDialog(parent),
-     m_versionInfoHash(versionInfo),
-diff --git a/svn/svnlogdialog.cpp b/svn/svnlogdialog.cpp
-index 21abadaa..685f7ec5 100644
---- a/svn/svnlogdialog.cpp
-+++ b/svn/svnlogdialog.cpp
-@@ -49,6 +49,13 @@ bool resetAndRevertFileToRevision(const QString &filePath, ulong revision)
-     return true;
- }
- 
-+enum columns_t {
-+    columnRevision,
-+    columnAuthor,
-+    columnDate,
-+    columnMessage
-+};
-+
- }
- 
- struct svnLogEntryInfo_t {
-@@ -64,13 +71,6 @@ struct svnLogEntryInfo_t {
- };
- Q_DECLARE_METATYPE(svnLogEntryInfo_t);
- 
--enum columns_t {
--    columnRevision,
--    columnAuthor,
--    columnDate,
--    columnMessage
--};
--
- SvnLogDialog::SvnLogDialog(const QString& contextDir, QWidget *parent) :
-     QDialog(parent),
-     m_contextDir(contextDir),
--- 
-GitLab
-
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 6f80cfdacf0f..286a9fa3e266 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-23.04.3.tar.xz 5737968 BLAKE2B 5942d5894c2d51cc3f0c5ab599bb82c2e324203f26a6b7a65dca2198cf046011c37d809ca71c2ef36db1687d8159bdbe97f33eb99d550eada982555d903c381e SHA512 6078947b3dd6c1c62ba2306109c9dcc4be6ebb64bb69699f0457aaa1e0b6b0168d8767d73f0f8731984f5b412200c5463df7237c65990ee073f2d35946ad7b9e
 DIST dolphin-23.08.5.tar.xz 5770048 BLAKE2B d46cbd81d2f6e020998fe560affa45916fdcf53e7acbb62503221d4a53cd582d692c025b7c9c16f6285a5d97fda696ff75198b479b7316c95e6b782c39bbb570 SHA512 0b25cc8ec1222fcd6eba971aa701a2ddcf5297c4d78b1cd63fde7ecf8e267f1af76ca1bf544ea4a4f98309b40c41aba441cfda1a9c3fb0e4df2a426e4402cb4b
 DIST dolphin-24.05.2.tar.xz 5580708 BLAKE2B 4a94495294e4327ece277650c075f26a26e96d1f7f9cc7850087bacebc04d80278101c01cd82908fd395528641bae3e9628fea218d8a230ea35f7657c08c39f6 SHA512 dd1fbfccf52a97528558b6dc6d3c95df44f4b027644bdb619472092158e8390968d553d6b8b17ce90533feb355c9e82e66bc12b26132ba76e08ed0eb91c168c6
+DIST dolphin-24.08.0.tar.xz 5627648 BLAKE2B ed7c7aa96421f60282ed25a7d6134bd8e72bd24338448d1bcad0df284b922d002e2cc138f9c02b36b2e529e34df20d06992a4dcdceaacb96fffc930fd50e8443 SHA512 a1eef2c785f2be101e8df1bc37cb4b93d346d3d9f053581f525e5729a997bb88dc6601a5691738477aa37eac8572ced63c88822946f455d5fa4cf328e259d83b
diff --git a/kde-apps/dolphin/dolphin-23.04.3.ebuild b/kde-apps/dolphin/dolphin-23.04.3.ebuild
deleted file mode 100644
index be2063e8e87b..000000000000
--- a/kde-apps/dolphin/dolphin-23.04.3.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="activities semantic-desktop telemetry"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5=
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${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/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	semantic-desktop? (
-		>=kde-apps/baloo-widgets-${PVCUT}:5
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	telemetry? ( kde-frameworks/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		kde-apps/kio-extras-kf5:5
-		>=kde-apps/kio-extras-${PVCUT}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	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 "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
-		optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT}
-		optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild b/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild
index be38f2a828dc..7263ce1a1363 100644
--- a/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
diff --git a/kde-apps/dolphin/dolphin-23.08.5.ebuild b/kde-apps/dolphin/dolphin-23.08.5.ebuild
deleted file mode 100644
index e0543a379707..000000000000
--- a/kde-apps/dolphin/dolphin-23.08.5.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="activities semantic-desktop telemetry"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5=
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${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/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	semantic-desktop? (
-		>=kde-apps/baloo-widgets-${PVCUT}:5
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	telemetry? ( kde-frameworks/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		kde-apps/kio-extras-kf5:5
-		>=kde-apps/kio-extras-${PVCUT}:5
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	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 "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
-		optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT}
-		optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/dolphin/dolphin-24.05.2-r1.ebuild b/kde-apps/dolphin/dolphin-24.05.2-r1.ebuild
index 43fbf7bfd2c4..8f958a5608b2 100644
--- a/kde-apps/dolphin/dolphin-24.05.2-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-24.05.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities semantic-desktop telemetry"
 
 # slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/dolphin/dolphin-24.08.0.ebuild b/kde-apps/dolphin/dolphin-24.08.0.ebuild
new file mode 100644
index 000000000000..fe7cd66a7146
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-24.08.0.ebuild
@@ -0,0 +1,89 @@
+# 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"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~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,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/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
+		>=kde-frameworks/kfilemetadata-${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
+		-DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package semantic-desktop KF6BalooWidgets)
+		$(cmake_use_find_package semantic-desktop KF6FileMetaData)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+	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 66e4b48a3db7..ef07534a5470 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,2 +1,2 @@
-DIST dragon-23.08.5.tar.xz 1671520 BLAKE2B 44d545052a671a548052e974f8b86da586fd31eadaeed54b80acc97bdc11da39beb846b0703eaf6199659140357a0a8d8a1a08c9c03874160f20048b4c622a9f SHA512 5e9fea7c28beb5d8198920ccebd1e7c2e289607d03a846f0991695add271f0e9f3ff81798e26324c736c9b581b385d6b24fbc57c5ab1807b7bb38ff72936ff4e
 DIST dragon-24.05.2.tar.xz 1828296 BLAKE2B 08962873fc197b84cab4db3d3dbe6f2eb80efdddffadb913a12cde9e30a0df1d950642878f64e387df1a7613ed0afef28e2d6ebc30d37d112a511fb0f0cb15fb SHA512 25557658c1f570f86cf45a48f27a2a995d9d286a17eb3d82cf8564aafdae52284de7e6346e52223414b1d3c703c97eb3c1f75f37f55b03f65a06abc5c68f0729
+DIST dragon-24.08.0.tar.xz 1829252 BLAKE2B c345e2cbd2461874d2c20e81361086964b1cbc592925c996a112e5e48787480b5b8a5fa83597359fce3db27c52a6a220ca53b3ca10bc3d7970f7a87caec90cc3 SHA512 a296a136032e9b283362671d60d70784665f08b8fd43e0c2fcc45213122224a2edb70cf99ee3b01f34a572c893362a266e356c64ba0ff00d132fe605a1236931
diff --git a/kde-apps/dragon/dragon-23.08.5.ebuild b/kde-apps/dragon/dragon-23.08.5.ebuild
deleted file mode 100644
index 2b824224d899..000000000000
--- a/kde-apps/dragon/dragon-23.08.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/dragon/dragon-24.05.2.ebuild b/kde-apps/dragon/dragon-24.05.2.ebuild
index 154657b0e359..3c6b296a0fb6 100644
--- a/kde-apps/dragon/dragon-24.05.2.ebuild
+++ b/kde-apps/dragon/dragon-24.05.2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dragon/dragon-24.08.0.ebuild b/kde-apps/dragon/dragon-24.08.0.ebuild
new file mode 100644
index 000000000000..e628872f6f0c
--- /dev/null
+++ b/kde-apps/dragon/dragon-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 3be7bcf03a5b..96c34adb58be 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1,3 @@
 DIST eventviews-23.08.5.tar.xz 469996 BLAKE2B 8e95dfb1de5b52f3b168a6af1e4414b6568d1ae8f0a6257e5ab97b18ed0ad4fa7c14f4f0f0c5880614e43c4bad66d528b4a8ca7f254e0e4eb089b0f0df12282d SHA512 0e94a8a900b521d114d0778ea23d5e255c9bf047b9150723a1ea40fec2c5b640d6321626017b0f4e005e653d76a882644874697029281dc932cf57760d36786f
 DIST eventviews-24.05.2.tar.xz 473684 BLAKE2B 8253605c37fec1caddd06866180e0a03a08cca5cbb49eb6de7c5b90c93fa2420ac34647b505aee11fff602d524ef41027a46acfd16f6f05bafa010fe94380ce6 SHA512 73f2b51a1305a44f396c949a132b0ddcd2c7158e9999438bf05177e3c8fe08dc906dbde2ed390fab1f42f4849ee2ad5eefac394f82894f2556002a139d0d6bb7
+DIST eventviews-24.08.0.tar.xz 490080 BLAKE2B 6881134a346d3b424ff71a7bb06efbb042f6160ffcc1e4ea72a2d56204cd4e0f59edfc07b579502560c208dff6bf75ae53f57fb590fcf6d0ea4efe7168f72ac0 SHA512 80bc03eef626a9f8e14f8096b807b8329aa4fd14a642f55e3dae5f6860204ea566d9e4ad8a6d15d2376747d43d1e205330f91cfe52cf41c47dff73250855426e
diff --git a/kde-apps/eventviews/eventviews-24.05.2.ebuild b/kde-apps/eventviews/eventviews-24.05.2.ebuild
index 886786d5ff94..8ba1d3e85fa9 100644
--- a/kde-apps/eventviews/eventviews-24.05.2.ebuild
+++ b/kde-apps/eventviews/eventviews-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calendar viewer for KDE PIM"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/eventviews/eventviews-24.08.0.ebuild b/kde-apps/eventviews/eventviews-24.08.0.ebuild
new file mode 100644
index 000000000000..322bf2db3272
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-24.08.0.ebuild
@@ -0,0 +1,45 @@
+# 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.5.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/kconfigwidgets-${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
new file mode 100644
index 000000000000..2ef7dba15c20
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/Manifest
@@ -0,0 +1,2 @@
+DIST ffmpegthumbs-24.05.2.tar.xz 32996 BLAKE2B 85229891ee2d2edcd2fca73d89511358e4f8f2b92e143081652f00344fc526773bd16cb778a136e002ba4ed0640969ddf8987cc6e32a4c225c32298c58d01d4c SHA512 335db6a332f23261cb88f5a9ccd1feeb14132cd0b81b69ea34494b008951e60f7372e82b2ea3c3e8cfca8d3f3aa75ba47969bb531a531b2d0557e9b32e1e6cc8
+DIST ffmpegthumbs-24.08.0.tar.xz 33160 BLAKE2B 9187b61f480a5e07f62bb209bf287a5262a8926f46ab67ba8846d7a117264ecd4f032898bdef055498f7b06d9f1c25914518af3efe36b4df8f06c9cc1ed74767 SHA512 d0a9844cabcd18bf1cbf36e82fd7d71ea0804488d7741262a885775b6d64d9a852d1bc5779858702244ad4aa95de36bbd7e0682e62cf2335dd0ba62d084678d7
diff --git a/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.05.2.ebuild b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.05.2.ebuild
new file mode 100644
index 000000000000..036be5ec70d2
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.05.2.ebuild
@@ -0,0 +1,23 @@
+# 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.08.0.ebuild b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.08.0.ebuild
new file mode 100644
index 000000000000..928d370615bc
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/ffmpegthumbs-common-24.08.0.ebuild
@@ -0,0 +1,23 @@
+# 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/metadata.xml b/kde-apps/ffmpegthumbs-common/metadata.xml
new file mode 100644
index 000000000000..8f8e4359197f
--- /dev/null
+++ b/kde-apps/ffmpegthumbs-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">multimedia/ffmpegthumbs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 0cef4f25d97f..22f1bf2f6d2e 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,2 +1,3 @@
 DIST ffmpegthumbs-23.08.5.tar.xz 32984 BLAKE2B 445ee91c4f09394922a5a7a0f6d9e81c855cec9a19526ea9f84dc0d7b6dabca6430aa4ae3813b7b86566098088a2b62991367751d97fb3edaf55a621955deafe SHA512 d4dfb37acacc362e7d98a0fda81efd2630988192e6f02bb8adde815585ad976db0a960806694a10d20ad7256ca2aed97df962ae4a1f4aa00e66aae480baab8f9
 DIST ffmpegthumbs-24.05.2.tar.xz 32996 BLAKE2B 85229891ee2d2edcd2fca73d89511358e4f8f2b92e143081652f00344fc526773bd16cb778a136e002ba4ed0640969ddf8987cc6e32a4c225c32298c58d01d4c SHA512 335db6a332f23261cb88f5a9ccd1feeb14132cd0b81b69ea34494b008951e60f7372e82b2ea3c3e8cfca8d3f3aa75ba47969bb531a531b2d0557e9b32e1e6cc8
+DIST ffmpegthumbs-24.08.0.tar.xz 33160 BLAKE2B 9187b61f480a5e07f62bb209bf287a5262a8926f46ab67ba8846d7a117264ecd4f032898bdef055498f7b06d9f1c25914518af3efe36b4df8f06c9cc1ed74767 SHA512 d0a9844cabcd18bf1cbf36e82fd7d71ea0804488d7741262a885775b6d64d9a852d1bc5779858702244ad4aa95de36bbd7e0682e62cf2335dd0ba62d084678d7
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5-r1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..b10f45f074f1
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	media-video/ffmpeg:0=
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+BDEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	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-23.08.5.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5.ebuild
deleted file mode 100644
index 8088289ae8a6..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	media-video/ffmpeg:0=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	virtual/pkgconfig
-"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2-r1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..a25188fc1484
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2-r1.ebuild
@@ -0,0 +1,35 @@
+# 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 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.05.2.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.2.ebuild
deleted file mode 100644
index 790aa40c56c6..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.05.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=8
-
-KFMIN=6.3.0
-QTMIN=6.6.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}"
-BDEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	virtual/pkgconfig
-"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild
new file mode 100644
index 000000000000..e8faeeb49976
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-24.08.0.ebuild
@@ -0,0 +1,35 @@
+# 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/filelight/Manifest b/kde-apps/filelight/Manifest
index 5501e5f94b47..45ec05eadade 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,2 +1,3 @@
 DIST filelight-23.08.5.tar.xz 700500 BLAKE2B 2892d3eae38f67f81091bee03676a29e7c2fcea9e0dc4a23a30190be262f64d0e37a2be5f6d311ebf996e5a95ce84713e6258c371d0ef291d33bcb27494d5eac SHA512 1d2ea6e13b18ddc7e80c789ad68a29b8d9a663bcbfd054714f4adc8e9e7482a8cf9e6a25213fd4f486494563d2854da043602774e49f784f4b8f2755ad143a8b
 DIST filelight-24.05.2.tar.xz 679824 BLAKE2B 607d189d3f18b9f0008acaaa6f6059666ae056384a4f6e6c97111ea05d011640bb0e9e8f27a17f741c1f5052e1925fd8f6c937f8a5408890940e8edea73a71e4 SHA512 ac777ffb76952bf75a1a8020a38da91f4819f32696567b489b1e857f5c93adf495a3f5cd40054668b32b3414100c1bfa725b2fad3a11d78a357b7d6c861662b5
+DIST filelight-24.08.0.tar.xz 682384 BLAKE2B cec0467dec942ea606505dce777a33edbc9a42b2aaf99860c2afbedfaa9141b4b504c36327b80ec225be28ec87048df20f998a65255c028bd7380ca8d83d9e20 SHA512 77b61edd20a1dc1fb7bbca14846bb49800f7d6877da84ca206b80d2b881f8fbb6060a8df7f632d10f7d0c9679569c508a25e139a7e84ef10457ed3d3fa227ba1
diff --git a/kde-apps/filelight/filelight-24.05.2.ebuild b/kde-apps/filelight/filelight-24.05.2.ebuild
index 7dcf8b490c94..d1ab43041201 100644
--- a/kde-apps/filelight/filelight-24.05.2.ebuild
+++ b/kde-apps/filelight/filelight-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/filelight/filelight-24.08.0.ebuild b/kde-apps/filelight/filelight-24.08.0.ebuild
new file mode 100644
index 000000000000..b405dcaa71fe
--- /dev/null
+++ b/kde-apps/filelight/filelight-24.08.0.ebuild
@@ -0,0 +1,41 @@
+# 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
+	>=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 34dbbc340903..9773b59799dd 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,2 +1,3 @@
 DIST granatier-23.08.5.tar.xz 2114816 BLAKE2B c14b5845ab04c514098699936914540c902b34e3a7ccf9f6fa01430e0e5eebea2ca4230d3db7839b66a2807fb8d87e6efe04f2eec1173e54bfc9d5ac2b83cc68 SHA512 1fa167cad60a5834efd59bc2826ccf387a334cc1a9e261ef93be17a3198e1e751a501c92ddd0e69292b8127fbad844dd9e2324662b9e793d98e8cbc35d999f59
 DIST granatier-24.05.2.tar.xz 2009140 BLAKE2B 08e00554f7bd96125b03355435cfefbcddd5776425b392d91cc6917c17b6d3e3ca3e6628036d20a6d6ebd1d6f20694467bbe0d9ac1dcc870f778ece1ec6f48bf SHA512 8d45b17c169ac80255be1be6e8ad00d7affe424947282c16d725c4b5b8a3115a4c1a01555fc845ca6081052019ed4c0b04e3bb1c81f52c27bd8093e1dbd03a36
+DIST granatier-24.08.0.tar.xz 2009828 BLAKE2B 121ac337cef7f22d31d49e7772389f8265f7c223f7adec127d0b17fd903f9f5a95c11f39a5805d913f7a98740ff16711aba6e257f05f9d708222c2ac989d0e49 SHA512 dfbc628d2b9d5f255e22f0d1e69c822ba0cc1504da77ed5771a1a6104a875d84f09ff1389935addbdf34ac71a335808b060583edcd5444f1629e77e9d67b85da
diff --git a/kde-apps/granatier/granatier-24.05.2.ebuild b/kde-apps/granatier/granatier-24.05.2.ebuild
index 4a910cbc2a48..3652bb05c0e0 100644
--- a/kde-apps/granatier/granatier-24.05.2.ebuild
+++ b/kde-apps/granatier/granatier-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/granatier/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/granatier-24.08.0.ebuild b/kde-apps/granatier/granatier-24.08.0.ebuild
new file mode 100644
index 000000000000..b782fe24fbb9
--- /dev/null
+++ b/kde-apps/granatier/granatier-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index e85b6435349c..4a277e51eda0 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1,3 @@
 DIST grantlee-editor-23.08.5.tar.xz 117568 BLAKE2B b8f94d6032160470e19204dd7a5da44159a4632a309f426d4aa793d3faa43421d871c98db390ba02acaa2a70d30bd159e9c146f84440af00a32f2ba7fe6d4e5c SHA512 9de2b5054a643022145b30840d1b93a9424338ffe6cec90085b57dd1be02af9204ba7882a865eb79b7cae4a35dc6386af5d1c8e312050d6d1095a9c9821b8eb2
 DIST grantlee-editor-24.05.2.tar.xz 122152 BLAKE2B 4792187a4adc564d23bc807096f0d8acc9d7a57b6fa72a5865cb2756a6ef3af03ea83e4c47dbd8bee7acc693fbd99be32d5c1cc56fba70c7106992d57e0be586 SHA512 b15b569abac5582e709fdac6f6d86230f9e4e76f26aac1d5a69846f06da40c7bb9e83e35393fbfffc76afa2fbd9c71cd87baf7ca2eec4abc8813f68faddae302
+DIST grantlee-editor-24.08.0.tar.xz 123852 BLAKE2B d8e36b9fb3fc40f914f2c0386c4c7b50a4abfdb3d49b8cce2cf8688458077344f5b48a6d6944662fc6d9f2bc8ea1ba5195e6053cf9ee537cd408b8c1d2c8386b SHA512 5de7ed7e0b0ef2143f568a5ac981b8c4af6399a194b9f8753023c71236b13943cb732a72453ab6fbb2dd7297224cf9d90529aed2e1d0914756147dc4e7ffaed1
diff --git a/kde-apps/grantlee-editor/grantlee-editor-24.05.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-24.05.2.ebuild
index c80881180a17..321539182179 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-24.05.2.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/grantlee-editor-24.08.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-24.08.0.ebuild
new file mode 100644
index 000000000000..d6060c4fd43e
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-24.08.0.ebuild
@@ -0,0 +1,40 @@
+# 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="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 8f1d633aac1f..d11e099e40df 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1,3 @@
 DIST grantleetheme-23.08.5.tar.xz 63212 BLAKE2B 169909c66468bd8fe4825205660d7023975c1a46bd29e381479601677d06adfea7f25dd44114df3cfab266d88668a4c94ca8e21b7d0025f9f820a64eff1c680e SHA512 3503a7d7ffb99510c52e3da9ce4585bb130f8acf78a7c00a7e07515f66ef930406a6d69891275cc297481f5ccc57395de44523ab42232c7e2c93fe4999e7d40b
 DIST grantleetheme-24.05.2.tar.xz 63036 BLAKE2B b6130186571d0a5cf3c650770c3182d70246535af0e7f285f7901089a0a793ca66e61a4f2e6d9ad7053373bccfebbc67f65ffcf082218aba4e0fe77f3000385d SHA512 2b1694607a721bffa5b11ea8f419909947762a082783a52cf2456a66e956946c126521d5a3e6618076e4580259531dc3acc82d00430aca3af3840e2a890c1be2
+DIST grantleetheme-24.08.0.tar.xz 63344 BLAKE2B 158a48bfb307bb000502ec77ce99eb49cde25af455041c93f2c5fe780c3a8d3538272e261eb956e3ee55194cf7cbdacfe69e110ff1311c8d5346b0901b6ea694 SHA512 96dc3c583b18f2deaf6cf28387a513d1d16d2ce1d3b444111874ce0f6b544e8c760c77f75b64af91e8383f35e98a8aaaddd1e0100eb05e8d564af6ede088db17
diff --git a/kde-apps/grantleetheme/grantleetheme-24.05.2.ebuild b/kde-apps/grantleetheme/grantleetheme-24.05.2.ebuild
index 66ee8118c6d9..fbb92b887bc6 100644
--- a/kde-apps/grantleetheme/grantleetheme-24.05.2.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for Grantlee plugins"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # fails if package not already installed
diff --git a/kde-apps/grantleetheme/grantleetheme-24.08.0.ebuild b/kde-apps/grantleetheme/grantleetheme-24.08.0.ebuild
new file mode 100644
index 000000000000..a5b1fbfbf572
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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.5.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 5f78b7d465f6..8d64907d5ada 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,2 +1,2 @@
-DIST gwenview-23.08.5.tar.xz 6904128 BLAKE2B f8f2a54ef438c4d3144198ee3a48de1ec72e7e3fc0f9b811130499087424b7c7a659d269c8be31998642589c0cad3d9e8c7cfebf6582c8d97999eb4e501a4aaa SHA512 8607f17b57211e31efc709dbec1091f7ca1587db90877583222acb5a82a19340530068adb85ca1748b0c849cf1f6551bd2fefdc2d55dfae1446b3582dc1615b9
 DIST gwenview-24.05.2.tar.xz 6513176 BLAKE2B 526bf8fe8caf319368997e31eac48013ba67e023f2e2a0a3082e69b4bff04828308ee85cc8a7cda9ca79a7429d0d749a08deb960149be337ded351d49f823026 SHA512 3c0cc7faa2c7f65b4146a0c7e4a1689ed7629510c9afd4fa891e422ad379e25fd6367e02326cf3721e7862d56661759d0fc9afa37d4cd0392d917d44ef8110e6
+DIST gwenview-24.08.0.tar.xz 6514240 BLAKE2B 33203bdcd5c81baff569c01a7bd21eb09288caf30c26c8cfecec1f8ed71a90eba064d67b2c4faf86486ae3fdb90e6c652c9077dc3f08ec548b128db28713d22c SHA512 4bd00ca9bec99fce7c894e51df68c606eecaaf65bfd8936a942f761ebe199c62ee579e64f90052359ab32a44a218736f8bcfbf9921c382467a588c1a234011c5
diff --git a/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch b/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
new file mode 100644
index 000000000000..148921f18169
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
@@ -0,0 +1,58 @@
+From b5cc214574eeb62f469a058daf52cd92270e4aa9 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Tue, 3 Sep 2024 00:40:11 -0400
+Subject: [PATCH] fix ODR violation: many files had the wrong definition of
+ Enum
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This enum has a different number of values, depending on whether
+gwenview is configured with the semanticinfo backend "none" or
+fake/baloo.
+
+In order to avoid Undefined Behavior, every file that includes sorting.h
+also has to include config-gwenview.h *before* sorting.h, which was not
+true. Solve this by including the config header inside the sorting.h
+header.
+
+Fixes link failures when LTO is enabled, since LTO allows the compiler
+to do whole-program optimization and type-check across the entire
+program:
+
+```
+/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6: error: type ‘Gwenview::Sorting::Enum’ violates the C++ One Definition Rule [-Werror=odr]
+   37 | enum Enum {
+      |      ^
+/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6: note: an enum with different number of values is defined in another translation unit
+   37 | enum Enum {
+      |      ^
+lto1: some warnings being treated as errors
+lto-wrapper: fatal error: /usr/bin/x86_64-pc-linux-gnu-g++ returned 1 exit status
+compilation terminated.
+/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: lto-wrapper failed
+collect2: error: ld returned 1 exit status
+```
+
+Fixes: https://bugs.gentoo.org/921649
+---
+ lib/sorting.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/sorting.h b/lib/sorting.h
+index 529ea6fc9..c008865cf 100644
+--- a/lib/sorting.h
++++ b/lib/sorting.h
+@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #ifndef SORTING_H
+ #define SORTING_H
+ 
++// Do not assume every file that includes this one, includes the config.h
++#include <config-gwenview.h>
++
+ // Qt
+ 
+ // KF
+-- 
+GitLab
+
diff --git a/kde-apps/gwenview/gwenview-23.08.5.ebuild b/kde-apps/gwenview/gwenview-23.08.5.ebuild
deleted file mode 100644
index 496e5bb95e14..000000000000
--- a/kde-apps/gwenview/gwenview-23.08.5.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-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
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwayland-${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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-gfx/exiv2:=
-	>=media-libs/kcolorpicker-0.2.0
-	<media-libs/kcolorpicker-0.3.0
-	>=media-libs/kimageannotator-0.5.0
-	<media-libs/kimageannotator-0.7.0
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	media-libs/tiff:=
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	fits? ( sci-libs/cfitsio )
-	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/wayland-protocols
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtimageformats-${QTMIN}:5
-	>=kde-frameworks/kimageformats-${KFMIN}:5
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package raw KF5KDcraw)
-		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
-		$(cmake_use_find_package share KF5Purpose)
-		-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.05.2-r1.ebuild b/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
index cefdfad20a88..20be90540f14 100644
--- a/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
+++ b/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities fits +mpris raw semantic-desktop share X"
 
 # requires running environment
diff --git a/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
new file mode 100644
index 000000000000..622f9c53904b
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
@@ -0,0 +1,113 @@
+# 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.3.0
+QTMIN=6.6.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/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=[gui]
+		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
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-24.08.0-odr.patch
+)
+
+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.08.0-r1.ebuild b/kde-apps/gwenview/gwenview-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..d720385f4680
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-24.08.0-r1.ebuild
@@ -0,0 +1,113 @@
+# 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 ~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/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=[gui]
+		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
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-odr.patch
+)
+
+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 a15bb79e069c..b3a994c93c6f 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1,3 @@
 DIST incidenceeditor-23.08.5.tar.xz 580968 BLAKE2B 2832f7002985f0ed070b4c5fdb2f63131a0111a5f4f25947f4c0361a0404f6919c7fde532ee23787b6632a02f4bf59a3cf804fd8d9202b44f7c761ab9d8af0b5 SHA512 ced163397e03bc6b1c56326004ba9768b1f8ad69c8e033e2e852d3242582bb9c50b09c524c17b70dbce3054796af01503ccff309175cd3b9a5582344be2d8c73
 DIST incidenceeditor-24.05.2.tar.xz 585732 BLAKE2B 0ff2ddd9322d7adcab8469a23feec76aa50907caec1a4799d83800abe5e107dd34b0daaec984132b40abbdd2f53ccef5e987b6848d40ca84418f4afec3032879 SHA512 6c4aaeaaad9d32cfec5c14c25f0bb4f64a5b830fca1728988bcc9f40563b6d86c56eb2e4ea7201e9625ff368b42102665a14817782b7349aabeb4775f67e84af
+DIST incidenceeditor-24.08.0.tar.xz 587744 BLAKE2B 2a31ef6ce390c607661a3c4fae9d35349d28f4886085729cea7ae86a2a9b33fab4086bac1cc93187a470192d23e10c57ca8fb96ffcf40802477a3ec507438e59 SHA512 def9aa69cb284e689bba16abe50e09205969e1af502be886272ec9f7b52b33eac73023fc6c4e5aa8b3993ee42e61963e4ddd075a78783d8fb3cfc96e6643c0a9
diff --git a/kde-apps/incidenceeditor/incidenceeditor-24.05.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-24.05.2.ebuild
index c1ddcc0b8e2b..1d315c557268 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-24.05.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Incidence editor for KOrganizer"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/incidenceeditor/incidenceeditor-24.08.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-24.08.0.ebuild
new file mode 100644
index 000000000000..477683753d76
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-24.08.0.ebuild
@@ -0,0 +1,66 @@
+# 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.5.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/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-${PVCUT}:6[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 ff71d5ae5579..fed940e7825d 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,2 +1,2 @@
-DIST juk-23.08.5.tar.xz 2088240 BLAKE2B 95c2fcf3786918a000caebbf4e3a6d7ecff3924c60fd3b1cde4c624a82e0fdd77341738b2cc43c0308e3aebe94355cb1dbb038c29e208d79b75466fa7a4b90aa SHA512 26a4f4a2732d05daf8b1a54f722aadf301cef791eaa21ce171fc7b1504dd0dd5df6e5814bb5062545bbdb8fffd42cfb5ec4211cd889b9a9fe2f01e578003cd79
 DIST juk-24.05.2.tar.xz 1899060 BLAKE2B c3d476cdfcc1c7077c1212d61f34530f5ad50cbb532c5afc0256246dbe9439408febecfbf64612b2cd2ab5346a96b44d8714f7e0ba43d2a0b53664c518b290c5 SHA512 51523355a8ab597f5472e3c1cd19c5216e8e41863b64c793b0851192379413f77de639061c54592e0043b072b7152aa83680a8ec89145f57f1a4156db70cd066
+DIST juk-24.08.0.tar.xz 1897684 BLAKE2B 2d8463dc4ab5229373c1b1da9545aeee79096d7c7bb27399858e14c7c8248efc1efb587c589d9ca2b1fd0c720898972db5c88ab49938f56b0bd6155eca249df5 SHA512 cb9f1b4bc4dcc8e4a7b2bcf8af64d6f2cb9ccf0f8e160e57943b8db46d45059a48bc13787031c40a27ff4f6a1bd31ab7268061069f9721ae34bdf5a72187ba5a
diff --git a/kde-apps/juk/juk-23.08.5.ebuild b/kde-apps/juk/juk-23.08.5.ebuild
deleted file mode 100644
index 690aa9c207ee..000000000000
--- a/kde-apps/juk/juk-23.08.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://apps.kde.org/juk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${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/kcrash-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	>=media-libs/taglib-1.6:=
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/kde-apps/juk/juk-24.05.2.ebuild b/kde-apps/juk/juk-24.05.2.ebuild
index 55f1cd11d07b..27707c3572fd 100644
--- a/kde-apps/juk/juk-24.05.2.ebuild
+++ b/kde-apps/juk/juk-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/juk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/juk/juk-24.08.0.ebuild b/kde-apps/juk/juk-24.08.0.ebuild
new file mode 100644
index 000000000000..603534b0d3d0
--- /dev/null
+++ b/kde-apps/juk/juk-24.08.0.ebuild
@@ -0,0 +1,45 @@
+# 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/k3b/Manifest b/kde-apps/k3b/Manifest
index cb215a2614dc..5972e7e443f5 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1 +1,2 @@
 DIST k3b-24.05.2.tar.xz 10690836 BLAKE2B 2e9ec4f9a235dd2474019bbb81bd9ca17f399abb4ec594028592513cb53cad0fb454a23e6ba1c356a538a9137cecf9646211a0cad2105e58ec07fed223924b05 SHA512 be8f3c391db45f8af087ec2d4783fb0cff99c58b999f353ad57c12a6e06e40ef14a969755e196816388a122214870d86ac339dcc2ae288a6c87116d609948fdf
+DIST k3b-24.08.0.tar.xz 10700700 BLAKE2B 862cbc99a3dce93ecfe89d2cb3d995a6f1aacb11a43b298c7ea33c8e04b7a1201516e14ebb09d83a7920ca7639557109cc2ac77cd2e7a272e67c0b04422d9777 SHA512 15b09c4b06b9550c0b8d80eaaf4e077d47e8be3eabef25178d10adf5d2039cb0f7a68963fcff67b7419e2713e4719bc6aeade0821ae51d246b196721b0f3f682
diff --git a/kde-apps/k3b/k3b-24.05.2.ebuild b/kde-apps/k3b/k3b-24.05.2.ebuild
index b55952931f5c..6394a318a2a1 100644
--- a/kde-apps/k3b/k3b-24.05.2.ebuild
+++ b/kde-apps/k3b/k3b-24.05.2.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.115.0
 QTMIN=5.15.12
-inherit ecm gear.kde.org
+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"
@@ -73,6 +73,11 @@ RDEPEND="${DEPEND}
 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
diff --git a/kde-apps/k3b/k3b-24.08.0.ebuild b/kde-apps/k3b/k3b-24.08.0.ebuild
new file mode 100644
index 000000000000..9107708962eb
--- /dev/null
+++ b/kde-apps/k3b/k3b-24.08.0.ebuild
@@ -0,0 +1,111 @@
+# 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_ENABLE_MUSICBRAINZ=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 eca98fa03e92..7700f7142c1f 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,2 +1,2 @@
-DIST kaccounts-integration-23.08.5.tar.xz 88544 BLAKE2B 6f21ea51c822ffde6c7d1db8f37a924009bcac16cf4e3955d86e1636d0eff7572f5fae89923c37c69ecfa7d8762c4c93ba165cf8d0cf5365ad9c683a0fdbff72 SHA512 dd959cf18dd91586b689c9fd832a2b8d62ef0630985078405b220007727bd9f773664b94d2922d1d9fd97b4e8e0f3ec1fae3a3bbbe0532241b96374045b35423
 DIST kaccounts-integration-24.05.2.tar.xz 92200 BLAKE2B 311b9eb7d93be5dd000eff563d9549dfbcfd15fd62260d4112bb3d572865d1452c0a42f93a2f8171b93bd779cf84acf075603463b809ed62bf1f0e11f249c63a SHA512 2d9419da0cf05dcb74373a4b0fed96d35279eb1c3f809c08ed6416caf1558f678065edfb551a7e95748cbde832b4f5d765da517d6d7af62c3401060dafe5243c
+DIST kaccounts-integration-24.08.0.tar.xz 92004 BLAKE2B dba4efec3613a47d2ccfe0cb915e6b05cb5f10f9891eecf0bb1dc85665690a6f5b1bbe546571ba1c9003450d1fb3cd3a36f707095406d36e48786ffc100b6fbf SHA512 62078901b362d8253d6a89dae67f9136587256b09c2f0637d61bb5519be3db9374bfcffaf985ff2a006b6130bd93cfd33404d0b4b7b00c3a48bb8d34f2ab4da7
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-23.08.5.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-23.08.5.ebuild
deleted file mode 100644
index cc6e7da71cb5..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-23.08.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
-
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# bug #549444
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	net-libs/accounts-qt[qt5(+)]
-	net-libs/signond[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/qcoro5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	kde-plasma/kde-cli-tools:*
-"
-# KAccountsMacros.cmake needs intltool
-RDEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-BDEPEND="
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	sys-devel/gettext
-"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-24.05.2.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-24.05.2.ebuild
index ba78f8b7d94e..1db6b21ecf95 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-24.05.2.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-24.05.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="qt5"
 
 # bug #549444
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-24.08.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-24.08.0.ebuild
new file mode 100644
index 000000000000..dc6c605d72d6
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-24.08.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KF5MIN=5.115.0
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QT5MIN=5.15.12
+QTMIN=6.7.2
+VIRTUALDBUS_TEST="true"
+inherit ecm gear.kde.org multibuild
+
+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="qt5"
+
+# 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.16_p20220803[qt5?,qt6]
+	>=net-libs/signond-8.61-r100[qt5?,qt6]
+	qt5? (
+		>=dev-qt/qtdeclarative-${QT5MIN}:5
+		>=dev-qt/qtgui-${QT5MIN}:5
+		>=dev-qt/qtwidgets-${QT5MIN}:5
+		>=kde-frameworks/kconfig-${KF5MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
+		>=kde-frameworks/kdbusaddons-${KF5MIN}:5
+		>=kde-frameworks/ki18n-${KF5MIN}:5
+		>=kde-frameworks/kio-${KF5MIN}:5
+		>=kde-frameworks/kwallet-${KF5MIN}:5
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/qcoro
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	kde-plasma/kde-cli-tools:*
+	qt5? (
+		dev-libs/qcoro5
+		>=kde-frameworks/kcmutils-${KF5MIN}:5
+	)
+"
+# KAccountsMacros.cmake needs intltool; TODO: Watch:
+# https://invent.kde.org/network/kaccounts-integration/-/merge_requests/61
+RDEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	kde-apps/signon-kwallet-extension:6
+"
+BDEPEND="sys-devel/gettext"
+PDEPEND=">=kde-apps/kaccounts-providers-${PVCUT}:6"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) default )
+}
+
+src_configure() {
+	my_src_configure() {
+		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
+			local mycmakeargs=( -DKF6_COMPAT_BUILD=ON )
+		fi
+
+		ecm_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant ecm_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant ecm_src_install
+}
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 576f3053dbff..9a467a02d4bf 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,2 +1,2 @@
-DIST kaccounts-providers-23.08.5.tar.xz 66184 BLAKE2B 964d186ec371c089f855a40d4113fd44cd0047b5f14642a21211a0ccfadfd148ee78222d50399f6046036ec9847d684daac5a2838cea26459a988013b5cfdde2 SHA512 740a4cef4fb555add1559eddba606537b452cbb0e67b8ce0e21079dd82aa5196c3fa975a8b121e43de69ca19d2f0744ab67a7581b634b931a52ead91d74dc074
 DIST kaccounts-providers-24.05.2.tar.xz 68652 BLAKE2B dd279a62e005f8099afc8e6e308a7941da344d56d356b547de61c977aa9c5ab7baac7f1aec363f772992872e1f9e769b81db33c09833f5d5841916f94d119b3e SHA512 cfabeb34af86c9d2d291b30f138b97d03e5c6f5dbade2646e8926b070ba5fc393b3f83e9f3967986836a6c60064f9ed8475e221923672348a53266c8d5231307
+DIST kaccounts-providers-24.08.0.tar.xz 68972 BLAKE2B 52569152a2b4a0cae34992c43f059a3702ec77dc56cfdb47b1101553a03bb2a92a6628c7c5c38ced6a165cc56d0e13ea28c85fe79ff7ab659226ae09cb16026e SHA512 c7d73bd325549881f1d29754a1b63e3f42fc045eda310b5cd78ca9c2fe3ce81c25e6e8729ee3581880d288b96fa4c5b53e74de75de90ce355d8aa9db8085d06d
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-23.08.5.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-23.08.5.ebuild
deleted file mode 100644
index 742933a62b0e..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-23.08.5.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="+webengine"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	|| (
-		kde-apps/kaccounts-integration:6[qt5]
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-	)
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	net-libs/signon-oauth2[qt5(+)]
-	net-libs/signon-ui
-"
-BDEPEND="
-	dev-util/intltool
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-24.05.2.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-24.05.2.ebuild
index 233cf6d0c84a..557d28dabd1b 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-24.05.2.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-24.08.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-24.08.0.ebuild
new file mode 100644
index 000000000000..711d7cc2377a
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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
+"
+BDEPEND="dev-util/intltool"
diff --git a/kde-apps/kaccounts-providers/metadata.xml b/kde-apps/kaccounts-providers/metadata.xml
index efeb40e25844..d925f2439758 100644
--- a/kde-apps/kaccounts-providers/metadata.xml
+++ b/kde-apps/kaccounts-providers/metadata.xml
@@ -8,7 +8,4 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
-	<use>
-		<flag name="webengine">Enable Nextcloud KAccounts plugin using <pkg>dev-qt/qtwebengine</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index f3ba0a298380..16a227381236 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1,3 @@
 DIST kaddressbook-23.08.5.tar.xz 3458708 BLAKE2B 04be326d547fe1f9fd89ef6a0fd59060829494d2f503b9b8cb5ba771aa98d60d2b8edbfa11ebb18de7645ad595c20642e2c56671271172c18e78eceb7beb346c SHA512 906efc3c2c947d02df0fdb6134dc0ececd0745d62f1f761195987c2c15698e9decca89de166bc46d17043f5d1e8c71ae1d9e6ee62a5737150da9d0c10429f9b1
 DIST kaddressbook-24.05.2.tar.xz 3407756 BLAKE2B e454fccddc2bae5dfc2874e6b68896f3d64a635816f83cb89ebf6566bb3d0a1286d2dc950b5d68f0fffdb01673930085bc0e6b99e841b1c702a504b035ff9ff8 SHA512 78f32d5b01a224885950caa1a13ef229589d05b81e2e437384d04cfe63b3bf5034c6b12984b272fc3dbb44d87f6f3da2c665ccd502b123b9722eaf2f004b6722
+DIST kaddressbook-24.08.0.tar.xz 3410104 BLAKE2B b3f816aedbeb15f7d4b2a29168f7c79c1fc8585e689ca2e337c39635f1630928d1b5204bc29d3b42c1dd694b957e671b380eeab748a0e316704672f154195a44 SHA512 c599ed1d6bf462e05c2a892d3fbdb509279f2eac98afff63fdcf748938af7ce2028b3c538a95afebf5b13ef42732d28ea09f86a7a937cfe1f52d70839c62f92b
diff --git a/kde-apps/kaddressbook/kaddressbook-24.05.2.ebuild b/kde-apps/kaddressbook/kaddressbook-24.05.2.ebuild
index e90d0dfc63d7..a50fc0764f66 100644
--- a/kde-apps/kaddressbook/kaddressbook-24.05.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-24.08.0.ebuild b/kde-apps/kaddressbook/kaddressbook-24.08.0.ebuild
new file mode 100644
index 000000000000..770c4299dac6
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-24.08.0.ebuild
@@ -0,0 +1,68 @@
+# 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 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="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
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(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 a7005f23566d..d5f0f9d3d665 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,2 +1,3 @@
 DIST kajongg-23.08.5.tar.xz 4592668 BLAKE2B 6155d5e483c5c0e46c2486b445a1e4e73a3a489188ab3eed5178918ab45802eab1a09cbec4d17c27679cd1b677ceda41006a88de7dba0550d346f3893f71cd8b SHA512 3a2eab57e71dc74e9f846705aebf827190d7927993d8442689961f42ec9ca5970f104a9ec14a80cabe8b18ef14fd44df8290eaf34914445ec4e4fdd32c718f10
 DIST kajongg-24.05.2.tar.xz 4601924 BLAKE2B 3c14def1edcc98d672adba7b87706894dfceda2f7b766e30d24b9130c785d0f4eeebc60611895ea97d3254867d3df0670dbc13feb2cdacf8db98a0fd0e597755 SHA512 6c5d1ac85204dd3a7f2e775660a0fbaf6b590d0d4fd64658d200b65b30edb09258a5ce4f7a5484467acef52324b28ed61022697b23100e32f1276c344b134075
+DIST kajongg-24.08.0.tar.xz 4605296 BLAKE2B dd3ff320207e0c3c170c81dd92a0fbeee29c1dd5d01b3babc9223a2f28f06eb0947834004b9c780e032f352676dac44c86d949bbff36de8d63c3f5ff711cf617 SHA512 c22814a42af3d4c2a1d0c296761c4e2a49f823d244f66af8321667280a1a712cc95386f32caedb795deabf8c09fefa94ed9c3b4be649d558d0dc407d00e1d96b
diff --git a/kde-apps/kajongg/kajongg-24.05.2.ebuild b/kde-apps/kajongg/kajongg-24.05.2.ebuild
index 0d1604995a4b..bba6ec1e60a5 100644
--- a/kde-apps/kajongg/kajongg-24.05.2.ebuild
+++ b/kde-apps/kajongg/kajongg-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kajongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kajongg/kajongg-24.08.0.ebuild b/kde-apps/kajongg/kajongg-24.08.0.ebuild
new file mode 100644
index 000000000000..e85ed1db711c
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-24.08.0.ebuild
@@ -0,0 +1,46 @@
+# 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
+	$(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 909bb864b068..1d1f7b2f84c3 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1,3 @@
 DIST kalarm-23.08.5.tar.xz 2630096 BLAKE2B 10fa714648be1a96b70ddb8fa445092d7a0d3368f976d45f4b45c47955e0bdc2b5e727520862f8bfb30911bdd60e80926208dac40172d650cd056d3ee6f7a535 SHA512 f9c2f1f8228e85c0fe10c6837948aa8f9fda7056edb8d1aa51f43ade1852236d4030b8720940dd3cbfba17339b8ffb971131baa747f114e87b88d4c9f826d2f1
 DIST kalarm-24.05.2.tar.xz 2586616 BLAKE2B b5500359661367385e5c47e11d5a28e869d13592f6aac482c9c7cd0366d3f11ee5904fee0dde49c0c2d0ed67b8d3d3b8e195eb1e2e3c33c53eb1b6380987f3fd SHA512 1e0f41c03c96a569073f2834e6fd16ef1eb8b9b39f80c738abdb8dee3c7ccab056c012ef07dd0534981f53a1fa7102dd3b52a229453eef8f194b7db109b5d321
+DIST kalarm-24.08.0.tar.xz 2589896 BLAKE2B addd1d177efc0d02aedbd39281dfc6ed5672356bdde7d0e46f1cbd7631824d92d867920578ca3035bccfe77dae67e17cf24de02a415ca6a1499946c1e8b1ac7e SHA512 e02f6e881fe6f615eabd66c72ba375ad9452370d3196955b462cc3cea13ff792bb3fd510fb5c7c5e9412c37227b8d36c2948fcd2ab42d77e1966fb049cb7e112
diff --git a/kde-apps/kalarm/kalarm-24.05.2.ebuild b/kde-apps/kalarm/kalarm-24.05.2.ebuild
index bb57bf884c71..6ea6206f363c 100644
--- a/kde-apps/kalarm/kalarm-24.05.2.ebuild
+++ b/kde-apps/kalarm/kalarm-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="+pim speech X"
 
 COMMON_DEPEND="
@@ -62,6 +62,7 @@ RDEPEND="${COMMON_DEPEND}
 	pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:6 )
 "
 DEPEND="${COMMON_DEPEND}
+	speech? ( kde-apps/kpimtextedit[speech] )
 	X? ( x11-base/xorg-proto )
 "
 
diff --git a/kde-apps/kalarm/kalarm-24.08.0.ebuild b/kde-apps/kalarm/kalarm-24.08.0.ebuild
new file mode 100644
index 000000000000..89871c3e5c28
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-24.08.0.ebuild
@@ -0,0 +1,84 @@
+# 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="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="+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
+	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_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 cf4884deeff8..87248b341261 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,2 +1,2 @@
-DIST kalgebra-23.08.5.tar.xz 1039996 BLAKE2B 1fed7fb19080d0b48dfed61ac9a539f78bbbb233ed333008f87e1864295bb9bcfc6da0ada611943365caa0c6920e63eac1301c4d0cb867efc461a96e8d5904da SHA512 fec2aeebcdcf5421b120cfccc9aca377cb5bb996d53eab12aa7f92ca146adcc184b9812d8b386b43424cdaa43752720c443eff3f147c75aa6972cadeadc6fb03
 DIST kalgebra-24.05.2.tar.xz 943464 BLAKE2B 02c79b6cba3f94b7bb8e9e4993724ea6ea0a508aff1a7876812e22295fe0e5bde00ce0ae2b180ac9c051ce6fa6dbf750d7679006ae9a850ad8c6411dbc61748c SHA512 14cf697a34170ec704eb2f9a74e1604ded336b3fab218152fdb9212536802b783580be1c3e0980ba00e92081aff3794fd46dc3f00a90e7edf37dbac9aabb8cac
+DIST kalgebra-24.08.0.tar.xz 943532 BLAKE2B 053c5dfeebd25b6118ead06a0f0b4869f85a359ba1c42b653dc3d5f8acde97a9cc76193682b40a327350436472fafd88e381d3a848d81445ad5915eb2d48e68b SHA512 39f4f15818336f7390ab41c9369fd4c0777ade51f05e313351602233de55b9c27b993c477c945e78022d8267365c1a708d15f091caa6da07ff91d328b113d869
diff --git a/kde-apps/kalgebra/kalgebra-23.08.5.ebuild b/kde-apps/kalgebra/kalgebra-23.08.5.ebuild
deleted file mode 100644
index 78f4c0de87e3..000000000000
--- a/kde-apps/kalgebra/kalgebra-23.08.5.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="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm flag-o-matic gear.kde.org
-
-DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
-HOMEPAGE="https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="readline"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/analitza-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-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.05.2.ebuild b/kde-apps/kalgebra/kalgebra-24.05.2.ebuild
index a46239fcb014..b8afbb1f934e 100644
--- a/kde-apps/kalgebra/kalgebra-24.05.2.ebuild
+++ b/kde-apps/kalgebra/kalgebra-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalgebra/kalgebra-24.08.0.ebuild b/kde-apps/kalgebra/kalgebra-24.08.0.ebuild
new file mode 100644
index 000000000000..d90534db0e81
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-24.08.0.ebuild
@@ -0,0 +1,49 @@
+# 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/ https://edu.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 108f7eaadf3f..1ea381515f02 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1 +1,2 @@
 DIST kalzium-24.05.2.tar.xz 22660452 BLAKE2B 613704a0fa2e5394f90b9b5754cc3be4d6119f08f1037becc12f56b5ad3e6fc1b70964eccc3f6ea98c291733c0daabbeb3a67c27ed93b2c99e36627fed6bf72f SHA512 980c08b59b3bb715e5b2c581624d5b90846a3b085aee9f2bb2c542270978bf02d929be1a366ef94d1f3c757882652de92b4ea2d64c1c0040de253bda23d8654b
+DIST kalzium-24.08.0.tar.xz 22682568 BLAKE2B 99730891ca8103670460eebc34d6e885cc63d4f04e07f021ec7bc733d7a13acf3d664242ac8f8d8f374505155ed936ff7de4ed118c4ca290319f7ad9bf44e19c SHA512 3d118f148ddb24ac981f228d2d23c29188ee1d42e098d680fddc69ce6959f4fff3b61bb03faaae1bc51aaefa8deb2da54a63f57b5f4d598b87a9215c9c0057d7
diff --git a/kde-apps/kalzium/kalzium-24.08.0.ebuild b/kde-apps/kalzium/kalzium-24.08.0.ebuild
new file mode 100644
index 000000000000..2c18c831f38d
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-24.08.0.ebuild
@@ -0,0 +1,66 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsvg-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	editor? (
+		dev-cpp/eigen:3
+		>=dev-qt/qtopengl-${QTMIN}:5
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		sci-chemistry/openbabel:=
+		>=sci-libs/avogadrolibs-1.93[qt5]
+	)
+	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
+		$(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 906d5f03a692..823d4d84a2b8 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,2 +1,2 @@
-DIST kamera-23.08.5.tar.xz 131704 BLAKE2B 30e2e855eab06c688f55cc9243c8a7b55a526835abff331d2d37dba0736a413a16ea1e6d92eecf60fd6bafad5d6b261b9545f6623b0cfdba0869eb3d23811869 SHA512 2d9eaf6cc0c40b13f81a2e671faa73972c923bb3fd3f4e7ab9d3586b3a530513506fe63d4f76c68e08b514c1e8c012a08753fb5e4b395b6e8453740d4ca18fd6
 DIST kamera-24.05.2.tar.xz 131036 BLAKE2B 2c3e5307d75aedee2c9b48f0f6592149c0a3d7206e71184c1d1d7583d42327b9bbce9c9325420d793f8c529044b4765b87ed078ea04b745d709646d1b1bbace7 SHA512 e18be7a69d77bd1ead3e97a9a71038277464baf3390047ec5806d29daaa2751be214deb6e02c73085e64ef014a551e323e8422f4064a9fff5584ba6d129d6680
+DIST kamera-24.08.0.tar.xz 131120 BLAKE2B 5098fd59a6ef5408465d52d667913992857262745fcbcb2d5b3981915baf2f56b3e2548082a6101e3f52202e7cbf122738710bd5a14a1d936289153d143e4a82 SHA512 5db2f5d2caac245c62a16633cdebf7df6eb61f724aa93a523531ed97eac3812424dbcfad4502ee9b5ef4319bcc2fccac9e1045a3cfa0306a448d8a5cc901df86
diff --git a/kde-apps/kamera/kamera-23.08.5.ebuild b/kde-apps/kamera/kamera-23.08.5.ebuild
deleted file mode 100644
index 434b4ccb6eb5..000000000000
--- a/kde-apps/kamera/kamera-23.08.5.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"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	media-libs/libgphoto2:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	sys-devel/gettext
-"
diff --git a/kde-apps/kamera/kamera-24.05.2.ebuild b/kde-apps/kamera/kamera-24.05.2.ebuild
index bc1f2f148568..541052b59409 100644
--- a/kde-apps/kamera/kamera-24.05.2.ebuild
+++ b/kde-apps/kamera/kamera-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kamera/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kamera/kamera-24.08.0.ebuild b/kde-apps/kamera/kamera-24.08.0.ebuild
new file mode 100644
index 000000000000..ecfdf9149dd9
--- /dev/null
+++ b/kde-apps/kamera/kamera-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kamoso/Manifest b/kde-apps/kamoso/Manifest
index fa0d1ee3c7af..89b128fda84f 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1 +1,2 @@
 DIST kamoso-24.05.2.tar.xz 233700 BLAKE2B 371f32bb688c60b539d236636ec56978cf6dfe6a0c1216e1a77870bea6441c488853fcdc3e553fddd1145b531b750dc38dc5d0973b037b3233481aa78735e306 SHA512 c11e47d753d29b1c53697457b33b2eccce7909785d6b32ac62d67cd828e2ccf0b8ff0cc555322dc5f791b04502a4ef55ba5a8a23b4d2f54e54e281ac1041d4e6
+DIST kamoso-24.08.0.tar.xz 232708 BLAKE2B 2243da2b94bc5ddf35aa47d68440d2c9d3535dbde8a730bfc5cd1acc0692159d86df921f1fa3a4ec28d56e93ba41e6cb802776822fc98f4cc0a3bb77ccb99508 SHA512 cf9857a0abb8418973e0af61f1f13bfec51aa7445a7fe980a6a4dffad79a54ba2dee83f0a4b154b3bf348df810ffe955aaa1b7499cc113a8cff4abe2c465c1b3
diff --git a/kde-apps/kamoso/kamoso-24.08.0.ebuild b/kde-apps/kamoso/kamoso-24.08.0.ebuild
new file mode 100644
index 000000000000..ded7553ebef5
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-24.08.0.ebuild
@@ -0,0 +1,46 @@
+# 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/kanagram/Manifest b/kde-apps/kanagram/Manifest
index b319fa543062..81837930f583 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,2 +1,2 @@
-DIST kanagram-23.08.5.tar.xz 8069044 BLAKE2B 2e56d8875090cf88e36cad810bf6131e9f024fc7c59258c7be125d1f19273ea315d363faf789b0c72c7a7f7d69aaac8339200ad56432ed4804830f8027d52700 SHA512 03073b96783e77108d2209959263d15f256bd5fc6511be9aab9781bbebc89cb20e2ab90679cd244254ea85d39fc1e1ceabee32f0ee986bba2faf6b9265f7838b
 DIST kanagram-24.05.2.tar.xz 7779700 BLAKE2B 96e59f62f7ac3faef71efdf34a042fd80560b4fe97b61ac1fd242d3f6ca53776b3f0711d961921ba8744b8906bb05255c702f536f5858b05c7f753b94a851e35 SHA512 ed178f10ede0fa2d7c32fd0fe8a0cf32635fa1ed2853cd398ac08ab80cda3dc0e21e653ae3a7ce0ba0dbe2c38d9773af5f7011511dd7fc0a472f74b665960d4b
+DIST kanagram-24.08.0.tar.xz 7780708 BLAKE2B 87d1cf982c9b38ebaa00e6eb4e95a5e8500e98ee40f130411032521baf6692e9c920893e2172fd21935a76f8222dbc33492e390aa3e12a5679e89bfb8e001900 SHA512 86417808afad04fabcecde3d401722628ddb966baec5342485576cf3b7cdbc2b4c215a2921a6d1a20cc2feff59bf0a9779766ade03a06447682ce982e70de4a7
diff --git a/kde-apps/kanagram/kanagram-23.08.5.ebuild b/kde-apps/kanagram/kanagram-23.08.5.ebuild
deleted file mode 100644
index d84d92420c04..000000000000
--- a/kde-apps/kanagram/kanagram-23.08.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
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}: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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-apps/kdeedu-data-${PVCUT}:*
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-24.05.2.ebuild b/kde-apps/kanagram/kanagram-24.05.2.ebuild
index 64c9e6c0bc2a..d3b6a8f13d3d 100644
--- a/kde-apps/kanagram/kanagram-24.05.2.ebuild
+++ b/kde-apps/kanagram/kanagram-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kanagram/kanagram-24.08.0.ebuild b/kde-apps/kanagram/kanagram-24.08.0.ebuild
new file mode 100644
index 000000000000..402a3a53ff1e
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-24.08.0.ebuild
@@ -0,0 +1,46 @@
+# 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/ https://edu.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 c5948a6d53f9..36dd83c9a20b 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,2 +1,3 @@
 DIST kapman-23.08.5.tar.xz 2483488 BLAKE2B b5b299ab8fd6005eea214c6e549b341daf9fdc12e80816c8c25913f9605bd928d3387e9750af1528fd8d7019fbd9fc74bae5d034ffba32eab620a40923f4ab45 SHA512 d3b45c5090ea7376caa18dd2691e0cce031a53bf2a0562aea71cf05ffdf04fa2d20cd41910951756f6ade49ea7c2ca74db57f15a43763f8d8dd5507f54cdd7e5
 DIST kapman-24.05.2.tar.xz 2143140 BLAKE2B 56ee4d55022a40a83e3cecaab8de6c200b05f3921e86080bf4c82dbb0dcb7c7f950c8a943146255308997d726c2feae2b019242736c80cea4f36694f8e7f4e9c SHA512 448d90ef5dcaff22be0190b330f3dc03ce98629b2d376d218d44f2f6d1356fd0ea5517ab98c6219d4c11ac42487f10b2095b6785e3529753c704d8bb44e31669
+DIST kapman-24.08.0.tar.xz 2143580 BLAKE2B 148b0f8ebb1f95499107fd355d37328b41371923a51d986810324575c10fa5a28a8fc7121414eac5b684dd74c1aed4e23b39e2c2c600f2ccce82aaa94c52c129 SHA512 8ff81bf4a1117cff0bb64a6e0036024194765839aa77b265e778e0d88617c0c4e8a2cdf92b314ffb59b09f98654ad6c4393949b0b93341563547996163dd34a2
diff --git a/kde-apps/kapman/kapman-24.05.2.ebuild b/kde-apps/kapman/kapman-24.05.2.ebuild
index a750b24546cd..61c03caa0d89 100644
--- a/kde-apps/kapman/kapman-24.05.2.ebuild
+++ b/kde-apps/kapman/kapman-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapman/kapman-24.08.0.ebuild b/kde-apps/kapman/kapman-24.08.0.ebuild
new file mode 100644
index 000000000000..41002fd5818c
--- /dev/null
+++ b/kde-apps/kapman/kapman-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index c554b64a4411..6416d1af0923 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,2 +1,2 @@
-DIST kapptemplate-23.08.5.tar.xz 339976 BLAKE2B 768f2ec77c05b48aeca3dfa1ee1dbe274d09c5d40dfb8562e64176caacf016bf82791268707d1b65882d1c019f5adcabff2076d1161f6a4cdc8d605a4f12c9f9 SHA512 f3acc363b7db209035b91b5492bd95159eb73303c9ef1780fc78cd10e7c247b5096e67a2975adba081e49d9ae4bb99874167b2fe550172160356989fb73c96cd
 DIST kapptemplate-24.05.2.tar.xz 342776 BLAKE2B de0cabcbf85c4377cc4169bce90e42cb6da6c98e3b0f8e5a388f56b10e53ad8f24f2ed7a266cd3e5012ad1d890d93b5ffe20e3d1e0045f39d69979e825af9ea1 SHA512 b7ef76c7d7054c182650a3d8878d79eb8db3a781a840b5ef8a47cc685f02e77d7cfe3f2e576f009ec00377c5099444a9e113b952141b042bef7de6a9f3257362
+DIST kapptemplate-24.08.0.tar.xz 342908 BLAKE2B 5af99e8e98333c28af8fa76f41bd1decd5da7a80628e4f1aa5f6a77f5ebb819c246fdf95e5e34b1d3eb593c2d12476d18fd9bdec087a6f720f975232d05b9f61 SHA512 21836678ca1f53ee32b24cebe2bd2ae330046a2bee330cc26808fabff23f9bd4b35aa3d966f92c9c4a31c16e3e6e382273f86a107263c336c566e7897b603ff8
diff --git a/kde-apps/kapptemplate/kapptemplate-23.08.5.ebuild b/kde-apps/kapptemplate/kapptemplate-23.08.5.ebuild
deleted file mode 100644
index 291e82056eb4..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-23.08.5.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=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/kapptemplate-24.05.2.ebuild b/kde-apps/kapptemplate/kapptemplate-24.05.2.ebuild
index 912166c7f4c2..0cf53ab65fe7 100644
--- a/kde-apps/kapptemplate/kapptemplate-24.05.2.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapptemplate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-24.08.0.ebuild b/kde-apps/kapptemplate/kapptemplate-24.08.0.ebuild
new file mode 100644
index 000000000000..22d7f98b6017
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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-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/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 ca9b27d0472d..3252d2875f33 100644
--- a/kde-apps/kate-addons/Manifest
+++ b/kde-apps/kate-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kate-23.08.5.tar.xz 8043480 BLAKE2B 68b27c125a1e7f144ecc1d7b6d3348337b2f14f7fd61307e4ec64b74bb388378314d6575801bbc22c49bf4470133d8f91dede5f9b384a2f2356ec1e111da01f8 SHA512 d3647d7c6af74fdfdf3bf9eb9da906195215800025b43558bd6c9811bd2f457a52555c84997801e0b0badddcd99b0dd6e384bf9ec82790fb14cb20ff026a5a5b
 DIST kate-24.05.2.tar.xz 8149132 BLAKE2B a4708858c065963d5f18d7ca5670f98ca1d991e2a92fbb2de87d16b084ab18e87095cbb25195df6ea65f28041381e8be25481c71e06992b75dfe93ef0641e552 SHA512 f1f9957d32cd149d071e2ed7c86b9c943974f3901d8242476975c9af3d1ae1743a08d966a6962655a5ae32c722d3590461fa939f095d3f9f8196ec08427a441c
+DIST kate-24.08.0.tar.xz 8202144 BLAKE2B ef0d2914241a40cce4f6cebe0d6f04909a6d2bb4a0d2f83211d6d78156a819ed59e899b1d3f83cd6e996a57955cfa32e224a8006af50891e1cdb3b18f33d17bc SHA512 8da049e3cf1c131750b76aeeaa9edf30bad90eb5ec3b96f7cde902916ecc6b9d7e443fa10c4671a8a01fe85ec2357ddaff441a4e0d34ffe0b919dff0996f27ac
diff --git a/kde-apps/kate-addons/kate-addons-24.05.2.ebuild b/kde-apps/kate-addons/kate-addons-24.05.2.ebuild
index 14e0838a8550..2c263c4335e5 100644
--- a/kde-apps/kate-addons/kate-addons-24.05.2.ebuild
+++ b/kde-apps/kate-addons/kate-addons-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="LGPL-2 LGPL-2+ MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+filebrowser lspclient +projects +snippets sql"
 
 DEPEND="
diff --git a/kde-apps/kate-addons/kate-addons-24.08.0-r1.ebuild b/kde-apps/kate-addons/kate-addons-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..cf2e28c02c24
--- /dev/null
+++ b/kde-apps/kate-addons/kate-addons-24.08.0-r1.ebuild
@@ -0,0 +1,100 @@
+# 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[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
new file mode 100644
index 000000000000..23cc50c4d635
--- /dev/null
+++ b/kde-apps/kate-common/Manifest
@@ -0,0 +1 @@
+DIST kate-24.08.0.tar.xz 8202144 BLAKE2B ef0d2914241a40cce4f6cebe0d6f04909a6d2bb4a0d2f83211d6d78156a819ed59e899b1d3f83cd6e996a57955cfa32e224a8006af50891e1cdb3b18f33d17bc SHA512 8da049e3cf1c131750b76aeeaa9edf30bad90eb5ec3b96f7cde902916ecc6b9d7e443fa10c4671a8a01fe85ec2357ddaff441a4e0d34ffe0b919dff0996f27ac
diff --git a/kde-apps/kate-common/kate-common-24.08.0.ebuild b/kde-apps/kate-common/kate-common-24.08.0.ebuild
new file mode 100644
index 000000000000..2a382f188ff9
--- /dev/null
+++ b/kde-apps/kate-common/kate-common-24.08.0.ebuild
@@ -0,0 +1,19 @@
+# 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/metadata.xml b/kde-apps/kate-common/metadata.xml
new file mode 100644
index 000000000000..0dd08b049459
--- /dev/null
+++ b/kde-apps/kate-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="cpe">cpe:/a:kde:kate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/kate-lib/Manifest b/kde-apps/kate-lib/Manifest
index ca9b27d0472d..3252d2875f33 100644
--- a/kde-apps/kate-lib/Manifest
+++ b/kde-apps/kate-lib/Manifest
@@ -1,2 +1,3 @@
 DIST kate-23.08.5.tar.xz 8043480 BLAKE2B 68b27c125a1e7f144ecc1d7b6d3348337b2f14f7fd61307e4ec64b74bb388378314d6575801bbc22c49bf4470133d8f91dede5f9b384a2f2356ec1e111da01f8 SHA512 d3647d7c6af74fdfdf3bf9eb9da906195215800025b43558bd6c9811bd2f457a52555c84997801e0b0badddcd99b0dd6e384bf9ec82790fb14cb20ff026a5a5b
 DIST kate-24.05.2.tar.xz 8149132 BLAKE2B a4708858c065963d5f18d7ca5670f98ca1d991e2a92fbb2de87d16b084ab18e87095cbb25195df6ea65f28041381e8be25481c71e06992b75dfe93ef0641e552 SHA512 f1f9957d32cd149d071e2ed7c86b9c943974f3901d8242476975c9af3d1ae1743a08d966a6962655a5ae32c722d3590461fa939f095d3f9f8196ec08427a441c
+DIST kate-24.08.0.tar.xz 8202144 BLAKE2B ef0d2914241a40cce4f6cebe0d6f04909a6d2bb4a0d2f83211d6d78156a819ed59e899b1d3f83cd6e996a57955cfa32e224a8006af50891e1cdb3b18f33d17bc SHA512 8da049e3cf1c131750b76aeeaa9edf30bad90eb5ec3b96f7cde902916ecc6b9d7e443fa10c4671a8a01fe85ec2357ddaff441a4e0d34ffe0b919dff0996f27ac
diff --git a/kde-apps/kate-lib/kate-lib-24.05.2.ebuild b/kde-apps/kate-lib/kate-lib-24.05.2.ebuild
index 1ddb9141581e..f69efc19c197 100644
--- a/kde-apps/kate-lib/kate-lib-24.05.2.ebuild
+++ b/kde-apps/kate-lib/kate-lib-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="LGPL-2 LGPL-2+ MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/kate-lib/kate-lib-24.08.0.ebuild b/kde-apps/kate-lib/kate-lib-24.08.0.ebuild
new file mode 100644
index 000000000000..634c862a61eb
--- /dev/null
+++ b/kde-apps/kate-lib/kate-lib-24.08.0.ebuild
@@ -0,0 +1,69 @@
+# 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/Manifest b/kde-apps/kate/Manifest
index ca9b27d0472d..3252d2875f33 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,2 +1,3 @@
 DIST kate-23.08.5.tar.xz 8043480 BLAKE2B 68b27c125a1e7f144ecc1d7b6d3348337b2f14f7fd61307e4ec64b74bb388378314d6575801bbc22c49bf4470133d8f91dede5f9b384a2f2356ec1e111da01f8 SHA512 d3647d7c6af74fdfdf3bf9eb9da906195215800025b43558bd6c9811bd2f457a52555c84997801e0b0badddcd99b0dd6e384bf9ec82790fb14cb20ff026a5a5b
 DIST kate-24.05.2.tar.xz 8149132 BLAKE2B a4708858c065963d5f18d7ca5670f98ca1d991e2a92fbb2de87d16b084ab18e87095cbb25195df6ea65f28041381e8be25481c71e06992b75dfe93ef0641e552 SHA512 f1f9957d32cd149d071e2ed7c86b9c943974f3901d8242476975c9af3d1ae1743a08d966a6962655a5ae32c722d3590461fa939f095d3f9f8196ec08427a441c
+DIST kate-24.08.0.tar.xz 8202144 BLAKE2B ef0d2914241a40cce4f6cebe0d6f04909a6d2bb4a0d2f83211d6d78156a819ed59e899b1d3f83cd6e996a57955cfa32e224a8006af50891e1cdb3b18f33d17bc SHA512 8da049e3cf1c131750b76aeeaa9edf30bad90eb5ec3b96f7cde902916ecc6b9d7e443fa10c4671a8a01fe85ec2357ddaff441a4e0d34ffe0b919dff0996f27ac
diff --git a/kde-apps/kate/kate-24.05.2.ebuild b/kde-apps/kate/kate-24.05.2.ebuild
index a11c4d5ac6c8..b6294fe601e3 100644
--- a/kde-apps/kate/kate-24.05.2.ebuild
+++ b/kde-apps/kate/kate-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/kate/kate-24.08.0.ebuild b/kde-apps/kate/kate-24.08.0.ebuild
new file mode 100644
index 000000000000..53b15c7c889e
--- /dev/null
+++ b/kde-apps/kate/kate-24.08.0.ebuild
@@ -0,0 +1,60 @@
+# 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
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets]
+	~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 d49778dcc58c..23ab1026351c 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,2 +1,3 @@
 DIST katomic-23.08.5.tar.xz 1454392 BLAKE2B be40de71bcc67f8ef026b2103d593779a8c5bd21d66888206e0fe38938f888e6b2d06f0b6bffd11210fac3d7ce10cb5a70fdc0a2604d0373437c5977be73c38f SHA512 053d00232c9d22037c7e5ca0c126a48188fc70286c07ea1c460dd378470778a695a9aa1222ee18f9925e0e762d21940a8710923b871bd8c3c7b6a5ef195f3704
 DIST katomic-24.05.2.tar.xz 1442844 BLAKE2B 2df76efc367aa779ae00f1806cd7f5d072722dc9e07d2f59d6475ddf3400ad762f2cf19e313042773b4c851aacbf0a3e06ccf0c4ab2d9e48618a2ccd30dda2b5 SHA512 7d859249d74d99a6f786fe7160678a6a7069135cb2a750189945dc13f02b12a1589dfe046bb938131fcc77bf298381187d72b3ba9aa990790304a3e22d0e2c33
+DIST katomic-24.08.0.tar.xz 1444528 BLAKE2B 0a5f4a5ca0400a52d36af5553eac114e2089c6bfd7863a865f3a7bf7562c8393a7a55f48929a9e46f184a12edfb0faeaa39b29c76b602579622263680e8fcbb9 SHA512 7fab74533adc4898166b91a17e115044e850dee21ad8f0edebf74032cedd73295080977d45410a6bc6a5994f0b317c514f69932fe538ce5d1b9df8487f901920
diff --git a/kde-apps/katomic/katomic-24.05.2.ebuild b/kde-apps/katomic/katomic-24.05.2.ebuild
index 705035a18f6f..095db40b5716 100644
--- a/kde-apps/katomic/katomic-24.05.2.ebuild
+++ b/kde-apps/katomic/katomic-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/katomic/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-24.08.0.ebuild b/kde-apps/katomic/katomic-24.08.0.ebuild
new file mode 100644
index 000000000000..bea3ffde6bbd
--- /dev/null
+++ b/kde-apps/katomic/katomic-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 9d1762d2b544..65ac8dd080aa 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,2 +1,3 @@
 DIST kbackup-23.08.5.tar.xz 400324 BLAKE2B dc252e9cd8de474aa6000e26f2db9645d8633aa7c6f3126a953475f88ea941a921bf5a15561a2724f96c94fba3a44b8b337fb3dad92fdf0a1ed2454f5e4044a6 SHA512 93d8cc5b9459dce624fa8acf7ded3987aceb63ab75d14081171560700bfc95f4b1a63bbea5ed0435e4cc0c9f53752de168e81ade70c1dd7492af619e923dd126
 DIST kbackup-24.05.2.tar.xz 374428 BLAKE2B 0b1a59ed3bfa36e4b9d7b1e5b226052167d5a4f22a60e1c2edf4a35f5d99d73998970625de0c3ff6892c5a7f983341d2dcb2b4b9628c8f05b8caee292de9e5f1 SHA512 8bce6bb0e66e0f4ef3811b33461e884cc614fb8f888d69559ab1f659d1eea930196e068151062144e7db762a8b0f21f4da39f354b49e9f61acde6bc5303891fb
+DIST kbackup-24.08.0.tar.xz 379588 BLAKE2B 98f9be79315f4035528cde99a95a463c3004a1ba19d64e1ae83a95bd1d1155262b6be814c96e2fabc5b833d4bda592cf8700bbf5ce0f399cd1f74377a0a7b686 SHA512 407694dc63bc17fa8e71fd5811a1773d9a651c525782f672ebf4daa37d3bdee39052e867b29a791292085ba2578e59ddbfef45969b21674f3fb6bd31999d44c3
diff --git a/kde-apps/kbackup/kbackup-24.05.2.ebuild b/kde-apps/kbackup/kbackup-24.05.2.ebuild
index a92925d17c80..8120660fe7b3 100644
--- a/kde-apps/kbackup/kbackup-24.05.2.ebuild
+++ b/kde-apps/kbackup/kbackup-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbackup/"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/kbackup-24.08.0.ebuild b/kde-apps/kbackup/kbackup-24.08.0.ebuild
new file mode 100644
index 000000000000..bf34ec223035
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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="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/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/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 08e02427397f..a1c5e93a7fe6 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,2 +1,3 @@
 DIST kblackbox-23.08.5.tar.xz 556816 BLAKE2B 3fd2c0a91ad505d5bc6792ed506997f3047ba0ce9a8b092eb6fe8785b7b43f451f56f52a46aabdb5329ac365feb407c55facbfbecdb5933d22dab5534c0d0002 SHA512 1b84cae0fca6146cb05f0e1abafd987dcaf4e24b07b52f5171e0f3bb8b9ef349086ea4bc08c6786d1a0d7e39beb10011f2b6ecf433966970d68c1b31339bc0c0
 DIST kblackbox-24.05.2.tar.xz 545340 BLAKE2B 422243392bc90522190ab761ecbc4f35a5783019c4f776b78ca4cdfa1640e18e5e3a3161d326d5b79fca068d28e02280becbfb2d569f113d44f90b09910cda55 SHA512 72b1a6ff28029f32e407ec1533e32626d61eba8232937de958bac5150783352d38a77721c3d8a9a8ebcb5a13a3c13b7cc3cc02c202e171cbe3aee00ac0b9a280
+DIST kblackbox-24.08.0.tar.xz 547160 BLAKE2B 5810f95d5e820c9f4ed908161640c7e2e0d2530699c8f4e86433847df6c58564f5eaf5519eb9114976126e0119ed219ca0aea3c50d16f814129424375a6288ee SHA512 2c756db4cec72cf04b3ae6da07f769f8aa9f1cfc477aad883aaccccac88e421006b2c17cb834b2b02bb1e16e84740b8447c457ab6e1908863c9259ef1bbe2313
diff --git a/kde-apps/kblackbox/kblackbox-24.05.2.ebuild b/kde-apps/kblackbox/kblackbox-24.05.2.ebuild
index 80439c1e0298..d6f737924c62 100644
--- a/kde-apps/kblackbox/kblackbox-24.05.2.ebuild
+++ b/kde-apps/kblackbox/kblackbox-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kblackbox/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-24.08.0.ebuild b/kde-apps/kblackbox/kblackbox-24.08.0.ebuild
new file mode 100644
index 000000000000..5b8eea13384e
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/kblocks/Manifest b/kde-apps/kblocks/Manifest
index f2aecbbf83e4..8b94b421f571 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,2 +1,3 @@
 DIST kblocks-23.08.5.tar.xz 2109492 BLAKE2B c3be3626fec75f46db8a94e04e72c5af35f426f5c1c4a339bc2dc4b6cbc3f79baa37ceda834a6f232f993519f2021d808e82c967c82db0a87f316c79671f15e4 SHA512 39525ea0cd7a0775efe1491f6960df28d8de65a775118e15cc1ef8d1ae70873829d096ec256f0505c4ca2fa0ecae1b49cbac6707f876afae2800a9307a055ad5
 DIST kblocks-24.05.2.tar.xz 2099824 BLAKE2B 2059d6bb7b10278c3a1ad5a583d80dc0dc1503058e2c228f7ba443ccf01fc19b1afb0754364cc86dbd10193e8bea08d013e89b3cf427feefb84302cdd5948574 SHA512 99c01a0a0739f2a6899d186a637e7f578d28dc5c67efb3e1b7c55c9a7686d36063d6e7df5504af479cff9845b0e7e0aeab11a547f7abfd5ce4a8c0fca404fa62
+DIST kblocks-24.08.0.tar.xz 2100104 BLAKE2B bf3bded422552b435001178171095373227f01dfb6811f8bfd59c3e629f6ef9af8e0e49d8ab73f9b01df320ba41c2702a0f341dabb9a5f60d4b97ab8dd3739ae SHA512 b60709ba5b3a0adef2fd0daf06f1c41c8efb4adff4a1cd26184aa16139123d2f9b3ac612aa60cd86123fa911028583ed1f8f8db8c4c09d0a393ff0bc8dcb28d4
diff --git a/kde-apps/kblocks/kblocks-24.05.2.ebuild b/kde-apps/kblocks/kblocks-24.05.2.ebuild
index 410e336537fe..5066181d79eb 100644
--- a/kde-apps/kblocks/kblocks-24.05.2.ebuild
+++ b/kde-apps/kblocks/kblocks-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kblocks/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/kblocks-24.08.0.ebuild b/kde-apps/kblocks/kblocks-24.08.0.ebuild
new file mode 100644
index 000000000000..3c15a2a8e2ed
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kbounce/Manifest b/kde-apps/kbounce/Manifest
index d2b0d84bd4d5..200ab74f064f 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,2 +1,3 @@
 DIST kbounce-23.08.5.tar.xz 3545492 BLAKE2B 37ad958addfa387c8d712fec1291066cf1534c3a05a9f4070af2126a06ecab51335e948873bd49fb855f1ecc38139a267fd24105b7a1f56e32b323d5d92993f2 SHA512 9783501977727a7dcf194aebbe980000168dd6eaf7af7d90a166489fd000eda93051ebcf97e473a4f72d98fe9faa2e6e4320231829217d6e927580b9fd16861c
 DIST kbounce-24.05.2.tar.xz 3319564 BLAKE2B a9827cd1a50f2e4cda10120f3b7f317f3ec24d29c030f6acca72ca592ce7a2db30cd124d6d9f9bffd6cbf01346c9bfba167dab669997ef8e7c94b0b05ad0e0b8 SHA512 287f5d0307fb5184088c1635e00a8c6776592cbcd795ee3977db2d6fc84043dc43c4acf2d43a7a7ff2d0b893711fcf27de89d92243e92008161c35b7f1a253b4
+DIST kbounce-24.08.0.tar.xz 3319716 BLAKE2B 55a31136d2ab7f3ca89ea1d3dabaf99b1217a13ddca247668fa195808303cbfb13cf5dad03297b186fd5c987f8120dd06390c0ad3930a9c08b43d5477a646667 SHA512 70d9240522e178efc1b2bd6cc6628fa0ef1803829b119a39e47497102e96f34e63995352e0d015cba856ff75ba3aa0b4e442aa6869f58787babb9b86e1e22922
diff --git a/kde-apps/kbounce/kbounce-24.05.2.ebuild b/kde-apps/kbounce/kbounce-24.05.2.ebuild
index 3a536a4244fd..d8ff962b22c5 100644
--- a/kde-apps/kbounce/kbounce-24.05.2.ebuild
+++ b/kde-apps/kbounce/kbounce-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kbounce/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/kbounce-24.08.0.ebuild b/kde-apps/kbounce/kbounce-24.08.0.ebuild
new file mode 100644
index 000000000000..c50112413e43
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 3088928bb34e..535dc041d045 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,2 +1,3 @@
 DIST kbreakout-23.08.5.tar.xz 2561604 BLAKE2B 1852d1ba1657328a8865da495bd7884ce08b96165e22aa5b874d72dbdded4ed4aafef2764708016af3c8fb97818dde5f71f56ab902c34f5b5b66ec3b4232c6c9 SHA512 ba7b135c89430312e879a64e25274fd1ffff6dcae7fde6fb02d9db19bf4d1e6808d727cecb396e25797e9dad748ad986c429c56db50b7920868d78b35ae5e707
 DIST kbreakout-24.05.2.tar.xz 2551648 BLAKE2B 4a057fd220e596e0ca47ecbf249b672a9e3b779f4773a26e18f92ef763e64e1ac99d58abdba398dcf9a1eb0b4463068eeb4600e15dcb9e3307dc16a6e2e5bfcb SHA512 fcffd119056a404267f100632d337ec32277fd8497a390404a11995900b221cbe6bf6c4115629af193f981b3ca576ca0e7db48e1408c8b14a120431d4a05a064
+DIST kbreakout-24.08.0.tar.xz 2552364 BLAKE2B 7382e858e9da18829ea897bbc3d6f6b45b2b27f2f4b43c5fe85defcee342b6f294789e00c5e3cf62f0835f8b6851aa3628777a25692e624d7d63a9e8319d17dd SHA512 5b99979e16ded1a3f1a1c6f493ef0e9bd9f0d7aebac3ef370c95ca33c2b4b542558bd07717a1cd567d89874fa38e20dc39f28630dd7707103f1de4d75e6398bd
diff --git a/kde-apps/kbreakout/kbreakout-24.05.2.ebuild b/kde-apps/kbreakout/kbreakout-24.05.2.ebuild
index 02f4bfecff92..8d5c071f3063 100644
--- a/kde-apps/kbreakout/kbreakout-24.05.2.ebuild
+++ b/kde-apps/kbreakout/kbreakout-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kbreakout/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-24.08.0.ebuild b/kde-apps/kbreakout/kbreakout-24.08.0.ebuild
new file mode 100644
index 000000000000..873bd4773e6b
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/kbruch/Manifest b/kde-apps/kbruch/Manifest
index b36555ea99bd..f4ad2ae47a4c 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,2 +1,2 @@
-DIST kbruch-23.08.5.tar.xz 5662960 BLAKE2B d1b5a2e54c3c196d366c1cf7f26b132b7d530f23128bedf8c729988349b18e6e056097642982853a3a9c18a1a8f0614083de010e8583ebfef981f8bcc7fd308c SHA512 3c21ad952f0a9cc01ede94861a38601debd737ab35ea7d1619952b4922f0d4896c0a034e67ef9dcb16552624a431e41fd5c62010e8ba667f0579531eb54cd4d0
 DIST kbruch-24.05.2.tar.xz 5148168 BLAKE2B c7b4b82e3329a19b6c40914d38d9665a6500d985c6872574c0b60875e90196a388aee19e856d97c6af8644d278dea55d6be68724b305797fac1c8c72a24eb2cd SHA512 333299e9d12dea151f1bf1b6b7676f28aaec5db133e63f1ba0ba767b811a9167ecb9f12c8e247fbfb8cb14794d9464c46854582f59b05eafe344f5adebaa2bca
+DIST kbruch-24.08.0.tar.xz 5151748 BLAKE2B cedc757e5bfe70a6f368ebd749a98caadbf9297c2f4fcc40dca10827d111a9f4ede15e01594f9c898f71a2610741afbb47e7593b497854a0efd47b51e5ac7e22 SHA512 9549cec9a53aa9f838cc3d0d1ac7ba525c86f220ecfc5b7ca89c963a96e355e236cdb6c05e3e3f897eaa9178a222234f0e0365c26c5e58011218b5b1944a6330
diff --git a/kde-apps/kbruch/kbruch-23.08.5.ebuild b/kde-apps/kbruch/kbruch-23.08.5.ebuild
deleted file mode 100644
index d05adcc17610..000000000000
--- a/kde-apps/kbruch/kbruch-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/kbruch-24.05.2-r1.ebuild b/kde-apps/kbruch/kbruch-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..b38673fb9bcb
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-24.05.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.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.05.2.ebuild b/kde-apps/kbruch/kbruch-24.05.2.ebuild
deleted file mode 100644
index c55850fa7bd0..000000000000
--- a/kde-apps/kbruch/kbruch-24.05.2.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="forceoptional"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.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/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/kbruch-24.08.0.ebuild b/kde-apps/kbruch/kbruch-24.08.0.ebuild
new file mode 100644
index 000000000000..fbef6479aaa8
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-24.08.0.ebuild
@@ -0,0 +1,29 @@
+# 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/ https://edu.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 a4a55f8dbddd..a068b8263922 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,2 +1,2 @@
-DIST kcachegrind-23.08.5.tar.xz 938564 BLAKE2B 6f44b9d4fbb1e02c17b741f9f3beb6db445a8006987c03d3459c3b3dcac4844cc2fdee52b67d22b1bc1e2892d361beb6471af755e157a92bacffa5bfc16fa7e8 SHA512 1025729b9dd537c954fc8ee4412a1e4bcfa7d25961cea397d73ef9e8b05709a62210007c6321c7781db164871a0a52fb0efbbf8885c6e4f13f907d29ee806af0
 DIST kcachegrind-24.05.2.tar.xz 934500 BLAKE2B 63080666168c866a6b5defb1a539f3781af8590137823df2a32516e65ea28d00f498afeb45b6840e3b65c072aae94543cbf91a72183039fdcbea19f3ce0f648b SHA512 3f220c50b66eea038e77dd020e401ae14f9fbb02839f509c73637f79bdfc2372da60302f29103a7654c580b10342d36561274ded3970631e1f7733c20970e241
+DIST kcachegrind-24.08.0.tar.xz 934724 BLAKE2B bb4559f4b57d24bd43e098250b084b0e13412c192fe5108e1889d7e9152041170fb12f6e5266f58650672c3321dc049b2eeee4f9e243e62cf7fb5648e7e1a130 SHA512 eb79a0ed1dd3ecec9d4793bd6076b38098cdfbae450b5e5319711385e58e3579ce13f083e3ddeb3580f4feb954dd00163d40437bda484e61db200ff64af5062e
diff --git a/kde-apps/kcachegrind/kcachegrind-23.08.5.ebuild b/kde-apps/kcachegrind/kcachegrind-23.08.5.ebuild
deleted file mode 100644
index faf45403d98b..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-23.08.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="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/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
diff --git a/kde-apps/kcachegrind/kcachegrind-24.05.2.ebuild b/kde-apps/kcachegrind/kcachegrind-24.05.2.ebuild
index 96e6fb1bd803..60a8a47f29f4 100644
--- a/kde-apps/kcachegrind/kcachegrind-24.05.2.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-24.05.2.ebuild
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-24.08.0.ebuild b/kde-apps/kcachegrind/kcachegrind-24.08.0.ebuild
new file mode 100644
index 000000000000..a91d5686a374
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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="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 d91254857008..049d298c5a17 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,2 +1,3 @@
 DIST kcalc-23.08.5.tar.xz 441012 BLAKE2B a6df25ee2e29068c0dd8917ce9156a19f36d599e10099025f6025bb28d1d7c81417325e73220d7d92c1bb4e7e211fe2c3863fa31d00ae766457cb60dc8f0e625 SHA512 945bf5944aba66868478b2d6cb1b184fbe394328c1de3fd1edf4e8aacef7f072a1e5fdbfbf49fd99219cd027df928b4db03908c0509a9913ebd16599611bf657
 DIST kcalc-24.05.2.tar.xz 462628 BLAKE2B 27961dc6ad7dd2298f87b4c7c41bf3d3dbbd3f20ed84ee21066119f444f80606ad2c81fb66f4f66956a6e92ddbb7dbc4c15803d3f4e146efb69d0cdf4f6621e9 SHA512 f94ff9d786e49271c1d6943a24c5f994c038be838c81260fec313aa85923efe268ce15cb4f383913a3854851fb5e0955af9ec3733bfb7b19441904467109146c
+DIST kcalc-24.08.0.tar.xz 472068 BLAKE2B dde3ae4bde1340bfff8c0567ae7a2d623b53484b3cc5e78e23059886232d45b23aba1baf14bf07f863a85006d132efb88e677efcd5c66cc5c04da103f93aaac8 SHA512 c96b2aba0a89c67bec71c204acf3621c82b04924ad0db2690225558d6e809609dc3f7ef534dac160a99d7ece5b4450558b7d0dde23d7c024d38b28426edb3152
diff --git a/kde-apps/kcalc/kcalc-24.05.2.ebuild b/kde-apps/kcalc/kcalc-24.05.2.ebuild
index f8e5bc548800..ab22e0a4940d 100644
--- a/kde-apps/kcalc/kcalc-24.05.2.ebuild
+++ b/kde-apps/kcalc/kcalc-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kcalc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalc/kcalc-24.08.0.ebuild b/kde-apps/kcalc/kcalc-24.08.0.ebuild
new file mode 100644
index 000000000000..e8738c3b770c
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-24.08.0.ebuild
@@ -0,0 +1,35 @@
+# 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/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 cabab754d86d..60ae35934d07 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,2 +1,3 @@
 DIST kcalutils-23.08.5.tar.xz 353696 BLAKE2B e3f8db5354b6c87f4543feed6bce4eea20dfd79a977eb2fd5b50bbd5489b559cdb5a015cf9f61d6891a694b63617888ec60c89583b0d83d936a11c40c5d96ce7 SHA512 3709421ce8ea993978d47031cb46b68641551abf4933f957ab8f2a0f136cf56bd96b0a6f3ed945809ae4e16ddce8d601ea096cc33c09d9b4567aec5a3260cd51
 DIST kcalutils-24.05.2.tar.xz 354868 BLAKE2B 988390c545e63a6f2b37768d5b96b73f7898e2be8ab9fec831129b05655cabd1b5ac1cad503da3d99170ceb7395176cabaf3486d6dc3013a1ef12c14d3f3b8e2 SHA512 6a4fe1b6790afa571fc09227b6c6b185e39d479dbfc64f8071df99fdc05f5452d01305fed32e8bd36034aeb13246db4a4c94697a620649c0fa085ee8fb135660
+DIST kcalutils-24.08.0.tar.xz 355312 BLAKE2B ba1a80e5cc65b449d822bdb9789b19203b21570358422102eeedbac86d6723b691f2bd21ac6a2740aef7392b0eba5e31d7ba99d98cd3bfdd3fc9d0d1a1bbdbb9 SHA512 f03bc6ef46040d6a2261bb20e767a5a9d19364e9b83be4eaaab6097d23dee683634f3a449cd561214924ed31ccdf39f4414545df0972d711f79eb54928c74651
diff --git a/kde-apps/kcalutils/kcalutils-24.05.2.ebuild b/kde-apps/kcalutils/kcalutils-24.05.2.ebuild
index baa91608e44d..d647d5791279 100644
--- a/kde-apps/kcalutils/kcalutils-24.05.2.ebuild
+++ b/kde-apps/kcalutils/kcalutils-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # bugs 653616, 711666
diff --git a/kde-apps/kcalutils/kcalutils-24.08.0.ebuild b/kde-apps/kcalutils/kcalutils-24.08.0.ebuild
new file mode 100644
index 000000000000..681dc08c4a62
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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.5.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 f853794df5e4..99d3c273cd9a 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,2 +1,3 @@
 DIST kcharselect-23.08.5.tar.xz 384536 BLAKE2B a37a57610814628f17bdb3eee7afb3b0782e8afbb81380bcf241d1c11ad1435cd9ae3eb9447565f7bc3deda0abbb8249a54acdb933f054a50a1aff5f50df3c2f SHA512 611eceb71478cf03545f8b9daaf848bff9f2b78f306dc7a5e0b3271f95cf56049b6203b3fd92c0d621e3b2e2395c71e90f771e2c1a0ee175ebf8bed9edaac7f5
 DIST kcharselect-24.05.2.tar.xz 474188 BLAKE2B ba9f98ea5ab688f81471e452c133430b5556d63378e855bb551736258e15cb3183f1722876d9181d19022a0bea126820a4b30b4b7d2e60a1160c38b871729071 SHA512 06d55d8bf8502e42c2011fe59e33dea3845028f318f8693dfc0bcf4b5595f0d757fe8c987b327465ffa9c59fb160ff5df7eb655be760b75e8f296b3af404625f
+DIST kcharselect-24.08.0.tar.xz 475768 BLAKE2B 6714e36bbf6e46d5a5522022159f717bbee11d7635dac4d6e435c4d2e2309b3f16896ea3d64ed7972bd656628e8871b80d5b1b3b49b7fae5ee7a306055f695e7 SHA512 703971eec532744ecc3b0368fda62edf8a8f010f008047e5d76be6d4989f489390db83288ac9369e29d37b57694329b449e034a99d471ef67b6c6d2464f8fcef
diff --git a/kde-apps/kcharselect/kcharselect-24.05.2.ebuild b/kde-apps/kcharselect/kcharselect-24.05.2.ebuild
index a4cf788f7e7a..57f4193a9217 100644
--- a/kde-apps/kcharselect/kcharselect-24.05.2.ebuild
+++ b/kde-apps/kcharselect/kcharselect-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kcharselect/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-24.08.0.ebuild b/kde-apps/kcharselect/kcharselect-24.08.0.ebuild
new file mode 100644
index 000000000000..7ccf4253662b
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index b9b0ee593c90..a64c9cc44772 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,2 +1,2 @@
-DIST kcolorchooser-23.08.5.tar.xz 34908 BLAKE2B c6ecd9316152301b765236082bc081a9db2f32cca6936a6de0efd7fc91559e37a6977c1608548fc90a645585565aefe53d3bde846a41f543564a4d7f37ff6f7a SHA512 d5c515e4caa06f4b952ce09056b8bc61757f0432713bd10b4164e8a27487df8254daa0e5ad7b35d34d64b9d54c89a93eb8c716a272e8ed0bb358434211f169ec
 DIST kcolorchooser-24.05.2.tar.xz 35228 BLAKE2B d33ad00b201cc0dd42eb54a1b3c8f8701dd0fcf9ea20b4d0935146003347b545937c177ee934b0384a295d61cc0a768abce28801cf6ccef1afb7f1a072203d3c SHA512 d648257588aae74c27e6f5acb46f8d1a79609a8a5b2d2698e0c6d7695c1d79ad2f79138b5417a4ec4b9d32e5d30315334cc03b21264eb4aa34235d1626f2d41b
+DIST kcolorchooser-24.08.0.tar.xz 35296 BLAKE2B 96fd76f062393712ceecae58c04b93cc01ae785061f16840eaf10bb6a4155a5d1ad1fa8a2bc92bf8102301fe993c75c1f15bbc04762703e3be9c55537b275bd2 SHA512 a4cbdde0949f664667ee2e4dbdc9b3d69f14ace0cbaab24818ce8fb7b6b852589f3a755ae962ed2fdf27a3477d6c21f37795557299e57e5709db358448b04bf8
diff --git a/kde-apps/kcolorchooser/kcolorchooser-23.08.5.ebuild b/kde-apps/kcolorchooser/kcolorchooser-23.08.5.ebuild
deleted file mode 100644
index 6ef3dfc2cf9d..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-23.08.5.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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://apps.kde.org/kcolorchooser/"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-24.05.2.ebuild b/kde-apps/kcolorchooser/kcolorchooser-24.05.2.ebuild
index 79a91e455996..9268a3dee300 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-24.05.2.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-24.05.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kcolorchooser/"
 
 LICENSE="MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/kcolorchooser-24.08.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-24.08.0.ebuild
new file mode 100644
index 000000000000..1d61bae5e817
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-24.08.0.ebuild
@@ -0,0 +1,24 @@
+# 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/kcron/Manifest b/kde-apps/kcron/Manifest
index cb4047d8b2af..5c77964401ef 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,2 +1,2 @@
-DIST kcron-23.08.5.tar.xz 942512 BLAKE2B 1d22d416161771612c2d9447fea529ff609ae5182074c0133f3e27b6b6e93feca72d07d4d76ef1dc79ae8c944bf365619ae7ce8fd63d1f0676453d9f53d44e87 SHA512 228767bec29a3e358100617ad597c1b131f3663984dfb077fe7d589222fb7f6cbc509e6a5332bd56027b82813394e8e60c99849624fa32013db596267780de32
 DIST kcron-24.05.2.tar.xz 876876 BLAKE2B 4458c3c857a1fc9dff32fa23b44c30c0cde512691a673a75d8567f73626a9ac24fed274db436c3d294efe7195d761b9a0c31e6ffb143494341b6802dd2259794 SHA512 8a16c00ece7d0208e21dbd449a993d67cfec4935fee456409dc69cd6f2f64dfcddb740faa58947b9c74914396611effc2fea84e3ed81d63a44e18e75816be7c2
+DIST kcron-24.08.0.tar.xz 876936 BLAKE2B 352fc3e5b65dfa0a33d1ebce4c2e7be028bf185ed5c470a50f3ec6a586b1dab069a28575c9541011f0de904924242457869ea22c3f67f211ed84ca17da204b44 SHA512 991c23df1c739b00b717ed6a72d28c5b0a554c0da15151ef48d16d87d9cc27b9d30b1ed11b8f0691b913b8ccdf7f87ece8b737577b33a956836c49febc032072
diff --git a/kde-apps/kcron/kcron-23.08.5.ebuild b/kde-apps/kcron/kcron-23.08.5.ebuild
deleted file mode 100644
index 88ce6a09d4f4..000000000000
--- a/kde-apps/kcron/kcron-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Task Scheduler"
-HOMEPAGE="https://apps.kde.org/kcron/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	virtual/cron
-"
diff --git a/kde-apps/kcron/kcron-24.05.2.ebuild b/kde-apps/kcron/kcron-24.05.2.ebuild
index 4932cb801378..600789a1e9be 100644
--- a/kde-apps/kcron/kcron-24.05.2.ebuild
+++ b/kde-apps/kcron/kcron-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kcron/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/kcron-24.08.0.ebuild b/kde-apps/kcron/kcron-24.08.0.ebuild
new file mode 100644
index 000000000000..bf1036e09c98
--- /dev/null
+++ b/kde-apps/kcron/kcron-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${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
+"
+RDEPEND="${DEPEND}
+	virtual/cron
+"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-23.08.5.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-23.08.5.ebuild
deleted file mode 100644
index 3cdd1ae0edb9..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-23.08.5.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 x86"
-IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
-
-RDEPEND="
-	>=kde-apps/kdecore-meta-${PV}:0
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:0 )
-	admin? ( >=kde-apps/kdeadmin-meta-${PV}:0 )
-	education? ( >=kde-apps/kdeedu-meta-${PV}:0 )
-	games? ( >=kde-apps/kdegames-meta-${PV}:0 )
-	graphics? ( >=kde-apps/kdegraphics-meta-${PV}:0 )
-	multimedia? ( >=kde-apps/kdemultimedia-meta-${PV}:0 )
-	network? ( >=kde-apps/kdenetwork-meta-${PV}:0 )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:0 )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:0 )
-	utils? ( >=kde-apps/kdeutils-meta-${PV}:0 )
-"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-24.05.2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-24.05.2.ebuild
index dc818e8d7f19..8ef04669d796 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-24.05.2.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
 
 RDEPEND="
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-24.08.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..0743b66b6198
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-24.08.0.ebuild
@@ -0,0 +1,26 @@
+# 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-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 89c1d30dbe13..305d3e89fa5f 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1 +1,2 @@
 DIST kde-dev-scripts-24.05.2.tar.xz 376192 BLAKE2B 29f0b0dbddbc88691b7d3fcfe036985e5aa6c8b40c676ed8a604659d4f1c368bb65da490f6d7f5a6a58c50aebf0f9b8deba191d070be4e49321bc20aa2e3f05c SHA512 a592813d3820932d7b9847eab153b556c23a2c0ae45af8d88b13a9af39aa45350d91c9fe78c6e850a7259e5dad90c282ad809392dd3793db55c1a365eee28f46
+DIST kde-dev-scripts-24.08.0.tar.xz 371932 BLAKE2B 2425b01dfb5540a46cc89ffca8358856a491268832315eac8b50081be4f9b234399c8672bec1176ffaeedbfe0635ef25ae8597985e572b6bb9bce815e2efdd39 SHA512 b7b80b2f9bc2e6ef3296cd47c1b6cb4bd1e198e31358d5d8d27415d20f796c834ffddb8fb7d46d44d71b08388f9faabdcea44e3745fea97ced12102b8a83f812
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-24.08.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-24.08.0.ebuild
new file mode 100644
index 000000000000..8c5f0c4f1edb
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-24.08.0.ebuild
@@ -0,0 +1,28 @@
+# 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-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 1c77a12b36a9..144e90e923ca 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,2 +1,2 @@
-DIST kde-dev-utils-23.08.5.tar.xz 75136 BLAKE2B 098df3e332e8ed1deecb8e1a50d43df0f549e18cc4739baa72392ac2e9c9cbe0e2dbb75d6ee5b90328fb74a9ae4297927286ec7996fc43b2214d716fab36f200 SHA512 08404c3aa9842f18abbcf02ba5ac6d6d07d9f2e2bf65d2c43530a3c16b4ce805d8ca149d9801ee25af392832ccc4504105490620767a75fb04224c2b57932499
 DIST kde-dev-utils-24.05.2.tar.xz 74756 BLAKE2B fded4f3334e65f32b44c10dcbb27b9d46387fc5b7382a7ececb1b5392907d7d327c67e613acd279cef36e0a9d8e7b002c81f53b7c3dc7a8bfb4127a352b3a2d2 SHA512 136f9692ba703de38bb1bec6b8a199638d7110a5fa0ffaf1ba1151a6488dcf9e0d371a299cf4f59408c6c1de400f63f44b893f96b1581ec4c0a82926205eea6d
+DIST kde-dev-utils-24.08.0.tar.xz 74832 BLAKE2B 5e1a29afb792f5cd806e737e9d6ed64113e391b3ce4b2ce968c4aae0865aba065e7c1bfee682aecda18c7f21314fefb499d4019d39e708a97b6e014eef7f1949 SHA512 34a59bb26af4e2a8e409076cdb8cf4197757c3294470f502e5fdaa6c7152e2924a0020b3d10c12a8268950d4ee650d7f0ba8b1e5c1cd62bb6fce1b182b35d1cd
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-23.08.5.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-23.08.5.ebuild
deleted file mode 100644
index b2256f3abdd6..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-23.08.5.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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Development Utilities"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-24.05.2.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-24.05.2.ebuild
index aae48d09d276..9d30ab9f6f1a 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-24.05.2.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-24.08.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-24.08.0.ebuild
new file mode 100644
index 000000000000..60c3d150729d
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-24.08.0.ebuild
@@ -0,0 +1,30 @@
+# 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/kdeaccessibility-meta/kdeaccessibility-meta-23.08.5.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-23.08.5.ebuild
deleted file mode 100644
index d449d6c3701c..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-23.08.5.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}:5
-	>=kde-apps/kmag-${PV}:5
-	>=kde-apps/kmousetool-${PV}:5
-	>=kde-apps/kmouth-${PV}:5
-"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.05.2.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.05.2.ebuild
index 15249438700f..c2b945539e0b 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.05.2.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.08.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..15249438700f
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-24.08.0.ebuild
@@ -0,0 +1,19 @@
+# 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/kdeadmin-meta/kdeadmin-meta-23.08.5.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-23.08.5.ebuild
deleted file mode 100644
index 5ddca5c0d446..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-23.08.5.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
-
-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="
-	>=kde-apps/ksystemlog-${PV}:5
-	cron? ( >=kde-apps/kcron-${PV}:5 )
-"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-24.05.2.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.05.2.ebuild
index 4beebb4632be..12d9b0a88b8d 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-24.05.2.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-24.08.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..4beebb4632be
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-24.08.0.ebuild
@@ -0,0 +1,17 @@
+# 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="
+	>=kde-apps/ksystemlog-${PV}:*
+	cron? ( >=kde-apps/kcron-${PV}:* )
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 16ae183ffccb..4ac5bcd49216 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,2 +1,3 @@
 DIST kdebugsettings-23.08.5.tar.xz 108668 BLAKE2B aa351ce7c54c4963240e11a18dfdac28b3e4c32d04e8d86dcaa6c5edbe262fb26084275e66915293017a29fc8a42d0905f6e0703c8d3af2ffa76a8bf2a273fb8 SHA512 6087f3e66e8d931d7dc5777b544372f38066beb9d1f4b5b78031d930b8cdcf0b95c29cd9b5f45d249edeca35ecf01424ebb18481267c3d1d7ccf0c2b9e2d349e
 DIST kdebugsettings-24.05.2.tar.xz 112776 BLAKE2B 8663d56db7f20754dcc5bffbe4a971ccbbebd6f55014ed9746a7eab54323079873c30ad64211aaeef4eeaf883bff5f97a86bc058329f9d22553d78e80f8af041 SHA512 9d4e33c025c42cad228643f93679aaf20cf5a93cfcd0ad184f13a39ba529a24c5db211341ada3bf661d7e1e59240ffeafefaf4934c98bc2ad9a772ba04a4328b
+DIST kdebugsettings-24.08.0.tar.xz 114736 BLAKE2B e5d67d6774240d9dbb00990f71a04c5bb32938daab0e9a59ef1c20f5930d38da6895902efbe9d78296c0079d6daf13e84432c02b2a063ad6b55b6ebbf9ffa8dc SHA512 124b0369797d016ede149cd80a1b2c15d6a00bd282c0074ca3f8de012d729ef6b0149d370ed75b32dea622649cd0cb1f24c209d59ffe58c8e1e6366e2730dabe
diff --git a/kde-apps/kdebugsettings/kdebugsettings-24.05.2.ebuild b/kde-apps/kdebugsettings/kdebugsettings-24.05.2.ebuild
index 95268b22ec2a..f0c7982209ac 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-24.05.2.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdebugsettings/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-24.08.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-24.08.0.ebuild
new file mode 100644
index 000000000000..25f9c0a7b7c3
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/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-23.08.5.ebuild b/kde-apps/kdecore-meta/kdecore-meta-23.08.5.ebuild
deleted file mode 100644
index 2079181d1642..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-23.08.5.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="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="+handbook +share +thumbnail +webengine"
-
-RDEPEND="
-	>=kde-apps/dolphin-${PV}:5
-	>=kde-apps/kdialog-${PV}:5
-	>=kde-apps/keditbookmarks-${PV}:5
-	>=kde-apps/kfind-${PV}:5
-	>=kde-apps/konsole-${PV}:5
-	>=kde-apps/kwrite-${PV}:5
-	handbook? ( >=kde-apps/khelpcenter-${PV}:5 )
-	webengine? ( || (
-		>=www-client/falkon-${PV}
-		>=kde-apps/konqueror-${PV}:5
-	) )
-"
-# Optional runtime deps: kde-apps/dolphin
-RDEPEND="${RDEPEND}
-	share? ( kde-frameworks/purpose:5 )
-	thumbnail? (
-		>=kde-apps/ffmpegthumbs-${PV}:5
-		>=kde-apps/thumbnailers-${PV}:5
-	)
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-24.05.2-r1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..1d32a601df93
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-24.05.2-r1.ebuild
@@ -0,0 +1,32 @@
+# 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.05.2.ebuild b/kde-apps/kdecore-meta/kdecore-meta-24.05.2.ebuild
deleted file mode 100644
index 62fdc11c12d1..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-24.05.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
-
-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 +thumbnail +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 )
-	thumbnail? (
-		>=kde-apps/ffmpegthumbs-${PV}:*
-		>=kde-apps/thumbnailers-${PV}:*
-	)
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-24.08.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..94abe4655261
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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 ~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/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index 0d9e85803212..7ea8697f712f 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="share">Install <pkg>kde-frameworks/purpose</pkg> for share file context menu actions in <pkg>kde-apps/dolphin</pkg></flag>
-		<flag name="thumbnail">Install <pkg>kde-apps/ffmpegthumbs</pkg> and <pkg>kde-apps/thumbnailers</pkg> for thumbnail generation in <pkg>kde-apps/dolphin</pkg></flag>
 		<flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 4a30e019ecfa..66e39db2914b 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,3 +1,2 @@
-DIST kdeedu-data-23.08.5.tar.xz 333492 BLAKE2B 82507a4d46fceff8c744f55561de231d07219b52022623987c647814e0ace977fc8af555d9c937aec78aaa0b959c6e86ea0a983b50f45079e99b5ab0cbfa24d7 SHA512 5afefd88d3822f2ba20cbc1806d4d8532bef269cf3eb5da55c0fe964a9634e3dcdf6d69717dc859a3158699ec77e0015aff656cfc316136acfc983582bc9f08b
-DIST kdeedu-data-24.02.2.tar.xz 338732 BLAKE2B df39e63497d0640e0c25ede6767742ebe1fb9635303acd0a8201d9969bdd162cd8ba757794340aafb0836967941f1efb81f4ccb1ec722938497c0c0b209830bf SHA512 bfbaf93b23afeb42dbf3d6fa28f624af0f8d5053283a1fef0786e564222378e1ff264145b338423c2275f0c789f50755f3983c0ff92e3ac3adeaf760c8a297d2
 DIST kdeedu-data-24.05.2.tar.xz 338808 BLAKE2B bbdf51f415154f307cbee529ef0ef5ac7346b74546eb8836051912d5cbb7bd3d37e565bc32547659cb508ee356be8e85004366f485064e675657231c64802319 SHA512 bcac6572b012c9ee2f99a22070490a4f44064c5f41be038ff6d94f5e40a4b697604ed7fa838edb3649f944a3a47d8140f693352066319c513ba7e554445f069e
+DIST kdeedu-data-24.08.0.tar.xz 338880 BLAKE2B d861627ef6ce6463328d02265970def168cc0e63af008d96d48ca13be6b2a57cdc29c8f87bc0c3a108e0a6840a76300e20acc37e07c4b19eb6318f9f97125fe9 SHA512 dddd0acae527081d2dcd8b7ae297ffa4de9737cddb20d673d0a49c458a4c96aabdd163ea1047b778a12dd3396890caebabcc2ebef85619acffa466c050930616
diff --git a/kde-apps/kdeedu-data/kdeedu-data-23.08.5.ebuild b/kde-apps/kdeedu-data/kdeedu-data-23.08.5.ebuild
deleted file mode 100644
index f0965bfdb32b..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-23.08.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
-
-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/qtcore:5
-	kde-frameworks/extra-cmake-modules:0
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.02.2.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.02.2.ebuild
deleted file mode 100644
index 5fb24685559f..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-24.02.2.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/qtcore:5
-	kde-frameworks/extra-cmake-modules:0
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.05.2.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.05.2.ebuild
index 9cfc69e35a79..faa4befbfb84 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-24.05.2.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-24.05.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Shared icons, artwork and data files for educational applications"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-24.08.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-24.08.0.ebuild
new file mode 100644
index 000000000000..9ae81c95eb47
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-24.08.0.ebuild
@@ -0,0 +1,18 @@
+# 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-meta/kdeedu-meta-23.08.5.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-23.08.5.ebuild
deleted file mode 100644
index 8d1c2ea31be0..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-23.08.5.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://edu.kde.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+webengine"
-
-RDEPEND="
-	>=kde-apps/analitza-${PV}:5
-	>=kde-apps/artikulate-${PV}:5
-	>=kde-apps/blinken-${PV}:5
-	>=kde-apps/kalzium-${PV}:5
-	>=kde-apps/kanagram-${PV}:5
-	>=kde-apps/kbruch-${PV}:5
-	>=kde-apps/kdeedu-data-${PV}:*
-	>=kde-apps/kgeography-${PV}:5
-	>=kde-apps/khangman-${PV}:5
-	>=kde-apps/kig-${PV}:5
-	>=kde-apps/kiten-${PV}:5
-	>=kde-apps/klettres-${PV}:5
-	>=kde-apps/kmplot-${PV}:5
-	>=kde-apps/kqtquickcharts-${PV}:5
-	>=kde-apps/ktouch-${PV}:5
-	>=kde-apps/kturtle-${PV}:5
-	>=kde-apps/kwordquiz-${PV}:5
-	>=kde-apps/libkeduvocdocument-${PV}:5
-	>=kde-apps/marble-${PV}:5
-	>=kde-apps/minuet-${PV}:5
-	>=kde-apps/rocs-${PV}:5
-	>=kde-apps/step-${PV}:5
-	webengine? (
-		>=kde-apps/cantor-${PV}:5
-		>=kde-apps/kalgebra-${PV}:5
-		>=kde-apps/parley-${PV}:5
-	)
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-24.05.2.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-24.05.2.ebuild
index 92a9530be995..f99105d34cee 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-24.05.2.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://edu.kde.org"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="+webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-24.08.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..92a9530be995
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-24.08.0.ebuild
@@ -0,0 +1,42 @@
+# 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://edu.kde.org"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+webengine"
+
+RDEPEND="
+	>=kde-apps/analitza-${PV}:*
+	>=kde-apps/artikulate-${PV}:*
+	>=kde-apps/blinken-${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/cantor-${PV}:*
+		>=kde-apps/kalgebra-${PV}:*
+		>=kde-apps/parley-${PV}:*
+	)
+"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-23.08.5.ebuild b/kde-apps/kdegames-meta/kdegames-meta-23.08.5.ebuild
deleted file mode 100644
index cf71014ad285..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-23.08.5.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
-
-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="
-	>=kde-apps/bomber-${PV}:5
-	>=kde-apps/bovo-${PV}:5
-	>=kde-apps/granatier-${PV}:5
-	>=kde-apps/kapman-${PV}:5
-	>=kde-apps/katomic-${PV}:5
-	>=kde-apps/kblackbox-${PV}:5
-	>=kde-apps/kblocks-${PV}:5
-	>=kde-apps/kbounce-${PV}:5
-	>=kde-apps/kbreakout-${PV}:5
-	>=kde-apps/kdiamond-${PV}:5
-	>=kde-apps/kfourinline-${PV}:5
-	>=kde-apps/kgoldrunner-${PV}:5
-	>=kde-apps/kigo-${PV}:5
-	>=kde-apps/killbots-${PV}:5
-	>=kde-apps/kiriki-${PV}:5
-	>=kde-apps/kjumpingcube-${PV}:5
-	>=kde-apps/klickety-${PV}:5
-	>=kde-apps/klines-${PV}:5
-	>=kde-apps/kmahjongg-${PV}:5
-	>=kde-apps/kmines-${PV}:5
-	>=kde-apps/knavalbattle-${PV}:5
-	>=kde-apps/knetwalk-${PV}:5
-	>=kde-apps/knights-${PV}:5
-	>=kde-apps/kolf-${PV}:5
-	>=kde-apps/kollision-${PV}:5
-	>=kde-apps/konquest-${PV}:5
-	>=kde-apps/kpat-${PV}:5
-	>=kde-apps/kreversi-${PV}:5
-	>=kde-apps/kshisen-${PV}:5
-	>=kde-apps/ksirk-${PV}:5
-	>=kde-apps/ksnakeduel-${PV}:5
-	>=kde-apps/kspaceduel-${PV}:5
-	>=kde-apps/ksquares-${PV}:5
-	>=kde-apps/ktuberling-${PV}:5
-	>=kde-apps/libkdegames-${PV}:5
-	>=kde-apps/libkmahjongg-${PV}:5
-	>=kde-apps/lskat-${PV}:5
-	>=kde-apps/palapeli-${PV}:5
-	>=kde-apps/picmi-${PV}:5
-	opengl? (
-		>=kde-apps/ksudoku-${PV}:5
-		>=kde-apps/kubrick-${PV}:5
-	)
-	python? ( >=kde-apps/kajongg-${PV}:5 )
-"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-24.05.2.ebuild b/kde-apps/kdegames-meta/kdegames-meta-24.05.2.ebuild
index e1ee899e52ab..3f44e170a6b0 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-24.05.2.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/categories/games/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-24.08.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..e1ee899e52ab
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-24.08.0.ebuild
@@ -0,0 +1,60 @@
+# 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/kdegraphics-meta/kdegraphics-meta-23.08.5.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-23.08.5.ebuild
deleted file mode 100644
index 35fe00b69791..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-23.08.5.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
-
-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"
-
-RDEPEND="
-	>=kde-apps/gwenview-${PV}:5
-	>=kde-apps/kamera-${PV}:5
-	>=kde-apps/kcolorchooser-${PV}:5
-	>=kde-apps/kdegraphics-mobipocket-${PV}:5
-	>=kde-apps/kolourpaint-${PV}:5
-	>=kde-apps/kruler-${PV}:5
-	>=kde-apps/libkdcraw-${PV}:5
-	>=kde-apps/libkexiv2-${PV}:5
-	>=kde-apps/okular-${PV}:5
-	>=kde-apps/svgpart-${PV}:5
-	>=kde-apps/thumbnailers-${PV}:5
-	color-management? ( >=kde-misc/colord-kde-${PV}:5 )
-	scanner? (
-		>=kde-apps/libksane-${PV}:5
-		>=kde-misc/skanlite-${PV}:5
-		>=media-gfx/skanpage-${PV}:5
-	)
-	screencast? ( >=kde-apps/spectacle-${PV}:* )
-"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-24.05.2.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.05.2.ebuild
index 6dc1502a109a..2f9d648400dd 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-24.05.2.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/graphics/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="color-management scanner +screencast +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-24.08.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..2b46d7c5b403
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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 ~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 dc3b1b2ef490..78d6bbc21197 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,2 +1,3 @@
 DIST kdegraphics-mobipocket-23.08.5.tar.xz 13004 BLAKE2B 55a4f78a79244ec94d1075dceedf0e9c55f731c2577cb6682b7cce8e356d4a8364a7de59ee9bd340df4c67331f288e6db16e74396c872abe5dbdf4795b0ce847 SHA512 8c421e8070c4143b99091f73d3bd3b67571eb76d9de0901e8cb96d8529280ae623531e9245eac2d9ff76d261cf2f66b8262b12909b9e43b270e9a5f4cb47d5b3
 DIST kdegraphics-mobipocket-24.05.2.tar.xz 13040 BLAKE2B 273df060d46dbae1434d5849f4c4097cde2a695b94cfad18a44496103f6c27196073bef43003e3c0d4f240ab026e09208985a071bf9ab4d35f14e763edb4ab52 SHA512 cef06040e91266ab5f9fbae42275b64bfab9d00f75dcae400961baa97e5f67048fb6733b8975654e9603bc19c7719cf93ef1c0d5a64bcb2a3fd641a7084229e6
+DIST kdegraphics-mobipocket-24.08.0.tar.xz 13068 BLAKE2B b21f4d5eba235fd9fec7c0a3bdabd5e84276d4ff882d81c8c6acae18da43e291bad6a63544059a14042c9ff901f3b55919e92b69bd52f95e75f2411b19a8f699 SHA512 a33579c2c99c27d6b143d5c7666b9bb79771db38952359fdbfa42485bb3feeb13cbf2c295570822f1c45cc371f84866b7e42e1d0c7206f43c9026f86dbaadc0a
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.05.2-r1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.05.2-r1.ebuild
index b8954ed99a5d..c2c90609d56a 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.05.2-r1.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.05.2-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library to support mobipocket ebooks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.08.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.08.0.ebuild
new file mode 100644
index 000000000000..db69c3213507
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-24.08.0.ebuild
@@ -0,0 +1,21 @@
+# 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/kdemultimedia-meta/kdemultimedia-meta-23.08.5.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-23.08.5.ebuild
deleted file mode 100644
index d227f7cfc127..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-23.08.5.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
-
-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}:5
-	>=kde-apps/juk-${PV}:5
-	>=kde-apps/kdenlive-${PV}:5
-	>=kde-apps/kmix-${PV}:5
-	>=kde-apps/kwave-${PV}:5
-	>=media-sound/elisa-${PV}:5
-	>=media-sound/kasts-${PV}
-	>=media-sound/krecorder-${PV}
-	cdrom? (
-		>=kde-apps/audiocd-kio-${PV}:5
-		>=kde-apps/k3b-${PV}:5
-		>=kde-apps/libkcddb-${PV}:5
-		>=kde-apps/libkcompactdisc-${PV}:5
-	)
-	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:5 )
-	gstreamer? ( >=kde-apps/kamoso-${PV}:5 )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.05.2.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.05.2.ebuild
index fcb0e51e8cb6..e8a7d0912003 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.05.2.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/categories/multimedia/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.08.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..fcb0e51e8cb6
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 8ab1b4e9a02b..a63c3850fa43 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,2 +1,2 @@
-DIST kdenetwork-filesharing-23.08.5.tar.xz 482676 BLAKE2B b657e52de808d4f2235a8f9e25e3b6e6cf2fcab111f7ad1fc899b7751a292489a8636dbea104744244dde41f6dc0db8c2f0d71dbe80d2875c37bb1976d5427e6 SHA512 a918171c02753c39bc5be1b931c93c160f246e992c7a761b9d094fc5c1649cee4ac11ea84cc4eaed5a7050f48303e06d86a2b2ed72cbf42b3887d196d10812db
 DIST kdenetwork-filesharing-24.05.2.tar.xz 493836 BLAKE2B bc701e74552285a81cd71dae27a5c8acec1bf9bd2a04741afb54061f2d116fc3d3fd9b0d8ab101593c02aaafb6e84b0c138da17122a491679b4316b0d783e428 SHA512 868ae6ddeb9bbcf059f91ade3008394e24e68be9a94f10fe1b968189723af0f65fb9ebb8927d5cf0dcb45007f0ce0046805edbc3dbd892035a4fe38068d42400
+DIST kdenetwork-filesharing-24.08.0.tar.xz 493724 BLAKE2B f4e10d0c5ea8dcbb76cfd6e18a7af0d33473bfb46ff3718db235776abe7f72adb4edd22dbd3b73a69b7519b87b642023c0721aceca21b0b8d0da2a59a777f02f SHA512 6968372ebd2b59dae49ffaed6e31215aa20c5b3df3147999fcc59d80c101fba399aec01a96802d542572d0e455341425e60e6bc7f381f8cd60dd43e3ae319b57
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-23.08.5-r1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-23.08.5-r1.ebuild
deleted file mode 100644
index 444264053cb7..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-23.08.5-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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/qcoro5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	net-fs/samba
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.05.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.05.2.ebuild
index 9b9bd964d99a..a310b4aa34b1 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.05.2.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.05.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.08.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.08.0.ebuild
new file mode 100644
index 000000000000..f1705f1ce30f
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-24.08.0.ebuild
@@ -0,0 +1,39 @@
+# 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-meta/kdenetwork-meta-23.08.5-r1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-23.08.5-r1.ebuild
deleted file mode 100644
index 1b861243b369..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-23.08.5-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
-
-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}:5
-	>=kde-apps/krdc-${PV}:5
-	>=kde-misc/kdeconnect-${PV}:5
-	>=net-im/neochat-${PV}
-	>=net-im/tokodon-${PV}
-	>=net-irc/konversation-${PV}:5
-	>=net-misc/kio-zeroconf-${PV}:5
-	>=net-news/alligator-${PV}
-	bittorrent? (
-		>=net-libs/libktorrent-${PV}:5
-		>=net-p2p/ktorrent-${PV}:5
-	)
-	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:5 )
-	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:5 )
-	screencast? ( >=kde-apps/krfb-${PV}:5 )
-	webengine? (
-		>=kde-apps/kaccounts-integration-${PV}:5
-		>=kde-apps/kaccounts-providers-${PV}:5
-		>=kde-apps/signon-kwallet-extension-${PV}:5
-		>=kde-misc/kio-gdrive-${PV}:5
-	)
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-24.05.2.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.05.2.ebuild
index 72e182fac7cd..a630be86ef88 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-24.05.2.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="+bittorrent dropbox samba +screencast +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-24.08.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..72e182fac7cd
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index e84ebf5c9ff6..a8e82d35cc26 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,2 +1,2 @@
-DIST kdenlive-23.08.5.tar.xz 12728000 BLAKE2B f2232bd5b3fbb36183018346f65eb2f590ea560a9aa10a198274709f34b0ff178922df9ab5b00d9577fc1a864b03ebd232f6e1a45bba7c9862ef9b60937d72a7 SHA512 1fbd11e1f6a42c668b9d22d74179b25fdd6e66dd903a5779f16ecad324850beaa5492859d9edb566ac94b162499ffdf4eb30be28adb1027d50de54369c96f2ac
 DIST kdenlive-24.05.2.tar.xz 12910996 BLAKE2B 45baa60b2cf5f83c46a3fc6dc4a2c3b39d19f25a14646440e91df33fa523d31f5346cc00b795327aa93d5e965c5e567897fe43431dde349208161eedf755772a SHA512 8ad98b77e7f8e5759039f4f4b702f1295be8ea6386a98696c5c9d28c10b904b62ddcf8d7154f8ad3e561eb7a2322a5138ec2c9df4b127c4a633d9b52693c50b2
+DIST kdenlive-24.08.0.tar.xz 12984692 BLAKE2B cc6e988109a28216bbd9f54c6eea2165881e81185def8b0f9dea77bbccd69469391f6ee98138fe738a1296df4a6a995cfb93ddee48151af2a8b7bea2d992ded7 SHA512 4179a36ff491cc7b7223b8dd5710b32dad3dd7737ca53452d76df4df61dfb9edeb396507ae446115c23366fc2891a7611afd161f81304f018e4d532036fb216d
diff --git a/kde-apps/kdenlive/kdenlive-23.08.5.ebuild b/kde-apps/kdenlive/kdenlive-23.08.5.ebuild
deleted file mode 100644
index 8b64f10137c3..000000000000
--- a/kde-apps/kdenlive/kdenlive-23.08.5.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
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="optional"
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only semantic-desktop v4l"
-
-RESTRICT="test" # segfaults, bug 684132
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-7.14.0[ffmpeg,frei0r,qt5,sdl,xml]
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	media-video/ffmpeg[encode,libass,sdl,X]
-	media-video/mediainfo
-"
-BDEPEND="sys-devel/gettext"
-
-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.05.2.ebuild b/kde-apps/kdenlive/kdenlive-24.05.2.ebuild
index 3c5aaaf383a4..88353e55ccc2 100644
--- a/kde-apps/kdenlive/kdenlive-24.05.2.ebuild
+++ b/kde-apps/kdenlive/kdenlive-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="gles2-only semantic-desktop v4l"
 
 RESTRICT="test" # segfaults, bug 684132
diff --git a/kde-apps/kdenlive/kdenlive-24.08.0.ebuild b/kde-apps/kdenlive/kdenlive-24.08.0.ebuild
new file mode 100644
index 000000000000..d6b873ed0e71
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-24.08.0.ebuild
@@ -0,0 +1,75 @@
+# 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.22.0-r1[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"
+
+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 ba373933c8e1..91da528f4fa4 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kdepim-addons-23.08.5.tar.xz 2652304 BLAKE2B e4eb1c249b01779067b1d12e11b64f7cf44565e0cfa7ec1f1e472d901ecca34793c330951ef70de5a05c64b650594d25fa096e3b2754db7ad203c2f8a549a5cb SHA512 ee9990b4ad3c838c70199b515361eff2b2d756c9c9be5c9a74f65bc1bf3177e77a59f0054968be672284cd65ecb0c6d1bcc4787c998e9e0fbc3820605285eb4a
 DIST kdepim-addons-24.05.2.tar.xz 2642052 BLAKE2B 1a847dfa80b0ca187edb23ea8685102d35f1f3459a898a12997c20268a0aca9d247322a2c9ad78226870112bae84926f0a63e71e884e6e8ca02a44a02e4ae645 SHA512 4087ab37f85d36f483dc98f56068710935f41ed152d0364148db3b07a5df4333a06ba215e29b1326ac9cad8add3723185a683c8089f18505a42e786d0efe66b1
+DIST kdepim-addons-24.08.0.tar.xz 2611208 BLAKE2B 25ac52886b7aba8b6dcdd5af4270d8e23a79bd2795b047bf092222f0393d2f46d22460a0e118fd810a062d8560075db43109c60f38f5fe6b1042fd5c01062f97 SHA512 ab4799d6e819d0f6b940ddd2e8feded890d90d902eb2996ec669dea3157d476923eb55d780bd0a76132effb5231da7dd9dc02dd5b1cf2be76065de6cb536fd28
diff --git a/kde-apps/kdepim-addons/kdepim-addons-24.05.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-24.05.2.ebuild
index 47f7200e68b2..971e88c948d4 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-24.05.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="importwizard markdown"
 
 RESTRICT="test"
diff --git a/kde-apps/kdepim-addons/kdepim-addons-24.08.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-24.08.0.ebuild
new file mode 100644
index 000000000000..a53fe50e2a12
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-24.08.0.ebuild
@@ -0,0 +1,80 @@
+# 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.5.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="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/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
+	>=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
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:6 )
+	markdown? ( app-text/discount:= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(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.05.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-24.05.2.ebuild
index f558953c8f68..02fe51eb01cb 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-24.05.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-24.08.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..72ed4c05de0f
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-24.08.0.ebuild
@@ -0,0 +1,74 @@
+# 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-notes-${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 867d9c66781d..9a2433cf651a 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,2 +1,3 @@
 DIST kdepim-runtime-23.08.5.tar.xz 1869936 BLAKE2B 10f9d7f58076c1c92b3fcff28def00603f9331c3c8adaa900f43ff2d90d2748b12f2b72be825b3a1200f4e0cec6b2b37caf91ab6223476c42a9545df4e16c25b SHA512 c42883c338f079ee97a8182610692243394ead7d7d16aa4d677d757b3a01c00a5d4fff0b77ec66a0fa096a58a6a9ca0f60c752f025c5e6d9d9683250aedab730
 DIST kdepim-runtime-24.05.2.tar.xz 1680432 BLAKE2B e28e3fd2d807407e2092da671e8f594f93039e40913e831eea8dc1eb6f3edbb85b2501bfad6053cbb1632c97153953316d7ba8428c2d5b23a8910a91c0adbddc SHA512 bd4f11a539f812b72444aa301d58c3898dddb0ef39c6b4f32d14f7030812be0200e317c109d691da353dc7bb27f82eff2dddbe16691fa34f50dc2c5020217b1e
+DIST kdepim-runtime-24.08.0.tar.xz 1672764 BLAKE2B 91b3328f1b6138d05306f37e16ccb55dd92fd566d5aa7569844c9378c8dd87d788003a8446fb23169f59b4cb1af615a726200cd3997696e2951556a8bb06115a SHA512 29664e43fc2f7e99ef1f281b73cd041ac93a77e326a5f4ec1100bf048ffca7626ff72f62f1d6792a4601361381d07c4abebb1fb5586a267e9d99903e86e3a0e6
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.05.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-24.05.2.ebuild
index d9df0a82d8f1..11522872932d 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-24.05.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="speech"
 
 RESTRICT="test"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-24.08.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-24.08.0.ebuild
new file mode 100644
index 000000000000..cd9b6e630b1d
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-24.08.0.ebuild
@@ -0,0 +1,82 @@
+# 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.5.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="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/akonadi-notes-${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-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/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}: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=(
+		-DKDEPIM_RUN_AKONADI_TEST=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Etebase=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+		$(cmake_use_find_package speech Qt6TextToSpeech)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-23.08.5.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-23.08.5.ebuild
deleted file mode 100644
index 27b1cc0c21f8..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-23.08.5.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
-
-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="
-	>=kde-apps/kapptemplate-${PV}:5
-	>=kde-apps/kcachegrind-${PV}:5
-	>=kde-apps/kde-dev-scripts-${PV}:5
-	>=kde-apps/kde-dev-utils-${PV}:5
-	>=kde-apps/kdesdk-thumbnailers-${PV}:5
-	>=kde-apps/kompare-${PV}:5
-	>=kde-apps/libkomparediff2-${PV}:5
-	>=kde-apps/poxml-${PV}:5
-	>=kde-apps/umbrello-${PV}:5
-	cvs? ( >=kde-apps/cervisia-${PV}:5 )
-	git? ( >=kde-apps/dolphin-plugins-git-${PV}:5 )
-	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:5 )
-	perl? ( >=dev-util/kio-perldoc-${PV}:5 )
-	python? ( >=kde-apps/lokalize-${PV}:5 )
-	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:5 )
-	webengine? (
-		>=dev-util/kdevelop-${PV}:5
-		php? ( >=dev-util/kdevelop-php-${PV}:5 )
-		python? ( >=dev-util/kdevelop-python-${PV}:5 )
-	)
-"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-24.05.2.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-24.05.2.ebuild
index cd07aae3ba94..1ede41cee4e0 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-24.05.2.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/categories/development/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="cvs git mercurial perl php python subversion webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-24.08.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..4bc88fda9e1a
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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"
+IUSE="cvs git mercurial perl php python subversion webengine"
+
+RDEPEND="
+	>=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
new file mode 100644
index 000000000000..9ed028075de5
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/Manifest
@@ -0,0 +1,2 @@
+DIST kdesdk-thumbnailers-24.05.2.tar.xz 27248 BLAKE2B 24547264f852dc4e69382ce2648056f22c17fc7f6063868957adabe20382db30f6acf9820e42a98ccd914a68f4713192dcf0c66ca23ddf38954b2553bcec519c SHA512 e253acf6720cd2fcb3750c9452303c03d9df5c87d693831e279a748b7a350358a36457373d35f087e0b00431b4e38a09346d726a280f90ee66e0cca6799db12d
+DIST kdesdk-thumbnailers-24.08.0.tar.xz 27164 BLAKE2B 9e72be2818e400a66834e1506f7e99bcf6fcd9f372289e80f92e9b2bd8cbb16c115cca78df58996014eb4959c9910606f68f71fb34b89fa8dcf19c18a733b866 SHA512 ed3dcb3600ecf8a7d27c68e960f01c1b4c6f3c88d5a21c870874978836bad435f13cbac81a7ca527161f652cf799d0549e4afcb43e9c1bbccb06fe67e7198e93
diff --git a/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.05.2.ebuild b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.05.2.ebuild
new file mode 100644
index 000000000000..b9a3b2858ffe
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.05.2.ebuild
@@ -0,0 +1,21 @@
+# 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 ~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.08.0.ebuild b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.08.0.ebuild
new file mode 100644
index 000000000000..c8b4aad49995
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/kdesdk-thumbnailers-common-24.08.0.ebuild
@@ -0,0 +1,21 @@
+# 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 ~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/metadata.xml b/kde-apps/kdesdk-thumbnailers-common/metadata.xml
new file mode 100644
index 000000000000..19fa07dcef36
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">sdk/kdesdk-thumbnailers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 9cbb4722d706..9ed028075de5 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1 +1,2 @@
 DIST kdesdk-thumbnailers-24.05.2.tar.xz 27248 BLAKE2B 24547264f852dc4e69382ce2648056f22c17fc7f6063868957adabe20382db30f6acf9820e42a98ccd914a68f4713192dcf0c66ca23ddf38954b2553bcec519c SHA512 e253acf6720cd2fcb3750c9452303c03d9df5c87d693831e279a748b7a350358a36457373d35f087e0b00431b4e38a09346d726a280f90ee66e0cca6799db12d
+DIST kdesdk-thumbnailers-24.08.0.tar.xz 27164 BLAKE2B 9e72be2818e400a66834e1506f7e99bcf6fcd9f372289e80f92e9b2bd8cbb16c115cca78df58996014eb4959c9910606f68f71fb34b89fa8dcf19c18a733b866 SHA512 ed3dcb3600ecf8a7d27c68e960f01c1b4c6f3c88d5a21c870874978836bad435f13cbac81a7ca527161f652cf799d0549e4afcb43e9c1bbccb06fe67e7198e93
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..6e94df9939bb
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Thumbnail generator for PO files"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+
+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.05.2-r10.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r10.ebuild
new file mode 100644
index 000000000000..f1a9e8654620
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2-r10.ebuild
@@ -0,0 +1,36 @@
+# 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 gear.kde.org
+
+DESCRIPTION="Thumbnail generator for PO files"
+
+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/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.05.2.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.2.ebuild
deleted file mode 100644
index 1482d025c4c5..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.05.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
-
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Thumbnail generator for PO files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.08.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.08.0.ebuild
new file mode 100644
index 000000000000..3aec57d82abe
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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 ~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-23.08.5.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-23.08.5.ebuild
deleted file mode 100644
index 8aa9a73f6ae5..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-23.08.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
-
-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 ~loong ~ppc64 x86"
-IUSE="7zip cups gpg lrz plasma rar +webengine"
-
-RDEPEND="
-	>=app-cdr/dolphin-plugins-mountiso-${PV}:5
-	>=app-crypt/keysmith-${PV}
-	>=kde-apps/ark-${PV}:5
-	>=kde-apps/filelight-${PV}:5
-	>=kde-apps/kate-${PV}:5
-	>=kde-apps/kbackup-${PV}:5
-	>=kde-apps/kcalc-${PV}:5
-	>=kde-apps/kcharselect-${PV}:5
-	>=kde-apps/kdebugsettings-${PV}:5
-	>=kde-apps/kdf-${PV}:5
-	>=kde-apps/kteatime-${PV}:5
-	>=kde-apps/ktimer-${PV}:5
-	>=kde-apps/kwalletmanager-${PV}:5
-	>=kde-apps/sweeper-${PV}:5
-	>=kde-apps/yakuake-${PV}:5
-	>=kde-misc/kweather-${PV}:5
-	>=kde-misc/markdownpart-${PV}:5
-	>=sys-block/partitionmanager-${PV}:5
-	>=sys-libs/kpmcore-${PV}:5
-	cups? ( || (
-		kde-plasma/print-manager:6
-		>=kde-plasma/print-manager-${PV}:5
-	) )
-	gpg? ( >=kde-apps/kgpg-${PV}:5 )
-	plasma? ( >=kde-misc/kclock-${PV} )
-	webengine? (
-		>=app-editors/ghostwriter-${PV}
-		>=kde-apps/kimagemapeditor-${PV}:5
-	)
-"
-# 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/kdeutils-meta/kdeutils-meta-24.05.2.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-24.05.2.ebuild
index 18b11b85ae9b..6123fbe60e81 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-24.05.2.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-24.05.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/categories/utilities/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="7zip gpg lrz plasma rar +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-24.08.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-24.08.0.ebuild
new file mode 100644
index 000000000000..09570f36dce5
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-24.08.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 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 ~x86"
+IUSE="7zip gpg lrz plasma rar +webengine"
+
+RDEPEND="
+	>=app-cdr/dolphin-plugins-mountiso-${PV}:*
+	>=app-cdr/isoimagewriter-${PV}:*
+	>=app-crypt/keysmith-${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 a2ead1d06703..218d142f1268 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,2 +1,3 @@
 DIST kdf-23.08.5.tar.xz 495184 BLAKE2B ef0e6cb0a43715e661c126357ca75ffdb60f8402bf5e147297deb1d78f4c06374b3ef839c1c41d9ab408b84ed8cd7cf1bf6337770db01878b8d92cdbb574d35f SHA512 4c4bed0d015a8c88492d05e50458b9a6185ea1cf616ad0298e3a421a988e6e58ec63e1ba7ced11e45783fb84d04edf20331beac6162f44df040a3b6a4c9e43a8
 DIST kdf-24.05.2.tar.xz 477228 BLAKE2B 626ef62881b998947f6c2b5c1e43fdc6f32ef63e9c02046be80456877da3c24d4a5e285e0c04e7c7d3cb46641823d51f61fa17d0eee9a65468fd120a2aba09b3 SHA512 ec100a84ea3e839b717468bdcb6e3060f9434ccf4b50ca2a083255cce21970ffe8776cba00dcfff8aba85906bd195805c5e701d376c031aaa8fd9b0f75755234
+DIST kdf-24.08.0.tar.xz 477456 BLAKE2B bed3e0cb1e93de381bc4f65fc8cc08b5a5ebadc390a099b8111d61f3af54a81888b29202555fef02637472476634cb338abc63520dba6f6bfbb199604204539b SHA512 3e45629ebf91fe43533f98a84333de26c9f8f88df69d34b842631219906ad1737bc7c2a2e3c759fc1d02af4cd9408e0ab3b55bb51e66045a5c60a6e949e7b709
diff --git a/kde-apps/kdf/kdf-24.05.2.ebuild b/kde-apps/kdf/kdf-24.05.2.ebuild
index 6ec7b54b0fab..fc867ecc3a03 100644
--- a/kde-apps/kdf/kdf-24.05.2.ebuild
+++ b/kde-apps/kdf/kdf-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdf/kdf-24.08.0.ebuild b/kde-apps/kdf/kdf-24.08.0.ebuild
new file mode 100644
index 000000000000..36f811024285
--- /dev/null
+++ b/kde-apps/kdf/kdf-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/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 edc938df255e..247687571b76 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,2 +1,3 @@
 DIST kdialog-23.08.5.tar.xz 144408 BLAKE2B 5af2c9f1e6315e9773bd23e21946c4aafec8b3da8b85a790d3a969bfe92892f74e0561c6ff5a5243a891a416b56e7ecab3b591d487d4db3ae1a1081df7e19da9 SHA512 0272ae61278ae68f48573da324e0ae5375d2261f0597908973f84de7b70eabce18dc3d4c90665191d5c22678e5ee15778b2e95d2ee0c49a7125e53323f1f4016
 DIST kdialog-24.05.2.tar.xz 146596 BLAKE2B d1649704bfd1d34bf2efa7bac27be95e55d15afb17e19ad711f970509d6ba5077164946072cd21ddb423e7a8aab92185f6794473758e7dc9f74cfbf1c2cbbdb5 SHA512 9522702c187046ddc8cdf83e30981f5d7c0f6c06492e122fde355c5952edcc5e82002b7afe151259d362bbe8e2b1599865bface2d91d6dea8b5000c70f810a82
+DIST kdialog-24.08.0.tar.xz 146660 BLAKE2B 23541302d8b2c5139a2fa860f8fe47da1be3d9e67e3c61f593f9c75bb52f11a53942e743add5dfb995d4afd34ea2a6b48d549118a497afeccb12098e9a860be5 SHA512 ffb3fc5740ad7632405db68b430335b313a568310a103a02a87371d5b1b9d7752537fb968da9033444c929e5ea283881703b21e684d45b682d7ccd568fe1e6b7
diff --git a/kde-apps/kdialog/kdialog-24.05.2.ebuild b/kde-apps/kdialog/kdialog-24.05.2.ebuild
index 4e9188297398..2391ca4aa484 100644
--- a/kde-apps/kdialog/kdialog-24.05.2.ebuild
+++ b/kde-apps/kdialog/kdialog-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdialog/kdialog-24.08.0.ebuild b/kde-apps/kdialog/kdialog-24.08.0.ebuild
new file mode 100644
index 000000000000..4b7991d9e954
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 778bbf1f9275..72e2b9b2daae 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,2 +1,3 @@
 DIST kdiamond-23.08.5.tar.xz 4710560 BLAKE2B 02d23853d23fd7b923ee7cd0d9a48205d6b35ae591731a735d0a3ef2f2e3ba3a5b74239a4f2e2695b3eb519f1c89d11744153e83c8428567f32755d40e360118 SHA512 b580c645862d21b8a5fb669ad46643a543a1a8a060606a573d0be49f143e69d4aae7bc24dfd803309313a31aa5c779a0066df0a24321855a404e75b2e15e29c8
 DIST kdiamond-24.05.2.tar.xz 4669100 BLAKE2B 688832f8edf2fe20745a5a69309334ae701924e81cb89e995f65f01d29b5d14bac4baf371a61c21e573ecdbdcff8072832cd3ba749a1eff813be0a4210d7c7f6 SHA512 aa65e2561029312052675de42827614d8809993e536ae7ece2a5736b6404b1891640cde31d3ff3416b9c762340c06a4749bb1d72d77558d7f3ae634a218153a3
+DIST kdiamond-24.08.0.tar.xz 4670236 BLAKE2B 8f636f7102628df80f2eed4e3efd13e0c39f097dfc494523db308521cbd903debb648e3d0b4559727957e0b1e53d5f353463dfd7e3d372994e3f03382b90d9fd SHA512 c508692083626221bef73e5bf46eecd9d6f31cfcaaaefff635329e8bd13a8bfba1638be073bc76fa540a31ff6c8d026c2884708bb596b51778c6368bdfe58641
diff --git a/kde-apps/kdiamond/kdiamond-24.05.2.ebuild b/kde-apps/kdiamond/kdiamond-24.05.2.ebuild
index d848539993fa..eae0c90b17d9 100644
--- a/kde-apps/kdiamond/kdiamond-24.05.2.ebuild
+++ b/kde-apps/kdiamond/kdiamond-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdiamond/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdiamond/kdiamond-24.08.0.ebuild b/kde-apps/kdiamond/kdiamond-24.08.0.ebuild
new file mode 100644
index 000000000000..534923d8d0a6
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 057c0e050497..9b3509894c01 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,2 +1,3 @@
 DIST keditbookmarks-23.08.5.tar.xz 239624 BLAKE2B 4a0c32264ed0a12c55e97c55c660be5bcf9e8270b24d012d5e6942f6701b5d28e6594e2f321543765eb1aebcecc3f0f55c51a5dbf43fb9c1a61cb54743e8af8a SHA512 848d727accc18802aa448d64276cc601691be8590f583bf76aa3de505d647f937da52b61d6b76e273eab233f81d8c24f68abad5ed2a73e67a2e22c31176f0ad9
 DIST keditbookmarks-24.05.2.tar.xz 244552 BLAKE2B a5da7481944b0d08996b3945506f5551d8be4cc2de3235ad40873eb35723e1266977b5cfe0bbef100fe557204c08ea3c362ee5817f2a7b33a78522abc1fd532a SHA512 5fc6a3e9446238ca13ba485baaf01745c730663cf34f6ac88ff8abab718b48b8eb6c916d18e725abc95e4fede38b85e6017489c7aeec0c4121e30a958dbd8e7a
+DIST keditbookmarks-24.08.0.tar.xz 258472 BLAKE2B b553d96b014bdf6091be12daadaef8caf825b0f7ef82ef613888037bfd3bbb2ffdd7d329ec55528f9990cff278b2b77c5bdf501115bd467a506c80685d4217e2 SHA512 2dee534998e97f986ed09be69a6fba8c4e66f98e60466a5c808be72774b3968662378f04f82a3ec307662eadad13fe6d4a3861c49fc3d80e19b17b4b82a42a1d
diff --git a/kde-apps/keditbookmarks/keditbookmarks-24.05.2.ebuild b/kde-apps/keditbookmarks/keditbookmarks-24.05.2.ebuild
index b530c54ee0af..2679c4a3b87d 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-24.05.2.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 # TODO: X handling?
diff --git a/kde-apps/keditbookmarks/keditbookmarks-24.08.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-24.08.0.ebuild
new file mode 100644
index 000000000000..6b79c8b6e0ac
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-24.08.0.ebuild
@@ -0,0 +1,47 @@
+# 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/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 88bb26d71cd8..404d17004d9a 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,2 +1,3 @@
 DIST kfind-23.08.5.tar.xz 344828 BLAKE2B 9be690657f9afc99bc4882ae20af5e92f934f6ee687428151caa54ffdeaa911244e95bd4564536b50212de765b469b80293bd437ca96e12fdcc43ef42ea776e8 SHA512 f5e23253c7c2c5d119bb62e31a6165713aa352c25b15d47f11e3c512fce64149e4ada6f51835fd96b5d576a7f42d647a8a1aa8eb9fdd503b6b5e623e4bac4d64
 DIST kfind-24.05.2.tar.xz 324116 BLAKE2B 71aed93a31c1fb46758eae349b581cd3a862e95d993327eb46e9747cf825c93f575e8f91b8cdd3335f5c389b5847e4ae3f116aeb27b830fa1d4eb97536a8fb83 SHA512 8582db6a1268b97024d1367ce40caa7e45db4403e3110959686ba46309980608a7ff91db7ea993a02eb5865a3e5b490c69e082241a60def7094aa259a811b418
+DIST kfind-24.08.0.tar.xz 325504 BLAKE2B b0c3f4670c14f8b2104ef4368b1b12033453c0043725574d0743ec5cd669478cdfb5660a1457527da496f0db6bf233e7167c9b47547089966093cfefa08ed116 SHA512 82e0c60f6fe52ee243f409aee11f904e40a813b177a26bb2b8b35b40ca80339a712c0055e901869d23a659d2bc79e4c14d62044c377e979243aa71f53dbe81d6
diff --git a/kde-apps/kfind/kfind-24.05.2.ebuild b/kde-apps/kfind/kfind-24.05.2.ebuild
index 74cbafa9ae38..31870fa97247 100644
--- a/kde-apps/kfind/kfind-24.05.2.ebuild
+++ b/kde-apps/kfind/kfind-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kfind/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfind/kfind-24.08.0.ebuild b/kde-apps/kfind/kfind-24.08.0.ebuild
new file mode 100644
index 000000000000..eacdaeb0399d
--- /dev/null
+++ b/kde-apps/kfind/kfind-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index ac3391fba9b5..b2d0f20e39ee 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,2 +1,3 @@
 DIST kfourinline-23.08.5.tar.xz 741372 BLAKE2B c180eb3a6d202c3f3c5a09d7d3c997526f2e68a4d7685122a1fdf9544683471381603eec32fa221c524a72ea5c79a1ce74d8dc2d5de7390f9ffc03ab6a65eded SHA512 d338a9373e2aaa3a5791a36556ab0b1ae6ac37e0c993eadfe80edb7cd811d66a232a54f04a7e58f81075e28b32efa7866dad75bc5b3744d713a703cbf27f1095
 DIST kfourinline-24.05.2.tar.xz 739440 BLAKE2B 3a44875b53d470e04a2c9c6e369630486b49f9477260ad86c10adeb61377559ad40efaf6395d79b3a06acd81afdd08b46133d02be122b2dd133857cb62d1db1a SHA512 e7c280ed05b31ea56e8e9c1b2b6f9bcef0b8ae56ab8d5c25e6dbea91f46493c74d5ebca261dce81b9e23c62e606389f94d577757a989b39750076a5d9b60f39c
+DIST kfourinline-24.08.0.tar.xz 742200 BLAKE2B ab5b3ae34a64d3b69daf3e6dded1533920c0b831100c39bcd3756bdcc7c3ff2e61022c0f3fbd55e947248e2269ef969a08a3d5aa233758f1536927812505209e SHA512 e81e16623921734b16ff352835828abc07bb5543cb8571f2d3100eb6b595d39dc532cf2a71fa314c84053f0d85e8ee6869e5099d04989fb397407c606bbb3903
diff --git a/kde-apps/kfourinline/kfourinline-24.05.2.ebuild b/kde-apps/kfourinline/kfourinline-24.05.2.ebuild
index 6c6ed0d682ad..8b61849c1b98 100644
--- a/kde-apps/kfourinline/kfourinline-24.05.2.ebuild
+++ b/kde-apps/kfourinline/kfourinline-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kfourinline/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-24.08.0.ebuild b/kde-apps/kfourinline/kfourinline-24.08.0.ebuild
new file mode 100644
index 000000000000..542b15894f84
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kgeography/Manifest b/kde-apps/kgeography/Manifest
index ab0a04a63424..18627b307aaa 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,2 +1,2 @@
-DIST kgeography-23.08.5.tar.xz 12553068 BLAKE2B 4884472ba7858df625ddfdf07ef50a70e390d6364e6c277d2ea92e753f81ef7178c4b91da560abd9a3ebc72512ee355f777a66742122e75e463110dc0eef4b00 SHA512 f87b108f97bbc6bf83f23b65af380dadd8be6b02558636501e542f7ddb80146b4b7799e6044a3fe59f82c8b12a68b33c2289178371ec4e8a72e5ef2035c4e685
 DIST kgeography-24.05.2.tar.xz 12436572 BLAKE2B 0382f6699526d2ecf173edf89d4b52a3aa41ca042f86b116e286a80047578cb70e940887dc768f7a0131d62192422033291055154c781591188566b9b52b6286 SHA512 1bf619e408289e911ff377ec41acedc66d4ddce5d66e8e71207d7301fb3a9066113165b9fdeb03912247ea245bade40653da1072ef116beb1e25034796a454b5
+DIST kgeography-24.08.0.tar.xz 12418968 BLAKE2B e6f0663808975bd63fdd3791ad6ce488f3223c983a45d606949f187017e71ba8493c3d28771bb1a39eb96013b7d3e6e83d18ae7b53542a2ca0b7718f9f8b1a09 SHA512 9f703a662bfd4c08acf482e0d7b8a598517664d5fc575c081580702744c3b917696084cad28352f84a5f9e1ca2d6618af0d2a3ef1265a784ab56cde3cb9d9ce7
diff --git a/kde-apps/kgeography/kgeography-23.08.5.ebuild b/kde-apps/kgeography/kgeography-23.08.5.ebuild
deleted file mode 100644
index 49cdf9364bac..000000000000
--- a/kde-apps/kgeography/kgeography-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://apps.kde.org/kgeography/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/kgeography-24.05.2.ebuild b/kde-apps/kgeography/kgeography-24.05.2.ebuild
index 57231af89365..160150f99eb9 100644
--- a/kde-apps/kgeography/kgeography-24.05.2.ebuild
+++ b/kde-apps/kgeography/kgeography-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgeography/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-24.08.0.ebuild b/kde-apps/kgeography/kgeography-24.08.0.ebuild
new file mode 100644
index 000000000000..f54b9c49a648
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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/kget/Manifest b/kde-apps/kget/Manifest
index 7e22df4451ff..82dcb14471d5 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,2 +1,2 @@
-DIST kget-23.08.5.tar.xz 5572688 BLAKE2B 60cc3da0f3dd4dd2cda4fd1851d74aaedc6dd5d4a7dfcc689f3f32f1c5632b067ce01e4b972d424243dc96a446ae33d59faa3abec55ed44a31691163f53d16a7 SHA512 c8ded9a4786db55b22734f0432d87bd260bca74f300e9dcf1ec38973269068f0b7b77d9943082cf2db0a8c37fbb644828b7e186ae83fb527be1706728de53e57
 DIST kget-24.05.2.tar.xz 4908268 BLAKE2B bbe4121aba4f764157ebe570d71fc63cd2a5a986603360e6810ed737a646dbbebb2eebc1e79fce7ffa4b37f078092c3e935c9b957c2a5119206f2bfb06df00e4 SHA512 6e83cdb9968a34c3e661fa34c0a7a7d1c465b95462539dc30aa16b26a6e521a681b9dac326d10e305d882ed53a7762c444f5bf9c0d6adc43c451a5e851a3546c
+DIST kget-24.08.0.tar.xz 4911756 BLAKE2B e1ddf1e50b32992e376a9b0eac92dcba6608d43ab81cbcbf0875502b1c7de5946f09a561f5e63d4cbb48aae214174e3a0bb5d0e3fa67544d1d2bd058dc5ca799 SHA512 ad3dcecb675215b0e8256605315d9eaea6f27b8f1b13a63bdd890b23078025502f20ff084e439a50aca801244809fa27bdd6ef5795051ccd099c072be5565070
diff --git a/kde-apps/kget/kget-23.08.5.ebuild b/kde-apps/kget/kget-23.08.5.ebuild
deleted file mode 100644
index 474e71cd6600..000000000000
--- a/kde-apps/kget/kget-23.08.5.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_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://apps.kde.org/kget/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="bittorrent gpg kde mms sqlite"
-
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	bittorrent? ( >=net-libs/libktorrent-21.07.80:5 )
-	gpg? ( app-crypt/gpgme:=[qt5] )
-	kde? ( kde-plasma/libkworkspace:5 )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bittorrent KF5Torrent)
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package kde LibKWorkspace)
-		$(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.05.2.ebuild b/kde-apps/kget/kget-24.05.2.ebuild
index cd8aac62422c..236d90595c8d 100644
--- a/kde-apps/kget/kget-24.05.2.ebuild
+++ b/kde-apps/kget/kget-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kget/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="bittorrent gpg mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/kget/kget-24.08.0.ebuild b/kde-apps/kget/kget-24.08.0.ebuild
new file mode 100644
index 000000000000..a61a71dc51ad
--- /dev/null
+++ b/kde-apps/kget/kget-24.08.0.ebuild
@@ -0,0 +1,70 @@
+# 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/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 043838e077a4..7a3feba00bb5 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,2 +1,3 @@
 DIST kgoldrunner-23.08.5.tar.xz 4981040 BLAKE2B ca07d02f158fae66d682976ca156ed1026d03440b50c351067b39e0d3111b2adca52ad442a34a62f6d3e3a2a973d88e4f8e11553f5883c7f350b8097b599a335 SHA512 ff0dd9fced9325e1f2566eeecb0a98a7619c8156c54d3d2c79496a7178d507cb7c1c609e502debefbd185e1de4214767e3d726066e32bba04047b19dbbb6d736
 DIST kgoldrunner-24.05.2.tar.xz 4294900 BLAKE2B e5aa083816d8ecebbcb1af0efa40f42d56a79265cc50f59f745a6702c5e1bb1544108cd34ae7d5ab1a75ef9fea104cc668fcbc77baefe8231a4081fb975c2127 SHA512 0fb8a92b25a6dc172f4a9387043e7e729bd75f43c4bc41e107f68ba60bf409fb1ebaf9f09e389c49196fec3b3a7257c54db80a0f126274943e604a36e7d81912
+DIST kgoldrunner-24.08.0.tar.xz 4323904 BLAKE2B 16d185cb648271214017d79e95062eefece6c26c1784d2ab0628d84fbf83ee0fe260ec76114b458739be0e775f1c6424765371d6a9736b5241e63b7ef32c4294 SHA512 bb1ce95a382cc0052f6eb5b56a3a09be25556ab2764876db46c3d2a9b3d09e008da6d05e2f55092cd8df4e8a0a2764e3e63fa72ab80bb2c4c994c92cca52a375
diff --git a/kde-apps/kgoldrunner/kgoldrunner-24.05.2.ebuild b/kde-apps/kgoldrunner/kgoldrunner-24.05.2.ebuild
index 618b0f6d4053..ebaa6de6d8c5 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-24.05.2.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kgoldrunner/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgoldrunner/kgoldrunner-24.08.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-24.08.0.ebuild
new file mode 100644
index 000000000000..c8f4d0c8d3da
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-24.08.0.ebuild
@@ -0,0 +1,39 @@
+# 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
+"
+BDEPEND="app-alternatives/gzip"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 6b1d4b2c6b62..326d658ba0cc 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,2 +1,3 @@
 DIST kgpg-23.08.5.tar.xz 3063592 BLAKE2B 42eb82f94e614b16bd8e49135eb5c566ee5ae47fa602184ba22e3a4e4b75adbd38a4348ea489cdf2f5b122a88b59a987a6f5f257469b916f9c747c87ca4473b4 SHA512 6137f9dc230595a40c5b04045ad2f5b0adfefe878bef0200aec688bd2e8d74b09d11ca83cf696dd893dbd374836686e9b5aa9f7459c565d7913748290a853de9
 DIST kgpg-24.05.2.tar.xz 3021924 BLAKE2B 53270f93972a37a8c4719203f792dc6a526829ad3329b446a52ebc87a42c612d2acf5dcf8b67de8afc8237f8c270b9acead1af6d145a82119abde21ee2299c26 SHA512 588f76cb14abb0edc039fc8b3709a899b8863627017cc32950066a1e508a16872dd0b1b811cefce2abcf51709ece72a216a35e2eae33ad754a0d1ed443118592
+DIST kgpg-24.08.0.tar.xz 3022200 BLAKE2B 0bbf710a3d676d105049db4c4eb142ab80741f796a8f94a20a6436473630426f63c8817a2a21f438309e63a3edf57cc974315af097bff1eff21cc71ed6543151 SHA512 804881e1fd757c9224159abce9a5ff69e8f36390becb1f872e2e649ab68f628954883f0f5101097c10d02a1dc2c9ce8963c9fec19e4a1f311a3e545d073fc6e3
diff --git a/kde-apps/kgpg/kgpg-24.05.2.ebuild b/kde-apps/kgpg/kgpg-24.05.2.ebuild
index 83a2ae0c7465..9df0f2f7854b 100644
--- a/kde-apps/kgpg/kgpg-24.05.2.ebuild
+++ b/kde-apps/kgpg/kgpg-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kgpg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kgpg/kgpg-24.08.0.ebuild b/kde-apps/kgpg/kgpg-24.08.0.ebuild
new file mode 100644
index 000000000000..2ab06456ceab
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-24.08.0.ebuild
@@ -0,0 +1,49 @@
+# 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/khangman/Manifest b/kde-apps/khangman/Manifest
index fd304b2b8da2..ef55abe92b3d 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,2 +1,2 @@
-DIST khangman-23.08.5.tar.xz 7448596 BLAKE2B f94445b7ae79585ad2d8256168694696e64fe82f7bc4832216bf4e4b69787f9adabd021bc762f9f2ed34d1df0e0e5bded06a13efdc334615c9d5e8ea263f4441 SHA512 9a3d360384dfa93365caa962b8ca0aba4903b7fa1291033788d7ca9b24b11dd154081a8888f6518db0e919e22f20acb1444e2297967cdef0554b6c580e9c1c4b
 DIST khangman-24.05.2.tar.xz 7014584 BLAKE2B a1948cefb1cdb0ef00a73af704704587526120f8a0e24d5c2060b5fee97bff1e8cc424361db1ab4cb8c7f5f50e48a2cf31e106dae39d7db6778bdd2caddf7a3e SHA512 026d78d78c5eeda6bd4809b56434d41a402f241697f5a4f95034ae5d516839fa60588f35dba7159aa3af66c6ce7e0aa6127fe96cb5b02f5097cc69a507496208
+DIST khangman-24.08.0.tar.xz 7016664 BLAKE2B 45fc6275dccd684be117eebcddbbd008aa31dc40c72bfe921bd7149d19abaf789d53fa7e388f0faf431a0efcdedc3a71e745dafb2fa85aa0b9453552aa2daa20 SHA512 bd2628ea82a75b673374714a8d65e3d3f324df28b387a72c06f3848a1aa7da645846a57dac96188b6e635fed634e60e9af5cd2bea799d089c979d256b186aa61
diff --git a/kde-apps/khangman/khangman-23.08.5.ebuild b/kde-apps/khangman/khangman-23.08.5.ebuild
deleted file mode 100644
index c0c09ead7ee2..000000000000
--- a/kde-apps/khangman/khangman-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}: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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-apps/kdeedu-data-${PVCUT}:*
-"
diff --git a/kde-apps/khangman/khangman-24.05.2.ebuild b/kde-apps/khangman/khangman-24.05.2.ebuild
index c586303679f6..925ccf01c22b 100644
--- a/kde-apps/khangman/khangman-24.05.2.ebuild
+++ b/kde-apps/khangman/khangman-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-24.08.0.ebuild b/kde-apps/khangman/khangman-24.08.0.ebuild
new file mode 100644
index 000000000000..a93040dbe463
--- /dev/null
+++ b/kde-apps/khangman/khangman-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/ https://edu.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 f06fb8effaad..b8075c3f1fd9 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,2 +1,2 @@
-DIST khelpcenter-23.08.5.tar.xz 4371224 BLAKE2B e7a4523dfa6b9bf57f8d9265750eb4d67bacdb47660f9e902986ac191626a5f35b729a35fedab3dd015f9a261b42996225783fdf98eefd3d16e30f2732d20d44 SHA512 2ba3dc6485fe0fca94263123ab577e92d17ed30cadf296266ba2f1d3ffa3352bd4964e2aff00404933035aafeef57795e1dbe31dea63ca9d67cf24ac4fbaabd6
 DIST khelpcenter-24.05.2.tar.xz 4220772 BLAKE2B ba0c16d0a8277463d62ec3ffeef1ae03d4830e5c61ddd94ec063236da7698e2c735e4d6b210f70a33612d5bfff31def478ad97b50a93b3584be03193f16c5385 SHA512 6f801f647bca45fae853e44f4357ecf8104275ad94666909fc558fb1ba4a1d7765245e461b804b9d1dab45541159bc385f6e7c06c9183ee4454159ad7237c268
+DIST khelpcenter-24.08.0.tar.xz 4220884 BLAKE2B 21893669d4f9dbbb246925e2fbcdc39db15cd6578228a02aea1ad2e089af97188c4841f2409177413843e2f52521122055e2ff512c159f41dabb00648ee7a5c3 SHA512 e74aa8a28daeee2fd1140d7cdca2997760b8e7da50f758a87fe9e7d3556f88deeaff1d198afa3366b2a7bca585a278a809b6c65e76b84544858c6cfd9e24066b
diff --git a/kde-apps/khelpcenter/khelpcenter-23.08.5.ebuild b/kde-apps/khelpcenter/khelpcenter-23.08.5.ebuild
deleted file mode 100644
index 930f94cb5e72..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-23.08.5.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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5[handbook]
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	kde-plasma/kde-cli-tools:*
-"
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
-}
diff --git a/kde-apps/khelpcenter/khelpcenter-24.05.2.ebuild b/kde-apps/khelpcenter/khelpcenter-24.05.2.ebuild
index ef800ffe33ad..5ba77bb150da 100644
--- a/kde-apps/khelpcenter/khelpcenter-24.05.2.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-24.05.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/khelpcenter/ https://userbase.kde.org/KHelpCenter
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-24.08.0.ebuild b/kde-apps/khelpcenter/khelpcenter-24.08.0.ebuild
new file mode 100644
index 000000000000..950626871369
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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}
+	kde-plasma/kde-cli-tools:*
+"
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index dfcefb1b5e27..5b0cfd8a666f 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,2 +1,3 @@
 DIST kidentitymanagement-23.08.5.tar.xz 163960 BLAKE2B 3f5972cba942f39ab672183befc75e16be5a3f0f10b9f344a0d1e32303278f594c6ab521e087daf6b61b28d9378879cb9eabb468ddd4bfd8b2b677df36e45297 SHA512 70c85a1513e0c676d3fa3215258dd3d82134a26712f7544832675b7ca8074162794967640479a62c5eb68bcf3c2c4b364ff53a79d9cb544d871876f4978cca3e
 DIST kidentitymanagement-24.05.2.tar.xz 194644 BLAKE2B 9077d3bc3df6b3c15fa865bb971146c65ea2c2df26a126d52ffdb6fb5dbb7f49ed406cc7c966a8fc66f9f61443b751a8ae016857011707d1fae2d6170b8e9e97 SHA512 3d24ce0bdbe2372c5201e6991e13ec45febe1179e7e1ccf704ef2d6986a0bbc875f9f4aaace3fa380027e014cc09d68df5412d290ba034af84412ed247f27a30
+DIST kidentitymanagement-24.08.0.tar.xz 195468 BLAKE2B 3e62625665e8e070a72fa31ab2e55378f4e53fc7a2f91fe95e584e5fa6d5417a4e7c55311717d5e7785cf4304323380daba5ab12ec1019efdbf5ca88cdf82aac SHA512 23af3062353a896f976fee46875986d30ee518ef8577cfe3837506ec2ef9b8fc06e42abff1880eedfc75477968463ea05ec411975516c37626dc0d22fb90456f
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-24.05.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-24.05.2.ebuild
index 9df1fbcf1c87..0482b6d77e3a 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-24.05.2.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-24.08.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-24.08.0.ebuild
new file mode 100644
index 000000000000..2f25e208d9da
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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.5.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 f991f0ad1284..8dbe68a26d94 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1 +1,2 @@
 DIST kig-24.05.2.tar.xz 3251144 BLAKE2B a9f273518f21b74123bc858b78c11539eb31808c48c1c2641e12d40ab9ac08accf7794ad5cdc2c38dfc59dd24c3b9df9a16c6f05fcebe3749b4e6163cee3c865 SHA512 80d53b96b4d43ea41e336f3e1949630790228d937d9010d22072429ef003b513c26f25dbec392feff5c9ec3968d975b95d3e5f985563079e735d541181a3e6b7
+DIST kig-24.08.0.tar.xz 3245816 BLAKE2B 05a18a107f20e0ee8c8bc7a1e494a50d62b7e7ca1fa1a5c934066e27544fceb501cacd6c4a15f779ebcf42375ace7cf30676f55cf589d369339c5ac217e7b7da SHA512 4479f559af1131bd867eeacd7926b58f98a26c3d1a0fe840a0efab02ba3ffbf98614dc25fd3090c49caf9b4520e7567638d52b394e25f0089d7f9c21b1907e91
diff --git a/kde-apps/kig/kig-24.08.0.ebuild b/kde-apps/kig/kig-24.08.0.ebuild
new file mode 100644
index 000000000000..c7ef85159ad0
--- /dev/null
+++ b/kde-apps/kig/kig-24.08.0.ebuild
@@ -0,0 +1,72 @@
+# 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..12} )
+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/ https://edu.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 af18150ea16a..095cc3661cf9 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,2 +1,3 @@
 DIST kigo-23.08.5.tar.xz 5269404 BLAKE2B 0fd18228c277292e416338906da287fa24b880c478f39e8702db5f642300509ff88b77f06ba2163bf869d47e76f8284c0a90ecfed767112263c22acdebc69b99 SHA512 251df2e37d79255a8424b180f3c921ee572d6378ce0533ccaba4e18bea7f45823e4457ba55aa8746fb3f92b6a2a5653bf4347bf9e35e1410dc95652ff64efcaa
 DIST kigo-24.05.2.tar.xz 4825580 BLAKE2B 85dea4e282056eb40141eb5cfce3af083dfd2771529787dfbd0d4f8e031109a211f55cd2715f84df7a43aaa4329ba42401fea12e2441707f5c053b8b83153597 SHA512 5091b3cc7e1138f252771e13c1dfb7e3784b203bc3f26358a4037c0059506efb79e9e415887aca498dd35b0b3e670f6c7b83d77549f99692e08dc71e0e833868
+DIST kigo-24.08.0.tar.xz 4827620 BLAKE2B a3aa6caea7061c20217014f66618d93943c0daf2a781f5897bc266e823c7e18beb4da7196836ae2e2d7a07ed908f25d87fd751b6c47ce3af34bf3c2b615c5246 SHA512 6b8655598c9b09670892c8eadbea95c52592dacbece63229402c3554141e450ab7786dfa8d0d047b2894c8b396ca3e59d7cd46a0ce60e8a1dc39deb8b44d2c01
diff --git a/kde-apps/kigo/kigo-24.05.2.ebuild b/kde-apps/kigo/kigo-24.05.2.ebuild
index 395c010a4733..d3613c118591 100644
--- a/kde-apps/kigo/kigo-24.05.2.ebuild
+++ b/kde-apps/kigo/kigo-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kigo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kigo/kigo-24.08.0.ebuild b/kde-apps/kigo/kigo-24.08.0.ebuild
new file mode 100644
index 000000000000..221f304b9bf5
--- /dev/null
+++ b/kde-apps/kigo/kigo-24.08.0.ebuild
@@ -0,0 +1,39 @@
+# 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
+"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 8e30df472420..2d9cb55748d7 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,2 +1,3 @@
 DIST killbots-23.08.5.tar.xz 1208076 BLAKE2B cfd320e6b16da38a6c2182764a3ef0149b35909f73fa8a6f712133abc51dfbfa50fe35c44e44c89bdd74cc32708daf3b2b1a37875461e76a1f535c1263287a57 SHA512 07840edc08915127df08791dbb5784564ea844df5f70bb3c3d518016204abfd3142b7d858741d212bac9eb4e0b539f33f6fc30309399c80221c3a0cdfff141ca
 DIST killbots-24.05.2.tar.xz 1159984 BLAKE2B e8cd5762f88de3b627a6fe984524a21f4f6dd8e6804fc4d63a63b4f44016a69404ec91742dbbd4677ab482a86aea36c1a0a31a697115701fe76cf466a66d71a2 SHA512 a4f9960fe428a0d8e2cf70bc10778747ea62666d738f5f345ce32547d6622782de475c2bdbd1b4b54403ab3cfca38bdb5c55511e35c13a008acfd428d97471d7
+DIST killbots-24.08.0.tar.xz 1162360 BLAKE2B 2bada15fb2747b6429fd81dd3489a356ac1da4cfd38220d6bcbfa016c6bc4676e394ae08a7e74a493c787867737c78f62fbdad24f86c6acc7cd7ccc36ce07483 SHA512 9706f0b7413d961b40ee370ed5de81b305e4391fe43505a1dc2efe95b834a8bc65961a8f267f9a36be234a56c46b7604329c511776f01ed7e20207f42a1b4ae6
diff --git a/kde-apps/killbots/killbots-24.05.2.ebuild b/kde-apps/killbots/killbots-24.05.2.ebuild
index f0ffced9dcfe..b8b1cb702c41 100644
--- a/kde-apps/killbots/killbots-24.05.2.ebuild
+++ b/kde-apps/killbots/killbots-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/killbots/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/killbots-24.08.0.ebuild b/kde-apps/killbots/killbots-24.08.0.ebuild
new file mode 100644
index 000000000000..5cdd308ee5d7
--- /dev/null
+++ b/kde-apps/killbots/killbots-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 62287699efcb..a17625dd647b 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1 +1,2 @@
 DIST kimagemapeditor-24.05.2.tar.xz 1069452 BLAKE2B cb5d77bcaecd1197cc943fa8d707b5dfbe7b65722b88a91f5b952f032bcf757209b145486a206915e62b2c9472ce5986f8647e24b1dd6e88c4f211c2ebece3a0 SHA512 529aac6fda44eb1ccd787964e2a1237778f13cbd4196ef03942d5fe9a4b3172ff4764797cf47c6acd9038bcb63340df906f993d631577c447bd348279d4f4033
+DIST kimagemapeditor-24.08.0.tar.xz 1071764 BLAKE2B 741192b78f8712c07972148a34c7450435d95eebe18c8027ad3d1f067b59bf834d2301e4373b7ac9b814e8f6df7e323a129cc27ad4f47cea059e18c05ba3c0bd SHA512 cfe33492237ee11056295c4d4bb2eaf205ea29f58a348a68ba31765d1e1219066c9048bcf2a5320ed458b05305ad9ed6cddf3bc8f4da7eba30ce8360855a6bfa
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-24.08.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-24.08.0.ebuild
new file mode 100644
index 000000000000..04521c203ab3
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/kimap/Manifest b/kde-apps/kimap/Manifest
index ae80c1b48e09..fc3227e520c1 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,2 +1,3 @@
 DIST kimap-23.08.5.tar.xz 131156 BLAKE2B c82c0773bd71cdac0165459418a5ba9a55346f25838d3e87763b4376318d68b6a725ffdd590b9955ae302bb1a32b22e3ee7d4a98456d0ae7329f02a92d64547e SHA512 53718d33c2e470aa82276473360162664bec734207498f39d3702aebde70f7bf8ee2902b8834d47f95413d1c040b52e5ea9c06386f3e5cdcddebcb75a8611337
 DIST kimap-24.05.2.tar.xz 132008 BLAKE2B 36d74956fc2366b2b84619a19ccbab3db5850f309fa710c09654aa6535976909f0964640e7be93ea42a3ccb4711f3ce89846f07a09c65b19520faf8197d2f91c SHA512 5c01b2a1df4dd96c5884dca1bdeb05f445061fb82b67233c80a2f17c688ba3ae97f9a03689ab5032ed73ff2156c65cc2bf60c6553039d37fc94b9e3c967aa7a7
+DIST kimap-24.08.0.tar.xz 132352 BLAKE2B 0d7dbd3cdd6bd41b7a6fc22452ba04720da682a2c42f50f85beb62fbac756f54a4373a3bd498b720abf69087a9d86999ddd463c36aef9f7d74a75ac1b8db24f6 SHA512 4ae7f9309c72d1313a768765a08aa07f95a2194e9886b81925e5a5e10b368a2b8aa61fee3f81a54c4caf7855676914448436b58d5a118ffd7afd28996755b2f0
diff --git a/kde-apps/kimap/kimap-24.05.2.ebuild b/kde-apps/kimap/kimap-24.05.2.ebuild
index 96e358d18c72..515db3977463 100644
--- a/kde-apps/kimap/kimap-24.05.2.ebuild
+++ b/kde-apps/kimap/kimap-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kimap/kimap-24.08.0.ebuild b/kde-apps/kimap/kimap-24.08.0.ebuild
new file mode 100644
index 000000000000..125096e57b23
--- /dev/null
+++ b/kde-apps/kimap/kimap-24.08.0.ebuild
@@ -0,0 +1,41 @@
+# 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.5.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 528ed4aec58f..efb9e44b5864 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,2 +1,3 @@
 DIST kio-extras-24.05.2.tar.xz 3468452 BLAKE2B 396a057299bf48357083321c30c5ca1d3319c100c4e603fcaad427c644f8d580764a4915c363c0f369d296b3da8dd43be02e2ed9f654fa7826dcabd88b02e63f SHA512 8c4ca9443a64d27908db98983b63bdec2a8d5a5426bee92989bb392a58ff0bc8d336409bd13fb719b6bbbb2242b47bc0d15d139e38e397631d085d35546337fb
+DIST kio-extras-24.08.0.tar.xz 3474308 BLAKE2B 508063a9bc6071974e6699e8ca8eee66e5d291917462bcb4e8f58c77137e41cdedcef99206314f318e4da8d95d33d18e689fc0c225729bc1bf54807a178ab925 SHA512 82952feaf739d27b54ed59b7051fc1dfe17668dbfcb1330cbd72553b3aef244155de49ec8919c947a3e2e7074ea84a125ccb4111d05b3aa4e9b4b135979425cf
 DIST kio-extras-kf5-24.02.2.tar.xz 1468060 BLAKE2B a578cebef92e2531e7a1565109470585022ad740220d7cf11547c50e4f2cd4b0336619b76cdfb4cfa07c3c6a5db5e421d89f5e2caaa11d60dffd17047bd96304 SHA512 b8bb00d59d4f84d58ea22bdda6dccd5151a7e48f788fe8827ca9576cf7e287b91c08ebb77b76cd93007593f4d9f0210d75ef551a92e8448796b83b5ffd37255a
diff --git a/kde-apps/kio-extras/kio-extras-24.02.2-r2.ebuild b/kde-apps/kio-extras/kio-extras-24.02.2-r2.ebuild
new file mode 100644
index 000000000000..655cc6cecdbc
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-24.02.2-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KDE_ORG_TAR_PN="kio-extras-kf5"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras/-/tree/kf5"
+EGIT_BRANCH="kf5"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="activities ios kf6compat +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	kde-apps/libkexiv2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-plasma/plasma-activities-${KFMIN}:5
+		>=kde-plasma/plasma-activities-stats-${KFMIN}:5
+	)
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	nfs? ( net-libs/libtirpc:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap:=[qt5(+)]
+	)
+	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-kf5:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	kf6compat? ( kde-apps/kio-extras: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 nfs TIRPC)
+		-DKF6_COMPAT_BUILD=$(usex kf6compat)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
+		-DWITHOUT_X11=$(usex !X)
+	)
+
+	use samba && mycmakeargs+=(
+		# do not attempt to find now Qt6-based system version
+		-DCMAKE_DISABLE_FIND_PACKAGE_KDSoapWSDiscoveryClient=ON
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kio-extras/kio-extras-24.05.2-r1.ebuild b/kde-apps/kio-extras/kio-extras-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..b3959681c739
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-24.05.2-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+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
+}
diff --git a/kde-apps/kio-extras/kio-extras-24.05.2.ebuild b/kde-apps/kio-extras/kio-extras-24.05.2.ebuild
deleted file mode 100644
index d6afb2b48687..000000000000
--- a/kde-apps/kio-extras/kio-extras-24.05.2.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-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[-kf6compat]
-	!kde-frameworks/kio:5[-kf6compat(-)]
-	>=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
-}
diff --git a/kde-apps/kio-extras/kio-extras-24.08.0-r1.ebuild b/kde-apps/kio-extras/kio-extras-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..b907daec37f3
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-24.08.0-r1.ebuild
@@ -0,0 +1,95 @@
+# 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
+
+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
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 5cf278e53139..335146fe52de 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,2 +1,3 @@
 DIST kiriki-23.08.5.tar.xz 371540 BLAKE2B 65b4e6d2aeecc31c492bdc67dbcde4535670e4b3a9aaf5a905816e246c4988dda1211b86e010751c558edffdb7f85d2fb3baa8b887e935a75990936001c7e351 SHA512 c3962ca41b7f461518d227132f7bff261abc503845bd38764c2c6a01f18efa5a5a2f2d5547a0500c2fccce858d03b17d237da55114af8bf9ae76ba81e075dc8e
 DIST kiriki-24.05.2.tar.xz 368492 BLAKE2B 72d3f1fe8be580c2a57752dae68045e033358c96a1c4982f95d8a59057e00238de1afe68a2be2246ec60672e60df541970fd8ffc42c79302629fd343111733ca SHA512 38f305dde4e0b9eb542656c1912db591c3f4e7718f35761674843f3bc3081a1b3c6162cfc7ba824183739c2888a3563f8f882cc81eacb6841e0d551051cf9b10
+DIST kiriki-24.08.0.tar.xz 369864 BLAKE2B eb74ed638174d633f04842ce297092c4e939c6a8b0f9503f25c8229d78134d333b148d66985d6a3ac349af7418c356605d8e0f36cec4c8ff518bdaa377d3bc1c SHA512 2a04ceb699d4d234d4e869fcc9444a90a03385b1c5f7f6f25f7e492496f2cb233bdd38830c326c7d425241e9395d0bf71c1a32fcb3fe14942bf2b6ca6bd8bf12
diff --git a/kde-apps/kiriki/kiriki-24.05.2.ebuild b/kde-apps/kiriki/kiriki-24.05.2.ebuild
index 3ccee4f73a15..1130af512f7e 100644
--- a/kde-apps/kiriki/kiriki-24.05.2.ebuild
+++ b/kde-apps/kiriki/kiriki-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kiriki/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiriki/kiriki-24.08.0.ebuild b/kde-apps/kiriki/kiriki-24.08.0.ebuild
new file mode 100644
index 000000000000..b3656aa758df
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/kiten/Manifest b/kde-apps/kiten/Manifest
index 13bd07852379..6a4354a12b29 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,2 +1,2 @@
-DIST kiten-23.08.5.tar.xz 11336836 BLAKE2B 75ed99e8a000171d4e598942fe6c5e0b90e5fd37ee711c27f7234120ca907ab117f70287ca102de438d6705e4d66b29118dbbc0dd01188c38bee1147b98f6b68 SHA512 a34efb1c28dcb86d2078904e34a61b3350093b3b88cefe57644a9f2f97d242d48fa3bc7b56321984c8f15ccf7b0919ba9ecbc874f370559d660431164cc3b0bb
 DIST kiten-24.05.2.tar.xz 11309376 BLAKE2B 13968dedf03c04358d7b6b324011a763134c2264a64349896df8f4a94a4bce94935d9205d7a968369e73dfe97561416d6af5578d24ec9bb6a40f6a183ddab019 SHA512 f785355190362b5d248fdeb981c9377db1fc823c7783d9b9c380d676ff2fa71db51e93435469fe5ee8d3cb07430b531e456e9f03138aadadea41b12b73bccd60
+DIST kiten-24.08.0.tar.xz 11309984 BLAKE2B ec891b0abcdfc7373efbb5f59bd9795239d8bb75a2b764783f4eaa4ff7ad75fd2d79bd847420c7366f985d7f0d38a936b99740bd441572ac527b8f0a8e9c2039 SHA512 bb447c5440536863e831d82a82a46453704de9b3b5300d2be29852e53ec9cba5169a2d4a63a073920440b808535c4f05366b2f1d43597fc8f5262eb13e188a22
diff --git a/kde-apps/kiten/kiten-23.08.5.ebuild b/kde-apps/kiten/kiten-23.08.5.ebuild
deleted file mode 100644
index b70b9582feb0..000000000000
--- a/kde-apps/kiten/kiten-23.08.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
-
-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/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/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kiten/kiten-24.05.2.ebuild b/kde-apps/kiten/kiten-24.05.2.ebuild
index 2ad6c6a0a795..af43c948bdd5 100644
--- a/kde-apps/kiten/kiten-24.05.2.ebuild
+++ b/kde-apps/kiten/kiten-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-24.08.0.ebuild b/kde-apps/kiten/kiten-24.08.0.ebuild
new file mode 100644
index 000000000000..344fb9779eb3
--- /dev/null
+++ b/kde-apps/kiten/kiten-24.08.0.ebuild
@@ -0,0 +1,41 @@
+# 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/ https://edu.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 8cf515bf9d8a..e84cbf11a10f 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,2 +1,3 @@
 DIST kitinerary-23.08.5.tar.xz 1940264 BLAKE2B ed09bace93b45275c2a7d9106a737b808f9423f044cd36349daaa5c864e1e78bd8592fc95a232bd91927e7af8a4f583759b2db7855c52445c8911d2c6346e3fa SHA512 bf62f4c2fbfbaaafe1d6e3acebdf4b19dab9a2f3e0fb6a2ffa16917e91f27386d562a6a9f5676cdd0ab8c1451a0e7e0e9282a0bc481e1f1b538882db5e1c23df
 DIST kitinerary-24.05.2.tar.xz 1986820 BLAKE2B d90988f40941446247f21528d7f1a81eda25d02fd8c7ec4a50221ffb23f0899bf2562147214b01f31fa29b5c20230c2f904a76f44d7444d69c7002d898fd5c78 SHA512 1e2ef663045d481229436c20e85191633052dddd3f73edc165f27c29bd508aa495509cd2df11198d240251166bc679219c5d14b9f191af9c2f4c011a1f5fc23f
+DIST kitinerary-24.08.0.tar.xz 1990164 BLAKE2B d1fb0a6284b0c02d7f121e79a63173fdf39792a1a421a511e386d51c45377ed296122e98811dd4bc4a3d43a9ccb18053e3d0c2d7af7bb7e4fa9d7546022b3b76 SHA512 16605c791f12aae420a72c4692d469fd69252ac07d48f65e2b484a37b8c5d8e8e4ef45d8e7592e0d06170c8c56f07ba89ef946f4054f1d3b9957cbceb4d0128f
diff --git a/kde-apps/kitinerary/kitinerary-24.05.2.ebuild b/kde-apps/kitinerary/kitinerary-24.05.2.ebuild
index eaba982c3804..b657332c67af 100644
--- a/kde-apps/kitinerary/kitinerary-24.05.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # bug 907957, 851000, 739732...
diff --git a/kde-apps/kitinerary/kitinerary-24.08.0.ebuild b/kde-apps/kitinerary/kitinerary-24.08.0.ebuild
new file mode 100644
index 000000000000..eb3241490ac0
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-24.08.0.ebuild
@@ -0,0 +1,48 @@
+# 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.5.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 2cd3ffe0af5b..70a82cb07fbc 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,2 +1,3 @@
 DIST kjumpingcube-23.08.5.tar.xz 339036 BLAKE2B d47666b498f13bb1d1754cf6ed17b3e1377a5ffd4d95fae7e0593b7404e3ba22a63354e15c5f012c2610a78495aa23f334af7698d938531429013a4c5a9db6c1 SHA512 b5eb092afaed411d1ef0008d5c5a79be86455d0663ad126d25bc45bc3464eeb40d02d03b07ed7bd1e7c1a7fbdba39158625799a05be846cc394ca29a81910eed
 DIST kjumpingcube-24.05.2.tar.xz 340148 BLAKE2B 632f65f726e0f879c0a1d7fffe6db5895220c7a1b69c4a50cef158f88c7f470fc1d3c18d67bd92c94b81bb222a69ed2e8654bc7c6e235c84c032fc5b45b44dc9 SHA512 a215c66907b1fc316d6e9eb4d8c58db1e1e0f8d10cdfefc4350a1b810192be62c1d3a320beed522321b31c28763d2432f0b52db1def6b4cd1d2663c19d6567e6
+DIST kjumpingcube-24.08.0.tar.xz 340096 BLAKE2B a8120115463bf3f559599889616e8ac3b423b093f3b47653512b77acd247c1ba3ec58b2f4e8a90c0d44d5720596a78a6a3c4b26741346083434a59023e0199a6 SHA512 3ef58e595f84c5ddb230a389e82beb4d570e5b65c21233c450df6d0370fb86ba7ea53529ed805d11bcf620d84230a8b48c771626cf1f62a0235b9cd56d4c780a
diff --git a/kde-apps/kjumpingcube/kjumpingcube-24.05.2.ebuild b/kde-apps/kjumpingcube/kjumpingcube-24.05.2.ebuild
index 76dde5ced3f6..c3e435c4c05d 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-24.05.2.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kjumpingcube/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-24.08.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-24.08.0.ebuild
new file mode 100644
index 000000000000..dab5931559cf
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/kldap/Manifest b/kde-apps/kldap/Manifest
index 49cd204c6b56..1b38a061f320 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,2 +1,3 @@
 DIST kldap-23.08.5.tar.xz 183440 BLAKE2B f112e2ffd623d9be30d39b3062640cecfa1c5e213846ee701b14ed07011980cbd2f72c320e804a16c04bf3a2d5803b0bdcdc14cfe68db0b6f3be1ba62a2a61f9 SHA512 2f732c1ddc16b21eb6468d4c35efc205b57b80b08bbd35ffd7eef8993d94e8819f12c42d09f86a5bd41c7af8dcfddc783450e474ba33eba739122bd78b395574
 DIST kldap-24.05.2.tar.xz 184856 BLAKE2B 747755ab7ad2211fedb599806ace8e9b0ac883c25f0cf996b3e8dea8bdbc3f354980d69664abf95cff25089a5efd3f9edbd761d8647c8062524ddaa5a4aa91ab SHA512 c954afe0dace09884353735e3f47c114edfb149447a023ade65112504e495688d7a0d507ab0744af93935093a46cb34c533ef9462aa4c5320035c088eb593054
+DIST kldap-24.08.0.tar.xz 188900 BLAKE2B ca449c43810f94bbc6d3a537b67d8438c1773c9e246374bcf24bfa4793de51fc8955d955ca7bf93303677e16748ea4798002b4b2f62588c52818726e43123d28 SHA512 0f4e9143cd3a076dd1daf8450b8588151585249dd5d1269039ba86a4e6e8e3013024693e311d2bd1bdf66a5a8a1a85e273886747a55978306ba5c4ee514ff3f6
diff --git a/kde-apps/kldap/kldap-24.05.2.ebuild b/kde-apps/kldap/kldap-24.05.2.ebuild
index e76521a9be40..4551ecc5a579 100644
--- a/kde-apps/kldap/kldap-24.05.2.ebuild
+++ b/kde-apps/kldap/kldap-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/kldap-24.08.0.ebuild b/kde-apps/kldap/kldap-24.08.0.ebuild
new file mode 100644
index 000000000000..b1c846f7f699
--- /dev/null
+++ b/kde-apps/kldap/kldap-24.08.0.ebuild
@@ -0,0 +1,30 @@
+# 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.5.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 3774e11615c2..2b8a0226a21e 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,2 +1,3 @@
 DIST kleopatra-23.08.5.tar.xz 2725800 BLAKE2B ebcda23b62788505316b90cdd3997b560abf7d0b79c49db9c47f13be4693a982ce7af19404850ff43902dd1d5be04c8b0f8f0539b60365ced25f4137dc8eece0 SHA512 052edeb168aa80dda9c0292b622c2dbb94d4e046ef37d7e9b4cb84f62aa8004958d4dfda6376e3bde3edea991a523d58a34417fa0864784909232479d6e9f066
 DIST kleopatra-24.05.2.tar.xz 2873920 BLAKE2B 08ed791b3eb093e9082a2a292cf24fe3d3df702507ceda91544aac0727996571d99dc41e6d06d153b1ee9fb182faea47c25468be6615f39dc1ea046f601aa7ed SHA512 2071968799d811c9653e92f6cda9f265ce08cb3fd5f966ede2b524a94a6c726ab0f32892f62072a14f67d245d414670d61dbd68d7346b1a6530b95dc5270cc60
+DIST kleopatra-24.08.0.tar.xz 2957592 BLAKE2B 3c7a06ddbfadb06066c359f263d16f596644da7b6c391a9cb9aa327095c9991307acd28be02bb0569d5ecbfdbe0f8679c7215ced3f66390457e2d34242eb44a9 SHA512 3c938ea3b294aae8b608ae916d727db99665a0a637970cb25d2ddd7e17b00d4976881cae1513e8aeca4d71a3ad063449925e3e9ef3bec2d399945328ab71b788
diff --git a/kde-apps/kleopatra/kleopatra-24.05.2.ebuild b/kde-apps/kleopatra/kleopatra-24.05.2.ebuild
index c5b9d2f7279b..ed31c1f5d14b 100644
--- a/kde-apps/kleopatra/kleopatra-24.05.2.ebuild
+++ b/kde-apps/kleopatra/kleopatra-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kleopatra/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="pim"
 
 # tests completely broken, bug #641720
diff --git a/kde-apps/kleopatra/kleopatra-24.08.0.ebuild b/kde-apps/kleopatra/kleopatra-24.08.0.ebuild
new file mode 100644
index 000000000000..12dbbb017f6c
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-24.08.0.ebuild
@@ -0,0 +1,67 @@
+# 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="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.1-r1:=[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/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 2b76a3c25864..6e782cf7f991 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,2 +1,2 @@
-DIST klettres-23.08.5.tar.xz 47844268 BLAKE2B 7f4272c97649a939d452aee328b723f8e65501e9adc34ba740e422842b4e5495ef78c26f02ee7b47d175953ff673f96333462a4e3c10c2403ab6c62f89509891 SHA512 423c8f16a119cb05cec61b9c2d947a3435f7656732ba7312c48ee16bc7a4f003fe98f144a8d7e8cf5503c650809ab48352ef1c8e1840087477e2b0c2254cad55
 DIST klettres-24.05.2.tar.xz 47179952 BLAKE2B d2fa4555b8ea68e7d7f5ea6630e8036476772ec1fe93ec8d1573ff979fc461c302dfc159203ebf3094b9eaa95c8d7d8ad586f4ddd132a23357ba625b61156c0b SHA512 8d19de73272af5b10037c58c07b3d534156ff61b03f178847eba80841db9f81e45702857bcb64bc304a9db5fddd00c42f102e311e033b4f28eec50a5e2338571
+DIST klettres-24.08.0.tar.xz 47191552 BLAKE2B 29e392e9e8d071bd964eb804b7cf866c4bb240925d8cdcf2520eba069c250b8f5cbd79a31485887b12a84c1f70d053b9f1c409f2880f45defe4d0eee8dfad8ee SHA512 8b98d30f5a4759d519c6c7a337ea45a6a0cce53d4a13a0494a7975c09183dc503725dfd8b87057e3d045ad49aa407f269cc766b5bbc445324ceac71cd4c13c21
diff --git a/kde-apps/klettres/klettres-23.08.5.ebuild b/kde-apps/klettres/klettres-23.08.5.ebuild
deleted file mode 100644
index 1bc6e81043cd..000000000000
--- a/kde-apps/klettres/klettres-23.08.5.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"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/klettres-24.05.2.ebuild b/kde-apps/klettres/klettres-24.05.2.ebuild
index eeb9f183d187..bd8788dad9f1 100644
--- a/kde-apps/klettres/klettres-24.05.2.ebuild
+++ b/kde-apps/klettres/klettres-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-24.08.0.ebuild b/kde-apps/klettres/klettres-24.08.0.ebuild
new file mode 100644
index 000000000000..756708980501
--- /dev/null
+++ b/kde-apps/klettres/klettres-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/ https://edu.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 092253c36b5a..860a6559162d 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,2 +1,3 @@
 DIST klickety-23.08.5.tar.xz 1502228 BLAKE2B 7a9c2a58056bb7b80135d53218d15f437e52cfbebf6de00770281286e841b8a18b86988e3bbd1ea9037a854442f752395b95bd71fbd69ca63585ea43a6a4d520 SHA512 d5078ddc18481a22e796e20cf05a3e2ee8e2626e73bda2cc043dc1f2b7d92fb985e7ab62aede7f96325c9485109f429fda587319f7f6b231ba6487ea0a046542
 DIST klickety-24.05.2.tar.xz 1381596 BLAKE2B 377844d6b55d1eac4ee36ac9a4ad8f271de35951e7ef0596b388477b916c517420e771bf69eb0d9637a412f86eafa02805cd99b68c0d846fe193d81b09e3deee SHA512 8ae70d02ed18258624a451e48ad61380ff68ac0b43e3c8ff63dce5cad6add0d00e751bf5d683f675628b380de431625dc522483e93a4fcf1e0c4688dafcebb04
+DIST klickety-24.08.0.tar.xz 1382628 BLAKE2B 9c239bb338c05b8b07302f4b81f43abdf048e70a6ef7850caa4bae4a7dedb892b8a72eb6429d67d28af4a69ff85da3b9f7e3a4f55dd6916cc855bd0f8840faa7 SHA512 d926e8931e485c6a5d98d53f434ac18544327c18c54b31fb01af5d8b6a9b867c61020d226805aec202abf333b19bb61804a277c3eb557dc9e34584da18b350cb
diff --git a/kde-apps/klickety/klickety-24.05.2.ebuild b/kde-apps/klickety/klickety-24.05.2.ebuild
index 41907b47d079..8d384285e5b6 100644
--- a/kde-apps/klickety/klickety-24.05.2.ebuild
+++ b/kde-apps/klickety/klickety-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/klickety/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-24.08.0.ebuild b/kde-apps/klickety/klickety-24.08.0.ebuild
new file mode 100644
index 000000000000..8e54c64cc0d3
--- /dev/null
+++ b/kde-apps/klickety/klickety-24.08.0.ebuild
@@ -0,0 +1,40 @@
+# 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/klines/Manifest b/kde-apps/klines/Manifest
index 366bd11ffa69..d0a5d5c8dbab 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,2 +1,3 @@
 DIST klines-23.08.5.tar.xz 1739488 BLAKE2B afa419c1a52eea307c51554606305963f96b5058dd16e7d05fbfe487c640275fd9c751a352306579427e96b4886fb74d389631511fb9c61fc62413c66c222b09 SHA512 372d48230d1703d32386ee98147c2fde7695db98f4670e72714f384218815f895232bf52eecce783a02a85dd1aa76b4b06b8d394f66cef4fff2b62012c593cdd
 DIST klines-24.05.2.tar.xz 1669184 BLAKE2B cd8800ef9f328e8176a48a547760dac44b6bee4d14888b531e21139957d92f941948665dfd0eda395139831496b6ceb5a1ba311e8c3e443ea2d64512029b9419 SHA512 317383ffad785600023a7ed7d936a90a40de66c1a52259627d8f2e5b306e278f6f77ef75d7c2ef76685f196f976a98d451e9543f5444d900aaa35af74581369f
+DIST klines-24.08.0.tar.xz 1669640 BLAKE2B 1c34bcf9b3a90427e31c9e0939010fe08a084e8d9931650451cfafab4ab78b5a184eef22ef0ef69238e1ceaa57da9a7c5331976c9c6ad8fd81655cc5448807c4 SHA512 53695301e1fbdbfa4f157bd409b32473780d674d38f972da0fb9ad760857eb4db18adf11b98558743188cf1021badaa59d85499d24b85a396a64aeba96f64b7f
diff --git a/kde-apps/klines/klines-24.05.2.ebuild b/kde-apps/klines/klines-24.05.2.ebuild
index 8aa45e533bd6..a30a85505d35 100644
--- a/kde-apps/klines/klines-24.05.2.ebuild
+++ b/kde-apps/klines/klines-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/klines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/klines-24.08.0.ebuild b/kde-apps/klines/klines-24.08.0.ebuild
new file mode 100644
index 000000000000..d803f21c5e07
--- /dev/null
+++ b/kde-apps/klines/klines-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/kmag/Manifest b/kde-apps/kmag/Manifest
index 2e3416a13d4f..ae351de7d374 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,2 +1,2 @@
-DIST kmag-23.08.5.tar.xz 725968 BLAKE2B 1a91d5af8e747e44384afe3c1f067d3545d563e1d9dfd9f5e8932d4287bdc044efaef67742c13314607a61d6134f97dce0ad90cedc8271846044c97d4575815a SHA512 6bfe3fa2dded39d1167afbdcc3cabb5f2b3e39c72ddae01870a504957c8a9cc965d9a9c35ad3199c9f90fbb66b773694ce117c5499bab7e214bc9460bbf94b51
 DIST kmag-24.05.2.tar.xz 674324 BLAKE2B cdf77892cf1cb114cf0193455450f9b0fbdfa0629f3fd8ec8155c59b60e3c0f94822ae66c830c92c553defeea6fc3f508a01661971418304c8ac122006851f86 SHA512 0aacda53bec9e6c6aa4fdd82d68f16b3225ea3b6937218002c29f07147685e7fbcbb4f0a6eb66fe382a6ed0317055be491bc0a2abd813cfe19526b712c3e8e1b
+DIST kmag-24.08.0.tar.xz 674324 BLAKE2B b2461558368a46284b49a713554bf9fb67ebe56abedb95e65da4bcf2a64eee61fe6c0db4e4da3954a12aa229981bbdd96c7063ec60eee6c06095782054607c1e SHA512 a46c3c7cc165c708c464a1abce61c820ce5cc1e18683a7c7347ab21aff2c2bedc426bf468580a485e2ce9630ece5191dc5fa39021155cf2c163f4bca79db0292
diff --git a/kde-apps/kmag/kmag-23.08.5.ebuild b/kde-apps/kmag/kmag-23.08.5.ebuild
deleted file mode 100644
index 84b9fe394ed6..000000000000
--- a/kde-apps/kmag/kmag-23.08.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://apps.kde.org/kmag/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kmag/kmag-24.05.2.ebuild b/kde-apps/kmag/kmag-24.05.2.ebuild
index e3311d5167f7..58a78fcfb42e 100644
--- a/kde-apps/kmag/kmag-24.05.2.ebuild
+++ b/kde-apps/kmag/kmag-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmag/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-24.08.0.ebuild b/kde-apps/kmag/kmag-24.08.0.ebuild
new file mode 100644
index 000000000000..cf9efaeeedba
--- /dev/null
+++ b/kde-apps/kmag/kmag-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 705ccc1fb0c9..6d2b90c06b90 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,2 +1,3 @@
 DIST kmahjongg-23.08.5.tar.xz 4101108 BLAKE2B 31183187c4aec01645e02f4d261834fd84f2be21597c327e42dba20a8939ffe078752eceee948de8460f2af00eeb21de5522b6a1da7d2d670011f31f6c933cb1 SHA512 0e37cb4f180b2be4137f69831d321bd9613842efe9a4550d3dc59001cf1ab239ba81826ac258680c377e05fce7a261b68069a1085b3bc2f1403ef5ddc6112eef
 DIST kmahjongg-24.05.2.tar.xz 3713540 BLAKE2B f8de1a41af25e8705a793ac1361ed662898d8b60223459cba80f93a34ed13e75a9826afc94ddd4bfc85c9b65c9e2dd378772d923be4300ec417b90571d4c07ec SHA512 cf23b8bdbb4c28d214be3f963abecc02092e464fb2a235a494f1a7cf9d3526bf18a0e4ce559a550bc58da3d630381bb0e2ad4abf283c92adcf9d640d883a3414
+DIST kmahjongg-24.08.0.tar.xz 3715468 BLAKE2B 9ef60e65a745d18ef5eece7fc051222126f327b8605a744e6e6863ca1e8460c6ad7bdb8938d3d0b9138b3aff26121e7a9e67fd99c108ea8471a81adf566e58e3 SHA512 9f7a56bfdb2dcb8affc51ba1d5f1892cf0f81f48bbd6e5d9e5e8238a88c84d1c35f04faeac1dcef2df7733c8a51350e2c2cc83b085c00d02c6c210daa5947523
diff --git a/kde-apps/kmahjongg/kmahjongg-24.05.2.ebuild b/kde-apps/kmahjongg/kmahjongg-24.05.2.ebuild
index 50d52033be8f..1231801615bc 100644
--- a/kde-apps/kmahjongg/kmahjongg-24.05.2.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kmahjongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-24.08.0.ebuild b/kde-apps/kmahjongg/kmahjongg-24.08.0.ebuild
new file mode 100644
index 000000000000..65c2087e059f
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 4d3c1d7f82fc..fbcde85b3820 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,2 +1,3 @@
 DIST kmail-account-wizard-23.08.5.tar.xz 185768 BLAKE2B f791505c8c770bd4430637b5d8766a522c3ef15e1cecba1c3cb8b3663a1ab2ce9dae4482c8e8a5704de5bb489e97baf969bd5422a3b26eba7e36c18e0539cf1c SHA512 2cf313687c214e8462ff42decdd67d4bed7d442cf73acdbd0a7dd26cbca1b8067964d61d3783c72fd34e435be5b222444118e01b56c37141d213b26686914c1f
 DIST kmail-account-wizard-24.05.2.tar.xz 162812 BLAKE2B c0b122f2dd6e4d438a2ea147161a173382cb91aac335fad8abbdc03371ef65fcfceafa3b3706cbb44375fa1bcd234aef20d8aac7344a1cc1098e7e2cb0a15cad SHA512 64113094325a3b937a10e613502a292c0f3352c2329bf528896c8f46a97ba42ad8485f7df63c0df0288070cfda220b13ec8476a8e99ee12f27d50f2b21ba0a57
+DIST kmail-account-wizard-24.08.0.tar.xz 165888 BLAKE2B 7ec0dfd498854d8877b1c70acc9d512e52c1035ac8533b599c9e2ae810d75a209fdecefc98092b46f45b9c4633da8f2ff6af5eed38f85e98504cdca1f9524f80 SHA512 e9dff3a63e37e9e57f7f0dfda0632ca4600a54a795996c0aba9d9c2bc1eb466dc18f4504be074db2f58ba921ceb4d0e0b85c237764fe5d7f8e49d338da8345b3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.05.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.05.2.ebuild
index 6071b86e5059..4467efbcac56 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.05.2.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # bug 926456; requires akonadi server
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-24.08.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.08.0.ebuild
new file mode 100644
index 000000000000..4dbfbe03425a
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-24.08.0.ebuild
@@ -0,0 +1,52 @@
+# 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.5.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 10b3dbb71189..ba03a9332456 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,2 +1,3 @@
 DIST kmail-23.08.5.tar.xz 7669124 BLAKE2B e3075a89552112dae16e092fc716118b19dc84afb6f001a1e45254632afa6dbae692667ec9960b29015fadb1fbc3e1bb8687bb893bb8b8ecc33244c79ff2506b SHA512 f22c0da7030ba0042c45c2d4be7f44cedf4c99794aea36249826e555e0bf52a4d43a975b6b4c97c2548da9d034932375f71607f7a1a6df1254267ca0b8a11d6a
 DIST kmail-24.05.2.tar.xz 8433040 BLAKE2B 24ef1a514545a1d118eaae7ae166a7ac82767823981d50b1c19a065429a8b937ae146701644d47d505135cde39420f49cbdc29548fdb65f822e4827ad0cb791d SHA512 a0edcd4f64e1c056fc712c3157f2cd6169e99758be699e465419c2dd5c44abebf1cb3f079897095db582477d0851ab5532028900f04ed47d6a18c18530680ae2
+DIST kmail-24.08.0.tar.xz 7734672 BLAKE2B 6760d0253ed79e0d387085af0ed2c7f93f781f7539691d1ebf9defbce23300e8145852067d4b204732039b0241017b72bf052ad5647fef687cb5909ae1d026e3 SHA512 d9e5b46437e7d1ee9c6e516b0088cd812bb7f884e6583096cf40125d7066b9752b037bd65f3ce7e2aa79b0052fb79cc14ec2e46eac0ed04f5ef472ba608523ad
diff --git a/kde-apps/kmail/kmail-24.05.2.ebuild b/kde-apps/kmail/kmail-24.05.2.ebuild
index 8d8428385470..dbae680c6be1 100644
--- a/kde-apps/kmail/kmail-24.05.2.ebuild
+++ b/kde-apps/kmail/kmail-24.05.2.ebuild
@@ -16,7 +16,7 @@ https://kontact.kde.org/components/kmail/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="pch speech telemetry"
 
 RESTRICT="test" # bug 616878
diff --git a/kde-apps/kmail/kmail-24.08.0.ebuild b/kde-apps/kmail/kmail-24.08.0.ebuild
new file mode 100644
index 000000000000..fbfbc7753389
--- /dev/null
+++ b/kde-apps/kmail/kmail-24.08.0.ebuild
@@ -0,0 +1,119 @@
+# 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 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="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
+	>=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/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/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/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:6
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[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=(
+		-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 d6b3b5bdb62c..5b01af6db1ff 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,2 +1,3 @@
 DIST kmailtransport-23.08.5.tar.xz 174688 BLAKE2B 3d4983d9ab7b25219c84f3d1d8ca9676e848c620e2396c06c05a55ed2b180b91f003a2bfa0707ef7a266fba4e5a85c3a6b08a598b973b9e5aae5c27d60cc6c60 SHA512 53410478e9e7bcf18a21eb45f96061b50e8f7319ce276255569c873f8e37b82d55ea0c882af368eedbf72cefa65a58e34ad5bed4adc1c2e57d866515c65c19b4
 DIST kmailtransport-24.05.2.tar.xz 187136 BLAKE2B 719f04b0a6c466d4057604f7ca38aad0c04f8793514322a502cdb6e484b32b35d367494382b5e6ab7358072c72859032144945c3d510ae3aa23f378bc9328173 SHA512 4c4c7d549ea1ad718b8d57acfd96f19dfc26aec930c31f3fb2034152a3a05fca52e4ab233aba40d6dea69eb097d2da39e9a8ecf358ed7116dbec449df7cb0089
+DIST kmailtransport-24.08.0.tar.xz 187708 BLAKE2B fd89ed388dde0f8937e16af15daec196727fc4e5f0d1ea4e46d6d2d99f57339b122552b33cdeae70c2e15e9babb23240993104afc1ed6346cf74afd40ca34df0 SHA512 faf7048410e9c31acebb1acb3e1d1baac2194259624cc5409e0ed60d3a8c352f5c18635cfe3d021caaffe1f453720176148bcf8ca29d25b7e0a3a7b592583acd
diff --git a/kde-apps/kmailtransport/kmailtransport-24.05.2.ebuild b/kde-apps/kmailtransport/kmailtransport-24.05.2.ebuild
index ecabfdae7d17..88b053bd9272 100644
--- a/kde-apps/kmailtransport/kmailtransport-24.05.2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kmailtransport/kmailtransport-24.08.0.ebuild b/kde-apps/kmailtransport/kmailtransport-24.08.0.ebuild
new file mode 100644
index 000000000000..2d8bce288612
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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.5.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 755d6e0313fb..e933e643f158 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,2 +1,3 @@
 DIST kmbox-23.08.5.tar.xz 29020 BLAKE2B 68d55c5da0be6fc40883930044c72e8710849458bceb323db10296321d02433407cf85d356f8103cb15239bbd2a68dc4de26b0888e3164ab7560e0cb82f594b7 SHA512 53342dc5487c392f0afd8c72766ee2196060d8fdc25505e92350517d85c10ea22a1d7d8bf44e306acd19e8ca8c09d8b4c7c39c07e68440146f0655e3c81e2b87
 DIST kmbox-24.05.2.tar.xz 28836 BLAKE2B a9ee75b8072dd4168c5ab1a2730f3756635e092b42088b75e8277e8f08e446dd00e4fa4d4fce275bfbe791040cfe0c6385a5c04efd8f6b4d7951bf5db4507f38 SHA512 cd5f051eab3cb51f6d067b51da3fe020f5cdbbc2894fc65e13a0405197d2ed3b5adf4596d3bd45ff2735c43a0a1352cc4a9bd74a0f9bf487860681a88c21cc48
+DIST kmbox-24.08.0.tar.xz 29180 BLAKE2B 3a219d6e495b59d8243ad5c8d7646ea5821d9fc8d28e18c0a3cec64f77df4275371ed612f862542d22ddc1ce9f491c7d3ce9c1d4c8299b2c57c84b37899426a1 SHA512 c46ab1c3331616c2ca924f09dd5ee69758b74d24e0d9dc0b20a8df8a9ae3dd6da0bb924dc4f184b18561f82916fdc08c78d2f97251e29dc86dcb869fee9e27eb
diff --git a/kde-apps/kmbox/kmbox-24.05.2.ebuild b/kde-apps/kmbox/kmbox-24.05.2.ebuild
index 399dd1aa3bec..6cdcd70a20ff 100644
--- a/kde-apps/kmbox/kmbox-24.05.2.ebuild
+++ b/kde-apps/kmbox/kmbox-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for accessing MBox format mail storages"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND=">=kde-apps/kmime-${PVCUT}:6"
diff --git a/kde-apps/kmbox/kmbox-24.08.0.ebuild b/kde-apps/kmbox/kmbox-24.08.0.ebuild
new file mode 100644
index 000000000000..d8237edbd160
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-24.08.0.ebuild
@@ -0,0 +1,20 @@
+# 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.5.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 22c0afe3fde8..e04541fdad70 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,2 +1,3 @@
 DIST kmime-23.08.5.tar.xz 162996 BLAKE2B 1d07bd6668b3a0bc0fbfe4b74c054ed261265e91cfb391309e7914a255e347baeaa5bee5f9e4211a2a982015d81275f4ca4b008f0be4e435dc8058b43a9fc6b5 SHA512 dfc5ed72da6232a0d9477da978fbdae322f81690122375e70364b9a3ef8f922fd4de924bd212f708eb5cb587cc6227493c7c0a274e67ac4591565c9e66017e4c
 DIST kmime-24.05.2.tar.xz 161748 BLAKE2B d9ad175b92dabbe6304b85f034730adebf1f11abae0457ff8db9a16d51aa1bb696e40f582eb2e01cf1543096e72f637df9251fedadf15e85563d2b5cebcd603f SHA512 2552663b7c4f4c4f7b675eee95769625aa6e48af4b22ef38bfdef35dd5ff4498deb4398cc68b9a9a5403325c41a382b6dda317c654e3d11424e94c9eb5b04da3
+DIST kmime-24.08.0.tar.xz 166112 BLAKE2B efe559c47802ffff83a9943faf9547e5b7f95d9cb664c571f57992a14d0195a457d07e943c6997ef8a2ac83d8b9dc0d42dd3f821f983cbf596bf0475092df699 SHA512 026e8f090a54781a27b7d058c573517e05dff49d29dfb0e4a5b460ea6e83434eba49982ee0612b60db0d0efde520440299b5584d58eeb338caa0e9a92425af05
diff --git a/kde-apps/kmime/kmime-24.05.2.ebuild b/kde-apps/kmime/kmime-24.05.2.ebuild
index f3b3f84d0c8b..90ddab44746b 100644
--- a/kde-apps/kmime/kmime-24.05.2.ebuild
+++ b/kde-apps/kmime/kmime-24.05.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmime/kmime-24.08.0.ebuild b/kde-apps/kmime/kmime-24.08.0.ebuild
new file mode 100644
index 000000000000..17913361bc2b
--- /dev/null
+++ b/kde-apps/kmime/kmime-24.08.0.ebuild
@@ -0,0 +1,24 @@
+# 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.5.0
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+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 f13ebab098ea..2371b2316be2 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,2 +1,3 @@
 DIST kmines-23.08.5.tar.xz 1010708 BLAKE2B 5614fd269b0d14b096a65f84dd1656e77433da2ad3c81d227b0cb6cbc5d545eadc5ffc13e17faa0c174ed34b7b55d7757454d6600d7b573021349b4c473dd85d SHA512 dcba68d8c5a8d01fea25f66c4130a22e28deca05ad51606b2056e1d77fc1aff26e2e3a09a4a33aeeeea89d20e64fe7942483be82f0be09deb261550b6d503280
 DIST kmines-24.05.2.tar.xz 944852 BLAKE2B 5cb78493c7af650a0bb486f48874b622bae87e9834fef2b2b2b61348fb6ae1509b3b67e63c8b11b73a5ac03c45306b249448f0d0c00c5965b928edff71df9712 SHA512 489e378c29f8fa79e87266933933b14c9b0cdc19685e70a07dbfd6f0a35414e2bdc689efbdbe6998e12641898b404b1c98d3234e8eb49f8d0c9a99338ce7b052
+DIST kmines-24.08.0.tar.xz 945436 BLAKE2B 890fe582d3a8834aece695f8cfba41b4967ac364e091fc36548f6577683b07d46a301764f927daea40821a5efb19e5b81b871a5c7e2520a47078d1be465400f2 SHA512 e6e8ae7c475535ce3507aa6ce3ec80b36c55444fb6dc120158d96c6bb488eb45695faaeb08fb4fed6513fde7d7615242d356bf67fa3170ebb9928c6a5aef684e
diff --git a/kde-apps/kmines/kmines-24.05.2.ebuild b/kde-apps/kmines/kmines-24.05.2.ebuild
index e3c5e222f33c..e58decfe52a5 100644
--- a/kde-apps/kmines/kmines-24.05.2.ebuild
+++ b/kde-apps/kmines/kmines-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kmines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/kmines-24.08.0.ebuild b/kde-apps/kmines/kmines-24.08.0.ebuild
new file mode 100644
index 000000000000..ed317e7b7d8a
--- /dev/null
+++ b/kde-apps/kmines/kmines-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/kmix/Manifest b/kde-apps/kmix/Manifest
index d97088065bc4..f5d3edaa43be 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1 +1,2 @@
 DIST kmix-24.05.2.tar.xz 1165196 BLAKE2B 512a56ee928546ee077e3302432faa65caf56f3e613f9a772733a5187800b3fc7c068a84c147897b1e53513d07601c59cf42e046d65d5dbe180e7255d168bc8c SHA512 126e0144034132e65cec59f774582ba10073bf2b96a97ca4e8fd75a9143b2fcf93659f869417095c75b90ec3347d3ff562ebd36eb3ea0fec8a0c303c8bdce6b9
+DIST kmix-24.08.0.tar.xz 1165316 BLAKE2B 5016ad90e3533ea968f6d1ec17a8884060da1f3f2d9eacffa3d3a07c34d707a9195b3dd1c456165f8707db3e09f93b0bf438e4c1ae3b587b4fb8efcc5d548586 SHA512 da2ac8833cbdbad97f8e9651a608e3f4ca85ec0a093fc039f450123ec3a05d6fea9d2437cb9970eca016f8eb2232ea53613c87ed453b1fd089dd335abf09df24
diff --git a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
new file mode 100644
index 000000000000..23987a8261db
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch
@@ -0,0 +1,94 @@
+From 8d6837131706bd0f5dbd573726e7c01775f8256c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 4 Sep 2024 08:03:09 +0200
+Subject: [PATCH] Revert "When we click on "Audio Setup", calls kcm_pulseaudio"
+
+This reverts commit a54f760987557036b90888a3efa7ad17346a00ed.
+---
+ apps/kmixwindow.cpp | 22 +---------------------
+ apps/kmixwindow.h   |  2 --
+ desktop/kmixui.rc   |  1 -
+ 3 files changed, 1 insertion(+), 24 deletions(-)
+
+diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp
+index fa727f39..fb182f49 100644
+--- a/apps/kmixwindow.cpp
++++ b/apps/kmixwindow.cpp
+@@ -37,7 +37,6 @@
+ #include <klocalizedstring.h>
+ #include <kstandardaction.h>
+ #include <kxmlguifactory.h>
+-#include <KProcess>
+ 
+ // KMix
+ #include "kmix_debug.h"
+@@ -164,11 +163,7 @@ void KMixWindow::initActions()
+ 
+ 	KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection());
+ 
+-	QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
+-	action->setText(i18n("Audio Setup..."));
+-	connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec()));
+-
+-	action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
++	QAction* action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow"));
+ 	action->setText(i18n("Hide Mixer Window"));
+ 	connect(action, SIGNAL(triggered(bool)), SLOT(hideOrClose()));
+ 	actionCollection()->setDefaultShortcut(action, Qt::Key_Escape);
+@@ -1174,21 +1169,6 @@ void KMixWindow::toggleMenuBar()
+ 	menuBar()->setVisible(_actionShowMenubar->isChecked());
+ }
+ 
+-void KMixWindow::slotKdeAudioSetupExec()
+-{
+-    forkExec(QStringList() << "kcmshell5" << "kcm_pulseaudio");
+-}
+-
+-void KMixWindow::forkExec(const QStringList& args)
+-{
+-   int pid = KProcess::startDetached(args);
+-   if (pid == 0)
+-   {
+-       KMessageBox::error(this, i18n("The helper application is either not installed or not working.\n\n%1",
+-                         args.join(QLatin1String(" "))));
+-   }
+-}
+-
+ void KMixWindow::slotConfigureCurrentView()
+ {
+ 	KMixerWidget *mw = qobject_cast<KMixerWidget *>(m_wsMixers->currentWidget());
+diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h
+index 67560723..0bcb04ed 100644
+--- a/apps/kmixwindow.h
++++ b/apps/kmixwindow.h
+@@ -86,7 +86,6 @@ protected Q_SLOTS:
+ 
+ private:
+     KMixerWidget* findKMWforTab( const QString& tabId );
+-    void forkExec(const QStringList& args);
+     KToggleAction* _actionShowMenubar;
+ 
+    bool m_startVisible;
+@@ -117,7 +116,6 @@ private:
+     static QString getKmixctrlRcFilename(const QString &postfix);
+ 
+ private Q_SLOTS:
+-   void slotKdeAudioSetupExec();
+    void slotConfigureCurrentView();
+ 
+    void plugged(const char *driverName, const QString &udi, int dev);
+diff --git a/desktop/kmixui.rc b/desktop/kmixui.rc
+index 5c53281a..27ca3351 100644
+--- a/desktop/kmixui.rc
++++ b/desktop/kmixui.rc
+@@ -16,7 +16,6 @@
+  <Menu name="settings">
+      <Action name="toggle_channels_currentview" append="save_merge"/>
+      <Action name="select_master" append="save_merge"/>
+-     <Action name="launch_kdesoundsetup" append="save_merge"/>
+  </Menu>
+  <Menu name="help" append="about_merge"><text>&amp;Help</text>
+   <Action name="hwinfo"/>
+-- 
+2.46.0
+
diff --git a/kde-apps/kmix/kmix-24.05.2-r1.ebuild b/kde-apps/kmix/kmix-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..314dc674568a
--- /dev/null
+++ b/kde-apps/kmix/kmix-24.05.2-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=5.115.0
+QTMIN=5.15.12
+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="5"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE="alsa plasma pulseaudio"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 )
+	pulseaudio? (
+		media-libs/libcanberra
+		media-libs/libpulse
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
+	"${FILESDIR}/${P}-revert-kcm_pulseaudio-dep.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alsa ALSA)
+		-DBUILD_DATAENGINE=$(usex plasma)
+		$(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/kmix/kmix-24.05.2.ebuild b/kde-apps/kmix/kmix-24.05.2.ebuild
deleted file mode 100644
index c8d35f75ee6d..000000000000
--- a/kde-apps/kmix/kmix-24.05.2.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_HANDBOOK="forceoptional"
-ECM_TEST="false"
-KFMIN=5.115.0
-QTMIN=5.15.12
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="alsa plasma pulseaudio"
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 )
-	pulseaudio? (
-		media-libs/libcanberra
-		media-libs/libpulse
-	)
-"
-RDEPEND="${DEPEND}
-	kde-plasma/kde-cli-tools:*
-"
-
-PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" ) # TODO: upstream
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-		-DBUILD_DATAENGINE=$(usex plasma)
-		$(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/kmix/kmix-24.08.0-r1.ebuild b/kde-apps/kmix/kmix-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..5153c51334f1
--- /dev/null
+++ b/kde-apps/kmix/kmix-24.08.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=5.115.0
+QTMIN=5.15.12
+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="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="alsa plasma pulseaudio"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	plasma? ( >=kde-plasma/libplasma-${KFMIN}:5 )
+	pulseaudio? (
+		media-libs/libcanberra
+		media-libs/libpulse
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}/${PN}-23.04.2-autostart_disable.patch"
+	"${FILESDIR}/${PN}-24.05.2-revert-kcm_pulseaudio-dep.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alsa ALSA)
+		-DBUILD_DATAENGINE=$(usex plasma)
+		$(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 8db6a9e8f480..228049eba34d 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,2 +1,2 @@
-DIST kmousetool-23.08.5.tar.xz 130964 BLAKE2B e3d4cd6697225f229490bacec909d674f57057b182b3b05aa48637be0447f472d2cce4003cfd905ed493a9ba56247ae74bd93fde2ec967735ed03168ef45230c SHA512 bb74c282384be910cafa59e41e2f6ac0c311bd968b03f9d079ae538eb46c0c653574a4983ca694b64c4ba783b38baf6acd7e7aa6294f72e243bb42e2c62cf1ad
 DIST kmousetool-24.05.2.tar.xz 130372 BLAKE2B 17bbc5985129028fcb2206cefb10abc2bb82f54f84c14d8beaaea821862bff62ac4041c0919aedd6864d2b00ee8f433c94812a4889decb2e6d224efe83d5b349 SHA512 681a070712c4a53750a3dff52d750c5b0b20415dc05a5e42603e94f3cfb6cd90b1b9401687db712e3b6e6a0a74f099dbc17f0cb97c84e2e5820b8ab223fcd0f6
+DIST kmousetool-24.08.0.tar.xz 130444 BLAKE2B 28eafe851fb67c521c94160b36426055450ed03e9ac2bbee482a2733086d1a665069a89759ddf1674ef5b083e42874f048e24511568b1acb4696f25f11746ec4 SHA512 adc99c65b3fbf5cdeee3d3426188777123700198c6c76f42e87a80f6123282fbc753e4b0e1486a20b09c655fbfc259a6c93bb196eea1b3e8ec372da6f4e8e568
diff --git a/kde-apps/kmousetool/kmousetool-23.08.5.ebuild b/kde-apps/kmousetool/kmousetool-23.08.5.ebuild
deleted file mode 100644
index 6874f1bde276..000000000000
--- a/kde-apps/kmousetool/kmousetool-23.08.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
-
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	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.05.2-r1.ebuild b/kde-apps/kmousetool/kmousetool-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..4e48d385a5a9
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-24.05.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.3.0
+QTMIN=6.6.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.05.2.ebuild b/kde-apps/kmousetool/kmousetool-24.05.2.ebuild
deleted file mode 100644
index 161a7561068b..000000000000
--- a/kde-apps/kmousetool/kmousetool-24.05.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
-
-ECM_HANDBOOK="optional"
-KFMIN=6.3.0
-QTMIN=6.6.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/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.08.0.ebuild b/kde-apps/kmousetool/kmousetool-24.08.0.ebuild
new file mode 100644
index 000000000000..0dd62050e1ab
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 62e7e01fa5bd..8d988d866ea2 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,2 +1,2 @@
-DIST kmouth-23.08.5.tar.xz 2091588 BLAKE2B 53b72d188ba1705d520a3343c169aa72b73164a9ef8957e7c954324625dffa47ffd79f83eba83e3d6f2623391a74219f6355626d6232a8247883ab7d1e5333b0 SHA512 8e98cf7924d05c49043f091b6eb4608cba1a215f447d53ba005c805e783f515099ab657b2c58eb9ed2fe5d42872d96bf268c078b5bdf24a6c93a57210c1041dc
 DIST kmouth-24.05.2.tar.xz 1935820 BLAKE2B 638749daf7ad0d496b3acd98829905052f463bc5a606114f96587406d4ce3b3d7ee881f1ff82179c1c961ecce3bfff73b9ece145612c76ccf8392d24a46d42fd SHA512 97046c6b9ef177a5a4764eb1a99cf4f03d92dba26c6f97121c552a95a1627ee098a161cddc7b95f083166c15da11d3ff61a26c3be735cab91cd0aff636cc8d09
+DIST kmouth-24.08.0.tar.xz 1936532 BLAKE2B 172e974ef6357acef1de3d1b18bc68a0953f5bf0c211ea845ab2359e8a6dd9eaa1a82cfa34dbeb6da8c140c2a2e904863ddd5c60177d07b81e1b83cd375f4912 SHA512 87259b810249694aca4e7e9c4500069a6ad728e6660ff22f43fc069ba89efa8012e4929b0bd940da24b743d5e22fd0e6620e5abca49b12c1307882d805db6908
diff --git a/kde-apps/kmouth/kmouth-23.08.5.ebuild b/kde-apps/kmouth/kmouth-23.08.5.ebuild
deleted file mode 100644
index a489ea7680a9..000000000000
--- a/kde-apps/kmouth/kmouth-23.08.5.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"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://apps.kde.org/kmouth/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtspeech-${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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmouth/kmouth-24.05.2.ebuild b/kde-apps/kmouth/kmouth-24.05.2.ebuild
index 7ce1243424cf..cf197ffaf256 100644
--- a/kde-apps/kmouth/kmouth-24.05.2.ebuild
+++ b/kde-apps/kmouth/kmouth-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmouth/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmouth/kmouth-24.08.0.ebuild b/kde-apps/kmouth/kmouth-24.08.0.ebuild
new file mode 100644
index 000000000000..d3e9e0b71d9a
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 77fc8903d12f..cf3906278c83 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1 +1,2 @@
 DIST kmplot-24.05.2.tar.xz 3004088 BLAKE2B 6c3a761df37cd3761b4d5651e330a73216e4c8b4f7c09b0a1b3d4980da8e63886144b36e368a8dd5f7807276cb3a00c153791a4bd52e1aaace1a009d5f43778c SHA512 32ed1ad65d6be7e4ccde6c4f965b9347517998c7c56a46f3e5f323c5294efff55fa19d9f4b982cc4203ef09666985f28763950b6a96585eaa388166ed6d0d158
+DIST kmplot-24.08.0.tar.xz 3010496 BLAKE2B 9ee0578dc38253c6559fdeaf9ea95efdac47f0f22edf1f7683959825d725d758a84a5f99ad076fd338419d6f3b51ebc3d6fbe652bd91f541887b26b307f36a6c SHA512 053b7b3c67b4cfc17b6def98aa6b3ce44ca0a7c4fef05fe849f0b79b8713f7c9f4850ccdf9a81deecd5270e29bdd59093f011c9db6c0f6d4dc929dab4eb1c1ed
diff --git a/kde-apps/kmplot/kmplot-24.08.0.ebuild b/kde-apps/kmplot/kmplot-24.08.0.ebuild
new file mode 100644
index 000000000000..dfd550656118
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/ https://edu.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 1b7636efcb42..a8f07556dd25 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,2 +1,3 @@
 DIST knavalbattle-23.08.5.tar.xz 1402920 BLAKE2B 298821807ba61b93902a1a67bf2573f76ca76a02449ed11478ba4b86ddecdd23255211bc36337aad9b23dc277fd36ce13cfb2f721c50941f00cb44b07aea423b SHA512 442624b3209a53c3068920ad9cc1c65df742c04aa22a16035086adc9c7c85dcb9455583dcb6dfa4a853ecabdc661c61149db5c3c03590589a595b7f792f4d950
 DIST knavalbattle-24.05.2.tar.xz 1042572 BLAKE2B 8a635c46d4629e00b6dd282fe41093d1a32515da7a1218a7a9df8f7df2083f4bfa6891352dc993e920b16c7931429ef138844e58c2b295159a818489841e1ae2 SHA512 3f1946db75c83b1f57b72f5d3236fa5848d76451cf327f3fc40c3176f53e1b3566f87a7b3612fd83c557cfd9a1bad2abc3a24933f3d75c531e73255bd92fdc9e
+DIST knavalbattle-24.08.0.tar.xz 1044208 BLAKE2B 0c7af5afb62aeb5525efe0b95417ac1cede9597e1ab762d1b35a6be3d7cabb79a26eab0b0b103f8de1b058208291da6d0e98de109049591b22720a23eec65861 SHA512 f6bf3c610e6167c781ab152b4d8fe9c385d4238113086acb069d36c0deeebb3e9cf8ebca04439a45b678dabe88bfbf7dd18a7812c25ef6bc3ec4553138dcd207
diff --git a/kde-apps/knavalbattle/knavalbattle-24.05.2.ebuild b/kde-apps/knavalbattle/knavalbattle-24.05.2.ebuild
index 83828622e850..1c23eb6b2f05 100644
--- a/kde-apps/knavalbattle/knavalbattle-24.05.2.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/knavalbattle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-24.08.0.ebuild b/kde-apps/knavalbattle/knavalbattle-24.08.0.ebuild
new file mode 100644
index 000000000000..978e97fb1a46
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-24.08.0.ebuild
@@ -0,0 +1,39 @@
+# 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/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 52dfae7efb7b..7fa6dd7fd042 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,2 +1,3 @@
 DIST knetwalk-23.08.5.tar.xz 1106916 BLAKE2B 9f0e59e220c97a12a3afcd052603dda9309a370d36825aba985c6deaf941142523774375efbd3d9276927c46d468774b1117ec1ea95c1158b81d7158639fe614 SHA512 7c75b2be561205d48e68655ec165df7dc4b24ad45325c4f0466a95fef9aff242810b2233fe2061d79bab31df84ce96e45abaa7642b99f09577520a9dec8e54d5
 DIST knetwalk-24.05.2.tar.xz 1004740 BLAKE2B ca76b823959f93bb1f99d6111cc72867f475702e60b5388d19e7f482a6aec97902b4b16557d1115c7062e28d763fd257b3272b6e2f85d1fed7047b1c5cc9054e SHA512 43887f27a2b0067aabc1be01bcc99a1355fff6d01107849f9f4c96377b0b1503912878fe2ca032c0bb59d8a71fae7e3ff25b9d0f430da2ff6c9629db422f757a
+DIST knetwalk-24.08.0.tar.xz 1006888 BLAKE2B a654ce0bfb2125808202f8584096bd612841b429b17ed966187a450410d206bc3a4e8eee8c364c09f236a610b635a480e004553d484199a34b577e57683aa30a SHA512 d69842c29596062b57cb76bf755090730e9bba1222a052d6333c336cd6f9f0ca49546a8ad6455b52e1fbeb383d6e5efce1da876e4ad9e7aa7ae9ba7c65b0c4b8
diff --git a/kde-apps/knetwalk/knetwalk-24.05.2.ebuild b/kde-apps/knetwalk/knetwalk-24.05.2.ebuild
index 6fe61c6bf36f..4bb4422e1ccf 100644
--- a/kde-apps/knetwalk/knetwalk-24.05.2.ebuild
+++ b/kde-apps/knetwalk/knetwalk-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/knetwalk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/knetwalk-24.08.0.ebuild b/kde-apps/knetwalk/knetwalk-24.08.0.ebuild
new file mode 100644
index 000000000000..dd408b12aa38
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/knights/Manifest b/kde-apps/knights/Manifest
index 6bce0eb5cc3a..3c2f53c5789c 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,2 +1,3 @@
 DIST knights-23.08.5.tar.xz 3334500 BLAKE2B 88afa3fc6deee29ae406f4e43028577e3f8014616530955316f3e559e3e55fddb942005471e1a630bb511a92e14228a033caca541099f9deba7f9f9ac95e70b5 SHA512 e71fcbf60216711cd2740a2f44b9937da2a244a4be2e57b1b4afbf772a1f096b72664f36cbdce86a61ffd123694c608e24d106681ff56bb8dc68e9daf0529a63
 DIST knights-24.05.2.tar.xz 2471608 BLAKE2B 45c1d6deace23166fb3d8762e3b3bd860f27981dce255810652d83550bd72adc09d020695e37d43bf0d6be3a9c9c0b8f4d15cb2fe2036e1037339ff9b8c72223 SHA512 188ccf4ef115a4f2a32834e7f8ca991fc70425434ba89dd21dd6afea799cef65e2e27a2a3073a2f89e5b53ae035cecd8d0e7eb56f6450b93e6ca4eb66c27eae6
+DIST knights-24.08.0.tar.xz 2479952 BLAKE2B 573fa71302d2f678119b1941b16e1f1810a92d660e3adfd0152160bbc0739efccd7db9eb664dada76164bab2b95c3b4270e612a7352e7b18d3fa947e0eae3b2c SHA512 598d7db0501c7c117672b00467c3712c03deb60d6446d4c5e0b30f3aaa5a093d45329355f02f59d9369f200987c690e1c1e71f04c804caf61b7fbf0f7b719cc9
diff --git a/kde-apps/knights/knights-24.05.2.ebuild b/kde-apps/knights/knights-24.05.2.ebuild
index 36903f65d348..ce450a770511 100644
--- a/kde-apps/knights/knights-24.05.2.ebuild
+++ b/kde-apps/knights/knights-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/knights/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knights/knights-24.08.0.ebuild b/kde-apps/knights/knights-24.08.0.ebuild
new file mode 100644
index 000000000000..efcc122ef59a
--- /dev/null
+++ b/kde-apps/knights/knights-24.08.0.ebuild
@@ -0,0 +1,58 @@
+# 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/knotes/Manifest b/kde-apps/knotes/Manifest
index 72123bf9ab1b..bf73c2fe74b0 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,2 +1,3 @@
 DIST knotes-23.08.5.tar.xz 378896 BLAKE2B 789a04d76594a07dce5f60cbbf7f39bcd2e89f4689791533a0954483f928fc70b003e23d2a318b50b7ba876e5b7382cf248606d18b84b93f5928a96eaf99f90a SHA512 797cfb4a702ac6473b982c74d0c8c5ab36df3cacd546a7701f0ac38156043b5db0983ed29fb3a3ffd11a494526dd71361eec53aee0512dd85bed5204ad3a73fb
 DIST knotes-24.05.2.tar.xz 381108 BLAKE2B 38235c28eab4743aa611fbd578837384fba8008514b7dd1ab53aef9ba030a193815569b76b96c9969116f3d172f038215cd0a61c20fcd2ad7fc5827cbed09312 SHA512 f343865d91fb403a1243dfd25f52cc1f7127a7c214bc898d2f63c2e10798e7a753366fbde4fac68e41d23a17e5876aa54685a51374c7877293a5bfed2b162e12
+DIST knotes-24.07.80.tar.xz 383020 BLAKE2B 4494a599ecc93fb074d4638f2826bdb759bae8289b51d875396bc92a9ef4fc8d83f734dbad62db9d35fc524c141d0835faf193e333625a0da859f5bc9daa4f27 SHA512 66c46e0c31150e3db1e9a1731449be8ff6af85a71157d1334984583eaeb24da9484a2b4538c9b60a67f5e53098c212f498e76a9fb8842f367de8ba9d33b22472
diff --git a/kde-apps/knotes/knotes-24.05.2-r1.ebuild b/kde-apps/knotes/knotes-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..94845c83dee9
--- /dev/null
+++ b/kde-apps/knotes/knotes-24.05.2-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://apps.kde.org/knotes/
+https://kontact.kde.org/components/knotes/"
+
+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-${PVCUT}:6
+	~kde-apps/akonadi-notes-${PVCUT}:6
+	~kde-apps/akonadi-search-${PVCUT}:6
+	~kde-apps/grantleetheme-${PVCUT}:6
+	~kde-apps/kcalutils-${PVCUT}:6
+	~kde-apps/kmime-${PVCUT}:6
+	~kde-apps/kontactinterface-${PVCUT}:6
+	~kde-apps/libkdepim-${PVCUT}:6
+	~kde-apps/pimcommon-${PVCUT}: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-${PVCUT}:6
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-apps/knotes/knotes-24.05.2.ebuild b/kde-apps/knotes/knotes-24.05.2.ebuild
deleted file mode 100644
index 0d3de31a94a9..000000000000
--- a/kde-apps/knotes/knotes-24.05.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://apps.kde.org/knotes/
-https://kontact.kde.org/components/knotes/"
-
-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-${PVCUT}:6
-	>=kde-apps/akonadi-notes-${PVCUT}:6
-	>=kde-apps/akonadi-search-${PVCUT}:6
-	>=kde-apps/grantleetheme-${PVCUT}:6
-	>=kde-apps/kcalutils-${PVCUT}:6
-	>=kde-apps/kmime-${PVCUT}:6
-	>=kde-apps/kontactinterface-${PVCUT}:6
-	>=kde-apps/libkdepim-${PVCUT}:6
-	>=kde-apps/pimcommon-${PVCUT}: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-${PVCUT}:6
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-apps/knotes/knotes-24.07.80_p20240826.ebuild b/kde-apps/knotes/knotes-24.07.80_p20240826.ebuild
new file mode 100644
index 000000000000..3a1c4612d12b
--- /dev/null
+++ b/kde-apps/knotes/knotes-24.07.80_p20240826.ebuild
@@ -0,0 +1,63 @@
+# 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/kolf/Manifest b/kde-apps/kolf/Manifest
index afafa46ce29b..2cf42d9ae7f9 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,2 +1,3 @@
 DIST kolf-23.08.5.tar.xz 1076364 BLAKE2B c66dfa20d525a954d599f35cbc03ec293c85af22060020493dacc8c0f7e03e5de6408e954fb05145ed40ab22dec7795bb5e6ac6f92f4e550f66e41d98a3f2573 SHA512 0622cb495829a16c904631f83e52187c77ed6cd1e4d49e19a4d8ddd55a3de0c51ab511fc1ed32d24ae2604147f1c75cee04780a4d7a6fe8be6553f669d34caf1
 DIST kolf-24.05.2.tar.xz 1066328 BLAKE2B d38d024a4024a748bda96713ebceb01f23f356063fe79e5fb1685e80ef78f6786e2baca63b3e7b16cd99a188386be94a0c63e87e1bb586189fefd68b61138501 SHA512 b147672b996b514aa7d6821edd1ef4ef420f577b0f0904112bf55d0f359ac1f71bfbad66920bc2d9626351a0114e1bd101693f96738cd7a161d2fd5ebca5e87d
+DIST kolf-24.08.0.tar.xz 1072496 BLAKE2B 5ceb648f1c8a75a8e4a2b8e882030c9758247729253cd15b2c8680c3c20325c7626c00fe2e0d2533b6bf860284bc2e9c3168485f3a2828a9f9e13612e226de77 SHA512 2b7eae248cbccea7121d936d6a87e53679bb42326538f0141624d637904935bdf56b4ffc130b4141ef41c3585b782bf98b047b4aac9d749db8266c749e96310e
diff --git a/kde-apps/kolf/kolf-24.05.2.ebuild b/kde-apps/kolf/kolf-24.05.2.ebuild
index f3a6cfe9e0d9..ea7a1e321ac2 100644
--- a/kde-apps/kolf/kolf-24.05.2.ebuild
+++ b/kde-apps/kolf/kolf-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kolf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolf/kolf-24.08.0.ebuild b/kde-apps/kolf/kolf-24.08.0.ebuild
new file mode 100644
index 000000000000..7352ebb59a0b
--- /dev/null
+++ b/kde-apps/kolf/kolf-24.08.0.ebuild
@@ -0,0 +1,39 @@
+# 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/kollision/Manifest b/kde-apps/kollision/Manifest
index d6b814348153..5a590f5169c1 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,2 +1,3 @@
 DIST kollision-23.08.5.tar.xz 308616 BLAKE2B 36abefa507864d03a378ae31e3b2eb03bef945337424c090de4c2535bd128d23a290b5992b087f042e6f2a961bc1b9b3197ccd3dcba0e01805e8b99a23bf1c35 SHA512 f6374c0e17b00cac09ec90edb05caff00be4324436dd427d3597271ed31a3cce107f31ab13e7eae7739b812bb52049629e4ae75f65710fb4fdd254a4b8db442e
 DIST kollision-24.05.2.tar.xz 308720 BLAKE2B ef5bf8fa8bf6a2012a93992a6745029cc9d9dd548b978881b887bbf3d1d65525547aa09f37cfea58d783d0cb6fff045293fdc5b962c68a011e189a73dc461b9a SHA512 b239683017759f177dd6aa4f185f373f4c972d73cc47f26e1e0505e27ad477d5e0e9bdc4d8f86db32a37d96bae20077ee352ec9d4f68ec70f8018551db09a49e
+DIST kollision-24.08.0.tar.xz 309256 BLAKE2B 2aa153b3e9f7019d0b5db9a021718231a9a141aa0ab36cebe6a9602313bb872fab7f277d653cda2538b25685fb606f2ac5d2728e5c8c3ed2dc30a302f2f6fb32 SHA512 812ae99e153175aeec1acc431cc2fb43cd598f5d4802fe726c2cd0bddc074065124d88d5ba59eea35c3b969bc3881d32f97be05871c976e8ce4310e01ed738d0
diff --git a/kde-apps/kollision/kollision-24.05.2.ebuild b/kde-apps/kollision/kollision-24.05.2.ebuild
index c748a2f93db1..b0f1f7e0cd7b 100644
--- a/kde-apps/kollision/kollision-24.05.2.ebuild
+++ b/kde-apps/kollision/kollision-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kollision/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-24.08.0.ebuild b/kde-apps/kollision/kollision-24.08.0.ebuild
new file mode 100644
index 000000000000..f18bef55498f
--- /dev/null
+++ b/kde-apps/kollision/kollision-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 78e308d528bd..059124bd1203 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,2 +1,3 @@
 DIST kolourpaint-24.02.2.tar.xz 5796724 BLAKE2B 6b06a86174d98a0cfea339cf42fe875163c3ee697837c7ccdb9a4c234c74e6d980487fde3072871e17b56ad17180f6983566884f902bd1f4f73f584aedc9f577 SHA512 4277ba48582a1ee3c62e95e00f4d8c3e048348eab5e2d75f0579e5e4b179da85793d6cf744b423c3991e9c6501fa4f9d78bfb8fa7389b9e9f334eb61a78000e0
 DIST kolourpaint-24.05.2.tar.xz 5294868 BLAKE2B 54b42452fa98fe3a45e48bc5f9658770a6ed5301408afc2c8a8d1b497c88608af9f34936b071d255c3cb5bebf46ff13fdad47be3283f833c8a1e55505485cf52 SHA512 9133693c46a209486b896e8d007fd4733355eef201cb0067557b3d6a2d4bf2f8785d0bf7f27e431b51b20485f27f1c0c334a9abeaf2215bb4caf33c64fb22191
+DIST kolourpaint-24.08.0.tar.xz 5301900 BLAKE2B 21cfe784a43cf96cae5ffae21f076f76bbfe445d027324a044ec48f951c168e16cc7e4f8b30554abdebde45f1753b95f2e85bf07c080328865e3ccc299755625 SHA512 2093240f57ede3268b9b339dc5bcbd838dd6473ecbde1d6b0a7ab89f1575b02c99aee7ec2c0d40c90cf41acf8739b230234dfba7d51f6b769238b709d5d0941b
diff --git a/kde-apps/kolourpaint/kolourpaint-24.05.2.ebuild b/kde-apps/kolourpaint/kolourpaint-24.05.2.ebuild
index b51939f4372b..7c9bb6f23123 100644
--- a/kde-apps/kolourpaint/kolourpaint-24.05.2.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-24.05.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/kolourpaint-24.08.0.ebuild b/kde-apps/kolourpaint/kolourpaint-24.08.0.ebuild
new file mode 100644
index 000000000000..335fea1e0b0e
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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/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/ktextwidgets-${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 0a36512b28e3..00fd574eaf8d 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1 +1 @@
-DIST kompare-24.05.2.tar.xz 941900 BLAKE2B 1f3b383a162274e9f4985076dd52335929ff65b9d96b0a552fdc95f902a7b3ca223a20049d017386504575af244bf396c9cefe5ed8324e9c90c85ce81498bde8 SHA512 fc6692a945f9603a59865c5a032fdddf6cf05c752076931bd28532c97bd7f43411d28f69b50ed1243977f2e763f69bdd88fed32dcc7198f584d65d48e1b70338
+DIST kompare-24.08.0.tar.xz 947304 BLAKE2B 3e3c4d8c822ebb45dbe2284e35d3c24311b18d9075091f6f842c1db645565d71ff709e68278114470981f3300782c2e6f11ee1b6ea10e04a1601ebb5989c7e35 SHA512 81c66568e493812fd7da662997a23a860991c8c500a766f16819d0e103003ee5705bd53b29b4d10d4751c4091452f6a6661c26f09f2ebdaa7ea362c83b7203c7
diff --git a/kde-apps/kompare/kompare-24.05.2.ebuild b/kde-apps/kompare/kompare-24.05.2.ebuild
deleted file mode 100644
index bebf978bc3d8..000000000000
--- a/kde-apps/kompare/kompare-24.05.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
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://apps.kde.org/kompare/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkomparediff2-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kompare/kompare-24.08.0.ebuild b/kde-apps/kompare/kompare-24.08.0.ebuild
new file mode 100644
index 000000000000..9eb8acbc53dd
--- /dev/null
+++ b/kde-apps/kompare/kompare-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 8091f0875205..670752fc325f 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,2 +1,2 @@
-DIST konqueror-23.08.5.tar.xz 10092644 BLAKE2B 5e3cc994e459e27288909e803864928886e4392ff1e430042182e13f428e3226a5b510cca2f3f5dfbb9311895d885dd1f3cb888a2f4ef61e5feaa9e22f9f5311 SHA512 8f0ebd03b24de9723800edd9a9c6dd6de5fe272e7a0702c1e07de4aa24fdbd7dae47de8afec07fced9c1d4fcd52a66fa0bad674f68a94499c7cc4bbb79e422ee
 DIST konqueror-24.05.2.tar.xz 9698780 BLAKE2B e661980bf22294d076da7d2cd911336324b722e9e0b2c4d957594bec006800e507d6ca7acf0bf195c803e6908d83313bdab30030dd986a308e5f41221690b99e SHA512 2c14febed5fa66a4958407c8ddbcfa3fb12156a9ccffd74928f0c7ed1dcefcce9260f6da66e0a3fee28a62048baef904644276995de5737d07a70275d7566ff7
+DIST konqueror-24.08.0.tar.xz 9685364 BLAKE2B 1f1215f43a0ba67a183893798de0da3dbcf9ae036108984f96c8042f2acfa7cf36000a9f8b45707811c1d5d96be4fc3056d28e10d363e288855461de43c30324 SHA512 bb354a156766fc30cac43881613545e286e6e9d7de533f2d76a4c6d9cfe4a4f0b35b32fde39e9c9d8637097cf03a0484e719b94eecb78487d9bcc2feaefabe6f
diff --git a/kde-apps/konqueror/konqueror-23.08.5-r1.ebuild b/kde-apps/konqueror/konqueror-23.08.5-r1.ebuild
deleted file mode 100644
index a4710e6ee038..000000000000
--- a/kde-apps/konqueror/konqueror-23.08.5-r1.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="activities speech"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kfind:5
-	kde-plasma/kde-cli-tools:*
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	# bug 933344
-	cmake_run_in plugins/webarchiver cmake_comment_add_subdirectory thumbnailer
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-	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.05.2.ebuild b/kde-apps/konqueror/konqueror-24.05.2.ebuild
index 5926ea7ef2b5..b5878a50a670 100644
--- a/kde-apps/konqueror/konqueror-24.05.2.ebuild
+++ b/kde-apps/konqueror/konqueror-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="activities speech"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
diff --git a/kde-apps/konqueror/konqueror-24.08.0.ebuild b/kde-apps/konqueror/konqueror-24.08.0.ebuild
new file mode 100644
index 000000000000..460454b979f5
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-24.08.0.ebuild
@@ -0,0 +1,86 @@
+# 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,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
+	>=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
+	kde-plasma/kde-cli-tools:*
+"
+
+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 bf35316d7b89..2094d87b639f 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,2 +1,3 @@
 DIST konquest-23.08.5.tar.xz 876844 BLAKE2B fd7c1be53ed1cf42eea5d7ec2ef6ced1f6994905d6b882f89f17a5767e7a7cb6d29e1b541c035cbc65b32175600e9b7cb48b90165e95d7fef12e0d89482514cc SHA512 2663c80d1f42bed06cddc5c1c52d0fc8aaffa3c7a927c06364c561b964253a1bd528bf679d547879dbc63b7ed34745db73ded78e88e1076f48cf7eb88762d9dc
 DIST konquest-24.05.2.tar.xz 855252 BLAKE2B 5890d96f36ce4861c364dd31aacd018d537b082d047bcd9df55b89780dd1688f12ffacbf9efa97cf216fe6754261c7adfc25f4b8612eac450d2a44a19c67226b SHA512 a06b5ce656a7a021f46c1e8270ad6c99423756023217fcd32d39716dcbb984340eeb49ca773929c0451b571f65da372209d8ec36273380c36441d21f6c10b184
+DIST konquest-24.08.0.tar.xz 857588 BLAKE2B e02809e6d633b638b4cebf4cdfe91cee91a397897ad47ec44c9399b9741226d0829b49cdf153befc8d6e7bcc02308468e6e45574f46ff4184f7b9df00510cf1e SHA512 0b9522687d6227f9764ab2020f8abfadad14c137544659630e95efd2506e9f277d0ffa318bb03074952ef26545f4c02836fe335f14858b640023be80383866cd
diff --git a/kde-apps/konquest/konquest-24.05.2.ebuild b/kde-apps/konquest/konquest-24.05.2.ebuild
index 1b6c02dc4ea7..911fdb4670a7 100644
--- a/kde-apps/konquest/konquest-24.05.2.ebuild
+++ b/kde-apps/konquest/konquest-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konquest/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konquest/konquest-24.08.0.ebuild b/kde-apps/konquest/konquest-24.08.0.ebuild
new file mode 100644
index 000000000000..09ea67a6f980
--- /dev/null
+++ b/kde-apps/konquest/konquest-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/konsole/Manifest b/kde-apps/konsole/Manifest
index dee43c7ad00c..0667ca0d37ad 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,2 +1,3 @@
 DIST konsole-23.08.5.tar.xz 1839952 BLAKE2B 6e8c373a346903b741b3a16953b80590fe87f286613783dc99e96d815920240ce53a4774b27c920d842d8b189fe53d7bb7da95995c058102853ee9dc151d45d8 SHA512 dd227f0446b623839f984cfa2f00b94e16c929f35b4714e791a11baf90907ac87ed469f50980a07e6528fbcc1654192d2504676b73d7856b6389077a4ef01f88
 DIST konsole-24.05.2.tar.xz 1770568 BLAKE2B feda024d6ee3c4ac0f2e84c9a4825829c63167cfbc86b6506dd0fefcc6ea28075a5b5685d474dfb746daee0cefeac6adef7227808f0da9a3d47bb941d82b2e2c SHA512 47b2fdfc4b79b1e8cef72aed9d77858347c0c89e7b0cd4106a2f0d362ea72a2d54b79385deb8525654a5b0da0fb19c8e1db370618a6f0ae2d8e1aab41e7261f3
+DIST konsole-24.08.0.tar.xz 1778236 BLAKE2B 2f67661f63951c186e5625d6d792eb7613223ae9d78c14300db345369b5cae86be45807ca64c5eab295e5853c4032a838d16ed8bfd596f7506cf747b9eb4f32f SHA512 470481e539c7838eb10c84e7df2cd44f77b6aa1738b475d96f2baeeae536d92f67ee1b81a6176f1b31efa4d1300fdde02c4de28ec1564f0b858427969d4f178f
diff --git a/kde-apps/konsole/konsole-24.05.2-r1.ebuild b/kde-apps/konsole/konsole-24.05.2-r1.ebuild
index 455b38cbd61b..1927bcb161a1 100644
--- a/kde-apps/konsole/konsole-24.05.2-r1.ebuild
+++ b/kde-apps/konsole/konsole-24.05.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-24.08.0.ebuild b/kde-apps/konsole/konsole-24.08.0.ebuild
new file mode 100644
index 000000000000..da8629fa24ec
--- /dev/null
+++ b/kde-apps/konsole/konsole-24.08.0.ebuild
@@ -0,0 +1,65 @@
+# 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/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 75b8bc816bc1..1da3f0ede2c0 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-calendar-tools-23.08.5.tar.xz 255924 BLAKE2B 9270cc942f35b06bcc7f16d28f6c426a35683cf344d1837a5e51542cbd6502256f7ba58f3768b16356e445982e287fada396fd36dba6e9d45fb822fb2947d5a5 SHA512 9dccd51cf1004d639c0f02fc7e5ebed71093ca375a2895a301723762a073644b565930f9ee4cf663195db87370497b976ecf216dcf8c1d67bd00481f9e7a2082
 DIST akonadi-calendar-tools-24.05.2.tar.xz 264420 BLAKE2B a1c50f709ef1faec77b7b7e10e822d794aaff7de41f2c941e87f2cfd760da9be1c7d7048dc6aa305e356016baff55afdd63547962cdad5dfac503a60ec852311 SHA512 1bc632cd7787d5d45f4a0b350e20dd4e36b0a659954c3098ea050cf827ab814f67cf0441e2e4818d225b22fcd2b7c3e51eb08fee823f4333d107d4366e4caed3
+DIST akonadi-calendar-tools-24.08.0.tar.xz 264900 BLAKE2B 6d8c6dd6ce2a1e92cf36405f81d90e676a31ae01db4ab86047ccba1418098c597021fdf698b46eca514de81dca61b768adf9b255f07b4194b58829bb68bd553e SHA512 a29abacbd77396ed2a9c7fa9e6104e28d6b2c47186e05c91ed8f32abc5451438b74c28ecbea157dcc686853a797b2fffc524857996613d4579d73f5c60070436
diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.05.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.05.2.ebuild
index b9619e21ded8..88208e394525 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-24.05.2.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild
new file mode 100644
index 000000000000..32e049d9d4ca
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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.5.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 e1003ff4a59d..c7d9a7745a55 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,2 +1,3 @@
 DIST kontact-23.08.5.tar.xz 876316 BLAKE2B 52b484eef4a5fa91b1f09974d94dfe8d2d5e74dd954f89fd468b02a2aaa7c244f2d5122db77a3d6da001a51134fb28572241112030dab788f2af50d6a1887cb7 SHA512 3965d54a10b52277c1a161b37bff8831f6488e00d76ecdf355df9241d857317c42b6b93756064666c1f54abcbcd6a4e83072a1fb240ae822ffd5e4618bbb0994
 DIST kontact-24.05.2.tar.xz 862904 BLAKE2B 47daf6f3d063289adfabf6b3eb9fc54950c65480979ef4d6cda214a128520d8f23acf2cf9b11cd5ca6a9a3e569b0d6fe6b0806820a4e32f20ff47c2721c4255d SHA512 ccaf0ac634caf6e918258c534b04528848d233f19bca188ed8273f15cbd65ed3f0219c76130ac5ef529b6ae9dec86e343390b0e0ddc94f23875176598517231f
+DIST kontact-24.08.0.tar.xz 862264 BLAKE2B 014a4035700214db490c6b7b74b1db821e2a272d192cca7a0478b5780a23c2dd381ce4481a129e53a1ed235c2e28a3cc8844935d05d4f28d213e70ce7c91d2dd SHA512 9fea8774a15295842f5144bbcd572559dc74958310e255d5776ea5596a03198b7131c53e359aafe5a2713ca55f3684e17a9ebd4f5f5e9c025d285bf50cc52f38
diff --git a/kde-apps/kontact/kontact-24.05.2.ebuild b/kde-apps/kontact/kontact-24.05.2.ebuild
index 0c47cee7d924..754251f03df2 100644
--- a/kde-apps/kontact/kontact-24.05.2.ebuild
+++ b/kde-apps/kontact/kontact-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-24.08.0.ebuild b/kde-apps/kontact/kontact-24.08.0.ebuild
new file mode 100644
index 000000000000..c8bb6de7b973
--- /dev/null
+++ b/kde-apps/kontact/kontact-24.08.0.ebuild
@@ -0,0 +1,44 @@
+# 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="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 e0492c6677dc..a566ebd10514 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,2 +1,3 @@
 DIST kontactinterface-23.08.5.tar.xz 40116 BLAKE2B 604e56786080e0815dedc7df0029414af38f78c3c4b7cfc006dd5cdf78f3f1e211a8c17e4a0b7e9f8edda1a15c5d97779e4a9a873588b6ddde968bebb0282456 SHA512 77f9e4a03ee698ec31925b3080ed792b0ce7cbfe230bceb59c64b2a17dcc13935871ead0cf229624c682744d0ec4c189ac596ecc6716a89ad2b3b6caaf73271c
 DIST kontactinterface-24.05.2.tar.xz 40368 BLAKE2B 2f4bc7b1769aabfbf8d85fcea8732c14d6d598089dc9a04246f402c7bdfca61ee721cd889eab2da6fb9855fccef4e32ac18c8491ea55ab9c66f3d52b3af1631a SHA512 7e46990774143977e3d6fedebd5bd89c7e07d3c3cd8e4801643645aa0667bde3f38ae8cf452df229f094579e16db8b91b72bd29d24c02c7664a750e346173268
+DIST kontactinterface-24.08.0.tar.xz 40696 BLAKE2B e1aa2ffab4664772f98a4c42fea0dd1ad0117e4ef9302941896a26fc74bfa37081334b61e5bb863929cc967ab1f2b957712b2e71b7183e15916e6e3cfe52398a SHA512 5479bb4d21d68dfa72a7e65abf6c41d205df2cd0b11b3ccd74e51bda9ec07cebb7e7f870a340d225468f16ebf35972dbcf47549a603a910b491e3b45b0947889
diff --git a/kde-apps/kontactinterface/kontactinterface-24.05.2.ebuild b/kde-apps/kontactinterface/kontactinterface-24.05.2.ebuild
index 78f932a7f4b7..a22626c75292 100644
--- a/kde-apps/kontactinterface/kontactinterface-24.05.2.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/kontactinterface/kontactinterface-24.08.0.ebuild b/kde-apps/kontactinterface/kontactinterface-24.08.0.ebuild
new file mode 100644
index 000000000000..8d1805e5f853
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-24.08.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+KFMIN=6.5.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,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 79d85b099f38..7a5c212da866 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,2 +1,3 @@
 DIST korganizer-23.08.5.tar.xz 2566660 BLAKE2B 500c282213bd00391f13e8b05d0bb000565c978a4a6312b8ae22b97b45a361a5c4db6ef8abdcfaeb8604ae44ac0140ca396c48b524948d89676ab392825bb2ea SHA512 fc18799233224ae8cfe468f31593f8e6fd322e397b01f1939f046f1cc0ccda635d2caf71148bd3e093c863f05d0feb1eb3b6513b024c291623f82d4dccd1fd0f
 DIST korganizer-24.05.2.tar.xz 2568408 BLAKE2B c141d73a67173d6e191d67ed1d923323ce3771dff70abe87f44c19cac0fa21f3e3958b641c4c82032cc3a3321d0dc6da96a2c612c31dc36747a2b46ebc9dd008 SHA512 f3b3d6d96cf0769ff495634a78739f26cb9c7ae1a7e86d5132090f84848480a91e614322d97883badbab3804fc56511b298e429d09495cadd11b54be0b87c32b
+DIST korganizer-24.08.0.tar.xz 2911324 BLAKE2B ee0e5b7aa4963865b61a9b5e9be4e2b1842b00dcc6fd2b14e99acee9ae5593f68c17230763ce1d4bcee2c552b5ff0a7efbe66ec1af7b3eb1db931d5335300994 SHA512 ab99e0b8223e16e4815c0ae6382388452a51c729b97550d046ad43163ece2c3925921c89f3e97b6b0e43513961ad415a115344b548d8f18d25bc61584c15d9f8
diff --git a/kde-apps/korganizer/korganizer-24.05.2.ebuild b/kde-apps/korganizer/korganizer-24.05.2.ebuild
index cab2df99eb6a..d6bf7ed74409 100644
--- a/kde-apps/korganizer/korganizer-24.05.2.ebuild
+++ b/kde-apps/korganizer/korganizer-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/korganizer/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="telemetry"
 
 # testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
diff --git a/kde-apps/korganizer/korganizer-24.08.0.ebuild b/kde-apps/korganizer/korganizer-24.08.0.ebuild
new file mode 100644
index 000000000000..4655f273d6e6
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-24.08.0.ebuild
@@ -0,0 +1,79 @@
+# 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="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="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/akonadi-notes-${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
+	>=kde-frameworks/kcalendarcore-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${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/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
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kldap-${PVCUT}:6
+	test? ( >=kde-apps/akonadi-${PVCUT}:6[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=(
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 86e884610a29..5f77edb43629 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,2 +1,3 @@
 DIST kpat-23.08.5.tar.xz 3755860 BLAKE2B e6a88119b88489b9bbe40b71ce97c8339f61f9a7731e02c0750352a126297cab0149d94dae4b74ea2ea2519510ec241fa7e238b840dc78db21db54c6628f7075 SHA512 fa4a05dc13ff9ae41d30a5fd85ee93c7a23602b591ae3e343adfd147d782b7db58690efe2216d999ff73e7a640d4cbaaf8a66da122508c9f39f4f884776d6b4a
 DIST kpat-24.05.2.tar.xz 3715548 BLAKE2B 64c1f650192ab0680707de3ee3d7489b02713f83980a278d6a56d40b37dccca022dc7573864c3f7465adc1c42727e2753be2d74a8ecf20335e6222b70f6a7c38 SHA512 b72fdf7cd1c4b70eedebcc772ea2373ad7d4084572f3788c40db196eab38bfe27b43206db7006c4170d6eb41eed4aa7bc95a93104c17bbd5196c8fbb4b6387ef
+DIST kpat-24.08.0.tar.xz 3724000 BLAKE2B fa8b863ff9610652c0d70f7b6ca98d374ff0942a8de376928b33a5e37845b153bd7a32e90fd515e413d6b55467635564f1e877e924d98242323931ef724e6fa2 SHA512 003dced46b3dde0eacd1163bec625a2e354d080ba0d9d2dcb3f0aaae2cfc1b79637238050fe13025dbf7d1762582e9cf3f61902b6b8f844dda5bf88e3afd6b81
diff --git a/kde-apps/kpat/kpat-24.05.2.ebuild b/kde-apps/kpat/kpat-24.05.2.ebuild
index cfde6455bb68..ae41aed4d66e 100644
--- a/kde-apps/kpat/kpat-24.05.2.ebuild
+++ b/kde-apps/kpat/kpat-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kpat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpat/kpat-24.08.0.ebuild b/kde-apps/kpat/kpat-24.08.0.ebuild
new file mode 100644
index 000000000000..a909eca128b6
--- /dev/null
+++ b/kde-apps/kpat/kpat-24.08.0.ebuild
@@ -0,0 +1,50 @@
+# 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/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index e9f83af76d12..d315026e8866 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,2 +1,3 @@
 DIST kpimtextedit-23.08.5.tar.xz 303128 BLAKE2B bc0e986bad2ade3cf62982b15a7919e9e3ebb6c3bbd7702bdfee725ac3fe0d655225c9bfee947ad78b85fc152594ff555fccde95cd7ba94da1b42f286703c7b2 SHA512 9e5dfdeb0abb8b3546e99e7311f5ba21b94b1a19a6af50c6eb12a5f8799f6c2f8bf164042ee36ad75506f82aa996314b18d3990e5f66421a7a59b9da3a941bf3
 DIST kpimtextedit-24.05.2.tar.xz 171632 BLAKE2B 6994b4e0ad312dbd2cf9b99b6dc9c0cb282afd1bd74dbf665a172d21ae60fa80dd38f2030ff4474f98e4cd50ad1fa07491619ed20c0c084bac062e3f748291ec SHA512 bf03a9d5728155d2cf273610ffa80dc498636897694b7717da72cfa814e0f4ea558ec170fc509b06e2005c312c7e2e320f40370d4020c1b54a752ea93b309360
+DIST kpimtextedit-24.08.0.tar.xz 176168 BLAKE2B 34fa0b25a832af292a7509269c23ef3b0ff7b8ea332c4df06eebd28e2d87c3d324204e912159db32b911d1293c5b623765e03d1e25b01e957b5dcc2ba2465a98 SHA512 7051d96b06806bf545ee7db8e59c004ef27f8d3da4503fb20cf250da748c25f7dceaebf39e54e1be05273c103cfe7db323ef1010da0a5c77e6da898e9d6229bf
diff --git a/kde-apps/kpimtextedit/kpimtextedit-24.05.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-24.05.2.ebuild
index 953c420ce9ea..2aa678edd34f 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-24.05.2.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="speech"
 
 RESTRICT="test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-24.08.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-24.08.0.ebuild
new file mode 100644
index 000000000000..02e9c5c5686b
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-24.08.0.ebuild
@@ -0,0 +1,42 @@
+# 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.5.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 b33fb3a17435..0e66eb22ba48 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,2 +1,3 @@
 DIST kpkpass-23.08.5.tar.xz 29416 BLAKE2B 03816824eda2993fd4fc3f92fc4cb1c03469f0e832d2b9dca470686e8e9d9ab8750f01cf095a147a59dc50bd7e3455183be32a1324a874da56105321dc3c578d SHA512 5855b6e8dc03590fe61861c3bda42cbd1df4eff9a7f4c4218d4a3d9d2a0cb5146750b9f839354e2a852bfa6fe6b6b1c08db94fe90f58654c3364797f42a573d6
 DIST kpkpass-24.05.2.tar.xz 29096 BLAKE2B 05d3b5853da4b3ef8950b1690dab63e6fbde8dad53ca9d9a0c65c9483ddfe113c690a1b30e05720d4c2ccd7ef277576c76aa5e6136a94a4a5c905e80ec28b28a SHA512 ae3478f67db89287d0ece384323acc06d700d3abd76238d2e569938183159ffa66c8fe04eb252d5c5de245b010ca338364f38b111cd457148f5c12be9af5265f
+DIST kpkpass-24.08.0.tar.xz 29428 BLAKE2B 6f0dedc5934fc1279b4738da32f03dd4f33d80077d8456de2fdab2806b07dcedc6a6ed566c1ae6f0405e732e6aca2e074f8e382cc0671a9da97506abc3dca2ac SHA512 857acc75f6406eb5cf04d4bceea7e1a38cd2cc59f57764e7de27ee627a47918140a5a7515815ee5c0514138740d376819b4a6e51dec36c329de9d543d8e2e657
diff --git a/kde-apps/kpkpass/kpkpass-24.05.2.ebuild b/kde-apps/kpkpass/kpkpass-24.05.2.ebuild
index 35137c8a3141..aaae45daef82 100644
--- a/kde-apps/kpkpass/kpkpass-24.05.2.ebuild
+++ b/kde-apps/kpkpass/kpkpass-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpkpass/kpkpass-24.08.0.ebuild b/kde-apps/kpkpass/kpkpass-24.08.0.ebuild
new file mode 100644
index 000000000000..d1dff5e03d89
--- /dev/null
+++ b/kde-apps/kpkpass/kpkpass-24.08.0.ebuild
@@ -0,0 +1,24 @@
+# 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.5.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 4d4191cb9262..0ead718a59ee 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1 +1,2 @@
 DIST kqtquickcharts-24.05.2.tar.xz 30868 BLAKE2B daa1cf1110a1dc5ffce6aff5caa08c01d26efbc432be1b1fdf7366ae581d446b50270dde144d40ac0333f910434e9af3eee1c7169be3f3dcd997f8dae14cb383 SHA512 063d6a6a5d6a3e3ed4a672b0523e6ee4594647dd1d297837b9db8f82e23ad18885e0ffcb24adeff2b17983b6dff063009fae5745840c51bf3284112837fee075
+DIST kqtquickcharts-24.08.0.tar.xz 30864 BLAKE2B fef4e238816a22721172757439dbdb65e7ba80b647987814796f902e8458d666370f797504d8804d9b4e8083f40c2253988248d89085613bd9d9f9d432a5efc3 SHA512 4b1232559f12a2c283848b7c0855bad3a53692140ffa4136e087d85ea69cd4975f5a7efd3b479f6f58edbeb874dfb2bb522f2bb3a60fa34b3e04155eb174e7c1
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-24.08.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-24.08.0.ebuild
new file mode 100644
index 000000000000..48d9e3c001bd
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-24.08.0.ebuild
@@ -0,0 +1,20 @@
+# 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/krdc/Manifest b/kde-apps/krdc/Manifest
index cd1dcfc46316..44aef0439793 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,2 +1,2 @@
-DIST krdc-23.08.5.tar.xz 1630604 BLAKE2B d1a9efdebf66babf8758c8862cef87ea7c14a43f4ea38eee89f6669b5f61d5e7d2d8cd94570c0e9f875ed2d61c9a2e4cec53371ae158dfd3e56da564b54a4509 SHA512 b1d50e0d9e4a8c7133e2378d90a1c011f40f2209c014f9b1ea9143ba5a3dfd597b0ebe576da245bb4a2758f9ead6a1014455eee287597272232f19b471c1d60c
 DIST krdc-24.05.2.tar.xz 1545296 BLAKE2B c9da457d47e39a8e4ea659cce480bb4775529954930d4b43c3782987878510d8ec2979f0b0400ec0f7162fa435367ab39ee7a5f9c4876e97fb2d787634637796 SHA512 b071e27761d075eacb920e9ca69fb60d04357b165d0f7a0c580f94a213701c58aab03ca3041e4b4f7aea47be0d05fabec3565dff5679b23fc8ee2e027f9ead08
+DIST krdc-24.08.0.tar.xz 1552116 BLAKE2B 8697a3f315704aaa32ba6c14871c5d9c7693d871fc8a62964c4e927d5770596616aabae9d0b53e1d62197ef073141dc5260f3b3c891445ce8ad7cd202c314382 SHA512 f83d156db120ae2a6b1acf296aee139b00a861ad7bf26a0b26cd219945bb62775542f82dc11899265a14e1ccba1746cac86f85bdcdd0c46c0309669419bf7032
diff --git a/kde-apps/krdc/krdc-23.08.5-r3.ebuild b/kde-apps/krdc/krdc-23.08.5-r3.ebuild
deleted file mode 100644
index 004f5aeff407..000000000000
--- a/kde-apps/krdc/krdc-23.08.5-r3.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"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-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/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}: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/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	vnc? (
-		net-libs/libssh:=
-		>=net-libs/libvncserver-0.9
-	)
-"
-RDEPEND="${DEPEND}
-	rdp? ( net-misc/freerdp:*[client] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DWITH_RDP=$(usex rdp)
-		-DWITH_VNC=$(usex vnc)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/krdc/krdc-24.05.2.ebuild b/kde-apps/krdc/krdc-24.05.2.ebuild
index 85f26c34a85a..88da593bcf10 100644
--- a/kde-apps/krdc/krdc-24.05.2.ebuild
+++ b/kde-apps/krdc/krdc-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krdc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities +rdp +vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/krdc/krdc-24.08.0.ebuild b/kde-apps/krdc/krdc-24.08.0.ebuild
new file mode 100644
index 000000000000..7fd8cd0171ad
--- /dev/null
+++ b/kde-apps/krdc/krdc-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# 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/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/knotifications-${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}"
+
+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 436f4d34da1a..4e3a12d067a5 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,2 +1,3 @@
 DIST kreversi-23.08.5.tar.xz 1079904 BLAKE2B d9fbf9370a43ff182491add0513e8b0dd957ae53fea6daedea0a87a8a2f18051c2ff54b9a1aed9b796e7b3e6453f390f6b820307ff8a38a2f4eaa529897aff5c SHA512 4ab7df2a43ff85570b00855f89994a9413f0de2f941b8ca94e54e8f68588575269d669509d3ca56be3b4dd8ee184cc44927f05c504aa32211d345607b7df5708
 DIST kreversi-24.05.2.tar.xz 1028692 BLAKE2B 56f9dacf7ef6a86781336308b4adf518507aaf752d98457f872072477a2d05bbb4a26a307d2625fcd60199084d04393e6e87914d06b4ab7f6fa1b01c23feff18 SHA512 e4d08eb15a10726d24928aa579b21faf85296d90a45c90cb695acefd1e9cf62f3fe11888b3ee14040230b5ebf37970d0c881dc6b2360f5a2f6d82909e741e70f
+DIST kreversi-24.08.0.tar.xz 1029392 BLAKE2B 1c814417e7032956017bd6d92bc25874d4822aab240d7dc5749d2bc1754e116fb71c24b08c0bf1ebe05f09694634fd58dafad5793314d22b9b21ee3a7d485ef6 SHA512 855511d05e1984fd7fb236e105ff2d1c2b6f3b2538b8394dd9b5a711fc5d06444a62f2c1dc52f9c5387dedbb8c1ab62ed70e41037f23eb9f2fafec0f4d47deb3
diff --git a/kde-apps/kreversi/kreversi-24.05.2.ebuild b/kde-apps/kreversi/kreversi-24.05.2.ebuild
index 57bdc0bed041..8b860abb762e 100644
--- a/kde-apps/kreversi/kreversi-24.05.2.ebuild
+++ b/kde-apps/kreversi/kreversi-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kreversi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kreversi/kreversi-24.08.0.ebuild b/kde-apps/kreversi/kreversi-24.08.0.ebuild
new file mode 100644
index 000000000000..c4b8c9fe5f0f
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-24.08.0.ebuild
@@ -0,0 +1,41 @@
+# 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/krfb/Manifest b/kde-apps/krfb/Manifest
index 944ff5adfccb..0ad46cf5ebe0 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,2 +1,2 @@
-DIST krfb-23.08.5.tar.xz 1322780 BLAKE2B 539bdcce235065604d0e3dc1a976f5298088d29a4294a84cf1481f89d5cce4747186a567b46fc65f551fdfe1dfebe45e50f796d50ef157c1a84f03e5a496834d SHA512 979c47759c347cb385dcad975faa6f7e4cada6ad6dcf1766bef1c294d1980f87453f6f74ae05b2bea2d5c0f6ef51187512087c22dd8ca1684f289d5c78ef300f
 DIST krfb-24.05.2.tar.xz 1198916 BLAKE2B fa0ed4c6dafca09e9edfba81b8ec38da37a9bed86379f47ca73bc85056ecf640cb8d99e148e743600b08b211750de18ca8cf09b4bc84c7a28abf5697808d670b SHA512 0c61e923328a4a64197bf0c040d63f3bead9df42f25ac43f2cf2bfcb0cfac4bfe2610d797173eae62c75ba04a3f54ef461726e5d3c48d0a2d9638a64bc8a7dfc
+DIST krfb-24.08.0.tar.xz 1200320 BLAKE2B b42415296a4194758c80fa6147a7780849ff7f42dd00a99f9ed479ba0b88f5e652cca4ef53f5e47d4e5eb92767500c09af8a38d02fc4919af5506752a2c6a61d SHA512 bc66bebbdf1ddb6c2b9155da224c5171f746e9880bd067a82fd5f570649f8346a16d2003320724ed91331ab3a35617e7a9323ae45fa59e0555b41884dd0e4113
diff --git a/kde-apps/krfb/krfb-23.08.5.ebuild b/kde-apps/krfb/krfb-23.08.5.ebuild
deleted file mode 100644
index 80db1a55db25..000000000000
--- a/kde-apps/krfb/krfb-23.08.5.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_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}: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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=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/qtgui-${QTMIN}:5[libinput]
-			>=dev-qt/qtgui-${QTMIN}:5[X]
-		)
-		>=dev-qt/qtwayland-${QTMIN}:5
-		kde-plasma/kpipewire:5
-		>=kde-plasma/kwayland-${KFMIN}:5
-	)
-"
-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/qtwaylandscanner-${QTMIN}:5 )"
-
-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.05.2.ebuild b/kde-apps/krfb/krfb-24.05.2.ebuild
index 04c936fc9d90..0718699db483 100644
--- a/kde-apps/krfb/krfb-24.05.2.ebuild
+++ b/kde-apps/krfb/krfb-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krfb/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="wayland"
 
 # slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/krfb/krfb-24.08.0.ebuild b/kde-apps/krfb/krfb-24.08.0.ebuild
new file mode 100644
index 000000000000..8ad8935e7bca
--- /dev/null
+++ b/kde-apps/krfb/krfb-24.08.0.ebuild
@@ -0,0 +1,62 @@
+# 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]
+	>=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/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 db35cdf3f564..30729adc30eb 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,2 +1,2 @@
-DIST kruler-23.08.5.tar.xz 288536 BLAKE2B 5204bdcffe7a122e7fe7097ab12e5e5337cb2711b5ef0bf9943a6ed26a704e25552d16a5b1c86a945328a3ba9f0655bb3e9e77f7f7b4660642bce65735bd5744 SHA512 e48dd790c6bb1d8ed17cf9c8ac26e3d1faf90af2610848db4d4b4645b047d14b0a7861853adf3999286fd0c7332059e4e8c6b38807eb5224dff12c14ba7d2591
 DIST kruler-24.05.2.tar.xz 284268 BLAKE2B 301130417a4edbd80d1b17f9f5125cbbccaac392a209029a55e8d540d5a0f71a870c8b515b7bb0ddf23943ccba3fee2c88e440562ced179e223614544a0aebab SHA512 4ef2917c959a18af1dd90d3d0d639c60401799cd640b157082849790e3afb8f189701d593c495f3236c66f200ecae72190a25b6d19f1553013505a1f17c61d98
+DIST kruler-24.08.0.tar.xz 284336 BLAKE2B 87d3b58f3d5c21d2fc252d95dadf5deb7c5b5136058b3e854147aa1fd1ace56c0bd4d593d4687b27c1f6bccb6dc79156f018777b3f0fd99effe485c9e60b6589 SHA512 6f81e41da610e6f448bfe99379f79c2e63e7860469f0edce29350e9a0e0e5751df459b6ff7957a352932f0beb75e618bc7abe6444d31c3dcb76370d113db66e5
diff --git a/kde-apps/kruler/kruler-23.08.5.ebuild b/kde-apps/kruler/kruler-23.08.5.ebuild
deleted file mode 100644
index 766f070bcadf..000000000000
--- a/kde-apps/kruler/kruler-23.08.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://apps.kde.org/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITHOUT_X11=$(usex !X)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kruler/kruler-24.05.2.ebuild b/kde-apps/kruler/kruler-24.05.2.ebuild
index 8fd2e293ff68..b196f66cedca 100644
--- a/kde-apps/kruler/kruler-24.05.2.ebuild
+++ b/kde-apps/kruler/kruler-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/kruler/kruler-24.08.0.ebuild b/kde-apps/kruler/kruler-24.08.0.ebuild
new file mode 100644
index 000000000000..f68a5d396247
--- /dev/null
+++ b/kde-apps/kruler/kruler-24.08.0.ebuild
@@ -0,0 +1,44 @@
+# 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/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[gui]
+		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 408db0684e3b..a50b61f2ec67 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,2 +1,3 @@
 DIST kshisen-23.08.5.tar.xz 1010444 BLAKE2B 9942f9b2b20f0ce62b96d24c136f4ff4c58b4df24f95166d513364dceeaee95275b55c2d964ed4ff0f052b44712effc4463376b43865819a6fb61a026a10522d SHA512 b51758c1f947314f60b74db5c481ef5fc15eb156c0968ddf4cb565677da4e71927b624ad57724acb3c8d14e06173a40bacb699357cc870d7bf012c4887f8b8ca
 DIST kshisen-24.05.2.tar.xz 967792 BLAKE2B ebf885c05d07637d9609cc0b5e8dedb78f0a0c0c2af6e9b025cb3839b3d4365ef6548324cf218e0f05871c7e89cfb4f5d3e861b9a45691492c30d957527c3258 SHA512 06d89a8ecd9973b0f2d2000f68f18b71afc9a96c299d6e7fa569fb93a229e23970d6e986db23f20cfd51413f39699d5d9a761fbc77b6e2766db802b9eb1d1a38
+DIST kshisen-24.08.0.tar.xz 968040 BLAKE2B be32e2acdfc1745d8f1bf35ce402e7cd7f4ad5c586d476243a03221a9a22c16607d213532756d3845d2115941f6f961ec1febb3902222daf14df02b09bd83870 SHA512 085ef54adfd6eed85ca77e2bfa6c229e0c0c2ded8837bdd314d8c619e3c286cdfbee70e3d46466739b2b6f5c564604e40c27192a5f5c1518815b9c7875aa74e1
diff --git a/kde-apps/kshisen/kshisen-24.05.2.ebuild b/kde-apps/kshisen/kshisen-24.05.2.ebuild
index 5ff77048d7df..151c55f34bcf 100644
--- a/kde-apps/kshisen/kshisen-24.05.2.ebuild
+++ b/kde-apps/kshisen/kshisen-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kshisen/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-24.08.0.ebuild b/kde-apps/kshisen/kshisen-24.08.0.ebuild
new file mode 100644
index 000000000000..e3d694f78882
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 47e3039cdda0..dc9ecc506c78 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,2 +1,3 @@
 DIST ksirk-23.08.5.tar.xz 7082556 BLAKE2B 3bc1c1e2ed7e576faf152ec9133cf6de2c24ada4fbb69acbb844b8e48e08f8f9ad75ab52c2de966ab15990cd57739cce2dcecdb707da821596eedba1d6fb34b5 SHA512 d3b5b96ff821fa50b120088729a0bbf767971f99619f9a66ea89520a94033f97d1b37452ad10ff0af96e19f78bf1aaa827ab62530ad8059b4ed5dfab02827801
 DIST ksirk-24.05.2.tar.xz 7069612 BLAKE2B e60d9806cca7150d4f192126ae45bcb507d6a6a3ec0e9407b4f712ed3653cc5c0d1d0fd5c3fb9c78579e05c3d635c21668dadc597ef15c980206751948fbfe76 SHA512 267b5847c934775388cfb7d6732e7eb7a0e3e6a54623d359a35e76da8ee0fa269abec5c672c926b04858b5a24c48a6611f244555873a74e17217b42bd6b54d30
+DIST ksirk-24.08.0.tar.xz 6701232 BLAKE2B a9887f6cd551ee03e8a5b93653c46507019519eac9a2524b91f50508a9882c9381b0d71d6fea1e04a8ff1cc1ef572e2381c80617cec56693d2003b566b8610e5 SHA512 b21fc63f8502093d7d006cdd53b01b4986d8b9ef57e5ab2184caa122416c1fd637e76176bac905b3715ef752caaf5a3d3fa7c2121bcf05afce6a862e7c4bc984
diff --git a/kde-apps/ksirk/ksirk-24.05.2.ebuild b/kde-apps/ksirk/ksirk-24.05.2.ebuild
index 63d809693805..470607bcf2e7 100644
--- a/kde-apps/ksirk/ksirk-24.05.2.ebuild
+++ b/kde-apps/ksirk/ksirk-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ksirk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/ksirk-24.08.0.ebuild b/kde-apps/ksirk/ksirk-24.08.0.ebuild
new file mode 100644
index 000000000000..012a462f8da7
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index eb4abe99aaff..be732fcb5e76 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,2 +1,3 @@
 DIST ksmtp-23.08.5.tar.xz 50196 BLAKE2B 290b97ee1bb92c904c605dc86e85bb002ac53e07e84fc691b5129e47ef4b083469ae1ea40fa11a5d9bda02f1b6c3384fbe2bf4b08f12129b5254096fcccbec67 SHA512 d5ab89d6f21da1df4ce236c08545eb79fc7720caea0e5c61d457663f6ad62a519fe51fe87614ac4ca8fd5e0d9b90f2d108cc3ca6051009cca3dab324848c9c09
 DIST ksmtp-24.05.2.tar.xz 52768 BLAKE2B 34c26bf70fd7828ec20a3836b2ead5c6da9c5245e51b294c33a1afb76fea2208c13b2ba905e9c52d670901b015b90fe5af77eda941abfeef434ad8641bb3bb04 SHA512 d9769dda6a051bd7d4c419a513341e44f4bcef116bfae9e99151d7c5911aed9b561a71f34d071d2427a173e5287eeed6d0b6bfc29f135715f20731cd968604ba
+DIST ksmtp-24.08.0.tar.xz 53104 BLAKE2B f1d2758c4ce04e7d7bf5d1df8451fc2b21d2ab0c9d3cfd623024bf4f0142ffe7be3e7899bf73de46c3ddfe144cacfbaf76e224995385b592644bc20eaff53b4e SHA512 65f489ca35ba02799a1c118bc4d7b772a1ffbbe7741daed4a1d75e7cc3599b40a5323776693938471bc75e667e3c120e349aeb433e23341f5d72e1fea28645ba
diff --git a/kde-apps/ksmtp/ksmtp-24.05.2.ebuild b/kde-apps/ksmtp/ksmtp-24.05.2.ebuild
index f4df4ed8cf41..26c17497637d 100644
--- a/kde-apps/ksmtp/ksmtp-24.05.2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-24.08.0.ebuild b/kde-apps/ksmtp/ksmtp-24.08.0.ebuild
new file mode 100644
index 000000000000..55d5654293ae
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-24.08.0.ebuild
@@ -0,0 +1,29 @@
+# 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.5.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 891c232e8126..316dd4c8c674 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,2 +1,3 @@
 DIST ksnakeduel-23.08.5.tar.xz 604216 BLAKE2B 6a03faa7573a1cfee26d4796a275ce7f32510a356b38ca05a6eba77450c7dbe164d1c0fd17ccd244a5fe8ba62250cfba1d999c74bc79c144178ee5eab6b8812e SHA512 29e89e323a368aaa4ad9b646716795c38e708a0578f70cf1723b74772784cd88f97d2a3157dd78e51569182f1466c6be3f0bed1a4fb1fce33b353f15130b6c6e
 DIST ksnakeduel-24.05.2.tar.xz 576336 BLAKE2B b9256f25eb484844d39bce31f8593ac7e8d8121344035cf98bebdc9944d21e07af9204362152e5d5e8ab155e432db301b1b969238a401479eb37b04d9d63315a SHA512 40369295991742a381a452372db1dc70c1958ca409cbb85aa9e37345a11dd63b92ab1b0ead168c4bc68720e56d6a33bbb618b53df3944b407298e542b4710604
+DIST ksnakeduel-24.08.0.tar.xz 577636 BLAKE2B ee0f0ac4f06edffab02e1b844f79fe7aab9cdd19026154dc96a7d80fb2ddfcdbf7293935e598bfe324768ee8f69892f438a27b7e3aab9de1f2bc6b07b99de286 SHA512 0c576ceb889f36d7dc11835a64805492123f418e1d42a332c5e93b1368930f5c9d95a4f1d5cff44df4adb4523b74619c8af216e7478cd9c5fc457dfe7c750678
diff --git a/kde-apps/ksnakeduel/ksnakeduel-24.05.2.ebuild b/kde-apps/ksnakeduel/ksnakeduel-24.05.2.ebuild
index 409416df5501..058233576e08 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-24.05.2.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksnakeduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-24.08.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-24.08.0.ebuild
new file mode 100644
index 000000000000..1876c9552ee7
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index afc9c2fd2979..ece308131443 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,2 +1,3 @@
 DIST kspaceduel-23.08.5.tar.xz 662164 BLAKE2B 676573cc242a0830ef5b14b572dd4bd5e45a4137aa637a51d6d66a4da13a28ce4de1d0cbafb51b92cadaa79d7326a04ddca26ba00b5624b45760ad6d733cd5db SHA512 21b17825889b75134812ac6df6b9a431c14d907126868e068654e2b3eb1f0d0fb46c5353ea3db3c03f99fd8905ba663736903ae507b993036298b5152cf1ee68
 DIST kspaceduel-24.05.2.tar.xz 628428 BLAKE2B 2ee7c27b9243bb9bf1f5ce3ca1bb9df4586a964f97374b4b6a78f78a58a4cf615ba939c22cb372a22c40b2f0f16f2b4b4dd30bdc92cf380ee5aa13cea6527e2f SHA512 905645f1c5a1187cd88f783ceb286c8d02fa4431906296366c6aa2de0618c8664f0ecaa15652232dce88e77a61e9b56b472e0d4fdf2d6e89169acea4f7a1a083
+DIST kspaceduel-24.08.0.tar.xz 630320 BLAKE2B a8f88f0d16ad2a0262cd47cf2b42368802425edf7f1561f11cf431b67fd76bebbbf6be9882be88edb8d76320fda48ac4e424a4550eedaa33099681de0ff0bd1f SHA512 e9acf1b889064a8d417375dd4c10b051fd1db9311bfe0c86151e68258da1a4490f6a6a4a5524c8c14180e6817a14743f660169f5bd119d944bfb17147a70551b
diff --git a/kde-apps/kspaceduel/kspaceduel-24.05.2.ebuild b/kde-apps/kspaceduel/kspaceduel-24.05.2.ebuild
index b34d6707855a..3a9af9c1a292 100644
--- a/kde-apps/kspaceduel/kspaceduel-24.05.2.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kspaceduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-24.08.0.ebuild b/kde-apps/kspaceduel/kspaceduel-24.08.0.ebuild
new file mode 100644
index 000000000000..baf8da6ea22d
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/ksquares/Manifest b/kde-apps/ksquares/Manifest
index b9c1f74ce498..0926c1b65170 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,2 +1,3 @@
 DIST ksquares-23.08.5.tar.xz 314572 BLAKE2B 56548b6ff4795538622422c8dddedb150f16a15d6a8560572b0052ed29e2c9498281675dcb040f6adeae22122b5be1e7843ad9159e1625f137b6ffe7c9ab7b9f SHA512 e69846939e21fc068d7dc7b24e07968a016dd16349c6bcf2bf278088e2ebcc43f13c962309971a164bfd4cdf42a08f65dfcb8b420daa2653b44a2828ec9aca11
 DIST ksquares-24.05.2.tar.xz 318300 BLAKE2B 50c17f68b5e47e5ee74ef25029e01bd197ae9c4dd37bc86c6f0b505519d79012ad182063f7c01281d400879179a58566a5fff575abac83b22e1e58ce41e898c2 SHA512 73213af550f74552f0abb222ec249b27a4f973b6efa0a2a6a67671efe01f74002e7a98d7f370a15793206217792389bfb62937e1c8cd269842fc10aeb1295e27
+DIST ksquares-24.08.0.tar.xz 318508 BLAKE2B 52ff2805e12fa2b622c79f9d61279f58af62a2e9c595ad31b2f57616ba523a8f3700490ee073f7e7538d9378f36663c6bbf57ce5d0501b7c2d5f9125a4b9f0d1 SHA512 d2a791e6edf6365fda41ad99b13339b29d72fbaf96a19564c35fee8a01b79f4ddb79c5e026dee98b8c43451bc150da9289bd585b33fb3b25a230cd96fd85c1f9
diff --git a/kde-apps/ksquares/ksquares-24.05.2.ebuild b/kde-apps/ksquares/ksquares-24.05.2.ebuild
index 7f5be5ec60de..83e9ddca2155 100644
--- a/kde-apps/ksquares/ksquares-24.05.2.ebuild
+++ b/kde-apps/ksquares/ksquares-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ksquares/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/ksquares-24.08.0.ebuild b/kde-apps/ksquares/ksquares-24.08.0.ebuild
new file mode 100644
index 000000000000..a5e0443ed1a9
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index a1ac55bae692..6b2d9377653a 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,2 +1,3 @@
 DIST ksudoku-23.08.5.tar.xz 1710076 BLAKE2B 28c09a43ddff90866238aca1240bf8fba834c1cc50e1759d7437645198ab2bd4bd45c3fa4969712d4881205d9f10409a74bd13fb5dc7837b65e2274e14abaa6d SHA512 cce20658b2225316d473f207b747129c284234dea61c4e2706fec3df38a8290aa81e581689199681aa0601727897f5b108f62e255288a8093fc4bac9d5be4581
 DIST ksudoku-24.05.2.tar.xz 1719004 BLAKE2B 8629ad23c77cac033e0d4870d6db4276839aee8aa8b85b2763d4909c4fc3b1929be73aad2a506da78b730a7d7edd7fa60f2731b4ab77e6384862fed87458ea10 SHA512 b791ddea541ed63f287881f1385daf5cdcafb06149429cc13da29e09b2a856e4e584d7093d074419112bb7c16cb81ba4590648dff0a6482bfea9752411419f66
+DIST ksudoku-24.08.0.tar.xz 1721332 BLAKE2B c19290ba586d15e6071ff7b994b05aced31b98b86a6ceba8fda5c7e4552ff955d01151828f9c96471fcb10e4717af216f2aa1d0cc04aad4858dea19993252502 SHA512 46a604631d51a1a42a40653432d522d4b38d64d26841862aa7b36e6370f4089bb115d3664965ca3bc5a2b332d0fe702f1c4f63b44a6cb17103da98b975087f3a
diff --git a/kde-apps/ksudoku/ksudoku-24.05.2.ebuild b/kde-apps/ksudoku/ksudoku-24.05.2.ebuild
index 2b0510e4f387..9afa0a0c7455 100644
--- a/kde-apps/ksudoku/ksudoku-24.05.2.ebuild
+++ b/kde-apps/ksudoku/ksudoku-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ksudoku/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksudoku/ksudoku-24.08.0.ebuild b/kde-apps/ksudoku/ksudoku-24.08.0.ebuild
new file mode 100644
index 000000000000..578aadfa0a97
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-24.08.0.ebuild
@@ -0,0 +1,41 @@
+# 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/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index dac360d90e19..8bcc24b087f1 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,2 +1,2 @@
-DIST ksystemlog-23.08.5.tar.xz 2014948 BLAKE2B 2d08528d7cb37b223c01bc509091b499c129e52cf90d893014f0a8ba564fc792f35131f67cca6465c59dff3f346e8ae5242ad6222850810af0ca532804f5f9e0 SHA512 8decb41ac919b3a7b67cc73f8e68d32c75b935072f14435939c373b84766a863c148572cf0d7e851f075e5ffe4ef8fddc85b70eaabeb29c16e8e3fa95b4ba584
 DIST ksystemlog-24.05.2.tar.xz 1855192 BLAKE2B c8f46be9043f683005f3d0f4e7b4809ed2d1fdbc1502fbdb480d15dad098a609d1551331d594185939e8feedb05d47b46302b89aa2195c6c4fe5b2b8994eb914 SHA512 e9f0118b52da8ff53b284bc82337ee72e33f851d32c0cf2ea216f1e73c197baaff2fe8d539df0efd5918dfc548425d50433f9cd5bc8dced2b39f6b68384460ba
+DIST ksystemlog-24.08.0.tar.xz 1855264 BLAKE2B 5f6b3dca321ae5ba005dd590429f889fb066bf4c6fabe960cc2a9fad952659c959328720f1be99cee227b3e59d2318848bc59ea405899c4ead9aa07794f5b744 SHA512 5ba24fd7fd3f9b0012451fccc3db676004a737bf0401427e26075fff7c357ddd405d9ce6ce6486af88ec8b31d5a1ef89ce939e6ff98ef38fc673e26023a82882
diff --git a/kde-apps/ksystemlog/ksystemlog-23.08.5.ebuild b/kde-apps/ksystemlog/ksystemlog-23.08.5.ebuild
deleted file mode 100644
index c6ccf243b392..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-23.08.5.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="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://apps.kde.org/ksystemlog/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="audit kdesu systemd"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	audit? ( sys-process/audit )
-	systemd? (
-		>=dev-qt/qtnetwork-${QTMIN}:5
-		sys-apps/systemd:=
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( kde-plasma/kde-cli-tools[kdesu] )
-"
-
-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
-	use systemd || ecm_punt_qt_module Network
-}
-
-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.05.2.ebuild b/kde-apps/ksystemlog/ksystemlog-24.05.2.ebuild
index 8a281fa8d1da..818da37941ff 100644
--- a/kde-apps/ksystemlog/ksystemlog-24.05.2.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ksystemlog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="audit kdesu systemd"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-24.08.0.ebuild b/kde-apps/ksystemlog/ksystemlog-24.08.0.ebuild
new file mode 100644
index 000000000000..f250826c6cee
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-24.08.0.ebuild
@@ -0,0 +1,63 @@
+# 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/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}
+	kdesu? ( kde-plasma/kde-cli-tools:*[kdesu] )
+"
+
+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 d168a4c3173d..af722d43e4ea 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,2 +1,3 @@
 DIST kteatime-23.08.5.tar.xz 315528 BLAKE2B 43268eac5b670d75cab1583793fc8bb00d1ca7ccea46868d8523b431012e922ef97b354042c79315c4bdcce6e7ebb628d1ae1b0c15a9f9290d368db1e63cead5 SHA512 057562c1f731a72b037a7a9fb4b46fede7ab7441ee09fca9be4dc66624cf701a0a603781224e77a9c5f81ac402b57be052983288e932ef8ae46c7b93ec3abe2b
 DIST kteatime-24.05.2.tar.xz 307756 BLAKE2B f91d497fded41ec40234c48dd8356f9c880d6e1dcffab87d75f85c4c7ed930631ddf2d285201d434f3be77684295ccd8fb5db614e37fcdb814d0dd2f5d0f0cde SHA512 9eb50a8ad889e8371e3b81c0ac02d23323b6f5d0a7334a395e7d0dd9aacb0ff7bf9f2b3997b55448cfb5bb3082f201d0d4b256eeb90d5c9c9ff0586c3f4fdfd2
+DIST kteatime-24.08.0.tar.xz 307720 BLAKE2B 188b152bd053eacaaa8bf5e4407ab30007d205df87ae3899148662f85045a01001e28c59824c036aa033e4774e74b7c8e168c4b561db4a82df3a4bd7c85b5c2c SHA512 197dc28d8f94f5dad7adbd546b62f4847252e8e58a79046022bf0fbf1bfc55174784d99711d3f039c1e55c664616f92b3de2e7cca2ed587e7968dfe37799af3d
diff --git a/kde-apps/kteatime/kteatime-24.05.2.ebuild b/kde-apps/kteatime/kteatime-24.05.2.ebuild
index 9c09153843e2..c48972f09a5a 100644
--- a/kde-apps/kteatime/kteatime-24.05.2.ebuild
+++ b/kde-apps/kteatime/kteatime-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kteatime/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kteatime/kteatime-24.08.0.ebuild b/kde-apps/kteatime/kteatime-24.08.0.ebuild
new file mode 100644
index 000000000000..47fd1519bd9d
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 5a54a6128cef..35309c8db452 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,2 +1,3 @@
 DIST ktimer-23.08.5.tar.xz 406472 BLAKE2B 3e2fdb11e151ed5b178b21b8cb95f605fb9a3d7cb386659b015f48157143a457eef1b8555b8c64004cae3bb1570bbfd87cc03953ebb759befb9277219c98d2bc SHA512 b9d8cae50265031b3ea9d2aa56e24cb6b0fc426a44f773b43b68a034834390d7938177337a45763d2ebef3e6a9c0f8ca3fc0f2c41b88d918665052f44ae8321a
 DIST ktimer-24.05.2.tar.xz 451508 BLAKE2B 696bfbae5f37af2a1a64f716c7b67dd5261fdd58688f30134c3dba21605bb48a60d0b88b54bb17f4d9eaca538eb5bf0072be2fc58dbb6c422a0cf071ffbaa0a1 SHA512 8a2175282a289d753ad4982715fe98cc7adca8b06070f823a077d0ec45d1eb0351a799f19bb4f7fc6be629708c140536d17970ab2f15fc5e9b13a34ce4897cf1
+DIST ktimer-24.08.0.tar.xz 451660 BLAKE2B 7f3486740806637374c2512b356f228c5c240e069385f7f90536f7dd219c49d953417ae3eaa6b3cc963626ff421b59f3532c4b314bed4efcb7bdc0ad9e9c5fa7 SHA512 893872aa333aebc8765d025f2a7736a9e01d2f94be8efa17de2e6738190f4d3cb327bd7e13c28e5dce70b1c95eb566652b18c19309e0c62d18557a3ec614fb19
diff --git a/kde-apps/ktimer/ktimer-24.05.2.ebuild b/kde-apps/ktimer/ktimer-24.05.2.ebuild
index 000015b640fb..7f6a6ced8174 100644
--- a/kde-apps/ktimer/ktimer-24.05.2.ebuild
+++ b/kde-apps/ktimer/ktimer-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/ktimer/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/ktimer-24.08.0.ebuild b/kde-apps/ktimer/ktimer-24.08.0.ebuild
new file mode 100644
index 000000000000..7db8698b575f
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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/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 c75faadbfc38..55da21c9c62c 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1 +1,2 @@
 DIST ktouch-24.05.2.tar.xz 4783280 BLAKE2B 576236170f7da3392fe71ccbc8a32db85b3b3e02efa5025cffe926da46acc88988c36c5457c045e357ba93f6768a5e53402d9a3afc3fca77980e03cfafaf381f SHA512 81859bd234f27aeecc5fdc4178646fbef291fbc9451f9157d0a0109625b6ed74db50c95b71bc2f8e1c8db54e7fed5118753808ea29694b36989e60d4356028a1
+DIST ktouch-24.08.0.tar.xz 4783780 BLAKE2B 0db0f8c97d9a3fbe57125ce4e065201d7e0b5fdbb77bbc8184af3b5f14c45d1651eee0d1ddde7c02702690cf785f305b1b6b234c390be0597616b55d87b9656b SHA512 7c414cc98f37cdad9cb03f3dde21d94083ff3bcf64c4283d5eb3c241553ef4f2f58e2908fff8f3e1684dc363366c3789fe15d3ca2dbc023d1694b9dca48fa1b6
diff --git a/kde-apps/ktouch/ktouch-24.08.0.ebuild b/kde-apps/ktouch/ktouch-24.08.0.ebuild
new file mode 100644
index 000000000000..f1a7acd6e26a
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-24.08.0.ebuild
@@ -0,0 +1,63 @@
+# 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/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 7c410650955c..eab3ace19041 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,2 +1,3 @@
 DIST ktuberling-23.08.5.tar.xz 71404564 BLAKE2B 756687489447268662ed7ab779ea570509fa41fbeaf7e75702ba7bcef909ad5a31c6be0f241be0de4ce950601bba48e340786e43ff211a719558e36f059251e4 SHA512 2f3578891ab7487bc22d5423ba8924115b8bbd41a43c7d7a9077b3bb297126b3e90017725be923825d67bfee9ed93bcf69cef7c36f57bfc02c85213012dd317c
 DIST ktuberling-24.05.2.tar.xz 71532572 BLAKE2B a93384efd8e98a9b90c2e4fab4f26bccf702da1348603489ed0f6619cf9e7781adbc5dd04b68af7bf3c97ebb71b9fbba06907071dc04370c01c22be3633ac986 SHA512 b50fab410c7bd9e9b0ddbcac09d6690670de8047d3f981c074969e42372fb3bc9824b2591cba91a76c1dcc747e68da534a295e044594a99e02426512dc987804
+DIST ktuberling-24.08.0.tar.xz 71556292 BLAKE2B b8cb92836893d3ea3f01c528ba13ad1b0419d2f355480f6bce6bb8f9f7286816bed21536054f51ea811d89cd9cfb7516477d6077599224202dc4e51992167604 SHA512 79e072ecccf8e913984600a62311cbc51c7261f4e8310e7750561b22e101f12ee08c4b1d6fe1bc369b1afdd6b85417ba94a02a166ff9cae1d15cc111e8491f24
diff --git a/kde-apps/ktuberling/ktuberling-24.05.2.ebuild b/kde-apps/ktuberling/ktuberling-24.05.2.ebuild
index 986b20d5b36f..cd0dd618dbba 100644
--- a/kde-apps/ktuberling/ktuberling-24.05.2.ebuild
+++ b/kde-apps/ktuberling/ktuberling-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ktuberling/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktuberling/ktuberling-24.08.0.ebuild b/kde-apps/ktuberling/ktuberling-24.08.0.ebuild
new file mode 100644
index 000000000000..205baf9fa917
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/kturtle/Manifest b/kde-apps/kturtle/Manifest
index b9cc10cd1508..d605b0151390 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,2 +1,2 @@
-DIST kturtle-23.08.5.tar.xz 2248160 BLAKE2B 3e7965489f23fece4cf3532a4caa267d80f49bf34d28193ee22c4b5e334b4d85af93acf628f2ee986b0dce882a288f38a53865a84c1b0d19b6fcfc9b3207d0fd SHA512 88004190af7103e2ce888f304cd6921bf88be2ddbbe5264885991ed3cb3ab085663b079a70053bf4e6221df701f763dd444449f929d359d3402729ebfe2f80f0
 DIST kturtle-24.05.2.tar.xz 2095048 BLAKE2B c048e8c3d6f245d236f0b640b376c77b1e60cf7af721710b634b4712f77502cda8ace386f66abe187f60f7dff76bed2041c63ccdf9d6976fda6dcd492d16d214 SHA512 1724099925e308fb8c3160b14b44074a2b91c52ad1b5c67d9d43e2ef5c5b77d76a383a982a4200680ee8bd75e98e7badd88cf50910551a58a238d6489f5e6ed2
+DIST kturtle-24.08.0.tar.xz 2095100 BLAKE2B 89b64f02ce8e066b47cd7b16bcd40e4df056880897f0b3003e3a9ef652f6c297f3c8653ef18a83ea8602b0ca0f45f8c7e38999ad9c4108b5c21c60233922634b SHA512 5830ad561b92d026ccf89b646e20842084d120e909391bf698de7c28cd0fefc394afa68bbc447e7fe5ab8a92685cce9b10c2763ed4ee4b298018ba14b7d352ea
diff --git a/kde-apps/kturtle/kturtle-23.08.5.ebuild b/kde-apps/kturtle/kturtle-23.08.5.ebuild
deleted file mode 100644
index 63e252778903..000000000000
--- a/kde-apps/kturtle/kturtle-23.08.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
-
-ECM_HANDBOOK="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
-
-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/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-24.05.2.ebuild b/kde-apps/kturtle/kturtle-24.05.2.ebuild
index 271f7bfe2931..fe4cd9165677 100644
--- a/kde-apps/kturtle/kturtle-24.05.2.ebuild
+++ b/kde-apps/kturtle/kturtle-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-24.08.0.ebuild b/kde-apps/kturtle/kturtle-24.08.0.ebuild
new file mode 100644
index 000000000000..2904dfd256d3
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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/ https://edu.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 c3a6d9c188c4..48f26f5f4081 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,2 +1,3 @@
 DIST kubrick-23.08.5.tar.xz 355416 BLAKE2B e6cdd4f9a3d416cb94b7a59c1f14e430a6e2e61fcd0b7f5c6f2b1d9af2d5d49896dce455c83593008b2722f399e11a44b224f56bc136843b96642b4c5b99f559 SHA512 85462d4a95a1e656ede7714290253620aef13d7be5d555ffe486cc0d8fb8e05f1a22f72575e0604a126b04cddd064438f843092cf117e557e18413eef0026b0f
 DIST kubrick-24.05.2.tar.xz 356348 BLAKE2B b44137a210b16dd9101ecf95e9125e35b312e3f932850e518147ae5b2b91f07a8419f978f2de6a62cee0d001684cdd3463b602f8cc32e097b5e3396813fa900b SHA512 1268ada6c72607fb0fa8524cf2dfc04452cf0d855b759085059549d54d755515898cbc01c90080428c26ed3c948779caaa0c5cb55ef80bc1cab48d29bb37ed3d
+DIST kubrick-24.08.0.tar.xz 365848 BLAKE2B 1ca0639adbfefe7e1998b1cf3e8252d81b546ff5fe8d2ae32f14a92c417bb1645542fade4abfb12b233945f2be0b0926bd4066a067003b3cb39e73ff53fbcd4c SHA512 88bc2783e992dcc995ba40b1f2c32f687c5a9ac00ae2e8b43d87cabcaf87b40b6809517ee60cd732266f3a419a179f6926e7e4578105e3bc4c665069b19b9356
diff --git a/kde-apps/kubrick/kubrick-24.05.2.ebuild b/kde-apps/kubrick/kubrick-24.05.2.ebuild
index aafc18ebd98c..3623de2ce1a2 100644
--- a/kde-apps/kubrick/kubrick-24.05.2.ebuild
+++ b/kde-apps/kubrick/kubrick-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kubrick/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/kubrick-24.08.0.ebuild b/kde-apps/kubrick/kubrick-24.08.0.ebuild
new file mode 100644
index 000000000000..ecb6943e24d0
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index eab697aba3e0..faf4d82eead9 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,2 +1,3 @@
 DIST kwalletmanager-23.08.5.tar.xz 853312 BLAKE2B 1c74755661b3997f7bc7437e205d85d8b9e55cd4abcc89b46fdd8a1dc2cd2c7e661a01631b76bea20c2fe15221c9597d5ed467a529986cfa79b033af50e3d42b SHA512 a4e452d9ac4263f7864baf0dd45465cdb213f3f331d771a8de246e076fdb2e670b3d3ad56484ae3754c5979a62b35ce00edd2ecd5310a211c881ffc681797458
 DIST kwalletmanager-24.05.2.tar.xz 1041128 BLAKE2B 9ee645a14f42b2be7287426b020fada39bafa828ee7a7c44c94e9323d2e26dec31a2b2d8fabc85a94330d8cdd04e901ea61fca4ac6a4380f9078c70a17dcb7bc SHA512 b86191cf4c1000ea2ce9905122652881cc9ac868afc11a7f5de3b48dd8ea6815c4c284d090ee1522f95a717d36470112554f681180778feab274409855924194
+DIST kwalletmanager-24.08.0.tar.xz 1041912 BLAKE2B e60f52ed4c38a56fc4c27d32a5b266b210e92c87522329f7ebe8b0c6aac1ae2f31db4ced54ae7c4ce68345b238714b4b29a40820f8e18af04af8cc9c4b7e3601 SHA512 9a8c413e983965592fedc1de95900f2e8b754dd8e06536c2747cfb092078e59a224eb3e2cd8a7a00a43a9add4cc94baa02327f78686f940531f196844e75c73f
diff --git a/kde-apps/kwalletmanager/kwalletmanager-24.05.2.ebuild b/kde-apps/kwalletmanager/kwalletmanager-24.05.2.ebuild
index cc811168bf30..7499cc41c48d 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-24.05.2.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kwalletmanager5/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-24.08.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-24.08.0.ebuild
new file mode 100644
index 000000000000..b63fd34e0247
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-24.08.0.ebuild
@@ -0,0 +1,40 @@
+# 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/kwave/Manifest b/kde-apps/kwave/Manifest
index 422fe06930a6..21fffb882ee0 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1 +1,2 @@
 DIST kwave-24.05.2.tar.xz 6551248 BLAKE2B 99756a6e6c8262269c6b72d33a1a54902752568b9039644791ddd44b792adf2d58eb3875982a4b2dce3b1bedce1a9969a42d1f144a86bd672930710f53872d43 SHA512 87c4696116e74cccf6cafbd3daf823927dd7bbb07f8fea27c76eca813decf1da9db9c05b0cfef25b1eb45b1f15fce5262438ab526eb46e47d8784bab7af12144
+DIST kwave-24.08.0.tar.xz 6551264 BLAKE2B 9e4fa05ca95778bd5115ed3995a21be58f4bbc5a8bbf03f00295c12e353b5297eb29bb8e539201aed8639457ddb1bb1aa71ea37a3bf914840a8acd71f454b607 SHA512 8200371b5dc03a0d4af78a6c3730c0b59e779898c73c5a955b77d690323ef6605b27d23bd13d3a800119b4d409c0fc4f5eb71f3d5069ee5a29dc0bef4718081f
diff --git a/kde-apps/kwave/kwave-24.08.0.ebuild b/kde-apps/kwave/kwave-24.08.0.ebuild
new file mode 100644
index 000000000000..9b5ea785995a
--- /dev/null
+++ b/kde-apps/kwave/kwave-24.08.0.ebuild
@@ -0,0 +1,87 @@
+# 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="Sound editor built on KDE Frameworks 5 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="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
+
+RDEPEND="
+	>=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/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	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}:5 )
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	pulseaudio? ( media-libs/libpulse )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+BDEPEND="
+	sys-devel/gettext
+	handbook? ( || (
+		gnome-base/librsvg
+		virtual/imagemagick-tools[png,svg]
+	) )
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README 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 ffac86b575df..11723d4fa1d2 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,2 +1,2 @@
-DIST kwordquiz-23.08.5.tar.xz 4073612 BLAKE2B dd38a5ae4f9ec40230764d07c9ba86b841df8f859067215989300dc88a750ed1a0d90504baf3329bbdfe59e712577f294b154d178b349209ce31b832dc329288 SHA512 f87c21c34fe8ef6a8b031324c22ee83a4306fee41dbe835963d1a1cbbe7ab6e808ea66060d128bafcdd613519fd61f327d60116c3a70e6dd5a6af52728495233
 DIST kwordquiz-24.05.2.tar.xz 3771828 BLAKE2B d13de16875370ce484041cb187791aa1a1a6bde384845781297556757855033a45a31bafccdf6e4908d5777a08ca27e05ec2414e25943bdbdc0d529c444fde9b SHA512 471a6c45aedc39b6c408ece138b7c2b6438435a82a00648ff4759ecfc0cfa55968ef2d39471bd1d593bad0941140668c438510d2428ae25371290d146838ca82
+DIST kwordquiz-24.08.0.tar.xz 3771924 BLAKE2B 3adaa7344694c4e25d7a93f4681807e2819ce864a18f182829a6704bab0d4523e7290533eca22cb4416f49b31b2b7005b77bfd258a515380c2ddca0eab2109d3 SHA512 c8b3bfe52b018a4a9ac663833b63c33b77d96be8373e499cba0d267803a18787b6fff10686766f88c83ca7425eb42443ed76b4356b56ad0416e7524c7f384360
diff --git a/kde-apps/kwordquiz/kwordquiz-23.08.5.ebuild b/kde-apps/kwordquiz/kwordquiz-23.08.5.ebuild
deleted file mode 100644
index 0450ded3976e..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-23.08.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/kirigami-addons-0.9.0:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwordquiz/kwordquiz-24.05.2.ebuild b/kde-apps/kwordquiz/kwordquiz-24.05.2.ebuild
index f89387d105b7..23f95ed22bd4 100644
--- a/kde-apps/kwordquiz/kwordquiz-24.05.2.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-24.08.0.ebuild b/kde-apps/kwordquiz/kwordquiz-24.08.0.ebuild
new file mode 100644
index 000000000000..8114e866dd64
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-24.08.0.ebuild
@@ -0,0 +1,35 @@
+# 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/ https://edu.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 ca9b27d0472d..3252d2875f33 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,2 +1,3 @@
 DIST kate-23.08.5.tar.xz 8043480 BLAKE2B 68b27c125a1e7f144ecc1d7b6d3348337b2f14f7fd61307e4ec64b74bb388378314d6575801bbc22c49bf4470133d8f91dede5f9b384a2f2356ec1e111da01f8 SHA512 d3647d7c6af74fdfdf3bf9eb9da906195215800025b43558bd6c9811bd2f457a52555c84997801e0b0badddcd99b0dd6e384bf9ec82790fb14cb20ff026a5a5b
 DIST kate-24.05.2.tar.xz 8149132 BLAKE2B a4708858c065963d5f18d7ca5670f98ca1d991e2a92fbb2de87d16b084ab18e87095cbb25195df6ea65f28041381e8be25481c71e06992b75dfe93ef0641e552 SHA512 f1f9957d32cd149d071e2ed7c86b9c943974f3901d8242476975c9af3d1ae1743a08d966a6962655a5ae32c722d3590461fa939f095d3f9f8196ec08427a441c
+DIST kate-24.08.0.tar.xz 8202144 BLAKE2B ef0d2914241a40cce4f6cebe0d6f04909a6d2bb4a0d2f83211d6d78156a819ed59e899b1d3f83cd6e996a57955cfa32e224a8006af50891e1cdb3b18f33d17bc SHA512 8da049e3cf1c131750b76aeeaa9edf30bad90eb5ec3b96f7cde902916ecc6b9d7e443fa10c4671a8a01fe85ec2357ddaff441a4e0d34ffe0b919dff0996f27ac
diff --git a/kde-apps/kwrite/kwrite-24.05.2.ebuild b/kde-apps/kwrite/kwrite-24.05.2.ebuild
index f511137487d5..b0f0784fd1f0 100644
--- a/kde-apps/kwrite/kwrite-24.05.2.ebuild
+++ b/kde-apps/kwrite/kwrite-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwrite/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kwrite/kwrite-24.08.0.ebuild b/kde-apps/kwrite/kwrite-24.08.0.ebuild
new file mode 100644
index 000000000000..891c37d3bf07
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-24.08.0.ebuild
@@ -0,0 +1,57 @@
+# 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/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 55b656074973..764c4e19f5a4 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,2 +1,3 @@
 DIST libgravatar-23.08.5.tar.xz 36184 BLAKE2B be5aa4ce9e756609a02d030cf73131a37bb9c344ae35295298173fc9daee81a69259f52778f98f74233efa9f0f1b829ef8d705e0f6637ff34df163aef04cb61a SHA512 8500d38410d478be79fe6f689a47249e45cb8ba5a2d25cfb175764ceb573d179c5387ba98f81b1913ec87870eac1d0416ad1e2dfde592b650ab6fda6d0b2270e
 DIST libgravatar-24.05.2.tar.xz 37564 BLAKE2B 9f274e014523079bd22d1e8e3e02a5f801fb701e45ac55178353d6f8521f9c3f6abbf1efa681a4401ced41f58f74268e00b2d0cd156749c9fccf1c57a514f29a SHA512 e27d90496d0c4d0d72f6956f3e227996890a387b329f2c0730f95499fb2b2724a558a8cf3a83eb230b5341d21cc96799ad5362c9cc13eb5d6b51236f630b67a6
+DIST libgravatar-24.08.0.tar.xz 38040 BLAKE2B 14e2e90ab0d30d29330929904af4392580e9adf72990e86ed1c319206385ff567d6c56b050f60cacf823a012d9352182d08a9c368dc41f92131b17fadc6c24ef SHA512 b78671ed0e48d8a386c4535bd0225ca9c104e7f7a2472078c7b649990a3cfb1a463fa36c456fcf070633d8020bb99df901631bbf705ec575b25fe8c66d0a9cc6
diff --git a/kde-apps/libgravatar/libgravatar-24.05.2.ebuild b/kde-apps/libgravatar/libgravatar-24.05.2.ebuild
index eaed7e6c60e0..f6d54e7975bd 100644
--- a/kde-apps/libgravatar/libgravatar-24.05.2.ebuild
+++ b/kde-apps/libgravatar/libgravatar-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for gravatar integration"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libgravatar/libgravatar-24.08.0.ebuild b/kde-apps/libgravatar/libgravatar-24.08.0.ebuild
new file mode 100644
index 000000000000..4321046869be
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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.5.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/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${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
new file mode 100644
index 000000000000..11ae813e812d
--- /dev/null
+++ b/kde-apps/libkcddb-common/Manifest
@@ -0,0 +1,2 @@
+DIST libkcddb-24.05.2.tar.xz 449172 BLAKE2B afd8371d9c05ebfffc173bdfa1ccf64dacc0caec1cae4c20c7ea9aca74795cc0567fc022589ecd8c54740a22e0d632a0ab3e5209258dde0bcb5e6aa10407281e SHA512 f6797a56c0362b0979b329a27a913bf36334587e86b1c50ab5dd5373b1cff0b69577e9ebff22bea93683c9c3c9da68339dc5e57d2926e6865f5b19ef5cfb51cf
+DIST libkcddb-24.08.0.tar.xz 449072 BLAKE2B 70706be680247c4e9e6e140a176e07fdcae2b3fdb4c97307a4fa2c125d7e8b8af03cf9671e421e5ca06f1c6ef77279309a1b09e69da178c66ec29c3a140f1435 SHA512 34f9245d26b6e95e3851d595c6160f9ec2df9cc7497edd7a39b58cfc8c9f7d3a6a69ce22d6c971b638037a04bc9ae3deec06a1d6f4aaf0185b517a9c436769ab
diff --git a/kde-apps/libkcddb-common/libkcddb-common-24.05.2.ebuild b/kde-apps/libkcddb-common/libkcddb-common-24.05.2.ebuild
new file mode 100644
index 000000000000..6e368997508f
--- /dev/null
+++ b/kde-apps/libkcddb-common/libkcddb-common-24.05.2.ebuild
@@ -0,0 +1,24 @@
+# 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.08.0.ebuild b/kde-apps/libkcddb-common/libkcddb-common-24.08.0.ebuild
new file mode 100644
index 000000000000..422b5adcdc5c
--- /dev/null
+++ b/kde-apps/libkcddb-common/libkcddb-common-24.08.0.ebuild
@@ -0,0 +1,24 @@
+# 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/metadata.xml b/kde-apps/libkcddb-common/metadata.xml
new file mode 100644
index 000000000000..b3bfb0b912f6
--- /dev/null
+++ b/kde-apps/libkcddb-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libkcddb</bugs-to>
+		<remote-id type="kde-invent">multimedia/libkcddb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index ca6e49a4a891..f909271a94a1 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,2 +1,3 @@
 DIST libkcddb-23.08.5.tar.xz 451388 BLAKE2B 2c6118d0f9f263d45226005340d66c99b32171459ad2f744b788b3d88f714546b99421251422fae6296b97fbcb3523ee12436974bed67ad9683a26124cd69e53 SHA512 fbc08f6a7d701df179a0b59e6b9d242faefc1801b2cda5f15d821ca5de019ac2ab37464f6cd186cd7be39a0fa5545cf89f074a094f437807e16024459a144d82
 DIST libkcddb-24.05.2.tar.xz 449172 BLAKE2B afd8371d9c05ebfffc173bdfa1ccf64dacc0caec1cae4c20c7ea9aca74795cc0567fc022589ecd8c54740a22e0d632a0ab3e5209258dde0bcb5e6aa10407281e SHA512 f6797a56c0362b0979b329a27a913bf36334587e86b1c50ab5dd5373b1cff0b69577e9ebff22bea93683c9c3c9da68339dc5e57d2926e6865f5b19ef5cfb51cf
+DIST libkcddb-24.08.0.tar.xz 449072 BLAKE2B 70706be680247c4e9e6e140a176e07fdcae2b3fdb4c97307a4fa2c125d7e8b8af03cf9671e421e5ca06f1c6ef77279309a1b09e69da178c66ec29c3a140f1435 SHA512 34f9245d26b6e95e3851d595c6160f9ec2df9cc7497edd7a39b58cfc8c9f7d3a6a69ce22d6c971b638037a04bc9ae3deec06a1d6f4aaf0185b517a9c436769ab
diff --git a/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild b/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..65fe140d80c4
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild
@@ -0,0 +1,57 @@
+# 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=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for CDDB"
+
+LICENSE="GPL-2+"
+SLOT="5"
+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/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkcddb-common-${PV}
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+# 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-23.08.5.ebuild b/kde-apps/libkcddb/libkcddb-23.08.5.ebuild
deleted file mode 100644
index 6838351de6c0..000000000000
--- a/kde-apps/libkcddb/libkcddb-23.08.5.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_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE library for CDDB"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="musicbrainz kf6compat"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}
-	kf6compat? ( kde-apps/libkcddb:6 )
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm "${D}"/usr/share/applications/kcm_cddb.desktop \
-			"${D}"/usr/share/config.kcfg/libkcddb5.kcfg || die
-		if use handbook; then
-			rm -r "${D}"/usr/share/help || die
-		fi
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild b/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..60691461dfbc
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild
@@ -0,0 +1,55 @@
+# 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.3.0
+QTMIN=6.6.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.05.2.ebuild b/kde-apps/libkcddb/libkcddb-24.05.2.ebuild
deleted file mode 100644
index d6756e1ffd4e..000000000000
--- a/kde-apps/libkcddb/libkcddb-24.05.2.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"
-ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE library for CDDB"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.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}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || 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.08.0.ebuild b/kde-apps/libkcddb/libkcddb-24.08.0.ebuild
new file mode 100644
index 000000000000..c3e83eb4fc18
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-24.08.0.ebuild
@@ -0,0 +1,55 @@
+# 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/metadata.xml b/kde-apps/libkcddb/metadata.xml
index 6055880e5555..b3bfb0b912f6 100644
--- a/kde-apps/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
@@ -9,7 +9,4 @@
 		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libkcddb</bugs-to>
 		<remote-id type="kde-invent">multimedia/libkcddb</remote-id>
 	</upstream>
-	<use>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 34d9e3908b53..c809e84cf5ae 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,2 +1,2 @@
-DIST libkcompactdisc-23.08.5.tar.xz 99360 BLAKE2B 087435f61ebe793b15c4b4f73bee6841409ee17467567ba861d85bb1af1b843fe541c2d20347ca2d9e83c1670b9649303d99f06de1771533e649cb15322955cb SHA512 cf6e10c04e6664ed2db16131de34e6c23ddd744887dbd94c7bc64913be9f797fd439731f03151e216c1055b759566521d7be502776b5be327613bf49fca69871
 DIST libkcompactdisc-24.05.2.tar.xz 99740 BLAKE2B 94320b85a1ad3e218eab232427f4d9c3e60c8faf4ffdca847abb43f509a6d9b8e83246f668c52ed3bc2c99bb3c7baa7dee094b5ac187913258f341a7dff1e58b SHA512 cdbe04c4ea0a9851e518651a1d5134d7dc2afc0b38361a54fc119885dddcbda896dedfe357b5df2e8701dda8a3f7f5e77347bbcc02c1268f75fb15f11a20e4dc
+DIST libkcompactdisc-24.08.0.tar.xz 99812 BLAKE2B 367cc5f8e47cee39c87ab231ceefa2a7e002f818292e00554d66b0ba082d0c2ab48a1bb32fa5ab61bee14af088d759b4e103c6b32736d90cbc77d2b08b4dd4b5 SHA512 7e52b373fb402662d8c856a972b2862e3e8474a29c3e1e0d27cef5b633aea01906357c178f5b4c801ff71c7e69c88da9a49c89128382d0f5881c4e7ae3cabe91
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5.ebuild
deleted file mode 100644
index aee305dc090d..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.5.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_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for playing & ripping CDs"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="alsa kf6compat"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}
-	kf6compat? ( kde-apps/libkcompactdisc:6 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..d38a943d834b
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.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.05.2.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2.ebuild
deleted file mode 100644
index 60aeeb79421c..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-24.05.2.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.3.0
-QTMIN=6.6.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}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.08.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.08.0.ebuild
new file mode 100644
index 000000000000..099856c367dd
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml
index 18d53b343a94..c1132e23fef5 100644
--- a/kde-apps/libkcompactdisc/metadata.xml
+++ b/kde-apps/libkcompactdisc/metadata.xml
@@ -9,7 +9,4 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="kde-invent">multimedia/libkcompactdisc</remote-id>
 	</upstream>
-	<use>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index e6e106fe6feb..d62bc68ba71a 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,2 +1,3 @@
 DIST libkdcraw-23.08.5.tar.xz 37500 BLAKE2B 03f192f09485dbdb2361d9553b067211825f3862a07661f3494b03cc12db66823af539ee29f04a2ef2874c61c42c129b5116428b0cfc9994022b0c079ca0ecee SHA512 76b5b5ee83dfb20f5bb857b7b1d654388066da70413f58319d8ba0b143d0ae8bbd1f2a1ff26d205742fe57f7cf76a81687419787498c72a6faa9d21f92836059
 DIST libkdcraw-24.05.2.tar.xz 37292 BLAKE2B fe1d4e72f55ea8ca1957e1d716de160aa1c06563314c837be1854975576f46f7f6afbf48f4bb31a55c005b580266ed05efc220795aed2004d8e8fa6af2740b6f SHA512 5f3e9f1c40edfe239a2658162fc46de07a2cb323b527caebf6e076ca014ed66f35f33ee7e29e5319795f133fce7329fc6b83c78a1e654478ac983df326faf0c7
+DIST libkdcraw-24.08.0.tar.xz 37324 BLAKE2B d8f17bbe5d155ca31df5c3fd5eabd158813d03ccc52f27b9b4b20b707f140624e64e5186be8130b5ea373418b964100f89423cde0adad711b3277d0cb4696770 SHA512 f144011e6ca6402d1078bc1cb9ba8ad8adf608a98b5d21201a8e18d9fa7c8bfbf04911755aca8bf4dabe056711d99df15d52acc8a4e3d15b1b8d55b4db65f97a
diff --git a/kde-apps/libkdcraw/libkdcraw-24.05.2.ebuild b/kde-apps/libkdcraw/libkdcraw-24.05.2.ebuild
index fbb16a49a010..11c1ed76f961 100644
--- a/kde-apps/libkdcraw/libkdcraw-24.05.2.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Digital camera raw image library wrapper"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-24.08.0.ebuild b/kde-apps/libkdcraw/libkdcraw-24.08.0.ebuild
new file mode 100644
index 000000000000..78ba0bdb0ac2
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-24.08.0.ebuild
@@ -0,0 +1,21 @@
+# 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/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 8c22e86ca305..d33173f8fc1c 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,2 +1,3 @@
 DIST libkdegames-23.08.5.tar.xz 6016168 BLAKE2B 464e11761dfdd3951cc1a19d2dacb57d2091fe78c988c17d24e502b3afa2a7a3afb053a6316c478b22bdf5a8682f24b4107729702be161989bc4ed0da632d229 SHA512 c0d2befdbdc6372b8e8d406b41805a5e8f914114b525772ff8434cfe46551adffed1b669b957e18ac6e0136d9a9fdeddf84b52a46170815b4531c8b15b1c50f9
 DIST libkdegames-24.05.2.tar.xz 5964468 BLAKE2B 4e725061d34eb09a5abc98a07c0d33a358375267597c1333c2fa571bcaea98f548709353ba6723c7bace2b1b87ed0d7c45d807c590053e9f72d3336fdd72018f SHA512 ee7b491f87de0e9d15d3b9d3755ea66ca8baed113f42f15780239c44bed7ff2e1f5a1cef410fea5ee5322f19d3320a09269c612d43d2ce0a9516a69334f6158b
+DIST libkdegames-24.08.0.tar.xz 5970840 BLAKE2B 4e39f6351bc3d068157074d519d77f8cdbd366caa719c251b2ab31a8e383ae4252eb531dfa9100da94aefa00bbf9bdd9f569ba7f048c203928b6ad2842bbdc57 SHA512 739c0ea1d002ae79f9f071663a834c3c79626151329463b9b4c57f23791c583266a838ba451fa2b7720d5fcb58504afdd73173660342bf0cc55eb5c9d5d659a9
diff --git a/kde-apps/libkdegames/libkdegames-24.05.2.ebuild b/kde-apps/libkdegames/libkdegames-24.05.2.ebuild
index dbaf0f520793..69a46917c068 100644
--- a/kde-apps/libkdegames/libkdegames-24.05.2.ebuild
+++ b/kde-apps/libkdegames/libkdegames-24.05.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Base library common to many KDE games"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-24.08.0.ebuild b/kde-apps/libkdegames/libkdegames-24.08.0.ebuild
new file mode 100644
index 000000000000..0fa365ddc5e0
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-24.08.0.ebuild
@@ -0,0 +1,45 @@
+# 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/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index b0ba92b19e57..57697d0a78d8 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,2 +1,3 @@
 DIST libkdepim-23.08.5.tar.xz 285476 BLAKE2B b0283e159a12cc50ce4174d4a8afd9b9fdf7298f1b707c040cb620a09aff425084e53393f4a9694a0ac9bf529893a3f7f2e5598a70f1a48f5ad5fa66493d9e36 SHA512 34487e087a1684eb9ab008a80cd56fa1da3993b49464035ad49c56fa7f3db2d4b1ce4c9edb4a7164239285280fa654694a4d9432429b39aada5cc6aa1f3e41a9
 DIST libkdepim-24.05.2.tar.xz 281976 BLAKE2B d6abe454293cc755822036534d7526f61f9ec4b8b140a39584fa50541d81b3f0f7cffa647b7b56e8264da377d0249e7db0ab26043c2474c4ef07f506bd83b9a2 SHA512 b2b6231ac854bfd7638c83101e077176c02374ed7704ea25811f76444e5f2e41dc0e5215b9ea10d63761021f2bbfdb70a81a7edf62a371957e19f43b3bebd6c9
+DIST libkdepim-24.08.0.tar.xz 282868 BLAKE2B c45e0cad29f5ad8596450443c149b58dc31ac55d1d52b4e092353af0762de7d56bd7422576120ed615245f8b6a774a00513d2a58279c831a5a483045f37362a2 SHA512 0314d8f3a96761bc3752bb06f10af15ca5db48871f5e6ea952eb29000c8ecadec19bcf5fdaa62b85bc1f2b3f1c7ffab87f68e618d35ce84e673c54ee411d1016
diff --git a/kde-apps/libkdepim/libkdepim-24.05.2.ebuild b/kde-apps/libkdepim/libkdepim-24.05.2.ebuild
index 92e838ff9281..17b15bdfc25b 100644
--- a/kde-apps/libkdepim/libkdepim-24.05.2.ebuild
+++ b/kde-apps/libkdepim/libkdepim-24.05.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-24.08.0.ebuild b/kde-apps/libkdepim/libkdepim-24.08.0.ebuild
new file mode 100644
index 000000000000..bc4d755bb45b
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-24.08.0.ebuild
@@ -0,0 +1,27 @@
+# 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.5.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 ea64cb716f67..acd85a1aab5c 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,2 +1,2 @@
-DIST libkeduvocdocument-23.08.5.tar.xz 229608 BLAKE2B b3dfeb16f5f7e7fbac4615ca5f6366a6aa82f185d4054142aaf5f458152930427797cf656af162e90f5e9f80f6ea8b96798d1b9d1ea881937ddd3529ae532968 SHA512 63b4cc2facc78a9b0cbeaeaa01cfb1f0114d66e816e7c0a8fb093b869e6a44feab6b023731af1e3ee0d817536e9d594207ad970fbdd1649e0be737cef6d3f360
 DIST libkeduvocdocument-24.05.2.tar.xz 227764 BLAKE2B 97277dc040eb84e8c9d6d1f0cb26c746d07b0719a45ad8c11a62e0bf00b628a9e564a2ca2ae1ef9fdfab44a7d3a2691b549ed50aa863c06f0218be7a775559fe SHA512 3e21e67c8710f4ffcff36ee1e1a08ff31a54f19421451362baf0086623b9f044fd5c9df2424c1ca8d5e0b09ed26f7fe831d18f57574dbd1bd891a137732a4f2e
+DIST libkeduvocdocument-24.08.0.tar.xz 228276 BLAKE2B 1866c18304067b85445482137f246d3f0e922fded119df61389be057ef44f79a0c801749311fbb7106ff70f27a7211f6682ae067145ea864aeada3719dd24af5 SHA512 d6ab0bb5755cc0dbe1c110185c1d79d6e8a06e339b7f0d6f0db48466973ef79fa97974260f3d12d1ed3810cc08c31957cb98cbfd19d33ba2baffb2893fa87bdd
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-23.08.5.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-23.08.5.ebuild
deleted file mode 100644
index 22ae75865e84..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for reading/writing KVTML"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-24.05.2.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.05.2.ebuild
index ba4e05bf2bd9..8b5bdd7d6fa2 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-24.05.2.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.05.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for reading/writing KVTML"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-24.08.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.08.0.ebuild
new file mode 100644
index 000000000000..41f893fe7093
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-24.08.0.ebuild
@@ -0,0 +1,25 @@
+# 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/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index e92083f4cfab..b85a8783d7d7 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,2 +1,3 @@
 DIST libkexiv2-23.08.5.tar.xz 60688 BLAKE2B b5b004a1eecd1e24542f41088b9cf04107d11e5cc2f4c80728c6bd1fccc06dee6f83ccf466f8fed7e1037c7f5fcd00eaf6519ed993f18affe77c839de60a9183 SHA512 e6535c24fea7c4a640433f6b1064d2058ba96a5908d08980ff978da8a4eb177aa26dd75a25c8ab44bb619b7a8e7ecfce8670ed3a67812806e9b587aeb48bcd16
 DIST libkexiv2-24.05.2.tar.xz 60608 BLAKE2B ab2b9ae74bb200760144bf1c36f5596d226ec4982c2e3920801bda0cd054f3e4164e414073d03cd9103d09cf88c79db3a3a32e5d5991f6fba65d2255940c91b8 SHA512 540c3b929635375a96ed62a5008469f3c3e630a25ea514123946800055388c277ec53a8c3077385a4204f4e0b3da6f6d75a6a67cdd52f019252f568a7f2b8257
+DIST libkexiv2-24.08.0.tar.xz 60636 BLAKE2B c5d3290ca57f14cd963e07afa4f1e2a888340c5bd27d0fbd2f879026b6b80b8d41698da2b85245ed3fa4de1b908141eebb8e5ca7ac23cacdb902cd10a439c263 SHA512 a0c6896891730ad7a02a2ed73b3d29f1036eac2dbdd7ca94795173148c0c7a873b95991c436d2e3e72c39f31c1bd8a3382e540a1d941d9a921dde5fdbca55c88
diff --git a/kde-apps/libkexiv2/libkexiv2-24.05.2.ebuild b/kde-apps/libkexiv2/libkexiv2-24.05.2.ebuild
index 05ddfb28a317..a3bab1006d0d 100644
--- a/kde-apps/libkexiv2/libkexiv2-24.05.2.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-24.08.0.ebuild b/kde-apps/libkexiv2/libkexiv2-24.08.0.ebuild
new file mode 100644
index 000000000000..bf9f7bb06217
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-24.08.0.ebuild
@@ -0,0 +1,21 @@
+# 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/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 7efa3dd17b0e..58bd9461d65d 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,2 +1,3 @@
 DIST libkgapi-23.08.5.tar.xz 335116 BLAKE2B 0d2c4515efa9a8adf9388b6447bef3d06887861cdb7eb6c40596445844b6e9fd13e17870f1dcd377c9a9d59998afe306ddc82694452816092bb1c74b0527b3bb SHA512 3bd99cf96aff46034847ba3b75243ed3171154538dfa5000336288c67439787cc6334b0d010176e9b38676ca9a109da9cc0f78a96fb37e43fa46974639ec3ed9
 DIST libkgapi-24.05.2.tar.xz 339032 BLAKE2B 5fc1b454bdae7b613ccfc7a5158944c0a7ee0e2d7e1c1c76e2b49abdc3090b67ecd0df8b53ad9e7bc9fd3004e291427cbcc22f36bafc243cd6d2b06f2281b809 SHA512 ee24f38be43086ad2651a0d1a611cb01eefc21e7b76b983641a65374c0e187f5ee555f3f20a4eb99fc17c4592daf031d6149155e4a440c8df3c7996bc866e00a
+DIST libkgapi-24.08.0.tar.xz 339452 BLAKE2B 9ab7cf70e366ae70b88d3281329f3aeeef8449c3d32629526518c089e99115dee9d5208507501b598ec139fda2779336a4716606c62b209ffc7c967ccb41742b SHA512 237ef5dec44adf9ad90ea1fd50fb374a6b72fca92d7617b4ab14ccc3518c7bcc721918819c55efe14c39b76a77fc8097859e640797d7032d19f1a54063e01718
diff --git a/kde-apps/libkgapi/libkgapi-23.08.5-r2.ebuild b/kde-apps/libkgapi/libkgapi-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..71c17a260405
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-23.08.5-r2.ebuild
@@ -0,0 +1,53 @@
+# 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=5.106.0
+QTMIN=5.15.9
+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="5"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+IUSE="kf6compat"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	!kf6compat? ( dev-libs/cyrus-sasl:2 )
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-apps/libkgapi:6 )
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SASL_PLUGIN=$(usex !kf6compat)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Both fail for multiple distros, see bug #832709 for more discussion
+		# Revisit at least once Qt 5.15.3 is in wider distribution (in Gentoo at least):
+		#   contacts-contactcreatejobtest, contacts-contactmodifyjobtest
+		# More failures not specific to Gentoo, bug #852593, KDE-bug #440648:
+		#  calendar-eventcreatejobtest, calendar-eventfetchjobtest, calendar-eventmodifyjobtest
+		-E "(contacts-contactcreatejobtest|contacts-contactmodifyjobtest|calendar-eventcreatejobtest|calendar-eventfetchjobtest|calendar-eventmodifyjobtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/libkgapi/libkgapi-23.08.5.ebuild b/kde-apps/libkgapi/libkgapi-23.08.5.ebuild
deleted file mode 100644
index 916b879155c2..000000000000
--- a/kde-apps/libkgapi/libkgapi-23.08.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
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-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.05.2.ebuild b/kde-apps/libkgapi/libkgapi-24.05.2.ebuild
index fcc2bf5d6145..72194632783e 100644
--- a/kde-apps/libkgapi/libkgapi-24.05.2.ebuild
+++ b/kde-apps/libkgapi/libkgapi-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkgapi/libkgapi-24.08.0.ebuild b/kde-apps/libkgapi/libkgapi-24.08.0.ebuild
new file mode 100644
index 000000000000..d0666d083e0e
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-24.08.0.ebuild
@@ -0,0 +1,37 @@
+# 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.5.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 69cfb0a558c6..4d76d2a21cdf 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,2 +1,3 @@
 DIST libkleo-23.08.5.tar.xz 566004 BLAKE2B dd9d11738c58a7d50c2f55abaa252b6978536fdb76669ba4f8d481a6f283980d61cdb39530461e54ced87f1f5499450983b9fa597afec2550531884fc2ea59c7 SHA512 af29ba96930613c51196ad77578c49c0288fb5b5629026cde9d29505e3a155d87998c19ea6a0babe1d1fe56d202668b1b8066a388632ae6a1e09729aa79e52c2
 DIST libkleo-24.05.2.tar.xz 594968 BLAKE2B 62cf01058c893c8d3fc28e3a862e4661b237f8523dd5eb1dd34b1ad8cd0feeb64da7d6bd73b06a8d335a56f537d513f7923a29969de5a3c77306375450b37e0d SHA512 764959663d860ae67c84f1383053ada197f55d73fdac864b35a7b790e4b70454de05d50c8d3b0c8ebed16205c3fedbf2c8d6961b7d7f7ac83fccc94dfa6e6658
+DIST libkleo-24.08.0.tar.xz 605652 BLAKE2B 05b68880d07fb181907308d65222d458909b51cf0edc5cba14daa8a83ed826bc611071b690a7e36ca6e42d51838c4f4e42e42e4483f3fc6e1ae25c2f634adfa9 SHA512 1fdc276b100a090a4b1f267c2063a81083732688db9c99be3f85c3f84ed791672eed4b99c931494e78bfbc15f48ac9a1bca9ef2f91680bb07954083b00a5bb2c
diff --git a/kde-apps/libkleo/libkleo-24.05.2.ebuild b/kde-apps/libkleo/libkleo-24.05.2.ebuild
index d1ced8c7d2b9..156f0c8323f2 100644
--- a/kde-apps/libkleo/libkleo-24.05.2.ebuild
+++ b/kde-apps/libkleo/libkleo-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="+fancyviewer"
 
 RDEPEND="
diff --git a/kde-apps/libkleo/libkleo-24.08.0.ebuild b/kde-apps/libkleo/libkleo-24.08.0.ebuild
new file mode 100644
index 000000000000..1a118189d946
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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.5.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.1-r1:=[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 67290f4fb759..b268d01cd35b 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,2 +1,3 @@
 DIST libkmahjongg-23.08.5.tar.xz 1688620 BLAKE2B 3baea8ff2d1cfd0f3edc2740b4c08d156178041919538a27121bfe6d4acfaac394896ce6e4412473694e75dfb2e13b45d29bd4f35f09c3f05dc5b84b2f058720 SHA512 c456868092bf7593bc2a1bfefd58b9b862339a5e899fc035b6d8bd0b40224ca2cba534df682a6fef98f5a40905ccfb0077ceef461abfe32b6bfbae953f5f04d7
 DIST libkmahjongg-24.05.2.tar.xz 1692164 BLAKE2B df96846caf376d6e9462caff22f9bc8ca9e2e208a700440d2bbf09682b0e1c062fa04370bc054cd138639578b2dcba352b8626ad431361e20afe5e7b2123396d SHA512 dbe3d66156229df494d48300674dbc4ebd6c4a72392ecbf120ac54d20872b41dc1fa5c0dbba2e54ba27c4e4102ad2e1a694ff0391efa2b91f34760e61c46f622
+DIST libkmahjongg-24.08.0.tar.xz 1694060 BLAKE2B 9401875bcbbdb3e3d1acfa39200f3d20449bb62b3d9d1955dddae1c76313a46733066e437d1a1e32d9f6aa95734266003ae238d14971357fe3813549d497e686 SHA512 9b19ae85b62efb4feb69b7056cde3fd47767a76717a4067a4a5c4e19ef8abc2b513595b33691520ec1fb22264899c8c1fbcd6041458b87f2add47203dc383d5c
diff --git a/kde-apps/libkmahjongg/libkmahjongg-24.05.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-24.05.2.ebuild
index 1b69f3576122..6508c786355d 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-24.05.2.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-24.08.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-24.08.0.ebuild
new file mode 100644
index 000000000000..787ecf71c66b
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-24.08.0.ebuild
@@ -0,0 +1,25 @@
+# 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}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index aded03a813d2..f253fa530c6f 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1 +1 @@
-DIST libkomparediff2-24.05.2.tar.xz 188884 BLAKE2B 2d3868be92fa4bb2777c0be58e66d6e34b953e0d7e4a57a235c54b1a1facc6f12d35f8abf124391ce31cb0d4c93d72ada59a54ac4754d759c753090f2ae403ec SHA512 54965f3f44c88bc3e7f0cbf7f5d3598ba05dc05d48a4d2b123d0e98eee1df1e82593828616e043ff60f35184d6a5df6121493447808ef630bb3bd6705c06d24e
+DIST libkomparediff2-24.08.0.tar.xz 187684 BLAKE2B b436b9f71a8a3a5c131ce53b477d4c3f16b09f074812f6acecd11870f269c8440e8e285bca196184dca9837c6235dba4caaf883b90338f03a668a7d418b90021 SHA512 e4e29b47d1bdb42f5eb114184d1649e348b271b84e7968097790aba929b8c13fcada24f76dd367200bab0ca346c698f80458ae96601fd119c39d8d7bcf8298ac
diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.05.2.ebuild b/kde-apps/libkomparediff2/libkomparediff2-24.05.2.ebuild
deleted file mode 100644
index 5b33ae482313..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-24.05.2.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_TEST="true"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE library to compare files and strings"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.08.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-24.08.0.ebuild
new file mode 100644
index 000000000000..09292a712327
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-24.08.0.ebuild
@@ -0,0 +1,27 @@
+# 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/libksane-common/Manifest b/kde-apps/libksane-common/Manifest
new file mode 100644
index 000000000000..cd2825b15c02
--- /dev/null
+++ b/kde-apps/libksane-common/Manifest
@@ -0,0 +1,2 @@
+DIST libksane-24.05.2.tar.xz 153572 BLAKE2B fe15e8359b9975b68f98370e502b6115169a94f153ccea6927c1492a68028edc22e3f062b23ed1e063b3349deb08f045f44e4fce0ce945fc4dec60ce27bd341a SHA512 ba5537fdb690e33ffdf841981ddfd9767a588f40277c39aa4fa6e2ad56cf42afe4a231282bbf4c410df600750a95b459a11e36d03a671fbad5369d141febd691
+DIST libksane-24.08.0.tar.xz 153544 BLAKE2B e39196024dbdf8dc6dfcaa2a0290398b1a52b9072d7de5441137c14992d4c5c98f2a0cb9873310a90d79acdfe603a49675955274b8a8e611f7913f9a1d995fae SHA512 dca60aff56f06181cbac3041694149b1e347f28875b6f6bdd90dd98520fd0072f9b6356388bf21a788a30e33cc07829af3a5af11a80f192e9777636c4bb48d8c
diff --git a/kde-apps/libksane-common/libksane-common-24.05.2.ebuild b/kde-apps/libksane-common/libksane-common-24.05.2.ebuild
new file mode 100644
index 000000000000..e76eae4a18fd
--- /dev/null
+++ b/kde-apps/libksane-common/libksane-common-24.05.2.ebuild
@@ -0,0 +1,23 @@
+# 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.08.0.ebuild b/kde-apps/libksane-common/libksane-common-24.08.0.ebuild
new file mode 100644
index 000000000000..582564bb6b69
--- /dev/null
+++ b/kde-apps/libksane-common/libksane-common-24.08.0.ebuild
@@ -0,0 +1,23 @@
+# 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/metadata.xml b/kde-apps/libksane-common/metadata.xml
new file mode 100644
index 000000000000..7f5e4344af19
--- /dev/null
+++ b/kde-apps/libksane-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libksane</bugs-to>
+		<remote-id type="kde-invent">graphics/libksane</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index b0aacc634a76..351ffbca1833 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,2 +1,3 @@
 DIST libksane-24.02.2.tar.xz 153524 BLAKE2B 71559382fef484c3d08c7022eacd0a6d3f7be1c3cc9b85e50c1f8b627c5e497173263fd7de2429cbe99b6f4b5185be40d8be1d3bbf8c1c3e3391205d7974d6ea SHA512 e5ad9152760384be4f1aa2b7cf54161caceb3fa68e9745606398cadd6e2e44c9b4b0d7d4cbf51c44667697221d6c7ab8ee3dcb9e210bd341d33bd7cee006909a
 DIST libksane-24.05.2.tar.xz 153572 BLAKE2B fe15e8359b9975b68f98370e502b6115169a94f153ccea6927c1492a68028edc22e3f062b23ed1e063b3349deb08f045f44e4fce0ce945fc4dec60ce27bd341a SHA512 ba5537fdb690e33ffdf841981ddfd9767a588f40277c39aa4fa6e2ad56cf42afe4a231282bbf4c410df600750a95b459a11e36d03a671fbad5369d141febd691
+DIST libksane-24.08.0.tar.xz 153544 BLAKE2B e39196024dbdf8dc6dfcaa2a0290398b1a52b9072d7de5441137c14992d4c5c98f2a0cb9873310a90d79acdfe603a49675955274b8a8e611f7913f9a1d995fae SHA512 dca60aff56f06181cbac3041694149b1e347f28875b6f6bdd90dd98520fd0072f9b6356388bf21a788a30e33cc07829af3a5af11a80f192e9777636c4bb48d8c
diff --git a/kde-apps/libksane/libksane-24.02.2-r1.ebuild b/kde-apps/libksane/libksane-24.02.2-r1.ebuild
deleted file mode 100644
index 0243c4f05cac..000000000000
--- a/kde-apps/libksane/libksane-24.02.2-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
-
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="kf6compat kwallet"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=media-libs/ksanecore-23.08.5:5
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	kf6compat? ( kde-apps/libksane:6 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwallet KF5Wallet)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm -r "${D}"/usr/share/icons/hicolor/16x16/actions \
-			"${D}"/usr/share/locale \
-			|| die
-	fi
-}
diff --git a/kde-apps/libksane/libksane-24.02.2-r2.ebuild b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
new file mode 100644
index 000000000000..29d61684095a
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.02.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE="kwallet"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=media-libs/ksanecore-23.08.5:5
+	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+"
+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
+)
+
+PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kwallet KF5Wallet)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/libksane/libksane-24.05.2-r1.ebuild b/kde-apps/libksane/libksane-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..c9c41566f9e9
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.05.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.3.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.6.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.05.2.ebuild b/kde-apps/libksane/libksane-24.05.2.ebuild
deleted file mode 100644
index fcad20ed1e87..000000000000
--- a/kde-apps/libksane/libksane-24.05.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
-
-KFMIN=6.3.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.6.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}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwallet KF6Wallet)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libksane/libksane-24.08.0.ebuild b/kde-apps/libksane/libksane-24.08.0.ebuild
new file mode 100644
index 000000000000..c2f9fa8a3efe
--- /dev/null
+++ b/kde-apps/libksane/libksane-24.08.0.ebuild
@@ -0,0 +1,45 @@
+# 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/metadata.xml b/kde-apps/libksane/metadata.xml
index 86031412db63..1a76a67e1b59 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -11,6 +11,5 @@
 	</upstream>
 	<use>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index ffebb70a7048..e956e47dd462 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,2 +1,3 @@
 DIST libksieve-23.08.5.tar.xz 581988 BLAKE2B 23aca922e538c3f31793e5e50ec00111db1cc0de5a1249618e27112791c229018d6e5b1a9876947a6efb4ed16e1bc91fbd397a6eb46d6b5a98716a604ae4e12b SHA512 791f4d9e5f24c8b3ba785db2db73d800275e82bf5ce68fdbc0ae0b8411a24417de71be0d38f21b1225e124efcc4fba4fa585602fbfdefcc5af106a8aa1d848d6
 DIST libksieve-24.05.2.tar.xz 592148 BLAKE2B 5bb1d0e4817445cec913c3fec3907ccbda71a6dcced7fd74463f12c80cf855f673d0e8876ed4b6939227021f39a1f569ebcac295f4cdfbee69e0ca421274075e SHA512 bcf6ee78064d1970df6a48cc189598164d319cc6e5102f7e3b6fa91571a1231c06be1564af781824ceb8d8ee91dbd3acf9ca1b0c1461b211d9b2e705dc4de995
+DIST libksieve-24.08.0.tar.xz 601920 BLAKE2B c4bfa1612c98f0cfba0a46ba8668e43d9cf694a28150d6340787e05fb1c36c1019506f6ca131ed3fa33469618d45a7ff3e5f0c2cc78104dfb238b93d025dcf2d SHA512 ddfb0b9e9a231e0aa0c38a3dd6ca9cc3fccc57fc73373ad01936977b23282823f0c8b0f62ee7df378d8f4f38382599e7152dc4aca4ab70bbd49f2783882bef9d
diff --git a/kde-apps/libksieve/libksieve-24.05.2.ebuild b/kde-apps/libksieve/libksieve-24.05.2.ebuild
index 8da42e5ef901..11ae33b1499b 100644
--- a/kde-apps/libksieve/libksieve-24.05.2.ebuild
+++ b/kde-apps/libksieve/libksieve-24.05.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="speech"
 
 RESTRICT="test"
diff --git a/kde-apps/libksieve/libksieve-24.08.0.ebuild b/kde-apps/libksieve/libksieve-24.08.0.ebuild
new file mode 100644
index 000000000000..065de754eb57
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-24.08.0.ebuild
@@ -0,0 +1,55 @@
+# 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.5.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/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 586fdff8e277..ab479a44b02b 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,2 +1,3 @@
 DIST ktnef-23.08.5.tar.xz 312392 BLAKE2B 1ff8c848ef01f771836b88baded31c9bc3c40e44095fb6fd42257f835e619a8a9d8a6a66ee2aa18e46e408f71e4af45ae03da2e34f0d4511f629c59f62eca9da SHA512 888389dcf96d07f9e4c0e05615cda67c1e663916ae4461429cbcba5d9dcfd0a3c911c8a6c3fb8eb3fd2a8cedb3193981f9815cc686275186e2f031316a389216
 DIST ktnef-24.05.2.tar.xz 312160 BLAKE2B 3984261bbd70b6c711932b2c653563489c43a01545a546d19631520f2af64c5efa787bd37f44027b7ac8bb485641aff6db68f32405e3fa9c7bb34119c560aa10 SHA512 06c8329a50d93afffcaab5554b7ec51db062d5d9490b85488d65247cb789cd06af15a6fcf659ff4fbbae3faba3932ab51c6f7c27847a5ca1ab61201c13c0e860
+DIST ktnef-24.08.0.tar.xz 313236 BLAKE2B 56a64fa235f85a82bb1af3e2fd3ce49aeb32cf9026fcfba1b156180880fcfa5e870b70f349307d794465f676accedfde5338aafb6c4a7e29c4e98041ef2b64d8 SHA512 2c47572f7216a85bcc3a31bcae90d7998aab3333a1f1f7bd6b18ee1eb2de862ccac0745082f3a66fab78f0740b9ef20abbd72161c3a8b590a9f728d3d156427d
diff --git a/kde-apps/libktnef/libktnef-24.05.2.ebuild b/kde-apps/libktnef/libktnef-24.05.2.ebuild
index 9fa304c0add5..ccee27978074 100644
--- a/kde-apps/libktnef/libktnef-24.05.2.ebuild
+++ b/kde-apps/libktnef/libktnef-24.05.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libktnef/libktnef-24.08.0.ebuild b/kde-apps/libktnef/libktnef-24.08.0.ebuild
new file mode 100644
index 000000000000..932409339015
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-24.08.0.ebuild
@@ -0,0 +1,28 @@
+# 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.5.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 9fda6be7902a..f0a79631cf0f 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1 +1,2 @@
 DIST lokalize-24.05.2.tar.xz 2076256 BLAKE2B 3a750865e167796fada9ce6fd3919b63a48c3d90e3ac982541fd59bee7cfba574926351141280db6684ef7bf263348ae2f83f6b0902d0ccc1d96763976af9df3 SHA512 518a32a1d61b768470d19d10b8348b0a91cb4355400cf2356309a36642fccb79586360c07a9afb3bf33152a928fff4bb2dcfc1226deb01bcaca91ae273e50253
+DIST lokalize-24.08.0.tar.xz 2040812 BLAKE2B 34ebd443d6f34eb09efbcdcc775bafbe08a357a21f14bc924d287b93f4d13a558d623df23898fb55f8784503426e947060a8f3a519cef05ae3e9148c2e517b4a SHA512 ecd2f5de46035d89c615776430068f2cff35c289dfc1d965463577d7f6fa7d8dbdfeddede3a9779432717587b33c8003b4b9e9a3d750ddc057dc35b1d6049d95
diff --git a/kde-apps/lokalize/lokalize-24.08.0.ebuild b/kde-apps/lokalize/lokalize-24.08.0.ebuild
new file mode 100644
index 000000000000..9a7b676624ba
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-24.08.0.ebuild
@@ -0,0 +1,66 @@
+# 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/lskat/Manifest b/kde-apps/lskat/Manifest
index ce67eec24d14..a955e5d6cb2a 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,2 +1,3 @@
 DIST lskat-23.08.5.tar.xz 1251488 BLAKE2B 884000a1ca5dacff34fe65381e15b632b992b7e1a1e1dc0d2683702711bdaca583e74e0fb693758ae3945c2cd6fe094d79a2b9fa6d050ab85989184f66895978 SHA512 44d6d6291666a97bb012cfeecef240a5441f5664fde6df20a4ba58c05b16f06a88c7f78970bc705b48c60ed4a1dee0e431686f5fe75837e9805aff2aadf6761f
 DIST lskat-24.05.2.tar.xz 1220720 BLAKE2B 4a3c8e92c3ebaac34f4a8eefba7174a432ddfa5059d0e2b23c33ba7b8c41d0a5214969e96755001883c337225e0752c46fbf42c3a7bbc7d325320db966b5f809 SHA512 b5ddcc462abbd994dd850f460da5fbc31e6c16805913f8ddae70c681d832fa26f44452388e8c3dcc077e4418ef13c5e1b1ba981b99ca735a2d684fc4cb3b3f12
+DIST lskat-24.08.0.tar.xz 1222732 BLAKE2B 76bb48419ae1ba0eaa42a8cb3cf42e86e81c3bf406ff208bf13b7c42b3b46d240ad62bc965626c3155f3e5dc410ab92863169baf5cdd9feebf20462d7c3afe46 SHA512 b1a1ed1964d2a188ea361e871a47bc1f18b8b6fb50370d87a0d6d879b16688e2b09a0b758a4af21e0342736d62eef9b9016209b8aa8a8fc3b8dfed18212eb3a9
diff --git a/kde-apps/lskat/lskat-24.05.2.ebuild b/kde-apps/lskat/lskat-24.05.2.ebuild
index 2cef101b4281..a4ec84fba9d6 100644
--- a/kde-apps/lskat/lskat-24.05.2.ebuild
+++ b/kde-apps/lskat/lskat-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/lskat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lskat/lskat-24.08.0.ebuild b/kde-apps/lskat/lskat-24.08.0.ebuild
new file mode 100644
index 000000000000..52fdb8c34d32
--- /dev/null
+++ b/kde-apps/lskat/lskat-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index f6415efbb1a4..77031078078e 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,2 +1,3 @@
 DIST mailcommon-23.08.5.tar.xz 763084 BLAKE2B cade987499bfcb1f5761a9f627517b14089b7a644c501c76076a16e35131f2c4fec17b8bc38340277527ae553bd2a85ddd3bb8df3d5719d6ad3bdda7bb9ce92d SHA512 d60539384fb54bfaf7ae527a7f2e9786e9eee91b27b96a2e8a59c97ec276080d6bededde3df22c828126a44f797e6372e2838b7561f0f8c819392831555fb181
 DIST mailcommon-24.05.2.tar.xz 773152 BLAKE2B b2ba2a64b8c314380e51f3c4cad9bb87e79861bc46d7eacd6025e96fdafa49bbd6cbf611c96daaa898f85d8187ab650baae8516ac523e41c43018746ada0ee43 SHA512 adf287b1ece2ed41d9a2498c72597ccb7798a5c051b71afd6b5ae252e0e67a75e3fa6526879acd0b65cf424a1052c2e0cf4c4ef5bd3bdd5200e3e8e342f20033
+DIST mailcommon-24.08.0.tar.xz 779480 BLAKE2B 59482f7b2b065d27a5a18e1cd60b5a015f556f23b529de3f55b963dbc6367b567dfaefa0d450b31470cc6c1553f05b062fdf812ec7286fd934d1879feb270ee9 SHA512 71cb2a8bccc961e53eb24c7664fb41d2cbb31e23ffa2caec49b73ac13190470331e7fe8c30c16625443c38e74cffd159f21d25d0ea3656dffa9ac28fb82c46dd
diff --git a/kde-apps/mailcommon/mailcommon-24.05.2.ebuild b/kde-apps/mailcommon/mailcommon-24.05.2.ebuild
index b7b308f8951b..b43135108d22 100644
--- a/kde-apps/mailcommon/mailcommon-24.05.2.ebuild
+++ b/kde-apps/mailcommon/mailcommon-24.05.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/mailcommon/mailcommon-24.08.0.ebuild b/kde-apps/mailcommon/mailcommon-24.08.0.ebuild
new file mode 100644
index 000000000000..14baf6f168da
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-24.08.0.ebuild
@@ -0,0 +1,57 @@
+# 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.5.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=""
+
+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
+	>=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/ktextwidgets-${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]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 63308be00771..c12db377acca 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,2 +1,3 @@
 DIST mailimporter-23.08.5.tar.xz 593380 BLAKE2B 48ae9105d09ce58bb6f83869a57f8c530c8297a9c695ca12d8abc0283f6bde70743b7546966b7630adc9574909dd9820217b906aec135a921c28509315738b59 SHA512 b6f57aa20603c1215dd96ec04716e5f724ffdc24434930525df0b3d9d4b2f0e42236e376222199455a64bfedf92edc52da8e3e7216d506b1cb611fdfd2091790
 DIST mailimporter-24.05.2.tar.xz 595316 BLAKE2B 15cb48d3bd4f89bbf805939ee87af50bb6134b148e5e1bd6fdf25d953e0ef6a65f30f6fe174a36861d70fef4a88bd0eb6e750544b07ee116ef40c719351d3c0f SHA512 1e61921de94ea9d374ac039ac3cfe41841b9928a2f68a527c7ba5656b0a9f550a0fcddc15b3640ab608ef0b0c01ed04e93f4cbbf38680c19d183a8250f14b88b
+DIST mailimporter-24.08.0.tar.xz 595812 BLAKE2B 1e6a3b762c5d78a81a03f7a0117b159cf529c9189e555d26d80695e443243535b25e212684f8f3d16e14db78f327c677d8b38ee7c64feee994f022874949df92 SHA512 c5129fa608ce390376f9acb4cb98aa92ff60adb01b5f75001a87295b9ee5b5838e2c906db1d21f6c6b97d134f8327cd43d1596151dc524b46f0cae208c84bb78
diff --git a/kde-apps/mailimporter/mailimporter-24.05.2.ebuild b/kde-apps/mailimporter/mailimporter-24.05.2.ebuild
index db781580af82..0068d9a8f318 100644
--- a/kde-apps/mailimporter/mailimporter-24.05.2.ebuild
+++ b/kde-apps/mailimporter/mailimporter-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library to import mail from various sources"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailimporter/mailimporter-24.08.0.ebuild b/kde-apps/mailimporter/mailimporter-24.08.0.ebuild
new file mode 100644
index 000000000000..ea6f0b53f420
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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.5.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 f79268312c93..15cd036f1e97 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1 +1,2 @@
 DIST marble-24.05.2.tar.xz 52448744 BLAKE2B eb61c35c215caaf3a1f63c020efc2f8a597fa47a908d08a8981e9887d521f157cabb8f8f61a8519124fcbdd878745eadb14a07ed63576ba7ad908f31568a9187 SHA512 41e76b1f977efeb0e46876792a7bd374bc150cbefdc53619d88f64a80cb39d6d7761803519172062fd6517657623383ca598c8a292f54a8d85270cc172d91699
+DIST marble-24.08.0.tar.xz 52449648 BLAKE2B e410ac2450ab4d82f86ec0cd3302b24e37bc266f9a88ddbf48137b9e6af704ecb83bb7616f98f07c4851e8685f3a5935fe9e2c649252ad7b85901d6ba57316c8 SHA512 5ef39517416875ed41229012b0081f7fa18083b3ddc331cadb07477eb4e239ea4e20ad3b458f8a5cabe4a792c93d7b4660651dc5d8bc799053e221955a2a1619
diff --git a/kde-apps/marble/marble-24.08.0.ebuild b/kde-apps/marble/marble-24.08.0.ebuild
new file mode 100644
index 000000000000..95c45cf5d931
--- /dev/null
+++ b/kde-apps/marble/marble-24.08.0.ebuild
@@ -0,0 +1,97 @@
+# 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="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+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="5/$(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/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-libs/zlib
+	aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	designer? ( >=dev-qt/designer-${QTMIN}:5 )
+	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	kde? (
+		>=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/kio-${KFMIN}:5
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
+	)
+	pbf? ( dev-libs/protobuf:= )
+	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+	shapefile? ( sci-libs/shapelib:= )
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+	aprs? ( dev-lang/perl )
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
+
+	use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package aprs Perl)
+		$(cmake_use_find_package geolocation Qt5Positioning)
+		-DBUILD_MARBLE_TESTS=$(usex test)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer)
+		-DWITH_libgps=$(usex gps)
+		-DWITH_KF5=$(usex kde)
+		$(cmake_use_find_package pbf Protobuf)
+		-DWITH_Phonon4Qt5=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DWITH_libwlocate=OFF
+		# bug 608890
+		-DKDE_INSTALL_CONFDIR="/etc/xdg"
+	)
+	if use kde; then
+		ecm_src_configure
+	else
+		cmake_src_configure
+	fi
+}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index db5d5b64269e..b38e479a0842 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,2 +1,3 @@
 DIST mbox-importer-23.08.5.tar.xz 30112 BLAKE2B 10f6d16b1958fb6861c183ca130c8a5a820d2c3900df23d32dfb0a7fa4077ee2b7082d69a41feb13b88d14f7fe6d4e08d2277eaea5ff28113725e104209d5a30 SHA512 0a7d7bed962367a5d85365f54f1f8bbc922aa6eadd934acf34ce5f85cb3f68f8825581e158845c52a1e5fa7dd6a7aed3c6e04fdcfffb7b6dcd5a1d451cd2cf72
 DIST mbox-importer-24.05.2.tar.xz 31268 BLAKE2B f664c11d2113a2627232d3d01e3a1764742bca5c44d57983a4c98bad99aa2e32225910936cca64145c7f43319f27f7827fbbdd3db5b27645418c5ac0d6a6b3b0 SHA512 dfa912ede32d10ab2643bd574d0f6ea2eb40a143e020993378075c88a4335298f76df64f37fc7d4ba1ad74401d5f32e49e64f1686d34af8e4c35c8c4aeae6486
+DIST mbox-importer-24.08.0.tar.xz 31860 BLAKE2B 6057e793eece55752afaa0c4cf94bb5426393e47e621455ea95ad8b1190d3666273ea00d0a7afeed04b2a544c0d252cebb2decdd9a22f74ba2ebc83b5dcb922d SHA512 cde381e8aefd0a4d56cd545ff7ad57d6929b021a5c09b8c7a1034118bca9a0871e78cbf40b06f110d27d0355653f1f7305478717067c173fbd05b328ccf61cd3
diff --git a/kde-apps/mbox-importer/mbox-importer-24.05.2.ebuild b/kde-apps/mbox-importer/mbox-importer-24.05.2.ebuild
index 4930fcb54fb8..ea0f97bdb50d 100644
--- a/kde-apps/mbox-importer/mbox-importer-24.05.2.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-24.05.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mbox-importer/mbox-importer-24.08.0.ebuild b/kde-apps/mbox-importer/mbox-importer-24.08.0.ebuild
new file mode 100644
index 000000000000..a2716a8b9fe8
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-24.08.0.ebuild
@@ -0,0 +1,33 @@
+# 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.5.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 c1d4b15b579b..b3fe95350f5b 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,2 +1,3 @@
 DIST messagelib-23.08.5.tar.xz 11374208 BLAKE2B 37201cd3ef58e1dfbe688ef240684838de6fc49816bb4294b047e0b2471395109c775183e453eccd19643d4d05f161f6d2e25ea83a4dd653f22aee36e97f7207 SHA512 e06eff48ad43264b79e5a8fc63a1b3aa021d44ab8aa9bcaa095e4650b001bc26bcf9b3edab95905655fd53f75e83ac8fd47b5e8e1828c535da804007f89ef39b
 DIST messagelib-24.05.2.tar.xz 11358880 BLAKE2B 1b7919106093e14d1e6f1a671e7b0425c14c911ec856799e9789e149aa145ab78cc78c8d0f45dc1185665a8b02238d5148a2ebf99fe3c5de79aad6e07bff3426 SHA512 a41a72728132e73665b68f216d6dd7cf9fef8e3f6e06ef972a3245dea3857e2b065ee55da308f9c7bf61938dd5bfe41933bc58e8827123cefd240eccc08d510b
+DIST messagelib-24.08.0.tar.xz 7522940 BLAKE2B f9425ecc8c084d4fb9d08756bc841dfd16214666484c06404890b6836ba298f8ccfbaa7d9d22e48a778ff51cb5bc8c0bdfd9b1585ff9c564dbe45c3344dad629 SHA512 c0e16227226bcaa7ff2c2d1276eb980b83f8b8b57dadd5389b7fcaa99460913c59e874e1ae6fc14be98767c3ef7be045dbfaae69d306c4329c1ad5eac7c7504e
diff --git a/kde-apps/messagelib/messagelib-24.05.2.ebuild b/kde-apps/messagelib/messagelib-24.05.2.ebuild
index f6a7acddf8ab..cf4e118ec695 100644
--- a/kde-apps/messagelib/messagelib-24.05.2.ebuild
+++ b/kde-apps/messagelib/messagelib-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries for messaging functions"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="speech"
 
 # bug 579630
diff --git a/kde-apps/messagelib/messagelib-24.08.0.ebuild b/kde-apps/messagelib/messagelib-24.08.0.ebuild
new file mode 100644
index 000000000000..f787f636069b
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-24.08.0.ebuild
@@ -0,0 +1,77 @@
+# 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.5.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]
+	>=app-crypt/qca-2.3.7:2[qt6]
+	>=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 50aa7f41fa31..abb942da8c96 100644
--- a/kde-apps/mimetreeparser/Manifest
+++ b/kde-apps/mimetreeparser/Manifest
@@ -1 +1,2 @@
 DIST mimetreeparser-24.05.2.tar.xz 641868 BLAKE2B 2c3228a927b4e27409359634867e5e5810140ca92a6fa64714df02341c558ec860e39c7c0d0a346681adefcd44c0704a764b8962e5b6e7540b0c630350e38cf7 SHA512 c7233f3fd4cece6ff1930f7144a8e25a9848f615eb82f8995623fde905c6cc345cf0e63bcf0b3c7d55d4956e1ca6f2ceb18670eb345de016807a72de29923bf1
+DIST mimetreeparser-24.08.0.tar.xz 644356 BLAKE2B 57fb56e277759c4859449d867bdcad87ffe1352ea9b69f04c71dfb1bff6e755431eb3ee641ca507b1c4ade39f61165ecd34883c86a884b8fc8a5d4a4d01ddd97 SHA512 aa37ba8a202e1a9d11fe4dbfda7365af4fa63dc26d304f743dbeb7535fa37401f4a21a2ee36d1cf8d40acbf9753536f4fd167c2163c52d9b62423290f96ec041
diff --git a/kde-apps/mimetreeparser/mimetreeparser-24.05.2.ebuild b/kde-apps/mimetreeparser/mimetreeparser-24.05.2.ebuild
index 8e296986ea34..eeb52c9ace84 100644
--- a/kde-apps/mimetreeparser/mimetreeparser-24.05.2.ebuild
+++ b/kde-apps/mimetreeparser/mimetreeparser-24.05.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Libraries for messaging functions"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # bug 926482, needs gpg-agent
diff --git a/kde-apps/mimetreeparser/mimetreeparser-24.08.0.ebuild b/kde-apps/mimetreeparser/mimetreeparser-24.08.0.ebuild
new file mode 100644
index 000000000000..072760fdb15f
--- /dev/null
+++ b/kde-apps/mimetreeparser/mimetreeparser-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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.5.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=""
+
+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 6e84f189f0da..f99b0eae51dc 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1 +1,2 @@
 DIST minuet-24.05.2.tar.xz 27687144 BLAKE2B 7a4e58b9ebd8281b711b80883467e9aaa024227dcf93d04b7b8581bbc7924fbf8a39b07137b13d8abc5028efca19c57c0e9f10d3b975d0b49298e1681f5bb6a5 SHA512 c363aa18aa280d84cb49196629e614bcf48a2da7d3d492fa5916547329cc901f87bcabcf133abb0bf65518640c7a65c39828706a3d513d897bf65e6e07ba4126
+DIST minuet-24.08.0.tar.xz 27686540 BLAKE2B adcd1494f749c44e9d65112039c97863dc6b149ad02ce7dc0020d74fe3859bb66b561246a914410d2382b459a9641b276cb3333985b0d957c57c581dbe498684 SHA512 e0579f2c331b24e4f09079bb9d1abfa6f6e50bff19e8175eececfb84308738617a1b8ecd19b03a837d2fe9e8ebfcefbcf6b2abe5d1d816092aebef9cb614ef47
diff --git a/kde-apps/minuet/minuet-24.08.0.ebuild b/kde-apps/minuet/minuet-24.08.0.ebuild
new file mode 100644
index 000000000000..4fab8719b70e
--- /dev/null
+++ b/kde-apps/minuet/minuet-24.08.0.ebuild
@@ -0,0 +1,30 @@
+# 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="Music Education software by KDE"
+HOMEPAGE="https://minuet.kde.org/"
+
+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/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	media-sound/fluidsynth:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 67f3388e4aad..a3640cf765b0 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,2 +1,2 @@
-DIST okular-23.08.5.tar.xz 8515760 BLAKE2B ec8ddf33917cc092e23934cc184280bf69fd92e184f05a14a3b0ec3636f00a90e35ab7c5b05e6b4083a4a94fb3d8725aa7b71686d5fe1d8962c4678690670f29 SHA512 c9e8b430fa4a5486cee0587f9beb077b4e8b5476f00ed42c9369fbb195ad9733ed310e01ebefc3c08cf78a53a3e72eab44c42a236b3dcad7e02421a864331dd6
 DIST okular-24.05.2.tar.xz 8016384 BLAKE2B 21a33ec0b9a451267f6772c460076c3150e02a76d0cf68ae80fda6567c1687ffeb96fe96dcb81bda20d3ada8cf89f782b133619755f80cce32cbc9804af9064c SHA512 029358a7c8935994a3a2949dc2e4629cd9dae9f8589d53759ce42696c9f5ac649d35d841b7ed826daf518c64971a84b04c86ff23c61964369933fa27841e0ceb
+DIST okular-24.08.0.tar.xz 8027692 BLAKE2B 4d62a464020953410773612fcfa8dbecf9e779246cc0aaa8a3eccdfca8bb1b0b634a990caaa3b3923b2e9dccb7d6354dc5de871adb5db1c76a862348ef536d9e SHA512 c647d728a7084c39d8ed951ce9d828d64de4f5f5888751e565f64683c8563834abb4fd3d97a182c04b6df5dd614f74b9802392fce4ffa71444aeec09bc4d7a9e
diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch
deleted file mode 100644
index a0babcad1c05..000000000000
--- a/kde-apps/okular/files/okular-21.11.80-tests.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 323fed918995fe2e01036c74c1498446b4d2f122 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-
----
- generators/chm/CMakeLists.txt                 | 12 +++---------
- generators/chm/autotests/CMakeLists.txt       |  8 ++++++++
- generators/chm/autotests/chmgeneratortest.cpp |  2 +-
- generators/comicbook/CMakeLists.txt           | 10 +++-------
- generators/comicbook/autotests/CMakeLists.txt |  6 ++++++
- 8 files changed, 27 insertions(+), 18 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 0d7452cba..3adb3fd54 100644
---- a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -23,15 +23,9 @@ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
- target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
- 
--########### autotests ###############
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
--    TEST_NAME "chmgeneratortest"
--    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-+if(BUILD_TESTING)
-+   add_subdirectory(autotests)
-+endif()
- 
- ########### install files ###############
- install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 000000000..59753ca45
---- /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+    TEST_NAME "chmgeneratortest"
-+    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
-index c428fa1b3..68f7a5821 100644
---- a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -30,7 +30,7 @@ void ChmGeneratorTest::initTestCase()
- {
-     Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
-     m_document = new Okular::Document(nullptr);
--    const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");
-+    const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
-     QMimeDatabase db;
-     const QMimeType mime = db.mimeTypeForFile(testFile);
-     QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess);
-diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
-index a0e7569a2..91bcc6ec7 100644
---- a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -25,13 +25,9 @@ if (KArchive_HAVE_LZMA)
-     target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
- endif()
- 
--########### autotests ###############
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/comicbooktest.cpp
--    TEST_NAME "comicbooktest"
--    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
--)
-+if(BUILD_TESTING)
-+    add_subdirectory(autotests)
-+endif()
- 
- ########### install files ###############
- install( FILES okularComicbook.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt
-new file mode 100644
-index 000000000..aaacb341a
---- /dev/null
-+++ b/generators/comicbook/autotests/CMakeLists.txt
-@@ -0,0 +1,6 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(comicbooktest.cpp
-+    TEST_NAME "comicbooktest"
-+    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
-+)
--- 
-2.33.0
-
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index c64a8d45ad61..9068188f0ca1 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -12,11 +12,9 @@
 	<use>
 		<flag name="crypt">Enable support for password-encrypted documents via <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
-		<flag name="image-backend">Enable image viewing support</flag>
 		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
 		<flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag>
 		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
-		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
 		<flag name="qml">Install Okular Qml components</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
diff --git a/kde-apps/okular/okular-23.08.5.ebuild b/kde-apps/okular/okular-23.08.5.ebuild
deleted file mode 100644
index 25f6cf6f093a..000000000000
--- a/kde-apps/okular/okular-23.08.5.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker +postscript qml share speech +tiff"
-
-# slot op: Uses Qt5::CorePrivate
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=kde-plasma/plasma-activities-${KFMIN}:5
-	media-libs/freetype
-	sys-libs/zlib
-	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-	markdown? ( >=app-text/discount-2.2.7-r1:= )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
-	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-	plucker? ( media-libs/libjpeg-turbo:= )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	qml? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
-	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-	"${FILESDIR}/${P}-implicit-vasprintf.patch" # bug 922345; pending upstream
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
-		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;"
-		-DOKULAR_UI=$(usex qml "both" "desktop")
-		$(cmake_use_find_package crypt KF5Wallet)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package image-backend KF5KExiv2)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
-	# signunsignedfieldtest fails, whatever. bug #852749
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/okular/okular-24.05.2.ebuild b/kde-apps/okular/okular-24.05.2.ebuild
index 5374239a303c..67a849e10972 100644
--- a/kde-apps/okular/okular-24.05.2.ebuild
+++ b/kde-apps/okular/okular-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff"
 
 # slot op: Uses Qt6::CorePrivate
@@ -65,6 +65,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-24.04.80-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+	"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
 )
 
 src_configure() {
diff --git a/kde-apps/okular/okular-24.08.0.ebuild b/kde-apps/okular/okular-24.08.0.ebuild
new file mode 100644
index 000000000000..6c78b54dae48
--- /dev/null
+++ b/kde-apps/okular/okular-24.08.0.ebuild
@@ -0,0 +1,100 @@
+# 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,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
+	>=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-23.12.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}-24.04.80-tests.patch" # bug 734138
+	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+	"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
+		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;LibZip;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 aa6d3e4a3075..e55589f3ff89 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,2 +1,3 @@
 DIST palapeli-23.08.5.tar.xz 2121544 BLAKE2B a441ef48ec83f37163de0a6fc03db7ca1ac8ef555e7594502b18f73ac804114a0b58c6fae7294154daef4b8fa5968e848dda4d64cbbe4ea1739eef30ad58c141 SHA512 98836ac282c2fec37608109c04a9bf1a3032d929c755572ad75ac81dfdd598ca7d33cea5a5749b64d1b0d07b8c2522ec76ac520ced76461777e1b872ea26b245
 DIST palapeli-24.05.2.tar.xz 2115532 BLAKE2B 0c92d2202f85d6194f47623f8dcb5066f1efd1eba45f3c7c41f6d0a7a31fe9efbe6508f7352d814c1d647763c0720a5aacb697340bd4886639b08433f27f3b46 SHA512 81216102beb8d6da6903e3182bfcc1f63d04cb4b53860d969c811d80149f23f6c05e568bbcc645a2fad8019bf8b31055c4dcb0db0437f73bce21bcd40459d577
+DIST palapeli-24.08.0.tar.xz 2119204 BLAKE2B 0cdbceaebb27efc9739930ba92abde8655a4ad299eb8de2290ffa630a40fd267124d7e1192fee2180efa32951f6b31661de96113dc01c0a6518e23531ce2f2e8 SHA512 010392f15f7243823f3d7225683bbbd481ce9d92ba9463c745f8bacad038d990ad6bc61d558f68d2896cc1ff68f1948fda66b521fab8123de6f74de5af507152
diff --git a/kde-apps/palapeli/palapeli-24.05.2.ebuild b/kde-apps/palapeli/palapeli-24.05.2.ebuild
index ee39917bb7bc..e250435fd53c 100644
--- a/kde-apps/palapeli/palapeli-24.05.2.ebuild
+++ b/kde-apps/palapeli/palapeli-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/palapeli/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/palapeli/palapeli-24.08.0.ebuild b/kde-apps/palapeli/palapeli-24.08.0.ebuild
new file mode 100644
index 000000000000..eeceb3c73ec2
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-24.08.0.ebuild
@@ -0,0 +1,38 @@
+# 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/parley/Manifest b/kde-apps/parley/Manifest
index f61748865e5b..865c7533edb3 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,2 +1,2 @@
-DIST parley-23.08.5.tar.xz 8610724 BLAKE2B e486826ea225a66dcc6a7023d9b8903e590b86526af395cda09b36a2d939fc1b0cbc9ea60cde9ecd561783101bb606b8af03dace64070be47268d2fda275f2c4 SHA512 2fa685a2b33fa2487d75380980c302d65dd858afd598a4ce3bd8c95b00120c7cf487b39bed500502ac87ce947b33b12199fcde1b5d3531d3ea69fce81f6015d5
 DIST parley-24.05.2.tar.xz 8420968 BLAKE2B fa39cdfd82f0f642182adc62487cf3828356981eb477baa538564bb353b54ff826115cec18c20e316b8a4232f2d5f215da9fed6db3ad8e38d82749c79e0f7b7f SHA512 8cf2b5bb65b1f4f5339ccba5d06a0b37933867ff3b3c93aa0fb3ef0b2b0c5a88742076e2c4fd1c0f9456871ff70872297800cba8a8f281127984a7908ad398b0
+DIST parley-24.08.0.tar.xz 8420860 BLAKE2B 518f1cd7bcf2cf33574022cc395a881c12c7f75137f5e8317ed2d6bf3fded250c5097c3c49adfb147eaa6c0a21b5e1f1872c07e6f71dbc57c3b69a01f2bf197f SHA512 71529ca73903c98904784fcf22facd145171fc615c56e2453905c35e69e3751dedad68ae7a7d699264571484a9e2fb2e0631d23d9f2ac838d29ffe53fdee78d6
diff --git a/kde-apps/parley/parley-23.08.5.ebuild b/kde-apps/parley/parley-23.08.5.ebuild
deleted file mode 100644
index ef764b6bc037..000000000000
--- a/kde-apps/parley/parley-23.08.5.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-i18n/translate-shell
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=kde-apps/libkeduvocdocument-${PVCUT}: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/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdeedu-data-${PVCUT}:*
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory plugins
-}
-
-pkg_postinst() {
-	optfeature "online access to translations" app-i18n/translate-shell
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/parley/parley-24.05.2.ebuild b/kde-apps/parley/parley-24.05.2.ebuild
index 0371d8773f77..c1fc4e519fc3 100644
--- a/kde-apps/parley/parley-24.05.2.ebuild
+++ b/kde-apps/parley/parley-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/parley/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="webengine"
 
 DEPEND="
diff --git a/kde-apps/parley/parley-24.08.0.ebuild b/kde-apps/parley/parley-24.08.0.ebuild
new file mode 100644
index 000000000000..2521c80f03e5
--- /dev/null
+++ b/kde-apps/parley/parley-24.08.0.ebuild
@@ -0,0 +1,65 @@
+# 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/picmi/Manifest b/kde-apps/picmi/Manifest
index b2699d6fe808..04a48f30d50e 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,2 +1,3 @@
 DIST picmi-23.08.5.tar.xz 1541784 BLAKE2B 05ef5eeee0e003c96397d34658e752f51376c58a371ee259b2c2561c8a3b4009b6951d27a5778ee1ce9ce19ba5878a1de38a949d1a3ffc0fb902a8458b35d528 SHA512 4982d7ec9271d94d6eff3e3d252376f4de2906e5df70571c64fac63ab9c0e60234360d755dcbe9900f4d40936813f5bb049cf9d5ce7522b8dec33732993823be
 DIST picmi-24.05.2.tar.xz 1514660 BLAKE2B eba3469c97f798ffc29a105e84fdbb5a9dbd28cdbcb760cbe9e4401967c8ca3b35377c1d9585f390b4fa4f9e89bc1dde37209b62d2b677e994de77bc3e2e9a6e SHA512 451004164b53e68e4adf80bcb7479ed6861a76a09ff72334c4c4782d974f9299659c69d7db301d895c35dcefaa04ec6ec2865514f603e37695e6e89c0364fb3f
+DIST picmi-24.08.0.tar.xz 1515824 BLAKE2B 4e17c61447704785d9c4e64db6e1e110bca57bb2d68f0b0683a45373e05625e6cedc51a424cf18365d0d5d82ffa8dfa6b12be59ab65161ad8ff4ad722a66cc05 SHA512 2b1bf6150a01176ab19b1a7a7c095df96277920ce64baf1e03f91a94474210179f523efeebd224323f943018e3e6b8deea6516a4cf2f54abf02c7a25f06a0e9f
diff --git a/kde-apps/picmi/picmi-24.05.2.ebuild b/kde-apps/picmi/picmi-24.05.2.ebuild
index bd22f2a8c98f..afb846704d10 100644
--- a/kde-apps/picmi/picmi-24.05.2.ebuild
+++ b/kde-apps/picmi/picmi-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/picmi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-24.08.0.ebuild b/kde-apps/picmi/picmi-24.08.0.ebuild
new file mode 100644
index 000000000000..a8871ae653d9
--- /dev/null
+++ b/kde-apps/picmi/picmi-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 8b2140c804d1..e06e99382f60 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,2 +1,3 @@
 DIST pim-data-exporter-23.08.5.tar.xz 427796 BLAKE2B 5f94e9638aa65f63c8ba8871eb7eeefc46c976f33e6db647fc15eba2383a8e2c8cf9e59205ca1480f1e331402d2aa982a42f323f1c6c75b82770c5aafc34f7b0 SHA512 5e01c826a5b97cde56b281a02f663693a5fef7e5cc666eec86fff075b230fd2ab3b28b6fff0d91234c568b293fbb80df1c79d9f8a3c8ca29659e4bb5f8cb01cb
 DIST pim-data-exporter-24.05.2.tar.xz 421244 BLAKE2B f3d8acff91999d201996a78676f3492863f338d61e72d77c7fd64ad09eefb0e13d9ff56ff141c11309eaac26e289429901d88679195032e8396bdbe8772fda4f SHA512 8693856bfc18117cdd7903571d1734a94051868e39539037f2d3a549a110952aca2d243fcedf731e6e9362e1959b2b3c8585151103f0d575aab34fdb4ccf4486
+DIST pim-data-exporter-24.08.0.tar.xz 425364 BLAKE2B 1e9a0df96b3e3868b38b7ecbe417fc7d084a1d2c30c0666919aa21ee5af98ca9d84d82892cdfe3a338ca41760b87b90e642de87024400b0f0fdc88da17a67c87 SHA512 745d2be3e10b9ff14b99b4f66d2c7dd5fe4ef1bfcd6c41ddd26ab61e1a48fda0f1aa0ef5fd92487cb31ab1c1f7e616083f48c69e27358be5114f927fde8f7b93
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-24.05.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-24.05.2.ebuild
index 022a1ca702cd..3cd50bfa60c0 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-24.05.2.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-24.05.2.ebuild
@@ -16,7 +16,7 @@ https://userbase.kde.org/KMail/Backup_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="telemetry"
 
 RESTRICT="test" # 11 out of 21 tests fail...
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-24.08.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-24.08.0.ebuild
new file mode 100644
index 000000000000..3c38fd75be00
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-24.08.0.ebuild
@@ -0,0 +1,58 @@
+# 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="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 ce2cc2e3146d..599d78a781c4 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,2 +1,3 @@
 DIST pim-sieve-editor-23.08.5.tar.xz 466164 BLAKE2B e6b9709c816e6beab19cd461c513d9b185940a6228a3a57fee49ba1a0c81e5615bbf156b307db6b4fbb19dd80f955bc7e7a40e763e060138f40a787d31084142 SHA512 edc8e32dc5660603bcc440c8f9c2dafcbe6cd08d191d726df11e9060787e013f6adf08aa0bd811cea77ab14f1941deb8190cd42e9a28c9c4c64b6687e1558b19
 DIST pim-sieve-editor-24.05.2.tar.xz 464368 BLAKE2B 6ba2f4f53f134abe1259e0f9ddbcbba97ff0221073ac4e116034f0956a4bd45c23d2206f38625ae5c30a3dd17c4e5998012c75c69283695f98df4f0daadc6f17 SHA512 2f506f74f827fc9e365b338c48cfaeb546bb839a0e5bf40ceac92039400d0a471f31566707dfedbff4562915ca472738bfcf919e53149cd2533913a81c337d69
+DIST pim-sieve-editor-24.08.0.tar.xz 469092 BLAKE2B 47158dcfc79ea382b32070df964e99136be9cd53b42859e6e76d525490bbb038b1f0e8c14c5b121c43b43444b087933281faa47d89f15d75983aaa8e6b998b96 SHA512 9fa0311b4db41ce175fd31752b534b4d159c8befb1a47e69a56d9f365e12a440917b6bb5f8e29114c249bac0f15bc2fdce8d87f7f39e279ae010dadaab798d7d
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.05.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.05.2.ebuild
index 02aecfa13bda..5451f9a7063f 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.05.2.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.05.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-24.08.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.08.0.ebuild
new file mode 100644
index 000000000000..45ba065af1ae
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-24.08.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+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 c758b2608150..c673bd053d01 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,2 +1,3 @@
 DIST pimcommon-23.08.5.tar.xz 349196 BLAKE2B 66d525d68108ecba772cb4f145da893a3f739f3729cd458c62fcc4affaaed8776a4dc558db25fb86597e0842738f2820af622efe6c24e4ed344d43477d5795db SHA512 36464dc23f601d7ffb4cd85be9bc48c15bf610b59de635664ba01d50c914e58ce78c66f0ba33c4db245fd063d721b7b918fd39ab0e466a307a52f7b32d627ae3
 DIST pimcommon-24.05.2.tar.xz 349596 BLAKE2B 5b000afc625f26219fb03360d4e26ba14ef34de3a186e1003abacd479aa822f72439ec055612013fa2714f285d6b1f1fe739c498fb73ec4e5200ff92aeece469 SHA512 626799e69cc12d9d53cd8754e9dc8899729d50d340a3bc4cee44ebf145d83451fb5f2ac5af85621123318784c1cc5da7a6c207f53e5eb7ce91cfd4a022d01135
+DIST pimcommon-24.08.0.tar.xz 350212 BLAKE2B 68613f20c792f51752e95739560d4c837f68d59a05cf86b3f04b5f4a627f2e178d7230f2e1c0ec98ff8c202de50604dcf2a6628d54072faca3c4d8a0cba46b8e SHA512 5907285f4937b82be5567083b20acdbd7e6d7ae31a3e072e5c3c0a7b8ce28cba979d74990afc691e336e244aaf06e92eb806d53c770c2149ca507bba08269e17
diff --git a/kde-apps/pimcommon/pimcommon-24.05.2.ebuild b/kde-apps/pimcommon/pimcommon-24.05.2.ebuild
index c01e4ab52616..f504f51dabcc 100644
--- a/kde-apps/pimcommon/pimcommon-24.05.2.ebuild
+++ b/kde-apps/pimcommon/pimcommon-24.05.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/pimcommon/pimcommon-24.08.0.ebuild b/kde-apps/pimcommon/pimcommon-24.08.0.ebuild
new file mode 100644
index 000000000000..291ada805e38
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-24.08.0.ebuild
@@ -0,0 +1,55 @@
+# 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.5.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=""
+
+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
+"
+DEPEND="${RDEPEND}"
+
+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 939214c7e933..a68055724ccf 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1 +1,2 @@
 DIST poxml-24.05.2.tar.xz 45140 BLAKE2B 95f873201d8229a90e1366fada52d94ba5f26b283bd76c85281fbfdf4454aea09ba9d93ec5d02f958e55513a58887ac3b2bf531f8d3483ba419455adea4ea720 SHA512 5ba73188b791dd04f7747e64a97617c7f60de449885a0521253ef42c8ec3dd4441524e4ea7ef5786dfb6fd864a7e0dd8de931f9023da59b8d35fd1e9705f2096
+DIST poxml-24.08.0.tar.xz 44384 BLAKE2B 59733a36c3c52fb688e82257cad848489e5ab263a9f231278d92a377fe8c9d13b943873001e4829d1156048b2a2b1db6b371479da22c7a99e315a4a6187d0308 SHA512 1370ec04a05b460564430b7bbc0a34f7ddad69632135bae9a861c22af798c761d228407a3d8dd32e99bbdaa9d67c3c0d13712e8c2ae647469687b5930a85b2fd
diff --git a/kde-apps/poxml/poxml-24.08.0.ebuild b/kde-apps/poxml/poxml-24.08.0.ebuild
new file mode 100644
index 000000000000..81fcf0c70c29
--- /dev/null
+++ b/kde-apps/poxml/poxml-24.08.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+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 9369d11bd765..a11d1f5382f0 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1 +1,2 @@
 DIST rocs-24.05.2.tar.xz 1566648 BLAKE2B b6d14f60358e2dff5181e097d7f0e24bcdd35a87439b672787058162f13c9c89ef499a30feece9e7d55626dcba3b5d725b26a1fcb0c4d2638e0468f8008e06a7 SHA512 3b2cc19891920381fa60ea1ced31bb2c23cf7e6cdc5258f45ae98357a34c72af4763c526d1bdc1436134fe21a488766cf62774c99045333e2e30b8611ac77cfc
+DIST rocs-24.08.0.tar.xz 1566472 BLAKE2B 36e1aa2dc56737b8c47622722145c6c333c0337ed3c6db5361f44fced3298120a36994ff96662e0b86b4d7cf17d92907f628f0f881193c3e3a910a096da76f3e SHA512 80cfe25611aee9ab40d9390a66f7e2debd0bee6e9d2c26e59526c1ea5b0f62476dd95419f608a5741d6770f66bad843aa8b5a4c430aeb9ffa22d8c2134b9519b
diff --git a/kde-apps/rocs/rocs-24.08.0.ebuild b/kde-apps/rocs/rocs-24.08.0.ebuild
new file mode 100644
index 000000000000..fffe26049964
--- /dev/null
+++ b/kde-apps/rocs/rocs-24.08.0.ebuild
@@ -0,0 +1,48 @@
+# 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/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index d57ece7b8180..f6ae90cc46ac 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,2 +1,2 @@
-DIST signon-kwallet-extension-23.08.5.tar.xz 11220 BLAKE2B f29733eb7c816862b6e9d4f6c068278f3b4e3969440f35639d648ba91e84b5acd5cff2d7a58a5f7019d87ac7e92e96dbc4d33320947bfc8989811163eca7b0aa SHA512 8df03b04bbec03aed51a332a3168bd614f9642df1e0b44275bf5b32089e64895083083f0f7b51a4a111bb5ddd8fdd0e751c1a886e56591b3b6af374659b18bdd
 DIST signon-kwallet-extension-24.05.2.tar.xz 11280 BLAKE2B ebacb69ee83d9e1a88214c723364c0fe16f62bae3cdb048a92995c8ff180994b486595f3554944487661717533c3efdd1e2473d8e94e5ba88cb24880763498b3 SHA512 169d62c19d165387ca8aba11f31f38e0c5e3ebb1c06a31f74fa617bfc6843bda4a8f020d651fdfebfc7ac498efa27cb2fbad9330b40b0f0035cf431cac476166
+DIST signon-kwallet-extension-24.08.0.tar.xz 11304 BLAKE2B 9e75163a77092c46c19352821d6187f30afdedae50dd691bc38732dfc380d010a44a3c7a165f0e4e2ca1a52f8701d818d2dc84857504bc6d5c3e9bcb987b84a0 SHA512 8b267b21fac6d4b21abf231d28c2b99d000fb9ad4ccf5c9fe7dc285f87a2d0be258e9a8ee452c08fe494ea05d9294067978ada1531ad18fcd707b1feaa75bfee
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-23.08.5.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-23.08.5.ebuild
deleted file mode 100644
index b2550e96e4c9..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-23.08.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
-
-KFMIN=5.106.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://accounts-sso.gitlab.io/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	net-libs/signond[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.05.2.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.05.2.ebuild
index a6de86f28c37..3fb89055d339 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.05.2.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.05.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:6
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.08.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.08.0.ebuild
new file mode 100644
index 000000000000..eb997f414e7e
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-24.08.0.ebuild
@@ -0,0 +1,20 @@
+# 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/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 36b2e2cd4f38..5b92a8cc4252 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,2 +1,2 @@
-DIST spectacle-23.08.5.tar.xz 1353080 BLAKE2B 22679e37ae3cdcd526853f91e4f427a6b24c8b366c80533a2fe4c727896a52ab25a6055f0d931cab2365cd40f5eb2ccf3bba3bb60e8319902dc1dd83d1d5ccf4 SHA512 4dce51d1932104c7f52cd7f0f306065f0d9bb7a57dc79603850ad6f9283729698324ee358c68f63b9ed306b19ca016a291a0d13e8053a14493283884e9c2c505
 DIST spectacle-24.05.2.tar.xz 1357104 BLAKE2B cfb7028e610e5fb4243de487d3b29df38c56157056cda073eee099f14ce9f94d58b512782f22dc24b2bede903271c63edc31bdd8cbf1767f63ab6cf970760205 SHA512 e6f868857d5518180c617fcc9139f4ac04f8d9811536c444cd28ffccf8baf22599f3d74a4f2dc410a761fbb759d1cc2f57beff33220313750a90e7b940ffdbf1
+DIST spectacle-24.08.0.tar.xz 1546740 BLAKE2B 24edec5ded49c73d767b7dff96e6581bebab482b8e9186372c521f46ea92934e342842a8fd17bdaf25092053efd4d77c8e33e09d9c11f2af46b2fc16aa7d9e16 SHA512 89ba54a284d7f7c36b1c699a7c5f8d7dc53ce7892c08370d4528f96e52a91096d28e669356a09e6cb6daf0ad05577dcafd789ca06e3ff2591e18cd49baa97e56
diff --git a/kde-apps/spectacle/spectacle-23.08.5.ebuild b/kde-apps/spectacle/spectacle-23.08.5.ebuild
deleted file mode 100644
index bd3b99bdf996..000000000000
--- a/kde-apps/spectacle/spectacle-23.08.5.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="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Screenshot capture utility"
-HOMEPAGE="https://apps.kde.org/spectacle/"
-
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="share"
-
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kde-plasma/kpipewire:5
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.9
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-24.05.2.ebuild b/kde-apps/spectacle/spectacle-24.05.2.ebuild
index a4bedd7409c2..d605c8983ffe 100644
--- a/kde-apps/spectacle/spectacle-24.05.2.ebuild
+++ b/kde-apps/spectacle/spectacle-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="share"
 
 # slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/spectacle/spectacle-24.08.0.ebuild b/kde-apps/spectacle/spectacle-24.08.0.ebuild
new file mode 100644
index 000000000000..6118467fe08d
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-24.08.0.ebuild
@@ -0,0 +1,71 @@
+# 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]
+	>=dev-qt/qtdeclarative-${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 b61b4261726b..43337fe7159e 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1 +1,2 @@
 DIST step-24.05.2.tar.xz 984052 BLAKE2B d54a2757175b51831f608768ba3b9887e6b3cf2c77822b68895df5f0fa3675342d7126e804b22025347c49c2d72422f9514ea6ae83e84f422d0de23cfb8f0074 SHA512 f1cf7844c0e140b78db7027e7201ed15c3f2f287ac3bef69ba03e97d0432db8745427c68c776476c8db33c0c4a78cbc70e53b19f0ac8dd579425665d98a2675e
+DIST step-24.08.0.tar.xz 987628 BLAKE2B c994d0b270cf5c46bef769e4abe71350f9062527646144fc8b45d39a64de7c8a2eb0f511a5d10ad53d1660715754437b8869eb621b3d43622e1ac2ea468ec71d SHA512 a406e88143f39661623e5ae1e7fb12b64bc0c8b239af7f2537a67603563f6edb0e2c976aa83d241fc2518fbae964eea9b19820ff2a07b759e19df59c09069e49
diff --git a/kde-apps/step/step-24.08.0.ebuild b/kde-apps/step/step-24.08.0.ebuild
new file mode 100644
index 000000000000..c22b752c1537
--- /dev/null
+++ b/kde-apps/step/step-24.08.0.ebuild
@@ -0,0 +1,53 @@
+# 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="Interactive physics simulator"
+HOMEPAGE="https://apps.kde.org/step/ https://edu.kde.org/step/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+gsl +qalculate"
+
+DEPEND="
+	>=dev-cpp/eigen-3.2:3
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${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/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sci-libs/cln
+	gsl? ( sci-libs/gsl:= )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+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 34bbe99d03bc..6697d9fab580 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,2 +1,2 @@
-DIST svgpart-23.08.5.tar.xz 28720 BLAKE2B f161d95e351286ac2d0c90e06504471622e2e717d9bfc7d78ba709803fda5218ee92bb6f8d30224963c4f690976bc1f6d3efe0570c7811f59e2d3342385ed74d SHA512 2bd0a97eba7d02372defa22b253c8ecbf21a8bf1038b7fb24812ec7a45336dbf26eb1606d363646cc1fab37524798d02432383f09dac1f3ee2a76cf32024e6be
 DIST svgpart-24.05.2.tar.xz 29808 BLAKE2B fee2d23ef966b8c1d548c65eee18b61e2bbd545ae76302643bb9427c060cdef3656d941cef7edcb080c185f1cbf6a5fafe043d47b0fe9fe0572a2dffcd307f79 SHA512 3bb2c520a11939ef2fe3ceee34c06bba8e9650584cc4b2937237cb41ced55ae2813f240737f567faf61c334e3d75408a55ddd39b57c11691ef9947920b9c33b2
+DIST svgpart-24.08.0.tar.xz 30092 BLAKE2B fb5a97935b8735c9b3917665d4aec68d6cd9dfd71ff7c0ff185edf2ffe9b4b3207fa25fdabafd26a7829b1b87637804e9e8f526750c726a74b046659a593b98e SHA512 7f090832e00adcaf28a9a115d1d631f6e48867ca8d6d543e1f3a646920fe1f9621f7e30ca7337aec5b2ea993aabd4a4d535b678aa4c3879d79a1642cd86735a1
diff --git a/kde-apps/svgpart/svgpart-23.08.5.ebuild b/kde-apps/svgpart/svgpart-23.08.5.ebuild
deleted file mode 100644
index 8f2e8d861e5a..000000000000
--- a/kde-apps/svgpart/svgpart-23.08.5.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=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Kpart for viewing SVGs"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/svgpart/svgpart-24.05.2.ebuild b/kde-apps/svgpart/svgpart-24.05.2.ebuild
index 908931ab06c8..58a593b8bccf 100644
--- a/kde-apps/svgpart/svgpart-24.05.2.ebuild
+++ b/kde-apps/svgpart/svgpart-24.05.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/svgpart/svgpart-24.08.0.ebuild b/kde-apps/svgpart/svgpart-24.08.0.ebuild
new file mode 100644
index 000000000000..d01149414c71
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-24.08.0.ebuild
@@ -0,0 +1,26 @@
+# 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/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 894587996c0a..6d2314324143 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,2 +1,3 @@
 DIST sweeper-23.08.5.tar.xz 399660 BLAKE2B 9af6fd1a5e0f49e18d9876404090a06078491ef16f1b1c0480322648e293d7aab6a4b5ac006c7d223ecf917c7207783f6b20198c2fea487f365e8f598a2e25bd SHA512 3a42824878da4e7ba1fbb13c5ad44f5993de8156997e073962f13eae86bdf30fd0764d54eb2342a709d84ba741d2e67be8b5950a5009bd7b7620a99695fcdfa6
 DIST sweeper-24.05.2.tar.xz 382280 BLAKE2B d1f30bb9b82d3469cd8d79a48a65093de044053631639f9b46588c91327d847d9c9a49733d0ffa446429f7901f94c7818a917699523fa3ab7dcb0819f797e43f SHA512 5ac63a90ecda4064028d694e78da74a0f0be018b48d450e0bf3c5be6330db86c22a34615bf18bebcb1969ab2bf8685a5d2b12a2a48ac84160ae0ca53c9de5805
+DIST sweeper-24.08.0.tar.xz 382672 BLAKE2B 5c45aa62cad59fadf16d0dbd5f6bc155905b4a45f716ddeabf5d41eb24bb5438c9eb7dede075ffbf86c4829a829f279e4be6cc158490daa81ec3f2716b8ff07e SHA512 4fc80ac7fe4b241cfac249cd90f96a5cee38ca0142898d3215c0e867f3f796ac578bba227aa2ff899e70e9f87bca55579c48c714634faada65bc25abbc37f199
diff --git a/kde-apps/sweeper/sweeper-24.05.2.ebuild b/kde-apps/sweeper/sweeper-24.05.2.ebuild
index 1b7bcb10f8eb..963e018f2b77 100644
--- a/kde-apps/sweeper/sweeper-24.05.2.ebuild
+++ b/kde-apps/sweeper/sweeper-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/sweeper/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/sweeper-24.08.0.ebuild b/kde-apps/sweeper/sweeper-24.08.0.ebuild
new file mode 100644
index 000000000000..e9e264d4a043
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-24.08.0.ebuild
@@ -0,0 +1,32 @@
+# 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/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
deleted file mode 100644
index e64ffdb416c4..000000000000
--- a/kde-apps/thumbnailers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
diff --git a/kde-apps/thumbnailers/metadata.xml b/kde-apps/thumbnailers/metadata.xml
index 419b2d426170..ca27dcc0ab13 100644
--- a/kde-apps/thumbnailers/metadata.xml
+++ b/kde-apps/thumbnailers/metadata.xml
@@ -10,7 +10,8 @@
 	</upstream>
 	<use>
 		<flag name="blender">Enable blender thumbnail generation using <pkg>kde-frameworks/karchive</pkg></flag>
+		<flag name="gettext">Enable PO file thumbnail generation using <pkg>kde-apps/kdesdk-thumbnailers</pkg></flag>
 		<flag name="mobi">Enable mobipocket thumbnail generation using <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag>
-<!--		<flag name="video">Enable video thumbnail generation using <pkg>kde-apps/ffmpegthumbs</pkg></flag> -->
+		<flag name="video">Enable video thumbnail generation using <pkg>kde-apps/ffmpegthumbs</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/thumbnailers/thumbnailers-23.08.5-r1.ebuild b/kde-apps/thumbnailers/thumbnailers-23.08.5-r1.ebuild
deleted file mode 100644
index 0ff1d0b9f017..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-23.08.5-r1.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="Metapackage for KIO thumbnail generators"
-HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="blender mobi pdf raw"
-
-RDEPEND="
-	blender? ( >=media-gfx/kio-blender-thumbnailer-${PV}:5 )
-	mobi? ( >=media-gfx/kio-mobi-thumbnailer-${PV}:5 )
-	pdf? ( >=media-gfx/kio-ps-thumbnailer-${PV}:5 )
-	raw? ( >=media-gfx/kio-raw-thumbnailer-${PV}:5 )
-"
diff --git a/kde-apps/thumbnailers/thumbnailers-23.08.5-r2.ebuild b/kde-apps/thumbnailers/thumbnailers-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..2261b1258057
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-23.08.5-r2.ebuild
@@ -0,0 +1,21 @@
+# 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="5"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="blender gettext mobi pdf raw video"
+
+RDEPEND="
+	blender? ( >=media-gfx/kio-blender-thumbnailer-${PV}:5 )
+	gettext? ( >=kde-apps/kdesdk-thumbnailers-${PV}:5 )
+	mobi? ( >=media-gfx/kio-mobi-thumbnailer-${PV}:5 )
+	pdf? ( >=media-gfx/kio-ps-thumbnailer-${PV}:5 )
+	raw? ( >=media-gfx/kio-raw-thumbnailer-${PV}:5 )
+	video? ( >=kde-apps/ffmpegthumbs-${PV}:5 )
+"
diff --git a/kde-apps/thumbnailers/thumbnailers-23.08.5.ebuild b/kde-apps/thumbnailers/thumbnailers-23.08.5.ebuild
deleted file mode 100644
index a185cca4e8d9..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-23.08.5.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
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Thumbnail generators for Mobipocket, PDF/PS and RAW files"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="mobi raw"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	raw? (
-		>=kde-apps/libkdcraw-${PVCUT}:5
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-"
-RDEPEND="${DEPEND}
-	mobi? ( !<kde-apps/kdegraphics-mobipocket-21.12.50:5[thumbnail] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MOBIPOCKET=$(usex !mobi)
-		$(cmake_use_find_package raw KF5KExiv2)
-		$(cmake_use_find_package raw KF5KDcraw)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/thumbnailers/thumbnailers-24.05.2-r1.ebuild b/kde-apps/thumbnailers/thumbnailers-24.05.2-r1.ebuild
deleted file mode 100644
index 9e352574cd7d..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-24.05.2-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
-
-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 mobi pdf raw" # video
-
-RDEPEND="
-	blender? ( >=media-gfx/kio-blender-thumbnailer-${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.05.2-r2.ebuild b/kde-apps/thumbnailers/thumbnailers-24.05.2-r2.ebuild
new file mode 100644
index 000000000000..cf4552096bac
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-24.05.2-r2.ebuild
@@ -0,0 +1,21 @@
+# 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.08.0.ebuild b/kde-apps/thumbnailers/thumbnailers-24.08.0.ebuild
new file mode 100644
index 000000000000..a5a6f0366483
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-24.08.0.ebuild
@@ -0,0 +1,21 @@
+# 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 ~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 43c2913bdd45..a46de43196d9 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1 +1,2 @@
 DIST umbrello-24.05.2.tar.xz 5616176 BLAKE2B 5a86565ea81ebcc1578a231920c3af71a8236d75f1e2e43d729ac19e39e49835a76bdcbe68d91f89923de2fdb1ec41e896be07ef743e44473bfec89957c1a920 SHA512 1c35893cf48960289ebbac9a2f26a0b7430f5dcb8e54a9aa5e539a160edd43068fe6e69a673a799feee46079188dfd34ecb11af05a852a35d9f3b066a3e82e74
+DIST umbrello-24.08.0.tar.xz 5615964 BLAKE2B 0539ca53743f57b1d543862a3e450d6aa2b28c652f34989945660a7086fc12c2667b58d9722a87b2e287dac673793e0d0b44e66026c6f9e22fe9b9332e4f7bc5 SHA512 50c2d35cbe33fad39e55ddfaa4d64f9899596dd8eca6d4c45f1b7b04e1320c7de422ae07647b2895d7f4c6e85a408f0a043d4b277144d76cde860dbef72150de
diff --git a/kde-apps/umbrello/umbrello-24.08.0.ebuild b/kde-apps/umbrello/umbrello-24.08.0.ebuild
new file mode 100644
index 000000000000..e988cb09e22e
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-24.08.0.ebuild
@@ -0,0 +1,71 @@
+# 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}-23.03.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 59e6d082b96e..a0091991dafc 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,2 +1,3 @@
 DIST yakuake-23.08.5.tar.xz 435320 BLAKE2B 5d84033bbcf854a7f71bdbc5c5563358608f42d31af656b429da2a2975ad8cc67d512e5bf57577615e0f1e822868143022b2cc545ea4ebd6cabd35b4ecc0fa52 SHA512 264e98a764d21be2182b04acb689ad8ade5b1b402582cd1f6deb2141088173adf1c64c9751a4a07677b1bcea1f376c220f14075d72f630b0409a0e2d4ff9f92e
 DIST yakuake-24.05.2.tar.xz 385688 BLAKE2B fff653519dacfd09aef9deadef1ec5a99a36b722c779dc41ea471c9668df5cff8ccf404fc8aa2cf68cf3ea3d753802b3c8bda2621bf037585b02b126fc098c16 SHA512 9e88c3abacab7185da4a87f455d1646fa20ba8909aee41ce846aba50aa4293437865e4e28a6e232745e355df0944b1d24d633072538e56a20e8c98f5cdcc4ba5
+DIST yakuake-24.08.0.tar.xz 389832 BLAKE2B 63f6d6c2dee3df52249b5bccca18747ec695c968855bd4a22c941a5722e652275b2778b430825a36089b02d933d9516f2fa3cfcc3c1a4a3cf987af59c4003dfa SHA512 ca59033fddc458d4433d6512fdb4f081cb800675c88c902baa42a95e336ff11fc2197f5b133901960ac91666aa405816a822cdcdc26c0cc2039f2c1620e203d8
diff --git a/kde-apps/yakuake/yakuake-24.05.2.ebuild b/kde-apps/yakuake/yakuake-24.05.2.ebuild
index 46d05cb49cbb..1a9a28d92b44 100644
--- a/kde-apps/yakuake/yakuake-24.05.2.ebuild
+++ b/kde-apps/yakuake/yakuake-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/yakuake/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="absolute-position"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-apps/yakuake/yakuake-24.08.0.ebuild b/kde-apps/yakuake/yakuake-24.08.0.ebuild
new file mode 100644
index 000000000000..63ae49fac7ee
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# 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-frameworks/attica/attica-6.5.0.ebuild b/kde-frameworks/attica/attica-6.5.0.ebuild
index 967b159c0b31..12e453630481 100644
--- a/kde-frameworks/attica/attica-6.5.0.ebuild
+++ b/kde-frameworks/attica/attica-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[network]"
diff --git a/kde-frameworks/baloo/baloo-5.116.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..6973638d2d12
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.116.0-r1.ebuild
@@ -0,0 +1,45 @@
+# 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-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="kf6compat"
+
+RESTRICT="test" # bug 624250
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-frameworks/baloo:6 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_INDEXER_SERVICE=$(usex !kf6compat)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/baloo/baloo-6.5.0.ebuild b/kde-frameworks/baloo/baloo-6.5.0.ebuild
index e2e2066e2b2c..19cbf4be852a 100644
--- a/kde-frameworks/baloo/baloo-6.5.0.ebuild
+++ b/kde-frameworks/baloo/baloo-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for searching and managing metadata"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/bluez-qt-6.5.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-6.5.0.ebuild
index 528fd590c568..950291cf7a25 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-6.5.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bugs 668196, 924708; they all hang
diff --git a/kde-frameworks/breeze-icons/breeze-icons-6.5.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-6.5.0.ebuild
index 9c4e8773f0c1..9b09a11f173c 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-6.5.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit cmake frameworks.kde.org python-any-r1 xdg
 DESCRIPTION="Breeze SVG icon theme"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 7aa6482a2197..c6c7d36d9a58 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1 @@
-DIST extra-cmake-modules-5.116.0.tar.xz 332248 BLAKE2B 3a9b9afc47279c3f3242f5cc8271596533be347374b59db6af49b6b08368917be4321f33d3721d3a3328f52ad9347556b40611702d7b8c52f86a92c7a23613fe SHA512 c0d73c2a6a155e3f03292335c994ec940892c751334e2336b42640016ebde5a9d72efe6fc6a31b7349504142da01e5974539b82d1e2aa967f448ae3ae80859f6
 DIST extra-cmake-modules-6.5.0.tar.xz 340948 BLAKE2B 104e02638042498e9fae486542a30a8f454c11d5c8c7099c10a88e0c34cbfffff1563905a79705ce59a5448af19479ec130bc23182138083e5ff06e312f4c488 SHA512 70150c13f0eb85924d5f80a40efb8981227915c497980bfa8e5622f2cca7b6cad4e0e5ebe0b8a34cdf4aabb33dee66073926dd5ea3a23229823605b0d2f29aee
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild
deleted file mode 100644
index b3f9beee0ee6..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-QTMIN=5.15.9
-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]"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-	test? (
-		>=dev-qt/linguist-tools-${QTMIN}:5
-		>=dev-qt/qtcore-${QTMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
-	"${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
-	"${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256
-)
-
-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)
-	)
-
-	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.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild
index cfe32a36a87c..ed1f9497b3a5 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild
@@ -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/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild
deleted file mode 100644
index 37cec1eb1db8..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-QTMIN=6.6.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]"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		>=dev-qt/qttools-${QTMIN}:6[assistant]
-	)
-	test? (
-		>=dev-qt/qttools-${QTMIN}:6[linguist]
-		>=dev-qt/qtbase-${QTMIN}:6
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
-	"${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256
-	"${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.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)
-	)
-
-	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/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
deleted file mode 100644
index 06406a7eaf6d..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-See also: https://phabricator.kde.org/D25812
-
-Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744136
-BUG: 387753
----
- modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 18 deletions(-)
-
-diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
-index 0ee5665e..d6e1f14c 100644
---- a/modules/ECMFindQmlModule.cmake.in
-+++ b/modules/ECMFindQmlModule.cmake.in
-@@ -7,27 +7,36 @@
- include(FindPackageHandleStandardArgs)
- include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
- 
--if (QT_MAJOR_VERSION EQUAL "5")
--    include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
--    ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
--    find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
--elseif (QT_MAJOR_VERSION EQUAL "6")
--    find_package(Qt6 COMPONENTS QmlTools REQUIRED)
--    get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
--endif()
--
--if(NOT QMLPLUGINDUMP_PROGRAM)
--    message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
--endif()
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
- 
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
--
--if(ExitCode EQUAL 0)
-+if(ECM_DISABLE_QMLPLUGINDUMP)
-+    message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
-     set(@GENMODULE@_FOUND TRUE)
--    set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    set(@GENMODULE@_VERSION @VERSION@)
- else()
--    message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
--    set(@GENMODULE@_FOUND FALSE)
-+
-+    if (QT_MAJOR_VERSION EQUAL "5")
-+        include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
-+        ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
-+        find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
-+    elseif (QT_MAJOR_VERSION EQUAL "6")
-+        find_package(Qt6 COMPONENTS QmlTools REQUIRED)
-+        get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
-+    endif()
-+
-+    if(NOT QMLPLUGINDUMP_PROGRAM)
-+        message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-+    endif()
-+
-+    execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
-+
-+    if(ExitCode EQUAL 0)
-+        set(@GENMODULE@_FOUND TRUE)
-+        set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    else()
-+        message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-+        set(@GENMODULE@_FOUND FALSE)
-+    endif()
- endif()
- 
- find_package_handle_standard_args(@GENMODULE@
--- 
-2.35.1
-
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-6.5.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-6.5.0.ebuild
index 501c4beb6662..b3ea7e79ee3c 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-6.5.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running Plasma environment
diff --git a/kde-frameworks/karchive/karchive-6.5.0.ebuild b/kde-frameworks/karchive/karchive-6.5.0.ebuild
index 5fd699e3efa7..8f39c613d288 100644
--- a/kde-frameworks/karchive/karchive-6.5.0.ebuild
+++ b/kde-frameworks/karchive/karchive-6.5.0.ebuild
@@ -9,7 +9,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+zstd"
 
 DEPEND="
diff --git a/kde-frameworks/kauth/kauth-6.5.0.ebuild b/kde-frameworks/kauth/kauth-6.5.0.ebuild
index f8c77b5ddc13..9c91fae5a6d1 100644
--- a/kde-frameworks/kauth/kauth-6.5.0.ebuild
+++ b/kde-frameworks/kauth/kauth-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+policykit"
 
 RDEPEND="
@@ -31,6 +31,8 @@ PDEPEND="policykit? ( kde-plasma/polkit-kde-agent:* )"
 CMAKE_SKIP_TESTS=(
 	# KAuthHelperTest test fails, bug 654842
 	KAuthHelperTest
+	# bug 938505
+	KAuthFdTest
 )
 
 src_configure() {
diff --git a/kde-frameworks/kbookmarks/kbookmarks-6.5.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-6.5.0.ebuild
index 10c29a443b62..5687ed4c0dd7 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-6.5.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-6.5.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-6.5.0.ebuild
index 539b0293ef2c..2b25ff5c7457 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-6.5.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library for interfacing with calendars"
 
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcmutils/kcmutils-6.5.0.ebuild b/kde-frameworks/kcmutils/kcmutils-6.5.0.ebuild
index c6d901446229..a573cb6b2d94 100644
--- a/kde-frameworks/kcmutils/kcmutils-6.5.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to work with KDE System Settings modules"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcodecs/kcodecs-6.5.0.ebuild b/kde-frameworks/kcodecs/kcodecs-6.5.0.ebuild
index 6d7a320f9c7d..08dd373b7d70 100644
--- a/kde-frameworks/kcodecs/kcodecs-6.5.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for manipulating strings using various encodings"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-6.5.0.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-6.5.0.ebuild
index 9a26d1fc1e63..843e12270a92 100644
--- a/kde-frameworks/kcolorscheme/kcolorscheme-6.5.0.ebuild
+++ b/kde-frameworks/kcolorscheme/kcolorscheme-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcompletion/kcompletion-6.5.0.ebuild b/kde-frameworks/kcompletion/kcompletion-6.5.0.ebuild
index 74670775edd9..808d778260ec 100644
--- a/kde-frameworks/kcompletion/kcompletion-6.5.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kconfig/kconfig-6.5.0.ebuild b/kde-frameworks/kconfig/kconfig-6.5.0.ebuild
index 920387489e87..419768f1c460 100644
--- a/kde-frameworks/kconfig/kconfig-6.5.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for reading and writing configuration"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="dbus qml"
 REQUIRED_USE="test? ( qml )"
 
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.5.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.5.0.ebuild
index 0783a3e4d35e..80dfaa5cd97f 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.5.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 CMAKE_SKIP_TESTS=(
diff --git a/kde-frameworks/kcontacts/kcontacts-6.5.0.ebuild b/kde-frameworks/kcontacts/kcontacts-6.5.0.ebuild
index 9cda8e0edebb..0cee1d812010 100644
--- a/kde-frameworks/kcontacts/kcontacts-6.5.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Address book API based on KDE Frameworks"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-6.5.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-6.5.0.ebuild
index 9be143aa113a..714d1a354076 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-6.5.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-6.5.0.ebuild
@@ -9,7 +9,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="dbus"
 
 DEPEND="
diff --git a/kde-frameworks/kcrash/kcrash-6.5.0.ebuild b/kde-frameworks/kcrash/kcrash-6.5.0.ebuild
index 7d1679715647..b9c22601c760 100644
--- a/kde-frameworks/kcrash/kcrash-6.5.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for intercepting and handling application crashes"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # requires running Plasma environment
diff --git a/kde-frameworks/kdav/kdav-6.5.0.ebuild b/kde-frameworks/kdav/kdav-6.5.0.ebuild
index dc51805cf7a0..827771a409aa 100644
--- a/kde-frameworks/kdav/kdav-6.5.0.ebuild
+++ b/kde-frameworks/kdav/kdav-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="DAV protocol implemention with KJobs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-6.5.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-6.5.0.ebuild
index fadd6ddfb3cf..a2e7810447b2 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-6.5.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-frameworks/kdeclarative/kdeclarative-6.5.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-6.5.0.ebuild
index 020efd148754..231a0688bb3e 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-6.5.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kded/kded-6.5.0.ebuild b/kde-frameworks/kded/kded-6.5.0.ebuild
index 505dcb21b8b3..fc48c662db9f 100644
--- a/kde-frameworks/kded/kded-6.5.0.ebuild
+++ b/kde-frameworks/kded/kded-6.5.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Central daemon of KDE workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-frameworks/kdesu/kdesu-6.5.0.ebuild b/kde-frameworks/kdesu/kdesu-6.5.0.ebuild
index 69b3aef23ba4..6e1c907823ba 100644
--- a/kde-frameworks/kdesu/kdesu-6.5.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to handle super user actions"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/kdnssd-6.5.0.ebuild b/kde-frameworks/kdnssd/kdnssd-6.5.0.ebuild
index 6ccc600538c4..044f4a752a1d 100644
--- a/kde-frameworks/kdnssd/kdnssd-6.5.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="zeroconf"
 
 DEPEND="
diff --git a/kde-frameworks/kdoctools/kdoctools-6.5.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.5.0.ebuild
index 4b24d23198cf..31a2e6242b76 100644
--- a/kde-frameworks/kdoctools/kdoctools-6.5.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/kde-frameworks/kf-env/kf-env-6.ebuild b/kde-frameworks/kf-env/kf-env-6.ebuild
index 204547c3be3f..ece89c4d8975 100644
--- a/kde-frameworks/kf-env/kf-env-6.ebuild
+++ b/kde-frameworks/kf-env/kf-env-6.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-6.5.0-r1.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-6.5.0-r1.ebuild
index d6db84563ad5..b8add8a48409 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-6.5.0-r1.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-6.5.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org optfeature python-any-r1
 DESCRIPTION="Library for extracting file metadata"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="epub exif ffmpeg mobi pdf taglib"
 
 RESTRICT="test"
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.116.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..e6902fde0cc6
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.116.0-r1.ebuild
@@ -0,0 +1,52 @@
+# 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 to handle global shortcuts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="kf6compat"
+
+RESTRICT="test" # requires installed instance
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=dev-qt/qtdeclarative-${QTMIN}:5
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		=kde-frameworks/kdeclarative-${PVCUT}*:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kf6compat? ( kde-plasma/kglobalacceld:6 )
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKF6_COMPAT_BUILD=$(usex kf6compat)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
+}
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-6.5.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.5.0.ebuild
index 3aeec7184323..5405b303c487 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-6.5.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to handle global shortcuts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.116.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..44c5fcc8cd04
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.116.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="dbus kf6compat wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
+	X? ( x11-libs/libxcb )
+"
+RDEPEND="${COMMON_DEPEND}
+	kf6compat? ( kde-frameworks/kguiaddons:6 )
+"
+BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GEO_SCHEME_HANDLER=$(usex !kf6compat)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.5.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..ceb955696cc5
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.5.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+IUSE="dbus wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui]
+	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.11.1 )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+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.5.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.5.0.ebuild
deleted file mode 100644
index d73da91e3131..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-6.5.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
-
-ECM_NONGUI="false"
-QTMIN=6.6.2
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="dbus wayland X"
-
-# slot op: includes qpa/qplatformnativeinterface.h
-COMMON_DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui]
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtbase-${QTMIN}:6=[wayland]
-		>=dev-qt/qtwayland-${QTMIN}:6
-	)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	wayland? ( >=dev-libs/plasma-wayland-protocols-1.11.1 )
-	X? ( x11-libs/libxcb )
-"
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
-
-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/kholidays/kholidays-6.5.0.ebuild b/kde-frameworks/kholidays/kholidays-6.5.0.ebuild
index 9114ca7a945b..1c3628e58db5 100644
--- a/kde-frameworks/kholidays/kholidays-6.5.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-6.5.0.ebuild
@@ -11,7 +11,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:6"
diff --git a/kde-frameworks/ki18n/ki18n-6.5.0.ebuild b/kde-frameworks/ki18n/ki18n-6.5.0.ebuild
index 19202fcd11ee..8066889a60b6 100644
--- a/kde-frameworks/ki18n/ki18n-6.5.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org python-single-r1
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.5.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.5.0.ebuild
index d46bd0c7ec17..f6faadb4b5c3 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-6.5.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for icon theming and configuration"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 574770
diff --git a/kde-frameworks/kidletime/kidletime-6.5.0.ebuild b/kde-frameworks/kidletime/kidletime-6.5.0.ebuild
index 4dcf02bf8677..3dc8e119fd6f 100644
--- a/kde-frameworks/kidletime/kidletime-6.5.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for detection and notification of device idle time"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="wayland X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kimageformats/kimageformats-6.5.0.ebuild b/kde-frameworks/kimageformats/kimageformats-6.5.0.ebuild
index f195832da455..115f8256b9b0 100644
--- a/kde-frameworks/kimageformats/kimageformats-6.5.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="avif eps heif jpegxl openexr raw"
 
 RDEPEND="
diff --git a/kde-frameworks/kio-trash-desktop-file/Manifest b/kde-frameworks/kio-trash-desktop-file/Manifest
new file mode 100644
index 000000000000..4cddc478cc1b
--- /dev/null
+++ b/kde-frameworks/kio-trash-desktop-file/Manifest
@@ -0,0 +1 @@
+DIST kio-5.116.0.tar.xz 3800352 BLAKE2B 2197d92589bd6eba360a72fb1902bb1e97d48065834e762e681eb312797f8c54829ee6099e87f316de83913755572e7b9fe4aa1d168fa83ada519cce8980d030 SHA512 a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376
diff --git a/kde-frameworks/kio-trash-desktop-file/kio-trash-desktop-file-5.116.0.ebuild b/kde-frameworks/kio-trash-desktop-file/kio-trash-desktop-file-5.116.0.ebuild
new file mode 100644
index 000000000000..61acc0f4e1d9
--- /dev/null
+++ b/kde-frameworks/kio-trash-desktop-file/kio-trash-desktop-file-5.116.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_I18N="false"
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-trash-desktop-file/}"
+KFMIN=5.115.0
+inherit ecm-common frameworks.kde.org
+
+DESCRIPTION="KIO Trash KCM service desktop file"
+S="${S}/src/ioslaves/trash"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+
+RDEPEND="
+	!<kde-frameworks/kio-5.116.0-r2:5
+	!kde-apps/kio-extras:6
+"
+
+ECM_INSTALL_FILES=(
+	kcm_trash.desktop:\${KDE_INSTALL_APPDIR}
+)
diff --git a/kde-frameworks/kio-trash-desktop-file/metadata.xml b/kde-frameworks/kio-trash-desktop-file/metadata.xml
new file mode 100644
index 000000000000..9a90f9cc8a0a
--- /dev/null
+++ b/kde-frameworks/kio-trash-desktop-file/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">frameworks/kio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-frameworks/kio/kio-5.116.0-r2.ebuild b/kde-frameworks/kio/kio-5.116.0-r2.ebuild
new file mode 100644
index 000000000000..2df85bd44289
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.116.0-r2.ebuild
@@ -0,0 +1,99 @@
+# 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_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="acl kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${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/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	sys-power/switcheroo-control
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		=kde-frameworks/kdoctools-${PVCUT}*:5
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		kde-apps/kio-extras:6
+		kde-frameworks/kio-trash-desktop-file:5
+	)
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKF6_COMPAT_BUILD=ON
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		-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/kio/kio-5.116.0.ebuild b/kde-frameworks/kio/kio-5.116.0.ebuild
deleted file mode 100644
index d3dab7d256f8..000000000000
--- a/kde-frameworks/kio/kio-5.116.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
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="optional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.9
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="acl kerberos kf6compat +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${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/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	sys-power/switcheroo-control
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		=kde-frameworks/kdoctools-${PVCUT}*:5
-	)
-	kerberos? ( virtual/krb5 )
-	kf6compat? ( kde-apps/kio-extras:6 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		-DKF6_COMPAT_BUILD=$(usex kf6compat)
-		-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/kio/kio-6.5.0.ebuild b/kde-frameworks/kio/kio-6.5.0.ebuild
index 1fd5b0f0d08b..d00d18ba1dcd 100644
--- a/kde-frameworks/kio/kio-6.5.0.ebuild
+++ b/kde-frameworks/kio/kio-6.5.0.ebuild
@@ -14,7 +14,7 @@ inherit ecm frameworks.kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="acl +kwallet wayland X"
 
 # tests hang
diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml
index 01d1befe3457..ef4d43059c0d 100644
--- a/kde-frameworks/kio/metadata.xml
+++ b/kde-frameworks/kio/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
 		<flag name="kwallet">Enable permanent storage of passwords for kpasswdserver with <pkg>kde-frameworks/kwallet</pkg></flag>
 	</use>
 	<slots>
diff --git a/kde-frameworks/kirigami/files/kirigami-6.5.0-disable-cachegen.patch b/kde-frameworks/kirigami/files/kirigami-6.5.0-disable-cachegen.patch
new file mode 100644
index 000000000000..e7aac3c64576
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-6.5.0-disable-cachegen.patch
@@ -0,0 +1,35 @@
+https://bugs.kde.org/show_bug.cgi?id=488326
+https://invent.kde.org/frameworks/kirigami/-/commit/7dea849cc263ddb33986e1e93669459ddde6990e
+https://invent.kde.org/frameworks/kirigami/-/merge_requests/1589
+
+From 7dea849cc263ddb33986e1e93669459ddde6990e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 21 Jul 2024 00:32:51 +0200
+Subject: [PATCH] Disable cachegen
+
+For some reason it breaks kirigami
+
+BUGS: 488326
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -9,12 +9,12 @@ add_subdirectory(layouts)
+ add_library(Kirigami)
+ add_library(KF6::Kirigami ALIAS Kirigami)
+ 
+-if (WIN32)
+-    # Kirigami apparently adds too many sources so on Windows we end
+-    # up running into command line length limits. So disable cache
+-    # generation on Windows for now.
+-    set(_extra_options NO_CACHEGEN)
+-endif()
++# On Windows Kirigami apparently adds too many sources so on Windows we end
++# up running into command line length limits. So disable cache
++# generation on Windows for now.
++# On Qt 6.7.2 cachegen is causing https://bugs.kde.org/show_bug.cgi?id=488326
++# investigate if future versions fix it and we can re-enable it
++set(_extra_options NO_CACHEGEN)
+ if (BUILD_SHARED_LIBS)
+     set(_extra_options ${_extra_options} NO_PLUGIN_OPTIONAL)
+ endif()
+-- 
+GitLab
diff --git a/kde-frameworks/kirigami/kirigami-5.116.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..1ac606ec2289
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.116.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="false"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_TAR_PN="${PN}2"
+QTMIN=5.15.9
+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 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="openmp"
+
+# requires package to already be installed
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+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=OFF
+		$(cmake_use_find_package openmp OpenMP)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/kirigami-5.116.0.ebuild b/kde-frameworks/kirigami/kirigami-5.116.0.ebuild
deleted file mode 100644
index 730b8a18bb13..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.116.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
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_TAR_PN="${PN}2"
-QTMIN=5.15.9
-inherit ecm frameworks.kde.org toolchain-funcs
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="openmp"
-
-# requires package to already be installed
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-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/kirigami/kirigami-6.5.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..e60a2be40200
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-6.5.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 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.6.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 ~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]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.0-disable-cachegen.patch
+)
+
+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/kirigami/kirigami-6.5.0.ebuild b/kde-frameworks/kirigami/kirigami-6.5.0.ebuild
index 5806f5e04354..40e3f5d06011 100644
--- a/kde-frameworks/kirigami/kirigami-6.5.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-6.5.0.ebuild
@@ -10,10 +10,10 @@ QTMIN=6.6.2
 inherit ecm frameworks.kde.org toolchain-funcs
 
 DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
+HOMEPAGE="https://community.kde.org/Kirigami"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="openmp"
 
 # requires package to already be installed
@@ -26,7 +26,7 @@ DEPEND="
 	>=dev-qt/qtsvg-${QTMIN}:6
 "
 RDEPEND="${DEPEND}
-	examples? ( !${CATEGORY}/${PN}:5[examples] )
+	examples? ( !${CATEGORY}/${PN}:5[examples(-)] )
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 "
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kitemmodels/kitemmodels-6.5.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-6.5.0.ebuild
index 3bb3c40598ee..2b22f8f5830f 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-6.5.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-6.5.0.ebuild
@@ -9,7 +9,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:6
diff --git a/kde-frameworks/kitemviews/kitemviews-6.5.0.ebuild b/kde-frameworks/kitemviews/kitemviews-6.5.0.ebuild
index ca1327fe4bb2..3a0b91b54cc0 100644
--- a/kde-frameworks/kitemviews/kitemviews-6.5.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing additional widgets for item models"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.5.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.5.0.ebuild
index a2b3d3505274..20e202b059cb 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-6.5.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-frameworks/knewstuff/knewstuff-6.5.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.5.0.ebuild
index b419d49aab9d..befbcfebcc73 100644
--- a/kde-frameworks/knewstuff/knewstuff-6.5.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-6.5.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="opds"
 
 DEPEND="
diff --git a/kde-frameworks/knotifications/knotifications-6.5.0.ebuild b/kde-frameworks/knotifications/knotifications-6.5.0.ebuild
index 2cf7c1b4d2c1..d7fb53ceacd2 100644
--- a/kde-frameworks/knotifications/knotifications-6.5.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for notifying the user of an event"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-6.5.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-6.5.0.ebuild
index 6a7b398844b2..23f52fc83f85 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-6.5.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for configuring desktop notifications"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="phonon"
 
 DEPEND="
diff --git a/kde-frameworks/kpackage/kpackage-6.5.0.ebuild b/kde-frameworks/kpackage/kpackage-6.5.0.ebuild
index b9d991f4ebc8..666a54d35ea3 100644
--- a/kde-frameworks/kpackage/kpackage-6.5.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to install and load packages of non binary content"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="man"
 
 DEPEND="
diff --git a/kde-frameworks/kparts/kparts-6.5.0.ebuild b/kde-frameworks/kparts/kparts-6.5.0.ebuild
index e6385952bb95..b8d21e5c9d48 100644
--- a/kde-frameworks/kparts/kparts-6.5.0.ebuild
+++ b/kde-frameworks/kparts/kparts-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing elaborate user-interface components"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpeople/kpeople-5.116.0.ebuild b/kde-frameworks/kpeople/kpeople-5.116.0.ebuild
index 629343001822..1da786f156f0 100644
--- a/kde-frameworks/kpeople/kpeople-5.116.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.116.0.ebuild
@@ -31,8 +31,8 @@ RDEPEND="${DEPEND}"
 
 src_test() {
 	local CMAKE_SKIP_TESTS=(
-		# bug 668192, segfaults
-		persondatatest
+		# bugs 668192, 816588: segfaults w/o virtx
+		personsmodeltest
 	)
 
 	ecm_src_test -j1
diff --git a/kde-frameworks/kpeople/kpeople-6.5.0.ebuild b/kde-frameworks/kpeople/kpeople-6.5.0.ebuild
index bee29f2c963d..baf6f44a4c5b 100644
--- a/kde-frameworks/kpeople/kpeople-6.5.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-6.5.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,8 +29,8 @@ RDEPEND="${DEPEND}"
 
 src_test() {
 	local CMAKE_SKIP_TESTS=(
-		# bug 668192, segfaults
-		persondatatest
+		# bugs 668192, 816588: segfaults w/o virtx
+		personsmodeltest
 	)
 
 	ecm_src_test -j1
diff --git a/kde-frameworks/kplotting/kplotting-6.5.0.ebuild b/kde-frameworks/kplotting/kplotting-6.5.0.ebuild
index a0a7728b63a3..4f3972859e24 100644
--- a/kde-frameworks/kplotting/kplotting-6.5.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing easy data-plotting functions"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
diff --git a/kde-frameworks/kpty/kpty-6.5.0.ebuild b/kde-frameworks/kpty/kpty-6.5.0.ebuild
index 8d3ce0c0e68e..0a708d85d101 100644
--- a/kde-frameworks/kpty/kpty-6.5.0.ebuild
+++ b/kde-frameworks/kpty/kpty-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.116.0-r1.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..35cb4b987c81
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.116.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="false"
+ECM_QTHELP="false"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+VIRTUALX_REQUIRED="test" # bug 910062 (tests fail)
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="QtQuick plugin providing high-performance charts"
+HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.116.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.116.0.ebuild
deleted file mode 100644
index 248d9a26c981..000000000000
--- a/kde-frameworks/kquickcharts/kquickcharts-5.116.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_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.9
-VIRTUALX_REQUIRED="test" # bug 910062 (tests fail)
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="QtQuick plugin providing high-performance charts"
-HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	examples? (
-		>=dev-qt/qtwidgets-${QTMIN}:5
-		=kde-frameworks/kdeclarative-${PVCUT}*:5
-		=kde-frameworks/kirigami-${PVCUT}*:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kquickcharts/kquickcharts-6.5.0-r2.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.5.0-r2.ebuild
new file mode 100644
index 000000000000..5caf68d1b787
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-6.5.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.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 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	examples? (
+		>=dev-qt/qtbase-${QTMIN}:6[widgets]
+		=kde-frameworks/kdeclarative-${PVCUT}*:6
+		=kde-frameworks/kirigami-${PVCUT}*:6
+	)
+"
+RDEPEND="${DEPEND}
+	examples? ( !${CATEGORY}/${PN}:5[examples(-)] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/kquickcharts-6.5.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.5.0.ebuild
deleted file mode 100644
index 75c530481578..000000000000
--- a/kde-frameworks/kquickcharts/kquickcharts-6.5.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_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-QTMIN=6.6.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 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# PVCUT=$(ver_cut 1-2)
-# 	examples? (
-# 		>=dev-qt/qtwidgets-${QTMIN}:6
-# 		=kde-frameworks/kdeclarative-${PVCUT}*:5
-# 		=kde-frameworks/kirigami-${PVCUT}*:5
-# 	)
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[gui]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/krunner/krunner-6.5.0.ebuild b/kde-frameworks/krunner/krunner-6.5.0.ebuild
index 33e5bed6e5f8..1189797e41ec 100644
--- a/kde-frameworks/krunner/krunner-6.5.0.ebuild
+++ b/kde-frameworks/krunner/krunner-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for providing different actions given a string query"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kservice/kservice-6.5.0.ebuild b/kde-frameworks/kservice/kservice-6.5.0.ebuild
index f06d6bdd50ac..1ce86a9ceac5 100644
--- a/kde-frameworks/kservice/kservice-6.5.0.ebuild
+++ b/kde-frameworks/kservice/kservice-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Advanced plugin and service introspection"
 
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 # requires running kde environment
diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.5.0.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.5.0.ebuild
index a3d2b58725e8..5783bfc7948a 100644
--- a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.5.0.ebuild
+++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Implementation of Status Notifier Items"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Qt6::WidgetsPrivate use
diff --git a/kde-frameworks/ksvg/ksvg-6.5.0.ebuild b/kde-frameworks/ksvg/ksvg-6.5.0.ebuild
index b62e5608cf43..9d9c6ac50367 100644
--- a/kde-frameworks/ksvg/ksvg-6.5.0.ebuild
+++ b/kde-frameworks/ksvg/ksvg-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Components for handling SVGs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.5.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.5.0.ebuild
index c48eab005425..3a12e4b4b976 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-6.5.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing a full text editor component"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+editorconfig"
 
 RESTRICT="test"
diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-6.5.0.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-6.5.0.ebuild
index b263f3a5bf2c..a468032b52b3 100644
--- a/kde-frameworks/ktexttemplate/ktexttemplate-6.5.0.ebuild
+++ b/kde-frameworks/ktexttemplate/ktexttemplate-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-6.5.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-6.5.0.ebuild
index 8fb3c171b8d5..3c7f1b5cdf55 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-6.5.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-6.5.0.ebuild
@@ -11,7 +11,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-frameworks/kunitconversion/kunitconversion-6.5.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-6.5.0.ebuild
index 463cb476e379..4d3ae4ad41ac 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-6.5.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for converting units"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r4.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r4.ebuild
new file mode 100644
index 000000000000..1cdfd440c876
--- /dev/null
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-1.3.0-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc kf6compat"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	!kf6compat? (
+		>=dev-qt/qtcharts-${QTMIN}:5
+		>=dev-qt/qtprintsupport-${QTMIN}:5
+		>=dev-qt/qtwidgets-${QTMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-frameworks/kuserfeedback:6 )
+"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	>=dev-qt/linguist-tools-${QTMIN}:5
+	doc? (
+		>=dev-qt/qdoc-${QTMIN}:5
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		# disable server application
+		-DENABLE_PHP=NO
+		-DENABLE_PHP_UNIT=NO
+		-DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+		-DENABLE_DOCS=$(usex doc)
+		-DENABLE_CLI=$(usex !kf6compat)
+		-DENABLE_CONSOLE=$(usex !kf6compat)
+	)
+
+	ecm_src_configure
+}
+
+CMAKE_SKIP_TESTS=(
+	# bugs: 921359, requires virtualx
+	openglinfosourcetest
+)
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-6.5.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-6.5.0.ebuild
index 0467f0e37f11..e79feaa0eb03 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-6.5.0.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-6.5.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc"
 
 # FIXME: Qt_6_PRIVATE_API matches UserFeedbackConsole, but where is it coming from?
diff --git a/kde-frameworks/kuserfeedback/metadata.xml b/kde-frameworks/kuserfeedback/metadata.xml
index 6e6a28916521..b70fd213351d 100644
--- a/kde-frameworks/kuserfeedback/metadata.xml
+++ b/kde-frameworks/kuserfeedback/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=frameworks-kuserfeedback</bugs-to>
 		<remote-id type="kde-invent">frameworks/kuserfeedback</remote-id>
 	</upstream>
 	<use>
diff --git a/kde-frameworks/kwallet/kwallet-5.116.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..c5e90ca90f32
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.116.0-r1.ebuild
@@ -0,0 +1,60 @@
+# 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 optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gpg kf6compat +man"
+
+DEPEND="
+	>=app-crypt/qca-2.3.1:2[qt5(+)]
+	dev-libs/libgcrypt:0=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+	!kf6compat? ( gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) )
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-frameworks/kwallet:6 )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KWALLETD=$(usex !kf6compat)
+		-DBUILD_KWALLET_QUERY=$(usex !kf6compat)
+		$(cmake_use_find_package man KF5DocTools)
+	)
+	if ! use kf6compat; then
+		mycmakeargs+=(
+			$(cmake_use_find_package gpg Gpgmepp)
+		)
+	fi
+
+	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/kwallet/kwallet-5.116.0.ebuild b/kde-frameworks/kwallet/kwallet-5.116.0.ebuild
index 02dd26354ef1..27b5ef66b083 100644
--- a/kde-frameworks/kwallet/kwallet-5.116.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.116.0.ebuild
@@ -52,8 +52,8 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Auto-unlocking after account login" "kde-plasma/kwallet-pam:5"
-		optfeature "KWallet management" "kde-apps/kwalletmanager:5"
+		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/kwallet/kwallet-6.5.0.ebuild b/kde-frameworks/kwallet/kwallet-6.5.0.ebuild
index e6425e528fbe..005a05f2e2a1 100644
--- a/kde-frameworks/kwallet/kwallet-6.5.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org optfeature
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="gpg +man"
 
 DEPEND="
@@ -44,8 +44,8 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Auto-unlocking after account login" "kde-plasma/kwallet-pam:6"
-		optfeature "KWallet management" "kde-apps/kwalletmanager:6"
+		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/kwidgetsaddons-6.5.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.5.0.ebuild
index ff54b3fda963..c27fd4d03342 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.5.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0-r1.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..e43f9e92b098
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=6.6.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]
+		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/kwindowsystem/kwindowsystem-6.5.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.5.0.ebuild
deleted file mode 100644
index 92511ab084ab..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-6.5.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
-
-QTMIN=6.6.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
-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]
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	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/kxmlgui-6.5.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-6.5.0.ebuild
index 79b92c61df5c..c44097448074 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-6.5.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: includes QtCore/private/qlocale_p.h
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.5.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.5.0.ebuild
index 38ccd48b0ebc..fdba40ea6be8 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.5.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="ModemManager bindings for Qt"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running environment
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-6.5.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.5.0.ebuild
index 1050102dfbef..02c7331ee8a8 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-6.5.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="NetworkManager bindings for Qt"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="teamd"
 
 DEPEND="
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild
index b333379088f3..4353786c4e19 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-6.0.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://develop.kde.org/frameworks/oxygen-icons/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-3"
diff --git a/kde-frameworks/prison/files/prison-6.5.0-cmake.patch b/kde-frameworks/prison/files/prison-6.5.0-cmake.patch
new file mode 100644
index 000000000000..dbd3e7c612f6
--- /dev/null
+++ b/kde-frameworks/prison/files/prison-6.5.0-cmake.patch
@@ -0,0 +1,42 @@
+From 073c611f0027ca1d7e5de18003993d3a85c2968e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Aug 2024 12:31:03 +0200
+Subject: [PATCH] Fix WITH_QUICK=OFF by moving ECMQmlModule behind the
+ conditional
+
+Otherwise we still end up with
+
+> -- Could NOT find Qt6Qml (missing: Qt6Qml_DIR)
+
+and finally
+
+> Failed setting up ECMQmlModule
+
+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 6a97368..11f3a52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ include(ECMAddTests)
+ include(CMakePackageConfigHelpers)
+ include(ECMSetupVersion)
+ include(ECMQtDeclareLoggingCategory)
+-include(ECMQmlModule)
+ include(ECMDeprecationSettings)
+ 
+ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
+@@ -39,6 +38,7 @@ option(WITH_MULTIMEDIA "Build scanner support" ON)
+ find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui)
+ 
+ if (WITH_QUICK)
++    include(ECMQmlModule)
+     find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick)
+ endif()
+ 
+-- 
+2.46.0
+
diff --git a/kde-frameworks/prison/prison-6.5.0.ebuild b/kde-frameworks/prison/prison-6.5.0.ebuild
index 873cd7cc7ee6..cf22787c01f3 100644
--- a/kde-frameworks/prison/prison-6.5.0.ebuild
+++ b/kde-frameworks/prison/prison-6.5.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://invent.kde.org/frameworks/prison"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="qml"
 
 RDEPEND="
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent,widgets] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938343
+
 src_configure() {
 	local mycmakeargs=(
 		# TODO: WITH_MULTIMEDIA?
diff --git a/kde-frameworks/purpose-kaccounts-services/Manifest b/kde-frameworks/purpose-kaccounts-services/Manifest
new file mode 100644
index 000000000000..e9a50ad9eb07
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/Manifest
@@ -0,0 +1 @@
+DIST purpose-6.5.0.tar.xz 174700 BLAKE2B 780682a8308023e40723616f3f69704fc168d4a3391194948a7345246cf0014572d0100fccb2575c11251b067c26a21f40997418bb98e35287e7c88b3454c9e2 SHA512 8f0947545c125b08ed34a36321d73ff99725e6e537ec7675f8cff0673c11b7a4570bf194da409b43c997927a844f2236ebaf07fd193f887d57e768485f41ca0b
diff --git a/kde-frameworks/purpose-kaccounts-services/metadata.xml b/kde-frameworks/purpose-kaccounts-services/metadata.xml
new file mode 100644
index 000000000000..ec7aae97d041
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=frameworks-purpose</bugs-to>
+		<remote-id type="kde-invent">frameworks/purpose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild
new file mode 100644
index 000000000000..936ff4ed283a
--- /dev/null
+++ b/kde-frameworks/purpose-kaccounts-services/purpose-kaccounts-services-6.5.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 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/}"
+KF5_BDEPEND=( "|| (
+	kde-apps/kaccounts-integration:6[qt5]
+	kde-apps/kaccounts-integration:5
+)" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+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
+"
+
+ecm-common-check_deps() {
+	return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		if(KFSLOT STREQUAL "6")
+			find_package(KAccounts6 REQUIRED)
+		else()
+			find_package(KAccounts REQUIRED)
+		endif()
+
+		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/metadata.xml b/kde-frameworks/purpose/metadata.xml
index 9f968689f3d1..fc6af5af3754 100644
--- a/kde-frameworks/purpose/metadata.xml
+++ b/kde-frameworks/purpose/metadata.xml
@@ -11,7 +11,6 @@
 	</upstream>
 	<use>
 		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
 		<flag name="webengine">Enable support for system-wide defined KAccounts</flag>
 	</use>
 	<slots>
diff --git a/kde-frameworks/purpose/purpose-5.116.0-r1.ebuild b/kde-frameworks/purpose/purpose-5.116.0-r1.ebuild
deleted file mode 100644
index 9f3b9e96d6dd..000000000000
--- a/kde-frameworks/purpose/purpose-5.116.0-r1.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_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.9
-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 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="bluetooth kaccounts kf6compat"
-
-# requires running environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/prison-${PVCUT}*:5
-	kaccounts? (
-		|| (
-			kde-apps/kaccounts-integration:6[qt5]
-			kde-apps/kaccounts-integration:5
-		)
-		net-libs/accounts-qt[qt5(+)]
-	)
-"
-RDEPEND="${DEPEND}
-	kf6compat? ( kaccounts? ( >=kde-frameworks/purpose-6.3.0-r1:6[webengine] ) )
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${PVCUT}:5
-	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
-	kaccounts? ( net-libs/accounts-qml[qt5(+)] )
-"
-BDEPEND="kaccounts? ( 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 kaccounts KAccounts)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm "${D}"/usr/share/icons/hicolor/128x128/apps/{reviewboard,phabricator}-purpose.png \
-			"${D}"/usr/share/icons/hicolor/16x16/apps/{reviewboard,phabricator}-purpose.png \
-			|| die
-		if use kaccounts; then
-			rm "${D}"/usr/share/accounts/services/kde/{google-youtube,nextcloud-upload}.service \
-			|| die
-		fi
-	fi
-}
-
-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/purpose/purpose-5.116.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild
new file mode 100644
index 000000000000..897e2153fb40
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.116.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+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 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="bluetooth kaccounts"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/prison-${PVCUT}*:5
+	kaccounts? (
+		|| (
+			kde-apps/kaccounts-integration:6[qt5]
+			kde-apps/kaccounts-integration:5
+		)
+		>=net-libs/accounts-qt-1.16_p20220803[qt5(-)]
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? (
+		kde-frameworks/purpose-kaccounts-services
+		>=net-libs/accounts-qml-0.7_p20231028[qt5(-)]
+	)
+"
+BDEPEND="kaccounts? ( 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 kaccounts KAccounts)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	# Shipped by kde-frameworks/purpose-kaccounts-services package for shared use w/ SLOT 5
+	use kaccounts && 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/purpose/purpose-6.5.0-r1.ebuild b/kde-frameworks/purpose/purpose-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..c2461306f412
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-6.5.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.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 ~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-${PVCUT}*:6
+	=kde-frameworks/kcoreaddons-${PVCUT}*:6
+	=kde-frameworks/ki18n-${PVCUT}*:6
+	=kde-frameworks/kio-${PVCUT}*:6
+	=kde-frameworks/kirigami-${PVCUT}*:6
+	=kde-frameworks/knotifications-${PVCUT}*:6
+	=kde-frameworks/kservice-${PVCUT}*:6
+	=kde-frameworks/prison-${PVCUT}*:6
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.16_p20220803[qt6]
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kdeclarative-${PVCUT}:6
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 )
+	webengine? (
+		>=kde-frameworks/purpose-kaccounts-services-${PVCUT}
+		>=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/purpose/purpose-6.5.0.ebuild b/kde-frameworks/purpose/purpose-6.5.0.ebuild
deleted file mode 100644
index 601eaf910a3c..000000000000
--- a/kde-frameworks/purpose/purpose-6.5.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_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=6.6.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 ~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-${PVCUT}*:6
-	=kde-frameworks/kcoreaddons-${PVCUT}*:6
-	=kde-frameworks/ki18n-${PVCUT}*:6
-	=kde-frameworks/kio-${PVCUT}*:6
-	=kde-frameworks/kirigami-${PVCUT}*:6
-	=kde-frameworks/knotifications-${PVCUT}*:6
-	=kde-frameworks/kservice-${PVCUT}*:6
-	=kde-frameworks/prison-${PVCUT}*:6
-	webengine? (
-		kde-apps/kaccounts-integration:6
-		>=net-libs/accounts-qt-1.16_p20220803[qt6]
-	)
-"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-	>=kde-frameworks/kdeclarative-${PVCUT}:6
-	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 )
-	webengine? ( >=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
-}
-
-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/qqc2-desktop-style-6.5.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.5.0.ebuild
index 052306a8ad15..8aa5c26ce6d0 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.5.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.5.0.ebuild
@@ -11,7 +11,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
diff --git a/kde-frameworks/solid/solid-6.5.0.ebuild b/kde-frameworks/solid/solid-6.5.0.ebuild
index 3e73f3dc1954..688978f334dd 100644
--- a/kde-frameworks/solid/solid-6.5.0.ebuild
+++ b/kde-frameworks/solid/solid-6.5.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org optfeature
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="ios"
 
 RDEPEND="
diff --git a/kde-frameworks/sonnet/sonnet-6.5.0.ebuild b/kde-frameworks/sonnet/sonnet-6.5.0.ebuild
index 518249d7ab30..712c056b9f5a 100644
--- a/kde-frameworks/sonnet/sonnet-6.5.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-6.5.0.ebuild
@@ -10,7 +10,7 @@ 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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="aspell +hunspell qml"
 
 DEPEND="
diff --git a/kde-frameworks/syndication/syndication-6.5.0.ebuild b/kde-frameworks/syndication/syndication-6.5.0.ebuild
index 1d67738cf873..43cabb2052ba 100644
--- a/kde-frameworks/syndication/syndication-6.5.0.ebuild
+++ b/kde-frameworks/syndication/syndication-6.5.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.5.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.5.0.ebuild
index 808fff1d9846..be71c9b2c0c9 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.5.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.5.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for syntax highlighting"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # examples: dev-qt/qtbase[printsupport,widgets]
diff --git a/kde-frameworks/threadweaver/threadweaver-6.5.0.ebuild b/kde-frameworks/threadweaver/threadweaver-6.5.0.ebuild
index 343dccd438fa..91fb751edd5d 100644
--- a/kde-frameworks/threadweaver/threadweaver-6.5.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-6.5.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index 4c528f920ba2..3bed268f5817 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,2 +1,2 @@
-DIST colord-kde-23.08.5.tar.xz 112824 BLAKE2B 3f94b6a0091e8dd0f7936c86e8a2550a8ad62cea5348f29b503e257cc9338a58baba5178bccb045cd8faa191277823f3b9972645312950c02e0d0be82d5164a8 SHA512 3b53b9f6dd5043ca4007c9123d642994bdaba077dc8a4355305aa8398ca4f91f271741da44ef90580feff82053f97aa2aa2febf3020b6cbe9ecc4c90c360836b
 DIST colord-kde-24.05.2.tar.xz 117320 BLAKE2B 73828c6cd8bca069a96159e58bda71250e242157a302071c436845192b1b84d52ae8ab4640c7f90145ad6d42f1789f2eceef37b58854b7aef9e990fe0cd357d3 SHA512 cc0fe9de6b60e65a9dcbb18e5918e4426bf0e2bd4fa4cd7f6cc8be25d43f5f1ef6bd0fb56ae13482f6e296a9c624545796da898a96c63e557d02fd0616641a6f
+DIST colord-kde-24.08.0.tar.xz 117340 BLAKE2B b9dc689beb640d92eecbf74bc7a1ffdd984d92deedc58fd617b18f5ee972faefddafce4ea9f55876a72c7b2a2235280f6f6b9b6f135019a5cef7fd99431f9f06 SHA512 36c92f359539ff694ae9adc11f74150f08bdeea2fa4c7615779288c4f886b0bf087c4a92929729af44694bae2132802d753484a2dc0c6c9206715f7bf6af7f97
diff --git a/kde-misc/colord-kde/colord-kde-23.08.5.ebuild b/kde-misc/colord-kde/colord-kde-23.08.5.ebuild
deleted file mode 100644
index aa4ba2d912a8..000000000000
--- a/kde-misc/colord-kde/colord-kde-23.08.5.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
-
-KDE_ORG_CATEGORY=graphics
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	media-libs/lcms:2
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/kirigami-addons:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	kde-plasma/kde-cli-tools:*
-	x11-misc/colord
-"
-
-PATCHES=( "${FILESDIR}/${PN}-23.08.3-without_x11.patch" )
-
-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.05.2.ebuild b/kde-misc/colord-kde/colord-kde-24.05.2.ebuild
index e373bbfa9162..0bd0d57e8560 100644
--- a/kde-misc/colord-kde/colord-kde-24.05.2.ebuild
+++ b/kde-misc/colord-kde/colord-kde-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/graphics/colord-kde"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-misc/colord-kde/colord-kde-24.08.0.ebuild b/kde-misc/colord-kde/colord-kde-24.08.0.ebuild
new file mode 100644
index 000000000000..35fd25a9b6ff
--- /dev/null
+++ b/kde-misc/colord-kde/colord-kde-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# 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
+	kde-plasma/kde-cli-tools:*
+	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/files/colord-kde-23.08.3-without_x11.patch b/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch
deleted file mode 100644
index d1cfc6f1085d..000000000000
--- a/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 31e125cc80497b0dc9f16abc808859ce97fd5fd1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 26 Mar 2023 19:25:40 +0200
-Subject: [PATCH] Add CMake option to build WITHOUT_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with X11
-support for other reverse dependencies.
-
-X11_FOUND is set automagically so far, and using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-Introducing this option means there is no behavior change by default,
-cmake will just skip finding X11 if the option is enabled.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c08b03..d491926 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,13 +47,17 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPON
-     Widgets
- )
- 
--find_package(X11)
--set_package_properties(X11 PROPERTIES
--    TYPE OPTIONAL
--    PURPOSE "For colord integration on X11"
--)
-+option(WITHOUT_X11 "Build without colord-kded for X11 integration (skips finding X11)" OFF)
-+if(NOT WITHOUT_X11)
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES
-+        TYPE OPTIONAL
-+        PURPOSE "For colord integration on X11"
-+    )
-+    set(HAVE_X11 ${X11_FOUND})
-+endif()
- 
--if (X11_FOUND)
-+if (HAVE_X11)
-     find_package(XCB REQUIRED COMPONENTS XCB RANDR)
-     if (QT_MAJOR_VERSION STREQUAL "5")
-         find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
-@@ -80,7 +84,7 @@ ecm_set_disabled_deprecation_versions(
- 	KF 5.100.0)
- 
- 
--if (X11_FOUND)
-+if (HAVE_X11)
-     add_subdirectory(colord-kded)
- endif()
- add_subdirectory(colord-kcm)
--- 
-GitLab
-
diff --git a/kde-misc/kclock/Manifest b/kde-misc/kclock/Manifest
index ef3119146726..5654c88269f2 100644
--- a/kde-misc/kclock/Manifest
+++ b/kde-misc/kclock/Manifest
@@ -1,2 +1,3 @@
 DIST kclock-23.08.5.tar.xz 642872 BLAKE2B 966a4938dedf434de7f09030b759d3baa2cad5823b4fb3fcd88b6871f4db245186502b0dc3d95238888a12b2d3b6179f7d39525cff2fcd69cedfe41dcf8d8770 SHA512 b477743b98988f40974b0b8774d28ab9216778456a4f31911b97a61f3812510fdf944fbea63c5c3b96c03e748ef9c3d95c420d0edc697e5c5e6f50989b462dcb
 DIST kclock-24.05.2.tar.xz 656416 BLAKE2B 62d08161516b08ebf0728464e8ca2e6dca842c87e0cca0059180ba45e3ae6e414fb196b8916ff17b3f2ef124e7d823640c2a1b4fea93dc90c93ea0b79ebfe69d SHA512 890f20d095eba59f5f0618f8ff19b82b04d3c11f564c88e5e7d98f44aeaec20667f21448862e154b35cbacc81cae433c8ed52da363486e4e9bfc4e0851659903
+DIST kclock-24.08.0.tar.xz 659364 BLAKE2B 6898e317a1384c3211e4bbc14942586c45c1ceafe4ece8040e5c4a77edf6edc98818a134b1cd4bc6cf2f19f5f0559b046e122667493e1d2b854cd07931c2705d SHA512 7a89e4f95d0eb2eb1fb7508ed4250c277f939be43ed4b623b106b2916c61780afb8b66b55962f7018db1ebf516fdd38b56e104536a0ed8cbfd243f8e18a95e61
diff --git a/kde-misc/kclock/kclock-24.05.2.ebuild b/kde-misc/kclock/kclock-24.05.2.ebuild
index becc5ef37f24..f448b4a77cf5 100644
--- a/kde-misc/kclock/kclock-24.05.2.ebuild
+++ b/kde-misc/kclock/kclock-24.05.2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 DEPEND="
 	dev-libs/kirigami-addons:6
diff --git a/kde-misc/kclock/kclock-24.08.0.ebuild b/kde-misc/kclock/kclock-24.08.0.ebuild
new file mode 100644
index 000000000000..641b5cc9d244
--- /dev/null
+++ b/kde-misc/kclock/kclock-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index fe4a482d4363..6ea9cc3211ac 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,2 +1,2 @@
-DIST kdeconnect-kde-23.08.5.tar.xz 657504 BLAKE2B fde6f1c023739c1c770f93d455ed8e256b1e34c78fd76276a1941364735bb1c14d7850f27a586ab8fcbc259f64223fa619d61ac65b04ab8431871664d6c6c05f SHA512 ef861ae5bf8d88acf2328a3eacac2242687b21a0e004cad137cef03fdebc9a162a2e7e54f4ff99bb1ec85247595e0007c9a35673dfe9ecf5b69ec91389b912d3
 DIST kdeconnect-kde-24.05.2.tar.xz 693240 BLAKE2B f42aa3bfc0cfeff2e817c2551581a551c1b406cb755d994f99bc124cfce57bd8222529e43b78e4734abfa057769d02b528f3e489d9dca1c2494a027554fb745f SHA512 2bced3b594fd5b43e0c01acbe8d3ba93e745c759f2d12eebba66854c4e122635a5011d07be820001a676e50bb6e561d16945e04a984abafa30a26d856df53c79
+DIST kdeconnect-kde-24.08.0.tar.xz 704200 BLAKE2B 6cb526a53eb37c39684c2dd8c11168b7c5d7868f754684b933a87b3b7a896197093bc5e05f55b29b562bcdc52aaf93e281b9c1e073efee390f467a984b0f0776 SHA512 e6e9ebbecba9ee07334e44053ea16ced16e9d3dd6693dc480452f637251318aa909758389de8446f1e81943a515cc8858ba4afe0a16af38a08a9c87fad8a1f22
diff --git a/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch b/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch
deleted file mode 100644
index bd7063f93ee6..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From eab3dd5f39b7633a3bc074713da69c53f123345d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 16 Jul 2021 23:15:26 +0200
-Subject: [PATCH] Revert "Disable kpeople qml module finding"
-
-This reverts commit 89f52af4389e9e98f7428db670355d144b6045a2.
-
-We don't have to do that, because we already apply downstream magic
-and set -DECM_DISABLE_QMLPLUGINDUMP=ON globally.
-
-See also: https://phabricator.kde.org/D25812
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 44af637f..b2027e92 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ else()
- 
-     add_definitions(-DHAVE_KIO)
- 
--    #ecm_find_qmlmodule(org.kde.people 1.0) FIXME This results in KPeople code being called which triggers DBus calls which breaks the Windows CI
-+    ecm_find_qmlmodule(org.kde.people 1.0)
-     ecm_find_qmlmodule(QtQuick.Particles 2.0)
- 
- endif()
--- 
-2.32.0
-
diff --git a/kde-misc/kdeconnect/kdeconnect-23.08.5-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-23.08.5-r1.ebuild
deleted file mode 100644
index 3df6ce5f4a2f..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-23.08.5-r1.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bluetooth pulseaudio telephony X"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[qt5(+),ssl]
-	dev-libs/glib:2
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	x11-libs/libxkbcommon
-	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
-	pulseaudio? ( <media-libs/pulseaudio-qt-1.4:= )
-	telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 )
-	X? (
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/wayland-protocols
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/kirigami-addons:5
-	dev-libs/kpeoplevcard:5
-	dev-qt/qdbus:*
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	net-fs/sshfs
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" )
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/921648
-	# https://bugs.kde.org/show_bug.cgi?id=480522
-	filter-lto
-
-	local mycmakeargs=(
-		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
-		$(cmake_use_find_package telephony KF5ModemManagerQt)
-		$(cmake_use_find_package X LibFakeKey)
-	)
-	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.05.2.ebuild b/kde-misc/kdeconnect/kdeconnect-24.05.2.ebuild
index 184b8cd091eb..20d94d309fcf 100644
--- a/kde-misc/kdeconnect/kdeconnect-24.05.2.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-24.05.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="bluetooth pulseaudio telephony zeroconf X"
 
 RESTRICT="test"
diff --git a/kde-misc/kdeconnect/kdeconnect-24.08.0.ebuild b/kde-misc/kdeconnect/kdeconnect-24.08.0.ebuild
new file mode 100644
index 000000000000..d40f8aed7ba5
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-24.08.0.ebuild
@@ -0,0 +1,107 @@
+# 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
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${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/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/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 8c567f74ab38..80525455cc8b 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,2 @@
-DIST kdiff3-1.11.1.tar.xz 1140680 BLAKE2B 4a3e2f3300a4d8ebe390e3e7ad6392b26cdac919bfa80d2b24e145536a763cca924c8a811826972a92215da7c297662b805c60ce0ee5a57816a3549c059a8353 SHA512 5f481a3cd67e80db939eb795618a635bda2c08875eb826c3a1b6487b631374c48ab9b8a546d9b9504c1bcbc0ed9072f16452d6ef9fe181ce6850f741ced710ce
 DIST kdiff3-1.11.2.tar.xz 1141676 BLAKE2B 53ceb67ed232a2af81705d977ab691305a6a8a0fafce23d56601e7e24787a4cd81b044448251acefdb43a1ac142f53c1864fb64bd236d03a80105bbb8541805e SHA512 7318bbc867a369a656e78a9a5530a4329d176cdf170ff43278a8f9b9d821950c17f5a41266a0756bb84322ed78eb6d9d21f587968fedb7432656ec4f65c367cf
+DIST kdiff3-1.11.3.tar.xz 1142212 BLAKE2B 60d609a29e5e244061581279c0d6ced05dec14a1d8c0385f952e11a4d9f8b91e4b669544582ac7ac2d3b901d214485d04022276537b45e8b28e9bea37d5b4828 SHA512 76edf2286ad5de7a9984c153134037b4beff06c6ba77be87c4a11e71ccda1c66730b6d8b185be68242ee23effcd3bf6b44367ed337ce71790d0e972f9464eb5f
diff --git a/kde-misc/kdiff3/kdiff3-1.11.1.ebuild b/kde-misc/kdiff3/kdiff3-1.11.1.ebuild
deleted file mode 100644
index 8f110067802a..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.11.1.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="optional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF
-		# TODO: -DENABLE_GDBINDEX?
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild b/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
index 1c589f8dc211..9b2b3b66af43 100644
--- a/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-misc/kdiff3/kdiff3-1.11.3.ebuild b/kde-misc/kdiff3/kdiff3-1.11.3.ebuild
new file mode 100644
index 000000000000..070dd90af8ee
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.11.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=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/kio-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.82
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	sys-apps/diffutils
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		# TODO: -DENABLE_GDBINDEX?
+	)
+	ecm_src_configure
+}
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index befe8a53246d..3271a1b9c229 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1 +1,2 @@
 DIST k4dirstat-3.4.2.tar.gz 411899 BLAKE2B 356844373c35def5421c234ae5b07bd11402f56309c30fc68a64766be634fec5f6d04a8931babe21efad6fc36ec992e8ebb08a29dc11a58b2b08f1072b3a8f18 SHA512 d29c9b18b4bc8e94af1f4b494418284a05b95a1b17dbb23614823b0e3e7cd2b470b8330d3f52c584c0c257d2c0dfd4d06914a3eb90a51f7b679437bccc695477
+DIST k4dirstat-3.4.3.tar.gz 412329 BLAKE2B c87a5c0d37616607e2c7bcd95803f3d4411b6331fa259d899245773d91dd5b0b5ececae658f4fb80536dedde972a69ebded5442be79e3993a5857f2db07a136f SHA512 f7d77fa338e035dc973317dbe39111bf2fe51b96bf27c1dc8812e909ac07a3e778899a1dd9b2b1c94771b9151f3e55b100ad933217adf2ce54287e6349a90bfe
diff --git a/kde-misc/kdirstat/kdirstat-3.4.3.ebuild b/kde-misc/kdirstat/kdirstat-3.4.3.ebuild
new file mode 100644
index 000000000000..7a66f2adc467
--- /dev/null
+++ b/kde-misc/kdirstat/kdirstat-3.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="k4dirstat-${PV}"
+ECM_HANDBOOK="forceoptional"
+inherit ecm
+
+DESCRIPTION="GUI equivalent to the du command based on KDE Frameworks"
+HOMEPAGE="https://github.com/jeromerobert/k4dirstat"
+SRC_URI="https://github.com/jeromerobert/k4dirstat/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	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/kiconthemes:5
+	kde-frameworks/kio:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DK4DIRSTAT_GIT_VERSION=OFF
+	)
+	ecm_src_configure
+}
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 12f315b9529b..7f6ecd0ab890 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
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/kde-misc/kio-gdrive-common/Manifest b/kde-misc/kio-gdrive-common/Manifest
new file mode 100644
index 000000000000..9750d99ea254
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/Manifest
@@ -0,0 +1,2 @@
+DIST kio-gdrive-24.05.2.tar.xz 80828 BLAKE2B 2e5bd00895028969663ded3fe54ba077c4ec714e9dabda86d6b10ed7ab6407bac7e23438b137ad8a8dda88de00187904555a825e7bb5414d62232ced5d081ae8 SHA512 c6da9037e58e679d03bcf7a2899448ed05e81ae7337ede43f76ba2589800731a80aa0bef21468790308cd36428d43f1cb0ef17221a875f5b25065f5b9e732a2b
+DIST kio-gdrive-24.08.0.tar.xz 80816 BLAKE2B 0feb10270cee5c64a221c8cb664c0a385dbb18c7be649cc1f530fbb45b75f89581300cdac2d4cc1711fda64f74bede9562046f65508f5c910afb1d4332422663 SHA512 cd1176c22742e642d795be6c72734b23aefcb5fe82bb41a9da8e43de08421055ba29241e63eafe6b927024db1c7b9b1ae1ab441ac385106b069ce2b99e28c588
diff --git a/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
new file mode 100644
index 000000000000..8cd7e701394b
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.05.2.ebuild
@@ -0,0 +1,59 @@
+# 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/}"
+KF5_BDEPEND=( "|| (
+	kde-apps/kaccounts-integration:6[qt5]
+	kde-apps/kaccounts-integration:5
+)" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+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
+"
+
+ECM_INSTALL_FILES=(
+	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+	return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		if(KFSLOT STREQUAL "6")
+			find_package(KAccounts6 REQUIRED)
+		else()
+			find_package(KAccounts REQUIRED)
+		endif()
+
+		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.08.0.ebuild b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild
new file mode 100644
index 000000000000..ebca41bc6d18
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/kio-gdrive-common-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# 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/}"
+KF5_BDEPEND=( "|| (
+	kde-apps/kaccounts-integration:6[qt5]
+	kde-apps/kaccounts-integration:5
+)" )
+KF6_BDEPEND=( "kde-apps/kaccounts-integration:6" )
+KFMIN=5.115.0
+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
+"
+
+ECM_INSTALL_FILES=(
+	desktop/gdrive-network.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	desktop/org.kde.kio_gdrive.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
+
+ecm-common-check_deps() {
+	return $(has_version -b "kde-apps/kaccounts-integration:6")
+}
+
+ecm-common_inject_heredoc() {
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		if(KFSLOT STREQUAL "6")
+			find_package(KAccounts6 REQUIRED)
+		else()
+			find_package(KAccounts REQUIRED)
+		endif()
+
+		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/metadata.xml b/kde-misc/kio-gdrive-common/metadata.xml
new file mode 100644
index 000000000000..676893a6308e
--- /dev/null
+++ b/kde-misc/kio-gdrive-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kio-gdrive</bugs-to>
+		<remote-id type="kde-invent">network/kio-gdrive</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 4c37cb967076..7a6a2e9e0a93 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,2 +1,3 @@
 DIST kio-gdrive-23.08.5.tar.xz 79452 BLAKE2B 7fab730a2781a0cf534beda35a48a2663cdd9e067759991e277775d1d5a492596cbdf9b3427e67da0d10415bf717ba46dd0d3d11c143de3733065e836b4fb345 SHA512 9535e64997b026aa6a5b6a092986486f726151948614f76c1f044e9fab6c0651f861776e928613a757c656fdd12cbba529dd63d04e1f58d5a43966b8d9d448c8
 DIST kio-gdrive-24.05.2.tar.xz 80828 BLAKE2B 2e5bd00895028969663ded3fe54ba077c4ec714e9dabda86d6b10ed7ab6407bac7e23438b137ad8a8dda88de00187904555a825e7bb5414d62232ced5d081ae8 SHA512 c6da9037e58e679d03bcf7a2899448ed05e81ae7337ede43f76ba2589800731a80aa0bef21468790308cd36428d43f1cb0ef17221a875f5b25065f5b9e732a2b
+DIST kio-gdrive-24.08.0.tar.xz 80816 BLAKE2B 0feb10270cee5c64a221c8cb664c0a385dbb18c7be649cc1f530fbb45b75f89581300cdac2d4cc1711fda64f74bede9562046f65508f5c910afb1d4332422663 SHA512 cd1176c22742e642d795be6c72734b23aefcb5fe82bb41a9da8e43de08421055ba29241e63eafe6b927024db1c7b9b1ae1ab441ac385106b069ce2b99e28c588
diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r1.ebuild
deleted file mode 100644
index f0e25f566bb1..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-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_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KDE_ORG_CATEGORY="network"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker for Google Drive service"
-HOMEPAGE="https://apps.kde.org/kio_gdrive/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64"
-IUSE="kf6compat +share"
-
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/kaccounts-integration:6[qt5]
-	kde-apps/libkgapi:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kaccounts-providers:*
-	kf6compat? ( kde-misc/kio-gdrive:6 )
-"
-BDEPEND="dev-util/intltool"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm "${D}"/usr/share/accounts/services/kde/google-drive.service \
-			"${D}"/usr/share/metainfo/org.kde.kio_gdrive.metainfo.xml \
-			"${D}"/usr/share/remoteview/gdrive-network.desktop || die
-		if use handbook; then
-			rm -r "${D}"/usr/share/help || die
-		fi
-		if use share; then
-			rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
-		fi
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..ed3d4000eaf0
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-23.08.5-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="optional"
+KDE_ORG_CATEGORY="network"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker for Google Drive service"
+HOMEPAGE="https://apps.kde.org/kio_gdrive/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64"
+IUSE="kf6compat +share"
+
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	|| (
+		kde-apps/kaccounts-integration:6[qt5]
+		>=kde-apps/kaccounts-integration-23.08:5
+	)
+	kde-apps/libkgapi:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/kaccounts-providers:*
+	${CATEGORY}/${PN}-common
+"
+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() {
+	if has_version -b "kde-apps/kaccounts-integration:6[qt5]"; then
+		PATCHES+=( "${FILESDIR}/${P}-kaccounts-integration-24.02.patch" )
+	fi
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	if use kf6compat && use share; then
+		rm -r "${D}"/usr/share/purpose/purpose_gdrive_config.qml || die
+	fi
+}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild b/kde-misc/kio-gdrive/kio-gdrive-23.08.5.ebuild
deleted file mode 100644
index 2c96475d1507..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-23.08.5.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="optional"
-KDE_ORG_CATEGORY="network"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker for Google Drive service"
-HOMEPAGE="https://apps.kde.org/kio_gdrive/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="+share"
-
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	|| (
-		kde-apps/kaccounts-integration:6[qt5]
-		kde-apps/kaccounts-integration:5
-	)
-	kde-apps/libkgapi:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kaccounts-providers:5
-"
-BDEPEND="dev-util/intltool"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..ee279b9aac08
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.05.2-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.3.0
+QTMIN=6.6.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.05.2.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.05.2.ebuild
deleted file mode 100644
index 6afd296e86de..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-24.05.2.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"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="network"
-KFMIN=6.3.0
-QTMIN=6.6.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}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-	kde-apps/kaccounts-providers:6
-"
-BDEPEND="dev-util/intltool"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF6Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-24.08.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-24.08.0.ebuild
new file mode 100644
index 000000000000..b2d6dda291ea
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# 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/metadata.xml b/kde-misc/kio-gdrive/metadata.xml
index 3517d3c77ec1..061e3c648d8e 100644
--- a/kde-misc/kio-gdrive/metadata.xml
+++ b/kde-misc/kio-gdrive/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=kio-gdrive</bugs-to>
+		<remote-id type="kde-invent">network/kio-gdrive</remote-id>
 	</upstream>
 	<use>
 		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
diff --git a/kde-misc/kio-gopher/Manifest b/kde-misc/kio-gopher/Manifest
index 5e2405449510..861ff3a033ec 100644
--- a/kde-misc/kio-gopher/Manifest
+++ b/kde-misc/kio-gopher/Manifest
@@ -1 +1 @@
-DIST kio-gopher-0.1.99.tar.xz 34176 BLAKE2B 6f02b96941c81c1658ebee6fdabae24a134993365a490f6de875009f5f303963b140412e2e440ef27cdd6666e06572ba2c57e6a5b001d7eb8c86a008ea62806c SHA512 1a61e79eacb88080f89c173ef87d48693ea874b4bf767f0854e44d0f918851baad02fed884ad2a915d5c2cd877cf17c6f076b242652ac6f483fc9a47aea86412
+DIST kio-gopher-0.1.99_p20240906-4ed56e64.tar.gz 44353 BLAKE2B 289b4a22528c105f3ffe88e9f2bfab2870de660b4d60a0b430bfc2c821e3f7bd5bcecd51c6e4e2db55c7c308a01b9232c0f4a16d498cc0c0c6c837cc84058f73 SHA512 c31f9fff0fc65a1a6355936d93d5e985177e84375006dc74446726e838ab4186de96746906b9f474326f2ada430ee6c07ed284464559977cbaaed3e16d714855
diff --git a/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild b/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
deleted file mode 100644
index 2288a4e15463..000000000000
--- a/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
+++ /dev/null
@@ -1,26 +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.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Gopher KIO worker for Konqueror"
-HOMEPAGE="https://userbase.kde.org/Kio_gopher"
-SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-misc/kio-gopher/kio-gopher-0.1.99_p20240906.ebuild b/kde-misc/kio-gopher/kio-gopher-0.1.99_p20240906.ebuild
new file mode 100644
index 000000000000..40e2c27c8b95
--- /dev/null
+++ b/kde-misc/kio-gopher/kio-gopher-0.1.99_p20240906.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=4ed56e64b9921eec474b49e913119449e7a91a0d
+KDE_ORG_CATEGORY="network"
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org
+
+DESCRIPTION="Gopher KIO worker for Konqueror"
+HOMEPAGE="https://userbase.kde.org/Kio_gopher"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/kio-gopher/metadata.xml b/kde-misc/kio-gopher/metadata.xml
index d925f2439758..afdec88ef6a8 100644
--- a/kde-misc/kio-gopher/metadata.xml
+++ b/kde-misc/kio-gopher/metadata.xml
@@ -6,6 +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=kio-gopher</bugs-to>
+		<remote-id type="kde-invent">network/kio-gopher</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/kio-stash/Manifest b/kde-misc/kio-stash/Manifest
index e4373d6d4594..8b5f94b978d8 100644
--- a/kde-misc/kio-stash/Manifest
+++ b/kde-misc/kio-stash/Manifest
@@ -1 +1 @@
-DIST kio-stash-1.0.tar.xz 25308 BLAKE2B 36329831bacd9cd271a52f7018ef4a46894a9ef65190d3372584cc489998197057e7d3ec64017446963ea024e9c50afb5fd5dc8c2d01c27cde7bc83844419cc5 SHA512 ca345a2cd2d8df72ad1f8de366ba290a21f0f3a98ac098d0393d66ec43334258e1e7222a19f89de9a53f152fe4c63aab1221dc045efee94385299fc63e65a931
+DIST kio-stash-1.0_p20240906-2a8b8801.tar.gz 66081 BLAKE2B 8920e4cfa3c9f0ecab894d03d14ef200fc6ca11579fb3018dd9613dfa6ab765743c7024867133703f77b942622bdc815d15ee8e88271ee9017ab4ee8bf996e91 SHA512 cdf19182f705b7a70a1e74a65fc08f27f2b554bf8d2a0fb050b6426ad0d1ec16b0ee0d8f55b70d841e85bc0a406d8ef2fea0394afd956feb713fe3af6ef01b31
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch b/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch
deleted file mode 100644
index 35b656fb6b73..000000000000
--- a/kde-misc/kio-stash/files/kio-stash-1.0-kioslave-no-desktop-app.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f977b43a47ebf6d26ee0bd6d35e0ac576bbbbf8a Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Fri, 9 Mar 2018 17:48:15 +0100
-Subject: kio slaves aren't desktop applications & drop incorrect provides
-
-Summary:
-https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#sect-Metadata-GenericComponent
-https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html
-
-also it seems a filestash binary isn't actually installed, so drop the
-provides entry for that
-
-Reviewers: shortstheory, bgupta, apol
-
-Reviewed By: apol
-
-Differential Revision: https://phabricator.kde.org/D11187
----
- src/org.kde.filestash.appdata.xml | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/org.kde.filestash.appdata.xml b/src/org.kde.filestash.appdata.xml
-index d532186..2df1a70 100644
---- a/src/org.kde.filestash.appdata.xml
-+++ b/src/org.kde.filestash.appdata.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<component type="desktop">
-+<component>
-   <id>org.kde.filestash.desktop</id>
-   <metadata_license>CC0-1.0</metadata_license>
-   <project_license>GPL-2.0</project_license>
-@@ -89,8 +89,5 @@
-       <image>https://cdn.kde.org/screenshots/kio-stash/kio-stash.png</image>
-     </screenshot>
-   </screenshots>
--  <provides>
--    <binary>filestash</binary>
--  </provides>
-   <project_group>KDE</project_group>
- </component>
--- 
-cgit v1.1
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-no-kf5config.patch b/kde-misc/kio-stash/files/kio-stash-1.0-no-kf5config.patch
deleted file mode 100644
index 1e434bb625ea..000000000000
--- a/kde-misc/kio-stash/files/kio-stash-1.0-no-kf5config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 624a1f38b9604def78c34e26ac31e1fd21c6673b
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Mon Jul 3 20:36:41 2017 +0200
-
-    Drop unused KF5Config dependency
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cbd710..1552df6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS
- )
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--    Config
-     KIO
-     DBusAddons
-     I18n
-diff --git a/src/ioslave/CMakeLists.txt b/src/ioslave/CMakeLists.txt
-index 462fef9..23922f8 100644
---- a/src/ioslave/CMakeLists.txt
-+++ b/src/ioslave/CMakeLists.txt
-@@ -6,8 +6,6 @@ target_link_libraries (kio_filestash
-     Qt5::DBus
-     KF5::KIOCore
-     KF5::I18n
--    KF5::ConfigCore
--    KF5::ConfigGui
- )
- 
- set_target_properties(kio_filestash PROPERTIES OUTPUT_NAME "filestash")
-diff --git a/src/ioslave/ioslave.cpp b/src/ioslave/ioslave.cpp
-index b280f11..8928efb 100644
---- a/src/ioslave/ioslave.cpp
-+++ b/src/ioslave/ioslave.cpp
-@@ -34,7 +34,6 @@
- 
- #include <KProtocolManager>
- #include <KLocalizedString>
--#include <KConfigGroup>
- #include <KFileItem>
- #include <KIO/Job>
- 
diff --git a/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch b/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch
deleted file mode 100644
index 93c786d7ad12..000000000000
--- a/kde-misc/kio-stash/files/kio-stash-1.0-unused-includes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c49db3ddb772ae7eb5bf6fc291e5e42391c930f8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 28 Nov 2020 17:28:00 +0100
-Subject: [PATCH] Remove unused includes
-
----
- src/iodaemon/stashnotifier.cpp | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/iodaemon/stashnotifier.cpp b/src/iodaemon/stashnotifier.cpp
-index 4cfbafc..b427836 100644
---- a/src/iodaemon/stashnotifier.cpp
-+++ b/src/iodaemon/stashnotifier.cpp
-@@ -20,16 +20,8 @@
- #include "stashnotifier.h"
- #include "stash_adaptor.h"
- 
--#include <QDir>
--#include <QFile>
--#include <QFileInfo>
--#include <QMetaType>
--#include <QDBusMetaType>
--
- #include <KDirWatch>
- #include <KPluginFactory>
--#include <KPluginLoader>
--#include <kdirnotify.h>
- 
- K_PLUGIN_FACTORY_WITH_JSON(StashNotifierFactory, "stashnotifier.json", registerPlugin<StashNotifier>();)
- 
--- 
-GitLab
-
diff --git a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
deleted file mode 100644
index ba9e9501f735..000000000000
--- a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KIO worker and daemon to stash discontinuous file selections"
-HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://invent.kde.org/utilities/kio-stash"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-kf5config.patch
-	"${FILESDIR}"/${P}-kioslave-no-desktop-app.patch
-	"${FILESDIR}"/${P}-unused-includes.patch
-)
diff --git a/kde-misc/kio-stash/kio-stash-1.0_p20240906.ebuild b/kde-misc/kio-stash/kio-stash-1.0_p20240906.ebuild
new file mode 100644
index 000000000000..eeff0a865354
--- /dev/null
+++ b/kde-misc/kio-stash/kio-stash-1.0_p20240906.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=2a8b88014643538a2fd8aad9e39f362d1fc91bf3
+ECM_TEST="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="KIO worker and daemon to stash discontinuous file selections"
+HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://invent.kde.org/utilities/kio-stash"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	>=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
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/kio-stash/metadata.xml b/kde-misc/kio-stash/metadata.xml
index 21702b0130f5..a0105f5769b3 100644
--- a/kde-misc/kio-stash/metadata.xml
+++ b/kde-misc/kio-stash/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=kio-stash</bugs-to>
 		<remote-id type="kde-invent">utilities/kio-stash</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 7df8124fb483..3367fe8f6e0e 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,2 +1,3 @@
 DIST krename-5.0.2-patchset-1.tar.xz 6360 BLAKE2B 69e8b046885be27c77d5d315e994e8b2a31e76ed76f4ea6d030679b83133725cb0577d818841b1f41e566e757f4cbd4e08c1f479bc1d572a8391db47c4a26e8c SHA512 2de0ee19d29dadb50995b0d02e486e8efdbff3d3fda0a3a6ec69f4b5858b4c376b3d33d2018da0cf2333309fe8b4ea58f4de21f6d2864c2c22b60830b5ac9bcf
 DIST krename-5.0.2.tar.xz 337908 BLAKE2B 2fb7a96ca3f3f3b193d0924dd1131a7442b32149c1f62387734c47680077b6f77e3cf32b940b85d6f688d24f24af08ac39a8ccc86f10f5ec1d65b53fc9631108 SHA512 c065d6de90c43e5297db2773d8569279535b007d3b00b99a252329e78c90dc949678ecd2f2ecaa74e72394fa0e848b8774f6f387d4a7f367b367b1dd38405545
+DIST krename-5.0.60_pre20240906-434e7668.tar.gz 814409 BLAKE2B 38f6250a84317cc2daec763f515ac50afc4b463605dd136bdc3706d22681a70619e8eeb0385a0f858cd2b6feb0121a93129f19c62a0be913b27f34abcbfcd60b SHA512 36863e6b7650389c519b06b6c6e2f7600c8c82f6f393c1f497fd4f36c6a59f88edd6bd04573b27371ae8775082d270d8b0026bd196b0ad3f874a7cad9189db88
diff --git a/kde-misc/krename/krename-5.0.60_pre20240906.ebuild b/kde-misc/krename/krename-5.0.60_pre20240906.ebuild
new file mode 100644
index 000000000000..81a179ade243
--- /dev/null
+++ b/kde-misc/krename/krename-5.0.60_pre20240906.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=434e76680c8880efc450056f074f027aca26fd75
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="Powerful batch file renamer"
+HOMEPAGE="https://apps.kde.org/krename/ https://userbase.kde.org/KRename"
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="exif office pdf taglib truetype"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${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/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	exif? ( media-gfx/exiv2:= )
+	office? ( >=kde-frameworks/karchive-${KFMIN}:6 )
+	pdf? ( app-text/podofo:= )
+	taglib? ( media-libs/taglib:= )
+	truetype? ( media-libs/freetype:2 )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package office KF6Archive)
+		$(cmake_use_find_package pdf PoDoFo)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package truetype Freetype)
+	)
+	ecm_src_configure
+}
diff --git a/kde-misc/krename/metadata.xml b/kde-misc/krename/metadata.xml
index d925f2439758..f256729a2636 100644
--- a/kde-misc/krename/metadata.xml
+++ b/kde-misc/krename/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="office">Enable support for file naming based on ODF metadata</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-misc/krusader/krusader-2.8.1-r1.ebuild b/kde-misc/krusader/krusader-2.8.1-r1.ebuild
deleted file mode 100644
index 4e4bd0f9d63d..000000000000
--- a/kde-misc/krusader/krusader-2.8.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org optfeature
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
-HOMEPAGE="https://krusader.org/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}: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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	sys-apps/acl
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kio-extras:5
-	kde-apps/thumbnailers:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_comment_add_subdirectory doc/handbook
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5"
-		optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}"
-		optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}"
-		optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-misc/krusader/krusader-2.8.1-r3.ebuild b/kde-misc/krusader/krusader-2.8.1-r3.ebuild
new file mode 100644
index 000000000000..2a8de91526f5
--- /dev/null
+++ b/kde-misc/krusader/krusader-2.8.1-r3.ebuild
@@ -0,0 +1,85 @@
+# 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 kde.org optfeature
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+fi
+
+DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
+HOMEPAGE="https://krusader.org/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}: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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	sys-apps/acl
+	sys-libs/zlib
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/kio-extras:5
+	kde-apps/thumbnailers:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	|| (
+		kde-plasma/kdesu-gui:*
+		kde-plasma/kde-cli-tools:*[kdesu(-)]
+	)
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_comment_add_subdirectory doc/handbook
+}
+
+src_configure() {
+	local mycmakeargs=( -DKDESU_PATH=/usr/bin/kdesu )
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5"
+		optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}"
+		optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}"
+		optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-misc/krusader/krusader-2.8.1.ebuild b/kde-misc/krusader/krusader-2.8.1.ebuild
deleted file mode 100644
index fd34eb8a83a5..000000000000
--- a/kde-misc/krusader/krusader-2.8.1.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="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org optfeature
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
-HOMEPAGE="https://krusader.org/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}: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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	sys-apps/acl
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		kde-apps/kio-extras-kf5:5
-		kde-apps/kio-extras:5
-	)
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_comment_add_subdirectory doc/handbook
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5"
-		optfeature "Markdown text previews" "kde-misc/markdownpart:${SLOT}"
-		optfeature "PDF/PS and RAW image thumbnails" "kde-apps/thumbnailers:${SLOT}"
-		optfeature "video thumbnails" "kde-apps/ffmpegthumbs:${SLOT}"
-		optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index 4d4f7510ad99..9fbcdaf82dd9 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,2 +1 @@
-DIST kshutdown-source-5.2.zip 445025 BLAKE2B 161a637ded6fa7ddc11daab5bfa20efe51bee0407339e178668c584cc690dd419bfb1e7e134cbc9ec3274a394d47496423f8b3b561cdd8083470daa4e8d24511 SHA512 ac46164da88815604007e637663c42430212b37231d6116fd31b947b24d2bd69aff0d79fcab570425960420d77168de184ccda99dd685bec96bb353cb578ee04
 DIST kshutdown-source-5.92-beta.zip 529301 BLAKE2B 6c0edb821c8d6c1f63fd2baa4d9ce5f1168b742ab8fb0bc0bcb7fa14f1613ef83c5c3c06dd59f9b9b436826980e5fa6a13a0088002379a82b0eb07a82e1a6771 SHA512 0958ea112b44b7eb837aad6a5f17e9a86455b285d4ae02c53e5a60057f23d3c253f71f02a03fbabd22bb8ff101eea45f00b27f98c8e63c1cc312e09e0f262203
diff --git a/kde-misc/kshutdown/kshutdown-5.2.ebuild b/kde-misc/kshutdown/kshutdown-5.2.ebuild
deleted file mode 100644
index 0b2ab75883bf..000000000000
--- a/kde-misc/kshutdown/kshutdown-5.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 xdg
-
-DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
-HOMEPAGE="https://kshutdown.sourceforge.io"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-source-${PV}.zip"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+kde"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kcrash:5
-		kde-frameworks/kdbusaddons:5
-		kde-frameworks/kglobalaccel:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kidletime:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/knotifyconfig:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-"
-RDEPEND="${DEPEND}
-	|| (
-		kde-frameworks/breeze-icons:*
-		kde-frameworks/oxygen-icons:*
-	)
-"
-BDEPEND="
-	app-arch/unzip
-	sys-devel/gettext
-	kde? ( kde-frameworks/extra-cmake-modules:0 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKS_PURE_QT=$(usex !kde)
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-misc/kshutdown/kshutdown-5.92.ebuild b/kde-misc/kshutdown/kshutdown-5.92.ebuild
index c67b3c6db5fb..d852af0d0b23 100644
--- a/kde-misc/kshutdown/kshutdown-5.92.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.92.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-beta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+kde"
 
 DEPEND="
diff --git a/kde-misc/kweather/Manifest b/kde-misc/kweather/Manifest
index ddf88fceb8b8..1b72fa658238 100644
--- a/kde-misc/kweather/Manifest
+++ b/kde-misc/kweather/Manifest
@@ -1,2 +1,3 @@
 DIST kweather-23.08.5.tar.xz 946796 BLAKE2B 1fcafac557c28dddd6cd4c345733bb38ac3a03496c78537338fa16b39037c28938bdbb0e89846f0e1fa0bd3725c0e9ec03b8b9b78fe5977e8666c6316ca738bc SHA512 75787edbfecf7137eefa071f3b339b87110744876fdc3fb7ea56cf976bdd95912ed4001cee474ccf29e385202b9e56fd04ddaa8077b4509c14a1059c6f22e255
 DIST kweather-24.05.2.tar.xz 949772 BLAKE2B 5e64a774bfd3854d37a68ecc2072a588b211154e4938c98adeed9f386b26326086239c3715743f4a9f49f35a12aa73758b3f82c93d2cc4f660c1eab1f3436056 SHA512 5605fe11efb9cd58ad4faf148101b82330d91b20ebee217763aafb2e0ae923e5295aaa0832ea7969b363af9d5ce144a2d637a4e0d741c5b5821326d08290b39e
+DIST kweather-24.08.0.tar.xz 416608 BLAKE2B ef1e09ad6d3288106d92f80e6251b63c818f435b1796a4e118249f671f22a8e00a2c7b5d62d86effe7dabea4e6fe65699ce5f8400375c8bd5dc415a144fe927e SHA512 d32525bef5a62425930b0bfd2eeeeedcf486e0f9296d551ca8afccd91abcddbd2771aa7238ee85fe0920495a91d6698bc66c6983a79c4257de77443b84d518c1
diff --git a/kde-misc/kweather/kweather-24.05.2.ebuild b/kde-misc/kweather/kweather-24.05.2.ebuild
index 5bfd4775b820..8e9f1b1249cb 100644
--- a/kde-misc/kweather/kweather-24.05.2.ebuild
+++ b/kde-misc/kweather/kweather-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kweather/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 DEPEND="
 	dev-libs/kirigami-addons:6
diff --git a/kde-misc/kweather/kweather-24.08.0.ebuild b/kde-misc/kweather/kweather-24.08.0.ebuild
new file mode 100644
index 000000000000..eaf3a274d945
--- /dev/null
+++ b/kde-misc/kweather/kweather-24.08.0.ebuild
@@ -0,0 +1,52 @@
+# 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/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
index ca0038d93eac..90119662e2e7 100644
--- a/kde-misc/markdownpart/Manifest
+++ b/kde-misc/markdownpart/Manifest
@@ -1,2 +1,3 @@
 DIST markdownpart-23.08.5.tar.xz 31544 BLAKE2B b7830e0b9083a5436a84596138881b891e527cd4f2ba16fc84a3de2f1a3a5911950db3973af0e5e9a9411d8ce994e4055dbde66f9393c7d72b8ac317c91706d5 SHA512 81cf38f47b977d625c3914403ba0aa34611464d9e1503088392a064b8f074d856b35cc456949a6da37e04628f4387c49d83290da993730a0dadf24afc31b074d
 DIST markdownpart-24.05.2.tar.xz 33940 BLAKE2B 8ba8bdba9d13d1ebca3d71c77dfcea13fbf79ad1e187d5d386841f8612817bafcefe641cb3373c20c9d37ba98f8cdc54c28d0f2e295bc84d0990695b2d9ae2b1 SHA512 70643f8a0396feb6ec7f74fe571cd25b64bb7e31f65eb068f0a5819a033fd0c9264b2aa25359adf100593789f72768b68e4917310699e9dcd740a055ce638fab
+DIST markdownpart-24.08.0.tar.xz 33932 BLAKE2B 2e6d2bdfd86d4ee908c5e229493d12e8c016fc913569c54b7a808d0fadcb548120746d6982021b19b780dbc1d6fc675550ec114fc2f61f6d15140870ee771e5a SHA512 0180ac5cf7eabde9a1467c944908ce60899426aa0b39e3ef3ba889305aa1364be7c295a9b5fc30ee7e2d9bff70598923a6c80f3426ecd71ac90f015e7c344d10
diff --git a/kde-misc/markdownpart/markdownpart-24.05.2.ebuild b/kde-misc/markdownpart/markdownpart-24.05.2.ebuild
index 5e8f40c919ef..0de033c8cd13 100644
--- a/kde-misc/markdownpart/markdownpart-24.05.2.ebuild
+++ b/kde-misc/markdownpart/markdownpart-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/markdownpart/"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/markdownpart/markdownpart-24.08.0.ebuild b/kde-misc/markdownpart/markdownpart-24.08.0.ebuild
new file mode 100644
index 000000000000..4b5c9ca6cf41
--- /dev/null
+++ b/kde-misc/markdownpart/markdownpart-24.08.0.ebuild
@@ -0,0 +1,28 @@
+# 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/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index 804170d2cf94..45ef461b995e 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1,2 +1 @@
-DIST plasma-pass-1.2.1.tar.xz 41608 BLAKE2B eb7f73be34bf014f6947029976a2922548ee307356da3f42bbb96ff6b14db91be98df2d0656a4bdc04b5d03d899f6eec06f4de5450f6d9f528a150c88530f670 SHA512 eff989e045ece776a5f2696c09381ecd8f49ba83cf7de89840ab1cad89bd15e33b9b331d9c91d16956a3d5b8e5f67f52a1aa176abf1d8023b57c18573c8ce5f9
 DIST plasma-pass-1.2.2.tar.xz 42776 BLAKE2B c9956304665b1f355d04ca1f89d55296f920f2260013aabd42066f41d527aa45097802898d8942df40477ebc0ac4efa577ead1cfd03d7c06796a3a65d2c2219a SHA512 40a6ee175ff1801cee84947639414f3e01c1fc28ad08ef54bbf1b131ecb8239236274ef10ae6c0aab600ccdc25c17bca24a245e78506331d416ee6d9b5e874be
diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild
deleted file mode 100644
index 6ae238bba32f..000000000000
--- a/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.102.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet to access password from pass"
-HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~riscv"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-IUSE=""
-
-DEPEND="
-	app-crypt/gpgme:=[cxx,qt5]
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	sys-auth/oath-toolkit
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild
index c95df5bdcb93..0324d1170163 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.2.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/pla
 
 if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~ppc64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 191bc88fb90e..12d6fcbea908 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1 +1,2 @@
 DIST skanlite-24.05.2.tar.xz 2383592 BLAKE2B 37a96a3ef1624eec779d26d16d9f1ed8447763c64e3c601b7b937c301d7b35a79384fdabf9330c8b980402a10920b5c6dfec849fe63c82aba5340743517ef2a6 SHA512 126f085a904bae344ad9b019f2c5dfccf5d3def87eb1a3293a668e641d4daa56a0c199433510886fb9325d6e51a539b9de1af6ffae7bc880dec9efbc9a6f59b9
+DIST skanlite-24.08.0.tar.xz 2383804 BLAKE2B 90244a5f48e66102c5b096d132e2021856bbffe01e393319ad764b4b6e4d70a81434a5061f06e4249761f011f12729b08756b39f5d766c4266e941e1303f607d SHA512 eb39a25e078df7904c5b573fe60a59f6732b8ce8b37e6e23a4616f89a0cce61a7d2282b3a827cc923c5a00c08a246524c38db6b4e7c7a5d57c0d3753d6263d93
diff --git a/kde-misc/skanlite/skanlite-24.08.0.ebuild b/kde-misc/skanlite/skanlite-24.08.0.ebuild
new file mode 100644
index 000000000000..c856571b5627
--- /dev/null
+++ b/kde-misc/skanlite/skanlite-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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/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 f1642c3574f9..134f59df8b64 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
 DIST tellico-3.5.5.tar.xz 6796536 BLAKE2B 6e526869840a865bc4dcca37e42141889c66739bee657592d9233eda20da1d6e9fdf44f82a29c6b656f34da82f56b2580324278fd73a810e13c844a72d4abd2c SHA512 4bbb975a8d23ac6fb45160b42d7d893adbaa772fd9f04a5a72a5a48c447cfcf1a933e192d71705b59c36cf64f50038248002174ad132d8f22848e3bbbee5dea7
+DIST tellico-4.0.tar.xz 6794676 BLAKE2B f073448302a994ba3f664bae2f939040b4e635b58ecb7d36fb8415936758dce341cdf47823657b22a9b81cf766703378223004b2679e06ef921b7cf5afc056ce SHA512 e7b32cad708ea48ae614461e3a204a114ecd66d5c45c54295b3e97f722735ea428d7b2a2ccd50571b17db81c42ede0aa0db39a31a6e6b8563a5cff88b38f745f
diff --git a/kde-misc/tellico/tellico-4.0.ebuild b/kde-misc/tellico/tellico-4.0.ebuild
new file mode 100644
index 000000000000..b2c38e9e7150
--- /dev/null
+++ b/kde-misc/tellico/tellico-4.0.ebuild
@@ -0,0 +1,86 @@
+# 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="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 b9a994efb832..c61a38e30d09 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,2 +1,3 @@
 DIST zanshin-23.08.5.tar.xz 365784 BLAKE2B e13ab967a3ed42626033401e7a88695554cde43156a2d7c3fbc7e5d77f846503bb5203a1c7517a8baf96a3849a038017368928972b9357021d0a17ffdd8d59aa SHA512 db9706902dc2733859f7af56ca6885f0b9731ca4ca692abe66f36e8dfadb9e2b65556600e79bb84bb19425681f9b457c29e0589c7701bf31b015f66cb825474e
 DIST zanshin-24.05.2.tar.xz 374592 BLAKE2B c3302c5638ddd6fa856f2597eae2a7924ec60747fde8d5b077858920ee75fb3a8aaeb79045bef8fa6a4fde2d350c50bf720cf7eb0655e0edbd395fc7c6128438 SHA512 f38ab59cb0ca31a94c00ef189f1e185092fc27a83d29c0279392bedddc1f09d9894b058d9ee770aeec3cb0949e1b8e31fa3951bf410974703980c72809a2907b
+DIST zanshin-24.08.0.tar.xz 375224 BLAKE2B ff84b579f8dc52ca85f8f1d70a990d0740512cca6c74b9ef0042fdfaa1c2639665a030aa83d82a40965a35218ebbb254f91f926d941655642708506328d1285d SHA512 74b0d76c8e50721553b076e5394b6eccf1051b85e818fc9bf2df358432fef15527a522c600b3e70a40d6551d18fda5db7bc8ef47c44e1c0438695c0415f7eb81
diff --git a/kde-misc/zanshin/zanshin-24.05.2.ebuild b/kde-misc/zanshin/zanshin-24.05.2.ebuild
index bc075c1ba2e9..8b7f640e39ac 100644
--- a/kde-misc/zanshin/zanshin-24.05.2.ebuild
+++ b/kde-misc/zanshin/zanshin-24.05.2.ebuild
@@ -16,7 +16,7 @@ https://userbase.kde.org/Zanshin"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 RESTRICT="test" # bug 785844
diff --git a/kde-misc/zanshin/zanshin-24.08.0.ebuild b/kde-misc/zanshin/zanshin-24.08.0.ebuild
new file mode 100644
index 000000000000..53c0b1afbe4b
--- /dev/null
+++ b/kde-misc/zanshin/zanshin-24.08.0.ebuild
@@ -0,0 +1,58 @@
+# 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.5.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/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/Manifest b/kde-plasma/bluedevil/Manifest
index e45d5d759422..14f13f8ebcdc 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,3 @@
 DIST bluedevil-5.27.11.tar.xz 366752 BLAKE2B 707c44f6cc918d80b9a93619b4fc47c8d3c7caf6436dfa34a1a336c3c7e4bf8c9b9409a7f07c56c55463301bac62c0c9a9d512ed74e52c0087fc530dbf7206cb SHA512 8eefad775088347456fc3a4ee04e13f83678867cde2076ade6905355a5c2847d7a177d449ba909c627be791584e16e6e0e8c13c2e46b42eb18dd9547a4d0deee
 DIST bluedevil-6.1.4.tar.xz 373600 BLAKE2B 5efb1f9e22b11269131372434cd51a0aaa35fd5bb8b8fb4d4e8a82670c2982d1a36c08a0f2bd8bec0a195b0b6c1f30459ec52ee3d2706c0c40e7501adb63e4ce SHA512 e2cecda61893827e769c604b92619689787d135fe31162e98e14bdcf84aa0c8b35cb1edcbfcb2c6982096d56e8449e4508d7775529d3a28848c7688744c4f535
+DIST bluedevil-6.1.5.tar.xz 379372 BLAKE2B 87f6721011fd1e06f7574a73889bf8094133050987ebfab6f50e14d797dde4b50b652b8beeafd973f513c99e7ff1c5249f8ec9e6642e4c7f287d25f3716e95f8 SHA512 920f62ea75003637e20d1f940cf3a756312f8c86eea0f9d8cffd5126118f940a2183fd1735b2468bee0e9a6d97b5b686d35adf02f275eb39d6e07feab666f9b1
diff --git a/kde-plasma/bluedevil/bluedevil-6.1.4.ebuild b/kde-plasma/bluedevil/bluedevil-6.1.4.ebuild
index a7b8e34b8d9c..d1581a4c9d34 100644
--- a/kde-plasma/bluedevil/bluedevil-6.1.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-6.1.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/bluedevil/bluedevil-6.1.5.ebuild b/kde-plasma/bluedevil/bluedevil-6.1.5.ebuild
new file mode 100644
index 000000000000..bf9cfa275770
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-6.1.5.ebuild
@@ -0,0 +1,42 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/bluez-qt-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}: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/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-plasma/libplasma-${PVCUT}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 4adf6cbe5164..f8d29bebfe79 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-grub-5.27.11.tar.xz 3145680 BLAKE2B 0143cefba69d45aacca005567b9f94b4e4abda728d0c2e8ec35543bd5ca5b007a78b4781a87f19417c7db339e3ecb05be8f80a3815b60c410de4dd27c0bd6ca0 SHA512 36f2c36d7d013ecdbf1ff80d6270e42ac06ab8fbcc12ba27d604657346b92f43661723e1ddfb6a3df7d76b3195f6808b8cce0bb8481783de5a46f6ab84442ff6
 DIST breeze-grub-6.1.4.tar.xz 1446064 BLAKE2B 86f42911f8761a924245869d35e7dd3d3bda7e9501999d136ca03f79164819fda8b2d63f449c24469e72965b1818dfcf12b88764d3d852ac292eb7950c9d2eea SHA512 0232885e5214cda7605787ef457011049f8f480046723a661a669c1e6b96a81601cbeab208cea8ec1d65bf3ecebbc89f99fc39eceb56766b6cffb049dcbe9496
+DIST breeze-grub-6.1.5.tar.xz 1445448 BLAKE2B 62ec714c72e42dd6fafb2bbffeb98a7a81361e1f90db07f5305d3f471526b8a1e3cc1a876875bdaac4225d5740455ef47c46c888b20e937a15ae4b5ff81c78f7 SHA512 6eeff8b340a05e304479219123285f60d127c2fd8be6699353f1e4f69affb28aa597af2a99d488093ac862b30a3bb8386ff0276daf8b39d4f682085d0ebaf474
diff --git a/kde-plasma/breeze-grub/breeze-grub-6.1.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.1.4.ebuild
index 318123de73fa..ba92fae04310 100644
--- a/kde-plasma/breeze-grub/breeze-grub-6.1.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-6.1.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-grub/breeze-grub-6.1.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.1.5.ebuild
new file mode 100644
index 000000000000..318123de73fa
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-6.1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+inherit plasma.kde.org
+
+DESCRIPTION="Breeze theme for GRUB"
+
+LICENSE="GPL-3+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+src_prepare() { default; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 0a85ef1a6558..3349915c8e0a 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-gtk-5.27.11.tar.xz 40688 BLAKE2B 0843870e93b21f890ef12c16e1ba25b02ba26774588a22a6fc77d1f6205769992ed30001cd2ffbfa85890581077f009b8bcaa02d00cb0bc5f1d9686a65f7dd89 SHA512 0d9f86142342d124cb31151695038c8cb03b5c7c16f21443e0e1613ec184c37ed7eebc46fadd74f6c553a1081d60846d53072e979e39ba455ca517825eaab846
 DIST breeze-gtk-6.1.4.tar.xz 40656 BLAKE2B 014ff6c01af9aedcb60788beea7e5b35445f531479baf53ced7b3cff475fe1e5d7d7dce8f7d8c57d18300257ec105e4e89ff75c486c028b3b0ad9781c84b8d74 SHA512 b1487358743a9a2385d91971ccf01d35fefe52f48e3e449c17b39975cf54f47b10a88273142334a45a76f3f4a5daa91c95f668b5abb201326cd762291f438fec
+DIST breeze-gtk-6.1.5.tar.xz 40668 BLAKE2B 85f2ee1e40d54e730724b4268776cb903eca23a4682cf37d1233f2934e7892967ce9882908c38d065752619f0c0f538477a09eae1e5e4cd11ecb81f9d88fb953 SHA512 fb7adb0e2072d934d02c24e16ffbebe9eb88981ba5bf0c8bfa05b7ef5d4de07935eff69b6b318d8aaf1380d137c98c82607173e7cd58314c46fdf1d737cf3109
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-6.1.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.1.4.ebuild
index 214aef709746..01840fc838de 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-6.1.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-6.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-6.1.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.1.5.ebuild
new file mode 100644
index 000000000000..4dc8d12f7dad
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-6.1.5.ebuild
@@ -0,0 +1,32 @@
+# 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)
+PYTHON_COMPAT=( python3_{10..12} )
+inherit ecm plasma.kde.org python-any-r1
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/sassc
+	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=kde-plasma/breeze-${PVCUT}:6
+"
+
+python_check_deps() {
+	python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index e97b841b146e..720a9208f2a9 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-plymouth-5.27.11.tar.xz 111328 BLAKE2B 19fe9b59d0b5816f2dde0366cc4b1c364892624949eba38ca518a1ad7733ac13cb27af4d816b8a7510f174ac68854a3adb82c406c064c670db18cce2478bb54d SHA512 fcd681089d1f78aa96546d3e9ed0a03ed091646f2874d4b6152bdd4056946a3a566a35c2aa01ec16bb593b87bf3d7677ebd6689bf76c6f0686db2a08bf7fdfef
 DIST breeze-plymouth-6.1.4.tar.xz 111080 BLAKE2B 3b40640904fb1bb0b0476966a98582775670c09c529a9948d840487012089ac2b9f9e357146aecf6d809e68ac9d4878a82fbddc8c587f89a83f78e254b58b8d4 SHA512 f43c8d07b587d7d0c3d2f1cedb0ed9a397bf6fac87a1bd825006fa9615e41b3f4eadcb843101577e24fe3d8650c053e78509bd23aed66843269f39c90819c637
+DIST breeze-plymouth-6.1.5.tar.xz 111132 BLAKE2B 36ca1f2e8af816e902cd8a334513ad8ba413ab02cd87cfb4ee868f7f4f81181dacc18a9ed6e693c201d5aede8a29efd58b7d18264aac7a97f965962b8da00523 SHA512 5fbae13dd6b44c8120976dae4ab9acac0e92e0da3b1830290e8e93d6c1e56da9567f528f8a4ed6429dbd950d58caec56fa5290f89d498eca8ab4d03170358172
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.4.ebuild
index e4fd32205b1e..1a656b67f6d0 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.5.ebuild
new file mode 100644
index 000000000000..914d9f53f170
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.1.5.ebuild
@@ -0,0 +1,28 @@
+# 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)
+inherit cmake plasma.kde.org
+
+DESCRIPTION="Breeze theme for Plymouth"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	cmake_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 9ae1f7ca6f60..36250949b5a9 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-5.27.11.tar.xz 87586968 BLAKE2B de90aa5203e6252c2e5400daf46f187d522319888f1c44006eeaaa4f57e87de97911511a9448fb286218b64b0526546ca341868c05f83f135bbe85ca9910ea1c SHA512 71d0b7421c7fa80e67410777fc37aa5ac0f51e74d593baa5ebd38e7f0313986974a1eb606e26c1b335b9ceb4b95717f43d6a45a25dd8de705d49d5a3f74e2bd6
 DIST breeze-6.1.4.tar.xz 58039692 BLAKE2B 0506fa24e3c98dd76cb5432d18f0a959e9c35f908a3057a611faea95a445ed81049c24c955b87153e973dc96fb25e1dd0ebbb6a7207e547b725743025cc43fee SHA512 51436a5d47b18545a186899f3599e0a23d60ff848bac629cbaff24b3eb55d7161b57952b39c0500f2682012eee4442f5d94b66cff27cc1497b5047d0648aed83
+DIST breeze-6.1.5.tar.xz 58041424 BLAKE2B 110ec250833a95fab278a9c10defe9203c85b3513b921bbda3a20dadb36d51aa23f4784fe2f384f9a781a1d67d9496584a6c29c6216c1abf1cb5ebee88d1dad4 SHA512 0107e117e3576d7d3fbffbe22d94afcc165b6f7055cb6220b5d284b2616221fff935d71898e00f7b68b0acf04f764d3492ca595caf06e7d3a692632a7887217a
diff --git a/kde-plasma/breeze/breeze-6.1.4.ebuild b/kde-plasma/breeze/breeze-6.1.4.ebuild
index e834c2a8b6eb..7da35baef0d5 100644
--- a/kde-plasma/breeze/breeze-6.1.4.ebuild
+++ b/kde-plasma/breeze/breeze-6.1.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="qt5"
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/breeze/breeze-6.1.5.ebuild b/kde-plasma/breeze/breeze-6.1.5.ebuild
new file mode 100644
index 000000000000..0df950ab246e
--- /dev/null
+++ b/kde-plasma/breeze/breeze-6.1.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KF5MIN=5.115.0
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QT5MIN=5.15.12
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="qt5"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/frameworkintegration-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${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/kirigami-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-plasma/kdecoration-${PVCUT}:6
+	qt5? (
+		>=dev-qt/qtdbus-${QT5MIN}:5
+		>=dev-qt/qtdeclarative-${QT5MIN}:5
+		>=dev-qt/qtgui-${QT5MIN}:5
+		>=dev-qt/qtwidgets-${QT5MIN}:5
+		>=dev-qt/qtx11extras-${QT5MIN}:5
+		>=kde-frameworks/frameworkintegration-${KF5MIN}:5
+		>=kde-frameworks/kcmutils-${KF5MIN}:5
+		>=kde-frameworks/kconfig-${KF5MIN}:5
+		>=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
+		>=kde-frameworks/kguiaddons-${KF5MIN}:5
+		>=kde-frameworks/ki18n-${KF5MIN}:5
+		>=kde-frameworks/kiconthemes-${KF5MIN}:5
+		>=kde-frameworks/kirigami-${KF5MIN}:5
+		>=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+		>=kde-frameworks/kwindowsystem-${KF5MIN}:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	qt5? ( >=kde-frameworks/kcmutils-${KF5MIN}:5 )
+"
+PDEPEND=">=kde-frameworks/breeze-icons-${KFMIN}:*"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_QT6=ON
+		-DBUILD_QT5=$(usex qt5)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 146b2179b95b..bbe61f8d36dc 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,3 @@
 DIST discover-5.27.11.tar.xz 881132 BLAKE2B 8f60d92745f38aef3a767f41c763d12fe07a915ea7f89ce03a37f1ed4bae1814081d08761be496e1020998a986650269f217eb6820a15b7bbb84aa056034ce60 SHA512 3393b99df506314420c18d2fbf05f7476dd86d4b27c1a153f5da4ebce03add63b0001194d1717b90d0f4bb34f106f34ed4f54f06bcdbf7aa3de492b94a470e37
 DIST discover-6.1.4.tar.xz 1024716 BLAKE2B 691201ec6de766011ac3d760824f3710d720da29b39584187144fddc301bc55319334c07f0823b638110fd37ddf80d82b91842383150c137a4efc41aa010071d SHA512 0f1777929bb05ac563bb62b083279ce8c5f1ae7c3c4ecb90a373a86a9168b13b6c454e6cb79a6fed6b1bc07ab39dfaf4d9e6d73bc4246bac1a7ad352712c7892
+DIST discover-6.1.5.tar.xz 1025644 BLAKE2B 094503733c528b0992fad0e9ff2ee42791e03f2c23e57617a76074a48bdb865c3f75aff2e19b430ba0895eb963460e1f504da8645d2162ae40b239bd29d836e5 SHA512 ea604afb73003b3d0e67bab78c6165f7a347499baf778928deaa03a48f0e9d06f6d4e753b3aa823bbd4e6cf39932d7a8432924d03da3bc3eea98052d7e433a4e
diff --git a/kde-plasma/discover/discover-6.1.4.ebuild b/kde-plasma/discover/discover-6.1.4.ebuild
index 68e956f5b0cf..829e37749342 100644
--- a/kde-plasma/discover/discover-6.1.4.ebuild
+++ b/kde-plasma/discover/discover-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE="+firmware flatpak snap telemetry webengine"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/discover-6.1.5.ebuild b/kde-plasma/discover/discover-6.1.5.ebuild
new file mode 100644
index 000000000000..cd4d97c7cc48
--- /dev/null
+++ b/kde-plasma/discover/discover-6.1.5.ebuild
@@ -0,0 +1,93 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+firmware flatpak snap telemetry webengine"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-libs/appstream-1.0.0:=[qt6]
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/attica-${KFMIN}:6
+	>=kde-frameworks/kauth-${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/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	firmware? ( >=sys-apps/fwupd-1.9.4 )
+	flatpak? ( sys-apps/flatpak )
+	snap? ( sys-libs/snapd-glib:=[qt6(-)] )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+	webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	snap? ( app-containers/snapd )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_kf_module Archive
+	# we don't do anything with this
+	sed -e "s/^pkg_check_modules.*Markdown/#&/" \
+		-e "s/^pkg_check_modules.*RpmOstree/#&/" \
+		-e "s/^pkg_check_modules.*Ostree/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: Port PackageKit's portage back-end to python3
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON
+		# Automated updates will not work for us
+		# https://invent.kde.org/plasma/discover/-/merge_requests/142
+		-DWITH_KCM=OFF
+		-DBUILD_DummyBackend=OFF
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		-DBUILD_FwupdBackend=$(usex firmware)
+		-DBUILD_RpmOstreeBackend=OFF
+		-DBUILD_SnapBackend=$(usex snap)
+		-DBUILD_SteamOSBackend=OFF
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+		$(cmake_use_find_package webengine Qt6WebView)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest|flatpaktest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index feee74868ce2..382a53be0c02 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,3 +1,4 @@
 DIST drkonqi-5.27.11.tar.xz 865308 BLAKE2B 62d395cd6fa18c08037886ad1b9240f080789c651d6b46a4f24eaff67ff1cd36656c1700df33d4ccff21d6cc2abad4e965fa5f678e2739ac745ef8a5490bdbe4 SHA512 c4e4e02f6b039d67e9f82c30f92576127f99e202bef4f0098dd59e7bec6071b587e79c687e5f19571c2be0fc91545258d4059a2f09836c50810021043cd300fd
 DIST drkonqi-5.27.8-revert-add-sentry-support.patch.xz 11996 BLAKE2B 17bf8c3e5c9a5bad200d22fa59b84a97caeca2c164d8b92a1dea665df7e73111401e82c1bacf5ab24c40fb21767c6dea38b38afd288d32190e1c72e453a38558 SHA512 50e448f311bde34c7e77a229aa7816899b7eb743b522d41bd31cc2b18741939a028fe42e267ba440560535fcb33890e3360e20d157a2e5959d2943ce8960491d
 DIST drkonqi-6.1.4.tar.xz 871580 BLAKE2B 83b2b11cde51c3d5e7abe809e47b0409243a810acb135a4b59220e0ae52b29f1970ba038c95fe942930bd2d6f6672818a5402345e8a0b7c79c5a9fae49a2f003 SHA512 ef79b3b4b31d1d8329a699a8b9d2a1dc28e7faf88ac7a3c11aa7361dc77adab3293d069d178da3e6d2117496736b30c7b092a7b27185381209ea2ce3aae4ab7c
+DIST drkonqi-6.1.5.tar.xz 871908 BLAKE2B 278cd91c3abdb21facd1f820935c662f0c37c2dc09c76e9b5fa10339e366829f8007657abed052f58df18dd5553991ae11dac81cfbef6a6fb6fc53d3160b780c SHA512 9e10c3536b80e6e39ffc4f09b061d458d331e03108b6db30ee77704dfe88afc768f6e53bff091b0284757c91799ed3a627a2d3481d8a6fbbf15c7da9cd5c1c6f
diff --git a/kde-plasma/drkonqi/drkonqi-6.1.4.ebuild b/kde-plasma/drkonqi/drkonqi-6.1.4.ebuild
index be6f681a9928..6c4fb227907c 100644
--- a/kde-plasma/drkonqi/drkonqi-6.1.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE="systemd"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-plasma/drkonqi/drkonqi-6.1.5.ebuild b/kde-plasma/drkonqi/drkonqi-6.1.5.ebuild
new file mode 100644
index 000000000000..4fa2ceeb2851
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-6.1.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{11..12} )
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org python-single-r1 systemd
+
+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"
+IUSE="systemd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test" # bug 935362
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${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/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	systemd? (
+		>=dev-qt/qtbase-${QTMIN}:6[network]
+		>=kde-frameworks/kservice-${KFMIN}:6
+		sys-apps/systemd:=
+		>=sys-auth/polkit-qt-0.175.0[qt6(+)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	test? ( >=dev-qt/qtbase-${QTMIN}:6[network] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygdbmi[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	')
+	|| (
+		dev-debug/gdb
+		dev-debug/lldb
+	)
+"
+
+pkg_setup() {
+	ecm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_PYTHON_VENDORING=OFF
+		$(cmake_use_find_package systemd Systemd)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && systemd_is_booted ; then
+		elog "For systemd, steps are needed for integration with systemd-coredumpd."
+		elog "As root, run the following:"
+		elog "1. systemctl enable drkonqi-coredump-processor@.service"
+		elog "2. systemctl --user enable --now --global drkonqi-coredump-launcher.socket"
+	fi
+}
diff --git a/kde-plasma/flatpak-kcm/Manifest b/kde-plasma/flatpak-kcm/Manifest
index decdb13d9422..4a977c3137dd 100644
--- a/kde-plasma/flatpak-kcm/Manifest
+++ b/kde-plasma/flatpak-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST flatpak-kcm-5.27.11.tar.xz 234316 BLAKE2B 7d68b8e199573f2c7dc5169f4cb9aaf4a267a97558cadbbbaa9ab023a73553d18be65f63fbfb302c951272b06b5ab46aaf8c4d8915e250efed33fa3a005305a4 SHA512 78cfde4e7d9177ff2eea8be56d18b81797c97fedd09736387ddcd39d6aff508cee1dc10d187faed43706412613b692a7d9d852a0e21716c63597f19fc959c87a
 DIST flatpak-kcm-6.1.4.tar.xz 243096 BLAKE2B d4ec520028714a6990c955cb1f4cc219d293fc4ac274755201611706bae21ec9dc281f13bd4332815cc1996b28ffefbc0d67a377e22685c4c5fb5a8dd12ce3fc SHA512 246bae5a8e49398e3d1faaf27982aaac7cd30b9285aceddfc9559ea7cc1a46c4133f98d1b309876b2b87de82e3cc71a577ea02359ac0658417bc5d06487f86f2
+DIST flatpak-kcm-6.1.5.tar.xz 243116 BLAKE2B bcda19f19c2e86bfb1023a190a87cd3d2bed3033a7be884ad3e8646e4ca5c0799c01b1a950811bfa4a12a22cd3ec66d06d49627fddaf0abd07bde3ede2a7c0af SHA512 39e9944b91cf3f8cef932945c4bf50ee5b0b34c2e323cd4c3afcc99033f41e9bab7173e3cfdc85f281a427ac20cd20b17270192f145d28d4e7c2f18365f4498c
diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.4.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.4.ebuild
index b23129b37729..cb45b2f929bd 100644
--- a/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.4.ebuild
+++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.4.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.5.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.5.ebuild
new file mode 100644
index 000000000000..febebe9f8019
--- /dev/null
+++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2023-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 plasma.kde.org
+
+DESCRIPTION="Flatpak Permissions Management KCM"
+HOMEPAGE="https://invent.kde.org/plasma/flatpak-kcm"
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtbase-${QTMIN}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=sys-apps/flatpak-0.11.8
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 0db58f12676b..a6719265aa1e 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,3 @@
 DIST kactivitymanagerd-5.27.11.tar.xz 126972 BLAKE2B 8e293e6ef19de7ce2048aceaa5152d10d4488e082f032ec805a0df6932fd74d29a3f8879cf109f0554881ece2b1e45ec695e12fbc80c9e7469b343b9ae4230a2 SHA512 0174babd75a7c13d2014d9bc3bf65b20a6851d19eeed2d2421524ca31db0ffab3dc973f7da753e4805096e9411632df082ba289ce9870898b58522fc7410ce17
 DIST kactivitymanagerd-6.1.4.tar.xz 110148 BLAKE2B 67868b4360598aa31e9ded929fe96b52f99f3773d63d209cb8aa63b87767ef4d238ce8848e6834bcead6e97e1b817108f10b234e044288d88dfe67f6b2780958 SHA512 9ec1719bd1a872b12a028cc7bc9fd3cb4d4a6942eb78a8a1241aa6437e6a9f91eb23674cbe2e508e5a602d373906b4850ca4918105db5f25bbe699c8a6d8f50d
+DIST kactivitymanagerd-6.1.5.tar.xz 110264 BLAKE2B 42a9c5551fdd57ee04cd1654654aaa692a285942a9bfd92d858bc4e32d8eb4cfac86ef4164c7d234ead75255780343fafe09a904e8b37ab5fa729f7ff747620f SHA512 e3720e53cd37375828d67ddfc873cc465eb4a0ccbf75b066bf98927752df2465f382cfa5cca3f340200f6c86a91087b0157de82b581a5f06bbe77b488909f417
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.4.ebuild
index b4662c78f9bc..4c874e6f8b8e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.4.ebuild
@@ -12,7 +12,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.5.ebuild
new file mode 100644
index 000000000000..24a2c3271124
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.1.5.ebuild
@@ -0,0 +1,34 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets]
+	>=kde-frameworks/kconfig-${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/kio-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools-common/Manifest b/kde-plasma/kde-cli-tools-common/Manifest
new file mode 100644
index 000000000000..ea8604bc8eee
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/Manifest
@@ -0,0 +1,2 @@
+DIST kde-cli-tools-6.1.4.tar.xz 629280 BLAKE2B accd7ffbfe0d52c4ab3bffbb2eff03f1f4ffd80b915cb9ed643fc3216d3ab23c373b29a24b273072e3ee3dddc3f72d258acee5ad9d25a8a869e16193c9413519 SHA512 8f06ef6e4eb1b070ecd2e52ca3e38c6aeb2bca3f3617dbf9a935d0a081bab71bd0d25b275ad6e19177dd8f7768b3dfd18a5b54f6074227d32e12b74c257d1689
+DIST kde-cli-tools-6.1.5.tar.xz 629280 BLAKE2B 200e316531ad6095fe0bfba356f2d5afb2f78dbc219e64bb14ed96d718b542475d3db9efdb8cad42a5c17dfaea7c33df3627a5747f17d549d5bbfe70d1a34e6c SHA512 48fcfdf832828a8c04b46c72dd35273e7859b719707529a755e475b1f82fdc65de641234db6c107ce1a1be05825b286fbf0d4d3620b4deb8e2163cb824dbf388
diff --git a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.4.ebuild b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.4.ebuild
new file mode 100644
index 000000000000..4f99561599a4
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.4.ebuild
@@ -0,0 +1,15 @@
+# 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/}"
+KFMIN=5.115.0
+inherit ecm-common plasma.kde.org
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+
+RDEPEND="!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*"
diff --git a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.5.ebuild b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.5.ebuild
new file mode 100644
index 000000000000..4a4a993032f6
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.1.5.ebuild
@@ -0,0 +1,15 @@
+# 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/}"
+KFMIN=5.115.0
+inherit ecm-common plasma.kde.org
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*"
diff --git a/kde-plasma/kde-cli-tools-common/metadata.xml b/kde-plasma/kde-cli-tools-common/metadata.xml
new file mode 100644
index 000000000000..7e9d56c900d5
--- /dev/null
+++ b/kde-plasma/kde-cli-tools-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kde-cli-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index f31443042e03..626acc7dc98f 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.27.11.tar.xz 670892 BLAKE2B 56463030f1935dd722212282000f9fd5e337de7171cc2f9ec08fdae66ed681463680af33fa5ac6b21c93e9eebbb4b415a211f0e72f075521960084afa69bfdb0 SHA512 8f6bbe39df4e491a28d3c6576c58bcbf74971f54157a8cdbc3bb7d4719a31d83f38bae45402cb8f48f11bd37d907bb625f89b929b83a2bb459d7c9c836d78006
 DIST kde-cli-tools-6.1.4.tar.xz 629280 BLAKE2B accd7ffbfe0d52c4ab3bffbb2eff03f1f4ffd80b915cb9ed643fc3216d3ab23c373b29a24b273072e3ee3dddc3f72d258acee5ad9d25a8a869e16193c9413519 SHA512 8f06ef6e4eb1b070ecd2e52ca3e38c6aeb2bca3f3617dbf9a935d0a081bab71bd0d25b275ad6e19177dd8f7768b3dfd18a5b54f6074227d32e12b74c257d1689
+DIST kde-cli-tools-6.1.5.tar.xz 629280 BLAKE2B 200e316531ad6095fe0bfba356f2d5afb2f78dbc219e64bb14ed96d718b542475d3db9efdb8cad42a5c17dfaea7c33df3627a5747f17d549d5bbfe70d1a34e6c SHA512 48fcfdf832828a8c04b46c72dd35273e7859b719707529a755e475b1f82fdc65de641234db6c107ce1a1be05825b286fbf0d4d3620b4deb8e2163cb824dbf388
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4-r2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4-r2.ebuild
new file mode 100644
index 000000000000..5565bd28d6cd
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4-r2.ebuild
@@ -0,0 +1,58 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 6 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+IUSE="kdesu X"
+
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}: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/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[X?]
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+RDEPEND="${DEPEND}
+	>=${CATEGORY}/${PN}-common-${PV}
+	kdesu? ( >=${CATEGORY}/kdesu-gui-${PV} )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF6Su=ON
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.4.ebuild
deleted file mode 100644
index 7df43026d7bc..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.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
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.3.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.7.1
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 6 to better interact with the system"
-HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-# requires running kde environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}: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/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[X?]
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:6 )
-	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF6Su)
-		-DWITH_X11=$(usex X)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../libexec/kf6/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.5.ebuild
new file mode 100644
index 000000000000..a4250961f995
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.1.5.ebuild
@@ -0,0 +1,58 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 6 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kdesu X"
+
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}: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/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[X?]
+	X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+RDEPEND="${DEPEND}
+	>=${CATEGORY}/${PN}-common-${PV}
+	kdesu? ( >=${CATEGORY}/kdesu-gui-${PV} )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF6Su=ON
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 71161930dcf6..8cd189fb381d 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,3 @@
 DIST kde-gtk-config-5.27.11.tar.xz 77516 BLAKE2B db2d4a03aa563cfd4df9c227400ccab51acbbace4b403dac30d9ef05ecca76186256435fdd62e46995fc7594d20a95109d1ecc6c941735bb22cca34e35a3b9a2 SHA512 5887631ba33ce1c121843412a713bc6fc3099a16a8961c9651919e66d9cce83f8391c47d7f6a5f4ad32ec5a497095755b315dfbbeb47ab5b3fa71b9166bf0ba0
 DIST kde-gtk-config-6.1.4.tar.xz 78560 BLAKE2B 89179267027581ae0d75b3f5e3d46576223c249311970de5dd15eb3c6ffd708e0209c47b428fc162be5136987c4fe3c22e1aa50a8f3f9c07cc6d0b308d42a42c SHA512 d685882bc77b8c549c5c9e789d97bd37e0f9beab727dfb4cf480f11c6e720596a2d50ba2a3ec5d8cd4ff0b013aac763c461079b5a7e560113b35012ffe8b87fb
+DIST kde-gtk-config-6.1.5.tar.xz 78620 BLAKE2B 76276977e767a54a2a0d069c3386a3d0e86c7fd51c1d9f1751ad75c8e83220d1058f44fb5718d579524abdfe6c5be7a4f9af0863546fad1d257af885706b404b SHA512 1b5d75df5cf329a34b92f88e22ff24529a91293a5a52980149d054cebeb7aa54337674fe33bdd58cd64a46976747041d7bccbfdeffd530507c42fa402d9ec131
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.4.ebuild
index 447b582f4205..f49d3168e45c 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.5.ebuild
new file mode 100644
index 000000000000..c1e9f3820048
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.1.5.ebuild
@@ -0,0 +1,43 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-plasma/kdecoration-${PVCUT}:6
+	x11-libs/gtk+:3[X]
+"
+RDEPEND="${DEPEND}
+	x11-misc/xsettingsd
+"
+BDEPEND="dev-lang/sassc"
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index ec1dc44294bd..bfb5340bfac0 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,3 @@
 DIST kdecoration-5.27.11.tar.xz 52748 BLAKE2B 8d3e7bd7e27dddd3b1f6ceb728291235fe1ae58c39d5eb242643aa27553c942062cf85d5f638c6a47fc45ad93f7a9ec8609dd1815c1b70ca7ebd246d32270966 SHA512 dd687d9925a56630df9b9e7b1ac58c1536efea97307a75b3f0fc43357d2f118c8727ed425cf4267ffee13fc9ec96c0f592d94b77835ce819b576dba00bb25037
 DIST kdecoration-6.1.4.tar.xz 55328 BLAKE2B 5602bda733b705523df5b7bce2056f5f11d92c4a724dc3a28b2a51223d2411d4bde87f5390d961c7eba69849ab2fdaf6ac7a605b91b66d3fc880cb132ee97bda SHA512 8e453f0c929df11c431d3489fcb76d42c3fce155705a88264d6b966c3d46efb944c4a64676eb8cefd427e0949a73bc91d3839a4db11c685b5bfdb0eb7c243df1
+DIST kdecoration-6.1.5.tar.xz 55360 BLAKE2B 82e0dbbd5458d3831b9d72265888c1ff9092eeebf88b37827de85673afea3ee898d134142c59448964597e4b16d54649f4ae6a911f3937392d6e7e18176e2fc8 SHA512 e2ece8c9f87b6b910590f92f6fe41f4819dad61b3390ae7b9e9e05d1c2a9a0ff6f506bcbbc88a7965f3979762d5e1ca7dad30cf9167e5c262ba0d5ab29939804
diff --git a/kde-plasma/kdecoration/kdecoration-6.1.4.ebuild b/kde-plasma/kdecoration/kdecoration-6.1.4.ebuild
index f36e5ec9ab3b..4ab0c66c0045 100644
--- a/kde-plasma/kdecoration/kdecoration-6.1.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-6.1.5.ebuild b/kde-plasma/kdecoration/kdecoration-6.1.5.ebuild
new file mode 100644
index 000000000000..cde26d2302a2
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-6.1.5.ebuild
@@ -0,0 +1,22 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Plugin based library to create window decorations"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 1b29da7141c9..c0f8f1a6343b 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.27.11.tar.xz 828464 BLAKE2B e1510944a45d20c0fbb46204e5ecd029a6de92396c40eadfe6fd932e8319c101befdb6862b385e0c8f02a5d91890927a576e1557563dab591d4dca745087318f SHA512 fdb9fdecba5e3b389ebc1ef165de3a988b52989bf4d38e38e46629355c937967b82f7cda8843641c16cd4927eddf6c35038168ffb739106eb33b356c9d939c86
 DIST kdeplasma-addons-6.1.4.tar.xz 889520 BLAKE2B 78b95e88b03fcf57fefd8007e5046ba4846a717771b479fdbd1d5ca53ca55f0ff59486938a654820e1384140f37c419127b1d8bbac11ead6083e0a35b3a624b6 SHA512 f7be4d7deb8a3224d2103bfaef61ef41d8a5e8c913179941518d4c73085881e5c3eaba494d4457d7ce79a139608211d6aec4c7b593b8e4df1c2c2d3d677b9392
+DIST kdeplasma-addons-6.1.5.tar.xz 894740 BLAKE2B 5c3de9c460a11bc28d19ec136e30dbdeb9bef05715a36f11e9c5c30b928bfab2f6a8b2898ac0d2e7b09d47ec9f38b5a480cf72d77450c8859df2e1c1d9a469aa SHA512 84a914a7d54d217beabab517a2ac5a257ffce8975b423ff3bd668c01b606609a8518bab67b45977b8f731dc655044c18d04843d57e7c597b5b9b7eb8e4b1d1a7
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.4.ebuild
index a9d33e023e26..9c15ff8fe71c 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+alternate-calendar share webengine"
 
 RESTRICT="test" # bug 727846, +missing selenium-webdriver-at-spi
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.5.ebuild
new file mode 100644
index 000000000000..30401fc4494e
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.1.5.ebuild
@@ -0,0 +1,73 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+alternate-calendar share webengine"
+
+RESTRICT="test" # bug 727846, +missing selenium-webdriver-at-spi
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kholidays-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kunitconversion-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	alternate-calendar? ( dev-libs/icu:= )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtquick3d-${QTMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alternate-calendar ICU)
+		$(cmake_use_find_package share KF6Purpose)
+		$(cmake_use_find_package webengine Qt6WebEngineQuick)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Disk quota applet" "sys-fs/quota"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kdesu-gui/Manifest b/kde-plasma/kdesu-gui/Manifest
new file mode 100644
index 000000000000..626acc7dc98f
--- /dev/null
+++ b/kde-plasma/kdesu-gui/Manifest
@@ -0,0 +1,3 @@
+DIST kde-cli-tools-5.27.11.tar.xz 670892 BLAKE2B 56463030f1935dd722212282000f9fd5e337de7171cc2f9ec08fdae66ed681463680af33fa5ac6b21c93e9eebbb4b415a211f0e72f075521960084afa69bfdb0 SHA512 8f6bbe39df4e491a28d3c6576c58bcbf74971f54157a8cdbc3bb7d4719a31d83f38bae45402cb8f48f11bd37d907bb625f89b929b83a2bb459d7c9c836d78006
+DIST kde-cli-tools-6.1.4.tar.xz 629280 BLAKE2B accd7ffbfe0d52c4ab3bffbb2eff03f1f4ffd80b915cb9ed643fc3216d3ab23c373b29a24b273072e3ee3dddc3f72d258acee5ad9d25a8a869e16193c9413519 SHA512 8f06ef6e4eb1b070ecd2e52ca3e38c6aeb2bca3f3617dbf9a935d0a081bab71bd0d25b275ad6e19177dd8f7768b3dfd18a5b54f6074227d32e12b74c257d1689
+DIST kde-cli-tools-6.1.5.tar.xz 629280 BLAKE2B 200e316531ad6095fe0bfba356f2d5afb2f78dbc219e64bb14ed96d718b542475d3db9efdb8cad42a5c17dfaea7c33df3627a5747f17d549d5bbfe70d1a34e6c SHA512 48fcfdf832828a8c04b46c72dd35273e7859b719707529a755e475b1f82fdc65de641234db6c107ce1a1be05825b286fbf0d4d3620b4deb8e2163cb824dbf388
diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-build-only-kdesu.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-build-only-kdesu.patch
new file mode 100644
index 000000000000..ecca7f33a00b
--- /dev/null
+++ b/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-build-only-kdesu.patch
@@ -0,0 +1,87 @@
+From 879f2767224d79fd9b8636b0893f6a99483c98df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 2 Sep 2024 23:18:46 +0200
+Subject: [PATCH] Make all KF5 and Qt5 modules optional, disable all subdirs
+ except kdesu
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fad18a81..6356d0c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
+ 
+ include(KDEGitCommitHooks)
+ 
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG COMPONENTS
+     Widgets
+     Svg
+     DBus
+@@ -44,7 +44,7 @@ if (NOT Qt${QT_MAJOR_VERSION}Test_FOUND)
+     set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+ 
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
++find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
+     Config
+     DocTools
+     IconThemes
+@@ -87,31 +87,31 @@ function(install_compat_symlink executable_target)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${executable_target}5 DESTINATION ${KDE_INSTALL_FULL_BINDIR})
+ endfunction()
+ 
+-add_subdirectory(kcmshell)
+-add_subdirectory(keditfiletype)
+-add_subdirectory(kmimetypefinder)
+-if (QT_MAJOR_VERSION EQUAL "5")
+-    add_subdirectory(ktraderclient)
+-endif()
+-add_subdirectory(kioclient)
+-add_subdirectory(ksvgtopng)
+-add_subdirectory(kdeinhibit)
+-add_subdirectory(plasma-open-settings)
+-add_subdirectory(kinfo)
+-
+-if(Qt5X11Extras_FOUND)
+-    add_subdirectory(kstart)
+-endif()
++#add_subdirectory(kcmshell)
++#add_subdirectory(keditfiletype)
++#add_subdirectory(kmimetypefinder)
++#if (QT_MAJOR_VERSION EQUAL "5")
++#    add_subdirectory(ktraderclient)
++#endif()
++#add_subdirectory(kioclient)
++#add_subdirectory(ksvgtopng)
++#add_subdirectory(kdeinhibit)
++#add_subdirectory(plasma-open-settings)
++#add_subdirectory(kinfo)
++
++#if(Qt5X11Extras_FOUND)
++#    add_subdirectory(kstart)
++#endif()
+ 
+ 
+ if(KF5Su_FOUND)
+     add_subdirectory(kdesu)
+ endif()
+ 
+-if(UNIX)
+-    add_subdirectory(kdeeject)
+-    add_subdirectory(kbroadcastnotification)
+-endif()
++#if(UNIX)
++#    add_subdirectory(kdeeject)
++#    add_subdirectory(kbroadcastnotification)
++#endif()
+ 
+ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
+ 
+-- 
+2.46.0
+
diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-cmake.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-cmake.patch
new file mode 100644
index 000000000000..80a46012e24b
--- /dev/null
+++ b/kde-plasma/kdesu-gui/files/kdesu-gui-5.27.11-cmake.patch
@@ -0,0 +1,25 @@
+From 34f66c29cf7186b860266582b198a5b6869c7fa3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 5 Sep 2024 14:31:44 +0200
+Subject: [PATCH] Add missing KF6WidgetsAddons, used by kdesu
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc435bca..ee962482 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,7 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
+     CoreAddons
+     OPTIONAL_COMPONENTS
+     Su
++    WidgetsAddons
+     QUIET
+ )
+ 
+-- 
+2.46.0
+
diff --git a/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch
new file mode 100644
index 000000000000..0679d9bf8501
--- /dev/null
+++ b/kde-plasma/kdesu-gui/files/kdesu-gui-6.1.5-build-only-kdesu.patch
@@ -0,0 +1,72 @@
+From eacbe389502b4f89cb64dc24f10f3e8d2b5eb5c7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 2 Sep 2024 23:18:46 +0200
+Subject: [PATCH] Make all KF6 and Qt6 modules optional, disable all subdirs
+ except kdesu
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc435bca..234447e0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
+ 
+ include(KDEGitCommitHooks)
+ 
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
++find_package(Qt6 ${QT_MIN_VERSION} CONFIG COMPONENTS
+     Widgets
+     Svg
+     DBus
+@@ -44,7 +44,7 @@ if (NOT Qt6Test_FOUND)
+     set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+ 
+-find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
++find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS
+     Config
+     DocTools
+     IconThemes
+@@ -78,23 +78,23 @@ function(install_compat_symlink executable_target)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${executable_target}5 DESTINATION ${KDE_INSTALL_FULL_BINDIR})
+ endfunction()
+ 
+-add_subdirectory(keditfiletype)
+-add_subdirectory(kmimetypefinder)
+-add_subdirectory(kioclient)
+-add_subdirectory(ksvgtopng)
+-add_subdirectory(kdeinhibit)
+-add_subdirectory(plasma-open-settings)
+-add_subdirectory(kinfo)
+-add_subdirectory(kstart)
++#add_subdirectory(keditfiletype)
++#add_subdirectory(kmimetypefinder)
++#add_subdirectory(kioclient)
++#add_subdirectory(ksvgtopng)
++#add_subdirectory(kdeinhibit)
++#add_subdirectory(plasma-open-settings)
++#add_subdirectory(kinfo)
++#add_subdirectory(kstart)
+ 
+ if(KF6Su_FOUND)
+     add_subdirectory(kdesu)
+ endif()
+ 
+-if(UNIX)
+-    add_subdirectory(kdeeject)
+-    add_subdirectory(kbroadcastnotification)
+-endif()
++#if(UNIX)
++#    add_subdirectory(kdeeject)
++#    add_subdirectory(kbroadcastnotification)
++#endif()
+ 
+ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
+ 
+-- 
+2.46.0
+
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-5.27.11-r1.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-5.27.11-r1.ebuild
new file mode 100644
index 000000000000..1304e9e77978
--- /dev/null
+++ b/kde-plasma/kdesu-gui/kdesu-gui-5.27.11-r1.ebuild
@@ -0,0 +1,49 @@
+# 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="kde-cli-tools"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Graphical frontend for KDE Frameworks' kdesu"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS="~arm ~loong x86"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+"
+RDEPEND="${DEPEND}
+	!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*[kdesu(+)]
+	>=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+	sys-apps/dbus[X]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build-only-kdesu.patch" # downstream split
+	"${FILESDIR}/${P}-cmake.patch" # bug 939081, pending upstream MR
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-6.1.4.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.1.4.ebuild
new file mode 100644
index 000000000000..c320ce903581
--- /dev/null
+++ b/kde-plasma/kdesu-gui/kdesu-gui-6.1.4.ebuild
@@ -0,0 +1,56 @@
+# 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="kde-cli-tools"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Graphical frontend for KDE Frameworks' kdesu"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdesu-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+"
+RDEPEND="${DEPEND}
+	!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*[kdesu(+)]
+	>=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+	sys-apps/dbus[X]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.5-build-only-kdesu.patch" # downstream split
+	"${FILESDIR}/${PN}-5.27.11-cmake.patch" # bug 939081, pending upstream MR
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../libexec/kf6/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild
new file mode 100644
index 000000000000..c4ba0b2f76d2
--- /dev/null
+++ b/kde-plasma/kdesu-gui/kdesu-gui-6.1.5.ebuild
@@ -0,0 +1,53 @@
+# 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="kde-cli-tools"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Graphical frontend for KDE Frameworks' kdesu"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdesu-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+"
+RDEPEND="${DEPEND}
+	!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*[kdesu(+)]
+	>=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+	sys-apps/dbus[X]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-6.1.5-build-only-kdesu.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../libexec/kf6/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kdesu-gui/metadata.xml b/kde-plasma/kdesu-gui/metadata.xml
new file mode 100644
index 000000000000..7e9d56c900d5
--- /dev/null
+++ b/kde-plasma/kdesu-gui/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">plasma/kde-cli-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index ca37ad2fb4fc..953de5340158 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,3 @@
 DIST kgamma-5.27.11.tar.xz 88576 BLAKE2B 67cd1a9b0f2f080f66871c889825826d16e7b32477928555abdcf0e7de5d8dfeadfb4ea66b792568a136c88889d76d6d3ec9d6c34f5ab7decf9abe04542a6da0 SHA512 853f09c6bdefb8ed3474131785475f9fccbe17edb949308049eda3060609a57ba53d9eae2074e399eedc8a731581063888b2205f59fec396e7296cc062caa309
 DIST kgamma-6.1.4.tar.xz 86272 BLAKE2B 3ce2f76f4b9bb89a84a3bc528cfe50b9786ecef5e2918a8d7efa6efc1c3d127af6f70fc9a6961e2a0cff514b5cf2ff1faef1dbe5de62b96c226d8479f410e419 SHA512 6afe6165f99706fb051adff36f82957b7d79c2482a4be991d921a407750bc584795520cf44f9404e2e1296f900db689ada183bccaf88230a43a0be85a9574c18
+DIST kgamma-6.1.5.tar.xz 86428 BLAKE2B 4b2798146d29792a98a0b53bd8bad7ad4844d425e7a5125d627009c77cdc9fc38894ebd4a71f7de5f457003a0beb318774f214f58036fa5c45993fc8373cd57b SHA512 40a7281d3fd3624521fdefefd4163c56a39a51225d84e007d47aff7fbd48978f3f82787d22d14e2a2c0412f1275b977d3eaa45c5061d360766d939a153decef8
diff --git a/kde-plasma/kgamma/kgamma-6.1.4.ebuild b/kde-plasma/kgamma/kgamma-6.1.4.ebuild
index a1c49f9af974..bc0527554cba 100644
--- a/kde-plasma/kgamma/kgamma-6.1.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kgamma/kgamma-6.1.5.ebuild b/kde-plasma/kgamma/kgamma-6.1.5.ebuild
new file mode 100644
index 000000000000..7563a54f84aa
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-6.1.5.ebuild
@@ -0,0 +1,30 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Screen gamma values kcontrol module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=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
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/kglobalacceld/Manifest b/kde-plasma/kglobalacceld/Manifest
index 53a249734f78..8760a177f0a8 100644
--- a/kde-plasma/kglobalacceld/Manifest
+++ b/kde-plasma/kglobalacceld/Manifest
@@ -1 +1,2 @@
 DIST kglobalacceld-6.1.4.tar.xz 55736 BLAKE2B dc3156827ecf7ac4119e9286ace120e062ffd6051264beec4a205f52117e56166cef8631f5d2c6af141119d95c05aa13232d47ca397fefd65418b458d9011a22 SHA512 386a7a69578b3bdece0ea568c922e11b587d3e72087be66b5e69170fe306b664314d323e7db3fd1bbfdf47f523b234334220ce0f8360cfb5d8f31e846fd664d9
+DIST kglobalacceld-6.1.5.tar.xz 55728 BLAKE2B e20c4af7b7b54822b3a2c96536d1af7627d218d3b27465062585860cbfbf9952931ccc7e36ebcbb2f25d14198db72dba52ec6a3858ddf1217206e94d69a9d745 SHA512 7557c6d6563d332c7b02754ee0c0f72f7595b2622ed20a7b562fc489c5a2b5895d54b8146dfd9bd94679e0d1fb6d04510eb779f2d7c74cb6a83b1e3b5f76a429
diff --git a/kde-plasma/kglobalacceld/kglobalacceld-6.1.4.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-6.1.4.ebuild
index 253735c7ea84..cedcb3933a56 100644
--- a/kde-plasma/kglobalacceld/kglobalacceld-6.1.4.ebuild
+++ b/kde-plasma/kglobalacceld/kglobalacceld-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 REQUIRED_USE="test? ( X )"
diff --git a/kde-plasma/kglobalacceld/kglobalacceld-6.1.5.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-6.1.5.ebuild
new file mode 100644
index 000000000000..1e5436ecbf29
--- /dev/null
+++ b/kde-plasma/kglobalacceld/kglobalacceld-6.1.5.ebuild
@@ -0,0 +1,53 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Daemon providing Global Keyboard Shortcut (Accelerator) functionality"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+REQUIRED_USE="test? ( X )"
+RESTRICT="test" # requires installed instance
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[gui]
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-frameworks/kglobalaccel:5[-kf6compat(-)]
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+# src_test() {
+# 	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
+# }
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 58c56156dc7f..58f4f2acd8b9 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.27.11.tar.xz 1018276 BLAKE2B 921832d3c52abfe35d3b77f34161c630d54c6fe8675eac6b2dcc343ab21b7c30b501216c9762aa90a8f5bfc036d2d8859a7419478ec38a85afcbf90315788cc1 SHA512 24a9df9fb28637e39293669569e4be896956ecfc3a27719821a1498f541aed220e7ebcd0e1a0b63051562690a9400b7fefc9c1217763c87009745e886573205e
 DIST kinfocenter-6.1.4.tar.xz 718988 BLAKE2B bb19b650bde8349046cb8b0c7871904a4457e1f7fe3e97740378e1239affa74028632da22aceafb930e6a72000949f57d9479f05f336111750412ecc96f2a7e3 SHA512 8d0af559f43f7af0972539fd3de9835ae804a369670cdc6c93b8e56c2ea01eda1bb3e3c0471e1f4047df8de6bbbb4e446fb65f6821adc3858afe64a2ee9149a2
+DIST kinfocenter-6.1.5.tar.xz 720016 BLAKE2B e0555f40fcf6ab5aac032b9366322b05cb38f60288ee275b2e69bf7116f80c6ca922b6dbacbb417aaffa66157d9f9216defad07de9705f03f7cec5f4c5145f64 SHA512 58909d0804d23bb17961ba471e8f3db8cd58e66c6df4bc4ac27eecaa99e003351df08f9b099589c78160459e4147d461f15b5d4df8140ef40778020445da9085
diff --git a/kde-plasma/kinfocenter/kinfocenter-6.1.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.1.4.ebuild
index 3bf0f0d92113..2031b535b8ca 100644
--- a/kde-plasma/kinfocenter/kinfocenter-6.1.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-6.1.4.ebuild
@@ -15,7 +15,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 ~ppc64 ~riscv ~x86"
 IUSE="gles2-only usb"
 
 DEPEND="
diff --git a/kde-plasma/kinfocenter/kinfocenter-6.1.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.1.5.ebuild
new file mode 100644
index 000000000000..8b34956c2d57
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-6.1.5.ebuild
@@ -0,0 +1,95 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only usb"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gles2-only=,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${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/solid-${KFMIN}:6
+	gles2-only? ( || (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[gles2]
+	) )
+	usb? ( virtual/libusb:1 )
+"
+RDEPEND="${DEPEND}
+	|| (
+		>=dev-qt/qttools-${QTMIN}:6[qdbus]
+		dev-qt/qdbus:*
+	)
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-plasma/systemsettings-${PVCUT}:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+CMAKE_SKIP_TESTS=(
+	# bug 816591
+	smbmountmodeltest
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package usb USB1)
+		-DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # missing
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature_header "Query network filesystem info:"
+		optfeature "NFS information module" net-fs/nfs-utils
+		optfeature "Samba status information module" net-fs/samba
+		optfeature_header "Query firmware/hardware info:"
+	fi
+	optfeature "System DMI table readout" sys-apps/dmidecode
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Firmware security module" "app-text/aha sys-apps/fwupd"
+		optfeature "PCI devices information module" sys-apps/pciutils
+		optfeature "advanced CPU information module" sys-apps/util-linux
+		optfeature_header "Query GPU/graphics support info:"
+	fi
+	optfeature "OpenCL information module" dev-util/clinfo
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "OpenGL information module" x11-apps/mesa-progs
+		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
+		optfeature "Wayland information module" app-misc/wayland-utils
+		optfeature "X Server information module" x11-apps/xdpyinfo
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 9dc85f99a808..3a4c8dc17a63 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,3 @@
 DIST kmenuedit-5.27.11.tar.xz 932088 BLAKE2B b9e85a079b9a2059ed64a31e61bad93ffc9862efed1106e8ef5adaa2637ff10a355b5b48e1a91761fbd6e8444917cb7e3278a36603e708ca286313dd96614cc2 SHA512 5dcfcd5be25a109fc3b42c42bf4476a7738b312aefb78e71c8191901758afd7be77481b0beabadc42955afd6852977b556d597e8ac8437598788e62302e66863
 DIST kmenuedit-6.1.4.tar.xz 871340 BLAKE2B a366faa89e9ccc68b8f1ce07056bd7758391399f2d5d08f7169df48176a84d6136d51d1d55dff7dd8ae57eeb46faf88f74b14f2adf8fb5eab8f5489e52c03f00 SHA512 612a393f928a5060afd69e1c346e03195e0a45df5af6da411ccd887f6fbe652f8a485e70a1cab7beed5ca64eff3c685316aa6f567ade071f727ff32edca5e061
+DIST kmenuedit-6.1.5.tar.xz 871396 BLAKE2B fad843b10d576210fb6f5cbfd23760ca9f95fa809dd25a3b8a73bc2d0c34f0cfda252072862e073bcbf2d5b69f58eead75b1323031499eb5611366ebb5b8489d SHA512 552ed7ceeadfefa90caa815a227960bc447455bfd74815a53fb0246b504e86e7369139c7ca2e0f05e5be1e6efa9c29bed9ce5e17014023259aabb2a96bcb66d6
diff --git a/kde-plasma/kmenuedit/kmenuedit-6.1.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-6.1.4.ebuild
index 990d449729fb..c90e88e190ef 100644
--- a/kde-plasma/kmenuedit/kmenuedit-6.1.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-6.1.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-6.1.5.ebuild
new file mode 100644
index 000000000000..426d7d1b7fe1
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-6.1.5.ebuild
@@ -0,0 +1,37 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,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/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-plasma/kpipewire/Manifest b/kde-plasma/kpipewire/Manifest
index 38b72625ee18..e7e8bb4eb48b 100644
--- a/kde-plasma/kpipewire/Manifest
+++ b/kde-plasma/kpipewire/Manifest
@@ -1,2 +1,3 @@
 DIST kpipewire-5.27.11.tar.xz 60076 BLAKE2B a0f9513babcf7d68252296ad258b2875e0e16a131302af8305f78a7d1fff87844c57cd88103aa95bdc8e584eab1e2142cd9edd9278c4afecf7b61769290f5910 SHA512 0350946c2e64f8b1224e31d49154f47b652bba55b3c3fbe39fa8b9da0e959a3c65b38d6f99cd3003a8ff409b29bdbbcc1b3f99deeb4052d1538776a2465c3641
 DIST kpipewire-6.1.4.tar.xz 148980 BLAKE2B d9ead0bfc582c31519b4a64bcd6ae14ee5a614579ef4edd741a2329bb4e3271bedfeaf5cad2158211d70ba1f3113a26c4378436d085f1b80fecfc83fddab0298 SHA512 e247709e2f89ac3bc55ca3cda78024d39b608c0be09453dcbabe441b247e7b8a54ad8c9ef0ba52a5d9e01b3361e569d14041188e317384c7baa835ec6d943ff4
+DIST kpipewire-6.1.5.tar.xz 149096 BLAKE2B c59380effb41cb0af3093b6f5d29a76df19a5100ea2d63a9bf2c7859e29e20c175039aca1ef8138298da6feefda0a23b87037926c4f93e00c3828f7e098a0615 SHA512 83d8f04b0c599e0d4ae5ecd4219bc2ff2404f41ecb25aaa6bfa6a0e46af7283bcdfdf29111454715e71183968745b299ce7d73966a85b63c5379967f5416177a
diff --git a/kde-plasma/kpipewire/kpipewire-6.1.4-r1.ebuild b/kde-plasma/kpipewire/kpipewire-6.1.4-r1.ebuild
index fc13ef39bb57..99d360e0cc7e 100644
--- a/kde-plasma/kpipewire/kpipewire-6.1.4-r1.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-6.1.4-r1.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 926511, fixed in 6.2
diff --git a/kde-plasma/kpipewire/kpipewire-6.1.5.ebuild b/kde-plasma/kpipewire/kpipewire-6.1.5.ebuild
new file mode 100644
index 000000000000..e91bb22c5a55
--- /dev/null
+++ b/kde-plasma/kpipewire/kpipewire-6.1.5.ebuild
@@ -0,0 +1,47 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Components relating to Flatpak pipewire use in Plasma"
+
+LICENSE="LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 926511, fixed in 6.2
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	media-libs/libepoxy
+	media-libs/libglvnd
+	media-libs/libva:=
+	media-libs/mesa[opengl]
+	media-video/ffmpeg:=
+	>=media-video/pipewire-0.3:=
+	x11-libs/libdrm
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-libs/plasma-wayland-protocols
+		dev-libs/wayland
+		>=dev-qt/qtwayland-${QTMIN}:6
+		>=kde-plasma/kwayland-${PVCUT}:6
+		media-video/pipewire[extra]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	x11-themes/sound-theme-freedesktop
+"
+BDEPEND="test? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
diff --git a/kde-plasma/krdp/Manifest b/kde-plasma/krdp/Manifest
index a3dadc5b01ad..b29cf6d65ed6 100644
--- a/kde-plasma/krdp/Manifest
+++ b/kde-plasma/krdp/Manifest
@@ -1 +1,2 @@
 DIST krdp-6.1.4.tar.xz 84032 BLAKE2B d213905ce37e300c5e60a67a1f75388fdcdbfae037c6077b07c10b4766efc7425d475bd585541e8fb3ebf30a1681583ce8142c33cd84bb1caffc7ce93bdc9ead SHA512 0563b3513f6c77721fb44d3dae778bf982d51ae2b88053cf4bd9d602acf0d08d8e7de55161f2bf188c7dfb00795fe3067ba205887908743d84eaa06c0b579a44
+DIST krdp-6.1.5.tar.xz 85076 BLAKE2B e9697e4478f48d91723660b739563ffc72a5737a0989f3dd2cf076d0d9f0b92f73968eecefd99ffbf4f872e01f80774bc8d43367a07fd26c065c8e5956c04486 SHA512 5c82b4a79d30133f2026266ec39f048233b6ef338c3c63f086c8c64b017611c0cd0c04375bf6d55cb588ef2653af28697f31bc8c85082aefe312286b62cb7cdb
diff --git a/kde-plasma/krdp/krdp-6.1.4.ebuild b/kde-plasma/krdp/krdp-6.1.4.ebuild
index 115f0ff4fd0f..0005ee04fcf3 100644
--- a/kde-plasma/krdp/krdp-6.1.4.ebuild
+++ b/kde-plasma/krdp/krdp-6.1.4.ebuild
@@ -15,7 +15,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/krdp/krdp-6.1.5.ebuild b/kde-plasma/krdp/krdp-6.1.5.ebuild
new file mode 100644
index 000000000000..be258f4014a2
--- /dev/null
+++ b/kde-plasma/krdp/krdp-6.1.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_TEST="true"
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm flag-o-matic plasma.kde.org toolchain-funcs
+
+DESCRIPTION="Library and examples for creating an RDP server"
+HOMEPAGE+=" https://quantumproductions.info/articles/2023-08/remote-desktop-using-rdp-protocol-plasma-wayland"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-plasma/kpipewire-${PVCUT}:6
+	>=net-misc/freerdp-2.10:2[server]
+	x11-libs/libxkbcommon
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/plasma-wayland-protocols
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_configure() {
+	# std::jthread and std::stop_token are implemented as experimental in libcxx
+	# enable these experimental libraries on clang systems
+	# https://libcxx.llvm.org/Status/Cxx20.html#note-p0660
+	[[ $(tc-get-cxx-stdlib) == 'libc++' ]] && append-cxxflags -fexperimental-library
+	ecm_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 9e959366b0b2..dcdcbe679179 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,3 @@
 DIST kscreen-5.27.11.tar.xz 186972 BLAKE2B 8c0ac5a2b4f80c7c65234755f858d816fe2d5b8d5288c86675f11d7af86fd5060eb97822b906d25e659ccc644f0439ddbc0db2bf594f8b1bbff787377280a313 SHA512 7f84eeb95972014878afea09568f7c1a465b2a6c519492f67964fd35fe8ec50fb8d815e0e935ada426ff9ee437fb8cc456b11b10d7cedf6b3bb3f6294312b633
 DIST kscreen-6.1.4.tar.xz 209784 BLAKE2B ffeb8d039b3b9fef7e4de26f27177bcdffeaf55e43596b288e83262402506f593bcdc761053942f5baadfef2712dcac1e0275843996fcb649e4bbaf4385fd134 SHA512 1d8ee0963d385207eeae97ff046af35cd3b3305b5f883237cb232326e5776d459bb24a87d5853cbb846bc780e0612eea3cf8db1b4091459d167d3ed054d77b2d
+DIST kscreen-6.1.5.tar.xz 210432 BLAKE2B 5f3fd6f47ce1882f597739c74e38d95c93cd0c216d039ee1801c5c7a5c665471de53c221362b912eabf82259679681009f5aaa4afb6a3ac7b3114317c425d0e0 SHA512 c6fe5f33056d093ae92ae69583062c3aeda67e82492f20bec0ea945dfca7fc20a305c00a7ed4fee5392d72a0c7f06156636c30901ca412d6e34cad726b918482
diff --git a/kde-plasma/kscreen/kscreen-6.1.4.ebuild b/kde-plasma/kscreen/kscreen-6.1.4.ebuild
index 01e75614d94e..962b48e91462 100644
--- a/kde-plasma/kscreen/kscreen-6.1.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.1.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreen/kscreen-6.1.5.ebuild b/kde-plasma/kscreen/kscreen-6.1.5.ebuild
new file mode 100644
index 000000000000..9362cd93c1e8
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-6.1.5.ebuild
@@ -0,0 +1,57 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# bug #580440, last checked 5.6.3
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in kded daemon
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsensors-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/layer-shell-qt-${PVCUT}:6
+	>=kde-plasma/libkscreen-${PVCUT}:6=
+	>=kde-plasma/libplasma-${PVCUT}:6
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXi
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index adbc876cd9f6..92e9cf6d7713 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,3 @@
 DIST kscreenlocker-5.27.11.tar.xz 160796 BLAKE2B 6ab6060ee7ce2b01a0a29f6d0aebbaba052fabaa6c229e92603b52d32ea473c438b8647cc2f2bdbf48edfa98c05aa7e22ce0b75964d9a8ab6d914c32254fdfcb SHA512 cfaaa6242253f6c511f645bb7f9023328a5d5bb58616284f85db949da969e04303f4e0e28283a08ed0fb02845840be67a76785d4b4596ef057ec7069cda92a3a
 DIST kscreenlocker-6.1.4.tar.xz 180356 BLAKE2B 2f29bb70f2aa52ab40608a38e01cae4be04a3b8fabfd3cae5ed42b755915ae3dd8add8c4cbb6e7abaec2a27f3b7281b195d579c01b32cb2b2b3b0f12831f520a SHA512 fbad2a6093ef5b9b916a97ec711174fcc09519f03b9ba3f2dfb9dbafc0cf05004db157915e765ee7af3a080ab1b4126c3b8d8052e6c96a83e2393ff6fd055485
+DIST kscreenlocker-6.1.5.tar.xz 180568 BLAKE2B 6980e553265ada7a5e80e7dad040b7f33eb598295b5533e2810e12e552bceb56136873cd00ffc2f7eb50e71977ef08c112d206f6f3d04a9ebadb9bd4d01858b2 SHA512 0448bbb8261dcaa0ea7bded8ab29311de21b88be4cb56bf68f5931dd97222ab7e24439d2a97c4544c5a723c3c5c7e2e2a019253c51aef5a26d8ec0cf6351c6b5
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.1.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.1.4.ebuild
index aad1f6a2d6e9..a115f2872e66 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-6.1.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-6.1.4.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.1.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.1.5.ebuild
new file mode 100644
index 000000000000..b7be6a4e04c1
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-6.1.5.ebuild
@@ -0,0 +1,79 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in greeter
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${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/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/layer-shell-qt-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/libkscreen-${PVCUT}:6
+	sys-libs/pam
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_install() {
+	ecm_src_install
+
+	newpamd "${FILESDIR}/kde-r1.pam" kde
+	newpamd "${FILESDIR}/kde-fingerprint.pam" kde-fingerprint
+	newpamd "${FILESDIR}/kde-smartcard.pam" kde-smartcard
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 8a784f7a0c8a..d88bd607114c 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,3 @@
 DIST ksshaskpass-5.27.11.tar.xz 27980 BLAKE2B 4fa35480f0ed7389bf41f56fc8266fccb8a33060c37f6df2c1edc44f49466267dbd45584e0afff6aaa79a3b5ffc1aca916c36a7ad768e36a457c081bfa53f217 SHA512 85c4091faa4ec4a6d068d4a0d464601054b88187ccfa05f4156b146dd3b3900dc15bcb3f9f9b0b057fb9b5687eabf55bb34d06d98a9e26ddb6a0afba1684feee
 DIST ksshaskpass-6.1.4.tar.xz 29468 BLAKE2B c32a7d65ac6adcf76c558b79e3936d7c87e5f950a79787352376b6e35beb1221103d2e1c134ed3d614eed621f84a241a3f582b51cdb0df26819af2cabc4c5b96 SHA512 391c8135aa8b625a2fcdab1ae2bdd30892daaaeeb9b2379fcbe3b5f37741bc078cb33acc1195429b8d1b26234663a383146fbed3d0d197ac243967a962b62681
+DIST ksshaskpass-6.1.5.tar.xz 29500 BLAKE2B 89b70c693a8d7852f403adcef164ae062f9ca829f78b011b75039b9c2feef924923e743ea9f2863dda410ed94b8815710f8e716ab186996f40745e1d5ec2dbb4 SHA512 cde90a3289ef84abb65d73eb76c96633524f830fea1ae15e735067723b46bbd92726c91802839c85b89c25828aea5b78dbe5979d44ea7132db2214d521a73135
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-6.1.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.1.4.ebuild
index 51e28013d943..4edfbf141e39 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-6.1.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-6.1.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.1.5.ebuild
new file mode 100644
index 000000000000..027fcfeb3c2b
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-6.1.5.ebuild
@@ -0,0 +1,49 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 6,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 6 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+}
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index a19add88ff8c..672eb4980665 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,2 +1,3 @@
 DIST ksystemstats-5.27.11.tar.xz 115812 BLAKE2B e2bd3cff153a4e48e119f4086d41f6b0ddef68ac3b6ef7613a4bec1358d8a9d2443bd92886e5ff746e7e51d46e23bf1c70e8c8d494b52f1db3aada2714da2422 SHA512 3fe1687bbe8b3aa6e7852e613f2938f0e2264bd98d3f743a0091b22132e60e710c946b7754b1d1b8085165506d89acd4f29db08d92d50822820287ed5d957621
 DIST ksystemstats-6.1.4.tar.xz 128992 BLAKE2B 0348b9389086f0fa67c178568ee73f919394c807abe38d8d5d8f3f733224368342434d79d09267c4614992261b5ead4d530503bc722648628f381c31db391335 SHA512 65813095b9283edd90b623a8a013c059f1312fe817d0942dc1065feb39c181dfe4b4173268b133ac09c675a71effba59e8804dbd7c1576e502d1dc6a2d958b32
+DIST ksystemstats-6.1.5.tar.xz 129024 BLAKE2B b011166db280c894bed5f07529efbd59dd4404e6b175be4e42d87336c989aaaa9ec021711f017c1b87175c52c8687409082de56881005a5522fd145d0072c5f6 SHA512 8efad26b6d7678516e0928b16b7296ca46917086e46d6b1c53fb268900435f0c37eec24a21d3a616abf979a047200e8c26eeed1beeeeb1a9844059d839c34636
diff --git a/kde-plasma/ksystemstats/ksystemstats-6.1.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.1.4.ebuild
index 1c4759060df6..143acdf74c18 100644
--- a/kde-plasma/ksystemstats/ksystemstats-6.1.4.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-6.1.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/ksystemstats/ksystemstats-6.1.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.1.5.ebuild
new file mode 100644
index 000000000000..4a18b3c859a0
--- /dev/null
+++ b/kde-plasma/ksystemstats/ksystemstats-6.1.5.ebuild
@@ -0,0 +1,43 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+VIRTUALX_REQUIRED="test" # bug 909312 (test fails)
+inherit ecm plasma.kde.org virtualx
+
+DESCRIPTION="Plugin-based system monitoring daemon"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,network]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	virtual/libudev:=
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index c91039fa734c..9feac9f02998 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-pam-5.27.11.tar.xz 22948 BLAKE2B 1c0cf86bb7e57696e44ac34a4392d1f81a6ade8fbaef6c61eefc79df39890aa1799ddbb39ec59fbde3ea4536c1113c1147b28bcdfc898049e847af99b107267b SHA512 b52177df434bf71214874a2410637240bb5a23f0fd06d41f3b62630d90e5262a231012c4f11119f96c151bb222e73652e5e8506ccc26c7cc451090f3bd156b6a
 DIST kwallet-pam-6.1.4.tar.xz 22516 BLAKE2B 58138c4e430774be535715ee5dbb8c365b11a53275856cce64b9e3a0fd259b9815d739061e2718b29abf7e0e93c5c00623b120cc65a1d4bf4012e4b513932b6b SHA512 e3a0a7a9b6c00a493e2fd108b586eb166b483fd3841c500230127179a0af23d178705e0ed1ecc15ed0fc19e46477da1b9e068dd76790d95ff4c5de8e7ff8096b
+DIST kwallet-pam-6.1.5.tar.xz 22524 BLAKE2B 3ae0ed78f568962ba24261d7f0801e9405c6356d4688ec914da750663cc10d2a0ada0b58dda4c5aa50035bda3f71b094654596ed5a00af91e433bb968854b4ad SHA512 367836153d8624c9e1df9fa24a05d09455d36584bceb452bb27958eeabc6a71648fa8cff77d3674e8cc21cf30044da2427a81d7302acb4e512de2c8d8b34258a
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-6.1.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.1.4.ebuild
index 9d114c7ed123..9b216723c662 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-6.1.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-6.1.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.1.5.ebuild
new file mode 100644
index 000000000000..ea0c6f111e7a
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-6.1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.5.0
+inherit ecm plasma.kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:6."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index aa5d5556beca..e0aa8c5e6d6b 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-integration-5.27.11.tar.xz 25708 BLAKE2B 67fe2d113955b2cdec1c3d621efbe84b2565aa3f22e0d15eb95f1a2bce1a6c7fe87da9c2974d93fb2f1939d92d64d2ab2a2a1db609df5973ded5ac4a02f214cf SHA512 c5f19a03e8161b346dbd89fb0d1b72d7906c19a7d55535878d9d75b7d96025d61808161f6b0ccaf9b5fef1d112f8e0ba1033ce149e42aec2cd261351d5ffb1c9
 DIST kwayland-integration-6.1.4.tar.xz 26420 BLAKE2B ee21cbb36234a1abbcbcb915e5e9a073767362a8b9ceb2d2fac450c4fa5e570b1c3ebc3fbc6b8291c6cf96846c747fa0f03e193e3e6462add6e13734e8136ca1 SHA512 0424f308558b3a1612426aeb5c1230617d18430029ce987178d3bcb69d34e2dfd044563fbef4d1d3d24d2a091069416a302ca376d5267f1819a2f1cad0657447
+DIST kwayland-integration-6.1.5.tar.xz 26396 BLAKE2B 7394bde4d04cbdb05367c1804e18718da2144c2190889be53f8cf9a20599593f46ab1933d07b6859de82f832cb30ffde4fba363c296799b190394f974e312ea8 SHA512 02ec5089483f466ee51a1a67a523aa8bac60c45b5cb80372a81493b43294fc83735152bbadb043c5b8af484fe29799da662c9bf5261adf3da774af5ce247b5aa
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-6.1.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-6.1.4.ebuild
index 599a5bbb2547..9f135289ce5a 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-6.1.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-6.1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-6.1.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-6.1.5.ebuild
new file mode 100644
index 000000000000..599a5bbb2547
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-6.1.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm flag-o-matic plasma.kde.org
+
+DESCRIPTION="Provides KWindowSystem integration plugin for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+# slot ops:
+# dev-qt/qtgui: QtXkbCommonSupportPrivate
+# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
+# kde-frameworks/kwindowsystem: Various private headers
+RDEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtgui-${QTMIN}:5=
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=dev-qt/qtgui-${QTMIN}:5[X]
+	)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
+	>=kde-plasma/kwayland-${KFMIN}:5
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}
+	dev-libs/plasma-wayland-protocols
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	filter-lto # bug 921430
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index fa436391bbe6..a9911db11367 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-5.116.0.tar.xz 337540 BLAKE2B e238af4a122317fde2b207762858fb913005afde60f1b9cf2dfd90163021d8c3d7d9c3b055a4bb3ae26b5d0560e90c9e0d1e1e51480315bf1a5bc5592a231d11 SHA512 48b24c88872a21d237274868fea601120fb9700f888ab0a7531651dc6501db8559af3a70b6131d89d31010e1f32013222d42e9d1244ae91bf9972588494957a9
 DIST kwayland-6.1.4.tar.xz 134076 BLAKE2B 74bf3b4e5890fd0ccca7e10bc84e341571349da803ad673f66494a0006875359c4cdb3455751d376cda96bb5a7c45381c4e2b8bd5e181e116e141bc08b21c706 SHA512 926906b9536b53f8443f04d09c8ea5c381031c23920893e6821438181ece12972efa62dc83ede6e268a92a3f5752a8772ee0687b7bfd210dab82cbaab1fbbbfa
+DIST kwayland-6.1.5.tar.xz 134076 BLAKE2B abba6423c470c21f834e304babe1b2e77c53526e0bd2bdc361fd0e6b8fbe7c1c248bc8e6ea5db118ec1b84f7bf59f361d28b14c908fbed132738675aa803f2e8 SHA512 d2e24141af64f987ad49e0dbefb82c472377bba6ef902ab65261095cc3a9d76cf585ee9b77f1a314f64d747fb035b38d8f11ddcd68af0eec1fbb6411e3860a00
diff --git a/kde-plasma/kwayland/kwayland-6.1.4.ebuild b/kde-plasma/kwayland/kwayland-6.1.4.ebuild
index fa2c840c0811..8030501ddacd 100644
--- a/kde-plasma/kwayland/kwayland-6.1.4.ebuild
+++ b/kde-plasma/kwayland/kwayland-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwayland/kwayland-6.1.5.ebuild b/kde-plasma/kwayland/kwayland-6.1.5.ebuild
new file mode 100644
index 000000000000..1521a040dc43
--- /dev/null
+++ b/kde-plasma/kwayland/kwayland-6.1.5.ebuild
@@ -0,0 +1,42 @@
+# 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 flag-o-matic plasma.kde.org
+
+DESCRIPTION="Qt-style API to interact with the wayland-client API"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+# slot ops: includes qpa/qplatformnativeinterface.h, surface_p.h
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,gui,opengl]
+	>=dev-qt/qtwayland-${QTMIN}:6=
+	media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	>=dev-libs/wayland-protocols-1.15
+	sys-kernel/linux-headers
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=dev-util/wayland-scanner-1.19.0
+"
+
+src_configure() {
+	filter-lto # bug 866575
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 50a91193fc9a..d91e6f104a1d 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,3 @@
 DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
 DIST kwin-6.1.4.tar.xz 8499248 BLAKE2B f455ee5da1ab735237581b41c3a423e3768443270e294ee1bd974f3f59bc72adf9d67939a27761dff51c2781df5f278b2fcf40f3b768e4bffaa1712934932894 SHA512 f7d512e633ec153f19b2f76f781d67a6c5f9b97df81205cf6e3cca227185b2764ffa612f0d1c0a528a37964dfcf3c6ac060c062ae8d653997057555cfd477090
+DIST kwin-6.1.5.tar.xz 8503432 BLAKE2B 8cd8da89f93ac64dbb8a42e90a09a188b86762440964d4e9425a924f0349360bcf31f187fcfb66b61fca42db44f93c97f313703c5b602e873035bec86f36b0b1 SHA512 a71d1f814c948293d5552504115178f20e7450ead86c57b0fda79584f613fbc77851d1735945f7f05bf0b6b8c09cdacf53154820176d133f41ec736ae1492946
diff --git a/kde-plasma/kwin/kwin-5.27.11-r1.ebuild b/kde-plasma/kwin/kwin-5.27.11-r1.ebuild
deleted file mode 100644
index a41c239d5468..000000000000
--- a/kde-plasma/kwin/kwin-5.27.11-r1.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm flag-o-matic plasma.kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.19:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[accessibility,egl,gles2-only=,libinput]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=[X(+)]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kwayland-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	>=kde-plasma/plasma-activities-${KFMIN}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	media-libs/libglvnd
-	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	>=x11-libs/libdrm-2.4.112
-	>=x11-libs/libxcb-1.10:=
-	>=x11-libs/libxcvt-0.1.1
-	>=x11-libs/libxkbcommon-1.5.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	gles2-only? ( || (
-		>=media-libs/mesa-24.1.0_rc1[opengl]
-		<media-libs/mesa-24.1.0_rc1[gles2]
-	) )
-	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kwayland-server
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	sys-apps/hwdata
-	x11-base/xwayland
-	multimedia? (
-		>=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml]
-		media-plugins/gst-plugins-soup:1.0
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.9
-	>=dev-libs/wayland-protocols-1.31
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
-	x11-base/xorg-proto
-	x11-libs/xcb-util-image
-	caps? ( sys-libs/libcap )
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	# ODR violation (bug #921558)
-	filter-lto
-
-	local mycmakeargs=(
-		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.27.11-r2.ebuild b/kde-plasma/kwin/kwin-5.27.11-r2.ebuild
index ff2950adf0b7..0991f47c04a4 100644
--- a/kde-plasma/kwin/kwin-5.27.11-r2.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.11-r2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwin/kwin-6.1.4-r1.ebuild b/kde-plasma/kwin/kwin-6.1.4-r1.ebuild
index b759cc819a2d..0589874ef8e6 100644
--- a/kde-plasma/kwin/kwin-6.1.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-6.1.4-r1.ebuild
@@ -14,7 +14,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 ~ppc64 ~riscv ~x86"
 IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwin/kwin-6.1.5.ebuild b/kde-plasma/kwin/kwin-6.1.5.ebuild
new file mode 100644
index 000000000000..8580013b2ff3
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.1.5.ebuild
@@ -0,0 +1,142 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+COMMON_DEPEND="
+	dev-libs/libei
+	>=dev-libs/libinput-1.19:=
+	>=dev-libs/wayland-1.22.0
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsensors-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}: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/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
+	>=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/breeze-${PVCUT}:6
+	>=kde-plasma/kdecoration-${PVCUT}:6
+	>=kde-plasma/kwayland-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libdisplay-info:=
+	media-libs/libepoxy
+	media-libs/libglvnd
+	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	>=x11-libs/libdrm-2.4.116
+	>=x11-libs/libxcb-1.10:=
+	>=x11-libs/libxcvt-0.1.1
+	>=x11-libs/libxkbcommon-1.5.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:6 )
+	gles2-only? ( || (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[gles2]
+	) )
+	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+	shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kdeplasma-addons:5
+	!kde-plasma/kwayland-server
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		dev-qt/qtmultimedia:6[ffmpeg]
+		(
+			dev-qt/qtmultimedia:6[gstreamer]
+			media-plugins/gst-plugins-soup:1.0
+		)
+	)
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6[wayland(+)]
+	sys-apps/hwdata
+	x11-base/xwayland[libei]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	>=dev-libs/wayland-protocols-1.34
+	>=dev-qt/qttools-${QTMIN}:6[widgets]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	x11-base/xorg-proto
+	x11-libs/xcb-util-image
+	caps? ( sys-libs/libcap )
+	test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: KWIN_BUILD_X11?
+		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+		$(cmake_use_find_package accessibility QAccessibilityClient6)
+		$(cmake_use_find_package caps Libcap)
+		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index d87fb3875f9e..33f05830a7ab 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,3 @@
 DIST kwrited-5.27.11.tar.xz 23492 BLAKE2B c37d142111e4bf2892b7795fc689452ab210a8cfc099aa89d75c0766975d62670f5a04039f1e10154d1a0b1d0025a7b8cc12fc68bc6042fcf1640c0c1154d6fe SHA512 b4a541832d567dbc2b0d391f7aa1463f17b89e62b3bb28447f728f7d32f640c2b5bd1011ef2224c37cbaa517f90e7bb17d0eadd9209af2af22db1986d6ab401a
 DIST kwrited-6.1.4.tar.xz 23720 BLAKE2B a7a1d62a474e1e71992e117f9bbbc8e11b16aabe0c3f46bbec662b69bd8e9b0c85ab91ca946e135b26cee4323faa846443aa83ac89fe8f3de938f9ccd8b3bd16 SHA512 8a7c8a8fc4f958ca7ec27f8a7d7534eac25afda5628a6ca0ee467a3296ca97bbc3b0445f2ded46eeeb1dfa8ff21a5b36d770c70146ca9dec922df2c98574d3da
+DIST kwrited-6.1.5.tar.xz 23740 BLAKE2B 2fc3e97e2567a86836c417bfd47856a2fea733c923ed3d6603299145fbff146c3028d347787a2b126505531789716676f11b04e4ae3a8c203f41c4ee97c0a186 SHA512 cdef2ace824e4fe71b8ef9ed100fcbf983f94945f1fcdd676f20e65df208533fbd04604db7be1fc3711e1444cde73f3835836106dee009f8fcc97f5ad5c7030d
diff --git a/kde-plasma/kwrited/kwrited-6.1.4.ebuild b/kde-plasma/kwrited/kwrited-6.1.4.ebuild
index 5b2c2c0386d9..ff9dfc35da9e 100644
--- a/kde-plasma/kwrited/kwrited-6.1.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwrited/kwrited-6.1.5.ebuild b/kde-plasma/kwrited/kwrited-6.1.5.ebuild
new file mode 100644
index 000000000000..1421b416b561
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-6.1.5.ebuild
@@ -0,0 +1,25 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpty-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 6aaf1ad7936a..41b51b6a1a05 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,2 +1,3 @@
 DIST layer-shell-qt-5.27.11.tar.xz 18488 BLAKE2B 3c56db129c4d525ee1968e3016f77f5adcf9ed121f6a7b28a6331ca06a1e1ad0df091c4d8afeb64e12176094332da5de33e91e219551c17ce22adc463dbe6b92 SHA512 9a7439a5653fe684967445109624989fbb11f8bc46815afd3eadf44f5753f4442d1d9d59c0721f1f383715f16aae845e3edc8c62409ccabee324dca219fb3429
 DIST layer-shell-qt-6.1.4.tar.xz 35948 BLAKE2B 65804344dd6e6914b8710fae9b90cd872ba8f1c4eb622f3acfa5360594b0af2c9938348626ab8cfec32134b779e5bfdc6f21a73f8aa755e7dfe56c77bb3bc849 SHA512 766955fe6012a285dae75116d6cbd312d245e05e422c2cca830834bb6be4ed188568928410936344101078a9af0d73b958a439b00159ac77e2efa4e591285b64
+DIST layer-shell-qt-6.1.5.tar.xz 35964 BLAKE2B 35cf6bb91a6a1f2b6c2bc47ca19776315d0353af9a2cbffea45f89b9ab4963f5c6936483b6d65138062d93443fa35d04aa83ad6573a4b99a2fb440da7cdf663a SHA512 b5b34a02ea7a39e37300301691400859d5e47133b77fbdfbbfe9b5e109a18d2e538749dfffdd8b8a655996f0b63d254fe72a8762b3ef667314cd507eba870154
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.4.ebuild
index 7a16b1d64542..ff85a8797fc5 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.4.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: various private QtWaylandClient headers
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.5.ebuild
new file mode 100644
index 000000000000..58d8e1c9aa2d
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.1.5.ebuild
@@ -0,0 +1,31 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
+
+LICENSE="LGPL-3+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# slot op: various private QtWaylandClient headers
+RDEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtbase-${QTMIN}:6[gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6=
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index d5b4cf1eabe2..a923b1574ace 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,3 @@
 DIST libkscreen-5.27.11.tar.xz 116052 BLAKE2B a727284888faa02f86c12ed332daa7fd5bf3fa2611664a5cd37608d61821a59023fb11b19afe26210735d5ffe5ee2e56a3a3b737b66d99aae8177061bb5cba5b SHA512 46cca0d7f91be8a284cbee951183d5559a1f298b987e5f76d5bf4b9a3d292d8ccf363f409582080d04aee692083f3e0a073bae15444f53e0f77565bb7c2255ba
 DIST libkscreen-6.1.4.tar.xz 119116 BLAKE2B 7b16b0e0f9ff43c7819f7021f0dc9479dc901b4b2a5de2d0b04c2f4d0e51fa3a436deafb7d1594d92348442a146df8c352a6c33b0c914212074e875648bf3931 SHA512 f432a758d422737979c2490d09a409efd4dc6721985efc3bfb23e35e73c244cfa3f304a2c5ffb15dc1c74f5e3ec71fb076b9967fe6d151866fc8489b0adfdbe9
+DIST libkscreen-6.1.5.tar.xz 119148 BLAKE2B 1344923ddc5baac058438bfaf1a976a62b2e778f497dda463a3be8ada3828f8eaf983f573947025bc8a59df2243234c8bb2820381d5c85de6605b5e121c9ccdb SHA512 b3d544187a02485356516eb3281841e77f6bf4d4f0548ffc4b49c295051b2c30fa0d3da3e98bdd9958f9c87c48d74aef5ad5f0ef32f854791ab829d86d9a419e
diff --git a/kde-plasma/libkscreen/libkscreen-6.1.4.ebuild b/kde-plasma/libkscreen/libkscreen-6.1.4.ebuild
index 78852734a209..6c9f8f3a6a21 100644
--- a/kde-plasma/libkscreen/libkscreen-6.1.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libkscreen/libkscreen-6.1.5.ebuild b/kde-plasma/libkscreen/libkscreen-6.1.5.ebuild
new file mode 100644
index 000000000000..cb27b05bc147
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-6.1.5.ebuild
@@ -0,0 +1,37 @@
+# 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.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Plasma screen management library"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6/8"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running session
+RESTRICT="test"
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+RDEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	x11-libs/libxcb:=
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index fbeac3223908..3bb2a9955225 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST libksysguard-5.27.11.tar.xz 890640 BLAKE2B 61a657f8fbc1042e57ec6e4ba85a6900db680547c61a611200dddc15b94af76f5183db6dc2c867138ccfc2af67f185d16eaff130999c525b3c8b7c23e38adc42 SHA512 21ac0f398c969146a9901cb184508cfab8f1d6e75e364ca638f85e87b0a25f9c901f81696c0bd6ee060f35c54204718f891510e7816858c190d78c2b25004544
 DIST libksysguard-6.1.4.tar.xz 305256 BLAKE2B a96335ec13f4b069edaea912e5541d59ee96de0a9b695298bd5bc297a8887965389132a238576428f2ab9881429991052a7a5abf4bcb814792462380ada5bf78 SHA512 0549e19182090d6b353e21fc86963b5fe27f712f7e928b0067021f0634ff119dd255c3760ab1cb8ce0a4eab4d532f921b1564208d711779973f20d428f31aa9a
+DIST libksysguard-6.1.5.tar.xz 306220 BLAKE2B 37f7e9c7fc1e91a0cfa4ab18b276e3d5187cb0a2a543a6a8d8d61a125cff49bcb1b73b85a1a3ea1f4079d10a94431995c5812e51198a7a12bf8f457b678b42af SHA512 d3ffec5479510241c3d006a7d0bc8ed23cd37dad84422c48bf8dad3eca62883759c2a536ffabe1bede1073144415f53cca8c2099129e96b18c8283a9e4e48140
diff --git a/kde-plasma/libksysguard/libksysguard-6.1.4.ebuild b/kde-plasma/libksysguard/libksysguard-6.1.4.ebuild
index c73b9a494bf4..d42b7e8591ef 100644
--- a/kde-plasma/libksysguard/libksysguard-6.1.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/libksysguard/libksysguard-6.1.5.ebuild b/kde-plasma/libksysguard/libksysguard-6.1.5.ebuild
new file mode 100644
index 000000000000..8b4787e9c254
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-6.1.5.ebuild
@@ -0,0 +1,43 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+
+LICENSE="LGPL-2+"
+SLOT="6/9"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-libs/libcap"
+
+src_test() {
+	# bugs 797898, 889942: flaky test
+	local myctestargs=(
+		-E "(sensortreemodeltest)"
+	)
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libplasma/Manifest b/kde-plasma/libplasma/Manifest
index 58c7c36d78f8..6ed7ee0d7c09 100644
--- a/kde-plasma/libplasma/Manifest
+++ b/kde-plasma/libplasma/Manifest
@@ -1,2 +1,3 @@
 DIST libplasma-6.1.4.tar.xz 2117624 BLAKE2B 95267993a201d4c8fb638e5f61a346736a0b86b20aa99b393e5d6695f5d798573b97fd1e516e541216583dac1af214043e7f78e0960a2415ea18cab073cec794 SHA512 d0db7ad8ceb9b63019d63070233664cd5f5b8a25b4f9de9a435e49db89f5b57bb71889b0d3fa07e0a99e3085f3874e80cff6b7c9190b467e63ff9a44e934107f
+DIST libplasma-6.1.5.tar.xz 2118832 BLAKE2B 7f499104181a6346ae0660d0cc2dab0172342b47e0b45950453aba602ddf408e87ff1e3df583ead4beff0d029489da86ced32a51e4ace1793809e049a81af163 SHA512 586ef5c408523eb8d5ef77f61277541c58070ea9147a7437f502e339a47d0f2d031c13d7843cfc094efb108779136cee3c06181b86004df1c46780e26d567717
 DIST plasma-framework-5.116.0.tar.xz 3311836 BLAKE2B ca47628891705bda2ae02728a680296e0ac2e4754f779a65685a85dd364ada9217e485ac9e10130c6c37fd0b98137263cb919941933fdbc0ba4c44febb6a99fd SHA512 d15a1379d14a13c17932c1278b209b0a2f6a07f1abc15cb436f73765f8df12564297541c29bf453991e4dc7d469c5b83ecc53e9e97480d10d8d897597acfe804
diff --git a/kde-plasma/libplasma/libplasma-5.116.0-r1.ebuild b/kde-plasma/libplasma/libplasma-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..0c3f499d93e0
--- /dev/null
+++ b/kde-plasma/libplasma/libplasma-5.116.0-r1.ebuild
@@ -0,0 +1,76 @@
+# 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"
+KDE_ORG_TAR_PN="plasma-framework"
+KFMIN=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Plasma library and runtime components based upon KF5 and Qt5"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gles2-only kf6compat man wayland"
+
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	=kde-frameworks/karchive-${KFMIN}*:5
+	=kde-frameworks/kconfig-${KFMIN}*:5[qml]
+	=kde-frameworks/kconfigwidgets-${KFMIN}*:5
+	=kde-frameworks/kcoreaddons-${KFMIN}*:5
+	=kde-frameworks/kdeclarative-${KFMIN}*:5
+	=kde-frameworks/kglobalaccel-${KFMIN}*:5
+	=kde-frameworks/kguiaddons-${KFMIN}*:5
+	=kde-frameworks/ki18n-${KFMIN}*:5
+	=kde-frameworks/kiconthemes-${KFMIN}*:5
+	=kde-frameworks/kio-${KFMIN}*:5
+	=kde-frameworks/kirigami-${KFMIN}*:5
+	=kde-frameworks/knotifications-${KFMIN}*:5
+	=kde-frameworks/kpackage-${KFMIN}*:5
+	=kde-frameworks/kservice-${KFMIN}*:5
+	=kde-frameworks/kwidgetsaddons-${KFMIN}*:5
+	=kde-frameworks/kwindowsystem-${KFMIN}*:5[X]
+	=kde-frameworks/kxmlgui-${KFMIN}*:5
+	=kde-plasma/plasma-activities-${KFMIN}*:5
+	x11-libs/libX11
+	x11-libs/libxcb
+	!gles2-only? ( media-libs/libglvnd[X] )
+	wayland? (
+		=kde-plasma/kwayland-${KFMIN}*:5
+		media-libs/libglvnd
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	kf6compat? ( kde-plasma/libplasma:6 )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DESKTOPTHEMES=$(usex !kf6compat)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/libplasma/libplasma-6.1.4.ebuild b/kde-plasma/libplasma/libplasma-6.1.4.ebuild
index 0c61b236f5c3..6baed6328278 100644
--- a/kde-plasma/libplasma/libplasma-6.1.4.ebuild
+++ b/kde-plasma/libplasma/libplasma-6.1.4.ebuild
@@ -15,7 +15,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 ~ppc64 ~riscv ~x86"
 IUSE="gles2-only"
 
 RESTRICT="test"
diff --git a/kde-plasma/libplasma/libplasma-6.1.5.ebuild b/kde-plasma/libplasma/libplasma-6.1.5.ebuild
new file mode 100644
index 000000000000..09a9035a5edd
--- /dev/null
+++ b/kde-plasma/libplasma/libplasma-6.1.5.ebuild
@@ -0,0 +1,69 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Plasma library and runtime components based upon KF6 and Qt6"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only"
+
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gles2-only=,gui,widgets,X]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-libs/wayland-1.15.0
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${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/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	=kde-plasma/plasma-activities-${PVCUT}*:6
+	media-libs/libglvnd
+	x11-libs/libX11
+	x11-libs/libxcb
+	!gles2-only? ( media-libs/libglvnd[X] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=dev-util/wayland-scanner-1.19.0
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 39b44dbcd961..c9f99233101e 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,3 @@
 DIST milou-5.27.11.tar.xz 58672 BLAKE2B 8b9cee6958c1437a239fc737d67a4677aab1c9a7d0d00873824512191a5be0d13550eae7db0c02d784328c22d7709c11b8beaecfe73649c51fc59b51fe49b91f SHA512 62fb06f50130a5836d50824ac1d9828463eb525787baa94489726e1fbfec270e1cf8b7f18a45430bdcbf3629eed0560a5d890cacd8d1d824dcc1362d53e50d9f
 DIST milou-6.1.4.tar.xz 50068 BLAKE2B 2aaddcd617178eac24d0b3bce258fce1caa46801f54aa191a4c22e75c61177b48450f0dfeaa0983f2b0d607e29d79df6252a5a414a91f83dae66936315cd21e8 SHA512 31314e36c8eedee976dd2d9984b01a5a6e59e946937d2d2d9fd0e2c6b922112cebab7f00b5177e7ce45361d0c1b4e4c74c9069a93a7cfee49d41d8de08e764b9
+DIST milou-6.1.5.tar.xz 50180 BLAKE2B 5e24ce0e15d372a9902dc21f1c5017e664faadd5fadca28f861102771c86f6f6a5228bb62e7d0daff4eda66bbb943d35d84589f489f4eb7c735ec37fc103457d SHA512 20f375fe8cee905238529e0215d2146af29fa7d7007f2a73f37a681ec8940a6e71a3e34bb5d149dc70f0f91ce55653d66b9afb60c5b740a4ada0fe0b47d87654
diff --git a/kde-plasma/milou/milou-6.1.4.ebuild b/kde-plasma/milou/milou-6.1.4.ebuild
index fc04c159ff9d..5c8a5de873d1 100644
--- a/kde-plasma/milou/milou-6.1.4.ebuild
+++ b/kde-plasma/milou/milou-6.1.4.ebuild
@@ -14,7 +14,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/milou/milou-6.1.5.ebuild b/kde-plasma/milou/milou-6.1.5.ebuild
new file mode 100644
index 000000000000..bb1f7d9d6ea1
--- /dev/null
+++ b/kde-plasma/milou/milou-6.1.5.ebuild
@@ -0,0 +1,29 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://invent.kde.org/plasma/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/ocean-sound-theme/Manifest b/kde-plasma/ocean-sound-theme/Manifest
index b45c950a7ed6..35c6c9854370 100644
--- a/kde-plasma/ocean-sound-theme/Manifest
+++ b/kde-plasma/ocean-sound-theme/Manifest
@@ -1 +1,2 @@
 DIST ocean-sound-theme-6.1.4.tar.xz 1210032 BLAKE2B 280e7c4ed39e62e9471c23c4d0db26a87d72a9f174a11eecf7def4d061f1392bdd880ef828a357ae3142490d4a8e7d9419be4c10db93fc4a6e709957d0ec32b8 SHA512 f2240e79787245f14ad45814c80813eacccc960fed7bf5b4fbdd2ea6546ee93a53c980908e9ab88fa3d55b46a18024259503758e132a08c338ed604cc4c38a65
+DIST ocean-sound-theme-6.1.5.tar.xz 1210080 BLAKE2B 1591fce46da589b0194f4b5093d0aafd52cc6f7a0a340fc89495e1cf9c4ffb5f00991b0f0f2f6160736c93651b228155a4a2ebf2bc03eb56a69d77fc824753c0 SHA512 f2aed788c1896b6e8fd24c1da5431e3298b49bfb4c08b5924938ab0cda5aa098565cb34fb8dc4735caf62021b12bf1db4bba90bc5cae1037918a86d79b37a2dc
diff --git a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.4.ebuild b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.4.ebuild
index 8a0883addfd6..70626505f370 100644
--- a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.4.ebuild
+++ b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.4.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 ~ppc64 ~riscv ~x86"
diff --git a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.5.ebuild b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.5.ebuild
new file mode 100644
index 000000000000..ed47d282d320
--- /dev/null
+++ b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.1.5.ebuild
@@ -0,0 +1,15 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Ocean Sound Theme for Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/ocean-sound-theme"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
diff --git a/kde-plasma/oxygen-sounds/Manifest b/kde-plasma/oxygen-sounds/Manifest
index 47097f3e634f..6e2133c1bebc 100644
--- a/kde-plasma/oxygen-sounds/Manifest
+++ b/kde-plasma/oxygen-sounds/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-sounds-5.27.11.tar.xz 1896616 BLAKE2B 2ffa50064fd35338c9bb36f1aa9395f3aff54f2b39307a80991c153544c60f15c1c4c56b64510efd4c442d26e40b84ead3a2fc9b873f6fbc2b01f8f22115fdc7 SHA512 e3287ee9ce4ae5b5fbfaa4debb563db11c395e14e3a037d65b22e136a4b188eda274e21c3e1349a3b921ea701581993bd9c11012befdc3fdd8094b4ed18a6ea3
 DIST oxygen-sounds-6.1.4.tar.xz 1936280 BLAKE2B f991dd879405da711f01f96b2e4c05e7836e0f0e36053d68724be081e57c0487b95899fb106801bb2d653979bc1d126c214467591b441649199db82beb19e619 SHA512 c297747fe73cb56f45cbd7b8ad8f0c1746fd6b2932cf57834317086873ac84f9556e4755cc5f137530cffd31fd755bdb190287d7c54fdd299e60a35fa67bfced
+DIST oxygen-sounds-6.1.5.tar.xz 1936612 BLAKE2B 719ca8a4dc643247425e67ec3c60615a83ef9d0f1496108c80eff255b2f4e59efec86e6ffc1a7cd002dcae003c830fcbd7a00fdc395036125e60cf37d78c4c84 SHA512 b354b9384a4a7c6271e9bec7cf197d28eef059929da4b63959cd6205b1c2af332c89152214c2c1aaae8c8473da31a4d5ba4a0236256951b567007608c9d2e1c1
diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.4.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.4.ebuild
index b45acb9eeff9..7a20d5f2c764 100644
--- a/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.4.ebuild
+++ b/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.4.ebuild
@@ -12,6 +12,6 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="!<kde-plasma/oxygen-5.24.80"
diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.5.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.5.ebuild
new file mode 100644
index 000000000000..640507c04923
--- /dev/null
+++ b/kde-plasma/oxygen-sounds/oxygen-sounds-6.1.5.ebuild
@@ -0,0 +1,17 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Oxygen sound theme for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="!<kde-plasma/oxygen-5.24.80"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index b534a8656f70..fc531c4bf22a 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-5.27.11.tar.xz 2783000 BLAKE2B 06bbf12c5e45f4fee4e5b7f572b7f6b57debc084bbd533afd7f839e1bd9bba119cf040b1a028a743d88fa7f50d9ea44f84e6eaca731c4d1d7c419d39210260c5 SHA512 8448d3f3d885175f0967bf8a3e1c2924846484c7e3794073f2b82ce9288468a2767f7361d1520a9c24a2a457f9f96deb752b73fc773d87c86609b4e148465c5e
 DIST oxygen-6.1.4.tar.xz 2800236 BLAKE2B 1306c231690f30f744dfe2e6823a3e5bcf098af16c0c253672b68440b9d714e62b6722729297b9084f1574ac1ef5402e34b9079ac3f1ea75b45f98c0eb71a3d0 SHA512 724265a2b0c8134e6152d2e74ec8dc608d2c8047325c3def4afcf812c7004822ea57a36a128360f1d7877955fbd567e054010747ebdff628f7e94e1d99717048
+DIST oxygen-6.1.5.tar.xz 2800624 BLAKE2B 4ae90887ce11f776fab8515735a9bd1a8f554dcb7e18e04c43f9b75ea21f3a30847a7f829e105c77c55cf3552fa0301276bf492c483b17e12c6945ca801f515b SHA512 d753421177805a687c390bde0c43a2b53adfe038a1bfeffaabafea71fde12e7b8e49903892c9a25b6de560a5f8587a5c74d4965fbe76ca39f814b9db787faff9
diff --git a/kde-plasma/oxygen/oxygen-6.1.4.ebuild b/kde-plasma/oxygen/oxygen-6.1.4.ebuild
index 42bb08f56095..62dc85f59f1c 100644
--- a/kde-plasma/oxygen/oxygen-6.1.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-6.1.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="qt5 X"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/oxygen/oxygen-6.1.5.ebuild b/kde-plasma/oxygen/oxygen-6.1.5.ebuild
new file mode 100644
index 000000000000..bdc9ebd6a7dc
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-6.1.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KF5MIN=5.115.0
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QT5MIN=5.15.12
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="qt5 X"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/frameworkintegration-${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/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-plasma/kdecoration-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	qt5? (
+		>=dev-qt/qtdbus-${QT5MIN}:5
+		>=dev-qt/qtdeclarative-${QT5MIN}:5
+		>=dev-qt/qtgui-${QT5MIN}:5
+		>=dev-qt/qtwidgets-${QT5MIN}:5
+		>=kde-frameworks/frameworkintegration-${KF5MIN}:5
+		>=kde-frameworks/kcompletion-${KF5MIN}:5
+		>=kde-frameworks/kconfig-${KF5MIN}:5
+		>=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
+		>=kde-frameworks/kguiaddons-${KF5MIN}:5
+		>=kde-frameworks/ki18n-${KF5MIN}:5
+		>=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+		>=kde-frameworks/kwindowsystem-${KF5MIN}:5
+		X? ( >=dev-qt/qtx11extras-${QT5MIN}:5 )
+	)
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[gui]
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_QT6=ON
+		-DBUILD_QT5=$(usex qt5)
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-activities-stats/Manifest b/kde-plasma/plasma-activities-stats/Manifest
index 63b540dea8e8..4fd478e6ec57 100644
--- a/kde-plasma/plasma-activities-stats/Manifest
+++ b/kde-plasma/plasma-activities-stats/Manifest
@@ -1,2 +1,3 @@
 DIST kactivities-stats-5.116.0.tar.xz 84584 BLAKE2B 89cf9fdce57c6eaeab9438c47127b682ef4e10d08cce4041ae8aecb07b8a492f0c1a21d96c5a906869db97f8c06d81c17a8addf48c6d47584dfbbe544bcf0970 SHA512 a50b84e989aecc551064c28f8e330ebc9054edc459cf085924ea61f17fcce8fa5037c39c485c5a58acdab5d93898e34648c292f91c450d075a09d0a0a18a610e
 DIST plasma-activities-stats-6.1.4.tar.xz 83192 BLAKE2B 1ed9cda61ccc57ea96918d14d4812686d7d8209e69d29938297156e8741a0570c7126404dda19d514fcc9e39fa01f4725bcf6223de25af211e90ac20b3f6dc15 SHA512 30e0263715a2a0ae0d51ac5e8e12674f3645a6a4afe4475ef5114a5028141cf00bdd706e4cf703322f14a8b47bafad1728ab28cfad07ac699c0490bccb39b145
+DIST plasma-activities-stats-6.1.5.tar.xz 83172 BLAKE2B 2bb12b6d08f74e304869d61afb60fb8bbfb885f350c38ed150c7a47034283c8d5066f18dffa8d7236f9de4e07c665a7e086c12da9eef7eebed6d4f4e82050589 SHA512 0656ca683a99f81a7b420f288731f46dd54558930896e3cb78da330e530681e87168d5ed9896975a6aed6b653b908051695a158840d03c047702208012db19c7
diff --git a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.4.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.4.ebuild
index 69cefb03b9f9..d019529eed0c 100644
--- a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.4.ebuild
+++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.5.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.5.ebuild
new file mode 100644
index 000000000000..4e458de90dc0
--- /dev/null
+++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.1.5.ebuild
@@ -0,0 +1,27 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Library for accessing usage data collected by the activities system"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,sql]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	kde-plasma/plasma-activities:6
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/boost )
+"
diff --git a/kde-plasma/plasma-activities/Manifest b/kde-plasma/plasma-activities/Manifest
index 22f9c2ec3f10..f6d7b3f23726 100644
--- a/kde-plasma/plasma-activities/Manifest
+++ b/kde-plasma/plasma-activities/Manifest
@@ -1,2 +1,3 @@
 DIST kactivities-5.116.0.tar.xz 73556 BLAKE2B 16a978a9df89bb74aa97553e53c7cd4a1ac69c99868a381090b46d37702cc38c847ae404b989adee9b00511f228ffa07b4e5b830802f9aa923d0f79508ea24ff SHA512 d36755cbf3e28262086da2d737c99eb6829c75c374972b97f8dfa7ba0f5d2c02c4d00e833702d23c04d02a6883d14735950cbdc0d92bb6dfa3fe615a488d5adf
 DIST plasma-activities-6.1.4.tar.xz 71112 BLAKE2B 614670034187f490a8ce34e036b2cb0e75f0880a08ff7bedf1b47b62c20aac326b463e00dab032af57b590864d601eee7d8b6958694f1c4189df86b54404916d SHA512 af71477bc664994bf2870a122bf69d5e55533e7240c5b88052cd9f757e456e72b0b964c906ca73e2413581fdb1bb800407820a948eaa53757ad456eddcf5ba39
+DIST plasma-activities-6.1.5.tar.xz 71148 BLAKE2B 14a68f55d8ddf0fcce9fcb95e34d1b64203b0ffcce213583434bf98b9f20fbbd57bc33e637ac42113f2055cf94249996691df7b7b68d26f8d6a5e57b506ac0ce SHA512 219d646963a5ea4d23687c1c151bcc1e97e75c3223c09043e939283a8a3fe272995731853c5917fb378b57e3185d72de933a1f9e1d76e36d20f319fb73baa52e
diff --git a/kde-plasma/plasma-activities/plasma-activities-6.1.4.ebuild b/kde-plasma/plasma-activities/plasma-activities-6.1.4.ebuild
index d851b3c18727..fea7eb24714a 100644
--- a/kde-plasma/plasma-activities/plasma-activities-6.1.4.ebuild
+++ b/kde-plasma/plasma-activities/plasma-activities-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-activities/plasma-activities-6.1.5.ebuild b/kde-plasma/plasma-activities/plasma-activities-6.1.5.ebuild
new file mode 100644
index 000000000000..a1f1809a763d
--- /dev/null
+++ b/kde-plasma/plasma-activities/plasma-activities-6.1.5.ebuild
@@ -0,0 +1,29 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Core components for KDE's Activities System"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	test? ( >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] )
+"
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index c47f59301392..934fb5e07932 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-browser-integration-5.27.11.tar.xz 212584 BLAKE2B 0ee27e9da1efa965b9babd18731e3a31d6fe30a23f786154f6a0de773f31c9e85b9d7ba7cda72ba53e031f3a626be79a1a579ab19e5fb3cd3479158abe575ea0 SHA512 5d887ab92221a9ae83ac1a927195e659b6508155c7e2062884f1b8ae8dddbdceea4a4a66ce1704179343ceef493240dd7ad68c461b3aa5f257c43f6062c0e7b0
 DIST plasma-browser-integration-6.1.4.tar.xz 222480 BLAKE2B c5dfdeffda46ed02ca8b5765034360e78400002998ba18e5b1b7a8c78835f1f03f066720081855135e2286877212ec9a09168481a158cdb3546b7eaa2f45abcb SHA512 1a858ae35dbad310c7e9abf88af9d81aae07b907014d94b42dd6a40fabc9d4625615e997e244f834d70573f9bda453fcd6885202977a3be0b02104be9d7c7496
+DIST plasma-browser-integration-6.1.5.tar.xz 222644 BLAKE2B d36dde47476446bae361fef0553eacae75e09709250246d3325f365e0f64b10f5c04502faf19e96714e838abc5ae95b925f14e603919170cf331cde925e91826 SHA512 2f16dbe197e0b9dd0c2e5433680d4422f8e763059a0cbb662187bcb50c446fb12add37b0edc8619a20b1abffe2f76d2b9a87bcf6b5ce030e2ba25efaddb1def9
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.4.ebuild
index a150c380ced8..3d2938ce6947 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.5.ebuild
new file mode 100644
index 000000000000..1b366f578a94
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.1.5.ebuild
@@ -0,0 +1,46 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
+
+LICENSE="GPL-3+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=kde-frameworks/kconfig-${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/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/purpose-${KFMIN}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-workspace-${PVCUT}:6
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/krunner-${KFMIN}:6
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 2d5008de31a4..4f4b20381a84 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,5 @@
 DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9
 DIST plasma-desktop-6.1.4.tar.xz 16140400 BLAKE2B 16b9d675151a84a972447268ce14bff6d8626ab03601ad49eac1e75919a6374de8d1595f93eee372d2c869a2664877844fd049dd299ca6817470991bc61d5d1a SHA512 59e24d0443aac91e09aef7b255f8c5540d32e0cca372fc2a8d399800eaa461a257f0bf2584560680015d2e5b4344faab4b46524f65031ae7e6ff541a65214b42
+DIST plasma-desktop-6.1.5.tar.xz 16144320 BLAKE2B 60b8ad791325e506551746790d23347c501caaa1550c470e5157e8902da07162691b30a36c53c6910d1daa32ea3e3801562d4acbf0feceaf35d72ad32662f809 SHA512 db5698874bd66be0194f868cc037af2521b924afb02a56036696504c2b3e8dec3d59ba9228203f7b0d08ffaaa36137f10081207fa79d748c5044b37063507b6f
 DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.1.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.1.4.ebuild
index dbbb588a95df..3de022e31a9e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.1.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.1.4.ebuild
@@ -16,7 +16,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 ~ppc64 ~riscv ~x86"
 IUSE="ibus scim screencast sdl +semantic-desktop webengine"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.1.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.1.5.ebuild
new file mode 100644
index 000000000000..d204e35e267f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.1.5.ebuild
@@ -0,0 +1,179 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-4"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ibus scim screencast sdl +semantic-desktop webengine"
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+	dev-libs/icu:=
+	dev-libs/wayland
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/attica-${KFMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${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/kded-${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/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/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-plasma/kwin-${PVCUT}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
+	>=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	media-libs/libcanberra
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2[joystick] )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.16_p20220803[qt6]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.25
+	dev-libs/boost
+	x11-base/xorg-proto
+	test? (
+		>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+		>=kde-plasma/kactivitymanagerd-${PVCUT}:6
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kdeplasma-addons-5.25.50
+	!<kde-plasma/plasma-workspace-6.0.80
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	>=kde-plasma/oxygen-${PVCUT}:6
+	kde-plasma/plasma-mimeapps-list
+	media-fonts/noto-emoji
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
+	webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] )
+"
+BDEPEND="
+	dev-util/intltool
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/${PN}-6.0.80-override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KCM_MOUSE_X11=ON
+		-DBUILD_KCM_TOUCHPAD_X11=ON
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+		$(cmake_use_find_package ibus GLIB2)
+		$(cmake_use_find_package sdl SDL2)
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" "app-accessibility/orca"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index bf426d189035..ad8c528ee7dd 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-disks-5.27.11.tar.xz 93892 BLAKE2B 7da072a23214297ceabaf256cf30ab2d0ed304f76351953ffae973a54ed0ad25a839549bb0c61b2793546b38c7857ec927d0ebb03885d3a43b2580aa9a60fd13 SHA512 102323ee220e0c2e823fe0a20f96a47646d5000555baa3f81e89168f62093690ed347f776cd78e290c7972114f9a76ba7e62f47c17db56312d5b58774f68100f
 DIST plasma-disks-6.1.4.tar.xz 101368 BLAKE2B 374839245128d397bb94e98084c725cf348259ebfac10bba8882ec96fa226a1767611a70d3e95489698b67addeca6d4394f3fb779af81620e2b0a2cc8785c427 SHA512 f129e22303a5de71e34633a72aa8b972475aeb3296ea9407b823ca7c579ee70723ee88ed764de6a28c5320d381d21a623e878444b20d8672e70411ffdedd3ea0
+DIST plasma-disks-6.1.5.tar.xz 101812 BLAKE2B d9ec1394dce1d1539a4de9e0316f34b2713600d2a7901958170d3ec0dc0e156e807e3e8c1584518bb7865e7339dc6859caccee2047c6d0abf115bfc4539379d5 SHA512 5b0e4d4aaaf7fdb35a136f9cc7a9882ea45e896258f154092c5567e2d1cfa4315cae8508e689fea4a89c6ca19f6f051566d67747b727aebe87d9e083a3fecf2e
diff --git a/kde-plasma/plasma-disks/plasma-disks-6.1.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-6.1.4.ebuild
index be846c7c9db7..c7c1ccbee8a6 100644
--- a/kde-plasma/plasma-disks/plasma-disks-6.1.4.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-disks/plasma-disks-6.1.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-6.1.5.ebuild
new file mode 100644
index 000000000000..c668f987a6a1
--- /dev/null
+++ b/kde-plasma/plasma-disks/plasma-disks-6.1.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${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/solid-${KFMIN}:6
+	sys-apps/smartmontools
+"
+RDEPEND="${DEPEND}
+	kde-plasma/kinfocenter:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index e58f75596861..788aa383ef1b 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-firewall-5.27.11.tar.xz 362988 BLAKE2B 484e853f4a8c61823e2a235fe5d5e40b6861c04044ca5058b8e866d9a9d9cb072b8a64c2c1b8a950f1604acc85dd27c38314735db2b6e4f59e8fb9085eda0ea8 SHA512 9c6a41448ef83a1c464e1e10441ae811bc898afc451b821fbd46141df4ffe1ad395692c420ce02dd5618197a307fa2729dbe8f0f703c1a64b14068f6c018ba7b
 DIST plasma-firewall-6.1.4.tar.xz 373820 BLAKE2B 8a876ab313192094d3da622fa66c3d149bf80f673f7ee27b13dc54b5a00b4a127e9d1e9cc133b5001806f43f81f1aa231f461c853046d722a314da0924ab8a9c SHA512 f685c378184a177237158db2cd3a14fc7e4806af60e28b93d5e7932dc18bb26538a5415891b6b562e79deff17d7929dc7673e9a0088f1591c0654b9937d6e94a
+DIST plasma-firewall-6.1.5.tar.xz 373904 BLAKE2B 46a7e73c8b16dc031a75754ee58ef2b790dd43543571b8ea5cb65c7175d0e2f6671167043e107ed535591d6d64f1b295ebf8e6fc60cd5f5bb5104d11914cd193 SHA512 3b3e63b7c5516e7e0775577fe272fb800fdcb125310181c74aa0e2499c62eccdf8f313d136dadb87bc9abd0c014a5dfc26337e3910aa7bafbf548f302e12d78e
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.1.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.1.4.ebuild
index 143bc10e05eb..bf9a32737928 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-6.1.4.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE="firewalld +ufw"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.1.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.1.5.ebuild
new file mode 100644
index 000000000000..88450aae88aa
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-6.1.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org python-single-r1
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="firewalld +ufw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	firewalld? ( net-firewall/firewalld )
+	ufw? ( net-firewall/ufw )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
+		-DBUILD_UFW_BACKEND=$(usex ufw)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if ! has_version sys-apps/systemd; then
+		ewarn "${PN} is not functional without sys-apps/systemd at this point."
+		ewarn "See also: https://bugs.gentoo.org/778527"
+	fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index c251d812063c..173665864673 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-integration-5.27.11.tar.xz 89460 BLAKE2B b6e0f487332c7280d394c9e84c44f18cd0694812307fdb1109a27d7f04ac5e0b2c6934adfed10fcbb65b5ec358e4ece728c8761edbc2872f33b40d3cff54495f SHA512 34e040425a11089bdda444132c224af8b4fca5d3fd30e875d4a385ad26bb215409c076c19ee3a2bbe3736121a7988bbc6ca564814f4e28b8e20acb5ebc194347
 DIST plasma-integration-6.1.4.tar.xz 93080 BLAKE2B d4004e2598d5568711dfd043cf49f73fc17d6d738bfbb06169db3564fc08bd0ab31e1a4f2f67f299b1589b65b8578cf460334cf05186c28340d55c8f6b516d30 SHA512 09276ecb1318aad8d89c95181cc4cee766f76384e143fac17006dbe72abdb105529fd71de3becfbe0f87c6a606574778b3da72065ce6b6d00ac141be2f8b664f
+DIST plasma-integration-6.1.5.tar.xz 93124 BLAKE2B 7b3e503f412342927ca934a4d2473676b551208fc00a0ce74d1abc7c72bc4ec99204e244f7589106a8f788a78d175923ffc451dde7bdc19eecc9ece13399e32d SHA512 1b5e82484c5a952f58fd93a2a76012331b226981527dc304b70f365abe1c2a2ccbb27b7f6194efe7a42fddfdf42c695d65dccd9e5907ee7a09f98a2c268b5020
diff --git a/kde-plasma/plasma-integration/plasma-integration-6.1.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.1.4.ebuild
index 2cc64b11c41c..9e7fe59b0736 100644
--- a/kde-plasma/plasma-integration/plasma-integration-6.1.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-6.1.4.ebuild
@@ -14,7 +14,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 ~ppc64 ~riscv ~x86"
 IUSE="qt5"
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-integration/plasma-integration-6.1.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.1.5.ebuild
new file mode 100644
index 000000000000..e235f0627bb0
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-6.1.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KF5MIN=5.115.0
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QT5MIN=5.15.12
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="qt5"
+
+# requires running kde environment
+RESTRICT="test"
+
+# slot ops: qdbus*_p.h and Qt6::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${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/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	x11-libs/libXcursor
+	x11-libs/libxcb
+	qt5? (
+		>=dev-qt/qtdbus-${QT5MIN}:5
+		>=dev-qt/qtgui-${QT5MIN}:5=[dbus]
+		>=dev-qt/qtquickcontrols2-${QT5MIN}:5
+		>=dev-qt/qtwayland-${QT5MIN}:5
+		>=dev-qt/qtwidgets-${QT5MIN}:5
+		>=dev-qt/qtx11extras-${QT5MIN}:5
+		>=kde-frameworks/kcompletion-${KF5MIN}:5
+		>=kde-frameworks/kconfig-${KF5MIN}:5
+		>=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+		>=kde-frameworks/kcoreaddons-${KF5MIN}:5
+		>=kde-frameworks/kguiaddons-${KF5MIN}:5
+		>=kde-frameworks/ki18n-${KF5MIN}:5
+		>=kde-frameworks/kiconthemes-${KF5MIN}:5
+		>=kde-frameworks/kio-${KF5MIN}:5
+		>=kde-frameworks/kjobwidgets-${KF5MIN}:5
+		>=kde-frameworks/knotifications-${KF5MIN}:5
+		>=kde-frameworks/kwindowsystem-${KF5MIN}:5
+		>=kde-frameworks/kxmlgui-${KF5MIN}:5
+		>=kde-plasma/kwayland-${KF5MIN}:5
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+	media-fonts/noto-emoji
+"
+PDEPEND="
+	>=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_QT6=ON
+		-DBUILD_QT5=$(usex qt5)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.27.11-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.27.11-r1.ebuild
deleted file mode 100644
index cca4f1957376..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.27.11-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
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
-cups +desktop-portal discover +display-manager +elogind +firewall flatpak grub
-gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm
-sdk +smart systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksystemstats-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}[lock]
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/oxygen-sounds-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
-	>=kde-plasma/plasma-welcome-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:*
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	colord? ( x11-misc/colord )
-	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	cups? ( kde-plasma/print-manager:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			<x11-misc/sddm-0.21.0_p20240302[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	elogind? ( sys-auth/elogind[pam] )
-	flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} )
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-		x11-misc/appmenu-gtk-module
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? (
-		sys-apps/systemd[pam]
-		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
-	)
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-plasma/plasma-desktop
-RDEPEND="${RDEPEND}
-	accessibility? ( app-accessibility/orca )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	ewarn "An existing installation of sys-auth/consolekit was detected even though"
-	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
-	ewarn "There can only be one session manager at runtime, otherwise random issues"
-	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
-	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
-	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.27.11-r2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.27.11-r2.ebuild
new file mode 100644
index 000000000000..cd5fee311e54
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.27.11-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://kde.org/plasma-desktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
+cups +desktop-portal discover +display-manager +elogind +firewall flatpak grub
+gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm
+sdk +smart systemd thunderbolt +wallpapers"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}[lock]
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/oxygen-${PV}:${SLOT}
+	>=kde-plasma/oxygen-sounds-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
+	>=kde-plasma/plasma-welcome-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:*
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	cups? ( kde-plasma/print-manager:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			<x11-misc/sddm-0.21.0_p20240723-r10[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	elogind? ( sys-auth/elogind[pam] )
+	flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} )
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.1.4-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.1.4-r1.ebuild
new file mode 100644
index 000000000000..dfd06659b834
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-6.1.4-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Merge this to pull in all Plasma 6 packages"
+HOMEPAGE="https://kde.org/plasma-desktop/"
+
+LICENSE="metapackage"
+SLOT="6"
+KEYWORDS="amd64 arm64 ~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
+thunderbolt unsupported wacom +wallpapers webengine +xwayland"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	!${CATEGORY}/${PN}:5
+	!kde-plasma/khotkeys:5
+	>=kde-plasma/breeze-${PV}:${SLOT}[qt5?]
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/kglobalacceld-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kpipewire-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${PV}:${SLOT}
+	>=kde-plasma/kwayland-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}[lock]
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/libplasma-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/ocean-sound-theme-${PV}:${SLOT}
+	>=kde-plasma/plasma-activities-${PV}:${SLOT}
+	>=kde-plasma/plasma-activities-stats-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}[qt5?]
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
+	>=kde-plasma/plasma-welcome-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/plasma5support-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:*
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/qqc2-breeze-style-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	>=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	cups? ( >=kde-plasma/print-manager-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			>=x11-misc/sddm-0.21.0_p20240723-r10[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	elogind? ( sys-auth/elogind[pam] )
+	flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} )
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		sys-apps/xdg-desktop-portal-gtk
+		x11-misc/appmenu-gtk-module
+	)
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+	)
+	oxygen-theme? (
+		>=kde-frameworks/oxygen-icons-6.0.0:*
+		>=kde-plasma/oxygen-${PV}:${SLOT}[qt5?]
+		>=kde-plasma/oxygen-sounds-${PV}:${SLOT}
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 )
+	rdp? ( >=kde-plasma/krdp-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	!unsupported? (
+		!gui-apps/qt6ct
+	)
+	wacom? ( >=kde-plasma/wacomtablet-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+	webengine? ( kde-apps/khelpcenter:6 )
+	xwayland? ( >=gui-apps/xwaylandvideobridge-0.4.0 )
+"
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
+
+pkg_postinst() {
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
+		# Workaround for bug #923292 (KDE-bug 479679)
+		ewarn "plasmashell and other KDE Plasma components are known to misbehave"
+		ewarn "when built with sys-libs/libcxx, e.g. crashing when right-clicking"
+		ewarn "on a panel. See bug #923292."
+		ewarn ""
+		ewarn "A possible (no warranty!) workaround is building sys-libs/libcxx and"
+		ewarn "sys-libs/libcxxabi with the following in package.env:"
+		ewarn " MYCMAKEARGS=\"-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=2\""
+		ewarn "You may then need to rebuild dev-qt/* and kde-*/*."
+	fi
+
+	if ! use qt5 && has_version dev-qt/qtgui; then
+		ewarn "KF5- and Qt5-based applications will exhibit various integration bugs"
+		ewarn "and generally look out of place in Plasma 6 without the dependencies"
+		ewarn "enforced by kde-plasma/plasma-meta[qt5]."
+		ewarn
+		ewarn "This warning message is being displayed because dev-qt/qtgui:5 is"
+		ewarn "currently installed which indicates the use of such applications."
+	fi
+}
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.1.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.1.4.ebuild
deleted file mode 100644
index 3f6762bdb8a9..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-6.1.4.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 toolchain-funcs
-
-DESCRIPTION="Merge this to pull in all Plasma 6 packages"
-HOMEPAGE="https://kde.org/plasma-desktop/"
-
-LICENSE="metapackage"
-SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~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
-thunderbolt unsupported wacom +wallpapers webengine +xwayland"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	!${CATEGORY}/${PN}:5
-	!kde-plasma/khotkeys:5
-	>=kde-plasma/breeze-${PV}:${SLOT}[qt5?]
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/kglobalacceld-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kpipewire-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksystemstats-${PV}:${SLOT}
-	>=kde-plasma/kwayland-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}[lock]
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/libplasma-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/ocean-sound-theme-${PV}:${SLOT}
-	>=kde-plasma/plasma-activities-${PV}:${SLOT}
-	>=kde-plasma/plasma-activities-stats-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}[qt5?]
-	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
-	>=kde-plasma/plasma-welcome-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/plasma5support-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:*
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/qqc2-breeze-style-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	colord? ( x11-misc/colord )
-	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	cups? ( >=kde-plasma/print-manager-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			>=x11-misc/sddm-0.21.0_p20240302[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	elogind? ( sys-auth/elogind[pam] )
-	flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} )
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-		sys-apps/xdg-desktop-portal-gtk
-		x11-misc/appmenu-gtk-module
-	)
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-	)
-	oxygen-theme? (
-		>=kde-frameworks/oxygen-icons-6.0.0:*
-		>=kde-plasma/oxygen-${PV}:${SLOT}[qt5?]
-		>=kde-plasma/oxygen-sounds-${PV}:${SLOT}
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 )
-	rdp? ( >=kde-plasma/krdp-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? (
-		sys-apps/systemd[pam]
-		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
-	)
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	!unsupported? (
-		!gui-apps/qt6ct
-	)
-	wacom? ( >=kde-plasma/wacomtablet-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-	webengine? ( kde-apps/khelpcenter:6 )
-	xwayland? ( >=gui-apps/xwaylandvideobridge-0.4.0 )
-"
-# Optional runtime deps: kde-plasma/plasma-desktop
-RDEPEND="${RDEPEND}
-	accessibility? ( app-accessibility/orca )
-"
-
-pkg_postinst() {
-	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
-		# Workaround for bug #923292 (KDE-bug 479679)
-		ewarn "plasmashell and other KDE Plasma components are known to misbehave"
-		ewarn "when built with sys-libs/libcxx, e.g. crashing when right-clicking"
-		ewarn "on a panel. See bug #923292."
-		ewarn ""
-		ewarn "A possible (no warranty!) workaround is building sys-libs/libcxx and"
-		ewarn "sys-libs/libcxxabi with the following in package.env:"
-		ewarn " MYCMAKEARGS=\"-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=2\""
-		ewarn "You may then need to rebuild dev-qt/* and kde-*/*."
-	fi
-
-	if ! use qt5 && has_version dev-qt/qtgui; then
-		ewarn "KF5- and Qt5-based applications will exhibit various integration bugs"
-		ewarn "and generally look out of place in Plasma 6 without the dependencies"
-		ewarn "enforced by kde-plasma/plasma-meta[qt5]."
-		ewarn
-		ewarn "This warning message is being displayed because dev-qt/qtgui:5 is"
-		ewarn "currently installed which indicates the use of such applications."
-	fi
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.1.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.1.5.ebuild
new file mode 100644
index 000000000000..081ef93f62bf
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-6.1.5.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Merge this to pull in all Plasma 6 packages"
+HOMEPAGE="https://kde.org/plasma-desktop/"
+
+LICENSE="metapackage"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~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
+thunderbolt unsupported wacom +wallpapers webengine +xwayland"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	!${CATEGORY}/${PN}:5
+	!kde-plasma/khotkeys:5
+	>=kde-plasma/breeze-${PV}:${SLOT}[qt5?]
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-common-${PV}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kdesu-gui-${PV}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/kglobalacceld-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kpipewire-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${PV}:${SLOT}
+	>=kde-plasma/kwayland-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}[lock]
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/libplasma-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/ocean-sound-theme-${PV}:${SLOT}
+	>=kde-plasma/plasma-activities-${PV}:${SLOT}
+	>=kde-plasma/plasma-activities-stats-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}[qt5?]
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
+	>=kde-plasma/plasma-welcome-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/plasma5support-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:*
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/qqc2-breeze-style-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	>=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	cups? ( >=kde-plasma/print-manager-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			>=x11-misc/sddm-0.21.0_p20240302[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	elogind? ( sys-auth/elogind[pam] )
+	flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} )
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		sys-apps/xdg-desktop-portal-gtk
+		x11-misc/appmenu-gtk-module
+	)
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+	)
+	oxygen-theme? (
+		>=kde-frameworks/oxygen-icons-6.0.0:*
+		>=kde-plasma/oxygen-${PV}:${SLOT}[qt5?]
+		>=kde-plasma/oxygen-sounds-${PV}:${SLOT}
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 )
+	rdp? ( >=kde-plasma/krdp-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	!unsupported? (
+		!gui-apps/qt6ct
+	)
+	wacom? ( >=kde-plasma/wacomtablet-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+	webengine? ( kde-apps/khelpcenter:6 )
+	xwayland? ( >=gui-apps/xwaylandvideobridge-0.4.0 )
+"
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
+
+pkg_postinst() {
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
+		# Workaround for bug #923292 (KDE-bug 479679)
+		ewarn "plasmashell and other KDE Plasma components are known to misbehave"
+		ewarn "when built with sys-libs/libcxx, e.g. crashing when right-clicking"
+		ewarn "on a panel. See bug #923292."
+		ewarn ""
+		ewarn "A possible (no warranty!) workaround is building sys-libs/libcxx and"
+		ewarn "sys-libs/libcxxabi with the following in package.env:"
+		ewarn " MYCMAKEARGS=\"-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=2\""
+		ewarn "You may then need to rebuild dev-qt/* and kde-*/*."
+	fi
+
+	if ! use qt5 && has_version dev-qt/qtgui; then
+		ewarn "KF5- and Qt5-based applications will exhibit various integration bugs"
+		ewarn "and generally look out of place in Plasma 6 without the dependencies"
+		ewarn "enforced by kde-plasma/plasma-meta[qt5]."
+		ewarn
+		ewarn "This warning message is being displayed because dev-qt/qtgui:5 is"
+		ewarn "currently installed which indicates the use of such applications."
+	fi
+}
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 1fe15e7ee595..a6c7ef69495c 100644
--- a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
+++ b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index e9e30140e83a..9e6dc42bddb5 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-nm-5.27.11.tar.xz 1150816 BLAKE2B 9c48416a45caf9ac4836f793bd082906b2f3548dc1000c013c9403d609e3d0eee6036da4c6bb9b24be31a278487f777bd6fc3b258ce75adec35759c94ee35994 SHA512 79148728ab0e365c686ad4f24e8304f4be37112794c6356495b6108629ba68348588cf56f2fee60d2392ebaa5f4ab33cc43c30bdbae053ead5c5783cc1ced8ad
 DIST plasma-nm-6.1.4.tar.xz 1201000 BLAKE2B 8092d5daf773f8a9b234b8bc10d1d7bf470e54b16947c53780361f9f69aac4d4acd2de027f823382039231a9144d17618887230a749550b427f692549a7965f5 SHA512 1df8c163d3ef5709e2ffd35742e8cd7914c448277800e3d67fc4896e13c917b5b381096c2582e2ce961e3b7a64bdda7f9383d9bde51f24a58f85f892f85711f5
+DIST plasma-nm-6.1.5.tar.xz 1202440 BLAKE2B 007014221efb8a84c82d2d78ee21c29e8dc2359d2e826f146a0583ece8218c21e850ee4ee29fdc7855d64babb8466ded422c44e819f3fe5c404dde737e7ccdd2 SHA512 1e676c5840d9a6a3e780506be3d2ce1dd889fc8b5a6a9f1f9b58d2fb7828837b462b0de42b3daa6d2e1c106fe6984ecd3832474a84c6217c63f80cabd35a94b3
diff --git a/kde-plasma/plasma-nm/plasma-nm-6.1.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.1.4.ebuild
index 3caef066a92b..6575d12b31cb 100644
--- a/kde-plasma/plasma-nm/plasma-nm-6.1.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-6.1.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-6.1.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.1.5.ebuild
new file mode 100644
index 000000000000..8688ca4a527b
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-6.1.5.ebuild
@@ -0,0 +1,77 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.3.7:2[qt6]
+	dev-libs/qcoro[dbus]
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}: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/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/modemmanager-qt-${KFMIN}:6
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:6[teamd=]
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	net-misc/mobile-broadband-provider-info
+	net-misc/networkmanager[teamd=]
+	openconnect? (
+		>=dev-qt/qtwebengine-${QTMIN}:6
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+"
+BDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_OPENCONNECT=$(usex openconnect)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-frameworks/kcmutils:6"; then
+		elog "${PN} is not terribly useful without kde-frameworks/kcmutils:6."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell6 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 33ccce236f75..246924077a76 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-pa-5.27.11.tar.xz 164028 BLAKE2B b657d0d82f4c0faa2e08d054c3f9e4f7fc439dbf5a2c3d6671b06b91d21f22da44ad3b0b6c848f6be63709cd6b7666bcef4f1992228c24574ade99c79824d6de SHA512 660e5e32476e8426dced4cf2fc1b198145f1e25237a1da392bbe9c889ffad92bc2a94dbf0daf13e03737f0fa5913e50bff264637178105815b4f32336b611857
 DIST plasma-pa-6.1.4.tar.xz 162772 BLAKE2B 6353770894fe1b8a51afee45a2ea17bd590bdb2752982e006ccf6ac8442484396e73378d8ee91972c7847c6be17f30d88ed07cbe0c60979ef400a711f7dd5ebd SHA512 00d46454f2091c9f0af809c03b7ecd19d2391d7b1f995ced91f49397a137523aaf7ce2844ec305069f0095a2dba73e5a163aa2ae05906a30f55946634ac5f3f9
+DIST plasma-pa-6.1.5.tar.xz 163064 BLAKE2B 91ce21182b9890bbabaff3f993dd8b15dc771a8b59d3c611f85b073b9d915aa4c83447d239fa20cd6cd65e3b91bb66ed7f0e63c0d452ec459cb15601bcc5ffc2 SHA512 c0219145c30e322bef6f8d578f2c880248175f52094d65ca5d1c49fde556137e2d1a3d5670a17d32e9d77dfc933444ddc2e30084e7dd15c77e3ad5eda1048714
diff --git a/kde-plasma/plasma-pa/plasma-pa-6.1.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.1.4.ebuild
index 04a6e042ea48..3ca933c0f4a9 100644
--- a/kde-plasma/plasma-pa/plasma-pa-6.1.4.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-6.1.4.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
diff --git a/kde-plasma/plasma-pa/plasma-pa-6.1.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.1.5.ebuild
new file mode 100644
index 000000000000..48c5e022fb91
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-6.1.5.ebuild
@@ -0,0 +1,44 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	media-libs/libcanberra
+	media-libs/libpulse
+	>=media-libs/pulseaudio-qt-1.5.0:=
+"
+RDEPEND="${DEPEND}
+	dev-libs/kirigami-addons:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	x11-themes/sound-theme-freedesktop
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index aa04e67694c3..e1ea217bafe1 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-sdk-5.27.11.1.tar.xz 322312 BLAKE2B 36f63e5dd301b93a6c36e87d8fc8b48f9c1819d7d74ce5da1b69ea7f450af0fbb36c7f4155b3c6c6b8e4b0ac9484fda5288feb1a4d643ae0753d4f4a4a957c48 SHA512 000f69a9197c978bc105a11d1b9f127c3e8f788686ad9654fdb595ed4a4e6cd156cc01654b804d5e2d719e386939a1ed27ae96c35e1612f0ac0db72fdd267d97
 DIST plasma-sdk-6.1.4.tar.xz 327276 BLAKE2B 49a59b9872adf749cd3beffa7c9ba114b0c6eeb778dbd07e217acc9b619f3d52be218fd5c5e334098cc80c5782c7177ef08cd07b6465fb03b3c260368f4cb573 SHA512 0cd5f55c4489ef76377d40459832409f919634d61d5830d72ec52e60dac8642b8d0592bf6a07382ebe4bb84a2b6427d7aa8c8e9b4b55033ddbae07af6c9d932e
+DIST plasma-sdk-6.1.5.tar.xz 327588 BLAKE2B a070974456044b206ed9ee58ee3814b21c6e4dc289ebb1430f8eed1fff6a2517ea90423590731ae6d2af8a1405b76bac50b04834e010959255ec407e010a0b79 SHA512 85810581c8a094848cbdfa4f7a3dbeda94f83918988cb36e741fece0d4eb21f4d5e018eeb957f6c373b1c25cba85826f17d0b79e04d650610eec1cf3c380bc41
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.1.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.1.4.ebuild
index fd651fdb3247..f11d5aac35bf 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-6.1.4.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-6.1.4.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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.1.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.1.5.ebuild
new file mode 100644
index 000000000000..c2adfe96addf
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-6.1.5.ebuild
@@ -0,0 +1,42 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+	>=dev-qt/qtdeclarative-${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/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/kpackage-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma5support-${PVCUT}:6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 76d79a6d54aa..b1d8b7fe3234 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-systemmonitor-5.27.11.tar.xz 173356 BLAKE2B 358a4f021813564c608d12c9483c076c746a201b2072bab3cb48625bc62a9666b4afd10267839a9836b4544b2cc0a2f88f53052a615606fe89db08f4f5100f2b SHA512 bbd7036d2666b39910f5e1d87e336f3531c55bbc35b29510be33619aa1afdfca26f4c437cdc68758c28ef3afe35ec0e618135c6cba68d967abcb0c03e045d06c
 DIST plasma-systemmonitor-6.1.4.tar.xz 187968 BLAKE2B 41b8b45395a9ad214a9e043063fc3f1cb0b1ca80594f95731c6f75ee85fd4f7431ee136aa9a3c5ae28ed8bc3a8ce53bd896970e109b740bcde65fced46e63b58 SHA512 08a8cc720b0b7a0132ff20e89c9f25dd05a61bf381c7074deda3a4ae1a76aa5329dbd5545d3e465eec8a1b033802426108f01e59f8dc17ead10cea2412c48790
+DIST plasma-systemmonitor-6.1.5.tar.xz 188276 BLAKE2B 300ad4c7a114a705de50afd59c84cbc44af0d56bd0355117063d9e609900dbcb47f3a5419a6e9ae8f73d49cdb13880ae50f9c84d7bce49f6791df1cb9ac3eedf SHA512 71fa893dff8333632d6d9e26aaba727c3b6701f3e20945a600911ca7e9f6f716ed3b9a7594fc6176547299a1172d87c8fdd0205e2ad961e27f33718015cbb7a4
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.4.ebuild
index 433750b28d04..313dac4a7851 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.4.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.5.ebuild
new file mode 100644
index 000000000000..5d2a50b6c137
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.1.5.ebuild
@@ -0,0 +1,42 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Monitor system sensors, process information and other system resources"
+HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/kirigami-addons-1.1.0:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${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/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+	>=kde-plasma/ksystemstats-${PVCUT}:6
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 4372b1a25266..fea8e385e750 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-thunderbolt-5.27.11.tar.xz 72824 BLAKE2B c6c7fb62b255388672116a0e0cd9d36637a8ace2e2b559e39ebb5a64867c1c3057f832875885990fec3cd0a478bb177f8e10f5cb05c486e33b097836f7f3dd4a SHA512 8ba96ca33d32b3185e7026c75f8b6158df4cee88e4f2a5e42a1a86faf22391fe62112e441cc1d41a36e7a7b74cef3d61ac2426399e0e71a862d88807c404c6f8
 DIST plasma-thunderbolt-6.1.4.tar.xz 79556 BLAKE2B fc823a61ccb01e2478c5c535767c21c712027111e3720607a7b32c3469440b2c3ea69f4a6a9e5a0810b4e6f5dfc26ab9179d7a6b190d0eb3a8659b34556ec9ce SHA512 a04414a072ea8ee6693131496f4d8ac9716d671ffd6b0eced5398bb0b2019c1667e0abf0382313dc38b00df19d2c320b4d137ce04619a23a91fc51a2f4d4e539
+DIST plasma-thunderbolt-6.1.5.tar.xz 79972 BLAKE2B 36c1ee8d41d25f818763d29b1cf0ca05c864cc5343805292d329c657a1a19515cfa231c56bd1d6f85e8676bd70d88974c8799d97ca70fad1a6dba972addb7703 SHA512 4340a66ea69189b2a8e622691f9cb2d34168f204658cd59a0b0c3f8aba547eb797ba8132c124c4a84a1041e7e93bc553ecf988193d33b715882af9aeb688fd9a
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.4.ebuild
index 1b1a74611825..9cacf03b2e46 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.4.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.4.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 ~riscv ~x86"
 IUSE=""
 
 # tests require DBus
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.5.ebuild
new file mode 100644
index 000000000000..0bac9ea6ff86
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.1.5.ebuild
@@ -0,0 +1,36 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="6"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+# tests require DBus
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	sys-apps/bolt
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index ab711116eb3b..0a2d1668dac3 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-vault-5.27.11.tar.xz 187204 BLAKE2B 7dcfdf2f2407a1138c80e8a28513643f3a4803643062c3bf1407fdd1066688b336b1287f3c4b4890dc7ce25069badaec78a9f1f7822cd28d928b7224f8847c4c SHA512 8e7a6a2acf28810ab8c12cf3d38583a563fb7f741c509395bf1b21a37070390eef2e2b6e0f7aa8dfaf8de8e12679be84aa25fb73790c5a431922eb531e944305
 DIST plasma-vault-6.1.4.tar.xz 201116 BLAKE2B a6c551dec3aea94ceb53dc7ec4af49709244bd6fc355d6c98f0c0837499fa5e66fbc2247e27ccc39c81348ab7ca77c16b8e81ac0165b28811fcecb533e20402c SHA512 3fe537cef805ec2f1604155fda8c3712d6c6e575e699ec93ef80c11305a81670e09d172b7fe792f51cf44212e0c4de2a1a6d8e97e0e37ec5d08cc7f6e59afc87
+DIST plasma-vault-6.1.5.tar.xz 201308 BLAKE2B d4b009385669935a886870421ef45b46165ef32f30aaa1bf85ebf70345ca0d6a2bbe8469691173ec5b320a3624767f281cadda7b459cdce1c2107342b2ef0de6 SHA512 74e10a58ba55b5452e109e0fbb942073bc6471595d03de0f6afeb0eaf1d1fbd0766992c246c21a3817474605e80fc62f8a1c6ef993f859ab858ae67e12cf2604
diff --git a/kde-plasma/plasma-vault/plasma-vault-6.1.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.1.4.ebuild
index b071d3b65099..6cd8de868fb6 100644
--- a/kde-plasma/plasma-vault/plasma-vault-6.1.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-6.1.4.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-6.1.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.1.5.ebuild
new file mode 100644
index 000000000000..91f6e669d73e
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-6.1.5.ebuild
@@ -0,0 +1,50 @@
+# 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 flag-o-matic plasma.kde.org
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}: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/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	# ODR violations (bug #909446, kde#471836)
+	filter-lto
+
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest
index 7280e4c42519..487af6996b2c 100644
--- a/kde-plasma/plasma-welcome/Manifest
+++ b/kde-plasma/plasma-welcome/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-welcome-5.27.11.tar.xz 839880 BLAKE2B 68d9192fa244c51aa50ca9746221444d879e0e031ca0fdbafdd641786ae3528fd7bde0ea2c76fabc7aed617248184a88e5c6658e85654fe162cf34bb47bd4a84 SHA512 b6e263d6fae310500743bb2ab6407ad5162b36aa91be9c932cd45ed56a2087ce47bde0be1a15be05397ccda9399f7b168266b6b10550ab3f337330af5b246aeb
 DIST plasma-welcome-6.1.4.tar.xz 665592 BLAKE2B 550e9cbaa26d0f250bf96b420e2c6b4ff1df4e85d07f707ef39fd0a9be82f154dea20aece30817b4b6dd2410d9cab4f384c546d4315591cd8ceee50cd2ba6d12 SHA512 9c011ea4d9fb1062f0b05790d5fc7406264fe62273bb9dfeb1908bb85dd045fdf6a760610c313bca20b1b0927da63734ac023b2100aa67d73c833f4fe4057ea7
+DIST plasma-welcome-6.1.5.tar.xz 672448 BLAKE2B f7abe5740df64972b4c91183b2cded1070f016498f13bc15feaba59e625096b109f4dc5573f899523d899911b6903ce178afd8df5e1618c9ec9d9659bc6f863b SHA512 09fdad9a554607f89538139252ff2c1b59544ddcddb75a3548366647f3347b28df8d7c238b18f50535a22747451c96e029ef66989f3ad60ad7a06a4b8c3c92c6
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild
index fb75f1778e18..c50d4dfea323 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Friendly onboarding wizard for Plasma"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild
new file mode 100644
index 000000000000..2536d95eb199
--- /dev/null
+++ b/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023-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 plasma.kde.org
+
+DESCRIPTION="Friendly onboarding wizard for Plasma"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}: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/kirigami-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 0a4895157307..b7fdc7756bf1 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-wallpapers-5.27.11.tar.xz 94029756 BLAKE2B 570645ce99c8f9992a328d8e61a25f36aa43f8fc7c4742b31869b2df6b234f39e991755867b873158db7ba74accaef5bd627a355cf0cb5b183ce4f5236d0b074 SHA512 796f5c652d449fc5d02a3702cf3037126d26cb1d46f5d698e154a80585931c0a4f6a658ad58ebb611be29bbff8a27a71091fd988a9533e0bcf86d4d597658b2c
 DIST plasma-workspace-wallpapers-6.1.4.tar.xz 100296044 BLAKE2B 25a35d4836d043bc9ad575d7296208d860d457841d14e301ebebc626fc19dad691347700de325a76dba7e9a7b04420cb8b96b2a951f337ca7f13f10c24e29557 SHA512 3f11ac9cb39437923651c96ccfdd3adb011bcee51adeeadec9a9fe86aa8022840991afad4171c6fc0a16bd0de7396c41c126b42d7e9a2303322e8749eb81b1c5
+DIST plasma-workspace-wallpapers-6.1.5.tar.xz 100299584 BLAKE2B d3ae4327c0e9fce40c15df0c64ab1335a1b014620ba75ba10c26f570571ce2f6a71b91fdfa8f16fd6bb1fd3a087c2ff76bdba7a50ab922c1627722f574abbaad SHA512 127d221cb668f77f65354a7171f097d0d69240d37b6421610d9d54a90ace103ae85d3ae9e36a94ce1ce24eac11d6db17bcd97fadd73d9d8a7081c70e96d71a8d
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.4.ebuild
index 3c02d63551f0..6a54a081eaaf 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.5.ebuild
new file mode 100644
index 000000000000..989dc8cacea5
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.1.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit cmake plasma.kde.org
+
+DESCRIPTION="Wallpapers for the Plasma workspace"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6
+	kde-frameworks/extra-cmake-modules:0
+"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7ea9164a81ee..ab8ee02877bf 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006
 DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05
+DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild
index 8ac01b010e74..736d633f9d19 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
 
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild
new file mode 100644
index 000000000000..9a0e73749591
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild
@@ -0,0 +1,230 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+	dev-libs/icu:=
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6=
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${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/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kded-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kidletime-${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/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kunitconversion-${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/prison-${KFMIN}:6[qml]
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/breeze-${PVCUT}:6
+	>=kde-plasma/kscreenlocker-${PVCUT}:6
+	>=kde-plasma/kwayland-${PVCUT}:6
+	>=kde-plasma/kwin-${PVCUT}:6
+	>=kde-plasma/layer-shell-qt-${PVCUT}:6
+	>=kde-plasma/libkscreen-${PVCUT}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	media-libs/libcanberra
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	sci-libs/libqalculate:=
+	sys-libs/zlib
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	appstream? ( >=dev-libs/appstream-1[qt6] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+	fontconfig? (
+		media-libs/fontconfig
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
+	gps? ( sci-geosciences/gpsd )
+	policykit? (
+		>=sys-auth/polkit-qt-0.175[qt6(+)]
+		virtual/libcrypt:=
+	)
+	screencast? (
+		>=dev-qt/qtbase-${QTMIN}:6=[opengl]
+		>=kde-plasma/kpipewire-${PVCUT}:6
+		media-libs/libglvnd
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+	systemd? ( sys-apps/systemd:= )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+	wallpaper-metadata? ( kde-apps/libkexiv2:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	dev-libs/qcoro[dbus]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/libkworkspace:5
+	!<kde-plasma/plasma-desktop-5.27.0:5
+	!kde-plasma/xembed-sni-proxy:*
+	app-text/iso-codes
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qttools-${QTMIN}:*[qdbus]
+	kde-apps/kio-extras:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+	>=kde-plasma/kactivitymanagerd-${PVCUT}:6
+	>=kde-plasma/kdesu-gui-${PVCUT}:*
+	>=kde-plasma/milou-${PVCUT}:6
+	>=kde-plasma/plasma-integration-${PVCUT}:6
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=dev-util/wayland-scanner-1.19.0
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+	test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		ecm_punt_bogus_dep KPipeWire
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	if ! use fontconfig; then
+		ecm_punt_bogus_dep XCB IMAGE
+		sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=ON # TODO: broken upstream, fix it if you can
+		-DGLIBC_LOCALE_GEN=$(usex policykit)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF6Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF6NetworkManagerQt)
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package telemetry KF6UserFeedback)
+		$(cmake_use_find_package wallpaper-metadata KExiv2Qt6)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plasma5support/Manifest b/kde-plasma/plasma5support/Manifest
index 2f3741b668b1..21058a394025 100644
--- a/kde-plasma/plasma5support/Manifest
+++ b/kde-plasma/plasma5support/Manifest
@@ -1 +1,2 @@
 DIST plasma5support-6.1.4.tar.xz 87596 BLAKE2B 93ab820f6935fda80d51193b792b6c1a35913943866b87864deb3ac1f6a29fbb1346e9f75bcacc35bced67e4edfa68e75be43c9c26d3999257977b9714b0a72a SHA512 03950606177618d9e771ef8117074f1aac36a588bcac1bf80c4662c761283cd7fdf83a101747f88370dd00be6f88e518c59bcc7a858ce86540136c90a20ed767
+DIST plasma5support-6.1.5.tar.xz 87732 BLAKE2B 6842bb67bd0d852153cbd0562c18e4ffe8c7532e71708d0bb40f6ff0d2c3dada3ccd4a402167f50174a18ec16d9b3b166e9684f88d06b45976cff5ac0948d22f SHA512 f4e0ac3b9da6795436926706758d309640b4ce824e8b2f404eb0f161ab6b314d6c23a63281d4674d828dccb53131ff526e74004e1db6405c5a23b087a6369bd7
diff --git a/kde-plasma/plasma5support/plasma5support-6.1.4.ebuild b/kde-plasma/plasma5support/plasma5support-6.1.4.ebuild
index be9471802ad1..2abd0728f09b 100644
--- a/kde-plasma/plasma5support/plasma5support-6.1.4.ebuild
+++ b/kde-plasma/plasma5support/plasma5support-6.1.4.ebuild
@@ -14,7 +14,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 926347
diff --git a/kde-plasma/plasma5support/plasma5support-6.1.5.ebuild b/kde-plasma/plasma5support/plasma5support-6.1.5.ebuild
new file mode 100644
index 000000000000..a553df4b5d50
--- /dev/null
+++ b/kde-plasma/plasma5support/plasma5support-6.1.5.ebuild
@@ -0,0 +1,36 @@
+# 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.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Support components for porting from KF5/Qt5 to KF6/Qt6"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 926347
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/plasma-workspace:5
+	!<kde-plasma/plasma-workspace-6.0.80:6
+"
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index c5e0a02727d5..771fe2aab8bd 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST plymouth-kcm-5.27.11.tar.xz 45828 BLAKE2B 28c06e6f1cd8cbd1d82786b00c28f652dc7ac123677ba0e00d2df494fa4ddd57883842051e984b144d6b6a8f87ba3d05d3a07fb9e8eb250013ca7044c232f0e7 SHA512 3b7174d52141db79330cb56ee3426dfc44f5d5edb5ebce5354fca098dd741c2414a0faaf5bc8a10a4c1ca21a72141a0c5f36558ede681400537d0686f4a2b0b5
 DIST plymouth-kcm-6.1.4.tar.xz 46564 BLAKE2B 21b10bd1a5a4455c1797c699c06b20ab25f7688083684ec87b13359d23412287fb0ac62b25d8dc0885093332a6397c8d377a430a62e950e0f1a61bcd80ffde80 SHA512 2aa7b56c96caa4eecc62f05f059f61cf65ce08a11e4ecd52997a71d68ed8707e2cdaa2f30ddb1cd1f5f1cde524c98387d36ec3d1561ccbb91d9c97503a479ff4
+DIST plymouth-kcm-6.1.5.tar.xz 46576 BLAKE2B 76a4647343ac22cf13e2101b2a37a4605bda7602fb90132ced6ea7c2ebb2a061f6a9d923d1cf248d95b07fb664b27a7aef32a31adc682387f52fe367aff49d64 SHA512 609997981ed905226af62cac55d523864133e73949458334b358426514d65d0d0a2b809049dea08da20426d9318a22e0327a9334a1004d8a59e6592485993ad4
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.4.ebuild
index f6f8e12124c8..4d84430804ee 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.4.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.5.ebuild
new file mode 100644
index 000000000000..7e1680f85038
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.1.5.ebuild
@@ -0,0 +1,36 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kconfig-${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
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index dbdfdeb68222..a3e66edc319e 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,3 @@
 DIST polkit-kde-agent-1-5.27.11.tar.xz 53144 BLAKE2B bfffb3ed163b0d1581a23f663120c367d32afaefe843f19b5e5b0b099fd3f7f6b0f396a8543797e6dc9771acb137125f0a7a2ebd2520edc15acec560ef532987 SHA512 c5687704986bca51fde5d0b8d054ee6bdd957d0742c0e6a6f33100c77874ea75b7cb973393d4c7711964e390aa31fe30128d157a757ae13fc0c4d2eae1fc7bed
 DIST polkit-kde-agent-1-6.1.4.tar.xz 56784 BLAKE2B 71d0ccb10c954052d85741b1ea721b8e9989fe0a4d42d29c81c1ed8e8fbb36a3bceb157848d772570185e641159c321dbccc27b9586f4ed683783c174601476d SHA512 45d9a3e9a870affb1a9d8ee19e4e252c71f1689ba673a86e66771d1a177b27721a274e91d75fc8589b4950754ee236ea8a8309384dda5fa4b57eaaa43f457aa7
+DIST polkit-kde-agent-1-6.1.5.tar.xz 56804 BLAKE2B 59308a8faf9fece66aa51e82da72878006ad00baa63706a84ff7e2cfaef90de8f32b9a2f1932004aee28a289852ebfd7aeebe9ef51fc7d8220526a371e1fb922 SHA512 f4fa0e2272da8bd8455ea09fe7e759a3c5e80d0d37c8a8a8282924ccd3cdb122ac9426ce7277e1a55244ada8024cdc3e240e393fdb6ddf4c33b9b1a9153bddbc
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.4.ebuild
index 00f8ff823c49..7cd51c29195b 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.5.ebuild
new file mode 100644
index 000000000000..4e665ab79cc6
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=6.5.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=sys-auth/polkit-qt-0.175[qt6(+)]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 5b8b60331094..1f02faef377c 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,3 @@
 DIST powerdevil-5.27.11.tar.xz 791244 BLAKE2B 423bca5c6c1731f241e1db5aba3a75c7f5801fb99957fb6de6df682053ee5810aeec412a599b83862f4b27c7392cd8781f5b5e952a11bcdb2910a406bf9990c6 SHA512 7ea5640d42c3aa4bc21091a56452202f798ed3df3cfab6b0f38895cdd558fe877e463bf2c801914ded2511777b353d6e252f9dcee2856b1995b6f08c84cc3b84
 DIST powerdevil-6.1.4.tar.xz 967284 BLAKE2B a38eb4afd28b61e7e47f300539d043a014c902e207272de36b429e74c8de68285d0e4169a0c1be578fba8639f7a3be3c9476c12983e23436bd0ae8cb62c68028 SHA512 b94fe6a01c809ee97df92096b75b4d670fdb11eae5d56a89c2387ce2aa0d517979fbe6f6ba117e5bd15fd7243bd7a2a4fe41a6ec1e25bbb86028d9c6ebc511a9
+DIST powerdevil-6.1.5.tar.xz 967780 BLAKE2B 37a0e3e7c76504d83cef695c6439ebe263497ac788af4337e4f809ffc4bbad963ac3b4c9095cc4743c69a6d6ecdc4d6d61c15fe978de434cacb0ef111b320ba6 SHA512 c606dc61a7291dd87643a8d69005e005b33a03523b85be70f7d24181e988972df62a3b7a98423273307d4e5cf127e6eb6992ba534efbb0ca37c9ff308fc8a679
diff --git a/kde-plasma/powerdevil/powerdevil-6.1.4.ebuild b/kde-plasma/powerdevil/powerdevil-6.1.4.ebuild
index 232d891a06dc..75e2bb636029 100644
--- a/kde-plasma/powerdevil/powerdevil-6.1.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-6.1.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="brightness-control caps"
 
 RESTRICT="test" # bug 926513
diff --git a/kde-plasma/powerdevil/powerdevil-6.1.5.ebuild b/kde-plasma/powerdevil/powerdevil-6.1.5.ebuild
new file mode 100644
index 000000000000..ddb3e54d6b3f
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-6.1.5.ebuild
@@ -0,0 +1,71 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="brightness-control caps"
+
+RESTRICT="test" # bug 926513
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=kde-frameworks/kauth-${KFMIN}:6[policykit]
+	>=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/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-plasma/layer-shell-qt-${PVCUT}:6
+	>=kde-plasma/libkscreen-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-workspace-${PVCUT}:6
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil:= )
+	caps? ( sys-libs/libcap )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	sys-power/power-profiles-daemon
+	>=sys-power/upower-0.9.23
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package brightness-control DDCUtil)
+		$(cmake_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 926513
+	ecm_src_test -j1
+}
diff --git a/kde-plasma/print-manager/Manifest b/kde-plasma/print-manager/Manifest
index 7f841c002fc1..3c0b4b112013 100644
--- a/kde-plasma/print-manager/Manifest
+++ b/kde-plasma/print-manager/Manifest
@@ -1,2 +1,2 @@
-DIST print-manager-23.08.5.tar.xz 290620 BLAKE2B 3a29dd5e4684e966d95cd9db424a4b3c82889cf8c2d1fe99a4c9d27e6593979cdbd26c11c8bd1af8df98ca9c86d2557da96a31f914e4deac10e86c2a188f0a9d SHA512 28af8ea76d08e83a5cdf1ea5c2e6ff6314bb89b835ed6af2648219075a75ed3606eb7472a2ebeea2aceb67fc562838a3c554b8515f168f36510a4e07077974f3
 DIST print-manager-6.1.4.tar.xz 370456 BLAKE2B cdc4ca600161746e1a602b65e6a37137b5dd8619a073fbe1c2569b94ef26d1be0d71cb1abce941827cdf3835dea4178ba0f5011302b2661a6a0b540aa2001a4c SHA512 6f041893116b698ffaa140d59541e469cf5b5e2ecf7a613a038f1fe44dd4d784d24a336ec8f994d3cb6b75f20187c3b31e5014ae6f50d0f27ebc7297478ce88e
+DIST print-manager-6.1.5.tar.xz 371292 BLAKE2B 140f63488f381dde409d673fac692197163efa200866311c0bb346e9dd57a57780dc3dd1a47fb950793b6bd5512e3d82ed2bae47e9476e1ece20e7dc0079b928 SHA512 0c83c5fdbd73ad47cde287ed2f3d89c735a44cce4c2d753201258183491bc9612091802bf639445a775f0b2ed7f485d7bc94d98904fb40ca11e23affbd046ceb
diff --git a/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild b/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild
index 8cc40131d13e..ab8b46d2445c 100644
--- a/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild
+++ b/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild
@@ -8,6 +8,6 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="kde-plasma/print-manager:6"
diff --git a/kde-plasma/print-manager/print-manager-23.08.5.ebuild b/kde-plasma/print-manager/print-manager-23.08.5.ebuild
deleted file mode 100644
index 7dce0e85c4e5..000000000000
--- a/kde-plasma/print-manager/print-manager-23.08.5.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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Manage CUPS print jobs and printers in Plasma"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+gtk"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	kde-plasma/kde-cli-tools:*
-	gtk? ( app-admin/system-config-printer )
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}
diff --git a/kde-plasma/print-manager/print-manager-6.1.4.ebuild b/kde-plasma/print-manager/print-manager-6.1.4.ebuild
index 26c17c8787ee..0b1ca14e9db9 100644
--- a/kde-plasma/print-manager/print-manager-6.1.4.ebuild
+++ b/kde-plasma/print-manager/print-manager-6.1.4.ebuild
@@ -12,7 +12,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 ~ppc64 ~riscv ~x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-plasma/print-manager/print-manager-6.1.5.ebuild b/kde-plasma/print-manager/print-manager-6.1.5.ebuild
new file mode 100644
index 000000000000..cc1d687308b7
--- /dev/null
+++ b/kde-plasma/print-manager/print-manager-6.1.5.ebuild
@@ -0,0 +1,68 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="Manage CUPS print jobs and printers in Plasma"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+gtk"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${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/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=net-print/cups-2.4
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/print-manager-23.08.5-r100:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	gtk? ( app-admin/system-config-printer )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+	fi
+}
diff --git a/kde-plasma/qqc2-breeze-style/Manifest b/kde-plasma/qqc2-breeze-style/Manifest
index 25bc137b8df7..e5907b37b9a2 100644
--- a/kde-plasma/qqc2-breeze-style/Manifest
+++ b/kde-plasma/qqc2-breeze-style/Manifest
@@ -1 +1,2 @@
 DIST qqc2-breeze-style-6.1.4.tar.xz 65964 BLAKE2B f2b4d8a3437c5322393121c7515dc14b6404d33ff0b3223b9339a8a2364dade2b0eebb2396126aacae635a6c7ea0361b86f58eda8f3aa8ad9a194766372ef805 SHA512 cdcac0056d740747dcee6f44cf248ad8b8b616bb7ef621d5b58b97abc8ab2c6ebaef3736899141ae32de7f5444237a2eea3e3902be3ab1c2177664678417fe7f
+DIST qqc2-breeze-style-6.1.5.tar.xz 65920 BLAKE2B 3007e314ca4602c2634495f2010620d4261308b3e87f68244028363ddd97085683165532b73b32c4862c8545a3e1186b86f854e1d3903fee1ecced41c759bdb6 SHA512 32ccead4bed7e94a3330ad834dc0f7e94f6ef50a099c6ff7c6808d5cb29e14bcba35aaa5112fff798c9d73174c63c26f9b7e3ff42ea030f1293ca40e5920fe99
diff --git a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.4.ebuild b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.4.ebuild
index e93d24303603..9632a73c6dff 100644
--- a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.4.ebuild
+++ b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.4.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 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
diff --git a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.5.ebuild b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.5.ebuild
new file mode 100644
index 000000000000..7cb8ffc78f8d
--- /dev/null
+++ b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Breeze inspired QQC2 Style"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) CC0-1.0"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kquickcharts-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 003f4d6c471f..6302f98bb14a 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-kcm-5.27.11.tar.xz 94340 BLAKE2B 10592e30e288f85f565d1070542b19a2a03d58a7d0befc69807049ad4ccb8a1491b93e94bd50fcc0f59e0b483d41a7758ead475def217e57c3600298340b049e SHA512 512eb0acfc0e3925d2c020103b94dc4ae7df4e82a4492e686f38e9ff6554e0f1ace42fa63bae3c4b8d8956a6413fc78cf65779ce3024213cfaaf5aa3fb2a74ff
 DIST sddm-kcm-6.1.4.tar.xz 98828 BLAKE2B eb727bc33824890e3d1e622a108258aacf318ddbbd99129701f0c667b644cca34b978c0d5b9f178fd9b1b37ef9c50f76eb6c6ce41925bb20f6a7c382b922ee1a SHA512 f4655a6f16d537cc9c202311dc65d3bd3c76d69a9a1439289f0cb578c3d4b96541dceb2730c4ee70ef0264fecfeb9d17b78b021d7243a969e32bdf3b1adc5b08
+DIST sddm-kcm-6.1.5.tar.xz 98940 BLAKE2B 9b8f20c1b5026b2719893b59000fe6883dca0c8dbd8b71cbb24211bffbf6073f7e8db7ff3aadcf3cb675d154c114570aa089253b944a071158ca1f44c966ad07 SHA512 63fe04d654d4faa8ccf7f64f82671db5ccae6dc245fc94b4f56d9535d6b16b76616eeec2422850fa702b72561d34c0485f87b90598294f0c5061a730ea5a6938
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.1.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.1.4.ebuild
index fb70bb907909..69af0e1473ee 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-6.1.4.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-6.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.1.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.1.5.ebuild
new file mode 100644
index 000000000000..1d620687c8de
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-6.1.5.ebuild
@@ -0,0 +1,40 @@
+# 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 plasma.kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	x11-misc/sddm
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 5d49ad3f6bca..d3c51edd89c4 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,3 @@
 DIST systemsettings-5.27.11.tar.xz 230736 BLAKE2B 0645be30d2f673683b020d62ce2a8168d4c656fcc23a863a6ca15bacc57be85cc13ef11ff5006ae377526ec55251120ed110afcc502d737d372255f5555ac824 SHA512 5e48b9f7099d2e6efb681094e24da50727bf8819e90bfbd55dbddb546449c1976f2e6763c13e00270f5bd845b3342764a745de40cf0d0278c7285bc1e6943991
 DIST systemsettings-6.1.4.tar.xz 213700 BLAKE2B 90fd8d0d525eaf00cb652c4c2fa947113b9368d65e88211216849a76c352faa89a4408f69a0957e24dc2c0be4e22384700a6411c8b04526dec634f6d1cb6181a SHA512 66e71ee0e846442eb2eddbfd7278ae23563401ea6e8501aedf1906ec2e500e0bf2fd1a69aabf1c209b5fd8ede8ca4d446a17f039516d5649c3720a8c5ca9b7b2
+DIST systemsettings-6.1.5.tar.xz 214616 BLAKE2B 25ce529f9247f7e71c2cbd3027e1975f4bd8fb5133e38c5416b372be4b95acbd29a7b3439f4cd36214b9f45e49b3d37e86d644d981ccbb25a7709d22b6e3cab9 SHA512 c5cb2d8563a9a80da8c81cbd94d1d29f851f2882bc36628e7e76fb07fc55daf3f3db05bbe9078c8d097da4185675f41fdbe2c9940705cd14e142d47db374adba
diff --git a/kde-plasma/systemsettings/systemsettings-6.1.4.ebuild b/kde-plasma/systemsettings/systemsettings-6.1.4.ebuild
index fb7306ecc9e2..8a3ebfd6c4fb 100644
--- a/kde-plasma/systemsettings/systemsettings-6.1.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-6.1.4.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-6.1.5.ebuild b/kde-plasma/systemsettings/systemsettings-6.1.5.ebuild
new file mode 100644
index 000000000000..00eb2ba4fac6
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-6.1.5.ebuild
@@ -0,0 +1,52 @@
+# 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 plasma.kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=kde-frameworks/kauth-${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/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/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/wacomtablet/Manifest b/kde-plasma/wacomtablet/Manifest
index db75017a4cb5..3679fb953a90 100644
--- a/kde-plasma/wacomtablet/Manifest
+++ b/kde-plasma/wacomtablet/Manifest
@@ -1,3 +1,2 @@
-DIST wacomtablet-3.2.0-patchset-1.tar.xz 7796 BLAKE2B 4fa998a0f4376579d1e0d06a8aa9edababedca22d579dbdae651eee3699decc880a7a1d277f04c2bc24adba87908c07ab711989a5985b68af5b295d3b3260d33 SHA512 ff96f05831e4760ce99920061f0dc927aa6a2d5ef4b7443c3129bb1431262cb4bc1434097595976672393e3b611438014ccb528fc948e7c0407fc9a2d52ade8d
-DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
 DIST wacomtablet-6.1.4.tar.xz 829624 BLAKE2B 1bf333ef012e65dcedf62a211eaab479caa73fafd73b46d89984582fc0aa8a469d2269b695d2cf74cef23010d010a1fbb66f86e5e82ab2cef86d820076270fab SHA512 c9e9d1dac0d44b6db9ce847908cfda9351fcf023b9f2f787d8c39b32ae74b805348c1e3dd35d7ac4432421ba5269ee6a6686ea46a2769df4a625034a4daba673
+DIST wacomtablet-6.1.5.tar.xz 829876 BLAKE2B 5a028b05ce7360a655a98fc351c3e472a8cdaaef605045f2bab1b7e9b1cf806c488bf629f161001c5885bf64a4eba1ba4a29e66ae757939bc2cf8457b82c640b SHA512 592a0188cfa72026cc501afeed8c3e54edd99acddd0c4932e2e88889fb78d190576dbc4c662d73abe768b307e6490063bdab330efaa85959e982a55afd292f99
diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
deleted file mode 100644
index 9434b0082569..000000000000
--- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 32c78782b3061bab2a3b1457133faf77b6d9ed2a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 14 Nov 2022 02:57:07 +0100
-Subject: [PATCH] Fix incorrect xsetwacom call
-
-When param is e.g. 'Button 1' the 'Button' and '1' need to be passed as separate arguments
-
-BUG: 454947
----
- src/kded/xsetwacomadaptor.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
-index 934fa8b..fc1bcac 100644
---- a/src/kded/xsetwacomadaptor.cpp
-+++ b/src/kded/xsetwacomadaptor.cpp
-@@ -245,10 +245,18 @@ bool XsetwacomAdaptor::setRotation(const QString& value)
- bool XsetwacomAdaptor::setParameter(const QString &device, const QString &param, const QString &value) const
- {
-     QProcess setConf;
--    if (!value.isEmpty()) {
--        setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
-+
-+    // https://bugs.kde.org/show_bug.cgi?id=454947
-+    static const QRegularExpression buttonWithNumber(QStringLiteral("^Button \\d+$"));
-+    if (param.contains(buttonWithNumber)) {
-+        const QStringList splitted = param.split(QLatin1Char(' '));
-+        setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << splitted[0] << splitted[1] << value);
-     } else {
--        setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
-+        if (!value.isEmpty()) {
-+            setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
-+        } else {
-+            setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
-+        }
-     }
- 
-     if (!setConf.waitForStarted() || !setConf.waitForFinished()) {
--- 
-GitLab
-
diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch
deleted file mode 100644
index 4ab144beabd4..000000000000
--- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c6bdd5a15c2e200aae6a7fe3597bbf11691e7e5f Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 6 Jun 2023 23:24:07 +0200
-Subject: [PATCH] Add missing include
-
----
- autotests/faketablet/faketablet.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/autotests/faketablet/faketablet.cpp b/autotests/faketablet/faketablet.cpp
-index 076a8d18..bf9e4904 100644
---- a/autotests/faketablet/faketablet.cpp
-+++ b/autotests/faketablet/faketablet.cpp
-@@ -20,6 +20,7 @@
- #include <iostream>
- #include <cstring>
- #include <cstdio>
-+#include <cstdint>
- #include <cstdlib>
- #include <csignal>
- #include <unistd.h>
--- 
-GitLab
-
diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
deleted file mode 100644
index e86f97cfaef4..000000000000
--- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 9c2f133ee400562ca9813e329f6e2bdae24a5ac5 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 4 Aug 2022 22:43:07 +0200
-Subject: [PATCH] Port from QRegExp to QRegularExpression
-
----
- src/common/buttonshortcut.cpp | 33 ++++++++++++++++++++-------------
- src/kded/xsetwacomadaptor.cpp | 17 +++++++++++------
- 2 files changed, 31 insertions(+), 19 deletions(-)
-
-diff --git a/src/common/buttonshortcut.cpp b/src/common/buttonshortcut.cpp
-index e11784f..32bf842 100644
---- a/src/common/buttonshortcut.cpp
-+++ b/src/common/buttonshortcut.cpp
-@@ -19,7 +19,7 @@
- 
- #include "buttonshortcut.h"
- 
--#include <QRegExp>
-+#include <QRegularExpression>
- #include <QKeySequence>
- 
- #include <KLocalizedString>
-@@ -266,8 +266,8 @@ bool ButtonShortcut::set(const QString& sequence)
-         return true;
-     }
- 
--    QRegExp modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), Qt::CaseInsensitive);
--    QRegExp buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), Qt::CaseInsensitive);
-+    static const QRegularExpression modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), QRegularExpression::CaseInsensitiveOption);
-+    static const QRegularExpression buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), QRegularExpression::CaseInsensitiveOption);
- 
-     if (seq.contains(buttonRx)) {
-         // this is a button
-@@ -388,7 +388,8 @@ void ButtonShortcut::convertToNormalizedKeySequence(QString& sequence, bool from
- {
-     normalizeKeySequence(sequence);
- 
--    QStringList keyList    = sequence.split (QRegExp (QLatin1String ("\\s+")), Qt::SkipEmptyParts);
-+    static const QRegularExpression rx(QStringLiteral("\\s+"));
-+    QStringList keyList    = sequence.split (rx, Qt::SkipEmptyParts);
-     bool        isFirstKey = true;
- 
-     sequence.clear();
-@@ -460,28 +461,33 @@ void ButtonShortcut::normalizeKeySequence(QString& sequence) const
- {
-     // When setting a shortcut like "ctrl+x", xsetwacom will convert it to "key +ctrl +x -x"
-     // therefore we just truncate the string on the first "-key" we find.
--    QRegExp minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
--    int     pos = 0;
-+    static const QRegularExpression minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
- 
--    if ((pos = minusKeyRx.indexIn(sequence, 0)) != -1) {
--        sequence = sequence.left(pos);
-+    const QRegularExpressionMatch minusKeyRxMatch = minusKeyRx.match(sequence);
-+
-+    if (minusKeyRxMatch.hasMatch()) {
-+        sequence = sequence.left(minusKeyRxMatch.capturedStart());
-     }
- 
-     // cleanup leading "key " identifier from xsetwacom sequences
--    sequence.remove(QRegExp (QLatin1String ("^\\s*key\\s+"), Qt::CaseInsensitive));
-+    static const QRegularExpression leadingKey(QStringLiteral("^\\s*key\\s+"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.remove(leadingKey);
- 
-     // Remove all '+' prefixes from keys.
-     // This will convert shortcuts like "+ctrl +alt" to "ctrl alt", but not
-     // shortcuts like "ctrl +" which is required to keep compatibility to older
-     // (buggy) configuration files.
--    sequence.replace(QRegExp (QLatin1String ("(^|\\s)\\+(\\S)")), QLatin1String ("\\1\\2"));
-+    static const QRegularExpression plusPrefixes(QStringLiteral("(^|\\s)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.replace(plusPrefixes, QLatin1String ("\\1\\2"));
- 
-     // Cleanup plus signs between keys.
-     // This will convert shortcuts like "ctrl+alt+shift" or "Ctrl++" to "ctrl alt shift" or "Ctrl +".
--    sequence.replace (QRegExp (QLatin1String ("(\\S)\\+(\\S)")), QLatin1String ("\\1 \\2"));
-+    static const QRegularExpression cleanupPlus(QStringLiteral("(\\S)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.replace (cleanupPlus, QLatin1String ("\\1 \\2"));
- 
-     // replace multiple whitespaces with one
--    sequence.replace (QRegExp (QLatin1String ("\\s{2,}")), QLatin1String (" "));
-+    static const QRegularExpression whitespaces(QStringLiteral("\\s{2,}"), QRegularExpression::CaseInsensitiveOption);
-+    sequence.replace (whitespaces, QLatin1String (" "));
- 
-     // trim the string
-     sequence = sequence.trimmed();
-@@ -500,7 +506,8 @@ void ButtonShortcut::prettifyKey(QString& key) const
- bool ButtonShortcut::setButtonSequence(const QString& buttonSequence)
- {
-     QString buttonNumber = buttonSequence;
--    buttonNumber.remove(QRegExp (QLatin1String ("^\\s*button\\s+"), Qt::CaseInsensitive));
-+    static const QRegularExpression rx(QStringLiteral("^\\s*button\\s+"), QRegularExpression::CaseInsensitiveOption);
-+    buttonNumber.remove(rx);
- 
-     bool ok     = false;
-     int  button = buttonNumber.toInt(&ok);
-diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
-index a39f307..934fa8b 100644
---- a/src/kded/xsetwacomadaptor.cpp
-+++ b/src/kded/xsetwacomadaptor.cpp
-@@ -27,7 +27,7 @@
- #include "tabletarea.h"
- 
- #include <QProcess>
--#include <QRegExp>
-+#include <QRegularExpression>
- 
- using namespace Wacom;
- 
-@@ -142,10 +142,13 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
-     QString modifiedParam = param.key();
- 
-     // convert tablet button number to hardware button number
--    QRegExp rx(QLatin1String("^Button\\s*([0-9]+)$"), Qt::CaseInsensitive);
-+    static const QRegularExpression rx(QLatin1String("^Button\\s*([0-9]+)$"), QRegularExpression::CaseInsensitiveOption);
-+
-+    const QRegularExpressionMatch match = rx.match(modifiedParam);
-+
-+    if (match.hasMatch()) {
-+        QString hwButtonNumber = match.captured(1);
- 
--    if (rx.indexIn(modifiedParam, 0) != -1) {
--        QString hwButtonNumber = rx.cap(1);
-         QString kernelButtonNumber;
- 
-         if (!d->buttonMap.isEmpty()) {
-@@ -167,9 +170,11 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
- 
- void XsetwacomAdaptor::convertButtonShortcut (const XsetwacomProperty& property, QString& value) const
- {
--    QRegExp rx (QLatin1String("^Button\\s*[0-9]+$"), Qt::CaseInsensitive);
-+    static const QRegularExpression rx(QLatin1String("^Button\\s*[0-9]+$"), QRegularExpression::CaseInsensitiveOption);
-+
-+    const QRegularExpressionMatch match = rx.match(property.key());
- 
--    if (rx.indexIn(property.key(), 0) != -1) {
-+    if (match.hasMatch()) {
-         ButtonShortcut buttonshortcut(value);
-         value = buttonshortcut.toString();
-     }
--- 
-GitLab
-
diff --git a/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild b/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild
deleted file mode 100644
index 7fd90c74d4a8..000000000000
--- a/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.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=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles"
-HOMEPAGE="https://userbase.kde.org/Wacomtablet"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-libs/libwacom-0.30:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libplasma-${KFMIN}:5
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libXi
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libX11
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${WORKDIR}/${P}-qt-5.15.patch"
-	"${WORKDIR}/${P}-qt-5.15-obsoletions.patch"
-	"${WORKDIR}/${P}-no-override-screenspace-w-missing-screen.patch" # KDE-bug 419392
-	"${WORKDIR}/${P}-fix-xsetwacom-adapter.patch"
-	"${WORKDIR}/${P}-Intuos-M-bluetooth.patch" # KDE-bug 418827
-	"${WORKDIR}/${P}-correct-icons.patch"
-	"${WORKDIR}/${P}-drop-empty-X-KDE-PluginInfo-Depends.patch"
-	"${WORKDIR}/${P}-fix-QProcess-invocation.patch"
-	"${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556
-	"${WORKDIR}/${P}-only-show-on-X11.patch"
-	"${FILESDIR}/${P}-port-to-QRegularExpression.patch" # pre-requisite for below:
-	"${FILESDIR}/${P}-fix-incorrect-xsetwacom-call.patch" # bug 850652, KDE-bug 454947
-	"${FILESDIR}/${P}-missing-include.patch" # bug 920043
-)
-
-CMAKE_SKIP_TESTS=(
-	# test needs DBus, bugs 675548, 920558
-	Test.KDED.DBusTabletService
-	Test.KDED.TabletHandler
-	Test.KDED.XInputAdaptor # SEGFAULT
-	Test.KDED.XsetWacomAdaptor # SEGFAULT
-)
diff --git a/kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild
index 8be99ffadc4b..38274e619e3f 100644
--- a/kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild
+++ b/kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Wacomtablet"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild
new file mode 100644
index 000000000000..ba7db68dfd95
--- /dev/null
+++ b/kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild
@@ -0,0 +1,56 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles"
+HOMEPAGE="https://userbase.kde.org/Wacomtablet"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+RDEPEND="
+	>=dev-libs/libwacom-0.30:=
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	>=x11-drivers/xf86-input-wacom-0.20.0
+	x11-libs/libXi
+	x11-libs/libxcb
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libX11
+"
+BDEPEND="sys-devel/gettext"
+
+src_test() {
+	# test needs DBus, bug 675548
+	local myctestargs=(
+		-E "(Test.KDED.DBusTabletService)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 96d8ccdd4397..bcfb0a09f678 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,2 +1,3 @@
 DIST xdg-desktop-portal-kde-5.27.11.tar.xz 143652 BLAKE2B e7086d30d677385a1d1a2bed22661b935b67ae3cd15102bf47f0b75ecc8e0d3189530e54913a11d0a9eb9db9427af18bd77bfc37d856a3e4bef46cc90bfd0bc1 SHA512 39e1c4cf284558e013c24523ef1993f48e237d13fc2fb3ccfbffcea1925f18bcd623229ef933aaf301c83f460ee849656ba3344ca74fd068e416ea2eb3467621
 DIST xdg-desktop-portal-kde-6.1.4.tar.xz 172404 BLAKE2B 8d64a6afc1d4a35d1dc159f8d0b9efcb17f423466e1db333e6b80e0e60d50f7a49a3803e958c8a3cfa5ed86b9c33fa0aa5e8dc15435c5e64cfc9d9eeea63abc3 SHA512 97390ec0f268f4ec33c55d5ba68bee0958ed490478e51ac7501270f340589150b835ee59405e7653394cc477f183a1cc543d65d6f8a98cb54158901c4b00c6b0
+DIST xdg-desktop-portal-kde-6.1.5.tar.xz 172860 BLAKE2B 71f33ef6ffc75a5c5281ce8c9a8a1fb3e266179b38774edcded1b53b480104b3efd14948ac88691a3aeff1e19b1e6b6358a1a16ce8c0dbef486f2f4c911fb082 SHA512 7866d3bedbb395cf8de84c86de5d1b4db0df776986f71acb622f72d04a654c11a9645d5376d20793992886d4149f608ed4a58d701368fe2f9b40c152fe25074c
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.4.ebuild
index 6fe1dc88bfbc..381702aa0563 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.4.ebuild
@@ -13,7 +13,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 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # dev-qt/qtbase:= slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.5.ebuild
new file mode 100644
index 000000000000..9f1a1882ea18
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.1.5.ebuild
@@ -0,0 +1,65 @@
+# 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
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# dev-qt/qtbase:= slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+# dev-qt/qtbase:=[cups]: includes specifically the cups private header
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtbase-${QTMIN}:6=[cups,dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	|| (
+		>=dev-qt/qtbase-${QTMIN}:6[libinput]
+		>=dev-qt/qtbase-${QTMIN}:6[X]
+	)
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6[dbus]
+	>=kde-frameworks/kconfig-${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/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
+	>=kde-plasma/kwayland-${PVCUT}:6
+	>=kde-plasma/plasma-workspace-${PVCUT}:6
+	x11-libs/libxkbcommon
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.13.0
+	>=dev-libs/wayland-protocols-1.25
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-misc/kio-fuse:6
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	virtual/pkgconfig
+"
+
+CMAKE_SKIP_TESTS=(
+	# bugs: 926483, wants dbus/X11
+	colorschemetest
+)
diff --git a/licenses/LBNLBSD b/licenses/LBNLBSD
new file mode 100644
index 000000000000..4ec6f7ff4bcb
--- /dev/null
+++ b/licenses/LBNLBSD
@@ -0,0 +1,39 @@
+Copyright (c) 2003, The Regents of the University of California,
+through Lawrence Berkeley National Laboratory (subject to receipt of
+any required approvals from the U.S. Dept. of Energy). All rights
+reserved. Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+(1) Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+(2) Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+(3) Neither the name of the University of California, Lawrence Berkeley
+National Laboratory, U.S. Dept. of Energy nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+You are under no obligation whatsoever to provide any bug fixes,
+patches, or upgrades to the features, functionality or performance of
+the source code ("Enhancements") to anyone; however, if you choose to
+make your Enhancements available either publicly, or directly to
+Lawrence Berkeley National Laboratory, without imposing a separate
+written license agreement for such Enhancements, then you hereby grant
+the following license: a non-exclusive, royalty-free perpetual license
+to install, use, modify, prepare derivative works, incorporate into
+other computer software, distribute, and sublicense such Enhancements
+or derivative works thereof, in binary and source code form.
diff --git a/licenses/NVIDIA-NVLM b/licenses/NVIDIA-NVLM
deleted file mode 100644
index 2c878c87ea71..000000000000
--- a/licenses/NVIDIA-NVLM
+++ /dev/null
@@ -1,28 +0,0 @@
- * This source code is subject to NVIDIA ownership rights under U.S. and
- * international Copyright laws.  Users and possessors of this source code
- * are hereby granted a nonexclusive, royalty-free license to use this code
- * in individual and commercial software.
- *
- * NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
- * CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR
- * IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL,
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS,  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION,  ARISING OUT OF OR IN CONNECTION WITH THE USE
- * OR PERFORMANCE OF THIS SOURCE CODE.
- *
- * U.S. Government End Users.   This source code is a "commercial item" as
- * that term is defined at  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)
- * and is provided to the U.S. Government only as a commercial end item.
- * 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 the
- * source code with only those rights set forth herein.
- *
- * Any use of this source code in individual and commercial software must
- * include, in the user documentation and internal comments to the code,
- * the above Disclaimer and U.S. Government End Users Notice.
diff --git a/licenses/SIP b/licenses/SIP
deleted file mode 100644
index 9406c3085a75..000000000000
--- a/licenses/SIP
+++ /dev/null
@@ -1,49 +0,0 @@
-RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP
-
-1. This LICENSE AGREEMENT ("the SIP License") is between Riverbank Computing
-Limited ("Riverbank"), and the Individual or Organization ("Licensee")
-accessing and otherwise using SIP software in source or binary form and its
-associated documentation.  SIP comprises a software tool for generating Python
-bindings for software C and C++ libraries, and a Python extension module used
-at runtime by those generated bindings.  This License Agreement may also be
-applied to other software packages written by Riverbank.
-
-2. Subject to the terms and conditions of this License Agreement, Riverbank
-hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
-reproduce, analyze, test, perform and/or display publicly, prepare derivative
-works, distribute, and otherwise use SIP alone or in any derivative version,
-provided, however, that Riverbank's License Agreement and Riverbank's notice of
-copyright, e.g., "Copyright (c) 2015 Riverbank Computing Limited; All Rights
-Reserved" are retained in SIP alone or in any derivative version prepared by
-Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on or
-incorporates SIP or any part thereof, and wants to make the derivative work
-available to others as provided herein, then Licensee hereby agrees to include
-in any such work a brief summary of the changes made to SIP.
-
-4. Licensee may not use SIP to generate Python bindings for any C or C++
-library for which bindings are already provided by Riverbank.
-
-5. Riverbank is making SIP available to Licensee on an "AS IS" basis.
-RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY
-OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND DISCLAIMS ANY
-REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-PURPOSE OR THAT THE USE OF SIP WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF SIP FOR ANY
-INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING,
-DISTRIBUTING, OR OTHERWISE USING SIP, OR ANY DERIVATIVE THEREOF, EVEN IF
-ADVISED OF THE POSSIBILITY THEREOF.
-
-7. This License Agreement will automatically terminate upon a material breach
-of its terms and conditions.
-
-8. Nothing in this License Agreement shall be deemed to create any relationship
-of agency, partnership, or joint venture between Riverbank and Licensee.  This
-License Agreement does not grant permission to use Riverbank trademarks or
-trade name in a trademark sense to endorse or promote products or services of
-Licensee, or any third party.
-
-9. By copying, installing or otherwise using SIP, Licensee agrees to be bound
-by the terms and conditions of this License Agreement.
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
deleted file mode 100644
index add44af322ac..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 xdg
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
-SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa wifi"
-
-RDEPEND="
-	dev-libs/keybinder:3
-	lxde-base/lxmenu-data
-	>=lxde-base/menu-cache-1.1.0-r1
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	>=x11-libs/libfm-1.3.2[gtk]
-	x11-libs/libwnck:3
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXpm
-	alsa? ( media-libs/alsa-lib )
-	wifi? ( net-wireless/wireless-tools )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
-you will have to configure panel settings via its menu.
-This will not be an issue with first time installations."
-
-PATCHES=(
-	# https://sourceforge.net/p/lxde/bugs/773/
-	"${FILESDIR}/${P}-fix-pager-panel-width.patch"
-)
-
-src_configure() {
-	local plugins="netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors"
-
-	use wifi && plugins+=",netstat"
-	use alsa && plugins+=",volumealsa"
-
-	econf \
-		$(use_enable alsa) \
-		--enable-gtk3 \
-		--with-x \
-		--with-plugins="${plugins}"
-	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/lxde-base/lxsession/lxsession-0.5.5.ebuild b/lxde-base/lxsession/lxsession-0.5.5.ebuild
deleted file mode 100644
index 943dbf23c0da..000000000000
--- a/lxde-base/lxsession/lxsession-0.5.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala autotools
-
-DESCRIPTION="LXDE session manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXSession"
-SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~x86-linux"
-IUSE="nls upower"
-
-COMMON_DEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	>=lxde-base/lxde-common-0.99.2-r1
-	sys-apps/dbus
-	sys-auth/polkit
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxsession-edit
-	sys-apps/lsb-release
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	$(vala_depend)
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fedora patches
-	"${FILESDIR}"/${PN}-0.5.2-reload.patch
-	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
-)
-
-src_prepare() {
-	rm *.stamp || die
-	vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# dbus is used for restart/shutdown (logind), and suspend/hibernate (UPower)
-	econf \
-		$(use_enable nls) \
-		--enable-gtk3
-}
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index abb7216fdee3..54dd6f9bb61c 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,2 +1 @@
-DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
 DIST lxterminal-0.4.0_p20230917.tar.gz 163085 BLAKE2B c26051fdf814da3989d74a14ad726b72e45afb1189c01ac6f3897daecc2473c3cfe1574976ab96bfe08ce7e2b84652471b6e839a17dd0c44932244c5936bd8c1 SHA512 4d00e979add7c2322703d0761707d9a935bb839ffcc981a61c51f28cb37466768c373dc03b9d8ae159e0e919d824c7d7f20bb9b2abda465092016c3692449c9d
diff --git a/lxde-base/lxterminal/lxterminal-0.4.0.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
deleted file mode 100644
index 36187dbcb679..000000000000
--- a/lxde-base/lxterminal/lxterminal-0.4.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=7
-
-inherit autotools xdg
-
-DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
-HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:2.91
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Avoid maintainer mode, bug #818211
-	rm aclocal.m4 || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-man --enable-gtk3
-}
diff --git a/lxqt-base/liblxqt/liblxqt-2.0.0-r1.ebuild b/lxqt-base/liblxqt/liblxqt-2.0.0-r1.ebuild
index 411ac05f804e..1d86ce069ffd 100644
--- a/lxqt-base/liblxqt/liblxqt-2.0.0-r1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-2.0.0-r1.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/libsysstat/libsysstat-1.0.0.ebuild b/lxqt-base/libsysstat/libsysstat-1.0.0.ebuild
index d7bfcbb1da03..49db8407e1c1 100644
--- a/lxqt-base/libsysstat/libsysstat-1.0.0.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-1.0.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/lxqt-base/lxqt-about/lxqt-about-2.0.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-2.0.0.ebuild
index 8218ec2040c6..65e713d3b748 100644
--- a/lxqt-base/lxqt-about/lxqt-about-2.0.0.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-2.0.0-r1.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..76fe01aae3fb
--- /dev/null
+++ b/lxqt-base/lxqt-admin/lxqt-admin-2.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt system administration tool"
+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 ~riscv"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+BDEPEND=">=dev-util/lxqt-build-tools-2.0.0"
+DEPEND="
+	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets]
+	=lxqt-base/liblxqt-${MY_PV}*
+	kde-frameworks/kwindowsystem:6
+	>=sys-auth/polkit-qt-0.175.0[qt6]
+	=lxqt-base/liblxqt-${MY_PV}*:=
+"
+RDEPEND="${DEPEND}"
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-2.0.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-2.0.0.ebuild
deleted file mode 100644
index b937a57dae32..000000000000
--- a/lxqt-base/lxqt-admin/lxqt-admin-2.0.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
-
-inherit cmake
-
-DESCRIPTION="LXQt system administration tool"
-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 ~riscv"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-2.0.0"
-DEPEND="
-	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets]
-	=lxqt-base/liblxqt-${MY_PV}*
-	kde-frameworks/kwindowsystem:6
-	>=sys-auth/polkit-qt-0.113.0
-	=lxqt-base/liblxqt-${MY_PV}*:=
-"
-RDEPEND="${DEPEND}"
diff --git a/lxqt-base/lxqt-config/lxqt-config-2.0.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-2.0.0.ebuild
index e898fee30a4f..5342301fd263 100644
--- a/lxqt-base/lxqt-config/lxqt-config-2.0.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-2.0.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-2.0.0.ebuild
index 508d4dac4712..3a345eee48c9 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-2.0.0.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-menu-data/lxqt-menu-data-2.0.0.ebuild b/lxqt-base/lxqt-menu-data/lxqt-menu-data-2.0.0.ebuild
index c2255f811634..60a640196d88 100644
--- a/lxqt-base/lxqt-menu-data/lxqt-menu-data-2.0.0.ebuild
+++ b/lxqt-base/lxqt-menu-data/lxqt-menu-data-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-2.0.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-2.0.0.ebuild
index b4360e235941..3b40be3922a0 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-2.0.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-2.0.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt-project.org/"
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-2.0.1.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-2.0.1.ebuild
index b22a432b675f..0cc1be3e6919 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-2.0.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-2.0.1.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-2.0.1.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-2.0.1.ebuild
index 1c8b668cf998..e7735a5c2db6 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-2.0.1.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-2.0.1.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-2.0.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-2.0.1.ebuild
index ba188239c813..a5ec83521f71 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-2.0.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-2.0.1.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-2.0.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-2.0.0.ebuild
index 5ce4e81e7b4b..a960579b4397 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-2.0.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-2.0.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-2.0.0.ebuild
index 61a6735d431f..caab9446bc55 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-2.0.0.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-2.0.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-2.0.0.ebuild
index a2f6c7049e31..bcc3a45e1681 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-2.0.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-2.0.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-2.0.0.ebuild
index 334beceb3fb8..1fe9434ddb00 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-2.0.0.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/lxqt-session-2.0.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-2.0.0.ebuild
index b204ade9009f..5b081eb01615 100644
--- a/lxqt-base/lxqt-session/lxqt-session-2.0.0.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-2.0.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-2.0.0.ebuild
index 21b0ee487ae1..eec9e9751c43 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-2.0.0.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-2.0.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/mail-client/claws-mail/claws-mail-4.3.0.ebuild b/mail-client/claws-mail/claws-mail-4.3.0.ebuild
index 9f5d5c97153b..1a738769bd2b 100644
--- a/mail-client/claws-mail/claws-mail-4.3.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 4bf559cd18fe..161a62697d6f 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,2 +1,2 @@
 DIST roundcubemail-1.6.7-complete.tar.gz 5899345 BLAKE2B c22803f3651c32f863081afe28d05e4b7918ba0cb1238c11de646a0fe3a16a6faff633a3a193a5813a50be710a71a8900d049f0e628661b6c7c036c0d69055ab SHA512 aedc940e769e881d448eced2ef0b603c87f9a9e18624cae4d14a946e6f9509c827f75e6fb294a760970e37caa9ab0bfb0a7ec8843b12542f59f350948d2d8d3b
-DIST roundcubemail-1.6.8-complete.tar.gz 5899212 BLAKE2B c5069fb038afe96dda75c815e564b23c629dc5683af7f428622556045f84e1cbe38b163609a6faefbc86d94d6f0bbab6778e9e62830fe68f98ea311cfbbdbbe1 SHA512 91bf08d5c2643b81efee87cae7045adad7fd6867bef6847ff64eac2490d84b38d08a8c6622fb947da67ecd43eaecb83ab4f3b5ebecc75e9f6dd511db6eb88128
+DIST roundcubemail-1.6.9-complete.tar.gz 5899444 BLAKE2B dc7409bec9c4bdfca4d55e2ebc2a1f688e7ce48bc1425ae99cba55b7340732e256f55c58fd4427ff7d932875ba9185f0bf6774760c3c800e3991ecbdb0eb8723 SHA512 b5f3f55da9cd75e550cba50d0980e1b1b6911a4ded02520fbd5d2f4ea9d30b695f9f1f2a66536fe7ba820e9337dd9c2f51132c5db622e853adb29a84118edec9
diff --git a/mail-client/roundcube/roundcube-1.6.8.ebuild b/mail-client/roundcube/roundcube-1.6.9.ebuild
index e8f09db98c3b..e8f09db98c3b 100644
--- a/mail-client/roundcube/roundcube-1.6.8.ebuild
+++ b/mail-client/roundcube/roundcube-1.6.9.ebuild
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index f9beaa785051..1f57c06f7cf4 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,198 +1,132 @@
-DIST thunderbird-115.13.0-af.xpi 550968 BLAKE2B 447b0c44a688a4c4336d7641393876bdc91a73e4ca67d9cac35c25b9c832edc5e81025dee2daee1a77762401b2b432e6944674ccc3df44226b449858f815bf3e SHA512 ba365e1c3f8ce852774f6a81b563bf3727dad8c96de39e5f834510f6795baaa07da3f062f77855e2f07beb719e5bb2c59e39f5f0dcf76d9772b5694e0db71f5f
-DIST thunderbird-115.13.0-ar.xpi 673662 BLAKE2B 5b6339cbe9267e99495faff82555410c677da70754d6b16790042f2846ff03cf202e213b9e18ef9e0014218003a636cd65ab230715d719b9959551f6e1f7fe52 SHA512 7e38e46bdaa5c3074e24ddb67de08529ed91100b54046052e6d73e087981463bb399e3207e6618c426651d635f95b6b5b2664cc2581c4fa360989bc87fac5d13
-DIST thunderbird-115.13.0-ast.xpi 569918 BLAKE2B e6c31f6487815a49eb5c97aa25eac5c193d046de260011dad0fb13aaf93c0a7566c17a28ae624b99e9d742b433db469702ad7c2eee88d1e5a3766f36b1efbbb2 SHA512 7bff6a66f08c66edaaa287edaf7aa5ff34cd77dd3b9a980e7954cd23793104f3b54fc664f24c10212ed27bac9507b1ad7931efc2569d9384b9202baffa8338e1
-DIST thunderbird-115.13.0-be.xpi 735788 BLAKE2B 233ff64d12e0b594e87bd399e493a7e3a3369da8854edd12b6664745553b0e6187da55f6e2dd11ba94f097058dde55ac3058260df15dfda64c8e60ed566c08b9 SHA512 93f4fb856fe4f547d5adf5aa6a8f47db24caab31f423173967f514af6cd57691aa6dd618a26696d2d1ee7eb715f4c136d44d001190e887ad44411f149a8a9201
-DIST thunderbird-115.13.0-bg.xpi 783904 BLAKE2B 6f66c87d1041f8175f2c8c61f5511d008e9238991580ecded4824e5e998d35251cececf65c6cc07d9f24ba327e9fbeda41ee4a65dad6cb4d11e3e0a713061a4b SHA512 0aa906fa17bb5b361635567e8a96dad1bb19c573aa2641f29023554b8d755cfd0bfabc2d66051e8aa3bd8658709e611a100bc929d1cb2571d9af0ce1869736a5
-DIST thunderbird-115.13.0-br.xpi 648135 BLAKE2B 21952d6d5a13e6dc56cc98edb813983fcafc8d73466b3111c59e62c8d9ae852d7283036108d5300eebe11d35a9ba16a7f33f90c73672621d3d8eb366576cd16c SHA512 43bd21bd85e59c44a1bea1aaef43da6f7bd83a625adf2be75673a27affe652e37c073a733d79f41cff851445a33ad73a7851d6515fb926d7faeede0d5496f43b
-DIST thunderbird-115.13.0-ca.xpi 687683 BLAKE2B 552066e6d3a2c56173dda3f57f10800554e5b5c92675291006ff3090f7c8c430fc93a24fcbc691c5a5e87789501316853406da5b705b8fd07a777f9b0625c354 SHA512 fc53c4fd649a7c0ee368b4b19895ff48990b3c679fbffc7679ed2072b5438607460db98552f2c7b27d8e309aadd7a4fac93ee6bb489b7aedf1bcebe67a568be5
-DIST thunderbird-115.13.0-cak.xpi 669805 BLAKE2B dcfd17100628f5a9d11b942579080eeee9eb6384ed65d6273507ef920770edffe4b7f40da46dff9ea256c26d98fca8bbe26d1f37c71634b3803ff221499cd743 SHA512 6eb5d61d8bd4ecb95e3cc8a355097c339db3fc5134fe2d141693c36122d469e2d97ed5e75ebd5a9afa393a30c6d7ffc6cef8040419a349311ffe883f0a71fce6
-DIST thunderbird-115.13.0-cs.xpi 771350 BLAKE2B 8f34b379aff6659cbe1d78c16ceb269f3feea8e41d253f69cea39999b93201c59003c5ac634ff694d1c0b9f3481c69f30fb9bc8753c92f2975d4ca472466223f SHA512 d30bea38e4dac554ba99a47bed062ad5a37f8746bd3ca7479ee8d89342d13763dce6d8f452648725bce84152a5612b583a7a25e470b32755fb1cd5b8a9632df5
-DIST thunderbird-115.13.0-cy.xpi 735267 BLAKE2B edb97fa5f5247ceb7943a7e1d5e98505c7d7baf6b19467a9e243dc0ebad510db376c2d367f2db76cca8bd502948c23b86d43adfea6d55a3e6601171a35b8c42a SHA512 79099175cfa4996d9c9183ed9d94f42d5520311341a2901e05449e1325f7f6913580afe43989a3e41f05139d07d02c83df27c987fda16b8f88598fcc7bdfbb58
-DIST thunderbird-115.13.0-da.xpi 722960 BLAKE2B fda82146de712b486396ffb3011caf96750e91641e2d411199e7fcd9e6d27ba3fd4f2929ea5699b2276454e44489add97932f9a5004c6cff801c742c74488907 SHA512 4f11712771f02a393206090b80bf35803b24cbf8f3cecd4ca0084323dab108a5166c1b10f8e1aeaa44d8ea129d87ab772863b7ca8de6cb3e5834614d4f88600c
-DIST thunderbird-115.13.0-de.xpi 752099 BLAKE2B 1d31857839862fd6cb6004c9511474e496c8c8417363fe223df1b73b8e62c3e5efb52df33a62d1f0c6f324e6ce8f5257b9e996908189712add4a79a458ae8735 SHA512 21e9c3fdcc26c5501835a2509f36d5b6172380ee185672834a752f9b6b03fcbf568c68f60adfcfec4ea2eb204a5332c6cf0118abb1c72d581004d21d75c21cb1
-DIST thunderbird-115.13.0-dsb.xpi 771541 BLAKE2B 92b0955d84c33b71503f6d13141fde7f22d19d72753f1f336e33de0ae4e2f28654d3d13beac7a1747cb5484d481526a4d66a28efc39e5b547033fc4d5f34f648 SHA512 1a7268fc508fb8b95ebe401ee3e38f46654b4f1fcacd657d3ec53b87571563e4d1823897cb0883c4fd997a33f0657726067f1876e60d23fac61465deffaa84c7
-DIST thunderbird-115.13.0-el.xpi 874880 BLAKE2B 9b3a9f21195a68898a1f075a778e41d68ceba9ed06c6e0e4b89b50d4f9f698176e7a6997db6dd7a4da65d822f08f95addb6b5c7f5f7ad816e5ebe97f5ad59566 SHA512 4c4cd64f94f1a1b0b77f70a8aa8b5e922952aebec0133023f009029c0a73d926da86b230a8a812aebf6d3bf87d3abf23ec612c9c8213b7f668e289836da33d77
-DIST thunderbird-115.13.0-en-CA.xpi 689557 BLAKE2B dda747a487e68c5af0740caffac5a36a65c8a56b743ec11add7d1d6690cd219a39ec6757d4d77338dc78cf1f93179e903e9a879917605a747b68ff2f46aa5fe4 SHA512 9761522ed175fd320de0398a5af69f2fd693619aa64fe9842da0da5654ec0783cd5b8d221e4989339c56742c2b8d7abfd54cbee1411649513618cd72f4fa5d10
-DIST thunderbird-115.13.0-en-GB.xpi 691416 BLAKE2B 4744e9c18dbd138f520bef4b06aca042e1883419784a128360254ba8754bb2a4928623069a3ef75c2e3777eb82dc3fd154fdc4e6906395a76e426417f04c4c9a SHA512 31c62ec8c6498806615dc4cfd9509289dd64a92ae4876d2342ea58533bbd7def126110e7036cb0b4e59b350f4fab9e0a80a7e42800ad202f409c1fb042f89c00
-DIST thunderbird-115.13.0-es-AR.xpi 746055 BLAKE2B 429d3cb3a8a70be66a859eb3638ab89b3b22a143bc7da9ef7148f046bc1571ab9448ecec780c6f2a4c7876d84756853ff684a9ab737293f2f9a6691e177b47ad SHA512 fc3cd1eb86ee63bba4594efefae32b4a5e07fe5faccfa048ecc9b62635e1b9d0a8f094db352fe9b90ae16147eb653566a884cd92899886ab02b04dd5fc2f1c7b
-DIST thunderbird-115.13.0-es-ES.xpi 708652 BLAKE2B 1a9842f78ca005f0c4e799043b433143f1eb38d9cbd491b94d39926b3498b13954ec04ba5ae7a3a9ba2440503a95b3f404c1ca4f20a4caf75941751a62546d66 SHA512 ad396d6008a25dc888e0d9d9da1f8e6afa9159103445a731a133780e749a69ed8487f08e536cb37c312fc31afa0e81dbaf1cf612ef1c7adc0fd6e33799f07b24
-DIST thunderbird-115.13.0-es-MX.xpi 721548 BLAKE2B 0b2760ed1798589d7639d49f596f23ed10d3f2c3e60fe345eec7c677335c15cadb34216062d6059b78f5e4050e5cc0ecf86a9bfee44415858bb7b8f3c2d0d83c SHA512 894621eac49772e70d9540f05e6324de6fb542228523f47f7cc40e47898d454a0202448fb4fbe36d4169888427ddf3363266ebcb09e37abd1ad602c9a0f6b086
-DIST thunderbird-115.13.0-et.xpi 681727 BLAKE2B 07eb74bddf50f5a1ce890ff67aad6a3b36ffa313f50da6f4eece69627de5a3c0cb016eb2bd29c64e2f94daa302b98f70a14f15906d2293679d659f64c1aabca5 SHA512 6de472c10009a578a12641d4c5a953d094f3082d46fcc41ae7f45cd6ddfd9ec6188f6e82baceb2c979feb77bf416ebe3dac78edcc2edea47056f1479fba2276c
-DIST thunderbird-115.13.0-eu.xpi 713895 BLAKE2B bceb13ace9783ad20b67cca8c8202b6dacd4051fbaedbd61fae6bc0bf6a1d502241cb6d427b78695c89d9d18c4731271aa37d73d4a9e7f548231583be4092cac SHA512 f9e4be26be0eb4e98e7e44d338a74c55a2c0e22ceccfb033767a223c00418991cb017eaf79663504bc6e6df258166ceb14f5199c63f07aa90f4250e9faafa9f0
-DIST thunderbird-115.13.0-fi.xpi 720464 BLAKE2B 68c24554d73b9b872998a7b4327e6298228e5287a28e1e2c5224830fe86b27f25a95528b5bfe914e7d339aedec595a2a93965a51d63282f18a286061473c7de9 SHA512 58e7a1a07886c90b32566b518d580cb93c07652cc35e410e6bfa15c9d11f98d2054901e2e16d8516998030101f6ca1647e02c4efca39f6617e9a5bf9b72e8067
-DIST thunderbird-115.13.0-fr.xpi 758743 BLAKE2B d89a2b69f8201faf4378879b6371ba72c9069f8ef30a26bf2af964a0099b0f7ae0377aa9043bb5b295a9262cfbe63598d4de31dc0dda7c9de3d0699c37d7e820 SHA512 35d753b858bae5de2540d52bfc129e9f964e2a1ea148e8f518dabdf296a43f918aa5aece0305150e1ac0d6aa41953c0cd40c465828b98c6f404b64a7a6a62c30
-DIST thunderbird-115.13.0-fy-NL.xpi 740533 BLAKE2B 742a7114e9e2d108f8f2ba14191c90c8f6c320c05a972b05d5d1980726570c9df7991ba331a206158a37aac89fdc07fbdcb3969f25a710f88686a882a1cde239 SHA512 fb2b95f1d22c8955a2aaf23a3f03a0f78fb2e379e8139f3101ed701a172b7305b575b7159677b6ad549a4f02af8be40de6684cd32e170a51855f0f4d9d4a050e
-DIST thunderbird-115.13.0-ga-IE.xpi 611156 BLAKE2B a4e2e0afcd5bed5c88d7dbdcf599b4d31c3af096ade5f72174943e4b09063968d2bcbea0a60b7d0eb4e164a131da994b2bb79a0dc1b4a7bee1d837f802fde700 SHA512 643c2635cde6cdb2cefe97adffe5697ac8929ea42112e95c9bfde42f79d0804b61699a7a972ba7c961cfc6d12dcdc7d0ee593019a7e79c6b285875ebe568c2b4
-DIST thunderbird-115.13.0-gd.xpi 714241 BLAKE2B 9f8a80712eb0a11acf0c8b25cd9aa83920c56eb3de7823e57e12888bf61a3073811bdf7384ac59b83d445f82f36929fa4daf580b453aaa07f06272815bb1bdc9 SHA512 630a3acb7933750add69548bac2c9f53ba38fe1a7fe342b27a72891a6095dcb4fb5ac72b0492f48df7d11d4127214b4908b59b5f22dccc907c1e51f41dc95bec
-DIST thunderbird-115.13.0-gl.xpi 726188 BLAKE2B 1d2ef5f55309263b349db09bc55ddb04d3a4f596eab48a107674b39bcb0b6d54bad48e77fc0f12d3d39c39f9e7e513224996c6f23bb26da2d017dd3f90f6e276 SHA512 cd41ce5b9b0dd56f620ff948c93ce16b03434151d9b63199d551b1718b37b7426501bfc66326125606a93e52fa9abe132a88f054b704c19ec35d47dc06c48646
-DIST thunderbird-115.13.0-he.xpi 692569 BLAKE2B 08eb6af4ce42f3026de1223be655635572f8dc3a34c7b45fcc5637fcaa416bff666069533718bb11b82adc319e31698d7af601055eac4b49674c02d8f92762d1 SHA512 f79ddc4400188dfe9ebe418c5acefc6bccfc5f0453235066e375e4da39b88fe85c579ab01311fc1ff569bdbf53165f313cc3312e2e2023e52f97bcb2248c0869
-DIST thunderbird-115.13.0-hr.xpi 689193 BLAKE2B d692761bf807741a86737967ae8fd417c66b51e31977b79e9f606ac43269e7be4e73fff3bb6e89e90120a8f671501e525d62584dc5b24a2cde47de6877ef16a9 SHA512 f6f1424062d8c79a5449ef95bd4811985a2bbcf271e24a5b635fe73d86bb7f18e6be144209073b2aeb0464b437487b679d9a0a61702ea952af20ad6305f12ac9
-DIST thunderbird-115.13.0-hsb.xpi 767598 BLAKE2B 7936a9e4d7e2473fcc25324e0a08ce7d716f3503f04f8e8321041fa4f18ee2086c98688a8861d36614c5aa3de43b1a2149166de21cd7e966b00c6a1a00beadab SHA512 566dd80c07cf966eafc6b133e0aedacd949a553e544728da544c52b0e8e60f9c8413a022699b842905bc7e8ef72c58515e40146ac054e1994eef871d4bd0e6bc
-DIST thunderbird-115.13.0-hu.xpi 770643 BLAKE2B 8290d946ef8739f5241cab3a21e7228c7368e3fee6cdb8b0e0887340b5b455534d9d66aff2441ff7466230a0fa7de48fda806f7decda8e8f9cfcd2e5055686fc SHA512 32348bc93d301467f61209e098d131d062a6c9844e85655dff13863e291f04fbc653a28ddbceb83645b47479c4e7f8331275e490eb69f5eb71002f5ee2cc5d8b
-DIST thunderbird-115.13.0-id.xpi 653742 BLAKE2B 1e8ef032d15a07e0dc41003820fe752beb4dbf1bc614b72c3c84de899fd2fe9e322df234999f4ed02d61397e6fba48fb4a2f9f1482c1a3fd933531623c154e3c SHA512 c9c6cec9437c3748ad3691dd75a9b8c1059671821ff03570be5d68c792eed2cd0a0da7ba3f40e7416cffa10dcc1819b59ecd5f969f7d2b6fa54e71fc4b4fbf75
-DIST thunderbird-115.13.0-is.xpi 727731 BLAKE2B 3f603e31f524caffd75277f45ee3ca8d1d98cfb69f2c25419d182cfe9965672ff3d8fce2fd4e13bfd21cac448e406df5884c18424b4e847fe53405f198584c54 SHA512 9cc38e93d45dbfc770aa81cb14965df2734ad2494e1cef13643d7fcaa595e749946ee2744566cdf1c3b3ba01adea400e89eb5ef752670535a6981a773b9e1010
-DIST thunderbird-115.13.0-it.xpi 677174 BLAKE2B 4ee5ed677a99e02ea65f832fbebca6d6903581198c60e161e298ca553414373cbd7556355415c7ecab84d73ad6e18b323eb62de2b9b4c040049ee8bb5fd11e7a SHA512 6e5db1cc3658422eac9735830fbacda8daa918e0ca9254b619e3ed344d536e021b6c7ef0ea9a458bcd55cf743f535900b8d7cf6a79c2eb38d26a45c69caeb717
-DIST thunderbird-115.13.0-ja.xpi 806227 BLAKE2B 9799bd09593fd5c91f81f577e44d998c1ea2daf69d9f51f324728818f1c6dfeaa678de3bc83842361dd5886c94496a8a14ad4f45c2917e59a5c9d57988fac7fd SHA512 0be4f51a484c9de7a58ead313cf3ee2bd8423225eccb53c4ab2478802ca736c32d46925e90dd6b0d36201b983bf215652941d77e97b667db0aa0d8b320abdebb
-DIST thunderbird-115.13.0-ka.xpi 786085 BLAKE2B 213c2d0cd5ccf9f6308de48a6796151191f9e4ce7ccd5f0c88307270be69966c94c06b966dac838cb4b93086bfa82704b050e270dcbaa481c034d9fc885a0236 SHA512 73a254c7a2642ac724ee15767ed874753d6b45bfd6fb04bd43ce8e6442a00c00cf1da5996e32ee06433f1c40ba43e5909632259b10b41c9dc61ef6fbb3fd5a67
-DIST thunderbird-115.13.0-kab.xpi 715826 BLAKE2B 8a9586fe37da7aaba0419f508140e5d885eed9b2e484b2595e682637b2ef00a1ec8a178e02eb954e2deaeb75578d889f2563018bbad24745a74d93f460526c4b SHA512 f498afdacc5daa1558b9b04c2428cc4769938f705182a851cfe5c0e2bd314cdbaa46647926f66816bebeb431f3fa7b7486d502ef83452aa9f830a99c5bb8af5f
-DIST thunderbird-115.13.0-kk.xpi 843702 BLAKE2B 025dc39113352ff5e8128083b7e6bbd4f8c6c4fb2532de9a7c29d025d702778ab988d7e55ee1894cf4fa45700f03916a6d847c999811c48dac916234906c2407 SHA512 85ae57d34572e41f6a1216f87c4cdca864e02b7dfd29e6d309191c9aa72b198e50b539e8ae3cfc4f1a19c1cdf5e23ce53afd5112a58bccbc08d73bc128118792
-DIST thunderbird-115.13.0-ko.xpi 747361 BLAKE2B a908ccf472ad83ee25fa020b2ede044fc0e94e0a4f5a44061d0aebc60da666f1aed2f3578988d49d255f4a58e8dead28249474a84758f2c3fe593cfa6d1741f7 SHA512 cbd79dfe70ff47c365f9d2a4a9da74f030c834d58454f150d5aab2de1edbae67a398b5da4352068050b2d0466ac9f731b237f29cf2d6d28e96a5d01895e77df3
-DIST thunderbird-115.13.0-lt.xpi 690565 BLAKE2B 08cd82b8400b2b2d834eb92d853950e78e09557a7afe32c724857a1d95bea43c3e074bb6dea22dfc8578c9875ca034b008c48f676e0788bb933b010eacc7aab1 SHA512 d65715343b73fed094c01ea358ebb8b867d072df2430b0ff7f69e7f27ed5d977da8e079e9fe23f86b2ca192018b33d28d3f9a3e56ed5fc521ebfa7368c0cc402
-DIST thunderbird-115.13.0-lv.xpi 627142 BLAKE2B 900205a9a85519e805d1c2f3300994b2f679c166f4af640f590f3684133fdf6273d7373cc60f1046df07528f8bd6ed99ffc5f790f705467e52f8e4584bb68414 SHA512 100c7924458a14570d60bb4ae317bc5671682d851d3f89bce439ebd0e73aa74f46904cf2317e7b710d1a4bf3010e43bcc9d4340fae9f6539968def01b3d8f6c1
-DIST thunderbird-115.13.0-ms.xpi 575461 BLAKE2B 9f177df7cf012b299043742e911ae7b05154d5d386cbf9e7485282c6af064aa566c3ab986c4f05eb5fce76afa95b2d9697bb2cc3351fe274dfde8e04bfa04a92 SHA512 5ab029c9036c4af6f4dbbbed0012a63ff248a5e5bc3ccd3bbecabf6d41f801bd10f952af9a88ed96078766de12d4967ba2c17fc5bd4981c0d4212cad86935c16
-DIST thunderbird-115.13.0-nb-NO.xpi 696573 BLAKE2B 6a0fe10040b84eb3df250bd672580e9617b591c8d87294a9d7881154a7cdcd19a4a26548c360abe544b3f92123f0733d89d8e6c4b96bf55638d7477d85071daa SHA512 3b6dcecb14d51e7f6dcf11da8c5c7e9c224f081587f3241ef57487c0abb599cf4ccf3cb8c72e297ab75a6cf1bd17d4ea0714bdf1c09b35c8f1cec63f57c3264c
-DIST thunderbird-115.13.0-nl.xpi 731871 BLAKE2B 5e3f84052eb23498972b76e62566344eede7650bec78011ded1c7518a8c49a34ae408f1a40e0e555fa49d59692da98c2d9568901889085fbd6b96f521a8fb8fd SHA512 dad0c6ca6a0b70f54a021cb99edc8bc12aa814faf192e9a74a269ee1c86452584dec7909ced17e6625542403d90c9f7407b25f0ead891228d2efd036b159d1cd
-DIST thunderbird-115.13.0-nn-NO.xpi 704545 BLAKE2B 8bfa62ed722ced2457efa8c5c17520d00cfd72663d7edcad8654a85bd8404288aa4962fd42dac26e3f1306c9c1e8e1b3aef6bcc136fbabfcad3e598b2ae68b20 SHA512 8731f011081ebc8b885e4c88e4b507086b3f6c6c06dc674ca3a0bf369d8bbcc9053d2d6af711770eecb0d581d36571945523f8f2d04a6f20bf0eb5b5be76f0d8
-DIST thunderbird-115.13.0-pa-IN.xpi 685093 BLAKE2B 9b0b898e216f34bf2db810129330e0ea933b25f96b4bfea74daef701b1f019859e1e1b4e45a2377a3a63f88e70ef62fe6bc29d6d773437afee43c939ee0c292e SHA512 ae6f044d8bd46fde4fb782c755f5c0bedb06e132a5dbd69f8c26bbb503fa4173634e208a1f2cf6df1bc0b7c6528e3bfc758956e8354e86705d90adf71d2a353b
-DIST thunderbird-115.13.0-pl.xpi 750938 BLAKE2B 7a9b877cd0808eeccb31ee155ce52681eab7079787991d090abb363e3be74684da9278c07160140e63cf3f4dfbe89fe5a913fe437eae872a2caab126bd59a186 SHA512 efebb3ad526d218816725c3c40d33b8ef325cf3f36e6e779720c35f3c785454f31cac8a664cfa7525653fd9926cdd5c9bba0f4b3612aa50c76d53e3b5b324789
-DIST thunderbird-115.13.0-pt-BR.xpi 739483 BLAKE2B 1ba7d0d6e4cbf647fb6b518610ee1c503b4f835945ff059ee5516514623e06497538aecda0c61b62798af388b5059beefdd5025c740a45a732fa6c2bbe4dac6c SHA512 0f31c176366345f062b9835d7ce1c476ea4eeb62c43efdd0e627885011a7c85f61b5d1705fe5bd06d6111b396858e1521b4a03949a4e87ef43c8cd14de938383
-DIST thunderbird-115.13.0-pt-PT.xpi 730158 BLAKE2B ebaad36b5cc45bcf79e8d122f0cee57237f9ba0f0290ea201621c7a8eac497da398aa2255ec1a0c9249ef4d865458afcb09733226c962c94bc4208211d11b43b SHA512 da06743d9778fa38b7f53f6fbe9839352182f2621aac028e9e5d2074133f4fda3f271eedef58c2a47b6ed716763632e2bb1729a9e82e30581e39b1e947991733
-DIST thunderbird-115.13.0-rm.xpi 735075 BLAKE2B a82d3b53746d291984725d9857911737ea3a1c04cd8b3f78a8244181adff862e50be77dba1e73a5d8c3b96e6cded61511e55a1a4d7c8bfe43757f755ea434863 SHA512 bee0911aafc97cff73e75b14b5470835ebffb9560a39bee92ed0052b00fa30aa0e0eb9d4a27125188a85c5b5cb45d2a3b11e506e3d8d583292de144cf248025c
-DIST thunderbird-115.13.0-ro.xpi 661824 BLAKE2B bb6985f76fbed382f981d9ac423b0c5f2c4a4a751429825376b32cd84e4f7386e64b679e8945ca06df6cb405c9d6952cad3e8660623cdbed4d59aeb778e55fa2 SHA512 ef7ff42c732c8629ed4c17a1e75ff93417897d81fa0b90e4247f0ff208a2eb9f6025732ca6d4f50f32629d3b6d71d64c07e7c46e4fb7ecc563ca80e24ceaa6be
-DIST thunderbird-115.13.0-ru.xpi 858382 BLAKE2B 2aa3211cbbade9594392f76b46a8a10548f594c362967a1b5e99340525bb54532a6c7271980d303bf13bc0b4f19cddb6703f19ce31e8fa966d2fb9d4c2e8485f SHA512 83b64dd0bc9875a05643fb3a8f9c2c24d61e1cded026aba8adfaa30222263ae29fee3b944491b009735012693ce5628637b983ba87d1bf20c3ea8dcb25bf8c20
-DIST thunderbird-115.13.0-sk.xpi 769722 BLAKE2B 85e0bba7c56bc223b4cd7206b33bdbeb320ca4c7ffbdacd1c42035455884d2f19e91c3efc3cb460c793a6fad8fe36b3b8dc55dc9e1e4fe6d7e76ff454d9b1387 SHA512 180dc51f5c0b39af3690f51bcb8d9bdf48796b3674a8f93173ddcd7611ee493ca3b3dc325172df9aa4decb9a299050b211c9e6ec440f0d028c2e3c022c0afeee
-DIST thunderbird-115.13.0-sl.xpi 731306 BLAKE2B bf1208dc577123a75926e3db397523268cde9cadf3a346e1a28e52faabe90cbc1ca5b0e67c6286bc4646c45e0b172db283625754dfeb62b21fe6b09bb587fcd9 SHA512 d0ac65771d68cc4800d22df1d16f9a66cd766d06831c1baba087b2e8f6d5ad64d63355e7340e6e18641a832d382ca127287e01b2555896e044cf2e940d45fb59
-DIST thunderbird-115.13.0-sq.xpi 753949 BLAKE2B 8d90fb94529bde9a54aa1cd56a9a837eb8bd3de48c1dc61b2eb065bfd5ed72787c4f316cee74cc5e3bb654d00fceaef25298f5ca524fc88ca27d15d4c5335796 SHA512 fc7c9383dcfbe8e711c5db9be8c53ea4a2f0556bd7f2f6f536b3fe3270fa7d9adc011a7d155f893612669484fc04365eb80f5cd989a200f2a2d8a1d55630ffda
-DIST thunderbird-115.13.0-sr.xpi 757443 BLAKE2B 368d11be79da3fc2fe92c9deec524cc97b3981dcd588d44e0b159eb80d90b1c53085b3de9e2d9e080405401d04b0e9798431643aa38c75ebd5b2d271a857c088 SHA512 c01157929f4839cadd1bc4c93b8f555a2acf051242266c68e223407a88fdf305bcaa508c6c91a92f6549fcaa8ae6ef4cd1588e70e41b99e9bc276f4a65ac6608
-DIST thunderbird-115.13.0-sv-SE.xpi 735009 BLAKE2B c9bed20022b16eda4890cf3e1428ec128ea3670d0fd6027709ff408f977827f5a84fa145c4af93ebe5e1a6aa4a16f28ec44a456fef00371ca745356ba54ac314 SHA512 31b66a1d0d4c8267a0cf49bec21e98d1dccf856d561235cde04b255b6ab89cbdac4af5ab5b4ef20bea00cd5a1e6b2cf65bc07edb58af598cfaaee86af5e5fe5d
-DIST thunderbird-115.13.0-th.xpi 805978 BLAKE2B 18cf30cfb24f9e22c88559796658bd7e6851c07e1b17d778aaa82da67555382ad542508370da4f2325e4642a3e15beb7c45ec7f706dd8e00bb4c5d89bee65757 SHA512 c334625677b4a76043f7014751a244b96816b3cdbe12a55edb376225dc24e217982ece81ab9bf4466d17b573832b6c5eb8139226141241862aa0334510637be3
-DIST thunderbird-115.13.0-tr.xpi 744573 BLAKE2B 9755b37114bdf0250b589823e6d15a125b30f10b47be9823590dfb98c92f30fa45eaeedcd7aae9119efc99a61df1cf2a45d730260593476d2e56ba38b1123027 SHA512 f2c0711a8796a5d2b0ded240cb6665e4611b083938fba91aea87a89cefb309c752c55b5f4527d73145ad3bd0a12b878b196d13c7557fd97592c4a510fccb9550
-DIST thunderbird-115.13.0-uk.xpi 847086 BLAKE2B f916abab336011b92bb4e679df1fc9afd9a873065afc18d97e11a3f7dffdadc640439c05188576d962be4dae9dcc6f6d6828c796decd80660b85bcd0a3a0a3f5 SHA512 6370ae047c453744de0ee618322558a65175627eab08ea8e1d21feca27fed7cf13475725a5eb73bd2e1d41af576bc2107946647aa26e4d810e94ca7f8543340c
-DIST thunderbird-115.13.0-uz.xpi 588502 BLAKE2B 21784887f9e7652e45fd315988260425c8233807e6300cfff86d511db4945797b87a9c08c6efb4a626eee3de0458ce27c3b9fa430648b7f2da97b443e073dbd6 SHA512 52688eab84e321334c9a99d9dcccf7e03a4b26c95fbce707ef9bb8d6c5e56e6e1e85e2a34b9fcd84d1f730263d77c62d540624a8094e73db214806b80c133a43
-DIST thunderbird-115.13.0-vi.xpi 773834 BLAKE2B 48965707b9c438c7224d41463670b537b7a20b4161245cb4200bb1b5fc117fbd343f239529456fcb1f4aa63d18cb3eb79774a7322c7fe700b73cf60c14e88db9 SHA512 6247f19b16008249931ec75f171739567e2c2ceee956236075f08edaed1dc08ff2b73d12031c3acb7e3f1db08d40e73224faabf8ee1e2705b6b5b103e2e8e665
-DIST thunderbird-115.13.0-zh-CN.xpi 772579 BLAKE2B a74d96bd5e8be22f7820860b790c723ae70ca4df3268dc857998db7dea61de540e5393e45808a937a8823583b9b72578798732b50f7fc4e60588ab7be9bae9bf SHA512 65d3ce84cefda33f31a0b0455dd59b9c7b2466b50f94741ae8c97ecc165897ff310303ce17b8f243c488862481b01723e97897c2dbfa46526be304d7dbdb8b68
-DIST thunderbird-115.13.0-zh-TW.xpi 777571 BLAKE2B 6c87f941a7764dfb8c6edab6785a700c13aeb9ac879a275262ed6c5c2fd606e727ed8b64455079ad8462d5147b104483ae2b09f720967ff808e37a2c4de52985 SHA512 5ddf1e877688e3d3dce43b21112ebfde881794d04f4421ba65dfdaea90a54d34d71db822fd34b78b7594019154db8f187c5eee5ff67a220e87bd1e1f57bba4d7
-DIST thunderbird-115.14.0-af.xpi 551075 BLAKE2B c059761dace91e4f5e98f1bdde879312f2eea951ade269c7b4239974aa4609cbc8f3090a0646e87fad840bfc166ce2421403e7c210c8ae965ae6385404d06c4d SHA512 584013d7b6eea794448f4764c17de7b989155ca782f602948a2d0f745c4344954daacd35327bcb85f9e9cad99d5b917f748d47a4805cef171d806bd8211aa591
-DIST thunderbird-115.14.0-ar.xpi 673775 BLAKE2B ea5e62105a53306ee18dd332775eb4917c68d041f50b14fda1baaa9ad09df42e6dafb47a03023c3a46cbf5092009ac84ae97cfe82b6771a99dcc7e86c6844b32 SHA512 2767eef517e451aedfca4b9a8e254f4388afc1c6021cdc301bd56513073688a63ceb7891aa5bb9dd6c83ae2d5f9078e9b832bdf3e761c88e2379076d15baf519
-DIST thunderbird-115.14.0-ast.xpi 570025 BLAKE2B 3477dcd1ca19880feeef3dba4fa07396e84acbb80345c1402fbfc1012451b2abdedb05b60f4907ff2873da174216e1275a61a281f4ccffd0030403b4813062c0 SHA512 a01c2d85389e7ca86af4bcc73565bca9faea308a77c16457dcb981492433a177761dd20daf3224ee64c7a527408265ae53fdfb2c2a5b4cfa0df8d2325240ca3a
-DIST thunderbird-115.14.0-be.xpi 737420 BLAKE2B f8f0a2b9a6b2a2541eae336e11fe876171636c59135a58264484adb1dd01a22d2e015e4203cc736d9cc44dae6530490b1f56dbcfb17aab41e6e897a702edc51f SHA512 58f519048e3a5f19e227ace477df49b64ddd622c9ea31e5e819d4efd6bc9667d74414abd1178d356ebb021d11de14cfcda125a1a5ecfc080073c5bded074cef9
-DIST thunderbird-115.14.0-bg.xpi 784506 BLAKE2B d34e1b3e6bb62cf433b82787aec4265c5194638ec85ea37d05f7c7f41cf0cc440865acaa07d9d919dc48e9a8504e7cb0fbdd11eedba2bfa57e5cee2db37b7a39 SHA512 09b931dc2469bb3df21cc85db53c00407d10c067b957ea63cfb921b89bbd4157f075b72abf8abec923c7c553f8e0c64c42b6d98d96b1c9bb8b27b53688dc99d3
-DIST thunderbird-115.14.0-br.xpi 648245 BLAKE2B d974ac0eb0abf6f822914db5a6f99592530c77c6e832a11f1a005d464eadc2b1bf66807b1008e323f602b3b8bf6fc6578d4b6c51d541be30b7a83308dad8472b SHA512 992cf5337f6d6b5761ad7332f11b0bba14eb962bff0c5683ca3f01a064ff13d76361adf177953a9091d48277d59f2263aa4aebedd450ca2b158a692a06e08ab6
-DIST thunderbird-115.14.0-ca.xpi 690611 BLAKE2B 28c74ba55689ef90b2a936403301b28f30add0ba9bd78507f37f87b420ca47ef86976b7a73cd3fa7396f06c22f96605d1497250a89440be9e9f9bb5518bfb448 SHA512 ca23e0a7f5df0e167c2cb293e1d5f3e8bf7af55de3233107b73c297c79121c2945da0fe470ea69bc2512de5dd9a967f674cd75945ff603769cc356d3cf3569b7
-DIST thunderbird-115.14.0-cak.xpi 669913 BLAKE2B a5de3694f2915b92889df15f147a2eeecb3d966580c669f54c3b34fed704c0c0959d65c9fc7f336540b18392ad79ab57374b4e4fd346a1f7fb493ec7447b14f7 SHA512 0c15a5a730f9ad8044004b9caa519da63af0312ef34edd818d691f9310c83ee338ead82ced902f340925c21dd29cf47dd19e766bbb9282dc76dc0944f3f707e7
-DIST thunderbird-115.14.0-cs.xpi 773205 BLAKE2B 954e169ef8b322529b79e26cc290baaaaaf7d113fd0f44cc798b83f23f90699d7763da1057ec438330df826e4b0386abeab28984c582712039062c86df6fac59 SHA512 c5fafb40529893b7a84f044fd69b548ef627ff861f63ba3c14411b860471bbdb308b659e033705afde937e99c28e0d80f7a2e456d305a5621662b872e0dc17bd
-DIST thunderbird-115.14.0-cy.xpi 736728 BLAKE2B 69a46412ae8bd4d2bd307f3633860a3dc5eadc94cb1cdc819a7f9af5fbe469aaf68e5eb97887fecf032051daf1748100d7be5d049284b3b13bb4e4e4ff643943 SHA512 4dc1c483f79e0b0986dbf7b6ef9dfc3e939b7621b0418b9f704d99cbcea18f97dfe3843b4d204f673e62050bbfed2fca84c7545f6baaa6c25d532f21d0c0b0ba
-DIST thunderbird-115.14.0-da.xpi 724375 BLAKE2B 81bce77270c0b3586af2914d2c3e5cc75a9555e87d306101fd74dd347bc540a141736fc259d5e4b41ccc8a982ee9386896ae582e5e8f2155cca89e656be50e8e SHA512 fded4ba16f3275e0063daf590696590dd7bfa2f9e687666df4e351a864808aa890219f7883e8aee53a299ee6231173ec19e834fdb256a45f0871a329f6bbe360
-DIST thunderbird-115.14.0-de.xpi 753549 BLAKE2B 2ddd5994da49b93ed9f9cf3911d121cb2598a2ce7afa0f714377d8f25c17b8af2f97ad3fffe7850757964441180c8a65d228ffe623b8fd7011235a8d65931fd9 SHA512 63efe71b9ae267b0afdbc8be55e2f66f4b0b86a1eec31df760dcc57ee8e6f11865712bfb5784d4760ec6d75314ac3acae805d105b08c54d0ea619b898da6428a
-DIST thunderbird-115.14.0-dsb.xpi 773555 BLAKE2B 3057c8580bacdbb2f306bb76f182b8c5bd60550224878c26aa168d341a5da20a5a94eb1f17fe5d08502c61a6d7202ed3f32d330a5533ee517a4bc9e27ff4d687 SHA512 d6c341b1e7283c756b98e9040dafc4c71743d4d4254b6a6e13664a14b4897058334554975e06905f99d0cb9457fb36234413733eee5059b370ab4652d27e25c4
-DIST thunderbird-115.14.0-el.xpi 877605 BLAKE2B f06810625dfb37f8090c653056197f43d860be38345673865cda9f0bc82ef2e1f8f27bc3acbc53a7a0372575f9fded8f28a042c4c3d85afdb0849dda5ebf8bf2 SHA512 ecd1d5896a145b925af0d80255172866e163568822bf306864eabd1c577f002fec022ddacf2cc8212f29287aa56a81448557d4e4c619085db5c41b5a87b2b1d4
-DIST thunderbird-115.14.0-en-CA.xpi 691843 BLAKE2B a05d1fc63b602efa96583bb1cab42f5d4507c088be1701bf45382f051ae39a7d98e8b1030a0252d098503da159001845e9281e61ced53cb142ec09d5fcbc1c92 SHA512 5c4e29534050dd9888a69e934e6ceeb22c2bc4f0f8182ef9c7a019da7ba351158f6d83f0f4a0548d06e37fd3ebbfc828eeaedd31addc3ad5ea3fd89cfc43bb65
-DIST thunderbird-115.14.0-en-GB.xpi 693140 BLAKE2B 56479aead322b98d12b6fc16456dca6365fee2257a59e549f11bb1d67f40d13bb5029c3aa04d27cf1b4c5919c95498545216bc17b2188df47541532117e58bd1 SHA512 a64e83decc87c5050e9b3557eda80b33cd076d86f9180d6d33e4068e3aa30c7093f0304a92e4e9c7728809ce62faef1a964053784953f249304483f0df9b7ff2
-DIST thunderbird-115.14.0-es-AR.xpi 747974 BLAKE2B 6e19a75a3ce8a744a6350514efa86e7b288cc311024fecc3f319027bcf35a2f9bd0a86f8fd66fa9890b225fb8f5c820bcee13e672ca4c34df9622a0fdcb15e68 SHA512 ac84f6a4a4e6a7d026b888da9a23660c048da5993b09059c41542bd699ab8e3fc4dd0d5f3e0b2a49013ce965340b00789bbd8883a4c95e792af7ec1a9b53252e
-DIST thunderbird-115.14.0-es-ES.xpi 710345 BLAKE2B 56235f2f3a53f05e9a2f9cd1ea4492dacd841a50592b81da7787e09e6fcd72d8fc85aa61ec864ab455ab8f4a01032bd787a267a88bb1392ec924f8ebaf18291f SHA512 c7dd7d7f92d5e7146f87925e11e61222acf564466ba5fbf9b56761db7f4f5f5d5e91aa40a860d6095f9e484f5e681188a41227559516fdb97ac39966dab0d491
-DIST thunderbird-115.14.0-es-MX.xpi 721705 BLAKE2B c5ea8cb8a7a5fc0264bd2c6edd4c98f93bdda55fe5d0c4af69aee9d1bdf66fce766cf5d13db3d16f3ab98ce8b8e6204699f20885b67f083d289e4ecdc78a587d SHA512 ed8416b441233203f5e2c1d95559e9e66c7a4413573f7f8c6157ae0708df3a265580599eabf8dd22b88630f642435cd33be62d16c7b3c5033a5f6f1989b378a2
-DIST thunderbird-115.14.0-et.xpi 681845 BLAKE2B f8c43bf64c09f938a3f9f901ab5909e5fb68cdd8c9ce7d0dd3636b656e78b9e45988788fdbd4546239ae4c5e947bf72f2f43aeb801f7e614254486e063a0fcf9 SHA512 b150c1fbb52ad4f2cbbe0ef5a17898324a8c111a6db7bbaa621af478b7dc8ec9a2dcc0abee50c4e38d377964e8f49e2943b9617e81126ce7a3ae73f4dcd794d2
-DIST thunderbird-115.14.0-eu.xpi 715703 BLAKE2B cc0c64a4cd10d0916366a10ddc820b0af1ef45daf30a90e6e5118ab34d977335b45905188762005980593950429f377a4bf88fb17ab5c5ababdb581d3781dcbb SHA512 89a656d9adcd98025c846db4e744f1c44e8f055afe30ae19af32d515133a00e6986b1718eedf0e58cf2c8e116ebb615bd11c9773eaf0e9cc0ad71da54df7aff9
-DIST thunderbird-115.14.0-fi.xpi 721458 BLAKE2B 51e8846f9fa3b193d1af1ac247e757720834c9fdab9ad1e6be99c5388f08bb4153c4e4d57b5d7fda5ce52a00b6404539c5a23fd18cd0e33af803f60217cc9d1b SHA512 5c2658f35998147d1e059cee9dde2b239be116ee9805621ad01056c13e39c57c8f23f30e02406d071857c34e19df2e3a313be609bf69c616c1d4a935987cf9af
-DIST thunderbird-115.14.0-fr.xpi 760363 BLAKE2B 90be2ee85bfdc05ff6bd569f68e3cb77de402267865df7ca4907704bf6b72a53b38b4a18a6067dc2ca2134b3c059c00df6c88f20061154708b357b0983d9e3b3 SHA512 6e8d1384030b8c45ae6222faef3949b0502d660c2a61bb1951af8dc800fadd663ad588f789836587240947a909d4abe331b059f9b680307e76520237543ae3c0
-DIST thunderbird-115.14.0-fy-NL.xpi 742643 BLAKE2B e65e5777232f7bfdd3f30c9d6f05f40f1c6123accc55653c53931933ecd8baa2ec96098d20ddbc16f3a94fd62915ed98e94bf36e84d516996cddeb18ca46b7b0 SHA512 269ace04c16c40d65c44dabe11192756574efd4989f854496d7b0bfabadcfddd14e5fbd051303a63c54eca6622dceaa63df7418bd1b3ee37e06553a7ed1ba942
-DIST thunderbird-115.14.0-ga-IE.xpi 611260 BLAKE2B ed1c147a2e4f14072c277690fa4fe63e67949c692f083cc7edb120566b39b0e9aefd07af0948d683dce248432d034f872f13aa5780c286479b993083ed73b927 SHA512 5db9010df40ead2755786f35fef01c710827733523135fa131bb6982aec65fec6d33ccb1ec3bb02ad2e8f6d408a4f690442fb80a4dd3b9630c8efee0cb32335d
-DIST thunderbird-115.14.0-gd.xpi 714361 BLAKE2B b6a66e5d188620339236dd1ef36136ab6fcde33e43c45a932ee785f48736dbbbef81e49f0ab562e697cf0af079b75040b5a79e2ac723734159a2c14778e37203 SHA512 0d3075c4c90bc9c0473f79aea4a83b6e2b58fba18b5d5821c459803020955a3ea44114b96f897410ea51cbc5d9cf5fa006a7c8c34c29ad0caaf0aa0a0316f3f9
-DIST thunderbird-115.14.0-gl.xpi 726304 BLAKE2B 78963f8dbf79150d00ae9a32acc2404e59e1b1d4c9dbc17d3a9a8386402142f11ec4bd334afc0fbd6d6d367d18e2f87980833d83b96ee606c1cd92987969e9ad SHA512 1386e78162fba0e7476619038a2b729142967faef8c8767d53fe2c94446719e90db49416f2ec56fa6d9053d52a89a9493d15a9298bb1acc29b3bf4a36731632d
-DIST thunderbird-115.14.0-he.xpi 693498 BLAKE2B bea57cd737f313866516b2ff2908e1d0e5b9f99970ecd5740b58a4068dd778b0db9bc1a657327f2864475142d04475ac86ecdef75d217378ce616a3574b273a7 SHA512 71892ecde40003ebca1974336a08c63965083c98d18012effc1bc8912cca855c7b02c57f86a1f947e01e6d1f1a993d9586f71244625b8fe40b09fb4135569789
-DIST thunderbird-115.14.0-hr.xpi 691433 BLAKE2B 08086582deb11088535f6f3b4f782a8d17fe676d44ef494d2d15c4779ded5bf3ab7baf31610c557d5cdae338e58c01fea3e56240ba1723a00c32ac36a7d4355b SHA512 fd7b9f632768f05a4e48c5996542191382d6530cff1fae1785cd6a8e6d48425a029b0cbf6a3b345f8b356fab3605bb00a64a88b6fae58949f2811b22735f534c
-DIST thunderbird-115.14.0-hsb.xpi 769641 BLAKE2B 5771a3079536f3497d5d1fe961d1b06d90f67db8981a8101829d20404a9c5c7c3554a9a656eebb84e27463759e08ec3f1e1e89b0937118369902e9ac67b9637f SHA512 9fe042c385bc89a3b2f75f8f0fc4b95823136e6c0c64e763d783218498caadea36e5c23b2898390ea14ff47743cb61528854f7e7171ac815557ea9cfad15e9b5
-DIST thunderbird-115.14.0-hu.xpi 771526 BLAKE2B 6ded963a558a8c0b5fd451ecdbdcc20771c1b3274271bcf049767f98605cd7ae925e13171c71763041927be372bcd7165fe71880414ccbf40d57adde319d1db8 SHA512 72e50ba136d89eda9f97990fc9ba193f81cf7a84c00b40116a5fe6c668823a95e38d47a0ab452f00dbb03855eea17882f88d8ff25676fe0ba720c90202316a78
-DIST thunderbird-115.14.0-id.xpi 655009 BLAKE2B ada437033f48a3131472eddb33547a0c60d2d0bee013b02bf86c5ab412d5755254536a071b72ed05c61361d04dd8e54e9c65b47eca50596f90042a2320bf41b9 SHA512 808832a2d44e9ef4744222357bcf07f019f278eb69a0c77cfd420f924ad23749414e99ed48ec0af89ac5e2df202e522ed68de51e8bf97b492f6f499a3be7c5be
-DIST thunderbird-115.14.0-is.xpi 727511 BLAKE2B 381790fba10c470a6c4b6099dbd3dc72289f541f916d7a5dba9ccc0522a68cea4d18c0e4cc17962c6576ce82ad50af2b7c3c91636c1acc100587afad784e752c SHA512 15d3e85812b78f120b1cb13feadd1a465b5cc91db2888a602bd68b3180d5631018114ecb99c6819df2a6626cf736add59eaf01dde585fede8f55fb173e39db40
-DIST thunderbird-115.14.0-it.xpi 678891 BLAKE2B 79c66d8d2465627a4ed2343d2673edd0db6f783a596df392a240a099f3ca2eb339e6f8be741ac0afaed2761b9427c22d5358962604e3fff8c3061c36e5a7a7b9 SHA512 359fabee10e9e5bb2130d918782c14007a70f2f912a1e683274ddb723cf10ce9fb256e6155ef299fa7bef5d85608a4c56faf91f951d269179c755068cb3d6583
-DIST thunderbird-115.14.0-ja.xpi 806835 BLAKE2B bd47fae4a1492e1f5d523ef40a234ef4181526014cb22c2a13b05683f33077eb01fd858b9d330b7acb12da1ab74b85d756baae1fd02230ed3fabcc338147c670 SHA512 e5c161f7b3814c7d9a3ccd0f858406e9d625e950fd812482955f74eec291d50cb7a4cf06577fb286d2f4742f5c6d8afe7663024b3f4ffbba0d813e269bdf0e6f
-DIST thunderbird-115.14.0-ka.xpi 786208 BLAKE2B 4e4f7156d3c515b1cf4fa509b10eac4be5a35f34efb04296da88d021d5a7ad7575e775f6f290fef4f6d60a28a08fb9ab787eacc748b41101c503785d6917cd1b SHA512 e1f2621207d7e4e2656c568de5953ffe6042d1490dc66fa96438ed2b5cb8cd946ffcd152f903a33f29b567a548f71b3c2426dc5b49d1dd4d227ddb3d18e6a9bd
-DIST thunderbird-115.14.0-kab.xpi 716194 BLAKE2B 1a15da10d72355b628c73146f561f89505097df9fa1dc09c27092c8215eb2d03bb6ff72619f3da875d54e7365ef11e54216568247cec1d8a644e762b9d217e92 SHA512 d0c0b6f17466d935170e873cbf8f28c9b685f7e1c79ba17d19b32cd03d8d727763b472038a8cafbfac7326f2d535b1707baa256c6f4ed86b99c58fcc653b5a80
-DIST thunderbird-115.14.0-kk.xpi 846249 BLAKE2B 7c5ab66f18305813529c82f1b1f8ceebf8f70966b48b0ccd4dd861fb885a40b003d4fe4e18871f4e11c22e18519fe003a80579e03dae17934690afeb331264db SHA512 a6d0b22d607d4f9688336e9fa983d9d6664208645948c38d7565542d7e7003a0e8208d12bb768d84848721ef26cca6529bdac828d2713ec3c058fbf24bf9afde
-DIST thunderbird-115.14.0-ko.xpi 749368 BLAKE2B 1aa65065f243e5bc6481e9005dd1cc56da0bf7c377fe5ed0cedf90732940ac4d8730aeaa0b1fd6ec169edab81c910653104e45d8af0bc16c3b7751ab61ec1695 SHA512 cb89874847428199071c9f1fc93cc7dbba2d061c427987ca5b7eb06d404fc149653feb2e2699e7a5fd9c32840a8d6a86470e4bdce103aa54e36bca4c66bc8c89
-DIST thunderbird-115.14.0-lt.xpi 690687 BLAKE2B ef23d07c4b30288e4aadb6323a33e6eb93ca56f639005ba492806b9a107da3ea1bd39444e7a9eb70e814f75838a2b969465b161f66679dc46fda8a7b9eb16a5e SHA512 46f86a6b7e0f765cf62e4fcc1f79a55afe005a6b0fe532a1ac58099f550b6e726ff271c9e0833d1dc3880aa5e9cf86c78a759d3d83a2a2d022d1147c948de157
-DIST thunderbird-115.14.0-lv.xpi 627247 BLAKE2B dab156cf1503af5f78acf7dc81549d79366894e52728e87308cb26f62ef1bb2ee94d811a8ec749f9e8d3ee08adcd89ebc53db7dda60e9094f5ff6812332cb591 SHA512 c38cf01e129aaf0efda94bcb8edde556b6555367991595df10f913e6cf8a2cf7e4e5afe542d54b416daa8fdcd0ac253ce440ec7ba3b60fabab6083e2af35f53c
-DIST thunderbird-115.14.0-ms.xpi 575568 BLAKE2B 5a2f7e6b25d4bef3291ccd55280d3faf9df28c9e581bf42adb752009c04e8fe852e07343c5ee972a771ad87779ef238c40457a5dad48e3657b3f5da261d84175 SHA512 6577ee7d014b809a3a1d41edd57ade0fbac8743c545fc7fcbdd7641f8f8773a060d9f03e9e0472d32a2031d15cb8c00a4594992b0006e9e76d2e1f4133f4354f
-DIST thunderbird-115.14.0-nb-NO.xpi 697703 BLAKE2B e94b90eb20d4e70bb1323c9c1e101ea905dba2524deb3b40b091b9f6e84a595079ca8843ae47f8da6f3dbac35b65a72edd9cf562627553cf9532b9b88f23b295 SHA512 7aa9ac637b3b8e087baae7046e437842f871324f883a94fce17f8efc2ce688cbc648687ba77c877c4beecf4dcff3147a849c11b434dae15a313974b53e845b45
-DIST thunderbird-115.14.0-nl.xpi 733820 BLAKE2B 7d967a15486da6494dd90a2a6afa94256d095d97da9569c7431b006d7b8b308f8e9207cacf788c4fd13c48021757f862e8c45ed0a7a95944abdb099db4d77648 SHA512 135f129f2b72d99599ceb5c92f03d96dcef28465717eaaefd1a12a4f8617ede060150cb18caf7ae6ed6053210c32bba0bb5e742b5f99a20f9a1eaf1d86eca37b
-DIST thunderbird-115.14.0-nn-NO.xpi 706209 BLAKE2B cdff6e4ed09b39f968ef53305bacc4209aa1cde5cf186fb55dc0ecc51a3ce586104a8e1e53ab254eca8edceaf95d2cd0bb979eebfca58187511e35b3968f3c80 SHA512 4a54b2254d57c1947fb27728a173270a9f9504c4bca25e2e700c602e6b5b8b9d7538bbd4303c062a55b23cbfc8204975d9699dc82515a80e192295e75898acb5
-DIST thunderbird-115.14.0-pa-IN.xpi 685637 BLAKE2B 518d15e64b5f9d246e1589f860d9b4f85a373876200f8f49964c304dd7d5a5ca19344f37cb190cfb7a8c9529d2741a7b7a8f55b3bf292f4071485dfa091ae598 SHA512 728d23c27bb03fcda6c60f83623ac7e66b4e7788767d657def85e976b5eb578a0b0a03df5baa4688e39db4c9d7fe0c57dd7bb1a4baff44c8c5776071d393125b
-DIST thunderbird-115.14.0-pl.xpi 752372 BLAKE2B cb38798a81dc8dde89078d83da3414c8da71c3e873501f5e82165b6960d0bf6c8b22efa2a99c3403e009e233bc1fdc1cf5263c2b26ea86c2f2e05025d8ee28c5 SHA512 623643cb84760e98a8265b617ac709d03c8e301f34837256b8c4a06e1a918656b1a90052d97b67e2a3ba23e0e499e8fc3285cdd558edb4b3e0ad0429f699cde3
-DIST thunderbird-115.14.0-pt-BR.xpi 741445 BLAKE2B a32a05e2acb157fdb9ece51b54d897b0fa052f1c40466f7e3e011b84091b069685ac5e636b55d770eb96837f0893f1326bbc111a758084079c0d80e9469d42d3 SHA512 7419835e5a02afa24780de1300f606fc2cb4c4872423f5a91ddbdfe6c2731f962adb769869f4e02381d5593bbf3683168eff562b6a2ab781a41a90ac535d6d23
-DIST thunderbird-115.14.0-pt-PT.xpi 731564 BLAKE2B 48d012e05d6da33fc52f961b3475edc1e740f356dc1f8aa4bd03436be18bb38ef285076ea1aa859b7e02d091ec0fbb54f76ae1ecbd8f18cb8d755d3314261168 SHA512 18aeb54f46a35e9644bccf6035cfdad6e0448674f38c934857c9184f75ede1e74130e3bab3017b22d286d129680849622cc11a049859a1d14d7df8bf3e62ac8d
-DIST thunderbird-115.14.0-rm.xpi 736852 BLAKE2B 54fa4c46b9d4c5874a964d9bc2a3d306320da797f202dc7ac33301936944c4457e9a82e479a15a246f3d665ab308ae5d5908f4010e6c30716560e7e68900ef31 SHA512 8b72e0772f1c7c4aa00fcd760bc04a3dae69335769d54e9368262fbded96ebf7308a671e46cbb6e921a043d6e297aa77a4510553fd5844f9ad742808b964a476
-DIST thunderbird-115.14.0-ro.xpi 661932 BLAKE2B bcaf398fe58aa77b26486c5a7ac62ec1c16d7edd35c0a173c47e0bccb189e7fff5cc1713862974181cd0acc722d6d24cdf48321db012e2df677aee1470690198 SHA512 f02addfac0f7e11c43b2f43e15d20f5e877c5300be6a5c23ae9d450096f064ebf597319228f81c7d5c6f598805050aff0431025600874e07a8b512e88fd3d083
-DIST thunderbird-115.14.0-ru.xpi 860677 BLAKE2B 279f64a91f2dcc2e793e05a2b493538ce7f549d4f64fa151af7b8c8eeb48ddcda7bf4b50bcb856c3d45622c1fcc34745ab9e2ecf5054f63bb3bc26951efabf4f SHA512 f94a708b8c08c416ee1e39207c32fff7c27749bd9025faa576a72493025786495851557251feccfa67fffbfd4a8cfeefaf25fc8a87c295af7be68b1d37d1e272
-DIST thunderbird-115.14.0-sk.xpi 772207 BLAKE2B 543a90f8dac0de1927764e3cf928b20d673c29c9669e39fbdd08b48c9586a211031891b7399fdf898d82624842f0c97364d1cf56d3420bb3ab71ea642a504a73 SHA512 f109e8d65417dbd3b0d8f5f37d1c5938d37a09f0387ecd75a690b88d365c56e231ff045010e0d6bfa1ec2c26898fd63a0577d207f837475df558746c46031646
-DIST thunderbird-115.14.0-sl.xpi 732187 BLAKE2B f7e8b441450acefd3fdcda9af3ca3dac97b98e5fa254c5a12c60c4ad61eca060007538f0046ae473d772de2f4bc5a0a53594522ea8bbf2b41d60997d6fd6027e SHA512 c9acc7a1ad4cb54868b0a66c0cf2cd6a3460acd6caee3c33331d0cd1894fe9142f1d5c3238c2b481bd80a390dc95d2c8feb513a2457ac86e28910d8ac968a4db
-DIST thunderbird-115.14.0-sq.xpi 754807 BLAKE2B d4cfd7bf239eda2bfd0d6bf408c7079d088ad0b948e2462f44d9427956d41da7931bfd03ca3757958cfca1c8d77a6aa425ec191751b05989f4f6f855c98f3805 SHA512 15bff4ec3b1bf8045a77cb7c5df6b07c8f0a4cf559490db126218b591e691fcc7cb26b3407ef16518d05609728bfa88f129f6df151133fb9e56fcb14d616bc4f
-DIST thunderbird-115.14.0-sr.xpi 757576 BLAKE2B 85c9e5e487b441f2a5fa04b4f8a1989fb3f984dce1e5333cf4d092329f6698a43946abd1d51d34727f51c87922ce8d34d01d1a2cafb3f316c6df7285b7c76a18 SHA512 10166e70d170ca698d4354b2a60d3ce962281e6e41f12e713d18da269562571ce069b8464fc91777ff8c9c2674b1581d58edc36e80b6bc242d455e177f43207e
-DIST thunderbird-115.14.0-sv-SE.xpi 736927 BLAKE2B bbf5e98eb26428721e86083f30929530fbbdbc1aeb05c73f7f0663ad3f6348993bf1294876769a321a4c27ed23a1fe5f9a3ddf381d45baf7ced0487e2c73981e SHA512 0c3c68ff09a02c01fe05d5e03598b551a91f025ba1366cecd443d6c54995a0334a89d746844698e6e1155a5acc1a857e6b5b3068c23f127047a72b29110955f1
-DIST thunderbird-115.14.0-th.xpi 806119 BLAKE2B 894e81d18f2094c8fcda79661e26d776e2de90ccdf73b739b8a0258f82400d4c487453904fe41fe94963181298b2b1c81d08dd7fdfe1e393163ab619d15256ea SHA512 911034e20151a17e787bc582668bc80323ff72503c0b905e4817a369f05dddf3f0c008e17193f415ae3625339265011f944a9002a1119a89205460a74834c0a4
-DIST thunderbird-115.14.0-tr.xpi 746840 BLAKE2B 95f03bebe20160e15d0a1abac5479ec464756f44063356a5ad9e9f58a3c0c43822b9afcccc245cbfdc4b7ad2232a71b936ea03ff15834c33f80588625c062528 SHA512 e5e656302cff207b53de54d7d090917193286c08ab584755ae3a7942a21beaddd24c02fa449640bf70f3fa2d5a0aeb3e2e8bbecf0d636c1355b4b38d0ab8f826
-DIST thunderbird-115.14.0-uk.xpi 847221 BLAKE2B 5f9578bf44a4788f2081057c2544e618a7924d3b659edfecb03e81b91bd5e8082eda8191cd0d8de211351104e898bd0ea71d5082b1a0719ce7459ca446414ac7 SHA512 ecc0e849166198def15a50aac46855be61acb65fbc63e74eb102293ce62e1320475b6700195feba835846130d597a9301455c4b77ed06a3396b5943be5a1590f
-DIST thunderbird-115.14.0-uz.xpi 588606 BLAKE2B 1c57e1fc57df04460d5d307e3e3eb27a3d5d8d7c5ace9ff4556e5d0e7549dd547154eeb05a1f3c07b9a2de36226280a43f1414f2105a5e75c137cd0063179524 SHA512 f05bc3ca4e77a72909c14024fb801b67eb928ca0ea6dc7b8cc6a318e08ac6636f1e24d4584ef40d7f34cf012833f627479cef2abf730dbcdcb0b835375e40f60
-DIST thunderbird-115.14.0-vi.xpi 774809 BLAKE2B fc16ca251941ed6e89b5cbbf8c5fea6187e00cdf6d30490a6d98088ffa845582c384611ddae3c042c3ecf71b43a91105b26e8433b287ae8c413864c21ca22b4d SHA512 536370b0615b373ee266bf39f434ee5ebec15d535e366fae99a68a2cc7ad75bd44f5abe41af7310b1d5e2e0762e783e4bb88fdd2c9de66f46ccab9c1e87f698e
-DIST thunderbird-115.14.0-zh-CN.xpi 775075 BLAKE2B 08be1a16a498404b503c7ea084c585a2c4f99c755b233a8cd3f8c384ce6b4c7768f0f6b03ab77e4688d2241c07f413decaca6b7a38f8113161e2c1303876a5ec SHA512 eb4e1894f408b7d90982a447183c3dbd702c654950c772c3adf6ac90be23655e6d6426210542de70682ba70797c247e6271bc7867fe2a8dc04ba8a63ab0e94c0
-DIST thunderbird-115.14.0-zh-TW.xpi 778882 BLAKE2B 1c17c1d70f42ad4a38497846fdb6296816f5f5bd782aed05ef090b2913170a796e1a54184ac566c3c278ab821dfc9379337f39a1c31f4f98e80833bcbea99189 SHA512 661acf4f1eeb803eabb4c5b8f9cfbbb6bd71eb456860fe23debf0de889d204aba490d545334098c8fd302de29b6adb5f1a75c4bd96e3fbd13f3dceec358a15ad
-DIST thunderbird-128.1.0-af.xpi 530022 BLAKE2B 741b3613ff2d6478d241bc4a2498827f4ab3915ef8378ac60a360aedb90b761ce14142ea3e2126d56275c97d47744325d8b2085b40dcb174bb320d791b7c1b22 SHA512 80cf8a2a84d4334100af3c010497a3b3f6a1ecee0646193f1534dad84de96c6aa331a18172ecc4da7428b4c4881d0a46169ce8893b90845e680bb9eb5fd0e476
-DIST thunderbird-128.1.0-ar.xpi 679531 BLAKE2B 545379463b938a57ba4de7f08f3df356e0e7b74621542d74fc40a2da84d127fe00785561f7fec446a434bc29ec3ecb04965cde58eba684f52bc3d4f189f34139 SHA512 89bbb69670c0db83053c7bdbc6ef8590c01805b487f8cb40d5139e2973aacce9e8277d20a779ba372dd29453f7717bd7cc27640873d56961b9d3321d1ad7970c
-DIST thunderbird-128.1.0-ast.xpi 560727 BLAKE2B 75de626cbe945a7e1d86aa1a5ba7ede2009f9c437ce46d605b159a6e84e84d600215f537c94e28e825b82ae237d55fbe3afa1e60316859a4ee55e572adbf69d6 SHA512 db71edb6381fafb026dd28dc48ee3e9ace6f714bc1063ac75a283bf42b545e61547ce8f52f6427d656a3533b6d250122ae3ae21e856f96a61fa1539d0fc3d0b8
-DIST thunderbird-128.1.0-be.xpi 753111 BLAKE2B 88b2bc8ade7a1d8d574a74aa01878d9d68d87fdfe2d6e7731385d2fefc8069216241d64b5a2f428cb35b0c4663009a189de75c1db3a64c61a1a21bbdcde23c3e SHA512 de601393fe9dd025f90dfd1c68322de980d1f58faceeb62045d5c0827cb54762e0c57cd23c5ad93fd8ee28e27af45207d4aa62634d8649552dbf695a667c6ea4
-DIST thunderbird-128.1.0-bg.xpi 801171 BLAKE2B 9b3effa6fa89ff74254d0aba69dc4693cd547e6996f9f6aecfd04d674fcc052b75452b705e80489287ca6e77b92c51f209e7f75465b284dbf95fa745add97ea9 SHA512 88a1f22031c0316fa232dca37f34eeac7b7dce3303242d162dc84cc4c7058effedcdbbaca734b1ab24f6c9063633f3a22f8d91f6760be2b989b029590665e7c9
-DIST thunderbird-128.1.0-br.xpi 652151 BLAKE2B 789ebfc62fd67a381b1f6976297aeef3ebb8630f131e2051966196b6e1ea62741759f7296ade922b955b0f721658f789f8f006de905c6ba33289504e4748a063 SHA512 a9353b859352afab77672f6a8bf86039b0a1bd359ba96af9a8b326fd68bc8cfc48f49c72ef194abbd38c7cfd958c1f74baec3e599ff197c66b0342c55db11e2f
-DIST thunderbird-128.1.0-ca.xpi 705576 BLAKE2B cc72e3947fc56f629e9f5984583bd1e736b7bca43ef0771f27e9819051d99a06b04afd485fb7694cc37e677408283096a8a0295be96fd499c7f0430e3cd602f9 SHA512 ef097962863c30a170dd7ec02d0a18cca00486b4a1b6714ab980d5b94db58433eda69264c7f49f0dab374ba37f0c74df7ee906063f56bf6e019d2576e3f38573
-DIST thunderbird-128.1.0-cak.xpi 671376 BLAKE2B b41e5eee2d63b109f9331a387fc22fbb9419d274aa0285d8e2224d6bcd7e3ed8c38bd540f98bc7c5558ac64eb666808f14ed2f3a516b87c4fb50d2a2ec1536a8 SHA512 b8fbca65e72463cd7cbebf1f47da68f05cb9e569095411d53dfec3796a41fd69931fca0c4f11493bac8b3a32da038d70a1dc2cebb8f4fa887da827921d0703d1
-DIST thunderbird-128.1.0-cs.xpi 782522 BLAKE2B 239f950bbd3066386f342b77ee901687449484fa7531aba93e362bbd2f20ff40720e01bfdc0275e84def2a601cac189b2d9f0f0e0f407c4a83b64525d210148c SHA512 f140695d1bdc41d603a9956882f145090d010fb5095f564ae3230adff459078a7af5188f22b1aebcd825d3915aca82427758943d780ab836234c6e34f1c8df54
-DIST thunderbird-128.1.0-cy.xpi 745833 BLAKE2B 55ac15a092b5f0c164e3a05095f5d15eed031e8d80f41fad095afcbbd9d64305f635e2b76d7e00ff0459c77f73fa470b4a6991836790d97daf37c012560c9294 SHA512 58ebe45f66707a103bde71e5f68924d6996171792cacf509eb5ed7df75348bd2a67c91851dd114255f4a7acee987193c2ad4630d70f71d72c52c1b77f4d05000
-DIST thunderbird-128.1.0-da.xpi 732247 BLAKE2B efdbd51962ed398e4ce42ebe86930e7879954db017c90be1069e38b8912198fee01281cca3d5d3a6030c7596ee94ad84732656d2f93a203ff7ea911a7b130259 SHA512 663b9de656b8a5cd932c4606f1ecfc8e9a6f4c60ee9b800cfebeb13f3cdf5449c43e1a5ae6d414707a030cf9459ee3bb1c3058e972696d62ed6d5c454c183c76
-DIST thunderbird-128.1.0-de.xpi 762888 BLAKE2B 647b7354b84a3993528fabe11d1f4176fa3aaa8291c4db2dea99835fcbfba0913a762c4f1d4dfeb69257a53aae904130b153d73b6e7bed6376bdb4c27687e7a1 SHA512 1969c34613ef05aa971091228b520bd88bf88eca384837e70fd72da0da303fff9d7c80cf9d045d70586c55c14a7d99346f7ad1ef91b69410ce39cf091e4b6375
-DIST thunderbird-128.1.0-dsb.xpi 780506 BLAKE2B 0dd77da83926596cbf89cf04077bdf995e9d4248dd9ba98c0c855fa212b71f8e3c2edf3bc60bc1c4cbbec128f7db147cfbf8fb377f57e3991e53a0b481323df4 SHA512 bb6db78cdaf66fef0532c9c9fa7a1fc8c34e7e19a8ff1e1942db1831f93c1f863faa05ec113289f27fe12ab7b98d3c46ebb1c91b64ccedca714803e0867d62bf
-DIST thunderbird-128.1.0-el.xpi 886608 BLAKE2B ed2df796edb70163eeb857d26b4ed09ec7d44313ad1c14b81e829343584b090f0cae50f83036c7501790595b72f2a24489f631ad621c9918f9484286fd08bb66 SHA512 651b25c8f908b8520fd130eeb9d48d9880238651d6f0cacc253cbc250714fa38b5ecbc1705dcdca37263a47b541f18f6afc9bf3956f93e1f4156a875e949b839
-DIST thunderbird-128.1.0-en-CA.xpi 699938 BLAKE2B 019b3400e29b99ad4d5848500e39581d821f1ebaa72bc2d340836fd72e905cf98386ec2d4d246b065030129ff5b133532702100e28b9c0b3fd17ad2aa855939a SHA512 1211b880e145c6dd69420ef2567be1718fb8c552b0d089d85f0211ff90d42668b496126d995d10968555ade4b12bdd37a3ef16b2cc05f4cb6d12e824bf33ac08
-DIST thunderbird-128.1.0-en-GB.xpi 700682 BLAKE2B 96d0edba40137df8ab178971094929716f65db41da784c169ffb767a2b3d9bd4ec2276f4daaca5ed2fff66af682befdce1c999caaa320fea339f3979f3805a06 SHA512 0f082ae1190fb1895a62ddd76b61bb51c23115cf502524e53369708a2266887b38cd4cf5e26a9d8e56408b2e1d3137f8400da96657c7bc75d3876c68c8c8e7d6
-DIST thunderbird-128.1.0-es-AR.xpi 756125 BLAKE2B c7d47ef5f296615993f4909cec468b890bcd4728a158cb808e4a34f1de469b89f5eda0ab2226494b2a21f9d388b22a9bb5528e59a07f01bc18999449f39d923d SHA512 38068599297aabf59ee3e66974c0110ac041e9eb7489cbc77bbc49e2270116e4517e462385f84af565a88a8061a951c111e70df37b87f60997dc4e4db2cb8b48
-DIST thunderbird-128.1.0-es-ES.xpi 723184 BLAKE2B 16102bd98d4c844891dcc5413515ce2213b4e84904e7782a410ad5f659a3811adc846cf6c83b3a0609da0c84f650246b6bd13ce71bc3fe54f9fa89c1b9299242 SHA512 c934b372074834f6e431349b6caa475d9d0bbd965cc2bca0b61f9515eeed4b061a4e03bdff9d2a022d0a544f5e7420e240f940581ba2b5d71a60415c2dacda2e
-DIST thunderbird-128.1.0-es-MX.xpi 734908 BLAKE2B 8d14d27cb899177aa7686097082f272200ba0752d8d647d95d0522de1a13afcb664771595a6e7c717c7e4095fcd0db9cd9e7f3f54f75ed89e0da8cb82ac02347 SHA512 408ff492308efd61c45d1795927121afb55a3ce67952fa085712e0431f7907dba2c5ae9650252ebc7cb03665622a5629465a5412e00de55376c4b19ee8afe9c3
-DIST thunderbird-128.1.0-et.xpi 695961 BLAKE2B 9b7b37dab2d68ece3f37e2b02df025baaea3a5b50b4d12e95c1e6e78d4266bbf8df9b3b68b126774283d96ac5096271e3ad3cce73349602a713846fff7174548 SHA512 f5b6b548700060e1d15f4c82dd0ca7d1d0a49570ce2e151ed2b58e5983075b22151fd0a8343c18f386af34832b0ae773c1391a2078e8226ee4a086ba4685f3f8
-DIST thunderbird-128.1.0-eu.xpi 726476 BLAKE2B 2b902b56287e89d84ffd0d9fd1a6e63b2907efb1d3601a02e1a017ca604601a10617264d7e3ad91c70fa9bbf1f47ffd8a08bef9fbbc942e713c59dad8ce4d8a6 SHA512 79c3dc77cde882d5016a3823516f9834016da4710e4c51757dde40eab2c2d284a78e6f1c5bfba1c61e7506471fbbc42834ccedf4c0fc50e5cd3df22e0fc6f304
-DIST thunderbird-128.1.0-fi.xpi 731185 BLAKE2B 7ff004ad0ecd9e42aca3e1c3281332d385f206360f3e1b5f5ed46e535c84c7924ebbd3450370421b24358026cc645419d46d72829ecee499b9f14d1c1a7f34c4 SHA512 931fea98c00934167e4cac512f7f7673768c9d27aca8a759a9fb2bc17984ccdca9549b889ea567fcd09a806b4e607581c734fe7a3926f87d01b5f60da63b76f4
-DIST thunderbird-128.1.0-fr.xpi 768595 BLAKE2B 1acad47d0a7f4d774413549fcb2ea4b1d136b66b04832ae72634cc65a090ce7f3b46d27d2b4bd788f3ee82bf4b8e14d0d1b69f5939f082cc48711dec3ccd11ea SHA512 640823d3af3a9f5ff9b511f7bd0d4b932608fa7adb7cdc2123585a88f2b97bf6910d1c92e212985b9d95a59e2f146cf6027680eb46ff6ad7ec772f9c4788825e
-DIST thunderbird-128.1.0-fy-NL.xpi 750667 BLAKE2B ffc6d83cdd6478797e8e2ac5014b6e1ed2092547ab50fa7fd1892babfc4e13943a876d7a5c29d38e5f102d81805ca4a2cb436b20e005c45ce1621b7967e621c8 SHA512 763220818b743754aa3133fe767445c157851781bba8c64f76a8e4f4010862c205db9a7ce0e270ff4173b9c2085139c866bc4ddab593ec4a0ff79794946aad0b
-DIST thunderbird-128.1.0-ga-IE.xpi 614867 BLAKE2B 49eacb60fa3357ceab9175a404259d075bafc4e879b6019e0f25be042af547075376d67ef164b9af6bebd5c594d71b47a81900d0a5f887ad31e51c90860c319d SHA512 1ccf7ca908214e68b3a0af21103e693736132a1d6d47ea2e1f91f4a85ff464a40586d4421169c8e8029b8f4ac2950639fa59da57a97e774f79af4095a2a43537
-DIST thunderbird-128.1.0-gd.xpi 727476 BLAKE2B 218e29cbe07a10820bb96a279201a039b4d7add4f74b32868901c422cc5b9b0aca5cd0c3ae38ce5db3b23ed90ebb356a1f4acc8438e43c46ba43e63e0c995df9 SHA512 694d160559e1dbc2748d80ff4178d9bc85a2be213f7e8f735d5e9b055ed4d5303c345ea83094ece31d9791badba02b7cd66ce5b96d6bbb918504680eb40c4ed6
-DIST thunderbird-128.1.0-gl.xpi 736247 BLAKE2B 666685a452fe7f333006d14d3338ef5cc92bb02b571e5d835838683f21effbbd9ade4f8de4457da87613609e69677ffc0de3a5a6b9838c82a847db35e965a01c SHA512 0ada5653c2a3597fcb85af960eff1e5b03eda8b5c139d6859868bb7b0145f4690e5fe315015310a9ddd2ace4d7fa5b8812b60cdeb01b7cfff360127c3e134662
-DIST thunderbird-128.1.0-he.xpi 698228 BLAKE2B 1b50328e818c415c656a83968a0f80e54d31953eb019c4342c58f53af8a0a121c0a601409751e8f072378df55ed3d31706431523624ebe99a849d9ff4b5e9a21 SHA512 19b234ebfedaa5f777c376aa497e543ff7efb8be828f3a669775e0ac8fa97e111de2783685efe7084b83a1a927ad6491fe84838d9d7cded209739e7e82cc1bf3
-DIST thunderbird-128.1.0-hr.xpi 700181 BLAKE2B d5890ef09a657a52daad8e906dccb989f89dd339cc9c2cb8fa563e14dbdfe1e8a1a52ab33e56cf1d10a1e05abda3521d988ef4eac24a28bf81b0bd2915b2027a SHA512 23848ef1c8f6858ccf5c9a626688a1dd182926309922bdf7525ea64f6851deb941897c9f922758318e8b142e277802bdbe256d0328825bdeec8b0a382c58754b
-DIST thunderbird-128.1.0-hsb.xpi 778026 BLAKE2B 5c227fd77f5cdd8052ebfd860be6aa9bb921f77a931d5fc7e3a95d8804a2e65ab5bcccf4a057eb65696dfc2762b0d07687cafdc8567bf615e47589a666eaf31a SHA512 7e94917addc059e475a8e9d8bd9ee5b21e51691cf174d2983a8423c1a536d238152075221b4b151c9e7cd013d24a454c077bb71956a431865c2fb47a09d191c1
-DIST thunderbird-128.1.0-hu.xpi 779499 BLAKE2B dae1c2e5fe4a3b458a06f9f83b73ee93197ddf40d762657bdf4e825d44df76ffdd5490982dd9aeb21e0e05e1ce4ea7f9eb8a2e49a058177310e1811cd445d9b4 SHA512 0cdec779a18fd00d756f08966d28b8d248c3b11bf609c465519a2945ff57bb090d4e375d415e66971c74be6bb0ef1cb6d2ee95fb9953135da411ba639dbadbd5
-DIST thunderbird-128.1.0-id.xpi 665685 BLAKE2B d1bbb000a660e2b631c4df4a0e3f6acc093a37ffbd478c5bc8f2958a760b4676f2b9f080af8ed1304afe6165e46e3d4a44103bdb39507d3cc70bcc79a1a98015 SHA512 5c71cfa4cf251cc6119aa6cdb73e8fa44150e4bb0d92019e0d7a7574ca1d7b1590f9537658c02db37db39879475790693cae39f30e213266db4fa230cc83564b
-DIST thunderbird-128.1.0-is.xpi 742829 BLAKE2B 32b1d6d366e68900e79a96e411f07484179c8f372c337ed686b10e03f16ac38e115b5779b284dfc870ba5083476188a9a1667440f6beb4d2c50b83c47a556129 SHA512 f11e92712276dd60a89b925333d5f7c67436bfd484caf7ad0d7d686550dc3029f1ed54e78b8b3c10f16fe7e373c6fcbab33c568e28ae90c6642fc0f69a1d72b0
-DIST thunderbird-128.1.0-it.xpi 687789 BLAKE2B c0c2af40fcefa52bba67a72250e8e6a5458bda21132d1d8173578a5da90cf2b406c027e6fb81a407a7b6a5d0302d22008a0d5b35c426fd42853c1b713d2847a9 SHA512 7fb281de4bc7758ae2e23cd9e4dfe4b4d2c7bdbde9af8300260e66af7bae01ca08e175de707601d50faf5ec0ae1e8e86c70820346a69f7cd758b139a93aebf9d
-DIST thunderbird-128.1.0-ja.xpi 818059 BLAKE2B dbf2a499d6f72fc856a352cf7501f8b5bc86c1c81d5a7fd078f00eb33e0ef52e352673dd09165912a3fb1105fe0ef603e61c58018bc043c860544fb703de2cfc SHA512 29b94518eaf999128353a7300d91a93e47bd2fa1205d4f2284fe6d5bdb31464ca02abc154945c2be94129b73cae6961e1836ad566397bdc361b17970c1a7e151
-DIST thunderbird-128.1.0-ka.xpi 795720 BLAKE2B 97d00c3840046404b123bce0c83a1a610a13c306453fd9b271a1c9daeaed5538a75ffa914a4184de4e98ef111ec27e01525b428433711ab84396232e60dc1eac SHA512 61f13f9ac01b413f6188a3e6ddb16e9a1ed3e54cd9a469aa03611bf5062415c47652072c29c5553e18d0cc32c6efd935b4480089ad2fd0e4b44a71215f073064
-DIST thunderbird-128.1.0-kab.xpi 731531 BLAKE2B 0e366862f2e0e32952b655a736b3c3049102ab01fe7e2132131a4852af3a36f68797aca2c802db831caf23beafbc8071b45fa51f2c6f63283b21607d19d01237 SHA512 3012446290bca68eb9f66b2cf0bc14bdabe6ac7dde5c8e24938996813063f141831f24f053d22b30cd93e0aab2d13ebc6d400ad8d4aa1f4ee78c03ffb2067cce
-DIST thunderbird-128.1.0-kk.xpi 854777 BLAKE2B 53804b73786a7af6981c78107c7910c9819fb4446bbd6ac7c7804c72f8d40f5b8786d6fe3f7b9483d8d127ac8458054c3d521557eab89da5bcd9ba824c60038a SHA512 d6ada776f7fbed2a31e3bd7cde6be0ccc8b174812ae9cd9fb9dffedc3f918dfcc49447384ff5e84fce8503f7069e66f05cefba9cd3f7f73334849d7318563608
-DIST thunderbird-128.1.0-ko.xpi 753028 BLAKE2B b3d938e06da60374d8c27068259a7ae1dabaedbf82f2491450c6aeebfbc16553f424669ffc9963bfb51717ef62428b5d00e8d4e91cd6252333e19b56f58e8f13 SHA512 1bb6c218a9cc35d0520a14523e74bbb1ca97d318826e655110d44b74be15fccf94016a4549401e8cdd3bb33daf9ebe9dfc313ab13d71e28c3baef511244140fb
-DIST thunderbird-128.1.0-lt.xpi 700593 BLAKE2B e1da4886611face5e07837328aeb47898c4d579d07278fc161fe9c1c7c9c5027d8e6f062262f5dac7cc359ca51fc8f7fd5f871bf1d4c14b2bc09a8a6c8a9d827 SHA512 cea2b8762514d45517dae62c7a08c5e5a04ed4389c41181294942751a082ae307200d9973c5e04e92c4aa2d203da13df17bc75333ba63994f25fc9cd3f0d3602
-DIST thunderbird-128.1.0-lv.xpi 621076 BLAKE2B 8086c6a47c6b7d637c6763fde202e954e618bab8674e2cd39048e87ff2b1a97980af12fa87406adb32052b0e4bb284ab6693f5193dab01831056540c6c11964b SHA512 4872321fdaf659df69f7f5eded5e19744e9a30e3862282e421a65f2ac028c2fb1ea6588d8f7495176553e59f28b6199f2d0b52ad58076c76d732de5ffe3dc65f
-DIST thunderbird-128.1.0-ms.xpi 580756 BLAKE2B 21005051c69b20b89885b8229ca6ad35fb141a913455c4531bfcdee07775831b2b6f03c77ad9ba46ec1c13cd815556b7ee88ba863e249377078f47432dd18af7 SHA512 4f2d4be2a2322d887c6bc0e5aa0ec93f53be584911a9500fee0be370fee3d27d38154418a150c0862c06b31a29cce53659a607100fed61b6c40e837c29e84757
-DIST thunderbird-128.1.0-nb-NO.xpi 702089 BLAKE2B b059b699c82f204c9d1ae64da8f64e994175cdf71ffce1d0c3c0df7fc60e57b3a27a540ebb5f8d79302df77bd90cb790bf260f360a721ce4f87cce4d16edac2e SHA512 843e8e80219937453e02770b49d719c541e85b96d41c8006bace0835b32d641030eea9f164091059712f5f34c9cfff39fb7e22a4cef2604c83c056b33bba71dc
-DIST thunderbird-128.1.0-nl.xpi 741945 BLAKE2B dd6fd487d889b5cf8de5e71bfcfac2f96618b7a31f40fc9339a803ea5f77a47092c3589a03182220aa520b22b962952d8ed18ec041a58e4e13a0ae25636e7e09 SHA512 122438cc88862b51a09b12b6a06498ba55c62c6e42732bcd9d7a091d47394f5b51640ae0bf624a61c1a16cee0bdcb30cd73b209ba9d0e9248b29b1e606127914
-DIST thunderbird-128.1.0-nn-NO.xpi 721389 BLAKE2B b8fe95b284ff3cf3144638d6ae321485ece49d3d9f1a9e2997431ba78da06302055d63848be12a91e357cc7e93fb20873c955b85d9ac4830291246451097e840 SHA512 22992ab7d7cb8475bd19c979dd7ae783517178430d6640e6908971dfa58d3865aa4bbcedf4771f598088f38106bc7fd07dd90c9e804fa8764d1d72a66c309fd4
-DIST thunderbird-128.1.0-pa-IN.xpi 681221 BLAKE2B ca892e4e3bb05b9fa715b674c45247078737d5e0c26086ac3277dab9ca16d5627eeb8ef97c5e8e9df7809019b9c45fc8fb4e0550283695c9bb658cd6f3b408f7 SHA512 90f71eb7593aa118b332dcd6ccc7fe429656d7b4d99934151e1780a80b1e091e5bb8590e9d27ed402d40afa8230fd86f18b6c968d456bb4a1c2f7331555fbdc1
-DIST thunderbird-128.1.0-pl.xpi 760886 BLAKE2B 65f07d12c5c02b0aa6755f10aa094b2ef469dc22206e438923b362904f2b9f11d7ae80c8c543dbb1b0dcd20753d6a20827bdfb39bc3140c9b89f1f8e07e7be0c SHA512 2217f1184de0df3dc8a45cd29166afdb48c63ea9ce7a7d32b5e82051c165fa3e56fedacb2fffcc2bac180ba8d918eafa5470bbf7bc8f6135047b5c038c90fa12
-DIST thunderbird-128.1.0-pt-BR.xpi 749077 BLAKE2B 20305205b57dc8c9e11dacfe45efdd28337588467c9b9ce6c744fd23361db6bfad6d9201745c89290d54e7d360f98ae5e7b724ede296795fc6638217e7595215 SHA512 8cb8b95f11aa01abd83d15d282c8f1c380d56c58b78c42eeff6f95dd005eacdeb6882823022533b61d3a24f41bbb4f7c8ba89d12e9626da5a6af7f37baaf134b
-DIST thunderbird-128.1.0-pt-PT.xpi 744905 BLAKE2B 92554593128a9854943d0f71e9e21ba9c20b025af226db4c52de6d6047d55e1dc3393e7bf480e15f611c876ec630e34d29af11d0a6f196fdd5cc28721add0d2d SHA512 74709c3a1db8c1bf9ae1c856d82e96a56652ea7e0b0efa5cdd9d614e229947e71c71552f85c59040dc7b4bd147be9ee92cf5199d75b2ba855033951cc06aeec6
-DIST thunderbird-128.1.0-rm.xpi 746019 BLAKE2B 30ef13abbcd6a03e24e46f668457dbe88db572e5717ee8bb0a21dbf64beb8e4fcea74f7440a880d6a117117ab69894d8e11c14d9653cbd3f3b913a7bfe7ca3f4 SHA512 af0bbb84a7a64285cfb92b75d922135ccb05fc6ec31baa8009cf114c1bcdae1ba2262ce8686906003f8eefb30df452a15dd7bcc129a4ffc903a5d494b961f3fc
-DIST thunderbird-128.1.0-ro.xpi 669415 BLAKE2B e2661774cf4897573d15ae9278ae309a5dc2a15a45b2ae95064173cfa257846beacb9c2729ede9bb72b937dd3ef8244ab9ba24b8eee61dd4901737e5eca2006f SHA512 c177f4144d18be994bac066eaac21c3a3922dd35bd9f9e53028717d537e53e80fe86b753cb80e570415118fc47cbb8bc67e0688720994a6075f88f1a91ef1f68
-DIST thunderbird-128.1.0-ru.xpi 869727 BLAKE2B 5ebdb26c6fd70dd9f3caa5eb4e79b6999f656f61d37ffc8bcf695c7bdc6b91a97859741d2cae5737249b355b3105a6288563b02d6eee7e1f8bebfac8b6a8ace0 SHA512 cc58326e95a5f8f631aa208a8776674db4b10858d7013fbfe71923896228f191f7024d349fdd4b95c8da1e1b30fa7d526eba1cf8dad6c7775939918e1068ec3a
-DIST thunderbird-128.1.0-sk.xpi 781707 BLAKE2B 7656c087652f0973d350e2a819c7636888b0284ccdcf6ceff445a280e27819adac98f58f24b3c89c322d58af355b4409269fccd10e3e642e6e6ae4f88cc0600c SHA512 477be6f98276673a9080333641e694ed7f2db2a31aafcac4602c956320983f18684442174e5d38cecdddf9932e191e944a560bdf640aa00d4a5eca69f0f5523c
-DIST thunderbird-128.1.0-sl.xpi 742773 BLAKE2B 9cc95282384dfccfdd29e11c0d8daab8e8bbf6c5cda5cf203bd935a73cc057e654e62f5f0685b12a2ba5b6b3f9841f10a046130d5065045d04f81c427ba5e0d4 SHA512 88f08d50b2f0b5017224c5095baefab3ae53a7fb43aa8342467d6181831dbc6fb5954e2381b5ad77f95d4277697ee52d6870257740ce8a8862184df863054bd2
-DIST thunderbird-128.1.0-sq.xpi 765336 BLAKE2B c94623e026f5b3a9502cb58e331794c55905e127df1d8644eca558daa52846b7c9d2c44c66e823a49c172617d67142bdb44315c6e2f0b17132f7ebd97e17bc45 SHA512 ad175048442c9cc247e77b26b42086fc53aedca896c75eb100a68cd91726efa793a99d656c00a62e7018c077e8873c5aa9110326fdf9694a1e3be592be955386
-DIST thunderbird-128.1.0-sr.xpi 770680 BLAKE2B a79ae5298d0fff9cad921a6663972a17f6c14b5b1123faa70bfa79e1895bf66623f21677438a381203ee5ec0477b6028fe455565e414bd9adddab12dfaca167c SHA512 eea635139bff898ecb66fc1b6b21980da372c14c4b91c00623305d85b20dfc3c9e7bb71569e2ffb32f274fc1b690fc4de549df3a9039bdf816d3061301f99763
-DIST thunderbird-128.1.0-sv-SE.xpi 745369 BLAKE2B 4bb35909a2fc1b651ecfed309171e4bd73b29a75d28783ba75862ca397ba4f634bd7ca206632d081a26888dd12840f8bf4d1cd3d10cd83ea557c72ec2f2c1bc1 SHA512 16bff9bf69419b30071765e4a6b6a666e854d2042410a290bb3cf69e32c2d88293cc7330757b0ba2a6ba4f6553e0e7196bda9fecb2e3a4473c9c5f81d3078076
-DIST thunderbird-128.1.0-th.xpi 810985 BLAKE2B dbe0a6801df6d406327377f493f04ea8c62a135db98b71681d3edde1c01431b0b3848b1fd03db8de5a55d3619d9b02b0ed1748cda2e85d0d109f1eac2d643a98 SHA512 61cc4b9823cf7da275d2d1b2d8cdf013f85b2a507f22c94c395abec1f052f2483da449ae3b9cd3b1bdc1312f17d58c88204f6d0fbfa56121a279aa8b48675a16
-DIST thunderbird-128.1.0-tr.xpi 755927 BLAKE2B 29ddd5bd5979e79531612fe3704afa2f5443d22cd8bf79e0c125fac1316f53f1b46c61de99b6aa792059bfaf8313a04af72ce96905e46dc0d56ace6aeea704b3 SHA512 b205d12a9bba26eef874fc1dcb50411da93ce80e6afaab1ff5b26998218ae2c2224b7524757b87551633fcd73d07692efc5aa8bcfac65cee0575bc3a0d9e0d11
-DIST thunderbird-128.1.0-uk.xpi 855730 BLAKE2B ad8c4cc442b6a733a0cadcb1eefa52a36fa7b393a9a7daafa44563bba1aba5912c33c140f7899578d3cf7bcd10b6af1482953952ece3c84e74335a8c625b1adb SHA512 b1ed242e48cf50b9cc902508eaee367e6192fe7347ecbffb0740ea8482433cf67f77eb8ef3c7f50e079f0aafec0c0f60d118b71e18e69ed6416ce643b5c46ad1
-DIST thunderbird-128.1.0-uz.xpi 591808 BLAKE2B eec16355be449ee03382f1d0aceb13ae4eced62c1c26a4cdda38ff92fcdae537064b8b8bf56f84cca415bacefc64ce370cf2fc2ed64d7c420d6c2d65f6c09579 SHA512 f91c09250fbe29e6eb5271da72c6affbbcc1c0680616a5a6b4e175ab247157908307c6d85f200ae8afcea0bb2495d16f950045a393b668516d41c6ae32671125
-DIST thunderbird-128.1.0-vi.xpi 784659 BLAKE2B a5452b16ff2c77537db81fc43b06969706ea5bbc0dc9ef2815923936d86e36f69ebfffad039c44e8fd1ab1ee29fb7e088f08193a634af8a53c7e3efda54cd3f5 SHA512 25c8fc8b8428d49e1e5e97231c00e4c1a864a8883c6f96f74b74e07d09a8448b90289767a2968fe58636db30e92af8e8f874ff431b97562261f0a855d3e3cd3a
-DIST thunderbird-128.1.0-zh-CN.xpi 784195 BLAKE2B 8431470bf86b0ae14013c46fcf52335a1f18240a8c27d52f2d3b2532d6cde2d75ebefc1b25f8dce4cde0ee95d6d92229c57b6dd82551fcc31f5a557f4e3c48ca SHA512 fcc3247cd35392d05a2bb7c6274152a5724e8a96180c652c5978182f24ae19b63e99db9285687fdbaaf609bf03f2eb014891f218bdf6bc4721e4be86b6602af8
-DIST thunderbird-128.1.0-zh-TW.xpi 787478 BLAKE2B 808f24ea4c0be1ea3d66b1cc10c887b201563a2a0e011529d4ae4b2da63ed3d43a7c27016a989fab67ac819ad685c6c4089988946afa821ab85850d9843be49e SHA512 fac29119ac494ef69432a79328c507ab3e64a7e94efe504e5d9db24c01d6701616c90eaad2f446e1099f954a465f91eb408b82e7972bf7e99c4fba74d3612352
-DIST thunderbird-bin_i686-115.13.0.tar.bz2 83149428 BLAKE2B 328f5aad64b58267873280d04b8275f399b19a829c4fdb6d7daa2b78dc3f6c09c61dfc3b8b3ccc7ce2d77a839cae23adc46492ff53f1bad313ece8e8d66db43e SHA512 f1e9865d08620bd1dfdbddf5fd1660152a93f6c6cdd64eb5127b32dd77731b955191eaeed26523b38911ae6c244e6950ba855504542053de5a7a7d9c17dcdef3
-DIST thunderbird-bin_i686-115.14.0.tar.bz2 83136429 BLAKE2B fff57e1f9caf22597f3b885f1b0a31c68af0dbdd7184bb4f739d17c7080a688bcb23d29cacaeb093f76ce8614386c239fbce3c047472f82e149b62ee98bf1760 SHA512 04831eafba7a958f64a695967bbc95d7f9d8ad1e09a98e806f8779f3e4a55bc1fa43ea1a39801597002a812b7b5dd1fa7cb6dd26758a878488453bd60effe0ff
-DIST thunderbird-bin_i686-128.1.0.tar.bz2 89403791 BLAKE2B 12540eb0548211e2ea8c46bdf5383e55a68bf18a21220dd5d6f1fe5bd61dbe5b053ed5baa35edbdf7f5d232822fee823bb157177382d8af6698f34c6858f5f04 SHA512 a3619751f1b5e8c1f35c49ac6d22751b08f9468e359e1983d3006b08471f6413a611dc4859b3876ef374fb9ba9920e2499bb14a8ba88d2a364b4e039cafdc8e1
-DIST thunderbird-bin_x86_64-115.13.0.tar.bz2 80720623 BLAKE2B ad0af0535261bd9a657e0166a81ccce692598fa8962e428600f7fd5941e397acc161ecd432f128270cc9ce5677b0d188540b36a3700c44b9c210805b067dc6c9 SHA512 b52eb96dcc2e5dc8d9d125af102ee405138172cef61de780d35d83e77d28632808ef8e51ed232c5025aa39e64bb59d1a5e6bc9bb58ce78733443e6fa5eacc70d
-DIST thunderbird-bin_x86_64-115.14.0.tar.bz2 80695203 BLAKE2B 5bcc8db265176070d5a80f4ba237f1b25ff3d36b7591eb415cc2a4cdac28fa2c474970c0c1430e04e85c2398d9772f9f839634f6111afba9f77e7a3bcee74760 SHA512 4eb3da52ace5361bc3e57d242ecba13023f9064387f4b804d2208b969d09adfc9fbee5a047b09eff6adc93fc69f4b6f70716444803a4ec403058cfcc720ff49b
-DIST thunderbird-bin_x86_64-128.1.0.tar.bz2 86969550 BLAKE2B 10305032a0af853468d65bff4aa2d942548356bef2ff80f92692ebf21e191ad3cc7f386e43bcff13cedee0300f3790552720bdc67bffa5a0d18793156edb01e6 SHA512 f1849d6ae306980c2bec3102007151af1dbca625489fc29c7f2c397d178eff4a0647707106285f1cf7b498d4ff6662dce097d1fbbd58da4fddbcd97902f15244
+DIST thunderbird-115.15.0-af.xpi 553548 BLAKE2B 62e9e3904c8f89cbaa6a01f6734e09bd93f3dea42cea6b0e5ce793a1ed8dbdccf5d1e0d67d92f1e4de09661f14f8a6cc7481f1860e04a581635ee4984355928d SHA512 2496a41f4f18cf53d0607c81659aaa9c248e07ef0b2068e6fae888a76b4d15fe8eb8e1031b21f81b586886e004c19e3d18a7b2800a12f3d0986a2b0c33f61109
+DIST thunderbird-115.15.0-ar.xpi 706940 BLAKE2B 3bd58099f54219d62b24013f8ea920d03514f6e9589dc6d19696b7ef78fa4b703a12d83293583b9c8506055ed2f47593e1b8b4055dd3abb1bc5554f9a5f9bddb SHA512 9c1bb958ab1101457f91f6fb5e8d35c2d0e727c3f9be02829bb536f1fae959d8fafd1d88e592cb8962f19dbbd227061c3e610acd55b10da3b166e7386b4acca9
+DIST thunderbird-115.15.0-ast.xpi 583831 BLAKE2B 91f3eac2479eb1f789ed5707443425c2000ad7d69f2431c78f3b7733736825dffbe02eef1f0cc48886648fa5e22dbc84f275efba614b43340d1726ec4d3ef86b SHA512 bda904a4f4072e87799f6d5ec99094457275482ec622e9bc87e961e91566d6611c1a3522f6bb7f36387b515c114d6a8ef7a9d15f2a673e5fbe02678d91855c2f
+DIST thunderbird-115.15.0-be.xpi 787754 BLAKE2B 89ada2a5bbe21d67caa2dfcb0598a2ec1a1986b64d397eeeda69c84260cee80ed34d42ba25352404a5194a387f4568c76f5344db62a5fa6bb1457e929fb475ef SHA512 a368e0d276f4f18b2fa6e552a6536db4375d1673ffc24a0564e779f4a573a0df5e830d825ba4539486aadc374cddc3dbcb4794f42269921b08edc5dfeef457ef
+DIST thunderbird-115.15.0-bg.xpi 828487 BLAKE2B da7dc05893f27e8103eee568b0886dc9b99e95c5fa041baba722043b704c20b6550fe00628d2e33b3ebbc32bd99ede28ec2b3b3a8a88d9253100bc960d4bc319 SHA512 04c68c65c7466023689d362ed12fd9de1a64b56650622bc59fb108a2b9f20ea0fe8b5dadd04a4a6cce769daccb3da973bb266d851b03937958c95bb828e371da
+DIST thunderbird-115.15.0-br.xpi 677642 BLAKE2B dd8fa1be534833f6646dac0479628b2510a86334b6739967e8c3c9bd745047b9b7f351546538093188722b2a16bf0b4f6436b89326d799244676efffbdedfef1 SHA512 0b6e141d12df90805c9e9ada288afda8ee562e7cc7909e89f181effdf345717699208d82b0af93b9d057dc5329a7c75f612005aab288a3d4cf3eaebf49a0fa99
+DIST thunderbird-115.15.0-ca.xpi 732349 BLAKE2B c8c43c87bea904f5f95260167f360efdb2f3a05956c4bf023fa600b2b818479d2e1da683d144547b0f578c5c5f211cab199dfd3dace4b2261742729ba12e690d SHA512 dede551b1ce32df6c0e278ce0f611e24b8157d023699c24b18c0d4b08304a479a266c290a1838e9b3f51995480f2ab6c3941c18172877e37cdeae760c08e2151
+DIST thunderbird-115.15.0-cak.xpi 694684 BLAKE2B 47d526da3821602495b0540404dee1b23eec8ff5bacae283d00fbc0582ed51fb9b9ea400033c79c117bafc767fe3659dfb54846f067fdee644bed53eac01703e SHA512 6a632d77d7d50c4df06d64bcfd85fbf1ba7e367caf0f8da5441722079f47e4d429badf44ede6a1ef8011d180f2059f05424e8ad3220249c4fbb0eb31aa6b5493
+DIST thunderbird-115.15.0-cs.xpi 814276 BLAKE2B 54399b3c2a8c0b5c6f8df4c067712373fcfa7002083002504a3d18ad21e56c6d909544d3f9f65cb3172276e2e7a353cf60365915a382e4e546ef36cc1ed0235d SHA512 9d7a87727302c96404f6368e38b9af4267e7fc474943e5e00126c43d98e912d3e2ecc70f139b4ea47e489df4322b47ef36d67912f9b284d3571effc758ede07b
+DIST thunderbird-115.15.0-cy.xpi 776201 BLAKE2B a9eb65746714b5e1fa18a9063ba0c0a41c67a929c3c8be6c046acf1061648df4dc9db6f1f23cc5e0902168e35e01b9aa7d668a15fe49a923b42d7f55dda6325d SHA512 25d65bc1928729d7d73dc696e7cbb10dd2b1ef3ca2b9ec6cfd30cd8cee13bd417a2167797790b001d8816d493cc96726845e8031ce88374197402ca2dba27454
+DIST thunderbird-115.15.0-da.xpi 762858 BLAKE2B 5b66867366323a8f359c34414f20dbf3f8c45de0f331e2cda878de72e186847a964fbf186e297a0cbb9271567575f5541b0baa4149555460a587b327a3d8ecd3 SHA512 fbf6ffab75a1f05200be6e0c88b3ee5e84c595e2294a1b0ea37d8c80fea7b6e3d8b363db9cf07b26d7f24a84f1bdda46557836bc7ee2f8e8163a07bbf4ddc1f3
+DIST thunderbird-115.15.0-de.xpi 794013 BLAKE2B a1499b20f81b34f0fcaf70c60ee0869ccc86b4025a0aa70f908c903aeaeeed001562130cc66571831b1725f6bef897b0b5c2fed551d8869f264dc1c62b13f62f SHA512 d3757ef308e58c0e68772b7aa4a4452869268dace611b2702aae0c725b4cff0baf2573a0087e21bf8cbf26829669abe0afbdd37390cab5879efa4c798ca448f6
+DIST thunderbird-115.15.0-dsb.xpi 812883 BLAKE2B f9795b4fc72e8b670ceb980bc38a8a61adba0b1752d463273da62082f372feb4ae598dc05d38c43aae907840d3676835803e77ea64f18cb2771e110ea84a8762 SHA512 1801e5a70bf5afd1ab6be7f34a2734644f7dfe951cd80efbc4cfbc2025a1782c804cf7284b9b4f0847224667afd565a670dc306a539f841a84b08705a4108085
+DIST thunderbird-115.15.0-el.xpi 923744 BLAKE2B d97291dbe15cb78a3e68672573699339d080bd14b8621012d37613fc330602cd859d8ca0cd3509b278d88cd7c10d3adbd7d2c11e016b8c9552f7412d42aa6249 SHA512 12b41df0868a571a78b068eaa2f66e71c059df20a8dbfcb531df06f05f9385e19be86fc784fede52753d6f6292e8808010ac8e66587e30715c98e3d7077d2ee9
+DIST thunderbird-115.15.0-en-CA.xpi 728508 BLAKE2B cc4152bb9ce4179868124cfc9a4330c87ff82e494f330ff6b391b976ce01b6d74b831c589ee178478c9788ba4de1c449686cd5d6b169498a2d598c6b480ed850 SHA512 d9381df862baebfe08549e873c5feff9e779b6336fea3a6bc458057a0c45e8bf81f36c694b68b9767087e4f32b6cf3097ae7e0724e78b7af3160d5957a88c396
+DIST thunderbird-115.15.0-en-GB.xpi 729649 BLAKE2B fd08184f7dc96515a2ffd9be3b760971d163a81097a56c7ef835ff2be2f6ee417ce98e8eebdf92a23003c01f23e2b02249451f50085c7d6d24397d19a83f67bc SHA512 e2daf19989bfb7592e7ea3ca0f4e68608b06a5691ab5c38a2df55d3c8751252ed1820cef3b23764624c1e2a6c5eb15aa09b452e93ea0bb1561e633b411bca395
+DIST thunderbird-115.15.0-es-AR.xpi 787328 BLAKE2B c88ef73a576cfe7c70dc62b751cbd55f45e9a9f2ed65386fe2c7220eea78d5dacc0d9b3f26f445becd65b628fdadc6d077c2923de1877a0ab7083093dc294dc5 SHA512 ea65441024a299fc6a9487f77aaa02a6ad53d66840ba06e535a580c5048f7ed4ea27ddbd77724bd0bfc992085344bdde440a5fd048d946fe821301f669dcfb7a
+DIST thunderbird-115.15.0-es-ES.xpi 751242 BLAKE2B d257ae2832b9feb601baddd44f6efc54f69e7f40ffe2e64252b3bcfe53ab0be1bff49e28dfeb33d2ecf613d63c96712779f513ddc443d6a809c8cf1d47b1e2b7 SHA512 802126f07e178d5c38fb74f02fb77fc32895fd38d6b2525c08b90d5458ecafff03a80d7b468e08f3c42fd71cabfb353d79b92c4d51dee99fa18fdb53efb19512
+DIST thunderbird-115.15.0-es-MX.xpi 757498 BLAKE2B daece78669631a36e1235d08d4d23b148f389284bac985d634fc6c1d77ba69f97bbc243063026069487809a79f9d084ffa68a191341dc4ffa78fe3153174fe09 SHA512 9cc2d48a7af9c53c7450ed2fce2f6c3749d1dbdcb135303e7b4d233dae96490d3597ca65d5152192152dc8438c75865d112fe7b3581e6e1f4d7dec8d8d42f3a4
+DIST thunderbird-115.15.0-et.xpi 716734 BLAKE2B 3aa410ef782a893f09092a5ae6c259a6e9c26ffc98a729971f41134d0ffd9500a5c9179145933669314f7eaa08dad8602fef0b271873d9cb19a549d64a1cd5f9 SHA512 20a09a02768792e617540e88312fc675c086daf55a279d7f398b1ba3b7fbb678ff04e5bb90c9881554d3ec0d316ecac30ee2c29c052545955471636e54c0a01a
+DIST thunderbird-115.15.0-eu.xpi 750792 BLAKE2B c165efbdcd40ca4d2936c409a34b675815952ec6338b0a90a22e249706e9df6c1701bfad99b5b478b7ea3a2df325fe928dd1122613d407a9e80844b749319031 SHA512 b0c875dbf7bd312ce28cca2b7693ba07154209d0117c596f5b2984c639ff53391147e04f302d82a42a333a62206125f33ee04b471ae465333531971865111281
+DIST thunderbird-115.15.0-fi.xpi 760381 BLAKE2B a4744d25976e83453d0324df2c580195fb2c9e420b9e1116b115783b8373ea569a7bc3f33ed86669c7a4ba98b9f237000cc3e56bc96820285b79ca14a83ced31 SHA512 2632031a4db1832b30e78b8944ab2f2f6dc32d6d3df763ab22ef37ad7cd7d06baa1c4db16b18a5eac0436d5a38aff7fdc8027a3be6a22430d18d3c0041e4a439
+DIST thunderbird-115.15.0-fr.xpi 800563 BLAKE2B 67f05fcc018554e2596409e9fd532059deb097458fd3c6fa234dfa996fc4326c23ae3b6a211c51eee7292a163ac6c59cdb0f014626206f296c3133e934810c5c SHA512 788dd6d65879f5723db6fe4d5345e60be6083629cfb413c30198912c50e9c47727759fe439cd26c233b5efa510e62471d6122638f86c5827a7c0fa6da7bceecb
+DIST thunderbird-115.15.0-fy-NL.xpi 782017 BLAKE2B f6f6fb51e439f9358bf630aa7f6eeeeaf1d3ad2273eae270473badc3f7ba788ed0b3861924f8ccd1333bc861ec5796858286ba1b199af6f7e0b78a44e60fb2f3 SHA512 eeccb4f8fd248c400df6d83253d33e65123542917ea6c25a19d7c5c073f86cb27bb762d4f87db3ad8d15ff4d3a8656d1c549a9b16f3ad4de057d77ed701ef7eb
+DIST thunderbird-115.15.0-ga-IE.xpi 640765 BLAKE2B bfc70a6d2432c6bb716c24d6185d9de52aff8b3129d46fb5e248ac4d8231167be6c969153055eb147e65a626a501b625e9e2c2f2943833d3b875af00bd1b96fc SHA512 2e628b3f3a2ac64b8c089d9fe46f18e43d81710e831991884f19e33886b3f964a063a2be2537bcd66be9d9510f55d0e14d94eafd602999d0587351e9c43b9b68
+DIST thunderbird-115.15.0-gd.xpi 751210 BLAKE2B 82a71dd33f3a0075ee71fc35f28117ef66e45a6ee248867e99dd90f78f6bc557d6cd03564c76bc64e3af2d4e4f2de39187553639a93690ba2f31a6dfd3859d42 SHA512 ea8f8f477ea2a38c4b30484abc3cfa2e31b637830cf8b1c4ccda1dbe74d921e929ddbf1cdaa954814d5d5192b41770086d1ad71fb8243d5277399921a6df0554
+DIST thunderbird-115.15.0-gl.xpi 761600 BLAKE2B 54ee430dd05878fe3e58ace3ab55ec5000c28f0658301d9ba74320454b4b8e48017935b89c07b094586112a65a60a10e95c83ff106d09b575a9aa5d80e6d375c SHA512 172a39a2b3439438b60c0c439c9234f6cceffebab3cc5429ac1358ad036179fdde25c10d39f7360208df2127eed521505c56043a1740ae52c5381adee93cd324
+DIST thunderbird-115.15.0-he.xpi 724287 BLAKE2B 454140edbe87cc51ce54aa6c56ac7bbdbe11940f7586ad28408cb866948d0c4f659b948f5f475e48526da00ee598a5c2f3017b9500857b948b6926b241e3d83b SHA512 b504cf16c8b442091e309c394b9ac6ddde2f5eca6780df2bae7a8a5ad6e1551850525cbcc975ce6ee92d71490f10693f47da7414844e02969c9760c1aa24ac00
+DIST thunderbird-115.15.0-hr.xpi 723720 BLAKE2B 58ba0dbd29ca1ec950d8c7b03d59efb725462e8a069d86eae1a1a2b0431c3902e21065095ab5f3655dffeecfa2d17b1bc01c19a83243b3fc8fce739901978353 SHA512 b2073682142f979d6c524d2448ee59ae0c0071daed287ec5a8d6cd3e05d71018e432e37bfc392af2840cb8ae60f3e2bb693e12dd2fea6f8e794e377a0b0efc6e
+DIST thunderbird-115.15.0-hsb.xpi 810428 BLAKE2B d532e05091137f25bbe70f543da50007c2c1e2191b3b776c0085fd5f1b5de4ee381798ce2b629b487e95444b74261e39b60c8807e7bd3c7b7f9ad1842bd72d87 SHA512 f863fa7fb45cfd91ef465ee1d7d2c57be094712a6341ffe27da857bc3b48a33919c983cdeef05943ad066bc00f62485dc5ab308302e79e30efc7c187117cc07b
+DIST thunderbird-115.15.0-hu.xpi 812084 BLAKE2B 92b0827dacd1c2607649982456f084c81f7a7d52b2f0ca55ef624523bdbbc25deb7d66b09716afe5b5668ded69ebd5e2d07e0bf463d5976fc3e8d4c821947168 SHA512 920b6a4ef23880a46c469f2dd8b63517600aa1ded49169b3982574c16c8d61f1d2732310b46471780100ed6e3a1e87f0484a325f84ef053b971d9283efb25a23
+DIST thunderbird-115.15.0-id.xpi 689001 BLAKE2B 287bc728f652c87983b92bdcdbc8fdb484a96a46a4ecee4a1134863ff42748ff9ce9c9f6fef9de2d8175995ec975d1a25cf091e5507c117077d6bdcd1114fb49 SHA512 094c8d4eeaee440ff8f0022ed9371d348794df30e6000f6533a540404c65ada4382f1ed08be3cf07966398e506a0f2dcbc7db11940ac1ef40c553e12494edd5d
+DIST thunderbird-115.15.0-is.xpi 767724 BLAKE2B 88325eb0c14edf8339c7a65b844962b1314fd2031de657c9ddad9df1313051861275725e761bc03920b8efde75d7eb3df33b95acda96741814a1e5524fc8087f SHA512 3eff726fed4f98304da87cb19296e3ba15b8c98dbaba6b6c7b02b7769d1fa04a3826f725de78c67eee1f5847fa34607fec375b8283c82d028cb88aaf25c119a0
+DIST thunderbird-115.15.0-it.xpi 717903 BLAKE2B d769ba1b46cdd414dff918d04e52b077715606d77f3ef8b9b119e813a7227877f0622ba7b2d1afd1deb78d768f71c06b735ace258ff5b7e00691357d587b400e SHA512 3f1c9c1712d2ee0e18f5e41b79870480ebfd0ce8e6660c18448def04ab96342370e882e6f3fb1dab4804dad3f83f57ef9453a4491c1679cf95d3b15d734942d8
+DIST thunderbird-115.15.0-ja.xpi 849892 BLAKE2B a7b1d4c2910fc999b38ac2742fd71a53f06982903256298abaaac6a697afe8f46a63f78b9e3fa5036838bbbb7c5dbb9456ae315ebae965d4768f0c825dcc1020 SHA512 a5885e219687f0804e3ab7e9c44f4771de6b98154e4301456e9cdb70dbf347afc39f2bcb38151af808b6e968a21afe9622785f308ad19df768c4f9c22c7ec381
+DIST thunderbird-115.15.0-ka.xpi 825497 BLAKE2B 5f8c516c60fdb2b292601802ec5d357935f1832a665bea812bd386f7d3effde9ba6f691b5c51c2f93a1be1a4c93e321ea67a4aeaa48ae296a6e703814d668648 SHA512 f9f459731a98d872a72092d104ccd43207bdde060b44f21ddecee773bbe521ebd863290391664e56ae3f3f5e9f304ee0b4742d05cd176f192c2c4f9f5b12036f
+DIST thunderbird-115.15.0-kab.xpi 757769 BLAKE2B 85769ea8ee24d0385be470b57ad37d8a1136489a199c30b0e1ed89fe150459032bc7d319ce44bfab8678186bb4350527dd6b629bf5da186da7553bff50d499b3 SHA512 d5369ccdade4f1f67c613a4a9ce89ba54b880a09432ff8c129d15c84392f5a55244845104c848bc45508094104a5f42f46e90c75c16913764d5a997084bb0722
+DIST thunderbird-115.15.0-kk.xpi 890201 BLAKE2B 875bf941500c677ecd5ef8a68a0a18de80296964d8994dacab0daab04e7d54a4b593cecf5d2372c1b94482685e3bffc1af8e3a216261114a1f3ae2a59c217eaf SHA512 e79f808d2fc4cb9d3732e5b9850074dda396e843388c22d305f6dc98ffa05030c08223b5b7bfe7666fb3e51959a81ff673938a0049a8fe47c0d63ec2357d1f28
+DIST thunderbird-115.15.0-ko.xpi 784810 BLAKE2B 349edb1a57558d020c840afd7f1c97985c7f3d73db499df888f8b4bbe5c3526e9f8d888016cc5200b0b05a5ad3a0ca3c5f21112ebe1e2f33ffad63ff7d227a69 SHA512 4b295c31d2d25b0a8660ba8fa2450f5777b4e8281fff7bec7b9acb95c55bbe3bef07fc1634d04b8675177e02cae82a632431bb873197535c4ec24e77e2cbbebe
+DIST thunderbird-115.15.0-lt.xpi 725498 BLAKE2B af4d7b8fdda2ebf20604dbade0595762a3d62969d856c118fec85ace2a78e6599e6076ece85d77fd59f253ab820e7615a1bc39aa990d958908c4d3dc93d98aa2 SHA512 2a846f8cbf2598938af8b07014e30d0d961bbe39d28fafb9f936aaf0a366e0b711faf24d833dede396a85cc8dbe35251c1faabd604699a19fd04dde68cbe4e64
+DIST thunderbird-115.15.0-lv.xpi 646853 BLAKE2B 2adbc3c14e4d7ec694fc60afcaec80f983ad9f023c8aba7df95275e1b01c56c5dfd9784d30f249f3b548477a661555ac531bbf6cf621338f48f47a4f076726ff SHA512 259980f5d19380eda199c9f6a2143a4ae2297462ace0f87bc9eac51016b6646724f0376ab8fdf9027acc619f4053cc8aa4efc59abf5f5480e62b6a3fb3bde677
+DIST thunderbird-115.15.0-ms.xpi 604574 BLAKE2B aa33ebc053162adb395e53ee6c0d24da671afec78019a045cd0f9eac8a705eb0de36fd41ffe979110fda95d9d72d286700452cfe7d60de63b13991d60a3f2886 SHA512 a337100b2e2af801915fdc3d3ae8657d02b3d0b79e628fbdcf765d61836fd16578d3184c0fc86ef54e701810165502e4b2cb3643e91cdc48e53653e053bf2907
+DIST thunderbird-115.15.0-nb-NO.xpi 731332 BLAKE2B 6a4006aee252df55b1650e49479ec2fd20439734b54d6a8d8e9e9d92b0e3527f010a9bf8d9176413b512dd3c596ac707e06cde41c93c73184218346091fc0011 SHA512 132ac5c6b51aa54db8a99bcfac53f26029e1f9366fe70cd3ed92bdb16817dce601c8580f9c4d3ec072d16bee86b7b882674af5da0a1ea721601c45e70710480e
+DIST thunderbird-115.15.0-nl.xpi 772932 BLAKE2B 3835c5f8f1e0e5c83241620f8f5e93991b2a864416f80042396c40f7071542bce055e2cb16a3619384253afb1cbb35a133d906fc34d45bded51950952229fed4 SHA512 e8efa8aad313a8b0b737932de74259193313eb2dca9d43c17006d50c9106025b3f87cb0fbffa54016d0deab1c2122f19e855a19e89935328bab4c365739faa77
+DIST thunderbird-115.15.0-nn-NO.xpi 751328 BLAKE2B 23c0990e0008d669260ff983ad2b0c791b9ffc72666f3fd7a783cf9e3515151b714b39a94956349a24bf5b2fecdd108a830164359cc4b78272e22c56b33c6695 SHA512 6c4b0b49a52fe991cda6999a306f5455f3a0b50304aa5f976d204cbd0ace3f43cf035d7ddbb5573e95ad49a7405fc73d364c05e98fdfe9d3d79fcf4f5c2162ef
+DIST thunderbird-115.15.0-pa-IN.xpi 707741 BLAKE2B 1040a214ea3bd23bc1786b9c2283ce300fc2d1d0f1511a579139fe4fbc3eea252f08a9f1f25b797087b7156ad5a761843e3f65f46e7e1a237c4387846d4facd9 SHA512 b795f4b25f93532af62b533c018800786d6bc2516be74922ed4703309637133bdb44f328682c89a44f58b04b56bb906426114c1a9f3c1ab9aa0f4554057eeeaa
+DIST thunderbird-115.15.0-pl.xpi 793040 BLAKE2B 213e59d3a9086dcb455fcb0768d38bba682b289bc8c253ef6dcd701896506bd80867842ad364ce2b712eb2b740358cf973e8a46f6cc2e2865df448e296099984 SHA512 34b1fcf5337fc9dab9040f0344786d4945c2a2172979456920e7399fbde033218f8122f17991915b04c95e194643e339e7cb0e983aa540093553f21a243b3dc1
+DIST thunderbird-115.15.0-pt-BR.xpi 780411 BLAKE2B 686e3b1c93e30d353a64ebce552b9d6f019e8207b74d3989dc7bd5499ea213db8369cbc17c7d9b5edef4d363ff35e440cf560c818812aff8066d2e65ab273c76 SHA512 b0abc305d52bdd83a445122b3e7a5083ee893450f03359aed7f3ad1369a80f5a28d209a3bd417d42601bc0b8ae91ea8b7755946b47bd59f1a381d3df0e60ba38
+DIST thunderbird-115.15.0-pt-PT.xpi 775799 BLAKE2B 70418fff74d67ae80da5724d5a665dc75f0b1590ee0c58145a8f406decb7bf34c75df981c07d178c57ff8cf253251ee10c753d7c18b389dc3339dec3cd398daf SHA512 179e73c6c30b1d6fa5a2d45bfdcba08906a12a9754ef4c3dc22e0a21d3b055a7ecc1dbee9831b93a04d237e33a6870a8b8a3f640b5c4dc653a67dd5b445a95ac
+DIST thunderbird-115.15.0-rm.xpi 776803 BLAKE2B 7a2e9e81d4f87a5779ac0d9698317d228f019d912c37e6125c94c1ce8ac38b6b3658b3f8625ca36ee44b4593d5e1746ffeb1a0142a1009c367fda5f66e8ddefc SHA512 2139d1c10b42f4a414e616abb5c9d91660cc282f92e70027701ef7daf8959d1e0353631494f580298b07124c902d40b8b6867f99f126f85a82ef0f23e6d6aed4
+DIST thunderbird-115.15.0-ro.xpi 693502 BLAKE2B 4d441b79b5d3afa525a040df641b9dc1116bd137902e36c3bcb09959ee09594b36780806e67343970fa42c5e952b35dc62b5fa8f0621825330feb59f2ff2f53d SHA512 d2ee3bc13614c71d9b16e42cba267ae80336bf978d01ebd6ed9453c2be0d6a0f5adc8fad482e835879cb9d534aa38ab5b80cd59a422a3ea4b7ca39f37443f9c4
+DIST thunderbird-115.15.0-ru.xpi 905766 BLAKE2B 50f214ef41bd3e0e57ac751e1b71244a5cebd67dcff870dea3dddd3e28aec34ba0ea3b9849d92adf68ac3d54d2ab2ee5e0f11dcba9a6ab977f06c6d5cd2a9354 SHA512 140129a13dd4cb81f8cd5643eefa97ceb4674e154774feaeb6679189cc0df0ba9f060aa6a8907454d0459c5d6cee165a59244eb02f50f2a385bb903be9e3594d
+DIST thunderbird-115.15.0-sk.xpi 813473 BLAKE2B 7af3e872a0b6690c8c4d0b36547a2c5f7b362c5f2744cec974050151c6a7fe9a56a46703cd7573573f083d1561faf23e4aac694388f708eb1f3e5a7569a6dc4c SHA512 4a1eab644776f7549764922c59616f96d91bcc29e4ede3c4bd3562a3c10a4b75145923ebee9226bc8849e1b0818fc5d42ac9a9f357abf2b15da1e688a677ee92
+DIST thunderbird-115.15.0-sl.xpi 771130 BLAKE2B d768a1b4906e32b65551bb48fe701c23cd007aae6e49126af1296e276471fe3dddf27b17f4363dbc285068325fed2bc7375e8bd2f4387065551f9d0ee048f8a4 SHA512 ff6f2cd3f2aa92ba975baec8afa1283104be6b80b1f3f2b845abea03a4f66c9b3532342e26b11b79d3a5cb750443e3237df16285d1c1a3f66ed8e7bbe960203c
+DIST thunderbird-115.15.0-sq.xpi 795877 BLAKE2B 9e88bfdb0d87977980ca28a04404e0c3f417428e363e768ac7e48edae93a45bf65ffa7c1ce29ef311f569943b2fdfc51b1aad11e8e2736ec7aa73e1062cef2fa SHA512 10f976e4e27f684b250e000ed867a16488d049580c0d386dcabc4ef69b79ae92a2e245f398d8cdf518c78b44b6d0630247d47c0b241901570eda5e2f754023b9
+DIST thunderbird-115.15.0-sr.xpi 794778 BLAKE2B b66b90e413c840acbb4696f2f9dda861df7d3cdf945eb1a7428b9af7da446bf12de1f082950d6e9361d21462c9bb3841de2ed61111ca18d377a7f76566d8b0b6 SHA512 47f7dff1d25d51d55c067d4eb75e74d67291f555c6bed5e19dcc733cfc6f4558497b1ac3b5b72c36527da43f1475ddf51d0b8e53b235bb3fdbd963f7b6edae10
+DIST thunderbird-115.15.0-sv-SE.xpi 776291 BLAKE2B 09015a65c11e3ab8a8ba9973420d27eada85607d074bc752b98b0be68c70093f70a1bdd8b64e1a6fb68ba5f9611f68027920777f8e55380de5e7ca5e36b54beb SHA512 8a095c742b58736121f4bbb76b69118d0871fbad1c69df51663726e58e07f8781bccf59ce12364e847e2c132809555a997a92a4a77751b2e257cf5bea16a4082
+DIST thunderbird-115.15.0-th.xpi 843556 BLAKE2B b2b860fa51391c7dc0a3d2eac5b49ee72850c177ea776a60af32824f0fdcf310b98db773e46d32fd7a25d73caec36837c09afa5daf615eaa400f3d907588da94 SHA512 ecae3e36c620d9b9481add385f2ca5b7315e5d053e98dddc1be0d3c290c52e1c0527f69427261845e04b7b2b8772e4420daab6507dc577888419e3cffb186383
+DIST thunderbird-115.15.0-tr.xpi 786494 BLAKE2B 619245907e2f1ea6e9fad1950507b1f8036358192fc406900fc1398dceb323d909b9ec8ac13d782f2ca307fa86d75338787e7509bee051a1dc40fb2ee48596c9 SHA512 8b926b9fd9f34d3da683792bd31d9b13178fbf48992889b28b2ffacd729290b33742bf61b7545c5f5688bfc1e40112c71227c29d8951fbe065fa755c9b5356f1
+DIST thunderbird-115.15.0-uk.xpi 889489 BLAKE2B 8026e53271436a08be86590ee532f558c2deb0383b1c6c17537dd6962d0441eae7f63ccf3f8d0bef26982c70dde01a9b5551cd6a3204f8f852f5ccaf9f38fb80 SHA512 eecbe3d98f5d2c42384031a6bd74aca52b281be25a38a990063153447354ba1500864a775f56e9b8b2e0c8164bdf1408cabb36c79b2fc0ab9fed6db2511a80ff
+DIST thunderbird-115.15.0-uz.xpi 616842 BLAKE2B e91646bc269836c830f0515a82ce0edb81ae1574c4367b967531f6b53e133143553cfd94884dabbdcd6973cc1a69a3ce90de5a5f189f7bd05a707a311c97247c SHA512 27ce21fa8bd28b5a2357bf025aa45dc7238f7d965797d7911f567c8c5404d8f4597fea77c4ef2a250bb37cc3eb888578b2589430393e0155d01cc61a9889c035
+DIST thunderbird-115.15.0-vi.xpi 815663 BLAKE2B 7cf6b7a580bedbcdb8d1d6ce969ed6a475db3301e1ed72f50ca0be7672c5932af64cc44346a4011694edfb17c4d2a461604be23140285756061f7a97588a8bb2 SHA512 29502cfa4e379d46603f3aae3dcc4f6f1d3371f69a821dec466f5febee8cd9fb80dc68de65198290d84b2ccb4ca333d85a1e9bcdeb8ccea6a19ca8961a2dc9d6
+DIST thunderbird-115.15.0-zh-CN.xpi 816082 BLAKE2B 6327323e3cb30dbed637dbd82175ba0f1eb68c6b228c735db585a8050358739bffcc2ed3d0f86b84a0f5dfed16cab9d4b4bd1882459903fc5741dc2ea63c5a31 SHA512 9861cac106263f3928a0cfc70f4760f35053a8dd4c207ed788922328fff5d297ddc9c81768d461fd04b0b3266ce1150022eb73405c3fa5876f9c479fc7655b10
+DIST thunderbird-115.15.0-zh-TW.xpi 819843 BLAKE2B 1f5854be3f2cdd4f680b0d649d6ee144f0d2ffc0cfaff094ad2f569a7c3a3245c8c460309b352de87e884e484486d9c3b84cbe56b07408706580528b9f65402f SHA512 3e7fffbdbe5b4435a29a420496e341a9b9d04568cfb46e0f73a8bbff4640d85266d105ca39789261db80e44834e7813a62723f5f3d190fbe585c293cfe03f39d
+DIST thunderbird-128.2.0-af.xpi 530351 BLAKE2B f4b04315d8618d6bd5709eb0c4cb96c361a1e2a93b2556ed9bb3c06a7b5c938667d170ffb26ff573c906e019be0602bcf6aa692184d2af713c78106392718d00 SHA512 4553dd36a166eded64956870e200fa598111fb970780a2b97f56319a465bb357b81e726f05bbf98cd5c09954e7a19e879b1de3a405bc0445de91ca2b7c44f707
+DIST thunderbird-128.2.0-ar.xpi 679867 BLAKE2B 5b306c106986de11dd40335a5ff30611de6d787d8d4f235ed40efb03f13690aa3685be6c6219f23812ab61d4c6a197bfee464111cb020e0d3e6ed420f613e1a1 SHA512 688e9fd15d629ab219a9234241bbc731cec59746bab60d1c2201046a58968c0afc2c7ac058501e5f206358b2e76af91ce926974bcbc82b6ca168d09a09ff4563
+DIST thunderbird-128.2.0-ast.xpi 561055 BLAKE2B 7e985f8fdf59dbc14168467b36a469fcc5eddacd7d049174713f1fe19bb5441320ca84171489a71ae3fea2f9e6267a98f2496e00df6f08b53eea9b17fc026a07 SHA512 edf8813fb11d6a7afd18b3d2253a41d1c4e450028dea2af61233e1602d98c65304038fabc0047c64aec91f65eb943b11b5b30662e4f3a44d21e04c74a4c50f14
+DIST thunderbird-128.2.0-be.xpi 755105 BLAKE2B 3fec208e7f3b0817e3a8e8822abdcea3cee6787b8bf565f9f2b89e80637828a2acfabca1ff6e9f64fbf2f4d1d73c623bec56071cc35d4296c8eb4789030602cf SHA512 4a208b9dff9389557f003f4637171b1e58eede69f2c875a5e9fedd488c3b80e84a7fe989d1e67c0b79e18e93df74ef04aa54d613cd1d01c8394a8d8f51531f82
+DIST thunderbird-128.2.0-bg.xpi 807860 BLAKE2B 7aa592981e26c26ef9ece53278f3ba9d0752e9581af9e5958219350187ba252bcf0279cb2b546b9c1dbe400d043128827b74b5dfdf9164cc647d893f72dca979 SHA512 99442d6032ee1a2824a0186a22b29748b1b69b7c59a616438ebc6ddce732437ef8b42e9de7b6034bd3f8c763aa725ff699ec6c608199e6cfcb2e79115b745748
+DIST thunderbird-128.2.0-br.xpi 652477 BLAKE2B 3cf8b378b67c62942a46cb685de9166d6ba8b8e3daae29859e871011e9d9f4558c2f5ab2010feefb85a534a63fcb7eae6d28749a551cc31fdca01a9b8255a2ea SHA512 1d6408eb0688fde1ffa1de6e791380f5e3fc222a5ca1a971a6e9e0a9444de82a3184824f1e95cee71a97a784557d59473e408efee6e33cc07f5f249ad6039475
+DIST thunderbird-128.2.0-ca.xpi 708967 BLAKE2B 76177b2b3e1ed5a9f7227364da6297f00e30ea5ff09ad93bd053e72593217c31b68b8e877e4e878cc50618e5e2179a984350c27b1e4be5ee2ace7a588197e5c2 SHA512 1c99399e388c47516a22d879cc23b14578c28364f0e957d82a7b92e75ee66922f748790a6522e0fa02073a820dcf0c190e9fb2b9a2087ad65499af1f6caae61d
+DIST thunderbird-128.2.0-cak.xpi 671704 BLAKE2B da438c852c579e6b02cafbc1b09b7d58e3cc76fb235fe157c19f3c044c2b2633ba77594059ba127252c3b362549431ffc293c88556a026ba8dbade3738d5515b SHA512 c138049b26928ea03d9554f99a6fa42a641f1bd840e50f16bbf164f15e7a46696651f63fd170ad374ea9931cc61c903606e423a087c1f5fb82fe3b17387c90cd
+DIST thunderbird-128.2.0-cs.xpi 785045 BLAKE2B 98ff73560bd028c0c1b8fc8b7e64fb9eb3af3966b55ad9b97310541308ea76eba7de9eea5de76f9e2fd459c66beaa6741a50303a16cf981f2892c329b388d74b SHA512 2f289d2d43305b091787dbddd62d4c288e031608e4d3a8e73f99fabad1ee694c50d90d4c6c2fd7e14f5d6cbf6ea343cf794b98133744f7d2268c513d4e31aa31
+DIST thunderbird-128.2.0-cy.xpi 749051 BLAKE2B fb7d2c860c49878632e8dc71d1ecedb02e5c3ed2de7a342e2a7824d30384537ef9c44a1b47a28d7ecdf7c7c582f665ba24429168b421953fd1d3b4e2070fab60 SHA512 6a8264a6ef7e8646dce804a1e8a9c5d789c1fb16c0237b799c0c4752037d7d9e7695bc63f73c56e63388e4b9f05561e14e434f5e3d6538debe05051630da0cc7
+DIST thunderbird-128.2.0-da.xpi 734115 BLAKE2B 95b06adf1ac0aad11ea642c4f0cd323766bed54c9ed691d2520686a59d1b1cf823e4c3c7a3f603f15be7872b41c637e655923026829b18e1ef118be0f021c99a SHA512 c7342d1d4681106a01ecae25cfb1ee485172c9e7e36d10d0e227e24a1a5d4547f69f2f384c87839fcea1dbdb935f97e504d29e9cb0a39cfc6088282d3149c4ec
+DIST thunderbird-128.2.0-de.xpi 766251 BLAKE2B a1ebb1c4a90afd192e93e7187036ca9d77f4e76d28c3f5820115c99884f01da3a6ace89554767ea2f736ed46ceaf93a2b99d60296fa48a43ad00b7aef03167b4 SHA512 df8f8a6d95c2d698427985daf5b6c5922a4201d5314005adf9d66aece66642901a0fc6dd01e4c34ba54ee7c196897f91c7beae69c7c09a2f040ff4f5bb03741d
+DIST thunderbird-128.2.0-dsb.xpi 782743 BLAKE2B d2f4209c6da0d6ac196958cb230eb70859548c3867a0a955df8edfb09822e0dddcfed100530da19f6d09fcf389177cbb6713aaabdf7d36a18382388adbfb2ffa SHA512 08fe7553f916fe0f8057a206cd4f1327e7bb6293ca6254433c08a1113a5f7ba83d26bdc6e16915e61bcff9c31ea4b8ed7d7bceb204f1e9cf8815c930aeeca302
+DIST thunderbird-128.2.0-el.xpi 889269 BLAKE2B 64a9552d9147e5eef0e3b8d711053d89e7e9ed64820f9ddbf160f0e84fac09452bdb9fb4f0796e4d265f5e41f451e93ecc65f71da8ec9cdfd8f506f7400eeefe SHA512 cd50a58fab6fdb5f2ddb062526547981b44d1193463033d9ee5be7c54f1834adb2a5410da7236678d447442d470f2fb32b389e40fc0961b0d053b8f008ad7914
+DIST thunderbird-128.2.0-en-CA.xpi 702143 BLAKE2B d28f797da6751302bd103ad4025e7e05e7f1746b7c2ef9bc36d5dab24a0e4248e3bd3e7aec345649379669e8d985eac709dcd2993758638a72011352c7302b1f SHA512 192b530c7e5035ebe8b1d1f2d870ea0ae7586aea179b7b6a5410522a675bf79ce786a7187040a14f2af3225401c520aa30511eedb7c60876137e4246c1896b0a
+DIST thunderbird-128.2.0-en-GB.xpi 702700 BLAKE2B dca31bdcc8b9b1da3c4708800276b868d9b5206f55a52952564e98f52920f53c41850ba09553c51b55da9fff092c66e93491cc165c16f7c881c347f180ada6a5 SHA512 026ba038c4bfb2abd3f26c31ee826eed0d17d00d4ed1e58f25da2e6d6f297ad4e90c1e12d1b8e4e2b908b171ce0cbb4a1057354fc5cee66073c90311c7f54ae6
+DIST thunderbird-128.2.0-es-AR.xpi 758350 BLAKE2B 64721c4eaeb8d7301bdbad809c7235b14b9d0f726fae6caa8acf61596bb9f150ff6feb8ad44a5d5792bceef40476690027f2e461ab12006e9c1abe8b2585e84d SHA512 7552962ef95cfca777c57f4b8109b6ceb0de35387878d140ec4dbcfca556a3d640a0f0049177448d32cce48c17705caa112ceb6409e87c278acbed4f4d3a20f5
+DIST thunderbird-128.2.0-es-ES.xpi 723514 BLAKE2B 3bbbc917ab62b65f315a77bd2c950e9c4aad0b448982a967000e3a754d7725c849ca38430ceaaad235816daf82b0ea2fabd666f9744ba05f57b14f90a856a5ff SHA512 bb5fb42d34b405058c97e7e329a64c9892bdbfe530748167dec283eb34086cd2be772f54e2d56714eda85939fd54faba7f14677c66817d6573faff541d4f561a
+DIST thunderbird-128.2.0-es-MX.xpi 737707 BLAKE2B 7260c4ae37fde04ebc0f23449192c8f329b007c9cb7b0e826cd7189dbd4ab966beb23599e4d106b4551c4a1f19b105ee6080a8f40b502d8ecde5f83e1efa6a75 SHA512 f38efcd62b3cdb38afcedc43fd228f77ad59caa859bb8481a6f4aea41aeca276134047700c312da3984ea40311a31afe4cb22f69eb105b2ef16eb8f017ec6e7e
+DIST thunderbird-128.2.0-et.xpi 696280 BLAKE2B bab80a3332acb3b5487068069728604d72235c9a0aeb9c793a4d8b6c61f6e7af29462b54d6a9bfe6d445e4cc454559f1fb4aee50830d57cf7f6b6eedab6e4362 SHA512 e34b4c6c5037401c4d6acb9d64b5984d18ae03c905360f2ae9504dea79afa4e0e9e9d2b93cd1cec843f0eb56945f9fc5070136eff9e4309163ebc4e88de376ac
+DIST thunderbird-128.2.0-eu.xpi 726802 BLAKE2B 53b6e2830d8d5e95cd741522ea4d115509ebe4eb150606f4f997aae65b0f17b228c51633dc22df9360f8562801b6437df18f355bde3c21e6a3ee9df9b73a3940 SHA512 ebfce61496f2c7c202961be85e4da5aa488b1a91021bf911891cff40c32a3abf0bcc665e6c4d0c07d0778eccd0d61df5fd52163f00ab3b914637f705fcb44a65
+DIST thunderbird-128.2.0-fi.xpi 733651 BLAKE2B c7a50566eac18ca86f88b8a743679fd03c0b11a9c55ac4a7fa9c6aead7f7a54eaae89c4c8752a683dbeb58cd8037fa2d41cf7838a86314933c2297a70ee0c49b SHA512 e1ecfdba4e0732a61c61bb931fac430f09642d7641e3cb3da4ec680ca1553a613a49937613a70a520aed158ffdf7f64ca9359c888e11563ab2941101361c29a4
+DIST thunderbird-128.2.0-fr.xpi 770186 BLAKE2B 0eb14cb05d3411a583d48732d6f65dce30fbfed37640707a85e66cce770fa0786e66e02f0e96e2009467ecaa40ba532913a0c8a7615999565142560acd9951ea SHA512 163daaaa076f00ee23ab0271249fa7a9c175b6a411f8d3309751e41f02c1f405531b0bb2ae0a29fdad6049ef9c4c8d71bbe479f084e7c98b56bf3be3ab3bda2d
+DIST thunderbird-128.2.0-fy-NL.xpi 752848 BLAKE2B ddb1920d1082090be895c41025b1313a824fd12c3ef819f4f0ef82ab693d871c210d0be4fb77831872a49b43fb57fbb0b4a6803717b00ea155e50b3ffe396a80 SHA512 cc336b67d0be16c82b4b3fac0bb5fe16f2c6f6fa711c5c0701970a37d75fc4c7869b329183471decd051566bdbedbacb360e49a283c1c116adf881de717745ce
+DIST thunderbird-128.2.0-ga-IE.xpi 615198 BLAKE2B 3b89495c04e27b9bd4a185ab79d5f8f41a07409b0b77119f350c91ee512cde9fd99a97aa1eca0b9b8838e29b950ac093a9845f9da2e63bb1c1a84e06bf5cf614 SHA512 09e0f9f0a23c2c52e399d9999873d92893a49c829619861b4f0f72d0dad12b638403626519097e6bd059166752d100c9bda9a4f8a4f47a21478646daf66dc610
+DIST thunderbird-128.2.0-gd.xpi 727804 BLAKE2B 8f75354d217d9d84c091ba029460332827f1de97e588c6613a33bc857da573f24d2a4ef66906c66ff5faf5b54a0c89179b96d668afd51dfe5148cee89a7f2bde SHA512 4b9b3da0cdba5df1a505cd730073d2e8887d4099fdfe7fd5a0f914db2f4e73fab2da47286a84f2eea0bdbbcfd5585f425928b29e7d09f1f050eaf9d3480c036d
+DIST thunderbird-128.2.0-gl.xpi 736573 BLAKE2B 3dd448d20d76383a5219db7d1e7ab5e21c793515943bb70bb1635862632cd7351c78268a687f8fa2d25ab2c7138118487f16243ab47e89dc33c921924560e285 SHA512 8975e87497557b9b427ff002d2fd156d2ef4e4b0036836af993f1a7b9c73c632c05d424bdc4e6359f6045bbea725ab3dee993e978b020f0480a1acd96395b2ce
+DIST thunderbird-128.2.0-he.xpi 700301 BLAKE2B aa7c9b89a6453aacc09c50d653148ed21ac53f29f88d24dbeef015bd60ac7aa1b3d7d33858c275b16ffb41cb54e4c2f41f09a9525ee6b19b98a9a993cc21a8e8 SHA512 3dd3929b600aab5d1a5c9f489fa326b48eb4de1740579e0d948d8b72aa2fb50e73bf337014be7d892c23cd1b2ab36a13d52da9b10dc4e5a220dff06dcf16afc9
+DIST thunderbird-128.2.0-hr.xpi 715018 BLAKE2B 1a40b987f16a5067a0d26a70a12b8c380248ab7cffb3053cb9991453e35fd9ebaf5167a0870bc6ccb6642a5dd6605860680fe596986bdbd599d80121d4156141 SHA512 b02f671ce57339f85098afb41e27b09a516cd903906bd34dfbe199525fecd73cd0bca978464fddef302f38ccab1bc14d862840677e7fbdb1ba9fd20ea754280d
+DIST thunderbird-128.2.0-hsb.xpi 780137 BLAKE2B 6d4610d5f13f7d211732b797ac79c105e2785a58873c49b7fdf948706eca001fef8523e1460f2485f79ac6876973297ebc02dabce837ac4f1c5413adc2d6849c SHA512 746dcb7d355c429fd4c6b633885a86eeb37e300a738c5bcbda4ca91ac0f6ededcf915e9d6a5de54bf7b3c2e463cd86d2cdb7ec2342173ed1836ab19f1137a880
+DIST thunderbird-128.2.0-hu.xpi 782933 BLAKE2B e88c56b89ae79d46865281ca8472ebd6862ba5fc81364ac538a2aa2efc99079e849cfb9fc5645080646ae0eafae4a80dc8d2e46ee99ba115d4bda654d4a8c894 SHA512 028839eca290eb7b02c83bb1bb40ec0f35dcae7d446c06f0366ab7cc17c1bdb0adc0bd72a5a71b6b67a4deb607befd2c5de0372c695d3a1ced5407f8c853fae6
+DIST thunderbird-128.2.0-id.xpi 666011 BLAKE2B 2b73fb3f7621e618e46479d657f8d20ad1fba7cbd4a8c5e0363c2b1ef021fbb03c934c5f11ad20ba4fa86413b93677add503077aafa42087e9fd78339886313d SHA512 16871831e5b92d8721d52c72afc0af6df0a7048e58e6f59bff8ad09b6aee00c0090c465d00f9501ce0f53d3b10b905bfaa1571d3d3e9006385bd22cd1abc0af8
+DIST thunderbird-128.2.0-is.xpi 743886 BLAKE2B eecdf7c8a9eadba2944ecae09df3b12872c83e8dbcee9ad481106ce4716ae8db915e61437215311957c9b43dc45676f5a5d163311452e6a8aed3020d0dd056a8 SHA512 17d1bf8d5ca0aedb25bad3e61f4bfb098830a87d95ace1dd2d90fadc030e7bf668c7cceea170ea7d13d7cb80c6e3e36b6749cdf52b970150dc5ea6b9ae1a6bbe
+DIST thunderbird-128.2.0-it.xpi 690396 BLAKE2B cea4e519cf4fa3e326dac57f6e684da5d311e5312beb687b847965833e5acb28ce59b41c97d198863654d2cf49e494951306425385a33cbe27061c09694f030b SHA512 8f473a1b0ffd9feec15e415f0c34ba69609e8a8ab271f3b36dacd4866f02affeeb73e4bb975db2375ce051f59969e54fe577591e9f6810e4a5440c659f4c9431
+DIST thunderbird-128.2.0-ja.xpi 819902 BLAKE2B 3911492febf78bde263ab00d5410a5991ae8c67f0cea5443565e1552bd2cfa5a48e43d73c6fe83b94b222ff2d391afa4efe01c13ce6e7d6ea28f6095ae00847b SHA512 b09cb2fb7b904d2048f1c37e4dfb74b9adf4b0b21023c55551ae51121acea85198a594701396e0d9058c267b83e8c1f2e6fc5b31f8fca8b001ed23f4cb5883e9
+DIST thunderbird-128.2.0-ka.xpi 796047 BLAKE2B 69465d477abfde17660b651dae0ba9fe05cd4b6fcc119a03f1dd3b905bdef1692bb15dc66e6f0d9a7be426a9ad1319040991e2b9afaca9fbdeceafb50ad3f5c4 SHA512 b02d01ef4f9b75a2d103ad499120cd0f9d01ae2b74d8a922463c2c2d42ddc6dfe73dc7ecf51d7c8f5be235107bb1f8c7b484d747e39bd576165eafab2a0edfbb
+DIST thunderbird-128.2.0-kab.xpi 731859 BLAKE2B d1b0799ba696785afec55f4b96eab8ff1641a43066638d475467ef997a49e584a31a53ec726e46e1bb59b3f97b164dd0c785a25db89f13a646ba7b69e297def0 SHA512 777dd7242a23724a4ce559164c0ee20243fa137e99a7a9c31b1e99587606dcd66fe7d39a89a799ca294b9abdb537da5ede605eaca85b19a35f0cab99b7a11a5f
+DIST thunderbird-128.2.0-kk.xpi 857290 BLAKE2B 39bbbc3e03fe9ce194cfe23cb1e65cb2e443b8c81d091bcb117daac219c76075ce2ddb6e8f3bb31eb9040bd7092bf84d0f532c3ad2293b1b298858d1cf9bb498 SHA512 8c9a2e6597246a166e0e5a51ec6309035788925e41a115e8e6b489fe1f6e6d528cf4ef535a010d83260a0f0aac375589e4bbdf711fa9b38b15980cb4db43d73e
+DIST thunderbird-128.2.0-ko.xpi 755165 BLAKE2B 255e9a16f49e607314d365f313249343dbcf8f170abe2e93d3862be51746ffba7aba0f3611992c4458f0d1aa3f2f2000babfd7b09ae4cec828fdca661b308d14 SHA512 1fe409f22f094f9c5b2cc70561650ad4563836ab8a3c5cce846376f53572838a93cca38810e75f2b6d19bc44b156e9341f2ae05b5832ef7844b703ce922b3416
+DIST thunderbird-128.2.0-lt.xpi 700918 BLAKE2B 622bbefcb2572593977459e9325fe25c979d00c7cfc08d04ec17734148a99f1a21535b00d90ccee31e87ca2f6a4260a241b6527ce1781586ab1c3f01ee4096ef SHA512 42539e633382f62b7fc4adf26a87b0842071077f7e6c6262b78f9174b969dc16ec79640cd7990c0bf6761c14f848792f32c9140248d734d97178566417069691
+DIST thunderbird-128.2.0-lv.xpi 623624 BLAKE2B c1f55d36b94e2b564a4f2c88c8726d85772a4853bb9b54777bd6892566747e1076cbc985268c3b4bbd161d8f853e0df07360765b513e5fc4ed2da3da211c0b3d SHA512 beea131a1297ac199c3b3ede8f8e09a576d70a6caca85b6073bc9d4bc6fa08186dc41936a5ea773957ee2fc395c618469acbf8bc41f5c30a193f19aeb9edc7b5
+DIST thunderbird-128.2.0-ms.xpi 581084 BLAKE2B f37963924f629b13445ed30156b5bb53282788e8d9f0a995eea822954661fb4ec729dfef397ddbf0cf439f06a6b8c0ac8ee9bcc1392662f0dddd0d4c5c30569b SHA512 d3229b79de9b89f4d668e520f80376ab1a88fc7f160c0d5c105ce4b1ce4fb6293d55368eac7d85a2bee929403386c4ccb143be7656d325ad0ec5e0759885de2c
+DIST thunderbird-128.2.0-nb-NO.xpi 703763 BLAKE2B 6f9bf5ea39c7350a1f3c1c7a7e5d3fb8417da27cf2c9bb0bdc36c8a777c0292346c662361fa4c4fc77d27f76d545921f40630b73d7bd730d5ace3b90768772f4 SHA512 580a7d4ccda3fa278647e6c1354cb9e70737ab6ca4fdf1ea2f335808f46369ca8908a77511dc0ca48c99beb45824afd708c9abb8617c8ff842c7547f2cf62f1a
+DIST thunderbird-128.2.0-nl.xpi 744105 BLAKE2B 20a89e15ae7e3539d5a28f38c58d0c7611d101c95600731abcdb248e2e5a59272302a9a0fafad924d4d96150f68bfbd872d47da5293ab8d27f236790e0ba01aa SHA512 9934e0042db3801c2fad3a2754d19f640354128dd376fc1db835b253c48cc83639be08de0162533e47db48d7869e689767cacad6ebaf136e22b831af587f6cb0
+DIST thunderbird-128.2.0-nn-NO.xpi 723768 BLAKE2B b1b6fafe6ffccc66f30665fc40c699daeb1c74c482573d1d2ceec565095b72f9eb40857954ab0cbd8de74022fed9f57275e22b5aa5f1169f6f4831b23543c781 SHA512 8f225825aef220b637fddab316e49d9a05535b19a83e224d6f7fbc88b56d100e8659e9c51658d2d6d082ce02b5db4ca4a4cfa94c3039a22d68df5c942ad28fc2
+DIST thunderbird-128.2.0-pa-IN.xpi 683076 BLAKE2B 1e05f44edd29210a4179a0b6fb00ba8095a7d7ff7d50855f1b8d84c0deccd8149eceb8ec4813f15bcf73edc056c74a7c911fc4395352f1b0143721f3b9f1f67d SHA512 1301414761d65b83d01b2605a70355b522bf66a2b9a01f7cebae46f8ba1aaf131d98b2989e2e740de2f11cb69067192db2156c286056ddec50bb42475a98641f
+DIST thunderbird-128.2.0-pl.xpi 762953 BLAKE2B 431add2fd6a53522452e0d1ea78a855fb3e562bb83c8e68797dfe2534b07fbb99505755ff7263574fe5e945d5cb57a281d1a3adf960b1c1022bca7df7c7aeca4 SHA512 582a2a94f3a472a930561d0a2d297d30d0444673b3d188e6cb3c49999c99a90783dd9671329db625a619ed349b016ab0a1638ace68be065fe2785829d90fff0e
+DIST thunderbird-128.2.0-pt-BR.xpi 751314 BLAKE2B be58c6d7445ce7fcc4a8f1744861342b749dfd09c0729f0df6416dd2354f903315be0f24acacef461c0a658301077c9aac0b3f2696f6c8c274cd80aa84b49b7a SHA512 fbda48a6f95cca8f7d02cebda30d2a129b113d4dceda4ea3a4fb1bdec837f61c91e39baf1a3677e0fd16cad49a07a59d8db9ff44d810bddd6af00b7a9981c048
+DIST thunderbird-128.2.0-pt-PT.xpi 746871 BLAKE2B 2e798c17d91e7b178d827bfdb56714e5dad560880765248f6d122806a1f4ab1878e488727570c243dc5d28a4aa8a7ffec30e99c6592f1d7bc8e2beb7a0a185a9 SHA512 3c48f173e48e67a66668af76008da90092fc02c77ec8625fba28218fc693931ff8658adc5913e318900b02ae04131cba1201ba68c7536a1cf8470d38bcc8eeaa
+DIST thunderbird-128.2.0-rm.xpi 746778 BLAKE2B a7936361d462a4411c571ffd381f4f8be95868de1fa8f09b6c39e4d78af0a910aebe9fe79f890c09d1f1e9a395c1c7e77de2c76c4d2c3ffa0bbf544304fce875 SHA512 c80e6909801c63c0db8e7423248e74bf634bb6efe14ba8e04ec69f9d1e95a1b8a4f37b44144e3889c3daba6ba2871542093259ffa62dc6e981c05a25bbbe154f
+DIST thunderbird-128.2.0-ro.xpi 669742 BLAKE2B edc839c54e190a7141f703dfd67999c48788ca56a364042f9181e283cafff20e2acb1fef5deb7e3fa0a5760403c1580ebfdcf6476ebe886c585706fc4d0babfe SHA512 dbc3f1a5b827d249ea7899ea67ceff9055eaeb7fb94c268d26829a056b7e377eea20ac64e685133ffa0418fec3b5114fdac53cb4f21de3006ee0994955f473da
+DIST thunderbird-128.2.0-ru.xpi 872246 BLAKE2B a05fa2c35876340956c853008bb9d42c9cf73f4f9fb49f289d55e9eaa5a68afa85f561736da5093ce9f3da33a0b48856840da36873d2dc060dfe22d0d181a713 SHA512 8fb14d376d25fc7690eb9d7cac23e12935d39809d481bd37038cf5993996e8da9af91369521e736f09e13891dbe2b6ff87538222500feda2166b73798ac5cc0e
+DIST thunderbird-128.2.0-sk.xpi 784171 BLAKE2B 19c2bc75d192c4bb5a9e3b76fc69b7a78452256f3fcf460ab0efd02d63a78de18a69e55f94431f24d0cfb6ac5f41ef9882e6e5b84317bd05116681b0db058901 SHA512 935bc5c8c88c159c1a7179aab69dd1d3ea6507067a9341760ee6e8e3a6fe0a25d8b439d92072b031cf8a675bb47bd7b4d56c26da6a5ab738402247ee4941c497
+DIST thunderbird-128.2.0-sl.xpi 743551 BLAKE2B 945d820ff6ac2f8a3cdc284e82ae93a9f67a6f2e645ecea7fbec070caef934d5d370c2d74dc0d8807dcadbf080a34c439889afe746200a32c3f8642d15efc573 SHA512 fa96809c273f08e93ee833eb64b923eb50c25a216ef69550dbdf7900d801dbe8baa4b87c00f1d08b0f805a7ba638174f03a5bd74db64e8eb7cb5bedab089d2bc
+DIST thunderbird-128.2.0-sq.xpi 765887 BLAKE2B 768d4675b03246cf929a62ea94d9ab1118952bf7276bdfbd4e8445093f018d52b517257fbb2406f15885e29d2a2a40d971741491e64710452428c71e8d3169ae SHA512 5a0ff4c52e61dbbbf87a3b012a3031f23a993d9287bda6cb9428e1de36bd0ccf93f0e1e7691fb234e696ac69587d99eff214699c7f0019ae261242b80b0662f7
+DIST thunderbird-128.2.0-sr.xpi 771006 BLAKE2B 2163ba03ca321921386fa2f3aaeaeb0c55fe89c630495e8272b64d06c6ad1e28ea3940d13ed98285fe0c25bf35b9a725ad8a3f83ed0819163a901d22d02c1fe2 SHA512 c29b762cbcc86b7cf732207a86fb04f548d7e2de8051381a99590e02f49a310fa647af08455172f44f74c095ced5ec301133f82c2d3151534da8903d6c73f6bb
+DIST thunderbird-128.2.0-sv-SE.xpi 747521 BLAKE2B bab34c471bf2fa3cf15e568ad838c97bdb7e513f4b090c4596e677075bd68103f4f9045551b99cad35ee30c77d7791727b7fd42fa7aaa292511559a4af3d412e SHA512 aead8781d882e5afb0a3751ebb37dc06e510b028e03f8653d197c7cb6070f958e023d8a59e3855bfcf87be4cfaa3901e53f76ae7413c84800f4991ca196790f5
+DIST thunderbird-128.2.0-th.xpi 813955 BLAKE2B 6e6d87168c2eccd1879f28bcd20e75ee74e77334857c6537825ede0b67d00a6ceb29bcc69393231345e7949e19341f2b06567ac69ffaa241b9cf73a28693efea SHA512 ac7714861e3384d0811eb6becd95d5da87bac4de8df2f78aa103972918259cf3e0947cbfa47eb355463aab3aa4be5abe80e127a61bf880994e192d635440636c
+DIST thunderbird-128.2.0-tr.xpi 758166 BLAKE2B 7558c91ab4be059287a140e857580dbf88817b49f1cc28b16dbe7ed1c1f511356591cbe9657dda96b406462a0c8c15c5c214c9c29c1723c6baa03150401062e8 SHA512 ebd44f3cf3c257fec075c7697246337bfc1fd6f0866947457f975a62e2d57299e77b4e31b72b8340dffb494c1cbd804e773fc0f462d0ec7ee58573ceea027703
+DIST thunderbird-128.2.0-uk.xpi 856056 BLAKE2B 3f3733a75f8a85abedc80936c9b1f89c4b3342e4d0337cc3da241ae392807929fa2dbcb9144a882e80167feec357b143f6abf707ee0b581d1cf68f6acb5d5d59 SHA512 c9c88a315305f76172c7df4dabff7cdb399e2eeb661cfb3b14bf489ca3ec004dc61dd70752436c9b318afa23b3984e697344b1cb1fcaeb7cb0fc92e11fa9de27
+DIST thunderbird-128.2.0-uz.xpi 592134 BLAKE2B 392ceee3e9c43ed96190a7d320593796a7d87dcfdd61cac45a2438bc5c390365d3533029e1b5c35a3bb39bac179c51f1b35d70a52d067a4502da540efc2956ea SHA512 00959d85d4cf38e203bd27dc1506ea4e4b326fdd3fee6973282180c0c04fcd1a3ff41e196f78c924fb7a666cf644f335523072e19a5a2790d642d1c97839e6e9
+DIST thunderbird-128.2.0-vi.xpi 787029 BLAKE2B 8905a673b71236891630a9dfac65575e5cc30a4db1951de756dfcfb4a4b10b41fa3bab7a7da01b1502fc1b795aeea1b92eedc7b1abaaf6049d1bc483c52141a3 SHA512 d854fb027d13d24fa4f4783880f76531c2a08bbab5cab5bc041e42ac36954923b797024d99d7c36c032565d5155d6c2d147743cc425ebd8ac2bcfc2179110899
+DIST thunderbird-128.2.0-zh-CN.xpi 785328 BLAKE2B a5cad2e891779711ab6be31929d96647c95b93bb50e6ec31f8a4b4f87eb2881f9ed20bf5818f4475aaaa301ed4a25a6a5350fdca9ce3d532747ff9a74593b535 SHA512 647dfe19d2866e1455d9c21ff0576f7a6ee5a780f5d07ca11cc02bade2a50cf42f21270d573f74258feba2a9adbede415fa4ae4a71e87f77a133e8931c259b47
+DIST thunderbird-128.2.0-zh-TW.xpi 789781 BLAKE2B 2f584744f1ec20465b5e39d8cb966543a1d549fbfb133392aa6bea100f3657df9b29c01d4f07b3bdc4d531a370f7da8d0b85605a680d36919eaf2e4091b4aef6 SHA512 162d5a7ef2e84e55424a6fcb14d18999d0b4c781045180a30394d7f767507dc6b1b084b2d4f3bed63b11d605560bf1fd59fbed7ed0d1e0dce6e47511ed7e6a8e
+DIST thunderbird-bin_i686-115.15.0.tar.bz2 83141923 BLAKE2B 65ab94671fecf4f315c790ee4525041363f1f05796f6c0ca2c73948b478d37b299104fa61c425e2f0d5cc8e291119590a9f60491f126ade931e2634c866e050f SHA512 c63ba5fac74c89583af6e7beceec7e027463f1511522c8245fc80b1f55e3a87de97a54e2c599b87d5ab3bc928bcdfd9533e54d0fa7415a8af2618133aaa4a90f
+DIST thunderbird-bin_i686-128.2.0.tar.bz2 89506968 BLAKE2B 8bca9cc35491a345a427f7e567d1bb4b6f4ca311b95489bf5ff6665ec8658b1377404ab418f4ff07c429f3e3b1984a3fedf93e377286840e0115c8c3e782f5ec SHA512 d28faed13f8720fce39e11229830ccc12fc3964bed304bf9922c9fcd7e2a6094c0ae30b130a8ed478a68640b8b8bafb100f2048985208d6acb7423639462bb47
+DIST thunderbird-bin_x86_64-115.15.0.tar.bz2 80669183 BLAKE2B e288a1ee07234ac3ab5749f2c18f1f342b440353b66a7c6d5c80b1aa1e6f46dc2dd1e5c81124b0393fa61141ad4c6c14939f2fdf9f15547e4160df5bdba7d2ec SHA512 311df005e79ba20d6e4e61b934f0c1e450e15b6622ec741c1ead98a111c7679f01cc9b4bc2c713be470385ed8fe9f87a8c3a2d0adf6198623fbbc092134a9f06
+DIST thunderbird-bin_x86_64-128.2.0.tar.bz2 87126118 BLAKE2B b16fb52964f802d139fb857fac545f285e1f26930b787dc6c0f5354daa27028c19b52a37b30aa774215b94f65b8ada11fbdc186442486e1c3657fffba4288a3f SHA512 926b90c9fc429fe31b13ac0b572252f02c82f1c1b37f72f8eabee526051b3784f721c6a96dc3147caa9cd9ae7d75cd9cfa1524423e52afd762dd83a4dba48951
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-115.14.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-115.14.0.ebuild
deleted file mode 100644
index 0ddec45f3444..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-115.14.0.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2024 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}"
-
-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="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="+alsa +ffmpeg +pulseaudio selinux wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-DEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-RDEPEND="${DEPEND}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/dbus-glib
-	>=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[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/libXtst
-	x11-libs/libxcb
-	>=x11-libs/pango-1.22.0
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-libs/libpulse )
-	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}-${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 \
-		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
-	fi
-
-	# 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.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
-
-	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
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	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
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	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-client/thunderbird-bin/thunderbird-bin-115.13.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-115.15.0.ebuild
index 0ddec45f3444..0ddec45f3444 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-115.13.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-115.15.0.ebuild
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-128.1.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-128.2.0.ebuild
index 1df793b39ec9..1df793b39ec9 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-128.1.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-128.2.0.ebuild
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index f391c3b1e66b..fe9c1c616efb 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,6 @@
 DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f SHA512 186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90
 DIST firefox-128esr-patches-02.tar.xz 20052 BLAKE2B 1c5646e6111d400c4f85910380c407c0000efddd9f9dfc228b042bbbb38755d4a2003f5fe9717a13ec53693cd6fdb1cbf9822649e8726f165a9e3d101a8b213f SHA512 ab0e7ad443d0b5d0a44867c9a732681df3bf28b30a2e14dc7d2eb43859483f452723b614ff6e8f52666be3840d88104aa2c82616628210215e1765b60beb3ea2
+DIST firefox-128esr-patches-03.tar.xz 14156 BLAKE2B 9a618f0ddb8596b740893dc9113f374d193a00e4e8e76dbb2794928ceaafc7b5309cb6f69f6287ae1e423f0be0a060580b0d9d59307c9889362dd17fb7d31d3d SHA512 c6ec7233b368fac623ec0cce6f5c37d358a0fa5bb2154dc67eebb50968376ca9d46f3a734f5d79a4aa4edde9e300a9c65315d0e499aa6a1325b6c76a6c164258
 DIST thunderbird-115.14.0-af.xpi 551075 BLAKE2B c059761dace91e4f5e98f1bdde879312f2eea951ade269c7b4239974aa4609cbc8f3090a0646e87fad840bfc166ce2421403e7c210c8ae965ae6385404d06c4d SHA512 584013d7b6eea794448f4764c17de7b989155ca782f602948a2d0f745c4344954daacd35327bcb85f9e9cad99d5b917f748d47a4805cef171d806bd8211aa591
 DIST thunderbird-115.14.0-ar.xpi 673775 BLAKE2B ea5e62105a53306ee18dd332775eb4917c68d041f50b14fda1baaa9ad09df42e6dafb47a03023c3a46cbf5092009ac84ae97cfe82b6771a99dcc7e86c6844b32 SHA512 2767eef517e451aedfca4b9a8e254f4388afc1c6021cdc301bd56513073688a63ceb7891aa5bb9dd6c83ae2d5f9078e9b832bdf3e761c88e2379076d15baf519
 DIST thunderbird-115.14.0-ast.xpi 570025 BLAKE2B 3477dcd1ca19880feeef3dba4fa07396e84acbb80345c1402fbfc1012451b2abdedb05b60f4907ff2873da174216e1275a61a281f4ccffd0030403b4813062c0 SHA512 a01c2d85389e7ca86af4bcc73565bca9faea308a77c16457dcb981492433a177761dd20daf3224ee64c7a527408265ae53fdfb2c2a5b4cfa0df8d2325240ca3a
@@ -65,6 +66,71 @@ DIST thunderbird-115.14.0-vi.xpi 774809 BLAKE2B fc16ca251941ed6e89b5cbbf8c5fea61
 DIST thunderbird-115.14.0-zh-CN.xpi 775075 BLAKE2B 08be1a16a498404b503c7ea084c585a2c4f99c755b233a8cd3f8c384ce6b4c7768f0f6b03ab77e4688d2241c07f413decaca6b7a38f8113161e2c1303876a5ec SHA512 eb4e1894f408b7d90982a447183c3dbd702c654950c772c3adf6ac90be23655e6d6426210542de70682ba70797c247e6271bc7867fe2a8dc04ba8a63ab0e94c0
 DIST thunderbird-115.14.0-zh-TW.xpi 778882 BLAKE2B 1c17c1d70f42ad4a38497846fdb6296816f5f5bd782aed05ef090b2913170a796e1a54184ac566c3c278ab821dfc9379337f39a1c31f4f98e80833bcbea99189 SHA512 661acf4f1eeb803eabb4c5b8f9cfbbb6bd71eb456860fe23debf0de889d204aba490d545334098c8fd302de29b6adb5f1a75c4bd96e3fbd13f3dceec358a15ad
 DIST thunderbird-115.14.0.source.tar.xz 533296972 BLAKE2B b286062857df12cee6b5aa42f26de7509cd89558a8173cb9e1ffebda2c9bd6ef808bf5034ee2149809e6c427d9c3fdc7f2d37030b0c71aa00d5b8f5381166d14 SHA512 b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29
+DIST thunderbird-115.15.0-af.xpi 553548 BLAKE2B 62e9e3904c8f89cbaa6a01f6734e09bd93f3dea42cea6b0e5ce793a1ed8dbdccf5d1e0d67d92f1e4de09661f14f8a6cc7481f1860e04a581635ee4984355928d SHA512 2496a41f4f18cf53d0607c81659aaa9c248e07ef0b2068e6fae888a76b4d15fe8eb8e1031b21f81b586886e004c19e3d18a7b2800a12f3d0986a2b0c33f61109
+DIST thunderbird-115.15.0-ar.xpi 706940 BLAKE2B 3bd58099f54219d62b24013f8ea920d03514f6e9589dc6d19696b7ef78fa4b703a12d83293583b9c8506055ed2f47593e1b8b4055dd3abb1bc5554f9a5f9bddb SHA512 9c1bb958ab1101457f91f6fb5e8d35c2d0e727c3f9be02829bb536f1fae959d8fafd1d88e592cb8962f19dbbd227061c3e610acd55b10da3b166e7386b4acca9
+DIST thunderbird-115.15.0-ast.xpi 583831 BLAKE2B 91f3eac2479eb1f789ed5707443425c2000ad7d69f2431c78f3b7733736825dffbe02eef1f0cc48886648fa5e22dbc84f275efba614b43340d1726ec4d3ef86b SHA512 bda904a4f4072e87799f6d5ec99094457275482ec622e9bc87e961e91566d6611c1a3522f6bb7f36387b515c114d6a8ef7a9d15f2a673e5fbe02678d91855c2f
+DIST thunderbird-115.15.0-be.xpi 787754 BLAKE2B 89ada2a5bbe21d67caa2dfcb0598a2ec1a1986b64d397eeeda69c84260cee80ed34d42ba25352404a5194a387f4568c76f5344db62a5fa6bb1457e929fb475ef SHA512 a368e0d276f4f18b2fa6e552a6536db4375d1673ffc24a0564e779f4a573a0df5e830d825ba4539486aadc374cddc3dbcb4794f42269921b08edc5dfeef457ef
+DIST thunderbird-115.15.0-bg.xpi 828487 BLAKE2B da7dc05893f27e8103eee568b0886dc9b99e95c5fa041baba722043b704c20b6550fe00628d2e33b3ebbc32bd99ede28ec2b3b3a8a88d9253100bc960d4bc319 SHA512 04c68c65c7466023689d362ed12fd9de1a64b56650622bc59fb108a2b9f20ea0fe8b5dadd04a4a6cce769daccb3da973bb266d851b03937958c95bb828e371da
+DIST thunderbird-115.15.0-br.xpi 677642 BLAKE2B dd8fa1be534833f6646dac0479628b2510a86334b6739967e8c3c9bd745047b9b7f351546538093188722b2a16bf0b4f6436b89326d799244676efffbdedfef1 SHA512 0b6e141d12df90805c9e9ada288afda8ee562e7cc7909e89f181effdf345717699208d82b0af93b9d057dc5329a7c75f612005aab288a3d4cf3eaebf49a0fa99
+DIST thunderbird-115.15.0-ca.xpi 732349 BLAKE2B c8c43c87bea904f5f95260167f360efdb2f3a05956c4bf023fa600b2b818479d2e1da683d144547b0f578c5c5f211cab199dfd3dace4b2261742729ba12e690d SHA512 dede551b1ce32df6c0e278ce0f611e24b8157d023699c24b18c0d4b08304a479a266c290a1838e9b3f51995480f2ab6c3941c18172877e37cdeae760c08e2151
+DIST thunderbird-115.15.0-cak.xpi 694684 BLAKE2B 47d526da3821602495b0540404dee1b23eec8ff5bacae283d00fbc0582ed51fb9b9ea400033c79c117bafc767fe3659dfb54846f067fdee644bed53eac01703e SHA512 6a632d77d7d50c4df06d64bcfd85fbf1ba7e367caf0f8da5441722079f47e4d429badf44ede6a1ef8011d180f2059f05424e8ad3220249c4fbb0eb31aa6b5493
+DIST thunderbird-115.15.0-cs.xpi 814276 BLAKE2B 54399b3c2a8c0b5c6f8df4c067712373fcfa7002083002504a3d18ad21e56c6d909544d3f9f65cb3172276e2e7a353cf60365915a382e4e546ef36cc1ed0235d SHA512 9d7a87727302c96404f6368e38b9af4267e7fc474943e5e00126c43d98e912d3e2ecc70f139b4ea47e489df4322b47ef36d67912f9b284d3571effc758ede07b
+DIST thunderbird-115.15.0-cy.xpi 776201 BLAKE2B a9eb65746714b5e1fa18a9063ba0c0a41c67a929c3c8be6c046acf1061648df4dc9db6f1f23cc5e0902168e35e01b9aa7d668a15fe49a923b42d7f55dda6325d SHA512 25d65bc1928729d7d73dc696e7cbb10dd2b1ef3ca2b9ec6cfd30cd8cee13bd417a2167797790b001d8816d493cc96726845e8031ce88374197402ca2dba27454
+DIST thunderbird-115.15.0-da.xpi 762858 BLAKE2B 5b66867366323a8f359c34414f20dbf3f8c45de0f331e2cda878de72e186847a964fbf186e297a0cbb9271567575f5541b0baa4149555460a587b327a3d8ecd3 SHA512 fbf6ffab75a1f05200be6e0c88b3ee5e84c595e2294a1b0ea37d8c80fea7b6e3d8b363db9cf07b26d7f24a84f1bdda46557836bc7ee2f8e8163a07bbf4ddc1f3
+DIST thunderbird-115.15.0-de.xpi 794013 BLAKE2B a1499b20f81b34f0fcaf70c60ee0869ccc86b4025a0aa70f908c903aeaeeed001562130cc66571831b1725f6bef897b0b5c2fed551d8869f264dc1c62b13f62f SHA512 d3757ef308e58c0e68772b7aa4a4452869268dace611b2702aae0c725b4cff0baf2573a0087e21bf8cbf26829669abe0afbdd37390cab5879efa4c798ca448f6
+DIST thunderbird-115.15.0-dsb.xpi 812883 BLAKE2B f9795b4fc72e8b670ceb980bc38a8a61adba0b1752d463273da62082f372feb4ae598dc05d38c43aae907840d3676835803e77ea64f18cb2771e110ea84a8762 SHA512 1801e5a70bf5afd1ab6be7f34a2734644f7dfe951cd80efbc4cfbc2025a1782c804cf7284b9b4f0847224667afd565a670dc306a539f841a84b08705a4108085
+DIST thunderbird-115.15.0-el.xpi 923744 BLAKE2B d97291dbe15cb78a3e68672573699339d080bd14b8621012d37613fc330602cd859d8ca0cd3509b278d88cd7c10d3adbd7d2c11e016b8c9552f7412d42aa6249 SHA512 12b41df0868a571a78b068eaa2f66e71c059df20a8dbfcb531df06f05f9385e19be86fc784fede52753d6f6292e8808010ac8e66587e30715c98e3d7077d2ee9
+DIST thunderbird-115.15.0-en-CA.xpi 728508 BLAKE2B cc4152bb9ce4179868124cfc9a4330c87ff82e494f330ff6b391b976ce01b6d74b831c589ee178478c9788ba4de1c449686cd5d6b169498a2d598c6b480ed850 SHA512 d9381df862baebfe08549e873c5feff9e779b6336fea3a6bc458057a0c45e8bf81f36c694b68b9767087e4f32b6cf3097ae7e0724e78b7af3160d5957a88c396
+DIST thunderbird-115.15.0-en-GB.xpi 729649 BLAKE2B fd08184f7dc96515a2ffd9be3b760971d163a81097a56c7ef835ff2be2f6ee417ce98e8eebdf92a23003c01f23e2b02249451f50085c7d6d24397d19a83f67bc SHA512 e2daf19989bfb7592e7ea3ca0f4e68608b06a5691ab5c38a2df55d3c8751252ed1820cef3b23764624c1e2a6c5eb15aa09b452e93ea0bb1561e633b411bca395
+DIST thunderbird-115.15.0-es-AR.xpi 787328 BLAKE2B c88ef73a576cfe7c70dc62b751cbd55f45e9a9f2ed65386fe2c7220eea78d5dacc0d9b3f26f445becd65b628fdadc6d077c2923de1877a0ab7083093dc294dc5 SHA512 ea65441024a299fc6a9487f77aaa02a6ad53d66840ba06e535a580c5048f7ed4ea27ddbd77724bd0bfc992085344bdde440a5fd048d946fe821301f669dcfb7a
+DIST thunderbird-115.15.0-es-ES.xpi 751242 BLAKE2B d257ae2832b9feb601baddd44f6efc54f69e7f40ffe2e64252b3bcfe53ab0be1bff49e28dfeb33d2ecf613d63c96712779f513ddc443d6a809c8cf1d47b1e2b7 SHA512 802126f07e178d5c38fb74f02fb77fc32895fd38d6b2525c08b90d5458ecafff03a80d7b468e08f3c42fd71cabfb353d79b92c4d51dee99fa18fdb53efb19512
+DIST thunderbird-115.15.0-es-MX.xpi 757498 BLAKE2B daece78669631a36e1235d08d4d23b148f389284bac985d634fc6c1d77ba69f97bbc243063026069487809a79f9d084ffa68a191341dc4ffa78fe3153174fe09 SHA512 9cc2d48a7af9c53c7450ed2fce2f6c3749d1dbdcb135303e7b4d233dae96490d3597ca65d5152192152dc8438c75865d112fe7b3581e6e1f4d7dec8d8d42f3a4
+DIST thunderbird-115.15.0-et.xpi 716734 BLAKE2B 3aa410ef782a893f09092a5ae6c259a6e9c26ffc98a729971f41134d0ffd9500a5c9179145933669314f7eaa08dad8602fef0b271873d9cb19a549d64a1cd5f9 SHA512 20a09a02768792e617540e88312fc675c086daf55a279d7f398b1ba3b7fbb678ff04e5bb90c9881554d3ec0d316ecac30ee2c29c052545955471636e54c0a01a
+DIST thunderbird-115.15.0-eu.xpi 750792 BLAKE2B c165efbdcd40ca4d2936c409a34b675815952ec6338b0a90a22e249706e9df6c1701bfad99b5b478b7ea3a2df325fe928dd1122613d407a9e80844b749319031 SHA512 b0c875dbf7bd312ce28cca2b7693ba07154209d0117c596f5b2984c639ff53391147e04f302d82a42a333a62206125f33ee04b471ae465333531971865111281
+DIST thunderbird-115.15.0-fi.xpi 760381 BLAKE2B a4744d25976e83453d0324df2c580195fb2c9e420b9e1116b115783b8373ea569a7bc3f33ed86669c7a4ba98b9f237000cc3e56bc96820285b79ca14a83ced31 SHA512 2632031a4db1832b30e78b8944ab2f2f6dc32d6d3df763ab22ef37ad7cd7d06baa1c4db16b18a5eac0436d5a38aff7fdc8027a3be6a22430d18d3c0041e4a439
+DIST thunderbird-115.15.0-fr.xpi 800563 BLAKE2B 67f05fcc018554e2596409e9fd532059deb097458fd3c6fa234dfa996fc4326c23ae3b6a211c51eee7292a163ac6c59cdb0f014626206f296c3133e934810c5c SHA512 788dd6d65879f5723db6fe4d5345e60be6083629cfb413c30198912c50e9c47727759fe439cd26c233b5efa510e62471d6122638f86c5827a7c0fa6da7bceecb
+DIST thunderbird-115.15.0-fy-NL.xpi 782017 BLAKE2B f6f6fb51e439f9358bf630aa7f6eeeeaf1d3ad2273eae270473badc3f7ba788ed0b3861924f8ccd1333bc861ec5796858286ba1b199af6f7e0b78a44e60fb2f3 SHA512 eeccb4f8fd248c400df6d83253d33e65123542917ea6c25a19d7c5c073f86cb27bb762d4f87db3ad8d15ff4d3a8656d1c549a9b16f3ad4de057d77ed701ef7eb
+DIST thunderbird-115.15.0-ga-IE.xpi 640765 BLAKE2B bfc70a6d2432c6bb716c24d6185d9de52aff8b3129d46fb5e248ac4d8231167be6c969153055eb147e65a626a501b625e9e2c2f2943833d3b875af00bd1b96fc SHA512 2e628b3f3a2ac64b8c089d9fe46f18e43d81710e831991884f19e33886b3f964a063a2be2537bcd66be9d9510f55d0e14d94eafd602999d0587351e9c43b9b68
+DIST thunderbird-115.15.0-gd.xpi 751210 BLAKE2B 82a71dd33f3a0075ee71fc35f28117ef66e45a6ee248867e99dd90f78f6bc557d6cd03564c76bc64e3af2d4e4f2de39187553639a93690ba2f31a6dfd3859d42 SHA512 ea8f8f477ea2a38c4b30484abc3cfa2e31b637830cf8b1c4ccda1dbe74d921e929ddbf1cdaa954814d5d5192b41770086d1ad71fb8243d5277399921a6df0554
+DIST thunderbird-115.15.0-gl.xpi 761600 BLAKE2B 54ee430dd05878fe3e58ace3ab55ec5000c28f0658301d9ba74320454b4b8e48017935b89c07b094586112a65a60a10e95c83ff106d09b575a9aa5d80e6d375c SHA512 172a39a2b3439438b60c0c439c9234f6cceffebab3cc5429ac1358ad036179fdde25c10d39f7360208df2127eed521505c56043a1740ae52c5381adee93cd324
+DIST thunderbird-115.15.0-he.xpi 724287 BLAKE2B 454140edbe87cc51ce54aa6c56ac7bbdbe11940f7586ad28408cb866948d0c4f659b948f5f475e48526da00ee598a5c2f3017b9500857b948b6926b241e3d83b SHA512 b504cf16c8b442091e309c394b9ac6ddde2f5eca6780df2bae7a8a5ad6e1551850525cbcc975ce6ee92d71490f10693f47da7414844e02969c9760c1aa24ac00
+DIST thunderbird-115.15.0-hr.xpi 723720 BLAKE2B 58ba0dbd29ca1ec950d8c7b03d59efb725462e8a069d86eae1a1a2b0431c3902e21065095ab5f3655dffeecfa2d17b1bc01c19a83243b3fc8fce739901978353 SHA512 b2073682142f979d6c524d2448ee59ae0c0071daed287ec5a8d6cd3e05d71018e432e37bfc392af2840cb8ae60f3e2bb693e12dd2fea6f8e794e377a0b0efc6e
+DIST thunderbird-115.15.0-hsb.xpi 810428 BLAKE2B d532e05091137f25bbe70f543da50007c2c1e2191b3b776c0085fd5f1b5de4ee381798ce2b629b487e95444b74261e39b60c8807e7bd3c7b7f9ad1842bd72d87 SHA512 f863fa7fb45cfd91ef465ee1d7d2c57be094712a6341ffe27da857bc3b48a33919c983cdeef05943ad066bc00f62485dc5ab308302e79e30efc7c187117cc07b
+DIST thunderbird-115.15.0-hu.xpi 812084 BLAKE2B 92b0827dacd1c2607649982456f084c81f7a7d52b2f0ca55ef624523bdbbc25deb7d66b09716afe5b5668ded69ebd5e2d07e0bf463d5976fc3e8d4c821947168 SHA512 920b6a4ef23880a46c469f2dd8b63517600aa1ded49169b3982574c16c8d61f1d2732310b46471780100ed6e3a1e87f0484a325f84ef053b971d9283efb25a23
+DIST thunderbird-115.15.0-id.xpi 689001 BLAKE2B 287bc728f652c87983b92bdcdbc8fdb484a96a46a4ecee4a1134863ff42748ff9ce9c9f6fef9de2d8175995ec975d1a25cf091e5507c117077d6bdcd1114fb49 SHA512 094c8d4eeaee440ff8f0022ed9371d348794df30e6000f6533a540404c65ada4382f1ed08be3cf07966398e506a0f2dcbc7db11940ac1ef40c553e12494edd5d
+DIST thunderbird-115.15.0-is.xpi 767724 BLAKE2B 88325eb0c14edf8339c7a65b844962b1314fd2031de657c9ddad9df1313051861275725e761bc03920b8efde75d7eb3df33b95acda96741814a1e5524fc8087f SHA512 3eff726fed4f98304da87cb19296e3ba15b8c98dbaba6b6c7b02b7769d1fa04a3826f725de78c67eee1f5847fa34607fec375b8283c82d028cb88aaf25c119a0
+DIST thunderbird-115.15.0-it.xpi 717903 BLAKE2B d769ba1b46cdd414dff918d04e52b077715606d77f3ef8b9b119e813a7227877f0622ba7b2d1afd1deb78d768f71c06b735ace258ff5b7e00691357d587b400e SHA512 3f1c9c1712d2ee0e18f5e41b79870480ebfd0ce8e6660c18448def04ab96342370e882e6f3fb1dab4804dad3f83f57ef9453a4491c1679cf95d3b15d734942d8
+DIST thunderbird-115.15.0-ja.xpi 849892 BLAKE2B a7b1d4c2910fc999b38ac2742fd71a53f06982903256298abaaac6a697afe8f46a63f78b9e3fa5036838bbbb7c5dbb9456ae315ebae965d4768f0c825dcc1020 SHA512 a5885e219687f0804e3ab7e9c44f4771de6b98154e4301456e9cdb70dbf347afc39f2bcb38151af808b6e968a21afe9622785f308ad19df768c4f9c22c7ec381
+DIST thunderbird-115.15.0-ka.xpi 825497 BLAKE2B 5f8c516c60fdb2b292601802ec5d357935f1832a665bea812bd386f7d3effde9ba6f691b5c51c2f93a1be1a4c93e321ea67a4aeaa48ae296a6e703814d668648 SHA512 f9f459731a98d872a72092d104ccd43207bdde060b44f21ddecee773bbe521ebd863290391664e56ae3f3f5e9f304ee0b4742d05cd176f192c2c4f9f5b12036f
+DIST thunderbird-115.15.0-kab.xpi 757769 BLAKE2B 85769ea8ee24d0385be470b57ad37d8a1136489a199c30b0e1ed89fe150459032bc7d319ce44bfab8678186bb4350527dd6b629bf5da186da7553bff50d499b3 SHA512 d5369ccdade4f1f67c613a4a9ce89ba54b880a09432ff8c129d15c84392f5a55244845104c848bc45508094104a5f42f46e90c75c16913764d5a997084bb0722
+DIST thunderbird-115.15.0-kk.xpi 890201 BLAKE2B 875bf941500c677ecd5ef8a68a0a18de80296964d8994dacab0daab04e7d54a4b593cecf5d2372c1b94482685e3bffc1af8e3a216261114a1f3ae2a59c217eaf SHA512 e79f808d2fc4cb9d3732e5b9850074dda396e843388c22d305f6dc98ffa05030c08223b5b7bfe7666fb3e51959a81ff673938a0049a8fe47c0d63ec2357d1f28
+DIST thunderbird-115.15.0-ko.xpi 784810 BLAKE2B 349edb1a57558d020c840afd7f1c97985c7f3d73db499df888f8b4bbe5c3526e9f8d888016cc5200b0b05a5ad3a0ca3c5f21112ebe1e2f33ffad63ff7d227a69 SHA512 4b295c31d2d25b0a8660ba8fa2450f5777b4e8281fff7bec7b9acb95c55bbe3bef07fc1634d04b8675177e02cae82a632431bb873197535c4ec24e77e2cbbebe
+DIST thunderbird-115.15.0-lt.xpi 725498 BLAKE2B af4d7b8fdda2ebf20604dbade0595762a3d62969d856c118fec85ace2a78e6599e6076ece85d77fd59f253ab820e7615a1bc39aa990d958908c4d3dc93d98aa2 SHA512 2a846f8cbf2598938af8b07014e30d0d961bbe39d28fafb9f936aaf0a366e0b711faf24d833dede396a85cc8dbe35251c1faabd604699a19fd04dde68cbe4e64
+DIST thunderbird-115.15.0-lv.xpi 646853 BLAKE2B 2adbc3c14e4d7ec694fc60afcaec80f983ad9f023c8aba7df95275e1b01c56c5dfd9784d30f249f3b548477a661555ac531bbf6cf621338f48f47a4f076726ff SHA512 259980f5d19380eda199c9f6a2143a4ae2297462ace0f87bc9eac51016b6646724f0376ab8fdf9027acc619f4053cc8aa4efc59abf5f5480e62b6a3fb3bde677
+DIST thunderbird-115.15.0-ms.xpi 604574 BLAKE2B aa33ebc053162adb395e53ee6c0d24da671afec78019a045cd0f9eac8a705eb0de36fd41ffe979110fda95d9d72d286700452cfe7d60de63b13991d60a3f2886 SHA512 a337100b2e2af801915fdc3d3ae8657d02b3d0b79e628fbdcf765d61836fd16578d3184c0fc86ef54e701810165502e4b2cb3643e91cdc48e53653e053bf2907
+DIST thunderbird-115.15.0-nb-NO.xpi 731332 BLAKE2B 6a4006aee252df55b1650e49479ec2fd20439734b54d6a8d8e9e9d92b0e3527f010a9bf8d9176413b512dd3c596ac707e06cde41c93c73184218346091fc0011 SHA512 132ac5c6b51aa54db8a99bcfac53f26029e1f9366fe70cd3ed92bdb16817dce601c8580f9c4d3ec072d16bee86b7b882674af5da0a1ea721601c45e70710480e
+DIST thunderbird-115.15.0-nl.xpi 772932 BLAKE2B 3835c5f8f1e0e5c83241620f8f5e93991b2a864416f80042396c40f7071542bce055e2cb16a3619384253afb1cbb35a133d906fc34d45bded51950952229fed4 SHA512 e8efa8aad313a8b0b737932de74259193313eb2dca9d43c17006d50c9106025b3f87cb0fbffa54016d0deab1c2122f19e855a19e89935328bab4c365739faa77
+DIST thunderbird-115.15.0-nn-NO.xpi 751328 BLAKE2B 23c0990e0008d669260ff983ad2b0c791b9ffc72666f3fd7a783cf9e3515151b714b39a94956349a24bf5b2fecdd108a830164359cc4b78272e22c56b33c6695 SHA512 6c4b0b49a52fe991cda6999a306f5455f3a0b50304aa5f976d204cbd0ace3f43cf035d7ddbb5573e95ad49a7405fc73d364c05e98fdfe9d3d79fcf4f5c2162ef
+DIST thunderbird-115.15.0-pa-IN.xpi 707741 BLAKE2B 1040a214ea3bd23bc1786b9c2283ce300fc2d1d0f1511a579139fe4fbc3eea252f08a9f1f25b797087b7156ad5a761843e3f65f46e7e1a237c4387846d4facd9 SHA512 b795f4b25f93532af62b533c018800786d6bc2516be74922ed4703309637133bdb44f328682c89a44f58b04b56bb906426114c1a9f3c1ab9aa0f4554057eeeaa
+DIST thunderbird-115.15.0-pl.xpi 793040 BLAKE2B 213e59d3a9086dcb455fcb0768d38bba682b289bc8c253ef6dcd701896506bd80867842ad364ce2b712eb2b740358cf973e8a46f6cc2e2865df448e296099984 SHA512 34b1fcf5337fc9dab9040f0344786d4945c2a2172979456920e7399fbde033218f8122f17991915b04c95e194643e339e7cb0e983aa540093553f21a243b3dc1
+DIST thunderbird-115.15.0-pt-BR.xpi 780411 BLAKE2B 686e3b1c93e30d353a64ebce552b9d6f019e8207b74d3989dc7bd5499ea213db8369cbc17c7d9b5edef4d363ff35e440cf560c818812aff8066d2e65ab273c76 SHA512 b0abc305d52bdd83a445122b3e7a5083ee893450f03359aed7f3ad1369a80f5a28d209a3bd417d42601bc0b8ae91ea8b7755946b47bd59f1a381d3df0e60ba38
+DIST thunderbird-115.15.0-pt-PT.xpi 775799 BLAKE2B 70418fff74d67ae80da5724d5a665dc75f0b1590ee0c58145a8f406decb7bf34c75df981c07d178c57ff8cf253251ee10c753d7c18b389dc3339dec3cd398daf SHA512 179e73c6c30b1d6fa5a2d45bfdcba08906a12a9754ef4c3dc22e0a21d3b055a7ecc1dbee9831b93a04d237e33a6870a8b8a3f640b5c4dc653a67dd5b445a95ac
+DIST thunderbird-115.15.0-rm.xpi 776803 BLAKE2B 7a2e9e81d4f87a5779ac0d9698317d228f019d912c37e6125c94c1ce8ac38b6b3658b3f8625ca36ee44b4593d5e1746ffeb1a0142a1009c367fda5f66e8ddefc SHA512 2139d1c10b42f4a414e616abb5c9d91660cc282f92e70027701ef7daf8959d1e0353631494f580298b07124c902d40b8b6867f99f126f85a82ef0f23e6d6aed4
+DIST thunderbird-115.15.0-ro.xpi 693502 BLAKE2B 4d441b79b5d3afa525a040df641b9dc1116bd137902e36c3bcb09959ee09594b36780806e67343970fa42c5e952b35dc62b5fa8f0621825330feb59f2ff2f53d SHA512 d2ee3bc13614c71d9b16e42cba267ae80336bf978d01ebd6ed9453c2be0d6a0f5adc8fad482e835879cb9d534aa38ab5b80cd59a422a3ea4b7ca39f37443f9c4
+DIST thunderbird-115.15.0-ru.xpi 905766 BLAKE2B 50f214ef41bd3e0e57ac751e1b71244a5cebd67dcff870dea3dddd3e28aec34ba0ea3b9849d92adf68ac3d54d2ab2ee5e0f11dcba9a6ab977f06c6d5cd2a9354 SHA512 140129a13dd4cb81f8cd5643eefa97ceb4674e154774feaeb6679189cc0df0ba9f060aa6a8907454d0459c5d6cee165a59244eb02f50f2a385bb903be9e3594d
+DIST thunderbird-115.15.0-sk.xpi 813473 BLAKE2B 7af3e872a0b6690c8c4d0b36547a2c5f7b362c5f2744cec974050151c6a7fe9a56a46703cd7573573f083d1561faf23e4aac694388f708eb1f3e5a7569a6dc4c SHA512 4a1eab644776f7549764922c59616f96d91bcc29e4ede3c4bd3562a3c10a4b75145923ebee9226bc8849e1b0818fc5d42ac9a9f357abf2b15da1e688a677ee92
+DIST thunderbird-115.15.0-sl.xpi 771130 BLAKE2B d768a1b4906e32b65551bb48fe701c23cd007aae6e49126af1296e276471fe3dddf27b17f4363dbc285068325fed2bc7375e8bd2f4387065551f9d0ee048f8a4 SHA512 ff6f2cd3f2aa92ba975baec8afa1283104be6b80b1f3f2b845abea03a4f66c9b3532342e26b11b79d3a5cb750443e3237df16285d1c1a3f66ed8e7bbe960203c
+DIST thunderbird-115.15.0-sq.xpi 795877 BLAKE2B 9e88bfdb0d87977980ca28a04404e0c3f417428e363e768ac7e48edae93a45bf65ffa7c1ce29ef311f569943b2fdfc51b1aad11e8e2736ec7aa73e1062cef2fa SHA512 10f976e4e27f684b250e000ed867a16488d049580c0d386dcabc4ef69b79ae92a2e245f398d8cdf518c78b44b6d0630247d47c0b241901570eda5e2f754023b9
+DIST thunderbird-115.15.0-sr.xpi 794778 BLAKE2B b66b90e413c840acbb4696f2f9dda861df7d3cdf945eb1a7428b9af7da446bf12de1f082950d6e9361d21462c9bb3841de2ed61111ca18d377a7f76566d8b0b6 SHA512 47f7dff1d25d51d55c067d4eb75e74d67291f555c6bed5e19dcc733cfc6f4558497b1ac3b5b72c36527da43f1475ddf51d0b8e53b235bb3fdbd963f7b6edae10
+DIST thunderbird-115.15.0-sv-SE.xpi 776291 BLAKE2B 09015a65c11e3ab8a8ba9973420d27eada85607d074bc752b98b0be68c70093f70a1bdd8b64e1a6fb68ba5f9611f68027920777f8e55380de5e7ca5e36b54beb SHA512 8a095c742b58736121f4bbb76b69118d0871fbad1c69df51663726e58e07f8781bccf59ce12364e847e2c132809555a997a92a4a77751b2e257cf5bea16a4082
+DIST thunderbird-115.15.0-th.xpi 843556 BLAKE2B b2b860fa51391c7dc0a3d2eac5b49ee72850c177ea776a60af32824f0fdcf310b98db773e46d32fd7a25d73caec36837c09afa5daf615eaa400f3d907588da94 SHA512 ecae3e36c620d9b9481add385f2ca5b7315e5d053e98dddc1be0d3c290c52e1c0527f69427261845e04b7b2b8772e4420daab6507dc577888419e3cffb186383
+DIST thunderbird-115.15.0-tr.xpi 786494 BLAKE2B 619245907e2f1ea6e9fad1950507b1f8036358192fc406900fc1398dceb323d909b9ec8ac13d782f2ca307fa86d75338787e7509bee051a1dc40fb2ee48596c9 SHA512 8b926b9fd9f34d3da683792bd31d9b13178fbf48992889b28b2ffacd729290b33742bf61b7545c5f5688bfc1e40112c71227c29d8951fbe065fa755c9b5356f1
+DIST thunderbird-115.15.0-uk.xpi 889489 BLAKE2B 8026e53271436a08be86590ee532f558c2deb0383b1c6c17537dd6962d0441eae7f63ccf3f8d0bef26982c70dde01a9b5551cd6a3204f8f852f5ccaf9f38fb80 SHA512 eecbe3d98f5d2c42384031a6bd74aca52b281be25a38a990063153447354ba1500864a775f56e9b8b2e0c8164bdf1408cabb36c79b2fc0ab9fed6db2511a80ff
+DIST thunderbird-115.15.0-uz.xpi 616842 BLAKE2B e91646bc269836c830f0515a82ce0edb81ae1574c4367b967531f6b53e133143553cfd94884dabbdcd6973cc1a69a3ce90de5a5f189f7bd05a707a311c97247c SHA512 27ce21fa8bd28b5a2357bf025aa45dc7238f7d965797d7911f567c8c5404d8f4597fea77c4ef2a250bb37cc3eb888578b2589430393e0155d01cc61a9889c035
+DIST thunderbird-115.15.0-vi.xpi 815663 BLAKE2B 7cf6b7a580bedbcdb8d1d6ce969ed6a475db3301e1ed72f50ca0be7672c5932af64cc44346a4011694edfb17c4d2a461604be23140285756061f7a97588a8bb2 SHA512 29502cfa4e379d46603f3aae3dcc4f6f1d3371f69a821dec466f5febee8cd9fb80dc68de65198290d84b2ccb4ca333d85a1e9bcdeb8ccea6a19ca8961a2dc9d6
+DIST thunderbird-115.15.0-zh-CN.xpi 816082 BLAKE2B 6327323e3cb30dbed637dbd82175ba0f1eb68c6b228c735db585a8050358739bffcc2ed3d0f86b84a0f5dfed16cab9d4b4bd1882459903fc5741dc2ea63c5a31 SHA512 9861cac106263f3928a0cfc70f4760f35053a8dd4c207ed788922328fff5d297ddc9c81768d461fd04b0b3266ce1150022eb73405c3fa5876f9c479fc7655b10
+DIST thunderbird-115.15.0-zh-TW.xpi 819843 BLAKE2B 1f5854be3f2cdd4f680b0d649d6ee144f0d2ffc0cfaff094ad2f569a7c3a3245c8c460309b352de87e884e484486d9c3b84cbe56b07408706580528b9f65402f SHA512 3e7fffbdbe5b4435a29a420496e341a9b9d04568cfb46e0f73a8bbff4640d85266d105ca39789261db80e44834e7813a62723f5f3d190fbe585c293cfe03f39d
+DIST thunderbird-115.15.0.source.tar.xz 534455612 BLAKE2B b77bb2a6c1334fba8638b299c91ab71e7753819538aee005afaf4554db8a91838daf88a670f6b108d7a33dee1a0fe57b9d0c9aca724a471801e858043a5d3b45 SHA512 b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2
 DIST thunderbird-128.1.0-af.xpi 530022 BLAKE2B 741b3613ff2d6478d241bc4a2498827f4ab3915ef8378ac60a360aedb90b761ce14142ea3e2126d56275c97d47744325d8b2085b40dcb174bb320d791b7c1b22 SHA512 80cf8a2a84d4334100af3c010497a3b3f6a1ecee0646193f1534dad84de96c6aa331a18172ecc4da7428b4c4881d0a46169ce8893b90845e680bb9eb5fd0e476
 DIST thunderbird-128.1.0-ar.xpi 679531 BLAKE2B 545379463b938a57ba4de7f08f3df356e0e7b74621542d74fc40a2da84d127fe00785561f7fec446a434bc29ec3ecb04965cde58eba684f52bc3d4f189f34139 SHA512 89bbb69670c0db83053c7bdbc6ef8590c01805b487f8cb40d5139e2973aacce9e8277d20a779ba372dd29453f7717bd7cc27640873d56961b9d3321d1ad7970c
 DIST thunderbird-128.1.0-ast.xpi 560727 BLAKE2B 75de626cbe945a7e1d86aa1a5ba7ede2009f9c437ce46d605b159a6e84e84d600215f537c94e28e825b82ae237d55fbe3afa1e60316859a4ee55e572adbf69d6 SHA512 db71edb6381fafb026dd28dc48ee3e9ace6f714bc1063ac75a283bf42b545e61547ce8f52f6427d656a3533b6d250122ae3ae21e856f96a61fa1539d0fc3d0b8
@@ -130,3 +196,133 @@ DIST thunderbird-128.1.0-vi.xpi 784659 BLAKE2B a5452b16ff2c77537db81fc43b0696970
 DIST thunderbird-128.1.0-zh-CN.xpi 784195 BLAKE2B 8431470bf86b0ae14013c46fcf52335a1f18240a8c27d52f2d3b2532d6cde2d75ebefc1b25f8dce4cde0ee95d6d92229c57b6dd82551fcc31f5a557f4e3c48ca SHA512 fcc3247cd35392d05a2bb7c6274152a5724e8a96180c652c5978182f24ae19b63e99db9285687fdbaaf609bf03f2eb014891f218bdf6bc4721e4be86b6602af8
 DIST thunderbird-128.1.0-zh-TW.xpi 787478 BLAKE2B 808f24ea4c0be1ea3d66b1cc10c887b201563a2a0e011529d4ae4b2da63ed3d43a7c27016a989fab67ac819ad685c6c4089988946afa821ab85850d9843be49e SHA512 fac29119ac494ef69432a79328c507ab3e64a7e94efe504e5d9db24c01d6701616c90eaad2f446e1099f954a465f91eb408b82e7972bf7e99c4fba74d3612352
 DIST thunderbird-128.1.0esr.source.tar.xz 677372864 BLAKE2B 43afab70674010ebc0839eacb513d031cb36b7c2dd7bdbe3d1096b9b16ab82e36c6d45b638e37b7fa6b6c88b1ab737110512ee17aa0df2f5c827d11ee47d2fcb SHA512 cda64afee45ae20a627116f9475cc4421262db40a7efa09eeafcb6e96f8fad97e8c96e2ecf04466ac4bce99fcebe0c3ce9953fa3fc4f5a92ab6f60e122f58c9a
+DIST thunderbird-128.1.1-af.xpi 530026 BLAKE2B b10f1d8efc346b3dad5ef3a8d4c81f354d00a69751039637a3a2ff0cb5610f3c187d00b9f65f681a8f1480011ebc42645594cd0530c785acd0dbdb835190c0c8 SHA512 679d037b130be9f6463609d4268ef3b3b40c9efeb308f12fe3865870519c2a6805cb0c91b8914c7752d22fbfbfb9a7743ddcf1ff3613de8e732df61748fb6a7b
+DIST thunderbird-128.1.1-ar.xpi 679533 BLAKE2B 6550a043ee29c7925373ce150365c975879d2ca7a12b0a65c8765e5384916afab849e942ea2be02a1e00b84bf93ff8112958d5d1bc1cc050bd31a217a0c09f36 SHA512 335cf6164d46f826335eb553c61cababbdea524207c8cfc60998136cd96406ce2f37c11221a6bf96b3c6fdbe38b29ab20aee451ba2fc3de373175dc1f7dcf2d8
+DIST thunderbird-128.1.1-ast.xpi 560728 BLAKE2B e6b74839085027038b0d0199b5f075dac34814c06b89aefcf8b39b48e6ba26864045e8d42773e282815003718341f207ebf240f263ab5fa759528ef4f1e90f7e SHA512 e4bef426ebcac1e86ccbe9d4a1a3d69c5f367fe724ee403ae1c580517bd27802fdc0bf730bac73a8e31f5b47f345f69446cf6404b94665166672c85cafc3bcbc
+DIST thunderbird-128.1.1-be.xpi 753253 BLAKE2B 58e6f0fd7768118bfbd24e5d79dc41d88e6363fd60e40bba5d5353fe02df05b98b121fa19be8ed87952697c9f0aaf432c214ff538fc51052cbabbe1074d68272 SHA512 25bc0c4f792615f73a4eb9fd54bbd03ae1a6fd2fb2469fa8e301e5857eb9a8604431dbb73c5ff62b1c6e8bb01033822d78f94d25d017d9607209b63e7b520619
+DIST thunderbird-128.1.1-bg.xpi 801173 BLAKE2B 29a8a8391d8ddc19659fc680b28e352300354100c74186358aba3975c36acad3b9da9dd3d5b5be6e7689ee3122d527a84a26fc81b658360767cb0f40a2b9f60e SHA512 5d908d068e312a9c5e0d7db124d704dfde20e89f3de62b5593cf822f2b3caec37ff37c2d6ff42c62aa50f9893bd708b4b3235ab33797f7418b62e58aa3ae9805
+DIST thunderbird-128.1.1-br.xpi 652151 BLAKE2B a6ec3043f58a35597f03b3b5c61037903903c4e9ddfca10d5c193a0bc02cbb730ddafbe28f892309d3f91e5d593ec01d8f041cdaaa900ae528e22bb358757986 SHA512 86a7b76a80834845eeee60114d69dd53606d3105ca6ad321988487dd7ddc506fdd18dbb033083fe0863c402180267b83c2225ab80afc82aca2ba4d479b990e11
+DIST thunderbird-128.1.1-ca.xpi 707977 BLAKE2B 632577f29990968bbe422a1d348f581b68bd01c1fc8ddba3a73bc932a852e3cdd7b5217522dd8b3174eae630332f32b10f8d64229e1cfad1e5067e4726280bf1 SHA512 5674eec4fc407cab5b6ace537c21371d6fb107a7741823f043a261aa1295fef0fb6b69f93b2200b17a0a17f74b309a6004ca4d6a590920ae80b1a87bbc16b993
+DIST thunderbird-128.1.1-cak.xpi 671378 BLAKE2B 4c53064aceed14507c6c27b89712715a6409865bd5d6671068e8ca0a41f4cffdc2c23df26cf8e52b4465ca970373d7e7bdba1c4bca104e8cc26aaa95ae62cfac SHA512 418e0985174dae5d0de1e56aa730f4faf2dc21eebd6d38ad23d0abcac3e481b33e725f91bdc1c33643e119fbef986b8f0458b23f8c12d312140de6567ff0e2aa
+DIST thunderbird-128.1.1-cs.xpi 782657 BLAKE2B 5a35a51a8676e73801c99237c863f2234783a52867e21571f92bb231904c7082c672cfeb92c76a4c3fbde9706f3f160532508ddee041a52bb9be50f37a0cefa2 SHA512 f72a1f61d868f0545176313f02700c9f4fb5bab44dc0677642cfdc695a73c2acecfdddadf7a61bdefdda5cc9b74f7800c5d11429cd29d68cbe3c2efe876727f9
+DIST thunderbird-128.1.1-cy.xpi 745992 BLAKE2B 146eb29adecc9be1c980d1e74a5a9f398abc528c9a1bc785770fb4044d20aeb725ef8007556aa3a1b8b1bbb1afb66fbe3798f1281266a59cfa943e190f4888f9 SHA512 ee4f973fa8787a859471e38125100bdffab3b7dc35c46fa3a9b8abcbc0a5cc77101e80f3e6d576da2ac902dc46159994a5dd5fb49c5bef7d78262b1ecccca17a
+DIST thunderbird-128.1.1-da.xpi 732218 BLAKE2B 6675dc577b16be547f7e2d0632309cf474db772be9716d6a28d8814c4a0af4501210911c8186ae96c0f02a0c674b14748f6962bd98da6e8487e8442daf305081 SHA512 6b75f206da06d914af402b66dc88398e547a7b9f2cdce2b5b999c22d9356d210a0f3da130d2cf333fb0bdad650b89e17f015293a9ae8d33a891459024266001d
+DIST thunderbird-128.1.1-de.xpi 763095 BLAKE2B 75ba72464cbd9ae75638dcfb59bd0064232518d1af80dc7be32d4ffefc1275c4c5641264620565f4582d03e958f8a37c9889cfcef7255a01624fff9c089b1cf9 SHA512 4309d01ce71ac8b18cc1a885225ad2bbc6cf9e8711cd6f196074d13f97c18c354ec364526bf8883227d1c4e7cfe67b0176a83cca9a3eed133eaae5bb2c484fec
+DIST thunderbird-128.1.1-dsb.xpi 780652 BLAKE2B 1af80bc4db88291bc567bc2a552773498da96b15ce609450ed2c8d326e368d7bf3c796eba3e53312ef999acb72cf07144c916433e1bb5c4262e8fd03a4d4fe33 SHA512 cddbe93033a78450354d4d634a4838510704c21612605fc66878dd7e18a15dd8e086369208d2ed2c982ee4ed47374cb30e22b2975d936613dce5dd810fd8b135
+DIST thunderbird-128.1.1-el.xpi 886743 BLAKE2B 800af0b6919a3527c203e0fc46f2d4cacbd85d09b5147999a627bed60d48cfde4676ed460f7166d0e165ade6e2fffcad916912f4a61156ef3e917be237a213f8 SHA512 eb917a74dc9b7dff0364dd6022590236975fdc4037b276388f87589a3263a6b060af2767b48be483d258fd76d6e1f249c5e3ca01d8688c8c41098c3a6fcfc387
+DIST thunderbird-128.1.1-en-CA.xpi 699939 BLAKE2B a297dbb9525cee90345eb29922c5225a376202400351a49534ddd3aa4dc64c489e5a005ce237acbb69bf7cb98a72046d982943c930a8b65676b97d9782771fe5 SHA512 03c8c50b015b5dd6aed624a1f66079972f092dc631ff354aea6de0977384785de3846f676dc702d37ee2b4d2a77cc85b8dee42134396ebcffe46fa56276a0124
+DIST thunderbird-128.1.1-en-GB.xpi 700796 BLAKE2B 97a96bc346c40e4a95fd93b08f3cbbd21f2c8d1e73e22201f7b85da2935d48a0680de0c91fd5c3ebf85cb0022463109afe63d5e915259366157549678ba0dc36 SHA512 10ef391e86f32478724bcdeef5ba9775f37722a7a01508ea3616e223836a7e6a80a23b7f1546f1b11b925744b73755839b5fa69fafe687f0d4472a374dc3eb23
+DIST thunderbird-128.1.1-es-AR.xpi 756246 BLAKE2B 0a6ab1d246747de2a04237019ed89a4741c6aefb218be4c2b1420a313dd40feb2a44e96b834230c785e1ceadd8530fe58602220989a4ff7a999fb28b9cea6a45 SHA512 3cbd0cf639c51714fbb4102d98a483f6c33dfcf89d0593f895f915f5f4ad40e0612661259189a9f8a090a516b797f5c8380f701ea4e29d5deee5246558db768c
+DIST thunderbird-128.1.1-es-ES.xpi 723185 BLAKE2B ef4e0440ed35de9eefea226d9f06a325b8250a207eefacc4669bca902e876492d337c196abbafcb3727b9db49f5a3f8860f37bd426c86272e70bdebed2590e73 SHA512 c421410c7b004b2465dab37bcaf4f4e21c14009faddd3c6c2cf74980dcd85a0b743b42bba27077b945822fd5691271bf0cf86e945f7f0ac1d17a2805e39a44a4
+DIST thunderbird-128.1.1-es-MX.xpi 734910 BLAKE2B fbd4c41700ae669a79413ff50f29708eed5d3e7b6dcbabc97be83d3a1e7dd20a0df949a437ca29b1ad2ed9d33933cd97a741a2dc0bacb0435dfe9dd5cac5ded1 SHA512 a819fcccfa9802e4314f57cb4c84c9afd398701fc7a916ad6326275207ac85dd7130848de2475482a33a43577c095b2895760ceb6a49aadc228098a8ea09271e
+DIST thunderbird-128.1.1-et.xpi 695922 BLAKE2B c8aff7ef11f36717fe7c6d6ec26dac1254d317cd6f2a2b35b0a4aca6e3e4f13fa8fb6add6e68fda14b001d49ef5ab112d237c2cfbd521b28c2c4a96293a3b58c SHA512 169dec6011581d657a8a59fea7ce9fe08e1535b58eced80bd364d54be7e26e2b4f5ff7e96823eca669294a34df0846c80585f29eaf60f18e533abf3bfafbadb9
+DIST thunderbird-128.1.1-eu.xpi 726477 BLAKE2B 7de427d57fb0bcc1ae3c72ba919896d1c0d91fd456839df17d174e8518d683d9e598069de030d9adb0c2db4d0c34989b7018609492aaa143221c00b95f062fa3 SHA512 b702077009df6ab53c5d739a68f73050f9a19eddb69dc1d5a134b23046885b69960de0dd72990c1f5615c2fa7034e4add13f7f71ba0aab2b62ed0335ef6f2b67
+DIST thunderbird-128.1.1-fi.xpi 731186 BLAKE2B 975f0751f0e6171f614c1673a06b8786880445bd4dfbaf49312e925fd7fb38e2950886f1053c1a6b4af41fd0cdbb17ded7057bae14020a87264befffed163603 SHA512 be2d3e25b1aa95b3ac4b14941b6b928575eea5ba3a07bd058fb26f220636601c69cd869db6452773ad81113e7bc5b24b1b9ea3a649098128607f1145528257cb
+DIST thunderbird-128.1.1-fr.xpi 768736 BLAKE2B 5d130b41617e2394fa070d57824cc88121bb917901f27da43f70144caff49d708ee9abff1c11cde7d0136fcd06c1d7acfa2f0ab4979bb6cb6389affccb5fc928 SHA512 bf4797e981ff74dbb7ddab51200d88c633ee5f9caed8916fbae00994f0adafb684f3484459f8485f585ca6a502811424bfeec95385b77a2c2c3930950c3ddf0c
+DIST thunderbird-128.1.1-fy-NL.xpi 750791 BLAKE2B 218f3e40449f782322aa2663ba0341a3f41ebb8fbcc072df9b5b2f0b531d2ead49b6b0f04e18fd498ee29a723e9fd1cfded6b57e9784b733e6c9f2cd46949898 SHA512 5b14a30d14cc3642266d98bcb57b61a6ee40008e984bd8cdd846d08749049dc67c8070344dd4c933978721112c357c33c8ea71eeaac5b48b87a73ff9513a0f28
+DIST thunderbird-128.1.1-ga-IE.xpi 614867 BLAKE2B 0ee9858b27bea800209d4c4900ec4e4cbe8ef09108d8a4b164a5acf4f18f1380dd3adcee3282bd418cb9c0feffa3ed8691b527a1c3580adef15d01048f560664 SHA512 499b857e297b45a62f6833a86621c7803f7ad1f31d1edd3e7262ba6775a42e01a8d65bf5a68dcd8b9e479a2c2f01bdaa73b5021f0d2c17d98394c366b875c51e
+DIST thunderbird-128.1.1-gd.xpi 727477 BLAKE2B 9e5ad9945682f06d9210589a96dd69b1a6ca578b4df60728a4746b58dcc157efe0dfe45dc12286496c36acca29f20927b4bde064c69b44584481dc26e4273fc9 SHA512 cbcc83a9a4ce3b46cac945f2da3c545522eae7c33e855563599850ad604937293ffdf3ff86b44e617b3263372a3a612b9de84a5800eef316b36e0b54296e1c19
+DIST thunderbird-128.1.1-gl.xpi 736249 BLAKE2B 5fa8ddbd41f780b2e37fe07cb8f0c0c41043eda1b041f2d2b35937b23d70864bb7c8350a924a0ddc5523630e2017fe699bd51e4d176e54b7cc24988b9768863b SHA512 12604c11470bcaba80a0100e422e634c380101c093b4f9b2967684edf14b5a4b7c5b364cb974f17bf50a8966051289a8438861b3ba6f244043d66a13127b644f
+DIST thunderbird-128.1.1-he.xpi 698230 BLAKE2B dc7169581988aee1385b2bac5d1b57d1bf40b8482ca833c7b1679271504e926161e204afa5cb715c47b6d4a17dfe0d860d1036a4464d1c532f622da1f6246fee SHA512 4af4ff48ba6e4249e9ecf8f9b95984fe5e4a4fbf613a25ef38a68a9615f3f7f4ad753a95e0a57b61341f9165ce2bdc0e12dd3ce8957868e6eeda9d9909166691
+DIST thunderbird-128.1.1-hr.xpi 700182 BLAKE2B 5c8bfbe9a95043d2b039d281552f5d92e33d1bf97ac1e4fb3b8895cdf7bac71ebc1d576c487f25c4a514ae47dc05e9fb56efd72f5de9e6284ca8b288c48bedd7 SHA512 3a2d9605a023b591d22d5e3da4bcd008f5029aa958057fc3bfe22637fd807663f9fb579d57543e3b8c52f4f62b00dfa02b41c1065af7cb3493d90675b6b8e2f4
+DIST thunderbird-128.1.1-hsb.xpi 778161 BLAKE2B 41c7253cfb7f12403ff49ae2bf9b964e8402490b715e2ac4b563a5f447b7e63419cbea5375daf84b4abf517ac1f7ca634919b04ab61fda965e7c458ab790fec1 SHA512 751eede7bd28badca08a5cd5cc0d3261ed006113bcfae3d2593e9137f988fec551815c075b1fe93c58fd3cf79f600a5f1cb9cb09a873b00baf119de72fc146f8
+DIST thunderbird-128.1.1-hu.xpi 779502 BLAKE2B 0e81476f314d73a9f7f7192fdaf3bff4520be1a335cc467b3dd76b97c79831b9e740d2054c10d797dd29c9f4516202d98df04cc5cd8c37195517db2ecb505c9e SHA512 a2d3dad8c13cdd14d5bc3bfd7fab60460d49c5875ab95c206b9a3620aa9c705c3f7dca4e5403a6c9bc9fd3493784a7ef522807258650c118a23482b33e5ffbdf
+DIST thunderbird-128.1.1-id.xpi 665687 BLAKE2B a370ce9bc99c6f7170536b244cf972a0644322ca80441deafd6e4b891888de6ca5abc36d3698df35974eefc0874a7c3aa773efedcf88deb841f968fd0fcf4f3a SHA512 31d30bc4b143aacb0b0c8ee00cd3f377e99738d040cbdf7f3dcc126605d113e45a7cc0cdedd27b233f7398a728ea59aceedd06227d9b9bb9235a7788e1846ec5
+DIST thunderbird-128.1.1-is.xpi 742975 BLAKE2B 1dfaf9e04f340cf0cab4f6f04f863596c2317b3d4d75959637eca09a594c91af8b52843b499fb76ad61c8a06c84bba608c81e44cb66bf69024448592cb0288a8 SHA512 cff944013c69d3b26c5ce6bd25a2f1b8580c663978e491f679af9c73f0a016103ca398de2666e96c926ec2d5e72edc8986624819938464d57a7cdbe94d0d7954
+DIST thunderbird-128.1.1-it.xpi 687915 BLAKE2B f7ca29996141885293acbc6d858ddb03149a71357fad82857a72b04bbe6539265c502814d9d5a9920ca95cdd6c5e937f1fc43611a2e9024aa50b3da891d5c5bc SHA512 d10f49dee11276d9639b73506f061295aaefa17191610f2bff02f7bb0f018d9f9b8f0866b79a985ea4a539dfd13ebfe8c866ebd2933760becda8b12b18fc6ac7
+DIST thunderbird-128.1.1-ja.xpi 818061 BLAKE2B bcb43287b9c7bfba5e0e71fce4b3caab0275e623f61202b58fc59523700ef9ca3f828c0c5f67a2ebfd17f8f36f9a8c18e7814fdcf74ef9279f77472aef63afa1 SHA512 0220377c9d3bf899c0424054faa22ae7abe9f83f81f10a04162052e8de51cc82b262ac788a89de232c3b2d174afda71ac7279778f0a226567cedd3b4be040b94
+DIST thunderbird-128.1.1-ka.xpi 795721 BLAKE2B bf42fd4ebc612764641fbbf3cd17cd21364866716a52518167c39485f069553ab7fde3fc46d996275b01c57d4098f43389b5a4158b9bd3ed9939b38f45062086 SHA512 bfeb4d172bb3f5f476665c44efc5373f8147d7b1c0f3eba2de53e7e553997beba553842f901abe6e36c64bca18e42cf7dd31996ba9861b82063fe2e259aef38c
+DIST thunderbird-128.1.1-kab.xpi 731533 BLAKE2B c43e8ec8a5ba5429a75f58c86a324815cbc587f571105881f173d7631dcbe3d49e5ff0adeafc9d50a1c945c88406b1475763fa054e8bf96335fc0fe6f89fb1ff SHA512 558c8f8b77c900a4bdfc61d08ba2d587fc0f9ca603f1bfa775741d4dd64f5dc76354764d23d1cdfd523850faa65fc6d0a6d1c5016d5833835f48b0c8227e556a
+DIST thunderbird-128.1.1-kk.xpi 854920 BLAKE2B 2aed0ab08746bcf154512e4fab1d8c8b310313191f2127a2aa4cdd83efd7ebae31f8b3b25a2fb9f2cd803edc671a08543f06c9e4bf13cb2861c62225100b4ad2 SHA512 b2bdcc0b641d7b94935af19328a5a5c5dd65b3cc015637efe360b775f04d68e8a4c59530f406fc123c4123c1a632887af13f43e6b02b1d258c9830526a7d4656
+DIST thunderbird-128.1.1-ko.xpi 753028 BLAKE2B 73fb048cfbdc3b22592e5e750262067c13113c4e5b1e2fdf1edb97bf23f12c530387fcaab1326ba6aacf4647ebf9978c0c4fb820b4ed56693fd479f54731c12b SHA512 b0430802e0ff41f0af1e974a087f622505242f9bc080d91e93cacbe3169d52f218c7639604624df4a68f2c6b3a40f3dd8c8cfea4227ae0b715477e986084a0e5
+DIST thunderbird-128.1.1-lt.xpi 700595 BLAKE2B 99ee7ea617a3e24050e73833cd77bdb0f9d4646696b858b92dc944efff0825e4ca6b5961731359cb9a1bee9ab75943019b15b6e4c1b5f86087278a696f4a7f60 SHA512 aa5825e8ac4d17b6b12ea667cc6eab4b6153ba5c464a4b7a6e73d5051dec002b85d54bd3e52dcb878851c15415ac013d4cfbed874b05b7af8857f6c489a66f5f
+DIST thunderbird-128.1.1-lv.xpi 621078 BLAKE2B 1755014f6d7bb7536feb89b7fad3638f70a63e2ec05393f9dbf726776e42476a31731a760f5712ea1ddcb974b70af00132d02826f37de9767b3a34dc7ff59132 SHA512 64c05f6ef2f9e23f9fb35ae0ed423cfdbadb4d7b4d47c8e72d7ec1b1f103b5abfb88667afc85b9d1a7e4255a3a1aeb6cb74ba9da6196f23ffc9896cd4e6a90f9
+DIST thunderbird-128.1.1-ms.xpi 580760 BLAKE2B 49d6f88d83f6725de4d4dd068becd3f263e74f4325a0084666b0a9af7c69f31b9160e17b248463ee74f0789c59b7125d1273e3c92922aab28762dc6523b89277 SHA512 02fedcf89aba12b2a47ae553efa63dc1df8e0ff6797978c82c89a0faafb99730b2cc99006c294b00194a0da0c948bf86d0f646ca9ff258d13cb672cd6f0f1190
+DIST thunderbird-128.1.1-nb-NO.xpi 702091 BLAKE2B 4f2d4c9863b9e22f0045c932931a607dbbb484548afc2b271a7eb55e9447c8107875bfa6804ac30c3226e833dea8c02e5a036d9a9e41d975a0526a34c44fbd5e SHA512 20a5c81f293df762b334c2eab3712b8c977408880c6e6bd9ccadf5bf3e0849b7ff9d602f7ed056272cdabc0e9df4c9ce30ea72413138514619090dcd1353b65b
+DIST thunderbird-128.1.1-nl.xpi 742071 BLAKE2B e30cf1b9961f87d6e1b8af6559db456429cfe0b1cf0a1b3908d0b1075ef698b81c2f467198f4196d982146ee91fe0e2962d4bd39f477f8d6989e53c365f9661d SHA512 1ed963e4d9ff02cec836ad62b58766f3e061efe67e66aa6ab91c8797d5894edbb28d6c66c16aee60be0cab87006a29924a183f84acceafcfea47802d26848b1e
+DIST thunderbird-128.1.1-nn-NO.xpi 721391 BLAKE2B c25de2b3c14569ef33ed39c440553d1d4cafac8c53616dd27ae77492035e0bed933ae20ee3191fc8b60afd3f9786fe550d452c8ad714d433269203774959310c SHA512 eeeb982276229ee673f7e43ae5f23e0f593a158b545eba8870248e1d3a5f95e0b9115080fae00e50ca65be2f232a2ffef2493e05c01a78d55cad75e57052c36f
+DIST thunderbird-128.1.1-pa-IN.xpi 681222 BLAKE2B 8533c26a4b315fcf32da8cc13a95eed5b19e00444a06a32177569f41e43067161bb1795055df71af065856f43030247a7920210fead3e4da80ebc337adcc6b38 SHA512 8564abc9b8e50cebadffd2aaefa97ea340761ac9ccc0074a6b0fbd7f1dff2f09f2c8b232ee5fe74d1a838cd3dea424ec84ae103c03f9ff486c3ee3395c8d5826
+DIST thunderbird-128.1.1-pl.xpi 760888 BLAKE2B 378f664d2596aa1aa44ca7abf292e173e5fbfe167cbf9a4df73e354d5eb59f4f996d9a0c3eeab505c218ef317b53e7062c2578fd5b1189ba9888f3ef29eb2995 SHA512 58cf7c5ea95e9d123e677083abf5556fe10ac09f2cdc38d71918113378551811f69c2c6e2e15deab95124f199acde7fdcc1eee65774e16fcfdc3dbc94687ba6a
+DIST thunderbird-128.1.1-pt-BR.xpi 749078 BLAKE2B 794f1da22894520777c8116a77b68704f4f00dec477c6e562512fe53cd7b8086fa395a597f7df93e8610d45a0e2a2205eebdf07e75cbfae50d1ae1bb58393179 SHA512 9a513c854eae6ee538b56cb7303dfe483fcf5f7734e5a2ba340ca1344817d7b1a9b1593c2c7d17b0e3f506cf4931c97ed6d53b11b0eccc913fd4da7feab7cd12
+DIST thunderbird-128.1.1-pt-PT.xpi 744907 BLAKE2B 2cee75854081d80429e15e105a0e8d1ba7c3e61d783eb0d9c3044ba488be43e571939d125e04991471e58b5ee09759437effddccbfb49827ad1ad68e85316e86 SHA512 947d4530b24829a13d09964416654224072fdfa44523605241672891d2aa8111d7c14794de852074d7b97e6f99b7481eb9cfb2637f65d4221cf9922738438dfa
+DIST thunderbird-128.1.1-rm.xpi 746021 BLAKE2B 5f913ef56cb475a89bdc5633b20ef31a66d197e6a47d20913032853f2764094f00645cafd5ab7812b2559bad689111a14f1254bfb04023be8d56a307026908e1 SHA512 9371a6d777217f041856fbf42f759540bc5f9ce2141ccda494bc6e015f84aa1fac5c0abbeb32e1a2cffcd713f28742573642c23ab28d6ddd764699e403509edc
+DIST thunderbird-128.1.1-ro.xpi 669418 BLAKE2B 0ed646e0935ab00ba75ce3491c925aa8af1dd1c7c3c587527f80a505ffa6795365c91320db716bce6b31aba98154b459964217da4740a86482b722cbd0739828 SHA512 d155fcb44b4424b282bdd10c8bbdd4be8dddf32d7a3320c24e6e9071277a032536a352ff1ff87528ff97093c8cb37e2778aedbc535f15f5a288cee485f4106a3
+DIST thunderbird-128.1.1-ru.xpi 869880 BLAKE2B ab9e69708102ce63f2239413820e59cbcd2f26f29680e2be43ef88b5301340e81c45c70b2b3902a25f95054448d1f551d1a84b0cd3895e15ca4486266a6e7418 SHA512 4db43dbb1807e96ce17ec2696ce758e827895be8394f24eef297be24862cafe25b76cb512e07281a6477018b437f77faa9dae429a6a039a0302c4411ffd85cc6
+DIST thunderbird-128.1.1-sk.xpi 781843 BLAKE2B 3e08add0379d28b6bcc44294de3ab6afaa8c745cb34af60f399fd857fbd46f2ce0e3ddbc7253dadba527094b215f68ebee9d152bb55aa3f613e3b344b337dc53 SHA512 8bafa78c068ac43ef64b4b0ac2fb46abc98cec0a630d85470370116258efe4ea9d48764db6cb953d1fbb88ee777c3639b3ec85e11cb95fdb5753d68f1baace87
+DIST thunderbird-128.1.1-sl.xpi 742785 BLAKE2B 26a360d83a329bc982bc3f625e70d89afe80113a8943e55e062dc3838b448abede8eab63ef93a35579bb8901680b845f37d305e953eaa7a1a47e872c1d7e4e09 SHA512 9bbdde150802d07102f993fdcaa22391b2e44de5708e2725f7c289129148970520154f8ac97f4b56f59e482e4b013ce2f194918b7d662fa770eb1ab1b4cbc798
+DIST thunderbird-128.1.1-sq.xpi 765340 BLAKE2B 225a30cd2dec7f21e4dd245250d555ea5c7fe1d8896a7faa40716bcd023583f6680947df49073db4b97500cbc07a2d404880fad8bdb197ec6f909efdf0e24b42 SHA512 67047c15f33c1870f4eecd05d4734326b1ce7d9e7c5436ee369c4f6888f7db442991e350d2cdd89d1010e9895d4276c150ae46250c208da4bf1b1c4f8c6a4dd0
+DIST thunderbird-128.1.1-sr.xpi 770682 BLAKE2B 8fb9185bb8c01e22356fe7af75c4134370ed60c025ef7947a79b18ec0aace5dbc3833455cdf874d33a548fdbd5028fe14adc854a009e1a8d2cb063538b339154 SHA512 4fc70e14169a0bccade80d51fa81a4966f23af49fc708fdec558a8a5d6e8a8ae58b1443c39fbc7c398c4f4fc081d1ab0d57fbe48d30238ddfa27f3dffb41a100
+DIST thunderbird-128.1.1-sv-SE.xpi 745493 BLAKE2B 756f6a8f2301da147156a056a2a6c162dffd642e671e976dc036c1121fc13fd11e4ee101952e33eed4f7642f8f4e4c17ddec7b4e6bde5251cea0cde96f7433a9 SHA512 1273d66b33960c3c45998d4f08f8af83a4ae5749fc79ae9b12e925dc1d1f7cfea989e25485c51e88516857ddc05150ceaf6412ef4765c31e2d42e150efa3ed00
+DIST thunderbird-128.1.1-th.xpi 810987 BLAKE2B a8608d4ff0a3905d7a963d6147f8dd829a78a1285215296a7a56d43ee3ed5135c65e2c426ea7303cc9382564c932145addb9685fc2d2242ef3247f0e17f845d3 SHA512 98bfd7b4156aabc84190a246295a0239fc2538322d9b06b7b73621ff614aa649e331b3a8bfe0be64d0f79b950b6d8b059ced3d364294571157c0e065e0fcbccd
+DIST thunderbird-128.1.1-tr.xpi 755983 BLAKE2B 6c854657cccab9b1e901cff967cb9def4f9a5045f5809fb52769e55e1b0ae21b260416346d32c15864d1fe38c70beec23d0c6985a2f7f1aace1a832e7b8bf259 SHA512 e37ac7ce0671389ca564d47f37a977223853a8bf3cbdad3834494d3d7c76caf06fc1f7a26b246d93bd899b49728cfd5ab912a7713170f24c1edba4c748b002ea
+DIST thunderbird-128.1.1-uk.xpi 855732 BLAKE2B 640f1424995265a7d9afd79d00b5bba1e3881dfc62b9b53e03a38283e9834e188111bf77441653ee807b110075cfb3ba06c3734ea39b3142fed7a864582ecdb8 SHA512 3ea7a90e3da56a9ba045d91f48969afa3a5e93f389c11da06c42c816332c43ea8bf096c9d1eabbb9df16adbc4f8d2ab882cd5d091abea490669b1364b92d19fa
+DIST thunderbird-128.1.1-uz.xpi 591809 BLAKE2B a8468e0e6c7b26de3e96a731cfa4873c571c3ffda6ee52737bf4e21e7278718ea7709836f8c810fce8d1925f68f3056299617ac712c6c137174a45667a9af843 SHA512 bac1956bfb40105d6fd81d066466699762aa9578f6d27311abf5629b5b869c97164eecd7819a7c1ed47a19335d8aa617397f566cd2fc67ba31642a67ba61b279
+DIST thunderbird-128.1.1-vi.xpi 784776 BLAKE2B addae70dfb4fcbeb4ee55d179c5be4617ab1e5f05a33febf648f3ad99476f87654d4655631e9ea1920630065cdf4e6aeef801f52b2edcd75a6c14a74184ef99f SHA512 9f8abf8dc183a4546fce4d129a9ee314150abdea401449902bde32c51fa1007368fe8f477c3aacfc67bdf48ba6c49c5f2b55994296689116204e57db7ddc3f6b
+DIST thunderbird-128.1.1-zh-CN.xpi 784197 BLAKE2B 8e4074448545cb54373406d0ce0295a68e6fdfababf38e95a4a473407cd824e189d62b27105156dc2f923beb6a9c2f2348d83802ce550dcb4d0a3c36d90d71ac SHA512 b42683ec3970afa764f491ac1f47cd7ccc117646a2f377088902f0c1f46b7bc2719d318f86cddc483268dcc65a59c87a1b1ac6dc627dd58ec9fc1254d1d73794
+DIST thunderbird-128.1.1-zh-TW.xpi 787600 BLAKE2B 9a56823925b2f0a5bff9c2c098d45d04242ac2a3d33603deaba17d346c6756b624f352d0a10fc6206a2f80c008fd822d9002c860ec89dbabcc9b398c7c4a0f3f SHA512 997c503a8dbe3e8cd2d331de6633eb205a9d21a886284360793e481bbcbfcb2a60e0451a64aa78d536034376aee6dea660cc14f8c8bdf8255acfdd9733631276
+DIST thunderbird-128.1.1esr.source.tar.xz 667771968 BLAKE2B 61cad10d9ec40d854ae7521b7cfd3075a9994d15a88af9171fec0ce228d08c7c75d41108f89a4bc8b5356322776cf25289e74f8b2b601bcfbe29b5b494bb11fa SHA512 91e17d63383b05a7565838c61eda3b642f1bb3b4c43ae78a8810dd6d9ba2e5f10939be17598dd5e87bdf28d6f70ff9e154e54218aaf161bd89a5a6d30b504427
+DIST thunderbird-128.2.0-af.xpi 530351 BLAKE2B f4b04315d8618d6bd5709eb0c4cb96c361a1e2a93b2556ed9bb3c06a7b5c938667d170ffb26ff573c906e019be0602bcf6aa692184d2af713c78106392718d00 SHA512 4553dd36a166eded64956870e200fa598111fb970780a2b97f56319a465bb357b81e726f05bbf98cd5c09954e7a19e879b1de3a405bc0445de91ca2b7c44f707
+DIST thunderbird-128.2.0-ar.xpi 679867 BLAKE2B 5b306c106986de11dd40335a5ff30611de6d787d8d4f235ed40efb03f13690aa3685be6c6219f23812ab61d4c6a197bfee464111cb020e0d3e6ed420f613e1a1 SHA512 688e9fd15d629ab219a9234241bbc731cec59746bab60d1c2201046a58968c0afc2c7ac058501e5f206358b2e76af91ce926974bcbc82b6ca168d09a09ff4563
+DIST thunderbird-128.2.0-ast.xpi 561055 BLAKE2B 7e985f8fdf59dbc14168467b36a469fcc5eddacd7d049174713f1fe19bb5441320ca84171489a71ae3fea2f9e6267a98f2496e00df6f08b53eea9b17fc026a07 SHA512 edf8813fb11d6a7afd18b3d2253a41d1c4e450028dea2af61233e1602d98c65304038fabc0047c64aec91f65eb943b11b5b30662e4f3a44d21e04c74a4c50f14
+DIST thunderbird-128.2.0-be.xpi 755105 BLAKE2B 3fec208e7f3b0817e3a8e8822abdcea3cee6787b8bf565f9f2b89e80637828a2acfabca1ff6e9f64fbf2f4d1d73c623bec56071cc35d4296c8eb4789030602cf SHA512 4a208b9dff9389557f003f4637171b1e58eede69f2c875a5e9fedd488c3b80e84a7fe989d1e67c0b79e18e93df74ef04aa54d613cd1d01c8394a8d8f51531f82
+DIST thunderbird-128.2.0-bg.xpi 807860 BLAKE2B 7aa592981e26c26ef9ece53278f3ba9d0752e9581af9e5958219350187ba252bcf0279cb2b546b9c1dbe400d043128827b74b5dfdf9164cc647d893f72dca979 SHA512 99442d6032ee1a2824a0186a22b29748b1b69b7c59a616438ebc6ddce732437ef8b42e9de7b6034bd3f8c763aa725ff699ec6c608199e6cfcb2e79115b745748
+DIST thunderbird-128.2.0-br.xpi 652477 BLAKE2B 3cf8b378b67c62942a46cb685de9166d6ba8b8e3daae29859e871011e9d9f4558c2f5ab2010feefb85a534a63fcb7eae6d28749a551cc31fdca01a9b8255a2ea SHA512 1d6408eb0688fde1ffa1de6e791380f5e3fc222a5ca1a971a6e9e0a9444de82a3184824f1e95cee71a97a784557d59473e408efee6e33cc07f5f249ad6039475
+DIST thunderbird-128.2.0-ca.xpi 708967 BLAKE2B 76177b2b3e1ed5a9f7227364da6297f00e30ea5ff09ad93bd053e72593217c31b68b8e877e4e878cc50618e5e2179a984350c27b1e4be5ee2ace7a588197e5c2 SHA512 1c99399e388c47516a22d879cc23b14578c28364f0e957d82a7b92e75ee66922f748790a6522e0fa02073a820dcf0c190e9fb2b9a2087ad65499af1f6caae61d
+DIST thunderbird-128.2.0-cak.xpi 671704 BLAKE2B da438c852c579e6b02cafbc1b09b7d58e3cc76fb235fe157c19f3c044c2b2633ba77594059ba127252c3b362549431ffc293c88556a026ba8dbade3738d5515b SHA512 c138049b26928ea03d9554f99a6fa42a641f1bd840e50f16bbf164f15e7a46696651f63fd170ad374ea9931cc61c903606e423a087c1f5fb82fe3b17387c90cd
+DIST thunderbird-128.2.0-cs.xpi 785045 BLAKE2B 98ff73560bd028c0c1b8fc8b7e64fb9eb3af3966b55ad9b97310541308ea76eba7de9eea5de76f9e2fd459c66beaa6741a50303a16cf981f2892c329b388d74b SHA512 2f289d2d43305b091787dbddd62d4c288e031608e4d3a8e73f99fabad1ee694c50d90d4c6c2fd7e14f5d6cbf6ea343cf794b98133744f7d2268c513d4e31aa31
+DIST thunderbird-128.2.0-cy.xpi 749051 BLAKE2B fb7d2c860c49878632e8dc71d1ecedb02e5c3ed2de7a342e2a7824d30384537ef9c44a1b47a28d7ecdf7c7c582f665ba24429168b421953fd1d3b4e2070fab60 SHA512 6a8264a6ef7e8646dce804a1e8a9c5d789c1fb16c0237b799c0c4752037d7d9e7695bc63f73c56e63388e4b9f05561e14e434f5e3d6538debe05051630da0cc7
+DIST thunderbird-128.2.0-da.xpi 734115 BLAKE2B 95b06adf1ac0aad11ea642c4f0cd323766bed54c9ed691d2520686a59d1b1cf823e4c3c7a3f603f15be7872b41c637e655923026829b18e1ef118be0f021c99a SHA512 c7342d1d4681106a01ecae25cfb1ee485172c9e7e36d10d0e227e24a1a5d4547f69f2f384c87839fcea1dbdb935f97e504d29e9cb0a39cfc6088282d3149c4ec
+DIST thunderbird-128.2.0-de.xpi 766251 BLAKE2B a1ebb1c4a90afd192e93e7187036ca9d77f4e76d28c3f5820115c99884f01da3a6ace89554767ea2f736ed46ceaf93a2b99d60296fa48a43ad00b7aef03167b4 SHA512 df8f8a6d95c2d698427985daf5b6c5922a4201d5314005adf9d66aece66642901a0fc6dd01e4c34ba54ee7c196897f91c7beae69c7c09a2f040ff4f5bb03741d
+DIST thunderbird-128.2.0-dsb.xpi 782743 BLAKE2B d2f4209c6da0d6ac196958cb230eb70859548c3867a0a955df8edfb09822e0dddcfed100530da19f6d09fcf389177cbb6713aaabdf7d36a18382388adbfb2ffa SHA512 08fe7553f916fe0f8057a206cd4f1327e7bb6293ca6254433c08a1113a5f7ba83d26bdc6e16915e61bcff9c31ea4b8ed7d7bceb204f1e9cf8815c930aeeca302
+DIST thunderbird-128.2.0-el.xpi 889269 BLAKE2B 64a9552d9147e5eef0e3b8d711053d89e7e9ed64820f9ddbf160f0e84fac09452bdb9fb4f0796e4d265f5e41f451e93ecc65f71da8ec9cdfd8f506f7400eeefe SHA512 cd50a58fab6fdb5f2ddb062526547981b44d1193463033d9ee5be7c54f1834adb2a5410da7236678d447442d470f2fb32b389e40fc0961b0d053b8f008ad7914
+DIST thunderbird-128.2.0-en-CA.xpi 702143 BLAKE2B d28f797da6751302bd103ad4025e7e05e7f1746b7c2ef9bc36d5dab24a0e4248e3bd3e7aec345649379669e8d985eac709dcd2993758638a72011352c7302b1f SHA512 192b530c7e5035ebe8b1d1f2d870ea0ae7586aea179b7b6a5410522a675bf79ce786a7187040a14f2af3225401c520aa30511eedb7c60876137e4246c1896b0a
+DIST thunderbird-128.2.0-en-GB.xpi 702700 BLAKE2B dca31bdcc8b9b1da3c4708800276b868d9b5206f55a52952564e98f52920f53c41850ba09553c51b55da9fff092c66e93491cc165c16f7c881c347f180ada6a5 SHA512 026ba038c4bfb2abd3f26c31ee826eed0d17d00d4ed1e58f25da2e6d6f297ad4e90c1e12d1b8e4e2b908b171ce0cbb4a1057354fc5cee66073c90311c7f54ae6
+DIST thunderbird-128.2.0-es-AR.xpi 758350 BLAKE2B 64721c4eaeb8d7301bdbad809c7235b14b9d0f726fae6caa8acf61596bb9f150ff6feb8ad44a5d5792bceef40476690027f2e461ab12006e9c1abe8b2585e84d SHA512 7552962ef95cfca777c57f4b8109b6ceb0de35387878d140ec4dbcfca556a3d640a0f0049177448d32cce48c17705caa112ceb6409e87c278acbed4f4d3a20f5
+DIST thunderbird-128.2.0-es-ES.xpi 723514 BLAKE2B 3bbbc917ab62b65f315a77bd2c950e9c4aad0b448982a967000e3a754d7725c849ca38430ceaaad235816daf82b0ea2fabd666f9744ba05f57b14f90a856a5ff SHA512 bb5fb42d34b405058c97e7e329a64c9892bdbfe530748167dec283eb34086cd2be772f54e2d56714eda85939fd54faba7f14677c66817d6573faff541d4f561a
+DIST thunderbird-128.2.0-es-MX.xpi 737707 BLAKE2B 7260c4ae37fde04ebc0f23449192c8f329b007c9cb7b0e826cd7189dbd4ab966beb23599e4d106b4551c4a1f19b105ee6080a8f40b502d8ecde5f83e1efa6a75 SHA512 f38efcd62b3cdb38afcedc43fd228f77ad59caa859bb8481a6f4aea41aeca276134047700c312da3984ea40311a31afe4cb22f69eb105b2ef16eb8f017ec6e7e
+DIST thunderbird-128.2.0-et.xpi 696280 BLAKE2B bab80a3332acb3b5487068069728604d72235c9a0aeb9c793a4d8b6c61f6e7af29462b54d6a9bfe6d445e4cc454559f1fb4aee50830d57cf7f6b6eedab6e4362 SHA512 e34b4c6c5037401c4d6acb9d64b5984d18ae03c905360f2ae9504dea79afa4e0e9e9d2b93cd1cec843f0eb56945f9fc5070136eff9e4309163ebc4e88de376ac
+DIST thunderbird-128.2.0-eu.xpi 726802 BLAKE2B 53b6e2830d8d5e95cd741522ea4d115509ebe4eb150606f4f997aae65b0f17b228c51633dc22df9360f8562801b6437df18f355bde3c21e6a3ee9df9b73a3940 SHA512 ebfce61496f2c7c202961be85e4da5aa488b1a91021bf911891cff40c32a3abf0bcc665e6c4d0c07d0778eccd0d61df5fd52163f00ab3b914637f705fcb44a65
+DIST thunderbird-128.2.0-fi.xpi 733651 BLAKE2B c7a50566eac18ca86f88b8a743679fd03c0b11a9c55ac4a7fa9c6aead7f7a54eaae89c4c8752a683dbeb58cd8037fa2d41cf7838a86314933c2297a70ee0c49b SHA512 e1ecfdba4e0732a61c61bb931fac430f09642d7641e3cb3da4ec680ca1553a613a49937613a70a520aed158ffdf7f64ca9359c888e11563ab2941101361c29a4
+DIST thunderbird-128.2.0-fr.xpi 770186 BLAKE2B 0eb14cb05d3411a583d48732d6f65dce30fbfed37640707a85e66cce770fa0786e66e02f0e96e2009467ecaa40ba532913a0c8a7615999565142560acd9951ea SHA512 163daaaa076f00ee23ab0271249fa7a9c175b6a411f8d3309751e41f02c1f405531b0bb2ae0a29fdad6049ef9c4c8d71bbe479f084e7c98b56bf3be3ab3bda2d
+DIST thunderbird-128.2.0-fy-NL.xpi 752848 BLAKE2B ddb1920d1082090be895c41025b1313a824fd12c3ef819f4f0ef82ab693d871c210d0be4fb77831872a49b43fb57fbb0b4a6803717b00ea155e50b3ffe396a80 SHA512 cc336b67d0be16c82b4b3fac0bb5fe16f2c6f6fa711c5c0701970a37d75fc4c7869b329183471decd051566bdbedbacb360e49a283c1c116adf881de717745ce
+DIST thunderbird-128.2.0-ga-IE.xpi 615198 BLAKE2B 3b89495c04e27b9bd4a185ab79d5f8f41a07409b0b77119f350c91ee512cde9fd99a97aa1eca0b9b8838e29b950ac093a9845f9da2e63bb1c1a84e06bf5cf614 SHA512 09e0f9f0a23c2c52e399d9999873d92893a49c829619861b4f0f72d0dad12b638403626519097e6bd059166752d100c9bda9a4f8a4f47a21478646daf66dc610
+DIST thunderbird-128.2.0-gd.xpi 727804 BLAKE2B 8f75354d217d9d84c091ba029460332827f1de97e588c6613a33bc857da573f24d2a4ef66906c66ff5faf5b54a0c89179b96d668afd51dfe5148cee89a7f2bde SHA512 4b9b3da0cdba5df1a505cd730073d2e8887d4099fdfe7fd5a0f914db2f4e73fab2da47286a84f2eea0bdbbcfd5585f425928b29e7d09f1f050eaf9d3480c036d
+DIST thunderbird-128.2.0-gl.xpi 736573 BLAKE2B 3dd448d20d76383a5219db7d1e7ab5e21c793515943bb70bb1635862632cd7351c78268a687f8fa2d25ab2c7138118487f16243ab47e89dc33c921924560e285 SHA512 8975e87497557b9b427ff002d2fd156d2ef4e4b0036836af993f1a7b9c73c632c05d424bdc4e6359f6045bbea725ab3dee993e978b020f0480a1acd96395b2ce
+DIST thunderbird-128.2.0-he.xpi 700301 BLAKE2B aa7c9b89a6453aacc09c50d653148ed21ac53f29f88d24dbeef015bd60ac7aa1b3d7d33858c275b16ffb41cb54e4c2f41f09a9525ee6b19b98a9a993cc21a8e8 SHA512 3dd3929b600aab5d1a5c9f489fa326b48eb4de1740579e0d948d8b72aa2fb50e73bf337014be7d892c23cd1b2ab36a13d52da9b10dc4e5a220dff06dcf16afc9
+DIST thunderbird-128.2.0-hr.xpi 715018 BLAKE2B 1a40b987f16a5067a0d26a70a12b8c380248ab7cffb3053cb9991453e35fd9ebaf5167a0870bc6ccb6642a5dd6605860680fe596986bdbd599d80121d4156141 SHA512 b02f671ce57339f85098afb41e27b09a516cd903906bd34dfbe199525fecd73cd0bca978464fddef302f38ccab1bc14d862840677e7fbdb1ba9fd20ea754280d
+DIST thunderbird-128.2.0-hsb.xpi 780137 BLAKE2B 6d4610d5f13f7d211732b797ac79c105e2785a58873c49b7fdf948706eca001fef8523e1460f2485f79ac6876973297ebc02dabce837ac4f1c5413adc2d6849c SHA512 746dcb7d355c429fd4c6b633885a86eeb37e300a738c5bcbda4ca91ac0f6ededcf915e9d6a5de54bf7b3c2e463cd86d2cdb7ec2342173ed1836ab19f1137a880
+DIST thunderbird-128.2.0-hu.xpi 782933 BLAKE2B e88c56b89ae79d46865281ca8472ebd6862ba5fc81364ac538a2aa2efc99079e849cfb9fc5645080646ae0eafae4a80dc8d2e46ee99ba115d4bda654d4a8c894 SHA512 028839eca290eb7b02c83bb1bb40ec0f35dcae7d446c06f0366ab7cc17c1bdb0adc0bd72a5a71b6b67a4deb607befd2c5de0372c695d3a1ced5407f8c853fae6
+DIST thunderbird-128.2.0-id.xpi 666011 BLAKE2B 2b73fb3f7621e618e46479d657f8d20ad1fba7cbd4a8c5e0363c2b1ef021fbb03c934c5f11ad20ba4fa86413b93677add503077aafa42087e9fd78339886313d SHA512 16871831e5b92d8721d52c72afc0af6df0a7048e58e6f59bff8ad09b6aee00c0090c465d00f9501ce0f53d3b10b905bfaa1571d3d3e9006385bd22cd1abc0af8
+DIST thunderbird-128.2.0-is.xpi 743886 BLAKE2B eecdf7c8a9eadba2944ecae09df3b12872c83e8dbcee9ad481106ce4716ae8db915e61437215311957c9b43dc45676f5a5d163311452e6a8aed3020d0dd056a8 SHA512 17d1bf8d5ca0aedb25bad3e61f4bfb098830a87d95ace1dd2d90fadc030e7bf668c7cceea170ea7d13d7cb80c6e3e36b6749cdf52b970150dc5ea6b9ae1a6bbe
+DIST thunderbird-128.2.0-it.xpi 690396 BLAKE2B cea4e519cf4fa3e326dac57f6e684da5d311e5312beb687b847965833e5acb28ce59b41c97d198863654d2cf49e494951306425385a33cbe27061c09694f030b SHA512 8f473a1b0ffd9feec15e415f0c34ba69609e8a8ab271f3b36dacd4866f02affeeb73e4bb975db2375ce051f59969e54fe577591e9f6810e4a5440c659f4c9431
+DIST thunderbird-128.2.0-ja.xpi 819902 BLAKE2B 3911492febf78bde263ab00d5410a5991ae8c67f0cea5443565e1552bd2cfa5a48e43d73c6fe83b94b222ff2d391afa4efe01c13ce6e7d6ea28f6095ae00847b SHA512 b09cb2fb7b904d2048f1c37e4dfb74b9adf4b0b21023c55551ae51121acea85198a594701396e0d9058c267b83e8c1f2e6fc5b31f8fca8b001ed23f4cb5883e9
+DIST thunderbird-128.2.0-ka.xpi 796047 BLAKE2B 69465d477abfde17660b651dae0ba9fe05cd4b6fcc119a03f1dd3b905bdef1692bb15dc66e6f0d9a7be426a9ad1319040991e2b9afaca9fbdeceafb50ad3f5c4 SHA512 b02d01ef4f9b75a2d103ad499120cd0f9d01ae2b74d8a922463c2c2d42ddc6dfe73dc7ecf51d7c8f5be235107bb1f8c7b484d747e39bd576165eafab2a0edfbb
+DIST thunderbird-128.2.0-kab.xpi 731859 BLAKE2B d1b0799ba696785afec55f4b96eab8ff1641a43066638d475467ef997a49e584a31a53ec726e46e1bb59b3f97b164dd0c785a25db89f13a646ba7b69e297def0 SHA512 777dd7242a23724a4ce559164c0ee20243fa137e99a7a9c31b1e99587606dcd66fe7d39a89a799ca294b9abdb537da5ede605eaca85b19a35f0cab99b7a11a5f
+DIST thunderbird-128.2.0-kk.xpi 857290 BLAKE2B 39bbbc3e03fe9ce194cfe23cb1e65cb2e443b8c81d091bcb117daac219c76075ce2ddb6e8f3bb31eb9040bd7092bf84d0f532c3ad2293b1b298858d1cf9bb498 SHA512 8c9a2e6597246a166e0e5a51ec6309035788925e41a115e8e6b489fe1f6e6d528cf4ef535a010d83260a0f0aac375589e4bbdf711fa9b38b15980cb4db43d73e
+DIST thunderbird-128.2.0-ko.xpi 755165 BLAKE2B 255e9a16f49e607314d365f313249343dbcf8f170abe2e93d3862be51746ffba7aba0f3611992c4458f0d1aa3f2f2000babfd7b09ae4cec828fdca661b308d14 SHA512 1fe409f22f094f9c5b2cc70561650ad4563836ab8a3c5cce846376f53572838a93cca38810e75f2b6d19bc44b156e9341f2ae05b5832ef7844b703ce922b3416
+DIST thunderbird-128.2.0-lt.xpi 700918 BLAKE2B 622bbefcb2572593977459e9325fe25c979d00c7cfc08d04ec17734148a99f1a21535b00d90ccee31e87ca2f6a4260a241b6527ce1781586ab1c3f01ee4096ef SHA512 42539e633382f62b7fc4adf26a87b0842071077f7e6c6262b78f9174b969dc16ec79640cd7990c0bf6761c14f848792f32c9140248d734d97178566417069691
+DIST thunderbird-128.2.0-lv.xpi 623624 BLAKE2B c1f55d36b94e2b564a4f2c88c8726d85772a4853bb9b54777bd6892566747e1076cbc985268c3b4bbd161d8f853e0df07360765b513e5fc4ed2da3da211c0b3d SHA512 beea131a1297ac199c3b3ede8f8e09a576d70a6caca85b6073bc9d4bc6fa08186dc41936a5ea773957ee2fc395c618469acbf8bc41f5c30a193f19aeb9edc7b5
+DIST thunderbird-128.2.0-ms.xpi 581084 BLAKE2B f37963924f629b13445ed30156b5bb53282788e8d9f0a995eea822954661fb4ec729dfef397ddbf0cf439f06a6b8c0ac8ee9bcc1392662f0dddd0d4c5c30569b SHA512 d3229b79de9b89f4d668e520f80376ab1a88fc7f160c0d5c105ce4b1ce4fb6293d55368eac7d85a2bee929403386c4ccb143be7656d325ad0ec5e0759885de2c
+DIST thunderbird-128.2.0-nb-NO.xpi 703763 BLAKE2B 6f9bf5ea39c7350a1f3c1c7a7e5d3fb8417da27cf2c9bb0bdc36c8a777c0292346c662361fa4c4fc77d27f76d545921f40630b73d7bd730d5ace3b90768772f4 SHA512 580a7d4ccda3fa278647e6c1354cb9e70737ab6ca4fdf1ea2f335808f46369ca8908a77511dc0ca48c99beb45824afd708c9abb8617c8ff842c7547f2cf62f1a
+DIST thunderbird-128.2.0-nl.xpi 744105 BLAKE2B 20a89e15ae7e3539d5a28f38c58d0c7611d101c95600731abcdb248e2e5a59272302a9a0fafad924d4d96150f68bfbd872d47da5293ab8d27f236790e0ba01aa SHA512 9934e0042db3801c2fad3a2754d19f640354128dd376fc1db835b253c48cc83639be08de0162533e47db48d7869e689767cacad6ebaf136e22b831af587f6cb0
+DIST thunderbird-128.2.0-nn-NO.xpi 723768 BLAKE2B b1b6fafe6ffccc66f30665fc40c699daeb1c74c482573d1d2ceec565095b72f9eb40857954ab0cbd8de74022fed9f57275e22b5aa5f1169f6f4831b23543c781 SHA512 8f225825aef220b637fddab316e49d9a05535b19a83e224d6f7fbc88b56d100e8659e9c51658d2d6d082ce02b5db4ca4a4cfa94c3039a22d68df5c942ad28fc2
+DIST thunderbird-128.2.0-pa-IN.xpi 683076 BLAKE2B 1e05f44edd29210a4179a0b6fb00ba8095a7d7ff7d50855f1b8d84c0deccd8149eceb8ec4813f15bcf73edc056c74a7c911fc4395352f1b0143721f3b9f1f67d SHA512 1301414761d65b83d01b2605a70355b522bf66a2b9a01f7cebae46f8ba1aaf131d98b2989e2e740de2f11cb69067192db2156c286056ddec50bb42475a98641f
+DIST thunderbird-128.2.0-pl.xpi 762953 BLAKE2B 431add2fd6a53522452e0d1ea78a855fb3e562bb83c8e68797dfe2534b07fbb99505755ff7263574fe5e945d5cb57a281d1a3adf960b1c1022bca7df7c7aeca4 SHA512 582a2a94f3a472a930561d0a2d297d30d0444673b3d188e6cb3c49999c99a90783dd9671329db625a619ed349b016ab0a1638ace68be065fe2785829d90fff0e
+DIST thunderbird-128.2.0-pt-BR.xpi 751314 BLAKE2B be58c6d7445ce7fcc4a8f1744861342b749dfd09c0729f0df6416dd2354f903315be0f24acacef461c0a658301077c9aac0b3f2696f6c8c274cd80aa84b49b7a SHA512 fbda48a6f95cca8f7d02cebda30d2a129b113d4dceda4ea3a4fb1bdec837f61c91e39baf1a3677e0fd16cad49a07a59d8db9ff44d810bddd6af00b7a9981c048
+DIST thunderbird-128.2.0-pt-PT.xpi 746871 BLAKE2B 2e798c17d91e7b178d827bfdb56714e5dad560880765248f6d122806a1f4ab1878e488727570c243dc5d28a4aa8a7ffec30e99c6592f1d7bc8e2beb7a0a185a9 SHA512 3c48f173e48e67a66668af76008da90092fc02c77ec8625fba28218fc693931ff8658adc5913e318900b02ae04131cba1201ba68c7536a1cf8470d38bcc8eeaa
+DIST thunderbird-128.2.0-rm.xpi 746778 BLAKE2B a7936361d462a4411c571ffd381f4f8be95868de1fa8f09b6c39e4d78af0a910aebe9fe79f890c09d1f1e9a395c1c7e77de2c76c4d2c3ffa0bbf544304fce875 SHA512 c80e6909801c63c0db8e7423248e74bf634bb6efe14ba8e04ec69f9d1e95a1b8a4f37b44144e3889c3daba6ba2871542093259ffa62dc6e981c05a25bbbe154f
+DIST thunderbird-128.2.0-ro.xpi 669742 BLAKE2B edc839c54e190a7141f703dfd67999c48788ca56a364042f9181e283cafff20e2acb1fef5deb7e3fa0a5760403c1580ebfdcf6476ebe886c585706fc4d0babfe SHA512 dbc3f1a5b827d249ea7899ea67ceff9055eaeb7fb94c268d26829a056b7e377eea20ac64e685133ffa0418fec3b5114fdac53cb4f21de3006ee0994955f473da
+DIST thunderbird-128.2.0-ru.xpi 872246 BLAKE2B a05fa2c35876340956c853008bb9d42c9cf73f4f9fb49f289d55e9eaa5a68afa85f561736da5093ce9f3da33a0b48856840da36873d2dc060dfe22d0d181a713 SHA512 8fb14d376d25fc7690eb9d7cac23e12935d39809d481bd37038cf5993996e8da9af91369521e736f09e13891dbe2b6ff87538222500feda2166b73798ac5cc0e
+DIST thunderbird-128.2.0-sk.xpi 784171 BLAKE2B 19c2bc75d192c4bb5a9e3b76fc69b7a78452256f3fcf460ab0efd02d63a78de18a69e55f94431f24d0cfb6ac5f41ef9882e6e5b84317bd05116681b0db058901 SHA512 935bc5c8c88c159c1a7179aab69dd1d3ea6507067a9341760ee6e8e3a6fe0a25d8b439d92072b031cf8a675bb47bd7b4d56c26da6a5ab738402247ee4941c497
+DIST thunderbird-128.2.0-sl.xpi 743551 BLAKE2B 945d820ff6ac2f8a3cdc284e82ae93a9f67a6f2e645ecea7fbec070caef934d5d370c2d74dc0d8807dcadbf080a34c439889afe746200a32c3f8642d15efc573 SHA512 fa96809c273f08e93ee833eb64b923eb50c25a216ef69550dbdf7900d801dbe8baa4b87c00f1d08b0f805a7ba638174f03a5bd74db64e8eb7cb5bedab089d2bc
+DIST thunderbird-128.2.0-sq.xpi 765887 BLAKE2B 768d4675b03246cf929a62ea94d9ab1118952bf7276bdfbd4e8445093f018d52b517257fbb2406f15885e29d2a2a40d971741491e64710452428c71e8d3169ae SHA512 5a0ff4c52e61dbbbf87a3b012a3031f23a993d9287bda6cb9428e1de36bd0ccf93f0e1e7691fb234e696ac69587d99eff214699c7f0019ae261242b80b0662f7
+DIST thunderbird-128.2.0-sr.xpi 771006 BLAKE2B 2163ba03ca321921386fa2f3aaeaeb0c55fe89c630495e8272b64d06c6ad1e28ea3940d13ed98285fe0c25bf35b9a725ad8a3f83ed0819163a901d22d02c1fe2 SHA512 c29b762cbcc86b7cf732207a86fb04f548d7e2de8051381a99590e02f49a310fa647af08455172f44f74c095ced5ec301133f82c2d3151534da8903d6c73f6bb
+DIST thunderbird-128.2.0-sv-SE.xpi 747521 BLAKE2B bab34c471bf2fa3cf15e568ad838c97bdb7e513f4b090c4596e677075bd68103f4f9045551b99cad35ee30c77d7791727b7fd42fa7aaa292511559a4af3d412e SHA512 aead8781d882e5afb0a3751ebb37dc06e510b028e03f8653d197c7cb6070f958e023d8a59e3855bfcf87be4cfaa3901e53f76ae7413c84800f4991ca196790f5
+DIST thunderbird-128.2.0-th.xpi 813955 BLAKE2B 6e6d87168c2eccd1879f28bcd20e75ee74e77334857c6537825ede0b67d00a6ceb29bcc69393231345e7949e19341f2b06567ac69ffaa241b9cf73a28693efea SHA512 ac7714861e3384d0811eb6becd95d5da87bac4de8df2f78aa103972918259cf3e0947cbfa47eb355463aab3aa4be5abe80e127a61bf880994e192d635440636c
+DIST thunderbird-128.2.0-tr.xpi 758166 BLAKE2B 7558c91ab4be059287a140e857580dbf88817b49f1cc28b16dbe7ed1c1f511356591cbe9657dda96b406462a0c8c15c5c214c9c29c1723c6baa03150401062e8 SHA512 ebd44f3cf3c257fec075c7697246337bfc1fd6f0866947457f975a62e2d57299e77b4e31b72b8340dffb494c1cbd804e773fc0f462d0ec7ee58573ceea027703
+DIST thunderbird-128.2.0-uk.xpi 856056 BLAKE2B 3f3733a75f8a85abedc80936c9b1f89c4b3342e4d0337cc3da241ae392807929fa2dbcb9144a882e80167feec357b143f6abf707ee0b581d1cf68f6acb5d5d59 SHA512 c9c88a315305f76172c7df4dabff7cdb399e2eeb661cfb3b14bf489ca3ec004dc61dd70752436c9b318afa23b3984e697344b1cb1fcaeb7cb0fc92e11fa9de27
+DIST thunderbird-128.2.0-uz.xpi 592134 BLAKE2B 392ceee3e9c43ed96190a7d320593796a7d87dcfdd61cac45a2438bc5c390365d3533029e1b5c35a3bb39bac179c51f1b35d70a52d067a4502da540efc2956ea SHA512 00959d85d4cf38e203bd27dc1506ea4e4b326fdd3fee6973282180c0c04fcd1a3ff41e196f78c924fb7a666cf644f335523072e19a5a2790d642d1c97839e6e9
+DIST thunderbird-128.2.0-vi.xpi 787029 BLAKE2B 8905a673b71236891630a9dfac65575e5cc30a4db1951de756dfcfb4a4b10b41fa3bab7a7da01b1502fc1b795aeea1b92eedc7b1abaaf6049d1bc483c52141a3 SHA512 d854fb027d13d24fa4f4783880f76531c2a08bbab5cab5bc041e42ac36954923b797024d99d7c36c032565d5155d6c2d147743cc425ebd8ac2bcfc2179110899
+DIST thunderbird-128.2.0-zh-CN.xpi 785328 BLAKE2B a5cad2e891779711ab6be31929d96647c95b93bb50e6ec31f8a4b4f87eb2881f9ed20bf5818f4475aaaa301ed4a25a6a5350fdca9ce3d532747ff9a74593b535 SHA512 647dfe19d2866e1455d9c21ff0576f7a6ee5a780f5d07ca11cc02bade2a50cf42f21270d573f74258feba2a9adbede415fa4ae4a71e87f77a133e8931c259b47
+DIST thunderbird-128.2.0-zh-TW.xpi 789781 BLAKE2B 2f584744f1ec20465b5e39d8cb966543a1d549fbfb133392aa6bea100f3657df9b29c01d4f07b3bdc4d531a370f7da8d0b85605a680d36919eaf2e4091b4aef6 SHA512 162d5a7ef2e84e55424a6fcb14d18999d0b4c781045180a30394d7f767507dc6b1b084b2d4f3bed63b11d605560bf1fd59fbed7ed0d1e0dce6e47511ed7e6a8e
+DIST thunderbird-128.2.0esr.source.tar.xz 674856032 BLAKE2B d86751b94bc6b611fa2ac740e79e57f4321d048e9bfb48f4237021ba2282036b79c449c08837b8b4c19e884cfb900493af4a8f6e221c56a4849241cd32d66de0 SHA512 24af7d705c13a0b49b0f9fa66a4d17ce4e95b65cc60f84f56364dc8fb480fb61b80166872e234a3c1cb843624874757407b2d9f0c5af82ddf2bf86de82571077
diff --git a/mail-client/thunderbird/thunderbird-115.15.0.ebuild b/mail-client/thunderbird/thunderbird-115.15.0.ebuild
new file mode 100644
index 000000000000..c95c579c8d9a
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-115.15.0.ebuild
@@ -0,0 +1,1363 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
+
+LLVM_MAX_SLOT=18
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing optfeature pax-utils python-any-r1 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}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
+IUSE+=" wayland wifi +X"
+
+# Thunderbird-only USE flags.
+IUSE+=" +system-librnp"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wifi? ( dbus )"
+
+TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
+	selinux? ( sec-policy/selinux-thunderbird )
+	!system-librnp? ( dev-libs/jsoncpp )
+	system-librnp? ( >=dev-util/librnp-0.17.1 )"
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:18
+			sys-devel/llvm:18
+			clang? (
+				sys-devel/lld:18
+				virtual/rust:0/llvm-18
+				pgo? ( =sys-libs/compiler-rt-sanitizers-18*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:17
+			sys-devel/llvm:17
+			clang? (
+				sys-devel/lld:17
+				virtual/rust:0/llvm-17
+				pgo? ( =sys-libs/compiler-rt-sanitizers-17*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:16
+			sys-devel/llvm:16
+			clang? (
+				sys-devel/lld:16
+				virtual/rust:0/llvm-16
+				pgo? ( =sys-libs/compiler-rt-sanitizers-16*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/lld:15
+				virtual/rust:0/llvm-15
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+	)
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.24.3
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( virtual/rust )
+	!elibc_glibc? (
+		|| (
+			dev-lang/rust
+			<dev-lang/rust-bin-1.73
+		)
+	)
+	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
+		)
+		wayland? (
+			|| (
+				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.90
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-74.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon[X]
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+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'
+
+	# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
+	addpredict /dev/dri
+	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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+
+			# May need a wider addpredict when using wayland+pgo.
+			addpredict /dev/dri
+
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		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
+}
+
+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; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	if ! use ppc64; then
+		rm -v "${WORKDIR}"/firefox-patches/*ppc64*.patch || die
+	fi
+
+	if use x86 && use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*-musl-non-lfs64-api-on-audio_thread_priority-crate.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/0029-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/0029-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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# 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 cargo checksums from crates we have patched
+	# moz_clear_vendor_checksums crate
+	moz_clear_vendor_checksums audio_thread_priority
+	moz_clear_vendor_checksums bindgen
+	moz_clear_vendor_checksums encoding_rs
+	moz_clear_vendor_checksums any_all_workaround
+	moz_clear_vendor_checksums packed_simd
+
+	# 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"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB 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-gpsd \
+		--disable-install-strip \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-js-shell \
+		--enable-legacy-profile-creation \
+		--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 && [[ ${CHOST} != armv*h* ]] ; 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
+	# 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-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"
+	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
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			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 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
+
+		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
+	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
+
+	# LTO flag was handled via configure
+	filter-lto
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		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*'
+
+	# Modifications to better support ARM, bug #553364
+	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 \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# With profile 23.0 elf-hack=legacy is broken with gcc.
+	# With Firefox-115esr elf-hack=relr isn't available (only in rapid).
+	# Solution: Disable build system's elf-hack completely, and add "-z,pack-relative-relocs"
+	#  manually with gcc.
+	#
+	# # elf-hack configure option isn't available on ppc64/riscv, #916259, #929244, #930046.
+	if use ppc64 || use riscv ; then
+		:;
+	else
+		mozconfig_add_options_ac 'elf-hack disabled' --disable-elf-hack
+	fi
+
+	if use amd64 || use x86 ; then
+		! use clang && append-ldflags "-z,pack-relative-relocs"
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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
+
+	if use system-python-libs; then
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
+	else
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	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 tc-ld-is-mold && use lto; 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 sys-devel/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.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 \
+		>>"${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
+
+	# 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 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
+
+	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@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	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
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	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
+
+	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-client/thunderbird/thunderbird-128.1.1.ebuild b/mail-client/thunderbird/thunderbird-128.1.1.ebuild
new file mode 100644
index 000000000000..505685b90a5c
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-128.1.1.ebuild
@@ -0,0 +1,1226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-128esr-patches-02.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}esr"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}esr-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}esr.source.tar.xz -> ${MOZ_P_DISTFILES}esr.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio"
+IUSE+=" selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent"
+IUSE+=" +system-libvpx system-png +system-webp wayland wifi +X"
+
+# Thunderbird-only USE flags.
+IUSE+=" +system-librnp"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	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 '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+			pgo? ( sys-libs/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
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	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
+			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 )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+}
+
+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; 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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		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 \
+		--enable-thunderbird-rust \
+		--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
+	# 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-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
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; 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
+
+		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
+	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
+
+	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"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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 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
+
+	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@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	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-client/thunderbird/thunderbird-128.2.0.ebuild b/mail-client/thunderbird/thunderbird-128.2.0.ebuild
new file mode 100644
index 000000000000..37b1a02af219
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-128.2.0.ebuild
@@ -0,0 +1,1190 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-128esr-patches-03.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}esr"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}esr-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}esr.source.tar.xz -> ${MOZ_P_DISTFILES}esr.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio"
+IUSE+=" selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent"
+IUSE+=" +system-libvpx system-png +system-webp wayland wifi +X"
+
+# Thunderbird-only USE flags.
+IUSE+=" +system-librnp"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	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 '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+			pgo? ( sys-libs/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
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	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 )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+}
+
+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; 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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		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 \
+		--enable-thunderbird-rust \
+		--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
+	# 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-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
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; 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
+
+		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
+	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
+
+	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"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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 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
+
+	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@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	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/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 49de70573234..f66f5a78c387 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -1,3 +1 @@
-DIST amavisd-milter-1.7.0.tar.gz 192688 BLAKE2B 882ecdc1f4b1b3fba2f7f82ffb3e7f4ecf27ce42fc14df926a508b852dd142161af9ce65bc367a5968f64a29a40cb362a0783bdbaf4dff2559715bfd53170f73 SHA512 52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af
-DIST amavisd-milter-1.7.1.tar.gz 193425 BLAKE2B e93f7f8f4c3b5e59fbfc160e60c8620231f8ab2a5fa06c39cf42b71c0c0abca4e27a1334d01e89337628ccdd685e059be469eeafc385521a780de1bf82bf3070 SHA512 db2fd53a3047a21fb20743fce7d01899eb92efffc62159d3022e0b5014dbfb3667e1664868734d84b58f5daadd8270d3e05a68c60a01a1ac35d104105cc86586
 DIST amavisd-milter-1.7.2.tar.gz 191224 BLAKE2B 82865acacec1004e611bbafd940d5721660b0daa1af1aea742d4176c613ce2af0e4bde523d0363b97e3f361270641acda477797eab9e8df9feb266c80ef6009c SHA512 639a5a4f92131f9b8d004255819e36dedd529ec95f8290663c6ea5860dbbce049a822ba0e68158228716778265009b93024e9102defdf9250d4e889157008181
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
deleted file mode 100644
index e4e1e71f157a..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="https://github.com/prehor/amavisd-milter/"
-SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	|| (
-		mail-filter/libmilter
-		mail-mta/sendmail
-	)"
-RDEPEND="${DEPEND}
-	mail-filter/amavisd-new"
-
-DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild
deleted file mode 100644
index 1e75c4994670..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="https://github.com/prehor/amavisd-milter/"
-SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	|| (
-		mail-filter/libmilter
-		mail-mta/sendmail
-	)"
-RDEPEND="${DEPEND}
-	mail-filter/amavisd-new"
-
-DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
index e7fe81bffc46..fa8078129f5b 100644
--- a/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -10,7 +10,6 @@ SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="mail-filter/libmilter:="
 RDEPEND="${DEPEND}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.2.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.2.ebuild
deleted file mode 100644
index ced1ec9e7e1f..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.7.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="https://github.com/prehor/amavisd-milter/"
-SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	|| (
-		mail-filter/libmilter
-		mail-mta/sendmail
-	)"
-RDEPEND="${DEPEND}
-	mail-filter/amavisd-new"
-
-DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.6-r1.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..e55bd80615cf
--- /dev/null
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.6-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYPI_NO_NORMALIZE=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python filtering architecture for the Courier MTA"
+HOMEPAGE="https://pypi.org/project/courier-pythonfilter/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="mail-mta/courier"
+
+python_install() {
+	distutils-r1_python_install
+	rm -rf "${D}$(python_get_sitedir)/etc" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc
+	doins pythonfilter.conf pythonfilter-modules.conf
+}
diff --git a/mail-filter/normalizemime/Manifest b/mail-filter/normalizemime/Manifest
index dd2174555537..e51aba41742d 100644
--- a/mail-filter/normalizemime/Manifest
+++ b/mail-filter/normalizemime/Manifest
@@ -1,2 +1 @@
-DIST normalizemime-1.19.tar.bz2 12192 BLAKE2B 663d2b67c597003c8b8f8d098bbb0538abcb2a68109ede900d9f6aca9b5af8d0a2822c86738dc8763b2693a4b1a642518c1d46cd8525fc2d94c1a8d2cf93f5e6 SHA512 670d2508dd6d79e09a9187d2161d4fd81168b34705d620d1ad3547d298404b3964ddb5ae1921e9e570c7132df1cd65e27f4da6e532bec39a9177085da84eb46c
 DIST normalizemime-1.21.cc 42498 BLAKE2B c5de7c41b531ec040adc45eaac19cf19e6c6ee2a3a6d294f738c1f4a64b2196bb749f5af9e8b0fd56683c064a17ce03be537e8437c59513d45df19bd54dbb924 SHA512 bebdfffebc49e612c8ead53b12e2a6fbdf6ddf30e5036828178d4ac1b853766fbba53ca36a52a0b4c833135a48f1b059905924446d513b26656fb4f5d02452e8
diff --git a/mail-filter/normalizemime/normalizemime-1.19.ebuild b/mail-filter/normalizemime/normalizemime-1.19.ebuild
deleted file mode 100644
index 2741d63cba57..000000000000
--- a/mail-filter/normalizemime/normalizemime-1.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Helper program to normalize MIME encoded messages"
-HOMEPAGE="http://hyvatti.iki.fi/~jaakko/spam/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	emake normalizemime
-}
-
-src_install() {
-	dobin normalizemime
-}
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index e0cc48e92631..1cb80b3b1cd9 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,2 +1,3 @@
 DIST courier-1.3.10.tar.bz2 7898254 BLAKE2B 10558f78cd58540cacbd85fb4dadbeddd374b8832a27c546864023aeebdf9e5ca1fa4d770cdefce6bf7ed2bbaf334a893393eae79cee2b13482e75d8b157824f SHA512 266d2785ea7a8b9455b9448e3279f77d399c182ec4408b599a301f389a28dd40b7b869c8b158eb49b4416b58ce09805fad3f176796a2cf0408bb93b766081ce3
+DIST courier-1.3.12.tar.bz2 7901365 BLAKE2B 95cbfeb0926366cf94876b5f03bd14fee516a0057771b083672151174cdbe7cbdbf2531e98dff0615432482526a883e972d56db8f8b1aa38e94d4b29ddcdeb71 SHA512 58ea9e3178de63a574a0cc456c07a48068170f2f3d89c8373a994430c381561845a305bddeb6f4e00922920ecd53acfff9db7f1de1bea3f06ae61682e1ede688
 DIST courier-1.3.5.tar.bz2 7901040 BLAKE2B 5a79d02d1d40967f98f2a1942fee6786d8e6e2ddc7dea6677a85db0480f71e4b974a671adc81c4bafd66c888c5b54012eb5684f2936f5164496699939d179fc4 SHA512 5f51383356f4a36f9c114be6aa69d694c82bb95b1a336d2948d486d582bd6559da69be93b7c20aee2ff57826ab7eeb265aa20794074456d036b22da7f280f95d
diff --git a/mail-mta/courier/courier-1.3.10.ebuild b/mail-mta/courier/courier-1.3.10.ebuild
index a1a8e7c241d4..1da157ecc1be 100644
--- a/mail-mta/courier/courier-1.3.10.ebuild
+++ b/mail-mta/courier/courier-1.3.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls split-usr"
 
diff --git a/mail-mta/courier/courier-1.3.12.ebuild b/mail-mta/courier/courier-1.3.12.ebuild
new file mode 100644
index 000000000000..0b53b7593184
--- /dev/null
+++ b/mail-mta/courier/courier-1.3.12.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls split-usr"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.72.3
+	>=net-libs/courier-unicode-2.3.1:=
+	net-dns/libidn2:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=sys-libs/gdbm-1.8.0:=
+	dev-libs/libpcre2
+	app-misc/mime-types
+	dev-lang/perl:=
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	local file="${1}" word=$(echo "${2}" | sed -e "s|=.*$||" -e "s|^.*opt ||")
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	local file="${1}" key="${2}" value="${3}" section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure DESTDIR="${D}" || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	if use split-usr; then
+		dosym ../bin/sendmail /usr/sbin/sendmail
+	fi
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		# Disable valgrind checks
+		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
+		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
+		sed -i -e 's:VALGRIND=:exit 0 #VALGRIND=:g' libs/maildrop/Makefile*
+		emake -j1 check
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [[ -z "${ROOT}" ]] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index d87f52e906c4..0648fb78c2d2 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,5 @@
 DIST exim-4.97.1.tar.xz 1919308 BLAKE2B ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8 SHA512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc
+DIST exim-4.98.tar.xz 1936984 BLAKE2B 927108e25eb60fb97e390916a4623339ccdd2dc9aaa1de1f913855f04f2372da765c12cc03c97b0ad49e47ea6200370490100407898ad3881ca41ade0940461a SHA512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15
 DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a777701b436 SHA512 6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183
+DIST exim-pdf-4.98.tar.xz 2148892 BLAKE2B 032660d946d54684ab495fd93fc600f2c2611ed87cfae2f15b4dc1e4e2a1de2eea4ba273f25085b7f8a5be481848129c366daad9447bd185ca087800a3ea1c9f SHA512 e9abce5c37fd102243c08f3eb25fe44d2fb79a9e41b23aa8f72b87d26fdb8ab13d2da8d0a7bf2ee4f9ce84d69c72f80483ca375710cd4ab87c32270ce1392641
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
diff --git a/mail-mta/exim/exim-4.97.1-r6.ebuild b/mail-mta/exim/exim-4.97.1-r6.ebuild
new file mode 100644
index 000000000000..fbc02d2e7b6f
--- /dev/null
+++ b/mail-mta/exim/exim-4.97.1-r6.ebuild
@@ -0,0 +1,637 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use flag-o-matic toolchain-funcs pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	!dane? ( ssl? ( gnutls ) )
+	dmarc? ( dkim spf )
+	dkim? ( ssl !gnutls )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	|| ( berkdb gdbm tdb )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only (probably due to unbound dep)
+# Exim supports it but we cannot express the dep USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from dep-pointofview.
+# Bug #925108 showed that DANE is basically non-optional with OpenSSL,
+# so we make -dane mandatory to use gnutls.  Bleh.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+	 [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+GPV="r0"
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	dev-libs/libpcre2:=
+	tdb? ( sys-libs/tdb:= )
+	!tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) )
+	!tdb? ( !berkdb? ( sys-libs/gdbm:= ) )
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[pkcs11?]
+			dev-libs/libtasn1
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	ldap? ( >=net-nds/openldap-2.0.7:= )
+	elibc_glibc? (
+		net-libs/libnsl:=
+		nis? (
+			net-libs/libtirpc:=
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis:= )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libcrypt:=
+	virtual/libiconv
+	"
+	# added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+	# Legacy patches which need a respin for -p1
+	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	eapply     "${FILESDIR}"/exim-4.97-as-needed-ldflags.patch # 352265, 391279
+	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
+	eapply     "${FILESDIR}"/exim-4.97-localscan_dlopen.patch
+	eapply     "${FILESDIR}"/exim-4.97-no-exim_id_update.patch
+	eapply     "${FILESDIR}"/exim-4.97.1-memory-usage-bug-3047.patch # 922780
+
+	eapply -p2 "${FILESDIR}"/exim-4.97.1-CVE-2024-39929-part1.patch
+	eapply -p2 "${FILESDIR}"/exim-4.97.1-CVE-2024-39929-part2.patch
+
+	# oddity, they disable berkdb as hack, and then throw an error when
+	# berkdb isn't enabled
+	sed -i \
+		-e 's/_DB_/_DONTMESS_/' \
+		-e 's/define DB void/define DONTMESS void/' \
+		src/auths/call_radius.c || die
+
+	if use maildir ; then
+		eapply "${FILESDIR}"/exim-4.94-maildir.patch
+	else
+		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+		append-cflags -DNO_EXECINFO
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+		WITH_CONTENT_SCAN=yes
+	EOC
+
+	# configure db implementation, Exim always needs one for its hints
+	# database, we prefer tdb and gdbm, since bdb is kind of getting
+	# less and less support
+	if use tdb ; then
+		cat >> Makefile <<- EOC
+			USE_TDB=yes
+			DBMLIB = -ltdb
+		EOC
+		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+	elif use gdbm ; then
+		cat >> Makefile <<- EOC
+			USE_GDBM=yes
+			DBMLIB = -lgdbm
+		EOC
+		sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+	else # must be berkdb via required_use
+		# use the "native" interfaces to the DBM and CDB libraries, support
+		# passwd and directory lookups by default
+		local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+		cat >> Makefile <<- EOC
+			USE_DB=yes
+			# keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+			CFLAGS += -I$(db_includedir ${DB_VERS})
+			DBMLIB = -l$(db_libname ${DB_VERS})
+		EOC
+		sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+		sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+	fi
+
+	# if we use libiconv, now is the time to tell so
+	if use !elibc_glibc && use !elibc_musl ; then
+		cat >> Makefile <<- EOC
+			EXTRALIBS_EXIM=-liconv
+		EOC
+	fi
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+	#
+
+	# support passwd and directory lookups by default
+	cat >> Makefile <<- EOC
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+				LOOKUP_LIBS += -lnsl
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+		cat >> Makefile <<- EOC
+			EXIM_MONITOR=eximon.bin
+		EOC
+	fi
+
+	#
+	# features
+	#
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+				>> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL=yes" >> Makefile
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	else
+		echo "DISABLE_TLS=yes" >> Makefile
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# SOCKS5 (outbound) proxy support
+	if use socks5; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SOCKS=yes
+		EOC
+	fi
+
+	# DANE
+	if use !dane; then
+		# DANE is enabled by default
+		sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		# this one is the default/supported variant since 4.95, and the
+		# only variant available since 4.96
+		cat >> Makefile <<- EOC
+			SUPPORT_SRS=yes
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc -r "${S}"/doc/.
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	if use pam; then
+		pamd_mimic system-auth exim auth account
+	fi
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
+	fi
+	if use berkdb && ( use gdbm || use tdb ) ; then
+		ewarn "USE=berkdb is ignored because USE=gdbm or USE=tdb is enabled!"
+	fi
+	if use dmarc ; then
+		einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+		einfo "you can populate this file with the contents downloaded from"
+		einfo "  https://publicsuffix.org/list/public_suffix_list.dat"
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	einfo
+	elog "Note that this release contains a tainted variable check that"
+	elog "is likely to break your configuration used with Exim 4.93 and before."
+	elog "Please check your transports for occurences of \$local_part, and"
+	elog "use a replacement like \$local_part_data where possible."
+}
diff --git a/mail-mta/exim/exim-4.98.ebuild b/mail-mta/exim/exim-4.98.ebuild
new file mode 100644
index 000000000000..0ebd73c6fd34
--- /dev/null
+++ b/mail-mta/exim/exim-4.98.ebuild
@@ -0,0 +1,640 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use flag-o-matic toolchain-funcs pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	!dane? ( ssl? ( gnutls ) )
+	dmarc? ( dkim spf )
+	dkim? ( ssl !gnutls )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	|| ( berkdb gdbm tdb sqlite )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only (probably due to unbound dep)
+# Exim supports it but we cannot express the dep USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from dep-pointofview.
+# Bug #925108 showed that DANE is basically non-optional with OpenSSL,
+# so we make -dane mandatory to use gnutls.  Bleh.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+	 [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
+
+GPV="r0"
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	dev-libs/libpcre2:=
+	tdb? ( sys-libs/tdb:= )
+	!tdb? ( berkdb? ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) )
+	!tdb? ( !berkdb? ( sys-libs/gdbm:= ) )
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[pkcs11?]
+			dev-libs/libtasn1
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	ldap? ( >=net-nds/openldap-2.0.7:= )
+	elibc_glibc? (
+		net-libs/libnsl:=
+		nis? (
+			net-libs/libtirpc:=
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis:= )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite:= )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libcrypt:=
+	virtual/libiconv
+	"
+	# added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+	# Legacy patches which need a respin for -p1
+	eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+	eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	eapply     "${FILESDIR}"/exim-4.97-as-needed-ldflags.patch # 352265, 391279
+	eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
+	eapply     "${FILESDIR}"/exim-4.97-localscan_dlopen.patch
+	eapply     "${FILESDIR}"/exim-4.97-no-exim_id_update.patch
+
+	# oddity, they disable berkdb as hack, and then throw an error when
+	# berkdb isn't enabled
+	sed -i \
+		-e 's/_DB_/_DONTMESS_/' \
+		-e 's/define DB void/define DONTMESS void/' \
+		src/auths/call_radius.c || die
+
+	if use maildir ; then
+		eapply "${FILESDIR}"/exim-4.94-maildir.patch
+	else
+		eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+		append-cflags -DNO_EXECINFO
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		-e "s:^LOOKUP_DBM = yes:# LOOKUP_DBM = yes:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+		WITH_CONTENT_SCAN=yes
+	EOC
+
+	# configure db implementation, Exim always needs one for its hints
+	# database, we prefer sqlite, tdb and gdbm, since bdb is kind of
+	# getting less and less support
+	sed -i \
+		-e 's:^USE_DB=yes:# USE_DB=yes:' \
+		-e 's:^USE_GDBM=yes:# USE_GDBM=yes:' \
+		-e 's:^USE_TDB=yes:# USE_TDB=yes:' \
+		-e 's:^USE_SQLITE=yes:# USE_SQLITE=yes:' \
+		Makefile || die
+	if use sqlite ; then
+		cat >> Makefile <<- EOC
+			USE_SQLITE=yes
+			DBMLIB = -lsqlite3
+		EOC
+	elif use tdb ; then
+		cat >> Makefile <<- EOC
+			USE_TDB=yes
+			DBMLIB = -ltdb
+		EOC
+	elif use gdbm ; then
+		cat >> Makefile <<- EOC
+			USE_GDBM=yes
+			DBMLIB = -lgdbm
+		EOC
+	else # must be berkdb via required_use
+		# use the "native" interfaces to the DBM and CDB libraries, support
+		# passwd and directory lookups by default
+		local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+		cat >> Makefile <<- EOC
+			USE_DB=yes
+			LOOKUP_DBM = yes
+			# keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+			CFLAGS += -I$(db_includedir ${DB_VERS})
+			DBMLIB = -l$(db_libname ${DB_VERS})
+		EOC
+	fi
+
+	# if we use libiconv, now is the time to tell so
+	if use !elibc_glibc && use !elibc_musl ; then
+		cat >> Makefile <<- EOC
+			EXTRALIBS_EXIM=-liconv
+		EOC
+	fi
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+	#
+
+	# support passwd and directory lookups by default
+	cat >> Makefile <<- EOC
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc
+				LOOKUP_LIBS += -lnsl
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+		cat >> Makefile <<- EOC
+			EXIM_MONITOR=eximon.bin
+		EOC
+	fi
+
+	#
+	# features
+	#
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \
+				>> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL=yes" >> Makefile
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	else
+		echo "DISABLE_TLS=yes" >> Makefile
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# SOCKS5 (outbound) proxy support
+	if use socks5; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SOCKS=yes
+		EOC
+	fi
+
+	# DANE
+	if use !dane; then
+		# DANE is enabled by default
+		sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		# this one is the default/supported variant since 4.95, and the
+		# only variant available since 4.96
+		cat >> Makefile <<- EOC
+			SUPPORT_SRS=yes
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
+}
+
+src_install() {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc -r "${S}"/doc/.
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	if use pam; then
+		pamd_mimic system-auth exim auth account
+	fi
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}/etc/exim/exim.conf from"
+		einfo "  ${EROOT}/etc/exim/exim.conf.dist."
+	fi
+	if use berkdb && ( use gdbm || use tdb ) ; then
+		ewarn "USE=berkdb is ignored because USE=gdbm or USE=tdb is enabled!"
+	fi
+	if use dmarc ; then
+		einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+		einfo "you can populate this file with the contents downloaded from"
+		einfo "  https://publicsuffix.org/list/public_suffix_list.dat"
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	einfo
+	elog "Note that this release contains a tainted variable check that"
+	elog "is likely to break your configuration used with Exim 4.93 and before."
+	elog "Please check your transports for occurences of \$local_part, and"
+	elog "use a replacement like \$local_part_data where possible."
+}
diff --git a/mail-mta/exim/files/exim-4.97.1-CVE-2024-39929-part1.patch b/mail-mta/exim/files/exim-4.97.1-CVE-2024-39929-part1.patch
new file mode 100644
index 000000000000..e83a44abc986
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.97.1-CVE-2024-39929-part1.patch
@@ -0,0 +1,111 @@
+patch reduced to code only
+
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Mon, 1 Jul 2024 18:35:12 +0000 (+0100)
+Subject: Fix MIME parsing of filenames specified using multiple parameters.  Bug 3099
+X-Git-Tag: exim-4.98-RC3~2
+X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/6ce5c70cff89
+
+Fix MIME parsing of filenames specified using multiple parameters.  Bug 3099
+---
+
+diff --git a/src/src/mime.c b/src/src/mime.c
+index 975ddca85..5f9e1ade7 100644
+--- a/src/src/mime.c
++++ b/src/src/mime.c
+@@ -587,10 +587,10 @@ while(1)
+ 
+ 	while (*p)
+ 	  {
+-	  DEBUG(D_acl) debug_printf_indent("MIME:   considering paramlist '%s'\n", p);
++	  DEBUG(D_acl)
++	    debug_printf_indent("MIME:   considering paramlist '%s'\n", p);
+ 
+-	  if (  !mime_filename
+-	     && strncmpic(CUS"content-disposition:", header, 20) == 0
++	  if (  strncmpic(CUS"content-disposition:", header, 20) == 0
+ 	     && strncmpic(CUS"filename*", p, 9) == 0
+ 	     )
+ 	    {					/* RFC 2231 filename */
+@@ -604,11 +604,12 @@ while(1)
+ 
+ 	    if (q && *q)
+ 	      {
+-	      uschar * temp_string, * err_msg;
++	      uschar * temp_string, * err_msg, * fname = q;
+ 	      int slen;
+ 
+ 	      /* build up an un-decoded filename over successive
+ 	      filename*= parameters (for use when 2047 decode fails) */
++/*XXX could grow a gstring here */
+ 
+ 	      mime_fname_rfc2231 = string_sprintf("%#s%s",
+ 		mime_fname_rfc2231, q);
+@@ -623,26 +624,32 @@ while(1)
+ 		  /* look for a ' in the "filename" */
+ 		  while(*s != '\'' && *s) s++;	/* s is 1st ' or NUL */
+ 
+-		  if ((size = s-q) > 0)
+-		    mime_filename_charset = string_copyn(q, size);
++		  if (*s)			/* there was a ' */
++		    {
++		    if ((size = s-q) > 0)
++		      mime_filename_charset = string_copyn(q, size);
+ 
+-		  if (*(p = s)) p++;
+-		  while(*p == '\'') p++;	/* p is after 2nd ' */
++		    if (*(fname = s)) fname++;
++		    while(*fname == '\'') fname++;    /* fname is after 2nd ' */
++		    }
+ 		  }
+-		else
+-		  p = q;
+ 
+-		DEBUG(D_acl) debug_printf_indent("MIME:    charset %s fname '%s'\n",
+-		  mime_filename_charset ? mime_filename_charset : US"<NULL>", p);
++		DEBUG(D_acl)
++		  debug_printf_indent("MIME:    charset %s fname '%s'\n",
++		    mime_filename_charset ? mime_filename_charset : US"<NULL>",
++		    fname);
+ 
+-		temp_string = rfc2231_to_2047(p, mime_filename_charset, &slen);
+-		DEBUG(D_acl) debug_printf_indent("MIME:    2047-name %s\n", temp_string);
++		temp_string = rfc2231_to_2047(fname, mime_filename_charset,
++					      &slen);
++		DEBUG(D_acl)
++		  debug_printf_indent("MIME:    2047-name %s\n", temp_string);
+ 
+ 		temp_string = rfc2047_decode(temp_string, FALSE, NULL, ' ',
+-		  NULL, &err_msg);
+-		DEBUG(D_acl) debug_printf_indent("MIME:    plain-name %s\n", temp_string);
++					      NULL, &err_msg);
++		DEBUG(D_acl)
++		  debug_printf_indent("MIME:    plain-name %s\n", temp_string);
+ 
+-		if (!temp_string || (size = Ustrlen(temp_string))  == slen)
++		if (!temp_string || (size = Ustrlen(temp_string)) == slen)
+ 		  decoding_failed = TRUE;
+ 		else
+ 		  /* build up a decoded filename over successive
+@@ -651,9 +658,9 @@ while(1)
+ 		  mime_filename = mime_fname = mime_fname
+ 		    ? string_sprintf("%s%s", mime_fname, temp_string)
+ 		    : temp_string;
+-		}
+-	      }
+-	    }
++		}	/*!decoding_failed*/
++	      }		/*q*/
++	    }		/*2231 filename*/
+ 
+ 	  else
+ 	    /* look for interesting parameters */
+@@ -682,7 +689,7 @@ while(1)
+ 
+ 
+ 	  /* There is something, but not one of our interesting parameters.
+-	     Advance past the next semicolon */
++	  Advance past the next semicolon */
+ 	  p = mime_next_semicolon(p);
+ 	  if (*p) p++;
+ 	  }				/* param scan on line */
diff --git a/mail-mta/exim/files/exim-4.97.1-CVE-2024-39929-part2.patch b/mail-mta/exim/files/exim-4.97.1-CVE-2024-39929-part2.patch
new file mode 100644
index 000000000000..f33e33598379
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.97.1-CVE-2024-39929-part2.patch
@@ -0,0 +1,247 @@
+patch reduced to code only
+
+From: Jeremy Harris <jgh146exb@wizmail.org>
+Date: Tue, 2 Jul 2024 13:41:19 +0000 (+0100)
+Subject: MIME: support RFC 2331 for name=.  Bug 3099
+X-Git-Tag: exim-4.98-RC3~1
+X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/1b3209b0577a
+
+MIME: support RFC 2331 for name=.  Bug 3099
+---
+
+diff --git a/src/src/mime.c b/src/src/mime.c
+index 5f9e1ade7..8044bb3fd 100644
+--- a/src/src/mime.c
++++ b/src/src/mime.c
+@@ -30,10 +30,10 @@ static int mime_header_list_size = nelem(mime_header_list);
+ 
+ static mime_parameter mime_parameter_list[] = {
+   /*	name	namelen	 value */
+-  { US"name=",     5, &mime_filename },
+-  { US"filename=", 9, &mime_filename },
+-  { US"charset=",  8, &mime_charset  },
+-  { US"boundary=", 9, &mime_boundary }
++  { US"name",     4, &mime_filename },
++  { US"filename", 8, &mime_filename },
++  { US"charset",  7, &mime_charset  },
++  { US"boundary", 8, &mime_boundary }
+ };
+ 
+ 
+@@ -577,8 +577,8 @@ while(1)
+       if (*(p = q)) p++;			/* jump past the ; */
+ 
+ 	{
+-	uschar * mime_fname = NULL;
+-	uschar * mime_fname_rfc2231 = NULL;
++	gstring * mime_fname = NULL;
++	gstring * mime_fname_rfc2231 = NULL;
+ 	uschar * mime_filename_charset = NULL;
+ 	BOOL decoding_failed = FALSE;
+ 
+@@ -590,90 +590,92 @@ while(1)
+ 	  DEBUG(D_acl)
+ 	    debug_printf_indent("MIME:   considering paramlist '%s'\n", p);
+ 
+-	  if (  strncmpic(CUS"content-disposition:", header, 20) == 0
+-	     && strncmpic(CUS"filename*", p, 9) == 0
+-	     )
+-	    {					/* RFC 2231 filename */
+-	    uschar * q;
+-
+-	    /* find value of the filename */
+-	    p += 9;
+-	    while(*p != '=' && *p) p++;
+-	    if (*p) p++;			/* p is filename or NUL */
+-	    q = mime_param_val(&p);		/* p now trailing ; or NUL */
+-
+-	    if (q && *q)
++	  /* look for interesting parameters */
++	  for (mime_parameter * mp = mime_parameter_list;
++	       mp < mime_parameter_list + nelem(mime_parameter_list);
++	       mp++
++	      ) if (strncmpic(mp->name, p, mp->namelen) == 0)
++	    {
++	    p += mp->namelen;
++	    if (*p == '*')			/* RFC 2231 */
+ 	      {
+-	      uschar * temp_string, * err_msg, * fname = q;
+-	      int slen;
+-
+-	      /* build up an un-decoded filename over successive
+-	      filename*= parameters (for use when 2047 decode fails) */
+-/*XXX could grow a gstring here */
+-
+-	      mime_fname_rfc2231 = string_sprintf("%#s%s",
+-		mime_fname_rfc2231, q);
+-
+-	      if (!decoding_failed)
++	      while (isdigit(*++p)) ;		/* ignore cont-cnt values */
++	      if (*p == '*') p++;		/* step over sep chset mark */
++	      if (*p == '=')
+ 		{
+-		int size;
+-		if (!mime_filename_charset)
++		uschar * q;
++		p++;				/* step over = */
++		q = mime_param_val(&p);		/* p now trailing ; or NUL */
++
++		if (q && *q)			/* q is the dequoted value */
+ 		  {
+-		  uschar * s = q;
++		  uschar * err_msg, * fname = q;
++		  int slen;
++
++		  /* build up an un-decoded filename over successive
++		  filename*= parameters (for use when 2047 decode fails) */
+ 
+-		  /* look for a ' in the "filename" */
+-		  while(*s != '\'' && *s) s++;	/* s is 1st ' or NUL */
++		  mime_fname_rfc2231 = string_cat(mime_fname_rfc2231, q);
+ 
+-		  if (*s)			/* there was a ' */
++		  if (!decoding_failed)
+ 		    {
+-		    if ((size = s-q) > 0)
+-		      mime_filename_charset = string_copyn(q, size);
+-
+-		    if (*(fname = s)) fname++;
+-		    while(*fname == '\'') fname++;    /* fname is after 2nd ' */
+-		    }
+-		  }
+-
+-		DEBUG(D_acl)
+-		  debug_printf_indent("MIME:    charset %s fname '%s'\n",
+-		    mime_filename_charset ? mime_filename_charset : US"<NULL>",
+-		    fname);
+-
+-		temp_string = rfc2231_to_2047(fname, mime_filename_charset,
+-					      &slen);
+-		DEBUG(D_acl)
+-		  debug_printf_indent("MIME:    2047-name %s\n", temp_string);
+-
+-		temp_string = rfc2047_decode(temp_string, FALSE, NULL, ' ',
+-					      NULL, &err_msg);
+-		DEBUG(D_acl)
+-		  debug_printf_indent("MIME:    plain-name %s\n", temp_string);
+-
+-		if (!temp_string || (size = Ustrlen(temp_string)) == slen)
+-		  decoding_failed = TRUE;
+-		else
+-		  /* build up a decoded filename over successive
+-		  filename*= parameters */
+-
+-		  mime_filename = mime_fname = mime_fname
+-		    ? string_sprintf("%s%s", mime_fname, temp_string)
+-		    : temp_string;
+-		}	/*!decoding_failed*/
+-	      }		/*q*/
+-	    }		/*2231 filename*/
+-
+-	  else
+-	    /* look for interesting parameters */
+-	    for (mime_parameter * mp = mime_parameter_list;
+-		 mp < mime_parameter_list + nelem(mime_parameter_list);
+-		 mp++
+-		) if (strncmpic(mp->name, p, mp->namelen) == 0)
+-	      {
+-	      uschar * q;
+-	      uschar * dummy_errstr;
++		    if (!mime_filename_charset)
++		      {			/* try for RFC 2231 chset/lang */
++		      uschar * s = q;
++
++		      /* look for a ' in the raw paramval */
++		      while(*s != '\'' && *s) s++;	/* s is 1st ' or NUL */
++
++		      if (*s)				/* there was a ' */
++			{
++			int size;
++			if ((size = s-q) > 0)
++			  mime_filename_charset = string_copyn(q, size);
++
++			if (*(fname = s)) fname++;
++			while(*fname == '\'') fname++;    /*fname is after 2nd '*/
++			}
++		      }
++
++		    DEBUG(D_acl)
++		      debug_printf_indent("MIME:    charset %s fname '%s'\n",
++			mime_filename_charset ? mime_filename_charset : US"<NULL>",
++			fname);
++
++		    fname = rfc2231_to_2047(fname, mime_filename_charset,
++						  &slen);
++		    DEBUG(D_acl)
++		      debug_printf_indent("MIME:    2047-name %s\n", fname);
++
++		    fname = rfc2047_decode(fname, FALSE, NULL, ' ',
++						  NULL, &err_msg);
++		    DEBUG(D_acl) debug_printf_indent(
++				    "MIME:    plain-name %s\n", fname);
++
++		    if (!fname || Ustrlen(fname) == slen)
++		      decoding_failed = TRUE;
++		    else if (mp->value == &mime_filename)
++		      {
++		      /* build up a decoded filename over successive
++		      filename*= parameters */
++
++		      mime_fname = string_cat(mime_fname, fname);
++		      mime_filename = string_from_gstring(mime_fname);
++		      }
++		    }	/*!decoding_failed*/
++		  }	/*q*/
++
++		if (*p) p++;			/* p is past ; */
++		goto param_done;		/* done matching param names */
++		}		/*2231 param coding extension*/
++	      }
++	    else if (*p == '=')
++	      {		/* non-2231 param */
++	      uschar * q, * dummy_errstr;
+ 
+ 	      /* grab the value and copy to its expansion variable */
+-	      p += mp->namelen;
++
++	      if (*p) p++;			/* step over = */
+ 	      q = mime_param_val(&p);		/* p now trailing ; or NUL */
+ 
+ 	      *mp->value = q && *q
+@@ -684,26 +686,31 @@ while(1)
+ 		"MIME:  found %s parameter in %s header, value '%s'\n",
+ 		mp->name, mh->name, *mp->value);
+ 
+-	      break;			/* done matching param names */
++	      if (*p) p++;			/* p is past ; */
++	      goto param_done;			/* done matching param names */
+ 	      }
+-
++	    }					/* interesting parameters */
+ 
+ 	  /* There is something, but not one of our interesting parameters.
+ 	  Advance past the next semicolon */
++
+ 	  p = mime_next_semicolon(p);
+ 	  if (*p) p++;
+-	  }				/* param scan on line */
++  param_done:
++	  }					/* param scan on line */
+ 
+ 	if (strncmpic(CUS"content-disposition:", header, 20) == 0)
+ 	  {
+-	  if (decoding_failed) mime_filename = mime_fname_rfc2231;
++	  if (decoding_failed)
++	    mime_filename = string_from_gstring(mime_fname_rfc2231);
+ 
+ 	  DEBUG(D_acl) debug_printf_indent(
+ 	    "MIME:  found %s parameter in %s header, value is '%s'\n",
+ 	    "filename", mh->name, mime_filename);
+ 	  }
+ 	}
+-      }
++      break;
++      }	/* interesting headers */
+ 
+   /* set additional flag variables (easier access) */
+   if (  mime_content_type
diff --git a/mail-mta/msmtp/msmtp-1.8.26.ebuild b/mail-mta/msmtp/msmtp-1.8.26.ebuild
index 99d42c9e6537..a459bdf7cca0 100644
--- a/mail-mta/msmtp/msmtp-1.8.26.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 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
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 31a4f715260f..b3142fdb9f1c 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,4 @@
-DIST postfix-3.10-20240724.tar.gz 4961309 BLAKE2B 866f253f1279b03c0c149a817940685b096973bbc2075f6f7cb4d0f7b117392efc78c8f68b208987796614dad38b7f0cabee2a9fd34e16145041fbac1df36c90 SHA512 380834d6df035e06153de41d10a6d0c77954715c07bb0f2dd777aa799166e47964d82121e1f621c69ff449f23f75144c756df14853c40b047cbee13c227fac77
+DIST postfix-3.10-20240902.tar.gz 4963467 BLAKE2B 283d1d5e5148878c73b9eb94e527760680d06c3fde3c07c26f2181ad329e7e10d7fa031caed783488d099725e8d08fb8fa9336579cb7c3494d504b4932fa5b88 SHA512 7fd7e5926e6ac2cc47c625fe0bb8611cfa3ee051d6748991dde9d86f1a2e1e9c6e7bb18c934fffa0ab785172bd831f0fc016ebbe627dc30a691e60602cab9568
 DIST postfix-3.8.5.tar.gz 4871284 BLAKE2B 0de999c47a4130eb3418ec60b23c10be405b9bc4b2a6022671f9dc4713256d2b81d3b43f01d89e02d2593f87109dcde366b0265eb0cb13cb3118d0e60e36b48b SHA512 26005da5750e7af742f4fc7596ae8320467176e069546c3487418c663b54f56734b4a6541665b8d72d94df2e0fd4f68a2bcc44c50a6d950334d5a5fb2293dff4
 DIST postfix-3.8.6.tar.gz 4873054 BLAKE2B eda349dbf7fe45636fbd68991dba9f099a41dd402f7d58eb71ae881b5889889e5fd29e42e2492ab2af4d7febae1922cb3513b740b21e97f12deb44b5927a3c3d SHA512 2b227bb6b57e4cf2d727a23762b161f2328959faa4683d63b35543701c3e954be552537eaa14a899c65ec4856d9f91b0398337088a6e2b48c0446fd406be8de4
 DIST postfix-3.9.0.tar.gz 4953133 BLAKE2B e07a525d9cbea43d3ed11f3d672452cf94f88ca7bbaf3c3254bf5be4ef675a1797a5fff2444c0db60c6eb53e43734a388a91faed72bb2fb4e3e5a353535602b0 SHA512 46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324
diff --git a/mail-mta/postfix/postfix-3.10_pre20240724.ebuild b/mail-mta/postfix/postfix-3.10_pre20240902.ebuild
index 5956c9b9539b..5956c9b9539b 100644
--- a/mail-mta/postfix/postfix-3.10_pre20240724.ebuild
+++ b/mail-mta/postfix/postfix-3.10_pre20240902.ebuild
diff --git a/mail-mta/postfix/postfix-3.9.0-r1.ebuild b/mail-mta/postfix/postfix-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..7afab4a89695
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.9.0-r1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+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 ~ia64 ~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
+
+	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.9.0.ebuild b/mail-mta/postfix/postfix-3.9.0.ebuild
index a56a1525293e..3cd753a92ec4 100644
--- a/mail-mta/postfix/postfix-3.9.0.ebuild
+++ b/mail-mta/postfix/postfix-3.9.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_SRC}"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl"
 
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r5.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r5.ebuild
deleted file mode 100644
index dd4bb4a05e8c..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.64-r5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=4
-WANT_AUTOMAKE=none
-
-inherit autotools
-
-DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
-HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
-SRC_URI="
-	mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
-	https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCHSET}.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 ~x64-solaris"
-IUSE="ipv6 +ssl gnutls +mta"
-
-DEPEND="
-	!prefix? ( acct-group/ssmtp )
-	ssl? (
-		gnutls? ( net-libs/gnutls[openssl] )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-"
-RDEPEND="
-	${DEPEND}
-	net-mail/mailbase
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/msmtp[mta]
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-	)
-"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/patches/0010_all_maxsysuid.patch
-	eapply "${WORKDIR}"/patches/0020_all_from-format-fix.patch
-	eapply "${WORKDIR}"/patches/0030_all_authpass.patch
-	eapply "${WORKDIR}"/patches/0040_all_darwin7.patch
-	eapply "${WORKDIR}"/patches/0050_all_strndup.patch
-	eapply "${WORKDIR}"/patches/0060_all_opessl_crypto.patch
-	eapply "${WORKDIR}"/patches/0070_all_solaris-basename.patch
-	eapply "${WORKDIR}"/patches/0080_all_gnutls.patch
-	eapply "${WORKDIR}"/patches/0090_all_debian-remote-addr.patch
-	eapply "${WORKDIR}"/patches/0100_all_ldflags.patch
-	eapply "${WORKDIR}"/patches/0110_all_stdint.patch
-	eapply "${WORKDIR}"/patches/0120_all_aliases.patch
-	eapply -p0 "${WORKDIR}"/patches/0130_all_garbage-writes.patch
-
-	# let's start by not using configure.in anymore as future autoconf
-	# versions will not support it.
-	mv configure.in configure.ac || die
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/ssmtp
-		$(use_enable ssl) $(use_with gnutls)
-		$(use_enable ipv6 inet6)
-		--enable-md5auth
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake etcdir="${EPREFIX}"/etc
-}
-
-src_install() {
-	dosbin ssmtp
-
-	doman ssmtp.8 ssmtp.conf.5
-	dodoc ChangeLog CHANGELOG_OLD INSTALL README TLS
-	newdoc ssmtp.lsm DESC
-
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-
-	local conffile="${ED}/etc/ssmtp/ssmtp.conf"
-
-	# Sorry about the weird indentation, I couldn't figure out a cleverer way
-	# to do this without having horribly >80 char lines.
-	sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\
-	# Commenting the following line will force ssmtp to figure\\
-	# out the hostname itself.\n\\
-	# hostname=:" \
-	"${conffile}" || die "sed failed"
-
-	# Comment rewriteDomain (bug #243364)
-	sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}"
-
-	# Set restrictive perms on ssmtp.conf as per #187841, #239197
-	# Protect the ssmtp configfile from being readable by regular users as it
-	# may contain login/password data to auth against a the mailhub used.
-	if ! use prefix; then
-		fowners root:ssmtp /etc/ssmtp/ssmtp.conf
-		fperms 640 /etc/ssmtp/ssmtp.conf
-		fowners root:ssmtp /usr/sbin/ssmtp
-		fperms 2711 /usr/sbin/ssmtp
-	fi
-
-	if use mta; then
-		dosym ../sbin/ssmtp /usr/lib/sendmail
-		dosym ssmtp /usr/sbin/sendmail
-		dosym ../sbin/ssmtp /usr/bin/mailq
-		dosym ../sbin/ssmtp /usr/bin/newaliases
-	fi
-}
diff --git a/mate-base/caja/caja-1.28.0-r1.ebuild b/mate-base/caja/caja-1.28.0-r1.ebuild
index c5cc0b5db2d6..7a83a5c73ff6 100644
--- a/mate-base/caja/caja-1.28.0-r1.ebuild
+++ b/mate-base/caja/caja-1.28.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic mate
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"
diff --git a/mate-base/mate/mate-1.26.0-r1.ebuild b/mate-base/mate/mate-1.26.0-r1.ebuild
deleted file mode 100644
index 9cfaebde80d6..000000000000
--- a/mate-base/mate/mate-1.26.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
-
-MATE_THEMES_V=3
-MATE_BRANCH="$(ver_cut 1-2)"
-MINOR=$(($(ver_cut 2) % 2))
-
-if [[ ${MINOR} -eq 0 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="https://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base bluetooth help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*
-	=mate-base/mate-menus-${MATE_BRANCH}*
-	=mate-base/mate-panel-${MATE_BRANCH}*
-	=mate-base/mate-session-manager-${MATE_BRANCH}*
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*
-	=x11-wm/marco-${MATE_BRANCH}*
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*
-		=mate-base/mate-control-center-${MATE_BRANCH}*
-		=mate-extra/mate-media-${MATE_BRANCH}*
-		=x11-misc/mozo-${MATE_BRANCH}*
-		=x11-terms/mate-terminal-${MATE_BRANCH}*
-	)
-	bluetooth? ( net-wireless/blueman )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
-		=x11-themes/mate-themes-${MATE_THEMES_V}*
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*
-		=app-editors/pluma-${MATE_BRANCH}*
-		=app-text/atril-${MATE_BRANCH}*
-		=mate-extra/caja-extensions-${MATE_BRANCH}*
-		=mate-extra/mate-calc-${MATE_BRANCH}*
-		=mate-extra/mate-netbook-${MATE_BRANCH}*
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
-		=mate-extra/mate-utils-${MATE_BRANCH}*
-		=media-gfx/eom-${MATE_BRANCH}*
-	)
-	help? (
-		gnome-extra/yelp
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}* )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "Please report all bugs to https:/bugs.gentoo.org"
-	elog ""
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-	elog "		mate-extra/caja-admin"
-}
diff --git a/mate-base/mate/mate-1.26.0-r2.ebuild b/mate-base/mate/mate-1.26.0-r2.ebuild
new file mode 100644
index 000000000000..13bafd65da5a
--- /dev/null
+++ b/mate-base/mate/mate-1.26.0-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MATE_THEMES_V=3
+MATE_BRANCH="$(ver_cut 1-2)"
+MINOR=$(($(ver_cut 2) % 2))
+
+if [[ ${MINOR} -eq 0 ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+fi
+
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="https://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+IUSE="+base bluetooth help +notification +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	=mate-base/mate-desktop-${MATE_BRANCH}*
+	=mate-base/mate-menus-${MATE_BRANCH}*
+	=mate-base/mate-panel-${MATE_BRANCH}*
+	=mate-base/mate-session-manager-${MATE_BRANCH}*
+	=mate-base/mate-settings-daemon-${MATE_BRANCH}*
+	=x11-wm/marco-${MATE_BRANCH}*
+	base? (
+		=mate-base/caja-${MATE_BRANCH}*
+		=mate-base/mate-applets-meta-${MATE_BRANCH}*
+		=mate-base/mate-control-center-${MATE_BRANCH}*
+		=mate-extra/mate-media-${MATE_BRANCH}*
+		=x11-misc/mozo-${MATE_BRANCH}*
+		=x11-terms/mate-terminal-${MATE_BRANCH}*
+	)
+	bluetooth? ( net-wireless/blueman )
+	themes? (
+		=x11-themes/mate-backgrounds-${MATE_BRANCH}*
+		=x11-themes/mate-icon-theme-${MATE_BRANCH}*
+		=x11-themes/mate-themes-${MATE_THEMES_V}*
+	)
+	extras? (
+		=app-arch/engrampa-${MATE_BRANCH}*
+		=app-editors/pluma-${MATE_BRANCH}*
+		=app-text/atril-${MATE_BRANCH}*
+		=mate-extra/caja-extensions-${MATE_BRANCH}*
+		=mate-extra/mate-calc-${MATE_BRANCH}*
+		=mate-extra/mate-power-manager-${MATE_BRANCH}*
+		=mate-extra/mate-screensaver-${MATE_BRANCH}*
+		=mate-extra/mate-system-monitor-${MATE_BRANCH}*
+		=mate-extra/mate-utils-${MATE_BRANCH}*
+		=media-gfx/eom-${MATE_BRANCH}*
+	)
+	help? (
+		gnome-extra/yelp
+		=mate-extra/mate-user-guide-${MATE_BRANCH}*
+	)
+"
+
+PDEPEND="
+	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}* )
+	virtual/notification-daemon:0"
+
+pkg_postinst() {
+	elog "Please report all bugs to https:/bugs.gentoo.org"
+	elog ""
+	elog "For installation, usage and troubleshooting details regarding MATE;"
+	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+	elog ""
+	if ! has_version x11-misc/mate-notification-daemon; then
+		elog "If you experience any issues with notifications, please try using"
+		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
+		elog ""
+	fi
+	elog "Some packages that are not included in this meta-package but may be of interest:"
+	elog "		mate-extra/caja-dropbox"
+	elog "		mate-extra/mate-user-share"
+	elog "		mate-extra/caja-admin"
+}
diff --git a/mate-extra/caja-actions/caja-actions-1.28.0.ebuild b/mate-extra/caja-actions/caja-actions-1.28.0.ebuild
index 78dee5dd4bb5..2707562c0dde 100644
--- a/mate-extra/caja-actions/caja-actions-1.28.0.ebuild
+++ b/mate-extra/caja-actions/caja-actions-1.28.0.ebuild
@@ -9,7 +9,7 @@ inherit mate
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Caja Actions"
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.28.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.28.0.ebuild
index 2c0ba289b6bd..9b6ccfeb5cb0 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.28.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.28.0.ebuild
@@ -10,7 +10,7 @@ inherit mate python-single-r1 linux-info
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.28.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.28.0.ebuild
index b34d9e6f414f..cb3a10594e7f 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.28.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.28.0.ebuild
@@ -9,7 +9,7 @@ inherit mate
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Personal file sharing for the MATE desktop"
diff --git a/media-fonts/alef/alef-1.ebuild b/media-fonts/alef/alef-1.ebuild
index 139db43713ca..e035b815d3d3 100644
--- a/media-fonts/alef/alef-1.ebuild
+++ b/media-fonts/alef/alef-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit font
 
diff --git a/media-fonts/courier-prime/courier-prime-1.203.ebuild b/media-fonts/courier-prime/courier-prime-1.203.ebuild
index 489eddddc120..3fcdc11cdbd2 100644
--- a/media-fonts/courier-prime/courier-prime-1.203.ebuild
+++ b/media-fonts/courier-prime/courier-prime-1.203.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 
 DOCS=( README-CourierPrime.txt README-CourierPrimeSans.txt README-CourierPrimeSource.txt )
 
diff --git a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
index 4a923f54fe52..00ecaa6a3771 100644
--- a/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
+++ b/media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE=""
 
 RESTRICT="binchecks strip test"
diff --git a/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920-r1.ebuild b/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920-r1.ebuild
index 8ab8eb3f2d48..f49c39666a55 100644
--- a/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920-r1.ebuild
+++ b/media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE=""
 
 RESTRICT="binchecks strip test"
diff --git a/media-fonts/fonts-meta/fonts-meta-3-r1.ebuild b/media-fonts/fonts-meta/fonts-meta-3-r1.ebuild
index 08c952237248..a051afab02df 100644
--- a/media-fonts/fonts-meta/fonts-meta-3-r1.ebuild
+++ b/media-fonts/fonts-meta/fonts-meta-3-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="cjk emoji +latin ms"
 
 LANGS="as bn bo brx doi dz gu hi km kn kok ks mai ml mr ne or pa ru sa sat sd si syc ta te th"
diff --git a/media-fonts/hermit/hermit-1.21.ebuild b/media-fonts/hermit/hermit-1.21.ebuild
index 659a7194324c..237664d0f981 100644
--- a/media-fonts/hermit/hermit-1.21.ebuild
+++ b/media-fonts/hermit/hermit-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://pcaro.es/d/otf-${P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild b/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild
index 0dfc5ede5b0b..67200fbd7ead 100644
--- a/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild
+++ b/media-fonts/ibm-plex/ibm-plex-5.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/IBM/plex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="otf +ttf"
 
 REQUIRED_USE="^^ ( otf ttf )"
diff --git a/media-fonts/intlfonts/Manifest b/media-fonts/intlfonts/Manifest
index 30340223fbc5..39deb904853c 100644
--- a/media-fonts/intlfonts/Manifest
+++ b/media-fonts/intlfonts/Manifest
@@ -1 +1,2 @@
 DIST intlfonts-1.4.1.tar.gz 26437950 BLAKE2B 57bdb2acb6d90362e6b2ab83d509638170c751aa26c803907dfb8f8db73a0190d112175815deab92866eb0af97cd4da11edf9cebdf6733e01bd32e93ed863b0e SHA512 6d070de3103c655065a904fce9a8c883f7c4fc12f42e039984cf40884853f57c88fb6c13221dc367c371e0e8585ed54650cfa69ae886cfae2a74df22ead95c06
+DIST intlfonts-1.4.2.tar.gz 12772093 BLAKE2B 84139c5cc6cf2250527c76f101143abb4832f90c10b701c46f74a664b57935e5fb437a6cd191503b4fe1f96fbde417e0b8e909b632609a97fe5bd71cde44182e SHA512 c079a940b855f387a899c4e025daf4fa10f237c1a0721cf72b4569438b2e3d37e9e8074207af2628b4b7e335e1c9f3ee0c66838642538f57a5b7383447afa055
diff --git a/media-fonts/intlfonts/intlfonts-1.4.2.ebuild b/media-fonts/intlfonts/intlfonts-1.4.2.ebuild
new file mode 100644
index 000000000000..26c492e58c16
--- /dev/null
+++ b/media-fonts/intlfonts/intlfonts-1.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="International X11 fixed fonts"
+HOMEPAGE="https://directory.fsf.org/wiki/Intlfonts"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain HPND GPL-3+-with-font-exception"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bdf"
+
+BDEPEND="x11-apps/bdftopcf
+	>=x11-apps/mkfontscale-1.2.0"
+
+DOCS=( ChangeLog NEWS README Emacs.ap )
+
+src_configure() {
+	local myeconfargs=(
+		--with-fontdir=/usr/share/fonts/${PN}
+		--enable-compress="gzip -9"
+		$(use_with bdf)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake install fontdir="${ED}/usr/share/fonts/${PN}"
+	einstalldocs
+	font_xfont_config
+}
diff --git a/media-fonts/iosevka/Manifest b/media-fonts/iosevka/Manifest
index 11ff5de83b39..c8a34f245035 100644
--- a/media-fonts/iosevka/Manifest
+++ b/media-fonts/iosevka/Manifest
@@ -1,48 +1,120 @@
 DIST SuperTTC-Iosevka-29.2.1.zip 103497864 BLAKE2B 4a3b26057c75ef16ca72b90df33a991affa9b89744d305338690ff787b33b1ece309cb4224d04af33888b1dd9c37f2454a6376c47dc3996430ee5bcb2517be8c SHA512 b5abfa1a244759a5f84a2555d61a30acb88962501c9ba11f026275204e47d1f69606844d04c4ec4e32a84d28b6e751ea7ad58da804c421bd0ede7779de65e544
 DIST SuperTTC-Iosevka-30.1.2.zip 94754606 BLAKE2B e4e2d3a18e232a179f6b673015280099649b5919175733b69cca6711243a7469a598ab925086daa1b795f52447caa00d158aa1f2b260c0d204e2e65794322bd5 SHA512 e43405afce689623bf4321af91b2d5f6f10a8036464f44be5f903746c88e1deb2cb4f6a885be42faee5d406e234d4eefc2477bf1496eb77e6c147addb913812e
+DIST SuperTTC-Iosevka-31.3.0.zip 104648692 BLAKE2B 200325dd4e0776b2a34225cc0a560384f9272cfbbbb720b2edcdb67576d13ca549252e86e15a02c0d795baa00699a68d84ec4cbfa09d744aa14120a170cd8f82 SHA512 645dc6c09ab44281c29ea02273b9bc27bfdbe15abb18474bbf2197ce1d74c06ec6abed96bbfbc053fad56f7a8dd26a403999eece05f360210df34dce4fa186f9
+DIST SuperTTC-Iosevka-31.4.0.zip 105615788 BLAKE2B 03403227fe662976c6dfe5c61098578c315f6c61d515f7a80b7e874f4c738d56cf9867e9861899481a71056b1435a58704c76bd23ee62fc925d8b310914c301b SHA512 bf2a8538687e6b6099449721f6908f74ba7ed5539c218b9a4d0c3a8300b026e693222a682a8ff8b64dee4df2b04430e6435cf2e21aaa27813b7da5afc6469fd4
+DIST SuperTTC-Iosevka-31.5.0.zip 105960618 BLAKE2B 38188fa87c151c43341b09207d8f03441a9fca744c89c9903d38e89037622724b42eccf74ea44ce959aa5591e911c58bcd5d475d51edd46ddd920b6b3990ac4d SHA512 393785808bc003564567f0674c7761b69d04899f8fcb4737db22632fb6c1916175a6dd336dae296b97842ad0dc196cc35358e85fa8f64216165d78aaf6bd585d
 DIST SuperTTC-IosevkaAile-29.2.1.zip 48675962 BLAKE2B 091786c99694a66d1dd08569dcaf3a7bba34cc8b58599087c204b64c597554a9d9c8b9bf34be0b497f1ff8fe3a92f6ada852c66b8ab47eadf7cf6e9e86d3d92c SHA512 bff7f9ddb9d4723d252274d6bb208a3fc50430762b6fc781fe8d47f30f21b55e290f49480794a86c8cc9ccc76b877036dcc75d196793d086a093910824902221
 DIST SuperTTC-IosevkaAile-30.1.2.zip 44125829 BLAKE2B f6d4393bb3096221967e5b2a78152ea9f8cfefa0dccc7ab6ef97b41075bc48801b415336cece562ef13c9b39cac999ce96317fb05f1478b37324f0e27d21dd91 SHA512 2dd6d87c47b86e58ad57d09be5a0fd74a4abb64170ff84103bef6e1e577ccfb23879ea0d416308412df7e733bebb564480eeb7b6b8b122863ae7ea70bd65efc9
+DIST SuperTTC-IosevkaAile-31.3.0.zip 49442398 BLAKE2B 54fb212fcacef9ca9ef5c18370bf9226553b1b852fc12e8f680d0065c71ca4cc0a75d82c4d85e42c767efa1c234a6e98acccbc49b247615bbc9f68a7e28ce1ec SHA512 03bc052b5edf57489ff5278da8bcfac5e6f21257325d4c2616a0b5f8700b3d8866e524eab5e8ba274ed5b718102e5782e44134777b97803c8694d629355ecf30
+DIST SuperTTC-IosevkaAile-31.4.0.zip 49895240 BLAKE2B 0566e54d605d285cdc49096f3e7013e6c6c9797d7cef944445e14cae4a0559651bf6c9e7daeb388458463f0637041e5241db7355fbab7ca7146fbcf3906577e5 SHA512 01e82aa058abe78607bbf2a49ef07768771dc6d40924d86d73a5654cebc59673dac49e5ba3fe2066759038c5a3ca126636fcbf4764ff8786c313a8e9f27492b0
+DIST SuperTTC-IosevkaAile-31.5.0.zip 50050900 BLAKE2B 42a4a64ed2591cb7b0a5799ac6e1a03233bbeb0bc0f2adaa369960d87a0348dee9dedfaa761b01610ae4e3a4756f97a693e7084edb0083d9fb2cb7d75dfee67d SHA512 28b4f7482a7e4b6ece50ece5fa246c4dacdd2322b28a91ca6ccc8464a2b1b8d04bea02bd0fb941b5257f80468072c37bb1e11d88f2c37b317a6fbb2d7a721c5d
 DIST SuperTTC-IosevkaCurly-29.2.1.zip 104465078 BLAKE2B 06792e8526415a1de8f98fe566a27fd86ac62c0a7315651d93511bbfa313f45948b71b9b348a834814b1b221034f5c8ed47a66cd5517259b97caea5da42e32bc SHA512 abb6d1cc4bd9d683c8f04f3fb85c943c3bb5a228018b790442abd9ed6173a26e0bb972d393c89d8dd971af94183090d2b0238cb1958d2a05cac0b81b29d29f3c
 DIST SuperTTC-IosevkaCurly-30.1.2.zip 95645907 BLAKE2B 257f1737ccb3572107d85011304b1070dc2c51c2236859c127a15aa1017358d3bd6193e26099ff5526ff7bdf6064869a7f46ffda0af111026bbb80a1c44371a2 SHA512 d2ea7867b700a63d7e14e3d0a5c10f8da32de78fc4452a67683bcd98e6bfc3e4af87817483c0ec12381841da36394e23ebcfa687db8da0d2802f822e2b70ca06
+DIST SuperTTC-IosevkaCurly-31.3.0.zip 105052901 BLAKE2B dd71c457bf0daccce160e6c68eba57b0f63e108787074729d19549178690f82fb23409c4287f4c2dc4ac03ff1933aa2f6cb0b40f3667c3a3160cbdcb006eea98 SHA512 43573134b072f162a466beabb024d1b743f3a85ea48a3232975c79cc4ff070f3a205162f59d8155f9eeaaa551d877fe36115dcd29e9d9190db29790c5f5c919b
+DIST SuperTTC-IosevkaCurly-31.4.0.zip 106019427 BLAKE2B faf0127aefaf68882bd160b6961e8e264b2423d604f7f32769bac0ecf68569817ad6c38d6972e5b3565e22abb9bf26c8ac53f614a52890ec6a0afc9414caafcb SHA512 ab4c1de1fa77f9eec4df112d84999c6969362d7e47e85551d997d64446cd2e0ebea54a6b7682e197b5b11be7b64787459fbf5730fa7e628cb394a6d14e0bf1a5
+DIST SuperTTC-IosevkaCurly-31.5.0.zip 106355364 BLAKE2B bfa3a10b711c3a0051cf475e22b3f9d05c4043ab9d6ffff5df531c54ac95ca383beafdf95ee3c48d19531bf8b825a3ed3229b88b111b5dd1298592a405c65a46 SHA512 907ae9934eb356ef0dc0d1e4910b464faa9926e86b9084e160ce73cdec02b6c9bcf165263f5254dae72e8215e809816f6bb75e105bb37a5b5af94b331e57c9f9
 DIST SuperTTC-IosevkaCurlySlab-29.2.1.zip 110542951 BLAKE2B a80a3360dc39cb3dae3471bf80a4f77fb4ae4642e7d26bcbb162dc0f1463a692f0dc3c97edf4d5d3d778789e05e09fccf1cfda5d376ad138d4b400864a35bfe1 SHA512 d35957cd87ec553debb50dec53fa5e35c96db684e7bd937292554c80cb2f0032788d62822b901bf9ee08773335586c7c898097fda1911ba33ccb4a02093ba4d5
 DIST SuperTTC-IosevkaCurlySlab-30.1.2.zip 101104290 BLAKE2B 4b8a560cc39df20e10acaff3dc2d9b20a1fbe139fce33309a2d57c8b520f0cc7a57d86b1825a709cd0283ca647b543897d86779cb994df559e2fbad1b886b2f7 SHA512 c35ad466e67aaf9e38fb297385136e92dfa3f2a3f7ddacbe864635da0544c4585e1c7be9224051daf50673fc570a90d4e9b8c283703827aed8ed5ca426b07d2d
+DIST SuperTTC-IosevkaCurlySlab-31.3.0.zip 111988272 BLAKE2B 759f8f5dbd080bc95dd54be910326890cf8940d7fd4f107c25f5d2d1453315b5a758c1e472372b39fbc3c30a49f536041915dc109d2527531e0d0a79dc28d538 SHA512 19f589faed1394096614e047821909fe804f9d0468021dce0acc5da6b152e668e5e6d46d2c0b83703d3d7c3af82dae5586593462d57bcf8e41ce994bd952a116
+DIST SuperTTC-IosevkaCurlySlab-31.4.0.zip 113003634 BLAKE2B 7bef9761a2864e3151c9537b0f4a564bdcdf5feffeadf045f4e35ad0a2819f26b6e9103e463ee1ae4a610f052b6d4ae4e21351fec726fc2edd5b16bc4679e918 SHA512 c61fa45627eb1cc432309d287bb4f0741c250b080b28a59fb30b5d5825d118c76239c8e181c1a865d4b9ec808c4681a990d9d13fc8166cc81e0c93668c9ccde0
+DIST SuperTTC-IosevkaCurlySlab-31.5.0.zip 113372795 BLAKE2B d4a1cf8dc1acca756f964b61ee35a6152a86256cfd1b22b0f8fbcb15bfbe14939780ff673ca93e96664da45f94e63777e59a88971f29564cb31a035a1e954086 SHA512 cea425eba7f67cddfc4e5c8892df8114b56bddd9977e46ad563839f912e81fa01a645d2906bbcd6fc760b9b6807a596cb1510977688181d3839922f1b1bbce0d
 DIST SuperTTC-IosevkaEtoile-29.2.1.zip 53142875 BLAKE2B ae7854092564a03353e791d1e2a43e03c0fecdd9470d74c5e1d6a866ced4d3cd2f35baadb76924f2138398b7fdb8ef7a6b9e9d35cfea57d3e27b81039f4313b1 SHA512 1c51ede6246ea9947362b86078a8dccb0d4d4274c282e3bd57ef12cb3d698735a7cd5a6855bbb74fab6fbe46c08532e386f7b569025f444507ce0298adafe16f
 DIST SuperTTC-IosevkaEtoile-30.1.2.zip 48924061 BLAKE2B 80d2c8db47bae9d4096b6a312d9cdc99f15831873b6c8a9872188abaf93241ee41215c27c1a801dcbb6c8d78f0612ab0f0f992ff63b051fca7a0bc2ba2d88d46 SHA512 aff8cb2754ba4ef2406a6632533d9e0f9d4c2470df85560fa4cc370269b4dada1bc600bac042f53ee75a72d2c953a19fdc8442391de4e8ff0d54874086372f61
+DIST SuperTTC-IosevkaEtoile-31.3.0.zip 54502485 BLAKE2B 5e98cd801a3bd0078fc60f0902415bab5b034c722eadbce80c8e7639efdd82645f7c4c2a58c0c86c6b12df3797663e8aa514c773ab3222e9a89a043545de805a SHA512 6e84aef69da7d7580d068fd012ccf64b04061310ab741700758c078af945e0238341318e6fe5a67151b9e782a29ad1cd5ee5f806f1801ba42a28082807813f53
+DIST SuperTTC-IosevkaEtoile-31.4.0.zip 54973049 BLAKE2B 882dc9b83aa2ae40a95872715ab65a2dca95a292d15e05e03a7071b89ea19490e9c607c5875f78f93daaf8ad89676e5a309b2e48444d5570fdaf9d7cdef752b3 SHA512 f80f31d73d1b8290b59d8b4579ba0a6bc6625102dd3d3330dc24df2b75a6cb6288fb7ff0dae9e27c26dd6539f989ee4adbcd5b307247c127089f0dad3f44def3
+DIST SuperTTC-IosevkaEtoile-31.5.0.zip 55162138 BLAKE2B 9f5e01e5aba00c117370f368fc77f1876b579171843ea18197152f4bf5c42927c0a55592df19289829373e6fdc0b48b3d79b9e069a6126a3db6dfb979877a30b SHA512 f39c7fb99513a846578f51ceca2963c4f4ef05fbbd51233765e8aa87efb8f35ee8cb362c78dc8c148766f39f771eae9a40c787aea5f423bcd0a29d780d8ba8cf
 DIST SuperTTC-IosevkaSS01-29.2.1.zip 24070948 BLAKE2B 7b3a190067e533233a15f7d270ad8d6a54945e357e96cc389dca3ce1f3aa8b4c4754467c7707ea299cbf9f366dcfc7c0ba00565dd3ff194faa7c837510af05ce SHA512 f485ec08d3b39868061bfbf09f20af35906e47fbf2d2ac320a1de7dc18bc3aa90cc02cc8f7b7b33c8b62b69cee6ee42d9b82834dc4b6d026767b16ecf69ca447
 DIST SuperTTC-IosevkaSS01-30.1.2.zip 24582819 BLAKE2B bf18b1906f0cc2e321f12b9160b6ec9986eb0b19267d3437cecf93fac9756390be93f4022e143734046aacb6414d6ecf635568b730daedb145d0d6f020127593 SHA512 0642f74f6edb264894e4772baf1dd5227ae071aed414324c73c47f5a2fc0f03b8d7c2b2c24b7c7fae3b874494bccd454a0869b995b4e891d73a780fb652266ac
+DIST SuperTTC-IosevkaSS01-31.3.0.zip 27504370 BLAKE2B 81afada1cf9b83c2d6ac1dbdf77e96d78d272d866fbe679d0faea2d093d4430661cf255a247e243523c7b9dd10ef9e09caf8da7812c24b1332d164e9a5d63b35 SHA512 f77f40d285fb9614c8c755ac7d14235e7b2d675c76bb8e5337e3d9c5384cd99d700372f76975408da1fd0e173195e970748c93e1cc9417711408c665d1aff2f6
+DIST SuperTTC-IosevkaSS01-31.4.0.zip 27532636 BLAKE2B ce8b85b16a0007c496774e96ba6fbe251d7114d13ee949351c81b402bb9cc98840e8048cf3cc388e84e3843728dfce4aa05c4ca761564b614226cac585a1755e SHA512 5cd112a9c926a3b47325433c13848fed5fe5650082667dea3262990b9820faf0a753a4d0d08d2edb906d8a99ca0bcb9294d8cf81b6ec65417cc10a83bb7f6abc
+DIST SuperTTC-IosevkaSS01-31.5.0.zip 27598111 BLAKE2B 3c52185038d93f291a28653751358ed3dcdbd1d74f9871a2d771ed5f725629864a54821fca3e128448091e2d5c50530146da1a7b61f4248899131e0a369208f9 SHA512 279f97ad6f76d418c305718112ebefd9c06fe890bd50c7f9b3a56a1003eb0137c9e19fd7aa35d42ce206f8b363469987f3db1e6089d77239a8c0cccd6b03a1f1
 DIST SuperTTC-IosevkaSS02-29.2.1.zip 24358170 BLAKE2B 80883b9330650b761ca8282f65452ace9346949b6c3ed346b8439a909abef77311eb6ac6e35a14063601d67e9b4dd62ad5036deebdc6f82e0471a202a380d9dd SHA512 28f02e19826a5eb66e31fba7edafaa1d292793de111a8674da9d200af847aef4ed13995f1fea4b3682e481bfc58b2f6774a53896e9ea7f69008cb91f289ef1e2
 DIST SuperTTC-IosevkaSS02-30.1.2.zip 24873322 BLAKE2B cb4cca0103d65dcda4116cb976b374e3650da986fc85c39f3db03fd2148f73b45821110b32d5f6eebd670b4be0ff6ae5f5ece91f0e88e296013e9fa0e47bb83e SHA512 54e36b6de7425c4fe224e481dd9ade611163dd65c92ec733b78e82012a07077800ce8781c88a1cb778de76a5f9a33479ba6ef75c5869a00e34dcdbc097b6c26c
+DIST SuperTTC-IosevkaSS02-31.3.0.zip 27948454 BLAKE2B fa3ac1acf2b2b035c2a16b4d7415c90d1419d399006b79bb513e626af8291635918c74cfbd6b91761dfb6881cc7944521598aab676ca34ca62d218655afdb96a SHA512 1c81c74bdfcbe39be36e9c45765d7a50d5c171cadf23d2d80f83dfb089cefbf83e02be36cf0b1812dd530a8b305d96bf37bdcd192339a87633cace3e02f22b14
+DIST SuperTTC-IosevkaSS02-31.4.0.zip 27954668 BLAKE2B 24ea3392e7ce6f5d105f9a5fb9aa367aa801fe1dc02cbfe1ad3a317babe7c1be351227d698683680e48775800eda90ba2fdbb93e3184906942c3bec8d7bd22e0 SHA512 d831a144244046c336f9698e05b6dbf83eab732993b9bce7ad72a9ab5ec1b7220ed4bee7c76002660199c9c2c3b1a9f85168b09e6e30e84b3d344aad27aa8770
+DIST SuperTTC-IosevkaSS02-31.5.0.zip 28020283 BLAKE2B d96bc32df6310f8779a79fa82f87eb098bb0642dab4e15665c08c2126a8bc55bacda1c895a5396aa324299f5f2effef4b176c8c1867adc7b8573c84e91649331 SHA512 c924ce1fa0421a330b1288e1b9100c589fe9ab7184d2ddfcca7e537fe6db391ef0b9cb1c32204e3eb84c7bb2c96f1f5c9653ac6f682e6d4f30d623ab89ed5f0b
 DIST SuperTTC-IosevkaSS03-29.2.1.zip 24708510 BLAKE2B 7e8897202312b56850315e5390581d4b1be49948e6372914d64fe1d60d3f450ff6a5900e3f699b120a017d9db428d7899c7f369db9860862ecf140a46401c951 SHA512 3f78f4b402d4e49c155ff38f390dbbb18ed9269d8faf5594cfd219a6294bf3aa1698f68e049501492c3e58424b25403353219e1d07df79a0fc5051d5b6cdd19d
 DIST SuperTTC-IosevkaSS03-30.1.2.zip 25223736 BLAKE2B b7e2a9679bd2318784adafa32acf8c9ae63eea07a92ba77635b9496054cc6c62761f87b6f788dca2d3a61fae80b1f454f325cc9af5d72819dc7e9a328bb2c103 SHA512 18cec021e7010eea7650fe8365c9676aeeef31217f6a4d18ff80ad9f383b4e8646e3a23da77038763f5beb8cb20a86b2d912244c7ce670fb8c1a6b94d55984ce
+DIST SuperTTC-IosevkaSS03-31.3.0.zip 28410449 BLAKE2B 3f10145bba328bc1165065336d6311eab8e302c81589513784522a8450c619d7781de5e532d609cd5c3a905c92730a843794fd5a144a1ce0ff9fc309f9d31359 SHA512 3da1d0f78061875d1e8d28db5944b84cfe0815f1be521a19845f28d1c9d982b4607ecacd2ee2411b6e480adb32a69e5b0717aa504fbcd550f4cb7e4778b572f2
+DIST SuperTTC-IosevkaSS03-31.4.0.zip 28436156 BLAKE2B 37f6f806c9db9abfdd2028e386bda49c65d8fcef63fe6c87b4f1b78a7bd4046b8062785fb4a4ae0ce904200d2de28626a6c21be8cb66887dec6d9d4e2a25e02a SHA512 272435f07bc92ac26287e20c518ce44478275f5f6f1ebe469198e6137d85b36b56ad9e3cb837e53ad7b4e3350e40e1d192d49083f7eb04cf734d2fcb0cacf8f4
+DIST SuperTTC-IosevkaSS03-31.5.0.zip 28497766 BLAKE2B b26ccd5c40ee4c6718a94fe0ba2d363abf8c95ae8af7ee96990e4e22dc1b65da34c67d3b309a05cd26e4652c5cba57b9018ebcdb68b9edacb4221369bf8b8d2e SHA512 95d97890b417657496d11b675b8e83899eabfdec81fb0d9d10bccee36a6d86d6d33419ece515519f411256d39553bf6ac8c7dc887164c2f6156b29d63ea759ef
 DIST SuperTTC-IosevkaSS04-29.2.1.zip 23597645 BLAKE2B a3ffaf1691c8acae6e40dd7c255ddf655453e6f1758f415b46f83449456d105934ebe14bbc7f740448e10737ddf4fa789412438c0f4b536d07e39314361353e4 SHA512 17bd889eaf57e7aaced8adacbd5f38be6320ca33ac23a70ad6b008a39e18111e83202c302d035cd1d8c01f7c3c9f301c7bc735cf28a06e5d6018ce7c2080cc77
 DIST SuperTTC-IosevkaSS04-30.1.2.zip 24091806 BLAKE2B 9fc0b49dc9507e4e276d65d550417eea0412541fc1c38980fc34d27fe9d63bd79f4a8fd880bcb9de693164c4df2c3939969e16878c111a8e1c26ac78bbe093c6 SHA512 5baa1a1d4afe43bb1ea0aec54f5d9e269b0af74fa257c30b14900a26d2055a47ed5f7f6020dd9ef6307bfbcf04cc84416f4df43b8f74502d43a59cd4f3e7bf23
+DIST SuperTTC-IosevkaSS04-31.3.0.zip 27110666 BLAKE2B e01970e01da7d6071a13e1b36ad37f12e76bd0bd3a73d772d7a2369f03d4ff7d04888ab49ad36e4a746c3fe6fc0e953cc2f6477100c8f36d8ec9c2d2f850b8d9 SHA512 d718989a232c0332f559880d342843a3bd51982173c37586a860468bc7725adf1dd6689b8228dc5a5a5ac5630e89ef03ecf5771c2c72a509eda8c98a0b8dd8b7
+DIST SuperTTC-IosevkaSS04-31.4.0.zip 27125005 BLAKE2B 5a963aa75a47900b7b922066f9ffb8a8bdc8e6397aa0106cc171bb64c6c7a506f143909e63cf161462ae1c1f8d477a77ce0efcb89acc6ec38ee25d74d6f525d5 SHA512 b43c6725dd4c07fbdcd33e5615797a65b8fe59bb5c8f0e1b15c1e9d268a3bd3033bbd00cc6de1e2efd2ddd3beb4e9316224672b27544aeaaf046eaf97ce4e624
+DIST SuperTTC-IosevkaSS04-31.5.0.zip 27183276 BLAKE2B c69471480a083c2340916314d5eb55c4ebaf394cf77c7dc7273a036bdabe4c86aab7a5bd6b70d750b791d40f3a18f341f348b8c24a0b3e3a991d8b7095c06d8a SHA512 1d16a4f677a58e1472f1449435cbfc4440ca5edda2bb3f0264ca2262cc86b40bd4c7367963b41e063c45baa5c6fbb708ffa18501122677f78a959bc118caf410
 DIST SuperTTC-IosevkaSS05-29.2.1.zip 24317481 BLAKE2B e0a4431a22aee1ac9a9faac75290d7ecd25206d2653f9f2fddbb41884aba6067ccfb1713d6cb9b8bc6d65cc7e7f22fc45e9596ebd956dd547cfe3aa9e3d13094 SHA512 0c7772dfa54a98d5eb7c234896d0f3e9d6483f2380db98b38d51ace362002d47c83fde9d4df2a610f7fef1f28099914e60a20a15e6eb48c0e16c8254c1425898
 DIST SuperTTC-IosevkaSS05-30.1.2.zip 24832838 BLAKE2B 5ced59f755b9c1121b54ea54f01a6c16a8847ea767447857630688514c614a00992e289ae5192412e838cb7017ed65a0e959a356b221761e208cd15875c826b0 SHA512 20e545a14c59d6392e461748c00852c5ba7b0741049072791523aacfacc013e44ba83b0c6d7da77727fbf5f673a820378eb0c23d0627bca0143405b9d86ad894
+DIST SuperTTC-IosevkaSS05-31.3.0.zip 27845491 BLAKE2B 283d0db4a0a78a55f04f881346ffdd5b0d87b63f6b4782d495e5117273425f84868956e674a5bcf8f256a9c25b1318313f7f1e587e52e88a11cf18dcad25d960 SHA512 d3af4857fbe7b73a8a0fdc4819899eee364606818ec4b22c29821179adb3dbcce6579396ee59cec18bb14ccbcc44fd4098625e958cf938e6b7d38a4a6d15cb1f
+DIST SuperTTC-IosevkaSS05-31.4.0.zip 27865055 BLAKE2B 94d2f82efe75db608236f6b7256083ff37ef136df7c557ae0cfa8d90bc85faf0858c2e1a6ad959e096ad3f8bdec9baf4d345c58c17f28326527051d3ca4cba17 SHA512 cb3fa3ab8fdc9ac5919f261956b11d4759d602cf322e84c623100e7ff81562cf495c45ce50a6a40a5981343ff95ccf91daa9c2dd62f7c7cdd39312601ac96a38
+DIST SuperTTC-IosevkaSS05-31.5.0.zip 27923814 BLAKE2B 8e2c497ca4586171ed72d28592d9a306f35d7eea864edb8ceb527078187bda5591ada18cb6cf81ffe9d7867fa1db76101b0d793ee46ab80ace9df53d7841197c SHA512 0d36476614cd78cd1bc95efb0dad866bc3e18cf7faad23e453910f297e2e55cfbb51507290ea9825f5c5597eedaf7e998236d03c2879891734815a39a66d580e
 DIST SuperTTC-IosevkaSS06-29.2.1.zip 23923109 BLAKE2B 12781d07dd378e34e3e1490185a876e1cf5a60be3a1a07ec8598015502ddc7b5771bf01f5bcca1a2e3489e1ca0f13dfcc6d2911dd25fa6c84ae082722cec9419 SHA512 ffeeeb571ea5d938e159bb18f3656a24c592e484ab8794440cfa156291a49dfa0e542694364d89e37b70af342e8dab9c5a9765fba7df1f8c2271f28ae09eeb02
 DIST SuperTTC-IosevkaSS06-30.1.2.zip 24428936 BLAKE2B 73eeb6a639f6496bf00e55b7d4aaad0b3aa76df02d43979c11032c895fcb9158160fbe9cca4eab8d54d3fb4c414b71509d315002c6f49ee66907df90f26921f1 SHA512 8b21e8463e5f601d8471dd6a4a4b20b883cf919242ba72a0c342821e62794b1759a4f006f8843b37428b0fc5953bbc3aced667b04e531f61e66b0a011fe07cfd
+DIST SuperTTC-IosevkaSS06-31.3.0.zip 27405155 BLAKE2B 3a79a3f6b64c7caa71f74bc1ec17c20aac8b7f5c88fb5e91b8099ab872d44f04730fbe87ead17ab8bb28931ec564341943fadc8e620dcb3208d3e363b2a38ff9 SHA512 6364c8e073ac864d91d625a3d017798b74d995a5c9288e4c26787c5d0fe48a04fbe65f7b4dd343d7dd0b3f3aedf9e9ca3962638a803d532f62dd432e8cdc3cc5
+DIST SuperTTC-IosevkaSS06-31.4.0.zip 27429480 BLAKE2B f69f64d19d74d2d77d4b19f82ae6f453563642d7e20be6a11d5e561af24b1cbcf4b976366d3e44dc8079d858c2872b0a51fc8afdebb05366d4b11c809ed055b7 SHA512 a53844b74af99a022609dfa80a4adacb636694436629c38c53c549a5d28bf54db83cac2c21ad58dbae4e38f4d92438ad68d1357a16f3f37c13567239604375a0
+DIST SuperTTC-IosevkaSS06-31.5.0.zip 27484157 BLAKE2B 425b7f23d111c3c5b6ec609da6af712515b27089b2b4f8585a008380d652e12e37ccf49795e5e35ee5e9d446a00164ad1daa65036d07869a2d222dbbbc54b16e SHA512 1ab591ae750692206afc6d4569f4287a6b115f7206fc941c1a5cdeaeece15053990cd9038a57e483a720ee8505f2053d10e61ff6e875d3f39b8a80784c2b5b88
 DIST SuperTTC-IosevkaSS07-29.2.1.zip 23788232 BLAKE2B c3111b8c7fc201f7b4bacfacb88bcf60ef5e92c5ef8116c510f93905b8606070952e2fce8c782d13835f9dfffbff6954dc95b0cbb78210a85686881da28e4ef2 SHA512 af9728250db3af75ae7f4d568ed7623cc6b0031c11c0abd69cfe2d7b1e3df647eb82b81daf2322b0e297a51600b0c87cbdf99089abb2c6aa28f2c0019de1da5c
 DIST SuperTTC-IosevkaSS07-30.1.2.zip 24293358 BLAKE2B c0a90320175f310c270d10465d563701bf32de0be16a3f822cdacbfed51f056b77cbf83160afdcec3735bfc7801110568b3b148a054ac9d07787633659f1a9d1 SHA512 7e4a8280a9fc9de68302575d5d2f697e22c1ec344b711677c66253ca4a97b656202772851a7379310f5c4a19c7da561f15d0e69e9e4098c10b2853480d079d7d
+DIST SuperTTC-IosevkaSS07-31.3.0.zip 27334141 BLAKE2B f28752a4dc7d4769947d179ce9e2c74ed644a1d164d3862dae41316fb4f27f03979260813a785b01dee55a4768e7d3057dade78e8482a24a50f4857bf904caa7 SHA512 b4a0c7e5fb9b2c556be2281467e05570625c25ef74c70511ce5282d5212ff1cbcc28d88b92091a59d04572da71147ed4d51d1566b8e2dffb740ae613cd9d5514
+DIST SuperTTC-IosevkaSS07-31.4.0.zip 27360640 BLAKE2B ab15d24afc69c5b964836a5281527e3ed0b2421c8b73a899c6e79976c3bd840e23f8656c6ac984d5aa661340448eb90a64d84a74ceb9d2246a49be81c541ed20 SHA512 f59fd4186647dd99c827ba97a88d99d1355c068c1d722f430b6b23d0a9d94155bfea452916d4a2df7976b6bba78a442e0f7bc65a376ed8bb768776d61c4b7c7a
+DIST SuperTTC-IosevkaSS07-31.5.0.zip 27427679 BLAKE2B a79b7ae512d0126db21439e8e39f7dc213011ad9436ebda904214e571cc5ee4469fe8fec93c766442e89929c84566a2105ba96396bbd3b7ee143df490734de84 SHA512 c1a05d0ca24b71bddad9826d968532ef116831338cd2e8df452534083757f2067c2b7772c6d02d31e41259fa33b4d8d52eab2685fef49c3e01eda4f466abd3df
 DIST SuperTTC-IosevkaSS08-29.2.1.zip 24656895 BLAKE2B cd7d2645eabc761bddd8f78bb1ebadba03d8e21b23bab288700f66240e55d0e9f4f90eedb583887d4296549cf434bff65b50df33b46c5103483babd288e2fccf SHA512 f4bf17cb2e2431594dbaf3c8616f0f3068831d760836b0cef19e60a605e1b02595a088a4702c77681cb12b502e0a6a88c9a86fdec2fc73a8339e5ca0d27449c5
 DIST SuperTTC-IosevkaSS08-30.1.2.zip 25166941 BLAKE2B 041beb281fb353db954a1e4585fe3cf4719e010b90d9cf65f72a9d09a0f0899eba8f6a8db464464add7f0b008fad2d64032edcb10a56dd0402524cb30adcf8bc SHA512 0ae712687dcc0090eb2bcc686349888fbe89b8cd817a00177897504e1931b5fd34eb870f861e3ee9b02597a39a138c0b83b535bb1bcb81a443f7492921acd39e
+DIST SuperTTC-IosevkaSS08-31.3.0.zip 28342902 BLAKE2B 4d99724c72a48d3b98fe7663051f65081eccf3dd8ff9a1ab6ad2e6d9673bf2f5becf0188f222f9df6dd9b20d4827de9a0b59b79b4193686b2bcf96389950b37c SHA512 9124668258227e1fe1e2ad5a49230f76f91dcaf39e689051a5982259c2bae501502fecc36fe961814ead0887be4f8b7c6d481e8c9af39e5f946288e313aadcb9
+DIST SuperTTC-IosevkaSS08-31.4.0.zip 28420620 BLAKE2B 955c871128ec584c9144c4eadd90129a58b72618a7f1b1c1a5ce93e29f31d0568f4a6e750b0a4fcf9a3baede931b60d804cf7d8f52370f24b12ecf2c36c4e781 SHA512 69d170854c5b5fb48a0ca76a61b6adeac6b269202dc1dfc73bfbb8a84fdf2ecd09b5556cf0cf7a6200e99b8c02be14e7cb91240a695ae60465b45292b2832d29
+DIST SuperTTC-IosevkaSS08-31.5.0.zip 28481527 BLAKE2B cd82faac8d16306c5180db8074b48fc08aec9eea6133aa8e2c9248e46a3e67c5c9a2dde260bd879d44d95f1760abd43103864aba152d9de2ffaad852c3f87011 SHA512 5ec8a1a7ce86d0a75538735ba4c61d26d47993d9f70385986fe3b6d5d1f49569d97a6b9c5c7dd69b4baf8532a2b21ded73f09a67fed5f773e8acda911ad384bb
 DIST SuperTTC-IosevkaSS09-29.2.1.zip 24589070 BLAKE2B 2e8d780108bd26f17b7ce1ae3b7f6ca9b0700db1c0455d0b1f44529722d4bab660860e222c28d647f0cb2dd846176fa25bd2e260c30dc693bedcdf9636a9e100 SHA512 1a934a690bc7c57ce4500367873ef213db4a3b8e900d8c09eaf0fc8fa4bdc85a2e2201efc0c927770f7fb3043f89293bb4cf66d7c81333f99be4c384b1d98d51
 DIST SuperTTC-IosevkaSS09-30.1.2.zip 25101794 BLAKE2B e4fb02aae0628fedb7285fa78a3e35a98074ada69ad01dd49959de25f3605d6a202cc65ef3fb646e7dc3ec5481b194951c1497cff9208506fe244d0612f693a7 SHA512 e4636043c36b131ed2e8d96ee17ffe4c0d4f12c74a406debf7ea61af23e00778bb579045f45bf663db3e512aa13a882c58a263fa60a3e4a62ffc29f291ed5a37
+DIST SuperTTC-IosevkaSS09-31.3.0.zip 28058273 BLAKE2B 3e2968788dac3c6fa3f1d212a30c2e90952ae1c3f3f71ac8c81cdd301c058ca26e6d38135ec18f52858319ef6f8f66414ad3892c9fa98f427e1685d57c8e5853 SHA512 d122d6347c301843ee4bb53753cbcd2e10f05544508d13936c93913cd29fa83732775a6f93c2df3dc7300135b7355dcde7d5f6b5765f1190774faf688f602a47
+DIST SuperTTC-IosevkaSS09-31.4.0.zip 28086301 BLAKE2B 2c8963dc0e87876f1bd75d1ed847ad2b26a5b12ed57408708929ad73d6f4724814d10a16b8841f9a7e9b066ac7ae79fb2b071c26cff74b8fa49b3015f4a4d9b8 SHA512 a0f852ca1ab4f254e64a24e4023ba549610aaaafe30523234c0f20eac7a0c5bd4ee35f244a847915547d32544471c65b82fb6f3d9e95211ce16aae4ea2b427ab
+DIST SuperTTC-IosevkaSS09-31.5.0.zip 28154165 BLAKE2B 08043ce0c9b4883ff155d9012ec91da4e12a8a02e4630a2756219655a585e67d019fe6fb2892f4f78a385ce1054e756dd11892daf4c27023f1be9b7e8b5b2026 SHA512 27489dceb85663c1cdef31e6ea93d74054855f6b21789838ffc1a65bfc5b156beae889596fa63f38354247a23c976d55c0ed2cf379e51168cc5a6b1eba45f6b2
 DIST SuperTTC-IosevkaSS10-29.2.1.zip 25188479 BLAKE2B 0caef38eea60827efcabaec22bf9e4e344b5b80497c94c090d76513a28a15fd0cd425d6466980ae78be9c961dc72d9b0f2238257f21aedbea55fb94e09067b09 SHA512 01a2961f9a479966fb5be8fac391032358e891e3004171f4219bd7056bc3a63fb9d35ea1ec395d646a4798f050ef84d986e447f84ffe8036a1deab4adefca710
 DIST SuperTTC-IosevkaSS10-30.1.2.zip 25864032 BLAKE2B 70d866a5f1bece14b597f0e713058dfab1b91740a241bb3a5623a83304ec805042af9d760d448b96defe312500be4606e00fbe55e28ede05b1b524662ef8ebfe SHA512 ede74c5bfacbd044f6a52de762bfdfefb1fcc3b59248aad09de6bfd9028b1eb10fa75110f73d382da1a128455a9fa77b13aad280a6d971a7e09d820344008f89
+DIST SuperTTC-IosevkaSS10-31.3.0.zip 29044414 BLAKE2B 813bc0a6caca6d3e8cce21262a18e1378733241e3bd589ff0dac1615bfcc25b4fc79908e8691de15e201ef4081f0e7ba1f56b03c8ca7bee93aeafddd2d6ed62c SHA512 ae2ff143acfd177a72b2c0f511d2dcd5f3c0961fd91d358803f1f29229d16378e6acb246b1fd6a6375665c28af043190c70a716f7b57d59c3b6f5d7f684892ed
+DIST SuperTTC-IosevkaSS10-31.4.0.zip 29219694 BLAKE2B ceb0cf8754d708e061ac638cc931be6c57c99059b7b8772b3a4f35271b7d6a2e6c99cf4dafcde921149927acb241386d0ea9abe5a07ffcf2fbce7a1971411c85 SHA512 b037cdcedf2c4ff466e04abac490bd24b26e05c9733e624e433c1d86871936bebc02a157c383292a1ac03c862c6c3316979fb78875eebecbb841ccf34df442da
+DIST SuperTTC-IosevkaSS10-31.5.0.zip 29283486 BLAKE2B 43b10a5e872cc0e3ffa931d4fe9a9a98923504c5861eb3ab9fb63b496bb8e84c9f2cd78130735e73cb48ad1b30de681fa3f0a152b2679d7127c019af02312c68 SHA512 6128aee5c8d598be4957848ed5e0981e9b57868d3d67f36c16d6dc1ea7ac00a1c881fdc4f7396567d91879039663ffea266cec8b5ffb8c2d3d3ed6df8724dfc2
 DIST SuperTTC-IosevkaSS11-29.2.1.zip 25354353 BLAKE2B d0423c386d94095c82cdd0be22f2a0cbf41f38af033b3cb6d057d41e49cf40b7d2a2284dd9d7b28d04c7098f2d3c464d626c17cc53144d80217cabc90d9da34b SHA512 420c9abd8dee0781e65cfbc8a25d30af8c345b53c4bf38ca581f19f6a39d4f7565d2a02a3a43d4dcb45c77cfd8229a364b171bf27125dbe319f445576333db17
 DIST SuperTTC-IosevkaSS11-30.1.2.zip 25967120 BLAKE2B 63a6bde4b23b3ea199feacec3a82007fd89c01797a7b347923cf93a27affb9b175ea8a8df0d9a728fa378017355605870d12afe05879b82abb1c1833752837f7 SHA512 3e3380bad13ed4c4085d09ca44d232d9303cbe713df8ad0a395edfba42c1e1146092091fdfaca534d151a43501bfbf828d90f1986d246bc097fd167c342ae0d5
+DIST SuperTTC-IosevkaSS11-31.3.0.zip 28995567 BLAKE2B 47f6df296d3720e345715651cef8e430f258c66ee3113a6d8c751e6e62e6b7269032d710e171c3b9b14b811cfef7ad9e132610ab65b225dc6c17c8aabca6b3ab SHA512 4d765c927aada7c54733bd78e5bdc6e120ec4538f03e78df7233181c6f39e10aae988826e795122c19613d6a32efc48db966cfe562629ef19f490173e4f83426
+DIST SuperTTC-IosevkaSS11-31.4.0.zip 29005412 BLAKE2B 255c40fe5a714ab38ab4227feaf1d517d39a8d57508e5a7482b2d3a43afa1f4f9105cacd611ce587896f43751855a8c24c4db48bf85119d2d707e3acd9841f79 SHA512 c36a684ad615e8080ca5eb851cf06edc8124b7002d37523883cae127b62d8e8182e7e2624aa446d1a802244477611f0f91e0e859696604aedb446d5362789684
+DIST SuperTTC-IosevkaSS11-31.5.0.zip 29081103 BLAKE2B 8c92b145e421dac33ad06ed2e96dc622ce72990e8170ab017b052849ec570989ddb0ee6d3bde1961eb1dbb2f072a3a7f384749b90a1054c2c4d492d0aa5bb571 SHA512 9a4f3515b1cbb1a1d808d9e6878ac79c15ed187dc1c94727607aed2817e4d904cd94fd9032df4715dfed41fdd6a5054998831e741eef0eafc379bebfdd20bf80
 DIST SuperTTC-IosevkaSS12-29.2.1.zip 24871618 BLAKE2B 1ad10cb389b887d9b07816fbaec53d28aea886e2b60483d86c205b562d7dc756e5ba4e5d2867c0e1d9deff92c8ede018cb3a50518695a183da1f483e805efc36 SHA512 02f97736d1760622346efd7332a1d6240fea48fcbf810a18588b77edad5c2313c9c5cd10e65a730ae70f666102e7bceea2c7be020a47af782afd0a607664fc02
 DIST SuperTTC-IosevkaSS12-30.1.2.zip 25403395 BLAKE2B 796fafb18bbedb859498d7c03942c614229b6b7e23dae114cba9a1e45b5fdc23d91a5ff0e2c1f1220c291a4685aaba96faa82f865f3dbc458d69642f720bfd39 SHA512 db51eaef6a208c8e3e86581e9dfd772157abbc4872614849caa9ec3a376141110ac1254a2b2e9d5ca3f2315b5e4b847e3203fab31d918a9209f2167dd140c2cb
+DIST SuperTTC-IosevkaSS12-31.3.0.zip 28404325 BLAKE2B 1761e9dd198150004e2c72394da968d6cd6b2bd77d56aac433cc2267bdbd11f33672f0a60d7e8acd3e5cc678a4f3e9dfdad907aa52834c8ece74560aa30590f1 SHA512 d04b3d2f15a2cdc9b4c9263f5a986262db64f3ea928119b091d2683a05ce41426c65fe96da4f2c3bbd6d332d37797d3fb258f4930218858240eea6ee78bb4793
+DIST SuperTTC-IosevkaSS12-31.4.0.zip 28431186 BLAKE2B f90197d5c0456e47daf0b6dfe402cf5f1c0d0150026aec7936b40476d9cee755aaebaa00d62c01fab799c720177a61c50deb98fc8846d102afe8e9ed79d3eb2b SHA512 1ecfb10be17a339e827fb8e931765cecb897315937ba6279ab220fef92ec2accf9c7acf25b64e498f85bc30eba61179651c3a0d845f7793959ba8e00f10aa889
+DIST SuperTTC-IosevkaSS12-31.5.0.zip 28495957 BLAKE2B df76c55f602c8777b18087810e4f7a5d1ec943ac81b0be9c9f543db934eef526f751735d58c13eb41087a3d5a91109a55b624b6a74441522019610430b9aa755 SHA512 28a40c949619220d7e8f505b6c560477423631c74de3ab6339dce92d733a6b11442b89b892a5a265fc73d96063bfef1bc7bc6fafa4d9e8be528b0999dba7342e
 DIST SuperTTC-IosevkaSS13-29.2.1.zip 23893362 BLAKE2B 86312d175ded75837142f99b8ad5a46cc03b218f6c7110f531dda35a42cde7f9e1b3fb04f2495bc071c2fd16b86ceb26f7f3fa25e1bc7cdaf5311d439eaedfc7 SHA512 4b67d75f45c03d57c9bae2bd35ce90ccdb78885af59a8e7000e65a5ccb22d17c85c092f427ac5c9e900e6e3d9f37707b0d9db9242c477ced06e96514cfee1ddf
 DIST SuperTTC-IosevkaSS13-30.1.2.zip 24393882 BLAKE2B d9582728327183ef8cff0077eb1050c21a849c2d5fd62841de0ab0d516a25ac87cdee5b57b7caa768278f42ec76dc7a62b7df4937c0718d2543401a5bddbdd58 SHA512 a9765b75f9e509d45d08406fe196dda9a047bb672f9a72b9055d332550cc39b90d919fc84f25280fda8d3d4aee24a69236d2e800944b7de9578990d471705833
+DIST SuperTTC-IosevkaSS13-31.3.0.zip 27308539 BLAKE2B 187e7f0a0b08be74135e0642f7cbf8ae7d07e407b2b24f1d30f55bdbace8857f81972b6e9ae10de16716e3caeca9e15c1fb1880a0f62ef870804a1a266c02b43 SHA512 083ed9256c8d51531dcd11d44761d04da169a9bf423fecc7cf8ccab01440ef1fac4248439db447ac2387e127ea98e84665e80d82bcd1ed38176ab66d596c6d70
+DIST SuperTTC-IosevkaSS13-31.4.0.zip 27328373 BLAKE2B 63270eb70732e5e3c068c945fafac9e857dd6fd9c69384cbe5dc3ec2090fc3500debb047631d5135d47f67477043c23ff85b29b33a190b243a9cf53c32327524 SHA512 cc6bd19b7e9b4e94ab7e0aa3f5072360ef449165cc42a8e689471e12b4d2639033a8b51783aadd88cf5ee4855a975c7ab1822e8bd41e843d4dadcf64d0c19754
+DIST SuperTTC-IosevkaSS13-31.5.0.zip 27387913 BLAKE2B e77ec164ac614bcdc371c83ca659d1061fb496bba457c990efa99c6d063670e6d3308afde9cafd6756fee6ec4ee08cbef64a28b51e970fb27c168ca3f9347965 SHA512 41c7f9a91c1a5648469535448b95bf3b208165f8346a47437d2c05152ad19aaddb52223d24c7043035d82d1c9c74ed974c8e182547ac46bf1349a64b70cf09a6
 DIST SuperTTC-IosevkaSS14-29.2.1.zip 23910705 BLAKE2B 9f4c0b711d153716e4dd528ba6e4e7120480d851444cf1019457722674e46bd2c2f11aec89ae2110bc9f824fab52316aa3170a7b510374fb8210d587dc6fd1d1 SHA512 3f2f4f5b3063460732c69dde39540b72d4c391b5a55bfd5e63a26fc81f915a42997528d59b3b9d93a5c0da8385b39664d1660e129fcf29912c259b70d2a9438b
 DIST SuperTTC-IosevkaSS14-30.1.2.zip 24403959 BLAKE2B af9d6189c71a38b82f77e394950816b8dff8453b5ab7b8c302ebc81879b9313e18ef40ce6d7c3f851913629ca602b5642d364869fb765c863d0918d8cfc11250 SHA512 2b9dc5b26c79fa2672a8c938db1ff469b4f333d2f64e3b2fcac760c63ad977ea8a2a4a53a21193b3cf11942b6fa027a8d5138dea01903bcca5f7e20d93ed1dd0
+DIST SuperTTC-IosevkaSS14-31.3.0.zip 27344943 BLAKE2B a01276123abcb53f70ebdadf181de043700a1fd897d247c7553406c8baec80d61d20009f9e502033dbb6d9e34eeb160a196ec3c2caed12c293f643e95c64f6a4 SHA512 14577708c7f474492c509f29f0b05fcbdd1c8050b25e42b31c61644aa4e03527cce5cbb59f98fa885892a05237d0cd14a1942bdfb26bb9107e75153feb8997e2
+DIST SuperTTC-IosevkaSS14-31.4.0.zip 27370200 BLAKE2B c08007138124ff472091a70ea931a44e480f9f8f4eb165aabfc51ef81625f53b02df8718addad1b2f21fb93b208ac6fa7f997ddff434988a760a3f17115f2cd4 SHA512 88bd0ced8a4a2fe2f552a8a74643ae7f6273d5a2d8758e8b7da0284197a2a7ae7d9f70817f70bfa0d31d3adbb2db3857cd6dae6fc545200a16eba38207ff925f
+DIST SuperTTC-IosevkaSS14-31.5.0.zip 27431270 BLAKE2B f9642f669d95c6489c1f88a92102c8985eb27019fc8e4b59a052287c305a44a825f707bb15f62f5b48cb2b20b0712a46327cf9556af59c0ee7859d6aaff349c4 SHA512 406697601be3ebb14ef892a7912374d7694b0647bb9f170d55a32854024767d5c90a7d2a600e4779be65c7b8c1771560f706f64252f076f7212af8920af1ba13
 DIST SuperTTC-IosevkaSS15-29.2.1.zip 28379302 BLAKE2B fcf742d56f5965d8a211f285d99b8bb6d07141ddf4efd79eba8bdb6679816601cafbfd2162b2ce57cc7e7e44184bae4b81ce25ef31d14c13a49a428caca17bb1 SHA512 2a62a6d27c86607e0b023bd30c2cee1e0470be88f52c3b3096f79d128d7537ab0fda6d5fc101c509e0f22587c2ff1eb6d6b36d2fac0787a3ff2d5ab588391353
 DIST SuperTTC-IosevkaSS15-30.1.2.zip 28926353 BLAKE2B fc43cbdb035f7e60904709e75a97baf3a02bcade0de7cba3222465579be3f239c0f4ca65bd7e29fe761d4270046ad13f62799d8bd491c5d89b1816e9b6e3b8a4 SHA512 e2c4db2ff27b8b447e2531b9ed67fa4521a7d9baa640cd14581a3d158f6bab7ef9809df3bb024a7eee6a5e6e7e5c21df4dfc45696ba53134d7075b97402b3711
+DIST SuperTTC-IosevkaSS15-31.3.0.zip 32171720 BLAKE2B dac3f1cff0463f92f06fc72fdf61c22931c9021c03a4862ee1601e0ca63af57e2f3518362c7e12e9c21c0b718b99d96a876ddc852d958316b78f28f0090804db SHA512 714fe23364fbc34868f11624c58e62c5769f7fcbfef0f5dcd0478992abbe353c317a87ae5d41e4b8ab63963b82bd59011a8cc7c99efe6017f4971f81cff6c014
+DIST SuperTTC-IosevkaSS15-31.4.0.zip 32196964 BLAKE2B f9f45c734e6165c3d0937894ad9aca0d5bac40eca2f573841befdc917621406f57e6c383a7ae1e4918b363c75089e13933efac0eca17a04e097a316458a41d99 SHA512 8fbd98fd0ef21016982a02b95698ab075f7af270bd665e30c08b1d2a18ddb32c0f28d959e75389f8d55f2a5e3cbd7b4293ad0c18fee8042b71b3533bcc9db0f0
+DIST SuperTTC-IosevkaSS15-31.5.0.zip 32265653 BLAKE2B 875441f6493f209d92c9621f4879d98ae2f5378e9c86960b8a02679b16ed350177c67bb8b599514d7f5aed52bf515130a2a613610186e8a26472632ea47045a6 SHA512 81cc6e9ce09582c7ba4bd05a11c898921167652db444c4dda63de54bec904dc7ba9afb68e60b7958422da6ee5d473a6d741616d709b1da513665fe5129bb3066
 DIST SuperTTC-IosevkaSS16-29.2.1.zip 24056235 BLAKE2B 50818ec66c8e92c29a69b32c57695db83ff15f6b928411ed698d2e783f77e50407d718a74c15eec2eeef442d71ba5d113107f1b656f7443cacf77bb50cd2c450 SHA512 31240b6450b4b17b7bd92dfad6dca7f7326abf64506517599e758b00006db3ad025490fd53da48a1c999cc02d8b8fd4e6a926c3d9aa2d5004a39b7d5b8d5a1dd
 DIST SuperTTC-IosevkaSS16-30.1.2.zip 24572782 BLAKE2B 4de91ef21060350ddff7b86b11aced6dd4c155e1aa47d7ca21d527764fcc44bc9c3265732060dfc55c7e3111482b07b9fe1bd96e73fef0f1417ba6d37244dae3 SHA512 53daaf0eaaeb38b996e204852195b1988900d70c72c27a693b47191f50f4ffd1c2dd76026eb4e508dd0456956443b3adc7312360447dff31fb73286ed1ede954
+DIST SuperTTC-IosevkaSS16-31.3.0.zip 27597951 BLAKE2B 113dbe608861cf321f907315643c37115e6301994293a66c3b06bac8b4ba7d031b5cf841663044f419ee1209864e3bd562041304e77326e8296aeac49990babd SHA512 bdb02332047a1a92aa916af4f9e84fd35acde170385c7537cda721598e35c1e6806c66f55f08b14ae20ed9fd0ff06c574cb2f096f2e9e455e49428f07b11eca8
+DIST SuperTTC-IosevkaSS16-31.4.0.zip 27609164 BLAKE2B 8380b66cc3904c16ff6a40317ecaa33cd9be87fba527eba1499313b3d661d61485a45d802c552ed506709373e424b8c07175829eb1e1ed78c0e3346852e8f78b SHA512 b4f14895c01687cfe237f6c7d90aa547290f40ee4365d9bbaf35a843a50e0f9ea35772fed97a5d9f8ed99d57b908fba5c507b5d14a6e72f12a935c1ccbff72de
+DIST SuperTTC-IosevkaSS16-31.5.0.zip 27672328 BLAKE2B 4d0e18d0ec1ab33d86e0c8b74df726b4c96ee491e3381d613620a8535964f12cb4e4048448f9b82be6415c36b7d07c0ae06c1cf238ed024a5df3212e356af495 SHA512 14360b0ad9db16f6ca3f6293c3d837c94f1781f9c7d868974aa30fb5cd23e3073037cbb73b637bb537ae2d131269109425716b4cfc887d5bae1413864d20cb12
 DIST SuperTTC-IosevkaSS17-29.2.1.zip 28215486 BLAKE2B 09f52c56b76b006ead76e03d72e45d31ce510929355f23b77a3285d972abc35357438ab92e47120d241327a4c209a0aeb605744c502c52f154032f1e5a7dd74e SHA512 f131ee89b99c43ac0bf64b4476e0d057dbaa8d5a3457bd92e06d78054e83cbf1559a963483b23df45b9253eec947fb70a8c741a8b6456e08540062b674ff69cf
 DIST SuperTTC-IosevkaSS17-30.1.2.zip 28810734 BLAKE2B aa0a7379c23b59ae95638268d009bbf665b5f60bbe0a701c04899be9841c118401d9c065d955a2ef71a58454c29fc0ecf56821baeaf081e0d4aeb33f76b0366d SHA512 01dcc80aa924a042b5b1c2931bd4965594572bef84887ba7b9728d5d7db38fc7e2e5b9fe6bd80c940481d63bc7076da2f9bd85b671cb9228fc317fa5c19a5bf7
+DIST SuperTTC-IosevkaSS17-31.3.0.zip 32002316 BLAKE2B 017d698899c8c5e80aebe0882948cc8b8b56879945afa74a82927314213cbe8ade805b6a4a821e98fbfff7e6429f0bb42f23d5bc38d2d23d28dbceb9fa2fb213 SHA512 25a08b5920bfbfccbfb2f1a82868a2b487449a6a51e3debdf5de3b592cb5849ac75ceefe487ceece2c4934f5f0dd71cb68636671a4a9307861d8b4d44e8846a5
+DIST SuperTTC-IosevkaSS17-31.4.0.zip 32022787 BLAKE2B ee1740fd8af8b40453f2155f9b27cc38ad2c6e504f790e84416e3569cd75e755fd24e85650c6a756678d93c24badb452f8d2852c8f2d17867302d436d938464d SHA512 b6f1cbb8809d736be1b49e1e645b2f97f2b3925ab90a697990de6a354e0e14c92e83a73c2d285b1a5a6246cc68d7d088553bd778a187895387f79e571d61896d
+DIST SuperTTC-IosevkaSS17-31.5.0.zip 32099992 BLAKE2B 090e95031d893ca41be7f1407eac59e73d498023939d4b6bccd05ce3f786e963d3ecac73853f4c0276fd4711bb2c5101121c85b529b2019f39865402ce66f4f9 SHA512 5211eee2ca0f51f2cdd215724b7536d16bd424be2d578affafd5a90389490cda0b492156bb05e71d7c4b8036c95218ee2e3ec7dee43397b3b5db9f35325c2d07
 DIST SuperTTC-IosevkaSS18-29.2.1.zip 24309546 BLAKE2B 8c270162e8cb354bebd5ce257f0be5b53632939fdde6b17855fa187a0786812bee9bd752478261e139480965917ba04c34a6ea819122766ccd8b2250148a7a6e SHA512 c2f7284deae447ec66fb936077ee2f3b81a3079f0b626663fc419fb7686112fff7db501a9f001381a68c034fef3b15b84fbebe22618047d787aeffd839af6e2c
 DIST SuperTTC-IosevkaSS18-30.1.2.zip 24807197 BLAKE2B 34ff18d6a8b79f1459db7732ae9659fd53ed9dbf1d5b3279c3822735c7128e84daee9eff660aed7bef08a2e947a35ba5de6e395d95b5c3f326d05f74a75e22d7 SHA512 090be2fd058275e49f73845d7f0a545479abe8525e619097a9f98cbcf00c091ebdf2afffbab2d809c1a4ce5eebc0e6bb8c09237e51a0c0e6a4881c3f249c61a4
+DIST SuperTTC-IosevkaSS18-31.3.0.zip 27768039 BLAKE2B cf34c59b8372b607528960f998b9d1afb324269356aa3f23b12f46118bae2a1c31d673f3170849580351a3d235797c5d115d9556db7f1c8edd402abc0433a6fb SHA512 c4d2837d80c5ba2a7a623b5fb6c38ac191bb02369515507366c145f4d0815bcddd78f935392372cc820e05aa8b897bfd9c658f86f494d3a446d1cd53449bc659
+DIST SuperTTC-IosevkaSS18-31.4.0.zip 27783588 BLAKE2B b1f1c9c7e6b49854561288a119056779dfb99e51c8e1f16792d59d6b2649433097559d95429d9efc50f9efcf312a87c9d83782883eb458788ab4d462ae5857d4 SHA512 7129c7114f83c9ddbe0a5e9f4e150978db9b137ebb6de47c3f459f67d3874a32c5aa5923df43adcbd98bef5504cc3b551c5bb989cb7557e30206ff3ae7ee1b8e
+DIST SuperTTC-IosevkaSS18-31.5.0.zip 27843221 BLAKE2B 27c8194f5e71434230c04000b9abf683b9e85debca43133b3da6ed2a3e64ccfd337a602898c905bbadf58a8ee544273c8796a5cfad6513c3a38ceb008a11197c SHA512 43046438f9abf3dddf0d19148ec2fe9baf3182adba382ed2f523729646cc7b816e4517fc70f639c07974eeea103b4086a83afeda661f0366c588ce2b5371372e
 DIST SuperTTC-IosevkaSlab-29.2.1.zip 110417352 BLAKE2B acb5f62e3382e0eddf3839766dac3c8191710f78b28310bf6ffaa1d22529ef8c230a1405f7ff7ea7f58164907ce672dd297f3789f34a54be9d0c8edb8478b200 SHA512 e7d0e22af0d008defefffb9090d212c85501bc7c412cf3652d42a5432611afd64f96b65806846655cf53b5fef485098595cf4bbeb7d48b09c675bbd5da3de9e9
 DIST SuperTTC-IosevkaSlab-30.1.2.zip 100983379 BLAKE2B 9fe54aeb326bfffc6939405aa7c127dd3db7b08ebe10d3771f21a75bf16f201ec1c4a4c31b4334e1319c710f95f4398b641da89fdebd029ae5379084b0c78ea7 SHA512 77ad777a8c992a0c07c4d4a9ffe0ad74527ba6373a10f20b2b5d142c302783d2be6e1e745df36ab32bdab27842ba6e2d5de5928fa23a2a23a55ce49c2d2fce57
+DIST SuperTTC-IosevkaSlab-31.3.0.zip 111588197 BLAKE2B 8585af0981ce07d2a91554ceedde8f9fd7a8c18408bfc58c90fc6a9fade84c90033ceb6289cb6af7ceee721467bf26e8f13f7fb6ac7ad8e055546ad389caeb43 SHA512 d3c01e19457e3c45444a0181a314cd717104afbbe0019e8e78ddd950956bc0cdb6fb5256a81cc5505fec7797a5547a5efb6dab7bd84eff7b1d253af84b16c07e
+DIST SuperTTC-IosevkaSlab-31.4.0.zip 112601877 BLAKE2B bd4373af0e73fe3a998b6c92851055f0c916661ac13af79904ac7119ebc0db653c52c9814a8f8a3c0d38f031e403d8f1f35d06e0f1d30993828d989fd7449c95 SHA512 dd2094fa36aa4be241e1fd83898b3617a436664ce64b1f92f154b5be64f7a897790fa4b794c012235cda40ba126382f53004ede89e47e5577a4466f92939c110
+DIST SuperTTC-IosevkaSlab-31.5.0.zip 112969174 BLAKE2B 71a66dfc0505fc5a26df61e7db322f89f9912b1886f78bd5c75549575cce596ced30b9fe214caa5684511fbb7d4b843daf03df4db0776178fdd2d1d6ad99e078 SHA512 5bdda45b010b445cc8093684fce54b058b6c059bbfc4ca24164e94e4e47689c3983d958b0baa1f2db6736dcdb595bf1a7aaf68639db1a12eb4e919eaf7b4a399
diff --git a/media-fonts/iosevka/iosevka-30.1.2.ebuild b/media-fonts/iosevka/iosevka-30.1.2.ebuild
index f1efa3721bec..66423bc35441 100644
--- a/media-fonts/iosevka/iosevka-30.1.2.ebuild
+++ b/media-fonts/iosevka/iosevka-30.1.2.ebuild
@@ -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-31.3.0.ebuild b/media-fonts/iosevka/iosevka-31.3.0.ebuild
new file mode 100644
index 000000000000..f1efa3721bec
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-31.3.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 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-31.4.0.ebuild b/media-fonts/iosevka/iosevka-31.4.0.ebuild
new file mode 100644
index 000000000000..f1efa3721bec
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-31.4.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 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-31.5.0.ebuild b/media-fonts/iosevka/iosevka-31.5.0.ebuild
new file mode 100644
index 000000000000..f1efa3721bec
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-31.5.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 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/ipaex/ipaex-004.01.ebuild b/media-fonts/ipaex/ipaex-004.01.ebuild
index a0b8dd6bd04a..d39213d98349 100644
--- a/media-fonts/ipaex/ipaex-004.01.ebuild
+++ b/media-fonts/ipaex/ipaex-004.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://moji.or.jp/wp-content/ipafont/IPAexfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/khmer/khmer-5.0-r1.ebuild b/media-fonts/khmer/khmer-5.0-r1.ebuild
index f7e6dbeee0a2..f74c814ffc53 100644
--- a/media-fonts/khmer/khmer-5.0-r1.ebuild
+++ b/media-fonts/khmer/khmer-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/khmer/All_KhmerOS_${PV}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
index 5275b43e583a..e6c9dcc2f8eb 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/mikachan/5513/${MY_PN}-${PV}.tar.bz2
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index 06d38487b6dd..f4d4462f57ae 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="truetype"
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/montecarlo/montecarlo-0-r1.ebuild b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
index 85be927d481e..1cb78e7c452f 100644
--- a/media-fonts/montecarlo/montecarlo-0-r1.ebuild
+++ b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 IUSE="bdf"
 
 src_install() {
diff --git a/media-fonts/nanum/nanum-3.0.ebuild b/media-fonts/nanum/nanum-3.0.ebuild
index f1ebce6ef511..fb57d9fd1480 100644
--- a/media-fonts/nanum/nanum-3.0.ebuild
+++ b/media-fonts/nanum/nanum-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 4906b0e698af..386a7d949914 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,4 +1,3 @@
-DIST noto-20240430.tar.gz 1067709428 BLAKE2B 068b49614efaf6136fb166d21cd01ed381a52b4677260b5382c8af6ccb45341518d1f135b1a27df4977580bac03119d85a54623ad25aeff2f13d72a9d06b479e SHA512 244dae7ff95be13e86932f59f5516174bd1d9c5bd7e27b97aa62e8321f61fbf95d66890663651dd7d5bb961c4335fec44ab536785b3c9ddcde971f4b955e3858
-DIST noto-20240531.tar.gz 1067977032 BLAKE2B 769468b6232eab061703df8d8dc026fa82d6005c0c53ff0a483557fd33e6c52ac3dc7e65f5444390d9130e0b0f04e5ecb71109462bc985e17cbd7d4112a9ab0d SHA512 2be323d3eaf5db9598950148d3d89824f97f2fef5aeea323862e3ef430de4ebf24b942d71319fbdee711778e78810b28cf76f3d6f815dd404db660d276f3f4eb
 DIST noto-20240630.tar.gz 1089432282 BLAKE2B 07984ab5deb385855122bd1688b237ef2c59956e7516db16f4ed2b683b1c04ae73c06bc4e5ba766077fb479e774a38a6ab97a318299b0581032dedb9ad7c3cc0 SHA512 eb0a0416c2a12b1a37f867d0f13a55d1d169466786fd367de246c67008c5def9c49eb942e81aaf9810f5c071cca076fa9019b92b11e169a48fe0b15dc7ce43aa
 DIST noto-20240731.tar.gz 1087189796 BLAKE2B 939cc60437521166c01c7255c23e33fa29d8eebd186191bde8bc79a3b9a27c25e9b393af92a55926b398f8540da2c676cda3720d844689d38b029397620e4c88 SHA512 0361b602f6e9545ffdcae85674f8d3bec1235cec506a271a5f857f80f339562972461dc70d89ebf0dce42bb13235e0b59c0b121292983843534cb489c69b4218
+DIST noto-20240830.tar.gz 1087158158 BLAKE2B e3b3410fa3c3fbd48e3224f7a22a46377ffa50d36df4027902bd86949579d33ebfb883939feba62ce8520a10d1c982c0c600e7363d5e3a752e76d75059eedf5b SHA512 cf3ac08d2c1fb134194ce6b1211d63ab5fc00adcfc92106afdd872ad9fb75cbf0437d88314a8cc3681fa93974f37c736685f529231ad5e8f8eca429876ee0032
diff --git a/media-fonts/noto/noto-20240430.ebuild b/media-fonts/noto/noto-20240430.ebuild
deleted file mode 100644
index 27a2170cac63..000000000000
--- a/media-fonts/noto/noto-20240430.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 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="1d9f081ebacd3382a050fdf8166eb491d716c462"
-SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://fonts.google.com/noto
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/notofonts.github.io-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	mkdir install-hinted || die
-	mv fonts/*/hinted/ttf/*.tt[fc] install-hinted/. || die
-
-	FONT_S="${S}/install-hinted/" font_src_install
-
-	# Allow to drop some fonts optionally for people that want to save
-	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.tt[f,c]
-}
diff --git a/media-fonts/noto/noto-20240531.ebuild b/media-fonts/noto/noto-20240531.ebuild
deleted file mode 100644
index 93cc4903b13c..000000000000
--- a/media-fonts/noto/noto-20240531.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 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="afdb0f94aa8ea1629948caab32845aade6dc97d2"
-SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-# Extra allows to optionally reduce disk usage even returning to tofu
-# issue as described in https://fonts.google.com/noto
-IUSE="cjk +extra"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/notofonts.github.io-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	mkdir install-hinted || die
-	mv fonts/*/hinted/ttf/*.tt[fc] install-hinted/. || die
-
-	FONT_S="${S}/install-hinted/" font_src_install
-
-	# Allow to drop some fonts optionally for people that want to save
-	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.tt[f,c]
-}
diff --git a/media-fonts/noto/noto-20240731.ebuild b/media-fonts/noto/noto-20240731.ebuild
index a318f147a1a6..0757b7c6cff9 100644
--- a/media-fonts/noto/noto-20240731.ebuild
+++ b/media-fonts/noto/noto-20240731.ebuild
@@ -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-20240830.ebuild b/media-fonts/noto/noto-20240830.ebuild
new file mode 100644
index 000000000000..73e020cb6c44
--- /dev/null
+++ b/media-fonts/noto/noto-20240830.ebuild
@@ -0,0 +1,42 @@
+# 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/nuosu-sil/Manifest b/media-fonts/nuosu-sil/Manifest
index 5d9fe3ca9baa..9a8cb802211f 100644
--- a/media-fonts/nuosu-sil/Manifest
+++ b/media-fonts/nuosu-sil/Manifest
@@ -1 +1,2 @@
 DIST NuosuSIL-2.200.zip 160601 BLAKE2B 61fcc33b91ee66f96ee1f7efe96c94970278645480fc6abccd6c95853e9e35af709a993af74a36d8d9a9f86bc2fd5b32a74031b9062e08b001a79d166c50fba8 SHA512 da5ba1dcbaa6cf18bb78b2720a53c453d94044d9de158fe394e26a6e6e18773c35b6073abb90b3b08e720b7105d06ca6388b7257cdd8b30d82b3b4013bd16513
+DIST NuosuSIL-2.300.zip 565288 BLAKE2B d412742d90dfb103cf7e6de63c477a47889f93c574f738ac55a24240bda6ddee2de7bdd92c6c09d1a2ae63d82ad7870da21a832e1d2c687d3598144495a4b348 SHA512 e68d9c36985a1afa1f3f86651690432615f9b0921aa80ab878b45add2841a9e3e1baaae6ef513a895a59b8cef1a7c56019e5d02b435e10a3893b9d0472c31fa2
diff --git a/media-fonts/nuosu-sil/nuosu-sil-2.300.ebuild b/media-fonts/nuosu-sil/nuosu-sil-2.300.ebuild
new file mode 100644
index 000000000000..3dc8b6cdfaa0
--- /dev/null
+++ b/media-fonts/nuosu-sil/nuosu-sil-2.300.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Unicode font for the standardized Yi script"
+HOMEPAGE="https://software.sil.org/nuosu/"
+SRC_URI="https://software.sil.org/downloads/r/nuosu/NuosuSIL-${PV}.zip"
+S="${WORKDIR}/NuosuSIL-${PV}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+BDEPEND="app-arch/unzip"
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/oldstandard/oldstandard-2.2-r1.ebuild b/media-fonts/oldstandard/oldstandard-2.2-r1.ebuild
index f1133d277963..e67d21197538 100644
--- a/media-fonts/oldstandard/oldstandard-2.2-r1.ebuild
+++ b/media-fonts/oldstandard/oldstandard-2.2-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index 90795150bd47..02a9f19300fe 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ~riscv ~s390 sparc x86"
 IUSE=""
 
 FONT_CONF=(
diff --git a/media-fonts/paratype-astra/paratype-astra-1001.ebuild b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
index 12d0d5b1825c..eda739ccee8a 100644
--- a/media-fonts/paratype-astra/paratype-astra-1001.ebuild
+++ b/media-fonts/paratype-astra/paratype-astra-1001.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="X"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/paratype/paratype-2.5.ebuild b/media-fonts/paratype/paratype-2.5.ebuild
index e83ba891d3ee..3849e212269b 100644
--- a/media-fonts/paratype/paratype-2.5.ebuild
+++ b/media-fonts/paratype/paratype-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="X"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
index db05d13a52cc..e3601892b8ec 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 IUSE=""
 
 FONT_CONF=( 10-powerline-symbols.conf )
diff --git a/media-fonts/quivira/quivira-4.1.ebuild b/media-fonts/quivira/quivira-4.1.ebuild
index 6cdf0abbf5ef..b5bcb9f3d7ef 100644
--- a/media-fonts/quivira/quivira-4.1.ebuild
+++ b/media-fonts/quivira/quivira-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~loong ppc ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ~riscv x86"
 IUSE="doc"
 
 S="${WORKDIR}"
diff --git a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
index d260354312ce..94880f804921 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.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
 
 inherit rpm font
 
@@ -10,12 +10,11 @@ RPM_P="${P}-705.noarch"
 DESCRIPTION="SGI fonts collection"
 HOMEPAGE="http://oss.sgi.com/projects/sgi_propack"
 SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/${RPM_P}.rpm"
+S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~loong ~ppc ppc64 ~s390 sparc x86"
 
-S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
-
 FONT_S="${S}"
 FONT_SUFFIX="pcf.gz"
diff --git a/media-fonts/shinonome/shinonome-0.9.11.ebuild b/media-fonts/shinonome/shinonome-0.9.11.ebuild
index d5dc97246d25..12a1bb7795bd 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://openlab.jp/efont/dist/shinonome/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 # Only installs fonts
 RESTRICT="strip binchecks"
 
diff --git a/media-fonts/signika/signika-1.001.ebuild b/media-fonts/signika/signika-1.001.ebuild
index 9f6cb2ab629f..53dd7faa42a0 100644
--- a/media-fonts/signika/signika-1.001.ebuild
+++ b/media-fonts/signika/signika-1.001.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index 369495f5cab3..f1c9a93fb4d3 100644
--- a/media-fonts/sil-abyssinica/Manifest
+++ b/media-fonts/sil-abyssinica/Manifest
@@ -1 +1,2 @@
 DIST AbyssinicaSIL-2.200.zip 1288734 BLAKE2B a6a19752a2c0fd0206705a325c9ab7fae0a803e97580066526a6d374c45698d82035df7b8e6dca038cb6ac01a17148247018dec0fe2dc6506ba7def5aa657fc9 SHA512 2f9092c4f06c2e26e03b8a4d0b31d18f6d7cfac9f0f89d8a05fe4de6a6caea4684cf63df83dc24c26db0ceb02602d3d2277143020c40b6170dd9f82bf0373d45
+DIST AbyssinicaSIL-2.201.zip 1283847 BLAKE2B 3a0f45c0fe4b050a484c58d847674d38ec3be538f8e4e676e172acfd27e03f6d5a39214eaba5f119cd6e696710ab584f7a65694fddfe4ed072d15656ad27c225 SHA512 f1bd5fb598980fab52aef79a9055116c43ed23a96180c34f79d6e9664904c894a7cff7e5aac0412eb4e59192049e9c3199678b6809e57fe03a7a6cba6f3a48c3
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-2.201.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-2.201.ebuild
new file mode 100644
index 000000000000..2bd4bbb5664a
--- /dev/null
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-2.201.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="AbyssinicaSIL-${PV}"
+inherit font
+
+DESCRIPTION="SIL Opentype Unicode fonts for Ethiopic languages"
+HOMEPAGE="https://software.sil.org/abyssinica/"
+SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="doc"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( FONTLOG.txt OFL-FAQ.txt README.txt )
+
+FONT_SUFFIX="ttf"
+
+src_install() {
+	font_src_install
+	use doc && dodoc -r "${S}"/documentation
+}
diff --git a/media-fonts/source-code-pro/Manifest b/media-fonts/source-code-pro/Manifest
index f0c144e08fd9..c585dfb89c1d 100644
--- a/media-fonts/source-code-pro/Manifest
+++ b/media-fonts/source-code-pro/Manifest
@@ -1 +1,2 @@
 DIST source-code-pro-2.038.tar.gz 6818951 BLAKE2B b133aa317bf5057e8b346d81491bf08c0c257066ed05b2001a9e327308a63a3ef943da3b12b5933c217c31839750fbb3947b4f566f48aac6e88c7096cbbf82cd SHA512 96981af2a470027a372ab8a02265d34a6b2a810c4cca0b498b01e613019a04c9760d95e21fb740af2c7fff076098bb36f5c282bf9b8f1875eed72ed70e4b3ac9
+DIST source-code-pro-2.042.tar.gz 8148876 BLAKE2B 16d5097bb8adbdbf0c0c61f708ea460e7608ebde7921fed464a2b71ed159416d9920bcbd72ad63d47a89460426a5c5af0c5a19ebac00ee7a1db0d61ae77a9823 SHA512 2cc2373c8f5ec817ee44e2c754735a4d21d989fd581bf1cdb764ba98a26b186574d7f583ebe0da905c4db029d12fd4df54ace43a191e274f76995940a618a91c
diff --git a/media-fonts/source-code-pro/source-code-pro-2.042.ebuild b/media-fonts/source-code-pro/source-code-pro-2.042.ebuild
new file mode 100644
index 000000000000..aa6e0b741041
--- /dev/null
+++ b/media-fonts/source-code-pro/source-code-pro-2.042.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font optfeature
+
+REALV="2.042R-u/1.062R-i/1.026R-vf"
+
+DESCRIPTION="Monospaced font family for user interface and coding environments"
+HOMEPAGE="https://adobe-fonts.github.io/source-code-pro/"
+SRC_URI="https://github.com/adobe-fonts/source-code-pro/archive/${REALV}.tar.gz -> source-code-pro-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${REALV//\//-}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RESTRICT="binchecks strip"
+
+RDEPEND="
+	media-libs/fontconfig
+"
+
+FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
+FONT_SUFFIX="otf"
+
+src_prepare() {
+	default
+	mv OTF/*.otf . || die
+}
+
+pkg_postinst() {
+	optfeature_header "Other variants of this font are:"
+	optfeature "Chinese, Japanese and Korean support" media-fonts/source-han-sans
+	optfeature "the sans-serif variant" media-fonts/source-sans
+	optfeature "the serif variant" media-fonts/source-serif
+}
diff --git a/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild b/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
index e313f90f0be6..10550f9e526f 100644
--- a/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
+++ b/media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/TibetanMachineUnicodeFont-${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
index de96d6e6ed69..24d7815616b2 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-core-${MY_PV}-r1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index d1ef07dd9e00..2f2cbeb995bb 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,8 @@
 DIST blender-3.3.15.tar.xz 41928632 BLAKE2B d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e SHA512 d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff
+DIST blender-3.3.21.tar.xz 41940868 BLAKE2B 74874226a0f690d2b81c0f96c441f519bd37ff0fec5c2dcae0f4f673d55863e2b2edbd60d2ed05890c440c5287e4cab943646cf4029d7c8287a636ac405e9bce SHA512 715a9808b25fe4c90ee3097edf21bdb3facfec51df0f6b6c6404a95bafe417d1e4998994f532ae9bac1e95de84cc8fd8fce8f8e672f9117646ad840074344d0e
 DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
+DIST blender-3.6.15.tar.xz 67906200 BLAKE2B 8709b20347e78f3f71d22fee9799b1c0e20a39521b35cff83d6cd3462d4b172e31c1656812d7ce51eef25341a0cff2e9efdcdab0bc9a361ec843a666fc8c3185 SHA512 dfd1d80850fe6ab0616fd99ab039345da621418890b1a006e5320a4b739d1cf6f4ca313e8f8aed6e27c976400c75e8d6085847623d933de71932aefe82f3fd32
 DIST blender-3.6.8.tar.xz 70453744 BLAKE2B 5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7 SHA512 a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
 DIST blender-4.0.2.tar.xz 73281252 BLAKE2B 6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983 SHA512 c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
 DIST blender-4.1.1.tar.xz 82146268 BLAKE2B 1ab4a6c1046851ef619394c62fc73794430dc091e2cab26d3d1d542e9d4519889e9b9731606385e9dc8657448ca3827875526f4a57dd1b5c326a73d8a6f9be8d SHA512 13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e
+DIST blender-4.2.1.tar.xz 72789532 BLAKE2B 74494e851e9e2e9fdcf4a77fa4e1c177d6b9f01ab1cde9daec40468e5399d84b04225ff3a6919191e685624e9094ea4cb2257a62344d3b0e87072f339253aa82 SHA512 20162bd1185e34c481a0520f4999f8c76018471b485fa72afa446f590638c564a370d036cc4a941bf204fce821d8305d4244b3ba9ec7f09f1839b8a276dfde39
diff --git a/media-gfx/blender/blender-3.3.21.ebuild b/media-gfx/blender/blender-3.3.21.ebuild
new file mode 100644
index 000000000000..66c872c02cea
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.21.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# 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"
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+	test +tiff valgrind"
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	optix? ( cuda )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+#
+# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917.
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/glew:*
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( <media-libs/opencolorio-2.3.0:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( <media-libs/embree-4.0.0:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+	openvdb? (
+		<media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( <dev-libs/optix-7.5.0 )
+	osl? ( <media-libs/osl-1.13:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+	"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+	"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+	"${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+	"${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	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
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}"/usr || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-3.6.15.ebuild b/media-gfx/blender/blender-3.6.15.ebuild
new file mode 100644
index 000000000000..698ccf250f72
--- /dev/null
+++ b/media-gfx/blender/blender-3.6.15.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
+	ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# 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"
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="+bullet +dds +fluid +openexr +tbb
+	alembic collada +color-management cuda +cycles cycles-bin-kernels
+	debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k
+	man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv
+	+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl
+	+sndfile test +tiff valgrind wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	optix? ( cuda )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/libepoxy:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/openimageio-2.4.6.0:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	openpgl? ( media-libs/openpgl:0/0.5 )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+	openvdb? (
+		<media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( <dev-libs/optix-7.5.0 )
+	osl? ( <media-libs/osl-1.13:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.12
+		>=dev-libs/wayland-protocols-1.15
+		>=x11-libs/libxkbcommon-0.2.0
+		media-libs/mesa[wayland]
+		sys-apps/dbus
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+	wayland? (
+		dev-util/wayland-scanner
+	)
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+
+		git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
+		git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
+
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+		ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
+		subversion_fetch ${ASSETS_SVN_URL} ../lib/assets
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+	blender_get_version
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_WAYLAND=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+		-DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DYNLOAD=OFF
+		-DWITH_GHOST_WAYLAND_LIBDECOR=OFF
+		-DWITH_GHOST_X11=$(usex X)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	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
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}"/usr || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-4.0.2-r1.ebuild b/media-gfx/blender/blender-4.0.2-r1.ebuild
index 79149721f474..ae693845b6b7 100644
--- a/media-gfx/blender/blender-4.0.2-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.2-r1.ebuild
@@ -83,7 +83,7 @@ RDEPEND="${PYTHON_DEPS}
 	embree? ( media-libs/embree:=[raymask] )
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
-	gmp? ( dev-libs/gmp )
+	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )
 	hip? ( >=dev-util/hip-5.7:= )
 	jack? ( virtual/jack )
diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild b/media-gfx/blender/blender-4.1.1-r2.ebuild
index 3de02e47f35d..b39222330cbf 100644
--- a/media-gfx/blender/blender-4.1.1-r2.ebuild
+++ b/media-gfx/blender/blender-4.1.1-r2.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-# matches media-libs/osl
+# NOTE must match media-libs/osl
 LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 
 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -83,7 +84,7 @@ RDEPEND="${PYTHON_DEPS}
 	embree? ( media-libs/embree:=[raymask] )
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
-	gmp? ( dev-libs/gmp )
+	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )
 	hip? (
 		llvm_slot_17? (
@@ -102,7 +103,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-2.1.0 )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
 	oneapi? ( dev-libs/intel-compute-runtime[l0] )
 	openexr? (
 		>=dev-libs/imath-3.1.7:=
@@ -186,6 +187,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
 	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
 )
 
 blender_check_requirements() {
@@ -343,9 +346,7 @@ src_configure() {
 		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
 		-DWITH_FFTW3=$(usex fftw)
 		-DWITH_GHOST_WAYLAND=$(usex wayland)
-		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
 		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
-		-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
 		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
@@ -393,6 +394,13 @@ src_configure() {
 		-DWITH_XR_OPENXR=no
 	)
 
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
 	# requires dev-vcs/git
 	if [[ ${PV} = *9999* ]] ; then
 		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
@@ -420,6 +428,13 @@ src_configure() {
 		)
 	fi
 
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use arm64 && append-flags -flax-vector-conversions
 
diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1.ebuild
new file mode 100644
index 000000000000..88bb85849015
--- /dev/null
+++ b/media-gfx/blender/blender-4.2.1.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+# NOTE must match media-libs/osl
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+
+inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_LFS="yes"
+	inherit git-r3
+	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
+	EGIT_SUBMODULES=( '*' '-lib/*' )
+	RESTRICT="!test? ( test )"
+else
+	SRC_URI="
+		https://download.blender.org/source/${P}.tar.xz
+	"
+	# 	test? (
+	# 		https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz
+	# 	)
+	# "
+	KEYWORDS="~amd64 ~arm ~arm64"
+	RESTRICT="test" # the test archive returns LFS references.
+fi
+
+LICENSE="GPL-3+ cycles? ( Apache-2.0 )"
+SLOT="${PV%.*}"
+IUSE="
+	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
+	debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack
+	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl
+	+opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio
+	renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff tbb )
+	fluid? ( tbb )
+	gnome? ( wayland )
+	hip? ( cycles )
+	nanovdb? ( openvdb )
+	openvdb? ( tbb openexr )
+	optix? ( cuda )
+	osl? ( cycles pugixml )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/cmake/versions.cmake
+RDEPEND="${PYTHON_DEPS}
+	app-arch/zstd
+	dev-libs/boost:=[nls?]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=[brotli]
+	media-libs/libepoxy:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/openimageio-2.5.6.0:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( media-libs/embree:=[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp[cxx] )
+	gnome? ( gui-libs/libdecor )
+	hip? (
+		llvm_slot_17? (
+			dev-util/hip:0/5.7
+		)
+		llvm_slot_18? (
+			>=dev-util/hip-6.1:=[llvm_slot_18(-)]
+		)
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+	oneapi? ( dev-libs/intel-compute-runtime[l0] )
+	openexr? (
+		>=dev-libs/imath-3.1.7:=
+		>=media-libs/openexr-3.2.1:0=
+	)
+	openpgl? ( media-libs/openpgl:= )
+	opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
+	openvdb? (
+		>=media-gfx/openvdb-11.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	optix? ( dev-libs/optix )
+	osl? (
+		>=media-libs/osl-1.13:=[${LLVM_USEDEP}]
+		media-libs/mesa[${LLVM_USEDEP}]
+	)
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff:= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.12
+		>=dev-libs/wayland-protocols-1.15
+		>=x11-libs/libxkbcommon-0.2.0
+		dev-util/wayland-scanner
+		media-libs/mesa[wayland]
+		sys-apps/dbus
+	)
+	vulkan? (
+		media-libs/shaderc
+		dev-util/spirv-tools
+		dev-util/glslang
+		media-libs/vulkan-loader
+	)
+	otf? (
+		media-libs/harfbuzz
+	)
+	renderdoc? (
+		media-gfx/renderdoc
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+	vulkan? (
+		dev-util/spirv-headers
+		dev-util/vulkan-headers
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+	wayland? (
+		dev-util/wayland-scanner
+	)
+	X? (
+		x11-base/xorg-proto
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
+	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+
+	if use oneapi; then
+		einfo "The Intel oneAPI support is rudimentary."
+		einfo ""
+		einfo "Please report any bugs you find to https://bugs.gentoo.org/"
+	fi
+}
+
+pkg_setup() {
+	if use osl; then
+		llvm-r1_pkg_setup
+	fi
+
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		if ! use test; then
+			EGIT_SUBMODULES+=( '-tests/*' )
+		fi
+		git-r3_src_unpack
+	else
+		default
+
+		if use test; then
+			mkdir -p "${S}/tests/data/" || die
+			mv blender-test-data/* "${S}/tests/data/" || die
+		fi
+	fi
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed \
+		-e "s|blender.svg|blender-${BV}.svg|" \
+		-e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" \
+		-e "s|blender.desktop|blender-${BV}.desktop|" \
+		-e "s|org.blender.Blender.metainfo.xml|blender-${BV}.metainfo.xml|" \
+		-i source/creator/CMakeLists.txt || die
+
+	sed \
+		-e "s|Name=Blender|Name=Blender ${BV}|" \
+		-e "s|Exec=blender|Exec=blender-${BV}|" \
+		-e "s|Icon=blender|Icon=blender-${BV}|" \
+		-i release/freedesktop/blender.desktop || die
+
+	sed -e "s|\${CMAKE_INSTALL_PREFIX}/\${BLENDER_BIN}|${T}/usr/\${BLENDER_BIN}|g" -i source/creator/CMakeLists.txt || die
+
+	mv \
+		release/freedesktop/icons/scalable/apps/blender.svg \
+		"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+	mv \
+		release/freedesktop/icons/symbolic/apps/blender-symbolic.svg \
+		"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+	mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die
+	mv release/freedesktop/org.blender.Blender.metainfo.xml "release/freedesktop/blender-${BV}.metainfo.xml"
+	mv release/freedesktop/org.blender.Blender.appdata.xml "release/freedesktop/blender-${BV}.appdata.xml"
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/testing.cmake || die
+	fi
+
+	if use vulkan; then
+		sed -e "s/extern_vulkan_memory_allocator/extern_vulkan_memory_allocator\nSPIRV-Tools-opt\nSPIRV-Tools\nSPIRV-Tools-link\nglslang\nSPIRV\nSPVRemapper/" -i source/blender/gpu/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859607
+	# https://projects.blender.org/blender/blender/issues/120444
+	filter-lto
+
+	# Workaround for bug #922600
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	append-lfs-flags
+	blender_get_version
+
+	local mycmakeargs=(
+		-DWITH_LIBS_PRECOMPILED=no
+		-DBUILD_SHARED_LIBS=no
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_BOOST=yes
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CPU_CHECK=no
+
+		-DWITH_CYCLES=$(usex cycles)
+
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda)
+		-DWITH_CYCLES_CUDA_BINARIES="$(usex cuda $(usex cycles-bin-kernels))"
+		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
+
+		-DWITH_CYCLES_DEVICE_HIP="$(usex hip)"
+		-DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels))
+
+		-DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)"
+		-DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))"
+
+		-DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra
+		-DWITH_CYCLES_EMBREE="$(usex embree)"
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
+		-DWITH_CYCLES_STANDALONE=no
+		-DWITH_CYCLES_STANDALONE_GUI=no
+
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_DRACO="no" # TODO: Package Draco
+		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_WAYLAND=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
+		-DWITH_GHOST_X11=$(usex X)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARFBUZZ="$(usex otf)"
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON)
+		-DWITH_HYDRA="no" # TODO: Package Hydra
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_WEBP=$(usex webp)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INSTALL_PORTABLE="no"
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MATERIALX="no" # TODO: Package MaterialX
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=no
+		-DWITH_PYTHON_INSTALL_NUMPY=no
+		-DWITH_PYTHON_INSTALL_ZSTANDARD=no
+		-DWITH_RENDERDOC="$(usex renderdoc)"
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=no
+		-DWITH_STRICT_BUILD_OPTIONS=yes
+		-DWITH_SYSTEM_EIGEN3=yes
+		-DWITH_SYSTEM_FREETYPE=yes
+		-DWITH_SYSTEM_LZO=yes
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD="no" # TODO: Package USD
+		-DWITH_VULKAN_BACKEND="$(usex vulkan)"
+		-DWITH_XR_OPENXR=no
+	)
+
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
+	# requires dev-vcs/git
+	if [[ ${PV} = *9999* ]] ; then
+		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
+	else
+		mycmakeargs+=( -DWITH_BUILDINFO="no" )
+	fi
+
+	if use cuda; then
+		mycmakeargs+=(
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
+		)
+	fi
+
+	if use hip; then
+		mycmakeargs+=(
+			-DROCM_PATH="$(hipconfig -R)"
+			-DHIP_HIPCC_FLAGS="-fcf-protection=none"
+		)
+	fi
+
+	if use optix; then
+		mycmakeargs+=(
+			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use arm64 && append-flags -flax-vector-conversions
+
+	append-cflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+	append-cppflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=no
+			-DWITH_LINKER_LLD=no
+		)
+		# Ease compiling with required gcc similar to cuda_sanitize but for cmake
+		use cuda && use cycles-bin-kernels && mycmakeargs+=( -DCUDA_HOST_COMPILER="$(cuda_gccdir)" )
+	fi
+
+	if tc-is-clang || use osl; then
+		mycmakeargs+=(
+			-DWITH_CLANG=yes
+			-DWITH_LLVM=yes
+		)
+	fi
+
+	if use test ; then
+		local CYCLES_TEST_DEVICES=( "CPU" )
+		if use cycles-bin-kernels; then
+			use cuda && CYCLES_TEST_DEVICES+=( "CUDA" )
+			use optix && CYCLES_TEST_DEVICES+=( "OPTIX" )
+			use hip && CYCLES_TEST_DEVICES+=( "HIP" )
+		fi
+		mycmakeargs+=(
+			-DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo "${CYCLES_TEST_DEVICES[*]}")"
+			-DWITH_COMPOSITOR_REALTIME_TESTS=yes
+			-DWITH_GPU_DRAW_TESTS=yes
+			-DWITH_GPU_RENDER_TESTS=yes
+		)
+	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
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+	export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		addwrite "/dev/dri/renderD128"
+		addwrite "/dev/char/"
+	fi
+
+	if use X; then
+		xdg_environment_reset
+	fi
+
+	addwrite /dev/dri
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T}/usr" || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+
+	if use osl; then
+		ewarn ""
+		ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to"
+		ewarn "an other LLVM version than what OSL is linked to."
+		ewarn "See https://bugs.gentoo.org/880671 for more details"
+		ewarn ""
+	fi
+
+	if ! use python_single_target_python3_11; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_11 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${BV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 77eb9876c615..88bb85849015 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-# matches media-libs/osl
+# NOTE must match media-libs/osl
 LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 
 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -17,7 +18,6 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
 	EGIT_SUBMODULES=( '*' '-lib/*' )
-	ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"
 	RESTRICT="!test? ( test )"
 else
 	SRC_URI="
@@ -36,7 +36,7 @@ SLOT="${PV%.*}"
 IUSE="
 	alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels
 	debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack
-	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl
+	jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl
 	+opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio
 	renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
 "
@@ -83,7 +83,7 @@ RDEPEND="${PYTHON_DEPS}
 	embree? ( media-libs/embree:=[raymask] )
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
-	gmp? ( dev-libs/gmp )
+	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )
 	hip? (
 		llvm_slot_17? (
@@ -102,7 +102,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-2.1.0 )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
 	oneapi? ( dev-libs/intel-compute-runtime[l0] )
 	openexr? (
 		>=dev-libs/imath-3.1.7:=
@@ -186,6 +186,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
 	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
 )
 
 blender_check_requirements() {
@@ -233,9 +235,6 @@ src_unpack() {
 			EGIT_SUBMODULES+=( '-tests/*' )
 		fi
 		git-r3_src_unpack
-
-		git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
-		git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
 	else
 		default
 
@@ -318,6 +317,7 @@ src_configure() {
 		-DWITH_BULLET=$(usex bullet)
 		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
 		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CPU_CHECK=no
 
 		-DWITH_CYCLES=$(usex cycles)
 
@@ -343,9 +343,7 @@ src_configure() {
 		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
 		-DWITH_FFTW3=$(usex fftw)
 		-DWITH_GHOST_WAYLAND=$(usex wayland)
-		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
 		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
-		-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
 		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
@@ -393,6 +391,13 @@ src_configure() {
 		-DWITH_XR_OPENXR=no
 	)
 
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
 	# requires dev-vcs/git
 	if [[ ${PV} = *9999* ]] ; then
 		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
@@ -420,6 +425,13 @@ src_configure() {
 		)
 	fi
 
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use arm64 && append-flags -flax-vector-conversions
 
@@ -488,6 +500,8 @@ src_test() {
 		xdg_environment_reset
 	fi
 
+	addwrite /dev/dri
+
 	cmake_src_test
 
 	# Clean up the image directory for src_install
diff --git a/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch
new file mode 100644
index 000000000000..e8e1c349b956
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch
@@ -0,0 +1,38 @@
+From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= <jannik.glueckert@gmail.com>
+Date: Fri, 23 Aug 2024 13:17:34 +0200
+Subject: [PATCH] fix FindLLVM lookup
+
+find out our installed libnames and use that in the lookup
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git build_files/cmake/Modules/FindLLVM.cmake build_files/cmake/Modules/FindLLVM.cmake
+index 4c7cc5f..21c760e 100644
+--- a/build_files/cmake/Modules/FindLLVM.cmake
++++ b/build_files/cmake/Modules/FindLLVM.cmake
+@@ -54,16 +54,21 @@ if(NOT LLVM_LIBPATH)
+   set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+   mark_as_advanced(LLVM_LIBPATH)
+ endif()
++if(NOT LLVM_LIBNAMES)
++  execute_process(COMMAND ${LLVM_CONFIG} --libnames
++	  OUTPUT_VARIABLE LLVM_LIBNAMES
++          OUTPUT_STRIP_TRAILING_WHITESPACE)
++  set(LLVM_LIBNAMES ${LLVM_LIBNAMES} CACHE PATH "Name of the LLVM libraries")
++  mark_as_advanced(LLVM_LIBNAMES)
++endif()
+ 
+ if(LLVM_STATIC)
+   find_library(LLVM_LIBRARY
+-               NAMES LLVMAnalysis # first of a whole bunch of libs to get
++               NAMES ${LLVM_LIBNAMES}
+                PATHS ${LLVM_LIBPATH})
+ else()
+   find_library(LLVM_LIBRARY
+-               NAMES
+-                 LLVM-${LLVM_VERSION}
+-                 LLVMAnalysis  # check for the static library as a fall-back
++               NAMES ${LLVM_LIBNAMES}
+                PATHS ${LLVM_LIBPATH})
+ endif()
+ 
diff --git a/media-gfx/blender/files/blender-4.1.1-numpy.patch b/media-gfx/blender/files/blender-4.1.1-numpy.patch
new file mode 100644
index 000000000000..bd76da8b5959
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.1.1-numpy.patch
@@ -0,0 +1,26 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 23 Aug 2024 13:19:21 +0200
+Subject: [PATCH] fix numpy lookup
+
+use cmake config for find_package()
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/build_files/cmake/platform/platform_unix.cmake
++++ b/build_files/cmake/platform/platform_unix.cmake
+@@ -463,13 +463,13 @@ if(WITH_BOOST)
+     endif()
+     list(APPEND __boost_packages system)
+     set(Boost_NO_WARN_NEW_VERSIONS ON)
+-    find_package(Boost 1.48 COMPONENTS ${__boost_packages})
++    find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages})
+     if(NOT Boost_FOUND)
+       # try to find non-multithreaded if -mt not found, this flag
+       # doesn't matter for us, it has nothing to do with thread
+       # safety, but keep it to not disturb build setups
+       set(Boost_USE_MULTITHREADED OFF)
+-      find_package(Boost 1.48 COMPONENTS ${__boost_packages})
++      find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages})
+     endif()
+     unset(__boost_packages)
+     if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild
index ac40477450ed..860bbe9e07a7 100644
--- a/media-gfx/darktable/darktable-4.6.0.ebuild
+++ b/media-gfx/darktable/darktable-4.6.0.ebuild
@@ -92,7 +92,7 @@ DEPEND="dev-db/sqlite:3
 	openexr? ( media-libs/openexr:= )
 	webp? ( media-libs/libwebp:= )"
 RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild b/media-gfx/darktable/darktable-4.6.1.ebuild
index f3b24a3397c4..43f3c82865fb 100644
--- a/media-gfx/darktable/darktable-4.6.1.ebuild
+++ b/media-gfx/darktable/darktable-4.6.1.ebuild
@@ -92,7 +92,7 @@ DEPEND="dev-db/sqlite:3
 	openexr? ( media-libs/openexr:= )
 	webp? ( media-libs/libwebp:= )"
 RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild
index a03a32b2d03e..7d5982a7686d 100644
--- a/media-gfx/darktable/darktable-4.8.0.ebuild
+++ b/media-gfx/darktable/darktable-4.8.0.ebuild
@@ -92,7 +92,7 @@ DEPEND="dev-db/sqlite:3
 	openexr? ( media-libs/openexr:= )
 	webp? ( media-libs/libwebp:= )"
 RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1:* )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
diff --git a/media-gfx/entice/Manifest b/media-gfx/entice/Manifest
index 332a28885576..68c626df54c6 100644
--- a/media-gfx/entice/Manifest
+++ b/media-gfx/entice/Manifest
@@ -1,2 +1 @@
 DIST entice-0.0.1.tar.xz 3994332 BLAKE2B 38f225a0464b0fcc956b32b02afd0ca9b0923bf0cf70688fe87ee29ef67ef6eda5d81eff957c68927e660f09f2d5b9592c6a5659aa5303a3b8ee88a4af523394 SHA512 2e2dbb24ed1ed97c20683bf93bf4d89afae7d18ed891025fe15a3f70f77e18cefbc5e1430c88cb06a89990def2088a414751407d60227ddbf9a2cb9dfa0609aa
-DIST entice-0_pre20220809.tar.gz 7940222 BLAKE2B 8fb23d904e66894f60db94e64f5d9f0f00b82d6409c3c5e3439ecb8cd7835d2aadd7e52280eed4fc81fd0ac92fc02c9ad58c32d263f3081d93986bf21037c04e SHA512 2f6d549d87ca39be3b2d2fa15b488c6ddf0a31fc5164d90e7b4c37343af2fe44c674330b3764f100b048f94da003c7807e28b95ab059e3c04632026e53e5b96b
diff --git a/media-gfx/entice/entice-0.0.1.ebuild b/media-gfx/entice/entice-0.0.1.ebuild
index d27098a8b85b..aac12dfd69df 100644
--- a/media-gfx/entice/entice-0.0.1.ebuild
+++ b/media-gfx/entice/entice-0.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.enlightenment.org/vtorri/entice/releases/download/v${PV}/${
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 	media-libs/libexif"
diff --git a/media-gfx/entice/entice-0_pre20220809.ebuild b/media-gfx/entice/entice-0_pre20220809.ebuild
deleted file mode 100644
index 92a9440ef6d1..000000000000
--- a/media-gfx/entice/entice-0_pre20220809.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature xdg
-
-MY_COMMIT="5122896d812a2db0fd2c536f047ac340fd1d12e5"
-
-DESCRIPTION="A simple image viewer based on EFL"
-HOMEPAGE="https://git.enlightenment.org/vtorri/entice https://github.com/vtorri/entice"
-SRC_URI="https://github.com/vtorri/entice/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-	media-libs/libexif"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/entice-${MY_COMMIT}"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature_header "Image format support:"
-	optfeature "avif support" dev-libs/efl[avif]
-	optfeature "bmp,wbmp support" dev-libs/efl[bmp]
-	optfeature "dds support" dev-libs/efl[dds]
-	optfeature "gif support" dev-libs/efl[gif]
-	optfeature "heif support" dev-libs/efl[heif]
-	optfeature "ico,cur support" dev-libs/efl[ico]
-	optfeature "jp2k support" dev-libs/efl[jpeg2k]
-	optfeature "pdf support" dev-libs/efl[pdf]
-	optfeature "pmaps support" dev-libs/efl[pmaps]
-	optfeature "psd support" dev-libs/efl[psd]
-	optfeature "raw support" dev-libs/efl[raw]
-	optfeature "svg,rsvg support" dev-libs/efl[svg]
-	optfeature "tga support" dev-libs/efl[tga]
-	optfeature "tgv support" dev-libs/efl[tgv]
-	optfeature "tiff support" dev-libs/efl[tiff]
-	optfeature "webp support" dev-libs/efl[webp]
-	optfeature "xcf support" dev-libs/efl[xcf]
-	optfeature "xpm support" dev-libs/efl[xpm]
-}
diff --git a/media-gfx/entice/metadata.xml b/media-gfx/entice/metadata.xml
index a1fbf3c0c993..c9765eba6379 100644
--- a/media-gfx/entice/metadata.xml
+++ b/media-gfx/entice/metadata.xml
@@ -5,4 +5,7 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">vtorri/entice</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/eom/eom-1.28.0-r2.ebuild b/media-gfx/eom/eom-1.28.0-r2.ebuild
new file mode 100644
index 000000000000..f808aaf8de76
--- /dev/null
+++ b/media-gfx/eom/eom-1.28.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 mate optfeature
+
+MINOR=$(($(ver_cut 2) % 2))
+if [[ ${MINOR} -eq 0 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
+SLOT="0"
+
+IUSE="X debug exif imagemagick +introspection nls jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=dev-libs/glib-2.52:2
+	>=dev-libs/libpeas-1.8.0:0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	>=x11-misc/shared-mime-info-0.20
+	exif? (
+		>=media-libs/libexif-0.6.22
+		media-libs/libjpeg-turbo:=
+	)
+	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-build/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-thumbnailer \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with exif libexif) \
+		$(usex imagemagick \
+			--without-gdk-pixbuf-thumbnailer \
+			--with-gdk-pixbuf-thumbnailer \
+		) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "webp support" gui-libs/gdk-pixbuf-loader-webp
+}
diff --git a/media-gfx/exiv2/exiv2-0.28.3.ebuild b/media-gfx/exiv2/exiv2-0.28.3.ebuild
index ee1fb3e320ce..1f4b825f1386 100644
--- a/media-gfx/exiv2/exiv2-0.28.3.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest
index 1ba0293237e7..825d8b234043 100644
--- a/media-gfx/fotema/Manifest
+++ b/media-gfx/fotema/Manifest
@@ -1 +1,2 @@
-DIST fotema-1.10.0.tar.xz 78681568 BLAKE2B 8956415b4e605b6c4cac12e8cd3d3179bace74ea0b5bc17bbede1d3ccc87c321cca09e6d42794c2568e2840c80333df54174d37f70368732e75657ee28d54e37 SHA512 28e1780a34f6bb655a7add708088ec4b6e42207f55055dd1011c6da9b5ea52407040cb5d02c4dff5d2ec2531ec94d02191d02ed1d29cebe64ff8a8e85f9cd0d7
+DIST fotema-1.14.0.tar.xz 78584796 BLAKE2B c7a53e07fd8ccbd6ba48d595fd280e428ce334908c7b00a4fb5021d92b69c17836ede51656d4a5ab2473fc8220a4b3cbfe25cbdf6da58bc4b7ba7bfbe6ed35dd SHA512 44ff2dd4d3d8268a3f9795f3c37651173a077a7ff831def8e968f658a75786755f7129bed565da674306194084519240b1aa4d378431c36689578f175a054df1
+DIST fotema-1.14.1.tar.xz 78613740 BLAKE2B d945e6be4ef8db99e3c380a75dd6328bcd3a94f885f75bd11db4f164a11f0d541c07d198087aed80a8df637945ca9abc9a98d4c240b0faafe4726d7a82eaef3a SHA512 f80650ccc7401b743e9f6f1b6623f99e5c78df8da44b1608ef1ebfaaf7028858d78a6ca574a712ff2ec1760d4fe0535a365925068be88858eb230ea820803eb2
diff --git a/media-gfx/fotema/fotema-1.10.0-r1.ebuild b/media-gfx/fotema/fotema-1.10.0-r1.ebuild
deleted file mode 100644
index 5bf1f9cab059..000000000000
--- a/media-gfx/fotema/fotema-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cargo gnome2-utils meson xdg-utils
-
-DESCRIPTION="Photo gallery for Linux"
-HOMEPAGE="https://github.com/blissd/fotema"
-SRC_URI="
-	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
-"
-
-# 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
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.0.0: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
-"
-
-ECARGO_VENDOR=${S}/vendor
-
-QA_FLAGS_IGNORED="/usr/bin/fotema"
-
-src_prepare() {
-	default
-	sed -i -e "/i18ndir =/s:'i18n':'share' / 'fotema' / &:" meson.build || die
-}
-
-src_configure() {
-	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
-
-		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
-		git = "https://github.com/blissd/rust-faces.git"
-		branch = "patch"
-		replace-with = "gentoo"
-	EOF
-
-	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.14.0.ebuild b/media-gfx/fotema/fotema-1.14.0.ebuild
new file mode 100644
index 000000000000..d4bc59161fe6
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.14.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo gnome2-utils meson xdg-utils
+
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
+"
+
+# 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
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.0.0: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
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_configure() {
+	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
+
+		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
+		git = "https://github.com/blissd/rust-faces.git"
+		branch = "patch"
+		replace-with = "gentoo"
+	EOF
+
+	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.14.1.ebuild b/media-gfx/fotema/fotema-1.14.1.ebuild
new file mode 100644
index 000000000000..d4bc59161fe6
--- /dev/null
+++ b/media-gfx/fotema/fotema-1.14.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo gnome2-utils meson xdg-utils
+
+DESCRIPTION="Photo gallery for Linux"
+HOMEPAGE="https://github.com/blissd/fotema"
+SRC_URI="
+	https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz
+"
+
+# 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
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.0.0: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
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="/usr/bin/fotema"
+
+src_configure() {
+	cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die
+
+		[source."git+https://github.com/blissd/rust-faces.git?branch=patch"]
+		git = "https://github.com/blissd/rust-faces.git"
+		branch = "patch"
+		replace-with = "gentoo"
+	EOF
+
+	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/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 122443176973..477c892d26a4 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -15,10 +15,10 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
+IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RESTRICT="!test? ( test )"
@@ -26,6 +26,10 @@ RESTRICT="!test? ( test )"
 # media-libs/{babl,gegl} are required to be built with USE="introspection"
 # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
 COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	')
 	>=app-accessibility/at-spi2-core-2.46.0
 	>=app-text/poppler-0.90.1[cairo]
 	>=app-text/poppler-data-0.4.9
@@ -36,10 +40,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.98[introspection,lcms,vala?]
+	>=media-libs/babl-9999[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-9999[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.14.0
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.13.1:2
@@ -69,12 +73,6 @@ COMMON_DEPEND="
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
 	postscript? ( app-text/ghostscript-gpl:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-		')
-	)
 	udev? ( >=dev-libs/libgudev-167:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
@@ -116,11 +114,12 @@ pkg_pretend() {
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
+	python-single-r1_pkg_setup
 	use lua && lua-single_pkg_setup
 
-	if use python; then
-		python-single-r1_pkg_setup
+	if has_version ">=media-libs/babl-9999" || has_version ">=media-libs/gegl-9999"; then
+		ewarn "Please make sure to rebuid media-libs/babl-9999 and media-libs/gegl-9999 packages"
+		ewarn "before building media-gfx/gimp-9999 to have their latest master branch versions."
 	fi
 }
 
@@ -182,7 +181,6 @@ src_configure() {
 		$(meson_feature openexr)
 		$(meson_feature openmp)
 		$(meson_feature postscript ghostscript)
-		$(meson_feature python)
 		$(meson_feature test headless-tests)
 		$(meson_feature udev gudev)
 		$(meson_feature vala)
@@ -229,9 +227,7 @@ src_test() {
 src_install() {
 	meson_src_install
 
-	if use python; then
-		python_optimize
-	fi
+	python_optimize
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 064922e59397..9706fab4aa29 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,3 +2,5 @@ DIST GraphicsMagick-1.3.42.tar.xz 5553692 BLAKE2B f8f0d7d420375262b7db8ffcc1c9eb
 DIST GraphicsMagick-1.3.42.tar.xz.asc 228 BLAKE2B 723f8d1ca13bd5b32a12d69bb46f4991df6e7963f0d4c12ddaf60167a9ade4c6fa36819cce1df202437143bc55e17dd6f2cff821412dafceeb3ab5e3dbf3dc7b SHA512 de5d90c748376e7e480a066e9354ac1771f15cb2d8c6e5c9249672fd811b7bbe06f97b3348240538fa8d0d7c11150f57fb5148285214712944f7535afb943bd0
 DIST GraphicsMagick-1.3.43.tar.xz 5657460 BLAKE2B caa4fa6546acb4cdaaa421030ccc5cd2b628ae723e07f84700f65e26e1f3e59039cf92fda259ee44ba1e1fa90e9c469844fb5289cc73d50c42bb50fb39358ca2 SHA512 15b4d90119f25fd45f16d50218d51d543841dd3cdaf0c585bce2c18592106bc41573ed1011d7176ff5882fa0cded8f46bfd1e639c26063571109911e22098757
 DIST GraphicsMagick-1.3.43.tar.xz.asc 228 BLAKE2B cb1290af98ea92de948df0421b7de101a713f0b8ce4a07959269d5edd10eb26f088585e1a8272482a9b219ee388ae8f040fc047ca76d5f752f04a7b57987c89c SHA512 3bd62bc64dd1b6f2d7a17f1281d8dc4c67c474860b4d95bfaf5fb4be93d0ee156b54c2a6ef4166687854e5458a6e43e61816a5fd508e4702f693a9d1e43984bf
+DIST GraphicsMagick-1.3.45.tar.xz 5936968 BLAKE2B 55c87c518267dc3330d09c39474acf4b89f06b2deddf8e5d36d3c235f39bb1ec5bd04d90e2dd6e50563430b58ea3b78ccb526bf8cf79efa32685ae8e04a1aee5 SHA512 2c12a24198a8ee1f86b4c43bf8903d129c891ec2c27ba22287dfc8a5f65c9223b2caa67a37b9a91b10b049ba8425e757738f5d92a9ae70abee76d323af9bd1a0
+DIST GraphicsMagick-1.3.45.tar.xz.asc 228 BLAKE2B 72c7554de7d45499f90fa6534ed819e4d40b5f878f8bf0b14b026e100390ee9cabddd9df0d3945664e559350f1621239fcb9aafa9987a26e346f52b2c2ad8215 SHA512 5f49c8d1cdd20cb5bd7b76660800d22ef8ab3b13c3954dc4feb7522cb1f4d343a8e98faa91094f616ecbb01ff770bc3f4dd252c62b6b70c780318d425730c5c1
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild
new file mode 100644
index 000000000000..7540cb69f787
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/ https://foss.heptapod.net/graphicsmagick/graphicsmagick"
+
+if [[ ${PV} == 9999 ]] ; then
+	EHG_REPO_URI="https://foss.heptapod.net/${PN}/${PN}"
+	inherit mercurial
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bobfriesenhahn.asc
+	inherit verify-sig
+
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma"
+IUSE+=" openmp perl postscript png q16 q32 static-libs tcmalloc tiff truetype"
+IUSE+=" webp wmf X zip zlib zstd"
+
+RDEPEND="
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	heif? ( media-libs/libheif:= )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/jasper:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	png? ( media-libs/libpng:= )
+	tcmalloc? ( dev-util/google-perftools:= )
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+=" virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.41-flags.patch
+	"${FILESDIR}"/${PN}-1.3.41-perl.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local myeconfargs=(
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_enable openmp)
+		--with-threads
+		$(use_with dynamic-loading modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with postscript gs)
+		$(use_with heif)
+		$(use_with jpegxl jxl)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with fpx)
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		$(use_with jpeg2k jp2)
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tcmalloc)
+		$(use_with tiff)
+		--without-trio
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with zip libzip)
+		$(use_with zlib)
+		$(use_with zstd)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use perl && emake perl-build
+}
+
+src_test() {
+	# Some perl tests fail when DISPLAY is set
+	unset DISPLAY
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		emake -C PerlMagick DESTDIR="${D}" install
+
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index fd1d7bcb1476..7540cb69f787 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -28,8 +28,8 @@ fi
 LICENSE="MIT"
 SLOT="0/${PV%.*}"
 IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma"
-IUSE+=" openmp perl png postscript q16 q32 static-libs tcmalloc tiff truetype"
-IUSE+=" webp wmf X zlib zstd"
+IUSE+=" openmp perl postscript png q16 q32 static-libs tcmalloc tiff truetype"
+IUSE+=" webp wmf X zip zlib zstd"
 
 RDEPEND="
 	dev-libs/libltdl
@@ -44,8 +44,8 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl:= )
 	png? ( media-libs/libpng:= )
-	postscript? ( app-text/ghostscript-gpl )
 	tcmalloc? ( dev-util/google-perftools:= )
 	tiff? ( media-libs/tiff:= )
 	truetype? (
@@ -59,6 +59,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 	)
+	zip? ( dev-libs/libzip:= )
 	zlib? ( sys-libs/zlib )
 	zstd? ( app-arch/zstd:= )
 "
@@ -103,12 +104,12 @@ src_configure() {
 		--with-quantum-depth=${depth}
 		--without-frozenpaths
 		$(use_with cxx magick-plus-plus)
+		$(use_with postscript gs)
 		$(use_with heif)
 		$(use_with jpegxl jxl)
 		$(use_with perl)
 		--with-perl-options=INSTALLDIRS=vendor
 		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
 		$(use_with fpx)
 		$(use_with jbig)
 		$(use_with webp)
@@ -125,6 +126,7 @@ src_configure() {
 		--with-fontpath="${EPREFIX}"/usr/share/fonts
 		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
 		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with zip libzip)
 		$(use_with zlib)
 		$(use_with zstd)
 		$(use_with X x)
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 99ba429c7cac..81b72dbdce7f 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="dynamic-loading">Compile graphicsmagick with dynamically loadable modules</flag>
 		<flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
 		<flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
+		<flag name="zip">Build with <pkg>dev-libs/libzip</pkg> to support the OpenRaster (ORA) format.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">graphicsmagick</remote-id>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b54b227f16d8..189f0aaaa531 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1,4 @@
+DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B ba6aa3cfd283e234c91e4e79a5410ba4b920cac59f1e1b23da7e899bd7b05a520bfcebd60cf3032c50da2c65bd70592a10de6a41382f9dc65eb37b1fac0f6b39 SHA512 11f3cd6a278d2af21a2bfdd5e88fe1302278b8d8a49c2b42affc5f1138f62db334fb53afc93883309904f1e6198fa4b577a5b28361e84a0c8f278873251b4e30
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080 SHA512 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04 SHA512 0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e
+DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b SHA512 636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89
diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch
new file mode 100644
index 000000000000..afd45b3417eb
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch
@@ -0,0 +1,28 @@
+From 3862ebc02771f33c309e9ee91b696aff0fbdc20e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 8 Sep 2024 21:10:01 +0200
+Subject: [PATCH 1/2] Revert "install perl module into user-specified prefix
+ (#7192)"
+
+This reverts commit c09d35f22090585a0357ecfbd58786022a37aae7.
+---
+ PerlMagick/Makefile.PL.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in
+index 902f01dc2..622a502ea 100644
+--- a/PerlMagick/Makefile.PL.in
++++ b/PerlMagick/Makefile.PL.in
+@@ -223,9 +223,6 @@ WriteMakefile
+    # Linker flags for building a dynamically loadable module
+    'LDDLFLAGS' => $LDDLFLAGS_magick,
+ 
+-   # Install PerlMagick into ImageMagick prefix
+-   'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+-- 
+2.44.2
+
diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch
new file mode 100644
index 000000000000..10418d8555e6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch
@@ -0,0 +1,27 @@
+From 5e08a2474436574d7ed6de006573dd9bc036cd5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 8 Sep 2024 21:10:13 +0200
+Subject: [PATCH 2/2] Revert "set perl install base to that of ImageMagick's"
+
+This reverts commit 2d5edb26e22dd34ac1e43936b5c461bf0dbdb03a.
+---
+ PerlMagick/quantum/Makefile.PL.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in
+index fabebd300..fa0bf3384 100644
+--- a/PerlMagick/quantum/Makefile.PL.in
++++ b/PerlMagick/quantum/Makefile.PL.in
+@@ -220,9 +220,6 @@ WriteMakefile
+    # Linker flags for building a dynamically loadable module
+    'LDDLFLAGS' => $LDDLFLAGS_magick,
+ 
+-   # Install PerlMagick into ImageMagick prefix
+-   'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+-- 
+2.44.2
+
diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
new file mode 100644
index 000000000000..1954fe32d565
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="
+	corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# for Darwin modules
+	elibtoolize
+
+	# For testsuite, see bug #500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--with-gcc-arch=no-automagic
+
+		# Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+		# For now, let's make USE=hardened do 'limited', and have USE=-hardened
+		# reflect the upstream default of 'open'.
+		#
+		# We might change it to 'secure' and 'limited' at some point.
+		# See also bug #716674.
+		--with-security-policy=$(usex hardened limited open)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in ${HOME} for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		# bug #472766
+		doins "${T}"/99${PN}
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
new file mode 100644
index 000000000000..16ef267001e2
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="
+	corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	jpegxl? ( >=media-libs/libjxl-0.6:= )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.1.1.38-perl-1.patch"
+	"${FILESDIR}/${PN}-7.1.1.38-perl-2.patch"
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		--with-uhdr
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+
+		# Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+		# For now, let's make USE=hardened do 'limited', and have USE=-hardened
+		# reflect the upstream default of 'open'.
+		#
+		# We might change it to 'secure' and 'limited' at some point.
+		# See also bug #716674.
+		--with-security-policy=$(usex hardened limited open)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	einstalldocs
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
new file mode 100644
index 000000000000..31879f9cdc1a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-18"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="
+	corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	jpegxl? ( >=media-libs/libjxl-0.6:= )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		--with-uhdr
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+
+		# Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open
+		# For now, let's make USE=hardened do 'limited', and have USE=-hardened
+		# reflect the upstream default of 'open'.
+		#
+		# We might change it to 'secure' and 'limited' at some point.
+		# See also bug #716674.
+		--with-security-policy=$(usex hardened limited open)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	einstalldocs
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 904cbdbc135e..31879f9cdc1a 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -155,6 +155,7 @@ src_configure() {
 		$(use_with zip)
 		$(use_with zlib)
 		--without-autotrace
+		--with-uhdr
 		$(use_with postscript dps)
 		$(use_with djvu)
 		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
@@ -226,8 +227,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt
+	einstalldocs
 
 	if use perl; then
 		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
index 156509f263af..a6489af9714d 100644
--- a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="gui"
 
 BDEPEND="
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 913884586af4..779b90b8aed7 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,2 +1 @@
-DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-DIST kgraphviewer-2.5.0.tar.xz 1571364 BLAKE2B 77a749f6b2c7707e26993685445fac679067b1188a5e2bf974d99ddc89844eeea19de9fbdf86b9c0738a95515c3a5155743df4232167e24350c8d356ea96f6e3 SHA512 80056703cd42b709925b771fe4bafe17771954705a607d6c352a0818c726bc7b48d299fffd7f3d2f75ac498059f79923d4de468db20f8538554c4d6b8baffedb
+DIST kgraphviewer-24.08.0.tar.xz 1582636 BLAKE2B 0043a4a77cf202d96c9e7e0f708e8d93bb71642ba220aa32655f671a8ec92b522d2c8914bdde65187bb270117e2d60f1f7b806895d337c443d7a91860a01f9c3 SHA512 c2ba1a82240fdbbd285b4815d6cc43804e7b26f856185b2d9b3a789e30c6a32c98bd8c92676db3007a58426cbc5961d0bcbf3f4d9c9aa4aed1c58ab12f68f51e
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
deleted file mode 100644
index 8b31d40fb157..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 7 Mar 2022 19:49:21 +0100
-Subject: [PATCH] Enable highdpi pixmaps
-
----
- src/main.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 32ad115..271e61f 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -38,6 +38,7 @@
- 
- int main(int argc, char **argv)
- {
-+  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-   QApplication app(argc, argv);
- 
-   KLocalizedString::setApplicationDomain("kgraphviewer");
--- 
-GitLab
-
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
deleted file mode 100644
index 76fa878bc364..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 8 May 2022 16:59:25 +0200
-Subject: [PATCH] Remove pointless/broken icons
-
-The distribute-horizontal-page icon doesn't serve any apparent purpose
-
-The portrait/landscape icons don't exist in any theme
-
-(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681)
----
- CMakeLists.txt                          |  1 -
- src/part/CMakeLists.txt                 |  2 +-
- src/part/KgvPageLayoutSize.cpp          | 10 ----------
- src/part/simpleprintingpagesetup.cpp    |  4 ----
- src/part/simpleprintingpagesetupbase.ui | 10 ----------
- 5 files changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd715d2..238a9dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     DocTools
-     Parts
-     WidgetsAddons
--    IconThemes
- )
- 
- find_package(Boost 1.36 REQUIRED)
-diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
-index 0e70be8..922e5c5 100644
---- a/src/part/CMakeLists.txt
-+++ b/src/part/CMakeLists.txt
-@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} )
- 
- add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS})
- 
--target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
-+target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
- 
- set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )
- 
-diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp
-index bb8b3d1..4053a20 100644
---- a/src/part/KgvPageLayoutSize.cpp
-+++ b/src/part/KgvPageLayoutSize.cpp
-@@ -42,7 +42,6 @@
- #include <QHBoxLayout>
- #include <QGridLayout>
- #include <QPixmap>
--#include <KIconTheme>
- #include "klocalizedstring.h"
- 
- KgvPageLayoutSize::KgvPageLayoutSize(
-@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize(
- //     m_orientGroup->setInsideSpacing( KDialog::spacingHint() );
-     grid1->addWidget( m_orientGroup, 2, 0 );
- 
--    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
--    QLabel* lbPortrait = new QLabel( m_orientGroup );
--    lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) );
--    lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() );
--    lay3->addWidget(lbPortrait);
-     QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup );
-     lay3->addWidget(rbPortrait);
-     m_orientButtons.addButton(rbPortrait);
-   
--    QLabel* lbLandscape = new QLabel( m_orientGroup );
--    lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) );
--    lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() );
--    lay3->addWidget(lbLandscape);
-     QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup );
-     lay3->addWidget(rbLandscape);
-     m_orientGroup->setLayout(lay3);
-diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp
-index 9882fbf..cd707b9 100644
---- a/src/part/simpleprintingpagesetup.cpp
-+++ b/src/part/simpleprintingpagesetup.cpp
-@@ -57,7 +57,6 @@
- #include <QPixmap>
- #include <QVBoxLayout>
- #include <klocalizedstring.h>
--#include <KIconTheme>
- #include <iostream>
- 
- namespace KGraphViewer
-@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup(
- 	connect(m_contents->printPreviewButton, &QPushButton::clicked,
-                 this, &KGVSimplePrintingPageSetup::slotPrintPreview);
- 
--	m_contents->iconLabel->setFixedWidth(32+6);
--    const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small);
--  m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize));
- 	m_contents->headerTitleFontButton->setText(i18n("Font..."));
- 	m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text."));
- 	connect(m_contents->headerTitleFontButton, &QPushButton::clicked,
-diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui
-index ddc6ee0..719a7d6 100644
---- a/src/part/simpleprintingpagesetupbase.ui
-+++ b/src/part/simpleprintingpagesetupbase.ui
-@@ -157,16 +157,6 @@
-        </item>
-       </layout>
-      </item>
--     <item>
--      <widget class="QLabel" name="iconLabel">
--       <property name="text">
--        <string/>
--       </property>
--       <property name="alignment">
--        <set>Qt::AlignVCenter</set>
--       </property>
--      </widget>
--     </item>
-      <item>
-       <widget class="QGroupBox" name="groupBox4">
-        <property name="title">
--- 
-2.37.3
-
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
deleted file mode 100644
index 970bf57f2cfb..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Tue, 5 Feb 2019 04:49:16 +0100
-Subject: Set StartupWMClass in desktop file
-
-Used by non-Plasma unixoid X-based shells to map windows to desktop files
-e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and
-instead expect (one of) the WM_CLASS entries to match the basename of the
-desktop file by default. StartupWMClass overwrites that default.
----
- src/org.kde.kgraphviewer.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop
-index bfff1bf..6b3affb 100644
---- a/src/org.kde.kgraphviewer.desktop
-+++ b/src/org.kde.kgraphviewer.desktop
-@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz
- Exec=kgraphviewer -qwindowtitle %c %u
- Icon=kgraphviewer
- Type=Application
-+StartupWMClass=kgraphviewer
- Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization;
- X-DocPath=kgraphviewer/index.html
- InitialPreference=10
--- 
-cgit v1.1
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
deleted file mode 100644
index 4716b8e8e2e9..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/kgraphviewer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-set-startupwmclass.patch"
-	"${FILESDIR}/${P}-highdpi.patch"
-	"${FILESDIR}/${P}-obsolete-dep.patch"
-)
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.5.0.ebuild
deleted file mode 100644
index d8fd97400f04..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.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
-
-ECM_HANDBOOK="optional"
-KFMIN=6.1.0
-QTMIN=6.6.2
-inherit ecm kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/kgraphviewer/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="
-	>=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="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-"
diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild
new file mode 100644
index 000000000000..4e65fec3c592
--- /dev/null
+++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild
@@ -0,0 +1,34 @@
+# 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 ~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 8e6d0767cba9..25187f03d646 100644
--- a/media-gfx/kio-blender-thumbnailer/Manifest
+++ b/media-gfx/kio-blender-thumbnailer/Manifest
@@ -1,2 +1,3 @@
 DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
 DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild
index 6c07d522c518..5c0f56be9ad1 100644
--- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-23.08.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild
index d89b1ff9b941..6ca172850f8b 100644
--- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.0.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.0.ebuild
new file mode 100644
index 000000000000..5ef7e9c0e3d1
--- /dev/null
+++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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-mobi-thumbnailer/Manifest b/media-gfx/kio-mobi-thumbnailer/Manifest
index 8e6d0767cba9..25187f03d646 100644
--- a/media-gfx/kio-mobi-thumbnailer/Manifest
+++ b/media-gfx/kio-mobi-thumbnailer/Manifest
@@ -1,2 +1,3 @@
 DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
 DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild
index 96c26b0c2571..2c151ad528c0 100644
--- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-23.08.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild
index 0d90be2af4e2..ff9f71ee7a35 100644
--- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.0.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.0.ebuild
new file mode 100644
index 000000000000..5333f1b82349
--- /dev/null
+++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.0.ebuild
@@ -0,0 +1,42 @@
+# 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-ps-thumbnailer/Manifest b/media-gfx/kio-ps-thumbnailer/Manifest
index 8e6d0767cba9..25187f03d646 100644
--- a/media-gfx/kio-ps-thumbnailer/Manifest
+++ b/media-gfx/kio-ps-thumbnailer/Manifest
@@ -1,2 +1,3 @@
 DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
 DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild
index ecb35e9d3465..c6e1caecc1b5 100644
--- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-23.08.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild
index 30266f3432c9..3042e12f1b3b 100644
--- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.0.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.0.ebuild
new file mode 100644
index 000000000000..e0ab87727184
--- /dev/null
+++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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-raw-thumbnailer/Manifest b/media-gfx/kio-raw-thumbnailer/Manifest
index 8e6d0767cba9..25187f03d646 100644
--- a/media-gfx/kio-raw-thumbnailer/Manifest
+++ b/media-gfx/kio-raw-thumbnailer/Manifest
@@ -1,2 +1,3 @@
 DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f
 DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503
+DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild
index b5b30f1b69eb..632c1da4fcfb 100644
--- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-23.08.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild
index b6b93b511ae8..335ba17313cc 100644
--- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.0.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.0.ebuild
new file mode 100644
index 000000000000..369f5f44090d
--- /dev/null
+++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.0.ebuild
@@ -0,0 +1,43 @@
+# 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/krita/files/krita-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
new file mode 100644
index 000000000000..df5fffb41d47
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/936296
+https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae
+
+From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 26 Aug 2024 14:38:03 +0200
+Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code
+
+Gentoo seems to build Krita with a global -march=znver4 flag,
+which causes "scalar" version of the code to be compiled with
+AVX512. Even though it is not how the system is supposed to work
+(and this avx512-optimization will never be used in real runtime),
+we shouldn't fail compilation.
+
+https://bugs.gentoo.org/936296
+https://github.com/xtensor-stack/xsimd/issues/1044
+--- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
++++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
+@@ -28,7 +28,7 @@ public:
+         const int numColorChannels = m_channelsPerPixel * numColumns;
+ 
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+-        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+         using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>;
+ 
+@@ -129,7 +129,7 @@ public:
+         const int numColorChannels = m_channelsPerPixel * numColumns;
+ 
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+-        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+ 
+         const int channelsPerAvx2Block = 32;
+-- 
+GitLab
diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
index c95734e0ad9a..6026fabe1417 100644
--- a/media-gfx/krita/krita-5.2.3.ebuild
+++ b/media-gfx/krita/krita-5.2.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
 	# git master
 	"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
+	"${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296
 )
 
 pkg_setup() {
diff --git a/media-gfx/libbgcode/Manifest b/media-gfx/libbgcode/Manifest
index 937b85cad131..4c6e9576d0ef 100644
--- a/media-gfx/libbgcode/Manifest
+++ b/media-gfx/libbgcode/Manifest
@@ -1,2 +1,2 @@
-DIST libbgcode-0.0.20240704.tar.gz 456516 BLAKE2B 26f0a6f01a937da0fc4e4a4db715759967eb235f004daa9140841d7b0040a04dc86627c07265f5eb0cb7b34a9c6b43ec97ee1c59b53319ab95a9f3cb965fe906 SHA512 ed45cad28b15f5ac4b2cc340159f591c2cfb2560e8fa96f67bb122a2f7337a2fd67e632550fae8c07b36aad523ebe91334776f132291c4f84ff63d0f4a3b583e
 DIST libbgcode-0.0.20240730.tar.gz 456671 BLAKE2B a15e903e42090eff3945f446f7d805ceabad533a2edcc9e4c82d99bac7aa42e9f10470f5ee41ed449799d9bc318c9097439a6534607a00d0bfeb2e2dea252b79 SHA512 b448d9ace946d85a4decc4a2cc05e1a41c64ba49968db1f818ba5974120f458159d5b639d5501a98daf4544a483366cd0e299c052f21577bb5ad763f7220d7e3
+DIST libbgcode-0.0.20240903.tar.gz 456751 BLAKE2B 93cd8eb83083581ba1ba735c6820dc0ead18d13ca0613387559d610f39c8011881bcc92ffec65fbcb40113b2b877050c15c7816d6db063698ce7ba5df7b35eda SHA512 86e9d85f0e52ebde853979e79639dc4424e26686fe55c45d78ca683cf32d8ec059976d43ffda9339a41892d30ebb267f8c360851889ad0a48ced874c27546f04
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild
deleted file mode 100644
index ec7244e9227a..000000000000
--- a/media-gfx/libbgcode/libbgcode-0.0.20240704.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
-
-LIBBGCODE_COMMIT=dcb8f7b6d91f1d490022083be09a76dc2bc9c51f
-
-DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter"
-HOMEPAGE="https://github.com/prusa3d/libbgcode"
-SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}"
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/heatshrink-0.4.1
-	>=sys-libs/zlib-1.0
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( =dev-cpp/catch-2*:0 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLibBGCode_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
index bf5c06541e91..c53e99967c5c 100644
--- a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
+++ b/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz
 S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild
new file mode 100644
index 000000000000..938eb7efa59a
--- /dev/null
+++ b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+LIBBGCODE_COMMIT=3db61e45713932b4a9cdd469aa567d65e0095d00
+
+DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter"
+HOMEPAGE="https://github.com/prusa3d/libbgcode"
+SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}"
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/heatshrink-0.4.1
+	>=sys-libs/zlib-1.0
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	test? ( =dev-cpp/catch-2*:0 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLibBGCode_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild
index d369079f6c01..cff2fc237659 100644
--- a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 2c06054fed4d..c9fb888709a3 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1 +1,2 @@
 DIST plantuml-1.2024.5.tar.gz 12119170 BLAKE2B 97fd8f48aa04d9d8b089547871abd954b8b1c189d32b844f1de4ac33678dabe2968a3307fb573f571adf541dbbbfd5eb5c21839b14f3cb9ed2e86ac7b447bb87 SHA512 20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5
+DIST plantuml-1.2024.6.tar.gz 12591935 BLAKE2B c9b56908538e3e98d2c8d4e56c064ffa378621d14232f8d769f1b80b610fcf22c50d94974a8c21791e2780231708e594a02466f0cba5e78a60b4b4110d0f89f0 SHA512 86633b93abdbc571ff335e61992f0db8ba20ed0e0d0dc5e9c564a8b312594051f47d453fb8b9787d3d3192ccc35f8ea99e5ddab8cc1d16458203c9309087ddbd
diff --git a/media-gfx/plantuml/plantuml-1.2024.6.ebuild b/media-gfx/plantuml/plantuml-1.2024.6.ebuild
new file mode 100644
index 000000000000..eafb36810423
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2024.6.ebuild
@@ -0,0 +1,50 @@
+# 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 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 ~x86"
+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/povray/povray-3.7.0.0-r5.ebuild b/media-gfx/povray/povray-3.7.0.0-r5.ebuild
deleted file mode 100644
index ea1666fa2b34..000000000000
--- a/media-gfx/povray/povray-3.7.0.0-r5.ebuild
+++ /dev/null
@@ -1,151 +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 virtualx
-
-POVRAY_MAJOR_VER=$(ver_cut 1-3)
-POVRAY_MINOR_VER=$(ver_cut 4)
-if [[ -n ${POVRAY_MINOR_VER} ]]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="https://www.povray.org/"
-SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${P}_p20160914-fix-c++14.patch.bz2"
-S=${WORKDIR}/${PN}-${MY_PV}
-
-LICENSE="AGPL-3+ CC-BY-SA-3.0 CC-BY-NC-SA-2.5"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug +io-restrictions tiff X"
-
-DEPEND="
-	dev-libs/boost:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	sys-libs/zlib
-	tiff? ( media-libs/tiff:= )
-	X? ( media-libs/libsdl )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-build/autoconf-archive"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-user-conf.patch
-	"${FILESDIR}"/${P}-automagic.patch
-	"${WORKDIR}"/${P}_p20160914-fix-c++14.patch
-	"${FILESDIR}"/${P}-gcc6-openexr.patch
-)
-
-src_prepare() {
-	[[ ${CHOST} == *-darwin* ]] && \
-		PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch )
-	eapply "${FILESDIR}"/${P}-r1-boost-1.50.patch
-
-	pushd unix &>/dev/null || die
-		pushd config &>/dev/null || die
-		rm -rf \
-			acx_pthread.m4 \
-			ax_boost_base.m4 \
-			ax_boost_thread.m4 \
-			ax_compare_version.m4 \
-			ax_compiler_vendor.m4 \
-			ax_compiler_version.m4 || die
-		popd &>/dev/null || die
-	bash -x prebuild.sh || die
-	popd &>/dev/null || die
-
-	rm -rf libraries || die
-
-	# Change some directories that cannot be adjusted via configure
-	sed \
-		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
-		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
-		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
-		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
-		-e "s:\"/usr/include\":\"${EPREFIX}/usr/include\":" \
-		-e "s:\"/usr/lib\":\"${EPREFIX}/usr/$(get_libdir)\":" \
-		-i configure.ac || die
-
-	sed \
-		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
-		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
-		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
-		-e 's:mkdir_p:MKDIR_P:g' \
-		-i Makefile.am || die
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/859784
-	# https://github.com/POV-Ray/povray/issues/458
-	# Upstream activity is dead for 3 years now, so don't hold
-	# your breath for a fix.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# but the code compiles using incorrect [default] paths
-	# (based on /usr/local...), so povray will not find the system
-	# config files without the following fix:
-	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"/usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"/etc/${PN}\\\"
-
-	# TODO: Restore OpenEXR if upstream start to support OpenEXR 3/imath
-	local myeconfargs=(
-		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)"
-		$(use_enable debug)
-		$(use_enable io-restrictions)
-		--without-openexr
-		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
-		$(use_with X x "${EPREFIX}/usr/$(get_libdir)")
-		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes")
-		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
-		--without-libmkl
-		--disable-pipe
-		--disable-strip
-		--disable-optimiz
-		--disable-optimiz-arch
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	virtx default
-}
-
-pkg_preinst() {
-	# Copy the old config files if they are in the old location
-	# but do not yet exist in the new location.
-	# This way, they can be treated by CONFIG_PROTECT as normal.
-	local conf_file version_dir
-	for conf_file in "${ED}"/etc/"${PN}"/*; do
-		if [[ ! -e "${EROOT}/etc/${PN}/${conf_file}" ]]; then
-			for version_dir in $(echo "${EROOT}"/etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
-				if [ -e "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" "${EROOT}/etc/${PN}" || die
-					elog "Note: ${conf_file} moved from ${EROOT}/etc/povray/${version_dir}/ to ${EROOT}/etc/povray/"
-					break
-				fi
-			done
-		fi
-	done
-}
diff --git a/media-gfx/povray/povray-3.7.0.0-r6.ebuild b/media-gfx/povray/povray-3.7.0.0-r6.ebuild
new file mode 100644
index 000000000000..2f37892249f4
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0.0-r6.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic virtualx
+
+POVRAY_MAJOR_VER=$(ver_cut 1-3)
+POVRAY_MINOR_VER=$(ver_cut 4)
+if [[ -n ${POVRAY_MINOR_VER} ]]; then
+	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
+	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
+else
+	MY_PV=${POVRAY_MAJOR_VER}
+fi
+
+DESCRIPTION="The Persistence of Vision Raytracer"
+HOMEPAGE="https://www.povray.org/"
+SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}_p20160914-fix-c++14.patch.bz2"
+S=${WORKDIR}/${PN}-${MY_PV}
+
+# Upstream claims to have CC-BY-NC-SA-2.5 documentation, but it doesn't seem
+# to actually be in the sources, so we don't distribute it either.
+LICENSE="AGPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug +io-restrictions tiff X"
+
+DEPEND="
+	dev-libs/boost:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	sys-libs/zlib
+	tiff? ( media-libs/tiff:= )
+	X? ( media-libs/libsdl )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-build/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-user-conf.patch
+	"${FILESDIR}"/${P}-automagic.patch
+	"${WORKDIR}"/${P}_p20160914-fix-c++14.patch
+	"${FILESDIR}"/${P}-gcc6-openexr.patch
+)
+
+src_prepare() {
+	[[ ${CHOST} == *-darwin* ]] && \
+		PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch )
+	eapply "${FILESDIR}"/${P}-r1-boost-1.50.patch
+
+	pushd unix &>/dev/null || die
+		pushd config &>/dev/null || die
+		rm -rf \
+			acx_pthread.m4 \
+			ax_boost_base.m4 \
+			ax_boost_thread.m4 \
+			ax_compare_version.m4 \
+			ax_compiler_vendor.m4 \
+			ax_compiler_version.m4 || die
+		popd &>/dev/null || die
+	bash -x prebuild.sh || die
+	popd &>/dev/null || die
+
+	rm -rf libraries || die
+
+	# Change some directories that cannot be adjusted via configure
+	sed \
+		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
+		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
+		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
+		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
+		-e "s:\"/usr/include\":\"${EPREFIX}/usr/include\":" \
+		-e "s:\"/usr/lib\":\"${EPREFIX}/usr/$(get_libdir)\":" \
+		-i configure.ac || die
+
+	sed \
+		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
+		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
+		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
+		-e 's:mkdir_p:MKDIR_P:g' \
+		-i Makefile.am || die
+
+	# The "+p" option on the test command line causes a pause and
+	# prompts the user to interact, so remove it.
+	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/859784
+	# https://github.com/POV-Ray/povray/issues/458
+	# Upstream activity is dead for 3 years now, so don't hold
+	# your breath for a fix.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# Fixes bug 71255
+	if [[ $(get-flag march) == k6-2 ]]; then
+		filter-flags -fomit-frame-pointer
+	fi
+
+	# The config files are installed correctly (e.g. povray.conf),
+	# but the code compiles using incorrect [default] paths
+	# (based on /usr/local...), so povray will not find the system
+	# config files without the following fix:
+	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"/usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"/etc/${PN}\\\"
+
+	# TODO: Restore OpenEXR if upstream start to support OpenEXR 3/imath
+	local myeconfargs=(
+		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)"
+		$(use_enable debug)
+		$(use_enable io-restrictions)
+		--without-openexr
+		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)")
+		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)")
+		$(use_with X x "${EPREFIX}/usr/$(get_libdir)")
+		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes")
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--without-libmkl
+		--disable-pipe
+		--disable-strip
+		--disable-optimiz
+		--disable-optimiz-arch
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	virtx default
+}
+
+pkg_preinst() {
+	# Copy the old config files if they are in the old location
+	# but do not yet exist in the new location.
+	# This way, they can be treated by CONFIG_PROTECT as normal.
+	local conf_file version_dir
+	for conf_file in "${ED}"/etc/"${PN}"/*; do
+		if [[ ! -e "${EROOT}/etc/${PN}/${conf_file}" ]]; then
+			for version_dir in $(echo "${EROOT}"/etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
+				if [ -e "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" ]; then
+					mv "${EROOT}/etc/${PN}/${version_dir}/${conf_file}" "${EROOT}/etc/${PN}" || die
+					elog "Note: ${conf_file} moved from ${EROOT}/etc/povray/${version_dir}/ to ${EROOT}/etc/povray/"
+					break
+				fi
+			done
+		fi
+	done
+}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 23e17c128f5e..1b8ab516b025 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1 +1,2 @@
 DIST rawtherapee-5.10.tar.xz 16943724 BLAKE2B 2d1250a03f2902ffcff666514f9785036c808e9883957f674bfdb9545b2feac8f2313ab819e0cb64f39196bd3db36e8084b52bda6194de9197215824e695809c SHA512 79d6d54f90fec6006d3dff53aca00ccd385c398ebede2f06a223905d69e1045c6ab772bd5aca4bde01d9086c3c03183be22c0df521166b1af63b60bd7d0e1cfc
+DIST rawtherapee-5.11.tar.xz 18005652 BLAKE2B d4b4cb45042faf7eadb1c5bfbd7d1db2a452397d10eb12349d1d0a2ae4b9254beb3ee943cf3ddf40380f31abc653ec2c85fb0d4c8e2b1121402bbd41e74afaf0 SHA512 a37af6d99569a6b427379b76b980be8dca5007bf4ec8fc65663e9e8d13850dd2f547e1633f69ee495df105ca6f0f9ab4daf12beec29c9fff63e2e7e5083813b2
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index aa20bff17b1d..aa96f3399ed7 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -5,4 +5,8 @@
 		<email>bkohler@gentoo.org</email>
 		<name>Ben Kohler</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/Beep6581/RawTherapee/issues</bugs-to>
+		<remote-id type="github">Beep6581/RawTherapee</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/rawtherapee/rawtherapee-5.11.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild
new file mode 100644
index 000000000000..c96b34c9b25b
--- /dev/null
+++ b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/_rc/-rc}
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="https://www.rawtherapee.com/"
+SRC_URI="https://github.com/Beep6581/RawTherapee/releases/download/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="openmp tcmalloc"
+
+RDEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/cairomm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/pangomm:1.4
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	gnome-base/librsvg:2
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/lensfun
+	media-libs/libcanberra[gtk3]
+	media-libs/libiptcdata
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/tiff:=
+	sci-libs/fftw:3.0=
+	sys-libs/zlib
+	x11-libs/gtk+:3
+	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# upstream tested that "fast-math" give wrong results, so filter it
+	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
+	filter-flags -ffast-math
+	# -Ofast enable "fast-math" both in gcc and clang
+	replace-flags -Ofast -O3
+	# In case we add an ebuild for klt we can (i)use that one,
+	# see http://cecas.clemson.edu/~stb/klt/
+	local mycmakeargs=(
+		-DOPTION_OMP=$(usex openmp)
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DCREDITSDIR=/usr/share/${PN}
+		-DLICENCEDIR=/usr/share/${PN}
+		-DCACHE_NAME_SUFFIX=""
+		-DWITH_SYSTEM_KLT="off"
+		-DENABLE_TCMALLOC=$(usex tcmalloc)
+	)
+	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/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest
index e9d63e01bad1..aa74598890dd 100644
--- a/media-gfx/skanpage/Manifest
+++ b/media-gfx/skanpage/Manifest
@@ -1,2 +1,3 @@
 DIST skanpage-23.08.5.tar.xz 1317292 BLAKE2B 2ee8e7db4e08c9f6ecac93789b20fcb862f56da8d44d5540268dd71f5e1e79c93c7d67455c534f2b0a50f4f2f99bcfdc1989dfd6ecafb7bd3c5a7bc15ab8880d SHA512 d5ddd8a52ad42421d79a6817eb3430996a9d968b2f824ca3c5adaf9bef69c60f6270b72a9d87308834b79f3038b6347b242c8fa635fd8c28953533061e21d158
 DIST skanpage-24.05.2.tar.xz 1332884 BLAKE2B 11d66fec7f13a658d652ca2c70d7f46e50d6c965903573ecfd9ffb4d259c7dd4fc9d2155297c9ffff928ae3c22d67b5642f8c4a31852b1b3f582675bcbb8459b SHA512 aa5dcde24a72332986ca68fbb457097ba08fae04c186654094dbff2ebd0f9b22688370f8a87eed54f0e16265a42adb297d189856a276d8cf56227b90dd7c6ab8
+DIST skanpage-24.08.0.tar.xz 1333828 BLAKE2B 2dae5beecf23940c128504c733bd2f5bb1f9aa6dcaa4bfd9882cfa0f68af246bb6b4a662fa242a46f138adf9ef151265de3008a69b0f354241e7970c945d4098 SHA512 a8a22ef563b5c3793ada8465acf42b2fd9c26fecb5afbc7d45540b4f12fb209d289cda4e768a46bf449122ea306028170df8ca41b2a9a68b602b10c1341c0b90
diff --git a/media-gfx/skanpage/skanpage-24.05.2.ebuild b/media-gfx/skanpage/skanpage-24.05.2.ebuild
index 89428258adfb..d19cdc047d27 100644
--- a/media-gfx/skanpage/skanpage-24.05.2.ebuild
+++ b/media-gfx/skanpage/skanpage-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/skanpage/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="ocr"
 
 DEPEND="
diff --git a/media-gfx/skanpage/skanpage-24.08.0.ebuild b/media-gfx/skanpage/skanpage-24.08.0.ebuild
new file mode 100644
index 000000000000..73a1e52e8c7c
--- /dev/null
+++ b/media-gfx/skanpage/skanpage-24.08.0.ebuild
@@ -0,0 +1,49 @@
+# 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/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
index ab7037d8bf25..e6b03c7a30c3 100644
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
+++ b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}/unix"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x64-macos"
 IUSE="doc examples jpeg mpi +opengl openmp png threads"
 
 DEPEND="
diff --git a/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild
index c9922d7c383a..004809937815 100644
--- a/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild
+++ b/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
deleted file mode 100644
index e45cd5e8c87e..000000000000
--- a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Record terminal sessions as SVG animations"
-HOMEPAGE="https://github.com/nbedos/termtosvg"
-SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 2b0fc9216a39..4959eeaa4d0e 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -2,3 +2,5 @@ DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa86
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
 DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110
+DIST xv-6.0.0.tar.gz 5051786 BLAKE2B 42c6e06848c5cc7a3f7da1d5c5b10a7d665601f41eb79bda4b3e904c103e88592da416559adc9565c820c6402c9b03271521f515b8f7c873cc959dfd3b5652e8 SHA512 600fde882e1279b5c7147089790006bcbd4e31ba6220309a272aca43242c56062d4c85b181fb1f2d4b0497f1546347206d7827204c2ebbbabaaf3de40c50191a
+DIST xv-6.0.1.tar.gz 5051856 BLAKE2B 7b7a76e211175776862312b48b1f5f91d1a901fffba2225390715c9e392a380add42eaee0429e0598dce677bbb4311e9bc1a506105b9a63595ab70e6253e6ae7 SHA512 7098a2600dc21f94ef1db3e1b23e79b0cdc989b93d792f891d7a29811037636a5887df88f1ad6df27b12be4b4b348f0cca34fe2ad0a58ed9b1228683f6b0b910
diff --git a/media-gfx/xv/xv-6.0.0.ebuild b/media-gfx/xv/xv-6.0.0.ebuild
new file mode 100644
index 000000000000..2983ac332da6
--- /dev/null
+++ b/media-gfx/xv/xv-6.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic xdg-utils
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859823
+	# https://github.com/jasper-software/xv/issues/25
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/xv/xv-6.0.1.ebuild b/media-gfx/xv/xv-6.0.1.ebuild
new file mode 100644
index 000000000000..2983ac332da6
--- /dev/null
+++ b/media-gfx/xv/xv-6.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic xdg-utils
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/859823
+	# https://github.com/jasper-software/xv/issues/25
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-libs/embree/embree-3.13.5-r1.ebuild b/media-libs/embree/embree-3.13.5-r1.ebuild
new file mode 100644
index 000000000000..44cfda6f3f18
--- /dev/null
+++ b/media-libs/embree/embree-3.13.5-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+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 tutorial ${CPU_FLAGS[@]}"
+REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=media-libs/glfw-3.2.1
+	virtual/opengl
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+	tutorial? (
+		media-libs/libjpeg-turbo
+		>=media-libs/libpng-1.6.34:0=
+		>=media-libs/openimageio-1.8.7:0=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.patch
+	"${FILESDIR}"/${PN}-3.13.5-fix-arm64.patch
+	"${FILESDIR}/${PN}-4.3.2-fix-output-operator.patch"
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/859838
+	# https://github.com/embree/embree/issues/481
+	filter-lto
+
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "m*" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -m*
+
+	# https://bugs.gentoo.org/910164
+	tc-is-clang && filter-lto
+
+	local mycmakeargs=(
+		# Currently Intel only host their test files on their internal network.
+		# So it seems like users can't easily get a hold of these and do
+		# regression testing on their own.
+		-DBUILD_TESTING:BOOL=OFF
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# default
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# default
+		-DEMBREE_FILTER_FUNCTION=ON
+		# default
+		-DEMBREE_GEOMETRY_CURVE=ON
+		# default
+		-DEMBREE_GEOMETRY_GRID=ON
+		# default
+		-DEMBREE_GEOMETRY_INSTANCE=ON
+		# default
+		-DEMBREE_GEOMETRY_POINT=ON
+		# default
+		-DEMBREE_GEOMETRY_QUAD=ON
+		# default
+		-DEMBREE_GEOMETRY_SUBDIVISION=ON
+		# default
+		-DEMBREE_GEOMETRY_TRIANGLE=ON
+		# default
+		-DEMBREE_GEOMETRY_USER=ON
+		# default
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+		# default
+		-DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		# TODO look into neon 2x support
+		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+		# default
+		-DEMBREE_RAY_PACKETS=ON
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_STAT_COUNTERS=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		-DEMBREE_TUTORIALS=$(usex tutorial))
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use tutorial; then
+		mycmakeargs+=(
+			-DEMBREE_TUTORIALS_LIBJPEG=ON
+			-DEMBREE_TUTORIALS_LIBPNG=ON
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild
deleted file mode 100644
index 02aed35aa2cc..000000000000
--- a/media-libs/embree/embree-3.13.5.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 flag-o-matic linux-info toolchain-funcs
-
-DESCRIPTION="Collection of high-performance ray tracing kernels"
-HOMEPAGE="https://github.com/embree/embree"
-SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-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 tutorial ${CPU_FLAGS[@]}"
-REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=media-libs/glfw-3.2.1
-	virtual/opengl
-	ispc? ( dev-lang/ispc )
-	tbb? ( dev-cpp/tbb:= )
-	tutorial? (
-		media-libs/libjpeg-turbo
-		>=media-libs/libpng-1.6.34:0=
-		>=media-libs/openimageio-1.8.7:0=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md readme.pdf )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.patch
-	"${FILESDIR}"/${PN}-3.13.5-fix-arm64.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
-	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable RPM package building
-	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/859838
-	# https://github.com/embree/embree/issues/481
-	filter-lto
-
-	# NOTE: You can make embree accept custom CXXFLAGS by turning off
-	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
-	# any "m*" compile flags. This is because embree builds modules for the
-	# different supported ISAs and picks the correct one at runtime.
-	# "m*" will pull in cpu instructions that shouldn't be in specific modules
-	# and it fails to link properly.
-	# https://github.com/embree/embree/issues/115
-
-	filter-flags -m*
-
-	# https://bugs.gentoo.org/910164
-	tc-is-clang && filter-lto
-
-	local mycmakeargs=(
-		# Currently Intel only host their test files on their internal network.
-		# So it seems like users can't easily get a hold of these and do
-		# regression testing on their own.
-		-DBUILD_TESTING:BOOL=OFF
-		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
-
-		# default
-		-DEMBREE_BACKFACE_CULLING=OFF
-		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
-
-		# default
-		-DEMBREE_FILTER_FUNCTION=ON
-		# default
-		-DEMBREE_GEOMETRY_CURVE=ON
-		# default
-		-DEMBREE_GEOMETRY_GRID=ON
-		# default
-		-DEMBREE_GEOMETRY_INSTANCE=ON
-		# default
-		-DEMBREE_GEOMETRY_POINT=ON
-		# default
-		-DEMBREE_GEOMETRY_QUAD=ON
-		# default
-		-DEMBREE_GEOMETRY_SUBDIVISION=ON
-		# default
-		-DEMBREE_GEOMETRY_TRIANGLE=ON
-		# default
-		-DEMBREE_GEOMETRY_USER=ON
-		# default
-		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
-		# default
-		-DEMBREE_IGNORE_INVALID_RAYS=OFF
-
-		# Set to NONE so we can manually switch on ISAs below
-		-DEMBREE_MAX_ISA:STRING="NONE"
-		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
-		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
-		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
-		# TODO look into neon 2x support
-		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
-		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
-		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
-		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
-		-DEMBREE_RAY_MASK=$(usex raymask)
-		# default
-		-DEMBREE_RAY_PACKETS=ON
-		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=OFF
-		-DEMBREE_STAT_COUNTERS=OFF
-		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
-		-DEMBREE_TUTORIALS=$(usex tutorial))
-
-	# Disable asserts
-	append-cppflags -DNDEBUG
-
-	if use tutorial; then
-		mycmakeargs+=(
-			-DEMBREE_TUTORIALS_LIBJPEG=ON
-			-DEMBREE_TUTORIALS_LIBPNG=ON
-			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-libs/embree/embree-4.3.1-r1.ebuild b/media-libs/embree/embree-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..7459d7d763b4
--- /dev/null
+++ b/media-libs/embree/embree-4.3.1-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+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"
+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[*]}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
+	arm64? ( cpu_flags_arm_neon )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+	"${FILESDIR}/embree-4.3.1-dont-install-tutorials.patch"
+	"${FILESDIR}/${PN}-4.3.2-fix-output-operator.patch"
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+
+	# raise cmake minimum version to silence warning
+	sed -e 's#CMAKE_MINIMUM_REQUIRED(VERSION 3.[0-9].0)#CMAKE_MINIMUM_REQUIRED(VERSION 3.5)#I' \
+	    -i \
+	        CMakeLists.txt \
+	        kernels/rthwif/CMakeLists.txt \
+	        tutorials/embree_info/CMakeLists.txt \
+	        tutorials/minimal/CMakeLists.txt \
+	    || die
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/859838
+	# https://github.com/embree/embree/issues/481
+	filter-lto
+
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "m*" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -m*
+
+	# https://bugs.gentoo.org/910164
+	tc-is-clang && filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# Default culling settings for Blender
+		# (Cycles will not render correctly without these)
+		# Some Embree tests will fail with these settings though...
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_BACKFACE_CULLING_CURVES=ON
+		-DEMBREE_BACKFACE_CULLING_SPHERES=ON
+
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# Make sure that we are using our custom compilie flags
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		# TODO look into neon 2x support
+		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+
+		# TODO figure out sycl support
+		-DEMBREE_SYCL_SUPPORT="no"
+
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		# Tutorial binaries are required by the tests
+		-DEMBREE_TUTORIALS=$(usex test)
+		-DEMBREE_ZIP_MODE=OFF
+	)
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTING=ON
+			-DEMBREE_TESTING_INSTALL_TESTS=OFF
+			-DEMBREE_TESTING_INTENSITY=4
+			# These tutorials are not used by the default tests
+			-DEMBREE_TUTORIALS_GLFW=OFF
+			-DEMBREE_TUTORIALS_INSTALL=OFF
+			-DEMBREE_TUTORIALS_LIBJPEG=OFF
+			-DEMBREE_TUTORIALS_LIBPNG=OFF
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=OFF
+			-DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO="yes"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# NOTE Some Embree tests will fail due to EMBREE_BACKFACE_CULLING settings for blender...
+	local CMAKE_SKIP_TESTS=(
+		'^embree_verify$'
+		'^embree_verify_i2$'
+		'^viewer_models_curves_round_line_segments_3.ecs$'
+		'^viewer_models_curves_round_line_segments_7.ecs$'
+		'^viewer_models_curves_round_line_segments_8.ecs$'
+		'^viewer_models_curves_round_line_segments_9.ecs$'
+		'^viewer_coherent_models_curves_round_line_segments_3.ecs$'
+		'^viewer_coherent_models_curves_round_line_segments_7.ecs$'
+		'^viewer_coherent_models_curves_round_line_segments_8.ecs$'
+		'^viewer_coherent_models_curves_round_line_segments_9.ecs$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_3.ecs$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_7.ecs$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_8.ecs$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_9.ecs$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_3.ecs$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_7.ecs$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_8.ecs$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_9.ecs$'
+		'^hair_geometry$'
+		'^embree_tests$'
+	)
+
+	cmake_src_test
+}
diff --git a/media-libs/embree/embree-4.3.1.ebuild b/media-libs/embree/embree-4.3.1.ebuild
deleted file mode 100644
index 4587a4b2855a..000000000000
--- a/media-libs/embree/embree-4.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 cmake flag-o-matic linux-info toolchain-funcs
-
-DESCRIPTION="Collection of high-performance ray tracing kernels"
-HOMEPAGE="https://github.com/embree/embree"
-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"
-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[*]}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
-	arm64? ( cpu_flags_arm_neon )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	ispc? ( dev-lang/ispc )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md readme.pdf )
-
-PATCHES=(
-	"${FILESDIR}/embree-4.3.1-dont-install-tutorials.patch"
-)
-
-pkg_setup() {
-	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
-	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable RPM package building
-	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
-		-i CMakeLists.txt || die
-
-	# raise cmake minimum version to silence warning
-	sed -e 's#CMAKE_MINIMUM_REQUIRED(VERSION 3.[0-9].0)#CMAKE_MINIMUM_REQUIRED(VERSION 3.5)#I' \
-	    -i \
-	        CMakeLists.txt \
-	        kernels/rthwif/CMakeLists.txt \
-	        tutorials/embree_info/CMakeLists.txt \
-	        tutorials/minimal/CMakeLists.txt \
-	    || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/859838
-	# https://github.com/embree/embree/issues/481
-	filter-lto
-
-	# NOTE: You can make embree accept custom CXXFLAGS by turning off
-	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
-	# any "m*" compile flags. This is because embree builds modules for the
-	# different supported ISAs and picks the correct one at runtime.
-	# "m*" will pull in cpu instructions that shouldn't be in specific modules
-	# and it fails to link properly.
-	# https://github.com/embree/embree/issues/115
-
-	filter-flags -m*
-
-	# https://bugs.gentoo.org/910164
-	tc-is-clang && filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
-
-		# Default culling settings for Blender
-		# (Cycles will not render correctly without these)
-		# Some Embree tests will fail with these settings though...
-		-DEMBREE_BACKFACE_CULLING=OFF
-		-DEMBREE_BACKFACE_CULLING_CURVES=ON
-		-DEMBREE_BACKFACE_CULLING_SPHERES=ON
-
-		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
-
-		# Make sure that we are using our custom compilie flags
-		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
-
-		# Set to NONE so we can manually switch on ISAs below
-		-DEMBREE_MAX_ISA:STRING="NONE"
-		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
-		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
-		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
-		# TODO look into neon 2x support
-		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
-		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
-		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
-		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
-		-DEMBREE_RAY_MASK=$(usex raymask)
-
-		# TODO figure out sycl support
-		-DEMBREE_SYCL_SUPPORT="no"
-
-		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=OFF
-		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
-		# Tutorial binaries are required by the tests
-		-DEMBREE_TUTORIALS=$(usex test)
-		-DEMBREE_ZIP_MODE=OFF
-	)
-
-	# Disable asserts
-	append-cppflags -DNDEBUG
-
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_TESTING=ON
-			-DEMBREE_TESTING_INSTALL_TESTS=OFF
-			-DEMBREE_TESTING_INTENSITY=4
-			# These tutorials are not used by the default tests
-			-DEMBREE_TUTORIALS_GLFW=OFF
-			-DEMBREE_TUTORIALS_INSTALL=OFF
-			-DEMBREE_TUTORIALS_LIBJPEG=OFF
-			-DEMBREE_TUTORIALS_LIBPNG=OFF
-			-DEMBREE_TUTORIALS_OPENIMAGEIO=OFF
-			-DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO="yes"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# NOTE Some Embree tests will fail due to EMBREE_BACKFACE_CULLING settings for blender...
-	local CMAKE_SKIP_TESTS=(
-		'^embree_verify$'
-		'^embree_verify_i2$'
-		'^viewer_models_curves_round_line_segments_3.ecs$'
-		'^viewer_models_curves_round_line_segments_7.ecs$'
-		'^viewer_models_curves_round_line_segments_8.ecs$'
-		'^viewer_models_curves_round_line_segments_9.ecs$'
-		'^viewer_coherent_models_curves_round_line_segments_3.ecs$'
-		'^viewer_coherent_models_curves_round_line_segments_7.ecs$'
-		'^viewer_coherent_models_curves_round_line_segments_8.ecs$'
-		'^viewer_coherent_models_curves_round_line_segments_9.ecs$'
-		'^viewer_quad_coherent_models_curves_round_line_segments_3.ecs$'
-		'^viewer_quad_coherent_models_curves_round_line_segments_7.ecs$'
-		'^viewer_quad_coherent_models_curves_round_line_segments_8.ecs$'
-		'^viewer_quad_coherent_models_curves_round_line_segments_9.ecs$'
-		'^viewer_grid_coherent_models_curves_round_line_segments_3.ecs$'
-		'^viewer_grid_coherent_models_curves_round_line_segments_7.ecs$'
-		'^viewer_grid_coherent_models_curves_round_line_segments_8.ecs$'
-		'^viewer_grid_coherent_models_curves_round_line_segments_9.ecs$'
-		'^hair_geometry$'
-		'^embree_tests$'
-	)
-
-	cmake_src_test
-}
diff --git a/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch b/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch
new file mode 100644
index 000000000000..9c28796905a5
--- /dev/null
+++ b/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch
@@ -0,0 +1,43 @@
+https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d.patch
+https://bugs.gentoo.org/938522
+https://bugs.gentoo.org/937275
+
+From cda4cf1919bb2a748e78915fbd6e421a1056638d Mon Sep 17 00:00:00 2001
+From: Daniel Opitz <daniel.opitz@intel.com>
+Date: Mon, 13 May 2024 10:17:51 +0200
+Subject: [PATCH] fix output operator, issue #486
+
+---
+ kernels/geometry/pointi.h     | 4 ++--
+ kernels/subdiv/bezier_curve.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kernels/geometry/pointi.h b/kernels/geometry/pointi.h
+index f81edb9035..aba8ec4ab3 100644
+--- a/kernels/geometry/pointi.h
++++ b/kernels/geometry/pointi.h
+@@ -210,9 +210,9 @@ namespace embree
+     };
+ 
+     /*! output operator */
+-    friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
++    friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)
+     {
+-      return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
++      return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";
+     }
+ 
+    public:
+diff --git a/kernels/subdiv/bezier_curve.h b/kernels/subdiv/bezier_curve.h
+index 257e0afd40..5e3b5c83b3 100644
+--- a/kernels/subdiv/bezier_curve.h
++++ b/kernels/subdiv/bezier_curve.h
+@@ -135,7 +135,7 @@ namespace embree
+       }
+       
+       friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
+-        return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
++        return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
+       }
+     };
+   
diff --git a/media-libs/fcft/fcft-3.1.8.ebuild b/media-libs/fcft/fcft-3.1.8.ebuild
index 3c6a695d8fbc..b8c1c1261ae9 100644
--- a/media-libs/fcft/fcft-3.1.8.ebuild
+++ b/media-libs/fcft/fcft-3.1.8.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 # ZLIB for nanosvg
 LICENSE="MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64 ~riscv"
 IUSE="examples +harfbuzz +libutf8proc test"
 REQUIRED_USE="
 	libutf8proc? ( harfbuzz )
diff --git a/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..9625b90cad74
--- /dev/null
+++ b/media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="DSSI Soft Synth Interface"
+HOMEPAGE="https://dssi.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/dssi/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	media-libs/dssi
+	media-libs/liblo
+	media-sound/fluidsynth:=
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fluidsynth2.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index a6eb898bf1d5..00262952f604 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,2 +1 @@
-DIST freeglut-3.4.0.tar.gz 413389 BLAKE2B 47b073c4e81473417358452ede3891b6fc36e324f66eec42fcbbadebb2144680e3b52caded504135239e170fd8f30a1fe8b6666a746b06d48cd7226c98a8114e SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
 DIST freeglut-3.6.0.tar.gz 429619 BLAKE2B c42985013aafbe0e21369295f67355f2b498f284289fceed9baff5de6a46b7fee2a2ee07e00c136f65caa9159b635df82030a112eae101f9f82751abd76636e4 SHA512 ceb5dd9ea86e915acb177e405e79b92f77cf3213ba21fe200491d0b1150dd9c81835b71cb8a928bd514eb719626ff802250429df2f6dfa33f8e181c3f74b2dd0
diff --git a/media-libs/freeglut/freeglut-3.4.0.ebuild b/media-libs/freeglut/freeglut-3.4.0.ebuild
deleted file mode 100644
index ce65b37fa2d0..000000000000
--- a/media-libs/freeglut/freeglut-3.4.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 ~ia64 ~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/glycin-loaders/glycin-loaders-1.1_beta-r1.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1_beta-r1.ebuild
new file mode 100644
index 000000000000..0775282f7108
--- /dev/null
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1_beta-r1.ebuild
@@ -0,0 +1,88 @@
+# 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_beta.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1_beta.ebuild
deleted file mode 100644
index 010fd073ec89..000000000000
--- a/media-libs/glycin-loaders/glycin-loaders-1.1_beta.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 release dev)
-		-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/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 403efc1f850a..b3819bfb2b57 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,3 +1,5 @@
 DIST intel-gmmlib-22.3.19.tar.gz 846342 BLAKE2B ce3c25740d9c3f556db31f880b47fba8358dd7d7d53d80bc9923bec8c67fdeee3ae4efa5465390c229bfdc2f6c64fa0a7963516f83d12061d34bf51102cb3a64 SHA512 804e4995983884832dbb6d08a4e3c8ca8d60e7ef2c5a0de12d0facfac1fdce619ad229ad1a6b62fdf0ba74a968caf3bb884e283af8cf38babacff350fc9728b9
 DIST intel-gmmlib-22.4.1.tar.gz 867162 BLAKE2B cc3dea9441f1b21b95595d5674046afec5ae673c6244b94572ba11d3451ddb9dae8adce9fe4310a5a0de3c723a3b7aef1031b9ca53f54b63fbefe43fadb7c2d1 SHA512 b44bd2f18ed97446c2e4f5ca7119cfde63f249fe8b5f23f0a531a2ec724aa51fe70014320d8f6dee85246df8ce220d5938654483d276eda60027162e304a3b64
 DIST intel-gmmlib-22.5.0.tar.gz 867541 BLAKE2B 89ac0fdac7212ea1122140357f04ffe67a27d4d743615b4d97121931370f44568cdcccfbeb681d8fe564b269f4fe1c0f47b50c9e7cc2ce44863d03ec47a75bdb SHA512 f4f33197cf635a71c02d1027f96268b0ebac66ba765b1b6d4d827b9cd7a044197a9a042371c5bf6550110b9d5b127bcf63627124a338cc9e8ee1e8bc1d90dbc2
+DIST intel-gmmlib-22.5.1.tar.gz 867534 BLAKE2B 2ea81d4444f5c79c87ccba1edaf5e00e88a7c95c1d236f55fa8b0776f31ea91acb54c99d0c3e13199183827b94f7c1f7136e40442ae30298093a0b86fdf61085 SHA512 515268f6451b5f822338820a121cb436cf73920afa1b092855188cf1b4fc8e11b3ed6d8481ba7c686aa4242fdd2f26ff9657ae9293df8197a428b0151ee4871f
+DIST intel-gmmlib-22.5.2.tar.gz 867665 BLAKE2B 64559ec6489614df352ba58d25f8706c234f3cff008228a7056e29d92584fab27af311fdb3db8c2e4f6983598019c646df8761ed422a47bcdbff02e79896d613 SHA512 516e2cc0d678d8fd44d8d2b1bfdf61c05670c01c906bd7f55a807846cd6399d4b616f86e6a1d85e2a6a0480c4616a40e9d5b29a3f45fbf588cc4d725ada71d49
diff --git a/media-libs/gmmlib/gmmlib-22.4.1.ebuild b/media-libs/gmmlib/gmmlib-22.4.1.ebuild
index 2a09f24b8f3d..0a7ae2c25cdb 100644
--- a/media-libs/gmmlib/gmmlib-22.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.4.1.ebuild
@@ -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/gmmlib/gmmlib-22.5.1.ebuild b/media-libs/gmmlib/gmmlib-22.5.1.ebuild
new file mode 100644
index 000000000000..2a09f24b8f3d
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 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/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-22.5.2.ebuild b/media-libs/gmmlib/gmmlib-22.5.2.ebuild
new file mode 100644
index 000000000000..2a09f24b8f3d
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 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/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 89b1d23bc78e..a2ae4a520af7 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,2 @@
-DIST harfbuzz-8.4.0.tar.xz 19241260 BLAKE2B 03d6bf0f70354d01ee85edb9fb80d48a91301f862f94f66fddc57ec808105dbeea013e595e2ee616d364773bb68bf5135d4cd44f31a5d3894952a1dced98855c SHA512 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a SHA512 d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c
 DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6 SHA512 2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af
diff --git a/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
deleted file mode 100644
index 2035e9dc70fb..000000000000
--- a/media-libs/harfbuzz/harfbuzz-8.4.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-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 ~ia64 ~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 #726120
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-
-	# bug #762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		# ICU 75 needs C++17 (bug #931090)
-		-Dcpp_std=c++17
-
-		-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/harfbuzz/harfbuzz-8.5.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
index 1d243727ad03..2035e9dc70fb 100644
--- a/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild
index a5dd866908b4..9519175f9036 100644
--- a/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild b/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
index 082451374d7e..2f0eabe1a3c2 100644
--- a/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
+++ b/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://downloads.sourceforge.net/openicc/OpenICC-Profiles/${P}.tar.bz2
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index bd3dfbc13059..f909bb35f308 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,5 +1,2 @@
-DIST jasper-4.0.0.tar.gz 1975127 BLAKE2B d4d8ae3324f3753e999adee57c215b89fa0ddeb3d945f10de15459a7d6566f1de9cbcd27a418bcc3c128bc138fff7e3f1cc157b6750d2d7dc1216f8e8cbc8bea SHA512 dc03434870e85b1fdbdf41a3e07ce5a8044c8d225717d3d7a5969d45e3bd716bfb2abc4b4e0b8cec2f4071a7520c5d3e48939dba0cabe6d192eacd593de0c563
-DIST jasper-4.1.1.tar.gz 1979438 BLAKE2B 7f72c7f5633b7b0b119733ea7cdaa51684d3593ea19de21ae45f036ac79245b418b4f72a90f4b7d458b38ea480f008a8b67a74a0c4f440c9d86f76419e04e712 SHA512 a15c196d7e448fb3c8b6512793d4b430e58ba6adf343b46392cac0880ae8c385cd75b43dd566c4a25baab983089cb95c00ae538dc0b84282cc98f2a9ce398d43
-DIST jasper-4.1.2.tar.gz 1982427 BLAKE2B 36f1e5abb90f6e684ab9b9479e3f28318c75e1f1cd71dfa9f84f00fca2e04ebec393b48ceec1db02d2777cb09fbf0f425cef017958aec1c7f6fd66277c370baa SHA512 ab3cc1e2a4b4232510eba89d03363ed1a9f74ee981e2e7eeef21d185dbc12f2efa5cc0e281c5d20adf1d3d0f95a44f7b0ece8fd304e26bdcd1ff352dbf398367
-DIST jasper-4.2.0.tar.gz 1980712 BLAKE2B 1f01775b23f368ae8380569e82026f24f82eeee1d5dc4f023ab844c3ae14007c79c416860efb414e620059824a2923d6bd3ffa1b4914eb7e11e247016ebead55 SHA512 31da8f49cec3ba2a3bb9ba40fa54fe64c97d1e564631c980619f0b3ffca36814adc6c2cb8dc1ead774a15546f308e7a33990821538d1e7b6c885b14ed4e1f711
 DIST jasper-4.2.2.tar.gz 1980836 BLAKE2B b5b1f1e27904bf3c884c43bd338b836425a68e5162e1e3dce320ac3cd5a0150cfe7e39a2709590378a33fd43eee3f7abe4d1d4d86bc99c0d58061a97cd9751a5 SHA512 5c5e0efae1c00a57d85ca5aa70f2cc332bb45db15e56f022c52a11f4ac8f995412896d62fcaa3b7f390a85de70aa56c421a9ab8e5945048ac94b19847eed67bd
+DIST jasper-4.2.4.tar.gz 1987060 BLAKE2B ff65214e4a18a9853e8c441ddc3b0908534db5d625aa4e4dd5d60536d150fcbd068cf0fdd4ca36d4c7047c91b02ac9721e85563c435b9f75db980c64b6d3629f SHA512 4552e4823e08f7cb444d5835f30180ae1631b1784078769f0c1d51f40dd3bb6c8a1e960147d07312164dbb3b489561d06ee8f75112e76dbba8aacfd09c7d03e4
diff --git a/media-libs/jasper/jasper-4.0.0.ebuild b/media-libs/jasper/jasper-4.0.0.ebuild
deleted file mode 100644
index 335732079920..000000000000
--- a/media-libs/jasper/jasper-4.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://jasper-software.github.io/jasper"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jasper-software/jasper.git"
-else
-	SRC_URI="https://github.com/jasper-software/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
-	S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-LICENSE="JasPer2.0"
-SLOT="0/7"
-IUSE="doc heif jpeg opengl"
-
-RDEPEND="
-	heif? ( media-libs/libheif:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-shells/bash
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-		virtual/latex-base
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_PROGRAM="${BROOT}"/bin/bash
-
-		# documentation
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package doc LATEX)
-
-		# HEIF
-		-DJAS_ENABLE_LIBHEIF=$(usex heif)
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/jasper/jasper-4.1.1.ebuild b/media-libs/jasper/jasper-4.1.1.ebuild
deleted file mode 100644
index 335732079920..000000000000
--- a/media-libs/jasper/jasper-4.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://jasper-software.github.io/jasper"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jasper-software/jasper.git"
-else
-	SRC_URI="https://github.com/jasper-software/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
-	S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-LICENSE="JasPer2.0"
-SLOT="0/7"
-IUSE="doc heif jpeg opengl"
-
-RDEPEND="
-	heif? ( media-libs/libheif:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-shells/bash
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-		virtual/latex-base
-	)"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_PROGRAM="${BROOT}"/bin/bash
-
-		# documentation
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package doc LATEX)
-
-		# HEIF
-		-DJAS_ENABLE_LIBHEIF=$(usex heif)
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/jasper/jasper-4.1.2.ebuild b/media-libs/jasper/jasper-4.1.2.ebuild
deleted file mode 100644
index 6540d3819942..000000000000
--- a/media-libs/jasper/jasper-4.1.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://jasper-software.github.io/jasper"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jasper-software/jasper.git"
-else
-	SRC_URI="https://github.com/jasper-software/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
-	S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-LICENSE="JasPer2.0"
-SLOT="0/7"
-IUSE="doc heif jpeg opengl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	heif? ( media-libs/libheif:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-shells/bash
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-		virtual/latex-base
-	)
-	test? ( media-libs/openjpeg )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.2-which-hunt.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_PROGRAM="${BROOT}"/bin/bash
-
-		# documentation
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package doc LATEX)
-
-		# HEIF
-		-DJAS_ENABLE_LIBHEIF=$(usex heif)
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/jasper/jasper-4.2.0.ebuild b/media-libs/jasper/jasper-4.2.0.ebuild
deleted file mode 100644
index 47b363a4f06e..000000000000
--- a/media-libs/jasper/jasper-4.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://jasper-software.github.io/jasper"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jasper-software/jasper.git"
-else
-	SRC_URI="https://github.com/jasper-software/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
-	S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-LICENSE="JasPer2.0"
-SLOT="0/7"
-IUSE="doc heif jpeg opengl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	heif? ( media-libs/libheif:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-shells/bash
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-		virtual/latex-base
-	)
-	test? ( media-libs/openjpeg )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_PROGRAM="${BROOT}"/bin/bash
-
-		# documentation
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package doc LATEX)
-
-		# HEIF
-		-DJAS_ENABLE_LIBHEIF=$(usex heif)
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/jasper/jasper-4.2.4.ebuild b/media-libs/jasper/jasper-4.2.4.ebuild
new file mode 100644
index 000000000000..2c68c17ea760
--- /dev/null
+++ b/media-libs/jasper/jasper-4.2.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="https://jasper-software.github.io/jasper/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jasper-software/jasper.git"
+else
+	SRC_URI="https://github.com/jasper-software/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~x86"
+	S="${WORKDIR}/${PN}-version-${PV}"
+fi
+
+LICENSE="JasPer2.0"
+SLOT="0/7"
+IUSE="doc heif jpeg opengl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+		virtual/glu
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-shells/bash
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+		virtual/latex-base
+	)
+	test? ( media-libs/openjpeg )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_PROGRAM="${BROOT}"/bin/bash
+
+		# documentation
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc LATEX)
+
+		# HEIF
+		-DJAS_ENABLE_LIBHEIF=$(usex heif)
+
+		# JPEG
+		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+
+		# OpenGL
+		-DJAS_ENABLE_OPENGL=$(usex opengl)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild
index ba108063e02c..b60c60996e84 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
index fd572618ff8e..b93e7ce73c7a 100644
--- a/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild
index 972d1b517f15..23b504c78829 100644
--- a/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.3.0-r100.ebuild
@@ -13,7 +13,7 @@ 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"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/ksanecore-common/Manifest b/media-libs/ksanecore-common/Manifest
new file mode 100644
index 000000000000..6f41a2b4fbb9
--- /dev/null
+++ b/media-libs/ksanecore-common/Manifest
@@ -0,0 +1,2 @@
+DIST ksanecore-24.05.2.tar.xz 51080 BLAKE2B c57152bbff1c3eb4c6de3f20809d9e3a7ec5c81c981823e3750142006f1c6ac0f7bfc5913042edfcaa6a8e2f2210c8dc8963097d60dffc153ffb9078e3ca13bd SHA512 862c5997f0e10e6b3382127fe1d5efee37621212f2ec70a5346bf914cbe6ff9d1476cd05b119e0784222c8a195787f30b4454aaeeeb9535d0d52362a7ba0a718
+DIST ksanecore-24.08.0.tar.xz 51200 BLAKE2B 787692d39738ec2bd93988399238f8e3d08ad753bde702e8fd24d6b9c6db3f24f1b061336b0a917b9e421b03f23fa46bef664dae24b38acfc483d68801e303ba SHA512 7e5f144811110cdb18f06ef163ba6ddf3bf270eefe654f6c53d1f2e91a28d2729f034c691a8439206a0514839edcff5d75d69e7ca4d6b191b981c931ed5c06e2
diff --git a/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild
new file mode 100644
index 000000000000..d598909ef7f0
--- /dev/null
+++ b/media-libs/ksanecore-common/ksanecore-common-24.05.2.ebuild
@@ -0,0 +1,18 @@
+# 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 ~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.08.0.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.08.0.ebuild
new file mode 100644
index 000000000000..3fd16d901523
--- /dev/null
+++ b/media-libs/ksanecore-common/ksanecore-common-24.08.0.ebuild
@@ -0,0 +1,18 @@
+# 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 ~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/metadata.xml b/media-libs/ksanecore-common/metadata.xml
new file mode 100644
index 000000000000..e2881717c482
--- /dev/null
+++ b/media-libs/ksanecore-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">libraries/ksanecore</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/ksanecore/Manifest b/media-libs/ksanecore/Manifest
index 5a1962229b68..f1627e4f46ec 100644
--- a/media-libs/ksanecore/Manifest
+++ b/media-libs/ksanecore/Manifest
@@ -1,2 +1,3 @@
 DIST ksanecore-23.08.5.tar.xz 50052 BLAKE2B 500c574d40a8c927cd8568d3d0094789731b58cbe64de8ff04ee993adb8503cbb4d999d14c3222d142bb2485f1131dfe45c0a6a305347180e1021d1aa661d020 SHA512 93bbb6160c063e54be4cb115cf164354fb545ff458aa2066d98a38e81d48dfed4260a4b2afcb252ba43cf25ed102345018e0ad99b7ca66b9cb0b2fb64235b440
 DIST ksanecore-24.05.2.tar.xz 51080 BLAKE2B c57152bbff1c3eb4c6de3f20809d9e3a7ec5c81c981823e3750142006f1c6ac0f7bfc5913042edfcaa6a8e2f2210c8dc8963097d60dffc153ffb9078e3ca13bd SHA512 862c5997f0e10e6b3382127fe1d5efee37621212f2ec70a5346bf914cbe6ff9d1476cd05b119e0784222c8a195787f30b4454aaeeeb9535d0d52362a7ba0a718
+DIST ksanecore-24.08.0.tar.xz 51200 BLAKE2B 787692d39738ec2bd93988399238f8e3d08ad753bde702e8fd24d6b9c6db3f24f1b061336b0a917b9e421b03f23fa46bef664dae24b38acfc483d68801e303ba SHA512 7e5f144811110cdb18f06ef163ba6ddf3bf270eefe654f6c53d1f2e91a28d2729f034c691a8439206a0514839edcff5d75d69e7ca4d6b191b981c931ed5c06e2
diff --git a/media-libs/ksanecore/ksanecore-23.08.5-r1.ebuild b/media-libs/ksanecore/ksanecore-23.08.5-r1.ebuild
deleted file mode 100644
index c278b5293f21..000000000000
--- a/media-libs/ksanecore/ksanecore-23.08.5-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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="kf6compat"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild b/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..43036a353e7e
--- /dev/null
+++ b/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+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="5"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild b/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..3e7842beb286
--- /dev/null
+++ b/media-libs/ksanecore/ksanecore-24.05.2-r1.ebuild
@@ -0,0 +1,30 @@
+# 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 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.05.2.ebuild b/media-libs/ksanecore/ksanecore-24.05.2.ebuild
deleted file mode 100644
index ddbaeecf5c0e..000000000000
--- a/media-libs/ksanecore/ksanecore-24.05.2.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
-
-KFMIN=6.3.0
-QTMIN=6.6.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}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
diff --git a/media-libs/ksanecore/ksanecore-24.08.0.ebuild b/media-libs/ksanecore/ksanecore-24.08.0.ebuild
new file mode 100644
index 000000000000..625b222fc648
--- /dev/null
+++ b/media-libs/ksanecore/ksanecore-24.08.0.ebuild
@@ -0,0 +1,30 @@
+# 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/metadata.xml b/media-libs/ksanecore/metadata.xml
index b98c4cab03b5..2016639ee2e5 100644
--- a/media-libs/ksanecore/metadata.xml
+++ b/media-libs/ksanecore/metadata.xml
@@ -8,7 +8,4 @@
 	<upstream>
 		<remote-id type="kde-invent">libraries/ksanecore</remote-id>
 	</upstream>
-	<use>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
index 72e98a8a227b..4e13106ace75 100644
--- a/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
+++ b/media-libs/libdisplay-info/libdisplay-info-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/${PV}/download
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libdovi/Manifest b/media-libs/libdovi/Manifest
index ba3697e7ef1b..e511f805d30b 100644
--- a/media-libs/libdovi/Manifest
+++ b/media-libs/libdovi/Manifest
@@ -1,17 +1,11 @@
 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.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
 DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
-DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
-DIST bitstream-io-2.2.0.crate 34113 BLAKE2B a449d31429b3aed5ec54c2590d285a532377c7d5e614eb785e11bb208c3541d1df8c439999202ac52227544ca42008a60b0989696ed0888ef2bfdedbc23f6b95 SHA512 51d328fb67df4d89f755769cb8806249349d9d69a4c1c538f72120b058fb7fed81356b867363396234a96061da92446c6e07b6498c7bf9c1f3f99de60aad3f2f
 DIST bitstream-io-2.5.0.crate 37723 BLAKE2B b9841766c4cfb1a669a8f180d9e2a0ed110a60f535fb69046859d740b672f78ee12fb805c2323164868a2dcfe6b55f8a6ee5e59003088a7533a5e537b02158e1 SHA512 8db74c147412c2ea335455d740cb2ef33be8ec0c3ffba08fdfd3983515abd8b47621d178bf1290a7830a9f15bd32912d17b3df7d39e9ac786970a868b8ed76d3
 DIST bitvec-1.0.1.crate 224375 BLAKE2B 9f109db6888cf73d69646911cc1c9e90535e54a7afc436d878bbc63ca20a30cc6e5b5b5cd42aa78c38df5a4012454769c126f9072f39d58bdd09e54887ba6d9f SHA512 83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e
-DIST bitvec_helpers-3.1.4.crate 5139 BLAKE2B 2f1b430e1548f82887b7e42750dbb5dce2288dfa4694a77dafc23687630af5b5289a22292c44a881f0a4bc23dd68cc247e868bb4def4f8c0258ddca169cdb4fe SHA512 fa1e3434b5b21d72b20b3b20f7359d24e882a6b3822231fe1cb060ae846c74e14990a69611aa79a4797906c6658413a505b6d4aeb20734fc76d70a370d2eda69
 DIST bitvec_helpers-3.1.5.crate 5147 BLAKE2B 4f9b297493abfdc6c8ea38db2c8bcaa23787d4aba746a9b0682afd27e7b04a1ffeeb5a51bdc3ea76080972de44321e5264a3e5150910f819178a73dfe78c4d95 SHA512 08ba37eb2c1d68ace18e82afe8e5f6a46259e44d3b3625234f68059acd72d53badc0016c1e9fb323488e85d7c7db5f8b8d8af14a3a947a98545492a49b218f65
-DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8
 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
@@ -19,82 +13,51 @@ DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05
 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.13.crate 56267 BLAKE2B 233f2fb4405ee2ff669220214c13b6c94858dbc375c8bf7eb83d7488690d74ebd8e1514679e02d1354b493b6e37fd7ed4b2ae32065d115a7287014aece90c2af SHA512 dd1a42ad3bf39463966c2ef76f3ec2dc5a847160bcd73de1718bd6706790f1ace183e3c9e6ee8d06f6ddea4b9bf30c884fa97d36b44f30dac26a85a52d9a0025
-DIST clap-4.5.3.crate 55388 BLAKE2B c0de02441b38bf4a4c7879997e70a8c0b55d41ac60ea2d918a3eaf7933ac9105a22cd59def6e7260066ab2d12ba32f13b26f4fffaa6303ed4e4f33622ac9c9c8 SHA512 735be90c75211cd8d77f014c8b91782246c652e92da810877a44ab4c9dc0b4ff9637640da04d57a17cd1550df1eba73d91d49d2e7a73815010c5d6a5017aaa9d
 DIST clap_builder-4.5.13.crate 164093 BLAKE2B f938635782ba9c1a675bc15a73a36ee7f1cbee501dd10be6f267364fde125c75474e5abe226e0eaf0c9fb224887c65bbc1be4641ca093282d3042f9980f4ab94 SHA512 ab7a29b29a15d22701550fc590ca6ec256edf03828e2b9a87072734a8f66b6e5a1843ac2ee7856c62472960af4e8f40840f840adb78ce5afca918f333e0f623f
-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 clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
-DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5
 DIST crc-3.2.1.crate 15070 BLAKE2B 9d5f488b57bc232528cfb8d9ef33a88d25d904395dfac8dc10e864dc0d6c89e576585195a20db585fe358859ec50afa998562ad6becf6fd2e505f3969eb36ed8 SHA512 64b7272d8cf55efe9768f9f3218f83302ccb59458a56fe3b7b2de1a53eb5a3b57fbf268647fdba5b230cccdd4058462ba583d76870ba12cb1057ac2787f181db
 DIST crc-catalog-2.4.0.crate 10155 BLAKE2B a9c3ef81871d72635addf1ded611fa6e963b9b128dda198eaa3a256512c8759608bae95df95524704aeb38f81e2fb6c2da2e29e306a8ed3dea595e63cdf05638 SHA512 25536456fe71c44fd8ec527299339c1d186f6e12f1f90142de60eabce337d836c2497ddd6307473b57a6cc720cfc8e29b059f378c70b8165bc171420ccb40a29
 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.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 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 crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
-DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST funty-2.0.0.crate 13160 BLAKE2B db6315d63fffe9f70698da0b1b0e4aea4b509242c60e6639f00303dad8d2ba60c6c1c04fe9289695b7aa2d7a0c90c31fba72656afa7ad111b77358772b14a9f5 SHA512 691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155
-DIST half-2.4.0.crate 50666 BLAKE2B 5175650e5cb9fa08a5d45ce35b76b15454d27f214d9b9236902ffab71834b342beba0654f9c85fc796bbb499a1a979b60714a5bf7666d1faf59d61530073adbd SHA512 7357a0f84dc6ae394efdd464f5a6da2bafa48bf8d794b2c34d1507d4d66af31ece8a012b58e6f76eacea2c249488a12c20f8c7e516ddd42a70633c9dbaa13bf5
 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 hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
-DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST indexmap-2.3.0.crate 83027 BLAKE2B c42cd83845923e68f9035de2d0645dfd5f37edab8b5f076c5d578867e721403b71cc48c5a68166e03688be96995c73cb81d0f2583aae8e24eb554a432854cf84 SHA512 035f76873c8f94dc0ebf8e2cd29c157135a1a6b5fe042997bd30a928227f6257a19dfbc43ea9b50cee425fabdfbe0ef6704627126ae5cc937855d6c91fca0958
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
-DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libdovi-3.3.0.tar.gz 459528 BLAKE2B 3582253118807b2171033d385194b40b439c097e1cbf786aa69872b88473ef49898390cddefdfdb3d5c55c2f44114522d2ea484b0a7a7d1e847056b3b5ae7c22 SHA512 f4d183305aee54aeaf2226b7f2848a81c0f99fe0368dcae09eb92b65dd85496b05ffb6d44ce16e04fab03a7a408de8f53c4654f67b286260c2c574f2d5afb579
 DIST libdovi-3.3.1.tar.gz 460353 BLAKE2B e6431f3e81d23e0ef4fcff52e82d9d55a86920ab2ae023d731369a9732bb2a41828a1815282ac2356ecac9e9112238b48a0ad1b3dcd355223de384a1ee8a2390 SHA512 f7240f2761aad5cc662ba401a81b4314a3a32a5b7ee1ce5b21497c767c40279438819184efe3de6e3faa7477b422fc9e9ab9177256c321fab8099e83933ea3ea
-DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
-DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
-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 once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562
-DIST plotters-0.3.5.crate 143975 BLAKE2B 57b9b37d9e5f43f12f1bbd95d0c0789a09b2f34b30278c62d8637f341a901ac4c0d70ce4a4f869429a43cafaab637d2f25af3eff12354b0e85b184f439c91320 SHA512 38bd608db346161ffa04c50aa315bf5d5eb2840490c5ad6722b9e294b8aacc3c434a1c6de073d2a29cb34de6cdc6260a227f9b7995ffbe75fbb8783708f50045
 DIST plotters-0.3.6.crate 147577 BLAKE2B 835e4bb81728d0c8199d33269d36e534064c8a7c2ba21cbc6d13ecee644b5dd6f4e8f743920770978133b70a168dfeeacc7979609f6904bbeb217c0361a17c70 SHA512 373a0ff61df8feeaaa0c32001a5354c7e1c2dee235aa76d1e8d3f98dd92479da07260f9e09f76ffd9467893eb6209dfcf751206e0603ccd21041f56d434560e6
-DIST plotters-backend-0.3.5.crate 13440 BLAKE2B 72ba042a2057f7afebad34a794df17a0c340ae0d15af2631a3f3abbe117dd8a8d17f877dd935ad59f33494c523664cbd4fc11e05f6c7ae0c495b5e9d4c4a8708 SHA512 4468e2619d7fe47cd03fefa8b1d901ddf5cd47b2899b4b9082cfb695f315cbe415fd57efbef6e0a67eb51dd8edad530c15442810fbb87dfc4b7943b1a7f55460
 DIST plotters-backend-0.3.6.crate 13669 BLAKE2B 33c8feb8589ea4c3a9bf02a28b4d841d5e716e79db33bdb923caa21448039283dc7d926d10fcc6058bd7ae503d71b2fec5b5682d0265f899f9f9ddcd9f4b125e SHA512 d25418e21560b9020cdbf687900d306c2fd03c4517ebf61c5992441674f4be70ec0b36ec40d065e934e0f148a2348cdcee4508bae3fba8166fbb3769312b66bf
-DIST plotters-svg-0.3.5.crate 6948 BLAKE2B 1e8df5cdf68b1e27e22ef2f383a81caf76ab598d09f31c536e86c543df78a609a33c3c426660a34a37d1313cc2937b0c678c5e1e43fd3d65bce95b59b2531935 SHA512 91c4955f62dbb8d80e01e5cbdc7ad5f1869be6025de1d2baeeb9198fb108ad8f01916cdc0728b7123ed9217abe92cdd8ad30116dd454312c8f63bf9cec98644a
 DIST plotters-svg-0.3.6.crate 6944 BLAKE2B e74d2bb5053b698f2a07270000249157ac1e5721e8b290cd60c2c840385e4f41d110be407597ca02633bdc5bfc3a2f3ea5c0f0fe0f800005a04741bace3a4e54 SHA512 62dbae4e7b95c01843c2470776a6a5c45df332846970c688b089cd2dd85dde146cec4cd57e42f9dbe8e994be5fb8906a47a0f8d3cb4a29ac3703ae668d374997
-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 quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST radium-0.7.0.crate 10906 BLAKE2B d576e0ea5c5287bcb6740cee3a3838b6ae4dfdef0ef05d34634b96dba5159e48260233db57a767c9e032fa5d9a5798361335cb19f7844f450113ece30ffbc51d SHA512 51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0
 DIST rayon-1.10.0.crate 180155 BLAKE2B 16cb706d2317d8a349394c521ec5ab550290c5ab2a0a0dc24f0282fa7eb01fd1351a7dc8b5af3a55ea321e6526fbe037fec3cf8b32463166a082a6e417a51fca SHA512 3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3
-DIST rayon-1.9.0.crate 177770 BLAKE2B 34e20aeb82a548bd80b8ab3faf8fd870201ba3d67f9618e5493332a3c43bcf1443c027b8ccc76cec8df6bff852434531a01c8490f829f57df5cfbc3d8a6e8a42 SHA512 c9763503fb135eefdebebb82d4d19d20e48a182f1125030a7df085ebda4184942d9057598194ab8e8d39b942c83c231834b10a677e89badb6305a2b571fc1abc
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
-DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
-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-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
-DIST roxmltree-0.19.0.crate 53547 BLAKE2B 0bf23bb050dec29cdfcd66bb231ea81caab40aa54b015c5480fde7dac899128438ecfb10d818dde456db8ec4cbeebc7f32f3c8ff17594b6a78c0f04f0361555f SHA512 c8eeb974d797316a8dc332c4068b2850eee124a13b0792cdc8acaefe521d8b40161f9159bbfee2866ab2c4f6133ceaaa1b5ed704a5f0db5ae3819d76042cbf36
 DIST roxmltree-0.20.0.crate 54594 BLAKE2B 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603 SHA512 f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91
-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 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_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436
 DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160
-DIST syn-2.0.53.crate 254828 BLAKE2B 4bbff9a430e12baae231eec35dca4a3130e9977c6272dcad4a25266441959461e6e2b69832492a6895948fada9152abf8630c1d011c93912356397360bfb7b8e SHA512 0c3e40e1af47910b59877246700dd695e2bf03c35e036adb99e9756f8e055c8b3421020fc43f71954aa7adfdc56712d58968f3f39ca2e93c0daedfebd8862b9b
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
@@ -107,28 +70,16 @@ DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd
 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-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 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.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50
 DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
-DIST windows_aarch64_gnullvm-0.52.4.crate 433373 BLAKE2B 5678cf2371e4c566b7ff0dd1fabcae92d12ce9f97670524c93fd8c34bf6b09d054e7de2f852302b8d994f52c81015b7cc8a74f529490c7bdd17a3b5d2c88a12e SHA512 dbb914a866873892a8cffecd4ed4977fe6c3fc48a58bb9f88655d86e7f8969cc27e6f5bb7d40eee41ae7d78f6f4be65d46650719321a7697c7b5b99a0f07a5dd
 DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
-DIST windows_aarch64_msvc-0.52.4.crate 828055 BLAKE2B 3088f2f66fc91ad698906315eae7e6c0dd7da5414c28cfa25b24e138fc4a7da40535be09129cd37b8e331d8d6e8c41d0106fba1ef9e5b4ac561140653e9ded4d SHA512 dcc538d0a9c276e7ec415575ec1392bf476219348984d9567f56d5cc7af0f9beeac523a9a6651f763dd4f50f89535a3ea2275d5321ec022c2ee8814e4e84e95b
 DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
-DIST windows_i686_gnu-0.52.4.crate 875736 BLAKE2B 31ee3017a6db246b0d5fc02e10cdb517a69ceac3dbbc9d41b4051f5dfa1196e4a46e7b3f5f90935560c03bb139b897e5dce69989a3698d9c88ebae923e24ef30 SHA512 9d57260744607eb63453040c532bf3693cf3d8d93c56543ee00aa66adf3a71919e72bdef7811f287167403ade893248f189b797a5d2dcb24ef4e6f3d915a88c6
 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.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e
 DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
-DIST windows_x86_64_gnu-0.52.4.crate 831627 BLAKE2B 64d29f6e0837be822d89cc8aaea2514382d2c03b33deb5684df1d6b81573b3817add39d99f66181a762fae7c155e60a8c070affe43a0f2e247fb0c5ddcc7afd9 SHA512 96c673fb330af597fc3c71b53b9b66cacc9f3f64f05dc7cfe4a77447b7545280f065df22b7d91a6b7cf681a442d8b71c9d2dd128e76580664d8598c481cbb95e
 DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
-DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
-DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
 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
diff --git a/media-libs/libdovi/libdovi-3.3.0.ebuild b/media-libs/libdovi/libdovi-3.3.0.ebuild
deleted file mode 100644
index b2a0b0bc13c4..000000000000
--- a/media-libs/libdovi/libdovi-3.3.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@1.1.3
-	anes@0.1.6
-	anstyle@1.0.6
-	anyhow@1.0.81
-	autocfg@1.1.0
-	bitstream-io@2.2.0
-	bitvec@1.0.1
-	bitvec_helpers@3.1.4
-	bumpalo@3.15.4
-	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.3
-	clap_builder@4.5.2
-	clap_lex@0.7.0
-	crc-catalog@2.4.0
-	crc@3.0.1
-	criterion-plot@0.5.0
-	criterion@0.5.1
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-utils@0.8.19
-	crunchy@0.2.2
-	either@1.10.0
-	equivalent@1.0.1
-	funty@2.0.0
-	half@2.4.0
-	hashbrown@0.14.3
-	hermit-abi@0.3.9
-	indexmap@2.2.6
-	is-terminal@0.4.12
-	itertools@0.10.5
-	itoa@1.0.10
-	js-sys@0.3.69
-	libc@0.2.153
-	log@0.4.21
-	memchr@2.7.1
-	num-traits@0.2.18
-	once_cell@1.19.0
-	oorandom@11.1.3
-	plotters-backend@0.3.5
-	plotters-svg@0.3.5
-	plotters@0.3.5
-	proc-macro2@1.0.79
-	quote@1.0.35
-	radium@0.7.0
-	rayon-core@1.12.1
-	rayon@1.9.0
-	regex-automata@0.4.6
-	regex-syntax@0.8.2
-	regex@1.10.4
-	roxmltree@0.19.0
-	ryu@1.0.17
-	same-file@1.0.6
-	serde@1.0.197
-	serde_derive@1.0.197
-	serde_json@1.0.114
-	syn@2.0.53
-	tap@1.0.1
-	tinytemplate@1.2.1
-	unicode-ident@1.0.12
-	walkdir@2.5.0
-	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-sys@0.3.69
-	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.52.0
-	windows-targets@0.52.4
-	windows_aarch64_gnullvm@0.52.4
-	windows_aarch64_msvc@0.52.4
-	windows_i686_gnu@0.52.4
-	windows_i686_msvc@0.52.4
-	windows_x86_64_gnullvm@0.52.4
-	windows_x86_64_gnu@0.52.4
-	windows_x86_64_msvc@0.52.4
-	wyz@0.5.1
-"
-inherit cargo edo multilib-minimal rust-toolchain
-
-DESCRIPTION="Dolby Vision metadata parsing and writing"
-HOMEPAGE="https://github.com/quietvoid/dovi_tool/"
-SRC_URI="
-	https://github.com/quietvoid/dovi_tool/archive/refs/tags/${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-S=${WORKDIR}/dovi_tool-${P}/dolby_vision
-
-LICENSE="MIT"
-LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016" # crates
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64"
-
-BDEPEND="
-	dev-util/cargo-c
-"
-
-QA_FLAGS_IGNORED="usr/lib.*/${PN}.*"
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -n cargoargs=${PN}_CARGOARGS_${ABI}
-
-	cargoargs=(
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--library-type=cdylib
-		--target="$(rust_abi)"
-		# cargo cbuild --help claims dev is default but (currently) this seems
-		# to always use release unless --profile=dev is explicitly passed?
-		$(usex debug --profile=dev --release)
-	)
-}
-
-multilib_src_compile() {
-	local -n cargoargs=${PN}_CARGOARGS_${ABI}
-
-	edo cargo cbuild "${cargoargs[@]}"
-}
-
-multilib_src_install() {
-	local -n cargoargs=${PN}_CARGOARGS_${ABI}
-
-	edo cargo cinstall --destdir="${D}" "${cargoargs[@]}"
-}
diff --git a/media-libs/libdovi/libdovi-3.3.1.ebuild b/media-libs/libdovi/libdovi-3.3.1.ebuild
index ff1174953080..c8d73ea5f7ba 100644
--- a/media-libs/libdovi/libdovi-3.3.1.ebuild
+++ b/media-libs/libdovi/libdovi-3.3.1.ebuild
@@ -102,7 +102,7 @@ S=${WORKDIR}/dovi_tool-${P}/dolby_vision
 LICENSE="MIT"
 LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016" # crates
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	dev-util/cargo-c
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index c09dfaf8e1a2..f28c23498611 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,3 +1,4 @@
 DIST libheif-1.15.2.tar.gz 1749773 BLAKE2B 788ecf59c936bfae9544bedd5fa50fd74f04adf29f804994bc208d2a5339b13984baf78a508babd80fa0d48381b2cc0bfb1e1140de97437b8c0336378a64fcb6 SHA512 79f22dad084bbe965dae7b8f92fc119dbdde7a04577ca9c7bc28b1a022a06f0ae64d3fbd11e82d6907f0fd678a31d98275e508a51a6bd0a9e8675c93790f1996
 DIST libheif-1.17.6.tar.gz 1433302 BLAKE2B 937a1ddfd86c4d50a609e24d00c07e0d1924a5532e36293f83fd67a38f4c13186cb5c4837598000d6d3516ec1965fdc6709ef825c327fd5ce3ea2194008b6efd SHA512 47d93df4f584979cea26af74cd8543b13398356b5fd46b1b378f7738cee471e80b7e117f6ce307674a549182f5ce22a577c6e79a6e72fe166421efc4be04687a
 DIST libheif-1.18.1.tar.gz 1524386 BLAKE2B 07c01c273460618d56b9259c2930da34632fffdcc2338480277e678ab173126bc9d6882a33dc459ed7cdacd7e636ff8d13c406c76c046afc47166609e9595942 SHA512 0b37b834882af8368fc550e75245f4cf487c71a041833ba5e7887155e289e9c2058b41724524091347f297cfdec45b537796a97f4c43531aecf9f0a099753f41
+DIST libheif-1.18.2.tar.gz 1525096 BLAKE2B 667a68f324f89b2274ea837ec8d40ada5450dce79f2b8d9e8ba365fe5f02d4222195109519380a6d38c4ebca929575e58c3a8e517aed27a2696d67db3e287556 SHA512 8fd47dbc8e31fdb6a972c852bc4e78440492ee3dd769e139f28ad489ccc23e6cf42a90cd23b16405fa30df3c7c43c78b2b65d5ca3ffb449bf06789b457ed3072
diff --git a/media-libs/libheif/libheif-1.18.2.ebuild b/media-libs/libheif/libheif-1.18.2.ebuild
new file mode 100644
index 000000000000..1aea405a52d6
--- /dev/null
+++ b/media-libs/libheif/libheif-1.18.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+aom gdk-pixbuf go rav1e svt-av1 test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-cpp/catch
+		dev-lang/go
+	)
+"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/tiff:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	rav1e? ( media-video/rav1e:= )
+	svt-av1? ( media-libs/svt-av1:=[${MULTILIB_USEDEP}] )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libheif/heif_version.h
+)
+
+src_prepare() {
+	if use test ; then
+		# bug 865351
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
+	cmake_src_prepare
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local mycmakeargs=(
+		-DENABLE_PLUGIN_LOADING=true
+		-DWITH_LIBDE265=true
+		-DWITH_AOM_DECODER=$(usex aom)
+		-DWITH_AOM_ENCODER=$(usex aom)
+		-DWITH_GDK_PIXBUF=$(usex gdk-pixbuf)
+		-DWITH_RAV1E="$(multilib_native_usex rav1e)"
+		-DWITH_SvtEnc="$(usex svt-av1)"
+		-DWITH_X265=$(usex x265)
+		-DWITH_KVAZAAR=true
+		-DWITH_JPEG_DECODER=true
+		-DWITH_JPEG_ENCODER=true
+		-DWITH_OpenJPEG_DECODER=true
+		-DWITH_OpenJPEG_ENCODER=true
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	default
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	default
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 4bcada1333eb..2687364a6dbf 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,4 +1,3 @@
 DIST fast_float-5.2.0.tar.gz 84800 BLAKE2B 39133eda20acd5f1f049e8040815a67aee588ab93be4953bde3b9227fb691e099581ef79b12b740437b78a9b4c9007762b44d9726ca07505ad5cb51394d8e3fd SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81
 DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7
-DIST libplacebo-v6.338.2.tar.bz2 697450 BLAKE2B 538785bea0003ff49a14b75f26fcd255259ed3b809b4b40be4000ec715808d6603d0139fe872ff2cf4ec13851a03fe63b251d019ef163fbbbfa74a012e0efbe6 SHA512 6577d19590b4d186d721238bd4c6bf940d1e766fe58053673fb5efb4c2c0a4408f29e7a1477328689a30b22eeac8c27548b82c11bfa0bc527d16f691849479c7
 DIST libplacebo-v7.349.0.tar.bz2 701309 BLAKE2B 6d0b546776c0326ab8305e7e12341b13e560e1ef53600913ece82341c762cdd466fd2d172781c769e59a57058769d5c0e48ca408ba0c2c7f936459bba6fb4212 SHA512 2e8cec7928aaafaaf9825cbacfb4758024ff04e40b98061fc6f178225647c90344e5aad23b02d82483062dbccf966a7d0178075151cefc6abaef1890f2b0c128
diff --git a/media-libs/libplacebo/libplacebo-6.338.2.ebuild b/media-libs/libplacebo/libplacebo-6.338.2.ebuild
deleted file mode 100644
index 8832825d47b9..000000000000
--- a/media-libs/libplacebo/libplacebo-6.338.2.ebuild
+++ /dev/null
@@ -1,126 +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 meson-multilib python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	GLAD_PV=2.0.4
-	FASTFLOAT_PV=5.2.0
-	SRC_URI="
-		https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.bz2
-		https://github.com/fastfloat/fast_float/archive/refs/tags/v${FASTFLOAT_PV}.tar.gz
-			-> fast_float-${FASTFLOAT_PV}.tar.gz
-		opengl? (
-			https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz
-				-> ${PN}-glad-${GLAD_PV}.tar.gz
-		)
-	"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="
-	https://libplacebo.org/
-	https://code.videolan.org/videolan/libplacebo/
-"
-
-LICENSE="
-	LGPL-2.1+
-	|| ( Apache-2.0 Boost-1.0 MIT )
-	opengl? ( MIT )
-"
-SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname
-IUSE="
-	glslang +lcms libdovi llvm-libunwind +opengl +shaderc test
-	unwind +vulkan +xxhash
-"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-# dlopen: libglvnd (glad)
-RDEPEND="
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	libdovi? ( media-libs/libdovi:=[${MULTILIB_USEDEP}] )
-	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] )
-	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
-	!shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-"
-# vulkan-headers is required even with USE=-vulkan for the stub (bug #882065)
-DEPEND="
-	${RDEPEND}
-	dev-util/vulkan-headers
-	xxhash? ( dev-libs/xxhash[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
-	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		local EGIT_SUBMODULES=(
-			3rdparty/fast_float
-			$(usev opengl 3rdparty/glad)
-		)
-		git-r3_src_unpack
-	else
-		default
-
-		rmdir "${S}"/3rdparty/fast_float || die
-		mv fast_float-${FASTFLOAT_PV} "${S}"/3rdparty/fast_float || die
-
-		if use opengl; then
-			rmdir "${S}"/3rdparty/glad || die
-			mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# typically auto-skipped, but may assume usable opengl/vulkan then hang
-	sed -i "/tests += 'opengl_surfaceless.c'/d" src/opengl/meson.build || die
-	sed -i "/tests += 'vulkan.c'/d" src/vulkan/meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddemos=false #851927
-		$(meson_use test tests)
-		$(meson_feature lcms)
-		$(meson_feature libdovi)
-		$(meson_feature opengl)
-		$(meson_feature opengl gl-proc-addr)
-		$(meson_feature shaderc)
-		$(usex shaderc -Dglslang=disabled $(meson_feature glslang))
-		$(meson_feature unwind)
-		$(meson_feature vulkan)
-		$(meson_feature vulkan vk-proc-addr)
-		-Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml
-		$(meson_feature xxhash)
-	)
-
-	meson_src_configure
-}
diff --git a/media-libs/libplacebo/libplacebo-7.349.0.ebuild b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
index 8832825d47b9..9d16436f4759 100644
--- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 0bf9834ccf55..1831a83708b6 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild
index 770b0824f694..87d54f232e8c 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.6.0.ebuild
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 6bdacd4a2042..1da0dafed4d7 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,3 +1,5 @@
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
 DIST SDL2-2.30.2.tar.gz 7426565 BLAKE2B 258084c6965281951b78619d7ebcd80b0f6873f54ded93d35b6b898f0533fef9a29bef4a8babe53df50bc589b0565b3a3b1378a930b43fdce575c4a5baa70864 SHA512 19316bb4c483a8c4be2140b70d906b7767beabada481873217a9207bd41e79c1854a837e1394325f59795da010f5344f791a7973a846b8189e3f9b662f408aca
 DIST SDL2-2.30.3.tar.gz 7425677 BLAKE2B 9918723bc3a0bc3abfc6d47b4fc7eeabcafdc9925ee93e4f31b3637e843a5b060ae61aef9b93743340a9df914248cff510e5d38e758e032b5ed4df9eed587746 SHA512 75ddea9ac3c2130e9f6036b4718dbe3d9d1b40dab3cd48d3d488d5a397dd0c226c0573bf18d82eb41498800accf045e259d2ae305f069fad7b34e47a017f2372
+DIST SDL2-2.30.6.tar.gz 7524883 BLAKE2B 9e253d107c2af7ff0f7f67968be2cffc2358fbabd26d4ec46454a11ac53b64ac24a620947601901e43e470ad6b2bb89e273d04c9c2de12c6ab1dd6a4f78733ff SHA512 c73fd0b52e77d248a5dc2808a660ded9e708b87f68f677970da71e9b4a25ec60cf52f319b8b014ced7c9363560f2360262c04551a895f0f83ee62c3feeafba47
+DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16
diff --git a/media-libs/libsdl2/libsdl2-2.30.6.ebuild b/media-libs/libsdl2/libsdl2-2.30.6.ebuild
new file mode 100644
index 000000000000..ce051d586a9f
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.30.6.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2024 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 ~ia64 ~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 fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx4? ( 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}
+	fcitx4? ( app-i18n/fcitx:4 )
+	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_PTHREADS=$(usex threads)
+		-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/libsdl2/libsdl2-2.30.7.ebuild b/media-libs/libsdl2/libsdl2-2.30.7.ebuild
new file mode 100644
index 000000000000..ce051d586a9f
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.30.7.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2024 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 ~ia64 ~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 fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx4? ( 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}
+	fcitx4? ( app-i18n/fcitx:4 )
+	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_PTHREADS=$(usex threads)
+		-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/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild b/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
index 8f8ea2a0abab..ffc0abe23372 100644
--- a/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
+++ b/media-libs/libsvgtiny-pixbuf/libsvgtiny-pixbuf-0.0.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://michael.orlitzky.com/code/libsvgtiny-pixbuf.xhtml"
 SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.xz"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-libs/libxml2:=
 	media-libs/libsvgtiny:=
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 578e0da87ddb..9187fef08c5a 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1 +1,2 @@
 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_p20240706.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20240706.ebuild
new file mode 100644
index 000000000000..3032ed6833b6
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20240706.ebuild
@@ -0,0 +1,63 @@
+# 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="2d2592860478e60d972b96e67ee034b8a71bb57a"
+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/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 61f56c93fdb6..e227a799e321 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -2,3 +2,5 @@ DIST intel-media-24.1.5.tar.gz 25834293 BLAKE2B 076731a57c7fbf6776df393c631e8abd
 DIST intel-media-24.2.5.tar.gz 25860224 BLAKE2B 2d2cfe9b72a1271e98deae9b80321c4953e2dfa73db80156d09352f2420081fda4ece0f4d98a4cd9c36217a8808d4816451d041fcb4f46979efaa3c8ae1d84e5 SHA512 f283cf4b6536e2c05df9c169958668ab7ee96291473a203dfd2fe79888e297b0b12f2b75ea9dba988335139fc7a63c1d2a4908a5a7d2c68b807fa131cb29b7b4
 DIST intel-media-24.3.0.tar.gz 27035846 BLAKE2B cb1d8764f532234c8f853d8918f33be2ad31d807fc7b128acb2551e62004d3e8a431bbb7c38e534c0ad5b5f0c2e4e1917da0ea8e242d5785088e2a6a4ef9bc2d SHA512 2e9c21c93e8d842aef7785195c7c6ad4fceb384eccb79e4108d7305cd2ba9ce34e9785ecd227345ede1135678da61259d325f074e1e9c8d08b29da107f96bfdc
 DIST intel-media-24.3.1.tar.gz 27087463 BLAKE2B 0c8519e5976e51cb6c854363f23f30bb98ea4a6e47a66e196a18a174ebde89bb71d36d21aa58a39f5dd3da76d225bd8902c1e983865ab1831dac3f7368d476fa SHA512 557fb40dcb409304f3209e0409d208648629f10bdeb2d9f4fe17f3c581bcc05c71d00cc9331c1d498e1981607b7fff7e4cad20a8f88b5b3605c7a606a5648828
+DIST intel-media-24.3.2.tar.gz 27086020 BLAKE2B 3a0dab661cd837075321657f495cd4c09e0226218fa64780777ba85d89a94624d69f383647c12786dcf776da2e04993882dbdeabe03cd9d15e1084dc7fc08042 SHA512 a6a29b07870b1f8288b01f100089026a68e6ca55908f00b1e3d1b579e29f96969f91c948eea2410a982588e8e47ad73ed3b8184acafb645811c5922e76cc0442
+DIST intel-media-24.3.3.tar.gz 27534326 BLAKE2B ab4adb5aded35387ead884cb385f1ce5dffa3a19d00e85095536077d4318e09e260f227b004a16a50faaaac735cb44ff3e7427bf2dba84c0415cd11107de9793 SHA512 73c637677216e3bb145b002d1ce5a4e799cfd0e33656152b8e12e290e893487131e49c01b31573e7b978da89cdb7d5663a1a6c6ad43ae3897e1778569f0c313f
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.ebuild
new file mode 100644
index 000000000000..bc3be02793b7
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.2.ebuild
@@ -0,0 +1,57 @@
+# 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.3.20:=[${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
+)
+
+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.3.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild
new file mode 100644
index 000000000000..bc3be02793b7
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.3.ebuild
@@ -0,0 +1,57 @@
+# 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.3.20:=[${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
+)
+
+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/libva-2.22.0.ebuild b/media-libs/libva/libva-2.22.0.ebuild
index 428ba181bbd3..fc3774487825 100644
--- a/media-libs/libva/libva-2.22.0.ebuild
+++ b/media-libs/libva/libva-2.22.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libvisual/libvisual-0.4.2-r1.ebuild b/media-libs/libvisual/libvisual-0.4.2-r1.ebuild
index 0403b84fa57f..57c866f65947 100644
--- a/media-libs/libvisual/libvisual-0.4.2-r1.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal optfeature
+inherit libtool multilib-minimal optfeature
 
 DESCRIPTION="Abstraction library between applications and audio visualisation plugins"
 HOMEPAGE="http://libvisual.org/"
@@ -24,6 +24,11 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libvisual-0.4/libvisual/lvconfig.h
 )
 
+src_prepare() {
+	default
+	elibtoolize
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--disable-static \
diff --git a/media-libs/lv2/lv2-1.18.10.ebuild b/media-libs/lv2/lv2-1.18.10.ebuild
deleted file mode 100644
index 7896910a2127..000000000000
--- a/media-libs/lv2/lv2-1.18.10.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_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit meson-multilib python-single-r1
-
-DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="https://lv2plug.in/"
-SRC_URI="https://lv2plug.in/spec/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc plugins test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	plugins? ( virtual/pkgconfig )
-	doc? (
-		app-text/doxygen
-		dev-python/rdflib
-	)
-	test? (
-		dev-libs/serd
-		dev-libs/sord[tools]
-		dev-python/rdflib
-	)
-"
-CDEPEND="
-	${PYTHON_DEPS}
-	plugins? (
-		media-libs/libsamplerate
-		media-libs/libsndfile
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="
-	${CDEPEND}
-	doc? ( dev-python/markdown )
-"
-RDEPEND="
-	${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/rdflib[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.18.6-add-missing-lv2.h.patch"
-	"${FILESDIR}/${P}-tests-optional.patch"
-)
-
-src_prepare() {
-	default
-
-	# XXX: Drop this > 1.18.10, -Dstrict=false should prevent it now, bug #906047.
-	sed -i -e "/codespell = /s:get_option('tests'):false:" test/meson.build || die
-
-	# fix doc installation path
-	sed -iE "s%lv2_docdir = .*%lv2_docdir = '"${EPREFIX}"/usr/share/doc/${PF}'%g" meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dlv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2
-		-Dstrict=false
-		$(meson_native_use_feature doc docs)
-		$(meson_feature plugins)
-		$(meson_feature test tests)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	local DOCS=( NEWS README.md )
-	einstalldocs
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 263340d397ea..260a93bec71f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,11 @@ DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 2e8e4ee98f904aa02f304a6c3cbbb81d0480220
 DIST mesa-24.1.4.tar.xz 29106920 BLAKE2B 2109fc604858a0927271d7b1edb76a24514acac6117e564c6999c99f068624964f5cf0b7d022cac5726e432353a32a5278b3aa00b64dd4118bb2f0b7123c3b41 SHA512 0293f1493685888e5d2f0e616645c937e5a9c348fcb654b050b7c42bfdade1518c508920e456cf8be0033dceab4570a916db87dbb454174e425d91e9c05d0748
 DIST mesa-24.1.5.tar.xz 29140156 BLAKE2B ea29b3b8b6f178dd21d7ee3042ea829755e398f8876dfac6c744de77c08d85abb2736add2141204e6d3343de46040f49d96e1ad455714880b4be46d7b36581f1 SHA512 5916cc38c4a17161b012310c473077177887c5fff1bc5cb1f6efdf5da44878c18c99fe0c62318d897798cd4edb0f7206a989198ba085c2d402d49cdd0ee25288
 DIST mesa-24.1.6.tar.xz 29172600 BLAKE2B 295634438e1a2ae64bd1c5b0309a253e72a4d95e559cabad72f94aa2b91e5b05179c69cce5e371b69707419399dae0bfe808cb16b2e9ee112277e18b8f0f31f9 SHA512 2df0c78126f34a9ab7ce4946ed9fcd58d828717ecfd93681d9e136e605e9a8e01428dd632c0125e06d805498ffd75250f0e617f47fbb7e6368e6c8a48f4c4dfc
+DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
 DIST mesa-24.2.0-rc4.tar.xz 29324360 BLAKE2B da26f43fa3e940a406e4987ed311fd22fc7608d4e09fc6cfd6584fe8873b8c5fdbf51d5f32042c46a883739cd22204a3dde2a0a1d6283c3453bc635bfba24ed5 SHA512 5a0b9043e8c3222faeaad31f435f3ea440d670ffa5497340c5809666a857fa4c77288745d52372a2267e9f9be97fc04e0d20b81bc027c1b7a33176a3bfa6b3c6
 DIST mesa-24.2.0.tar.xz 29342732 BLAKE2B dfbd0e5b8de3db475f40a8313ee3013bb513d505541e056efd84aad50d5043414dd2c0b95e6c7336a1b4d29037274dae2fa1fdb9697187bf239a5adb54dd3721 SHA512 a585c788801b5a341d356e44d958b148e6e14f6b3d7224e99a92faa2f004bf0cfc90103c5fdc651afb22f805c6f9dc594f9f3f5ecebcea36f6305b3a6ccb9294
+DIST mesa-24.2.1.tar.xz 29431192 BLAKE2B f4ef9fd08bbf16551498a8edce1e19e594a0b85ee1f05f8f7c80fcf12ec7ac4cb5947b713791f5202201f8cfc48773507d869dbd239e6fc3dcf2c3a621892327 SHA512 3b77e5faec51b67583131123b0cc010b52325ea308e4075323102aa999d9c9fbb65b873eb537ed4f577b5a0811e7f096e7e101510cb50326ea5c439b4b468380
+DIST mesa-24.2.2.tar.xz 29441876 BLAKE2B 14b29989b056c3bc76cb64babef6e93dd31af37ea72674adaad3f7ef7373c004996e375941662b1c3bbacfd707a21e2e3631a116a841130edfa1bfe3450ae5ab SHA512 d9979f7a1ae7bfeb0658d1b6c9021b7d0043c3ca71db9deaa2fc8a3d4c07cd58497b9233737a31fb66ef711a369a859757a63fb86c2aadd859867f9a4eaf16a9
 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.1.6.ebuild b/media-libs/mesa/mesa-24.1.6.ebuild
index 9a583c95d8ec..31b013d07404 100644
--- a/media-libs/mesa/mesa-24.1.6.ebuild
+++ b/media-libs/mesa/mesa-24.1.6.ebuild
@@ -32,7 +32,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/mesa/mesa-24.1.7.ebuild b/media-libs/mesa/mesa-24.1.7.ebuild
new file mode 100644
index 000000000000..9a583c95d8ec
--- /dev/null
+++ b/media-libs/mesa/mesa-24.1.7.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+CARGO_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
+
+MY_P="${P/_/-}"
+
+CRATES="
+	syn@2.0.39
+	proc-macro2@1.0.70
+	quote@1.0.33
+	unicode-ident@1.0.12
+	paste@1.0.14
+"
+
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# 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
+	vulkan-overlay 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} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
+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 "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			)
+		")
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/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.613.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.34 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=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}]
+	")
+	video_cards_intel? (
+		~dev-util/intel_clc-${PV}
+		dev-libs/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
+			>=virtual/rust-1.74.1
+		)
+	)
+	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}]" || 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 sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+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
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && 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 || # swrast
+	   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
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_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
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	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
+		-Ddri3=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_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-24.2.1.ebuild b/media-libs/mesa/mesa-24.2.1.ebuild
new file mode 100644
index 000000000000..a64eb1901f88
--- /dev/null
+++ b/media-libs/mesa/mesa-24.2.1.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+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 toolchain-funcs
+
+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
+"
+
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# 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
+	vulkan-overlay 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} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+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 "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			)
+		")
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/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.613.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.34 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=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}
+		dev-libs/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
+			>=virtual/rust-1.74.1
+		)
+	)
+	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 sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+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
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && 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
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	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
+		-Ddri3=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_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-24.2.2.ebuild b/media-libs/mesa/mesa-24.2.2.ebuild
new file mode 100644
index 000000000000..a64eb1901f88
--- /dev/null
+++ b/media-libs/mesa/mesa-24.2.2.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+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 toolchain-funcs
+
+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
+"
+
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# 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
+	vulkan-overlay 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} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+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 "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			)
+		")
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/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.613.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.34 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=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}
+		dev-libs/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
+			>=virtual/rust-1.74.1
+		)
+	)
+	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 sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+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
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && 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
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	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
+		-Ddri3=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_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 a64eb1901f88..172d1f066e10 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -60,7 +60,7 @@ 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
-	vulkan-overlay wayland +X xa +zstd"
+	wayland +X xa +zstd"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	d3d9? (
@@ -77,7 +77,6 @@ REQUIRED_USE="
 		)
 	)
 	llvm? ( ${LLVM_REQUIRED_USE} )
-	vulkan-overlay? ( vulkan )
 	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
@@ -413,6 +412,8 @@ multilib_src_configure() {
 				)
 			fi
 		fi
+
+		emesonargs+=(-Dvulkan-layers=device-select,overlay)
 	fi
 
 	driver_list() {
@@ -420,11 +421,6 @@ multilib_src_configure() {
 		echo "${drivers//$'\n'/,}"
 	}
 
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
 	if use opengl && use X; then
 		emesonargs+=(-Dglx=dri)
 	else
@@ -440,7 +436,6 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dshared-glapi=enabled
-		-Ddri3=enabled
 		-Dexpat=enabled
 		$(meson_use opengl)
 		$(meson_feature opengl gbm)
diff --git a/media-libs/mpvqt/mpvqt-1.0.1.ebuild b/media-libs/mpvqt/mpvqt-1.0.1.ebuild
index 1c2fe7f623e2..3ee775477d43 100644
--- a/media-libs/mpvqt/mpvqt-1.0.1.ebuild
+++ b/media-libs/mpvqt/mpvqt-1.0.1.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="libmpv wrapper for QtQuick2 and QML"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 16b307d02f1d..b0154e1071b7 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,2 +1,3 @@
+DIST netpbm-11.2.10.tar.xz 3782160 BLAKE2B 22dab865106f48a83992ff780a3a3cb26e7fd279b4e22f622a5f6459f90aecf70ce85ce65fd9f14ebe9a148a92ac2b0eb35ca95b0feb88dc0cbe24d11921e4d3 SHA512 baa12b1aa5d66967d900f3d92ebd9cdf2bc936389fd943b995ed863b9f57977bdb6c1e92588252b6219d26d06085b7ea5e3400f1d9be688cb538c807b84293bf
 DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
-DIST netpbm-11.7.0.tar.xz 3805348 BLAKE2B fa42e4806e9573a6dc6d2df3bde6e8318269a88669e6417022e7c5c6c995a46b7762acca47cb5eea301824d8ec78c57a29df34ec68fd3146d9e785271524e205 SHA512 b9cd20c568056a32314addce7d9d059e4c4475a36aabbaebf3f8e74ae4b127a62e8280a32dafd17a2cf1e06fa3f509818ddb5d11700132810b93ee65c933f099
+DIST netpbm-11.7.1.tar.xz 3805692 BLAKE2B af7d9374c0dbea1b77a02bb9ea371dd46faac4225cef179d5076ae3f41115b681728267a9cc84c8544f0217647206648242499043b15cf9e076f1c5e41c134ec SHA512 7a07a0d959944a95c51853d9a5392302de00ebd0c18a9039ceeaf4b398bf796c9079aa8c0c46865f4b19628c1bda29b60c9efec4ee7b7968db82ba3e83f5c079
diff --git a/media-libs/netpbm/netpbm-11.2.10.ebuild b/media-libs/netpbm/netpbm-11.2.10.ebuild
new file mode 100644
index 000000000000..1fefcc467f12
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.10.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
+# They only provide a tarball for super stable, but super stable is a bit lagging.
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.7.yy) on SLOT "0/advanced".
+# The stable branch is stabilized according to usual Gentoo rules, while the
+# advanced branch will not be stabilized.
+# A detailed explanation is here https://netpbm.sourceforge.net/release.html
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="https://netpbm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
+SLOT="0/stable"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
+
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+# some installed programs are perl scripts
+RDEPEND="
+	dev-lang/perl
+	jbig? ( media-libs/jbigkit:= )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
+	png? (
+		>=media-libs/libpng-1.4:0=
+		sys-libs/zlib
+	)
+	postscript? (
+		app-text/ghostscript-gpl
+		sys-libs/zlib
+	)
+	rle? ( media-libs/urt:= )
+	svga? ( media-libs/svgalib )
+	tiff? ( >=media-libs/tiff-3.5.5:= )
+	xml? ( dev-libs/libxml2 )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-arch/xz-utils
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/netpbm-10.86.21-build.patch
+	"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
+	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
+	"${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
+	"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
+)
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+
+netpbm_config_lib() {
+	usex ${1} -l${2:-$1} NONE
+}
+
+# for bug #828127
+netpbm_cflags_for_build() {
+	if is-flagq -fPIC; then
+		echo -fPIC
+	fi
+}
+
+src_prepare() {
+	default
+
+	# make sure we use system libs
+	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+	# fix typo in a test
+	sed -i \
+		-e 's:^o#! /bin/sh:#! /bin/sh:' \
+		test/stdin-ppm3.test || die
+
+	# take care of the importinc stuff ourselves by only doing it once
+	# at the top level and having all subdirs use that one set #149843
+	sed -i \
+		-e '/^importinc:/s|^|importinc:\nmanual_|' \
+		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+		common.mk || die
+	sed -i \
+		-e '/%.c/s: importinc$::' \
+		common.mk lib/Makefile lib/util/Makefile || die
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+	# The postscript knob is currently bound up with a fork test.
+	if ! use postscript ; then
+		sed -i \
+			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+			converter/other/Makefile generator/Makefile || die
+		sed -i -r \
+			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i \
+			-e 's:lps-roundtrip.*::' \
+			-e 's:pbmtextps-dump.*::' \
+			-e 's:pbmtextps.*::' \
+			test/Test-Order || die
+		sed -i \
+			-e '/^$/d' \
+			test/all-in-place.ok || die
+		sed -i \
+			'2iexit 80' \
+			test/ps-{alt-,flate-,}roundtrip.test || die
+	fi
+
+	# the new postscript test needs +x
+	chmod +x test/lps-roundtrip.test || die
+
+	# Do not test png if not built
+	if ! use png ; then
+		sed -i -E \
+			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i \
+			-e '/^$/d' \
+			test/all-in-place.ok || die
+
+		sed -i -E \
+			-e 's:(pamrgbatopng|pngtopnm).*::' \
+			test/legacy-names.{ok,test} || die
+		sed -i \
+			-e '/^$/d' \
+			test/legacy-names.ok || die
+		sed -i \
+			-e 's:png-roundtrip.*::' \
+			-e 's:winicon-roundtrip.*::' \
+			test/Test-Order || die
+	fi
+
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
+	# ppmpat-random is broken on musl
+	# bug #907295
+	if use elibc_musl; then
+		sed \
+			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
+			-e 's:ppmpat-random.*::' \
+			-i test/Test-Order || die
+	fi
+}
+
+src_configure() {
+	cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed"
+		# Misc stuff
+		BUILD_FIASCO = N
+		SYMLINK = ln -sf
+
+		# These vars let src_test work by default
+		PKGDIR_DEFAULT = ${T}/netpbm
+		RESULTDIR_DEFAULT = ${T}/netpbm-test
+
+		# Toolchain options
+		CC = $(tc-getCC) -Wall
+		LD = \$(CC)
+		CC_FOR_BUILD = $(tc-getBUILD_CC)
+		LD_FOR_BUILD = \$(CC_FOR_BUILD)
+		AR = $(tc-getAR)
+		RANLIB = $(tc-getRANLIB)
+		PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+		STRIPFLAG =
+		CFLAGS_SHLIB = -fPIC
+		CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
+
+		LDRELOC = \$(LD) -r
+		LDSHLIB = $(netpbm_ldshlib)
+		LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+		LINKERISCOMPILER = Y
+		NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+		NETPBMLIBTYPE = $(netpbm_libtype)
+		STATICLIB_TOO = $(usex static-libs Y N)
+
+		# The var is called SSE, but the code is actually SSE2.
+		WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
+
+		# Gentoo build options
+		TIFFLIB = $(netpbm_config_lib tiff)
+		# Let tiff worry about its own dependencies #395753
+		TIFFLIB_NEEDS_JPEG = N
+		TIFFLIB_NEEDS_Z = N
+		JPEGLIB = $(netpbm_config_lib jpeg)
+		PNGLIB = $(netpbm_config_lib png)
+		ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+		LINUXSVGALIB = $(netpbm_config_lib svga vga)
+		XML2_LIBS = $(netpbm_config_lib xml xml2)
+		JBIGLIB = $(netpbm_config_lib jbig)
+		JBIGHDR_DIR =
+		JASPERLIB = NONE
+		JASPERHDR_DIR =
+		URTLIB = $(netpbm_config_lib rle)
+		URTHDR_DIR =
+		X11LIB = $(netpbm_config_lib X X11)
+		X11HDR_DIR =
+	EOF
+}
+
+src_compile() {
+	emake -j1 pm_config.h version.h manual_importinc #149843
+	emake
+}
+
+src_test() {
+	# The code wants to install everything first and then test the result.
+	emake install.{bin,lib,data}
+	emake check
+}
+
+src_install() {
+	# Subdir make targets like to use `mkdir` all over the place
+	# without any actual dependencies, thus the -j1.
+	emake -j1 package pkgdir="${ED}"/usr
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+	fi
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+	dodir /usr/share
+	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+	doman userguide/*.[0-9]
+	dodoc README
+
+	cd doc || die
+	dodoc HISTORY Netpbm.programming USERDOC
+	docinto html
+	dodoc -r ../userguide/*.html
+}
diff --git a/media-libs/netpbm/netpbm-11.7.0.ebuild b/media-libs/netpbm/netpbm-11.7.1.ebuild
index a0a3d3f56e04..a0a3d3f56e04 100644
--- a/media-libs/netpbm/netpbm-11.7.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.7.1.ebuild
diff --git a/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-use-of-execinfo.h.patch b/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-use-of-execinfo.h.patch
new file mode 100644
index 000000000000..e87fb0ada3f9
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-use-of-execinfo.h.patch
@@ -0,0 +1,51 @@
+From 74ff3c3990e725c6f9ae407e5f28673570fa4645 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
+ <kacper.slominski72@gmail.com>
+Date: Sun, 11 Aug 2024 22:38:58 +0200
+Subject: [PATCH 1/3] Patch out use of execinfo.h
+
+Not available on musl, and the backtrace functionality is unused
+anyway (only called by the leak detector AFAICS).
+---
+ external/JUCE/modules/juce_core/juce_core.cpp            | 4 ----
+ .../JUCE/modules/juce_core/system/juce_SystemStats.cpp   | 9 +--------
+ 2 files changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/external/JUCE/modules/juce_core/juce_core.cpp b/external/JUCE/modules/juce_core/juce_core.cpp
+index 067a189..e3e6254 100644
+--- a/external/JUCE/modules/juce_core/juce_core.cpp
++++ b/external/JUCE/modules/juce_core/juce_core.cpp
+@@ -101,10 +101,6 @@
+  #include <sys/time.h>

+  #include <net/if.h>

+  #include <sys/ioctl.h>

+-

+- #if ! (JUCE_ANDROID || JUCE_WASM)

+-  #include <execinfo.h>

+- #endif

+ #endif

+ 

+ #if JUCE_MAC || JUCE_IOS

+diff --git a/external/JUCE/modules/juce_core/system/juce_SystemStats.cpp b/external/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+index 3fe9ac7..840c731 100644
+--- a/external/JUCE/modules/juce_core/system/juce_SystemStats.cpp
++++ b/external/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+@@ -173,14 +173,7 @@ String SystemStats::getStackBacktrace()
+     }

+ 

+    #else

+-    void* stack[128];

+-    auto frames = backtrace (stack, numElementsInArray (stack));

+-    char** frameStrings = backtrace_symbols (stack, frames);

+-

+-    for (int i = 0; i < frames; ++i)

+-        result << frameStrings[i] << newLine;

+-

+-    ::free (frameStrings);

++    jassertfalse; // patched out <execinfo.h>

+    #endif

+ 

+     return result;

+-- 
+2.44.2
+
diff --git a/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-use-of-stat64.patch b/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-use-of-stat64.patch
new file mode 100644
index 000000000000..890c33d6197c
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-use-of-stat64.patch
@@ -0,0 +1,42 @@
+From 6b2901929fa7d618bda890adc7ecc15cb18d5b01 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
+ <kacper.slominski72@gmail.com>
+Date: Sun, 11 Aug 2024 23:31:25 +0200
+Subject: [PATCH 2/3] Patch out use of stat64
+
+Not available on musl, and we're better off with using
+-D_FILE_OFFSET_BITS=64 instead anyway.
+---
+ CMakeLists.txt                                                 | 2 ++
+ external/JUCE/modules/juce_core/native/juce_posix_SharedCode.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c9ade5..ddbaa16 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,8 @@ set(CMAKE_BINARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ 
+ set(MINGW_ADDITIONAL_LINKING_FLAGS "-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic")
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
++
+ if(NOT BUILD_VERSION)
+     set(BUILD_VERSION 1.99)
+ endif()
+diff --git a/external/JUCE/modules/juce_core/native/juce_posix_SharedCode.h b/external/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+index 700e191..b92f19c 100644
+--- a/external/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
++++ b/external/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+@@ -167,7 +167,7 @@ int juce_siginterrupt (int sig, int flag)
+ //==============================================================================

+ namespace

+ {

+-   #if JUCE_LINUX || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)

++   #if (JUCE_IOS && ! __DARWIN_ONLY_63_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)

+     using juce_statStruct = struct stat64;

+     #define JUCE_STAT  stat64

+    #else

+-- 
+2.44.2
+
diff --git a/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-uses-of-nl_langinfo-for-musl.patch b/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-uses-of-nl_langinfo-for-musl.patch
new file mode 100644
index 000000000000..04de9f024b69
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/files/noise-suppression-for-voice-1.10-Patch-out-uses-of-nl_langinfo-for-musl.patch
@@ -0,0 +1,36 @@
+From b0ab5ab1b140fe76ff2e923e9d6434ad434adb88 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
+ <kacper.slominski72@gmail.com>
+Date: Sun, 11 Aug 2024 23:46:21 +0200
+Subject: [PATCH 3/3] Patch out uses of nl_langinfo for musl
+
+Not available on musl, instead use the alternative code path for BSD.
+---
+ .../JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp  | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/external/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp b/external/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+index 84abf88..a7b3343 100644
+--- a/external/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/external/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -198,7 +198,7 @@ String SystemStats::getComputerName()
+ 

+ String SystemStats::getUserLanguage()

+ {

+-   #if JUCE_BSD

++   #if JUCE_BSD || (JUCE_LINUX && !defined(__GLIBC__))

+     if (auto langEnv = getenv ("LANG"))

+         return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true);

+ 

+@@ -210,7 +210,7 @@ String SystemStats::getUserLanguage()
+ 

+ String SystemStats::getUserRegion()

+ {

+-   #if JUCE_BSD

++   #if JUCE_BSD || (JUCE_LINUX && !defined(__GLIBC__))

+     return {};

+    #else

+     return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);

+-- 
+2.44.2
+
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-1.10-r1.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-1.10-r1.ebuild
deleted file mode 100644
index c2f614f070e7..000000000000
--- a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-1.10-r1.ebuild
+++ /dev/null
@@ -1,82 +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="A real-time noise suppression plugin for voice"
-HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
-else
-	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-IUSE="lv2 vst vst3 test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-
-DEPEND="
-	lv2? ( ${COMMON_DEPEND} )
-	vst? ( ${COMMON_DEPEND} )
-	vst3? ( ${COMMON_DEPEND} )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-src_configure() {
-	# Bug #925672
-	append-atomic-flags
-
-	local mycmakeargs=(
-		-DBUILD_LADSPA_PLUGIN=ON
-		-DBUILD_LV2_PLUGIN=$(usex lv2 ON OFF)
-		-DBUILD_VST_PLUGIN=$(usex vst ON OFF)
-		-DBUILD_VST3_PLUGIN=$(usex vst3 ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DBUILD_AU_PLUGIN=OFF
-		-DBUILD_AUV3_PLUGIN=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cp "${BUILD_DIR}/src/common/CTestTestfile.cmake" "${BUILD_DIR}/CTestTestfile.cmake" || die
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	dodir /usr/share/pipewire/pipewire.conf.avail/
-	sed "s|%PATH_TO_LADSPA_PLUGIN%|${EPREFIX}/usr/$(get_libdir)/ladspa/librnnoise_ladspa.so|" \
-		"${FILESDIR}/99-input-denoising.conf" \
-		> "${D}/${EPREFIX}/usr/share/pipewire/pipewire.conf.avail/99-input-denoising.conf" || die
-}
-
-pkg_postinst() {
-	elog "An example PipeWire configuration has been installed into:"
-	elog "${EPREFIX}/usr/share/pipewire/pipewire.conf.avail/99-input-denoising.conf"
-	elog ""
-	elog "You can enable it by copying or symlinking the file into:"
-	elog "  ~/.config/pipewire/pipewire.conf.d/ for your user, or"
-	elog "  /etc/pipewire/pipewire.conf.d/ to enable it system-wide."
-}
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-1.10-r2.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-1.10-r2.ebuild
new file mode 100644
index 000000000000..89d7719e6af2
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-1.10-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A real-time noise suppression plugin for voice"
+HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
+else
+	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+IUSE="lv2 vst vst3 test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+
+DEPEND="
+	lv2? ( ${COMMON_DEPEND} )
+	vst? ( ${COMMON_DEPEND} )
+	vst3? ( ${COMMON_DEPEND} )
+"
+
+RDEPEND="${DEPEND}"
+
+# Fixes for the JUCE issues the latter 3 patches work around have been
+# submitted upstream, but have not been merged yet:
+# https://github.com/juce-framework/JUCE/pull/1239
+PATCHES=(
+	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${P}-Patch-out-use-of-execinfo.h.patch"
+	"${FILESDIR}/${P}-Patch-out-use-of-stat64.patch"
+	"${FILESDIR}/${P}-Patch-out-uses-of-nl_langinfo-for-musl.patch"
+)
+
+src_configure() {
+	# Bug #925672
+	append-atomic-flags
+
+	local mycmakeargs=(
+		-DBUILD_LADSPA_PLUGIN=ON
+		-DBUILD_LV2_PLUGIN=$(usex lv2 ON OFF)
+		-DBUILD_VST_PLUGIN=$(usex vst ON OFF)
+		-DBUILD_VST3_PLUGIN=$(usex vst3 ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DBUILD_AU_PLUGIN=OFF
+		-DBUILD_AUV3_PLUGIN=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cp "${BUILD_DIR}/src/common/CTestTestfile.cmake" "${BUILD_DIR}/CTestTestfile.cmake" || die
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	dodir /usr/share/pipewire/pipewire.conf.avail/
+	sed "s|%PATH_TO_LADSPA_PLUGIN%|${EPREFIX}/usr/$(get_libdir)/ladspa/librnnoise_ladspa.so|" \
+		"${FILESDIR}/99-input-denoising.conf" \
+		> "${D}/${EPREFIX}/usr/share/pipewire/pipewire.conf.avail/99-input-denoising.conf" || die
+}
+
+pkg_postinst() {
+	elog "An example PipeWire configuration has been installed into:"
+	elog "${EPREFIX}/usr/share/pipewire/pipewire.conf.avail/99-input-denoising.conf"
+	elog ""
+	elog "You can enable it by copying or symlinking the file into:"
+	elog "  ~/.config/pipewire/pipewire.conf.d/ for your user, or"
+	elog "  /etc/pipewire/pipewire.conf.d/ to enable it system-wide."
+}
diff --git a/media-libs/oidn/oidn-2.2.2.ebuild b/media-libs/oidn/oidn-2.2.2.ebuild
index 1d059c48a8b6..193b91c619d1 100644
--- a/media-libs/oidn/oidn-2.2.2.ebuild
+++ b/media-libs/oidn/oidn-2.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-LLVM_COMPAT=( {15..17} )
+LLVM_COMPAT=( {15..18} )
 ROCM_VERSION=5.7
 
 inherit cuda cmake python-single-r1 llvm-r1 rocm
@@ -38,7 +38,12 @@ RDEPEND="
 	hip? ( dev-util/hip )
 	openimageio? ( media-libs/openimageio:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch"
diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.0.ebuild
index 0dd6f000d711..3ff4eb5cf3fc 100644
--- a/media-libs/oidn/oidn-2.3.0.ebuild
+++ b/media-libs/oidn/oidn-2.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-LLVM_COMPAT=( {15..17} )
+LLVM_COMPAT=( {15..18} )
 ROCM_VERSION=5.7
 
 inherit cmake cuda llvm-r1 python-any-r1 rocm
@@ -36,7 +36,12 @@ RDEPEND="
 	hip? ( dev-util/hip )
 	openimageio? ( media-libs/openimageio:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+"
 BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
diff --git a/media-libs/openexr/openexr-3.2.3-r2.ebuild b/media-libs/openexr/openexr-3.2.3-r2.ebuild
new file mode 100644
index 000000000000..574d441feb13
--- /dev/null
+++ b/media-libs/openexr/openexr-3.2.3-r2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://openexr.com/"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		utils? (
+			https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
+				-> openexr-images-1.0.tar.gz
+		)
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/31" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+REQUIRED_USE="doc? ( utils )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/libdeflate:=[zlib(+)]
+	>=dev-libs/imath-3.1.6:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/help2man )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
+		-i docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	if use test && use utils; then
+		IMAGES=(
+			Beachball/multipart.0001.exr
+			Beachball/singlepart.0001.exr
+			Chromaticities/Rec709.exr
+			Chromaticities/Rec709_YC.exr
+			Chromaticities/XYZ.exr
+			Chromaticities/XYZ_YC.exr
+			LuminanceChroma/Flowers.exr
+			LuminanceChroma/Garden.exr
+			MultiResolution/ColorCodedLevels.exr
+			MultiResolution/WavyLinesCube.exr
+			MultiResolution/WavyLinesLatLong.exr
+			MultiView/Adjuster.exr
+			TestImages/GammaChart.exr
+			TestImages/GrayRampsHorizontal.exr
+			v2/LeftView/Balls.exr
+			v2/Stereo/Trunks.exr
+		)
+
+		mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+		for image in "${IMAGES[@]}"; do
+			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
+		done
+	fi
+
+}
+
+src_configure() {
+	if use x86; then
+		replace-cpu-flags native i686
+	fi
+
+	local mycmakeargs=(
+		-DOPENEXR_CXX_STANDARD="17"
+
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_WEBSITE="no"
+
+		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
+		-DOPENEXR_BUILD_PYTHON="no"
+		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
+		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
+		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
+
+		-DOPENEXR_INSTALL="yes"
+		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
+		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
+		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
+
+		-DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
+
+		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
+		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
+	)
+	if use test; then
+		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
+		#   - https://bugs.gentoo.org/925128
+		#   - https://openexr.com/en/latest/install.html#component-options
+
+		# NOTE: the fuzz tests are very slow
+		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=()
+
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+	use x86 && CMAKE_SKIP_TESTS+=(
+		'^OpenEXR.testDwaLookups$'
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use examples && docompress -x "/usr/share/doc/${PF}/examples"
+
+	cmake_src_install
+}
diff --git a/media-libs/openexr/openexr-3.2.3.ebuild b/media-libs/openexr/openexr-3.2.3.ebuild
deleted file mode 100644
index 146862dea6dd..000000000000
--- a/media-libs/openexr/openexr-3.2.3.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 cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://openexr.com/"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		utils? (
-			https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
-			  -> openexr-images-1.0.tar.gz
-		)
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/31" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
-REQUIRED_USE="doc? ( utils )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/libdeflate[zlib]
-	>=dev-libs/imath-3.1.6:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( sys-apps/help2man )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -e "s:/var/tmp/:${T}:" \
-		-i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
-
-	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
-		-i docs/CMakeLists.txt || die
-
-	cmake_src_prepare
-
-	if use test && use utils; then
-		IMAGES=(
-			Beachball/multipart.0001.exr
-			Beachball/singlepart.0001.exr
-			Chromaticities/Rec709.exr
-			Chromaticities/Rec709_YC.exr
-			Chromaticities/XYZ.exr
-			Chromaticities/XYZ_YC.exr
-			LuminanceChroma/Flowers.exr
-			LuminanceChroma/Garden.exr
-			MultiResolution/ColorCodedLevels.exr
-			MultiResolution/WavyLinesCube.exr
-			MultiResolution/WavyLinesLatLong.exr
-			MultiView/Adjuster.exr
-			TestImages/GammaChart.exr
-			TestImages/GrayRampsHorizontal.exr
-			v2/LeftView/Balls.exr
-			v2/Stereo/Trunks.exr
-		)
-
-		mkdir -p "${BUILD_DIR}/src/test/bin" || die
-
-		for image in "${IMAGES[@]}"; do
-			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
-			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
-		done
-	fi
-
-}
-
-src_configure() {
-	if use x86; then
-		replace-cpu-flags native i686
-	fi
-
-	local mycmakeargs=(
-		-DOPENEXR_CXX_STANDARD="17"
-
-		-DBUILD_SHARED_LIBS="yes"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_WEBSITE="no"
-
-		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
-		-DOPENEXR_BUILD_PYTHON="no"
-		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
-		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
-		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
-
-		-DOPENEXR_INSTALL="yes"
-		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
-		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
-		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
-
-		-DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
-
-		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
-		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
-	)
-	if use test; then
-		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
-		#   - https://bugs.gentoo.org/925128
-		#   - https://openexr.com/en/latest/install.html#component-options
-
-		# NOTE: the fuzz tests are very slow
-		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=()
-
-	use arm64 && CMAKE_SKIP_TESTS+=(
-		# bug #922247
-		'OpenEXRCore.testDWAACompression'
-		'OpenEXRCore.testDWABCompression'
-	)
-	use x86 && CMAKE_SKIP_TESTS+=(
-		'^OpenEXR.testDwaLookups$'
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use examples && docompress -x "/usr/share/doc/${PF}/examples"
-
-	cmake_src_install
-}
diff --git a/media-libs/openexr/openexr-3.2.4-r2.ebuild b/media-libs/openexr/openexr-3.2.4-r2.ebuild
new file mode 100644
index 000000000000..8c58eef5d830
--- /dev/null
+++ b/media-libs/openexr/openexr-3.2.4-r2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://openexr.com/"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		utils? (
+			https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
+				-> openexr-images-1.0.tar.gz
+		)
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/31" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+REQUIRED_USE="doc? ( utils )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/libdeflate:=[zlib(+)]
+	>=dev-libs/imath-3.1.6:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/help2man )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
+		-i docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	if use test && use utils; then
+		IMAGES=(
+			Beachball/multipart.0001.exr
+			Beachball/singlepart.0001.exr
+			Chromaticities/Rec709.exr
+			Chromaticities/Rec709_YC.exr
+			Chromaticities/XYZ.exr
+			Chromaticities/XYZ_YC.exr
+			LuminanceChroma/Flowers.exr
+			LuminanceChroma/Garden.exr
+			MultiResolution/ColorCodedLevels.exr
+			MultiResolution/WavyLinesCube.exr
+			MultiResolution/WavyLinesLatLong.exr
+			MultiView/Adjuster.exr
+			TestImages/GammaChart.exr
+			TestImages/GrayRampsHorizontal.exr
+			v2/LeftView/Balls.exr
+			v2/Stereo/Trunks.exr
+		)
+
+		mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+		for image in "${IMAGES[@]}"; do
+			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
+		done
+	fi
+
+}
+
+src_configure() {
+	if use x86; then
+		replace-cpu-flags native i686
+	fi
+
+	local mycmakeargs=(
+		-DOPENEXR_CXX_STANDARD="17"
+
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_WEBSITE="no"
+
+		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
+		-DOPENEXR_BUILD_PYTHON="no"
+		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
+		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
+		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
+
+		-DOPENEXR_INSTALL="yes"
+		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
+		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
+		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
+
+		-DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
+
+		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
+		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
+	)
+	if use test; then
+		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
+		#   - https://bugs.gentoo.org/925128
+		#   - https://openexr.com/en/latest/install.html#component-options
+
+		# NOTE: the fuzz tests are very slow
+		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=()
+
+	use arm64 && CMAKE_SKIP_TESTS+=(
+		# bug #922247
+		'OpenEXRCore.testDWAACompression'
+		'OpenEXRCore.testDWABCompression'
+	)
+	use x86 && CMAKE_SKIP_TESTS+=(
+		'^OpenEXR.testDwaLookups$'
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use examples && docompress -x "/usr/share/doc/${PF}/examples"
+
+	cmake_src_install
+}
diff --git a/media-libs/openexr/openexr-3.2.4.ebuild b/media-libs/openexr/openexr-3.2.4.ebuild
deleted file mode 100644
index 915a3cbda2ae..000000000000
--- a/media-libs/openexr/openexr-3.2.4.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 cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://openexr.com/"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		utils? (
-			https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
-			  -> openexr-images-1.0.tar.gz
-		)
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/31" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
-REQUIRED_USE="doc? ( utils )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/libdeflate[zlib]
-	>=dev-libs/imath-3.1.6:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( sys-apps/help2man )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -e "s:/var/tmp/:${T}:" \
-		-i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
-
-	sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
-		-i docs/CMakeLists.txt || die
-
-	cmake_src_prepare
-
-	if use test && use utils; then
-		IMAGES=(
-			Beachball/multipart.0001.exr
-			Beachball/singlepart.0001.exr
-			Chromaticities/Rec709.exr
-			Chromaticities/Rec709_YC.exr
-			Chromaticities/XYZ.exr
-			Chromaticities/XYZ_YC.exr
-			LuminanceChroma/Flowers.exr
-			LuminanceChroma/Garden.exr
-			MultiResolution/ColorCodedLevels.exr
-			MultiResolution/WavyLinesCube.exr
-			MultiResolution/WavyLinesLatLong.exr
-			MultiView/Adjuster.exr
-			TestImages/GammaChart.exr
-			TestImages/GrayRampsHorizontal.exr
-			v2/LeftView/Balls.exr
-			v2/Stereo/Trunks.exr
-		)
-
-		mkdir -p "${BUILD_DIR}/src/test/bin" || die
-
-		for image in "${IMAGES[@]}"; do
-			mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
-			cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/${image}" || die
-		done
-	fi
-
-}
-
-src_configure() {
-	if use x86; then
-		replace-cpu-flags native i686
-	fi
-
-	local mycmakeargs=(
-		-DOPENEXR_CXX_STANDARD="17"
-
-		-DBUILD_SHARED_LIBS="yes"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_WEBSITE="no"
-
-		-DOPENEXR_BUILD_EXAMPLES="$(usex examples)"
-		-DOPENEXR_BUILD_PYTHON="no"
-		-DOPENEXR_BUILD_TOOLS="$(usex utils)"
-		-DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
-		-DOPENEXR_ENABLE_THREADING="$(usex threads)"
-
-		-DOPENEXR_INSTALL="yes"
-		-DOPENEXR_INSTALL_DOCS="$(usex doc)"
-		-DOPENEXR_INSTALL_PKG_CONFIG="yes"
-		-DOPENEXR_INSTALL_TOOLS="$(usex utils)"
-
-		-DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
-
-		-DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
-		-DOPENEXR_FORCE_INTERNAL_IMATH="no"
-	)
-	if use test; then
-		# OPENEXR_RUN_FUZZ_TESTS depends on BUILD_TESTING, see
-		#   - https://bugs.gentoo.org/925128
-		#   - https://openexr.com/en/latest/install.html#component-options
-
-		# NOTE: the fuzz tests are very slow
-		mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS="ON" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=()
-
-	use arm64 && CMAKE_SKIP_TESTS+=(
-		# bug #922247
-		'OpenEXRCore.testDWAACompression'
-		'OpenEXRCore.testDWABCompression'
-	)
-	use x86 && CMAKE_SKIP_TESTS+=(
-		'^OpenEXR.testDwaLookups$'
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use examples && docompress -x "/usr/share/doc/${PF}/examples"
-
-	cmake_src_install
-}
diff --git a/media-libs/openpgl/metadata.xml b/media-libs/openpgl/metadata.xml
index 362878695f7a..3fa42bd60c93 100644
--- a/media-libs/openpgl/metadata.xml
+++ b/media-libs/openpgl/metadata.xml
@@ -19,6 +19,6 @@
 		production environment.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">OpenPathGuidingLibrary/openpgl</remote-id>
+		<remote-id type="github">RenderKit/openpgl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openpgl/openpgl-0.5.0-r1.ebuild b/media-libs/openpgl/openpgl-0.5.0-r1.ebuild
index ceba00c1713e..9984537e2a11 100644
--- a/media-libs/openpgl/openpgl-0.5.0-r1.ebuild
+++ b/media-libs/openpgl/openpgl-0.5.0-r1.ebuild
@@ -6,20 +6,19 @@ EAPI=8
 inherit cmake flag-o-matic
 
 DESCRIPTION="Intel Open Path Guiding Library"
-HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl"
-SRC_URI="https://github.com/OpenPathGuidingLibrary/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/RenderKit/openpgl"
+SRC_URI="https://github.com/RenderKit/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="-* amd64 ~arm64"
 
 X86_CPU_FLAGS=( sse4_2 avx2 avx512dq )
-CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
 IUSE="${CPU_FLAGS[*]} debug"
 
 REQUIRED_USE="
 	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
-	arm64? ( cpu_flags_arm_neon )
 "
 
 RDEPEND="
@@ -40,13 +39,14 @@ src_configure() {
 		-DOPENPGL_ISA_SSE4="$(usex cpu_flags_x86_sse4_2)"
 		-DOPENPGL_ISA_AVX2="$(usex cpu_flags_x86_avx2)"
 		-DOPENPGL_ISA_AVX512="$(usex cpu_flags_x86_avx512dq)"
-		-DOPENPGL_ISA_NEON="$(usex cpu_flags_arm_neon)"
+		-DOPENPGL_ISA_NEON="$(usex arm64)"
 		# TODO look into neon 2x support
-		# -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm_neon2x)"
+		# neon2x is "double pumped" neon on apple silicon
+		# -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm64_neon2x)"
 	)
 
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	use cpu_flags_arm_neon && append-flags -flax-vector-conversions
+	use arm64 && append-flags -flax-vector-conversions
 
 	# Disable asserts
 	append-cppflags "$(usex debug '' '-DNDEBUG')"
diff --git a/media-libs/openpgl/openpgl-0.6.0.ebuild b/media-libs/openpgl/openpgl-0.6.0.ebuild
index 07d8adf9d845..a3ebfbe61803 100644
--- a/media-libs/openpgl/openpgl-0.6.0.ebuild
+++ b/media-libs/openpgl/openpgl-0.6.0.ebuild
@@ -6,20 +6,19 @@ EAPI=8
 inherit cmake flag-o-matic
 
 DESCRIPTION="Intel Open Path Guiding Library"
-HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl"
-SRC_URI="https://github.com/OpenPathGuidingLibrary/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/RenderKit/openpgl"
+SRC_URI="https://github.com/RenderKit/openpgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="-* ~amd64 ~arm64"
 
 X86_CPU_FLAGS=( sse4_2 avx2 avx512dq )
-CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
 IUSE="${CPU_FLAGS[*]} debug"
 
 REQUIRED_USE="
 	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
-	arm64? ( cpu_flags_arm_neon )
 "
 
 RDEPEND="
@@ -40,13 +39,14 @@ src_configure() {
 		-DOPENPGL_ISA_SSE4="$(usex cpu_flags_x86_sse4_2)"
 		-DOPENPGL_ISA_AVX2="$(usex cpu_flags_x86_avx2)"
 		-DOPENPGL_ISA_AVX512="$(usex cpu_flags_x86_avx512dq)"
-		-DOPENPGL_ISA_NEON="$(usex cpu_flags_arm_neon)"
+		-DOPENPGL_ISA_NEON="$(usex arm64)"
 		# TODO look into neon 2x support
-		# -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm_neon2x)"
+		# neon2x is "double pumped" neon on apple silicon
+		# -DOPENPGL_ISA_NEON2X="$(usex cpu_flags_arm64_neon2x)"
 	)
 
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	use cpu_flags_arm_neon && append-flags -flax-vector-conversions
+	use arm64 && append-flags -flax-vector-conversions
 
 	# Disable asserts
 	append-cppflags "$(usex debug '' '-DNDEBUG')"
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index 031b514998a6..bf5610e29372 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -14,7 +14,7 @@
 			Enable support for OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)
 		</flag>
 		<flag name="glfw">
-			Enable support for OpenGL FrameWork (<pkg>media-libs/glfw</pkg>)
+			Build all example files that uses (<pkg>media-libs/glfw</pkg>)
 		</flag>
 		<flag name="ptex">
 			Adds support for faster per-face texture mapping through
diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild
new file mode 100644
index 000000000000..7c2bfcedf8c9
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.6.0-r2.ebuild
@@ -0,0 +1,223 @@
+# 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 cuda flag-o-matic python-any-r1 toolchain-funcs virtualx
+
+MY_PV="$(ver_rs "1-3" '_')"
+
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X cuda doc examples glfw opencl +opengl openmp ptex python tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+# TODO needed for stringify due to unwrapped KERNEL_FILES in opensubdiv/{far,osd}/CMakeLists.txt
+REQUIRED_USE="
+	|| ( opencl opengl )
+"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		dev-python/docutils
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+RDEPEND="
+	opengl? (
+		media-libs/libglvnd
+		glfw? (
+			media-libs/glfw:=
+			X? (
+				x11-libs/libX11
+				x11-libs/libXcursor
+				x11-libs/libXi
+				x11-libs/libXinerama
+				x11-libs/libXrandr
+				x11-libs/libXxf86vm
+			)
+		)
+	)
+	opencl? ( virtual/opencl )
+	openmp? ( || (
+		sys-devel/gcc:*[openmp]
+		sys-libs/libomp
+	) )
+	ptex? ( media-libs/ptex )
+	tbb? ( dev-cpp/tbb:= )
+"
+
+# CUDA_RUNTIME is statically linked
+DEPEND="
+	${RDEPEND}
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.6.0-cudaflags.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use cuda; then
+		# When building binary packages we build all major targets unless specified otherwise
+		if [[ -z "${CUDAARCHS+x}" ]]; then
+			case ${MERGE_TYPE} in
+				source)    CUDAARCHS="native" ;;
+				# buildonly) CUDAARCHS="all" ;;
+				buildonly) CUDAARCHS="all-major" ;;
+			esac
+		fi
+
+		# check if user provided --gpu-architecture/-arch flag instead of CUDAARCHS
+		for f in ${NVCCFLAGS}; do
+			if [[ ${f} == -arch* || ${f} == --gpu-architecture* ]]; then
+				CUDAARCHS="NVCC"
+				break
+			fi
+		done
+
+		if [[ "${CUDAARCHS}" == "NVCC" ]]; then
+			unset  CUDAARCHS
+		else
+			export CUDAARCHS
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/install(/s/^/#DONOTINSTALL /g" \
+		-i \
+			regression/*/CMakeLists.txt \
+			tools/stringify/CMakeLists.txt \
+		|| die
+
+	sed \
+		-e "/install( TARGETS osd_static_[cg]pu/s/^/#DONOTINSTALL /g" \
+		-i \
+			opensubdiv/CMakeLists.txt \
+		|| die
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="share/${PN}/bin"
+
+		# DirectX
+		-DNO_DX="yes"
+
+		# MacOS
+		-DNO_MACOS_FRAMEWORK="yes"
+		-DNO_METAL="yes"
+
+		-DNO_DOC="$(usex !doc)"
+		-DNO_EXAMPLES="$(usex !examples)"
+		-DNO_TUTORIALS="$(usex !tutorials)"
+		-DNO_REGRESSION="$(usex !test)"
+		-DNO_TESTS="$(usex !test)"
+
+		-DNO_PTEX="$(usex !ptex)"
+
+		# GUI
+		-DNO_OPENGL="$(usex !opengl)"
+
+		# Backends
+		-DNO_CUDA="$(usex !cuda)"
+		-DNO_OMP="$(usex !openmp)"
+		-DNO_TBB="$(usex !tbb)"
+		-DNO_OPENCL="$(usex !opencl)"
+	)
+
+	if use cuda; then
+		# The old cmake CUDA module doesn't use environment variable to initialize flags
+		mycmakeargs+=(
+			-DCUDA_NVCC_FLAGS="-forward-unknown-opts ${NVCCFLAGS}"
+		)
+	fi
+
+	if use opencl; then
+		mycmakeargs+=(
+			# not packaged https://github.com/martijnberger/clew
+			-DNO_CLEW="yes"
+		)
+	fi
+
+	if use opengl; then
+		mycmakeargs+=(
+			-DNO_GLTESTS="$(usex !test)"
+			 # GLEW support is unmaintained infavor of their own GL handler code.
+			 # Turning this on will lead to crashes when using their GPU backend.
+			-DNO_GLEW="yes"
+			-DNO_GLFW="$(usex !glfw)"
+		)
+		if use glfw; then
+			mycmakeargs+=(
+				-DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+				-DNO_GLFW_X11="$(usex !X)"
+			)
+		fi
+	fi
+
+	if use ptex; then
+		mycmakeargs+=(
+			-DPTEX_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	fi
+
+	if ! use python; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_Python="yes"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# Fails due to for CL & CUDA kernels, works outside
+		"glImaging"
+	)
+
+	# "far_tutorial_1_2 breaks with gcc and > -O1"
+	tc-is-gcc && is-flagq '-O@(2|3|fast)' && CMAKE_SKIP_TESTS+=( "far_tutorial_1_2" )
+
+	use cuda && cuda_add_sandbox -w
+
+	virtx cmake_src_test
+
+	local KERNELS=( CPU )
+	use openmp && KERNELS+=( OPENMP )
+	use tbb && KERNELS+=( TBB )
+
+	# use cuda && KERNELS+=( CUDA )
+	# use opencl && KERNELS+=( CL )
+
+	use opengl && use X && KERNELS+=( XFB )
+	use opengl && KERNELS+=( GLSL )
+
+	virtx "${BUILD_DIR}/bin/glImaging" -w test -l 3 -s 256 256 -a -k "$(IFS=","; echo "${KERNELS[*]}")"
+}
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 592bbe0d5de8..508ce1e3139e 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,2 +1 @@
-DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
 DIST phonon-backend-vlc-0.12.0.tar.xz 71664 BLAKE2B 9ace1020d8e9a9e97243706ff81703d3f22bf892f402e44451147a24547d09bcf12f5745377c01d65b4d1fb03cd975b323b2cab62f8136880d1d9c004cca7d7b SHA512 78f5ead829d5025c7cb9e01b33819514d795651d1d932c03bd8cc2ad5d427e5aaaeeb6016820d5a7bb9907f6df1142a0fbc097830d7c63b01f77d2167a0c9264
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild
deleted file mode 100644
index 7c4561516741..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.3-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
-
-MY_PN="phonon-backend-vlc"
-inherit ecm kde.org
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.11.0[qt5(+)]
-	media-video/vlc:=[dbus,ogg,vorbis(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 57e453229456..65c56493213c 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,2 +1 @@
-DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
 DIST phonon-4.12.0.tar.xz 408996 BLAKE2B 568af4aec5247759e49db2137978b9f1828256f817bcb321f02e69d597d78e97c9ce437e89cd63b5a8b15c312f74ccee11b34270e74be2dc24c2af9ee97490f0 SHA512 0dbd88464985051f4c43e64a4d0b7e2d65e7f6b54fd2bae4ec1790fbdf9f79348aa91d4839c72a4f66297d5a9c7b379cc34923b99b97130a5443e5b2c0cc8a9a
diff --git a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch b/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
deleted file mode 100644
index a3fe704bba0d..000000000000
--- a/media-libs/phonon/files/phonon-4.11.1-clang-16.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 069d5a3eb81bcbc730e44c27a0d060a85cf9213d Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dimitry@andric.com>
-Date: Sun, 16 Jul 2023 15:17:39 +0200
-Subject: [PATCH] Future-proof build fix for clang > 16
-
-Clang is intending to remove the `-Wno-enum-constexpr-conversion` flag
-in the future, because it can invoke undefined behavior.
-
-To avoid the "integer value NNNN is outside the valid range of values
-[0, 7] for the enumeration type 'ObjectDescriptionType'" warnings,
-explicitly specify that the `ObjectDescriptionType` enum uses `unsigned`
-as the underlying type.
-
-This also allows to remove the CMake patch that added the
-`-Wno-enum-constexpr-conversion` flag.
-
-* asturm 2023-08-20: Drop adding of -Wno-enum-constexpr-conversion in
-  commit f685bdfdf30deeea2d1db01c1edf0c60cbda652e in the first place.
-
----
- phonon/objectdescription.h         | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
-index 97fec2e79..6ce92de54 100644
---- a/phonon/objectdescription.h
-+++ b/phonon/objectdescription.h
-@@ -43,7 +43,7 @@ namespace Phonon
-      *
-      * \ingroup Backend
-      */
--    enum ObjectDescriptionType
-+    enum ObjectDescriptionType : unsigned
-     {
-         /**
-          * Audio output devices. This can be soundcards (with different drivers), soundservers or
--- 
-GitLab
diff --git a/media-libs/phonon/files/phonon-4.12.0-cmake.patch b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
new file mode 100644
index 000000000000..26805cb18267
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.12.0-cmake.patch
@@ -0,0 +1,62 @@
+From 02bde730f0750ca751da81a7077a0f70bf9dd056 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 22 Aug 2024 21:19:07 +0200
+Subject: [PATCH] Hide QtDesigner cmake finding and workarounds behind existing
+ option
+
+Otherwise, `add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)` will
+potentially fail even if PHONON_BUILD_DESIGNER_PLUGIN was not requested.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 32 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c00760fc..babeb392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,23 +116,27 @@ foreach(version ${VERSIONS})
+     # https://bugreports.qt.io/browse/QTBUG-114706
+     add_library(Qt::Widgets ALIAS Qt${QT_MAJOR_VERSION}::Widgets)
+ 
+-    # Designer Plugin
+-    find_package(Qt${QT_MAJOR_VERSION}Designer ${REQUIRED_QT_VERSION})
+-    set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
+-        TYPE RECOMMENDED
+-        DESCRIPTION "Needed to build the Qt Designer plugin"
+-        URL "https://www.qt.io/download")
+-    # https://bugreports.qt.io/browse/QTBUG-114706
+-    if(Qt${QT_MAJOR_VERSION}Xml_FOUND)
+-        add_library(Qt::Xml ALIAS Qt${QT_MAJOR_VERSION}::Xml)
++    if(PHONON_BUILD_DESIGNER_PLUGIN)
++        # Designer Plugin
++        find_package(Qt${QT_MAJOR_VERSION}Designer ${REQUIRED_QT_VERSION})
++        set_package_properties(Qt${QT_MAJOR_VERSION}Designer PROPERTIES
++            TYPE RECOMMENDED
++            DESCRIPTION "Needed to build the Qt Designer plugin"
++            URL "https://www.qt.io/download")
++        # https://bugreports.qt.io/browse/QTBUG-114706
++        if(Qt${QT_MAJOR_VERSION}Xml_FOUND)
++            add_library(Qt::Xml ALIAS Qt${QT_MAJOR_VERSION}::Xml)
++        endif()
++        if(QT_MAJOR_VERSION STREQUAL "6")
++            # Qt6Designer links to OpenGLWidgets but doesnt find it
++            find_package(Qt6OpenGLWidgets ${REQUIRED_QT_VERSION})
++            # https://bugreports.qt.io/browse/QTBUG-114706
++            add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)
++        endif()
+     endif()
+ 
+     if(QT_MAJOR_VERSION STREQUAL "6")
+         find_package(Qt6Core5Compat REQUIRED)
+-        # Qt6Designer links to OpenGLWidgets but doesnt find it
+-        find_package(Qt6OpenGLWidgets ${REQUIRED_QT_VERSION})
+-        # https://bugreports.qt.io/browse/QTBUG-114706
+-        add_library(Qt::OpenGLWidgets ALIAS Qt6::OpenGLWidgets)
+     endif()
+ 
+     set(BUILDSYSTEM_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/${PHONON_LIB_SONAME}/buildsystem/)
+-- 
+2.46.0
+
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index e90f046a5550..7cf9bf61194f 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -10,6 +10,5 @@
 	</upstream>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="vlc">Install VLC Phonon backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/phonon/phonon-4.11.1-r2.ebuild b/media-libs/phonon/phonon-4.11.1-r2.ebuild
deleted file mode 100644
index cfad75fb1aed..000000000000
--- a/media-libs/phonon/phonon-4.11.1-r2.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 desktop ecm kde.org
-
-DESCRIPTION="KDE multimedia abstraction library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libpulse[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 )
-	vlc? ( >=media-libs/phonon-vlc-0.9.60[qt5(+)] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-clang-16.patch" ) # bug 894346
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		-DPHONON_BUILD_SETTINGS=ON
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	make_desktop_entry "${PN}settings" \
-		"Phonon Audio and Video" preferences-desktop-sound
-}
diff --git a/media-libs/phonon/phonon-4.12.0-r3.ebuild b/media-libs/phonon/phonon-4.12.0-r3.ebuild
deleted file mode 100644
index 5ccc7cf1b081..000000000000
--- a/media-libs/phonon/phonon-4.12.0-r3.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 desktop flag-o-matic kde.org multibuild
-
-DESCRIPTION="KDE multimedia abstraction library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
-SLOT="0"
-IUSE="debug designer minimal pulseaudio +qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-DEPEND="
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libpulse[glib]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-	)
-	qt6? (
-		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[gui,widgets]
-		designer? ( dev-qt/qttools:6[designer] )
-	)
-"
-RDEPEND="${DEPEND}
-	!media-libs/phonon-gstreamer
-	|| (
-		kde-frameworks/breeze-icons:*
-		kde-frameworks/oxygen-icons:*
-	)
-"
-BDEPEND="
-	dev-libs/libpcre2:*
-	>=kde-frameworks/extra-cmake-modules-5.115.0:*
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-PDEPEND="
-	!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )
-"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	use debug || append-cppflags -DQT_NO_DEBUG
-
-	myconfigure() {
-		local mycmakeargs=(
-			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
-			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
-			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
-			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
-			-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-			-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-			-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=(
-				-DPHONON_BUILD_QT5=OFF
-				-DPHONON_BUILD_SETTINGS=ON
-			)
-		else
-			mycmakeargs+=(
-				-DPHONON_BUILD_QT6=OFF
-				-DPHONON_BUILD_SETTINGS=$(usex !qt6)
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-	make_desktop_entry "${PN}settings" \
-		"Phonon Audio and Video" preferences-desktop-sound
-}
diff --git a/media-libs/phonon/phonon-4.12.0-r4.ebuild b/media-libs/phonon/phonon-4.12.0-r4.ebuild
new file mode 100644
index 000000000000..545735c83895
--- /dev/null
+++ b/media-libs/phonon/phonon-4.12.0-r4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop flag-o-matic kde.org multibuild
+
+DESCRIPTION="KDE multimedia abstraction library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) !pulseaudio? ( || ( GPL-2 GPL-3 ) )"
+SLOT="0"
+IUSE="debug designer minimal pulseaudio +qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libpulse[glib]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	qt6? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,widgets]
+		designer? ( dev-qt/qttools:6[designer] )
+	)
+"
+RDEPEND="${DEPEND}
+	!media-libs/phonon-gstreamer
+	|| (
+		kde-frameworks/breeze-icons:*
+		kde-frameworks/oxygen-icons:*
+	)
+"
+BDEPEND="
+	dev-libs/libpcre2:*
+	>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+PDEPEND="!minimal? ( >=media-libs/phonon-vlc-0.12.0[qt5?,qt6?] )"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938315
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	myconfigure() {
+		local mycmakeargs=(
+			-DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/}
+			-DPHONON_BUILD_${MULTIBUILD_VARIANT^^}=ON
+			-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+			-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+			-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+			-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
+			-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=(
+				-DPHONON_BUILD_QT5=OFF
+				-DPHONON_BUILD_SETTINGS=ON
+			)
+		else
+			mycmakeargs+=(
+				-DPHONON_BUILD_QT6=OFF
+				-DPHONON_BUILD_SETTINGS=$(usex !qt6)
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+	make_desktop_entry "${PN}settings" \
+		"Phonon Audio and Video" preferences-desktop-sound
+}
diff --git a/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch b/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch
new file mode 100644
index 000000000000..282596049953
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch
@@ -0,0 +1,54 @@
+Do not call the undeclared exit function.  This avoids build problems
+with future compilers which do not support implicit function
+declarations.
+
+diff --git a/configure b/configure
+index 229ccd453ae4487f..fdf3785ad4c5175f 100755
+--- a/configure
++++ b/configure
+@@ -19537,9 +19537,9 @@ int main()
+       || fflush ((FILE *)0) < 0
+       || (fpr = fopen ("conftest0", "r")) == (FILE *)0
+       || fread (test_array, 1, 7, fpr) != 7)
+-    exit (1);
++    return 1;
+   else
+-    exit(0); }
++    return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (ac_try="$ac_link"
+@@ -24022,7 +24022,7 @@ int main()
+   int i;
+   for (i=0; i < B; i++)
+     Array[i] = i - 3;
+-  exit (Array[1] != -2);
++  return Array[1] != -2;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+diff --git a/configure.ac b/configure.ac
+index 8fb7b640864eb4a8..d1f6d7e08c6946d4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,9 +88,9 @@ int main()
+       || fflush ((FILE *)0) < 0
+       || (fpr = fopen ("conftest0", "r")) == (FILE *)0
+       || fread (test_array, 1, 7, fpr) != 7)
+-    exit (1);
++    return 1;
+   else
+-    exit(0); }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
++    return 0; }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
+ 
+ # Checks for header files: ANSI C, POSIX, and nonstandard Unix headers.
+ AC_HEADER_STDC
+@@ -383,7 +383,7 @@ int main()
+   int i;
+   for (i=0; i < B; i++)
+     Array[[i]] = i - 3;
+-  exit (Array[[1]] != -2);
++  return Array[[1]] != -2;
+ }]])],
+ [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
+   if test "$ac_cv_c_gcc_strength_bug" = "yes"
diff --git a/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch b/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch
new file mode 100644
index 000000000000..a14336a580d7
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch
@@ -0,0 +1,46 @@
+https://github.com/NixOS/nixpkgs/commit/92d99c521b2c02fa645b3b993ac4bbaf49e43ddd
+
+diff -ur a/pic2plot/gram.cc b/pic2plot/gram.cc
+--- a/pic2plot/gram.cc	2000-06-28 00:23:21.000000000 -0400
++++ b/pic2plot/gram.cc	2023-09-07 22:59:47.004460065 -0400
+@@ -1229,9 +1229,9 @@
+      char *from;
+      unsigned int count;
+ {
+-  register char *f = from;
+-  register char *t = to;
+-  register int i = count;
++  char *f = from;
++  char *t = to;
++  int i = count;
+
+   while (i-- > 0)
+     *t++ = *f++;
+@@ -1244,9 +1244,9 @@
+ static void
+ __yy_memcpy (char *to, char *from, unsigned int count)
+ {
+-  register char *t = to;
+-  register char *f = from;
+-  register int i = count;
++  char *t = to;
++  char *f = from;
++  int i = count;
+
+   while (i-- > 0)
+     *t++ = *f++;
+@@ -1289,10 +1289,10 @@
+ yyparse(YYPARSE_PARAM_ARG)
+      YYPARSE_PARAM_DECL
+ {
+-  register int yystate;
+-  register int yyn;
+-  register short *yyssp;
+-  register YYSTYPE *yyvsp;
++  int yystate;
++  int yyn;
++  short *yyssp;
++  YYSTYPE *yyvsp;
+   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+   int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+ 
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index 94645c96f8d2..e4735da03c80 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
 HOMEPAGE="https://www.gnu.org/software/plotutils/"
 SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+png X"
diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild
new file mode 100644
index 000000000000..9b4fdd74264e
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool autotools greadme
+
+DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
+HOMEPAGE="https://www.gnu.org/software/plotutils/"
+SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+png X"
+
+DEPEND="
+	media-libs/libxmi
+	png? (
+		media-libs/libpng:0=
+		sys-libs/zlib
+	)
+	X? ( x11-libs/libXaw )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/plotutils-${PV}
+"
+
+DOCS=( AUTHORS COMPAT ChangeLog INSTALL.{fonts,pkg} KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-libxmi.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-configure-c99.patch
+	"${FILESDIR}"/${P}-cxx17-fix.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r libxmi/* || die
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--enable-libplotter
+		--disable-libxmi
+		--disable-static
+		$(use_with png libpng)
+		$(usex X "--with-x --enable-libxmi" "--without-x")
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use X ; then
+		greadme_stdin <<-EOF
+			There are extra fonts available in the plotutils package.
+			The current ebuild does not install them for you since most
+			of them can be installed via the media-fonts/urw-fonts
+			package. See /usr/share/doc/${PF}/INSTALL.fonts for
+			information on installing the remaining Tektronix fonts.
+
+			If you manually install the extra fonts and use the
+			program xfig, you might want to recompile to take
+			advantage of the additional ps fonts.
+			Also, it is possible to enable ghostscript and your
+			printer to use the HP fonts.
+		EOF
+	fi
+}
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild
index f4df3184779f..46af9297856c 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.5.0.ebuild
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
index 306f1b004f3d..b5355e5f2b18 100644
--- a/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
+++ b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/roc-streaming/roc-toolkit/archive/refs/tags/v${PV}.t
 
 LICENSE="MPL-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa llvm-libunwind pulseaudio sox sndfile ssl tools test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 46d191f4d738..c26dbce8a8bf 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1 +1,2 @@
 DIST sdl-mixer-1.2.12_p20221010.tar.gz 5861748 BLAKE2B 95b8e59bf796aa1a1593d8895aa153d62653fc9085e65c380cef3a0394201dd6c5c0deb323d6acecd4bca0e46d11f0ec94ebab8be872654e46d2d56231a1fd12 SHA512 5b15bf81b868968a09f82b160e371355e40a29c95a3e79c3cffa49ab5cc7c3212034d12301c21c8a44aef5c981a7a8fec3cb76e9dfe55619159a613b8dec6557
+DIST sdl-mixer-1.2.12_p20240525.tar.gz 5835402 BLAKE2B 61238592251259c464f4e85be894f8ffcb8259c47bb56cddb0795fa4cd9f3fba2b431680b7a65ac9c2c87153f7e3bdde7b2496f5c536e55764e09c9450cdbea9 SHA512 1925b025c99a47d635f8a9a211712103c641a82c6d4e930b996de4eb1a08d5f5b1892dfd999924e0945d63ae4c59550ac112fbf7f8d76846d6ee54b1434e82a8
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
new file mode 100644
index 000000000000..0fa3a0936e53
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check SDL-1.2 branch for possible backports/new snapshots
+
+inherit multilib-minimal
+
+SDL_MIXER_COMMIT="ed76d39cda0735d26c14a3e4f4da996e420f6478"
+
+MY_PN=${PN/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://github.com/libsdl-org/SDL_mixer/archive/${SDL_MIXER_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-music-flac-shared
+		--disable-music-fluidsynth-shared
+		--disable-music-mod-shared
+		--disable-music-mp3-shared
+		--disable-music-ogg-shared
+
+		$(use_enable wav music-wave)
+		$(use_enable vorbis music-ogg)
+		$(use_enable mikmod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		$(use_enable flac music-flac)
+		$(use_enable static-libs static)
+		$(use_enable smpeg music-mp3)
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable timidity music-timidity-midi)
+		$(use_enable fluidsynth music-fluidsynth-midi)
+
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/shaderc/shaderc-2024.1-r1.ebuild b/media-libs/shaderc/shaderc-2024.1-r1.ebuild
index 7ffb74097d53..6bb171c4aba0 100644
--- a/media-libs/shaderc/shaderc-2024.1-r1.ebuild
+++ b/media-libs/shaderc/shaderc-2024.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 5807307f49bd..4662aea91114 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,3 +1,4 @@
 DIST libsrtp-a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz 636836 BLAKE2B 496afcb80f67a8f76104e338408d4930475daadaf3f7cd2d673336aef938986876995e475a4d932424d7f99f6a339bad360f566d6fd3719316eaf8241970cf8d SHA512 930e665434e80e8a26d81b785563c915619b546a9a0af0455a14278816997074add852fae107027f4899415cb0ab47ffbf9492bea76b94b10f558b52098bbf92
 DIST libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.bz2 418856 BLAKE2B a72e1f75491785b272b0ded46368a67aadb643278e5764d16dcd902ab7e4139d8664ffbacd940f30113ce3171e0b0846fe0d6111ced17c5b08f326cd61b2af14 SHA512 ff9cfbb61a1361e959740d00c741dc6fbe71ca7c61770abc35f70aada402df3884d7d5992ae79472dfe3d7641154d4f13065593fee41bf8eae924e26cc654117
 DIST tg_owt-0_pre20230921.tar.gz 13726037 BLAKE2B 635342dd2127330542374e2f0f9acee91844c3c825fe4610dabe2996c541d9b3dc1681999910e5b591752f7e8f65a089c16b43216dd0c0b84f1a0e913e5a0213 SHA512 538d713e9ac91e9f676cdf301d11d7b5be0d67bda6283537e03b6322f3cca5c0234ff2f2b0b23e9046709f77ed282fc4d3526d3b21ee93478c50380be410372f
+DIST tg_owt-0_pre20240804.tar.gz 11722734 BLAKE2B 084bedf7ae20ba173244851e82749dba31ba1320d83d021876f12350ecaa2fb03e47857fdc8013c87df6cae6e9250ec78548b498f35a92d305a28070475f36e4 SHA512 12bc17f39569f8b09c793d0e65b82926325c8d9046454e385ef7c82ab26f4e39e8f44f7491c80be71743abd78565bca50023b62365437fc8e43fc23d1b64840b
diff --git a/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild b/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild
new file mode 100644
index 000000000000..59214057bbec
--- /dev/null
+++ b/media-libs/tg_owt/tg_owt-0_pre20240804-r1.ebuild
@@ -0,0 +1,123 @@
+# 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:=
+	)
+	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/vidstab/vidstab-1.1.1-r1.ebuild b/media-libs/vidstab/vidstab-1.1.1-r1.ebuild
index 6df252bff8f9..c8203cc91f9d 100644
--- a/media-libs/vidstab/vidstab-1.1.1-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vidstab/vidstab-1.1.1.ebuild b/media-libs/vidstab/vidstab-1.1.1.ebuild
index ec0ef0590a9a..a05d655f90b3 100644
--- a/media-libs/vidstab/vidstab-1.1.1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index fa73a3e3e1e3..6ad7e8b24a26 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6bacbbf4893a..02889381064a 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,2 +1 @@
-DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 DIST vigra-1.11.2_p20240505.tar.gz 34219390 BLAKE2B ad92dc6d21acb52c1aa587a4fbe051fb8416ab8f0b5a7560a6d720f38e73d467c9cebb3940cede83827e7657e30438e4d0d52207cffaf208be76f4ff8cdebca9 SHA512 fa51fc456046989e8bf1225d8ae4bac9ef77b24b9343e657c327f817f3a1b622c645ef22772a6c14c30f7e86ec5ab08df8592ec7b21727146d0f775c010cc9d5
diff --git a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
deleted file mode 100644
index ffa3334f873a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:10:56 +0200
-Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445)
-
----
- config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-index f6f9d563b..47cf4237c 100644
---- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-+++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND)
-                 boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
-                 # Mac with Python 3
-                 boost_python${PYTHON_VERSION_MAJOR}
-+                # conda-forge
-+                boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
-                 # default
-                 boost_python)
- 
diff --git a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
deleted file mode 100644
index 88ed61ee374c..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
-From: JaimeIvanCervantes <jimmycc80@hotmail.com>
-Date: Fri, 16 Jun 2017 13:21:45 -0700
-Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
- when using unsigned int N for TinyVector SIZE. (Fixes #414)
-
----
- include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
-index 1b5efa740..ec89bcf58 100644
---- a/include/vigra/multi_convolution.hxx
-+++ b/include/vigra/multi_convolution.hxx
-@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
-                   class T2, class S2>
-         void
-         gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                   MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                   MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                    double sigma,
-                                    ConvolutionOptions<N> opt = ConvolutionOptions<N>());
- 
-@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
-                                   class T2, class S2>
-         void
-         gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                   MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                   MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                    ConvolutionOptions<N> opt);
- 
-         // likewise, but execute algorithm in parallel
-@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
-                                   class T2, class S2>
-         void
-         gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                   MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                   MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                    BlockwiseConvolutionOptions<N> opt);
-     }
-     \endcode
-@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                           MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                           MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                            ConvolutionOptions<N> opt )
- {
-     if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
-           class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                           MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                           MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                            double sigma,
-                            ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
-     dest.init(0.0);
- 
-     typedef typename NumericTraits<T1>::RealPromote TmpType;
--    MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
-+    MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
- 
-     using namespace multi_math;
- 
-@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
-                                   class T2, class S2>
-         void
-         symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                    MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                    MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                     ConvolutionOptions<N> opt = ConvolutionOptions<N>());
- 
-         // execute algorithm in parallel
-@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
-                                   class T2, class S2>
-         void
-         symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                                    MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                                    MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                                     BlockwiseConvolutionOptions<N> opt);
-     }
-     \endcode
-@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
--                            MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+                            MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
-                             ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-     if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
-         template <unsigned int N, class T1, class S1,
-                                   class T2, class S2>
-         void
--        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                                      MultiArrayView<N, T2, S2> divergence,
-                                      ConvolutionOptions<N> const & opt);
- 
-         template <unsigned int N, class T1, class S1,
-                                   class T2, class S2>
-         void
--        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                                      MultiArrayView<N, T2, S2> divergence,
-                                      double sigma,
-                                      ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
-         template <unsigned int N, class T1, class S1,
-                                   class T2, class S2>
-         void
--        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+        gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                                      MultiArrayView<N, T2, S2> divergence,
-                                      BlockwiseConvolutionOptions<N> const & opt);
-     }
-@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
- template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                              MultiArrayView<N, T2, S2> divergence,
-                              ConvolutionOptions<N> const & opt)
- {
-@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
- template <unsigned int N, class T1, class S1,
-                           class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
-                              MultiArrayView<N, T2, S2> divergence,
-                              double sigma,
-                              ConvolutionOptions<N> opt = ConvolutionOptions<N>())
diff --git a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch b/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
deleted file mode 100644
index 2433ba41712a..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-gcc-10.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dc730be49fc8def4304a651fa525e43b7754955e Mon Sep 17 00:00:00 2001
-From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-Date: Tue, 16 Oct 2018 19:26:17 +0200
-Subject: [PATCH] fixed noexcept declaration
-
----
- include/vigra/separableconvolution.hxx | 6 +++---
- include/vigra/stdconvolution.hxx       | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/vigra/separableconvolution.hxx b/include/vigra/separableconvolution.hxx
-index 7ee33c09d..8fd120602 100644
---- a/include/vigra/separableconvolution.hxx
-+++ b/include/vigra/separableconvolution.hxx
-@@ -1409,10 +1409,10 @@ class Kernel1D
-         {}
- 
-         ~InitProxy()
--#ifndef _MSC_VER
--            throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
-             noexcept(false)
-+#else
-+            throw(PreconditionViolation)
- #endif
-         {
-             vigra_precondition(count_ == 1 || count_ == sum_,
-diff --git a/include/vigra/stdconvolution.hxx b/include/vigra/stdconvolution.hxx
-index 76d61a53f..657247259 100644
---- a/include/vigra/stdconvolution.hxx
-+++ b/include/vigra/stdconvolution.hxx
-@@ -792,10 +792,10 @@ public:
-         {}
- 
-         ~InitProxy()
--#ifndef _MSC_VER
--            throw(PreconditionViolation)
--#elif _MSC_VER >= 1900
-+#if _MSC_VER >= 1900 || __cplusplus >= 201103L
-             noexcept(false)
-+#else
-+            throw(PreconditionViolation)
- #endif
-         {
-             vigra_precondition(count_ == 1 || count_ == sum_,
diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
deleted file mode 100644
index 703cd22b9321..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
-https://bugs.gentoo.org/823632
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
- 
- 
- IF(WITH_OPENEXR)
-+    FIND_PACKAGE(Imath CONFIG)
-+    IF(TARGET Imath::Imath)
-+        FIND_PACKAGE(OpenEXR CONFIG)
-+        SET(OPENEXR_LIBRARIES
-+		    OpenEXR::OpenEXR
-+		    OpenEXR::Iex
-+			OpenEXR::IlmThread
-+			Imath::Imath
-+		)
-+		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
-+		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
-+		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
-+		set(OPENEXR_FOUND TRUE)
-+	ELSE()
-     VIGRA_FIND_PACKAGE(OpenEXR)
-+	ENDIF()
- ENDIF()
- 
- IF(WITH_HDF5)
---- a/src/impex/CMakeLists.txt
-+++ b/src/impex/CMakeLists.txt
-@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
- 
- IF(OPENEXR_FOUND)
-+  cmake_policy(SET CMP0028 NEW)
-   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
- ENDIF(OPENEXR_FOUND)
- 
diff --git a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch b/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
deleted file mode 100644
index 111bc06d5716..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python-syntax.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/ukoethe/vigra/commit/aba7e731bdde39516b5470673ce40a0036665201
-https://github.com/ukoethe/vigra/commit/c949d3640266f515eb1e3ecca2b752e13e0c3804
-
-From aba7e731bdde39516b5470673ce40a0036665201 Mon Sep 17 00:00:00 2001
-From: Mark Harfouche <mark.harfouche@gmail.com>
-Date: Mon, 5 Sep 2022 15:10:08 -0400
-Subject: [PATCH] Avoid using `is not` when comparing to an integer
-
----
- vigranumpy/lib/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vigranumpy/lib/__init__.py b/vigranumpy/lib/__init__.py
-index 072a797c6..f598e0a8d 100644
---- a/vigranumpy/lib/__init__.py
-+++ b/vigranumpy/lib/__init__.py
-@@ -1780,7 +1780,7 @@ def handle_click(self, event):
-                         for yo in range(-1*bs, bs+1):
-                             xx = x+xo
-                             yy = y+yo
--                            if xo is not 0 or yo is not 0:
-+                            if (xo != 0) or (yo != 0):
-                                 if  xx >=0 and xx<shape[0] and \
-                                     yy >=0 and yy<shape[0]:
-                                     otherLabel = labels[xx, yy]
-
-From c949d3640266f515eb1e3ecca2b752e13e0c3804 Mon Sep 17 00:00:00 2001
-From: Omari Stephens <xsdg@xsdg.org>
-Date: Tue, 28 Dec 2021 21:54:51 +0000
-Subject: [PATCH] Updates doc generation config for Python 3 compatibility
-
----
- vigranumpy/docsrc/conf.py.cmake2.in | 2 +-
- vigranumpy/docsrc/conf.py.in        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vigranumpy/docsrc/conf.py.cmake2.in b/vigranumpy/docsrc/conf.py.cmake2.in
-index e4266a636..175dfb39f 100644
---- a/vigranumpy/docsrc/conf.py.cmake2.in
-+++ b/vigranumpy/docsrc/conf.py.cmake2.in
-@@ -23,7 +23,7 @@ _original_getargspec = inspect.getargspec
- def _getargspec_workaround(*args, **kw):
-     try:
-         return _original_getargspec(*args, **kw)
--    except TypeError, e:
-+    except TypeError as e:
-         if str(e).startswith('arg is not a Python function'):
-             return inspect.ArgSpec([], None, None, None)
-         else:
-diff --git a/vigranumpy/docsrc/conf.py.in b/vigranumpy/docsrc/conf.py.in
-index 607559352..ac2261d20 100644
---- a/vigranumpy/docsrc/conf.py.in
-+++ b/vigranumpy/docsrc/conf.py.in
-@@ -22,7 +22,7 @@ _original_getargspec = inspect.getargspec
- def _getargspec_workaround(*args, **kw):
-     try:
-         return _original_getargspec(*args, **kw)
--    except TypeError, e:
-+    except TypeError as e:
-         if str(e).startswith('arg is not a Python function'):
-             return inspect.ArgSpec([], None, None, None)
-         else:
-
-
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch b/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
deleted file mode 100644
index 7001a2a0217e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.12-distutils.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/ukoethe/vigra/commit/1203cccaed97c276d7c3cf6886730d03f6e8dfc6
-
-(But with some edits for more distutils removals & rebase.)
-
-From 1203cccaed97c276d7c3cf6886730d03f6e8dfc6 Mon Sep 17 00:00:00 2001
-From: Mark Harfouche <mark.harfouche@gmail.com>
-Date: Sat, 30 Sep 2023 16:25:08 -0400
-Subject: [PATCH] Do not use distutils since it is deprecated
-
---- a/vigranumpy/setup.py.cmake2.in
-+++ b/vigranumpy/setup.py.cmake2.in
-@@ -1,5 +1,8 @@
--import distutils, ctypes.util, shutil, os, sys
--from distutils.core import setup
-+import ctypes.util
-+import shutil
-+import os
-+import sys
-+from setuptools import setup
- 
- # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
- # if additional libraries are linked dynamically (e.g. tiff, png)
---- a/vigranumpy/setup.py.in
-+++ b/vigranumpy/setup.py.in
-@@ -1,5 +1,9 @@
--import distutils, ctypes.util, shutil, os, sys
--from distutils.core import setup
-+import ctypes.util
-+import shutil
-+import os
-+import sys
-+from setuptools import setup
-+
- 
- # copy the required DLLs to the directory $vigranumpy_tmp_dir/dlls
- # if additional libraries are linked dynamically (e.g. tiff, png)
-
---- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-+++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake
-@@ -40,7 +40,7 @@ IF(PYTHONINTERP_FOUND)
-     #
-     ######################################################################
-     execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
--                    "from distutils.sysconfig import *; print(get_python_inc())"
-+                    "import sysconfig; print(sysconfig.get_paths()['include'])"
-                     OUTPUT_VARIABLE PYTHON_INCLUDE OUTPUT_STRIP_TRAILING_WHITESPACE)
-     SET(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE}
-         CACHE PATH "Path to Python include files"
-@@ -66,10 +66,10 @@ IF(PYTHONINTERP_FOUND)
-             set(PYTHON_LIBRARY_NAME python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-         ELSE()
-             execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
--                             "from distutils.sysconfig import *; print(get_config_var('LDLIBRARY'))"
-+                             "import sysconfig; print(sysconfig.get_config_var('LDLIBRARY'))"
-                               OUTPUT_VARIABLE PYTHON_LIBRARY_NAME OUTPUT_STRIP_TRAILING_WHITESPACE)
-             execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
--                             "from distutils.sysconfig import *; print(get_config_var('LIBDIR'))"
-+                             "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"
-                                OUTPUT_VARIABLE PYTHON_LIBRARY_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
-         ENDIF()
-         FIND_LIBRARY(PYTHON_LIBRARIES ${PYTHON_LIBRARY_NAME} HINTS "${PYTHON_LIBRARY_PREFIX}" "${PYTHON_PREFIX}"
-@@ -139,7 +139,7 @@ IF(PYTHONINTERP_FOUND)
-     ######################################################################
-     IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
-         execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
--                         "from distutils.sysconfig import *; print(get_python_lib(1))"
-+                         "import sysconfig; print(sysconfig.get_paths()['purelib'])"
-                           OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
-         FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
-     ENDIF()
diff --git a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch b/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
deleted file mode 100644
index 2e6cd3469f8e..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-python3.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a6fa62663c6a6b752ed0707e95f643e25867a0f9 Mon Sep 17 00:00:00 2001
-From: John Kirkham <kirkhamj@janelia.hhmi.org>
-Date: Fri, 19 Oct 2018 11:32:42 -0400
-Subject: [PATCH] Receive `const char *` from `PyUnicode_AsUTF8`
-
-In Python 3.7, `PyUnicode_AsUTF8` was changed to return a `const char *`
-instead of a `char *`. This broke VIGRA as we were accepting a `char *`
-in this case instead. Fortunately we do not need it to be mutable for
-our use case. So just type the variable storing the result from
-`PyUnicode_AsUTF8` as a `const char *`. Should still work on older
-Python 3 versions that return `char *` as well.
-
-ref: https://bugs.python.org/issue28769
----
- vigranumpy/src/core/vigranumpycore.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx
-index ec38d3636..c81c6ae52 100644
---- a/vigranumpy/src/core/vigranumpycore.cxx
-+++ b/vigranumpy/src/core/vigranumpycore.cxx
-@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s)
- 	return checksum(data, size);
- #else
- 	Py_ssize_t size = 0;
--	char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
-+	const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
- 	return checksum(data, size);
- #endif
- }
diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
deleted file mode 100644
index fc265763f6ad..000000000000
--- a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8
-Bug-Debian: https://bugs.debian.org/923467
-Author: Andreas Tille <tille@debian.org>
-Last-Update: Fri, 08 Mar 2019 18:38:02 +0100
-
---- a/vigranumpy/docsrc/conf.py.cmake2.in
-+++ b/vigranumpy/docsrc/conf.py.cmake2.in
-@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
- 
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
---- a/vigranumpy/docsrc/conf.py.in
-+++ b/vigranumpy/docsrc/conf.py.in
-@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath']
- 
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
deleted file mode 100644
index 07f703b229be..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-inherit cmake flag-o-matic python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
-	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
-
-REQUIRED_USE="
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-# runtime dependency on python is required by the vigra-config script
-DEPEND="
-	fftw? ( sci-libs/fftw:3.0= )
-	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	openexr? (
-		>=dev-libs/imath-3.1.4-r2:=
-		>=media-libs/openexr-3:0=
-	)
-	png? ( media-libs/libpng:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	tiff? ( media-libs/tiff:= )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${PYTHON_DEPS}
-	${DEPEND}
-"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
-	"${FILESDIR}/${P}-boost-python.patch"
-	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
-	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
-	"${FILESDIR}/${PN}-1.11.2-python3.12-remove-imp.patch" # bug 929649
-	"${FILESDIR}/${PN}-1.11.1-python3.12-distutils.patch" # bug 929649
-	# TODO: upstream
-	"${FILESDIR}/${P}-lib_suffix.patch"
-	"${FILESDIR}/${P}-cmake-module-dir.patch"
-	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
-	"${FILESDIR}/${P}-openexr3.patch"
-	"${FILESDIR}/${P}-python-syntax.patch"
-)
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_prepare() {
-	vigra_disable() {
-		if ! use ${1}; then
-			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
-				-i CMakeLists.txt || die "failed to disable ${1}"
-		fi
-	}
-
-	cmake_src_prepare
-
-	vigra_disable fftw fftw3
-	vigra_disable fftw fftw3f
-	vigra_disable jpeg
-	vigra_disable png
-	vigra_disable tiff
-	vigra_disable zlib
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
-
-	use doc || cmake_comment_add_subdirectory docsrc
-
-	if ! use test; then
-		cmake_comment_add_subdirectory test
-		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
-	fi
-}
-
-src_configure() {
-	# Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
-	# bug #808731
-	use hdf5 && append-cppflags -DH5_USE_110_API
-
-	vigra_configure() {
-		local mycmakeargs=(
-			-DAUTOEXEC_TESTS=OFF
-			-DDOCINSTALL="share/doc/${PF}/html"
-			-DWITH_HDF5=$(usex hdf5)
-			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=OFF # only used for tests
-			-DWITH_VIGRANUMPY=$(usex python)
-		)
-		cmake_src_configure
-	}
-
-	if use python; then
-		python_foreach_impl vigra_configure
-	else
-		vigra_configure
-	fi
-}
-
-src_compile() {
-	local VIGRA_BUILD_DIR
-	vigra_compile() {
-		cmake_src_compile
-		VIGRA_BUILD_DIR="${BUILD_DIR}"
-	}
-	if use python; then
-		python_foreach_impl vigra_compile
-	else
-		vigra_compile
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl cmake_src_install
-		python_optimize
-	else
-		cmake_src_install
-	fi
-}
-
-src_test() {
-	# perhaps disable tests (see #390447)
-	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
-	}
-	if use python; then
-		python_foreach_impl vigra_test
-	else
-		vigra_test
-	fi
-}
diff --git a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
index 09cc7b4ffdc8..6637427cd835 100644
--- a/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
+++ b/media-libs/vigra/vigra-1.11.2_p20240505.ebuild
@@ -23,7 +23,7 @@ else
 		SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
 	fi
 
-	KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/vips/vips-8.15.2.ebuild b/media-libs/vips/vips-8.15.2.ebuild
index 5c06e49cb788..317bef1eb0a8 100644
--- a/media-libs/vips/vips-8.15.2.ebuild
+++ b/media-libs/vips/vips-8.15.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit flag-o-matic meson python-single-r1 toolchain-funcs vala
 
 MY_PV=${PV}a # cleanup next bump
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild
index de009aa28375..b9e5f80b13f3 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.290.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild
index ca20e66ef4a1..7dbff34236a8 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.290.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/media-libs/waffle/waffle-1.8.1.ebuild b/media-libs/waffle/waffle-1.8.1.ebuild
index c90b20ae53d1..046bb04eaf51 100644
--- a/media-libs/waffle/waffle-1.8.1.ebuild
+++ b/media-libs/waffle/waffle-1.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson-multilib multilib virtualx ${GIT_ECLASS}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index b95b528c7338..df3438c35d15 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,2 +1,3 @@
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
+DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160147ba41cd1a692ae9a661b76608ac11e05aa5bc4628030f833d6a822cee187f3fbc4c015e094eb1b30c96783147124 SHA512 6d0d9e079d6c7650abb5c00ad60cf3cfe72a220b3ee7cd030d4daeefdd9feeb4d056cf2e01b2f8d2fb0a66ccc15cdde860237f8ac5eac42ede6e5444a81346f8
diff --git a/media-libs/x264/x264-0.0.20240513.ebuild b/media-libs/x264/x264-0.0.20240513.ebuild
new file mode 100644
index 000000000000..e5fa9d33f6bd
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20240513.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with media-video/x264-encoder
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Free library for encoding X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
+	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${PN}-${X264_COMMIT}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/164" # SONAME
+IUSE="cpu_flags_ppc_altivec +interlaced opencl static-libs +threads"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )
+	opencl? ( dev-lang/perl )
+"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
+
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
+
+multilib_src_configure() {
+	tc-export CC
+
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
+	local asm_conf=""
+
+	if \
+		[[ ${ABI} == x86* ]] \
+		|| [[ ${ABI} == "x32" ]] \
+		|| [[ ${CHOST} == armv5* ]] \
+		|| [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; } \
+		|| use mips && { ! test-compile 'c' 'int main(void){__asm__("addvi.b $w0, $w1, 1");return 0;}' ; }
+	then
+		asm_conf=" --disable-asm"
+	fi
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		--cross-prefix="${CHOST}-" \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex opencl "" "--disable-opencl") \
+		$(usex static-libs "--enable-static" "") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index e94280109f25..e5fa9d33f6bd 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
 else
-	X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-${X264_COMMIT}"
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index c27eb2713e67..2ea6fb64ce0a 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1 +1,2 @@
+DIST x265-3.6.tar.gz 1655889 BLAKE2B 2598421e2e21974998b0b20895dc7e12dbf6ebe1b6c23bb5a7710b575d3db773335cd1f0b3ef110b79cf4d6dd01e543e9807a0509963497edc25f617f80c29f3 SHA512 570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
diff --git a/media-libs/x265/files/test-ns.patch b/media-libs/x265/files/test-ns.patch
index 898751a7ae2d..86cadade6a09 100644
--- a/media-libs/x265/files/test-ns.patch
+++ b/media-libs/x265/files/test-ns.patch
@@ -1,7 +1,5 @@
 Namespace functions for multi-bitdepth builds so that libraries are self-contained.
 
-Index: source/common/param.h
-===================================================================
 --- source.orig/common/param.h
 +++ source/common/param.h
 @@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param
@@ -23,8 +21,6 @@ Index: source/common/param.h
  #define PARAM_NS X265_NS
  #endif
  }
-Index: source/encoder/api.cpp
-===================================================================
 --- source.orig/encoder/api.cpp
 +++ source/encoder/api.cpp
 @@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_par
@@ -58,15 +54,6 @@ Index: source/encoder/api.cpp
      }
      x265_copy_params(&save, encoder->m_latestParam);
      int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
-@@ -604,7 +604,7 @@ fail:
-         *pi_nal = 0;
- 
-     if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart)
--        x265_csvlog_frame(encoder->m_param, pic_out);
-+        PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
- 
-     if (numEncoded < 0)
-         encoder->m_aborted = true;
 @@ -637,7 +637,7 @@ void x265_vmaf_encoder_log(x265_encoder*
          encoder->fetchStats(&stats, sizeof(stats));
          int padx = encoder->m_sps.conformanceWindow.rightOffset;
@@ -76,15 +63,6 @@ Index: source/encoder/api.cpp
      }
  }
  #endif
-@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc,
-         encoder->fetchStats(&stats, sizeof(stats));
-         int padx = encoder->m_sps.conformanceWindow.rightOffset;
-         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
--        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-+        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-     }
- }
- 
 @@ -872,7 +872,7 @@ void x265_alloc_analysis_data(x265_param
      return;
  
@@ -94,8 +72,6 @@ Index: source/encoder/api.cpp
  }
  
  void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis)
-Index: source/encoder/encoder.cpp
-===================================================================
 --- source.orig/encoder/encoder.cpp
 +++ source/encoder/encoder.cpp
 @@ -186,8 +186,8 @@ void Encoder::create()
@@ -127,15 +103,6 @@ Index: source/encoder/encoder.cpp
              X265_FREE(m_dupBuffer[i]);
          }
  
-@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture*
-     if (m_exportedPic)
-     {
-         if (!m_param->bUseAnalysisFile && m_param->analysisSave)
--            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-+            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
-         m_exportedPic = NULL;
-         m_dpb->recycleUnreferenced();
 @@ -1968,7 +1968,7 @@ int Encoder::encode(const x265_picture*
  
              /* Free up inputPic->analysisData since it has already been used */
@@ -280,8 +247,6 @@ Index: source/encoder/encoder.cpp
      m_aborted = true; \
      return; \
  }\
-Index: source/common/param.cpp
-===================================================================
 --- source.orig/common/param.cpp
 +++ source/common/param.cpp
 @@ -102,7 +102,7 @@ x265_param *x265_param_alloc()
@@ -293,3 +258,23 @@ Index: source/common/param.cpp
  #ifdef SVT_HEVC
       x265_free(p->svtHevcParam);
  #endif
+--- source.orig/encoder/api.cpp
++++ source/encoder/api.cpp
+@@ -604,7 +604,7 @@ fail:
+         *pi_nal = 0;
+ 
+     if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart)
+-        x265_csvlog_frame(encoder->m_param, pic_out);
++        PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
+ 
+     if (numEncoded < 0)
+         encoder->m_aborted = true;
+@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc,
+         encoder->fetchStats(&stats, sizeof(stats));
+         int padx = encoder->m_sps.conformanceWindow.rightOffset;
+         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
+-        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
++        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
+     }
+ }
+ 
diff --git a/media-libs/x265/files/x265-3.5-r5-cpp-std.patch b/media-libs/x265/files/x265-3.5-r5-cpp-std.patch
new file mode 100644
index 000000000000..99fbf9bd75de
--- /dev/null
+++ b/media-libs/x265/files/x265-3.5-r5-cpp-std.patch
@@ -0,0 +1,23 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 23 Aug 2024 14:31:40 +0200
+Subject: [PATCH] don't force old c++ standards
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,14 +221,6 @@ if(GCC)
+     if(NOT INTEL_CXX AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
+         add_definitions(-Wno-class-memaccess)
+     endif()
+-    if(ENABLE_HDR10_PLUS)
+-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")
+-            message(FATAL_ERROR "gcc version above 4.8 required to support hdr10plus")
+-        endif()
+-        add_definitions(-std=gnu++11)
+-    else()
+-        add_definitions(-std=gnu++98)
+-    endif()
+     if(ENABLE_PIC)
+          add_definitions(-fPIC)
+     endif(ENABLE_PIC)
diff --git a/media-libs/x265/files/x265-3.5-r5-gcc15.patch b/media-libs/x265/files/x265-3.5-r5-gcc15.patch
new file mode 100644
index 000000000000..6a474d3c192f
--- /dev/null
+++ b/media-libs/x265/files/x265-3.5-r5-gcc15.patch
@@ -0,0 +1,29 @@
+From: Ted Rodgers <ted.d.rodgers@gmail.com>
+Date: Fri, 23 Aug 2024 12:15:56 +0200
+Subject: [PATCH] Explicitly include <cstdint>
+
+GCC 15 will no longer include <cstdint> by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+/var/tmp/portage/media-libs/x265-3.5-r4/work/x265_3.5/source/dynamicHDR10/json11/json11.cpp:101:32: error: ‘uint8_t’ does not name a type
+  101 |         } else if (static_cast<uint8_t>(ch) <= 0x1f) {
+      |                                ^~~~~~~
+/var/tmp/portage/media-libs/x265-3.5-r4/work/x265_3.5/source/dynamicHDR10/json11/json11.cpp:28:1: note: ‘uint8_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+   27 | #include <limits>
+  +++ |+#include <cstdint>
+   28 | 
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/dynamicHDR10/json11/json11.cpp
++++ b/dynamicHDR10/json11/json11.cpp
+@@ -25,6 +25,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
++#include <cstdint>
+ 
+ #if _MSC_VER
+ #pragma warning(disable: 4510) //const member cannot be default initialized
diff --git a/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch b/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch
new file mode 100644
index 000000000000..eec119f7f923
--- /dev/null
+++ b/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch
@@ -0,0 +1,11 @@
+--- source.orig/encoder/encoder.cpp
++++ source/encoder/encoder.cpp
+@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture*
+     if (m_exportedPic)
+     {
+         if (!m_param->bUseAnalysisFile && m_param->analysisSave)
+-            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
++            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
+         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
+         m_exportedPic = NULL;
+         m_dpb->recycleUnreferenced();
diff --git a/media-libs/x265/files/x265-3.6-cmake-cleanup.patch b/media-libs/x265/files/x265-3.6-cmake-cleanup.patch
new file mode 100644
index 000000000000..7cbe3722f1e0
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-cmake-cleanup.patch
@@ -0,0 +1,47 @@
+From d6b009be2aa62c679ea994125c02310d4b8d401b Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:23:49 +0200
+Subject: [PATCH 1/2] cmake: cleanup old policies
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,18 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
+         FORCE)
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+-if(POLICY CMP0025)
+-    cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
+-endif()
+-if(POLICY CMP0042)
+-    cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+-endif()
+-if(POLICY CMP0054)
+-    cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
+-endif()
+ 
++cmake_minimum_required (VERSION 3.28) # OBJECT libraries require 2.8.8
+ project (x265)
+-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckSymbolExists)
+
+From 701cc9679e9453cc94afac7904657262109e56b5 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:23:59 +0200
+Subject: [PATCH 2/2] cmake: fix nasm warning
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/cmake/FindNasm.cmake
++++ b/cmake/FindNasm.cmake
+@@ -20,6 +20,6 @@ if(NASM_EXECUTABLE)
+ endif()
+ 
+ # Provide standardized success/failure messages
+-find_package_handle_standard_args(nasm
++find_package_handle_standard_args(Nasm
+     REQUIRED_VARS NASM_EXECUTABLE
+     VERSION_VAR NASM_VERSION_STRING)
diff --git a/media-libs/x265/files/x265-3.6-code-cleanup.patch b/media-libs/x265/files/x265-3.6-code-cleanup.patch
new file mode 100644
index 000000000000..dbea7ef6c1ff
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-code-cleanup.patch
@@ -0,0 +1,140 @@
+From bca0b4b72977683794d441e57adc8c279ff4bfca Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:25:35 +0200
+Subject: [PATCH 1/4] use boolean compare instead of bitwise
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/cudata.cpp b/common/cudata.cpp
+index 19281de..d5b295f 100644
+--- a/common/cudata.cpp
++++ b/common/cudata.cpp
+@@ -73,7 +73,7 @@ inline bool isEqualRow(int addrA, int addrB)
+ /* Check whether 2 addresses point to the same row or column */
+ inline bool isEqualRowOrCol(int addrA, int addrB)
+ {
+-    return isEqualCol(addrA, addrB) | isEqualRow(addrA, addrB);
++    return isEqualCol(addrA, addrB) || isEqualRow(addrA, addrB);
+ }
+ 
+ /* Check whether one address points to the first column */
+
+From da3eb3ea55be74e440b272e24d7d8e67cb7a76db Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:44:55 +0200
+Subject: [PATCH 2/4] fix variable shadowing
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/cudata.h b/common/cudata.h
+index 8397f05..7f132e6 100644
+--- a/common/cudata.h
++++ b/common/cudata.h
+@@ -48,7 +48,7 @@ enum PartSize
+     SIZE_2NxnD, // asymmetric motion partition, 2Nx(3N/2) + 2Nx( N/2)
+     SIZE_nLx2N, // asymmetric motion partition, ( N/2)x2N + (3N/2)x2N
+     SIZE_nRx2N, // asymmetric motion partition, (3N/2)x2N + ( N/2)x2N
+-    NUM_SIZES
++    PART_NUM_SIZES
+ };
+ 
+ enum PredMode
+
+From 4ec09af244e2cfe3dfb739d74af7640ac114e775 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:45:33 +0200
+Subject: [PATCH 3/4] register is a unused and reserved keyword in c++-17
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/md5.cpp b/common/md5.cpp
+index a9042f4..7e638e7 100644
+--- a/common/md5.cpp
++++ b/common/md5.cpp
+@@ -185,7 +185,10 @@ void MD5Final(MD5Context *ctx, uint8_t *digest)
+  */
+ void MD5Transform(uint32_t *buf, uint32_t *in)
+ {
+-    register uint32_t a, b, c, d;
++#if __cplusplus < 201703L
++    register
++#endif
++    uint32_t a, b, c, d;
+ 
+     a = buf[0];
+     b = buf[1];
+
+From 09379bbfe797e54f91ef5702c802f75aad604067 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:26:55 +0200
+Subject: [PATCH 4/4] use std::abs instead of abs to avoid truncating values
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/pixel.cpp b/common/pixel.cpp
+index 3cd074c..62410f3 100644
+--- a/common/pixel.cpp
++++ b/common/pixel.cpp
+@@ -124,10 +124,10 @@ int ads_x4(int encDC[4], uint32_t *sums, int delta, uint16_t *costMvX, int16_t *
+     int nmv = 0;
+     for (int16_t i = 0; i < width; i++, sums++)
+     {
+-        int ads = abs(encDC[0] - long(sums[0]))
+-            + abs(encDC[1] - long(sums[lx >> 1]))
+-            + abs(encDC[2] - long(sums[delta]))
+-            + abs(encDC[3] - long(sums[delta + (lx >> 1)]))
++        int ads = std::abs(encDC[0] - long(sums[0]))
++            + std::abs(encDC[1] - long(sums[lx >> 1]))
++            + std::abs(encDC[2] - long(sums[delta]))
++            + std::abs(encDC[3] - long(sums[delta + (lx >> 1)]))
+             + costMvX[i];
+         if (ads < thresh)
+             mvs[nmv++] = i;
+@@ -141,8 +141,8 @@ int ads_x2(int encDC[2], uint32_t *sums, int delta, uint16_t *costMvX, int16_t *
+     int nmv = 0;
+     for (int16_t i = 0; i < width; i++, sums++)
+     {
+-        int ads = abs(encDC[0] - long(sums[0]))
+-            + abs(encDC[1] - long(sums[delta]))
++        int ads = std::abs(encDC[0] - long(sums[0]))
++            + std::abs(encDC[1] - long(sums[delta]))
+             + costMvX[i];
+         if (ads < thresh)
+             mvs[nmv++] = i;
+@@ -156,7 +156,7 @@ int ads_x1(int encDC[1], uint32_t *sums, int, uint16_t *costMvX, int16_t *mvs, i
+     int nmv = 0;
+     for (int16_t i = 0; i < width; i++, sums++)
+     {
+-        int ads = abs(encDC[0] - long(sums[0]))
++        int ads = std::abs(encDC[0] - long(sums[0]))
+             + costMvX[i];
+         if (ads < thresh)
+             mvs[nmv++] = i;
+diff --git a/encoder/analysis.cpp b/encoder/analysis.cpp
+index aabf386..127032d 100644
+--- a/encoder/analysis.cpp
++++ b/encoder/analysis.cpp
+@@ -2692,8 +2692,8 @@ void Analysis::classifyCU(const CUData& ctu, const CUGeom& cuGeom, const Mode& b
+             {
+                 offset = (depth * X265_REFINE_INTER_LEVELS) + i;
+                 /* Calculate distance values */
+-                diffRefine[i] = abs((int64_t)(trainData.cuVariance - m_frame->m_classifyVariance[offset]));
+-                diffRefineRd[i] = abs((int64_t)(cuCost - m_frame->m_classifyRd[offset]));
++                diffRefine[i] = std::abs((int64_t)(trainData.cuVariance - m_frame->m_classifyVariance[offset]));
++                diffRefineRd[i] = std::abs((int64_t)(cuCost - m_frame->m_classifyRd[offset]));
+ 
+                 /* Calculate prior probability - ranges between 0 and 1 */
+                 if (trainingCount)
+diff --git a/encoder/ratecontrol.cpp b/encoder/ratecontrol.cpp
+index 9f2b8d9..7732ccd 100644
+--- a/encoder/ratecontrol.cpp
++++ b/encoder/ratecontrol.cpp
+@@ -1891,7 +1891,7 @@ double RateControl::tuneQScaleForGrain(double rcOverflow)
+     int newQp = rcOverflow > 1.1 ? curQp + 2 : rcOverflow > 1 ? curQp + 1 : curQp - 1 ;
+     double projectedBitrate =  int(m_fps + 0.5) * m_qpToEncodedBits[newQp];
+     if (curBitrate > 0 && projectedBitrate > 0)
+-        q =  abs(projectedBitrate - m_bitrate) < abs (curBitrate - m_bitrate) ? x265_qp2qScale(newQp) : m_lastQScaleFor[P_SLICE];
++        q =  std::abs(projectedBitrate - m_bitrate) < std::abs (curBitrate - m_bitrate) ? x265_qp2qScale(newQp) : m_lastQScaleFor[P_SLICE];
+     else
+         q = rcOverflow > 1 ? qScaleAvg * qpstep : rcOverflow < 1 ?  qScaleAvg / qpstep : m_lastQScaleFor[P_SLICE];
+     return q;
diff --git a/media-libs/x265/files/x265-3.6-test-ns_2.patch b/media-libs/x265/files/x265-3.6-test-ns_2.patch
new file mode 100644
index 000000000000..63308e5bb48d
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-test-ns_2.patch
@@ -0,0 +1,30 @@
+--- source.orig/encoder/encoder.cpp
++++ source/encoder/encoder.cpp
+@@ -1478,7 +1478,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
+     if (m_exportedPic)
+     {
+         if (!m_param->bUseAnalysisFile && m_param->analysisSave)
+-            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
++            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
+ 
+         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
+ 
+--- a/common/threadpool.cpp
++++ b/common/threadpool.cpp
+@@ -25,6 +25,7 @@
+ #include "common.h"
+ #include "threadpool.h"
+ #include "threading.h"
++#include "param.h"
+ 
+ #include <new>
+ 
+@@ -314,7 +315,7 @@ ThreadPool* ThreadPool::allocThreadPools(x265_param* p, int& numPools, bool isTh
+                    sprintf(nextCount, "%d", cpusPerNode[i]);
+              strcat(poolString, nextCount);
+          }
+-         x265_param_parse(p, "pools", poolString);
++         PARAM_NS::x265_param_parse(p, "pools", poolString);
+      }
+ #endif
+     if (p->numaPools && *p->numaPools)
diff --git a/media-libs/x265/files/x265-9999-test-ns.patch b/media-libs/x265/files/x265-9999-test-ns.patch
index ed3de18ae83e..35859c54455e 100644
--- a/media-libs/x265/files/x265-9999-test-ns.patch
+++ b/media-libs/x265/files/x265-9999-test-ns.patch
@@ -31,6 +31,25 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
  #define PARAM_NS X265_NS
  #endif
  }
+--- a/common/threadpool.cpp
++++ b/common/threadpool.cpp
+@@ -25,6 +25,7 @@
+ #include "common.h"
+ #include "threadpool.h"
+ #include "threading.h"
++#include "param.h"
+ 
+ #include <new>
+ 
+@@ -314,7 +315,7 @@ ThreadPool* ThreadPool::allocThreadPools(x265_param* p, int& numPools, bool isTh
+                    sprintf(nextCount, "%d", cpusPerNode[i]);
+              strcat(poolString, nextCount);
+          }
+-         x265_param_parse(p, "pools", poolString);
++         PARAM_NS::x265_param_parse(p, "pools", poolString);
+      }
+ #endif
+     if (p->numaPools && *p->numaPools)
 --- a/encoder/api.cpp
 +++ b/encoder/api.cpp
 @@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_param *p)
@@ -64,16 +83,16 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
      }
      x265_copy_params(&save, encoder->m_latestParam);
      int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
-@@ -602,7 +602,7 @@ fail:
-         *pi_nal = 0;
- 
+@@ -604,7 +604,7 @@ fail:
      if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart)
--        x265_csvlog_frame(encoder->m_param, pic_out);
-+        PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
+     {
+         for (int layer = 0; layer < encoder->m_param->numLayers; layer++)
+-            x265_csvlog_frame(encoder->m_param, pic_out[layer]);
++            PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out[layer]);
+     }
  
      if (numEncoded < 0)
-         encoder->m_aborted = true;
-@@ -643,7 +643,7 @@ void x265_vmaf_encoder_log(x265_encoder* enc, int argc, char **argv, x265_param
+@@ -646,7 +646,7 @@ void x265_vmaf_encoder_log(x265_encoder* enc, int argc, char **argv, x265_param
          encoder->fetchStats(&stats, sizeof(stats));
          int padx = encoder->m_sps.conformanceWindow.rightOffset;
          int pady = encoder->m_sps.conformanceWindow.bottomOffset;
@@ -82,16 +101,16 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
      }
  }
  #endif
-@@ -657,7 +657,7 @@ void x265_encoder_log(x265_encoder* enc, int argc, char **argv)
-         encoder->fetchStats(&stats, sizeof(stats));
-         int padx = encoder->m_sps.conformanceWindow.rightOffset;
-         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
--        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-+        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
+@@ -662,7 +662,7 @@ void x265_encoder_log(x265_encoder* enc, int argc, char **argv)
+         for (int layer = 0; layer < encoder->m_param->numLayers; layer++)
+         {
+             encoder->fetchStats(stats, sizeof(stats[layer]), layer);
+-            x265_csvlog_encode(encoder->m_param, &stats[0], padx, pady, argc, argv);
++            PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats[0], padx, pady, argc, argv);
+         }
      }
  }
- 
-@@ -878,7 +878,7 @@ void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis)
+@@ -884,7 +884,7 @@ void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis)
      return;
  
  fail:
@@ -102,7 +121,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
  void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis)
 --- a/encoder/encoder.cpp
 +++ b/encoder/encoder.cpp
-@@ -216,8 +216,8 @@ void Encoder::create()
+@@ -217,8 +217,8 @@ void Encoder::create()
          {
              m_dupBuffer[i] = (AdaptiveFrameDuplication*)x265_malloc(sizeof(AdaptiveFrameDuplication));
              m_dupBuffer[i]->dupPic = NULL;
@@ -113,7 +132,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
              m_dupBuffer[i]->dupPlane = NULL;
              m_dupBuffer[i]->dupPlane = X265_MALLOC(char, framesize);
              m_dupBuffer[i]->dupPic->planes[0] = m_dupBuffer[i]->dupPlane;
-@@ -768,7 +768,7 @@ int Encoder::setAnalysisData(x265_analysis_data *analysis_data, int poc, uint32_
+@@ -774,7 +774,7 @@ int Encoder::setAnalysisData(x265_analysis_data *analysis_data, int poc, uint32_
          curFrame->m_analysisData = (*analysis_data);
          curFrame->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
          curFrame->m_analysisData.numPartitions = m_param->num4x4Partitions;
@@ -122,7 +141,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
          if (m_param->maxCUSize == 16)
          {
              if (analysis_data->sliceType == X265_TYPE_IDR || analysis_data->sliceType == X265_TYPE_I)
-@@ -872,7 +872,7 @@ void Encoder::destroy()
+@@ -881,7 +881,7 @@ void Encoder::destroy()
          for (uint32_t i = 0; i < DUP_BUFFER; i++)
          {
              X265_FREE(m_dupBuffer[i]->dupPlane);
@@ -131,61 +150,61 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
              X265_FREE(m_dupBuffer[i]);
          }
  
-@@ -1478,7 +1478,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
-     if (m_exportedPic)
+@@ -1491,7 +1491,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
+     if (*m_exportedPic)
      {
          if (!m_param->bUseAnalysisFile && m_param->analysisSave)
--            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-+            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
- 
-         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
+-            x265_free_analysis_data(m_param, &m_exportedPic[0]->m_analysisData);
++            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic[0]->m_analysisData);
  
-@@ -1892,7 +1892,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
- 
-             /* Free up inputPic->analysisData since it has already been used */
-             if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE))
--                x265_free_analysis_data(m_param, &outFrame->m_analysisData);
-+                PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+         for (int i = 0; i < m_param->numLayers; i++)
+         {
+@@ -1973,7 +1973,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
  
-             if (pic_out)
-             {
-@@ -1971,7 +1971,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
-                     writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData);
-                     pic_out->analysisData.saveParam = pic_out->analysisData.saveParam;
-                     if (m_param->bUseAnalysisFile)
--                        x265_free_analysis_data(m_param, &pic_out->analysisData);
-+                        PARAM_NS::x265_free_analysis_data(m_param, &pic_out->analysisData);
+                 /* Free up inputPic->analysisData since it has already been used */
+                 if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE))
+-                    x265_free_analysis_data(m_param, &outFrame->m_analysisData);
++                    PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+                 if (pic_out[sLayer])
+                 {
+                     PicYuv* recpic = outFrame->m_reconPic[0];
+@@ -2052,7 +2052,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
+                         writeAnalysisFile(&pic_out[sLayer]->analysisData, *outFrame->m_encData);
+                         pic_out[sLayer]->analysisData.saveParam = pic_out[sLayer]->analysisData.saveParam;
+                         if (m_param->bUseAnalysisFile)
+-                            x265_free_analysis_data(m_param, &pic_out[sLayer]->analysisData);
++                            PARAM_NS::x265_free_analysis_data(m_param, &pic_out[sLayer]->analysisData);
+                     }
                  }
-             }
-             if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion))
-@@ -1986,7 +1986,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
-                 writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData);
-             }
-             if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)
--                x265_free_analysis_data(m_param, &outFrame->m_analysisData);
-+                PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
-             if (m_param->internalCsp == X265_CSP_I400)
-             {
-                 if (slice->m_sliceType == P_SLICE)
-@@ -2153,7 +2153,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
+                 if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion))
+@@ -2067,7 +2067,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
+                     writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData);
+                 }
+                 if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)
+-                    x265_free_analysis_data(m_param, &outFrame->m_analysisData);
++                    PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
+                 if (m_param->internalCsp == X265_CSP_I400)
+                 {
+                     if (slice->m_sliceType == P_SLICE)
+@@ -2250,7 +2250,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
                  uint32_t heightInCU = (m_param->sourceHeight + m_param->maxCUSize - 1) >> m_param->maxLog2CUSize;
-                 frameEnc->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
-                 frameEnc->m_analysisData.numPartitions = m_param->num4x4Partitions;
--                x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
-+                PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
-                 frameEnc->m_analysisData.poc = frameEnc->m_poc;
+                 frameEnc[0]->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
+                 frameEnc[0]->m_analysisData.numPartitions = m_param->num4x4Partitions;
+-                x265_alloc_analysis_data(m_param, &frameEnc[0]->m_analysisData);
++                PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc[0]->m_analysisData);
+                 frameEnc[0]->m_analysisData.poc = frameEnc[0]->m_poc;
                  if (m_param->rc.bStatRead)
-                     readAnalysisFile(&frameEnc->m_analysisData, frameEnc->m_poc, frameEnc->m_lowres.sliceType);
-@@ -2164,7 +2164,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
+                     readAnalysisFile(&frameEnc[0]->m_analysisData, frameEnc[0]->m_poc, frameEnc[0]->m_lowres.sliceType);
+@@ -2261,7 +2261,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
                  for (int i = 0; i < m_param->rc.zonefileCount; i++)
                  {
-                     if (m_param->rc.zones[i].startFrame == frameEnc->m_poc)
+                     if (m_param->rc.zones[i].startFrame == frameEnc[0]->m_poc)
 -                        x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
 +                        PARAM_NS::x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
                  }
              }
  
-@@ -2307,7 +2307,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
+@@ -2408,7 +2408,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture** pic_out)
                  analysis->numCUsInFrame  = numCUsInFrame;
                  analysis->numCuInHeight = heightInCU;
                  analysis->numPartitions  = m_param->num4x4Partitions;
@@ -194,7 +213,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
              }
              if (m_param->bEnableTemporalSubLayers > 2)
              {
-@@ -4434,7 +4434,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
+@@ -4711,7 +4711,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
          else if (fread(val, size, readSize, fileOffset) != readSize)\
      {\
          x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
@@ -203,7 +222,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
          m_aborted = true;\
          return;\
      }\
-@@ -4470,7 +4470,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
+@@ -4747,7 +4747,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
          if (poc != curPoc || feof(m_analysisFileIn))
          {
              x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
@@ -212,7 +231,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
              return;
          }
      }
-@@ -4504,7 +4504,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
+@@ -4781,7 +4781,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
      if (m_param->scaleFactor)
          analysis->numPartitions *= factor;
      /* Memory is allocated for inter and intra analysis data based on the slicetype */
@@ -221,7 +240,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
  
      if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
      {
-@@ -4757,7 +4757,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
+@@ -5034,7 +5034,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
      else if (fread(val, size, readSize, fileOffset) != readSize)\
      {\
          x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
@@ -230,7 +249,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
          m_aborted = true;\
          return;\
      }\
-@@ -4794,7 +4794,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
+@@ -5071,7 +5071,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
          if (poc != curPoc || feof(m_analysisFileIn))
          {
              x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
@@ -239,7 +258,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
              return;
          }
      }
-@@ -4825,7 +4825,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
+@@ -5102,7 +5102,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x
      analysis->numCuInHeight = cuLoc.heightInCU;
  
      /* Memory is allocated for inter and intra analysis data based on the slicetype */
@@ -248,7 +267,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
  
      if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
      {
-@@ -5440,7 +5440,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, int sli
+@@ -5717,7 +5717,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, int sli
      if (fread(val, size, readSize, fileOffset) != readSize)\
      {\
      x265_log(NULL, X265_LOG_ERROR, "Error reading analysis 2 pass data\n"); \
@@ -257,7 +276,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
      m_aborted = true; \
      return; \
  }\
-@@ -5454,7 +5454,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, int sli
+@@ -5731,7 +5731,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, int sli
      if (poc != curPoc || feof(m_analysisFileIn))
      {
          x265_log(NULL, X265_LOG_WARNING, "Error reading analysis 2 pass data: Cannot find POC %d\n", curPoc);
@@ -266,7 +285,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
          return;
      }
      /* Now arrived at the right frame, read the record */
-@@ -5561,7 +5561,7 @@ void Encoder::writeAnalysisFile(x265_analysis_data* analysis, FrameData &curEncD
+@@ -5838,7 +5838,7 @@ void Encoder::writeAnalysisFile(x265_analysis_data* analysis, FrameData &curEncD
      if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
      {\
          x265_log(NULL, X265_LOG_ERROR, "Error writing analysis data\n");\
@@ -275,7 +294,7 @@ Namespace functions for multi-bitdepth builds so that libraries are self-contain
          m_aborted = true;\
          return;\
      }\
-@@ -5783,7 +5783,7 @@ void Encoder::writeAnalysisFileRefine(x265_analysis_data* analysis, FrameData &c
+@@ -6060,7 +6060,7 @@ void Encoder::writeAnalysisFileRefine(x265_analysis_data* analysis, FrameData &c
      if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
      {\
      x265_log(NULL, X265_LOG_ERROR, "Error writing analysis 2 pass data\n"); \
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index af1229eaf0d8..91d4b52dc9b9 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -8,7 +8,6 @@
     <flag name="10bit">Add support for producing 10bits HEVC.</flag>
     <flag name="12bit">Add support for producing 12bits HEVC.</flag>
     <flag name="numa">Build with support for NUMA nodes.</flag>
-    <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
   </use>
   <upstream>
     <remote-id type="bitbucket">multicoreware/x265_git</remote-id>
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
deleted file mode 100644
index 3fa4d5cb933f..000000000000
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal multibuild
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	S=${WORKDIR}/${P}/source
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/x265-3.3-ppc64.patch"
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/test-ns.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 12bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DENABLE_HDR10_PLUS=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 10bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist="" v=
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-				if [[ ${ABI} = ppc* ]] ; then
-					# upstream uses mix of altivec + power8 vectors
-					# it's impossible to enable altivec without CPU_POWER8
-					# and it does not work on ppc32
-					# so we toggle both variables together
-					mycmakeargs+=(
-						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-					)
-				fi
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	local myabicmakeargs=(
-		-DENABLE_TESTS=$(usex test ON OFF)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DGIT_ARCHETYPE=1 #814116
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
-		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-
-	# we don't install *.a files for all variants,
-	# so just delete these files instead of pretending
-	# real USE=static-libs support
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index f3d6c8cbd76a..7e950e3b98c8 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/x265-3.3-ppc64.patch"
 	"${FILESDIR}/tests.patch"
 	"${FILESDIR}/test-ns.patch"
+	"${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch"
 )
 
 src_unpack() {
diff --git a/media-libs/x265/x265-3.5-r4.ebuild b/media-libs/x265/x265-3.5-r4.ebuild
index 11fbb36fc212..172970e12143 100644
--- a/media-libs/x265/x265-3.5-r4.ebuild
+++ b/media-libs/x265/x265-3.5-r4.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/x265-3.3-ppc64.patch"
 	"${FILESDIR}/tests.patch"
 	"${FILESDIR}/test-ns.patch"
+	"${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch"
 )
 
 src_unpack() {
diff --git a/media-libs/x265/x265-3.5-r5.ebuild b/media-libs/x265/x265-3.5-r5.ebuild
new file mode 100644
index 000000000000..c9db10613904
--- /dev/null
+++ b/media-libs/x265/x265-3.5-r5.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic multilib-minimal multibuild
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
+	MY_P="${PN}-${PV}"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	MY_P="${PN}_${PV}"
+fi
+
+S="${WORKDIR}/${MY_P}/source"
+unset MY_P
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/199"
+IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm-r1.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
+	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
+	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
+	"${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch"
+	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
+	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
+)
+
+pkg_setup() {
+	variants=(
+		$(usev 12bit "main12")
+		$(usev 10bit "main10")
+	)
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it
+
+x265_variant_src_configure() {
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
+	local mycmakeargs=(
+		"${mycmakeargs[@]}"
+		-DHIGH_BIT_DEPTH=ON
+		-DEXPORT_C_API=OFF
+		-DENABLE_SHARED=OFF
+		-DENABLE_CLI=OFF
+	)
+
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DMAIN12=ON
+			)
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DENABLE_HDR10_PLUS=ON
+			)
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake_src_configure
+}
+
+multilib_src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875854
+	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+	filter-lto
+
+	local mycmakeargs=(
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA="$(usex numa)"
+		-DENABLE_SVT_HEVC="no" # missing
+		-DENABLE_VTUNE="no" # missing
+		-DGIT_ARCHETYPE=1 #814116
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DENABLE_CLI="no"
+		)
+	fi
+
+	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
+	# x86 # Bug #528202, bug #913412
+	# x32 # bug #510890
+	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
+		mycmakeargs+=(
+			-DENABLE_ASSEMBLY=OFF
+			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
+			# source/CMakeLists.txt:858
+			# -DENABLE_TESTS="no" #728748
+		)
+	else
+		mycmakeargs+=(
+			-DENABLE_TESTS="$(usex test)"
+		)
+	fi
+
+	if [[ ${ABI} = ppc* ]] ; then
+		# upstream uses mix of altivec + power8 vectors
+		# it's impossible to enable altivec without CPU_POWER8
+		# and it does not work on ppc32
+		# so we toggle both variables together
+		mycmakeargs+=(
+			-DCPU_POWER8="$(usex cpu_flags_ppc_vsx2)"
+			-DENABLE_ALTIVEC="$(usex cpu_flags_ppc_vsx2)"
+		)
+	fi
+
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant x265_variant_src_configure
+
+		local liblist="" v=
+		for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+			ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
+			liblist+="libx265_${v}.a;"
+		done
+
+		mycmakeargs+=(
+			-DEXTRA_LIB="${liblist}"
+			-DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
+			-DLINKED_10BIT"=$(usex 10bit)"
+			-DLINKED_12BIT="$(usex 12bit)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant cmake_src_compile
+	fi
+	cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant x265_variant_src_test
+	fi
+	x265_variant_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-3.6.ebuild b/media-libs/x265/x265-3.6.ebuild
new file mode 100644
index 000000000000..ba013c73d378
--- /dev/null
+++ b/media-libs/x265/x265-3.6.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic multilib-minimal multibuild
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
+	MY_P="${PN}-${PV}"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	MY_P="${PN}_${PV}"
+fi
+
+S="${WORKDIR}/${MY_P}/source"
+unset MY_P
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/209"
+IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-arm.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
+	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
+	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
+	"${FILESDIR}/${PN}-3.6-test-ns_2.patch"
+	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
+	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
+)
+
+pkg_setup() {
+	variants=(
+		$(usev 12bit "main12")
+		$(usev 10bit "main10")
+	)
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it
+
+x265_variant_src_configure() {
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
+	local mycmakeargs=(
+		"${mycmakeargs[@]}"
+		-DHIGH_BIT_DEPTH=ON
+		-DEXPORT_C_API=OFF
+		-DENABLE_SHARED=OFF
+		-DENABLE_CLI=OFF
+	)
+
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DMAIN12=ON
+			)
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DENABLE_HDR10_PLUS=ON
+			)
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake_src_configure
+}
+
+multilib_src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875854
+	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+	filter-lto
+
+	local mycmakeargs=(
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA="$(usex numa)"
+		-DENABLE_SVT_HEVC="no" # missing
+		-DENABLE_VTUNE="no" # missing
+		-DGIT_ARCHETYPE=1 #814116
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DENABLE_CLI="no"
+		)
+	fi
+
+	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
+	# x86 # Bug #528202, bug #913412
+	# x32 # bug #510890
+	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
+		mycmakeargs+=(
+			-DENABLE_ASSEMBLY=OFF
+			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
+			# source/CMakeLists.txt:858
+			# -DENABLE_TESTS="no" #728748
+		)
+	else
+		mycmakeargs+=(
+			-DENABLE_TESTS="$(usex test)"
+		)
+	fi
+
+	if [[ ${ABI} = ppc* ]] ; then
+		# upstream uses mix of altivec + power8 vectors
+		# it's impossible to enable altivec without CPU_POWER8
+		# and it does not work on ppc32
+		# so we toggle both variables together
+		mycmakeargs+=(
+			-DCPU_POWER8="$(usex cpu_flags_ppc_vsx2)"
+			-DENABLE_ALTIVEC="$(usex cpu_flags_ppc_vsx2)"
+		)
+	fi
+
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant x265_variant_src_configure
+
+		local liblist="" v=
+		for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+			ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
+			liblist+="libx265_${v}.a;"
+		done
+
+		mycmakeargs+=(
+			-DEXTRA_LIB="${liblist}"
+			-DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
+			-DLINKED_10BIT"=$(usex 10bit)"
+			-DLINKED_12BIT="$(usex 12bit)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant cmake_src_compile
+	fi
+	cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant x265_variant_src_test
+	fi
+	x265_variant_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8be9f4a93e84..bf2855a23f64 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -5,21 +5,25 @@ EAPI=8
 
 inherit cmake flag-o-matic multilib-minimal multibuild
 
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	S=${WORKDIR}/${P}/source
+	MY_P="${PN}-${PV}"
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	MY_P="${PN}_${PV}"
 fi
 
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+S="${WORKDIR}/${MY_P}/source"
+unset MY_P
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/208"
+SLOT="0/212"
 IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
 RESTRICT="!test? ( test )"
 
@@ -34,16 +38,18 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-arm.patch"
 	"${FILESDIR}/neon.patch"
 	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
+	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
 	"${FILESDIR}/${PN}-9999-test-ns.patch"
+	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
+	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
 )
 
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
+pkg_setup() {
+	variants=(
+		$(usev 12bit "main12")
+		$(usev 10bit "main10")
+	)
 }
 
 # By default, the library and the encoder is configured for only one output bit
@@ -57,102 +63,34 @@ src_unpack() {
 # To achieve this, we have to build one (static) library for each non-main
 # variant, and link it into the main library.
 # Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
+# allow disabling it
 
 x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
 	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
 
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	local mycmakeargs=(
+		"${mycmakeargs[@]}"
+		-DHIGH_BIT_DEPTH=ON
+		-DEXPORT_C_API=OFF
+		-DENABLE_SHARED=OFF
+		-DENABLE_CLI=OFF
+	)
+
 	case "${MULTIBUILD_VARIANT}" in
 		"main12")
 			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
 				-DMAIN12=ON
 			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 12bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
 			;;
 		"main10")
 			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
 				-DENABLE_HDR10_PLUS=ON
 			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 10bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist="" v=
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-				if [[ ${ABI} = ppc* ]] ; then
-					# upstream uses mix of altivec + power8 vectors
-					# it's impossible to enable altivec without CPU_POWER8
-					# and it does not work on ppc32
-					# so we toggle both variables together
-					mycmakeargs+=(
-						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-					)
-				fi
-			fi
 			;;
 		*)
 			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
 	esac
 	cmake_src_configure
-	popd >/dev/null || die
 }
 
 multilib_src_configure() {
@@ -161,37 +99,79 @@ multilib_src_configure() {
 	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
 	filter-lto
 
-	local myabicmakeargs=(
-		-DENABLE_TESTS=$(usex test ON OFF)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+	local mycmakeargs=(
 		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DENABLE_LIBNUMA="$(usex numa)"
+		-DENABLE_MULTIVIEW="yes"
+		-DENABLE_SVT_HEVC="no" # missing
+		-DENABLE_VTUNE="no" # missing
 		-DGIT_ARCHETYPE=1 #814116
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DENABLE_CLI="no"
+		)
+	fi
 
 	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202, bug #913412
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	# x86 # Bug #528202, bug #913412
+	# x32 # bug #510890
+	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
+		mycmakeargs+=(
+			-DENABLE_ASSEMBLY=OFF
+			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
+			# source/CMakeLists.txt:858
+			# -DENABLE_TESTS="no" #728748
+		)
+	else
+		mycmakeargs+=(
+			-DENABLE_TESTS="$(usex test)"
+		)
+	fi
+
+	if [[ ${ABI} = ppc* ]] ; then
+		# upstream uses mix of altivec + power8 vectors
+		# it's impossible to enable altivec without CPU_POWER8
+		# and it does not work on ppc32
+		# so we toggle both variables together
+		mycmakeargs+=(
+			-DCPU_POWER8="$(usex cpu_flags_ppc_vsx2)"
+			-DENABLE_ALTIVEC="$(usex cpu_flags_ppc_vsx2)"
+		)
 	fi
 
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant x265_variant_src_configure
+
+		local liblist="" v=
+		for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+			ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
+			liblist+="libx265_${v}.a;"
+		done
+
+		mycmakeargs+=(
+			-DEXTRA_LIB="${liblist}"
+			-DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
+			-DLINKED_10BIT"=$(usex 10bit)"
+			-DLINKED_12BIT="$(usex 12bit)"
+		)
+	fi
+
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake_src_compile
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant cmake_src_compile
+	fi
+	cmake_src_compile
 }
 
 x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
 		"${BUILD_DIR}/test/TestBench" || die
 	else
 		einfo "Unit tests check only assembly."
@@ -201,14 +181,15 @@ x265_variant_src_test() {
 }
 
 multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
+	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
+	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
+		multibuild_foreach_variant x265_variant_src_test
+	fi
+	x265_variant_src_test
 }
 
 multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake_src_install
+	cmake_src_install
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/xvid/xvid-1.3.7-r2.ebuild b/media-libs/xvid/xvid-1.3.7-r2.ebuild
index 4aed0ef04f1d..000451feecd6 100644
--- a/media-libs/xvid/xvid-1.3.7-r2.ebuild
+++ b/media-libs/xvid/xvid-1.3.7-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}/build/generic"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch b/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
deleted file mode 100644
index 563fde6589fc..000000000000
--- a/media-plugins/calf/files/calf-9999-fix-build-with-lld.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -53,7 +53,7 @@ libcalflv2gui_la_SOURCES = gui.cpp gui_config.cpp gui_controls.cpp ctl_curve.cpp
- if USE_DEBUG
- libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static
- else
--libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat -export-symbols-regex "lv2ui_descriptor" $(GUI_DEPS_LIBS) -disable-static
-+libcalflv2gui_la_LDFLAGS = -rpath $(pkglibdir) -avoid-version -module -lexpat $(GUI_DEPS_LIBS) -disable-static
- endif
- 
- if HAVE_LD_NODELETE
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2-r1.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2-r1.ebuild
index 7dfd5c7ceb57..12b1861a1ec7 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2-r1.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit multilib-minimal
+inherit flag-o-matic libtool multilib-minimal
 
 DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
 HOMEPAGE="http://libvisual.org/"
@@ -36,7 +36,20 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
+src_prepare() {
+	default
+	elibtoolize
+}
+
 multilib_src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/927006
+	# https://github.com/Libvisual/libvisual/issues/358
+	#
+	# Do not trust with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	ECONF_SOURCE=${S} \
 	econf \
 		$(use_enable jack) \
diff --git a/media-radio/cwdaemon/Manifest b/media-radio/cwdaemon/Manifest
index 6b45eb1129a8..a5cfeec56a97 100644
--- a/media-radio/cwdaemon/Manifest
+++ b/media-radio/cwdaemon/Manifest
@@ -1 +1,2 @@
 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.13.0.ebuild b/media-radio/cwdaemon/cwdaemon-0.13.0.ebuild
new file mode 100644
index 000000000000..2169bb362fff
--- /dev/null
+++ b/media-radio/cwdaemon/cwdaemon-0.13.0.ebuild
@@ -0,0 +1,24 @@
+# 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="https://cwdaemon.sourceforge.net"
+SRC_URI="https://github.com/acerion/${PN}/archive/v${PV}/${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/cwdaemon/metadata.xml b/media-radio/cwdaemon/metadata.xml
index 0e65bae317ed..62b91035bbcf 100644
--- a/media-radio/cwdaemon/metadata.xml
+++ b/media-radio/cwdaemon/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">cwdaemon</remote-id>
+    <remote-id type="github">acerion/cwdaemon</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-radio/svxlink/svxlink-19.09.2.ebuild b/media-radio/svxlink/svxlink-19.09.2.ebuild
index 2e0f2c6624e1..5dc13813cd96 100644
--- a/media-radio/svxlink/svxlink-19.09.2.ebuild
+++ b/media-radio/svxlink/svxlink-19.09.2.ebuild
@@ -10,7 +10,7 @@ inherit cmake flag-o-matic systemd
 CMAKE_USE_DIR="${S}/src"
 
 DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
-HOMEPAGE="http://www.svxlink.org"
+HOMEPAGE="https://www.svxlink.org"
 SRC_URI="https://github.com/sm0svx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/media-radio/svxlink/svxlink-24.02-r2.ebuild b/media-radio/svxlink/svxlink-24.02-r2.ebuild
index c179c98aeac6..64d96f379833 100644
--- a/media-radio/svxlink/svxlink-24.02-r2.ebuild
+++ b/media-radio/svxlink/svxlink-24.02-r2.ebuild
@@ -10,12 +10,12 @@ inherit cmake flag-o-matic systemd xdg-utils
 CMAKE_USE_DIR="${S}/src"
 
 DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
-HOMEPAGE="http://www.svxlink.org"
+HOMEPAGE="https://www.svxlink.org"
 SRC_URI="https://github.com/sm0svx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ogg qt5 rtlsdr"
 
 DEPEND="dev-lang/tcl:=
@@ -47,7 +47,7 @@ BDEPEND="
 src_prepare() {
 	# fix build for MUSL (bug #936813)
 	if use elibc_musl ; then
-		eapply -p1 "${FILESDIR}/$P-musl.patch"
+		eapply -p1 "${FILESDIR}/${P}-musl.patch"
 	fi
 	if ! use ogg ; then
 		# drop automatic discovery of dependency
diff --git a/media-radio/tucnak/tucnak-4.61.ebuild b/media-radio/tucnak/tucnak-4.61.ebuild
index e424442c7ed4..538f145335bf 100644
--- a/media-radio/tucnak/tucnak-4.61.ebuild
+++ b/media-radio/tucnak/tucnak-4.61.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib portaudio rtlsdr suid"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 053e6c87979f..2151e14de3e7 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,3 +1,2 @@
-DIST abcMIDI-2024.06.18.zip 633663 BLAKE2B 276553fa00d6a32a89e5f70505ff081acec3e151908a0829fddc6882d785d617c5ece73348689b93b7e7dfe7e5d845ffd66430ccd03ecee8dcb82d33d8f76399 SHA512 f8a16b8d47993c99571a5514b4579b697aa43039f87a794477cff54ea98f4f13c2f441ebf089f0d24cc4fe8f21482e06217f51a907cc4d0922c653b04b45b86f
 DIST abcMIDI-2024.07.26.zip 633725 BLAKE2B 8412eaea34e11d4012f56c745405a8aff445a9e9561b64152ce24bb7192da0733a4f04e3172072b01ce12b8586c841b07679cb80e78b846904bb69d3faa73288 SHA512 89e0d3c1b6fbbc0676f54c375e3f9aadace15d314b79041b6ba9c1fa352d18a5a024afd03cd151e72865ee8ff551a307613f4209feb43a1ae17e6bcfc8a5dba8
 DIST abcMIDI-2024.08.13.zip 633931 BLAKE2B eaa3f0c9f070a89b7ba03e369018747c7ad9f684cf8f1ada12797b3a2617e2461a47d0e8ee970d30ed46ae44b300285da54ad41843b6ac4130801ccb032d2c7f SHA512 c808f762e86ddeb9c2a2ec0c36519d78366f8a9b505e94c81365d31d12dfd9b349cbab6ef1004da108741635e4c712e948a721e4352a06bf178a882934bb2a6c
diff --git a/media-sound/abcmidi/abcmidi-2024.06.18.ebuild b/media-sound/abcmidi/abcmidi-2024.06.18.ebuild
deleted file mode 100644
index 45b003914d76..000000000000
--- a/media-sound/abcmidi/abcmidi-2024.06.18.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/876421
-	# https://github.com/sshlien/abcmidi/issues/9
-	filter-lto
-
-	default
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2024.07.26.ebuild b/media-sound/abcmidi/abcmidi-2024.07.26.ebuild
index 8aed3dc3a8d2..45b003914d76 100644
--- a/media-sound/abcmidi/abcmidi-2024.07.26.ebuild
+++ b/media-sound/abcmidi/abcmidi-2024.07.26.ebuild
@@ -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/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index b57e60ab662e..50ca52c5345c 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1 +1,2 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
+DIST alsaplayer-0.99.82.tar.gz 1087776 BLAKE2B 34a197799da90c2dfe08b4a85baa3ac47d1b21e919908981c6ff3993a16fa1b97814cab54aae84be9e1da8fa3395952ef8fef85fe153a528ea3a6d6cd0f20658 SHA512 749fb8581d766df28a1ec42af9888fda0665ffcc0bb85a489365ae02611bc90a6cfc42d9c2cb19a3eeb385fb2c401b9d16e864a22887d8d6b6de3a55ebc140e2
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
new file mode 100644
index 000000000000..ec4c2f7e0031
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic xdg
+
+DESCRIPTION="A heavily multi-threaded pluggable audio player"
+HOMEPAGE="https://alsaplayer.sourceforge.net/"
+SRC_URI="https://github.com/alsaplayer/alsaplayer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~riscv ~sparc ~x86"
+IUSE="+alsa doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+REQUIRED_USE="|| ( alsa jack nas oss )"
+
+RDEPEND="
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac:= )
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	nas? ( media-libs/nas )
+	ogg? ( media-libs/libogg )
+	opengl? ( virtual/opengl )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+
+src_prepare() {
+	default
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860423
+	# https://github.com/alsaplayer/alsaplayer/issues/28
+	filter-lto
+
+	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
+	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
+
+	econf \
+		--disable-esd \
+		$(use_enable nls) \
+		$(use_enable opengl) \
+		$(use_enable mikmod) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable flac) \
+		$(use_enable mad) \
+		$(use_enable id3tag) \
+		$(use_enable gtk systray) \
+		$(use_enable jack) \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable gtk gtk2) \
+		$(use_enable nas)
+}
+
+src_install() {
+	default
+	dodoc docs/*.txt
+
+	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch
new file mode 100644
index 000000000000..202d2e8ccf12
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,11 +82,6 @@
+ dnl PKGCONFIG preparations
+ dnl ======================
+ 
+-if test -z $PKG_CONFIG_PATH; then
+-	PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+-fi
+-
+-export PKG_CONFIG_PATH
+ 
+ 
+ dnl ===============
+--- a/output/jack/Makefile.am
++++ b/output/jack/Makefile.am
+@@ -24,7 +24,6 @@
+ 
+ AM_CXXFLAGS = $(COMMON_FLAGS) $(JACK_CFLAGS)
+ 
+-AM_CFLAGS = $(AM_CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/output
+ 
diff --git a/media-sound/apulse/apulse-0.1.13-r2.ebuild b/media-sound/apulse/apulse-0.1.13-r2.ebuild
deleted file mode 100644
index 2b0fe6849406..000000000000
--- a/media-sound/apulse/apulse-0.1.13-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib multiprocessing
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-IUSE="debug sdk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	sdk? ( !media-libs/libpulse !media-sound/pulseaudio ) "
-RDEPEND="${DEPEND}
-	!media-plugins/alsa-plugins[pulseaudio]"
-
-PATCHES=(
-	"${FILESDIR}/sdk.patch"
-	"${FILESDIR}/check-key-before-remove.patch"
-	"${FILESDIR}/man.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use sdk; then
-		# Ensure all relevant libdirs are added, to support all ABIs
-		DIRS=
-		_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-		multilib_foreach_abi _add_dir
-		sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DINSTALL_SDK=$(usex sdk)"
-		"-DLOG_TO_STDERR=$(usex debug)"
-		"-DWITH_TRACE=$(usex debug)"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	_test() {
-		pushd tests || die
-		cmake -S "${S}/tests" -B . || die
-		emake test_ringbuffer
-		ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)" \
-			--test-load "$(makeopts_loadavg)" || die
-		popd || die
-	}
-	multilib_foreach_abi _test
-}
-
-multilib_src_install_all() {
-	if ! use sdk; then
-		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
-		multilib_foreach_abi _install_wrapper
-		dobin "${T}/apulse"
-	fi
-	einstalldocs
-}
diff --git a/media-sound/apulse/apulse-0.1.13-r3.ebuild b/media-sound/apulse/apulse-0.1.13-r3.ebuild
index 1289e259187c..c16e81ba4925 100644
--- a/media-sound/apulse/apulse-0.1.13-r3.ebuild
+++ b/media-sound/apulse/apulse-0.1.13-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 IUSE="debug sdk test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/ardour/ardour-8.6.ebuild b/media-sound/ardour/ardour-8.6.ebuild
deleted file mode 100644
index 365ac6ace241..000000000000
--- a/media-sound/ardour/ardour-8.6.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
-
-PYTHON_COMPAT=( python3_{9..12} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
-inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 ~loong ~x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="8"
-IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac:=
-	media-libs/freetype:2
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	net-libs/libwebsockets
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil[X,gtk2]
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-text/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.patch"
-	"${FILESDIR}/${PN}-6.8-boost-1.85.patch"
-)
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# delete optimization flags
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-
-	# handle arch
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-
-	# boost and shebang
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-
-	# handle locales
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	# avoid bug https://bugs.gentoo.org/800067
-	local -x AS="$(tc-getCC) -c"
-
-	# -Werror=odr
-	# https://tracker.ardour.org/view.php?id=9649
-	# https://bugs.gentoo.org/917095
-	filter-lto
-
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
-			echo '' || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls '' "--no-nls")
-		$(usex phonehome '' "--no-phone-home")
-		# not possible right now  --use-external-libs
-		# missing dependency: https://github.com/c4dm/qm-dsp
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
-	find "${D}/usr/share/icons/" -name ardour6.png -delete
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-	rm "${D}/usr/share/mime/packages/ardour.xml" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index b9125316634a..dec80f94f8b5 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,2 +1,2 @@
-DIST audex-0.95_pre20220909-f94cd394.tar.gz 192286 BLAKE2B cbe2376aba03a5c575aead2ff3f105381150e370415433136128642e21c6481cd8db6ad44f7e9ca0e8e6ea00886a918582c232aec49023ca710d501a579f1a25 SHA512 b251a9d90f3d24ae3da75a2ad73654505ff6fc3bbc71ad65b5f37380cd2b6f04122c1f6246013f5078178982de6e37afe2bbea34c084221401e1f91fb9ff4ba1
 DIST audex-24.05.2.tar.xz 706044 BLAKE2B 0f3e8781e5a8a8194899a3342de7463c0e075f5e0eaa57ef9e388c713c487273a7460a6ad4cd8171ba172d3ab121c9a9c81b9bd17d7546aeac69e0d9aa86cbff SHA512 ed43e59fb93b4836c9a65baebe8ab50d05d3389c63c38568f38706108af76905048b9d62e403ba1e36c3f3496fc1eb6d4e801d4571738bea428ef31d539db72e
+DIST audex-24.08.0.tar.xz 708504 BLAKE2B 9b0aa31115852c335570802cbcb41e92e3acf764ddb9ee0a7462b0f84c76900ca79cd2b429e3821a8b62785c4de8c5dc60603a48ac18f2ae253256e8a143a38b SHA512 91593fe79921c852ffbdf293944d9b96aff6c86551e93d2e01feab3d456e085ae7b81fff7612ccf4bfa6b05104c49f12a77072d5622274d857451de565468874
diff --git a/media-sound/audex/audex-0.95_pre20220909.ebuild b/media-sound/audex/audex-0.95_pre20220909.ebuild
deleted file mode 100644
index c4a6572fc313..000000000000
--- a/media-sound/audex/audex-0.95_pre20220909.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_TEST="true"
-KDE_ORG_COMMIT="f94cd394db5d99e9024f47530cd7edf1a08a0cc1"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Tool for ripping compact discs"
-HOMEPAGE="https://userbase.kde.org/Audex"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkcddb-22.04.0: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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-sound/cdparanoia
-"
-RDEPEND="${DEPEND}"
diff --git a/media-sound/audex/audex-24.05.2.ebuild b/media-sound/audex/audex-24.05.2.ebuild
index 8e6bdef0d6b2..e3357526c349 100644
--- a/media-sound/audex/audex-24.05.2.ebuild
+++ b/media-sound/audex/audex-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/audex/ https://userbase.kde.org/Audex"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/audex/audex-24.08.0.ebuild b/media-sound/audex/audex-24.08.0.ebuild
new file mode 100644
index 000000000000..797eb8b4c7f5
--- /dev/null
+++ b/media-sound/audex/audex-24.08.0.ebuild
@@ -0,0 +1,40 @@
+# 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/elisa/Manifest b/media-sound/elisa/Manifest
index f4c056187cb2..2cbe840352aa 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,2 +1,2 @@
-DIST elisa-23.08.5.tar.xz 1814776 BLAKE2B b3c59fbb84d6f4bdf6a45d41f6c8d97e8ed898fd3be5b7c6274218baeaf4e3cf63ede6077515ecff14c83cc8599e1fb8013ab7d5d3ffcb7da7eebf43d627fc62 SHA512 f0ab10b9e4d57b3331220a9ae2f8a240d7259ce7e381957cc12fc73b3bf23cdf32affde2e8dc09c8e5fbd05da74401f274c522bb44cd652feb7c1fb75e64cba8
 DIST elisa-24.05.2.tar.xz 2083008 BLAKE2B d20314651bb4b1ac3e51826c2153f4496fdfaf23ac6662b17f56d9efedf6e9cf310120865865301367d3e3feacf9e7144de85ab5613001a6b438e96128cd3018 SHA512 873f93d8301dabce0352902186ffb4b49db41c20da24f9b0df45d7613e66dc17f1d653c28eb8cd3c3eb549a671d03159eff15cfd5a3ccffd4ba587c0e163b4a7
+DIST elisa-24.08.0.tar.xz 1908472 BLAKE2B 5b43fd54a487f9805f994bfe4444a0d7b7fe0ae382739e1c84b7035d224b0023bb1f8e2f1b37e07722fa177bb9ea6a7634566fccac8dfae75257fbd6a1ad3bf8 SHA512 a4ce41dcf811e8fbcd930308b3307f3d2531d705304961008d8123ad24fda49607604e472a2b031b66b0ccf3c101433542389684ba4292b7089cd799c10ce11f
diff --git a/media-sound/elisa/elisa-23.08.5.ebuild b/media-sound/elisa/elisa-23.08.5.ebuild
deleted file mode 100644
index 22dc1d81ca4c..000000000000
--- a/media-sound/elisa/elisa-23.08.5.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="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://apps.kde.org/elisa/"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="mpris semantic-desktop +vlc"
-
-RESTRICT="test"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	mpris? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF5DBusAddons)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/elisa/elisa-24.05.2.ebuild b/media-sound/elisa/elisa-24.05.2.ebuild
index 04ec5d034c78..cd0482cd0b48 100644
--- a/media-sound/elisa/elisa-24.05.2.ebuild
+++ b/media-sound/elisa/elisa-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/elisa/"
 
 LICENSE="LGPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+mpris vlc"
 
 RESTRICT="test"
diff --git a/media-sound/elisa/elisa-24.08.0.ebuild b/media-sound/elisa/elisa-24.08.0.ebuild
new file mode 100644
index 000000000000..9582a61c465e
--- /dev/null
+++ b/media-sound/elisa/elisa-24.08.0.ebuild
@@ -0,0 +1,56 @@
+# 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/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/fluidsynth/fluidsynth-2.3.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild
index c43bce493f21..1d8a00ab9285 100644
--- a/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild
@@ -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 lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/jack2/jack2-1.9.22.ebuild b/media-sound/jack2/jack2-1.9.22.ebuild
index c52bbee4676b..3a33beb69665 100644
--- a/media-sound/jack2/jack2-1.9.22.ebuild
+++ b/media-sound/jack2/jack2-1.9.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 2241477aa20d..5f680d13f15f 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest
index 6d3d357bc1c6..22d32820d65c 100644
--- a/media-sound/kasts/Manifest
+++ b/media-sound/kasts/Manifest
@@ -1,2 +1,2 @@
-DIST kasts-23.08.5.tar.xz 581312 BLAKE2B eb85f74a6934947146f9ef277ed963eeba6ab108e8ff6a446255229cf7e7f4e6e6eacc16a508d46688f244f6b857a5d168387431f1520decd2e83b39189bcc05 SHA512 bfe2fa6d0bc628c51fa0db13a434e80c08a29e4bae95bccbaf6d029c424d6277eea9d0625f9de69ad6f011c482cd571000566ac838e22b03c57e8671ff4c3bd8
 DIST kasts-24.05.2.tar.xz 608992 BLAKE2B ca871f8c06cd9bc757476105585bc7e2c044dc91335c38769c38717f5b299322837619f41b5708f59e943b62a9a6db2b1d0e36b3076546a3398c78e4d13521d3 SHA512 38c974601c8ef91da0bf1c4a4ab4120b028a39198d4651100002e32fa6ec9790acf5028615496680d1282cfcbd6c190988b79be3378ba78172433dacba3cff8d
+DIST kasts-24.08.0.tar.xz 618204 BLAKE2B 7f70b0be63ffa89030f99b0a2a737aba3fd61cc7eb8a3231dea60c6f05ea2a1620391df3451efe7e121eea5ec56861cb5de6020af9d7bb42220b93e1260604d8 SHA512 9ed371843df42634228629140d592358c0772ed3a63cd3aa4ffcb223eeef5cd610fe571eecab597e7cffb444345699e3d9ae9be222956c51f2a550f0c24c9ba5
diff --git a/media-sound/kasts/kasts-23.08.5.ebuild b/media-sound/kasts/kasts-23.08.5.ebuild
deleted file mode 100644
index 53db2e77c645..000000000000
--- a/media-sound/kasts/kasts-23.08.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-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 ~loong ~ppc64 ~riscv x86"
-IUSE="gstreamer networkmanager vlc"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-0.7.2:5
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	media-libs/taglib:=
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-	)
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-BDEPEND="gstreamer? ( virtual/pkgconfig )"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_qt_module Test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLE_PLAYER=OFF
-		-DBUILD_GSTREAMER_BACKEND=$(usex gstreamer)
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-	ecm_src_configure
-}
diff --git a/media-sound/kasts/kasts-24.05.2-r1.ebuild b/media-sound/kasts/kasts-24.05.2-r1.ebuild
index 1706454d11c1..853b0cbd9a3d 100644
--- a/media-sound/kasts/kasts-24.05.2-r1.ebuild
+++ b/media-sound/kasts/kasts-24.05.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kasts/"
 
 LICENSE="GPL-2 GPL-2+ GPL-3+ BSD LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="gstreamer vlc"
 
 DEPEND="
diff --git a/media-sound/kasts/kasts-24.08.0.ebuild b/media-sound/kasts/kasts-24.08.0.ebuild
new file mode 100644
index 000000000000..7cd4260c1193
--- /dev/null
+++ b/media-sound/kasts/kasts-24.08.0.ebuild
@@ -0,0 +1,50 @@
+# 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.1-r1:=[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/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/krecorder/Manifest b/media-sound/krecorder/Manifest
index 8ae7b1806c8e..87507b456ae5 100644
--- a/media-sound/krecorder/Manifest
+++ b/media-sound/krecorder/Manifest
@@ -1,2 +1,2 @@
-DIST krecorder-23.08.5.tar.xz 162496 BLAKE2B 8323c13e7c633fcfb3b53ffb43b59fad725f85ff9980db312cd262ccf4a4c1813f5323adfdb3ce8b4efebd5ee3e4a61dd0f8d2c0858b6840d0c1cfb48d14a3c8 SHA512 dfe9ba96c1476e019b569fc811dccde1dfe866375d8b0a663f253d2dfa36b4be012f3f31c5ca83ba59f76546cfa6a3720c79112820d43dd26648a1680f987b64
 DIST krecorder-24.05.2.tar.xz 166792 BLAKE2B 50c64c8b7e3936457cf9bd47b20427376fb413c816a14756601919b711e5f813ee53b97bd9559ae54fb4ca3f6f05ed144ead092bb30ddfa7774ccd2ebc6d9eb3 SHA512 e5110464b5881c894c46a94a03dec7ad1a375025db4922566994368669de7cf608cd2eb6cdde1565292c0e50ee1ccce55517daed4601c924f5b8ebef49507942
+DIST krecorder-24.08.0.tar.xz 168180 BLAKE2B e9932fb8786057aefa883cc351e8ad23ea39dfa193c7d87354ee72389a84a0825612013e0199aa955337a13e26d986b9ebae08bf48559d2ed47d8d9bac8c2fe4 SHA512 63052051ef9db3d5498364caabc11dcd37c16553911ee86eb10addebf17f2c475092cbd4c897cec9f8d1b354c3f31cbce7ba354ef98f6ca8cb43e4ca75044c5c
diff --git a/media-sound/krecorder/krecorder-23.08.5.ebuild b/media-sound/krecorder/krecorder-23.08.5.ebuild
deleted file mode 100644
index f21d218c9044..000000000000
--- a/media-sound/krecorder/krecorder-23.08.5.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
-
-KDE_ORG_CATEGORY="utilities"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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-0.6:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-BDEPEND=">=kde-frameworks/ki18n-${KFMIN}:5"
diff --git a/media-sound/krecorder/krecorder-24.05.2.ebuild b/media-sound/krecorder/krecorder-24.05.2.ebuild
index d209b15af67d..65debd1dfb8c 100644
--- a/media-sound/krecorder/krecorder-24.05.2.ebuild
+++ b/media-sound/krecorder/krecorder-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krecorder/"
 
 LICENSE="CC0-1.0 CC-BY-4.0 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	dev-libs/kirigami-addons:6
diff --git a/media-sound/krecorder/krecorder-24.08.0.ebuild b/media-sound/krecorder/krecorder-24.08.0.ebuild
new file mode 100644
index 000000000000..01e69af0a849
--- /dev/null
+++ b/media-sound/krecorder/krecorder-24.08.0.ebuild
@@ -0,0 +1,30 @@
+# 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/musescore/Manifest b/media-sound/musescore/Manifest
index 0c1a8f18e1b7..a6de463cbe3c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
 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.1.tar.gz 144734281 BLAKE2B 97ba6dab964e5eb87984aa60381134dbd8dc687700b90001df6943a86b5bdf7df63fe026854800dfa16b329c71afd13f86569b494174a8dc22bac5bfc7162acc SHA512 54cd782be642e1da7e7c3bf2362a207c44aa103cf3cc2d33f63e25fea914753c886a691dfb823737f29c100fb592e91741524bc564abc1c975722174951ddf38
diff --git a/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
new file mode 100644
index 000000000000..6abc9e4fbd95
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
@@ -0,0 +1,38 @@
+From b274f13311ad0b2bce339634a006ba22fbd3379e Mon Sep 17 00:00:00 2001
+From: Ken Bloom <kbloom@gmail.com>
+Date: Fri, 30 Aug 2024 09:17:27 -0400
+Subject: [PATCH] Fix MainToolbar, and AppMenuBar in Qt 6.5+
+
+The problem was that a ListView lazily creates delegates as needed to
+actually display them. If the size of the ListView is 0, then it doesn't
+need to display anything, so it may not create any of the delegates. If
+it doesn't create any delegates, then we can't make it size itself to
+fit its contents. By setting a minimum size of 1, we force the ListView
+to create a delegate that we can then use to determine the ListView's
+actual size.
+
+Fixes: #24097
+--- a/src/appshell/qml/MainToolBar.qml
++++ b/src/appshell/qml/MainToolBar.qml
+@@ -70,8 +70,8 @@ Item {
+ 
+         model: toolBarModel
+ 
+-        width: contentItem.childrenRect.width
+-        height: contentItem.childrenRect.height
++        width: Math.max(1, contentItem.childrenRect.width)
++        height: Math.max(1, contentItem.childrenRect.height)
+ 
+         delegate: PageTabButton {
+             id: radioButtonDelegate
+--- a/src/appshell/qml/platform/AppMenuBar.qml
++++ b/src/appshell/qml/platform/AppMenuBar.qml
+@@ -28,7 +28,7 @@ import MuseScore.AppShell 1.0
+ ListView {
+     id: root
+ 
+-    height: contentItem.childrenRect.height
++    height: Math.max(1,contentItem.childrenRect.height)
+     width: contentWidth
+ 
+     property alias appWindow: appMenuModel.appWindow
diff --git a/media-sound/musescore/files/musescore-4.4.0-include.patch b/media-sound/musescore/files/musescore-4.4.0-include.patch
new file mode 100644
index 000000000000..75257dffcf9c
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-include.patch
@@ -0,0 +1,11 @@
+--- a/src/framework/audio/internal/fx/reverb/vectorops.h
++++ b/src/framework/audio/internal/fx/reverb/vectorops.h
+@@ -27,6 +27,8 @@
+ 
+ #include <cstdint>
+ 
++#include <cstring>
++
+ //
+ // This header is provided for convenience, to easily wrap vector operations around
+ // their platform-specific optimised libraries (e.g. IPP, vDSP), if desired.
diff --git a/media-sound/musescore/files/musescore-4.5.0-missing-include.patch b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
new file mode 100644
index 000000000000..b4a510dddd5b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/framework/extensions/devtools/apidumpmodel.cpp
++++ b/src/framework/extensions/devtools/apidumpmodel.cpp
+@@ -22,6 +22,7 @@
+ #include "apidumpmodel.h"
+ 
+ #include <QClipboard>
++#include <QGuiApplication>
+ 
+ #include "extensions/api/extapi.h"
+ 
diff --git a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
deleted file mode 100644
index bac09d7eaa82..000000000000
--- a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,7 +206,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,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
-         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
-         )
- 
--    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
--    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
--    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
-+    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-+    pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
-+    pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
-+    pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
- 
--    set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
-+    set(MODULE_LINK
-+        ${MODULE_LINK}
-+        PkgConfig::lame
-+        PkgConfig::libopusenc
-+        PkgConfig::flac
-+        PkgConfig::flacpp
-+    )
- endif()
- 
- if (ARCH_IS_X86_64)
---- 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/audio/internal/encoders/oggencoder.cpp
-+++ b/src/framework/audio/internal/encoders/oggencoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "oggencoder.h"
- 
--#include "opusenc.h"
-+#include "opus/opusenc.h"
- 
- #include "log.h"
- 
---- a/src/framework/global/CMakeLists.txt
-+++ b/src/framework/global/CMakeLists.txt
-@@ -112,9 +112,6 @@ set(MODULE_SRC
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
--    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.cpp
--    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.h
--    ${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/mu_patch.h
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
-@@ -132,6 +129,8 @@ set(MODULE_SRC
-     ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
- )
- 
-+find_package(tinyxml2 REQUIRED)
-+
- if (GLOBAL_NO_INTERNAL)
-     set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
- else()
-@@ -213,6 +212,7 @@ list(APPEND MODULE_INCLUDE
- list(APPEND MODULE_LINK
-     ${FS_LIB}
-     ${Z_LIB}
-+    tinyxml2::tinyxml2
- )
- 
- if (MUE_ENABLE_CUSTOM_ALLOCATOR)
---- a/src/framework/global/serialization/xmldom.cpp
-+++ b/src/framework/global/serialization/xmldom.cpp
-@@ -21,7 +21,7 @@
-  */
- #include "xmldom.h"
- 
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include <tinyxml2.h>
- 
- #include "log.h"
- 
---- a/src/framework/global/serialization/xmlstreamreader.cpp
-+++ b/src/framework/global/serialization/xmlstreamreader.cpp
-@@ -25,7 +25,7 @@
- 
- #include "global/types/string.h"
- 
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include <tinyxml2.h>
- 
- #include "log.h"
- 
---- 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/musescore-4.4.1.ebuild b/media-sound/musescore/musescore-4.4.1.ebuild
new file mode 100644
index 000000000000..288ff6994663
--- /dev/null
+++ b/media-sound/musescore/musescore-4.4.1.ebuild
@@ -0,0 +1,135 @@
+# 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"
+	"${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 06e97196028f..a301de148da8 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 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
@@ -59,8 +60,10 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
 	"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+	"${FILESDIR}/${PN}-4.4.0-include.patch"
+	"${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch"
+	"${FILESDIR}/${PN}-4.5.0-missing-include.patch"
 )
 
 src_unpack() {
@@ -96,8 +99,10 @@ src_configure() {
 		-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)"
diff --git a/media-sound/ncspot/Manifest b/media-sound/ncspot/Manifest
index e6f5fe56976d..10ecd4a1d01e 100644
--- a/media-sound/ncspot/Manifest
+++ b/media-sound/ncspot/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 adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aes-0.6.0.crate 86774 BLAKE2B e687f2839b53adc3ef990da8221705a462015aa0ea004a6e15dba7e7ecc008d9d13cad6222b03244dc48bd1717a442e7aa5aaab6e97bba1d3be28c1d914e464e SHA512 65349285e429f9b8815743d86b3ebdececd48ce556a08b6ec5ec89bf966bc9b187a7df4fbe1f3b25172db3aab219b23f8040c1160359868e9f71d67a767c90c9
@@ -14,55 +13,39 @@ DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d
 DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
 DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed
 DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
-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-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
 DIST arboard-3.4.0.crate 46785 BLAKE2B e866343f8d7d40ece483dac28600d931d76b0c138772c0f39e9a9eb65fecb72f24e3898f0af3082d8a71162950c905c23a55ad21bb112e8de923d5d4cadb6fbe SHA512 1950b99a90f6b7447aec97d395b221bc0a68613df87087aa3f9c59a2d97a38be24270f4c10bbbd98407eb66508055203f9988984a90e739305049653324e0576
-DIST async-broadcast-0.7.0.crate 20852 BLAKE2B 5848b71ced51d2a8ba7c5d9e1102b626b450c5412d35362903beecdcb7a7fc89ef33ebc3aa233fa1ae8bdf2da2768b541d16b91dc21c0435751bdda9e1bdce7a SHA512 d1a452db233cd9c1776b0d5931727d8d96a5e7779088fc410eae897a174c5dd80900c86385e270c62f164f340951a5f83860be970e37cd4910cf8a85dd78d89f
 DIST async-broadcast-0.7.1.crate 21867 BLAKE2B 9c430a70bbd2b15ecc88afee064bcb04a665c0421d6c239de611d86ff3fe56fafc083ebc172c5d41c9f72a40080d87a75dae8e9b1e85249202dd844b8360735b SHA512 82b90a41ade624631dd5a03226921ed58835ddf1bcde271ff0c0e14905fb069847bbacee5592978c5389cbf366d77a7cab244ca92871949f3f4872d6da10755c
-DIST async-channel-2.2.1.crate 14326 BLAKE2B ff89c3c0daf1b682c6eef8efba42e9fd29a374b6508cf254e69c8e503eb6ae10d96d129baf0c5033af4a9826210c57a6f826eb62241108ca4448f8dc438ad33a SHA512 706aa51402267ee2e7b8995efea8fb950a88d5db5e86302d554850074a2ecc541b02db3b9b28f068d4143de41300f75a405c0f2b9e83cd848ffc98a1d336da71
 DIST async-channel-2.3.1.crate 14576 BLAKE2B 09ea03c9758805c90be9aba222e1d74f3166ab492e533597647d1b4f08bf1dda79d73b21de791b9802e19c225cb94b7cb25550bba61488c7b61fa87f88eb29dd SHA512 94c999912bdf681dcb686292645bc8c340c2687bc9544f317e0123e672752c6b31e9d784e488e7d0bab79b5f207da8904a7f1fe140397513b47c292a6508a7e5
-DIST async-executor-1.11.0.crate 24767 BLAKE2B 02e396acc8aae8f83fe6652b78765c6845a212ec231fedac817f0b0e4076b1a756e0613544e82c29c5276b6538ecb0f8789e221c8f182f0cff0d9c70b1324027 SHA512 a966e235a6f73c92ac8aded01315f2b309c8fd69fc3b92c189f33ad7b2e9790c09bd3ba6e4fd4f46017fe803299629ede6bb490341e6a7acaeae0d4fbab19dce
 DIST async-executor-1.13.0.crate 27974 BLAKE2B f12f77471a843fa44dbe5281159d47c0e41b53672dbb1f91519e9e6f302024b905e8415027c0d740bc33db43267db94da907251af8ebbe677ce6ded59078e92f SHA512 618d771243c1ec31496cc228f3e6bdd3d5cdd479eb94e30810c87241e38a5fa652b59d61ec55cefbd120f0ea1d557a683c8a42a3e82344b7813d172d25b6ddec
 DIST async-fs-2.1.2.crate 17071 BLAKE2B 7b8a67fdab5d9d964af7d45a03a3ef405f9590b556249a35897f14a231f2b781d90df48c8296965e941f8c259c4c13a57691c81f09c20ce81406d5d2e7962731 SHA512 a671374a59c7804d26bf22d9617fc329cfa0cb38413ac05cb2f6ff192c5275a8ba41f1a088fb1978e61a66693c85f9c6b08486d44e30b7fa158568e41dc005a1
-DIST async-io-2.3.2.crate 49298 BLAKE2B cf01d97782405c56261d54800fcefe97c914850d50b49ce2902eda3cfacfbe6800dc0ec9b418f4bc51f579a9d0dca8b2842b17d97c3e046667e539ac67f72a57 SHA512 a7f04de21cd2eea933d7bdddaa548c92ed9a96d4f910d0aebd2ea9ddb7fe75de5f142df7aa4f7afc23b6877a20e68d3376db2e801e2a258e74b3f0ad674630fd
 DIST async-io-2.3.3.crate 49746 BLAKE2B 312d71f8670f720947ae5e78e6bd0251534d5a872164845f8606951ef88009e54684019831f55f27322e6e5d7d3f6f4a8157032fb6387ae6859be0d0dab74689 SHA512 5709064176812556a567cd558161a5e1a014b989e6835de5b77f387bcda8f148d03e5ac79a5dde56977bd3f2d38644593aa99ed28a4d646d3535332eae4b09c9
-DIST async-lock-3.3.0.crate 33286 BLAKE2B 93e66c16a6b1cb759378e198927d2df8ff9f7839a2bcda49d8e013ec7b9b175bb4199864bff585282a471cab6d4f88b70141636413dbcaa7b0453d35f08a94d6 SHA512 0f9e0940e610744fa97c6d2ece9220a2ad91f09155eda66703c2aaf4959f85c17f2cb55ef5fdf29013d4dcd84f8cdb6b16e8692ec7724744b57bf11a86f22f5c
 DIST async-lock-3.4.0.crate 34446 BLAKE2B e113033a86101bd93543d287379ba354b4bd61ce87786719f05f8a990c177a885eb50a19eb71fcd5cafa01308cb45b7872be65cd7e975cde03b0555a691a4bd7 SHA512 83731067a3302d3266848b0f65ea6564dad60188472c80e78a7d4cd93804f830332aa01b404b60a8f91cc1c6c7170020ebdfe4b5bae14fef6d3bddcc5f1ed9a5
-DIST async-process-2.2.2.crate 27641 BLAKE2B 4d223bf845583dfa9eb670bebd4731b5d82738fbbbdce162db212b32e166c7ebc1d8471c2651a20dbd5c8d087e182dea932f4fc09af85d080adeaa5945f96bfe SHA512 d65fa85fa06230fc1fb554171cb2dd31c32334f413968027b04745752b10de5d780036a8924eedc1c826d181b55c19a807dbfde6b4b2597aa11f1b1d556d5ef6
 DIST async-process-2.2.3.crate 28954 BLAKE2B da54aed4f017c9b8ee499a6813ac861ea2cc41b73d3aeede3528885bf0a010926926d23a6c6dd0429b563fffbeb63d3f0c8e625cd04faabfed92059052323e24 SHA512 201f87823617f1126f8dfb230c95aa248986258ccf95e5d0e9f475f160a9e64ec1642897fb2f8ffde3d748b29ed7185349b10ad5cc0f504cf45c302dc0de52a7
 DIST async-recursion-1.1.1.crate 14874 BLAKE2B 6260dffdfa9fe00cc1a63c8cb103a3f210611627bbc75c2658e7cd732c504791c6577d7033af3c5afa875f90cb370b7f216979e0bdb62dab4acd61786cb5239e SHA512 e3acd07a35be546ead68c7792963c7bf1876b3e5d6a20c2be73d2f030d26d68e2a318999937d4fe253e39d8254e12e42c66314f40a3b230c5d258f34dc0d9027
-DIST async-signal-0.2.6.crate 16696 BLAKE2B ddfc789706ab39dac25436db39fe73c7e35504a8ae18f4ce9e75515d363c3cce1f4170315210ff172ba138a7241a7dee56d5aae854af69ebdbf3740e3534bb17 SHA512 a65ca9f77f9fa8251b84a5856fbd9856b632cba3e4a2276fbc680b16bbe2efb7e1278e6d4e33f2fcc1bfa43146deed43774080336d70101778389f9737d2275e
 DIST async-signal-0.2.8.crate 17497 BLAKE2B 1ad10800c45aa02c3b644b6e21cee88939cda4e5b4d0b40b2c1304c4c61a5dfd6d01a99608e8faf3ca678bf68fa368dc6ec2b8cab3574a49d8efefb2bb9e3c74 SHA512 f109f470628c99f514ecdc86fbe31c983dd7e1a35de2b7bd81d05d47f10d89aa318ba90642123b917e7da69e7a24d0934e936d212fb55e23051d2d8dacb7b3fb
 DIST async-task-4.7.1.crate 38077 BLAKE2B 200f3c2eff92afeffb34404bd9b02af39226024d309137c3835342ab6631c09f14f47abc5d25d77e73cbd133274e731fc88e7e94d8456f690b0f1056bae8dd95 SHA512 8495436d0739a2ce83b372ae13ff24ca1487c92e032948d5830af19c3ba411d7cd004634fa10bc2f748f8a82de27c12cbfacaac92cd0012e1fae024eca9e78ca
-DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
 DIST async-trait-0.1.81.crate 28896 BLAKE2B 154e6b8da082193832bca7bbc097eb5ee25ed8365d1cb8dedf27f62fbffc710cfbfd0094a200a10399e942014083b74f521dae01cc4601e0f6b9d7364761fce0 SHA512 1fabbaa813ba320012c0bad54d27232eebca4d3fff1cc5ed771df9f90d9e9bfaca4f7b018358dc599fd30c5974d00b34ffc05ce6e9151a57ba572543bff83fd0
 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.71.crate 86553 BLAKE2B 15ed93574fb9e8e28d5ad901bb1f94013b5fec7a79aa96d17f13f6f11a02d29a274ec14ce51a9f515574839aa41232e5aaf6e6fa3ad9c0483591055bd0a78c8a SHA512 5d9307757349e860fb4cab7e9ba1c9d0f1faf49ebcd935ba879b85fed2a9812786c7458abb59a742842a0796fc29ce9921cf575792402486ecdbd9a2568cdd89
 DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 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 bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 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-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
-DIST block2-0.5.0.crate 24095 BLAKE2B f73c9c2c04768213966e8421317e0263fcef5cb124baea027f92dc7aaa91b92dc7326f694fff221eb64f9a56af6cd3d2a3cce9d06e1b6a56d17b66b3a0d48a0f SHA512 0339b13e9167974f357cebfa94438f42e47b84d8868f0883f9fa4af3b839a8eb9075cc262fc77fc949137b5f5d5080e8a9776dc23b6b8160e5f240bf79d404f6
 DIST block2-0.5.1.crate 24191 BLAKE2B 6fb5505091c5f06524f20250d3c649bec46a93e96ea08227ed91163bcfd0c64fdfebbe86e77a4e64d0d049036e14d5d28ff1c85c4707d4791651616cd6c7ed6a SHA512 084b15f06d005c9d4b78b20a85ed804ca10143e3bfc6b52c4c90f72b4b3455fd27bb02577a01f7c21e58a60d174c1b5d29b662da05b9e35688dcd266a988e045
-DIST blocking-1.6.0.crate 17696 BLAKE2B 5efab89514a712044ca5eb67410cd3e2996f3a6f798e9bce2e3ec3c68bb134bf163d7d11e02f6a749baa94922b6d1b7cc2a8641a8044b4ea892698e069817109 SHA512 6b45de329933067d62c6848d14b17d64fbc7918daff5a4c307698530388e856dcb787e9b59178551589cfaf54cdeb972b3a3825e8a6ef8ee1fd76c5aee6392e5
 DIST blocking-1.6.1.crate 17788 BLAKE2B d07246809d8b80f1fdbdc678b2877f349b748f2dd0f8543e91fde4aec7aea0b45e145a44f07cdbf26934d20269af01844e1cf7d9dd8b9588d129da7f929d9c95 SHA512 1879bf31c18d5cc4653f794dd4109769ae32071564d3a0d63896162fe160bb5ed3d7d8de59ab34363f8192871122099bb8564ffa93de5a5b75ffd93c0d424ed6
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
-DIST bytemuck-1.15.0.crate 47672 BLAKE2B 49f2d92cfd5abfbe3fd94e7e4c9a3d4ac22c67b58e73947f461cf8e5022738b7d38c790de2a1717b731d658f1646066bee2f936a1575e2995e6de39d20f918b2 SHA512 5b6886f252945449c4546c181bbb6c95597e498aba6b1faf81c5a4af69bcb9e3e024d7d6e849d347682e8ca72ecaa9a70d13fb06c174e17846f0c85bb4810433
 DIST bytemuck-1.16.1.crate 48321 BLAKE2B ae8525a829a2c981200dfbc17de7f2a4e14fc6df71328c1a62b27dfa7488fdf634b4a6f45e65104bc45b828a91d3d0a70d06e9dd4c61dcba18db09204a22a6f2 SHA512 ba9e5eaae4d4d5ffd654da0359cdb5e85ad2d111b26a3b5147bae69519963ae3118ebe2afd34e92305cad3b3e573cd5aaf175c3bf81e94126f65ca3c9320b9dd
 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.6.1.crate 60723 BLAKE2B a6f28770d1c42d7bb02964cafedc205c2730351cfca81520dbf62300284416a49e19c5d858dc37ba001d21846efb75d20977162a7e203e7171ef33868a720309 SHA512 4826cdba7a772b68f7352a3160a4c8ff93002110644c2e99537274cbb9776ba2f40ed8be9cde564f58b884c1985bdbce07cd7f5a46d34b48146ff51f317b5ab7
 DIST cargo-xtask-0.1.0.crate 821 BLAKE2B 7a1c4c5f3b8f96c7247154edf3868cf25f44d8ea90845c673e6b097b8093304885cbba96b4dec30072e138002ba585985ed2615b2d6ff49881146eaf97d50bd0 SHA512 fb310f39d1eb64c6c487b677cfb98ae0c3aa9b71600c55d916d7b5de027a69547094f3b6fc06dcea1593dfff334f4ab22fab263bc7374b08b0b01a2b7d24dbd1
-DIST cc-1.0.97.crate 76951 BLAKE2B ec2e65797dfe13223b64f28bf6d143e00362f8bdd14e4df3d16ec2c5b68b8c603968f8cf6e7ede95b527ef16a748775bf247e8bf11010a326bbac4b296d72eb5 SHA512 119d1769530ec2fcc643b9b4a0f2a45db6f0772e4df882b832f961824bbb41d101d4a507573b4e05b4627d647fa823e81bc66dafdde40146878616af96b24143
 DIST cc-1.1.5.crate 81493 BLAKE2B 3edd99cd9d05b090a57cf62f1236c02d0731baa8b2bdcd6c14f21e68323cdf4a65439f81701c1b1960b70919f1a342f1ad8e0bc830bfd187eedbbf443a5df77b SHA512 2ee646d3808bd06b3bba5788d0f93762009875e1f5c25dad67b0f8dafcb512be3ff105bf9d2e92a2507a2fd942b8d774004971c1f203ad40894336ffb89ceebd
 DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
@@ -71,21 +54,14 @@ DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
-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.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
 DIST clap-4.5.8.crate 56338 BLAKE2B d8f07ac09b59f631047a54b0b9918d18d264508d5ba173c9895fc613102b0cfbbc76b89e58abafb43c1fde7dfa129f3a0b478219c3984eb41af6efd3ae138ff9 SHA512 cbfdb79e8020b72c618dcc2d554e41224f4995b6c47512c8406137aeb2df971a29fa198e504254b758c7b87bb2f2ea3cafc542f412d747744abf25a334ed6cb7
 DIST clap-4.5.9.crate 56348 BLAKE2B e2c60cc6dacc6d6c7d3718ae3748ed5f681722ef060c6b2c4ec1262da4ff4c3b235df3127946816ad61aa03d3b98c55739877dd14d1182a7d4c37daf6e1e349b SHA512 6eae38d69f99fdcc7e2a1f799b4ae770a00dc8556def97a10d578426f6770e0d86fc32816aac2dc5a59c147dbd7501eb9f7b94953a2342cf74b1034459705e88
-DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
 DIST clap_builder-4.5.9.crate 164088 BLAKE2B 47021738e0d3e946360ddbc144923daadf7151129e8548607ea3688b75f9a71ba676a31dc543a7258981fd3e561359fc0c5ed5fb6a921420a679e5d7f072c5d1 SHA512 5f9e297036a86bc33daeb76a8d906e14c58899c460ab66c934b7db0309ed5a7f63bb10d644f84e692fbb84081c20102ae97e33cb39e9ed71bea920d4e5e6aac7
-DIST clap_complete-4.5.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3
 DIST clap_complete-4.5.7.crate 38833 BLAKE2B d3028583ac233da8a47e9dad776f551e1e9b1b884337f35e7632e84a84d75968fa32f40fc0c08709661b6e9f1f536032228030b01c545553a3e0d9b6bf202a94 SHA512 9cc3a1a93e0f42174d4e7d03c628f48f94a9398527c85a5e52a915020998c8daa7ed656d3bf4b85137a7f5b5a7d8d08e17d3f5776f1d6d983d3979bc940583c8
 DIST clap_complete-4.5.8.crate 39228 BLAKE2B e829b87fd096dbcf7d4cf51670aa51cd28ebcc89663657c509311baf3b5cba93cb80f53f2bcd954cde79f49ae73e43bb15b3934d59449d1c36f255357d95e727 SHA512 08dafabf7b6f07c0d9028680dd2a5a1ecc0d3308f11b419bf6fb2566d220fcfd585c221adc7d550f1625129b4c1e58b2fb9b1d4ffdabd3341877fd729a41a29b
-DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
 DIST clap_lex-0.7.1.crate 12766 BLAKE2B e0e3a1a4a65bf9df3c21753f9298a7461046e6b34c7a8d26521efc551ef3511a7d202f25ebdddf285ff68c4073364f48cf739ff0bda32f41d4fd0c87c4cf02fb SHA512 4cdede5eb9fa527567e9f3f94fd8fe7e1022d9e9236e78d30b3068befbaadedd778b5464f800e74bf187c44af9df582365f4d41a0113f8ab0fe9abc936171fc2
-DIST clap_mangen-0.2.20.crate 14861 BLAKE2B 68fc1a18d0c2df088b4c11ba2bd4de73b8d272f888f9c1e7da73493012bab26a47cf178769fa657e4b893bd11eeda038135dd7a606a31b86e03bbbe57422deb5 SHA512 f651d0c044cea804c469a59a6f4e3024546cd018d73aa4dedc4f2ddd78c04fe0cf6790d442fc16968146068cd61c685819e5f39fef6320aeaf6dc210f61582c2
 DIST clap_mangen-0.2.22.crate 15699 BLAKE2B 8c2d3e9b02466fcec671b6e0f57d1f4bb4a576e055f9bddf8950386a88382f1a97a7aa398038cf6cdb8ba348983e6226278fa5f21454dabb7da85f5c91de245c SHA512 7abb55db27671391575bb7a0ee284a601938fd69e7a8e34c03f335fccdb1efcbf290e5ecb2f44d5dd0bf146ebd862e704f050aee940597df27181ba5434c54e8
-DIST clipboard-win-5.3.1.crate 19921 BLAKE2B b0b3b9e30bf4bd897fe6db78cb68a906e8dcaf79f0f4218428f5707f89aa60450d3aed272de10e81ef708e2ddf4737393380593cbd34fae5b1abf87a9119d85d SHA512 bea2c0858d6d4d7e5e49bedb83d032fd7b23b62e042e173f4acafa262b4946dbf4b8026f47befa1484c7d478db6a818e6cb0f549ce29a7f027f75828e9ba35f8
 DIST clipboard-win-5.4.0.crate 20559 BLAKE2B b4c795cf707500b429322dfd0c593188b63f9330c916f2559953e5bb4192599fbc2337280940ff287b9691683ebc421ed56aa5adf64fd09fe1c560fa88df2d45 SHA512 1e5bb8dcc860f989a46183a748a47fb18aa66a164df1fe366081fd620ffba9a858f8e87ca19783c37b93cdaafa11029170d149ee30422b1c9b98020784055503
 DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
 DIST combine-4.6.7.crate 134808 BLAKE2B 1f3ea9962f4ed4177a9c028d04934b5e261df405c1c0282c74609e0e6a1490a92b262ad26d1d21dae977cff8795bfa3c1f85aa43fab13a88227394d61d93861d SHA512 b8232b0e1f94039cef3ad4a0a35a972eb49f4f198749d2fe50aa3fd2a77614f2d24e51f3b4465243ce9140aed6bd048aaaae189a7ba864e3d23843e9be0c437f
@@ -100,11 +76,8 @@ DIST coreaudio-rs-0.10.0.crate 34487 BLAKE2B 30c2273082266de0e4fe7f7f6ea56673d95
 DIST coreaudio-sys-0.2.15.crate 5532 BLAKE2B c7c3f67a6db3b9d9b604989812b45d75b02a04565d1dfcca4698abdf540d1deef1c93b6a9b02a3689a32f033495411a5dc11efe4871e907f8bc0fec6b5fc4f25 SHA512 060379c57ee110ac413fbd24b48edef283ffba17692672f9ea3f6f0a627cad8f827ae2d375c341b0180bd4de7b3b5d55a06ed7b171fcf3cc20264826f2489436
 DIST cpal-0.13.5.crate 93790 BLAKE2B 9e1b6f6d385ac48a7534c716a332c6c15b77556253fbfe27153f1e68bf702f84b6450a915ba79d229443beec2c4419bf7ebe7f856a0c95278a3447236500c1b9 SHA512 ad1ee6ed7473474df716300eb6b1e5db8a4a0f9844a5bebb6704e1acaf102c4dcd495d559ef6be99db652ccc0ea2a9c2d2a266e865389ce08aa6f60ba06e1c8d
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
-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.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c
 DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
-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 crossterm-0.25.0.crate 116533 BLAKE2B d39cdd1f4df716974cd0929ca40073ac6e17b2dd73f27b48c7b2bcd7cb4545bce544b2e8459812b866936c03a27162b309848e6a92290960619c4efe2a1e0502 SHA512 fdf2b5b4bdcbc8c7dc4e8c5e0cdf68cacdb97886b52087dde1f1be9b869c00965c0cf9db64b700801b0d1274b913703ade66a92d47aa8da604121693b8701201
 DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7
@@ -116,13 +89,10 @@ DIST cursive_buffered_backend-0.6.1.crate 6420 BLAKE2B 821c835255f7a6232c5de3dcd
 DIST cursive_core-0.3.7.crate 159235 BLAKE2B eee0f2ca959e742446a659a4182204d5e4f65d30b3c126cef563f2e47cc12214c5b1743fc4e7de3d0eddac7a6f0ba2ddadf96446abc2997e907d74439dc0e606 SHA512 2c19b2726422094158c70af4a1e656666a279f0d60beab6d8ea11be1cf937a7f13794058d7b1f6a46241a13e60fc0e96c95fda8331000198813d3a4d6ba1e3b9
 DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75
 DIST darling-0.20.10.crate 32031 BLAKE2B 038c2a4d919a8e9ff6eff5f83911b40cf4e918ac27c90f313b6b9131c41770f83cc3901973fea1c6fea2886a8360f3c5cf73b807d14e579b8b8e87f15e3bc6dc SHA512 7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55
-DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3
 DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f
 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
-DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751
 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 darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
 DIST derive-new-0.6.0.crate 7694 BLAKE2B 8c7f33653f01961eb8df131e9f61422a54b3fed986a4116b7174693649e8762ec60e5251e9a34713a8e0126e4e2fb2fefe1d6e8c5591d806b1dcd480512cb153 SHA512 2f603df3765657e1dc857012610d849705002c8f710136ddf4717cde5d7f827d7d886074a08ec75d4678601c17b8cac83961db25bd10e49840777a4e89c4f7cd
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
@@ -132,7 +102,6 @@ DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47a
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980d8af1c050d6096d45fb748f0acee7f7de2f9433f97ec19faec9e028f57c8149229eecb1827a1ef8eb60 SHA512 4a8f1c09007ecce1d7c829899aafb90081fe4fd89cfac3550638018760e24f63985e3060c4056b55bf58cf4622b1b31595e1c524a75b1b4354b8f3c35fc267ae
 DIST downcast-rs-1.2.1.crate 11821 BLAKE2B e8a78afcd8d2f17c9505973359e2151d59b233e1757b4c7019047f148b1c8a4f28dc3a0d6eff6cc7f4a7ed986bf592ccf0481dc112768a9751475e1b0dbe27f2 SHA512 f37804c1b1e2cb0ecf2460fd6ab274c843c43e94aa7dfbf4e3c53529cca9b5624c4ea5ab5ceaafd72481165c7335f3cd1f846ae43deaabd18f363572825a5f86
-DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
 DIST endi-1.1.0.crate 4872 BLAKE2B 8bbffc45ceb70777c6606714a7bb8f9b26ff33a295fd722958a5e9c556d5bb1e97a34e216514e5acaea51811d78fb4aac927c1f8315fcfd8000fda3741c53b4e SHA512 1a4b65cf77f530a2d15cfe968aecfcc9120957d23d2b442cd3d8f23d7039e832e7d6ab29aa5ad8570468421095650e26fa07f29bf75ae361416072241726c61a
@@ -140,18 +109,13 @@ DIST enum-map-2.7.3.crate 21792 BLAKE2B 5cee4f4f5b3f29c5f73197de22a7559fd6264fbc
 DIST enum-map-derive-0.17.0.crate 10781 BLAKE2B df77d362cfee0cfbcd9354f65530424af9b501351544d97d5cf04c4a4fbd5f1862968bce42b719b9159892490e69c06c47d9fe1be4ecff16212e26906329e572 SHA512 270f2e9130e5c0124be707b7b4f642992768d2dde3b429cd86a192410c3618cabe24a914ffa79578f14cce72c28a55d5a44df8d66ccf3178c4c68bf4da61c065
 DIST enum_dispatch-0.3.13.crate 29876 BLAKE2B 8fa66a72b1f35e174abcc8266e8a36e835923a1b31aa2fbbbbefe3bcf1287bb01b456597915c0a36a9ab7e6a6cd0ce7ebae38c09028ceb9109b7d18f26f023df SHA512 9ff73db5852d8c515f8f3beae0e62ac3845b42fb39a2ecdcda50e44535e9183790406652024e3f968ecbf4413488a02344831c45498294ba97c345b31e1d0782
 DIST enumflags2-0.7.10.crate 16622 BLAKE2B 5130fc27294e25ff3fca4bfae3895c79ef3f78d20c64378854375ef859eba0e0b00dc6b2e662129bc41997751537c40e058674f43323e11d463f2e8be34ef593 SHA512 03baa542e83b15d0e2e36205a0ea7a6694bd959b315918302324d50ecf30efcd915af79441c9c8c15670c16776442d5fdce51080fa7404662e2756607fee1668
-DIST enumflags2-0.7.9.crate 16555 BLAKE2B fc9d888285be03c9b47c6f2192467361bd4e67d41053a046508d0d431ac15b8cba69c265123a5403cdeac213d6c3ace8a94130267bd891e576b6d4cd34ffb082 SHA512 3899b6af180e239673d10cef2b02c848c79325f50dc40ce1ed07d00775d157679f1aee83b3fb79b8e432419810309d3ffd1bdde8c866aff723c2a3cc9d4c735b
 DIST enumflags2_derive-0.7.10.crate 8104 BLAKE2B 7332ce1236a62a02c3441192e1bb9ec3944dbb7e74e91bec0f488f5b7c382c3879196b1608bebbe04015cfc2a9ed0bb5a399f889ef94b43176d28df8f1c16598 SHA512 3dad49b91c9724504121ed1b1efe7167fcb61c956d7925523e1edef14bbd92187d82e60dcebc8ac0c22d50c801ab2868460b8b3e298f31a730a7000f80080509
-DIST enumflags2_derive-0.7.9.crate 7901 BLAKE2B e71ecdabe6c4e5ff7e01b1a820da948b000d614fb9ca6dd53c2a6dee215269d392a1e15c724ded3caae3b08dfdf796e1f61e04fc4a887956eeed8666fbf25868 SHA512 4bb89eba5b22cef199b19cd0d92605b5a11ec3738002b4fc2426c6aefbe6017f8b7156b3ac83fa7ecbb5abe54643b3456a8700ec831cf1dc27a518e621446be0
 DIST enumset-1.1.3.crate 26976 BLAKE2B 4e40cec8a6db10a04b598eed3aa7b9a81235ed95e433571ee4c92a699c4687a004dffb94721aafceadc4a6c68dcf08fd622385a802ad330208d55f7c0cea0436 SHA512 1fcc39050a75d73febf9f1976913872269f41916fbfe936b7ab67d7d61bd67de9ffc71a1cbf34eef92b2fdb0313b5c77ce9dc7adafae5992fbeb6fcf7b31c180
 DIST enumset_derive-0.8.1.crate 12711 BLAKE2B 752eeac1d1215a041962e3386ac95c1b8673921b76bc4ecb14acd98895f01ed3be24a95b5ac127af9f4fbacf65bb5035e60b989e3cc7d732db6015d92106ef38 SHA512 9ff87a0a5dbee945b58987f9d26200efa5e8d5c085ceda6e44ff9cc1b05bd903cdda632e459b26415e7e2195af79aa51b8e95fb9ee7917fc74a6102f220e5148
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST error-code-3.2.0.crate 7569 BLAKE2B 815e83d67a1f257b4e9b3058ff849b3c37a44a0339b8a3ba175b7c3cf4794ffbc76369ddb433ec278002200702b83e32042d62e5603af5010ad4df4c9364c501 SHA512 d3a6dbfdbc1626d9502964dd4615fa5d39f8507996fe6e727bc694c1da54c1760b000d4827bca7a2190db5f04b8549c6345f262702eaca88d8b83a43649c37e2
-DIST event-listener-4.0.3.crate 39784 BLAKE2B 2924aa196726f3a6404536dbf494a52d266014b2097ea1f4a42e0f5d54bc2d14d6722deb4e40f1b1fb539ec12af7348275a75a9fe3e619a7f6a6a9156e0d30ac SHA512 2ed4f1624fde0643fc8eaf3275dfe77c15f936e1eeaae43d205f68d90e2a8dd3eee3b39e953a221cd19a88e8b947eabd5b8477dabaf8f30de328c0c13d132d7b
-DIST event-listener-5.3.0.crate 43084 BLAKE2B 0876bf059b3d4798cf4a273f784a4d4461c933e6982805b44e997ae244a5996566acff08ccba2fae6bad6ba2b536fe90f554943d1f735f5638a37bcf0a74139e SHA512 b31b6ef4de7c062900845bd7d0e940045b641f7b02898eba2fcf42ac98241a696777e4e1fa740aa52fb80454b5adcff4e1511705d9a593c882f9ccd13437bc8d
 DIST event-listener-5.3.1.crate 42576 BLAKE2B dfd8020527c06adae338e9bcf19076e70ae745facd7b49e8d6604e8508436b70b48fb1f4479214998f288055447186d4ef4969630af90e301103bc5faf6492e5 SHA512 98b7219a3959d6225ee5fb68e8b9d284ab03334d895f52a71f673e59cabab1d06a0abb9eab905e8d38d5f9589725c7c598355ae3c909044a23bc5830b761f5c0
-DIST event-listener-strategy-0.4.0.crate 10225 BLAKE2B cedf057e73b7d26ce691c3a5523c7492ba6fea65393ba20ca80ed091d3c4b392c85caf5a526647886547cca22bd703b0a01aaa8d018b07731ef909bc3281243a SHA512 02e8253ce8b680d9df72b786115d8894147483c5b44d530adb600718213424b2d87c899517ddacefe73738ec9c8904d042341d4aab8076fd19876e89972061e9
 DIST event-listener-strategy-0.5.2.crate 10697 BLAKE2B f49faa8a2cda551b65e29b9dc98e4e55dabff7f2b330097bf5f6a5a5927804a99cb699d1f693db9c7cbd92ecb44f6c1b51be2b86810d3e3fbfd5eebcfad1a241 SHA512 7b3759d07c7936b53351172e38623658cbe642f079426c99e7f9187ba1d7f8cbbe7530c056cc760909cda4e70281a50577caa41426164b4c8d6c3f4cbddb2626
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST fdeflate-0.3.4.crate 25001 BLAKE2B 69bffdb689dc467bd62738299ea17295bf7dd9d51c78b17e1ef6eee265056308703646791676c44430a686e1d713a8f561c5db972de7ab7c5e7b21050cad70f8 SHA512 a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf
@@ -178,17 +142,14 @@ DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b
 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.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.4.4.crate 168905 BLAKE2B aa71ad20ac387054449bce337d9097822d583c5daf7bc3f703f1a8dd204cd616f0f690ca39eb5e3b623b5694ca9c5c070f829d461a1f6fef0b94882b142806e6 SHA512 469ea1d854a70fa8a0510437626b0e0b2fb5409c6eefb0f5a89be5cf24d9082654be6cecba3d817a19604e8778deca6fb10762bb29e0d1bfcf8548031e3ef4e5
 DIST h2-0.4.5.crate 174166 BLAKE2B 17344c381a45c525dc701236a3e0a0015818f36c6c09507da4c340be35ca1544240a035df789854a6c24e3cfc0e57d08d33a925d4907634d7b82df793102cee1 SHA512 3241dd8dbabb12e09ebd4acc05d9868395b51b4514262d4caa9f7af8b4219a8bffb3589398d3dfd86949783b8b2ac968b9ddc9644ac741da5d516b68402f0eef
 DIST half-1.8.3.crate 41624 BLAKE2B 101550482bacf9762d850234daa49917510e0061cc8b729c0da434d5530bca88d694850ad5865cbdf47434383ad5d68abfa768610a50878deff9ac84ab0d28ba SHA512 9ba1341edc6aa1c2edebd77ac76cc95851d3387e189a8d5a66dfc0974e79ba8610af8463c2bcee38d4dc96f82316ed7041ca31ccda8863de5a90b4f85f3a529a
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
 DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
-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
@@ -198,20 +159,14 @@ DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17
 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.0.crate 5411 BLAKE2B f560b45bfb1525fbdb209982740dc2da5688034912377b88a1f0e069a003bd3fba3d3f248bae98dde043e6f797f256a219228611e9b8035e6181f4c84381f823 SHA512 b351df7a2ec991787a57232229f80a29a648433de25efc1db2c9453d5a09b75c2e8b0101268b6753251c686a2af9ce346e08bd016f4e93891534f428c1d80183
 DIST http-body-1.0.1.crate 6125 BLAKE2B e253f2c85c0553382db955ce9ed18072f8916738962083223f2466034803553818e7f5a11649ebf5ea9118e7ce1067bd9b999379a03a335b88c810bcd312cafc SHA512 3d9a711619e5b14d2188fa42bbd43653dceeeb7e172cbd96d36fdf37846fa2c1efa0fad019395a4fa6da2e139875934aa56caf7332dc40546095b0a774ca39bd
-DIST http-body-util-0.1.1.crate 11930 BLAKE2B 7e8388c2e15f7cd2d4e4630bd1af25bea49efc2444b18aaecd5fe191d913c7922a34efcf48b69811e1c64923bb7dc1e3aae9a2ca2daa1b1a5c9e12c679dcf787 SHA512 bb3750ab98dcaa7024c1b5a90b3865b303fac8f723dd037960f12815c6e0d1e68ab5e09dad0b7ab3154a820e7ec4a5bc7b39be104e5721c7ef1fb36416fd9b24
 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.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.30.crate 198175 BLAKE2B 9aa000132bc5db1cf566df48d243484b52a099d47d68aa2fc02d11455f3eece99f6a954bcc9900c0173cb39f145d371cf97b024517aefee4c7bea7746f800dfd SHA512 037f19ad0ee461dede269acc634955b087cc021abe52053de74805243621e35037b4968e20fa0ce7fcfd83ae05bf485c8003cf1df55dc30bc4cd64e62fcde633
-DIST hyper-1.3.1.crate 148763 BLAKE2B 50727f12dc4fc3ac605b19f92c30815a059364674b57dc0d8fee1aac548ba9474a9c0f23c32c537ef1b814a6eef10608dd442c579e37b102c249356c715f3cb7 SHA512 a7158d887593e29885c0d62a482916d50e14b69d7a4136be6c29e262d739d742d551446507bed27f7e6d7b142faac9907ed7b590e6f84175092c52f176598806
 DIST hyper-1.4.1.crate 151849 BLAKE2B aa5f48c38ed54de8d1b8ca0236acbae6bc30d530156c3f4f429f89e48148dcfd0580478041549a3f43faf38b30f36bc41276a272463c42c80c1b45a7b24a236b SHA512 0fcaaabfbb606020534aaf0cf68c9f1be3480f2d1b126deec30ba2879cdc3c7c7a24bdc5a2ed81aabe8be4df36b146ac1585ed8d07181dcb743852ff3fc0878b
 DIST hyper-proxy-0.9.1.crate 10317 BLAKE2B f9d00182507e6ac917adb73c0fc9b58fab95998e2e22d8c129e51e9e39239e58086ccdfd862713dbc615b8ea736f68e72ae7fa834c7af44c2c62f5203bb9a50b SHA512 4a8c5e79475d9fb09f7bb1bf54b97e7879037ab4f97626fcb5ee788e8480dc617fa686cf43379a87bb90d0b96d91c13cf496ae07b527c06cceb6ac337e90556a
 DIST hyper-tls-0.6.0.crate 15052 BLAKE2B 2d9baa91bb89078e58b6a3af87af6796c110cc26f79604d56552836b3fc770ea63b215b44623a57394d1d60382d65f9ac0502e68700ccef4a2d4b19414497545 SHA512 6b99b08669e689005a27f2ca70a12aa51298a6a4226de072cd84fb15275339dde8e2054838541096484d732a1d2d913bfa945ff3003054eb62ac4c2d0a8ecbd8
-DIST hyper-util-0.1.3.crate 61647 BLAKE2B 25821f66f7576e89b5c7a5207a4179a7e86f024b04acd1e8c7cdc8be3bc8c9222df1efdb14de087a0db50029370a84ba5d48ae2a0d85d04c1322bc1701a4c2df SHA512 fa68ae79e56a40beef318ec1b3fa6683ecd49371a64b123e55cb311a739d44226bfd526afbbab661785ce4302ef4bb1bcbff80ae3c6af26a4db62e9d4792a114
 DIST hyper-util-0.1.6.crate 69910 BLAKE2B 15cd92866ee69eb898cdc46c9fcb8e67e772cef0d069d6dd2b56b76464861d5fd8aa1f8ee3c27a7feaac7ecded048b4295c74ecb0aff67eebe2b8307fa202f7b SHA512 ea1efe399f8847afb6dae13078c9a6fe3984b76bef1f6a282889033dd516cb5644d85999b8a77fe9c20d2273854f71b5c0a5a5f54f2dc8e249894e263b8bbea7
 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
@@ -220,7 +175,6 @@ DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e51
 DIST image-0.25.1.crate 9176733 BLAKE2B f7daa1982ec510de79c925157f2e1a861c89a92f1cc043617469f3c95cc9158f1ffcf274513556993bbc4bd5ee5f86bcccd406cfec06d98b0330bfc10687acac SHA512 4252672cb5b5fde61e9c7fce1712997ea082e3e7d5350970d597c0a1421b21078e1b4c3088474c4b500f396bce604d0749085fe4cdfe1c3b5f3d1ffcd39c1b04
 DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9
 DIST ioctl-rs-0.2.0.crate 4214 BLAKE2B 046f3ac4177d8f3934e96d0765d93a7ba9ccd7fc471f8736446a7959a08cba5d56294d023a6f24ba24145f668614a693b5824db3517eeb8ef29b7df5519dc05b SHA512 110bd5239f37327892c272791c87b038fc9041cf67c6ee41c671f5c5d22f070b921fbc23695ded9219caddac1097f47c78c0eae3930adb3d38a6ffdcbe14a4de
 DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
@@ -232,13 +186,10 @@ DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e
 DIST jobserver-0.1.31.crate 27306 BLAKE2B 08ed4a90dfdad5bd7d67b8e15cf61bccb4a9669dfe4a479680c481e7066c70d833cd199b56a4ce7d1180cc9fef565d0afe722a13a436b86326cdfc8c10fb0424 SHA512 0488e5eafc5a99583d4626ae8900d49082aa09228b35a8992d8e715b5a39aade47f51562dc4db8ac41305e069988c4c63e1c78e92d65561e3e8a09d4dfa5fe25
 DIST jpeg-decoder-0.3.1.crate 744364 BLAKE2B 0ccc3a7f42e471fc1fc7995fa99573b798da89911667e477a310d10b95745708e583d53776467b9d54a399047b727a3fd4c26a1387382c226f6594770b21ba05 SHA512 103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00
 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 lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST lewton-0.10.2.crate 68807 BLAKE2B 348af2eb2cf9a8d3e2277d5c63a34430910b7ce0c470b4aafb41c6dc2289702b5726cbdd4e390b9d5b88df594bd4d168dd0647a64342e8fd3677fec96d89b3ea SHA512 8868d1347f75099d40dfdeecb17ec1aa26540d3d9dda88ae62329e35b30cc7cc2869420592d777810a7df1e5e2c7a9518e7895f885921d68ff66ecf3417d28dd
-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 libloading-0.8.4.crate 28636 BLAKE2B 5961c69ce15cf2bfb4ad743ead808374f5a7a9d98ad5585d895fa4654b1c31309d968eb3f5d63e7dd5fa95b77ea59c80e666ab0e467849c858a807cc3a68ffb2 SHA512 670d82fde2ddbfcc28efaf7736d799690e4fe4b7872d95854b9c4320d64f45d4b33c0e1917228302a7625f2e5e55e5ad56e113ee8e67d59fb384b7054a0cc849
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libpulse-binding-2.28.1.crate 130637 BLAKE2B 3b5490c5bbd3d60e8deb70d2a5561437770694c0616dc655dfb7d8368cb30b58b1ad6c05d60d6d1c04cbc7e6c895b8ce7bf77d0d63df0d5de5f4acad8ee30fb1 SHA512 224e8e6dada41084d5cb238715af7ed9e057df6ccdd37736a6b8bd8305fa66c2878884a9c66063ff337ef26e441de8fd7ba148be0f73c6196d2442aa3b25465c
@@ -251,28 +202,22 @@ DIST librespot-core-0.4.2.crate 25197 BLAKE2B 15e9b3815fc0851b9a38902612eedea44a
 DIST librespot-metadata-0.4.2.crate 3850 BLAKE2B c6dbc60565fbbf989787b3173cd5586d727d83c7d08f6ec0f12344dc0a66d93647d7b54acc2942b51a4ed4961b220cb4d389f4e90bc77703a06fb5f8a217d903 SHA512 eab90ae89d4207487ff074312dbc8291f616d7f422a5d8120a72772d25550bfc7f090bce4f0510ac37db031bfdacb6763f0720321338dd8627dfcc21237bb396
 DIST librespot-playback-0.4.2.crate 39168 BLAKE2B b8d527e35e80c10388afd9d9e02de3c6fc7edc8df87bc28df4ed676fc2601c8b3861ae748f0bbbd302d6aa6f21b90958243ad62ac32292351c0a1f719289881d SHA512 88f773c35267e6b70b75caa21c3bbb55e1c4a609a5b96d1817fed755ef52286cf0951d32e43368e18538b1345017ee3a4e014c4d76b16291744160c5f2e6f67b
 DIST librespot-protocol-0.4.2.crate 12192 BLAKE2B 21c299e6869000380e424c5acfc21fe3e3cd9f58aa56eb2d7b306555d34e8cd13865ebe80f9328459eeec53ea5cd4ee05070d877ec4a7d5ad985f77e50e9586f SHA512 098d336ff7ffedbd930ce382ab80e6243860df3a28c85a7cd29c8a6e5cacf8b5aa454dc21ed5bcea03e7840fb279be88b2698eba5bb46989b9d910ba7673b3f3
-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 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 mac-notification-sys-0.6.1.crate 12242 BLAKE2B 473afa3ec0349f967b92b38d4fc1431d9b9b45ba23fd22aea6386de3ddcabc161adc672dbe6b394a5a11f9f012f3be1c84a48ff59c336c49221b5ae6dcf1e314 SHA512 76c202a10e1ad5ca7c892885048f07cf83c8acc45adc297d622c1f51fa706193bdb7a901ac127b0b96d97c03955feb3715ff83e08bd292e477124f4793488cf1
 DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST maybe-async-0.2.10.crate 22107 BLAKE2B 2b8bea636cc271574bad08313b86d5b3a2163199addb0b6320630655a8b238d811db302f1c9c7168bed5963f0b55a90554627c48f59ec2ccfd5674303b1cb344 SHA512 c41fc42385a47706167fa9c51fbd2e4dac74683c362d66f71705de4125dd639a518207a2ae4cc3e5f913279ea205d260b0ed3fe2edbce68f27ddaa9e9989e59b
-DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 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.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
-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 ncspot-1.1.1.tar.gz 254968 BLAKE2B 3c637c3426df7f2ac9e7f6fe5835fa2b0e691c2a67c207f75cacb2813a3570549447dc5a30ba2c4c678b512c895553c7a007bc22547a883ae42b94a40628bcf3 SHA512 1cbdd166da3e620b3ab9eaebac7f75b2ee07fb04190ee08db70b88054311ec61b03364676279c35783671c12318ac594b28f8d4db1995842055a43decb35e49e
 DIST ncspot-1.1.2.tar.gz 255659 BLAKE2B 4341560dff41518db9208d9dde9823c25bd1206c80d1a10e5df91fc60be57d68708310c1d9473886196b04bb5be7e8bca87595abef0fca9bb44337752e96663d SHA512 81f79f7fb92998faccf12482a029057ee80758fb522ec9d34427a193d5dd5c1ffe6390e3f327f8883e0d27925f715025e8eab16e80888326931c6bf4deced3ba
 DIST ncurses-5.101.0.crate 26027 BLAKE2B dde9d01bf611720c2cdafd7136c974a9eb5fbca566e0b5c8cdf60c1f5979a6cb0a4b6b47170819eca78d6448978b4b19e81fd0ef0ae61eab2932859b45a8a787 SHA512 e73513a28706dce70296af28170e8c124b9ab105dcc6509f2d65114f0f8f948b775cb4b459293a399bbf748f06bb60e5906818d928b4f0078c96531d8ab050e7
 DIST ndk-0.6.0.crate 39828 BLAKE2B cf59da1e11fed905b245520c7fb00012c194379aad9a8d75e39e771e3df629824c17bc04121b4899bd7f13e9546cde3877593f0b4f3e66d6876f9ee6625285fb SHA512 62af40a702784a35bd3517131aa5c5fe22da81091e45a8c8639fa8f1f8b3fed117991db9518dcf55878cbd6222f696d09e0bfb28e161aa47d77b2825ad2e1fbb
@@ -288,7 +233,6 @@ DIST notify-rust-4.11.0.crate 59658 BLAKE2B 7f014935db7c8561ad4671bd399960ff3485
 DIST num-0.2.1.crate 9082 BLAKE2B d82bf8cf2f53ad30cee1364d65358e8421aedf66126184936d575e359307373ede66358e7672e1eedf3b8ec6a997439a077943c6f20045aa24a89bcdeb611e70 SHA512 9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778
 DIST num-0.4.3.crate 9575 BLAKE2B ccf8b2bc0fb93ad75353ab93839344f1621e79a916b2cfee42e1332808608a5cc0552066c46c0608364c22df09b69651fce911448085782bab2ba08c90e4781e SHA512 766ba6b7a012f7272979ed02942acdabf9c5a97f553732e241c05a1075f4367651ac0bca58a512c22857f5df20dd9060a7829715e45e3b16de650d4fe4818c81
 DIST num-bigint-0.2.6.crate 87275 BLAKE2B a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3 SHA512 19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
-DIST num-bigint-0.4.5.crate 102281 BLAKE2B a25880f907caeb948d0a8619180be7e1e66d0644819a842fd1413a1ecc8d7cd873b4a55a684e8a98f6bc1b74612e20d3d01389c6753389cd9f4cf7f754125fdd SHA512 0d3b1da7f37a441cae0bc276b5b9b8aaad2f5a7ddc3a1c9b6c6e09be70147f7430604c74c57a79dce12d32c242393c8031ec7bbe9b1cc6fb6e496d6fd151474e
 DIST num-bigint-0.4.6.crate 102801 BLAKE2B 0460e7dfdbd44b6c68fc8ead6bff4353e549127158dab8bb5d217ee33104fe9ad5f58b63a01d56fffa8d7c4df1a87dcf5b536e436a0ef98dc4418a4690c4cc15 SHA512 19d14a7755de2b559026547d9e3e1775e636781bdfdd418f2e1d962c51411a0973a46d84d0356e30c0f708a7c7b2097926611960043f71391919cab1aeb6aa04
 DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
 DIST num-complex-0.4.6.crate 30352 BLAKE2B b9f0465d53e8e16edc44187f8efa40681377e75fc4bbaec2c9fd8b8f5384044c3a989106ed3cdb740cb86e19659b34e4b38e7cfd7bb01904e137ddeda3d0b6b5 SHA512 11ca2c28ffbd15aacb7e184b7f3e09cbec9c955738568c1e0760c256c72b230cae7152403d834c8ed9358e42b724269e99313dde9a23027a6963ca176ca45615
@@ -306,23 +250,16 @@ DIST num_threads-0.1.7.crate 7455 BLAKE2B 282514d1c6ebe67ab2c30f91efd5b6c8880baa
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 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.3.3.crate 20519 BLAKE2B c18653020b190f7a60075aacd238cf404b959b7e3580d0907ce7ef3659fdf610c5cf3e151b474697f0450a115e7f503e1c3307c43e53c65be65f17b0cc448f9a SHA512 29e0a516c1a3237671d165feb1ef934afc041635023b26515ac7a06b462acc3f4e25823a142339fa4b9e20fc9a369141c31527c6b17821ce403a72dbba68d4a3
 DIST objc-sys-0.3.5.crate 20560 BLAKE2B 448be3afd2fb1c4ec3059138329f325dee87a394f2d22a121292d24d55709497789eda356bc5498871660764d455320e30a0e2732c5b5e3f93a22647c8798130 SHA512 caf19594c04d666f24c791b941346d31cc6fc03adedd6d0ff393910e9489d974afccb155400b618e2d62cd13885cc85b16a3c33e4e72409e3cebb0760ae34b99
-DIST objc2-0.5.1.crate 193188 BLAKE2B c81ce2b043231d6bd3c357e3402c74876af4c9ea2311835736849ed00e854f068e5822fc8c9ff2777c85bccd438ca8561ff714afaa3ad742ba2ad993db9e6894 SHA512 7d43c4b3bbcf424e7a94bab3166df7fff9894795f6ee53c5a65a3592929b7d0dd946fab49c915d6ef9c174329ad1a5b1d109ffe0448e26eafd97aa5f1c9f2e63
 DIST objc2-0.5.2.crate 199204 BLAKE2B 439eb3b4883f09e523cf43727eebb1008e1a444a2395fed87d55ed1b5d6bb31d4ac405076143920fb3eb1e9ade6a7b17d2431c50b77b030fe98249ce59ca67e5 SHA512 2375d4e7633ce8a14c8229e5da54694419e8516be3bc80083d0be4d80b786dd07d7e152b044fe058946a96c41346b119b7725d9a05038f12074d95c15c9d9aaa
-DIST objc2-app-kit-0.2.0.crate 328831 BLAKE2B 70e67596393e736904202b45d5dfc8ce56e0f901ff94ab7a2cfe7f57e056217a9c3c82f23747d0cdb1d70f144c3b43a498db48779f30a95f7adf7754c363bc23 SHA512 020b491edde2b0af5c7b1ec0a26d0e1dc83e1505f721d76ce7475d79091ac702e92036561135384c831ad58f4c0b0d7a77a88db1f338a22ce160b7ef926ed33f
 DIST objc2-app-kit-0.2.2.crate 337435 BLAKE2B 470a0f4e1766e24db45ffe8fd1366cdcc187db1174d8a59d5971b9956ecc4f405649b65a0ffe5495e7d6c76148dddbdc17e1196719c1e2b582459756b6a10a4f SHA512 23b865fe8d27ba34c71863d73fb4f6164cc88900baa7d1419f1671fc72cf2f759fb99321abd09af7b2976ee8cba2f0711c68f9a2302827f5f61134b9006e18d2
-DIST objc2-core-data-0.2.0.crate 30048 BLAKE2B e8fab39a8aaf2c3e61c54dd976bd522a6069ae816fe08bf6d94eabfdeaf3d02b8cfb7e4904ef1d593b71a258b68ce87a2cc35cb0d0978e00a9fb2fe72ba9e0a9 SHA512 f97e256ef0f7d56a23a1d4c66f4c80b9f10d6ac5fc6768afeefb86cc4ef368bfc2189c26f456657b1a4312c9480bbaaa6f0cc45eab92b3b813aa298c65c6babc
 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.1.crate 18592 BLAKE2B fdb189a9035588ed28b65bac5b2c028309160d662dac2f68bb27d40c47f013f79f634796981c7a575eb9081c43f47281d1827c79e2b43820a844aedbbd0860d4 SHA512 4ce8c73d77d9d95db6f141e087fbb4b38b576917709e6d633d012ebf6528f52a07cd4a50690ecaa8c9d3577cd1d38c7be036d978d5d5cc0ffefc7792364469c0
 DIST objc2-encode-4.0.3.crate 19478 BLAKE2B 370a5d799d90a9f2ff85763d1e1a6301541a815b40e27eb9d49a18ccbadecf8b65b59e5ed8a16f2d7b824a41ab200f24b8bbca5208c8f05fb4e91512179276ee SHA512 ecf8eb91c2817f2ea9e84f9ffc44150192d05096c1a3e2b575e6dc8eedc28c1c3f5559286bd2f4fccf39a02a156b0ea4d4396a8eed4313d11835c122a9bc29a3
-DIST objc2-foundation-0.2.0.crate 242960 BLAKE2B 3fad756221e1de85ddcc61c274084fd3d1bcc0e1f63a52cf6d04d6d9a47df57b19fe72198ab34bbed3ee649a5bf2781d968d4928147c5bb7909fd84dc32f5cea SHA512 5376c1c22e02890b6ac4127de923736a4885a7517a4fe15adfa6bd0f3229579bfd1d47915f30c437fbe011d757f02c53edeb1ad20a1ca6880ead63303d51955f
 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 objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
-DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
 DIST object-0.36.1.crate 323865 BLAKE2B 60afa0ce744d32544b56e982fee69a33114de81ddb8e25156c4f1c6e492b39390a47e14a929cb7a9688bad34923a67d164295a42eb17932433b7d6b5cac72d85 SHA512 a64a7538f4be5473f9f206cdb0c79cc402ff3c868b7b4d33ec899e07754d55999e9a1dea0f7cc465be8effb3dbf9859d1460b083de1e3ee7bbdc7434d242361a
 DIST oboe-0.4.6.crate 24067 BLAKE2B a3e1c3ba6534fdc2159ead7a301c6b54718b19ce2e3357ce3bcb58b31c1ee3b86b427f4470564b2e8a3e8b0120b33c25ac069bca922dfdd0a1478ece5b398f40 SHA512 bfd792bb8cf2254030e2750b09a87da70defc4fc65882d94ca70469b175e04175787bd89707cd4dee876dba127b8f3b8ad9c5eee32ef5ff0cad49b046b29a793
 DIST oboe-sys-0.4.5.crate 140656 BLAKE2B 26fdb4ea66dbf2f74ccf38beb280262715642ef22b87076d16f0b8e7f7b8d284714d8c7207567e51cbc421d22224b664f0b1051a0eed3c78c16d825ccc8a1d1e SHA512 b8e31b5cfcba10d43b9e373793427341175b7e84f8805fd18a8be387bae407801a0f196d0910103175c23e41b193c4eded2a4597b958128c29e401a27d9b4474
@@ -334,13 +271,11 @@ DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501
 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 ordered-stream-0.2.0.crate 19077 BLAKE2B 581285d32136bb9c2134f405c5a2d67c952a36eb3613912be029f2826b847919188e1b479506b46f20e0b63d371f476b99d9e7e1ee8d47ddef7b4f48451b0e3e SHA512 99976f90637f0daedeae05d4270d33bc03fad1c06a85bcf2cd7140b149f76c7560d5e60becf05a633a62dc82f7f65900eb8f510c62aea4e630b78c45dc76d83e
-DIST os_pipe-1.1.5.crate 11430 BLAKE2B 45abc371ddd363d193817a339f9e1894ec6fd275b9c9d190283347bb023ec7686e3ca6a5f2bf09cd7ee6abb8843ae52410c203af2310bf3e35c280c5b9874ea5 SHA512 d862484e9a0594f31e45531fac9a892fe247c1003a9c365a28083c0b5132719fe6fcd7ed996716a4baddf1f8ec4857d62d05663d3fd7ecee5802005c55368048
 DIST os_pipe-1.2.0.crate 10615 BLAKE2B e00c9a1d668253ee8b759ead12708d75b180abd415444fa995c18107317ad9465c11af1f6be67dd8f64bc7d289a0e12096e9593af99c1052aca644efc5d83107 SHA512 77662eabc70f034882da4662c6f9def1796e6564f0965beae961998ed29d47ddae8ef3b8c9e612b46ee6ab907db49a6259f8d586156ea88f4e0431fa306211eb
 DIST owning_ref-0.4.1.crate 12658 BLAKE2B 42bda4584b2f017e7b48bfc1fab9aaf59d49b8942eceaff6f6d95e5e1fd456d952693ef70ca1a496c48d3bfbf69604dd47adb97af31fdd803a6119f11503920d SHA512 15ecf5c53a675f7c96f850f54bea5fde63f8cfe22ad5c01941f67695154a39950087bd72bbd9a2f9e76825a3fb8dd1d20ba92335f265f4aa273e1086773b918c
 DIST pancurses-0.17.0.crate 34656 BLAKE2B ef4ee7e07c5cbe75a108d0972049bb571a02405d835f2c6fd461e9dec3ced7c0f08f9d92c0b7e5205dc754b718b255538d10adfbbecbe6a75b686dd7ff2a733d SHA512 048740f35324f6c702bb98a608c6497b77415bdeeb4a83978d85dd66bd0b352a952adbd50546021b039fb30be3a47dfeb3022f92fc1a96126a5069d5ebb14b1a
 DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
-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.8.6.crate 32567 BLAKE2B 9943244f813879ab85eae0b9a6bd8f8f0070fe190bc43148a832b217ad546bc97e58707a3987072965a79ae8bc2fa839aebac272f2de00993b8ac1ca0c5fc5ef SHA512 906241f8e2d71784d572fb78978c9550b19af9c4e32fe3b2da751287806d0faeba61f5bd36f7aab026970b2bffaaa1f62ddc10c64dc348eae61bf7b51297ef80
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
@@ -353,12 +288,10 @@ DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c0358822
 DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
 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.1.crate 15878 BLAKE2B bf63206c72b08a87da7ec5949124bb2742ec0aadb116f4c2ea86b09adeec4f741479b64e92f824a3df87ae9dba07ebdf812cbb6622853f9223f8ed90ee6dc389 SHA512 86d2195b8811bc2d30050e977925a947b175ca674e99497b7202dd8c515e09fb83e42f389ed3c6b554dc2c6480892bfd26c91fee463115ef1c710aaea858afe1
 DIST piper-0.2.3.crate 15924 BLAKE2B 13263d38692f954b321568d999c92640040b4a411ceb82fa68ad84e32c40f56d62db49a0611f4afc24825fd8aa7252422120581e173d9adc236e0294cd11e759 SHA512 18867a2ca43c3224c3c749debdcfb65c07e0fe28759973140320712ec0d6a86125635665aceb4feae0c3aca9667048b6754121b7667a2c8caa1ecd2e3b3af7c9
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST platform-dirs-0.3.0.crate 6744 BLAKE2B e6f2419e990938fa1837f4a491401ec09d121c68bb0190a330936879ffce56465bdc463a22205533e2722b290470e4b713e8ba797e4f28e44d7d5896cbb33fbb SHA512 b17deeab45bd3c89fec90c028ca9b4bb80a51d2a3c0e8f3121f0fcf6f12ea5d951591c097cf4fcb3a484a987fad97b722dfa1c0b90017a5cad3b56de2e555857
 DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84
-DIST polling-3.7.0.crate 58381 BLAKE2B b18c2de920feacd907b1a93b3bcc5419a147a086c2fc19dbd09b408ee56bc93fc58968e5a92458454a13c82a1e8d66d1e4253d2da229d1a52909a9254bb34822 SHA512 912669f12c81f5b33c02d39ccf6f3f40bf87d1c646f3013447247335d93fa99fa1188a078e03af44068bf4bb7f0ef88355bcf271a8c96ac1bdc7fba292dffc2c
 DIST polling-3.7.2.crate 57988 BLAKE2B 4a957ac93d2d4b1d1cda0525b42b6f5b9a3a93b115fd107339e7cdadeb7344833749467ee99cd7c77de0a065378faf89dbf85520fa1a71b67f71e7f9dd5eaa53 SHA512 d98ead0c929458f65ff75b9712ef9665878ad2656c729333eaea4340a236f67876b1c665eb683f695c9f12a89420401e1461c39ae8297081f4789dd5d2a7562b
 DIST portaudio-rs-0.3.2.crate 13267 BLAKE2B fc47e0d51d7aadb9358c1602659f823a70fe5addb75fc628fea78e08904cceabc8d9b7cfab738f21b054cbf6dd104036d8a7fbfa3b1ff82106749a278dc45a2d SHA512 cf2b9250fec8aba6a5095b0838279e39beab5cb5f077330e6185dc146e049c6a8580aba883493fe497ca20c2b64db24851c81de43e48fe19ab876418d3b910d2
 DIST portaudio-sys-0.1.1.crate 2327 BLAKE2B 2b2b3312138c2e23ebbec4ac120e7f93eb535325b95fc4cdadab96e82b1fdb3d541d62c8563ce85b5a46c22ef364907177a2de943f697600d98dd99b27500fbe SHA512 221ba8f669048ed4eed4006b5eda45b8289e05fbf0b133809c64ed6c9b65714dc62a867edde3ef960ae5f644b91a0ab4f65b5bf259e8c4b75d63f58009c3abd4
@@ -367,7 +300,6 @@ DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb76974
 DIST priority-queue-1.4.0.crate 33872 BLAKE2B c313509f663318033d93afaaf1a9507dc3ca091992c00029184a070fb8a29e91ca907a7d5f80c815b87d1e79570d329c8399cd95886ddf9839a0a3c2c2c7fa7f SHA512 de3ff208bdbbe3b9868f7c7e3524efa70b575031271a1dafcb19d699ee025e1d020dacfedf55592623f1f7f58fd6c7b98549d55355ea94befd646f91b540d3a8
 DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659
 DIST proc-macro-crate-3.1.0.crate 11084 BLAKE2B 9a9d02f0f34a30668ba94e34d51199c332209c47fd8bef28c452924f75984dcf3aef2c92c4ab3fb03205d589e4f773d960064b4d08fdb2480168f10b84fafe98 SHA512 eb5ad763aa700f2cb1604c32a4bf2fad499a03ad868a22d06b0697b77875b1cc13c739fcf165b2bd547207ef6dc3bd13ceb75e1a59c596daf916f356ed27d8e2
-DIST proc-macro2-1.0.82.crate 48452 BLAKE2B c01f60b788c1395d1041d7eb55fe9519ae4e78f86e3dfa732458747767ff801fcdd5a19a81ee9a8d8cd2457eb0a2bb7cec118299a5a9a64d65b5cf06b9d81165 SHA512 3726463868483243adce01c319c1deb1ab153188f1adcb083b53bff838fa80371091bb8e20ce88709ea850ab3ef74dcd99ca5aa95fa375b330841fd4230c842d
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST protobuf-2.28.0.crate 167541 BLAKE2B 3db5e11d458f54fe0e121fda6ed4c1949f8fb0488148c48e512e05cdb3ca3e2fea4a0a0e4f22b312eefb75d3bdf0ef30fcf3d865ab5c06caa8d11a8b96f44b32 SHA512 14e87f5e4039eb98d473055634102e7d8f79d294de0e04e0c0423dba6e34abbb28b1f94bc2d96ab16d3e02e770fe876b4c8c3af8835a43a8448514efd0b02312
 DIST protobuf-codegen-2.28.0.crate 40826 BLAKE2B 0e581fc7b1b2d2b28aa10a00493c79053d5b1e507200961cd26a548d4bc46bd56717ffa00b0f2ad5b92059b2fcb39ba18bd4a85449a87943fd623bbe1e8213f2 SHA512 5b23b4987f2a7a080dd93842e63ab58e8b95e4a2d78de3e4af7ef863f8d6c359b989cbc6c0a6e0853803d903f66a43021598814efbe85a8d712320e38f9485eb
@@ -380,26 +312,18 @@ DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e
 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 redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
-DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
 DIST redox_syscall-0.5.3.crate 23830 BLAKE2B 0a38235ec277144f0c3e7bcb1d273c7f357d85aef33dbd06328ef16bab7df0a07b523431590899ea58d55e8e1d84c32392478530200cca3a9483e8a47b29e233 SHA512 777d1208004b7756887d6c5745ea408972670e59430e1d299d01a463ae41b98e0920ee77aefef8755fc949d4799dca679afaaae9c1a7d060f76f69af5b90427e
 DIST redox_termios-0.1.3.crate 3240 BLAKE2B 3aa7360c9e982faf433b527605fab4cc01f74eac5f1f4698b5c7f43e5a7645fcddb39bd639c8f6935fb82db5a065630ee788fd8b111cca80be15db1a08d0b3fe SHA512 a221afea8eb1c7efe848e270a6ad5b65a97af945b4f64d3aa5346f5a61a9daaac1993446ddd78c1923b798e1659518856d7260d9d30651d91897850b0a1950d8
 DIST redox_users-0.4.5.crate 15514 BLAKE2B 9fc9d9c4875ed711efb75fb08f345b5f4f0667717d37710143742e48251a709c53760bcbc31ce13e6432672f9417be429c38c2e77a6b786887841714290a1194 SHA512 7a25cc91c9d1bfe537f20b83255990681d136ced5aaa7aa0cdb1b1fc024ba36aa1fb75c335c768a85ee078019a9ca2460efd911cad8ae6fe8b0385fb171aa4b4
-DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 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-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.12.4.crate 170627 BLAKE2B 7aeb2cbb9ce8a7ff28d7befb727e5be36f7ca03ab3d449f82cc93ae511467f0fa078202eb1f239bfda38739320e4fc0c994b5bb99febe15c81227fbca7895847 SHA512 fec388a448df03919563c007e83b565a8a88dfa4b208cf5ec9701eaa1d9dd1b6767b03e76b60324598f875f8d5ac971ad2ce3fa3ee032375c0fcc43a731f8cc8
 DIST rodio-0.15.0.crate 7414161 BLAKE2B 89fb7543b3fdf24d5099bf6a46fa50e7fc386071337bddde4ec4100482cf04e31605490c8bf48a11b644aa1c370627f0602b541ada9dd62441944a19cddb3db9 SHA512 5a138ccb096f5f86c556c53d26ca794b9b519b6e4e556ec30ef8822e92ae04849af58767b7a36806fd7a6e8f18fd01ed852da8c19e2fe43bc2ec9c2ae9a9707d
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
-DIST rspotify-0.13.1.crate 2447916 BLAKE2B 6887b256cee5de490ebd18b7bc49828ded4c246bf701242560375e47f83515d86ff6463428790e0432888b8e05ddf9323b82c35ccf700b4e1c4659f049b7e534 SHA512 827a203139a0f84945711394abf90d133a7623b5106c9ba19349ee6c20ec30020754732654d3ff12c3077f9f23f814ff3c6c688c00d202e608e24bcb8b01268a
 DIST rspotify-0.13.2.crate 2447931 BLAKE2B b10fba17548e3d2b8e21247ae300ad67d64045e6ac87973ab4769fafdcb8c98586c72e70643d803a2feb70184ac2d05b8625476e8f32f1b3c146ad51d1391995 SHA512 cd571c40749932a9d19bddc25e635bba298bed9db4580f005275cc1fe6ae59c97f1e840581b7d8a9e24bd802509d6731b3c19a80911bc3a20adb015362e9181c
-DIST rspotify-http-0.13.1.crate 6444 BLAKE2B 65e0ba4e8a6f9c8daf7d0271efdff1d9f60fe85b1daa00085012e9fb4aa2c14ed261c8bcdc0a7f52b93e64e6e96830cd969feaeb14b46783498803a95fa85851 SHA512 b50728432bc1e28f9aaf07d2a1af255c21c1179d32318271cfd2ad3151de6c2799fc3878cb74a9d788f1fdb7f6ef6cde246de6233e824a6a05eb4186414e0b4c
 DIST rspotify-http-0.13.2.crate 6513 BLAKE2B 63dbe71a802e7ee2c4407e30c50520c6a3456cbc2d67a8ffc57a194efc56952a6690d41a68eaf5f6b31965351f8618c2eb27ab52c8c3ba974f08aef3ddba175b SHA512 f819fba8ef3361ced3f12d048a142f4312651019b2db19d54c77ec85294e161d8704d63fc2dc30657dc9aede2edcdcbc3c007d3e20ccf2f7bde900ea57acea04
-DIST rspotify-macros-0.13.1.crate 2837 BLAKE2B d3f43cc5c7f87068d9cfe483b8f576fbbe5bb7f0e86fb1ae6d4c7cb1f154f9ffda5ab927d7cf715457081fab167ea5c6480b861de4e1eb7783604962b42ecbff SHA512 5e0264dcf80c34e531a5d51c5011336b1d7892778e1da29e9e6b3257941ac14b8afeaf80793084cb70c6bcef7023051dad9a07abc84cae719cefb15ae69693ab
 DIST rspotify-macros-0.13.2.crate 2835 BLAKE2B a68f00352454d3722682a38ed972d1610177fa294fb458696ad51305577a4ef73a548b38a708c37c1da45e2464added5ea1f7d4e8c8622a7445e756e755d7009 SHA512 686022316938573079b2901f5a18ce915082b1bc66253098f87fc2e1d66ea349a9703868578f15e423f07dac9a3a28a54f52ef96109cb5eda2729ef1622b0557
-DIST rspotify-model-0.13.1.crate 23402 BLAKE2B 0a755ea4df38e9d90ff0064bb216660d329409225301a5bfc58fbac7f7c322d8ad6ffb67815da06320f8e26647d48dd68be9570d98065a413612b112cb724b33 SHA512 573558a00291bf0bc285f5d1b71f9c9e91f6e88cf373217eebf05ededa9057c46f1cba51b77f6546a95255fa554d04f12278861767515f5c474ef41219cc9fa5
 DIST rspotify-model-0.13.2.crate 23486 BLAKE2B 83aae14c110b7da9366f5ebe7e07ce3b43074e2ee526a791f233a6267d2abf696ed54c5a5fcc38aac037da8eaba9075100a150289d4729e2b0f55609be197627 SHA512 0fd0afb563b45ebafd5ea4cd097bab6b610d3377633978f5ec2f648c68062457c0f1e133ca7aa588a9a4e6d5e9932bb70d15d509b88a392b8f5ae9609d3b6bfb
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
@@ -407,27 +331,20 @@ DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb5
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustls-pemfile-2.1.2.crate 25928 BLAKE2B 790545dd6347badda8f67bbe67b8d4d7de9f24c134857840d7ba2335f2755cf03c05b26c16c8b1e397b3257cd39a6d3a333103c2c3ea32ccf4118bc3d42995c2 SHA512 35127c68250c31f2fd6924355ec37d5318d8a86ad38da48e68b3ea6e241deeb019eb967c510e95230be6d6c3357b0a85aa022942d21a50423632f8e2496177cb
 DIST rustls-pki-types-1.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83edf487a6a940e1bc8937c3ed7900cac590674bf2c5a5edac6055a2bdf763b132d4624a8c51caf0250d5055ce5e8f4bc5eb SHA512 5502795aebd7058084d0e30d6c09befc4182493113207f539a8d42006d4189158e9028245aa627d6943a88514b6292fbd56b5ea1abef8c83a429bf6d641f6f11
-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.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 scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-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.11.0.crate 18718 BLAKE2B 4fd8e8eabdc910f656cbed6d6f941992eebc2ebe29c1d85e4ee2de5aee2e4840f2952ffa0b0f9ae88329a2b16d66c3575796f476b873c6bb3c3efcc8d119ab6f SHA512 e3848a45391ebd98026ecafb0777852aa826b465613ef184cc33cdbaa75fb91053d46d417dfda6398339abd3b67788a567562e99b3c509b676b7ee5a4372acd8
 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 serde-1.0.201.crate 77725 BLAKE2B 3cef32b1c026215e83d84dc7867e93b3c76dd683be0519ea17de25ea030d8cbda9031a54636f254026ddd30d96033d217cd81a8bf50cd7b3a936000bd47a3736 SHA512 d422f16277b59d756f7e85e6c589a28f4134ee221968eedb48bde430b63c3cf6d379ae8f03249439f984c66e0a9639238159b42879a9fa03fc49b167870ce35d
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
 DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
-DIST serde_derive-1.0.201.crate 55865 BLAKE2B 2ab2a02a7819a12ebe44697d97d24ed61cbff872e3a1df7a33671165619619a1826e80a948a85f7508db024d4480ae1e91ead5944eed3d011fb0f449d1983738 SHA512 925b7238cdd833dc3eebab162e4f18eab9fd533178b957a7a3149079a10a0eee598a3048ddab6f16113467e8eef78604e3bdb26ec7e30184aa0202b1f4267cf8
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056
 DIST serde_json-1.0.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
 DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
-DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
 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 sha-1-0.9.8.crate 14029 BLAKE2B 80fa6903880ee36841375345d1763672ae8c3b790965b0bfc7cec7ecc69744be3a35a890a6f52b2a25f9ed1b91ce6986dd04b00ee455563b00218f8acd4b6ce5 SHA512 d4708a762d5f3dfd902ed335f0383cf63b442f95b1aebbaca3643606ed2480060d2ed04f123d0c44496147ecbb06a093980b435f9d3ff9e0f5c908389736aa9f
@@ -449,13 +366,10 @@ DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5f
 DIST stdweb-0.1.3.crate 90221 BLAKE2B b8072c7be865327b47facaeac68373ce3085474d7a694f2e7f371024b5c4c0c616b8215a75e71b72b0e7aa534c9f8172593c7ec648c32049288ddfac1b0764cc SHA512 d7119427aae5d37336b8cf0002bae9c0d76a87a6865dbc9cc4c1f9abe64efe8d861c149b3975c6b3481a804e20be4fa28619257c233d3ea3d550ebd550ca5fa6
 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.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3
 DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a8a28cc7c8a72a0aef20569c6ab22a8a8d26c2d9272f18d000e4ce94858a6647194f0a7b86d812d52b05a9 SHA512 62f116d5bbc6167a6ac68b049f8045bc660901f1ce1252f8bdcd91cb28bef821aad8098905369db6c2fe74c134a5d549e55ddd28e383d7d78f7175258924b268
-DIST strum_macros-0.26.2.crate 27056 BLAKE2B c9df13a91dd08f8bba0dfeec4fc03b59cd74eafaace7d2d228b8636264a9ea11137d0be741a936f7290e09525586818726000f07ed84a5ae711b89d61f52e89e SHA512 519bc654adcf131d85d1ef83f62be2429f7472df25cf962fdc1cf5070d33c39dfe71f08fbf296df9b85fdfcda95cf2fea27e8e52e9ae93de27bb8fc4a5b55dd1
 DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
 DIST syn-2.0.71.crate 266398 BLAKE2B 78760c9965b59e14ab5d97e83c4dabdba99cd1933b66350c7d5c5f9e55f34fe68207597b51aeb023b211a065d986889655ab701b94347397ca6856a4fcbcdc85 SHA512 cf6264bc148ec550d943d7d146c7360a7d753e37ef553e6d0c6dc265bf516084530a5617f6826069275cc6f71d9f820014f7d92f04356ae964df8b79edaf7bbe
 DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
 DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f
@@ -464,32 +378,24 @@ DIST tauri-winrt-notification-0.2.1.crate 42232 BLAKE2B e85297cd712f8eb454944300
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
-DIST thiserror-1.0.60.crate 21247 BLAKE2B 433d54b0938451a4458da709576f78e957d243bd7a27619f070c05f395fa6717566fa3d40be61f85e3b95edb11391107b11be3945bc6ee8a70bb9f55c17f08e3 SHA512 4fbd8770fed56da490436a018d5bcc00075493e9772b8249e72bb7213262766574b83743469fabc602d417ca0a787ee43f539dd9f08d87e9ec73c6c65768381f
 DIST thiserror-1.0.62.crate 21323 BLAKE2B fd2061bc5e7ea7ba43ed59c355c8cdbbcf416b189d0b2a3c33f725c270c1d0a8c6ca18ae538bc7d4634166ba747172c32be98b8139bd333a7522aa35730bed7b SHA512 29efa072b31e63e78a3e31fe84758fabbe7337d3e7338be4e4bfd35c8b083b53dc3cb68be78aaddf80eebabe301de00e2ee1908c7b00dd5a2168b0b66d8edffc
-DIST thiserror-impl-1.0.60.crate 15787 BLAKE2B e83014f3cfed1e0c54d7854787a6bcc5a099af33fd14431831e607884f1658339e5e1f9d666d6d92d362a285337ac5f170c71bbdece96a343bd80007e73009d4 SHA512 607356d744e1becf7b7070878b8738d853978d28ef4a589bae739f1c3cebde90e8d70e7ec79d67588f6d024784a0fe91c21658befbfeeb71d33f5eaea9416325
 DIST thiserror-impl-1.0.62.crate 16047 BLAKE2B 63a1fe66d3dadec304b9ecc241cfd71a6b278081336f4377fd435c9f959997bd0e0b0de2b5c318ad60d747f1fcf27df0f03932ba63f1288491f9935d3ebba735 SHA512 5f852f4b37af396336a941ec9f0340d93c8c70bc39f0a2cdfae3c20f180e06e51b4590a7535ddbcb87a792eba7e52ef9274019a98ee870f1eaf1b3b7cadf3303
 DIST thread-id-4.2.1.crate 9100 BLAKE2B b342989d20b2b16939dda3b8bf6eeb378a94e5821c0d8f3c0528a720bf912f52e36604cdf6a6165c4521cc8f5e726cb19c20f71ff94915b72953f437bb3cf012 SHA512 91b07c01dbcf9a0b3edd6fd14f9f60ea26ed0cc8b21972e40fa2e34a0fa4abba1c71106994972929a99d9542bb186cc814406ee7979212526a69c5a8a49950c2
 DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
 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 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.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85
 DIST tokio-1.38.1.crate 774260 BLAKE2B c30488cf0beb002732991f86ffbbd4edc4fb3661837cfecfc93b8cbf9972ff307ed4c41c893221207995953daa7123c8ae0c5dda43111df74f9192b82f2eed1c SHA512 72934b781cafb27488325de9226bcdfcd2327f4dac0d58a22b87e3ffa3604db431985efb8ec68f1287d1cf17a9c3273aea89558d19572ecd2895e0e64b97141c
-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-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914
 DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
 DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
-DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265
 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_datetime-0.6.6.crate 11698 BLAKE2B 8db35da8a3f6fec053bc82995f4abeb8d2855f2e94ed6ef4a4a6f47e956ea2cb6f8d0edd5c1b1cdebf83c7c218d9f2d80f48346e62fa7985532cba925891edd5 SHA512 710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0
 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.12.crate 104416 BLAKE2B 8f1f670ae986b900e141ed359f8ec1300dd91c3b0c204c8f3d6bcb44bd11ed06dda87535a6a8b94efa604a323e2a714ddfb382633b1ee3605e1f91488d9f2e56 SHA512 723b9cf08b1262c3e28c227ab363fec0122e23c3c9854f428d1aa117dc87564be2e22f368f9ee63cfe7abafa563c2ea51c00909d44eaa067bf1fd8c985d25965
 DIST toml_edit-0.22.15.crate 104053 BLAKE2B 7a7be39a9691f555824ba7b009082cd5058fd0e73b9d79bfe0bdc0a90571e396f00c0075064587e21c14fa82b124b273129ea992e566182316e7bcb0918f9bc8 SHA512 94d2ad3007ae64afff8f2ccd5452c2404e44e522daae699c98b0144473e7493fcd6e57c9d649b20065a056ea567138a8a516366ec3f19f6d47fa5b42cbb32047
 DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
 DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e
@@ -497,7 +403,6 @@ DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644
 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 tree_magic_mini-3.1.4.crate 14548 BLAKE2B b7161ae0eb7a7445a979b5f3232db45aea35a9ed9be8262de6d962afd6d423b8ec9220830fab6f5451b422097ac5a79a7a3e9c2789e97d9e4dbdaecea8fd1970 SHA512 f1cccd8e4231fbfe53491195eb48e652c66ceb88e1d2ce76e3b18094ab7bd2f83867058019ffd5a5d7c2227d57eda6bd7a1227c7db68f406e40843f80a64b187
 DIST tree_magic_mini-3.1.5.crate 14557 BLAKE2B 1b6e18c69cc192ed318bdb830e501e594e9f9af3d8282c19c23d38572d8326e157b13bf04bedc75f83a5cd067489834660b0d26af97a49e08ddc5de03c65c69b SHA512 7d811a04b3d3e9c80e2ecd99ce1a164c142f3824d936425797ccf62a281568263df9d12bd43b3a93846b1f8221906d7fcebd4f14d1163be4eac3681db6023274
 DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
@@ -506,16 +411,11 @@ 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-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
-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 ureq-2.10.0.crate 112894 BLAKE2B e6c9c56cd4790aa842e2a07cbfdaf81d6971bdbc31d924d27eb3839abf7c5261e33aef3aad8b5a2c7f897eb798b107e987e2b64e9df66ca8095885f7e0cb740b SHA512 a04831abe500771bec2394993e79092c37d02106623bd49d45acf18eba51d5324723e1650ec13d2ae20cd23d4f8c2b66ab8cf179e39e81dca6c0cc04208695af
-DIST ureq-2.9.7.crate 113834 BLAKE2B e80ea64d610ab01d129527a120878ac3eb38248885c772aead6fb983f777b7469f7debd042ce93c0bfb6adeeb7ed476f7dd96c62de386ec2d64dbed28973a829 SHA512 33893aa1df316b5987571ce6b46373c625ed89e452a313f9490d63896f144e56ee0c35c1eaec77eb8d2a66e7726f3dae6e96bd2ee0db7c0604485105fc69bef4
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
-DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 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.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vergen-3.2.0.crate 16897 BLAKE2B 1a83f338f13cd55aed1d57db05e6454d1c86937f5d3a9a7b5b14bfc72a891671b70665ef388590ddd0a19ac8acad8251990bd81b9fcedf80898ed5d327f9d373 SHA512 d582ade1ed57f5067b4b24376d0164405a7a5a587e12c09b724fe0773b03d4eee95694fbe9f43d0f34bf6145dc297850e05039c81ac6df27670e326b7a254c09
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
@@ -528,15 +428,11 @@ DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbae
 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 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-client-0.31.2.crate 62976 BLAKE2B f7c4e1f581bace8b491c7ffd393106db44b7be028c136b1ab99c9f091f828c6ff6e5157234882a7926da5cc0de22c1ce14dda7e00ccd5e2ecc5e3356dec86e71 SHA512 1f15b1f8787e1b25b90369106ac6119f208a60ab9c3fe851287fa9c7c8d9fb03217c3f33ffb1dfba5df4f2a749be19402d25ed80e1ed9d7301c1c40e847911b8
 DIST wayland-client-0.31.5.crate 63042 BLAKE2B 9efa3be373b5bd938eef796faa0c7647844f7e222e8e1c8e8f69cd0100122a2c4191ba70baff4a17f78e3d99c7270e523b3030327cc670f820afd4a7341ff586 SHA512 bc49d4c9d4f923ecb4416afb279f45da88742d372e716aa7299fb7b8778268e81e43298fbca122148ddc995fc7350a9bc80c27672603c2bcea834535c6827037
 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.1.crate 35419 BLAKE2B adaf9d19f395c5b11e35113ef31b5e11e76fda4929365e61f5a40fbc3f8505e68cacc4e31eb0137da2a07edaca898a2835a22e7236affddf7fea012f087197b7 SHA512 61521f39f414bce7bf372656544294382676649a42d3e2751b6a33874bf12ea3fe87d55c9389799197bbbab36fade2f386a6a83437434d4e0175347b232f7f62
 DIST wayland-scanner-0.31.4.crate 35691 BLAKE2B e9c2cbf97719e7729892a777c37e865f22d22a6e1138d189a512c938e24ac710b6f431f7808c656facfb189a47a27564ccb6b687dcf3dc794b1ea87dfc8a6fc4 SHA512 44c41437a20e2f895e3330b4fe72eb6b7846a2287ce5f7e1f2aec1407cc324dc43549cbfc82aeaa23c69709e2c5c339b32aaf298b63ee675b8dded175ec7d0cc
-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 web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b
 DIST weezl-0.1.8.crate 42175 BLAKE2B 2a8dc84f018a4364ef814044a590477724b79655cd01d605e02442bdc8de1f7df3003946041dbcc17bc82315f0c11e7fc3c3b0b0375f65436f53bcac11b2bc71 SHA512 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
@@ -549,62 +445,43 @@ DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305de
 DIST windows-core-0.56.0.crate 45084 BLAKE2B 757a386d54b805de2f28979561536473d21e057f676d47d4b9068210cf0b3833956c65ddd5291d6852ad3c7af5a048c0d70896816678f11077b794cd8689b0bd SHA512 db6edbd14ef477d71a56869ac4d5eeeeef5a991a336c30c6da9960f1c9eca067c06f597dbc58f3e21c40cf19e2a28dc45ed09826c8fc17cdb57f35b0f3492793
 DIST windows-implement-0.56.0.crate 9157 BLAKE2B bde09ed367b9d31d5c392f78cf6d9d98afe343bde120b38ae412969e5fa9141ad3f478d05556d27b41a0feccfe1ddeccb9f7136defd14f12d07c22e719957518 SHA512 e472fce92d6eca17f75c075f87aa52c9b985febd83986ff811f0dc615f75cbe5fcaa13b2d2c96720211314549f0f76fabd2197119bbfd1b28d60823a889a5ef1
 DIST windows-interface-0.56.0.crate 9834 BLAKE2B d7cbec43c154ec5d8d91e02bbdad8bcc821537b303893244c819e2ace4b0d05d155d1b41fba8cc16566d5b2ad97da71177796f460e45367b53aa39d71e43ff65 SHA512 0ceb89df6d0a45281a5dd77c25efbd1bdb72f0965a4b6cc11f5f8249400297effb77e42a1ec2613fe7ce82a831559a5d1c8c6ebc45b419aa0aa96e84f01c8184
-DIST windows-result-0.1.1.crate 10460 BLAKE2B b65ae2b95414fde488570e47daa40f5b0aee3f9b90c906751e85e35dd63044ff6b72ae3451d94c70ef64610325d0fef6880ca5fd55ec14d83587871bebf113ab SHA512 4aebab689ebc9333f9c430c186f886c25faa954cd154fd9fea960073669f0db6d88002f025c31fe37c64f0298a0736f6fad5b4c4e59869239da2156c90b8ffce
 DIST windows-result-0.1.2.crate 10601 BLAKE2B 75db56ada75b59fbc450ea39d73c7ea2ca05239c7a1973bbbcef2445f5fe009e32eb0b1df15ab8b44802cebdb71671ad5e741019beea2d49eb59c37534b63197 SHA512 435649961752a345aa3bf5234f88c87248768ce0ee099f6836e889406941069fbbbb17b4c6cea981fe0aa30bcb8839dba88731fbb023265a14b6232c03fcf7df
 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-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
 DIST windows-version-0.1.1.crate 7201 BLAKE2B 5e77bc27682c15cdd9ca0272bfe17dee7645f03add65a239e9a97105691e85b109c7cdfd74c5257f8eb783fb68991d1488bcf25e6cb87ed4eacad08507512549 SHA512 06a22e00f7b11dfbe9124f39c87235ce28bfd3dd361af928b0a9b99793ffb7a8b8473c198825f1f47c2efade0617d99160eea3b3d3d76c818c400327e77b412d
 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_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.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.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.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.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.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.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.13.crate 162649 BLAKE2B f088396ccdc6e96e56b822c20ea483eaead57794e101bff3df6ea35fe039fa2dcf2eac98dabebc3decb4129c200490633f05ba5dd4325cec29d28c78887c3de1 SHA512 a8a94c26afc4cc4db6ec2e65e7bff325fbe6816d4a80fb97e2014e202af0f549a77518f0435157985822aa9fd8642b95258b6cf87a9e695f4b9a11b5fe514d86
-DIST winnow-0.6.8.crate 159453 BLAKE2B 36ae0b096ab916c1d925d51ce9b4fa072fd687022c3578debf4be852eeed046fd73003c8be2f6e3b0abbd2d3952a23100e79a8e432f516a0ddab2ac7aba4b034 SHA512 64652527221385a1278efb66d25ebbab86cb64d2f71fbf9bc9956dc548ae9d028b998f3aa851a94dba66853da7fbf1bdfcf2dae02ed60b2562869569acf2b583
 DIST winreg-0.5.1.crate 17693 BLAKE2B 4bb51f04c7e86e4c563c58c3caf9a69ab1880cd895edac9565ec2b89e5a3b7ea9028e94839afa2eae0cb33ef90d1211c1100010433b720a5c1e27d60b3a9ff91 SHA512 03c2350e4aa6c41956f493018136f0b016d36c587e6f27d57dddd29a55391286be4805962c4247bb59821c3031ec75f9a63c140536c13aac894c07e914380f7f
 DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
 DIST wl-clipboard-rs-0.8.1.crate 32835 BLAKE2B 3b542e5f7fba1ce659d94a682ec3b46ff9def98ac34563b7e3021987c6792e993b1f2f96421a58293270a68d10e64b57d856648a3ee796f7ff16e0621d8c3d9e SHA512 3113f079064eb0a23b3c8d02561b2d7ca0111b0c02e3f45819dcd4feac8342004860d8e936cb0bde9dcaaff897a2531213d3e4ed7b28731592a9bcffd7574fab
 DIST x11rb-0.13.1.crate 223916 BLAKE2B 1663b0d4eb059924f9c2dbfa2fff01ee9c7a90bb6652d6e6a1519676e36ef7cca5fd079e39f45137350f595bca592ae9098b93877cdad9540131063379fad2ed SHA512 652f499857aff45053e2ffe1a2e3463323bcf3cf546482dcef4d2805e90a898a12f647da9181fcf02d7234bebdfc424f8a4e0e256dfd49aba4b643284308404f
 DIST x11rb-protocol-0.13.1.crate 508522 BLAKE2B abd88b4175e2fadebc44f232262b71261fac9b1289ee749d31fbd4a9d9c8ff426ccf9edef8eced4b41e4fba3401cd81d109fbf8aef1c99b4529f57910d000a8d SHA512 5c1a40fcbc77aa6e3357ac64af37958ac54aa3a78af354c1ea5f8e8b28f352c6e5d8b4762d8c4eb93fa8a1a122184b89c9b1c95a53d35b08819654dbd4cc4db0
-DIST xdg-home-1.1.0.crate 3600 BLAKE2B 9ebd05881f0b835ad8647691d05b168f0cc807ccd02bbeff4da9db0a4f6b9c5458a891d6df2867f8597f70789d7e4d49d4b81dcd266ed05d1c3d4b67ad9f11f6 SHA512 3f4d6d81b84beab8eb549e124c9dcf5dbcad8b6471cd87edcebf5c0011371667718104c7ea6eba7301fde7524137b18484621c820c75b182bafd7b9b2972957a
 DIST xdg-home-1.2.0.crate 3881 BLAKE2B 97e8869b2c2c72e8613a09049c7ad55dcd48ab124a713747d76c2106932152ce254ae19ab64a1d44959899334359ba1fd0f5b03ba3b9a7c797bd7158eaba55a1 SHA512 50b4ebf67b56e6880bb1340e6268aeac65f0ea38fcd3669becb77d356758434ef569c81844b9bfd17245f9d19f77cd7670388211ed5209052974c023d6151eab
 DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c458dc76943cfab88f2f2544762477bbe1378bc1f5e365cd5a5ecf79e41fa66140190047f37ea5dfe678c97a542e SHA512 39875839dcf90b391e76a6b2c2efb2e6f8bfdfdaa59c4815bab8f24412f840c6b01232b5bd79a8f8c6bf7733333e5915c2a7235d27f890b883d6658094bf6271
-DIST zbus-4.2.1.crate 157271 BLAKE2B 93aee295c56c0fd93c66ccf3e17c542f5cd7f6c96b6c6879b47c19111a291f6d401ef1e8d66d973cc5657090b75b56ee0b957ffd97de452d455b3c74b46bf1f1 SHA512 31d4232e966b74e1fd7104f006543fe2331472adcc163f56d22f1765418c8446e71b2e93884e9a046422cd83996f44452512ffc14b12bc83a1376be8fd7d73a6
 DIST zbus-4.3.1.crate 157785 BLAKE2B 4ebdbee7c83e39b901c64d73915b23a7a6840958a7718a7e35de35624ae5c892ccc99c30c073157b9068c8070b6c6c632a2dde67e3fc270fb256c6ba2abcbd77 SHA512 cf05f63f40967ec4106ff1e705b57e419ae5ef7dadfacb2ea5deaa3b51f23bb0cc786cae05ef22fb4cb82f335add189d2ac545fa98d18f18fc9ca9cfbe2959b2
-DIST zbus_macros-4.2.1.crate 28865 BLAKE2B d85346cedf2a2c8fc81c7d183e23a9efc9d9c012b63bd96b8730cf12652878555d8613b330f725473d1febe99eca5c69f485ddefbf1d5b5347151ba4c501b357 SHA512 65a25f5b75c92f5c8849254495eb0bc02c378e7046e0a8274ffe7b02bf6c6a1dc1216c583e022cba08c0f794ed27f16db5c0ddc41ce9c551f4b4e836820cab76
 DIST zbus_macros-4.3.1.crate 31173 BLAKE2B 280b45930e93d5e568bdb84102b03a287299a3251178629f7b281ba7771b3bda4d98a66e64f87c016cabd1aec2f303e452363bcca83fad8bfa948928c9b06fed SHA512 22212d07c630e01c422b84c25499fc768042d0022a9156cfe7f1cc85ecf7c1b28121960839ecd4ff9223bb7f51d52d0e46a2e7366846375c54a7b4254a5e0806
 DIST zbus_names-3.0.0.crate 10650 BLAKE2B 0c8a0ee67c9236ef51a1add3038d5ac5a9f00dccd9df059b16454754db44e7c5ac66b74f3f98c317ee73a1c982b8439d6a92995d984b9b9d744c3c9203edbed3 SHA512 e0ebd468f152ef8063faa547f60b58d2d87948e24741d1cec0e97eef1817653d524ce5519795db64a3a7d9101ee2c6b67f0bf2bade894c57b5c37aee19fc82ab
 DIST zerocopy-0.6.6.crate 47473 BLAKE2B 234279a161f5e136fb3ecae263274dceaa878c0da180b070d679d090c498385841670783824739ce8b2c0db10e8470bdc3993e1b2460064bc44d80526937e94e SHA512 2933bc6560c117e4574334da24eeb53d02ce8b158f46fdd77cd7dfe8bbd108b3b95318df4b0b59718ab696349649111c06a8d3960cc5f52223abe2c9dc335dad
-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.6.6.crate 522443 BLAKE2B aa3626428c9d79a4bf6f593da0fbe42c77cebff8a0c1c4b22bbe2a5aa63f6e30771681887565905fd62241c2d396eefb32435ed1c01d3d165cc1989d12c42401 SHA512 c91144a6d5c85a0917dd34302a7518b98780c06377399831a777a0d4da7826c70f66e3ec9eeadf1bd5f63be36a75345d49257cca1ba15db0f6d9f129d7f0c1b4
-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 zvariant-4.1.0.crate 81950 BLAKE2B 894cbc6686e0006e14f83d9e320264b5c56fba61b32bc4912ea7824a1610fb2c23a8a89911a14b06af82775b070fca728c3f67c49127ea02a243ea7583bb146f SHA512 8be60d4d2ada5fa1f0ef93f8c6714b2b9a6bf3c4a36a4c3f203d32267bfe2736360bd4a05918373a8785b2c803816d0b973cc0234164566bf116adbc1e9a73b7
 DIST zvariant-4.1.2.crate 82045 BLAKE2B f2f35f60bc6a0ce4ab834dd0f87caa0420681db5414f73361f0f97ed9249c5bc312acf6531be7eda23b737944690a2228fdfe4a539be148650ba099d8ee0d29a SHA512 42beacc2f1bae1f931e1ab823882001ce25163d0974c0d586ec65d00973ba9579c7d744ac49a1e2c39ede8225ec4d10c34112fd9c6d0f8686df66774cf672a75
-DIST zvariant_derive-4.1.0.crate 11025 BLAKE2B 1d1c691ce08386bc68d640f9df116a3e2a881541e782be02a6598d090f689d9c16f28838eb4f62d701ab9d6fe70055ea41611e3348310fca4191f9976132a272 SHA512 9246706df8fe81c3cd8ba26bac50589a89b36f0245d3a10e382d9e91618b1f5763cfc9920154571075aefbc7c6c02e9809cbb3b5efe8c4b2f38998a6a36880aa
 DIST zvariant_derive-4.1.2.crate 11026 BLAKE2B c5c176323cb3bce71272ea8277305e065d9dbfea21bd92bec48826a7e54ca2fc61995e722dc1b8f0ace5e752a9d3f88b46363b9b4307d9126bb7e9292669e666 SHA512 044e2df2023635ea664fde7f41fd24eb3181a2675a8e863343519750d9a68d8646dd89135fcc28204c7bb38380743614073cca6be0614540a35ea3d7b1942140
-DIST zvariant_utils-1.1.1.crate 6859 BLAKE2B 91c6cfc14b7cbdab9d662ea2f7db1506037ff8dfc58599e7e220fb44cef5260783117223251ea4a3dca03ea739c80eab2baa933fee3bfd1d78f0ae721ea36a97 SHA512 4ee75536e57aa6f05e9739c1a3bb037ebc276d22206c0a3ddc3c245395aefead5f8197af1e659e33780df968715101831c286ef28513aaf7f2a5e4a43767cdc3
 DIST zvariant_utils-2.0.0.crate 6815 BLAKE2B 0321261a8371f2df14fcb0abb575dd413d834630eaf1a62b0bfc35384a536e1c1dff5a1fb26248ba4fc0dd5663dfca57892f0175ea98e5a000c8a19996e56b11 SHA512 162d8af9800a8afa16817e3580621768c9ab7d863153edc3cb1748e80aaa2f2b9c05bfffb53b098f313fe7cc2052cf49d854cc761771bc21ab1a93965a55f066
diff --git a/media-sound/ncspot/ncspot-1.1.1.ebuild b/media-sound/ncspot/ncspot-1.1.1.ebuild
deleted file mode 100644
index 76a90c2fcf73..000000000000
--- a/media-sound/ncspot/ncspot-1.1.1.ebuild
+++ /dev/null
@@ -1,580 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.6
-
-EAPI=8
-
-CRATES="
-	addr2line@0.21.0
-	adler@1.0.2
-	aes-ctr@0.6.0
-	aes-soft@0.6.4
-	aes@0.6.0
-	aesni@0.10.0
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	alsa-sys@0.3.1
-	alsa@0.6.0
-	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
-	arboard@3.4.0
-	async-broadcast@0.7.0
-	async-channel@2.2.1
-	async-executor@1.11.0
-	async-fs@2.1.2
-	async-io@2.3.2
-	async-lock@3.3.0
-	async-process@2.2.2
-	async-recursion@1.1.1
-	async-signal@0.2.6
-	async-task@4.7.1
-	async-trait@0.1.80
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	backtrace@0.3.71
-	base64@0.13.1
-	base64@0.21.7
-	base64@0.22.1
-	bindgen@0.69.4
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	block-buffer@0.9.0
-	block2@0.5.0
-	block@0.1.6
-	blocking@1.6.0
-	bumpalo@3.16.0
-	bytemuck@1.15.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	cc@1.0.97
-	cesu8@1.1.0
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.1.1
-	chrono@0.4.38
-	cipher@0.2.5
-	clang-sys@1.7.0
-	clap@4.5.4
-	clap_builder@4.5.2
-	clap_complete@4.5.2
-	clap_lex@0.7.0
-	clap_mangen@0.2.20
-	clipboard-win@5.3.1
-	colorchoice@1.0.1
-	combine@4.6.7
-	concurrent-queue@2.5.0
-	cookie@0.18.1
-	cookie_store@0.21.0
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	core-graphics-types@0.1.3
-	core-graphics@0.23.2
-	coreaudio-rs@0.10.0
-	coreaudio-sys@0.2.15
-	cpal@0.13.5
-	cpufeatures@0.2.12
-	crc32fast@1.4.0
-	crossbeam-channel@0.5.12
-	crossbeam-utils@0.8.19
-	crossterm@0.25.0
-	crossterm_winapi@0.9.1
-	crypto-common@0.1.6
-	crypto-mac@0.11.1
-	ctr@0.6.0
-	cursive@0.20.0
-	cursive_buffered_backend@0.6.1
-	cursive_core@0.3.7
-	darling@0.13.4
-	darling@0.20.8
-	darling_core@0.13.4
-	darling_core@0.20.8
-	darling_macro@0.13.4
-	darling_macro@0.20.8
-	deranged@0.3.11
-	derive-new@0.6.0
-	digest@0.10.7
-	digest@0.9.0
-	dirs-next@1.0.2
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	dlib@0.5.2
-	downcast-rs@1.2.1
-	either@1.11.0
-	encoding_rs@0.8.34
-	endi@1.1.0
-	enum-map-derive@0.17.0
-	enum-map@2.7.3
-	enum_dispatch@0.3.13
-	enumflags2@0.7.9
-	enumflags2_derive@0.7.9
-	enumset@1.1.3
-	enumset_derive@0.8.1
-	equivalent@1.0.1
-	errno@0.3.9
-	error-code@3.2.0
-	event-listener-strategy@0.4.0
-	event-listener-strategy@0.5.2
-	event-listener@4.0.3
-	event-listener@5.3.0
-	fastrand@2.1.0
-	fdeflate@0.3.4
-	fern@0.6.2
-	fixedbitset@0.4.2
-	flate2@1.0.30
-	fnv@1.0.7
-	foreign-types-macros@0.2.3
-	foreign-types-shared@0.1.1
-	foreign-types-shared@0.3.1
-	foreign-types@0.3.2
-	foreign-types@0.5.0
-	form_urlencoded@1.2.1
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-io@0.3.30
-	futures-lite@2.3.0
-	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
-	gethostname@0.4.3
-	getrandom@0.2.15
-	gimli@0.28.1
-	glob@0.3.1
-	h2@0.4.4
-	half@1.8.3
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	headers-core@0.2.0
-	headers@0.3.9
-	heck@0.4.1
-	hermit-abi@0.3.9
-	hex@0.4.3
-	hmac@0.11.0
-	home@0.5.9
-	http-body-util@0.1.1
-	http-body@0.4.6
-	http-body@1.0.0
-	http@0.2.12
-	http@1.1.0
-	httparse@1.8.0
-	httpdate@1.0.3
-	hyper-proxy@0.9.1
-	hyper-tls@0.6.0
-	hyper-util@0.1.3
-	hyper@0.14.28
-	hyper@1.3.1
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	idna@0.5.0
-	image@0.25.1
-	indexmap@1.9.3
-	indexmap@2.2.6
-	instant@0.1.12
-	ioctl-rs@0.2.0
-	ipnet@2.9.0
-	is_terminal_polyfill@1.70.0
-	itertools@0.12.1
-	itoa@1.0.11
-	jni-sys@0.3.0
-	jni@0.19.0
-	jobserver@0.1.31
-	jpeg-decoder@0.3.1
-	js-sys@0.3.69
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	lewton@0.10.2
-	libc@0.2.154
-	libloading@0.8.3
-	libm@0.2.8
-	libpulse-binding@2.28.1
-	libpulse-simple-binding@2.28.1
-	libpulse-simple-sys@1.21.1
-	libpulse-sys@1.21.0
-	libredox@0.1.3
-	librespot-audio@0.4.2
-	librespot-core@0.4.2
-	librespot-metadata@0.4.2
-	librespot-playback@0.4.2
-	librespot-protocol@0.4.2
-	linux-raw-sys@0.4.13
-	lock_api@0.4.12
-	log@0.4.21
-	mac-notification-sys@0.6.1
-	mach@0.3.2
-	malloc_buf@0.0.6
-	maplit@1.0.2
-	maybe-async@0.2.10
-	memchr@2.7.2
-	memoffset@0.6.5
-	memoffset@0.9.1
-	mime@0.3.17
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.2
-	mio@0.8.11
-	native-tls@0.2.11
-	ncurses@5.101.0
-	ndk-context@0.1.1
-	ndk-glue@0.6.2
-	ndk-macro@0.3.0
-	ndk-sys@0.3.0
-	ndk@0.6.0
-	nix@0.23.2
-	nix@0.28.0
-	nom@7.1.3
-	notify-rust@4.11.0
-	num-bigint@0.2.6
-	num-bigint@0.4.5
-	num-complex@0.2.4
-	num-complex@0.4.6
-	num-conv@0.1.0
-	num-derive@0.3.3
-	num-integer@0.1.46
-	num-iter@0.1.45
-	num-rational@0.2.4
-	num-rational@0.4.2
-	num-traits@0.2.19
-	num@0.2.1
-	num@0.4.3
-	num_cpus@1.16.0
-	num_enum@0.5.11
-	num_enum_derive@0.5.11
-	num_threads@0.1.7
-	numtoa@0.1.0
-	objc-foundation@0.1.1
-	objc-sys@0.3.3
-	objc2-app-kit@0.2.0
-	objc2-core-data@0.2.0
-	objc2-encode@4.0.1
-	objc2-foundation@0.2.0
-	objc2@0.5.1
-	objc@0.2.7
-	objc_id@0.1.1
-	object@0.32.2
-	oboe-sys@0.4.5
-	oboe@0.4.6
-	ogg@0.8.0
-	once_cell@1.19.0
-	opaque-debug@0.3.1
-	openssl-macros@0.1.1
-	openssl-probe@0.1.5
-	openssl-sys@0.9.102
-	openssl@0.10.64
-	ordered-stream@0.2.0
-	os_pipe@1.1.5
-	owning_ref@0.4.1
-	pancurses@0.17.0
-	parking@2.2.0
-	parking_lot@0.11.2
-	parking_lot@0.12.2
-	parking_lot_core@0.8.6
-	parking_lot_core@0.9.10
-	parse_duration@2.1.1
-	pbkdf2@0.8.0
-	pdcurses-sys@0.7.1
-	percent-encoding@2.3.1
-	petgraph@0.6.5
-	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.1
-	pkg-config@0.3.30
-	platform-dirs@0.3.0
-	png@0.17.13
-	polling@3.7.0
-	portaudio-rs@0.3.2
-	portaudio-sys@0.1.1
-	powerfmt@0.2.0
-	ppv-lite86@0.2.17
-	priority-queue@1.4.0
-	proc-macro-crate@1.3.1
-	proc-macro-crate@3.1.0
-	proc-macro2@1.0.82
-	protobuf-codegen-pure@2.28.0
-	protobuf-codegen@2.28.0
-	protobuf@2.28.0
-	quick-xml@0.31.0
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	rand_distr@0.4.3
-	redox_syscall@0.2.16
-	redox_syscall@0.5.1
-	redox_termios@0.1.3
-	redox_users@0.4.5
-	regex-automata@0.4.6
-	regex-syntax@0.8.3
-	regex@1.10.4
-	reqwest@0.12.4
-	rodio@0.15.0
-	roff@0.2.1
-	rspotify-http@0.13.1
-	rspotify-macros@0.13.1
-	rspotify-model@0.13.1
-	rspotify@0.13.1
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustc_version@0.4.0
-	rustix@0.38.34
-	rustls-pemfile@2.1.2
-	rustls-pki-types@1.7.0
-	rustversion@1.0.16
-	ryu@1.0.18
-	same-file@1.0.6
-	schannel@0.1.23
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	security-framework-sys@2.11.0
-	security-framework@2.11.0
-	semver@1.0.23
-	serde@1.0.201
-	serde_cbor@0.11.2
-	serde_derive@1.0.201
-	serde_json@1.0.117
-	serde_repr@0.1.19
-	serde_spanned@0.6.5
-	serde_urlencoded@0.7.1
-	sha-1@0.9.8
-	sha1@0.10.6
-	sha2@0.10.8
-	shannon@0.2.0
-	shell-words@1.1.0
-	shlex@1.3.0
-	signal-hook-mio@0.2.3
-	signal-hook-registry@1.4.2
-	signal-hook@0.3.17
-	simd-adler32@0.3.7
-	slab@0.4.9
-	smallvec@1.13.2
-	socket2@0.5.7
-	socks@0.3.4
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	stdweb@0.1.3
-	strsim@0.10.0
-	strsim@0.11.1
-	strum@0.26.2
-	strum_macros@0.26.2
-	subtle@2.4.1
-	syn@1.0.109
-	syn@2.0.61
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tauri-winrt-notification@0.2.1
-	tempfile@3.10.1
-	term_size@0.3.2
-	termion@1.5.6
-	thiserror-impl@1.0.60
-	thiserror@1.0.60
-	thread-id@4.2.1
-	tiff@0.9.1
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-native-tls@0.3.1
-	tokio-stream@0.1.15
-	tokio-util@0.7.11
-	tokio@1.37.0
-	toml@0.8.12
-	toml_datetime@0.6.5
-	toml_edit@0.19.15
-	toml_edit@0.21.1
-	toml_edit@0.22.12
-	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
-	tree_magic_mini@3.1.4
-	try-lock@0.2.5
-	typenum@1.17.0
-	uds_windows@1.1.0
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.12
-	ureq@2.9.7
-	url@2.5.0
-	utf8parse@0.2.1
-	uuid@1.8.0
-	vcpkg@0.2.15
-	vergen@3.2.0
-	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
-	wayland-backend@0.3.3
-	wayland-client@0.31.2
-	wayland-protocols-wlr@0.2.0
-	wayland-protocols@0.31.2
-	wayland-scanner@0.31.1
-	wayland-sys@0.31.1
-	web-sys@0.3.69
-	weezl@0.1.8
-	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-implement@0.56.0
-	windows-interface@0.56.0
-	windows-result@0.1.1
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.5
-	windows-version@0.1.1
-	windows@0.56.0
-	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.8
-	winreg@0.5.1
-	winreg@0.52.0
-	wl-clipboard-rs@0.8.1
-	x11rb-protocol@0.13.1
-	x11rb@0.13.1
-	xdg-home@1.1.0
-	xi-unicode@0.3.0
-	zbus@4.2.1
-	zbus_macros@4.2.1
-	zbus_names@3.0.0
-	zerocopy-derive@0.6.6
-	zerocopy-derive@0.7.34
-	zerocopy@0.6.6
-	zerocopy@0.7.34
-	zvariant@4.1.0
-	zvariant_derive@4.1.0
-	zvariant_utils@1.1.1
-"
-
-# xtask crates:
-CRATES+="
-	cargo-xtask@0.1.0
-	clap_mangen@0.2.20
-	clap_complete@4.5.2
-	clap@4.5.4
-"
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 cargo desktop optfeature python-any-r1
-
-DESCRIPTION="ncurses Spotify client written in Rust using librespot"
-HOMEPAGE="https://github.com/hrkfdn/ncspot"
-SRC_URI="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}"
-
-LICENSE="BSD-2"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD-2 BSD Boost-1.0 ISC MIT Unicode-DFS-2016
-	|| ( LGPL-3 MPL-2.0 )
-"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="clipboard cover mpris ncurses +notify pulseaudio"
-
-RDEPEND="dev-libs/openssl:=
-	sys-apps/dbus
-	clipboard? ( x11-libs/libxcb:= )
-	cover? ( media-gfx/ueberzug )
-	ncurses? ( sys-libs/ncurses:= )
-	!ncurses? ( sys-libs/ncurses )
-	pulseaudio? ( media-libs/libpulse )
-	!pulseaudio? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-QA_FLAGS_IGNORED="/usr/bin/ncspot"
-
-src_configure() {
-	local myfeaturesdef=""
-
-	use clipboard && myfeaturesdef+="share_clipboard,share_selection,"
-	use cover && myfeaturesdef+="cover,"
-	use mpris && myfeaturesdef+="mpris,"
-	use ncurses && myfeaturesdef+="ncurses_backend,"
-	use notify && myfeaturesdef+="notify,"
-
-	# It always seems to link to libpulse regardless of this setting if libpulse is installed.
-	if use pulseaudio; then
-	  myfeaturesdef+="pulseaudio_backend,"
-	else
-	  myfeaturesdef+="alsa_backend,"
-	fi
-
-	local myfeatures=( "${myfeaturesdef::-1}" )
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cargo_src_compile
-
-	cargo xtask generate-shell-completion || die
-	cargo xtask generate-manpage || die
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-
-	domenu misc/ncspot.desktop
-	newicon -s scalable images/logo.svg ncspot.svg
-
-	dobashcomp misc/ncspot.bash
-
-	insinto /usr/share/fish/completions
-	doins misc/ncspot.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/_ncspot
-
-	doman misc/ncspot.1
-}
-
-pkg_postinst() {
-	optfeature_header "Optional runtime features:"
-	optfeature "MPRIS song scrobbling support" media-sound/rescrobbled
-}
diff --git a/media-sound/ncspot/ncspot-1.1.2.ebuild b/media-sound/ncspot/ncspot-1.1.2.ebuild
index 293e8b81254a..a860b34aca6b 100644
--- a/media-sound/ncspot/ncspot-1.1.2.ebuild
+++ b/media-sound/ncspot/ncspot-1.1.2.ebuild
@@ -515,7 +515,7 @@ LICENSE+="
 	|| ( LGPL-3 MPL-2.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="clipboard cover mpris ncurses +notify pulseaudio"
 
diff --git a/media-sound/owntone/Manifest b/media-sound/owntone/Manifest
index 24e735e127d1..f5424917a3f3 100644
--- a/media-sound/owntone/Manifest
+++ b/media-sound/owntone/Manifest
@@ -1 +1,3 @@
 DIST owntone-28.9.tar.xz 1066248 BLAKE2B 68ba46e6ff2e406d54ccfe387191a67d4eb7590db3039d87ffcd5eabf7417059084997f0d6be810d164616cd663b2e4143714ef4ac31acb7d91e254ccd342465 SHA512 29f42a4a8c9501a038ecc5026fc4bce9d777dee722937b89a55523cd68f001c821017d09f32b704a0c331879f7049d7d087d8e6899c82924f45401b012c65e95
+DIST owntone-28.9_p20240903-40c22e3d.tar.gz 5730828 BLAKE2B 8328a1c06fa40f27d55c3b28149a0b50f6bf295fe96c1f11bd82e677447ee3c5b5bf55b7d77f201fa73095c1b3f1a878b80b241ac1467d2977611eec3901d1d5 SHA512 5b8ea0aafd8cc63752152ab2e7ae82bb6cd02b743efd419b75f9a3bf2981b26066ef34c26c392822e0666e633653749fce5cdffb83bac788546a3b9a729e1e96
+DIST owntone-40c22e3-mpd-0.24-r1.patch 75389 BLAKE2B 8047a72dcd374c03e81ea0ab2e2017cab40c58d11d8cf566580b422bbede793696d434ebfacf9d9b2366c91e86a949a8f1c7abced045025a98d7e2795f05c781 SHA512 6a0aa32622083f47eedf172880bb7d6debd3063fa18059510b022e3eca7afbd7d8c29d5f7fc8a3b04b54a42585e6df8e5568615125316a063ff58f97ca2206b4
diff --git a/media-sound/owntone/owntone-28.9_p20240903.ebuild b/media-sound/owntone/owntone-28.9_p20240903.ebuild
new file mode 100644
index 000000000000..7d107bce1626
--- /dev/null
+++ b/media-sound/owntone/owntone-28.9_p20240903.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+GITREV="40c22e3d2f716177ad737998f3ef909f20c4acfa"
+DESCRIPTION="DAAP (iTunes) and MPD media server"
+HOMEPAGE="https://owntone.github.io/owntone-server"
+SRC_URI="https://github.com/owntone/owntone-server/archive/${GITREV}.tar.gz -> ${P}-${GITREV:0:8}.tar.gz
+	https://github.com/grobian/owntone-mpd/releases/download/mpd-0.24-r1/${PN}-${GITREV:0:7}-mpd-0.24-r1.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa +chromecast"
+S="${WORKDIR}/${PN}-server-${GITREV}"
+
+RDEPEND="
+	app-pda/libplist
+	dev-db/sqlite:3
+	dev-libs/confuse
+	dev-libs/json-c
+	dev-libs/libevent
+	dev-libs/libgcrypt
+	dev-libs/libsodium
+	dev-libs/libunistring
+	dev-libs/libxml2
+	dev-libs/mxml:0
+	dev-libs/protobuf-c
+	media-libs/alsa-lib
+	media-video/ffmpeg
+	net-dns/avahi
+	net-libs/libwebsockets
+	net-misc/curl
+	sys-devel/gettext
+	sys-libs/zlib
+	acct-group/audio
+	acct-user/owntone
+	alsa? ( media-libs/alsa-lib )
+	chromecast? ( net-libs/gnutls media-video/ffmpeg[opus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	sys-apps/gawk
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-${GITREV:0:7}-mpd-0.24-r1.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# fix log path, and enable songs/cache databases
+	sed -i \
+		-e "/logfile = /s:= .*$:= ${EPREFIX}/var/log/owntone/owntone.log:" \
+		-e "/\(db_path\|cache_path\) =/s:/cache/:/:" \
+		-e "/\(db_path\|cache_path\) =/s:^#::" \
+		owntone.conf.in || die
+}
+
+src_configure() {
+	econf \
+		--without-pulseaudio \
+		--with-libwebsockets \
+		--with-avahi \
+		--with-user=owntone \
+		--with-group=audio \
+		$(use_with alsa) \
+		$(use_enable chromecast) || die
+}
+
+src_install() {
+	default
+
+	rm -Rf "${ED}"/var/lib  # all empty dirs
+	find "${ED}" -name "*.la" -delete
+
+	keepdir /var/lib/owntone
+	keepdir /var/log/owntone
+	fowners owntone /var/log/owntone
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-2.0.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-2.0.0.ebuild
index 8057c54e08f0..6ca427a8872b 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-2.0.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-2.0.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 340ecce39158..18a3a97b63b4 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,2 +1,4 @@
 DIST picard-2.12.1.tar.gz 5863157 BLAKE2B 0015b0c378088f2cd2d7f2449a41c544b9f4cb4e521e9728a872f37ab21815f492a8a80886ce294e17406808cb965968962b8fde6625907f324c50b3ba53d160 SHA512 d9a9f574d7a4ca981cd224068c59eef5f3acdab8e8f84a3d5c5c4428d57c49e706899f039e246c0bdbe85206b1777c8211e54d02982bd163c7bbcad5126b3d11
+DIST picard-2.12.2.tar.gz 5863787 BLAKE2B f9f8fc5ffe424ce2a9aa154994e7ec1adf61a61a94769fb36d715de9ec84f1dac2d49f27d13900354adad7dcb936d62a2eba429e4ccb20dc5d6849d7f4b22adc SHA512 d06583c82737e6b5f26a639f24ecec115f29a9df7498e2632e084bcfc31f13c72965bd862c19c496fe0539c8987812d53ed9298522e37989c733af2f7ecface1
+DIST picard-2.12.3.tar.gz 5878683 BLAKE2B cdbe37842d5e2602941513835a3f28ff1ab2cad6ec37f41e6c1d8d4df2a8c957a36422414f2e4ce06d217c19b4a737fc4385022edb3052bba9cac138fa73c50b SHA512 0c4ec97f7d786982685cc095c838e46435b7305f10c33cd7d82eba006150acee934a92a182c3891e48555a7b958068782e9458ee4368cc4e3e39ad80cda858be
 DIST picard-2.12.tar.gz 5857635 BLAKE2B 4eaec28830d85a0a45d220012fbb1acbfd40accc1536e47aa616b7d0014ef6f36111a6e9d6992862f9ff5419f7cb0c7b2b7b0a737ceca20bc804ce040f52ab22 SHA512 28f8d6b7b59a9a145404ab497a4ef0d71f2fefe86b9ec28b7f6879ec10f5ab1fd3582363bb15dd92c92c624843e87c11fce959fee75d0b312e72f6575d93b1a6
diff --git a/media-sound/picard/picard-2.12.2.ebuild b/media-sound/picard/picard-2.12.2.ebuild
new file mode 100644
index 000000000000..6a6e26e28fc9
--- /dev/null
+++ b/media-sound/picard/picard-2.12.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+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/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/picard/picard-2.12.3.ebuild b/media-sound/picard/picard-2.12.3.ebuild
new file mode 100644
index 000000000000..6a6e26e28fc9
--- /dev/null
+++ b/media-sound/picard/picard-2.12.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+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/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index d402bcf391ca..076113b97749 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1,2 +1 @@
-DIST qastools-v0.23.0.tar.bz2 205810 BLAKE2B 20cbf8df1418645f20364f4e5d11d68c8f5980659f96fa654ac55e1479c7275ac81f16460fc5571dc3e7fdd7d53c27044a6faa065711d4ea43d20be7d981cd81 SHA512 543e2f6407ba36f7cb0ce811ee1ceac14652960c58636671fabeaca25d154db263b654d07795ec2a81232b1e177469cbb45617099d40af47d6ab1148443582fb
 DIST qastools-v1.4.0.tar.bz2 216159 BLAKE2B bcd908eff818369bef088c67ddbcf2770cfcc9931becfc80063588da2febb0251a0917e695f7255e8becdc569e2409326203f2f5eba178569e2d63be4a02b0a7 SHA512 2158ed32c752ffc12b2f0b76d85e80af73e41511bfe54faf197d79d740f083e0b8a6efe1e913c7a0b31249c5d02cd506553b4ce83e03d4e517050a530041f071
diff --git a/media-sound/qastools/qastools-0.23.0.ebuild b/media-sound/qastools/qastools-0.23.0.ebuild
deleted file mode 100644
index 789af4082220..000000000000
--- a/media-sound/qastools/qastools-0.23.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=7
-
-inherit cmake
-
-DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser"
-HOMEPAGE="https://gitlab.com/sebholt/qastools"
-SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	virtual/libudev:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-nomancompress.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_LICENSE_INSTALL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qastools/qastools-1.4.0.ebuild b/media-sound/qastools/qastools-1.4.0.ebuild
index 37704ef41fe2..7612c6be6a5c 100644
--- a/media-sound/qastools/qastools-1.4.0.ebuild
+++ b/media-sound/qastools/qastools-1.4.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-qt/qtbase:6[dbus,gui,network,widgets]
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 40014d5906b0..a6736768432f 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,2 +1 @@
-DIST qjackctl-1.0.0.tar.gz 1314301 BLAKE2B f27422bb98a4a7b1ec905df63989a51edfd6ccebdbae0da000f98a1dcaf93757f3aab9ec971ad3f395c668c85fc838ff62017545072028e5ccd0d435e4a9ac15 SHA512 2ca2691112d35d959ab0d0abc86e79b7526c6b5a5ef6d36581bc712ad6926b13cc559767b81c817bbfb7a5203e2cfaad396451ad749b553d6882d2c963a3f197
 DIST qjackctl-1.0.1.tar.gz 1318578 BLAKE2B c2741cfed5244e9c0b837b7bb7ac31dd6fad74226cad9401014565928e59c6fc448fda6e4e335e4acdc92d55b05f330a2101b1f9cbbce6918b7749c62f0e9379 SHA512 ac0442c0fe8f29ca27dfe149db3bc20a968ff7b2abb764bbb7b7cd1f57e26edac70b834c4f6fa6578fa07afad9de3e8f846d131517e9b5862333634715933b08
diff --git a/media-sound/qjackctl/qjackctl-1.0.0.ebuild b/media-sound/qjackctl/qjackctl-1.0.0.ebuild
deleted file mode 100644
index 8b1ca524e452..000000000000
--- a/media-sound/qjackctl/qjackctl-1.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
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-		-DCONFIG_QT6=no
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qjackctl/qjackctl-1.0.1.ebuild b/media-sound/qjackctl/qjackctl-1.0.1.ebuild
index 29b887562b75..8b1ca524e452 100644
--- a/media-sound/qjackctl/qjackctl-1.0.1.ebuild
+++ b/media-sound/qjackctl/qjackctl-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
index 3b48a0281a9e..f69b613d4def 100644
--- a/media-sound/qmidiarp/Manifest
+++ b/media-sound/qmidiarp/Manifest
@@ -1 +1,2 @@
 DIST qmidiarp-0.7.0.tar.bz2 718430 BLAKE2B 43b558d8185f2e798dc17dc58c966daf244f35b11abf5c96220f81210b39dc619daa260ff384a16da35c74584c90e86330597ec6e170bb071cebf977374c5efa SHA512 f1dcb9c817bfc9c39a9b120f5716518c3ef825652258d5852f9e228cbc3018202427a19d4b47858c16d43e5d8bbf3712cced68d95f300cc6b98ad76c608b68fd
+DIST qmidiarp-0.7.1.tar.bz2 718810 BLAKE2B 3f8283e19964084961e991531e973793b07aa4e8f08d4d55bfb2f302314338c8aba2da50bd6aad58bcd7fc07d7f259a9c2bc90fdb824fe2ddc8ef733fb076265 SHA512 50f73deb2bd7c609df1211b3ce03d3253ecfeae4c26736e3ca4c8062fcc08f5b00de47fc0c3e50215f00c3bf4bf67519b85c5f3fa793501146413e396d0eabcf
diff --git a/media-sound/qmidiarp/qmidiarp-0.7.1.ebuild b/media-sound/qmidiarp/qmidiarp-0.7.1.ebuild
new file mode 100644
index 000000000000..c4596707c28e
--- /dev/null
+++ b/media-sound/qmidiarp/qmidiarp-0.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Arpeggiator, sequencer and MIDI LFO for ALSA"
+HOMEPAGE="https://qmidiarp.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lv2 nls osc"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+	virtual/pkgconfig"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/jack
+	lv2? ( media-libs/lv2 )
+	osc? ( media-libs/liblo )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local myeconfargs=(
+		$(use_enable lv2 lv2plugins)
+		$(use_enable nls translations)
+		$(use_enable osc nsm)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 1ae06a84932d..df5eae86e9af 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,2 +1,2 @@
-DIST qtractor-1.0.0.tar.gz 2635806 BLAKE2B eb77f02b9fa60a6603ac1f7d17e7fe1140af13e89eabe7698d134728fa419ee6a0cfbeb0a5dc0581f9d6961a74aefa7151589e126fd607d6724779721921ded4 SHA512 43c86cab60193b0b31323dfe5f5664ae6dd6726d36ef28caee472966bb82527b6f9d6c3c007ea10674f89e0f3aa107cc25b66fb7f8d9ab3f96f25d81bbd1c5be
 DIST qtractor-1.1.1.tar.gz 2650631 BLAKE2B bb8641bd3f2bc227b8f1e9945720ddf7982b03802c998c9c7ea06afd2ee61d997ee4093e9094439e38ff2af063a32f94258f06e9e3b9f1a1a05902ad889e3908 SHA512 e007a654b7e320530ff5d5f41c8c823eb25eec84396dbb8a8c28ac62a058899d79666fcc927c1c0274386f59db28319317dbeac0d478fcf30254daa8a14e51d0
+DIST qtractor-1.2.0.tar.gz 2650100 BLAKE2B 18afad9da8ed526747d89448fd371d9b76f79c0e2f4cb9aa6d672692aa8862f5d362e0334254e71c89eee3f85a096f873343968116e4d6ef169be9043db603c1 SHA512 0a5e3ee9675bbb0603ce1833ee44e49144fbd501a4c7d937cfe5e3e2556fef8cf5917a5d20f10181d464dbf603f7701d1ff5fc25465dbfcaca85f5411370418f
diff --git a/media-sound/qtractor/qtractor-1.0.0.ebuild b/media-sound/qtractor/qtractor-1.0.0.ebuild
deleted file mode 100644
index 27cb23754511..000000000000
--- a/media-sound/qtractor/qtractor-1.0.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	x11-libs/libxcb:=
-	aubio? ( media-libs/aubio:= )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_QT6=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=1
-		-DCONFIG_VST2=1
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/qtractor-1.1.1.ebuild b/media-sound/qtractor/qtractor-1.1.1.ebuild
index 15185bd5c831..27cb23754511 100644
--- a/media-sound/qtractor/qtractor-1.1.1.ebuild
+++ b/media-sound/qtractor/qtractor-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/media-sound/qtractor/qtractor-1.2.0.ebuild b/media-sound/qtractor/qtractor-1.2.0.ebuild
new file mode 100644
index 000000000000..15185bd5c831
--- /dev/null
+++ b/media-sound/qtractor/qtractor-1.2.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 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 )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	x11-libs/libxcb:=
+	aubio? ( media-libs/aubio:= )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_QT6=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=1
+		-DCONFIG_VST2=1
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 78b333ad7275..f580257e2455 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1 +1,2 @@
 DIST sidplayfp-2.8.0.tar.gz 243292 BLAKE2B 92fc48659c459c6add6ef26000c9e153ec41b1b96ba205985d5c39ea14c4bb6c5b87e77ddc58945d8bb965a45af56e6eb436d0e10cc15553fbfeb84f6ef3ca08 SHA512 83f2d8cbe422ddc638fb36955b78c303ffe6dcbbc3cb92a2f9947de402579fcdd2e4f28fa130a49dfca87b6103daee1107f8797c38bd5c5d198b1642cee4cf53
+DIST sidplayfp-2.9.0.tar.gz 247965 BLAKE2B 11ff3c33360aca182886418bda8dbfb534de6c6e76b854dfaf78599ce388b5c493221cf8d0f13fdb5ccb7cae7d352484b56505cbef3f955cac5cb26d933d35e1 SHA512 2a59cca74456e04ff6cd5bf3c8f47eb8687e577cd907979188713d38f1602ec8933d467222ae4f5e630116bc71832435bd911901c666b3285c796bb1c5d03393
diff --git a/media-sound/sidplayfp/sidplayfp-2.9.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.9.0.ebuild
new file mode 100644
index 000000000000..2d76084b9af7
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-2.9.0.ebuild
@@ -0,0 +1,51 @@
+# 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/strawberry/Manifest b/media-sound/strawberry/Manifest
index 2d7d7409641e..47c837a96064 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,2 +1 @@
-DIST strawberry-1.0.23.tar.xz 11297440 BLAKE2B 4110a19ac27a254ec778bc46592f4b1b00ea8cb077a231d5dc0bb69c8ef78aca02a15339b888812c7cb31540f61647e2c8b15d416c68c4da4690407ac851dec4 SHA512 f3249e97b2f0130dadf2a5fcfc128d7054accd6b86cf088a3a45549c584529aefbadaf09e9ed074af85c679495b03ad700e78f6952e913a40b38eaf7c77d5adb
 DIST strawberry-1.1.1.tar.xz 11352308 BLAKE2B f43f39f254dce088dd41141715a639f62eb847f0c881e228d5fb1d75a1ee6f70a94fcea732bffda839e2bf7179dc4bf0d8967eb2713c84111339afdc31891bdd SHA512 f44042bc44b6711b8c433b23733c10a13ac6c09f524604fb6d5b71df236cd211a16ea05587af4681ff6859c0af45dc384c67c5f1712182ff692ecf78d6938e19
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index c5351200e084..9496c014df75 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -8,7 +8,7 @@
 	<use>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
 		<flag name="moodbar">Enable moodbar support</flag>
-		<flag name="soup">Enable soup support</flag>
+		<flag name="soup">Allow streaming with <pkg>media-plugins/gst-plugins-soup</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jonaski/strawberry</remote-id>
diff --git a/media-sound/strawberry/strawberry-1.0.23-r2.ebuild b/media-sound/strawberry/strawberry-1.0.23-r2.ebuild
deleted file mode 100644
index ad37177bd647..000000000000
--- a/media-sound/strawberry/strawberry-1.0.23-r2.ebuild
+++ /dev/null
@@ -1,129 +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 plocale xdg
-
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
-
-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="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	media-libs/alsa-lib
-	media-libs/taglib
-	!qt6? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-	qt6? (
-		dev-libs/kdsingleapplication[qt6(+)]
-		dev-qt/qtbase[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
-	)
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	icu? ( dev-libs/icu:= )
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-libs/libpulse )
-	vlc? ( media-video/vlc )
-"
-# 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}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		soup? ( 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-cpp/gtest
-	dev-libs/boost
-	!qt6? ( dev-qt/qttest:5 )
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		-DBUILD_WITH_QT6="$(usex qt6)"
-		-DBUILD_WITH_QT5="$(usex !qt6)"
-		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		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"
-	fi
-}
diff --git a/media-sound/strawberry/strawberry-1.0.23.ebuild b/media-sound/strawberry/strawberry-1.0.23.ebuild
deleted file mode 100644
index fc81b1b29b2b..000000000000
--- a/media-sound/strawberry/strawberry-1.0.23.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
-
-inherit cmake flag-o-matic plocale xdg
-
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
-
-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="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus: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/alsa-lib
-	media-libs/taglib
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	icu? ( dev-libs/icu:= )
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-libs/libpulse )
-	vlc? ( media-video/vlc )
-"
-# 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}
-	gstreamer? (
-		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-cpp/gtest
-	dev-libs/boost
-	dev-qt/qttest:5
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		-DQT_VERSION_MAJOR=5
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		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"
-	fi
-}
diff --git a/media-sound/strawberry/strawberry-1.1.1.ebuild b/media-sound/strawberry/strawberry-1.1.1.ebuild
index 0ffec658a10b..a74ee32e184c 100644
--- a/media-sound/strawberry/strawberry-1.1.1.ebuild
+++ b/media-sound/strawberry/strawberry-1.1.1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
 
 BDEPEND="
 	sys-devel/gettext
@@ -29,6 +29,7 @@ BDEPEND="
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	dev-libs/glib:2
+	dev-libs/icu:=
 	dev-libs/protobuf:=
 	media-libs/alsa-lib
 	media-libs/taglib
@@ -53,7 +54,6 @@ COMMON_DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	icu? ( dev-libs/icu:= )
 	ipod? ( media-libs/libgpod )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( media-libs/libmtp )
@@ -99,7 +99,6 @@ src_configure() {
 		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 3db9ec7c7628..3b96cd045947 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+PLOCALES="ca cs de es es_AR es_ES es_MX et fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
@@ -19,35 +19,41 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
 	sys-devel/gettext
 	virtual/pkgconfig
+	!qt6? ( dev-qt/linguist-tools:5 )
 "
 COMMON_DEPEND="
 	dev-db/sqlite:=
 	dev-libs/glib:2
+	dev-libs/icu:=
 	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus: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/alsa-lib
 	media-libs/taglib
-	x11-libs/libX11
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+	qt6? (
+		dev-libs/kdsingleapplication[qt6(+)]
+		dev-qt/qtbase:6[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
+	)
 	cdda? ( dev-libs/libcdio:= )
 	gstreamer? (
 		media-libs/chromaprint:=
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	icu? ( dev-libs/icu:= )
 	ipod? ( media-libs/libgpod )
 	moodbar? ( sci-libs/fftw:3.0 )
 	mtp? ( media-libs/libmtp )
@@ -58,7 +64,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	gstreamer? (
 		media-plugins/gst-plugins-meta:1.0
-		media-plugins/gst-plugins-soup:1.0
+		soup? ( media-plugins/gst-plugins-soup:1.0 )
 		media-plugins/gst-plugins-taglib:1.0
 	)
 	mtp? ( gnome-base/gvfs[mtp] )
@@ -67,7 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/gtest
 	dev-libs/boost
-	dev-qt/qttest:5
+	!qt6? ( dev-qt/qttest:5 )
 "
 
 DOCS=( Changelog README.md )
@@ -93,7 +99,6 @@ src_configure() {
 		-DLINGUAS="$(plocale_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DUSE_ICU="$(usex icu)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
@@ -102,7 +107,9 @@ src_configure() {
 		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
-		-DQT_VERSION_MAJOR=5
+		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT5="$(usex !qt6)"
+		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/vimpc/vimpc-9999.ebuild b/media-sound/vimpc/vimpc-9999.ebuild
index a6a60a208193..517aa42ede27 100644
--- a/media-sound/vimpc/vimpc-9999.ebuild
+++ b/media-sound/vimpc/vimpc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,11 +28,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-boost.patch
-	"${FILESDIR}"/${P}-wformat-security.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/vmpk/vmpk-0.8.7.ebuild b/media-sound/vmpk/vmpk-0.8.7.ebuild
index 652ccbe41250..da5a0f3d7dc2 100644
--- a/media-sound/vmpk/vmpk-0.8.7.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.7.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DBUS=$(usex dbus)
+		-DUSE_QT=5
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
index a466553f269a..eda60ca94541 100644
--- a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils
 
@@ -36,10 +36,12 @@ XMMS2_PLUGINS=(
 IUSE="
 	${XMMS2_OPTIONALS[@]%:*}
 	${XMMS2_PLUGINS[@]%:*}
-	+server"
+	+server
+"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	test? ( server )"
+	test? ( server )
+"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -96,7 +98,8 @@ COMMON_DEPEND="
 			net-dns/avahi[mdnsresponder-compat]
 			net-misc/curl
 		)
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	perl? (
@@ -109,16 +112,19 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	cxx? ( dev-libs/boost )
-	test? ( dev-util/cunit )"
+	test? ( dev-util/cunit )
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	perl? (	dev-perl/Pod-Parser )
-	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )"
+	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
+"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
 	avcodec_free_frame # succcessfully detects that this is gone in newer ffmpeg
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 3f1e09c883ae..470709e254cd 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -7,6 +7,7 @@ DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d5
 DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
 DIST kodi-20.5-Nexus.tar.gz 54568445 BLAKE2B 15eb409918fa3768528d9abd24c52fd8b94c82699ef2ce10a529278fe25544dc335b66d137ae8ae304511cd92c1c0be34881937ec705ba936f5a4b0d737903f7 SHA512 a47a54ca11e1d3daeddea8c1ae716cd4461e3441de43a026a920c709b2ff5c7e0acc2a5fd4ac8c15f0da1940bd7f21a65eff32203ad8e167603c1576b21d4dcc
 DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b
+DIST kodi-21.1-Omega.tar.gz 41091890 BLAKE2B e711ef9b958ff3f8e006913ea6c42092164eeaae7011c2307f6d9846509e58db101a19dd51f4e95000de2f30ca2e77fd196187223d0ced7adad233d3ab57e286 SHA512 8458447c2a6d7ce0fdcfc7ec9b4ff1f8be0abf18a16804d245c3cef99408fcfb4b13aa18fca16c87e560316c97d281e214cf37fd7e17e243c1206c5575195dc8
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
diff --git a/media-tv/kodi/files/kodi-21-optional-ffmpeg-libx11.patch b/media-tv/kodi/files/kodi-21-optional-ffmpeg-libx11.patch
new file mode 100644
index 000000000000..1d0805a3e574
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21-optional-ffmpeg-libx11.patch
@@ -0,0 +1,14 @@
+--- a/tools/depends/target/ffmpeg/CMakeLists.txt
++++ b/tools/depends/target/ffmpeg/CMakeLists.txt
+@@ -74,6 +74,11 @@ if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
+   else()
+     list(APPEND ffmpeg_conf --disable-vdpau)
+   endif()
++  if ("x11" IN_LIST CORE_PLATFORM_NAME_LC)
++    list(APPEND ffmpeg_conf --enable-xlib)
++  else()
++    list(APPEND ffmpeg_conf --disable-xlib)
++  endif()
+ elseif(CORE_SYSTEM_NAME STREQUAL android)
+   list(APPEND ffmpeg_conf --target-os=android
+                           --extra-libs=-liconv
diff --git a/media-tv/kodi/files/kodi-21.1-silence-libdvdread-git.patch b/media-tv/kodi/files/kodi-21.1-silence-libdvdread-git.patch
new file mode 100644
index 000000000000..83190d91e1db
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21.1-silence-libdvdread-git.patch
@@ -0,0 +1,36 @@
+From a193fae2ace4aa9086f9b73fa7008a016c30061e Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 21 Aug 2024 13:40:02 +0300
+Subject: [PATCH] Silence git "command not found"
+
+--- a/cmake/modules/FindLibDvdRead.cmake
++++ b/cmake/modules/FindLibDvdRead.cmake
+@@ -39,6 +39,9 @@ if(NOT TARGET LibDvdRead::LibDvdRead)
+ 
+   set(LIBDVDREAD_VERSION ${${MODULE}_VER})
+ 
++  set(patches "${CORE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/silence-git.patch")
++  generate_patchcommand("${patches}")
++
+   set(HOST_ARCH ${ARCH})
+   if(CORE_SYSTEM_NAME STREQUAL android)
+     if(ARCH STREQUAL arm)
+--- /dev/null
++++ b/tools/depends/target/libdvdread/silence-git.patch
+@@ -0,0 +1,13 @@
++diff --git a/Makefile.am b/Makefile.am
++index f2849b8..7cee887 100644
++--- a/Makefile.am
+++++ b/Makefile.am
++@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -Im4
++ 
++ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdread $(CSS_CFLAGS)
++ 
++-dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README.md TODO
+++dist_doc_DATA = AUTHORS COPYING NEWS README.md TODO
++ 
++ MAINTAINERCLEANFILES = ChangeLog
++ 
+-- 
+2.46.0
+
diff --git a/media-tv/kodi/kodi-21.1.ebuild b/media-tv/kodi/kodi-21.1.ebuild
new file mode 100644
index 000000000000..09ed7be38e5e
--- /dev/null
+++ b/media-tv/kodi/kodi-21.1.ebuild
@@ -0,0 +1,545 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CODENAME="Omega"
+
+# libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
+
+# Versions for the forked projects that are bundled
+# See tools/depends/target/<project>/<project>-VERSION
+LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
+LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
+LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
+FFMPEG_VERSION="6.0.1"
+
+# Java bundles from xbmc/interfaces/swig/CMakeLists.txt
+GROOVY_VERSION="4.0.16"
+APACHE_COMMON_LANG_VERSION="3.14.0"
+APACHE_COMMON_TEXT_VERSION="1.11.0"
+
+_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} )
+JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
+# Required to be set, but not used.
+JAVA_PKG_WANT_SOURCE="21"
+JAVA_PKG_WANT_TARGET="21"
+
+PYTHON_REQ_USE="sqlite,ssl"
+PYTHON_COMPAT=( python3_{10..12} )
+
+# See cmake/scripts/common/ArchSetup.cmake for available options
+CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
+
+inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
+	toolchain-funcs xdg
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/"
+
+SRC_URI="
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz
+		-> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz
+		-> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-${GROOVY_VERSION}.zip
+	https://mirrors.kodi.tv/build-deps/sources/commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	https://mirrors.kodi.tv/build-deps/sources/commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
+	css? (
+		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
+			-> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	)
+	!system-ffmpeg? (
+		https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
+	)
+"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	if [[ ${PV} != "9999" ]]; then
+		EGIT_BRANCH="${CODENAME}"
+	fi
+	inherit git-r3
+else
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_PV="${MY_PV}-${CODENAME}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}
+fi
+
+LICENSE="GPL-2+"
+# vendored dependencies
+# apache-groovy, common-lang3 and commons-text
+LICENSE+=" Apache-2.0"
+# libdvdnav, libdvdread and libdvdcss.
+LICENSE+=" GPL-2+"
+# ffmpeg built as USE="gpl"
+LICENSE+=" !system-ffmpeg? ( GPL-2 )"
+
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gbm wayland X )
+	?? ( mariadb mysql )
+	bluray? ( udf )
+	gbm? ( udev )
+	soc? ( system-ffmpeg )
+	udev? ( !libusb )
+	vdpau? ( X !gles !gbm )
+	zeroconf? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+# dev-libs/libcec[-cubox] bug #818262
+COMMON_DEPEND="
+	>=dev-libs/flatbuffers-23.3.3:=
+	>=dev-libs/lzo-2.04:2
+	media-libs/giflib:=
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+	wayland? (
+		dev-cpp/waylandpp:=
+	)
+"
+COMMON_TARGET_DEPEND="${PYTHON_DEPS}
+	>=net-misc/curl-7.68.0[http2]
+	>=sys-libs/zlib-1.2.11
+	dev-db/sqlite:3
+	dev-libs/crossguid
+	>=dev-libs/fribidi-1.0.5
+	>=dev-libs/libcdio-2.1.0:=[cxx]
+	>=dev-libs/libfmt-6.1.2:=
+	dev-libs/libfstrcmp
+	dev-libs/libpcre[cxx]
+	>=dev-libs/openssl-1.1.1k:0=
+	>=dev-libs/spdlog-1.5.0:=
+	dev-libs/tinyxml[stl]
+	dev-libs/tinyxml2:=
+	media-fonts/roboto
+	media-libs/libglvnd[X?]
+	>=media-libs/freetype-2.10.1
+	media-libs/harfbuzz:=
+	>=media-libs/libass-0.15.0:=
+	media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
+	>=media-libs/taglib-1.9.0
+	sci-libs/kissfft
+	virtual/libiconv
+	virtual/ttf-fonts
+	x11-libs/libdrm
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	')
+	airplay? (
+		>=app-pda/libplist-2.0.0:=
+		net-libs/shairplay
+	)
+	alsa? (
+		>=media-libs/alsa-lib-1.1.4.1
+	)
+	bluetooth? (
+		net-wireless/bluez:=
+	)
+	bluray? (
+		>=media-libs/libbluray-1.1.2:=
+	)
+	caps? (
+		sys-libs/libcap
+	)
+	cec? (
+		>=dev-libs/libcec-4.0[-cubox]
+	)
+	dbus? (
+		sys-apps/dbus
+	)
+	gbm? (
+		>=dev-libs/libinput-1.10.5:=
+		media-libs/libdisplay-info
+		x11-libs/libxkbcommon
+	)
+	gles? (
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gles2]
+		)
+	)
+	!gles? (
+		media-libs/glu
+	)
+	lcms? (
+		>=media-libs/lcms-2.10:2
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lirc? (
+		app-misc/lirc
+	)
+	mariadb? (
+		dev-db/mariadb-connector-c:=
+	)
+	mysql? (
+		dev-db/mysql-connector-c:=
+	)
+	nfs? (
+		>=net-fs/libnfs-2.0.0:=
+	)
+	pipewire? (
+		>=media-video/pipewire-0.3.50:=
+	)
+	pulseaudio? (
+		media-libs/libpulse
+	)
+	samba? (
+		>=net-fs/samba-3.4.6[smbclient(+)]
+	)
+	system-ffmpeg? (
+		=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
+	)
+	!system-ffmpeg? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		media-libs/dav1d:=
+		net-libs/gnutls:=
+	)
+	udf? (
+		>=dev-libs/libudfread-1.0.0
+	)
+	udev? (
+		virtual/libudev:=
+	)
+	vaapi? (
+		media-libs/libva:=[wayland?,X?]
+	)
+	vdpau? (
+		|| (
+			>=x11-libs/libvdpau-1.1
+			>=x11-drivers/nvidia-drivers-180.51
+		)
+	)
+	wayland? (
+		>=x11-libs/libxkbcommon-0.4.1[wayland]
+	)
+	webserver? (
+		>=net-libs/libmicrohttpd-0.9.77:=[messages(+)]
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+	)
+	xslt? (
+		dev-libs/libxslt
+		>=dev-libs/libxml2-2.9.4
+	)
+	zeroconf? (
+		net-dns/avahi[dbus]
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${COMMON_TARGET_DEPEND}
+"
+DEPEND="
+	${COMMON_DEPEND}
+	${COMMON_TARGET_DEPEND}
+	>=dev-libs/rapidjson-1.0.2
+	test? (
+		>=dev-cpp/gtest-1.10.0
+	)
+	wayland? (
+		>=dev-libs/wayland-protocols-1.7
+	)
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXrender
+	)
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	app-arch/unzip
+	dev-build/cmake
+	dev-lang/swig
+	virtual/pkgconfig
+	<=virtual/jre-21:*
+	doc? (
+		app-text/doxygen
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch
+	"${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch
+)
+
+# bug #544020
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	java-pkg-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${MY_P}.tar.gz
+	fi
+
+	unpack apache-groovy-binary-${GROOVY_VERSION}.zip
+	unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Add all possible names for kissfft libraries
+	for datatype in {float,int16,int32,simd}; do
+		sed -i \
+			-e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \
+			cmake/modules/FindKissFFT.cmake || die
+	done
+
+	if tc-is-cross-compiler; then
+		# These tools are automatically built with CMake during a native build
+		# but need to be built in advance using Autotools for a cross build.
+		NATIVE_TOOLS=(
+			TexturePacker
+			JsonSchemaBuilder
+		)
+
+		local t
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+			AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+			popd >/dev/null || die
+		done
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local core_platform=(
+		$(usev gbm)
+		$(usev wayland)
+		$(usev X x11)
+	)
+
+	local mycmakeargs=(
+		-Wno-dev # less noise
+
+		-DAPP_RENDER_SYSTEM=$(usex gles gles gl)
+		-DCORE_PLATFORM_NAME="${core_platform[*]}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_TESTING=$(usex test)
+		-DVERBOSE=ON
+
+		# Enforce use of configured python interpeter
+		-DPYTHON_PATH=$(python_get_library_path)
+		-DPYTHON_VER=${EPYTHON##python} # wont work for pypy
+
+		# Toolchain
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CLANGFORMAT=OFF
+		-DENABLE_CLANGTIDY=OFF
+		-DENABLE_CPPCHECK=OFF
+		-DENABLE_INCLUDEWHATYOUUSE=OFF
+		# https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_GOLD=OFF
+		-DENABLE_LLD=OFF
+		-DENABLE_MOLD=OFF
+		-DUSE_LTO=OFF
+
+		# Features
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra stuff in 'src_install()'
+		-DENABLE_ISO9660PP=$(usex optical)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGL=$(usex !gles)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPTICAL=$(usex optical)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UDFREAD=$(usex udf)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+
+		-DWITH_FFMPEG=$(usex system-ffmpeg)
+
+		#To bundle or not
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_FMT=OFF
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_GTEST=OFF
+		-DENABLE_INTERNAL_KISSFFT=OFF
+		-DENABLE_INTERNAL_PCRE=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
+		-DENABLE_INTERNAL_TAGLIB=OFF
+		-DENABLE_INTERNAL_UDFREAD=OFF
+
+		-DTARBALL_DIR="${DISTDIR}"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}"
+		-Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}"
+		-Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}"
+	)
+
+	# Separated to avoid "Manually-specified variables were not used by the project:"
+	use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF )
+	use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" )
+	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
+	use !system-ffmpeg && mycmakeargs+=(
+		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz"
+	)
+	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
+
+	for flag in ${CPU_FLAGS[@]} ; do
+		local name=${flag#cpu_flags_*_}
+		mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) )
+	done
+
+	if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then
+		# Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		append-cflags -DNDEBUG
+		append-cxxflags -DNDEBUG
+	fi
+
+	# Violates ODR (bug #860984) and USE_LTO does spooky stuff
+	# https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e
+	filter-lto
+
+	if tc-is-cross-compiler; then
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			pushd "${S}/tools/depends/native/$t/src" >/dev/null || die
+			econf_build
+			install -m0755 /dev/null "$t" || die # Actually build later.
+			mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" )
+			popd >/dev/null || die
+		done
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		for t in "${NATIVE_TOOLS[@]}" ; do
+			emake -C "${S}/tools/depends/native/$t/src"
+		done
+	fi
+
+	cmake_src_compile all
+	use doc && cmake_build doc
+	use test && cmake_build kodi-test
+}
+
+src_test() {
+	local -x CMAKE_SKIP_TESTS=(
+		# Known failing, unreliable test
+		# bug #743938
+		TestCPUInfo.GetCPUFrequency
+		# Test failure stemming from sci-libs/kissfft
+		# The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i]
+		# evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08.
+		TestRFFT.SimpleSignal
+		# Tries to ping localhost, naturally breaking network-sandbox
+		TestNetwork.PingHost
+	)
+
+	if use arm || use x86; then
+		# bug #779184
+		# https://github.com/xbmc/xbmc/issues/18594
+		CMAKE_SKIP_TESTS+=(
+			TestDateTime.Reset
+			TestDateTime.SetDateTime
+			TestDateTime.SetFromDBTime
+		)
+	fi
+
+	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
+	local -x KODI_HOME="${BUILD_DIR}"
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug #457588
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	if use !eventclients ; then
+		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
+		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
+	fi
+
+	python_optimize "${D}$(python_get_sitedir)"
+
+	einstalldocs
+	use doc && dodoc -r "${S}"/docs/html/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use dbus ; then
+		optfeature "getting battery level and active power source" sys-power/upower
+		optfeature "control of shutdown, reboot, suspend, and hibernate" sys-auth/elogind sys-apps/systemd
+		optfeature "storage management support (automounting, volume monitoring, etc)" sys-fs/udisks:2
+	fi
+}
diff --git a/media-tv/kodi/kodi-21.9999.ebuild b/media-tv/kodi/kodi-21.9999.ebuild
index 7ca90c8d20dd..3e9e0d60425b 100644
--- a/media-tv/kodi/kodi-21.9999.ebuild
+++ b/media-tv/kodi/kodi-21.9999.ebuild
@@ -19,16 +19,16 @@ GROOVY_VERSION="4.0.16"
 APACHE_COMMON_LANG_VERSION="3.14.0"
 APACHE_COMMON_TEXT_VERSION="1.11.0"
 
-# Doesn't build with jdk-21
-_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} )
+_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} )
 JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
 # Required to be set, but not used.
-JAVA_PKG_WANT_SOURCE="17"
-JAVA_PKG_WANT_TARGET="17"
+JAVA_PKG_WANT_SOURCE="21"
+JAVA_PKG_WANT_TARGET="21"
 
 PYTHON_REQ_USE="sqlite,ssl"
 PYTHON_COMPAT=( python3_{10..12} )
 
+# See cmake/scripts/common/ArchSetup.cmake for available options
 CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
 
 inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
@@ -67,11 +67,19 @@ else
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
 LICENSE="GPL-2+"
+# vendored dependencies
+# apache-groovy, common-lang3 and commons-text
+LICENSE+=" Apache-2.0"
+# libdvdnav, libdvdread and libdvdcss.
+LICENSE+=" GPL-2+"
+# ffmpeg built as USE="gpl"
+LICENSE+=" !system-ffmpeg? ( GPL-2 )"
+
 SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
@@ -79,7 +87,7 @@ SLOT="0"
 IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	^^ ( gbm wayland X )
+	|| ( gbm wayland X )
 	?? ( mariadb mysql )
 	bluray? ( udf )
 	gbm? ( udev )
@@ -122,7 +130,6 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libass-0.15.0:=
 	media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
 	>=media-libs/taglib-1.9.0
-	=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
 	sci-libs/kissfft
 	virtual/libiconv
 	virtual/ttf-fonts
@@ -194,6 +201,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	samba? (
 		>=net-fs/samba-3.4.6[smbclient(+)]
 	)
+	system-ffmpeg? (
+		=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
+	)
+	!system-ffmpeg? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		media-libs/dav1d:=
+		net-libs/gnutls:=
+	)
 	udf? (
 		>=dev-libs/libudfread-1.0.0
 	)
@@ -253,12 +269,17 @@ BDEPEND="
 	dev-build/cmake
 	dev-lang/swig
 	virtual/pkgconfig
-	<=virtual/jre-17:*
+	<=virtual/jre-21:*
 	doc? (
 		app-text/doxygen
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch
+	"${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch
+)
+
 # bug #544020
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -318,11 +339,17 @@ src_prepare() {
 }
 
 src_configure() {
+	local core_platform=(
+		$(usev gbm)
+		$(usev wayland)
+		$(usev X x11)
+	)
+
 	local mycmakeargs=(
 		-Wno-dev # less noise
 
 		-DAPP_RENDER_SYSTEM=$(usex gles gles gl)
-		-DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11)
+		-DCORE_PLATFORM_NAME="${core_platform[*]}"
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 		-DENABLE_TESTING=$(usex test)
 		-DVERBOSE=ON
@@ -353,7 +380,7 @@ src_configure() {
 		-DENABLE_CEC=$(usex cec)
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
+		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra stuff in 'src_install()'
 		-DENABLE_ISO9660PP=$(usex optical)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
@@ -461,13 +488,20 @@ src_test() {
 		# The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i]
 		# evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08.
 		TestRFFT.SimpleSignal
-		# bug #779184
-		# https://github.com/xbmc/xbmc/issues/18594
-		$(usev x86 TestDateTime.SetFromDBTime)
 		# Tries to ping localhost, naturally breaking network-sandbox
 		TestNetwork.PingHost
 	)
 
+	if use arm || use x86; then
+		# bug #779184
+		# https://github.com/xbmc/xbmc/issues/18594
+		CMAKE_SKIP_TESTS+=(
+			TestDateTime.Reset
+			TestDateTime.SetDateTime
+			TestDateTime.SetFromDBTime
+		)
+	fi
+
 	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
 	local -x KODI_HOME="${BUILD_DIR}"
 
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index e4efd7f63cd8..1b42bd7ce45e 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CODENAME=""
+CODENAME="Piers"
 
 # libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
 
@@ -19,16 +19,16 @@ GROOVY_VERSION="4.0.16"
 APACHE_COMMON_LANG_VERSION="3.14.0"
 APACHE_COMMON_TEXT_VERSION="1.11.0"
 
-# Doesn't build with jdk-21
-_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} )
+_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17,21} )
 JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
 # Required to be set, but not used.
-JAVA_PKG_WANT_SOURCE="17"
-JAVA_PKG_WANT_TARGET="17"
+JAVA_PKG_WANT_SOURCE="21"
+JAVA_PKG_WANT_TARGET="21"
 
 PYTHON_REQ_USE="sqlite,ssl"
 PYTHON_COMPAT=( python3_{10..12} )
 
+# See cmake/scripts/common/ArchSetup.cmake for available options
 CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
 
 inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \
@@ -67,11 +67,19 @@ else
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
 LICENSE="GPL-2+"
+# vendored dependencies
+# apache-groovy, common-lang3 and commons-text
+LICENSE+=" Apache-2.0"
+# libdvdnav, libdvdread and libdvdcss.
+LICENSE+=" GPL-2+"
+# ffmpeg built as USE="gpl"
+LICENSE+=" !system-ffmpeg? ( GPL-2 )"
+
 SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
@@ -79,7 +87,7 @@ SLOT="0"
 IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	^^ ( gbm wayland X )
+	|| ( gbm wayland X )
 	?? ( mariadb mysql )
 	bluray? ( udf )
 	gbm? ( udev )
@@ -110,19 +118,19 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libcdio-2.1.0:=[cxx]
 	>=dev-libs/libfmt-6.1.2:=
 	dev-libs/libfstrcmp
-	dev-libs/libpcre[cxx]
+	dev-libs/libpcre2:=
 	>=dev-libs/openssl-1.1.1k:0=
 	>=dev-libs/spdlog-1.5.0:=
 	dev-libs/tinyxml[stl]
 	dev-libs/tinyxml2:=
 	media-fonts/roboto
+	media-gfx/exiv2:=
 	media-libs/libglvnd[X?]
 	>=media-libs/freetype-2.10.1
 	media-libs/harfbuzz:=
 	>=media-libs/libass-0.15.0:=
 	media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
 	>=media-libs/taglib-1.9.0
-	=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
 	virtual/libiconv
 	virtual/ttf-fonts
 	x11-libs/libdrm
@@ -193,6 +201,15 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	samba? (
 		>=net-fs/samba-3.4.6[smbclient(+)]
 	)
+	system-ffmpeg? (
+		=media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?]
+	)
+	!system-ffmpeg? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		media-libs/dav1d:=
+		net-libs/gnutls:=
+	)
 	udf? (
 		>=dev-libs/libudfread-1.0.0
 	)
@@ -252,12 +269,17 @@ BDEPEND="
 	dev-build/cmake
 	dev-lang/swig
 	virtual/pkgconfig
-	<=virtual/jre-17:*
+	<=virtual/jre-21:*
 	doc? (
 		app-text/doxygen
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch
+	"${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch
+)
+
 # bug #544020
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
@@ -310,11 +332,17 @@ src_prepare() {
 }
 
 src_configure() {
+	local core_platform=(
+		$(usev gbm)
+		$(usev wayland)
+		$(usev X x11)
+	)
+
 	local mycmakeargs=(
 		-Wno-dev # less noise
 
 		-DAPP_RENDER_SYSTEM=$(usex gles gles gl)
-		-DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11)
+		-DCORE_PLATFORM_NAME="${core_platform[*]}"
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 		-DENABLE_TESTING=$(usex test)
 		-DVERBOSE=ON
@@ -345,7 +373,7 @@ src_configure() {
 		-DENABLE_CEC=$(usex cec)
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
+		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra stuff in 'src_install()'
 		-DENABLE_ISO9660PP=$(usex optical)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
@@ -372,15 +400,17 @@ src_configure() {
 		-DWITH_FFMPEG=$(usex system-ffmpeg)
 
 		#To bundle or not
-		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_CEC=OFF
 		-DENABLE_INTERNAL_CURL=OFF
+		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_DAV1D=OFF
+		-DENABLE_INTERNAL_EXIV2=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_INTERNAL_FLATBUFFERS=OFF
 		-DENABLE_INTERNAL_FMT=OFF
 		-DENABLE_INTERNAL_FSTRCMP=OFF
 		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_PCRE=OFF
+		-DENABLE_INTERNAL_PCRE2=OFF
 		-DENABLE_INTERNAL_RapidJSON=OFF
 		-DENABLE_INTERNAL_SPDLOG=OFF
 		-DENABLE_INTERNAL_TAGLIB=OFF
@@ -449,13 +479,20 @@ src_test() {
 		# Known failing, unreliable test
 		# bug #743938
 		TestCPUInfo.GetCPUFrequency
-		# bug #779184
-		# https://github.com/xbmc/xbmc/issues/18594
-		$(usev x86 TestDateTime.SetFromDBTime)
 		# Tries to ping localhost, naturally breaking network-sandbox
 		TestNetwork.PingHost
 	)
 
+	if use arm || use x86; then
+		# bug #779184
+		# https://github.com/xbmc/xbmc/issues/18594
+		CMAKE_SKIP_TESTS+=(
+			TestDateTime.Reset
+			TestDateTime.SetDateTime
+			TestDateTime.SetFromDBTime
+		)
+	fi
+
 	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
 	local -x KODI_HOME="${BUILD_DIR}"
 
diff --git a/media-tv/mythtv/mythtv-33.1-r1.ebuild b/media-tv/mythtv/mythtv-33.1-r1.ebuild
deleted file mode 100644
index 34c97cbba763..000000000000
--- a/media-tv/mythtv/mythtv-33.1-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISABLE_AUTOFORMATTING="yes"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit edo flag-o-matic java-pkg-opt-2 java-ant-2 python-any-r1
-inherit qmake-utils readme.gentoo-r1 systemd toolchain-funcs user-info
-
-DESCRIPTION="Open Source DVR and media center hub"
-HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
-if [[ ${PV} == *_p* ]] ; then
-	MY_COMMIT="5824c588db24b4e71a7d94e829e6419f71089297"
-	SRC_URI="https://github.com/MythTV/mythtv/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	# mythtv and mythplugins are separate builds in the github MythTV project
-	S="${WORKDIR}/mythtv-${MY_COMMIT}/mythtv"
-else
-	SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	# mythtv and mythplugins are separate builds in the github mythtv project
-	S="${WORKDIR}/${P}/mythtv"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE_VIDEO_CAPTURE_DEVICES="v4l ieee1394 hdhomerun vbox ceton"
-IUSE="alsa asi autostart cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb exif fftw jack java"
-IUSE+=" +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx"
-IUSE+=" +wrapper x264 x265 +xml xmltv +xvid +X zeroconf"
-IUSE+=" ${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
-REQUIRED_USE="
-	cdr? ( cdda )
-"
-
-RDEPEND="
-	acct-user/mythtv
-	dev-libs/glib:2
-	dev-libs/lzo
-	dev-libs/libzip:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[mysql]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/tex-gyre
-	media-gfx/exiv2:=
-	media-libs/freetype:2
-	media-libs/libbluray:=[java?]
-	media-libs/libsamplerate
-	media-libs/libsoundtouch
-	media-libs/taglib
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	autostart? (
-		net-dialup/mingetty
-		x11-apps/xset
-		x11-wm/evilwm
-	)
-	cec? ( dev-libs/libcec )
-	dvd? (
-		dev-libs/libcdio:=
-		media-libs/libdvdcss
-		sys-fs/udisks:2
-	)
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	hdhomerun? ( media-libs/libhdhomerun )
-	ieee1394? (
-		media-libs/libiec61883
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	lame? ( media-sound/lame )
-	lcd? ( app-misc/lcdproc )
-	libass? ( media-libs/libass:= )
-	lirc? ( app-misc/lirc )
-	nvdec? ( x11-drivers/nvidia-drivers )
-	opengl? ( dev-qt/qtopengl:5 )
-	pulseaudio? ( media-libs/libpulse )
-	systemd? ( sys-apps/systemd:= )
-	vaapi? ( media-libs/libva:= )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( media-libs/libvpx:= )
-	x264? (	media-libs/x264:= )
-	X? (
-		x11-apps/xinit
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXinerama:=
-		x11-libs/libXrandr:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		x11-misc/wmctrl:=
-	)
-	x265? (	media-libs/x265 )
-	xml? ( dev-libs/libxml2:2 )
-	xmltv? (
-		dev-perl/XML-LibXML
-		media-tv/xmltv
-	 )
-	xvid? ( media-libs/xvid )
-	zeroconf? (
-		dev-libs/openssl:=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/yasm
-	sys-kernel/linux-headers
-	x11-base/xorg-proto
-	perl? (
-		dev-perl/DBD-mysql
-		dev-perl/DBI
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		dev-perl/LWP-Protocol-https
-		dev-perl/Net-UPnP
-		dev-perl/XML-Simple
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	opengl? ( virtual/opengl )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/lxml[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-			dev-python/requests-cache[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-33.1-libva.patch
-	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch
-	"${FILESDIR}"/${PN}-33.1-linux-headers-6.5.patch
-)
-
-python_check_deps() {
-	use python || return 0
-	python_has_version "dev-python/python-dateutil[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/requests-cache[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use python && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# https://github.com/MythTV/mythtv/pull/824
-	# https://github.com/MythTV/mythtv/pull/838
-	# https://bugs.gentoo.org/888291
-	eapply -p2 "${FILESDIR}"/${PN}-33.1-python3.12.patch
-
-	# Perl bits need to go into vendor_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/Makefile || die "Cannot convert site_perl to vendor_perl!"
-
-}
-
-src_configure() {
-	local -a myconf=()
-
-	# Setup paths
-	myconf+=( --prefix="${EPREFIX}"/usr )
-	myconf+=( --libdir="${EPREFIX}"/usr/$(get_libdir) )
-	myconf+=( --libdir-name=$(get_libdir) )
-	myconf+=( --mandir="${EPREFIX}"/usr/share/man )
-
-	if use debug; then
-		myconf+=( --compile-type=debug )
-		myconf+=( --disable-stripping ) # FIXME: does not disable for all files, only for some
-		myconf+=( --enable-valgrind ) # disables timeouts for valgrind memory debugging
-	else
-		myconf+=( --compile-type=release )
-	fi
-
-	# Build boosters
-	has ccache "${FEATURES}" || myconf+=( --disable-ccache )
-	has distcc "${FEATURES}" || myconf+=( --disable-distcc )
-
-	# CPU settings
-	# Mythtv's configure is borrowed from ffmpeg,
-	# Bug #172723
-	# Try to get cpu type based on CFLAGS.
-	# 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.
-	local i
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
-		myconf+=( --cpu="${i}" )
-		break
-	done
-	myconf+=( $(use_enable cpu_flags_ppc_altivec altivec) )
-
-	# Sound Output Support
-	myconf+=(
-		$(use_enable oss audio-oss)
-
-		$(use_enable alsa audio-alsa)
-		$(use_enable jack audio-jack)
-		$(use_enable pulseaudio audio-pulseoutput)
-	)
-
-	# Input Support
-	myconf+=(
-		$(use_enable lirc)
-		$(use_enable input_devices_joystick joystick-menu)
-		$(use_enable cec libcec)
-		$(use_enable ieee1394 firewire)
-		$(use_enable hdhomerun)
-		$(use_enable vbox)
-		$(use_enable ceton)
-		$(use_enable v4l v4l2)
-		$(use_enable dvb)
-		$(use_enable asi)
-	)
-
-	# Video Output Support
-	myconf+=(
-		$(use_enable X x11)
-	)
-
-	# Hardware accelerators
-	myconf+=(
-		$(use_enable nvdec)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable opengl)
-		$(use_enable opengl egl)
-		$(use_enable libass)
-	)
-
-	# System tools
-	myconf+=(
-		$(use_enable systemd systemd_notify)
-		$(use_enable systemd systemd_journal)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf libdns-sd)
-	)
-
-	# Bindings
-	if use perl && use python; then
-		myconf+=( --with-bindings=perl,python )
-	elif use perl; then
-		myconf+=( --without-bindings=python )
-		myconf+=( --with-bindings=perl )
-	elif use python; then
-		myconf+=( --without-bindings=perl )
-		myconf+=( --with-bindings=python )
-	else
-		myconf+=( --without-bindings=perl,python )
-	fi
-	use python && myconf+=( --python="${EPYTHON}" )
-	myconf+=( $(use_enable java bdjava) )
-
-	# External codec library options (used for mythffmpeg and streaming transcode)
-	# lame is required for some broadcasts for silence detection of commercials
-	# default enable in IUSE with +lame
-	myconf+=(
-		$(use_enable lame libmp3lame)
-		$(use_enable xvid libxvid)
-		$(use_enable x264 libx264)
-		$(use_enable x265 libx265)
-		$(use_enable vpx libvpx)
-	)
-
-	# Clean up DSO load times and other compiler bits
-	myconf+=( --enable-symbol-visibility )
-	myconf+=( --enable-pic )
-
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) )
-		myconf+=( --cross-prefix="${CHOST}"- )
-	fi
-
-	# econf sets these options that are not handled by configure:
-	# --build --host --infodir --localstatedir --sysconfdir
-
-	edo ./configure \
-		--prefix="${EPREFIX}/usr" \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--qmake="$(qt5_get_bindir)"/qmake \
-		"${myconf[@]}"
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	use python && python_optimize  # does all packages by default
-	dodoc AUTHORS README
-	readme.gentoo_create_doc
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init-r3 mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
-	if use systemd; then
-		systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
-	fi
-
-	# The acct-user/mythtv package creates/manages the user 'mythtv'
-	keepdir /etc/mythtv
-	fowners -R mythtv /etc/mythtv
-	keepdir /var/log/mythtv
-	fowners -R mythtv /var/log/mythtv
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
-	insinto /usr/share/mythtv/contrib
-	# Ensure we don't install scripts needing the perl bindings (bug #516968) Finding none is OK.
-	if ! use perl; then
-		find contrib/ -name '*.pl' -exec rm {} \;
-	fi
-	# Ensure we don't install scripts needing the python bindings (bug #516968) Finding none is OK.
-	if ! use python; then
-		find contrib/ -name '*.py' -exec rm {} \;
-	fi
-	doins -r contrib/*
-
-	# Install our mythfrontend wrapper which is similar to Mythbuntu's
-	if use wrapper; then
-		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real" || die "Failed to install mythfrontend.real"
-		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-	fi
-
-	if use autostart; then
-		newenvd - 95mythtv <<- _EOF_
-			CONFIG_PROTECT=\"$(egethome mythtv)\"
-		_EOF_
-		insinto $(egethome mythtv)
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable but not files named "__init__.py"
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \
-		-exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable"
-
-	# Ensure that Python scripts are executed by Python 2
-	use python && python_fix_shebang "${ED}/usr/share/mythtv"
-
-	# Make shell & perl scripts executable
-	find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_config() {
-	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
-		"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-	fi
-}
diff --git a/media-tv/mythtv/mythtv-33.1-r2.ebuild b/media-tv/mythtv/mythtv-33.1-r2.ebuild
new file mode 100644
index 000000000000..61c42a783f0d
--- /dev/null
+++ b/media-tv/mythtv/mythtv-33.1-r2.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISABLE_AUTOFORMATTING="yes"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit edo flag-o-matic java-pkg-opt-2 python-any-r1
+inherit qmake-utils readme.gentoo-r1 systemd toolchain-funcs user-info
+
+DESCRIPTION="Open Source DVR and media center hub"
+HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
+if [[ ${PV} == *_p* ]] ; then
+	MY_COMMIT="5824c588db24b4e71a7d94e829e6419f71089297"
+	SRC_URI="https://github.com/MythTV/mythtv/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	# mythtv and mythplugins are separate builds in the github MythTV project
+	S="${WORKDIR}/mythtv-${MY_COMMIT}/mythtv"
+else
+	SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	# mythtv and mythplugins are separate builds in the github mythtv project
+	S="${WORKDIR}/${P}/mythtv"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE_VIDEO_CAPTURE_DEVICES="v4l ieee1394 hdhomerun vbox ceton"
+IUSE="alsa asi autostart cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb exif fftw jack java"
+IUSE+=" +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx"
+IUSE+=" +wrapper x264 x265 +xml xmltv +xvid +X zeroconf"
+IUSE+=" ${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
+REQUIRED_USE="
+	cdr? ( cdda )
+"
+
+RDEPEND="
+	acct-user/mythtv
+	dev-libs/glib:2
+	dev-libs/lzo
+	dev-libs/libzip:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[jpeg]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[mysql]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	media-fonts/tex-gyre
+	media-gfx/exiv2:=
+	media-libs/freetype:2
+	media-libs/libbluray:=[java?]
+	media-libs/libsamplerate
+	media-libs/libsoundtouch
+	media-libs/taglib
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	autostart? (
+		net-dialup/mingetty
+		x11-apps/xset
+		x11-wm/evilwm
+	)
+	cec? ( dev-libs/libcec )
+	dvd? (
+		dev-libs/libcdio:=
+		media-libs/libdvdcss
+		sys-fs/udisks:2
+	)
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	hdhomerun? ( media-libs/libhdhomerun )
+	ieee1394? (
+		media-libs/libiec61883
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	lame? ( media-sound/lame )
+	lcd? ( app-misc/lcdproc )
+	libass? ( media-libs/libass:= )
+	lirc? ( app-misc/lirc )
+	nvdec? ( x11-drivers/nvidia-drivers )
+	opengl? ( dev-qt/qtopengl:5 )
+	pulseaudio? ( media-libs/libpulse )
+	systemd? ( sys-apps/systemd:= )
+	vaapi? ( media-libs/libva:= )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( media-libs/libvpx:= )
+	x264? (	media-libs/x264:= )
+	X? (
+		x11-apps/xinit
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXinerama:=
+		x11-libs/libXrandr:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		x11-misc/wmctrl:=
+	)
+	x265? (	media-libs/x265 )
+	xml? ( dev-libs/libxml2:2 )
+	xmltv? (
+		dev-perl/XML-LibXML
+		media-tv/xmltv
+	)
+	xvid? ( media-libs/xvid )
+	zeroconf? (
+		dev-libs/openssl:=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/yasm
+	sys-kernel/linux-headers
+	x11-base/xorg-proto
+	perl? (
+		dev-perl/DBD-mysql
+		dev-perl/DBI
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-UPnP
+		dev-perl/XML-Simple
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=dev-java/ant-1.10.14-r3 )
+	opengl? ( virtual/opengl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/mysqlclient[${PYTHON_USEDEP}]
+			dev-python/requests-cache[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-33.1-libva.patch
+	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch
+	"${FILESDIR}"/${PN}-33.1-linux-headers-6.5.patch
+)
+
+python_check_deps() {
+	use python || return 0
+	python_has_version "dev-python/python-dateutil[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/requests-cache[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use python && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	cat > external/libmythbluray/src/libbluray/bdj/build.properties <<-EOF
+		java_version_asm=1.8
+		java_version_bdj=1.8
+	EOF
+	# https://github.com/MythTV/mythtv/pull/824
+	# https://github.com/MythTV/mythtv/pull/838
+	# https://bugs.gentoo.org/888291
+	eapply -p2 "${FILESDIR}"/${PN}-33.1-python3.12.patch
+
+	# Perl bits need to go into vendor_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile || die "Cannot convert site_perl to vendor_perl!"
+
+}
+
+src_configure() {
+	local -a myconf=()
+
+	# Setup paths
+	myconf+=( --prefix="${EPREFIX}"/usr )
+	myconf+=( --libdir="${EPREFIX}"/usr/$(get_libdir) )
+	myconf+=( --libdir-name=$(get_libdir) )
+	myconf+=( --mandir="${EPREFIX}"/usr/share/man )
+
+	if use debug; then
+		myconf+=( --compile-type=debug )
+		myconf+=( --disable-stripping ) # FIXME: does not disable for all files, only for some
+		myconf+=( --enable-valgrind ) # disables timeouts for valgrind memory debugging
+	else
+		myconf+=( --compile-type=release )
+	fi
+
+	# Build boosters
+	has ccache "${FEATURES}" || myconf+=( --disable-ccache )
+	has distcc "${FEATURES}" || myconf+=( --disable-distcc )
+
+	# CPU settings
+	# Mythtv's configure is borrowed from ffmpeg,
+	# Bug #172723
+	# Try to get cpu type based on CFLAGS.
+	# 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.
+	local i
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[[ "${i}" == "native" ]] && i="host" # bug #273421
+		myconf+=( --cpu="${i}" )
+		break
+	done
+	myconf+=( $(use_enable cpu_flags_ppc_altivec altivec) )
+
+	# Sound Output Support
+	myconf+=(
+		$(use_enable oss audio-oss)
+
+		$(use_enable alsa audio-alsa)
+		$(use_enable jack audio-jack)
+		$(use_enable pulseaudio audio-pulseoutput)
+	)
+
+	# Input Support
+	myconf+=(
+		$(use_enable lirc)
+		$(use_enable input_devices_joystick joystick-menu)
+		$(use_enable cec libcec)
+		$(use_enable ieee1394 firewire)
+		$(use_enable hdhomerun)
+		$(use_enable vbox)
+		$(use_enable ceton)
+		$(use_enable v4l v4l2)
+		$(use_enable dvb)
+		$(use_enable asi)
+	)
+
+	# Video Output Support
+	myconf+=(
+		$(use_enable X x11)
+	)
+
+	# Hardware accelerators
+	myconf+=(
+		$(use_enable nvdec)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable opengl)
+		$(use_enable opengl egl)
+		$(use_enable libass)
+	)
+
+	# System tools
+	myconf+=(
+		$(use_enable systemd systemd_notify)
+		$(use_enable systemd systemd_journal)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf libdns-sd)
+	)
+
+	# Bindings
+	if use perl && use python; then
+		myconf+=( --with-bindings=perl,python )
+	elif use perl; then
+		myconf+=( --without-bindings=python )
+		myconf+=( --with-bindings=perl )
+	elif use python; then
+		myconf+=( --without-bindings=perl )
+		myconf+=( --with-bindings=python )
+	else
+		myconf+=( --without-bindings=perl,python )
+	fi
+	use python && myconf+=( --python="${EPYTHON}" )
+	myconf+=( $(use_enable java bdjava) )
+
+	# External codec library options (used for mythffmpeg and streaming transcode)
+	# lame is required for some broadcasts for silence detection of commercials
+	# default enable in IUSE with +lame
+	myconf+=(
+		$(use_enable lame libmp3lame)
+		$(use_enable xvid libxvid)
+		$(use_enable x264 libx264)
+		$(use_enable x265 libx265)
+		$(use_enable vpx libvpx)
+	)
+
+	# Clean up DSO load times and other compiler bits
+	myconf+=( --enable-symbol-visibility )
+	myconf+=( --enable-pic )
+
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) )
+		myconf+=( --cross-prefix="${CHOST}"- )
+	fi
+
+	# econf sets these options that are not handled by configure:
+	# --build --host --infodir --localstatedir --sysconfdir
+
+	edo ./configure \
+		--prefix="${EPREFIX}/usr" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--qmake="$(qt5_get_bindir)"/qmake \
+		"${myconf[@]}"
+}
+
+src_install() {
+	emake STRIP="true" INSTALL_ROOT="${D}" install
+	use python && python_optimize  # does all packages by default
+	dodoc AUTHORS README
+	readme.gentoo_create_doc
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r3 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	if use systemd; then
+		systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
+	fi
+
+	# The acct-user/mythtv package creates/manages the user 'mythtv'
+	keepdir /etc/mythtv
+	fowners -R mythtv /etc/mythtv
+	keepdir /var/log/mythtv
+	fowners -R mythtv /var/log/mythtv
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968) Finding none is OK.
+	if ! use perl; then
+		find contrib/ -name '*.pl' -exec rm {} \;
+	fi
+	# Ensure we don't install scripts needing the python bindings (bug #516968) Finding none is OK.
+	if ! use python; then
+		find contrib/ -name '*.py' -exec rm {} \;
+	fi
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real" || die "Failed to install mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		newenvd - 95mythtv <<- _EOF_
+			CONFIG_PROTECT=\"$(egethome mythtv)\"
+		_EOF_
+		insinto $(egethome mythtv)
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable but not files named "__init__.py"
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \
+		-exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable"
+
+	# Ensure that Python scripts are executed by Python 2
+	use python && python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; \
+		|| die "Failed to make script executable"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_config() {
+	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+		"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+	fi
+}
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index ba9c5986a979..1c05b2acefaa 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,12 +1,8 @@
-DIST plexmediaserver_1.40.2.8395-c67dce28e_amd64.deb 82029834 BLAKE2B 3f0acd1d8dc554ee4539c0dc36976935c975b2ed54824805835d490d33d4d8319f5c67ec2926ca253fd1dcac97b3daad13e98e2a80f35403cf2d7c58f25786f5 SHA512 6a20b3e9af5097667fed5768262fcb4c5182cbf0db9edf2f8870e41063191c1420ea4a1e9abd39a5168a37b9445088e61d167731c9b5f3914d7c4ff25834ceb5
-DIST plexmediaserver_1.40.2.8395-c67dce28e_arm64.deb 73766282 BLAKE2B d0ddf6718465aeae596c1a8391962b576beceb4cfdb3a23eee1bf18585e8fb42c0409ef3fbc43fd09a8977a1fa9143ea20fa8432accfc6e4bda7622bed59bfaf SHA512 58269cba44aaecb7c7720517bcdc3baee2cf42b265c6c910066459cfb462f9ccd5dd88fe2fa43bc19954782a5a6f4525d7436158a0662b80ce422cc7896f0922
-DIST plexmediaserver_1.40.2.8395-c67dce28e_armhf.deb 70899814 BLAKE2B 87cb5cd21ed08f11609063a1836c51413193bec3a0fe4ba81212fd8383136805c591875ad42d170f08f41e986c50679841db6b4ba7517b9e78a01af7f4a5b8d5 SHA512 744d19fd708ab8e77fbeac15ad52069105ec92b7c391b1452e92417adaf7bfbb6d70d6fcabc556ea5467631433db08bbfea83fe7fa4e0b1462b473f32d6b91d6
-DIST plexmediaserver_1.40.2.8395-c67dce28e_i386.deb 74590626 BLAKE2B fa42e617a02c3403a7fc2d45bb6c7e56a78ebfcf7bc34f45da2cc67a912a163001ef2f87383abde7d5de51e74bbcd439abd12e866f8106d4e7fd5a67e0172755 SHA512 89a6905b662a83e0af9872a1cf801ba1fa9b08976a606ef64fdee61f49709f0c5b4e3d2acd6d9e0e4e7605a16401902f5282ecb1a39f47833591dc054d3dedc2
-DIST plexmediaserver_1.40.3.8555-fef15d30c_amd64.deb 81659190 BLAKE2B 021322da3442e4288f6fd4b2cb9081073a9fdbce4039a6c518a1357c294369cbd571b2e51284cbd67e427118448919a189be65455e53378d2a5ec0fae9b0e300 SHA512 145f90d31d6384358b06d0fc9b0d7712435607b8806e16b84e8110190fe192ac7e86da4730d1de33ea824dd8c79026f69d315906e1a0ac3e418ba6ab8a862e1c
-DIST plexmediaserver_1.40.3.8555-fef15d30c_arm64.deb 73914470 BLAKE2B 901386536c2540230217fac7cbb37566fde4e5f809f4e1d0fc381a44974cad5ae13dbc7a9e7af62e9b138b8e4d40d726afef7c5813f2eef846e21e372f2152e1 SHA512 c15a6a454a0c0d09c75e02db93f6eec45d7127bfb38354bd565b5b83ec133dd8e32413a079a91d623987381e0eac02f5c0c43ff2b0cf8e08343699d70ceabf05
-DIST plexmediaserver_1.40.3.8555-fef15d30c_armhf.deb 73976334 BLAKE2B 4953ac4bc1e9138795c0abd0c04e9f83f4243d607bdcd40ba71ef8cbc646ffbc73139317f1218a499bc0e2da010ec4fe567da8fff20ceac0adee906e5012732e SHA512 a357385aa0424dc3b91299381eaa86a4dcc117009d2aab4cc6c079755a981c2de3ea23134400adaa7165f0621ae5679c4e33774c12aa0875ab32086d2de32e79
-DIST plexmediaserver_1.40.3.8555-fef15d30c_i386.deb 74919610 BLAKE2B 2303ebff407951a25442b26b812c45b535a5ad63b5988ecb63227e27335218c6972593144332308ba751d9ea9f4636a109fba5ec73b5aee36b0c0880ffaa0558 SHA512 2322db24d4dd1744bc42d1b94dda02477a328ae0cab06367031ede4a860f481b78358270c2e923e5fa3b5662fe5b546d11a964dec98582e3631159f3864121a2
-DIST plexmediaserver_1.40.4.8679-424562606_amd64.deb 81712638 BLAKE2B 9785f29c07e9d386a87f076703695c80e46c455a1eb9eb90dca33ce15c2707f774f729965471017e529dee6a51ed9e0cf0df98ebc3dedf478dd3d16da94a7f91 SHA512 58ef48a78e79047dbc00866959f1df15ee36cec445e3b88ee69b623636f1d6bb10001587e13d13851a3c24f298e2d12bb7da6946cf6b99b9c5fb4564e83ca201
-DIST plexmediaserver_1.40.4.8679-424562606_arm64.deb 73952850 BLAKE2B 1df7cb2b29aae0698947ecc8c6a07c848ae0daa3880a7256c79c043692922c10ef838646c0e69679948f5bfee3b4cd025f327719d959f87f68d77f93bc8898c5 SHA512 6d6285a806367324df980f6eed1036726e8ee779956c11035ed01edb908816f4713483b803406c4bc306c43432210c3c74ae8aa8361930954d1c61810ce639b6
-DIST plexmediaserver_1.40.4.8679-424562606_armhf.deb 74224106 BLAKE2B dd48f29d8e73544d0ab2076108a3cc50bbd63537b61c251041ae69bf60457baecd5333fb52315c7cd5b2a4c4d459f0f8d0d307d4ed9650908390f391d51fccb0 SHA512 247bab93068639ae6213c11d6c8ca598666bca73f7a2a51463665c00f471f9fe9523bdfeeee6fbcce3d2a50cd50dec2e5070903154490719e7814f34fe87111e
-DIST plexmediaserver_1.40.4.8679-424562606_i386.deb 74868902 BLAKE2B cde6382b33a7c7d9c2d30df05251d0f15263e7a530561fe22b484526bec94f0b1456d757c30b3c336b7b44ad5bfd8596e655a2312260404d05beba2e39276ab0 SHA512 511e6449a15736c5ce2fa067f4574dd2c36bbd1f41bd10854127cdc111bc0916370486448324a9e23654c7a79c13159351470a0fc11e86c3559300e5b2f23b1e
+DIST plexmediaserver_1.40.5.8854-f36c552fd_amd64.deb 81245190 BLAKE2B 66055a6e0ba0b8e84e791bae201b9b640baa94a0147eb0f54f07f124757b597b807c67fbc274fc8e64f05e1f17c437f6d9c7baeaa6b364917277e9afbfb03db3 SHA512 2a53305bea57c59626b7f83213c71f02c7766142c3eaf416aba86e9754a128686c95688574e1bb206807fb5d4b1b02a9ba837870e17a0d447dafaecd6b50de90
+DIST plexmediaserver_1.40.5.8854-f36c552fd_arm64.deb 73833094 BLAKE2B 9c0354f9363867cc68db0ce796a0ecf77252cfe3249e9245159db2bdeeede37d794492d98fffe3857e3fb69d66e16c27584b225fec7118379775b0ee975bd907 SHA512 b004e855005e88188818ea961e23037191873e7f39c23b5fa337995686da58706313817a6791b653b4d07304643adac2388a5d4d3d1b28643f9f118db14d82b1
+DIST plexmediaserver_1.40.5.8854-f36c552fd_armhf.deb 74086042 BLAKE2B 2b74a5789a354af9122e5b9ae2358d9cbc433a85cb3f52b850539ab13dd24aefdd1dc4cadc37953ac0be5d3e55293f12a80b96c04e298a4ed89e850a2067577f SHA512 aff06f07e419adc3aa6afb260115986154d768d00f3406bb51d4ef0334bffe076875e3af208575f719c3b3a23d477dbe67e23999bec620df851cb7be1555f1bc
+DIST plexmediaserver_1.40.5.8854-f36c552fd_i386.deb 74784106 BLAKE2B 4e3818583709cfd4fc4d28152bf4692e221d1bafbef9dcd306e8c939b526563d9e7d7773c8dcf0562725d5e2d9287f22c7ad421f390d738866a39d07bef46a73 SHA512 8e137f5565f5cfc36fdb80c64abb7b9c7b5e0054da97c44f3d5ff73e8b00ebd8a8e7cba0bec79a2ff0ca9fb7c9e42e593c9211813538fe758b66a7522e55ed39
+DIST plexmediaserver_1.40.5.8921-836b34c27_amd64.deb 81250582 BLAKE2B 4d99c06a141744ecdf595a3bd1472e5b2530b481e1f91f75072fa28b11996bb7d3e0a6808f37e98c0c2db315eb7d69a8687edffb4d00c92974e826e88cf08571 SHA512 71e0b0b0e614dee395461dc511afa4e71ad7a5dfb803116f21ea6210c0d4940b0e08b825eb485fdbf88054ec4dd41b97f0b0158e683ab262f4fa36984e24314a
+DIST plexmediaserver_1.40.5.8921-836b34c27_arm64.deb 73844562 BLAKE2B 7310ceb9c7af6da0e62a9cc55405d6f63aa99e8f9563b25b5fa66887ca17ca34d78f39357cfb521ac5e01cafd6c3195238a87994542cd5dc60468e2e392ab206 SHA512 29f60923d8ea0b28218aaba0d962aa25c90f652d5b8b4e93573171e7b3521e2b18b4bb9a5381dec78cf61ebafc7595e93647f10f836086de6a3edda17d58975f
+DIST plexmediaserver_1.40.5.8921-836b34c27_armhf.deb 74074378 BLAKE2B a81bb2038c52d6bb9299c6bc51f22b3c896d54bdb3c07cba5aa09daaf03cb34e45c88cef7753e6ce409445a0a6e022b7d712a2cc7a21dbc9bc0d50eed42d851a SHA512 77c2b90c2fef476573ca4a7f7874ff5f3356c9cabf733bd33e16687469a28d6b97bd5a80d8900a94309cef34c473164f6d698029370e99fc8ca04d141b2805b4
+DIST plexmediaserver_1.40.5.8921-836b34c27_i386.deb 74786146 BLAKE2B 8bbd8c3f60103c8048553c3d80e7ff045e79debf6f021c606501328cc61f4e270723d977fbef5ae4fbf9975542331eb83009f313ff93cfd964eff14528eed6a2 SHA512 914cf58fc2458b82c68a64c10845ff30c7146d3bd0ea4c47eefc5089c0b7d8e12a946d6557e48b61f0e9532aa1d98b56ecddf527d453d9340376856a93123a9f
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.2.8395.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.2.8395.ebuild
deleted file mode 100644
index 165fb8db5c54..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.40.2.8395.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 readme.gentoo-r1 systemd unpacker pax-utils
-
-MY_PV="${PV}-c67dce28e"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
-	arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
-"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm arm64 ~x86"
-RESTRICT="bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}.service.patch"
-)
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-BINS_TO_PAX_MARK=(
-	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
-	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	# Install the OpenRC init/conf files
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	# Install systemd service file
-	systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
-
-	# Add pax markings to some binaries so that they work on hardened setup
-	local f
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	einfo
-	ewarn "IMPORTANT: This version makes changes to the database which will require 1.31.2 or higher to start"
-	ewarn "Please also be patient when updating to this version, initial run may take time as database is upgraded"
-	ewarn "Full release announcement, including instructions for rollback: https://forums.plex.tv/t/plex-media-server/30447/612"
-
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.3.8555.ebuild
deleted file mode 100644
index 9647666c641b..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.40.3.8555.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
-
-inherit readme.gentoo-r1 systemd unpacker pax-utils
-
-MY_PV="${PV}-fef15d30c"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
-	arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
-"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm arm64 ~x86"
-RESTRICT="bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}.service.patch"
-)
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-BINS_TO_PAX_MARK=(
-	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
-	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	# Install the OpenRC init/conf files
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	# Install systemd service file
-	systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
-
-	# Add pax markings to some binaries so that they work on hardened setup
-	local f
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.4.8679.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.4.8679.ebuild
deleted file mode 100644
index 6dd77f9a9ed1..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.40.4.8679.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
-
-inherit readme.gentoo-r1 systemd unpacker pax-utils
-
-MY_PV="${PV}-424562606"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
-	arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
-"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}.service.patch"
-)
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	# Install the OpenRC init/conf files
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	# Install systemd service file
-	systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
-
-	# Add pax markings to some binaries so that they work on hardened setup
-	BINS_TO_PAX_MARK=(
-		"${ED}/usr/lib/plexmediaserver/Plex Script Host"
-		"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
-	)
-
-	local f
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.5.8854.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.5.8854.ebuild
new file mode 100644
index 000000000000..a94f1991c0c0
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.40.5.8854.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd unpacker pax-utils
+
+MY_PV="${PV}-f36c552fd"
+MY_URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="Free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
+	arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
+	arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
+"
+S="${WORKDIR}"
+
+LICENSE="Plex"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm arm64 ~x86"
+RESTRICT="bindist"
+
+DEPEND="
+	acct-group/plex
+	acct-user/plex"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}.service.patch"
+)
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/plexmediaserver/lib/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
+)
+
+src_install() {
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	keepdir /var/log/pms
+	fowners plex:plex /var/log/pms
+
+	keepdir /var/lib/plexmediaserver
+	fowners plex:plex /var/lib/plexmediaserver
+
+	# Install the OpenRC init/conf files
+	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+
+	# Install systemd service file
+	systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	BINS_TO_PAX_MARK=(
+		"${ED}/usr/lib/plexmediaserver/Plex Script Host"
+		"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
+	)
+
+	local f
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+
+	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+	# so it doesn't try to rebuild libraries that can't be rebuilt.
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/80plexmediaserver
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-tv/plex-media-server/plex-media-server-1.40.5.8921.ebuild b/media-tv/plex-media-server/plex-media-server-1.40.5.8921.ebuild
new file mode 100644
index 000000000000..c0d545ff7b87
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.40.5.8921.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd unpacker pax-utils
+
+MY_PV="${PV}-836b34c27"
+MY_URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="Free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
+	arm? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_armhf.deb )
+	arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
+"
+S="${WORKDIR}"
+
+LICENSE="Plex"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist"
+
+DEPEND="
+	acct-group/plex
+	acct-user/plex"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}.service.patch"
+)
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/plexmediaserver/lib/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
+)
+
+src_install() {
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	keepdir /var/log/pms
+	fowners plex:plex /var/log/pms
+
+	keepdir /var/lib/plexmediaserver
+	fowners plex:plex /var/lib/plexmediaserver
+
+	# Install the OpenRC init/conf files
+	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+
+	# Install systemd service file
+	systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	BINS_TO_PAX_MARK=(
+		"${ED}/usr/lib/plexmediaserver/Plex Script Host"
+		"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
+	)
+
+	local f
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+
+	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+	# so it doesn't try to rebuild libraries that can't be rebuilt.
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/80plexmediaserver
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
deleted file mode 100644
index eaca215a25f2..000000000000
--- a/media-tv/v4l-utils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
deleted file mode 100644
index 0ee28643ea1c..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-SSP doesn't make sense for BPF.
-
-https://bugs.gentoo.org/889561
---- a/utils/keytable/Makefile.am
-+++ b/utils/keytable/Makefile.am
-@@ -22,7 +22,7 @@ ir_keytable_LDFLAGS = $(ARGP_LIBS)
- 
- if WITH_BPF
- ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS)
--ir_keytable_CFLAGS = $(LIBBPF_CFLAGS)
-+ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) -fno-stack-protector
- SUBDIRS = bpf_protocols
- endif
- 
---- a/utils/keytable/bpf_protocols/Makefile.am
-+++ b/utils/keytable/bpf_protocols/Makefile.am
-@@ -8,7 +8,7 @@ CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \
-         | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
- 
- %.o: %.c bpf_helpers.h
--	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -c $<
-+	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -fno-stack-protector -c $<
- 
- PROTOCOLS = grundig.o pulse_distance.o pulse_length.o rc_mm.o manchester.o xbox-dvd.o imon_rsc.o raw.o samsung36.o
- 
diff --git a/media-tv/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml
deleted file mode 100644
index a320ecd97a79..000000000000
--- a/media-tv/v4l-utils/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="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
-<use>
-	<flag name="bpf">Enables support for IR BPF decoders.</flag>
-</use>
-</pkgmetadata>
diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
deleted file mode 100644
index 1294a25de248..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs udev xdg
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="+bpf dvb opengl qt5 +udev"
-
-RDEPEND="
-	>=media-libs/libv4l-${PV}[dvb?]
-	bpf? (
-		<dev-libs/libbpf-1:=
-		virtual/libelf:=
-	)
-	udev? ( virtual/libudev )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
-		media-libs/alsa-lib
-	)
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
-"
-
-# Not really prebuilt but BPF objects make our QA checks go crazy.
-QA_PREBUILT="*/rc_keymaps/protocols/*.o"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.22.1-no-stack-protector-bpf.patch
-)
-
-check_llvm() {
-	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
-		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
-		${clang} -target bpf -print-supported-cpus &>/dev/null ||
-			die "${clang} does not support the BPF target. Please check LLVM_TARGETS."
-	fi
-}
-
-pkg_pretend() {
-	has_version -b sys-devel/clang && check_llvm
-}
-
-pkg_setup() {
-	check_llvm
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use qt5; then
-		local qt5_paths=( \
-			MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
-			UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
-			RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
-		)
-		if ! use opengl; then
-			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
-		fi
-	fi
-
-	# Hard disable the flags that apply only to the libs.
-	econf \
-		--disable-static \
-		$(use_enable dvb libdvbv5) \
-		$(use_enable qt5 qv4l2) \
-		$(use_enable qt5 qvidcap) \
-		$(use_enable bpf) \
-		--without-jpeg \
-		$(use_with udev libudev) \
-		--with-udevdir="$(get_udevdir)" \
-		"${qt5_paths[@]}"
-}
-
-src_install() {
-	emake -C utils DESTDIR="${D}" install
-	emake -C contrib DESTDIR="${D}" install
-
-	dodoc README
-	newdoc utils/libv4l2util/TODO TODO.libv4l2util
-	newdoc utils/libmedia_dev/README README.libmedia_dev
-	newdoc utils/dvb/README README.dvb
-	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use udev && udev_reload
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
-		ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
-		ewarn "you may need to take action to avoid breakage. See"
-		ewarn "https://bugs.gentoo.org/767175 for more details."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use udev && udev_reload
-}
diff --git a/media-tv/v4l-utils/v4l-utils-1.26.ebuild b/media-tv/v4l-utils/v4l-utils-1.26.ebuild
deleted file mode 100644
index 179042a3715e..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.26.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="Transitional package to be superseded by media-libs/libv4l[utils]"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="+bpf dvb qt5"
-
-RDEPEND=">=media-libs/libv4l-${PV}[utils,bpf?,dvb?,qt5?]"
diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest
deleted file mode 100644
index d48b0ef5b348..000000000000
--- a/media-video/bdsup2sub/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bdsup2sub-4.0.0.tar.xz 199796 BLAKE2B 293c7d0433103a3087fb057b938b1cf2d42acc01ccdeb8c815f124c3a6b61f20bb211d88f9f4a7e516f4f7aa54200d2c1ec36adbfe700321543f27a9408269f4 SHA512 d12f5ddde2b9fec9dc50a43212db52f068852c972c0ee559dbe7f56490d7082eb1f603413a17737f791450d7f1458ed5ba39fda9a7a1349af03c07a0173c13a6
-DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild
deleted file mode 100644
index 8246c205b408..000000000000
--- a/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit desktop java-pkg-2 java-ant-2
-
-XDG_P="xdg-20100731"
-
-MY_PN="BDSup2Sub"
-
-DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
-HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
-SRC_URI="
-	http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}/${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-xdg.patch" )
-
-src_prepare() {
-	default
-
-	# apply XDG patch
-	cp -v "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
-}
-
-src_compile() {
-	eant build $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar "dist/${MY_PN}.jar"
-	java-pkg_dolauncher "${PN}" --main "${MY_PN}" --java_args -Xmx256m
-	newicon bin_copy/icon_32.png "${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" "${MY_PN}" "${MY_PN}"
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}
diff --git a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch
deleted file mode 100644
index 3f68beb6d495..000000000000
--- a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/deadbeef/SupTools/Core.java	2010-07-29 13:01:48.000000000 +0200
-+++ b/src/deadbeef/SupTools/Core.java	2010-08-01 02:19:25.215473885 +0200
-@@ -22,6 +22,8 @@
- import deadbeef.Tools.Props;

- import deadbeef.Tools.ToolBox;

- 

-+import xdg.*;

-+

- /*

-  * Copyright 2009 Volker Oth (0xdeadbeef)

-  *

-@@ -750,6 +752,7 @@
- 			cliMode = false;

- 			String s = c.getClass().getName().replace('.','/') + ".class";

- 			URL url = c.getClass().getClassLoader().getResource(s);

-+			/*

- 			int pos;

- 			try {

- 				fnameProps = URLDecoder.decode(url.getPath(),"UTF-8");

-@@ -767,6 +770,8 @@
- 					fnameProps = fnameProps.substring(0,pos+1);

- 			}

- 			fnameProps += Core.iniName;

-+			*/

-+			fnameProps = xdg.config_home() + "/" + Core.iniName;

- 

- 			// read properties from ini file

- 			props = new Props();

-@@ -905,8 +910,10 @@
- 	 * Write properties

- 	 */

- 	public static void storeProps() {

--		if (props != null)

-+		if (props != null) {

-+			xdg.mkdirs_file(fnameProps);

- 			props.save(fnameProps);

-+		}

- 	}

- 	

- 	/**

diff --git a/media-video/bdsup2sub/files/build-4.0.0.xml b/media-video/bdsup2sub/files/build-4.0.0.xml
deleted file mode 100644
index 9aab31c3a5e1..000000000000
--- a/media-video/bdsup2sub/files/build-4.0.0.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="BDSup2Sub" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="src" />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="apidocs" />
-	<property name="dist.dir" value="dist" />
-	<property name="resources.dir" value="bin_copy" />
-	<property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
-	<property name="target.jdk" value="1.6" />
-
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${docs.dir}" />
-		<mkdir dir="${build.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<javac srcdir="${src.dir}"
-			destdir="${build.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}"
-			encoding="ISO-8859-1"/>
-		<copy todir="${build.dir}">
-			<fileset dir="${resources.dir}" />
-		</copy>
-	</target>
-
-	<!-- build the jar files -->
-	<target name="build" depends="compile">
-		<jar jarfile="${project.jar}" basedir="${build.dir}">
-			<manifest>
-				<attribute name="Main-Class" value="${ant.project.name}" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="javadoc" depends="init">
-		<javadoc sourcepath="${src.dir}"
-			packagenames="*"
-           		destdir="${docs.dir}"
-           		author="true"
-           		version="true"
-			use="true"
-			charset="UTF-8"
-			encoding="ISO-8859-1"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-        <!-- zip the sources -->
-        <target name="sourcezip">
-		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
-                        <zipfileset dir="${src.dir}" />
-                </zip>
-        </target>
-
-</project>
diff --git a/media-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml
deleted file mode 100644
index a2dfee954457..000000000000
--- a/media-video/bdsup2sub/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>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 5c5c58f892d0..0b55534a0ff4 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -2,3 +2,4 @@ DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 53b805354b55f1dfbe2341b767aaccc
 DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd SHA512 8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c
 DIST ffmpeg-chromium-127.tar.xz 10418192 BLAKE2B 2a623ee8e2c0940e4067e6ebecaecdc64c45b16022327a84d77323348c210b091c58eb52b4afea1f2918cd29a27c3457a3294f561a5e6ee2db28c63f432b23bd SHA512 0cddb21761ad3b54f5393d3963ca94518cb4ab8183f2bbe975f8419bd94d8b20131750a22d75fd56b304a2b83be364993a839f727342b7eed6a2d1868f79af4c
 DIST ffmpeg-chromium-128.tar.xz 10420280 BLAKE2B 0b5b3ca891445042c9c1a27713b57a0d99f75fd2d57116b89afa1020dde61a1b2d3d14e0c6d639a17fd0b45359e803580100c600e6ac99eb383630512ab8402b SHA512 a420da69c49c11bf49229066f7f08d837d8bfacfa47c659b8c3e5bb28426b65749a16ce221bf2996541902f2d55750c43e75596102a6449cdf4a845cbad777dc
+DIST ffmpeg-chromium-129.tar.xz 10424032 BLAKE2B dbe0b8c2d799958660b6a3ca0f1a8e68a8f5b81ef813f2837b1c66bc03a9200cc8273b6c077fec5402157701cd341ce75055d39aac7b78e5af39537285a0bb8a SHA512 c6ac36f41cc7eed353b92809a481dd783ca52eabc15a10d6a41cb241e2ad8a25cb2467b62c671f303f90b6b3bb1497a196b4488457832fb5b51a796de20ca49c
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild
index 6b5bd6600a97..947eddc83b5d 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild
@@ -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-129.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild
new file mode 100644
index 000000000000..c5b82639dda6
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT=14d16cd143ad1993900c276e37592956702443a9
+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 >=dev-lang/yasm-1.3 ) )
+"
+
+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
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	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 745b007c9410..2c622807c410 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,12 +1,18 @@
 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.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac4e858960c07e244ec3dbcea8f9e9fbdec4ff20b64227afad5ea5d0b05eff79a905f8002314ab4e9c37116c1908 SHA512 8a86b2db4a9abb68bb86d770ba1babb76c8b8313cfb0258ae70c88e736a93b99c342a6ecda94b739e8e7c103bed75d4afd756dd94e08c6255f424ef62c264741
 DIST ffmpeg-6.0.1.tar.xz.asc 520 BLAKE2B dc7222c7c55e9af28c54dcfae4fce33fb44aa2a7e9d2ca4af85a961568b67f63116a6597234cd7ce009669b8ecf6576defd9380c389356435ffc3026b1126f03 SHA512 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c
 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
 DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f
 DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969aef972cf85bd8bf33643da08b2a224b2ea7c369a58e62fb758c0e8747c6cc6694672b889016fdb16b3d33f530 SHA512 cf65f68f6b0fa351d273c1b4fd74fca63a40cbd802bcd14124018784164fd1c6a09de3d9b0e0631eaf4c8b4fbcb846cc47a7831ad70eb0cfac6d21a51bd09941
diff --git a/media-video/ffmpeg/ffmpeg-4.4.5.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5.ebuild
new file mode 100644
index 000000000000..805cf2c0a13c
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.4.5.ebuild
@@ -0,0 +1,618 @@
+# 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+=" 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 ~ia64 ~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? ( >=sys-devel/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-get_cabac_inline_x86-32-bit.patch
+	"${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch
+	"${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch
+	"${FILESDIR}"/${PN}-4.4.4-glslang.patch
+	"${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch
+	"${FILESDIR}"/${PN}-4.4.5-incmptbl-pntr-types.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=( )
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	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"
+
+	use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override
+}
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
new file mode 100644
index 000000000000..3b04397ceda1
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -0,0 +1,621 @@
+# 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-6.1-r3.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 )
+		)
+	"
+
+	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}"
+
+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 ~ia64 ~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 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 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}] )
+	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}] )
+	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.255:=[${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.255 )
+"
+
+# += 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? ( >=sys-devel/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 )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	!test? ( test )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r2.patch
+	"${FILESDIR}"/${PN}-6.1-wint-conversion.patch
+	"${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch
+	"${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
+	"${FILESDIR}"/${PN}-6.1-gcc-14.patch
+	"${FILESDIR}"/${PN}-6.0.1-alignment.patch
+	"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-libgcrypt.patch
+	"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.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 )
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	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?)
+		--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)
+	)
+
+	# 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"
+
+	use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`"
+}
diff --git a/media-video/ffmpeg/ffmpeg-7.0.2.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2.ebuild
new file mode 100644
index 000000000000..6bb51288794a
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-7.0.2.ebuild
@@ -0,0 +1,623 @@
+# 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 ~ia64 ~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? ( >=sys-devel/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 )
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	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)
+	)
+
+	# 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"
+
+	use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override
+}
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch b/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch
new file mode 100644
index 000000000000..a47a62917a29
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/936433
+
+diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
+index 4b81bd1..4e7f49f 100644
+--- a/libavutil/hwcontext_vaapi.c
++++ b/libavutil/hwcontext_vaapi.c
+@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
+     uint32_t va_fourcc;
+     int err, i, j, k;
+ 
+-    unsigned long buffer_handle;
++    uintptr_t buffer_handle;
+     VASurfaceAttribExternalBuffers buffer_desc;
+     VASurfaceAttrib attrs[2] = {
+         {
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch b/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch
deleted file mode 100644
index a06b9119666f..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-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=cc703cf60759d9798f440a9417e4efa2fcbe2747
-https://sourceware.org/PR30578
-https://gcc.gnu.org/PR108941
-
-From cc703cf60759d9798f440a9417e4efa2fcbe2747 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/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch
deleted file mode 100644
index 2c71a189329a..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=58f18df430d48e47a82c5e740d6e63a50c97d75f
-
-From 58f18df430d48e47a82c5e740d6e63a50c97d75f Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
-Date: Thu, 2 Mar 2023 17:27:30 +0100
-Subject: [PATCH] lavu/vulkan: fix handle type for 32-bit targets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fixes compilation with clang which errors out on Wint-conversion.
-
-Signed-off-by: Kacper MichajÅow <kasper93@gmail.com>
-Signed-off-by: Martin Storsjö <martin@martin.st>
-(cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264)
-Signed-off-by: Martin Storsjö <martin@martin.st>
---- a/libavutil/hwcontext_vulkan.c
-+++ b/libavutil/hwcontext_vulkan.c
-@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
- 
-     av_freep(&cmd->queues);
-     av_freep(&cmd->bufs);
--    cmd->pool = NULL;
-+    cmd->pool = VK_NULL_HANDLE;
- }
- 
- static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
---- a/libavutil/vulkan.h
-+++ b/libavutil/vulkan.h
-@@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline {
-     VkDescriptorSetLayout         *desc_layout;
-     VkDescriptorPool               desc_pool;
-     VkDescriptorSet               *desc_set;
-+#if VK_USE_64_BIT_PTR_DEFINES == 1
-     void                         **desc_staging;
-+#else
-+    uint64_t                      *desc_staging;
-+#endif
-     VkDescriptorSetLayoutBinding **desc_binding;
-     VkDescriptorUpdateTemplate    *desc_template;
-     int                           *desc_set_initialized;
--- 
-2.30.2
diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest
index a67f2b616569..1f37a26d2c55 100644
--- a/media-video/jellyfin-media-player/Manifest
+++ b/media-video/jellyfin-media-player/Manifest
@@ -1,3 +1,4 @@
+DIST jellyfin-media-player-1.11.1.tar.gz 514141 BLAKE2B 00984b9241613a94ab0c27f21c4202ca064ff42cba8ba3d01b7bda20af53e80aa4ce14df9a8e906574d94fb3146a68cc84bc61e2be94d4e16ce087c97494de5b SHA512 24616c36e92e168655f6c37ef214ad7aa46df1cb331e1bff225b83b83da18fa91fb66d13145744c20cf49d2b92132cff065f6e8429bc111fd1be1a3d68a9c8ec
 DIST jellyfin-media-player-1.7.1.tar.gz 575001 BLAKE2B b650f981427721a254fd1dcaa58ebf9f93aba47de50f8c24db27e917de8cd8ebb3da67afa68990845f9e019aac0c8d81f5440dd72f604aa74cdc71d8cc476d8f SHA512 7f8cd4c9094254a133430b1d1594d44a92696cd769323ecc51ef973dde1f09b013f9ade0affb9e364d922935994613f662667af46f90aae2ae04d6cb9deb86f0
 DIST jellyfin-media-player-1.8.1.tar.gz 582343 BLAKE2B a5fa8d20cd3ec6e4444c1e9d90b93622f7435c2ccbf886c02ce744aa7aeb5a2440b07b3e5b3edb81bb6675d82958f5d63147412dd3d28fced60060de5724e52b SHA512 821bfa42e981d996c7f32f3951e625749a74636ebcb6a6c68c606282fb0db6d4c205419887828cc0dcdd3005d88b237977a01a82e2800a489c8bf3abac33630f
 DIST jellyfin-media-player-1.9.0.tar.gz 519208 BLAKE2B c64bb40011dd3761144e70c9549329c921156d9b0c46425e9812d6210baa8b90df7ac8f5af3379da76f6b8c6a55a3d8ac903ce5481895135eaea720d2ce936a2 SHA512 58c35530d61405ed5ff5a73c8a4f3869b21e0b0b0eb5cef7cf15b846543f1070d5c2b4dbfc102c6b4fbce5cb844fea711045d39c1a6bae9c882ad24c6ccd0333
diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.11.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.11.1.ebuild
new file mode 100644
index 000000000000..f2716ede9ed4
--- /dev/null
+++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.11.1.ebuild
@@ -0,0 +1,68 @@
+# 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 python-any-r1
+
+DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player"
+HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player"
+
+SRC_URI="
+	https://github.com/jellyfin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="+dbus"
+
+DEPEND="
+	dev-libs/libcec
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/libsdl2
+	media-video/mpv:=[libmpv]
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	dbus? ( dev-qt/qtdbus:5 )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+# x11-misc/xdg-utils is used for xdg-screensaver, which is used to inhibit
+# screen locking
+
+RDEPEND="
+	${DEPEND}
+	!dbus? ( x11-misc/xdg-utils )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOpenGL_GL_PREFERENCE=GLVND
+		# PMP, at least prior to the fork into JMP, used to download codecs,
+		# for safe measure, disable that.
+		-DENABLE_CODECS=OFF
+		# LINUX_X11POWER instructs JMP to use xdg-screensaver instead of dbus
+		# for inhibiting screen saving.
+		-DLINUX_X11POWER="$(usex dbus OFF ON)"
+	)
+	cmake_src_configure
+}
diff --git a/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild
index bb6e662ce6a2..58c3da6cd0ee 100644
--- a/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 	https://linuxtv.org/downloads/dtv-scan-tables/${PN}/scantable.dvb -> ${SCANTABLE}"
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 DESCRIPTION="Media player with digital TV support by KDE"
diff --git a/media-video/libva-utils/libva-utils-2.22.0.ebuild b/media-video/libva-utils/libva-utils-2.22.0.ebuild
index 60f57e6e4c4a..b08b407bf80c 100644
--- a/media-video/libva-utils/libva-utils-2.22.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.22.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 9f311bc29cbd..7fe20340b6f5 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,10 +1,4 @@
 DIST cef_binary_5060_linux_x86_64_v3.tar.xz 91352460 BLAKE2B 443f4b1bc638d3fe462fd8b8dd167e96f65aebb2b8de3616beac298449e2786c746f9a1fa4a0dbe2e3ef2d593139938e97538890d3ca3b74018b3afb9c7fc661 SHA512 1fbdf1d4ed117f3b8af20476c57502145d652b451ba8e0a544081403d292cc7a78642e9071b8f0283a19ef7ad507ef6e0d9df32b00afc51605ab74f650a7d755
-DIST obs-browser-2a2879b5a69f4a99cd7459d8595af46cdb23115c.tar.gz 112519 BLAKE2B 94b0e46d83865ff5b85ffa07c082a561ad14205512502976e555555449441a0f701d14445b97b2084d2e10bc9289dd51e28fcf7057cb4584e6ef025bfde93062 SHA512 5ad219dacf50a4187ff79ee8d5d3e2bcc978b6dd91396669e76c56af2af26424c74151b15d9185a87c06aeb694a0a2f5d80e66a6c18c60ce843009c6f97e9b3a
-DIST obs-browser-996b5a7bc43d912f1f4992e0032d4f263ac8b060.tar.gz 112416 BLAKE2B c82b5b55184130caaca0aad066ce1253c28206522e8d130cb3b940ee283c8a2dffc409a5d4774cad17535f958f52f4fe632a6b4462a18c10a4b5bbe02b60b4e9 SHA512 f6f7dbeb1d28b6c47663f36cb119cbc90a18c46fc6e81ca6db87e901ae4cee1fafd4a4a8c3f8cae94619d2f8f92baf1c52ca5c7df182f3df7521397638b0660d
-DIST obs-browser-c81851a1d7696c2d7ba319122eec387c1568ad44.tar.gz 112521 BLAKE2B 184d398941e8055c89f9a80664ce0b3a900fc0df75c5f45c30e3c80e7645c23052ab4ff6816169136c7d9ae4da7754ab0a64bc075a7ee9036effa64860c88f21 SHA512 78e09171d173ff756ce60f6ac1da201cc87ac317b3f5839632813a177b7eb126a376e8d194eb2b6d64a7cf0d1292640d6c216cfd4e82f71f54b44e8a85e86c49
-DIST obs-studio-30.1.2.tar.gz 16023853 BLAKE2B 8886b7c07240e5f83a37f046c0a68aad6432cfc7056959caa25c33dd9a830de44f27c821809116000f82939e1684222c1f8343bc83b362f0f3f3338923bbf196 SHA512 8d6102f3431c1c6c530f22b09612cb955c1877e5aba07aa0ba1d7b014471ebf9f0c1f8e898eb9373c64417455e75d8b9cf2ae4d9010b6a09330bac9f4e5aa01e
-DIST obs-studio-30.2.0.tar.gz 16122672 BLAKE2B 7c91c1a3691035fb3503ac25a22bad416de506488cb9bf2f4567b6048f40f4bd93ca17a92e92c535c9ead6e70b7610200b335d203978b47feee7e642310d86d2 SHA512 546374e0efbe9f23ecc2580d9d118e930afd576471b8931baa00cd4fbafe6bcba5f3a4b15769338860472aad616ccd2bd952bdef416acd85e637bbefd8c9d581
-DIST obs-studio-30.2.1.tar.gz 16150144 BLAKE2B 4e50f90af43ba785619bb90a793bbfe63e5d914d046c4da109883a3f21f98f9a55efd6600374046623e87f47733167236a2390b0ba90d4e9c7c310e24a4d5792 SHA512 d8bbe71305d3aac3d64db1d3c9bee0a849bffcad4ba1019c9028d69511a4c2ed341b878a3fd5818abda707fcecb2bc90c3f35a453d84317c782d24c299a15a13
+DIST obs-browser-c710222ec9d7ef9aa5d7099e9019d636e2c89f00.tar.gz 112527 BLAKE2B abfdd7cff3ec4479cc78d1f85a404ac48c2ebee1ba679a48e4e7abeb685ee08faa00059bda1cee2d5abf16b69ad0aa843898f612b3ee9d46f0950bd546aa6e44 SHA512 1ec2f48ce986c0d44cddf4332c8b58b8eb1fcb6a662504dd7ec580f9eb45b2a570542424d4c31ed6f96060746f21082661d43bf50b94469b4ef0c1f0b9190f7c
+DIST obs-studio-30.2.3.tar.gz 16150339 BLAKE2B b3ed65060881a731bd2e48d8b490cde4a0cf2886bfbdfb2f09536b4aae15c8230c6f6fc20eed3943b88c194b46509dca702d7e955b5b148b5f3577db410f0889 SHA512 1fea762b8fb4d5401516d9e547fe20db389633fb1abbdb52e4b9559ab6aaf3b9f4c25e055896b4063c6a693bfeb78e6463486b4c66e3994a6d1ceb0b7f65865f
 DIST obs-websocket-0548c7798a323fe5296c150e13b898a5ee62fc1e.tar.gz 250611 BLAKE2B fefeab4a637528138152d6e1bd374d6e3f08e4a4e20698665adf4dd925e7831df5bdb1068e402def71b6e12e239db823dac2944e6549c00e914abca175d16fc0 SHA512 f24f520c4a08ad2b80d97c5dfba14421fcd48661d3b0fb694af5d11e063c711e7bf49a4baa95d9de8aff07b6fbbd4b4681ce10a4074506d98cf25c793cc2844d
-DIST obs-websocket-d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32.tar.gz 246888 BLAKE2B 6e06c85ee47cb088a50b9d5eae9a8d68441989c1f76fdcd7806d59597062af5eb36e1722600b1a8d544e5f11533985b9bac243f7ca1002eed616e2f5c11a9a3f SHA512 31d5e1817aab341e55cbc5c759f28509f442695afb90d08a235c07359a65d2c2d3dfae2bf9c8a5086db310bb127dc59945ebe23fb219fda7408ee82d05b43938
-DIST obs-websocket-f8bc7c4f593c7957ecdb45a24faaff3e95f24e8b.tar.gz 250582 BLAKE2B 13a93a00b8f7d3cc775641243ffb14b98490b2190386663a05621376dc9f70838005768039c236083e8767e1951378341a242df2fefdd74b7172090a4526a0d0 SHA512 38e02f346042d6c71bab6f0dc3c706953b996d0c8a92a3c0922b04955ea0152857005f924c5a0fccfaa64a6fef5b0dd597bce658c152be38081d1dc02ed2be19
diff --git a/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
new file mode 100644
index 000000000000..29648cf15825
--- /dev/null
+++ b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/json11.cpp b/json11.cpp
+index 9647846..8266a14 100644
+--- a/json11.cpp
++++ b/json11.cpp
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 2e6e1d188e06..be051ff610c3 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -19,8 +19,9 @@
     <flag name="pipewire">Build with PipeWire support.</flag>
     <flag name="python">Build with scripting support for Python 3.</flag>
     <flag name="qsv">Build with Intel Quick Sync Video support.</flag>
+    <flag name="sndio">Build with sndio support.</flag>
     <flag name="speex">Build with Speex noise suppression filter support.</flag>
-    <flag name="ssl">Build with TLS/SSL support for RTMPS connections.</flag>
+    <flag name="test-input">Build and install input sources used for testing.</flag>
     <flag name="vlc">Build with VLC media source support.</flag>
     <flag name="websocket">Build with WebSocket API support.</flag>
   </use>
diff --git a/media-video/obs-studio/obs-studio-30.1.2.ebuild b/media-video/obs-studio/obs-studio-30.1.2.ebuild
deleted file mode 100644
index 6ddcf823b797..000000000000
--- a/media-video/obs-studio/obs-studio-30.1.2.ebuild
+++ /dev/null
@@ -1,270 +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="996b5a7bc43d912f1f4992e0032d4f263ac8b060"
-OBS_WEBSOCKET_COMMIT="d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32"
-
-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-libs/glib:2
-	dev-libs/jansson:=
-	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-cpp/nlohmann_json
-		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
-	)
-	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/nlohmann_json
-		dev-cpp/websocketpp
-		dev-libs/qr-code-generator
-	)
-"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-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_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.0-r1.ebuild b/media-video/obs-studio/obs-studio-30.2.0-r1.ebuild
deleted file mode 100644
index c2bb6f445487..000000000000
--- a/media-video/obs-studio/obs-studio-30.2.0-r1.ebuild
+++ /dev/null
@@ -1,271 +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="c81851a1d7696c2d7ba319122eec387c1568ad44"
-OBS_WEBSOCKET_COMMIT="f8bc7c4f593c7957ecdb45a24faaff3e95f24e8b"
-
-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
-	)
-	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}"
-
-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
-}
-
-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=$(usex nvenc)
-		-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.1.ebuild b/media-video/obs-studio/obs-studio-30.2.1.ebuild
deleted file mode 100644
index d5800bb8e299..000000000000
--- a/media-video/obs-studio/obs-studio-30.2.1.ebuild
+++ /dev/null
@@ -1,271 +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="2a2879b5a69f4a99cd7459d8595af46cdb23115c"
-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
-	)
-	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}"
-
-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
-}
-
-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=$(usex nvenc)
-		-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
new file mode 100644
index 000000000000..043f43465d42
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-30.2.3.ebuild
@@ -0,0 +1,278 @@
+# 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-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index d5800bb8e299..78f140d81c76 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 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="2a2879b5a69f4a99cd7459d8595af46cdb23115c"
+OBS_BROWSER_COMMIT="be9f1b646406d2250b402581b043f1558042d7f0"
 OBS_WEBSOCKET_COMMIT="0548c7798a323fe5296c150e13b898a5ee62fc1e"
 
 DESCRIPTION="Software for Recording and Streaming Live Video Content"
@@ -26,9 +26,12 @@ if [[ ${PV} == 9999 ]]; then
 	)
 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
+		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
@@ -39,9 +42,8 @@ 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
+	python qsv sndio speex test-input truetype v4l vlc wayland websocket
 "
-RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	browser? ( || ( alsa pulseaudio ) )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -66,6 +68,7 @@ DEPEND="
 	media-libs/x264:=
 	media-video/ffmpeg:=[nvenc?,opus,x264]
 	net-misc/curl
+	net-libs/mbedtls:=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-apps/util-linux
@@ -111,13 +114,13 @@ DEPEND="
 		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 )
-	ssl? ( net-libs/mbedtls:= )
-	test? ( dev-util/cmocka )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -137,7 +140,9 @@ DEPEND="
 		dev-libs/qr-code-generator
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	qsv? ( media-libs/intel-mediasdk )
+"
 
 QA_PREBUILT="
 	usr/lib*/obs-plugins/chrome-sandbox
@@ -172,46 +177,46 @@ src_unpack() {
 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_CCACHE=OFF
 		-DENABLE_DECKLINK=$(usex decklink)
+		-DENABLE_FFMPEG_NVENC=$(usex nvenc)
 		-DENABLE_FREETYPE=$(usex truetype)
 		-DENABLE_JACK=$(usex jack)
 		-DENABLE_LIBFDK=$(usex fdk)
-		-DENABLE_NATIVE_NVENC=$(usex nvenc)
 		-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_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
+		-DENABLE_SNDIO=$(usex sndio)
 		-DENABLE_SPEEXDSP=$(usex speex)
-		-DENABLE_UNIT_TESTS=$(usex test)
+		-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)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DUNIX_STRUCTURE=1
 	)
 
 	if [[ ${PV} != 9999 ]]; then
@@ -230,7 +235,7 @@ src_configure() {
 		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
 	fi
 
-	if use browser && use ssl; then
+	if use browser; then
 		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
 	else
 		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 4bc34434e501..9acb4f661c48 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -6,3 +6,4 @@ DIST pipewire-1.2.0-docs.tar.xz 58528 BLAKE2B b7abdfecd46239050ab80695c8f3d1a4e6
 DIST pipewire-1.2.0.tar.bz2 1810104 BLAKE2B a20caae515d800f80f607aeba585609ce9f47d0a38c48cc2eb3534f64049f774c119e36d27a585b5f7537e4eef6b2a56881e7db1e2ca2eedd52248ee9f331209 SHA512 3b9ceb02d3ea9fcadd2e009750d0c5b2435c8648c79f2fa9dc8dc83c772759985b140a02381a6c7be819b23d2a5a7671e456e81cf9b5be3437e994ef610bda59
 DIST pipewire-1.2.1.tar.bz2 1812153 BLAKE2B a95d3ba69ef6ee8d001c9081fec4392ef0c219c154b0f78851dd15e5a60f6daccc33fdf80a9ea653bd32d14109c5e1a5885e0c5ce392747be8e08c37a239a2e2 SHA512 e5bf5b712e2d96c96dd907780cd4b1a3d153f01261977bd75a11823bcc2be17b6c858d2967821862660d97426c8ed5f8ebd7bfde27dafe9f30c5b459b17e587f
 DIST pipewire-1.2.2.tar.bz2 1812524 BLAKE2B 4085ace98c38e718dd259f5ef864d8674e0c663bd486f5e8dfb2e79d63b471eb8686ab79841aa0e5689ef9d08ce0be66cb67cce2e9038cd5a81e823a816e8209 SHA512 8baf98bdb05f95acaf2f9a5189ad6da843181464cc21f31cc39604bfb2beb2a34327621348122e07436e39c5d0ad223a941674737848ac2e4e56e0d366d1b5f5
+DIST pipewire-1.2.3.tar.bz2 1813639 BLAKE2B 42bd8a08125e79a67a4adec30541ae7fef3c1e8279d8f84365636f8691a237fc7d6b392ed2576b681a9b9418804978e5a8493d7062567ed89035286fb49977f5 SHA512 8a06ef3a9079b334b0d3248431fe6a09f330ad8078dc378ac465e253d3601c3e4552e2e07f7cf492ff6fbc218e686b30941ea153ccaaf826b5f0ff231f6b214e
diff --git a/media-video/pipewire/pipewire-1.2.3.ebuild b/media-video/pipewire/pipewire-1.2.3.ebuild
new file mode 100644
index 000000000000..408bee308b53
--- /dev/null
+++ b/media-video/pipewire/pipewire-1.2.3.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/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..12} )
+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 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
+	)
+	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 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)
+
+		$(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/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest
deleted file mode 100644
index be77ff186208..000000000000
--- a/media-video/raspberrypi-omxplayer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 BLAKE2B 5b8f8973302718cd06f0b7527eb1cc59bddd4c98a58917c540853e54a5c6d6978b00eb790ac5d18cd2e1b90730543e51c3c6edc221b4df1d9482d5e89af5846b SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
deleted file mode 100644
index d71e6b376080..000000000000
--- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,9 +2,11 @@
- 
- CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
- 
--LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-+PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
-+
-+LIBS+=-lrt -lpthread $(shell ${PKG_CONFIG} --libs $(PKGS)) -L/opt/vc/lib
- 
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=$(shell ${PKG_CONFIG} --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
- 
- DIST ?= omxplayer-dist
- 
-@@ -51,8 +47,7 @@
- 	bash gen_version.sh > version.h 
- 
- omxplayer.bin: version $(OBJS)
--	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
--	$(STRIP) omxplayer.bin
-+	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
- 
- help.h: README.md Makefile
- 	awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch
deleted file mode 100644
index bd35d6283d21..000000000000
--- a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -4,9 +4,11 @@
- 
- PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
- 
--LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
-+PKG_CONFIG ?= pkg-config
- 
--INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
-+LIBS+=-lrt -lpthread $(shell $(PKG_CONFIG) --libs $(PKGS)) -L${SYSROOT}/opt/vc/lib
-+
-+INCLUDES+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) -I${SYSROOT}/opt/vc/include -I. -Ilinux
- 
- DIST ?= omxplayer-dist
diff --git a/media-video/raspberrypi-omxplayer/files/fonts-path.patch b/media-video/raspberrypi-omxplayer/files/fonts-path.patch
deleted file mode 100644
index 6683145f6833..000000000000
--- a/media-video/raspberrypi-omxplayer/files/fonts-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/omxplayer.cpp b/omxplayer.cpp
-index 0626e2e..8450bf2 100644
---- a/omxplayer.cpp
-+++ b/omxplayer.cpp
-@@ -83,8 +83,8 @@ bool              m_osd                 = true;
- bool              m_no_keys             = false;
- std::string       m_external_subtitles_path;
- bool              m_has_external_subtitles = false;
--std::string       m_font_path           = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
--std::string       m_italic_font_path    = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
-+std::string       m_font_path           = "/usr/share/fonts/freefont/FreeSans.ttf";
-+std::string       m_italic_font_path    = "/usr/share/fonts/freefont/FreeSansOblique.ttf";
- std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
- bool              m_asked_for_font      = false;
- bool              m_asked_for_italic_font = false;
diff --git a/media-video/raspberrypi-omxplayer/metadata.xml b/media-video/raspberrypi-omxplayer/metadata.xml
deleted file mode 100644
index a3222eacca00..000000000000
--- a/media-video/raspberrypi-omxplayer/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="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">popcornmix/omxplayer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild
deleted file mode 100644
index 67b8ee489721..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-GIT_COMMIT="791d7df"
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-SRC_URI="https://github.com/popcornmix/omxplayer/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="X"
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	dev-libs/boost
-	media-libs/freetype:2
-	X? (
-		x11-apps/xrefresh
-		x11-apps/xset
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/Makefile-0_p20160528.patch
-	"${FILESDIR}"/fonts-path.patch
-	"${FILESDIR}"/cross-0_p20160528.patch
-)
-
-DOCS=( README.md )
-
-S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
-
-src_prepare() {
-	default
-	cat > Makefile.include << EOF
-LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX PKG_CONFIG
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	einstalldocs
-}
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 40c2ec9173eb..6b436d457909 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,2 +1,2 @@
-DIST shotcut-23.09.29.tar.gz 11908874 BLAKE2B e107d5f0284afd54b31eff72220d4224621da7b46fff6345d729ea0464b8967bc3329a12121aeedcdec6bcce7f4c6394065463269708a4bd4d29cc4389bc1706 SHA512 a829c2eda51db4fe20fa207e3e98ce0fb1e777af8ac495aa1ad20407bb91a41fed569298611288e04a528f1120fc89292d0333d3e445dce1ab86a799dea78e16
 DIST shotcut-24.02.19.tar.gz 12077171 BLAKE2B ac7ab500f8817007ec981a94a2b7a414a4d981c630bd289fdf70eb2f1d493391dc74e372d82273aa4d81a2a9b685b1275e30ab47f6d6c5ce44812c286f43ed54 SHA512 60fc8874622db7ebb3e345ac8ba23a0d7c5e60c929c5955189b71540bbd5946e4dc0db0ad119a4ba3659f2d6e4dd64652be3dabc82b3c01feefb5619685ec454
+DIST shotcut-24.06.26.tar.gz 12276595 BLAKE2B 0f062f3cb3991291b962fd351cac266bf20fd7d58acb70245655b93cbdbc7147a24e17d4ecf4eaa1bd5e3bbf29a29b73f289d529c539f6540616e3a03bf82ac5 SHA512 282c3f73cedae9b1fcb85d08a18fcd164481307baaca0227f536846ee0fc1c2f09382d0ba40fb0993210c78e7192338fa3577fe9c963e8bfc5a9d5bacc912a8b
diff --git a/media-video/shotcut/shotcut-23.09.29.ebuild b/media-video/shotcut/shotcut-23.09.29.ebuild
deleted file mode 100644
index 88276adaf800..000000000000
--- a/media-video/shotcut/shotcut-23.09.29.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 cmake flag-o-matic xdg
-
-DESCRIPTION="A free, open source, cross-platform video editor"
-HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
-if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
-fi
-
-IUSE="debug"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/qttools:6[linguist]
-"
-DEPEND="
-	dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,widgets,xml]
-	dev-qt/qtdeclarative:6[widgets]
-	dev-qt/qtmultimedia:6
-	>=media-libs/mlt-7.18.0[ffmpeg,frei0r,jack,opengl,sdl,xml]
-	media-video/ffmpeg
-"
-
-RDEPEND="${DEPEND}
-	virtual/jack
-"
-
-src_configure() {
-	CMAKE_BUILD_TYPE=$(usex debug Debug Release)
-	if [[ ${PV} != 9999* ]] ; then
-		SHOTCUT_VERSION="${PV}"
-	else
-		SHOTCUT_VERSION="$(git log --date=format:'%y.%m.%d' -1 --format='%ad')"
-	fi
-	local mycmakeargs=(
-		-DSHOTCUT_VERSION="${SHOTCUT_VERSION}"
-	)
-	use debug || append-cxxflags "-DNDEBUG"
-	append-cxxflags "-DSHOTCUT_NOUPGRADE"
-	cmake_src_configure
-}
diff --git a/media-video/shotcut/shotcut-24.06.26.ebuild b/media-video/shotcut/shotcut-24.06.26.ebuild
new file mode 100644
index 000000000000..b72aafd2d6c0
--- /dev/null
+++ b/media-video/shotcut/shotcut-24.06.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="A free, open source, cross-platform video editor"
+HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
+fi
+
+LICENSE="GPL-3+"
+
+SLOT="0"
+
+IUSE="debug"
+
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+"
+DEPEND="
+	dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,widgets,xml]
+	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtcharts:6
+	>=media-libs/mlt-7.18.0[ffmpeg,frei0r,jack,opengl,sdl,xml]
+	media-video/ffmpeg
+"
+
+RDEPEND="${DEPEND}
+	virtual/jack
+"
+
+src_configure() {
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release)
+	if [[ ${PV} != 9999* ]] ; then
+		SHOTCUT_VERSION="${PV}"
+	else
+		SHOTCUT_VERSION="$(git log --date=format:'%y.%m.%d' -1 --format='%ad')"
+	fi
+	local mycmakeargs=(
+		-DSHOTCUT_VERSION="${SHOTCUT_VERSION}"
+	)
+	use debug || append-cxxflags "-DNDEBUG"
+	append-cxxflags "-DSHOTCUT_NOUPGRADE"
+	cmake_src_configure
+}
diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild
index 88276adaf800..b72aafd2d6c0 100644
--- a/media-video/shotcut/shotcut-9999.ebuild
+++ b/media-video/shotcut/shotcut-9999.ebuild
@@ -15,11 +15,12 @@ else
 	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
 fi
 
-IUSE="debug"
-
 LICENSE="GPL-3+"
+
 SLOT="0"
 
+IUSE="debug"
+
 BDEPEND="
 	dev-qt/qttools:6[linguist]
 "
@@ -27,6 +28,7 @@ DEPEND="
 	dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,widgets,xml]
 	dev-qt/qtdeclarative:6[widgets]
 	dev-qt/qtmultimedia:6
+	dev-qt/qtcharts:6
 	>=media-libs/mlt-7.18.0[ffmpeg,frei0r,jack,opengl,sdl,xml]
 	media-video/ffmpeg
 "
diff --git a/media-video/subliminal/subliminal-2.2.1.ebuild b/media-video/subliminal/subliminal-2.2.1.ebuild
index 2ced5f8b3782..d432d8ef9ca3 100644
--- a/media-video/subliminal/subliminal-2.2.1.ebuild
+++ b/media-video/subliminal/subliminal-2.2.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 SRC_URI+=" test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )"
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 05bb9ac24752..fceeff018ba5 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -2,3 +2,4 @@ DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a
 DIST wireplumber-0.5.2.tar.bz2 408788 BLAKE2B 51a9c0268212b353b54099d2d57fd93dec5b42d4ec3151f93b4ebd4df3f4478a19858ec8302af58558a9387afa647a00a0872d471f0f2ea5e681978afbdcf553 SHA512 4cd2949739b8af86f73e072fe8c1d8606fa9be77b6e109aa0825d516f11953c4811ae1162da07ae245f7039f4243d01c43b8e9c083d4e0be1066b180484abbfb
 DIST wireplumber-0.5.3.tar.bz2 411081 BLAKE2B 627cb0adaddd512e2b5f2e706b622972232f76000d690837da5f03a3628669b99c4768de6590ec378684311915626de7ac3316bda1f5d1152c9df448ec41e389 SHA512 1c62f7f919242b2a9586ff6a532f214b564bcf10c838eae4a64078edf6fd461fc65f364c8af79150e33b86594331446516a1a4c926bb245a4b2ba2d9f63f7243
 DIST wireplumber-0.5.5.tar.bz2 411519 BLAKE2B 016641b6b21b6176b0f3f70c0c96ccd32ea4d3609bf337a3c9af6e8219cb160a92e30027e3187adb023d0c35ad822ce9be374d098eab76508f218a7ae2528754 SHA512 50ddc6f275bba89ddac0e55dd2a572a13ca19953bce6bdbca14eadd44f3669c7ad4b39ae857770543567a05ea3e437ccee36a2538fad1f4caa777036ace04f77
+DIST wireplumber-0.5.6.tar.bz2 415566 BLAKE2B 7f5323ddea415bac31bbb5f05b711e52bd631d9e6c4b22b6055055761a19c0a4c16a36a90ecd0f90c3fbfaddad8be57e823ad0b97327569e94074bee21d5e31c SHA512 58b18c1c1f1040e9954de75488a82ff7504fb908f7e5d57dd219f3479612551c94a1384d399a99b983f66859560aaf71c8ab9414318e48abb6f8cd3b88fcecc8
diff --git a/media-video/wireplumber/files/wireplumber-0.5.6-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.5.6-config-disable-sound-server-parts.patch
new file mode 100644
index 000000000000..4e691e5790b3
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.5.6-config-disable-sound-server-parts.patch
@@ -0,0 +1,18 @@
+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
+
+--- a/src/config/wireplumber.conf
++++ b/src/config/wireplumber.conf
+@@ -72,8 +72,8 @@ wireplumber.profiles = {
+ 
+     policy.standard = required
+ 
+-    hardware.audio = required
+-    hardware.bluetooth = required
++    #hardware.audio = required
++    #hardware.bluetooth = required
+     hardware.video-capture = required
+   }
+ 
diff --git a/media-video/wireplumber/wireplumber-0.5.6.ebuild b/media-video/wireplumber/wireplumber-0.5.6.ebuild
new file mode 100644
index 000000000000..05daac42ad03
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.5.6.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
+#
+# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/0.5"
+IUSE="elogind system-service systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+	test? ( sys-apps/dbus )
+"
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.68
+	>=media-video/pipewire-1.0.5-r1:=
+	virtual/libintl
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="
+	${DEPEND}
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+	# Defer enabling sound server parts to media-video/pipewire
+	# TODO: Soon, we should be able to migrate to just a dropin at
+	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+	"${FILESDIR}"/${PN}-0.5.6-config-disable-sound-server-parts.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddaemon=true
+		-Dtools=true
+		-Dmodules=true
+		# Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Ddoc=disabled
+		# Only used for Sphinx doc generation
+		-Dintrospection=disabled
+		-Dsystem-lua=true
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		$(meson_use system-service systemd-system-service)
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+		$(meson_use test dbus-tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/wireplumber/* "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/wireplumber || die
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
+	else
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index a3a02062c4c1..05daac42ad03 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -68,7 +68,7 @@ PATCHES=(
 	# Defer enabling sound server parts to media-video/pipewire
 	# TODO: Soon, we should be able to migrate to just a dropin at
 	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
-	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
+	"${FILESDIR}"/${PN}-0.5.6-config-disable-sound-server-parts.patch
 )
 
 src_configure() {
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index b95b528c7338..df3438c35d15 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,3 @@
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
+DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160147ba41cd1a692ae9a661b76608ac11e05aa5bc4628030f833d6a822cee187f3fbc4c015e094eb1b30c96783147124 SHA512 6d0d9e079d6c7650abb5c00ad60cf3cfe72a220b3ee7cd030d4daeefdd9feeb4d056cf2e01b2f8d2fb0a66ccc15cdde860237f8ac5eac42ede6e5444a81346f8
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
new file mode 100644
index 000000000000..488b1f76ddb7
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with media-libs/x264
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
+	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="
+	~media-libs/x264-${PV}[interlaced=,threads=]
+	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.5.2:= )
+"
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="
+	${RDEPEND}
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	tc-export CC
+
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--system-libx264 \
+		--host="${CHOST}" \
+		--disable-lsmash \
+		$(usex avs "" "--disable-avs") \
+		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+		$(usex ffmpegsource "" "--disable-ffms") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex mp4 "" "--disable-gpac") \
+		$(usex threads "" "--disable-thread") || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index f688e3cb2d4e..488b1f76ddb7 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
 else
-	X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index a813ba3a5331..e3a8ab65c6de 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,2 +1 @@
-DIST yle-dl-20240706.tar.gz 78964 BLAKE2B 5ed0a9ba391853566c3abbbd88d6fcce33c7f7e88183e89f3c272f6cae6c519ff272f648934e8fa58e0a7d59f87677189e14f1532cbadbbd6f73312810b4994e SHA512 c54a99bfa1ff71296e4ae40cb62408338942144e60f8df25fa8e7a9d53ff8d3c61e0b3c85e8404c716a18f54986e242b72dd4424c65ffe24f2ea4b128f7cf27a
 DIST yle-dl-20240806.tar.gz 79725 BLAKE2B c09d8ee7ca7f9db30433fb1cfa2ecf7ea2d791a56661341d059c917a498b9a60d7db277a4a186523eb841f0543d07d8caeb8c1adcf4804051e3196cbba4e2e4a SHA512 21b3cbddbdf058b75a5bb1afca0a2ca3573b99a18a85185458227d82f291028c4796e27f53a7a72b07cdd96ef1606ddac6dd467ebe8d1004ad4e9f4e0e62f17e
diff --git a/media-video/yle-dl/yle-dl-20240706.ebuild b/media-video/yle-dl/yle-dl-20240706.ebuild
deleted file mode 100644
index d879b645e845..000000000000
--- a/media-video/yle-dl/yle-dl-20240706.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=flit
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/yle-dl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-DOCS=( COPYING ChangeLog README.fi.md README.sv.md README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
-	elog
-	optfeature "automatically detect filesystems that require restricted character sets" dev-python/psutil
-	optfeature "store metadata as extended file attributes" dev-python/pyxattr
-	optfeature "youtube-dl download engine" net-misc/yt-dlp
-}
diff --git a/metadata/install-qa-check.d/60python-site b/metadata/install-qa-check.d/60python-site
index a0a0f4370db2..facfb54f1b3c 100644
--- a/metadata/install-qa-check.d/60python-site
+++ b/metadata/install-qa-check.d/60python-site
@@ -53,7 +53,7 @@ python_site_check() {
 
 		# check for packages installing outside site-packages
 		case ${CATEGORY}/${PN} in
-			dev-lang/python|dev-python/pypy*)
+			dev-lang/python|dev-python/pypy*|dev-python/python-tests)
 				;;
 			*)
 				while IFS= read -d $'\0' -r f; do
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 5fb0b20d5f8a..a4a5816dbe5b 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -27,8 +27,9 @@ manifest-required-hashes = BLAKE2B
 # 2018-05-13 council meeting deprecated EAPI 5 for ebuilds.
 # 2021-07-11 council meeting deprecated EAPI 6.
 # 2021-08-08 council meeting banned EAPI 5.
-eapis-banned = 0 1 2 3 4 5
-eapis-deprecated = 6
+# 2023-07-11 council meeting banned EAPI 6.
+eapis-banned = 0 1 2 3 4 5 6
+eapis-deprecated =
 
 # EAPIs 0 to 4 are banned for profiles
 # EAPIs 6 and 7 do not include any profile related changes
diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf
index d97f93f11ae4..8066827fd3f1 100644
--- a/metadata/license-mapping.conf
+++ b/metadata/license-mapping.conf
@@ -40,6 +40,7 @@ BSD-2-Clause = BSD-2
 BSD-2-Clause-Patent = BSD-2-with-patent
 BSD-2-Clause-Views = BSD-2
 BSD-3-Clause = BSD
+BSD-3-Clause-LBNL = LBNLBSD
 BSD-4-Clause = BSD-4
 BSL-1.0 = Boost-1.0
 BUSL-1.1 = BUSL-1.1
diff --git a/metadata/stabilization-groups/lttng.group b/metadata/stabilization-groups/lttng.group
new file mode 100644
index 000000000000..a94742aca620
--- /dev/null
+++ b/metadata/stabilization-groups/lttng.group
@@ -0,0 +1,3 @@
+dev-util/lttng-modules
+dev-util/lttng-tools
+dev-util/lttng-ust
diff --git a/metadata/stabilization-groups/python/cpython.group b/metadata/stabilization-groups/python/cpython.group
index 539033834c6e..221635db56e4 100644
--- a/metadata/stabilization-groups/python/cpython.group
+++ b/metadata/stabilization-groups/python/cpython.group
@@ -1,2 +1,3 @@
 app-doc/python-docs
 dev-lang/python
+dev-python/python-tests
diff --git a/metadata/stabilization-groups/tigervnc.group b/metadata/stabilization-groups/tigervnc.group
new file mode 100644
index 000000000000..6246d3e41d13
--- /dev/null
+++ b/metadata/stabilization-groups/tigervnc.group
@@ -0,0 +1,2 @@
+net-misc/tigervnc
+net-misc/tigervnc-xorg-module
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 710a8d7184d9..c5efc6126560 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,2 +1,3 @@
 DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
 DIST arping-2.23.tar.gz 51911 BLAKE2B 8b0d34522957a83d0a66b47576fa0ecbd1e4fc86537df6d2737510bdb1a4ea3d30feb664077790a8f70be9cf2cdcdc30a648261e9a6a30401ce85274c45ccf12 SHA512 45295fd68717379d18fcff4270c70e0d9df3cae175f0c2a9f1e8e88e3046f5109e7a95bb717be329af8d6002c9a2338efd39831a652c0b425b75058287fa35df
+DIST arping-2.25.tar.gz 62032 BLAKE2B a7b5bdfb693ee31781509584b4a0363e856d8134cebe1119fee974a57c399f1128a306b85e3f3669d4fe8f7031dfb87b9cfcc2f8df76b6f969310a12460363ad SHA512 7cfc1ed73bd7621911f9b1b0ad23680c7dde6f8674a0223e6341dc6e40c7d49bb293bc519e9e9de8abaa9209ad7fedad902901235f87b8d21395f3396739b922
diff --git a/net-analyzer/arping/arping-2.25.ebuild b/net-analyzer/arping/arping-2.25.ebuild
new file mode 100644
index 000000000000..772eaa60eece
--- /dev/null
+++ b/net-analyzer/arping/arping-2.25.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fcaps
+
+DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it"
+HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+seccomp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-libs/libpcap
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	seccomp? ( sys-libs/libseccomp )
+	!net-misc/iputils[arping(+)]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/check
+		dev-python/subunit
+	)"
+
+FILECAPS=( cap_net_raw usr/sbin/arping )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Controls whether seccomp is used by default
+		$(use_enable seccomp)
+	)
+
+	# Needed to actually make it optional and not automagic
+	# (and we want it optional for the non-seccomp arches, like sparc)
+	export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp)
+	export ac_cv_header_seccomp_h=$(usex seccomp)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 53e3f2db8fe8..c5940fa0c061 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,3 +1,4 @@
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST arpwatch-3.5.tar.gz 117594 BLAKE2B 73b979ec279e5bf5baaeac05949e1bddf08cd9c3c7afcd29b37991ba55ba2bb8968b57b407eb571ec52871017372f479e586ba84b0f1aee67331ce7617309fb8 SHA512 e46b350c483f0e7c873eb177be337f238b2db3d859d8b305df5a74d9d97ca449750f9ed50a99c5d4c51618e22747731d70ceb3f13aae39c39d258b960258fb88
+DIST arpwatch-3.6.tar.gz 117254 BLAKE2B 77cb129bb543a45e22e27c02193b2ceaf4c65fd56b4d77e710379a2fbcaa5f1be4d625ea0b99f63843358ae993c7bee95db764baf36e0802a7aceae5d81706c7 SHA512 5ba47b15f294396f79efa4b72743169b9eb36747d675144e8f456a23d3987dc0d719d9b97704e7eeec0795f03ee7ef7e8fe8a4ba1ee35d19ab8ec6b077d345e8
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
diff --git a/net-analyzer/arpwatch/arpwatch-3.6.ebuild b/net-analyzer/arpwatch/arpwatch-3.6.ebuild
new file mode 100644
index 000000000000..75c21ca8232c
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-3.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+ETHERCODES_DATE=20200628
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
+HOMEPAGE="https://ee.lbl.gov/"
+SRC_URI="
+	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~riscv ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="
+	acct-group/arpwatch
+	net-libs/libpcap
+	sys-libs/ncurses:=
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/arpwatch
+	virtual/mta
+	selinux? ( sec-policy/selinux-arpwatch )
+"
+
+PATCHES=(
+	# sent upstream on 2023-12-05
+	"${FILESDIR}"/0001-Fix-configure-check-for-time.h.patch
+	"${FILESDIR}"/0002-Avoid-using-undocumented-internals-for-DNS.patch
+)
+
+src_prepare() {
+	default
+
+	# Temporary for 0001-Fix-configure-check-for-time.h.patch
+	eautoreconf
+}
+
+src_install() {
+	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
+	doman arpsnmp.8 arpwatch.8
+
+	insinto /usr/share/arpwatch
+	newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
+
+	diropts --group=arpwatch --mode=770
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch
+	newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch
+
+	systemd_dounit "${FILESDIR}/arpwatch.service"
+	systemd_install_serviced "${FILESDIR}/arpwatch.conf"
+}
+
+pkg_postinst() {
+	# Previous revisions installed /var/lib/arpwatch with the wrong
+	# ownership. Instead of the intended arpwatch:root, it was left as
+	# root:root. If we find any such mis-owned directories, we fix them,
+	# and then set the permission bits how we want them in *this*
+	# revision.
+	#
+	# The "--from" flag ensures that we only fix directories that need
+	# fixing, and the "&& chmod" ensures that we only adjust the
+	# permissions if the owner also needed fixing.
+	chown \
+		--from=root:root \
+		--no-dereference \
+		:arpwatch \
+		"${ROOT}"/var/lib/arpwatch && \
+		chmod 770 "${ROOT}"/var/lib/arpwatch
+}
diff --git a/net-analyzer/calamaris/Manifest b/net-analyzer/calamaris/Manifest
index 076a2fe8d920..6e7a8d331b01 100644
--- a/net-analyzer/calamaris/Manifest
+++ b/net-analyzer/calamaris/Manifest
@@ -1 +1,2 @@
 DIST calamaris-2.99.4.5.tar.gz 116893 BLAKE2B 9864f135b364dd7d7becd7c30cc28da1f41c4db0fb940f45153d5fd8da04c8df8675a728e19b47f6eb8f602945655817717189349fe047944d0abdacfd0476c9 SHA512 d9bc890afd6a349ea448b4f40281b8d4dd5babf2915cdfe6d4a46c066826e54c3a9e988e575fb13a4cf5ae9500d33faa5d24f295504f7b6fbfbec219610b309d
+DIST calamaris-2.99.4.7.tar.gz 119791 BLAKE2B 390b38cad5f021899592365d763bcd009e41a39e0ccd9e5a3c28b4aa7224ee97b1591995a0441d6970548f9093df7f94c570bf94f0ba0a27ba8d2a854e41572c SHA512 0d2f15214b58dcf5a2d170e30a9ae61f0191e2b2fd1dfbce271655802f358e2e5b02e1884f68aa62fbbe9ff91bc6b564e6cfaaed48c3484a0d781a2b28e15bed
diff --git a/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild
index 658b1514c2ec..def7af0634f8 100644
--- a/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild
+++ b/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="parses logfiles of a wide variety of web proxy servers and generate
 HOMEPAGE="https://cord.de/calamaris-english"
 SRC_URI="https://cord.de/files/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="selinux"
diff --git a/net-analyzer/calamaris/calamaris-2.99.4.7.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.7.ebuild
new file mode 100644
index 000000000000..0fc541570a7d
--- /dev/null
+++ b/net-analyzer/calamaris/calamaris-2.99.4.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Parses logfiles of a wide variety of web proxy servers and generates reports"
+HOMEPAGE="https://cord.de/calamaris-english"
+SRC_URI="https://cord.de/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/GDGraph
+	selinux? ( sec-policy/selinux-calamaris )
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:\(use lib\).*$:\1 '/usr/share/';:" \
+		calamaris || die
+}
+
+src_install() {
+	dobin calamaris calamaris-cache-convert
+
+	insinto /usr/share/${PN}
+	doins *.pm
+
+	doman calamaris.1
+
+	dodoc BUGS CHANGES EXAMPLES EXAMPLES.v3 README TODO calamaris.conf
+}
diff --git a/net-analyzer/fail2ban/fail2ban-1.1.0-r2.ebuild b/net-analyzer/fail2ban/fail2ban-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..aa1a5b054c52
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-1.1.0-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 distutils-r1 systemd tmpfiles
+
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fail2ban/fail2ban"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pyasyncore[${PYTHON_USEDEP}]
+		dev-python/pyasynchat[${PYTHON_USEDEP}]
+	' 3.12)
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? (
+		$(python_gen_cond_dep '
+			dev-python/python-systemd[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/aiosmtpd[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
+	"${FILESDIR}"/${PN}-1.0.2-umask-tests.patch
+	"${FILESDIR}"/${PN}-1.1.0-openssh-9.8.patch
+	"${FILESDIR}"/${PN}-1.1.0-openssh-9.8-fixups.patch
+	"${FILESDIR}"/${PN}-1.1.0-openrc-nftables.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+}
+
+python_test() {
+	# Skip testRepairDb for bug #907348 (didn't always fail..)
+	# https://github.com/fail2ban/fail2ban/issues/3586
+	bin/fail2ban-testcases \
+		--no-network \
+		--ignore databasetestcase.DatabaseTest.testRepairDb \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+
+	# Workaround for bug #790251
+	rm -rf fail2ban.egg-info || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
+
+	newconfd files/fail2ban-openrc.conf ${PN}
+
+	# These two are placed in the ${BUILD_DIR} after being "built"
+	# in install_scripts().
+	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
+	systemd_dounit "${BUILD_DIR}/${PN}.service"
+
+	dotmpfiles files/${PN}-tmpfiles.conf
+
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
+	if [[ ${previous_less_than_0_7} == 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2Ban!"
+		elog
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify ; then
+		elog "For most jail.conf configurations, it is recommended you install"
+		elog "dev-python/pyinotify to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite] ; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+}
diff --git a/net-analyzer/fail2ban/files/fail2ban-1.1.0-openrc-nftables.patch b/net-analyzer/fail2ban/files/fail2ban-1.1.0-openrc-nftables.patch
new file mode 100644
index 000000000000..844be1cedd34
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-1.1.0-openrc-nftables.patch
@@ -0,0 +1,25 @@
+https://github.com/fail2ban/fail2ban/commit/9e31cfc1f10e8304dc0b5adf0a429d57fcb598a3
+
+From 9e31cfc1f10e8304dc0b5adf0a429d57fcb598a3 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 24 Aug 2024 11:59:59 -0400
+Subject: [PATCH] files/fail2ban-openrc.init.in: start after nftables
+
+The "after iptables" clause in the OpenRC service script's depend()
+function causes fail2ban to start after iptables, if iptables is
+scheduled to start. Here we add "after nftables" as well: nftables is
+the successor to iptables, and fail2ban supports it out-of-the-box.
+If nftables is scheduled to start, we want to wait until it's done
+before starting fail2ban.
+--- a/files/fail2ban-openrc.init.in
++++ b/files/fail2ban-openrc.init.in
+@@ -44,7 +44,7 @@ retry="30"
+ 
+ depend() {
+ 	use logger
+-	after iptables
++	after iptables nftables
+ }
+ 
+ checkconfig() {
+
diff --git a/net-analyzer/fail2ban/files/fail2ban-1.1.0-openssh-9.8-fixups.patch b/net-analyzer/fail2ban/files/fail2ban-1.1.0-openssh-9.8-fixups.patch
new file mode 100644
index 000000000000..06ff07bd0599
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-1.1.0-openssh-9.8-fixups.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/936838
+https://github.com/fail2ban/fail2ban/commit/c769046a1f729880cc53efdff4b52ac96010752f
+https://github.com/fail2ban/fail2ban/commit/54c0effceb998b73545073ac59c479d9d9bf19a4
+
+From c769046a1f729880cc53efdff4b52ac96010752f Mon Sep 17 00:00:00 2001
+From: sebres <info@sebres.de>
+Date: Sun, 11 Aug 2024 11:55:39 +0200
+Subject: [PATCH] Revert "`filterd./sshd.conf`: fixed journalmatch
+ (sshd.service seems to be renamed to ssh.service)" - it'd patched in debian
+ branch. This reverts commit 6fce23e7baa484c7d1f9b0c9a11986f3916c41dd.
+
+--- a/config/filter.d/sshd.conf
++++ b/config/filter.d/sshd.conf
+@@ -126,7 +126,7 @@ ignoreregex =
+ 
+ maxlines = 1
+ 
+-journalmatch = _SYSTEMD_UNIT=ssh.service + _COMM=sshd
++journalmatch = _SYSTEMD_UNIT=sshd.service + _COMM=sshd
+ 
+ # DEV Notes:
+ #
+
+From 54c0effceb998b73545073ac59c479d9d9bf19a4 Mon Sep 17 00:00:00 2001
+From: sebres <info@sebres.de>
+Date: Sun, 11 Aug 2024 12:10:12 +0200
+Subject: [PATCH] filter.d/sshd.conf: amend to #3747/#3812 (new ssh version
+ would log with `_COMM=sshd-session`)
+
+--- a/config/filter.d/sshd.conf
++++ b/config/filter.d/sshd.conf
+@@ -126,7 +126,7 @@ ignoreregex =
+ 
+ maxlines = 1
+ 
+-journalmatch = _SYSTEMD_UNIT=sshd.service + _COMM=sshd
++journalmatch = _SYSTEMD_UNIT=sshd.service + _COMM=sshd + _COMM=sshd-session
+ 
+ # DEV Notes:
+ #
diff --git a/net-analyzer/gsa/metadata.xml b/net-analyzer/gsa/metadata.xml
index 6fb56eca5155..aa8e4edf754e 100644
--- a/net-analyzer/gsa/metadata.xml
+++ b/net-analyzer/gsa/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gsad/metadata.xml b/net-analyzer/gsad/metadata.xml
index 27bf47cfefc0..43f84bcab747 100644
--- a/net-analyzer/gsad/metadata.xml
+++ b/net-analyzer/gsad/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild
index a7da7de1491c..475102cd716b 100644
--- a/net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ldap test radius"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml
index df3bcf4ee54f..b7136456d439 100644
--- a/net-analyzer/gvm-libs/metadata.xml
+++ b/net-analyzer/gvm-libs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml
index 49aa4756bce9..9dac8a2bb335 100644
--- a/net-analyzer/gvm-tools/metadata.xml
+++ b/net-analyzer/gvm-tools/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
index 588dd28fa08c..9a9ba3cac03d 100644
--- a/net-analyzer/gvm/metadata.xml
+++ b/net-analyzer/gvm/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index 362c0017dc23..c20efeb6e575 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
index 23bb00c63b89..23b4203493f8 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="Display bandwidth usage on an interface"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/ https://code.blinkace.com/pdw/iftop"
-SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
+HOMEPAGE="https://www.ex-parrot.com/pdw/iftop/ https://code.blinkace.com/pdw/iftop"
+SRC_URI="https://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
 S="${WORKDIR}"/${P/_/}
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/munin/files/logrotate.d-munin.4 b/net-analyzer/munin/files/logrotate.d-munin.4
new file mode 100644
index 000000000000..8bbb6422620b
--- /dev/null
+++ b/net-analyzer/munin/files/logrotate.d-munin.4
@@ -0,0 +1,33 @@
+/var/log/munin/munin-node.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	delaycompress
+	notifempty
+	create 640 root root
+	postrotate
+		test -e /run/openrc/softlevel && /etc/init.d/munin-node restart 1>/dev/null || true
+		test -e /run/systemd/system && systemctl restart munin-node 1>/dev/null || true
+	endscript
+}
+
+/var/log/munin/munin-update.log /var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	delaycompress
+	notifempty
+	nocreate
+}
+
+/var/log/munin/munin-cgi-graph.log /var/log/munin/munin-cgi-html.log {
+	daily
+	missingok
+	rotate 7
+	compress
+	delaycompress
+	notifempty
+	create 640 @CGIUSER@ root
+}
diff --git a/net-analyzer/munin/munin-2.0.76-r2.ebuild b/net-analyzer/munin/munin-2.0.76-r2.ebuild
new file mode 100644
index 000000000000..02dea0084875
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.76-r2.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="https://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	dev-perl/TimeDate
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.8 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		app-alternatives/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.8:*
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${FILESDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF || die
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	JFLAGS=-Xlint
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local cgiuser=$(usex apache2 apache munin)
+
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run and /var/cache from the install, as it's not the
+	# package's to deal with.
+	rm -rf "${D}"/run "${D}"/var/cache || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.73 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
+	d /run/munin 0700 munin munin - -
+	d /var/cache/munin-cgi 0755 ${cgiuser} munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.4 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include-2.4-r1 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include"
+			elog "/etc/apache2/vhosts.d/munin-2.4.include from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 5056e1fa04e9..f27d4027dd2f 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,3 +1,5 @@
 DIST netdata-1.45.4.tar.gz 74881136 BLAKE2B e6184458a8b7e4430fb3e11543812f00652712c0c78d3ffb2f040adf649ceb4b01b4984165e489dfbea5c2207b702319fd5f3fb0d6d420e8973a20e54f3555b9 SHA512 44ab814c1dfb8c70880a363abbf29115189da366a49df953665dc2831da389e46ac2e33c288ebdbb10478f66180d0243d1b848a2f94043449198a87d9ad06340
 DIST netdata-1.46.1.tar.gz 75135927 BLAKE2B 61ba35b4c61df47fd3aa03f08dc168dd02173b3c1ef0246bdf14555c50e9e573b0fa4b1bbca8b8f89f89a21a076630318acd21969be9060d1e7fba08cea85e22 SHA512 04d9f955129538cdd34175b6586fc548b80da1aa6d7cc7d8ecfb222e36ad184d51ad45c71b173ede7f8c1d948b9dafa3136b71cb47dfd8a73a0412445e6aae51
 DIST netdata-1.46.2.tar.gz 75133899 BLAKE2B 56fedb88071fffd906fbe7bd6eb78baab944e5fe4929e203e0cc29a0397c7ee71bb4718c372d82981d47ecb2caaa38fd071ed619c058a76165a6c02a2165f5cc SHA512 d38951df52638ed8a620e7b271e1ad9fb30b7de1a38b0080c36cdccdb6c64928ff63e6c631d0e762b887d16a94e603a8414eabc0b288cb82e839fadfd38accb3
+DIST netdata-1.47.0.tar.gz 51034692 BLAKE2B 3d0fabb24a6e0b5c7f2b8059e1fb66ce06d2bac1d1eac8919398b37015e8902d8c29ba3a31c05d0d0427d843410f6b24016aab34fc607ed557fbe7d581f35715 SHA512 8470398d60eba82af94ee1bc41896bc8200decbd51f242d0ef4ac293f5b0257cd72dd88191d82a37e717c08ed50e75bc72855a65d76356491c487ba50ade395e
+DIST netdata-1.47.1.tar.gz 51028613 BLAKE2B 435aeb7a87655b234ac7373307d05b9933e40817fdcdbdf291c1b2719eb9d6e5fa53fe4fb81b715303a87d8f1f7faeac1b3f97c042f76f6872250aacf805503e SHA512 33a94d93caf2c58874da3dd4e62ebabda7e8d303a4f04712dac0cf4e59ff9c384016a6b356783370567c6857c81f0df294331f889198bbf115a00f3df7378758
diff --git a/net-analyzer/netdata/netdata-1.47.0.ebuild b/net-analyzer/netdata/netdata-1.47.0.ebuild
new file mode 100644
index 000000000000..2f9af0d43617
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.47.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} )
+
+inherit cmake fcaps linux-info optfeature python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	app-alternatives/awk
+	sys-libs/libcap
+	cups? ( net-print/cups )
+	app-arch/lz4:=
+	app-arch/zstd:=
+	app-arch/brotli:=
+	dbengine? (
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libpcre2:=
+	dev-libs/libuv:=
+	dev-libs/libyaml
+	dev-libs/protobuf:=
+	bpf? ( virtual/libelf:= )
+	sys-libs/zlib
+	ipmi? ( sys-libs/freeipmi )
+	dev-libs/json-c:=
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl:=
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		app-arch/snappy:=
+		dev-libs/protobuf:=
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep'
+	'usr/libexec/netdata/plugins.d/apps.plugin'
+	'usr/libexec/netdata/plugins.d/debugfs.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+		-DCMAKE_INSTALL_PREFIX=/
+		-DENABLE_ACLK=$(usex aclk)
+		-DENABLE_CLOUD=$(usex cloud)
+		-DENABLE_DBENGINE=$(usex dbengine)
+		-DENABLE_PLUGIN_CUPS=$(usex cups)
+		-DENABLE_PLUGIN_NFACCT=$(usex nfacct)
+		-DENABLE_PLUGIN_FREEIPMI=$(usex ipmi)
+		-DENABLE_EXPORTER_MONGODB=$(usex mongodb)
+		-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus)
+		-DENABLE_PLUGIN_XENSTAT=$(usex xen)
+		-DENABLE_PLUGIN_EBPF=$(usex bpf)
+		-DENABLE_PLUGIN_GO=FALSE
+		-DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -rf "${D}/var/cache" || die
+	rm -rf "${D}/var/run" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	keepdir /var/lib/netdata/cloud.d
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}"
+	newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}"
+	systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service"
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer"
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+
+	optfeature "go.d external plugin" net-analyzer/netdata-go-plugin
+}
diff --git a/net-analyzer/netdata/netdata-1.47.1.ebuild b/net-analyzer/netdata/netdata-1.47.1.ebuild
new file mode 100644
index 000000000000..2f9af0d43617
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.47.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} )
+
+inherit cmake fcaps linux-info optfeature python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	app-alternatives/awk
+	sys-libs/libcap
+	cups? ( net-print/cups )
+	app-arch/lz4:=
+	app-arch/zstd:=
+	app-arch/brotli:=
+	dbengine? (
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libpcre2:=
+	dev-libs/libuv:=
+	dev-libs/libyaml
+	dev-libs/protobuf:=
+	bpf? ( virtual/libelf:= )
+	sys-libs/zlib
+	ipmi? ( sys-libs/freeipmi )
+	dev-libs/json-c:=
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl:=
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		app-arch/snappy:=
+		dev-libs/protobuf:=
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep'
+	'usr/libexec/netdata/plugins.d/apps.plugin'
+	'usr/libexec/netdata/plugins.d/debugfs.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
+		-DCMAKE_INSTALL_PREFIX=/
+		-DENABLE_ACLK=$(usex aclk)
+		-DENABLE_CLOUD=$(usex cloud)
+		-DENABLE_DBENGINE=$(usex dbengine)
+		-DENABLE_PLUGIN_CUPS=$(usex cups)
+		-DENABLE_PLUGIN_NFACCT=$(usex nfacct)
+		-DENABLE_PLUGIN_FREEIPMI=$(usex ipmi)
+		-DENABLE_EXPORTER_MONGODB=$(usex mongodb)
+		-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus)
+		-DENABLE_PLUGIN_XENSTAT=$(usex xen)
+		-DENABLE_PLUGIN_EBPF=$(usex bpf)
+		-DENABLE_PLUGIN_GO=FALSE
+		-DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -rf "${D}/var/cache" || die
+	rm -rf "${D}/var/run" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	keepdir /var/lib/netdata/cloud.d
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}"
+	newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}"
+	systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service"
+	systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer"
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+
+	optfeature "go.d external plugin" net-analyzer/netdata-go-plugin
+}
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index a65e20bdc67f..cc541437f51d 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1 +1,2 @@
+DIST netdiscover-0.10.tar.gz 403310 BLAKE2B 87de2dd647bb2f047cb8655a97f3b44c0d69e127bb6b67030f789e64345692c54a70ff799a866669b5cbbf174176f415057a7e642e5703dc8e5f5e9c95633dff SHA512 a04a3ecb9cb76f22edc761b1a661e6e0f5c620763ca5a059923ce2d080e0d15bc0e0861ae354efc28ba2cea09b642128d8ee022106402f82041180c22e8becc9
 DIST netdiscover-0.7.tar.gz 356514 BLAKE2B de880e124d1ee52c5466cf843ad3fc7077c9a673867f117f255791da9fcc8444599bf703515ef04eaa0f3fbc8ed50951bbd6cb147b1eb18020e06d35a90ccee4 SHA512 e526c1560c4054c6a2761d392997629b301c50db2c408719e84a820f9ad206825b9a4620e6721dcdebbb5c7479cd239e85de2d0657f97015b103805e8f9c05b4
diff --git a/net-analyzer/netdiscover/netdiscover-0.10.ebuild b/net-analyzer/netdiscover/netdiscover-0.10.ebuild
new file mode 100644
index 000000000000..0471f737666e
--- /dev/null
+++ b/net-analyzer/netdiscover/netdiscover-0.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Active/passive address reconnaissance tool"
+HOMEPAGE="https://github.com/netdiscover-scanner/netdiscover"
+SRC_URI="
+	https://github.com/${PN}-scanner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=net-libs/libpcap-0.8.3-r1
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0fa4d25ff5fa..a93dbd521953 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 		# The bundled libdnet is incompatible with the version available in the
 		# tree, so we cannot use the system library here.
 		--with-libdnet=included
-		--with-pcre="${ESYSROOT}"/usr
+		--with-libpcre="${ESYSROOT}"/usr
 		--without-dpdk
 	)
 
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index a8294a39bc80..1e8154929c2f 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,4 +1,2 @@
-DIST openvas-scanner-22.7.9.tar.gz 1069904 BLAKE2B 908810997880d1267f41df59905acc2ac2d491ab8453001ae8e2cc6881958150e8866b07b4e335888e8e574b5a347b33880bd24c9b8d140edd6c384e498e5dc9 SHA512 279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd
-DIST openvas-scanner-23.0.1.tar.gz 1387550 BLAKE2B 22f0b7f10fbb8be7d0897ce1895035ec9e330adee2a56d7c724e9e9fd54808ed10de5f05b3bb02918e44e45a7f85035e7d63fdd89345dcdb09d5180740823c74 SHA512 e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7
-DIST openvas-scanner-23.3.0.tar.gz 1416508 BLAKE2B de5864183b19df7b825bb74a5c38493b484494c5ef0f871f83e77efd6f6ce9934fd0a2365c5e7fe2b53e0c3f0c6a0eccd57528571dcd8586cbe5ef575aa5ec4f SHA512 cebe73f376a0b7731ffcb3eb9eb6e223ad490d8c0b708f07f508c562f2cfea956fa61e2bfb9141d2bf826c727be901ef2f455b74c055032f72cd52b7591bd171
 DIST openvas-scanner-23.3.2.tar.gz 1416687 BLAKE2B 6d8b0ba5b0a6f503ef27962fc9007f5538ecc6747aa713baec402acb20c5f7da01743a055173ed736ea90beb6d62f54ad8db8bffc915ce946416553f953b9842 SHA512 045a0811b5480170e52a218c8005d01acf064658aa0c3999ec9c07df9a0da47c53ad3de17565c1542c6f13521153e0477e9fdf92dee5f05e6723e29915cebc15
+DIST openvas-scanner-23.8.4.tar.gz 1448233 BLAKE2B 6ee681ebae29cecfdb237ac9e60959bc8cdaa5acf04af7e4d8b3de587a72f827101a6609e7434a34459b12842d555da2ecaf30c571609bdf7359e7d9c406b7c1 SHA512 63a5301610f16d046b709849dfe4c8a3cc57f551de0c8c30ae701cb278ba4ade964b1007efd14d74eedf1077537ae05b4fd6f84dd62a730240ee12fc85397a9b
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch
deleted file mode 100644
index 9d7294708360..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes underlinking pcatp lib in nasl/CMakeLists.txt
-Upstream PR: https://github.com/greenbone/openvas-scanner/pull/1611
-
-diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
-index 975154a..dd1b925 100644
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
- set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}")
- # line below is needed so it also works with no-undefined which is e.g. used by Mandriva
--target_link_libraries (openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS}
-+target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS}
-                          ${LIBOPENVAS_MISC_LDFLAGS}
-                          ${GLIB_JSON_LDFLAGS} 
-                          ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-23.3.0-link-curl.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-23.3.0-link-curl.patch
deleted file mode 100644
index 7fc9972a04b7..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-23.3.0-link-curl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Fixes underlinking curl lib in nasl/CMakeLists.txt
-Upstream PR: https://github.com/greenbone/openvas-scanner/pull/1647
-
-From d070e15547bf8377b90ed660c099c82fb30e2d32 Mon Sep 17 00:00:00 2001
-From: Giuseppe Foti <foti.giuseppe@gmail.com>
-Date: Sat, 18 May 2024 18:53:19 +0200
-Subject: [PATCH 1/2] link curl
-
-Signed-off-by: Giuseppe Foti <foti.giuseppe@gmail.com>
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
- set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}")
- # line below is needed so it also works with no-undefined which is e.g. used by Mandriva
--target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS}
-+target_link_libraries (openvas_nasl_shared openvas_misc_shared curl pcap ${GLIB_LDFLAGS}
-                          ${LIBOPENVAS_MISC_LDFLAGS}
-                          ${GLIB_JSON_LDFLAGS} 
-                          ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m
--- 
-2.43.2
-
-
-From 17475b6e7e3b0bf4ccc56915b1ea69adadfda0a5 Mon Sep 17 00:00:00 2001
-From: Giuseppe Foti <foti.giuseppe@gmail.com>
-Date: Sat, 18 May 2024 18:54:04 +0200
-Subject: [PATCH 2/2] Remove redundant whitespaces
-
-Signed-off-by: Giuseppe Foti <foti.giuseppe@gmail.com>
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -172,7 +172,7 @@ add_definitions (-DOPENVAS_GPG_BASE_DIR="${OPENVAS_GPG_BASE_DIR}")
- 
- include_directories (${GLIB_INCLUDE_DIRS}
-                      ${LIBOPENVAS_MISC_INCLUDE_DIRS}
--                     ${GLIB_JSON_INCLUDE_DIRS} 
-+                     ${GLIB_JSON_INCLUDE_DIRS}
-                      ${GPGME_INCLUDE_DIRS}
-                      ${LIBSSH_INCLUDE_DIRS}
-                      ${LIBGVM_BASE_INCLUDE_DIRS}
-@@ -181,7 +181,7 @@ include_directories (${GLIB_INCLUDE_DIRS}
-                      ${GCRYPT_INCLUDE_DIRS})
- 
- 
--# Build shared 
-+# Build shared
- add_library (openvas_nasl_shared SHARED ${FILES})
- set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
- set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-@@ -190,7 +190,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION
- # line below is needed so it also works with no-undefined which is e.g. used by Mandriva
- target_link_libraries (openvas_nasl_shared openvas_misc_shared curl pcap ${GLIB_LDFLAGS}
-                          ${LIBOPENVAS_MISC_LDFLAGS}
--                         ${GLIB_JSON_LDFLAGS} 
-+                         ${GLIB_JSON_LDFLAGS}
-                          ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m
-                          ${LIBGVM_BASE_LDFLAGS}
-                          ${LIBGVM_UTIL_LDFLAGS}
-@@ -219,5 +219,5 @@ install (FILES ${CMAKE_SOURCE_DIR}/doc/man/openvas-nasl.1
-          DESTINATION ${DATADIR}/man/man1 )
- 
- install (FILES ${CMAKE_SOURCE_DIR}/doc/man/openvas-nasl-lint.1
--         DESTINATION ${DATADIR}/man/man1 )   
-+         DESTINATION ${DATADIR}/man/man1 )
- ## End
--- 
-2.43.2
-
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index 8b98cc0ee111..177d061aa8be 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild
deleted file mode 100644
index 5c8c16dce1d2..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.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 cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
-
-MY_DN="openvas"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
-SRC_URI="
-	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ~x86"
-IUSE="doc snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	>=dev-db/redis-5.0.3
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/json-glib-1.4.4
-	>=net-libs/gnutls-3.2.15:=
-	>=net-analyzer/gvm-libs-22.4
-	net-libs/libpcap
-	app-crypt/gpgme:=
-	>=dev-libs/libgcrypt-1.6:=
-	dev-libs/libgpg-error
-	>=dev-libs/libksba-1.0.7
-	>=net-libs/libssh-0.6.0:=
-	dev-libs/libbsd
-	snmp? ( net-analyzer/net-snmp:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/bison-2.5
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		app-text/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-		virtual/pandoc
-	)
-	test? ( dev-libs/cgreen )
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove -Werror compiler flag
-	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
-	if use doc; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-
-	#Remove tests that doesn't work in the network sandbox
-	if use test; then
-		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
-		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DINSTALL_OLD_SYNC_SCRIPT=OFF"
-		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_build -C "${BUILD_DIR}" doxygen-full manual
-	fi
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use doc; then
-		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
-		local HTML_DOCS=(
-			"${BUILD_DIR}"/doc/generated/html/.
-			"${BUILD_DIR}"/doc/html-manual
-		)
-	fi
-	cmake_src_install
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners gvm:gvm /var/log/gvm
-	fi
-
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/openvas
-	fi
-
-	insinto /etc/openvas
-	newins "${FILESDIR}/openvas.conf-22" openvas.conf
-
-	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
-	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
-
-	insinto /etc/gvm
-	doins config/redis-openvas.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
-	fi
-
-	fperms 0750 /etc/gvm
-	fperms 0640 /etc/gvm/redis-openvas.conf
-
-	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
-	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o gvm -g gvm
-	fi
-	keepdir /var/lib/openvas/redis
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	tmpfiles_process redis-openvas.conf
-	optfeature "port scanner" net-analyzer/nmap
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
deleted file mode 100644
index 8e66176a615b..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
-
-MY_DN="openvas"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
-SRC_URI="
-	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	>=dev-db/redis-5.0.3
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/libgcrypt-1.6:=
-	dev-libs/libgpg-error
-	>=dev-libs/libksba-1.0.7
-	dev-libs/libbsd
-	>=net-libs/libssh-0.6.0:=
-	>=dev-libs/json-glib-1.4.4
-	>=net-analyzer/gvm-libs-22.4
-	>=net-libs/gnutls-3.6.4:=
-	net-libs/libpcap
-	>=net-misc/curl-7.74.0[ssl]
-	snmp? ( net-analyzer/net-snmp:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/bison-2.5
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		app-text/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-		virtual/pandoc
-	)
-	test? ( dev-libs/cgreen )
-"
-PATCHES=(
-	# See https://github.com/greenbone/openvas-scanner/pull/1611
-	"${FILESDIR}"/openvas-scanner-23.0.1-link-pcap.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove -Werror compiler flag
-	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
-	if use doc; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-
-	#Remove tests that doesn't work in the network sandbox
-	if use test; then
-		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
-		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_build -C "${BUILD_DIR}" doxygen-full manual
-	fi
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use doc; then
-		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
-		local HTML_DOCS=(
-			"${BUILD_DIR}"/doc/generated/html/.
-			"${BUILD_DIR}"/doc/html-manual
-		)
-	fi
-	cmake_src_install
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners gvm:gvm /var/log/gvm
-	fi
-
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/openvas
-	fi
-
-	insinto /etc/openvas
-	newins "${FILESDIR}/openvas.conf-22" openvas.conf
-
-	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
-	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
-
-	insinto /etc/gvm
-	doins config/redis-openvas.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
-	fi
-
-	fperms 0750 /etc/gvm
-	fperms 0640 /etc/gvm/redis-openvas.conf
-
-	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
-	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o gvm -g gvm
-	fi
-	keepdir /var/lib/openvas/redis
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	tmpfiles_process redis-openvas.conf
-	optfeature "port scanner" net-analyzer/nmap
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild
deleted file mode 100644
index b26024cee8d1..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
-
-MY_DN="openvas"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
-SRC_URI="
-	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	>=dev-db/redis-5.0.3
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/libgcrypt-1.6:=
-	dev-libs/libgpg-error
-	>=dev-libs/libksba-1.0.7
-	dev-libs/libbsd
-	>=net-libs/libssh-0.6.0:=
-	>=dev-libs/json-glib-1.4.4
-	>=net-analyzer/gvm-libs-22.4
-	>=net-libs/gnutls-3.6.4:=
-	net-libs/libpcap
-	>=net-misc/curl-7.74.0[ssl]
-	snmp? ( net-analyzer/net-snmp:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/bison-2.5
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		app-text/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-		virtual/pandoc
-	)
-	test? ( dev-libs/cgreen )
-"
-PATCHES=(
-	# See https://github.com/greenbone/openvas-scanner/pull/1647
-	"${FILESDIR}"/openvas-scanner-23.3.0-link-curl.patch
-)
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Remove -Werror compiler flag
-	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
-	if use doc; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-
-	#Remove tests that doesn't work in the network sandbox
-	if use test; then
-		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
-		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_build -C "${BUILD_DIR}" doxygen-full manual
-	fi
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use doc; then
-		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
-		local HTML_DOCS=(
-			"${BUILD_DIR}"/doc/generated/html/.
-			"${BUILD_DIR}"/doc/html-manual
-		)
-	fi
-	cmake_src_install
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners gvm:gvm /var/log/gvm
-	fi
-
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/openvas
-	fi
-
-	insinto /etc/openvas
-	newins "${FILESDIR}/openvas.conf-22" openvas.conf
-
-	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
-	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
-
-	insinto /etc/gvm
-	doins config/redis-openvas.conf
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
-	fi
-
-	fperms 0750 /etc/gvm
-	fperms 0640 /etc/gvm/redis-openvas.conf
-
-	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
-	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
-
-	if use prefix; then
-		diropts -m0750
-	else
-		diropts -m0750 -o gvm -g gvm
-	fi
-	keepdir /var/lib/openvas/redis
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	tmpfiles_process redis-openvas.conf
-	optfeature "port scanner" net-analyzer/nmap
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild
new file mode 100644
index 000000000000..4437e7dc21b4
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-23.8.4.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature
+
+MY_DN="openvas"
+
+DESCRIPTION="Open Vulnerability Assessment Scanner"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
+SRC_URI="
+	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc snmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/gvm
+	app-crypt/gpgme:=
+	>=dev-db/redis-5.0.3
+	>=dev-libs/glib-2.42:2
+	>=dev-libs/libgcrypt-1.6:=
+	dev-libs/libgpg-error
+	>=dev-libs/libksba-1.0.7
+	dev-libs/libbsd
+	>=net-libs/libssh-0.6.0:=
+	>=dev-libs/json-glib-1.4.4
+	>=net-analyzer/gvm-libs-22.4
+	>=net-libs/gnutls-3.6.4:=
+	net-libs/libpcap
+	>=net-misc/curl-7.74.0[ssl]
+	snmp? ( net-analyzer/net-snmp:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/bison-2.5
+	app-alternatives/lex
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		app-text/xmltoman
+		app-text/htmldoc
+		dev-perl/CGI
+		dev-perl/SQL-Translator
+		virtual/pandoc
+	)
+	test? ( dev-libs/cgreen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# QA-Fix | Remove -Werror compiler flag
+	sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560
+	# QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
+	if use doc; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+
+	#Remove tests that doesn't work in the network sandbox
+	if use test; then
+		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
+		"-DOPENVAS_RUN_DIR=/run/ospd"
+		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_build -C "${BUILD_DIR}" doxygen-full manual
+	fi
+	cmake_build rebuild_cache
+	if use test; then
+		cmake_build tests
+	fi
+}
+
+src_install() {
+	if use doc; then
+		mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die
+		local HTML_DOCS=(
+			"${BUILD_DIR}"/doc/generated/html/.
+			"${BUILD_DIR}"/doc/html-manual
+		)
+	fi
+	cmake_src_install
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/log/gvm
+	if ! use prefix; then
+		fowners gvm:gvm /var/log/gvm
+	fi
+
+	keepdir /var/lib/openvas/{gnupg,plugins}
+	if ! use prefix; then
+		fowners -R gvm:gvm /var/lib/openvas
+	fi
+
+	insinto /etc/openvas
+	newins "${FILESDIR}/openvas.conf-22" openvas.conf
+
+	systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service
+	newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf
+
+	insinto /etc/gvm
+	doins config/redis-openvas.conf
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf
+	fi
+
+	fperms 0750 /etc/gvm
+	fperms 0640 /etc/gvm/redis-openvas.conf
+
+	newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas
+	newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o gvm -g gvm
+	fi
+	keepdir /var/lib/openvas/redis
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	tmpfiles_process redis-openvas.conf
+	optfeature "port scanner" net-analyzer/nmap
+	readme.gentoo_print_elog
+}
diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml
index 18eb90f3e699..cfeef6b2af20 100644
--- a/net-analyzer/ospd-openvas/metadata.xml
+++ b/net-analyzer/ospd-openvas/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml
index fc9cf3041b5d..d040955023c6 100644
--- a/net-analyzer/python-gvm/metadata.xml
+++ b/net-analyzer/python-gvm/metadata.xml
@@ -5,10 +5,6 @@
 		<email>foti.giuseppe@gmail.com</email>
 		<name>Giuseppe Foti</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jonas.licht@gmail.com</email>
-		<name>Jonas Licht</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index f8a03b85593f..e9e50b6bde6e 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,2 +1,3 @@
 DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3
 DIST sngrep-1.7.0.tar.gz 248947 BLAKE2B 39a5d9bc71df9fb5bd4abadadf3f8fc8a680dd06eb4a7f06bb597a70215854d0ee4b93b39cfff67e2b15b6fed4ffac2865741af31b21a7ba8a91f9c01c4c750a SHA512 ecf31d61643ecc9ba1a9fe7759ae8c2c65fcbf6886ed263def2993dd6900eb9aeaddce8ebbde71e1ec57fbdc11a388de05f7c13f4587714e3b3e33689cf591b0
+DIST sngrep-1.8.2.tar.gz 254184 BLAKE2B c13ffc6ff8231e0c1086a65815abb3d9831a3f016d7348da773c69d38a1c4433fdae98b6e810f277e350cad8d48033090ab86c0bd6ff237dd88e9c1b5207ac87 SHA512 0aa630ccd1816e81ed2d16f30275326ea4a91becd053ce5480a9695300e0cf1a97d06b75be248e8915a3e61f94baad0f6e61c2b580a28d291d1b8204388570c4
diff --git a/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
index 89771013483f..ed6f944f83d8 100644
--- a/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="Ncurses SIP Messages flow viewer"
 HOMEPAGE="https://github.com/irontec/sngrep"
 SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="eep gnutls pcre ssl zlib"
diff --git a/net-analyzer/sngrep/sngrep-1.7.0.ebuild b/net-analyzer/sngrep/sngrep-1.7.0.ebuild
index 4ec90e3677e8..ed6f944f83d8 100644
--- a/net-analyzer/sngrep/sngrep-1.7.0.ebuild
+++ b/net-analyzer/sngrep/sngrep-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="Ncurses SIP Messages flow viewer"
 HOMEPAGE="https://github.com/irontec/sngrep"
 SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="eep gnutls pcre ssl zlib"
diff --git a/net-analyzer/sngrep/sngrep-1.8.2.ebuild b/net-analyzer/sngrep/sngrep-1.8.2.ebuild
new file mode 100644
index 000000000000..1f492deec9f9
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.8.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls pcre ssl zlib"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=[unicode(+)]
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	pcre? ( dev-libs/libpcre2 )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ipv6
+		--enable-unicode
+		--without-pcre
+		$(use_enable eep)
+		$(use_with pcre pcre2)
+		$(use_with ssl $(usex gnutls gnutls openssl))
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-analyzer/snmpclitools/Manifest b/net-analyzer/snmpclitools/Manifest
index b21a3514efb0..5ab032edf383 100644
--- a/net-analyzer/snmpclitools/Manifest
+++ b/net-analyzer/snmpclitools/Manifest
@@ -1 +1,2 @@
 DIST snmpclitools-0.6.4.tar.gz 50853 BLAKE2B 23b28395c1b4d376e4b39f8ebb6d9acf8329da8c9bd6403d0670236ed89a783c0145ceb3ed31a653055bc6fbde785f911e6eeb30f32a587b80878b26ea2a8ba1 SHA512 42c0905f65bc855f7f0089ee7e944543e29ca0ca5a8d7185f5fa877f9c97cae1f1952477e85c614db9785deabad1770f1a046c4e6e98a7832097581f8e14748c
+DIST snmpclitools-0.7.2.tar.gz 59948 BLAKE2B fc2b0bf913e7145a62a910d759c18ed5a4954783d386b18af55522061bc729ec2337b8871ed76c8419441ed9b81be6e05ffd173c713356cd1a2d59e43d6e3912 SHA512 2b546f2286d8fe977ca17b6f04fa871a5d7d5d815a2157aef6c6af12e05021be829f766e43abda439c5ee5ae8a84e366178381d10760a536302363245ae5739b
diff --git a/net-analyzer/snmpclitools/metadata.xml b/net-analyzer/snmpclitools/metadata.xml
index 1584f1bcd08d..1f1815af0069 100644
--- a/net-analyzer/snmpclitools/metadata.xml
+++ b/net-analyzer/snmpclitools/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">etingof/snmpclitools</remote-id>
+		<remote-id type="pypi">snmpclitools</remote-id>
+		<remote-id type="github">lextudio/snmpclitools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild
index 190b3e6f2f15..276a0dc17282 100644
--- a/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild
+++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1
 
-DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps"
+DESCRIPTION="Pure-Python SNMP management tools"
 HOMEPAGE="https://github.com/etingof/snmpclitools"
 SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="!dev-python/pysnmp-apps
+RDEPEND="
 	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
-	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]"
+	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
+"
diff --git a/net-analyzer/snmpclitools/snmpclitools-0.7.2.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.7.2.ebuild
new file mode 100644
index 000000000000..520d0ff66e99
--- /dev/null
+++ b/net-analyzer/snmpclitools/snmpclitools-0.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure-Python SNMP management tools"
+HOMEPAGE="
+	https://github.com/lextudio/snmpclitools/
+	https://pypi.org/project/snmpclitools/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pysnmp-6.0.0[${PYTHON_USEDEP}]
+"
+
+# TODO: doc
+#distutils_enable_sphinx docs/source \
+#	dev-python/sphinx-copybutton dev-python/sphinx-notfound-page dev-python/sphinx-sitemap
diff --git a/net-analyzer/syweb/Manifest b/net-analyzer/syweb/Manifest
index 578e04176939..4e6da8cb6035 100644
--- a/net-analyzer/syweb/Manifest
+++ b/net-analyzer/syweb/Manifest
@@ -1 +1,2 @@
 DIST syweb-0.65.tar.gz 37052 BLAKE2B 502bee5e78bdfd309780dd7414616eec99982b3c203039aff645842fc6538396180dabcc9953a70f4bc7c7326fb28c11dc5bd4fd17b8e5c409a8424203b61a88 SHA512 ca4a4ad6f48dc4ff32c11979d6f34ae6f87462fd295780cdef6609ca425d21698ff43e2c5ffbf43a1f1ecccef4718891992160d1fbc1325726c474d113f824b2
+DIST syweb-0.67.tar.gz 40380 BLAKE2B 2856d552799577f5e3e10821ef06f23d747c1f814e7a578371d62702fa6aeeaa6a04491a66c2a0ff6cf78672e62c65871a903416317f96239959b5a3faf9ff4e SHA512 a0b7c3e390e3c9849a85c08872e9baa9c75df8d0e00d4b7e3dadb0f4a38f244efdbb4b58eb2221c5296f25b9152ac8b54e615cc56e641600ce28600f6115e264
diff --git a/net-analyzer/syweb/syweb-0.65-r1.ebuild b/net-analyzer/syweb/syweb-0.65-r1.ebuild
index 1f6494bd2c77..f3122287ff22 100644
--- a/net-analyzer/syweb/syweb-0.65-r1.ebuild
+++ b/net-analyzer/syweb/syweb-0.65-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,8 +7,8 @@ WEBAPP_MANUAL_SLOT="yes"
 inherit webapp
 
 DESCRIPTION="Web frontend to symon"
-HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
-SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+HOMEPAGE="https://www.xs4all.nl/~wpd/symon/"
+SRC_URI="https://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
diff --git a/net-analyzer/syweb/syweb-0.67.ebuild b/net-analyzer/syweb/syweb-0.67.ebuild
new file mode 100644
index 000000000000..f3122287ff22
--- /dev/null
+++ b/net-analyzer/syweb/syweb-0.67.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WEBAPP_MANUAL_SLOT="yes"
+inherit webapp
+
+DESCRIPTION="Web frontend to symon"
+HOMEPAGE="https://www.xs4all.nl/~wpd/symon/"
+SRC_URI="https://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="
+	net-analyzer/rrdtool
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG README
+	docinto layouts
+	dodoc symon/*.layout
+
+	dodir "${MY_HOSTROOTDIR}"/syweb/cache
+	insinto "${MY_HOSTROOTDIR}"/syweb
+	doins symon/hifn_test.layout
+	webapp_serverowned "${MY_HOSTROOTDIR}"/syweb/cache
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/syweb/*
+	webapp_configfile "${MY_HTDOCSDIR}"/setup.inc
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index a9f92479362d..d6e49e27faef 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,2 +1,4 @@
 DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
 DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8
+DIST tcpdump-4.99.5.tar.gz 2045086 BLAKE2B 754c25eafe84754465356042faa1369678655aa93d1b736c259ca9a6bd1e18c44784ae136dc6a3e64af9903c05c29e1379aafd7badc0e129c5a29ae908db13ff SHA512 69bc52ef7af7fd562370adf2e95cb592aad6193df9ab1708de52ac86a4c1cff72e8b256a739b435c324ee2df61051abde7d2659bc40f061d7c4fbcab1dcaa2e2
+DIST tcpdump-4.99.5.tar.gz.sig 442 BLAKE2B 8742616147e2965ea6879b471662669f1942cdb8892834ac3ebfd4a6f610bde1a091bb85dc8c0836b26d1db7036d072608d7242ee4ddfbf590a07beb584a67cc SHA512 e36d2023973335cb95e91cb13414f6c0e6386175ed88fdeb2c0afabf7c39ad43f138d13b18ff2e88b142aad5147d37ddc03c3111e9d4d22bf3697e0acc30905c
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch
new file mode 100644
index 000000000000..0be1d7a75aaf
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.99.5-lfs.patch
@@ -0,0 +1,22 @@
+https://github.com/the-tcpdump-group/tcpdump/pull/1068
+
+From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 27 Jul 2023 08:31:53 +0100
+Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE
+
+This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms.
+
+Bug: https://bugs.gentoo.org/911176
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,8 @@ fi
+ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+ AC_LBL_C_INLINE
+ 
++AC_SYS_LARGEFILE
++
+ AC_CHECK_HEADERS(rpc/rpc.h rpc/rpcent.h net/if.h)
+ #
+ # Get the size of a void *, to know whether this is a 32-bit or 64-bit build.
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch
new file mode 100644
index 000000000000..c7448fb311c1
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.99.5-libdir.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -427,7 +427,7 @@ fi
+ 
+ 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
+@@ -1168,7 +1168,7 @@ return 0;
+ 		#
+ 		AC_LBL_SAVE_CHECK_STATE
+ 		CFLAGS="$CFLAGS -I$libcrypto_root/include"
+-		LIBS="$LIBS -L$libcrypto_root/lib -lcrypto"
++		LIBS="$LIBS -lcrypto"
+ 		AC_MSG_CHECKING(whether we have a system OpenSSL/libressl that we can use)
+ 		AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ 		    [[
+@@ -1182,7 +1182,7 @@ return 0;
+ 			AC_MSG_RESULT(yes)
+ 			HAVE_LIBCRYPTO=yes
+ 			LIBCRYPTO_CFLAGS="-I$libcrypto_root/include"
+-			LIBCRYPTO_LIBS="-L$libcrypto_root/lib -lcrypto"
++			LIBCRYPTO_LIBS="-lcrypto"
+ 		    ],
+ 		    AC_MSG_RESULT(no))
+ 		AC_LBL_RESTORE_CHECK_STATE
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild
new file mode 100644
index 000000000000..00d989c63d4a
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A tool for network monitoring and data acquisition"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+caps +smi +ssl +samba suid test"
+REQUIRED_USE="test? ( samba )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libpcap-1.10.1
+	caps? (
+		acct-group/pcap
+		acct-user/pcap
+		sys-libs/libcap-ng
+	)
+	smi? ( net-libs/libsmi )
+	ssl? (
+		>=dev-libs/openssl-0.9.6m:=
+	)
+	suid? (
+		acct-group/pcap
+		acct-user/pcap
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-lang/perl
+	)
+"
+BDEPEND="caps? ( virtual/pkgconfig )"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240901 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.99.5-libdir.patch
+	"${FILESDIR}"/${PN}-4.99.5-lfs.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable samba smb) \
+		$(use_with caps cap-ng) \
+		$(use_with smi) \
+		$(use_with ssl crypto "${ESYSROOT}/usr") \
+		$(usex caps "--with-user=pcap" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use caps ; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-caps"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid ; then
+		fowners root:pcap /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 6d223129b9ed..fc0d793f2a15 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,13 +24,13 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+drop-root +smi +ssl +samba suid test"
+IUSE="+caps +smi +ssl +samba suid test"
 REQUIRED_USE="test? ( samba )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-libs/libpcap-1.10.1
-	drop-root? (
+	caps? (
 		acct-group/pcap
 		acct-user/pcap
 		sys-libs/libcap-ng
@@ -50,17 +50,12 @@ DEPEND="
 		dev-lang/perl
 	)
 "
-BDEPEND="drop-root? ( virtual/pkgconfig )"
+BDEPEND="caps? ( virtual/pkgconfig )"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240901 )"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-libdir.patch
-	"${FILESDIR}"/${PN}-9999-lfs.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
@@ -69,19 +64,18 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable samba smb) \
-		$(use_with drop-root cap-ng) \
-		$(use_with drop-root chroot '') \
+		$(use_with caps cap-ng) \
 		$(use_with smi) \
 		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=pcap" "")
+		$(usex caps "--with-user=pcap" "")
 }
 
 src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
+	if [[ ${EUID} -ne 0 ]] || ! use caps ; then
 		emake check
 	else
 		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+		ewarn "set FEATURES=userpriv or set USE=-caps"
 	fi
 }
 
diff --git a/net-analyzer/tcpslice/tcpslice-1.5.ebuild b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
index d6ef4a8164f7..7a5e9c78a7a7 100644
--- a/net-analyzer/tcpslice/tcpslice-1.5.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit verify-sig
 
 DESCRIPTION="Extract and concatenate portions of pcap files"
-HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
 SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz
 	verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
diff --git a/net-analyzer/tcpslice/tcpslice-1.7.ebuild b/net-analyzer/tcpslice/tcpslice-1.7.ebuild
index addd46fe7ec6..2e725ff18f9b 100644
--- a/net-analyzer/tcpslice/tcpslice-1.7.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.7.ebuild
@@ -7,7 +7,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tcpdump.asc"
 inherit verify-sig
 
 DESCRIPTION="Extract and concatenate portions of pcap files"
-HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
 SRC_URI="
 	https://www.tcpdump.org/release/${P}.tar.xz
 	verify-sig? ( https://www.tcpdump.org/release/${P}.tar.xz.sig )
diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
index 5587fcf6e107..f6b2f45ff837 100644
--- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
 MY_PV="${PV/./_}"
 
 DESCRIPTION="Internet bandwidth tester"
-HOMEPAGE="http://tptest.sourceforge.net/"
+HOMEPAGE="https://tptest.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/tptest/tptest-3.1.7-r3.ebuild b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild
index 58fefcd79cff..b1331c02ae92 100644
--- a/net-analyzer/tptest/tptest-3.1.7-r3.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
 MY_PV="${PV/./_}"
 
 DESCRIPTION="Internet bandwidth tester"
-HOMEPAGE="http://tptest.sourceforge.net/"
+HOMEPAGE="https://tptest.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-4.2.6.ebuild b/net-analyzer/wireshark/wireshark-4.2.6.ebuild
index 63bc4eeebbb0..8d02bfc81fb4 100644
--- a/net-analyzer/wireshark/wireshark-4.2.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.6.ebuild
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-analyzer/wtfis/wtfis-0.10.0.ebuild b/net-analyzer/wtfis/wtfis-0.10.0.ebuild
index ffc1de3aaabe..65becaf5436a 100644
--- a/net-analyzer/wtfis/wtfis-0.10.0.ebuild
+++ b/net-analyzer/wtfis/wtfis-0.10.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git"
 else
 	SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index f3388e39c759..be3f77c39870 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -2,21 +2,15 @@ DIST zabbix-5.0.42-go-deps.tar.xz 27792520 BLAKE2B 900f47dd211d761204d9b47ad3869
 DIST zabbix-5.0.42.tar.gz 21825176 BLAKE2B 378b740ec70d29156b4a9cf4b67436ff63057513bcd9ad596f3da2c2737cff16a5b88e84763f94c621e549a8749ef8995b4d51d578e533d62b9e07842bbe4dea SHA512 305b2d1873aad091aeb893e82f5c9aeb253c71683a1a95f7711c824fe0b9b29c7c6e96a17a727f9eb0f512d0983bb7d62bfb32e9a50b7ff2e7b0e9bf7d9ff42e
 DIST zabbix-5.0.43-go-deps.tar.xz 27816524 BLAKE2B 10f575550304c90b22bacebcfd4498da06a366da4fe2a540af00bef68dcc7c89def96829045a75498d61c4e46dfbe81cd5d64115fbefc9e14bd528fd3c945e77 SHA512 89640317385035b84f6df022a3a837230ace1ffde4addddeb08fb36c69c3e29d8596401a79f4a8e743f08fe252b84d8bb8163bb82d6bafdfb30128aaad0d5325
 DIST zabbix-5.0.43.tar.gz 21882108 BLAKE2B fd8bb51cbe8f919270f0890394bd850ab969516b0031544deb0eb4c467dc1dd22d0c0dcc7faf21df2e60aa2d7c941628de35629c4ae96a5122cecbd23ee5e588 SHA512 c3fe4dc8aec87efee93e3da40a69f7546be49b7fbf01967f0d3af657f6ebe415eb038d1d94e9ceeb6e9f5797f1168bf03eba42830cfe75738066153c57ce52dc
-DIST zabbix-6.0.30-go-deps.tar.xz 30833644 BLAKE2B 0b15f210c16dd8ab6bef0fbcb1926dee99aa73716ebe2285c69e9630723c5a85d1083c380c192707cf56c5ff04d3064320eda12d568c08e104f629dc256d696c SHA512 c5074ed89a60b5491a823015126a15d4e58f1964887d15b5e7ca9ecaea3ff2c026f4e2554db25bb26367a66adfc981a7debb89c08fb90927241e7f018fd2ab11
-DIST zabbix-6.0.30.tar.gz 45039653 BLAKE2B 5446a15c5fa3400d78eef47cced6cbd0bc884b6b1f14e267321f562b5891e21de41179bb615a733b49ee0ae334aadede32d931db400b9148ec9bc6636ac71e5a SHA512 8e49b53a30d4c9450ea00600144542cc1c709b2a11f3716462eefedee4d47b59c99334002bfd6644c6c49afaba0a268c86f9824ac7d45305c95b55681fd82eee
-DIST zabbix-6.0.31-go-deps.tar.xz 31203888 BLAKE2B e4b2a8a0f505f01b58dc0dd6baf5ea243cbba0fe996aa022a64248a1b698f8919aead95540e05dad71c7b3610cc86ba40dcb685960a0f234d1dc04739ed69f38 SHA512 ef6813f7e29aaf5b2361952fe5373fdbbb2b9a9c39a2314cd3daf8e4f8233f8ded31f29c3efe1f8a9fecb79c4872d5fb7ffdc846c7dd6bbdfb95f683f936e48a
-DIST zabbix-6.0.31.tar.gz 45176869 BLAKE2B d00a02d764f3f8800a87ef5763fff3cd27b5e6c8ed57bd07b23da809e9b4dd61a1b575c7717ff39311b16bba4906256a48ab01e8f2b4b594bcfde25ae003ed73 SHA512 75488e47ac32758f41ebe76d2e6a0e7f165e3921e04b9ac8304dc72a97718739aef06c42baa3d474066bd6f10c944547131c25ef4d553df9cbd13b797ea3d586
 DIST zabbix-6.0.32-go-deps.tar.xz 31197844 BLAKE2B 91d99f94ed189c0e8f08d01c5b88835588c7797d33c54b0c60d593afe8d6f14aa481a6036db840ca7b2782ac4440dcaf757306a52ef11fce1408714c8face139 SHA512 63d9804563c12aac7fed4de28b6c1726f1bdfe338170a5d6c82413736920b082287dbb1fd7d64b7db84d013403dde2f5518783135495ff7e2563e927e6e213f9
 DIST zabbix-6.0.32.tar.gz 45340574 BLAKE2B 7b6b7db112184691e9584a7017776c14023ee94f6228c21b9b2c4a1e6e822454e8c1847d51ba4ac71b984e40d4d80e64b77155c64ea2fe45f00c2b02dcc6a215 SHA512 f19fe303b5377fbdc78c63016e7af1395a07e96b1ae394afe73fc9c7669b6eccb599942e9aebe7e173d827bc3c48284c918e9867dded00f4f0da74cb60653221
 DIST zabbix-6.0.33-go-deps.tar.xz 30931784 BLAKE2B 675550b5573917aa091ed5a84670d3aa218484e5c224f02e9fa7f93a99beb11296506f69d6d3858b4382d83e8fc0db78414ceb9868fff5ddd83ceadb8df3e7d5 SHA512 62c61406b0f327bdf2362c6aa3a31a2c12fd9b8e55fa8e0667035a3ff28a26f41703adc9f195937a5fad0ff0f13538684c5cf99cbf8734540a0e7e04404b3129
 DIST zabbix-6.0.33.tar.gz 45392256 BLAKE2B 736c5b46193e7e7f93dfa00eb56c65fdf3fa6e36a647d0f910118923950114dbbbe9382563e96db4d8ee6199b4e0342037fb8ec6ec8d349884612f5ef18db966 SHA512 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d
-DIST zabbix-6.4.15-go-deps.tar.xz 33572368 BLAKE2B 2065ede50e7682b180387e08b2b2e9893fde4dd5316d2087aa7931a0e08b100558a47b49e9e5204f60ad9e0ce480dce9787e7a43d3841a67b9ea96db80fd1703 SHA512 347b51492147e203a2d7966fd8fe8f2b044fecd45948a767fcf4f79c96cebe8774643a1d0940a76103d25eecf852770a3a7c156d371a3de2cfef2121de5c076a
-DIST zabbix-6.4.15.tar.gz 46631895 BLAKE2B 3f9c23db6e8d0895b1fb5566b2cd9877d1e219c17ebea7dc5057621313c9b6f7ecd5cf1bedd3f759dfa4a429a87b50b06b97bb663d756817027c2f04ce3a625a SHA512 2fb032a02e3c507807dde140fdb17ad453ba199c724f3eb7e0e053d64df3c4f57bbc63b794eedfb3b5000f23bcabb5d6aa89039fa6f1a118c70f5cd44fd5ff02
-DIST zabbix-6.4.16-go-deps.tar.xz 33766756 BLAKE2B 24ce0f3febbdeaf16f54eb351861ba8adbd59e9a54ab898882eab80741f34b7f255d226f4a61df2f8b5c4ac9e36160fa14ce872ab0c55c811eb4f5529c5213db SHA512 925344d69da4cadf9ea4fd27a1f991c14a6b77d0c58f3884e4c4e0b29f5ab2427507d2cce3d81085feafc88b87e6c1c1885813cd97543af28b0c0cf4246b5988
-DIST zabbix-6.4.16.tar.gz 46717893 BLAKE2B 69212ba902195cabc38a14c9c0865d3f613662b58c5d21b654f030e888d9a33eec8c2149478b1e28af2bcfae07c9f34d5bc2531d17fd15f095916dfb64d76e64 SHA512 1688ac2fa6f3361f866f93e39b38c898e2460c510b982301b67899bcf42fb3949c843918fd0b566c5c1126ef8cb39407d5b73d22c6a0fd7a8404506df0544e33
 DIST zabbix-6.4.17-go-deps.tar.xz 34014892 BLAKE2B d3e4710fb1cb86a8842cef4fb66a9d68df6738cf6cf4c9a9d219f6af16e4829627c668fefca79d7face897b529b76182f0068629f4278ed68af8c97e49a204a7 SHA512 96b58aba2b14b5f9c89aeb65efbc30304fab1e276d2cb2b23cac90510b71ab6ce7dec4520ebe5c1dc244e95475dfa259e320390078b10aaaf8042d8039342bdb
 DIST zabbix-6.4.17.tar.gz 46879401 BLAKE2B 957ae298e09debeb962d6b902569eb083cd3b6f93371984c7adb4464e4c1547292bf9df6ced5440c775b81e7b3276d8ec124f844de7d3bc68639a7bab1e41c2a SHA512 ef0840427c1814c6292debbabaa0754f377d1b4ad8c36474acabfd5d474cc3d0ceef36daccf2aa545ccda66e42b674ca3fe038eea9569127adc08cbfacf87b55
-DIST zabbix-7.0.0-go-deps.tar.xz 33347940 BLAKE2B 7da8c3ff2bb74c31c551d61fa3d5ffc6d6a330361eea178dffc5379412da2fce9330acfe35bef2ae1c515a47ecef3ff24f54f17692cb32226d928b4f1d2072e8 SHA512 a365da2fb5dc3ecdaa2a4c4ee53aa022b298ded16e150814cc0cbd3b9dbaa12d5f163130724ba2ac6a129acc99386b7fd81ca3834d69fb856bdc805d90c0d3c2
-DIST zabbix-7.0.0.tar.gz 47919968 BLAKE2B dc6736a1e433b5f0d742ec9e908b47a0094da77f69103d566b7476379a28819e46d9327d53e388b9ccfeb7b3b4d976fb47ba94a02057ab62ef8294e19af00188 SHA512 3302f6f7b8731e25c87d1582f897d25b8e9b5eeeddb3632aea57e39bb7a47acbaa5e74e175e83166ea3476e7e932f3282b6cc353104cdfc87dea3d4976fbc703
+DIST zabbix-6.4.18-go-deps.tar.xz 33714692 BLAKE2B abb5899e8ce233fe20a84e167b3615e46c578901df6786cb7e7781f355b108a44bb06ba68426483d5c5eb11fd5c0984efa945224d53f0ebd4a358e9a35c48b26 SHA512 8032fca6dff2f48f16e6c7e37d3df06336276c7f242654996b80f7c5eb083d289f5e6d65c8df79e22b956d28ba498e68eb2fe42adeedac97942bb73a23122d1e
+DIST zabbix-6.4.18.tar.gz 46907603 BLAKE2B 978c51a40995687537c453feac1232d39490fa4f49973f3a7febe6e7a0d5424b056b26f7f2509cb7e8fca8c9c648e7fe16208e7f72850fb3a73d92d09e0115c0 SHA512 b7a6b7bd5321bd7921a9ecb5fb205a872dc5db06a82cb307a26233cf5ee644f8a6d8087b03396bdef4a86095839e5c79cc269b19b27adefb13aa387bc5607cbd
 DIST zabbix-7.0.2-go-deps.tar.xz 33723108 BLAKE2B a1a726e81d92c536ac1398c0573912477ec8fc88b95672da2dc972f68399cd4364438a8e4d0c8ea10666a0861d2ba652fa32921ce5bada990627f256858e0c6e SHA512 76949158cc8281b35a2ddfb1c2c9b36f1a4dbaea05fb6add0b20f31a59f32ace641de789a1f819eb73a56353f7e456785a69763cea960aaa46ef9d6ba9b34d7c
 DIST zabbix-7.0.2.tar.gz 48162883 BLAKE2B a6323e2e8960e9df0127f1f688cfb3ff4cdde7edcfce189176aa1fa3cfed847beb67d35415df18a18ed1da674496e1f60a2c45269ee6dff34fd83cbb424c9221 SHA512 3f5aca53d767630b5bb48a1075ddbb841b2052eb63a775e8aae8eed749f521b397f648c5dca918e3c56680f280aef99280c129c2ab1073794257ff074afadfd8
+DIST zabbix-7.0.3-go-deps.tar.xz 33769108 BLAKE2B 45d9bc317b74a8f1cdc80058ec3828d31ec5190afa85a29955a37a91921bd36565e092d97b051512e48321bfeaaa9a92db6f3bd7d11e4ccdf2825867f644c87e SHA512 6b7c90b72e02e6de6243c4f89af3303ab7da66b91981f9c2a0334a1fac436dc3ebdff64b1d09a1151606ff838d16dcf13e6003cf9c0db1148f3a814b02e28085
+DIST zabbix-7.0.3.tar.gz 48193982 BLAKE2B dceebf9ecf1957f507626cc33a86ee31ef3a2180046f744fc878a99258de8509115a67f2ccf4d56e9cfc84e14ae8ea897353692a151c3317934437869644b28e SHA512 22149415712017c2fb504972c9673623ea710842611644a934a9f555685a73e516ecbad566048b5ec05ba6404000687feee0815e7b2c8a04fb8fd154c9539671
diff --git a/net-analyzer/zabbix/zabbix-6.0.30.ebuild b/net-analyzer/zabbix/zabbix-6.0.30.ebuild
deleted file mode 100644
index 7cbc451d3735..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.30.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.31.ebuild b/net-analyzer/zabbix/zabbix-6.0.31.ebuild
deleted file mode 100644
index 44884d9f45ff..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.31.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.32.ebuild b/net-analyzer/zabbix/zabbix-6.0.32.ebuild
index 44884d9f45ff..7cbc451d3735 100644
--- a/net-analyzer/zabbix/zabbix-6.0.32.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.32.ebuild
@@ -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-6.4.15.ebuild b/net-analyzer/zabbix/zabbix-6.4.15.ebuild
deleted file mode 100644
index 44b5abc0f52e..000000000000
--- a/net-analyzer/zabbix/zabbix-6.4.15.ebuild
+++ /dev/null
@@ -1,393 +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="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.4.0-configure-sscanf.patch"
-	"${FILESDIR}/${PN}-6.4.6-clang16-build-fix.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
-
-	# 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 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.4.16.ebuild b/net-analyzer/zabbix/zabbix-6.4.16.ebuild
deleted file mode 100644
index 1f01c04f346d..000000000000
--- a/net-analyzer/zabbix/zabbix-6.4.16.ebuild
+++ /dev/null
@@ -1,393 +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="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.4.0-configure-sscanf.patch"
-	"${FILESDIR}/${PN}-6.4.6-clang16-build-fix.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
-
-	# 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 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.4.17.ebuild b/net-analyzer/zabbix/zabbix-6.4.17.ebuild
index 1cf14aab3662..7f6ead335ecd 100644
--- a/net-analyzer/zabbix/zabbix-6.4.17.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.17.ebuild
@@ -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-6.4.18.ebuild b/net-analyzer/zabbix/zabbix-6.4.18.ebuild
new file mode 100644
index 000000000000..1cf14aab3662
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.18.ebuild
@@ -0,0 +1,392 @@
+# 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="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.4.0-configure-sscanf.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
+
+	# 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 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-7.0.0.ebuild b/net-analyzer/zabbix/zabbix-7.0.0.ebuild
deleted file mode 100644
index 77e7e44907a5..000000000000
--- a/net-analyzer/zabbix/zabbix-7.0.0.ebuild
+++ /dev/null
@@ -1,372 +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"
-	"${FILESDIR}/${PN}-6.4.6-clang16-build-fix.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.2.ebuild b/net-analyzer/zabbix/zabbix-7.0.2.ebuild
index f90e2783580f..132e5bd1913b 100644
--- a/net-analyzer/zabbix/zabbix-7.0.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.2.ebuild
@@ -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.3.ebuild b/net-analyzer/zabbix/zabbix-7.0.3.ebuild
new file mode 100644
index 000000000000..f90e2783580f
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-7.0.3.ebuild
@@ -0,0 +1,371 @@
+# 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-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest
index c7e76b206bdd..84390342677e 100644
--- a/net-dialup/cutecom/Manifest
+++ b/net-dialup/cutecom/Manifest
@@ -1,2 +1 @@
-DIST cutecom-v0.51.0.tar.bz2 1296457 BLAKE2B 407bbe12fb4303e98589720c3fe9bf96a4112c816e64a3a32227d07a64c1efbb5b33c364d1f3f06ff67c9bc935c0bf62de14849b554508eaffacda1f65e7fad9 SHA512 67857977ab6444509662be4d27059e3c4cb766a69b78d806f4cd3d6cb7306d53094337fb384133a616ae397ac4d4d7c86347285a2d68f88fbf105d73ebd97731
 DIST cutecom-v0.60.0-RC1.tar.bz2 1291319 BLAKE2B 8d73a51916d8d3f103ba6215d0bf2865337aa82f95d12be512001abd845cac08f9c9b6fb9022574aff42fef958c90676ae0828d1597879c798bd1ffe4bec68ba SHA512 92a210ab846f452287693add8db52833fd83814f59a2be8de304278dbc711b2a5dc0fdaadf877a588ad023849370151788d1ea678ba777fe0a4a600429669151
diff --git a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild b/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
deleted file mode 100644
index 683af0a6bb22..000000000000
--- a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A serial terminal, like minicom, written in Qt"
-HOMEPAGE="https://gitlab.com/cutecom/cutecom"
-SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${PV}/cutecom-v${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz"
-
-S="${WORKDIR}/cutecom-v${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-for-qt-5.15.0.patch )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i \
-		-e '/Path/d' \
-		-e '/Terminal/s/0/false/' \
-		"${PN}.desktop" || die 'sed on desktop file failed'
-}
-
-src_install() {
-	cmake_src_install
-	domenu "${PN}.desktop"
-	doicon "distribution/${PN}.png"
-}
diff --git a/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild b/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild
index 96f3fbcdc992..5284edf7cd27 100644
--- a/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild
+++ b/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild
@@ -10,11 +10,11 @@ MY_PV=${PV/_rc/-RC}
 DESCRIPTION="A serial terminal, like minicom, written in Qt"
 HOMEPAGE="https://gitlab.com/cutecom/cutecom"
 SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${MY_PV}/cutecom-v${MY_PV}.tar.bz2"
+S="${WORKDIR}/cutecom-v${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	dev-qt/qtbase:6
@@ -22,8 +22,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	net-dialup/lrzsz"
 
-S="${WORKDIR}/cutecom-v${MY_PV}"
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 5b6dc6258fa2..10de77f9f9a3 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,2 +1,4 @@
 DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353
 DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d
+DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b SHA512 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
+DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
diff --git a/net-dns/bind-tools/bind-tools-9.16.50.ebuild b/net-dns/bind-tools/bind-tools-9.16.50.ebuild
new file mode 100644
index 000000000000..81e0a5f69697
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.50.ebuild
@@ -0,0 +1,170 @@
+# 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/isc.asc
+inherit autotools flag-o-matic multiprocessing toolchain-funcs verify-sig
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="
+	https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz
+	verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz.asc )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+caps doc gssapi idn libedit readline test xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
+RESTRICT="!test? ( test )"
+
+# libuv lower bound should be the highest value seen at
+# https://gitlab.isc.org/isc-projects/bind9/-/blob/bind-9.16/lib/isc/netmgr/netmgr.c?ref_type=heads#L244
+# to avoid issues with matching stable/testing, etc
+RDEPEND="
+	>=dev-libs/libuv-1.42.0:=
+	dev-libs/openssl:=
+	caps? ( sys-libs/libcap )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${RDEPEND}"
+# sphinx required for man-page and html creation
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+	verify-sig? ( sec-keys/openpgp-keys-isc )
+"
+
+src_prepare() {
+	default
+
+	# Do not disable thread local storage on Solaris, it works with our
+	# toolchain, and it breaks further configure checks
+	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
+
+	# Slow tests
+	sed -i "s/{name='mem_test'}/{name='mem_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die
+	sed -i "s/{name='timer_test'}/{name='timer_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die
+
+	# Conditionally broken
+	use sparc && ( sed -i "/{name='netmgr_test'}/d" "lib/isc/tests/Kyuafile" || die )
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# localstatedir for nsupdate -l, bug #395785
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with idn libidn2 "${ESYSROOT}"/usr)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug #607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug #344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h || die
+}
+
+src_compile() {
+	local AR="$(tc-getAR)"
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake -Onone unit
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	local tool
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind-tools/bind-tools-9.18.0.ebuild b/net-dns/bind-tools/bind-tools-9.18.0.ebuild
new file mode 100644
index 000000000000..4591569c80b1
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.18.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+caps doc gssapi idn libedit readline xml"
+
+RDEPEND=">=net-dns/bind-9.18.0[caps?,doc?,gssapi?,idn?,xml?]"
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 56161e2f3eed..3ccb3e119b6f 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,6 @@
 DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353
 DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d
+DIST bind-9.16.50.tar.xz 5134620 BLAKE2B 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b SHA512 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
+DIST bind-9.16.50.tar.xz.asc 833 BLAKE2B 7eabf67b96d1fc94ec096adf1b4d075c370b603b7225522fe5b97d04c519f68f017fe0ccaf7ddeff029d17c0b4c3932a09f009376553f987671ba21f6b9cdb7d SHA512 0650ad5d55da2d9fe848d68aa59b16998b781152209ebcaabaea68144dab75ff9f4cfcceaa87a6b6da4f2f98fcf6f9eddd16d19ddf958fef242d93da03516dbc
+DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312 SHA512 6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.16.50.ebuild b/net-dns/bind/bind-9.16.50.ebuild
new file mode 100644
index 000000000000..95d09246a9b8
--- /dev/null
+++ b/net-dns/bind/bind-9.16.50.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc
+inherit python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles verify-sig
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
+SRC_URI="
+	https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz.asc )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug #602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi"
+IUSE+=" json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
+RESTRICT="!test? ( test )"
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	dev-libs/libuv:=
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap:= )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb:= )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb:= )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${DEPEND}
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-bind )
+"
+BDEPEND="
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+	verify-sig? ( sec-keys/openpgp-keys-isc )
+"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	default
+
+	# Should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Slow tests
+	sed -i "s/{name='mem_test'}/{name='mem_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die
+	sed -i "s/{name='timer_test'}/{name='timer_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die
+
+	# Conditionally broken
+	use sparc && ( sed -i "/{name='netmgr_test'}/d" "lib/isc/tests/Kyuafile" || die )
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with test cmocka)
+		# Removed in 9.17, drags in libunwind dependency too
+		--disable-backtrace
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		$(use_with berkdb dlz-bdb "${ESYSROOT}"/usr)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+	#gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h || die
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	emake -C "${BUILD_DIR}"/bin/python
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake -Onone unit
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r4 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.18.29-r2.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild
new file mode 100644
index 000000000000..cbd163402fca
--- /dev/null
+++ b/net-dns/bind/bind-9.18.29-r2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	dev-libs/json-c:=
+	>=dev-libs/libuv-1.37.0:=
+	sys-libs/zlib:=
+	dev-libs/openssl:=[-bindist(-)]
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	doh? ( net-libs/nghttp2:= )
+	geoip? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	idn? ( net-dns/libidn2 )
+	jemalloc? ( dev-libs/jemalloc:= )
+	lmdb? ( dev-db/lmdb )
+	xml? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc
+	!<net-dns/bind-tools-9.18.0
+"
+# sphinx required for man-page and html creation
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-util/cmocka
+		dev-util/kyua
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir="${EPREFIX}"/etc/bind
+		--localstatedir="${EPREFIX}"/var
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		--with-json-c
+		--with-zlib
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable doh)
+		$(use_with doh libnghttp2)
+		$(use_enable fixed-rrset)
+		$(use_enable static-libs static)
+		$(use_enable geoip)
+		$(use_with geoip maxminddb)
+		$(use_with gssapi)
+		$(use_with idn libidn2)
+		$(use_with jemalloc)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# system tests ('emake test') require network configuration for IPs etc
+	# so we run the unit tests instead.
+	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README.md
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto dnssec-guide
+		dodoc -r doc/dnssec-guide/
+
+		docinto contrib
+		dodoc contrib/scripts/nanny.pl
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+	newins "${FILESDIR}"/named.conf.auth named.conf.auth
+
+	newinitd "${FILESDIR}"/named.init-r15 named
+	newconfd "${FILESDIR}"/named.confd-r8 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	if ! use static-libs ; then
+		find "${ED}"/usr/lib* -name '*.la' -delete || die
+	fi
+
+	#
+	# /var/bind
+	#
+	# These need to remain for now because CONFIG_PROTECT won't
+	# save them and we shipped configs for years containing references
+	# to them.
+	#
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r4 named.cache
+	# bug #450406
+	dosym named.cache /var/bind/root.cache
+	#
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	dosym -r /var/bind/pri /etc/bind/pri
+	dosym -r /var/bind/sec /etc/bind/sec
+	dosym -r /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /etc/bind/{bind.keys,named.conf,named.conf.auth}
+	fperms 0640 /etc/bind/{bind.keys,named.conf,named.conf.auth}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r2" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+
+	# show only when upgrading to 9.18
+	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 9.18; then
+		elog "As this is a major bind version upgrade, please read:"
+		elog "   https://kb.isc.org/docs/changes-to-be-aware-of-when-moving-from-bind-916-to-918"
+		elog "for differences in functionality."
+		elog ""
+		ewarn "In particular, please note that bind-9.18 does not need a root hints file anymore"
+		ewarn "and we only ship with one as a stop-gap. If your current configuration specifies a"
+		ewarn "root hints file - usually called named.cache - bind will not start as it will not be able"
+		ewarn "to find the specified file. Best practice is to delete the offending lines that"
+		ewarn "reference named.cache file from your configuration."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	if [[ "${CHROOT_NOMOUNT:-0}" -ne 0 ]]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [[ "${CHROOT_GEOIP:-0}" -eq 1 ]]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/files/named.conf.auth b/net-dns/bind/files/named.conf.auth
new file mode 100644
index 000000000000..373a77b96018
--- /dev/null
+++ b/net-dns/bind/files/named.conf.auth
@@ -0,0 +1,33 @@
+//http local {
+//	endpoints { "/dns-query"; };
+//};
+
+options {
+	directory "/var/cache/bind";
+	pid-file "/run/named/named.pid";
+
+	listen-on { 127.0.0.1; };
+	listen-on-v6 { ::1; };
+	// dns-over-tls
+	listen-on port 853 tls ephemeral { 127.0.0.1; };
+	listen-on-v6 port 853 tls ephemeral { ::1; };
+	// dns-over-https
+	//listen-on port 443 tls ephemeral http local { 127.0.0.1; };
+	//listen-on-v6 port 443 tls ephemeral http local { ::1; };
+
+	allow-recursion {
+		none;
+	};
+	allow-transfer {
+		none;
+	};
+	allow-update {
+		none;
+	};
+};
+
+zone "example.com." {
+	type primary;
+	file "/var/bind/pri/db.example.com";
+	notify explicit;
+};
diff --git a/net-dns/bind/files/named.confd-r8 b/net-dns/bind/files/named.confd-r8
new file mode 100644
index 000000000000..2d2ef4b868f6
--- /dev/null
+++ b/net-dns/bind/files/named.confd-r8
@@ -0,0 +1,37 @@
+# Set various named options here.
+#
+#OPTIONS=""
+
+# config file path
+NAMED_CONF="/etc/bind/named.conf"
+
+# Set this to the number of processors you want bind to use.
+# Leave this unchanged if you want bind to automatically detect the number
+#CPU="1"
+
+# If you wish to run bind in a chroot:
+# 1) un-comment the CHROOT= assignment, below. You may use
+#    a different chroot directory but MAKE SURE it's empty.
+# 2) run: emerge --config =<bind-version>
+#
+#CHROOT="/chroot/dns"
+
+# Uncomment to enable binmount of /usr/share/GeoIP
+#CHROOT_GEOIP="1"
+
+# Uncomment the line below to avoid that the init script mounts the needed paths
+# into the chroot directory.
+# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1".
+#CHROOT_NOMOUNT="1"
+
+# Uncomment this option if you have setup your own chroot environment and you
+# don't want/need the chroot consistency check
+#CHROOT_NOCHECK=1
+
+# Default pid file location
+# use named.conf to specify pid-file location
+
+# Scheduling priority: 19 is the lowest and -20 is the highest.
+# Default: 0
+#NAMED_NICELEVEL="0"
+
diff --git a/net-dns/bind/files/named.init-r15 b/net-dns/bind/files/named.init-r15
new file mode 100644
index 000000000000..2bd52a773200
--- /dev/null
+++ b/net-dns/bind/files/named.init-r15
@@ -0,0 +1,251 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig checkzones"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use logger
+	provide dns
+}
+
+NAMED_CONF=${NAMED_CONF:-${CHROOT}/etc/bind/named.conf}
+
+OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}
+MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60}
+
+_mount() {
+	local from
+	local to
+	local opts
+	local ret=0
+
+	if [ "${#}" -lt 3 ]; then
+		eerror "_mount(): to few arguments"
+		return 1
+	fi
+
+	from=$1
+	to=$2
+	shift 2
+
+	opts="${*}"
+	shift $#
+
+	if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then
+		einfo "mounting ${from} to ${to}"
+		mount ${from} ${to} ${opts}
+		ret=$?
+
+		eend $ret
+		return $ret
+	fi
+
+	return 0
+}
+
+_umount() {
+	local dir=$1
+	local ret=0
+
+	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
+		ebegin "umounting ${dir}"
+		umount ${dir}
+		ret=$?
+
+		eend $ret
+		return $ret
+	fi
+
+	return 0
+}
+
+_get_pidfile() {
+	# as suggested in bug #107724, bug 335398#c17
+	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
+			/usr/bin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
+	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid
+}
+
+check_chroot() {
+	if [ -n "${CHROOT}" ]; then
+		[ ! -d "${CHROOT}" ] && return 1
+		[ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1
+		[ ! -d "${CHROOT}/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
+		[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
+		[ ! -d "${CHROOT}/var/log/named" ] && return 1
+		[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
+		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
+		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
+			if [ -d "/usr/lib64" ]; then
+				[ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1
+			elif [ -d "/usr/lib" ]; then
+				[ ! -d "${CHROOT}/usr/lib/engines" ] && return 1
+			fi
+		fi
+	fi
+
+	return 0
+}
+
+checkconfig() {
+	ebegin "Checking named configuration"
+
+	if [ ! -f "${NAMED_CONF}" ] ; then
+		eerror "No ${NAMED_CONF} file exists!"
+		return 1
+	fi
+
+	/usr/bin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || {
+		eerror "named-checkconf failed! Please fix your config first."
+		return 1
+	}
+
+	eend 0
+	return 0
+}
+
+checkzones() {
+	ebegin "Checking named configuration and zones"
+	/usr/bin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}}
+	eend $?
+}
+
+start() {
+	local piddir
+
+	ebegin "Starting ${CHROOT:+chrooted }named"
+
+	if [ -n "${CHROOT}" ]; then
+		if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+			check_chroot || {
+				eend 1
+				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+				return 1
+			}
+		fi
+
+		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
+			if [ ! -e /usr/lib/engines/libgost.so ]; then
+				eend 1
+				eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support"
+				return 1
+			fi
+			cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || {
+				eend 1
+				eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'"
+				return 1
+			}
+		fi
+		cp -Lp /etc/localtime "${CHROOT}/etc/localtime"
+
+		if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
+			einfo "Mounting chroot dirs"
+			_mount /etc/bind ${CHROOT}/etc/bind -o bind
+			_mount /var/bind ${CHROOT}/var/bind -o bind
+			_mount /var/log/named ${CHROOT}/var/log/named -o bind
+			if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+				_mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind
+			fi
+		fi
+
+		# On initial startup, if piddir inside the chroot /var/run/named
+		# Then the .../var/run part might not exist yet
+		checkpath -q -d -o root:root -m 0755 "${piddir}/.."
+	fi
+
+	checkconfig || { eend 1; return 1; }
+
+	# create piddir (usually /run/named) if necessary, bug 334535
+	_get_pidfile
+	piddir="${PIDFILE%/*}"
+	checkpath -q -d -o root:named -m 0770 "${piddir}" || {
+		eerror "Failed to create PID directory at $piddir"
+		eend 1
+		return 1
+	}
+
+	# In case someone have $CPU set in /etc/conf.d/named
+	if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then
+		CPU="-n ${CPU}"
+	fi
+
+	start-stop-daemon --start --pidfile ${PIDFILE} \
+		--nicelevel ${NAMED_NICELEVEL:-0} \
+		--exec /usr/sbin/named \
+		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
+	eend $?
+}
+
+stop() {
+	local reported=0
+
+	ebegin "Stopping ${CHROOT:+chrooted }named"
+
+	# Workaround for now, until openrc's restart has been fixed.
+	# openrc doesn't care about a restart() function in init scripts.
+	if [ "${RC_CMD}" = "restart" ]; then
+		if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+			check_chroot || {
+				eend 1
+				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+				return 1
+			}
+		fi
+
+		checkconfig || { eend 1; return 1; }
+	fi
+
+	# -R 10, bug 335398
+	_get_pidfile
+	start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \
+		--exec /usr/sbin/named
+
+	if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
+		ebegin "Umounting chroot dirs"
+
+		# just to be sure everything gets clean
+		while fuser -s ${CHROOT} 2>/dev/null; do
+			if [ "${reported}" -eq 0 ]; then
+				einfo "Waiting until all named processes are stopped (max. ${MOUNT_CHECK_TIMEOUT} seconds)"
+			elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then
+				eerror "Waiting until all named processes are stopped failed!"
+				eend 1
+				break
+			fi
+			sleep 1
+			reported=$((reported+1))
+		done
+
+		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP
+		_umount ${CHROOT}/etc/bind
+		_umount ${CHROOT}/var/log/named
+		_umount ${CHROOT}/var/bind
+	fi
+
+	eend $?
+}
+
+reload() {
+	local ret
+
+	ebegin "Reloading named.conf and zone files"
+
+	checkconfig || { eend 1; return 1; }
+
+	_get_pidfile
+	if [ -n "${PIDFILE}" ]; then
+		start-stop-daemon --pidfile $PIDFILE --signal HUP
+		ret=$?
+	else
+		ewarn "Unable to determine the pidfile... this is"
+		ewarn "a fallback mode. Please check your installation!"
+
+		$RC_SERVICE restart
+		ret=$?
+	fi
+
+	eend $ret
+}
diff --git a/net-dns/bind/files/named.service-r2 b/net-dns/bind/files/named.service-r2
new file mode 100644
index 000000000000..4ca34544fe61
--- /dev/null
+++ b/net-dns/bind/files/named.service-r2
@@ -0,0 +1,13 @@
+[Unit]
+Description=Internet domain name server
+After=network.target
+
+[Service]
+ExecStartPre=/usr/libexec/generate-rndc-key.sh
+ExecStartPre=/usr/bin/named-checkconf -z /etc/bind/named.conf
+ExecStart=/usr/sbin/named -f -u named
+ExecReload=/usr/sbin/rndc reload
+ExecStop=/usr/sbin/rndc stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index ec13f291d0cd..aa2583bf5543 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="dnstap">Enables dnstap packet logging</flag>
 		<flag name="dnsrps">Enable the DNS Response Policy Service (DNSRPS) API, a mechanism to allow an external response policy provider</flag>
 		<flag name="dlz">Enables dynamic loaded zones, 3rd party extension</flag>
+		<flag name="doh">Enables dns-over-https</flag>
 		<flag name="fixed-rrset">Enables fixed rrset-order option</flag>
 		<flag name="geoip2">Enable GeoIP2 API from MaxMind</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 3f1a70d7a529..a43ee2b3da90 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -12,3 +12,5 @@ DIST c-ares-1.32.2.tar.gz 1026293 BLAKE2B 1acd4d90d0e9d8abcbc49561db8ae2e5529539
 DIST c-ares-1.32.2.tar.gz.asc 228 BLAKE2B 6a09ff532d1334f994f9e9365ce6074aae4227b27c0a5ef40e441192b6b23c728772278fec7c8c34fc93d20309b04b9e31802d4491dc3e1313818eadbe8a4afc SHA512 385ca9bd72a2131f2eb51c035e50d21d816361872a0db42c6a9dc60a1a3971d464f34c2518c759e01e6c88b5bf100ddaa87862e877187a9b59800070b2bef7af
 DIST c-ares-1.33.0.tar.gz 1040626 BLAKE2B 730ca3ca9ebb03228fc17d87f1a659f77f91d2a4cc840fa21d7bf083878cc2714a2695808f53de2182e3cf2be367a95bb9625473cfbace40536cb3a33fd0d338 SHA512 3cf1b94d6e8e53742703a679d7e35d3f985320720f41fa58189a0bcad4aca80405c73c4689abe7879df292dbe8f3ddca34b2d48429af5afcc9d2933edb075788
 DIST c-ares-1.33.0.tar.gz.asc 228 BLAKE2B 945ebedb47c998aa917aebc6180cc9f601bc4f10c648955cc9af84e09d5832e06cf7c7afa7ddc1591474f23758c7d269c722d4dce34e4680edc69ce93be483ad SHA512 bd6386a917d072ac41adb604affa314b8e05e8cfeff5ade7e9d6f520baf4d73d7adf68cff35f4748aeee45d4d646ca6d6cf438e75e1c7125f1ababd561809e8c
+DIST c-ares-1.33.1.tar.gz 1044943 BLAKE2B d8084db84da252ced8cc91b4ed523a5309dbc788bf25f1ab46f3e4817b4c12a3d3d4565179287b7542ac8a7b4f812c20dcc44d9f7284153a9e43765ca7aaf996 SHA512 b5ec4f08539be552f01d49f03327e3999754b940d83c63fbd934c2ed34cf7f05c3f90c9eb64a78a3d7862280bf75765296576a70a6029257daaf90e3e35ab3e4
+DIST c-ares-1.33.1.tar.gz.asc 228 BLAKE2B 4908cc70133d75f926387873b0bf7b274c8ab162391b73da2a9f25658bda52763f41ffb1aa4236cdc14efa7bcbbba32d3b0be8bd95161654901c304a4f14f6f8 SHA512 f9c8c8965046176104487939b04a38f3f6e68693ff1ef239ce988cf4c56dfacf2766482857d480a4022d6101c2591c013d8687d4bbf009e40863c1d7a95c2fad
diff --git a/net-dns/c-ares/c-ares-1.33.1.ebuild b/net-dns/c-ares/c-ares-1.33.1.ebuild
new file mode 100644
index 000000000000..8268e2db33ce
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.33.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Both Daniel and Brad are listed as possible signers on the homepage
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradhouse.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+	https://github.com/c-ares/c-ares/releases/download/v${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/c-ares/c-ares/releases/download/v${PV}/${P}.tar.gz.asc )
+"
+
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-cpp/gtest )
+	verify-sig? ( sec-keys/openpgp-keys-bradhouse )
+"
+
+DOCS=( AUTHORS README.md RELEASE-NOTES.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+A__QA_CONFIG_IMPL_DECL_SKIP=(
+	# Checking for obsolete headers
+	malloc
+	calloc
+	free
+
+	# Non-existent on Linux
+	closesocket
+	CloseSocket
+	ioctlsocket
+	bitncmp
+	ConvertInterfaceIndexToLuid
+	ConvertInterfaceLuidToNameA
+)
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# warnings are default, but enable -std=c90 which doesn't define
+		# 'bool' which is a type used/assumed in macOS system headers
+		sed -i -e 's/-std=c90/& -Dbool=int/' configure{.ac,} || die
+		# sysconfig integration requires deep framework compatibility
+		# and is not really desired in Prefix
+		sed -i -e 's/__APPLE__/__DISABLED__/' \
+			src/lib/ares_sysconfig_mac.c || die
+		sed -i -e '/elif defined(__APPLE__)/s/__APPLE__/__DISABLED__/' \
+			src/lib/ares_sysconfig.c || die
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-symbol-hiding
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	# Needed for running unit tests only
+	# Violates sandbox and tests pass fine without
+	export ax_cv_uts_namespace=no
+	export ax_cv_user_namespace=no
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd "${BUILD_DIR}"/test || die
+
+	# We're skipping the "real" network tests with the filter
+	# see https://github.com/c-ares/c-ares/tree/main/test
+	local network_tests=(
+		# Most live tests have Live in the name
+		*Live*
+		# These don't but are still in ares-test-live.cc => live
+		*GetTCPSock*
+		*TimeoutValue*
+		*GetSock*
+		*GetSock_virtualized*
+		*VerifySocketFunctionCallback*
+		# Seems flaky, even run manually
+		# https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d
+		*MockUDPMaxQueriesTest.GetHostByNameParallelLookups*
+	)
+
+	# The format for disabling test1, test2, and test3 looks like:
+	# -test1:test2:test3
+	edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}"))
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild b/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..dc311688bbfd
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		doh? ( ssl )
+		doh3? ( ssl quic )
+		ipcipher? ( ssl )
+		quic? ( ssl )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	bpf? ( dev-libs/libbpf:= )
+	cdb? ( dev-db/tinycdb:= )
+	dev-libs/boost:=
+	sys-libs/libcap
+	dev-libs/libedit
+	dev-libs/libsodium:=
+	dnstap? ( dev-libs/fstrm )
+	doh? ( net-libs/nghttp2:= )
+	doh3? ( net-libs/quiche:= )
+	lmdb? ( dev-db/lmdb:= )
+	quic? ( net-libs/quiche )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:0= )
+	xdp? ( net-libs/xdp-tools )
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/1.9.6-boost-1.86.0.patch"
+	"${FILESDIR}/1.9.6-json11-gcc15.patch"
+)
+
+src_prepare() {
+	default
+
+	# clean up duplicate file
+	rm -f README.md
+}
+
+src_configure() {
+	# bug #822855
+	append-lfs-flags
+
+	# some things can only be enabled/disabled by defines
+	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
+	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
+
+	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+		-i "${S}/configure"
+
+	local myeconfargs=(
+		--sysconfdir=/etc/dnsdist
+		--with-lua="${ELUA}"
+		--without-h2o
+		--enable-tls-providers
+		--without-gnutls
+		$(use_with bpf ebpf)
+		$(use_with cdb cdb)
+		$(use_enable doh dns-over-https)
+		$(use_enable doh3 dns-over-http3)
+		$(use_enable dnscrypt)
+		$(use_enable dnstap)
+		$(use_enable ipcipher)
+		$(use_with lmdb )
+		$(use_enable quic dns-over-quic)
+		$(use_with regex re2)
+		$(use_with snmp net-snmp)
+		$(use_enable ssl dns-over-tls)
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		$(use_with xdp xsk)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch b/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
new file mode 100644
index 000000000000..bf9d23984bba
--- /dev/null
+++ b/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
@@ -0,0 +1,35 @@
+
+Fix compilation with boost-1.86.
+Patch path prefix adapted for dnsdist.
+
+From: https://github.com/PowerDNS/pdns/commit/eed56000b1d68ac083b8e8bea4ff0ea30a1579c4
+
+From eed56000b1d68ac083b8e8bea4ff0ea30a1579c4 Mon Sep 17 00:00:00 2001
+From: Michael Cho <michael@michaelcho.dev>
+Date: Thu, 15 Aug 2024 22:49:17 -0400
+Subject: [PATCH] Fix build with boost 1.86.0
+
+Boost 1.86.0 changes seem to no longer indirectly include header which
+causes build to fail with:
+```
+uuid-utils.cc:38:58:
+error: 'random' is not a class, namespace, or enumeration
+```
+
+boost/random/mersenne_twister.hpp has been available since Boost 1.21.2
+---
+ pdns/uuid-utils.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdns/uuid-utils.cc b/pdns/uuid-utils.cc
+index c59e0a0d0daa..301daff0bb1e 100644
+--- a/uuid-utils.cc
++++ b/uuid-utils.cc
+@@ -30,6 +30,7 @@
+ #endif /* BOOST_PENDING_INTEGER_LOG2_HPP */
+ #endif /* BOOST_VERSION */
+ 
++#include <boost/random/mersenne_twister.hpp>
+ #include <boost/uuid/uuid_generators.hpp>
+ 
+ // The default of:
diff --git a/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch b/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
new file mode 100644
index 000000000000..9aac470625f6
--- /dev/null
+++ b/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
@@ -0,0 +1,19 @@
+
+Fix compilation with gcc-15
+
+Bug: https://bugs.gentoo.org/937628
+Bug: https://github.com/PowerDNS/pdns/issues/14549
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+diff -rup dnsdist-1.9.6/ext/json11/json11.cpp dnsdist-1.9.6-gcc15/ext/json11/json11.cpp
+--- dnsdist-1.9.6/ext/json11/json11.cpp	2024-07-15 11:46:15.000000000 +0200
++++ dnsdist-1.9.6-gcc15/ext/json11/json11.cpp	2024-08-09 18:03:51.090140981 +0200
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index c0cba7b1344e..000b9a78abb3 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/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>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>holger@applied-asynchrony.com</email>
 		<name>Holger Hoffstätte</name>
@@ -13,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>nativemad@gentoo.org</email>
+		<name>Andreas Schuerch</name>
+	</maintainer>
 	<longdescription lang="en">
 		dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life is to route traffic to the best server, delivering top performance to legitimate users while shunting or blocking abusive traffic.
 	</longdescription>
diff --git a/net-dns/doggo/Manifest b/net-dns/doggo/Manifest
new file mode 100644
index 000000000000..19aa3edbfe11
--- /dev/null
+++ b/net-dns/doggo/Manifest
@@ -0,0 +1,2 @@
+DIST doggo-1.0.4-deps.tar.xz 11679916 BLAKE2B c11bf091b6ff94fa6dc44c0d11dcfdea3834a765edf5e7548aa6edf48fcc73a78abbdd9afae643663141ef7fb06692e3887a5b45b95fabd2dad512676442a830 SHA512 222cc3dc1599eb67ed3b274cae39b342b900eb2a09ac8d8230c3bc2e60b3bacd7a43fcf6744d3432743802413924ad4cab5c76fb313071e747f6b76d6c5c2d49
+DIST doggo-1.0.4.tar.gz 2436385 BLAKE2B adeb97fbe3ae6cf280d579a8ea5bb7790c79535f4df46041bd45aa0fa2add9f5d8bb228deb374787d1ecb3a3bc02bf9ed6545c74adb1a55262c63f1db347857e SHA512 10b59b5fa735ef42dc218a0b704292e4840b29880029f870e30fad77bc0d544bdb1d24630e3d0cc8be27542268f49c24f3ff4f0b72449195a2546d83b7942d2d
diff --git a/net-dns/doggo/doggo-1.0.4.ebuild b/net-dns/doggo/doggo-1.0.4.ebuild
new file mode 100644
index 000000000000..cb4e40048fc1
--- /dev/null
+++ b/net-dns/doggo/doggo-1.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion
+
+DESCRIPTION="Command-line DNS Client for Humans"
+HOMEPAGE="https://github.com/mr-karan/doggo"
+
+SRC_URI="https://github.com/mr-karan/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://www.applied-asynchrony.com/distfiles/${P}-deps.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	emake build-cli VERSION=${PV}
+}
+
+src_install() {
+	newbin bin/${PN}.bin ${PN}
+
+	local comp
+	for comp in bash fish zsh; do
+		bin/${PN}.bin completions $comp > "${WORKDIR}"/${PN}.$comp || die
+	done
+
+	newbashcomp "${WORKDIR}"/${PN}.bash ${PN}
+	newfishcomp "${WORKDIR}"/${PN}.fish ${PN}.fish
+	newzshcomp "${WORKDIR}"/${PN}.zsh _${PN}
+}
diff --git a/net-dns/doggo/metadata.xml b/net-dns/doggo/metadata.xml
new file mode 100644
index 000000000000..b4febebbbc53
--- /dev/null
+++ b/net-dns/doggo/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>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>
+	<upstream>
+		<remote-id type="github">mr-karan/doggo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
index 9877746f6cda..e0467c5e893b 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap jemalloc kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 4c503d5daf2e..81065e1e99f8 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -22,10 +22,6 @@ DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749
 DIST link-cplusplus-1.0.9.crate 7484 BLAKE2B 4f73807068243aa0dc4b6773c5446fc988154669eb196afca19fe39ffe63627ee705c4ee3cf9cca9628d0bb8fc4cdeb7ef52b41bab810d12721a6ad53d9557ee SHA512 30697093b54ca449135d7a2a963bdd9af61a446472b0f245c87a05bd6eefa62eeebf9cc58cf17aa77ac5f2301b05ae27d13eb50d92ec58fec27303f865261170
 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.4.tar.bz2 1659047 BLAKE2B f1a5cbd69f32bb402a5556fa4ad99df7fc89cc868cec9e4c271f42407e2a4f7cf900b1f071d416f271597242b472f537bdfbe969e2c3694f7ef9df77763f9937 SHA512 a78422917df91a8f8c49bc5c2bdf599f92f6c3359f049653c6623a05da8117445c04400321cc4e2128cfaedb7b345cbec003339c35e4f2c76bb43d16d07b00d4
-DIST pdns-recursor-5.0.5.tar.bz2 1658574 BLAKE2B 7bf3bc9c742e97d396654fdd8b680cb9d3270a7dc1849ee50c747cc8934c21bed0f778708e04c162fafdca74c4664e299b18c2abd6bdef6d127cee04c75684fd SHA512 52bed3516a8dfbe4be5e5ddd81920955c1c4c66d1996afc9f61d361e06ec11cc5aba7afe4c49f8f69b1554b6564cb619ee5572c066d6d6f2733a0f07bc6945c0
-DIST pdns-recursor-5.0.6.tar.bz2 1689757 BLAKE2B ddc82e19e3761a35ab3fd81bf0f73a7c139f0ce9464259f311d1f9fd8134627760efadca5310c4d3875bb469eafbdc0719fe30e38aa58687ff24eefe16e27205 SHA512 1f8496b4ce50d02ca12d44576b2fa800b83d5d9fdeab57956445ebb80ab72b7fe6e7bf7368c3fe6e6b57133458c98c5773ce0ad9da86dd49f2830c52649957d6
-DIST pdns-recursor-5.0.7.tar.bz2 1697502 BLAKE2B b3fff4f0b2baaf9e9e99f192b4b900355aea8e347ed4ff8bb1b3e70e8f017b66fcda3ba1c140c84950e99bcc8350bf5f61fb75e3dcf7443a55455781213f6b25 SHA512 d23c289c972d671d31735839bcae68fb573330435563061b6b9086c74dedcd37ff30632d5b67ec6185877fd42c881b2f41fc9eb65cfd4414457763626149dd4b
 DIST pdns-recursor-5.0.8.tar.bz2 1675936 BLAKE2B 21bebcf135c310dc8b82223dd1dece8621b79bb34d2dd5f30970c577c300bf75728c45f138c36198ddacde004ac7e57f3a2083441577a355168c81730df6d125 SHA512 90d990cf6e8ce89252d0fc428265b93b70c974c9b86627fdf61534c5a5ecc85c2b3c51eb12d37a9bf6fcddf9e576dbc3c883e9f599687e7b2741a49194957c38
 DIST pdns-recursor-5.1.1.tar.bz2 1709091 BLAKE2B dd09852d14520dcb623a617e9af8342e63b731d5df818e25fcb4a5ed91782c90fa728a7dc808d8e22a66770d0113bfff34fda0f95da0695de26b2a48bebf5e48 SHA512 59129312e79bb48ce5af4de0c90f36765084708fd7b728655b07ca0cf68ba618a4bf517a9e695caaecc57e5edef4f6fa373719aa0b3e82e25d17a077883784d0
 DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.0.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.4.ebuild
deleted file mode 100644
index e244974c1501..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-5.0.4.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"
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-CRATES="
-	cc@1.0.84
-	codespan-reporting@0.11.1
-	cxx-build@1.0.110
-	cxx@1.0.110
-	cxxbridge-flags@1.0.110
-	cxxbridge-macro@1.0.110
-	equivalent@1.0.1
-	hashbrown@0.14.2
-	indexmap@2.1.0
-	ipnet@2.9.0
-	itoa@1.0.9
-	libc@0.2.150
-	link-cplusplus@1.0.9
-	once_cell@1.18.0
-	proc-macro2@1.0.69
-	quote@1.0.33
-	ryu@1.0.15
-	scratch@1.0.7
-	serde@1.0.192
-	serde_derive@1.0.192
-	serde_yaml@0.9.27
-	syn@2.0.39
-	termcolor@1.4.0
-	unicode-ident@1.0.12
-	unicode-width@0.1.11
-	unsafe-libyaml@0.2.9
-	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
-"
-
-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:=[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
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-src_configure() {
-	econf \
-		--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
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-src_test() {
-	default
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.0.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.5.ebuild
deleted file mode 100644
index 35970c3ed18e..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-5.0.5.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"
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-CRATES="
-	cc@1.0.84
-	codespan-reporting@0.11.1
-	cxx-build@1.0.110
-	cxx@1.0.110
-	cxxbridge-flags@1.0.110
-	cxxbridge-macro@1.0.110
-	equivalent@1.0.1
-	hashbrown@0.14.2
-	indexmap@2.1.0
-	ipnet@2.9.0
-	itoa@1.0.9
-	libc@0.2.150
-	link-cplusplus@1.0.9
-	once_cell@1.18.0
-	proc-macro2@1.0.69
-	quote@1.0.33
-	ryu@1.0.15
-	scratch@1.0.7
-	serde@1.0.192
-	serde_derive@1.0.192
-	serde_yaml@0.9.27
-	syn@2.0.39
-	termcolor@1.4.0
-	unicode-ident@1.0.12
-	unicode-width@0.1.11
-	unsafe-libyaml@0.2.9
-	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
-"
-
-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:=[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
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-src_configure() {
-	econf \
-		--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
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-src_test() {
-	default
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.0.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.6.ebuild
deleted file mode 100644
index e244974c1501..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-5.0.6.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"
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-CRATES="
-	cc@1.0.84
-	codespan-reporting@0.11.1
-	cxx-build@1.0.110
-	cxx@1.0.110
-	cxxbridge-flags@1.0.110
-	cxxbridge-macro@1.0.110
-	equivalent@1.0.1
-	hashbrown@0.14.2
-	indexmap@2.1.0
-	ipnet@2.9.0
-	itoa@1.0.9
-	libc@0.2.150
-	link-cplusplus@1.0.9
-	once_cell@1.18.0
-	proc-macro2@1.0.69
-	quote@1.0.33
-	ryu@1.0.15
-	scratch@1.0.7
-	serde@1.0.192
-	serde_derive@1.0.192
-	serde_yaml@0.9.27
-	syn@2.0.39
-	termcolor@1.4.0
-	unicode-ident@1.0.12
-	unicode-width@0.1.11
-	unsafe-libyaml@0.2.9
-	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
-"
-
-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:=[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
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-src_configure() {
-	econf \
-		--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
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-src_test() {
-	default
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.0.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.7.ebuild
deleted file mode 100644
index 35970c3ed18e..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-5.0.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"
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-CRATES="
-	cc@1.0.84
-	codespan-reporting@0.11.1
-	cxx-build@1.0.110
-	cxx@1.0.110
-	cxxbridge-flags@1.0.110
-	cxxbridge-macro@1.0.110
-	equivalent@1.0.1
-	hashbrown@0.14.2
-	indexmap@2.1.0
-	ipnet@2.9.0
-	itoa@1.0.9
-	libc@0.2.150
-	link-cplusplus@1.0.9
-	once_cell@1.18.0
-	proc-macro2@1.0.69
-	quote@1.0.33
-	ryu@1.0.15
-	scratch@1.0.7
-	serde@1.0.192
-	serde_derive@1.0.192
-	serde_yaml@0.9.27
-	syn@2.0.39
-	termcolor@1.4.0
-	unicode-ident@1.0.12
-	unicode-width@0.1.11
-	unsafe-libyaml@0.2.9
-	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
-"
-
-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:=[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
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-src_configure() {
-	econf \
-		--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
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-src_test() {
-	default
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.0.8.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.8.ebuild
index 35970c3ed18e..e244974c1501 100644
--- a/net-dns/pdns-recursor/pdns-recursor-5.0.8.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-5.0.8.ebuild
@@ -46,7 +46,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 )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-5.1.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.1.1.ebuild
index d03d27cc9b1d..b6e990955b2c 100644
--- a/net-dns/pdns-recursor/pdns-recursor-5.1.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-5.1.1.ebuild
@@ -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 )"
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index d62c52052e3d..45c0d3642ec4 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1,2 +1 @@
-DIST s6-dns-2.3.7.1.tar.gz 92354 BLAKE2B 52f3535cf508054044da74b8fdf03246d8dce11ffaa22f427c18ea27a8a61a46e7bb43bc50962f5c6f04a0b73e8d960a3e9f9acf9ea7c8a66f9706f4c3b8dd69 SHA512 9dabee86d9a27fb0e4a3c10563694bb5734c08c4d730a69daec17dad140274aa104bd6edbd501261c7a7c7bcee505f79134b7119457d5fbedcbb2be6b352ebb0
 DIST s6-dns-2.3.7.2.tar.gz 92381 BLAKE2B 952ac09a3f622eac0e4498fefd973a5344b763436c55066681884b74f61edb4dfef349ffda653477edc5d19d5315ca4768aa679a151507d088e926348665026b SHA512 4dc89e3b8ba22e4e63e8e5a84432ce444865712755c600b4bc62b49dda13c09c372ff2169b0db4790d0f07c392005dda76ed1df5ef8335d2f382d09919b53eae
diff --git a/net-dns/s6-dns/s6-dns-2.3.7.1.ebuild b/net-dns/s6-dns/s6-dns-2.3.7.1.ebuild
deleted file mode 100644
index e566ec1b44b9..000000000000
--- a/net-dns/s6-dns/s6-dns-2.3.7.1.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 toolchain-funcs
-
-DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2).7.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index d6f4567b7fa2..5756b80ab52a 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,3 +1,2 @@
-DIST arno-iptables-firewall-2.1.1.tar.gz 141076 BLAKE2B d3f78767a3ac447841aa01becfd73434cfddc9f56142d5c6ac86072527c17a30449434b8cddba74bb45f8234268ba589ab2ea932db462317a2dfb714f31f2450 SHA512 55494c8a214c0b2dacfef23170ea596bf9ecdfc73d1a6b2bd703183278569f68103eb63580d1b18cae97a9460b95373f0091bbf5decf275c80803a1331555d79
 DIST arno-iptables-firewall-2.1.1a.tar.gz 141116 BLAKE2B db6a4b5bfc94d69bbc8f6eb6b15485ae030e62ff26b00aa88e0426fdc711dadfc641a3a3fe55ce1c35ab61900f2d2235fca3d7359879d7255e44c3b19f8bf13f SHA512 1af2bd82434a530d44d2a511ce7416d2c5387ae1fe215e0db47cb72d6517a64c7d4366bfed33e0446d48ed403d55b09306d34aa8528d666f088d9557632b5756
 DIST arno-iptables-firewall-2.1.2a.tar.gz 141918 BLAKE2B a70e218ba98a8683aacf28a72494b237925cb343bf55933944244d1927b5202e30dbcb46673d8ac3d7f084208270ae407f8eeb6155a7bfd4c6aecf2a9a392c52 SHA512 cabdcc23da99593f32638c1467c20e59b6c13b64e37863e2293cde945ad5cdacb330521abc917813de4e8e1224fe44735dbb71edc56dcb821c3bd8a1bef01604
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
deleted file mode 100644
index 1d2ea185a64b..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="https://rocky.eld.leidenuniv.nl"
-
-MY_PV=$(ver_rs 3 -)
-MY_PV=${MY_PV/rc/RC}
-SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins rsyslog"
-
-DEPEND=""
-RDEPEND="net-firewall/ipset
-	net-firewall/iptables
-	sys-apps/coreutils
-	sys-apps/iproute2
-	plugins? ( net-dns/bind-tools )"
-
-S="${WORKDIR}/aif-${MY_PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
-before using this package. To start the script, run:
-
-/etc/init.d/${PN} start (for OpenRC)
-systemctl start ${PN} (for systemd)
-
-If you want to start this script at boot, run:
-
-rc-update add ${PN} default (for OpenRC)
-systemctl enable ${PN} (for systemd)"
-
-src_prepare() {
-	sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
-		bin/"${PN}" share/"${PN}"/environment || die "Sed failed!"
-	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
-		lib/systemd/system/"${PN}.service" || die "Sed failed!"
-	eapply_user
-}
-
-src_install() {
-	insinto /etc/"${PN}"
-	doins etc/"${PN}"/firewall.conf
-	doins etc/"${PN}"/custom-rules
-
-	doinitd "${FILESDIR}/${PN}"
-	systemd_dounit lib/systemd/system/"${PN}.service"
-
-	dobin bin/arno-fwfilter
-	dosbin bin/"${PN}"
-
-	insinto /usr/libexec/"${PN}"
-	doins share/"${PN}"/aif-job-execute
-	doins share/"${PN}"/aif-job-processor
-	doins share/"${PN}"/environment
-
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/"${PN}"
-
-	dodoc CHANGELOG README
-	readme.gentoo_create_doc
-
-	if use plugins
-	then
-		insinto /etc/"${PN}"/plugins
-		doins etc/"${PN}"/plugins/*
-
-		insinto /usr/libexec/"${PN}"/plugins
-		doins share/"${PN}"/plugins/*.plugin
-
-		exeinto /usr/libexec/"${PN}"/plugins
-		doexe share/"${PN}"/plugins/adaptive-ban-helper
-		doexe share/"${PN}"/plugins/dyndns-host-open-helper
-		doexe share/"${PN}"/plugins/parasitic-net-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
-		doexe share/"${PN}"/plugins/traffic-accounting-show
-
-		docinto plugins
-		dodoc share/"${PN}"/plugins/*.CHANGELOG
-	fi
-
-	if use rsyslog
-	then
-		insinto /etc/rsyslog.d
-		newins etc/rsyslog.d/"${PN}".conf 60-"${PN}".conf
-	fi
-
-	doman share/man/man1/arno-fwfilter.1 \
-		share/man/man8/"${PN}".8
-}
-
-pkg_postinst() {
-	ewarn "When you stop this script, all firewall rules are flushed!"
-	ewarn "Make sure to not use multiple firewall scripts simultaneously"
-	ewarn "unless you know what you are doing!"
-	readme.gentoo_print_elog
-}
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 58ee0e06b095..6d68316717a7 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1 +1,2 @@
 DIST firewalld-2.1.1.tar.bz2 1315222 BLAKE2B 064abfae1f2f1c5a63bbbbbec3357aa6e63936818fa2020ca882d1b834736b3735a32b0ab318e6de78b6f785cb4da0ee4e299956c922d9dbf6e7bd442e9bb2d6 SHA512 383e5ea3d451a28241e5a76f8d0efeeb8319663bdc5f680b68c5156ddb5145fac766a9ee9521c4af27b1df82861ca6f68ee81c0588b1dd6c4f6d4e4f5ca8fee1
+DIST firewalld-2.2.1.tar.bz2 1295501 BLAKE2B fc7bb401895bc39c34ec585468bdcc1b3c3f8eeb35c786c0cf7d886f456c99840107db73e8f611a7d7ab1db1408c6dc349a3d5eee2fbd1e624fe06dd8a558d91 SHA512 08117be01a25a8e263cf419d7b01a98c80b53108af68f6cfc1d900692e6124c37b9dd6feaf4bc3c6e3f27958a9ee45b9795c7f5a9250eb644b6e903f97672c8a
diff --git a/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch b/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch
new file mode 100644
index 000000000000..461dec825c94
--- /dev/null
+++ b/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch
@@ -0,0 +1,19 @@
+Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
+Removes EnvironmentFile and FIREWALLD_ARGS variable
+===================================================================
+--- a/config/firewalld.service.in
++++ b/config/firewalld.service.in
+@@ -4,12 +4,10 @@
+ Wants=network-pre.target
+ After=dbus.service
+ After=polkit.service
+-Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
+ Documentation=man:firewalld(1)
+
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/firewalld
+-ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
++ExecStart=@sbindir@/firewalld --nofork --nopid
+ ExecReload=/bin/kill -HUP $MAINPID
+ # supress to log debug and error output also to /var/log/messages
+ StandardOutput=null
diff --git a/net-firewall/firewalld/files/firewalld.service b/net-firewall/firewalld/files/firewalld.service
deleted file mode 100644
index 708326f58fed..000000000000
--- a/net-firewall/firewalld/files/firewalld.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=firewalld - dynamic firewall daemon
-Before=network-pre.target
-Wants=network-pre.target
-After=dbus.service
-After=polkit.service
-Documentation=man:firewalld(1)
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/firewalld
-ExecStart=/usr/sbin/firewalld --nofork --nopid $FIREWALLD_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-# supress to log debug and error output also to /var/log/messages
-StandardOutput=null
-StandardError=null
-Type=dbus
-BusName=org.fedoraproject.FirewallD1
-KillMode=mixed
-
-[Install]
-WantedBy=multi-user.target
-Alias=dbus-org.fedoraproject.FirewallD1.service
diff --git a/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..f017a3287621
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-2.2.1-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature
+inherit plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://firewalld.org/"
+SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="gui selinux test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/openrc-navi sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		>=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]
+		)
+	')
+	net-firewall/nftables[xtables(+)]
+	selinux? ( sec-policy/selinux-firewalld )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/glib:2
+"
+BDEPEND="
+	app-text/docbook-xml-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-systemd-service.patch
+)
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="
+		~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER
+		~NETFILTER_ADVANCED
+		~NETFILTER_INGRESS
+		~NF_NAT_MASQUERADE
+		~NF_NAT_REDIRECT
+		~NF_TABLES_INET
+		~NF_TABLES_IPV4
+		~NF_TABLES_IPV6
+		~NF_CONNTRACK
+		~NF_CONNTRACK_BROADCAST
+		~NF_CONNTRACK_NETBIOS_NS
+		~NF_CONNTRACK_TFTP
+		~NF_CT_NETLINK
+		~NF_CT_NETLINK_HELPER
+		~NF_DEFRAG_IPV4
+		~NF_DEFRAG_IPV6
+		~NF_NAT
+		~NF_NAT_TFTP
+		~NF_REJECT_IPV4
+		~NF_REJECT_IPV6
+		~NF_SOCKET_IPV4
+		~NF_SOCKET_IPV6
+		~NF_TABLES
+		~NF_TPROXY_IPV4
+		~NF_TPROXY_IPV6
+		~IP_NF_FILTER
+		~IP_NF_IPTABLES
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_RAW
+		~IP_NF_SECURITY
+		~IP_NF_TARGET_MASQUERADE
+		~IP_NF_TARGET_REJECT
+		~IP6_NF_FILTER
+		~IP6_NF_IPTABLES
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT
+		~IP6_NF_RAW
+		~IP6_NF_SECURITY
+		~IP6_NF_TARGET_MASQUERADE
+		~IP6_NF_TARGET_REJECT
+		~IP_SET
+		~NETFILTER_CONNCOUNT
+		~NETFILTER_NETLINK
+		~NETFILTER_NETLINK_OSF
+		~NETFILTER_NETLINK_QUEUE
+		~NETFILTER_SYNPROXY
+		~NETFILTER_XTABLES
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER_XT_MATCH_MULTIPORT
+		~NETFILTER_XT_MATCH_STATE
+		~NETFILTER_XT_NAT
+		~NETFILTER_XT_TARGET_MASQUERADE
+		~NFT_COMPAT
+		~NFT_CT
+		~NFT_FIB
+		~NFT_FIB_INET
+		~NFT_FIB_IPV4
+		~NFT_FIB_IPV6
+		~NFT_HASH
+		~NFT_LIMIT
+		~NFT_LOG
+		~NFT_MASQ
+		~NFT_NAT
+		~NFT_QUEUE
+		~NFT_QUOTA
+		~NFT_REDIR
+		~NFT_REJECT
+		~NFT_REJECT_INET
+		~NFT_REJECT_IPV4
+		~NFT_REJECT_IPV6
+		~NFT_SOCKET
+		~NFT_SYNPROXY
+		~NFT_TPROXY
+		~NFT_TUNNEL
+		~NFT_XFRM
+	"
+
+	# kernel >= 4.19 has a unified NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	# bug #926685
+	if kernel_is -le 6 1 ; then
+		CONFIG_CHECK+=" ~NFT_OBJREF"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${ED}"/etc/xdg/autostart || die
+		rm -f "${ED}"/usr/bin/firewall-applet || die
+		rm -f "${ED}"/usr/bin/firewall-config || die
+		rm -rf "${ED}"/usr/share/applications || die
+		rm -rf "${ED}"/usr/share/icons || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-firewall/ipset/files/ipset-7.22-fix-building-on-musl.patch b/net-firewall/ipset/files/ipset-7.22-fix-building-on-musl.patch
new file mode 100644
index 000000000000..7a77aa952869
--- /dev/null
+++ b/net-firewall/ipset/files/ipset-7.22-fix-building-on-musl.patch
@@ -0,0 +1,10 @@
+--- a/src/ipset.c	2024-08-30 14:21:19.201863069 +0000
++++ b/src/ipset.c	2024-08-30 14:21:52.525571560 +0000
+@@ -15,6 +15,7 @@
+ #include <config.h>
+ #include <libipset/ipset.h>		/* ipset library */
+ #include <libipset/xlate.h>		/* translate to nftables */
++#include <libgen.h>
+ 
+ int
+ main(int argc, char *argv[])
diff --git a/net-firewall/ipset/ipset-7.22-r2.ebuild b/net-firewall/ipset/ipset-7.22-r2.ebuild
new file mode 100644
index 000000000000..5024380e1283
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.22-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=modules
+inherit autotools bash-completion-r1 linux-mod-r1 systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/"
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	net-firewall/iptables
+	net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-bash-completion.patch"
+	"${FILESDIR}/${P}-asan-buffer-overflow.patch"
+	"${FILESDIR}/${P}-argv-bounds.patch"
+	"${FILESDIR}/${P}-fix-building-on-musl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_setup() {
+	get_version
+	CONFIG_CHECK="NETFILTER"
+	ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+	CONFIG_CHECK+=" NETFILTER_NETLINK"
+	ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel."
+	# It does still build without NET_NS, but it may be needed in future.
+	#CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+	#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel."
+	CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+	ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)"
+
+	build_modules=0
+	if use modules; then
+		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
+			if linux_chkconfig_present "IP_NF_SET" || \
+				linux_chkconfig_present "IP_SET"; then #274577
+				eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel."
+				eerror "Please either build ipset with modules USE flag disabled"
+				eerror "or rebuild kernel without IP_SET support and make sure"
+				eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ."
+				die "USE=modules and in-kernel ipset support detected."
+			else
+				einfo "Modular kernel detected. Gonna build kernel modules..."
+				build_modules=1
+			fi
+		else
+			eerror "Nonmodular kernel detected, but USE=modules. Either build"
+			eerror "modular kernel (without IP_SET) or disable USE=modules"
+			die "Nonmodular kernel detected, will not build kernel modules"
+		fi
+	fi
+
+	[[ ${build_modules} -eq 1 ]] && linux-mod-r1_pkg_setup
+}
+
+src_configure() {
+	export bashcompdir="$(get_bashcompdir)"
+
+	econf \
+		--enable-bashcompl \
+		$(use_with modules kmod) \
+		--with-maxsets=${IP_NF_SET_MAX} \
+		--with-ksource="${KV_DIR}" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	einfo "Building userspace"
+
+	local modlist=( xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/:
+					em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules )
+
+	for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do
+		modlist+=( ${i}=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/ipset )
+	done
+
+	emake
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Building kernel modules"
+		linux-mod-r1_src_compile
+	fi
+}
+
+src_install() {
+	einfo "Installing userspace"
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/ipset.initd-r7 ${PN}
+	newconfd "${FILESDIR}"/ipset.confd-r1 ${PN}
+	systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
+	keepdir /var/lib/ipset
+
+	if [[ ${build_modules} -eq 1 ]]; then
+		einfo "Installing kernel modules"
+		linux-mod-r1_src_install
+	fi
+}
diff --git a/net-firewall/nftables/nftables-1.1.0.ebuild b/net-firewall/nftables/nftables-1.1.0.ebuild
deleted file mode 100644
index 60c4f92e0ca9..000000000000
--- a/net-firewall/nftables/nftables-1.1.0.ebuild
+++ /dev/null
@@ -1,228 +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..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
-inherit edo linux-info distutils-r1 systemd verify-sig
-
-DESCRIPTION="Linux kernel firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
-	BDEPEND="app-alternatives/yacc"
-else
-	SRC_URI="
-		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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-fi
-
-# See COPYING: new code is GPL-2+, existing code is GPL-2
-LICENSE="GPL-2 GPL-2+"
-SLOT="0/1"
-IUSE="debug doc +gmp json libedit python +readline static-libs test xtables"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.4:=
-	>=net-libs/libnftnl-1.2.7:=
-	gmp? ( dev-libs/gmp:= )
-	json? ( dev-libs/jansson:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-	xtables? ( >=net-firewall/iptables-1.6.1:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/asciidoc
-		>=app-text/docbook2X-0.8.8-r4
-	)
-	python? ( ${DISTUTILS_DEPS} )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	libedit? ( !readline )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} =~ ^[9]{4,}$ ]] ; then
-		eautoreconf
-	fi
-
-	if use python; then
-		pushd py >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable debug)
-		$(use_enable doc man-doc)
-		$(use_with !gmp mini_gmp)
-		$(use_with json)
-		$(use_with libedit cli editline)
-		$(use_with readline cli readline)
-		$(use_enable static-libs static)
-		$(use_with xtables)
-	)
-
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		pushd py >/dev/null || die
-		distutils-r1_src_configure
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd py >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_test() {
-	emake check
-
-	if [[ ${EUID} == 0 ]]; then
-		edo tests/shell/run-tests.sh -v
-	else
-		ewarn "Skipping shell tests (requires root)"
-	fi
-
-	if use python; then
-		pushd tests/py >/dev/null || die
-		distutils-r1_src_test
-		popd >/dev/null || die
-	fi
-}
-
-python_test() {
-	if [[ ${EUID} == 0 ]]; then
-		edo "${EPYTHON}" nft-test.py
-	else
-		ewarn "Skipping Python tests (requires root)"
-	fi
-}
-
-src_install() {
-	default
-
-	if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
-		pushd doc >/dev/null || die
-		doman *.?
-		popd >/dev/null || die
-	fi
-
-	# Do it here instead of in src_prepare to avoid eautoreconf
-	# rmdir lets us catch if more files end up installed in /etc/nftables
-	dodir /usr/share/doc/${PF}/skels/
-	mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
-	rmdir "${ED}"/etc/nftables || die
-
-	exeinto /usr/libexec/${PN}
-	newexe "${FILESDIR}"/libexec/${PN}-mk.sh ${PN}.sh
-	newconfd "${FILESDIR}"/${PN}-mk.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-mk.init-r1 ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-
-	if use python ; then
-		pushd py >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_preinst() {
-	local stderr
-
-	# There's a history of regressions with nftables upgrades. Perform a
-	# safety check to help us spot them earlier. For the check to pass, the
-	# currently loaded ruleset, if any, must be successfully evaluated by
-	# the newly built instance of nft(8).
-	if [[ -n ${ROOT} ]] || [[ ! -d /sys/module/nftables ]] || [[ ! -x /sbin/nft ]]; then
-		# Either nftables isn't yet in use or nft(8) cannot be executed.
-		return
-	elif ! stderr=$(umask 177; /sbin/nft -t list ruleset 2>&1 >"${T}"/ruleset.nft); then
-		# Report errors induced by trying to list the ruleset but don't
-		# treat them as being fatal.
-		printf '%s\n' "${stderr}" >&2
-	elif [[ ${stderr} == *"is managed by iptables-nft"* ]]; then
-		# Rulesets generated by iptables-nft are special in nature and
-		# will not always be printed in a way that constitutes a valid
-		# syntax for ntf(8). Ignore them.
-		return
-	elif set -- "${ED}"/usr/lib*/libnftables.so;
-		! LD_LIBRARY_PATH=${1%/*} "${ED}"/sbin/nft -c -f -- "${T}"/ruleset.nft
-	then
-		eerror "Your currently loaded ruleset cannot be parsed by the newly built instance of"
-		eerror "nft. This probably means that there is a regression introduced by v${PV}."
-		eerror "(To make the ebuild fail instead of warning, set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
-		if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
-			die "Aborting because of failed nft reload!"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local save_file
-	save_file="${EROOT}"/var/lib/nftables/rules-save
-
-	# In order for the nftables-restore systemd service to start
-	# the save_file must exist.
-	if [[ ! -f "${save_file}" ]]; then
-		( umask 177; touch "${save_file}" )
-	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
-		ewarn "Your system has dangerous permissions for ${save_file}"
-		ewarn "It is probably affected by bug #691326."
-		ewarn "You may need to fix the permissions of the file. To do so,"
-		ewarn "you can run the command in the line below as root."
-		ewarn "    'chmod 600 \"${save_file}\"'"
-	fi
-
-	if has_version 'sys-apps/systemd'; then
-		elog "If you wish to enable the firewall rules on boot (on systemd) you"
-		elog "will need to enable the nftables-restore service."
-		elog "    'systemctl enable ${PN}-restore.service'"
-		elog
-		elog "If you are creating firewall rules before the next system restart"
-		elog "the nftables-restore service must be manually started in order to"
-		elog "save those rules on shutdown."
-	fi
-
-	if has_version 'sys-apps/openrc'; then
-		elog "If you wish to enable the firewall rules on boot (on openrc) you"
-		elog "will need to enable the nftables service."
-		elog "    'rc-update add ${PN} default'"
-		elog
-		elog "If you are creating or updating the firewall rules and wish to save"
-		elog "them to be loaded on the next restart, use the \"save\" functionality"
-		elog "in the init script."
-		elog "    'rc-service ${PN} save'"
-	fi
-}
diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006-r1.ebuild b/net-firewall/pglinux/pglinux-2.3.1_p20171006-r1.ebuild
deleted file mode 100644
index dce22e6b5022..000000000000
--- a/net-firewall/pglinux/pglinux-2.3.1_p20171006-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=7
-
-COMMIT=9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8
-MY_PN="peerguardian"
-MY_P="${MY_PN}-${PV}"
-inherit autotools qmake-utils linux-info systemd xdg-utils
-
-DESCRIPTION="Privacy oriented firewall application"
-HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron dbus networkmanager qt5 zlib"
-REQUIRED_USE="qt5? ( dbus )"
-
-DEPEND="
-	net-libs/libnetfilter_queue
-	net-libs/libnfnetlink
-	dbus? ( sys-apps/dbus )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		|| (
-			kde-plasma/kde-cli-tools:*[kdesu]
-			x11-misc/ktsuss
-		)
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
-	net-firewall/iptables
-	sys-apps/sysvinit
-	cron? ( virtual/cron )
-	networkmanager? ( net-misc/networkmanager:= )
-"
-BDEPEND="
-	app-arch/unzip
-	dev-build/libtool:2
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_TARGET_NFQUEUE
-	~NETFILTER_XT_MATCH_IPRANGE
-	~NETFILTER_XT_MARK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NF_CONNTRACK
-	~NF_CONNTRACK_IPV4
-	~NF_DEFRAG_IPV4
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_TARGET_REJECT"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
-
-src_prepare() {
-	default
-	sed -e 's:/sbin/runscript:/sbin/openrc-run:' \
-		-i pglcmd/init/pgl.gentoo.in || die "Failed to convert to openrc-run"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-lowmem
-		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps
-		--with-gentoo-init
-		--localstatedir=/var
-		--enable-logrotate
-		$(use_enable cron)
-		$(use_enable dbus)
-		$(use_enable networkmanager)
-		$(use_with qt5)
-		LRELEASE=$(qt5_get_bindir)/lrelease
-		LUPDATE=$(qt5_get_bindir)/lupdate
-		MOC=$(qt5_get_bindir)/moc
-		QMAKE=$(qt5_get_bindir)/qmake
-		RCC=$(qt5_get_bindir)/rcc
-		UIC=$(qt5_get_bindir)/uic
-		$(use_enable zlib)
-		--with-systemd="$(systemd_get_systemunitdir)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/{lib,log,spool}/pgl
-	rm -rf "${ED}"/tmp || die
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
-	elog "  app-arch/unzip (needed for blocklists packed as .zip)"
-	elog "  virtual/mta (needed to send informational (blocklist updates) and"
-	elog "    warning mails (if pglcmd.wd detects a problem.))"
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006-r2.ebuild b/net-firewall/pglinux/pglinux-2.3.1_p20171006-r2.ebuild
new file mode 100644
index 000000000000..4d46a3319fb3
--- /dev/null
+++ b/net-firewall/pglinux/pglinux-2.3.1_p20171006-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8
+MY_PN="peerguardian"
+MY_P="${MY_PN}-${PV}"
+inherit autotools qmake-utils linux-info systemd xdg-utils
+
+DESCRIPTION="Privacy oriented firewall application"
+HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
+SRC_URI="https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cron dbus networkmanager qt5 zlib"
+REQUIRED_USE="qt5? ( dbus )"
+
+DEPEND="
+	net-libs/libnetfilter_queue
+	net-libs/libnfnetlink
+	dbus? ( sys-apps/dbus )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}
+	net-firewall/iptables
+	sys-apps/sysvinit
+	cron? ( virtual/cron )
+	networkmanager? ( net-misc/networkmanager:= )
+	qt5? ( || (
+			kde-plasma/kdesu-gui
+			x11-misc/ktsuss
+	) )
+"
+BDEPEND="
+	app-arch/unzip
+	dev-build/libtool:2
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_TARGET_NFQUEUE
+	~NETFILTER_XT_MATCH_IPRANGE
+	~NETFILTER_XT_MARK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NF_CONNTRACK
+	~NF_CONNTRACK_IPV4
+	~NF_DEFRAG_IPV4
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_TARGET_REJECT"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
+
+src_prepare() {
+	default
+	sed -e 's:/sbin/runscript:/sbin/openrc-run:' \
+		-i pglcmd/init/pgl.gentoo.in || die "Failed to convert to openrc-run"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-lowmem
+		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps
+		--with-gentoo-init
+		--localstatedir=/var
+		--enable-logrotate
+		$(use_enable cron)
+		$(use_enable dbus)
+		$(use_enable networkmanager)
+		$(use_with qt5)
+		LRELEASE=$(qt5_get_bindir)/lrelease
+		LUPDATE=$(qt5_get_bindir)/lupdate
+		MOC=$(qt5_get_bindir)/moc
+		QMAKE=$(qt5_get_bindir)/qmake
+		RCC=$(qt5_get_bindir)/rcc
+		UIC=$(qt5_get_bindir)/uic
+		$(use_enable zlib)
+		--with-systemd="$(systemd_get_systemunitdir)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/{lib,log,spool}/pgl
+	rm -rf "${ED}"/tmp || die
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
+	elog "  app-arch/unzip (needed for blocklists packed as .zip)"
+	elog "  virtual/mta (needed to send informational (blocklist updates) and"
+	elog "    warning mails (if pglcmd.wd detects a problem.))"
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index d340d6b46336..a754d26a5c05 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1 +1,2 @@
 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533
+DIST nfs-utils-2.7.1.tar.bz2 1001424 BLAKE2B 176c5559c23c2761c1f2beed068fda8bdd39ac9fa09b4b223552c1455152c410d8925adf8d0023300d4355338e9dc8f6b2774ba71488e795945e5f1fee2b305c SHA512 9e55d4a0d672dbb0e20f8ea0213355a0bec054124c2a9437b3e4b81214c24ef5adb43914bd8606d4af14801ec8e6a4f849c9a97d76ae0879566792bbc960845a
diff --git a/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
new file mode 100644
index 000000000000..b177432a2ae2
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="https://downloads.sourceforge.net/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd +uuid"
+REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 )"
+# bug #315573
+RESTRICT="test"
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+COMMON_DEPEND="
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	sys-fs/e2fsprogs
+	dev-db/sqlite:3
+	dev-libs/libevent:=
+	caps? ( sys-libs/libcap )
+	ldap? (
+		net-nds/openldap:=
+		sasl? (
+			app-crypt/mit-krb5
+			dev-libs/cyrus-sasl:2
+		)
+	)
+	libmount? ( sys-apps/util-linux )
+	nfsv3? ( >=net-nds/rpcbind-0.2.4 )
+	nfsv4? (
+		>=sys-apps/keyutils-1.5.9:=
+		sys-fs/lvm2
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnfsidmap
+	selinux? (
+		sec-policy/selinux-rpc
+		nfsv3? ( sec-policy/selinux-rpcbind )
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+	"${FILESDIR}"/${PN}-udev-sysctl.patch
+	"${FILESDIR}"/${PN}-2.6.4-C99-inline.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfsv4 && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable CONFIG_CRYPTO_MD5 in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Our DEPEND forces this.
+	export libsqlite3_cv_is_recent=yes
+	export ac_cv_header_keyutils_h=$(usex nfsv4)
+
+	# SASL is consumed in a purely automagic way
+	export ac_cv_header_sasl_h=no
+	export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+	local myeconfargs=(
+		--disable-static
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		--enable-ipv6
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsv4)
+		$(use_enable nfsv4 nfsdcld)
+		$(use_enable nfsv4 nfsdcltrack)
+		$(use_enable nfsv4 nfsv41)
+		$(use_enable nfsv4 nfsv4server)
+		$(use_enable uuid)
+		$(use_with kerberos krb5 "${ESYSROOT}"/usr)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Remove compiled files bundled in the tarball
+	emake clean
+
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. bug #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=()
+	if use nfsv4 ; then
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+
+	local sedexp=( -e '#placehoder' )
+	use nfsv3 || sedexp+=( -e '/need portmap/d' )
+
+	mkdir -p "${T}/init.d" || die
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die
+		doinitd "${T}/init.d/${f}"
+	done
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	# Remove legacy service if not requested (as it will be broken without rpcbind)
+	if ! use nfsv3; then
+		rm "${ED}${systemd_systemunitdir}/nfs-server.service" || die
+	fi
+
+	# bug #368505
+	keepdir /var/lib/nfs
+	# bug #603628
+	keepdir /var/lib/nfs/v4recovery
+
+	# No static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+}
diff --git a/net-fs/nfs4-acl-tools/Manifest b/net-fs/nfs4-acl-tools/Manifest
index e419b9652c74..25bd68beedfd 100644
--- a/net-fs/nfs4-acl-tools/Manifest
+++ b/net-fs/nfs4-acl-tools/Manifest
@@ -1 +1,3 @@
 DIST nfs4-acl-tools-0.3.7.tar.gz 99139 BLAKE2B 5125fca65ee7b9dcea16e9b633bbfc26aa5c74202412119f138a5c47ae67d8f8e72fd4eb43182aaf3119858eb83fe6f24f6b53abc0b448aca04c3de4043ad9c1 SHA512 3922bced4e74891b0c4ea10a03eec0cc2e531de355776ba364a91bd656a78d19f9cfba026face34331841ee7c8609f12084fc10081601bc65aaf0fb008ca2fc6
+DIST nfs4-acl-tools-0.4.2.tar.gz 171197 BLAKE2B 2722063ef020a0933e277de7e971a2e255a7cb8db8b074b07ae5186f7e1b55da56cbe27b9c1aaed090a1b44e0b7e4547fdce83e182b5c654d32cbe23e960d8fc SHA512 ba78f4efda513b50ca0191ff239d87eb595f56013d9310f492491ea7fd0a25eefaf5f5f48efdfbb7173771585bb2785aedfd44688575f47cf42ee3a9a0229544
+DIST nfs4-acl-tools-0.4.3_rc1.tar.gz 57832 BLAKE2B 4738a423b09a7b5f71b5f3bbab1c184d0361ff1bc4de3eab0b251113dc4728feba91360225eaf6d6f70fa0c1e322b084dc0e567e2c5ed25a05200ae4398e0b2f SHA512 7445e91f869abc928623ca9eddadedbaf4fd2086cbd85e55178dc6e14b5cac99ee89ffb71ba87628b5a905f9e6052530a1f4e8bb9a5546420319d4c3cc7e86da
diff --git a/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.4.2-libattr.patch b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.4.2-libattr.patch
new file mode 100644
index 000000000000..f7ea55f8bfbc
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.4.2-libattr.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index 3337575..3612f92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AC_PROG_INSTALL
+ AC_PROG_CC
+ 
+ AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h unistd.h])
+-AC_CHECK_HEADERS([attr/xattr.h sys/xattr.h])
++AC_CHECK_HEADERS([sys/xattr.h])
+ 
+ AC_C_CONST
+ AC_TYPE_UID_T
+diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
+index eecdd34..4ec4f66 100644
+--- a/m4/package_attrdev.m4
++++ b/m4/package_attrdev.m4
+@@ -9,7 +9,7 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR],
+     libattr="-lattr"
+     test -f `pwd`/../attr/libattr/libattr.la && \
+         libattr="`pwd`/../attr/libattr/libattr.la"
+-    test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la"
++    test -f ${libdir}/libattr.la && libattr="${libdir}/libattr.la"
+     AC_SUBST(libattr)
+   ])
+ 
+@@ -24,6 +24,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR],
+     libattr="-lattr"
+     test -f `pwd`/../attr/libattr/libattr.la && \
+         libattr="`pwd`/../attr/libattr/libattr.la"
+-    test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la"
++    test -f ${libdir}/libattr.la && libattr="${libdir}/libattr.la"
+     AC_SUBST(libattr)
+   ])
diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.2.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.2.ebuild
new file mode 100644
index 000000000000..000cce8072fb
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs"
+HOMEPAGE="https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=summary"
+if [[ ${PV} != *_rc* ]] ; then
+	SRC_URI="
+		https://linux-nfs.org/~steved/${PN}/${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="
+		https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=snapshot;h=refs/tags/${P/_/-};sf=tgz
+			-> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${P/_/-}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RESTRICT="test"
+
+RDEPEND="sys-apps/attr"
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.7-libtool.patch" # bug #731162
+	"${FILESDIR}/${PN}-0.3.5-jobserver-unavailable.patch"
+	"${FILESDIR}/${PN}-0.4.2-libattr.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.3_rc1.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.3_rc1.ebuild
new file mode 100644
index 000000000000..01732f05fadc
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.3_rc1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs"
+HOMEPAGE="https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=summary"
+if [[ ${PV} != *_rc* ]] ; then
+	SRC_URI="
+		https://linux-nfs.org/~steved/${PN}/${P}.tar.gz
+	"
+	# KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="
+		https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=snapshot;h=refs/tags/${P/_/-};sf=tgz
+			-> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${P/_/-}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# TODO only for 0.4.3_rc1
+# - it has minimal changes compared to 0.4.2
+# - no new release since 2022-11-22
+# - so we might as well keyword this as well
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+RDEPEND="sys-apps/attr"
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.7-libtool.patch" # bug #731162
+	"${FILESDIR}/${PN}-0.3.5-jobserver-unavailable.patch"
+	"${FILESDIR}/${PN}-0.4.2-libattr.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-fs/samba/samba-4.18.10.ebuild b/net-fs/samba/samba-4.18.10.ebuild
index be5091996562..d7569cd2b07f 100644
--- a/net-fs/samba/samba-4.18.10.ebuild
+++ b/net-fs/samba/samba-4.18.10.ebuild
@@ -369,6 +369,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.18.11.ebuild b/net-fs/samba/samba-4.18.11.ebuild
index 853948ccc18f..87b7ff0dc625 100644
--- a/net-fs/samba/samba-4.18.11.ebuild
+++ b/net-fs/samba/samba-4.18.11.ebuild
@@ -369,6 +369,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.18.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild
index 6d1877fa6e7b..523c89d53286 100644
--- a/net-fs/samba/samba-4.18.8.ebuild
+++ b/net-fs/samba/samba-4.18.8.ebuild
@@ -369,6 +369,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.18.9.ebuild b/net-fs/samba/samba-4.18.9.ebuild
index 1acb8412bd5c..e81477e18784 100644
--- a/net-fs/samba/samba-4.18.9.ebuild
+++ b/net-fs/samba/samba-4.18.9.ebuild
@@ -369,6 +369,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.19.4.ebuild b/net-fs/samba/samba-4.19.4.ebuild
index 9903c474ab38..5ced32d13bd1 100644
--- a/net-fs/samba/samba-4.19.4.ebuild
+++ b/net-fs/samba/samba-4.19.4.ebuild
@@ -368,6 +368,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.19.6.ebuild b/net-fs/samba/samba-4.19.6.ebuild
index 119e2c01cff1..bc332efe7f29 100644
--- a/net-fs/samba/samba-4.19.6.ebuild
+++ b/net-fs/samba/samba-4.19.6.ebuild
@@ -368,6 +368,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.19.7.ebuild b/net-fs/samba/samba-4.19.7.ebuild
index 0911ede7e865..488e63e216c4 100644
--- a/net-fs/samba/samba-4.19.7.ebuild
+++ b/net-fs/samba/samba-4.19.7.ebuild
@@ -368,6 +368,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.20.0.ebuild b/net-fs/samba/samba-4.20.0.ebuild
index 5cdececc5c61..cc11ee9dd01a 100644
--- a/net-fs/samba/samba-4.20.0.ebuild
+++ b/net-fs/samba/samba-4.20.0.ebuild
@@ -368,6 +368,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.20.1.ebuild b/net-fs/samba/samba-4.20.1.ebuild
index 5cdececc5c61..cc11ee9dd01a 100644
--- a/net-fs/samba/samba-4.20.1.ebuild
+++ b/net-fs/samba/samba-4.20.1.ebuild
@@ -368,6 +368,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/samba/samba-4.20.2.ebuild b/net-fs/samba/samba-4.20.2.ebuild
index 55f811279821..1b9ba753e133 100644
--- a/net-fs/samba/samba-4.20.2.ebuild
+++ b/net-fs/samba/samba-4.20.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *_rc* ]]; then
 	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -368,6 +368,8 @@ multilib_src_install() {
 		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
 		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
 		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
 	fi
 
 	if use pam && use winbind ; then
diff --git a/net-fs/wdfs/wdfs-1.4.2-r2.ebuild b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild
deleted file mode 100644
index 67ac495d22aa..000000000000
--- a/net-fs/wdfs/wdfs-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDAV filesystem with special features for accessing subversion repositories"
-HOMEPAGE="http://noedler.de/projekte/wdfs/"
-SRC_URI="http://noedler.de/projekte/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/neon-0.24.7
-	>=sys-fs/fuse-2.5:0
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-Waddress.patch"
-)
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild
index b4093a7b8c5e..e739104433e5 100644
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
 else
 	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
deleted file mode 100644
index f220232e1764..000000000000
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Facebook protocol plugin for BitlBee"
-HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit	git-r3
-	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
-else
-	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=net-im/bitlbee-3[plugins]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index b85d45645eee..5a1e2c44c926 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1 +1 @@
-DIST discord-0.0.64.tar.gz 103547165 BLAKE2B c0ef2ab2f5296a7ba29f7d5a53f0d26fd6984579b32a9641fa2b49c3a5fa6ab7a371dcebdb97481e7843e179c6f0cf1fb55775659639727b72220a50dffa8d17 SHA512 835a1a1ac6c583e41d7c3521b5cbdafaf669d18b5ba1521109c3a3554d10015ef1198aba3697a149bdebb3cd747de4534dd923d448138891be661af96fbee26f
+DIST discord-0.0.68.tar.gz 103552884 BLAKE2B 949f2fc8591a5b076420930484788ce605ffccfbbfcc2cd458c214634d18d8945317d5b041d606137903d2479d022f94e462c537757469f0edd978c9d55ce37c SHA512 38375d2c778a36ce5676b6409ac399ad1fcb4e79abd0b08918132fa2c3fcd287b51e95457d8d4c9745957bbbad614041f925fbf7141f2d6d517ef79c9e878f9a
diff --git a/net-im/discord/discord-0.0.64.ebuild b/net-im/discord/discord-0.0.64.ebuild
deleted file mode 100644
index 9c133ac136e6..000000000000
--- a/net-im/discord/discord-0.0.64.ebuild
+++ /dev/null
@@ -1,147 +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
-	app-crypt/libsecret
-	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.68.ebuild b/net-im/discord/discord-0.0.68.ebuild
new file mode 100644
index 000000000000..1af370033bc8
--- /dev/null
+++ b/net-im/discord/discord-0.0.68.ebuild
@@ -0,0 +1,146 @@
+# 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/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 3ca08714061a..a7da7f3c5a44 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.11.70_amd64.deb 98683552 BLAKE2B d3e70470e6371b74f070b972f56fb07ef599a771b9bf8c202d9738dab6b35ebca96e2a641c2b21fc5a8a3b1950e5259db273887a218cfcaeafd786313d28e3ec SHA512 5ed1e2e3dc064f53bd67370372b63733c092c667ba07b8a9669efc40c7fbc5b11d02caa6aca210fb9deaf56daef1321474cf96509921ee4462ae8cb0c0064413
+DIST element-desktop_1.11.76_amd64.deb 98759454 BLAKE2B 1d513f87c692cad3319f4e816f965a81beaa88ba1cd2bac1e444480ab60d78f610d8a44b6b5ff8ab286800170de19518ea713f0fda1f901bf4d5d02975b908a8 SHA512 fb34d1bb29b81f59e1f1439a1ad55e83a868e5c1b67206197793c0fa63d8c0c35bc9a5f41ecb934426821dc86ed0152192b831786f36c5c5121a4306f38dd287
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.70.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.76.ebuild
index caa91e1123e0..caa91e1123e0 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.11.70.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.11.76.ebuild
diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest
index fd1fca034f21..f3eb072cda29 100644
--- a/net-im/fractal/Manifest
+++ b/net-im/fractal/Manifest
@@ -1,20 +1,4 @@
-DIST fractal-6.tar.bz2 1430986 BLAKE2B 2388771eb34b527ce758efc9a81a5134cb5558ba64bbdf2cbb4911e56698dff7fcf175280b1a8126ffe59189024dbdb3fb847a88e991b86adb81b5e0f64a4ef7 SHA512 78f5ae06117b8f7218084946c883022ec08ae213a433c17386cdf84a30dcb2796f957c13b5b21cef1e500df0b1a86794aff144698c014fdeb42b782bf5583280
-DIST fractal-6_beta-crates.tar.xz 45123596 BLAKE2B 88bd065066367943dc84af70a514f79e96382d62fb47caf80844a0c5532cc065fe5aa72bc737f240d6f64cd5e9f123be467c9fef0fd64e8f7a4aa496e613a408 SHA512 23cfff457be78c6ba2e71342d54605adad28dd0a21dcf3d3415477a36e78c52c921fd92083551798b6fccb4569814a33606812752c5b9c4ca2952e94f7f2f596
-DIST fractal-7.rc.tar.bz2 1758681 BLAKE2B e1ba8fc8a6c03056ade1ec47d7c366b10457e69f36926f53e8b3066c9a8381ff7de8905e7015fdd898f70443a3863b3eaab38e77bf5fff415ffef123bc9128f3 SHA512 7d8e4106dfdd3f5aa5615d5ddd299752b08052c303cb336d8e3b4f75ade938f91d363f3d6a51b44b12a6b86c65e127ebd4809383a58f9afdf4ee10361f72883d
-DIST fractal-7.tar.bz2 1776528 BLAKE2B e77f434bdcd4ddc198392dec6ee07f13e21d9dd780f66555e6baf2e19ac118a8ab7acff2366c87b458d0825c230ba029d2f4a85e1678f1d08743289adc5f23a5 SHA512 413970efb89326cb19fefe9a375580e38b1338013b6b1f5b454c25e0bbe1ef948cc678ddcde5cf781dadbde150f2c58c09469adbde2fb6613009b620417cbc2d
-DIST fractal-7_rc-crates.tar.xz 50067064 BLAKE2B 0d11ba2a36b9e71292f0e44a42fd910aba6926bf310b807833a00c1ad41bbdc50b30155b7950805c4c6c261fec464949b73a01ad27c0f92f1e5947ba5e446582 SHA512 61d4a0dda16fab90cede30e791ab34a97f7d02cccf9d0dab323eac221a5cd523c6565ffa163f8b76815c0ba390e47e485721e9124b63d0c4221ae888cd2477a6
-DIST fractal-8.beta.tar.bz2 1828544 BLAKE2B a8ce003d217297b5d8a479d1a04f442aaa83d09a74bf79fdc37cbf084b7860cb8a9620ef134a2e4a9c1d2777e2e22c2af400966341335055c1bb51844de84953 SHA512 5953ccb6c1953a6a31bc8f74e12c08aba3ef39d46401c06c47a1c8d34f54acb69cb6c9197276124390aa914ab331df438538899ff78e60f40ee57cf7e40b9d11
-DIST fractal-8.rc.tar.bz2 1843363 BLAKE2B 59137e9d0a78251495a04bfbef47c0b03599d2cd326281cc1366224a297cff1a5300c4a906720dcace4a061c291c6d95c4dea62c4b1b38288b880c3b198b32b0 SHA512 ab90ff7a3628272e8f72128a42572af2957b4ede37fbf973f4e5901d2974e747f624bc9911d17f45c205ca74388802f13113e68da570da4c7f3fbc792a0e8639
 DIST fractal-8.tar.bz2 1860423 BLAKE2B d6b0b0a8f479d7ceda4c40bd9eb677ef01abf8304ebd4ba8d15bc96557c78ec84af37fbca241feec3e85b3ef3b4ae6bc7564a40c5232830b43b03cd73e6fe9f4 SHA512 cae1e9f85fb570a075ceb88c115d5ce8169a3c38920765e46fd0f92e6c962a2377338e330d54cf3944903828db1c0c50c51ff4de2a079b34a478248485aad952
-DIST fractal-8_beta-crates.tar.xz 48856364 BLAKE2B cf7973533446e296ee2b8fbc258c80add440aa8f29300e1f300d87ab95f74337fd6433daaae5ee494452315f9ebf12b8b45b5200dd2d70b2b9d2ae522960508c SHA512 b1f7c790412fccc1ee4ae114fd4f82fe82a155d004168b7b0ad54749c04e4a82a76557e4e1dc2d26235414975a50d830f357ac7da3bd3fce41bcaa58d25d4c5c
 DIST fractal-8_rc-crates.tar.xz 49000316 BLAKE2B b9c68668e762563a06ba176e23b76fab23ba97e61e48c01ad18e063426fc906c20c559a0f812fa08871b916156d3374b9308390f950e3dd1fa56ab270f8d283e SHA512 8c855aae2fbddbe2c186b6e1c0ef269ab1ced6c5ea1f3e7270681d6523549569aa6ccab91cbc803b1322d5115d9c8cda0df75d8eef9db559f10834d542454723
-DIST matrix-authentication-service-099eabd1371d2840a2f025a6372d6428039eb511.gh.tar.gz 1455871 BLAKE2B f774e3a7d86f06ebd6dbe5a9952533010d2d07d5e5857ea778c307d71c2b741027ca0787caaec602a41589f0fa7e25834fdea4325db665438a3964d1025412be SHA512 2f29252f740c3874eefdcafa2f8fe499254e01e5a3bf79dc4e93a77627f9352f0606b33529764d4cd6aefca8128c7f991c11e136ccc8286e3b3cd06959b4ffd7
-DIST matrix-rust-sdk-0a7184e594d1dc0c00e5d5773f206f50a6c0939a.gh.tar.gz 2187701 BLAKE2B 0d65d3d5166ea3810c4e172edc0df34c8a53c9b2e80687b8a44d39dc4c4a704b49a5ef2fe9cf42e6b318380eab9ee00e9aa8c119caa45b6cbf418026ee5579d0 SHA512 7e8bdc5e437ddfed7c51ba0f8327d076ca1cf676f2cbb353b11c19b819371189c7f8f4d41b5bd102ba02181af345f142bce08c8e934bff01430ef34b80f7e06b
-DIST matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz 1743912 BLAKE2B 48b6352fbad17eb1651e5ca57bca25ea64dacecf0e97b63502fa54fd86ac65728656e799c0b50fddec575d05aa408c8347815f30afbf78413e973c35e0d8768f SHA512 a330250bf25dcb4a4a4a8bfc3bdda1a19d389080fb6a4983f00cc9cddc2f12b7a8f652942a58b9ed78b9c52802f94fd391e3dfd6971add8a44dbf66460488a1b
-DIST matrix-rust-sdk-88c4dec35f05ae295e0f2bf0362d6f5d72606d92.gh.tar.gz 1888735 BLAKE2B 5906290df4815505e28d3233c1e9515cb466b71068e6bbce4d89b33111b2367300e5503da61a7d1986e7ce1e515ab20c8d300c23de27e5168a216efba5c90893 SHA512 cced50fd36fe00223113533f65986b767919c6fadf68e6f4a8f778928510fa7702ef0d8f080e0eea686e1a99b324c6bafa141382e64aeb821fa1a1e258e1e98b
 DIST matrix-rust-sdk-92b4c2a469f507696fa9db3d6bdb000a761e2694.gh.tar.gz 2220737 BLAKE2B df740551e28e0651447dd3f3404b9e3aa2a871acaecbfb7774a5ea62c45b89b4ddfd347fa5d1975c22874e8f629a645e6fcd8d69b14de4c4e22723b47d217755 SHA512 f2f44cc3119666a7cc3382ba95b44b757ce9ef193a004aa4423ccbe51dbcafa6ecfbab6f90f2a274e88b06cd07e45c03c357877aa36e8626f67ae04c8586e328
-DIST ruma-4c00bd010dbdca6005bd599b52e90a0b7015d056.gh.tar.gz 646845 BLAKE2B 0b634c56bf8235a532d0a9e4997328aa2c4f03390eaddd006f6e099a7fceb12de87b271d57b822f63198bbcfb3e3ecc1dd2b06a24e8344e3f740f4e6044afd58 SHA512 cf5428805b5eace7c6368d849a90d3b53916dcf0afabdbb38acad2e5cc0bce6d6a3d948ae50d7f3d65b221b7b30ccebdce61275461482fe691d44b0ceb129ca9
 DIST ruma-4d3d8b46fd519012e4585ccf00dbea1eb602c028.gh.tar.gz 692921 BLAKE2B 3d06096f41327351e462628d1218c9031a10f3d3dd661dc2a2008ed37001cad649dd5f081316ca4eba7acc715c6eba91576532ea62ab94c8915ec697992f9390 SHA512 6193005c1e5224f4e903f00c4086091161239b2980c88dc23c666840fb72d61b336339909cb7efb4f9f14d151a8172fb8b0ecaf162df3a0094edccf97d616fe4
-DIST ruma-e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0.gh.tar.gz 683524 BLAKE2B aead22e6c7cc323fb6e0d8300c31aab0bb9033fe3db5b368a922aa2c0d077445d85355166183bb96bc03a49c9d087f8604e22059991d511c2d23d8d01041a70b SHA512 ff580a900bb0259f68349ec1d76dcdd30531c1b2300dbd990e2050963df1a2acfa105df266c24e2e3ce06c3a3ea1f54663807e64f7e84ea462bb8cce426d46ce
-DIST vodozemac-0c75746fc8a5eda4a0e490d345d1798b4c6cbd67.gh.tar.gz 200601 BLAKE2B 68fc156df1bc35d0a4d78e428ff39b521161e47e5dfe688b168c48510c44a80eef227851096b6875e71743301c178f8719ce6492b05f2c02941e5288f557f585 SHA512 1477da2e4c7be025ff3c1b73fce51e8d2a872d8d16481e7f159b55290810e315e0d92bb042204e3a28bc68fec346c769b04fcd82aff2de34a1293aa4bbfd14bd
-DIST vodozemac-4ef989c6a8eba0bc809e285a081c56320a9bbf1e.gh.tar.gz 211199 BLAKE2B 73489e233fea8813c22f99490420e19c0b30ee8a59a1815d7aab99b512680b2372c773a1038d9c1626abaa715f7eaf1149dceb1cf76b2571a6e6ebdb077febc0 SHA512 cfe8fbe9529865b1d5a2820b0d1ec42d82b3312562a8705d481a9e0126d0e5d2748b4c9e2f05faf83213980d9825fb2e296e019592cc8b17e1606d8304de60e6
diff --git a/net-im/fractal/fractal-6.ebuild b/net-im/fractal/fractal-6.ebuild
deleted file mode 100644
index 975db0e74b70..000000000000
--- a/net-im/fractal/fractal-6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2023-2024 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;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-base'
-	[matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-common'
-	[matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto'
-	[matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb'
-	[matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode'
-	[matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite'
-	[matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption'
-	[matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui'
-	[matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk'
-)
-
-inherit cargo gnome2-utils meson
-
-MY_P=${P/_/.}
-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/${P}_beta-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 GPL-3+ ISC MIT
-	MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-DEPEND="
-	>=dev-libs/glib-2.72
-	>=gui-libs/gtk-4.10.0:4
-	>=gui-libs/libadwaita-1.4.0: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]
-	>=dev-libs/openssl-1.0.1:=
-	>=media-libs/libshumate-1.0.0:1.0
-	>=dev-db/sqlite-3.24.0:3
-	>=sys-apps/xdg-desktop-portal-1.14.1
-"
-RDEPEND="
-	${DEPEND}
-	virtual/secret-service
-"
-# clang needed by bindgen
-BDEPEND="
-	sys-devel/clang
-	>=virtual/rust-1.75.0
-"
-
-# Rust
-QA_FLAGS_IGNORED="usr/bin/fractal"
-
-src_configure() {
-	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-7.ebuild b/net-im/fractal/fractal-7.ebuild
deleted file mode 100644
index ba5d82a37853..000000000000
--- a/net-im/fractal/fractal-7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[mas-http]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/http'
-	[mas-iana]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/iana'
-	[mas-jose]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/jose'
-	[mas-oidc-client]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/oidc-client'
-	[matrix-sdk-base]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-base'
-	[matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-common'
-	[matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto'
-	[matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb'
-	[matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode'
-	[matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite'
-	[matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption'
-	[matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui'
-	[matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk'
-	[oauth2-types]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/oauth2-types'
-	[ruma-client-api]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-client-api'
-	[ruma-common]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-common'
-	[ruma-events]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-events'
-	[ruma-federation-api]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-federation-api'
-	[ruma-html]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-html'
-	[ruma-identifiers-validation]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-identifiers-validation'
-	[ruma-macros]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-macros'
-	[ruma-push-gateway-api]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-push-gateway-api'
-	[ruma]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma'
-	[vodozemac]='https://github.com/matrix-org/vodozemac;0c75746fc8a5eda4a0e490d345d1798b4c6cbd67;vodozemac-%commit%'
-)
-
-inherit cargo gnome2-utils meson
-
-MY_P=${P/_/.}
-CRATE_P=${P}_rc
-
-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 GPL-3+ ISC MIT
-	MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	>=dev-libs/glib-2.76
-	>=gui-libs/gtk-4.12.0:4
-	>=gui-libs/libadwaita-1.5.0: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]
-	>=dev-libs/openssl-1.0.1:=
-	>=media-libs/libshumate-1.0.0:1.0
-	>=dev-db/sqlite-3.24.0:3
-	>=sys-apps/xdg-desktop-portal-1.14.1
-"
-RDEPEND="
-	${DEPEND}
-	virtual/secret-service
-"
-# clang needed by bindgen
-BDEPEND="
-	sys-devel/clang
-	>=virtual/rust-1.75.0
-"
-
-# 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() {
-	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-7_rc.ebuild b/net-im/fractal/fractal-7_rc.ebuild
deleted file mode 100644
index 1541d0b57f73..000000000000
--- a/net-im/fractal/fractal-7_rc.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[mas-http]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/http'
-	[mas-iana]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/iana'
-	[mas-jose]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/jose'
-	[mas-oidc-client]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/oidc-client'
-	[matrix-sdk-base]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-base'
-	[matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-common'
-	[matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto'
-	[matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb'
-	[matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode'
-	[matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite'
-	[matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption'
-	[matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui'
-	[matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;88c4dec35f05ae295e0f2bf0362d6f5d72606d92;matrix-rust-sdk-%commit%/crates/matrix-sdk'
-	[oauth2-types]='https://github.com/matrix-org/matrix-authentication-service;099eabd1371d2840a2f025a6372d6428039eb511;matrix-authentication-service-%commit%/crates/oauth2-types'
-	[ruma-client-api]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-client-api'
-	[ruma-common]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-common'
-	[ruma-events]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-events'
-	[ruma-federation-api]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-federation-api'
-	[ruma-html]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-html'
-	[ruma-identifiers-validation]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-identifiers-validation'
-	[ruma-macros]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-macros'
-	[ruma-push-gateway-api]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma-push-gateway-api'
-	[ruma]='https://github.com/ruma/ruma;4c00bd010dbdca6005bd599b52e90a0b7015d056;ruma-%commit%/crates/ruma'
-	[vodozemac]='https://github.com/matrix-org/vodozemac;0c75746fc8a5eda4a0e490d345d1798b4c6cbd67;vodozemac-%commit%'
-)
-
-inherit cargo gnome2-utils meson
-
-MY_P=${P/_/.}
-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/${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 GPL-3+ ISC MIT
-	MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	>=dev-libs/glib-2.76
-	>=gui-libs/gtk-4.12.0:4
-	>=gui-libs/libadwaita-1.5.0: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]
-	>=dev-libs/openssl-1.0.1:=
-	>=media-libs/libshumate-1.0.0:1.0
-	>=dev-db/sqlite-3.24.0:3
-	>=sys-apps/xdg-desktop-portal-1.14.1
-"
-RDEPEND="
-	${DEPEND}
-	virtual/secret-service
-"
-# clang needed by bindgen
-BDEPEND="
-	sys-devel/clang
-	>=virtual/rust-1.75.0
-"
-
-# 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() {
-	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.ebuild b/net-im/fractal/fractal-8.ebuild
index 2a278e434d24..cba92e4c81d5 100644
--- a/net-im/fractal/fractal-8.ebuild
+++ b/net-im/fractal/fractal-8.ebuild
@@ -55,7 +55,7 @@ LICENSE+="
 	MIT MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 DEPEND="
 	>=dev-libs/glib-2.76
diff --git a/net-im/fractal/fractal-8_beta.ebuild b/net-im/fractal/fractal-8_beta.ebuild
deleted file mode 100644
index bcb75925ea4f..000000000000
--- a/net-im/fractal/fractal-8_beta.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2023-2024 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;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-base'
-	[matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-common'
-	[matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto'
-	[matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb'
-	[matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode'
-	[matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite'
-	[matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption'
-	[matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui'
-	[matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;0a7184e594d1dc0c00e5d5773f206f50a6c0939a;matrix-rust-sdk-%commit%/crates/matrix-sdk'
-	[ruma-client-api]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-client-api'
-	[ruma-common]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-common'
-	[ruma-events]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-events'
-	[ruma-federation-api]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-federation-api'
-	[ruma-html]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-html'
-	[ruma-identifiers-validation]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-identifiers-validation'
-	[ruma-macros]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-macros'
-	[ruma-push-gateway-api]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma-push-gateway-api'
-	[ruma]='https://github.com/ruma/ruma;e5a370f7e5fcebb0da6e4945e51c5fafba9aa5f0;ruma-%commit%/crates/ruma'
-	[vodozemac]='https://github.com/matrix-org/vodozemac;4ef989c6a8eba0bc809e285a081c56320a9bbf1e;vodozemac-%commit%'
-)
-
-inherit cargo gnome2-utils meson
-
-MY_P=${P/_/.}
-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/${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-DFS-2016 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	>=dev-libs/glib-2.76
-	>=gui-libs/gtk-4.12.0:4
-	>=gui-libs/libadwaita-1.5.0: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]
-	>=dev-libs/openssl-1.0.1:=
-	>=media-libs/libshumate-1.0.0:1.0
-	>=dev-db/sqlite-3.24.0:3
-	>=sys-apps/xdg-desktop-portal-1.14.1
-"
-RDEPEND="
-	${DEPEND}
-	virtual/secret-service
-"
-# clang needed by bindgen
-BDEPEND="
-	sys-devel/clang
-	>=virtual/rust-1.79.0
-"
-
-# 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() {
-	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_rc.ebuild b/net-im/fractal/fractal-8_rc.ebuild
deleted file mode 100644
index 4f14fbbdf129..000000000000
--- a/net-im/fractal/fractal-8_rc.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2023-2024 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;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-base'
-	[matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-common'
-	[matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto'
-	[matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb'
-	[matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode'
-	[matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite'
-	[matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption'
-	[matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui'
-	[matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;92b4c2a469f507696fa9db3d6bdb000a761e2694;matrix-rust-sdk-%commit%/crates/matrix-sdk'
-	[ruma-client-api]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-client-api'
-	[ruma-common]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-common'
-	[ruma-events]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-events'
-	[ruma-federation-api]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-federation-api'
-	[ruma-html]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-html'
-	[ruma-identifiers-validation]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-identifiers-validation'
-	[ruma-macros]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-macros'
-	[ruma-push-gateway-api]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma-push-gateway-api'
-	[ruma]='https://github.com/matrix-org/ruma;4d3d8b46fd519012e4585ccf00dbea1eb602c028;ruma-%commit%/crates/ruma'
-)
-
-inherit cargo gnome2-utils meson
-
-MY_P=${P/_/.}
-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/${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-DFS-2016 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	>=dev-libs/glib-2.76
-	>=gui-libs/gtk-4.12.0:4
-	>=gui-libs/libadwaita-1.5.0: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]
-	>=dev-libs/openssl-1.0.1:=
-	>=media-libs/libshumate-1.0.0:1.0
-	>=dev-db/sqlite-3.24.0:3
-	>=sys-apps/xdg-desktop-portal-1.14.1
-"
-RDEPEND="
-	${DEPEND}
-	virtual/secret-service
-"
-# clang needed by bindgen
-BDEPEND="
-	sys-devel/clang
-	>=virtual/rust-1.79.0
-"
-
-# 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() {
-	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/neochat/Manifest b/net-im/neochat/Manifest
index b606b5c9c54f..3d32dd43a8b6 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,2 +1,2 @@
-DIST neochat-23.08.5.tar.xz 795564 BLAKE2B 1f6dec3376f059e9d70e8be5461719bc74d631a0f98b4d417cd5b8709b4ed1ce9fc48e90a57c8f32889ad2fbf3089f80d9b29a7a73a1944fb54db81f837c4a67 SHA512 936e8112818bc925121d71fcc23d43bc448387af7c8c7857f2ce8b5d128f1acedc9c3c2b6d66e50fb317418cbd144c5262e2fb9e6d80364d48e08e42b27316bf
 DIST neochat-24.05.2.tar.xz 980740 BLAKE2B ad04b0ac30337195d1666a308e354efa6bedfb6268f644c36d2fa2f9276ef4670311981377272552c3573c9cd78a223e285022c97169bee5c141460bdcd84ccd SHA512 fef944f0b7b4f4ce85645a18791a08b225989d7a55736a5946ae71c5db850f8ce620622ffcc276d688bc0047115067fb04c5aa48b3917e97b86fca0ca6bbb1d9
+DIST neochat-24.08.0.tar.xz 1024700 BLAKE2B e9bc4a0d5ec222ffa5cd2ab4997f6ca2ff4bc9ff24ca2a2108edeeaf639dcc2ebc50055e37e4dec4016c52698cd476324cdcb3bf64b88c223071c4e4280f6cc4 SHA512 07e60fc49fdf542a4f1f6463940aa2499a475c3cf61c9800fcd5107b1adc7c37b964cc921ed6798c38f3572349533683440c42977f244ada5ad8b8608c4d5674
diff --git a/net-im/neochat/files/neochat-24.08.0-cmake.patch b/net-im/neochat/files/neochat-24.08.0-cmake.patch
new file mode 100644
index 000000000000..b1ab04d7725e
--- /dev/null
+++ b/net-im/neochat/files/neochat-24.08.0-cmake.patch
@@ -0,0 +1,38 @@
+From a7e06375fddf7927b0b2bb5e8f986ace9d9a57eb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 11 Aug 2024 17:58:58 +0200
+Subject: [PATCH] Include missing ECMQmlModule
+
+Amends bc67033c003e7f8b73fadd4239ab5b737de27877 and e0c3a1c14395117661521f0d880bdcf52124d1e1
+
+No idea why this isn't caught by CI, but it fails for me otherwise.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 22743b6d8b3ddcd301ab80ef48a7896c18de464f)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d3e92f71..b5a2c9e34 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,6 +38,7 @@ include(KDEGitCommitHooks)
+ include(ECMCheckOutboundLicense)
+ include(ECMQtDeclareLoggingCategory)
+ include(ECMAddAndroidApk)
++include(ECMQmlModule)
+ if (NOT ANDROID)
+     include(KDEClangFormat)
+ endif()
+@@ -59,7 +60,6 @@ set_package_properties(Qt6 PROPERTIES
+     PURPOSE "Basic application components"
+ )
+ 
+-qt_policy(SET QTP0001 NEW)
+ if (QT_KNOWN_POLICY_QTP0004)
+ qt_policy(SET QTP0004 NEW)
+ endif ()
+-- 
+2.46.0
+
diff --git a/net-im/neochat/neochat-23.08.5.ebuild b/net-im/neochat/neochat-23.08.5.ebuild
deleted file mode 100644
index 4d3d2449ad44..000000000000
--- a/net-im/neochat/neochat-23.08.5.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="optional"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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 ~ppc64 x86"
-
-DEPEND="
-	app-text/cmark:=
-	>=dev-libs/kirigami-addons-0.7.2:5
-	dev-libs/qcoro5
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/knotifications-${KFMIN}:5[qml]
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5[qml]
-	media-libs/kquickimageeditor:5
-	>=net-libs/libquotient-0.8:=[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtlocation-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtpositioning-${QTMIN}:5[qml]
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-BDEPEND="virtual/pkgconfig"
-
-CMAKE_SKIP_TESTS=(
-	# bug 909816
-	texthandlertest
-)
diff --git a/net-im/neochat/neochat-24.05.2.ebuild b/net-im/neochat/neochat-24.05.2.ebuild
index f73be5685796..3e128c75ff85 100644
--- a/net-im/neochat/neochat-24.05.2.ebuild
+++ b/net-im/neochat/neochat-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/neochat/"
 
 LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 # TODO: Wire up kunifiedpush once packaged? (1a3055df8673802076bc0c269ec24274abef375b)
 DEPEND="
diff --git a/net-im/neochat/neochat-24.08.0.ebuild b/net-im/neochat/neochat-24.08.0.ebuild
new file mode 100644
index 000000000000..8a4786674d98
--- /dev/null
+++ b/net-im/neochat/neochat-24.08.0.ebuild
@@ -0,0 +1,60 @@
+# 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.1-r1:=[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
+	>=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/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.8.2:=[qt6]
+"
+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"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938367
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 370e6cc90fe6..46da5a3febf8 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_7.19.0_amd64.deb 121595302 BLAKE2B 24d86f4a622abc4b93a713debce12e4709fcc1e9b215ad560394454c951c9ff319b1ee373316645017b0d680bf1bde458848d3abe7f38dbb0d3f313b7028dc44 SHA512 03a573d12e30489ebd6a89062fbb88ff82ad7bcaadb29185af75911eff2a8be3fa30898035c79220560bde1f71db5ab71f74acb56ca99f8e721a23ab6289ac7e
+DIST signal-desktop_7.22.0_amd64.deb 122256870 BLAKE2B 39822a5bba412e389aea670ce315d71d503b2d82ea3209d11c8e4a95c503ea1aa15310153388ab7c2bad9ed5c960d6e0ada45efc2b3452c59156c9f76b230bcd SHA512 d3f45872af6318185ab7c732cabb72b1c193756e8d055ca3964284f37c94a6076eafcb11760ad7880dc1fe29a18ec598f5432a05da2046c95c633b70c5390e89
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-7.19.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-7.22.0.ebuild
index 4ddfe8d854e5..4ddfe8d854e5 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-7.19.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-7.22.0.ebuild
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 420ebf0ec03b..848ecbefdc03 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,2 +1,2 @@
-DIST slack-desktop-4.39.90-amd64.deb 80769062 BLAKE2B c181e467af3315fdc893cd5fd45b73f0398c4a2446aa930c71646635fd9bed27764160d4bc53c05d898da047c2074b529f73a0e710bb8fa84e6a8e1a699457d9 SHA512 1e7da79a4dc74a4bd89909bf4901c5bdb5a92194b3e6ae0baa50942ccc4210b134ea6da008e055a0c834015a2a73b44093258803e941b658dc3a043e2d0568b3
-DIST slack-desktop-4.39.95-amd64.deb 80122430 BLAKE2B dbe778c7be44a5e477f58e08aa204ead4e79fc511757ef4f8f7a3b8f1a3612694f955805731180f79e2df55c5af610cdd775d456ddfe2365caeadb7ac23e4cf5 SHA512 b4f7c9aea134016d034b254aecce459201aa80b09674a768b142581ff08491c854edfd9f94f640c1527df072f8f49ea3463289c92077ac8f17e27d7a8279ab86
+DIST slack-desktop-4.40.120-amd64.deb 81441946 BLAKE2B b2ac591f6abaa4fa37508c9dcce5eee382affbbde7612b1191c830ad95b51127d407657c1d0503cdb54032113b57c78785da8db0ac6e44bf469aa3273b50e1bd SHA512 66c54a75920cc6d821a66e139c1e389bfd518419c37b891236896cd4651369ce5b2c57fb23a01d766c32997be6b1d4cfe411b091557b7aa6c4b97dcf3d8e2bf2
+DIST slack-desktop-4.40.126-amd64.deb 81473774 BLAKE2B 2ba69b6b7171cd90c0f7f884f2c7af5933ced5bc77f5639a4e109054d0032e8391a4bb7e32a909709b0c251e71e50b768ead5d66c54fdf70fbc0398e316b1ee6 SHA512 c1ff49a49f209d27b0b61133e0b2237e79f065291ae4390ad19600547b0fcf820aeb658b28cb13975895aec6eff8dca002e68af53dd441d45e38b58c7d014511
diff --git a/net-im/slack/slack-4.39.90.ebuild b/net-im/slack/slack-4.40.120.ebuild
index 1df68b31ba00..1df68b31ba00 100644
--- a/net-im/slack/slack-4.39.90.ebuild
+++ b/net-im/slack/slack-4.40.120.ebuild
diff --git a/net-im/slack/slack-4.39.95.ebuild b/net-im/slack/slack-4.40.126.ebuild
index 1df68b31ba00..1df68b31ba00 100644
--- a/net-im/slack/slack-4.39.95.ebuild
+++ b/net-im/slack/slack-4.40.126.ebuild
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index d1b9b31f24ca..e974871fa2d4 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -9,6 +9,7 @@ DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8
 DIST bytes-1.6.1.crate 60723 BLAKE2B a6f28770d1c42d7bb02964cafedc205c2730351cfca81520dbf62300284416a49e19c5d858dc37ba001d21846efb75d20977162a7e203e7171ef33868a720309 SHA512 4826cdba7a772b68f7352a3160a4c8ff93002110644c2e99537274cbb9776ba2f40ed8be9cde564f58b884c1985bdbce07cd7f5a46d34b48146ff51f317b5ab7
+DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
@@ -28,7 +29,6 @@ DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad09095
 DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
 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 memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
@@ -52,27 +52,27 @@ DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
+DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
 DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
 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.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-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.120.crate 147062 BLAKE2B 54f93ef2b0f1c9e7c5a8e8797fd298c96513913a20c3e08a21aea39a15ffb5ad0269d5daab10fceea7164ba432e355b89d89dea2985f86bd0e73ac3920f827c5 SHA512 dab44850326f9020d6f6dd3fc8147e22eed693527fe9cac2c6bc8f6a030f461061e8e54d2780382ce32cced63b5a016372a4f9938effdd1631d8f3dc96014e3e
 DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160
+DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
 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
 DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
 DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
-DIST synapse-1.110.0.gh.tar.gz 8576357 BLAKE2B 9309e7d149dc68313eba1afe543d074ec0301b5d806c0236a1006fdebdfb088dc5678199fae44718564cfd62ea4795c8b4a3e5174c26b3c58139b29277bb089b SHA512 3c13c26290fde42ee88fa69d46ea06402f00061825c87a53ffe50571bb4fdc67a72ee780c88d72e1f7c50926111b9924d910ff2d79738bcb3163e13331f26454
-DIST synapse-1.111.0.gh.tar.gz 8616992 BLAKE2B 0492e2933c46186332c5b5cbfdb42a4d6323b4c4b3d85307ee631d983c3d7a64b57dd75a1b995ed96b137df444de70339debb3b52a13b8f9602801540ee969a0 SHA512 8067a130d1f992acfb0c6d6eca182506a075c4361f5f00ad2a02c57d9ed15c88abc05318fe80fc9d2853ecc36118d89eec7264ddefae4d38411d2d65bdbd7f51
 DIST synapse-1.111.1.gh.tar.gz 8617197 BLAKE2B 2d1a91ba46f53de964b188cce7c079a22783c8978aa47b0d69148ca59f7a05c398eae79846ac36dc704dae735c41ac071620811cbdf19b5831a839d23d2ca21f SHA512 02047f673ddf6f32731a327ba1412d2a396af0ee4a57a7a7ae5e76d6a14957196bedcf53ecc21d3dac8fc4d92872aad335755599fa1a87d82c90d471f0549ef3
 DIST synapse-1.112.0.gh.tar.gz 8644732 BLAKE2B b50d9313eee37efa87c8cbd197728462c3104b336136cd732c4eef3d17c1d71aaaac7f4dc28099755b67221ac9351e4238fa45fc01581d752eafddad6687e749 SHA512 dc09e37f6581dd2b25c2aaae53294df997e450bfc4c3496929f56d342d354a48f0bfaac2aee154f7e1f53e86f7d078844495290c0fbc6c91efea966f8f6d68ff
 DIST synapse-1.113.0.gh.tar.gz 8674102 BLAKE2B 2ee2e400b0a759af9a4278cfb6028c8a355d842d8a4f02ba9946f2ff5caba95573c53f33bbbca029a092cfabadfd853d4caaef4e2ad8d218ab89722f3a59d00b SHA512 190e14adb67ec39f63b21623b620fe60047ef49b2ea5515c17d3ff7d1cc990ddb26c4d7a35b65b61b28b5059ad6ff78a90cc3d49efc5b462f6a4240284ebf50f
+DIST synapse-1.114.0.gh.tar.gz 8697736 BLAKE2B 984cab788fd88ffbb1919b4aad75df741267a1d8752d9fd95a68e7bae75b28993b325fff32d721661607c3d66761f2ba5768ad6f0636f65a23eb4fc9c9e5100e SHA512 14e9abd441d1f67411d7087ca489a52343d7804ba8b575326ec52e128c0a3a0ba533b08ddaf3d31b49ac80d7b79a18e9ccdde581510c69c883d4284ddd4aed4b
 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.2.crate 11517 BLAKE2B b15ec0ddd8f4936de1533fb347888b0dc6d0755ee7cb8e11a54e70a4accf0f3558b06e5bf48a8f06199b030510dcfbc1d4180d94e9d7516ef7bede728dab2221 SHA512 6bad4dcc2cbd5c05b1d535e6d8bb91da84cf2ee8c2d6c189ce302f5d5c3757d7878ccefaebeaaed93b8b7d90ec4d22033f9aee7f9a22a9329ce9b391934a3b12
diff --git a/net-im/synapse/synapse-1.110.0.ebuild b/net-im/synapse/synapse-1.110.0.ebuild
deleted file mode 100644
index 78eaa933aa42..000000000000
--- a/net-im/synapse/synapse-1.110.0.ebuild
+++ /dev/null
@@ -1,243 +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=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-CRATES="
-	aho-corasick@1.1.3
-	anyhow@1.0.86
-	arc-swap@1.7.1
-	autocfg@1.3.0
-	base64@0.21.7
-	bitflags@2.5.0
-	blake2@0.10.6
-	block-buffer@0.10.4
-	bumpalo@3.16.0
-	bytes@1.6.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.4.1
-	hex@0.4.3
-	http@1.1.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
-	lock_api@0.4.12
-	log@0.4.21
-	memchr@2.7.2
-	memoffset@0.9.1
-	mime@0.3.17
-	once_cell@1.19.0
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.17
-	proc-macro2@1.0.82
-	pyo3-build-config@0.21.2
-	pyo3-ffi@0.21.2
-	pyo3-log@0.10.0
-	pyo3-macros-backend@0.21.2
-	pyo3-macros@0.21.2
-	pyo3@0.21.2
-	pythonize@0.21.1
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	redox_syscall@0.5.1
-	regex-automata@0.4.6
-	regex-syntax@0.8.3
-	regex@1.10.5
-	ryu@1.0.18
-	scopeguard@1.2.0
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.117
-	sha1@0.10.6
-	sha2@0.10.8
-	smallvec@1.13.2
-	subtle@2.5.0
-	syn@2.0.61
-	target-lexicon@0.12.14
-	typenum@1.17.0
-	ulid@1.1.2
-	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
-	windows-targets@0.52.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnu@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_msvc@0.52.5
-"
-
-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 )"
-
-DEPEND="
-	acct-user/synapse
-	acct-group/synapse
-"
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
-RDEPEND="
-	${DEPEND}
-	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/jinja-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/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.3.0_p20240628[${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="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		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/synapse/synapse-1.111.0.ebuild b/net-im/synapse/synapse-1.111.0.ebuild
deleted file mode 100644
index 3a89339b7731..000000000000
--- a/net-im/synapse/synapse-1.111.0.ebuild
+++ /dev/null
@@ -1,244 +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=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-CRATES="
-	aho-corasick@1.1.3
-	anyhow@1.0.86
-	arc-swap@1.7.1
-	autocfg@1.3.0
-	base64@0.21.7
-	bitflags@2.5.0
-	blake2@0.10.6
-	block-buffer@0.10.4
-	bumpalo@3.16.0
-	bytes@1.6.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.4.1
-	hex@0.4.3
-	http@1.1.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
-	lock_api@0.4.12
-	log@0.4.22
-	memchr@2.7.2
-	memoffset@0.9.1
-	mime@0.3.17
-	once_cell@1.19.0
-	parking_lot@0.12.2
-	parking_lot_core@0.9.10
-	portable-atomic@1.6.0
-	ppv-lite86@0.2.17
-	proc-macro2@1.0.82
-	pyo3-build-config@0.21.2
-	pyo3-ffi@0.21.2
-	pyo3-log@0.10.0
-	pyo3-macros-backend@0.21.2
-	pyo3-macros@0.21.2
-	pyo3@0.21.2
-	pythonize@0.21.1
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	redox_syscall@0.5.1
-	regex-automata@0.4.6
-	regex-syntax@0.8.3
-	regex@1.10.5
-	ryu@1.0.18
-	scopeguard@1.2.0
-	serde@1.0.204
-	serde_derive@1.0.204
-	serde_json@1.0.120
-	sha1@0.10.6
-	sha2@0.10.8
-	smallvec@1.13.2
-	subtle@2.5.0
-	syn@2.0.61
-	target-lexicon@0.12.14
-	typenum@1.17.0
-	ulid@1.1.2
-	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
-	windows-targets@0.52.5
-	windows_aarch64_gnullvm@0.52.5
-	windows_aarch64_msvc@0.52.5
-	windows_i686_gnu@0.52.5
-	windows_i686_gnullvm@0.52.5
-	windows_i686_msvc@0.52.5
-	windows_x86_64_gnu@0.52.5
-	windows_x86_64_gnullvm@0.52.5
-	windows_x86_64_msvc@0.52.5
-"
-
-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 )"
-
-DEPEND="
-	acct-user/synapse
-	acct-group/synapse
-"
-# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
-# introduces some breaking changes for synapse,
-# see https://github.com/element-hq/synapse/issues/17075
-RDEPEND="
-	${DEPEND}
-	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/jinja-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[${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.3.0_p20240628[${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="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		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/synapse/synapse-1.112.0.ebuild b/net-im/synapse/synapse-1.112.0.ebuild
index fa4f7b2e96a2..814a392eb445 100644
--- a/net-im/synapse/synapse-1.112.0.ebuild
+++ b/net-im/synapse/synapse-1.112.0.ebuild
@@ -116,7 +116,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.114.0.ebuild b/net-im/synapse/synapse-1.114.0.ebuild
new file mode 100644
index 000000000000..75b416527580
--- /dev/null
+++ b/net-im/synapse/synapse-1.114.0.ebuild
@@ -0,0 +1,244 @@
+# Copyright 2022-2024 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..12} )
+
+CRATES="
+	aho-corasick@1.1.3
+	anyhow@1.0.86
+	arc-swap@1.7.1
+	autocfg@1.3.0
+	base64@0.21.7
+	bitflags@2.5.0
+	blake2@0.10.6
+	block-buffer@0.10.4
+	bumpalo@3.16.0
+	bytes@1.7.1
+	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.4.1
+	hex@0.4.3
+	http@1.1.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
+	lock_api@0.4.12
+	log@0.4.22
+	memchr@2.7.2
+	memoffset@0.9.1
+	mime@0.3.17
+	once_cell@1.19.0
+	parking_lot@0.12.2
+	parking_lot_core@0.9.10
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	proc-macro2@1.0.82
+	pyo3-build-config@0.21.2
+	pyo3-ffi@0.21.2
+	pyo3-log@0.10.0
+	pyo3-macros-backend@0.21.2
+	pyo3-macros@0.21.2
+	pyo3@0.21.2
+	pythonize@0.21.1
+	quote@1.0.36
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	redox_syscall@0.5.1
+	regex-automata@0.4.6
+	regex-syntax@0.8.3
+	regex@1.10.6
+	ryu@1.0.18
+	scopeguard@1.2.0
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.127
+	sha1@0.10.6
+	sha2@0.10.8
+	smallvec@1.13.2
+	subtle@2.5.0
+	syn@2.0.61
+	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
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.52.5
+"
+
+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 )"
+
+DEPEND="
+	acct-user/synapse
+	acct-group/synapse
+"
+# The dev-python/twisted-24.3.0_p20240628 snapshot available in our tree
+# introduces some breaking changes for synapse,
+# see https://github.com/element-hq/synapse/issues/17075
+RDEPEND="
+	${DEPEND}
+	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/jinja-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[${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[${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="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		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 cbce9b37ef88..4e2a86936d43 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,4 @@
-DIST tdesktop-5.2.3.tar.gz 19578184 BLAKE2B fc84134969910c919469c069f6de498c6491d773b8dda4815d10db07e94e7fecbb43c4e8263bc96ac086cc8cf6944d4e77bfc1066cb26384b758bc6378e6f6a6 SHA512 4cabcb06fae6f1c51bdd738d8ac5d261d82e0fb044ad7b76f7aaef3291b731469cc3f5014b1c86f63756629b12e566c4f0fc2e09a240fb0b318d887b173cf067
 DIST tdesktop-5.3.2.tar.gz 19633052 BLAKE2B 9a26cde1c8ca28be9418beb0c5c85ddcfa600fd0d299c4561ece24ebee76d707a3542e34c85e42c5c4acf4cd20cdea10056deac82c00cbe118c1438f94fb15ac SHA512 736699832930935aeb3d1b0e27e24bc95ae09d8ed07d95fe8bd624a17959c4d2444ad8403006641450ce126429d573c126dbf5071125aa7a2edb9c612377dcb7
-DIST tsetup.5.2.3.tar.xz 57653472 BLAKE2B ede4057f519fec21417f1348b1a20666430f903e8cb13ab507b2a1050882042252f87e445b2de859607b9ee7b77b4791d252d4173ae7b473dd62cb1b812ab578 SHA512 0d9e212d78ff5c572a69c4378a7cd8e232f6fec510df97502808e161490458d473987ca79f8cc1328708c9fafdf26c1f6e85d60adc4c6547e3cf579fd15d3d26
+DIST tdesktop-5.4.1.tar.gz 19879412 BLAKE2B 5ef691f42fb0931736bb5c8710b4165f1ad82308bab4e06a3c3e1630bac8de1372409c8956afa789e00bc66e7ef2b042de4ec3ce42c23af8fcdbe5f2999b06a8 SHA512 9848698d0a1190c7c6da101f80132f0e09e21f585def18b2da334d45b20cab17a96e4d707bef958606e180ea2c183ca464770707f8696cf2a02b256d736b6450
 DIST tsetup.5.3.2.tar.xz 56785516 BLAKE2B 9f90bd71818b9bc5b325cff61056b084ec2a5bab4abbef08bae0c8a2ad1e29aa5f9874c19c9deb38bb377461df9bb624a6cf3f4acdfaa944d8a6ee9873165e3a SHA512 42d7f5f41b822f24a13915e01dcbb1a45661eda9c2b2f03816a826493ca3bd23e4486f14680344b4c4ec119faec204ba7d750b8b5c685801d854cc831a25cceb
+DIST tsetup.5.4.1.tar.xz 57175592 BLAKE2B e9a107c64b4f82dc8b3edb34fb37b8d10c3e32326cfdc265d998b3baca6c6a7f655990f65fe68db98e1f885646712e605c17eb671609948bedcca82ee50438ce SHA512 7155bc54a50c0b0377cad5d409ab9be42be0ad790f9f514cf11bac55ccefdb080898d98db50db2e995c7f2c81659f541a305c7a9172176f13d2994d54860a3e5
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.2.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.4.1.ebuild
index 24722ca70535..24722ca70535 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-5.2.3.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-5.4.1.ebuild
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 2b24ff1f1ae4..4ced5bee3b06 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,2 +1,4 @@
 DIST tdesktop-5.0.4-full.tar.gz 69462550 BLAKE2B 46e630ea74c6571e41909bab768ff19e8eaf2246cf624474b1c14d5c598146e0c772f55d7665af35979dc27bc70eb372b6865e5fecb6f97c50e13351c352bb54 SHA512 611bad9f174a35c27ffc55efe3544318f992af25a89364c3b64fa1afb4765ebf7aae7d4a83539d9e0038fe4ca8e637bdb5d453f058e64dffc2c45edf2f348dbb
 DIST tdesktop-5.2.3-full.tar.gz 69745773 BLAKE2B a6811098d2e0f8d0ebc0d7ac4d392981ff600544d31eb38a72b208778a69462d241122f8ff74b3a8b730d7a1221b78febb0ea9f641872992a830d9c805555c39 SHA512 5d5bf1f5c35af11b2adf7db075832e7cca5768c2c5f82d9fc5054b9d45f964a3520eb88864aefc3de593ce1359534b210b1e5d89495819e7386f6ca15fd4a15c
+DIST tdesktop-5.4.1-full.tar.gz 70056797 BLAKE2B 078a747c51df9ca8a173270b128e5c84439706b6c9d5ecde0fb0c88301f709b01613d2a895e9d1219809093cf3409211e63d8e131abed172c16192763dadc764 SHA512 f86b86c6001b2c214d897821c175f41c53ca44401285909b2b12254634cca821137d61a28c75d79ed757c1ade08873035397aae7c462494c1ab6382501a8072a
+DIST tdesktop-5.5.1-full.tar.gz 70095171 BLAKE2B 3221defb9df90333434b688e698b7c1ef842dca968049f3cd0cee428da353867cac52a0325fa1006e7d0a11d693c8e5e28b1983b57217ac4c227831cf1052214 SHA512 c8aadf6d2ad739523e714774c1b69be6792f805fb83d7f16a716c688cc800c54c5f13595742bd26d8b84f26342d89e21c668c8a79ed2a0607782a8421a40844a
diff --git a/net-im/telegram-desktop/telegram-desktop-5.4.1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.4.1.ebuild
new file mode 100644
index 000000000000..9ecc8d7c3463
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-5.4.1.ebuild
@@ -0,0 +1,261 @@
+# 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"
+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.5.1.ebuild b/net-im/telegram-desktop/telegram-desktop-5.5.1.ebuild
new file mode 100644
index 000000000000..98c1b5012cf5
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-5.5.1.ebuild
@@ -0,0 +1,261 @@
+# 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/tokodon/Manifest b/net-im/tokodon/Manifest
index 473495ee8c35..c7380968fcac 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,2 +1,2 @@
-DIST tokodon-23.08.5.tar.xz 335920 BLAKE2B 620de13602a8f846c980fc0e57a3c13c73725fca16c2ca7cbcd362d9339a531466f496aa8d4dd0e3f310fd2d87399b34f0c78f74bd9312d2a49190897f92ffd7 SHA512 1f21df479ebe31d2bc891b01fc465f5711445fb1bfefba7a90aec7d9eef304618487f1992cad82f4207928bb7398642db97038817b2aa602e9d77135c216f404
 DIST tokodon-24.05.2.tar.xz 539764 BLAKE2B 96acd0a25942922734b92528d5569890f07e7f9e8bc4440421b91e0f625a78c8e4d0ce185d554887d72d5a3aa27e15cddcaad6622331180e0e551f1c17090138 SHA512 85b5a4837075bf00830015cc022219fc1bfb9a83c03649917bcabe79a21405c6d3937a1fc16199a75f7ecca71c190ac82aada130ada83e6920a1fac267239733
+DIST tokodon-24.08.0.tar.xz 567328 BLAKE2B 1663cc59d0f62a1d52e7e5ae587d0ce64be6ea5bab00c32287b13567d44324cbe8e1dc2232c8cd924ee4e32ef6cc9441e2d9c2ddb37864af79dd9479ed7d537b SHA512 56ceee38a6dafb9f8a64a4a282d9c7848477ba29d4b323f05bfa1ed6c2540f7e6257ac7a6a6ca9dc0f26333fbc3639bc50acb95df614e9645695ce14003afef4
diff --git a/net-im/tokodon/tokodon-23.08.5-r1.ebuild b/net-im/tokodon/tokodon-23.08.5-r1.ebuild
deleted file mode 100644
index 40b62333aa3b..000000000000
--- a/net-im/tokodon/tokodon-23.08.5-r1.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
-
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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"
-
-DEPEND="
-	>=dev-libs/kirigami-addons-0.10.0:5
-	media-video/mpv:=[libmpv]
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebsockets-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/breeze-icons-${KFMIN}:*
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5[qml]
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-BDEPEND="virtual/pkgconfig"
diff --git a/net-im/tokodon/tokodon-24.05.2-r2.ebuild b/net-im/tokodon/tokodon-24.05.2-r2.ebuild
index cb45b4c7d0a3..784fa5caa982 100644
--- a/net-im/tokodon/tokodon-24.05.2-r2.ebuild
+++ b/net-im/tokodon/tokodon-24.05.2-r2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="+mpv webengine"
 
 # TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc)
diff --git a/net-im/tokodon/tokodon-24.08.0.ebuild b/net-im/tokodon/tokodon-24.08.0.ebuild
new file mode 100644
index 000000000000..1b4964e000d5
--- /dev/null
+++ b/net-im/tokodon/tokodon-24.08.0.ebuild
@@ -0,0 +1,57 @@
+# 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.1-r1:=[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
+	>=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/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/whatsie/Manifest b/net-im/whatsie/Manifest
index 156690b52d83..9dc1f768cb93 100644
--- a/net-im/whatsie/Manifest
+++ b/net-im/whatsie/Manifest
@@ -1,2 +1,2 @@
-DIST whatsie-4.14.2.tar.gz 21146777 BLAKE2B 3d923b9d4b109cbc894481fed9723fe84d992663ea953218cd4b128317aebe2fb8a60608d351cc9f4cfc5a976713ce2a3a642a122276068ed63a96e6cf656603 SHA512 b0b6ab0fab30723ee64b723f79776b6953229502e22f4c5e9fb809aa198e369ee05398abca218680adeea1acfcafd0026e13e424458fedad2c0260c2d956fffb
 DIST whatsie-4.15.0.tar.gz 21146977 BLAKE2B fc8d3aba5776681efe761ce495419b793c54abd7bc1aadef2bbddb9356ccadfcd4b3937d5640e363e0fa5580a19fe4ea84e8d1d79ea44de5b1311d176d1b8495 SHA512 7e06a2ed60df8bd7714a2b768b05a2b6ff0038eb9b84b1c98977b99b48b0720837010df9adc37617102787dd86d51d6793bfa2b7c7fd0cc9e481a7585c7e7050
+DIST whatsie-4.15.3.tar.gz 21139889 BLAKE2B 54576dfeeb527f801582ad2d94c24b5d5437ed15eca2b3a2dced73d026725f07eb52d1a837c307ee25cf20ac631a9dd2750f9577da580604da56bc5878462dbb SHA512 6bc493b050b4d092a9e075d399cea169873dba6ca4c8db925e3fab82b8c19074713828619a8f699c7917559f9eb052b13bc4935b7a376fcac3017988269014ec
diff --git a/net-im/whatsie/whatsie-4.14.2.ebuild b/net-im/whatsie/whatsie-4.14.2.ebuild
deleted file mode 100644
index cecf52d1bc2d..000000000000
--- a/net-im/whatsie/whatsie-4.14.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt Based WhatsApp Client"
-HOMEPAGE="https://github.com/keshavbhatt/whatsie"
-SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-QT_MIN="5.15"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	>=dev-qt/qtcore-${QT_MIN}:5
-	>=dev-qt/qtgui-${QT_MIN}:5
-	>=dev-qt/qtnetwork-${QT_MIN}:5
-	>=dev-qt/qtpositioning-${QT_MIN}:5
-	>=dev-qt/qtwebengine-${QT_MIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QT_MIN}:5
-"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	einstalldocs
-	INSTALL_ROOT="${ED}" emake install
-}
diff --git a/net-im/whatsie/whatsie-4.15.3.ebuild b/net-im/whatsie/whatsie-4.15.3.ebuild
new file mode 100644
index 000000000000..8919b85b6d47
--- /dev/null
+++ b/net-im/whatsie/whatsie-4.15.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Qt Based WhatsApp Client"
+HOMEPAGE="https://github.com/keshavbhatt/whatsie"
+SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QT_MIN="5.15"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	>=dev-qt/qtcore-${QT_MIN}:5
+	>=dev-qt/qtgui-${QT_MIN}:5
+	>=dev-qt/qtnetwork-${QT_MIN}:5
+	>=dev-qt/qtpositioning-${QT_MIN}:5
+	>=dev-qt/qtwebengine-${QT_MIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QT_MIN}:5
+"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	einstalldocs
+	INSTALL_ROOT="${ED}" emake install
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index b416f21ab5de..ef6323d9d78f 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,2 +1,2 @@
-DIST zoom-6.0.2.4680_x86_64.tar.xz 202434660 BLAKE2B b73103c759a6d41257aa31919e6d992663e1984364ee7a2d42ae61576afcb7e61c206088885f2adb076a446bec77da6fad59d40b446f37c4b3732908dc0b4982 SHA512 e8a842b281fea1f5399cb245208bed77689035226af5901e856f7d2542aa2e623a8a7f7647e312849deedac324853f945c26252d37bc0f98e8210a958e7f15fa
-DIST zoom-6.1.6.1013_x86_64.tar.xz 207011804 BLAKE2B c27d62ac37ce6c8919f5252d2db3feed25819482b17954f9b4350614f67aa2a2c4c2e9a882a723d4cf32836fd72982d5323914b66e093282ebba921b708ebb1a SHA512 9ddfdbe3b9a969fa2fe9ba0cf22fa4633654a0378aebc51015dddb4a5c144838feba372e6d03e4d409c0589c3fab05073ec8b556e62aa7768790b6365a567ee0
+DIST zoom-6.1.10.1400_x86_64.tar.xz 206894340 BLAKE2B 53f1ecc2e4d4c5e21853ccf3b5750c433951a1d98cb4cbd43b5bbe0f8deffbdc54ee597c586e4df8ac84488282da171b4adc3ef74c9e53477bd0ad594015eb6b SHA512 5421af416ae104201e5cb15483e1ef8a378935cb4a942c614dba1ddd96bf0a9dbc8c53373fbd8ab516765714ba1169d1387d0f9f00b413f35999e67f392193aa
+DIST zoom-6.1.11.1545_x86_64.tar.xz 206886856 BLAKE2B c97736f9a75803f25bcfb64cf904fb65d89ab549737cd4816a5f0533c891e54bd5b75a725cbaf70342857a84d3e5847ac91000ffb1e45a046485053791cff4ea SHA512 6fb2c45fb161b84f740d58b1265cd9255778d089702d8bdd5cd8a2bb9bf89cb97048cb0e2edb02a638ee112657adfe0a1c37274ffa500d277f0baf977180154a
diff --git a/net-im/zoom/zoom-6.0.2.4680.ebuild b/net-im/zoom/zoom-6.0.2.4680.ebuild
deleted file mode 100644
index ad8149eaf736..000000000000
--- a/net-im/zoom/zoom-6.0.2.4680.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop 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="+bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!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
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	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 )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-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 email json ringtone scheduler sip \
-		timezones translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh \
-		aomhost libaomagent.so libdvf.so libmkldnn.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
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.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
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || 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/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
-		)
-	else
-		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
-	make_desktop_entry "zoom %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-im/zoom/zoom-6.1.10.1400.ebuild b/net-im/zoom/zoom-6.1.10.1400.ebuild
new file mode 100644
index 000000000000..1df6e759f958
--- /dev/null
+++ b/net-im/zoom/zoom-6.1.10.1400.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop 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="+bundled-qt 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
+	>=dev-libs/quazip-1.0:0=[qt5(+)]
+	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 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+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 email json ringtone scheduler sip \
+		timezones translations
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher ZoomWebviewHost *.sh \
+		aomhost libaomagent.so libdvf.so libmkldnn.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
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.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
+
+	if use bundled-qt; then
+		doins -r Qt
+		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || 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
+		)
+	else
+		local qtzoom="5.15" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
+	fi
+
+	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+
+	make_desktop_entry "zoom %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-im/zoom/zoom-6.1.11.1545.ebuild b/net-im/zoom/zoom-6.1.11.1545.ebuild
new file mode 100644
index 000000000000..1df6e759f958
--- /dev/null
+++ b/net-im/zoom/zoom-6.1.11.1545.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop 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="+bundled-qt 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
+	>=dev-libs/quazip-1.0:0=[qt5(+)]
+	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 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+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 email json ringtone scheduler sip \
+		timezones translations
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher ZoomWebviewHost *.sh \
+		aomhost libaomagent.so libdvf.so libmkldnn.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
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.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
+
+	if use bundled-qt; then
+		doins -r Qt
+		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || 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
+		)
+	else
+		local qtzoom="5.15" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
+	fi
+
+	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+
+	make_desktop_entry "zoom %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-im/zoom/zoom-6.1.6.1013-r1.ebuild b/net-im/zoom/zoom-6.1.6.1013-r1.ebuild
deleted file mode 100644
index 25458088a749..000000000000
--- a/net-im/zoom/zoom-6.1.6.1013-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop 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="+bundled-qt 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
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	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 )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-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 email json ringtone scheduler sip \
-		timezones translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher ZoomWebviewHost *.sh \
-		aomhost libaomagent.so libdvf.so libmkldnn.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
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.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
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || 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
-		)
-	else
-		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
-
-	make_desktop_entry "zoom %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/ergo/ergo-2.14.0.ebuild b/net-irc/ergo/ergo-2.14.0.ebuild
index 95f83d85f0ca..9ee896dc26a1 100644
--- a/net-irc/ergo/ergo-2.14.0.ebuild
+++ b/net-irc/ergo/ergo-2.14.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${P/_/-}
 LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 fi
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 35abc6896c64..bc2b5e54115f 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,5 +1,3 @@
-DIST inspircd-3.16.1-fix-build-paths.patch.bz2 4751 BLAKE2B 78ae06bfbdd6d389af2890aadebc5765f16d1616bb9c1b8820a21b2f2a283f4f4aea5bc4f7edc5d61acc80da67ca80a2d0b007a669cf7a37f1ea77b11f552643 SHA512 1fec0c784a1d306a62c9a5320236bfb53bffd4278bbcc8439ea640500b8668cec4e6c23174d1d88f8109bc88549c931ff889b4c07a8f0f5446bb85a434665702
-DIST inspircd-3.16.1.tar.gz 877817 BLAKE2B a54992c32a13a512bce93157b23a17d433fbdbf7efcaa54a66be17628335db379d0abbb14e22a455e069fd8fb2a1f3e0152a112acbe634e6de87208b4a1b8cd5 SHA512 2b488858b0012bcb3eb92a33960e9927c861587c7b7451a47fd3e10a97fad9c392524d98712593fd455c5cbae7fd1779e4b90b9e55680c2f36b483e0acf2bba5
 DIST inspircd-3.17.1-fix-build-paths.patch.bz2 4689 BLAKE2B ca479cde2278e3605d31177d658f33ad56f847a5ccae7898e0e739e803323aa6b3137fa8e27bc5191fea4087d0d8c08a6818290e663eacd6f9c7a38fe53d9699 SHA512 103f97f4ce810ebc4b8fce54b4379dcee3aec68e75f5e1569825770b09a961a9d73e0da3a5eb97fa4153a5a2ab69478c60ed531bd84f36a59517de05cf10aeb9
 DIST inspircd-3.17.1.tar.gz 881389 BLAKE2B 30e6dc24e8e517a71b3a582c3e2c92ef1e52f8a52e1b4acace79537bbf6ae04f904be0f55a96bc65acdbb386d5fbf80c5fcec88cbbb5f74f4f5f15bdb0ca701c SHA512 ae8699506d32e7c09c1b982baeea36eca520d6be65732976e77695f1ca1768aa070f0ae3b9abf9fd390201021a679ef5478114b66f40e996de6873f3fb83836b
 DIST inspircd-4.2.0-fix-build-paths.patch.bz2 4808 BLAKE2B edd76fd6bc27e23fc3a9cb44cd369dd54c88eb9c3eeabd9a5cecd67d6403f75be0a27c931b513aba0f8a32c3927beee87442167a5e176e53308d4def7fc2565a SHA512 afd90a47cdca28c449f1ca04473a3724030edc66a67f1287b9ff6105c34a7e1a38c1938cf53d92246c351d6c7e6e213cd8743c62e23f492a10389d13fe0667f4
diff --git a/net-irc/inspircd/inspircd-3.16.1.ebuild b/net-irc/inspircd/inspircd-3.16.1.ebuild
deleted file mode 100644
index e179adf0a0da..000000000000
--- a/net-irc/inspircd/inspircd-3.16.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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}"
-
-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%,}
-	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[@]}"
-}
-
-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"
-
-	rmdir "${ED}"/run{/inspircd,} || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index bf6dc7b04b47..6688cfd30aa8 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1,2 @@
-DIST konversation-23.08.5.tar.xz 4490296 BLAKE2B 027b53e5b59f6666818eb83c4ec8bbbafa6ebc4b02c512eb032090f535de166456a93c5f1f4d93a583d11bbf33f8defe165941527c35891a7b40109a99e27552 SHA512 4de29fa128934dcf2a41f6f06bb0d1a6dc0080ca572f1ce9d30c41d16ce36c285fe390f5fc8d06cbf0b0fd307f36c75068954aeb1847482f106d33c0801ba0ef
 DIST konversation-24.05.2.tar.xz 4388192 BLAKE2B 4eeaa7c2c0264a742fc814ec0a2820aac4bf39fa91d4915cc5065710f28b77d0856a917975415b2c9fb9ec16ada8f4f2553709df24378fb1a12a9a55878876dc SHA512 a965a5384ee5b1d49bccd81d7038d927dd4cf8ab2935909cfc69032e77fd8f87a134e729a65e999ce45ccae64316d8318c4649844aa1f490a7513e3255c34622
+DIST konversation-24.08.0.tar.xz 4392476 BLAKE2B d04a89607fddba3bd295333805ce4b177e6167c5abc9d0245f06a33c2471f86b38ed07b694ad74515db2de4593c5eec29e9681824e20fc2ef16defb2dafb4a4b SHA512 99a444efd2ae01216cf9e65b3f7aae1e1b57052b5f8637b3c6463d6a2eecc1a04dfa9aa0f84cba10e8c3c2b702af6a8dfcd7bb665791e7bff8312d9d8c242063
diff --git a/net-irc/konversation/konversation-23.08.5.ebuild b/net-irc/konversation/konversation-23.08.5.ebuild
deleted file mode 100644
index 82a8ada7d872..000000000000
--- a/net-irc/konversation/konversation-23.08.5.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="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="+crypt"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl] )
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" "kde-apps/konsolepart:5" "kde-apps/konsole:5"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/net-irc/konversation/konversation-24.05.2.ebuild b/net-irc/konversation/konversation-24.05.2.ebuild
index 7973cc7dd210..270c61e2b724 100644
--- a/net-irc/konversation/konversation-24.05.2.ebuild
+++ b/net-irc/konversation/konversation-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="+crypt"
 
 DEPEND="
diff --git a/net-irc/konversation/konversation-24.08.0.ebuild b/net-irc/konversation/konversation-24.08.0.ebuild
new file mode 100644
index 000000000000..3f0a67f09d85
--- /dev/null
+++ b/net-irc/konversation/konversation-24.08.0.ebuild
@@ -0,0 +1,71 @@
+# 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/kvirc/Manifest b/net-irc/kvirc/Manifest
index f63504991f48..670edde31f44 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,3 +1 @@
-DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079
-DIST kvirc-5.2.2.tar.gz 6362952 BLAKE2B ba90de3730dee0466c21cd658eda622bfb8f601e1af79d53952b2b016c0bacf0dc1d83c78f307288cc2e3bfda409773adfffc1b53fba6a0d8c682a5ab8739259 SHA512 dcb140051cebe4eaa82d8b8e221e4df3f40695b3b3a9aa9842ef5325e3129c73d08e5849589385793efc1eb70fd115ee634422af8be3f943eea79719a4159ea5
 DIST kvirc-5.2.4.tar.gz 6333384 BLAKE2B e9e85c90cd66bda6b53aac14f807e487c1b65b3a4e463462ea768227a28f774db40e0dce63387aa934b3366db376be945e76682c5a14aae638e4f6470741f5e4 SHA512 7658bdf5258d822164d8b38b6f4baa1814ad49a9ecc7dc0013fc0e9dbd952aca0ba9ab8e90dbcfa0c9db43c756e862989b04cedcfba00f2751371955ffea6503
diff --git a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch
deleted file mode 100644
index 0d2944e30830..000000000000
--- a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From da4659a9d9c30b6d89875f328cca88758ef568c6 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Wed, 17 Jan 2024 20:58:27 -0800
-Subject: [PATCH] Fix build with Qt5 and WANT_DCC_VIDEO
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-```
-src/modules/dcc/DccVideoWindow.cpp: In member function ‘virtual const QString& DccVideoWindow::target()’:
-src/modules/dcc/DccVideoWindow.cpp:660:40: error: cannot convert ‘QString’ to ‘QString*’ in assignment
-```
----
- src/modules/dcc/DccVideoWindow.cpp | 14 ++------------
- src/modules/dcc/DccVideoWindow.h   |  2 +-
- 2 files changed, 3 insertions(+), 13 deletions(-)
-
-diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
-index 7f4f66ea42..7cf8058fe8 100644
---- a/src/modules/dcc/DccVideoWindow.cpp
-+++ b/src/modules/dcc/DccVideoWindow.cpp
-@@ -396,7 +396,6 @@ DccVideoWindow::DccVideoWindow(DccDescriptor * dcc, const char * name)
- {
- 	m_pDescriptor = dcc;
- 	m_pSlaveThread = nullptr;
--	m_pszTarget = nullptr;
- 
- 	m_pButtonBox = new KviTalHBox(this);
- 
-@@ -557,12 +556,6 @@ DccVideoWindow::~DccVideoWindow()
- 	}
- 
- 	KviThreadManager::killPendingEvents(this);
--
--	if(m_pszTarget)
--	{
--		delete m_pszTarget;
--		m_pszTarget = nullptr;
--	}
- }
- 
- void DccVideoWindow::resizeEvent(QResizeEvent *)
-@@ -654,11 +647,8 @@ void DccVideoWindow::connectionInProgress()
- const QString & DccVideoWindow::target()
- {
- 	// This may change on the fly...
--	if(!m_pszTarget)
--		m_pszTarget = new QString();
--
--	m_pszTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data());
--	return *m_pszTarget;
-+	m_szTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data());
-+	return m_szTarget;
- }
- 
- void DccVideoWindow::getBaseLogFileName(QString & buffer)
-diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
-index 98bb622f5b..d0f957ea3e 100644
---- a/src/modules/dcc/DccVideoWindow.h
-+++ b/src/modules/dcc/DccVideoWindow.h
-@@ -129,7 +129,7 @@ class DccVideoWindow : public DccWindow
- 	QGridLayout * m_pLayout;
- 	QTimer m_Timer;
- 	QLabel * m_pVideoLabel[3];
--	QString * m_pszTarget;
-+	QString m_szTarget;
- 	DccVideoThread * m_pSlaveThread;
- 	QByteArray m_tmpTextDataOut;
- 	QString m_szLocalNick;
diff --git a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
deleted file mode 100644
index 9f3700ec9d9b..000000000000
--- a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 21 Jan 2024 21:07:37 +0000
-Subject: [PATCH] Fix ability to select Qt5 vs Qt6
-
-https://bugs.gentoo.org/922636
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aabc0988b..9368e81c9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -389,7 +389,9 @@ endif()
- ############################################################################
- 
- # first check if Qt6 or Qt5 has to be used
--find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-+if(NOT DEFINED QT_VERSION_MAJOR)
-+	find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-+endif()
- # second, detect available modules for the specific Qt version
- find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
- if(Qt${QT_VERSION_MAJOR}Widgets_FOUND)
diff --git a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
deleted file mode 100644
index e9b6d4a308d7..000000000000
--- a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic python-single-r1 xdg
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
-	S="${WORKDIR}/KVIrc-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:0 )
-	nls? ( sys-devel/gettext )"
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:2 )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/kvirc-5.2.0-qtver.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-		einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-		sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \
-			-i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-	fi
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DWANT_ENV_FLAGS=ON
-		-DWANT_VERBOSE=ON
-
-		-DWANT_CRYPT=ON
-		-DWANT_DCC_VOICE=ON
-		-DWANT_IPC=ON
-		-DWANT_IPV6=ON
-		-DWANT_TRANSPARENCY=ON
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc-video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=OFF
-		-DWANT_SPELLCHECKER=$(usex spell)
-		-DQT_VERSION_MAJOR=5
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=OFF
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-			-DPython3_LIBRARY="$(python_get_library_path)"
-		)
-	fi
-	if [[ "${PV}" == "9999" ]]; then
-		mycmakeargs+=(
-			-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-			-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cmake_src_compile devdocs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		(
-			docinto html
-			dodoc -r "${BUILD_DIR}/doc/api/html/"*
-		)
-	fi
-}
diff --git a/net-irc/kvirc/kvirc-5.2.0-r2.ebuild b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
deleted file mode 100644
index bb2c098eb7b8..000000000000
--- a/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic python-single-r1 xdg
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/KVIrc-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:0 )
-	nls? ( sys-devel/gettext )"
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:2 )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/kvirc-5.2.0-qtver.patch"
-	"${FILESDIR}/kvirc-5.2.0-dccvideo.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-		einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-		sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \
-			-i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-	fi
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DWANT_ENV_FLAGS=ON
-		-DWANT_VERBOSE=ON
-
-		-DWANT_CRYPT=ON
-		-DWANT_DCC_VOICE=ON
-		-DWANT_IPC=ON
-		-DWANT_IPV6=ON
-		-DWANT_TRANSPARENCY=ON
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc-video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBENGINE=$(usex webengine)
-		-DWANT_SPELLCHECKER=$(usex spell)
-		-DQT_VERSION_MAJOR=5
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=OFF
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-			-DPython3_LIBRARY="$(python_get_library_path)"
-		)
-	fi
-	if [[ "${PV}" == "9999" ]]; then
-		mycmakeargs+=(
-			-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-			-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cmake_src_compile devdocs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		(
-			docinto html
-			dodoc -r "${BUILD_DIR}/doc/api/html/"*
-		)
-	fi
-}
diff --git a/net-irc/kvirc/kvirc-5.2.2.ebuild b/net-irc/kvirc/kvirc-5.2.2.ebuild
deleted file mode 100644
index 5f7c77b52cf6..000000000000
--- a/net-irc/kvirc/kvirc-5.2.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake flag-o-matic python-single-r1 xdg
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
-	S="${WORKDIR}/KVIrc-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:0 )
-	nls? ( sys-devel/gettext )"
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:2 )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-		einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-		sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \
-			-i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-	fi
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DWANT_ENV_FLAGS=ON
-		-DWANT_VERBOSE=ON
-
-		-DWANT_CRYPT=ON
-		-DWANT_DCC_VOICE=ON
-		-DWANT_IPC=ON
-		-DWANT_IPV6=ON
-		-DWANT_TRANSPARENCY=ON
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc-video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBENGINE=$(usex webengine)
-		-DWANT_SPELLCHECKER=$(usex spell)
-		-DQT_VERSION_MAJOR=5
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=OFF
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-			-DPython3_LIBRARY="$(python_get_library_path)"
-		)
-	fi
-	if [[ "${PV}" == "9999" ]]; then
-		mycmakeargs+=(
-			-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-			-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cmake_src_compile devdocs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		(
-			docinto html
-			dodoc -r "${BUILD_DIR}/doc/api/html/"*
-		)
-	fi
-}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 32a984d0afbb..27dced2fcd5d 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI="8"
 DESCRIPTION="Advanced IRC Client"
 HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-CMAKE_MAKEFILE_GENERATOR="emake"
 PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake flag-o-matic python-single-r1 xdg
@@ -20,40 +19,35 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine"
+IUSE="audiofile +dbus debug doc gsm kde +nls oss +perl profile +python spell +ssl theora webengine"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-BDEPEND="dev-lang/perl:0
+BDEPEND="
+	dev-lang/perl:0
 	virtual/pkgconfig
 	doc? ( app-text/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:0 )
 	nls? ( sys-devel/gettext )"
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
+DEPEND="
+	dev-qt/qtbase:6[concurrent,gui,network,sql,widgets,xml]
+	dev-qt/qtmultimedia:6
 	sys-libs/zlib:0=
 	x11-libs/libX11
-	x11-libs/libXScrnSaver
 	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
+	dbus? ( dev-qt/qtbase:6[dbus] )
 	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
+		kde-frameworks/kconfig:6
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/kio:6
+		kde-frameworks/ki18n:6
+		kde-frameworks/knotifications:6
+		kde-frameworks/kparts:6
+		kde-frameworks/kservice:6
+		kde-frameworks/kstatusnotifieritem:6
+		kde-frameworks/kwindowsystem:6
+		kde-frameworks/kxmlgui:6
 	)
 	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
 	python? ( ${PYTHON_DEPS} )
 	spell? ( app-text/enchant:2 )
 	ssl? ( dev-libs/openssl:0= )
@@ -62,7 +56,7 @@ DEPEND="dev-qt/qtcore:5
 		media-libs/libtheora
 		media-libs/libvorbis
 	)
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+	webengine? ( dev-qt/qtwebengine:6[widgets] )"
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
@@ -102,7 +96,7 @@ src_configure() {
 		-DWANT_TRANSPARENCY=ON
 
 		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc-video)
+		-DWANT_DCC_VIDEO=OFF
 		-DWANT_DEBUG=$(usex debug)
 		-DWANT_DOXYGEN=$(usex doc)
 		-DWANT_GETTEXT=$(usex nls)
@@ -113,12 +107,12 @@ src_configure() {
 		-DWANT_OPENSSL=$(usex ssl)
 		-DWANT_OSS=$(usex oss)
 		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PHONON=OFF
 		-DWANT_PYTHON=$(usex python)
 		-DWANT_QTDBUS=$(usex dbus)
 		-DWANT_QTWEBENGINE=$(usex webengine)
 		-DWANT_SPELLCHECKER=$(usex spell)
-		-DQT_VERSION_MAJOR=5
+		-DQT_VERSION_MAJOR=6
 
 		# COMPILE_SVG_SUPPORT not used in source code.
 		-DWANT_QTSVG=OFF
diff --git a/net-irc/quassel/quassel-0.14.0-r3.ebuild b/net-irc/quassel/quassel-0.14.0-r3.ebuild
index 56acb7683fa8..546741201071 100644
--- a/net-irc/quassel/quassel-0.14.0-r3.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then
 		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	else
 		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+		KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
 	fi
 	S="${WORKDIR}/${MY_P}"
 else
diff --git a/net-irc/rhapsody/rhapsody-0.28b.ebuild b/net-irc/rhapsody/rhapsody-0.28b.ebuild
deleted file mode 100644
index d95565a1196f..000000000000
--- a/net-irc/rhapsody/rhapsody-0.28b.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 toolchain-funcs
-
-DESCRIPTION="IRC client intended to be displayed on a text console"
-HOMEPAGE="http://rhapsody.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.0:0="
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-uclibc.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_configure() {
-	PKGCONFIG="$(tc-getPKG_CONFIG)" \
-	./configure -i /usr/share/rhapsody || die "configure failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS} -fcommon"
-}
-
-src_install() {
-	dobin rhapsody
-
-	insinto /usr/share/rhapsody/help
-	doins help/*.hlp
-
-	dodoc docs/CHANGELOG
-}
diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index ee3b47f0067c..57042043d326 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,4 +1,4 @@
-DIST soju-0.7.0-deps.tar.xz 89862684 BLAKE2B d56302c5b330c581365da56f1718571144ac0475fa5879a839e723d2d13aa6cb9793a8f64418098aa0035421192eb2ae955603330ea3be6116db057d5fef3b1a SHA512 08fb5f2e75508840b76fb5f3479023eb735abc128cef0a621a3bafbc8d1dde504cf78812cb4e7921d7aaaafc40595ca592ce0b8aaf21c388fd781b52b5d266d2
-DIST soju-0.7.0.tar.gz 149198 BLAKE2B 2047b61792454f20a7cc4c24466047ffa43f5d56a1726b32f5120686d5fecd1f81d057adafc8696e2d85e922e37ae6f158808c0b35529ca2cb7018ecbec0d381 SHA512 9b199c5e3270e325cb6e101b0e7b5c70af75c831442a135fa0484bd2aef3ada98ab48261cd91342d278bfbbbbb626c2c83eeec8029388a8fe9663515e676ba43
 DIST soju-0.8.0-deps.tar.xz 79434480 BLAKE2B 4cb3bbcd7d4c0fc610dffc585291fe07981c0d5d08e81fe800c6a08f3655eb999e097e17fe59342b896091a8e5640782f65bba351b94948ff9ed0f548fe6280c SHA512 a1f82740e673ed95cde2917d5dad53645b8cfcdefd673f44cd5b0573238c39a17355ea27e55572bb03625529202be50bf00f4bb57322ffa8857409cb1b190872
 DIST soju-0.8.0.tar.gz 154571 BLAKE2B 737fc3e44ea04b42c6a5029db0c6c65a03c22dd30c26196439c97abe2ee9f1379b9cd49ef2cf15e25a911c0d05af1f17fcfea585c85278e081e4f3b7d9d55342 SHA512 22fb0815704b70dd302d75c4a00d80ac22cd622175066e7365277ef7d5a531537aa308b53703d15651a5ae841e2a02a3d7f19165c847078c5a0ae3c40d750738
+DIST soju-0.8.2-deps.tar.xz 72699036 BLAKE2B 5abfa3d683a0f06be7361bfeec751b6f4892fde51f1d9216cca163eac125e72f68a8116279b16b8ce6f5076293b7ad67b6098f887ac3cea3f099f2b27643ed48 SHA512 64fa60a90a33021661f51f2f6456bf8f2e8d01282143ad41b966ade105e6b4f2310f83f81f45bcea6baa2f76857e549f1548844ec1c3f17c1f1e0615523ef813
+DIST soju-0.8.2.tar.gz 155059 BLAKE2B 17f220440c8135abeb570808d7a4cb5cdb6993c076ffe9eb2fa0bb0e8487f9b29831049b2702692cc0903277399603dbe8e0ad27ed6356b932c29979a6eeddef SHA512 7e5bc27394223c021ce6e1b9d93b617ade5bd803f37e030ea05e079efdf343ff0128753803a2e1c86ca2c83786bdaf21600cb6457b4404dd0cf2ff0e5646c62b
diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml
index e5c26b9d7f79..408b34bb938d 100644
--- a/net-irc/soju/metadata.xml
+++ b/net-irc/soju/metadata.xml
@@ -10,6 +10,7 @@
       <name>Proxy Maintainers</name>
     </maintainer>
     <upstream>
+      <remote-id type="codeberg">emersion/soju</remote-id>
       <remote-id type="sourcehut">~emersion/soju</remote-id>
       <remote-id type="github">alfredfo/soju-deps</remote-id>
     </upstream>
diff --git a/net-irc/soju/soju-0.7.0-r1.ebuild b/net-irc/soju/soju-0.7.0-r1.ebuild
deleted file mode 100644
index 43d0b770ae70..000000000000
--- a/net-irc/soju/soju-0.7.0-r1.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
-
-inherit go-module systemd
-
-DESCRIPTION="soju is a user-friendly IRC bouncer"
-HOMEPAGE="https://soju.im/"
-SRC_URI="https://git.sr.ht/~emersion/${PN}/refs/download/v${PV}/${P}.tar.gz"
-SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz"
-
-LICENSE="AGPL-3 Apache-2.0 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
-IUSE="moderncsqlite +sqlite pam"
-REQUIRED_USE="?? ( moderncsqlite sqlite )"
-
-BDEPEND="
-	app-text/scdoc
-"
-RDEPEND="
-	acct-user/soju
-	acct-group/soju
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# musl removed legacy LFS64 interfaces in version 1.2.4 temporarily
-	# reenabled using _LARGEFILE64_SOURCE until this is resolved
-	# upstream https://github.com/mattn/go-sqlite3/issues/1164
-	CGO_CFLAGS="${CGO_CFLAGS}"
-	if use sqlite; then
-		GOFLAGS+=" -tags=libsqlite3"
-		CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-	elif use moderncsqlite; then
-		GOFLAGS+=" -tags=moderncsqlite"
-		CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
-	else
-		GOFLAGS+=" -tags=nosqlite"
-	fi
-	# Only way to pass CFLAGS to CGO at the
-	# moment. https://github.com/gentoo/gentoo/pull/33539/
-	export CGO_CFLAGS
-	use pam && GOFLAGS+=" -tags=pam"
-
-	ego build ${GOFLAGS} ./cmd/soju
-	ego build ${GOFLAGS} ./cmd/sojudb
-	ego build ${GOFLAGS} ./cmd/sojuctl
-
-	scdoc <doc/soju.1.scd >doc/soju.1 || die
-	scdoc <doc/sojuctl.1.scd >doc/sojuctl.1 || die
-}
-
-src_install() {
-	dobin soju
-	dobin sojudb
-	dobin sojuctl
-
-	doman doc/soju.1
-	doman doc/sojuctl.1
-	systemd_dounit contrib/soju.service
-	keepdir /etc/soju
-	insinto /etc/soju
-	newins config.in config
-	newinitd "${FILESDIR}"/soju.initd soju
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "${PN} requires a user database for authenticating clients."
-	elog "As the soju user, create a database using:"
-	elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]"
-}
diff --git a/net-irc/soju/soju-0.8.2.ebuild b/net-irc/soju/soju-0.8.2.ebuild
new file mode 100644
index 000000000000..f92c219dc9f1
--- /dev/null
+++ b/net-irc/soju/soju-0.8.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="soju is a user-friendly IRC bouncer"
+HOMEPAGE="https://soju.im/"
+SRC_URI="https://codeberg.org/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz"
+S="${WORKDIR}/soju"
+
+LICENSE="AGPL-3 Apache-2.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+IUSE="moderncsqlite +sqlite pam"
+REQUIRED_USE="?? ( moderncsqlite sqlite )"
+
+BDEPEND="
+	app-text/scdoc
+"
+RDEPEND="
+	acct-user/soju
+	acct-group/soju
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	# musl removed legacy LFS64 interfaces in version 1.2.4 temporarily
+	# reenabled using _LARGEFILE64_SOURCE until this is resolved
+	# upstream https://github.com/mattn/go-sqlite3/issues/1164
+	CGO_CFLAGS="${CGO_CFLAGS}"
+	if use sqlite; then
+		GOFLAGS+=" -tags=libsqlite3"
+		CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
+	elif use moderncsqlite; then
+		GOFLAGS+=" -tags=moderncsqlite"
+		CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
+	else
+		GOFLAGS+=" -tags=nosqlite"
+	fi
+	# Only way to pass CFLAGS to CGO at the
+	# moment. https://github.com/gentoo/gentoo/pull/33539/
+	export CGO_CFLAGS
+	use pam && GOFLAGS+=" -tags=pam"
+
+	ego build ${GOFLAGS} ./cmd/soju
+	ego build ${GOFLAGS} ./cmd/sojudb
+	ego build ${GOFLAGS} ./cmd/sojuctl
+
+	scdoc <doc/soju.1.scd >doc/soju.1 || die
+	scdoc <doc/sojuctl.1.scd >doc/sojuctl.1 || die
+}
+
+src_install() {
+	dobin soju
+	dobin sojudb
+	dobin sojuctl
+
+	doman doc/soju.1
+	doman doc/sojuctl.1
+	systemd_dounit contrib/soju.service
+	keepdir /etc/soju
+	insinto /etc/soju
+	newins config.in config
+	newinitd "${FILESDIR}"/soju.initd soju
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "${PN} requires a user database for authenticating clients."
+	elog "As the soju user, create a database using:"
+	elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]"
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index f4ce336382f1..af7b8e715551 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -4,7 +4,11 @@ DIST weechat-4.2.3.tar.xz 2594708 BLAKE2B d36e4a0041d5fa9533f82b5c3abe3286b5805f
 DIST weechat-4.2.3.tar.xz.asc 833 BLAKE2B 3a973ca88f95f2b231f49f394f9214343b2b9bfb76a76cc2173543a7e3472321489daaae939f47053ff55f52b7e2d9feca8e418c695460fa8a15bd0f3fa3c477 SHA512 9f8df247be019d797bff244ef9337667e2d61a93ea68fc78abeb48f3a1414b307fd0e137b2d9a473ced5c9ba2518fc012f4cadeed041605f3a30d04d54fec7b7
 DIST weechat-4.3.2.tar.xz 2693508 BLAKE2B 599ee64317f2a10c7bdd8636759b249d3db7c4c30bc9c12566e4dc2534ec932fa8f3b2fe1c570e2e40b20cac9af99f8429ee1bf6edc0aa2c7e32368058f515c6 SHA512 438d76cada9bb870c188b8fe0c8ad45d1d0dc71392ee8d5193c5b3c3424afad4f98bedc9a396b2294c4cb20bce9299e5a4f921525f7f976e5cd1f589a78b2caa
 DIST weechat-4.3.2.tar.xz.asc 833 BLAKE2B 14a71a4b66cf82fe7bb0e3c7eefe3f2f3d3b14f0c7ca26fd645716d33acd64598dfcfda9162bb07290cb9758eeef1471cde28183c559440597d45bc8984969a6 SHA512 ff9a3d3777fecf1de1898647b97f45ebe68c95f09cc098280ba4f0dc9e6d78f25119217bfb704eecbabed9bba09d567556913018f69d903858a84e8150298690
-DIST weechat-4.3.3.tar.xz 2694000 BLAKE2B 1fde0f51add8928f264c0f9418f60d03ff60cf3ea347413d0823b6a8d5781c59a893f1c047b08ff4760628f50189c3e8ffed89f8d78171bcaf260f957aac2146 SHA512 ca6f80b874fa7b1a5e2773b7b05bdd47e6dd9a622e72ce2f876a94d4c6edaa6834cea83a7294dd2acb2c0bc67bc9e731593b33252559bb26290f964911790b1b
-DIST weechat-4.3.3.tar.xz.asc 833 BLAKE2B 53ecaf3b58c9d894a026452e42e386e4beb819539f12653363dcf93caddcdd1790b338d91f347b788a01183621931011bb79cff1fc75900ce97cd947e8d397f5 SHA512 35a348b2dd230c738634acbd77c8ae786296b93b755f1b22b0b8500c5bc2787ab64128aaf51bf755b9ffeefb08ab3f78cd57e6e9403849964ef561b7c850a264
 DIST weechat-4.3.4.tar.xz 2694132 BLAKE2B c0f8a81d415679a2651903ede9725791f60bd77963270ca12fbb391f3565cb4ddc254379d989b7f8183651331593663dd285ae1c0744b75eb533193ad11577e8 SHA512 026684a3ee40eae166820c64cf68fccb27346117b90b617be4d0b10048ea4b3b8454f1020138c71f61598e6127e0426b7ba094d69f4da02fd322d9bd2b06a81b
 DIST weechat-4.3.4.tar.xz.asc 833 BLAKE2B 60caec0bfaf402638bada38fa576bf881774890ddf43bfc327a7e6b6e7d133e67a19ee728867a9030fcd688041e7f9ce7a71cd8095845b575ba0a67ee5c52c51 SHA512 4e8dbec71852f2d4f1119129e77c7c4256f94af651d01fa21ebb219bcf2488ef57b868335ef22c659ef0d0acb921457561f29e46f021856c8610d1bc559bd9e8
+DIST weechat-4.3.6.tar.xz 2694420 BLAKE2B 47809deba9683c8fd40cc78b54fe63cafbf5ca3e2b4dd96b1fe597f4f425ea682c3c8d3d634aae34a3b23e7cdddc97537848320e2e54d9372a17502dad022af9 SHA512 d97223f733b4b5233f9ddcd97cb1011a2ad9edc72f17d1e3670cc843848783a6c41ff8edc12edf33eda3e6f0b1bd8898a638cf9dc1a1d2c4996a7f063d473742
+DIST weechat-4.3.6.tar.xz.asc 833 BLAKE2B 5cd9e34c69e30e008e3f7ceccc69796b9890fead9dbb490515925c47347818f5b60b69e1704618f1f6de602cbd5389f77405bf99d93c2c0379afff5c8f0eeabb SHA512 5a3cb83c4f8d1102dce21fb03c3e6a37729b66160a232e8b8342525bdd84f158b945d936f5931b7619e51fbf117a986c8ad5edf5b4d461265bd778329c67c18b
+DIST weechat-4.4.1.tar.xz 2728104 BLAKE2B 71436cf291271690337a918907b8de411f9f8f0c80ffd8d20aa035ee2121917c62a6d9704b28fac8efa4e4b7067eb0c834746e07083abe29ddf679ee3261b658 SHA512 75b1fc21674229f11f9d5d049b663dee77e65529b5dfe62744e7afd0f0854afa4344b56f26d91fe9378ccece932e05e57e9bce4e1d7515d4d26fdffbf2f2a55b
+DIST weechat-4.4.1.tar.xz.asc 833 BLAKE2B 6fbeebcb09551687cb216aa6bad8dd21628c14ecc8bb8f2d1ac1d5b70fd0b1002e7a1e896f350e04a18c63437e3e6953e6e6e05d1a90f920be906bdf51fe575a SHA512 66d80b5233b0a3a8262cfe5db3e91043f33ac426b94ad5bd6f37b32e59b413435d2ca55f3aba9d53f8a1454c43161ab51f31ca02d0eafd83b8e3cea1497a96de
+DIST weechat-4.4.2.tar.xz 2728232 BLAKE2B aa9730c6a67f29319d9e2609179ff0b4bea71a60335a2d9a4df5f652ee8f6221652f3a910ed885d6fa8887d0181b967b8ce67b98613e8b87306ff42e703ebfce SHA512 1a603a020319d3ee9d27659c71b353dc939a56bc0dc8fabd55e82c74e28bdef8ed749441e7b2377b78598bdf11ec020d6c94a092bf30c86220b61e276cef2293
+DIST weechat-4.4.2.tar.xz.asc 833 BLAKE2B bb0e2bd6ad37904de0e2b3301c962256e60156d3de786c93cf86814552d82a4157f330dba3a5a07f9597301f63ba1ef723632d5305bdecbc708ec28f7ffd2439 SHA512 f2690ffced22e9d27b95d552bc2ee0a92439e71df205933704dd78b99b5c6634ee4b141227ff35c596892d0290b0866d18da6f3a2b5e83c1010ba0aa28b29af1
diff --git a/net-irc/weechat/weechat-4.3.4.ebuild b/net-irc/weechat/weechat-4.3.4.ebuild
index d86207e4e6ef..097b0624a75b 100644
--- a/net-irc/weechat/weechat-4.3.4.ebuild
+++ b/net-irc/weechat/weechat-4.3.4.ebuild
@@ -17,7 +17,7 @@ else
 		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-4.3.3.ebuild b/net-irc/weechat/weechat-4.3.6.ebuild
index d86207e4e6ef..d86207e4e6ef 100644
--- a/net-irc/weechat/weechat-4.3.3.ebuild
+++ b/net-irc/weechat/weechat-4.3.6.ebuild
diff --git a/net-irc/weechat/weechat-4.4.1.ebuild b/net-irc/weechat/weechat-4.4.1.ebuild
new file mode 100644
index 000000000000..b35455cb8847
--- /dev/null
+++ b/net-irc/weechat/weechat-4.4.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake lua-single python-single-r1 xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	inherit verify-sig
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
+		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru sr tr"
+IUSE="doc enchant man nls relay-api selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	enchant? ( spell )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+	relay-api? ( relay )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0:12= )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+	)
+	python? ( ${PYTHON_DEPS} )
+	relay-api? ( dev-libs/cJSON )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.3
+			dev-lang/ruby:3.2
+			dev-lang/ruby:3.1
+		)
+	)
+	selinux? ( sec-policy/selinux-irc )
+	spell? (
+		enchant? ( app-text/enchant:* )
+		!enchant? ( app-text/aspell )
+	)
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	zstd? ( app-arch/zstd:= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND+="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS.md CHANGELOG.md CONTRIBUTING.md UPGRADING.md README.md"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	local j
+	for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \
+			| sed -e 's/.*set(\(\w\+\).*/\1/'); do
+		for j in $(grep set.${i} doc/CMakeLists.txt \
+				| sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do
+			if ! has ${j} ${LINGUAS-${j}} ; then
+				sed -i \
+					-e "s/\(set(${i}.*\) ${j}/\1/" \
+					doc/CMakeLists.txt || die
+			fi
+		done
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_PHP=OFF
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		# -DENABLE_DOC requires all plugins (except javascript).
+		# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
+		# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
+		-DENABLE_DOC=OFF
+		-DENABLE_DOC_INCOMPLETE=$(usex doc)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_CJSON=$(usex relay-api)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_TYPING=$(usex typing)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
diff --git a/net-irc/weechat/weechat-4.4.2.ebuild b/net-irc/weechat/weechat-4.4.2.ebuild
new file mode 100644
index 000000000000..b35455cb8847
--- /dev/null
+++ b/net-irc/weechat/weechat-4.4.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake lua-single python-single-r1 xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	inherit verify-sig
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
+		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru sr tr"
+IUSE="doc enchant man nls relay-api selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	enchant? ( spell )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+	relay-api? ( relay )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0:12= )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+	)
+	python? ( ${PYTHON_DEPS} )
+	relay-api? ( dev-libs/cJSON )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.3
+			dev-lang/ruby:3.2
+			dev-lang/ruby:3.1
+		)
+	)
+	selinux? ( sec-policy/selinux-irc )
+	spell? (
+		enchant? ( app-text/enchant:* )
+		!enchant? ( app-text/aspell )
+	)
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	zstd? ( app-arch/zstd:= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND+="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS.md CHANGELOG.md CONTRIBUTING.md UPGRADING.md README.md"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	local j
+	for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \
+			| sed -e 's/.*set(\(\w\+\).*/\1/'); do
+		for j in $(grep set.${i} doc/CMakeLists.txt \
+				| sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do
+			if ! has ${j} ${LINGUAS-${j}} ; then
+				sed -i \
+					-e "s/\(set(${i}.*\) ${j}/\1/" \
+					doc/CMakeLists.txt || die
+			fi
+		done
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_PHP=OFF
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		# -DENABLE_DOC requires all plugins (except javascript).
+		# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
+		# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
+		-DENABLE_DOC=OFF
+		-DENABLE_DOC_INCOMPLETE=$(usex doc)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_CJSON=$(usex relay-api)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_TYPING=$(usex typing)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 741324dee72d..b35455cb8847 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -31,7 +31,7 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 # dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru sr tr"
 IUSE="doc enchant man nls relay-api selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
@@ -85,10 +85,6 @@ BDEPEND+="
 	nls? ( >=sys-devel/gettext-0.15 )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-)
-
 DOCS="AUTHORS.md CHANGELOG.md CONTRIBUTING.md UPGRADING.md README.md"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index cdbb8c02765a..d653c1e82777 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1 +1,2 @@
 DIST courier-authlib-0.72.1.tar.bz2 2288448 BLAKE2B 0af13cb4d4e8661011acae46c7134ed7d76b5d114129846397bbaf95db3d05ac792a99c9088e1101c0d8f040bccace9e813d54bc864cabb67ba2501701567bce SHA512 2e46f3ee91dc3b0e81e1f2fb2ebae9615fd1bc2349946167ebb0d6701fc60f1ed754f0d9de160730b45991869ab30849f153a0e523777f5eae28f8a38426e814
+DIST courier-authlib-0.72.3.tar.bz2 2289793 BLAKE2B 41e28e3d48a7586e54758d49324f51ba4e565186d4f1765301c1592474d2c57ddc62e088739f8c16d51abca86cdcb94745756bbdf9b06f6cd5197b52f145e367 SHA512 9a2901c15605611e139d8066e01ea94db9b0dda65e9fd8b6b0d50946fd0ca9805be212cfcb9d35b0e953b0d2f0d90dd2063410700a5eb4a2f2cb9fc184ac7fa2
diff --git a/net-libs/courier-authlib/courier-authlib-0.72.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.72.3.ebuild
new file mode 100644
index 000000000000..9842945ae958
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.72.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.3.1:=
+	virtual/libcrypt:=
+	dev-libs/libltdl
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index effd3eeb68e5..1161d5f00b67 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1 +1,2 @@
 DIST courier-unicode-2.3.0.tar.bz2 657354 BLAKE2B 4ccb4743330b5da8b4ab8f39d3ca186bcb826ef466a909d6cc011df5c2e15a8d547cf59f44dc40a02108d08695fa2747eab0050c3cd3e913277c9cc32ddf61db SHA512 f0db382a5c3fbe76fa1395e90f5f5489f83e95753f95058aa1c1b16dbcd5aba0425e88674337d18d32d00ed932609c3e984ae684bb122fea40eaae9489f470d4
+DIST courier-unicode-2.3.1.tar.bz2 657748 BLAKE2B a5e07741d410e212b3cf55ee690f794a0a133fea1bdcb181c1630f113588f0301d0a253770395bb5f1996321569dfe7c1e06b2918026575cef04b3233199386c SHA512 ee515e06364075d40c3204073cd828f5f663ec9cfe97259d38a5b30f0452f44073192685e408cd92aa93550bf61c2fe6dd5261845f7934ffa44b6f3a475edda6
diff --git a/net-libs/courier-unicode/courier-unicode-2.3.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.3.1.ebuild
new file mode 100644
index 000000000000..79fe28d55bce
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-2.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 6f894687f9ed..595f947f50a5 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1 +1,2 @@
 DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
+DIST gloox-1.0.28.tar.bz2 728337 BLAKE2B dcbabba6707fb92c8e1619ff4d4568a723c448aca2dd1fdd8fb0ca1d96e0e9f07f5848a64447c22d03a7d2ac7c80702bbdbc4d11249da1801c31e71bd17fabf3 SHA512 8be06963a54957d53bb285482d2ad01569fb281fcb53b03a29dc4444e1915f2f7d81e3fec1288f127bc09ca37d1c0beb4cb8e4f7079becb32dc223e3ceb50e00
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild
deleted file mode 100644
index b63398759439..000000000000
--- a/net-libs/gloox/gloox-1.0.24.ebuild
+++ /dev/null
@@ -1,61 +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/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="https://camaya.net/gloox/"
-SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-# Check upstream changelog: https://camaya.net/gloox/changelog/
-SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnutls idn ssl static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	idn? ( net-dns/libidn:= )
-	gnutls? ( net-libs/gnutls:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.24-musl.patch"
-	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
-	"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
-	"${FILESDIR}/${PN}-1.0.24-pthread-link.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	local myeconfargs=(
-		--without-examples
-		$(usex debug "--enable-debug" '')
-		$(use_enable static-libs static)
-		$(use_with idn libidn)
-		$(use_with gnutls)
-		$(use_with ssl openssl)
-		$(use_with test tests)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/gloox/gloox-1.0.28.ebuild b/net-libs/gloox/gloox-1.0.28.ebuild
new file mode 100644
index 000000000000..4f9c9456987e
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.28.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP client library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+# Check upstream changelog: https://camaya.net/gloox/changelog/
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnutls idn ssl static-libs test +xhtmlim zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? ( dev-libs/openssl:0= )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-examples # not installed anyway so don't build them
+		$(usex debug "--enable-debug" '')
+		$(use_enable static-libs static)
+		$(use_enable xhtmlim)
+		$(use_with idn libidn)
+		$(use_with gnutls)
+		$(use_with ssl openssl)
+		$(use_with test tests)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
index 8ae7ea99aee3..f8414a9a0073 100644
--- a/net-libs/gloox/metadata.xml
+++ b/net-libs/gloox/metadata.xml
@@ -5,4 +5,7 @@
 	<upstream>
 		<changelog>https://camaya.net/gloox/changelog/</changelog>
 	</upstream>
+	<use>
+		<flag name="xhtmlim">expose internal NodeList for optional XHTML-IM rendering without external parser</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch b/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch
new file mode 100644
index 000000000000..1e1b3b54f49d
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch
@@ -0,0 +1,45 @@
+https://gitlab.com/gnutls/gnutls/-/commit/f3e8eac0586a19f4dafd89f68006a536b826e65a
+
+From f3e8eac0586a19f4dafd89f68006a536b826e65a Mon Sep 17 00:00:00 2001
+From: Andreas Metzler <ametzler@bebt.de>
+Date: Thu, 15 Aug 2024 16:22:02 +0200
+Subject: [PATCH] revert back to datefudge for "openssl ocsp".
+
+openssl's -attime only changes the verification logic but not the
+generation.
+
+Broken by: d1bc7f644422c4d87edfcd9fafe7f292a1a3a6de
+
+Signed-off-by: Andreas Metzler <ametzler@bebt.de>
+--- a/tests/ocsp-tests/ocsp-must-staple-connection.sh
++++ b/tests/ocsp-tests/ocsp-must-staple-connection.sh
+@@ -48,6 +48,8 @@ fi
+ 
+ . "${srcdir}/scripts/common.sh"
+ 
++skip_if_no_datefudge
++
+ eval "${GETPORT}"
+ # Port for gnutls-serv
+ TLS_SERVER_PORT=$PORT
+@@ -69,7 +71,6 @@ fi
+ 
+ CERTDATE="2016-04-28 00:00:00"
+ TESTDATE="2016-04-29 00:00:00"
+-EPOCHTESTDATE=1461888000
+ EXP_OCSP_DATE="2016-03-27 00:00:00"
+ 
+ OCSP_PID=""
+@@ -129,8 +130,8 @@ cp "${srcdir}/ocsp-tests/certs/ocsp_index.txt.attr" ${ATTRFILE}
+ # SO_REUSEADDR usage.
+ PORT=${OCSP_PORT}
+ launch_bare_server \
+-	  "${OPENSSL}" ocsp -attime "${EPOCHTESTDATE}" \
+-	  -index "${INDEXFILE}" -text \
++	  "$FAKETIME" "${TESTDATE}" \
++	  "${OPENSSL}" ocsp -index "${INDEXFILE}" -text \
+ 	  -port "${OCSP_PORT}" \
+ 	  -rsigner "${srcdir}/ocsp-tests/certs/ocsp-server.pem" \
+ 	  -rkey "${srcdir}/ocsp-tests/certs/ocsp-server.key" \
+-- 
+GitLab
diff --git a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
index 3474e58c4983..57a12bf55f89 100644
--- a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit autotools multilib-minimal verify-sig flag-o-matic
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
 HOMEPAGE="https://www.gnutls.org/"
@@ -74,6 +74,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.8.7.1-configure-brotli.patch
+	"${FILESDIR}"/${PN}-3.8.7.1-tests.patch
 )
 
 src_prepare() {
@@ -89,13 +90,6 @@ src_prepare() {
 	# fails to compile in certain configurations
 	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
 
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# should be gone on next release, for gnulib memset_s breakage
-		append-cppflags -D__STDC_WANT_LIB_EXT1__=1
-		# alloca usage, similar
-		sed -i -e '$a#include <alloca.h>' config.h.in || die
-	fi
-
 	# Use sane .so versioning on FreeBSD.
 	#elibtoolize
 
@@ -155,6 +149,12 @@ multilib_src_configure() {
 	)
 
 	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# gnulib ends up defining its own pthread_mutexattr_gettype
+		# otherwise, which is causing versioning problems
+		echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >> config.h || die
+	fi
 }
 
 multilib_src_install_all() {
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 85a1b4066a43..f20c36397757 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -16,7 +16,7 @@
 			Add support for PKCS#11 through <pkg>app-crypt/p11-kit</pkg>
 		</flag>
 		<flag name="tools">
-			Build extra tools
+			Build cli tools such as gnutls-cli, certtool and oscptool
 		</flag>
 		<flag name="tls-heartbeat">
 			Enable the Heartbeat Extension in TLS and DTLS
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 15bd602fc31c..03554fdb6e8f 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -5,3 +5,4 @@ DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8
 DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff
 DIST grpc-1.62.1.tar.gz 22384671 BLAKE2B 134e40732e784e52d518cde6e518e4c08e2f67a025754d88b92a9a314f86e53bee33ee793395b9e225c0895c6ac8b9c036892c82c19d0fddf69909a22eac4b78 SHA512 3224ad2617c18156f90c54c1ebf1f2015e405a6f12546e8709e0c905f52508c9f1a13b4d5a6cc7a35abf58b429985b5b504c9062f50c0d3d6aa163180a61047a
 DIST grpc-1.65.1.tar.gz 22539865 BLAKE2B f044305a1817c46d12b96d65a7d70e4342921d372bbeb127840ccbf5cda1f5a34daf7319cd8564a7d327f6abfbac67e4300f80cfe9e66dd49d65d77d30fd3402 SHA512 ca8ebe71fb88a0fc605706c3c81c349e79c40b347081a06795fa64550720bc745373ac5d167263d098e98553077cfda141e4f4be2eefa5f345ede9b0ddec4f54
+DIST grpc-1.66.0.tar.gz 22654517 BLAKE2B 99c7392036dd2eda8384c921223c7d877739c9368a90ec6ba513f7b37b5f5d151795362f3260cb2b3a4132a11b9cb2b3ce6bb5b6894186efc8fa1d8e809c8ebc SHA512 1cd2662ff71ef45642d7c7ac3ab9b20d850ff4f925aea335f0069d870d54f6e4c3107d858cf2e6a45e3e511bc5c9983e75173a0ee7aab7a8e34357c6d5e2fbe8
diff --git a/net-libs/grpc/files/grpc-1.65.0-vlog.patch b/net-libs/grpc/files/grpc-1.65.0-vlog.patch
new file mode 100644
index 000000000000..e57c0ba222b3
--- /dev/null
+++ b/net-libs/grpc/files/grpc-1.65.0-vlog.patch
@@ -0,0 +1,17 @@
+
+Fix build with abseil-cpp-20240722.0 which no longer implicitly
+includes absl/log/vlog_is_on.h
+
+See: https://github.com/abseil/abseil-cpp/releases/tag/20240722.0
+Bug: https://bugs.gentoo.org/939015
+
+--- grpc-1.65.1/src/core/util/log.cc~	2024-07-17 00:53:49.000000000 +0200
++++ grpc-1.65.1/src/core/util/log.cc	2024-09-04 09:28:18.494476262 +0200
+@@ -19,6 +19,7 @@
+ #include <grpc/support/port_platform.h>
+ 
+ #include "absl/log/log.h"
++#include "absl/log/vlog_is_on.h"
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/net-libs/grpc/grpc-1.65.1.ebuild b/net-libs/grpc/grpc-1.65.1.ebuild
index 448a008c7796..3fbe1dcd6309 100644
--- a/net-libs/grpc/grpc-1.65.1.ebuild
+++ b/net-libs/grpc/grpc-1.65.1.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+	"${FILESDIR}/${PN}-1.65.0-vlog.patch"
 )
 
 python_check_deps() {
diff --git a/net-libs/grpc/grpc-1.66.0.ebuild b/net-libs/grpc/grpc-1.66.0.ebuild
new file mode 100644
index 000000000000..af53605f1ca3
--- /dev/null
+++ b/net-libs/grpc/grpc-1.66.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic python-any-r1
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/43.166"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc examples test systemd"
+RESTRICT="!test? ( test )"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	>=dev-cpp/abseil-cpp-20240116:=
+	>=dev-libs/re2-0.2022.04.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-27.0:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.19.1:=
+	sys-libs/zlib:=
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+		dev-cpp/gtest
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		net-misc/curl
+		$(python_gen_any_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/cffi[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.65.0-system-gtest.patch"
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version -b "dev-python/twisted[${PYTHON_USEDEP}]" &&
+		python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+		python_has_version -b "dev-python/cffi[${PYTHON_USEDEP}]" &&
+		python_has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	# These extra libs are defined as dependencies of the vendored gtest,
+	# which is a dependency of the unit tests, therefore they are normally
+	# implicitly picked up and linked to the test binaries.  However removing
+	# the vendored gtest to use the system one also removes these dependencies,
+	# so we have to redeclare them as dependencies of the test binaries individually.
+	local extra_libs=(
+		"GTest::gtest"
+		"GTest::gmock"
+		"\${_gRPC_RE2_LIBRARIES}"
+		"absl::flat_hash_set"
+		"absl::failure_signal_handler"
+		"absl::stacktrace"
+		"absl::symbolize"
+		"absl::flags"
+		"absl::flags_parse"
+		"absl::flags_reflection"
+		"absl::flags_usage"
+		"absl::strings"
+		"absl::any"
+		"absl::optional"
+		"absl::variant"
+	)
+	: "$(echo "${extra_libs[@]}" | "${EPYTHON}" -c 'import sys;print("\\n\\1".join(sys.stdin.read().split()))')"
+	local rstring="${_}"
+	sed -i -E "s/( +)gtest/\1${rstring}/g" "CMakeLists.txt" || die
+
+	# Integrate tests with ctest rather than the custom test framework.
+	# Formatted with dev-python/black.
+	"${EPYTHON}" - <<-EOF | tee -a "CMakeLists.txt"
+		import json, pathlib
+
+		print("if(gRPC_BUILD_TESTS)")
+		for line in [
+		  json.dumps([t["name"], "./" + t["name"], *t["args"]]).translate(
+		  str.maketrans(dict.fromkeys("[],", None))
+		  )
+		  for t in json.loads(
+		    pathlib.Path("tools/run_tests/generated/tests.json").read_text()
+		  )
+		  if "linux" in t["platforms"] and not t["flaky"] and not t.get("boringssl", False)
+		]:
+		  print(f"  add_test({line})")
+		print("endif()")
+	EOF
+
+	# Weird path issue.  All tests except these two assume they are running from top-level src
+	sed -i -E "s/lslash != nullptr/false/" "test/core/http/httpcli_test_util.cc" || die
+
+	# Called via system() by some of the C++ sources, respect EPYTHON
+	sed -i -E "s#for p in #for p in \"${EPYTHON}\"#" "tools/distrib/python_wrapper.sh" || die
+
+	# Respect EPYTHON when testing, don't touch installed files otherwise
+	use test && python_fix_shebang --force "${S}"
+
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	# suppress network access, package builds fine without the submodules
+	mkdir "${S}/third_party/opencensus-proto/src" || die
+
+	soversion_check
+}
+
+src_configure() {
+	# https://github.com/grpc/grpc/issues/29652
+	filter-lto
+
+	local mycmakeargs=(
+		-DgRPC_DOWNLOAD_ARCHIVES=OFF
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DgRPC_USE_SYSTEMD=$(usex systemd ON OFF)
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# This is normally done with start_port_server.py, but this forks and exits,
+	# while we need to capture the pid, so run it ourselves
+	"${EPYTHON}" "tools/run_tests/python_utils/port_server.py" \
+		-p 32766 -l "${T}/port_server.log" &
+	local port_server_pid="${!}"
+
+	# Reimplementation of what start_port_server.py does with curl
+	curl --retry 9999 --retry-all-errors --retry-max-time 120 \
+		--fail --silent --output /dev/null "http://localhost:32766/get" || die
+
+	CMAKE_SKIP_TESTS=(
+		# CallCommandWithTimeoutDeadlineSet has a timeout set to 5000.25 seconds
+		^grpc_tool_test$
+
+		# Need network access
+		^posix_event_engine_native_dns_test$
+		^posix_event_engine_test$
+		^resolve_address_using_ares_resolver_test$
+		^resolve_address_using_native_resolver_test$
+	)
+
+	use amd64 && CMAKE_SKIP_TESTS+=(
+		^examine_stack_test$ # fails on amd64 only
+		^stack_tracer_test$ # fails on amd64 only
+	)
+
+	use alpha && CMAKE_SKIP_TESTS+=(
+		^endpoint_pair_test$ # fails on alpha
+		^event_poller_posix_test$ # fails on alpha
+		^tcp_posix_test$ # fails on alpha
+	)
+
+	# NOTE breaks with shared linking because the metric is twice initialised in a static function in a anonymous
+	# namespace
+	# metrics.cc:49] Metric name grpc.lb.pick_first.disconnections has already been registered.
+	# https://bugs.gentoo.org/935787 Leave the bug open until we fixed the underlying issue
+	CMAKE_SKIP_TESTS+=(
+		^bad_ping_test$
+		^binary_metadata_test$
+		^call_creds_test$
+		^call_host_override_test$
+		^cancel_after_accept_test$
+		^cancel_after_client_done_test$
+		^cancel_after_invoke_test$
+		^cancel_after_round_trip_test$
+		^cancel_before_invoke_test$
+		^cancel_in_a_vacuum_test$
+		^cancel_with_status_test$
+		^client_streaming_test$
+		^compressed_payload_test$
+		^connectivity_test$
+		^default_host_test$
+		^disappearing_server_test$
+		^empty_batch_test$
+		^filter_causes_close_test$
+		^filter_init_fails_test$
+		^filter_test_test$
+		^filtered_metadata_test$
+		^graceful_server_shutdown_test$
+		^grpc_authz_test$
+		^high_initial_seqno_test$
+		^hpack_size_test$
+		^http2_stats_test$
+		^invoke_large_request_test$
+		^keepalive_timeout_test$
+		^large_metadata_test$
+		^max_concurrent_streams_test$
+		^max_connection_age_test$
+		^max_connection_idle_test$
+		^max_message_length_test$
+		^negative_deadline_test$
+		^no_logging_test$
+		^no_op_test$
+		^payload_test$
+		^ping_pong_streaming_test$
+		^ping_test$
+		^proxy_auth_test$
+		^registered_call_test$
+		^request_with_flags_test$
+		^request_with_payload_test$
+		^resource_quota_server_test$
+		^retry_cancel_after_first_attempt_starts_test$
+		^retry_cancel_during_delay_test$
+		^retry_cancel_with_multiple_send_batches_test$
+		^retry_cancellation_test$
+		^retry_disabled_test$
+		^retry_exceeds_buffer_size_in_delay_test$
+		^retry_exceeds_buffer_size_in_initial_batch_test$
+		^retry_exceeds_buffer_size_in_subsequent_batch_test$
+		^retry_lb_drop_test$
+		^retry_lb_fail_test$
+		^retry_non_retriable_status_before_trailers_test$
+		^retry_non_retriable_status_test$
+		^retry_per_attempt_recv_timeout_on_last_attempt_test$
+		^retry_per_attempt_recv_timeout_test$
+		^retry_recv_initial_metadata_test$
+		^retry_recv_message_replay_test$
+		^retry_recv_message_test$
+		^retry_recv_trailing_metadata_error_test$
+		^retry_send_initial_metadata_refs_test$
+		^retry_send_op_fails_test$
+		^retry_send_recv_batch_test$
+		^retry_server_pushback_delay_test$
+		^retry_server_pushback_disabled_test$
+		^retry_streaming_after_commit_test$
+		^retry_streaming_succeeds_before_replay_finished_test$
+		^retry_streaming_test$
+		^retry_test$
+		^retry_throttled_test$
+		^retry_too_many_attempts_test$
+		^retry_transparent_goaway_test$
+		^retry_transparent_max_concurrent_streams_test$
+		^retry_transparent_not_sent_on_wire_test$
+		^retry_unref_before_finish_test$
+		^retry_unref_before_recv_test$
+		^server_finishes_request_test$
+		^server_streaming_test$
+		^shutdown_finishes_calls_test$
+		^shutdown_finishes_tags_test$
+		^simple_delayed_request_test$
+		^simple_metadata_test$
+		^simple_request_test$
+		^streaming_error_response_test$
+		^test_core_end2end_channelz_test$
+		^thread_pool_test$
+		^timeout_before_request_call_test$
+		^trailing_metadata_test$
+		^write_buffering_at_end_test$
+		^write_buffering_test$
+	)
+
+	# BUG this should be nonfatal and we kill the server even when tests fail
+	cmake_src_test
+
+	kill "${port_server_pid}" || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild
index dccf068e8704..2d552a2d3831 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.1-r1.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 src_prepare() {
 	default
 
-	use vala & vala_setup
+	use vala && vala_setup
 }
 
 src_configure() {
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild
index 252a0fcc4541..e374f2449e7e 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.1.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 src_prepare() {
 	default
 
-	use vala & vala_setup
+	use vala && vala_setup
 }
 
 src_configure() {
diff --git a/net-libs/ignition-msgs/files/protobuf.patch b/net-libs/ignition-msgs/files/protobuf.patch
index 5a441ae4d2a9..e3522fc0207f 100644
--- a/net-libs/ignition-msgs/files/protobuf.patch
+++ b/net-libs/ignition-msgs/files/protobuf.patch
@@ -7,7 +7,7 @@ Index: gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt
  #--------------------------------------
  # Find Protobuf
 -set(REQ_PROTOBUF_VER 3)
-+set(REQ_PROTOBUF_VER 4)
++set(REQ_PROTOBUF_VER 27.2.0)
  ign_find_package(IgnProtobuf
                   VERSION ${REQ_PROTOBUF_VER}
                   REQUIRED
diff --git a/net-libs/ignition-msgs/ignition-msgs-5.11.0-r1.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.11.0-r1.ebuild
new file mode 100644
index 000000000000..abd23159af4f
--- /dev/null
+++ b/net-libs/ignition-msgs/ignition-msgs-5.11.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Protobuf messages and functions for robot applications"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-msgs"
+SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/protobuf:=
+	sci-libs/ignition-math:6=
+	dev-libs/tinyxml2:=
+"
+DEPEND="${RDEPEND}
+	dev-build/ignition-cmake:2"
+BDEPEND="dev-build/ignition-cmake:2"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}"
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 1721069ee7ab..f0b31770d1f2 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
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="CC0-1.0 GPL-3+"
diff --git a/net-libs/ldns/ldns-1.8.3-r3.ebuild b/net-libs/ldns/ldns-1.8.3-r3.ebuild
index 1c0a0c3058a2..a7f5067f7cc5 100644
--- a/net-libs/ldns/ldns-1.8.3-r3.ebuild
+++ b/net-libs/ldns/ldns-1.8.3-r3.ebuild
@@ -34,6 +34,11 @@ RDEPEND="
 	${DEPEND}
 "
 
+# False positive, always fails, bug #898658
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	ioctlsocket
+)
+
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/ldns-config
 )
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index 3e5e27cd36f9..948f522c4e24 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,2 +1 @@
-DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
 DIST libbloom-1.6.tar.gz 1872005 BLAKE2B de3368724e9c05489efae74ce36e880e2db29f78792b84b13325a24a3c302154fdbb621d672e9ef7f612ef00df1ec8fe010c59461822f5d04b4c5b27996ef773 SHA512 3dd4343d68def05800dd6ffc5a05b05d0702a8c0c9f0a397f105d4389c88a7bffa419734aeb4fa4e1a2c418b12a8192fa27ddcbaeee72906450d64cbfd64db15
diff --git a/net-libs/libbloom/libbloom-1.5-r2.ebuild b/net-libs/libbloom/libbloom-1.5-r2.ebuild
deleted file mode 100644
index 17be8bdca711..000000000000
--- a/net-libs/libbloom/libbloom-1.5-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple and small bloom filter implementation in plain C"
-HOMEPAGE="https://github.com/jvirkki/libbloom"
-SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=("${FILESDIR}"/${PN}-1.5-AR.patch)
-
-src_compile() {
-	tc-export AR CC
-	emake BITS=default OPT=
-}
-
-src_install() {
-	doheader bloom.h
-	dolib.so build/${PN}.so*
-}
diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild
index a792f191fa46..9a4c0b1e0169 100644
--- a/net-libs/libbloom/libbloom-1.6.ebuild
+++ b/net-libs/libbloom/libbloom-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,6 @@ SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 PATCHES=("${FILESDIR}"/${PN}-1.5-AR.patch)
 
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 2548940b8626..05a09275f3f8 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,2 +1,2 @@
-DIST libktorrent-23.08.5.tar.xz 604184 BLAKE2B e4fc72be9fe20b06220b25fa558a1f86dd029e4eec15da2c8f26ed4acc69e1c06db3fea6ed8dfdb643a01beaf2146c7c0939e8a0da05920712e7f5614e4b4a47 SHA512 c38f944167436a7190e46093cbc928d3db375f7414fa5acdf5b3fd9e77007435259740027941daed422c784d691532f3c9a6c824ce9ac23c091edbedc563aa11
 DIST libktorrent-24.05.2.tar.xz 605972 BLAKE2B 136951dd13029c4b05ce7f5785b913c14c2dcd47c575e10ca223ef9cd0fd187dd0654c49d1e65032ff9d9a4713c772c9bb48512b040d004736d67fce34b47016 SHA512 fb2fca63079988e8f623e77adeff21dfb49c15c604d6ae35da172be3b012c529e73139245061ead46a895bb5af8f4a3be35668295c0a2f5c5fbe1d0a7bc92711
+DIST libktorrent-24.08.0.tar.xz 605840 BLAKE2B 575899a932e2b3633cda64566aa60d34b9b110a53939a66aa624c2fbcd700d8958c3938014fcec47300417c7aae9f3368601379c1fc355ed8333f5c164aff1c6 SHA512 272bb03e7acf1b86443ab2cab93eb79703df98b3e49a27cd89b37bb5256bdd2056715f6249b0615ed9e8a03ec11305d8b2a4f05cd03987bc83c2adbabe04c802
diff --git a/net-libs/libktorrent/libktorrent-23.08.5.ebuild b/net-libs/libktorrent/libktorrent-23.08.5.ebuild
deleted file mode 100644
index a7f8aee65872..000000000000
--- a/net-libs/libktorrent/libktorrent-23.08.5.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="network"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[qt5(+)]
-	>=dev-libs/gmp-6.0.0a:0=
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-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@\"//" \
-		KF5TorrentConfig.cmake.in || die
-}
-
-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.05.2.ebuild b/net-libs/libktorrent/libktorrent-24.05.2.ebuild
index cf1763fcbd13..a9c4a8c304b5 100644
--- a/net-libs/libktorrent/libktorrent-24.05.2.ebuild
+++ b/net-libs/libktorrent/libktorrent-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/libktorrent/libktorrent-24.08.0.ebuild b/net-libs/libktorrent/libktorrent-24.08.0.ebuild
new file mode 100644
index 000000000000..b4e75e71fc67
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-24.08.0.ebuild
@@ -0,0 +1,59 @@
+# 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=""
+
+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
+"
+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_test() {
+	# failing network tests
+	local myctestargs=(
+		-E "(fin|packetloss|send|superseedtest|transmit|utppolltest)"
+	)
+
+	ecm_src_test
+}
diff --git a/net-libs/libnftnl/libnftnl-1.2.7.ebuild b/net-libs/libnftnl/libnftnl-1.2.7.ebuild
index 3559fe7f2439..1f34a564727b 100644
--- a/net-libs/libnftnl/libnftnl-1.2.7.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.2.7.ebuild
@@ -17,7 +17,7 @@ else
 		https://netfilter.org/projects/${PN}/files/${P}.tar.xz
 		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
index c7cc5eaddb37..7c799237ee1c 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.4.0.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A library with SDR DSP primitives"
-HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
+DESCRIPTION="Library with SDR DSP primitives"
+HOMEPAGE="https://gitea.osmocom.org/sdr/libosmo-dsp/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
index 5793baf98d52..8b3e4cfa9f92 100644
--- a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
+++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
-DESCRIPTION="A library with SDR DSP primitives"
-HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
+DESCRIPTION="Library with SDR DSP primitives"
+HOMEPAGE="https://gitea.osmocom.org/sdr/libosmo-dsp/"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}"
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 4f89b6eceec0..8c1b9da2b753 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,2 +1,4 @@
 DIST libpcap-1.10.4.tar.gz 952153 BLAKE2B 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c SHA512 1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1
 DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb8876a12e63f6627bf9dc1a784e780610cd0c858243cc75a63999b40bc64507b078777ae844ede7c07eef9f4f9e0d5 SHA512 34aa401c2e162d708c61b78b445af2fe4ddc0e57de9124b5cc3a05679ffbc3834088160f83892d827e25c65b33313fe71aa73c2de09935d387252ab315ca5ee1
+DIST libpcap-1.10.5.tar.gz 974772 BLAKE2B c0bb29c5c308cb21244a9c63d3daa19033eb21fbd721607c057f04b2ae6b2527fb1cfeeb2b29b7c3535d5d6256aa5fdf5aa22ce48aa4f88a3cc8a81029a98116 SHA512 e599a31f2f1c03bdf386defa613ea9f08f80459c87068c2dd36c55c1bd678e2622cdce6333f0a776f16812df7bd4d6747820d1c35c7a2f1d7ad4a2ffb45dbe24
+DIST libpcap-1.10.5.tar.gz.sig 442 BLAKE2B 6816bb76c6b41b292a29edcff7d89e71511d25190da7e4f26296fbae2690e476b5072f44b5ff1c9e43f31403a37e23d69c18e1f2483488fe8d742cbe3f768312 SHA512 183ed0f6a93679550dc5a589422e92023a92be8fe29f79fb296e966f26e3693e1c6d47c5e88bccbb6004cb19b6419c9d7cd998f4e2255f5594a7f5f6e84ecdc9
diff --git a/net-libs/libpcap/libpcap-1.10.4.ebuild b/net-libs/libpcap/libpcap-1.10.4.ebuild
index 5d183cff7e97..63222f9a2dfa 100644
--- a/net-libs/libpcap/libpcap-1.10.4.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,10 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="BSD"
+# The project itself has COPYING with BSD, but the files used for
+# the libpcap library itself seem to be a mix of BSD-with-attribution
+# and BSD-4.
+LICENSE="BSD BSD-with-attribution BSD-4"
 SLOT="0"
 IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libpcap/libpcap-1.10.5.ebuild b/net-libs/libpcap/libpcap-1.10.5.ebuild
new file mode 100644
index 000000000000..6f2a3246565e
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.10.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+# The project itself has COPYING with BSD, but the files used for
+# the libpcap library itself seem to be a mix of BSD-with-attribution
+# and BSD-4.
+LICENSE="BSD BSD-with-attribution BSD-4"
+SLOT="0"
+IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/flex
+	dbus? ( virtual/pkgconfig )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240901 )"
+fi
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #884275
+	export LEX=flex
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+	use test && emake testprogs
+}
+
+multilib_src_test() {
+	testprogs/findalldevstest || die
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 770877d74270..6f2a3246565e 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,10 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="BSD"
+# The project itself has COPYING with BSD, but the files used for
+# the libpcap library itself seem to be a mix of BSD-with-attribution
+# and BSD-4.
+LICENSE="BSD BSD-with-attribution BSD-4"
 SLOT="0"
 IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
 RESTRICT="!test? ( test )"
@@ -42,7 +45,7 @@ BDEPEND="
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240901 )"
 fi
 
 src_prepare() {
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index c3d88e10923c..054fe4705196 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,3 +1 @@
-DIST libproxy-0.5.3.tar.gz 60069 BLAKE2B adfa982344470251667b113f12f77722f6793ceeec902ccf82e32e80e15836384fbe1ccbec8865fc877fa04b25e6985847eef75b4ce437dbf0410d16e2bd5f36 SHA512 0fa4c677372afa76a9f143abb1472af1df85e1190425ec4168b98e575a9b9c9fe3dcc56062609da8ef266d56dfb153e7f7a1c15aed2d385003d9f3f421d08590
-DIST libproxy-0.5.4.tar.gz 60605 BLAKE2B b603781d454ae9d177522d85027f763275e6f243579e8dd808fc5f740438105ac9f782bd35c39cb0007f42279d8d4f724a81dd06fc79709af227064a477cd70e SHA512 4372570322682369f65317cbeb4e9b9dbcff3d8e5089a3bb3b8efa6cd461468a313793435fd5815fe18360984c44e6895c3c2a62e5e0b07eb0c3bf3532dbb1b2
 DIST libproxy-0.5.5.tar.gz 60880 BLAKE2B fedf06db2e39ca1cacf489542597ab002a8c943234fda2f9e5482d43d3b3b0a5af2c4d270eb678e24bb3c4c9ac8e37e65d609af84d02be9541555e953be6a0f5 SHA512 101139fe6972c9b8b46a8bc5f5cea807649ad21e201a9cd7d532d2145c34eadc861d8039fc8a2bf129f364ddc99ffb1324ab8f19bb0b4b9e52eb0f6bd703c8a8
diff --git a/net-libs/libproxy/libproxy-0.5.3.ebuild b/net-libs/libproxy/libproxy-0.5.3.ebuild
deleted file mode 100644
index 448f904ff3aa..000000000000
--- a/net-libs/libproxy/libproxy-0.5.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="duktape gnome gtk-doc +introspection kde test vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_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 )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kde? ( kde-frameworks/kconfig:5 )
-"
-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
-		$(meson_use kde config-kde)
-		$(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.4-r1.ebuild b/net-libs/libproxy/libproxy-0.5.4-r1.ebuild
deleted file mode 100644
index b0c3841f68a2..000000000000
--- a/net-libs/libproxy/libproxy-0.5.4-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
-
-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 ~ia64 ~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/metadata.xml b/net-libs/libproxy/metadata.xml
index 020f23f2a1d7..3e3dc695c41e 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -7,7 +7,6 @@
 	<use>
 		<flag name="duktape">Use <pkg>dev-lang/duktape</pkg> for PAC parsing</flag>
 		<flag name="gnome">Enable support for reading proxy settings from GNOME</flag>
-		<flag name="kde">Enable support for reading proxy settings from KDE</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">libproxy/libproxy</remote-id>
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 400b330da1df..c7393db2b4ee 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,2 +1 @@
-DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d
 DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5
diff --git a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch
deleted file mode 100644
index 0f5773d75739..000000000000
--- a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/rockdaboot/libpsl/commit/fb6b75317ab669c255906fa4db256837332eb1ed
-
-From fb6b75317ab669c255906fa4db256837332eb1ed Mon Sep 17 00:00:00 2001
-From: Vincent Torri <vtorri@outlook.fr>
-Date: Sat, 14 Jan 2023 17:25:31 +0100
-Subject: [PATCH] add 'tests' option to disable tests and fuzzers
-
----
- meson.build       | 6 ++++--
- meson_options.txt | 3 +++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d96748d..4492354 100644
---- a/meson.build
-+++ b/meson.build
-@@ -132,6 +132,8 @@ endif
- subdir('include')
- subdir('src')
- subdir('tools')
--subdir('tests')
--subdir('fuzz')
-+if get_option('tests')
-+  subdir('tests')
-+  subdir('fuzz')
-+endif
- subdir(join_paths('docs', 'libpsl'))
-diff --git a/meson_options.txt b/meson_options.txt
-index e9d6a23..d66f256 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -17,3 +17,6 @@ option('psl_testfile', type : 'string', value : '',
- 
- option('docs', type: 'boolean', value: false,
-   description: 'Build the API reference (requires gtk-doc)')
-+
-+option('tests', type: 'boolean', value: true,
-+  description: 'Build the tests and fuzzers')
-
diff --git a/net-libs/libpsl/libpsl-0.21.2.ebuild b/net-libs/libpsl/libpsl-0.21.2.ebuild
deleted file mode 100644
index 8dba8ae8ee92..000000000000
--- a/net-libs/libpsl/libpsl-0.21.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
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="C library for the Public Suffix List"
-HOMEPAGE="https://github.com/rockdaboot/libpsl"
-SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu +idn test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
-	idn? (
-		dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-		net-dns/libidn2:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests-optional.patch
-)
-
-pkg_pretend() {
-	if use icu && use idn ; then
-		ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"."
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-
-	# Prefer idn even if icu is in USE as well
-	if use idn ; then
-		emesonargs+=(
-			-Druntime=libidn2
-			-Dbuiltin=true
-		)
-	elif use icu ; then
-		emesonargs+=(
-			-Druntime=libicu
-			-Dbuiltin=true
-		)
-	else
-		emesonargs+=(
-			-Druntime=no
-		)
-	fi
-
-	meson_src_configure
-}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
deleted file mode 100644
index 1e8120260bb2..000000000000
--- a/net-libs/libsignon-glib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
deleted file mode 100644
index b31bd46a825e..000000000000
--- a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Sat, 2 Jan 2021 14:19:18 +0100
-Subject: [PATCH] build: make documentation really optional
-
-Build of the documentation only if the meson option for it is enabled.
----
- meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 5d0de55..b10f80d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -23,7 +23,9 @@ endif
- root_dir = include_directories ('.')
- 
- subdir('libsignon-glib')
--subdir('docs')
-+if get_option('documentation')
-+    subdir('docs')
-+endif
- 
- if get_option('python')
-     subdir('pygobject')
--- 
-GitLab
-
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
deleted file mode 100644
index 66254e398029..000000000000
--- a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4fae9155a19aca601072f361768e0bf8ed556b1e Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Tue, 11 Jan 2022 22:05:11 +0100
-Subject: [PATCH] Fix build with meson >= 0.61.0
-
-Otherwise it fails with "docs/reference/meson.build:21:6: ERROR:
-gnome.gtkdoc keyword argument 'expand_content_files' was of type
-array[File] but should have been array[str]".
----
- docs/reference/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/reference/meson.build b/docs/reference/meson.build
-index 654404b..3927109 100644
---- a/docs/reference/meson.build
-+++ b/docs/reference/meson.build
-@@ -47,9 +47,9 @@ gnome.gtkdoc(
-         'libsignon-glib.types',
-     ],
-     content_files: doc_content_files,
--    expand_content_files: files(
-+    expand_content_files: [
-         'migrating-1to2.xml'
--    ),
-+    ],
-     fixxref_args: [
-         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
-         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
--- 
-GitLab
-
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
deleted file mode 100644
index 84711961b404..000000000000
--- a/net-libs/libsignon-glib/libsignon-glib-2.1-r2.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..12} )
-inherit meson python-r1 vala
-
-DESCRIPTION="GLib binding for the D-Bus API provided by signond"
-HOMEPAGE="https://accounts-sso.gitlab.io/"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-VERSION_${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="debug doc +introspection python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
-# needs more love
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/glib:2
-	net-libs/signond
-	introspection? ( dev-libs/gobject-introspection:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_any_dep)
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	doc? ( dev-util/gtk-doc )
-	test? ( dev-libs/check )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-docs-optional.patch"
-	"${FILESDIR}/${P}-meson-0.61.patch"
-)
-
-python_check_deps() { return 0; }
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-
-	cp libsignon-glib/*.xml libsignon-glib/interfaces || die
-}
-
-src_configure() {
-	myconfigure() {
-		local emesonargs=(
-			-Ddebugging=$(usex debug true false)
-			-Ddocumentation=$(usex doc true false)
-			-Dintrospection=$(usex introspection true false)
-			-Dpython=$(usex python true false)
-			-Dtests=$(usex test true false)
-		)
-
-		meson_src_configure
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir myconfigure
-	else
-		myconfigure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir meson_src_compile
-	else
-		meson_src_compile
-	fi
-}
-
-src_test() {
-	if use python; then
-		python_foreach_impl run_in_build_dir meson_src_test
-	else
-		meson_src_test
-	fi
-}
-
-src_install() {
-	einstalldocs
-
-	if use python; then
-		python_foreach_impl run_in_build_dir meson_src_install
-		python_foreach_impl python_optimize
-	else
-		meson_src_install
-	fi
-}
diff --git a/net-libs/libsignon-glib/metadata.xml b/net-libs/libsignon-glib/metadata.xml
deleted file mode 100644
index 8641e5bdd399..000000000000
--- a/net-libs/libsignon-glib/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/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch b/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
new file mode 100644
index 000000000000..a809420ca803
--- /dev/null
+++ b/net-libs/libssh2/files/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
@@ -0,0 +1,66 @@
+From 9a769054fc03f02db75355f0850360a26fae7324 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Thu, 5 Sep 2024 23:18:47 -0400
+Subject: [PATCH] cmake: always run the tests even when static libs are
+ disabled
+
+The BUILD_STATIC_LIBS option is intended for the use case where users do
+not wish to build and install a static lib because it is not one of the
+artifacts they are interested in. The option should not be used to
+disable running the testsuite.
+
+Instead, when tests are enabled, define the target. Just don't export or
+install it. Build systems build lots of things that aren't deliverable
+artifacts, and this becomes just one more of them.
+
+(cherry-picked from PR https://github.com/libssh2/libssh2/pull/1450)
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+---
+ src/CMakeLists.txt   | 6 ++++--
+ tests/CMakeLists.txt | 8 ++------
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5bbed5e5..eb2fb7c2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -97,8 +97,10 @@ if(WIN32 AND BUILD_STATIC_LIBS AND BUILD_SHARED_LIBS AND
+ endif()
+ 
+ # we want it to be called libssh2 on all platforms
+-if(BUILD_STATIC_LIBS)
+-  list(APPEND libssh2_export ${LIB_STATIC})
++if(BUILD_STATIC_LIBS OR BUILD_TESTING)
++  if(BUILD_STATIC_LIBS)
++    list(APPEND libssh2_export ${LIB_STATIC})
++  endif()
+   add_library(${LIB_STATIC} STATIC ${SOURCES})
+   target_compile_definitions(${LIB_STATIC} PRIVATE ${PRIVATE_COMPILE_DEFINITIONS} ${libssh2_DEFINITIONS})
+   target_link_libraries(${LIB_STATIC} PRIVATE ${LIBRARIES})
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 76eb78ef..a61ea5a3 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -73,16 +73,12 @@ target_include_directories(runner PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../src" .
+ foreach(test ${DOCKER_TESTS} ${STANDALONE_TESTS} ${SSHD_TESTS})
+   if(NOT ";${TESTS_WITH_LIB_STATIC};" MATCHES ";${test};")
+     set(LIB_FOR_TESTS ${LIB_SELECTED})
+-  elseif(TARGET ${LIB_STATIC})
+-    set(LIB_FOR_TESTS ${LIB_STATIC})
+   else()
+-    unset(LIB_FOR_TESTS)
+-    message(STATUS "Skip test requiring static libssh2 lib: ${test}")
++    set(LIB_FOR_TESTS ${LIB_STATIC})
+   endif()
+ 
+   # We support the same target as both Docker and SSHD test. Build those just once.
+-  # Skip building tests that require the static lib when the static lib is disabled.
+-  if(NOT TARGET ${test} AND LIB_FOR_TESTS)
++  if(NOT TARGET ${test})
+     add_executable(${test} ${test}.c)
+     target_compile_definitions(${test} PRIVATE "${CRYPTO_BACKEND_DEFINE}")
+     target_include_directories(${test} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../src" ../src ../include "${CRYPTO_BACKEND_INCLUDE_DIR}")
+-- 
+2.44.2
+
diff --git a/net-libs/libssh2/libssh2-1.11.0-r3.ebuild b/net-libs/libssh2/libssh2-1.11.0-r3.ebuild
new file mode 100644
index 000000000000..3c699abeb4e6
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.11.0-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://libssh2.org"
+SRC_URI="https://libssh2.org/download/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="gcrypt mbedtls test zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
+	"${FILESDIR}"/${PN}-1.11.0-size_t.patch
+	# https://github.com/libssh2/libssh2/pull/1450
+	"${FILESDIR}"/0001-cmake-always-run-the-tests-even-when-static-libs-are.patch
+)
+
+multilib_src_configure() {
+	local crypto_backend=OpenSSL
+	if use gcrypt; then
+		crypto_backend=Libgcrypt
+	elif use mbedtls; then
+		crypto_backend=mbedTLS
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DCRYPTO_BACKEND=${crypto_backend}
+		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+	)
+
+	if use test ; then
+		# Pass separately to avoid unused var warnings w/ USE=-test
+		mycmakeargs+=(
+			-DRUN_SSHD_TESTS=OFF
+			-DRUN_DOCKER_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 70a9e03a7d0b..939a5d0804a7 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake-multilib git-r3
 
 DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
+HOMEPAGE="https://libssh2.org"
 EGIT_REPO_URI="https://github.com/libssh2/libssh2"
 
 LICENSE="BSD"
@@ -26,7 +26,9 @@ RDEPEND="
 	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
@@ -42,11 +44,10 @@ multilib_src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=OFF
 		-DBUILD_TESTING=$(usex test)
 		-DCRYPTO_BACKEND=${crypto_backend}
 		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-		-DRUN_SSHD_TESTS=OFF
-		-DRUN_DOCKER_TESTS=OFF
 	)
 
 	if use test ; then
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 959e80b1c14f..d205ec431a41 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,2 +1,3 @@
 DIST libtirpc-1.3.4.tar.bz2 563292 BLAKE2B 33371e83e9f54e9d6d434b75d3a95bedefce63050846483471e302b1fbb3b63a18db90b652050c43e1c6e42b03e34bafb2fb6ae89787f05af0cf747319825424 SHA512 004e61b5853717324790c46cda5ff227d525909f189194ae72a1ec8f476ca35d7f4c1f03c0fbc690c1696d60a212675b09246dbe627fdbf1a9a47f5664e82b00
+DIST libtirpc-1.3.5.tar.bz2 565188 BLAKE2B 1ae1cc0be1c52bca8fbe2300159d9298b069b3f81adde7f50da3fb7049f9b9f628393dfe94e9276facfeea2b1ccdc9a52632fee4af432c36e457fd3ff2b0963c SHA512 c80a953671c5692294efe7425e41c7f12bd4c430f473f9ea71883168cb4a69111f0018122bd0e7982e18f4576e45d4977ce0790743382faae006c446813d2a4f
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
diff --git a/net-libs/libtirpc/libtirpc-1.3.5.ebuild b/net-libs/libtirpc/libtirpc-1.3.5.ebuild
new file mode 100644
index 000000000000..b37b2dd4d804
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.3.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git"
+SRC_URI="
+	https://downloads.sourceforge.net/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz
+"
+
+LICENSE="BSD BSD-2 BSD-4 LGPL-2.1+"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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}] )"
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cp -ra "${WORKDIR}"/tirpc "${S}"/ || die
+
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local myeconfargs=(
+		$(use_enable kerberos gssapi)
+		$(use_enable static-libs static)
+		KRB5_CONFIG="${ESYSROOT}"/usr/bin/krb5-config
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
index e93530706526..4f624da5ee8c 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/18"
-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="
 	kernel_linux? ( sys-apps/lsb-release )
diff --git a/net-libs/nghttp2/nghttp2-1.62.1.ebuild b/net-libs/nghttp2/nghttp2-1.62.1.ebuild
index 38e73ec93643..5accde584b6c 100644
--- a/net-libs/nghttp2/nghttp2-1.62.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.62.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0/1.14" # 1.<SONAME>
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
 
 REQUIRED_USE="test? ( static-libs )"
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index 02d07708fed4..26fda781349a 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,2 +1,3 @@
 DIST nghttp3-1.3.0.tar.xz 390176 BLAKE2B 8ff17da3e53efb27b13e9ab17dba4ca27cc8fd948b160a36a0b0496f61a49c2729f1281f9a29cb8fecd4dd2c274696885a3c5e001be3dcfc30f5f1c9b6339467 SHA512 a862e7a3c3f6722b07d5437976850b2998032d1f7b9da7a49e6863d59c611ff7204c9923e8e570301a9bfbd91931a30f8f85e96cfb35481783adfc2f955a8b8c
 DIST nghttp3-1.4.0.tar.xz 389036 BLAKE2B f8292aded56c0778dc285cf7d8261494c89e70e1e2128b0196be97706b1ce45edfd885031d069990429ef82c56c4922e0fe07d7471d4851642ce5e8afaf02bb9 SHA512 39ff9418009dcf84ae58d8297f53427da91509a69ecc4fc78c4c00f0fe6bbe348f7afffeafe535ae4c02ff9f0413016b4f51de6a87d8e8c8f6b415bb7f2b0895
+DIST nghttp3-1.5.0.tar.xz 391668 BLAKE2B cbafd1e927bc39db78e238c0a7330170ec8e7a6fad96489fe754088cd40def9ddff7f7eef64bc9dc6efc729acbd4dfe2779bb5ac72092bfe91e3e6aab5b97456 SHA512 76a089fb0dd88b9aced41fccf36758c6504f8faf68c143ca81c260c017ac6dfd83fe678c401304de8bf65e859b0559dc5e8fcb37e88e547076d0ba9fd2c4a59c
diff --git a/net-libs/nghttp3/nghttp3-1.3.0.ebuild b/net-libs/nghttp3/nghttp3-1.3.0.ebuild
index 610121890c67..090a05628f65 100644
--- a/net-libs/nghttp3/nghttp3-1.3.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.3.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 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~riscv x86"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/nghttp3/nghttp3-1.4.0.ebuild b/net-libs/nghttp3/nghttp3-1.4.0.ebuild
index 111b9ebebcb4..c543c530dd7e 100644
--- a/net-libs/nghttp3/nghttp3-1.4.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.4.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 ~ia64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/nghttp3/nghttp3-1.5.0.ebuild b/net-libs/nghttp3/nghttp3-1.5.0.ebuild
new file mode 100644
index 000000000000..4a0974d256ea
--- /dev/null
+++ b/net-libs/nghttp3/nghttp3-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 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/ngtcp2/nghttp3.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="HTTP/3 library written in C"
+HOMEPAGE="https://github.com/ngtcp2/nghttp3/"
+
+LICENSE="MIT"
+SLOT="0/0"
+
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	test? ( static-libs )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_LIB_ONLY=ON
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		-DENABLE_EXAMPLES=OFF
+	)
+	use test && mycmakeargs+=( -DBUILD_TESTING=ON )
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && cmake_build check
+}
diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
index b342674b4fa5..6f21ea803a4e 100644
--- a/net-libs/nghttp3/nghttp3-9999.ebuild
+++ b/net-libs/nghttp3/nghttp3-9999.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 ~ia64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~riscv ~x86"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index cc142af58628..9173031865e6 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -5,3 +5,4 @@ DIST ngtcp2-1.3.0.tar.xz 615620 BLAKE2B b8ec40c02979b0f25c1655c3c4a40c5a604d83f0
 DIST ngtcp2-1.4.0.tar.xz 618480 BLAKE2B a04010fa227a4cbe4ddb2036034a4eb97d80a410d2aa3959e2af48248e9dfe754c05b2d6b4b2d157c850f3d018d71d6dec1830f51e318f62a00b8fb3aa295ea3 SHA512 6491f158cd3bd659d593810935ceedefea8ee4a77e0a1952c0300f83188d0af1ef8313b24f9dbd3e7a795b6ad9099d2681b70ff1bafd92eed429ee028b2f2dea
 DIST ngtcp2-1.5.0.tar.xz 627464 BLAKE2B 6a6fc91f2755d9cbccd6118b53b56b0b4fd3b445c9a491a2d7469ad59d7fe1983516eb79242196db009e7b0875c4db5305bd4c285d2437073b605033f812084d SHA512 6c05beccac5d53c575ceaa594ac6b1d91ae9f0be01394b3520e84b51a44d3c6a71612c2c6f613d3d1b9d2992a83a68696fedbfdc3842f02d4009c95b463ad97f
 DIST ngtcp2-1.6.0.tar.xz 623300 BLAKE2B 738b98d05a188c00d0bae45bbdac91daa9076476a81b696acd22b126bc2e5352c4aa486b8f469723a20ff59e8785b99aa7576b83820fd6312c5988b3a35adc95 SHA512 3afa23e05b7810cc4dd8b8b497ed47eff73fe97869d0a560a324d59491975209705a9dd0de4ab5833ed8e1c2507a621318be7dd18673ac9b07204598fecdffe8
+DIST ngtcp2-1.7.0.tar.xz 631072 BLAKE2B 1a1ce134c54974418c0cf0bacc09a770e29cd7c7bfc44a2b5420f3bef3e70502f610bee4e9bb5ed9b87024153aa9390d5a233d2d6e2689166e1079e0e4f52600 SHA512 6efa42d17772fde00d9d0a67f2cbcf0704a8462c7305a5e3f213d1e98c9302a1ceee847081ecef358c7a421db56236e571a1ad9ff7fa5f5037987c5cb14e517d
diff --git a/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild
new file mode 100644
index 000000000000..789b94518acb
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-1.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl static-libs test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DENABLE_BORINGSSL=OFF
+		-DENABLE_PICOTLS=OFF
+		-DENABLE_WOLFSSL=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 3f5258811345..8a231b44400f 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,11 +1,6 @@
-DIST node-v18.20.3.tar.xz 40610412 BLAKE2B 7f1cb88cd4bf51ca8933344a11f710c8748b88a9cfa38f6960b8f12f0b78afbecd0fae86608b81fcaca44d98042aae5807924bb09e2088491831d6eb08615ca2 SHA512 0f518e8f3985274d5b0f48eb574675fa0a1ade6f5e59a9de706b2ade3f8a82dbea1557611a6353422090a95846b5ed107ea2476f78bee787ef4f0db8c07bc999
 DIST node-v18.20.4.tar.xz 40445740 BLAKE2B 0675f2aba1d9a9cd9aeb665ecb3a0f61b9caf39daeb6154941f84b9c423caa7a658c14b8c2c5e12d94424b2470748ec7fad28ecb10390d37f92eb7e50f8adc26 SHA512 1ccef99ebee3906f5bad3c1582f9551ced9bed15e6a047d59d1a23c6110004fb46ea4bebcf9899748c64109f78788d7365ee956444e645eaf397dabbcddda21e
-DIST node-v20.14.0.tar.xz 41795876 BLAKE2B 588c380751c12f05ccc95146f6e7f9c3eadfc77e769d836cdca1832a7739a40723fd9a7a4e59a2ab4ad087a2b2def5da76ec28077996b59ae0a6d5b2bd15d2c6 SHA512 b6148c705b2152b20c6567a9bbcbbb3925972d17273e126613b350d1d117600e2d895a93d70f793523cb903337ace9527c541a38cb10137eb81ba992778ed243
-DIST node-v20.15.0.tar.xz 41868532 BLAKE2B 07049df11e18b90ee3ebc72fdd953a64a4a925f234fcf7bfb26c472d841bd3f6f34233670d1cc67ba592eeaa714de74c6a7b89ac5a9f62a321764023a86760de SHA512 2b041ee368ca27fa1f92ec8a43237423b7e2f81dabf525e20df7b9b200a46e6d9a8c4b82beb33ec58a9351e0eea865eadfadac3d9e4d3733b1d699f0b5d4bbf3
 DIST node-v20.15.1.tar.xz 41880412 BLAKE2B f113856db03a3306d50a659e21d11f585e9e78b85ce7ad9926cc778837f905c618ac762faf56e03caaa862ab0a38c5f34770cd2bfb0854d79650ee9d9b9e2bfe SHA512 2a2935490c4c629f47cc67819094904a1b91eaf0b75cbb8ebe92f5eb34b0929230932fa456bf1bec00213155ea8b6337b2e02e946fc18606543c8c71082615b9
-DIST node-v20.16.0.tar.xz 41822608 BLAKE2B 90421b9bf5fad96fadee3eb6fc12461aa6a3456a5266a03f1286f977429af6992e5b1c81a72faa54b3349d46e93881fbfad8970bdebe56afde16b17a1a59dd26 SHA512 494ac16904ecb9f799789f190b869b7509bc66e99713d72723d2bf5051a8a5ca57a4f7303c732aa1fd121cff0defd238be4f656cb4d4e81cc7416b63d9c8677d
-DIST node-v22.3.0.tar.xz 44517412 BLAKE2B 38ed4e6de9be48fb252b809a0174420f0f201f583ef5fb46a446d74168a25b39e1fa95ede44bfee8e7099dfe5636b3fb2bcd1ba3d626d7dfcac01dec0bd84d0a SHA512 70d1508bb576d98ef138db5618a5b07ca4412ec8a2aa35c8ff1d76fc93221bff6d7b418ff60b9194c420ad810523d5aeb0ffa662d2fa99f9cecf299317698710
-DIST node-v22.4.0.tar.xz 46116620 BLAKE2B 262fc22bfe8bab2158a9e9fa274b03bb1ffd875814144fbd6cee45bf2641813363061affa5ebb9b657066899722616d41486046be11425d1a2005fa1261796e3 SHA512 6f7907021ec8c0b16d737da68ae9efa1e424aa38964456e01eb10a3f0111a6d6ceff31ba0f8876cd9df19d92de202e17cccf528b844242e5c66ff1f6b1867f55
+DIST node-v20.17.0.tar.xz 41751520 BLAKE2B 157cf4c3326fcd2f1324c0898018c88327df05c717acfa8d96728e1ebf378ea04e46da56b93e89041a49b5ee4b7e6070373401a2bc2e9163eec3b0dffb6ff4d3 SHA512 3f21c9b5b292143d25a9d51e24d8f9b366429872b3d905d705fb2293e4f4b11e8861650535425d498b999974971a8dec7bf9f9c398af03170caa84bdc63b94da
 DIST node-v22.4.1.tar.xz 46125104 BLAKE2B 7e54a7e01f821d752abbec03212c5be838b2e12fdb10c50cfe05b0ec25ddbe71eaa3187ba25d99efb258ab14d31927216e6816aacdfa29efdb1dc70a06e9b135 SHA512 840423e9738cad9f6024e9b51b683893eab16487ba18183251a189b5d4acf9b4168e9245623092705b014bff2058174127d5d7ecb31c1a8b324961074cb8ca54
-DIST node-v22.5.1.tar.xz 46149824 BLAKE2B 99a215e211ac12fe83106dee142d9411ea4e0fcbe8b360431b2211148ee34cbe041c19eaf2936f21ccf6405ab18aec5ba983a280942101682347ffb319babea6 SHA512 ad0efb9552cf9658b16a7d97edca8ac601841d9ef5b2383927d53181505fd5f0893bb0b4bbf2b42a17b15db66c6690d8e5a1c9e7f8d031325368bc6d47d0642c
-DIST node-v22.6.0.tar.xz 46900628 BLAKE2B 52d566fcc25c370dd2cddbc21f4f9a9d7293b454b832eaaece979fa25232fef59270ba980ebfe6b8ac2424c733ef3ec33a7e7f689b818a30071ec9d3854bc553 SHA512 31a1ad99bf131917b45ec353929525686d22ed3eea1ea9f9498b5a43c0bf38b5f68885fc4a174f9d819a01745767a8b4e8d0577a7eec150456b4a102ddad639b
+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/files/nodejs-20.11.0-riscv.patch b/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch
deleted file mode 100644
index 3bf7a80ea078..000000000000
--- a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From dda5cdb15cfe5c7437f471054f5bd79a82b6eda2 Mon Sep 17 00:00:00 2001
-From: kxxt <rsworktech@outlook.com>
-Date: Wed, 17 Jan 2024 09:16:34 +0800
-Subject: [PATCH] Revert "deps: V8: cherry-pick 13192d6e10fa"
-
-This reverts commit bc2ebb972b34f54e042de9636e7451d2526436a9, which
-shouldn't be applied to v20.x.
-
-Fix https://github.com/nodejs/unofficial-builds/issues/106
----
- common.gypi                                      |  2 +-
- deps/v8/src/builtins/riscv/builtins-riscv.cc     |  2 +-
- deps/v8/src/codegen/riscv/assembler-riscv-inl.h  | 16 ++++++++--------
- deps/v8/src/codegen/riscv/assembler-riscv.h      |  2 +-
- deps/v8/src/execution/riscv/simulator-riscv.cc   |  8 ++++----
- .../regexp/riscv/regexp-macro-assembler-riscv.cc |  2 +-
- 6 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/common.gypi b/common.gypi
-index db09a8a33df06..fa0729ffe45e8 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -36,7 +36,7 @@
- 
-     # Reset this number to 0 on major V8 upgrades.
-     # Increment by one for each non-official patch applied to deps/v8.
--    'v8_embedder_string': '-node.17',
-+    'v8_embedder_string': '-node.18',
- 
-     ##### V8 defaults for Node.js #####
- 
-diff --git a/deps/v8/src/builtins/riscv/builtins-riscv.cc b/deps/v8/src/builtins/riscv/builtins-riscv.cc
-index d6091434b9b0a..3404562785991 100644
---- a/deps/v8/src/builtins/riscv/builtins-riscv.cc
-+++ b/deps/v8/src/builtins/riscv/builtins-riscv.cc
-@@ -1512,7 +1512,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
-   // Set the return address to the correct point in the interpreter entry
-   // trampoline.
-   Label builtin_trampoline, trampoline_loaded;
--  Tagged<Smi> interpreter_entry_return_pc_offset(
-+  Smi interpreter_entry_return_pc_offset(
-       masm->isolate()->heap()->interpreter_entry_return_pc_offset());
-   DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero());
- 
-diff --git a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h
-index ca6d641e2c94e..55f191e6afe76 100644
---- a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h
-+++ b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h
-@@ -128,9 +128,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at(
- }
- 
- void Assembler::deserialization_set_special_target_at(
--    Address instruction_payload, Tagged<Code> code, Address target) {
-+    Address instruction_payload, Code code, Address target) {
-   set_target_address_at(instruction_payload,
--                        !code.is_null() ? code->constant_pool() : kNullAddress,
-+                        !code.is_null() ? code.constant_pool() : kNullAddress,
-                         target);
- }
- 
-@@ -159,13 +159,12 @@ void Assembler::deserialization_set_target_internal_reference_at(
-   }
- }
- 
--Tagged<HeapObject> RelocInfo::target_object(PtrComprCageBase cage_base) {
-+HeapObject RelocInfo::target_object(PtrComprCageBase cage_base) {
-   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-   if (IsCompressedEmbeddedObject(rmode_)) {
--    return HeapObject::cast(
--        Tagged<Object>(V8HeapCompressionScheme::DecompressTagged(
--            cage_base,
--            Assembler::target_compressed_address_at(pc_, constant_pool_))));
-+    return HeapObject::cast(Object(V8HeapCompressionScheme::DecompressTagged(
-+        cage_base,
-+        Assembler::target_compressed_address_at(pc_, constant_pool_))));
-   } else {
-     return HeapObject::cast(
-         Object(Assembler::target_address_at(pc_, constant_pool_)));
-@@ -187,7 +186,8 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
-   }
- }
- 
--void RelocInfo::set_target_object(Tagged<HeapObject> target,
-+void RelocInfo::set_target_object(Heap* heap, HeapObject target,
-+                                  WriteBarrierMode write_barrier_mode,
-                                   ICacheFlushMode icache_flush_mode) {
-   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-   if (IsCompressedEmbeddedObject(rmode_)) {
-diff --git a/deps/v8/src/codegen/riscv/assembler-riscv.h b/deps/v8/src/codegen/riscv/assembler-riscv.h
-index bcd5a62d324ee..ed222b52d6927 100644
---- a/deps/v8/src/codegen/riscv/assembler-riscv.h
-+++ b/deps/v8/src/codegen/riscv/assembler-riscv.h
-@@ -286,7 +286,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase,
-   // This is for calls and branches within generated code.  The serializer
-   // has already deserialized the lui/ori instructions etc.
-   inline static void deserialization_set_special_target_at(Address location,
--                                                           Tagged<Code> code,
-+                                                           Code code,
-                                                            Address target);
- 
-   // Get the size of the special target encoded at 'instruction_payload'.
-diff --git a/deps/v8/src/execution/riscv/simulator-riscv.cc b/deps/v8/src/execution/riscv/simulator-riscv.cc
-index 052a2d67dd7e4..9582db489638a 100644
---- a/deps/v8/src/execution/riscv/simulator-riscv.cc
-+++ b/deps/v8/src/execution/riscv/simulator-riscv.cc
-@@ -1781,7 +1781,7 @@ void RiscvDebugger::Debug() {
-           sreg_t value;
-           StdoutStream os;
-           if (GetValue(arg1, &value)) {
--            Tagged<Object> obj(value);
-+            Object obj(value);
-             os << arg1 << ": \n";
- #ifdef DEBUG
-             obj.Print(os);
-@@ -1830,7 +1830,7 @@ void RiscvDebugger::Debug() {
-           PrintF("  0x%012" PRIxPTR " :  0x%016" REGIx_FORMAT
-                  "  %14" REGId_FORMAT " ",
-                  reinterpret_cast<intptr_t>(cur), *cur, *cur);
--          Tagged<Object> obj(*cur);
-+          Object obj(*cur);
-           Heap* current_heap = sim_->isolate_->heap();
-           if (obj.IsSmi() ||
-               IsValidHeapObject(current_heap, HeapObject::cast(obj))) {
-@@ -4692,7 +4692,7 @@ bool Simulator::DecodeRvvVS() {
- Builtin Simulator::LookUp(Address pc) {
-   for (Builtin builtin = Builtins::kFirst; builtin <= Builtins::kLast;
-        ++builtin) {
--    if (builtins_.code(builtin)->contains(isolate_, pc)) return builtin;
-+    if (builtins_.code(builtin).contains(isolate_, pc)) return builtin;
-   }
-   return Builtin::kNoBuiltinId;
- }
-@@ -4709,7 +4709,7 @@ void Simulator::DecodeRVIType() {
-         if (builtin != Builtin::kNoBuiltinId) {
-           auto code = builtins_.code(builtin);
-           if ((rs1_reg() != ra || imm12() != 0)) {
--            if ((Address)get_pc() == code->instruction_start()) {
-+            if ((Address)get_pc() == code.InstructionStart()) {
-               sreg_t arg0 = get_register(a0);
-               sreg_t arg1 = get_register(a1);
-               sreg_t arg2 = get_register(a2);
-diff --git a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc
-index 72f89767eb348..4063b4b3d2194 100644
---- a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc
-+++ b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc
-@@ -1211,7 +1211,7 @@ static T* frame_entry_address(Address re_frame, int frame_offset) {
- int64_t RegExpMacroAssemblerRISCV::CheckStackGuardState(Address* return_address,
-                                                         Address raw_code,
-                                                         Address re_frame) {
--  Tagged<InstructionStream> re_code = InstructionStream::cast(Object(raw_code));
-+  InstructionStream re_code = InstructionStream::cast(Object(raw_code));
-   return NativeRegExpMacroAssembler::CheckStackGuardState(
-       frame_entry<Isolate*>(re_frame, kIsolateOffset),
-       static_cast<int>(frame_entry<int64_t>(re_frame, kStartIndexOffset)),
-
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index a81beb28246a..aea2f7be0a47 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -13,7 +13,7 @@
 		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 		<flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag>
 		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nodejs/node</remote-id>
diff --git a/net-libs/nodejs/nodejs-18.20.3.ebuild b/net-libs/nodejs/nodejs-18.20.3.ebuild
deleted file mode 100644
index e813e02ffe60..000000000000
--- a/net-libs/nodejs/nodejs-18.20.3.ebuild
+++ /dev/null
@@ -1,257 +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 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 systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.44.0:=
-	>=net-dns/c-ares-1.18.1:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-debug/systemtap )
-	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() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	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}-18.16.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 sys-libs/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=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--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} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out -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-resolveany.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-utimes-y2K38.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" )
-	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-18.20.4.ebuild b/net-libs/nodejs/nodejs-18.20.4.ebuild
index cb29e9256b96..2e4b995390a1 100644
--- a/net-libs/nodejs/nodejs-18.20.4.ebuild
+++ b/net-libs/nodejs/nodejs-18.20.4.ebuild
@@ -24,7 +24,7 @@ else
 	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 systemtap test"
+IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
 	npm? ( ssl )
 	system-icu? ( icu )
diff --git a/net-libs/nodejs/nodejs-20.14.0.ebuild b/net-libs/nodejs/nodejs-20.14.0.ebuild
deleted file mode 100644
index 19cb5426039c..000000000000
--- a/net-libs/nodejs/nodejs-20.14.0.ebuild
+++ /dev/null
@@ -1,262 +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_{9..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info 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-71:= )
-	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 sys-libs/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() {
-	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-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-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" )
-	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-20.15.0.ebuild b/net-libs/nodejs/nodejs-20.15.0.ebuild
deleted file mode 100644
index 53ca55f77715..000000000000
--- a/net-libs/nodejs/nodejs-20.15.0.ebuild
+++ /dev/null
@@ -1,262 +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_{9..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info 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-71:= )
-	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 sys-libs/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() {
-	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-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-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" )
-	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-20.16.0.ebuild b/net-libs/nodejs/nodejs-20.16.0.ebuild
deleted file mode 100644
index 810d175eaacf..000000000000
--- a/net-libs/nodejs/nodejs-20.16.0.ebuild
+++ /dev/null
@@ -1,266 +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_{9..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 sys-libs/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-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
-	)
-	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-20.17.0.ebuild b/net-libs/nodejs/nodejs-20.17.0.ebuild
new file mode 100644
index 000000000000..44f8a7a5ea5b
--- /dev/null
+++ b/net-libs/nodejs/nodejs-20.17.0.ebuild
@@ -0,0 +1,266 @@
+# 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_{9..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 sys-libs/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-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
+	)
+	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.3.0.ebuild b/net-libs/nodejs/nodejs-22.3.0.ebuild
deleted file mode 100644
index 3e25b06b15e3..000000000000
--- a/net-libs/nodejs/nodejs-22.3.0.ebuild
+++ /dev/null
@@ -1,274 +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 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.61.0:=
-	>=net-libs/ngtcp2-1.3.0:=
-	>=dev-libs/simdjson-3.9.1:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-71:= )
-	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 )
-
-	# bug 931256
-	use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.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 sys-libs/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-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() {
-	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-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-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/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.4.0.ebuild b/net-libs/nodejs/nodejs-22.4.0.ebuild
deleted file mode 100644
index f3e2f9cc26af..000000000000
--- a/net-libs/nodejs/nodejs-22.4.0.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
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info 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:=
-	>=net-libs/ngtcp2-1.3.0:=
-	sys-libs/zlib
-	corepack? ( !sys-apps/yarn )
-	system-icu? ( >=dev-libs/icu-71:= )
-	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 )
-
-	# 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
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/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() {
-	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/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.5.1.ebuild b/net-libs/nodejs/nodejs-22.5.1.ebuild
deleted file mode 100644
index 42854806e256..000000000000
--- a/net-libs/nodejs/nodejs-22.5.1.ebuild
+++ /dev/null
@@ -1,283 +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 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:=
-	>=net-libs/ngtcp2-1.3.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 )
-
-	# 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
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/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/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.6.0.ebuild b/net-libs/nodejs/nodejs-22.6.0.ebuild
deleted file mode 100644
index 40e5d335039b..000000000000
--- a/net-libs/nodejs/nodejs-22.6.0.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
-
-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 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:=
-	>=net-libs/ngtcp2-1.3.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 )
-
-	# 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
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/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.7.0.ebuild b/net-libs/nodejs/nodejs-22.7.0.ebuild
new file mode 100644
index 000000000000..bc4c9333bb81
--- /dev/null
+++ b/net-libs/nodejs/nodejs-22.7.0.ebuild
@@ -0,0 +1,291 @@
+# 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-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
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/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
new file mode 100644
index 000000000000..2c68aa6262a1
--- /dev/null
+++ b/net-libs/nodejs/nodejs-22.8.0.ebuild
@@ -0,0 +1,291 @@
+# 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-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
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/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 40e5d335039b..2c68aa6262a1 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -7,7 +7,7 @@ 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 xdg-utils
+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/"
@@ -24,7 +24,7 @@ else
 	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"
+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 )
@@ -39,11 +39,14 @@ RDEPEND=">=app-arch/brotli-1.0.9:=
 	>=dev-libs/simdjson-3.9.1:=
 	>=net-dns/c-ares-1.18.1:=
 	>=net-libs/nghttp2-1.61.0:=
-	>=net-libs/ngtcp2-1.3.0:=
 	sys-libs/zlib
 	corepack? ( !sys-apps/yarn )
 	system-icu? ( >=dev-libs/icu-73:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	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
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index bf7aedc80f98..bdd981dad087 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1 +1,2 @@
 DIST ntirpc-5.0.tar.gz 390950 BLAKE2B b97265eb0af7964b9810f2b4e285531bdd467c9b7385cfcdc75987a6c275e5675d2044e05f560e27a6d5cd4af80b6b27e484ce7cd333878dedf6d1d5fa1e434e SHA512 f73a1bf8a7188bd3fb50ce735ebd18dead63cb93ea8c347aef267082673c40580402b0381d1ed6c7fdecf7752718c059e406dff3051a739632ed8097eccc6646
+DIST ntirpc-6.0.1.tar.gz 438965 BLAKE2B 393a9d45127c52930a845db638de6cb4f370452075e085cd40a6a59daec27ab1bd4291a713685b344b2c829d08f186425cd6383951d1bae66e49c1e70676980a SHA512 7145f1b620309517a2c1c51f2deba15cc5651eee8010aea2d9b667e281c4ac82855f5222a54b701775472e3466b69b7d6aa2e53d05d6553f9200870491de7af5
diff --git a/net-libs/ntirpc/ntirpc-6.0.1.ebuild b/net-libs/ntirpc/ntirpc-6.0.1.ebuild
new file mode 100644
index 000000000000..351ef70b92d0
--- /dev/null
+++ b/net-libs/ntirpc/ntirpc-6.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Transport Independent RPC library for nfs-ganesha"
+HOMEPAGE="https://github.com/nfs-ganesha/ntirpc"
+SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gssapi rdma"
+
+# Since the GSS option only controls some extra files to be enabled,
+# there's nothing to list in the depend string for it.
+RDEPEND="
+	dev-libs/userspace-rcu:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GSS=$(usex gssapi)
+		-DUSE_RPC_RDMA=$(usex rdma)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/udns/udns-0.4-r3.ebuild b/net-libs/udns/udns-0.4-r3.ebuild
index ccc3d9b26b6a..9a50ccbae09b 100644
--- a/net-libs/udns/udns-0.4-r3.ebuild
+++ b/net-libs/udns/udns-0.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="ipv6 static +tools"
 
 PATCHES=(
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
index c150ea58d69d..83b7c85cddc9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
@@ -240,6 +240,9 @@ src_configure() {
 		-DUSE_WOFF2=ON
 	)
 
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
index 7952234cddf5..4deeda8e8d09 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
@@ -244,6 +244,9 @@ src_configure() {
 		-DUSE_WOFF2=ON
 	)
 
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
index a5535bd92795..8bb3bea943e0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
@@ -238,6 +238,9 @@ src_configure() {
 		-DUSE_WOFF2=ON
 	)
 
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 
diff --git a/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild
index 6861f5e2c969..4a8225a808b2 100644
--- a/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.4.3.ebuild
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-apps/grep[pcre]
 	>=sys-devel/clang-11.0.0
+	sys-devel/m4
 "
 
 # Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index adb7bceccf0c..36dabdbebfb9 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -1,2 +1 @@
-DIST altermime-0.3.11.tar.gz 90244 BLAKE2B 5acd29ee3e5927b67de41db4f7cfbe606814ef6476340f26509b1823fcbfa6269c15e1d7e7936e948a7cb0f81b9a17b9a63c2333697707525bc62fd350a55f2a SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68
 DIST altermime-0.3.12.tar.gz 88131 BLAKE2B dd1556438830c35e45e1e258eadbaa4ae237e77c6735910ba9d3080e7cc4fdcebc100dbeab01bbe0f4bed4762bbd8da9ce1e3a5cc280f62e5090f5c149f2f8f7 SHA512 72a2dfef5489d1e798e121308b03d272b2e679e15d3a45f3d25f9e27f9f6211a68ad032f33082a4bc38960f0a407b6892ec41e7fbd2073e950763da3942a7346
diff --git a/net-mail/altermime/altermime-0.3.11.ebuild b/net-mail/altermime/altermime-0.3.11.ebuild
deleted file mode 100644
index 8f58d7d6f7f8..000000000000
--- a/net-mail/altermime/altermime-0.3.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-HOMEPAGE="https://pldaniels.com/altermime/"
-SRC_URI="https://www.pldaniels.com/altermime/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-
-LICENSE="Sendmail"
-SLOT="0"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.10-MIME_headers-overflow.patch
-	"${FILESDIR}"/${P}-respect-flags.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin altermime
-	dodoc CHANGELOG README
-}
diff --git a/net-mail/altermime/altermime-0.3.12.ebuild b/net-mail/altermime/altermime-0.3.12.ebuild
index 7f2e6454ea80..7a5aaf7381ce 100644
--- a/net-mail/altermime/altermime-0.3.12.ebuild
+++ b/net-mail/altermime/altermime-0.3.12.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/alterMIME-${PV}"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.11-respect-flags.patch"
diff --git a/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
deleted file mode 100644
index 8d169e4bcf71..000000000000
--- a/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/320785
-
---- a/MIME_headers.c
-+++ b/MIME_headers.c
-@@ -2243,7 +2243,7 @@
- 		{
- 			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
- 			snprintf(hinfo->name, sizeof(hinfo->name),"%s",p);
--			snprintf(hinfo->filename, sizeof(hinfo->name),"%s",p);
-+			snprintf(hinfo->filename, sizeof(hinfo->filename),"%s",p);
- 			FNFILTER_filter(hinfo->filename, _MIMEH_FILENAMELEN_MAX);
- 			SS_push(&(hinfo->ss_filenames), hinfo->filename, strlen(hinfo->filename));
- 
diff --git a/net-mail/automx2/automx2-2024.2.ebuild b/net-mail/automx2/automx2-2024.2.ebuild
index 598ce69b2d1f..671f397d3e83 100644
--- a/net-mail/automx2/automx2-2024.2.ebuild
+++ b/net-mail/automx2/automx2-2024.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="acct-user/automx2
 	dev-python/flask[${PYTHON_USEDEP}]
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
deleted file mode 100644
index ebaf60aa0318..000000000000
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99-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=7
-
-DESCRIPTION="checkpassword-compatible authentication program w/pam support"
-HOMEPAGE="http://checkpasswd-pam.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/checkpasswd-pam/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~riscv x86"
-
-DEPEND=">=sys-libs/pam-0.75"
-
-DOCS=(
-	AUTHORS
-	NEWS
-	README
-)
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r3.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r3.ebuild
new file mode 100644
index 000000000000..219b82b21213
--- /dev/null
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="checkpassword-compatible authentication program w/pam support"
+HOMEPAGE="http://checkpasswd-pam.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/checkpasswd-pam/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86"
+
+DEPEND=">=sys-libs/pam-0.75"
+
+DOCS=(
+	AUTHORS
+	NEWS
+	README
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99-clang16-build-fix.patch
+)
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 503efebe549a..bc6adb7ffbbd 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,2 +1 @@
-DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
 DIST ezmlm-idx-7.2.2.tar.gz 742451 BLAKE2B fd40b1216d34eba253ef00a53366c8a5f2d19edd9ef20ddea3047a6837263589ac8fc4911820836b49bf4c95b99a1c99d3d2808bc90dd8eb58bc262e6acc74d7 SHA512 4fdd30d6dc254fd0353f34675ea8baa91d95860de1fb23ff5517280c75a8d87405bdd7e180e25eb8f5c0b152a35a11a939f4e7364596e83d81053b1e6019245c
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r5.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r5.ebuild
deleted file mode 100644
index 8abe4c595229..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmail toolchain-funcs
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips sparc x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:* )"
-RDEPEND="${DEPEND}
-	virtual/qmail"
-REQUIRED_USE="?? ( mysql postgres )"
-
-PATCHES=( "${FILESDIR}/${PN}-7.0.0-fno-common.patch" )
-
-src_prepare() {
-	default
-	echo /usr/bin > conf-bin || die
-	echo /usr/$(get_libdir)/ezmlm > conf-lib || die
-	echo /etc/ezmlm > conf-etc || die
-	echo /usr/share/man > conf-man || die
-	echo ${QMAIL_HOME} > conf-qmail || die
-
-	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc || die
-	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld || die
-
-	# fix DESTDIR and skip cat man-pages
-	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
-		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
-		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake it man
-
-	if use mysql; then
-		emake mysql
-	elif use postgres; then
-		emake pgsql
-	fi
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
-	dobin ezmlm-{cgi,checksub,import,rmtab}
-
-	make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch b/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch
deleted file mode 100644
index 11e4cb5d3533..000000000000
--- a/net-mail/ezmlm-idx/files/ezmlm-idx-7.0.0-fno-common.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-fix build with -fno-common
-
---- a/ezmlm-get.c	2021-05-24 12:07:05.245657000 +0200
-+++ b/ezmlm-get.c	2021-05-24 12:07:11.477657000 +0200
-@@ -125,7 +125,7 @@
- 
- int act = AC_NONE;		/* Action we do */
- int flageditor = 0;		/* if we're invoked for within dir/editor */
--struct stat st;
-+static struct stat st;
- 
- int flaglocked = 0;		/* if directory is locked */
- int flagq = 0;			/* don't use 'quoted-printable' */
-@@ -157,7 +157,7 @@
- substdio ssindex;
- char indexbuf[1024];
- 
--int fdlock;
-+static int fdlock;
- 
- void lockup(void)
- /* lock unless locked */
---- a/idxthread.c	2021-05-24 12:06:55.169657000 +0200
-+++ b/idxthread.c	2021-05-24 12:07:09.197657000 +0200
-@@ -39,13 +39,13 @@
- 
- static char strnum[FMT_ULONG];
- 
--struct stat st;
-+static struct stat st;
- 			/* if no data, these may be the entire table, so */
- 			/* need to be static */
- static subentry sdummy;
- static authentry adummy;
- 
--int fdlock;
-+static int fdlock;
- 
- /* NOTE: These do NOT prevent double locking */
- static void lockup(void)
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
deleted file mode 100644
index 38c5e740ce97..000000000000
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Grep for mbox files"
-SRC_URI="https://downloads.sourceforge.net/mboxgrep/${P}.tar.gz"
-HOMEPAGE="https://datatipp.se/mboxgrep/"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="dmalloc"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libpcre
-	sys-libs/zlib
-	dmalloc? ( dev-libs/dmalloc )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with dmalloc no yes)
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		install
-	dodoc ChangeLog NEWS TODO README
-}
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r3.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r3.ebuild
index 0c9276dd5bbf..76324164dbe6 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r3.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r3.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="Grep for mbox files"
-SRC_URI="https://downloads.sourceforge.net/mboxgrep/${P}.tar.gz"
 HOMEPAGE="https://datatipp.se/mboxgrep/"
+SRC_URI="https://downloads.sourceforge.net/mboxgrep/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="dmalloc"
 
diff --git a/net-mail/mess822/mess822-0.58-r3.ebuild b/net-mail/mess822/mess822-0.58-r3.ebuild
index 4c134793ee62..e6be67593c7c 100644
--- a/net-mail/mess822/mess822-0.58-r3.ebuild
+++ b/net-mail/mess822/mess822-0.58-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RESTRICT="test"
 
diff --git a/net-mail/mu/files/mu-1.12.2-musl.patch b/net-mail/mu/files/mu-1.12.2-musl.patch
deleted file mode 100644
index 35f6017e56f3..000000000000
--- a/net-mail/mu/files/mu-1.12.2-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: https://github.com/djcb/mu/pull/2677
-From: Matthew Smith <matthew@gentoo.org>
-Date: Mon, 1 Apr 2024 11:23:39 +0000
-Subject: [PATCH] mu-utils: Fix build with musl
-
-In musl, `stdout` is a macro that expands to `(stdout)`, and
-`::(stdout)` is not valid C++.
-
-../mu-1.12.2/lib/utils/mu-utils.hh:268:32: error: expected
-  id-expression before '(' token
- 268 |                              ::stdout);
-     |                                ^~~~~~
-
-Nothing in the Mu namespace is named stdout, so it is safe to drop
-the `::`.
-
-Bug: https://bugs.gentoo.org/928361
---- a/lib/utils/mu-utils.hh
-+++ b/lib/utils/mu-utils.hh
-@@ -265,7 +265,7 @@ bool fputs_encoded (const std::string& str, FILE *stream);
- template<typename...T>
- static inline bool mu_print_encoded(fmt::format_string<T...> frm, T&&... args) noexcept {
- 	return fputs_encoded(fmt::format(frm, std::forward<T>(args)...),
--			     ::stdout);
-+			     stdout);
- }
- 
- /**
--- 
-2.44.0
-
diff --git a/net-mail/mu/files/mu-1.12.4-timet.patch b/net-mail/mu/files/mu-1.12.4-timet.patch
new file mode 100644
index 000000000000..90ee1b60ba15
--- /dev/null
+++ b/net-mail/mu/files/mu-1.12.4-timet.patch
@@ -0,0 +1,34 @@
+From 075394b35f33bcf684eb0b0023a8640a3ce9c8f5 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Mon, 26 Aug 2024 14:46:54 +0000
+Subject: [PATCH] lib: use time_t_max for empty datetime
+
+In Mu::parse_date_time, when provided with an empty string, return
+time_t_max instead of G_MAXINT64. For systems with a 64-bit time_t, there
+is no difference. With a 32-bit time_t it caused a test to fail:
+
+    not ok /utils/date-basic - ERROR:../mu-1.12.4/lib/utils/tests/test-utils.cc:92
+    void test_date_basic(): assertion failed
+    (parse_date_time(std::get<0>(test), std::get<1>(test)).value_or(-1)
+      == std::get<2>(test)): (18446744073709551615 == 2147483647)
+
+This edge case probably only affected the test, as when other parts of
+the application call parse_date_time (e.g. mu-server.cc and
+mu-query-processor.cc), they check if the input string is empty first.
+
+Upstream: https://github.com/djcb/mu/pull/2749
+Bug: https://bugs.gentoo.org/933093
+--- a/lib/utils/mu-utils.cc
++++ b/lib/utils/mu-utils.cc
+@@ -493,7 +493,7 @@ Mu::parse_date_time(const std::string& dstr, bool is_first, bool utc)
+ 
+ 	/* one-sided dates */
+ 	if (dstr.empty())
+-		return is_first ? 0 : G_MAXINT64;
++		return is_first ? time_t_min : time_t_max;
+ 	else if (dstr == "today" || dstr == "now")
+ 		return special_date_time(dstr, is_first);
+ 	else if (dstr.find_first_of("ymdwhMs") != std::string::npos)
+-- 
+2.46.0
+
diff --git a/net-mail/mu/mu-1.12.4-r1.ebuild b/net-mail/mu/mu-1.12.4-r1.ebuild
new file mode 100644
index 000000000000..7d7aa9f54a3f
--- /dev/null
+++ b/net-mail/mu/mu-1.12.4-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson readme.gentoo-r1
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
+
+# mu: GPL-3+
+# + cli11: BSD
+# + fmt: MIT
+# + tl: CC0-1.0
+# + variant-lite: Boost-1.0
+LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugs.gentoo.org/925503
+	"${FILESDIR}"/${PN}-1.12.0-no-python.patch
+
+	# https://bugs.gentoo.org/933093
+	"${FILESDIR}"/${PN}-1.12.4-timet.patch
+)
+
+DOC_CONTENTS="
+	To use mu4e you need to configure it in your .emacs file.
+	See the manual for more information:
+	https://www.djcbsoftware.nl/code/mu/mu4e/
+"
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+
+	# Don't install NEWS.org into /usr/share/doc.
+	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
+
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
+	# Instead, put it in /usr/share/doc/${PF}.
+	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature readline)
+		-Dcld2=disabled
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
+		# TODO: revisit this, it's not actually deprecated, just been reworked
+		-Dguile=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Since meson no longer installs NEWS.org, install it with dodoc.
+	# Also, it must be uncompressed so that it can be viewed with
+	# mu4e-info.
+	docompress -x /usr/share/doc/${PF}/NEWS.org
+	dodoc NEWS.org
+
+	if use emacs; then
+		# Same as above.
+		docompress -x /usr/share/doc/${PF}/mu4e-about.org
+		dodoc mu4e/mu4e-about.org
+
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use emacs && readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-1.12.4.ebuild b/net-mail/mu/mu-1.12.4.ebuild
deleted file mode 100644
index 23e6d037c065..000000000000
--- a/net-mail/mu/mu-1.12.4.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 elisp-common meson readme.gentoo-r1
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-# mu: GPL-3+
-# + cli11: BSD
-# + fmt: MIT
-# + tl: CC0-1.0
-# + variant-lite: Boost-1.0
-LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/925503
-	"${FILESDIR}"/${PN}-1.12.0-no-python.patch
-)
-
-DOC_CONTENTS="
-	To use mu4e you need to configure it in your .emacs file.
-	See the manual for more information:
-	https://www.djcbsoftware.nl/code/mu/mu4e/
-"
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Dcld2=disabled
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# TODO: revisit this, it's not actually deprecated, just been reworked
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	if use emacs; then
-		# Same as above.
-		docompress -x /usr/share/doc/${PF}/mu4e-about.org
-		dodoc mu4e/mu4e-about.org
-
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use emacs && readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.12.6-r1.ebuild b/net-mail/mu/mu-1.12.6-r1.ebuild
new file mode 100644
index 000000000000..d458d77cb7ca
--- /dev/null
+++ b/net-mail/mu/mu-1.12.6-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson readme.gentoo-r1
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
+
+# mu: GPL-3+
+# + cli11: BSD
+# + fmt: MIT
+# + tl: CC0-1.0
+# + variant-lite: Boost-1.0
+LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugs.gentoo.org/925503
+	"${FILESDIR}"/${PN}-1.12.0-no-python.patch
+
+	# https://bugs.gentoo.org/933093
+	"${FILESDIR}"/${PN}-1.12.4-timet.patch
+)
+
+DOC_CONTENTS="
+	To use mu4e you need to configure it in your .emacs file.
+	See the manual for more information:
+	https://www.djcbsoftware.nl/code/mu/mu4e/
+"
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+
+	# Don't install NEWS.org into /usr/share/doc.
+	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
+
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
+	# Instead, put it in /usr/share/doc/${PF}.
+	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature readline)
+		-Dcld2=disabled
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
+		# TODO: revisit this, it's not actually deprecated, just been reworked
+		-Dguile=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Since meson no longer installs NEWS.org, install it with dodoc.
+	# Also, it must be uncompressed so that it can be viewed with
+	# mu4e-info.
+	docompress -x /usr/share/doc/${PF}/NEWS.org
+	dodoc NEWS.org
+
+	if use emacs; then
+		# Same as above.
+		docompress -x /usr/share/doc/${PF}/mu4e-about.org
+		dodoc mu4e/mu4e-about.org
+
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use emacs && readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/mu/mu-1.12.6.ebuild b/net-mail/mu/mu-1.12.6.ebuild
deleted file mode 100644
index 974051ec7307..000000000000
--- a/net-mail/mu/mu-1.12.6.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 elisp-common meson readme.gentoo-r1
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-# mu: GPL-3+
-# + cli11: BSD
-# + fmt: MIT
-# + tl: CC0-1.0
-# + variant-lite: Boost-1.0
-LICENSE="BSD Boost-1.0 CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/925503
-	"${FILESDIR}"/${PN}-1.12.0-no-python.patch
-)
-
-DOC_CONTENTS="
-	To use mu4e you need to configure it in your .emacs file.
-	See the manual for more information:
-	https://www.djcbsoftware.nl/code/mu/mu4e/
-"
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Dcld2=disabled
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# TODO: revisit this, it's not actually deprecated, just been reworked
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	if use emacs; then
-		# Same as above.
-		docompress -x /usr/share/doc/${PF}/mu4e-about.org
-		dodoc mu4e/mu4e-about.org
-
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use emacs && readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index b046daa6407c..0f9054dfd29f 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,2 +1 @@
-DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff b/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff
deleted file mode 100644
index be33e047b16a..000000000000
--- a/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Naur qmail-autoresponder-0.97.orig/options.c qmail-autoresponder-0.97/options.c
---- qmail-autoresponder-0.97.orig/options.c	2009-09-26 22:45:17.000000000 +0200
-+++ qmail-autoresponder-0.97/options.c	2009-09-26 22:46:07.000000000 +0200
-@@ -1,4 +1,3 @@
--#include <mysql/mysql.h>
- #include <stdlib.h>
- #include <string.h>
- #include <str/str.h>
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
deleted file mode 100644
index 599b03e5fdbe..000000000000
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Rate-limited autoresponder for qmail"
-HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
-SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86"
-IUSE="mysql"
-
-DEPEND=">=dev-libs/bglibs-1.106
-	mysql? ( dev-db/mysql-connector-c:0= )"
-RDEPEND="
-	${DEPEND}
-	virtual/qmail
-	mysql? ( virtual/mysql )
-"
-
-src_prepare() {
-	use mysql || eapply "${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
-	default
-}
-
-src_configure() {
-	echo "/usr/include/bglibs" > conf-bgincs || die
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-}
-
-src_compile() {
-	# fails on parallel builds!
-	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
-	if use mysql; then
-		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
-	fi
-}
-
-src_install() {
-	dobin qmail-autoresponder
-	doman qmail-autoresponder.1
-	if use mysql; then
-		dobin qmail-autoresponder-mysql
-		dodoc schema.mysql
-	fi
-
-	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
-}
-
-pkg_postinst() {
-	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
-}
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
index 24c065bf55fd..0bc660b8b6c3 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,8 +9,8 @@ DESCRIPTION="Rate-limited autoresponder for qmail"
 HOMEPAGE="https://untroubled.org/qmail-autoresponder/"
 SRC_URI="https://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86"
 IUSE="mysql"
 
diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
deleted file mode 100644
index b84b856369c7..000000000000
--- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="Command line based, SMTP email agent"
-HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/"
-SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="ssl"
-
-RDEPEND="
-	dev-lang/perl
-	ssl? ( dev-perl/IO-Socket-SSL )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-overzealous-version-check.patch
-	"${FILESDIR}"/${PV}-overzealous-verify-mode-check.patch
-)
-
-src_install() {
-	dobin sendEmail
-	dodoc CHANGELOG README TODO
-}
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index b42411cbe095..38ea118f8691 100644
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1,2 +1 @@
-DIST autoupnp-0.5.0.tar.gz 7402 BLAKE2B b6de76a45e6811e57cfb15bf41d3305ad4e8ed9b1459270426724b016d33a9a398bae5bca4d3d87360d712614fcad0fa5d8571db88ce632afd43220539ba992d SHA512 0118b20fdb225673348c3ba469bfde6c37e79fba42e7dbf7bca6a0c25dd9f853b0ee73860c5dbb8165e97125cb71b2794d4e88ece0a1155c85f4c83390131dbc
 DIST autoupnp-0.5.1.tar.gz 14091 BLAKE2B 0df03b00dbf6623512c4598b7a9d9222e01317cbeba04006bec00f071ae1397986358fa2af5af38c712648e31ad7c89e81a32d73fcd2be332e75630a86f03826 SHA512 6d5d34dbb008f3be979c2692b16cc1d45a8b3062ef9fd60c268bb26a066f898e974301157e8d7fdcef7d279804504b4d2703bc09f83c8cc1173529673febf10a
diff --git a/net-misc/autoupnp/autoupnp-0.5.0.ebuild b/net-misc/autoupnp/autoupnp-0.5.0.ebuild
deleted file mode 100644
index 46dbe3d77c75..000000000000
--- a/net-misc/autoupnp/autoupnp-0.5.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 meson
-
-DESCRIPTION="Automatic open port forwarder using UPnP"
-HOMEPAGE="https://github.com/projg2/autoupnp/"
-SRC_URI="
-	https://github.com/projg2/autoupnp/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-DEPEND="
-	<net-libs/miniupnpc-2.2.8:0=
-	libnotify? ( x11-libs/libtinynotify:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature libnotify)
-	)
-	meson_src_configure
-}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 4c51ea908345..183074fe7c17 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,4 @@
 DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5
 DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb
+DIST chrony-4.6.tar.gz 631899 BLAKE2B b94e49aa5b9da2cde06d91b674a732a02eee552e88fa169877504cf75645a55dc78a0234a2356d35953b6204095a1c3e9973cc502cafdb6e92bb1231c74f8156 SHA512 84926b6c9eb90824ab98333412b001b18de9342dacb898d195ee8de52868b1945700a8b161de6b603c231460d290e02df6712c1dcb7f034ba45754b38466c8bd
+DIST chrony-4.6.tar.gz.asc 833 BLAKE2B 38d7402b5e8f2063dbe8a0f454ae87143a0a74d916d117270a7ed39e003eb7a5f816a37613c6ca1f2a1e8b14d94718d88b11c96090a5f5e855d64e552d112d95 SHA512 f735c1d52f1474d2af656e55d3a9abfd33b4ed706b983a393c7e3852b766b5179fe4098425ee7f32bb5db4a2e4170e8c5930cf63d20884be6c0eac338a3d26db
diff --git a/net-misc/chrony/chrony-4.5.ebuild b/net-misc/chrony/chrony-4.5.ebuild
index 8eb587f88c65..b3439f8d9beb 100644
--- a/net-misc/chrony/chrony-4.5.ebuild
+++ b/net-misc/chrony/chrony-4.5.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
 	fi
 fi
 
diff --git a/net-misc/chrony/chrony-4.6.ebuild b/net-misc/chrony/chrony-4.6.ebuild
new file mode 100644
index 000000000000..eed7ae6b026d
--- /dev/null
+++ b/net-misc/chrony/chrony-4.6.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony-project.org/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
+	inherit verify-sig
+
+	SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+"
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
+	libtomcrypt? ( dev-libs/libtomcrypt:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
+	nts? ( net-libs/gnutls:= )
+	pps? ( net-misc/pps-tools )
+	readline? ( dev-libs/libedit )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+	html? ( dev-ruby/asciidoctor )
+	nts? ( virtual/pkgconfig )
+	sechash? (
+		nettle? ( virtual/pkgconfig )
+		nss? ( virtual/pkgconfig )
+	)
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Needed for doc generation in 9999
+	REQUIRED_USE+=" html"
+	BDEPEND+="
+		app-alternatives/yacc
+		virtual/w3m
+	"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# FP, checks with macro afterwards (bug #907877)
+	recvmmsg
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps ; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp ; then
+		sed -i \
+			-e 's/ -F 2//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
+	# Not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+
+		$(usev !caps '--disable-linuxcaps')
+		$(usev !cmdmon '--disable-cmdmon')
+		$(usev debug '--enable-debug')
+
+		# USE=readline here means "readline-like functionality"
+		# chrony only supports libedit in terms of the library providing
+		# it.
+		$(usev !readline '--without-editline --disable-readline')
+
+		$(usev !libtomcrypt '--without-tomcrypt')
+		$(usev !nettle '--without-nettle')
+		$(usev !nss '--without-nss')
+		$(usev !ntp '--disable-ntp')
+		$(usev !nts '--disable-nts')
+		$(usev !nts '--without-gnutls')
+		$(usev !phc '--disable-phc')
+		$(usev !pps '--disable-pps')
+		$(usev !refclock '--disable-refclock')
+		$(usev !rtc '--disable-rtc')
+		$(usev samba '--enable-ntp-signd')
+		$(usev !sechash '--disable-sechash')
+
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+
+		${EXTRA_ECONF}
+	)
+
+	# Print the ./configure call
+	edo ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	if [[ ${PV} == 9999 ]] ; then
+		# Uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usev !html 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	# Compatibility with other distributions who install to /etc/chrony.conf (bug #835461)
+	dosym -r /etc/chrony/chrony.conf /etc/chrony.conf
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html ; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps ; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		# bug #711058
+		fowners -R ntp:ntp /var/{lib,log}/chrony
+		fperms -R 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=0
+	HAD_SECCOMP=0
+	HAD_PRE_NEW_SECCOMP_LEVEL=0
+
+	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
+	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
+	if has_version 'net-misc/chrony[caps]' ; then
+		HAD_CAPS=1
+	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=1
+	fi
+
+	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+		# This version introduced a new filter level: -F 2
+		# It's a limited set of seccomp filters designed to be 'bare minimum'
+		HAD_PRE_NEW_SECCOMP_LEVEL=1
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
+			# bug #719876
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+			ewarn "This is necessary for chrony to drop privileges"
+		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	# See bug #783915 for general discussion on enabling seccomp filtering
+	# by default.
+	local show_seccomp_enable_msg=0
+
+	# Was seccomp disabled before and now enabled?
+	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	# Are we coming from an old version without the new 'minimal' filter?
+	# (-F 2)
+	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+		elog "To enable seccomp in a stricter mode, please modify:"
+		elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
+	fi
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 75c467aacec7..eed7ae6b026d 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index f6e7c659594f..f7409a2272a7 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1 +1,2 @@
 DIST connman-1.42.tar.gz 743965 BLAKE2B 1d9eeb4c917978df502de684128a3464bbc7f3960878842a3ac27295dc5d049641cd5218a9542055b5d9ab2b6114fb773fc8a173f54dca3afe37109ab58bde35 SHA512 98ede28854e5948c8b67c5ba03b156ed9966e9fcda2d39168062873b194a192d12af885c63d9a2cb0b7b5b882b69fdbb0e09c4eb0c6772a76db06de7b9e363d7
+DIST connman-1.43.tar.gz 800363 BLAKE2B f7d906df55e89ffe58fe4c684577be94468d24e6934f82f6461c93969743c44c227cc1caa1dc5123ffb8e521385a08bc7e59c733619c39beae34a2e8ca0b495f SHA512 60fef8fb5ac0679068794c84af7eefbc051c4fff12c86a02574d3225e5729ae9ff38d4223f72f03621db9b05624843165fee5692dc12d493676d987b9433174a
diff --git a/net-misc/connman/connman-1.43.ebuild b/net-misc/connman/connman-1.43.ebuild
new file mode 100644
index 000000000000..117268197dc3
--- /dev/null
+++ b/net-misc/connman/connman-1.43.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	net-libs/gnutls
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0=
+	)
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )"
+RDEPEND="${COMMON_DEPEND}
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	l2tp? ( net-dialup/xl2tpd )
+	ofono? ( net-misc/ofono )
+	policykit? ( sys-auth/polkit )
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
+
+if [ ! -z ${COMMIT} ]; then
+	S=${WORKDIR}/${PN}-${COMMIT}
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+
+	cp "${FILESDIR}"/connman.initd2 "${T}"
+	if use iwd; then
+		sed -i \
+			-e "s/need dbus/need dbus iwd/" \
+			-e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \
+			"${T}"/connman.initd2 || die
+		sed -i \
+			-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \
+			src/connman.service.in || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var \
+		--runstatedir=/run \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+		)
+	# wifi USE logic to match networkmanager ebuild behavior
+	if use wifi; then
+		if use iwd; then
+			myeconfargs+=( --enable-iwd --disable-wifi )
+		else
+			myeconfargs+=( --disable-iwd --enable-wifi=builtin )
+		fi
+	else
+		myeconfargs+=( --disable-iwd --disable-wifi )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${T}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process connman_resolvconf.conf
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index f629b1d12db1..217735387d6a 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,5 @@
+DIST curl-8.10.0.tar.xz 2729448 BLAKE2B 18b438c0e4e7b0b698a1fee16406c611124e3d137349869dd8dbb43b5ba45163c6a053e02f665e627424c96e18f8499c13ebe1eeb4c1441936d0183d28696ae6 SHA512 055277695ea242fcb0bf26ca6c4867a385cd578cd73ed4c5c4a020233248044c1ecaebcbaeaac47d3ffe07a41300ea5fc86396d7e812137cf75ed3e1b54ca5b2
+DIST curl-8.10.0.tar.xz.asc 488 BLAKE2B 2b651b074b39eb8b34bc9e46a70d4e6597f04250fc3b5c8f8c4641a022529d176179cc54d9c7dccd9b64c62f1873a7ab214705d6a724928e68b871216658a683 SHA512 3d3ece14008facc373cd715d46eeb523bb17a701df3b1839f0774847692613a9472d3e7a60ba814846bbc8e8e4f17c81a1f1355e1c9eebef244b7cd00e0f6fb8
 DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef SHA512 5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2
 DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37
 DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a
diff --git a/net-misc/curl/curl-8.10.0.ebuild b/net-misc/curl/curl-8.10.0.ebuild
new file mode 100644
index 000000000000..8a7e7125f608
--- /dev/null
+++ b/net-misc/curl/curl-8.10.0.ebuild
@@ -0,0 +1,383 @@
+# 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 ~ia64 ~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.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=( 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.9.1.ebuild b/net-misc/curl/curl-8.9.1.ebuild
deleted file mode 100644
index 29fe1924e39a..000000000000
--- a/net-misc/curl/curl-8.9.1.ebuild
+++ /dev/null
@@ -1,382 +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 ~ia64 ~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? (
-		^^ (
-			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
-)
-
-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 94d88b092468..8a7e7125f608 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -78,7 +78,7 @@ REQUIRED_USE="
 # 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)
+# - 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.
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index f2059325c3bb..fa84c818dca1 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,4 @@
+DIST dhcpcd-10.0.10.tar.xz 272732 BLAKE2B 2ecf52009f3fd4442863e1927a8d9e777ee6f34ff4d50a6f1e67821fb23fd12221df1e3a0a04ea0874df8feac15785772b4aa75af407f74448e442db36410e30 SHA512 87c836731637c134a95ea91d9a3d5c682e6e7f3340961f2995fc84931ff9b2a4c0073aca872a98738dc76005eb1159c42f1044fb0998891386784df299786349
 DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004
 DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4
 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
new file mode 100644
index 000000000000..ec115638fa16
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd optfeature toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
+
+LICENSE="BSD-2 BSD ISC MIT"
+SLOT="0"
+IUSE="debug +embedded ipv6 privsep +udev"
+
+DEPEND="
+	app-crypt/libmd
+	udev? ( virtual/udev )
+"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# These don't exist on Linux/glibc (bug #900264)
+	memset_explicit
+	memset_s
+	setproctitle
+	strtoi
+	consttime_memequal
+	SHA256_Init
+	hmac
+	# These may exist on some glibc versions, but the checks fail due to
+	# -Werror / undefined reference no matter what. bug #924825
+	arc4random
+	arc4random_uniform
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	optfeature "lookup-hostname hook" net-dns/bind-tools
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 56307d8d8f09..ec115638fa16 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit systemd optfeature toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -168,9 +168,5 @@ pkg_postinst() {
 		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
 	fi
 
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
+	optfeature "lookup-hostname hook" net-dns/bind-tools
 }
diff --git a/net-misc/dropbear/dropbear-2022.83-r1.ebuild b/net-misc/dropbear/dropbear-2022.83-r1.ebuild
new file mode 100644
index 000000000000..6c2b03dbdd0d
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2022.83-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
+inherit savedconfig pam python-any-r1 verify-sig
+
+DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+SRC_URI+=" verify-sig? (
+		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
+		https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
+	)"
+
+LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
+RESTRICT="!test? ( test ) test"
+
+LIB_DEPEND="
+	virtual/libcrypt[static-libs(+)]
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? (
+		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
+		>=dev-libs/libtommath-1.2.0
+		${LIB_DEPEND//\[static-libs(+)]}
+	)
+	pam? ( sys-libs/pam )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/attrs[${PYTHON_USEDEP}]
+			dev-python/iniconfig[${PYTHON_USEDEP}]
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/pluggy[${PYTHON_USEDEP}]
+			dev-python/py[${PYTHON_USEDEP}]
+			dev-python/pyparsing[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/psutil[${PYTHON_USEDEP}]
+		')
+	)
+	verify-sig? ( sec-keys/openpgp-keys-dropbear )
+"
+
+REQUIRED_USE="pam? ( !static )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.46-dbscp.patch
+	"${FILESDIR}"/${PN}-2022.82-tests.patch
+)
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+	)
+}
+
+python_check_deps() {
+	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+
+	if use static ; then
+		ewarn "Using bundled copies of libtommath and libtomcrypt"
+	fi
+}
+
+src_prepare() {
+	default
+	sed \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		default_options.h > localoptions.h || die
+	sed \
+		-e '/pam_start/s:sshd:dropbear:' \
+		-i svr-authpam.c || die
+	restore_config localoptions.h
+}
+
+src_configure() {
+	# Notes:
+	# 1) We use bundled libtom* when static build is enabled because
+	#    libtomcrypt lacks it and we don't particularly want to add it.
+	# 2) We disable the hardening flags as our compiler already enables them
+	#    by default as is appropriate for the target.
+	local myeconfargs=(
+		--disable-harden
+
+		# bug #836900
+		$(use_enable !elibc_musl lastlog)
+		$(use_enable !elibc_musl wtmp)
+
+		$(use_enable static bundled-libtom)
+		$(use_enable zlib)
+		$(use_enable pam)
+		$(use_enable !bsdpty openpty)
+		$(use_enable shadow)
+		$(use_enable static)
+		$(use_enable syslog)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README SMALL MULTI
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin || die
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}" || die
+	fi
+	save_config localoptions.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
+}
diff --git a/net-misc/dropbear/dropbear-2022.83.ebuild b/net-misc/dropbear/dropbear-2022.83.ebuild
deleted file mode 100644
index 94e79a2f42d8..000000000000
--- a/net-misc/dropbear/dropbear-2022.83.ebuild
+++ /dev/null
@@ -1,166 +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} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
-inherit savedconfig pam python-any-r1 verify-sig
-
-DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-SRC_URI+=" verify-sig? (
-		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
-		https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
-	)"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
-RESTRICT="!test? ( test ) test"
-
-LIB_DEPEND="
-	virtual/libcrypt[static-libs(+)]
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? (
-		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
-		>=dev-libs/libtommath-1.2.0
-		${LIB_DEPEND//\[static-libs(+)]}
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-BDEPEND="
-	test? (
-		$(python_gen_any_dep '
-			dev-python/attrs[${PYTHON_USEDEP}]
-			dev-python/iniconfig[${PYTHON_USEDEP}]
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/pluggy[${PYTHON_USEDEP}]
-			dev-python/py[${PYTHON_USEDEP}]
-			dev-python/pyparsing[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-		')
-	)
-	verify-sig? ( sec-keys/openpgp-keys-dropbear )
-"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.46-dbscp.patch
-	"${FILESDIR}"/${PN}-2022.82-tests.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-python_check_deps() {
-	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use static ; then
-		ewarn "Using bundled copies of libtommath and libtomcrypt"
-	fi
-}
-
-src_prepare() {
-	default
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i svr-authpam.c || die
-	restore_config localoptions.h
-}
-
-src_configure() {
-	# Notes:
-	# 1) We use bundled libtom* when static build is enabled because
-	#    libtomcrypt lacks it and we don't particularly want to add it.
-	# 2) We disable the hardening flags as our compiler already enables them
-	#    by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-
-		# bug #836900
-		$(use_enable !elibc_musl lastlog)
-		$(use_enable !elibc_musl wtmp)
-
-		$(use_enable static bundled-libtom)
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}" || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/dropbear-2024.85.ebuild b/net-misc/dropbear/dropbear-2024.85-r1.ebuild
index 257cdc04ca87..257cdc04ca87 100644
--- a/net-misc/dropbear/dropbear-2024.85.ebuild
+++ b/net-misc/dropbear/dropbear-2024.85-r1.ebuild
diff --git a/net-misc/dropbear/files/dropbear.init.d b/net-misc/dropbear/files/dropbear.init.d
index eaa3ae2919c2..473c548ba5e0 100644
--- a/net-misc/dropbear/files/dropbear.init.d
+++ b/net-misc/dropbear/files/dropbear.init.d
@@ -11,7 +11,7 @@ check_config() {
 	mkdir -p /etc/dropbear
 
 	local t k
-	for t in dss rsa ecdsa; do
+	for t in rsa ecdsa ed25519; do
 		k="/etc/dropbear/dropbear_${t}_host_key"
 		if [ ! -e ${k} ] ; then
 			# See if support is enabled for this key type.
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 767000aaefc3..473e8b5fff63 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,9 +1,4 @@
-DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-202.4.5551.tar.gz 113668681 BLAKE2B 2590c89af767803b77ff7bd57e4978c90a90be6f6394f7058393045fa4f3c68ae97ab365a460eccf38ab1e0b0a58b0e33aa482348a0bdf040dbe71d0bf683eeb SHA512 d5176c6c4b8f178fced661ef6df73fb767c3e7ff7f111df4829ab258d218586e128acb4187de6d840a0faca5a8766ea97b77c4d5c915fbd944be458ff07b8765
-DIST dropbox-lnx.x86-203.4.4857.tar.gz 113474071 BLAKE2B 109111bca49d7c59d9f7c28b9c012953b8cb01a116cdfe757b0c37b9a168e12ed61501cf313c5b5264fbbafa1528d5e2c884de51c3e3a18318dfd195b14ff7d1 SHA512 54945ecb11094d1a73a96f0469415eee8c2b936a22f8a9410ea5cac75e5eda4b3db72def487eef6f113e6bac7eb656403587fbaab4503bb331032648225660a3
-DIST dropbox-lnx.x86-204.4.5420.tar.gz 113538291 BLAKE2B bd8bb5a2ff327627d9664f93a9c68cc01b6a745b69fa1d312e3f64da7edc9ef62da45807d5fdfcdcad194a5eebf6562b67e22abce241c435c37c9d46d485cae9 SHA512 868350b68e77a91d4a1e74ede5cf4b219b998089956c1827c96f36fd6401a8bf058d573d31485e1ca94e7d2c72a6c20f34563d5c04ed2833971d8f2bc41de08e
+DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95133b5117277cd635c8a77ec3e7ca8338538e5a6a2c4a23f3ef0186184bc1dc770b3c7f3a219f00faa6 SHA512 cd7ad8fea652f0713a00e7fbd88d6c22949dde216040f2ba7c903db70cb6c5c9ec85202831c0863c3bb2cf339b4ea0c6731d7b2d56750b63a4f36160815e4346
 DIST dropbox-lnx.x86-205.4.5765.tar.gz 114089572 BLAKE2B 503650c9fe49c1142872b829892c3759924af57c0327d49b3891f78cbad9b8aa4964861b719023ce5dc837fac98937559635a3e9c16da5b352b104c3cba792c3 SHA512 35715777719c10f38b54e92e24af5d6af85e4caedb7b45bef0693f93d7b0faa0da81b772f821ff4c4a60065e68ac98769cdf0655cce557550d1040f1c765598e
-DIST dropbox-lnx.x86_64-202.4.5551.tar.gz 116236652 BLAKE2B f8a7c45ed45ce70580cb0c2f23e83c06098b8792e4a47b01f8ea9d2b1674b6d6470450edc25d58917630106b9f3ba49c20e87829b2f594d9e3a458d2586276fe SHA512 2d33f9f6d7a8b59f381ed43033c7638a54ae0a84f68845127505f6eb7ef00fbae490d7ba8d4f5e31790a39348612db665591e2785870acf816d60ca6d20097c3
-DIST dropbox-lnx.x86_64-203.4.4857.tar.gz 116080942 BLAKE2B 44b039a1478bc48a01c2a6c81250417c753dacbac0c7b393e2bf5b1ed1fdcb06855432c6f48bdc3d734d036f5f6e769eee6fdc9ac1685d003db711c9a6646112 SHA512 372ebe6a621f9df7143a4f685d9a6c305d3b124813b13514dd56a409ec473240115000bbedad624efc40c36660811e4a347f0847a9c9a1e0e526f20559f3390d
-DIST dropbox-lnx.x86_64-204.4.5420.tar.gz 116062581 BLAKE2B a9740c2c7d1c36fa1b263c65c3bce119e0974409451af0e17038184de4986a6a5349b7b687c4f484fadd8d3698ddeb030358cd22a4a0e28a9d46eb88b64f9544 SHA512 850804590b7fc1932ef421451355e47b55ecf40c1090382317b4dad168f6dad67448ec9df59296da010a50f39dce1e62621177f7e0b3c250bcb1be33daf62ceb
 DIST dropbox-lnx.x86_64-205.4.5765.tar.gz 116601880 BLAKE2B 40fbef3634736e4350d7b5e3bcf70d9daf1524d06b7707a7abeeff53020e2e51e3816a42903fc172ea9b8c721b769450d56cdb3f2fd562e114ce377b8cca4465 SHA512 9b9246ad573f0b04a9a403e6c71e2924da453f448a69bf8e24b1d662a80461b19a8fb75d29411006cf6b38b2227f4e5e94c57f481612d89621fc2ce985d8d450
+DIST dropbox-lnx.x86_64-206.4.6506.tar.gz 116749927 BLAKE2B 231172bf0e51e6a316b76f21043258f99e3f771a241983848f0551db60189a624239e9cdd3110128d499028203d3d4511026da91c371da4ba73c6046ae2ad1b5 SHA512 80dfbefe898819f5880433aa87c7bdce52555c59173c01eb4dc464f12805aa14ea4d2f0dbcd31731d694f6151c3ec14f9e62db1b6ab35d4fdac3cefabd2660aa
diff --git a/net-misc/dropbox/dropbox-202.4.5551.ebuild b/net-misc/dropbox/dropbox-202.4.5551.ebuild
deleted file mode 100644
index e90baaad900e..000000000000
--- a/net-misc/dropbox/dropbox-202.4.5551.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-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}/DropboxGlyph_Blue.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-203.4.4857.ebuild b/net-misc/dropbox/dropbox-203.4.4857.ebuild
deleted file mode 100644
index 7d9715a71882..000000000000
--- a/net-misc/dropbox/dropbox-203.4.4857.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-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}/DropboxGlyph_Blue.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-204.4.5420.ebuild b/net-misc/dropbox/dropbox-204.4.5420.ebuild
deleted file mode 100644
index 7d9715a71882..000000000000
--- a/net-misc/dropbox/dropbox-204.4.5420.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 desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-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}/DropboxGlyph_Blue.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-205.4.5765.ebuild b/net-misc/dropbox/dropbox-205.4.5765.ebuild
index 7d9715a71882..da3bda691687 100644
--- a/net-misc/dropbox/dropbox-205.4.5765.ebuild
+++ b/net-misc/dropbox/dropbox-205.4.5765.ebuild
@@ -10,12 +10,12 @@ HOMEPAGE="https://www.dropbox.com/"
 SRC_URI="
 	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
 	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+	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 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
@@ -89,7 +89,7 @@ src_install() {
 
 	if use X; then
 		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+		newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
 	fi
 
 	make_desktop_entry "${PN}" "Dropbox" "dropbox"
diff --git a/net-misc/dropbox/dropbox-206.4.6506.ebuild b/net-misc/dropbox/dropbox-206.4.6506.ebuild
new file mode 100644
index 000000000000..9aafe425d4d6
--- /dev/null
+++ b/net-misc/dropbox/dropbox-206.4.6506.ebuild
@@ -0,0 +1,109 @@
+# 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/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index 47b0f42e7e45..c8d0fa69ffca 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1,3 +1,4 @@
 DIST ena-driver-2.11.1-linux.tar.gz 1441591 BLAKE2B 39db9d21efd0d7f810304a1be0be13dd0c944419a9e5aee5a60c3dee310f990af9787cb297e36e718aa3f62ff3a7e9ce4e8302a19efcc3b151438869827b540d SHA512 f27c556a902ee276022ddafec7cda70790280587f470968f233e3de09a7dac3b49f43a2b7dba1018489c9ff5f0f554201fe63b82533c6a627b7f533c2b4910c5
 DIST ena-driver-2.12.2-linux.tar.gz 1444018 BLAKE2B 54223073bb096e8b6d29dc7bc8c971f5b99dd8803d5ece5e631120a9b2b8d180742cb74d5986dc163e3de53f223161dedc61102def498ea6274f117ae9508055 SHA512 93cb93c78aa409a1f9c3d542e1271dda9630641ceb32ecd2f69b69b380cf9625e1bc89721726ffcd3f64ff538df87e276748c5c7ac1f625a171624ffff776b6a
 DIST ena-driver-2.12.3-linux.tar.gz 1444176 BLAKE2B 8dedd042d912082d60c29aa121b09e9d18ae7294257e217ac17970ea34ef0b7871d4ab87995f5cf59512174288e35d2c6bdd6aab3cd04c972e077364f8a4e9da SHA512 e1afaa3826e0b89c0cd07293ee300f14e452018e06ea7ac2048e4015c1d7115d3f1f112bd3897c6cd177314d6ebb63fd3111d1b45c76f9bc818dcf30d3ecf1cc
+DIST ena-driver-2.13.0-linux.tar.gz 1450959 BLAKE2B 3536d976505de48f64ad33bb30269dbc090631e862c68c250f9452e5537018f86ecb93fa2272a812172c9145d33ecef7e82a1cee3cf86db53f520f6e2b3d3545 SHA512 2be761afae1374ab5d8043d01d8521c21c944d8e6830b0cf24dea6e51a4b2e1751d5521ad261af9eebca819c9c15ebcec5a84b51af505df7bc9cd99ef0350939
diff --git a/net-misc/ena-driver/ena-driver-2.13.0.ebuild b/net-misc/ena-driver/ena-driver-2.13.0.ebuild
new file mode 100644
index 000000000000..3d3ab17ac267
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 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/freerdp/Manifest b/net-misc/freerdp/Manifest
index 5363c7cee049..0b3e2356f48d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -6,3 +6,5 @@ DIST freerdp-3.6.3.tar.gz 10199503 BLAKE2B ff4c76a7f2d808db09d22b6cf79caaa1f1aff
 DIST freerdp-3.6.3.tar.gz.asc 228 BLAKE2B 4ea04f0d662afef34d61f06d36f3bd6f872f2a7cd8095df581f489306d88a761921a0a93325bdd4c5a627a1c47c612652697b9dc3338ebe0ea952a65b0783cc7 SHA512 6568362c2ad1032925e7dfcd04977c56a58e661b8eacc79d6d2ad77bb9e56d3dff3f13d004d50a88827aa9ccbd2f56c1019a53e18bf35856dbec81acba1dc142
 DIST freerdp-3.7.0.tar.gz 10223833 BLAKE2B 6d1fab8a88dd9113c6daf0d609cac006d1303f30dd9a9e4b9a8d9d78df64281c86c3e30142be82b7e696983649114f31b9cbd35773e712331bf522a2928cdde3 SHA512 6af8962549bd259f1fb4ae15e60562602cdcc8a4492f35c93e2da45c315abdcf7c78f0525a5821a829f811fb759730a6980ee177d3864989701873ad70189f74
 DIST freerdp-3.7.0.tar.gz.asc 228 BLAKE2B 87cd5f8cb8286eaf108098ee8baa7ed7c6e05b0d3e78050d16f96f6327c40f03bbe96b6aac719a8203240b4eb02e175daad57189dc7e0a0e022b02372aa69d6f SHA512 b62cf129db113ae727669f26de8dc971e33b78cf0b83e5f84a518c30366ff74c14675701870e9e09aedaad23000b3316a04a76cb7df475f3e4d5465f206b0e30
+DIST freerdp-3.8.0.tar.gz 10235403 BLAKE2B 96a788e6f394d21cc57c8dc729d1fe5f80b7dbd0119342358a59b63dda7e9e687f17aa0b6c812c33f4a3f3dd34c067e1206418083d2b61b3e5d20b75e6846093 SHA512 ebe724930ea56890a83514496bd11fcc6f77f170a3bb3de4b62506fa2e8bc919cf8593d7e93a9a421fdea22976ddc3f3dbd921fd9e0fb3c7dbd288e387a1c238
+DIST freerdp-3.8.0.tar.gz.asc 228 BLAKE2B 442b48027cbb7fe8cee9a2599772d317f003635939c3f8201097fefd0e2d2f5ec8776a18db23cac47f153c02864b976893f2fccb9050c638f0b94d7b98b5bd40 SHA512 d6be8aa062544b6cb05b39b4036da5403786d02db1ccf11363bfb9ef71c64703051305dfd3de46ac8ec986a664c849521f22d3061112c851a7e40038b827a3e6
diff --git a/net-misc/freerdp/freerdp-3.8.0.ebuild b/net-misc/freerdp/freerdp-3.8.0.ebuild
new file mode 100644
index 000000000000..5907f28cdfca
--- /dev/null
+++ b/net-misc/freerdp/freerdp-3.8.0.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	inherit verify-sig
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="https://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+	virtual/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib:0
+	aad? ( dev-libs/cJSON )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	fuse? ( sys-fs/fuse:3 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		X? ( x11-libs/libXrandr )
+	)
+	icu? ( dev-libs/icu:0= )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	kerberos? ( virtual/krb5 )
+	openh264? ( media-libs/openh264:0= )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? (
+		media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
+		media-libs/sdl2-ttf
+	)
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	client? (
+		wayland? (
+			dev-libs/wayland
+			x11-libs/libxkbcommon
+		)
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/freerdp:0
+	client? ( !net-misc/freerdp:2[client] )
+	server? ( !net-misc/freerdp:2[server] )
+	smartcard? ( app-crypt/p11-kit )
+"
+
+option() {
+	usex "$1" ON OFF
+}
+
+option_client() {
+	if use client; then
+		option "$1"
+	else
+		echo OFF
+	fi
+}
+
+run_for_testing() {
+	if use test; then
+		local BUILD_DIR="${WORKDIR}/${P}_testing"
+		"$@"
+	fi
+}
+
+src_configure() {
+	# bug #881695
+	filter-lto
+	freerdp_configure -DBUILD_TESTING=OFF
+	run_for_testing freerdp_configure -DBUILD_TESTING=ON
+}
+
+freerdp_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+
+		# https://bugs.gentoo.org/927037
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
+		-DCHANNEL_URBDRC=$(option usb)
+		-DWITH_AAD=$(option aad)
+		-DWITH_ALSA=$(option alsa)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(option client)
+		-DWITH_CLIENT_SDL=$(option sdl)
+		-DWITH_SAMPLE=OFF
+		-DWITH_CUPS=$(option cups)
+		-DWITH_DEBUG_ALL=$(option debug)
+		-DWITH_MANPAGES=ON
+		-DWITH_FFMPEG=$(option ffmpeg)
+		-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+		-DWITH_SWSCALE=$(option ffmpeg)
+		-DWITH_CAIRO=$(option !ffmpeg)
+		-DWITH_DSP_FFMPEG=$(option ffmpeg)
+		-DWITH_FUSE=$(option fuse)
+		-DWITH_GSTREAMER_1_0=$(option gstreamer)
+		-DWITH_JPEG=$(option jpeg)
+		-DWITH_KRB5=$(option kerberos)
+		-DWITH_NEON=$(option cpu_flags_arm_neon)
+		-DWITH_OPENH264=$(option openh264)
+		-DWITH_OSS=OFF
+		-DWITH_PCSC=$(option smartcard)
+		-DWITH_PKCS11=$(option smartcard)
+		-DWITH_PULSE=$(option pulseaudio)
+		-DWITH_SERVER=$(option server)
+		-DWITH_LIBSYSTEMD=$(option systemd)
+		-DWITH_UNICODE_BUILTIN=$(option !icu)
+		-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+		-DWITH_X11=$(option X)
+		-DWITH_XINERAMA=$(option xinerama)
+		-DWITH_XV=$(option xv)
+		-DWITH_WAYLAND=$(option_client wayland)
+		-DWITH_WEBVIEW=OFF
+		-DWITH_WINPR_TOOLS=$(option server)
+
+		"$@"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	run_for_testing cmake_src_compile
+}
+
+src_test() {
+	local myctestargs=( -E TestBacktrace )
+	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
+	run_for_testing cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
+}
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 51aab209a2db..5907f28cdfca 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -120,17 +120,27 @@ option_client() {
 	fi
 }
 
+run_for_testing() {
+	if use test; then
+		local BUILD_DIR="${WORKDIR}/${P}_testing"
+		"$@"
+	fi
+}
+
 src_configure() {
 	# bug #881695
 	filter-lto
+	freerdp_configure -DBUILD_TESTING=OFF
+	run_for_testing freerdp_configure -DBUILD_TESTING=ON
+}
 
+freerdp_configure() {
 	local mycmakeargs=(
 		-Wno-dev
 
 		# https://bugs.gentoo.org/927037
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
 
-		-DBUILD_TESTING=$(option test)
 		-DCHANNEL_URBDRC=$(option usb)
 		-DWITH_AAD=$(option aad)
 		-DWITH_ALSA=$(option alsa)
@@ -166,14 +176,21 @@ src_configure() {
 		-DWITH_WAYLAND=$(option_client wayland)
 		-DWITH_WEBVIEW=OFF
 		-DWITH_WINPR_TOOLS=$(option server)
+
+		"$@"
 	)
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile
+	run_for_testing cmake_src_compile
+}
+
 src_test() {
 	local myctestargs=( -E TestBacktrace )
 	has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
-	cmake_src_test
+	run_for_testing cmake_src_test
 }
 
 src_install() {
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 09893092e163..46b77c5b9d07 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,2 +1,3 @@
 DIST gallery-dl-1.27.1.gh.tar.gz 686087 BLAKE2B c80f37d314671637f435957abf9d79d01d421e48c89e90a3290e6fbf6e32f89d4b7495deeaf2ce0528750b65d4b404108fe78bc42f0e39dda4bcfd4267aa9dff SHA512 d3243bd23e7a743d98b9745d78b653546a49a97dd8468b60014fa6ba74071de8057c8b479dc3d74854b4c194034b027fe15bc530a60dea34dcc6221b105c285c
 DIST gallery-dl-1.27.3.gh.tar.gz 699804 BLAKE2B e1ded03fe94abcc442f4010e7e4cf51fbe1724543544761ccd318e61eb33146dbf25229d50123b9d0018b30dc6bffb895b022b61f6f5937dd77ea85f689206f2 SHA512 3fdee99af361364f7f1a207378c07efc24b3090f721da1dca3391972bdac4f31823e6711ac69ca6afca8de23fe276758af910179d511f739ec43b4408bbab6e6
+DIST gallery-dl-1.27.4.gh.tar.gz 707554 BLAKE2B 09868291bf01db3db9bf4521a39a2443c6fe82cbd68f5840ff0d14a911bee56a649d89fcec3d2e705b0cabc54c18a0f04eee2fc8bb40e3b99803ea393e5d35f8 SHA512 7e22abbe77929ee4ef420f586b018796c00b8dc18b7ea709fe85bc51ac9fc467ba8763fcec4ab2afe108fd0fbb9002980970e037e1af2408e9c6504db1891220
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.3.ebuild
index fea34fbde450..64a17799c780 100644
--- a/net-misc/gallery-dl/gallery-dl-1.27.3.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.27.3.ebuild
@@ -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.27.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.4.ebuild
new file mode 100644
index 000000000000..e06bebddb525
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.27.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Tests against real servers, some tests always fail and some are subject to change.
+	rm test/test_results.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/yt-dlp
+}
diff --git a/net-misc/geckodriver/Manifest b/net-misc/geckodriver/Manifest
index 3f261f93fecf..5b65c43c6003 100644
--- a/net-misc/geckodriver/Manifest
+++ b/net-misc/geckodriver/Manifest
@@ -1,51 +1,31 @@
-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 ahash-0.7.8.crate 38550 BLAKE2B 0fd5f220c15bc0a1aa2e95d13477bcc832d992c6406f9da0994ae32419e440a6f7ef84c1a7a1242d5904dca5d91206602d943ca81b444f46d2eb91d55844baea SHA512 63677b2001d633ecabb36c08bd92e00b5fa71f24aed1c4601d12d846ea06aeaf093c37cfe1f6642147800caa6c749e9a202aa21f9ab4799efa379ad0d952a2ee
-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 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 anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3
 DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69
-DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST arbitrary-1.3.2.crate 32037 BLAKE2B f8f6a10a8f42f14eefaad4348b6ff200d0c2fb22faa7a2876247228046359e39c555f3170a1975f64f8537319b97c7ce2030dcab3614229c8334b5d6f9248114 SHA512 faab26c44f25d2c7298add2a657e4010d9fe24b3a61e2270bc6feac05cf2a82895fe225d2fb1c6b63e6c7da54e061955503f39322b96dbdbc4916601bd5e5ccf
-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.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
 DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
-DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
 DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
-DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
 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.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
 DIST bytes-1.7.1.crate 63623 BLAKE2B c399f7f25b85ac284bd2f139d895838eeba7deb56d109c8579966be4b8a7a56bbc26f9387bd0bef9fe5449d5e2ae8d11b254a7ef93048a4827d945ddddb5ce09 SHA512 04cb5bb1718ee378be1d9d56aef2d117ed561935ddadd78139ef2839f998e92c88369c79560bce9d23246a3ebda1dc888af373f9ad4827a0b9a249379bc71e81
-DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cc-1.1.7.crate 81694 BLAKE2B 95f2a266cf4c42cd4212cd07c0fc436400affbacf66c4a089359fcef4ec5c51c727ac6f3876515ea3460076898a0e03da6647ed0d2e67bee5d151194dd47da19 SHA512 2c3b3d99b292ba44b4805f4a77daebeae054267755a08b1a2d5583f89ba1cf01b42e9393279c8f37f64998fd14c9648dcdb41fa5b2390c3c4442afb484f624ef
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
-DIST clap-4.4.12.crate 54784 BLAKE2B d5825ac67b7b7f1567024d1d3c2a54027819e0d6da87e022ec02867060952d2727f9413a2cea8ba11185649c25863a506e1fdd9421bd92eba79399fae86eaf02 SHA512 003c7ee7b71254a1d8977282bde75b57a8e191abb0439f66695c047cbe63ad1bf7ab1a14ed79b415c7bd6144f82d49a77325f618a34c932f258bed98903bb97c
 DIST clap-4.5.13.crate 56267 BLAKE2B 233f2fb4405ee2ff669220214c13b6c94858dbc375c8bf7eb83d7488690d74ebd8e1514679e02d1354b493b6e37fd7ed4b2ae32065d115a7287014aece90c2af SHA512 dd1a42ad3bf39463966c2ef76f3ec2dc5a847160bcd73de1718bd6706790f1ace183e3c9e6ee8d06f6ddea4b9bf30c884fa97d36b44f30dac26a85a52d9a0025
-DIST clap_builder-4.4.12.crate 163345 BLAKE2B 37e655a7c9ca21dff4445629e041d5ae2aec1ef0d44e21c09dcb860253c3f52d04dc2bcfd37e2ed7e9839d5c01fa86bb2613d5aba1b4112cda51e879f35f80d2 SHA512 7edcd85a45f17d4f6f87e463bfd9f5e0348067907b13a1f625007f0527544af21476b3805988e2b6f5baabce8ab5deb08f80b3d94ab5d5535fd310c6c668a21e
 DIST clap_builder-4.5.13.crate 164093 BLAKE2B f938635782ba9c1a675bc15a73a36ee7f1cbee501dd10be6f267364fde125c75474e5abe226e0eaf0c9fb224887c65bbc1be4641ca093282d3042f9980f4ab94 SHA512 ab7a29b29a15d22701550fc590ca6ec256edf03828e2b9a87072734a8f66b6e5a1843ac2ee7856c62472960af4e8f40840f840adb78ce5afca918f333e0f623f
-DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST cookie-0.16.2.crate 34632 BLAKE2B 095c8c4fbd8bd2aca5f1bc2bf7f37f231878e3ea9e2646e7c2e63bc7ff824ed0a55f80216e9d1f0466e6fab306a0f211d08c093278f4f23c07762ded9e2033c5 SHA512 f006bb19f63065c6ba9a7553c1d97643e261723f3d5087586811acfe595b3c7d90f7e5c83431a44a50d0b4a36667635ad09e5cb307e323cde14820dfd38e57c6
 DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
 DIST core_maths-0.1.0.crate 5807 BLAKE2B ae6308342e1d90ed2924c6a92dcfffb0284825c0de95061402294ec052f4cacaca6033d27370557c2620ddd6aa7907f492ea2e5aee95cfeee542ca9f4fd6aa9d SHA512 48eb120f4e48721100215cebe703a71ab0ab543206c5f9b806c3727a2dedeb4df0d5d9bc733eb5cf6c556833b23b8280190deaf6ee0d583e697f02d9f23da35c
-DIST cpufeatures-0.2.11.crate 12727 BLAKE2B 5b91dffb779e437606db9b75d2b05c2de19069575a8272112e9a0389f5bd8de0f753cd90330b5a5bb6a3f84c9e794e96328664557db31c43853ba43097229efc SHA512 af179e269a4d5f48b50134a5e98ac541a9a0d6aa34f13fb8fd9ce8d5092352e1b322437254449ecb1bce608d8558b1cca2c79232ac1327efd887193bd1d36031
 DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
-DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd SHA512 c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
-DIST crossbeam-utils-0.8.18.crate 42383 BLAKE2B f0b58626f3d40c5a889572e0f5fdb468e4c13ce0afc09aec1a75e1c5888cab56fbc644f592c620e1d28aae79687c4446146d9f783d96f8bd177d0a4a559fe8dd SHA512 977f41d7596a8d206fab665570f155479e15a83698fa54e714305d56ce32d78abc6f778b5f6e3c379ed1da27e241639cf4d0cd12922383f774ae85b32a4dc550
 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
@@ -55,11 +35,8 @@ DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948
 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 fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
-DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
 DIST flate2-1.0.31.crate 108176 BLAKE2B 2b0afbeec9ef08e54bfc572d7a386052d519d5bdeb220a316b67409403d229425580e33991f0a98536e6468f0e59ca87b59ff2d00425749336d4e68906d5d787 SHA512 b211254e15b38663f080552598d61d6766d6e7abc45cbac8fbdb5af65b833d2d3fbc00b5748ee12d4fc71726ab84dda9da20b6916121735c7b1c6c9d7a09fa61
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
@@ -70,30 +47,21 @@ DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28
 DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
 DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
 DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
-DIST geckodriver-0.34.0.tar.gz 109474 BLAKE2B fd2b0815b02668eafbc4fc37e81d7adcc7466b366edcf17c50b391a1f1dc466b1e64925dd589c75f8d59d4387ff2285141130b8432f778238a1139070977a221 SHA512 4ef85427db7b3c8a3171d3c9808eb26ad276c734829d3916e1a6b937294befe3e6f0c3980624a21005433aa5caaf270746ce0a383c3fede3ba77b86f6f862b0b
 DIST geckodriver-0.35.0.tar.gz 112565 BLAKE2B 87928336a2ff2c4da9d1cdb29a36ce05ddb495284e382e4a724413c4c4e0d0b1ef8e1640798c1ea318c82b836328d63114241a7607f2df2c33a7fa11ef7aa04e SHA512 17518966b847cca28dd879dd7aedcacc9b581367edbe78261b9cc3023f6013d185f16066252118a2de49f3286cba895022cdfac9d5928f9f6e4f03d645ad84f1
 DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
-DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
-DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
 DIST gimli-0.29.0.crate 275756 BLAKE2B 092e5bce9503a337451f63706e7ae7d12a4228db6a43d2c14fa6af74640a790ec70ea2055ac84db3919d19612ee6ee0453f64981390667abec97637679ff06d3 SHA512 a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446
-DIST h2-0.3.22.crate 166413 BLAKE2B 058456b6799d1ff73dc914b37279c4ad2cf5f8cf4fa2532dc6e1fab76c3f8ba67589c3fd481f5fb02b2df3927ea75c8a4c359943565ef81af6d5759bd679fce5 SHA512 70cc7e246ac554c9a15bf2d53a5473e878f426fa426fa266fd91fc2ebf4071b7b207c4f7f104f84242f6f9163ff4c790432f73b61b43e1ef5231b0ff424ceaab
 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 headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
 DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
-DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51
 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.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.30.crate 198175 BLAKE2B 9aa000132bc5db1cf566df48d243484b52a099d47d68aa2fc02d11455f3eece99f6a954bcc9900c0173cb39f145d371cf97b024517aefee4c7bea7746f800dfd SHA512 037f19ad0ee461dede269acc634955b087cc021abe52053de74805243621e35037b4968e20fa0ce7fcfd83ae05bf485c8003cf1df55dc30bc4cd64e62fcde633
-DIST iana-time-zone-0.1.59.crate 27033 BLAKE2B 5d7c9fa38c85a99ae9da34c881e1b6b626c6a1356d7de412868a26fbb469bdc8408a0baac4fc940354d5223b3004924819a1d1663b129d9addb22689a55f900c SHA512 3c9da44a31423b451cda42b1fd340b29f18c05fc88f4e3c5b0ad5d1e6cf426691cc87b7ffcb9f47c12c4e8d9a3b504e44edc7f6975b867cf8612e93e6eac1f91
 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
@@ -104,135 +72,81 @@ DIST icu_segmenter-1.5.0.crate 610798 BLAKE2B d0431427f79a943539fa43dbb66e97d00a
 DIST icu_segmenter_data-1.5.0.crate 3384822 BLAKE2B ca6e049f8563d365130b3fd6e7fc4bd84fe701a8eb23531514ce7afd5f56ebe078a106ac06d79145406b6c5acc824e5f8f68f046a085b156648b1b09ccb80bcb SHA512 517b1fdc488a136ebec32e9e356c7543c857f37fec897d778de7f39baf0f173772cd873cd81dec8156d8eadc83a74c7fa35c3c340184a7ec84363ed5702a0d92
 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.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600
 DIST indexmap-2.3.0.crate 83027 BLAKE2B c42cd83845923e68f9035de2d0645dfd5f37edab8b5f076c5d578867e721403b71cc48c5a68166e03688be96995c73cb81d0f2583aae8e24eb554a432854cf84 SHA512 035f76873c8f94dc0ebf8e2cd29c157135a1a6b5fe042997bd30a928227f6257a19dfbc43ea9b50cee425fabdfbe0ef6704627126ae5cc937855d6c91fca0958
-DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
-DIST js-sys-0.3.66.crate 80765 BLAKE2B 366f2741a1f7bc76f78068e183080bc221d45fb9adca257da61fd05a3f9044b7c6dd9d1c317e29af30effb28fb969bee2f766ff348f14d9d036f1a7e6bc2e599 SHA512 7244c856b2455d441e02eb12227517a101af28596d676797ae45098512052c09650612a93d912378d27254c5ac64dba9b37057c7493c1e3d3e0d52b2169340ac
 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 lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
-DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
-DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
-DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
-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 log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
-DIST marionette-0.5.0.crate 9683 BLAKE2B cd0205fc7d3951467ac73289a405e57dcede6aeb29d4a52886249a17f2e48f6f90f6fd3a0d886cba44aaf6bf02010306fb03a50589303bcc0101c03429c0ca39 SHA512 ccb3ff896b931601de72bd1d6fc2158fc8af61efe26b33c5a1896639ed2178e3afc3dd33eae2d8a9b19107b5fcb8391a854fec743b3a2e1d2d6b04024c28c210
 DIST marionette-0.6.0.crate 9623 BLAKE2B c3683cf31df84a800ef7e73582a7ea7d48cfb9ca69e5163450bd8b9186540eb917fc1d704f1c46a0deda6846ce880c69f0110f99043f0448271fb6b71c2ee2c2 SHA512 3cb1638ff47ecc43630922705ce8c54e277b1313f521bf00a92e91af6f4b520bc28e6c64baccbde363802cec42d4e2d08c2b96ef697210ff864167f06dd5891c
-DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
-DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
 DIST mime_guess-2.0.5.crate 27166 BLAKE2B a8ec67e16a336e7d07c9aaa55025c24c3d4a62aae25213ce768786d9f292b76930132a880d662cd9a5d63aa899e9d488ab76fa9d99350e9f448ef484705ba4d9 SHA512 433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c
-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 mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
-DIST mozdevice-0.5.2.crate 14449 BLAKE2B a3119d355da681ca8abd7db5ae655ec654a271696e0978567ad07d1ac08e3e80548908c995103024f03a20fda42aeda186dd0a77a977b29c1ba0dca23fe23163 SHA512 bd63863bc711083a047c38b2856870ba88bf6d678e050d02d6775ce4956adb70e0d4ec3e6ffaa271f3b60c583c62cb0595fd7637e8a4e096d2f6976e95d36085
 DIST mozdevice-0.5.3.crate 14497 BLAKE2B 1d8edccf7f686c45a3fe81c40680d81312a143fb316640bcc6fb81c0edbe09c6ed1890da632074d58e078deceb6fcda1b1c7558a90e099ec768766734824005b SHA512 07dfb6294e4df7b7bf0fca13ce0fe97d0fb53041cc6529a1a3692ac5f9805f92d8c649798944fe3950f6edb19f286ac5c46f3b3c957cbd9a74f50d676f63abc2
 DIST mozilla-central-workspace-hack-0.1.0.crate 3123 BLAKE2B 00c3a1f47dbbbc54ce0259c1f3e54a23827990925d03b8026185c0511a951474bfd2370b1adb66e77f43ce1ed53b4811c786891d0c95db66ef930b5955254525 SHA512 a67540dabcf667af04ad91ce784ba911fe363989e866d2e346252d1715465c0150b0e1fd633a5e36f5547b09bda0342cba92c2f6104643f7ec9fde95230cfd55
-DIST mozprofile-0.9.2.crate 9786 BLAKE2B a5e4e20c11ba6fc009c40dd0b5606bc3d6360d35e6bbed4a2ff7bc8b761e94845ef4a981012fc13130325c6ff9c9d5d86ec4b90f0e930a1888c8ac091c2f2d34 SHA512 031ab3f61ea18d0e23ae2f0212eb6c72984f19859c738ba240a49217ef83aeeacc6f2e4038421b25bcb97001a214dc91c969236485f6af95d0fa3994280d188a
 DIST mozprofile-0.9.3.crate 9838 BLAKE2B a7980c810e381bf6984f25865907688943f09dab5cc78d09f0b0bf4241ae1b2a9f1398406fb84ad9289c438f56093330a8d849307c1b31fc3eacaedb71b59256 SHA512 c8e92a348482c56ea0e6eb5027f2e7523a1a27f5e930632588578fc935f3cacf1f70463f2968b39dfffa91dc698135b45ccfacb6ed54f27202f96bd538b2f521
-DIST mozrunner-0.15.2.crate 12767 BLAKE2B 791aee5dabfccba57f711678f5e62780539867de5d5e221935ea3f5c0d19846c1bf11551a8569f7dde07a0334c2f52287dda735c00559c22be65a1ef2abe9c2f SHA512 39b9f52b462af39fed42c5a3db0bf4e7b2582ea788710dae8182ee50f608c8be16b2d5d11824911d47e4183878a5bc8660c1545afdfd4254487cf1e222cf0240
 DIST mozrunner-0.15.3.crate 12707 BLAKE2B 29d773cc1dbfb4a98f9bc1c3b3998c47ed2e3e0bbf71b57a1912acc46d84a20b31ac391ae794c3314ce8cf402affd73a35aab82384d758f4afb65f6abc1fbc36 SHA512 4f62449d86a04c15b4988cbb22b92d4dfc828f88eef035f1a5acfbbbbcc9efb4c62740cbda3f0d51bdf7b486c9430777f606e6591037aac3a3ca9950a06f07d7
-DIST mozversion-0.5.2.crate 4126 BLAKE2B 0d8c72c1f5fe474cd46ce654b835169845bdda568ad945df8b7f30c098cc649c72f86f11ee0ded0450faff3a8274f3bd3436b3a819cab1d8e62d9399005aa026 SHA512 7def4945e11aee02464c1cd11e5954c442101029e546859a72c03c12459e2486f874d24bce2b0daaaed3e4a02df8756f8688f323df9f403833633fedf90897b4
 DIST mozversion-0.5.3.crate 4181 BLAKE2B ca822d3388a48c13b143b85a65d284659e95589ab381c3d76a87d0fd3e8d8f2c7ea512a6d0b8ac11d5019cc7737c0914065e290494ff1d238fd6055af9ff916d SHA512 46303399070ff532c8c12119f80a018b204920639ed1d82219c75960b3c85fc1a5243d8f48234698c5603d1f7f8f39f79c5f8f69e0c05f45475d4947e842d120
 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-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 object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
 DIST object-0.36.2.crate 324577 BLAKE2B 8e2c07215088639aa2727ea2ed0833bc6634186fcb4b6accf725059a20fde4394789b88c314b19483fe240b73fdcefedaccd7afcae529c658724083b035536dd SHA512 f5adb662c0e6e184a75c14181d70f3c9d8d6f4002fcb9082863c9c7a28f36d35464168c7447e63316c0227d38d92eec73240665afdecfa574eb625b040854ef9
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 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.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578
-DIST pin-project-internal-1.1.3.crate 27824 BLAKE2B 23b59024481710102677ba35aa8db8e27f6ce0973941addc11bc8a994031c2a4fe04cac197f04fb13c61110e554953883f50b4df15dd632e4c59fc8422fb26b0 SHA512 d2aef23074cdce910fbed47130636dfe3fcb6ab255c6fb4ff822d364d54d181f007c80755ae6f8c7519054888c1a763738d523217a8157542aa35007a77f2288
 DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
-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-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST plist-1.6.0.crate 47932 BLAKE2B 1996f016b12205fee8a22d52e78d5fccd309407728bc7ef516d7c54e998e76051f405032cc9fd72b8f2d81d509ce6e0aff28e088fe97e1f222e5af0f18a43705 SHA512 025f7a04cc0f16a3f44af0c63b5fbad49bcb7227460ba4e7849499a4436836b86d331c81c936ed246ee700fa2556598f9f745c1d2bf5196e0222625db0a2633b
 DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
-DIST proc-macro2-1.0.74.crate 45383 BLAKE2B 926802f43624216a01d355f78e0d14a113b72a2d01cf0a754c7dc29f3722a394546184e157c9a3475de495b8bf8f824847812314d3620d8ea083e53d9419a9c3 SHA512 7bb247f7b0274f4011032fad056bf5c11f2887364479eb997a62ca5659c0c8b1949f020bc9d1c12a50e5bc6ce03d025be55dd1a1c68b3377eef4469af6514c3b
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-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 quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-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 regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
-DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
-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 rust-ini-0.10.3.crate 9938 BLAKE2B dd8956128b164de522b42d6637f984a5f97a1f330afa92517c6a2c459435fb972f39517d036413423c5629bfaa3789a1d7406d66d10e2fa6dd3bd040777710ce SHA512 0ca4cd15d81ed8c5cdf659e6b5ec91bc6a2e014380d6891936711d2ee2639dea3141f825147e4fecd21205fb1df95909798272368a50db5c69e7ede7856b8169
-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 rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6cdc49963277bd7a58ebdccaa59c33710ee625bc0a07fe2102f370e39143adca0651d123a0dfeb562d32e7a537 SHA512 a48c959c0fbc9700294b1ab0fb71a303bcef89a01b4407c2d7dc7c83b35dfbdb69bb6ac9a364ba7d68b4e561445e6c227af586cab15d9799de9e6622e89ada12
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
-DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
-DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
-DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
-DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
-DIST serde-1.0.194.crate 76863 BLAKE2B f77db1450d3be27cd2304433d2964745c0de0752c80f4aac03017f097d43470bee8e45af82934b77c182e1a6bb08b39a1008145ebf399bb86a0a2cf5483d4c2f SHA512 8bff0dce77f270303c5a14f9b41bf8f955efd4c794bec2b59e8e0cc1940ad462abb8711cc1a8e2ff6f51cb3ece354be526f81cb27350e0595b92c66a5acde7a9
 DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde_derive-1.0.194.crate 55685 BLAKE2B 18e8e061be5f9085c2f0bf8e44baeff2a50248f26365b1a4cf5d64aeec518a0e11ea610bc3cc28965dba69c658e6d645e5c1ca6d5d4714000ead3192495bf8d7 SHA512 4219d286d279aadbc5791f4a8bd922a302458ee5056e75052d4653024b9ec7353c2337dc8ac716488d603aa791c5d848912ed0ef90bc235c4e9d47629245ab02
 DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_json-1.0.110.crate 146448 BLAKE2B 9fb35fa711ea16660bf433dfeb02475b15f216c8f579f70a131a6b7d49cee95e74f88b87e8ca50d1ab35e43e2a5e36f4562f5e3bbf5e4f0da3e2f6c7d5df50e1 SHA512 fb163784981093f30de15e920aa68c8e58179ddcb536d5cdba2318d41f88529c30b8b03193a6900efe954dcd933d4577422756670f4df8841ca70a1196b31284
 DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160
-DIST serde_repr-0.1.18.crate 9974 BLAKE2B f6a8b2c8bc759bc8cfb3826489faf67da13b1cbe2432c30ec877036924869b9cf7c1ead2809b8e5852e352b51c91f40fa892ca68832ea567e4a7df29f8590a98 SHA512 09d77ccc60a748f8c95998632459f52268cf45949c0e22250f751eeaceb7336c03a457587af7bdc6fbc188cea4e15e77c8bf63d9741a9ae31fd0b8e787cabcde
 DIST serde_repr-0.1.19.crate 9997 BLAKE2B 1bfc8e94b8c3cf897813f4749d6a1112c1097c2c257821eb366073a41ac46084a21bdc0ee4e3b99d82444619a894472e24fccb60cbd8a41ab7d5b0469cad7c41 SHA512 678216a62702b3300fef850f10ee60d88f31de1fbeb7300e3fbbdc4e4a9cbc95c6890c8e7b9385223ec837d9504edd53e69b620f80609e54579c0994ed1ab0a1
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 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.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 strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
-DIST syn-2.0.46.crate 250537 BLAKE2B d963daa4b6bffb4de6823cc2e37bece7266f6fb4415f32cd0c33a2840870766e04231ab6ea2d7d09b0886797bce13ac433c8ad30a541e66a98c221b42358d8a5 SHA512 5219718a0f3e8d76066212df4d52f04ab0953e4c2333d64b24a8bd9651de9f5caa41b1b7a6657b9707f2303f4a5db7fc038bfebd25aa08700417f9f9d76e0178
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
 DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa
 DIST tempfile-3.11.0.crate 34153 BLAKE2B 3a89580e05600ff2ef5637d2ed76ad8f1a769f6dae40cbd23f7bc2cb9d0807d03713ce1571df54c866c8fd9a4fb073990e4e98cc8ffee33aa4d8343c2d39733c SHA512 47d4c48c4f90d116a2f7d5ebf29ea623fb0a0fbfb1192aaaa53a83218ac910b6c836d6d4d8233b07d06e14de70fbf30d243152b7ac22a03d180905c53b6ad9e6
-DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
-DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
-DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
-DIST time-0.3.31.crate 121762 BLAKE2B af9097f5e44bf1a2d3bfd26e094e5c3bd17697b35ace2549167ce9f766e422d34f619b230fa81e5de6296f6d01de74a58923d7e69f7db04d6ad055d21f177bfa SHA512 e1cf8197f1eb9556e6320268eea35ca4e5ef33020fae94b181cc21d97b56c074b87ea783804cd7b7ff072736e498f0890b7af8e16c5492a12a4597a4cf33c4fa
 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.16.crate 24356 BLAKE2B 807f56609924cf66dd57eba1d39b0b9302dbadff468562bd624c5413e5e9c36c416f670d558d519a89c0399b9b5aeaa41b2fa2bdbac9113e61bc830d7494a470 SHA512 19345f2bdf626cdc8c44bc11fbe9e13466cb7223cae89228c20ae83e7e9d71e8fe6a037b0461c289f9ceb6c8f08885458bc1db09adeeaddbbb0fbfb0dbfbf6c5
 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.35.1.crate 744407 BLAKE2B a3fed316542c4275aaa5c5b16353ae7e15306c9c6e06b86035b43df3b2a223ee4dbd9e8adbaf5a2426513279b68249afae5162bd53e14a6736b71bb1c0d01167 SHA512 75c14b714341db3764d2fde645c6ffac6f4e32be83b3ccf6315f3240fed96b65c75b8a0936df6e04a0a45cec49b3a781b5b8001282c91704f6a19ce7d188675f
 DIST tokio-1.38.1.crate 774260 BLAKE2B c30488cf0beb002732991f86ffbbd4edc4fb3661837cfecfc93b8cbf9972ff307ed4c41c893221207995953daa7123c8ae0c5dda43111df74f9192b82f2eed1c SHA512 72934b781cafb27488325de9226bcdfcd2327f4dac0d58a22b87e3ffa3604db431985efb8ec68f1287d1cf17a9c3273aea89558d19572ecd2895e0e64b97141c
-DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303
 DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
-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 tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
@@ -241,42 +155,27 @@ DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d35935
 DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
-DIST unicode-bidi-0.3.14.crate 56429 BLAKE2B 8670c2bb1ad98d4540d7837e8b395078b5e0eacc0dcb7ef3ecf6ddaff9d69ce136a883b99cc5bdafd3a3d657834432d0145b11a44ea1d8b776a5394e56ba04f1 SHA512 8793d415e33f1f693ba5928d8aa09ad6dc10bca6d8ad338fca527e5b142d1ea1cb84515459a9fa0a821ae68747cae570bd3872646fcf218ebc7167ad41c97379
 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-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.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
 DIST unix_path-1.0.1.crate 22226 BLAKE2B 0a0fbd0e0489cc9f31139c12d93549990160b140e67c789bf0900468f17b8f3623b72aa2bda89e23e545d6a84efef796166d12a685745a4f9ec9142d50b693ae SHA512 7648ad86bd45f8ca536b33f582d2a9e9772afbec5508abd28de42d5d6eeecdcfcf9905ee85632be4653d1fc15a370fd27825879e285e0c642aeb1663d19b6a46
 DIST unix_str-1.0.0.crate 16226 BLAKE2B 8cebac54cf69825f651067e1ecf3d8cc6387e898775da1440eec9f3f5186bef6fd1dfb983ddaa11fe8dadfc9b2e50beb1653de4e026040d6e71994d2bead3c00 SHA512 3fa234e8a371fe964a2ede29e0be9f1fb91a6858111fa5bd164bd1eb2a248e71db16f9e9faae86a7ab709458d8fee96cdedf51f7894c7bf667cd3dfb1e757859
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090
 DIST uuid-1.10.0.crate 47648 BLAKE2B 370f56b5057fc43ed6645ca4a032737230242c88f3c6945248585054a0d1de0c85cb2eb21bd4c759c1ca73df1b5005652f74b474537116c4fd6642cb60d274ff SHA512 e17db9433d919b51468acaebd240a2cb218d07f099fade49118ca9313f8cdf6aa3103e7aa24440be65a4f25a25f8f511e36dba08cbef27747f9e43b849cd612b
-DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55
-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 want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
-DIST warp-0.3.6.crate 116794 BLAKE2B ee3396698ba62593e80fe4d0090ada41919f056dadcafdb9533741cbecadb7203a9f436ecfc2d07c21be5034198f12b8c42b6a10e6ae19995d199d71e2a13a6a SHA512 a150a55e1625e2c95aaa0ca3bfc0e9b79e75c5d04898a6ae8cd91fdaad342ebb5c1b2305a6d10640eb0d67b19b3ba8f3fdad3c45b345967da11e29210a131255
 DIST warp-0.3.7.crate 117428 BLAKE2B 37b92dbf5fc2099a4e541a3f6fe9bb84795586d8c2ddcbbb7e03a42a9363bbd5296fa524d7bbfcce2883d419d50b8e34975c72d5c9a518075d6dd2df37fbd2a2 SHA512 8dc2dcb5a64555caa5cf74617cc5fc4fe3874d55f4df1b455e6b68c855fe8791f979c622d64b7e357085e322a047cce411c4dc751ecb608c9832abf7550db5a0
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST wasm-bindgen-0.2.89.crate 181935 BLAKE2B 88ff35daace267087750053eacdcf81f1d6cfd7653e1b21cd8436799688615a2840ab733e0196cde747dd4a49ffc3d4efc7c64f48e4e75bd9a240a689f7c037c SHA512 e9e3b95547423ac7acb0f0b327b9fde6c8ef3160296509332fe5d9cbf9eb6a4ed6ad30b29552cdcd113a94e95fab4e3ecc1e7a03811514f84fac569972febf5b
 DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
-DIST wasm-bindgen-backend-0.2.89.crate 28205 BLAKE2B d280d04a6e8df72c0eb0d99b134c017be8c7d378578e23505ebb184510e6eab746fc06ca25333a62c24405565531b6e1c79a5010ae31aebb280c7820d5fe41fd SHA512 9ff63a2401e741013753fbbbc86990948e0e8820ffdb4b16167d2c72f12626306e5d077fef37d8d956acc73eefd699dc7f03250926a5609639b127d4e46daf1b
 DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
-DIST wasm-bindgen-macro-0.2.89.crate 13906 BLAKE2B 93e4b784eaf75a070f471d7d60b802d42b4bdbfd0c7ec21ecf1dbda554ed2bed62d99c2b28ba1527ad8f6f3e5b6083d132f36f9c36efcfa9f6a9cfab73b1ca0d SHA512 060e0f300bdc42557798f4d7348165ac9dde60e4f7760acca5da6ec02bdf8bac22e2e5b80f733aae625a0c699dbe831e0afc6e66b2af8fe445aa6513c5180381
 DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462
-DIST wasm-bindgen-macro-support-0.2.89.crate 20008 BLAKE2B 867ed0049f076d37e8c0587928d67209d69071a6beb80afaba35b947c16958d2c61ef1c762d1706de6744f23ed811815cd94f7059b3ad823aa99f30929cc3a33 SHA512 4ff50819d989733b51e6614b8b14992dc7e53e4c283b89c4e21dd50659cdc49a8cec379df7630ee26e04be62f4ff0bc5eeee9153dbeaec213e8217964a149e76
 DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7
-DIST wasm-bindgen-shared-0.2.89.crate 7265 BLAKE2B 78668ee6af47357983788161c2a50562ff37a8d584e6be61142c5609360aa712571c3fac6b3395215c5d132edb864e0ce8e7b648fd7225433a81f2ae3e6a586b SHA512 02b2252b5b2e6bc8723404ee8cc750684f488b3e80ab60210d97fd7b343a67db2ef8d62aa792a5f02bb351467f4ffbc887512a215007f6fd089b29f8d3a23be3
 DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07
-DIST webdriver-0.50.0.crate 32046 BLAKE2B 77522b682f4a82ef4450aead5f785a335348deb630588969546633b92b20381da3ba5d1401f5339b5c7dacf1357821f41466179c745dd6925106b5a59c163bd3 SHA512 2f116dc7d2b11432e8343dc888c1854972d754a0ec91cf19e24e4068a7074d54d4b3215daaf2547adac4ac922afe05c323c9b7c4d3c854cc8470b3959c0101dc
 DIST webdriver-0.51.0.crate 32322 BLAKE2B 42b328f992e8a89b572dd25fd4a600e170ae3fa8c3242d52b9fe766123e2ddff46e49c1ea5250bd742b6458a385e82070acdaffa267bda4db6ec7d2ff437e085 SHA512 1d62ae8b0d8274eb068554580132a1d8bd6bf2600e0f292fbee17307116805e141bf05cef02d5afbc587ae6e262df749daa754c51a44c52ae7eb5d43d4ded9f5
 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.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
@@ -284,29 +183,21 @@ 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.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.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.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.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.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.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.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.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 winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1
@@ -317,5 +208,4 @@ DIST zerofrom-0.1.4.crate 5044 BLAKE2B 8ad9a14b8b0c251cffb420f7ac673669fd29b74bc
 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
-DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
 DIST zip-2.1.6.crate 107876 BLAKE2B 2e1f3f5dd3ec3911361e0b32227a0622fc40e12a84d1eec51b1cc6ce8b402e6530fb7c3a3d5b4ebe19a975a698ef3acde895d009e660cddb27c4d87c2d01b777 SHA512 f0c7ca518faa8b353a83e485c1522247e1e2054ae2b480c188ae0b80192223b1ea89b3163efe87ee8cb2912f20748ea6e835c1abbe67ef426f1a7a31bb967f95
diff --git a/net-misc/geckodriver/geckodriver-0.34.0.ebuild b/net-misc/geckodriver/geckodriver-0.34.0.ebuild
deleted file mode 100644
index c677d93e4526..000000000000
--- a/net-misc/geckodriver/geckodriver-0.34.0.ebuild
+++ /dev/null
@@ -1,229 +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="
-	addr2line@0.21.0
-	adler@1.0.2
-	aho-corasick@1.1.2
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstyle@1.0.4
-	anyhow@1.0.79
-	autocfg@1.1.0
-	backtrace@0.3.69
-	base64@0.21.5
-	bitflags@1.3.2
-	bitflags@2.4.1
-	block-buffer@0.10.4
-	bumpalo@3.14.0
-	byteorder@1.5.0
-	bytes@1.5.0
-	cc@1.0.83
-	cfg-if@1.0.0
-	chrono@0.4.31
-	clap@4.4.12
-	clap_builder@4.4.12
-	clap_lex@0.6.0
-	cookie@0.16.2
-	core-foundation-sys@0.8.6
-	cpufeatures@0.2.11
-	crc32fast@1.3.2
-	crossbeam-utils@0.8.18
-	crypto-common@0.1.6
-	deranged@0.3.11
-	digest@0.10.7
-	dirs-sys@0.3.7
-	dirs@4.0.0
-	equivalent@1.0.1
-	errno@0.3.8
-	fastrand@2.0.1
-	flate2@1.0.28
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	generic-array@0.14.7
-	getrandom@0.2.11
-	gimli@0.28.1
-	h2@0.3.22
-	hashbrown@0.12.3
-	hashbrown@0.14.3
-	headers-core@0.2.0
-	headers@0.3.9
-	http-body@0.4.6
-	http@0.2.11
-	httparse@1.8.0
-	httpdate@1.0.3
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.59
-	idna@0.5.0
-	indexmap@1.9.3
-	indexmap@2.1.0
-	itoa@1.0.10
-	js-sys@0.3.66
-	lazy_static@1.4.0
-	libc@0.2.151
-	libredox@0.0.1
-	line-wrap@0.1.1
-	linked-hash-map@0.5.6
-	linux-raw-sys@0.4.12
-	log@0.4.20
-	marionette@0.5.0
-	memchr@2.7.1
-	mime@0.3.17
-	mime_guess@2.0.4
-	miniz_oxide@0.7.1
-	mio@0.8.10
-	mozdevice@0.5.2
-	mozprofile@0.9.2
-	mozrunner@0.15.2
-	mozversion@0.5.2
-	num-traits@0.2.17
-	object@0.32.2
-	once_cell@1.19.0
-	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
-	plist@1.6.0
-	powerfmt@0.2.0
-	proc-macro2@1.0.74
-	quick-xml@0.31.0
-	quote@1.0.35
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	regex-automata@0.4.3
-	regex-syntax@0.8.2
-	regex@1.10.2
-	rust-ini@0.10.3
-	rustc-demangle@0.1.23
-	rustix@0.38.28
-	rustls-pemfile@1.0.4
-	ryu@1.0.16
-	safemem@0.3.3
-	same-file@1.0.6
-	scoped-tls@1.0.1
-	semver@1.0.21
-	serde@1.0.194
-	serde_derive@1.0.194
-	serde_json@1.0.110
-	serde_repr@0.1.18
-	serde_urlencoded@0.7.1
-	serde_yaml@0.8.26
-	sha1@0.10.6
-	slab@0.4.9
-	socket2@0.5.5
-	strsim@0.10.0
-	syn@2.0.46
-	tempfile@3.9.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.56
-	thiserror@1.0.56
-	time-core@0.1.2
-	time-macros@0.2.16
-	time@0.3.31
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-stream@0.1.14
-	tokio-util@0.7.10
-	tokio@1.35.1
-	tower-service@0.3.2
-	tracing-core@0.1.32
-	tracing@0.1.40
-	try-lock@0.2.5
-	typenum@1.17.0
-	unicase@2.7.0
-	unicode-bidi@0.3.14
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.22
-	unicode-segmentation@1.10.1
-	unix_path@1.0.1
-	unix_str@1.0.0
-	url@2.5.0
-	uuid@1.6.1
-	version_check@0.9.4
-	walkdir@2.4.0
-	want@0.3.1
-	warp@0.3.6
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.89
-	wasm-bindgen-macro-support@0.2.89
-	wasm-bindgen-macro@0.2.89
-	wasm-bindgen-shared@0.2.89
-	wasm-bindgen@0.2.89
-	webdriver@0.50.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-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
-	winreg@0.10.1
-	yaml-rust@0.4.5
-	zip@0.6.6
-"
-
-inherit cargo
-
-DESCRIPTION="Proxy for using WebDriver clients to interact with Gecko-based browsers"
-HOMEPAGE="https://firefox-source-docs.mozilla.org/testing/geckodriver/ https://github.com/mozilla/geckodriver"
-SRC_URI="https://github.com/mozilla/geckodriver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}"
-
-LICENSE="MPL-2.0"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="unchained"
-
-RDEPEND="!www-client/firefox[geckodriver(-)]"
-
-pkg_setup() {
-	QA_FLAGS_IGNORED="/usr/$(get_libdir)/firefox/geckodriver"
-}
-
-src_prepare() {
-	# Apply the unchained patch from https://github.com/rafiibrahim8/geckodriver-unchained -
-	# makes geckodriver available on Gecko-based non-Firefox browsers, e.g. Librewolf.
-	# bgo#930568
-	use unchained && eapply "${FILESDIR}"/geckodriver-0.34.0-firefox-125.0-unchained.patch
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	mkdir -p "${D}"/usr/$(get_libdir)/firefox || die "Failed to create /usr/lib*/firefox directory."
-	exeinto /usr/$(get_libdir)/firefox
-	doexe "$(cargo_target_dir)"/geckodriver
-	dosym -r /usr/$(get_libdir)/firefox/geckodriver /usr/bin/geckodriver
-}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 44e5c5374c0d..515d4831ca87 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,3 +1 @@
-DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2
-DIST gerbera-2.1.0.tar.gz 5828980 BLAKE2B d611b9db723e52d417c64ce6ff8bfd77009ad7b7c2454b8f722810aacfde76b892894e8a70cf4e25474f970b13353eb770d4663f91ac59ac87cea858928005fb SHA512 5069ffb470dc10c5b7e6f95e9d61794e00d8a4473835860e7bca63ff1c34f2b8544b3a7fed8373a20e6bbddb2bc016ecb39a8321e930813e65e444b653e5a24f
 DIST gerbera-2.2.0.tar.gz 6138157 BLAKE2B eab6008696cf353c50468a686509ed82381375e7b5e5a5a1b38bfcad6e275ca69885df7a8df7ebdf5bb407f7e7ec9401c27e09fbca55ec61ef15c415439b7148 SHA512 6e11d3e40c9a95d278ce4c6f0c914a27fed250e9202bb81c0f539d06622738bfa5b2156ca6bd061872e276858eb203f626c997ddc00810f9d816f4ff9198c97e
diff --git a/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch
deleted file mode 100644
index 9e84f53b3ef4..000000000000
--- a/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 07f78866608c8f1094696615932e2d8382e5fd8c Mon Sep 17 00:00:00 2001
-From: Kostadin Shishmanov <kocelfc@tutanota.com>
-Date: Thu, 16 Nov 2023 21:17:34 +0200
-Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14
-
-Gentoo bug: https://bugs.gentoo.org/917136
-
-Upstream PR: https://github.com/gerbera/gerbera/pull/2899
-
-Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
----
- src/cds/cds_objects.h                     | 1 +
- src/iohandler/io_handler_buffer_helper.cc | 2 ++
- src/iohandler/mem_io_handler.cc           | 2 ++
- src/util/tools.h                          | 1 +
- src/util/upnp_clients.cc                  | 2 ++
- 5 files changed, 8 insertions(+)
-
-diff --git a/src/cds/cds_objects.h b/src/cds/cds_objects.h
-index 4283a3af5..a4b9c1d01 100644
---- a/src/cds/cds_objects.h
-+++ b/src/cds/cds_objects.h
-@@ -34,6 +34,7 @@
- #ifndef __CDS_OBJECTS_H__
- #define __CDS_OBJECTS_H__
- 
-+#include <algorithm>
- #include <map>
- #include <memory>
- #include <vector>
-diff --git a/src/iohandler/io_handler_buffer_helper.cc b/src/iohandler/io_handler_buffer_helper.cc
-index ee1de602e..49afd3c8c 100644
---- a/src/iohandler/io_handler_buffer_helper.cc
-+++ b/src/iohandler/io_handler_buffer_helper.cc
-@@ -36,6 +36,8 @@
- 
- #include "config/config_manager.h"
- 
-+#include <algorithm>
-+
- IOHandlerBufferHelper::IOHandlerBufferHelper(std::shared_ptr<Config> config, std::size_t bufSize, std::size_t initialFillSize)
-     : config(std::move(config))
-     , bufSize(bufSize)
-diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc
-index 534c452da..230f4aa85 100644
---- a/src/iohandler/mem_io_handler.cc
-+++ b/src/iohandler/mem_io_handler.cc
-@@ -34,6 +34,8 @@
- 
- #include "mem_io_handler.h" // API
- 
-+#include <algorithm>
-+
- MemIOHandler::MemIOHandler(const void* buffer, int length)
-     : buffer(new char[length])
-     , length(length)
-diff --git a/src/util/tools.h b/src/util/tools.h
-index 177f09900..de2481c87 100644
---- a/src/util/tools.h
-+++ b/src/util/tools.h
-@@ -33,6 +33,7 @@
- #ifndef __TOOLS_H__
- #define __TOOLS_H__
- 
-+#include <algorithm>
- #include <map>
- #include <optional>
- #include <vector>
-diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc
-index e07fb4508..d95f426fb 100644
---- a/src/util/upnp_clients.cc
-+++ b/src/util/upnp_clients.cc
-@@ -33,6 +33,8 @@
- 
- #include <upnp.h>
- 
-+#include <algorithm>
-+
- std::shared_ptr<ClientStatusDetail> ClientStatusDetail::clone() const
- {
-     return std::make_shared<ClientStatusDetail>(group, itemId, playCount, lastPlayed.count(), lastPlayedPosition.count(), bookMarkPos.count());
diff --git a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild
deleted file mode 100644
index c7fbd27a2fa3..000000000000
--- a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-info
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib"
-
-RDEPEND="
-	acct-user/gerbera
-	dev-db/sqlite
-	dev-libs/libebml:=
-	dev-libs/libfmt:=
-	dev-libs/pugixml
-	dev-libs/spdlog:=
-	>=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp]
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	exiv2? ( media-gfx/exiv2:= )
-	ffmpeg? ( media-video/ffmpeg:= )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	javascript? ( dev-lang/duktape:= )
-	magic? ( sys-apps/file )
-	matroska? ( media-libs/libmatroska:= )
-	mysql? ( dev-db/mysql-connector-c )
-	taglib? ( media-libs/taglib )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12.1-gcc14.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AVCODEC=$(usex ffmpeg)
-		-DWITH_CURL=$(usex curl)
-		-DWITH_DEBUG=$(usex debug)
-		-DWITH_EXIF=$(usex exif)
-		-DWITH_EXIV2=$(usex exiv2)
-		-DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
-		-DWITH_INOTIFY=1
-		-DWITH_JS=$(usex javascript)
-		-DWITH_LASTFM=NO
-		-DWITH_MAGIC=$(usex magic)
-		-DWITH_MATROSKA=$(usex matroska)
-		-DWITH_MYSQL=$(usex mysql)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TAGLIB=$(usex taglib)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN}
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-1.3.0.config config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-}
-
-pkg_postinst() {
-	if use mysql; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-2.1.0.ebuild b/net-misc/gerbera/gerbera-2.1.0.ebuild
deleted file mode 100644
index b3c80239e4c7..000000000000
--- a/net-misc/gerbera/gerbera-2.1.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 cmake linux-info
-
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib"
-
-RDEPEND="
-	acct-user/gerbera
-	dev-db/sqlite
-	dev-libs/libebml:=
-	dev-libs/libfmt:=
-	dev-libs/pugixml
-	dev-libs/spdlog:=
-	net-libs/libupnp:=[ipv6(+),reuseaddr,-blocking-tcp]
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	exiv2? ( media-gfx/exiv2:= )
-	ffmpeg? ( media-video/ffmpeg:= )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	javascript? ( dev-lang/duktape:= )
-	magic? ( sys-apps/file )
-	matroska? ( media-libs/libmatroska:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	taglib? ( media-libs/taglib )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AVCODEC=$(usex ffmpeg)
-		-DWITH_CURL=$(usex curl)
-		-DWITH_DEBUG=$(usex debug)
-		-DWITH_EXIF=$(usex exif)
-		-DWITH_EXIV2=$(usex exiv2)
-		-DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
-		-DWITH_INOTIFY=1
-		-DWITH_JS=$(usex javascript)
-		-DWITH_LASTFM=NO
-		-DWITH_MAGIC=$(usex magic)
-		-DWITH_MATROSKA=$(usex matroska)
-		-DWITH_MYSQL=$(usex mysql)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TAGLIB=$(usex taglib)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN}
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-1.3.0.config config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-}
-
-pkg_postinst() {
-	if use mysql; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
new file mode 100644
index 000000000000..df21e34cd4a5
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -0,0 +1,2 @@
+DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
+DIST kio-zeroconf-24.08.0.tar.xz 44876 BLAKE2B ef95fff8d7e27d8d48aff732ff134e168f395a368e9264968819cea39be26c216db3952f17fdcd5be44f61184b7b3176b5fc5d502be42b9576f6665fce159667 SHA512 68a157909264c9c4a36f6c90086bf74a15024121170c8b9a8459866a192715937308f9bdc991eba61307cf0a771ac37bf40dfb32f369416463f9c9418542da9a
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2-r1.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..f1f40621d14d
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.05.2-r1.ebuild
@@ -0,0 +1,24 @@
+# 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.05.2-r2: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.08.0-r1.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..4ab4638c9e5a
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.08.0-r1.ebuild
@@ -0,0 +1,24 @@
+# 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/metadata.xml b/net-misc/kio-zeroconf-common/metadata.xml
new file mode 100644
index 000000000000..cb61f990580f
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">network/kio-zeroconf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index b142bd4c8cf0..5ff7a1f2a015 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,2 +1,3 @@
 DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6
 DIST kio-zeroconf-24.05.2.tar.xz 44392 BLAKE2B 6ef8fc100cae8256b8a77ea0d11715df420bfa41fd09ebcb9f72b898981c1a0cd6067e14f4f01977f3d0314a5e0c0bac9a8864183a509652c37e8e3a2bfdb304 SHA512 ce85f0ef9ea1cf1efb58ea63f25ea50d141fe7756c06eaea55d44fa64b66831c80b54cec2d2d61d748807eb8c04cdb8dbd531ca69efa1874f58b0057c45c5f9f
+DIST kio-zeroconf-24.08.0.tar.xz 44876 BLAKE2B ef95fff8d7e27d8d48aff732ff134e168f395a368e9264968819cea39be26c216db3952f17fdcd5be44f61184b7b3176b5fc5d502be42b9576f6665fce159667 SHA512 68a157909264c9c4a36f6c90086bf74a15024121170c8b9a8459866a192715937308f9bdc991eba61307cf0a771ac37bf40dfb32f369416463f9c9418542da9a
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r2.ebuild
new file mode 100644
index 000000000000..79cfe2ecde6a
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${CATEGORY}/${PN}-common
+"
+
+# 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-23.08.5.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild
deleted file mode 100644
index 3300b2034c62..000000000000
--- a/net-misc/kio-zeroconf/kio-zeroconf-23.08.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
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="kf6compat"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	kf6compat? ( net-misc/kio-zeroconf:6 )
-"
-
-src_install() {
-	ecm_src_install
-
-	if use kf6compat; then
-		rm "${D}"/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml \
-			"${D}"/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml \
-			"${D}"/usr/share/remoteview/zeroconf.desktop || die
-		rm -r "${D}"/usr/share/locale || die
-	fi
-}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r2.ebuild
new file mode 100644
index 000000000000..0b224d476d27
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2-r2.ebuild
@@ -0,0 +1,39 @@
+# 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 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.05.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.2.ebuild
deleted file mode 100644
index eaa51e81642c..000000000000
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.05.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=8
-
-KFMIN=6.3.0
-QTMIN=6.6.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}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.08.0-r1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..1c51d9b1efb0
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.08.0-r1.ebuild
@@ -0,0 +1,39 @@
+# 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/metadata.xml b/net-misc/kio-zeroconf/metadata.xml
index 8697c2472ca5..cb61f990580f 100644
--- a/net-misc/kio-zeroconf/metadata.xml
+++ b/net-misc/kio-zeroconf/metadata.xml
@@ -9,7 +9,4 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 		<remote-id type="kde-invent">network/kio-zeroconf</remote-id>
 	</upstream>
-	<use>
-		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest
index 0456414d887d..5ad213138684 100644
--- a/net-misc/moonlight/Manifest
+++ b/net-misc/moonlight/Manifest
@@ -1 +1 @@
-DIST MoonlightSrc-5.0.1.tar.gz 79820559 BLAKE2B ae67db6aab9e2104021e35b5bc4822a57a3b82a03f6b2bd1cc95e356833f163e9f6f30afc082dc8d1e4b120ef9ef7aeca2f30eec88502773020e0a6b48cbf0b1 SHA512 618d67afd4638e6c051850fc68b68fd313c9334300e35370b0b3741ec51e30da212633954b7ea47cc1f0644f5005cc06ecf861349418512919453d576f9acd60
+DIST MoonlightSrc-6.0.1.tar.gz 83786545 BLAKE2B b227780264965b8e455e6a12dde9244325b7799737c44fffbe9219651c9390223bd13956de82af31c1f5483327d9398ff8fc9724d7466353ced415ebf2ed3fd7 SHA512 44b7c77a438c46f0374d4289203518f4468b10a5e388ae4a928845825886b8b3abd975f9ca6ddf4eaf94eb80667650520a1522292a91f88ec0f6d7396570b8ef
diff --git a/net-misc/moonlight/metadata.xml b/net-misc/moonlight/metadata.xml
index 69364f1304dd..b385312471c7 100644
--- a/net-misc/moonlight/metadata.xml
+++ b/net-misc/moonlight/metadata.xml
@@ -14,5 +14,6 @@
 		<flag name="glslow">Prefer direct KMS/DRM rendering over EGL/GLES rendering for better performance on some weaker GPUs</flag>
 		<flag name="libdrm">Enable video rendering via <pkg>x11-libs/libdrm</pkg></flag>
 		<flag name="soundio">Enable sound output via <pkg>media-libs/libsoundio</pkg> instead of <pkg>media-libs/libsdl2</pkg></flag>
+		<flag name="vkslow">Prefer hardware YUV-RGB conversion and scaling over Vulkan for better performance on some weaker GPUs</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/moonlight/moonlight-5.0.1-r3.ebuild b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild
deleted file mode 100644
index 33e79bb06086..000000000000
--- a/net-misc/moonlight/moonlight-5.0.1-r3.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
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git"
-	EGIT_SUBMODULES=( '*' -libs -soundio )
-	inherit git-r3
-else
-	SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-	S="${WORKDIR}"
-fi
-
-inherit qmake-utils xdg
-
-DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
-HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X"
-
-RDEPEND="
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/libglvnd
-	media-libs/libpulse
-	media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
-	media-libs/opus
-	media-libs/sdl2-ttf
-	media-video/ffmpeg:=[cuda?,libdrm?]
-	libdrm? ( x11-libs/libdrm )
-	soundio? ( media-libs/libsoundio:= )
-	vaapi? ( media-libs/libva:=[wayland?,X?] )
-	vdpau? (
-		x11-libs/libvdpau
-		media-libs/libsdl2[X]
-	)
-	wayland? ( dev-libs/wayland )
-	X? ( x11-libs/libX11 )
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	dev-qt/qtcore
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# Force system libsoundio over bundled version.
-	rm -r soundio/ || die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \
-		$(usex cuda "" disable-cuda) \
-		$(usex libdrm "" disable-libdrm) \
-		--disable-mmal \
-		$(usex vaapi "" disable-libva) \
-		$(usex vdpau "" disable-libvdpau) \
-		$(usex wayland "" disable-wayland) \
-		$(usex X "" disable-x11) \
-		$(usev embedded) \
-		$(usev glslow) \
-		$(usev soundio) \
-	"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
diff --git a/net-misc/moonlight/moonlight-6.0.1.ebuild b/net-misc/moonlight/moonlight-6.0.1.ebuild
new file mode 100644
index 000000000000..b991b6f1e5b0
--- /dev/null
+++ b/net-misc/moonlight/moonlight-6.0.1.ebuild
@@ -0,0 +1,100 @@
+# 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/moonlight-stream/moonlight-qt.git"
+	EGIT_SUBMODULES=( '*' -libs -soundio/libsoundio )
+	inherit git-r3
+else
+	SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}"
+fi
+
+inherit qmake-utils xdg
+
+DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
+HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda +libdrm embedded glslow qt5 qt6 soundio +vaapi vdpau vkslow wayland X"
+REQUIRED_USE="|| ( qt6 qt5 )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	media-libs/libglvnd
+	media-libs/libplacebo:=
+	media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
+	media-libs/opus
+	media-libs/sdl2-ttf
+	media-video/ffmpeg:=[cuda?,libdrm?]
+	libdrm? ( x11-libs/libdrm )
+	qt6? (
+		dev-qt/qtbase:6[gui,network]
+		dev-qt/qtdeclarative:6[svg]
+	)
+	!qt6? ( qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	) )
+	soundio? ( media-libs/libsoundio:= )
+	vaapi? ( media-libs/libva:=[wayland?,X?] )
+	vdpau? (
+		x11-libs/libvdpau
+		media-libs/libsdl2[X]
+	)
+	wayland? ( dev-libs/wayland )
+	X? ( x11-libs/libX11 )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	dev-qt/qtcore
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Force system libsoundio over bundled version.
+	rm -r soundio/ || die
+}
+
+src_configure() {
+	local qmake_args=(
+		PREFIX="${EPREFIX}/usr"
+		CONFIG+="
+			disable-mmal
+			$(usex cuda "" disable-cuda)
+			$(usex libdrm "" disable-libdrm)
+			$(usex vaapi "" disable-libva)
+			$(usex vdpau "" disable-libvdpau)
+			$(usex wayland "" disable-wayland)
+			$(usex X "" disable-x11)
+			$(usev embedded)
+			$(usev glslow)
+			$(usev soundio)
+			$(usev vkslow)
+		"
+	)
+
+	if use qt6; then
+		eqmake6 "${qmake_args[@]//$'\n'}"
+	else
+		eqmake5 "${qmake_args[@]//$'\n'}"
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	einstalldocs
+}
diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild
index 33e79bb06086..b991b6f1e5b0 100644
--- a/net-misc/moonlight/moonlight-9999.ebuild
+++ b/net-misc/moonlight/moonlight-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git"
-	EGIT_SUBMODULES=( '*' -libs -soundio )
+	EGIT_SUBMODULES=( '*' -libs -soundio/libsoundio )
 	inherit git-r3
 else
 	SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz"
@@ -19,23 +19,30 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
 HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X"
+IUSE="cuda +libdrm embedded glslow qt5 qt6 soundio +vaapi vdpau vkslow wayland X"
+REQUIRED_USE="|| ( qt6 qt5 )"
 
 RDEPEND="
 	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
 	media-libs/libglvnd
-	media-libs/libpulse
+	media-libs/libplacebo:=
 	media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
 	media-libs/opus
 	media-libs/sdl2-ttf
 	media-video/ffmpeg:=[cuda?,libdrm?]
 	libdrm? ( x11-libs/libdrm )
+	qt6? (
+		dev-qt/qtbase:6[gui,network]
+		dev-qt/qtdeclarative:6[svg]
+	)
+	!qt6? ( qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	) )
 	soundio? ( media-libs/libsoundio:= )
 	vaapi? ( media-libs/libva:=[wayland?,X?] )
 	vdpau? (
@@ -63,18 +70,28 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \
-		$(usex cuda "" disable-cuda) \
-		$(usex libdrm "" disable-libdrm) \
-		--disable-mmal \
-		$(usex vaapi "" disable-libva) \
-		$(usex vdpau "" disable-libvdpau) \
-		$(usex wayland "" disable-wayland) \
-		$(usex X "" disable-x11) \
-		$(usev embedded) \
-		$(usev glslow) \
-		$(usev soundio) \
-	"
+	local qmake_args=(
+		PREFIX="${EPREFIX}/usr"
+		CONFIG+="
+			disable-mmal
+			$(usex cuda "" disable-cuda)
+			$(usex libdrm "" disable-libdrm)
+			$(usex vaapi "" disable-libva)
+			$(usex vdpau "" disable-libvdpau)
+			$(usex wayland "" disable-wayland)
+			$(usex X "" disable-x11)
+			$(usev embedded)
+			$(usev glslow)
+			$(usev soundio)
+			$(usev vkslow)
+		"
+	)
+
+	if use qt6; then
+		eqmake6 "${qmake_args[@]//$'\n'}"
+	else
+		eqmake5 "${qmake_args[@]//$'\n'}"
+	fi
 }
 
 src_install() {
diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild
index 123086e09347..ad91759b66ef 100644
--- a/net-misc/mosh/mosh-1.4.0.ebuild
+++ b/net-misc/mosh/mosh-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools bash-completion-r1 flag-o-matic
+inherit autotools bash-completion-r1
 
 MY_P=${PN}-${PV/_rc/rc}
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
 
@@ -51,15 +51,20 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# abseil-cpp needs >=c++14
+	local CXXSTD="14"
+	if has_version ">=dev-cpp/abseil-cpp-20240722.0"; then
+		# needs >=c++17
+		CXXSTD="17"
+	fi
+	sed -e "/AX_CXX_COMPILE_STDCXX/{s/11/${CXXSTD}/}" -i configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
 	MAKEOPTS+=" V=1"
 
-	# protobuf needs >=c++14
-	append-cxxflags -std=gnu++14
-
 	local myeconfargs=(
 		# We install it ourselves in src_install
 		--disable-completion
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index a773790b0ce4..fa944a6f73cd 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,2 +1,3 @@
 DIST netifrc-0.7.7.tar.bz2 75823 BLAKE2B e2d99ac347e9a449b39981b1aa1585ff83d05af1bafe09f7e2e25954360df1e76f53ce4a5c8e08777ba45baf697a307697576835df4c4b4ae010ab84dbe8bb2b SHA512 995f89beece9e7ff0b558b466c06a476f22d3161f31622a232c382d81e74399aeb0a39cb4a95080829120c527a1a93757425671e2ca3639d8637e5e905ad3e80
 DIST netifrc-0.7.8.tar.bz2 76239 BLAKE2B 501a2bcfaa2753187425cba31f01b2a644ae4d01da76e4bd3722b815b1fa743905728fd66ac9d56c915dba767723bd5df2c417706c8a0150628e61b6e0b86ffb SHA512 d483453058d3e8c3cb22e8eedea69e12ac5fe94449d35a2cd842d7e32603174a470a8a4e883ebf24a0f09374dbf1f4c0c0db5094ae2d2191bcc1c9c8356170ad
+DIST netifrc-0.7.9.tar.bz2 76842 BLAKE2B bcdd12fc6202b550d157eb531d28277fdd3216a7b547542da96d79a0ff42168d19fa50e86643f290049df87db84d1b15aefab4041e0a3f8334b6e8bd6ec650db SHA512 3a29294c71ce663cc114406a1ee2310fd33dd60826d5cc1b264475410face7ba8e685ed0a8f7255842065e75ca6670ee5e1333c8092b8fae71732f4e40e68404
diff --git a/net-misc/netifrc/netifrc-0.7.9.ebuild b/net-misc/netifrc/netifrc-0.7.9.ebuild
new file mode 100644
index 000000000000..6383dff98b95
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.7.9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/netifrc.git
+		https://github.com/gentoo/${PN}
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+IUSE="+dhcp"
+
+RDEPEND="
+	sys-apps/gentoo-functions
+	|| (
+		>=sys-apps/openrc-0.15
+		sys-apps/openrc-navi
+	)
+	dhcp? (
+		|| (
+			net-misc/dhcpcd
+			net-misc/dhcp[client]
+			sys-apps/busybox
+		)
+	)
+"
+BDEPEND="
+	kernel_linux? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	default
+}
+
+src_compile() {
+	MAKE_ARGS=(
+		PREFIX="${EPREFIX}"
+		UPREFIX="${EPREFIX}/usr"
+		UDEVDIR="${EPREFIX}$(get_udevdir)"
+		LIBEXECDIR="${EPREFIX}/lib/${PN}"
+		PF="${PF}"
+	)
+
+	emake "${MAKE_ARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+	# Install the service file
+	local LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+
+	local UNIT_DIR="$(systemd_get_systemunitdir)"
+	UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}"
+	dosym net@.service "${UNIT_DIR}/net@lo.service"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 5813ac63d181..434f1f591550 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,4 @@
 DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b571128f55c041f2fa1d38f7d22ed0f3ebca2b4ad9faef56d5699a48a70f062d13385c39123185b50ebba3d035d4e5af1320ce1844 SHA512 fc8700f36e3a2e8f07d219f9e7065a97e46d162d8c4f9a576e322dc45470e8b95321a1e176c4739a4fa212a69ff2782049096b32dcfe656a9e9cbedb8c7ed50e
+DIST nextcloud-client-3.12.6.tar.gz 13647404 BLAKE2B 8414c0248596f5bde78074de72a4cc5331741b19c94d2bb40893afbe7821e1016809245c74ddb14daaf21f8c25c80db4e0e752282435734b36d5ea711c2bc81d SHA512 1ac3351f1371eebae46cdeb2aa6b2203dc0c3583abc8b690a6a1764ffd489dcd5b2b56d6f94fa45c212cbd17969f889a36ce3f186e2f99d159728daefb07ff32
 DIST nextcloud-client-3.13.2.tar.gz 13782506 BLAKE2B 867ae6ac056bc818d544d22b3a08c8876c093ca75746217822e3111c9de1e8a6b90ba9e0954e0b8c952082ea39f6f732c8914e267b4b1f1d8af3d8ebf6dbd73e SHA512 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6
 DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.12.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.12.6.ebuild
new file mode 100644
index 000000000000..0fdcd3b2d8bb
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.12.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 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
+"
+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 )"
+
+# slot op for qtqui as this package uses private API parts of qtqui
+# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	net-libs/libcloudproviders
+	kde-frameworks/karchive:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	|| ( gnome-base/librsvg media-gfx/inkscape )
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-qt/qttest:5
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+)
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || 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)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	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/nextcloud-client/nextcloud-client-3.13.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
index 151c9bcdf637..84a333f1e602 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/desktop-${PV/_/-}"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index d1b7a339a1a1..3be7239020e1 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -3,3 +3,4 @@ DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59
 DIST passt-2024.04.26.tar.xz 196148 BLAKE2B f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68 SHA512 f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98
 DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae SHA512 04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3
 DIST passt-2024.06.07.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488 SHA512 103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0
+DIST passt-2024.08.21-r1.tar.xz 209692 BLAKE2B 1b6b540f64528e375e6f0cfd90cec788b2b2281f7ab6dbe0f6df933757dcc4f37e154b2cd8e9e00adbc2b647a044fca05f2c48f49d05c0443c396831a2e13754 SHA512 ec09210b471377cc9f3d0044c97924834fadcfed7523aaab2f6c0fddb2d3d098c0730d1573e7c44963334d33dba5fbf660b0b222d4c71fab27cebf8edb52abf1
diff --git a/net-misc/passt/passt-2024.03.26.ebuild b/net-misc/passt/passt-2024.03.26.ebuild
index 90df839f93d9..91d818f5b4a1 100644
--- a/net-misc/passt/passt-2024.03.26.ebuild
+++ b/net-misc/passt/passt-2024.03.26.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="4988e2b"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://passt.top/passt"
+	EGIT_REPO_URI="https://passt.top/passt"
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.04.05.ebuild b/net-misc/passt/passt-2024.04.05.ebuild
index e4201215e520..be03e08a6fab 100644
--- a/net-misc/passt/passt-2024.04.05.ebuild
+++ b/net-misc/passt/passt-2024.04.05.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="954589b"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://passt.top/passt"
+	EGIT_REPO_URI="https://passt.top/passt"
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.04.26.ebuild b/net-misc/passt/passt-2024.04.26.ebuild
index c73a0f7c146b..cf83c50f72ed 100644
--- a/net-misc/passt/passt-2024.04.26.ebuild
+++ b/net-misc/passt/passt-2024.04.26.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="d03c4e2"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://passt.top/passt"
+	EGIT_REPO_URI="https://passt.top/passt"
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.05.10.ebuild b/net-misc/passt/passt-2024.05.10.ebuild
index ce44d6abe4eb..022bbfc62aa7 100644
--- a/net-misc/passt/passt-2024.05.10.ebuild
+++ b/net-misc/passt/passt-2024.05.10.ebuild
@@ -12,7 +12,7 @@ RELEASE_COMMIT="7288448"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://passt.top/passt"
+	EGIT_REPO_URI="https://passt.top/passt"
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
diff --git a/net-misc/passt/passt-2024.06.07.ebuild b/net-misc/passt/passt-2024.06.07.ebuild
index 65a98bc9f51b..37ba4d13c25f 100644
--- a/net-misc/passt/passt-2024.06.07.ebuild
+++ b/net-misc/passt/passt-2024.06.07.ebuild
@@ -12,11 +12,11 @@ RELEASE_COMMIT="8a83b53"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://passt.top/passt"
+	EGIT_REPO_URI="https://passt.top/passt"
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="BSD GPL-2+"
diff --git a/net-misc/passt/passt-2024.08.21-r1.ebuild b/net-misc/passt/passt-2024.08.21-r1.ebuild
new file mode 100644
index 000000000000..c5749fff3812
--- /dev/null
+++ b/net-misc/passt/passt-2024.08.21-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp"
+HOMEPAGE="https://passt.top/"
+
+RELEASE_COMMIT="1d6142f"
+MY_PV="${PV//./_}.${RELEASE_COMMIT}"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://passt.top/passt"
+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"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+IUSE="static"
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	[[ ${PV} != 9999* ]] && export VERSION="${PV}"
+	export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${PF}"
+
+	emake $(usev static)
+}
diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild
index 65a98bc9f51b..056444e46eba 100644
--- a/net-misc/passt/passt-9999.ebuild
+++ b/net-misc/passt/passt-9999.ebuild
@@ -12,21 +12,17 @@ RELEASE_COMMIT="8a83b53"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://passt.top/passt"
+	EGIT_REPO_URI="https://passt.top/passt"
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
 IUSE="static"
 
-PATCHES=(
-	"${FILESDIR}"/Makefile-2024.03.20.patch
-)
-
 src_prepare() {
 	default
 	tc-export CC
diff --git a/net-misc/pingu/Manifest b/net-misc/pingu/Manifest
index dff3f8cd1f88..52284a8b7b55 100644
--- a/net-misc/pingu/Manifest
+++ b/net-misc/pingu/Manifest
@@ -1 +1,2 @@
+DIST pingu-1.5.1.tar.gz 31574 BLAKE2B afc11958aace1a1f87dbd9051f40354f4f0bd77f599d17a4772de8ba2f7d8d7fec0e203c87f354517bf0e29d5238265459a97d950a157316b530a577a989f472 SHA512 1ec50ad5a1cb7318dc6ffb8ab8454f85dda9d31ea13503eaf001109b7255b6e93e165769e9b3c7fd95f2449f079e107f81a974b148b6f00f50f13ee8124d92fb
 DIST pingu-1.5.tar.gz 31565 BLAKE2B 13d1fa075f32d5a32cece55c5292cda08f72e711a8567cc8b25ce0e2bb0325395f1346e9feb96eb266c93d10d04609d87562192f7b7d0c22730fd4a8561c6c1a SHA512 71e5fbe93f831f24d168957cdeaff2817a22f407575316d6515755bec760d10724821070549eaab562924237b96976a1a776ca903d5fe0cd9f9b69a38eadd8c9
diff --git a/net-misc/pingu/pingu-1.5.1.ebuild b/net-misc/pingu/pingu-1.5.1.ebuild
new file mode 100644
index 000000000000..73a282c4fac8
--- /dev/null
+++ b/net-misc/pingu/pingu-1.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Policy routing daemon with failover and load-balancing"
+HOMEPAGE="https://github.com/ncopa/pingu"
+SRC_URI="https://github.com/ncopa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="dev-libs/libev"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-text/asciidoc )"
+
+# Fix QA with install into path /run/pingu must be created at runtime
+PATCHES=( "${FILESDIR}"/"${PN}"-1.5-makefile.patch )
+
+QA_CONFIG_IMPL_DECL_SKIP=( 'strlcpy' )
+
+src_configure() {
+	local myconf=(
+		--prefix=/usr
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+	)
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newtmpfiles "${FILESDIR}"/pingu.tmpfile pingu.conf
+	newinitd "${FILESDIR}"/pingu.initd pingu
+	newconfd "${FILESDIR}"/pingu.confd pingu
+	systemd_dounit "${FILESDIR}"/pingu.service
+	keepdir /var/lib/pingu
+	insinto /etc/pingu
+	newins pingu.conf pingu.conf.example
+}
+
+pkg_postinst() {
+	tmpfiles_process pingu.conf
+}
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 29ddf91d5457..a118c36f5a7e 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,2 +1,4 @@
 DIST rclone-1.67.0-deps.tar.xz 367523832 BLAKE2B 45e33614658aa619f0abe4cb48ae8eb82d39cf3f56ef9c9f0fcfbc14c2ba2868ff237ae0ab1f308bab31352e176209029604c18c22d180d68c0605a6a671a3c2 SHA512 2e4aba47f37ca67c7ba827d9c70bae858cb9633861c546e9cf19205a11109c52ea8e3e7b13f3073be5ab6405770b7c58bb00124393b712bd59fa25da6930987e
 DIST rclone-1.67.0.tar.gz 17232236 BLAKE2B 8241234a970335bb67a5f51b11fdc79afe4a3894c1df2409d141cc8662fec669c1d273e7e67383291703cf66a4168a0ff3c3f8e28d569b0df340c0e7b4a4c324 SHA512 9d336c6a03ba7711f88fbd6ff019b4ce02825467b9656bba8811e9c27fe857ba5d64d863e1f5f3129cbcc89509891615d911794376c90775901a7de1b0741448
+DIST rclone-1.68.0-deps.tar.xz 313382892 BLAKE2B 5dbf928d1a9ee4eccd796c5d083da1fefc115af9b087072708fa5a9e98a5bc74f824e922c1cad8f132c2549d4c335877c4fa78f8842a1732972bbe862b0bba28 SHA512 e32a8489ab822648f26b47e58ef7a7a1f3776ee08b585a642a21e02b31095ddef22b068e97cf21545e6a806b467d4d5e79eab4ae31da9ccf238d7735ca6dc35f
+DIST rclone-1.68.0.tar.gz 17441116 BLAKE2B 445cd8607950b25cf973350a62d884c3b786eadd6e781d36a1886e085871accc6743672f993f6da8a15a1af7e0146110ff931fe169d6f8a4586cf772e6e17fc9 SHA512 899255f6a22c53b7ab5b59c0f3532bc64b9b3b2691e7202a97fea5047cc8cdf042c2e235cdac67c8cf18e3d68ca2b2ca1eb4d871bffcba8c97514c7ef8db0e13
diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml
index 77f51273cdf6..08aec66404f8 100644
--- a/net-misc/rclone/metadata.xml
+++ b/net-misc/rclone/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Maciej Barć</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://gitlab.com/rclone/rclone/-/issues/</bugs-to>
+		<bugs-to>https://github.com/rclone/rclone/issues/</bugs-to>
 		<remote-id type="github">rclone/rclone</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rclone/rclone-1.68.0.ebuild b/net-misc/rclone/rclone-1.68.0.ebuild
new file mode 100644
index 000000000000..b59ebe324c66
--- /dev/null
+++ b/net-misc/rclone/rclone-1.68.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 bash-completion-r1 check-reqs edo go-module
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/
+	https://github.com/rclone/rclone/"
+SRC_URI="
+	https://github.com/rclone/rclone/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	sys-fs/fuse:3
+"
+
+CHECKREQS_DISK_BUILD="2500M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_compile() {
+	local go_ldflags="
+		-X github.com/rclone/rclone/fs.Version=${PV}
+	"
+	local -a go_buildargs=(
+		-ldflags "${go_ldflags}"
+		-mod=readonly
+		-o ./
+	)
+	ego build "${go_buildargs[@]}" .
+
+	edob ./rclone genautocomplete bash "${PN}.bash"
+	edob ./rclone genautocomplete zsh "${PN}.zsh"
+}
+
+src_test() {
+	# Setting CI skips unreliable tests, see "fstest/testy/testy.go"
+	# "TestAddPlugin" and "TestRemovePlugin" fail.
+	local -x CI="true"
+	local -x RCLONE_CONFIG="/not_found"
+
+	edob go test -mod=readonly -v -run "!Test.*Plugin" ./...
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "${PN}"
+	dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone
+	dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs
+
+	newbashcomp "${PN}.bash" "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins "${PN}.zsh" "_${PN}"
+
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch b/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch
deleted file mode 100644
index a6ff70b353d5..000000000000
--- a/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-https://github.com/resurrecting-open-source-projects/openrdate/pull/3
-
-From: Sam James <sam@gentoo.org>
-Date: Thu, 3 Feb 2022 09:23:35 +0000
-Subject: [PATCH] Use <stdint.h> to fix musl compatibility
-
-uint32_t and friends are provided by <stdint.h> and the types
-previously being relied on are non-standard, so let's swap.
-
-This fixes building rdate on e.g. musl rather than glibc.
-
-Bug: https://bugs.gentoo.org/832554
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/ntp.c
-+++ b/src/ntp.c
-@@ -52,6 +52,7 @@
- #include <netdb.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <time.h>
- #include <unistd.h>
-@@ -106,11 +107,11 @@ struct ntp_data {
-     double		receive;
-     double		transmit;
-     double		current;
--    u_int64_t	recvck;
-+    uint64_t	recvck;
- 
-     /* Local State */
-     double		originate;
--    u_int64_t	xmitck;
-+    uint64_t	xmitck;
- };
- 
- void	ntp_client(const char *, int, struct timeval *, struct timeval *, int, int, int);
-@@ -282,7 +283,7 @@ write_packet(int fd, struct ntp_data *data)
- 
-     packet[0] = (NTP_VERSION << 3) | (NTP_MODE_CLIENT);
- 
--    data->xmitck = (u_int64_t)arc4random() << 32 | arc4random();
-+    data->xmitck = (uint64_t)arc4random() << 32 | arc4random();
- 
-     /*
-      * Send out a random 64-bit number as our transmit time.  The NTP
-@@ -300,7 +301,7 @@ write_packet(int fd, struct ntp_data *data)
-      * the transmit field intelligible.
-      */
- 
--    *(u_int64_t *)(packet + NTP_TRANSMIT) = data->xmitck;
-+    *(uint64_t *)(packet + NTP_TRANSMIT) = data->xmitck;
- 
-     data->originate = current_time(JAN_1970);
- 
-@@ -453,7 +454,7 @@ double
- current_time(double offset)
- {
-     struct timeval current;
--    u_int64_t t;
-+    uint64_t t;
- 
-     if (gettimeofday(&current, NULL))
-         err(1, "Could not get local time of day");
---- a/src/ntpleaps.c
-+++ b/src/ntpleaps.c
-@@ -45,12 +45,13 @@
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
- 
- #include "ntpleaps.h"
- 
--static u_int64_t *leapsecs;
-+static uint64_t *leapsecs;
- static unsigned int leapsecs_num;
- 
- 
-@@ -81,10 +82,10 @@ ntpleaps_init(void)
- }
- 
- int
--ntpleaps_sub(u_int64_t *t)
-+ntpleaps_sub(uint64_t *t)
- {
-     unsigned int i = 0;
--    u_int64_t u;
-+    uint64_t u;
-     int r = 1;
- 
-     if (ntpleaps_init() == -1)
-@@ -105,10 +106,10 @@ ntpleaps_sub(u_int64_t *t)
-     return (r);
- }
- 
--u_int32_t
--read_be_dword(u_int8_t *ptr)
-+uint32_t
-+read_be_dword(uint8_t *ptr)
- {
--    u_int32_t res;
-+    uint32_t res;
- 
-     memcpy(&res, ptr, 4);
-     return (ntohl(res));
-@@ -120,10 +121,10 @@ ntpleaps_read(void)
- {
-     int fd;
-     unsigned int r;
--    u_int8_t buf[32];
--    u_int32_t m1, m2, m3;
--    u_int64_t s;
--    u_int64_t *l;
-+    uint8_t buf[32];
-+    uint32_t m1, m2, m3;
-+    uint64_t s;
-+    uint64_t *l;
- 
-     fd = open("/usr/share/zoneinfo/right/UTC", O_RDONLY | O_NDELAY);
-     if (fd == -1)
-@@ -153,7 +154,7 @@ ntpleaps_read(void)
-         close(fd);
-         return (-1);
-     }
--    if ((l = (u_int64_t *)malloc(r << 3)) == NULL) {
-+    if ((l = (uint64_t *)malloc(r << 3)) == NULL) {
-         close(fd);
-         return (-1);
-     }
---- a/src/ntpleaps.h
-+++ b/src/ntpleaps.h
-@@ -46,11 +46,13 @@
- #ifndef _NTPLEAPS_H
- #define _NTPLEAPS_H
- 
-+#include <stdint.h>
-+
- /* Offset between struct timeval.tv_sec and a tai64_t */
- #define	NTPLEAPS_OFFSET	(4611686018427387914ULL)
- 
- /* Hide this ugly value from programmes */
--#define	SEC_TO_TAI64(s)	(NTPLEAPS_OFFSET + (u_int64_t)(s))
-+#define	SEC_TO_TAI64(s)	(NTPLEAPS_OFFSET + (uint64_t)(s))
- #define	TAI64_TO_SEC(t)	((t) - NTPLEAPS_OFFSET)
- 
- /* Initializes the leap second table. Does not need to be called
-@@ -70,6 +72,6 @@ int ntpleaps_read(void);
-  * to posix clock tick time.
-  * returns 0 on success, -1 on error (time is unchanged), 1 on leap second
-  */
--int ntpleaps_sub(u_int64_t *);
-+int ntpleaps_sub(uint64_t *);
- 
- #endif
---- a/src/rfc868time.c
-+++ b/src/rfc868time.c
-@@ -50,6 +50,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <err.h>
-+#include <stdint.h>
- #include <string.h>
- #include <netdb.h>
- #include <unistd.h>
-@@ -68,10 +69,10 @@ rfc868time_client (const char *hostname, int family, struct timeval *new,
- {
-     struct addrinfo hints, *res0, *res;
-     struct timeval old;
--    u_int32_t tim;	/* RFC 868 states clearly this is an uint32 */
-+    uint32_t tim;	/* RFC 868 states clearly this is an uint32 */
-     int s;
-     int error;
--    u_int64_t td;
-+    uint64_t td;
- 
-     memset(&hints, 0, sizeof(hints));
-     hints.ai_family = family;
diff --git a/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch b/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch
deleted file mode 100644
index 05289f3453c9..000000000000
--- a/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/resurrecting-open-source-projects/openrdate/pull/4
-
-From: Sam James <sam@gentoo.org>
-Date: Thu, 3 Feb 2022 09:30:53 +0000
-Subject: [PATCH] Respect AR from environment
-
-Detect `AR` from the environment (first the AR environment variable, but
-failing that, ${CHOST}-ar). This allows using different toolchains (e.g.
-Clang and LLVM's tooling) and also facilitates cross-compilation.
-
-Bug: https://bugs.gentoo.org/729998
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,6 +11,8 @@ AC_CONFIG_SRCDIR([src/rdate.c])
- AC_CONFIG_HEADERS([config.h])
- AC_ARG_VAR([kernel_version], [the version of the kernel to build against])
- 
-+AC_CANONICAL_HOST
-+
- # Checks for programs.
- AC_PROG_CC
- 
-@@ -22,6 +24,8 @@ AC_PROG_INSTALL
- AC_PROG_RANLIB
- AC_PROG_EGREP
- 
-+AM_PROG_AR
-+
- # Checks for libraries.
- AC_CHECK_LIB([c], [fork])
- AC_CHECK_LIB([util], [malloc])
-@@ -52,7 +56,6 @@ AC_CHECK_FUNCS([gettimeofday memset select socket])
- AC_PATH_PROG([UNAME], [uname],
-                [:])
- 
--AC_CANONICAL_HOST
- # Determine the particulars of the host
- case "${host}" in
- 	*-*-linux*)
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 9bb86350bfed..14a5d49dbd53 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,2 +1 @@
-DIST s6-networking-2.7.0.2.tar.gz 115997 BLAKE2B 24728f3b5e08eb94b295f345231a348c072c08a84d42585763bed8fe7057eeee6860b0d00f8548a86a896db98f1c4f51346b12f9361d500f962de6defe39308e SHA512 49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631
 DIST s6-networking-2.7.0.3.tar.gz 116055 BLAKE2B 1f2a6c3796aac95526fac68c8918831089eecb1536f42e4bfd85640eac8e4b0197ca03a039eb37671e1f0032419dfa4f7397b03a352b8c38c17609e75d79f09c SHA512 50d369303bd448d09a3f6431e64fb0f0b13383c92764b499ed881af3a6a8c4f779f1f9d98341943f6fdc8b18d16df444897d3750212df89efd838b6de562eede
diff --git a/net-misc/s6-networking/s6-networking-2.7.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.7.0.2.ebuild
deleted file mode 100644
index 7d7abc64001e..000000000000
--- a/net-misc/s6-networking/s6-networking-2.7.0.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
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	dev-lang/execline:=
-	>=dev-libs/skalibs-2.14.1.0:=
-	>=net-dns/s6-dns-2.3.7.0:=
-	sys-apps/s6:=[execline]
-	ssl? ( dev-libs/libretls:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/s6"
-		--with-lib="/usr/$(get_libdir)/s6-dns"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-		$(use_enable ssl ssl libtls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	optfeature "man pages" app-doc/s6-networking-man-pages
-}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 3ca9da5463d0..dd12ae1aacac 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1 @@
-DIST smb4k-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz 33212 BLAKE2B 774f56888ff29da7bbe9f94b74838d628052520b3c5f97e52d4f3b3dd20c0207d1e706e398b24a54c7a03cc3b9c5693c70e18f4418bfd9c83d8e3ce48cd19fe9 SHA512 004ebf52194a2801c01429990b00ada1b7e2850d1087d3efacf29542cac6a9bb351181ff8ef6713550279d9c5c2f415dcdfba847ef5c848a564b2454e6c05e81
-DIST smb4k-3.2.5.tar.xz 4314812 BLAKE2B 9c5ca6f3d9607be1e5673f7d32a8dc5f191045ccc5607a4ccd9d48d07fc698278db5bbe5e8ffcc4fa9a1f390d52e7ebb877bc01146754873af5d3c266aad16d2 SHA512 6273c9701cf3d65f9b1d7ce0cbe929dc8f422b6a7a308f0b3c4c08e30acf2d189bc1ef4f960dad25aaf71b38b29ce6c41ba8adf50f0bb139e25a0d65a8e67a28
 DIST smb4k-3.2.80.tar.xz 4345084 BLAKE2B 117074e852c6393ba07f71ab0561c61a41d0a45128aad402a5baa3a41efefb8e2b2e984d69f04e44a1940678ea404003685fe83c2cd36bddc1cbe756e78e6833 SHA512 46acd2adad4b7e8278d6fdf4ee31691a75b88222188271975adf5391d7767af8e7617695a51c2536e621f57db97627e4ab3db1953cdc6cc475dd462b5da2836a
diff --git a/net-misc/smb4k/smb4k-3.2.5-r2.ebuild b/net-misc/smb4k/smb4k-3.2.5-r2.ebuild
deleted file mode 100644
index 652cf6fbbece..000000000000
--- a/net-misc/smb4k/smb4k-3.2.5-r2.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="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz"
-	KEYWORDS="amd64 arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+discovery plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-	discovery? ( net-libs/kdsoap:=[qt5(+)] )
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-plasma/libplasma-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-3.2.5-bundled-kdsoap-ws-discovery-client.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
-		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
-	)
-
-	use discovery && mycmakeargs+=(
-		# do not attempt to find now Qt6-based system version
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDSoapWSDiscoveryClient=ON
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.2.80.ebuild b/net-misc/smb4k/smb4k-3.2.80.ebuild
index 9e0ab7802da4..71945febd679 100644
--- a/net-misc/smb4k/smb4k-3.2.80.ebuild
+++ b/net-misc/smb4k/smb4k-3.2.80.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="https://downloads.sourceforge.net/${PN}/Development/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
index 784cfaef5d9a..97e84321b8f2 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+HOMEPAGE="https://www.spice-space.org https://gitlab.freedesktop.org/spice/spice-gtk"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 	inherit git-r3
diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
index 508b80c65082..fce7fc5c833f 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+HOMEPAGE="https://www.spice-space.org https://gitlab.freedesktop.org/spice/spice-gtk"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 	inherit git-r3
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 5f81513a6c11..69199a32af5f 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+HOMEPAGE="https://www.spice-space.org https://gitlab.freedesktop.org/spice/spice-gtk"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 	inherit git-r3
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 511109c6732f..d38d8cc71dc3 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -2,3 +2,4 @@ DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e80
 DIST streamlink-6.7.4.tar.gz 744387 BLAKE2B bd8fb9af560fbe164a63fd1b698100765c716b44b6f3364e6ad072f69d0fdee9d22dd0fda6c297f249915c9a60f10e2089228a8c19244a7ef18b5809632bf96a SHA512 266c66626624814d708a228d4e2e62c443c3973fb139632a88086619c755fa80d97fad077a2a7383f9beb3e2f4464274beb0bb446b85f6f63d6704a88a9c2e29
 DIST streamlink-6.8.1.tar.gz 748765 BLAKE2B bf42375bc37432c66e8d2c9d8c3b31cfbda8c990bc4d7b83970198c4f60b5dc30d5ce3daf339bb842bc058955edff55df16da4f4cc0362410eaaff1bb6d74e28 SHA512 51cb03ca2414ec64f95704833568bb48aaae458e77f6ef3f4d858b564908cff4944c07a0b4d3bb648a0fe2bbb6a43a7964333878e31aef0b2a6ff3b9048b8e1d
 DIST streamlink-6.8.3.tar.gz 753510 BLAKE2B 94ac37947911765d14d135582eb86acb682af3f84e3bb4faeef9d3bb0a2d75f06a4a2b9ca57ac7966e5e4e8b14cdf2a62611e15990705ebd4995442b12badbc9 SHA512 a5053ea38d4f444e478c0ea5d9ff9f858637a29f3bdfca532796bb178ad78e4de17623dabb64cccd141005688ff2dc7349246a01919e507483baea55e084b75c
+DIST streamlink-6.9.0.tar.gz 758696 BLAKE2B 14baa37903c4b3084206a59959e47e5c764603da24084361b76a21d013b833ecb49df7d6baa45eb93f3491469deda828553439cc91a0ba6af07f96ce92c13764 SHA512 7ace33553dfdf7e45642347cc468c746ef9a7e400cd5629e326a93d5c0e57d77da1538b00ebf01665f147d41e5b8cc3de241dcc0b6b1b83329ecfb46950f8d00
diff --git a/net-misc/streamlink/streamlink-6.9.0.ebuild b/net-misc/streamlink/streamlink-6.9.0.ebuild
new file mode 100644
index 000000000000..3e4bc7e2f370
--- /dev/null
+++ b/net-misc/streamlink/streamlink-6.9.0.ebuild
@@ -0,0 +1,99 @@
+# 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-asyncio[${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
+
+python_test() {
+	# Skip tests requiring <dev-python/pytest-8.0.0
+	# https://github.com/streamlink/streamlink/pull/5901
+	EPYTEST_DESELECT+=(
+		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception
+		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error
+		tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach
+		tests/webbrowser/cdp/test_client.py::TestNavigate::test_error
+		tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure
+		tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json
+		tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id
+		'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]'
+		'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]'
+		tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command
+		tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception
+		tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error
+		tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result
+	)
+
+	epytest
+}
diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild
index 6135d7c43f78..5018392b1133 100644
--- a/net-misc/sunshine/sunshine-9999.ebuild
+++ b/net-misc/sunshine/sunshine-9999.ebuild
@@ -52,7 +52,7 @@ DESCRIPTION="Self-hosted game stream host for Moonlight"
 HOMEPAGE="https://github.com/LizardByte/Sunshine"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cuda debug libdrm svt-av1 trayicon vaapi wayland X x264 x265"
+IUSE="cuda debug libdrm svt-av1 systemd trayicon vaapi wayland X x264 x265"
 
 # Strings for CPU features in the useflag[:configure_option] form
 # if :configure_option isn't set, it will use 'useflag' as configure option
@@ -338,6 +338,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=no
 		-DBOOST_USE_STATIC=no
+		-DBUILD_DOCS=no
 		-DBUILD_TESTS=no
 		-DCCACHE_FOUND=no
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=yes
@@ -352,9 +353,9 @@ src_configure() {
 		-DSUNSHINE_ENABLE_TRAY=$(usex trayicon)
 		-DSUNSHINE_REQUIRE_TRAY=$(usex trayicon)
 		-DSUNSHINE_SYSTEM_WAYLAND_PROTOCOLS=yes
-		-DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir)
 		-DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d
 	)
+	use systemd && mycmakeargs+=( -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) )
 	[[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true )
 	CMAKE_USE_DIR="${S}" cmake_src_configure
 }
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
deleted file mode 100644
index 48f881ebf961..000000000000
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
-HOMEPAGE="https://tigervnc.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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-xorg-module/tigervnc-xorg-module-1.14.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.0.ebuild
index 65b3a6997f9c..e7af3cd37fdd 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-misc/tigervnc-${PV}[server]
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 7ccc45a9c450..23dfd6d42f59 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,2 @@
-DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
-DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
deleted file mode 100644
index bfcf6ceaef16..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add more possible paths for Xsession, depending on which display manager is
-installed.  We need an Xsession that executes its command line parameters, so
-leave xinit last.
-
-See also https://bugs.gentoo.org/746227
-
---- a/unix/vncserver/vncserver.in
-+++ b/unix/vncserver/vncserver.in
-@@ -437,11 +437,14 @@
- 	die "$prog: couldn't find \"$cmd\" on your PATH.\n";
-     }
- 
--    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
--        if (-x "$cmd") {
--            $Xsession = $cmd;
--            last;
--        }
-+    $Xsession=$ENV{TIGERVNC_XSESSION_FILE};
-+    if (not defined $Xsession) {
-+	foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
-+	    if (-x "$cmd") {
-+		$Xsession = $cmd;
-+		last;
-+	    }
-+	}
-     }
-     if (not defined $Xsession) {
-         die "$prog: Couldn't find suitable Xsession.\n";
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
new file mode 100644
index 000000000000..8408fb77db5f
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/938694
+https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582
+
+From 4f6a3521874da5a67fd746389cfa9b6199eb3582 Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Mon, 29 Jul 2024 16:16:08 +0200
+Subject: [PATCH] Add missing comma in default security type list
+
+Otherwise it merges with the next entry, removing both of them from the
+default list.
+--- a/common/rfb/SecurityClient.cxx
++++ b/common/rfb/SecurityClient.cxx
+@@ -60,7 +60,7 @@ StringParameter SecurityClient::secTypes
+  "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,"
+ #endif
+ #ifdef HAVE_NETTLE
+- "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII"
++ "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII,"
+ #endif
+  "VncAuth,None",
+ ConfViewer);
diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
deleted file mode 100644
index 62d96695236a..000000000000
--- a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2023 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.8"
-XSERVER_PATCH_VERSION="21.1.1"
-
-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 ~ia64 ~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
-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/libbsd
-		dev-libs/openssl:0=
-		sys-libs/pam
-		x11-libs/libXau
-		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
-		opengl? ( media-libs/libglvnd[X] )
-		!net-misc/turbovnc[server]
-	)
-	viewer? (
-		media-video/ffmpeg:=
-		x11-libs/fltk: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/libxcvt
-		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.12.0-xsession-path.patch
-	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-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 's:\(present.h\):../present/\1:' os/utils.c || die
-		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 \
-			--disable-present \
-			--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 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.13.1.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.13.1.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-
-		# comment out pam_selinux.so, the server does not start if missing
-		# part of bug #746227
-		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
-		# 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 && {
-		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:'
-	}
-
-	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/tigervnc/tigervnc-1.14.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..771510fc74c3
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2024 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.13"
+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 ~ia64 ~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
+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/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
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk: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/libxcvt
+		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}"/${P}-typo-VncAuth.patch # bug #938694
+)
+
+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
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# 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/tigervnc/tigervnc-1.14.0.ebuild b/net-misc/tigervnc/tigervnc-1.14.0.ebuild
deleted file mode 100644
index dfc8ef4f5e0b..000000000000
--- a/net-misc/tigervnc/tigervnc-1.14.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2024 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.13"
-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 ~ia64 ~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
-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/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
-		opengl? ( media-libs/libglvnd[X] )
-		!net-misc/turbovnc[server]
-	)
-	viewer? (
-		media-video/ffmpeg:=
-		x11-libs/fltk: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/libxcvt
-		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
-)
-
-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
-
-		# comment out pam_selinux.so, the server does not start if missing
-		# part of bug #746227
-		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
-		# 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/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 24dd8515063c..dfc8ef4f5e0b 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -44,7 +44,6 @@ COMMON_DEPEND="
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	server? (
-		dev-libs/libbsd
 		dev-libs/openssl:0=
 		sys-libs/pam
 		x11-libs/libXau
@@ -97,7 +96,7 @@ BDEPEND="
 PATCHES=(
 	# Restore Java viewer
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
 
@@ -198,8 +197,8 @@ src_install() {
 		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.13.1.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.13.90.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
 
 		systemd_douserunit unix/vncserver/vncserver@.service
 
@@ -221,6 +220,13 @@ pkg_postinst() {
 		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 && \
diff --git a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild
deleted file mode 100644
index 442fb8e5f171..000000000000
--- a/net-misc/tinyssh/tinyssh-20240101-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 systemd toolchain-funcs
-
-DESCRIPTION="A small SSH server with state-of-the-art cryptography"
-HOMEPAGE="https://tinyssh.org"
-if [[ "${PV}" == "99999999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"
-else
-	SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="CC0-1.0"
-SLOT="0"
-
-IUSE="+sodium"
-
-DEPEND="
-	sodium? ( dev-libs/libsodium:= )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/ucspi-tcp
-"
-
-PATCHES=(
-	"${FILESDIR}/tinyssh-20240101_c99.patch"
-	"${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
-)
-
-src_prepare() {
-	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
-	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
-	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
-
-	default
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	if use sodium
-	then
-		emake \
-			CC="$(tc-getCC)" \
-			LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
-			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
-			LDFLAGS="${LDFLAGS}"
-	else
-		emake CC="$(tc-getCC)"
-	fi
-}
-
-src_install() {
-	dosbin build/bin/tinysshd{,-makekey}
-	dobin build/bin/tinysshd-printkey
-	doman man/*
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service"
-	systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket"
-	systemd_dounit "${FILESDIR}/${PN}-makekey.service"
-}
-
-pkg_postinst() {
-	einfo "TinySSH is in beta stage, and ready for production use."
-	einfo "See https://tinyssh.org for more information."
-}
diff --git a/net-misc/tinyssh/tinyssh-20240101-r2.ebuild b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
new file mode 100644
index 000000000000..db7411fdc4a4
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A small SSH server with state-of-the-art cryptography"
+HOMEPAGE="https://tinyssh.org"
+if [[ "${PV}" == "99999999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"
+else
+	SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="CC0-1.0"
+SLOT="0"
+
+IUSE="+sodium"
+
+DEPEND="
+	sodium? ( dev-libs/libsodium:= )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/ucspi-tcp
+"
+
+PATCHES=(
+	"${FILESDIR}/tinyssh-20240101_c99.patch"
+	"${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
+)
+
+src_prepare() {
+	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
+	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
+	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
+
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	if use sodium
+	then
+		# -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>`
+		emake \
+			CC="$(tc-getCC)" \
+			LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
+			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
+			LDFLAGS="${LDFLAGS}"
+	else
+		emake CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	dosbin build/bin/tinysshd{,-makekey}
+	dobin build/bin/tinysshd-printkey
+	doman man/*
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service"
+	systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket"
+	systemd_dounit "${FILESDIR}/${PN}-makekey.service"
+}
+
+pkg_postinst() {
+	einfo "TinySSH is in beta stage, and ready for production use."
+	einfo "See https://tinyssh.org for more information."
+}
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 4b288ff014ec..9d2ed3e6c433 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd toolchain-funcs
 
@@ -28,10 +28,11 @@ RDEPEND="
 	sys-apps/ucspi-tcp
 "
 
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die
+PATCHES=(
+	"${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
+)
 
+src_prepare() {
 	# Use make-tinysshcc.sh script, which has no tests and doesn't execute
 	# binaries. See https://github.com/janmojzis/tinyssh/issues/2
 	sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
@@ -44,10 +45,11 @@ src_compile() {
 
 	if use sodium
 	then
+		# -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>`
 		emake \
 			CC="$(tc-getCC)" \
 			LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
-			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
+			CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
 			LDFLAGS="${LDFLAGS}"
 	else
 		emake CC="$(tc-getCC)"
diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild
index 5dfbbc31163e..b27cb174ba1e 100644
--- a/net-misc/trurl/trurl-9999.ebuild
+++ b/net-misc/trurl/trurl-9999.ebuild
@@ -29,10 +29,6 @@ DEPEND=">=net-misc/curl-7.81.0"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14-fix-makefile.patch
-)
-
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index ed012e1186c2..27b9ede55b74 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1,3 +1,3 @@
-DIST Tuba-0.6.3.gh.tar.gz 1124191 BLAKE2B b5a7107c94d9adf89fc02224891c12b71fc2b640e962006fbfcf1d0673e5f3f73b11423b6d66e8952e2aef122ade6a57607cced5d4707bd91193157fd561ce11 SHA512 b987b9b8434a0abd086a3197154b27bd4a0bca69df07bcec26c59a2da51cf447943e7a05a83529a99670f2b1b7ea1a7dce1da39148844d23706940f3a0a423d8
-DIST Tuba-0.8.1.gh.tar.gz 1737171 BLAKE2B b7bd9b0b6559a108886c46927ebdfb08e533c72fe63bfcb17f46c6aba3b637c99e324c83037a26024094516b659c247f2b6a61390313a4503ad593a4db97a39b SHA512 8e37e806ada3ad507761fbbf7f028f87c83e9e25fc3bd5a922fd9e6b0334c4c86b6c988ac337e5889f7ab05fd62e36044a9934b589583d1eabb2efbfae4f6a5d
 DIST Tuba-0.8.2.gh.tar.gz 1751598 BLAKE2B 9fb0a32d7731ca406a6f79223c862fbe0b75493ace5dc2d83cdab111e955ded2f1b42c31542e38b027245df29ba6a84d88014cafdba0214bdb22910c933989bd SHA512 5d00843ae54c7f32adf5bdbecf0798730f797f778aea55bdc6fff1bf7fdb3b386544a209bd621a92774dcbe25d26503ca9da73211355866452069b6fa4542360
+DIST Tuba-0.8.3.gh.tar.gz 1783840 BLAKE2B 11f98de167107bdc53f42aa6e33af14d946b7745e530623b174832bc7ce363ca7b63f83ed2d58f9b179144ebf0499d6773f5be54c2f8fa0f8897b6a2ae020fe8 SHA512 29082a84e0b5149f8a8610575965d252826d564f28eb128a9db3c215a2c1edda23a3b6316f8b62c22a37ab9d340f94e571ea8be96719a3ff714a6b26da90a314
+DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
diff --git a/net-misc/tuba/tuba-0.6.3.ebuild b/net-misc/tuba/tuba-0.6.3.ebuild
deleted file mode 100644
index 4f85b302be9c..000000000000
--- a/net-misc/tuba/tuba-0.6.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2023-2024 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/json-glib-1.4.4[introspection]
-	>=dev-libs/libgee-0.8.5:0.8[introspection]
-	dev-libs/libxml2
-	>=gui-libs/gtk-4.11.3:4[gstreamer,introspection]
-	>=gui-libs/libadwaita-1.4:1[introspection,vala]
-	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
-	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
-	)
-
-	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/tuba/tuba-0.8.2.ebuild b/net-misc/tuba/tuba-0.8.2.ebuild
index e75bb85f2c86..9d6611efb92d 100644
--- a/net-misc/tuba/tuba-0.8.2.ebuild
+++ b/net-misc/tuba/tuba-0.8.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 # TODO: optional dep on libspelling-1
 DEPEND="
diff --git a/net-misc/tuba/tuba-0.8.1.ebuild b/net-misc/tuba/tuba-0.8.3.ebuild
index e75bb85f2c86..e75bb85f2c86 100644
--- a/net-misc/tuba/tuba-0.8.1.ebuild
+++ b/net-misc/tuba/tuba-0.8.3.ebuild
diff --git a/net-misc/tuba/tuba-0.8.4.ebuild b/net-misc/tuba/tuba-0.8.4.ebuild
new file mode 100644
index 000000000000..e75bb85f2c86
--- /dev/null
+++ b/net-misc/tuba/tuba-0.8.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2023-2024 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.5:1[introspection,vala]
+	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
+	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/whois/whois-5.5.23.ebuild b/net-misc/whois/whois-5.5.23.ebuild
index afbc87e1ae4d..b5be510bfed5 100644
--- a/net-misc/whois/whois-5.5.23.ebuild
+++ b/net-misc/whois/whois-5.5.23.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 6a0ecfa84dd3..84fa484d63e2 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -268,9 +268,9 @@ DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff5
 DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
+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 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.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848
diff --git a/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch b/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch
new file mode 100644
index 000000000000..27a991cf719b
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/938204
+https://github.com/zerotier/ZeroTierOne/issues/2345
+https://github.com/zerotier/ZeroTierOne/pull/2349
+https://github.com/zerotier/ZeroTierOne/commit/e915d109530a34370af948a04cac91b2f049c486
+https://github.com/time-rs/time/issues/681
+https://github.com/time-rs/time/pull/671
+
+diff --git a/rustybits/Cargo.lock b/rustybits/Cargo.lock
+index 1b01a0df3..09d9ced0c 100644
+--- a/rustybits/Cargo.lock
++++ b/rustybits/Cargo.lock
+@@ -2855,9 +2855,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -2876,9 +2876,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
+
diff --git a/net-misc/zerotier/zerotier-1.14.0.ebuild b/net-misc/zerotier/zerotier-1.14.0.ebuild
index 933ff2176ec9..9b3f00cf92ca 100644
--- a/net-misc/zerotier/zerotier-1.14.0.ebuild
+++ b/net-misc/zerotier/zerotier-1.14.0.ebuild
@@ -275,8 +275,8 @@ CRATES="
 	thiserror@1.0.58
 	thread_local@1.1.8
 	time-core@0.1.2
-	time-macros@0.2.17
-	time@0.3.34
+	time-macros@0.2.18
+	time@0.3.36
 	tinyvec@1.6.0
 	tinyvec_macros@0.1.1
 	tokio-io-timeout@1.2.0
@@ -399,6 +399,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.14.0-respect-ldflags.patch
 	"${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch
 	"${FILESDIR}"/${PN}-1.12.2-noexecstack.patch
+	"${FILESDIR}"/${PN}-1.14.0-update-time.patch
 )
 
 DOCS=( README.md AUTHORS.md )
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 987dc7f896b3..b8161c1bb97c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,8 +1,8 @@
 DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8 SHA512 233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968
 DIST openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 5024359 BLAKE2B ffdffbd47e76545c2dc2d433d290945ab6eebd910031a60249cd8f6eac24f67841098e61c7e57864428e20a183a46d36dac422bba8cf6f3596f97439875af96b SHA512 abd1e8bda0762500db028f283fe2da9480a419072927295d6f3e1448cae130592511f385a87585843cf88217417c90ef57174ca919cfcf163eb41642a72bb4e3
 DIST openldap-OPENLDAP_REL_ENG_2_5_16.tar.bz2 5022608 BLAKE2B 829e416e3cf92d36df0d6642e44083f9b288ef9c3743a84aef3f03cdf7b08b21ea45231653a2659fe0da285ca47a346d336d02c8e0dda21f039fb9e49630262b SHA512 629b92e275b69a540b200e61165492a4706afdf7b15d21bfe2f1fd4c338ecf397ad0c918e36dcef54d1f0cede2f039a8f73d4735f00e892d64ce9a177d490a07
-DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b SHA512 1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7
+DIST openldap-OPENLDAP_REL_ENG_2_5_18.tar.bz2 5026131 BLAKE2B 0f1a00995bd880b3ee42c4de2c3a405ebb7969de253f4b3866eb46c1856b61539ed7e1133a1b11636efc1da1ed5fc6cae53da60b22ab31486518000d34ff6324 SHA512 77a84950c905d2a4bd25f93108eb79f1416689176531246f12b4c3f6e8e3fe689504cd3f9875142e9bf665306a622ac8fe7e6b39aa4be67099f0965a16634526
 DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c SHA512 bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
-DIST openldap-OPENLDAP_REL_ENG_2_6_5.tar.bz2 5040569 BLAKE2B d1835e560a81bc3df2eb44964162306057ad28869a1e41da7ab823460b4a33437cd385ec9448a6df9bc580afd04dff5c4680e0b91a2f16960ad2c5f3812410ba SHA512 d259ca5ac8fbdcf9bb477e24c0feaf05678ab660007164a54463a954f1b26c3f9740855d16155fa249adcb2652223fdcfc682bb4005b46a5f36e2d5cae37f158
 DIST openldap-OPENLDAP_REL_ENG_2_6_6.tar.bz2 5040213 BLAKE2B 2497b6698344674a9e8db5f2f2531541167065bb8ac9f512ecdb9349115140d5e83daef9b489e244eee08445de57599ddcfeeed71d4aab41edc58a3092910925 SHA512 3c235ff7b26f753afeb0176e95ecbf6a353bf76f00935c091323366bf97289f628d4d7b4ae3e2a31fe0797715d6c69e6704967dc79ccbae7add3023e226ad73b
+DIST openldap-OPENLDAP_REL_ENG_2_6_8.tar.bz2 5065637 BLAKE2B d55345c11bd8892a594c3f7114cd1368e017c2e29997da7a80bdd915308d498f62dfb5cc3a3360b50df78ef5f90a48a566a8ce3ace85ebf9aa6b288a37c4eff2 SHA512 556d1377afc73a84ee325c4d7bcc8446def936b67d3f07df4bd2a243ff30f268c5c0c298977482df1e1a86b2b7a0cd7846fc1f51d706748d39f67f5d621ccc04
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
diff --git a/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch b/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch
new file mode 100644
index 000000000000..4ffee325275b
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch
@@ -0,0 +1,60 @@
+Port upstream commit 337455eb3a66176cc3f66d2c663a72cc7b4178bd to 2.4.59.
+
+With 2.4.x, gentoo-infra saw crashes in nsscache during exit.
+This patch was later reverted upstream because it was not portable to AIX And
+was fixed in a different way in 2.5 & 2.6 releases.
+
+original https://github.com/openldap/openldap/commit/337455eb3a66176cc3f66d2c663a72cc7b4178bd
+revert: https://github.com/openldap/openldap/commit/5e13ef87a94491f9339dbca709db29e76741f1a9
+AIX discussion: https://bugs.openldap.org/show_bug.cgi?id=10176
+diff '--color=auto' -NuarwbB --exclude '*.rej' --exclude '*.orig' openldap-2.4.59.orig/libraries/libldap/init.c openldap-2.4.59/libraries/libldap/init.c
+--- openldap-2.4.59.orig/libraries/libldap/init.c	2021-06-03 11:40:31.000000000 -0700
++++ openldap-2.4.59/libraries/libldap/init.c	2024-08-24 11:15:06.727326650 -0700
+@@ -508,9 +508,6 @@
+ 		gopts->ldo_def_sasl_authcid = NULL;
+ 	}
+ #endif
+-#ifdef HAVE_TLS
+-	ldap_int_tls_destroy( gopts );
+-#endif
+ }
+
+ /*
+diff '--color=auto' -NuarwbB --exclude '*.rej' --exclude '*.orig' openldap-2.4.59.orig/libraries/libldap/tls2.c openldap-2.4.59/libraries/libldap/tls2.c
+--- openldap-2.4.59.orig/libraries/libldap/tls2.c	2024-08-24 11:14:46.910678897 -0700
++++ openldap-2.4.59/libraries/libldap/tls2.c	2024-08-24 11:15:38.103963402 -0700
+@@ -155,6 +155,14 @@
+ 	tls_imp->ti_tls_destroy();
+ }
+
++static void
++ldap_exit_tls_destroy( void )
++{
++	struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
++
++	ldap_int_tls_destroy( lo );
++}
++
+ /*
+  * Initialize a particular TLS implementation.
+  * Called once per implementation.
+@@ -163,6 +171,7 @@
+ tls_init(tls_impl *impl )
+ {
+ 	static int tls_initialized = 0;
++	int rc;
+
+ 	if ( !tls_initialized++ ) {
+ #ifdef LDAP_R_COMPILE
+@@ -175,7 +184,10 @@
+ #ifdef LDAP_R_COMPILE
+ 	impl->ti_thr_init();
+ #endif
+-	return impl->ti_tls_init();
++	rc = impl->ti_tls_init();
++
++	atexit( ldap_exit_tls_destroy );
++	return rc;
+ }
+
+ /*
diff --git a/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch b/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch
new file mode 100644
index 000000000000..ec7775c99dfa
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch
@@ -0,0 +1,41 @@
+--- openldap-2.4.59/servers/slapd/back-meta/conn.c	2021-06-03 11:40:31.000000000 -0700
++++ openldap-2.4.59/servers/slapd/back-meta/conn.c	2024-08-24 14:22:31.677357359 -0700
+@@ -31,6 +31,7 @@
+ 
+ #define AVL_INTERNAL
+ #include "slap.h"
++#include "proto-slap.h"
+ #include "../back-ldap/back-ldap.h"
+ #include "back-meta.h"
+ 
+--- openldap-2.4.59/servers/slapd/back-ldap/bind.c	2021-06-03 11:40:31.000000000 -0700
++++ openldap-2.4.59/servers/slapd/back-ldap/bind.c	2024-08-24 14:22:13.340701355 -0700
+@@ -31,6 +31,7 @@
+ 
+ #define AVL_INTERNAL
+ #include "slap.h"
++#include "proto-slap.h"
+ #include "back-ldap.h"
+ #include "lutil.h"
+ #include "lutil_ldap.h"
+--- openldap-2.4.59/servers/slapd/config.c	2021-06-03 11:40:31.000000000 -0700
++++ openldap-2.4.59/servers/slapd/config.c	2024-08-24 14:22:13.414034645 -0700
+@@ -43,6 +43,7 @@
+ #endif
+ 
+ #include "slap.h"
++#include "proto-slap.h"
+ #ifdef LDAP_SLAPI
+ #include "slapi/slapi.h"
+ #endif
+diff '--color=auto' -NuarwbB openldap-2.4.59.orig/servers/slapd/proto-slap.h openldap-2.4.59/servers/slapd/proto-slap.h
+--- openldap-2.4.59.orig/servers/slapd/proto-slap.h	2024-08-24 14:31:02.304109181 -0700
++++ openldap-2.4.59/servers/slapd/proto-slap.h	2024-08-24 14:31:18.004121208 -0700
+@@ -739,6 +739,7 @@
+ LDAP_SLAPD_F (int) bindconf_tls_set LDAP_P((
+ 	slap_bindconf *bc, LDAP *ld ));
+ LDAP_SLAPD_F (void) bindconf_free LDAP_P(( slap_bindconf *bc ));
++LDAP_SLAPD_F (void) slap_client_keepalive LDAP_P(( LDAP *ld, slap_keepalive *sk ));
+ LDAP_SLAPD_F (int) slap_client_connect LDAP_P(( LDAP **ldp, slap_bindconf *sb ));
+ LDAP_SLAPD_F (int) config_generic_wrapper LDAP_P(( Backend *be,
+ 	const char *fname, int lineno, int argc, char **argv ));
diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch
deleted file mode 100644
index c2acb679e3ba..000000000000
--- a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2055,7 +2055,7 @@ dnl
- WITH_SYSTEMD=no
- systemdsystemunitdir=
- ol_link_systemd=no
--if test $ol_enable_slapd == no && test $ol_enable_balancer != yes ; then
-+if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then
- 	if test $ol_with_systemd != no ; then
- 		AC_MSG_WARN([servers disabled, ignoring --with-systemd=$ol_with_systemd argument])
- 		ol_with_systemd=no
diff --git a/net-nds/openldap/files/openldap-2.6.3-clang16.patch b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
deleted file mode 100644
index 7027197281b2..000000000000
--- a/net-nds/openldap/files/openldap-2.6.3-clang16.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From ee4983302d6f052e77ab0332d2a128d169c2eacb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Tue, 15 Nov 2022 21:45:27 +0100
-Subject: [PATCH] Remove default-int/k&r declarations from the configure macros
-
-Recently, Clang tried to switch to having K&R prototypes and other
-non-strictly-conforming prototypes error out, as a result of C2x changes
-to the standard.  These have been located across many packages, and
-range in severity from mild compile errors to runtime misconfiguration
-as a result of broken configure scripts.
-
-This covers all the instances I could find by grepping around the
-codebase, and gets OpenLDAP building on my system.
-
-Bug: https://bugs.gentoo.org/871288
-Bug: https://bugs.gentoo.org/871372
---- a/build/openldap.m4
-+++ b/build/openldap.m4
-@@ -154,6 +154,7 @@ fi
- if test $ol_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
-+#include <stdlib.h>
- #ifndef HAVE_EBCDIC
- #	define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- #	define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -394,9 +395,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
- AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
- [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
- 
--int main(argc, argv)
--	int argc;
--	char **argv;
-+int main(int argc, char **argv)
- {
- OL_PTHREAD_TEST_FUNCTION
- }
-@@ -518,7 +517,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
- #include <sys/types.h>
- #include <regex.h>
- static char *pattern, *string;
--main()
-+int main(void)
- {
- 	int rc;
- 	regex_t re;
-@@ -545,7 +544,8 @@ AC_DEFUN([OL_C_UPPER_LOWER],
- [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <ctype.h>
--main()
-+#include <stdlib.h>
-+int main(void)
- {
- 	if ('C' == toupper('C'))
- 		exit(0);
-@@ -603,7 +603,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
- 			]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
- 	else
- 		AC_RUN_IFELSE([AC_LANG_SOURCE([[
--			main() {
-+			int main(void) {
- 				char buf[100];
- 				buf[0] = 0;
- 				strerror_r( 1, buf, sizeof buf );
---- a/configure.ac
-+++ b/configure.ac
-@@ -1031,7 +1031,11 @@ dnl ----------------------------------------------------------------
- AC_CHECK_HEADERS( sys/epoll.h )
- if test "${ac_cv_header_sys_epoll_h}" = yes; then
- 	AC_MSG_CHECKING(for epoll system call)
--	AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv)
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
-+#ifdef HAVE_SYS_POLL_H
-+#include <sys/epoll.h>
-+#endif
-+int main(int argc, char **argv)
- {
- 	int epfd = epoll_create(256);
- 	exit (epfd == -1 ? 1 : 0);
-@@ -1493,10 +1497,8 @@ pthread_rwlock_t rwlock;
- 				dnl save the flags
- 				AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <pthread.h>
--#ifndef NULL
--#define NULL (void*)0
--#endif
--]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
-+pthread_t thread;
-+]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
- 			])
- 
- 			if test $ol_cv_func_pthread_detach = no ; then
-@@ -1551,6 +1553,9 @@ dnl			esac
- 				AC_CACHE_CHECK([if select yields when using pthreads],
- 					ol_cv_pthread_select_yields,[
- 				AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#define _XOPEN_SOURCE 500               /* For pthread_setconcurrency() on glibc */
-+#include <stdlib.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <unistd.h>
-@@ -1561,8 +1566,7 @@ dnl			esac
- 
- static int fildes[2];
- 
--static void *task(p)
--	void *p;
-+static void *task(void *p)
- {
- 	int i;
- 	struct timeval tv;
-@@ -1586,9 +1590,7 @@ static void *task(p)
- 	exit(0); /* if we exit here, the select blocked the whole process */
- }
- 
--int main(argc, argv)
--	int argc;
--	char **argv;
-+int main(int argc, char **argv)
- {
- 	pthread_t t;
- 
---- a/contrib/ldaptcl/tclAppInit.c
-+++ b/contrib/ldaptcl/tclAppInit.c
-@@ -45,9 +45,7 @@ EXTERN int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-  */
- 
- int
--main(argc, argv)
--    int argc;			/* Number of command-line arguments. */
--    char **argv;		/* Values of command-line arguments. */
-+main(int argc, char **argv)
- {
- #ifdef USE_TCLX
-     TclX_Main(argc, argv, Tcl_AppInit);
---- a/contrib/ldaptcl/tkAppInit.c
-+++ b/contrib/ldaptcl/tkAppInit.c
-@@ -37,16 +37,9 @@ int (*tclDummyMathPtr)() = matherr;
-  * This is the main program for the application.
-  *-----------------------------------------------------------------------------
-  */
--#ifdef __cplusplus
- int
- main (int    argc,
-       char **argv)
--#else
--int
--main (argc, argv)
--    int    argc;
--    char **argv;
--#endif
- {
- #ifdef USE_TCLX
-     TkX_Main(argc, argv, Tcl_AppInit);
-@@ -68,14 +61,8 @@ main (argc, argv)
-  * interp->result if an error occurs.
-  *-----------------------------------------------------------------------------
-  */
--#ifdef __cplusplus
- int
- Tcl_AppInit (Tcl_Interp *interp)
--#else
--int
--Tcl_AppInit (interp)
--    Tcl_Interp *interp;
--#endif
- {
-     if (Tcl_Init (interp) == TCL_ERROR) {
-         return TCL_ERROR;
---- a/servers/slapd/syslog.c
-+++ b/servers/slapd/syslog.c
-@@ -209,7 +209,7 @@ openlog(const char *ident, int logstat, int logfac)
- }
- 
- void
--closelog()
-+closelog(void)
- {
- 	(void)close(LogFile);
- 	LogFile = -1;
--- 
-2.38.1
-
diff --git a/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch
new file mode 100644
index 000000000000..e6ab4e5a46cb
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch
@@ -0,0 +1,40 @@
+From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Wed, 26 Jun 2024 07:41:01 +0000
+Subject: Fix incompatible pointer type error with gcc option
+ -Wincompatible-pointer-types
+
+lib32-openldap do_compile failure with gcc-14:
+| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types]
+|   971 |                                         keyhash.bv_val, &keyhash.bv_len ) < 0 ) {
+|       |                                                         ^~~~~~~~~~~~~~~
+|       |                                                         |
+|       |                                                         ber_len_t * {aka long unsigned int *}
+| In file included from tls_g.c:44:
+| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'}
+|  2406 |                        size_t *result_size);
+|       |                        ^~~
+
+Upstream-Status: Submitted
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ libraries/libldap/tls_g.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index 7c23875..b4b487d 100644
+--- a/libraries/libldap/tls_g.c
++++ b/libraries/libldap/tls_g.c
+@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval
+ 		keyhash.bv_len = gnutls_hash_get_len( alg );
+ 		keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len );
+ 		if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key,
+-					keyhash.bv_val, &keyhash.bv_len ) < 0 ) {
++					keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) {
+ 			goto done;
+ 		}
+ 	} else {
+-- 
+2.34.1
+
diff --git a/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch
new file mode 100644
index 000000000000..9f79048645d6
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch
@@ -0,0 +1,71 @@
+# https://git.openldap.org/openldap/openldap/-/commit/fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab.patch
+From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Tue, 6 Feb 2024 21:38:24 -0500
+Subject: [PATCH] ITS#10171 - Explicitly cast private values
+
+Fixes issues with -Werror=incompatible-pointer-types
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+---
+ servers/slapd/config.c              | 2 +-
+ servers/slapd/overlays/constraint.c | 2 +-
+ servers/slapd/overlays/dyngroup.c   | 2 +-
+ servers/slapd/overlays/valsort.c    | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/servers/slapd/config.c b/servers/slapd/config.c
+index 80333f359c..987c862d91 100644
+--- a/servers/slapd/config.c
++++ b/servers/slapd/config.c
+@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
+ 	int rc, arg_user, arg_type, arg_syn, iarg;
+ 	unsigned uiarg;
+ 	long larg;
+-	size_t ularg;
++	unsigned long ularg;
+ 	ber_len_t barg;
+ 	
+ 	if(Conf->arg_type == ARG_IGNORED) {
+diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
+index f939b37762..0d6156af4d 100644
+--- a/servers/slapd/overlays/constraint.c
++++ b/servers/slapd/overlays/constraint.c
+@@ -557,7 +557,7 @@ done:;
+ 				a2->restrict_filter = ap.restrict_filter;
+ 				a2->restrict_val = ap.restrict_val;
+ 
+-				for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
++				for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+ 					/* Get to the end */ ;
+ 
+ 				a2->ap_next = *app;
+diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
+index 5d890d6650..e0e70af2d9 100644
+--- a/servers/slapd/overlays/dyngroup.c
++++ b/servers/slapd/overlays/dyngroup.c
+@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c )
+ 		 */
+ 		a2 = ch_malloc( sizeof(adpair) );
+ 
+-		for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
++		for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
+ 			/* Get to the end */ ;
+ 
+ 		a2->ap_mem = ap.ap_mem;
+diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
+index 3d998e2fcb..e251500d0b 100644
+--- a/servers/slapd/overlays/valsort.c
++++ b/servers/slapd/overlays/valsort.c
+@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) {
+ 		return(1);
+ 	}
+ 
+-	for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
++	for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
+ 		/* Get to the end */ ;
+ 
+ 	vi = ch_malloc( sizeof(valsort_info) );
+-- 
+GitLab
+
diff --git a/net-nds/openldap/openldap-2.4.59-r2.ebuild b/net-nds/openldap/openldap-2.4.59-r2.ebuild
index c40329c153ec..4806ec8b4eb0 100644
--- a/net-nds/openldap/openldap-2.4.59-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.59-r2.ebuild
@@ -693,7 +693,8 @@ multilib_src_compile() {
 		build_contrib_module "allowed" "allowed.c" "allowed"
 		build_contrib_module "autogroup" "autogroup.c" "autogroup"
 		build_contrib_module "cloak" "cloak.c" "cloak"
-		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match"
+		# comp_match: really complex, adds new external deps, questionable demand
 		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
 		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
 		build_contrib_module "dupent" "dupent.c" "dupent"
@@ -757,7 +758,8 @@ multilib_src_install() {
 			einfo "Adding $(basename ${x})"
 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
 		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}"
 		use prefix || fowners root:ldap /etc/openldap/slapd.conf
 		fperms 0640 /etc/openldap/slapd.conf
 		cp "${configfile}" "${configfile}".default || die
diff --git a/net-nds/openldap/openldap-2.4.59-r3.ebuild b/net-nds/openldap/openldap-2.4.59-r3.ebuild
new file mode 100644
index 000000000000..367fb900d9bf
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.59-r3.ebuild
@@ -0,0 +1,936 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools db-use flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.OpenLDAP.org/"
+
+# upstream mirrors are mostly not working, using canonical URI
+SRC_URI="
+	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
+	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
+	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
+	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
+	mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE_DAEMON="crypt samba tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
+IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+REQUIRED_USE="cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( berkdb )
+	?? ( test minimal )
+	kerberos? ( ?? ( kinit smbkrb5passwd ) )"
+RESTRICT="!test? ( test )"
+
+# always list newer first
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}"
+BDB_PKGS=''
+for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
+
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	ssl? (
+		!gnutls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libltdl
+		sys-fs/e2fsprogs
+		>=dev-db/lmdb-0.9.18:=
+		crypt? ( virtual/libcrypt:= )
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			dev-libs/openssl:0=
+		)
+		berkdb? (
+			<sys-libs/db-6.0:=
+			|| ( ${BDB_PKGS} )
+			)
+		smbkrb5passwd? (
+			dev-libs/openssl:0=
+			kerberos? ( app-crypt/heimdal )
+			)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+			)
+		cxx? ( dev-libs/cyrus-sasl:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
+	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+	# bug #189817
+	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	# bug #420959
+	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+	# unbundle lmdb
+	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
+
+	# fix some compiler warnings
+	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
+
+	# Atexit segfault
+	"${FILESDIR}"/${PN}-2.4.59-atexit-fix.patch
+
+	# implicit function defs
+	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
+	"${FILESDIR}"/${PN}-2.4.59-implicit-function.patch
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		if use berkdb; then
+			# find which one would be used
+			for bdb_slot in ${BDB_SLOTS} ; do
+				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+				[[ -n "${NEWVER}" ]] && break
+			done
+		fi
+		local fail=0
+		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		-i include/ldap_defaults.h || die
+
+	default
+	rm -r libraries/liblmdb || die
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+	popd &>/dev/null || die
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed \
+		-e 's|/bin/sh|/bin/bash|g' \
+		-i tests/scripts/* || die "sed failed"
+
+	if test -e configure.in -a ! -e configure.ac ; then
+		mv -f configure.in configure.ac
+	fi
+
+	# Required for autoconf-2.70 #765043
+	sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.ac || die
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	# <dir> <sources> <outputname>
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I"${BUILD_DIR}"/include \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	if use experimental ; then
+		# connectionless ldap per bug #342439
+		# connectionless is a unsupported feature according to Howard Chu
+		# see https://bugs.openldap.org/show_bug.cgi?id=9739
+		# (see also bug #892009)
+		append-flags -DLDAP_CONNECTIONLESS
+	fi
+
+	# The configure scripts make some assumptions that aren't valid in newer GCC.
+	# https://bugs.gentoo.org/920380
+	append-flags $(test-flags-CC -Wno-error=implicit-int)
+	# conftest.c:113:16: error: passing argument 1 of 'pthread_detach' makes
+	# integer from pointer without a cast [-Wint-conversion]
+	append-flags $(test-flags-CC -Wno-error=int-conversion)
+	# error: passing argument 3 of ‘ldap_bv2rdn’ from incompatible pointer type
+	# [-Wincompatible-pointer-types]
+	# expected ‘char **’ but argument is of type ‘const char **’
+	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( $(use_enable debug) )
+
+	# ICU exists only in the configure, nowhere in the codebase, bug #510858
+	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
+
+	if ! use minimal && multilib_is_native_abi; then
+		local CPPFLAGS=${CPPFLAGS}
+
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf+=( --enable-ldap )
+
+		# backends
+		myconf+=( --enable-slapd )
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf+=( --enable-bdb --enable-hdb )
+			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
+			einfo "Using ${DBINCLUDE} for sys-libs/db version"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I${DBINCLUDE}
+		else
+			myconf+=( --disable-bdb --disable-hdb )
+		fi
+		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		myconf+=( $(use_enable perl perl mod) )
+
+		myconf+=( $(use_enable odbc sql mod) )
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf+=( --with-odbc=${odbc_lib} )
+		fi
+
+		# slapd options
+		myconf+=(
+			$(use_enable crypt)
+			--disable-slp
+			$(use_enable samba lmpasswd)
+			$(use_enable syslog)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				--enable-aci=mod
+			)
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf+=( --enable-syncprov=yes )
+		use overlays && myconf+=( --enable-overlays=mod )
+
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-bdb
+			--disable-hdb
+			--disable-mdb
+			--disable-overlays
+			--disable-syslog
+		)
+	fi
+
+	# basic functionality stuff
+	myconf+=(
+		$(use_enable ipv6)
+		$(multilib_native_use_with sasl cyrus-sasl)
+		$(multilib_native_use_enable sasl spasswd)
+		$(use_enable tcpd wrappers)
+	)
+
+	# Some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf+=( --with-tls=${ssl_lib} )
+
+	for basicflag in dynamic local proctitle shared; do
+		myconf+=( --enable-${basicflag} )
+	done
+
+	tc-export AR CC CXX
+	CONFIG_SHELL="/bin/sh" \
+	ECONF_SOURCE="${S}" \
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	local myconf_ldapcpp=(
+		--with-ldap-includes="${S}"/include
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+		-L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+	ECONF_SOURCE=${S}/contrib/ldapc++ \
+	econf "${myconf_ldapcpp[@]}" \
+		CC="${CC}" \
+		CXX="${CXX}"
+	popd &>/dev/null || die
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
+	local lt="${BUILD_DIR}/libtool"
+	export echo="echo"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake CC="${CC}" CXX="${CXX}"
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+			popd &>/dev/null || die
+		fi
+
+		if use pbkdf2; then
+			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
+			einfo "Compiling contrib-module: pw-pbkdf2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o pbkdf2.lo \
+				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
+			einfo "Linking contrib-module: pw-pbkdf2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-pbkdf2.la \
+				pbkdf2.lo || die "linking pw-pbkdf2 failed"
+			popd &>/dev/null || die
+		fi
+
+		if use sha2 ; then
+			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
+			einfo "Compiling contrib-module: pw-sha2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o sha2.lo \
+				-c sha2.c || die "compiling pw-sha2 failed"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o slapd-sha2.lo \
+				-c slapd-sha2.c || die "compiling pw-sha2 failed"
+			einfo "Linking contrib-module: pw-sha2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-sha2.la \
+				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
+			popd &>/dev/null || die
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "cloak" "cloak.c" "cloak"
+		# comp_match: really complex, adds new external deps, questionable demand
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match"
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		build_contrib_module "dupent" "dupent.c" "dupent"
+		build_contrib_module "lastbind" "lastbind.c" "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+		build_contrib_module "trace" "trace.c" "trace"
+		popd &>/dev/null || die
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		emake tests
+	fi
+}
+
+multilib_src_install() {
+	local lt="${BUILD_DIR}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		einfo "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
+		einfo "Install systemd service"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+		systemd_dounit "${T}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+		# If built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		tmpfiles_process slapd.conf
+
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/net-nds/openldap/openldap-2.5.14.ebuild b/net-nds/openldap/openldap-2.5.14.ebuild
index 0abdc8dcb986..62ff82759fc4 100644
--- a/net-nds/openldap/openldap-2.5.14.ebuild
+++ b/net-nds/openldap/openldap-2.5.14.ebuild
@@ -339,7 +339,10 @@ src_prepare() {
 	#
 	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
 	# the bundled lmdb's header to find out the version.
-	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' libraries/liblmdb/lmdb.h || die)
+	local bundled_lmdb_version=$(
+		sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
+			libraries/liblmdb/lmdb.h || die
+		)
 	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
 
 	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
@@ -708,7 +711,8 @@ multilib_src_install() {
 			einfo "Adding $(basename ${x})"
 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
 		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}"
 		use prefix || fowners root:ldap /etc/openldap/slapd.conf
 		fperms 0640 /etc/openldap/slapd.conf
 		cp "${configfile}" "${configfile}".default || die
diff --git a/net-nds/openldap/openldap-2.5.16.ebuild b/net-nds/openldap/openldap-2.5.16.ebuild
index 6d3babe45f1b..21845b57060c 100644
--- a/net-nds/openldap/openldap-2.5.16.ebuild
+++ b/net-nds/openldap/openldap-2.5.16.ebuild
@@ -337,7 +337,10 @@ src_prepare() {
 	#
 	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
 	# the bundled lmdb's header to find out the version.
-	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' libraries/liblmdb/lmdb.h || die)
+	local bundled_lmdb_version=$(
+		sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
+		libraries/liblmdb/lmdb.h || die
+	)
 	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
 
 	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
@@ -706,7 +709,8 @@ multilib_src_install() {
 			einfo "Adding $(basename ${x})"
 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
 		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}"
 		use prefix || fowners root:ldap /etc/openldap/slapd.conf
 		fperms 0640 /etc/openldap/slapd.conf
 		cp "${configfile}" "${configfile}".default || die
diff --git a/net-nds/openldap/openldap-2.5.18.ebuild b/net-nds/openldap/openldap-2.5.18.ebuild
new file mode 100644
index 000000000000..48748317f4b5
--- /dev/null
+++ b/net-nds/openldap/openldap-2.5.18.ebuild
@@ -0,0 +1,875 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+
+MY_PV="$(ver_rs 1-2 _)"
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.openldap.org/"
+SRC_URI="
+	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
+	mirror://gentoo/${BIS_P}
+"
+S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
+
+LICENSE="OPENLDAP GPL-2"
+# Subslot added for bug #835654
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
+IUSE_OVERLAY="overlays perl autoca"
+IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test"
+IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+REQUIRED_USE="cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( cleartext debug sasl )
+	autoca? ( !gnutls )
+	?? ( test minimal )
+	kerberos? ( ?? ( kinit smbkrb5passwd ) )"
+RESTRICT="!test? ( test )"
+
+SYSTEM_LMDB_VER=0.9.33
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!gnutls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libltdl
+		sys-fs/e2fsprogs
+		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
+		argon2? ( app-crypt/argon2:= )
+		crypt? ( virtual/libcrypt:= )
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			dev-libs/openssl:0=
+		)
+		smbkrb5passwd? (
+			dev-libs/openssl:0=
+			kerberos? ( app-crypt/heimdal )
+		)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
+	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
+	"${FILESDIR}"/${PN}-2.6.1-flags.patch
+	"${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch
+	#"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch # needs backport
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		local fail=0
+
+		# This will not cover detection of cn=Config based configuration, but
+		# it's hopefully good enough.
+		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
+			eerror "    OpenLDAP >= 2.6.x has dropped support for Shell backend."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted away from backend shell!"
+			echo
+			fail=1
+		fi
+		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
+			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted to mdb!"
+			echo
+			fail=1
+		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. Check that your data is intact."
+	eerror "11. Set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# The system copy of dev-db/lmdb must match the version that this copy
+	# of OpenLDAP shipped with! See bug #588792.
+	#
+	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
+	# the bundled lmdb's header to find out the version.
+	local bundled_lmdb_version=$(
+		sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
+		libraries/liblmdb/lmdb.h || die
+	)
+	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
+
+	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
+		eerror "Source lmdb version: ${bundled_lmdb_version}"
+		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
+		die "Ebuild needs to update SYSTEM_LMDB_VER!"
+	fi
+
+	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
+
+	local filename
+	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
+		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
+		mv "${filename}.utf8" "${filename}"
+	done
+
+	default
+
+	sed -i \
+		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
+		-e '/MKDIR.*.(DESTDIR)\/run/d' \
+		-e '/MKDIR.*.(DESTDIR).*.(runstatedir)/d' \
+		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to remove too early stripping"
+	popd &>/dev/null || die
+
+	# Fails with OpenSSL 3, bug #848894
+	# https://bugs.openldap.org/show_bug.cgi?id=10009
+	rm tests/scripts/test076-authid-rewrite || die
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+build_contrib_module() {
+	# <dir> [<target>]
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $1"
+	local target="${2:-all}"
+	emake \
+		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
+		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+		"${target}"
+	popd &>/dev/null || die
+}
+
+multilib_src_configure() {
+	# Optional Features
+	myconf+=(
+		--enable-option-checking
+		$(use_enable debug)
+		--enable-dynamic
+		$(use_enable syslog)
+		$(use_enable ipv6)
+		--enable-local
+	)
+
+	# Optional Packages
+	myconf+=(
+		--without-fetch
+	)
+
+	# The configure scripts make some assumptions that aren't valid in newer GCC.
+	# https://bugs.gentoo.org/920380
+	append-flags $(test-flags-CC -Wno-error=implicit-int)
+	# conftest.c:113:16: error: passing argument 1 of 'pthread_detach' makes
+	# integer from pointer without a cast [-Wint-conversion]
+	append-flags $(test-flags-CC -Wno-error=int-conversion)
+	# error: passing argument 3 of ‘ldap_bv2rdn’ from incompatible pointer type
+	# [-Wincompatible-pointer-types]
+	# expected ‘char **’ but argument is of type ‘const char **’
+	#append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+	if use experimental ; then
+		# connectionless ldap per bug #342439
+		# connectionless is a unsupported feature according to Howard Chu
+		# see https://bugs.openldap.org/show_bug.cgi?id=9739
+		# (see also bug #892009)
+		append-flags -DLDAP_CONNECTIONLESS
+	fi
+
+	if ! use minimal && multilib_is_native_abi; then
+		# SLAPD (Standalone LDAP Daemon) Options
+		# overlay chaining requires '--enable-ldap' #296567
+		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
+		myconf+=(
+			--enable-ldap=yes
+			--enable-slapd
+			$(use_enable cleartext)
+			$(use_enable crypt)
+			$(multilib_native_use_enable sasl spasswd)
+			--disable-slp
+			$(use_enable tcpd wrappers)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				# ACI build as dynamic module not supported (yet)
+				--enable-aci=yes
+			)
+		fi
+
+		for option in modules rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# static SLAPD backends
+		for backend in mdb; do
+			myconf+=( --enable-${backend}=yes )
+		done
+
+		# module SLAPD backends
+		for backend in asyncmeta dnssrv meta null passwd relay sock; do
+			# missing modules: wiredtiger (not available in portage)
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		use perl && myconf+=( --enable-perl=mod )
+
+		if use odbc ; then
+			myconf+=( --enable-sql=mod )
+			if use iodbc ; then
+				myconf+=( --with-odbc="iodbc" )
+				append-cflags -I"${EPREFIX}"/usr/include/iodbc
+			else
+				myconf+=( --with-odbc="unixodbc" )
+			fi
+		fi
+
+		use overlays && myconf+=( --enable-overlays=mod )
+		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
+		# compile-in the syncprov
+		myconf+=( --enable-syncprov=yes )
+
+		# SLAPD Password Module Options
+		myconf+=(
+			$(use_enable argon2)
+		)
+
+		# Optional Packages
+		myconf+=(
+			$(use_with systemd)
+			$(multilib_native_use_with sasl cyrus-sasl)
+		)
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-mdb
+			--disable-overlays
+			--disable-autoca
+			--disable-syslog
+			--without-systemd
+		)
+	fi
+
+	# Library Generation & Linking Options
+	myconf+=(
+		$(use_enable static-libs static)
+		--enable-shared
+		--enable-versioning
+		--with-pic
+	)
+
+	# some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		if use gnutls ; then
+			myconf+=( --with-tls="gnutls" )
+		else
+			# disable MD2 hash function
+			append-cflags -DOPENSSL_NO_MD2
+			myconf+=( --with-tls="openssl" )
+		fi
+	else
+		myconf+=( --with-tls="no" )
+	fi
+
+	tc-export AR CC CXX
+
+	ECONF_SOURCE="${S}" econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		--localstatedir="${EPREFIX}"/var \
+		--runstatedir="${EPREFIX}"/run \
+		--sharedstatedir="${EPREFIX}"/var/lib \
+		"${myconf[@]}"
+
+	# argument '--runstatedir' seems to have no effect therefore this workaround
+	sed -i \
+		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
+		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
+
+	sed -i \
+		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
+		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
+
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# we have to run it AFTER the main build, not just after the main configure
+	local myconf_ldapcpp=(
+		--with-libldap="${E}/lib"
+		--with-ldap-includes="${S}/include"
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS="${LDFLAGS}"
+	local CPPFLAGS="${CPPFLAGS}"
+
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+
+	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
+	popd &>/dev/null || die "popd contrib/ldapc++"
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			build_contrib_module "passwd" "pw-kerberos.la"
+		fi
+
+		if use pbkdf2; then
+			build_contrib_module "passwd/pbkdf2"
+		fi
+
+		if use sha2 ; then
+			build_contrib_module "passwd/sha2"
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		build_contrib_module "passwd" "pw-netscape.la"
+
+		#build_contrib_module "acl" "posixgroup.la" # example code only
+		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
+		build_contrib_module "addpartial"
+		build_contrib_module "allop"
+		build_contrib_module "allowed"
+		build_contrib_module "autogroup"
+		build_contrib_module "cloak"
+		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop"
+		build_contrib_module "dsaschema"
+		build_contrib_module "dupent"
+		build_contrib_module "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod"
+		build_contrib_module "noopsrch"
+		#build_contrib_module "nops" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" RESO:LATER
+		build_contrib_module "trace"
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		$(tc-getCC) -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CPPFLAGS} \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		pwd
+
+		# Increase various test timeouts/delays, bug #894012
+		# We can't just double everything as there's a cumulative effect.
+		export SLEEP0=2 # originally 1
+		export SLEEP1=10 # originally 7
+		export SLEEP2=20 # originally 15
+		export TIMEOUT=16 # originally 8
+
+		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
+		# emake partests => runs ALL of the tests in parallel
+		# wt/WiredTiger is not supported in Gentoo
+		TESTS=( lloadd mdb )
+		#TESTS+=( pldif ) # not done by default, so also exclude here
+		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
+
+		emake -Onone "${TESTS[@]}"
+	fi
+}
+
+multilib_src_install() {
+	emake CC="$(tc-getCC)" \
+		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		einfo "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
+
+		if use systemd; then
+			# The systemd unit uses Type=notify, so it is useless without USE=systemd
+			einfo "Install systemd service"
+			rm -rf "${ED}"/{,usr/}lib/systemd
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
+			systemd_dounit "${T}"/slapd.service
+			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+		fi
+
+		# if built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			libtool --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		if use systemd; then
+			tmpfiles_process slapd.conf
+		fi
+
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+}
diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild b/net-nds/openldap/openldap-2.6.3-r7.ebuild
deleted file mode 100644
index b60d581438f2..000000000000
--- a/net-nds/openldap/openldap-2.6.3-r7.ebuild
+++ /dev/null
@@ -1,827 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Re cleanups:
-# 2.5.x is an LTS release so we want to keep it for a while.
-
-inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
-
-MY_PV="$(ver_rs 1-2 _)"
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.openldap.org/"
-SRC_URI="
-	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.gz
-	mirror://gentoo/${BIS_P}
-"
-S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
-
-LICENSE="OPENLDAP GPL-2"
-# Subslot added for bug #835654
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl autoca"
-IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test"
-IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
-IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-REQUIRED_USE="cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( cleartext sasl )
-	autoca? ( !gnutls )
-	?? ( test minimal )
-	kerberos? ( ?? ( kinit smbkrb5passwd ) )"
-RESTRICT="!test? ( test )"
-
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		dev-libs/libltdl
-		sys-fs/e2fsprogs
-		>=dev-db/lmdb-0.9.18:=
-		argon2? ( app-crypt/argon2:= )
-		crypt? ( virtual/libcrypt:= )
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			dev-libs/openssl:0=
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl:0=
-			kerberos? ( app-crypt/heimdal )
-		)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-BDEPEND="!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-)
-"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
-	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
-	"${FILESDIR}"/${PN}-2.6.1-flags.patch
-	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
-	"${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch
-	"${FILESDIR}"/${PN}-2.6.3-clang16.patch
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		local fail=0
-
-		# This will not cover detection of cn=Config based configuration, but
-		# it's hopefully good enough.
-		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
-			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted away from backend shell!"
-			echo
-			fail=1
-		fi
-		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
-			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted to mdb!"
-			echo
-			fail=1
-		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. Check that your data is intact."
-	eerror "11. Set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
-
-	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
-		iconv -f iso-8859-1 -t utf-8 "$filename" > "$filename.utf8"
-		mv "$filename.utf8" "$filename"
-	done
-
-	default
-
-	sed -i \
-		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
-		-e '/MKDIR.*.(DESTDIR)\/run/d' \
-		-e '/MKDIR.*.(DESTDIR).*.(runstatedir)/d' \
-		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to remove to early stripping"
-	popd &>/dev/null || die
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-build_contrib_module() {
-	# <dir> [<target>]
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $1"
-	local target="${2:-all}"
-	emake \
-		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
-		"$target"
-	popd &>/dev/null || die
-}
-
-multilib_src_configure() {
-	# Optional Features
-	myconf+=(
-		--enable-option-checking
-		$(use_enable debug)
-		--enable-dynamic
-		$(use_enable syslog)
-		$(use_enable ipv6)
-		--enable-local
-	)
-
-	# Optional Packages
-	myconf+=(
-		--without-fetch
-	)
-
-	if ! use minimal && multilib_is_native_abi; then
-		# SLAPD (Standalone LDAP Daemon) Options
-		# overlay chaining requires '--enable-ldap' #296567
-		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
-		myconf+=(
-			--enable-ldap=yes
-			--enable-slapd
-			$(use_enable cleartext)
-			$(use_enable crypt)
-			$(multilib_native_use_enable sasl spasswd)
-			--disable-slp
-			$(use_enable tcpd wrappers)
-		)
-		if use experimental ; then
-			# connectionless ldap per bug #342439
-			# connectionless is a unsupported feature according to Howard Chu
-			# see https://bugs.openldap.org/show_bug.cgi?id=9739
-			append-cppflags -DLDAP_CONNECTIONLESS
-
-			myconf+=(
-				--enable-dynacl
-				# ACI build as dynamic module not supported (yet)
-				--enable-aci=yes
-			)
-		fi
-
-		for option in modules rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# static SLAPD backends
-		for backend in mdb; do
-			myconf+=( --enable-${backend}=yes )
-		done
-
-		# module SLAPD backends
-		for backend in asyncmeta dnssrv meta null passwd relay sock; do
-			# missing modules: wiredtiger (not available in portage)
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		use perl && myconf+=( --enable-perl=mod )
-
-		if use odbc ; then
-			myconf+=( --enable-sql=mod )
-			if use iodbc ; then
-				myconf+=( --with-odbc="iodbc" )
-				append-cflags -I"${EPREFIX}"/usr/include/iodbc
-			else
-				myconf+=( --with-odbc="unixodbc" )
-			fi
-		fi
-
-		use overlays && myconf+=( --enable-overlays=mod )
-		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
-		# compile-in the syncprov
-		myconf+=( --enable-syncprov=yes )
-
-		# SLAPD Password Module Options
-		myconf+=(
-			$(use_enable argon2)
-		)
-
-		# Optional Packages
-		myconf+=(
-			$(use_with systemd)
-			$(multilib_native_use_with sasl cyrus-sasl)
-		)
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-mdb
-			--disable-overlays
-			--disable-autoca
-			--disable-syslog
-			--without-systemd
-		)
-	fi
-
-	# Library Generation & Linking Options
-	myconf+=(
-		$(use_enable static-libs static)
-		--enable-shared
-		--enable-versioning
-		--with-pic
-	)
-
-	# some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		if use gnutls ; then
-			myconf+=( --with-tls="gnutls" )
-		else
-			# disable MD2 hash function
-			append-cflags -DOPENSSL_NO_MD2
-			myconf+=( --with-tls="openssl" )
-		fi
-	else
-		myconf+=( --with-tls="no" )
-	fi
-
-	tc-export AR CC CXX
-
-	ECONF_SOURCE="${S}" econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		--localstatedir="${EPREFIX}"/var \
-		--runstatedir="${EPREFIX}"/run \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		"${myconf[@]}"
-
-	# argument '--runstatedir' seems to have no effect therefore this workaround
-	sed -i \
-		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
-		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
-
-	sed -i \
-		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
-		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
-
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# we have to run it AFTER the main build, not just after the main configure
-	local myconf_ldapcpp=(
-		--with-libldap="${E}/lib"
-		--with-ldap-includes="${S}/include"
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-	local LDFLAGS=${LDFLAGS}
-	local CPPFLAGS=${CPPFLAGS}
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
-		-L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-	ECONF_SOURCE=${S}/contrib/ldapc++ \
-	econf "${myconf_ldapcpp[@]}"
-	popd &>/dev/null || die "popd contrib/ldapc++"
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			build_contrib_module "passwd" "pw-kerberos.la"
-		fi
-
-		if use pbkdf2; then
-			build_contrib_module "passwd/pbkdf2"
-		fi
-
-		if use sha2 ; then
-			build_contrib_module "passwd/sha2"
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		build_contrib_module "passwd" "pw-netscape.la"
-
-		#build_contrib_module "acl" "posixgroup.la" # example code only
-		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
-		build_contrib_module "addpartial"
-		build_contrib_module "allop"
-		build_contrib_module "allowed"
-		build_contrib_module "autogroup"
-		build_contrib_module "cloak"
-		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop"
-		build_contrib_module "dsaschema"
-		build_contrib_module "dupent"
-		build_contrib_module "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod"
-		build_contrib_module "noopsrch"
-		#build_contrib_module "nops" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" RESO:LATER
-		build_contrib_module "trace"
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		$(tc-getCC) -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd "tests"
-		pwd
-		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
-		# emake partests => runs ALL of the tests in parallel
-		# wt/WiredTiger is not supported in Gentoo
-		TESTS=( plloadd pmdb )
-		#TESTS+=( pldif ) # not done by default, so also exclude here
-		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
-		emake "${TESTS[@]}"
-	fi
-}
-
-multilib_src_install() {
-	emake CC="$(tc-getCC)" \
-		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		einfo "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
-
-		if use systemd; then
-			# The systemd unit uses Type=notify, so it is useless without USE=systemd
-			einfo "Install systemd service"
-			rm -rf "${ED}"/{,usr/}lib/systemd
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
-			systemd_dounit "${T}"/slapd.service
-			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-		fi
-
-		# if built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			libtool --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		if use systemd; then
-			tmpfiles_process slapd.conf
-		fi
-
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.6.4-r1.ebuild b/net-nds/openldap/openldap-2.6.4-r1.ebuild
deleted file mode 100644
index 2f6ab178605e..000000000000
--- a/net-nds/openldap/openldap-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,861 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Re cleanups:
-# 2.5.x is an LTS release so we want to keep it for a while.
-
-inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
-
-MY_PV="$(ver_rs 1-2 _)"
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.openldap.org/"
-SRC_URI="
-	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
-	mirror://gentoo/${BIS_P}
-"
-S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
-
-LICENSE="OPENLDAP GPL-2"
-# Subslot added for bug #835654
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl autoca"
-IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test"
-IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
-IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-REQUIRED_USE="cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( cleartext sasl )
-	autoca? ( !gnutls )
-	?? ( test minimal )
-	kerberos? ( ?? ( kinit smbkrb5passwd ) )"
-RESTRICT="!test? ( test )"
-
-SYSTEM_LMDB_VER=0.9.30
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		dev-libs/libltdl
-		sys-fs/e2fsprogs
-		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
-		argon2? ( app-crypt/argon2:= )
-		crypt? ( virtual/libcrypt:= )
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			dev-libs/openssl:0=
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl:0=
-			kerberos? ( app-crypt/heimdal )
-		)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-BDEPEND="!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-)
-"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
-	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
-	"${FILESDIR}"/${PN}-2.6.1-flags.patch
-	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
-	"${FILESDIR}"/${PN}-2.6.4-clang16.patch
-	"${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		local fail=0
-
-		# This will not cover detection of cn=Config based configuration, but
-		# it's hopefully good enough.
-		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
-			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted away from backend shell!"
-			echo
-			fail=1
-		fi
-		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
-			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted to mdb!"
-			echo
-			fail=1
-		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. Check that your data is intact."
-	eerror "11. Set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	# The system copy of dev-db/lmdb must match the version that this copy
-	# of OpenLDAP shipped with! See bug #588792.
-	#
-	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
-	# the bundled lmdb's header to find out the version.
-	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' libraries/liblmdb/lmdb.h || die)
-	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
-
-	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
-		eerror "Source lmdb version: ${bundled_lmdb_version}"
-		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
-		die "Ebuild needs to update SYSTEM_LMDB_VER!"
-	fi
-
-	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
-
-	local filename
-	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
-		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
-		mv "${filename}.utf8" "${filename}"
-	done
-
-	default
-
-	sed -i \
-		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
-		-e '/MKDIR.*.(DESTDIR)\/run/d' \
-		-e '/MKDIR.*.(DESTDIR).*.(runstatedir)/d' \
-		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to remove too early stripping"
-	popd &>/dev/null || die
-
-	# Fails with OpenSSL 3, bug #848894
-	# https://bugs.openldap.org/show_bug.cgi?id=10009
-	rm tests/scripts/test076-authid-rewrite || die
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-build_contrib_module() {
-	# <dir> [<target>]
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $1"
-	local target="${2:-all}"
-	emake \
-		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
-		"${target}"
-	popd &>/dev/null || die
-}
-
-multilib_src_configure() {
-	# Optional Features
-	myconf+=(
-		--enable-option-checking
-		$(use_enable debug)
-		--enable-dynamic
-		$(use_enable syslog)
-		$(use_enable ipv6)
-		--enable-local
-	)
-
-	# Optional Packages
-	myconf+=(
-		--without-fetch
-	)
-
-	if use experimental ; then
-		# connectionless ldap per bug #342439
-		# connectionless is a unsupported feature according to Howard Chu
-		# see https://bugs.openldap.org/show_bug.cgi?id=9739
-		# (see also bug #892009)
-		append-flags -DLDAP_CONNECTIONLESS
-	fi
-
-	if ! use minimal && multilib_is_native_abi; then
-		# SLAPD (Standalone LDAP Daemon) Options
-		# overlay chaining requires '--enable-ldap' #296567
-		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
-		myconf+=(
-			--enable-ldap=yes
-			--enable-slapd
-			$(use_enable cleartext)
-			$(use_enable crypt)
-			$(multilib_native_use_enable sasl spasswd)
-			--disable-slp
-			$(use_enable tcpd wrappers)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				# ACI build as dynamic module not supported (yet)
-				--enable-aci=yes
-			)
-		fi
-
-		for option in modules rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# static SLAPD backends
-		for backend in mdb; do
-			myconf+=( --enable-${backend}=yes )
-		done
-
-		# module SLAPD backends
-		for backend in asyncmeta dnssrv meta null passwd relay sock; do
-			# missing modules: wiredtiger (not available in portage)
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		use perl && myconf+=( --enable-perl=mod )
-
-		if use odbc ; then
-			myconf+=( --enable-sql=mod )
-			if use iodbc ; then
-				myconf+=( --with-odbc="iodbc" )
-				append-cflags -I"${EPREFIX}"/usr/include/iodbc
-			else
-				myconf+=( --with-odbc="unixodbc" )
-			fi
-		fi
-
-		use overlays && myconf+=( --enable-overlays=mod )
-		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
-		# compile-in the syncprov
-		myconf+=( --enable-syncprov=yes )
-
-		# SLAPD Password Module Options
-		myconf+=(
-			$(use_enable argon2)
-		)
-
-		# Optional Packages
-		myconf+=(
-			$(use_with systemd)
-			$(multilib_native_use_with sasl cyrus-sasl)
-		)
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-mdb
-			--disable-overlays
-			--disable-autoca
-			--disable-syslog
-			--without-systemd
-		)
-	fi
-
-	# Library Generation & Linking Options
-	myconf+=(
-		$(use_enable static-libs static)
-		--enable-shared
-		--enable-versioning
-		--with-pic
-	)
-
-	# some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		if use gnutls ; then
-			myconf+=( --with-tls="gnutls" )
-		else
-			# disable MD2 hash function
-			append-cflags -DOPENSSL_NO_MD2
-			myconf+=( --with-tls="openssl" )
-		fi
-	else
-		myconf+=( --with-tls="no" )
-	fi
-
-	tc-export AR CC CXX
-
-	ECONF_SOURCE="${S}" econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		--localstatedir="${EPREFIX}"/var \
-		--runstatedir="${EPREFIX}"/run \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		"${myconf[@]}"
-
-	# argument '--runstatedir' seems to have no effect therefore this workaround
-	sed -i \
-		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
-		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
-
-	sed -i \
-		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
-		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
-
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# we have to run it AFTER the main build, not just after the main configure
-	local myconf_ldapcpp=(
-		--with-libldap="${E}/lib"
-		--with-ldap-includes="${S}/include"
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS="${LDFLAGS}"
-	local CPPFLAGS="${CPPFLAGS}"
-
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-
-	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
-	popd &>/dev/null || die "popd contrib/ldapc++"
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			build_contrib_module "passwd" "pw-kerberos.la"
-		fi
-
-		if use pbkdf2; then
-			build_contrib_module "passwd/pbkdf2"
-		fi
-
-		if use sha2 ; then
-			build_contrib_module "passwd/sha2"
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		build_contrib_module "passwd" "pw-netscape.la"
-
-		#build_contrib_module "acl" "posixgroup.la" # example code only
-		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
-		build_contrib_module "addpartial"
-		build_contrib_module "allop"
-		build_contrib_module "allowed"
-		build_contrib_module "autogroup"
-		build_contrib_module "cloak"
-		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop"
-		build_contrib_module "dsaschema"
-		build_contrib_module "dupent"
-		build_contrib_module "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod"
-		build_contrib_module "noopsrch"
-		#build_contrib_module "nops" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" RESO:LATER
-		build_contrib_module "trace"
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		$(tc-getCC) -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CPPFLAGS} \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		pwd
-
-		# Increase various test timeouts/delays, bug #894012
-		# We can't just double everything as there's a cumulative effect.
-		export SLEEP0=2 # originally 1
-		export SLEEP1=10 # originally 7
-		export SLEEP2=20 # originally 15
-		export TIMEOUT=16 # originally 8
-
-		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
-		# emake partests => runs ALL of the tests in parallel
-		# wt/WiredTiger is not supported in Gentoo
-		TESTS=( plloadd pmdb )
-		#TESTS+=( pldif ) # not done by default, so also exclude here
-		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
-
-		emake "${TESTS[@]}"
-	fi
-}
-
-multilib_src_install() {
-	emake CC="$(tc-getCC)" \
-		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		einfo "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
-
-		if use systemd; then
-			# The systemd unit uses Type=notify, so it is useless without USE=systemd
-			einfo "Install systemd service"
-			rm -rf "${ED}"/{,usr/}lib/systemd
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
-			systemd_dounit "${T}"/slapd.service
-			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-		fi
-
-		# if built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			libtool --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		if use systemd; then
-			tmpfiles_process slapd.conf
-		fi
-
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.6.4-r2.ebuild b/net-nds/openldap/openldap-2.6.4-r2.ebuild
deleted file mode 100644
index 4ff4b2c3d6d0..000000000000
--- a/net-nds/openldap/openldap-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,867 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Re cleanups:
-# 2.5.x is an LTS release so we want to keep it for a while.
-
-inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
-inherit ssl-cert toolchain-funcs systemd tmpfiles
-
-MY_PV="$(ver_rs 1-2 _)"
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.openldap.org/"
-SRC_URI="
-	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
-	mirror://gentoo/${BIS_P}
-"
-S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
-
-LICENSE="OPENLDAP GPL-2"
-# Subslot added for bug #835654
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl autoca"
-IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test"
-IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
-IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-REQUIRED_USE="cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( cleartext sasl )
-	autoca? ( !gnutls )
-	?? ( test minimal )
-	kerberos? ( ?? ( kinit smbkrb5passwd ) )"
-RESTRICT="!test? ( test )"
-
-SYSTEM_LMDB_VER=0.9.30
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		dev-libs/libevent:=
-		dev-libs/libltdl
-		sys-fs/e2fsprogs
-		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
-		argon2? ( app-crypt/argon2:= )
-		crypt? ( virtual/libcrypt:= )
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			dev-libs/openssl:0=
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl:0=
-			kerberos? ( app-crypt/heimdal )
-		)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-BDEPEND="!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-)
-"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
-	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
-	"${FILESDIR}"/${PN}-2.6.1-flags.patch
-	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
-	"${FILESDIR}"/${PN}-2.6.4-clang16.patch
-	"${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		local fail=0
-
-		# This will not cover detection of cn=Config based configuration, but
-		# it's hopefully good enough.
-		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
-			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted away from backend shell!"
-			echo
-			fail=1
-		fi
-		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
-			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted to mdb!"
-			echo
-			fail=1
-		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. Check that your data is intact."
-	eerror "11. Set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	# The system copy of dev-db/lmdb must match the version that this copy
-	# of OpenLDAP shipped with! See bug #588792.
-	#
-	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
-	# the bundled lmdb's header to find out the version.
-	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
-		libraries/liblmdb/lmdb.h || die)
-	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
-
-	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
-		eerror "Source lmdb version: ${bundled_lmdb_version}"
-		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
-		die "Ebuild needs to update SYSTEM_LMDB_VER!"
-	fi
-
-	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
-
-	local filename
-	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
-		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
-		mv "${filename}.utf8" "${filename}"
-	done
-
-	default
-
-	sed -i \
-		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
-		-e '/MKDIR.*.(DESTDIR)\/run/d' \
-		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to remove too early stripping"
-	popd &>/dev/null || die
-
-	# Fails with OpenSSL 3, bug #848894
-	# https://bugs.openldap.org/show_bug.cgi?id=10009
-	rm tests/scripts/test076-authid-rewrite || die
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-build_contrib_module() {
-	# <dir> [<target>]
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $1"
-	local target="${2:-all}"
-	emake \
-		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
-		"${target}"
-	popd &>/dev/null || die
-}
-
-multilib_src_configure() {
-	# Optional Features
-	myconf+=(
-		--enable-option-checking
-		$(use_enable debug)
-		--enable-dynamic
-		$(use_enable syslog)
-		--enable-ipv6
-		--enable-local
-	)
-
-	# Optional Packages
-	myconf+=(
-		--without-fetch
-	)
-
-	if use experimental ; then
-		# connectionless ldap per bug #342439
-		# connectionless is a unsupported feature according to Howard Chu
-		# see https://bugs.openldap.org/show_bug.cgi?id=9739
-		# (see also bug #892009)
-		append-flags -DLDAP_CONNECTIONLESS
-	fi
-
-	if ! use minimal && multilib_is_native_abi; then
-		# SLAPD (Standalone LDAP Daemon) Options
-		# overlay chaining requires '--enable-ldap' #296567
-		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
-		myconf+=(
-			--enable-ldap=yes
-			--enable-slapd
-			$(use_enable cleartext)
-			$(use_enable crypt)
-			$(multilib_native_use_enable sasl spasswd)
-			--disable-slp
-			$(use_enable tcpd wrappers)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				# ACI build as dynamic module not supported (yet)
-				--enable-aci=yes
-			)
-		fi
-
-		for option in modules rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# static SLAPD backends
-		for backend in mdb; do
-			myconf+=( --enable-${backend}=yes )
-		done
-
-		# module SLAPD backends
-		for backend in asyncmeta dnssrv meta null passwd relay sock; do
-			# missing modules: wiredtiger (not available in portage)
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		use perl && myconf+=( --enable-perl=mod )
-
-		if use odbc ; then
-			myconf+=( --enable-sql=mod )
-			if use iodbc ; then
-				myconf+=( --with-odbc="iodbc" )
-				append-cflags -I"${EPREFIX}"/usr/include/iodbc
-			else
-				myconf+=( --with-odbc="unixodbc" )
-			fi
-		fi
-
-		use overlays && myconf+=( --enable-overlays=mod )
-		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
-		# compile-in the syncprov
-		myconf+=( --enable-syncprov=yes )
-
-		# Build the standalone load balancer (lloadd) - also available as a slapd module; --enable-balancer=mod
-		myconf+=( --enable-balancer=yes )
-
-		# SLAPD Password Module Options
-		myconf+=(
-			$(use_enable argon2)
-		)
-
-		# Optional Packages
-		myconf+=(
-			$(use_with systemd)
-			$(multilib_native_use_with sasl cyrus-sasl)
-		)
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-mdb
-			--disable-overlays
-			--disable-autoca
-			--disable-syslog
-			--without-systemd
-		)
-	fi
-
-	# Library Generation & Linking Options
-	myconf+=(
-		$(use_enable static-libs static)
-		--enable-shared
-		--enable-versioning
-		--with-pic
-	)
-
-	# some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		if use gnutls ; then
-			myconf+=( --with-tls="gnutls" )
-		else
-			# disable MD2 hash function
-			append-cflags -DOPENSSL_NO_MD2
-			myconf+=( --with-tls="openssl" )
-		fi
-	else
-		myconf+=( --with-tls="no" )
-	fi
-
-	tc-export AR CC CXX
-
-	ECONF_SOURCE="${S}" econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		--localstatedir="${EPREFIX}"/var \
-		--runstatedir="${EPREFIX}"/run \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		"${myconf[@]}"
-
-	# argument '--runstatedir' seems to have no effect therefore this workaround
-	sed -i \
-		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
-		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
-
-	sed -i \
-		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
-		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
-
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# we have to run it AFTER the main build, not just after the main configure
-	local myconf_ldapcpp=(
-		--with-libldap="${E}/lib"
-		--with-ldap-includes="${S}/include"
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS="${LDFLAGS}"
-	local CPPFLAGS="${CPPFLAGS}"
-
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-
-	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
-	popd &>/dev/null || die "popd contrib/ldapc++"
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			build_contrib_module "passwd" "pw-kerberos.la"
-		fi
-
-		if use pbkdf2; then
-			build_contrib_module "passwd/pbkdf2"
-		fi
-
-		if use sha2 ; then
-			build_contrib_module "passwd/sha2"
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		build_contrib_module "passwd" "pw-netscape.la"
-
-		#build_contrib_module "acl" "posixgroup.la" # example code only
-		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
-		build_contrib_module "addpartial"
-		build_contrib_module "allop"
-		build_contrib_module "allowed"
-		build_contrib_module "autogroup"
-		build_contrib_module "cloak"
-		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop"
-		build_contrib_module "dsaschema"
-		build_contrib_module "dupent"
-		build_contrib_module "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod"
-		build_contrib_module "noopsrch"
-		#build_contrib_module "nops" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" RESO:LATER
-		build_contrib_module "trace"
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		$(tc-getCC) -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CPPFLAGS} \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		pwd
-
-		# Increase various test timeouts/delays, bug #894012
-		# We can't just double everything as there's a cumulative effect.
-		export SLEEP0=2 # originally 1
-		export SLEEP1=10 # originally 7
-		export SLEEP2=20 # originally 15
-		export TIMEOUT=16 # originally 8
-
-		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
-		# emake partests => runs ALL of the tests in parallel
-		# wt/WiredTiger is not supported in Gentoo
-		TESTS=( plloadd pmdb )
-		#TESTS+=( pldif ) # not done by default, so also exclude here
-		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
-
-		emake "${TESTS[@]}"
-	fi
-}
-
-multilib_src_install() {
-	emake CC="$(tc-getCC)" \
-		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		einfo "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
-			-i "${configfile}" || die
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
-
-		if use systemd; then
-			# The systemd unit uses Type=notify, so it is useless without USE=systemd
-			einfo "Install systemd service"
-			rm -rf "${ED}"/{,usr/}lib/systemd
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
-			systemd_dounit "${T}"/slapd.service
-			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-		fi
-
-		# if built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			libtool --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		if use systemd; then
-			tmpfiles_process slapd.conf
-		fi
-
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.6.4-r3.ebuild b/net-nds/openldap/openldap-2.6.4-r3.ebuild
index 5e781e7012d9..7194cc597604 100644
--- a/net-nds/openldap/openldap-2.6.4-r3.ebuild
+++ b/net-nds/openldap/openldap-2.6.4-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Re cleanups:
 # 2.5.x is an LTS release so we want to keep it for a while.
 
-inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs
 inherit ssl-cert toolchain-funcs systemd tmpfiles
 
 MY_PV="$(ver_rs 1-2 _)"
diff --git a/net-nds/openldap/openldap-2.6.5-r1.ebuild b/net-nds/openldap/openldap-2.6.5-r1.ebuild
deleted file mode 100644
index 66a264d48ad2..000000000000
--- a/net-nds/openldap/openldap-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,870 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Re cleanups:
-# 2.5.x is an LTS release so we want to keep it for a while.
-
-inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
-inherit ssl-cert toolchain-funcs systemd tmpfiles
-
-MY_PV="$(ver_rs 1-2 _)"
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.openldap.org/"
-SRC_URI="
-	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
-	mirror://gentoo/${BIS_P}
-"
-S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
-
-LICENSE="OPENLDAP GPL-2"
-# Subslot added for bug #835654
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl autoca"
-IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test"
-IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
-IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-REQUIRED_USE="
-	cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( cleartext sasl )
-	autoca? ( !gnutls )
-	?? ( test minimal )
-	kerberos? ( ?? ( kinit smbkrb5passwd ) )
-"
-RESTRICT="!test? ( test )"
-
-SYSTEM_LMDB_VER=0.9.31
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		dev-libs/libevent:=
-		dev-libs/libltdl
-		sys-fs/e2fsprogs
-		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
-		argon2? ( app-crypt/argon2:= )
-		crypt? ( virtual/libcrypt:= )
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			dev-libs/openssl:0=
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl:0=
-			kerberos? ( app-crypt/heimdal )
-		)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-		)
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-BDEPEND="
-	!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-	)
-"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
-	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
-	"${FILESDIR}"/${PN}-2.6.1-flags.patch
-	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		local fail=0
-
-		# This will not cover detection of cn=Config based configuration, but
-		# it's hopefully good enough.
-		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
-			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted away from backend shell!"
-			echo
-			fail=1
-		fi
-		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
-			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted to mdb!"
-			echo
-			fail=1
-		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. Check that your data is intact."
-	eerror "11. Set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	# The system copy of dev-db/lmdb must match the version that this copy
-	# of OpenLDAP shipped with! See bug #588792.
-	#
-	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
-	# the bundled lmdb's header to find out the version.
-	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
-		libraries/liblmdb/lmdb.h || die)
-	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
-
-	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
-		eerror "Source lmdb version: ${bundled_lmdb_version}"
-		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
-		die "Ebuild needs to update SYSTEM_LMDB_VER!"
-	fi
-
-	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
-
-	local filename
-	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
-		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
-		mv "${filename}.utf8" "${filename}"
-	done
-
-	default
-
-	sed -i \
-		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
-		-e '/MKDIR.*.(DESTDIR)\/run/d' \
-		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to remove too early stripping"
-	popd &>/dev/null || die
-
-	# Fails with OpenSSL 3, bug #848894
-	# https://bugs.openldap.org/show_bug.cgi?id=10009
-	rm tests/scripts/test076-authid-rewrite || die
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-build_contrib_module() {
-	# <dir> [<target>]
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $1"
-	local target="${2:-all}"
-	emake \
-		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
-		"${target}"
-	popd &>/dev/null || die
-}
-
-multilib_src_configure() {
-	# Optional Features
-	myconf+=(
-		--enable-option-checking
-		$(use_enable debug)
-		--enable-dynamic
-		$(use_enable syslog)
-		--enable-ipv6
-		--enable-local
-	)
-
-	# Optional Packages
-	myconf+=(
-		--without-fetch
-		$(multilib_native_use_with sasl cyrus-sasl)
-	)
-
-	if use experimental ; then
-		# connectionless ldap per bug #342439
-		# connectionless is a unsupported feature according to Howard Chu
-		# see https://bugs.openldap.org/show_bug.cgi?id=9739
-		# (see also bug #892009)
-		append-flags -DLDAP_CONNECTIONLESS
-	fi
-
-	if ! use minimal && multilib_is_native_abi; then
-		# SLAPD (Standalone LDAP Daemon) Options
-		# overlay chaining requires '--enable-ldap' #296567
-		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
-		myconf+=(
-			--enable-ldap=yes
-			--enable-slapd
-			$(use_enable cleartext)
-			$(use_enable crypt)
-			$(multilib_native_use_enable sasl spasswd)
-			--disable-slp
-			$(use_enable tcpd wrappers)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				# ACI build as dynamic module not supported (yet)
-				--enable-aci=yes
-			)
-		fi
-
-		for option in modules rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# static SLAPD backends
-		for backend in mdb; do
-			myconf+=( --enable-${backend}=yes )
-		done
-
-		# module SLAPD backends
-		for backend in asyncmeta dnssrv meta null passwd relay sock; do
-			# missing modules: wiredtiger (not available in portage)
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		use perl && myconf+=( --enable-perl=mod )
-
-		if use odbc ; then
-			myconf+=( --enable-sql=mod )
-			if use iodbc ; then
-				myconf+=( --with-odbc="iodbc" )
-				append-cflags -I"${EPREFIX}"/usr/include/iodbc
-			else
-				myconf+=( --with-odbc="unixodbc" )
-			fi
-		fi
-
-		use overlays && myconf+=( --enable-overlays=mod )
-		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
-		# compile-in the syncprov
-		myconf+=( --enable-syncprov=yes )
-
-		# Build the standalone load balancer (lloadd) - also available as a slapd module; --enable-balancer=mod
-		myconf+=( --enable-balancer=yes )
-
-		# SLAPD Password Module Options
-		myconf+=(
-			$(use_enable argon2)
-		)
-
-		# Optional Packages
-		myconf+=(
-			$(use_with systemd)
-		)
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-mdb
-			--disable-overlays
-			--disable-autoca
-			--disable-syslog
-			--without-systemd
-		)
-	fi
-
-	# Library Generation & Linking Options
-	myconf+=(
-		$(use_enable static-libs static)
-		--enable-shared
-		--enable-versioning
-		--with-pic
-	)
-
-	# some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		if use gnutls ; then
-			myconf+=( --with-tls="gnutls" )
-		else
-			# disable MD2 hash function
-			append-cflags -DOPENSSL_NO_MD2
-			myconf+=( --with-tls="openssl" )
-		fi
-	else
-		myconf+=( --with-tls="no" )
-	fi
-
-	tc-export AR CC CXX
-
-	ECONF_SOURCE="${S}" econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		--localstatedir="${EPREFIX}"/var \
-		--runstatedir="${EPREFIX}"/run \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		"${myconf[@]}"
-
-	# argument '--runstatedir' seems to have no effect therefore this workaround
-	sed -i \
-		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
-		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
-
-	sed -i \
-		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
-		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
-
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# we have to run it AFTER the main build, not just after the main configure
-	local myconf_ldapcpp=(
-		--with-libldap="${E}/lib"
-		--with-ldap-includes="${S}/include"
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS="${LDFLAGS}"
-	local CPPFLAGS="${CPPFLAGS}"
-
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-
-	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
-	popd &>/dev/null || die "popd contrib/ldapc++"
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			build_contrib_module "passwd" "pw-kerberos.la"
-		fi
-
-		if use pbkdf2; then
-			build_contrib_module "passwd/pbkdf2"
-		fi
-
-		if use sha2 ; then
-			build_contrib_module "passwd/sha2"
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		build_contrib_module "passwd" "pw-netscape.la"
-
-		#build_contrib_module "acl" "posixgroup.la" # example code only
-		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
-		build_contrib_module "addpartial"
-		build_contrib_module "allop"
-		build_contrib_module "allowed"
-		build_contrib_module "autogroup"
-		build_contrib_module "cloak"
-		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop"
-		build_contrib_module "dsaschema"
-		build_contrib_module "dupent"
-		build_contrib_module "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod"
-		build_contrib_module "noopsrch"
-		#build_contrib_module "nops" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" RESO:LATER
-		build_contrib_module "trace"
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		$(tc-getCC) -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CPPFLAGS} \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		pwd
-
-		# Increase various test timeouts/delays, bug #894012
-		# We can't just double everything as there's a cumulative effect.
-		export SLEEP0=2 # originally 1
-		export SLEEP1=10 # originally 7
-		export SLEEP2=20 # originally 15
-		export TIMEOUT=16 # originally 8
-
-		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
-		# emake partests => runs ALL of the tests in parallel
-		# wt/WiredTiger is not supported in Gentoo
-		TESTS=( plloadd pmdb )
-		#TESTS+=( pldif ) # not done by default, so also exclude here
-		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
-
-		emake -Onone "${TESTS[@]}"
-	fi
-}
-
-multilib_src_install() {
-	emake CC="$(tc-getCC)" \
-		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		einfo "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
-			-i "${configfile}" || die
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
-
-		if use systemd; then
-			# The systemd unit uses Type=notify, so it is useless without USE=systemd
-			einfo "Install systemd service"
-			rm -rf "${ED}"/{,usr/}lib/systemd
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
-			systemd_dounit "${T}"/slapd.service
-			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-		fi
-
-		# if built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			libtool --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		if use systemd; then
-			tmpfiles_process slapd.conf
-		fi
-
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.6.6-r2.ebuild b/net-nds/openldap/openldap-2.6.6-r2.ebuild
index 965cce327fb3..fd2f6205da49 100644
--- a/net-nds/openldap/openldap-2.6.6-r2.ebuild
+++ b/net-nds/openldap/openldap-2.6.6-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Re cleanups:
 # 2.5.x is an LTS release so we want to keep it for a while.
 
-inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs
 inherit ssl-cert toolchain-funcs systemd tmpfiles
 
 MY_PV="$(ver_rs 1-2 _)"
@@ -149,6 +149,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
 	"${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch
+	"${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch
+	"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch
 )
 
 openldap_filecount() {
@@ -815,6 +817,7 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
 	docinto rfc ; dodoc doc/rfc/*.txt
+	rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part of current codebase.
 }
 
 pkg_preinst() {
diff --git a/net-nds/openldap/openldap-2.6.6.ebuild b/net-nds/openldap/openldap-2.6.6.ebuild
deleted file mode 100644
index e38e6c6522c5..000000000000
--- a/net-nds/openldap/openldap-2.6.6.ebuild
+++ /dev/null
@@ -1,870 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Re cleanups:
-# 2.5.x is an LTS release so we want to keep it for a while.
-
-inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
-inherit ssl-cert toolchain-funcs systemd tmpfiles
-
-MY_PV="$(ver_rs 1-2 _)"
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.openldap.org/"
-SRC_URI="
-	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
-	mirror://gentoo/${BIS_P}
-"
-S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
-
-LICENSE="OPENLDAP GPL-2"
-# Subslot added for bug #835654
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl autoca"
-IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test"
-IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
-IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-REQUIRED_USE="
-	cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( cleartext sasl )
-	autoca? ( !gnutls )
-	?? ( test minimal )
-	kerberos? ( ?? ( kinit smbkrb5passwd ) )
-"
-RESTRICT="!test? ( test )"
-
-SYSTEM_LMDB_VER=0.9.31
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		dev-libs/libevent:=
-		dev-libs/libltdl
-		sys-fs/e2fsprogs
-		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
-		argon2? ( app-crypt/argon2:= )
-		crypt? ( virtual/libcrypt:= )
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			dev-libs/openssl:0=
-		)
-		smbkrb5passwd? (
-			dev-libs/openssl:0=
-			kerberos? ( app-crypt/heimdal )
-		)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-		)
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-BDEPEND="
-	!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-	)
-"
-
-# for tracking versions
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
-	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
-	"${FILESDIR}"/${PN}-2.6.1-flags.patch
-	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		local fail=0
-
-		# This will not cover detection of cn=Config based configuration, but
-		# it's hopefully good enough.
-		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
-			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted away from backend shell!"
-			echo
-			fail=1
-		fi
-		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
-			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
-			eerror "	You will need to migrate per upstream's migration notes"
-			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
-			eerror "	Your existing database will not be accessible until it is"
-			eerror "	converted to mdb!"
-			echo
-			fail=1
-		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. Check that your data is intact."
-	eerror "11. Set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	# The system copy of dev-db/lmdb must match the version that this copy
-	# of OpenLDAP shipped with! See bug #588792.
-	#
-	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
-	# the bundled lmdb's header to find out the version.
-	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
-		libraries/liblmdb/lmdb.h || die)
-	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
-
-	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
-		eerror "Source lmdb version: ${bundled_lmdb_version}"
-		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
-		die "Ebuild needs to update SYSTEM_LMDB_VER!"
-	fi
-
-	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
-
-	local filename
-	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
-		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
-		mv "${filename}.utf8" "${filename}"
-	done
-
-	default
-
-	sed -i \
-		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
-		-e '/MKDIR.*.(DESTDIR)\/run/d' \
-		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to remove too early stripping"
-	popd &>/dev/null || die
-
-	# Fails with OpenSSL 3, bug #848894
-	# https://bugs.openldap.org/show_bug.cgi?id=10009
-	rm tests/scripts/test076-authid-rewrite || die
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-build_contrib_module() {
-	# <dir> [<target>]
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $1"
-	local target="${2:-all}"
-	emake \
-		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
-		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
-		"${target}"
-	popd &>/dev/null || die
-}
-
-multilib_src_configure() {
-	# Optional Features
-	myconf+=(
-		--enable-option-checking
-		$(use_enable debug)
-		--enable-dynamic
-		$(use_enable syslog)
-		--enable-ipv6
-		--enable-local
-	)
-
-	# Optional Packages
-	myconf+=(
-		--without-fetch
-	)
-
-	if use experimental ; then
-		# connectionless ldap per bug #342439
-		# connectionless is a unsupported feature according to Howard Chu
-		# see https://bugs.openldap.org/show_bug.cgi?id=9739
-		# (see also bug #892009)
-		append-flags -DLDAP_CONNECTIONLESS
-	fi
-
-	if ! use minimal && multilib_is_native_abi; then
-		# SLAPD (Standalone LDAP Daemon) Options
-		# overlay chaining requires '--enable-ldap' #296567
-		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
-		myconf+=(
-			--enable-ldap=yes
-			--enable-slapd
-			$(use_enable cleartext)
-			$(use_enable crypt)
-			$(multilib_native_use_enable sasl spasswd)
-			--disable-slp
-			$(use_enable tcpd wrappers)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				# ACI build as dynamic module not supported (yet)
-				--enable-aci=yes
-			)
-		fi
-
-		for option in modules rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# static SLAPD backends
-		for backend in mdb; do
-			myconf+=( --enable-${backend}=yes )
-		done
-
-		# module SLAPD backends
-		for backend in asyncmeta dnssrv meta null passwd relay sock; do
-			# missing modules: wiredtiger (not available in portage)
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		use perl && myconf+=( --enable-perl=mod )
-
-		if use odbc ; then
-			myconf+=( --enable-sql=mod )
-			if use iodbc ; then
-				myconf+=( --with-odbc="iodbc" )
-				append-cflags -I"${EPREFIX}"/usr/include/iodbc
-			else
-				myconf+=( --with-odbc="unixodbc" )
-			fi
-		fi
-
-		use overlays && myconf+=( --enable-overlays=mod )
-		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
-		# compile-in the syncprov
-		myconf+=( --enable-syncprov=yes )
-
-		# Build the standalone load balancer (lloadd) - also available as a slapd module; --enable-balancer=mod
-		myconf+=( --enable-balancer=yes )
-
-		# SLAPD Password Module Options
-		myconf+=(
-			$(use_enable argon2)
-		)
-
-		# Optional Packages
-		myconf+=(
-			$(use_with systemd)
-			$(multilib_native_use_with sasl cyrus-sasl)
-		)
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-mdb
-			--disable-overlays
-			--disable-autoca
-			--disable-syslog
-			--without-systemd
-		)
-	fi
-
-	# Library Generation & Linking Options
-	myconf+=(
-		$(use_enable static-libs static)
-		--enable-shared
-		--enable-versioning
-		--with-pic
-	)
-
-	# some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		if use gnutls ; then
-			myconf+=( --with-tls="gnutls" )
-		else
-			# disable MD2 hash function
-			append-cflags -DOPENSSL_NO_MD2
-			myconf+=( --with-tls="openssl" )
-		fi
-	else
-		myconf+=( --with-tls="no" )
-	fi
-
-	tc-export AR CC CXX
-
-	ECONF_SOURCE="${S}" econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		--localstatedir="${EPREFIX}"/var \
-		--runstatedir="${EPREFIX}"/run \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		"${myconf[@]}"
-
-	# argument '--runstatedir' seems to have no effect therefore this workaround
-	sed -i \
-		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
-		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
-
-	sed -i \
-		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
-		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
-
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# we have to run it AFTER the main build, not just after the main configure
-	local myconf_ldapcpp=(
-		--with-libldap="${E}/lib"
-		--with-ldap-includes="${S}/include"
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS="${LDFLAGS}"
-	local CPPFLAGS="${CPPFLAGS}"
-
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-
-	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
-	popd &>/dev/null || die "popd contrib/ldapc++"
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			build_contrib_module "passwd" "pw-kerberos.la"
-		fi
-
-		if use pbkdf2; then
-			build_contrib_module "passwd/pbkdf2"
-		fi
-
-		if use sha2 ; then
-			build_contrib_module "passwd/sha2"
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		build_contrib_module "passwd" "pw-netscape.la"
-
-		#build_contrib_module "acl" "posixgroup.la" # example code only
-		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
-		build_contrib_module "addpartial"
-		build_contrib_module "allop"
-		build_contrib_module "allowed"
-		build_contrib_module "autogroup"
-		build_contrib_module "cloak"
-		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop"
-		build_contrib_module "dsaschema"
-		build_contrib_module "dupent"
-		build_contrib_module "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod"
-		build_contrib_module "noopsrch"
-		#build_contrib_module "nops" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" RESO:LATER
-		build_contrib_module "trace"
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		$(tc-getCC) -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CPPFLAGS} \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		pwd
-
-		# Increase various test timeouts/delays, bug #894012
-		# We can't just double everything as there's a cumulative effect.
-		export SLEEP0=2 # originally 1
-		export SLEEP1=10 # originally 7
-		export SLEEP2=20 # originally 15
-		export TIMEOUT=16 # originally 8
-
-		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
-		# emake partests => runs ALL of the tests in parallel
-		# wt/WiredTiger is not supported in Gentoo
-		TESTS=( plloadd pmdb )
-		#TESTS+=( pldif ) # not done by default, so also exclude here
-		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
-
-		emake -Onone "${TESTS[@]}"
-	fi
-}
-
-multilib_src_install() {
-	emake CC="$(tc-getCC)" \
-		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		einfo "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
-			-i "${configfile}" || die
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
-
-		if use systemd; then
-			# The systemd unit uses Type=notify, so it is useless without USE=systemd
-			einfo "Install systemd service"
-			rm -rf "${ED}"/{,usr/}lib/systemd
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
-			systemd_dounit "${T}"/slapd.service
-			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-		fi
-
-		# if built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			libtool --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		if use systemd; then
-			tmpfiles_process slapd.conf
-		fi
-
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.6.8.ebuild b/net-nds/openldap/openldap-2.6.8.ebuild
new file mode 100644
index 000000000000..250d4ce0b66e
--- /dev/null
+++ b/net-nds/openldap/openldap-2.6.8.ebuild
@@ -0,0 +1,895 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs
+inherit ssl-cert toolchain-funcs systemd tmpfiles
+
+MY_PV="$(ver_rs 1-2 _)"
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.openldap.org/"
+SRC_URI="
+	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
+	mirror://gentoo/${BIS_P}
+"
+S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
+
+LICENSE="OPENLDAP GPL-2"
+# Subslot added for bug #835654
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
+IUSE_OVERLAY="overlays perl autoca"
+IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test"
+IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+REQUIRED_USE="
+	cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( cleartext sasl )
+	autoca? ( !gnutls )
+	?? ( test minimal )
+	kerberos? ( ?? ( kinit smbkrb5passwd ) )
+"
+RESTRICT="!test? ( test )"
+
+SYSTEM_LMDB_VER=0.9.33
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!gnutls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libevent:=
+		dev-libs/libltdl
+		sys-fs/e2fsprogs
+		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
+		argon2? ( app-crypt/argon2:= )
+		crypt? ( virtual/libcrypt:= )
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			dev-libs/openssl:0=
+		)
+		smbkrb5passwd? (
+			dev-libs/openssl:0=
+			kerberos? ( app-crypt/heimdal )
+		)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+		)
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+BDEPEND="
+	!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+	)
+"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
+	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
+	"${FILESDIR}"/${PN}-2.6.1-flags.patch
+	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
+	#"${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch
+	"${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch
+	#"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch # included upstream
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		local fail=0
+
+		# This will not cover detection of cn=Config based configuration, but
+		# it's hopefully good enough.
+		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
+			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted away from backend shell!"
+			echo
+			fail=1
+		fi
+		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
+			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted to mdb!"
+			echo
+			fail=1
+		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. Check that your data is intact."
+	eerror "11. Set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# The system copy of dev-db/lmdb must match the version that this copy
+	# of OpenLDAP shipped with! See bug #588792.
+	#
+	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
+	# the bundled lmdb's header to find out the version.
+	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
+		libraries/liblmdb/lmdb.h || die)
+	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
+
+	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
+		eerror "Source lmdb version: ${bundled_lmdb_version}"
+		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
+		die "Ebuild needs to update SYSTEM_LMDB_VER!"
+	fi
+
+	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
+
+	local filename
+	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
+		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
+		mv "${filename}.utf8" "${filename}"
+	done
+
+	default
+
+	sed -i \
+		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
+		-e '/MKDIR.*.(DESTDIR)\/run/d' \
+		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to remove too early stripping"
+	popd &>/dev/null || die
+
+	# Fails with OpenSSL 3, bug #848894
+	# https://bugs.openldap.org/show_bug.cgi?id=10009
+	rm tests/scripts/test076-authid-rewrite || die
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+build_contrib_module() {
+	# <dir> [<target>]
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $1"
+	local target="${2:-all}"
+	emake \
+		CC="${CC}" \
+		LDAP_BUILD="${BUILD_DIR}" \
+		libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+		prefix="${EPREFIX}/usr" \
+		STRIP=/bin/true \
+		"${target}"
+	popd &>/dev/null || die
+}
+
+multilib_src_configure() {
+	# Optional Features
+	myconf+=(
+		--enable-option-checking
+		$(use_enable debug)
+		--enable-dynamic
+		$(use_enable syslog)
+		--enable-ipv6
+		--enable-local
+	)
+
+	# Optional Packages
+	myconf+=(
+		--without-fetch
+		$(multilib_native_use_with sasl cyrus-sasl)
+	)
+
+	# error: passing argument 3 of ‘ldap_bv2rdn’ from incompatible pointer type [-Wincompatible-pointer-types]
+	# expected ‘char **’ but argument is of type ‘const char **’
+	#append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+	if use experimental ; then
+		# connectionless ldap per bug #342439
+		# connectionless is a unsupported feature according to Howard Chu
+		# see https://bugs.openldap.org/show_bug.cgi?id=9739
+		# (see also bug #892009)
+		append-flags -DLDAP_CONNECTIONLESS
+	fi
+
+	if ! use minimal && multilib_is_native_abi; then
+		# SLAPD (Standalone LDAP Daemon) Options
+		# overlay chaining requires '--enable-ldap' #296567
+		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
+		myconf+=(
+			--enable-ldap=yes
+			--enable-slapd
+			$(use_enable cleartext)
+			$(use_enable crypt)
+			$(multilib_native_use_enable sasl spasswd)
+			--disable-slp
+			$(use_enable tcpd wrappers)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				# ACI build as dynamic module not supported (yet)
+				--enable-aci=yes
+			)
+		fi
+
+		for option in modules rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# static SLAPD backends
+		for backend in mdb; do
+			myconf+=( --enable-${backend}=yes )
+		done
+
+		# module SLAPD backends
+		for backend in asyncmeta dnssrv meta null passwd relay sock; do
+			# missing modules: wiredtiger (not available in portage)
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		use perl && myconf+=( --enable-perl=mod )
+
+		if use odbc ; then
+			myconf+=( --enable-sql=mod )
+			if use iodbc ; then
+				myconf+=( --with-odbc="iodbc" )
+				append-cflags -I"${EPREFIX}"/usr/include/iodbc
+			else
+				myconf+=( --with-odbc="unixodbc" )
+			fi
+		fi
+
+		use overlays && myconf+=( --enable-overlays=mod )
+		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
+		# compile-in the syncprov
+		myconf+=( --enable-syncprov=yes )
+
+		# Build the standalone load balancer (lloadd) - also available as a slapd module; --enable-balancer=mod
+		myconf+=( --enable-balancer=yes )
+
+		# SLAPD Password Module Options
+		myconf+=(
+			$(use_enable argon2)
+		)
+
+		# Optional Packages
+		myconf+=(
+			$(use_with systemd)
+		)
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-mdb
+			--disable-overlays
+			--disable-autoca
+			--disable-syslog
+			--without-systemd
+		)
+	fi
+
+	# Library Generation & Linking Options
+	myconf+=(
+		$(use_enable static-libs static)
+		--enable-shared
+		--enable-versioning
+		--with-pic
+	)
+
+	# some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		if use gnutls ; then
+			myconf+=( --with-tls="gnutls" )
+		else
+			# disable MD2 hash function
+			append-cflags -DOPENSSL_NO_MD2
+			myconf+=( --with-tls="openssl" )
+		fi
+	else
+		myconf+=( --with-tls="no" )
+	fi
+
+	tc-export AR CC CXX
+
+	ECONF_SOURCE="${S}" \
+	STRIP=/bin/true \
+		econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		--localstatedir="${EPREFIX}"/var \
+		--runstatedir="${EPREFIX}"/run \
+		--sharedstatedir="${EPREFIX}"/var/lib \
+		"${myconf[@]}"
+
+	# argument '--runstatedir' seems to have no effect therefore this workaround
+	sed -i \
+		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
+		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
+
+	sed -i \
+		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
+		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
+
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# we have to run it AFTER the main build, not just after the main configure
+	local myconf_ldapcpp=(
+		--with-libldap="${E}/lib"
+		--with-ldap-includes="${S}/include"
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS="${LDFLAGS}"
+	local CPPFLAGS="${CPPFLAGS}"
+
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+
+	ECONF_SOURCE="${S}"/contrib/ldapc++ \
+	STRIP=/bin/true \
+		econf \
+		"${myconf_ldapcpp[@]}"
+	popd &>/dev/null || die "popd contrib/ldapc++"
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake \
+		CC="$(tc-getCC)" \
+		SHELL="${EPREFIX}"/bin/sh \
+		STRIP="/bin/true"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				CC="$(tc-getCC)" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+				STRIP=/bin/true
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			build_contrib_module "passwd" "pw-kerberos.la"
+		fi
+
+		if use pbkdf2; then
+			build_contrib_module "passwd/pbkdf2"
+		fi
+
+		if use sha2 ; then
+			build_contrib_module "passwd/sha2"
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		build_contrib_module "passwd" "pw-netscape.la"
+
+		#build_contrib_module "acl" "posixgroup.la" # example code only
+		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
+		build_contrib_module "addpartial"
+		build_contrib_module "allop"
+		build_contrib_module "allowed"
+		build_contrib_module "autogroup"
+		build_contrib_module "cloak"
+		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop"
+		build_contrib_module "dsaschema"
+		build_contrib_module "dupent"
+		build_contrib_module "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod"
+		build_contrib_module "noopsrch"
+		#build_contrib_module "nops" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" RESO:LATER
+		build_contrib_module "trace"
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		$(tc-getCC) -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CPPFLAGS} \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		pwd
+
+		# Increase various test timeouts/delays, bug #894012
+		# We can't just double everything as there's a cumulative effect.
+		export SLEEP0=2 # originally 1
+		export SLEEP1=10 # originally 7
+		export SLEEP2=20 # originally 15
+		export TIMEOUT=16 # originally 8
+
+		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
+		# emake partests => runs ALL of the tests in parallel
+		# wt/WiredTiger is not supported in Gentoo
+		TESTS=( plloadd pmdb )
+		#TESTS+=( pldif ) # not done by default, so also exclude here
+		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
+
+		emake -Onone "${TESTS[@]}"
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		CC="$(tc-getCC)" \
+		DESTDIR="${D}" \
+		SHELL="${EPREFIX}"/bin/sh \
+		STRIP=/bin/true \
+		install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		einfo "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}" || die
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
+
+		if use systemd; then
+			# The systemd unit uses Type=notify, so it is useless without USE=systemd
+			einfo "Install systemd service"
+			rm -rf "${ED}"/{,usr/}lib/systemd
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
+			systemd_dounit "${T}"/slapd.service
+			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+		fi
+
+		# if built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			libtool --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+	rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part of current codebase.
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		if use systemd; then
+			tmpfiles_process slapd.conf
+		fi
+
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+}
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
index d0c0f958b66d..f3447857a37b 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://download.gna.org/smbldap-tools/sources/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-perl/perl-ldap
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.11-r1.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.11-r1.ebuild
index 903e7e8eedd7..03f855ca0ccb 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.11-r1.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fumiyas/smbldap-tools/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-perl/perl-ldap
diff --git a/net-news/alligator/Manifest b/net-news/alligator/Manifest
index 9e2f7634f352..195ff2f6a149 100644
--- a/net-news/alligator/Manifest
+++ b/net-news/alligator/Manifest
@@ -1,2 +1,2 @@
-DIST alligator-23.08.5.tar.xz 191576 BLAKE2B 324680e50774c0c5030b98ba12a2418b74abf07ae27add40ff8cedb7574e4ef639dd2e0846a286748b33e0075e31e85f9a87f1242898e9e93b99774c2c6c58b5 SHA512 1daa2d9d0be0df379770011e3fc521235e1b7dfe7c68f20a8e573e813e2acd50b543c0d9cf5b4e608b1b3f6f06fce14fe3312fae9d054904af314db1953891ce
 DIST alligator-24.05.2.tar.xz 194208 BLAKE2B 915829987ae8ce318aa46adc0abeb869cd151d82d1a03211ef3567f30890bd80dc08830224778922a0e4fa2548c66bb78822997efd239be5e2d4b2c33cb69eb0 SHA512 69c76fa97c5e99eff3c4dbcb92a151a05c285ea7ab195e84f06d3f4f0aaa87e06903d6930d6c1f0df3cb4c54ae71327027a6af81dec3ae1ed5fd3258aee8bab8
+DIST alligator-24.08.0.tar.xz 195104 BLAKE2B 67564a2849bd43b42b7a569d3f174c30730e34f45b62df976f412b3fedd58de30d4cbf799ebb3b51723ae33becec2f08a17957eae0dd8565933814771d1d3da9 SHA512 b21dc07c6e70c7329a47687d7af2b720d69c3713f346276d4cc7555954c012054b7d4aabe9446caaa415f137efd5267b23a09df18fe1d4eecbedf7deb1670559
diff --git a/net-news/alligator/alligator-23.08.5.ebuild b/net-news/alligator/alligator-23.08.5.ebuild
deleted file mode 100644
index c84b9eba84e8..000000000000
--- a/net-news/alligator/alligator-23.08.5.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=5.106.0
-QTMIN=5.15.9
-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-0.6:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/net-news/alligator/alligator-24.05.2.ebuild b/net-news/alligator/alligator-24.05.2.ebuild
index 5719f8bbe23c..aeb2627a107c 100644
--- a/net-news/alligator/alligator-24.05.2.ebuild
+++ b/net-news/alligator/alligator-24.05.2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 DEPEND="
 	dev-libs/kirigami-addons:6
diff --git a/net-news/alligator/alligator-24.08.0.ebuild b/net-news/alligator/alligator-24.08.0.ebuild
new file mode 100644
index 000000000000..4e286b453257
--- /dev/null
+++ b/net-news/alligator/alligator-24.08.0.ebuild
@@ -0,0 +1,28 @@
+# 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/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-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 12586c28bf86..11883a6fdd50 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,3 +1 @@
-DIST SABnzbd-4.2.3-src.tar.gz 5096209 BLAKE2B 60d52f89cd85d942d50310b25016a33983889ee13e380785e3510b954e82ce6c29f867e4cf21814e4a949b9f0484cf55766583234bed7e91432a3a741ac3ba3a SHA512 446985d6c5faddd90bff097a55fb2e4e588f9d5aad42215187bade57dab9b00c132d8d9116c68b8210b51d382740a97908f2b5d071cbf6b90fe9c7ecbfc65398
-DIST SABnzbd-4.3.1-src.tar.gz 5104424 BLAKE2B d37b06da3943e1ae196b139c5c9be57b7c6af6225535ef3ca95c55dd93b6a64c7a2c2f73494c173d3284e63065f5a8867057a377ccf6505de7f6a2daa8b62a5f SHA512 99584a6e66c81bea59d9c139deb8c9683804000c09feb6df10c96ec52c3d9deedd794cee3d9db845b58c27d151cc2fcd1be1b022ce256f750dc45ba8d4ecae52
 DIST SABnzbd-4.3.2-src.tar.gz 5106752 BLAKE2B 0f8c934b862354158e8aa081adc9beec285e2f3b01899b6ae4e51e7b236aacf1a5dfff21a4e847add1412c620cd6da2e7c2e38173c3450443b37142332ab5659 SHA512 3b119ac4f3de55191e9ed4668b5423e680a11e12f98f0d3d82cc7e2195af316c30711372771a6ab863bcc3fdf39e79f121781341872b42cfbdec332f63ffc29a
diff --git a/net-nntp/sabnzbd/sabnzbd-4.2.3.ebuild b/net-nntp/sabnzbd/sabnzbd-4.2.3.ebuild
deleted file mode 100644
index a724182b8531..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-4.2.3.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"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_alpha/Alpha}"
-MY_PV="${MY_PV/_beta/Beta}"
-MY_PV="${MY_PV/_rc/RC}"
-
-MY_P="SABnzbd-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.11[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.7.1[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabctools-8.1.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		>=app-arch/par2cmdline-0.8
-		>=app-arch/par2cmdline-turbo-1.1.0
-	)
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			<dev-python/pyfakefs-5.4.0[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			~dev-python/pytest-7.4.4[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/tavalidate[${PYTHON_USEDEP}]
-			>=dev-python/tavern-2[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		'tests/test_newswrapper.py::TestNewsWrapper'
-		'tests/test_happyeyeballs.py::TestHappyEyeballs'
-		'tests/test_internetspeed.py::TestInternetSpeed'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-		'tests/test_functional_sorting.py::TestDownloadSorting'
-	)
-
-	# The test suite is prone to being broken by random plugins that happen
-	# to be installed, so disable autoloading.
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Use PYTEST_PLUGINS instead of args to 'epytest' because the test suite
-	# calls pytest itself and the args would get lost. To get the list of plugins,
-	# if stuck, comment out the AUTOLOAD line above, look at the list of loaded
-	# plugins at the top of the pytest output, then translate those into module names
-	# by e.g. checking equery f.
-	local -x PYTEST_PLUGINS=pytest_mock,tavern,tavern._core.pytest,pyfakefs.pytest_plugin,pytest_asyncio.plugin
-
-	epytest -s
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r email icons interfaces locale po sabnzbd scripts tools
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-4.3.1.ebuild b/net-nntp/sabnzbd/sabnzbd-4.3.1.ebuild
deleted file mode 100644
index d5ca5cb9611a..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-4.3.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_alpha/Alpha}"
-MY_PV="${MY_PV/_beta/Beta}"
-MY_PV="${MY_PV/_rc/RC}"
-
-MY_P="SABnzbd-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/apprise-1.7.6[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.11[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.7.1[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabctools-8.1.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		>=app-arch/par2cmdline-0.8
-		>=app-arch/par2cmdline-turbo-1.1.0
-	)
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			<dev-python/pyfakefs-5.4.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			~dev-python/pytest-7.4.4[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/tavalidate[${PYTHON_USEDEP}]
-			>=dev-python/tavern-2[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		'tests/test_newswrapper.py::TestNewsWrapper'
-		'tests/test_happyeyeballs.py::TestHappyEyeballs'
-		'tests/test_internetspeed.py::TestInternetSpeed'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-		'tests/test_functional_sorting.py::TestDownloadSorting'
-	)
-
-	# The test suite is prone to being broken by random plugins that happen
-	# to be installed, so disable autoloading.
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Use PYTEST_PLUGINS instead of args to 'epytest' because the test suite
-	# calls pytest itself and the args would get lost. To get the list of plugins,
-	# if stuck, comment out the AUTOLOAD line above, look at the list of loaded
-	# plugins at the top of the pytest output, then translate those into module names
-	# by e.g. checking equery f.
-	local -x PYTEST_PLUGINS=pytest_mock,tavern,tavern._core.pytest,pyfakefs.pytest_plugin,pytest_asyncio.plugin
-
-	epytest -s
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r email icons interfaces locale po sabnzbd scripts tools
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild b/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild
index f1cebec164bd..8170087d60e0 100644
--- a/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 # Sabnzbd is GPL-2 but bundles software with the following licenses.
 LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -116,6 +116,8 @@ src_test() {
 		'tests/test_functional_sorting.py::TestDownloadSorting'
 		# Bug https://bugs.gentoo.org/934331 fixed in 4.3.3.
 		'tests/test_sorting.py::TestSortingSorter'
+		# cryptography-43, https://bugs.gentoo.org/938453
+		'tests/test_utils/test_cert_gen.py::TestCertGen::test_generate_key_custom[512-test_key.pem]'
 	)
 
 	# The test suite is prone to being broken by random plugins that happen
diff --git a/net-p2p/biglybt/biglybt-3.6.0.0-r1.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0-r1.ebuild
deleted file mode 100644
index afbc9f0b3c8f..000000000000
--- a/net-p2p/biglybt/biglybt-3.6.0.0-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
-
-# No tests, #839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_PROVIDES="com.${PN}:${PN}-core:${PV} com.${PN}:${PN}-ui:${PV}"
-
-inherit desktop java-pkg-2 java-pkg-simple optfeature xdg
-
-DESCRIPTION="Feature-filled Bittorrent client based on the Azureus open source project"
-HOMEPAGE="https://www.biglybt.com"
-SRC_URI="https://github.com/BiglySoftware/BiglyBT/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/BiglyBT-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/swt:4.27[cairo]
-"
-
-# Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8
-# StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \
-# sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found
-# Restricting to jdk:11 for https://bugs.gentoo.org/888859
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=(
-	CODING_GUIDELINES.md
-	CONTRIBUTING.md
-	ChangeLog.txt
-	README.md
-	TRANSLATE.md
-)
-
-JAVADOC_SRC_DIRS=( {core,uis}/src )
-
-PATCHES=(
-	"${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch"
-	"${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
-	"${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.patch"
-	"${FILESDIR}/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	# AENameServiceDescriptor fails to compile with jdk >= 11
-	# "error: package sun.net.spi.nameservice does not exist"
-	# https://github.com/BiglySoftware/BiglyBT/pull/2611
-	rm -r core/src/com/biglybt/core/util/spi || die
-
-	cp -r core/{src,resources} || die
-	find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
-
-	cp -r uis/{src,resources} || die
-	find uis/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
-}
-
-src_compile() {
-	einfo "Compiling module \"core\""
-	JAVA_JAR_FILENAME="${PN}-core.jar"
-	JAVA_RESOURCE_DIRS="core/resources"
-	JAVA_SRC_DIR="core/src"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA="${PN}-core.jar"
-
-	einfo "Compiling module \"uis\""
-	JAVA_JAR_FILENAME="BiglyBT.jar"
-	JAVA_LAUNCHER_FILENAME="${PN}"
-	JAVA_MAIN_CLASS="com.${PN}.ui.Main"
-	JAVA_RESOURCE_DIRS="uis/resources"
-	JAVA_SRC_DIR="uis/src"
-	java-pkg-simple_src_compile
-
-	if use doc; then
-		einfo "Creating javadoc"
-		JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
-		ejavadoc
-	fi
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	make_desktop_entry "${PN}" BiglyBT "${PN}" "Network;FileTransfer"
-
-	if use source; then
-		java-pkg_dosrc "core/src/*"
-		java-pkg_dosrc "uis/src/*"
-	fi
-	default
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature_header "If you are using plugin proxies you might want to swap them for these native packages:"
-	optfeature "I2P SOCKS proxy" net-vpn/i2p net-vpn/i2pd
-	optfeature "TOR SOCKS proxy" net-vpn/tor
-}
diff --git a/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
new file mode 100644
index 000000000000..05df130f4bb3
--- /dev/null
+++ b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="com.${PN}:${PN}-core:${PV} com.${PN}:${PN}-ui:${PV}"
+
+inherit desktop java-pkg-2 java-pkg-simple optfeature xdg
+
+DESCRIPTION="Feature-filled Bittorrent client based on the Azureus open source project"
+HOMEPAGE="https://www.biglybt.com"
+SRC_URI="https://github.com/BiglySoftware/BiglyBT/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/BiglyBT-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64"
+
+CP_DEPEND="
+	dev-java/commons-cli:0
+	dev-java/swt:4.27[cairo]
+"
+
+# Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8
+# StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \
+# sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found
+# Restricting to jdk:11 for https://bugs.gentoo.org/888859
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=(
+	CODING_GUIDELINES.md
+	CONTRIBUTING.md
+	ChangeLog.txt
+	README.md
+	TRANSLATE.md
+)
+
+JAVADOC_SRC_DIRS=( {core,uis}/src )
+
+PATCHES=(
+	"${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch"
+	"${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
+	"${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.patch"
+	"${FILESDIR}/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch"
+	"${FILESDIR}/biglybt-3.6.0.0-fix-ambiguous.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	# AENameServiceDescriptor fails to compile with jdk >= 11
+	# "error: package sun.net.spi.nameservice does not exist"
+	# https://github.com/BiglySoftware/BiglyBT/pull/2611
+	rm -r core/src/com/biglybt/core/util/spi || die
+
+	cp -r core/{src,resources} || die
+	find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+
+	cp -r uis/{src,resources} || die
+	find uis/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+}
+
+src_compile() {
+	einfo "Compiling module \"core\""
+	JAVA_JAR_FILENAME="${PN}-core.jar"
+	JAVA_RESOURCE_DIRS="core/resources"
+	JAVA_SRC_DIR="core/src"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA="${PN}-core.jar"
+
+	einfo "Compiling module \"uis\""
+	JAVA_JAR_FILENAME="BiglyBT.jar"
+	JAVA_LAUNCHER_FILENAME="${PN}"
+	JAVA_MAIN_CLASS="com.${PN}.ui.Main"
+	JAVA_RESOURCE_DIRS="uis/resources"
+	JAVA_SRC_DIR="uis/src"
+	java-pkg-simple_src_compile
+
+	if use doc; then
+		einfo "Creating javadoc"
+		JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+		ejavadoc
+	fi
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	make_desktop_entry "${PN}" BiglyBT "${PN}" "Network;FileTransfer"
+
+	if use source; then
+		java-pkg_dosrc "core/src/*"
+		java-pkg_dosrc "uis/src/*"
+	fi
+	default
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature_header "If you are using plugin proxies you might want to swap them for these native packages:"
+	optfeature "I2P SOCKS proxy" net-vpn/i2p net-vpn/i2pd
+	optfeature "TOR SOCKS proxy" net-vpn/tor
+}
diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch
deleted file mode 100644
index a1db6dce78ed..000000000000
--- a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/uis/src/com/biglybt/ui/swt/systray/SystemTraySWT.java
-+++ b/uis/src/com/biglybt/ui/swt/systray/SystemTraySWT.java
-@@ -124,7 +124,6 @@ public class SystemTraySWT
- 				SystemTraySWT.core = core;
- 				gm = core.getGlobalManager();
- 				if (Constants.isUnix) {
--					ensureDorkBoxPlugin(core);
- 				}
- 			}
- 		});
diff --git a/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch b/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch
new file mode 100644
index 000000000000..8464f866570a
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch
@@ -0,0 +1,11 @@
+--- a/uis/src/com/biglybt/ui/console/multiuser/commands/UserCommand.java
++++ b/uis/src/com/biglybt/ui/console/multiuser/commands/UserCommand.java
+@@ -187,7 +187,7 @@ public class UserCommand extends IConsoleCommand {
+ 
+ 			UserProfile profile = new UserProfile(userName, userType);
+ 			profile.setPassword(password);
+-			String defaultSaveDirectory = commandLine.getOptionValue('d', null);
++			String defaultSaveDirectory = commandLine.getOptionValue('d', (String) null);
+ 			profile.setDefaultSaveDirectory(defaultSaveDirectory);
+ 
+ 			getUserManager().addUser(profile);
diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index d5be9aa47104..fb0a5eb5b0fa 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -5,4 +5,5 @@ DIST bitcoin-core-26.1.tar.gz 12822211 BLAKE2B 9093133f025a47cc93cc02056c2588be0
 DIST bitcoin-core-26.2.tar.gz 12889171 BLAKE2B 9a0d5ed49eb4e14e9bd4c88fb5665536a82ad054c8a6756bed7eeff15be1fb15bca280e73ecd97a2a09d5a4bc9ae6c400f815a83e62959eac26a22d0803a2282 SHA512 4069a903423d58e29a49c638274f0916d6b8e6e8761b987e570a230ecb3b5f6ceaa499b1d6e3dd52bc16f2c3c229ad31ab2ce1d0c91e61d85a65fdc477b0e3ba
 DIST bitcoin-core-27.0.tar.gz 13087956 BLAKE2B f625eaa2ce98cd8ed771f97d5a7e66733e94523d2ddda99cd858777bfb88a6e7eafae71e10fbf1ddadfcf629f2e3f790fb48c39f0e016d3fb22f1da7e7c93614 SHA512 0833fbd654570bc3e50efbe4da1f0bcab7744b92becc76d0dfea39a551325bd1b64ae746f7d9824d9e93fc53c95bc5eb5977869f0af04e26bd8ccb992d4c6e7c
 DIST bitcoin-core-27.1.tar.gz 13146683 BLAKE2B 9df45ca67565aa1f1cb851e86302ab5e7edbc573642cbd66585910cbd20ecbe8b3a89f7441fc7f299bb3ff32cf687a617f7449cd1a4164e9ac78637501f619da SHA512 b3c2f90b125705401dbf1318db44be586f3609473a9aa3b7330d6c7f48bf5b31951f822e494ae607ebb96e5ffb62b909bea51be14fd91ed71ea62324d2736862
+DIST bitcoin-core-28.0_rc1.tar.gz 12588747 BLAKE2B dc1900ad2dd58c504092127d60db83e22cea67cbb693f6d827b9284e4ddaed9c447a0107fcbc7109dd98a465b239aee46b10496c40f40301d5e02d02b16d86a3 SHA512 6d123330d8b3f4f50b21f84463c754d8bf179b0298f1004ef3249655213fb37855665de6eb3b2e226c3127e0e83bdb93a4ee0992d300f37025c5f033dbb1891e
 DIST bitcoin-core-miniupnpc-2.2.8-compat.patch 1130 BLAKE2B 4b1e8eaf4c7f13e9317fa4f69f6c2bce5f1663d8e4731bfe5ca5b4622fcd140e6532acdae544259727a59050b7f3f7bd7dab6f7f23dccebef4caf8fdef0f0c83 SHA512 ec0890d90a5ec3555b2e5477ead75ea5874c57aa3312dc64df5688224f51569f3f7c59593ed2f4336b283fff71c87b5d4fd786ab3cfecbb6407ef143b5018ba5
diff --git a/net-p2p/bitcoin-core/bitcoin-core-28.0_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-28.0_rc1.ebuild
new file mode 100644
index 000000000000..52d9e599d002
--- /dev/null
+++ b/net-p2p/bitcoin-core/bitcoin-core-28.0_rc1.ebuild
@@ -0,0 +1,423 @@
+# 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-leveldb +system-libsecp256k1 systemtap test test-full upnp zeromq"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	system-leveldb? ( || ( daemon 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-leveldb? ( virtual/bitcoin-leveldb )
+	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/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
+	! use system-leveldb || rm -r src/leveldb || die
+	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-leveldb)
+		$(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() {
+	DOCS+=( doc/release-notes/*.md )
+	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/files/28.0-syslibs.patch b/net-p2p/bitcoin-core/files/28.0-syslibs.patch
new file mode 100644
index 000000000000..ec52597a201e
--- /dev/null
+++ b/net-p2p/bitcoin-core/files/28.0-syslibs.patch
@@ -0,0 +1,296 @@
+From 19cd9d584f7bd7868898ae7592633e2eb255eb46 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <bitcoin@mattwhitlock.name>
+Date: Sun, 17 Sep 2023 10:29:27 -0400
+Subject: [PATCH] support linking against system-installed leveldb and
+ libsecp256k1
+
+- Abort if runtime leveldb != compiled-against leveldb.
+
+Originally based on 22.0-fix_build_without_leveldb.patch.
+---
+ configure.ac              | 90 ++++++++++++++++++++++++++++++++++++++-
+ src/Makefile.am           | 13 +++++-
+ src/Makefile.test.include |  2 +
+ src/dbwrapper.cpp         | 27 +++++++++++-
+ src/dbwrapper.h           |  8 ++++
+ src/kernel/checks.cpp     |  7 +++
+ 6 files changed, 143 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3bc6b13efc..290f289bf7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1141,6 +1141,41 @@ if test "$enable_fuzz_binary" = "yes"; then
+      ]])])
+ fi
+ 
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++  [AS_HELP_STRING([[--with-system-libsecp256k1[=PKG]]],
++    [build using system-installed libsecp256k1 instead of bundled, passing PKG (default: libsecp256k1) to pkg-config (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [AS_IF([test "x$withval" = xyes], [with_system_libsecp256k1=libsecp256k1])],
++  [with_system_libsecp256k1=no])
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test "x$with_system_libsecp256k1" = xno])
++AM_COND_IF([EMBEDDED_LIBSECP256K1], [
++  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++], [
++  saved_CPPFLAGS=$CPPFLAGS
++  saved_LIBS=$LIBS
++  PKG_CHECK_MODULES([libsecp256k1], [$with_system_libsecp256k1])
++  CPPFLAGS="$libsecp256k1_CFLAGS $CPPFLAGS"
++  LIBS="$libsecp256k1_LIBS $LIBS"
++  missing_modules=
++  AC_DEFUN([CHECK_MODULE], [
++    AC_CHECK_HEADER([secp256k1_$1.h],
++      [AC_CHECK_FUNCS([$2], [], [missing_modules="${missing_modules} $1"])],
++      [missing_modules="${missing_modules} $1"])
++  ])
++  CHECK_MODULE([ellswift], [secp256k1_ellswift_encode])
++  CHECK_MODULE([extrakeys], [secp256k1_xonly_pubkey_parse])
++  CHECK_MODULE([recovery], [secp256k1_ecdsa_recover])
++  CHECK_MODULE([schnorrsig], [secp256k1_schnorrsig_verify])
++  AS_IF([test -n "${missing_modules}"], [
++    AC_MSG_ERROR([system-installed libsecp256k1 does not support these required modules:${missing_modules}])
++  ])
++  CPPFLAGS=$saved_CPPFLAGS
++  LIBS=$saved_LIBS
++])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test "$enable_wallet" != "no"; then
+     dnl Check for libdb_cxx only if wallet enabled
+     if test "$use_bdb" != "no"; then
+@@ -1200,6 +1235,55 @@ if test "$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononono"; th
+   use_zmq=no
+ fi
+ 
++dnl Check for leveldb, only if explicitly requested
++AC_ARG_WITH([system-leveldb],
++  [AS_HELP_STRING([--with-system-leveldb],
++    [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_leveldb=$withval],
++  [system_leveldb=no])
++AC_ARG_VAR([leveldb_CFLAGS],[C compiler flags for system-leveldb])
++AC_ARG_VAR([leveldb_LIBS],[linker flags for system-leveldb])
++AS_IF([test x$system_leveldb != xno],[
++  TEMP_CPPFLAGS="$CPPFLAGS"
++  TEMP_LIBS="$LIBS"
++  CPPFLAGS="$leveldb_CFLAGS"
++  LIBS="$leveldb_LIBS"
++  AC_SEARCH_LIBS([leveldb_open],[leveldb],[leveldb_LIBS="$LIBS"],
++    [AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])])
++  AC_CHECK_HEADER([leveldb/filter_policy.h],[],
++    [AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])])
++  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[],
++    [AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])])
++
++  AC_MSG_CHECKING([for library containing leveldb::NewMemEnv])
++  for searchlib in "" "-lmemenv" ERR; do
++    if test "x$searchlib" = "xERR"; then
++      AC_MSG_RESULT([no])
++      AC_MSG_ERROR([LevelDB's memenv helper not found; using --with-system-leveldb is not supported anyway])
++    fi
++    LIBS="$searchlib $leveldb_LIBS"
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([
++        #include <leveldb/env.h>
++        #include <leveldb/helpers/memenv.h>
++      ],[
++        leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default());
++        delete myenv;
++      ])
++    ],[
++      AC_MSG_RESULT([$searchlib])
++      break
++    ])
++  done
++  leveldb_LIBS="$LIBS"
++  LIBS="$TEMP_LIBS"
++  CPPFLAGS="$TEMP_CPPFLAGS"
++],[
++  AC_DEFINE([EMBEDDED_LEVELDB],[1],[Define to use the bundled LevelDB sources])
++])
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
++AC_SUBST(leveldb_CFLAGS)
++AC_SUBST(leveldb_LIBS)
++
+ dnl Check for libminiupnpc (optional)
+ if test "$use_upnp" != "no"; then
+   TEMP_CPPFLAGS="$CPPFLAGS"
+@@ -1693,8 +1777,10 @@ CPPFLAGS="$CPPFLAGS_TEMP"
+ if test -n "$use_sanitizers"; then
+   export SECP_CFLAGS="$SECP_CFLAGS $SANITIZER_CFLAGS"
+ fi
+-ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --disable-module-ecdh"
+-AC_CONFIG_SUBDIRS([src/secp256k1])
++AM_COND_IF([EMBEDDED_LIBSECP256K1],[
++  ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --disable-module-ecdh"
++  AC_CONFIG_SUBDIRS([src/secp256k1])
++])
+ 
+ AC_OUTPUT
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1ccb5332c4..04e9d54962 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,7 +25,7 @@ check_PROGRAMS =
+ TESTS =
+ BENCHMARKS =
+ 
+-BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT)
++BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT)
+ 
+ LIBBITCOIN_NODE=libbitcoin_node.a
+ LIBBITCOIN_COMMON=libbitcoin_common.a
+@@ -34,7 +34,11 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
+ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+ 
+ if ENABLE_ZMQ
+ LIBBITCOIN_ZMQ=libbitcoin_zmq.a
+@@ -66,8 +70,10 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI)
+ endif
+ noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO)
+ 
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+ 
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -1110,8 +1116,13 @@ endif
+ 
+ include Makefile.minisketch.include
+ 
++if EMBEDDED_LEVELDB
+ include Makefile.crc32c.include
+ include Makefile.leveldb.include
++else
++LEVELDB_CPPFLAGS = $(leveldb_CFLAGS)
++LIBLEVELDB = $(leveldb_LIBS)
++endif
+ 
+ include Makefile.test_util.include
+ include Makefile.test_fuzz.include
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index c396cc2ebf..233f1a1c21 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -449,7 +449,9 @@ if ENABLE_BENCH
+ 	$(BENCH_BINARY) -sanity-check -priority-level=high
+ endif
+ endif
++if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
++endif
+ 
+ if ENABLE_TESTS
+ UNIVALUE_TESTS = univalue/test/object univalue/test/unitester
+diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
+index 479064d468..b476b42c85 100644
+--- a/src/dbwrapper.cpp
++++ b/src/dbwrapper.cpp
+@@ -22,7 +22,11 @@
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+ #include <leveldb/filter_policy.h>
+-#include <leveldb/helpers/memenv/memenv.h>
++#if EMBEDDED_LEVELDB
++# include <leveldb/helpers/memenv/memenv.h>
++#else
++# include <leveldb/helpers/memenv.h>
++#endif
+ #include <leveldb/iterator.h>
+ #include <leveldb/options.h>
+ #include <leveldb/slice.h>
+@@ -51,6 +55,27 @@ static void HandleError(const leveldb::Status& status)
+     throw dbwrapper_error(errmsg);
+ }
+ 
++#if !EMBEDDED_LEVELDB
++#include <node/interface_ui.h>
++#include <util/translation.h>
++#include <leveldb/c.h>
++bool dbwrapper_SanityCheck()
++{
++    unsigned long header_version = (leveldb::kMajorVersion << 16) | leveldb::kMinorVersion;
++    unsigned long library_version = (leveldb_major_version() << 16) | leveldb_minor_version();
++
++    if (header_version != library_version) {
++        InitError(Untranslated(strprintf("Compiled with LevelDB %d.%d, but linked with LevelDB %d.%d (incompatible).",
++            leveldb::kMajorVersion, leveldb::kMinorVersion,
++            leveldb_major_version(), leveldb_minor_version()
++        )));
++        return false;
++    }
++
++    return true;
++}
++#endif
++
+ class CBitcoinLevelDBLogger : public leveldb::Logger {
+ public:
+     // This code is adapted from posix_logger.h, which is why it is using vsprintf.
+diff --git a/src/dbwrapper.h b/src/dbwrapper.h
+index 63c2f99d2a..406d03f1ea 100644
+--- a/src/dbwrapper.h
++++ b/src/dbwrapper.h
+@@ -5,6 +5,10 @@
+ #ifndef BITCOIN_DBWRAPPER_H
+ #define BITCOIN_DBWRAPPER_H
+ 
++#if defined(HAVE_CONFIG_H)
++#include <config/bitcoin-config.h>
++#endif
++
+ #include <attributes.h>
+ #include <serialize.h>
+ #include <span.h>
+@@ -46,6 +50,10 @@ struct DBParams {
+     DBOptions options{};
+ };
+ 
++#if !EMBEDDED_LEVELDB
++bool dbwrapper_SanityCheck();
++#endif
++
+ class dbwrapper_error : public std::runtime_error
+ {
+ public:
+diff --git a/src/kernel/checks.cpp b/src/kernel/checks.cpp
+index e4a13ee4cc..2ca51437bf 100644
+--- a/src/kernel/checks.cpp
++++ b/src/kernel/checks.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <kernel/checks.h>
+ 
++#include <dbwrapper.h>
+ #include <random.h>
+ #include <util/result.h>
+ #include <util/translation.h>
+@@ -14,6 +15,12 @@ namespace kernel {
+ 
+ util::Result<void> SanityChecks(const Context&)
+ {
++#if !EMBEDDED_LEVELDB
++    if (!dbwrapper_SanityCheck()) {
++        return util::Error{Untranslated("Database sanity check failure. Aborting.")};
++    }
++#endif
++
+     if (!Random_SanityCheck()) {
+         return util::Error{Untranslated("OS cryptographic RNG sanity check failure. Aborting.")};
+     }
+-- 
+2.46.0
+
diff --git a/net-p2p/bitcoin-core/metadata.xml b/net-p2p/bitcoin-core/metadata.xml
index a43e231b9918..57e1f807773b 100644
--- a/net-p2p/bitcoin-core/metadata.xml
+++ b/net-p2p/bitcoin-core/metadata.xml
@@ -22,7 +22,8 @@
 		<flag name="sqlite">Support descriptor wallets in SQLite format</flag>
 		<flag name="system-leveldb">Link with <pkg>virtual/bitcoin-leveldb</pkg> rather than embedding an internal copy</flag>
 		<flag name="system-libsecp256k1">Link with <pkg>dev-libs/libsecp256k1</pkg> rather than embedding an internal copy</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
+		<flag name="test-full">Run tests that take a long time</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
 	</use>
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index 6a03780bc782..914568760981 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -13,7 +13,7 @@
 		<flag name="external-signer">Include support for external wallet signer programs</flag>
 		<flag name="nat-pmp">Enable NAT-PMP port forwarding</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 5126e22fdc07..fbaa215fd727 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -12,7 +12,7 @@
 	<use>
 		<flag name="external-signer">Include support for external wallet signer programs</flag>
 		<flag name="nat-pmp">Enable NAT-PMP port forwarding</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index cf15653a883f..e7e396c59a3a 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,8 +1,2 @@
-DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a
-DIST classified-ads-0.14.tar.gz 2657632 BLAKE2B e3b405cb4c706a17158871b571a28f8a024b87e73e758858cec2387a7889ddf1ee5af2ce84b151d31bb5271991531380a2f177028022e2f5e28d7720926ebf8e SHA512 1d68c494f1f680b36fd8997183d222c8c4fd852cb4278947aed1744ba49d49d1cbb04ee06d6952ab22096c6d8b87b940c66d518cb26757fe03f17b3d1ce6dddb
-DIST classified-ads-0.15.tar.gz 2657723 BLAKE2B 71d670d716aa8dd743a981fb29545117b3cdc68ac8777870182676c2a03ab7d86d3ec84ad30a283874f7d643e7776faabd1e2a481f2a265e677c07a52690bd40 SHA512 5d770b213db14fc33491223a880daae923b4dc60d2d75398bf4a272e28618a3d1198c1d949daf5e59de28b71f90627945bd9c39b96c44bfbb445d5d8f96ce15d
 DIST classified-ads-0.16.tar.gz 2712434 BLAKE2B 09d541a80c4d0a8adfde0a34ee781f1ed02dfe632280f1928fd55f1aa6486364a45b94f88d5e5e0804d3c91cb3e2f8e7fa6a8477dab629d68f15a441ee404bf3 SHA512 1ca9ca0d3282f2e8230320f02eb405fc10b30b6f2b5f89e25105d71b64ff1d38616e8a48e7faca25643af9ce507d56c4b42022e7c2b90efe5d8e6d23e927d044
-DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
-DIST classified-ads-graphics-0.14.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
-DIST classified-ads-graphics-0.15.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 DIST classified-ads-graphics-0.16.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
diff --git a/net-p2p/classified-ads/classified-ads-0.13-r1.ebuild b/net-p2p/classified-ads/classified-ads-0.13-r1.ebuild
deleted file mode 100644
index 5f9a72b28641..000000000000
--- a/net-p2p/classified-ads/classified-ads-0.13-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=7
-inherit qmake-utils virtualx xdg
-
-DESCRIPTION="Program for displaying classified advertisement items"
-HOMEPAGE="http://katiska.org/classified-ads/"
-SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz
-	-> classified-ads-${PV}.tar.gz
-	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true
-	-> classified-ads-graphics-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	dev-lang/tcl:=
-	dev-lang/tk:=
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/opus
-	net-libs/libnatpmp
-	net-libs/miniupnpc
-	sys-apps/file
-	sys-libs/zlib
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( app-text/doxygen[dot] )
-	test? ( dev-libs/libgcrypt:0
-		dev-qt/qttest:5
-		dev-debug/gdb:0 )"
-
-src_prepare() {
-	# preprocessed graphics are unpacked into wrong directory
-	# so lets move them into correct location:
-	mv ../ui/* ui/ || die
-	# possible patches
-	eapply_user
-}
-
-src_configure() {
-	eqmake5
-	if use test; then
-		cd testca || die
-		eqmake5
-	fi
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		pushd doc > /dev/null || die
-		doxygen || die
-		popd > /dev/null || die
-	fi
-	if use test; then
-		emake -C testca
-	fi
-}
-
-src_test() {
-	# testca will return 0 if all unit tests pass
-	virtx ./testca/testca
-}
-
-src_install() {
-	docompress -x /usr/share/doc/
-	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
-	use doc && dodoc -r doc/doxygen.generated/html/.
-}
diff --git a/net-p2p/classified-ads/classified-ads-0.13-r2.ebuild b/net-p2p/classified-ads/classified-ads-0.13-r2.ebuild
deleted file mode 100644
index 1f23776c5ef0..000000000000
--- a/net-p2p/classified-ads/classified-ads-0.13-r2.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
-inherit qmake-utils virtualx xdg
-
-DESCRIPTION="Program for displaying classified advertisement items"
-HOMEPAGE="http://katiska.org/classified-ads/"
-SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz
-	-> classified-ads-${PV}.tar.gz
-	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true
-	-> classified-ads-graphics-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	dev-lang/tcl:=
-	dev-lang/tk:=
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/opus
-	net-libs/libnatpmp
-	net-libs/miniupnpc
-	sys-apps/file
-	sys-libs/zlib
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/doxygen[dot] )
-	test? ( dev-libs/libgcrypt:0
-		dev-qt/qttest:5
-		dev-debug/gdb:0 )"
-
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${P}-examples-install-dir.patch"
-)
-
-src_prepare() {
-	# preprocessed graphics are unpacked into wrong directory
-	# so lets move them into correct location:
-	mv ../ui/* ui/ || die
-	default
-}
-
-src_configure() {
-	eqmake5 examplefiles.path=/usr/share/doc/${PF}/examples
-	if use test; then
-		cd testca || die
-		eqmake5
-	fi
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		pushd doc > /dev/null || die
-		doxygen || die
-		popd > /dev/null || die
-	fi
-	if use test; then
-		emake -C testca
-	fi
-}
-
-src_test() {
-	# testca will return 0 if all unit tests pass
-	virtx ./testca/testca
-}
-
-src_install() {
-	docompress -x /usr/share/doc/
-	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
-	use doc && dodoc -r doc/doxygen.generated/html/.
-}
diff --git a/net-p2p/classified-ads/classified-ads-0.14.ebuild b/net-p2p/classified-ads/classified-ads-0.14.ebuild
deleted file mode 100644
index 30c8a9c7dc71..000000000000
--- a/net-p2p/classified-ads/classified-ads-0.14.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
-
-inherit qmake-utils virtualx xdg
-
-DESCRIPTION="Program for displaying classified advertisement items"
-HOMEPAGE="http://katiska.org/classified-ads/"
-SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz
-	-> classified-ads-${PV}.tar.gz
-	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true
-	-> classified-ads-graphics-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	dev-lang/tcl:=
-	dev-lang/tk:=
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/opus
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	sys-apps/file
-	sys-libs/zlib
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libgcrypt:0
-		dev-qt/qttest:5
-		dev-debug/gdb:0 )"
-
-BDEPEND="sys-devel/gettext
-	doc? ( app-text/doxygen )"
-
-src_prepare() {
-	# preprocessed graphics are unpacked into wrong directory
-	# so lets move them into correct location:
-	mv ../ui/* ui/ || die
-	default
-}
-
-src_configure() {
-	eqmake5 examplefiles.path=/usr/share/doc/${PF}/examples
-	if use test; then
-		cd testca || die
-		eqmake5
-	fi
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		pushd doc > /dev/null || die
-		doxygen || die
-		popd > /dev/null || die
-	fi
-	if use test; then
-		emake -C testca
-	fi
-}
-
-src_test() {
-	# testca will return 0 if all unit tests pass
-	virtx ./testca/testca || die
-}
-
-src_install() {
-	docompress -x /usr/share/doc/
-	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
-	use doc && dodoc -r doc/doxygen.generated/html/.
-}
diff --git a/net-p2p/classified-ads/classified-ads-0.15.ebuild b/net-p2p/classified-ads/classified-ads-0.15.ebuild
deleted file mode 100644
index 30c8a9c7dc71..000000000000
--- a/net-p2p/classified-ads/classified-ads-0.15.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
-
-inherit qmake-utils virtualx xdg
-
-DESCRIPTION="Program for displaying classified advertisement items"
-HOMEPAGE="http://katiska.org/classified-ads/"
-SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz
-	-> classified-ads-${PV}.tar.gz
-	https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true
-	-> classified-ads-graphics-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	dev-lang/tcl:=
-	dev-lang/tk:=
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/opus
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	sys-apps/file
-	sys-libs/zlib
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libgcrypt:0
-		dev-qt/qttest:5
-		dev-debug/gdb:0 )"
-
-BDEPEND="sys-devel/gettext
-	doc? ( app-text/doxygen )"
-
-src_prepare() {
-	# preprocessed graphics are unpacked into wrong directory
-	# so lets move them into correct location:
-	mv ../ui/* ui/ || die
-	default
-}
-
-src_configure() {
-	eqmake5 examplefiles.path=/usr/share/doc/${PF}/examples
-	if use test; then
-		cd testca || die
-		eqmake5
-	fi
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		pushd doc > /dev/null || die
-		doxygen || die
-		popd > /dev/null || die
-	fi
-	if use test; then
-		emake -C testca
-	fi
-}
-
-src_test() {
-	# testca will return 0 if all unit tests pass
-	virtx ./testca/testca || die
-}
-
-src_install() {
-	docompress -x /usr/share/doc/
-	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
-	use doc && dodoc -r doc/doxygen.generated/html/.
-}
diff --git a/net-p2p/classified-ads/files/classified-ads-0.13-examples-install-dir.patch b/net-p2p/classified-ads/files/classified-ads-0.13-examples-install-dir.patch
deleted file mode 100644
index e6b0b4bab362..000000000000
--- a/net-p2p/classified-ads/files/classified-ads-0.13-examples-install-dir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Antti Järvinen <antti.jarvinen@katiska.org>
-Bug: https://bugs.gentoo.org/809464
-
-Installs example TCL programs into correct path. Upon startup binary
-will check example files from path, this why this touches not only
-makefile but also the c++ code. Changes are possible to incorporate
-into next upstream release so this patch will become obsolete.
-
-diff -u -r classified-ads-0.13.orig/classified-ads.pro classified-ads-0.13/classified-ads.pro
---- classified-ads-0.13.orig/classified-ads.pro	2018-07-03 17:16:11.000000000 +0300
-+++ classified-ads-0.13/classified-ads.pro	2021-10-17 19:13:22.049743665 +0300
-@@ -186,7 +186,9 @@
- manpages.path = /usr/share/man/man1
- manpages.files = classified-ads.1
- # note this example file path appears also in file tclmodel.cpp
--examplefiles.path = /usr/share/doc/classified-ads/examples
-+isEmpty(examplefiles.path){
-+  examplefiles.path = /usr/share/doc/classified-ads/examples
-+} 
- examplefiles.files = doc/sysinfo.tcl doc/luikero.tcl doc/calendar.tcl
- INSTALLS += target \
-         desktopfiles \
-diff -u -r classified-ads-0.13.orig/datamodel/tclmodel.cpp classified-ads-0.13/datamodel/tclmodel.cpp
---- classified-ads-0.13.orig/datamodel/tclmodel.cpp	2018-07-03 17:16:11.000000000 +0300
-+++ classified-ads-0.13/datamodel/tclmodel.cpp	2021-10-17 19:28:39.084875578 +0300
-@@ -292,7 +292,13 @@
- #else
-         // in unix this path appears in classified-ads.pro and 
-         // is used by "make install" phase.
--        QDir examplesDir ("/usr/share/doc/classified-ads/examples") ; 
-+        QDir examplesDir ("/usr/share/doc/classified-ads/examples") ;
-+        if ( !examplesDir.exists() ) {
-+	  // some linux distributions want version number inside path:
-+	  examplesDir.setPath("/usr/share/doc/classified-ads-"+
-+			      QString(CLASSIFIED_ADS_VERSION)+
-+			      "/examples") ;	  
-+        }
- #endif
-         if ( !examplesDir.exists() ) {
-             return ; // no examples, obviously
-diff -u -r classified-ads-0.13.orig/mcontroller.h classified-ads-0.13/mcontroller.h
---- classified-ads-0.13.orig/mcontroller.h	2018-07-03 17:16:11.000000000 +0300
-+++ classified-ads-0.13/mcontroller.h	2021-10-18 20:38:39.495032595 +0300
-@@ -25,7 +25,7 @@
- #include "datamodel/netrequestexecutor.h"
- #include "datamodel/cadbrecord.h" // for CaDbRecord::SearchTerms
- 
--#define CLASSIFIED_ADS_VERSION "0.13"
-+#define CLASSIFIED_ADS_VERSION "0.13-r2"
- 
- class Node ;
- class Model ;
diff --git a/net-p2p/go-ethereum/Manifest b/net-p2p/go-ethereum/Manifest
index 1fe3b15d9ad3..fcfc19dc6eb8 100644
--- a/net-p2p/go-ethereum/Manifest
+++ b/net-p2p/go-ethereum/Manifest
@@ -3,3 +3,4 @@ DIST go-ethereum-1.10.18.tar.gz 13084436 BLAKE2B 4918f13b131796f928c17e6cbd3ab42
 DIST go-ethereum-1.13.14-deps.tar.xz 70373740 BLAKE2B 6bc403f85e024fdeeab8f41ef7f2940cceee11b8f6a1f97dc53cc5dda997f3c97ddcaefac61df196508f00fe61152f21bedc8de9e380fa91245a049c0a93ab58 SHA512 0d6cc6b846dab05acabfa0fc840f2db450a3138f863bf3f99ef83040071260a42fa2dccb88877a0d340e2532241653c32efb783bc67698f316ab1c9291d75330
 DIST go-ethereum-1.13.14.tar.gz 13500798 BLAKE2B f5cf0c3f72aedc7d149c5342c2edbcb4310301b4c9b164d65e1e281b8db78c79ca884e9cb41ecd72ed6fbbed34e198cb13fe7cc726856c9f323a4aacc4a2dc17 SHA512 80a410dbeb06e8a46bd5b4e962fcf030fa8787eef192dbcd01c3d98bf31e822a8c3b92c35251876e122eac3fad707faf95b5e5c0baed8e29aa024c856b6f54bc
 DIST go-ethereum-1.14.7.tar.xz 167692372 BLAKE2B 90333516179a126a4972f616152fbf8eb83bb1f75b28ff92665b23d450bc04bba231c4978fada1f472f2205d373fbdf555548db262d8dd09c21730ed9ede74cd SHA512 ba2218c40bc58861a975041f04b822f38275c98cd1ebf0dbcfd0d454ca43d2712df4d35cb3516e503a31ab0f90fc1ba64b2e889e0b82fea8d33dd9dd1d838f13
+DIST go-ethereum-1.14.8.tar.xz 167710376 BLAKE2B aa9e5b854bfec55b3b998a22042a3b5a8091341358764d6568f08a936ba19dda1ad9a1a2c0f5728b0f0cc932eee027636653a1e4d2ca613c9eaadddb8cdb08cb SHA512 4bd2bbd34742cb5acce8734414b5d77f49ca9a54885939f932a8889702d9cead3efcf723d75b4e62b0bd3eeabc2ed298b65639da3485ac80eeaf45b7d01fad03
diff --git a/net-p2p/go-ethereum/go-ethereum-1.14.8.ebuild b/net-p2p/go-ethereum/go-ethereum-1.14.8.ebuild
new file mode 100644
index 000000000000..e43e7334a29b
--- /dev/null
+++ b/net-p2p/go-ethereum/go-ethereum-1.14.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+LONG_VERSION="${PV}+build30154+noble"
+DESCRIPTION="Official golang implementation of the Ethereum protocol"
+HOMEPAGE="https://github.com/ethereum/go-ethereum"
+SRC_URI="https://ppa.launchpadcontent.net/ethereum/ethereum/ubuntu/pool/main/e/ethereum/ethereum_${LONG_VERSION}.tar.xz -> ${P}.tar.xz"
+# Above PPA is listed as an official source here:
+# https://geth.ethereum.org/docs/getting-started/installing-geth#ubuntu-via-ppas
+S="${WORKDIR}/ethereum-${LONG_VERSION}"
+
+LICENSE="GPL-3+ LGPL-3+ MIT || ( BSD GPL-2 ) BSD-2 LGPL-2.1+ Apache-2.0 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="devtools"
+
+# Does all kinds of wonky stuff like connecting to Docker daemon, network activity, ...
+RESTRICT+=" test"
+
+src_unpack() {
+	default
+	mv "${S}/.mod" "${WORKDIR}/go-mod" || die
+}
+
+src_compile() {
+	emake $(usex devtools all geth)
+}
+
+src_install() {
+	einstalldocs
+
+	dobin build/bin/geth
+
+	# TODO: replace with wildcard
+	if use devtools; then
+		dobin build/bin/abidump
+		dobin build/bin/abigen
+		dobin build/bin/blsync
+		dobin build/bin/bootnode
+		dobin build/bin/clef
+		dobin build/bin/devp2p
+		dobin build/bin/era
+		dobin build/bin/ethkey
+		dobin build/bin/evm
+		dobin build/bin/rlpdump
+	fi
+}
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 3707a8e24952..42f64f93dbb4 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,2 +1,2 @@
-DIST ktorrent-23.08.5.tar.xz 2170976 BLAKE2B 047614caebfbddb36a517f79bfee3d10b7755e6246e4149a7e7d059f2156699a374ea57ba1102193faaf2f36c464c4c050eb0cfa5ac7331900dc0e70a5802d52 SHA512 f31c8f7be8eeae172b694380a1f828abe68087f059deb99ec268c5e6499e45beb28fe889732a198dae3c7f28f26b93b43e40da519e6407bea193198682b3c6bf
 DIST ktorrent-24.05.2.tar.xz 2181476 BLAKE2B 6276eb27c37255cb0ecf72785c990c3dac93b178cba8a1425cfad82b596f8efb87dcc12a6ec09b81064e3e3e2c06e0acc9c8507394ac2e0e148a7591dfbf2617 SHA512 4dd106c1ff1068100d4694b8dbc2e2b2475b8cb4dfbbc892fac1a31d619fce87c1f96dab6137f9430357b4b462ce9a34f1a5ab1dcb35b319ce46df11747dfee7
+DIST ktorrent-24.08.0.tar.xz 2183900 BLAKE2B f115afb180584379b9ac7f1c8524958a3a0f047d5c04643665afab18d9d56e13d7098c814d13b45ff8734314150a0c8955f41eb41ed89ac79c8d7b9d2c094bda SHA512 d64d61931e4fd793f6d044039438294f351da897c0420664cfb6a001a9557dcf35e81ad25888e223f24bf2fc835218a6a722ccb4d64870bdf635ea0c8f46bb32
diff --git a/net-p2p/ktorrent/ktorrent-23.08.5.ebuild b/net-p2p/ktorrent/ktorrent-23.08.5.ebuild
deleted file mode 100644
index 76128873918d..000000000000
--- a/net-p2p/ktorrent/ktorrent-23.08.5.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
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/ktorrent/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator
-+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=net-libs/libktorrent-${PVCUT}:5
-	infowidget? ( dev-libs/geoip )
-	ipfilter? ( >=kde-frameworks/karchive-${KFMIN}:5 )
-	mediaplayer? (
-		>=media-libs/phonon-4.11.0[qt5(+)]
-		>=media-libs/taglib-1.5:=
-	)
-	rss? (
-		>=dev-qt/qtwebengine-${QTMIN}:5
-		>=kde-frameworks/syndication-${KFMIN}:5
-	)
-	shutdown? ( kde-plasma/libkworkspace:5 )
-	stats? ( >=kde-frameworks/kplotting-${KFMIN}:5 )
-	upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.71
-"
-RDEPEND="${COMMON_DEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		|| (
-			kde-apps/kio-extras-kf5:5
-			kde-apps/kio-extras:5
-		)
-		>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	)
-"
-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 KF5Syndication)
-		-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.05.2.ebuild b/net-p2p/ktorrent/ktorrent-24.05.2.ebuild
index 452f0d4cc06a..eae90f49400e 100644
--- a/net-p2p/ktorrent/ktorrent-24.05.2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-24.05.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
diff --git a/net-p2p/ktorrent/ktorrent-24.08.0.ebuild b/net-p2p/ktorrent/ktorrent-24.08.0.ebuild
new file mode 100644
index 000000000000..db8e6dae8125
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-24.08.0.ebuild
@@ -0,0 +1,91 @@
+# 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/kubo/Manifest b/net-p2p/kubo/Manifest
index 0e82d8139fd9..11c2e71fc440 100644
--- a/net-p2p/kubo/Manifest
+++ b/net-p2p/kubo/Manifest
@@ -1,3 +1,5 @@
 DIST kubo-0.26.0.tar.gz 16129891 BLAKE2B 199e3fb3d7982eb3bca35c7139a15f4c4f32a54bde2c9ae2e5b594524668d146296001ccfb29d1ded5eec0e82a02b4e16a4bbb7a82bcc4787ee06820f02d4687 SHA512 21bcfd605d0aa0b55afafa5c717b6b0f8c657722a207ae0cb901815b7881266ae528acc85d74e70f5fafec9407c68cd5dcb2e02ab9fbe61c05f648888e15e0e5
 DIST kubo-0.28.0.tar.gz 16070929 BLAKE2B f0febdee1e2313c83369c07b520fe285e10a73322d87f3891dd8edc97d6fa3d8dab7644d6108d060ef652fe34ed7cacf75f756e48f1e022d16b12bc30d298c0b SHA512 e6ef309084b8f09b56e5bceae37cf220c7e015003a8660f132d4e79709c7bd29ae8d8bb02736dab6a447b3acccc7dd0bd7043955df0a787a72fb3b9dfe9c42f5
+DIST kubo-0.29.0-fs-repo-15-to-16-v1.0.1-vendor.tar.xz 1643384 BLAKE2B 6c51d34ab06e662213075cdc73fce0d3dad8c9acbfd2af6cd68ee50e90c33b91f06a68bbe40f4f3de867dd2862fb3cc0a09cb377f4d1ae70750906236059de5d SHA512 f3d9fbfc93fa714491eb7b8c995b686b8af86a65c56e7f14034b0dedb36b2b9a4d489852d7988acce30dcfd53f1637e1dca42ffdaa785bc6104864fc19c45a0c
+DIST kubo-0.29.0-fs-repo-15-to-16-v1.0.1.tar.gz 25942003 BLAKE2B 48eb3f50c8d0064561a99dd834cfc73482003bed70be93342bb30e993b509cca6aea0d44658ea981bb1063c458ce98e796293172b01109265e431f7a6ae279ae SHA512 bf631d402ecbee75e5a49e19e31c40172aeef81a13325bbf557841ba9e765caf39df42370a20d6e4039e7bd98e27dc5bd7a42f4490f30928a5614aca2214aea1
 DIST kubo-0.29.0.tar.gz 16229764 BLAKE2B 91a6d322987bf7316f4acaf984ea57ea69617925e56adf4cee06be4d08a3a77f8f197aed42aa16cd438485df657de02cd647d3319c7c1afd09c0b8410fab30e6 SHA512 f23496452c3382629fddafce039acdff51c085280b15b807923bc4474b3ec540a39f9906ba7dcba621fef6237336ee2eb1bed10f81cac7a1dfccb21b7c3fecfb
diff --git a/net-p2p/kubo/kubo-0.29.0-r1.ebuild b/net-p2p/kubo/kubo-0.29.0-r1.ebuild
new file mode 100644
index 000000000000..3f83dfd5962a
--- /dev/null
+++ b/net-p2p/kubo/kubo-0.29.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion systemd
+
+FS_MIG_V="1.0.1"
+FS_MIG_N="fs-repo-15-to-16"
+MY_FS_MIG="${FS_MIG_N}-v${FS_MIG_V}"
+FS_MIG_DIR="fs-repo-migrations-${MY_FS_MIG}"
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.tech https://github.com/ipfs/kubo/"
+SRC_URI="https://github.com/ipfs/${PN}/releases/download/v${PV}/kubo-source.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/ipfs/fs-repo-migrations/archive/refs/tags/${FS_MIG_N}/v${FS_MIG_V}.tar.gz -> ${P}-${MY_FS_MIG}.tar.gz"
+SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${MY_FS_MIG}-vendor.tar.xz -> ${P}-${MY_FS_MIG}-vendor.tar.xz"
+
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/ipfs
+	acct-user/ipfs
+	sys-fs/fuse:0
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md docs/ )
+
+src_prepare() {
+	default
+
+	sed -i '/fs-repo-1[0-9]-to-*/d' "${FS_MIG_DIR}/ignored-migrations" || die
+}
+
+src_compile() {
+	local mygoargs
+	mygoargs=(
+		-tags release
+	)
+
+	ego build "${mygoargs[@]}" -o ipfs ./cmd/ipfs
+	ego build "${mygoargs[@]}" -o ipfswatch ./cmd/ipfswatch
+
+	IPFS_PATH="" ./ipfs commands completion bash > ipfs-completion.bash || die
+	IPFS_PATH="" ./ipfs commands completion fish > ipfs-completion.fish || die
+	IPFS_PATH="" ./ipfs commands completion zsh > ipfs-completion.zsh || die
+
+	cd "${FS_MIG_DIR}" || die
+	emake
+}
+
+src_test() {
+	ego test ./cmd/ipfs/... ./cmd/ipfswatch/...
+}
+
+src_install() {
+	dobin ipfs
+	dobin ipfswatch
+	newbashcomp ipfs-completion.bash ipfs
+	newfishcomp ipfs-completion.fish ipfs
+	newzshcomp ipfs-completion.zsh _ipfs
+	einstalldocs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
+
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	keepdir /var/log/ipfs
+	fowners -R ipfs:ipfs /var/log/ipfs
+
+	dobin "${FS_MIG_DIR}/fs-repo-migrations/fs-repo-migrations"
+	find "${FS_MIG_DIR}" -executable -type f -name "fs-repo-*" -exec dobin {} \; || die
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+
+	# See https://bugs.gentoo.org/838238
+	ewarn 'In case kubo CPU usage is too high run the next workaround'
+	ewarn 'su -s /bin/sh -c "ipfs config profile apply lowpower" ipfs'
+	ewarn 'Be aware that this will make your node less visible to other peers'
+}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index e1536bafef11..85a109e44ab7 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,4 @@
-DIST qbittorrent-4.6.3.tar.xz 4512004 BLAKE2B b97022d2380e4cc1c4fdd06e7365136978f64b3ed98a4521e34197dcfa86c6e4032e0f9f7de1310a100a924f9a5250b145236d87f28317c4a79fe5d130d858b6 SHA512 13a7952bc8d0e57c24fcfb00ab8c7e5a1fdcb9c4755cb50f7f6b94a5cb01657e3b21996ff581366d957eaa36d90e14003c544c2376150d6041f14f42c4a03adc
-DIST qbittorrent-4.6.3.tar.xz.asc 849 BLAKE2B 34f61400fd340dd3770c600e57be36a434c5fcfed1d2d8ad9e050e7112a141f7aec3e6f94d3bcd7a893a7969344f6d7120aa908a3c8ed9451a475bd25a98a53a SHA512 0d2420be78fd66a7f1e0e8797f73fcbe462f08640adbc0c681f9321423eefb7805d3267ab144e8934f00a7ebeac0931f16c9fef199196e222b57a0153916696e
-DIST qbittorrent-4.6.4.tar.xz 4517896 BLAKE2B e2fc721b25e4a8983e8b481061de38a74f84ef32e1b791d658284607b9555791af67424a9a53985514906cd07e66807d4c9020e927ff5f30124af581c6ca2095 SHA512 2c3c364ea9dd11b7230a568036f599e5aeb0a7f2bbaa109cb04a706c88e693b4b4a9df7166227c453315ac9945e0f56066664c216c78111b5671bb798f618181
-DIST qbittorrent-4.6.4.tar.xz.asc 849 BLAKE2B 9eff44ee4bec81ee3064d8c8bccdf170144a4dc64c7bb56fb151a4effba5ba360190b7aeebbb284dc89ac888b82321457fd504cdddb6a722d57311cfb2c82f00 SHA512 817026a5695106a7f0a1ed60f221e52fb9c2244565d54ec43f21211dd3bffab89c8e02f2a71ff095e8a364dcfb44a13844af4d759a90d8133e7ef54021d2ab46
 DIST qbittorrent-4.6.5.tar.xz 4521852 BLAKE2B e988e73e2493d49a4f5e0ce64ac0d80ced288b9a324cbf8e31392e456aa8155a2d5d7109cd3aa0dd12e5d0332445fad2cc3b13b55e7c5844f53990a50f152e9a SHA512 a6e3c3c87eef6c547e602184105cb40da0b94d9887c61ba393bc71888943a9fa6a0fa990a7e6f69627b6d05208f7d39593ddf337125127985e90f859b6edc877
 DIST qbittorrent-4.6.5.tar.xz.asc 849 BLAKE2B c4ca92c7fc3ced048c068b9f0f805e0b511d86d30647e5310bc64ebbb186f35b6d3345436e9176e9e095ac9427d6a4b07b0bc3994e693098adfec07074e10b24 SHA512 b3c3d3740691346f3f48aa556e55702917b031d6f10802ca2a58c94097e096d2bc87d90cf2fefed30cd426f94fc108c7cbed44c95bf3cc0a0128dab0413c147b
+DIST qbittorrent-4.6.6.tar.xz 4524468 BLAKE2B 20141bf0bca5dd851950e070172d509b8f7d9d59125808b304ca321f31e4ed2f6fc8e012c05c37485a900db65c5e64b88b807196270a7328e2258ec550de8a7a SHA512 5062a2fe4fa821e76b6f058c1ca761572623bb2c5bf0df288119cd67563a5e2f1811b8c24bac9a9696b4620c3a1068136523add146691b483ed19e00d1000610
+DIST qbittorrent-4.6.6.tar.xz.asc 849 BLAKE2B 56ec7c17d3c49661bc156400d6a721767fa2b90e9946b4a6e737fa712bc60dc61ec08a4db638dcc440875a217ae36823d645bbd2a913e14b35747a3128ad9d21 SHA512 09975d8200f9c6c46ace2de95f43f42924ddfebb3140a20f10db2389fc63f1f2117e28bc3084da5605b01a0c040f272bd1e638feea51ebcc4cd56df1e9cb2af4
diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.3.ebuild b/net-p2p/qbittorrent/qbittorrent-4.6.3.ebuild
deleted file mode 100644
index d003502d13d5..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.6.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo multibuild systemd verify-sig xdg
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
-		verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
-	"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus +gui qt6 systemd test webui"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )
-	dbus? ( gui )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-1.1.1:=
-	>=net-libs/libtorrent-rasterbar-1.2.19:=
-	>=sys-libs/zlib-1.2.11
-	qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] )
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtxml:5
-	)
-	gui? (
-		!qt6? (
-			dev-qt/qtgui:5
-			dev-qt/qtsvg:5
-			dev-qt/qtwidgets:5
-			dbus? ( dev-qt/qtdbus:5 )
-		)
-		qt6? (
-			>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
-			>=dev-qt/qtsvg-6.2:6
-		)
-	)
-	webui? (
-		acct-group/qbittorrent
-		acct-user/qbittorrent
-	)
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-libs/boost-1.71
-	test? (
-		!qt6? ( dev-qt/qttest:5 )
-	)"
-BDEPEND+="
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( >=dev-qt/qttools-6.2:6[linguist] )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use gui && MULTIBUILD_VARIANTS+=( gui )
-	use webui && MULTIBUILD_VARIANTS+=( nogui )
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			# musl lacks execinfo.h
-			-DSTACKTRACE=$(usex !elibc_musl)
-			# More verbose build logs are preferable for bug reports
-			-DVERBOSE_CONFIGURE=ON
-			-DQT6=$(usex qt6)
-			-DWEBUI=$(usex webui)
-			-DTESTING=$(usex test)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
-			# We do this in multibuild, see bug #839531 for why.
-			# Fedora has to do the same thing.
-			mycmakeargs+=(
-				-DGUI=ON
-				-DDBUS=$(usex dbus)
-				-DSYSTEMD=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DGUI=OFF
-				-DDBUS=OFF
-			)
-
-			use systemd && mycmakeargs+=(
-				# The systemd service calls qbittorrent-nox, which is only
-				# installed when GUI=OFF.
-				-DSYSTEMD=ON
-				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	my_src_test() {
-		# cmake does not detect tests by default, if you use enable_testing
-		# in a subdirectory instead of the root CMakeLists.txt
-		cd "${BUILD_DIR}"/test || die
-		edo ctest .
-	}
-
-	multibuild_foreach_variant my_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-	einstalldocs
-
-	if use webui; then
-		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	fi
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.6.4.ebuild
deleted file mode 100644
index d003502d13d5..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.6.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo multibuild systemd verify-sig xdg
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
-		verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
-	"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus +gui qt6 systemd test webui"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gui webui )
-	dbus? ( gui )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-1.1.1:=
-	>=net-libs/libtorrent-rasterbar-1.2.19:=
-	>=sys-libs/zlib-1.2.11
-	qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] )
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtxml:5
-	)
-	gui? (
-		!qt6? (
-			dev-qt/qtgui:5
-			dev-qt/qtsvg:5
-			dev-qt/qtwidgets:5
-			dbus? ( dev-qt/qtdbus:5 )
-		)
-		qt6? (
-			>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
-			>=dev-qt/qtsvg-6.2:6
-		)
-	)
-	webui? (
-		acct-group/qbittorrent
-		acct-user/qbittorrent
-	)
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-libs/boost-1.71
-	test? (
-		!qt6? ( dev-qt/qttest:5 )
-	)"
-BDEPEND+="
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( >=dev-qt/qttools-6.2:6[linguist] )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use gui && MULTIBUILD_VARIANTS+=( gui )
-	use webui && MULTIBUILD_VARIANTS+=( nogui )
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			# musl lacks execinfo.h
-			-DSTACKTRACE=$(usex !elibc_musl)
-			# More verbose build logs are preferable for bug reports
-			-DVERBOSE_CONFIGURE=ON
-			-DQT6=$(usex qt6)
-			-DWEBUI=$(usex webui)
-			-DTESTING=$(usex test)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
-			# We do this in multibuild, see bug #839531 for why.
-			# Fedora has to do the same thing.
-			mycmakeargs+=(
-				-DGUI=ON
-				-DDBUS=$(usex dbus)
-				-DSYSTEMD=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DGUI=OFF
-				-DDBUS=OFF
-			)
-
-			use systemd && mycmakeargs+=(
-				# The systemd service calls qbittorrent-nox, which is only
-				# installed when GUI=OFF.
-				-DSYSTEMD=ON
-				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	my_src_test() {
-		# cmake does not detect tests by default, if you use enable_testing
-		# in a subdirectory instead of the root CMakeLists.txt
-		cd "${BUILD_DIR}"/test || die
-		edo ctest .
-	}
-
-	multibuild_foreach_variant my_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-	einstalldocs
-
-	if use webui; then
-		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	fi
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.6.ebuild b/net-p2p/qbittorrent/qbittorrent-4.6.6.ebuild
new file mode 100644
index 000000000000..534975068940
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.6.6.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edo multibuild systemd verify-sig xdg
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz
+		verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc )
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus +gui qt6 systemd test webui"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( gui webui )
+	dbus? ( gui )
+"
+
+RDEPEND="
+	>=dev-libs/openssl-1.1.1:=
+	>=net-libs/libtorrent-rasterbar-1.2.19:=
+	>=sys-libs/zlib-1.2.11
+	qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] )
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtxml:5
+	)
+	gui? (
+		!qt6? (
+			dev-qt/qtgui:5
+			dev-qt/qtsvg:5
+			dev-qt/qtwidgets:5
+			dbus? ( dev-qt/qtdbus:5 )
+		)
+		qt6? (
+			>=dev-qt/qtbase-6.2:6[dbus?,gui,widgets]
+			>=dev-qt/qtsvg-6.2:6
+		)
+	)
+	webui? (
+		acct-group/qbittorrent
+		acct-user/qbittorrent
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/boost-1.71
+	test? (
+		!qt6? ( dev-qt/qttest:5 )
+	)"
+BDEPEND+="
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( >=dev-qt/qttools-6.2:6[linguist] )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use gui && MULTIBUILD_VARIANTS+=( gui )
+	use webui && MULTIBUILD_VARIANTS+=( nogui )
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			# musl lacks execinfo.h
+			-DSTACKTRACE=$(usex !elibc_musl)
+			# More verbose build logs are preferable for bug reports
+			-DVERBOSE_CONFIGURE=ON
+			-DQT6=$(usex qt6)
+			-DWEBUI=$(usex webui)
+			-DTESTING=$(usex test)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then
+			# We do this in multibuild, see bug #839531 for why.
+			# Fedora has to do the same thing.
+			mycmakeargs+=(
+				-DGUI=ON
+				-DDBUS=$(usex dbus)
+				-DSYSTEMD=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DGUI=OFF
+				-DDBUS=OFF
+			)
+
+			use systemd && mycmakeargs+=(
+				# The systemd service calls qbittorrent-nox, which is only
+				# installed when GUI=OFF.
+				-DSYSTEMD=ON
+				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	my_src_test() {
+		# cmake does not detect tests by default, if you use enable_testing
+		# in a subdirectory instead of the root CMakeLists.txt
+		cd "${BUILD_DIR}"/test || die
+		edo ctest .
+	}
+
+	multibuild_foreach_variant my_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+	einstalldocs
+
+	if use webui; then
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	fi
+}
diff --git a/net-p2p/transmission/transmission-4.0.6-r5.ebuild b/net-p2p/transmission/transmission-4.0.6-r5.ebuild
new file mode 100644
index 000000000000..5f17ccd5c63e
--- /dev/null
+++ b/net-p2p/transmission/transmission-4.0.6-r5.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2006-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic tmpfiles systemd xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/transmission/transmission"
+else
+	MY_PV="${PV/_beta/-beta.}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="A fast, easy, and free BitTorrent client"
+HOMEPAGE="https://transmissionbt.com/"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT="0"
+IUSE="appindicator cli debug gtk nls mbedtls qt6 systemd test"
+RESTRICT="!test? ( test )"
+
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		gtk? ( sys-devel/gettext )
+	)
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+COMMON_DEPEND="
+	app-arch/libdeflate:=[gzip(+)]
+	>=dev-libs/libevent-2.1.0:=[threads(+)]
+	!mbedtls? ( dev-libs/openssl:0= )
+	mbedtls? ( net-libs/mbedtls:0= )
+	net-libs/libnatpmp
+	>=net-libs/libpsl-0.21.1
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.28.0[ssl]
+	sys-libs/zlib:=
+	nls? ( virtual/libintl )
+	gtk? (
+		>=dev-cpp/gtkmm-4.11.1:4.0
+		>=dev-cpp/glibmm-2.60.0:2.68
+		appindicator? ( dev-libs/libayatana-appindicator )
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,network,widgets]
+		dev-qt/qtsvg:6
+	)
+	systemd? ( >=sys-apps/systemd-209:= )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/transmission-4.0.6-miniupnpc-2.2.8.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+		-DENABLE_GTK=$(usex gtk ON OFF)
+		-DENABLE_MAC=OFF
+		-DREBUILD_WEB=OFF
+		-DENABLE_CLI=$(usex cli ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_NLS=$(usex nls ON OFF)
+
+		-DRUN_CLANG_TIDY=OFF
+
+		-DUSE_GTK_VERSION=4
+		-DUSE_SYSTEM_EVENT2=ON
+		-DUSE_SYSTEM_DEFLATE=ON
+		-DUSE_SYSTEM_DHT=OFF
+		-DUSE_SYSTEM_MINIUPNPC=ON
+		-DUSE_SYSTEM_NATPMP=ON
+		-DUSE_SYSTEM_UTP=OFF
+		-DUSE_SYSTEM_B64=OFF
+		-DUSE_SYSTEM_PSL=ON
+
+		-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl)
+		-DWITH_INOTIFY=ON
+		-DWITH_APPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+	)
+
+	if use qt6; then
+		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 )
+	else
+		mycmakeargs+=( -DENABLE_QT=OFF )
+	fi
+
+	# Disable assertions by default, bug 893870.
+	use debug || append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
+
+src_test() {
+	# https://github.com/transmission/transmission/issues/4763
+	cmake_src_test -E DhtTest.usesBootstrapFile
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+
+	if use systemd; then
+		# Service sets Type=notify
+		systemd_dounit daemon/transmission-daemon.service
+		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
+	fi
+
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
+
+	newtmpfiles "${FILESDIR}"/transmission-daemon.tmpfiles transmission-daemon.conf
+}
+
+pkg_postrm() {
+	if use gtk || use qt6; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use qt6; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+	tmpfiles_process transmission-daemon.conf
+}
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index c129e9140880..5e09d9018343 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -24,8 +24,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test"
-REQUIRED_USE="?? ( qt5 qt6 )"
+IUSE="appindicator cli debug gtk nls mbedtls qt6 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -37,7 +36,6 @@ BDEPEND="
 	nls? (
 		gtk? ( sys-devel/gettext )
 	)
-	qt5? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "
 COMMON_DEPEND="
@@ -56,14 +54,6 @@ COMMON_DEPEND="
 		>=dev-cpp/glibmm-2.60.0:2.68
 		appindicator? ( dev-libs/libayatana-appindicator )
 	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
 	qt6? (
 		dev-qt/qtbase:6[dbus,gui,network,widgets]
 		dev-qt/qtsvg:6
@@ -108,8 +98,6 @@ src_configure() {
 
 	if use qt6; then
 		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 )
-	elif use qt5; then
-		mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 )
 	else
 		mycmakeargs+=( -DENABLE_QT=OFF )
 	fi
@@ -144,14 +132,14 @@ src_install() {
 }
 
 pkg_postrm() {
-	if use gtk || use qt5 || use qt6; then
+	if use gtk || use qt6; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
 }
 
 pkg_postinst() {
-	if use gtk || use qt5 || use qt6; then
+	if use gtk || use qt6; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index b911f5172313..d17bea35ff7d 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,2 +1,3 @@
 DIST epson-inkjet-printer-escpr-1.8.5-1.tar.gz 5666905 BLAKE2B 549c948709993779b5615b501038fdceb6c3d6f173709b8cf99459346fff89923bdbe1babe34ee98eed4e1ebbd7a4b5962ddbc9cec9711aa15ff2056fec3d436 SHA512 4117b1efe903e4f506bbc67c45079f1d467ff6527691308734e55d32feeda3ec44b2dd85361e0243114f924eef04a91b0a5e86b5008f0a32ef323989b3d2896f
+DIST epson-inkjet-printer-escpr2-1.2.15-1.tar.gz 5560479 BLAKE2B 8180fe06df8175ec31044b0eec2a125b9567c11a827343401a07e59e8bd93e689617b9b29364374f1d6ba6d6bca320d6615f601791c59e966d3a4d63f7adbeb0 SHA512 62cd5161f65f8ca6f8c1a8bb755e06eb147d4a06b5f796a8068ed9235b3abf38e6ccb10e82bdd93fddc085b90a7f9332e024ba09679aa08490a05735c0372653
 DIST epson-inkjet-printer-escpr2-1.2.9-1.tar.gz 5367737 BLAKE2B 6868569a6bed622e2f50619a36ffb0a0f7e834fd8a794ae3bc906d971db26b0c86386c9545190ec384027d0b8e8f62ddda6cb24f1e3f60b9c535a1eeddff4332 SHA512 70ff744d42fac4c79d2994648763b0b3970ee5463a7a310a0721a63735d536cb9a0499c894289d946b30e6f564f9bf60aa61801580ab6635af211d50867921a1
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild
new file mode 100644
index 000000000000..f29a147b08b4
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
+HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/16/06/85/fddc1d5996d0cab4dceea35852a2e430fb124993/${MY_P}-1.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="EPSON LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="/usr/lib64/libescpr2.so.1.0.0"
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	#"${FILESDIR}/gcc-no-implicit-function-declaration-${PV}.patch"
+	"${FILESDIR}/gcc-no-implicit-function-declaration-$(ver_cut 1-2 ${PV}).patch"
+)
+
+src_configure() {
+	econf \
+		--with-cupsfilterdir="${EPREFIX}/usr/libexec/cups/filter"
+		--with-cupsppddir="${EPREFIX}/usr/share/ppd"
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr/lib64" -name "*.la" -delete \
+		|| die "Removal of libtool files (.la) has failed."
+}
diff --git a/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch
new file mode 100644
index 000000000000..ab244ddbe71b
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch
@@ -0,0 +1,89 @@
+From 70b13d5be6d9ca55c0a9ec0dd401c9401922b1b7 Mon Sep 17 00:00:00 2001
+From: Aleix Quintana Alsius <kinta@communia.org>
+Date: Fri, 31 May 2024 23:51:51 +0200
+Subject: [PATCH] reroll update x86-64 patch
+
+---
+ src/filter.c  | 12 +++++++++---
+ src/mem.c     |  1 +
+ src/wrapper.c |  1 +
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/filter.c b/src/filter.c
+index d53e091..5bb2a5f 100644
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -39,6 +39,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpr-services.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -48,6 +49,11 @@
+ #include "optBase.h"
+ #include "linux_cmn.h"
+ #include "custompage.h"
++#include "xfifo.h"
++
++extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB*);
++extern EPS_ERR_CODE SendStartJob ();
++extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*);
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+ 
+@@ -453,7 +459,7 @@ main (int argc, char *argv[])
+ 	}
+ 	
+ 	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
+-	int printHeight = 0;
++	EPS_UINT32 printHeight = 0;
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////	
+ 
+ 	print_area_x = printJob.printableAreaWidth;
+@@ -632,7 +638,7 @@ main (int argc, char *argv[])
+ 						memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3);
+ 					}
+ 				}
+-				PrintBand (rever_buf, bandBmp.widthBytes, &printHeight);
++				PrintBand ((const EPS_UINT8 *)rever_buf, bandBmp.widthBytes, &printHeight);
+ 				pos -= bandBmp.widthBytes;
+ 			}
+ 
+@@ -925,7 +931,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt)
+ 
+ 	/* Get number of pages */
+ 	char page_num;
+-	read (STDIN_FILENO, &page_num, 1);
++	(void)read (STDIN_FILENO, &page_num, 1);
+ 	debug_msg("total pages = %d\n", page_num);
+ 
+ 	/* Others */
+diff --git a/src/mem.c b/src/mem.c
+index f53f2bc..d6c945a 100644
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdlib.h>
+ #include "mem.h"
++#include "err.h"
+ 
+ void *
+ mem_malloc (unsigned int size, bool_t crit)
+diff --git a/src/wrapper.c b/src/wrapper.c
+index 1fa6daa..bfd567d 100644
+--- a/src/wrapper.c
++++ b/src/wrapper.c
+@@ -33,6 +33,7 @@
+ /* added 22-04-2004 */
+ #include <signal.h>
+ 
++#include "custompage.h"
+ #include "libprtX.h"
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+-- 
+2.45.1
+
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index e53dc71bcd6e..daebdfc0ea27 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,16 +1,13 @@
 DIST VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz 196700 BLAKE2B d740e19104a91b4cf978596ccda861974e96c9ed85a49c91e996c5bc6dde40f1cdcf49e6a75243aba7bf59abfd8d2c051a7ee574bab22f9e512d74376c9e1738 SHA512 cdc62271bb75ef7032745a457e1a54a84bcaadce73324272462b647383177338c5c2c8a17993d6344840e8ce0308a7e6f0df9bb766ebe0e8d4ee6dd4914e188c
-DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685 SHA512 d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076 SHA512 bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1
 DIST haproxy-2.4.27.tar.gz 3671596 BLAKE2B 987df4b07686e68805ff31a6832498ad8a7487a63b37e8d5ba9cd20be245a91c42e50d754d7d580d0899fed630a6bf99bd594cfec7b3a9d00ccac744a09da19b SHA512 97227805acd6131df8b4d398099bd9b89d1cd2aaddce4a3f334bf5b8b4dd01a30a0c3b56a7c23268456cf0e3a39244ddfd3ea0c27ee44f2c3bdf49c045b5fd8c
-DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d SHA512 5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc SHA512 81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
 DIST haproxy-2.6.18.tar.gz 4103766 BLAKE2B e55f401ede25e54b199b33b7fc3dd788a45e9abbeef10fde5be6939124ab14e119ace3a2dd9d191b7c32270989c98787bdc30d2defa80c012215e2761538ce4c SHA512 44bc0504b62c9553fe084c607e8e4d73df100b371a3493663f82fe661d07852046e1be5dc7d195a3d85f1170d9096c6a0770251ed10c1bc88f8f982ce740042f
 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0 SHA512 1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2 SHA512 774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.10.tar.gz 4392333 BLAKE2B 4afc387970adbd6f882aa9b1d95cf6cc914d98ce69648282798fe2d97be82adc60c6ad4d0f3a78f56e2eca26d91a47044de2ca7277ca2567ecfdd2233ad64f32 SHA512 0a36f1e17702f4ab6eccf1c10643f4685e8c8b272cc71cbf5feb61c8c95ea52b5fc47eeefc97390bb8cb4ac1d52db0c9ad3c0510f8ca017bf10204690554c6d2
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc SHA512 dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
+DIST haproxy-2.9.10.tar.gz 4532342 BLAKE2B a015b04cb008b6b0d0397e57caa0ae2fda7c91cf0c21f581cc58088fc853d962a5fc1750cd07012e03e3a063e9710803c5100e326aa89bc013b87d638764b11b SHA512 3aea657c37251cdeed295e90cbe0b54a87821c87ef17f80cd057a16102212fb1b992c6fe8b7c4f1a5d6f1890170f470a703b74bd17e2546cfd9847323d2c687f
 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692 SHA512 4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
 DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B 60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303c SHA512 23f320d49f822761cc0a4d8b7e15c8a58b804e4601c9421fa2433afe19798944d5a7264bf83502534b99236dda7c44ec72b97c1e6cdbcf203ab3090ae5313b3b
-DIST haproxy-2.9.9.tar.gz 4527952 BLAKE2B ef20ad71bf4ac0bf628267bc496c57598b2166002c71bd566323ec9e73bc2cea8ebac406d1eb87c5ec07b1253a54604f6b5f798caa29655c342d9846f62619a6 SHA512 6c0cd9fefc82d340ff2ac8427936b0c3e5a48208728f31239c511ee6c1e09299f8bb77b46a20194a31fee8b8299092979978d6564c0bbab033b2e437331c7dae
-DIST haproxy-3.0.2.tar.gz 4679721 BLAKE2B 301605d6e0c3e05241aeaac0c2c4d208896f0a8a239d0961f002c981da844ac8006cf11cd89e6017fe96030723d3dbea910a52d311fc82342f5eea196dea2a57 SHA512 f8add239e7c85ceff7a2fbc1a4e2394a449e247682d1868983ddb34943f14e01b74c710ded7a758b1e985dfaecf24e07a0b47c4c9d195f74ee1d3c2ef4567c71
-DIST haproxy-3.0.3.tar.gz 4684023 BLAKE2B d5f10110f0c95e214885b3a2248ed048adaf747e382fd343f90cfd35ed58e58f71a643260d87208e70f4d37101ba80471cd06ccd2d4cd9915031aa42fc86104f SHA512 a5aa15c0b95ab7920b6cd531a640f6a1fd75339b92a7b5dd0905ff281dea138ac287fc92cd5d8910fbbd18f2ae92d76d7ce09482debba9838def511b02f998c5
+DIST haproxy-3.0.4.tar.gz 4689835 BLAKE2B bb3691ac99db91a4a9faecce14f032d152d2fec36bc7722e7a71a8218e05e258c2667e45109af2006f20df38739d911db0be2f4845789824e7a012d4adc7bc38 SHA512 354d441d39a981ca16d844b64e06fde62df9ba0bc7fdd9e79e4890312be18378d7231ac997b035d5ef990f67f0b2cf8e60592026634777ccdb99286078c12867
diff --git a/net-proxy/haproxy/haproxy-2.4.23.ebuild b/net-proxy/haproxy/haproxy-2.4.23.ebuild
deleted file mode 100644
index 74bb3576a796..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.23.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"
-
-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 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 ROADMAP 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.6.14.ebuild b/net-proxy/haproxy/haproxy-2.6.14.ebuild
deleted file mode 100644
index 1e57b8694cc7..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.14.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"
-
-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.9.ebuild b/net-proxy/haproxy/haproxy-2.9.10.ebuild
index ce11ece1a066..ce11ece1a066 100644
--- a/net-proxy/haproxy/haproxy-2.9.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.9.10.ebuild
diff --git a/net-proxy/haproxy/haproxy-3.0.3.ebuild b/net-proxy/haproxy/haproxy-3.0.3.ebuild
deleted file mode 100644
index 019b7ed1219f..000000000000
--- a/net-proxy/haproxy/haproxy-3.0.3.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.0.2.ebuild b/net-proxy/haproxy/haproxy-3.0.4.ebuild
index 019b7ed1219f..019b7ed1219f 100644
--- a/net-proxy/haproxy/haproxy-3.0.2.ebuild
+++ b/net-proxy/haproxy/haproxy-3.0.4.ebuild
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f5f8ae210f39..35715b142af2 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,5 @@
+DIST squid-6.10.tar.xz 2558208 BLAKE2B 608b49c25549e73bc58ee4ec82a4d582f6f28b6dd324261806931eb2e37f0b5d63f6c2f6373a3db43823e805f5d6df56b2a4b5a8324cd6e623c4302d2c4b9421 SHA512 c0b75c3d383b1cd234b30dd02e84e1c5655fc53f63b75704bf4bac9ee0b86ba27e4656116893aff8b95dea19ff1befabcbb9dab3875da52fcb65f1d30f0fe5a9
+DIST squid-6.10.tar.xz.asc 647 BLAKE2B 22c41fae76b5e2efb5adc7d34beac0dce8218af0a4e77268989078acb91b6822a41f9a44cb60796548bb392040ad35317b5cfde9fdc51a37ffae616bbe9faede SHA512 5e9d053db90549760f7a675d9f4703ecde460906cb09dff489f9db5d0f7826fb30487c9b009cc4577f3f061f3c7b3a667418af298f55f882f696884dc536bf53
 DIST squid-6.6.tar.xz 2554824 BLAKE2B 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc SHA512 4ab261ed85ad674288467500aca9d8a48e3918b55f777635c0ba7a2551f248d35536848a5fbf2c946490a818004727f2aed33144f0a3ebab0be36cc4cffb020c
 DIST squid-6.6.tar.xz.asc 1193 BLAKE2B c37a400c51c30de35c6fe52123389c134d05670a36b1ffae4d67e7d06981bbf94788343daf2fdeafb782d464a977ee31bc601e3b1b92b45cd40ba6a6725b9a16 SHA512 08550569759c403a1a9747d08ea7055751fbf251355691074f6d09baca76a0987c5dff36e1f01b64edd446d568c7244b14124f6f8a1b19ccfc30293eed83a297
 DIST squid-6.7.tar.xz 2427468 BLAKE2B 0cd892213085326d1f4cc065778d95d74c03edaaf98b839b4422397fdcd449716b022e74adcbac636ca98e9d5c45a8f7aa156c3edc9f306fb13fc5cc21125dd6 SHA512 6221437056c600119fe9ff1ceeeaa9955cf9f21df481ad29a3515f8439a41b779d51f37b820b75641d0d4d6de54554f6f924dbd347834bf4a6ad6b5b317084a0
diff --git a/net-proxy/squid/squid-6.10.ebuild b/net-proxy/squid/squid-6.10.ebuild
new file mode 100644
index 000000000000..266c40c8dce1
--- /dev/null
+++ b/net-proxy/squid/squid-6.10.ebuild
@@ -0,0 +1,402 @@
+# 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/squid.gpg
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs verify-sig
+
+DESCRIPTION="Full-featured web proxy cache"
+HOMEPAGE="https://www.squid-cache.org/"
+
+MY_PV_MAJOR=$(ver_cut 1)
+# Upstream patch ID for the most recent bug-fixed update to the formal release.
+#r=-20181117-r0022167
+r=
+if [[ -z ${r} ]]; then
+	SRC_URI="
+		http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz
+		https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch
+		verify-sig? ( http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz.asc )
+	"
+else
+	SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2
+		https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch"
+	S="${S}${r}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
+IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
+
+DEPEND="
+	acct-group/squid
+	acct-user/squid
+	dev-libs/libltdl
+	sys-libs/tdb
+	virtual/libcrypt:=
+	caps? ( >=sys-libs/libcap-2.16 )
+	ecap? ( net-libs/libecap:1 )
+	esi? (
+		dev-libs/expat
+		dev-libs/libxml2
+	)
+	ldap? ( net-nds/openldap:= )
+	gnutls? ( >=net-libs/gnutls-3.1.5:= )
+	logrotate? ( app-admin/logrotate )
+	nis? (
+		net-libs/libtirpc:=
+		net-libs/libnsl:=
+	)
+	kerberos? ( virtual/krb5 )
+	pam? ( sys-libs/pam )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? (
+		dev-libs/nettle:=
+		!gnutls? (
+			dev-libs/openssl:=
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+	${DEPEND}
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	perl? ( dev-lang/perl )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+"
+DEPEND+=" valgrind? ( dev-debug/valgrind )"
+BDEPEND="
+	dev-lang/perl
+	ecap? ( virtual/pkgconfig )
+	test? ( dev-util/cppunit )
+	verify-sig? ( sec-keys/openpgp-keys-squid )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2-gentoo.patch
+	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
+	"${DISTDIR}"/${PN}-6.9-memleak_fix.patch
+)
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	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() {
+	default
+
+	# Fixup various paths
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/purge.1 || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		src/acl/external/unix_group/ext_unix_group_acl.8 \
+		src/acl/external/session/ext_session_acl.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
+
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+
+		--datadir=/usr/share/squid
+		--libexecdir=/usr/libexec/squid
+		--localstatedir=/var
+		--sysconfdir=/etc/squid
+		--with-default-user=squid
+		--with-logdir=/var/log/squid
+		--with-pidfile=/run/squid.pid
+
+		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
+		--enable-log-daemon-helpers
+		--enable-url-rewrite-helpers
+		--enable-cache-digests
+		--enable-delay-pools
+		--enable-disk-io
+		--enable-eui
+		--enable-icmp
+		--enable-ipv6
+		--enable-follow-x-forwarded-for
+		--enable-removal-policies="lru,heap"
+		--disable-strict-error-checking
+		--disable-arch-native
+
+		--with-large-files
+		--with-build-environment=default
+
+		--with-tdb
+
+		--without-included-ltdl
+		--with-ltdl-include="${ESYSROOT}"/usr/include
+		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
+
+		$(use_with caps cap)
+		$(use_enable snmp)
+		$(use_with ssl openssl)
+		$(use_with ssl nettle)
+		$(use_with gnutls)
+		$(use_with ldap)
+		$(use_enable ssl-crtd)
+		$(use_with systemd)
+		$(use_with test cppunit)
+		$(use_enable ecap)
+		$(use_enable esi)
+		$(use_enable esi expat)
+		$(use_enable esi xml2)
+		$(use_enable htcp)
+		$(use_with valgrind valgrind-debug)
+		$(use_enable wccp)
+		$(use_enable wccpv2)
+	)
+
+	# Basic modules
+	local basic_modules=(
+		NCSA
+		POP3
+		getpwnam
+
+		$(usev samba 'SMB')
+		$(usev ldap 'SMB_LM LDAP')
+		$(usev pam 'PAM')
+		$(usev sasl 'SASL')
+		$(usev nis 'NIS')
+		$(usev radius 'RADIUS')
+	)
+
+	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
+
+	if use mysql || use postgres || use sqlite; then
+		basic_modules+=( DB )
+	fi
+
+	# Digests
+	local digest_modules=(
+		file
+
+		$(usev ldap 'LDAP eDirectory')
+	)
+
+	# Kerberos
+	local negotiate_modules=( none )
+
+	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
+
+	if use kerberos; then
+		# We intentionally overwrite negotiate_modules here to lose
+		# the 'none'.
+		negotiate_modules=( kerberos wrapper )
+
+		if has_version app-crypt/heimdal; then
+			myeconfargs+=(
+				--without-mit-krb5
+				--with-heimdal-krb5
+			)
+		else
+			myeconfargs+=(
+				--with-mit-krb5
+				--without-heimdal-krb5
+			)
+		fi
+	fi
+
+	# NTLM modules
+	local ntlm_modules=( none )
+
+	if use samba ; then
+		# We intentionally overwrite ntlm_modules here to lose
+		# the 'none'.
+		ntlm_modules=( SMB_LM )
+	fi
+
+	# External helpers
+	local ext_helpers=(
+		file_userip
+		session
+		unix_group
+		delayer
+		time_quota
+
+		$(usev samba 'wbinfo_group')
+		$(usev ldap 'LDAP_group eDirectory_userip')
+	)
+
+	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
+	if use mysql || use postgres || use sqlite; then
+		ext_helpers+=( SQL_session )
+	fi
+
+	# Storage modules
+	local storeio_modules=(
+		aufs
+		diskd
+		rock
+		ufs
+	)
+
+	#
+	local transparent
+	if use kernel_linux; then
+		myeconfargs+=(
+			--enable-linux-netfilter
+			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
+		)
+	fi
+
+	tc-export_build_env BUILD_CXX
+	export BUILDCXX="${BUILD_CXX}"
+	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+	tc-export CC AR
+
+	# Should be able to drop this workaround with newer versions.
+	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
+	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
+
+	# Bug #719662
+	append-atomic-flags
+
+	print_options_without_comma() {
+		# IFS as ',' will cut off any trailing commas
+		(
+			IFS=','
+			options=( $(printf "%s," "${@}") )
+			echo "${options[*]}"
+		)
+	}
+
+	myeconfargs+=(
+		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
+		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
+		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
+		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
+		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
+		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	systemd_dounit tools/systemd/squid.service
+
+	# Need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+
+	# Pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# These scripts depend on perl
+	if ! use perl; then
+		local perl_scripts=(
+			basic_pop3_auth ext_delayer_acl helper-mux
+			log_db_daemon security_fake_certverify
+			storeid_file_rewrite url_lfs_rewrite
+		)
+
+		local script
+		for script in "${perl_scripts[@]}"; do
+			rm "${ED}"/usr/libexec/squid/${script} || die
+		done
+	fi
+
+	# Cleanup
+	rm -r "${D}"/run "${D}"/var/cache || die
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc src/auth/negotiate/kerberos/README README.kerberos
+	newdoc src/auth/basic/RADIUS/README README.RADIUS
+	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
+	dodoc RELEASENOTES.html
+
+	if use pam; then
+		newpamd "${FILESDIR}"/squid.pam squid
+	fi
+
+	newconfd "${FILESDIR}"/squid.confd-r2 squid
+	newinitd "${FILESDIR}"/squid.initd-r7 squid
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/squid.logrotate-r1 squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}"/squid.cron-r1 squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+
+	# Hack for bug #834503 (see also bug #664940)
+	# Please keep this for a few years until it's no longer plausible
+	# someone is upgrading from < squid 5.7.
+	mv "${ED}"/usr/share/squid/errors{,.new} || die
+}
+
+pkg_preinst() {
+	# Remove file in EROOT that the directory collides with.
+	rm -rf "${EROOT}"/usr/share/squid/errors || die
+
+	# Following the collision protection check, reverse
+	# src_install's rename in ED.
+	mv "${ED}"/usr/share/squid/errors{.new,} || die
+}
+
+pkg_postinst() {
+	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
+
+	if [[ ${#r} -gt 0 ]]; then
+		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
+	fi
+}
diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
index c141a430b420..c04b8ddb549e 100644
--- a/net-proxy/trojan/metadata.xml
+++ b/net-proxy/trojan/metadata.xml
@@ -25,6 +25,9 @@
 	</longdescription>
 	<use>
 		<flag name="mysql">build with MySQL support</flag>
+		<flag name="nat">Build with NAT support</flag>
+		<flag name="reuseport">Build with SO_REUSEPORT support</flag>
+		<flag name="tcpfastopen">Force build with TCP Fast Open support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">trojan-gfw/trojan</remote-id>
diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
deleted file mode 100644
index b5b332947cbb..000000000000
--- a/net-proxy/trojan/trojan-1.16.0-r2.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
-
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-any-r1 systemd readme.gentoo-r1
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/trojan"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git"
-else
-	SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="mysql test"
-
-# Some hiccups setting up local network server.
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	mysql? ( dev-db/mysql-connector-c:= )
-"
-DEPEND="${RDEPEND}
-	acct-group/trojan
-	acct-user/trojan
-	test? ( net-misc/curl ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	cmake_src_prepare
-	sed -i -e "/User/s/nobody/trojan/g" \
-		"${S}"/examples/trojan.service-example || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MYSQL=$(usex mysql)
-		-DSYSTEMD_SERVICE=ON
-		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}/trojan.initd" trojan
-
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_src_test -j1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-proxy/trojan/trojan-1.16.0-r3.ebuild b/net-proxy/trojan/trojan-1.16.0-r3.ebuild
new file mode 100644
index 000000000000..f77acffb22dc
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.16.0-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 systemd readme.gentoo-r1
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/trojan"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git"
+else
+	SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="mysql +nat +reuseport tcpfastopen test"
+
+# Some hiccups setting up local network server.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	mysql? ( dev-db/mysql-connector-c:= )
+"
+DEPEND="${RDEPEND}
+	acct-group/trojan
+	acct-user/trojan
+	test? ( net-misc/curl ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	cmake_src_prepare
+	sed -i -e "/User/s/nobody/trojan/g" \
+		"${S}"/examples/trojan.service-example || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MYSQL=$(usex mysql)
+		-DENABLE_NAT=$(usex nat)
+		-DENABLE_REUSE_PORT=$(usex reuseport)
+		-DFORCE_TCP_FASTOPEN=$(usex tcpfastopen)
+		-DSYSTEMD_SERVICE=ON
+		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}/trojan.initd" trojan
+
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_src_test -j1
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index a47bcf364138..90406a4c2793 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,5 +1 @@
-DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b
-DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
 DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
diff --git a/net-voip/mumble/files/mumble-1.4-force-alignment.patch b/net-voip/mumble/files/mumble-1.4-force-alignment.patch
deleted file mode 100644
index ea0ae4792443..000000000000
--- a/net-voip/mumble/files/mumble-1.4-force-alignment.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001
-From: Davide Beatrici <git@davidebeatrici.dev>
-Date: Thu, 1 Sep 2022 23:32:57 +0200
-Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for
- CCameraAngles in GTAV plugin
-
-https://en.cppreference.com/w/cpp/language/alignas
-
-This fixes compilation when the implicit alignment is not 8 bytes.
-
-It can be the case with 32 bit targets.
----
- plugins/gtav/structs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h
-index 2829dc11e1..0e4f76edab 100644
---- a/plugins/gtav/structs.h
-+++ b/plugins/gtav/structs.h
-@@ -118,7 +118,7 @@ struct CCameraManagerAngles {
- 	ptr_t cameraAngles; // CCameraAngles *
- };
- 
--struct CCameraAngles {
-+struct alignas(8) CCameraAngles {
- 	uint8_t pad1[960];
- 	ptr_t playerAngles; // CPlayerAngles *
- 	uint8_t pad2[60];
diff --git a/net-voip/mumble/mumble-1.4.287-r1.ebuild b/net-voip/mumble/mumble-1.4.287-r1.ebuild
deleted file mode 100644
index 006c163c720a..000000000000
--- a/net-voip/mumble/mumble-1.4.287-r1.ebuild
+++ /dev/null
@@ -1,158 +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 cmake flag-o-matic python-any-r1 xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P}.src"
-	fi
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-crypto-threads.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco[util,xml,zip]
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/opus-1.3.1
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon:= )
-	jack? ( virtual/jack )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-1.4-openssl3.patch"
-	"${WORKDIR}/${PN}-1.4-crypto-threads.patch"
-	"${WORKDIR}/${PN}-1.4-odr.patch"
-	"${FILESDIR}/${PN}-1.4-force-alignment.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# required because of xdg.eclass also providing src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-Dalsa="$(usex alsa)"
-		-Dtests="$(usex test)"
-		-Dbundled-celt="ON"
-		-Dbundled-opus="OFF"
-		-Dbundled-speex="OFF"
-		-Ddbus="$(usex dbus)"
-		-Dg15="$(usex g15)"
-		-Djackaudio="$(usex jack)"
-		-Doverlay="ON"
-		-Dportaudio="$(usex portaudio)"
-		-Doverlay-xcompile="$(usex multilib)"
-		-Dpipewire="$(usex pipewire)"
-		-Dpulseaudio="$(usex pulseaudio)"
-		-Drnnoise="$(usex rnnoise)"
-		-Dserver="OFF"
-		-Dspeechd="$(usex speech)"
-		-Dtranslations="$(usex nls)"
-		-Dupdate="OFF"
-		-Dwarnings-as-errors="OFF"
-		-Dzeroconf="$(usex zeroconf)"
-	)
-
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
-	fi
-
-	# https://bugs.gentoo.org/832978
-	# fix tests (and possibly runtime issues) on arches with unsigned chars
-	append-cxxflags -fsigned-char
-
-	cmake_src_configure
-}
-
-src_test() {
-	# https://bugs.gentoo.org/884049
-	# increase timeout for tests
-	local -x QTEST_FUNCTION_TIMEOUT=600000
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use amd64 && use multilib ; then
-		# The 32bit overlay library gets built when multilib is enabled.
-		# Install it into the correct 32bit lib dir.
-		local libdir_64="/usr/$(get_libdir)/mumble"
-		local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"
-		dodir ${libdir_32}
-		mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
-			"${ED}"/${libdir_32}/ || die
-	fi
-
-	insinto /usr/share/mumble
-	doins -r samples
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
-	elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)."
-	echo
-}
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index a47bcf364138..90406a4c2793 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -1,5 +1 @@
-DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b
-DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
 DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
diff --git a/net-voip/murmur/files/murmur.confd b/net-voip/murmur/files/murmur.confd
deleted file mode 100644
index 36367c51136b..000000000000
--- a/net-voip/murmur/files/murmur.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# where to look for the config file
-MURMUR_CONF=/etc/murmur/murmur.ini
-
-# run as this user
-MURMUR_USER=murmur
-
-# HOME directory of MURMUR_USER
-MURMUR_HOME=/var/lib/murmur
-
diff --git a/net-voip/murmur/metadata.xml b/net-voip/murmur/metadata.xml
index 60eba5013c64..4a342d839e56 100644
--- a/net-voip/murmur/metadata.xml
+++ b/net-voip/murmur/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Kenton Groombridge</name>
 	</maintainer>
 	<use>
-		<flag name="grpc">Use <pkg>net-libs/grpc</pkg> to enable remote control capabilities.</flag>
 		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
 	</use>
 	<upstream>
diff --git a/net-voip/murmur/murmur-1.4.287-r2.ebuild b/net-voip/murmur/murmur-1.4.287-r2.ebuild
deleted file mode 100644
index 61f7d8175087..000000000000
--- a/net-voip/murmur/murmur-1.4.287-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_P}.src"
-	fi
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus grpc +ice test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	grpc? ( net-libs/grpc )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-qt/qttest:5
-"
-BDEPEND="
-	acct-group/murmur
-	acct-user/murmur
-	virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
-	# Required for the mkini.sh script which calls perl multiple times
-	BDEPEND+="
-		dev-lang/perl
-	"
-fi
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.
-	The defualt 'SuperUser' password will be written into the log file
-	when starting murmur for the first time.
-	If you want to set it yourself, please execute:
-	su murmur -s /bin/bash -c 'mumble-server -ini /etc/murmur/murmur.ini -supw <pw>'
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-PATCHES=(
-	"${WORKDIR}/mumble-1.4-openssl3.patch"
-	"${WORKDIR}/mumble-1.4-crypto-threads.patch"
-	"${WORKDIR}/mumble-1.4-odr.patch"
-)
-
-src_prepare() {
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	# Change dbus user from mumble-server to murmur
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-i "${S}"/scripts/murmur.conf || die
-
-	# Adjust default server settings to be correct for our default setup
-	sed \
-		-e 's:database=:database=/var/lib/murmur/database.sqlite:' \
-		-e 's:;logfile=murmur.log:logfile=/var/log/murmur/murmur.log:' \
-		-e 's:;pidfile=:pidfile=/run/murmur/murmur.pid:' \
-		-i "${S}"/scripts/murmur.ini || die
-
-	# Adjust systemd service file to our config location #689208
-	sed \
-		-e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-e "s@murmurd@mumble-server@" \
-		-i scripts/${PN}.service || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-Dclient="OFF"
-		-Ddbus="$(usex dbus)"
-		-Dg15="OFF"
-		-Dgrpc="$(usex grpc)"
-		-Dice="$(usex ice)"
-		-Doverlay="OFF"
-		-Dserver="ON"
-		-Dzeroconf="$(usex zeroconf)"
-	)
-	if [[ "${PV}" != 9999 ]] ; then
-		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
-	fi
-
-	# https://bugs.gentoo.org/832978
-	# fix tests (and possibly runtime issues) on arches with unsigned chars
-	append-cxxflags -fsigned-char
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc README.md CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	doins scripts/${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	# Copy over the initd file so we can modify it incase zeroconf support is on.
-	cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd
-
-	if use zeroconf; then
-		sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die
-	fi
-
-	newinitd "${T}"/murmur.initd murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/mumble-server.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-	readme.gentoo_print_elog
-}
diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
new file mode 100644
index 000000000000..5c32f1d0d2a1
--- /dev/null
+++ b/net-vpn/candy/Manifest
@@ -0,0 +1 @@
+DIST candy-5.10.3.gh.tar.gz 115258 BLAKE2B 70d698d69fbb0a28adeb1ba515a1a1f6986c083d3a04b688bfd5b7ead98941bac46af47cd745b74928fc56466ebe3fa7d570f7ecaa1716b2eac948d9eaf52fe2 SHA512 c56ab81f599c5fbf72c509265b3fc0189a17e36b8738e536f21702585e7994c706a277d8c1dbf8b68e7f3609518fec0b4daccc0b180d375463e898bb7d41bbdc
diff --git a/net-vpn/candy/candy-5.10.3.ebuild b/net-vpn/candy/candy-5.10.3.ebuild
new file mode 100644
index 000000000000..9460dccd05c1
--- /dev/null
+++ b/net-vpn/candy/candy-5.10.3.ebuild
@@ -0,0 +1,42 @@
+# 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/files/README.gentoo b/net-vpn/candy/files/README.gentoo
new file mode 100644
index 000000000000..810d833321b0
--- /dev/null
+++ b/net-vpn/candy/files/README.gentoo
@@ -0,0 +1,10 @@
+Notes:
+ Running candy with multi instances
+
+   1) Using OpenRC
+    Prepare /etc/candy.d/${foo}.cfg first
+    # ln -s /etc/init.d/candy{,.${foo}}
+    # rc-update add candy.${foo} default
+
+   2) Using Systemd
+    # systemctl enable candy@${foo}
diff --git a/net-vpn/candy/metadata.xml b/net-vpn/candy/metadata.xml
new file mode 100644
index 000000000000..997cf71315bb
--- /dev/null
+++ b/net-vpn/candy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>yangmame@icloud.com</email>
+		<name>Xin Yang</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lanthora/candy</remote-id>
+		<maintainer>
+			<name>lanthora</name>
+			<email>lanthora@outlook.com</email>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.4.0.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.4.0.ebuild
index 6a4dd8a1e71b..a9601e011c16 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.4.0.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.4.0.ebuild
@@ -29,7 +29,7 @@ else
 		https://github.com/eduvpn/python-eduvpn-client/releases/download/${PV}/${MY_P}.tar.xz
 		verify-sig? ( https://github.com/eduvpn/python-eduvpn-client/releases/download/${PV}/${MY_P}.tar.xz.asc )
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild
index 84ff41be06c6..9612e2b38c22 100644
--- a/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild
+++ b/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild
@@ -28,7 +28,7 @@ else
 		verify-sig? ( https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz.asc )
 		https://www-user.tu-chemnitz.de/~hamari/eduvpn/${P}-deps.tar.xz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index fc780a5df065..4a66e7bda912 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -2,3 +2,5 @@ DIST frp-0.56.0-deps.tar.xz 2890568 BLAKE2B cabeeba66d4fa94ff95637020178310c984b
 DIST frp-0.56.0.tar.gz 1080201 BLAKE2B 493e8b21aab6d5fae2d762eafba7d94de59394e9c4cb3c3dfce2bd8b5a0d0fcca6ef471917e8257022e079bececf34e910fe3b6bc845753862da59a1d00ca20c SHA512 883dce220aa78296f2b7eb9d64b3d1598bc2df436c52a48bc813d725a6f8fa43028359b0507bf4a586a29f4739310474047abfefd46249c0c9942990ceac0e2d
 DIST frp-0.58.1-deps.tar.xz 2916740 BLAKE2B 49256c40ca359a5b76a92e2999e3a5a3ca4899f71e4804544296ee71fa6c079f563b1892195243e9e8792c72c445f779fb5a32b1cc5c4ebca9265d88808072e3 SHA512 3295e0e6b5a7ace8c5af1dd9e15ffb893930c0f03755e8de46dfbca2272747b95d8e58f4034f4fa2c44896c5036654b3c805a6d3dd0d39299996335330d28d07
 DIST frp-0.58.1.tar.gz 1081317 BLAKE2B e5d897a9d866df1075c9fb397f1cbcf23efb738fd89e58bce4fba5abce23d9cb6c826b50d4cda52b3fa40a6194003a51c6209f2d4aef43d9dc62f08b51a776a7 SHA512 809e86e9cd2cb67ae338b2584c0c8f5d4f01104cc7725826743f48eb5c893bce9cd678bcd90e04953bb6bfc6523fcf400c6bc1bdf03ff335666b05af5e0c4b55
+DIST frp-0.60.0-vendor.tar.xz 2816520 BLAKE2B 3f58f108c1dc563d73d119293d9cbcb181059c24bb58731f5d6d870a320982c976c8a0938ff0442bd21ffd0bb86218aaa20f1b382fb7a045422aaea411ad3557 SHA512 9825d39cd4bce25ad796b3ac817e690ca41daf9f028ac4e88aa43b4e295d20f9ede57a1be8933efca00a512ff238f8e34a85f24a4b56f9c52cf40aa1f26118f9
+DIST frp-0.60.0.tar.gz 1073862 BLAKE2B c6169818bbca656d44bc945c70b73474a4f427bd123fa7a546285fb63d3a156dc90d7fa1d46f2ba4ae971281e546fb43a217ad2527b7bd20a402810cb356d7ac SHA512 4c86b91a28b58ce5b681e5f8c886efd57a41fb6ac92606facce0b6f6f6cbd6cf6f789209252455bc6bc6a3ad043f2470040ac84b893926653cc036b40907e60c
diff --git a/net-vpn/frp/frp-0.60.0.ebuild b/net-vpn/frp/frp-0.60.0.ebuild
new file mode 100644
index 000000000000..994a8b5d4b28
--- /dev/null
+++ b/net-vpn/frp/frp-0.60.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd shell-completion
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-vendor.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="+client +server"
+REQUIRED_USE="|| ( client server )"
+BDEPEND=">=dev-lang/go-1.22"
+
+src_compile() {
+	mkdir -pv comp || die
+
+	if use client; then
+		ego build -trimpath -ldflags "-s -w" -tags frpc -o frpc ./cmd/frpc
+		./frpc completion bash > comp/frpc || die
+		./frpc completion fish > comp/frpc.fish || die
+		./frpc completion zsh > comp/_frpc || die
+	fi
+
+	if use server; then
+		ego build -trimpath -ldflags "-s -w" -tags frps -o frps ./cmd/frps
+		./frps completion bash > comp/frps || die
+		./frps completion fish > comp/frps.fish || die
+		./frps completion zsh > comp/_frps || die
+	fi
+}
+
+src_install() {
+	_install() {
+		# Install binary file
+		dobin "${1}"
+
+		# Install completion files
+		dobashcomp "${S}/comp/${1}"
+		dofishcomp "${S}/comp/${1}.fish"
+		dozshcomp "${S}/comp/_${1}"
+
+		# Install systemd services
+		systemd_dounit "${FILESDIR}/${1}.service"
+		systemd_newunit "${FILESDIR}/${1}_at_.service" "${1}@.service"
+
+		# Install config files
+		insinto "/etc/${PN}"
+		newins "${S}/conf/${1}.toml" "${1}.toml.example"
+		newins "${S}/conf/${1}_full_example.toml" "${1}_full.toml.example"
+	}
+
+	if use client; then
+		_install frpc
+	fi
+
+	if use server; then
+		_install frps
+	fi
+}
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 64b2a9814809..b9560b8355df 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1 +1,2 @@
 DIST i2psource_2.5.2.tar.bz2 33791390 BLAKE2B ceb74d4dd1c694aa174d9861615f5765f5620a803a5bd8b30eb8f986b2855a70e38c90899ed655f5cb65af5dde1a9572d4bb4ad5d244e5a62805a81325bf8419 SHA512 92ee39fb75b8b3bc4a06ea04831d2267d0fcd52a250eaa5b162f3c1e2c29207a51dcbafe4eab4fcfa87b21317201911d5bdafc118f5493c98bb86d0513fc9c88
+DIST i2psource_2.6.0.tar.bz2 33486530 BLAKE2B c9a39f4700c590a4e9e6ba621f24d1b6b181e6e69433493259bd59113231c2023c506419298ae6ed158808c0a45bed91038ab92c96147973ec947a787f91f56c SHA512 fdabd15084d0f66474d70e4786951be31e7a0fb4bf8094cd1a442beebd3c81d5f00d88ddc4b79b79d1494e2ad469c2b8028279e1259cd80a6ba68b6265d1be2e
diff --git a/net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch b/net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch
new file mode 100644
index 000000000000..e0be1a1926f6
--- /dev/null
+++ b/net-vpn/i2p/files/2.6.0-force-gentoo-classpath.patch
@@ -0,0 +1,291 @@
+commit 0d7543a63f99fb1713274fd8619d0d7285f68727
+Author: tharvik <tharvik@users.noreply.github.com>
+Date:   Sat Aug 17 13:56:51 2024 +0200
+
+    add gentoo.classpath
+
+diff --git a/apps/i2pcontrol/build.xml b/apps/i2pcontrol/build.xml
+index c350b0b73..db73702f4 100644
+--- a/apps/i2pcontrol/build.xml
++++ b/apps/i2pcontrol/build.xml
+@@ -24,6 +24,7 @@
+         <pathelement location="${wrapperlib}/wrapper.jar" />
+         <!-- following jar only present for debian builds -->
+         <pathelement location="../../core/java/build/json-simple.jar" />
++        <pathelement path="${gentoo.classpath}" />
+     </path>
+ 
+     <path id="cpSocket">
+@@ -33,6 +34,7 @@
+         <pathelement location="${wrapperlib}/wrapper.jar" />
+         <!-- following jar only present for debian builds -->
+         <pathelement location="../../core/java/build/json-simple.jar" />
++        <pathelement path="${gentoo.classpath}" />
+     </path>
+ 
+     <target name="all" depends="clean, build" />
+diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
+index 7033fccff..6701a4f47 100644
+--- a/apps/i2psnark/java/build.xml
++++ b/apps/i2psnark/java/build.xml
+@@ -63,6 +63,7 @@
+                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
+                 <pathelement location="../../jetty/jettylib/jetty-util.jar" />
+                 <pathelement location="../../desktopgui/dist/desktopgui.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </javac>
+     </target>
+diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
+index fc40aa32b..91725ab16 100644
+--- a/apps/i2ptunnel/java/build.xml
++++ b/apps/i2ptunnel/java/build.xml
+@@ -45,7 +45,7 @@
+             destdir="./build/obj"
+             includeAntRuntime="false"
+             encoding="UTF-8"
+-            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
++            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar:${gentoo.classpath}" >
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+     </target>
+@@ -373,6 +373,7 @@
+                 <!-- required for multipart form handling in register.jsp -->
+                 <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
+                 <pathelement location="../../jetty/jettylib/jspc.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <arg value="-d" />
+             <arg value="../jsp/WEB-INF/classes" />
+@@ -410,6 +411,7 @@
+                 <pathelement location="../../../core/java/build/i2p.jar" />
+                 <!-- required for multipart form handling in register.jsp -->
+                 <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </javac>
+         <copy file="../jsp/web.xml" tofile="../jsp/web-out.xml" />
+@@ -477,6 +479,7 @@
+                 <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
+                 <pathelement location="../../streaming/java/build/streaming.jar" />
+                 <pathelement location="${junit.home}/junit4.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <batchtest>
+                 <fileset dir="./test/junit/">
+diff --git a/apps/imagegen/imagegen/build.xml b/apps/imagegen/imagegen/build.xml
+index ea55c2c7e..83d17e36c 100644
+--- a/apps/imagegen/imagegen/build.xml
++++ b/apps/imagegen/imagegen/build.xml
+@@ -8,6 +8,7 @@
+         <pathelement location="../identicon/build/identicon.jar" />
+         <pathelement location="../zxing/build/zxing.jar" />
+         <pathelement location="../../../build/i2p.jar" />
++        <pathelement path="${gentoo.classpath}" />
+     </path>
+ 
+     <target name="all" depends="war" />
+diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
+index 3eed66acf..79d664ca9 100644
+--- a/apps/jetty/build.xml
++++ b/apps/jetty/build.xml
+@@ -418,6 +418,7 @@
+                 <pathelement location="./jettylib/org.mortbay.jetty.jar" />
+                 <!-- following jar only present for debian builds -->
+                 <pathelement location="./jettylib/tomcat-api.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
+index 7e589cb81..387c09eae 100644
+--- a/apps/ministreaming/java/build.xml
++++ b/apps/ministreaming/java/build.xml
+@@ -262,6 +262,7 @@
+                 <pathelement location="${mockito.home}/byte-buddy.jar" />
+                 <pathelement location="${mockito.home}/objenesis.jar" />
+                 <pathelement location="${mockito.home}/mockito-core.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+@@ -326,6 +327,7 @@
+                 <pathelement location="../../build/jbigi.jar" />
+                 <pathelement location="${with.clover}" />
+                 <pathelement location="${with.cobertura}" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <batchtest todir="../../../reports/ministreaming/junit/">
+                 <fileset dir="./test/junit">
+diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
+index 3f9c7ba4b..abcac8aec 100644
+--- a/apps/routerconsole/java/build.xml
++++ b/apps/routerconsole/java/build.xml
+@@ -88,6 +88,7 @@
+                 <!-- following jars only present for debian builds -->
+                 <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
+                 <pathelement location="../../../core/java/build/json-simple.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </javac>
+     </target>
+@@ -499,6 +500,7 @@
+                 <pathelement location="build/obj/" />
+                 <pathelement location="../../../router/java/build/router.jar" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <arg value="-d" />
+             <arg value="../jsp/WEB-INF/classes" />
+@@ -539,6 +541,7 @@
+                 <pathelement location="build/obj/" />
+                 <pathelement location="../../../router/java/build/router.jar" />
+                 <pathelement location="../../../core/java/build/i2p.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </javac>
+ 
+diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
+index bd5782b73..d0c12b334 100644
+--- a/apps/sam/java/build.xml
++++ b/apps/sam/java/build.xml
+@@ -18,6 +18,7 @@
+                 <pathelement location="../../../core/java/build/obj" />
+                 <pathelement location="../../../core/java/build/gnu-getopt.jar" />
+                 <pathelement location="../../ministreaming/java/build/obj" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </depend>
+     </target>
+@@ -39,7 +40,7 @@
+             includeAntRuntime="false"
+             encoding="UTF-8"
+             destdir="./build/obj" 
+-            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
++            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar:${gentoo.classpath}" >
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+     </target>
+diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
+index ecfa0ebfd..690b456de 100644
+--- a/apps/streaming/java/build.xml
++++ b/apps/streaming/java/build.xml
+@@ -76,6 +76,7 @@
+                 <pathelement location="${mockito.home}/byte-buddy.jar" />
+                 <pathelement location="${mockito.home}/objenesis.jar" />
+                 <pathelement location="${mockito.home}/mockito-core.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+@@ -143,6 +144,7 @@
+                 <pathelement location="../../build/jbigi.jar" />
+                 <pathelement location="${with.clover}" />
+                 <pathelement location="${with.cobertura}" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <batchtest todir="../../../reports/streaming/junit/">
+                 <fileset dir="./test/junit">
+diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
+index 801881118..2d34278e9 100644
+--- a/apps/susidns/src/build.xml
++++ b/apps/susidns/src/build.xml
+@@ -35,6 +35,7 @@
+ 		<pathelement location="${ant.home}/lib/ant.jar" />
+ 		<pathelement location="../../../core/java/build/i2p.jar" />
+ 		<pathelement location="../../addressbook/dist/addressbook.jar" />
++		<pathelement path="${gentoo.classpath}" />
+  	</path>
+ 
+ 	<property name="javac.compilerargs" value="" />
+diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
+index a8c8cfffa..098b911db 100644
+--- a/apps/susimail/build.xml
++++ b/apps/susimail/build.xml
+@@ -53,6 +53,7 @@
+                 <!-- tomcat-api.jar only present for debian builds -->
+                 <pathelement location="../jetty/jettylib/tomcat-api.jar" />
+                 <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </javac>
+     </target>
+diff --git a/core/java/build.xml b/core/java/build.xml
+index be590b093..4dc18c711 100644
+--- a/core/java/build.xml
++++ b/core/java/build.xml
+@@ -72,7 +72,7 @@
+                debuglevel="lines,vars,source"
+                includeAntRuntime="false"
+                encoding="UTF-8"
+-               destdir="./build/obj" classpath="${javac.classpath.mod}" >
++               destdir="./build/obj" classpath="${javac.classpath.mod}:${gentoo.classpath}" >
+             <compilerarg line="${javac.compilerargs}" />
+             <include name="**/*.java" />
+             <exclude name="${source.exclude1}" />
+@@ -284,6 +284,7 @@
+                 <pathelement location="${scalactic.jar}" />
+                 <pathelement location="${scalatest.jar}" />
+                 <pathelement location="./build/obj" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+         </scalac>
+     </target>
+@@ -319,6 +320,7 @@
+                 <pathelement location="${mockito.home}/objenesis.jar" />
+                 <pathelement location="${mockito.home}/mockito-core.jar" />
+                 <pathelement location="${junit.home}/junit4.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+@@ -485,6 +487,7 @@
+                 <pathelement location="../../build/jbigi.jar" />
+                 <pathelement location="${with.clover}" />
+                 <pathelement location="${with.cobertura}" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <batchtest todir="../../reports/core/junit/">
+                 <fileset dir="./test/junit/">
+diff --git a/installer/tools/java/build.xml b/installer/tools/java/build.xml
+index 51c45cebf..81b0f6f26 100644
+--- a/installer/tools/java/build.xml
++++ b/installer/tools/java/build.xml
+@@ -29,7 +29,7 @@
+             release="${javac.release}"
+             includeAntRuntime="false"
+             encoding="UTF-8"
+-            destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
++            destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar:${gentoo.classpath}" >
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+     </target>
+diff --git a/router/java/build.xml b/router/java/build.xml
+index 34cf4c1f7..0b0833e38 100644
+--- a/router/java/build.xml
++++ b/router/java/build.xml
+@@ -48,7 +48,7 @@
+                debuglevel="lines,vars,source"
+                includeAntRuntime="false"
+                encoding="UTF-8"
+-               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" >
++               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar:${gentoo.classpath}" >
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+     </target>
+@@ -285,6 +285,7 @@
+                 <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+                 <pathelement location="${junit.home}/junit4.jar" />
+                 <pathelement location="../../core/java/build/i2ptest.jar" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <compilerarg line="${javac.compilerargs}" />
+         </javac>
+@@ -431,6 +432,7 @@
+                 <pathelement location="../../build/jbigi.jar" />
+                 <pathelement location="${with.clover}" />
+                 <pathelement location="${with.cobertura}" />
++                <pathelement path="${gentoo.classpath}" />
+             </classpath>
+             <batchtest todir="../../reports/router/junit/">
+                 <fileset dir="./test/junit">
diff --git a/net-vpn/i2p/i2p-2.6.0.ebuild b/net-vpn/i2p/i2p-2.6.0.ebuild
new file mode 100644
index 000000000000..a77f1880f29d
--- /dev/null
+++ b/net-vpn/i2p/i2p-2.6.0.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 systemd toolchain-funcs
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LANGS=(
+	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
+	sr sv tk tr uk vi zh zh-TW
+)
+IUSE="${LANGS[@]/#/l10n_}"
+
+CP_DEPEND="
+	dev-java/bcprov:0
+	dev-java/hashcash:1
+	dev-java/httpcomponents-client:4
+	dev-java/identicon:1
+	dev-java/java-getopt:1
+	dev-java/java-service-wrapper:0
+	dev-java/jbcrypt:0
+	dev-java/json-simple:2.3
+	dev-java/jsonrpc2-server:1
+	dev-java/jstl:0
+	dev-java/jstl-api:0
+	dev-java/minidns-core:1
+	dev-java/zxing-core:3
+	dev-java/zxing-javase:3
+	sys-devel/gettext:0[java]
+	www-servers/tomcat:9
+"
+# jdk-11 for bug #932030
+DEPEND="
+	dev-libs/gmp:0=
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/hamcrest:0
+		dev-java/junit:4
+		dev-java/mockito:4
+	)
+"
+BDEPEND="
+	>=dev-java/ant-1.10.14-r3:0
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit4]
+	)
+"
+RDEPEND="
+	${CP_DEPEND}
+	acct-user/i2p
+	acct-group/i2p
+	>=virtual/jre-11:*
+"
+
+PATCHES=( "${FILESDIR}/${PV}-force-gentoo-classpath.patch" )
+
+DOCS=( README.md history.txt )
+
+src_prepare() {
+	default # apply PATCHES
+
+	# remove hardcoded javac's source & target
+	find -name build.xml \
+		-exec sed -Ei 's,(source|target)="\$\{javac\.version\}",,g' {} + ||
+		die "remove javac's source & target in build files"
+
+	java-pkg-2_src_prepare
+
+	# remove most bundled, excepted the next ones.
+	# apps/addressbook/java/src/net/metanotion too much code drift
+	# apps/i2psnark/java/src/org/klomp/snark too much code drift
+	# apps/jrobin need rrd4j ebuild
+	# apps/routerconsole/java/src/{com,edu} too much code drift
+	# {core,router}/java/src/com/southernstorm/noise use internal symbols
+	# core/java/src/freenet too much code drift
+	# core/java/src/gnu/crypto too much code drift
+	# router/java/src/com/maxmind changed interface
+	# router/java/src/org/cybergarage unable to find version 3
+	# router/java/src/org/freenetproject too big to pull
+	# router/java/src/org/xlattice changed interface
+	java-pkg_clean ! \
+		-path "./apps/jetty/jetty-distribution-*" # need to package jetty
+	( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
+		require.gettext=true
+		with-libgetopt-java=true
+		with-libjakarta-taglibs-standard-java=true
+		with-libjson-simple-java=true
+		with-libtomcat9-java=true
+		with-gettext-base=true
+		# with-geoip-database=true need std geoip use
+		# with-libjetty9-java=true needs a jetty ebuild
+	EOF
+
+	# bcprov
+	rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
+	sed -e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
+		-i core/java/src/net/i2p/crypto/CryptoConstants.java ||
+		die 'redirect imports of bcprov'
+	# getopt, gettext
+	rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
+	# httpcomponents-client
+	rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
+	sed -e 's,net\.i2p\.apache,org.apache,' \
+		-i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
+			apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
+		die 'redirect imports of httpcomponents-client'
+	# identicon, zxing
+	rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
+	sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
+	sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
+	sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
+		die 'do not depend on unbundled'
+	mkdir -p apps/imagegen/identicon/build || die 'create built identicon dependencies'
+	java-pkg_jar-from --into apps/imagegen/identicon/build identicon-1
+	# hashcash
+	rm core/java/src/com/nettgryppa/security/HashCash.java ||
+		die 'unbundle hashcash'
+	# jbcrypt, jsonrpc2-*
+	rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
+	# jstl*
+	sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
+		die 'unbundle jstl*'
+	java-pkg_jar-from --into apps/susidns/src/lib jstl jstl-impl.jar standard.jar
+	java-pkg_jar-from --into apps/susidns/src/lib jstl-api jstl-api.jar jstl.jar
+	# minidns-core, json-simple
+	rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
+	mkdir core/java/build || die 'create built core dependencies'
+	java-pkg_jar-from --into core/java/build json-simple-2.3
+
+	# keep only enabled locales
+	local lang
+	for lang in ${LANGS[@]}
+	do
+		if ! use "l10n_${lang}"
+		then
+			find -regextype egrep \
+					-regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
+				-delete || die "unbundling ${lang} translations"
+		fi
+	done
+
+	# fix some locale names
+	find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
+	find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
+		die 'fix some locale names'
+}
+
+src_configure() {
+	# build for our JDK
+	cat >> override.properties <<-EOF || die 'set JDK infos'
+		ant.build.javac.source=$(java-pkg_get-source)
+		ant.build.javac.target=$(java-pkg_get-target)
+	EOF
+
+	# deamon shouldn't start GUI
+	sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
+		installer/resources/clients.config ||
+		die 'avoid auto starting browser'
+
+	# yep, that's us
+	echo 'build.built-by=Gentoo' >> override.properties ||
+		die 'bragging failed'
+
+	# support no-UTF-8 build systems
+	echo 'file.encoding=UTF-8' >> override.properties ||
+		die 'set files encoding'
+}
+
+src_compile() {
+	local libs='bcprov,gettext,hashcash-1,httpcomponents-client-4'
+	libs+=',java-getopt-1,java-service-wrapper,jbcrypt,jsonrpc2-server-1'
+	libs+=',tomcat-9,minidns-core-1,zxing-javase-3'
+	eant \
+		-Dgentoo.classpath=`java-pkg_getjars --with-dependencies "${libs}"` \
+		preppkg-base
+
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		shift 1
+
+		"$(tc-getCC)" "${@}" -Iinclude ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"src/${name}.c" -o "lib${name}.so"
+	}
+
+	cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi -lgmp || die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid || die "unable to build jcpuid"
+	fi
+}
+
+src_test() {
+	# avoid rebuilding
+	sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
+		die 'avoid building twice'
+
+	# halt on error
+	find -name build.xml \
+		-execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
+		die 'ensure test failures propagate'
+
+	local libs='bcprov,gettext,hashcash-1,httpcomponents-client-4'
+	libs+=',java-getopt-1,java-service-wrapper,jbcrypt,jsonrpc2-server-1'
+	libs+=',tomcat-9,minidns-core-1,zxing-javase-3'
+	libs+=',hamcrest,junit-4,mockito-4'
+	# no scala as depending on antlib.xml not installed by dev-lang/scala
+	eant \
+		-Dgentoo.classpath=`java-pkg_getjars --build-only --with-dependencies "${libs}"` \
+		junit.test
+}
+
+src_install() {
+	# install basic documentation
+	einstalldocs
+	doman installer/resources/man/eepget.*
+
+	# install main files
+	java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
+	if use amd64 || use x86; then
+		java-pkg_doso core/c/jcpuid/libjcpuid.so
+	fi
+	cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
+	java-pkg_dojar lib/*.jar
+	java-pkg_dowar webapps/*.war
+
+	# install shared
+	insinto /usr/share/i2p
+	doins blocklist.txt hosts.txt {clients,i2p*}.config
+	doins -r certificates docs eepsite geoip scripts
+
+	# install daemons
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup dirs
+	keepdir /var/log/i2p /var/lib/i2p
+	fowners i2p:i2p /var/lib/i2p /var/log/i2p
+
+	# create own launchers
+	java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
+		--pwd "${EPREFIX}/usr/share/i2p" \
+		--java_args "\
+			-Di2p.dir.config=${EPREFIX}/var/lib/i2p \
+			-Di2p.dir.log=${EPREFIX}/var/log/i2p \
+			-DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+}
diff --git a/net-vpn/i2pd/i2pd-2.52.0.ebuild b/net-vpn/i2pd/i2pd-2.52.0.ebuild
index 14ed8c998b07..02167b17f796 100644
--- a/net-vpn/i2pd/i2pd-2.52.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.52.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
+IUSE="cpu_flags_x86_aes +upnp"
 
 RDEPEND="
 	acct-user/i2pd
@@ -29,16 +29,10 @@ DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
 
 PATCHES=( "${FILESDIR}/${P}-miniupnp.patch" )
 
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles
 		-DWITH_STATIC=OFF
 		-DWITH_UPNP=$(usex upnp ON OFF)
 		-DWITH_LIBRARY=ON
diff --git a/net-vpn/i2pd/i2pd-2.53.1.ebuild b/net-vpn/i2pd/i2pd-2.53.1.ebuild
index cb442b9d45f9..b9b3a931569f 100644
--- a/net-vpn/i2pd/i2pd-2.53.1.ebuild
+++ b/net-vpn/i2pd/i2pd-2.53.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
+IUSE="cpu_flags_x86_aes +upnp"
 
 DEPEND="
 	dev-libs/boost:=
@@ -30,16 +30,10 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/build"
 
 DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
 
-pkg_pretend() {
-	if use i2p-hardening && ! tc-is-gcc; then
-		die "i2p-hardening requires gcc"
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_HARDENING=OFF # worsens or matches the non-hardened profiles
 		-DWITH_STATIC=OFF
 		-DWITH_UPNP=$(usex upnp ON OFF)
 		-DWITH_LIBRARY=ON
diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
index 9427ac50fa12..86d072b8ee21 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -9,11 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="i2p-hardening">
-			Compile with hardening on vanilla compilers/linkers
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">PurpleI2P/i2pd</remote-id>
 	</upstream>
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index a5ddcb1dc2a6..76f89c3f1f64 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -1,10 +1,2 @@
-DIST tailscale-1.50.1-deps.tar.xz 371484616 BLAKE2B cb4ac1939c4ad36bf3c752ccbdd1f34469e96e0576ae0f4bdede2f6e8ce8865c17addaead22c3be862846b1b9399900c0f3c8c0d720c5200c35405a974c85ec8 SHA512 3f11ba62e9879c0e51cd76a6e524d5e6bacb101e26e700872507f08c7924147a146a56933cd391a2b845bfb4fc7ad31a0a13dbc21dd3c8a2f7e10feea6d8b926
-DIST tailscale-1.50.1.tar.gz 1992569 BLAKE2B 503dd358d13f038eafd67d2c00f292965eaba390ec483daded893082a87428c4bbf01bafb0339aaca3ebc62123985f0686046959d4aa25325b877a779de83b34 SHA512 3eb0e0f0ef6df4d77f9649fb8deb8b829286bc8ab70016b09da6aad9aa4e5d027494e2151db425b52e775997345d39d13bce6013e8c69700023a936f142dcfd6
-DIST tailscale-1.56.1-deps.tar.xz 395648828 BLAKE2B 08770560a70296af830763fdfd82ab16533911279c3d0719c5a628f8900292f1154b2a297111662152874251ae91081c03e34c25cb2016bd649bfcf89e423a3d SHA512 c3f91ce12ded8e0307e517f40c8953887ad4f85fe243d4dcfb7a874f478409dadc750e736c5d355a62dcacada30f1cf8f40adbc8d13ca9286f7456557da712ea
-DIST tailscale-1.56.1.tar.gz 2311243 BLAKE2B 3046aae1d6b652cd0ce56202b1f24bafca019621878e7da2258c2850b534d8dff713d4e32b4c985bc1636382505934efb320e751ca75275054139184b8e61640 SHA512 a6e213eeb885d160b816f7d795d8ae66cd322d652657ee5309e220c6526eb73d5aea07dcd57983468520891c5405fcb84255350cdacc078514cede8a351a4888
-DIST tailscale-1.58.2-deps.tar.xz 397235964 BLAKE2B 3273320edb277d8f6527b6048f62356930287c6eeb1310e35dede72be0476331d2ae4ffe9658f8c36ebfc3384cc2b0e4f617cb25d2685c5e28dda66a9290e12b SHA512 370262f4589814d87587d8b685cde3a706611627ab6de09fdd271b3110baebebcfe2334574b7737643e5e2797638220901b1769eae469a08ec3325d82ac633de
-DIST tailscale-1.58.2.tar.gz 2361679 BLAKE2B 1aa66710677ba7c648782db9f67ce8cf565812b08610bb078bcd78ee2d695601fcb2f681102eb7a1232b6c4057ba5e1fed1d26b375cec793f0fbce65aff38755 SHA512 3370af3c0214544d15196063f798e17e7c35566cf4d01628faa1e26ba1a5885834b0f3d2862e3009a81ff9f4298cdd3f826fc5d09f23568c30c64bc6f0400f6b
-DIST tailscale-1.60.0-deps.tar.xz 382250200 BLAKE2B 199d78fdccd0502dbf2d7e9e3cb50660a83d1187e35e50cd5f648970927fdf5c1df98682e8366d108603a1163df32fdc523041b8fe36dabfb2d13f0951357b16 SHA512 7fa1f21d42ddc85a98ad420104e17183b9c615010e8f13ca971f3488d382c6b7a8595006062e09f6438eeeaa6559a4e35eab3b053e85a66c5dfa9924d1aa5258
-DIST tailscale-1.60.0.tar.gz 2440764 BLAKE2B f6c6ee3e378ddc37dbe67a74b1ff2b1cf5b9cbe720f6a38b3292f6fc7874b2712f00d7ba2e647a12c7b29edb2ca131605226af5fd56200b8fa7c6005e6eba778 SHA512 81c96c6f64d4141894673be7d524bacae7485f9c1d63fde5dcea952573daafc87c9f5b5fa17ceabe8e88a4d61b4f939822228fb2a310bd8522ca15f7cb9c3a60
-DIST tailscale-1.66.1-deps.tar.xz 166468968 BLAKE2B ff69b69cfb9e46ea9a8b0267f5c14068cf715dff04167d9994630b03813790a8d305362508d6d77501eb6b41d0b44a68b5c447e29f0fc41ae343e303068ed584 SHA512 d923ab191c7986f90c78e85a8399910f1a94225223778fb92c11207ae144d149cf583f5c2fd5fb006802fc916ab73cc48f657c65960d570d9f98a7ddd47e32c6
-DIST tailscale-1.66.1.tar.gz 2634211 BLAKE2B cbf90ee36545fa8ba302f872948dc92e735bfe690451428540bee10399d1db1cdbf050949a5f3dbc69a77596b6a6d94724eb43bf9a4ee78a5cee9ada03889a3e SHA512 46e226c651abd5dee248e49fcf40a0cea9de72fe9e330015299acd9ec1fc83e1f192948c26b803f0fe3404558471b374391f3cf9155ecb2257a2563f79f3278b
+DIST tailscale-1.72.0-deps.tar.xz 226770144 BLAKE2B 4c23fe678a320f674cafb9e3d9f80c9a698bb6133ac8a64fe6024822e03a93ce9cdfcb0838370a8cb6da38da6d6f0241c9599f3a1b11224d1dd531ba00efa629 SHA512 848e83af5f26883cd7f56e19749cf02a489a5a7e0a0c7e23d4df6f44d59d311e7f28ddd4e67c29626c6d7d8232d867d249a6f8287177bddab59c5279a3cf776d
+DIST tailscale-1.72.0.tar.gz 3031783 BLAKE2B 58e7609a8481ee0bbf58ad3b3d924d88192c201ea32d4efbf015201d2d67a8a330ee93452bdd23c902065bcd924f18e793ac531348c2c34591fab15c2c2eb01b SHA512 ed1b853bde7a5aadc469e2d2e810db8b800514d8278b24d3f2453ecc3e89b4198999e52f3bbc7743302ab60ad78432d5222808ce7e7739befd9bd15ad2eda20a
diff --git a/net-vpn/tailscale/metadata.xml b/net-vpn/tailscale/metadata.xml
index dc313a03992d..c22f46fc25e5 100644
--- a/net-vpn/tailscale/metadata.xml
+++ b/net-vpn/tailscale/metadata.xml
@@ -5,10 +5,6 @@
 		<name>William Hubbs</name>
 		<email>williamh@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<name>Patrick McLean</name>
-		<email>chutzpah@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">tailscale/tailscale</remote-id>
 	</upstream>
diff --git a/net-vpn/tailscale/tailscale-1.50.1.ebuild b/net-vpn/tailscale/tailscale-1.50.1.ebuild
deleted file mode 100644
index b66e15e4f4b4..000000000000
--- a/net-vpn/tailscale/tailscale-1.50.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# These settings are obtained by running ./build_dist.sh shellvars` in
-# the upstream repo.
-VERSION_MINOR="50"
-VERSION_SHORT="1.50.1"
-VERSION_LONG="1.50.1-t874938806"
-VERSION_GIT_HASH="8749388061d0251483389fa876afa01e0e76f15b"
-
-DESCRIPTION="Tailscale vpn client"
-HOMEPAGE="https://tailscale.com"
-SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="net-firewall/iptables"
-BDEPEND=">=dev-lang/go-1.21"
-
-RESTRICT="test"
-
-# This translates the build command from upstream's build_dist.sh to an
-# ebuild equivalent.
-build_dist() {
-	ego build -tags xversion -ldflags "
-		-X tailscale.com/version.Long=${VERSION_LONG}
-		-X tailscale.com/version.Short=${VERSION_SHORT}
-		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
-}
-
-src_compile() {
-	build_dist ./cmd/tailscale
-	build_dist ./cmd/tailscaled
-}
-
-src_install() {
-	dosbin tailscaled
-	dobin tailscale
-
-	systemd_dounit cmd/tailscaled/tailscaled.service
-	insinto /etc/default
-	newins cmd/tailscaled/tailscaled.defaults tailscaled
-	keepdir /var/lib/${PN}
-	fperms 0750 /var/lib/${PN}
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-vpn/tailscale/tailscale-1.56.1.ebuild b/net-vpn/tailscale/tailscale-1.56.1.ebuild
deleted file mode 100644
index 87e2fb6a8fad..000000000000
--- a/net-vpn/tailscale/tailscale-1.56.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# These settings are obtained by running ./build_dist.sh shellvars` in
-# the upstream repo.
-VERSION_MINOR="56"
-VERSION_SHORT="1.56.1"
-VERSION_LONG="1.56.1-tf1ea3161a"
-VERSION_GIT_HASH="f1ea3161a2a06ad6474a9ea919e91e9bd6062f84"
-
-DESCRIPTION="Tailscale vpn client"
-HOMEPAGE="https://tailscale.com"
-SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="net-firewall/iptables"
-BDEPEND=">=dev-lang/go-1.21"
-
-RESTRICT="test"
-
-# This translates the build command from upstream's build_dist.sh to an
-# ebuild equivalent.
-build_dist() {
-	ego build -tags xversion -ldflags "
-		-X tailscale.com/version.Long=${VERSION_LONG}
-		-X tailscale.com/version.Short=${VERSION_SHORT}
-		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
-}
-
-src_compile() {
-	build_dist ./cmd/tailscale
-	build_dist ./cmd/tailscaled
-}
-
-src_install() {
-	dosbin tailscaled
-	dobin tailscale
-
-	systemd_dounit cmd/tailscaled/tailscaled.service
-	insinto /etc/default
-	newins cmd/tailscaled/tailscaled.defaults tailscaled
-	keepdir /var/lib/${PN}
-	fperms 0750 /var/lib/${PN}
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-vpn/tailscale/tailscale-1.58.2.ebuild b/net-vpn/tailscale/tailscale-1.58.2.ebuild
deleted file mode 100644
index 0a375b02d222..000000000000
--- a/net-vpn/tailscale/tailscale-1.58.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# These settings are obtained by running ./build_dist.sh shellvars` in
-# the upstream repo.
-VERSION_MINOR="58"
-VERSION_SHORT="1.58.2"
-VERSION_LONG="1.58.2-tb0e1bbb62"
-VERSION_GIT_HASH="b0e1bbb62ef3834e99f5212b44043cec1866b07e"
-
-DESCRIPTION="Tailscale vpn client"
-HOMEPAGE="https://tailscale.com"
-SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="net-firewall/iptables"
-BDEPEND=">=dev-lang/go-1.21"
-
-RESTRICT="test"
-
-# This translates the build command from upstream's build_dist.sh to an
-# ebuild equivalent.
-build_dist() {
-	ego build -tags xversion -ldflags "
-		-X tailscale.com/version.Long=${VERSION_LONG}
-		-X tailscale.com/version.Short=${VERSION_SHORT}
-		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
-}
-
-src_compile() {
-	build_dist ./cmd/tailscale
-	build_dist ./cmd/tailscaled
-}
-
-src_install() {
-	dosbin tailscaled
-	dobin tailscale
-
-	systemd_dounit cmd/tailscaled/tailscaled.service
-	insinto /etc/default
-	newins cmd/tailscaled/tailscaled.defaults tailscaled
-	keepdir /var/lib/${PN}
-	fperms 0750 /var/lib/${PN}
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-vpn/tailscale/tailscale-1.60.0.ebuild b/net-vpn/tailscale/tailscale-1.60.0.ebuild
deleted file mode 100644
index 66cc49a2efc3..000000000000
--- a/net-vpn/tailscale/tailscale-1.60.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# These settings are obtained by running ./build_dist.sh shellvars` in
-# the upstream repo.
-VERSION_MINOR="60"
-VERSION_SHORT="1.60.0"
-VERSION_LONG="1.60.0-tf4e3ee53e"
-VERSION_GIT_HASH="f4e3ee53ea4605d400df2ef6b6005b026661f96b"
-
-DESCRIPTION="Tailscale vpn client"
-HOMEPAGE="https://tailscale.com"
-SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="net-firewall/iptables"
-BDEPEND=">=dev-lang/go-1.22"
-
-RESTRICT="test"
-
-# This translates the build command from upstream's build_dist.sh to an
-# ebuild equivalent.
-build_dist() {
-	ego build -tags xversion -ldflags "
-		-X tailscale.com/version.Long=${VERSION_LONG}
-		-X tailscale.com/version.Short=${VERSION_SHORT}
-		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
-}
-
-src_compile() {
-	build_dist ./cmd/tailscale
-	build_dist ./cmd/tailscaled
-}
-
-src_install() {
-	dosbin tailscaled
-	dobin tailscale
-
-	systemd_dounit cmd/tailscaled/tailscaled.service
-	insinto /etc/default
-	newins cmd/tailscaled/tailscaled.defaults tailscaled
-	keepdir /var/lib/${PN}
-	fperms 0750 /var/lib/${PN}
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-vpn/tailscale/tailscale-1.66.1.ebuild b/net-vpn/tailscale/tailscale-1.66.1.ebuild
deleted file mode 100644
index a11d49b98146..000000000000
--- a/net-vpn/tailscale/tailscale-1.66.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd tmpfiles
-
-# These settings are obtained by running ./build_dist.sh shellvars` in
-# the upstream repo.
-VERSION_MINOR="66"
-VERSION_SHORT="1.66.1"
-VERSION_LONG="1.66.1-t88e23b6cf"
-VERSION_GIT_HASH="88e23b6cfd4b9a9cad5ce858b73ece1f07970fee"
-
-DESCRIPTION="Tailscale vpn client"
-HOMEPAGE="https://tailscale.com"
-SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="net-firewall/iptables"
-BDEPEND=">=dev-lang/go-1.22"
-
-RESTRICT="test"
-
-# This translates the build command from upstream's build_dist.sh to an
-# ebuild equivalent.
-build_dist() {
-	ego build -tags xversion -ldflags "
-		-X tailscale.com/version.Long=${VERSION_LONG}
-		-X tailscale.com/version.Short=${VERSION_SHORT}
-		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
-}
-
-src_compile() {
-	build_dist ./cmd/tailscale
-	build_dist ./cmd/tailscaled
-}
-
-src_install() {
-	dosbin tailscaled
-	dobin tailscale
-
-	systemd_dounit cmd/tailscaled/tailscaled.service
-	insinto /etc/default
-	newins cmd/tailscaled/tailscaled.defaults tailscaled
-	keepdir /var/lib/${PN}
-	fperms 0750 /var/lib/${PN}
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-vpn/tailscale/tailscale-1.72.0.ebuild b/net-vpn/tailscale/tailscale-1.72.0.ebuild
new file mode 100644
index 000000000000..8e7f0dd0cdf3
--- /dev/null
+++ b/net-vpn/tailscale/tailscale-1.72.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info systemd tmpfiles
+
+# These settings are obtained by running ./build_dist.sh shellvars` in
+# the upstream repo.
+VERSION_MINOR="72"
+VERSION_SHORT="1.72.0"
+VERSION_LONG="1.72.0-taa448d5a9"
+VERSION_GIT_HASH="aa448d5a9985378af04966c6d7aec8d9f4a166ca"
+
+DESCRIPTION="Tailscale vpn client"
+HOMEPAGE="https://tailscale.com"
+SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+CONFIG_CHECK="~TUN"
+
+RDEPEND="net-firewall/iptables"
+BDEPEND=">=dev-lang/go-1.22"
+
+RESTRICT="test"
+
+# This translates the build command from upstream's build_dist.sh to an
+# ebuild equivalent.
+build_dist() {
+	ego build -tags xversion -ldflags "
+		-X tailscale.com/version.Long=${VERSION_LONG}
+		-X tailscale.com/version.Short=${VERSION_SHORT}
+		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
+}
+
+src_compile() {
+	build_dist ./cmd/tailscale
+	build_dist ./cmd/tailscaled
+}
+
+src_install() {
+	dosbin tailscaled
+	dobin tailscale
+
+	systemd_dounit cmd/tailscaled/tailscaled.service
+	insinto /etc/default
+	newins cmd/tailscaled/tailscaled.defaults tailscaled
+	keepdir /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-vpn/tor/tor-0.4.8.12.ebuild b/net-vpn/tor/tor-0.4.8.12.ebuild
index c6a8bf0c9848..d0b537089282 100644
--- a/net-vpn/tor/tor-0.4.8.12.ebuild
+++ b/net-vpn/tor/tor-0.4.8.12.ebuild
@@ -28,7 +28,7 @@ else
 	S="${WORKDIR}/${MY_PF}"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+		KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627-r1.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627-r1.ebuild
index cb02e3c10175..a3ecc32bb244 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627-r1.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
 	S="${WORKDIR}/wireguard-linux-compat-${PV}"
 	# Please don't stabilize this package. Stable users should use gentoo-sources 5.4 or 5.10.
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627.ebuild
index 220aa7209ada..7d186592e7da 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20220627.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
 	S="${WORKDIR}/wireguard-linux-compat-${PV}"
 	# Please don't stabilize this package. Stable users should use gentoo-sources 5.4 or 5.10.
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 9fe9ed895cb8..95b7a79fd154 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,2 +1,4 @@
 DIST iwd-2.17.tar.xz 1083756 BLAKE2B f930c13cafa7bcfe30b481891d2a8a7a439b316aaafb5ca9b05b2c2123cfe76ec032e8194e3bf1de34ce4330016a14c7fc316d15c03428f7832213220789f486 SHA512 06630fa1fdedbe82dc294eb0b44b542e79c11c09ffed8d8dcd4e38089ab43b8f5fbcfb2af29df494441fd54bc87d76c988fde2c639c219a890bbc45de3fff53d
 DIST iwd-2.19.tar.xz 1088892 BLAKE2B 0bd332b41b205ed8b396e672fb869c8d78a9b18d94691851ccc63b43602a61e96fb5029797c3fe2863fc4964ae0c51d1395f67a9bdc977dfe4dc2c49111f41be SHA512 e06f1936be25be042f6c48d3ff86db6b3b07a2d9406c234e74258e7bb3df7a7efd1510929851830922006613d02d4904b26c2d8a67bab2daa14c2eae086c2eb6
+DIST iwd-2.20.tar.xz 1092832 BLAKE2B 34001bc34c07a40f34bb8a30258d9493a38957fd0d5ea83f5721d4441b78c5c061e2bb84380932422cdd695f37eac4b1c40d6535965b06d5f255fae64734d956 SHA512 ddfcc22539185be8847dedde4d3c8e86af0d71f3d1befd5bfaa57d5e75222676db3f49530f1082b531149164aee0411dcf76e4a78a41c3d878b2920197bfccea
+DIST iwd-2.21.tar.xz 1095396 BLAKE2B 8681532e7125488750b68f5deb7b2c9fc16ed665a762cabeed5a002424cc474e8e47753e71b42ec22a2c004368b81f0087437e4689c11981df43a92b54eb3db5 SHA512 48c444e653486e86f443588ebc844781ff7aa9ba438f5fa50097c4021a822bb522a326a6e29b11ed2dc0de45230dff210906830746d0bc2fc4dd25479eb48773
diff --git a/net-wireless/iwd/iwd-2.19-r1.ebuild b/net-wireless/iwd/iwd-2.19-r1.ebuild
new file mode 100644
index 000000000000..e58ab2372cc2
--- /dev/null
+++ b/net-wireless/iwd/iwd-2.19-r1.ebuild
@@ -0,0 +1,167 @@
+# 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.67"
+
+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 ~ia64 ~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-2.20.ebuild b/net-wireless/iwd/iwd-2.20.ebuild
new file mode 100644
index 000000000000..8d2778bb52d8
--- /dev/null
+++ b/net-wireless/iwd/iwd-2.20.ebuild
@@ -0,0 +1,167 @@
+# 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.68"
+
+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 ~ia64 ~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-2.21.ebuild b/net-wireless/iwd/iwd-2.21.ebuild
new file mode 100644
index 000000000000..b453e7614a9e
--- /dev/null
+++ b/net-wireless/iwd/iwd-2.21.ebuild
@@ -0,0 +1,167 @@
+# 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 ~ia64 ~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/qdmr/Manifest b/net-wireless/qdmr/Manifest
index 40540ae44506..5b1e5940c5fc 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,4 +1,2 @@
-DIST qdmr-0.10.2.tar.gz 5903169 BLAKE2B 1ef4e9846dd4206d1eae3cfb5562fccec24b156bfd77a82e801e8d1194b969bbda0f14e99c1b6505d18abba4a79d87c5eee2232110969faf4c078c1fe781a8ee SHA512 96a3fd22be2b8f77a4925cfb426de12a55b29ee73eaf78869091fd0ecd36d2df51195f2ca70689857e190767c4651d3d4915a0b7aa9f5c6e429f46a53edb991c
-DIST qdmr-0.10.4.tar.gz 6013877 BLAKE2B 32da2984620e162e049f4017e29bff7d500f293fa6125246fdd2e7640ed9dd1e0e066c03297c365b9b5dc2e76dee1e1511fed327690c9a611fd7aa1abc26f988 SHA512 4ba75274bcaa4a7b8887edf7a1725863ee4dc00730d9386673b5c149e7ac30a32f06b7341ebd327cae337eac7a445999a17606cbbb22734216df2c14cb03c322
-DIST qdmr-0.11.2.tar.gz 6391759 BLAKE2B d45c934a0bad8c92a10a1f183007310137c8ad04a95f5f1471bac2a54f7f33e3af44b386e4ff2803a42934b575ce2e414bb6090a7e474e7aa1ac82b1d722598e SHA512 cd8dfc9eb9d6efad08efcaaa7b6e2ae61823982bd2ffa7bc41826c9fea3c21bd63f5a2114dc63d88e01a0c56f2fb615cbe0ddef62b87deebb798beda937de5d0
 DIST qdmr-0.11.3.tar.gz 6577404 BLAKE2B 7f9133e9620c5286492ee813907c47d550eba9368e801cd3939897381ed751788fa43337dbeb2cd1be5c4765c554ac5a031d9b4965c49dd1a521949d74b6f9f2 SHA512 4bb62cd84e8cce02f6582f854c4247c91f30271cc96856a4d1a55a4dbea5d2d9639e9db2df8b76f2ff196dddac1d7de3632627890617688037bd78085422e75e
+DIST qdmr-0.12.0.tar.gz 6905942 BLAKE2B 4452120860c8e4cc8e720161d90dd090affe43fa15965895e2e088f94856675811d3685933f25493b00eb2157ff58bef5481cb705cd92e7c9ef94a61fc877bdb SHA512 5cdb41c5d0234f8c1d4cfc4f75ea4e832c94f692320fe7714df1d0e893379b2c0939e004779a71cb601e696133d94d083d4e6062ab31916e9431bd14f6a60b6a
diff --git a/net-wireless/qdmr/qdmr-0.10.2.ebuild b/net-wireless/qdmr/qdmr-0.10.2.ebuild
deleted file mode 100644
index c57e656cbffa..000000000000
--- a/net-wireless/qdmr/qdmr-0.10.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev linux-info
-
-DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
-HOMEPAGE="https://dm3mat.darc.de/qdmr/"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-cpp/yaml-cpp:=
-	dev-qt/designer:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtserialport:5
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
-
-pkg_setup() {
-	CONFIG_CHECK="~USB_ACM"
-	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
-	CONFIG_CHECK="~USB_SERIAL"
-	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
-	check_extra_config
-}
-
-src_prepare() {
-	#no devil perms
-	sed -i 's#666#660#' dist/99-qdmr.rules
-	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
-	cmake_src_prepare
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/net-wireless/qdmr/qdmr-0.10.4.ebuild b/net-wireless/qdmr/qdmr-0.10.4.ebuild
deleted file mode 100644
index 2408bd6b897c..000000000000
--- a/net-wireless/qdmr/qdmr-0.10.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev linux-info
-
-DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
-HOMEPAGE="https://dm3mat.darc.de/qdmr/"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-cpp/yaml-cpp:=
-	dev-qt/designer:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtserialport:5
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-pkg_setup() {
-	CONFIG_CHECK="~USB_ACM"
-	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
-	CONFIG_CHECK="~USB_SERIAL"
-	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
-	check_extra_config
-}
-
-src_prepare() {
-	#no devil perms
-	sed -i 's#666#660#' dist/99-qdmr.rules
-	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
-	cmake_src_prepare
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-wireless/qdmr/qdmr-0.11.2.ebuild b/net-wireless/qdmr/qdmr-0.11.2.ebuild
deleted file mode 100644
index 1ba9c2ff8c36..000000000000
--- a/net-wireless/qdmr/qdmr-0.11.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev linux-info
-
-DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
-HOMEPAGE="https://dm3mat.darc.de/qdmr/"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-cpp/yaml-cpp:=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtserialport:5
-	virtual/libusb:1
-"
-DEPEND="${RDEPEND}
-	dev-qt/designer:5
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-pkg_setup() {
-	CONFIG_CHECK="~USB_ACM"
-	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
-	CONFIG_CHECK="~USB_SERIAL"
-	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-wireless/qdmr/qdmr-0.11.3.ebuild b/net-wireless/qdmr/qdmr-0.11.3.ebuild
index 1ba9c2ff8c36..564de8371aa1 100644
--- a/net-wireless/qdmr/qdmr-0.11.3.ebuild
+++ b/net-wireless/qdmr/qdmr-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,13 +14,12 @@ else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="GPL-3+"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/yaml-cpp:=
@@ -40,9 +39,9 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 pkg_setup() {
 	CONFIG_CHECK="~USB_ACM"
-	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
+	WARNING_USB_ACM="You need to enable CONFIG_USB_ACM in your kernel to talk to some radios"
 	CONFIG_CHECK="~USB_SERIAL"
-	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
+	WARNING_USB_SERIAL="You need to enable CONFIG_USB_SERIAL in your kernel to talk to some radios"
 	check_extra_config
 }
 
diff --git a/net-wireless/qdmr/qdmr-0.12.0.ebuild b/net-wireless/qdmr/qdmr-0.12.0.ebuild
new file mode 100644
index 000000000000..f5fdcfa51e17
--- /dev/null
+++ b/net-wireless/qdmr/qdmr-0.12.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev linux-info
+
+DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
+HOMEPAGE="https://dm3mat.darc.de/qdmr/"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/yaml-cpp:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtserialport:5
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}
+	dev-qt/designer:5
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+pkg_setup() {
+	CONFIG_CHECK="~USB_ACM"
+	WARNING_USB_ACM="You need to enable CONFIG_USB_ACM in your kernel to talk to some radios"
+	CONFIG_CHECK="~USB_SERIAL"
+	WARNING_USB_SERIAL="You need to enable CONFIG_USB_SERIAL in your kernel to talk to some radios"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild
index 1ba9c2ff8c36..f5fdcfa51e17 100644
--- a/net-wireless/qdmr/qdmr-9999.ebuild
+++ b/net-wireless/qdmr/qdmr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,11 +16,10 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="GPL-3+"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/yaml-cpp:=
@@ -40,9 +39,9 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 pkg_setup() {
 	CONFIG_CHECK="~USB_ACM"
-	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
+	WARNING_USB_ACM="You need to enable CONFIG_USB_ACM in your kernel to talk to some radios"
 	CONFIG_CHECK="~USB_SERIAL"
-	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
+	WARNING_USB_SERIAL="You need to enable CONFIG_USB_SERIAL in your kernel to talk to some radios"
 	check_extra_config
 }
 
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index fdde55309e82..f43de96eaa21 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,5 +1,3 @@
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.5.187.zip 172434106 BLAKE2B db54079f30c9f61989ceb70474ea68559189804876000534c2a0165a9ef2324f92d19e7b055eaa31cd77e7bd90db0c29aa9f20953dc17a5c54cc646a5c862990 SHA512 703e29273412c497a5bea74210e8c409c629b81fee2badd3f116bbb31a2ca82942ff0281303c0da57757a85e44f4457ba3730deaba0a1f4cc2adc1eb5ace3276
-DIST unifi-8.1.127.zip 165920812 BLAKE2B 553273139c7f8e38c04ce3823b4478e6e366ff3a139f22d692fb6f9c39284e6fbe12191bc4991e832d124e08893121018931c74c921a2186c849cb97016f8310 SHA512 45b9fe1d7d73b3544c2158062cc4f3fcea515a21ed31ed9be408995949cf4cc5f504a4b10934b400bbf309d38cf52ac72cdda87cde14217c360aa736071dffff
-DIST unifi-8.2.93.zip 168248927 BLAKE2B 2a120d5b63fe7be97e9fe6d4092293a26cac2eef55489d36fe23402c72a15315522a335015f8aa00cb6b61c372b7e28c978906ce21361e4d2dc4f4d21c960f2f SHA512 30d747256c5ae1403ca8a01f31e80723a1f14c328368f43cee2d867158a079e441c456405ae676fe3c5d6e8ae039af3cd24f1fd36b05660ad79cfe6fdb8d6acf
 DIST unifi-8.3.32.zip 169676863 BLAKE2B 337d095e4ea434d22af78c93de1a14ac8ad6800286505242498ad513d424230208cf0e38c5df5185ad6480ff83d695837e8915067aa6026dc3faea49d245571e SHA512 f8ae2712c40957d308cc713b7f75cd9682da0b34f773293428ef6e8931629e5d365c8af4bc5503f96d0b751f4d996a1b8492cc443dc9a043c40105f38d9995c6
diff --git a/net-wireless/unifi/unifi-8.1.127.ebuild b/net-wireless/unifi/unifi-8.1.127.ebuild
deleted file mode 100644
index 2f1936dc19fa..000000000000
--- a/net-wireless/unifi/unifi-8.1.127.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-8.2.93.ebuild b/net-wireless/unifi/unifi-8.2.93.ebuild
deleted file mode 100644
index 2f1936dc19fa..000000000000
--- a/net-wireless/unifi/unifi-8.2.93.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-8.3.32.ebuild b/net-wireless/unifi/unifi-8.3.32.ebuild
index ed01ef5545ac..2f1936dc19fa 100644
--- a/net-wireless/unifi/unifi-8.3.32.ebuild
+++ b/net-wireless/unifi/unifi-8.3.32.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="systemd system-mongodb"
 RESTRICT="bindist mirror"
 
diff --git a/net-wireless/wavemon/files/wavemon-0.9.4-build.patch b/net-wireless/wavemon/files/wavemon-0.9.4-build.patch
deleted file mode 100644
index afce0a712049..000000000000
--- a/net-wireless/wavemon/files/wavemon-0.9.4-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2021-09-21 10:27:24.966739165 +0200
-+++ b/Makefile.in	2021-09-21 10:27:57.537003815 +0200
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
- 
- CC	 ?= @CC@
--CFLAGS	 ?= @CFLAGS@ @LIBNL3_CLI_CFLAGS@
-+CFLAGS	 = @CFLAGS@ @LIBNL3_CLI_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS  ?= @LDFLAGS@
- DEFS	 ?= @DEFS@
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index a3fc2a240cd9..58071d9fab0d 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-08-23)
+# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
+sys-apps/systemd bpf
+
 # Hans de Graaff <graaff@gentoo.org> (2024-08-16)
 # Requires large parts of dev-ruby/rails to be keyworded
 dev-ruby/minitest-hooks test
@@ -334,7 +338,6 @@ media-video/ffmpeg dav1d libaribb24 libtesseract
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
 # USE=bpf depends on sys-devel/clang which is not keyworded on alpha.
 media-libs/libv4l bpf
-media-tv/v4l-utils bpf
 
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
 # Mask until dev-libs/libfido2 is keyworded
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 40a242b365d5..754ff9c5cfcb 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -1,6 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-09-04)
+# Build with debugging support by default to facilitate dev-debug/dtrace
+# and sys-apps/systemd[bpf].
+>=sys-kernel/gentoo-kernel-6.10.8 debug
+>=sys-kernel/vanilla-kernel-6.10.8 debug
+
 # James Le Cuirot <chewi@gentoo.org> (2022-06-25)
 # Realign the stack in the 32-bit build for compatibility with older binaries by
 # default. This is not the default on x86 because it has a performance cost.
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index b9ed7199898a..4309f6e2c921 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -253,7 +253,7 @@ sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
 sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
 sys-libs/compiler-rt-sanitizers -gwp-asan
 sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -orc -profile -xray
-sys-libs/compiler-rt-sanitizers -ctx-profile
+sys-libs/compiler-rt-sanitizers -ctx-profile -nsan -rtsan
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index f9fa5971a905..22b18c98f822 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -76,10 +76,6 @@ media-video/ffmpeg qsv
 # needs stabilizing
 media-video/ffmpeg vmaf
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
-# needs stabilizing
-media-video/ffmpeg amf
-
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is stabilized on amd64.
 app-crypt/pinentry -efl
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index f3d2a819b196..d34202932280 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -92,6 +92,7 @@ dev-python/spyder-notebook
 dev-util/kdevelop
 dev-util/kdevelop-php
 dev-util/kdevelop-python
+kde-frameworks/purpose-kaccounts-services
 kde-apps/akonadi-calendar
 kde-apps/akonadi-import-wizard
 kde-apps/akonadiconsole
@@ -128,6 +129,7 @@ kde-apps/parley
 kde-apps/pim-data-exporter
 kde-apps/pim-sieve-editor
 kde-misc/kio-gdrive
+kde-misc/kio-gdrive-common
 kde-misc/tellico
 kde-misc/zanshin
 media-gfx/digikam
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index b48476c9919d..00bbe3720940 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,9 +1,14 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Ulrich Müller <ulm@gentoo.org> (2024-08-03)
-# Needs dev-libs/openspecfun which is not yet keyworded
-sci-visualization/gnuplot amos
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-07)
+# kde-plasma/plasma-workspace:6 is not keyworded
+sys-auth/polkit kde
+virtual/notification-daemon kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-07-31)
+# KF6 and media-libs/phonon will drop arm keyword
+app-office/texstudio video
 
 # Michał Górny <mgorny@gentoo.org> (2024-07-24)
 # Full testing requires www-client/firefox.
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 7a8455431a72..31ac62057c09 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -60,11 +60,6 @@ dev-python/ipython nbconvert
 # dev-libs/criterion is not marked stable yet
 app-admin/syslog-ng test
 
-# Sam James <sam@gentoo.org> (2022-01-15)
-# Requires dev-util/pahole which is not yet marked stable on arm.
-sys-kernel/gentoo-kernel debug
-sys-kernel/vanilla-kernel debug
-
 # Sam James <sam@gentoo.org> (2021-10-25)
 # Various dependencies not yet stable on arm
 # bug #816981
@@ -106,7 +101,6 @@ sci-mathematics/z3 java
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
 # Needs kde-frameworks/{kwallet,ki18n,kconfig} stable
 dev-vcs/subversion kwallet
-net-libs/libproxy kde
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
 # Needs kde-plasma/{polkit-kde-agent,plasma-workspace} stable
diff --git a/profiles/arch/arm64/package.use b/profiles/arch/arm64/package.use
index 3d30a34a0dba..22f0c2a5e48e 100644
--- a/profiles/arch/arm64/package.use
+++ b/profiles/arch/arm64/package.use
@@ -1,6 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-09-04)
+# Build with debugging support by default to facilitate dev-debug/dtrace
+# and sys-apps/systemd[bpf].
+>=sys-kernel/gentoo-kernel-6.10.8 debug
+>=sys-kernel/vanilla-kernel-6.10.8 debug
+
 # James Le Cuirot <chewi@gentoo.org> (2023-12-16)
 # Apply additional FFmpeg patches for efficient playback on some SoCs.
 media-tv/kodi soc
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 697d59d5c500..e0a0b3fe9972 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Ulrich Müller <ulm@gentoo.org> (2024-08-03)
-# Needs dev-libs/openspecfun which is not yet keyworded
-sci-visualization/gnuplot amos
-
 # orbea <orbea@riseup.net> (2024-07-19)
 # Unmask the dynarec flag which has arm64 asm.
 games-emulation/rmg -dynarec
@@ -241,7 +237,7 @@ app-text/enchant voikko
 sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
 sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
 sys-libs/compiler-rt-sanitizers -gwp-asan -shadowcallstack
-sys-libs/compiler-rt-sanitizers -libfuzzer -profile -xray
+sys-libs/compiler-rt-sanitizers -libfuzzer -profile -xray -rtsan
 >=sys-libs/compiler-rt-sanitizers-16 -orc
 
 # Roy Bamford <neddyseagoon@gentoo.org> (2020-12-07)
@@ -285,11 +281,6 @@ media-video/ffmpeg -rav1e
 # Mask io-uring & zbc pending keywording
 sys-block/fio -io-uring
 
-# Michał Górny <mgorny@gentoo.org> (2020-06-19)
-# Requires dev-util/pahole.
-sys-kernel/gentoo-kernel debug
-sys-kernel/vanilla-kernel debug
-
 # Sam James <sam@gentoo.org> (2020-06-11)
 # PGO works on arm64
 >=www-client/firefox-68.9.0 -pgo
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 1d3fbfbbc9b5..9a9ccce5a07c 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -252,7 +252,7 @@ sys-libs/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan
 sys-libs/compiler-rt-sanitizers ubsan safestack cfi scudo
 sys-libs/compiler-rt-sanitizers shadowcallstack gwp-asan
 sys-libs/compiler-rt-sanitizers libfuzzer memprof orc profile xray
-sys-libs/compiler-rt-sanitizers ctx-profile
+sys-libs/compiler-rt-sanitizers ctx-profile nsan rtsan
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 1fa92e6e97c5..dc92c7939f40 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # 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> (2024-08-23)
+# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
+sys-apps/systemd bpf
+
 # Ulrich Müller <ulm@gentoo.org> (2024-08-03)
 # Needs dev-libs/openspecfun which is not yet keyworded
 sci-visualization/gnuplot amos
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f8f57449b9be..b906a322f814 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-08-23)
+# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
+sys-apps/systemd bpf
+
 # Matt Jolly <kangie@gentoo.org> (2024-08-14)
 # QUIC dependencies are not keyworded
 net-misc/curl http3 quic curl_quic_openssl curl_quic_ngtcp2
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 475887b6dd32..cc55e19652fe 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,27 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# 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.
+>=dev-lang/spidermonkey-115 -jit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-19)
+# kde-apps/kdesdk-thumbnailers is not yet keyworded
+kde-apps/thumbnailers gettext
+
 # Hans de Graaff <graaff@gentoo.org> (2024-08-18)
 # Requires large parts of dev-ruby/rails to be keyworded
 dev-ruby/minitest-hooks test
@@ -125,7 +146,6 @@ dev-python/pyside6 3d location scxml
 app-office/libreoffice clang
 <dev-db/postgresql-16 llvm
 <dev-lang/rust-1.73.0 wasm
-dev-lang/spidermonkey clang lto
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-07-26)
 # MPV currently[1] has no plans to support >=lua5-3 making luajit
@@ -293,6 +313,7 @@ media-plugins/gst-plugins-meta libvisual
 >=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230705 -dfsan
 >=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230717 -profile -xray
 >sys-libs/compiler-rt-sanitizers-17.0.0_pre20230717 -libfuzzer
+>=sys-libs/compiler-rt-sanitizers-19 -cfi
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-07-08)
 # virtual/{jdk,jre} is not available on loong yet.
diff --git a/profiles/arch/mips/mips64/multilib/package.mask b/profiles/arch/mips/mips64/multilib/package.mask
new file mode 100644
index 000000000000..aff67b6b78b8
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/package.mask
@@ -0,0 +1,5 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Has broken dependency specs for multilib...
+sys-boot/arcload
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/package.mask b/profiles/arch/mips/mipsel/mips64el/multilib/package.mask
new file mode 100644
index 000000000000..aff67b6b78b8
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/package.mask
@@ -0,0 +1,5 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Has broken dependency specs for multilib...
+sys-boot/arcload
diff --git a/profiles/arch/mips/mipsel/o32/package.mask b/profiles/arch/mips/mipsel/o32/package.mask
index 02c903e795a5..3eba8c7538c5 100644
--- a/profiles/arch/mips/mipsel/o32/package.mask
+++ b/profiles/arch/mips/mipsel/o32/package.mask
@@ -1,6 +1,10 @@
 # Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-09-10)
+# Mask on o32 until we've fixed kgcc64
+sys-boot/arcload
+
 # Joshua Kinard <kumba@gentoo.org> (2024-02-27)
 # app-arch/lrzip-next does not support 32-bit arches (#925548)
 app-arch/lrzip-next
diff --git a/profiles/arch/mips/o32/package.mask b/profiles/arch/mips/o32/package.mask
index 02c903e795a5..3eba8c7538c5 100644
--- a/profiles/arch/mips/o32/package.mask
+++ b/profiles/arch/mips/o32/package.mask
@@ -1,6 +1,10 @@
 # Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-09-10)
+# Mask on o32 until we've fixed kgcc64
+sys-boot/arcload
+
 # Joshua Kinard <kumba@gentoo.org> (2024-02-27)
 # app-arch/lrzip-next does not support 32-bit arches (#925548)
 app-arch/lrzip-next
diff --git a/profiles/arch/mips/package.mask b/profiles/arch/mips/package.mask
index ddd3628b28a4..744beaad5084 100644
--- a/profiles/arch/mips/package.mask
+++ b/profiles/arch/mips/package.mask
@@ -1,6 +1,13 @@
-# Copyright 2006-2023 Gentoo Authors
+# Copyright 2006-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-08)
+# requires <llvm-18
+dev-lang/spidermonkey:102
+=sys-auth/polkit-123
+=dev-lang/rust-1.71.1
+=virtual/rust-1.71.1-r2
+
 # matoro <matoro_gentoo@matoro.tk> (2023-12-15)
 # Broken on BE and no way to test on LE, mask for now
 # https://github.com/libjxl/libjxl/issues/2433
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index ebb4e48d2860..019333fee28a 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,86 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-08)
+# Packages needing dev-python/selenium.
+dev-python/aiohttp-cors test
+dev-python/django test
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-08)
+# requires <llvm-18
+dev-db/postgresql llvm_slot_15 llvm_slot_16 llvm_slot_17
+media-libs/mesa llvm_slot_15 llvm_slot_16 llvm_slot_17
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-08)
+# needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
+gnome-base/gvfs google test
+
+# Michał Górny <mgorny@gentoo.org> (2024-09-08)
+# libcxx is broken on mips, https://bugs.gentoo.org/939297#c2
+sys-devel/clang-common default-libcxx
+sys-devel/clang-runtime libcxx
+
+# Hans de Graaff <graaff@gentoo.org> (2024-09-08)
+# Requires large parts of dev-ruby/rails to be keyworded
+dev-ruby/minitest-hooks test
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-07)
+# gui-libs/gtk:4 is not keyworded here
+app-crypt/gcr:4 gtk
+>=app-crypt/pinentry-1.3.0 gtk
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-06)
+# media-libs/vidstab is not keyworded
+media-video/ffmpeg vidstab
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-09-06)
+# media-video/rav1e isn't keyworded here
+media-libs/libavif rav1e
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-26)
+# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
+sys-apps/systemd bpf
+media-libs/libv4l bpf
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-26)
+# dev-ruby/thor not keyworded here
+app-text/htmltidy test
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-25)
+# simplify the dep tree
+app-admin/syslog-ng amqp grpc kafka mongodb smtp test
+app-crypt/pinentry efl
+app-text/doxygen gui
+dev-build/cmake gui
+dev-db/mysql cjk
+dev-db/percona-server cjk
+dev-libs/libisoburn frontend-optional
+dev-python/uvicorn test-rust
+dev-util/glade gjs
+dev-util/pkgcheck emacs
+dev-util/ragel doc
+dev-vcs/git doc subversion
+mail-mta/postfix mongodb
+media-sound/liblc3 test
+net-misc/rsync rrsync
+net-firewall/nftables doc
+dev-util/ccache doc
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-25)
+# Some optional emacs dependencies are not keyworded.
+app-editors/emacs gui mailutils
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-25)
+# net-libs/webkit-gtk has no mips keywords
+app-editors/emacs xwidgets
+dev-util/glade webkit
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-25)
+# alternatives not available on mips
+app-alternatives/awk nawk
+app-alternatives/bc gh
+app-alternatives/lex reflex
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-07-05)
 # Avoid unkeyworded media-gfx/libimagequant
 dev-python/pillow imagequant
@@ -82,7 +162,7 @@ net-analyzer/rrdtool rados
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-22)
 # Qt 5 is not keyworded here
-app-admin/setools X
+app-admin/setools X test
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-22)
 # Qt 5 is not keyworded here
@@ -188,7 +268,7 @@ app-text/enchant voikko
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa vulkan vulkan-overlay zink video_cards_zink
 
 # Michał Górny <mgorny@gentoo.org> (2018-01-23)
 # USE=collab requires unkeyworded net-libs/loudmouth & dev-cpp/asio.
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 6fdd3e3d526c..da6c9e7c86fe 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-26)
+# media-libs/libheif is not keyworded here
+heif
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2024-08-26)
+# media-libs/libjxl is not keyworded here
+jpegxl
+
 # Unmask the flag which corresponds to ARCH.
 -mips
 
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1a4bd8be7bd6..802fa28d8127 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Ulrich Müller <ulm@gentoo.org> (2024-08-03)
-# Needs dev-libs/openspecfun which is not yet keyworded
-sci-visualization/gnuplot amos
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-19)
+# kde-apps/kdesdk-thumbnailers is not yet keyworded
+kde-apps/thumbnailers gettext
 
 # Thomas Bettler <thomas.bettler@gmail.com> (2024-06-10)
 # requires dev-libs/apache-arrow which is net yet keyworded
@@ -295,7 +295,6 @@ dev-db/percona-server -numa
 # Requires unkeyworded dependencies
 dev-vcs/subversion kwallet
 net-irc/quassel kde
-net-libs/libproxy kde
 sys-auth/polkit kde
 sys-block/gparted kde
 virtual/notification-daemon kde
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index e87ca2c33169..bf02a9359c47 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-04)
+# KF6 and media-libs/phonon have dropped ppc keyword
+app-office/texstudio video
+net-irc/kvirc phonon
+
 # Matt Jolly <kangie@gentoo.org> (2024-08-14)
 # QUIC dependencies are not keyworded
 net-misc/curl http3 quic curl_quic_openssl curl_quic_ngtcp2
@@ -199,7 +204,6 @@ dev-python/pyopengl test
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
 # USE=bpf depends on sys-devel/clang which is not keyworded on ppc.
 media-libs/libv4l bpf
-media-tv/v4l-utils bpf
 
 # Matthew Thode <prometheanfire@gentoo.org> (2020-02-17)
 # Mask until net-analyzer/icinga2 is keyworded
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index d0ccb4411891..1818fc6de33f 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -70,10 +70,6 @@ lxqt-base/lxqt-meta desktop-portal
 # impl there anyway. Please keep this in sync with use.stable.mask.
 dev-lang/python-exec -python_targets_pypy3
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-12)
-# telepathy stack is not keyworded
-dev-util/kdevelop reviewboard
-
 # Sam James <sam@gentoo.org> (2021-10-17)
 # Go doesn't support pie on ppc64, bug #818529
 net-dns/dnscrypt-proxy pie
@@ -111,6 +107,7 @@ dev-util/diffoscope haskell
 sys-libs/compiler-rt-sanitizers -asan -lsan -msan -tsan
 sys-libs/compiler-rt-sanitizers -ubsan -scudo
 sys-libs/compiler-rt-sanitizers -profile
+>=sys-libs/compiler-rt-sanitizers-19 -orc
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
 # fwupd keyworded now on ppc64
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index dbbd4dfe6178..299a152bee92 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
+# Waiting for KF6 stabilisation in bug #934478
+app-crypt/pinentry qt6
+
 # Sam James <sam@gentoo.org> (2024-04-30)
 # sys-block/nbdkit is not yet marked stable here
 app-emulation/libvirt nbd
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index a194f032c5ca..d18dd825222c 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,9 +1,17 @@
 # Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Ulrich Müller <ulm@gentoo.org> (2024-08-03)
-# Needs dev-libs/openspecfun which is not yet keyworded
-sci-visualization/gnuplot amos
+# Michael Orlitzky <mjo@gentoo.org> (2024-09-01)
+# Mask the optional plotting backend sci-libs/vtk because it's a beast
+# and I don't want to deal with it right now.
+sci-mathematics/maxima vtk
+
+# Michael Orlitzky <mjo@gentoo.org> (2024-08-26)
+# There's an unexplained test failure in sci-libs/qd that I've emailed
+# the authors about. Until we know what's up with that, USE=qd should
+# remain masked for consumers.
+sci-libs/fplll qd
+sci-mathematics/lcalc double-double quad-double
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-07-06)
 # KDE PIM is not keyworded here
@@ -76,8 +84,10 @@ sys-kernel/installkernel -systemd-boot -ukify -uki
 sys-block/tgt rbd
 
 # jinqiang zhang <peeweep@0x0.ee> (2023-03-27)
-# Sanitizers supported on this architecture.
+# Sanitizers supported on riscv64.
 sys-libs/compiler-rt-sanitizers -asan -lsan
+>=sys-libs/compiler-rt-sanitizers-19 -libfuzzer -hwasan -profile -tsan
+>=sys-libs/compiler-rt-sanitizers-19 -ubsan -scudo
 
 # Yixun Lan <dlan@gentoo.org> (2023-02-16)
 # USE=java depend on virtual/jdk:1.8 which is not support on RISC-V
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 00ac5effb49e..3c3913716246 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -4,6 +4,13 @@
 # Unmask the flag which corresponds to ARCH.
 -riscv
 
+# Michael Orlitzky <mjo@gentoo.org> (2024-09-01)
+# These lisp implementations have ~riscv keywords.
+# This counteracts the mask in arch/base/use.mask.
+-clisp
+-ecl
+-gcl
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-07-11)
 # Unmask secureboot flag on arches where sbsigntools is keyworded
 -secureboot
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 442b717d7b57..ae7ab5ecfa16 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org> (2024-09-01)
+# Requires large parts of dev-ruby/rails to be keyworded
+dev-ruby/minitest-hooks test
+
+# Sam James <sam@gentoo.org> (2024-08-23)
+# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
+sys-apps/systemd bpf
+
 # Matt Jolly <kangie@gentoo.org> (2024-08-14)
 # QUIC dependencies are not keyworded
 net-misc/curl http3 quic curl_quic_openssl curl_quic_ngtcp2
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index e7032ba9fad8..9c99b995cdf4 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-08-23)
+# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here
+sys-apps/systemd bpf
+
 # Ulrich Müller <ulm@gentoo.org> (2024-08-03)
 # Needs dev-libs/openspecfun which is not yet keyworded
 sci-visualization/gnuplot amos
@@ -404,7 +408,6 @@ x11-libs/qwt designer
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-15)
 # USE=bpf depends on sys-devel/clang which is not keyworded on sparc
 media-libs/libv4l bpf
-media-tv/v4l-utils bpf
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # dev-lang/luajit is not keyworded on sparc
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index 19f6423ba197..8f89b5b34cb6 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -28,9 +28,6 @@ dev-python/spyder-unittest
 dev-python/spyder-line-profiler
 dev-python/spyder-vim
 dev-python/spyder-notebook
-dev-util/kdevelop:5
-dev-util/kdevelop-php:5
-dev-util/kdevelop-python:5
 kde-apps/akonadi-calendar:5
 kde-apps/akonadi-import-wizard:5
 kde-apps/akonadiconsole:5
@@ -44,7 +41,6 @@ kde-apps/incidenceeditor:5
 kde-apps/kaccounts-providers:5
 kde-apps/kaddressbook:5
 kde-apps/kalarm:5
-kde-apps/kalgebra:5
 kde-apps/kdepim-addons:5
 kde-apps/kdepim-meta
 kde-apps/kdepim-runtime:5
@@ -61,7 +57,6 @@ kde-apps/libksieve:5
 kde-apps/mailcommon:5
 kde-apps/messagelib:5
 kde-apps/mbox-importer:5
-kde-apps/parley:5
 kde-apps/pim-data-exporter:5
 kde-apps/pim-sieve-editor:5
 kde-misc/kio-gdrive
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 1947aa4df1ce..4f221ab56a98 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,12 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-07-21)
-# Need not as yet stable KF6-based counterparts (bug #934361)
-kde-apps/libkcddb kf6compat
-kde-apps/libkcompactdisc kf6compat
-kde-apps/libksane kf6compat
-net-misc/kio-zeroconf kf6compat
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-02)
+# kde-plasma/plasma-workspace is not stable here.
+sys-auth/polkit kde
+virtual/notification-daemon kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-30)
+# KF6 is not stable here.
+>=app-crypt/pinentry-1.3.0 wayland
 
 # Matt Turner <mattst88@gentoo.org> (2024-07-14)
 # spirv-llvm-translator < 17 is not stable on x86.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 302010846cdc..39891976a91a 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -12,7 +12,7 @@ USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL CURL_QUIC ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS GUILE_SINGLE_TARGET GUILE_TARGETS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PERL_FEATURES PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL CURL_QUIC ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS GUILE_SINGLE_TARGET GUILE_TARGETS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PERL_FEATURES PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/base/package.use b/profiles/base/package.use
index b4cc281eb2aa..cf646b56fb24 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,13 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-05-30)
-# Only up to python 3.11 supported, bug #929546
-<dev-util/kdevelop-python-24.05.1:5 python_single_target_python3_11
-~www-client/falkon-23.08.5 python_single_target_python3_11
-dev-python/pyside2 python_targets_python3_11
-dev-python/shiboken2 python_targets_python3_11
-
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-03-23)
 # Used by pkgcheck, so let's make it easier for all developers to install it
 >=dev-libs/tree-sitter-bash-0.21.0 python
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6c9bef5a32a7..98f7127451ee 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,34 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2024-09-07)
+# yacc[reference] exists more for curiosity than anything else, it's
+# not for real use on systems.
+app-alternatives/yacc reference
+
+# Sam James <sam@gentoo.org> (2024-09-03)
+# Causes crashes with e.g. dlz+samba (bug #938955)
+net-dns/bind jemalloc
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-02)
+# kde-plasma/print-manager:5 and kde-apps/khelpcenter:5 cleanup
+kde-plasma/plasma-meta:5 cups handbook
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-02)
+# Prepare kde-apps/kaccounts-integration:5 cleanup
+kde-plasma/plasma-desktop:5 kaccounts
+kde-plasma/plasma-welcome:5 kaccounts
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-01)
+# Prepare for dev-util/kdevelop:5 removal
+kde-apps/umbrello:5 php
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-31)
+# Prepare for KDE PIM 5 removal and avoid conflicts w/ KDE PIM 6
+app-office/kmymoney:5 addressbook
+app-office/kraft:5 pim
+media-gfx/digikam:5 addressbook
+
 # Viorel Munteanu <ceamac@gentoo.org> (2024-07-26)
 # Branch 7.1 needs a new BDEPEND for doc
 >=app-emulation/virtualbox-7.1 doc
@@ -55,10 +83,6 @@ app-admin/testdisk ewf
 # Wayland client is broken/deprecated by upstream. Bug 930197.
 >=net-misc/freerdp-3 wayland
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-04-06)
-# Depends on last-rited kde-apps/ktp-accounts-kcm
-dev-util/kdevelop reviewboard
-
 # Michał Górny <mgorny@gentoo.org> (2024-03-26)
 # sys-auth/pam_ssh is being last rited, bug #892031.
 sys-auth/pambase pam_ssh
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 02af998f914f..575a76e0a50c 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,16 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
-# Building with qt6 requires (masked) kde-frameworks:6
-app-admin/calamares qt6
-app-crypt/pinentry qt6
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-29)
+# Pin down kf6compat mask to currently stable versions.
+<kde-apps/kio-extras-24.02.2-r2 kf6compat
+<kde-apps/libkgapi-23.08.5-r2 kf6compat
+<kde-frameworks/baloo-5.116.0-r1 kf6compat
+<kde-frameworks/kglobalaccel-5.116.0-r1 kf6compat
+<kde-frameworks/kguiaddons-5.116.0-r1 kf6compat
+<kde-frameworks/kuserfeedback-1.3.0-r4 kf6compat
+<kde-frameworks/kwallet-5.116.0-r1 kf6compat
+<kde-plasma/libplasma-5.116.0-r1 kf6compat
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-14)
 # Qt6 dependencies are not yet available in stable. Moreover,
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index de017f0c28aa..4c528b5880f3 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
-# KF6 is not in stable yet.
-kf6compat
-
 # Michał Górny <mgorny@gentoo.org> (2024-05-08)
 # Python implementations without stable keywords.
 python_targets_python3_13
diff --git a/profiles/default/linux/ppc/package.use.mask b/profiles/default/linux/ppc/package.use.mask
index 631cbe4ff0cb..eff2ddb9a45c 100644
--- a/profiles/default/linux/ppc/package.use.mask
+++ b/profiles/default/linux/ppc/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
+# Requires sys-libs/libcxx.
+dev-cpp/benchmark libcxx
+
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize
diff --git a/profiles/default/linux/ppc64/package.use.mask b/profiles/default/linux/ppc64/package.use.mask
index 631cbe4ff0cb..eff2ddb9a45c 100644
--- a/profiles/default/linux/ppc64/package.use.mask
+++ b/profiles/default/linux/ppc64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
+# Requires sys-libs/libcxx.
+dev-cpp/benchmark libcxx
+
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize
diff --git a/profiles/default/linux/ppc64le/package.use.mask b/profiles/default/linux/ppc64le/package.use.mask
index 631cbe4ff0cb..eff2ddb9a45c 100644
--- a/profiles/default/linux/ppc64le/package.use.mask
+++ b/profiles/default/linux/ppc64le/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
+# Requires sys-libs/libcxx.
+dev-cpp/benchmark libcxx
+
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize
diff --git a/profiles/features/time64/package.accept_keywords b/profiles/default/linux/x86/23.0/i686/time64/package.accept_keywords
index e71b50502825..f065ec275cad 100644
--- a/profiles/features/time64/package.accept_keywords
+++ b/profiles/default/linux/x86/23.0/i686/time64/package.accept_keywords
@@ -3,4 +3,4 @@
 
 # For better testing of time64, we use gcc-14 here already in an otherwise stable
 # environment.
-sys-devel/gcc:14
+sys-devel/gcc:14 ~x86
diff --git a/profiles/desc/monkeyd_plugins.desc b/profiles/desc/monkeyd_plugins.desc
deleted file mode 100644
index 49a82d1a8bb3..000000000000
--- a/profiles/desc/monkeyd_plugins.desc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of MONKEYD_PLUGINS USE_EXPAND flags for www-servers/monkeyd.
-# All plugins are included here except cgi and fastcgi which are global use flags.
-
-auth - Provide HTTP Basic Authentication.
-cheetah - Provide a shell-like command line interface.
-#cgi - Provide the traditional CGI interface - This is a global USE flag.
-dirlisting - Show an HTML listing of the content of a directory.
-#fastcgi - Provide FastCGI proxy support - This is a global USE flag.
-liana - Build your own network layer through monkeyd.
-logger - Log requests and common errors.
-mandril - Restrict incoming connections based on the IP address or URI request.
-tls - Provide TLS using mbed TLS (formerly known as PolarSSL) - Currently disabled.
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 96fbd36959f5..a2a1165ea299 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -29,7 +29,7 @@ USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/features/llvm/package.use.mask b/profiles/features/llvm/package.use.mask
index 44b8fcea3c54..9559cea0d1f0 100644
--- a/profiles/features/llvm/package.use.mask
+++ b/profiles/features/llvm/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jimi Huotari <chiitoo@gentoo.org> (2024-08-22)
+# Fails to compile due to a pre-built binary.
+# Gentoo bug: 922163
+media-video/obs-studio browser
+
 # Sam James <sam@gentoo.org> (2023-07-22)
 # Doesn't call llvm-profdata so fails.
 sys-devel/binutils pgo
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index a31c6934656d..8f0c620b4211 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-08-31)
+# sys-devel/binutils[gprofng] is masked on musl
+dev-debug/gprofng-gui
+
+# Sam James <sam@gentoo.org> (2024-08-21)
+# systemtap needs porting to musl. Fails to compile in a few ways.
+# See bug #925857.
+dev-debug/systemtap
+sys-apps/tuned
+
 # Robert Förster <Dessa@gmake.de> (2024-05-06)
 # needs mongodb
 net-wireless/unifi
@@ -75,7 +85,10 @@ app-arch/lrzip-next
 # Christopher Fore <csfore@posteo.net> (2024-01-24)
 # >=sys-fs/bcachefs-tools-1.4.1 uses functions currently not in Musl
 # https://github.com/koverstreet/bcachefs-tools/issues/213
->=sys-fs/bcachefs-tools-1.4.1
+# The above was fixed in musl 1.2.5, which bcachefs-tools 1.11.0
+# will now depend on.
+# https://www.openwall.com/lists/musl/2024/03/01/2
+<sys-fs/bcachefs-tools-1.11.0
 
 # Conrad Kostecki <conikost@gentoo.org> (2024-01-23)
 # Uses glibc function getsourcefilter(),
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index fc7357eef0bc..1bae192c2abe 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,20 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-08-22)
+# Browser uses a prebuilt binary built against glibc (bug #934005)
+media-video/obs-studio browser
+
+# Sam James <sam@gentoo.org> (2024-08-21)
+# dev-debug/systemtap doesn't work on musl
+app-emulation/libvirt dtrace
+gui-libs/neatvnc tracing
+gui-apps/wayvnc tracing
+
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
+# Requires sys-libs/libcxx.
+dev-cpp/benchmark libcxx
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-07-25)
 # Requires systemd-detect-virt
 app-emulation/virt-firmware test
diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index 8188a9fef818..36a3df9cb46b 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -1,10 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Select the correct ELIBC
 -elibc_musl
 elibc_glibc
 
+# Sam James <sam@gentoo.org> (2024-08-21)
+# dev-debug/systemtap doesn't work on musl
+systemtap
+
 # Sam James <sam@gentoo.org> (2022-10-04)
 # Mask USE flags which pull in a binary package linked against glibc (rolling
 # mask, use for all such packages)
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index c6156b25d79c..30e6852a7ea3 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -44,6 +44,7 @@ net-analyzer/suricata
 net-analyzer/gvm-tools
 net-analyzer/gr-fosphor
 net-analyzer/gvm
+net-analyzer/snmpclitools
 media-sound/beets
 media-sound/gnome-sound-recorder
 media-gfx/oxipng
@@ -122,6 +123,10 @@ dev-python/dissononce
 dev-python/consonance
 dev-python/PyGithub
 dev-python/adblock
+dev-python/pysnmp
+dev-python/pysnmp-mibs
+dev-python/pysmi
+dev-python/pysnmpcrypto
 dev-java/icedtea-web
 dev-debug/pwndbg
 dev-db/mycli
@@ -180,6 +185,7 @@ net-wireless/gnuradio
 net-wireless/gqrx
 net-wireless/gr-iqbal
 net-wireless/gr-osmosdr
+app-emulation/diskimage-builder
 
 # Various packages requiring Rust.
 app-admin/ansible
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index 3520b9ccc372..888aadab1d16 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Petr Vaněk <arkamar@gentoo.org> (2024-09-01)
+# Requires dev-python/cryptography
+app-crypt/osslsigncode test
+
 # matoro <matoro_gentoo@matoro.tk> (2024-07-27)
 # Additional entries exposed by correcting musl, #936643
 x11-wm/xpra crypt oauth
diff --git a/profiles/license_groups b/profiles/license_groups
index 166c9d825cef..6917ca54aef5 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -25,7 +25,7 @@ FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4
 # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0
 # We exclude NOSA and Watcom-1.0, but we keep Artistic because Debian
 # considers it DFSG-free.
-OSI-APPROVED-FREE 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 BlueOak-1.0.0 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPL-1.02 LPPL-1.3c MirOS MIT MIT-0 MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL Ms-RL nethack OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-3.0 Unicode-DFS-2016 Unlicense UPL-1.0 UoI-NCSA W3C wxWinLL-3 ZLIB ZPL
+OSI-APPROVED-FREE 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 BlueOak-1.0.0 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LBNLBSD LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPL-1.02 LPPL-1.3c MirOS MIT MIT-0 MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL Ms-RL nethack OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-3.0 Unicode-DFS-2016 Unlicense UPL-1.0 UoI-NCSA W3C wxWinLL-3 ZLIB ZPL
 
 # Misc licenses that are probably free software, i.e. follow the
 # Free Software Definition at https://www.gnu.org/philosophy/free-sw.html
diff --git a/profiles/package.mask b/profiles/package.mask
index 300e0b820c56..73e8341a4429 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,295 @@
 
 #--- END OF EXAMPLES ---
 
+# Eli Schwartz <eschwartz@gentoo.org> (2024-09-09)
+# Upstream has dropped this package since MATE 1.28.
+# Removal on 2024-10-09.  Bug #932568.
+mate-extra/mate-netbook
+
+# Eli Schwartz <eschwartz@gentoo.org> (2024-09-09)
+# Fails to build with modern C. Unmaintained for 20 years.
+# Removal on 2024-10-09.  Bug #877105, #927389.
+sci-chemistry/mopac7
+
+# Sam James <sam@gentoo.org> (2024-09-10)
+# Breaks libstdc++ with a casing issue: https://gcc.gnu.org/PR116657
+=sys-libs/timezone-data-2024b
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-09)
+# No revdeps for years, KF5-based. Removal on 2024-10-09.
+net-libs/libmediawiki
+
+# Alfredo Tupone <tupone@gentoo.org> (2024-06-09)
+# These packages are no more needed. Use dev-ml/dune-private-libs
+# that include these
+# remove on 2024-10-08. Bug #939339
+dev-ml/stdune
+dev-ml/ordering
+dev-ml/dyn
+
+# Michał Górny <mgorny@gentoo.org> (2024-09-08)
+# Does not build anymore.  No upstream activity since 2021.
+# Removal on 2024-10-08.  Bug #932532.
+sci-physics/qmeq
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-07)
+# These packages are EOL in Plasma 6.
+# Removal on 2024-10-07.
+<kde-plasma/khotkeys-5.27.50:5
+<kde-plasma/libkworkspace-5.27.50:5
+<kde-plasma/xembed-sni-proxy-5.27.50:5
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-07)
+# Mask remaining KDE Gear 23.08.5 packages for removal on 2024-09-21.
+# All of these have KF6-based upgrades available - all users must upgrade.
+~app-cdr/dolphin-plugins-mountiso-23.08.5
+~app-crypt/keysmith-23.08.5
+~kde-apps/ark-23.08.5
+~kde-apps/baloo-widgets-23.08.5
+~kde-apps/bomber-23.08.5
+~kde-apps/bovo-23.08.5
+~kde-apps/dolphin-23.08.5
+~kde-apps/filelight-23.08.5
+~kde-apps/granatier-23.08.5
+~kde-apps/kajongg-23.08.5
+~kde-apps/kapman-23.08.5
+~kde-apps/kate-addons-23.08.5
+~kde-apps/kate-23.08.5
+~kde-apps/kate-lib-23.08.5
+~kde-apps/katomic-23.08.5
+~kde-apps/kbackup-23.08.5
+~kde-apps/kblackbox-23.08.5
+~kde-apps/kblocks-23.08.5
+~kde-apps/kbounce-23.08.5
+~kde-apps/kbreakout-23.08.5
+~kde-apps/kcalc-23.08.5
+~kde-apps/kcalutils-23.08.5
+~kde-apps/kcharselect-23.08.5
+~kde-apps/kdebugsettings-23.08.5
+~kde-apps/kdf-23.08.5
+~kde-apps/kdialog-23.08.5
+~kde-apps/kdiamond-23.08.5
+~kde-apps/keditbookmarks-23.08.5
+~kde-apps/kfind-23.08.5
+~kde-apps/kfourinline-23.08.5
+~kde-apps/kgoldrunner-23.08.5
+~kde-apps/kigo-23.08.5
+~kde-apps/killbots-23.08.5
+~kde-apps/kiriki-23.08.5
+~kde-apps/kjumpingcube-23.08.5
+~kde-apps/klickety-23.08.5
+~kde-apps/klines-23.08.5
+~kde-apps/kmahjongg-23.08.5
+~kde-apps/kmines-23.08.5
+~kde-apps/knavalbattle-23.08.5
+~kde-apps/knetwalk-23.08.5
+~kde-apps/knights-23.08.5
+~kde-apps/kolf-23.08.5
+~kde-apps/kollision-23.08.5
+~kde-apps/kolourpaint-24.02.2
+~kde-apps/konquest-23.08.5
+~kde-apps/konsole-23.08.5
+~kde-apps/kpat-23.08.5
+~kde-apps/kreversi-23.08.5
+~kde-apps/kshisen-23.08.5
+~kde-apps/ksirk-23.08.5
+~kde-apps/ksnakeduel-23.08.5
+~kde-apps/kspaceduel-23.08.5
+~kde-apps/ksquares-23.08.5
+~kde-apps/ksudoku-23.08.5
+~kde-apps/kteatime-23.08.5
+~kde-apps/ktimer-23.08.5
+~kde-apps/ktuberling-23.08.5
+~kde-apps/kubrick-23.08.5
+~kde-apps/kwalletmanager-23.08.5
+~kde-apps/kwrite-23.08.5
+~kde-apps/libkdegames-23.08.5
+~kde-apps/libkmahjongg-23.08.5
+~kde-apps/lskat-23.08.5
+~kde-apps/palapeli-23.08.5
+~kde-apps/picmi-23.08.5
+~kde-apps/sweeper-23.08.5
+~kde-apps/yakuake-23.08.5
+~kde-misc/kclock-23.08.5
+~kde-misc/kweather-23.08.5
+~kde-misc/markdownpart-23.08.5
+~media-gfx/skanpage-23.08.5
+~sys-block/partitionmanager-23.08.5
+~sys-libs/kpmcore-23.08.5
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-07)
+# Plasma 6 is not planned to be going stable on x86.
+# Plasma 5 will be cleaned up shortly. Removal on 2024-09-21.
+<kde-plasma/bluedevil-5.27.50:5
+<kde-plasma/breeze-5.27.50:5
+<kde-plasma/breeze-grub-5.27.50:5
+<kde-plasma/breeze-gtk-5.27.50:5
+<kde-plasma/breeze-plymouth-5.27.50:5
+<kde-plasma/discover-5.27.50:5
+<kde-plasma/drkonqi-5.27.50:5
+<kde-plasma/flatpak-kcm-5.27.50:5
+<kde-plasma/kactivitymanagerd-5.27.50:5
+<kde-plasma/kde-cli-tools-5.27.50:5
+<kde-plasma/kde-gtk-config-5.27.50:5
+<kde-plasma/kdecoration-5.27.50:5
+<kde-plasma/kdeplasma-addons-5.27.50:5
+<kde-plasma/kgamma-5.27.50:5
+<kde-plasma/kinfocenter-5.27.50:5
+<kde-plasma/kmenuedit-5.27.50:5
+<kde-plasma/kpipewire-5.27.50:5
+<kde-plasma/kscreen-5.27.50:5
+<kde-plasma/kscreenlocker-5.27.50:5
+<kde-plasma/ksshaskpass-5.27.50:5
+<kde-plasma/ksystemstats-5.27.50:5
+<kde-plasma/kwallet-pam-5.27.50:5
+<kde-plasma/kwin-5.27.50:5
+<kde-plasma/kwrited-5.27.50:5
+<kde-plasma/layer-shell-qt-5.27.50:5
+<kde-plasma/libksysguard-5.27.50:5
+<kde-plasma/milou-5.27.50:5
+<kde-plasma/oxygen-5.27.50:5
+<kde-plasma/oxygen-sounds-5.27.50:5
+<kde-plasma/plasma-browser-integration-5.27.50:5
+<kde-plasma/plasma-desktop-5.27.50:5
+<kde-plasma/plasma-disks-5.27.50:5
+<kde-plasma/plasma-firewall-5.27.50:5
+<kde-plasma/plasma-integration-5.27.50:5
+<kde-plasma/plasma-meta-5.27.50:5
+<kde-plasma/plasma-nm-5.27.50:5
+<kde-plasma/plasma-pa-5.27.50:5
+<kde-plasma/plasma-sdk-5.27.50:5
+<kde-plasma/plasma-systemmonitor-5.27.50:5
+<kde-plasma/plasma-thunderbolt-5.27.50:5
+<kde-plasma/plasma-workspace-5.27.50:5
+<kde-plasma/plasma-workspace-wallpapers-5.27.50:5
+<kde-plasma/plasma-vault-5.27.50:5
+<kde-plasma/plasma-welcome-5.27.50:5
+<kde-plasma/plymouth-kcm-5.27.50:5
+<kde-plasma/powerdevil-5.27.50:5
+<kde-plasma/sddm-kcm-5.27.50:5
+<kde-plasma/systemsettings-5.27.50:5
+<kde-plasma/xdg-desktop-portal-kde-5.27.50:5
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-04)
+# Unmaintained upstream, latest media-libs/phonon release incompatible.
+# Removal on 2024-10-04.
+media-libs/phonon-gstreamer
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-04)
+# KF5 Porting aids (from KDElibs4). No more, or PMASKED revdeps.
+# Removal on 2024-10-04. Bug #755956
+kde-frameworks/khtml
+kde-frameworks/kjs
+kde-frameworks/kross
+
+# Fabian Groffen <grobian@gentoo.org> (2024-09-02)
+# exim_tinydb utility crashes due to invalid free() (used in startup script)
+=mail-mta/exim-4.98
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-31)
+# All users must upgrade to KDE PIM 6.
+# KDE PIM 5 depends on deprecated kde-frameworks/kross:5,
+# blocking deprecated dev-qt/qtscript:5 removal, and deprecated
+# dev-qt/qtwebengine:5.
+# x86 users: This is the end of the road for KDE PIM on x86. Export
+# your data with kde-apps/pim-data-exporter, if necessary, and migrate
+# to alternative PIM applications.
+# Bugs #810493, #925720. Removal on 2024-09-31.
+<app-office/merkuro-23.08.50
+<kde-apps/akonadi-23.08.50
+<kde-apps/akonadi-calendar-23.08.50
+<kde-apps/akonadi-contacts-23.08.50
+<kde-apps/akonadi-import-wizard-23.08.50
+<kde-apps/akonadi-mime-23.08.50
+<kde-apps/akonadi-notes-23.08.50
+<kde-apps/akonadi-search-23.08.50
+<kde-apps/akonadiconsole-23.08.50
+<kde-apps/akregator-23.08.50
+<kde-apps/calendarjanitor-23.08.50
+<kde-apps/calendarsupport-23.08.50
+<kde-apps/eventviews-23.08.50
+<kde-apps/grantlee-editor-23.08.50
+<kde-apps/grantleetheme-23.08.50
+<kde-apps/incidenceeditor-23.08.50
+<kde-apps/kaddressbook-23.08.50
+<kde-apps/kalarm-23.08.50
+<kde-apps/kcalutils-23.08.50
+<kde-apps/kdepim-addons-23.08.50
+<kde-apps/kdepim-meta-23.08.50
+<kde-apps/kdepim-runtime-23.08.50
+<kde-apps/kidentitymanagement-23.08.50
+<kde-apps/kimap-23.08.50
+<kde-apps/kitinerary-23.08.50
+<kde-apps/kldap-23.08.50
+<kde-apps/kleopatra-23.08.50
+<kde-apps/kmail-23.08.50
+<kde-apps/kmail-account-wizard-23.08.50
+<kde-apps/kmailtransport-23.08.50
+<kde-apps/kmbox-23.08.50
+<kde-apps/kmime-23.08.50
+<kde-apps/knotes-23.08.50
+<kde-apps/konsolekalendar-23.08.50
+<kde-apps/kontact-23.08.50
+<kde-apps/kontactinterface-23.08.50
+<kde-apps/korganizer-23.08.50
+<kde-apps/kpimtextedit-23.08.50
+<kde-apps/kpkpass-23.08.50
+<kde-apps/ksmtp-23.08.50
+<kde-apps/libgravatar-23.08.50
+<kde-apps/libkdepim-23.08.50
+<kde-apps/libkleo-23.08.50
+<kde-apps/libksieve-23.08.50
+<kde-apps/libktnef-23.08.50
+<kde-apps/mailcommon-23.08.50
+<kde-apps/mailimporter-23.08.50
+<kde-apps/mbox-importer-23.08.50
+<kde-apps/messagelib-23.08.50
+<kde-apps/pim-data-exporter-23.08.50
+<kde-apps/pim-sieve-editor-23.08.50
+<kde-apps/pimcommon-23.08.50
+<kde-misc/zanshin-23.08.50
+<kde-apps/kgpg-23.08.50
+app-text/kjots:5
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-31)
+# This is so old that it was only kept alive as KF5-based snapshot of an
+# upstream git branch containing a single "Initial port to KF/Qt5 (back in
+# 2017). That was never merged to master, project archived for a long time.
+# Bug #759772. Removal on 2024-09-31.
+media-gfx/kcoloredit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-29)
+# No signs of development upstream (last commit in 2016). If you use this,
+# please ping them in order to get it ported over to KF6.
+# Removal on 2024-09-29.
+kde-misc/ktoshiba
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-29)
+# This is so old that it was only kept alive as KF5-based version by means
+# of a downstream patch porting away from KDElibs4 (back in 2014!). Not
+# functional in KIO-6 revdeps. Removal on 2024-09-29.
+kde-misc/openofficeorg-thumbnail
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-29)
+# Long unmaintained Plasma 5-only desktop widget. Removal on 2024-09-29.
+kde-misc/plasma-applet-network-monitor
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-29)
+# This is so old that it was only kept alive as KF5-based version by means
+# of a downstream patch porting away from KDElibs4. No reports of it even
+# being in a working state (e.g. bug 813031). Removal on 2024-09-29.
+kde-misc/kio-locate
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-25)
+# Broken with current Plasma 5 version, not ported to Plasma 6.
+# Removal on 2024-09-24.
+kde-misc/latte-dock
+
+# Florian Schmaus <flow@gentoo.org> (2024-08-23)
+# Has a serious bug that causes synced directories to end up world read-
+# and writeable. See https://github.com/nextcloud/desktop/issues/6863
+>=net-misc/nextcloud-client-3.13.1
+
 # Arsen Arsenović <arsen@gentoo.org> (2024-08-02)
 # Guile rework masks.  Mask all packages or package versions that are
 # being bumped as part of the Guile reslotting process.
@@ -67,11 +356,6 @@ app-text/cuneiform
 # Removal on 2024-09-10.  Bugs #937775, #675028.
 media-sound/SmarTagger
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-08-10)
-# Mask KF6-based version for now until actual KF6-based consumers
-# also move to ::gentoo.
-~dev-util/kdevelop-pg-qt-2.3.0
-
 # Pacho Ramos <pacho@gentoo.org> (2024-08-09)
 # Mask until we find out a way to deal better with the upstream
 # introduced circular dep, bug #937616
@@ -107,63 +391,11 @@ sys-auth/pam_ldap
 >=mail-client/thunderbird-128.1.0
 >=mail-client/thunderbird-bin-128.1.0
 
-# Michał Górny <mgorny@gentoo.org> (2024-08-06)
-# Superseded by dev-libs/libayatana-*.  No revdeps left.
-# Removal on 2024-09-05.  Bug #936881.
-dev-libs/libappindicator
-dev-libs/libindicator
-
-# Michael Orlitzky <mjo@gentoo.org> (2024-08-03)
-# Unmaintained package. Upstream is not quite _dead_, but the project
-# domain (where tarballs and documentation were hosted) was hijacked in
-# 2022 and nothing has been done about it. As a result, the version in
-# Gentoo is far out of date. Four open bugs, no interest. Removal on
-# or after 2024-09-03.
-acct-group/monkeyd
-acct-user/monkeyd
-www-servers/monkeyd
-
-# Sam James <sam@gentoo.org> (2024-08-02)
-# Unreliable software, unmaintained in Gentoo. Having it in the main
-# repositories may give users an impression of it being a safe tool.
-# Removal on 2024-09-01.
-app-backup/mkstage4
-
-# James Le Cuirot <chewi@gentoo.org> (2024-07-29)
-# Superseded by media-libs/libv4l[utils].
-# Removal on 2024-08-29. Bug #936674.
-media-tv/v4l-utils
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-07-29)
-# Lacks maintainer capacity for update version plus java dependencies.
-# A pull request for the version bump could be provided on request.
-# Removal on 2024-08-28. Bug #736076.
-media-video/bdsup2sub
-
 # Eli Schwartz <eschwartz@gentoo.org> (2024-07-29)
 # Bad version can result in failing builds. Please upgrade to 72.1.0.
 =dev-python/ensurepip-setuptools-72.0.0
 =dev-python/setuptools-72.0.0
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-07-27)
-# Stable version stuck on EAPI=6.
-# Lacks maintainer capacity for dev-lang/scala.
-# Removal on 2024-08-26.  Bugs #932012, #932737, #933607.
-dev-lang/scala
-dev-lang/mozart
-dev-lang/mozart-stdlib
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2024-07-27)
-# EAPI=6 package, awaits version bump.
-# Removal on 2024-08-26.  Bug #936756.
-www-apps/rt
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2024-07-27)
-# EAPI=6, awaits version bump. This is *-macos prefix only package, so
-# hard to verify EAPI bump without the maintainer.
-# Removal on 2024-08-26.  Bug #936755.
-dev-debug/gdb-apple
-
 # Alfred Wingate <parona@protonmail.com> (2024-07-24)
 # Includes change that breaks firewalld notably.
 #
@@ -172,56 +404,6 @@ dev-debug/gdb-apple
 # https://lore.kernel.org/netfilter-devel/Zp7FqL_YK3p_dQ8B@egarver-mac/
 =net-firewall/nftables-1.1.0
 
-# Sam James <sam@gentoo.org> (2024-07-24)
-# Fails to build with GCC 15, several open bugs
-# including test failures. Unpackaged by others.
-# Removal on 2024-08-23.  Bug #936581.
-app-accessibility/epos
-
-# David Seifert <soap@gentoo.org> (2024-07-22)
-# Unmaintained, replaced by app-portage/pram which has more features
-# and works better for merging PRs. Removal on 2024-08-21.
-dev-perl/Gentoo-App-Pram
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-07-21)
-# No more revdeps after net-libs/telepathy-accounts-signon last-rites.
-# Removal on 2024-08-20.
-net-libs/libsignon-glib
-
-# Hans de Graaff <graaff@gentoo.org> (2024-07-21)
-# Obsolete slots that are no longer used by any cucumber
-# version. Removal on 2024-08-21.
-dev-util/cucumber-core:10
-dev-util/cucumber-cucumber-expressions:16
-dev-util/cucumber-gherking:22
-dev-util/cucumber-html-formatter:20
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2024-07-20)
-# EAPI=6, fails to apply patch during src_prepare.
-# Removal on 2024-08-19.  Bugs #936398, #908957, #908959.
-media-video/raspberrypi-omxplayer
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2024-07-19)
-# EAPI=6 games. Feel free to drop any package after bumping it's EAPI.
-# Removal on 2024-08-18.  Bug #936299.
-games-arcade/sdl-sopwith
-games-arcade/syobon
-games-arcade/wop
-games-mud/crystal
-games-mud/gmudix
-games-mud/kildclient
-games-puzzle/color-lines
-games-puzzle/hangman
-games-puzzle/scramble
-games-puzzle/zaz
-games-simulation/cannonsmash
-games-strategy/crimson
-
-# Hans de Graaff <graaff@gentoo.org> (2024-07-17)
-# Obsolete slot. Please use a newer slot instead. No reverse
-# dependencies left. Removal on 2024-08-17.
-dev-ruby/rmagick:4
-
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2024-07-07)
 # New major ffmpeg version. Tracker bug #928905.
 >=media-video/ffmpeg-7.0
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
index c7843ea3d55c..ab2b27c9ac44 100644
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ b/profiles/prefix/sunos/solaris/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2024-08-20)
+# quic code fails to compile, seems Linux minded
+net-misc/curl http3 quic curl_quic_openssl
+
 # Fabian Groffen <grobian@gentoo.org> (2024-07-21)
 # Python integration breaks over C++ standards conflict(s) that Python
 # headers try to change
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 3b95670e238e..bf979c47c3e1 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -358,42 +358,42 @@ mips		default/linux/mips/17.0/mipsel/multilib/n32			exp
 mips		default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr	exp
 mips		default/linux/mips/17.0/mipsel/multilib/n64			exp
 mips		default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr	exp
-mips		default/linux/mips/23.0/mipsel/o32_sf				exp
-mips		default/linux/mips/23.0/mipsel/o32_sf/systemd			exp
-mips		default/linux/mips/23.0/mipsel/o32				exp
-mips		default/linux/mips/23.0/mipsel/o32/systemd			exp
-mips		default/linux/mips/23.0/mipsel/n32				exp
-mips		default/linux/mips/23.0/mipsel/n32/systemd			exp
-mips		default/linux/mips/23.0/mipsel/n64				exp
-mips		default/linux/mips/23.0/mipsel/n64/systemd			exp
-mips		default/linux/mips/23.0/mipsel/multilib/n32			exp
-mips		default/linux/mips/23.0/mipsel/multilib/n32/systemd		exp
-mips		default/linux/mips/23.0/mipsel/multilib/n64			exp
-mips		default/linux/mips/23.0/mipsel/multilib/n64/systemd		exp
-mips		default/linux/mips/23.0/o32_sf					exp
-mips		default/linux/mips/23.0/o32_sf/systemd				exp
-mips		default/linux/mips/23.0/o32					exp
-mips		default/linux/mips/23.0/o32/systemd				exp
-mips		default/linux/mips/23.0/n32					exp
-mips		default/linux/mips/23.0/n32/systemd				exp
-mips		default/linux/mips/23.0/n64					exp
-mips		default/linux/mips/23.0/n64/systemd				exp
-mips		default/linux/mips/23.0/multilib/n32				exp
-mips		default/linux/mips/23.0/multilib/n32/systemd			exp
-mips		default/linux/mips/23.0/multilib/n64				exp
-mips		default/linux/mips/23.0/multilib/n64/systemd			exp
-mips		default/linux/mips/23.0/split-usr/mipsel/o32_sf			exp
-mips		default/linux/mips/23.0/split-usr/mipsel/o32			exp
-mips		default/linux/mips/23.0/split-usr/mipsel/n32			exp
-mips		default/linux/mips/23.0/split-usr/mipsel/n64			exp
-mips		default/linux/mips/23.0/split-usr/mipsel/multilib/n32		exp
-mips		default/linux/mips/23.0/split-usr/mipsel/multilib/n64		exp
-mips		default/linux/mips/23.0/split-usr/o32_sf			exp
-mips		default/linux/mips/23.0/split-usr/o32				exp
-mips		default/linux/mips/23.0/split-usr/n32				exp
-mips		default/linux/mips/23.0/split-usr/n64				exp
-mips		default/linux/mips/23.0/split-usr/multilib/n32			exp
-mips		default/linux/mips/23.0/split-usr/multilib/n64			exp
+mips		default/linux/mips/23.0/mipsel/o32_sf				stable
+mips		default/linux/mips/23.0/mipsel/o32_sf/systemd			stable
+mips		default/linux/mips/23.0/mipsel/o32				stable
+mips		default/linux/mips/23.0/mipsel/o32/systemd			stable
+mips		default/linux/mips/23.0/mipsel/n32				stable
+mips		default/linux/mips/23.0/mipsel/n32/systemd			stable
+mips		default/linux/mips/23.0/mipsel/n64				stable
+mips		default/linux/mips/23.0/mipsel/n64/systemd			stable
+mips		default/linux/mips/23.0/mipsel/multilib/n32			dev
+mips		default/linux/mips/23.0/mipsel/multilib/n32/systemd		dev
+mips		default/linux/mips/23.0/mipsel/multilib/n64			dev
+mips		default/linux/mips/23.0/mipsel/multilib/n64/systemd		dev
+mips		default/linux/mips/23.0/o32_sf					stable
+mips		default/linux/mips/23.0/o32_sf/systemd				stable
+mips		default/linux/mips/23.0/o32					stable
+mips		default/linux/mips/23.0/o32/systemd				stable
+mips		default/linux/mips/23.0/n32					stable
+mips		default/linux/mips/23.0/n32/systemd				stable
+mips		default/linux/mips/23.0/n64					stable
+mips		default/linux/mips/23.0/n64/systemd				stable
+mips		default/linux/mips/23.0/multilib/n32				dev
+mips		default/linux/mips/23.0/multilib/n32/systemd			dev
+mips		default/linux/mips/23.0/multilib/n64				dev
+mips		default/linux/mips/23.0/multilib/n64/systemd			dev
+mips		default/linux/mips/23.0/split-usr/mipsel/o32_sf			dev
+mips		default/linux/mips/23.0/split-usr/mipsel/o32			dev
+mips		default/linux/mips/23.0/split-usr/mipsel/n32			dev
+mips		default/linux/mips/23.0/split-usr/mipsel/n64			stable
+mips		default/linux/mips/23.0/split-usr/mipsel/multilib/n32		dev
+mips		default/linux/mips/23.0/split-usr/mipsel/multilib/n64		dev
+mips		default/linux/mips/23.0/split-usr/o32_sf			dev
+mips		default/linux/mips/23.0/split-usr/o32				dev
+mips		default/linux/mips/23.0/split-usr/n32				dev
+mips		default/linux/mips/23.0/split-usr/n64				stable
+mips		default/linux/mips/23.0/split-usr/multilib/n32			dev
+mips		default/linux/mips/23.0/split-usr/multilib/n64			dev
 
 
 # PPC profiles
@@ -654,9 +654,9 @@ mips		default/linux/mips/17.0/o32/musl				exp
 mips		default/linux/mips/17.0/n64/musl				exp
 mips		default/linux/mips/17.0/mipsel/o32/musl				exp
 mips		default/linux/mips/17.0/mipsel/n64/musl				exp
-mips		default/linux/mips/23.0/mipsel/o32/musl				exp
+mips		default/linux/mips/23.0/mipsel/o32/musl				dev
 mips		default/linux/mips/23.0/mipsel/n64/musl				exp
-mips		default/linux/mips/23.0/o32/musl				exp
+mips		default/linux/mips/23.0/o32/musl				dev
 mips		default/linux/mips/23.0/n64/musl				exp
 mips		default/linux/mips/23.0/split-usr/mipsel/o32/musl		exp
 mips		default/linux/mips/23.0/split-usr/mipsel/n64/musl		exp
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 3cba94431b41..02e4f168b0a1 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qml qt6 qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 0822e94248e9..82330969f098 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 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
+net-p2p/transmission -qt5
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-03-07)
 # Required by kde-frameworks/kio:6
 dev-qt/qtbase libproxy
diff --git a/profiles/targets/desktop/plasma/make.defaults b/profiles/targets/desktop/plasma/make.defaults
index 62e625bbfdcb..7f42ef98fc5b 100644
--- a/profiles/targets/desktop/plasma/make.defaults
+++ b/profiles/targets/desktop/plasma/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="activities declarative dri kde kwallet networkmanager pipewire plasma policykit pulseaudio qml screencast semantic-desktop wayland widgets"
+USE="activities declarative dri kde kwallet networkmanager pipewire plasma policykit pulseaudio screencast semantic-desktop wayland widgets"
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index ae28b8b9cf94..711d8c19c351 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,24 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Resolve conflict between Plasma 6 and KDevelop 24.05
->=dev-util/kdevelop-24.05.1:5 -plasma
-
-# Sam James <sam@gentoo.org> (2024-06-13)
-# Needed by dependencies of KDE Plasma and KDE Gear
-app-crypt/gpgme qt6
-app-crypt/pinentry qt6
-app-crypt/qca qt6
-app-text/poppler qt6
-dev-libs/qtkeychain qt6
-media-libs/phonon qt6
-media-libs/phonon-vlc qt6
-net-libs/accounts-qml qt6
-net-libs/accounts-qt qt6
-net-libs/signond qt6
-net-libs/signon-oauth2 qt6
-sys-auth/polkit-qt qt6
-
 # Alfred Wingate <parona@protonmail.com> (2023-12-25)
 # Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X )
 >=media-tv/kodi-20.2 wayland -X
@@ -47,9 +29,6 @@ dev-python/pyside6 webchannel
 # Required by sys-apps/flatpak, a dependency of kde-plasma/discover
 dev-util/ostree curl
 
-# Required by <net-im/neochat-23.08.50
-dev-qt/qtmultimedia:5 gstreamer
-
 # Required by app-editors/okteta:5
 dev-qt/qtscript:5 scripttools
 
@@ -59,6 +38,9 @@ dev-qt/qtsql:5 mysql
 # Enable by default, requires kde-frameworks/kwayland
 kde-apps/yakuake absolute-position
 
+# Required by kde-plasma/plasma-workspace, in ksmserver
+kde-plasma/kde-cli-tools kdesu
+
 # Required by kde-frameworks/kapidox
 media-gfx/graphviz python
 
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 761222bbafeb..05eb97ac02e0 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -7,7 +7,6 @@ move app-doc/psmark app-text/psmark
 move app-doc/xmltoman app-text/xmltoman
 move app-doc/zeal app-text/zeal
 move sys-devel/gdb dev-debug/gdb
-move sys-devel/gdb-apple dev-debug/gdb-apple
 move dev-util/lldb dev-debug/lldb
 move dev-util/cgdb dev-debug/cgdb
 move dev-util/ninja dev-build/ninja
diff --git a/profiles/updates/3Q-2024 b/profiles/updates/3Q-2024
index 109dd8d735b0..a216d62bb6b1 100644
--- a/profiles/updates/3Q-2024
+++ b/profiles/updates/3Q-2024
@@ -2,3 +2,6 @@ move sci-libs/rtree dev-python/rtree
 move dev-python/mapbox_earcut dev-python/mapbox-earcut
 move dev-qt/kdsingleapplication dev-libs/kdsingleapplication
 slotmove dev-util/kdevelop-pg-qt 5 0
+move dev-python/parse_type dev-python/parse-type
+slotmove app-admin/calamares 5 0
+slotmove x11-misc/kronometer 5 0
diff --git a/sci-astronomy/sirilic/sirilic-1.15.9.ebuild b/sci-astronomy/sirilic/sirilic-1.15.9.ebuild
index dd5dcb825cc7..8a430cca043d 100644
--- a/sci-astronomy/sirilic/sirilic-1.15.9.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.15.9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/sci-biology/amap/amap-2.2-r5.ebuild b/sci-biology/amap/amap-2.2-r5.ebuild
deleted file mode 100644
index 949749969c27..000000000000
--- a/sci-biology/amap/amap-2.2-r5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-opt-2 java-ant-2 toolchain-funcs
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="Protein multiple-alignment-based sequence annealing"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://baboon.math.berkeley.edu/${PN}/download/${MY_P}.tar.gz"
-S="${WORKDIR}/${PN}-align"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="java"
-
-RDEPEND="java? ( >=virtual/jre-1.8:* )"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-includes.patch
-)
-
-src_prepare() {
-	default
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C align
-
-	if use java; then
-		pushd display >/dev/null || die
-		eant -Ddisplay all || die
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	dobin align/${PN}
-
-	dodoc align/{README,PROBCONS.README}
-
-	insinto /usr/share/${PN}
-	doins -r examples
-
-	if use java; then
-		java-pkg_newjar display/AmapDisplay.jar amapdisplay.jar
-		java-pkg_dolauncher amapdisplay --jar amapdisplay.jar
-	fi
-}
diff --git a/sci-biology/amap/amap-2.2-r6.ebuild b/sci-biology/amap/amap-2.2-r6.ebuild
new file mode 100644
index 000000000000..487616726fc4
--- /dev/null
+++ b/sci-biology/amap/amap-2.2-r6.ebuild
@@ -0,0 +1,55 @@
+# 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-opt-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Protein multiple-alignment-based sequence annealing"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://baboon.math.berkeley.edu/amap/download/${P/-/.}.tar.gz"
+S="${WORKDIR}/amap-align"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="java"
+
+DEPEND="java? ( >=virtual/jdk-1.8:* )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
+
+DOCS=( align/{README,PROBCONS.README} )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-includes.patch
+)
+
+src_prepare() {
+	default
+	use java && java-pkg-opt-2_src_prepare && java-pkg_clean
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C align
+	if use java; then
+		JAVA_JAR_FILENAME="amapdisplay.jar"
+		JAVA_SRC_DIR="display/src"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	dobin align/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r examples
+
+	use java && java-pkg-simple_src_install
+}
diff --git a/sci-biology/fasta/Manifest b/sci-biology/fasta/Manifest
index c0bd97106d3a..8144c91b5e78 100644
--- a/sci-biology/fasta/Manifest
+++ b/sci-biology/fasta/Manifest
@@ -1 +1,2 @@
 DIST fasta-36.3.8h.tar.gz 1257682 BLAKE2B e6bd9087563150355fed6edf52a24a0b31ef0658b1e95c3df6d5b5711fc4d137ddd773fb8b3b2fa82fe3f5c310689b2f89668f5b51654eed41ed71f9ef140f99 SHA512 30d160ad083a605397c6c35d2b28f6064cd96f51f99b3664b424ec1dbbbd09772c72e89731a7257306ab58c4ad4b877e229873abd0e09407c64fae643bc04391
+DIST fasta-36.3.8i.tar.gz 1402674 BLAKE2B 5653ae18d38a8f99ac1a76235ebad7189faeaacf9a043ab81ec56036e851d45fcc47435413f81f989efc6dfbccd6e3235c9cd14a6f129719d978ffc69e5def0f SHA512 6f34bd1a5f74362fd569d9c8e7ca7c9fcb0648ea7e861c3d0b54bbdc32ba0caad4beb2aad204122178ee6bcefd579d824412a863163050c305da0a661d55c234
diff --git a/sci-biology/fasta/fasta-36.3.8h-r1.ebuild b/sci-biology/fasta/fasta-36.3.8h-r1.ebuild
index 1cd7ca60dcde..b811765e502e 100644
--- a/sci-biology/fasta/fasta-36.3.8h-r1.ebuild
+++ b/sci-biology/fasta/fasta-36.3.8h-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,10 +15,7 @@ S="${WORKDIR}/${PN}36-${MY_PV}"
 LICENSE="fasta"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="debug cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-shells/tcsh )"
+IUSE="debug cpu_flags_x86_sse2"
 
 src_prepare() {
 	CC_ALT=
@@ -45,6 +42,11 @@ src_prepare() {
 	export CC_ALT="${CC_ALT}"
 	export ALT="${ALT}"
 
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/862267
+	# https://github.com/wrpearson/fasta36/issues/63
+	filter-lto
+
 	eapply "${FILESDIR}"/${P}-ldflags.patch
 
 	sed \
diff --git a/sci-biology/fasta/fasta-36.3.8i.ebuild b/sci-biology/fasta/fasta-36.3.8i.ebuild
new file mode 100644
index 000000000000..6363b4b56f2d
--- /dev/null
+++ b/sci-biology/fasta/fasta-36.3.8i.ebuild
@@ -0,0 +1,81 @@
+# 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_PV="${PV}_14-Nov-2020"
+
+DESCRIPTION="FASTA is a DNA and Protein sequence alignment software package"
+HOMEPAGE="https://fasta.bioch.virginia.edu/fasta_www2/fasta_down.shtml"
+SRC_URI="https://github.com/wrpearson/fasta36/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}36-${MY_PV}"
+
+LICENSE="fasta"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="debug cpu_flags_x86_sse2"
+
+src_prepare() {
+	CC_ALT=
+	CFLAGS_ALT=
+	ALT=
+
+	use debug && append-flags -DDEBUG
+
+	if [[ "$(tc-getCC)" == *icc* ]]; then
+		CC_ALT=icc
+		ALT="${ALT}_icc"
+	else
+		CC_ALT="$(tc-getCC)"
+		use x86 && ALT="32"
+		use amd64 && ALT="64"
+	fi
+
+	if use cpu_flags_x86_sse2 ; then
+		ALT="${ALT}_sse2"
+		append-flags -msse2
+		[[ "$(tc-getCC)" == *icc* ]] || append-flags -ffast-math
+	fi
+
+	export CC_ALT="${CC_ALT}"
+	export ALT="${ALT}"
+
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/862267
+	# https://github.com/wrpearson/fasta36/issues/63
+	filter-lto
+
+	sed \
+		-e 's:-ffast-math::g' \
+		-i make/Makefile* || die
+
+	eapply_user
+}
+
+src_compile() {
+	emake -C src -f ../make/Makefile.linux${ALT} CC="${CC_ALT} ${CFLAGS}" HFLAGS="${LDFLAGS}" all
+}
+
+src_test() {
+	cd test || die
+	FASTLIBS="../conf" bash test.sh || die
+}
+
+src_install() {
+	dobin bin/*
+
+	pushd bin >/dev/null || die
+		local i
+		for i in *36; do
+			dosym ${i} /usr/bin/${i%36}
+		done
+	popd >/dev/null || die
+
+	insinto /usr/share/${PN}
+	doins -r conf/. data seq
+
+	doman doc/{prss3.1,fasta36.1,fasts3.1,fastf3.1,ps_lav.1,map_db.1}
+	dodoc FASTA_LIST README* doc/{README*,readme*,fasta*,changes*}
+}
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index e9f5245f83e7..8009bee745eb 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,3 +1,4 @@
 DIST bc-6.5.0.tar.xz 461380 BLAKE2B e4aa633162d03fc5723e967ba81f985ab1b16e47b3c9a3ca1c32e9a717db682ce88cc6ba453d5e9b09539dcb8ddbb258b7b7dbdd2e27279355e3c35028d56130 SHA512 1cb03038d828a0b10734c29931777add8b22f194c507b8ff538ec1aa52a2a97a4ac2733d72cdb0710fdc6937807074e929f7918c56aaf5be8fbe908ea7c5a401
 DIST bc-6.7.5.tar.xz 468572 BLAKE2B 3942cfbbc2b8a307bc24b9f7c3e037bce374bd17332b236a8c76ccacef1177e36669b7f61944a5c5791b0a436dec171991cfc821526865a816fba91e65aa1f04 SHA512 5f689fd20801ea7ede725ae5dc4e8744bdf2d72424bffef99c53193a950f4bd83b6eb4c5a07556576d0b3f5b6cd7f9fc7cbcb41d27891f488bb2e97a186f76a4
-DIST bc-6.7.6.tar.xz 473104 BLAKE2B 447cf15d94e8800ad81d734efef5a6b4dfdc4930eeb0bff3a4c093e31d65a8449cf3e685af077ae3397a1a730c4345fb7e95c82446d09b692f4fd6ef6e90ea88 SHA512 418ce61e8151a548627b794692325f48c68f8cedca7a0cb8d896bb74510f55b33486214af0af1b160c1f387f3d034300dff6fbc29c2d44d7b304a7a37c3c478b
+DIST bc-7.0.0.tar.xz 474468 BLAKE2B 2905f96639558a7f1203a0f63207f26b5e4cb75a91c4b848a4ef7f0313dfaa698499f948eb7ecdbc5eb3fcd0bd3ecf8c2f005256e48a58615fa8b69ec19932ae SHA512 ef89525eea8773dddb7efd3dd33f589de287ac807b772480e884bd666f29b2b0b362c999029cc6d82733f830195ca3f6fd867f15190fbcbf807ddbc4b24abb65
+DIST bc-7.0.1.tar.xz 474272 BLAKE2B ed83854828a917c5e5cdfcb46d2b0a2769f937c45cb454533ad42c3037331fcf4a668acaffb11acde733f587270d121ed3f6677f50b751de25835bd9b267f63a SHA512 376ef1b4a72a64ee114ee5a835ea36ad4f26fdd06662df2db387e645c7ab86b49b019461928e891455daeae9afddb496959c4b2aebeafb1b37051c379c62a888
diff --git a/sci-calculators/bc-gh/bc-gh-6.7.6.ebuild b/sci-calculators/bc-gh/bc-gh-7.0.0.ebuild
index f60e406b8630..f60e406b8630 100644
--- a/sci-calculators/bc-gh/bc-gh-6.7.6.ebuild
+++ b/sci-calculators/bc-gh/bc-gh-7.0.0.ebuild
diff --git a/sci-calculators/bc-gh/bc-gh-7.0.1.ebuild b/sci-calculators/bc-gh/bc-gh-7.0.1.ebuild
new file mode 100644
index 000000000000..f60e406b8630
--- /dev/null
+++ b/sci-calculators/bc-gh/bc-gh-7.0.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+MY_P="bc-${PV}"
+DESCRIPTION="Implementation of POSIX bc with GNU extensions"
+HOMEPAGE="
+	https://git.gavinhoward.com/gavin/bc/
+	https://github.com/gavinhoward/bc/
+"
+SRC_URI="
+	https://github.com/gavinhoward/bc/releases/download/${PV}/${MY_P}.tar.xz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="libedit readline"
+
+DEPEND="
+	!readline? (
+		libedit? ( dev-libs/libedit:= )
+	)
+	readline? (
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	local myconf=(
+		# GNU and BSD bc's have slightly different behavior. This bc can act
+		# like both, changing at runtime with environment variables, but it
+		# needs defaults, which can be set at compile time. This option sets all
+		# of the defaults to match the GNU bc/dc since it's common on Linux.
+		-pGNU
+		# A lot of test results are generated first by a bc compatible with the
+		# GNU bc. If there is no GNU bc installed, then those tests should be
+		# skipped. That's what this option does. Without it, we would have a
+		# dependency cycle. Those tests are super long, anyway.
+		-G
+		# Disables the automatic stripping of binaries.
+		-T
+		# Enables installing all locales, which is important for packages.
+		-l
+		# Disables some "problematic" tests that need specific options on Linux
+		# to not trigger the OOM killer because malloc() lies.
+		-P
+	)
+	if use readline ; then
+		myconf+=( -r )
+	elif use libedit ; then
+		myconf+=( -e )
+	fi
+
+	local -x EXECSUFFIX="-gh"
+	local -x PREFIX="${EPREFIX}/usr"
+	edo ./configure.sh "${myconf[@]}"
+}
+
+src_test() {
+	# This is to fix a bug encountered on Arch. It is to ensure we don't get
+	# segfaults on `make check` when the error messages change because the error
+	# messages are passed to printf(); they have format specifiers. With these
+	# env vars, the internal error messages are used, instead of the installed
+	# locales, which might be different since the new locale files are not
+	# installed yet. (It is impossible to use uninstalled locales because of the
+	# poor design of POSIX locales.)
+	env LANG=C LC_ALL=C emake check
+}
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index df2ab42fa581..6aff2fea8746 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -4,3 +4,4 @@ DIST qalculate-gtk-4.7.0.tar.gz 2836490 BLAKE2B cee9bf916d5b70fb82353a04b6dce9cb
 DIST qalculate-gtk-4.8.0.tar.gz 2811851 BLAKE2B 9b6631ea66c3d464d1ef1328f008776273f540c96b716e8ddd490257e4d4a4db96ff9200e082a47d31996ef80f481bc87b0e6542dd2e2b577d2b829f6bf02709 SHA512 afba53c3b317ea65775b60c285032f016470074c39a03e294fbd1b34dc6f8e406b026fb3827ad6dc56d577544cb8dafe4ce62bf17405cfef1c74ab5fb5cbc168
 DIST qalculate-gtk-4.8.1.tar.gz 2812660 BLAKE2B 9ea4861a28562f8f352e9fc99453b6ff2b64c5289ddc65801b2a39aacf5ced17521e7f6320c4e9c89b24a932fd638176406644e472ebc0a3f3c8370d5e911b3d SHA512 8891ec7e46015c12abe0bc68110fe5d9df1c14853af71194c1909cc9cd70d27fe63b29fe9a713431ca00e6529e0429b68c9b466c216cf4e40053724f471227ef
 DIST qalculate-gtk-5.0.0.tar.gz 2855414 BLAKE2B 8e1af78d23ec5fb31ae1eb121e4536436add15a4a2d797b574d6f9efa8137b37e2734cda56d64a2a3887fb2a0cb385697c53cc0061e41caf1a1109e15e8dd22e SHA512 69fb158c50c3bdfe7e72f9c4ee6412575ccde43a64a3a1f4760d9c12337d0f8f54cb91636dc95e94133178f0b10efd7a065bf683797e22b683a78a3c40c78c59
+DIST qalculate-gtk-5.2.0.tar.gz 2902354 BLAKE2B b52433538edb3c7840cf094ac56ebfcc6880ea704fd64e142af9c3965b0ccaadfa8ed7d764cce3a7d9d47d8cd620b685246e59ac5461160512b8eef7141cf092 SHA512 e65e8cd5ad505e2f20a1f917a831381cbb69a0b086e8e371685e918b8638a766f6f80be5420e73da6fcf347dc96c5bbf7fced6e694311b13b533a9bf279814c0
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-5.2.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-5.2.0.ebuild
new file mode 100644
index 000000000000..ac030f7c5630
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-5.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 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 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
+}
diff --git a/sci-calculators/qalculate-qt/Manifest b/sci-calculators/qalculate-qt/Manifest
index a9a0b0140720..db58ddf57f51 100644
--- a/sci-calculators/qalculate-qt/Manifest
+++ b/sci-calculators/qalculate-qt/Manifest
@@ -1,3 +1,4 @@
 DIST qalculate-qt-4.8.0.tar.gz 1304320 BLAKE2B 586ae62f1408d71187eb371cc91e08a8ee9733a86ac1de98aa55c14bcc5c67a8c884e9dcdaeb651b26b287e0794e08630e90aadf55e9cb858c7a28ea0f6d2b00 SHA512 a980f65048b3469521e8eedacee370ebab26505a67e5493a64f1d18aab6f65a83f9031a8827bd27c299154b34e2f2e65cf1357348c52e210105db92677935ec7
 DIST qalculate-qt-4.8.1.tar.gz 1332134 BLAKE2B 983cb8fe7c9c8732078a6c88570cf728ea2ef1c1b91d080b91070105c43a049987422fd3e7bdd680bec7de732d810dec533c4dce7935201da58f9c36a60d6fa6 SHA512 b1776b57ec268648a2375b3b5f94b7b3c01cccc3deb68ab57c0471200d7cfd1f94df7263d1be400d8af7e1f030aae34b828749a8f8b73cb51850d572c6d018e3
 DIST qalculate-qt-5.0.0.tar.gz 1747001 BLAKE2B fd91dce2e349a74f0f3aa2faf5eb5f8ce68be32b82804ecd6568297bcb53514a4750ad65a3167d3c78f025474e5552f281b85e9dfb30bf3a4418b6cb3c19f412 SHA512 8ad34952004ab46582642db685242a9922fd63db13256feaf70fdf2ea413f77b49fd4a65a860a19e2db6eea9215d237873da4f59b2e0dc00827fcaca90ac6de7
+DIST qalculate-qt-5.2.0.tar.gz 1763726 BLAKE2B a3d93e7740063b95ce19ff0006b11b15a38cdd5e8888e41dbf11ea896d016c8c9e1ccc56c90dc7c262852431b72332818ae39ec92f585839d97db64730cc08a1 SHA512 a25dbe16f29ad047f42c601729fdc1e79cd12f526975b358c1838085513c8fb7d70c313e258876b465a871eea0804ab6ea56e9c34eb6d9c01784a4f67f6cc6af
diff --git a/sci-calculators/qalculate-qt/qalculate-qt-5.2.0.ebuild b/sci-calculators/qalculate-qt/qalculate-qt-5.2.0.ebuild
new file mode 100644
index 000000000000..f8afc04e42b7
--- /dev/null
+++ b/sci-calculators/qalculate-qt/qalculate-qt-5.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022-2024 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 qmake-utils
+
+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/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	>=sci-libs/libqalculate-${PV}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_prepare() {
+	default
+	eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}
diff --git a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
index f785669fe7f4..c536575112e8 100644
--- a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,6 +39,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/927389
+	#
+	# Unmaintained fortran code, no bug report.
+	filter-lto
+
 	econf --disable-static
 }
 
diff --git a/sci-chemistry/pymol/pymol-3.0.0.ebuild b/sci-chemistry/pymol/pymol-3.0.0.ebuild
index 150f7732d930..b6ec9fbef1e3 100644
--- a/sci-chemistry/pymol/pymol-3.0.0.ebuild
+++ b/sci-chemistry/pymol/pymol-3.0.0.ebuild
@@ -26,19 +26,20 @@ IUSE="+netcdf web"
 DEPEND="
 	dev-cpp/msgpack-cxx
 	dev-libs/mmtf-cpp
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pmw[${PYTHON_USEDEP}]
+	sys-libs/zlib
 	media-libs/freetype:2
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
 	netcdf? ( sci-libs/netcdf:0= )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
+	media-video/mpeg-tools
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+	dev-python/pmw[${PYTHON_USEDEP}]
 	sci-chemistry/chemical-mime-data
 "
 
@@ -66,6 +67,11 @@ python_prepare_all() {
 }
 
 python_configure_all() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/933235
+	# https://github.com/schrodinger/pymol-open-source/issues/395
+	filter-lto
+
 	use !netcdf && DISTUTILS_ARGS=( --no-vmd-plugins )
 }
 
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index e69dd5a5d142..496b50235c75 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,2 +1 @@
-DIST ghdl-4.0.0.tar.gz 7683124 BLAKE2B 2b43f1a24c9fb30f754ae6326b21fd52991f3bd69fc1c2dfbd3064d950cef74f7e66f2a846778e6429fbfae07d349f913993d91c52ec53cdad894b06f810cb03 SHA512 95b08274f2ed54556fbe2e72ce52605d9ca8269b535306348d25a259615a0610b59a61fb4458e0c1e548570361af15d45d89941bf4ab4afd2fafb10b07e69cae
 DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703
diff --git a/sci-electronics/ghdl/ghdl-4.0.0-r1.ebuild b/sci-electronics/ghdl/ghdl-4.0.0-r1.ebuild
deleted file mode 100644
index 7fb1396f35c1..000000000000
--- a/sci-electronics/ghdl/ghdl-4.0.0-r1.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
-
-ADA_COMPAT=( gnat_2021 gcc_13 )
-LLVM_MAX_SLOT=17        # Check "configure" script for supported LLVM versions.
-
-inherit ada edo llvm toolchain-funcs
-
-DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87"
-HOMEPAGE="https://ghdl.github.io/ghdl/
-	https://github.com/ghdl/ghdl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/ghdl/${PN}.git"
-else
-	SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="llvm"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-RDEPEND="
-	${ADA_DEPS}
-	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
-
-pkg_setup() {
-	ada_pkg_setup
-
-	use llvm && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local -a myconf=(
-		# Build.
-		--disable-werror
-
-		# Install location.
-		--libdir=$(get_libdir)
-		--prefix=/usr
-
-		# Features.
-		--enable-libghdl
-		--enable-synth
-	)
-
-	if use llvm ; then
-		myconf+=( --with-llvm-config=llvm-config )
-	fi
-
-	# Not a autotools script!
-	edo sh ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	patchelf --set-soname libghw.so lib/libghw.so || die
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
diff --git a/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild b/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..ab07376f8f4f
--- /dev/null
+++ b/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_13 )
+LLVM_COMPAT=( {16..17} )        # Check configure script for supported LLVM versions.
+
+inherit ada edo llvm-r1 toolchain-funcs
+
+DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87"
+HOMEPAGE="https://ghdl.github.io/ghdl/
+	https://github.com/ghdl/ghdl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ghdl/${PN}.git"
+else
+	SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="llvm +static-libs"
+
+# The LLVM backend requires static libraries to work, see bug: https://bugs.gentoo.org/938171
+REQUIRED_USE="${ADA_REQUIRED_USE} llvm? ( static-libs )"
+
+RDEPEND="
+	${ADA_DEPS}
+	llvm? (
+		$(llvm_gen_dep '
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/patchelf
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
+
+pkg_setup() {
+	ada_pkg_setup
+
+	use llvm && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local -a myconf=(
+		# Build.
+		--disable-werror
+
+		# Install location.
+		--libdir=$(get_libdir)
+		--prefix="/usr"
+
+		# Features.
+		--enable-libghdl
+		--enable-synth
+	)
+
+	if use llvm ; then
+		myconf+=(
+			--with-llvm-config="llvm-config"
+		)
+	fi
+
+	# Not a autotools script!
+	edo sh ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	patchelf --set-soname libghw.so lib/libghw.so || die
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+}
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index fe31bed80039..54c056353961 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,3 +1,4 @@
 DIST kicad-footprints-7.0.10.tar.bz2 24478270 BLAKE2B dd12467ba7bad3f0ab44164ea4ef6502f44143ec66173d5dadba62ab60559c0e75c4f77d00436ba2f7e1f0b527ae94cd0954fdd568031d049fbb69de56f13c0c SHA512 23fe7018f0f7328dc3d55e9f206d7ee4f4734be768d7024291b9d22c0134f1b887be5baf74fd601454e89a9a282aa9c0ad0ff631f5d29ec2ccac1c30b4dc1b66
 DIST kicad-footprints-7.0.11.tar.bz2 22722611 BLAKE2B f081eee0d8d2f9c691d7326dbc0a2edd329e027ae6602927f87e2e3c645fed1ba008e634a9043710ce552a94b01c28ac88461b83b97b26c225ad901af8535f21 SHA512 0786c08674432d797c7f98a05917ba22cfff4353e7b0e9007d61078cf6f5fc8ddf832e1a1e4d74788c9bf51fe9280ceae2c6051fce2253b5ba31b0a0f74d4511
 DIST kicad-footprints-8.0.3.tar.bz2 26585619 BLAKE2B ee9383770b4ebcab5cbf7576c71d71694c05760525267167923c3f8dd4d075c87d13402190455f9e7134815ea36ae8ca0fd84b51317f31120e816950cf42db15 SHA512 f61e56a4519708da19f9850f3102a0efbf73ebf276f821c1fc9f57d88f01ac7454002a32b8da7912bdfa2a4c5264254fad5d579329ea5eaf147ef2aade23ecc6
+DIST kicad-footprints-8.0.4.tar.bz2 26603867 BLAKE2B bf4e653cf25dd856985796f3f408648e98858a13afc6ed86a670d796abedba6fd291501f46e904fd1709f5553b678472e524110626126b3a0190b5e74f6b73cb SHA512 61191c33b07ffde61768befa9f2eaa32084a431cf1d5ac240e7e2c6c36b1129fae8e69f99dd3dd314c0f75c6ea7617eda2db5b564783079cf3e4f8a3ba781276
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild
index 7882a2e18c3c..57eb68c43c79 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-8.0.4.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-8.0.4.ebuild
new file mode 100644
index 000000000000..7882a2e18c3c
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-8.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-8.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+#	 x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild b/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild
index e47e613dc36e..5f2feada06fa 100644
--- a/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kicad.org"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 IUSE="doc minimal"
 
diff --git a/sci-electronics/kicad-meta/kicad-meta-8.0.4.ebuild b/sci-electronics/kicad-meta/kicad-meta-8.0.4.ebuild
new file mode 100644
index 000000000000..e47e613dc36e
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-8.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+IUSE="doc minimal"
+
+RDEPEND="
+	>=sci-electronics/kicad-${PV}
+	>=sci-electronics/kicad-symbols-${PV}
+	>=sci-electronics/kicad-footprints-${PV}
+	doc? (
+		>=app-doc/kicad-doc-${PV}
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-${PV}
+		>=sci-electronics/kicad-templates-${PV}
+	)
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index b44cd9fc4ede..c93efb943211 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,3 +1,4 @@
 DIST kicad-packages3d-7.0.10.tar.bz2 773216530 BLAKE2B f45da926aa4621999c166014d6b578ace2b355343b1cf84db26f82084f27f50fd31ec1f76c91486958e6e15f353b0eac647e9251980c03f2b5522838edab5133 SHA512 c1ecf8ccb2f1e70d5981345e1f40bad6a09f1ccae4b5d67d3af3442699a3e99b6ff1a50b07a7530f6fe69d8070bd38138202f2903961afe239f11d99e1b1dd8b
 DIST kicad-packages3d-7.0.11.tar.bz2 774735333 BLAKE2B af24617db4864b4630413132a0cc5643356ea1069f095b52f157083de8d7c4800e47847ff81379669ed2584bf8c5175e54d2cf6df9fe657bcbbe151af9529ea6 SHA512 7eb3699d79a2bff0369bd610fce20c7f128e7b650d7ce5082d28ab2b3683487ef7275c3b8e1927fdddda169917a0550304b563824c5f24f9b731d3ae04727fc6
 DIST kicad-packages3d-8.0.3.tar.bz2 785569695 BLAKE2B 7e8a125e37873b0bc4b0ff64e5d331f0c74ebd0e6611d30f2a6f2732fea9b67552ae3ac4de6466d2c64ed21c7af02f80186ad9370c0d97aabb82cb2cb663a76b SHA512 60192eba5413cc76d84f4065420fb8a01a80cb9b5cbfb58ba197ebe10befbdd33d9d4ccb75d33c45de791a8fc635bd1225aaf38ad61c5f1a3ce99d03376e44a0
+DIST kicad-packages3d-8.0.4.tar.bz2 785528686 BLAKE2B 7bdb20482a7c91f35541d0023931b45525a0d894e363c073b3cfed5b3ec9a1c8094791d7b070138a7cffe6b78189408bac5138e1d7d740a4543e6ac9d5ee76ef SHA512 258bdbe2c6048c790003c1879c75bd8b1e13e626444a2cfd8832afb7b55be01f8e45f3a050024be2855ea43d6150dd155c7659a25e9fcdf54c28fbc07092e5b1
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild
index d4b12654f757..b2f360802e81 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${PN/3d/3D}-${PV}"
 
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.4.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.4.ebuild
new file mode 100644
index 000000000000..d4b12654f757
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN/3d/3D}-${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-8.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 81df553803b1..5e0a14be3ce9 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,3 +1,4 @@
 DIST kicad-symbols-7.0.10.tar.bz2 3119612 BLAKE2B b5957fe4168bd325f7628110ccac1c40d24891c07d8b9618f8c7b1c3c612afd2e1efff82357ca1f4259e7dd06c1a11abf18f29e0e4b1dd8e531b9a80c94f5d8b SHA512 dd9b80a88a8ed10bb42c921f5d56ce4e82e2349b64a23e08f2d75d0903073e2e5132bce63d23d0b71116775392994dd5292742874e87b81bdb2b726f6c4c09f0
 DIST kicad-symbols-7.0.11.tar.bz2 3369887 BLAKE2B a32be647927ea56e5f806a38983001ed31e22495b3e6dd5c63f3f0b69c84c2efdbcc8c5d18aa6ee8060242f1b0ea5c96ca0f2e7c7a98a4cb8c4f69eec1985ae7 SHA512 16e2dc478500f5b7baff0e5205530d14bc5969b2b1cdf7158995f194c7984025edc54c6a3b460ebc352dec1d3eb01e28474b027aa8994adc6958e3d014018263
 DIST kicad-symbols-8.0.3.tar.bz2 3671038 BLAKE2B 6a76254b87ae14efd0d8e7edf2569755be902f16ef567c5b4bdd12b9c3e75a7a94437942e4affce378467daaa433d2ddb22fe32f7e39e5a60bd52e91faff23e2 SHA512 60ac5249281e783eae58d368b6521dbb5f0ef524a2be81d04b9578e6540baacf597300b5ac67566d2f91befbf67366eb8bb6cd0036b8773ecd753d91f5ab6cf8
+DIST kicad-symbols-8.0.4.tar.bz2 3672987 BLAKE2B 26a10b4acc9c89898221b02d4716f33790da2f6c896a6f4bad1e93eaac99323fad71c9de11065ee9392f6f7f42caaeafcc0f929271bbfee893ddd077c297205a SHA512 5a7d2c04db1953e515c6b008bb48692d2dce9cbbb883fb16cb81ef8189c44d359757ea53a1cfdbbf480e9cdeb6d7d0cd6c1b243523d189543611c2d9584fb8b5
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild
index 4cea180f1254..5b10fa6c38b2 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-8.0.4.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-8.0.4.ebuild
new file mode 100644
index 000000000000..4cea180f1254
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-8.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-8.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 22c1b0e4ac7b..fcfb1e9ed182 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,3 +1,4 @@
 DIST kicad-templates-7.0.10.tar.bz2 1347681 BLAKE2B 0a6b2d06d257a21f32b1d5a5dfb90cf6f84f589b498faf292f0799a14dac8088482d9fa2a6cd55b2c3f9a145795cfeeb19e43b4a376ace22bab4f781fdba08ef SHA512 ee073bb615edb501075c703f60d4ba8015b489fb416d4a7709e552950904fc29b7c1dd32dd6edee2edf766d15cd1fe385c96c5d859ef89498abbb30714dcb919
 DIST kicad-templates-7.0.11.tar.bz2 1348043 BLAKE2B 8aa60440fb2344dbcf2336ed78694a5f07bc167475b0a75ff1095c3b72407feaa2a453bfb8a199529ae48d96bcd005f48b83e38dff1f7ea51005c45f0b8be6a9 SHA512 02248755e4b2cba8e496eb9e8349f6e5a88e11d95afbffae6dd87e423615c50744dc3f47b138ea253bb4b06d5c853d34d1980dadd7e18abbecbd7c032c7d0290
 DIST kicad-templates-8.0.3.tar.bz2 2783001 BLAKE2B 96c51de6dcecc371bb7b7ddef4807a95eb14d87459ec7b65f55bf79f6d4cda926f95a75bdda66b468e4f512b7f17b179f58cb307c69af9337e450f675071bf0e SHA512 267ffd98a1b18392257b7f35b938420f36da5022c40e5b86da18cb96636cbf71b52b62f2f4a70eae066c89751803f2a9fadb5f4f99940879e6da2eacac97787c
+DIST kicad-templates-8.0.4.tar.bz2 2783175 BLAKE2B bd419b26e4ddff95de3e5af7d0bd6c53d54b8560e2e5a95a80585a93ec8dc3b82e26dfe48ce75962060aaeb84a7026bf5906280c946c68daee53bd7196a27656 SHA512 2cf72f160e2aa9600703afc3efbd2a72c64519db7121cf355278062aa4cc3e35e09f07024b36266b67496abfc30785ccda2a25589c77bfae58c7e2ea993ad067
diff --git a/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild b/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild
index 56a84f2bc09a..e7f55b5f0e86 100644
--- a/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-8.0.4.ebuild b/sci-electronics/kicad-templates/kicad-templates-8.0.4.ebuild
new file mode 100644
index 000000000000..56a84f2bc09a
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-8.0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-8.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 408edc5dd6f3..5b1fad841a20 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,3 +1,4 @@
 DIST kicad-7.0.10.tar.bz2 43991960 BLAKE2B 3e21f575e41a6036ff2a9c3ab17472e51c73612ddadbf88631717b43024e604a8607fff013828823ff4db4d4263ac8e3bcc3b069e3efdfdc66fdb627f60f192a SHA512 f8005e6cb685c4cdc3982eec644f6d4a115138eaa19ca0bd2e6ae07613eac9c98fd7cdc181dd83e6c6d3c4b73ff6a54261ac5448a2a9c53298bc611c1bf408e1
 DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e942269c0c14950bb6b3413fb616af74a1b4e7095fc746e20125096f7d2e4c7a9f271dd58918b22fa53e8ce7b78fa6f6 SHA512 28d5560ead989dcfb6d3b07e37443de3bf1883bd56604ae20f70c0a068504fd8745f7011507d417f487b86071cec130ac8eb7bda7513d096e78dcc3dc98585aa
 DIST kicad-8.0.3.tar.bz2 72936035 BLAKE2B 667d6bc2e3a3f7ccc7a22a63d22702e6886404a86bca6ca2acdd5181c7046995332bb70f1fca9d25b20d9a7e1a9545488d00fb8d2ca70fd479a989ccea6c856f SHA512 14921827120381e749d094d2a76c850d2bee394c496859df3f4550a32b678a9523199a745e199f7c874ef85b2e8279129578e666c16932fbbcb1ba98c4e62b34
+DIST kicad-8.0.4.tar.bz2 72958676 BLAKE2B 756970ea920e8951d76a53596b46ca83b904e50f50474f03b2efa1aad815092c819b5ad144717bfeba7c778cd3fd18fc2f082beaf47e88a51f9acc575e8aaac2 SHA512 b490cd201b79388ca9ba771363043373034f036cc73e520cf1c4cf9c011dfd25a5e9c3eee8a7bfe23521193cd44f6c28aaf3e270e8444e7ba75dff62e6a74f1e
diff --git a/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch b/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch
deleted file mode 100644
index d2523993e6fe..000000000000
--- a/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Huang Rui <vowstar@gmail.com>
-Date: Fri, 22 Mar 2024 18:18:40 +0800
-Subject: [PATCH] libgit2-1.8.0 compatibility: adjusted parent pointer type
-
-- Adjusted parent pointer type in git_commit_create call for compatibility
-  with libgit2 1.8.0 and above.
-- Included preprocessor checks to maintain support for versions older than
-  1.8.0.
-- Ensures consistent function behavior across different libgit2 versions.
-
-Fixes https://gitlab.com/kicad/code/kicad/-/issues/17536
-Signed-off-by: Huang Rui <vowstar@gmail.com>
----
- kicad/project_tree_pane.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/kicad/project_tree_pane.cpp
-+++ b/kicad/project_tree_pane.cpp
-@@ -2233,7 +2233,14 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
-         }
- 
-         git_oid           oid;
-+    // Check if the libgit2 library version is 1.8.0 or higher
-+#if ( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 )
-+        // For libgit2 version 1.8.0 and above
-+        git_commit* const parents[1] = { parent };
-+#else
-+        // For libgit2 versions older than 1.8.0
-         const git_commit* parents[1] = { parent };
-+#endif
- 
-         if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr, commit_msg.mb_str(), tree,
-                            1, parents ) != 0 )
--- 
-2.44.0
-
diff --git a/sci-electronics/kicad/kicad-7.0.10-r1.ebuild b/sci-electronics/kicad/kicad-7.0.10-r1.ebuild
new file mode 100644
index 000000000000..b73e214f39f2
--- /dev/null
+++ b/sci-electronics/kicad/kicad-7.0.10-r1.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..11} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples nls openmp test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
+COMMON_DEPEND="
+	dev-db/unixODBC
+	dev-libs/boost:=[context,nls]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
+	<sci-libs/opencascade-7.8.0:0=
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	>sci-electronics/ngspice-27[shared]
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	nls? (
+		sys-devel/gettext
+	)
+	test? (
+		media-gfx/cairosvg
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-4.0
+	doc? ( app-text/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="1500M"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=OFF
+
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+
+		-DKICAD_BUILD_QA_TESTS="$(usex test)"
+	)
+
+	setup-wxwidgets
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
+	dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	dodoc doxygen/eagle-plugin-notes.txt
+
+	if use doc ; then
+		cd doxygen || die
+		dodoc -r out/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-7.0.10.ebuild b/sci-electronics/kicad/kicad-7.0.10.ebuild
deleted file mode 100644
index 01d0cff6c0d7..000000000000
--- a/sci-electronics/kicad/kicad-7.0.10.ebuild
+++ /dev/null
@@ -1,176 +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} )
-WX_GTK_VER="3.2-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.org"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-	fi
-fi
-
-# BSD for bundled pybind
-LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
-SLOT="0"
-IUSE="doc examples nls openmp test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# Contains bundled pybind but it's patched for wx
-# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
-COMMON_DEPEND="
-	dev-db/unixODBC
-	dev-libs/boost:=[context,nls]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	net-misc/curl
-	>=sci-libs/opencascade-7.3.0:0=
-	<sci-libs/opencascade-7.8.0:0=
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	>sci-electronics/ngspice-27[shared]
-	sys-libs/zlib
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	nls? (
-		sys-devel/gettext
-	)
-	test? (
-		media-gfx/cairosvg
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-4.0
-	doc? ( app-text/doxygen )"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi
-
-CHECKREQS_DISK_BUILD="1500M"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.0-werror.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-
-		-DKICAD_SCRIPTING_WXPYTHON=ON
-		-DKICAD_USE_EGL=OFF
-
-		-DKICAD_BUILD_I18N="$(usex nls)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
-
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-
-		-DKICAD_BUILD_QA_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doxygen-docs
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
-	dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
-
-	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
-	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dodoc doxygen/eagle-plugin-notes.txt
-
-	if use doc ; then
-		cd doxygen || die
-		dodoc -r out/html/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-7.0.11-r1.ebuild b/sci-electronics/kicad/kicad-7.0.11-r1.ebuild
new file mode 100644
index 000000000000..009383220d05
--- /dev/null
+++ b/sci-electronics/kicad/kicad-7.0.11-r1.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..11} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples nls openmp test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
+COMMON_DEPEND="
+	dev-db/unixODBC
+	dev-libs/boost:=[context,nls]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
+	<sci-libs/opencascade-7.8.0:0=
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	>sci-electronics/ngspice-27[shared]
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	nls? (
+		sys-devel/gettext
+	)
+	test? (
+		media-gfx/cairosvg
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-4.0
+	doc? ( app-text/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="1500M"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=OFF
+
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+
+		-DKICAD_BUILD_QA_TESTS="$(usex test)"
+	)
+
+	setup-wxwidgets
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
+	dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	dodoc doxygen/eagle-plugin-notes.txt
+
+	if use doc ; then
+		cd doxygen || die
+		dodoc -r out/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-7.0.11.ebuild b/sci-electronics/kicad/kicad-7.0.11.ebuild
deleted file mode 100644
index 6048013c238d..000000000000
--- a/sci-electronics/kicad/kicad-7.0.11.ebuild
+++ /dev/null
@@ -1,176 +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} )
-WX_GTK_VER="3.2-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.org"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	fi
-fi
-
-# BSD for bundled pybind
-LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
-SLOT="0"
-IUSE="doc examples nls openmp test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# Contains bundled pybind but it's patched for wx
-# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
-COMMON_DEPEND="
-	dev-db/unixODBC
-	dev-libs/boost:=[context,nls]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	net-misc/curl
-	>=sci-libs/opencascade-7.3.0:0=
-	<sci-libs/opencascade-7.8.0:0=
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	>sci-electronics/ngspice-27[shared]
-	sys-libs/zlib
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	nls? (
-		sys-devel/gettext
-	)
-	test? (
-		media-gfx/cairosvg
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-4.0
-	doc? ( app-text/doxygen )"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi
-
-CHECKREQS_DISK_BUILD="1500M"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.0-werror.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-
-		-DKICAD_SCRIPTING_WXPYTHON=ON
-		-DKICAD_USE_EGL=OFF
-
-		-DKICAD_BUILD_I18N="$(usex nls)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
-
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-
-		-DKICAD_BUILD_QA_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doxygen-docs
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
-	dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
-
-	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
-	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dodoc doxygen/eagle-plugin-notes.txt
-
-	if use doc ; then
-		cd doxygen || die
-		dodoc -r out/html/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-8.0.3-r1.ebuild b/sci-electronics/kicad/kicad-8.0.3-r1.ebuild
new file mode 100644
index 000000000000..185f4e17db69
--- /dev/null
+++ b/sci-electronics/kicad/kicad-8.0.3-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples nls openmp test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
+COMMON_DEPEND="
+	app-crypt/libsecret
+	dev-db/unixODBC
+	dev-libs/boost:=[context,nls]
+	dev-libs/libgit2:=
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.5.0:0=
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	>sci-electronics/ngspice-27[shared]
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	nls? (
+		sys-devel/gettext
+	)
+	test? (
+		media-gfx/cairosvg
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-4.0
+	doc? ( app-text/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="1500M"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.3-gcc15-cstdint.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_prepare() {
+	filter-lto # Bug 927482
+	cmake_src_prepare
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=OFF
+
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+
+		-DKICAD_SPICE_QA="$(usex test)"
+		-DKICAD_BUILD_QA_TESTS="$(usex test)"
+	)
+
+	setup-wxwidgets
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	export CMAKE_SKIP_TESTS=(
+		qa_pcbnew
+		qa_cli
+	)
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \
+		cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	dodoc doxygen/eagle-plugin-notes.txt
+
+	if use doc ; then
+		cd doxygen || die
+		dodoc -r out/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-8.0.3.ebuild b/sci-electronics/kicad/kicad-8.0.3.ebuild
deleted file mode 100644
index 44f6f4cffb87..000000000000
--- a/sci-electronics/kicad/kicad-8.0.3.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-WX_GTK_VER="3.2-gtk3"
-
-inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	fi
-fi
-
-# BSD for bundled pybind
-LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
-SLOT="0"
-IUSE="doc examples nls openmp test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# Contains bundled pybind but it's patched for wx
-# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
-COMMON_DEPEND="
-	app-crypt/libsecret
-	dev-db/unixODBC
-	dev-libs/boost:=[context,nls]
-	dev-libs/libgit2:=
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	net-misc/curl
-	>=sci-libs/opencascade-7.5.0:0=
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	>sci-electronics/ngspice-27[shared]
-	sys-libs/zlib
-	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	nls? (
-		sys-devel/gettext
-	)
-	test? (
-		media-gfx/cairosvg
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-4.0
-	doc? ( app-text/doxygen )"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi
-
-CHECKREQS_DISK_BUILD="1500M"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.3-gcc15-cstdint.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-}
-
-src_prepare() {
-	filter-lto # Bug 927482
-	cmake_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-
-		-DKICAD_SCRIPTING_WXPYTHON=ON
-		-DKICAD_USE_EGL=OFF
-
-		-DKICAD_BUILD_I18N="$(usex nls)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
-
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-
-		-DKICAD_SPICE_QA="$(usex test)"
-		-DKICAD_BUILD_QA_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doxygen-docs
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
-	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
-
-	export CMAKE_SKIP_TESTS=(
-		qa_pcbnew
-		qa_cli
-	)
-
-	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
-	LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \
-		cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dodoc doxygen/eagle-plugin-notes.txt
-
-	if use doc ; then
-		cd doxygen || die
-		dodoc -r out/html/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-8.0.4.ebuild b/sci-electronics/kicad/kicad-8.0.4.ebuild
new file mode 100644
index 000000000000..4cbb09a09b4b
--- /dev/null
+++ b/sci-electronics/kicad/kicad-8.0.4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples nls openmp test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120
+COMMON_DEPEND="
+	app-crypt/libsecret
+	dev-db/unixODBC
+	dev-libs/boost:=[context,nls]
+	dev-libs/libgit2:=
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.5.0:0=
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	>sci-electronics/ngspice-27[shared]
+	sys-libs/zlib
+	>=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		>=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	nls? (
+		sys-devel/gettext
+	)
+	test? (
+		media-gfx/cairosvg
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-4.0
+	doc? ( app-text/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="1500M"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.3-gcc15-cstdint.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_prepare() {
+	filter-lto # Bug 927482
+	cmake_src_prepare
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=OFF
+
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+
+		-DKICAD_SPICE_QA="$(usex test)"
+		-DKICAD_BUILD_QA_TESTS="$(usex test)"
+	)
+
+	setup-wxwidgets
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	mkdir -p "${BUILD_DIR}/qa/eeschema/" || die
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	export CMAKE_SKIP_TESTS=(
+		qa_cli
+	)
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \
+		cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	dodoc doxygen/eagle-plugin-notes.txt
+
+	if use doc ; then
+		cd doxygen || die
+		dodoc -r out/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 2e01abb50361..b213eb0e1df5 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,3 +1 @@
-DIST librepcb-0.1.7-source.zip 13112342 BLAKE2B 53b6dad94febee84b60df1d848936f44093698c9965d4b24815395ff564a5634ab84f38574e7a1b6891f2cdd99b5162eb3747bbfdde2dfc2d680cff76a4e1cc1 SHA512 285ad661b9c528b1aa05c9a0482034af26e9344eb08a119ffabbadf518957a9784ccb9582bcfabcf5bf8982c33b6286b39722c0d59072df983925b3949b3e6c5
-DIST librepcb-1.0.0-source.zip 14000096 BLAKE2B 5b78bb0bd32de78207a95916bc7a7ff85b58f3b4b67e6faf9180bae852ce11416ac3740c04eb30b57073a21eb24d8041136e1ef17f5614e3f7d340e7b813b03d SHA512 7bc056be37fd39d873f6a40cf04c529e95dfc2b69d1cc8246ccbba0932a67c0f017e939c206cf0656b4657cb5c99c10c7e19b9dc4969d54d0a80014029da9439
 DIST librepcb-1.1.0-source.zip 15373750 BLAKE2B 6f8ba8d66b95373e4760aae617b423e71fcb89ceb39703ce4547a390e4ad0630866632d9bad01f93780fdb8c3452ec0424e753ef891402e440686c64eba56495 SHA512 2ca02095d89547e17813fcfeadedd48fb9345d177885c9d21a8d313d864c6f02243eb13a33341c474bc0671a66ef6b00b6329760aeb3439fdb10123f2db9d38b
diff --git a/sci-electronics/librepcb/librepcb-0.1.7.ebuild b/sci-electronics/librepcb/librepcb-0.1.7.ebuild
deleted file mode 100644
index c2752d3b0f23..000000000000
--- a/sci-electronics/librepcb/librepcb-0.1.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2009-2022 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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5"
-
-RDEPEND="
-	dev-cpp/muParser:=
-	dev-libs/quazip:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5"
-
-src_configure() {
-	local mycmakeargs+=(
-		-DUNBUNDLE_QUAZIP=ON
-		-DUNBUNDLE_MUPARSER=ON )
-	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: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.0.0-r2.ebuild b/sci-electronics/librepcb/librepcb-1.0.0-r2.ebuild
deleted file mode 100644
index cdee44faf323..000000000000
--- a/sci-electronics/librepcb/librepcb-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2009-2024 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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="opencascade"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5"
-
-RDEPEND="
-	dev-cpp/muParser:=
-	dev-libs/quazip:=[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	opencascade? ( sci-libs/opencascade:= )
-	sys-libs/zlib
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-src_configure() {
-	local mycmakeargs+=(
-		-DUSE_OPENCASCADE=$(usex opencascade 1 0)
-		-DUNBUNDLE_QUAZIP=ON
-		-DUNBUNDLE_MUPARSER=ON )
-	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.1.0-r1.ebuild b/sci-electronics/librepcb/librepcb-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..26ffe3cc6261
--- /dev/null
+++ b/sci-electronics/librepcb/librepcb-1.1.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2009-2024 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 qt6"
+
+BDEPEND="
+	app-arch/unzip
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )"
+
+RDEPEND="
+	dev-cpp/muParser:=
+	!qt6? (
+		dev-libs/quazip:=[qt5(+)]
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		dev-libs/quazip:=[qt6(-)]
+		dev-qt/qtbase[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets]
+		dev-qt/qtdeclarative:6
+		dev-qt/qtsvg:6
+	)
+	opencascade? ( sci-libs/opencascade:= )
+	media-libs/libglvnd[X]
+	sys-libs/zlib
+	virtual/glu"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+	!qt6? ( dev-qt/qttest:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DQT_MAJOR_VERSION=$(usex qt6 6 5)
+		-DUNBUNDLE_GTEST=ON
+		-DUNBUNDLE_MUPARSER=ON
+		-DUNBUNDLE_QUAZIP=ON
+		-DUSE_OPENCASCADE=$(usex opencascade 1 0) )
+	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.1.0.ebuild b/sci-electronics/librepcb/librepcb-1.1.0.ebuild
deleted file mode 100644
index 8e3488865a8b..000000000000
--- a/sci-electronics/librepcb/librepcb-1.1.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2009-2024 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 qt6"
-
-BDEPEND="
-	app-arch/unzip
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )"
-
-RDEPEND="
-	dev-cpp/muParser:=
-	!qt6? (
-		dev-libs/quazip:=[qt5(+)]
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		dev-libs/quazip:=[qt6(-)]
-		dev-qt/qtbase[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets]
-		dev-qt/qtdeclarative:6
-		dev-qt/qtsvg:6
-	)
-	opencascade? ( sci-libs/opencascade:= )
-	sys-libs/zlib
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	!qt6? ( dev-qt/qttest:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DQT_MAJOR_VERSION=$(usex qt6 6 5)
-		-DUNBUNDLE_GTEST=ON
-		-DUNBUNDLE_MUPARSER=ON
-		-DUNBUNDLE_QUAZIP=ON
-		-DUSE_OPENCASCADE=$(usex opencascade 1 0) )
-	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/nvc/Manifest b/sci-electronics/nvc/Manifest
index 9b901bac015d..5108a188c853 100644
--- a/sci-electronics/nvc/Manifest
+++ b/sci-electronics/nvc/Manifest
@@ -1,3 +1,2 @@
-DIST nvc-1.13.0.tar.gz 1961847 BLAKE2B 5cb2e99baeb0c190ccd83535f7a5114327410b80339448eb50188147f2160a0320edaa612579c77327d7b67d51c7e312ebed6ac07bfe3ab636b3322baf050f53 SHA512 c93fa48dda45de734dafa996eda0b924f11c497feeee5e19b49be22594dcd9324abfe2e1d31c706f2d058950cd2525af46a3aa5ac61506628c3dc7af73685a39
-DIST nvc-1.13.1.tar.gz 1958325 BLAKE2B 13b8a6fdb330b23d0a6fbf26b6ba770f15d66a1c62c4491b42b0ed4aa5acc8be580f8617f313c79accef94c12f9890162d49e3997bb405dcc4c1db0564c8a940 SHA512 49ac03c5c404b899061a5a45650561fe5e60f48d89afde733a315c0d2e6e5cad00db136864d161eab7c2aa375f8d880b520d8cc744e8b2ec984096b91d3aafad
 DIST nvc-1.13.2.tar.gz 1960586 BLAKE2B 6cd7a362690be61ef9fa16bf59cc03ffa6abcc95d6e8fa28e3f5b80e732a61a6507f6fd8569111dfdd961c924adb06856b351c33140c5d989e0e8d461a081f84 SHA512 8d81949bbf8b89475ffec5729b9009203fef0c2116be4ce644dc2dc1d3ebb3158dc597f2dc7a9ac8f5fb9c5114ea01403a787964c3820091731942d95beb35bf
+DIST nvc-1.13.3.tar.gz 1963182 BLAKE2B c03cb06b8e94e6d5c139ec4da17d6665cb5ce899fabe0ffe60459681aad329ddf9ac6ad9082515e3be76fd32aad56a6c0c89c02c0f22a55ea15a8a3a9e61e763 SHA512 c65904762081429660998f59ec25fbbdc8084a7472be06bad99e42457f5eca5516a65f472a8960cbd9dc0b0a6f5ccfa0d6a8b3d238805ab0120c046bbe56ff3b
diff --git a/sci-electronics/nvc/nvc-1.13.0.ebuild b/sci-electronics/nvc/nvc-1.13.0.ebuild
deleted file mode 100644
index dd4ecc425726..000000000000
--- a/sci-electronics/nvc/nvc-1.13.0.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
-
-LLVM_MAX_SLOT=16
-
-inherit autotools bash-completion-r1 llvm
-
-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? (
-		<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-libs/check
-	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_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-verilog
-		--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/nvc/nvc-1.13.1.ebuild b/sci-electronics/nvc/nvc-1.13.3.ebuild
index 7beab1f0813a..7beab1f0813a 100644
--- a/sci-electronics/nvc/nvc-1.13.1.ebuild
+++ b/sci-electronics/nvc/nvc-1.13.3.ebuild
diff --git a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
index 6d68a3f229f6..0b5446455b34 100644
--- a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -6,7 +6,7 @@ EAPI="8"
 inherit cmake xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index 5def86e1cebb..f6e44dc48a2f 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -6,7 +6,7 @@ EAPI="8"
 inherit cmake xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
index 148370c0f790..9f8ce64111d0 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -6,7 +6,7 @@ EAPI="8"
 inherit xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index 148370c0f790..9f8ce64111d0 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -6,7 +6,7 @@ EAPI="8"
 inherit xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
deleted file mode 100644
index 124e05d65111..000000000000
--- a/sci-geosciences/bt747/bt747-2.1.7-r3.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 java-pkg-2 java-ant-2
-
-DESCRIPTION="MTK GPS Datalogger Device Control"
-HOMEPAGE="https://www.bt747.org"
-SRC_URI="https://downloads.sourceforge.net/project/bt747/Development/BT747_${PV}_full.zip
-	https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="1"
-KEYWORDS="~amd64"
-
-BDEPEND="app-arch/unzip:0"
-CDEPEND="
-	dev-java/commons-imaging:0
-	dev-java/jcalendar:1.2
-	dev-java/jchart2d:0
-	dev-java/jopt-simple:0
-	>=dev-java/rxtx-2.2_pre2:2
-	dev-java/swing-layout:1
-	dev-java/swingx:1.6
-	dev-java/swingx-ws:bt747
-"
-RDEPEND="${CDEPEND}
-	dev-libs/glib:2[dbus]
-	>=virtual/jre-1.8:*
-"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-"
-
-EANT_BUILD_TARGET="dist.j2se"
-EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo"
-EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	# Fix for newer jchart2d.
-	eapply "${FILESDIR}/jchart2d-3.2.patch"
-
-	# Remove all the bundled stuff.
-	rm -rv dist/ lib/ || die
-
-	# GraphicsUtilities moved in later SwingX versions.
-	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
-		src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die
-}
-
-src_install() {
-	dodoc {ChangeLog,README}.txt
-
-	java-pkg_dojar dist/*.jar
-	java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \
-		--java-args="-Xmx192m"
-
-	doicon "${DISTDIR}/${PN}.gif"
-	make_desktop_entry ${PN} BT747 bt747.gif
-}
diff --git a/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild
new file mode 100644
index 000000000000..b5b2ecc0515f
--- /dev/null
+++ b/sci-geosciences/bt747/bt747-2.1.7-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2
+
+DESCRIPTION="MTK GPS Datalogger Device Control"
+HOMEPAGE="https://www.bt747.org"
+SRC_URI="https://downloads.sourceforge.net/project/bt747/Development/BT747_${PV}_full.zip
+	https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="1"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/unzip:0
+	>=dev-java/ant-1.10.14-r3:0"
+CDEPEND="
+	dev-java/commons-imaging:0
+	dev-java/jcalendar:1.2
+	dev-java/jchart2d:0
+	dev-java/jopt-simple:0
+	>=dev-java/rxtx-2.2_pre2:2
+	dev-java/swing-layout:1
+	dev-java/swingx:1.6
+	dev-java/swingx-ws:bt747
+"
+
+# Java 11 because of compile error with 1.8
+# /var/tmp/portage/sci-geosciences/bt747-2.1.7-r3/work/build.xml:1478:
+# java.lang.NoSuchMethodError: java.nio.CharBuffer.flip()Ljava/nio/CharBuffer;
+DEPEND="${CDEPEND}
+	>=virtual/jdk-11:*
+"
+RDEPEND="${CDEPEND}
+	dev-libs/glib:2[dbus]
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( ChangeLog.txt )
+PATCHES=(
+	"${FILESDIR}/bt747-2.1.7-source-target.patch"
+	# Fix for newer jchart2d.
+	"${FILESDIR}/jchart2d-3.2.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	# Remove all the bundled stuff.
+	rm -rv dist/ lib/ || die
+
+	# GraphicsUtilities moved in later SwingX versions.
+	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
+		src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die
+
+	# EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo"
+	cat > build.properties <<-EOF || die
+		skip.proguard=yes
+		svn=true
+		svnversion=true
+		build.current.revision=Gentoo
+		ant.build.javac.source=$(java-pkg_get-source)
+		ant.build.javac.target=$(java-pkg_get-target)
+		jcalendar.jar=$(java-pkg_getjars jcalendar-1.2)
+		jchart.jar=$(java-pkg_getjars jchart2d)
+		jopt-simple.jar=$(java-pkg_getjars jopt-simple)
+		rxtxcomm.jar=$(java-pkg_getjars rxtx-2)
+		sanselan.jar=$(java-pkg_getjars commons-imaging)
+		swing-layout.jar=$(java-pkg_getjars swing-layout-1)
+		swingx.jar=$(java-pkg_getjars swingx-1.6)
+		swingx-ws.jar=$(java-pkg_getjars swingx-ws-bt747)
+	EOF
+}
+
+src_compile() {
+	eant dist.j2se
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+	java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \
+		--java-args="-Xmx192m"
+
+	doicon "${DISTDIR}/${PN}.gif"
+	make_desktop_entry ${PN} BT747 bt747.gif
+}
diff --git a/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch
new file mode 100644
index 000000000000..aa9c46751371
--- /dev/null
+++ b/sci-geosciences/bt747/files/bt747-2.1.7-source-target.patch
@@ -0,0 +1,33 @@
+Hardcoded javac options prevent configuration.
+In order to allow using -Dant.build.javac.source
+and -Dant.build.javac.target we remove them.
+
+--- a/build.xml
++++ b/build.xml
+@@ -411,7 +411,7 @@
+ 		<delete dir="${j2sebuild.dir}" />
+ 		<mkdir dir="${j2sebuild.dir}" />
+ 
+-		<javac verbose="no" srcdir="${src_j2se.dir}" destdir="${j2sebuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="j2seclasspath" encoding="iso-8859-15" target="1.5" source="1.5">
++		<javac verbose="no" srcdir="${src_j2se.dir}" destdir="${j2sebuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="j2seclasspath" encoding="iso-8859-15">
+ 			<include name="bt747/j2se_view/BT747Main.java" />
+ 			<include name="bt747/j2se_view/BT747cmd.java" />
+ 			<include name="de/k621/avr/gps/converter/NMEAConverter.java" />
+@@ -442,7 +442,7 @@
+ 		<delete dir="${wababuild.dir}" />
+ 		<mkdir dir="${wababuild.dir}" />
+ 
+-		<javac verbose="no" srcdir="${src_waba.dir}" destdir="${wababuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="wabaclasspath" encoding="iso-8859-15" target="1.5" source="1.5">
++		<javac verbose="no" srcdir="${src_waba.dir}" destdir="${wababuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="wabaclasspath" encoding="iso-8859-15">
+ 			<include name="BT747.java" />
+ 			<compilerarg line="-Xlint:unchecked" />
+ 		</javac>
+@@ -971,7 +971,7 @@
+ 				<include name="${src_j2se.dir}/**/resources/*" if="is.lib" />
+ 			</fileset>
+ 		</delete>
+-		<javac verbose="no" srcdir="${rxtxsrc.dir}" destdir="${rxtxbuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="${build.classpath}" encoding="iso-8859-15" target="1.5" source="1.5">
++		<javac verbose="no" srcdir="${rxtxsrc.dir}" destdir="${rxtxbuild.dir}" optimize="${java.optimize}" debug="${java.debug}" classpathref="${build.classpath}" encoding="iso-8859-15">
+ 			<include name="**/*.java" />
+ 		</javac>
+ 		<copy todir="${rxtxbuild.dir}">
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
index 5b61f9f33ebe..6898cab90cd3 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
 else
 	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 5b61f9f33ebe..8f8e29366683 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -12,61 +12,44 @@ MY_P="${PN}_${MY_PV}"
 DESCRIPTION="GPS waypoints, tracks and routes converter"
 HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
 else
 	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc qt6"
+IUSE="doc"
 
 BDEPEND="
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		dev-lang/perl
 		dev-libs/libxslt
 	)
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
 "
-
 RDEPEND="
 	dev-libs/expat
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[gui,network,widgets,xml]
+	dev-qt/qtserialport:6
+	dev-qt/qtwebchannel:6
+	dev-qt/qtwebengine:6[widgets]
 	sci-libs/shapelib:=
 	sys-libs/zlib:=[minizip]
 	virtual/libusb:1
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtserialport:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets,xml]
-		dev-qt/qtserialport:6
-		dev-qt/qtwebchannel:6
-		dev-qt/qtwebengine:6[widgets]
-		dev-qt/qt5compat:6
-	)
 "
-
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" )
 
 src_prepare() {
 	cmake_src_prepare
@@ -83,7 +66,7 @@ src_configure() {
 		-DGPSBABEL_MAPPREVIEW=ON
 		-DGPSBABEL_EMBED_MAP=ON
 		-DGPSBABEL_EMBED_TRANSLATIONS=ON
-		-DUSE_QT6="$(usex qt6)"
+		-DUSE_QT6=ON
 	)
 
 	cmake_src_configure
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index aaa5cf87fe30..379362cf62ee 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,2 @@
 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
 DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
-DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
index 5fa3915b850b..0871bb02df0d 100644
--- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -39,7 +39,8 @@ fi
 IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
+	opengl? ( X )
+	pdal? ( cxx )"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2.ebuild
deleted file mode 100644
index 8a3ea23d393d..000000000000
--- a/sci-geosciences/grass/grass-8.3.2.ebuild
+++ /dev/null
@@ -1,276 +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} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-
-inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-
-if [[ ${PV} =~ "9999" ]]; then
-	SLOT="0/8.3"
-else
-	SLOT="0/$(ver_cut 1-2 ${PV})"
-fi
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc ~x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:=
-	sci-libs/proj:=
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	bzip2? ( app-arch/bzip2:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	las? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	pdal? ( >=sci-libs/pdal-2.0.0:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(python_gen_cond_dep '
-			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
-			dev-python/pillow[${PYTHON_USEDEP}]
-			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
-		')
-		x11-libs/cairo[X]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-
-	# When patching the build system, avoid running autoheader here. The file
-	# config.in.h is maintained manually upstream. Changes to it may lead to
-	# undefined behavior. See bug #866554.
-	# AT_NOEAUTOHEADER=1 eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862579
-	# https://github.com/OSGeo/grass/issues/3506
-	#
-	# Do not trust it with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with bzip2 bzlib)
-		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
-		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	if use X; then
-		local GUI="--gui"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
index bd3d41da509b..9903823c07a3 100644
--- a/sci-geosciences/grass/grass-8.4.0.ebuild
+++ b/sci-geosciences/grass/grass-8.4.0.ebuild
@@ -39,7 +39,8 @@ fi
 IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
+	opengl? ( X )
+	pdal? ( cxx )"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/sci-geosciences/grass/grass-8.4.0_rc1.ebuild b/sci-geosciences/grass/grass-8.4.0_rc1.ebuild
deleted file mode 100644
index bd3d41da509b..000000000000
--- a/sci-geosciences/grass/grass-8.4.0_rc1.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-
-inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-
-if [[ ${PV} =~ "9999" ]]; then
-	SLOT="0/8.4"
-else
-	SLOT="0/$(ver_cut 1-2 ${PV})"
-fi
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:=
-	sci-libs/proj:=
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	bzip2? ( app-arch/bzip2:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	las? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	pdal? ( >=sci-libs/pdal-2.0.0:= )
-	png? ( media-libs/libpng:= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:= )
-	sqlite? ( dev-db/sqlite:3 )
-	svm? ( sci-libs/libsvm:= )
-	tiff? ( media-libs/tiff:= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(python_gen_cond_dep '
-			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
-			dev-python/pillow[${PYTHON_USEDEP}]
-			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
-		')
-		x11-libs/cairo[X]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-
-	# When patching the build system, avoid running autoheader here. The file
-	# config.in.h is maintained manually upstream. Changes to it may lead to
-	# undefined behavior. See bug #866554.
-	# AT_NOEAUTOHEADER=1 eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862579
-	# https://github.com/OSGeo/grass/issues/3506
-	#
-	# Do not trust it with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with bzip2 bzlib)
-		$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
-		$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with svm libsvm)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	if use X; then
-		local GUI="--gui"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 0844f7c7bbff..558ef152545b 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -39,7 +39,8 @@ fi
 IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
+	opengl? ( X )
+	pdal? ( cxx )"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 61cbc1c933f4..a0c22b0964c9 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,3 +1,3 @@
-DIST josm-snapshot-19096.jar 18349420 BLAKE2B 0423ccd0cad224168a1c88cc1bffb6643a65b837a9a0715aa867e0ece55d7d6d69530adb2ee32e65cc3a9364daaba0ca7a9d6edb8807e809913f145f8e554269 SHA512 6005dd32a2ca0aa1f7367b181b99d13d000d98282420d3119569b9fb148407191a1a8dccc81734b3c2e40715ee813599305dcadd5e3cf2af040ba312f75a0467
 DIST josm-snapshot-19128.jar 18376543 BLAKE2B 055d652eccfe820a7e793190dab69fb39a5961d147996a6d8bb51518d3f91df6de6989547cfbb10e7c20db86abe1bfeda800a873bd26f5d92d896a2ee8c51829 SHA512 d21f3d4bccc4a0e83c5c65fba195af2490d7f1751dcd1b3d542c69ee2edce0a99881c21b52bd7d9aed5848a667542a4e67a6dcb8a701b74531a57c75ae23dd3f
 DIST josm-snapshot-19160.jar 18236258 BLAKE2B c0650ed766476aca4ff05fc07e1630e8a524f01a3c154233e4fba76db2998a7b18b18618815c6c44c091409f3dd922cbda61ea801974e0103adbfcb7e11bf378 SHA512 a8ba54e729b3699b0a380087ba1986cfd4061380c6fe2554e950751cf4a41803c1c92b480b93b0e17a41aedf789047f67494ef0a2495b9f360963a4f9508137a
+DIST josm-snapshot-19207.jar 18348268 BLAKE2B 35d8a35b6f2ba4553784d44c6928b2d179d82fae65a98c71c859fd7bb8ce5a26510cfa784318b83f21c38e944685fec2e83e3138f5c7a6cf47229e505ab80ad3 SHA512 7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af
diff --git a/sci-geosciences/josm-bin/josm-bin-19096.ebuild b/sci-geosciences/josm-bin/josm-bin-19096.ebuild
deleted file mode 100644
index 3c2c192c743d..000000000000
--- a/sci-geosciences/josm-bin/josm-bin-19096.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
-
-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"
-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_install() {
-	java-pkg_newjar "${DISTDIR}/${A}" ${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 ${PN}.png
-		newicon -s ${icon_size} -t locolor \
-			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/josm-bin/josm-bin-19207.ebuild b/sci-geosciences/josm-bin/josm-bin-19207.ebuild
new file mode 100644
index 000000000000..6303fb8bbeed
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-19207.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 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"
+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_install() {
+	java-pkg_newjar "${DISTDIR}/${A}" ${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 ${PN}.png
+		newicon -s ${icon_size} -t locolor \
+			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
+	done
+	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 3458e0e36292..a46397a987b2 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,2 +1 @@
-DIST laszip-src-3.4.1.tar.bz2 151530 BLAKE2B 17647e458a43165d21cf3ad6fa141f5ae5d82d27d73e4e2d4098bbb72db4826f495e86e15c6985c29eb532ba2677f1c9fe1674e1d8219b451f5b0f26cba1b2e0 SHA512 3aaace2b38b61403b965ca29c8902d757d781dd5ec6aa55eb5779164a66bd340a3be9af17dfe625e77a7ffcc54579610d3ebdbfce54c42ae8ba47dbd22c8c1e7
 DIST laszip-src-3.4.3.tar.bz2 153819 BLAKE2B f23d0410ea474c50e858353ef06d9d006e091615e1a8cd26c070de81d2e12770ca64aa3281dd1348ebd372776cd951039d3fa3a60f487d0cb85dda0b19b17f4b SHA512 32635d0918201b1eb141b70bf946f06a40ef9a05d1b51429c90375382e9064e2c500574926a49ae2f6fef44c3a94329b1c305a3945f9bed2a3a92c9d63d37d74
diff --git a/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild b/sci-geosciences/laszip/laszip-3.4.1-r1.ebuild
deleted file mode 100644
index d41ac8eef3fb..000000000000
--- a/sci-geosciences/laszip/laszip-3.4.1-r1.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
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
-HOMEPAGE="https://laszip.org/"
-SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862582
-	# Fixed in newer version.
-	filter-lto
-
-	cmake_src_configure
-}
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
deleted file mode 100644
index fd0926e96b21..000000000000
--- a/sci-geosciences/laszip/laszip-3.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
-HOMEPAGE="https://laszip.org/"
-SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862582
-	# Fixed in newer version.
-	filter-lto
-
-	cmake_src_configure
-}
diff --git a/sci-geosciences/laszip/laszip-3.4.3.ebuild b/sci-geosciences/laszip/laszip-3.4.3.ebuild
index e82c9094b483..70998812675f 100644
--- a/sci-geosciences/laszip/laszip-3.4.3.ebuild
+++ b/sci-geosciences/laszip/laszip-3.4.3.ebuild
@@ -12,4 +12,4 @@ S="${WORKDIR}/${PN}-src-${PV}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 7ac053ae9167..ec2e4a7fe117 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
 DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752
diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
deleted file mode 100644
index 060fae52b9e2..000000000000
--- a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake depend.apache perl-functions python-r1 webapp
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-# NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl postgis python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the python-r1 eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/expat-2.2.8
-	dev-libs/libxml2:2=
-	dev-libs/libxslt[crypt]
-	>=dev-libs/protobuf-c-1.3.2:=
-	>=media-libs/freetype-2.9.1-r3
-	>=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
-	>=media-libs/giflib-5.2.1:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libpng-1.6.37:=
-	>=net-misc/curl-7.69.1
-	>=sci-libs/gdal-3.0.4:=[oracle?]
-	>=sci-libs/proj-6.2.1:=
-	virtual/libiconv
-	>=x11-libs/agg-2.5-r3
-	apache? (
-		app-admin/webapp-config
-		dev-libs/fcgi
-	)
-	bidi? (
-		dev-libs/fribidi
-		media-libs/harfbuzz:=
-	)
-	cairo? ( x11-libs/cairo )
-	geos? ( sci-libs/geos )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oracle? ( dev-db/oracle-instantclient:=	)
-	perl? ( dev-lang/perl:= )
-	postgis? (
-		dev-db/postgis
-		dev-db/postgresql:=
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	perl? ( >=dev-lang/swig-4.0 )
-	python? (
-		>=dev-lang/swig-4.0
-		>=dev-python/setuptools-44.1.0
-	)
-"
-
-want_apache2 apache
-
-pkg_setup() {
-	use apache && webapp_pkg_setup
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	use python && python_copy_sources
-}
-
-_generate_cmake_args() {
-	# Provides a simple, bare config for bindings to build upon
-	# Need WITH_WMS=ON or build fails
-	local args=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
-		"-DWITH_CAIRO=OFF"
-		"-DWITH_FCGI=OFF"
-		"-DWITH_FRIBIDI=OFF"
-		"-DWITH_GEOS=OFF"
-		"-DWITH_GIF=OFF"
-		"-DWITH_HARFBUZZ=OFF"
-		"-DWITH_ICONV=OFF"
-		"-DWITH_PROTOBUFC=OFF"
-		"-DWITH_POSTGIS=OFF"
-		"-DWITH_WMS=ON"
-		"-DWITH_WCS=OFF"
-		"-DWITH_WFS=OFF"
-		"-DWITH_OGCAPI=OFF"
-	)
-
-	echo "${args[@]}"
-}
-
-src_configure() {
-	# NOTE: We could make this based on _generate_cmake_args, but
-	# then we wouldn't be as-explicit about what is enabled/not,
-	# and reliant on defaults not changing.
-	# Readability and maintainability is better this way.
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
-		"-DWITH_CLIENT_WMS=ON"
-		"-DWITH_CLIENT_WFS=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_KML=ON"
-		"-DWITH_LIBXML2=ON"
-		"-DWITH_PHPNG=OFF"
-		"-DWITH_PROTOBUFC=ON"
-		"-DWITH_SOS=ON"
-		"-DWITH_WMS=ON"
-		"-DWITH_WFS=ON"
-		"-DWITH_WCS=ON"
-		"-DWITH_XMLMAPFILE=ON"
-		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
-		"-DWITH_CAIRO=$(usex cairo ON OFF)"
-		"-DWITH_FCGI=$(usex apache ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
-		"-DWITH_MYSQL=$(usex mysql ON OFF)"
-		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
-		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
-		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
-		"-DWITH_PERL=$(usex perl ON OFF)"
-	)
-
-	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
-
-	# Configure the standard build first
-	cmake_src_configure
-
-	# Minimal build for bindings
-	# Note that we use _generate_cmake_args to get a clean config each time, then add
-	# in options as appropriate. Otherwise we'd get contamination between bindings.
-	if use python ; then
-		mycmakeargs=(
-			$(_generate_cmake_args)
-			"-DWITH_PYTHON=ON"
-		)
-
-		python_foreach_impl cmake_src_configure
-		python_foreach_impl python_optimize
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python ; then
-		python_foreach_impl cmake_src_compile
-	fi
-}
-
-src_install() {
-	# Needs to be first
-	use apache && webapp_src_preinst
-
-	if use python ; then
-		python_foreach_impl cmake_src_install
-		python_foreach_impl python_optimize
-	fi
-
-	# Install this last because this build is the most "fully-featured"
-	cmake_src_install
-
-	if use apache ; then
-		# We need a mapserver symlink available in cgi-bin
-		dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
-		webapp_src_install
-	fi
-}
-
-pkg_postinst() {
-	use apache && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use apache && webapp_pkg_prerm
-}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d7ccf995079b..72a22013d4f5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273
 DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a
 DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild
deleted file mode 100644
index f0cc12843e19..000000000000
--- a/sci-geosciences/qgis/qgis-3.36.1.ebuild
+++ /dev/null
@@ -1,285 +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="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake flag-o-matic python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-	test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# At some point the dependency on qwtpolar should be
-# replaced with a dependency on qwt[polar]. Currently
-# it does not build with qwt-6.2[polar] though.
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( sci-geosciences/grass:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	pdal? ( sci-libs/pdal:= )
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git init -q || die
-			git config user.email "larry@gentoo.org" || die
-			git config user.name "Larry the Cow" || die
-			git add . || die
-			git commit -m "init" || die
-		fi
-	fi
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862660
-	# https://github.com/qgis/QGIS/issues/56859
-	#
-	# Do not trust with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=$(usex doc)
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=$(usex test)
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-		-DWITH_DRACO=OFF
-	)
-
-	# We list all supported versions *by upstream for this version*
-	# here, even if we're not allowing it (e.g. bugs for now), so
-	# we enable/disable all the right versions. This is so qgis doesn't
-	# try to automatically use a version the build system knows about.
-	local supported_grass_versions=( 7 8 )
-	if use grass; then
-		# We can do this because we have a := dep on grass &
-		# it changes subslot (ABI) when major versions change, so
-		# the logic here doesn't end up becoming stale.
-		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
-		readarray -d'.' -t v <<<"${f[2]}"
-		grassdir="grass${v[0]}${v[1]}"
-
-		GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
-		einfo "Supported versions: ${supported_grass_versions[@]}"
-		einfo "Found GRASS version: ${v[0]}*"
-
-		local known_grass_version
-		# GRASS isn't slotted (in Gentoo, anyway) so we pick
-		# the best version we can to build against, and disable the others.
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			case "${known_grass_version}" in
-				"${v[0]}")
-					einfo "GRASS version ${known_grass_version} is supported. Enabling."
-					mycmakeargs+=(
-						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
-						"-DWITH_GRASS${known_grass_version}=ON"
-					)
-					;;
-				*)
-					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
-					mycmakeargs+=(
-						"-DWITH_GRASS${known_grass_version}=OFF"
-					)
-					;;
-			esac
-		done
-	else
-		local known_grass_version
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			mycmakeargs+=(
-				"-DWITH_GRASS${known_grass_version}=OFF"
-			)
-		done
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	CMAKE_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
-		-E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)'
-
-		--output-on-failure
-	)
-
-	virtx cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.36.3.ebuild b/sci-geosciences/qgis/qgis-3.36.3.ebuild
deleted file mode 100644
index f0cc12843e19..000000000000
--- a/sci-geosciences/qgis/qgis-3.36.3.ebuild
+++ /dev/null
@@ -1,285 +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="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake flag-o-matic python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-	test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# At some point the dependency on qwtpolar should be
-# replaced with a dependency on qwt[polar]. Currently
-# it does not build with qwt-6.2[polar] though.
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( dev-qt/qt3d:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( sci-geosciences/grass:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	pdal? ( sci-libs/pdal:= )
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		')
-	)
-	qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-			dev-python/nose2[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git init -q || die
-			git config user.email "larry@gentoo.org" || die
-			git config user.name "Larry the Cow" || die
-			git add . || die
-			git commit -m "init" || die
-		fi
-	fi
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862660
-	# https://github.com/qgis/QGIS/issues/56859
-	#
-	# Do not trust with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=$(usex doc)
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=$(usex test)
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-		-DWITH_DRACO=OFF
-	)
-
-	# We list all supported versions *by upstream for this version*
-	# here, even if we're not allowing it (e.g. bugs for now), so
-	# we enable/disable all the right versions. This is so qgis doesn't
-	# try to automatically use a version the build system knows about.
-	local supported_grass_versions=( 7 8 )
-	if use grass; then
-		# We can do this because we have a := dep on grass &
-		# it changes subslot (ABI) when major versions change, so
-		# the logic here doesn't end up becoming stale.
-		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
-		readarray -d'.' -t v <<<"${f[2]}"
-		grassdir="grass${v[0]}${v[1]}"
-
-		GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
-		einfo "Supported versions: ${supported_grass_versions[@]}"
-		einfo "Found GRASS version: ${v[0]}*"
-
-		local known_grass_version
-		# GRASS isn't slotted (in Gentoo, anyway) so we pick
-		# the best version we can to build against, and disable the others.
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			case "${known_grass_version}" in
-				"${v[0]}")
-					einfo "GRASS version ${known_grass_version} is supported. Enabling."
-					mycmakeargs+=(
-						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
-						"-DWITH_GRASS${known_grass_version}=ON"
-					)
-					;;
-				*)
-					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
-					mycmakeargs+=(
-						"-DWITH_GRASS${known_grass_version}=OFF"
-					)
-					;;
-			esac
-		done
-	else
-		local known_grass_version
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			mycmakeargs+=(
-				"-DWITH_GRASS${known_grass_version}=OFF"
-			)
-		done
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	CMAKE_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
-		-E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_core_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimitedTextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)'
-
-		--output-on-failure
-	)
-
-	virtx cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild
new file mode 100644
index 000000000000..0284f8d105e8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+	inherit git-r3
+else
+	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+	KEYWORDS="~amd64"
+fi
+inherit cmake flag-o-matic python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	mapserver? ( python )
+"
+# 	test? ( postgres )
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtpositioning:6
+	dev-qt/qtserialport:6
+	dev-qt/qtsvg:6
+	dev-vcs/git
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[qt6]
+	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)]
+	3d? ( dev-qt/qt3d:6 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( sci-geosciences/grass:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	pdal? ( sci-libs/pdal:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/owslib[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sip:=[${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		python? (
+			app-text/qpdf
+			app-text/poppler[cairo,utils]
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/qttools:6[linguist]
+	app-alternatives/yacc
+	app-alternatives/lex
+	doc? ( app-text/doxygen )
+	test? (
+		python? (
+			$(python_gen_cond_dep '
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
+				dev-python/nose2[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+PATCHES=(
+	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
+	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
+	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# Tests want to be run inside a git repo
+	if [[ ${PV} != *9999* ]]; then
+		if use test; then
+			git config --global --add safe.directory "${S}" || die
+			git init -q || die
+			git config --local gc.auto 0 || die
+			git config --local user.email "larry@gentoo.org" || die
+			git config --local user.name "Larry the Cow" || die
+			git add . || die
+
+			git commit -m "init" || die
+		fi
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862660
+	# https://github.com/qgis/QGIS/issues/56859
+	#
+	# Do not trust with LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=share/man/
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+
+		# -DQWT_INCLUDE_DIR=/usr/include/qwt6
+		# -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+		# -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
+
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DBUILD_WITH_QT6=ON
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=$(usex doc)
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=$(usex test)
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GSL=$(usex georeferencer)
+		$(cmake_use_find_package hdf5 HDF5)
+		-DWITH_SERVER=$(usex mapserver)
+		$(cmake_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=ON
+		-DWITH_QTWEBENGINE=$(usex webengine)
+		-DWITH_PDAL=$(usex pdal)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=OFF
+		-DWITH_DRACO=OFF
+	)
+
+	# We list all supported versions *by upstream for this version*
+	# here, even if we're not allowing it (e.g. bugs for now), so
+	# we enable/disable all the right versions. This is so qgis doesn't
+	# try to automatically use a version the build system knows about.
+	local supported_grass_versions=( 7 8 )
+	if use grass; then
+		# We can do this because we have a := dep on grass &
+		# it changes subslot (ABI) when major versions change, so
+		# the logic here doesn't end up becoming stale.
+		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
+		readarray -d'.' -t v <<<"${f[2]}"
+		grassdir="grass${v[0]}${v[1]}"
+
+		GRASSDIR=/usr/$(get_libdir)/${grassdir}
+
+		einfo "Supported versions: ${supported_grass_versions[*]}"
+		einfo "Found GRASS version: ${v[0]}*"
+
+		local known_grass_version
+		# GRASS isn't slotted (in Gentoo, anyway) so we pick
+		# the best version we can to build against, and disable the others.
+		for known_grass_version in "${supported_grass_versions[@]}" ; do
+			case "${known_grass_version}" in
+				"${v[0]}")
+					einfo "GRASS version ${known_grass_version} is supported. Enabling."
+					mycmakeargs+=(
+						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
+						"-DWITH_GRASS${known_grass_version}=ON"
+					)
+					;;
+				*)
+					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
+					mycmakeargs+=(
+						"-DWITH_GRASS${known_grass_version}=OFF"
+					)
+					;;
+			esac
+		done
+	else
+		local known_grass_version
+		for known_grass_version in "${supported_grass_versions[@]}" ; do
+			mycmakeargs+=(
+				"-DWITH_GRASS${known_grass_version}=OFF"
+			)
+		done
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	CMAKE_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
+
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite "/proc/self/mem"
+	addwrite "/proc/self/task/"
+	addwrite "/dev/fuse"
+
+	local -x CMAKE_SKIP_TESTS=(
+		PyQgsAFSProvider$
+		PyQgsAnnotation$
+		PyQgsAuthenticationSystem$
+		PyQgsAuxiliaryStorage$
+		PyQgsBlockingNetworkRequest$
+		PyQgsBlockingProcess$
+		PyQgsCodeEditor$
+		PyQgsDataItemProviderRegistry$
+		PyQgsDelimitedTextProvider$
+		PyQgsEditWidgets$
+		PyQgsElevationProfileCanvas$
+		PyQgsEmbeddedSymbolRenderer$
+		PyQgsExternalStorageAwsS3$
+		PyQgsExternalStorageWebDav$
+		PyQgsFileDownloader$
+		PyQgsFloatingWidget$
+		PyQgsGeometryTest$
+		PyQgsGoogleMapsGeocoder$
+		PyQgsGroupLayer$
+		PyQgsLayerDefinition$
+		PyQgsLayoutHtml$
+		PyQgsLayoutLegend$
+		PyQgsLayoutMap$
+		PyQgsLineSymbolLayers$
+		PyQgsMapBoxGlStyleConverter$
+		PyQgsMapLayerComboBox$
+		PyQgsMapLayerProxyModel$
+		PyQgsMemoryProvider$
+		PyQgsNetworkAccessManager$
+		PyQgsOGRProvider$
+		PyQgsOGRProviderGpkg$
+		PyQgsPainting$
+		PyQgsPalLabelingCanvas$
+		PyQgsPalLabelingLayout$
+		PyQgsPalLabelingPlacement$
+		PyQgsPlot$
+		PyQgsPointCloudAttributeByRampRenderer$
+		PyQgsPointCloudClassifiedRenderer$
+		PyQgsPointCloudRgbRenderer$
+		PyQgsProcessExecutablePt1$
+		PyQgsProcessExecutablePt2$
+		PyQgsProcessingAlgRunner$
+		PyQgsProcessingInPlace$
+		PyQgsProcessingPackageLayersAlgorithm$
+		PyQgsProcessingParameters$
+		PyQgsProject$
+		PyQgsPythonProvider$
+		PyQgsRasterFileWriter$
+		PyQgsRasterLayer$
+		PyQgsRasterLayerRenderer$
+		PyQgsSelectiveMasking$
+		PyQgsSettings$
+		PyQgsSettingsEntry$
+		PyQgsShapefileProvider$
+		PyQgsSpatialiteProvider$
+		PyQgsStyleModel$
+		PyQgsSvgCache$
+		PyQgsSymbolLayerReadSld$
+		PyQgsTextRenderer$
+		PyQgsVectorFileWriter$
+		PyQgsVectorLayerCache$
+		PyQgsVectorLayerEditBuffer$
+		PyQgsVectorLayerEditUtils$
+		PyQgsVectorLayerProfileGenerator$
+		PyQgsWFSProvider$
+		TestQgsRandomMarkerSymbolLayer$
+		qgis_sip_uptodate$
+		test_3d_3drendering$
+		test_3d_layout3dmap$
+		test_3d_mesh3drendering$
+		test_3d_pointcloud3drendering$
+		test_3d_tessellator$
+		test_analysis_gcptransformer$
+		test_app_advanceddigitizing$
+		test_authmethod_authoauth2method$
+		test_core_mapdevicepixelratio$
+		test_core_ogcutils$
+		test_core_openclutils$
+		test_core_vectortilelayer$
+		test_gui_dockwidget$
+		test_gui_ogrprovidergui$
+
+		PyQgsDocCoverage$
+		PyQgsSipCoverage$
+	)
+
+	CMAKE_SKIP_TESTS+=(
+		test_core_blendmodes$
+		test_core_callout$
+		test_core_compositionconverter$
+		test_core_dataitem$
+		test_core_expression$
+		test_core_gdalutils$
+		test_core_labelingengine$
+		test_core_layoutmap$
+		test_core_layoutmapoverview$
+		test_core_layoutpicture$
+		test_core_linefillsymbol$
+		test_core_maprendererjob$
+		test_core_maprotation$
+		test_core_meshlayer$
+		test_core_meshlayerrenderer$
+		test_core_networkaccessmanager$
+		test_core_pointcloudlayerexporter$
+		test_core_project$
+		test_core_rastercontourrenderer$
+		test_core_rasterlayer$
+		test_core_simplemarker$
+		test_core_tiledownloadmanager$
+		test_gui_processinggui$
+		test_gui_filedownloader$
+		test_gui_newdatabasetablewidget$
+		test_gui_queryresultwidget$
+		test_analysis_processingalgspt2$
+		test_analysis_meshcontours$
+		test_analysis_triangulation$
+		test_analysis_processing$
+		test_provider_wcsprovider$
+		test_app_maptoolcircularstring$
+		test_app_vertextool$
+	)
+
+	if ! use netcdf; then
+		CMAKE_SKIP_TESTS+=(
+			test_core_gdalprovider$
+		)
+	fi
+
+	if ! use hdf5; then
+		CMAKE_SKIP_TESTS+=(
+			test_gui_meshlayerpropertiesdialog$
+			test_app_maptooleditmesh$
+		)
+	fi
+
+	if ! use python || ! use postgres; then
+		CMAKE_SKIP_TESTS+=(
+			ProcessingGrassAlgorithmsRasterTestPt2$
+			ProcessingCheckValidityAlgorithmTest$
+			ProcessingGdalAlgorithmsGeneralTest$
+			ProcessingGdalAlgorithmsRasterTest$
+			ProcessingGdalAlgorithmsVectorTest$
+			ProcessingGeneralTest$
+			ProcessingGenericAlgorithmsTest$
+			ProcessingGrassAlgorithmsImageryTest$
+			ProcessingGrassAlgorithmsRasterTestPt1$
+			ProcessingGrassAlgorithmsVectorTest$
+			ProcessingGuiTest$
+			ProcessingModelerTest$
+			ProcessingParametersTest$
+			ProcessingProjectProviderTest$
+			ProcessingQgisAlgorithmsTestPt1$
+			ProcessingQgisAlgorithmsTestPt2$
+			ProcessingQgisAlgorithmsTestPt3$
+			ProcessingQgisAlgorithmsTestPt4$
+			ProcessingQgisAlgorithmsTestPt5$
+			ProcessingQgisAlgorithmsTestPt5$
+			ProcessingScriptUtilsTest$
+			ProcessingToolsTest$
+		)
+	fi
+
+	local myctestargs=(
+		--output-on-failure
+		-j1
+	)
+
+	xdg_environment_reset
+
+	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
+	virtx cmake_src_test
+}
+
+src_install() {
+	if use test; then
+		git config --global --add safe.directory "${S}" || die
+	fi
+	cmake_src_install
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	if use python; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/qgis/python
+	fi
+
+	if use grass; then
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/sci-geosciences/qgis/qgis-3.38.0.ebuild b/sci-geosciences/qgis/qgis-3.38.0.ebuild
deleted file mode 100644
index 76526560ee61..000000000000
--- a/sci-geosciences/qgis/qgis-3.38.0.ebuild
+++ /dev/null
@@ -1,520 +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="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake flag-o-matic python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	mapserver? ( python )
-	qt6? ( polar )
-"
-# 	test? ( postgres )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/protobuf:=
-	dev-vcs/git
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	sys-libs/zlib
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( sci-geosciences/grass:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	pdal? ( sci-libs/pdal:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-			dev-python/markupsafe[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/owslib[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
-		')
-	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-		webengine? ( dev-qt/qtwebengine:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
-		dev-qt/qtmultimedia:6
-		dev-qt/qtpositioning:6
-		dev-qt/qtserialport:6
-		dev-qt/qtsvg:6
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-		webengine? ( dev-qt/qtwebengine:6 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
-	test? (
-		python? (
-			app-text/qpdf
-			app-text/poppler[cairo,utils]
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	app-alternatives/yacc
-	app-alternatives/lex
-	doc? ( app-text/doxygen )
-	test? (
-		python? (
-			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
-				dev-python/nose2[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=(
-	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
-	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
-	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests want to be run inside a git repo
-	if [[ ${PV} != *9999* ]]; then
-		if use test; then
-			git config --global --add safe.directory "${S}" || die
-			git init -q || die
-			git config --local gc.auto 0 || die
-			git config --local user.email "larry@gentoo.org" || die
-			git config --local user.name "Larry the Cow" || die
-			git add . || die
-
-			git commit -m "init" || die
-		fi
-	fi
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862660
-	# https://github.com/qgis/QGIS/issues/56859
-	#
-	# Do not trust with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-
-		# -DQWT_INCLUDE_DIR=/usr/include/qwt6
-		# -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		# -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DBUILD_WITH_QT6="$(usex qt6)"
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=$(usex doc)
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=$(usex test)
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GSL=$(usex georeferencer)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_QTWEBENGINE=$(usex webengine)
-		-DWITH_PDAL=$(usex pdal)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=OFF
-		-DWITH_DRACO=OFF
-	)
-
-	# We list all supported versions *by upstream for this version*
-	# here, even if we're not allowing it (e.g. bugs for now), so
-	# we enable/disable all the right versions. This is so qgis doesn't
-	# try to automatically use a version the build system knows about.
-	local supported_grass_versions=( 7 8 )
-	if use grass; then
-		# We can do this because we have a := dep on grass &
-		# it changes subslot (ABI) when major versions change, so
-		# the logic here doesn't end up becoming stale.
-		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
-		readarray -d'.' -t v <<<"${f[2]}"
-		grassdir="grass${v[0]}${v[1]}"
-
-		GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
-		einfo "Supported versions: ${supported_grass_versions[*]}"
-		einfo "Found GRASS version: ${v[0]}*"
-
-		local known_grass_version
-		# GRASS isn't slotted (in Gentoo, anyway) so we pick
-		# the best version we can to build against, and disable the others.
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			case "${known_grass_version}" in
-				"${v[0]}")
-					einfo "GRASS version ${known_grass_version} is supported. Enabling."
-					mycmakeargs+=(
-						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
-						"-DWITH_GRASS${known_grass_version}=ON"
-					)
-					;;
-				*)
-					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
-					mycmakeargs+=(
-						"-DWITH_GRASS${known_grass_version}=OFF"
-					)
-					;;
-			esac
-		done
-	else
-		local known_grass_version
-		for known_grass_version in "${supported_grass_versions[@]}" ; do
-			mycmakeargs+=(
-				"-DWITH_GRASS${known_grass_version}=OFF"
-			)
-		done
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	CMAKE_BUILD_TYPE=Release  # RelWithDebInfo enables debug logging
-
-	cmake_src_configure
-}
-
-src_test() {
-	addwrite "/proc/self/mem"
-	addwrite "/proc/self/task/"
-	addwrite "/dev/fuse"
-
-	local -x CMAKE_SKIP_TESTS=(
-		PyQgsAFSProvider$
-		PyQgsAnnotation$
-		PyQgsAuthenticationSystem$
-		PyQgsAuxiliaryStorage$
-		PyQgsBlockingNetworkRequest$
-		PyQgsBlockingProcess$
-		PyQgsCodeEditor$
-		PyQgsDataItemProviderRegistry$
-		PyQgsDelimitedTextProvider$
-		PyQgsEditWidgets$
-		PyQgsElevationProfileCanvas$
-		PyQgsEmbeddedSymbolRenderer$
-		PyQgsExternalStorageAwsS3$
-		PyQgsExternalStorageWebDav$
-		PyQgsFileDownloader$
-		PyQgsFloatingWidget$
-		PyQgsGeometryTest$
-		PyQgsGoogleMapsGeocoder$
-		PyQgsGroupLayer$
-		PyQgsLayerDefinition$
-		PyQgsLayoutHtml$
-		PyQgsLayoutLegend$
-		PyQgsLayoutMap$
-		PyQgsLineSymbolLayers$
-		PyQgsMapBoxGlStyleConverter$
-		PyQgsMapLayerComboBox$
-		PyQgsMapLayerProxyModel$
-		PyQgsMemoryProvider$
-		PyQgsNetworkAccessManager$
-		PyQgsOGRProvider$
-		PyQgsOGRProviderGpkg$
-		PyQgsPainting$
-		PyQgsPalLabelingCanvas$
-		PyQgsPalLabelingLayout$
-		PyQgsPalLabelingPlacement$
-		PyQgsPlot$
-		PyQgsPointCloudAttributeByRampRenderer$
-		PyQgsPointCloudClassifiedRenderer$
-		PyQgsPointCloudRgbRenderer$
-		PyQgsProcessExecutablePt1$
-		PyQgsProcessExecutablePt2$
-		PyQgsProcessingAlgRunner$
-		PyQgsProcessingInPlace$
-		PyQgsProcessingPackageLayersAlgorithm$
-		PyQgsProcessingParameters$
-		PyQgsProject$
-		PyQgsPythonProvider$
-		PyQgsRasterFileWriter$
-		PyQgsRasterLayer$
-		PyQgsRasterLayerRenderer$
-		PyQgsSelectiveMasking$
-		PyQgsSettings$
-		PyQgsSettingsEntry$
-		PyQgsShapefileProvider$
-		PyQgsSpatialiteProvider$
-		PyQgsStyleModel$
-		PyQgsSvgCache$
-		PyQgsSymbolLayerReadSld$
-		PyQgsTextRenderer$
-		PyQgsVectorFileWriter$
-		PyQgsVectorLayerCache$
-		PyQgsVectorLayerEditBuffer$
-		PyQgsVectorLayerEditUtils$
-		PyQgsVectorLayerProfileGenerator$
-		PyQgsWFSProvider$
-		TestQgsRandomMarkerSymbolLayer$
-		qgis_sip_uptodate$
-		test_3d_3drendering$
-		test_3d_layout3dmap$
-		test_3d_mesh3drendering$
-		test_3d_pointcloud3drendering$
-		test_3d_tessellator$
-		test_analysis_gcptransformer$
-		test_app_advanceddigitizing$
-		test_authmethod_authoauth2method$
-		test_core_mapdevicepixelratio$
-		test_core_ogcutils$
-		test_core_openclutils$
-		test_core_vectortilelayer$
-		test_gui_dockwidget$
-		test_gui_ogrprovidergui$
-
-		PyQgsDocCoverage$
-		PyQgsSipCoverage$
-	)
-
-	CMAKE_SKIP_TESTS+=(
-		test_core_blendmodes$
-		test_core_callout$
-		test_core_compositionconverter$
-		test_core_dataitem$
-		test_core_expression$
-		test_core_gdalutils$
-		test_core_labelingengine$
-		test_core_layoutmap$
-		test_core_layoutmapoverview$
-		test_core_layoutpicture$
-		test_core_linefillsymbol$
-		test_core_maprendererjob$
-		test_core_maprotation$
-		test_core_meshlayer$
-		test_core_meshlayerrenderer$
-		test_core_networkaccessmanager$
-		test_core_pointcloudlayerexporter$
-		test_core_project$
-		test_core_rastercontourrenderer$
-		test_core_rasterlayer$
-		test_core_simplemarker$
-		test_core_tiledownloadmanager$
-		test_gui_processinggui$
-		test_gui_filedownloader$
-		test_gui_newdatabasetablewidget$
-		test_gui_queryresultwidget$
-		test_analysis_processingalgspt2$
-		test_analysis_meshcontours$
-		test_analysis_triangulation$
-		test_analysis_processing$
-		test_provider_wcsprovider$
-		test_app_maptoolcircularstring$
-		test_app_vertextool$
-	)
-
-	if ! use netcdf; then
-		CMAKE_SKIP_TESTS+=(
-			test_core_gdalprovider$
-		)
-	fi
-
-	if ! use hdf5; then
-		CMAKE_SKIP_TESTS+=(
-			test_gui_meshlayerpropertiesdialog$
-			test_app_maptooleditmesh$
-		)
-	fi
-
-	if ! use python || ! use postgres; then
-		CMAKE_SKIP_TESTS+=(
-			ProcessingGrassAlgorithmsRasterTestPt2$
-			ProcessingCheckValidityAlgorithmTest$
-			ProcessingGdalAlgorithmsGeneralTest$
-			ProcessingGdalAlgorithmsRasterTest$
-			ProcessingGdalAlgorithmsVectorTest$
-			ProcessingGeneralTest$
-			ProcessingGenericAlgorithmsTest$
-			ProcessingGrassAlgorithmsImageryTest$
-			ProcessingGrassAlgorithmsRasterTestPt1$
-			ProcessingGrassAlgorithmsVectorTest$
-			ProcessingGuiTest$
-			ProcessingModelerTest$
-			ProcessingParametersTest$
-			ProcessingProjectProviderTest$
-			ProcessingQgisAlgorithmsTestPt1$
-			ProcessingQgisAlgorithmsTestPt2$
-			ProcessingQgisAlgorithmsTestPt3$
-			ProcessingQgisAlgorithmsTestPt4$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingQgisAlgorithmsTestPt5$
-			ProcessingScriptUtilsTest$
-			ProcessingToolsTest$
-		)
-	fi
-
-	local myctestargs=(
-		--output-on-failure
-		-j1
-	)
-
-	xdg_environment_reset
-
-	local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
-	virtx cmake_src_test
-}
-
-src_install() {
-	if use test; then
-		git config --global --add safe.directory "${S}" || die
-	fi
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 76526560ee61..0284f8d105e8 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
@@ -25,11 +25,10 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	mapserver? ( python )
-	qt6? ( polar )
 "
 # 	test? ( postgres )
 
@@ -37,11 +36,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtpositioning:6
+	dev-qt/qtserialport:6
+	dev-qt/qtsvg:6
 	dev-vcs/git
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
@@ -49,6 +56,9 @@ COMMON_DEPEND="
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
 	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[qt6]
+	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)]
+	3d? ( dev-qt/qt3d:6 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( sci-geosciences/grass:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -78,74 +88,14 @@ COMMON_DEPEND="
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
 		')
 	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-		webengine? ( dev-qt/qtwebengine:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
-		dev-qt/qtmultimedia:6
-		dev-qt/qtpositioning:6
-		dev-qt/qtserialport:6
-		dev-qt/qtsvg:6
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-		webengine? ( dev-qt/qtwebengine:6 )
-	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
 "
 DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
 	test? (
 		python? (
 			app-text/qpdf
@@ -157,20 +107,14 @@ RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
 BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
+	dev-qt/qttools:6[linguist]
 	app-alternatives/yacc
 	app-alternatives/lex
 	doc? ( app-text/doxygen )
 	test? (
 		python? (
 			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
 				dev-python/nose2[${PYTHON_USEDEP}]
 				dev-python/mock[${PYTHON_USEDEP}]
 			')
@@ -221,7 +165,7 @@ src_configure() {
 
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
-		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT6=ON
 		-DWITH_ANALYSIS=ON
 		-DWITH_APIDOC=$(usex doc)
 		-DWITH_GUI=ON
@@ -235,7 +179,7 @@ src_configure() {
 		$(cmake_use_find_package netcdf NetCDF)
 		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_QWTPOLAR=ON
 		-DWITH_QTWEBENGINE=$(usex webengine)
 		-DWITH_PDAL=$(usex pdal)
 		-DWITH_POSTGRESQL=$(usex postgres)
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 14aa90976ed8..986bf4932766 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1 +1,2 @@
 DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c
+DIST qmapshack-1.17.1_p600.tar.gz 56720384 BLAKE2B 0a76b90273838898c74d6fcf81de0903cd24c294e5ccb7333cdc478b22f01bb771bcc155683c27e0310b018b2c47cf23235b3cd65b81779f97104e389b79450b SHA512 05729eddaca0fd845490eb56e0a0c4ed6d3a721433c24c3e8a6a424a2d6dbb6f9a16dfc8babe4a4ae1b48d8215f586654b1385f748ee8497d629ecdbe4fae2f9
diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p600.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p600.ebuild
new file mode 100644
index 000000000000..e35048395d1a
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p600.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
+COMMIT="1f009ac0be1d1c2a4c31aa1283f4009e88685d34"
+SRC_URI="https://github.com/kiozen/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/quazip:0=[qt6(+)]
+	dev-qt/qt5compat:6[icu,qml]
+	dev-qt/qttools:6[assistant,linguist,opengl,qdbus,qml,widgets,zstd]
+	dev-qt/qtwebengine:6[widgets]
+	sci-geosciences/routino
+	sci-libs/alglib
+	sci-libs/gdal:=
+	sci-libs/proj:=
+"
+DEPEND="${RDEPEND}"
+
+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/XNNPACK/XNNPACK-2024.02.29.ebuild b/sci-libs/XNNPACK/XNNPACK-2024.02.29.ebuild
index 28d2c0606622..a59ac4887be9 100644
--- a/sci-libs/XNNPACK/XNNPACK-2024.02.29.ebuild
+++ b/sci-libs/XNNPACK/XNNPACK-2024.02.29.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
 
 CommitId=fcbf55af6cf28a4627bcd1f703ab7ad843f0f3a2
 
@@ -54,6 +54,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/933414
+	# https://github.com/google/XNNPACK/issues/6806
+	filter-lto
+
 	local mycmakeargs=(
 		-DXNNPACK_BUILD_BENCHMARKS=OFF
 		-DXNNPACK_USE_SYSTEM_LIBS=ON
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index 01cba33f2c7c..16b731aa4a2b 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/brial/brial-1.2.12.ebuild b/sci-libs/brial/brial-1.2.12.ebuild
index 1a4d4a95fd64..949a5d87445f 100644
--- a/sci-libs/brial/brial-1.2.12.ebuild
+++ b/sci-libs/brial/brial-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 8ba08b047dd7..b90bffc4df0f 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..e990c18926b2
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=6.1
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+
+MYPN=pytorch
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="A deep learning framework"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${MYP}.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	mpi? ( distributed )
+	gloo? ( distributed )
+	?? ( cuda rocm )
+	rocm? (
+		|| ( ${ROCM_REQUIRED_USE} )
+		!flash
+	)
+"
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/gflags:=
+	>=dev-cpp/glog-0.5.0
+	dev-libs/cpuinfo
+	dev-libs/libfmt
+	dev-cpp/opentelemetry-cpp
+	dev-libs/protobuf:=
+	dev-libs/pthreadpool
+	dev-libs/sleef
+	virtual/lapack
+	sci-libs/onnx
+	sci-libs/foxi
+	cuda? (
+		dev-libs/cudnn
+		>=dev-libs/cudnn-frontend-1.0.3:0/8
+		<dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler]
+	)
+	fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 )
+	gloo? ( sci-libs/gloo[cuda?] )
+	mpi? ( virtual/mpi )
+	nnpack? ( sci-libs/NNPACK )
+	numpy? ( $(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		') )
+	onednn? ( dev-libs/oneDNN )
+	opencl? ( virtual/opencl )
+	qnnpack? (
+		!sci-libs/QNNPACK
+		dev-cpp/gemmlowp
+	)
+	rocm? (
+		=dev-util/hip-6.1*
+		=dev-libs/rccl-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
+		=sci-libs/miopen-6.1*[${ROCM_USEDEP}]
+		=dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+
+		=sci-libs/hipBLASLt-6.1*
+		amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
+		amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] )
+		amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] )
+		amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] )
+	)
+	distributed? (
+		sci-libs/tensorpipe[cuda?]
+		dev-cpp/cpp-httplib
+	)
+	xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 )
+	mkl? ( sci-libs/mkl )
+	openblas? ( sci-libs/openblas )
+"
+DEPEND="
+	${RDEPEND}
+	cuda? ( >=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-libs/ideep )
+	dev-libs/psimd
+	dev-libs/FP16
+	dev-libs/FXdiv
+	dev-libs/pocketfft
+	dev-libs/flatbuffers
+	>=sci-libs/kineto-0.4.0_p20240525
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	../patches/${PN}-2.4.0-gentoo.patch
+	../patches/${PN}-2.4.0-install-dirs.patch
+	../patches/${PN}-1.12.0-glog-0.6.0.patch
+	../patches/${PN}-1.13.1-tensorpipe.patch
+	../patches/${PN}-2.3.0-cudnn_include_fix.patch
+	../patches/${PN}-2.1.2-fix-rpath.patch
+	../patches/${PN}-2.4.0-fix-openmp-link.patch
+	../patches/${PN}-2.4.0-rocm-fix-std-cpp17.patch
+	../patches/${PN}-2.2.2-musl.patch
+	../patches/${PN}-2.4.0-exclude-aotriton.patch
+	../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch
+	../patches/${PN}-2.3.0-fix-libcpp.patch
+	"${FILESDIR}"/${PN}-2.4.0-libfmt-11.patch
+	"${FILESDIR}"/${P}-cpp-httplib.patch
+	"${FILESDIR}"/${P}-cstdint.patch
+)
+
+src_prepare() {
+	filter-lto #bug 862672
+	sed -i \
+		-e "/third_party\/gloo/d" \
+		cmake/Dependencies.cmake \
+		|| die
+	cmake_src_prepare
+	pushd torch/csrc/jit/serialization || die
+	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+	popd
+	# prefixify the hardcoded paths, after all patches are applied
+	hprefixify \
+		aten/CMakeLists.txt \
+		caffe2/CMakeLists.txt \
+		cmake/Metal.cmake \
+		cmake/Modules/*.cmake \
+		cmake/Modules_CUDA_fix/FindCUDNN.cmake \
+		cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
+		cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
+		cmake/public/LoadHIP.cmake \
+		cmake/public/cuda.cmake \
+		cmake/Dependencies.cmake \
+		torch/CMakeLists.txt \
+		CMakeLists.txt
+
+	if use rocm; then
+		sed -e "s:/opt/rocm:/usr:" \
+			-e "s:lib/cmake:$(get_libdir)/cmake:g" \
+			-e "s/HIP 1.0/HIP 1.0 REQUIRED/" \
+			-i cmake/public/LoadHIP.cmake || die
+
+		ebegin "HIPifying cuda sources"
+		${EPYTHON} tools/amd_build/build_amd.py || die
+		eend $?
+	fi
+}
+
+src_configure() {
+	if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
+		ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+		ewarn "These may not be optimal for your GPU."
+		ewarn ""
+		ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
+		ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
+		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5"
+		ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
+		ewarn ""
+		ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+		ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_CUSTOM_PROTOBUF=OFF
+		-DBUILD_SHARED_LIBS=ON
+
+		-DUSE_CCACHE=OFF
+		-DUSE_CUDA=$(usex cuda)
+		-DUSE_DISTRIBUTED=$(usex distributed)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_FAKELOWP=OFF
+		-DUSE_FBGEMM=$(usex fbgemm)
+		-DUSE_FLASH_ATTENTION=$(usex flash)
+		-DUSE_MEM_EFF_ATTENTION=OFF
+		-DUSE_GFLAGS=ON
+		-DUSE_GLOG=ON
+		-DUSE_GLOO=$(usex gloo)
+		-DUSE_KINETO=OFF # TODO
+		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+		-DUSE_MKLDNN=$(usex onednn)
+		-DUSE_NNPACK=$(usex nnpack)
+		-DUSE_XNNPACK=$(usex xnnpack)
+		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+		-DUSE_TENSORPIPE=$(usex distributed)
+		-DUSE_PYTORCH_QNNPACK=$(usex qnnpack)
+		-DUSE_NUMPY=$(usex numpy)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_ROCM=$(usex rocm)
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_UCC=OFF
+		-DUSE_VALGRIND=OFF
+		-DPython_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DUSE_SYSTEM_PTHREADPOOL=ON
+		-DUSE_SYSTEM_PSIMD=ON
+		-DUSE_SYSTEM_FXDIV=ON
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_SYSTEM_GLOO=ON
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_PYTORCH_METAL=OFF
+		-DUSE_XPU=OFF
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use mkl; then
+		mycmakeargs+=(-DBLAS=MKL)
+	elif use openblas; then
+		mycmakeargs+=(-DBLAS=OpenBLAS)
+	else
+		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
+	fi
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+		addpredict "/proc/self/task" # bug 926116
+
+		mycmakeargs+=(
+			-DUSE_CUDNN=ON
+			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	elif use rocm; then
+		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+
+		mycmakeargs+=(
+			-DUSE_NCCL=ON
+			-DUSE_SYSTEM_NCCL=ON
+		)
+
+		# ROCm libraries produce too much warnings
+		append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
+
+		if tc-is-clang; then
+			# fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656
+			append-cxxflags -fclang-abi-compat=17
+		fi
+	fi
+
+	if use onednn; then
+		mycmakeargs+=(
+			-DUSE_MKLDNN=ON
+			-DMKLDNN_FOUND=ON
+			-DMKLDNN_LIBRARIES=dnnl
+			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
+		)
+	fi
+
+	cmake_src_configure
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	rm -rf python
+	mkdir -p python/torch/include || die
+	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
+	cp torch/version.py python/torch/ || die
+	python_domodule python/caffe2
+	python_domodule python/torch
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+}
diff --git a/sci-libs/caffe2/caffe2-2.4.0.ebuild b/sci-libs/caffe2/caffe2-2.4.0.ebuild
deleted file mode 100644
index 524dafcaacef..000000000000
--- a/sci-libs/caffe2/caffe2-2.4.0.ebuild
+++ /dev/null
@@ -1,290 +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} )
-ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
-
-MYPN=pytorch
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="A deep learning framework"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${MYP}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	mpi? ( distributed )
-	gloo? ( distributed )
-	?? ( cuda rocm )
-	rocm? (
-		|| ( ${ROCM_REQUIRED_USE} )
-		!flash
-	)
-"
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/gflags:=
-	>=dev-cpp/glog-0.5.0
-	dev-libs/cpuinfo
-	dev-libs/libfmt
-	dev-cpp/opentelemetry-cpp
-	dev-libs/protobuf:=
-	dev-libs/pthreadpool
-	dev-libs/sleef
-	virtual/lapack
-	sci-libs/onnx
-	sci-libs/foxi
-	cuda? (
-		dev-libs/cudnn
-		>=dev-libs/cudnn-frontend-1.0.3:0/8
-		<dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler]
-	)
-	fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 )
-	gloo? ( sci-libs/gloo[cuda?] )
-	mpi? ( virtual/mpi )
-	nnpack? ( sci-libs/NNPACK )
-	numpy? ( $(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		') )
-	onednn? ( dev-libs/oneDNN )
-	opencl? ( virtual/opencl )
-	qnnpack? (
-		!sci-libs/QNNPACK
-		dev-cpp/gemmlowp
-	)
-	rocm? (
-		=dev-util/hip-6.1*
-		=dev-libs/rccl-6.1*[${ROCM_USEDEP}]
-		=sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
-		=sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
-		=sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
-		=sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
-		=sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
-		=sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
-		=sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
-		=sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
-		=sci-libs/miopen-6.1*[${ROCM_USEDEP}]
-		=dev-util/roctracer-6.1*[${ROCM_USEDEP}]
-
-		=sci-libs/hipBLASLt-6.1*
-		amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
-		amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] )
-		amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] )
-		amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] )
-	)
-	distributed? ( sci-libs/tensorpipe[cuda?] )
-	xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 )
-	mkl? ( sci-libs/mkl )
-	openblas? ( sci-libs/openblas )
-"
-DEPEND="
-	${RDEPEND}
-	cuda? ( >=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-libs/ideep )
-	dev-libs/psimd
-	dev-libs/FP16
-	dev-libs/FXdiv
-	dev-libs/pocketfft
-	dev-libs/flatbuffers
-	>=sci-libs/kineto-0.4.0_p20240525
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	../patches/${PN}-2.4.0-gentoo.patch
-	../patches/${PN}-2.4.0-install-dirs.patch
-	../patches/${PN}-1.12.0-glog-0.6.0.patch
-	../patches/${PN}-1.13.1-tensorpipe.patch
-	../patches/${PN}-2.3.0-cudnn_include_fix.patch
-	../patches/${PN}-2.1.2-fix-rpath.patch
-	../patches/${PN}-2.4.0-fix-openmp-link.patch
-	../patches/${PN}-2.4.0-rocm-fix-std-cpp17.patch
-	../patches/${PN}-2.2.2-musl.patch
-	../patches/${PN}-2.4.0-exclude-aotriton.patch
-	../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch
-	../patches/${PN}-2.3.0-fix-libcpp.patch
-)
-
-src_prepare() {
-	filter-lto #bug 862672
-	sed -i \
-		-e "/third_party\/gloo/d" \
-		cmake/Dependencies.cmake \
-		|| die
-	cmake_src_prepare
-	pushd torch/csrc/jit/serialization || die
-	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
-	popd
-	# prefixify the hardcoded paths, after all patches are applied
-	hprefixify \
-		aten/CMakeLists.txt \
-		caffe2/CMakeLists.txt \
-		cmake/Metal.cmake \
-		cmake/Modules/*.cmake \
-		cmake/Modules_CUDA_fix/FindCUDNN.cmake \
-		cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
-		cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
-		cmake/public/LoadHIP.cmake \
-		cmake/public/cuda.cmake \
-		cmake/Dependencies.cmake \
-		torch/CMakeLists.txt \
-		CMakeLists.txt
-
-	if use rocm; then
-		sed -e "s:/opt/rocm:/usr:" \
-			-e "s:lib/cmake:$(get_libdir)/cmake:g" \
-			-e "s/HIP 1.0/HIP 1.0 REQUIRED/" \
-			-i cmake/public/LoadHIP.cmake || die
-
-		ebegin "HIPifying cuda sources"
-		${EPYTHON} tools/amd_build/build_amd.py || die
-		eend $?
-	fi
-}
-
-src_configure() {
-	if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
-		ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
-		ewarn "These may not be optimal for your GPU."
-		ewarn ""
-		ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
-		ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
-		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5"
-		ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
-		ewarn ""
-		ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
-		ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_SHARED_LIBS=ON
-
-		-DUSE_CCACHE=OFF
-		-DUSE_CUDA=$(usex cuda)
-		-DUSE_DISTRIBUTED=$(usex distributed)
-		-DUSE_MPI=$(usex mpi)
-		-DUSE_FAKELOWP=OFF
-		-DUSE_FBGEMM=$(usex fbgemm)
-		-DUSE_FLASH_ATTENTION=$(usex flash)
-		-DUSE_MEM_EFF_ATTENTION=OFF
-		-DUSE_GFLAGS=ON
-		-DUSE_GLOG=ON
-		-DUSE_GLOO=$(usex gloo)
-		-DUSE_KINETO=OFF # TODO
-		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-		-DUSE_MKLDNN=$(usex onednn)
-		-DUSE_NNPACK=$(usex nnpack)
-		-DUSE_XNNPACK=$(usex xnnpack)
-		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
-		-DUSE_TENSORPIPE=$(usex distributed)
-		-DUSE_PYTORCH_QNNPACK=$(usex qnnpack)
-		-DUSE_NUMPY=$(usex numpy)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_ROCM=$(usex rocm)
-		-DUSE_SYSTEM_CPUINFO=ON
-		-DUSE_SYSTEM_PYBIND11=ON
-		-DUSE_UCC=OFF
-		-DUSE_VALGRIND=OFF
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_PSIMD=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-		-DUSE_PYTORCH_METAL=OFF
-		-DUSE_XPU=OFF
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use mkl; then
-		mycmakeargs+=(-DBLAS=MKL)
-	elif use openblas; then
-		mycmakeargs+=(-DBLAS=OpenBLAS)
-	else
-		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
-	fi
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-		addpredict "/proc/self/task" # bug 926116
-
-		mycmakeargs+=(
-			-DUSE_CUDNN=ON
-			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	elif use rocm; then
-		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
-
-		mycmakeargs+=(
-			-DUSE_NCCL=ON
-			-DUSE_SYSTEM_NCCL=ON
-		)
-
-		# ROCm libraries produce too much warnings
-		append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
-
-		if tc-is-clang; then
-			# fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656
-			append-cxxflags -fclang-abi-compat=17
-		fi
-	fi
-
-	if use onednn; then
-		mycmakeargs+=(
-			-DUSE_MKLDNN=ON
-			-DMKLDNN_FOUND=ON
-			-DMKLDNN_LIBRARIES=dnnl
-			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
-		)
-	fi
-
-	cmake_src_configure
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto "/var/lib/${PN}"
-	doins "${BUILD_DIR}"/CMakeCache.txt
-
-	rm -rf python
-	mkdir -p python/torch/include || die
-	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
-	cp torch/version.py python/torch/ || die
-	python_domodule python/caffe2
-	python_domodule python/torch
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
-}
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-cpp-httplib.patch b/sci-libs/caffe2/files/caffe2-2.4.0-cpp-httplib.patch
new file mode 100644
index 000000000000..5d684a4a4738
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.4.0-cpp-httplib.patch
@@ -0,0 +1,13 @@
+--- a/torch/lib/libshm/CMakeLists.txt	2024-09-04 06:09:51.943752841 +0200
++++ b/torch/lib/libshm/CMakeLists.txt	2024-09-04 06:10:52.243821438 +0200
+@@ -24,6 +24,10 @@
+   CXX_STANDARD 17)
+ target_link_libraries(shm PRIVATE ${TORCH_CPU_LIB})
+ 
++if (USE_DISTRIBUTED)
++  target_link_libraries(shm PRIVATE cpp-httplib)
++endif()
++
+ if(UNIX AND NOT APPLE)
+   include(CheckLibraryExists)
+   find_package(Threads REQUIRED)
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-cstdint.patch b/sci-libs/caffe2/files/caffe2-2.4.0-cstdint.patch
new file mode 100644
index 000000000000..f248ab031eb0
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.4.0-cstdint.patch
@@ -0,0 +1,10 @@
+--- a/caffe2/utils/string_utils.cc	2024-09-05 08:29:06.930438069 +0200
++++ b/caffe2/utils/string_utils.cc	2024-09-05 08:29:28.398137596 +0200
+@@ -3,6 +3,7 @@
+ #include <algorithm>
+ #include <sstream>
+ #include <vector>
++#include <cstdint>
+ 
+ namespace caffe2 {
+ 
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch b/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch
new file mode 100644
index 000000000000..9f6740a07f1f
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch
@@ -0,0 +1,44 @@
+Fix build against libfmt-11
+
+https://github.com/pytorch/pytorch/commit/83eedf66b9e7f52323d9f45c5dfaa64472452595
+https://github.com/pytorch/pytorch/pull/130628
+
+From 83eedf66b9e7f52323d9f45c5dfaa64472452595 Mon Sep 17 00:00:00 2001
+From: Aaron Gokaslan <aaronGokaslan@gmail.com>
+Date: Tue, 16 Jul 2024 06:12:08 +0000
+Subject: [PATCH] Update libfmt submodule to 11.0.1 (#130628)
+
+Update libfmt to 11.0.1 reopen of https://github.com/pytorch/pytorch/pull/129962. Requires a kineto update and moves fmt::join into a separate include so added it where necessary.
+
+Pull Request resolved: https://github.com/pytorch/pytorch/pull/130628
+Approved by: https://github.com/aaronenyeshi
+--- a/torch/csrc/distributed/c10d/socket.cpp
++++ b/torch/csrc/distributed/c10d/socket.cpp
+@@ -32,6 +32,7 @@ C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated")
+ #include <fmt/chrono.h>
+ C10_DIAGNOSTIC_POP()
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ 
+ #include <torch/csrc/distributed/c10d/error.h>
+ #include <torch/csrc/distributed/c10d/exception.h>
+--- a/torch/csrc/profiler/standalone/execution_trace_observer.cpp
++++ b/torch/csrc/profiler/standalone/execution_trace_observer.cpp
+@@ -10,6 +10,7 @@
+ #endif // _WIN32
+ 
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <chrono>
+ #include <cmath>
+ #include <fstream>
+--- a/torch/csrc/profiler/util.cpp
++++ b/torch/csrc/profiler/util.cpp
+@@ -5,6 +5,7 @@
+ #include <c10/util/ArrayRef.h>
+ #include <c10/util/irange.h>
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ 
+ #ifdef USE_KINETO
+ #include <libkineto.h>
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index fe074558539e..0e7764e95f41 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1 +1,2 @@
 DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca
+DIST cantera-3.0.1.tar.gz 2451841 BLAKE2B b05771021a81d5266dfed382e2a6357e5b70653c6d9cfb5f03a6755095f4f8f4e7c0f78b79e0bf131c01fefce46bbc647c790ee412b6457c515cda39d4fc3054 SHA512 fa993b33867c6c0a0ca539f52116c4cdea739dfcd30deb5d2f66042f290f7f2f60112d7a37c38fbd8a38a119e5af00a7a85fd80b6e36388202b666be0ddd7715
diff --git a/sci-libs/cantera/cantera-3.0.0-r1.ebuild b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
index 9f0de3263452..c6b3ec2711e1 100644
--- a/sci-libs/cantera/cantera-3.0.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-3.0.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
 
-inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
+inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
 HOMEPAGE="https://www.cantera.org"
@@ -78,6 +78,10 @@ pkg_setup() {
 ## Full list of configuration options of Cantera is presented here:
 ## http://cantera.org/docs/sphinx/html/compiling/config-options.html
 src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://github.com/Cantera/cantera/issues/1783
+	filter-lto
+
 	scons_vars=(
 		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
diff --git a/sci-libs/cantera/cantera-3.0.1.ebuild b/sci-libs/cantera/cantera-3.0.1.ebuild
new file mode 100644
index 000000000000..46a9c3b2f469
--- /dev/null
+++ b/sci-libs/cantera/cantera-3.0.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fortran hdf5 lapack +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/yaml-cpp
+	hdf5? ( sci-libs/HighFive )
+	!lapack? ( sci-libs/sundials:0= )
+	lapack? (
+		>=sci-libs/sundials-6.5.0:0=[lapack?]
+		virtual/lapack
+	)
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/libfmt
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		>=dev-cpp/gtest-1.11.0
+		python? (
+			$(python_gen_cond_dep '
+				dev-python/h5py[${PYTHON_USEDEP}]
+				dev-python/pandas[${PYTHON_USEDEP}]
+				dev-python/pytest[${PYTHON_USEDEP}]
+				dev-python/scipy[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0_env.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://github.com/Cantera/cantera/issues/1783
+	filter-lto
+
+	scons_vars=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++17"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${FCFLAGS}"
+		optimize_flags="-Wno-inline"
+		renamed_shared_libraries="no"
+		use_pch="no"
+		## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		system_yamlcpp="y"
+		hdf_support=$(usex hdf5 y n)
+		system_blas_lapack=$(usex lapack y n)
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+		use_rpath_linkage="yes"
+		extra_lib_dirs="/usr/$(get_libdir)/${PN}"
+	)
+	use hdf5 && scons_vars+=( system_highfive="y" )
+	use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+	)
+
+	if use python ; then
+		scons_targets+=( python_package="full" python_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D}" libdirname="$(get_libdir)"
+	if ! use python ; then
+		rm -r "${D}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D}$(python_get_sitedir)/${PN}"
+	fi
+
+	# User could remove this line if require static libs for development purpose
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+}
diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
index eb2f320fe9bc..191c4845525f 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
@@ -45,6 +45,7 @@ DOCS=( README.md VERSION )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.0-system-mathjax.patch"
+	"${FILESDIR}/${PN}-2.2.0-include-algorithm.patch"
 )
 
 src_prepare() {
diff --git a/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch b/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch
new file mode 100644
index 000000000000..4f5887eec6e4
--- /dev/null
+++ b/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch
@@ -0,0 +1,18 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Wed, 21 Aug 2024 20:19:25 +0200
+Subject: [PATCH] include algorithm
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/internal/ceres/cuda_streamed_buffer.h
++++ b/internal/ceres/cuda_streamed_buffer.h
+@@ -34,6 +34,9 @@
+ #include "ceres/internal/config.h"
+ 
+ #ifndef CERES_NO_CUDA
++
++#include <algorithm>
++
+ #include "ceres/cuda_buffer.h"
+ 
+ namespace ceres::internal {
diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild
new file mode 100644
index 000000000000..35272e786648
--- /dev/null
+++ b/sci-libs/coinor-dylp/coinor-dylp-1.10.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=DyLP
+
+inherit flag-o-matic libtool
+
+DESCRIPTION="COIN-OR dynamic simplex linear program solver"
+HOMEPAGE="https://github.com/coin-or/DyLP/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-text/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+DEPEND="sci-libs/coinor-osi:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+	elibtoolize
+}
+
+src_configure() {
+	# heavily vintage autotools relies on UB to detect SunOS
+	# https://bugs.gentoo.org/878143
+	# https://github.com/coin-or/DyLP/issues/27
+	filter-lto
+
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}"/usr
+		$(use_with doc dot)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${D}" install
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild
deleted file mode 100644
index 73b6503f67f9..000000000000
--- a/sci-libs/coinor-dylp/coinor-dylp-1.10.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=DyLP
-
-DESCRIPTION="COIN-OR dynamic simplex linear program solver"
-HOMEPAGE="https://github.com/coin-or/DyLP/"
-SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="EPL-1.0"
-
-# major soname component
-SLOT="0/1"
-
-KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
-# packages contain a check for it. Gentoo bug 601648 and upstream issue,
-#
-#   https://github.com/coin-or/CoinUtils/issues/132
-#
-BDEPEND="virtual/fortran
-	virtual/pkgconfig
-	doc? ( app-text/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-DEPEND="sci-libs/coinor-osi:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
-
-src_prepare() {
-	# Needed to make the --with-coin-instdir in src_configure happy.
-	dodir /usr
-
-	# They don't need to guess at this, but they do, and get it wrong...
-	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		-i configure \
-		|| die "failed to fix the pkgconfig path in ${S}/configure"
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake all $(usex doc doxydoc "")
-}
-
-src_test() {
-	# NOT redundant! The build system has a "make check" target that does
-	# nothing, so if you don't specify "test" here, you'll get a no-op.
-	emake test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
-
-	emake DESTDIR="${D}" install
-
-	# Duplicate junk, and in the wrong location.
-	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
-
-	use examples && dodoc -r examples
-}
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 347cfbd3e12c..f65a2faf15f2 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
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 8c096e29135a..44abf5d59c81 100644
--- a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
+++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.1-enable-examples.patch
 	"${FILESDIR}"/${PN}-6.1.1-fix-clang-17-no-offload-uniform-block.patch
 	"${FILESDIR}"/${PN}-6.1.1-no-git-no-hash.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch
 )
 
 src_prepare() {
@@ -51,6 +52,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	if ! use debug; then
 		append-cflags "-DNDEBUG"
 		append-cxxflags "-DNDEBUG"
@@ -73,7 +76,7 @@ src_configure() {
 		)
 	fi
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-libcxx.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-libcxx.patch
new file mode 100644
index 000000000000..c73dafc02420
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-libcxx.patch
@@ -0,0 +1,25 @@
+libc++ has no std::numeric_limits<__Float16> implementation and treats f8_t as is_integral.
+
+Bug for is_integral: https://github.com/llvm/llvm-project/issues/102767
+Bug for numeric_limits: https://github.com/ROCm/composable_kernel/issues/1460
+--- a/library/include/ck/library/utility/check_err.hpp
++++ b/library/include/ck/library/utility/check_err.hpp
+@@ -146,7 +146,7 @@ check_err(const Range& out,
+     bool res{true};
+     int err_count  = 0;
+     double err     = 0;
+-    double max_err = std::numeric_limits<ranges::range_value_t<Range>>::min();
++    double max_err = NumericLimits<ranges::range_value_t<Range>>::Min();
+     for(std::size_t i = 0; i < ref.size(); ++i)
+     {
+         const double o = type_convert<float>(*std::next(std::begin(out), i));
+@@ -178,7 +178,8 @@ check_err(const Range& out,
+ template <typename Range, typename RefRange>
+ std::enable_if_t<(std::is_same_v<ranges::range_value_t<Range>, ranges::range_value_t<RefRange>> &&
+                   std::is_integral_v<ranges::range_value_t<Range>> &&
+-                  !std::is_same_v<ranges::range_value_t<Range>, bhalf_t>)
++                  !std::is_same_v<ranges::range_value_t<Range>, bhalf_t> &&
++                  !std::is_same_v<ranges::range_value_t<Range>, f8_t>)
+ #ifdef CK_EXPERIMENTAL_BIT_INT_EXTENSION_INT4
+                      || std::is_same_v<ranges::range_value_t<Range>, int4_t>
+ #endif
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
index b54cd124a841..4345dffa84d5 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="openmp"
 
 # Our autotools patch hacks in PKG_CHECK_MODULES calls.
diff --git a/sci-libs/fplll/fplll-5.4.5.ebuild b/sci-libs/fplll/fplll-5.4.5.ebuild
index f947f1eaf1d1..57108bc65cbf 100644
--- a/sci-libs/fplll/fplll-5.4.5.ebuild
+++ b/sci-libs/fplll/fplll-5.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="qd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/givaro/givaro-4.2.0.ebuild b/sci-libs/givaro/givaro-4.2.0.ebuild
index d657e0e4660f..3f96a663cbe8 100644
--- a/sci-libs/givaro/givaro-4.2.0.ebuild
+++ b/sci-libs/givaro/givaro-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar
 
 LICENSE="CeCILL-B"
 SLOT="0/9" # soname major
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/gloo/files/gloo-2023.12.03-gcc15.patch b/sci-libs/gloo/files/gloo-2023.12.03-gcc15.patch
new file mode 100644
index 000000000000..d68b4e551053
--- /dev/null
+++ b/sci-libs/gloo/files/gloo-2023.12.03-gcc15.patch
@@ -0,0 +1,10 @@
+--- a/gloo/types.h	2024-09-06 22:05:07.308213847 +0200
++++ b/gloo/types.h	2024-09-06 22:05:32.598941783 +0200
+@@ -5,6 +5,7 @@
+ #pragma once
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #ifdef __CUDA_ARCH__
+ #include <cuda.h>
diff --git a/sci-libs/gloo/gloo-2023.12.03.ebuild b/sci-libs/gloo/gloo-2023.12.03.ebuild
index 16201cde8c0d..bb2bc3e914c1 100644
--- a/sci-libs/gloo/gloo-2023.12.03.ebuild
+++ b/sci-libs/gloo/gloo-2023.12.03.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2022.05.18-gentoo.patch
 	"${FILESDIR}"/${PN}-2023.01.17-cuda.patch
 	"${FILESDIR}"/${PN}-2023.01.17-ssl3.patch
+	"${FILESDIR}"/${P}-gcc15.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-libcxx.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-libcxx.patch
new file mode 100644
index 000000000000..32aa65127e84
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-libcxx.patch
@@ -0,0 +1,57 @@
+# libc++ issue: https://github.com/llvm/llvm-project/issues/98734
+diff --git a/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp b/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
+index 82cc81f..94e62d4 100644
+--- a/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
++++ b/library/src/amd_detail/rocblaslt/src/rocblaslt_mat.cpp
+@@ -28,6 +28,7 @@
+ #include "handle.h"
+ #include "rocblaslt_mat_utils.hpp"
+ #include "tensile_host.hpp"
++#include <array>
+ 
+ #include <hip/hip_runtime_api.h>
+ 
+@@ -602,7 +603,7 @@ rocblaslt_status
+     std::vector<int64_t>            ldc_vec, batch_stride_c_vec, num_batches_c_vec;
+     std::vector<int64_t>            ldd_vec, batch_stride_d_vec, num_batches_d_vec;
+     std::vector<int64_t>            lde_vec, batch_stride_e_vec, num_batches_e_vec;
+-    std::vector<int8_t[16]>         alpha_1(matmul_descr.size());
++    std::vector<std::array<int8_t, 16>>         alpha_1(matmul_descr.size());
+ 
+     std::vector<bool> gradient_vec;
+ 
+@@ -692,10 +693,10 @@ rocblaslt_status
+             return validArgs;
+ 
+         const void* alphaTmp = nullptr;
+-        memset(alpha_1[i], 0, sizeof(int8_t) * 16);
++        memset(alpha_1[i].data(), 0, sizeof(int8_t) * 16);
+         if(scaleAlphaVec)
+         {
+-            setTo1(compute_type, (void*)alpha_1[i], &alphaTmp);
++            setTo1(compute_type, (void*)alpha_1[i].data(), &alphaTmp);
+         }
+         else
+         {
+@@ -867,7 +868,7 @@ rocblaslt_status
+     std::vector<int64_t> lde_vec, batch_stride_e_vec, num_batches_e_vec;
+     std::vector<bool>    gradient_vec;
+ 
+-    std::vector<int8_t[16]> alpha_1(m.size());
++    std::vector<std::array<int8_t, 16>> alpha_1(m.size());
+ 
+     for(int i = 0; i < m.size(); i++)
+     {
+@@ -924,10 +925,10 @@ rocblaslt_status
+             return validArgs;
+ 
+         const void* alphaTmp = nullptr;
+-        memset(alpha_1[i], 0, sizeof(int8_t) * 16);
++        memset(alpha_1[i].data(), 0, sizeof(int8_t) * 16);
+         if(scaleAlphaVec)
+         {
+-            setTo1(compute_type, (void*)alpha_1[i], &alphaTmp);
++            setTo1(compute_type, (void*)alpha_1[i].data(), &alphaTmp);
+         }
+         else
+         {
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
index 6bd608c94d0e..7f1e61d2dc0f 100644
--- a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
@@ -37,7 +37,7 @@ Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535
      else()
 --- a/library/src/amd_detail/rocblaslt/src/CMakeLists.txt
 +++ b/library/src/amd_detail/rocblaslt/src/CMakeLists.txt
-@@ -100,7 +100,16 @@ if( BUILD_WITH_TENSILE )
+@@ -100,7 +100,17 @@ if( BUILD_WITH_TENSILE )
    set( Tensile_INC
      ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile
    )
@@ -45,7 +45,8 @@ Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535
 +  set_target_properties( TensileHost PROPERTIES POSITION_INDEPENDENT_CODE ON )
  
 +  set( Tensile_SRC
-+  src/amd_detail/rocblaslt/src/tensile_host.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/tensile_host.cpp
++  ${PROJECT_SOURCE_DIR}/tensilelite/Tensile/Source/lib/source/msgpack/MessagePack.cpp
 +  )
 +
 +  set( Tensile_INC
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
new file mode 100644
index 000000000000..574f185be5d7
--- /dev/null
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+# gfx941 and gfx942 assembly uses directives of LLVM >= 18.1.0
+LLVM_COMPAT=( 18 )
+
+inherit cmake python-any-r1 llvm-r1 prefix 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=( gfx90a gfx940 gfx941 gfx942 )
+IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" )
+IUSE="${IUSE_TARGETS[@]/#/+} test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	dev-cpp/msgpack-cxx
+	sci-libs/hipBLAS:${SLOT}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/rocm-cmake
+	$(python_gen_any_dep '
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	')
+	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+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
+)
+
+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[*]}
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	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)
+	)
+
+	use test && mycmakeargs+=( -DBUILD_FORTRAN_CLIENTS=ON )
+
+	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++"
+	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
+	cmake_src_test -j1
+}
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild
deleted file mode 100644
index cf2ad2ac5382..000000000000
--- a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.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
-
-ROCM_SKIP_GLOBALS=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-# gfx941 and gfx942 assembly uses directives of LLVM >= 18.1.0
-LLVM_COMPAT=( 18 )
-
-inherit cmake python-any-r1 llvm-r1 prefix 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=( gfx90a gfx940 gfx941 gfx942 )
-IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" )
-IUSE="${IUSE_TARGETS[@]/#/+} test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/hip
-	dev-cpp/msgpack-cxx
-	sci-libs/hipBLAS:${SLOT}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-build/rocm-cmake
-	$(python_gen_any_dep '
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/joblib[${PYTHON_USEDEP}]
-	')
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-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
-)
-
-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[*]}
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	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)
-	)
-
-	use test && mycmakeargs+=( -DBUILD_FORTRAN_CLIENTS=ON )
-
-	CXX=hipcc 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++"
-	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
-	cmake_src_test -j1
-}
diff --git a/sci-libs/hipCUB/hipCUB-6.1.1.ebuild b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
index 8a38588c8d4c..ab990f284e87 100644
--- a/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
+++ b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_TEST=$(usex test ON OFF)
@@ -44,7 +46,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/hipFFT/hipFFT-6.1.1.ebuild b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
index d9700529cd24..8cc68e63e149 100644
--- a/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
+++ b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
@@ -25,6 +25,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=(
 		-DROCM_SYMLINK_LIBS=OFF
 		-DBUILD_CLIENTS_TESTS=OFF
diff --git a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
index 2a123df19544..30e218be3a80 100644
--- a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
+++ b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
@@ -25,11 +25,13 @@ RDEPEND="dev-util/hip
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 		-DROCM_SYMLINK_LIBS=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
index be450babaed3..99c4a9c0ca41 100644
--- a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
@@ -36,6 +36,8 @@ PATCHES=(
 )
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
@@ -43,5 +45,5 @@ src_configure() {
 		-DBUILD_WITH_SPARSE=$(usex sparse ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild
index d0d519b18ce6..3a05960c2cc7 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 		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 grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+		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}"
diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild
index b3aa027c2624..c0c211e6fde5 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild
@@ -69,7 +69,7 @@ src_prepare() {
 		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 grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+		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}"
diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
index 46d70c4b6625..2176f205682a 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
@@ -57,7 +57,7 @@ src_prepare() {
 		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 grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+		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}"
diff --git a/sci-libs/ignition-common/Manifest b/sci-libs/ignition-common/Manifest
index 9e65f0ac5d6c..5a77be81e52c 100644
--- a/sci-libs/ignition-common/Manifest
+++ b/sci-libs/ignition-common/Manifest
@@ -1,2 +1 @@
-DIST ignition-common3_3.14.2.tar.gz 7174986 BLAKE2B 38e42f139321aba5ab42c71d874b516bdf7a32edf3d1b0649991e27957d85e1b416d0206cadbeeea12957f7563920952982e4efb813ce8f33520c06e651553cc SHA512 fdc9dfdc8f69ff72e4381af61b3a6e120f361ab21417792db17f85e0ba2d60c4e32df0b72a45101ed72f65ea16a82c95d29e410962e9ecb40c2427a88593bc15
 DIST ignition-common3_3.17.0.tar.gz 8037300 BLAKE2B edebfa767c5640b2be5ca4cbe41687f7fb646dd3074789b4f4fb35242d6d2393f3ab2398945cf47cbe032a25f30284beb23a0b8d4ca72931f343a7be431efc5c SHA512 282024e5a99ae5f0879f1d11ed7ad4db0920b02e41051f76142b9de74ed296af365723e769ed3b0bd85a9f77a32d7735c85f2f7ef747ea83c5398697598473b1
diff --git a/sci-libs/ignition-common/ignition-common-3.14.2.ebuild b/sci-libs/ignition-common/ignition-common-3.14.2.ebuild
deleted file mode 100644
index 04e87b079f9e..000000000000
--- a/sci-libs/ignition-common/ignition-common-3.14.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake
-
-IGN_MAJOR=3
-
-DESCRIPTION="Set of libraries designed to rapidly develop robot applications"
-HOMEPAGE="https://github.com/ignitionrobotics/ign-common"
-SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="${IGN_MAJOR}"
-KEYWORDS="~amd64"
-IUSE="test"
-#RESTRICT="!test? ( test )"
-# tests dont even build
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/tinyxml2:=
-	sci-libs/ignition-math:6=
-	sys-apps/util-linux
-	media-libs/freeimage:=
-	sci-libs/gts:=
-	media-video/ffmpeg:0=
-"
-DEPEND="${RDEPEND}
-	dev-build/ignition-cmake:2"
-BDEPEND="
-	dev-build/ignition-cmake:2"
-
-S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}"
-PATCHES=(
-	"${FILESDIR}/ffmpeg5.patch"
-	"${FILESDIR}/ffmpeg6.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_TESTING=$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/iml/iml-1.0.5-r1.ebuild b/sci-libs/iml/iml-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..f967cdfd1ab6
--- /dev/null
+++ b/sci-libs/iml/iml-1.0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Integer Matrix Library"
+HOMEPAGE="https://www.cs.uwaterloo.ca/~astorjoh/iml.html"
+SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
+
+# COPYING is GPL-2, but the files under src/ all have a BSD header
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="virtual/cblas"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-use-any-cblas-implementation.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-default="${EPREFIX}"/usr \
+		--enable-shared \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild b/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild
index 14e039c7eec1..b4a8adf61398 100644
--- a/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild
+++ b/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/sci-libs/kissfft/kissfft-131.1.0.ebuild b/sci-libs/kissfft/kissfft-131.1.0.ebuild
deleted file mode 100644
index 9fb779d33ddd..000000000000
--- a/sci-libs/kissfft/kissfft-131.1.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=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 toolchain-funcs
-
-DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid"
-HOMEPAGE="https://github.com/mborgerding/kissfft"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/mborgerding/kissfft"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="alloca cpu_flags_x86_sse openmp test tools"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		sci-libs/fftw:3.0
-		$(python_gen_any_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-131.1.0-cross.patch
-)
-
-python_check_deps() {
-	python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKISSFFT_OPENMP=$(usex openmp 1 0)
-		-DKISSFFT_TEST=$(usex test)
-		-DKISSFFT_TOOLS=$(usex tools)
-		-DKISSFFT_USE_ALLOCA=$(usex alloca)
-		-DKISSFFT_DATATYPE=$(usex cpu_flags_x86_sse simd float)
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index de79b06f2f39..8a339063a47c 100644
--- a/sci-libs/klu/klu-1.3.9-r2.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="
diff --git a/sci-libs/libhomfly/libhomfly-1.02.6.ebuild b/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
index 9107465b4d8c..8f489d9154da 100644
--- a/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
+++ b/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,16 +9,16 @@ DESCRIPTION="Library to compute the homfly polynomial of a link"
 HOMEPAGE="https://github.com/miguelmarco/libhomfly"
 SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="static-libs"
 
 DEPEND="dev-libs/boehm-gc"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 029cd91e973a..2612fa9a3194 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -5,3 +5,4 @@ DIST libqalculate-4.8.0.tar.gz 2625669 BLAKE2B 957adcc6b5dabee4d9d6a593a4d5c894e
 DIST libqalculate-4.8.1.tar.gz 2625564 BLAKE2B 017188bd43da03c398ed17e883f460637d1af35df9643ac62c938f5aa189431fee49143d517c2d4489c4cca030f1220129f9dfce448969a9601c74273bfdb1a9 SHA512 e4e3f884ac42b706ee79f8fa37fbff69a30dc3f24edbe66b259507723dc3f028243acea4cb29dd68d933e7e357a55207aaf619fe9f66caa118a212de06c2a8d4
 DIST libqalculate-5.0.0.tar.gz 2674322 BLAKE2B 1ae2203c4443b57198a0e7862361f732ae8428cb6b55942f9ff9984f0956c5a2cda3fd9f5a49fa98c10526879e9ce2751a9e5c33d1e6092503640da13844df0d SHA512 d3467e79e1454a76ee0c4d8795241c105d42580f95321e24b0657d99535ed8827809cc7ec0474c9e75cd668158aa84a500e5bd3a92dd0f4a3d1e4fc91811c399
 DIST libqalculate-5.0.0b.tar.gz 2674304 BLAKE2B 8f41f141aedac2f1ccdd8b48182f972b29ae2835b1a4844ba076112754061f06970817ec3e1248c50c3c9792d41927e277b05bd8933b9a63446e0d56d5449a8b SHA512 88bddd961fca48b0c971ba035cd295d642aac009164654b0c6b18e1c72892c69614f3dd90d5b851c05dfab41fda9a6dd18fbaecac9d28bfed387a7063280ebc7
+DIST libqalculate-5.2.0.tar.gz 2694752 BLAKE2B 3be1a538c5093ba8915ed1c9a795f11b615a6ed6ef9aaf7539abad411040d8c87709611f6e0367884cfd25cd46356b9237fd9c665796a275d3ecebe4fbef3edb SHA512 d849c315d3c35f97f47572c891bb2284db593d2bb5611d9405a1e7d00e849d35e08392fe6c67e5296311ed99597f76d25c3878cdcedadb2928699c22cba8af41
diff --git a/sci-libs/libqalculate/libqalculate-5.2.0.ebuild b/sci-libs/libqalculate/libqalculate-5.2.0.ebuild
new file mode 100644
index 000000000000..c77ed2aa9c27
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-5.2.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 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 toolchain-funcs
+
+MY_PV="${PV//b/}"
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${MY_PV}/${P}.tar.gz"
+S="${WORKDIR}"/"${PN}-${MY_PV}"
+
+LICENSE="GPL-2+"
+# SONAME changes pretty often on bumps. Check!
+SLOT="0/23.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
+}
+
+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
+
+	econf \
+		$(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)
+}
+
+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/libsemigroups/libsemigroups-2.7.3-r1.ebuild b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
index 15fff4b3b57d..15469f067cb7 100644
--- a/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
+++ b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 # Source headers have "or any later version"
 LICENSE="GPL-3+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="cpu_flags_x86_popcnt"
 
 PATCHES=( "${FILESDIR}/${P}-gcc-15-buildfix.patch" )
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
new file mode 100644
index 000000000000..808227a2fffb
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
@@ -0,0 +1,63 @@
+From bae9308ec157378bd22ce4f4a0226f1e7ef23594 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Mon, 8 Jun 2020 20:46:44 -0700
+Subject: [PATCH] Fix ruby SWIG bindings generation
+
+bindings/swig/doc.py generates a swig interface file for ruby bindings
+that includes docstrings with comments braces ( /* and */ ) like this:
+
+  %feature("docstring") sigrok::Channel::type "/* Type of this channel. */\n";
+  %feature("docstring") sigrok::Channel::enabled "/* Enabled status of this channel. */\n";
+
+SWIG generates *.cxx and adds its own braces to the docstring:
+
+/*/* Document-class: Sigrok::Error
+Exception thrown when an error code is returned by any libsigrok call. */
+*/
+
+this causes compilation error for Ruby bindings.
+
+To fix the error we should not add extra braces to the docstring.
+With this patch libsigrok compiles fine with with ruby 2.7 and swig 4.0.2.
+
+Fixes bug #1526
+
+Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+---
+ bindings/swig/doc.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/swig/doc.py b/bindings/swig/doc.py
+index e8767af8..182f5477 100644
+--- a/bindings/swig/doc.py
++++ b/bindings/swig/doc.py
+@@ -46,7 +46,7 @@ for compound in index.findall('compound'):
+         if language == 'python':
+             print('%%feature("docstring") %s "%s";' % (class_name, brief))
+         elif language == 'ruby':
+-            print('%%feature("docstring") %s "/* Document-class: %s\\n%s */\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
++            print('%%feature("docstring") %s "Document-class: %s\\n%s\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
+         elif language == 'java':
+             print('%%typemap(javaclassmodifiers) %s "/** %s */\npublic class"' % (
+             class_name, brief))
+@@ -77,10 +77,10 @@ for compound in index.findall('compound'):
+                             for name, desc in parameters.items()]) + '";')
+                 if language == 'ruby' and kind == 'public-func':
+                     print(str.join('\n', [
+-                        '%%feature("docstring") %s::%s "/* %s' % (
++                        '%%feature("docstring") %s::%s "%s' % (
+                             class_name, member_name, brief)] + [
+                         '@param %s %s' % (name, desc)
+-                            for name, desc in parameters.items()]) + ' */\\n";')
++                            for name, desc in parameters.items()]) + '\\n";')
+                 elif language == 'java' and kind == 'public-func':
+                         print(str.join('\n', [
+                             '%%javamethodmodifiers %s::%s "/** %s' % (
+@@ -111,4 +111,4 @@ for compound in index.findall('compound'):
+             print('%}')
+     elif language == 'ruby' and constants:
+         for member_name, brief in constants:
+-            print('%%feature("docstring") %s::%s "/* %s */\\n";' % (class_name, member_name, brief))
++            print('%%feature("docstring") %s::%s "%s\\n";' % (class_name, member_name, brief))
+-- 
+2.27.0
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild
index 61b96e87fe2a..29150532d1a4 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild
@@ -5,10 +5,13 @@ EAPI="8"
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
+USE_RUBY="ruby31 ruby32"
+RUBY_OPTIONAL="yes"
+
+inherit autotools python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
@@ -20,9 +23,10 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb"
+IUSE="bluetooth +cxx ftdi hidapi java parport python ruby serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx )
-	python? ( cxx ${PYTHON_REQUIRED_USE} )"
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
 
 RESTRICT="!test? ( test )"
 
@@ -39,6 +43,7 @@ LIB_DEPEND="
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
 	)
+	ruby? ( $(ruby_implementations_depend) )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
 	usb? ( virtual/libusb:1[static-libs(+)] )
 "
@@ -58,6 +63,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
+	ruby? ( >=dev-lang/swig-3.0.8 )
 	test? ( >=dev-libs/check-0.9.4 )
 	virtual/pkgconfig
 "
@@ -68,6 +74,7 @@ PATCHES=(
 	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
 	"${FILESDIR}/${P}-swig-4.patch"
 	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+	"${FILESDIR}/${P}-ruby-swig-docs.patch"
 	"${FILESDIR}/${P}-check-0.15.patch"
 	# https://bugs.gentoo.org/878395
 	"${FILESDIR}/${PN}-0.5.2-swig-4.1.patch"
@@ -77,6 +84,7 @@ PATCHES=(
 
 pkg_setup() {
 	use python && python_setup
+	use ruby && ruby-ng_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -88,7 +96,17 @@ sigrok_src_prepare() {
 	eautoreconf
 }
 
+each_ruby_prepare() {
+	sigrok_src_prepare
+}
+
 src_prepare() {
+	if use ruby; then
+		# copy source to where ruby-ng_src_unpack puts it
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		# ruby-ng_src_prepare calls default by itself
+		ruby-ng_src_prepare
+	fi
 	default
 	sigrok_src_prepare
 	use python && python_copy_sources
@@ -96,6 +114,8 @@ src_prepare() {
 
 sigrok_src_configure() {
 	econf \
+		--disable-python \
+		--disable-ruby \
 		$(use_with bluetooth libbluez) \
 		$(use_with ftdi libftdi) \
 		$(use_with hidapi libhidapi) \
@@ -110,12 +130,17 @@ sigrok_src_configure() {
 
 each_python_configure() {
 	cd "${BUILD_DIR}"
-	sigrok_src_configure --disable-ruby --enable-python
+	sigrok_src_configure --enable-python
+}
+
+each_ruby_configure() {
+	RUBY="${RUBY}" sigrok_src_configure --enable-ruby
 }
 
 src_configure() {
-	sigrok_src_configure --disable-ruby --disable-python
+	sigrok_src_configure
 	use python && python_foreach_impl each_python_configure
+	use ruby && ruby-ng_src_configure
 }
 
 each_python_compile() {
@@ -123,9 +148,14 @@ each_python_compile() {
 	emake python-build
 }
 
+each_ruby_compile() {
+	emake ruby-build
+}
+
 src_compile() {
 	default
 	use python && python_foreach_impl each_python_compile
+	use ruby && ruby-ng_src_compile
 }
 
 src_test() {
@@ -138,9 +168,14 @@ each_python_install() {
 	python_optimize
 }
 
+each_ruby_install() {
+	emake ruby-install DESTDIR="${D}"
+}
+
 src_install() {
 	default
 	use python && python_foreach_impl each_python_install
+	use ruby && ruby-ng_src_install
 	use udev && udev_dorules contrib/*.rules
 	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 951d87e75bb6..908f3fbda84e 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -5,10 +5,13 @@ EAPI="8"
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit python-r1 java-pkg-opt-2 udev xdg-utils
+USE_RUBY="ruby31 ruby32"
+RUBY_OPTIONAL="yes"
+
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
@@ -20,9 +23,10 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 
 LICENSE="GPL-3"
 SLOT="0/9999"
-IUSE="bluetooth +cxx ftdi hidapi java nettle parport python serial static-libs test +udev usb"
+IUSE="bluetooth +cxx ftdi hidapi java nettle parport python ruby serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx )
-	python? ( cxx ${PYTHON_REQUIRED_USE} )"
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
 
 RESTRICT="!test? ( test )"
 
@@ -40,6 +44,7 @@ LIB_DEPEND="
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
 	)
+	ruby? ( $(ruby_implementations_depend) )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
 	usb? ( virtual/libusb:1[static-libs(+)] )
 "
@@ -59,6 +64,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
+	ruby? ( >=dev-lang/swig-3.0.8 )
 	test? ( >=dev-libs/check-0.9.4 )
 	virtual/pkgconfig
 "
@@ -67,6 +73,7 @@ S="${WORKDIR}"/${P}
 
 pkg_setup() {
 	use python && python_setup
+	use ruby && ruby-ng_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -78,7 +85,17 @@ sigrok_src_prepare() {
 	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
+each_ruby_prepare() {
+	sigrok_src_prepare
+}
+
 src_prepare() {
+	if use ruby; then
+		# copy source to where ruby-ng_src_unpack puts it
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		# ruby-ng_src_prepare calls default by itself
+		ruby-ng_src_prepare
+	fi
 	default
 	sigrok_src_prepare
 	use python && python_copy_sources
@@ -86,6 +103,8 @@ src_prepare() {
 
 sigrok_src_configure() {
 	econf \
+		--disable-python \
+		--disable-ruby \
 		$(use_with bluetooth libbluez) \
 		$(use_with ftdi libftdi) \
 		$(use_with hidapi libhidapi) \
@@ -101,12 +120,17 @@ sigrok_src_configure() {
 
 each_python_configure() {
 	cd "${BUILD_DIR}"
-	sigrok_src_configure --disable-ruby --enable-python
+	sigrok_src_configure --enable-python
+}
+
+each_ruby_configure() {
+	RUBY="${RUBY}" sigrok_src_configure --enable-ruby
 }
 
 src_configure() {
-	sigrok_src_configure --disable-ruby --disable-python
+	sigrok_src_configure
 	use python && python_foreach_impl each_python_configure
+	use ruby && ruby-ng_src_configure
 }
 
 each_python_compile() {
@@ -114,9 +138,14 @@ each_python_compile() {
 	emake python-build
 }
 
+each_ruby_compile() {
+	emake ruby-build
+}
+
 src_compile() {
 	default
 	use python && python_foreach_impl each_python_compile
+	use ruby && ruby-ng_src_compile
 }
 
 src_test() {
@@ -129,9 +158,14 @@ each_python_install() {
 	python_optimize
 }
 
+each_ruby_install() {
+	emake ruby-install DESTDIR="${D}"
+}
+
 src_install() {
 	default
 	use python && python_foreach_impl each_python_install
+	use ruby && ruby-ng_src_install
 	use udev && udev_dorules contrib/*.rules
 	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
index 72015cba5833..5e6f74c7e12d 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
index 0e58fddc4fb2..15fa35d024cd 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index 193ac833026d..7500259016a1 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
diff --git a/sci-libs/linbox/linbox-1.7.0-r1.ebuild b/sci-libs/linbox/linbox-1.7.0-r1.ebuild
index eef3546aca5d..be6ccf63e16a 100644
--- a/sci-libs/linbox/linbox-1.7.0-r1.ebuild
+++ b/sci-libs/linbox/linbox-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 # headers all say LGPL-2.1
 LICENSE="GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc opencl openmp"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
index 5c4de4a39ebf..c0230257e175 100644
--- a/sci-libs/m4ri/m4ri-20200125.ebuild
+++ b/sci-libs/m4ri/m4ri-20200125.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4rie/m4rie-20200115-r1.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
index 60d518b539d8..be0f41e475fd 100644
--- a/sci-libs/m4rie/m4rie-20200115-r1.ebuild
+++ b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug static-libs"
 
 DEPEND="sci-libs/m4ri"
diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild
index 7cf62bdcb790..f272f435ece8 100644
--- a/sci-libs/miopen/miopen-6.1.1.ebuild
+++ b/sci-libs/miopen/miopen-6.1.1.ebuild
@@ -58,6 +58,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	if ! use debug; then
 		append-cflags "-DNDEBUG"
 		append-cxxflags "-DNDEBUG"
@@ -91,7 +93,7 @@ src_configure() {
 		check_amdgpu
 	fi
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
index 76afa306787b..d61bc2f3343d 100644
--- a/sci-libs/mpfi/mpfi-1.5.4.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Multiple precision interval arithmetic library based on MPFR"
-HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html"
+HOMEPAGE="https://perso.ens-lyon.fr/nathalie.revol/software.html"
 SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz"
 
 # COPYING is GPL-3, COPYING.LESSER is LGPL-3, source file headers
diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest
index 65f50bc1fcf2..5b59ba271455 100644
--- a/sci-libs/onnx/Manifest
+++ b/sci-libs/onnx/Manifest
@@ -1,2 +1 @@
-DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a SHA512 ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5
 DIST onnx-1.16.1.tar.gz 12428832 BLAKE2B 15a7db2fa263914957c671bd8e94eb8b80afeba0b396e8b54f8fb2deda2965885055efae7a6f6e402eb085b5795025020f650132023ba3d4df1f395d99ec353c SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4
diff --git a/sci-libs/onnx/onnx-1.16.0-r1.ebuild b/sci-libs/onnx/onnx-1.16.0-r1.ebuild
deleted file mode 100644
index 16f073d9b4d3..000000000000
--- a/sci-libs/onnx/onnx-1.16.0-r1.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_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 cmake
-
-DESCRIPTION="Open Neural Network Exchange (ONNX)"
-HOMEPAGE="https://github.com/onnx/onnx"
-SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="disableStaticReg"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-libs/protobuf:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/abseil-cpp"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_configure_all()
-{
-	mycmakeargs=(
-		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
-		-DONNX_USE_LITE_PROTO=ON
-		-DONNX_BUILD_SHARED_LIBS=ON
-		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_configure() {
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	mycmakeargs=(
-		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
-		-DONNX_USE_LITE_PROTO=ON
-		-DONNX_BUILD_SHARED_LIBS=ON
-		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
-	)
-	CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile
-}
-
-python_compile_all() {
-	cmake_src_compile
-}
-
-python_install_all() {
-	cmake_src_install
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-}
diff --git a/sci-libs/onnx/onnx-1.16.1-r1.ebuild b/sci-libs/onnx/onnx-1.16.1-r1.ebuild
new file mode 100644
index 000000000000..0e8227eb2487
--- /dev/null
+++ b/sci-libs/onnx/onnx-1.16.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022-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 cmake
+
+DESCRIPTION="Open Neural Network Exchange (ONNX)"
+HOMEPAGE="https://github.com/onnx/onnx"
+SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="disableStaticReg"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-libs/protobuf:=
+	dev-cpp/abseil-cpp:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_configure_all()
+{
+	mycmakeargs=(
+		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
+		-DONNX_USE_LITE_PROTO=ON
+		-DONNX_BUILD_SHARED_LIBS=ON
+		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	mycmakeargs=(
+		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
+		-DONNX_USE_LITE_PROTO=ON
+		-DONNX_BUILD_SHARED_LIBS=ON
+		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
+	)
+	CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile
+}
+
+python_compile_all() {
+	cmake_src_compile
+}
+
+python_install_all() {
+	cmake_src_install
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+}
diff --git a/sci-libs/onnx/onnx-1.16.1.ebuild b/sci-libs/onnx/onnx-1.16.1.ebuild
deleted file mode 100644
index 16f073d9b4d3..000000000000
--- a/sci-libs/onnx/onnx-1.16.1.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_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 cmake
-
-DESCRIPTION="Open Neural Network Exchange (ONNX)"
-HOMEPAGE="https://github.com/onnx/onnx"
-SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="disableStaticReg"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-libs/protobuf:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/abseil-cpp"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_configure_all()
-{
-	mycmakeargs=(
-		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
-		-DONNX_USE_LITE_PROTO=ON
-		-DONNX_BUILD_SHARED_LIBS=ON
-		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_configure() {
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	mycmakeargs=(
-		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
-		-DONNX_USE_LITE_PROTO=ON
-		-DONNX_BUILD_SHARED_LIBS=ON
-		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
-	)
-	CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile
-}
-
-python_compile_all() {
-	cmake_src_compile
-}
-
-python_install_all() {
-	cmake_src_install
-	distutils-r1_python_install_all
-}
-
-src_install() {
-	distutils-r1_src_install
-}
diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index f3c88aa3ab89..ebb48f6acc7e 100644
--- a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
@@ -52,9 +52,12 @@ RDEPEND="
 		media-libs/fontconfig
 		media-libs/freetype:2
 	)
-	opengl? (
+	gles2-only? (
 		media-libs/libglvnd
 	)
+	opengl? (
+		media-libs/libglvnd[X]
+	)
 	X? (
 		x11-libs/libX11
 	)
diff --git a/sci-libs/opencascade/opencascade-7.8.1.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild
index 94a2d018ce23..30e00b7a18a0 100644
--- a/sci-libs/opencascade/opencascade-7.8.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild
@@ -51,9 +51,12 @@ RDEPEND="
 		media-libs/fontconfig
 		media-libs/freetype:2
 	)
-	opengl? (
+	gles2-only? (
 		media-libs/libglvnd
 	)
+	opengl? (
+		media-libs/libglvnd[X]
+	)
 	X? (
 		x11-libs/libX11
 	)
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index 94a2d018ce23..aa6493d1b426 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -51,9 +51,12 @@ RDEPEND="
 		media-libs/fontconfig
 		media-libs/freetype:2
 	)
-	opengl? (
+	gles2-only? (
 		media-libs/libglvnd
 	)
+	opengl? (
+		media-libs/libglvnd[X]
+	)
 	X? (
 		x11-libs/libX11
 	)
@@ -97,8 +100,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch"
-	"${FILESDIR}/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch"
 	"${FILESDIR}/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch"
 	"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
 	"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild
index 2e32db358efe..5bcb22cdbeda 100644
--- a/sci-libs/openlibm/openlibm-0.8.3.ebuild
+++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild
@@ -13,7 +13,7 @@ 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 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-stack-protection.patch
diff --git a/sci-libs/pcl/files/pcl-1.14.1-gcc15.patch b/sci-libs/pcl/files/pcl-1.14.1-gcc15.patch
new file mode 100644
index 000000000000..41001211bad1
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-gcc15.patch
@@ -0,0 +1,62 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 22 Aug 2024 16:44:39 +0200
+Subject: [PATCH] fix gcc 15
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/registration/include/pcl/registration/correspondence_rejection_features.h
++++ b/registration/include/pcl/registration/correspondence_rejection_features.h
+@@ -203,6 +203,11 @@ protected:
+     /** \brief Empty destructor */
+     ~FeatureContainer() override = default;
+ 
++    inline std::string getClassName()
++    {
++      return "FeatureContainer<FeatureT>";
++    }
++
+     inline void
+     setSourceFeature(const FeatureCloudConstPtr& source_features)
+     {
+--- a/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.h
++++ b/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.h
+@@ -94,6 +94,9 @@ namespace pcl
+         short d , off[DIMENSION];
+         NodeData nodeData;
+ 
++        Point3D<Real> center;
++        int offset[3];
++
+         OctNode(void);
+         ~OctNode(void);
+         int initChildren(void);
+--- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.h
++++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.h
+@@ -56,6 +56,8 @@ namespace pcl
+         bool _contiguous;
+         int _maxEntriesPerRow;
+         static int UseAlloc;
++        std::size_t m_M;
++        std::size_t m_N;
+       public:
+         static Allocator<MatrixEntry<T> > internalAllocator;
+         static int UseAllocator(void);
+--- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
++++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
+@@ -235,7 +235,7 @@ namespace pcl
+     void SparseMatrix<T>::SetIdentity()
+     {
+       SetZero();
+-      for(int ij=0; ij < Min( this->Rows(), this->Columns() ); ij++)
++      for(int ij=0; ij < std::min( this->rows, this->_maxEntriesPerRow ); ij++)
+         (*this)(ij,ij) = T(1);
+     }
+ 
+@@ -388,7 +388,7 @@ namespace pcl
+       T alpha,beta,rDotR;
+       int i;
+ 
+-      solution.Resize(M.Columns());
++      solution.Resize(M._maxEntriesPerRow);
+       solution.SetZero();
+ 
+       d=r=bb;
diff --git a/sci-libs/pcl/files/pcl-1.14.1-tests.patch b/sci-libs/pcl/files/pcl-1.14.1-tests.patch
new file mode 100644
index 000000000000..83919b0c0c07
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-tests.patch
@@ -0,0 +1,26 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 22 Aug 2024 17:40:21 +0200
+Subject: [PATCH] enable tests
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -8,11 +8,12 @@ if(NOT build)
+   return()
+ endif()
+ 
+-find_package(GTestSource REQUIRED)
+-include_directories(SYSTEM ${GTEST_INCLUDE_DIRS} ${GTEST_SRC_DIR})
+-
+-add_library(pcl_gtest STATIC ${GTEST_SRC_DIR}/src/gtest-all.cc)
+-target_include_directories(pcl_gtest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
++find_package(GTest REQUIRED)
++add_library(pcl_gtest INTERFACE IMPORTED)
++set_target_properties(pcl_gtest PROPERTIES
++  INTERFACE_LINK_LIBRARIES GTest::gtest
++  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include
++)
+ 
+ enable_testing()
+ 
+
diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1.ebuild
index 46645bec9842..b5d59362af57 100644
--- a/sci-libs/pcl/pcl-1.14.1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1.ebuild
@@ -14,13 +14,12 @@ else
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
-HOMEPAGE="https://pointclouds.org/"
 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 qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
-# tests need the gtest sources to be available at build time
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/flann-1.7.1
@@ -51,6 +50,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	!!dev-cpp/metslib
+	test? ( dev-cpp/gtest )
 "
 BDEPEND="
 	doc? (
@@ -62,7 +62,8 @@ BDEPEND="
 		dev-python/sphinx-rtd-theme
 		dev-python/sphinxcontrib-doxylink
 	)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 REQUIRED_USE="
 	openni? ( usb )
@@ -73,6 +74,8 @@ REQUIRED_USE="
 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"
 )
 
 src_prepare() {
@@ -101,7 +104,7 @@ src_configure() {
 		"-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=FALSE"
+		-DBUILD_global_tests="$(usex test)"
 	)
 
 	if use qt5; then
@@ -114,3 +117,7 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/test" cmake_src_test
+}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 46645bec9842..b5d59362af57 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -14,13 +14,12 @@ else
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
-HOMEPAGE="https://pointclouds.org/"
 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 qt5 qt6 usb vtk cpu_flags_x86_sse test tutorials"
-# tests need the gtest sources to be available at build time
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/flann-1.7.1
@@ -51,6 +50,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	!!dev-cpp/metslib
+	test? ( dev-cpp/gtest )
 "
 BDEPEND="
 	doc? (
@@ -62,7 +62,8 @@ BDEPEND="
 		dev-python/sphinx-rtd-theme
 		dev-python/sphinxcontrib-doxylink
 	)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 REQUIRED_USE="
 	openni? ( usb )
@@ -73,6 +74,8 @@ REQUIRED_USE="
 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"
 )
 
 src_prepare() {
@@ -101,7 +104,7 @@ src_configure() {
 		"-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=FALSE"
+		-DBUILD_global_tests="$(usex test)"
 	)
 
 	if use qt5; then
@@ -114,3 +117,7 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/test" cmake_src_test
+}
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 647c94900bf4..77c890f33400 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1 +1,2 @@
 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.24.ebuild b/sci-libs/qd/qd-2.3.24.ebuild
new file mode 100644
index 000000000000..2dd5a5b3591a
--- /dev/null
+++ b/sci-libs/qd/qd-2.3.24.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+LICENSE="LBNLBSD"
+SLOT="0"
+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/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
index 26bfc2ada24d..b4fe232ecfe8 100644
--- a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
@@ -58,9 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /dev/random
-	addpredict /dev/kfd
-	addpredict /dev/dri/
+	rocm_use_hipcc
 
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
@@ -86,7 +84,7 @@ src_configure() {
 		)
 	fi
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
index 4eef4ea268dc..99709902c496 100644
--- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -101,6 +101,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -112,7 +114,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
index cd85f27b6500..5829c9167987 100644
--- a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
+++ b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
@@ -42,6 +42,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -51,7 +53,7 @@ src_configure() {
 		-DROCM_SYMLINK_LIBS=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
index 1cfbcdbd04f3..e3b1aa20b634 100644
--- a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
+++ b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
@@ -33,6 +33,8 @@ 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)"
@@ -42,7 +44,7 @@ src_configure() {
 		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
index 4fe2bbbdaca1..c2fdccf5764b 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
@@ -32,6 +32,8 @@ BDEPEND="test? ( dev-cpp/gtest
 RESTRICT="!test? ( test )"
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -43,7 +45,7 @@ src_configure() {
 		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
index 31d07cee0a08..c18eeff84c43 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
 		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 grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+		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}"
diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild
index e370820ce9dc..1864cd0ee3b2 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r2.ebuild
@@ -95,7 +95,7 @@ src_prepare() {
 		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 grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+		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}"
diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
index 093273002e65..2e3168095ed5 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
@@ -90,8 +90,7 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /dev/kfd
-	addpredict /dev/dri/
+	rocm_use_hipcc
 
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
@@ -103,7 +102,7 @@ src_configure() {
 		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
index 7a04d78cbe0f..c63a53337467 100644
--- a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
+++ b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
@@ -32,6 +32,8 @@ BDEPEND=">=dev-build/cmake-3.22"
 PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -40,7 +42,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
index a3f8d61463b1..3122ab799976 100644
--- a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
+++ b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
@@ -44,6 +44,8 @@ PATCHES=(
 )
 
 src_configure() {
+	rocm_use_hipcc
+
 	# ld.lld bug https://github.com/llvm/llvm-project/issues/61101
 	filter-lto
 
@@ -55,7 +57,7 @@ src_configure() {
 		-DROCWMMA_BUILD_TESTS="$(usex test)"
 	)
 	use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON)
-	CC=hipcc CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index b333ecdd8776..53c3575548ce 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,2 +1 @@
-DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f SHA512 bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942
 DIST rtabmap-0.21.3.tar.gz 21956462 BLAKE2B 41c3c95715bc165d339a4a63747e40db4357ffd1b5151630689008a6856c4721805ec8def9b47ea487ca428641b5d253dfa5b62b1bbb14027168bbc0e4c350d3 SHA512 0b9b2d2fdcfdef0324fcde54a74ecec75786372f2df0bd8d9383ae71c500098bff016465a68ce2a9328d0a2beee4bf9b0af6b21435589ce1e91503fe2aca5d01
diff --git a/sci-libs/rtabmap/files/vtk.patch b/sci-libs/rtabmap/files/vtk.patch
deleted file mode 100644
index adb80216a8da..000000000000
--- a/sci-libs/rtabmap/files/vtk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: rtabmap-0.20.22-rolling/guilib/src/opencv/vtkImageMatSource.cpp
-===================================================================
---- rtabmap-0.20.22-rolling.orig/guilib/src/opencv/vtkImageMatSource.cpp
-+++ rtabmap-0.20.22-rolling/guilib/src/opencv/vtkImageMatSource.cpp
-@@ -48,6 +48,7 @@
- #include <vtkInformationVector.h>
- #include <vtkStreamingDemandDrivenPipeline.h>
- #include <vtkObjectFactory.h>
-+#include <vtkVersionMacros.h>
- 
- namespace rtabmap {
- 	vtkStandardNewMacro(vtkImageMatSource);
diff --git a/sci-libs/rtabmap/files/yamlcpp.patch b/sci-libs/rtabmap/files/yamlcpp.patch
deleted file mode 100644
index e6a3b74f5e04..000000000000
--- a/sci-libs/rtabmap/files/yamlcpp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: rtabmap-0.20.13-rolling/tools/EurocDataset/CMakeLists.txt
-===================================================================
---- rtabmap-0.20.13-rolling.orig/tools/EurocDataset/CMakeLists.txt
-+++ rtabmap-0.20.13-rolling/tools/EurocDataset/CMakeLists.txt
-@@ -1,8 +1,5 @@
- cmake_minimum_required(VERSION 2.8)
- 
--FIND_PACKAGE(yaml-cpp QUIET)
--
--IF(NOT yaml-cpp_FOUND)
-    find_package(PkgConfig QUIET)
-    IF(PKG_CONFIG_FOUND)
-       pkg_check_modules(yaml_cpp QUIET yaml-cpp)
-@@ -12,7 +9,6 @@ IF(NOT yaml-cpp_FOUND)
-          SET(yaml-cpp_FOUND ${yaml_cpp_FOUND})
- 	  ENDIF(yaml_cpp_FOUND)
-    ENDIF(PKG_CONFIG_FOUND)
--ENDIF(NOT yaml-cpp_FOUND)
- 
- IF(yaml-cpp_FOUND)
- 
diff --git a/sci-libs/rtabmap/rtabmap-0.20.23.ebuild b/sci-libs/rtabmap/rtabmap-0.20.23.ebuild
deleted file mode 100644
index 480f83d5b6bb..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.20.23.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake multilib
-
-VER_SUFFIX=rolling
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}-${VER_SUFFIX}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	ieee1394? ( media-libs/libdc1394:2= )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/yamlcpp.patch" "${FILESDIR}/vtk.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index 0f85a555538f..5e0156db5e06 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,3 +1 @@
-DIST scalapack-2.1.0-gcc10.patch 231026 BLAKE2B dacecca8307cd2bf7a20e6453fb17bc1f5a3f2926b6d8f3b89f7f8d34993368574804f0427f228de4525f2b2d73105de561588ba5a4d2fb609d5ed035f51ddc9 SHA512 a11057599639c167e907f8e4d45204174fd326e2ffb9e2d05533db23d8e2dd8cfc1d37f06d5502baa3d5714092fbf4638cf4d9fea84ca9d4fb150e21cc57861e
-DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2 SHA512 0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4
 DIST scalapack-2.2.0_p20240704.tar.gz 4776451 BLAKE2B 927f6af5196c350cb48bdc0e2a6af40e8212045150b976367852926decabafa13dd5a9b680ad4aa1fce051b5fe3987ee9c034042ffdbba7fde4175847313f96b SHA512 ddd37cd4291f00fbdd9c27d23849238d2f32807b0fba86301cb73a6463f1b4feaf97a5c492ab6ac1c01139f0d1d7d06af898ec90366e5812b6524538812a53ea
diff --git a/sci-libs/scalapack/scalapack-2.1.0-r1.ebuild b/sci-libs/scalapack/scalapack-2.1.0-r1.ebuild
deleted file mode 100644
index 192ee312b7ca..000000000000
--- a/sci-libs/scalapack/scalapack-2.1.0-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=7
-
-inherit cmake flag-o-matic fortran-2 toolchain-funcs
-
-GCC10_PATCH_HASH="bc6cad585362aa58e05186bb85d4b619080c45a9"
-
-DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
-HOMEPAGE="https://www.netlib.org/scalapack/"
-SRC_URI="
-	https://www.netlib.org/scalapack/${P}.tgz
-	https://github.com/Reference-ScaLAPACK/scalapack/commit/${GCC10_PATCH_HASH}.patch -> ${P}-gcc10.patch
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	virtual/lapack
-	virtual/mpi[fortran]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${DISTDIR}/${P}-gcc10.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use static-libs; then
-		mkdir "${WORKDIR}/${PN}_static" || die
-	fi
-	# mpi does not have a pc file
-	sed -i -e 's/mpi//' scalapack.pc.in || die
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/862924
-	# https://github.com/Reference-ScaLAPACK/scalapack/issues/95
-	#
-	# Do not trust it for LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	scalapack_configure() {
-		local mycmakeargs=(
-			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-			-DBUILD_TESTING=$(usex test)
-			$@
-		)
-		cmake_src_configure
-	}
-
-	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
-		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
-}
-
-src_compile() {
-	cmake_src_compile
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_install
-
-	insinto /usr/include/blacs
-	doins BLACS/SRC/*.h
-
-	insinto /usr/include/scalapack
-	doins PBLAS/SRC/*.h
-}
diff --git a/sci-libs/spqr/spqr-2.0.9-r3.ebuild b/sci-libs/spqr/spqr-2.0.9-r3.ebuild
index b63bdbe966ea..a7499f3bf790 100644
--- a/sci-libs/spqr/spqr-2.0.9-r3.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit libtool
+
 DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
@@ -25,6 +27,11 @@ DEPEND="
 	tbb? ( <dev-cpp/tbb-2021:= )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	default
+	elibtoolize
+}
+
 src_configure() {
 	econf \
 		--disable-static \
diff --git a/sci-libs/spqr/spqr-2.0.9-r4.ebuild b/sci-libs/spqr/spqr-2.0.9-r4.ebuild
new file mode 100644
index 000000000000..92082b0cee2e
--- /dev/null
+++ b/sci-libs/spqr/spqr-2.0.9-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool
+
+DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc partition tbb"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+# We require the cholmod supernodal module that is enabled with
+# USE=lapack, and cholmod has to have partition support if spqr is going
+# to have it (the ./configure script for spqr checks this). Note that
+# spqr links to metis directly, too.
+DEPEND="
+	virtual/lapack
+	=sci-libs/cholmod-3*[lapack,partition?]
+	partition? ( >=sci-libs/metis-5.1.0 )
+	tbb? ( <dev-cpp/tbb-2021:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_with doc) \
+		$(use_with partition) \
+		$(use_with tbb)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 0de6728aeb82..1cc10b5289f4 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild b/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild
index 9e2594472ee3..ff73f597c54d 100644
--- a/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild
+++ b/sci-libs/symmetrica/symmetrica-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://gitlab.com/sagemath/symmetrica/uploads/b3d8e1ad5ab2449c30bbc314
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="doc"
 
 DOCS=( README.md )
diff --git a/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch
new file mode 100644
index 000000000000..e22dfbe5025b
--- /dev/null
+++ b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gcc15.patch
@@ -0,0 +1,10 @@
+--- a/tensorpipe/common/allocator.h	2024-09-06 21:57:32.806149494 +0200
++++ b/tensorpipe/common/allocator.h	2024-09-06 21:57:54.018918083 +0200
+@@ -13,6 +13,7 @@
+ #include <functional>
+ #include <memory>
+ #include <vector>
++#include <cstdint>
+ 
+ #include <tensorpipe/common/error.h>
+ 
diff --git a/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild b/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild
index 0ff4c6216eef..7783066e9de0 100644
--- a/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild
+++ b/sci-libs/tensorpipe/tensorpipe-2022.05.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,6 +12,8 @@ HOMEPAGE="https://github.com/pytorch/tensorpipe/"
 SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
 	-> ${P}.tar.gz"
 
+S="${WORKDIR}"/${PN}-${CommitId}
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -28,11 +30,10 @@ DEPEND="${RDEPEND}
 	dev-libs/libnop
 "
 
-S="${WORKDIR}"/${PN}-${CommitId}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${P}-gcc15.patch
 )
 
 src_configure() {
diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch
new file mode 100644
index 000000000000..df2d6fc61167
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch
@@ -0,0 +1,46 @@
+From d00b98bd8ef02f854f1068e8ab8fd2fb28244c3b Mon Sep 17 00:00:00 2001
+From: Ted Rodgers <ted.d.rodgers@gmail.com>
+Date: Sat, 10 Aug 2024 16:13:09 -0400
+Subject: [PATCH] include cstdint + correct case/words
+
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
+@@ -11402,7 +11402,7 @@ public:
+ 
+     VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const
+     {
+-      return this->CellFacePortal.Get(pointIndex);
++      return this->CellEdgesPortal.Get(pointIndex);
+     }
+ 
+   private:
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
+@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
+   auto hyperarcsPortal = this->Hyperarcs.ReadPortal();
+   auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();
+   auto whichIterationPortal = this->WhichIteration.ReadPortal();
+-  auto whichRoundPortal = this->whichRound.ReadPortal();
++  auto whichRoundPortal = this->WhichRound.ReadPortal();
+   auto superarcsPortal = this->Superarcs.ReadPortal();
+   auto superparentsPortal = this->Superparents.ReadPortal();
+   for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)
+@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
+     if (contourtree_augmented::NoSuchElement(superarcTo))
+     { // no superarc
+       // if it occurred on the final round, it's the global root and is shown as the NULL node
+-      if (whichRoundPortal.Get(superarcFrom) == this->NRounds)
++      if (whichRoundPortal.Get(superarcFrom) == this->NumRounds)
+       { // root node
+         outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc
+                   << " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp
+@@ -136,6 +136,7 @@
+ //
+ #pragma once
+ 
++#include <cstdint>
+ #include <type_traits>
+ #include <cstddef>
+ #include <memory>
diff --git a/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch
new file mode 100644
index 000000000000..7c4d4544a490
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-core-octree_node.txx.patch
@@ -0,0 +1,18 @@
+From b5f466a66771621a3aaa15434910f413ab7168f7 Mon Sep 17 00:00:00 2001
+From: Ted Rodgers <ted.d.rodgers@gmail.com>
+Date: Sat, 10 Aug 2024 16:10:13 -0400
+Subject: [PATCH] octree_node.txx fix chilren typo
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/Utilities/octree/octree/octree_node.txx
++++ b/Utilities/octree/octree/octree_node.txx
+@@ -210,7 +210,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_>::operator[](int child) co
+   {
+     throw std::domain_error("Attempt to access children of an octree leaf node.");
+   }
+-  return this->_M_chilren[child];
++  return this->m_children[child];
+ }
+ 
+ /**\brief Return a reference to a child node.
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
new file mode 100644
index 000000000000..ac519f98aa63
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch
@@ -0,0 +1,72 @@
+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/vtk-9.2.5-r2.ebuild b/sci-libs/vtk/vtk-9.2.5-r2.ebuild
new file mode 100644
index 000000000000..4af7d8df0261
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.2.5-r2.ebuild
@@ -0,0 +1,746 @@
+# 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_{9..11} )
+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)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+	test? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+"
+S="${WORKDIR}/VTK-${PV}"
+
+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 imaging
+	java las +logging mpi mysql odbc 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 openvdb pdal
+		postgres rendering views
+	)
+	cuda? ( video_cards_nvidia vtkm )
+	java? ( rendering )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( rendering )
+	qt6? ( rendering )
+	sdl? ( rendering )
+	tk? ( python rendering )
+	web? ( python )
+"
+
+# for <pegtl-3 dependency see
+# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
+# 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-cpp/eigen
+	dev-cpp/nlohmann_json
+	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/pegtl-3
+	dev-libs/pugixml
+	dev-libs/utfcpp
+	media-libs/freetype
+	media-libs/libjpeg-turbo
+	>=media-libs/libharu-2.4.2:=
+	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-1.8:* )
+	las? ( sci-geosciences/liblas )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( dev-db/mariadb-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openvdb? ( media-gfx/openvdb:= )
+	pdal? ( <sci-libs/pdal-2.6.0:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		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} )
+"
+
+# for <pegtl-3 dependency see
+# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
+DEPEND="
+	${RDEPEND}
+	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.2-vtkGeometryFilter-add-missing-mutex-header-file.patch
+	"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
+	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
+	"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
+	"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
+)
+
+DOCS=( CONTRIBUTING.md README.md )
+
+vtk_check_reqs() {
+	local dsk=4096
+	local mem=$(( $(usex cuda 7168 0) ))
+
+	dsk=$(( $(usex doc 3072 0) + ${dsk} ))
+	dsk=$(( $(usex examples 3072 0) + ${dsk} ))
+	dsk=$(( $(usex cuda 8192 0) + ${dsk} ))
+
+	# 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)")
+	else
+		if [[ -n "${MAKEOPTS}" ]]; then
+			jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		fi
+	fi
+	mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) ))
+
+	use cuda && export CHECKREQS_MEMORY=${mem}M
+	export CHECKREQS_DISK_BUILD=${dsk}M
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+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
+
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
+	# bug #835659
+	if use cuda; then
+		if [[ ${VTK_CUDA_ARCH} = native ]]; then
+			eerror "Using native CUDA arches is currently broken."
+			eerror "Please set it to one of the common arch names:"
+			eerror "kepler, maxwell, pascal, turing or ampere."
+			die "Please set VTK_CUDA_ARCH environment variable!"
+		fi
+	fi
+
+	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
+
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
+	# bug #835659
+	if use cuda; then
+		if [[ ${VTK_CUDA_ARCH} = native ]]; then
+			eerror "Using native CUDA arches is currently broken."
+			eerror "Please set it to one of the common arch names:"
+			eerror "kepler, maxwell, pascal, turing or ampere."
+			die "Please set VTK_CUDA_ARCH environment variable!"
+		fi
+	fi
+
+	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: cli11 (::guru), 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
+
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+
+	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-${PV}/.ExternalData/README.rst . || die
+		ln -sf ../../VTK-${PV}/.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_ANDROID_BUILD=OFF
+		-DVTK_IOS_BUILD=OFF
+
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
+		# we use the pre-built documentation and install these with USE=doc
+		-DVTK_BUILD_DOCUMENTATION=OFF
+		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
+
+		# no package in the tree: https://github.com/LLNL/conduit
+		-DVTK_ENABLE_CATALYST=OFF
+		-DVTK_ENABLE_KITS=OFF
+		-DVTK_ENABLE_LOGGING=$(usex logging ON OFF)
+		# defaults to ON: USE flag for this?
+		-DVTK_ENABLE_REMOTE_MODULES=OFF
+
+		# disable fetching files during build
+		-DVTK_FORBID_DOWNLOADS=ON
+
+		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_StandAlone="YES"
+		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT")
+
+		-DVTK_INSTALL_SDK=ON
+
+		-DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite
+		-DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IOXML="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT"
+		-DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_cgns="WANT"
+		-DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT"
+		-DVTK_MODULE_ENABLE_VTK_eigen="WANT"
+		-DVTK_MODULE_ENABLE_VTK_expat="WANT"
+		-DVTK_MODULE_ENABLE_VTK_fmt="WANT"
+		-DVTK_MODULE_ENABLE_VTK_freetype="WANT"
+		-DVTK_MODULE_ENABLE_VTK_hdf5="WANT"
+		-DVTK_MODULE_ENABLE_VTK_jpeg="WANT"
+		-DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libharu="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libproj="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libxml2="WANT"
+		-DVTK_MODULE_ENABLE_VTK_lz4="WANT"
+		-DVTK_MODULE_ENABLE_VTK_lzma="WANT"
+		-DVTK_MODULE_ENABLE_VTK_netcdf="WANT"
+		-DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT"
+		-DVTK_MODULE_ENABLE_VTK_ogg="WANT"
+		-DVTK_MODULE_ENABLE_VTK_pegtl="WANT"
+		-DVTK_MODULE_ENABLE_VTK_png="WANT"
+		-DVTK_MODULE_ENABLE_VTK_pugixml="WANT"
+		-DVTK_MODULE_ENABLE_VTK_sqlite="WANT"
+		-DVTK_MODULE_ENABLE_VTK_theora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_tiff="WANT"
+		-DVTK_MODULE_ENABLE_VTK_utf8="WANT"
+		-DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_zlib="WANT"
+
+		# not packaged in Gentoo
+		-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 ON OFF)
+		-DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
+		-DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
+
+		-DVTK_UNIFIED_INSTALL_TREE=ON
+
+		-DVTK_USE_CUDA=$(usex cuda ON OFF)
+		# 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 ON OFF)
+		-DVTK_USE_TK=$(usex tk ON OFF)
+		-DVTK_USE_X=ON
+
+		-DVTK_WHEEL_BUILD=OFF
+
+		-DVTK_WRAP_JAVA=$(usex java ON OFF)
+		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
+	)
+
+	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"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	fi
+
+	if use boost; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
+		)
+	fi
+
+	# TODO: checks this on updates of nvidia-cuda-toolkit and update
+	# the list of available arches if necessary, i.e. add new arches
+	# once they are released at the end of the list before all.
+	# See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+	# CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake,
+	# as of 3.25.1 doesn't recognize these keywords.
+	# FIXME: better use numbers than names?
+	if use cuda; then
+		local cuda_arch=
+		case ${VTK_CUDA_ARCH:-native} in
+			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
+			# no longer supports it
+			kepler|maxwell|pascal|volta|turing|ampere|all)
+				cuda_arch=${VTK_CUDA_ARCH}
+				;;
+#			native)
+#				ewarn "If auto detection fails for you, please try and export the"
+#				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
+#				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
+#				cuda_arch=native
+#				;;
+			*)
+				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
+				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
+				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
+				;;
+		esac
+		ewarn "Using CUDA architecture '${cuda_arch}'"
+
+		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
+	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="WANT" )
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" )
+		fi
+	fi
+
+	if use gdal; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
+		)
+	fi
+
+	if use imaging; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT"
+		)
+		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" )
+	fi
+
+	if ! use java && ! use python; then
+		# defaults to ON
+		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_JARDIR="share/${PN}"
+			-DVTK_ENABLE_WRAPPING=ON
+			-DVTK_MODULE_ENABLE_VTK_Java="WANT"
+		)
+	fi
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_MPI="YES"
+			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
+			-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+		)
+		use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" )
+		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
+		if use rendering; then
+			mycmakeargs+=(
+				-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
+				-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT"
+			)
+		fi
+		use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON )
+	else
+		mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" )
+	fi
+
+	use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" )
+	use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
+	use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" )
+	use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" )
+
+	if use python; then
+		mycmakeargs+=(
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DVTK_ENABLE_WRAPPING=ON
+			-DVTK_MODULE_ENABLE_VTK_Python="WANT"
+			-DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT"
+			-DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT"
+			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
+		)
+		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" )
+	fi
+
+	if use qt5 && use qt6; 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"
+		)
+	else
+		if use qt5; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
+				-DVTK_QT_VERSION="5"
+			)
+		elif use qt6; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml"
+				-DVTK_QT_VERSION="6"
+			)
+		else
+			mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" )
+		fi
+	fi
+
+	if use qt5 || use qt6; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT"
+		)
+		if use mysql || use postgres; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
+		fi
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
+		fi
+		if use views; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
+		fi
+	fi
+
+	if use rendering; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_OSPRAY=OFF
+
+			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_gl2ps="WANT"
+			-DVTK_MODULE_ENABLE_VTK_glew="WANT"
+			-DVTK_MODULE_ENABLE_VTK_opengl="WANT"
+
+			-DVTK_USE_SDL2=$(usex sdl "YES" "NO")
+		)
+		use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" )
+		use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" )
+		use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" )
+	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=ON
+
+			# requested even if all use flags are off
+			-DVTK_MODULE_ENABLE_VTK_octree="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	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 < stdpthread < 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
+		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="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT"
+		)
+	fi
+
+	if use vtkm; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT"
+
+			-DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221
+			-DVTKm_Vectorization=native
+		)
+	fi
+
+	if use web; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_WebCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT"
+		)
+		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" )
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	cmake_src_configure
+}
+
+src_compile() {
+	use test && cmake_build VTKData
+	cmake_src_compile
+}
+
+# FIXME: avoid nonfatal?
+# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
+src_test() {
+#	nonfatal virtx cmake_src_test
+	virtx cmake_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.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
deleted file mode 100644
index 7460dc7f2461..000000000000
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ /dev/null
@@ -1,746 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-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)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
-	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
-	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
-	)
-	test? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
-	)
-"
-S="${WORKDIR}/VTK-${PV}"
-
-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 imaging
-	java las +logging mpi mysql odbc 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 openvdb pdal
-		postgres rendering views
-	)
-	cuda? ( video_cards_nvidia vtkm )
-	java? ( rendering )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( rendering )
-	qt6? ( rendering )
-	sdl? ( rendering )
-	tk? ( python rendering )
-	web? ( python )
-"
-
-# for <pegtl-3 dependency see
-# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
-# 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-cpp/eigen
-	dev-cpp/nlohmann_json
-	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/pegtl-3
-	dev-libs/pugixml
-	dev-libs/utfcpp
-	media-libs/freetype
-	media-libs/libjpeg-turbo
-	>=media-libs/libharu-2.4.2:=
-	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-1.8:* )
-	las? ( sci-geosciences/liblas )
-	mpi? ( virtual/mpi[cxx,romio] )
-	mysql? ( dev-db/mariadb-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openvdb? ( media-gfx/openvdb:= )
-	pdal? ( <sci-libs/pdal-2.6.0:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtopengl:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsql:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		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} )
-"
-
-# for <pegtl-3 dependency see
-# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
-DEPEND="
-	${RDEPEND}
-	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.2-vtkGeometryFilter-add-missing-mutex-header-file.patch
-	"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
-	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
-	"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
-	"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
-)
-
-DOCS=( CONTRIBUTING.md README.md )
-
-vtk_check_reqs() {
-	local dsk=4096
-	local mem=$(( $(usex cuda 7168 0) ))
-
-	dsk=$(( $(usex doc 3072 0) + ${dsk} ))
-	dsk=$(( $(usex examples 3072 0) + ${dsk} ))
-	dsk=$(( $(usex cuda 8192 0) + ${dsk} ))
-
-	# 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)")
-	else
-		if [[ -n "${MAKEOPTS}" ]]; then
-			jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		fi
-	fi
-	mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) ))
-
-	use cuda && export CHECKREQS_MEMORY=${mem}M
-	export CHECKREQS_DISK_BUILD=${dsk}M
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-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
-
-	if use qt6 && use qt5; then
-		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
-	fi
-
-	# bug #835659
-	if use cuda; then
-		if [[ ${VTK_CUDA_ARCH} = native ]]; then
-			eerror "Using native CUDA arches is currently broken."
-			eerror "Please set it to one of the common arch names:"
-			eerror "kepler, maxwell, pascal, turing or ampere."
-			die "Please set VTK_CUDA_ARCH environment variable!"
-		fi
-	fi
-
-	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
-
-	if use qt6 && use qt5; then
-		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
-	fi
-
-	# bug #835659
-	if use cuda; then
-		if [[ ${VTK_CUDA_ARCH} = native ]]; then
-			eerror "Using native CUDA arches is currently broken."
-			eerror "Please set it to one of the common arch names:"
-			eerror "kepler, maxwell, pascal, turing or ampere."
-			die "Please set VTK_CUDA_ARCH environment variable!"
-		fi
-	fi
-
-	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: cli11 (::guru), 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
-
-	cmake_src_prepare
-
-	if use cuda; then
-		cuda_add_sandbox -w
-		cuda_src_prepare
-	fi
-
-	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-${PV}/.ExternalData/README.rst . || die
-		ln -sf ../../VTK-${PV}/.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_ANDROID_BUILD=OFF
-		-DVTK_IOS_BUILD=OFF
-
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
-		# we use the pre-built documentation and install these with USE=doc
-		-DVTK_BUILD_DOCUMENTATION=OFF
-		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
-
-		# no package in the tree: https://github.com/LLNL/conduit
-		-DVTK_ENABLE_CATALYST=OFF
-		-DVTK_ENABLE_KITS=OFF
-		-DVTK_ENABLE_LOGGING=$(usex logging ON OFF)
-		# defaults to ON: USE flag for this?
-		-DVTK_ENABLE_REMOTE_MODULES=OFF
-
-		# disable fetching files during build
-		-DVTK_FORBID_DOWNLOADS=ON
-
-		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT")
-		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT")
-		-DVTK_GROUP_ENABLE_StandAlone="YES"
-		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT")
-		-DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT")
-
-		-DVTK_INSTALL_SDK=ON
-
-		-DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite
-		-DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_IOXML="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT"
-		-DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_cgns="WANT"
-		-DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT"
-		-DVTK_MODULE_ENABLE_VTK_eigen="WANT"
-		-DVTK_MODULE_ENABLE_VTK_expat="WANT"
-		-DVTK_MODULE_ENABLE_VTK_fmt="WANT"
-		-DVTK_MODULE_ENABLE_VTK_freetype="WANT"
-		-DVTK_MODULE_ENABLE_VTK_hdf5="WANT"
-		-DVTK_MODULE_ENABLE_VTK_jpeg="WANT"
-		-DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT"
-		-DVTK_MODULE_ENABLE_VTK_libharu="WANT"
-		-DVTK_MODULE_ENABLE_VTK_libproj="WANT"
-		-DVTK_MODULE_ENABLE_VTK_libxml2="WANT"
-		-DVTK_MODULE_ENABLE_VTK_lz4="WANT"
-		-DVTK_MODULE_ENABLE_VTK_lzma="WANT"
-		-DVTK_MODULE_ENABLE_VTK_netcdf="WANT"
-		-DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT"
-		-DVTK_MODULE_ENABLE_VTK_ogg="WANT"
-		-DVTK_MODULE_ENABLE_VTK_pegtl="WANT"
-		-DVTK_MODULE_ENABLE_VTK_png="WANT"
-		-DVTK_MODULE_ENABLE_VTK_pugixml="WANT"
-		-DVTK_MODULE_ENABLE_VTK_sqlite="WANT"
-		-DVTK_MODULE_ENABLE_VTK_theora="WANT"
-		-DVTK_MODULE_ENABLE_VTK_tiff="WANT"
-		-DVTK_MODULE_ENABLE_VTK_utf8="WANT"
-		-DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_zlib="WANT"
-
-		# not packaged in Gentoo
-		-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 ON OFF)
-		-DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
-		-DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
-
-		-DVTK_UNIFIED_INSTALL_TREE=ON
-
-		-DVTK_USE_CUDA=$(usex cuda ON OFF)
-		# 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 ON OFF)
-		-DVTK_USE_TK=$(usex tk ON OFF)
-		-DVTK_USE_X=ON
-
-		-DVTK_WHEEL_BUILD=OFF
-
-		-DVTK_WRAP_JAVA=$(usex java ON OFF)
-		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
-	)
-
-	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"
-
-			# available in ::guru, so avoid  detection if installed
-			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
-		)
-	fi
-
-	if use boost; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
-			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
-		)
-	fi
-
-	# TODO: checks this on updates of nvidia-cuda-toolkit and update
-	# the list of available arches if necessary, i.e. add new arches
-	# once they are released at the end of the list before all.
-	# See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
-	# CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake,
-	# as of 3.25.1 doesn't recognize these keywords.
-	# FIXME: better use numbers than names?
-	if use cuda; then
-		local cuda_arch=
-		case ${VTK_CUDA_ARCH:-native} in
-			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
-			# no longer supports it
-			kepler|maxwell|pascal|volta|turing|ampere|all)
-				cuda_arch=${VTK_CUDA_ARCH}
-				;;
-#			native)
-#				ewarn "If auto detection fails for you, please try and export the"
-#				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
-#				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
-#				cuda_arch=native
-#				;;
-			*)
-				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
-				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
-				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
-				;;
-		esac
-		ewarn "Using CUDA architecture '${cuda_arch}'"
-
-		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
-	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="WANT" )
-		if use rendering; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" )
-		fi
-	fi
-
-	if use gdal; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
-		)
-	fi
-
-	if use imaging; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT"
-		)
-		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" )
-	fi
-
-	if ! use java && ! use python; then
-		# defaults to ON
-		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
-	fi
-
-	if use java; then
-		mycmakeargs+=(
-			-DCMAKE_INSTALL_JARDIR="share/${PN}"
-			-DVTK_ENABLE_WRAPPING=ON
-			-DVTK_MODULE_ENABLE_VTK_Java="WANT"
-		)
-	fi
-
-	if use mpi; then
-		mycmakeargs+=(
-			-DVTK_GROUP_ENABLE_MPI="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
-			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
-			-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-		)
-		use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" )
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
-		if use rendering; then
-			mycmakeargs+=(
-				-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
-				-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT"
-			)
-		fi
-		use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON )
-	else
-		mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" )
-	fi
-
-	use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" )
-	use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
-	use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" )
-	use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" )
-
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DVTK_ENABLE_WRAPPING=ON
-			-DVTK_MODULE_ENABLE_VTK_Python="WANT"
-			-DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT"
-			-DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT"
-			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
-		)
-		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" )
-	fi
-
-	if use qt5 && use qt6; 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"
-		)
-	else
-		if use qt5; then
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
-				-DVTK_QT_VERSION="5"
-			)
-		elif use qt6; then
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml"
-				-DVTK_QT_VERSION="6"
-			)
-		else
-			mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" )
-		fi
-	fi
-
-	if use qt5 || use qt6; then
-		mycmakeargs+=(
-			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT"
-		)
-		if use mysql || use postgres; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
-		fi
-		if use rendering; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
-		fi
-		if use views; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
-		fi
-	fi
-
-	if use rendering; then
-		mycmakeargs+=(
-			-DVTK_ENABLE_OSPRAY=OFF
-
-			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_gl2ps="WANT"
-			-DVTK_MODULE_ENABLE_VTK_glew="WANT"
-			-DVTK_MODULE_ENABLE_VTK_opengl="WANT"
-
-			-DVTK_USE_SDL2=$(usex sdl "YES" "NO")
-		)
-		use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" )
-		use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" )
-		use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" )
-	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=ON
-
-			# requested even if all use flags are off
-			-DVTK_MODULE_ENABLE_VTK_octree="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
-
-			# available in ::guru, so avoid  detection if installed
-			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
-		)
-	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 < stdpthread < 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
-		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="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT"
-		)
-	fi
-
-	if use vtkm; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT"
-
-			-DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221
-			-DVTKm_Vectorization=native
-		)
-	fi
-
-	if use web; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_WebCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT"
-		)
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" )
-	fi
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	cmake_src_configure
-}
-
-src_compile() {
-	use test && cmake_build VTKData
-	cmake_src_compile
-}
-
-# FIXME: avoid nonfatal?
-# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
-src_test() {
-#	nonfatal virtx cmake_src_test
-	virtx cmake_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.2.6-r1.ebuild b/sci-libs/vtk/vtk-9.2.6-r1.ebuild
deleted file mode 100644
index bb87bdb1068e..000000000000
--- a/sci-libs/vtk/vtk-9.2.6-r1.ebuild
+++ /dev/null
@@ -1,747 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-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)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
-	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
-	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
-	)
-	test? (
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
-	)
-"
-S="${WORKDIR}/VTK-${PV}"
-
-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 imaging
-	java las +logging mpi mysql odbc 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 openvdb pdal
-		postgres rendering views
-	)
-	cuda? ( video_cards_nvidia vtkm )
-	java? ( rendering )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( rendering )
-	qt6? ( rendering )
-	sdl? ( rendering )
-	tk? ( python rendering )
-	web? ( python )
-"
-
-# for <pegtl-3 dependency see
-# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
-# 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-cpp/eigen
-	dev-cpp/nlohmann_json
-	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/pegtl-3
-	dev-libs/pugixml
-	dev-libs/utfcpp
-	media-libs/freetype
-	media-libs/libjpeg-turbo
-	>=media-libs/libharu-2.4.2:=
-	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-1.8:* )
-	las? ( sci-geosciences/liblas )
-	mpi? ( virtual/mpi[cxx,romio] )
-	mysql? ( dev-db/mariadb-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openvdb? ( media-gfx/openvdb:= )
-	pdal? ( <sci-libs/pdal-2.6.0:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtopengl:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsql:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		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} )
-"
-
-# for <pegtl-3 dependency see
-# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
-DEPEND="
-	${RDEPEND}
-	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.2-vtkGeometryFilter-add-missing-mutex-header-file.patch
-	"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
-	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
-	"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
-	"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
-	"${FILESDIR}"/vtk-9.2.6-Java21.patch
-)
-
-DOCS=( CONTRIBUTING.md README.md )
-
-vtk_check_reqs() {
-	local dsk=4096
-	local mem=$(( $(usex cuda 7168 0) ))
-
-	dsk=$(( $(usex doc 3072 0) + ${dsk} ))
-	dsk=$(( $(usex examples 3072 0) + ${dsk} ))
-	dsk=$(( $(usex cuda 8192 0) + ${dsk} ))
-
-	# 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)")
-	else
-		if [[ -n "${MAKEOPTS}" ]]; then
-			jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		fi
-	fi
-	mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) ))
-
-	use cuda && export CHECKREQS_MEMORY=${mem}M
-	export CHECKREQS_DISK_BUILD=${dsk}M
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-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
-
-	if use qt6 && use qt5; then
-		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
-	fi
-
-	# bug #835659
-	if use cuda; then
-		if [[ ${VTK_CUDA_ARCH} = native ]]; then
-			eerror "Using native CUDA arches is currently broken."
-			eerror "Please set it to one of the common arch names:"
-			eerror "kepler, maxwell, pascal, turing or ampere."
-			die "Please set VTK_CUDA_ARCH environment variable!"
-		fi
-	fi
-
-	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
-
-	if use qt6 && use qt5; then
-		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
-	fi
-
-	# bug #835659
-	if use cuda; then
-		if [[ ${VTK_CUDA_ARCH} = native ]]; then
-			eerror "Using native CUDA arches is currently broken."
-			eerror "Please set it to one of the common arch names:"
-			eerror "kepler, maxwell, pascal, turing or ampere."
-			die "Please set VTK_CUDA_ARCH environment variable!"
-		fi
-	fi
-
-	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: cli11 (::guru), 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
-
-	cmake_src_prepare
-
-	if use cuda; then
-		cuda_add_sandbox -w
-		cuda_src_prepare
-	fi
-
-	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-${PV}/.ExternalData/README.rst . || die
-		ln -sf ../../VTK-${PV}/.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_ANDROID_BUILD=OFF
-		-DVTK_IOS_BUILD=OFF
-
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
-		# we use the pre-built documentation and install these with USE=doc
-		-DVTK_BUILD_DOCUMENTATION=OFF
-		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
-
-		# no package in the tree: https://github.com/LLNL/conduit
-		-DVTK_ENABLE_CATALYST=OFF
-		-DVTK_ENABLE_KITS=OFF
-		-DVTK_ENABLE_LOGGING=$(usex logging ON OFF)
-		# defaults to ON: USE flag for this?
-		-DVTK_ENABLE_REMOTE_MODULES=OFF
-
-		# disable fetching files during build
-		-DVTK_FORBID_DOWNLOADS=ON
-
-		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT")
-		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT")
-		-DVTK_GROUP_ENABLE_StandAlone="YES"
-		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT")
-		-DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT")
-
-		-DVTK_INSTALL_SDK=ON
-
-		-DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite
-		-DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_IOXML="WANT"
-		-DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT"
-		-DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_cgns="WANT"
-		-DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT"
-		-DVTK_MODULE_ENABLE_VTK_eigen="WANT"
-		-DVTK_MODULE_ENABLE_VTK_expat="WANT"
-		-DVTK_MODULE_ENABLE_VTK_fmt="WANT"
-		-DVTK_MODULE_ENABLE_VTK_freetype="WANT"
-		-DVTK_MODULE_ENABLE_VTK_hdf5="WANT"
-		-DVTK_MODULE_ENABLE_VTK_jpeg="WANT"
-		-DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT"
-		-DVTK_MODULE_ENABLE_VTK_libharu="WANT"
-		-DVTK_MODULE_ENABLE_VTK_libproj="WANT"
-		-DVTK_MODULE_ENABLE_VTK_libxml2="WANT"
-		-DVTK_MODULE_ENABLE_VTK_lz4="WANT"
-		-DVTK_MODULE_ENABLE_VTK_lzma="WANT"
-		-DVTK_MODULE_ENABLE_VTK_netcdf="WANT"
-		-DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT"
-		-DVTK_MODULE_ENABLE_VTK_ogg="WANT"
-		-DVTK_MODULE_ENABLE_VTK_pegtl="WANT"
-		-DVTK_MODULE_ENABLE_VTK_png="WANT"
-		-DVTK_MODULE_ENABLE_VTK_pugixml="WANT"
-		-DVTK_MODULE_ENABLE_VTK_sqlite="WANT"
-		-DVTK_MODULE_ENABLE_VTK_theora="WANT"
-		-DVTK_MODULE_ENABLE_VTK_tiff="WANT"
-		-DVTK_MODULE_ENABLE_VTK_utf8="WANT"
-		-DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT")
-		-DVTK_MODULE_ENABLE_VTK_zlib="WANT"
-
-		# not packaged in Gentoo
-		-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 ON OFF)
-		-DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
-		-DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
-
-		-DVTK_UNIFIED_INSTALL_TREE=ON
-
-		-DVTK_USE_CUDA=$(usex cuda ON OFF)
-		# 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 ON OFF)
-		-DVTK_USE_TK=$(usex tk ON OFF)
-		-DVTK_USE_X=ON
-
-		-DVTK_WHEEL_BUILD=OFF
-
-		-DVTK_WRAP_JAVA=$(usex java ON OFF)
-		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
-	)
-
-	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"
-
-			# available in ::guru, so avoid  detection if installed
-			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
-		)
-	fi
-
-	if use boost; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
-			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
-		)
-	fi
-
-	# TODO: checks this on updates of nvidia-cuda-toolkit and update
-	# the list of available arches if necessary, i.e. add new arches
-	# once they are released at the end of the list before all.
-	# See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
-	# CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake,
-	# as of 3.25.1 doesn't recognize these keywords.
-	# FIXME: better use numbers than names?
-	if use cuda; then
-		local cuda_arch=
-		case ${VTK_CUDA_ARCH:-native} in
-			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
-			# no longer supports it
-			kepler|maxwell|pascal|volta|turing|ampere|all)
-				cuda_arch=${VTK_CUDA_ARCH}
-				;;
-#			native)
-#				ewarn "If auto detection fails for you, please try and export the"
-#				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
-#				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
-#				cuda_arch=native
-#				;;
-			*)
-				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
-				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
-				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
-				;;
-		esac
-		ewarn "Using CUDA architecture '${cuda_arch}'"
-
-		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
-	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="WANT" )
-		if use rendering; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" )
-		fi
-	fi
-
-	if use gdal; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
-		)
-	fi
-
-	if use imaging; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT"
-		)
-		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" )
-	fi
-
-	if ! use java && ! use python; then
-		# defaults to ON
-		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
-	fi
-
-	if use java; then
-		mycmakeargs+=(
-			-DCMAKE_INSTALL_JARDIR="share/${PN}"
-			-DVTK_ENABLE_WRAPPING=ON
-			-DVTK_MODULE_ENABLE_VTK_Java="WANT"
-		)
-	fi
-
-	if use mpi; then
-		mycmakeargs+=(
-			-DVTK_GROUP_ENABLE_MPI="YES"
-			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
-			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
-			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
-			-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-		)
-		use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" )
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
-		if use rendering; then
-			mycmakeargs+=(
-				-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
-				-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT"
-			)
-		fi
-		use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON )
-	else
-		mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" )
-	fi
-
-	use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" )
-	use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
-	use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" )
-	use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" )
-
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DVTK_ENABLE_WRAPPING=ON
-			-DVTK_MODULE_ENABLE_VTK_Python="WANT"
-			-DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT"
-			-DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT"
-			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
-		)
-		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" )
-	fi
-
-	if use qt5 && use qt6; 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"
-		)
-	else
-		if use qt5; then
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
-				-DVTK_QT_VERSION="5"
-			)
-		elif use qt6; then
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml"
-				-DVTK_QT_VERSION="6"
-			)
-		else
-			mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" )
-		fi
-	fi
-
-	if use qt5 || use qt6; then
-		mycmakeargs+=(
-			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT"
-		)
-		if use mysql || use postgres; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
-		fi
-		if use rendering; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
-		fi
-		if use views; then
-			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
-		fi
-	fi
-
-	if use rendering; then
-		mycmakeargs+=(
-			-DVTK_ENABLE_OSPRAY=OFF
-
-			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT"
-			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT"
-			-DVTK_MODULE_ENABLE_VTK_gl2ps="WANT"
-			-DVTK_MODULE_ENABLE_VTK_glew="WANT"
-			-DVTK_MODULE_ENABLE_VTK_opengl="WANT"
-
-			-DVTK_USE_SDL2=$(usex sdl "YES" "NO")
-		)
-		use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" )
-		use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" )
-		use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" )
-	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=ON
-
-			# requested even if all use flags are off
-			-DVTK_MODULE_ENABLE_VTK_octree="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
-
-			# available in ::guru, so avoid  detection if installed
-			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
-		)
-	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 < stdpthread < 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
-		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="WANT"
-			-DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT"
-		)
-	fi
-
-	if use vtkm; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT"
-			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT"
-
-			-DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221
-			-DVTKm_Vectorization=native
-		)
-	fi
-
-	if use web; then
-		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_WebCore="WANT"
-			-DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT"
-		)
-		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" )
-	fi
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	cmake_src_configure
-}
-
-src_compile() {
-	use test && cmake_build VTKData
-	cmake_src_compile
-}
-
-# FIXME: avoid nonfatal?
-# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
-src_test() {
-#	nonfatal virtx cmake_src_test
-	virtx cmake_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.2.6-r3.ebuild b/sci-libs/vtk/vtk-9.2.6-r3.ebuild
new file mode 100644
index 000000000000..9520c47ec4fd
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.2.6-r3.ebuild
@@ -0,0 +1,747 @@
+# 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_{9..11} )
+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)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+	test? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+"
+S="${WORKDIR}/VTK-${PV}"
+
+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 imaging
+	java las +logging mpi mysql odbc 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 openvdb pdal
+		postgres rendering views
+	)
+	cuda? ( video_cards_nvidia vtkm )
+	java? ( rendering )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( rendering )
+	qt6? ( rendering )
+	sdl? ( rendering )
+	tk? ( python rendering )
+	web? ( python )
+"
+
+# for <pegtl-3 dependency see
+# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
+# 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-cpp/eigen
+	dev-cpp/nlohmann_json
+	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/pegtl-3
+	dev-libs/pugixml
+	dev-libs/utfcpp
+	media-libs/freetype
+	media-libs/libjpeg-turbo
+	>=media-libs/libharu-2.4.2:=
+	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-1.8:* )
+	las? ( sci-geosciences/liblas )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( dev-db/mariadb-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openvdb? ( media-gfx/openvdb:= )
+	pdal? ( <sci-libs/pdal-2.6.0:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		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} )
+"
+
+# for <pegtl-3 dependency see
+# https://discourse.vtk.org/t/compilation-errors-related-to-pegtl-proj/5929
+DEPEND="
+	${RDEPEND}
+	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.2-vtkGeometryFilter-add-missing-mutex-header-file.patch
+	"${FILESDIR}"/${PN}-9.2.2-VTKm-respect-user-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
+	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
+	"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
+	"${FILESDIR}"/${PN}-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch
+	"${FILESDIR}"/vtk-9.2.6-Java21.patch
+)
+
+DOCS=( CONTRIBUTING.md README.md )
+
+vtk_check_reqs() {
+	local dsk=4096
+	local mem=$(( $(usex cuda 7168 0) ))
+
+	dsk=$(( $(usex doc 3072 0) + ${dsk} ))
+	dsk=$(( $(usex examples 3072 0) + ${dsk} ))
+	dsk=$(( $(usex cuda 8192 0) + ${dsk} ))
+
+	# 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)")
+	else
+		if [[ -n "${MAKEOPTS}" ]]; then
+			jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		fi
+	fi
+	mem=$(( ${mem} * $(( ${jobs} > 4 ? 4 : ${jobs} )) ))
+
+	use cuda && export CHECKREQS_MEMORY=${mem}M
+	export CHECKREQS_DISK_BUILD=${dsk}M
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+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
+
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
+	# bug #835659
+	if use cuda; then
+		if [[ ${VTK_CUDA_ARCH} = native ]]; then
+			eerror "Using native CUDA arches is currently broken."
+			eerror "Please set it to one of the common arch names:"
+			eerror "kepler, maxwell, pascal, turing or ampere."
+			die "Please set VTK_CUDA_ARCH environment variable!"
+		fi
+	fi
+
+	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
+
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
+	# bug #835659
+	if use cuda; then
+		if [[ ${VTK_CUDA_ARCH} = native ]]; then
+			eerror "Using native CUDA arches is currently broken."
+			eerror "Please set it to one of the common arch names:"
+			eerror "kepler, maxwell, pascal, turing or ampere."
+			die "Please set VTK_CUDA_ARCH environment variable!"
+		fi
+	fi
+
+	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: cli11 (::guru), 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
+
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+
+	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-${PV}/.ExternalData/README.rst . || die
+		ln -sf ../../VTK-${PV}/.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_ANDROID_BUILD=OFF
+		-DVTK_IOS_BUILD=OFF
+
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
+		# we use the pre-built documentation and install these with USE=doc
+		-DVTK_BUILD_DOCUMENTATION=OFF
+		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
+
+		# no package in the tree: https://github.com/LLNL/conduit
+		-DVTK_ENABLE_CATALYST=OFF
+		-DVTK_ENABLE_KITS=OFF
+		-DVTK_ENABLE_LOGGING=$(usex logging ON OFF)
+		# defaults to ON: USE flag for this?
+		-DVTK_ENABLE_REMOTE_MODULES=OFF
+
+		# disable fetching files during build
+		-DVTK_FORBID_DOWNLOADS=ON
+
+		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_StandAlone="YES"
+		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DEFAULT")
+
+		-DVTK_INSTALL_SDK=ON
+
+		-DVTK_MODULE_ENABLE_VTK_IOCGNSReader="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOExportPDF="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOLAS=$(usex las "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IONetCDF="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOpenVDB=$(usex openvdb "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT" # sqlite
+		-DVTK_MODULE_ENABLE_VTK_IOPDAL=$(usex pdal "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_IOXML="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOXMLParser="WANT"
+		-DVTK_MODULE_ENABLE_VTK_RenderingFreeType=$(usex freetype "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig=$(usex freetype "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_cgns="WANT"
+		-DVTK_MODULE_ENABLE_VTK_doubleconversion="WANT"
+		-DVTK_MODULE_ENABLE_VTK_eigen="WANT"
+		-DVTK_MODULE_ENABLE_VTK_expat="WANT"
+		-DVTK_MODULE_ENABLE_VTK_fmt="WANT"
+		-DVTK_MODULE_ENABLE_VTK_freetype="WANT"
+		-DVTK_MODULE_ENABLE_VTK_hdf5="WANT"
+		-DVTK_MODULE_ENABLE_VTK_jpeg="WANT"
+		-DVTK_MODULE_ENABLE_VTK_jsoncpp="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libharu="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libproj="WANT"
+		-DVTK_MODULE_ENABLE_VTK_libxml2="WANT"
+		-DVTK_MODULE_ENABLE_VTK_lz4="WANT"
+		-DVTK_MODULE_ENABLE_VTK_lzma="WANT"
+		-DVTK_MODULE_ENABLE_VTK_netcdf="WANT"
+		-DVTK_MODULE_ENABLE_VTK_nlohmannjson="WANT"
+		-DVTK_MODULE_ENABLE_VTK_ogg="WANT"
+		-DVTK_MODULE_ENABLE_VTK_pegtl="WANT"
+		-DVTK_MODULE_ENABLE_VTK_png="WANT"
+		-DVTK_MODULE_ENABLE_VTK_pugixml="WANT"
+		-DVTK_MODULE_ENABLE_VTK_sqlite="WANT"
+		-DVTK_MODULE_ENABLE_VTK_theora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_tiff="WANT"
+		-DVTK_MODULE_ENABLE_VTK_utf8="WANT"
+		-DVTK_MODULE_ENABLE_VTK_vtkm=$(usex vtkm "WANT" "DEFAULT")
+		-DVTK_MODULE_ENABLE_VTK_zlib="WANT"
+
+		# not packaged in Gentoo
+		-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 ON OFF)
+		-DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
+		-DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
+
+		-DVTK_UNIFIED_INSTALL_TREE=ON
+
+		-DVTK_USE_CUDA=$(usex cuda ON OFF)
+		# 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 ON OFF)
+		-DVTK_USE_TK=$(usex tk ON OFF)
+		-DVTK_USE_X=ON
+
+		-DVTK_WHEEL_BUILD=OFF
+
+		-DVTK_WRAP_JAVA=$(usex java ON OFF)
+		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
+	)
+
+	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"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	fi
+
+	if use boost; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
+		)
+	fi
+
+	# TODO: checks this on updates of nvidia-cuda-toolkit and update
+	# the list of available arches if necessary, i.e. add new arches
+	# once they are released at the end of the list before all.
+	# See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+	# CUDA 11.8 supports Ada Lovelace and Hopper arches, but cmake,
+	# as of 3.25.1 doesn't recognize these keywords.
+	# FIXME: better use numbers than names?
+	if use cuda; then
+		local cuda_arch=
+		case ${VTK_CUDA_ARCH:-native} in
+			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
+			# no longer supports it
+			kepler|maxwell|pascal|volta|turing|ampere|all)
+				cuda_arch=${VTK_CUDA_ARCH}
+				;;
+#			native)
+#				ewarn "If auto detection fails for you, please try and export the"
+#				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
+#				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
+#				cuda_arch=native
+#				;;
+			*)
+				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
+				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
+				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
+				;;
+		esac
+		ewarn "Using CUDA architecture '${cuda_arch}'"
+
+		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
+	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="WANT" )
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="WANT" )
+		fi
+	fi
+
+	if use gdal; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOGDAL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
+		)
+	fi
+
+	if use imaging; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_ImagingColor="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingFourier="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingGeneral="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingHybrid="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingMath="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingMorphological="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingSources="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingStatistics="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ImagingStencil="WANT"
+		)
+		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="WANT" )
+	fi
+
+	if ! use java && ! use python; then
+		# defaults to ON
+		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_JARDIR="share/${PN}"
+			-DVTK_ENABLE_WRAPPING=ON
+			-DVTK_MODULE_ENABLE_VTK_Java="WANT"
+		)
+	fi
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_MPI="YES"
+			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOMPIParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
+			-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+		)
+		use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="WANT" )
+		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
+		if use rendering; then
+			mycmakeargs+=(
+				-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
+				-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="WANT"
+			)
+		fi
+		use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON )
+	else
+		mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" )
+	fi
+
+	use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT" )
+	use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
+	use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" )
+	use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT" )
+
+	if use python; then
+		mycmakeargs+=(
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DVTK_ENABLE_WRAPPING=ON
+			-DVTK_MODULE_ENABLE_VTK_Python="WANT"
+			-DVTK_MODULE_ENABLE_VTK_PythonInterpreter="WANT"
+			-DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="WANT"
+			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
+		)
+		use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="WANT" )
+	fi
+
+	if use qt5 && use qt6; 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"
+		)
+	else
+		if use qt5; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
+				-DVTK_QT_VERSION="5"
+			)
+		elif use qt6; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml"
+				-DVTK_QT_VERSION="6"
+			)
+		else
+			mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" )
+		fi
+	fi
+
+	if use qt5 || use qt6; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="WANT"
+		)
+		if use mysql || use postgres; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
+		fi
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
+		fi
+		if use views; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
+		fi
+	fi
+
+	if use rendering; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_OSPRAY=OFF
+
+			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingContext2D="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingExternal="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLOD="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingLabel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingUI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolume="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="WANT"
+			-DVTK_MODULE_ENABLE_VTK_gl2ps="WANT"
+			-DVTK_MODULE_ENABLE_VTK_glew="WANT"
+			-DVTK_MODULE_ENABLE_VTK_opengl="WANT"
+
+			-DVTK_USE_SDL2=$(usex sdl "YES" "NO")
+		)
+		use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="WANT" )
+		use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="WANT" )
+		use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="WANT" )
+	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=ON
+
+			# requested even if all use flags are off
+			-DVTK_MODULE_ENABLE_VTK_octree="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	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 < stdpthread < 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
+		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="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsInfovis="WANT"
+		)
+	fi
+
+	if use vtkm; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="WANT"
+
+			-DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221
+			-DVTKm_Vectorization=native
+		)
+	fi
+
+	if use web; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_WebCore="WANT"
+			-DVTK_MODULE_ENABLE_VTK_WebGLExporter="WANT"
+		)
+		use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="WANT" )
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	cmake_src_configure
+}
+
+src_compile() {
+	use test && cmake_build VTKData
+	cmake_src_compile
+}
+
+# FIXME: avoid nonfatal?
+# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
+src_test() {
+#	nonfatal virtx cmake_src_test
+	virtx cmake_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.0-r3.ebuild b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
new file mode 100644
index 000000000000..3a522724f066
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.3.0-r3.ebuild
@@ -0,0 +1,918 @@
+# 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.0.ebuild b/sci-libs/vtk/vtk-9.3.0.ebuild
deleted file mode 100644
index cc7a1a438652..000000000000
--- a/sci-libs/vtk/vtk-9.3.0.ebuild
+++ /dev/null
@@ -1,915 +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"
-)
-
-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-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
index 11247d765a45..79de2ff00dfb 100644
--- a/sci-mathematics/coq-serapi/Manifest
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -1 +1,2 @@
 DIST coq-serapi-0.19.0.tar.gz 180779 BLAKE2B 27083a851139e983158b4cb251d37971d0eec61dd91303a0d09512e690c56a75624dab8c5120eebaed1e7bb168d0b2b889d538854812506c4d0a804f7bee7423 SHA512 e01706beb957315011682f2f74448e66c7a8a077418eeaf7d3fa21414bdf88950b75adbfe2392656e4d6036ce6585d4d53b1dadfd8379249b2943ea389c9c83e
+DIST coq-serapi-0.20.0.tar.gz 182481 BLAKE2B 0483eb7023c67b42def13d23ceec7375d4a575f58ef0b6ed39cbcf8c8f76633c74c83bdebff18b7a777d90beeb20d03c38f20cff525afd1822db31c4a168d413 SHA512 00f8ff851c1b99f45761d098af51949f9a6844d05e23b2cede795bb4f93a9a0a753b45c38271537b257f0ec9cd7538be251174eff483a89cd57889f40a358c27
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.20.0.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.20.0.ebuild
new file mode 100644
index 000000000000..2a430ae8faf5
--- /dev/null
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.20.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COQ_MIN_V="8.20.0"
+COQ_MAX_V="8.21.0"
+
+inherit dune elisp-common
+
+DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
+HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ejgallego/${PN}.git"
+else
+	# The tarball in SRC_URI is comprised of <supported coq>+<package version>
+	SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQ_MIN_V}+${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COQ_MIN_V}-${PV}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-mathematics/coq-${COQ_MIN_V}:= <sci-mathematics/coq-${COQ_MAX_V}:=
+	>=dev-ml/ppx_sexp_conv-0.13.0:=
+	dev-ml/cmdliner:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_deriving_yojson:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_import:=
+	dev-ml/sexplib:=
+	dev-ml/yojson:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	emacs? (
+		>=app-editors/emacs-23.1:*
+	)
+	test? (
+		sci-mathematics/coq-mathcomp
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.19.0-sertop-el.patch" )
+
+SITEFILE="50sertop-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs && elisp-compile sertop/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	rm -r "${ED}/usr/share/emacs" || die
+
+	if use emacs ; then
+		elisp-install "${PN}" sertop/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index d12fee666b04..e860b25a99cb 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,3 +1,4 @@
 DIST coq-8.19.0.tar.gz 7674352 BLAKE2B 195040c01797ac9ce67611e0c96a4601e0a48966e094e868b9f3644aa9f75fa85adf0e2e6340a14ae0a0598b746f5ad989d8f10736cd2d3852a449f6f79d2c93 SHA512 02fb5b4fb575af79e092492cbec6dc0d15a1d74a07f827f657a72d4e6066532630e5a6d15be4acdb73314bd40b9a321f9ea0584e0ccfe51fd3a56353bd30db9b
 DIST coq-8.19.1.tar.gz 7675945 BLAKE2B 62ee346f50d0a22ab217a8e689c3078347519d159619b75f20a8decace356b49c60bcd5b2cec5fbcaffc758a8944f8a7940298df1c0ddddfbd858ed9269c12f3 SHA512 ec8379df34ba6e72bcf0218c66fef248b0e4c5c436fb3f2d7dd83a2c5f349dd0874a67484fcf9c0df3e5d5937d7ae2b2a79274725595b4b0065a381f70769b42
 DIST coq-8.19.2.tar.gz 7678311 BLAKE2B 5f9617fbe0127b0c8357c63f331ba3e9fb5a931be9a4a8e8de2e27820a0d986bf99ed9a512740a0f721c742504225ae56e240af893510aa0e449931499d10aab SHA512 91bc81530fa4f6498961583ad51eac5001f139881788b88e360a866ad8e2a6e2c5bce86d1a580ab4cd4782bf49d48318767df82471ce33ba3ac143e5569ad33c
+DIST coq-8.20.0.tar.gz 7839432 BLAKE2B 9b489db0cc6874b0a629f3bdb4b503201005ec95a3375441538cd7e51d371a39561b9d0ab23ac485652782fdc7ae8d90c97ca1ff4d9a85fb8727a39ed4a6f48c SHA512 1a7eac6e2f58724a3f9d68bbb321e4cfe963ba1a5551b9b011db4b3f559c79be433d810ff262593d753770ee41ea68fbd6a60daa1e2319ea00dff64c8851d70b
diff --git a/sci-mathematics/coq/coq-8.20.0.ebuild b/sci-mathematics/coq/coq-8.20.0.ebuild
new file mode 100644
index 000000000000..7446a497d097
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.20.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs desktop dune edo
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="https://coq.inria.fr/
+	https://github.com/coq/coq/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/coq/coq.git"
+else
+	SRC_URI="https://github.com/coq/coq/archive/V${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="debug doc gui +ocamlopt test"
+
+# TODO: Lots of failing tests. Maybe investigate later.
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/num:=
+	dev-ml/zarith:=
+	gui? (
+		>=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?]
+		>=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-ml/findlib
+	doc? (
+		>=dev-java/antlr-4.7:4
+		dev-python/antlr4-python3-runtime
+		dev-python/beautifulsoup4
+		dev-python/pexpect
+		dev-python/sphinx-rtd-theme
+		dev-python/sphinxcontrib-bibtex
+		dev-tex/latexmk
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+		media-fonts/freefont
+	)
+	test? (
+		dev-ml/ounit2
+	)
+"
+
+CHECKREQS_DISK_BUILD="2G"
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+DUNE_PACKAGES=()
+
+src_prepare() {
+	# Remove bad tests (recursive).
+	local -a bad_tests=(
+		coq-makefile/timing-aggregate
+		coq-makefile/timing-error
+		coq-makefile/timing-per-file
+		coq-makefile/timing-per-line
+		coq-makefile/timing-template
+	)
+	local bad_test=""
+	for bad_test in "${bad_tests[@]}" ; do
+		if [[ -e "test-suite/${bad_test}" ]] ; then
+			rm -r "test-suite/${bad_test}" || die "failed to remove test ${bad_test}"
+		else
+			ewarn "Test file ${bad_test} does not exist"
+		fi
+	done
+
+	default
+}
+
+src_configure() {
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+
+	DUNE_PACKAGES=(
+		coq-core
+		coq-stdlib
+		coqide-server
+		coq
+	)
+	use gui && DUNE_PACKAGES+=( coqide )
+
+	emake clean
+
+	local -a myconf=(
+		-prefix /usr
+		-libdir "/usr/$(get_libdir)/coq"
+		-mandir /usr/share/man
+		-docdir "/usr/share/doc/${PF}"
+		-datadir /usr/share/coq
+		-configdir "/etc/xdg/${PN}"
+		-native-compiler "$(usex ocamlopt yes no)"
+	)
+	use debug && myconf+=( -debug )
+	edo sh ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake DUNEOPT="--display=short --profile release" VERBOSE="1" dunestrap
+
+	dune-compile "${DUNE_PACKAGES[@]}"
+
+	use doc && emake refman-html
+}
+
+src_install() {
+	dune-install "${DUNE_PACKAGES[@]}"
+
+	if use gui ; then
+		make_desktop_entry coqide "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+	fi
+
+	local ocamlc_where="$(ocamlc -where)"
+
+	# Dune installs into /usr/<libdir>/ocaml/<coq> but
+	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
+	local sym=""
+	for sym in "${DUNE_PACKAGES[@]}" ; do
+		dosym "${ocamlc_where}/${sym}" "/usr/$(get_libdir)/${sym}"
+	done
+
+	einstalldocs
+}
diff --git a/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild b/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild
index c98c5b6bf51d..348bf1942132 100644
--- a/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild
+++ b/sci-mathematics/dunshire/dunshire-0.1.3-r1.ebuild
@@ -5,26 +5,32 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1
 
 DESCRIPTION="Python library to solve linear games over symmetric cones"
 HOMEPAGE="https://michael.orlitzky.com/code/dunshire/"
 SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
 LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/cvxopt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
 
-RDEPEND="dev-python/cvxopt[${PYTHON_USEDEP}]"
 DOCS=( doc/README.rst )
 
 distutils_enable_sphinx doc/source
 
-# There are no additional dependencies even though we're not really
-# using setup.py to run the test suite any more. The __main__.py
-# runner has its own exit code handling.
-distutils_enable_tests setup.py
-
 python_test() {
 	PYTHONPATH="." "${EPYTHON}" test/__main__.py --verbose || die
 }
diff --git a/sci-mathematics/dunshire/metadata.xml b/sci-mathematics/dunshire/metadata.xml
index 24ac776863fa..f2908ee10b59 100644
--- a/sci-mathematics/dunshire/metadata.xml
+++ b/sci-mathematics/dunshire/metadata.xml
@@ -5,8 +5,4 @@
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
-
-  <upstream>
-    <remote-id type="pypi">dunshire</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index e539bf0d9aaf..194e412a262d 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1 +1,2 @@
 DIST eclib-20231212.tar.bz2 926463 BLAKE2B 8105ac4014f9e44545d1d1e1cd5e18e36e467131b57a04a02d7e4f2390b0b0f78d0bac60dfbc0403a6681816a64a6e81c8d6a198f83bef991f697c2756a6d048 SHA512 692aa6bc2a52cd9496700990172b5a807abbd3f8bf8e931de14c48a401d1d383f95fa5def68bbf9a1aee08dfabac608604c0fd6f8bb49b813e6c6c909a2f27a7
+DIST eclib-20240408.tar.bz2 918771 BLAKE2B e9f4a37973b40e73a111330800fcfebae91251613902b35ff29a45bdf3e7cd8cc49b061af121eff6aaa657d28b24b20ec00b77bad468504e545b3810852a50d2 SHA512 d93c724fa5816ce45a661d50000309e148fdbd0e287fbdbbf30bd6b3c6a7225846d90f11bc4d86c4b96111cbe8429b174e7d81ea0be1eef1a8acaa43287c09cf
diff --git a/sci-mathematics/eclib/eclib-20240408.ebuild b/sci-mathematics/eclib/eclib-20240408.ebuild
new file mode 100644
index 000000000000..a8b4b73b14eb
--- /dev/null
+++ b/sci-mathematics/eclib/eclib-20240408.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Programs for elliptic curves defined over the rational numbers"
+HOMEPAGE="https://github.com/JohnCremona/eclib"
+SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+# COPYING is GPL-2 but the file headers say "or ... any later version"
+# LGPL-2.1+ is for bundled GetOpt.cc
+LICENSE="GPL-2+ LGPL-2.1+"
+
+# Subslot is from the soname, (LT_CURRENT - LT_AGE) in configure.ac.
+# (But for now, see src_prepare below.)
+SLOT="0/12"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="boost flint minimal test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sci-mathematics/pari:=
+	dev-libs/ntl:=
+	boost? ( dev-libs/boost:= )
+	flint? ( sci-mathematics/flint:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# LT_CURRENT was bumped to 12 in the 20230424 release but LT_AGE was
+	# left at two despite an interface being removed. Subsequent releases
+	# have propagated the off-by-two error. This isn't strictly necessary
+	# but it's nice to have the soname match the subslot.
+	sed -e 's/LT_AGE=3/LT_AGE=1/' -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex minimal --disable-allprogs "" "" "") \
+		$(use_with boost) \
+		$(use_with flint)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/gap/gap-4.13.1.ebuild b/sci-mathematics/gap/gap-4.13.1.ebuild
index 7927d5feec2a..083b69e86f54 100644
--- a/sci-mathematics/gap/gap-4.13.1.ebuild
+++ b/sci-mathematics/gap/gap-4.13.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0/9" # soname
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="cpu_flags_x86_popcnt debug memcheck minimal readline test valgrind"
 REQUIRED_USE="?? ( memcheck valgrind )"
 
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-find-name.patch b/sci-mathematics/gfan/files/gfan-0.6.2-find-name.patch
new file mode 100644
index 000000000000..5e6718e70ed2
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-find-name.patch
@@ -0,0 +1,18 @@
+Description: Properly terminate while loop when finding application name.
+Author: Anders Nedergaard Jensen <jensen@math.au.dk>
+Origin: https://bugs.debian.org/950008#17
+Bug-Debian: https://bugs.debian.org/950008
+Forwarded: yes
+Last-Update: 2021-11-21
+
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -26,7 +26,7 @@
+     {
+       l--;
+     }
+-  while(p[l]!=0 && p[l]!='/');
++  while(l >= 0 && p[l]!='/');
+ 
+   return p+l+1;
+ }
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-fix-0602ResultantFanProjection.patch b/sci-mathematics/gfan/files/gfan-0.6.2-fix-0602ResultantFanProjection.patch
new file mode 100644
index 000000000000..99fe8167398e
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-fix-0602ResultantFanProjection.patch
@@ -0,0 +1,27 @@
+Description: Use int64_t instead of signed long int for 64-bit integer typedef
+ On 32-bit architectures, longs are only 32 bits.  The resulting overflow
+ was causing an infinite loop in the 0602ResultantFanProjection test.
+Bug-Debian: https://bugs.debian.org/905300
+Bug-Debian: https://bugs.debian.org/974558
+Author: Doug Torrance <dtorrance@piedmont.edu>
+Last-Update: 2020-11-12
+
+(mjo: added missing include)
+
+--- a/src/vektor.h
++++ b/src/vektor.h
+@@ -6,11 +6,12 @@
+ #include <assert.h>
+ #include <algorithm>
+ #include <complex>
++#include <cstdint>
+ #include <stdio.h>
+ 
+ using namespace std;
+ 
+-typedef signed long int int64;
++typedef int64_t int64;
+ 
+ void outOfRange(int i, int n);
+ 
+
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-fix-spelling-errors.patch b/sci-mathematics/gfan/files/gfan-0.6.2-fix-spelling-errors.patch
new file mode 100644
index 000000000000..08b78c6efcaa
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-fix-spelling-errors.patch
@@ -0,0 +1,50 @@
+Descriptions: Fix some spelling errors in output text of the programs
+Author: Cédric Boutillier <boutil@debian.org>
+Author: Doug Torrance <dtorrance@piedmont.edu>
+Forwarded: yes
+Last-Update: 2020-11-13
+
+--- a/src/app_scarfisgeneric.cpp
++++ b/src/app_scarfisgeneric.cpp
+@@ -24,7 +24,7 @@
+   }
+   const char *helpText()
+   {
+-    return "This program takes a matrix as input and checks if it satisfies Scarf's generality conditions. The rows of the matrix are listed on the input. The A1 condition is that there exists a strictly poistive vector in the co-kernel of the matrix. The A2 condition is that te maximal minors of the matrix are non-zero. A3\n";
++    return "This program takes a matrix as input and checks if it satisfies Scarf's generality conditions. The rows of the matrix are listed on the input. The A1 condition is that there exists a strictly poistive vector in the co-kernel of the matrix. The A2 condition is that the maximal minors of the matrix are non-zero. A3\n";
+   }
+   ScarfIsGenericApplication()
+   {
+--- a/src/app_symmetries.cpp
++++ b/src/app_symmetries.cpp
+@@ -35,7 +35,7 @@
+   }
+   SymmetriesApplication():
+     optionSymmetry("--symmetry","Specify subgroup to be searched for permutations keeping the ideal fixed."),
+-    optionTorusSymmetry("--symsigns","Specify for each generator of the group specified wiht --symmetry an element of ${-1,+1}^n$ which by its multiplication on the variables together with the permutation is expected to keep the ideal fixed.")
++    optionTorusSymmetry("--symsigns","Specify for each generator of the group specified with --symmetry an element of ${-1,+1}^n$ which by its multiplication on the variables together with the permutation is expected to keep the ideal fixed.")
+   {
+     registerOptions();
+   }
+--- a/src/app_representatives.cpp
++++ b/src/app_representatives.cpp
+@@ -24,7 +24,7 @@
+   }
+   const char *helpText()
+   {
+-    return "This program computes takes generaters for a subgroup of S_n and a list of n-dimensional integer vectors. The output is a list of vectors, one from each orbit of elements of the list. \n";
++    return "This program computes takes generators for a subgroup of S_n and a list of n-dimensional integer vectors. The output is a list of vectors, one from each orbit of elements of the list. \n";
+   }
+   RepresentativesApplication()
+   {
+--- a/src/tropical2.cpp
++++ b/src/tropical2.cpp
+@@ -271,7 +271,7 @@
+   PolynomialSet r(theRing);
+   if(theRing.getNumberOfVariables()!=weight.size())
+     {
+-      cerr << "Error: Number of varaibles in polynomial ring "<<theRing.getNumberOfVariables()<< " length of weight vector " << weight.size() <<endl;
++      cerr << "Error: Number of variables in polynomial ring "<<theRing.getNumberOfVariables()<< " length of weight vector " << weight.size() <<endl;
+       assert(0);
+     }
+ 
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 29b330866f46..fe1b428750be 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -9,9 +9,11 @@ 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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
@@ -19,8 +21,6 @@ DEPEND="dev-libs/gmp:0=[cxx(+)]
 	sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}${PV}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
 	"${FILESDIR}/${PN}-0.6.2-testsuite.patch"
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r5.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r5.ebuild
new file mode 100644
index 000000000000..47fbcc3b8e1d
--- /dev/null
+++ b/sci-mathematics/gfan/gfan-0.6.2-r5.ebuild
@@ -0,0 +1,78 @@
+# 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-testsuite.patch"
+	"${FILESDIR}/${PN}-0.6.2-Makefile.patch"
+	"${FILESDIR}/${PN}-0.6.2-fix-0602ResultantFanProjection.patch"
+	"${FILESDIR}/${PN}-0.6.2-fix-spelling-errors.patch"
+	"${FILESDIR}/${PN}-0.6.2-find-name.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
+
+	# 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 c8840a6dbd27..46e80c85d618 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1,2 @@
 DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
-DIST giac_1.9.0-93.tar.gz 115117442 BLAKE2B 397c64c5587fadca37b3298fef8c15c2977ded30849af2f3d3ee8a083d26f8db4645ac6a0db2fce4e254144cdc70b88d3313de58a502510e21a22927e1af3505 SHA512 b8c7d7070218afdfdb8f9a94911407860ab81ead9a60adf7f0c0cec3c50cec5fad3a439269192a01ef4d55ed822a4a619b123b6938ba76f9aba3537d14bc4680
+DIST giac_1.9.0-995.tar.gz 128346387 BLAKE2B c275d2cad511b906a3822156bd05f83cd77265cf489da82b111973b0a80de7abd1875d0cf0116e34610aa20b5ea2cc36550950dbf1eb1a321db8c7145c789137 SHA512 7111a21df5efe1ef5f14dc744277e18f3e4701842d827da0f8d745e1bcec4c06b45e3306b7ed3c4affee59c5df2454643900eefe32d46019771e6bb07bc971d9
diff --git a/sci-mathematics/giac/files/giac-1.9.0.995-fix-undefined-behavior.patch b/sci-mathematics/giac/files/giac-1.9.0.995-fix-undefined-behavior.patch
new file mode 100644
index 000000000000..92d37ae93fa8
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.995-fix-undefined-behavior.patch
@@ -0,0 +1,43 @@
+From 864ecde569ce9fad636abe1135de33fdc94e6981 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 5 Sep 2024 19:49:07 -0400
+Subject: [PATCH 1/1] src/vecteur.cc: skip undefined behavior with a bounds
+ check
+
+---
+ src/vecteur.cc | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/vecteur.cc b/src/vecteur.cc
+index de10197..119d454 100644
+--- a/src/vecteur.cc
++++ b/src/vecteur.cc
+@@ -8490,6 +8490,17 @@ namespace giac {
+ 	  }
+ 	  else {
+ 	    int C=col+1;
++	    // mjo: C can be equal to cmax here, which makes buffer[C]
++	    // illegal. In that case, however, nothing will happen
++	    // below:
++	    //
++	    // 1. C = cmax ==> C >= (cmax-4), so the "for" loop is skipped
++	    // 2. After the "for" loop, C += ptr-&buffer[C] sets C to zero
++	    // 3. Now C = cmax means that the second "for" loop is skipped
++	    //
++	    // As a result, we can comment out this whole thing when
++	    // C = cmax to avoid a crash.
++	    if (C < cmax) {
+ 	    longlong * ptr= &buffer[C],*ptrend=&buffer[0]+cmax-4;
+ 	    const int *ptrN=&Nline[C];
+ 	    for (;ptr<ptrend;ptrN+=4,ptr+=4){
+@@ -8502,6 +8513,7 @@ namespace giac {
+ 	    for (;C<cmax;++C){
+ 	      buffer[C] -= coeff*Nline[C];   
+ 	    }
++	    }
+ 	  }
+ 	}
+ 	// copy back buffer to N[l]
+-- 
+2.44.2
+
diff --git a/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
new file mode 100644
index 000000000000..4c0d6d7d8d0a
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
@@ -0,0 +1,38 @@
+From Michael Orlitzky <michael@orlitzky.com> in the original version
+of the patch:
+
+This was added upstream when it was pointed out that the codebase
+contains undefined behavior that triggers glibcxx's assertions.
+Disabling the assertions without fixing the undefined behavior is not
+a satisfactory solution, so we drop the override.
+
+diff --git a/configure.ac b/configure.ac
+index 96b0223..cdc5618 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@ AC_CHECK_FUNCS(tgammaf)
+ dnl avoid "security" checks for vectors is also included in first.h
+ dnl use -std=c++17 -march=native  for vectorclass v2 optimizations
+ dnl -DUSE_OBJET_BIDON added because xcas::localisation() does not load locales correctly for modules loaded before main() is executed
+-CXXFLAGS="$CXXFLAGS  -U_GLIBCXX_ASSERTIONS -DUSE_OBJET_BIDON"
++CXXFLAGS="$CXXFLAGS -DUSE_OBJET_BIDON"
+ 
+ dnl Define DOUBLEVAL if bigendian
+ if test "x$ac_cv_c_bigendian" = "xyes"; then
+diff --git a/src/first.h b/src/first.h
+index 7852c73..21e15b9 100644
+--- a/src/first.h
++++ b/src/first.h
+@@ -25,9 +25,9 @@
+ #define register 
+ 
+ 
+-#ifdef _GLIBCXX_ASSERTIONS
+-#undef _GLIBCXX_ASSERTIONS
+-#endif
++// #ifdef _GLIBCXX_ASSERTIONS
++// #undef _GLIBCXX_ASSERTIONS
++// #endif
+ 
+ #if defined NUMWORKS && !defined SDL_KHICAS
+ #define KHICAS 1
diff --git a/sci-mathematics/giac/giac-1.9.0.93.ebuild b/sci-mathematics/giac/giac-1.9.0.93.ebuild
deleted file mode 100644
index 9f42bdacc1a7..000000000000
--- a/sci-mathematics/giac/giac-1.9.0.93.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
-
-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"
-
-# The licensing is explained in README. We disable or delete several
-# bundled features (MicroPytho, QuickJS, FLTK, gl2ps) that are
-# specifically mentioned there.
-LICENSE="GPL-3+"
-
-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(+)]
-	dev-libs/mpfr:=
-	dev-libs/ntl:=
-	net-misc/curl
-	sci-libs/mpfi
-	sci-libs/gsl:=
-	sci-mathematics/cliquer
-	sci-mathematics/nauty
-	sci-mathematics/pari:=[threads]
-	sys-libs/readline:=
-	virtual/lapack
-	virtual/blas
-	ao? ( media-libs/libao )
-	ecm? ( sci-mathematics/gmp-ecm )
-	gc? ( dev-libs/boehm-gc )
-	glpk? ( sci-mathematics/glpk )
-	gui? (
-		media-libs/libpng:=
-		x11-libs/fltk[opengl]
-		x11-libs/gl2ps
-	)"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-tex/hevea
-	virtual/pkgconfig
-	app-alternatives/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
-	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
-	"${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
-	"${FILESDIR}/${P}-glibcxx-assertions.patch"
-	"${FILESDIR}/${P}-no-fltk-buildfix.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() {
-	# giac-1.9.0.55 tries to compile a bundled version of FLTK for you
-	# if you pass --enable-fltk but the system version isn't detected.
-	# We make sure that cannot happen under any circumstances.
-	rm fltk-1.3.8-source.tar.bz2 || die
-
-	# similar deal with gl2ps
-	rm src/gl2ps.[ch] || die
-
-	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 the gui is though --disable-fltk.
-	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-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild
new file mode 100644
index 000000000000..6a9a85a14f05
--- /dev/null
+++ b/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild
@@ -0,0 +1,198 @@
+# 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"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The licensing is explained in README. We disable or delete several
+# bundled features (MicroPytho, QuickJS, FLTK, gl2ps) that are
+# specifically mentioned there.
+LICENSE="GPL-3+"
+
+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(+)]
+	dev-libs/mpfr:=
+	dev-libs/ntl:=
+	net-misc/curl
+	sci-libs/mpfi
+	sci-libs/gsl:=
+	sci-mathematics/cliquer
+	sci-mathematics/nauty
+	sci-mathematics/pari:=[threads]
+	sys-libs/readline:=
+	virtual/lapack
+	virtual/blas
+	ao? ( media-libs/libao )
+	ecm? ( sci-mathematics/gmp-ecm )
+	gc? ( dev-libs/boehm-gc )
+	glpk? ( sci-mathematics/glpk )
+	gui? (
+		media-libs/libpng:=
+		x11-libs/fltk[opengl]
+		x11-libs/gl2ps
+	)"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-tex/hevea
+	virtual/pkgconfig
+	app-alternatives/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
+	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
+	"${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
+	"${FILESDIR}/${P}-glibcxx-assertions.patch"
+	"${FILESDIR}/${P}-fix-undefined-behavior.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"
+
+src_prepare() {
+	# giac-1.9.0.55 tries to compile a bundled version of FLTK for you
+	# if you pass --enable-fltk but the system version isn't detected.
+	# We make sure that cannot happen under any circumstances.
+	rm fltk-1.3.8-source.tar.bz2 || die
+
+	# similar deal with gl2ps
+	rm src/gl2ps.[ch] || die
+
+	# These are executable (ARM) build artifacts that should not have
+	# been shipped. We remove them so they can be rebuilt properly.
+	rm src/mkjs doc/khicas.nwa || die
+
+	# Don't waste time eautoreconfing the bundled micropython that we
+	# never use.
+	sed -e 's/micropython-1.12//g' -i Makefile.am || die
+	sed -e '/micropython-1.12/d' -i configure.ac || die
+	rm -r micropython-1.12 || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++17 # 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 the gui is though --disable-fltk.
+	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/gimps/gimps-30.19.20.ebuild b/sci-mathematics/gimps/gimps-30.19.20.ebuild
index df7238cd585d..ec86e2265e58 100644
--- a/sci-mathematics/gimps/gimps-30.19.20.ebuild
+++ b/sci-mathematics/gimps/gimps-30.19.20.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 SLOT="0"
 LICENSE="GIMPS"
 RESTRICT="mirror bindist"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch
deleted file mode 100644
index d8cdaa02a2c5..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 39b4872..4c04865 100644
---- a/Makefile
-+++ b/Makefile
-@@ -154,8 +154,8 @@ mkdir -p $1$(PREFIX)/bin
- mkdir -p $1$(PREFIX)/share/applications
- mkdir -p $1$(PREFIX)/share/icons/hicolor/128x128/apps
- mkdir -p $1$(PREFIX)/share/$(PACKAGE_NAME)/$(PACKAGE_VERSION)
--cp $(GSL_SHELL_GUI) $(GSL_SHELL) $1$(PREFIX)/bin
--strip $1$(PREFIX)/bin/$(GSL_SHELL) $1$(PREFIX)/bin/$(GSL_SHELL_GUI)
-+test -f $(GSL_SHELL_GUI) && cp $(GSL_SHELL_GUI) $1$(PREFIX)/bin  || :
-+test -f $(GSL_SHELL) && cp $(GSL_SHELL) $1$(PREFIX)/bin  || :
- test -f $(LUAJIT_SO) && \
-   mkdir -p $1$(PREFIX)/lib && \
-   cp $(LUAJIT_SO) $1$(PREFIX)/lib && \
-@@ -168,7 +168,7 @@ $(CP_REL) $(LUA_BASE_FILES) $1$(PREFIX)/share/$(PACKAGE_NAME)/$(PACKAGE_VERSION)
- $(CP_REL) $(EXAMPLES_FILES) $1$(PREFIX)/bin
- endef
- 
--install: $(GSL_SHELL) $(GSL_SHELL_GUI)
-+install:
- 	$(call install-to-dir,$(DESTDIR))
- 
- debian: $(DEBIAN_PACKAGE)
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch
deleted file mode 100644
index 29ddaf2fd710..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/user-manual/conf.py b/doc/user-manual/conf.py
-index 899f5d6..9475d85 100644
---- a/doc/user-manual/conf.py
-+++ b/doc/user-manual/conf.py
-@@ -25,7 +25,7 @@ import sys, os
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.pngmath']
-+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.imgmath']
- 
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
diff --git a/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild b/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
index 27c1bc7592fc..f844bccde0e3 100644
--- a/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
+++ b/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e
 LICENSE="GPL-2+"
 # The subslot is the libLfunction soname major version
 SLOT="0/1"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 # Omit USE=mpfr for now because it's broken upstream:
 #
diff --git a/sci-mathematics/lrcalc/lrcalc-2.1.ebuild b/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
index b4cdd85c2350..28d4099dfbe3 100644
--- a/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
+++ b/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://sites.math.rutgers.edu/~asbuch/lrcalc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/2"
-KEYWORDS="amd64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~riscv ~x86 ~ppc-macos ~x64-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/mathmod/Manifest b/sci-mathematics/mathmod/Manifest
index 77e6820fca96..979247d0ef63 100644
--- a/sci-mathematics/mathmod/Manifest
+++ b/sci-mathematics/mathmod/Manifest
@@ -1,2 +1 @@
 DIST mathmod-11.1.tar.gz 7934535 BLAKE2B ccb5ba1ee74b0e6f2d605bf76f107ce43f695f2dc81fe0ef8498fdb29978f3da214178ed433eea9536f3ee801c24887988e0c1064833a6a1069e0349fb209a05 SHA512 50485094a5c0f08077a27215d4189ba28085ad9d6cc3323043955d63723271adf80ba2c8a75afd0b50ea7443a55f5d4efd8f8d5eae32a9c0718450784ff728ab
-DIST mathmod-4.1.src.zip 974709 BLAKE2B f7fa5579b670b2512eab4fd7b706a0ca2282fb63356ea44ea2ddc6204b73ae2b7cd6f837d7622ebf0e51ba2b0127437b1836b59780df6c4b8e704fcb92e8680e SHA512 e7a170f5b57384cca4e755a0bb3691ec3fe29e9b22027534f1e84ed656905495c70eea8c69262f31a937ca508c34177d33adc23f5a8a3c91db1eceb2aa283a6d
diff --git a/sci-mathematics/mathmod/mathmod-4.1-r1.ebuild b/sci-mathematics/mathmod/mathmod-4.1-r1.ebuild
deleted file mode 100644
index bd7f4940e4e2..000000000000
--- a/sci-mathematics/mathmod/mathmod-4.1-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=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Plot parametric and implicit surfaces"
-HOMEPAGE="https://www.facebook.com/pages/MathMod/529510253833102"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.src.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-branches-274-trunk
-
-src_configure() {
-	eqmake5 MathMod.pro
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe MathMod
-	insinto /usr/share/${P}
-	doins mathmodconfig.js mathmodcollection.js advancedmodels.js
-	newicon -s 16 icon/catenoid_mini_16x16.png catenoid.png
-	newicon -s 32 icon/catenoid_mini_32x32.png catenoid.png
-	newicon -s 64 icon/catenoid_mini_64x64.png catenoid.png
-	make_desktop_entry MathMod MathMod catenoid
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sci-mathematics/maxima/maxima-5.47.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.47.0-r1.ebuild
index a46260b283ef..21d00f97a4f7 100644
--- a/sci-mathematics/maxima/maxima-5.47.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.47.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 # say LLGPL version 2 or later which I have approximated by LLGPL-2.1.
 LICENSE="GPL-2 GPL-2+ LLGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecl emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sci-mathematics/octave/octave-9.2.0-r1.ebuild b/sci-mathematics/octave/octave-9.2.0-r1.ebuild
new file mode 100644
index 000000000000..c0305336a4ae
--- /dev/null
+++ b/sci-mathematics/octave/octave-9.2.0-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 imagemagick java json klu portaudio postscript +qhull +qrupdate readline sndfile +sparse spqr ssl sundials zlib"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
+# ideal, but both "graphicsmagick" and "imagemagick" are global USE
+# flags whose existing descriptions conflict with the obvious way we
+# would want to use them in octave. In any case, upstream doesn't really
+# support imagemagick, only graphicsmagick (bug 864785).
+COMMON_DEPS="
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-text/ghostscript-gpl
+	sys-apps/texinfo
+	dev-libs/libpcre2
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:= )
+	gnuplot? ( sci-visualization/gnuplot )
+	hdf5? ( sci-libs/hdf5:= )
+	imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+	json? ( dev-libs/rapidjson )
+	klu? ( sci-libs/klu:= )
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		>=media-gfx/fig2dev-3.2.9-r1
+	)
+	gui? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,opengl,network,widgets]
+		media-libs/fontconfig:=
+		media-libs/freetype:=
+		virtual/glu
+		x11-libs/gl2ps:=
+		x11-libs/libX11:=
+		x11-libs/qscintilla:=[qt6]
+	)
+	qhull? ( media-libs/qhull:= )
+	qrupdate? ( sci-libs/qrupdate:= )
+	readline? ( sys-libs/readline:= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:=
+		sci-libs/camd:=
+		sci-libs/ccolamd:=
+		sci-libs/cholmod:=
+		sci-libs/colamd:=
+		sci-libs/cxsparse:=
+		sci-libs/umfpack:=
+	)
+	spqr? ( sci-libs/spqr:= )
+	ssl? ( dev-libs/openssl:= )
+	sundials? (
+		klu? ( >=sci-libs/sundials-4:=[sparse] )
+		!klu? ( >=sci-libs/sundials-4:= )
+	)
+"
+RDEPEND="${COMMON_DEPS}
+	java? ( >=virtual/jre-1.8:* )"
+DEPEND="${COMMON_DEPS}
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? (
+		dev-qt/qttools:6[linguist]
+		doc? ( dev-qt/qttools:6[assistant] )
+	)
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# libstdc++ bug, bug #887815
+	append-cxxflags -U_GLIBCXX_ASSERTIONS
+
+	# Unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	# Some of these use_with flags are a bit mismatched. The configure
+	# script offers only --without-foo, and detects "foo" automatically
+	# unless --without-foo is specified. Passing --with-foo is not an
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		--enable-shared
+		--with-z
+		--with-bz2
+		--without-fltk
+
+		# bug #901965
+		--without-libiconv-prefix
+		--without-libreadline-prefix
+
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable json rapidjson)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with gui opengl)
+		$(use_with gui qt 6)
+		$(use_with gui x)
+		$(use_with hdf5)
+		$(use_with imagemagick magick GraphicsMagick++)
+		$(use_with klu)
+		$(use_with portaudio)
+		$(use_with qhull qhull_r)
+		$(use_with qrupdate)
+		$(use_with sndfile)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with spqr)
+		$(use_with ssl openssl)
+		$(use_with sundials sundials_ida)
+		$(use_with sundials sundials_nvecserial)
+	)
+
+	# Tell autoconf where to find qt binaries, fix bug #837752
+	if use gui ; then
+		export MOC="$(qt6_get_bindir)/../libexec/moc" \
+			UIC="$(qt6_get_bindir)/../libexec/uic" \
+			RCC="$(qt6_get_bindir)/../libexec/rcc" \
+			LRELEASE="$(qt6_get_bindir)/lrelease" \
+			QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator"
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug #566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	use java && \
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/octave/octave-9.2.0.ebuild b/sci-mathematics/octave/octave-9.2.0.ebuild
deleted file mode 100644
index 24c4f2d9dc7b..000000000000
--- a/sci-mathematics/octave/octave-9.2.0.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
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="High-level interactive language for numerical computations"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 imagemagick java json klu portaudio postscript +qhull +qrupdate readline sndfile +sparse spqr ssl sundials zlib"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
-# ideal, but both "graphicsmagick" and "imagemagick" are global USE
-# flags whose existing descriptions conflict with the obvious way we
-# would want to use them in octave. In any case, upstream doesn't really
-# support imagemagick, only graphicsmagick (bug 864785).
-COMMON_DEPS="
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-text/ghostscript-gpl
-	sys-apps/texinfo
-	dev-libs/libpcre2
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	virtual/blas
-	virtual/lapack
-	curl? ( net-misc/curl:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:= )
-	gnuplot? ( sci-visualization/gnuplot )
-	hdf5? ( sci-libs/hdf5:= )
-	imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
-	json? ( dev-libs/rapidjson )
-	klu? ( sci-libs/klu:= )
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		>=media-gfx/fig2dev-3.2.9-r1
-	)
-	gui? (
-		dev-qt/qtbase:6[gui,opengl,network,widgets]
-		media-libs/fontconfig:=
-		media-libs/freetype:=
-		virtual/glu
-		x11-libs/gl2ps:=
-		x11-libs/libX11:=
-		x11-libs/qscintilla:=[qt6]
-	)
-	qhull? ( media-libs/qhull:= )
-	qrupdate? ( sci-libs/qrupdate:= )
-	readline? ( sys-libs/readline:= )
-	sndfile? ( media-libs/libsndfile )
-	sparse? (
-		sci-libs/arpack:=
-		sci-libs/camd:=
-		sci-libs/ccolamd:=
-		sci-libs/cholmod:=
-		sci-libs/colamd:=
-		sci-libs/cxsparse:=
-		sci-libs/umfpack:=
-	)
-	spqr? ( sci-libs/spqr:= )
-	ssl? (
-		dev-libs/openssl:=
-	)
-	sundials? (
-		klu? ( >=sci-libs/sundials-4:=[sparse] )
-		!klu? ( >=sci-libs/sundials-4:= )
-	)
-"
-RDEPEND="${COMMON_DEPS}
-	java? ( >=virtual/jre-1.8:* )"
-DEPEND="${COMMON_DEPS}
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="
-	dev-util/gperf
-	virtual/pkgconfig
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	gui? ( dev-qt/qttools:6[linguist] )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-)
-
-src_prepare() {
-	default
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# libstdc++ bug, bug #887815
-	append-cxxflags -U_GLIBCXX_ASSERTIONS
-
-	# Unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	# Some of these use_with flags are a bit mismatched. The configure
-	# script offers only --without-foo, and detects "foo" automatically
-	# unless --without-foo is specified. Passing --with-foo is not an
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var/state/octave"
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--disable-64
-		--enable-shared
-		--with-z
-		--with-bz2
-		--without-fltk
-
-		# bug #901965
-		--without-libiconv-prefix
-		--without-libreadline-prefix
-
-		$(use_enable doc docs)
-		$(use_enable java)
-		$(use_enable json rapidjson)
-		$(use_enable readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(use_enable fftw fftw-threads)
-		$(use_with glpk)
-		$(use_with gui opengl)
-		$(use_with gui qt 6)
-		$(use_with gui x)
-		$(use_with hdf5)
-		$(use_with imagemagick magick GraphicsMagick++)
-		$(use_with klu)
-		$(use_with portaudio)
-		$(use_with qhull qhull_r)
-		$(use_with qrupdate)
-		$(use_with sndfile)
-		$(use_with sparse arpack)
-		$(use_with sparse umfpack)
-		$(use_with sparse colamd)
-		$(use_with sparse ccolamd)
-		$(use_with sparse cholmod)
-		$(use_with sparse cxsparse)
-		$(use_with spqr)
-		$(use_with ssl openssl)
-		$(use_with sundials sundials_ida)
-		$(use_with sundials sundials_nvecserial)
-	)
-
-	# Tell autoconf where to find qt binaries, fix bug #837752
-	if use gui ; then
-		export MOC="$(qt6_get_bindir)/../libexec/moc" \
-			UIC="$(qt6_get_bindir)/../libexec/uic" \
-			RCC="$(qt6_get_bindir)/../libexec/rcc" \
-			LRELEASE="$(qt6_get_bindir)/lrelease" \
-			QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator"
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
-	export VARTEXFONTS="${T}/fonts"
-
-	default
-
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		dodoc $(find doc -name '*.pdf')
-	else
-		# bug #566134, macros.texi is installed by make install if use doc
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-
-	use java && \
-		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
-	doenvd 99octave
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/palp/palp-2.21.ebuild b/sci-mathematics/palp/palp-2.21.ebuild
index 043002341a01..8ed9def3704f 100644
--- a/sci-mathematics/palp/palp-2.21.ebuild
+++ b/sci-mathematics/palp/palp-2.21.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.com/stringstuwien/PALP/-/archive/v${PV}/PALP-v${PV}.tar.
 S="${WORKDIR}/PALP-v${PV}"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 # The "mori.x" program pipes input to "Singular".
 RDEPEND="sci-mathematics/singular"
diff --git a/sci-mathematics/planarity/metadata.xml b/sci-mathematics/planarity/metadata.xml
index fd4c3a0ae185..07ebd0d1054c 100644
--- a/sci-mathematics/planarity/metadata.xml
+++ b/sci-mathematics/planarity/metadata.xml
@@ -19,8 +19,6 @@
   </maintainer>
 
   <upstream>
-    <remote-id type="github">
-      graph-algorithms/edge-addition-planarity-suite
-    </remote-id>
+    <remote-id type="github">graph-algorithms/edge-addition-planarity-suite</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
index 11e65b5d56d1..499d8a63eeb7 100644
--- a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
+++ b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/relea
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 src_install() {
 	default
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 64de0ecea8e1..cb4b81dbdabb 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1 +1,2 @@
 DIST polymake-4.11-minimal.tar.bz2 7325783 BLAKE2B 87e62741e4e44c5fea7454d5cc8cb205cf13f8ee743c1d72100f937d0677505ce0c5c8f5b37c118f89079ca88f313991eaefb2ea02c49b6c7b45c438c6f9e13b SHA512 94adf3fcec21de50451091a04ca17010f5e71b44e3dcd4e2d52b9f952b94ee0cf3f6df15657b761b0bda20eb47cbdc0cb2481bb440c7243442be34f913292246
+DIST polymake-4.12-minimal.tar.bz2 7337552 BLAKE2B 4893be1f04ace2c4eb95ed01bc55e62e2187e10b5b10c1d274b2d4e771e1d863b2eb7adeb9a05b2f4c14466cdce1c0d223cfcf35c125d9989ab3825a88e46464 SHA512 127d4058148fdac05fb83a3ab893edfe5c0ab6865f9745d1e709396c23af9762574616f0466adcee59d35646d807621a090a41e8cc693b1fca1f5f6cd5d01054
diff --git a/sci-mathematics/polymake/files/polymake-4.12-no-perl-constraints.patch b/sci-mathematics/polymake/files/polymake-4.12-no-perl-constraints.patch
new file mode 100644
index 000000000000..54cbb1ee0324
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake-4.12-no-perl-constraints.patch
@@ -0,0 +1,62 @@
+From b0639eca089256c1d816b62c0e2b901cc14a5f7c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 28 Aug 2024 10:57:17 -0400
+Subject: [PATCH] support/configure.pl: disable perl version check
+
+The test suite apparently passes with perl-5.40, and that's what
+we have in ~arch on Gentoo, so let's accept it.
+---
+ support/configure.pl | 37 -------------------------------------
+ 1 file changed, 37 deletions(-)
+
+diff --git a/support/configure.pl b/support/configure.pl
+index 5615c65..95f66de 100644
+--- a/support/configure.pl
++++ b/support/configure.pl
+@@ -14,43 +14,6 @@
+ #  GNU General Public License for more details.
+ #-------------------------------------------------------------------------------
+ 
+-BEGIN {
+-   if ($] < 5.016) {
+-      print STDERR <<".";
+-polymake requires perl version not lower than 5.16;
+-your perl interpreter says it is $].
+-
+-Please upgrade your perl installation;
+-if you already have an up-to-date perl interpreter somewhere else,
+-you can specify its location on the command line:
+-
+-./configure PERL=/path/to/my/new/perl [other options ...]
+-.
+-      exit(1);
+-   } elsif ($] >= 5.040) {
+-      print STDERR <<".";
+-*************
+-*** ERROR ***
+-*************
+-
+-polymake has not been checkced for compatibility with perl 5.40 or newer;
+-your perl interpreter says it is $].
+-
+-If you already have another (older) perl interpreter somewhere else, you can
+-specify its location on the command line:
+-
+-./configure PERL=/path/to/my/new/perl [other options ...]
+-
+-You can install a custom perl version in your home directory using perlbrew
+-(https://perlbrew.pl). Make sure to append '-Duseshrplib' to the install
+-command if you want to use libpolymake (e.g. for the jupyter interface) and to
+-install all required perl modules which are listed after running configure
+-again with the new perl.
+-.
+-      exit(1);
+-   }
+-}
+-
+ use Config;
+ use Cwd;
+ use File::Path;
+-- 
+2.46.0
+
diff --git a/sci-mathematics/polymake/polymake-4.12.ebuild b/sci-mathematics/polymake/polymake-4.12.ebuild
new file mode 100644
index 000000000000..a4232f80fa1b
--- /dev/null
+++ b/sci-mathematics/polymake/polymake-4.12.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic ninja-utils toolchain-funcs
+
+DESCRIPTION="Tool for polyhedral geometry and combinatorics"
+HOMEPAGE="https://polymake.org/"
+SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2"
+
+# polymake itself is GPL-2, but even the minimal tarball bundles a lot
+# of other code. I've included everything that turns up with a
+#
+#   find ./ -name 'LICENSE' -o -name 'COPYING'
+#
+# in the list below. If any of these bother you, you may want to take a
+# closer look at how (or even if) the corresponding code is being used.
+LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
+
+REQUIRED_USE="^^ ( bliss nauty )"
+
+# The "configure" script isn't autotools; it basically exists just to
+# exec some other perl script but using the familiar name.
+BDEPEND="dev-lang/perl
+	${NINJA_DEPEND}"
+
+DEPEND="
+	libpolymake? ( dev-lang/perl )
+	dev-libs/boost:=
+	dev-libs/gmp:=
+	dev-libs/libxml2:2=
+	dev-libs/libxslt:=
+	dev-libs/mpfr:=
+	sys-libs/readline:=
+	bliss? ( sci-libs/bliss:=[gmp] )
+	cdd? ( sci-libs/cddlib:= )
+	flint? ( sci-mathematics/flint:= )
+	lrs? ( >=sci-libs/lrslib-051:=[gmp] )
+	nauty? ( sci-mathematics/nauty:= )
+	normaliz? ( >=sci-mathematics/normaliz-3.8:= )
+	ppl? ( dev-libs/ppl:= )
+	singular? ( sci-mathematics/singular:= )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/TermReadKey
+	dev-perl/XML-SAX
+	dev-perl/XML-Writer"
+
+PATCHES=( "${FILESDIR}/${P}-no-perl-constraints.patch" )
+
+src_configure() {
+	# Without this, the build system tries to use "the highest possible"
+	# optimization level and will override what's in your CXXFLAGS.
+	export CXXOPT=""
+
+	tc-export CC CXX
+
+	# We need to define BLISS_USE_GMP if bliss was built with gmp support.
+	# Therefore we require gmp support on bliss, so that the package
+	# manager can prevent rebuilds with changed gmp flag. Yes, this should
+	# be append-cppflags; but the build system doesn't respect CPPFLAGS.
+	use bliss && append-cxxflags -DBLISS_USE_GMP
+
+	# This isn't an autotools ./configure script, so a lot of things
+	# don't work the way you'd expect. We disable openmp unconditionally
+	# because it's only supposedly only used for building the bundled
+	# libnormaliz (we unbundle it) and for something called to_simplex
+	# that I can't find anywhere in the polymake source.
+	./configure --prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
+		$(usev !libpolymake "--without-callable") \
+		--without-java \
+		--without-javaview \
+		--without-native \
+		--without-scip \
+		--without-soplex \
+		--without-openmp \
+		$(use_with bliss bliss "${EPREFIX}/usr") \
+		$(use_with cdd cdd "${EPREFIX}/usr") \
+		$(use_with flint flint "${EPREFIX}/usr") \
+		$(use_with lrs lrs "${EPREFIX}/usr") \
+		$(use_with nauty nauty "${EPREFIX}/usr") \
+		$(use_with normaliz libnormaliz "${EPREFIX}/usr") \
+		$(use_with ppl ppl "${EPREFIX}/usr") \
+		$(use_with singular singular "${EPREFIX}/usr") \
+		|| die
+}
+
+# There is a backwards-compatible Makefile that would call ninja for us
+# in src_compile/src_install, but it doesn't handle MAKEOPTS correctly.
+src_compile() {
+	eninja -C build/Opt
+}
+
+src_install() {
+	# DESTDIR needs to find its way into the real install script,
+	# support/install.pl.
+	export DESTDIR="${D}"
+	eninja -C build/Opt install
+}
+
+src_test() {
+	perl/polymake --script run_testcases --emacs-style \
+		|| die "test suite failed"
+}
+
+pkg_postinst() {
+	elog "Additional features for polymake are available through external"
+	elog "software such as sci-mathematics/4ti2 and sci-mathematics/topcom."
+	elog "After installing new external software run 'polymake --reconfigure'."
+}
diff --git a/sci-mathematics/primecount/primecount-7.13-r1.ebuild b/sci-mathematics/primecount/primecount-7.13-r1.ebuild
index 2408ad36320b..62113042f54e 100644
--- a/sci-mathematics/primecount/primecount-7.13-r1.ebuild
+++ b/sci-mathematics/primecount/primecount-7.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="0/7"  # subslot is first component of libprimecount.so version
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="+executable openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/primesieve/primesieve-12.3.ebuild b/sci-mathematics/primesieve/primesieve-12.3.ebuild
index 580881f0c652..6d81d07c4184 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"
+KEYWORDS="~amd64 ~riscv"
 IUSE="doc +executable test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index d341b86d2513..5924b60c882e 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,2 +1 @@
-DIST rkward-0.7.5.tar.gz 7682442 BLAKE2B b3c79dbc51585c646e88549d82b0a68a3246219b069d641f71beb25f2ac855d0c7a0e44e1cdba3da112ee94479584768ebd45fc37afb83fbd95de51bcc3f5a31 SHA512 247ee50fbebb9b74a1c03d6ef99dded18a1b3cf18286a6d2afcaa8ff7472cc3cb735db0a876926625aff4674906956f7a0c001a46d0dfd328a93e8c7af9f6c6b
 DIST rkward-0.8.0.tar.gz 8614382 BLAKE2B e44dd1c9ae5df02160ac47a14409a2fbf88dbc085369af22e64c80a59740f25305129e166402e944f85978cabde4d273a08f7f473eb46fdb31145ff8d886f46a SHA512 07070189e05fe1bdd65372fb3f90c027c693b93e3dc80a17bc30f90c983ca0bc777f30ea81ef99343ebdc90f463f47721d03f26d116145567c8ef6ca4ffdff27
diff --git a/sci-mathematics/rkward/rkward-0.7.5.ebuild b/sci-mathematics/rkward/rkward-0.7.5.ebuild
deleted file mode 100644
index feca760015fe..000000000000
--- a/sci-mathematics/rkward/rkward-0.7.5.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
-
-ECM_HANDBOOK="forceoptional"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="IDE for the R-project"
-HOMEPAGE="https://rkward.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ LGPL-2"
-SLOT="5"
-IUSE=""
-
-DEPEND="
-	dev-lang/R
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/karchive:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kjobwidgets:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	kde-frameworks/ktexteditor:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kwindowsystem:5
-	kde-frameworks/kxmlgui:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "kate plugins support" "kde-apps/kate-addons:${SLOT}"
-		optfeature "prendering (or previewing) R markdown (.Rmd) files" "virtual/pandoc"
-		optfeature "managing citations while writing articles" "app-text/kbibtex"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 47b4b29f7af8..8a392ba16a04 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1 +1,2 @@
 DIST singular-4.3.2p16.tar.gz 20880476 BLAKE2B ce226a6867b764e593ddbf2c71220d9ea14ccdfd956046d5a94dfb768a97927ca3cf961a9ea808cb77028f2c65d989032202d3a0bde555ace945df1e987077a8 SHA512 1dae0e229e124db03e5e240c3ab2f1049c9f77cf369f701c4a2d0767ba9c23baab2d5d14271e415a3ccbf7b9a9297fcf324b8ccc2841a5156d6ee846cb409de2
+DIST singular-4.4.0p2.tar.gz 20924020 BLAKE2B 0d663b830c37c96635303faeb14a55e0eff05bc378a3263cf83374893056b1c3175718f6b0870ac0c906a92eda59db0ca91a39a7b69a88d298a4a7993b9249d1 SHA512 df3faf025f30ab1c60460f661c4cec945a410311ca89d0756eafb57b430bb53ecec103b90ca91891fc7b1e720938a8259a9b256b6acd322c021c33e628b6654b
diff --git a/sci-mathematics/singular/singular-4.4.0_p2.ebuild b/sci-mathematics/singular/singular-4.4.0_p2.ebuild
new file mode 100644
index 000000000000..7cadc4a9aeac
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.4.0_p2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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
+
+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/smtinterpol/smtinterpol-2.5_p20211018-r1.ebuild b/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018-r1.ebuild
new file mode 100644
index 000000000000..05a73e04d6b8
--- /dev/null
+++ b/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *_p20211018 ]] && COMMIT=32d7fa8751f668f9e9a18e4e96df3337b53d2150
+
+inherit java-pkg-2
+
+DESCRIPTION="Interpolating SMT-solver computing Craig interpolants for various theories"
+HOMEPAGE="https://ultimate.informatik.uni-freiburg.de/smtinterpol/
+	https://github.com/ultimate-pa/smtinterpol/"
+SRC_URI="https://github.com/ultimate-pa/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-java/ant-1.10.14-r3:0"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-Version.template-version.patch
+	"${FILESDIR}"/${PN}-build.xml-basename.patch
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant all
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+
+	einstalldocs
+}
diff --git a/sci-mathematics/twelf/metadata.xml b/sci-mathematics/twelf/metadata.xml
index d4994fb246a4..938124fd245e 100644
--- a/sci-mathematics/twelf/metadata.xml
+++ b/sci-mathematics/twelf/metadata.xml
@@ -7,4 +7,7 @@
   logic programming and for the formalization of programming language
   theory.
   </longdescription>
+  <upstream>
+    <remote-id type="github">standardml/twelf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild
index 0a7237065277..1fc16b00baa4 100644
--- a/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-inherit elisp-common
+inherit elisp-common flag-o-matic
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Implementation of the logical framework LF"
-HOMEPAGE="http://twelf.org/"
-SRC_URI="http://twelf.plparty.org/releases/${MY_P}.tar.gz"
+HOMEPAGE="https://twelf.org/"
+SRC_URI="https://github.com/standardml/twelf/releases/download/v${PV}/${MY_P}.tar.gz"
 
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
@@ -59,6 +59,12 @@ src_prepare() {
 }
 
 src_compile() {
+	# relocation R_X86_64_32 against hidden symbol `globalCPointer' can not be used when making a PIE object
+	# https://bugs.gentoo.org/863266
+	#
+	# The software is unmaintained and disables bug reports.
+	filter-lto
+
 	emake mlton CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -fno-PIE"
 	if use emacs ; then
 		pushd "${S}/emacs" || die "Could change directory to emacs"
diff --git a/sci-misc/jupyterlab-desktop-bin/Manifest b/sci-misc/jupyterlab-desktop-bin/Manifest
index 9cf095be00dd..9f5e9ac7de4c 100644
--- a/sci-misc/jupyterlab-desktop-bin/Manifest
+++ b/sci-misc/jupyterlab-desktop-bin/Manifest
@@ -1,2 +1,3 @@
 DIST jupyterlab-desktop-bin-4.1.8.1.rpm 332883125 BLAKE2B e0d46f6eb1718b5f2e2b00b1ac934bfa3bab12b2d5e9c0cafd2874a67cc1fc8a1aabc5ac9d5d3ac4abf53b262a8e5cdc8d27ef4c2cdc30a069420f2227dffed2 SHA512 9a6fa8729c4cab9df7643bbc1c2094e438ff9136b7c2f5897a5e0603ad8740e3ed46b6fe7a01885c063d0df6310dca8fe4aadb45da76c1543841b9eb7d70080d
 DIST jupyterlab-desktop-bin-4.2.1.1.rpm 333190569 BLAKE2B 838b26ab78aaa42b48877b88f19b80617c2f9dc690c4133ec0797422207f8225264d5d891a9b7d65048449e1b27328503934f690cddef966c9a2e0a659c18ca6 SHA512 82f0f096cffd8ae2f154c03d92ea90ba1e60028b3b1a560337281399639eee78945e37ac158a1e661baeef100c250b089c513949190ab0413bd4aa4276d84f65
+DIST jupyterlab-desktop-bin-4.2.5.1.rpm 336515433 BLAKE2B 7173a3179b848471540070b172f5b196e7a0192bc3dd60d9ba20b129ce1276ac4707c6f37a2371707fdce1c2a4ed8943006e9e08b1464717f0d696ad5e11843d SHA512 62669c48a632441075bdf96796866e4a64601ad06f4e9fc85b52e3956aa6ce85dd7f52816cc3c9c4466eeff7759c92721dbabf274dc6001785cb71cb84e2ed9f
diff --git a/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild
new file mode 100644
index 000000000000..ca5796ef53de
--- /dev/null
+++ b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.2.5.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2019-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 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 rpm xdg
+
+DESCRIPTION="JupyterLab desktop application, based on Electron"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="https://github.com/jupyterlab/${PN%%-bin}/releases/download/v$(ver_rs 3 -)/JupyterLab-Setup-Fedora-x64.rpm -> ${P}.rpm"
+S="${WORKDIR}"
+
+# Electron bundles a bunch of things
+LICENSE="
+	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
+	unRAR OFL-1.1 CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-python/jupyterlab-$(ver_cut 1-3)
+	media-libs/alsa-lib
+	media-libs/mesa
+	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/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/JupyterLab/*"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# cleanup languages
+	pushd "opt/JupyterLab/locales" || die
+	chromium_remove_language_paks
+	popd || die
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
+src_install() {
+	local size=512
+	doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/jupyterlab-desktop.png"
+
+	domenu usr/share/applications/jupyterlab-desktop.desktop
+
+	local DESTDIR="/opt/JupyterLab"
+	pushd "opt/JupyterLab" || die
+
+	exeinto "${DESTDIR}"
+	doexe chrome-sandbox chrome_crashpad_handler jupyterlab-desktop *.so*
+
+	insinto "${DESTDIR}"
+	doins *.pak *.bin *.json *.dat
+	insopts -m0755
+	doins -r locales resources
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/jupyterlab-desktop /opt/bin/jupyterlab-desktop
+	popd || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog ""
+	elog "On initial startup you will be prompted to select the python environment of"
+	elog "your choice. Either select a specific python version, e.g. /usr/bin/pythonX.Y,"
+	elog "or choose /usr/bin/python to follow the system wide setting in"
+	elog "/etc/python-exec/python-exec.conf."
+	elog "Please note that only python environments corresponding to the enabled"
+	elog "PYTHON_TARGETS on dev-python/jupyterlab will work."
+	elog ""
+}
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild
new file mode 100644
index 000000000000..6d1f04e29d39
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-6.0.1-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,2,3,4} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="master"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="gnuplot"
+SLOT="0"
+IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost qt5 qt6 readline regis tgif wxwidgets X"
+
+REQUIRED_USE="
+	doc? ( gd )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	amos? ( dev-libs/openspecfun )
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( ${LUA_DEPS} )
+	qt5? ( !qt6? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtprintsupport:5=
+		dev-qt/qtsvg:5=
+		dev-qt/qtwidgets:5= ) )
+	qt6? (
+		dev-qt/qtbase:6=[gui,network,widgets]
+		dev-qt/qtsvg:6=
+		dev-qt/qt5compat:6= )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:3 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
+		dev-texlive/texlive-mathscience
+		app-text/ghostscript-gpl )
+	qt5? ( !qt6? ( dev-qt/linguist-tools:5 ) )"
+
+IDEPEND="latex? ( virtual/latex-base )"
+
+GP_VERSION="${PV%.*}"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-no-picins.patch
+	"${FILESDIR}"/${PN}-6.0.0-configure.patch
+	"${FILESDIR}"/${PN}-6.0.1-watchpoints.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV##*.} = 9999 ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	use wxwidgets && setup-wxwidgets
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	use qt5 && use qt6 && ewarn "USE flag \"qt6\" overrides \"qt5\""
+
+	econf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with amos) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with gd) \
+		$(use_with gpic) \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with metafont) \
+		$(use_with metapost) \
+		$(use_with regis) \
+		$(use_with tgif) \
+		$(use_with X x) \
+		--enable-stats \
+		$(usev qt6 --with-qt=qt6 || use_with qt5 qt qt5) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	emake all
+
+	# pdflatex fails in titlepag.tex: "Argument of  has an extra }."
+	# Install the pre-built gnuplot.pdf instead.
+	#if use doc; then
+	#	if use cairo; then
+	#		emake -C docs pdf
+	#	else
+	#		ewarn "Cannot build figures unless cairo is enabled."
+	#		ewarn "Building documentation without figures."
+	#		emake -C docs pdf_nofig
+	#		mv docs/nofigures.pdf docs/gnuplot.pdf || die
+	#	fi
+	#fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
+	fi
+
+	if use doc; then
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf #FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	emake check GNUTERM="dumb"
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index fdbc3eb13346..22f0aa59fe77 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -1,2 +1,3 @@
 DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a
 DIST grace_5.1.25-13.debian.tar.xz 110248 BLAKE2B 19dce6ed1b9e1d93d87036f5aba5ee262d54a58bc7daf2039fb2246bd2f45e413832561a33f8cb1b793fdf30831b0282f00e60efe3980df7875d2923a9f32f76 SHA512 51ee85525557c630fc3e208eb9b72b8973de6351698766ade1a59af6b9f16bc1b6b9c2c40d2270eb33d55806c4762c7b5d10b14f2a470ff00cfae2c9351bc922
+DIST grace_5.1.25-17.debian.tar.xz 112540 BLAKE2B 6637c87cda3dadbb3cf8040811e227a080a116101ee0da9c51d068e811bbe7516ae8ef462dcc50bd6d53a88765908ca955cd9b1bbebcfff37da1c40d7c76f640 SHA512 2d9a05e7f409893193e23f904d82afc6e930ae7b051b9ddcfa62c6ddfb0f892cc931f41968fa52ef95ea9c1aef4138de4bdac570789e494a0f6308e355b2bda7
diff --git a/sci-visualization/grace/files/grace-configure-c99.patch b/sci-visualization/grace/files/grace-configure-c99.patch
new file mode 100644
index 000000000000..ff8cf077a5f1
--- /dev/null
+++ b/sci-visualization/grace/files/grace-configure-c99.patch
@@ -0,0 +1,89 @@
+From 625be283aa5fcfe0cfe1cc3851226d7677a21cdc Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 2 Sep 2024 20:00:20 -0400
+Subject: [PATCH] configure: fix implicit function declarations
+
+Import fedora patch:
+https://src.fedoraproject.org/rpms/grace/blob/rawhide/f/grace-configure-c99-1.patch
+
+Do not call the XmRegisterConverters function because current Motif
+does not declare it (but still exports it).  With this call, the
+result of this configure check depends on whether the compiler
+supports implicit function declarations or not.
+
+Additionally add missing includes to various checks that lacked them.
+Florian's patch moved from exit to return, but adding the includes is
+shorter.
+---
+ configure | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index d58ce51..3f3c1f3 100755
+--- a/configure
++++ b/configure
+@@ -4931,6 +4931,7 @@ else
+ /* end confdefs.h.  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #define LOG2EA 0.44269504088896340735992
+@@ -8309,6 +8310,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <zlib.h>
+       int main(void) {
+@@ -8395,6 +8397,7 @@ else
+ /* end confdefs.h.  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <jpeglib.h>
+       int main(void) {
+         int vinc;
+@@ -8479,6 +8482,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <png.h>
+       int main(void) {
+@@ -8566,6 +8570,8 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <pdflib.h>
+       int main(void) {
+         char *vinc;
+@@ -9516,11 +9522,11 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <Xm/XmAll.h>
+       int main(void) {
+         int vlibn, vincn;
+         vincn = XmVersion;
+-        XmRegisterConverters();
+         vlibn = xmUseVersion;
+         if (vincn < 1002) {
+           exit(1);
+@@ -9790,6 +9796,7 @@ else
+ /* end confdefs.h.  */
+ 
+ #include <XmHTML/XmHTML.h>
++#include <stdlib.h>
+       int main(void) {
+         int vlib, vinc;
+         vlib = XmHTMLGetVersion();
+-- 
+2.44.2
+
diff --git a/sci-visualization/grace/grace-5.1.25_p17.ebuild b/sci-visualization/grace/grace-5.1.25_p17.ebuild
new file mode 100644
index 000000000000..2e8a4182babb
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.25_p17.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FORTRAN_NEEDED=fortran
+
+inherit desktop flag-o-matic fortran-2 toolchain-funcs xdg
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fftw fortran jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff:=
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:3.0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	netcdf? ( sci-libs/netcdf:= )
+	png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${P/_p*}"
+
+PATCHES=(
+	# Fix for missing defines when fortran is disabled
+	"${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# Fix a leak (from freebsd)
+	"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch
+	# Honor -noask option and avoid accidentally overwritting files
+	"${FILESDIR}"/${PN}-5.1.25-honor-noask.patch
+	# Fix C99 compat (from Fedora); included in debian "source-hardening"???
+	#"${FILESDIR}"/${PN}-c99.patch
+	"${FILESDIR}"/${PN}-configure-c99.patch
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		# We have a safer one
+		[[ ${p} = configure-implicit-declarations.diff ]] && continue
+
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+}
+
+src_configure() {
+	# -Werror=strict-aliasing, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/863293
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	tc-export CC AR
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		$(use_with fortran f77 $(tc-getFC))
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
+
+	domenu "${FILESDIR}"/${PN}.desktop
+	for size in 16 22 24 32; do
+		newicon -s "${size}" "${WORKDIR}"/debian/icons/grace"${size}".png "${PN}.png"
+	done
+	doicon -s 48 "${WORKDIR}"/debian/icons/grace.png
+	doicon -s scalable "${WORKDIR}"/debian/grace.svg
+}
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 6f951d4a3987..8231c1048a99 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1 +1 @@
-DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da
+DIST labplot-2.11.1.tar.xz 24180904 BLAKE2B c2b94db140ca47f648f2b7e82956a88fa36819aa666430d69b0c328d46a254e0fe9991d4ea61581c4c8da0f44694b2016471090a166e8beeb378f1e02eb6b2c7 SHA512 51a039c7eec5a2e104079b1dc7bfe1ecdc2c4e3327bcfbdc99e1b2fbae2b2be5db3a1a2c319e30d41a7cfcf177be756e8e3bb05d9a58c8418e43900dfad6b3b1
diff --git a/sci-visualization/labplot/labplot-2.10.1.ebuild b/sci-visualization/labplot/labplot-2.10.1.ebuild
deleted file mode 100644
index dceb294dff35..000000000000
--- a/sci-visualization/labplot/labplot-2.10.1.ebuild
+++ /dev/null
@@ -1,98 +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=5.88.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
-HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="cantor excel fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
-
-DEPEND="
-	app-text/poppler
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=sci-libs/gsl-1.15:=
-	cantor? (
-		>=kde-apps/cantor-19.12.0:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-		>=kde-frameworks/kservice-${KFMIN}:5
-	)
-	excel? ( dev-libs/qxlsx:= )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:= )
-	hdf5? ( sci-libs/hdf5:= )
-	libcerf? ( sci-libs/libcerf )
-	markdown? ( app-text/discount:= )
-	matio? ( sci-libs/matio:= )
-	netcdf? ( sci-libs/netcdf:= )
-	origin? ( sci-libs/liborigin:2 )
-	root? (
-		app-arch/lz4
-		sys-libs/zlib
-	)
-	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
-	telemetry? ( kde-frameworks/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-# not packaged: dev-qt/qtmqtt, bug 683994
-BDEPEND="
-	app-alternatives/yacc
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MQTT=OFF # not packaged
-		-DENABLE_READSTAT=OFF # not packaged
-		-DENABLE_VECTOR_BLF=OFF # not packaged
-		-DENABLE_CANTOR=$(usex cantor)
-		-DENABLE_EXCEL=$(usex excel)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_FITS=$(usex fits)
-		-DENABLE_HDF5=$(usex hdf5)
-		-DENABLE_LIBCERF=$(usex libcerf)
-		-DENABLE_DISCOUNT=$(usex markdown)
-		-DENABLE_MATIO=$(usex matio)
-		-DENABLE_NETCDF=$(usex netcdf)
-		-DENABLE_LIBORIGIN=$(usex origin)
-		-DENABLE_ROOT=$(usex root)
-		-DENABLE_QTSERIALPORT=$(usex serial)
-		$(cmake_use_find_package telemetry KUserFeedback)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	ecm_src_configure
-}
diff --git a/sci-visualization/labplot/labplot-2.11.1.ebuild b/sci-visualization/labplot/labplot-2.11.1.ebuild
new file mode 100644
index 000000000000..4684a482542b
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.11.1.ebuild
@@ -0,0 +1,111 @@
+# 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.3.0
+QTMIN=6.6.2
+inherit ecm kde.org
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="eigen fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx"
+
+# IUSE="cantor"
+# 	cantor? (
+# 		>=kde-apps/cantor-19.12.0:6
+# 		>=kde-frameworks/kparts-${KFMIN}:6
+# 		>=kde-frameworks/kservice-${KFMIN}:6
+# 	)
+DEPEND="
+	app-text/poppler[qt6(-)]
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,gui,network,sql,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/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/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
+	>=sci-libs/gsl-1.15:=
+	eigen? ( dev-cpp/eigen:3= )
+	xlsx? ( dev-libs/qxlsx:= )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	libcerf? ( sci-libs/libcerf )
+	markdown? ( app-text/discount:= )
+	matio? ( sci-libs/matio:= )
+	netcdf? ( sci-libs/netcdf:= )
+	ods? (
+		dev-libs/libixion:=
+		dev-libs/liborcus:=
+	)
+	origin? ( sci-libs/liborigin:2 )
+	root? (
+		app-arch/lz4
+		sys-libs/zlib
+	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:6 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+# not packaged: dev-qt/qtmqtt, bug 683994
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/gettext
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	sed -e "/^ *find_package.*QT NAMES/s/Qt5 //" \
+		-i CMakeLists.txt || die # ensure Qt6 build
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MQTT=OFF # not packaged
+		-DENABLE_READSTAT=OFF # not packaged
+		-DENABLE_VECTOR_BLF=OFF # not packaged
+		-DENABLE_CANTOR=OFF # $(usex cantor)
+		-DENABLE_EIGEN3=$(usex eigen)
+		-DENABLE_XLSX=$(usex xlsx)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_LIBCERF=$(usex libcerf)
+		-DENABLE_DISCOUNT=$(usex markdown)
+		-DENABLE_MATIO=$(usex matio)
+		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_ORCUS=$(usex ods)
+		-DENABLE_LIBORIGIN=$(usex origin)
+		$(cmake_use_find_package share KF6Purpose)
+		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedbackQt6) # FIXME: should be KF6UserFeedback
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	ecm_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index f83aea5d78d6..4684a482542b 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="eigen excel fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry"
+IUSE="eigen fftw fits hdf5 libcerf markdown matio netcdf ods origin root serial share telemetry xlsx"
 
 # IUSE="cantor"
 # 	cantor? (
@@ -46,7 +46,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:6
 	>=sci-libs/gsl-1.15:=
 	eigen? ( dev-cpp/eigen:3= )
-	excel? ( dev-libs/qxlsx:= )
+	xlsx? ( dev-libs/qxlsx:= )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -90,7 +90,7 @@ src_configure() {
 		-DENABLE_VECTOR_BLF=OFF # not packaged
 		-DENABLE_CANTOR=OFF # $(usex cantor)
 		-DENABLE_EIGEN3=$(usex eigen)
-		-DENABLE_XLSX=$(usex excel)
+		-DENABLE_XLSX=$(usex xlsx)
 		-DENABLE_FFTW=$(usex fftw)
 		-DENABLE_FITS=$(usex fits)
 		-DENABLE_HDF5=$(usex hdf5)
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 75a89a727232..cd20ab7b75cd 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -14,13 +14,11 @@
 		<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=LabPlot2</bugs-to>
 		<remote-id type="kde-invent">education/labplot</remote-id>
 	</upstream>
 	<use>
-		<flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</pkg></flag>
 		<flag name="eigen">Enable support for fast baseline removal via <pkg>dev-cpp/eigen</pkg></flag>
-		<flag name="excel">Enable support for importing/exporting Microsoft Excel files (.xlsx) via <pkg>dev-libs/qxlsx</pkg></flag>
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
 		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
@@ -30,5 +28,6 @@
 		<flag name="root">Enable support for CERN's ROOT file type</flag>
 		<flag name="serial">Enable support for RS232 serial ports using <pkg>dev-qt/qtserialport</pkg></flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+		<flag name="xlsx">Enable support for importing/exporting Microsoft Excel files (.xlsx) via <pkg>dev-libs/qxlsx</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index afd8adc4b993..8edeec777311 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1 +1 @@
-DIST pythonprop-0.30.1.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43
+DIST pythonprop-0.30.1_p20240217.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43
diff --git a/sci-visualization/pythonprop/files/pythonprop-0.30.1-p20240217.patch b/sci-visualization/pythonprop/files/pythonprop-0.30.1-p20240217.patch
new file mode 100644
index 000000000000..61e26db5a736
--- /dev/null
+++ b/sci-visualization/pythonprop/files/pythonprop-0.30.1-p20240217.patch
@@ -0,0 +1,169 @@
+diff --git a/data/voacapgui.desktop.in b/data/voacapgui.desktop.in
+index 3237a87..175d7d8 100644
+--- a/data/voacapgui.desktop.in
++++ b/data/voacapgui.desktop.in
+@@ -3,4 +3,5 @@ Type=Application
+ Exec=voacapgui
+ Name=voacapgui
+ Categories=Science;HamRadio
++Keywords=amateur;ham;hf;prediction;plot;radio;voacap;
+ Icon=@PACKAGE@
+diff --git a/man/voa3DPlot.1 b/man/voa3DPlot.1
+new file mode 100644
+index 0000000..1336eea
+--- /dev/null
++++ b/man/voa3DPlot.1
+@@ -0,0 +1,36 @@
++.TH voa3DPlot 1 "FEV 2024" Linux "User Manuals"
++.SH NAME
++voa3DPlot \- Plot the contents of VOACAP output files in a 3D format
++.SH SYNOPSIS
++.B voa3DPlot [options] file
++.SH DESCRIPTION
++.B voa3DPlot
++A python script used to graphically display the contents of output files produced by VOACAP.
++.SH OPTIONS
++.IP --version
++Shows program version number and exit.
++.IP "-h, --help"
++Shows a help message and exit.
++.IP "-b band, --band=band"
++Displays a band plan indicated by 'band', an integer value from 1 to 3 (1:SWL, 2:UK AMATEUR BANDS and 3:KSA AMATEUR BANDS).
++.IP "-f max_frequency, --freqmax=max_frequency"
++Specifies the maximum frequency (MHz) to display on the Y axis.
++.IP "-g group, --group=group"
++Specifies the group(s) within a file containing multiple groups to plot.  Multiple groups must be separated by commas, e.g. '-g 1,3,4' (default = 1).
++.IP "-l 'label', --label='label'"
++Specifies the text label to be printed as a main title at the top of the plot.
++.IP "-m colourmap, --cmap=colourmap"
++Specifies the colourmap to use. Supported colour maps are 'autumn', 'bone', 'cool', 'copper',', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' (default = 'jet').
++.IP "-o outputfile, --outfile=outputfile"
++Used to specify an output file to save the plot to.
++.IP "-q, --quiet"
++Process quietly, don't produce a graph on the screen.  This only makes sense when used in conjunction with the -o option.
++.IP "-t type, --datatype=type"
++Specifies the type of image to plot.  Supported image types are 0:None 1:MUFday 2:REL 3:SNR 4:S DBW (default = 1).
++.IP "-z timezone, --timezone=timezone"
++Specifies the timezone to shift the plots to.
++.SH AUTHORS
++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>.
++
++This manual page was written by David da Silva Polverari <polverari@debian.org>
++for the Debian Project (but may be used by others).
+diff --git a/man/voaAreaPlot.1 b/man/voaAreaPlot.1
+index 8ddcfde..eb8c76a 100644
+--- a/man/voaAreaPlot.1
++++ b/man/voaAreaPlot.1
+@@ -46,7 +46,7 @@ POI_FILE is a text file with points of interest to plot on the map.  The file is
+ .IP "-p PROJECTION, --projection=PROJECTION"
+ PROJECTION specifies the map projection.  Valid values are 'cyl' (Equidistant
+ Cylindrical), 'mill' (Miller Cylindrical), gall' (Gall Stereographic),
+-'robin' (Robinson), 'vandg' (van der Grinten), 'sinu' (Sinusoidal), 'mbtfpq'
++\(aqrobin' (Robinson), 'vandg' (van der Grinten), 'sinu' (Sinusoidal), 'mbtfpq'
+ (McBryde-Thomas Flat Polar Quartic), 'eck4' (Eckert IV), 'kav7' (Kavrayskiy
+ VII), 'moll' (Mollweide), 'hammer' (Hammer).
+ .IP "-r RESOLUTION, --resolution=RESOLUTION"
+diff --git a/man/voaAreaPlotgui.1 b/man/voaAreaPlotgui.1
+new file mode 100644
+index 0000000..88d07d6
+--- /dev/null
++++ b/man/voaAreaPlotgui.1
+@@ -0,0 +1,13 @@
++.TH voaAreaPlotgui 1 "FEV 2024" Linux "User Manuals"
++.SH NAME
++voaAreaPlotgui \- Graphical frontend to the voaAreaPlot application
++.SH SYNOPSIS
++.B voaAreaPlotgui file
++.SH DESCRIPTION
++.B voaAreaPlotgui
++is a graphical user interface to the voaAreaPlot application. It plots the file contents according to the parameters set on the user interface.
++.SH AUTHORS
++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>.
++
++This manual page was written by David da Silva Polverari <polverari@debian.org>
++for the Debian Project (but may be used by others).
+diff --git a/man/voaP2PPlotgui.1 b/man/voaP2PPlotgui.1
+new file mode 100644
+index 0000000..457a6a0
+--- /dev/null
++++ b/man/voaP2PPlotgui.1
+@@ -0,0 +1,13 @@
++.TH voaP2PPlotgui 1 "FEV 2024" Linux "User Manuals"
++.SH NAME
++voaP2PPlotgui \- Graphical frontend to the voaP2PPlot application
++.SH SYNOPSIS
++.B voaP2PPlotgui file
++.SH DESCRIPTION
++.B voaP2PPlotgui
++is a graphical user interface to the voaP2PPlot application. It plots the file contents according to the parameters set on the user interface.
++.SH AUTHORS
++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>.
++
++This manual page was written by David da Silva Polverari <polverari@debian.org>
++for the Debian Project (but may be used by others).
+diff --git a/man/voacapgui.1 b/man/voacapgui.1
+new file mode 100644
+index 0000000..31b12eb
+--- /dev/null
++++ b/man/voacapgui.1
+@@ -0,0 +1,13 @@
++.TH voacapgui 1 "FEV 2024" Linux "User Manuals"
++.SH NAME
++voacapgui \- An input GUI for voacapl
++.SH SYNOPSIS
++.B voacapgui
++.SH DESCRIPTION
++.B voacapgui
++is a graphical user interface frontend for \fBvoacapl\fP. It generates voacap input files from user input data and plots the resulting predictions.
++.SH AUTHORS
++This program was written by James Watson (M0DNS) <jimwatson at mac dot com>.
++
++This manual page was written by David da Silva Polverari <polverari@debian.org>
++for the Debian Project (but may be used by others).
+diff --git a/src/pythonprop/voaAreaPlot.py b/src/pythonprop/voaAreaPlot.py
+index a0bd789..01f5d86 100644
+--- a/src/pythonprop/voaAreaPlot.py
++++ b/src/pythonprop/voaAreaPlot.py
+@@ -114,6 +114,9 @@ class VOAAreaPlot:
+ 
+         self.datadir = datadir
+ 
++        # set backend during initialization to avoid switching error
++        matplotlib.use('GTK3Agg')
++
+         try:
+             plot_parameters = VOAFile((in_file))
+             plot_parameters.parse_file()
+@@ -146,7 +149,10 @@ class VOAAreaPlot:
+         #    sys.exit(1)
+ 
+         portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
+-        plt.register_cmap(name='portland', cmap=portland)
++        try:
++            plt.register_cmap(name='portland', cmap=portland)
++        except ValueError:
++            print("Portland colormap is already registered")
+         colMap = color_map
+ 
+         projection = ccrs.PlateCarree()
+diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py
+index faf87e6..7255667 100644
+--- a/src/pythonprop/voaP2PPlot.py
++++ b/src/pythonprop/voaP2PPlot.py
+@@ -136,8 +136,15 @@ class VOAP2PPlot:
+ 
+         self.image_defs = self.IMG_TYPE_DICT[self.data_type]
+         self.user_bands = user_bands
++
++        # set backend during initialization to avoid switching error
++        matplotlib.use('GTK3Agg')
++
+         portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
+-        matplotlib.cm.register_cmap(name='portland', cmap=portland)
++        try:
++            matplotlib.cm.register_cmap(name='portland', cmap=portland)
++        except ValueError:
++            print("Portland colormap is already registered")
+ 
+         if plot_groups[0]=='a':
+             num_grp = self.df.get_number_of_groups()
diff --git a/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch b/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch
deleted file mode 100644
index 5a6736b4624b..000000000000
--- a/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-# Drop 'portland' colormap creation. It is done more than once and actual
-# matplotlib do not like redefinitions.
-diff --git a/src/pythonprop/voaAreaPlot.py b/src/pythonprop/voaAreaPlot.py
-index a0bd789..a3bdd48 100644
---- a/src/pythonprop/voaAreaPlot.py
-+++ b/src/pythonprop/voaAreaPlot.py
-@@ -94,7 +94,7 @@ class VOAAreaPlot:
-                     vg_files = [1],
-                     data_type = 1,
-                     time_zone = 0,
--                    color_map = 'portland',
-+                    color_map = 'jet',
-                     face_colour = "white",
-                     filled_contours = False,
-                     plot_contours = False,
-@@ -145,8 +145,6 @@ class VOAAreaPlot:
-         #    print "-180 < Latitude < 180.0, -90 < Longitude < 90"
-         #    sys.exit(1)
- 
--        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
--        plt.register_cmap(name='portland', cmap=portland)
-         colMap = color_map
- 
-         projection = ccrs.PlateCarree()
-@@ -498,8 +496,8 @@ def main(in_file, datadir=None):
-         dest = "color_map",
-         default = 'jet',
-         choices = [ 'autumn', 'bone', 'cool', 'copper', 'gray', \
--                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter', 'portland' ],
--        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' or 'portland'.  Default = 'jet'"))
-+                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter' ],
-+        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer' or 'winter'.  Default = 'jet'"))
-     """
-     parser.add_argument("-n", "--interest",
-         dest = "poi_file",
-diff --git a/src/pythonprop/voaAreaPlotgui.py b/src/pythonprop/voaAreaPlotgui.py
-index c001397..9f75acc 100644
---- a/src/pythonprop/voaAreaPlotgui.py
-+++ b/src/pythonprop/voaAreaPlotgui.py
-@@ -84,8 +84,7 @@ class VOAAreaPlotGUI:
-               'pink': _('pink'),
-               'spring': _('spring'),
-               'summer': _('summer'),
--              'winter': _('winter'),
--              'portland': _('portland')}
-+              'winter': _('winter')}
- 
-     def __init__(self,
-             data_source_filename,
-diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py
-index faf87e6..61fe9b9 100644
---- a/src/pythonprop/voaP2PPlot.py
-+++ b/src/pythonprop/voaP2PPlot.py
-@@ -136,8 +136,6 @@ class VOAP2PPlot:
- 
-         self.image_defs = self.IMG_TYPE_DICT[self.data_type]
-         self.user_bands = user_bands
--        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
--        matplotlib.cm.register_cmap(name='portland', cmap=portland)
- 
-         if plot_groups[0]=='a':
-             num_grp = self.df.get_number_of_groups()
-@@ -375,8 +373,8 @@ def main(data_file, datadir=None):
-         dest="color_map",
-         default='jet',
-         choices = [ 'autumn', 'bone', 'cool', 'copper', 'gray', \
--                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter', 'portland' ],
--        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' or 'portland'.  Default = 'jet'"))
-+                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter' ],
-+        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer' or 'winter'.  Default = 'jet'"))
- 
-     parser.add_argument("-o", "--outfile",
-         dest="save_file",
-diff --git a/src/pythonprop/voaP2PPlotgui.py b/src/pythonprop/voaP2PPlotgui.py
-index e1c120b..0aca557 100644
---- a/src/pythonprop/voaP2PPlotgui.py
-+++ b/src/pythonprop/voaP2PPlotgui.py
-@@ -83,8 +83,7 @@ class VOAP2PPlotGUI:
-               'pink': _('pink'),
-               'spring': _('spring'),
-               'summer': _('summer'),
--              'winter': _('winter'),
--              'portland': _('portland')}
-+              'winter': _('winter')}
- 
- 
-     def __init__(self, data_source_filename, parent = None, datadir=""):
diff --git a/sci-visualization/pythonprop/files/pythonprop-matplotlib3.9.patch b/sci-visualization/pythonprop/files/pythonprop-matplotlib3.9.patch
new file mode 100644
index 000000000000..4cea6f50d4ee
--- /dev/null
+++ b/sci-visualization/pythonprop/files/pythonprop-matplotlib3.9.patch
@@ -0,0 +1,65 @@
+--- a/src/pythonprop/voaAreaPlot.py
++++ b/src/pythonprop/voaAreaPlot.py
+@@ -148,15 +148,15 @@ class VOAAreaPlot:
+         #    print "-180 < Latitude < 180.0, -90 < Longitude < 90"
+         #    sys.exit(1)
+ 
+-        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
++        portland = ListedColormap(["#0C3383","#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"], name="portland")
+         try:
+-            plt.register_cmap(name='portland', cmap=portland)
++            matplotlib.colormaps.register(cmap=portland)
+         except ValueError:
+             print("Portland colormap is already registered")
+         colMap = color_map
+ 
+         projection = ccrs.PlateCarree()
+-        axes_class = (GeoAxes,dict(map_projection=projection))
++        axes_class = (GeoAxes,dict(projection=projection))
+ 
+         number_of_subplots = len(vg_files)
+ 
+@@ -208,7 +208,7 @@ class VOAAreaPlot:
+                     cbar_mode='single',
+                     cbar_pad=0.2,
+                     cbar_size='3%',
+-                    label_mode='')
++                    label_mode='L')
+         
+         self.main_title_label = fig.suptitle(str(self.image_defs['title']), fontsize=self.main_title_fontsize)
+ 
+@@ -292,7 +292,7 @@ class VOAAreaPlot:
+                     ax.plot([xpt],[ypt],'ro')
+                     ax.text(xpt+100000,ypt+100000,location.get_name())
+             """
+-            gl = ax.gridlines(crs=projection, draw_labels=True,
++            gl = ax.gridlines(crs=projection, draw_labels=["bottom", "left"],
+                   linewidth=1, color='black', alpha=0.75)
+             gl.xlabels_top = False
+             gl.xlabels_bottom = False
+diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py
+index 7255667..4a3ff05 100644
+--- a/src/pythonprop/voaP2PPlot.py
++++ b/src/pythonprop/voaP2PPlot.py
+@@ -140,9 +140,10 @@ class VOAP2PPlot:
+         # set backend during initialization to avoid switching error
+         matplotlib.use('GTK3Agg')
+ 
+-        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
++        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"],
++name="portland")
+         try:
+-            matplotlib.cm.register_cmap(name='portland', cmap=portland)
++            matplotlib.colormaps.register(cmap=portland)
+         except ValueError:
+             print("Portland colormap is already registered")
+ 
+@@ -203,7 +204,7 @@ class VOAP2PPlot:
+                     cbar_mode='single',
+                     cbar_pad=0.2,
+                     cbar_size='3%',
+-                    label_mode='')
++                    label_mode='L')
+ 
+         self.main_title_label = fig.suptitle(plot_label+str(self.image_defs['title']), fontsize=self.main_title_fontsize)
+ 
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild
deleted file mode 100644
index 0020e216326c..000000000000
--- a/sci-visualization/pythonprop/pythonprop-0.30.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
-HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop"
-SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	')
-	dev-python/cairocffi
-	sci-libs/cartopy[${PYTHON_SINGLE_USEDEP}]
-	sci-electronics/voacapl
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-"
-
-PATCHES=( "${FILESDIR}/${PN}-drop-portland.patch" )
-
-src_prepare() {
-	eapply_user
-
-	eapply ${PATCHES[@]}
-
-	# drop building *.pdf files
-	sed -i -e "s#docs/user/help##g" Makefile.am || die
-	# do not call update_destop_database here
-	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die
-	# fix Desktop Entry
-	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.1_p20240217.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1_p20240217.ebuild
new file mode 100644
index 000000000000..87ef45d96187
--- /dev/null
+++ b/sci-visualization/pythonprop/pythonprop-0.30.1_p20240217.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit autotools python-single-r1
+
+MY_PV=$(ver_cut 1-3)
+
+DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
+HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop"
+SRC_URI="https://github.com/jawatson/${PN}/archive/v${MY_PV}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	')
+	dev-python/cairocffi
+	sci-libs/cartopy[${PYTHON_SINGLE_USEDEP}]
+	sci-electronics/voacapl
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.30.1-p20240217.patch"
+		"${FILESDIR}/${PN}-matplotlib3.9.patch" )
+
+src_prepare() {
+	eapply_user
+
+	eapply ${PATCHES[@]}
+
+	# drop building *.pdf files
+	sed -i -e "s#docs/user/help##g" Makefile.am || die
+	# do not call update_destop_database here
+	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die
+	# fix Desktop Entry
+	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/sec-keys/openpgp-keys-andresimon/Manifest b/sec-keys/openpgp-keys-andresimon/Manifest
index a6b7be4d70e4..7aceb0e0398e 100644
--- a/sec-keys/openpgp-keys-andresimon/Manifest
+++ b/sec-keys/openpgp-keys-andresimon/Manifest
@@ -1 +1,2 @@
+DIST B8C55574187F49180EDC763750FE0279D805A7C7.v2.asc 4519 BLAKE2B 723900405c26400cc238eee931dcac22affee80aa1b27323929f6ac6b61f71c1ed3043adf255ec61bbb121d6cf1ad6e495b844dfc1c674dfacf14cef8d06fbf0 SHA512 96e45cf91ff72e1f45e1edc74f5e5c1964a6b2d49880033b52a2c6a459ecdd8aaeced27c3f0041b9ed6f1515c42e432951dbdb9b917a5f3403a91202b29c5240
 DIST openpgp-keys-andresimon-20230830-B8C55574187F49180EDC763750FE0279D805A7C7.asc 2208 BLAKE2B 9b269d5aaa3b581a262012c5f950ccf87a1f61e0e556bb156156191918f2f1dade61b99d20f9f2dc381dafdedc4c19be82ebebe45ff3e9de1e77c6bf2165fd63 SHA512 f22110469f198b0d20204aea1257734279c916603cf59626a83ca7b482b33aa3e1f8b05c12e1b0f1ab6719bbea3530ebc6b15e5821281226fc0e8f2046068705
diff --git a/sec-keys/openpgp-keys-andresimon/openpgp-keys-andresimon-20240906.ebuild b/sec-keys/openpgp-keys-andresimon/openpgp-keys-andresimon-20240906.ebuild
new file mode 100644
index 000000000000..ccf064d205a8
--- /dev/null
+++ b/sec-keys/openpgp-keys-andresimon/openpgp-keys-andresimon-20240906.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by Andre Simon"
+HOMEPAGE="http://andre-simon.de/zip/download.php#gpgsig"
+SRC_URI="
+	https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8c55574187f49180edc763750fe0279d805a7c7
+		-> B8C55574187F49180EDC763750FE0279D805A7C7.v2.asc
+"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - andresimon.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-poi/Manifest b/sec-keys/openpgp-keys-apache-poi/Manifest
new file mode 100644
index 000000000000..a973ddb645e5
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-poi/Manifest
@@ -0,0 +1 @@
+DIST openpgp-keys-apache-poi-20230921-KEYS.asc 167947 BLAKE2B faecd737de9c8659a41d08e30df1d5534cc3588e0e5b120b47d344a4cd80d14e6c1537352cafcea569ad03b75e2ec28e17fe60b97487343f4b57717aa91dce82 SHA512 92f0100b155f64a23f430ecb09cec48f94000615723f43c01dca275948e8ac5164e9f4b5da3dae119f7516da8b53012b8d6681497890638deba7b764645767db
diff --git a/sec-keys/openpgp-keys-apache-poi/metadata.xml b/sec-keys/openpgp-keys-apache-poi/metadata.xml
new file mode 100644
index 000000000000..6ef2d50cf07e
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-poi/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>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-poi/openpgp-keys-apache-poi-20230921.ebuild b/sec-keys/openpgp-keys-apache-poi/openpgp-keys-apache-poi-20230921.ebuild
new file mode 100644
index 000000000000..e9c0eaf5c551
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-poi/openpgp-keys-apache-poi-20230921.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by poi.apache.org"
+HOMEPAGE="https://poi.apache.org/download.html"
+SRC_URI="https://downloads.apache.org/poi/KEYS -> ${P}-KEYS.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - poi.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 765685eaf331..4d1605629254 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,6 +1,4 @@
-DIST openpgp-keys-apache-tomcat-10.1.25-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
-DIST openpgp-keys-apache-tomcat-10.1.26-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-10.1.28-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
-DIST openpgp-keys-apache-tomcat-9.0.90-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
-DIST openpgp-keys-apache-tomcat-9.0.91-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-10.1.29-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
 DIST openpgp-keys-apache-tomcat-9.0.93-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.94-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.26.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.26.ebuild
deleted file mode 100644
index 7481a3964076..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.26.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-10.1.25.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.29.ebuild
index 7481a3964076..7481a3964076 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.25.ebuild
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.29.ebuild
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.91.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.91.ebuild
deleted file mode 100644
index 57c3e1749269..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.91.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-apache-tomcat/openpgp-keys-apache-tomcat-9.0.90.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.94.ebuild
index 57c3e1749269..57c3e1749269 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.90.ebuild
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.94.ebuild
diff --git a/sec-keys/openpgp-keys-bradking/Manifest b/sec-keys/openpgp-keys-bradking/Manifest
index 1fdb9947390d..0c7e5429320c 100644
--- a/sec-keys/openpgp-keys-bradking/Manifest
+++ b/sec-keys/openpgp-keys-bradking/Manifest
@@ -1,3 +1,4 @@
 DIST openpgp-keys-bradking-20220407-2D2CEF1034921684.asc 42061 BLAKE2B 657ae2501acaf0e6db039a32417291dcf9f7d0003f63bf4d2eee0a7777d6379c45c8c3b78e4c7f5af14607a01e4862442d3fe4124c59355f7247434142e42a2b SHA512 39882aebd86d2bc006e25929957c6932578764baea10ca4eefaa5aa81c9b326172ac81db17d992103ebd8b8bd0755d3e35b3b8e595ad669e05b87dfaf593ab19
 DIST openpgp-keys-bradking-20220818-2D2CEF1034921684.asc 44364 BLAKE2B 57a1568cc6a219ad1f84fcde53154f81d3c86b07ac3297754163ec87bff2114a6c71dc3a9771815b1c0856e2514f41126a4615437ff81ecddca2b26426ae1c53 SHA512 496728a608ce1f6b2b2f255ee87e59990ca2c1f8e3fb502ab7a34fe1bad7224dfb7bc0de78c2bb14385a34cbd09c0c2f1ed214ab9441c3254bb76efab8f8f0d1
 DIST openpgp-keys-bradking-20230817-2D2CEF1034921684.asc 46654 BLAKE2B 6ecf16805ed61939dce3d48a4d9720305695e86dc8ce941bb889ee1f5b13c4abf594ef8b2aa0012788faf846c8f05d8fe15545848a76ce77bec869e416e7d7d5 SHA512 5ae674d7829d818ea054d3f048fe230fd681ec1014909f0e2d8ad47a8348c1d513c6094189205c01a3ea4b5ede583d69afd14ee4ec8ddc98014d1090777b0e9e
+DIST openpgp-keys-bradking-20240902-2D2CEF1034921684.asc 36974 BLAKE2B 19dc455ed7acce9113e7514a85a4d479412e895fab588e28acc120f680cfe7171f79ae9d7f97fcfdee41856dff4dec23bf7539e32bb11484e0a0f7dd40d7708e SHA512 68b9a3cbbb67bb34a41e6b45251f1bc8a3d1ca596a6c4e040234359c8a9ec9c793bf04abc8325cfc320b8965916507bda4a74d60c5ec600c23271eed3a110c5b
diff --git a/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20240902.ebuild b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20240902.ebuild
new file mode 100644
index 000000000000..b95daa08061a
--- /dev/null
+++ b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20240902.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by Brad King"
+HOMEPAGE="https://cmake.org/download/"
+# Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcba23971357c2e6590d9efd3ec8fef3a7bfb4eda
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-2D2CEF1034921684.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - bradking.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild
index d6ca7cfafa87..f4414480caf2 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20240708.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 	BDEPEND="net-misc/curl"
 else
 	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 S="${WORKDIR}"
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild
index f7167e3e04d1..96eaff32b4da 100644
--- a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20240424.ebuild
@@ -63,7 +63,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sec-keys/openpgp-keys-tcpdump/Manifest b/sec-keys/openpgp-keys-tcpdump/Manifest
index 975246ca01fa..3196a748763a 100644
--- a/sec-keys/openpgp-keys-tcpdump/Manifest
+++ b/sec-keys/openpgp-keys-tcpdump/Manifest
@@ -1,2 +1,3 @@
 DIST openpgp-keys-tcpdump-20210416.asc 1776 BLAKE2B d0522a6e03156685b88e74d80311ec37065430ad304116c892b7623b792957aaff38abf1b41f10e9c9ca8a74f852659b6194da61d5d4f309e48ce82a10c740c5 SHA512 5182b3ecc229cdb53b4ecc14696717698df3ffdca93482a771945b4e988da929dc30ad11cad272c6545c10290df1dc0338c26c039821ad19acabb9c08fd690ad
 DIST openpgp-keys-tcpdump-20240308.asc 2387 BLAKE2B 7cc47626d6a99f07228b213fb3c0f87bb307bb145350aaca05bedf41ca1b801b6458c061e078a34419c8b1767856272ffb30af1ad75ff1b0cf7d923ad15b0ea7 SHA512 c7ec80997c754fbd9ee249941f0224572afa9c36c0b8afec220081b1012c506f3df27bf29c3c55b0431b97448d0a05241bd4ef32450f7f1fd9dae09d4a30da98
+DIST openpgp-keys-tcpdump-20240901.asc 1359 BLAKE2B 27b1a6323838b481afbff2292d4e77956e3f37df36b8d8470b5c96989967a00f0712c0ac1f22d1536bbf1613d9b6c7de644de4f1bb6118cc7049c59a19b89a1b SHA512 0af707e30cf857a848c91dc91d1c778bef2168fcc504dddda8157bc6bc133787288e5fe3f48f777ca5e58bad1578b304b3ef2cb996906384058a9e22f91dcad6
diff --git a/sec-keys/openpgp-keys-tcpdump/openpgp-keys-tcpdump-20240901.ebuild b/sec-keys/openpgp-keys-tcpdump/openpgp-keys-tcpdump-20240901.ebuild
new file mode 100644
index 000000000000..e6f172f82880
--- /dev/null
+++ b/sec-keys/openpgp-keys-tcpdump/openpgp-keys-tcpdump-20240901.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used to sign tcpdump releases"
+HOMEPAGE="https://www.tcpdump.org/index.html#latest-releases"
+SRC_URI="https://www.tcpdump.org/release/signing-key.asc -> ${P}.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+
+	insinto /usr/share/openpgp-keys
+	newins - tcpdump.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-xpdf/metadata.xml b/sec-keys/openpgp-keys-xpdf/metadata.xml
index c3bda71eefca..112e0ed7b95c 100644
--- a/sec-keys/openpgp-keys-xpdf/metadata.xml
+++ b/sec-keys/openpgp-keys-xpdf/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r1.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r1.ebuild
index bd9e0ce41730..f955b9c060de 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r2.ebuild
index a40a0c0f42d9..0e3b004c6c5c 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
index 57f0ac923b71..32b5d8759791 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20240226-r1.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20240226-r1.ebuild
index 9a1a1c7e9e3b..e6795615f26e 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20240226-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20240226-r2.ebuild
index e193b7e02956..48b61bdca10e 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-9999.ebuild b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
index d7d65de45d18..bdc076517f46 100644
--- a/sec-policy/selinux-acct/selinux-acct-9999.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20240226-r1.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20240226-r1.ebuild
index f3f8a60a8c56..1b4690b79472 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20240226-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20240226-r2.ebuild
index ed60b4249289..84baaa2425a2 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-9999.ebuild b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
index 28500c38a13f..39ba816806b9 100644
--- a/sec-policy/selinux-afs/selinux-afs-9999.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20240226-r1.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20240226-r1.ebuild
index ac1d6a2f3e02..0d2f0a1e951c 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20240226-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20240226-r2.ebuild
index 1d762ea5fb3f..f8b75d40897d 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-9999.ebuild b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
index 15637889277c..e5e39d7d4411 100644
--- a/sec-policy/selinux-aide/selinux-aide-9999.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r1.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r1.ebuild
index 3b420b8d19ea..af9e25be93f0 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r2.ebuild
index 05798803a49b..11db71bdeea4 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
index 9f5eeab13d17..abcf030cd8d8 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r1.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r1.ebuild
index a09ead5c4f4c..3b26bfff5a57 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r2.ebuild
index d786c8f5f5bf..7672ebfd7964 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
index e1ab3616aee8..9a949a147c2c 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r1.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r1.ebuild
index 47bc288e5603..f397942040f2 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r2.ebuild
index 25a33299c56d..49c71db26be1 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
index 2d7e91a18924..a719243a26e3 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-android/selinux-android-2.20240226-r1.ebuild b/sec-policy/selinux-android/selinux-android-2.20240226-r1.ebuild
index 22931bcc9a61..ee47d5da2dc1 100644
--- a/sec-policy/selinux-android/selinux-android-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-android/selinux-android-2.20240226-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20240226-r2.ebuild
index 087c64e1b619..81968a333c7e 100644
--- a/sec-policy/selinux-android/selinux-android-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-android/selinux-android-9999.ebuild b/sec-policy/selinux-android/selinux-android-9999.ebuild
index d61f1879f624..d67452b2a793 100644
--- a/sec-policy/selinux-android/selinux-android-9999.ebuild
+++ b/sec-policy/selinux-android/selinux-android-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20240226-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20240226-r1.ebuild
index fbbdd7b9b459..4730aa5a75b0 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20240226-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20240226-r2.ebuild
index da3941883959..b70ee43d41ff 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apache/selinux-apache-9999.ebuild b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
index 01787fd61f8d..4173f043f1b6 100644
--- a/sec-policy/selinux-apache/selinux-apache-9999.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r1.ebuild
index 2bcbd7b4b5dd..7857c567f7d5 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild
index 580ce10230ee..f77f7e15b576 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
index 8cce79082c01..67a0003f7e38 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20240226-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20240226-r1.ebuild
index 5f57d6ac1725..2cd6769222e2 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20240226-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20240226-r2.ebuild
index 5b99cf4fbd65..871d25ffa933 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-apm/selinux-apm-9999.ebuild b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
index 9b90f2e875bf..261f69899726 100644
--- a/sec-policy/selinux-apm/selinux-apm-9999.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r1.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r1.ebuild
index 63ae805d46dc..0b3e80d31e38 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r2.ebuild
index 0197f7aadab5..29268ba0c8bf 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
index 5e3d725304ba..577daf07ae10 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r1.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r1.ebuild
index 9df713d677a6..4edece1732d7 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r2.ebuild
index c0e0e4ad6913..94fba0939cf6 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
index 2dffd8fa9abb..779487f440c8 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20240226-r1.ebuild b/sec-policy/selinux-at/selinux-at-2.20240226-r1.ebuild
index 66c19dd0ab2b..d22392c870bc 100644
--- a/sec-policy/selinux-at/selinux-at-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20240226-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20240226-r2.ebuild
index 82e0e710bd81..b4e7e8b20029 100644
--- a/sec-policy/selinux-at/selinux-at-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-9999.ebuild b/sec-policy/selinux-at/selinux-at-9999.ebuild
index c82b4235f3c0..4b6bf3875704 100644
--- a/sec-policy/selinux-at/selinux-at-9999.ebuild
+++ b/sec-policy/selinux-at/selinux-at-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20240226-r1.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20240226-r1.ebuild
index 14200698057b..1d891e8fdbaa 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20240226-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20240226-r2.ebuild
index 70abe68a4a3c..36f754522788 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-9999.ebuild b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
index fdb27c5fad63..0eeb01abdf57 100644
--- a/sec-policy/selinux-automount/selinux-automount-9999.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r1.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r1.ebuild
index 2347eb0dd98b..b56828b1a51f 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r2.ebuild
index 0b94ee739ae7..0c1967557757 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
index e33c6c37c52c..fdb16ddebc8b 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r1.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r1.ebuild
index f99dcf713d37..6c0a210dec13 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r2.ebuild
index f0b39084f0c5..442a23a03085 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
index a47d0e2f4eb9..52dfbf61bce8 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20240226-r1.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20240226-r1.ebuild
index 00c02fda845a..052d75dc2844 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20240226-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20240226-r2.ebuild
index e0d1cf889630..8f890610af3e 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-9999.ebuild b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
index 6a1429686d81..e7b88525db2e 100644
--- a/sec-policy/selinux-backup/selinux-backup-9999.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r1.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r1.ebuild
index 30fac12b0b65..c96976e56eb6 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r2.ebuild
index e1a8f8703fc2..9c512833e446 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
index 985257670d36..45b03713d9b1 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r1.ebuild
index f9e01b16f6fc..3c321e1c55dd 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild
index 9afff17a04b7..6a8c488e7c23 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20240226-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index 9ca7ee646d2e..aed954eecb28 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base/selinux-base-2.20240226-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20240226-r1.ebuild
index 4fa0e038ce61..12291e7921c1 100644
--- a/sec-policy/selinux-base/selinux-base-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20240226-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-base/selinux-base-2.20240226-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20240226-r2.ebuild
index 1d65f2c54201..0c870e9f5bb4 100644
--- a/sec-policy/selinux-base/selinux-base-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20240226-r2.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index bd1990dd7d94..351b84fbcc85 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20240226-r1.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20240226-r1.ebuild
index f8fb56736079..7e2cebc15caf 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20240226-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20240226-r2.ebuild
index 49295bead19e..b0ee6aa62be6 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-9999.ebuild b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
index 660d8f7562ed..fc61ea28bf7b 100644
--- a/sec-policy/selinux-bind/selinux-bind-9999.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r1.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r1.ebuild
index 2d08e0b5fa9c..746dcc7f8b28 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r2.ebuild
index 2f49ffaad01a..01f9396c75d6 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
index 3b556c61327a..c1e8b8248244 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r1.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r1.ebuild
index 73ddb170f155..481a1d8a7e2f 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r2.ebuild
index f8645d4ddecd..ce740ef85259 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
index de794e5e1a16..e7d6b0ff8e3d 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r1.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r1.ebuild
index 896c079ec882..bb2fa49f19b1 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r2.ebuild
index 3c35beeaa45f..ad301d339467 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
index 1abd2778cec8..37a6e4fe1680 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r1.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r1.ebuild
index 671ddb735432..841d5606f18c 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r2.ebuild
index 71979ba5e539..b736088f7ebb 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
index d3145dfdc262..ecdab7d79041 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r1.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r1.ebuild
index f10deb39e0f2..ffea6cf5172b 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r2.ebuild
index 024f902644b1..32808326b21c 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
index fa01a1026930..175d9e832b0a 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r1.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r1.ebuild
index 5dc3a9967c5f..d9efe1e6d9b4 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r2.ebuild
index 5038eca5b143..4779c8504697 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
index 30d3cd0df420..1012d6db2b0f 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20240226-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20240226-r1.ebuild
index 7ef50df56925..2b14f5f3bd60 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20240226-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20240226-r2.ebuild
index 2adc3c81ab12..0f5fad1c0bed 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-9999.ebuild b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
index b0e9659f7a1d..dfb4d22c9ca7 100644
--- a/sec-policy/selinux-canna/selinux-canna-9999.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r1.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r1.ebuild
index 5c0d2a590613..938efeaa146b 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r2.ebuild
index 98c4673f241f..1a17280f6aec 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
index 77a4c535c7e1..09b68e2cee1b 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r1.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r1.ebuild
index c736b6f0b185..94071b8dc7f8 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r2.ebuild
index 9d99c185a3bb..622285d42019 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
index b25aa0d2f337..bbb7075a64e2 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r1.ebuild b/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r1.ebuild
index 0fc2bf860ee2..2f8142601725 100644
--- a/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for certbot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r2.ebuild b/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r2.ebuild
index b6c84d24b2bc..b7a2de20d400 100644
--- a/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-certbot/selinux-certbot-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for certbot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-certbot/selinux-certbot-9999.ebuild b/sec-policy/selinux-certbot/selinux-certbot-9999.ebuild
index 92c0a4241036..8ade3a81faca 100644
--- a/sec-policy/selinux-certbot/selinux-certbot-9999.ebuild
+++ b/sec-policy/selinux-certbot/selinux-certbot-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for certbot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r1.ebuild
index c695708c308a..b43db1894d92 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r2.ebuild
index 3cbd0ecc1cce..213f585fa2f2 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
index 956a44f59b21..5137fc56420d 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r1.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r1.ebuild
index a9b8f9a5df6a..b672bbc71e95 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r2.ebuild
index 4fc13ba5a3e9..f05fc13539fa 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
index d309eec68f77..b72d27685c66 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r1.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r1.ebuild
index 6bedd08f76d4..f0c6e931368c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r2.ebuild
index 6bedd08f76d4..f0c6e931368c 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20240226-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
index 5426155c0e52..e11a39c6e145 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r1.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r1.ebuild
index a3e7cbde1439..7086e49aa6a4 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r2.ebuild
index ca458315573f..ea955c9cb458 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
index c50e46a96e99..60cce44d22d3 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r1.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r1.ebuild
index ad3eae53b54a..19f31f902012 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r2.ebuild
index 1a9e252a5626..49d5bfd96102 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
index c9d8561386f7..ab5ceeb1bea8 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r1.ebuild b/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r1.ebuild
index 8ec0e9c4dc05..9a0e2d698d23 100644
--- a/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cloudinit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r2.ebuild b/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r2.ebuild
index ff278698af7b..0e51780203e9 100644
--- a/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cloudinit/selinux-cloudinit-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cloudinit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cloudinit/selinux-cloudinit-9999.ebuild b/sec-policy/selinux-cloudinit/selinux-cloudinit-9999.ebuild
index 17db3cdb0e8e..36f378daa003 100644
--- a/sec-policy/selinux-cloudinit/selinux-cloudinit-9999.ebuild
+++ b/sec-policy/selinux-cloudinit/selinux-cloudinit-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cloudinit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r1.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r1.ebuild
index 846c0f225f4d..1af3bad2921e 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r2.ebuild
index e20be319e4c2..762d297f26b0 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
index 15946ef7b4dc..5eab3a9dcce7 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20240226-r1.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20240226-r1.ebuild
index ab942258faa6..9f01c416a0dd 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20240226-r2.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20240226-r2.ebuild
index 2653007ce4be..b75b282abfde 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-colord/selinux-colord-9999.ebuild b/sec-policy/selinux-colord/selinux-colord-9999.ebuild
index c5b48049a696..09f169e06f60 100644
--- a/sec-policy/selinux-colord/selinux-colord-9999.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-container/selinux-container-2.20240226-r1.ebuild b/sec-policy/selinux-container/selinux-container-2.20240226-r1.ebuild
index abd433953350..ed70fdefceb0 100644
--- a/sec-policy/selinux-container/selinux-container-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-container/selinux-container-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for container"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-container/selinux-container-2.20240226-r2.ebuild b/sec-policy/selinux-container/selinux-container-2.20240226-r2.ebuild
index 6daac99c5283..f416ed0379bc 100644
--- a/sec-policy/selinux-container/selinux-container-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-container/selinux-container-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for container"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
diff --git a/sec-policy/selinux-container/selinux-container-9999.ebuild b/sec-policy/selinux-container/selinux-container-9999.ebuild
index 7ea7963542c4..f905cf5f743d 100644
--- a/sec-policy/selinux-container/selinux-container-9999.ebuild
+++ b/sec-policy/selinux-container/selinux-container-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for container"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r1.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r1.ebuild
index 946f00a015ad..03a4efb27d1a 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r2.ebuild
index 012487bb224c..fb813cd2a7d4 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
index cd177fb580b2..9ae3999dca63 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r1.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r1.ebuild
index 9bfc6ce6f2ec..dcf1001fcdcd 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r2.ebuild
index a3851d310553..e2eec06f76fb 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
index a5e29796b250..d727d39fce57 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20240226-r1.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20240226-r1.ebuild
index 7bb4999705de..d73e54ffb821 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20240226-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20240226-r2.ebuild
index f518aff67365..c083941ab8bd 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-9999.ebuild b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
index b6974da6bf6a..488672f643f1 100644
--- a/sec-policy/selinux-courier/selinux-courier-9999.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r1.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r1.ebuild
index 5e54356baf44..bd118e335730 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r2.ebuild
index ce1403f792c5..7bbcc524374e 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
index 818558041301..88f08d6cf58c 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r1.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r1.ebuild
index a39b1181c644..12bd0a12e8f3 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r2.ebuild
index 325e2c1ad45b..0634c68e92b5 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
index 554722afba1e..693bb648c84d 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-crio/selinux-crio-2.20240226-r1.ebuild b/sec-policy/selinux-crio/selinux-crio-2.20240226-r1.ebuild
index c7526e57c07b..bf9745eb4bbe 100644
--- a/sec-policy/selinux-crio/selinux-crio-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-crio/selinux-crio-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cri-o"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-crio/selinux-crio-2.20240226-r2.ebuild b/sec-policy/selinux-crio/selinux-crio-2.20240226-r2.ebuild
index fdf2a640ed5e..6e146e40b446 100644
--- a/sec-policy/selinux-crio/selinux-crio-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-crio/selinux-crio-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cri-o"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-crio/selinux-crio-9999.ebuild b/sec-policy/selinux-crio/selinux-crio-9999.ebuild
index fc5a73e502d5..1b568976d5f7 100644
--- a/sec-policy/selinux-crio/selinux-crio-9999.ebuild
+++ b/sec-policy/selinux-crio/selinux-crio-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cri-o"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20240226-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20240226-r1.ebuild
index 64871741ab38..34777b6d78ff 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20240226-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20240226-r2.ebuild
index 25d7557742f2..d78ed04b8231 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cups/selinux-cups-9999.ebuild b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
index 9972d398327c..fd29f8dda98d 100644
--- a/sec-policy/selinux-cups/selinux-cups-9999.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r1.ebuild
index 076f272ce01c..4d65506c5e6b 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r2.ebuild
index 76cc739c11c1..deced4d3d1cf 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
index c7000039c884..aeb67bc3c1d8 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r1.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r1.ebuild
index 43be8a2675eb..0be6a101e993 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r2.ebuild
index 2a8635a47f15..8b1398133111 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
index 86227239ef9f..324d705d5320 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r1.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r1.ebuild
index b843241d505d..a855fc90c030 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r2.ebuild
index 21aedb340cf6..6d8087ca934c 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
index 8954b8333f18..017104154ffd 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20240226-r1.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20240226-r1.ebuild
index c34c8d0ca6ad..5de2b046c74d 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20240226-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20240226-r2.ebuild
index 2f3d2693de18..ac49c5622592 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-9999.ebuild b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
index e3d99631b217..207cb3aac8b1 100644
--- a/sec-policy/selinux-dante/selinux-dante-9999.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r1.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r1.ebuild
index 375c49256009..2c88f6f1b8c8 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r2.ebuild
index 6f52d3d4837e..9313edb1995f 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
index 0b5c1450a88f..1a2b7374dd0e 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r1.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r1.ebuild
index 2312f6f9700f..032873b59ca7 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r2.ebuild
index 03b4788375c9..868504906989 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
index 3bb315eba14c..33f0cbe98b4f 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r1.ebuild
index 2e0582555d9a..1f8156689df0 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r2.ebuild
index 737321b68d8a..dd1152c531a4 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
index 0a16358e14ff..c64026f2cdfd 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r1.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r1.ebuild
index 27fb888bbac6..12c4a62ebb20 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r2.ebuild
index e73a7d90ddd3..189ba2057690 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
index 58359a83c2d1..a9eab6b2d171 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r1.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r1.ebuild
index 8fcf00fd94ac..4525f5880326 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r2.ebuild
index 207564ac20d9..e368480871a8 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
index 80482d8c65af..dab7c6669da2 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r1.ebuild
index fcb0878ce166..ed0b62ea788a 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r2.ebuild
index c520e02e189b..dbe03c88d3df 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
index 8a29694b9411..9b61a5d3f398 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r1.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r1.ebuild
index fba2885f09ca..d697bf49b891 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r2.ebuild
index ad54e1b22f7e..c773372c67ea 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
index 5da5842f3f1d..d60a6150e2f4 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r1.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r1.ebuild
index c92c20643e73..0f7565b9e585 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r2.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r2.ebuild
index 3b0fa0967113..78e1b15794b9 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
index 6f76ed76cec8..b60935e3560e 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r1.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r1.ebuild
index c42507104e55..ad6e5be92126 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r2.ebuild
index f5ef0c536765..a3552210acc3 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
index bcef71e0fde0..b4c660bd1000 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r1.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r1.ebuild
index f4748518124d..7f742b75de09 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r2.ebuild
index 726891e82b22..15f5f94e8887 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
index 18536a4cab63..4674bdbcdee9 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r1.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r1.ebuild
index 286f8ef10a8b..3ee9e9144fab 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r2.ebuild
index 5f113cb52372..2f6239e41a1e 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
index 68f28408b716..9624b120e504 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r1.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r1.ebuild
index 858a163df096..80c32a309c6b 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r2.ebuild
index d41177d9d550..1f233f3a44f8 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
index 6fca9f73bcdf..16c36c832c49 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r1.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r1.ebuild
index 0942b8d80395..41f2a9fc077a 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r2.ebuild
index f97abeba1814..d731ee14e530 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
index e56673bb8b9d..fd11f539ef7b 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r1.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r1.ebuild
index 42fe6ea6c4c7..9138b695a2a3 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r2.ebuild
index 28e6123e54d2..7f63aea97bb6 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
index 649576a8c1cc..2a289049542d 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-docker/selinux-docker-2.20240226-r1.ebuild b/sec-policy/selinux-docker/selinux-docker-2.20240226-r1.ebuild
index 1b770d2f76be..3fa8901ef32d 100644
--- a/sec-policy/selinux-docker/selinux-docker-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-docker/selinux-docker-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for docker"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-docker/selinux-docker-2.20240226-r2.ebuild b/sec-policy/selinux-docker/selinux-docker-2.20240226-r2.ebuild
index 9814b8a0810b..f8e3f816a1d8 100644
--- a/sec-policy/selinux-docker/selinux-docker-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-docker/selinux-docker-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for docker"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-docker/selinux-docker-9999.ebuild b/sec-policy/selinux-docker/selinux-docker-9999.ebuild
index f0beb1536e1e..2c75223af5a0 100644
--- a/sec-policy/selinux-docker/selinux-docker-9999.ebuild
+++ b/sec-policy/selinux-docker/selinux-docker-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for docker"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r1.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r1.ebuild
index 803c3bbff03a..6723eda3e504 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r2.ebuild
index d3792b1bbbd6..fb18a6c141df 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
index be3dfbfedf55..26441845371b 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r1.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r1.ebuild
index 900412afdf9e..362958f5d115 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r2.ebuild
index 33c4a83ed7a5..74d7fdfa9a3d 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
index ead069c132b2..50b59c06a20f 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r1.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r1.ebuild
index 49d022932e22..aad5f47af031 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r2.ebuild
index 68da8bdb16fd..fe80e1afe80f 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
index 489d04529ba8..283065c96ea7 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r1.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r1.ebuild
index 531560e17b0d..a42a94971667 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r2.ebuild
index 72d0923537cf..a7d4fc96a2fc 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
index b00b6c950bfd..c9ea58b5f1a9 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r1.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r1.ebuild
index 44bcabaf3c1b..f42ea9e66ac0 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r2.ebuild
index ba825a140c68..18333b88eb9a 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
index f14c80fb0b75..fdf9206bca01 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r1.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r1.ebuild
index 42c8b91b38ac..405d0fb20112 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r2.ebuild
index d06fa98f6e3b..590b4f3a0772 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
index b618164332ec..a9545e04a926 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20240226-r1.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20240226-r1.ebuild
index e2507e00662b..8c810223786f 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20240226-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20240226-r2.ebuild
index 3109cc9cd919..95cec0d48819 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-9999.ebuild b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
index 1fbd64ee99ce..2fc710041b6b 100644
--- a/sec-policy/selinux-exim/selinux-exim-9999.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r1.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r1.ebuild
index e72d4ede9dc3..3fc1da25fa3b 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r2.ebuild
index 8f8b3f0e4cc4..904d4c5c1aa2 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
index 0d36a2fac1e0..7b209b03b41c 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r1.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r1.ebuild
index 1f881b125bdf..9d388ab68bcd 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r2.ebuild
index af541036ad74..fda3eaebde41 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
index c5d1ce9786d4..dfac5a68a44f 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20240226-r1.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20240226-r1.ebuild
index f0c334419c07..22e0dd1c7d44 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20240226-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20240226-r2.ebuild
index b48845b14ac8..16e1a6defcd0 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-finger/selinux-finger-9999.ebuild b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
index a36f57ac4888..8def7c6fa0c5 100644
--- a/sec-policy/selinux-finger/selinux-finger-9999.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-firewalld/selinux-firewalld-2.20240226-r2.ebuild b/sec-policy/selinux-firewalld/selinux-firewalld-2.20240226-r2.ebuild
index b5f0f542d882..0d9a54eb54be 100644
--- a/sec-policy/selinux-firewalld/selinux-firewalld-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-firewalld/selinux-firewalld-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for firewalld"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-firewalld/selinux-firewalld-9999.ebuild b/sec-policy/selinux-firewalld/selinux-firewalld-9999.ebuild
index 13057cb78b5e..a80ba40fa81f 100644
--- a/sec-policy/selinux-firewalld/selinux-firewalld-9999.ebuild
+++ b/sec-policy/selinux-firewalld/selinux-firewalld-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for firewalld"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20240226-r1.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20240226-r1.ebuild
index dad6dff71683..0cbcdfc95730 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20240226-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20240226-r2.ebuild
index 514aec852dc4..62e04ba311b0 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-9999.ebuild b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
index 838e1414274c..d50229158bac 100644
--- a/sec-policy/selinux-flash/selinux-flash-9999.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r1.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r1.ebuild
index 53e4ef563933..521069a25aff 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r2.ebuild
index 35c6e99c4159..ddb88ad7c7cd 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
index 2667fb18f9af..38d5a27b68cc 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r1.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r1.ebuild
index c095015c86a5..f9ae8a78fa48 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r2.ebuild
index 816fd8b6fd56..698c90347a01 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
index a7a4d262bdd3..ac46173cd24f 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20240226-r1.ebuild b/sec-policy/selinux-games/selinux-games-2.20240226-r1.ebuild
index f7232f968091..c5e6b439c6c1 100644
--- a/sec-policy/selinux-games/selinux-games-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20240226-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20240226-r2.ebuild
index 3f128646a50a..40d1f4fbba14 100644
--- a/sec-policy/selinux-games/selinux-games-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-9999.ebuild b/sec-policy/selinux-games/selinux-games-9999.ebuild
index 197109b4bc59..cfc699616294 100644
--- a/sec-policy/selinux-games/selinux-games-9999.ebuild
+++ b/sec-policy/selinux-games/selinux-games-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r1.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r1.ebuild
index c5d8dfb369ea..8aedfa2e1376 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r2.ebuild
index 2c6aad7b0d76..051bca9da9af 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
index 749e3c824089..c931fb7eed6c 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-git/selinux-git-2.20240226-r1.ebuild b/sec-policy/selinux-git/selinux-git-2.20240226-r1.ebuild
index ea0341047180..1a5d55aeb9c0 100644
--- a/sec-policy/selinux-git/selinux-git-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-git/selinux-git-2.20240226-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20240226-r2.ebuild
index 801fefc3bee9..169cb125327f 100644
--- a/sec-policy/selinux-git/selinux-git-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-git/selinux-git-9999.ebuild b/sec-policy/selinux-git/selinux-git-9999.ebuild
index 2917aa3d1dce..4ae8751c59b8 100644
--- a/sec-policy/selinux-git/selinux-git-9999.ebuild
+++ b/sec-policy/selinux-git/selinux-git-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r1.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r1.ebuild
index 434d70cc5c9f..670c657fa500 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r2.ebuild
index 1eea693a1130..617c4e438ffd 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
index ce8fd65899d7..9c1dffbcc15a 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r1.ebuild b/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r1.ebuild
index 884cc02d2fca..46ffebeb4092 100644
--- a/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for glusterfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r2.ebuild b/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r2.ebuild
index 4fd55bd09977..5cf971d0925c 100644
--- a/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-glusterfs/selinux-glusterfs-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for glusterfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-glusterfs/selinux-glusterfs-9999.ebuild b/sec-policy/selinux-glusterfs/selinux-glusterfs-9999.ebuild
index df9e936466cb..4ff1b433fe05 100644
--- a/sec-policy/selinux-glusterfs/selinux-glusterfs-9999.ebuild
+++ b/sec-policy/selinux-glusterfs/selinux-glusterfs-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for glusterfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r1.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r1.ebuild
index e3bf6fc7104c..4378b7c74c36 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r2.ebuild
index 66958142c172..e40a984083fd 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
index b459503f1ce9..a60db2ec6e38 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r1.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r1.ebuild
index 1bc632f30d35..94e48685167e 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r2.ebuild
index 1bc632f30d35..94e48685167e 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20240226-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
index 4ef14cdf9a37..b97f3b292392 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r1.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r1.ebuild
index 1d32d45230ea..356149881dbb 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r2.ebuild
index 32a92d27efb3..102c7e4afc8b 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
index f84612414fae..115bbbe19487 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r1.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r1.ebuild
index 6f02e33bba5e..d62c38e0e78c 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r2.ebuild
index df37bb69b175..0a49f5847636 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
index 3e87064f5eff..f33e311087ff 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r1.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r1.ebuild
index 4584ade948dc..7d96b7536d55 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r2.ebuild
index 6a7f70bbb3a2..3f010ab01e41 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
index 1ed71c452037..f04a77d42fea 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r1.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r1.ebuild
index 815ec31a2103..60b80fb45e6b 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r2.ebuild
index a5c1a8fac086..0cca603f4b3f 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
index d2cdd86d47a5..eb38871e891c 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r1.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r1.ebuild
index f2ae92a9e305..74b2bf75d9db 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r2.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r2.ebuild
index 40ea11697866..54351a92c145 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
index 40223780230b..4d9172b8af4d 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r1.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r1.ebuild
index 113d7fce07ad..57d59ddc3321 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r2.ebuild
index 227f54762247..acb06234f1a5 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
index a85fb4a68646..e9afed78880b 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r1.ebuild b/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r1.ebuild
index 1221274be544..057e20bf8378 100644
--- a/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hostapd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r2.ebuild b/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r2.ebuild
index 15bb20af20cd..58c0ebd05dae 100644
--- a/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-hostapd/selinux-hostapd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hostapd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-hostapd/selinux-hostapd-9999.ebuild b/sec-policy/selinux-hostapd/selinux-hostapd-9999.ebuild
index 32c5db1e4b56..894cad420bed 100644
--- a/sec-policy/selinux-hostapd/selinux-hostapd-9999.ebuild
+++ b/sec-policy/selinux-hostapd/selinux-hostapd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hostapd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r1.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r1.ebuild
index 27b47135e30f..95668e37116e 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r2.ebuild
index 43189ea0968a..824be9a7f7c9 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
index 66b294757dea..2467f87a47f7 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r1.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r1.ebuild
index df59a723b8a7..dc12ea77c57b 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r2.ebuild
index 752cd2a116c6..97b49c55e70e 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
index 0709c5d73b23..1fcb74387be0 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r1.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r1.ebuild
index 7386394939bf..03309b0204fe 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r2.ebuild
index 49d352d56db1..b9a61efca954 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
index 42a21f2935f3..be53187c329c 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20240226-r1.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20240226-r1.ebuild
index d32a14d61650..43eae2787148 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20240226-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20240226-r2.ebuild
index e54f98bf6608..298d386cd12d 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-9999.ebuild b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
index b5b888f8848a..39060db79546 100644
--- a/sec-policy/selinux-inn/selinux-inn-9999.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r1.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r1.ebuild
index 862256b329d1..485ff6668f3e 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r2.ebuild
index 1dc3dfe5f023..f9044eac7acb 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
index 31b6a7d44ec3..4e1fe0c71dbe 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20240226-r1.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20240226-r1.ebuild
index 66c66eaff25e..f072e7406f1e 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20240226-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20240226-r2.ebuild
index 9ee11a2cc243..a62f743632d9 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-9999.ebuild b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
index d311001f1e68..7b9701206783 100644
--- a/sec-policy/selinux-irc/selinux-irc-9999.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r1.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r1.ebuild
index 799f31c02586..dae128934247 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r2.ebuild
index 7c1fa9da9d30..4e77cae3d9df 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
index 7c3396da1d11..652b73b22693 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r1.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r1.ebuild
index e4ac9f8aa0a3..a33d0a358131 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r2.ebuild
index 30411608d5ce..e4c674f4ec3b 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
index 4ee95576d0e3..0b0636832f8e 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r1.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r1.ebuild
index 94450d83a391..62e0b0b2e43a 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r2.ebuild
index ccc627d14afa..2d6df9bb0472 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
index 7c0190d5aa9e..21a0f3e6c8b4 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20240226-r1.ebuild b/sec-policy/selinux-java/selinux-java-2.20240226-r1.ebuild
index 865586c45baf..6892a7de136a 100644
--- a/sec-policy/selinux-java/selinux-java-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20240226-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20240226-r2.ebuild
index 865586c45baf..6892a7de136a 100644
--- a/sec-policy/selinux-java/selinux-java-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20240226-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-9999.ebuild b/sec-policy/selinux-java/selinux-java-9999.ebuild
index 9f2cdc05e14d..c6eeda7de89e 100644
--- a/sec-policy/selinux-java/selinux-java-9999.ebuild
+++ b/sec-policy/selinux-java/selinux-java-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r1.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r1.ebuild
index 4e45c12f0e6e..42fa8937e5b9 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r2.ebuild
index 29d34c6922c4..b557943d2098 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
index 6dc46b1149b3..326a3312335a 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r1.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r1.ebuild
index 82169e47a099..642379b8156a 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r2.ebuild
index 9b3eb5caa5e5..bbb09ebf60e3 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
index 2d18f0ee1195..a6feb44c0323 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r1.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r1.ebuild
index e63f388868c9..57241b37b80a 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r2.ebuild
index 64d565187db4..2cefdf20c417 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
index 832efd085103..9646065ecb96 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r1.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r1.ebuild
index 40e88d98591d..192a35e2f895 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r2.ebuild
index 792b6bf6c49e..56fc6e6dabc7 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
index 95adcd0c2a3f..23def36ac953 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r1.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r1.ebuild
index 2662144cc632..4665e34ee319 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r2.ebuild
index 4989510688d9..2e111cd34c16 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
index f05dcb941a2d..53d83a242ea3 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r1.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r1.ebuild
index 336905653bb4..b11041d64492 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r2.ebuild
index b2071c9b4209..25c1eb54bea8 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
index 3d380314eecd..45d5724110e0 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r1.ebuild b/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r1.ebuild
index cb7d3e974b13..65d8ecea51e5 100644
--- a/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kubernetes"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r2.ebuild b/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r2.ebuild
index 65dabbe11383..086ac6aa720a 100644
--- a/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-kubernetes/selinux-kubernetes-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kubernetes"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-kubernetes/selinux-kubernetes-9999.ebuild b/sec-policy/selinux-kubernetes/selinux-kubernetes-9999.ebuild
index 09730a28c89b..dd048c8f8a5e 100644
--- a/sec-policy/selinux-kubernetes/selinux-kubernetes-9999.ebuild
+++ b/sec-policy/selinux-kubernetes/selinux-kubernetes-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kubernetes"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r1.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r1.ebuild
index 0f76abf332dc..cc94ea0bd772 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r2.ebuild
index 112688fb6bf7..65a8a1b88844 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
index 15f1ca1d853d..89423fba9d92 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20240226-r1.ebuild b/sec-policy/selinux-links/selinux-links-2.20240226-r1.ebuild
index 76dadc1f8a66..170752a325ee 100644
--- a/sec-policy/selinux-links/selinux-links-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20240226-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20240226-r2.ebuild
index d93558404dcc..c0c65c430f35 100644
--- a/sec-policy/selinux-links/selinux-links-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-9999.ebuild b/sec-policy/selinux-links/selinux-links-9999.ebuild
index 893e46910a73..a37d6c02b747 100644
--- a/sec-policy/selinux-links/selinux-links-9999.ebuild
+++ b/sec-policy/selinux-links/selinux-links-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r1.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r1.ebuild
index d773005fb7dd..88295031585d 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r2.ebuild
index f410fca986ee..b50f7da3e06e 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
index ad328437e8ad..533fadf20a6b 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r1.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r1.ebuild
index d7567a9236ca..ea82517f3025 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r2.ebuild
index d21488fb25b5..feed5444bb4e 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
index 1aa6ec950653..689c0c9a9201 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r1.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r1.ebuild
index 10c7c0a90326..885e3e6d4b1a 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r2.ebuild
index 1b0afa1abd89..70ad075af8db 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
index 36780cd68f00..9616700227bf 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r1.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r1.ebuild
index 61c950abee0c..7ae3a74aa9ff 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r2.ebuild
index 333f4af3956d..3dbdc82a7650 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
index b9a150bbd4fd..dfb84ac5ea9e 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r1.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r1.ebuild
index a9867a536faa..eb7476445df9 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r2.ebuild
index fe28cbdda921..c6fad4650cf5 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
index 99a7e254ddb5..ca6072ed43bf 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r1.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r1.ebuild
index d802360810e8..a58fa71a4ba3 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r2.ebuild
index 394237cfcc72..7df7e02f7852 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
index 2c37f4f7dd57..79ba958d1a61 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r1.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r1.ebuild
index 63d390fcc9ea..bc3b08e9e5ab 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r2.ebuild
index 131998fb9f82..bd8d34c9d0b6 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
index c463d589a2f5..29909e9f4673 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r1.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r1.ebuild
index 58173286f89c..e9b536755bdc 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r2.ebuild
index 8d306bdc5966..c72a9dd0a7aa 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
index 66ec13bb76b5..cefbe518f246 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r1.ebuild b/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r1.ebuild
index 5dfdda3ab323..32a06e5e42c0 100644
--- a/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for matrixd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r2.ebuild b/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r2.ebuild
index b41e477a5a3e..617f8d017246 100644
--- a/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-matrixd/selinux-matrixd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for matrixd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-matrixd/selinux-matrixd-9999.ebuild b/sec-policy/selinux-matrixd/selinux-matrixd-9999.ebuild
index 0b556507a767..4f236458bbba 100644
--- a/sec-policy/selinux-matrixd/selinux-matrixd-9999.ebuild
+++ b/sec-policy/selinux-matrixd/selinux-matrixd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for matrixd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r1.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r1.ebuild
index 0c8b7fcd7f0f..712325caf9bf 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r2.ebuild
index efab9adc617c..1ef2810feb4b 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
index dc2337e3662a..ac6fa48cd4b0 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r1.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r1.ebuild
index f387dc381cf1..1d55ed562856 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r2.ebuild
index f03c6ca4414e..b8244a9421f0 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
index c56259f6d181..e38d875d0e64 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20240226-r1.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20240226-r1.ebuild
index fb2ca1fadbce..9db743bae341 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20240226-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20240226-r2.ebuild
index b063d966bcfb..6489db89ebcb 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-9999.ebuild b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
index d3bb5d2dc0c5..e7db98dd3cd5 100644
--- a/sec-policy/selinux-milter/selinux-milter-9999.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r1.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r1.ebuild
index 9a86403d9160..7a7acb35445d 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r2.ebuild
index 098a1b6f48d5..9b9b6503d59c 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
index e86e0eec14d0..7e7a70730bd9 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20240226-r1.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20240226-r1.ebuild
index 219b52006a08..fb4b9354b796 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20240226-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20240226-r2.ebuild
index 1a5624bb950c..928099e8d96a 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-9999.ebuild b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
index 4f3d1f3966e8..96bd93afc0df 100644
--- a/sec-policy/selinux-mono/selinux-mono-9999.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r1.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r1.ebuild
index ab2ec33c0713..2195bcad0a3a 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r2.ebuild
index ab2ec33c0713..2195bcad0a3a 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20240226-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
index 00ffaf083e8b..2dd03964777e 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r1.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r1.ebuild
index 7f8c456f93d8..936c40b3b33f 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r2.ebuild
index c7d6f4afa5cc..0c42548e16ee 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
index ce7032069e29..fad33eb319cf 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r1.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r1.ebuild
index 76de12ecc6e6..88203fa8f163 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r2.ebuild
index 76de12ecc6e6..88203fa8f163 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20240226-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
index 55e6abf27baa..68c526abce90 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r1.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r1.ebuild
index eb913e065adf..0b7a390408e3 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r2.ebuild
index 409aef7856b8..8424a245bfdc 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
index dcbd3f8af913..35514eda63e1 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20240226-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20240226-r1.ebuild
index d4617a689214..7fa37b1c187f 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20240226-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20240226-r2.ebuild
index 672a7957a380..8039e99442c6 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-munin/selinux-munin-9999.ebuild b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
index eca34ec8db39..363dae175d09 100644
--- a/sec-policy/selinux-munin/selinux-munin-9999.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r1.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r1.ebuild
index c20e8cc03341..fce73bc8b9ec 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r2.ebuild
index c4c0fb2d0e9f..466f254f3c7c 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
index 792c7809be17..9ce2886d8029 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r1.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r1.ebuild
index 966ccb98abd0..d3436b66fc26 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r2.ebuild
index 7569ec2197eb..f18eb848956e 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
index 0ccab6e86efa..f2ed9632224f 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r1.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r1.ebuild
index ecd646430939..2c2770d5e41e 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r2.ebuild
index b50f52f18304..edb1b52f16e2 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
index ffe692758744..58ab07e2bb87 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r1.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r1.ebuild
index 999ae0a61336..99d9d0d4a116 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r2.ebuild
index 32e341c39e2c..e7176313cad0 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
index fa57ce72aa36..0ffd61e038dc 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r1.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r1.ebuild
index 9f0fd920720a..b1ede9580b09 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r2.ebuild
index c485b57ab2b4..e798435b4329 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
index 4984f5b9dbc7..57132d5ab7b6 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r1.ebuild
index c94d433e4463..ded3bb0a5697 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r2.ebuild
index b78b71fff28d..8d6322c12de8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
index 17c46f232454..c33b2403b7a8 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r1.ebuild b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r1.ebuild
index cbc1ab8dd0ac..9a3b30b46faf 100644
--- a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for node_exporter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r2.ebuild b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r2.ebuild
index 9ad18aef5e2d..e713ea7c5349 100644
--- a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for node_exporter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild b/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild
index 7eba20dbbe13..863d7f056a1c 100644
--- a/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild
+++ b/sec-policy/selinux-node_exporter/selinux-node_exporter-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for node_exporter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r1.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r1.ebuild
index 02d2d73bdcab..85f20bbb6e04 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r2.ebuild
index 53e56c78e9fb..c354508102bd 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
index 4e0ae83f99ae..52858b96a983 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r1.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r1.ebuild
index 86b79fccbe3f..6eefc6c02a76 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r2.ebuild
index ad878db43fe2..f88a07a6f980 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
index 2bf1a3aa5acb..767c28a05cb8 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r1.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r1.ebuild
index 78a8fd4ce994..92a0f4e7a7e0 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r2.ebuild
index f7748f4d633a..773d3600f335 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
index 8f1f884bcae3..6117039bb921 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20240226-r1.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20240226-r1.ebuild
index 2a3705cfb566..013e9992a76a 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20240226-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20240226-r2.ebuild
index 9331fec4902e..be8ecd79a59a 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nut/selinux-nut-9999.ebuild b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
index 11b236fb79d6..6349764f640b 100644
--- a/sec-policy/selinux-nut/selinux-nut-9999.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20240226-r1.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20240226-r1.ebuild
index d9b2ef544626..94bf576be379 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20240226-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20240226-r2.ebuild
index f7875ccc060e..221e85ed6223 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-9999.ebuild b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
index 1cafe546ef02..9defe8f57509 100644
--- a/sec-policy/selinux-nx/selinux-nx-9999.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r1.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r1.ebuild
index 279a1cbaf253..8b6ea0dbee25 100644
--- a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for obfs4proxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r2.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r2.ebuild
index fab9baacb34b..3c309da0979e 100644
--- a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for obfs4proxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild
index 31b08414c8dc..38e3533c052f 100644
--- a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild
+++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for obfs4proxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r1.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r1.ebuild
index b6af9b22012f..01903fa3c0d3 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r2.ebuild
index 8be0be5f1842..a2286aba5ea3 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
index 41bef8871209..61ee774d4a11 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20240226-r1.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20240226-r1.ebuild
index bfc61abb97f1..6da563efd1d7 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20240226-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20240226-r2.ebuild
index f54637748735..d3ae522240c8 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-9999.ebuild b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
index 8fd85fcd9dae..ccc488edb222 100644
--- a/sec-policy/selinux-oident/selinux-oident-9999.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20240226-r1.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20240226-r1.ebuild
index 6ae14e5286f3..57c1a9953380 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20240226-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20240226-r2.ebuild
index d56cf2ab4f22..9812a926d4cc 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-9999.ebuild b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
index ca3f2aeb8359..c8ea8b7cd3bd 100644
--- a/sec-policy/selinux-openct/selinux-openct-9999.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r1.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r1.ebuild
index ca730fdff108..ca76a18b5fd8 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r2.ebuild
index 054cc3c7352f..9d8c845ce67a 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
index ebc36ded7ffa..03378853e266 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r1.ebuild b/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r1.ebuild
index 09400496d162..4e7854707d7e 100644
--- a/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for opensm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r2.ebuild b/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r2.ebuild
index cb52490f8cbc..6a6536b136dc 100644
--- a/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-opensm/selinux-opensm-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for opensm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-opensm/selinux-opensm-9999.ebuild b/sec-policy/selinux-opensm/selinux-opensm-9999.ebuild
index 02015bb58dac..797d00b33cf9 100644
--- a/sec-policy/selinux-opensm/selinux-opensm-9999.ebuild
+++ b/sec-policy/selinux-opensm/selinux-opensm-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for opensm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r1.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r1.ebuild
index 094e70ff6425..6557a26eefc5 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r2.ebuild
index abb272961712..38eaf36448ff 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
index b4a2b2b323f9..71edd93051e6 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20240226-r1.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20240226-r1.ebuild
index fc7e1d2548ba..0cbe00946e87 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20240226-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20240226-r2.ebuild
index 3a86deab3382..0d3e1f9ea8a2 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pan/selinux-pan-9999.ebuild b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
index fa98e2872fa5..b516e858c554 100644
--- a/sec-policy/selinux-pan/selinux-pan-9999.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r1.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r1.ebuild
index 6a8eb41b1ffe..e238a27504f6 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r2.ebuild
index 9a180fff25d5..4ff3df34592b 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
index f0edc75645d9..d126a38ec414 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r1.ebuild
index 534fbc793194..ab1ab426d342 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r2.ebuild
index f73ff5962fbb..e738cf981c35 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
index 896d4fe336b6..b3f32e99f8a3 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r1.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r1.ebuild
index 4ac24b0b3770..89f106b09115 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r2.ebuild
index 54facf75836b..26a2d6584c8f 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
index 6c646b03a588..b2e8bbec771d 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-podman/selinux-podman-2.20240226-r1.ebuild b/sec-policy/selinux-podman/selinux-podman-2.20240226-r1.ebuild
index e638ab9a0305..6766aadd4347 100644
--- a/sec-policy/selinux-podman/selinux-podman-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-podman/selinux-podman-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-podman/selinux-podman-2.20240226-r2.ebuild b/sec-policy/selinux-podman/selinux-podman-2.20240226-r2.ebuild
index 10324a3737c9..c4df17d36414 100644
--- a/sec-policy/selinux-podman/selinux-podman-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-podman/selinux-podman-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-podman/selinux-podman-9999.ebuild b/sec-policy/selinux-podman/selinux-podman-9999.ebuild
index 154bc6d4cb0e..7d594d7d1ba3 100644
--- a/sec-policy/selinux-podman/selinux-podman-9999.ebuild
+++ b/sec-policy/selinux-podman/selinux-podman-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r1.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r1.ebuild
index 2c6507d8853a..04fdab703e42 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r2.ebuild
index e64098f6503e..ffe4f23dad9d 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
index 7a9ebf0d27fc..774bf493c54b 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r1.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r1.ebuild
index 3dec88d96d27..268b1f8b829e 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r2.ebuild
index 960cf7efa061..fe7010756998 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
index 74725f72a058..e924fa88597b 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r1.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r1.ebuild
index 115299bf50f8..8e03f26a6bb7 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r2.ebuild
index a7a72cbb20b7..0f05d19253a2 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
index efe06bc6661c..44226fe1d07a 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r1.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r1.ebuild
index 9d0ac9876cfc..47167e33d4e4 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r2.ebuild
index 5df4b34019a6..58d7b928e2d0 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
index c9777f4fbd6d..e11112fee917 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r1.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r1.ebuild
index 0eb7216105a1..28ffa8acb52b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r2.ebuild
index 83f75f48edcd..6b90d382d830 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
index 18bf357bcf66..53d5d4a40462 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r1.ebuild b/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r1.ebuild
index b2db6abc0d31..bd3b7a8fe2e4 100644
--- a/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for powerprofiles"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r2.ebuild b/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r2.ebuild
index e576c06eb701..df75a9f8998e 100644
--- a/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-powerprofiles/selinux-powerprofiles-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for powerprofiles"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-powerprofiles/selinux-powerprofiles-9999.ebuild b/sec-policy/selinux-powerprofiles/selinux-powerprofiles-9999.ebuild
index 51a83a362117..49e1aa29bae6 100644
--- a/sec-policy/selinux-powerprofiles/selinux-powerprofiles-9999.ebuild
+++ b/sec-policy/selinux-powerprofiles/selinux-powerprofiles-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for powerprofiles"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r1.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r1.ebuild
index 5d2b8a1d40f0..06cb8478ad3e 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r2.ebuild
index 4884abb16c98..d0734bfa3989 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
index a7c574ee7881..a0b02f5dd294 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r1.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r1.ebuild
index 3f7359356c61..cab99adaa159 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r2.ebuild
index da70316338c1..0b45d52b44a8 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
index e4b14c4127e3..7c6739bcaeb6 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r1.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r1.ebuild
index 9029c0abb309..196e03596a6f 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r2.ebuild
index ec04f676df71..f0538e8f8d10 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
index deccc8f70065..5dc27d194c6b 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20240226-r1.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20240226-r1.ebuild
index 31d519e90290..72d88f2a0eee 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20240226-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20240226-r2.ebuild
index d1f9daa45da3..a33d7f377651 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-9999.ebuild b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
index 1325b6a2a473..8207791cbc7b 100644
--- a/sec-policy/selinux-psad/selinux-psad-9999.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r1.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r1.ebuild
index cfd17b60d7e7..c5d824f75bd2 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r2.ebuild
index 05b90aa65462..39ea7741b58b 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
index 0f5b4f8ad028..66aefaa97ffe 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r1.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r1.ebuild
index 561c20688eef..876a901ed782 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r2.ebuild
index 35a474e05cd0..46078607bc37 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
index 530da3ae6d11..c76384d40634 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r1.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r1.ebuild
index a014bd10a70e..80e5403e51e0 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r2.ebuild
index 251e7378437b..b94559354357 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
index ad334eebeb32..a1b0a8e2eae1 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r1.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r1.ebuild
index 1b6ac967942d..77c45357d11d 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r2.ebuild
index ab041ef455c9..fdef3af84002 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
index a2ba13e77c50..1cd5ffdea9cc 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r1.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r1.ebuild
index bd4eb956d2db..a0296b5141ea 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r2.ebuild
index 56ea5424f2b7..e926cc45c54b 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
index 4f5192731366..7d24ef14c3d0 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r1.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r1.ebuild
index 617e635eaeeb..da56c973e1ac 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r2.ebuild
index d69dc4d27600..93a9afbe1ea6 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
index fcffdf89e9de..ff64ca34844a 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20240226-r1.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20240226-r1.ebuild
index 84fbe884221c..e01b8e51f194 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20240226-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20240226-r2.ebuild
index bea27e3497e3..9f1f39dc4ee2 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-9999.ebuild b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
index 4749a16d3c69..0b3a3b59a332 100644
--- a/sec-policy/selinux-quota/selinux-quota-9999.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20240226-r1.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20240226-r1.ebuild
index 932efe3922aa..77d50bb2f545 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20240226-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20240226-r2.ebuild
index 5f4c476d5977..c7eb4eab6a7d 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-9999.ebuild b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
index c45dc08de6b0..0a755ba91873 100644
--- a/sec-policy/selinux-radius/selinux-radius-9999.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r1.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r1.ebuild
index 5d1e255f0f64..dbe8234174bb 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r2.ebuild
index ae7390979a38..4df2b636411e 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
index dd93d5fd5978..605aa6cacfff 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r1.ebuild b/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r1.ebuild
index 6da1e43d5ff1..8d8a3fe5d0c9 100644
--- a/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rasdaemon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r2.ebuild b/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r2.ebuild
index 604849515db1..0415a2f7eb71 100644
--- a/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rasdaemon/selinux-rasdaemon-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rasdaemon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rasdaemon/selinux-rasdaemon-9999.ebuild b/sec-policy/selinux-rasdaemon/selinux-rasdaemon-9999.ebuild
index 97c91afe093b..c5a4ed7a02ef 100644
--- a/sec-policy/selinux-rasdaemon/selinux-rasdaemon-9999.ebuild
+++ b/sec-policy/selinux-rasdaemon/selinux-rasdaemon-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rasdaemon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20240226-r1.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20240226-r1.ebuild
index b737342b553d..70ccc99e6570 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20240226-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20240226-r2.ebuild
index bc9a6d287519..043153e9c3a4 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-9999.ebuild b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
index 78b61944263e..27353dad39b6 100644
--- a/sec-policy/selinux-razor/selinux-razor-9999.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20240226-r1.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20240226-r1.ebuild
index cc56118125f2..4988a70f71e8 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20240226-r2.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20240226-r2.ebuild
index c5460dfeb846..e446f5b9a2b0 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-redis/selinux-redis-9999.ebuild b/sec-policy/selinux-redis/selinux-redis-9999.ebuild
index 376b158d22ed..f05cfc535c22 100644
--- a/sec-policy/selinux-redis/selinux-redis-9999.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r1.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r1.ebuild
index 67d8c864c294..9fc1d7ffa7f6 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r2.ebuild
index ed2019f492ff..6cb523221848 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
index 74ed193ab6c1..d7dfeb35df4f 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r1.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r1.ebuild
index 7c9bd1457f0c..6652b0d028c9 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r2.ebuild
index b160f6b4b98b..9e1efae300fb 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
index 156daf8795a8..0f6e16ce11e9 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r1.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r1.ebuild
index cab8dee5a557..0a5f0aaa96ee 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r2.ebuild
index 548d6c1797f4..bf53c205911f 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
index d60f7a17570c..f02d0415a907 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r1.ebuild b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r1.ebuild
index 5cd9b14e5980..0ef5c129c529 100644
--- a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rootlesskit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r2.ebuild b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r2.ebuild
index 5f9f18636bd4..8d882166abdc 100644
--- a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rootlesskit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-9999.ebuild b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-9999.ebuild
index d839b7f2ab04..d95004836458 100644
--- a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-9999.ebuild
+++ b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rootlesskit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r1.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r1.ebuild
index 11c69bd88879..94482e8868db 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r2.ebuild
index 86d6b6402b6a..3d511306bb06 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
index ef4d2b022a1e..89df85f46782 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r1.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r1.ebuild
index a409b5a8739b..50da8da27c32 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r2.ebuild
index 52001d746b75..46ffedc37146 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
index 5b0ec7080fb1..7299855d6d5f 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r1.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r1.ebuild
index 079e1529b2e0..bbfc921cecc1 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r2.ebuild
index 78a7bf3e602a..d3317a8ae706 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
index a312ce0eb3cd..d9f7d6b1b2e3 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r1.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r1.ebuild
index ca5826b702a4..5ae1436b3b82 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r2.ebuild
index 719df24984fc..227015555daa 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
index 6f7ab5f3d5ce..34dbd96a0209 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r1.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r1.ebuild
index 9cf1ec341601..f0d0e90381aa 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r2.ebuild
index 467303265b6d..fa73574412a5 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
index 705ec6592bb9..cfed7261b728 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r1.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r1.ebuild
index 99f025785ff3..0b93ab782e1c 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r2.ebuild
index dc179e242da5..11f5ee018811 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
index 142e11149c77..074227b117a2 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20240226-r1.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20240226-r1.ebuild
index 7e989f2cd859..0ef04922754d 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20240226-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20240226-r2.ebuild
index e6eae4b66523..5e1d0629f015 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-9999.ebuild b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
index 12cbab56c475..3cc15d9eacfc 100644
--- a/sec-policy/selinux-salt/selinux-salt-9999.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20240226-r1.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20240226-r1.ebuild
index c567ceab5258..82cc9f965b48 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20240226-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20240226-r2.ebuild
index 0943e3856e73..9da308e6b074 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-9999.ebuild b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
index 0fdd2e08280b..406127c27896 100644
--- a/sec-policy/selinux-samba/selinux-samba-9999.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r1.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r1.ebuild
index ebed1a7ca0a0..7d174235f37d 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r2.ebuild
index 8f3a3144c99c..cd2e630f8428 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
index 727a4cd37593..88a2e5386d23 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20240226-r1.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20240226-r1.ebuild
index 3dbf2e0b0370..bc4bae11f2c1 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20240226-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20240226-r2.ebuild
index 3ad8d8a0bc16..0f97d02d5f2e 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-9999.ebuild b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
index 2042a9883c04..c3fc7b8f79b1 100644
--- a/sec-policy/selinux-screen/selinux-screen-9999.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r1.ebuild b/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r1.ebuild
index e36e831d7c1e..51b528431ef2 100644
--- a/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for secadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r2.ebuild b/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r2.ebuild
index 0fd00a12b391..aa697e9f59d6 100644
--- a/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-secadm/selinux-secadm-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for secadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-secadm/selinux-secadm-9999.ebuild b/sec-policy/selinux-secadm/selinux-secadm-9999.ebuild
index b6fdd22d99cb..d8deceaccf8b 100644
--- a/sec-policy/selinux-secadm/selinux-secadm-9999.ebuild
+++ b/sec-policy/selinux-secadm/selinux-secadm-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for secadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r1.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r1.ebuild
index ca4b42e58c62..6be800a26717 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r2.ebuild
index 4d48666ad016..9307d7f15943 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
index d3123be8592e..0d26b6b32d38 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r1.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r1.ebuild
index 1ff0d0fb3e83..a0f95c80d6e0 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r2.ebuild
index 78b1fa4319e2..0e95b98cff23 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
index b640b6349767..e158644d781a 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r1.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r1.ebuild
index 30834daff9b7..64fd95f16b7e 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r2.ebuild
index 30d64057eea4..4559024bb90a 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
index 8c521d9024d5..b2bcbbf66c76 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r1.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r1.ebuild
index 9a730b566551..a47b209a72d4 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r2.ebuild
index fb2ce63e1ea5..2489ceeaa576 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
index dda245fa5994..cdb365503b84 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20240226-r1.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20240226-r1.ebuild
index cab3b6ffdf90..3fd6dc06aead 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20240226-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20240226-r2.ebuild
index cab3b6ffdf90..3fd6dc06aead 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20240226-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-skype/selinux-skype-9999.ebuild b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
index f070cea5dbe5..6af39dba9e06 100644
--- a/sec-policy/selinux-skype/selinux-skype-9999.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r1.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r1.ebuild
index cfb3ad8bb6db..aaf258ee4bab 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r2.ebuild
index cd5435b79bc3..08a8b8412718 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
index fb037880bf96..c30d3a58fedd 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r1.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r1.ebuild
index 598ce17a0fe9..4d208b9be975 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r2.ebuild
index 923a731e7c59..61e12e6df49f 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
index ca8af7253c33..9485c9f024b4 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r1.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r1.ebuild
index ae920d71a4ac..ceedfa5f9364 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r2.ebuild
index c8c25165e031..60a097bc6902 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
index f2375bfe2457..6789f8e6f259 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r1.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r1.ebuild
index 100ecc0c4336..53af1bbe6512 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r2.ebuild
index a12f99efaf2c..9a4ce3e6c729 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
index 9dd441dc2def..047d7173d199 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r1.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r1.ebuild
index ab043693ef67..df56ac3bb8c3 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r2.ebuild
index b618646205a0..2a39ce99d839 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
index ec8b120033e7..2c019b055be5 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20240226-r1.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20240226-r1.ebuild
index 684ce8b3c958..c457ef0f53f8 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20240226-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20240226-r2.ebuild
index a54ba54fdca0..733042a3248a 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-9999.ebuild b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
index 7df12a2a4f35..cd957c10d6af 100644
--- a/sec-policy/selinux-snort/selinux-snort-9999.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r1.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r1.ebuild
index ca204553246d..8e9f5f92c9e5 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r2.ebuild
index b1d38f9e2329..030041f7750a 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
index 76f4dccc1e59..da9388dcdf30 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r1.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r1.ebuild
index 0b3e870fd1a5..2164e8acc4e0 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r2.ebuild
index 04ebab668ee6..490d3919bc24 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
index 60abfccde643..620507e1856f 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20240226-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20240226-r1.ebuild
index e10b092d5de7..fb01339356fb 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20240226-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20240226-r2.ebuild
index e05814a5fb67..221a3b74a9f9 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-squid/selinux-squid-9999.ebuild b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
index 6a550357e69e..9a04e6b1fc64 100644
--- a/sec-policy/selinux-squid/selinux-squid-9999.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r1.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r1.ebuild
index 9921e5091cd1..316610d236f7 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r2.ebuild
index 3fcb478329c3..c015e7de1d30 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
index 7f5a05df443b..3e80f3dc4fe8 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r1.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r1.ebuild
index 45058b437766..3c443c084528 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r2.ebuild
index 2797180ccb26..98b52c246245 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
index fc1da1ed3ec2..cf622cb15f70 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r1.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r1.ebuild
index fb0359b77b3b..dfea70f76cc1 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r2.ebuild
index 02acef9a704c..b78fa301cf65 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
index 9836ab5e994d..4bee86fc1807 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r1.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r1.ebuild
index 6afdbe32ba5c..9f52a72ebe82 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r2.ebuild
index 3ed82b86e102..a703fe7e21a8 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
index 33cf229098b1..6c60764cceb1 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r1.ebuild b/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r1.ebuild
index 46f1958b789d..1df912178fbe 100644
--- a/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for switcheroo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r2.ebuild b/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r2.ebuild
index 490da5a66410..f5f6e2bb700a 100644
--- a/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-switcheroo/selinux-switcheroo-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for switcheroo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-switcheroo/selinux-switcheroo-9999.ebuild b/sec-policy/selinux-switcheroo/selinux-switcheroo-9999.ebuild
index d7dec7bca8e7..e476af757e90 100644
--- a/sec-policy/selinux-switcheroo/selinux-switcheroo-9999.ebuild
+++ b/sec-policy/selinux-switcheroo/selinux-switcheroo-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for switcheroo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r1.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r1.ebuild
index 8f5f2a2a93ad..67898d60f88b 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r2.ebuild
index 6451ef57aa88..d331280a4c62 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
index 7389773e350d..34238d669910 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r1.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r1.ebuild
index e0aff3bd9926..b135186fff92 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r2.ebuild
index dc9bd0c679f7..926e6dbc83c2 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
index a04b8969a1a4..482e46880974 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r1.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r1.ebuild
index fc3dcac7f59b..cdc35231a26f 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r2.ebuild
index 5f1ac496ba69..df3b570e5a61 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
index 038da9ecd614..8ef8596f3ad4 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r1.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r1.ebuild
index 58b3ba7cea29..78d784d09209 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r2.ebuild
index 4fa1988d5108..2a822c660bb8 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild b/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
index 7389480465e1..9cabd213c3c5 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r1.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r1.ebuild
index 9390df8995b1..b5a9f68bc563 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r2.ebuild
index fa460ecf7259..92dad1b0613c 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
index 8c3d71cc24ee..e84b4b7368f7 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r1.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r1.ebuild
index da25613ff541..22711a8155cb 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r2.ebuild
index 7936275afb39..32875588194d 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
index b9f7ccfc662c..66516eaac8d3 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r1.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r1.ebuild
index 97ca426e3e39..37298acad57d 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r2.ebuild
index 3934ff8a51eb..e241fe6bfe8b 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
index 2c550a3f226a..4e4c6fee3939 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r1.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r1.ebuild
index 2273fa210638..8fe256192825 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r2.ebuild
index 86ce437143bb..be515a78c0cd 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
index 55da740810d6..6a803116fe5d 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r1.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r1.ebuild
index 92b449a940d5..a7cf161bbc4d 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r2.ebuild
index 67fe09b85c70..2b15dc914c79 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
index ede57575f69c..b0c494a94092 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r1.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r1.ebuild
index f14f2cff059d..798d0a32d6b4 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r2.ebuild
index b27064324b1f..3de07d1dae8b 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
index f862dbce8b31..e3aa6467a28d 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r1.ebuild b/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r1.ebuild
index 74a62216470f..cbfc1ea88ac3 100644
--- a/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbolt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r2.ebuild b/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r2.ebuild
index c1b19643df3b..d90eaf279738 100644
--- a/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-thunderbolt/selinux-thunderbolt-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbolt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-thunderbolt/selinux-thunderbolt-9999.ebuild b/sec-policy/selinux-thunderbolt/selinux-thunderbolt-9999.ebuild
index 5ed63874a014..318488b8c0d0 100644
--- a/sec-policy/selinux-thunderbolt/selinux-thunderbolt-9999.ebuild
+++ b/sec-policy/selinux-thunderbolt/selinux-thunderbolt-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbolt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r1.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r1.ebuild
index 107e9444583a..a10c4d677787 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r2.ebuild
index a169fbace6de..1585ec7d3cb7 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
index 8815f3cdfe35..258af789ea2d 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r1.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r1.ebuild
index 1d7e10466bae..b1fd512aa511 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r2.ebuild
index e7ee00a2cbac..9640ba8b8e8e 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
index c88b648e7da4..2d1a9ed1759f 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20240226-r1.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20240226-r1.ebuild
index 3a5684a0d6c8..8a4dde8866f9 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20240226-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20240226-r2.ebuild
index 418235c9342c..803c56444e3c 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-9999.ebuild b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
index 860e1d2a5bb8..f7e20c65343c 100644
--- a/sec-policy/selinux-tor/selinux-tor-9999.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r1.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r1.ebuild
index ed89723a2c21..77efffbf6ad1 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r2.ebuild
index 9944032eefbc..c49f9b9b2aa9 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
index 6f6ee80897bc..a073498f9e59 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r1.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r1.ebuild
index 7965c4d8caca..13aa4ea687cb 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r2.ebuild
index 2fe95b267d1a..1df9c19d5e97 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
index 6c5763ca923b..dde7d03129a5 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r1.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r1.ebuild
index f37953ae745a..a5a43a0b3dc2 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r2.ebuild
index 8e640dec47d7..c015ed9b4600 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
index b7dc137f2008..bf5ca1cd7c07 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20240226-r1.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20240226-r1.ebuild
index 11948d96a1ef..737b298151f6 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20240226-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20240226-r2.ebuild
index 2322e6aff2a1..e45ee6810f7e 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-9999.ebuild b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
index 5fd5d7463e9f..32bff8dae0d4 100644
--- a/sec-policy/selinux-uml/selinux-uml-9999.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r1.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r1.ebuild
index 07dd67c5e9e7..37cc1e876e11 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r2.ebuild
index 379cec1fcf86..fce4f6e7f3a0 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
index 9c07fe13f9ac..ef6bafffa625 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r1.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r1.ebuild
index 32d4c95745fd..f39b28346cf9 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r2.ebuild
index 669ef4d4f8ca..66cdf886fa37 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
index 853a240801c8..01523a516c27 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r1.ebuild b/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r1.ebuild
index aba2f9b8b6ba..7152decd7005 100644
--- a/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r2.ebuild b/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r2.ebuild
index 1955d7ace631..e1ae0ddae7b5 100644
--- a/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-usbguard/selinux-usbguard-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-usbguard/selinux-usbguard-9999.ebuild b/sec-policy/selinux-usbguard/selinux-usbguard-9999.ebuild
index 49ec47659e1b..b1cf7709bd62 100644
--- a/sec-policy/selinux-usbguard/selinux-usbguard-9999.ebuild
+++ b/sec-policy/selinux-usbguard/selinux-usbguard-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r1.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r1.ebuild
index 7298f0e68dca..94d984d0d113 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r2.ebuild
index 6ed70ce0ce7d..f686d6392749 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
index ce2f195f56db..7f8291d2d9bc 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r1.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r1.ebuild
index ebbe9f066241..34d9a57cae05 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r2.ebuild
index fec86901388b..db54da27ec71 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
index e757963cf084..e5da85956149 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r1.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r1.ebuild
index 1a6499c8b29f..f7cd97b028d1 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r2.ebuild
index af76bfb8ddb2..bddad56cd40e 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
index 45e96f707f35..2f9e41169342 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r1.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r1.ebuild
index fe7dab6438cc..d257ad392d55 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r2.ebuild
index 1d74d3cf87f1..a28c9087304f 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
index 1a2752c1f4d7..15fd908820e5 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r1.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r1.ebuild
index ab35e22ac945..c5167811d651 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r2.ebuild
index d8e3df8303be..e3e3d892a683 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
index 3c43f0acb714..077968e060fa 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r1.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r1.ebuild
index 142b4b13b281..4b5b01e43662 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r2.ebuild
index 91e1a409623b..bb683db00124 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
index 3117d917262d..25fa74c21e65 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r1.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r1.ebuild
index fabf34333574..ac9223f85ab5 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r2.ebuild
index 6a710b616fc9..91694ae6982f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
index 50f23c535122..eb5d63243922 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20240226-r1.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20240226-r1.ebuild
index 05b8222ca358..68be43244458 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20240226-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20240226-r2.ebuild
index 660e33229e55..47bde8a0dba2 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-9999.ebuild b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
index 269d6221d693..93de505b1f17 100644
--- a/sec-policy/selinux-vde/selinux-vde-9999.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20240226-r1.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20240226-r1.ebuild
index cd45ff3fd36a..c127761ad48b 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20240226-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20240226-r2.ebuild
index 5c574f13eee0..65f60a14774e 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-9999.ebuild b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
index bb8100b84e2a..38aee6d364b4 100644
--- a/sec-policy/selinux-virt/selinux-virt-9999.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r1.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r1.ebuild
index e27ecad2337c..61684efa0441 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r2.ebuild
index 50a17f788fd1..812ceac0aafd 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
index 0417b26c89b3..3b2285014a94 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r1.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r1.ebuild
index 078f1680647e..3cfbeea9a4b9 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r2.ebuild
index 600873612412..965ed334604e 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
index c47d2ade8fb2..35521a2f7346 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r1.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r1.ebuild
index 3e7b73a119a9..9f21aeefdffd 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r2.ebuild
index ec899d1c64f5..49f954b985d5 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
index 26125ba6bb11..0d22cc21e12b 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r1.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r1.ebuild
index 507cf8b9b7a1..be7157c975a9 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r2.ebuild
index 04f7462f4a8d..175b0548e2ea 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
index 6f5e64933037..0c2b70405873 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r1.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r1.ebuild
index 46ad244ccd21..9b99332b882a 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r2.ebuild
index 67640314c74b..64b547b17127 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
index 87728f247d33..bfedbcccc12e 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r1.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r1.ebuild
index 8fee138c99ec..fba546df3972 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r2.ebuild
index 56d89ce0ef11..68b515a29b57 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
index b54def3e348e..4345249cd93e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20240226-r1.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20240226-r1.ebuild
index 5ad7285f4423..53f527decf29 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20240226-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20240226-r2.ebuild
index b16eafdbbb68..1feccc615df3 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-9999.ebuild b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
index 4c1e7a09c6de..499b043f3fe2 100644
--- a/sec-policy/selinux-wine/selinux-wine-9999.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r1.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r1.ebuild
index 95acc85324d4..f2a7aadac96b 100644
--- a/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r2.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r2.ebuild
index e6a178403b40..da78f34ca2fb 100644
--- a/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-wireguard/selinux-wireguard-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-9999.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-9999.ebuild
index b14f54f287c3..0d90ff1977c5 100644
--- a/sec-policy/selinux-wireguard/selinux-wireguard-9999.ebuild
+++ b/sec-policy/selinux-wireguard/selinux-wireguard-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireguard"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r1.ebuild
index 069929e42b90..b257d72bd4f1 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r2.ebuild
index b64301ee25fa..0b914f26ec00 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
index 85868a34c406..ba0c9f2735bf 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20240226-r1.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20240226-r1.ebuild
index aa4b182ab4c9..69d82e540a28 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20240226-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20240226-r2.ebuild
index bc513ed609f8..f62593460131 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-9999.ebuild b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
index dd021adbac7e..567bb78c840f 100644
--- a/sec-policy/selinux-wm/selinux-wm-9999.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20240226-r1.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20240226-r1.ebuild
index c398e3e6ecee..5e895e6bad40 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20240226-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20240226-r2.ebuild
index a1f023e47cc6..6762a4004e16 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-9999.ebuild b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
index 2c3ce25f2aee..4b8aac7b2b24 100644
--- a/sec-policy/selinux-xen/selinux-xen-9999.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r1.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r1.ebuild
index fee51c89764e..32cd6f682fe7 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r2.ebuild
index f8e4f5d53dad..e7145f8699a2 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
index e4aae2e016ad..41cb94fd990a 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r1.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r1.ebuild
index aff83309a1fa..f91c72d8c3c2 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r1.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r2.ebuild
index 89fdb791989a..013cb8b393d4 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
index 01221a23e79d..72a14a5e4462 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r1.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r1.ebuild
index 558654386a77..986e31cf57e8 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r2.ebuild
index 764edcbfdc4c..ac6e574732fb 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
index 24a2b38a0b54..7844a999cdb9 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r1.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r1.ebuild
index 0aa481419055..a0c2ba692a8c 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r2.ebuild
index 3cbbc97d96d4..6d040125f104 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
index d519240d2a17..c4a7991c837c 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r1.ebuild b/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r1.ebuild
index fb4a097ffbf2..3fedef8d44bc 100644
--- a/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r1.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r2.ebuild b/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r2.ebuild
index e62ba35a0464..83b058c4f82b 100644
--- a/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-zfs/selinux-zfs-2.20240226-r2.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
diff --git a/sec-policy/selinux-zfs/selinux-zfs-9999.ebuild b/sec-policy/selinux-zfs/selinux-zfs-9999.ebuild
index fc06bce13b7d..f30ef5b5264a 100644
--- a/sec-policy/selinux-zfs/selinux-zfs-9999.ebuild
+++ b/sec-policy/selinux-zfs/selinux-zfs-9999.ebuild
@@ -10,5 +10,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/sys-apps/asahi-nvram/metadata.xml b/sys-apps/asahi-nvram/metadata.xml
index ab757f372ced..c0d4d6d29036 100644
--- a/sys-apps/asahi-nvram/metadata.xml
+++ b/sys-apps/asahi-nvram/metadata.xml
@@ -10,8 +10,6 @@
 		<name>Gentoo Asahi Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">
-			WhatAmISupposedToPutHere/asahi-nvram
-		</remote-id>
+		<remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/bfs/Manifest b/sys-apps/bfs/Manifest
index e7e394fb495c..e9167cc4a2bf 100644
--- a/sys-apps/bfs/Manifest
+++ b/sys-apps/bfs/Manifest
@@ -1,4 +1,2 @@
-DIST bfs-3.1.3.tar.gz 237696 BLAKE2B ca76ef02cd8ea65ab7d866a9c677063367c16c89b5f521da842ca0465e0485a90077009d9b5f324c7df09c1ab53036eb0f2965f372fd56762556dfbed43deb2c SHA512 4511c809666241f1b14ef3a01b80f0dc369510b67f45c1ce3e2d4445bcec9a4b86fb01333067b8dd713e992e57be7b99328b47a21b27864e6575981287de8e36
-DIST bfs-3.2.tar.gz 252756 BLAKE2B 444d23c8df92c6c0bcbd38889cec29012c40d742a23e1755390259a325fab9d082a23ef444bf76462b21fcdeb41fa749593f5ec7d640f7270252ed4268ccc3fe SHA512 2881a37b65d8015853a658a4f759a5213ea433a726ee9952b82bd2d6c682f92e7d014eaa7ec8f1d127b3c25b5d3b04e3b24ae61ec2549212a7a4f9335f91bf8b
 DIST bfs-3.3.1.tar.gz 262841 BLAKE2B bc848f4daa98172531e6c13100dcd1f3b722f4282acc5fd3677b2c4a83effa49e681d0cac3fa2c104fd1db03543c4f0a6ca9bc494ee3737d0c927f0170171eac SHA512 e31153ef244483e4337bd2bb64fc4ddf55d56048b5af54003a917287868114c81befb771b6cfc7473e384d3157b24cbec7ca27336362a438c7803eb7fc85d8d3
-DIST bfs-3.3.tar.gz 262590 BLAKE2B f418a9b2f8749eb28dbe702e9303a4b4d2ec8119a712544a24d0a01cf9e4a5794d8882103bff799920ffbc7d3855656b034ec960b2b3bed64b183bb8b60cf348 SHA512 ed4396e81eaeb54a8d196e2cd0300c1a33f600e7e69d9e8fddf39916e3ade0db422fbae74f1fb1ae76ece1352a3fdf20976fbbf521c5f1ce0bb3c073133004fb
+DIST bfs-4.0.1.tar.gz 272678 BLAKE2B c25165b469ea52ef2e0b73ae0cbcef485a739d25cd3c49d25cd0543ab97009b256637d0dab5cb1ce01c3da7ab77519ac6a5b9cff36634c81415ec309d46c7d1d SHA512 0697aab71e2101638fbb5923ec57b9439d6fdd212dccd2f1b90cd4a1bc9c72acca5dca92e9aa6efef06696b324cb6754784602064f35b529ff97d1933672d73c
diff --git a/sys-apps/bfs/bfs-3.1.3-r1.ebuild b/sys-apps/bfs/bfs-3.1.3-r1.ebuild
deleted file mode 100644
index b4bf6e267d1f..000000000000
--- a/sys-apps/bfs/bfs-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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 unicode xattr"
-
-DEPEND="
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	io-uring? ( sys-libs/liburing:= )
-	unicode? ( dev-libs/oniguruma:= )
-	xattr? ( sys-apps/attr )
-"
-RDEPEND="${DEPEND}"
-
-bfsmake() {
-	emake \
-		USE_ACL=$(usev acl '1') \
-		USE_ATTR=$(usev xattr '1') \
-		USE_LIBCAP=$(usev caps '1') \
-		USE_LIBURING=$(usev io-uring '1') \
-		USE_ONIGURUMA=$(usev unicode '1') \
-		"$@"
-}
-
-src_compile() {
-	tc-export CC
-	use debug || append-cppflags -DNDEBUG
-
-	bfsmake
-}
-
-src_test() {
-	# -n check gets confused so need manual src_test definition?
-	bfsmake check
-}
-
-src_install() {
-	bfsmake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/sys-apps/bfs/bfs-3.2.ebuild b/sys-apps/bfs/bfs-3.2.ebuild
deleted file mode 100644
index c99fcb8e9ad7..000000000000
--- a/sys-apps/bfs/bfs-3.2.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
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	use debug || append-cppflags -DNDEBUG
-
-	edo ./configure \
-		$(use_enable acl libacl) \
-		$(use_enable caps libcap) \
-		$(use_enable selinux libselinux) \
-		$(use_enable io-uring liburing) \
-		$(use_enable 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-3.3.ebuild b/sys-apps/bfs/bfs-4.0.1.ebuild
index 265ded51c383..265ded51c383 100644
--- a/sys-apps/bfs/bfs-3.3.ebuild
+++ b/sys-apps/bfs/bfs-4.0.1.ebuild
diff --git a/sys-apps/busybox/busybox-1.36.1-r3.ebuild b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
index a0e6e95cf3f2..fc4a1f5e738e 100644
--- a/sys-apps/busybox/busybox-1.36.1-r3.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 182c258c077d..181327529a15 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1 @@
-DIST cpuid-20240709.src.tar.gz 156034 BLAKE2B c7487a0b9a21593d32df4a2eb42bf4deb7a357155d1dd28ec3d485349b7a3164f5a7c3ecb3b65c1c88c5c1a9132d158a33568d6f5d9398e0b8a75c54dd86f824 SHA512 c89d6d9a332c80a78698f3862dbb0e17df793b389ae6d522c9c68cb2818b932d7653f7c8d7e5344918b7e93f944c8f7ea02276148df4f25b720d4561fc6698ed
 DIST cpuid-20240716.src.tar.gz 155562 BLAKE2B 52625a547c70b7fd45d63fea88acfcc938443f1f53c686896f88ef193240b7b9ea76020a48b187689c27fddad4cba8cdd41044ab57f731e488af14fd1a608fa3 SHA512 1efbd3f98253700d2948573025733fb7a3354d008b968c83078d36ddac834c4adae4eeef288214066ad520d23fa1eb0ea2036f878cde20d982a1810e7305b7a4
diff --git a/sys-apps/cpuid/cpuid-20240709.ebuild b/sys-apps/cpuid/cpuid-20240709.ebuild
deleted file mode 100644
index 4b2f6e4279a8..000000000000
--- a/sys-apps/cpuid/cpuid-20240709.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 toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BDEPEND="
-	app-alternatives/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20240716.ebuild b/sys-apps/cpuid/cpuid-20240716.ebuild
index c2868c0d5525..4b2f6e4279a8 100644
--- a/sys-apps/cpuid/cpuid-20240716.ebuild
+++ b/sys-apps/cpuid/cpuid-20240716.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-alternatives/gzip
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 137cd6e27a3a..4fdc4ced1770 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1 +1,2 @@
+DIST cracklib-words-2.10.2.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730
 DIST cracklib-words-2.9.11.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730
diff --git a/sys-apps/cracklib-words/cracklib-words-2.10.2.ebuild b/sys-apps/cracklib-words/cracklib-words-2.10.2.ebuild
new file mode 100644
index 000000000000..4d8b68ab4280
--- /dev/null
+++ b/sys-apps/cracklib-words/cracklib-words-2.10.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: ideally bump with sys-libs/cracklib
+DESCRIPTION="Large set of crack/cracklib dictionaries"
+HOMEPAGE="https://github.com/cracklib/cracklib/"
+SRC_URI="https://github.com/cracklib/cracklib/releases/download/v${PV}/${P}.xz"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/share/dict
+	newins ${P} ${PN}
+}
+
+pkg_postinst() {
+	if [[ -n ${ROOT} ]] && create-cracklib-dict -h >&/dev/null ; then
+		ebegin "Regenerating cracklib dictionary"
+		create-cracklib-dict /usr/share/dict/* >/dev/null
+		eend $?
+	fi
+}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 5fd11e6318ea..9812c01b65ba 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,2 +1 @@
-DIST dbus-1.15.6.tar.xz 1406672 BLAKE2B 5c2b876ede784a82c43096e82c3fa4b905cab26aa8f27e5553d07c53bde6120854cd9b109f3f179e9b47ecd7e2b69c08655b96d821c7790c1c9f52bb6356d331 SHA512 8c2e207d98245d5f8d358e9824be9e8646af8147958e8bd56e18d478e8976e58a6645ee1aba62451fcc58443157e2a39c4a6ed9c2e440e7b6b05053d022f0113
 DIST dbus-1.15.8.tar.xz 1149088 BLAKE2B 7c1962dfccc6a1b6250e80b0706d7f44536fabeff009013865ec4b1edaec6d4b47dcbe8f78caa61ef7aef4bac6b79f0e2027dd16bbb2baae328429e648bf8b8c SHA512 84b8ac194ede3bf300f4501395b7253538469a4f9d59ea4adaf800282e359ef43494d81941b338081d3704317d39f0aba14906c6490419f04f946eb9d815f46c
diff --git a/sys-apps/dbus/dbus-1.15.6.ebuild b/sys-apps/dbus/dbus-1.15.6.ebuild
deleted file mode 100644
index 2dc19ec5f954..000000000000
--- a/sys-apps/dbus/dbus-1.15.6.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Be careful with packaging odd-version-number branches!
-# After >1.15, we should at least keep stable as an upstream stable branch,
-# possibly even ~arch too, given the note about security releases on their website.
-# See https://www.freedesktop.org/wiki/Software/dbus/#download.
-
-PYTHON_COMPAT=( python3_{10..12} )
-TMPFILES_OPTIONAL=1
-
-# As of 1.15.6, the Meson build system is now recommended upstream, but we
-# can't use it because our elogind patch needs rebasing and submission upstream.
-# See bug #599494.
-inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	acct-user/messagebus
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-COMMON_DEPEND="
-	>=dev-libs/expat-2.1.0
-	elogind? ( sys-auth/elogind )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux
-	)
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/expat
-	test? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.40:2
-	)
-	valgrind? ( >=dev-debug/valgrind-3.6 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-user/messagebus
-	selinux? ( sec-policy/selinux-dbus )
-	systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
-	"${FILESDIR}/dbus-1.15.0-enable-elogind.patch"
-	"${FILESDIR}/dbus-1.15.0-daemon-optional.patch" # bug #653136
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# fix standards conflict, due to gcc being c99 by default nowadays
-		sed -i \
-			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
-			configure.ac || die
-	fi
-
-	# required for bug #263909, cross-compile so don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local rundir=$(usex kernel_linux /run /var/run)
-
-	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
-		> "${T}"/dbus.initd || die
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local docconf myconf testconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic', bug #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--runstatedir="${EPREFIX}${rundir}"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		--disable-kqueue
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable systemd user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
-		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dbus-user=messagebus
-		$(multilib_native_use_with valgrind)
-		$(use_with X x)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-daemon
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		testconf=(
-			$(use_enable test asserts)
-			$(use_enable test checks)
-			$(use_enable test embedded-tests)
-			$(use_enable test stats)
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-		)
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# After the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	# DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
-	# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
-	DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA install-cmakeconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${T}"/dbus.initd dbus
-
-	if use X; then
-		# dbus X session script (bug #77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/80-dbus-r1 80-dbus
-	fi
-
-	# Needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# Let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/{,var/}run
-
-	# bug #761763
-	rm -rf "${ED}"/usr/lib/sysusers.d
-
-	dodoc AUTHORS NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use systemd; then
-		tmpfiles_process dbus.conf
-	fi
-
-	# Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	# TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-}
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
index 4a3e878ad467..db2c5069a58d 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 IUSE="examples"
 
 src_compile() {
diff --git a/sys-apps/eza/Manifest b/sys-apps/eza/Manifest
index 8ee728f9d54f..4a60272b3596 100644
--- a/sys-apps/eza/Manifest
+++ b/sys-apps/eza/Manifest
@@ -3,8 +3,6 @@ DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf1
 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 ansi-width-0.1.0.crate 6116 BLAKE2B f90f1f2cf668ef6d36b8aa723c3dec02b64139d4729f2c286c7298b78752d1e241fc7063ba2571388bba9f06d61feae05b0f48f2eaadb91f04035fe16184875a SHA512 2366fc37e81153dd19554fc4f2688ee1ce4a4794cdc6a56eaf6e7cf6a5459b2b1309bc35d8d049114c64730d9eb6d73a9a1380747b4cde644498a9b39e41c31e
-DIST ansi_colours-1.2.2.crate 21374 BLAKE2B a5ca621a12070686d531b1053eb2f7c01ee848a8c5f10469011d4ebb7b92d9b4d5ad9a569dc7bdcbc127e572e58f2e80af4154080014b02164941a8b115ed867 SHA512 077a6ddb4b44f79aebc704128804bcfe549b5c68a75d0d57452250b91cc02cd3784c25a93f061bae6060bff3eb02bb8a88fdf46ef6128a843eff4b0e84f7c972
-DIST ansiterm-0.12.2.crate 26777 BLAKE2B 08dd1e95ce9c3bc3673dc92e2e6c61d6d9c125560717e2046a52786f5ab50c9619a7bedabee8991ca90c9e09f2b4c5ad2b7c8e67b874779ca989023ebc6bd56a SHA512 b9a37ea51a3ec4e9cef972a1480fb07f9e8626fd800dfe417e3ac615156310648b65f4d6665e0bb91ac6e1ef28b74c1f66d5cae66cfcfe4c1a3b74805cb1dbed
 DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163
 DIST anstyle-1.0.3.crate 13986 BLAKE2B 9e9fa894da78a6c0933c423524827ead33aa4e384e04771ccccaa179f1e8a6459a5094db7f61714457b919d2e713d09df4429b83793d807821bfdb226ff115a5 SHA512 f1ac506814e1ce1df537ea8a88ed75f3f897aa9e559ba7eb5a8acfd043641dada12953669153d1f719da28f935a9651a07b5ae1e351139f0f03b58a67bc28477
 DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176
@@ -14,6 +12,7 @@ DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b5
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST automod-1.0.14.crate 8717 BLAKE2B aaf79cd054645d3fce5e57f96bdc33f0d02c66495353f4155eba37e81160cd3eb3019587770a38bc22cff5f1e673f0af1b0c9e5e6472bd08e9a6c2812c71b576 SHA512 5efdf134f24298f3a522688b3bb87f5e8e43bafd761909a09a1018f7142ef0ce3ed390f7f01cc475391bf8e6e3d433d776c47efce619a403276ed8998b2c531f
 DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16
+DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
 DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605
@@ -39,24 +38,26 @@ DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e
 DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
 DIST datetime-0.5.2.crate 113732 BLAKE2B e9461220ae45b67fd20b925f1c8e0b3b66d980340fc01d4a36fbba2007100d5d3904b3307eb2e5e75b84bb182dd702e9a274cfe7c5a6f382c053beb7131fdd32 SHA512 7578d839bf8d673d15f1caf84266c45c42bc1efaca9067a4ca22c25bc4ad14b7fd8eb73425f5178e188485872a20f1fe153665331d409302bb1cb4aab6cff623
 DIST deranged-0.3.9.crate 17080 BLAKE2B a1441d629cb5d8ed75c49c25a42c144ecf5f6d060612b01bc2c78cde577f59fc3aed35b8b5629be50433244975fb4f98004ea99bad1177862d15c8695951dda1 SHA512 63abb2a6aaa770596caf96672c764e2f65b867653f9cd3fc268b4d2137afee7b3fc0618d83ab29c80c313e03455fb717a5015cfb33a69f95adeeddce723003fd
+DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1
+DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a
 DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8
 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST eza-0.18.13-manpages.tar.xz 7684 BLAKE2B 9851c72e47d16c6112160d611c44dc057dd527507c9b209baa04f842016504883c5f13af83984ff2914d9f4b23b6cae3ff77994bf9ee2c43e269507562edc9ed SHA512 b0f91ce1a8e1677d34b6a987cb26d05ed3ef40a9153168c8035c570fdd606432690b677f179ac9d16ea6aed7963902cacb3c1f1f2133cea063eab94d33501ecf
-DIST eza-0.18.13.tar.gz 1385128 BLAKE2B 1d84298f8fe950399acaa457b452e85ec9540242bdefc2d542f75bb339b82b8a861f4032b85d9240fde74397a678cd792bf81cb59bda0fb5b7442ee30f43d8b3 SHA512 e257e57e7be3419bd4b9abf72e32222ad5a8029801cd8a7128151da3ce2198a57a1f6187e70ec7a1929e012572348bad56f7904f8cce2e1c26ab8880b6041f0c
 DIST eza-0.18.16-manpages.tar.xz 7676 BLAKE2B 3fafbe01d5403441a2818c889443380f5c5c98befb88e14cafadd3b1c614202f5fc4a0bdca380be46160b4751f9fcdb655d89885f42f042fc68ae5aacfe2642a SHA512 3da68575e4bf9ae779521e0db2496a28f95bca971aa45aee59c04bd5b757b7e195a64437cff6335015a80f6360b5f6581a3b8544178cc4dbd5272727d7c16882
 DIST eza-0.18.16.tar.gz 1385656 BLAKE2B 6761aec3dd638976b0482ece6e8ede8726d4ba90b5fd0d54d8198359601f9bb4abbf6771eb0ab624034a61222c6653adfdce86b64b1c506a4f6326f17e0988e1 SHA512 92bf46df3e851275670fc445c3955999b4ea7b19b2fd6d4c6b403f93be7e4cdbb5c8e536da522603a7bed24e4d924d8ec8a37a3e2174260b378b29690a7ccf7c
 DIST eza-0.18.21-manpages.tar.xz 7720 BLAKE2B ec5e4ef5070bc332c0fef150769dfa6648bc019853f6f802aef83811a5141ec4ea08b4181f24f3bba48854dab9982a303d5e1c70446361d134c607214c7c8535 SHA512 927c87447bf307cf56b8b44a74fd7dbf1e6ef82b279c923b45dfab349d6c06de02c3a6810420047b51238f1567a4b8284a7f0b5db018ce775ee36e56b745d03d
 DIST eza-0.18.21.tar.gz 1385590 BLAKE2B 94d0a0d71d406a2d43edc715f6fce2bd18a9c38f53c788a0e1784b3ac309afef6b8c9223f1468515a1d308a969808caa646ce18b4c6a0f9a2fdf4559ddc32879 SHA512 8f8982ed17cd028d2aa7ae1dbb88c7c505b579697ecc5e21845ff0a5a99324038524f844dc6d26e46a19a08cc6ad31a7c8f000fc46b0bc635bfb6591ca8b3936
-DIST eza-0.18.6-manpages.tar.xz 7680 BLAKE2B 527c4168a3db228e2b64496aee1a85b659f62e732a4d938459eb06b92139673834a4db6ff3a19763608a52d315949dbaaded451d7821080813d79540805a75d4 SHA512 98293a498c590bee460483bf5092fb3b8be5435c76cd3e8bbabca68cccf5fdb0a7152612de3eca65faae138f861e6ac408331fcef154a97efc9db57343467edf
-DIST eza-0.18.6.tar.gz 1385830 BLAKE2B b2f2b3a72388a0b33ba80c206d32a52df36325c40dddf68420b70cf59a41769ffb54599ea5a021d0f28a5f7df795b6c98993104158c590a723d1fe50596201c1 SHA512 f7e492e19a74e66b63658734b2f01c3908ce5364c3ba50982c9dadb3f8c52137d86b341af71c4362388163a19cff0b21a04452d071100bac9b471498f8b2b266
+DIST eza-0.19.0-manpages.tar.xz 7720 BLAKE2B e24619a9c586d1ebdcf579218fd3fe94e7557d30ec89a3e37b1de140b0cc05ee7d7bccacb56e49dbf22040dceb7c6a2d5679b5ab9f5a6d6a00c0d092a0bbf164 SHA512 1b51cf3b9130088aae67cd4786c98c1fffd0cf5174d1122c6221e377460d57a9c1f4250a0ed2b5efc8240a6c65ec50da2fa413f0e5c2252dedbf0095eff2a264
+DIST eza-0.19.0.tar.gz 1385560 BLAKE2B ddce0469875fb16c299c1c67914ef40fa86bc95ed2ef3895d7a1137e8863e49aaae12b1b5c544abc9eeb5b632b1437612c51dfaffe1fa13ebfd896110caec20e SHA512 a859501709a38787481bcd0d6b1a29f29a35f2e5c0fe1e1ce507f852786c840745baf7e52230b35864fb39b3f6300edf2c520615789ce75d572b350464ca10da
+DIST eza-0.19.2-manpages.tar.xz 8716 BLAKE2B 891049bae99d9c24327c000225ef01fdf8e68e8cdd4434d55d2d4872de83e2874ab1baf007193bb98693e537f4ec7da7b8e13b738e85ac3c78ae80434a9910cf SHA512 3376b0ff72f7ecbf73740e84bd7f160be66fe3ebec36d0e0d062e644dff72947dd94fc460ea46a2886da949c3e8aab0b0abdecf3b87b9a12d610db8908361c2a
+DIST eza-0.19.2.tar.gz 1400194 BLAKE2B 28fb210dc2dcb783c6d79ddac988cd1175ce069ec1e146698b1f7d68e0086bb9129119a33f005b98c773d47db1d8ee8b531ea2cce0ebcc944160ad87fde32a3d SHA512 4c215681f8ece840054b0697179d0aed630abd601f2bc50ea7bdb4d5c7604a1f8157ee7fbee5e4cf98f5b1e4944f44cf1d804d1cb21eec05dddf7d37f6c79124
 DIST fast-srgb8-1.0.0.crate 17214 BLAKE2B c5d2e04bf43fccdcd31d6f81cdcde3d89bf0ce94bbc506c2bc09c62b4e83469a2b72db0bb09f4cc2495ace7510834e7fe49df6aa7864092452d9f7865f35cc14 SHA512 834edef5eb4ec23b9e627b5e879a1649af19a17a1af0bae97c040869dbd14751ff3b29a606c52e5fe07b60f07fb695f328409c39788a4e74af0ab7b716688a0b
 DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc
 DIST filetime-0.2.22.crate 15029 BLAKE2B 068f4a84388d04d900bc5518a94895985ecba9c618a47b6483cabc31abd267e37ce69d78c51703ec5745307800d96ac801f37ac9959c60283c3c3d6ccd349c0a SHA512 d40d8baeb57ec85bb9ccf76ff0f898915c4e6cf384020121b53f4a2a1ef2840af5b4c9e8e1ff177034273f4f7a6bf81d2dd7a02cf498b61ea31ceaa30b877067
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST git2-0.18.2.crate 212536 BLAKE2B fffdea2d9a279ec6c371b03489f85039a50250bed9177ebb82090b74a7deddb988b3456ac7e7323be00822e3c243820839f00bd2478cc4d17d0d5d9ad943b4c6 SHA512 d7b7f61ee2c074da28b85bce8475d1b0b953e047ddea70d834fbcffc58a910f0fee3cb91b6e3a0e6fd14b76d142ea02909330db0266299b73c743463a8443a99
+DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
 DIST git2-0.18.3.crate 213009 BLAKE2B f0df4ba154d08f7e7ccd2f5bac9c41c60dd4af7c49d525b0b30fe9fc563c8fe62cf6be833e867f86d61103b946223a7cff9171aad569b8596c340deded56e419 SHA512 f74221d0d96c36d9362c762185b6715f93adc78d5b4db89a3008a2baeb4bb05d5cee2f3c53f59fec97e9a690f82ac3a4f29a1633445f63c6137512255fed48a5
 DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
@@ -74,33 +75,33 @@ DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a4
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
 DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
-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 libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b SHA512 45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
 DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
+DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
-DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST line-wrap-0.2.0.crate 10633 BLAKE2B 0207bc5f38e0a11168684769c8f743a77930dc48f774f3cd9653e09c92394b918bb8186cb0aaf69ef120f5439acd8f3d7baf9e2b79a77a802a9f77a6077af57d SHA512 0fdb591ffaee918e32249a83cc28b72bcabb1259b0531cc4cc2a2241f1dc4fef27af41d5e8da150b9629de025ed60d25240bbffd02f4121f355433e7dd13297c
 DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772
 DIST locale-0.2.2.crate 18910 BLAKE2B f34c69403d81c86c6b178f8f28271e39ddec59696d11eb17c40bdbbcfe9be697184237f2ee3fa4c7b703067cc8c6dbb999a60884f81378b394994c53426e11fc SHA512 ae542f8811405fac032029885a59d39c922da7c1b59e69f5e0d73047d05ed803475b3aa9b486cce47abfdac03f5892013b822e896794e6dd80329b4f105be28f
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST nu-ansi-term-0.50.0.crate 28482 BLAKE2B 48ab82481353372f72fc52b2b7a9835747634e0bd8704f84489c5c1c68bcb4aebead76b232b97dc7319fbd473a9d1d2606b597567508ab0ea9cf17b3e5c85016 SHA512 cb9a1215a730fed293cfd83e7fe89d049d120435740dca5416ad06c9f5b40f496fe22c9d16eca724a56b9039e9f58b17a3301e80c28724fdba70ec81e6f469d2
+DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 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 oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST openssl-src-111.26.0+1.1.1u.crate 5110372 BLAKE2B 34b2641303b676e2254eb9a754812b40f9fd32f02e4f851b006b3d09ccc2f29e206b4f30f49f8f1bbb3de1ce3f01e4ff15791705e663eddc09c8cbd6b314f891 SHA512 b5f663e3a05a620d75d587c69cbdaf316f9c4243f013bc6e5f4be812e4bea1b67a2b01ccb4575d9b7242b9900e106eba71f732afcdba47f82c8bfa570d258b5d
 DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
+DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
 DIST os_pipe-1.1.4.crate 11436 BLAKE2B 215f548a5b16854e156f785a1cc57ff16c241b50223c75159081017889cfe718d6dbdc6567dfc751d71eebda7476c95701c8ae88b1320a0cbba66a694b471d08 SHA512 8568008e30fdc47c1c89f7368654d26407fb6594cd89e2b85786c875d9dd99e77ed2bb84d281351072670e2dfe7a952d6251c6fb4d111ebe6a63cb34942b6aa3
-DIST palette-0.7.5.crate 204746 BLAKE2B bd5bbe4bf8bdc7428834a72513901d40edd7f0027591f8c3ce46412bb42837f473a35b56a45d6a6a71cba693a301c9ad0b4eff0b59cf025f00b0031ec1b050d4 SHA512 b6cc7e9c1ff1302a6827de905450e38a1cc66d97c803add57deeca9f40c565db61b0ac59b6d627e1491b6f221878c2323af5cc6ca05cfeb9554918e9d9c89efe
 DIST palette-0.7.6.crate 230913 BLAKE2B 688eec3839b9fadf6e226a01ed063cbce1d6af9176e20d565b908351d3135a92852e76de17411238e60534895bf43cc585fb9ba1aa76a0683293b4ba6482558f SHA512 c43e39992e796799fc2044e39a8461eb528140438e40ecf64af8ee2f4854a520594be001f8aaa0f4bb8731fadb77b60b07c16592e87924b8af6c6583b0a344b5
-DIST palette_derive-0.7.5.crate 14285 BLAKE2B be50b33a675c46ae62021b4c9e3b4f413b8f9d251a1ee2bd01633877e24e4c880ee6bcc13d4385110d96a1d7c3c53edbb8c46fd0878b97a94c61359349dae96a SHA512 13fa53ae40aea409c94675c119228e39a4602ad50015d8a44b2a394c919dbbb4d719e0aa60fc3fe804d2abe54f405ed0097ff66230e73022227811b7520e49a6
 DIST palette_derive-0.7.6.crate 17073 BLAKE2B 6b225a8f93765a11e4a70c97783b6088c376cacf9c9e237996de4b123dd42dd3a8368519d5ede00323aeed5dd99142bef52c58be3907333963c7012176286ed8 SHA512 29efe90cdd53532015b4f957ed3c1018ee06f55574d4a7f871b868f77b0d9e74ef48da030c4981327abe9876a4664ad78466177fdb49034306e325d4e80baec7
 DIST partition-identity-0.3.0.crate 6711 BLAKE2B 4dbe9e11684099b4cce4e077eb0b8a7942ea166d7f7d094a76f9ef79e52bb03299f9ef52a5badfa5b168e3144dbfb446096ccd06d4b81cfaf7718dbca293901d SHA512 153843ea6c6a76fed350a24fad206304aa88f66755737c50b9f17bea3be434b7fe8940fdb8e31d43415accd4435c6b0c16f5ffcb5d5a1da72cdb8056c7b66bdb
 DIST path-clean-1.0.1.crate 4514 BLAKE2B f35919495573266fda5a68a0de68b7dd751f946b9ed670f369b6c374190fd1a4d1e392d112127b55c5b4ce30237ad7b6e099ae36f8a5393517792a23bf6a7964 SHA512 27ec9449a574d18ec4609147aceb02c0eac98600c15c5c2d5784f7de747479881a83dbc9e12ad07d497944c73d67bd946e5013c7c2cf1125c1931c3c84bb3274
@@ -110,8 +111,8 @@ DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b996345
 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 pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST plist-1.6.0.crate 47932 BLAKE2B 1996f016b12205fee8a22d52e78d5fccd309407728bc7ef516d7c54e998e76051f405032cc9fd72b8f2d81d509ce6e0aff28e088fe97e1f222e5af0f18a43705 SHA512 025f7a04cc0f16a3f44af0c63b5fbad49bcb7227460ba4e7849499a4436836b86d331c81c936ed246ee700fa2556598f9f745c1d2bf5196e0222625db0a2633b
 DIST plist-1.6.1.crate 47933 BLAKE2B 6b064b7b30aa6c07b31843bc548d7f38a04cbdd0d282706ff4cc1d8ccb1060891ce28c28350db86a970be9277a0f978c2c6e3283a7ceabf406c28044574fccfc SHA512 fdec4ff7d080668df45e6a26a92520f72a3fcd58638238f42603723ad0cac48ea5df41c066a19f6f6e1207263cea02c775495b1ecf6e09ef101ffdc157cccea6
+DIST plist-1.7.0.crate 101068 BLAKE2B d94c0c9abe1b39d747259fa56decdbbd4679b606f7753ad11dafa43aaf8e8673903c70e5e6c994a6bbc404993bd77b70b119ffc998fa1b05049c5c9768d75983 SHA512 68298950e1e0a3d5228348dfce7f0796a72f75f43f0e6b93647d460eaecb826b2a3fa1f4023bdb84a1544a4ccfc7abfb39f9aa7550d9b2199878064e1a76b69b
 DIST plotters-0.3.5.crate 143975 BLAKE2B 57b9b37d9e5f43f12f1bbd95d0c0789a09b2f34b30278c62d8637f341a901ac4c0d70ce4a4f869429a43cafaab637d2f25af3eff12354b0e85b184f439c91320 SHA512 38bd608db346161ffa04c50aa315bf5d5eb2840490c5ad6722b9e294b8aacc3c434a1c6de073d2a29cb34de6cdc6260a227f9b7995ffbe75fbb8783708f50045
 DIST plotters-backend-0.3.5.crate 13440 BLAKE2B 72ba042a2057f7afebad34a794df17a0c340ae0d15af2631a3f3abbe117dd8a8d17f877dd935ad59f33494c523664cbd4fc11e05f6c7ae0c495b5e9d4c4a8708 SHA512 4468e2619d7fe47cd03fefa8b1d901ddf5cd47b2899b4b9082cfb695f315cbe415fd57efbef6e0a67eb51dd8edad530c15442810fbb87dfc4b7943b1a7f55460
 DIST plotters-svg-0.3.5.crate 6948 BLAKE2B 1e8df5cdf68b1e27e22ef2f383a81caf76ab598d09f31c536e86c543df78a609a33c3c426660a34a37d1313cc2937b0c678c5e1e43fd3d65bce95b59b2531935 SHA512 91c4955f62dbb8d80e01e5cbdc7ad5f1869be6025de1d2baeeb9198fb108ad8f01916cdc0728b7123ed9217abe92cdd8ad30116dd454312c8f63bf9cec98644a
@@ -120,32 +121,35 @@ DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d
 DIST proc-macro2-1.0.83.crate 48661 BLAKE2B 787507c35d0a922613e9f52628d7798a0d5a32a68398bf73f84acf490e982b9a6e6552277799f3682d7c9a5a759fa7491e94314fb1fbd97d1933e0835191884f SHA512 dea63362b905c8c762ed5f8a0f4402e43189dcedf418ed734e4ed14230a6be4940ab325bd5302aa2aabbff88b58205a19858cf295333c0a4d92737828cb1442b
 DIST proc-mounts-0.3.0.crate 8363 BLAKE2B 928790cd65ae64cbc434e1bd6f1f8335d920c82f888f89f6d03241a79efc6df8b1412971eba053867a744a2cfe6226b7d2a9a228e82f95d7a124f21018ef4a21 SHA512 c66ae15b5a3313a346929ff7bf2b9bfe8e588c9f6996b7f921afb7320e17c73d024cfe00b247f49a0e4703829c37b73c540cd7fd3711bee1bd8c56ab32e7b0fb
 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 quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 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.9.0.crate 177770 BLAKE2B 34e20aeb82a548bd80b8ab3faf8fd870201ba3d67f9618e5493332a3c43bcf1443c027b8ccc76cec8df6bff852434531a01c8490f829f57df5cfbc3d8a6e8a42 SHA512 c9763503fb135eefdebebb82d4d19d20e48a182f1125030a7df085ebda4184942d9057598194ab8e8d39b942c83c231834b10a677e89badb6305a2b571fc1abc
 DIST rayon-core-1.12.1.crate 70701 BLAKE2B a32eb9ae9a71b4f0881f7bfd5375aa7db5681f20f7e0b25e6ecb3161f2aad36b93026c1691d02bf298a48ea07ec9475a237fba457ed0b0b8624aebab2b4988df SHA512 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 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_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
 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.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
 DIST rustix-0.38.21.crate 358962 BLAKE2B b3e4915385aaa1783e0024caee2c454d9ce66542ffdb9ab0f0ef02f07b6d583a49b29b25a604832903f7909a0362bcd2260958cfe3fe045af4df2ea5c62c1da8 SHA512 f3b147706e1befb9d743bb57c7f8dc0a1ca8f244ed98069dfc757ee9d7281f097531bf7d1028d21ac798ee27bfb07b2ea6ac395dd0bc6caef4647fac88669833
 DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
-DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
+DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506
 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
+DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41
 DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc
 DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354
+DIST serde_yaml-0.9.29.crate 64840 BLAKE2B 87ee27f456058a5d5934d1ca0659f4cc725e1af9845214527f88279059b95400f24d4ceff14b6da90b7772c2cfd4ce834ba137f89e18a2df7dc3fec15a8d2e6c SHA512 ab1f915196e47f2853e1d622a64d39e245dcf9d26084fbeb37116d35f25d4cf716ee55bb19cb15b7bc780323d6d4e599d14c3ff11d5e19e430e7953113d7556d
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST similar-2.2.1.crate 51147 BLAKE2B c86005ff69a14980db2cb90b13ed908448a711f09d1ee20a109d1dab2cc5bd839274f3803082721f1d81003c9011efdadcd190f4cb46eb09b26e338107546f45 SHA512 9a353bfbe495bab83e401314bb97c6605fa6283af06e03bad50bc429388c7abf44bb9cc68db781ef2b786840eb444907f35b70b17343b2cb993800536b4e36a2
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
 DIST snapbox-0.5.12.crate 53364 BLAKE2B 4cd0d95f52e95e4575801e99772c15484db338df8d5dc7b59dcc6975272dc116d15f3437a13e479e1b99847683b93c3c691aa52ccd6c718a0b843bc357a6df88 SHA512 5c137b4bbbe77ab0f9fc8c24169473bf8858ef92e3743e546ef3984ff6ba0052b72a70ebe3fd101cfb697ef859deba71997b7fc71b2686f34e5810b5deb976d5
-DIST snapbox-0.5.5.crate 49091 BLAKE2B 1a5b996dfb3f8660dca6dbf5f9cb1a5dbbdee6f86a5d31b921c7d99827d1b230cd5513086539f0d6d9b26e17227217a84f2340124de7ca4a057074af64d0bf11 SHA512 f0ac51aca51158025783f95761cd454aa6104022abea2e05fcc87021cde1a5f545c1653d101b437aa80eb64fca36f5a13198c8515e8b0fc33b13d0777fec4615
 DIST snapbox-0.5.9.crate 49982 BLAKE2B a6c58b4122cf104de46ba171f6b2a104036b4d59b884e2756c7095d2b3bafdb35e96307c431c29cc18730aef5a33ce3430cb2afab736b15c81f5bf3d9ecd5aa4 SHA512 b16cabb32f612f291053b25b1ec65dbb3e27f9740a87bb203ae6e86451242373def1bf0377b07c6d576d8e44e7b8754a94d2fd4794c38e7c1651a1e7d9be81e1
 DIST snapbox-macros-0.3.8.crate 6328 BLAKE2B 217515d52debafcda4bbd3cca583c4e029758a54640d726c2c0230062cbbbf4c4b0e97a82fe56a2813a793f799879d8284c62b3cf985ae72e399db7556f317e1 SHA512 a0d4d923a5b64db9794b51c553e011af80ea7f86d797a4af8a81c7ac097808f42c00579225cecace46aea9e818d3b4fe00ebeddaae291c3a4bed61c77e6bbfe4
 DIST snapbox-macros-0.3.9.crate 6453 BLAKE2B a076217e83826add6467dbdc89553d21a779304225ab3b0d3c16bb2504df11700f8c1d45972c0706f737d2aeb30c4fdaddfbed185e400cc9c161c88994179d45 SHA512 afd84441660835b7cb884436f96e68a1c0da695cbeacfc4de5b3e3bae95221bbb7cf861778e2a3f7c20ebdb7df57109b5923a45e2caefe4502590f9072d3bcab
@@ -156,8 +160,10 @@ DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f111
 DIST thiserror-1.0.48.crate 18862 BLAKE2B b98d63646526e1ed0baf27a17faacee3d8be34421f6fb211d4e1909965a3a327440c0b97c4aba423f416c5a849a47a1d42623a6e64ae27d2236706dc9a30a783 SHA512 078427d19a28f59aaca27f508795cfb06c024b5a34dfc83360c3bec2b8f7abe474706a41fb68732998f154507921beb03dd033f0a6d1dcfcee03b1f2adb8a0b2
 DIST thiserror-impl-1.0.48.crate 15096 BLAKE2B 6b5eed1102256f2c809c21201cf319cc8eed11ab1dd04e6b6bf9759c8eb32e58f0c88407e7c515ac801cea69abfa3bba0c4ee98b034459129f322f6918e9e168 SHA512 6826e242445fba8beb16325fe2e0ad0423b84aae6c1a035dca85e6e07d2b62be8879cb1a0a2b307602d330ad83530260a2480123c9ac5cde59157f74ffd665b7
 DIST time-0.3.30.crate 120289 BLAKE2B 917b71ea8362ca14f2564706919e7e62ebd3e8024d48ebcd9ac9799368a12f425b982a7739a73c025155d5dd0650ef8c9fd4642c60a9111294cad7ac2e30672c SHA512 268f0c779e2a44431932aa407f39878ff1412e287f9678574537fe7185f12faf7605c5ef433aa6d364bf77894e819ff3953f870ef7ad208b7203f1c58eccc4e5
+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.15.crate 23568 BLAKE2B ed16207f302e03095e726f0087f9f7c1514cd71b68a17ac804424c526349838171f3bda62d442b8429a89adb084cca1a4117828c3d66d20f2ff8272d7cb2d3a6 SHA512 d6da54996ab99a46b2b2cef83cec62eca2462490db439ba9814502f7d5ecc3018eb266b29453d601677a0ef39797da77a106d407e0e5de3b110ec1c5ae2f3c6b
+DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST timeago-0.4.2.crate 18821 BLAKE2B 3669505354a6a3611fcea12e246318cdae805c23492f891cac879c08dc7b616f6843384d7debdbf76a7f598dc33cbfa6c71e23b0983ce826162bb5176542cc4a SHA512 f1f8c63b4f42463068478d3eac661d0431204ca65ca0a63d29d93af587c40a4c4912e3f027e37dc3344591e30362d49fb3b770a14ac0d8120d8e08fd5fe97e4c
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
@@ -165,23 +171,23 @@ DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f14
 DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6
 DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
 DIST toml_edit-0.22.6.crate 103304 BLAKE2B 93f14ec5e0765673b4621216707605d7c2afef82d0ad9fe1e0c660be62fb65a59e91db3144c7bf04c71cf5848dc970447b3b31255125d3a2be94ababb3d82692 SHA512 9816338008f2727fd53d34164c0be16621b61e22ac4838752839af4bd09e4d361f319bbd188c5732c1af140358d73d645e05faf4d655eb295d6c331293b7f2d2
-DIST trycmd-0.15.0.crate 33990 BLAKE2B a206f2adca22972ba59b348db7b62b4beba111c300a7faef80483c9458221b25d2f6dc0f63ae75b0f6fa896dfda6487065374a2312ae493b5b912c099b81639e SHA512 4b63bac98a5c609e17d7bb6cad6b052a512799fe3fb49e68e4e19bb0a031f0098356a6a72582c115de636681b6826ed277ab47547f28bef2da692560c0c95743
 DIST trycmd-0.15.1.crate 33978 BLAKE2B 58e08189dba5b13161a0431e78150ce4f0167274555248db0037e0e2fef77379b01937b3ab7521d048696ed0c5ea0143e0c96f6fbaced3d7bf3615e2dea0e174 SHA512 8a9f26dbc5f9f28791980fe9bfbc9866601c9c2bca5171421dcc0f13a91f8114114fc6b4b7631014837d6d93631d193e954c892af42b936449ef7d49f6d69e32
 DIST trycmd-0.15.2.crate 33769 BLAKE2B bb0efff0329ff5665463b9c0589448cd438660d33576854b4de3893da7930ab4d0ed9009f2e894cafd6cd6f171b88904a786a0078d708f6f6ff884c2bcca5c73 SHA512 adf96b57e91cb2691168c50d7cc837a1fa7d127bb0c738c080a0ad564ef95b185e5e87f555a111c625555e2e5100b191939dfc6dd73ac307e249f8e6b9db5885
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
-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.10.crate 61964 BLAKE2B 07de7d3925cfa25f7d95d7a48c7fd5266d1db763b2715d6eecb7b288a834b794590df4638c91d0f021d348c354f7320441e54d62871c7156ddaa821409884a7b SHA512 9989fd93105ae343ce3ed097fc66e62ad9fcb64b8ace4ac2f7bcd374782f9919082ba0bc0f246a9a7071c35172f08953560a8108553076a819d9d1d7dce9a5aa
 DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST uutils_term_grid-0.6.0.crate 10904 BLAKE2B 9779eac591c1e9b2e60630fbd49350d171b11fabe2e0d0df64e2c46da186afa579808ea052c8bb5db02f174a8548905dbcaf3b002fc3f240a1fe469cd739c99e SHA512 9d169a6eacc368824924c49d7f4847927f633c6492d921735deedcefc02c53664b094e8d736fe45b1d9085d5c99ea3ec676f25221a2cf2e81ce4c5f261ad40ab
-DIST uzers-0.11.3.crate 22745 BLAKE2B 59a64624c1a59dff483e28f1b80499191c9a860dcb00e4f27c5c39942ba5a1ec6a4fbe98bb585fca079f4594a57fb24db41675e1aac87fb4873e6056ef13c98f SHA512 3a4eb2d2479550bb34319d2d3841f1e4a5b024dd85193ce127a90479b3d801880d9d3624caa265aaaf9908c7dea73fd7da5780c12c2984db3db04ce45668d97d
 DIST uzers-0.12.0.crate 29098 BLAKE2B 446326a3a3dbb38bf82a2a08f84665b7f1e6a349e1aa4bec44698c51a7c10cf692074c664dbd19100357a3e910f550584bec615bf14afcb1f8d0c40cd8a15030 SHA512 ad0fae66148d451860e86e1046016bf75b4788f412bae9a40bf895c2c385797f3f69e95f030c28ed50cd42fec1cfff2d66228adef393b034547d3bbcc9e7f554
+DIST uzers-0.12.1.crate 29272 BLAKE2B 1a79446814c636702a8845291c8f0add0a0a6b468de8e07a7d8fc5bc3098490e48125abc809c0f44a9e47c9becb4806e29dcf390a6311f952de35a886b85d721 SHA512 93c4160bfcbdca57a3c945b73a94d1ba8612e0258950f7c10307dd57c838a0664890cbe34a98649c18fb783744423a7fd240da8b5eabe1e660a533e9b32f6260
 DIST vcpkg-0.2.12.crate 15530 BLAKE2B 23ee1a34064f19b67232c417a11093f01624b1ddb6aa572ac67ec125dd3f784036e68b58078607e028028e7c7e787c40a158d99cf120b8b80fd8d18c18a07a74 SHA512 33076b42cc83fa614fde2cbcfe1bc5426c99fe3707c129e6c2b7aa16afe3bbf6ada027ac35cc70bc432df25e6a4f6086d251effceae373b6efc23c6a6fb2ff46
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
+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-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
 DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6
@@ -195,22 +201,32 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
 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.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.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.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.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.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.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.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.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.2.crate 157140 BLAKE2B 2cb9e63875403fe525739e2e20d4351f51b6f52dc03928af6de4531f388ec5cd0af7e21ef2f621330f7c91b01eb644fafd0618a246ce3c3dfe61d801e8f8e0e3 SHA512 dd54d69f7ce91f7ac2503ec79bf5bc3e45d2e8b0a3fc593487af33396f819c9df145eacd5ab43ecedca592a89ef259351314335de3fe740a05af5889f24fa8a5
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
diff --git a/sys-apps/eza/eza-0.18.13.ebuild b/sys-apps/eza/eza-0.18.13.ebuild
deleted file mode 100644
index 50a14b21defd..000000000000
--- a/sys-apps/eza/eza-0.18.13.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@1.0.5
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anes@0.1.6
-	ansi-width@0.1.0
-	anstream@0.6.11
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@3.0.1
-	anstyle@1.0.3
-	approx@0.5.1
-	autocfg@1.1.0
-	base64@0.21.5
-	bitflags@1.3.2
-	bitflags@2.4.0
-	bumpalo@3.13.0
-	byteorder@1.4.3
-	cast@0.3.0
-	cc@1.0.79
-	cfg-if@1.0.0
-	chrono@0.4.34
-	ciborium-io@0.2.1
-	ciborium-ll@0.2.1
-	ciborium@0.2.1
-	clap@4.4.3
-	clap_builder@4.4.2
-	clap_lex@0.5.1
-	colorchoice@1.0.0
-	content_inspector@0.2.4
-	core-foundation-sys@0.8.4
-	criterion-plot@0.5.0
-	criterion@0.5.1
-	crossbeam-deque@0.8.3
-	crossbeam-epoch@0.9.15
-	crossbeam-utils@0.8.16
-	datetime@0.5.2
-	deranged@0.3.9
-	dunce@1.0.4
-	either@1.9.0
-	equivalent@1.0.1
-	errno-dragonfly@0.1.2
-	errno@0.3.3
-	fast-srgb8@1.0.0
-	fastrand@2.0.0
-	filetime@0.2.22
-	form_urlencoded@1.0.1
-	git2@0.18.3
-	glob@0.3.1
-	half@1.8.2
-	hashbrown@0.14.2
-	hermit-abi@0.3.2
-	humantime-serde@1.1.1
-	humantime@2.1.0
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.57
-	idna@0.2.3
-	indexmap@2.1.0
-	is-terminal@0.4.9
-	itertools@0.10.5
-	itoa@1.0.9
-	jobserver@0.1.22
-	js-sys@0.3.64
-	libc@0.2.153
-	libgit2-sys@0.16.2+1.7.2
-	libz-sys@1.1.2
-	line-wrap@0.2.0
-	linux-raw-sys@0.4.11
-	locale@0.2.2
-	log@0.4.21
-	matches@0.1.8
-	memchr@2.6.3
-	memoffset@0.9.0
-	natord@1.0.9
-	normalize-line-endings@0.3.0
-	nu-ansi-term@0.50.0
-	num-traits@0.2.14
-	number_prefix@0.4.0
-	once_cell@1.19.0
-	oorandom@11.1.3
-	openssl-src@111.26.0+1.1.1u
-	openssl-sys@0.9.61
-	os_pipe@1.1.4
-	palette@0.7.5
-	palette_derive@0.7.5
-	partition-identity@0.3.0
-	path-clean@1.0.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
-	pkg-config@0.3.19
-	plist@1.6.1
-	plotters-backend@0.3.5
-	plotters-svg@0.3.5
-	plotters@0.3.5
-	powerfmt@0.2.0
-	proc-macro2@1.0.66
-	proc-mounts@0.3.0
-	quick-xml@0.31.0
-	quote@1.0.33
-	rand@0.8.5
-	rand_core@0.6.4
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.1.57
-	redox_syscall@0.3.5
-	regex-automata@0.3.8
-	regex-syntax@0.7.5
-	regex@1.9.5
-	rustix@0.38.21
-	ryu@1.0.15
-	same-file@1.0.6
-	scopeguard@1.2.0
-	serde@1.0.188
-	serde_derive@1.0.188
-	serde_json@1.0.107
-	serde_spanned@0.6.5
-	shlex@1.3.0
-	similar@2.2.1
-	siphasher@0.3.11
-	snapbox-macros@0.3.8
-	snapbox@0.5.9
-	syn@2.0.29
-	tempfile@3.8.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.48
-	thiserror@1.0.48
-	time-core@0.1.2
-	time-macros@0.2.15
-	time@0.3.30
-	timeago@0.4.2
-	tinytemplate@1.2.1
-	tinyvec@1.2.0
-	tinyvec_macros@0.1.0
-	toml_datetime@0.6.5
-	toml_edit@0.22.6
-	trycmd@0.15.1
-	unicode-bidi@0.3.5
-	unicode-ident@1.0.11
-	unicode-normalization@0.1.17
-	unicode-width@0.1.11
-	url@2.2.1
-	utf8parse@0.2.1
-	uutils_term_grid@0.6.0
-	uzers@0.11.3
-	vcpkg@0.2.12
-	wait-timeout@0.2.0
-	walkdir@2.4.0
-	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
-	web-sys@0.3.64
-	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-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.0
-	windows@0.48.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.2
-	zoneinfo_compiled@0.5.1
-"
-
-inherit cargo shell-completion
-
-# script to generate the tarball: https://raw.githubusercontent.com/sevz17/eza-manpages/main/generate-eza-manpages
-MANPAGES_BASE_URI="https://github.com/sevz17/eza-manpages/releases/download/${PV}"
-
-DESCRIPTION="A modern, maintained replacement for ls"
-HOMEPAGE="https://github.com/eza-community/eza"
-SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${MANPAGES_BASE_URI}/${P}-manpages.tar.xz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+git"
-
-DEPEND="git? ( >=dev-libs/libgit2-1.7.0:= )"
-RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.70.0"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	default
-
-	# Known failing test, upstream says it could potentially be ignored for know
-	# bug #914214
-	# https://github.com/eza-community/eza/issues/393
-	rm tests/cmd/{icons,basic}_all.toml || die
-	rm tests/cmd/absolute{,_recurse}_unix.toml || die
-
-	sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping"
-
-	if use git; then
-		# libgit2-sys unnecessarily(?) requests <libgit2-1.8.0, bump to 2 for now
-		sed -e '/range_version/s/1\.8\.0/2/' \
-			-i "${ECARGO_VENDOR}"/libgit2-sys-0.16.2+1.7.2/build.rs || die
-	fi
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev git)
-	)
-	export LIBGIT2_NO_VENDOR=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-	cargo_src_configure --no-default-features
-}
-
-src_install() {
-	cargo_src_install
-
-	dobashcomp "completions/bash/${PN}"
-	dozshcomp "completions/zsh/_${PN}"
-	dofishcomp "completions/fish/${PN}.fish"
-
-	doman "${WORKDIR}"/manpages/*
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt "0.13.0"; then
-			elog "Starting with 0.13.0 \$EXA_COLORS using style codes nh and uh"
-			elog "will need to be updated to use nt and ut"
-		fi
-	done
-}
diff --git a/sys-apps/eza/eza-0.18.6.ebuild b/sys-apps/eza/eza-0.18.6.ebuild
deleted file mode 100644
index 0bd577b67434..000000000000
--- a/sys-apps/eza/eza-0.18.6.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@1.0.5
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anes@0.1.6
-	ansi-width@0.1.0
-	ansi_colours@1.2.2
-	ansiterm@0.12.2
-	anstream@0.6.11
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@3.0.1
-	anstyle@1.0.3
-	approx@0.5.1
-	autocfg@1.1.0
-	base64@0.21.5
-	bitflags@1.3.2
-	bitflags@2.4.0
-	bumpalo@3.13.0
-	byteorder@1.4.3
-	cast@0.3.0
-	cc@1.0.79
-	cfg-if@1.0.0
-	chrono@0.4.34
-	ciborium-io@0.2.1
-	ciborium-ll@0.2.1
-	ciborium@0.2.1
-	clap@4.4.3
-	clap_builder@4.4.2
-	clap_lex@0.5.1
-	colorchoice@1.0.0
-	content_inspector@0.2.4
-	core-foundation-sys@0.8.4
-	criterion-plot@0.5.0
-	criterion@0.5.1
-	crossbeam-deque@0.8.3
-	crossbeam-epoch@0.9.15
-	crossbeam-utils@0.8.16
-	datetime@0.5.2
-	deranged@0.3.9
-	dunce@1.0.4
-	either@1.9.0
-	equivalent@1.0.1
-	errno-dragonfly@0.1.2
-	errno@0.3.3
-	fast-srgb8@1.0.0
-	fastrand@2.0.0
-	filetime@0.2.22
-	form_urlencoded@1.0.1
-	git2@0.18.2
-	glob@0.3.1
-	half@1.8.2
-	hashbrown@0.14.2
-	hermit-abi@0.3.2
-	humantime-serde@1.1.1
-	humantime@2.1.0
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.57
-	idna@0.2.3
-	indexmap@2.1.0
-	is-terminal@0.4.9
-	itertools@0.10.5
-	itoa@1.0.9
-	jobserver@0.1.22
-	js-sys@0.3.64
-	libc@0.2.153
-	libgit2-sys@0.16.2+1.7.2
-	libz-sys@1.1.2
-	line-wrap@0.1.1
-	linux-raw-sys@0.4.11
-	locale@0.2.2
-	log@0.4.21
-	matches@0.1.8
-	memchr@2.6.3
-	memoffset@0.9.0
-	natord@1.0.9
-	normalize-line-endings@0.3.0
-	num-traits@0.2.14
-	number_prefix@0.4.0
-	once_cell@1.19.0
-	oorandom@11.1.3
-	openssl-src@111.26.0+1.1.1u
-	openssl-sys@0.9.61
-	os_pipe@1.1.4
-	palette@0.7.5
-	palette_derive@0.7.5
-	partition-identity@0.3.0
-	path-clean@1.0.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
-	pkg-config@0.3.19
-	plist@1.6.0
-	plotters-backend@0.3.5
-	plotters-svg@0.3.5
-	plotters@0.3.5
-	powerfmt@0.2.0
-	proc-macro2@1.0.66
-	proc-mounts@0.3.0
-	quick-xml@0.31.0
-	quote@1.0.33
-	rand@0.8.5
-	rand_core@0.6.4
-	rayon-core@1.12.1
-	rayon@1.9.0
-	redox_syscall@0.1.57
-	redox_syscall@0.3.5
-	regex-automata@0.3.8
-	regex-syntax@0.7.5
-	regex@1.9.5
-	rustix@0.38.21
-	ryu@1.0.15
-	safemem@0.3.3
-	same-file@1.0.6
-	scopeguard@1.2.0
-	serde@1.0.188
-	serde_derive@1.0.188
-	serde_json@1.0.107
-	serde_spanned@0.6.5
-	shlex@1.3.0
-	similar@2.2.1
-	siphasher@0.3.11
-	snapbox-macros@0.3.8
-	snapbox@0.5.5
-	syn@2.0.29
-	tempfile@3.8.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.48
-	thiserror@1.0.48
-	time-core@0.1.2
-	time-macros@0.2.15
-	time@0.3.30
-	timeago@0.4.2
-	tinytemplate@1.2.1
-	tinyvec@1.2.0
-	tinyvec_macros@0.1.0
-	toml_datetime@0.6.5
-	toml_edit@0.22.6
-	trycmd@0.15.0
-	unicode-bidi@0.3.5
-	unicode-ident@1.0.11
-	unicode-normalization@0.1.17
-	unicode-width@0.1.11
-	url@2.2.1
-	utf8parse@0.2.1
-	uutils_term_grid@0.6.0
-	uzers@0.11.3
-	vcpkg@0.2.12
-	wait-timeout@0.2.0
-	walkdir@2.4.0
-	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
-	web-sys@0.3.64
-	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-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.0
-	windows@0.48.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.2
-	zoneinfo_compiled@0.5.1
-"
-
-inherit cargo shell-completion
-
-# script to generate the tarball: https://raw.githubusercontent.com/sevz17/eza-manpages/main/generate-eza-manpages
-MANPAGES_BASE_URI="https://github.com/sevz17/eza-manpages/releases/download/${PV}"
-
-DESCRIPTION="A modern, maintained replacement for ls"
-HOMEPAGE="https://github.com/eza-community/eza"
-SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${MANPAGES_BASE_URI}/${P}-manpages.tar.xz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 LGPL-3+ MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+git"
-
-DEPEND="git? ( >=dev-libs/libgit2-1.7.0:= )"
-RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.70.0"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	default
-
-	# Known failing test, upstream says it could potentially be ignored for know
-	# bug #914214
-	# https://github.com/eza-community/eza/issues/393
-	rm tests/cmd/{icons,basic}_all.toml || die
-	rm tests/cmd/absolute{,_recurse}_unix.toml
-
-	sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping"
-
-	if use git; then
-		# libgit2-sys unnecessarily(?) requests <libgit2-1.8.0, bump to 2 for now
-		sed -e '/range_version/s/1\.8\.0/2/' \
-			-i "${ECARGO_VENDOR}"/libgit2-sys-0.16.2+1.7.2/build.rs || die
-	fi
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usev git)
-	)
-	export LIBGIT2_NO_VENDOR=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-	cargo_src_configure --no-default-features
-}
-
-src_install() {
-	cargo_src_install
-
-	dobashcomp "completions/bash/${PN}"
-	dozshcomp "completions/zsh/_${PN}"
-	dofishcomp "completions/fish/${PN}.fish"
-
-	doman "${WORKDIR}"/manpages/*
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt "0.13.0"; then
-			elog "Starting with 0.13.0 \$EXA_COLORS using style codes nh and uh"
-			elog "will need to be updated to use nt and ut"
-		fi
-	done
-}
diff --git a/sys-apps/eza/eza-0.19.0.ebuild b/sys-apps/eza/eza-0.19.0.ebuild
new file mode 100644
index 000000000000..f6a792c30176
--- /dev/null
+++ b/sys-apps/eza/eza-0.19.0.ebuild
@@ -0,0 +1,245 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.0.5
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	ansi-width@0.1.0
+	anstream@0.6.11
+	anstyle-parse@0.2.1
+	anstyle-query@1.0.0
+	anstyle-wincon@3.0.1
+	anstyle@1.0.3
+	approx@0.5.1
+	autocfg@1.1.0
+	automod@1.0.14
+	base64@0.22.1
+	bitflags@1.3.2
+	bitflags@2.4.0
+	bumpalo@3.13.0
+	by_address@1.2.1
+	byteorder@1.4.3
+	cast@0.3.0
+	cc@1.0.79
+	cfg-if@1.0.0
+	chrono@0.4.34
+	ciborium-io@0.2.1
+	ciborium-ll@0.2.1
+	ciborium@0.2.1
+	clap@4.4.3
+	clap_builder@4.4.2
+	clap_lex@0.5.1
+	colorchoice@1.0.0
+	content_inspector@0.2.4
+	core-foundation-sys@0.8.4
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.15
+	crossbeam-utils@0.8.16
+	datetime@0.5.2
+	deranged@0.3.9
+	dunce@1.0.4
+	either@1.9.0
+	equivalent@1.0.1
+	errno-dragonfly@0.1.2
+	errno@0.3.3
+	fast-srgb8@1.0.0
+	fastrand@2.0.0
+	filetime@0.2.22
+	form_urlencoded@1.0.1
+	git2@0.19.0
+	glob@0.3.1
+	half@1.8.2
+	hashbrown@0.14.2
+	hermit-abi@0.3.2
+	humantime-serde@1.1.1
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.57
+	idna@0.2.3
+	indexmap@2.1.0
+	is-terminal@0.4.9
+	itertools@0.10.5
+	itoa@1.0.9
+	jobserver@0.1.22
+	js-sys@0.3.64
+	libc@0.2.155
+	libgit2-sys@0.17.0+1.8.1
+	libz-sys@1.1.2
+	linux-raw-sys@0.4.11
+	locale@0.2.2
+	log@0.4.22
+	matches@0.1.8
+	memchr@2.6.3
+	memoffset@0.9.0
+	natord@1.0.9
+	normalize-line-endings@0.3.0
+	nu-ansi-term@0.50.0
+	num-conv@0.1.0
+	num-traits@0.2.14
+	number_prefix@0.4.0
+	once_cell@1.19.0
+	oorandom@11.1.3
+	openssl-src@111.26.0+1.1.1u
+	openssl-sys@0.9.61
+	os_pipe@1.1.4
+	palette@0.7.6
+	palette_derive@0.7.6
+	partition-identity@0.3.0
+	path-clean@1.0.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
+	pkg-config@0.3.19
+	plist@1.7.0
+	plotters-backend@0.3.5
+	plotters-svg@0.3.5
+	plotters@0.3.5
+	powerfmt@0.2.0
+	proc-macro2@1.0.83
+	proc-mounts@0.3.0
+	quick-xml@0.32.0
+	quote@1.0.36
+	rand@0.8.5
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.1.57
+	redox_syscall@0.3.5
+	regex-automata@0.3.8
+	regex-syntax@0.7.5
+	regex@1.9.5
+	rustix@0.38.21
+	ryu@1.0.15
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.188
+	serde_derive@1.0.188
+	serde_json@1.0.107
+	serde_spanned@0.6.5
+	shlex@1.3.0
+	similar@2.2.1
+	siphasher@0.3.11
+	snapbox-macros@0.3.9
+	snapbox@0.5.12
+	syn@2.0.65
+	tempfile@3.8.0
+	terminal_size@0.3.0
+	thiserror-impl@1.0.48
+	thiserror@1.0.48
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	timeago@0.4.2
+	tinytemplate@1.2.1
+	tinyvec@1.2.0
+	tinyvec_macros@0.1.0
+	toml_datetime@0.6.5
+	toml_edit@0.19.15
+	trycmd@0.15.2
+	unicode-bidi@0.3.5
+	unicode-ident@1.0.11
+	unicode-normalization@0.1.17
+	unicode-width@0.1.13
+	url@2.2.1
+	utf8parse@0.2.1
+	uutils_term_grid@0.6.0
+	uzers@0.12.0
+	vcpkg@0.2.12
+	wait-timeout@0.2.0
+	walkdir@2.4.0
+	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
+	web-sys@0.3.64
+	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-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows@0.48.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.5.40
+	zoneinfo_compiled@0.5.1
+"
+
+inherit cargo shell-completion
+
+# script to generate the tarball: https://raw.githubusercontent.com/sevz17/eza-manpages/main/generate-eza-manpages
+MANPAGES_BASE_URI="https://github.com/sevz17/eza-manpages/releases/download/${PV}"
+
+DESCRIPTION="A modern, maintained replacement for ls"
+HOMEPAGE="https://eza.rocks https://github.com/eza-community/eza"
+SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${MANPAGES_BASE_URI}/${P}-manpages.tar.xz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+git"
+
+DEPEND="git? ( >=dev-libs/libgit2-1.8.1:= )"
+RDEPEND="${DEPEND}"
+BDEPEND=">=virtual/rust-1.70.0"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	# Known failing tests, upstream says they could potentially be ignored for now.
+	# bug #914214
+	# https://github.com/eza-community/eza/issues/393
+	rm tests/cmd/{icons,basic}_all.toml || die
+	rm tests/cmd/absolute{,_recurse}_unix.toml || die
+
+	sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping"
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev git)
+	)
+	export LIBGIT2_NO_VENDOR=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	dobashcomp "completions/bash/${PN}"
+	dozshcomp "completions/zsh/_${PN}"
+	dofishcomp "completions/fish/${PN}.fish"
+
+	doman "${WORKDIR}"/manpages/*
+}
diff --git a/sys-apps/eza/eza-0.19.2.ebuild b/sys-apps/eza/eza-0.19.2.ebuild
new file mode 100644
index 000000000000..7c748f4db104
--- /dev/null
+++ b/sys-apps/eza/eza-0.19.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.0.5
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	ansi-width@0.1.0
+	anstream@0.6.11
+	anstyle-parse@0.2.1
+	anstyle-query@1.0.0
+	anstyle-wincon@3.0.1
+	anstyle@1.0.3
+	approx@0.5.1
+	autocfg@1.1.0
+	automod@1.0.14
+	base64@0.22.1
+	bitflags@1.3.2
+	bitflags@2.4.0
+	bumpalo@3.13.0
+	by_address@1.2.1
+	byteorder@1.4.3
+	cast@0.3.0
+	cc@1.0.79
+	cfg-if@1.0.0
+	chrono@0.4.34
+	ciborium-io@0.2.1
+	ciborium-ll@0.2.1
+	ciborium@0.2.1
+	clap@4.4.3
+	clap_builder@4.4.2
+	clap_lex@0.5.1
+	colorchoice@1.0.0
+	content_inspector@0.2.4
+	core-foundation-sys@0.8.4
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.15
+	crossbeam-utils@0.8.16
+	datetime@0.5.2
+	deranged@0.3.9
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	dunce@1.0.4
+	either@1.9.0
+	equivalent@1.0.1
+	errno-dragonfly@0.1.2
+	errno@0.3.3
+	fast-srgb8@1.0.0
+	fastrand@2.0.0
+	filetime@0.2.22
+	form_urlencoded@1.0.1
+	getrandom@0.2.12
+	git2@0.19.0
+	glob@0.3.1
+	half@1.8.2
+	hashbrown@0.14.2
+	hermit-abi@0.3.2
+	humantime-serde@1.1.1
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.57
+	idna@0.2.3
+	indexmap@2.1.0
+	is-terminal@0.4.9
+	itertools@0.10.5
+	itoa@1.0.9
+	jobserver@0.1.22
+	js-sys@0.3.64
+	libc@0.2.155
+	libgit2-sys@0.17.0+1.8.1
+	libredox@0.0.1
+	libz-sys@1.1.2
+	linux-raw-sys@0.4.11
+	locale@0.2.2
+	log@0.4.22
+	matches@0.1.8
+	memchr@2.6.3
+	memoffset@0.9.0
+	natord@1.0.9
+	normalize-line-endings@0.3.0
+	nu-ansi-term@0.50.0
+	num-conv@0.1.0
+	num-traits@0.2.14
+	number_prefix@0.4.0
+	once_cell@1.19.0
+	oorandom@11.1.3
+	openssl-src@111.26.0+1.1.1u
+	openssl-sys@0.9.61
+	option-ext@0.2.0
+	os_pipe@1.1.4
+	palette@0.7.6
+	palette_derive@0.7.6
+	partition-identity@0.3.0
+	path-clean@1.0.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
+	pkg-config@0.3.19
+	plist@1.7.0
+	plotters-backend@0.3.5
+	plotters-svg@0.3.5
+	plotters@0.3.5
+	powerfmt@0.2.0
+	proc-macro2@1.0.83
+	proc-mounts@0.3.0
+	quick-xml@0.32.0
+	quote@1.0.36
+	rand@0.8.5
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.1.57
+	redox_syscall@0.3.5
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	regex-automata@0.3.8
+	regex-syntax@0.7.5
+	regex@1.9.5
+	rustix@0.38.21
+	ryu@1.0.15
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.193
+	serde_derive@1.0.193
+	serde_json@1.0.107
+	serde_spanned@0.6.5
+	serde_yaml@0.9.29
+	shlex@1.3.0
+	similar@2.2.1
+	siphasher@0.3.11
+	snapbox-macros@0.3.9
+	snapbox@0.5.12
+	syn@2.0.65
+	tempfile@3.8.0
+	terminal_size@0.3.0
+	thiserror-impl@1.0.48
+	thiserror@1.0.48
+	time-core@0.1.2
+	time-macros@0.2.18
+	time@0.3.36
+	timeago@0.4.2
+	tinytemplate@1.2.1
+	tinyvec@1.2.0
+	tinyvec_macros@0.1.0
+	toml_datetime@0.6.5
+	toml_edit@0.19.15
+	trycmd@0.15.2
+	unicode-bidi@0.3.5
+	unicode-ident@1.0.11
+	unicode-normalization@0.1.17
+	unicode-width@0.1.13
+	unsafe-libyaml@0.2.10
+	url@2.2.1
+	utf8parse@0.2.1
+	uutils_term_grid@0.6.0
+	uzers@0.12.1
+	vcpkg@0.2.12
+	wait-timeout@0.2.0
+	walkdir@2.4.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
+	web-sys@0.3.64
+	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-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows@0.48.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
+	zoneinfo_compiled@0.5.1
+"
+
+inherit cargo shell-completion
+
+# script to generate the tarball: https://raw.githubusercontent.com/sevz17/eza-manpages/main/generate-eza-manpages
+MANPAGES_BASE_URI="https://github.com/sevz17/eza-manpages/releases/download/${PV}"
+
+DESCRIPTION="A modern, maintained replacement for ls"
+HOMEPAGE="https://eza.rocks https://github.com/eza-community/eza"
+SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${MANPAGES_BASE_URI}/${P}-manpages.tar.xz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+git"
+
+DEPEND="git? ( >=dev-libs/libgit2-1.8.1:= )"
+RDEPEND="${DEPEND}"
+BDEPEND=">=virtual/rust-1.70.0"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	# Known failing tests, upstream says they could potentially be ignored for now.
+	# bug #914214
+	# https://github.com/eza-community/eza/issues/393
+	rm tests/cmd/{icons,basic}_all.toml || die
+	rm tests/cmd/absolute{,_recurse}_unix.toml || die
+
+	sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping"
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev git)
+	)
+	export LIBGIT2_NO_VENDOR=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	dobashcomp "completions/bash/${PN}"
+	dozshcomp "completions/zsh/_${PN}"
+	dofishcomp "completions/fish/${PN}.fish"
+
+	doman "${WORKDIR}"/manpages/*
+}
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index c987e8f94937..57d17c7c946f 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -2,41 +2,65 @@ DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa
 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.0.3.crate 9742 BLAKE2B cfcba0a2773f07b9292279afd70832c5d4eb441ed61bcacdbeeda9184c63b7e01af70a8744d6efceb7f74a2c2dfa5672b873255cc1d273bd6a2d3d7ee08c2d2b SHA512 38637f49e547836a4958d9f528cb270abfc81c5ca644d6d43b0f3aaef8c6f1301a8bc30a23afec5e71722c3afe7eb0f48f9fdea88b73e36f597b74531da84226
+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.82.crate 45361 BLAKE2B 558bac4de847a432fc80427e7be4e78cae4b01c4da852eae2121416af4d7e6ddeaeffd7de9bb69e55340b9a228436b975fdea88e380391a77c782a3776b835dd SHA512 e0d25a8c0b9c45e1db2072618097aff3908f70bfcbf0963d3c9dd9c97be27a85c4a763c5cb74e1ccd1b0a2059360e0879df4be80e10e58e0a5346b65f4fa1a69
+DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST argmax-0.3.1.crate 11270 BLAKE2B 5ea6790707e3d133cc52cf56fdfa93938e6e368408f97b28b4f3cec7aa3493beaff6be6ccdd13e9b34ecbb9a50bfb00f8a702a06820c925a720c5c3baf8606ec SHA512 717df8bab99c0047fa14255208b9799be0324e962addd363eee17f4fbfcc8df8b73263e9e8fc6c8eba6212b84adf8eac87cd3a77cc76b7c5a0ea7973870490b9
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 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.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
 DIST cc-1.0.96.crate 76576 BLAKE2B e0171d68b04bf2435a858b3d50376580f0740588770064bb695ba49b6827bf1f92aa4e973c8dc55e1622e795d23fa8fe42abd122d5d016e800dd5ea86c4ceb3d SHA512 a3e8058165e61020bb10491dae50fcbffbb411d27d6dc44997a931f424e88cb36d89004165aae9c531244a7026920804222c819d12b1be3e3db571bec181d8a3
+DIST cc-1.1.13.crate 82857 BLAKE2B fe3c076a4f7428e39a1bd00f27e0476446db65b112d3ce3ab6db24d37de7ac788667ce6d8e490fd34d66432d0da418b6e63812d5788890256cced5457635db37 SHA512 6e0ecb082ff35fbc83c312f24f6693c3e4f4ee03c2247fbc5adce4f6774a9d6c8dfa28f93b2ec5a00d4da8a7d60bd4a77f2b904ed6bb1cca02a677b9b3cfebd2
 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 clap-4.5.16.crate 56627 BLAKE2B 83a6a9ad12b826affa68df179dc1cb534f58b6ae505f4794ca6dfaa8f8a9e33d93b9babd7931bf48bc13da31cb3078b442c4a2a2e84a8f2e675b5d620100c50d SHA512 d13bfda2c3f77cf194acd87763d5f2fea83ec2135504b173af2941547a7d3dcf75c3757532c60b53c57600bf4859395ddc94a7dd92b17f44c60d3e781741f928
 DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
+DIST clap_builder-4.5.15.crate 163717 BLAKE2B 795fa9c6de6a3f4d9a1288c3340613c14b11a5346e314f5f486bee76346f5f88396e54d95d051bd84184a91bb1f2d3575f870fca56a4b9b590ea2d9939beb415 SHA512 52efd99bce20bb8ff2187c4cef8bc27bef6cdc52598f00b47639b797683f18c76a79a6ebf34d1d250621a49cab0e9ec9e7824d323516f1ed3fa721cfd34cd713
 DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
+DIST clap_complete-4.5.19.crate 50315 BLAKE2B b407ec7891b9ffcaab3ce10ff46432788f070b049c515ab96246aa592cb895ef7f1e2b2f7bee4016677c51e83324dfcfb5f7f7cbdfa698edd931a6933da087f9 SHA512 48e31cf8b51efa2a9f98a73b92970b70f6d44be2737e920df9e0bd62912e66ba64c3979a886a351e117adff550370c6f0167dc7cc1accb8bfe42063fdc7983f1
 DIST clap_complete-4.5.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3
+DIST clap_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea42d9df9af26b5234ccde23175180efe21df93513df49f6ba83e46cc85cedcead29c902e426c39b25086c9f79a51c SHA512 670411136c819577c0129c6fcf5a8216cac82a47ae11ce3cd97cffd038644e06c5a21f7a69948628f01fb77f1e656678ffbfe441385866fdf90d247bda036c4d
 DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
+DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
+DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 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 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-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
+DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 DIST ctrlc-3.4.4.crate 14660 BLAKE2B fe7c2ca8352dbe40e60ad2c63654beafd9ad3f62483b23b3c614a22dacc8ce0edd2b94e9ec3a2472c581f6a1b8befe0952df092b4c7d34ad92414190e285e51b SHA512 c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c
+DIST ctrlc-3.4.5.crate 14592 BLAKE2B 189b026f4061b68848851dc694c71c6ecf87d6c6cdb4518a3aa215ac3d77739db43aa68e3c628e51dad99d7ad089ae6c66a6d03bd912ab9748a0793d09c2333b SHA512 3fca36deead46f3ca586f0a07ace804251d3c3e49a9a63e8c34546e2305d08158770304ebd0c9ad6ed499f811cbbee0b76ffee1858aae60852a61a19024db3e6
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a
 DIST faccess-0.2.4.crate 7262 BLAKE2B d069c8ea1555563137a9e7fd4e8626b8327f96e7eb1e05f1281e20fd1f283278cfada7eb2a10064bd03d8057561367283bcc16280132f16ad3e9e977027f8150 SHA512 6d3328238dcdad0a310ad33e28ca32e68314c7a1b99b0c88c4bb5b380c5a385ec8deb23bb5e8f6bb2eff957becf0b514c488564eb6bd88d471f6ebd3a1614efd
 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST fd-10.1.0.tar.gz 126984 BLAKE2B b6ebb5739cdcde7e6956ca9f9b901c6507913354be6e235cca86ba4a3a4c2fa74281cc97d6db9e44169e63b0d276951d3c4f5d00bd3d9b75c0e9e99ad680b4bd SHA512 6ab75965cb1852dd677ffb07d51db852c993b59551ab2e3a87bf81560a41c5fff35e63e9e09aa495c6c42cd9d038bf8ad85c491095435c9881101cf6284385df
+DIST fd-10.2.0.tar.gz 128683 BLAKE2B d60961f8f4745f3e8582ec78be11045024f1a771c9d5edd2f76900368420486669a0eccee82257d002a45e95f05294d15ce9bfdced98c177be3aaefc47ceda9e SHA512 db7a41d0dd448d73a88f7920b0d67d5d99864fef0a7d64a91523a55af9fd745e6520df8aee808f4131a07acd34730571d94a20e1e6aa1336c6f3caaab593d4ab
 DIST fd-v10.1.0-i686-unknown-linux-gnu.tar.gz 1681663 BLAKE2B d780db4ccc5fbbb6300477019f5911d3f7565ef4e33b21e88dade70d99f7a4f33fcbca265b544e6d355fd0ada271e20f70730fa7d8a6caf944848d1341b3cfc4 SHA512 74fe1cb1a42642553bc926928bfca740a6a6026bbe42f35301ab72d54f27ad59c8ae00df8c675668da5de076e8739d79957f80147e282ec4781fea8ba90a526d
+DIST fd-v10.2.0-i686-unknown-linux-gnu.tar.gz 1667456 BLAKE2B c5aed1c948a725b300cb3c963445c73ec211688bb8986ebc7fc0a0540af3d3043c827615c4cbe14da56264da08888b464cfb17b6f1adef7fd4808800974a0c28 SHA512 f1e1f800c46881664e95a69985c27cb837c837946a7bfdf0d5be272da886689dec76d6106615eabb011d41e986e9589b1330d908ffa063e35254c52c426728ee
 DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST filetime-0.2.24.crate 14938 BLAKE2B 85e05026b35ba195637dec12d2f47cc30a189db0c565c2aae22ab1bf407e910874abebf401167b0c330c790f3e014c37108610063b5428031d28452eb78009d2 SHA512 b371bcdbd0e41b875de623c7b7f122e8f0e421382e741084645372b774cf09614eec9fe74514c90199b7110e8af27c62625e92281f3544afc9374889372c27f8
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
@@ -45,68 +69,108 @@ DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152e
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
 DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
 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 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 js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
+DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7
 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 libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
+DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 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 log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST lscolors-0.17.0.crate 23535 BLAKE2B 63f13223914618e1694a409ea60fb888c61dffca356e73cf773a62304a299f253a6b6661a8cd6d60ad8588e98cf0881e9e264d785808e94449b04b04ab8b5828 SHA512 a90ddbcd8163bc48cd65be76f353c2128d704d1d34a16c38e15baf591c74984041ba92654b4d51b00758fc47c84e30d3e427fb654f5bb1b907b50b5608572a05
+DIST lscolors-0.19.0.crate 26976 BLAKE2B 9d35d666914ab4ceceab31102058b24ffd2ecfaa9ab9a763222366cbd91a9960557f530b2af8f8b3d889a3b9690539b36c15842f4f63df88c1a08f439b81c11e SHA512 2c7bca74756e385bf11dd0e737f77498460b3cafae65e2178d30a4c1b7a0c7ae574d7a3eedd1593cfdce5b7a6a946b9c6be1f01445089bd7ed54f85c9af04e58
 DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST nix-0.24.3.crate 266843 BLAKE2B 1eb1667a60d07c4541a0cb0cf0bed2c7c5256411028becdb229febd0f6215e8e176d3bf691f3bad2fc64841209bf364ff8345a3e92afb2bf8d3705fd734c8ef5 SHA512 6ecda3a14ce00002265e46a066b443cd3c092a306e25d9206b74ae31b8468fd5105b597ff1e7097588bbb6ef5e52fa48ebad908303b61db53361b525f44c13ad
 DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
+DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST normpath-1.2.0.crate 20107 BLAKE2B 08a86e545ed8d0f1881645690c45c4a5fff438680a36778d938bda03e489706a1086e91e27429a414b5925b15be93a80d8dd2327cae28bd567a058cbec5b6c3c SHA512 a8e20301909e28d6b46ff388ac77c7b093c3654418f74955aaa185489fb859b79fa75b7cc303c0f6ef93b01efe18fa70628b1e85c123e143cbaee98eeb558e15
+DIST normpath-1.3.0.crate 20719 BLAKE2B 6f7e91bd80a6fac14fbb72e304aecb6353b05a5e970d75899b8c40313b095f79463fa4cca1f7879c11d41e2437d499247c36915075b4190054f2f9a810e1e682 SHA512 a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f
 DIST nu-ansi-term-0.50.0.crate 28482 BLAKE2B 48ab82481353372f72fc52b2b7a9835747634e0bd8704f84489c5c1c68bcb4aebead76b232b97dc7319fbd473a9d1d2606b597567508ab0ea9cf17b3e5c85016 SHA512 cb9a1215a730fed293cfd83e7fe89d049d120435740dca5416ad06c9f5b40f496fe22c9d16eca724a56b9039e9f58b17a3301e80c28724fdba70ec81e6f469d2
+DIST nu-ansi-term-0.50.1.crate 28536 BLAKE2B fc259654aca2119c1d913e101b0fe7a561b44ba4a6145d309bec23d82ba5e4db916852acafecb727efc92b5dea1641304b26c383ac07a8796e296bb179eaa669 SHA512 c29735a5e1562776251dbd7337a3e4b68eeb299e86c534feab6478512ca5e167b42ebd32c6c461b71187cd375b8a2f587feb962f1501a656543f1429731a95a2
 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 proc-macro2-1.0.81.crate 48233 BLAKE2B 94319064772c757b6bf57eb9e759e827454f719d82210271ebab9c6ee4ecfddc9099522cdc8595123efe2efb64fd50eadd7e31419c5842ff1cb8fdd32e8daa0c SHA512 7edec4b786d9fe076ced4fa5c0d369c163fd1c27c895431245a8268ab2e16665b7c0a585552d46ceee6b8103979a4201f92abb381f0e678128abed359f514de7
+DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 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.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
+DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 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-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
+DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST serde-1.0.200.crate 77611 BLAKE2B 57f4a76cf534ffda009a5441e694b0ac87b30e470c97d77bfd572eb54f039c3cec56f9bf5e035e4b3b257ddb341cb4b7fdb85ca3c4684167220dbb98d1e6a762 SHA512 d4d01d62e7338b147f83bdbe358813e70b7ac218ddbdeab534926d205d46f86e2086f73a01f453c9d4a3bfed07e10d57ebd1f86bdafd4fe96c6298f1e527b8eb
+DIST serde-1.0.208.crate 78232 BLAKE2B 238de7207416756fd241568e47866716da33a6d4d0a72f47362e8d878fd87ec6a237c58ec3a79e7e87a64f2dd59a18970334c8f2db85fb841d16802e8ea9c695 SHA512 13468e827875d3ee8c8848ea3e71dc2e1087f9f434ce947d344208b112f4acb853eeee132a0da61166fd040a423fc8996c58c919ea795c23a09a4ed5e3ced288
 DIST serde_derive-1.0.200.crate 55785 BLAKE2B 45eca5504aff6bd099a42dfc794cf732c7e76e5ed362d16082ac069d29e1e6c22bb3e13dede4bc498df8f008bdba15479de618380f37c9742a34d97c9ca12efe SHA512 e70f0e092d81542a96b33610da8ddbf04023d8ecc1fa4a4f31978699c118f096e8534f9e3e4e479ee74280efb86d752dd1fce038ef2def329fdcc10c1aa50942
+DIST serde_derive-1.0.208.crate 56019 BLAKE2B 68812664bf69f8a65e2be984257975b765f183bdd07b2fd376a7a400e083f610b600855c93703e53a2d334e77e9064b52018c74eddcc953ad0aa9555cf1350c3 SHA512 4f7f1da39ca952ec8b40efe6bdf69bb7a7620f7ab7b344ada26e304622aee5c13fda301c89a6b360c2c1f9284c87918e340edd47186a7e1ed54ba8b2fa0f294b
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST syn-2.0.60.crate 255808 BLAKE2B d7a8e415dd72267fd92da48ba8b3e6feb728f0639797db1aa74aeaa2a57935b7565eec37cbd32eec826154e2c54075b121737369eb15af36c322c34b3cfd7930 SHA512 20bfa02b03c193672a9922f9a5e196185341e082a262f7c00d7c2d467d9e2d77f4af3994634923cfaeee34aa9eab510415165f052ffd9b1ed0b1b581e272898d
+DIST syn-2.0.75.crate 268805 BLAKE2B 936688757ef1b39df0ac34fb2b98e14d15ea5d500b7db7d0c6358c495a385686287f5220b1427c0f086c56fab9caa0eb1f4b1c8cc6e6079f5b9cd24332ce7626 SHA512 f200b5fc6656912471a976e81f460713e9194a962441eb984e26320fc9f197a1d09c6a0a6bba4ab9bd153720ff5b48758f4bac617735ca455c37cc3041f84e38
 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 test-case-3.3.1.crate 8797 BLAKE2B bad61b52f7865882cf6f1ad9448335a8c2eb725629858d62675ed5c10e3a160f5b2cf28cea1179a0c1fea1b33668a70f294b8a2252db460490f3c0bdb705e7d9 SHA512 9d6836759dcd71a61ab4e395db7c1a75a14ac3102a36c39b09868ba96d28a2265d8ded385942e55cf95dafc7f4b53fc498b30b6473cedc9b558977878e831b3c
 DIST test-case-core-3.3.1.crate 14327 BLAKE2B cdca628ed77b8d7bbdf50c775268f733e125fdcdb4425d228691d9650558c3797876f5d8e900a7afc330f61c2be588452ced646248bd676fe4da1a4f8000decd SHA512 2c58aa3c9051b99c269168d5d321c73314188501fd33170a8a5d44e860354f5a399545abbdf50478a43d13e15ee9ed53d4a9c800b263a5e42b97416f96e2c0e3
 DIST test-case-macros-3.3.1.crate 4961 BLAKE2B c3cab2832fbcf3deab12b13bfbb32bbe73528df4d98e84de589a39cd9f3540e308e307148eeedfef4822e3f6820e1b1ba93b102851c7792c5abda25f735b9abb SHA512 3383ad7fa23f09b3289e2beefb2a2ea6bb7f7f48d71339b4c1e613c4807e83e4ab816b1c36369524d65aec7929064d2951c758d9c88164e7792a0a46fbf2d933
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266
 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 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-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 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-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.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.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.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.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.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.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.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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
diff --git a/sys-apps/fd/fd-10.2.0.ebuild b/sys-apps/fd/fd-10.2.0.ebuild
new file mode 100644
index 000000000000..dea1a4d44705
--- /dev/null
+++ b/sys-apps/fd/fd-10.2.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	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
+	argmax@0.3.1
+	autocfg@1.3.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bstr@1.10.0
+	bumpalo@3.16.0
+	cc@1.1.13
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.38
+	clap@4.5.16
+	clap_builder@4.5.15
+	clap_complete@4.5.19
+	clap_derive@4.5.13
+	clap_lex@0.7.2
+	colorchoice@1.0.2
+	core-foundation-sys@0.8.7
+	crossbeam-channel@0.5.13
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	ctrlc@3.4.5
+	diff@0.1.13
+	errno@0.3.9
+	etcetera@0.8.0
+	faccess@0.2.4
+	fastrand@2.1.0
+	filetime@0.2.24
+	globset@0.4.14
+	heck@0.5.0
+	home@0.5.9
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ignore@0.4.22
+	is_terminal_polyfill@1.70.1
+	jemalloc-sys@0.5.4+5.3.0-patched
+	jemallocator@0.5.4
+	js-sys@0.3.70
+	lazy_static@1.5.0
+	libc@0.2.158
+	libredox@0.1.3
+	linux-raw-sys@0.4.14
+	log@0.4.22
+	lscolors@0.19.0
+	memchr@2.7.4
+	nix@0.24.3
+	nix@0.29.0
+	normpath@1.3.0
+	nu-ansi-term@0.50.1
+	num-traits@0.2.19
+	once_cell@1.19.0
+	proc-macro2@1.0.86
+	quote@1.0.36
+	redox_syscall@0.5.3
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	rustix@0.38.34
+	same-file@1.0.6
+	serde@1.0.208
+	serde_derive@1.0.208
+	shlex@1.3.0
+	strsim@0.11.1
+	syn@2.0.75
+	tempfile@3.12.0
+	terminal_size@0.3.0
+	test-case-core@3.3.1
+	test-case-macros@3.3.1
+	test-case@3.3.1
+	unicode-ident@1.0.12
+	utf8parse@0.2.2
+	version_check@0.9.5
+	walkdir@2.5.0
+	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
+	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
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
+HOMEPAGE="https://github.com/sharkdp/fd"
+SRC_URI="
+	https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/sharkdp/${PN}/releases/download/v${PV}/${PN}-v${PV}-i686-unknown-linux-gnu.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+
+DEPEND="
+	!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.77.2
+"
+
+QA_FLAGS_IGNORED="/usr/bin/fd"
+
+src_compile() {
+	sed -i -e '/strip/d' Cargo.toml || die
+
+	# this enables to build with system jemallloc, but musl targets do not use it at all
+	if ! use elibc_musl; then
+		export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
+		# https://github.com/tikv/jemallocator/issues/19
+		export CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
+	fi
+	cargo_src_compile
+}
+
+src_test() {
+	unset CLICOLOR_FORCE
+	cargo_src_test
+}
+
+src_install() {
+	cargo_src_install
+
+	# pre-downloaded to avoid generation via running itself.
+	local compdir="${WORKDIR}/${PN}-v${PV}-i686-unknown-linux-gnu"
+
+	newbashcomp "${compdir}"/autocomplete/fd.bash fd
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${compdir}"/autocomplete/fd.fish
+
+	# zsh completion is in contrib
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/_fd
+
+	dodoc README.md
+	doman doc/*.1
+}
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch
deleted file mode 100644
index 0b703a41d2e6..000000000000
--- a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -1,6 +1,7 @@
- generate_sbat = find_program('generate_sbat.py', native: true)
- generate_binary = find_program('generate_binary.py', native: true)
- 
-+efi_ld = get_option('efi-ld')
- efi_ldsdir = get_option('efi-ldsdir')
- efi_incdir = get_option('efi-includedir')
- 
-@@ -226,7 +227,7 @@
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
-+                   command : [efi_ld, '-o', '@OUTPUT@'] +
-                              efi_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
-+option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules')
- option('efi-libdir', type : 'string', description : 'path to the EFI lib directory')
- option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
- option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory')
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 3ee08953ae06..7513305fec6b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1 +1,2 @@
 DIST fwupd-1.9.20.tar.xz 4290676 BLAKE2B da9c47df676fc6da059e6a2df60891ff3d9141280ee3be58079c7e07ea785e3129aa5140520dcb87cbd8df7833bc43c201217fac54099133cbab0143fc5dfae8 SHA512 3854421b99e4f6869f840bdf601d3fb61a60ef2875f829858809631f22d24060184c424ef7406ff7ede50ad7a2bcd8b93793244c84d88d2269776f0c26846ee9
+DIST fwupd-1.9.23.tar.xz 4300104 BLAKE2B d084244f99b5edccf4bf6a783846623876e9b4344c05bfe3cd412235bcde63d1f36db5528572e371fd0bde27f72c2bd61ba7b6472504ade4c9a068a00e34ca4e SHA512 379adcc79d40795f4895749bc944689ffee6fadc7c3dd1974df98c15120ca47d020ad4efabc68d0371cb36ebd3b549698c05a81bee0a673745a867bb32c4eeb5
diff --git a/sys-apps/fwupd/fwupd-1.9.23.ebuild b/sys-apps/fwupd/fwupd-1.9.23.ebuild
new file mode 100644
index 000000000000..6553ff479810
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.9.23.ebuild
@@ -0,0 +1,210 @@
+# 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-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	modemmanager? ( gusb )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	test? ( archive gusb )
+	test-full? ( test )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
+	>=dev-build/meson-0.60.0
+	virtual/pkgconfig
+	gtk-doc? (
+		$(python_gen_cond_dep '
+			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+		')
+		>=dev-util/gi-docgen-2021.1
+	)
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		net-libs/gnutls[tools]
+		test-full? ( dev-util/umockdev )
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/xz-utils
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/json-glib-1.6.0
+	>=dev-libs/libgudev-232:=
+	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.3.6:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-misc/curl-7.62.0
+	archive? ( app-arch/libarchive:= )
+	cbor? ( >=dev-libs/libcbor-0.7.0:= )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( >=net-libs/gnutls-3.6.0 )
+	gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
+	policykit? ( >=sys-auth/polkit-0.114 )
+	sqlite? ( dev-db/sqlite )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss:= )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+	amdgpu? (
+		sys-kernel/linux-headers
+		x11-libs/libdrm[video_cards_amdgpu]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test-full && has sandbox ${FEATURES}; then
+			ewarn "Certain ${PN} tests are fragile with sandboxing enabled,"
+			ewarn "see https://github.com/fwupd/fwupd/issues/1414."
+			ewarn "When in doubt, emerge ${PN} with USE=-test-full."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	vala_setup
+
+	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+		-i docs/meson.build || die
+
+	python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+	local plugins=(
+		-Dplugin_gpio="enabled"
+		$(meson_feature amdgpu plugin_amdgpu)
+		$(meson_feature amt plugin_intel_me)
+		$(meson_feature fastboot plugin_fastboot)
+		$(meson_feature flashrom plugin_flashrom)
+		$(meson_feature gusb plugin_uf2)
+		$(meson_feature logitech plugin_logitech_bulkcontroller)
+		$(meson_feature modemmanager plugin_modem_manager)
+		$(meson_feature nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_feature synaptics plugin_synaptics_mst)
+		$(meson_feature synaptics plugin_synaptics_rmi)
+		$(meson_feature tpm plugin_tpm)
+		$(meson_feature uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_feature uefi plugin_uefi_pk)
+	)
+	if use ppc64 || use riscv ; then
+		plugins+=( -Dplugin_msr="disabled" )
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="disabled"
+		-Dcurl="enabled"
+		-Defi_binary="false"
+		-Dman="true"
+		-Dsupported_build="enabled"
+		-Dsystemd_unit_user=""
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
+		$(meson_feature archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(meson_feature bluetooth bluez)
+		$(meson_feature cbor)
+		$(meson_feature elogind)
+		$(meson_feature gnutls)
+		$(meson_feature gtk-doc docs)
+		$(meson_feature gusb)
+		$(meson_feature lzma)
+		$(meson_feature introspection)
+		$(meson_feature policykit polkit)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test tests)
+		$(meson_use test-full)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_test() {
+	LC_ALL="C" meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+	fi
+
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/fwupd/device-tests \
+			"${ED}"/usr/share/fwupd/host-emulate.d/thinkpad-p1-iommu.json.gz \
+			"${ED}"/usr/share/fwupd/remotes.d/fwupd-tests.conf \
+			"${ED}"/usr/share/installed-tests \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use minimal || udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use minimal || udev_reload
+}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 2327d3230c75..5903402156ac 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-disk-utility-45.1.tar.xz 1774976 BLAKE2B cc7aa559acfec54df2adf725dc2c8e6918f148139fdc96d2378d178cb37a0cea1297a5db678c104cf7c103d7fc2e0d6e9dd965147a5afa10f217346ba5abe720 SHA512 30705f0b123738816e8f18c8951b1172f7b09b7c500aa8afa313b5bc1e7d2f248e086663dbe7ca4f44584bb8c2a09ca19ab6fbd11edabfc0f32a47dd939f2131
 DIST gnome-disk-utility-46.0.tar.xz 1775636 BLAKE2B c5cdb02dd90f842c312f48e5295252c8c0056bcb6e322924bab2b8736e80c2505894d35435fc9eedc6690be3cd3b6bf28ba40373cd6b023d19e328f8bb681254 SHA512 c2aa29de1c7f483602499edf127e71270b43c0a6c9241f4c62453f45c65aea500cb8fed7af4f70b7c53d07ac9de9866090e7403d9d523e49dd826361f8224769
+DIST gnome-disk-utility-46.1.tar.xz 1571960 BLAKE2B 89d37eeb3eeace2015ee7f2f456242e83e57e53067e32db8540560ada477c32cb81dfec562a824d03fafd024cde17b939b1e5344edbc60cde8eb30af1b3c15ef SHA512 e2b6b6e793e5ad0ca3c22704ccb9ae420acbe41d237eb9aabbda51a47dd3d452daa4f71f07edb37157a03cd2faf76338f80b9044f5d0ff546e74196005ba30bb
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild
new file mode 100644
index 000000000000..7657f988063e
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-46.1.ebuild
@@ -0,0 +1,63 @@
+# 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="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://apps.gnome.org/en/DiskUtility/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=gui-libs/libhandy-1.5.0:1
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/hd-idle/files/hd-idle-service-dropin.conf b/sys-apps/hd-idle/files/hd-idle-service-dropin.conf
new file mode 100644
index 000000000000..4525e100d9b1
--- /dev/null
+++ b/sys-apps/hd-idle/files/hd-idle-service-dropin.conf
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# override settings for hd-idle
+
+# hd-idle command line options
+# Options are:
+#  -a                      Set (partial) device name of disks for subsequent
+#                          idle-time parameters (-i). This parameter is optional
+#                          in the sense that there's a default entry for all
+#                          disks which are not named otherwise by using this
+#                          parameter.
+#  -i <idle_time>          Idle time in seconds.
+#  -l <logfile>            Name of logfile (written only after a disk has spun
+#                          up). Please note that this option might cause the
+#                          disk which holds the logfile to spin up just because
+#                          another disk had some activity. This option should
+#                          not be used on systems with more than one disk
+#                          except for tuning purposes. On single-disk systems,
+#                          this option should not cause any additional spinups.
+#
+# Options not exactly useful here:
+#  -t <disk>               Spin-down the specfified disk immediately and exit.
+#  -d                      Debug mode. This will prevent hd-idle from
+#                          becoming a daemon and print debugging info to
+#                          stdout/stderr
+#  -h                      Print usage information.
+
+[Service]
+# To override, uncomment the following ExecStart lines (including the first) to unset and
+# then override ExecStart as needed.
+# Remember to "systemctl daemon-reload" and restart the service
+# after each change.
+#ExecStart=
+#ExecStart=/usr/sbin/hd-idle -i 180 -l /var/log/hd-idle.log
diff --git a/sys-apps/hd-idle/hd-idle-1.05-r3.ebuild b/sys-apps/hd-idle/hd-idle-1.05-r3.ebuild
new file mode 100644
index 000000000000..7fb27c49dd43
--- /dev/null
+++ b/sys-apps/hd-idle/hd-idle-1.05-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd
+
+DESCRIPTION="Utility for spinning down hard disks after a period of idle time"
+HOMEPAGE="https://hd-idle.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CONFIG_CHECK="~PROC_FS"
+
+DOCS=( debian/changelog README )
+
+src_install() {
+	default
+	systemd_newunit "${FILESDIR}"/hd-idle.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}"/hd-idle-service-dropin.conf
+	newinitd "${FILESDIR}"/hd-idle-init hd-idle
+	newconfd "${FILESDIR}"/hd-idle-conf hd-idle
+
+	elog "The systemd unit file for hd-idle no longer sources ${EPREFIX}/etc/conf.d/hd-idle ."
+	elog "Configuration is still done via ${EPREFIX}/etc/conf.d/hd-idle for OpenRC systems"
+	elog "while for systemd systems, a systemd drop-in file located at"
+	elog "${EPREFIX}/etc/systemd/system/hd-idle.service.d/00gentoo.conf"
+	elog "is used for configuration."
+}
diff --git a/sys-apps/iproute2/iproute2-6.9.0.ebuild b/sys-apps/iproute2/iproute2-6.9.0.ebuild
index 94334695f4ff..79b383ad6e65 100644
--- a/sys-apps/iproute2/iproute2-6.9.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.9.0.ebuild
@@ -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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild
index 056011e4bd02..c1c19af4d549 100644
--- a/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-include.patch
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 31260357e110..727a74bfcc0a 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,2 +1,3 @@
 DIST logwatch-7.10.tar.gz 511766 BLAKE2B 66d7cb09f4c73ca55a3bad9eb2e9a46eabdc0da444e5361ddc10e7bee28de2e58f2c10530f75d40b2689d33624d612f439171b995e9f21a7e48bf211db1f2bd2 SHA512 838bcc7a3b12eb31450a20195fe2ca4ab238500051bb2f50bd1775272fefa412e0a2473c0294a5495ef594fa530b00dac0dc6d18b93e124f36614686502e55cb
+DIST logwatch-7.11.tar.gz 513041 BLAKE2B 074b9b1d58bd199c82edc6fb40703b71f9488966e2acb8afc015fde93806740d11a3c8705303139716bbc50c353f3e8c3f4c0e9cf1d5f870cbb8599fbdd526d1 SHA512 1af075ad2459fade202396af5fa50b705b4635b71b5fc3be832df80c491baa1dd726b3023f84ecbb621e0e19004a0f8cdb017e657c4511bcd4cbd3205177ce22
 DIST logwatch-7.9.tar.gz 501086 BLAKE2B ebfc65c88036244840fe4fbf42c0bea668cac3063771f0042827a2f583d654403b75bdfa428f50a7fdac5f0098ec08ef5a27006db7f7576b361653594462d607 SHA512 d091fbbeb0cac4b661fb066118fd384dbdeabe137c699ea6892d53567a45978c0742b1be9cf2f8b8c2e522314351ee6c2e3710ac2e61bbf1a3c8d63f78a3646f
diff --git a/sys-apps/logwatch/files/logwatch-7.11-openssh-9.8.patch b/sys-apps/logwatch/files/logwatch-7.11-openssh-9.8.patch
new file mode 100644
index 000000000000..1162115f3f09
--- /dev/null
+++ b/sys-apps/logwatch/files/logwatch-7.11-openssh-9.8.patch
@@ -0,0 +1,37 @@
+https://sourceforge.net/p/logwatch/patches/84/
+--- a/conf/services/secure.conf
++++ b/conf/services/secure.conf
+@@ -24,7 +24,7 @@ $secure_ip_lookup = No
+ # Use this to ignore certain services in the secure log.
+ # You can ignore as many services as you would like.
+ # (we ignore sshd because its entries are processed by the sshd script)
+-$ignore_services = sshd Pluto stunnel proftpd saslauthd imapd postfix/smtpd
++$ignore_services = sshd sshd-session Pluto stunnel proftpd saslauthd imapd postfix/smtpd
+ 
+ # For these services, summarize only (i.e. don't least each IP, just
+ # list the number of connections total)
+--- a/conf/services/sshd.conf
++++ b/conf/services/sshd.conf
+@@ -19,7 +19,7 @@ LogFile = secure
+ LogFile = messages
+ 
+ # Only give lines pertaining to the sshd service...
+-*OnlyService = sshd
++*OnlyService = (sshd|sshd-session)
+ *RemoveHeaders
+ 
+ # Variable $sshd_ignore_host is used to filter out hosts that login
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -246,9 +246,9 @@ while (defined(my $ThisLine = <STDIN>)) {
+       $NoIdent{$name}++;
+    } elsif (
+       ($ThisLine =~ m/^(?:error:.*|fatal:) Connection closed by remote host/ ) or
+-      ($ThisLine =~ m/^(|fatal: )Read error from remote host(| [^ ]+): Connection reset by peer/ ) or
++      ($ThisLine =~ m/^(|fatal: )Read error from remote host(| [^ ]+)(| port \d+): Connection reset by peer/ ) or
+       ($ThisLine =~ m/^error: .*: read: Connection reset by peer/ ) or
+-      ($ThisLine =~ m/^Read error from remote host [^ ]+: (Connection timed out|No route to host)/ ) or
++      ($ThisLine =~ m/^Read error from remote host [^ ]+(| port \d+): (Connection timed out|No route to host)/ ) or
+       ($ThisLine =~ m/^fatal: Read from socket failed: No route to host/) or
+       ($ThisLine =~ m/^fatal: Write failed: Network is unreachable/ ) or
+       ($ThisLine =~ m/^fatal: Write failed: Broken pipe/) or
diff --git a/sys-apps/logwatch/logwatch-7.11.ebuild b/sys-apps/logwatch/logwatch-7.11.ebuild
new file mode 100644
index 000000000000..65e89de2a50a
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.11.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tmpfiles
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="selinux"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/HTML-Parser
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo
+	virtual/cron
+	virtual/mta
+	virtual/mailx
+	selinux? ( sec-policy/selinux-logwatch )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssh-9.8.patch
+)
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else (bug #100243)
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 751955f3a7e9..873b9ebc6bc0 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="https://sourceforge.net/projects/logwatch/"
 
 if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git"
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}/${P}.tar.gz"
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index eae690b6d49c..da239dc6f859 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -1,4 +1,5 @@
 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 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.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8
@@ -9,13 +10,16 @@ DIST anstyle-wincon-1.0.2.crate 11712 BLAKE2B 68215a76e44cbe0e69c4111eaf7cd818d0
 DIST assert_cmd-2.0.14.crate 24591 BLAKE2B 2a25812480770ce8549700b6c5afd0e3fc230c280c66b5b61480a2db0dc6c5a95b6a564ca7eb6024fa43498168d8bd3511a6cd659498540bf1a5a3bdbc2a3fc8 SHA512 112c3f933a013715c0dfcf29889ec023c88097a70fe212a7d98d0a5272d5f6da87df9353da006483830a0ac3c42a12e12d8fabeb90eb62453982edbc75215613
 DIST assert_fs-1.1.1.crate 18090 BLAKE2B 27177447fa5d0e5670142cd3ff8c284518615a765bdf0766592cdb0799d9acb29af3443733874300879dc46fcd1af9952df39add9cf9fe52eacf4af8588b0546 SHA512 e1f1772a17f85c4f46d9dac86a8564efe86278049e3f4a40b1dfb874b701fac01726a78d5f38f6812d415666b466de92b5e191a477441c479744c36a3d230130
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
+DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
 DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812
+DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf
 DIST chrono-humanize-0.2.3.crate 15411 BLAKE2B d271f5f34e27edd1ffc10d655f50c47ed1871c3553dd40dc10c5de6fba8fdd2186fc65bf4d229c558314e330bdfada73c663f01e0fe1a9c73fab964f60aff919 SHA512 cb379e678b97749cb6fb5d6aaa1878ae2b106cfd6850ba5ff909b4f22dec67c70d3f738c05980ac3ab691fb959541ceb6f43068f0786c21b2ad1933e5047469b
 DIST clap-4.3.24.crate 55026 BLAKE2B c49987221905f7a39d6628fd755524b2395130f0b55f984067238fe73ee7e71faf2532e990198ece793ca8aa03043108b638a618c30ff8c0a3e10b68a3f8d0e7 SHA512 4c45cce4ade8058e6e7131ebc7754da5974e5965128ef5be1a6d327e0ac5f7151ab6a0494024d89404e1743efbb8891de76322d3e44abff76cf2123fcb4534f7
 DIST clap_builder-4.3.24.crate 162489 BLAKE2B befbbc2f379d8b6bfe538cf86a0f27927a4f9ed73e7224df980241c2ad6acbf79a56cab74b3f337d09ce26a5b0c9e9f60226ecce58b6b2ae0dcbdd49a3df6ccc SHA512 e81d73bd3bef181c945856bd2402ec52a100d38ffc223bf485186c4618076d38c277dd85b21e2391471de463dbe3f2fcdf59e115576be8dbef330d888fdc05e9
@@ -37,6 +41,7 @@ DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd
 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 fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
@@ -49,6 +54,7 @@ DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e4
 DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
 DIST git2-0.18.2.crate 212536 BLAKE2B fffdea2d9a279ec6c371b03489f85039a50250bed9177ebb82090b74a7deddb988b3456ac7e7323be00822e3c243820839f00bd2478cc4d17d0d5d9ad943b4c6 SHA512 d7b7f61ee2c074da28b85bce8475d1b0b953e047ddea70d834fbcffc58a910f0fee3cb91b6e3a0e6fd14b76d142ea02909330db0266299b73c743463a8443a99
+DIST git2-0.18.3.crate 213009 BLAKE2B f0df4ba154d08f7e7ccd2f5bac9c41c60dd4af7c49d525b0b30fe9fc563c8fe62cf6be833e867f86d61103b946223a7cff9171aad569b8596c340deded56e419 SHA512 f74221d0d96c36d9362c762185b6715f93adc78d5b4db89a3008a2baeb4bb05d5cee2f3c53f59fec97e9a690f82ac3a4f29a1633445f63c6137512255fed48a5
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
 DIST globwalk-0.9.1.crate 12572 BLAKE2B 3518672646219e391aa0f157ae6597c78603bbef776d92403b874f848846d60ff8734e75b117dc76b1be91f830157cfce698058f445773748b9dda9cdaf3afce SHA512 9c95d6832950b35cf6ac87bd986116a75c847f11dd2e96ec0cbeb6c223ff901c949429669698cd75c4244a60c3de7df9adec648bc531303cdfba889e09f29448
@@ -61,16 +67,20 @@ DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4
 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
 DIST indexmap-2.2.5.crate 81498 BLAKE2B 8914a50344951aad58766fbfebe8780298098e3a7c923287e3a84f6de41e2924a6a3bb3ee91ceae9b5b49654b83ddc7516a4cfa6253584b0657995d7c8f63a89 SHA512 84fbb6e61756d5ff746f6ffb2c3c8552f96d3af205075a381f06df85258c7597ce24b0d193127a797f975a3fddc1fa92110738227babc73a7fa37505331f8d78
+DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jobserver-0.1.28.crate 25543 BLAKE2B 90fb1d8696b575b16b5b12d6fa4e7bc7890f5f09110b147d65eef8888a16ace1446a789f8079a3706f0252be8a04061d989bc8fc53e6c004d6b8a4094baf1642 SHA512 8ffb33b8c162935de1226e0ca4048f36e6e90bd1731cc7f06110bc97e2adef904f777df0ca4ed48b3b8ee4f2c243b2f883f6897427867904aa3385098abcbcee
 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 libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b SHA512 45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
 DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
+DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49
 DIST libz-sys-1.1.15.crate 3958887 BLAKE2B 989b33d3a0ce09b0268f81d86c33979c7627379d921fce4be83b8c31419aa0613a9e3d82aea400861090fe6b0bf00612396cfbe0b8eff2cf682576b62f81f807 SHA512 316a3b961d8f9b47ac763365d36a4171afc0fb19a01f9570f1962765da0bf67e7f57b848e16f370d653b40a2526fb8720a4625062cd53d4e4f12e1c69d158097
+DIST libz-sys-1.1.16.crate 3958920 BLAKE2B 1780cfc7181a3c33dd8f693ee93e46bf0f70c1958503e8eb866d6ecb6732c8ab7bec56397c5384d582680fdbd8762ae37ccca7063616f266c59a7eff7801c0db SHA512 1d6b65b5a5293d470cf8ed48293a6f8273828a0cdf096d286e777d438b2c4d076360b5492ee3c2c83b27605d51389e6a3eda7eaebfb09a6041a877a48540aef1
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
@@ -78,7 +88,9 @@ DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f8558
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST lscolors-0.16.0.crate 23368 BLAKE2B f4c39acda48e5da0489b8a5b169a55bd69f9d4a2e7c264e6f785feb6f50c5b51ce793b5b34a85aca90809644d55999ce5158117e6496936ebf13758b064d59e5 SHA512 3b6f65e5cdad090fb05b278d4f5cc3d3219dcaa5413dcdb20ca4f673842906c09c71fab4dfe23a3669a9a3781af0d08a793e1626900a078e7e776286c676195a
 DIST lsd-1.1.2.tar.gz 108050 BLAKE2B 3e525b070bbc572e7e80cb5f71d91ef9141ff6acbaf4d29eba9279ab1dad0fb12a25a9e4c2a94bdb65f0655a54b18f5738d8adcbc25a9e929832e9b3e2739b3e SHA512 2d0370c5fb463a4f5e1f2b0366e4fa4baab08eb307b8410d430361777d061a18b9bb9f75a7d19afbb12449c62a59d986cdb170937b7814f49cfbeb85612e8d54
+DIST lsd-1.1.3.tar.gz 108263 BLAKE2B 1264c2980ddd3e5d0fad2e6d5fa7ac29f7379fa2006c030fd25d08b157ac69fbed819602b3af3fa4775548ed13c1b9ec17f68fe9eb6fe05ae9496cc3818b0095 SHA512 a7acea65b190f455888fe4bca4fa0516da5b47270b01e55c10979abbc05d0659f3f2a8481b3b736eb895a66ff0798ea4797492ed17473cf9d4e9065922087301
 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
+DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST nu-ansi-term-0.49.0.crate 28211 BLAKE2B 057f2d9a3b6fa773e5b8b7b33eb0bd588db3310f01354701832716d77dd6c49ae17f69728582cdf84e8387f7c57b9eb05cc97ee6e14541878f12fb50f93855cc SHA512 8168f44f3574e56fe70ecbc67255556bb92215d3520d1cfca7be918b3d7d54be7aa0d82359f1044eaf66f11ee85fab1f9ccf32b13cdc39139c2facc78b2d8e71
@@ -89,27 +101,34 @@ DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ec
 DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
 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-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0
 DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
 DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
 DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
+DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f
 DIST pure-rust-locales-0.8.1.crate 178758 BLAKE2B bb2fe00e5e6b67ed4e5b5b99d6786772b84997ec788e720470ae960b1c99637cce8f82792305aa5a873ea59d9a375434035d983aba26fc26fde5750817856449 SHA512 cddd35f6d288c863a0790a1e0213004d93b0c2dfdc5cccb22fbdb726b0853f776d3c6b03e2082d76f827c41f9831fed762a6804d186447e18e61f903f827c51c
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 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 regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
+DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
 DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6
 DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
 DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
 DIST serde_yaml-0.9.32.crate 65170 BLAKE2B b1651895b2828acb8b962398700ba6802718391369d94a11c63edf8bffdcc5df91170b619d29d0f97c40050232e416822a05d9743543ffcde79deddce0581a8b SHA512 121047516378ee1fe98ec0262be63f39bc09d8d46f0a7c98c0ef1792a8636a9a8ddf0f97608a57723af0f7e4de369e25c353180b9e6de749f57bb7349f419dee
+DIST serde_yaml-0.9.34+deprecated.crate 65290 BLAKE2B 1c1f8c7dd1a7952948596d8c727fb6fd36426c7b80ddaba2e6065db7551757e6fb170c77373ba9784f6b32de9f8aec94f90e1c85df98b9ac1f75a7cc8e5da174 SHA512 64329436d18bc3b1a0737afff7c8727f7e04c71b2bf6022f597a45f0860fa3a678eac688f61f0bf7a7846f98809f427c9907625e1d00c8691c383043c1cffaca
 DIST serial_test-2.0.0.crate 7946 BLAKE2B 4f467100401f0800cf6cf3000b046d43a0df6c2164264061cdaaf9207cd719b087bc9fdd1fd64f1a8ba945c9f2c432786cf0bb5c77bc0d1525e14148cc6b6044 SHA512 65bbba74ddf39c3437b3afa327f7cb1befad12a81e639bc6285608211621b444dbf81edfde8b1b85c708a873c105d27aaf0d2f2d4dcac8872c68d92849c8f3dc
 DIST serial_test_derive-2.0.0.crate 5638 BLAKE2B 72fcbc0a6903b0ac82af3334048eab8fd43f65333570758d4a484f2a7ab83a44c39e9a9f4af3cb1be5296f25d863208a88e3243162664b710daffdeddfd8b3af SHA512 3cbab9f93c1b966e0827d9ee9f41e4cead47c2de8b8da80a3f9402549d01c9f28042d084abfb6f1037bd31c751de8e4139131014da7c80a165444bc3db804be3
 DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
@@ -117,8 +136,10 @@ DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a60
 DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-2.0.52.crate 254728 BLAKE2B 1e56e49de8fee8ed47e89a0791bb0188ee8f0dac127f6e17a1c91a3cb8744a61a6e3b8d3a7fa5cc450a453e9ba7c9ed844302d23cb6e6cd8ca8c624ca475b32e SHA512 a0fb277a4d4611c465d76adf83040a6ac4375275d9f9414fddb34f577573b0f5890b94773bd57660e9af4b65778888ddf34c99d829fe4f58a966484cd8dd9b05
+DIST syn-2.0.57.crate 254911 BLAKE2B 76fd87dd0aebb85b81bf50c56e65f01342b92778ebaf3475b7654c9bbcf4dbfed147d3d63f25cb073bdfcd0318826903dd68ee5c8227ff1e8b742ae6ec66bf25 SHA512 270b86ceb1a9eda6db5b3d7fcbf998d5e8f243b6285f59e593dd6a6495b8829f0b81428d6ffd4e8eb9f021ef747ec5b60c3358c626158e3333f3bd44e84b797d
 DIST sys-locale-0.3.1.crate 15681 BLAKE2B c60d11812280b8e0c1e5a753c7867351deaa43d26bb3ce0b381f56c2f375ec8db2755636131a13fadd79aa6d90b75c5834dbf52848b9ca50c1ecc5b627fc640a SHA512 c06ff352d5beb9d214f08e82b8d49acd8b83114e6b88c9685f0694d42bba079215e6afd1c5c75a8e8bfbcc72d99cb01de7a3d8f160196adb6db9c34bcf1a1ebd
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
@@ -126,7 +147,9 @@ DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0c
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
 DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f2bd2966503501ff89ca6b49afd61e6d9e1ebf18c08d374ff9de4e958dfcb3da8740fdfe31cceace5be456bfe4b SHA512 0ff7e48c3696f4f4c6af29f3142f0a7bb88a07b7a9877ec243e3ea15d89c48f1898b731311da5d4a7c88060628cae3eeea6a4eccf25bd851cb3075920cb1a936
+DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c
+DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
@@ -134,6 +157,7 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d
 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 unsafe-libyaml-0.2.10.crate 61964 BLAKE2B 07de7d3925cfa25f7d95d7a48c7fd5266d1db763b2715d6eecb7b288a834b794590df4638c91d0f021d348c354f7320441e54d62871c7156ddaa821409884a7b SHA512 9989fd93105ae343ce3ed097fc66e62ad9fcb64b8ace4ac2f7bcd374782f9919082ba0bc0f246a9a7071c35172f08953560a8108553076a819d9d1d7dce9a5aa
+DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712
 DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST uzers-0.11.3.crate 22745 BLAKE2B 59a64624c1a59dff483e28f1b80499191c9a860dcb00e4f27c5c39942ba5a1ec6a4fbe98bb585fca079f4594a57fb24db41675e1aac87fb4873e6056ef13c98f SHA512 3a4eb2d2479550bb34319d2d3841f1e4a5b024dd85193ce127a90479b3d801880d9d3624caa265aaaf9908c7dea73fd7da5780c12c2984db3db04ce45668d97d
diff --git a/sys-apps/lsd/lsd-1.1.3.ebuild b/sys-apps/lsd/lsd-1.1.3.ebuild
new file mode 100644
index 000000000000..e6e71f902764
--- /dev/null
+++ b/sys-apps/lsd/lsd-1.1.3.ebuild
@@ -0,0 +1,237 @@
+# Copyright 2017-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anstream@0.3.2
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@1.0.2
+	anstyle@1.0.6
+	assert_cmd@2.0.14
+	assert_fs@1.1.1
+	autocfg@1.2.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	bstr@1.9.1
+	bumpalo@3.15.4
+	cc@1.0.90
+	cfg-if@1.0.0
+	chrono-humanize@0.2.3
+	chrono@0.4.37
+	clap@4.3.24
+	clap_builder@4.3.24
+	clap_complete@4.5.1
+	clap_derive@4.3.12
+	clap_lex@0.5.1
+	colorchoice@1.0.0
+	core-foundation-sys@0.8.6
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	crossterm@0.27.0
+	crossterm_winapi@0.9.1
+	dashmap@5.5.3
+	difflib@0.4.0
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	doc-comment@0.3.3
+	equivalent@1.0.1
+	errno@0.3.8
+	fastrand@2.0.2
+	float-cmp@0.9.0
+	form_urlencoded@1.2.1
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-io@0.3.30
+	futures-sink@0.3.30
+	futures-task@0.3.30
+	futures-util@0.3.30
+	futures@0.3.30
+	getrandom@0.2.12
+	git2@0.18.3
+	glob@0.3.1
+	globset@0.4.14
+	globwalk@0.9.1
+	hashbrown@0.14.3
+	heck@0.4.1
+	hermit-abi@0.3.9
+	human-sort@0.2.2
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	idna@0.5.0
+	ignore@0.4.22
+	indexmap@2.2.6
+	io-lifetimes@1.0.11
+	is-terminal@0.4.12
+	itoa@1.0.11
+	jobserver@0.1.28
+	js-sys@0.3.69
+	lazy_static@1.4.0
+	libc@0.2.153
+	libgit2-sys@0.16.2+1.7.2
+	libredox@0.1.3
+	libz-sys@1.1.16
+	linked-hash-map@0.5.6
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.13
+	lock_api@0.4.11
+	log@0.4.21
+	lscolors@0.16.0
+	memchr@2.7.2
+	mio@0.8.11
+	normalize-line-endings@0.3.0
+	nu-ansi-term@0.49.0
+	num-traits@0.2.18
+	once_cell@1.19.0
+	option-ext@0.2.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	percent-encoding@2.3.1
+	pin-project-lite@0.2.14
+	pin-utils@0.1.0
+	pkg-config@0.3.30
+	predicates-core@1.0.6
+	predicates-tree@1.0.9
+	predicates@3.1.0
+	proc-macro2@1.0.79
+	pure-rust-locales@0.8.1
+	quote@1.0.35
+	redox_syscall@0.4.1
+	redox_users@0.4.5
+	regex-automata@0.4.6
+	regex-syntax@0.8.3
+	regex@1.10.4
+	rustix@0.37.27
+	rustix@0.38.32
+	ryu@1.0.17
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.197
+	serde_derive@1.0.197
+	serde_yaml@0.9.34+deprecated
+	serial_test@2.0.0
+	serial_test_derive@2.0.0
+	signal-hook-mio@0.2.3
+	signal-hook-registry@1.4.1
+	signal-hook@0.3.17
+	slab@0.4.9
+	smallvec@1.13.2
+	strsim@0.10.0
+	syn@2.0.57
+	sys-locale@0.3.1
+	tempfile@3.10.1
+	term_grid@0.1.7
+	terminal_size@0.2.6
+	terminal_size@0.3.0
+	termtree@0.4.1
+	thiserror-impl@1.0.58
+	thiserror@1.0.58
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unicode-width@0.1.11
+	unsafe-libyaml@0.2.11
+	url@2.5.0
+	utf8parse@0.2.1
+	uzers@0.11.3
+	vcpkg@0.2.15
+	version_check@0.9.4
+	vsort@0.2.0
+	wait-timeout@0.2.0
+	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
+	wild@2.2.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@0.43.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.4
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.4
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.4
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.4
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.4
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.4
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.4
+	xattr@1.3.1
+	xdg@2.5.2
+	yaml-rust@0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="An ls command with a lot of pretty colors and some other stuff."
+HOMEPAGE="https://github.com/lsd-rs/lsd/"
+SRC_URI="
+	https://github.com/lsd-rs/lsd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+
+DEPEND="
+	dev-libs/libgit2:=
+"
+
+QA_FLAGS_IGNORED="usr/bin/lsd"
+
+src_prepare() {
+	sed -i -e '/strip/s:true:false:' Cargo.toml || die
+	default
+}
+
+src_compile() {
+	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+
+	local DOCS=( README.md doc/lsd.md )
+	einstalldocs
+
+	newbashcomp "${T}"/shell_completions/lsd.bash lsd
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/shell_completions/lsd.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins "${T}"/shell_completions/_lsd
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 7e1173b07bc8..5a223d246b13 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,3 +1,4 @@
 DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176329781deaf9434d87d7718f9b6ce0b6d4642a03f22a04c7f042dda7f8986b5bce0038f0748461ca55d66964ccc SHA512 edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391
 DIST man-db-2.12.0.tar.xz 1987444 BLAKE2B a6258c1fc9cd81be5d288298660f5b9bda22d726ef98dd5c0a1998809a32391f7244be6897ee8e03483e705a426d6a59d442de3dc2e84f45500daa825ac639db SHA512 4b644a508cf10ef6d27b6325b08f8a89e0695bbc1409bf420efd27649c6851860cc472c4d86063f7b71dccd01fb158faa82afa1e2b91c9a20154acf66b0349bf
 DIST man-db-2.12.1.tar.xz 2041380 BLAKE2B b06c48431608cf798659d19df754d992dca8ba31842613a3326e376e80fe74d913146f45a7f3c5e70c421a2401aeabdb091de78ebb3102b9d70c194286c245a7 SHA512 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329
+DIST man-db-2.13.0.tar.xz 2071032 BLAKE2B 7ce91a7abc6d3bbd92d4707f13caacd8ab5caee0502a2b115f8aa53f4d38df05b0e03346f70584618cce6f5457113e826828a02b847bff57abd6ba6ec1b2d407 SHA512 612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723
diff --git a/sys-apps/man-db/man-db-2.13.0.ebuild b/sys-apps/man-db/man-db-2.13.0.ebuild
new file mode 100644
index 000000000000..8493ff48726f
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.13.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd prefix tmpfiles
+
+DESCRIPTION="A man replacement that utilizes dbm instead of flat files"
+HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/man-db/man-db"
+else
+	inherit libtool
+	# TODO: Change tarballs to gitlab too...?
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	>=dev-libs/libpipeline-1.5.0
+	>=sys-apps/groff-1.20.0
+	sys-libs/gdbm:=
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+		virtual/libiconv
+		virtual/libintl
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/man
+	acct-user/man
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+PATCHES=(
+	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs
+	unreachable MIN alignof static_assert
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	hprefixify src/man_db.conf.in
+	if use prefix ; then
+		{
+			echo "#"
+			echo "# Added settings for Gentoo Prefix"
+			[[ ${CHOST} == *-darwin* ]] && \
+				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
+			echo "MANDATORY_MANPATH /usr/share/man"
+		} >> src/man_db.conf.in
+	fi
+}
+
+src_configure() {
+	# Set sections we want to search by default
+	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
+	case ${CHOST} in
+		*-solaris*)
+			# Solaris tends to use sections named after the pkgs that
+			# owns them, in particular for libc functions we want those
+			# sections
+			local s
+			for s in $(cd /usr/share/man/ && echo man*) ; do
+				s=${s#man}
+				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
+			done
+			;;
+	esac
+
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid # bug #662438
+		$(use_enable !prefix cache-owner man)  # bug #917024
+		--with-sections="${sections}"
+
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+
+		--with-db=gdbm
+	)
+
+	case ${CHOST} in
+		*-solaris*|*-darwin*)
+			myeconfargs+=(
+				$(use_with nls libiconv-prefix "${EPREFIX}"/usr)
+				$(use_with nls libintl-prefix "${EPREFIX}"/usr)
+			)
+			;;
+	esac
+
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. bug #184604
+	if use manpager; then
+		sed -i \
+			-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+			src/man_db.conf || die
+	fi
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING.md,TODO}
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}/var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}" ; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process man-db.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		local _replacing_version=
+
+		for _replacing_version in ${REPLACING_VERSIONS} ; do
+			if [[ $(ver_cut 2 ${_replacing_version}) -lt 7 ]] ; then
+				einfo "Rebuilding man-db from scratch with new database format!"
+				su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+
+				# No need to run it again if we hit one
+				break
+			fi
+		done
+	fi
+}
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index c7bf7566c03d..1688f8fc0cc0 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -4,3 +4,7 @@ DIST mawk-1.3.4-20240123.tgz 413943 BLAKE2B 29a9c89995e969a62bd0b30e494c67e53aea
 DIST mawk-1.3.4-20240123.tgz.asc 729 BLAKE2B e4ba4ddd1f3227a9dc922a1325b00fac2d9c95a848fdc03f57eaa5f354bf45da218cbf6e931b5c1464b799c05d10ff7fe95d1eb81221b4afba468bedc7805815 SHA512 3b4b8b8b7b74aff7061158a7c284d1949c09d52d78003b678c9dcc1da036a4d84b873103d76362866daf914d5a7d717c71baf13d30d7e882b03c5f87c8e4c452
 DIST mawk-1.3.4-20240622.tgz 414190 BLAKE2B 3238e633546ea04b0e3822271fcd37d1ac6ae3924c9e7655ff14c9fa35d691ba27bb779e7c1b7f95a46c0aa90b75a71ab2681763c89812f55773e97489e03ff8 SHA512 29fed436502531e226af5e04bc54c2f4f9430c80d863f27e520401577c1f03a10d8a0d9def94c71ca43de40a7b1f450340802de37a7276bfe91d029779b1460e
 DIST mawk-1.3.4-20240622.tgz.asc 729 BLAKE2B b57d41b6062a51d18525abce1c1d463debe032fe05dea9f9ac82f49cae12b7190cdcdb59ef69757b1372d777353ab3cae7a38177e99f684550bf31f85fd3eb56 SHA512 a97297424dea27207b49b51fd1461c9a158dd9a4e5289e91194beebe67a35b3b9fbb414cf8367eae296688038264f1e7b6d69a00903f9c88d0b90d32fc154ae3
+DIST mawk-1.3.4-20240819.tgz 421586 BLAKE2B cc80703428d50d3eb1ba681aedadc3c0136ecbf73505a2982b5be5a34d3dd49e52b70c05af0a30819ede8f5a6edb01d48df58f1b2554c9c17f116258ad45ffad SHA512 db547df08b6d511805e5c7995d42f63fe95014ac8f1837397e8ed4aeeaadd11dc9b0cb1f54ea3210e70b0378278b24fe31c7c7c912f1da3ce96deb61ce4dfc0f
+DIST mawk-1.3.4-20240819.tgz.asc 729 BLAKE2B 59139459eb51853d3182858bc3d5db961c1b676bf7e219aff65a45bda6b32e8855502231200d9bc63b15181bce400bf883463877cb3546a237d9622681c9f650 SHA512 0e736aea177a0c28808d47dfb459502eefcccfc6f2129a0bdd3c6571d807a5bb49ef554b8169dc2c6f60c6b544bd7d490ab27ec7534846d1b6b736d98ab8fd4f
+DIST mawk-1.3.4-20240827.tgz 423080 BLAKE2B 3844a0240e55b5287397763634ed16fb292919a60228fbb9e7d73e347b9ddef7a206d4207f45d1042fad87d5af62c2bb339dfa5bafc788c2aa854034fccc47f6 SHA512 29d4f4a2ef7bb75b3ac60a3bf1c9d33b09efb842b36b7106d5e76736fde2de5c5647170aa5378f4e1232e2495c064dffae6698bfbdf4546768db457b62fb2012
+DIST mawk-1.3.4-20240827.tgz.asc 729 BLAKE2B d1958ba9d04d249c744f48430ccb9deb34b0bbad5e733e2f720269d128f4f2916e6acc69fdfdd7b6b66d755a1b800847da7befa18aa9f1417ea44014e7adf6e3 SHA512 5930fad06cc53de14ff8eb14548b4a3aadf47ac93f2a7122c74db49583fe2d0eb07c29bc0082870e2760c7250c26e0e336fbba918a7c54cef6f75caf0b600357
diff --git a/sys-apps/mawk/files/mawk-1.3.4_p20240819-tests.patch b/sys-apps/mawk/files/mawk-1.3.4_p20240819-tests.patch
new file mode 100644
index 000000000000..ac75eed869d0
--- /dev/null
+++ b/sys-apps/mawk/files/mawk-1.3.4_p20240819-tests.patch
@@ -0,0 +1,12 @@
+Sent upstream via email by sam on 2024-08-27.
+--- a/test/mawktest
++++ b/test/mawktest
+@@ -269,7 +269,7 @@ Finish "character-classes demo"
+ Begin "long-lines test"
+ if [ -f /proc/meminfo ]
+ then
+-	AWK=$PROG longline.sh | cmp -s - longline.out || Fail "longline.awk"
++	AWK=$PROG ./longline.sh | cmp -s - longline.out || Fail "longline.awk"
+ else
+ 	echo "SKIPPED because of memory requirements"
+ fi
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240819.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240819.ebuild
new file mode 100644
index 000000000000..b3ff452624b9
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20240819.ebuild
@@ -0,0 +1,55 @@
+# 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/thomasdickey.asc
+inherit toolchain-funcs verify-sig
+
+MY_P="${P/_p/-}"
+DESCRIPTION="An (often faster than gawk) awk-interpreter"
+HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
+SRC_URI="https://invisible-mirror.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="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	arc4random_push # doesn't exist on Linux
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4_p20240819-tests.patch
+)
+
+src_configure() {
+	tc-export BUILD_CC
+	econf
+}
+
+src_install() {
+	default
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe examples/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk; then
+		eselect awk update ifunset
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild
new file mode 100644
index 000000000000..8259c09ce3d6
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20240827.ebuild
@@ -0,0 +1,51 @@
+# 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/thomasdickey.asc
+inherit toolchain-funcs verify-sig
+
+MY_P="${P/_p/-}"
+DESCRIPTION="An (often faster than gawk) awk-interpreter"
+HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
+SRC_URI="https://invisible-mirror.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="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	arc4random_push # doesn't exist on Linux
+)
+
+src_configure() {
+	tc-export BUILD_CC
+	econf
+}
+
+src_install() {
+	default
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe examples/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk; then
+		eselect awk update ifunset
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/moar/moar-1.24.6.ebuild b/sys-apps/moar/moar-1.24.6.ebuild
index 928e03d26244..7da7d0e2a6a0 100644
--- a/sys-apps/moar/moar-1.24.6.ebuild
+++ b/sys-apps/moar/moar-1.24.6.ebuild
@@ -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/openrc-navi/Manifest b/sys-apps/openrc-navi/Manifest
index 60e196263a0a..babc96f61bff 100644
--- a/sys-apps/openrc-navi/Manifest
+++ b/sys-apps/openrc-navi/Manifest
@@ -1 +1 @@
-DIST openrc-navi-0.60_beta3.tar.gz 254826 BLAKE2B 97ed51dd74b536a6f7de0bad1a652bff7cdb51422578ce504095821f22be30ebaaa64fd5164ae775f82d17fe3b443766505ea7d999162d0cb679aa706a465fea SHA512 955051107670ce6b2233e88eba6f62e787e8f5b47dbbdbc1b196484a3ac0fadf1219da7f7d7873cf14fc3ac7bf4f7e9634d1d9f224afc93bf9bfed3b7ac5f649
+DIST openrc-navi-0.60_beta4.tar.gz 255190 BLAKE2B 7a48892c6ba9f17bbf1c329f5af645293fc16d2bc973f74679d527bb36b82bd5ef613ddcb4548ef7501cb57afcadcd76ad402ccff1a46f604b39161a302becbb SHA512 d309fa2cf0251793593384d37674fad2cb4892a987c7c09ae4957145885010d4010d36f3f205783a2112d5b7764049971db4872c4c414e638a8ea552cd09e74d
diff --git a/sys-apps/openrc-navi/openrc-navi-0.60_beta3.ebuild b/sys-apps/openrc-navi/openrc-navi-0.60_beta4.ebuild
index 536afa285068..536afa285068 100644
--- a/sys-apps/openrc-navi/openrc-navi-0.60_beta3.ebuild
+++ b/sys-apps/openrc-navi/openrc-navi-0.60_beta4.ebuild
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index d9c663fc92e4..628d1dd4d74f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,3 +1,4 @@
 DIST openrc-0.48.tar.gz 250249 BLAKE2B 4d99d0562e268ad747562ee39cae645ea9221a705fb344969388d2f5f8e0597e62c12bda9dffe0d98eab6437aac0af2c873ad082ec8db01cd61e48b8637f421b SHA512 c67c0a1c87f44a6fde0a7634fcdff0683a821eef5183a4f3e1ef850d04dd7f6c23ec0a72b4a76d9f6c08cb34e362d5e204937caec549eadc638c286c2389c5ee
 DIST openrc-0.53.1.tar.gz 251312 BLAKE2B c44570b489621ac097f057dd25a9a7fd6274fc68c987d548a8c7ab49068bc2025375527c97b82b919ff955d27ce8e4110d6e8f0472abfd83b6911ea9e501198d SHA512 f4e53c28c62b8f184935387d3d8b30dea5953b28d7e50dc00a2b48d84fa3b0c9c19d27a9cdf0b9879b4e4b2a3f91604b893ad5178680e7af0bbbdbd00e108537
 DIST openrc-0.54.2.tar.gz 249992 BLAKE2B 46f7439c9cc264dee19ce3b2ae7d3ac892d302242b9de0855afdfc368bed8bea5b34d95d46327ce3ce796b5dff8e3d30f110249d60ed408a6d6d9a085c7d1c7d SHA512 6a4a9e7d84a5b4f1aeb78a271e69560b1d9e621392b36d26997727d75099f3628e7712f09b4e5393bc588eca41b375e2777a307d8b03ce26f45ed297537c9fd6
+DIST openrc-0.55.tar.gz 249860 BLAKE2B 0d7350a95aee7fd3b8df76cad01e0eac4d3f1f8aaf56aa5a7a01d2fcb21f4aca382eb9472bdced4738571947c232a81689fc8f5dd6289457132cc49497ee3b3c SHA512 3c317efd7fc412db789d1170c37caf127c74194fb3d2327112e85a827be072b1ec86620673bf3e96d72d5e54b38be8366b676169e4b746399646dfe89fefd625
diff --git a/sys-apps/openrc/openrc-0.55.ebuild b/sys-apps/openrc/openrc-0.55.ebuild
new file mode 100644
index 000000000000..24d92426858e
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.55.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson pam
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash caps debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
+
+COMMON_DEPEND="
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap )
+	sys-process/psmisc
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? (
+		sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		s6? ( sys-apps/s6-linux-init[sysv-utils(-)] )
+	)
+	virtual/tmpfiles
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature audit)
+		"-Dbranding=\"Gentoo Linux\""
+		$(meson_feature caps capabilities)
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Drootprefix="${EPREFIX}"
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+
+	# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
+	for v in ${REPLACING_VERSIONS}; do
+		[[ -x $(type rc-update) ]] || continue
+		if ver_test $v -lt 0.45; then
+			if rc-update show boot | grep -q urandom; then
+				rc-update del urandom boot
+				rc-update add seedrng boot
+		fi
+		fi
+	done
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f00e95f74c6d..a210297bce59 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1 +1,2 @@
 DIST pkgcore-0.12.27.tar.gz 636436 BLAKE2B a03b795eb685b552659b6110a9a19e6915320f3bcc87a4c5343a9ae16b82ebea46b538d8606ff10fa1f1c46f85117aeec240247e98aaccc00b0c67996bd2421a SHA512 99e8e125fbb086a98f6c2f494624e63d47d2f594f952eb5e540eba355161eecaeb55ffc3f2df951cdfcd9cb5b1720411c58e2ab4f3299a63eeafa44eed6f7912
+DIST pkgcore-0.12.28.tar.gz 636701 BLAKE2B 5bb80f42b7de8ca39ee7379fae6ea3a1e2a3fec5f799f72a8a0425a4185c85968756778daf244d048ef7028bb8a71e45d6bd913843c5eb3a218a5daa78d198a6 SHA512 0e3c8c174826acc41edc4625fd4c2ae0759d5de015768110d06fac87be9ac2f1f4feefc48880735834474ec89b96e3c245d0619ea6986ec0c7323a9dc106f40e
diff --git a/sys-apps/pkgcore/pkgcore-0.12.28.ebuild b/sys-apps/pkgcore/pkgcore-0.12.28.ebuild
new file mode 100644
index 000000000000..1dc106e93939
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.28.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
+		https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	inherit pypi
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	COMMON_DEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	COMMON_DEPEND=">=dev-python/snakeoil-0.10.7[${PYTHON_USEDEP}]"
+fi
+
+RDEPEND="
+	${COMMON_DEPEND}
+	>=app-shells/bash-5.1[readline]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-3.6.ebuild b/sys-apps/policycoreutils/policycoreutils-3.6.ebuild
index b8f8898a9128..2ed2a4fec990 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.6.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.6.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/policycoreutils/policycoreutils-3.7.ebuild b/sys-apps/policycoreutils/policycoreutils-3.7.ebuild
index e2d9f436bc13..a0924ca80f24 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.7.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.7.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 6b54ec0947c1..d3fd43c24d94 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/polychromatic/polychromatic-0.9.2.ebuild b/sys-apps/polychromatic/polychromatic-0.9.2.ebuild
index 17566f06c680..364b9f2920d6 100644
--- a/sys-apps/polychromatic/polychromatic-0.9.2.ebuild
+++ b/sys-apps/polychromatic/polychromatic-0.9.2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4eff023f98f4..68ee3af2c25e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,3 +2,4 @@ DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c6
 DIST portage-3.0.63.tar.bz2 1187961 BLAKE2B 10523150b0eabac97309004c57356c40fa94ebd59f8f76701ae63d13f9424b523ccee2a367174af3a52078d5d9e4338b94e144247f6709c2f7df4418c040b06f SHA512 323adc17254f92e58f22028dad12ebcaaafa25c82567c5d31cc9575c30e0d78224c8f9efe0fcbeee549b08b0797edffb4bbe9c6fbbd8943e3f9dcda25eedd699
 DIST portage-3.0.64.tar.bz2 1187654 BLAKE2B 622cdda85315ab60ca3b1ae7cf1cb1fe479b69c945dafe14655030387d857ae89c0d8326b85fb3d3754ea95ecf2792ae60ba36f1ad9b18d1ac693fdabf9b235e SHA512 26a9fc9532aebd5965c6d62d78914d827ac48df100b5fc518934857881ca19b927e05b2cd9a2bb674b0e1bd5feff2058a083de9c8fb86af16efe8752325c7722
 DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb5799460e1faa8b8ab137fa017e17d47d6d5da6382e75322f21d4be77a31acffbacd753c70b43b011613cc5a6332bc96 SHA512 c864bcb3bef11916128852a5f50b161d82529d7316ec970703a9ec948c46a51148419ef1dfde2906f72347dd41d0eebd49f5a1769a228d97145f5517c34dbff8
+DIST portage-3.0.66.tar.bz2 1198148 BLAKE2B 77012739f18dfbbf088533fc9ccb64fe870d849ef6dadfdd92855d16fbca5eec08b065f94067898016787c03fd1b338dbe06192d56a97f2ad62681bda37c3be8 SHA512 0b182a2078c1c2b7d2e7148834dd6f2b2ae09bf4c91454e0cae908406abd9ad221a46738869ead17c5595c988bb2c11c462ba29ffb022389b1f2e824f093c853
diff --git a/sys-apps/portage/portage-3.0.66.ebuild b/sys-apps/portage/portage-3.0.66.ebuild
new file mode 100644
index 000000000000..8958c0cc58ea
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.66.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.27
+	>=dev-build/meson-1.3.0-r1
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+	doc? (
+		~app-text/docbook-xml-dtd-4.4
+		app-text/xmlto
+	)
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-user/portage
+	>=app-arch/tar-1.27
+	app-arch/zstd
+	>=app-misc/pax-utils-0.1.17
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=sys-apps/findutils-4.9
+	!build? (
+		>=app-admin/eselect-1.2
+		app-portage/getuto
+		>=app-shells/bash-5.0:0
+		>=sec-keys/openpgp-keys-gentoo-release-20240703
+		>=sys-apps/sed-4.0.5
+		rsync-verify? (
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	if use prefix-guest; then
+		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		-Deprefix="${EPREFIX}"
+		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(meson_use doc)
+		$(meson_use apidoc)
+		$(meson_use gentoo-dev)
+		$(meson_use ipc)
+		$(meson_use xattr)
+	)
+
+	if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
+		emesonargs+=( -Dnative-extensions=true )
+	else
+		emesonargs+=( -Dnative-extensions=false )
+	fi
+
+	if use build; then
+		emesonargs+=( -Drsync-verify=false )
+	else
+		emesonargs+=( $(meson_use rsync-verify) )
+	fi
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local EPYTEST_XDIST=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	python_foreach_impl epytest
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+		"${ED}/usr/lib/portage/${EPYTHON}"
+	)
+
+	meson_src_install
+	python_fix_shebang "${pydirs[@]}"
+	python_optimize "${pydirs[@]}"
+}
+
+pkg_preinst() {
+	if ! use build && [[ -z ${ROOT} ]]; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+
+		env -u BINPKG_FORMAT \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}
diff --git a/sys-apps/pv/pv-1.8.12.ebuild b/sys-apps/pv/pv-1.8.12.ebuild
index 89cf567ffe13..2fe16ca8af87 100644
--- a/sys-apps/pv/pv-1.8.12.ebuild
+++ b/sys-apps/pv/pv-1.8.12.ebuild
@@ -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/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 55ec5b6b8f6f..1cdbc410adcb 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,48 +1,92 @@
 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 anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011
+DIST anyhow-1.0.87.crate 46831 BLAKE2B 8d277aef9dfb9e28d6fbbb840fc3dde385ae29df8fdaf76913c39ccdfac487c8a7599783c6bf4271cd7466a06bcb4b3b1459b317c0f531634a4b4b8ccc1d6174 SHA512 1ed272eb20bd28d361d71b8dd1279bb3ab3a722c6a68e0f7bf4fb0a196f8a5d9f5ed9874d231ba7cf93e6a6f2551e96411d1fcb26908c79ee76919214637816f
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bstr-1.10.0.crate 380426 BLAKE2B 19330a5a293430c09908d2174ff814351b16419f60de6463abf9b8a9dff06a4e6845e889d8047a710cef54842f2790d9cd5080b92cdcb113d89742b869979c74 SHA512 823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2
 DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b27023187004c81cd01e5315dcac920ff87a6bb87ccfbb949364f1361dc04d342e24f9f54490b5d44a81d1 SHA512 dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cc-1.1.18.crate 83315 BLAKE2B a97d24ffdf44f80795f67f7721ed4d2524d92342bfb4ba39e00a1d3351945c904ba84cc7e245c637453e70d19b1584a400e8422e185d42c036ef44d3f2135663 SHA512 af525791c6ba731d688d3f5bf898c0ff86bbd81b127454d7f933491cea1e921d171cb819d04e460e759c6ae0f6da2188ede6bbe94c940c47c6d9d9f991925401
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST crossbeam-channel-0.5.10.crate 90442 BLAKE2B f3117110f7c558d2263f0c8522f98a9f38e04d3ce43b4e0fa67f33f23c5c5be6680d177884131dfa75f50cab50b3607be1f09a10126fb960b8a2e04161178292 SHA512 afd65fda772f9f225e1b372d27fd90f991097c57ac9b2747a40702e50791c6d702d1342088c99c2243873cbe6126f7c4e8df8f41b00bf4db3dbccfae1ae0063e
+DIST crossbeam-channel-0.5.13.crate 91174 BLAKE2B 7a9aed6f4922c1d10e4ae12508a03dc7daca773adad6a317c4ea38e544d7c28c56a06623d958aec540fcaa86fa9051a1aaa2c859dadff72873f18f2f3a951449 SHA512 0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8
 DIST crossbeam-deque-0.8.4.crate 21752 BLAKE2B 1813e2c0916ac990c5ce54aadd13f309dc4d2cb651995261cf591900a5c820712de7dd730116e8b4cf78bcef19626889fc0658d7f1020cb2c1d7fab41718a31a SHA512 cc036613727a3aa8933bec419ba8a5fd2f506770ad2cf874ff757b048e0d29ea3f1b0e2b72d2d5352ed4b62c6764c7bbb10d0d4e217176da26bf5ae4bca0b68b
+DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
 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.18.crate 42383 BLAKE2B f0b58626f3d40c5a889572e0f5fdb468e4c13ce0afc09aec1a75e1c5888cab56fbc644f592c620e1d28aae79687c4446146d9f783d96f8bd177d0a4a559fe8dd SHA512 977f41d7596a8d206fab665570f155479e15a83698fa54e714305d56ce32d78abc6f778b5f6e3c379ed1da27e241639cf4d0cd12922383f774ae85b32a4dc550
+DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa
 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_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 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 jobserver-0.1.27.crate 24774 BLAKE2B 259c854f3cca79f769dde0a796aef4dc135574d816e7d0b8aed4b3d4e09d4eea600db30f7c8a8f7c68c9040efa1ab99029b1380ba6240dbf21634e7b5ad141d8 SHA512 2681234952be7a5ae67770d45f4d52e8278347f79b349bda594626712b1fba595a4cf46e8fb5426b548c325a23243facf7fbdc01ae0e853e492aff39444879a5
+DIST jobserver-0.1.32.crate 27549 BLAKE2B 5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb SHA512 d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST lexopt-0.3.0.crate 24767 BLAKE2B 9e2437715bbeb5ad1d638b21791936a336f5344afa2fe6c65506cfd478a75671bc82c81c4329e6aa7edf9c34b61083ccf5a38268340702c614701e99269b8ce4 SHA512 7ce3856a54fa6274ea3d5a4fe353f4a0411f5f6754fe8a5e7a114705f063300a93aa2efad765bc1dd0244caee15a8cf44a3de540a4db0626ed2ac6476bdb6843
 DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec
+DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memmap2-0.9.3.crate 33125 BLAKE2B a6448f687872bbb069b9454a80b08faca9f66723cc7fbf89bc623079fdbfceaea729eea6d61852e7c2e85492d5d9c9a8cfde54d53568bd9585c0581150e14de4 SHA512 025068aaf27296731c3a4fd8df3b745cd37e86a564aa5ab9a8eccddb99fa054820eff5a6a858c3f443666bf594b149c84045f43a555353286b066b3f1ff514cf
+DIST memmap2-0.9.4.crate 32752 BLAKE2B 1b21af908061e6fe09484ce5f84d31ed1751301dffb6439512b38c53f9f090cef7541b591b968d0207c6d8351ee4d5949007caef7832ce130ffda1b3716b5454 SHA512 8bba078dba73253e8ee88f0bd2202dcd2afd0b7b800d08af8af593b882cb4acff7e297a3f299e253f5adf103893fc390dcd73e882a2e7d93ca96099fc2eace4a
 DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
 DIST packed_simd-0.3.9.crate 98340 BLAKE2B 8668038eb213cec44afded5164ccf368fbecea21aa3de64d49e798d7f0fac638af9616a435cb79cf0435387f67fe97a7eb00748eaf39be14bb6d50ecbb4c938e SHA512 1336ed8aee50a580784f38388f0cc2f0a8639149333e94b7f83aa7cc314a80c60b66ac203a7302cd4cf01f3d0b89da58d2ce9038b7685840fbc1b758217dbd1b
 DIST pcre2-0.2.6.crate 30765 BLAKE2B e0d4cdfcd18c4992c09af36dcc3f8294210571046dd09d3f5b300d871f872b181dbd791d0c7634d1b9f4100dfb1f98b470e73e6c8c1f17ae2867c5b93a1822a6 SHA512 101a0c4f1300ef7184aafba9048e0a7ad310d86d5236871e2b2477d4cedb23ac8bd6c6cd48970145eccbfb684f3efb5a80100e056e0c6052bc6fdbc4ad308317
+DIST pcre2-0.2.9.crate 31025 BLAKE2B 55fb42b76f8cd198ade5b38ddfe89b8a8fe14f4cb0667e9da8121a4681e7ee973c20eaaa6d5a16f5ccccd749b1c82c060996139a512bdc63fc64cf477621f339 SHA512 e428f68260ba5791d062f4ee38f57daa75239db078c0a39dbed8ce4f28825aabd2b53c482867c4191c4d80a49cfecf9aa7d3ed505d0c59f01fa8e114fe158a0f
 DIST pcre2-sys-0.2.8.crate 626303 BLAKE2B d2d74d3a2d2d50a0a3496a3a4204fbcc7f300845c209fd22106ce0cedb528a375ba8e3d10ff4ed68590cb38308e4c648dfcdeb55d17dd6a6b0101e7b9dea534d SHA512 4f0b21a0dff41ccbfb1dd6387d63b066e71002a7b96f76d8ab5ff34c056cd862337c1ef08daf30436fdf68eba4eb98f6e8a1ad6d2903e2e348ed9b85e2a7f616
+DIST pcre2-sys-0.2.9.crate 697425 BLAKE2B 04e6dcd7e75a1abdb5e3d7d812b3b79c2d57bba6591040d75c29bb4baa6895d9d585bdf00511185605d720bac181842d6b624f72ddcaf8125afc0c20e1237db2 SHA512 c94d9520334302228f916b3599a6efd372ed2871aa3c85c3df55e66fed2d2e7033caece4385586d8ff55f55005338b0f042df97ff82f7d6b22d71ed3791fdb52
 DIST pkg-config-0.3.28.crate 20330 BLAKE2B e38aa3fd2f03bcdca0ca92585ef558841623e38d01cbeb9db988f157ab94a0ad60be2b264dffccd0312594128cdf42fc40b659d1c009265ec274e4ab5801f79d SHA512 1ef92c5cf5320fb2e7d9e337edae08eaef01c762cb18406f732af731e5a94bef95be36cc0e0f5643f47a925aa127c5520a961c034e7b86357715656707a6e0e4
+DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 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 quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
+DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
 DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8
+DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
 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 ripgrep-14.1.0.tar.gz 584473 BLAKE2B 69771fbf3e575e19ff935609fa1a93f410d3fcac58bc20442355fa9556f8568eab294a1fd569c8d91e823f0f58f17734fa13f32b9aa4f8b61f3065b06d79e9e6 SHA512 b50044b6513f5caad1373c1cd4598779311bfce9f28092b90852ed9489c728b01ef5c91d4110d70a75ec08d977fbdd2a2da9cbf0b2820eb48b99f9ec3825e0a3
+DIST ripgrep-14.1.1.tar.gz 581402 BLAKE2B 113dc509bcc3327cca541dcfcbe8e4d196503124f89ce50c94a3a2f8b29e194429941876b324c106d6ed4195d2c726022ba01144f0bcd4fc2a1db1e95b452b76 SHA512 6aacbc99025c1c0c301491574953bed4d7dd04f9ce7ce999c47eaa50d71ea7edd905f718e2e94031a5ad651d4daebce772c57ed291c639938991ad4574be8244
 DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
+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.195.crate 76856 BLAKE2B 6a80b59335f222ae48d5e377c30611f30fe6416e6853ca47a39016e21f649cb9dfbe4964ce19e5da977fb9a963228a6a81c1e85af99ae12d7a0a5722901aa2f5 SHA512 0002ecb933d08fbdc8585ee74efb4048d385459f629261f5a4a8401b794f1c02b8296db79f479013a0b2a47ba99bee6c02d60d0fc2454e32f1b038b4071e8727
+DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde_derive-1.0.195.crate 55687 BLAKE2B 4da7916e36f71dfe82defa6c45b3075395cae54631cdff08a4607e962290020e7214288258fd316439c02536073325f5902e7b00144f97269a207fc453496599 SHA512 8a82ae4e7cfe0c3ac27688cc95d74bf4c2e10c1fe845ab28fb57579b2f47f36d13218c2ae603f93f00114065d47c3e46166dea39b205be673f443c34305dacce
+DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_json-1.0.111.crate 146447 BLAKE2B a3509185e78c438f495ee9d5b5b7c23cd3b565d45178500f2b9ceb8cc8b1cc509b8d25d217f2c98bb597bab205566d660c3f60506c836da903c52206e6fb160e SHA512 11851e34a9a40de32654a12ada1d1bd01abb11531c5804f5d0747bbb01bf59025dd92be916104fbc278bbba5c89c77920941b83c0ac2f0da23f5d61a7788e83f
+DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
+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 textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3
+DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
+DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad
 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.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.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/sys-apps/ripgrep/ripgrep-14.1.1.ebuild b/sys-apps/ripgrep/ripgrep-14.1.1.ebuild
new file mode 100644
index 000000000000..550c7e957f70
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-14.1.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.3
+	anyhow@1.0.87
+	bstr@1.10.0
+	cc@1.1.18
+	cfg-if@1.0.0
+	crossbeam-channel@0.5.13
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	encoding_rs@0.8.34
+	encoding_rs_io@0.1.7
+	glob@0.3.1
+	itoa@1.0.11
+	jemalloc-sys@0.5.4+5.3.0-patched
+	jemallocator@0.5.4
+	jobserver@0.1.32
+	lexopt@0.3.0
+	libc@0.2.158
+	log@0.4.22
+	memchr@2.7.4
+	memmap2@0.9.4
+	pcre2-sys@0.2.9
+	pcre2@0.2.9
+	pkg-config@0.3.30
+	proc-macro2@1.0.86
+	quote@1.0.37
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	ryu@1.0.18
+	same-file@1.0.6
+	serde@1.0.210
+	serde_derive@1.0.210
+	serde_json@1.0.128
+	shlex@1.3.0
+	syn@2.0.77
+	termcolor@1.4.1
+	textwrap@0.16.1
+	unicode-ident@1.0.12
+	walkdir@2.5.0
+	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 bash-completion-r1
+
+DESCRIPTION="Search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="
+	https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	BSD MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+pcre"
+
+RDEPEND="pcre? ( dev-libs/libpcre2:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=virtual/rust-1.72
+	virtual/pkgconfig
+"
+
+QA_FLAGS_IGNORED="usr/bin/rg"
+
+src_prepare() {
+	default
+	# unforce static linking on musl
+	rm .cargo/config.toml || die
+}
+
+src_configure() {
+	# allow building on musl with dynamic linking support
+	# https://github.com/BurntSushi/rust-pcre2/issues/7
+	use pcre && export PCRE2_SYS_STATIC=0
+	myfeatures=( $(usev pcre pcre2) )
+	cargo_src_configure
+}
+
+src_install() {
+	cargo_src_install
+
+	local gen=( "$(cargo_target_dir)"/rg --generate )
+	newbashcomp - rg < <( "${gen[@]}" complete-bash || die )
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins - rg.fish < <( "${gen[@]}" complete-fish || die )
+
+	insinto /usr/share/zsh/site-functions
+	newins - _rg < <( "${gen[@]}" complete-zsh || die )
+
+	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
+	newman - rg.1 < <( "${gen[@]}" man || die )
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index ebc496f28bee..9d070ea50a5e 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1 +1,2 @@
 DIST rng-tools-6.16.tar.gz 67401 BLAKE2B ab1a84c9a298e71ea5cdc1e91004ac069199a0128ee9701b1b3e24b6c705c63a642ab3db260a2c6c910c185e8fc75d5775caa3b7c370f102c75fac496e9bca17 SHA512 f4155dca8a54f47227f49ccf5f8453ddd50bd91a37b3b1659b5ad02278ed119028cee42918dd48552c79e19f2e2477277a41afa8e422395b2778b17fab09484d
+DIST rng-tools-6.17.tar.gz 69979 BLAKE2B 4e5a654369ef21ffe19c50fc60bb0242d48ee91c9ea839cde18379aba01fc3648019c610526a51d75094578e25f94a4aa23566bb2dc723b2ff447b9800bfc03f SHA512 fe874e578c0d5916c271ed5a96b87ed8bb5ce4238cc158471d390ca32864959206b0657dd5910ebb0730a3987f3bf9656690759f5a910d1c4a5891a27678e60d
diff --git a/sys-apps/rng-tools/rng-tools-6.17.ebuild b/sys-apps/rng-tools/rng-tools-6.17.ebuild
new file mode 100644
index 000000000000..d09d31b02b80
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.17.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="jitterentropy nistbeacon pkcs11 qrypt rtlsdr selinux test"
+REQUIRED_USE="test? ( jitterentropy )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/libcap
+	jitterentropy? ( app-crypt/jitterentropy:= )
+	nistbeacon? (
+		dev-libs/jansson:=
+		dev-libs/libxml2:2=
+		net-misc/curl[ssl]
+	)
+	pkcs11? ( dev-libs/libp11:= )
+	qrypt? (
+		dev-libs/jansson:=
+		net-misc/curl[ssl]
+	)
+	rtlsdr? ( net-wireless/rtl-sdr )
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "s/sleep 30/sleep 120/g" tests/rngtestjitter.sh || die
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+		$(use_with rtlsdr)
+		$(use_with qrypt)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	RNGD_JITTER_TIMEOUT=90 default
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
+	systemd_dounit rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EPREFIX}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index a4059c272e87..adb016fddad7 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1 @@
-DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f SHA512 f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443
 DIST s6-rc-0.5.4.3.tar.gz 101738 BLAKE2B fbf69bff42c999af063810fd92467de5357d9405dbb3767064ab1aa12bda1262f5622884a1d547ca4d2c03cb9714f0f53acc4389949c65f606780837dcd0ccf7 SHA512 7a54a32ea1261de79b9494adde74b50dbefce831f5a00f9d3772c9b64fd71918ce54a16dff828de0fb762633255226ca935357f9f31c4264716b7041a5f5f8bb
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
deleted file mode 100644
index c1c9f919cb9e..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.5.4.2.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 optfeature toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-lang/execline:=
-	>=dev-libs/skalibs-2.14.0.0:=
-	>=sys-apps/s6-2.11.3.0:=[execline]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--libexecdir=/lib/s6
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/execline"
-		--with-lib="/usr/$(get_libdir)/s6"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${ver}" -lt "0.5.4.0"; then
-			elog "Location of helper utilities was changed from /usr/libexec to /lib/s6 in"
-			elog "version 0.5.4.0. It is necessary to recompile and update s6-rc database and"
-			elog "restart s6rc-oneshot-runner service because you are upgrading from older"
-			elog "version."
-		fi
-	done
-
-	optfeature "man pages" app-doc/s6-rc-man-pages
-}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index d9fa4f53f2a4..c48efd2109a7 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,2 +1 @@
-DIST s6-2.12.0.4.tar.gz 255314 BLAKE2B 4a7da37affdc2d0651da905fdfbffe897709cc6f2a4a36453f0a87c88da66adb307805b9f8c850813186ce51c18ed07b8a95aa34a8a266a5a24b3b8646b19485 SHA512 dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56
 DIST s6-2.13.0.0.tar.gz 256126 BLAKE2B 08c20a6e2268bcecea39f7066f8fcbb61723c4c0ae3772af5362b68f53ed65494b824827779d44d64d204688f03634bdd079f08def5b41a5170d88888e2fbc8a SHA512 b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d
diff --git a/sys-apps/s6/s6-2.12.0.4.ebuild b/sys-apps/s6/s6-2.12.0.4.ebuild
deleted file mode 100644
index 53c17e66ea22..000000000000
--- a/sys-apps/s6/s6-2.12.0.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 optfeature toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~mips ~ppc ~ppc64 ~riscv x86"
-IUSE="+execline"
-
-RDEPEND="
-	>=dev-libs/skalibs-2.14.1.0:=
-	execline? ( dev-lang/execline:= )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--libexecdir=/lib/s6
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/execline"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-		$(use_enable execline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	optfeature "man pages" app-doc/s6-man-pages
-}
diff --git a/sys-apps/selinux-python/selinux-python-3.6.ebuild b/sys-apps/selinux-python/selinux-python-3.6.ebuild
index bf587f6db97e..0d7aaa6c015a 100644
--- a/sys-apps/selinux-python/selinux-python-3.6.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.6.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild
index 16191f0518b8..1ab3a996077c 100644
--- a/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 6f2d5059e879..548bc77836d4 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/shadow/shadow-4.14.8.ebuild b/sys-apps/shadow/shadow-4.14.8.ebuild
index d5851b0c5875..d43ce3e1a7f8 100644
--- a/sys-apps/shadow/shadow-4.14.8.ebuild
+++ b/sys-apps/shadow/shadow-4.14.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/downloa
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl audit cracklib nls pam selinux skey split-usr su systemd xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index 9e14eb5787b8..f4be7640f5a8 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -1,5 +1,6 @@
 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.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
 DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f48e7d4f1a7b9a828083f5bb8747cdc92aee66f73251b19195bbdc1f65aad992632e820d86cbeff287d598257ae3628a6 SHA512 5e5b0e23e1f5b259e5d3746e3e05817af8dee95af7105ea775a5c1d69b4e537a4d6a25e2c1d46ab83e2385217b158f7940dc1315ae581c35ee23289647105e73
@@ -13,7 +14,7 @@ DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4e
 DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6
 DIST anyhow-1.0.86.crate 46741 BLAKE2B 21b1f3acd1c1b659e6e9a53693178de67c806d7dbad30dedea0fb7078b2388baa196d1e7240a7dc88ed9dc93ee4c00bca8e608dad1b6bfb5bfa4f4c5ab51f0d3 SHA512 3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a
 DIST argv-0.1.11.crate 8683 BLAKE2B 44344e0f3678b159b64d06287d58508479831dc0bd7b044a1ccaebfffdd9023508da5d86f3e6d8af8579cf5351f6c8963581af978ca46bb0b87a37c1802e67d8 SHA512 011e8d5333b305387d7667bbcd4d3e694fb73d16ba4c51a10969d5dae7a7a4286f8583c160949fc2724c56c7d47c618813d0dd55c42665c8c2d1cccfcaf414a3
-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.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST backtrace-0.3.73.crate 87617 BLAKE2B 585eebbb44671dfb3ff088092f62c7b25118ffc34e148b9b6ac67707923254ea43056861e2658c5fac7b9ed16fa56c30e7734e976fc3178f1fc03912d1d44c40 SHA512 dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -21,24 +22,21 @@ DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2
 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.1.10.crate 82159 BLAKE2B 81168fd673e065a3ecc5b3aea8b288c5353bdf5ff82e9dc1c0970225ab7f51dc2be00bc977690934af1df094f89c7e57e35702950849a9a2a07b1876ef950cec SHA512 8c72753166fdb0d9d4b326938c5423d996dac82b5af65c8fb16734bb3ddbbc31a9254a18f1ef5f06a770261ab947d06757acbc60af9486496d3562dab30b3733
-DIST cc-1.1.7.crate 81694 BLAKE2B 95f2a266cf4c42cd4212cd07c0fc436400affbacf66c4a089359fcef4ec5c51c727ac6f3876515ea3460076898a0e03da6647ed0d2e67bee5d151194dd47da19 SHA512 2c3b3d99b292ba44b4805f4a77daebeae054267755a08b1a2d5583f89ba1cf01b42e9393279c8f37f64998fd14c9648dcdb41fa5b2390c3c4442afb484f624ef
+DIST cc-1.1.14.crate 83005 BLAKE2B 777ebbe65b71b62e435b03e1749ebf6ce4664b07dda1635c454a59d3308fca0b27937b53227010ed1a7120ae7b21336e9481a4a08942e5a27e3a74bfbc8380ef SHA512 acc5b071c7be4ea1e70609574582686363f9811e03029857cddb7c6a6d4e01c32fc71bf50ee3d7da8ba88c0ed2ac4da7f66963dde69ee3ecffbf52ae1ba88c4a
+DIST cc-1.1.15.crate 83085 BLAKE2B 14077692d5fc47afc59b44227353aa24d91708fecd316b058e553940e6a9b6c8f148115cde2b7d6cb2a3462f487aa3b45bd670a2beab03f677e4bf63a06fc3f7 SHA512 2f1e4f3a4dad3638f680448520e218e3c984a7c13c3984d620949a9d3c4f13d68b3a0749997dace1e43faffe3477ea15394bd4e32a959bd56e3c35c27a4aa4de
 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 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.13.crate 56267 BLAKE2B 233f2fb4405ee2ff669220214c13b6c94858dbc375c8bf7eb83d7488690d74ebd8e1514679e02d1354b493b6e37fd7ed4b2ae32065d115a7287014aece90c2af SHA512 dd1a42ad3bf39463966c2ef76f3ec2dc5a847160bcd73de1718bd6706790f1ace183e3c9e6ee8d06f6ddea4b9bf30c884fa97d36b44f30dac26a85a52d9a0025
-DIST clap-4.5.15.crate 56612 BLAKE2B f5f34a6d3e84731de7dc1b54d8576e8e9e573fa1381e9bbcba8e2b66f8cc693ce51c7a876c34705ed705de7a793bfd2f4922fb86f8764adb7a4dacd03af06ff7 SHA512 a0bd102065cb29eb565e65408ce5bf37e3404b7496959614d10ff2f9bb2e29c1abf8f5a3716aa85994a49bce4ac12d63586c8ec8187c0d3a6f696a4804fb446b
-DIST clap_builder-4.5.13.crate 164093 BLAKE2B f938635782ba9c1a675bc15a73a36ee7f1cbee501dd10be6f267364fde125c75474e5abe226e0eaf0c9fb224887c65bbc1be4641ca093282d3042f9980f4ab94 SHA512 ab7a29b29a15d22701550fc590ca6ec256edf03828e2b9a87072734a8f66b6e5a1843ac2ee7856c62472960af4e8f40840f840adb78ce5afca918f333e0f623f
+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_derive-4.5.13.crate 30132 BLAKE2B d5fcd2c5a213817165c61ba2071fc6424ce822e4881686556b8379fc71188f60d8c6712f6f4a8e5c8b125b58d7454aa9846214caf324fbc93300abba240bea17 SHA512 2dae32bffd91de9311d94e2be0d990074cb2e2edc832f422cd5e7c5177f5daafc0c335e74f865024c77cae5fff631ddaba58028fcfc24b203467478fd473bbf5
 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
 DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
-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_affinity-0.8.1.crate 9604 BLAKE2B d152c87a9af6df1ee54f2b6268549505e480c953ad0b1d729ede4696787e89284e656ccf78b68a94a48926ad76dfa807b3b4b975116fd2e5d9850acc79a29d95 SHA512 576bb880ccdf875a736fb154e458e044e2e5c9d8fb8d00e645daf72c59696db09339360f4f6ac4d8c75d8eecc48c3c740c964e295484414ffa73171e0c92239e
 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
@@ -54,18 +52,21 @@ DIST darling-0.20.10.crate 32031 BLAKE2B 038c2a4d919a8e9ff6eff5f83911b40cf4e918a
 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d
 DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52
 DIST derive_builder-0.20.0.crate 36563 BLAKE2B 753f2a7b1ad37e4b0cd94fc032109179f559352d5d754c0258a597c0b5f819e3383a30ed5c9414b24a4b12e917f41c23bc01554727d06f130f4bfceb3a952c51 SHA512 3fb085259b8219d07c88a233c1aa0e586f6c6ec31c302896c3d2900a062a2e27b4211023f544bf139df3f4f6157773f192a96d9f1e980bf1bb7bd2125d5a7605
+DIST derive_builder-0.20.1.crate 36977 BLAKE2B 30a7d6c8dc8fb484a08bedc3d06d56a5b5e7d94f2f5310b3a9d43b5a81661ef59a7cb94a164e9a0e27c1d4be5eff7d5607def1464711f27355043c2894908561 SHA512 1464d6a3e941b6dbaa77b4b7cc45260a05567491fe9567511f5561ce4a94c6cb7a7e3a4b9802ebbf7b1b3ffa39253814d3171e350058c17038e1f0e4dfc28efb
 DIST derive_builder_core-0.20.0.crate 32579 BLAKE2B 409890428e291f60a22ee0138cdc1a80498c26607e576a93d1d23c9def454c723b2e7a21faf3261dd106d62dff83123ebd76c3de8b2a7e7ff0aa9e700720acb9 SHA512 b4564364bea1c98563c7ec8b0bd99f260cc2b382a3a8f1156d401c57383b815a4a54e3e5f2446ccb2665eae600d6528faddf31d0f65678a3e5274073c2334073
+DIST derive_builder_core-0.20.1.crate 32295 BLAKE2B 6ed1d78089795d41c6c486813f525199088b62ccb27270e81b7ecaad2f1f2cda31838e6eba464c762ac8850c8a598d4b0392d13acf119279e7b6804fad751637 SHA512 f1c80ca9b772530c960f48aed9c8974cd64ba6eda41576fec548c780e9a8a2a1b2951ac0ea7be7edc932fcba72eb88f098c6713af1f3ff37c5d0b016d9db20a8
 DIST derive_builder_macro-0.20.0.crate 6308 BLAKE2B daeaf30f4548ce0796df99920515a1e6291faad80ee9aabe6849354a942650b5903c744daad5cbddb4bf8dd87542b773eaa1989783f5e19c69b4db61786edb16 SHA512 1239bccd3f752c641782aa99d14de0ee92431f46be8b98861cc416e304b03dd18ec875f592d94093189b571592d9fb10b322f7dd205f90b84574e37d38869a1c
+DIST derive_builder_macro-0.20.1.crate 6363 BLAKE2B 6b614f3d27140eab4496719fe2f46878fbba5b05153e61e7e406853a910873a811601a8937c9c5785cadc64eb3dfa758b098ab9328009c7bd8a455df63a95c31 SHA512 5550557f6a9e58e0292bb5ef68a0cce81a8b19fbf50cc511cd5c6519e5187420e20ea98cdcceb870595bd1383688df2c2dd8f6f3cde42df6e52f962bf67bd3fc
 DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1
 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.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
-DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
-DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
+DIST expiringmap-0.1.2.crate 4347 BLAKE2B f6a796c42b2873fdac21fdfc4cf3a756cfb7cc099537590b0acfa602b8774ebf3eb50e77c8731d65ee834676708526f4be3f40dc75c8c8bc44af9ae83ac57790 SHA512 3873652411eab7e1164e4c70b7c8d09b5a722f9b22642eb61b6397085bc61291f0ace840ef8c5ff70c25410126bda5e9fd095416a4604b7032bd6be151c475bb
+DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e
 DIST fixedbitset-0.5.7.crate 26537 BLAKE2B 48b7e02d7fa3fb33f05fb2de50a829e2f25d19ac680d59c754faef754ca4678d1671fcdc66d06c39b51b4f937bca44a89b87da195e43a4a905a0d29fa95996f9 SHA512 320b1b47a9f93590f24d5c111c171c401f15a50dc29617c8715b6c9d0b3f26e17f966a87d8628661dfc62ff8dee98524f3b6f4f4391725b1b77db714eb6eef60
-DIST flate2-1.0.31.crate 108176 BLAKE2B 2b0afbeec9ef08e54bfc572d7a386052d519d5bdeb220a316b67409403d229425580e33991f0a98536e6468f0e59ca87b59ff2d00425749336d4e68906d5d787 SHA512 b211254e15b38663f080552598d61d6766d6e7abc45cbac8fbdb5af65b833d2d3fbc00b5748ee12d4fc71726ab84dda9da20b6916121735c7b1c6c9d7a09fa61
+DIST flate2-1.0.33.crate 108838 BLAKE2B 9fd23b3b0a75c29f750c873f74de8565f0d8f3a574c7d28e11d15e6c3c4686c42ba98b5769a08c21f3b9c6ffe7140196c3e7001153ff5a046ee7af40f7f6d965 SHA512 59a871137518586f1d66810528595acad5ca763ec5acc100098a372194f55f33b48e59c0806fd237c644a6d797b5deb26c541fa871a1194ee3ac725da3b6d134
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e
 DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
@@ -87,6 +88,7 @@ DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a82
 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 hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hex-conservative-0.2.1.crate 25440 BLAKE2B 1cdcd4a7074f4dd4db8512023552b526b51ceef8f506b581159b9c5b8a47d5c8c07d63369da10a2987f8a84f2a74c4521b2b497f5bf125b76395a86d60475119 SHA512 a1f15f80d2775509c8e6b00b58795eaab080604bf913a28d0a93f9dcd4e0dd16bbde7df04307cc472ed017172ad2561eac27fd51bd38d47978c954041a0bafc8
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
@@ -94,21 +96,25 @@ DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152e
 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
 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.3.0.crate 83027 BLAKE2B c42cd83845923e68f9035de2d0645dfd5f37edab8b5f076c5d578867e721403b71cc48c5a68166e03688be96995c73cb81d0f2583aae8e24eb554a432854cf84 SHA512 035f76873c8f94dc0ebf8e2cd29c157135a1a6b5fe042997bd30a928227f6257a19dfbc43ea9b50cee425fabdfbe0ef6704627126ae5cc937855d6c91fca0958
+DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
+DIST indexmap-2.5.0.crate 85919 BLAKE2B 766da0a2ddc406e3fb1a70a0bee00141045ff72b52cc412adf05972ccef59d416f502c429dada111461cb522a5c442087e01d8fb235c2f1fd5493adea00e79dc SHA512 c4627d43b1bc5c5fd64861d1a7ed66255ec3f790367028b2758a40751286d6677da7170cfb04dd88ca4c2d163df621583d2e0dc4e9db6d7ed9bd0cbea42b1729
 DIST io-uring-0.6.4.crate 55060 BLAKE2B 3c65b0676438353c10eea2a987c58ea1808812e32bf938edf12e579586bf80b5242d1115b4dda6b9e47f47f865b3ba3e2a5a1a70b0beab42bf1a05ee98656418 SHA512 a2135b58b370aff3cf75079f33fddd5d4d2dc5d0b93cb69d0f43e97586daa18f3ae1af48b9efdeb52e74abc6697437a5d0cb9986488c0cf000a0d8279fc2a394
 DIST ipnetwork-0.20.0.crate 16556 BLAKE2B f6da9b2283241101279ba510c641a287107b2c27ebfc425af183ca342e4c049915aae2a2107bcd7e8349a47e07ca1dae118194acb71b7b756a36f498a6c67f8b SHA512 a8746f25abb73820cdbaf758f537c726bc9f48afa82417361d54c41bf3b86077e5901135ac5e305e2f669f093690ca518c811c89793d107b3deb139861462978
-DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
+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 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 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.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST libc-0.2.158.crate 751340 BLAKE2B a67318ab24bb86c4df682cdf846d51f5f0a69504567acff43cc6e724f2641521945dc75dddc10c1c265fda960cb28b528575b5d39ce321073844dbddbc77bdb8 SHA512 c2d90d58480cca3464db475d7c70cd66bc1492239d8183038b48def8f5d8a437a1e2a2f084cb2bd9456889221b10aa07981cd5e9bcbb6bea28a2bde3c76f1105
 DIST libcgroups-0.3.3.crate 93697 BLAKE2B cd237dc5177c7112002ba9fa6b08b7438bc0d77cf556a0716e031c4deacc646c35f61bb0c6f842c243e78cff6e52e69827933d61d242073ae79958b05a16149e SHA512 2a64c1f0408fadcd0dbcbf33b27246da706542cda61b4ab1dc4d26ad10e4494830ac292cfd9ff26ea74d8452c26bdc174a5425c5111c4021eb4aacd24e6961de
+DIST libcgroups-0.4.0.crate 94781 BLAKE2B e4a6b73774a08d8548f0e757dd6e571cae9c1809f3dcfc96da0404adbfbf63d454099f1957e782bf519ab92e7f75f78bcba03ca6478feb8006f58b3ab234c3c6 SHA512 5cd1ae9da27548d02a819e75dfd3f3d22a5f20231bfc831a32940e070c4080c7ef92f4a0bbca631c6e2394ece85b30f6a627e86cc525d8c9e415c820dc03b2aa
 DIST libcontainer-0.3.3.crate 108873 BLAKE2B 73e367d4e1092fbd96bca5d2fd114b48bc8a83732d895802b6bc78e38b469a10d6b3bf050f4361ddbd9e9d61304feef97669eb00a0424e540ce60bd682ba6cb8 SHA512 a4a3e87fc17911567d2fcd1de6d8d63fc27b669bab624a3b429186cac1bc780b96e4788a58adf85b1e22150c7ef14d4a65c700db7e62825bccc8b3bff2de4586
+DIST libcontainer-0.4.0.crate 109717 BLAKE2B e625e48220a2c4f7a358dc8c301435ca2f3a3392a1e7ed5b3ec8b57d785c135d3f0254375529fb54bf494a12ffaf93389dcdff55508ff500c74fe0c16fffb475 SHA512 b099277b49508a670372280013b9c2d22270b4ad9cca5bdd091ed4e1fe27a5ea107f96bb3db45038a85614eb88a654e3e9b3f3e4d7d0b78dec48ce5cf45764f4
 DIST libloading-0.8.5.crate 28902 BLAKE2B a0fca8f8876092e874964b3dcbaacd417451704fc1d687669a95a0b9df22ccda73a754118ac0bd706a7c7d86e4eceb2ad012e20e341d71548b34ea8d629bbfdf SHA512 f332884fa75cf210460f4678d45091345b23469c09301614c476e95bc54163afd6d4f098a34f9e0d529fa1ec63892395b50957598070ff327743e4c3b0871074
 DIST liboci-cli-0.3.3.crate 9387 BLAKE2B 33b8c40b97cc683050c0743310f8d2502f056bb9524e287818b39fb9420db46d9c1d28a43e50eeb0a173f5ea2d69a17b0b6608b4198c7a4c68d641acda512b91 SHA512 f4b021fbf60323eab67d43ec2b5798ea4b9350360602b9cd2016f43e416521a39dffee3a0cbd10e3ce6932bf06dd8e7f6cff92f7a5cfb55347ce7e69e6b07010
+DIST liboci-cli-0.4.0.crate 9431 BLAKE2B 9e4809e508eb10d59a13cf9ce417a8bcd6a28805040953db501828c11c171cfb544787e66a81a4be96ab8dcd4049687efd60e635bbbe4be63441a9279cd745dd SHA512 c71c134f9def6458ba12a2bf5f62c25bf2e23bf076633848525c19f06e39d8d639e2676dfbed0993bf42e8d74eaa98bd354aa14632d27efc6cc304c91495162d
 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
@@ -121,16 +127,20 @@ DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1
 DIST mimalloc2-rust-0.3.2.crate 5361 BLAKE2B 98b07f982f68c07beebab7a775994cc428a2ca9bb851cbd312d3a93feb73d323ebe192d8da5d3a813ed1dab936ce93c4217ce3a3c7663e5671fd78ad93cc4ffc SHA512 2b3a14971a975308ac9a922f0f5fafd6906cc6335dd859b8f26e12674c37b86126c82480c02562a610e622c91297302b6e4548b05da5bb60c86d67c5f678ffee
 DIST mimalloc2-rust-sys-2.1.7-source.crate 166651 BLAKE2B aecb28d3e9443b48932b0d7e4ce5be7e98fc70404f350d050b0ccea5966dcc97d7b50e33856b4a7391884a693893b6080911556db5c417a67b9a89739a0dbd5c SHA512 dc272cc4c7874722d81acb5ef2bca409d48442527ee914c503bdb7a167f9f53421e3ccd36978f9ff9eefe2fcdd122ec605098d237be35b28712eecb2f8ba9f86
 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 nc-0.8.23.crate 932047 BLAKE2B 98c0178b1060ff6598a4afede9934810a3761a1634f8166d6b4adacee26562b15e994887a8dfb90cd29f8499a460b2b5ddb6a57e648d9de9c96fd9218a9034ed SHA512 66d7e2274ae0464400576728d55479afe7a925abb71c826b75bd0e6a652d632119576221cc71033d02218f3d95ef67a3a95263d82c5e48ac8148aaae3c365299
+DIST nc-0.9.3.crate 1052173 BLAKE2B 0097995d26018bce53c04be565f7231e9b957b7fb2a27771a7487dc8d840048ce38313d969727fd6c309669b0969ad9ba19bd026b647394bd3d7bf80f0fdc530 SHA512 46f7c28ef90a485f24ffacb868212da366288194b1d5c640afe262cc71bc0ea2564e95676e15e3abc008cfa392412f08dd815e2e16e838b671b10e1c76269f41
 DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a90c34160f4d143e9c297a34a2ee72e9de3a48bd3418657fbc9bafd09b704ec15a42b16b3a4187d5304ce77 SHA512 7b35a0f87427eb1b5e1480d7daedafea4609b7f3a4fcf48ca99bdbc2f150865996539f2c51c7ae6a6a13169614681fc838efb306994b020d44b45735a7380010
+DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
 DIST nix-0.29.0.crate 318248 BLAKE2B 3a13a88375a359cf77b28d7f77f47f178bd31ef74b7627b6701bc6fc601024706be4e9ac1a076c7cba26b64d3bac4de17aab45fe3c045aa7a36e2d9232e872ca SHA512 86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f
 DIST nonempty-0.10.0.crate 12661 BLAKE2B 6d86e3a3b7dd0eda0f9485cedc61f6450d2a6176af5841272b455205f64abcf64d846c457cf233fe4dc0328bd0ab03b713397faf13056e515a5322ff228f03a2 SHA512 ae8c00fd056f8f2a59c7a569c922ae3188c337aeb52531fcbc315ce51787c89ee907eb7039ff96cadada0909610cbdf9a3b6604be6b894878a86352c3d475adf
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
 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.2.crate 324577 BLAKE2B 8e2c07215088639aa2727ea2ed0833bc6634186fcb4b6accf725059a20fde4394789b88c314b19483fe240b73fdcefedaccd7afcae529c658724083b035536dd SHA512 f5adb662c0e6e184a75c14181d70f3c9d8d6f4002fcb9082863c9c7a28f36d35464168c7447e63316c0227d38d92eec73240665afdecfa574eb625b040854ef9
 DIST object-0.36.3.crate 325288 BLAKE2B 0701822a51a82a1674514d7572c5f91bb40834e23d40b0fb440d933221e8256b7eb36711e8b8870d866384774c7c1e36b89363d7f6bb94af92f9f567f7aca211 SHA512 2f8175d757a66658bf91234d6a58905ef9a410bb19973e81bdd8b28322f6865e32f5b9cfd0ad38195cb07b2721ababf240876270f39a6c7ab8a36a127dc18f0e
+DIST object-0.36.4.crate 325802 BLAKE2B 1eb4fbe0cb2882a5371947234b4421b224c40a61cf71b994ee53074d70e010ee9b30638290ae89e14a9c6e1e339001852dbfedd4d740c642415c58327d121a76 SHA512 b929b3ad9ca32a5830a2ba103e6e14419b145c324b834b453d53f3cbfb5181246b2628baf5fc668c449f5337411d374b56abdd4d1dc4a744f65aaaab284bf77c
 DIST oci-spec-0.6.5.crate 59030 BLAKE2B 5df5984dce5c5be0aedff102b9ac4e6f183267de5ce07b6688c69e8ceb92c9acd2bac4780d6bc68598fe0cf0e564c2176885f2f164abce834f83808b85de40c7 SHA512 8288f95f6e903e9d48e717a569165512f4f545fa05e776f0a2509a0fe780f4adc3dfb8d51c5ee8eb9bbb7b6cb598e6ad4419c2b2228e7eb0e0324a193a618455
+DIST oci-spec-0.6.8.crate 63061 BLAKE2B e209ac8e919c298e13f5e32b6bb6d9961ae5f700426242436851e6f705e4b6e7531def68f794b9ffb3572eee38814341030684deb0e22ec0e9665957123283dc SHA512 54bc88e9d003ef34f327e55f59609df874033808aa0482925ba477f3cb123f2fe728e7597e3164448a0d6f9172ee65469c4a329104284a44b36cb8b8302e132c
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562
 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56
@@ -138,7 +148,6 @@ DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a
 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 petgraph-0.6.5.crate 710970 BLAKE2B 7f590e93fb44f1bfb8920e512402edc1cb087ff9d5dac7bc4be965f64ffacf9c1c503eab4156cd2005f41099f6b34f51e49b21dfa217271fcc0d4ee16ae85366 SHA512 454e9805731374abf1085f1a8a72aaed85e83cd30ab9601bcfe0e46882ba6656242284bdf32b6e75c2f5ebdd1325d5f8873d5f720aabf297822ca97311afb677
 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
@@ -153,10 +162,10 @@ DIST protobuf-3.2.0.crate 211054 BLAKE2B e49bb3ad408fa83512c136e44e04a266962dd3a
 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.2.crate 39340 BLAKE2B c67f884083beff400279826a7f30adb55f677482ecd92ff5790d5cc4bcd5165c4b326226fcd43eb87781d03e0567d4908c7943beefd2e00d41c034d00e084dce SHA512 3b3b65eaee8a427f1d50265fc137f8e2a8e3f8bc97f34571f27a88e2d7b0a911aecb412973196917bcacda96ed7a502d155d1b25f41ed87f7d39252e66671746
-DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
+DIST quick_cache-0.6.5.crate 40283 BLAKE2B 344a4442016d6a4aaa2187a06b037d5c7003e72a62224858b5ed00ea866abc7df487670f5647e362abd16bc0e0c3fd4caf6f86fed381db7d7c1bbd7d7f51c80e SHA512 29c88b763cdbe494116f7ff0e07ead28edd9f1e5d09f77487c1e32fd9964b58b1157f90f7c3dd34b94d693976ca08157d81221e9e2d482af934c1bf6b86befab
+DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 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 redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9
 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.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
@@ -172,6 +181,7 @@ DIST rust-criu-0.4.0.crate 31256 BLAKE2B ae9f2ab330fd33e3583b3ecfc2f2d901a3febd8
 DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8
 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.35.crate 369206 BLAKE2B f52d40dce187c8712fe8dbeb0fb8c338656f5d9bc92b7e886bd93008732462e8a2cb64f64825e9fa8ada41054f22bc2a0eb2b9c32c856c89d6d572f9eb9b894b SHA512 0f5367d596797f5719a154e0f929b24db8c5f2b92b3ed4772b89e11663beb0b3fd6447e1ddbde32bb2507450ca60504ba0ba6b4d58510fc64dfd70e5099ccdef
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST safe-path-0.1.0.crate 10966 BLAKE2B c87dfd71f93df7e5c81dcaeac41b74fe282a8e8c8cc990cc6d876957e198ea8dc0c06e73f8b27699239d3012ac250520dc08ef91ec20080306d0a6a616bff7ca SHA512 bc673dfa28380208e239c1d2ab7d8b0ca174f7b124288ed6779ed9d257dff1f16e1f9c2a2a61ff69d131024f727ec17147b5a651933a7c0ee5f9126b11aef79b
@@ -181,32 +191,28 @@ DIST scroll-0.12.0.crate 24145 BLAKE2B 93f070ad4d0656b6cbbbca78d27269e8fd5895c51
 DIST scroll_derive-0.12.0.crate 4693 BLAKE2B 957aa96820cf40ea49562dbc12a419c7b8b06bd94a759aa5494f4ea4fa08a5f154a7dba8acc3d8bd41c1a2f259bfdd2d3f4b4dfd3dabfc30fffa021b4aee4930 SHA512 db2ede0f6d16783915f5f155174fc0cb700cd054a0ec54fddeb899f74da4dc2ad5acd6f0784701f93a95a42cb04c82e7a7de9680ba0fdaf4dbc51a2358610bc2
 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.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
-DIST serde-1.0.206.crate 78250 BLAKE2B 004a4e20d1749469772e21948e2818d6c9b138164fb2cb71d112458870cf39bc414f405a01228e193d356dd858e8d05d0866feb515c5cb5770fb6667985f9336 SHA512 f8eeeba71f18e56c6ba93634339eb91b633d49f249d593794987c94a30977c2b55f981cfa7344b2e6f687c63ec5a76da7fe13bd3d758484e81edfa94e5731b15
-DIST serde_derive-1.0.204.crate 55871 BLAKE2B 8f0cdb244a820712d557a3273e505c4461f4d7db89e8394040b4c66ede787b6b38b4c9923b38959ab4042c9076b8af72008c0dd15ac93a0ecdeb99da8fb526ae SHA512 bbb2b5e60e2af5bc7528b937ffaf0d3ffd433dbd9cb2592c1e07090620309057e4f11cbd6112fc1d2c5557e1bb3c0f4d59eb06ff06fa021ec683ab880997140e
-DIST serde_derive-1.0.206.crate 56193 BLAKE2B 3b6e8ab1b57459b181f73df7b53155ce4c197538dd0c9194479b1983a54f0d126f375f05aa8d9e3142fe85a1cc9caeaf8efc07214d808741a13a6620afd83a7f SHA512 8c6bf8905f6cc7fe778bfe9e0532226d683e69f052cfe0797e7d534e4b8353c68dd8520f6e09b8b2bbca7fa32b39d69b4524fee20140b375fd1adc49acef2719
-DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160
-DIST serde_json-1.0.124.crate 148160 BLAKE2B 3cbac549c58b33a0ce3c8a68626ef96d75a46416a2d5018b3ade952edf001cbf12631ed650fb1650283ac3e506dacbeb564f61d842693d640c7abe34d2ee3984 SHA512 db47594b5030f8aa091d8f84585d87f53b7115888aaa84ac364eec4a8cc46619f42dbc7545908b503191ffc0d422883935243c30ee7d356ad58c84f1c943d4ee
+DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
+DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
+DIST serde_json-1.0.127.crate 149465 BLAKE2B da5048f70a0b7594be0112efbfccf8d6575a77b324d59321cbd34d355978aadb2ceea1bbcb182412547587235f58873ddd2232822f020e2db85c1599cb0bca8b SHA512 f14f5eeebe07261daded47c3cbb6d511da4633bfcc46ea1b0600063730dd4211a0c310959e4f8731a688d18d60a46f6dc1c1a1f052f170b6207877b93742a88b
 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 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 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 syd-3.23.18.tar.gz 845115 BLAKE2B 320b85c182d370788907afdd9123ebacbbb4d24cc9023eabffbb362fb04aaffa55c3dc651b5b26e1ca0aa043f9b4397ccbafc70c2159ee2b63943cb2d6235069 SHA512 76e9e825ed2a0e468a1a8e49e158b58b5e7aa114e576dcae1269383ff43794d9cde32dcdb493b688e4584249d0c509ab814059cbd5f200977614b5d8ca09120a
-DIST syd-3.24.0.tar.gz 839822 BLAKE2B 81579959326c96a911249e39525d7eab7e2a3e8044a1dfa4f932de024c57f14019ba6c31594efb0dbb263891543ae145cf49d10264a16f705e002ce69ddfc73f SHA512 3e711d6bca0b823a68f4da0326a6815de92e2c366db5e15c8c78cf9b868425c60de6fe6fcda7654898591d513d3718b8bd3f0ce3be636c6847d2222170e6d9da
+DIST syd-3.24.4.tar.gz 842234 BLAKE2B d705aa8ac99e7b180eef1ae619bc943ab376df2b725a7eb5539eed8f8063fb6b199ba7bf597dcebc7f6d710999c1883edcec7acacb3c24c42b359753e2a92802 SHA512 4d20a518f350c93b45c06a929d415ce047d2bc0db69aa8be1a0abb2698899a5faa86a2e32af9039ed15147c5db52569140fc85c4a9c1fc5a1220a9f000242cd2
+DIST syd-3.25.0.tar.gz 831359 BLAKE2B f0890432d39a0acf6a590d63b9b701ee4e1d170593f20b30a375d76e3c0835d1df82ff603bf54ebbe42282de165c1d3990f83e1d7d2b03b9ad37c04ccaae1860 SHA512 491dc2e7a5b45ddf9d818f6e842a003a24f228d7e78c8bdce4923d60d2c64e36eab3b32264e8c87e0352c3c7882c3e9ce6f9c19568556ed1245a9fe8d2400172
 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.74.crate 267998 BLAKE2B f47aa22011b42038a1db1486822335b7c2c2453de04ccd881ade8c17bab192667977b689925c36b3c579bf2086d516f2b26f48e81cdce22ed8798e2664195119 SHA512 c0b602d9ba5342aec609e67a3ecabfaf49cc81be86fb0cc8e576c1a882b36678de5b139fb41981f437fa49012c6493ab0f68a528910a10a3a86c98a22451aa93
+DIST syn-2.0.76.crate 268798 BLAKE2B 5446965c6331fbb445a313ca8da9d8e7454e31d9a36c2f595747edc65c0d2a05e9d8e4e9fb6dbb30da8264c7db36b1cea14110201bb06e40bca69b25c3f79f1c SHA512 c633b9f68e67b3cbf2432d3648e42f8d92403877a0128becd22cb108c0cfab9f1bc6b941b9cde225d8b727890e9f86457fad05b544fd07be4c01c2e60a2cdeaa
+DIST syn-2.0.77.crate 268784 BLAKE2B adf14ddc4b284ad78dae3c05be7e63a58a85a2ef16c1051b991aa278843ba7231f0da3cf2adc65eb95762d4c88b4e1440cb616c651d3bb568392bb036399304c SHA512 f8030332c3c4ab34fc1e86196eb0eeda9700e5438f2a339591a5968d8bdd3373b523dba4bd998bf578e4247e0019d999d4e9c6d062a1dedcafe18d27b6c9f6d4
 DIST tabwriter-1.4.0.crate 9951 BLAKE2B 8833c5a7f37749268187e60d95b07262e77c461ab868cd934e58031703dc0c9ea83b8757e681747900dc07eb5c8e41e589d9c37568b66ca25c95f0fbf07c8a8c SHA512 066846124e3beee816f76ed3a59fb224593537ce5807aa472fbcd0cb98f638dba6801d171b6d1026e56b6eaae6f2e873d64c190c97bbd8d6ffeffc82f3b4d52f
 DIST tcmalloc-0.3.0.crate 6674 BLAKE2B 51e898db18b4dc79b8f771bd5990fa38b9af6ec2e9cfb4e7529e09f5b847e6513c47b0b5e13138426eb21ff95bf60d2ab65e502a01316331120825b6d9a6e2d3 SHA512 a8e8e3110da6a736312e48eeda1b0391f82d04aba968a4b857db2bd5615a96e297a4ebf7ad97ca4a59cb15246f0b56d72b20454d5cbc6958d52494aab18eff3b
-DIST tempfile-3.11.0.crate 34153 BLAKE2B 3a89580e05600ff2ef5637d2ed76ad8f1a769f6dae40cbd23f7bc2cb9d0807d03713ce1571df54c866c8fd9a4fb073990e4e98cc8ffee33aa4d8343c2d39733c SHA512 47d4c48c4f90d116a2f7d5ebf29ea623fb0a0fbfb1192aaaa53a83218ac910b6c836d6d4d8233b07d06e14de70fbf30d243152b7ac22a03d180905c53b6ad9e6
 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66
 DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
-DIST thread-id-4.2.2.crate 9230 BLAKE2B 07598f1a9f30ee38f3ad08d757d3ea2f84a2a21a614a15785f4a3a1970c935ea2686ed74359ba04bdfc29963a36785743359997d38e1c921517cc8b85c376489 SHA512 f67ee525d118a41270d45de609dd020d708853a6dce4f2dbe181ccaaaaf75cc7e615bcb37c05dd7b5a9bfd08fbf1ea611fb01f7fc171c56f8df13c56faffb49e
 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
@@ -222,11 +228,11 @@ DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfe
 DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
 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.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
-DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
-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 wasm-bindgen-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422
+DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597
+DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632
+DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8
+DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420
 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
diff --git a/sys-apps/syd/syd-3.23.18.ebuild b/sys-apps/syd/syd-3.23.18.ebuild
deleted file mode 100644
index fe7644182a4f..000000000000
--- a/sys-apps/syd/syd-3.23.18.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RESTRICT="test" # fails with sandbox
-
-CRATES="
-	addr2line@0.22.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
-	anes@0.1.6
-	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
-	argv@0.1.11
-	arrayvec@0.7.4
-	autocfg@1.3.0
-	backtrace@0.3.73
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bumpalo@3.16.0
-	caps@0.5.5
-	cast@0.3.0
-	cc@1.1.7
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	clap@4.5.13
-	clap_builder@4.5.13
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	colorchoice@1.0.2
-	core-foundation-sys@0.8.6
-	core_affinity@0.8.1
-	crc32fast@1.4.2
-	criterion-plot@0.5.0
-	criterion@0.5.1
-	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
-	cty@0.2.2
-	darling@0.20.10
-	darling_core@0.20.10
-	darling_macro@0.20.10
-	derive_builder@0.20.0
-	derive_builder_core@0.20.0
-	derive_builder_macro@0.20.0
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	either@1.13.0
-	equivalent@1.0.1
-	errno@0.3.9
-	error-chain@0.12.4
-	fastrand@2.1.0
-	fixedbitset@0.4.2
-	fixedbitset@0.5.7
-	flate2@1.0.31
-	fnv@1.0.7
-	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
-	getargs@0.5.0
-	getrandom@0.2.15
-	getset@0.1.2
-	gimli@0.29.0
-	goblin@0.8.2
-	gperftools@0.2.0
-	half@2.4.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hex-conservative@0.2.1
-	hex@0.4.3
-	home@0.5.9
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	indexmap@1.9.3
-	indexmap@2.3.0
-	io-uring@0.6.4
-	ipnetwork@0.20.0
-	is-terminal@0.4.12
-	is_terminal_polyfill@1.70.1
-	itertools@0.10.5
-	itoa@1.0.11
-	js-sys@0.3.69
-	lazy_static@1.5.0
-	lexis@0.2.3
-	libc@0.2.155
-	libcgroups@0.3.3
-	libcontainer@0.3.3
-	libloading@0.8.5
-	liboci-cli@0.3.3
-	libredox@0.1.3
-	libseccomp-sys@0.2.1
-	libseccomp@0.3.0
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	md5@0.7.0
-	memchr@2.7.4
-	memoffset@0.9.1
-	mimalloc2-rust-sys@2.1.7-source
-	mimalloc2-rust@0.3.2
-	miniz_oxide@0.7.4
-	nc@0.8.23
-	nix@0.27.1
-	nix@0.29.0
-	nonempty@0.10.0
-	nu-ansi-term@0.46.0
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	object@0.36.2
-	oci-spec@0.6.5
-	once_cell@1.19.0
-	oorandom@11.1.4
-	option-ext@0.2.0
-	overload@0.1.1
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	parse-size@1.0.0
-	petgraph@0.6.5
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	plain@0.2.3
-	prctl@1.0.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
-	protobuf-codegen@3.2.0
-	protobuf-parse@3.2.0
-	protobuf-support@3.2.0
-	protobuf@3.2.0
-	quote@1.0.36
-	redox_syscall@0.5.3
-	redox_users@0.4.5
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.6
-	rs_hasher_ctx@0.1.3
-	rs_internal_hasher@0.1.3
-	rs_internal_state@0.1.3
-	rs_n_bit_words@0.1.3
-	rs_sha1@0.1.3
-	rs_sha3_256@0.1.2
-	rs_sha3_384@0.1.2
-	rs_sha3_512@0.1.2
-	rust-criu@0.4.0
-	rustc-demangle@0.1.24
-	rustc-hash@2.0.0
-	rustix@0.38.34
-	rustversion@1.0.17
-	ryu@1.0.18
-	safe-path@0.1.0
-	same-file@1.0.6
-	scopeguard@1.2.0
-	scroll@0.12.0
-	scroll_derive@0.12.0
-	secure-string@0.3.0
-	sendfd@0.4.3
-	serde@1.0.204
-	serde_derive@1.0.204
-	serde_json@1.0.122
-	sharded-slab@0.1.7
-	shellexpand@3.1.0
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.2
-	strsim@0.11.1
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@1.0.109
-	syn@2.0.72
-	tabwriter@1.4.0
-	tcmalloc@0.3.0
-	tempfile@3.11.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread-id@4.2.2
-	thread_local@1.1.8
-	tick_counter@0.4.5
-	tinytemplate@1.2.1
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing@0.1.40
-	unicode-ident@1.0.12
-	unicode-width@0.1.13
-	utf8parse@0.2.2
-	valuable@0.1.0
-	version_check@0.9.5
-	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@4.4.2
-	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
-	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"
-RDEPEND="${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+="-Clink-args=-static -Clink-args=-no-pie -Clink-args=-Wl,-Bstatic -Ctarget-feature=+crt-static"
-		local myfeatures=( "log,uring,utils" )
-		cargo_src_configure --no-default-features
-	else
-		local myfeatures=( "oci" )
-		cargo_src_configure
-	fi
-}
-
-src_install () {
-	cargo_src_install
-	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/syd/syd-3.24.0.ebuild b/sys-apps/syd/syd-3.24.0.ebuild
deleted file mode 100644
index 6d7d70129e47..000000000000
--- a/sys-apps/syd/syd-3.24.0.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RESTRICT="test" # fails with sandbox
-
-CRATES="
-	addr2line@0.22.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
-	anes@0.1.6
-	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
-	argv@0.1.11
-	arrayvec@0.7.4
-	autocfg@1.3.0
-	backtrace@0.3.73
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bumpalo@3.16.0
-	caps@0.5.5
-	cast@0.3.0
-	cc@1.1.10
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	clap@4.5.15
-	clap_builder@4.5.15
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	colorchoice@1.0.2
-	core-foundation-sys@0.8.7
-	core_affinity@0.8.1
-	crc32fast@1.4.2
-	criterion-plot@0.5.0
-	criterion@0.5.1
-	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
-	cty@0.2.2
-	darling@0.20.10
-	darling_core@0.20.10
-	darling_macro@0.20.10
-	derive_builder@0.20.0
-	derive_builder_core@0.20.0
-	derive_builder_macro@0.20.0
-	dirs-sys@0.4.1
-	dirs@5.0.1
-	either@1.13.0
-	equivalent@1.0.1
-	errno@0.3.9
-	error-chain@0.12.4
-	fastrand@2.1.0
-	fixedbitset@0.4.2
-	fixedbitset@0.5.7
-	flate2@1.0.31
-	fnv@1.0.7
-	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
-	getargs@0.5.0
-	getrandom@0.2.15
-	getset@0.1.2
-	gimli@0.29.0
-	goblin@0.8.2
-	gperftools@0.2.0
-	half@2.4.1
-	hashbrown@0.12.3
-	hashbrown@0.14.5
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hex-conservative@0.2.1
-	hex@0.4.3
-	home@0.5.9
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	indexmap@1.9.3
-	indexmap@2.3.0
-	io-uring@0.6.4
-	ipnetwork@0.20.0
-	is-terminal@0.4.12
-	is_terminal_polyfill@1.70.1
-	itertools@0.10.5
-	itoa@1.0.11
-	js-sys@0.3.69
-	lazy_static@1.5.0
-	lexis@0.2.3
-	libc@0.2.155
-	libcgroups@0.3.3
-	libcontainer@0.3.3
-	libloading@0.8.5
-	liboci-cli@0.3.3
-	libredox@0.1.3
-	libseccomp-sys@0.2.1
-	libseccomp@0.3.0
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.22
-	md5@0.7.0
-	memchr@2.7.4
-	memoffset@0.9.1
-	mimalloc2-rust-sys@2.1.7-source
-	mimalloc2-rust@0.3.2
-	miniz_oxide@0.7.4
-	nc@0.8.23
-	nix@0.27.1
-	nix@0.29.0
-	nonempty@0.10.0
-	nu-ansi-term@0.46.0
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	object@0.36.3
-	oci-spec@0.6.5
-	once_cell@1.19.0
-	oorandom@11.1.4
-	option-ext@0.2.0
-	overload@0.1.1
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	parse-size@1.0.0
-	petgraph@0.6.5
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	pkg-config@0.3.30
-	plain@0.2.3
-	prctl@1.0.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
-	protobuf-codegen@3.2.0
-	protobuf-parse@3.2.0
-	protobuf-support@3.2.0
-	protobuf@3.2.0
-	quick_cache@0.6.2
-	quote@1.0.36
-	redox_syscall@0.5.3
-	redox_users@0.4.5
-	regex-automata@0.4.7
-	regex-syntax@0.8.4
-	regex@1.10.6
-	rs_hasher_ctx@0.1.3
-	rs_internal_hasher@0.1.3
-	rs_internal_state@0.1.3
-	rs_n_bit_words@0.1.3
-	rs_sha1@0.1.3
-	rs_sha3_256@0.1.2
-	rs_sha3_384@0.1.2
-	rs_sha3_512@0.1.2
-	rust-criu@0.4.0
-	rustc-demangle@0.1.24
-	rustc-hash@2.0.0
-	rustix@0.38.34
-	rustversion@1.0.17
-	ryu@1.0.18
-	safe-path@0.1.0
-	same-file@1.0.6
-	scopeguard@1.2.0
-	scroll@0.12.0
-	scroll_derive@0.12.0
-	secure-string@0.3.0
-	sendfd@0.4.3
-	serde@1.0.206
-	serde_derive@1.0.206
-	serde_json@1.0.124
-	sharded-slab@0.1.7
-	shellexpand@3.1.0
-	slab@0.4.9
-	slotmap@1.0.7
-	smallvec@1.13.2
-	strsim@0.11.1
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@1.0.109
-	syn@2.0.74
-	tabwriter@1.4.0
-	tcmalloc@0.3.0
-	tempfile@3.12.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	thread-id@4.2.2
-	thread_local@1.1.8
-	tick_counter@0.4.5
-	tinytemplate@1.2.1
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-log@0.2.0
-	tracing-subscriber@0.3.18
-	tracing@0.1.40
-	unicode-ident@1.0.12
-	unicode-width@0.1.13
-	utf8parse@0.2.2
-	valuable@0.1.0
-	version_check@0.9.5
-	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@4.4.2
-	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
-	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"
-RDEPEND="${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+="-Clink-args=-static -Clink-args=-no-pie -Clink-args=-Wl,-Bstatic -Ctarget-feature=+crt-static"
-		local myfeatures=( "log,uring,utils" )
-		cargo_src_configure --no-default-features
-	else
-		local myfeatures=( "oci" )
-		cargo_src_configure
-	fi
-}
-
-src_install () {
-	cargo_src_install
-	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/syd/syd-3.24.4.ebuild b/sys-apps/syd/syd-3.24.4.ebuild
new file mode 100644
index 000000000000..b9d18ca17f07
--- /dev/null
+++ b/sys-apps/syd/syd-3.24.4.ebuild
@@ -0,0 +1,310 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RESTRICT="test" # fails with sandbox
+
+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
+	anes@0.1.6
+	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
+	argv@0.1.11
+	arrayvec@0.7.6
+	autocfg@1.3.0
+	backtrace@0.3.73
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bumpalo@3.16.0
+	caps@0.5.5
+	cast@0.3.0
+	cc@1.1.14
+	cfg-if@1.0.0
+	cfg_aliases@0.2.1
+	chrono@0.4.38
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.16
+	clap_builder@4.5.15
+	clap_derive@4.5.13
+	clap_lex@0.7.2
+	colorchoice@1.0.2
+	core-foundation-sys@0.8.7
+	crc32fast@1.4.2
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	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
+	cty@0.2.2
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	derive_builder@0.20.0
+	derive_builder_core@0.20.0
+	derive_builder_macro@0.20.0
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	either@1.13.0
+	equivalent@1.0.1
+	errno@0.3.9
+	error-chain@0.12.4
+	fastrand@2.1.1
+	fixedbitset@0.5.7
+	flate2@1.0.33
+	fnv@1.0.7
+	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
+	getargs@0.5.0
+	getrandom@0.2.15
+	getset@0.1.2
+	gimli@0.29.0
+	goblin@0.8.2
+	gperftools@0.2.0
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hermit-abi@0.4.0
+	hex-conservative@0.2.1
+	hex@0.4.3
+	home@0.5.9
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	indexmap@1.9.3
+	indexmap@2.4.0
+	io-uring@0.6.4
+	ipnetwork@0.20.0
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itertools@0.10.5
+	itoa@1.0.11
+	js-sys@0.3.70
+	lazy_static@1.5.0
+	lexis@0.2.3
+	libc@0.2.158
+	libcgroups@0.3.3
+	libcontainer@0.3.3
+	libloading@0.8.5
+	liboci-cli@0.3.3
+	libredox@0.1.3
+	libseccomp-sys@0.2.1
+	libseccomp@0.3.0
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	md5@0.7.0
+	memchr@2.7.4
+	memoffset@0.9.1
+	mimalloc2-rust-sys@2.1.7-source
+	mimalloc2-rust@0.3.2
+	miniz_oxide@0.7.4
+	miniz_oxide@0.8.0
+	nc@0.8.23
+	nix@0.27.1
+	nix@0.29.0
+	nonempty@0.10.0
+	nu-ansi-term@0.46.0
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	object@0.36.3
+	oci-spec@0.6.5
+	once_cell@1.19.0
+	oorandom@11.1.4
+	option-ext@0.2.0
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	parse-size@1.0.0
+	pin-project-lite@0.2.14
+	pin-utils@0.1.0
+	pkg-config@0.3.30
+	plain@0.2.3
+	prctl@1.0.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
+	protobuf-codegen@3.2.0
+	protobuf-parse@3.2.0
+	protobuf-support@3.2.0
+	protobuf@3.2.0
+	quick_cache@0.6.5
+	quote@1.0.37
+	redox_syscall@0.5.3
+	redox_users@0.4.6
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	rs_hasher_ctx@0.1.3
+	rs_internal_hasher@0.1.3
+	rs_internal_state@0.1.3
+	rs_n_bit_words@0.1.3
+	rs_sha1@0.1.3
+	rs_sha3_256@0.1.2
+	rs_sha3_384@0.1.2
+	rs_sha3_512@0.1.2
+	rust-criu@0.4.0
+	rustc-demangle@0.1.24
+	rustc-hash@2.0.0
+	rustix@0.38.34
+	rustversion@1.0.17
+	ryu@1.0.18
+	safe-path@0.1.0
+	same-file@1.0.6
+	scopeguard@1.2.0
+	scroll@0.12.0
+	scroll_derive@0.12.0
+	secure-string@0.3.0
+	sendfd@0.4.3
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.127
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	shlex@1.3.0
+	slab@0.4.9
+	slotmap@1.0.7
+	smallvec@1.13.2
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@1.0.109
+	syn@2.0.76
+	tabwriter@1.4.0
+	tcmalloc@0.3.0
+	tempfile@3.12.0
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tick_counter@0.4.5
+	tinytemplate@1.2.1
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing@0.1.40
+	unicode-ident@1.0.12
+	unicode-width@0.1.13
+	utf8parse@0.2.2
+	valuable@0.1.0
+	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@4.4.2
+	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
+	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"
+RDEPEND="${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+="-Clink-args=-static -Clink-args=-no-pie -Clink-args=-Wl,-Bstatic -Ctarget-feature=+crt-static"
+		local myfeatures=( "log,uring,utils" )
+		cargo_src_configure --no-default-features
+	else
+		local myfeatures=( "oci" )
+		cargo_src_configure
+	fi
+}
+
+src_install () {
+	cargo_src_install
+	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/syd/syd-3.25.0.ebuild b/sys-apps/syd/syd-3.25.0.ebuild
new file mode 100644
index 000000000000..320cd1c8778a
--- /dev/null
+++ b/sys-apps/syd/syd-3.25.0.ebuild
@@ -0,0 +1,304 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RESTRICT="test" # fails with sandbox
+
+CRATES="
+	addr2line@0.22.0
+	adler2@2.0.0
+	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
+	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
+	argv@0.1.11
+	arrayvec@0.7.6
+	autocfg@1.3.0
+	backtrace@0.3.73
+	bitflags@1.3.2
+	bitflags@2.6.0
+	bumpalo@3.16.0
+	caps@0.5.5
+	cast@0.3.0
+	cc@1.1.15
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	cfg_aliases@0.2.1
+	chrono@0.4.38
+	ciborium-io@0.2.2
+	ciborium-ll@0.2.2
+	ciborium@0.2.2
+	clap@4.5.16
+	clap_builder@4.5.15
+	clap_derive@4.5.13
+	clap_lex@0.7.2
+	colorchoice@1.0.2
+	core-foundation-sys@0.8.7
+	crc32fast@1.4.2
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crunchy@0.2.2
+	cty@0.2.2
+	darling@0.20.10
+	darling_core@0.20.10
+	darling_macro@0.20.10
+	derive_builder@0.20.1
+	derive_builder_core@0.20.1
+	derive_builder_macro@0.20.1
+	dirs-sys@0.4.1
+	dirs@5.0.1
+	either@1.13.0
+	equivalent@1.0.1
+	errno@0.3.9
+	error-chain@0.12.4
+	expiringmap@0.1.2
+	fastrand@2.1.1
+	fixedbitset@0.5.7
+	flate2@1.0.33
+	fnv@1.0.7
+	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
+	getargs@0.5.0
+	getrandom@0.2.15
+	getset@0.1.2
+	gimli@0.29.0
+	goblin@0.8.2
+	gperftools@0.2.0
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	heck@0.5.0
+	hermit-abi@0.3.9
+	hermit-abi@0.4.0
+	hex-conservative@0.2.1
+	hex@0.4.3
+	home@0.5.9
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	ident_case@1.0.1
+	indexmap@1.9.3
+	indexmap@2.5.0
+	io-uring@0.6.4
+	ipnetwork@0.20.0
+	is-terminal@0.4.13
+	is_terminal_polyfill@1.70.1
+	itertools@0.10.5
+	itoa@1.0.11
+	js-sys@0.3.70
+	lazy_static@1.5.0
+	lexis@0.2.3
+	libc@0.2.158
+	libcgroups@0.4.0
+	libcontainer@0.4.0
+	libloading@0.8.5
+	liboci-cli@0.4.0
+	libredox@0.1.3
+	libseccomp-sys@0.2.1
+	libseccomp@0.3.0
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	md5@0.7.0
+	memchr@2.7.4
+	memoffset@0.9.1
+	mimalloc2-rust-sys@2.1.7-source
+	mimalloc2-rust@0.3.2
+	miniz_oxide@0.7.4
+	miniz_oxide@0.8.0
+	nc@0.9.3
+	nix@0.28.0
+	nix@0.29.0
+	nonempty@0.10.0
+	nu-ansi-term@0.46.0
+	num-traits@0.2.19
+	num_cpus@1.16.0
+	object@0.36.4
+	oci-spec@0.6.8
+	once_cell@1.19.0
+	oorandom@11.1.4
+	option-ext@0.2.0
+	overload@0.1.1
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	parse-size@1.0.0
+	pin-project-lite@0.2.14
+	pin-utils@0.1.0
+	pkg-config@0.3.30
+	plain@0.2.3
+	prctl@1.0.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
+	protobuf-codegen@3.2.0
+	protobuf-parse@3.2.0
+	protobuf-support@3.2.0
+	protobuf@3.2.0
+	quick_cache@0.6.5
+	quote@1.0.37
+	redox_syscall@0.5.3
+	redox_users@0.4.6
+	regex-automata@0.4.7
+	regex-syntax@0.8.4
+	regex@1.10.6
+	rs_hasher_ctx@0.1.3
+	rs_internal_hasher@0.1.3
+	rs_internal_state@0.1.3
+	rs_n_bit_words@0.1.3
+	rs_sha1@0.1.3
+	rs_sha3_256@0.1.2
+	rs_sha3_384@0.1.2
+	rs_sha3_512@0.1.2
+	rust-criu@0.4.0
+	rustc-demangle@0.1.24
+	rustc-hash@2.0.0
+	rustix@0.38.35
+	rustversion@1.0.17
+	ryu@1.0.18
+	safe-path@0.1.0
+	same-file@1.0.6
+	scopeguard@1.2.0
+	scroll@0.12.0
+	scroll_derive@0.12.0
+	secure-string@0.3.0
+	sendfd@0.4.3
+	serde@1.0.209
+	serde_derive@1.0.209
+	serde_json@1.0.127
+	sharded-slab@0.1.7
+	shellexpand@3.1.0
+	shlex@1.3.0
+	slab@0.4.9
+	smallvec@1.13.2
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@1.0.109
+	syn@2.0.77
+	tabwriter@1.4.0
+	tcmalloc@0.3.0
+	tempfile@3.12.0
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tick_counter@0.4.5
+	tinytemplate@1.2.1
+	tracing-attributes@0.1.27
+	tracing-core@0.1.32
+	tracing-log@0.2.0
+	tracing-subscriber@0.3.18
+	tracing@0.1.40
+	unicode-ident@1.0.12
+	unicode-width@0.1.13
+	utf8parse@0.2.2
+	valuable@0.1.0
+	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@4.4.2
+	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
+	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"
+RDEPEND="${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+="-Clink-args=-static -Clink-args=-no-pie -Clink-args=-Wl,-Bstatic -Ctarget-feature=+crt-static"
+		local myfeatures=( "log,uring,utils" )
+		cargo_src_configure --no-default-features
+	else
+		local myfeatures=( "oci" )
+		cargo_src_configure
+	fi
+}
+
+src_install () {
+	cargo_src_install
+	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 0cef56bf9fbd..de2e44d3b954 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -2,4 +2,6 @@ DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fed
 DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bdb97a3cee87c076317f260147939051f24f9ee8f39dec5e38f9b2ce61ea4737422eece680c4d15dd1fdcc5f3e61b6e5ec5f5c4 SHA512 0ab39a653d42d7b58ad875176270aed93e03ba28b33616520548a01e7d06d170379f9206b4a2b280a588d4f7084af10a2a0ec7a6cb724902ddff149e512d789d
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
 DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
+DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
+DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
new file mode 100644
index 000000000000..d76d79f1f07f
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 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 ~ia64 ~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/jinja[\${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=(
+		$(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.11.ebuild b/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
new file mode 100644
index 000000000000..523af66c5d3b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
@@ -0,0 +1,621 @@
+# Copyright 2022-2024 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 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.6"
+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 ~ia64 ~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/jinja[\${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=(
+		-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 76526784c672..79ef074a003f 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,5 +4,7 @@ DIST systemd-256.4.tar.gz 15657554 BLAKE2B ac5f11a25341aae906b4fed6a66a18bbc4119
 DIST systemd-256.5.tar.gz 15664466 BLAKE2B 334f197b53b9d35e3784bcdf81af426806339250a01a249c80392c4e7cc26633a94356581fb59edb3d042c35fb80fadcc077ebbc79eac488c18469030552d0b0 SHA512 40558194e05a17b218adf3d6df48b738c866855d43d09c1e9381c2c568a44a8f1617b64476736fc7e34416ad9e8d25dc023cf9de090b4ef9079866919377009f
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
 DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
+DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
+DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
 DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
diff --git a/sys-apps/systemd/files/255-install-format-overflow.patch b/sys-apps/systemd/files/255-install-format-overflow.patch
deleted file mode 100644
index 3dca7d8e8ec7..000000000000
--- a/sys-apps/systemd/files/255-install-format-overflow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/systemd/systemd-stable/commit/f85d2c6d1023b1fe558142440b1d63c4fc5f7c98
-https://github.com/systemd/systemd/issues/30448
-https://bugs.gentoo.org/916518
-
-From f85d2c6d1023b1fe558142440b1d63c4fc5f7c98 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sat, 24 Feb 2024 12:05:44 +0000
-Subject: [PATCH] install: fix compiler warning about empty directive argument
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On ppc64el with gcc 13.2 on Ubuntu 24.04:
-
-3s In file included from ../src/basic/macro.h:386,
-483s                  from ../src/basic/alloc-util.h:10,
-483s                  from ../src/shared/install.c:12:
-483s ../src/shared/install.c: In function ‘install_changes_dump’:
-483s ../src/shared/install.c:432:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
-483s   432 |                         err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.",
-483s       |                                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-483s ../src/shared/install.c:432:75: note: format string is defined here
-483s   432 |                         err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.",
-
-(cherry picked from commit 8040fa55a1cbc34dede3205a902095ecd26c21e3)
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -340,9 +340,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes,
-         assert(verb || r >= 0);
- 
-         for (size_t i = 0; i < n_changes; i++) {
--                if (changes[i].type < 0)
--                        assert(verb);
-                 assert(changes[i].path);
-+                /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there
-+                 * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used
-+                 * too. */
-+                assert(verb || changes[i].type >= 0);
-+                verb = strna(verb);
- 
-                 /* When making changes here, make sure to also change install_error() in dbus-manager.c. */
- 
-
diff --git a/sys-apps/systemd/files/256-bpf-gcc.patch b/sys-apps/systemd/files/256-bpf-gcc.patch
new file mode 100644
index 000000000000..0570695d397c
--- /dev/null
+++ b/sys-apps/systemd/files/256-bpf-gcc.patch
@@ -0,0 +1,26 @@
+https://github.com/systemd/systemd/commit/dde6f1d7456db7aa72d24b1d6956b419b6f9945c
+
+From dde6f1d7456db7aa72d24b1d6956b419b6f9945c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 24 Aug 2024 13:09:47 +0100
+Subject: [PATCH] meson: search for 'bpf-unknown-none' too
+
+We currently search for 'bpf-gcc' and 'bpf-none-gcc'. Gentoo's
+sys-devel/bpf-toolchain package uses 'bpf-unknown-none-gcc', as does Fedora's
+cross-binutils. Search for this name too.
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 5e0b666c64b17..fbc2bbdf2f22f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1109,6 +1109,7 @@ else
+         elif bpf_compiler == 'gcc'
+                 bpf_gcc = find_program('bpf-gcc',
+                                        'bpf-none-gcc',
++                                       'bpf-unknown-none-gcc',
+                                        required : true,
+                                        version : '>= 13.1.0')
+                 bpf_gcc_found = bpf_gcc.found()
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index c9b8604a3c68..fea934417f1d 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,6 +11,7 @@
 	<use>
 		<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name="boot">Enable EFI boot manager and stub loader</flag>
+		<flag name="bpf">Enable BPF support for sandboxing and firewalling.</flag>
 		<flag name="cgroup-hybrid">Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).</flag>
 		<flag name="curl">Enable support for uploading journals</flag>
 		<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
diff --git a/sys-apps/systemd/systemd-254.17.ebuild b/sys-apps/systemd/systemd-254.17.ebuild
new file mode 100644
index 000000000000..594ff20f83e3
--- /dev/null
+++ b/sys-apps/systemd/systemd-254.17.ebuild
@@ -0,0 +1,537 @@
+# Copyright 2011-2024 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 ~ia64 ~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-apps/hwids[udev]
+	!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/jinja[\${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
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	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
new file mode 100644
index 000000000000..4ef4fdfc95a6
--- /dev/null
+++ b/sys-apps/systemd/systemd-255.11.ebuild
@@ -0,0 +1,537 @@
+# Copyright 2011-2024 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 ~ia64 ~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-apps/hwids[udev]
+	!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/jinja[\${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
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	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.5.ebuild b/sys-apps/systemd/systemd-256.5.ebuild
index 3b8464645eec..1c74d39e00f8 100644
--- a/sys-apps/systemd/systemd-256.5.ebuild
+++ b/sys-apps/systemd/systemd-256.5.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://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
+	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
@@ -158,6 +158,10 @@ BDEPEND="
 	>=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
@@ -223,6 +227,7 @@ pkg_pretend() {
 			~!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
@@ -268,6 +273,7 @@ src_unpack() {
 src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/systemd-test-process-util.patch"
+		"${FILESDIR}/256-bpf-gcc.patch"
 	)
 
 	if ! use vanilla; then
@@ -311,6 +317,8 @@ multilib_src_configure() {
 		$(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)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3b40a5319500..f11fdab115eb 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://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
+	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
@@ -158,6 +158,10 @@ BDEPEND="
 	>=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
@@ -223,6 +227,7 @@ pkg_pretend() {
 			~!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
@@ -311,6 +316,8 @@ multilib_src_configure() {
 		$(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)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 57957bf83f2c..a8ce96b667d8 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,2 +1,2 @@
-DIST texinfo-7.1.0.90.tar.xz 5551856 BLAKE2B b014bc6be130466cf2431339574e8fa02182b10638045e51d78a3cf5fe8ec402b28d758cba77c3a9a8780c62a48d5d471b88ded2c1ce0e800834c111c7d402b2 SHA512 2049a797472967bcb8955ea856916fb355b4b79b20f38c95841b2dc48c58f5d2d9d438582ed1a4a3dffad79af2f16d473276fdcae6ffc4dcb8eba09b997b743d
+DIST texinfo-7.1.1.tar.xz 5572864 BLAKE2B 64dbd315e65d5b7cb0bb06c918e9924bb15a25a4bb26322db10b7ee98e9e6626b62592f8edd0ff016256f4a84837dabacb5278c3826e34fa3e080a5e8c0fb626 SHA512 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a
 DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db
diff --git a/sys-apps/texinfo/texinfo-7.1.0.90.ebuild b/sys-apps/texinfo/texinfo-7.1.1.ebuild
index 69014441481c..69014441481c 100644
--- a/sys-apps/texinfo/texinfo-7.1.0.90.ebuild
+++ b/sys-apps/texinfo/texinfo-7.1.1.ebuild
diff --git a/sys-apps/thunderbolt-software-user-space/metadata.xml b/sys-apps/thunderbolt-software-user-space/metadata.xml
index 194d9e70626b..3903bd5d2e95 100644
--- a/sys-apps/thunderbolt-software-user-space/metadata.xml
+++ b/sys-apps/thunderbolt-software-user-space/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">
-		<name>Jonas Licht</name>
-		<email>jonas.licht@gmail.com</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Installs the tools tbtacl and tbtadm for Thunderbolt device approval, handling the ACL and more.
 		Also install udev rules to mange acls.
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 4d0207457f37..148c2f1cf4e1 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,2 +1,3 @@
 DIST tuned-2.22.1.tar.gz 254690 BLAKE2B 1942aed859425494df702a45900d6e0c26c799f19427cb1ff18160ed49cf8ac78ae3b73a39f1120a1dc5d344c3c1e61298085c54655aa13052600b946cb16a41 SHA512 160b1cab5477d84a0da89f584fe646b32162527a138d9b5957799c5f26598b98449733040710133a1c5bdd5588eee72549131ff163e777a105fc24e92edc6d8f
 DIST tuned-2.23.0.tar.gz 261402 BLAKE2B 7fb46fc8eb074779c963c8424c3e802cd9ef216ef80cd96ba8d9d3f1bc83dc03187496044d164cbc1ef6c164ee9004b2dfc6795cf6b6605cb662502f3b4cc5c2 SHA512 b7d95b17ab38ac944e6e5b8b4345ddf65120a03ebb73cdb1795525c237852a8fa4223dcef6ce28189874e5010c8076816bd3646fd7f700983f2449400a2057d8
+DIST tuned-2.24.0.tar.gz 263676 BLAKE2B e699ca612bdf9395e47c0882c8302c14a3d657299f224580cab0a9c3eda73a6a435af6d34d69d5cf9df138a1d87fcd2eb16e551427d348231322a1250de4981d SHA512 d004cd621e26195fff14b39f29b2143cf47de09641454acd3029d61142c3d000a452f018356c84c32772bd99fc766f6ee847d2a8eddbde8ae34aaa0ecefa644e
diff --git a/sys-apps/tuned/metadata.xml b/sys-apps/tuned/metadata.xml
index 30ce2dba85be..9958f255bdb6 100644
--- a/sys-apps/tuned/metadata.xml
+++ b/sys-apps/tuned/metadata.xml
@@ -9,4 +9,7 @@
 A tool that performs monitoring and adaptive configuration of the system
 according to selected profile. 
 </longdescription>
+<upstream>
+	<remote-id type="github">redhat-performance/tuned</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/tuned/tuned-2.24.0.ebuild b/sys-apps/tuned/tuned-2.24.0.ebuild
new file mode 100644
index 000000000000..7f5306e69847
--- /dev/null
+++ b/sys-apps/tuned/tuned-2.24.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit optfeature python-single-r1 tmpfiles xdg-utils
+
+DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
+HOMEPAGE="https://github.com/redhat-performance/tuned"
+SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-linux-procfs[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+	')"
+
+RDEPEND="
+	${DEPEND}
+	app-emulation/virt-what
+	dev-debug/systemtap
+	sys-apps/dbus
+	sys-apps/ethtool
+	sys-power/powertop
+	"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^PYTHON/s:/usr/bin/python3:${EPREFIX}/usr/bin/${EPYTHON}:" \
+		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
+		-e "/\$(DESTDIR)\/run\/tuned/d" \
+		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
+		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
+		Makefile || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	python_fix_shebang "${D}"
+	python_optimize
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+	xdg_icon_cache_update
+
+	optfeature_header
+	optfeature "Optimize for power saving by spinning-down rotational disks" sys-apps/hdparm
+	optfeature "Get hardware info" sys-apps/dmidecode
+	optfeature "Optimize network txqueuelen" sys-apps/iproute2
+}
diff --git a/sys-apps/xdg-desktop-portal-xapp/Manifest b/sys-apps/xdg-desktop-portal-xapp/Manifest
index 66395ce49dbc..8676234b34c7 100644
--- a/sys-apps/xdg-desktop-portal-xapp/Manifest
+++ b/sys-apps/xdg-desktop-portal-xapp/Manifest
@@ -1,2 +1,2 @@
 DIST xdg-desktop-portal-xapp-1.0.4.tar.gz 88429 BLAKE2B 7f45a252a5c0dd433238a58012c65369240e7974a93d3d2b5b73bdbc91509480977ad1ce381a6f4ee3a0c87bfabd11ce87bf99839018811a84378e54be1ef36f SHA512 3f861473a763c37a1af95e3beb13c3364a04f557310d5a6520845bc754941149eb3d80a4e2893699715ff11b135edb2859f6349b6aa6fbe0aa1e173263e22dba
-DIST xdg-desktop-portal-xapp-1.0.8.tar.gz 90500 BLAKE2B edef095868df23e671810db10f162bf72ad50132100910a6e097c08da6d02ff216c110bf3bc597d85c9d380f6857216dec6ca62b4acda1b152e1fc7b99684822 SHA512 0baae8a4a260396ea0b17a76be100a535588411a8f66a085b2dfd577fe6141d53dcb48e2085223359d1f5f691c5a16aa0d7a496ff08a94a00486c597f77aae84
+DIST xdg-desktop-portal-xapp-1.0.9.tar.gz 90661 BLAKE2B dc7ec9ff18516a892bdbf184ae8d3730a4f2c38ba091830c55500fdf61d6bb87abcfc56638c51e42374e29957e47c3090addaad7d7167a119bfb3cd43d3d5d57 SHA512 7badd5e41e610647dcece7c5344be03816ed08a226a6667d9484e8e4560396eb8dab2140edf977d7038bf3f21ce8b8d6516bf041af9c92bf024274faf35e2037
diff --git a/sys-apps/xdg-desktop-portal-xapp/files/xdg-desktop-portal-xapp-1.0.9-remove-gdk-refs.patch b/sys-apps/xdg-desktop-portal-xapp/files/xdg-desktop-portal-xapp-1.0.9-remove-gdk-refs.patch
new file mode 100644
index 000000000000..948fb6ad91f4
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-xapp/files/xdg-desktop-portal-xapp-1.0.9-remove-gdk-refs.patch
@@ -0,0 +1,35 @@
+From b364687b8a696c78f2d3c46e0c45c2dc28e79a33 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 10 Aug 2024 08:06:28 -0400
+Subject: [PATCH] Remove Gdk references and meson dependency.
+
+ref: 54fca8b5b6a2b
+---
+ src/meson.build | 1 -
+ src/settings.c  | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index f4128c8..a3e8aa5 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -61,7 +61,6 @@ deps = [
+   meson.get_compiler('c').find_library('m'),
+   dependency('glib-2.0', version: '>= 2.44'),
+   dependency('gio-unix-2.0'),
+-  dependency('gdk-3.0'),
+   xdg_desktop_portal_dep,
+ ]
+ 
+diff --git a/src/settings.c b/src/settings.c
+index 55014fb..1e77664 100644
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -24,7 +24,6 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+-#include <gdk/gdk.h>
+ 
+ #include "settings.h"
+ #include "utils.h"
diff --git a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.8.ebuild b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.8.ebuild
deleted file mode 100644
index 8f5941074321..000000000000
--- a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.8.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
-
-inherit meson systemd
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal using Cinnamon/MATE/Xfce"
-HOMEPAGE="https://github.com/linuxmint/xdg-desktop-portal-xapp/"
-SRC_URI="https://github.com/linuxmint/xdg-desktop-portal-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=sys-apps/xdg-desktop-portal-1.5
-	x11-libs/gtk+:3
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/xdg-desktop-portal-gtk
-	>=x11-libs/xapp-2.8.4
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.9.ebuild b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.9.ebuild
new file mode 100644
index 000000000000..21bf46038390
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-xapp/xdg-desktop-portal-xapp-1.0.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using Cinnamon/MATE/Xfce"
+HOMEPAGE="https://github.com/linuxmint/xdg-desktop-portal-xapp/"
+SRC_URI="https://github.com/linuxmint/xdg-desktop-portal-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=sys-apps/xdg-desktop-portal-1.5
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal-gtk
+	>=x11-libs/xapp-2.8.4
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Remove orphaned gdk references
+	# https://github.com/linuxmint/xdg-desktop-portal-xapp/commit/b364687b8a696c78f2d3c46e0c45c2dc28e79a33
+	"${FILESDIR}/${PN}-${PV}-remove-gdk-refs.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 3ce9fb1e8ab7..abf5d5d7e98b 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,2 +1,3 @@
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 DIST elogind-252.9.tar.gz 1922777 BLAKE2B dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a SHA512 eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd
+DIST elogind-255.5.tar.gz 2127126 BLAKE2B 395352fc24bc815d1e39c2d5722eb09c2e3378873e2ea4173d8c209cd66c28a9b94ebe62ab3efbd5dccd822d99b86a6c1a871620adefb1215cb6d4ceee78a9f9 SHA512 dd9494062ef18c3c4cddbaf70b394bf90f6da3ce49f85312e99eabde54b2fcdb5cfdde1bcbaa661031afc72853e9b138dae336e1caed72e927bfd61c8cb22895
diff --git a/sys-auth/elogind/elogind-252.9-r2.ebuild b/sys-auth/elogind/elogind-252.9-r2.ebuild
index 6c9522bc9e1a..41ccffac0be8 100644
--- a/sys-auth/elogind/elogind-252.9-r2.ebuild
+++ b/sys-auth/elogind/elogind-252.9-r2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/elogind/elogind"
 
 LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
 SLOT="0"
-IUSE="+acl audit +cgroup-hybrid debug doc +pam +policykit selinux test"
+IUSE="+acl audit cgroup-hybrid debug doc +pam +policykit selinux test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -54,8 +54,9 @@ DOCS=( README.md)
 
 PATCHES=(
 	"${FILESDIR}/${P}-nodocs.patch"
-	"${FILESDIR}/${PN}-252.9-musl-lfs.patch"
-	"${FILESDIR}/${PN}-252.9-musl-1.2.5.patch"
+	"${FILESDIR}/${P}-musl-lfs.patch"
+	"${FILESDIR}/${P}-musl-1.2.5.patch"
+	"${FILESDIR}/${P}-py-exec.patch" # bug 933398
 )
 
 python_check_deps() {
@@ -139,6 +140,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
 	if ! use pam; then
 		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
 		ewarn "In other words, it will be useless for most applications."
@@ -180,3 +182,7 @@ pkg_postinst() {
 		fi
 	done
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-auth/elogind/elogind-255.5.ebuild b/sys-auth/elogind/elogind-255.5.ebuild
new file mode 100644
index 000000000000..75bf151e6d9e
--- /dev/null
+++ b/sys-auth/elogind/elogind-255.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="v255-stable"
+	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit linux-info meson pam python-any-r1 udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+IUSE="+acl audit cgroup-hybrid debug doc +pam +policykit selinux test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+DEPEND="
+	audit? ( sys-process/audit )
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( sys-libs/pam )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
+	!sys-apps/systemd
+"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
+
+DOCS=( README.md)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-252.9-nodocs.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	use kernel_linux && linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	if use cgroup-hybrid; then
+		cgroupmode="hybrid"
+	else
+		cgroupmode="unified"
+	fi
+
+	python_setup
+
+	EMESON_BUILDTYPE="$(usex debug debug release)"
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
+		--libexecdir="lib/elogind"
+		--localstatedir="${EPREFIX}"/var
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+		-Dman=auto
+		-Dsmack=true
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddefault-kill-user-processes=false
+		-Dacl=$(usex acl enabled disabled)
+		-Daudit=$(usex audit enabled disabled)
+		-Dhtml=$(usex doc auto disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dpamlibdir="$(getpam_mod_dir)"
+		-Dselinux=$(usex selinux enabled disabled)
+		-Dtests=$(usex test true false)
+		-Dutmp=$(usex elibc_musl false true)
+		-Dmode=release
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/elogind
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	udev_reload
+	if ! use pam; then
+		ewarn "${PN} will not be managing user logins/seats without USE=\"pam\"!"
+		ewarn "In other words, it will be useless for most applications."
+		ewarn
+	fi
+	if ! use policykit; then
+		ewarn "loginctl will not be able to perform privileged operations without"
+		ewarn "USE=\"policykit\"! That means e.g. no suspend or hibernate."
+		ewarn
+	fi
+	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
+		elog "elogind is currently started from boot runlevel."
+	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
+		ewarn "elogind is currently started from default runlevel."
+		ewarn "Please remove elogind from the default runlevel and"
+		ewarn "add it to the boot runlevel by:"
+		ewarn "# rc-update del elogind default"
+		ewarn "# rc-update add elogind boot"
+	else
+		elog "elogind is currently not started from any runlevel."
+		elog "You may add it to the boot runlevel by:"
+		elog "# rc-update add elogind boot"
+		elog
+		elog "Alternatively, you can leave elogind out of any"
+		elog "runlevel. It will then be started automatically"
+		if use pam; then
+			elog "when the first service calls it via dbus, or"
+			elog "the first user logs into the system."
+		else
+			elog "when the first service calls it via dbus."
+		fi
+	fi
+
+	for version in ${REPLACING_VERSIONS}; do
+		if ver_test "${version}" -lt 252.9; then
+			elog "Starting with release 252.9 the sleep configuration is now done"
+			elog "in the /etc/elogind/sleep.conf. Should you use non-default sleep"
+			elog "configuration remember to migrate those to new configuration file."
+		fi
+	done
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-auth/elogind/files/elogind-252.9-py-exec.patch b/sys-auth/elogind/files/elogind-252.9-py-exec.patch
new file mode 100644
index 000000000000..05f37e64d29b
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-252.9-py-exec.patch
@@ -0,0 +1,19 @@
+From f56b6bfa18b6b582619074135b07ff35a84e6a01 Mon Sep 17 00:00:00 2001
+From: Sven Eden <sven@eden-worx.com>
+Date: Wed, 1 Nov 2023 15:14:01 +0100
+Subject: [PATCH] Add execution bit on tools that had it missing.
+
+Signed-off-by: Sven Eden <sven@eden-worx.com>
+---
+ tools/dbus_exporter.py       | 0
+ tools/meson-render-jinja2.py | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 tools/dbus_exporter.py
+ mode change 100644 => 100755 tools/meson-render-jinja2.py
+
+diff --git a/tools/dbus_exporter.py b/tools/dbus_exporter.py
+old mode 100644
+new mode 100755
+diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py
+old mode 100644
+new mode 100755
diff --git a/sys-auth/elogind/files/elogind.conf b/sys-auth/elogind/files/elogind.conf
new file mode 100644
index 000000000000..167260a42aa5
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.conf
@@ -0,0 +1,7 @@
+# /etc/conf.d/elogind: config file for /etc/init.d/elogind
+
+# this is the elogind executable
+ELOGIND_EXEC="/usr/lib/elogind/elogind"
+
+# this is where elogind will store its pid file
+ELOGIND_PIDFILE="/run/elogind.pid"
diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml
index 43950e1cc395..ce8da1d386de 100644
--- a/sys-auth/elogind/metadata.xml
+++ b/sys-auth/elogind/metadata.xml
@@ -5,7 +5,7 @@
 		<email>asturm@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="cgroup-hybrid">Use hybrid cgroup hierarchy (OpenRC's default) instead of unified.</flag>
+		<flag name="cgroup-hybrid">Use hybrid cgroup hierarchy instead of unified (OpenRC's default).</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">elogind/elogind</remote-id>
diff --git a/sys-auth/libfprint/libfprint-1.94.4.ebuild b/sys-auth/libfprint/libfprint-1.94.4.ebuild
index 09397061db41..d74276c012f2 100644
--- a/sys-auth/libfprint/libfprint-1.94.4.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit meson udev
 
 DESCRIPTION="Library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+HOMEPAGE="https://fprint.freedesktop.org/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
 SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-auth/libfprint/libfprint-1.94.7.ebuild b/sys-auth/libfprint/libfprint-1.94.7.ebuild
index 0fc7d352a1f0..59d43930bc1f 100644
--- a/sys-auth/libfprint/libfprint-1.94.7.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.7.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}-v${PV}"
 
 DESCRIPTION="Library to add support for consumer fingerprint readers"
 HOMEPAGE="
-	https://cgit.freedesktop.org/libfprint/libfprint
+	https://fprint.freedesktop.org/
 	https://gitlab.freedesktop.org/libfprint/libfprint
 "
 SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch
new file mode 100644
index 000000000000..5affd40c3111
--- /dev/null
+++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.11-fix-musl-build.patch
@@ -0,0 +1,24 @@
+From 65f37d4deb6ac87dd64df1bb281588d300a1bf3e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 12 Feb 2024 18:18:31 -0800
+Subject: [PATCH] libpskc: fix implicit declaration with musl
+
+---
+ libpskc/global.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libpskc/global.c b/libpskc/global.c
+index 1a514506..6082e11a 100644
+--- a/libpskc/global.c
++++ b/libpskc/global.c
+@@ -24,6 +24,7 @@
+ #include <pskc/pskc.h>
+ 
+ #include "internal.h"
++#include <stdlib.h>		/* free */
+ #include <string.h>		/* strverscmp */
+ #include <libxml/parser.h>	/* xmlInitParser */
+ #include <libxml/catalog.h>	/* xmlLoadCatalog */
+-- 
+GitLab
+
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild
index 03d2801fa64c..b82f773e2a74 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.11.ebuild
@@ -27,13 +27,27 @@ BDEPEND="
 	test? ( dev-libs/libxml2 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-musl-build.patch" )
+
+# fpurge is from gnulib, and unused as of 2.6.11
 QA_CONFIG_IMPL_DECL_SKIP=(
 	MIN # glibc fp
-	unreachable
 	alignof
+	fpurge
 	static_assert
+	unreachable
 )
 
+src_prepare() {
+	default
+
+	# After patching, we have to fix the mtime on libpskc/global.c so
+	# that it doesn't cause Makefile.gdoc to be rebuilt so that it
+	# doesn't cause Makefile.in to be rebuilt so that it doesn't try to
+	# run automake-1.16.5 for no reason. Bug 936309.
+	touch --reference=libpskc/errors.c libpskc/global.c || die
+}
+
 src_configure() {
 	local myeconfargs=(
 		--cache-file="${S}"/config.cache
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 34ff79b9441b..811483f2c10c 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,2 +1,3 @@
 DIST polkit-123.tar.bz2 707480 BLAKE2B 27d8764606d8156118269fb4cd5eda1cfd0d56df219e4157cd78fd4c2a2d001c474271b7bb31e7e82ca376eacd26411418695058cc888700690606348b4d014a SHA512 4306363d3ed7311243de462832199bd10ddda35e36449104daff0895725d8189b07a4c88340f28607846fdf761c23470da2d43288199c46aa816426384124bb6
 DIST polkit-124.tar.bz2 715490 BLAKE2B ecfc1ec73a7e1bbdf7374642ad4e1dbe534149a27e75bb1235eaa446ff912466ee0cdd978c34b7f110bc62a49b25ffddc9011e280686e3f304a234454be85a40 SHA512 db520882b0bedf1c96052570bf4c55d7e966d8172f6d26acf0791d98c4b911fce5ee39e6d830f06122ac8df33c6b43c252cdb7ba3a54523804824ebf355405dc
+DIST polkit-125.tar.gz 453652 BLAKE2B 068bd4a7c028a0b4e026a0fdc3a60bd323087282a5c5bd7cbc404dbedb997de63893ce2282e8cd5f01f8d98ff0cc1a46200543a832fa397a4f50ef8d6ba2b28b SHA512 64d85c1557355d6de6483beeb855b74a99dbb30cf9968206dc0aaf147156072ca2604bf667533099ee3972b3eed0421ec0a1ff8bea35a1e4c54da7b9688e0953
diff --git a/sys-auth/polkit/files/polkit-125-musl.patch b/sys-auth/polkit/files/polkit-125-musl.patch
new file mode 100644
index 000000000000..ee0a444c919e
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-125-musl.patch
@@ -0,0 +1,34 @@
+https://github.com/polkit-org/polkit/commit/13bea3e08f924002a6a5c2f275d4bf1588fc3d02
+
+From 13bea3e08f924002a6a5c2f275d4bf1588fc3d02 Mon Sep 17 00:00:00 2001
+From: Sertonix <sertonix@posteo.net>
+Date: Sun, 11 Aug 2024 00:26:51 +0200
+Subject: [PATCH] Fix missing arguments with HAVE_PTHREAD_CONDATTR_SETCLOCK
+
+Fixes <64f5e4dda52> Add syslog-style log levels support
+--- a/src/polkitbackend/polkitbackendduktapeauthority.c
++++ b/src/polkitbackend/polkitbackendduktapeauthority.c
+@@ -767,12 +767,14 @@ runaway_killer_common(PolkitBackendJsAuthority *authority, RunawayKillerCtx *ctx
+ #ifdef HAVE_PTHREAD_CONDATTR_SETCLOCK
+   if ((pthread_err = pthread_condattr_init(&attr))) {
+     polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
++                                  LOG_LEVEL_ERROR,
+                                   "Error initializing condition variable attributes: %s",
+                                   strerror(pthread_err));
+     return FALSE;
+   }
+   if ((pthread_err = pthread_condattr_setclock(&attr, PK_CLOCK))) {
+     polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
++                                  LOG_LEVEL_ERROR,
+                                   "Error setting condition variable attributes: %s",
+                                   strerror(pthread_err));
+     goto err_clean_condattr;
+@@ -780,6 +782,7 @@ runaway_killer_common(PolkitBackendJsAuthority *authority, RunawayKillerCtx *ctx
+   /* Init again, with needed attr */
+   if ((pthread_err = pthread_cond_init(&ctx->cond, &attr))) {
+     polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
++                                  LOG_LEVEL_ERROR,
+                                   "Error initializing condition variable: %s",
+                                   strerror(pthread_err));
+     goto err_clean_condattr;
+
diff --git a/sys-auth/polkit/polkit-125.ebuild b/sys-auth/polkit/polkit-125.ebuild
new file mode 100644
index 000000000000..fa58387359d1
--- /dev/null
+++ b/sys-auth/polkit/polkit-125.ebuild
@@ -0,0 +1,157 @@
+# 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 pam pax-utils python-any-r1 systemd tmpfiles xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://github.com/polkit-org/polkit"
+if [[ ${PV} == *_p* ]] ; then
+	# Upstream don't make releases very often. Test snapshots throughly
+	# and review commits, but don't shy away if there's useful stuff there
+	# we want.
+	MY_COMMIT=""
+	SRC_URI="https://github.com/polkit-org/polkit/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+	S="${WORKDIR}"/${PN}-${MY_COMMIT}
+else
+	SRC_URI="https://github.com/polkit-org/polkit/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test"
+# Tests restricted b/c of permissions
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	acct-user/polkitd
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/expat
+	daemon? (
+		duktape? ( dev-lang/duktape:= )
+		!duktape? ( dev-lang/spidermonkey:115[-debug] )
+	)
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	!pam? ( virtual/libcrypt:= )
+	systemd? ( sys-apps/systemd:0=[policykit] )
+	!systemd? ( sys-auth/elogind )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/polkitd
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+"
+
+DOCS=( docs/TODO HACKING.md NEWS.md README.md )
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# bug #401513
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+		-Dauthfw="$(usex pam pam shadow)"
+		-Dexamples=false
+		-Dgtk_doc=false
+		-Dman=true
+		-Dos_type=gentoo
+		-Djs_engine=$(usex duktape duktape mozjs)
+		-Dpam_module_dir=$(getpam_mod_dir)
+		-Dsession_tracking="$(usex systemd logind elogind)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(meson_use !daemon libs-only)
+		$(meson_use introspection)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	meson_src_install
+
+	# acct-user/polkitd installs its own (albeit with a different filename)
+	rm -rf "${ED}"/usr/lib/sysusers.d || die
+
+	if use examples ; then
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
+	fi
+
+	if use daemon; then
+		if [[ ${EUID} == 0 ]]; then
+			diropts -m 0700 -o polkitd
+		fi
+		keepdir /etc/polkit-1/rules.d
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process polkit-tmpfiles.conf
+
+	if use daemon && [[ ${EUID} == 0 ]]; then
+		chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+		chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	fi
+}
diff --git a/sys-auth/polkit/polkit-9999-r1.ebuild b/sys-auth/polkit/polkit-9999-r1.ebuild
new file mode 100644
index 000000000000..431d20a6a5f4
--- /dev/null
+++ b/sys-auth/polkit/polkit-9999-r1.ebuild
@@ -0,0 +1,160 @@
+# 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 pam pax-utils python-any-r1 systemd xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://github.com/polkit-org/polkit"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/polkit-org/polkit"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Upstream don't make releases very often. Test snapshots throughly
+	# and review commits, but don't shy away if there's useful stuff there
+	# we want.
+	MY_COMMIT=""
+	SRC_URI="https://github.com/polkit-org/polkit/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+	S="${WORKDIR}"/${PN}-${MY_COMMIT}
+else
+	SRC_URI="https://github.com/polkit-org/polkit/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	acct-user/polkitd
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/expat
+	daemon? (
+		duktape? ( dev-lang/duktape:= )
+		!duktape? ( dev-lang/spidermonkey:115[-debug] )
+	)
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	!pam? ( virtual/libcrypt:= )
+	systemd? ( sys-apps/systemd:0=[policykit] )
+	!systemd? ( sys-auth/elogind )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/polkitd
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+"
+
+DOCS=( docs/TODO HACKING.md NEWS.md README.md )
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd
+"
+
+python_check_deps() {
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# FIXME: Horrible hack to facilitate testing in bug #934314
+	patch -p1 -f < "${FILESDIR}"/${PN}-124-systemd.patch
+	patch -p1 -f < "${FILESDIR}"/${PN}-124-systemd-fixup.patch
+	patch -p1 -f < "${FILESDIR}"/${PN}-124-c99-fixes.patch
+	sed -i -e "s:dependency('systemd':dependency('libelogind':" meson.build || die
+
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+		-Dauthfw="$(usex pam pam shadow)"
+		-Dexamples=false
+		-Dgtk_doc=false
+		-Dman=true
+		-Dos_type=gentoo
+		-Dsession_tracking="$(usex systemd libsystemd-login libelogind)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Djs_engine=$(usex duktape duktape mozjs)
+		$(meson_use !daemon libs-only)
+		$(meson_use introspection)
+		$(meson_use test tests)
+		$(usex pam "-Dpam_module_dir=$(getpam_mod_dir)" '')
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	meson_src_install
+
+	# acct-user/polkitd installs its own (albeit with a different filename)
+	rm -rf "${ED}"/usr/lib/sysusers.d || die
+
+	if use examples ; then
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
+	fi
+
+	if use daemon; then
+		if [[ ${EUID} == 0 ]]; then
+			diropts -m 0700 -o polkitd
+		fi
+		keepdir /etc/polkit-1/rules.d
+	fi
+}
+
+pkg_postinst() {
+	if use daemon && [[ ${EUID} == 0 ]]; then
+		chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+		chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	fi
+}
diff --git a/sys-auth/polkit/polkit-9999.ebuild b/sys-auth/polkit/polkit-9999.ebuild
new file mode 100644
index 000000000000..71d7e57a0403
--- /dev/null
+++ b/sys-auth/polkit/polkit-9999.ebuild
@@ -0,0 +1,156 @@
+# 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 pam pax-utils python-any-r1 systemd tmpfiles xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://github.com/polkit-org/polkit"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/polkit-org/polkit"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Upstream don't make releases very often. Test snapshots throughly
+	# and review commits, but don't shy away if there's useful stuff there
+	# we want.
+	MY_COMMIT=""
+	SRC_URI="https://github.com/polkit-org/polkit/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+	S="${WORKDIR}"/${PN}-${MY_COMMIT}
+else
+	SRC_URI="https://github.com/polkit-org/polkit/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="+daemon examples gtk +introspection kde pam selinux systemd test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	acct-user/polkitd
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/glib
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/expat
+	daemon? (
+		dev-lang/duktape:=
+	)
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	!pam? ( virtual/libcrypt:= )
+	systemd? ( sys-apps/systemd:0=[policykit] )
+	!systemd? ( sys-auth/elogind )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/polkitd
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+"
+
+DOCS=( docs/TODO HACKING.md NEWS.md README.md )
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd
+"
+
+python_check_deps() {
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# bug #401513
+	sed -i -e 's|unix-group:@PRIVILEGED_GROUP@|unix-user:@PRIVILEGED_GROUP@|' src/polkitbackend/*-default.rules.in || die
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+		-Dauthfw="$(usex pam pam shadow)"
+		-Dexamples=false
+		-Dgtk_doc=false
+		-Dman=true
+		-Dos_type=gentoo
+		-Dpam_module_dir=$(getpam_mod_dir)
+		-Dprivileged_group=0
+		-Dsession_tracking="$(usex systemd logind elogind)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(meson_use !daemon libs-only)
+		$(meson_use introspection)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	meson_src_install
+
+	# acct-user/polkitd installs its own (albeit with a different filename)
+	rm -rf "${ED}"/usr/lib/sysusers.d || die
+
+	if use examples ; then
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
+	fi
+
+	if use daemon; then
+		if [[ ${EUID} == 0 ]]; then
+			diropts -m 0700 -o polkitd
+		fi
+		keepdir /etc/polkit-1/rules.d
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process polkit-tmpfiles.conf
+
+	if use daemon && [[ ${EUID} == 0 ]]; then
+		chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+		chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	fi
+}
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index e719d6e332fd..f1d1125d52ca 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -20,7 +20,7 @@
 		<flag name="samba">Add Privileged Attribute Certificate Support for Kerberos</flag>
 		<flag name="subid">Support subordinate uid and gid ranges in FreeIPA</flag>
 		<flag name="sudo">Build helper to let <pkg>app-admin/sudo</pkg> use sssd provided information</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:fedoraproject:sssd</remote-id>
diff --git a/sys-auth/sssd/sssd-2.9.4.ebuild b/sys-auth/sssd/sssd-2.9.4.ebuild
index d83be12eeecc..6592cc6d1e68 100644
--- a/sys-auth/sssd/sssd-2.9.4.ebuild
+++ b/sys-auth/sssd/sssd-2.9.4.ebuild
@@ -163,6 +163,11 @@ src_prepare() {
 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
 }
 
diff --git a/sys-auth/sssd/sssd-2.9.5.ebuild b/sys-auth/sssd/sssd-2.9.5.ebuild
index c1195b951775..995e823a05e9 100644
--- a/sys-auth/sssd/sssd-2.9.5.ebuild
+++ b/sys-auth/sssd/sssd-2.9.5.ebuild
@@ -163,6 +163,11 @@ src_prepare() {
 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
 }
 
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index bd76042c13e4..3432e0d31fc9 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,5 +1,4 @@
-DIST yubico-piv-tool-2.3.1.tar.gz 1315267 BLAKE2B 9b7d96129f3cab4fd68d18d0bbbf8dfa5fdda383ffb8099f898e23c99d0f1caf387a26cb9d01582521a070b93bac941b8a10faac736137cb72c86fbf5c95d2f8 SHA512 44cd9c482f2a2942d10a238ac2cb2d40df7cd11ddc27d6df88912512e956746b5634018b421d5cc4b947e4c36f9841898d5a08eb613bf22558089103dab95988
-DIST yubico-piv-tool-2.4.2.tar.gz 1332497 BLAKE2B ba08b19fe4659842fdfad06d662120a9d2858e25a56d56f63edc88e607c5b56a79f5ca90826fb8b78295e218ff1a728a168d04f330b7f640a9f3e804528320ed SHA512 032a91c9ac50cb5604a56ec0d0a84cf64bfff5440930a1643bddcd15cf02fc44d33d949286b2595eb4c196cb31050c13f507b32f3156d4600fdad46057b65b56
-DIST yubico-piv-tool-2.5.1.tar.gz 1340147 BLAKE2B 96638e22bf03046daae5ba4b4d689cfe6d7e1f8ebbf64695bd3e259ca7e53513ff92933c935294536c504fc96b2ed1c7df4b9962b1789803eb9576b51715f00e SHA512 736aeeac3d9368699b33e928cfb5b54ad6aa1450acf734397bc689ba9ccc82077f46f7ea2bd06dd1457b91eb50f7a0231a57914b3ea2ff0f07d425b4d27b96e4
 DIST yubico-piv-tool-2.5.2.tar.gz 1324642 BLAKE2B 23b175d37f0f510e1360f8c793e95ee654e7d0218ca6fb29a884e4aaf143704555bc04c489fa944e2731208cb713d2d763d84dd8b6ef36aa4dafe22c55d81edc SHA512 522a163be55dd92c2f18a779b64b1a163a6f81390757db34b58e909d896d78bcff30907eb8a2dc703d70133cdd71e2d3841d36d77cf7211351b5c825965dffd0
 DIST yubico-piv-tool-2.5.2.tar.gz.sig 566 BLAKE2B f7cdcbd7f47dd07b57c2cfe146c8801edce254b00cf4abf65783da687787ce91f2bee1419050a2977c66c074cfaf6c8e2f566d5b83ed3b61d56b6f9ba3e41a65 SHA512 c251cc7c7019923c60380302889cc3654ef913c1d5498d328528586d70b951aecff474a4da3a2b9ddb21c1b860335205a16ffed1d397e16e226e7f4725c2bf90
+DIST yubico-piv-tool-2.6.0.tar.gz 1359764 BLAKE2B c9513401bdf9175b929a7c7ecf09ef07a76cc0d7fc37fd43f0b1fb882c878417d5a804e27f66ec7d34e6faf40e1c1508efe6fd968f43b5f382d0071d5f74cc20 SHA512 11efcc12cdcdddc8f6a946460ee8be40d0652478f9884b01945ec048f95e03e706f00737607a20e75135667ece0de06627cd0a4f441d9048ad9e19f3f67fee00
+DIST yubico-piv-tool-2.6.0.tar.gz.sig 566 BLAKE2B f5a99c89618cbfed11950402d850a4d38e934a3436399156e950abed6a45bf0ba89e2c45c9014248f1eb3e71bc8d0abbcfaaa87c537788490daca4a52368f794 SHA512 fae8612ea08e7136134fe9fa82893f0f98118e4592e5e7fb0b844aa96e0182cf9b6d5eddc1bbe11b49470ebaf22fdf33575f7955b870b01eeff6b751d7a000b8
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.3.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.3.1.ebuild
deleted file mode 100644
index 1145a5ac9a67..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	dev-libs/openssl:=[-bindist(-)]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
-	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
-	"${FILESDIR}"/${PN}-2.3.0-no-Werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
-		|| die "Failed to generate p11-kit module configuration"
-	insinto /usr/share/p11-kit/modules
-	doins ${PN}.module
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.ebuild
deleted file mode 100644
index 42a6ee70a2dc..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.4.2.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
-
-DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	dev-libs/openssl:=[-bindist(-)]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
-	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
-	"${FILESDIR}"/${PN}-2.3.0-no-Werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
-		|| die "Failed to generate p11-kit module configuration"
-	insinto /usr/share/p11-kit/modules
-	doins ${PN}.module
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.5.1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.5.1.ebuild
deleted file mode 100644
index 42a6ee70a2dc..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.5.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 cmake
-
-DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/pcsc-lite
-	dev-libs/openssl:=[-bindist(-)]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-BDEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
-	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
-	"${FILESDIR}"/${PN}-2.3.0-no-Werror.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIB=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
-		|| die "Failed to generate p11-kit module configuration"
-	insinto /usr/share/p11-kit/modules
-	doins ${PN}.module
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.6.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.6.0.ebuild
new file mode 100644
index 000000000000..bdbd4e029157
--- /dev/null
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake verify-sig
+
+DESCRIPTION="Command-line tool and p11-kit module for the YubiKey PIV application"
+HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
+	verify-sig? ( https://developers.yubico.com/${PN}/Releases/${P}.tar.gz.sig )"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test verify-sig"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/pcsc-lite
+	dev-libs/openssl:=[-bindist(-)]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+	verify-sig? ( >=sec-keys/openpgp-keys-yubico-20240628 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.1-tests-optional.patch
+	"${FILESDIR}"/${PN}-2.1.1-ykcs11-threads.patch
+	"${FILESDIR}"/${PN}-2.3.0-no-Werror.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIB=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	echo "module: ${EPREFIX}/usr/$(get_libdir)/libykcs11.so" > ${PN}.module \
+		|| die "Failed to generate p11-kit module configuration"
+	insinto /usr/share/p11-kit/modules
+	doins ${PN}.module
+}
diff --git a/sys-block/dust/Manifest b/sys-block/dust/Manifest
index 478bdeca6de8..67285d5a78bc 100644
--- a/sys-block/dust/Manifest
+++ b/sys-block/dust/Manifest
@@ -1,107 +1,123 @@
-DIST aho-corasick-1.0.1.crate 167320 BLAKE2B f148004140d4f705e93f448020b97c434b93fea6ae34fd74b1f394b076c2727a87f5ec54542a0f52822d716c10ada3c68ae8f50a46c455fc6e828b10b5650ecc SHA512 7cea5b2305b90aebc54f78446cfc91f275b1be8489d2d80c3baa9ff8b913f9b2296adbdf4aefb0d8fce8f57812963fb9450b200d133a9d61e100cef324068070
+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 ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anstyle-1.0.0.crate 13972 BLAKE2B 741704b6e338834696bc816d8a65ff933f9bff48e71d25269f04c4a24c3dbb06826d2f84f73a1dceeda99cfc5c8e3d59b3d07dbb404cc3471b86cf118d074e80 SHA512 5a0159b9f8a80afadff04ecbec3c1769cef712c77de8062b31323298dab9507f4a87b7c777e6335d310ec464b0982d097b5888b4b351c389b5f4419c2c87be7b
-DIST assert_cmd-2.0.11.crate 25346 BLAKE2B 1777fd5e3c0ea962d06b4e26e8c7437a3f1d8834fd0439338f53985e5958f2e11dadcf96a8ac86035bb9bce20ed9072fe4c37cee5dafdda3e6d2f72afe8b7a8e SHA512 45c142e7d4f526fe66f9987ea6c62750c53eb2e429cafff6a13bb5fd6377c59888cfa19abbc3a3d50f377f69ea894c42906639020c86de09805662d929a95aae
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09
+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 assert_cmd-2.0.14.crate 24591 BLAKE2B 2a25812480770ce8549700b6c5afd0e3fc230c280c66b5b61480a2db0dc6c5a95b6a564ca7eb6024fa43498168d8bd3511a6cd659498540bf1a5a3bdbc2a3fc8 SHA512 112c3f933a013715c0dfcf29889ec023c88097a70fe212a7d98d0a5272d5f6da87df9353da006483830a0ac3c42a12e12d8fabeb90eb62453982edbc75215613
+DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bstr-1.4.0.crate 345921 BLAKE2B 39a3cb366a7ceb784b7a6626f81338e8047498c5755ed60fce1f6460ea5aa907ab5df4bcf30a07ed699c7af7d2d0dbc48b2c5cb674b863c22fd63b5080b52fae SHA512 98dc7bdcc1a307eae2ed202b2b785a4ad27719c4b3289408edc710beabedb78d16b3042b41de04fca5dbdba19d8567df69c35431e33a3c02924820e1a601df36
-DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
+DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
+DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172
+DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1
+DIST cc-1.0.97.crate 76951 BLAKE2B ec2e65797dfe13223b64f28bf6d143e00362f8bdd14e4df3d16ec2c5b68b8c603968f8cf6e7ede95b527ef16a748775bf247e8bf11010a326bbac4b296d72eb5 SHA512 119d1769530ec2fcc643b9b4a0f2a45db6f0772e4df882b832f961824bbb41d101d4a507573b4e05b4627d647fa823e81bc66dafdde40146878616af96b24143
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea
-DIST clap_complete-3.2.5.crate 31625 BLAKE2B c76baef63d773b81eb4d8d953da4a94769b618da45fb0f13fb9d6c6738b67ccdbd58ad2b5361bae99705fd2b7aadb520d6e7f4d258d872971e0e308a36900965 SHA512 c26d6c15a0ab44720cd7a5979dd4c66a9171082b99c04cda10fe4f6dd9a1405f8ca9022c344d03d7d2af7788bc28be033c9e2311f6879993901773176783f61e
-DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
-DIST clap_mangen-0.1.11.crate 13993 BLAKE2B a5cc37d899642a3b0a32e6c70326be46d20cb03d5190bbe536a1ee393857b9daf8946216d281ca329137bb1b8f473a5722de94683a8484b39481211029cc764b SHA512 197ebab7ce81111d9af6dc0367b2a4033fd45873af068ed45d14cd31a57b44603d02683d2b0cd02d8ba05eec283cfa0db95e90af13d169effc11690ba3940ad2
+DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
+DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
+DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
+DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
+DIST clap_complete-4.5.1.crate 37823 BLAKE2B 0cf64989041e0773ee0d4ea767dc781d9cfaa68c3edfbf2b04874f24064aab762223b50b5fb511a09583191fddf03f5bc7afc443c213871eb24f94695fcfe004 SHA512 c815e6f8fe190b0cfab85e739973b8a40fb23586fd329f96cc21a5ecfa9108ad5bb4a5a6cc5e00983e704d4272c87433b426f582ee44dcc9fc59d9a7784f9334
+DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
+DIST clap_mangen-0.2.20.crate 14861 BLAKE2B 68fc1a18d0c2df088b4c11ba2bd4de73b8d272f888f9c1e7da73493012bab26a47cf178769fa657e4b893bd11eeda038135dd7a606a31b86e03bbbe57422deb5 SHA512 f651d0c044cea804c469a59a6f4e3024546cd018d73aa4dedc4f2ddd78c04fe0cf6790d442fc16968146068cd61c685819e5f39fef6320aeaf6dc210f61582c2
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
 DIST config-file-0.2.3.crate 3652 BLAKE2B 79d76d40144fad6e26ad0bec599fe5105508cf29781f21df48866db1ec827dab37e89f3e79d2beb814bf4e0e0b068d6393fc768a6d9ea7f7f4621729f4e80fc5 SHA512 863786db71b71d5dd09dbabccb5ec5b482404bef630d02074a0f339d30f0beb921207c3bf78845cddc3a8d643711f1c3ba4dd8895e2b391527a33f2fe206c728
-DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
-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-epoch-0.9.14.crate 48524 BLAKE2B 439eec7e5e0364af0fe0a34ffc9354ae289798ffa7480bc656d4a610101e1ef2d5f484d84f82c87f961bd622434c36adfb7a87f7fbd2c71077b732cc7cc765ad SHA512 543cb60cff7c0823733f6ace191b137a04025a2b40fe4fea5eb273772009627fb705aecf742bc59e01367d4c15a14aca73aa2caf7f4b509f4b25947e14fd1e19
-DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b SHA512 adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
+DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
+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-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
+DIST ctrlc-3.4.4.crate 14660 BLAKE2B fe7c2ca8352dbe40e60ad2c63654beafd9ad3f62483b23b3c614a22dacc8ce0edd2b94e9ec3a2472c581f6a1b8befe0952df092b4c7d34ad92414190e285e51b SHA512 c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST directories-4.0.1.crate 16040 BLAKE2B 57368021712e652af2dbc64e3b219ac072c2fd5e5f7f882ac36649e0e804b5345c3f9afcd6d75caec3851a371f6eec3101e80a125f6ad20c045fd105980922f8 SHA512 babe4e23759b2e01a284a14aa1b45ba9d705ad7257246fe8c1ee6a071f48192c58a30b7d09c222268be83f7ebb59c0cc91e8b1342c1f9f0a96ec079fd264f8d5
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST dust-0.8.6.gh.tar.gz 102584 BLAKE2B 20fb3a061f93ececdd0b32d1c6f09d343b0e9f5888ba7e28c74a02712329488d9dabe051902fbb63a1513dc3e0f86a62ffbac671e6eab7cf69134204ac37f59e SHA512 17422a08a6c36250b849e2a0e2ebe7917adc6c7b3a3886046cbff3cd33b6ec96088b915f0c950985e7c7352d9fea7298c2abcdca64dd67db1b5417abe8f7f1f4
-DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
-DIST errno-0.3.1.crate 10348 BLAKE2B 72831d0b69f95884a69918249cc0e814eb5eade3205331bec6d2021f8b01a42c4c9b494f2717033d65a4c5230c8490b6ce250d349c1e8e177b20e7e84a860020 SHA512 00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54
-DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
-DIST getrandom-0.2.9.crate 34457 BLAKE2B ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29 SHA512 48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082
-DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
-DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9
-DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST io-lifetimes-1.0.10.crate 37294 BLAKE2B 9b8836c4bf30e6d102fd9973ac66f067c3ff8bc2806e55f26368ebdc9854f2e9cc6eecc8014f9a0b22a968a6eea8be243fcb7a641d2d0dfc747ee08a6a1450bb SHA512 4b2cde9522780a408c5d4e6406286bc5dd3a0de1a99675129e9856e5d889498a127fd5dd7c937a7542135abc2213b60bfb6258b7871b8709dcdd79d60455bea9
-DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.142.crate 679343 BLAKE2B 4168a8c3766bbc4f5adbd4babd84757cb81bb3c8cc806b8b5c1381a88ddccbb8bf55ae84f2879ab26adda09a3d44d21e2708dc9bce5d4868663fad8dd0f0e086 SHA512 8eb465fea8bfa865aa592185ea2dd89a6d89252b0e44fb7398ae82c9fa031d501fc3a1c37e50d1971be528c6e1a4ca416da224ba82e5a8766ec598464593afdd
-DIST linux-raw-sys-0.3.7.crate 1013423 BLAKE2B e77b372a391c0389674331647f8f479d96ebfff99f6bbe60b6d8935e035834026e15c056f098c91ed328e512b72b7e25b04534841aac26e658991e41fb9963d6 SHA512 49a84d3e57f3e3985fbb82a2d59df55bd7a259a65a2b2dc180b6a32e92eb1dedad0edfdda1fbd51698dfa31b1ac06777338910c63564a14d1e85d9b7344d21dc
+DIST dust-1.1.1.gh.tar.gz 111345 BLAKE2B 46b72e2d83b61f3b7fc33ab6d32b25d7e7641ece799e12abfd3f5e79e2cfeb31ba1bbc3725eeb9d8eb90fa528752c719b11ea88fbf963530139ca6a7d54eace5 SHA512 c7051fa5a924891aa25fac22d3e5c53dd5a6c5ae063e6013316c78f7ac1c0006f8523781ccefe5b9a9cc0b2a799decb0d045bb7a37db78e9e97b805f8c085f33
+DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432
+DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST fastrand-2.0.2.crate 14674 BLAKE2B ea23f52d745f4fcfd4ec911d48d77c60da837f57942994b17458daac7cae38953cf679459908d68e5f393d03a90cd6eddba23d2a86c2bc11ebfeed0bb41fe4dd SHA512 3ef9c21e4928071619adbad6421165ea82feb04c26ee18893b172f9f8a510b9a2097257ae31647a907680412b68d6662eff13cb27649ed9f5e68c374619701cf
+DIST filesize-0.2.0.crate 5066 BLAKE2B c43cc098a2b4ec4f9a2990ccfb17a6379e7eaa01686cf9d077ae4b3f80f517f5abdae2eb3244989f0fc4e9a1c6c9b6ed1f43921d3067d474211d74fe31cb75ac SHA512 d80ca58ed1c2c9959cb98033c270ebc520ab050b812c17e22cb1bda3cfd44d35542e56c45da36765873e9ef18f21a01b8d615bafc6bdfc9cf555d9175b47bdce
+DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
+DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
+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 io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
+DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
+DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
+DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
+DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
+DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST lscolors-0.13.0.crate 21948 BLAKE2B ded53945c023c0f8edb7fd563a11c30a03bf295fb5f08eeffaef163e4427164ff9d6c595a15e54fc6792fa927b9f35a272250771a9f6c7e7aa13308df469624d SHA512 bce06cd4505a9efacee6302b536575e495720a3d051a8bdfac3904a8b0bba94aee6bb516702b79750711a57699e4e49ed3f354646ba22f3d3338693e20f80caa
-DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
+DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
+DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a
 DIST ntapi-0.4.1.crate 126552 BLAKE2B ef5291a32f5edab4b29648fcc73df30f993558e45ed862a62a4d7e85f963f195f0a74c9e61eecf928c8966799da45a23694d0c6a1ad5f7d9ab3a8bce86d6d2eb SHA512 8e32d45a508d20f0d3537e056f363270120980dc23564713306e36acbc12a6d379eb3857026fecc16ca75080431e06742e3806801d3e0a848a01f64a8dd4f2d7
 DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
-DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
-DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
-DIST os_str_bytes-6.5.0.crate 23166 BLAKE2B 60f5beced502b7bcf165dd2bca2989f9039fc22cda80bbb09d2ed0eb115831c6e0f80292e656f4bf9c0b0635ad10210c88c1b23bcbb59b8d2729b6cda473ecd7 SHA512 cde7779ba24304256cc57de78208af4d26bc91dae7fbb9c85e3f67c3e35cb6268caf3fc9eef530a8d3cbdc951ec3534223f3559d2a013561912231ebdb1801b2
+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 overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
-DIST predicates-3.0.3.crate 22743 BLAKE2B e0dbdba7bfaedfd3730bc381efd439c09a0730a8876be219ae5b8beb230f99acb29263c7eea1ea7333102335550936cb968f82268eeaf61db912fc4d2ba2952c SHA512 6638890cf3ca26170363e789318fd201223818089a34970fb650c12e11da0c2031dbe114ffa1e4bc55c05f7c75f41c60ca3bdb4764e061c6317508275940c7e1
+DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0
 DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
 DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
-DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
-DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
-DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
-DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
-DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
-DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
-DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.8.1.crate 248412 BLAKE2B 4f1355104def09ec8f7a7d604fb08d0a39af36cdbb5160c63329e8c06ef2d2ad1063fc7280c90ba3748e1766b65f52fd6da24e439d5262209a6137bcbe2eda9c SHA512 fe83c2497b786314cbd9ead0d85a39ca87ae92225e444a41ba381fe80aa381a88806e2c20e1c468b8b59503fdf1c2b7e5bf6eaae0ddf9f14a70c1ca2773e8830
-DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-syntax-0.7.1.crate 339705 BLAKE2B 59dcdb9e0f5a2008db491756fb353745bf4dbaba0d3a8a6782960c990065e1870cc120d7a7e220991b78f89053aa63b1a9c326f5ae3526d47679e4ae30ae5e66 SHA512 ff61e4a075550fce3a16e516f8222a489dfe2bdf9431220c98c33b1f9e6b19da7bc1ca6bf34031235d6f1ad06882b63d606874a14d2e27c615701ecc2f4cdd9a
+DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f
+DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+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_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269
+DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
+DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
+DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
-DIST rustix-0.37.19.crate 323809 BLAKE2B 6a01e5128910c4b1333359efdacd5d0c1f0cf0ac4f2615e6891c10e7de3ce8df5ca50955a3e5c27f3b85d3ffee9fe28105aac3baa4fadd05172645e9f7ddb853 SHA512 e1c00f97414313580dfb7a616cd0e9a64d87950b4d4e6b536b5eaea93b8741f769ef62d4ee1461af8266758f9bdc136a445abbb05c8355a11d338a166b498722
-DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.162.crate 77030 BLAKE2B 27e6a9bfabcd66a2250be36ac9987ec12a864c15eabea4bb793f796a19d85db097bf46426462fbdd22ccde24af3581638c2e14634701a0b14a3bfcc624c40a8d SHA512 e9b112999b69a14f1d05cce985448378c889a497dfa00f86e0c611b17d98fe7d942e9142fdf8c95c6d0a32e2016b3f384b52efae3bd75012c12299b02d055578
-DIST serde_derive-1.0.162.crate 55076 BLAKE2B 1d83bd6a397b27c412f07462e4898e4aad2f724acf5d2d3a295efa3b311bd94186aefb2bd2ce5b5ca74e779814c87e694b005ea25a65695388d4a30bce00ff32 SHA512 edd1bd42b130df0625cd762a827ab44ee49420c704eb581205f6010270550a9f22eeb3b658a52645877537d29b81b324ec209f21aa3bcd09a2749007b27cde4a
-DIST stfu8-0.2.6.crate 42575 BLAKE2B 115f13b087327cf9adbea356f4d688467b4cfeeab09440f1849ad8c80e15868a4bc427560f485c793911164edb3feef2011ccee3013a163b865f0a7a5d6f9779 SHA512 4836f4f2a1469f91e7c1725c1953281f0adea4efa98e6916b671b869f2e6fdc7f0b7d62037e05e5457f793df6eaa517823548c6ec6151027a1c2a70115e93bb0
-DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST syn-2.0.15.crate 240785 BLAKE2B ee2a2250e7083770f8fcb5ac0b387a28bab041e56dc9a835bdc366d39830cbd464aec156b47947331864220d78856f74e94c24061bd0c4fc908584efd355bce6 SHA512 19520d13b417ad2cabaf7e31f45271d41f26158607d0ab21e76a04e824133c64f4acba0f8c044c675028832563ed7cc73fd88d519520ef3834008dbb3d04663b
+DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
+DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6
+DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
+DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
+DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
+DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
+DIST stfu8-0.2.7.crate 42753 BLAKE2B 0fd14038b094f0351fc80d9de4b8d5f83b047577d0c59af549e7ba5c980f4e7db71b8368dfa29d877c8d834dcb59a752e2234c502914900a97d4a0bf796c83ec SHA512 5584cd8b16b78e6131a6f4f6601fcfafc737bcf614855595e5a2253b20c031045dd48fa5fddc124538f27c031b879be7d71918f588edc273dd52fdece70e3e59
+DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0e15b07101a680394204af2df8897ba784dbe57b95c4fa9e732439d0f5aabb090b1b1c81f066bfa125919419 SHA512 ef4165dabaf8cbdd6c58420043cff9c0d1f4bc3ed53de5973b654bd71ac7d462fecaa6e1b750fbcbb8e19b35f6e6b73641a17656b20f5562b6ba7d84e69de226
+DIST syn-2.0.55.crate 254901 BLAKE2B f48da9df7d80bc35ec7f88d2b73a29fc1f2daaf2b1e2120c8a145c730e99148ef7a41fde7466f3b12ce8f017b505341cf5109353a9aa2164827a724b775167bb SHA512 093414e1db32cf723161fdf213c6bc59aeda00c6867ca8cc28997822375bca07ec709e47324bdb936df87298e84da296fe15968811a0d74c978a1a90b89dbd3a
 DIST sysinfo-0.27.8.crate 145438 BLAKE2B 52cef5486325bbc30e3f9a41fb3fe39b6a803127bd1a37b4223573973efbade9922a7c8986cb0bbfa601b3cd000dce78e3e501c62f041d1271e2e2ae44f9c8f1 SHA512 0efb86996318139dd0d6a5360b69adf9e093e0f06c855b47b9c46498871213cf4924afd0db92614df6191659379e1fd317bce434bd1eb57efc89cd10724bc5fa
-DIST tempfile-3.5.0.crate 31129 BLAKE2B 6d32584819794dbbb1f30970577ca2c82cf79979f94b070327285ae8bca6f8e3ea2402d2034290472f284ce039a3a578bfdfa81a53b5c49b587dbdb40960f6fe SHA512 8e8775a9727e32f6931b3289d2b8aefa5ede7b224ae2e1937da3aff371ef5f6078587f060eb36793e9779249992a97acc39c02c6095c41467929e39ada12c7db
-DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
+DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed
 DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
-DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3
-DIST thiserror-1.0.40.crate 18709 BLAKE2B 8057ebcd11546f8b3ae5d760c1dd1764386f3c29dc43bc7a4aef20604970c65356daef137734e80260051d41e39979943bfda496459696b924a95f455159704c SHA512 db1b1fab3aa61dc6bbc672670eb70cee2f838fa713d3a927022900eddde253108d123bded1aa6df8d314e1aa2f8ff37bc72fc9b0803fe3a56447a64290ab2a91
-DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2
+DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
+DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST thousands-0.2.0.crate 11060 BLAKE2B 89ef9e6ee8eb838e288c5e36708bfb391e98be1179b6801b3304c5a7049becad12f00f46696fb4cc6c86003f8fbb2eeb69cfa8467b22051f385782c1ff156477 SHA512 a16d015c584791e6e8ea13e6e114ff5126ada15a8d375c3608911946a6769ac4e9c31592d71fc0868c43879b0228c65e6fb9c0b83e63b818286898b2ff9ef19b
 DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
-DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
-DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
+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 utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 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.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5
+DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa
+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 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.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.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
+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-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
-DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
-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_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_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_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_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_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_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-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.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50
+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_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_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_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_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_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_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
+DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
diff --git a/sys-block/dust/dust-0.8.6.ebuild b/sys-block/dust/dust-0.8.6.ebuild
deleted file mode 100644
index 1b2b63185ad0..000000000000
--- a/sys-block/dust/dust-0.8.6.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.5.4
-
-EAPI=8
-
-CRATES="
-	aho-corasick-1.0.1
-	ansi_term-0.12.1
-	anstyle-1.0.0
-	assert_cmd-2.0.11
-	atty-0.2.14
-	autocfg-1.1.0
-	bitflags-1.3.2
-	bstr-1.4.0
-	cc-1.0.79
-	cfg-if-1.0.0
-	clap-3.2.25
-	clap_complete-3.2.5
-	clap_lex-0.2.4
-	clap_mangen-0.1.11
-	config-file-0.2.3
-	core-foundation-sys-0.8.4
-	crossbeam-channel-0.5.8
-	crossbeam-deque-0.8.3
-	crossbeam-epoch-0.9.14
-	crossbeam-utils-0.8.15
-	difflib-0.4.0
-	directories-4.0.1
-	dirs-sys-0.3.7
-	doc-comment-0.3.3
-	either-1.8.1
-	errno-0.3.1
-	errno-dragonfly-0.1.2
-	fastrand-1.9.0
-	getrandom-0.2.9
-	hashbrown-0.12.3
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hermit-abi-0.3.1
-	indexmap-1.9.3
-	instant-0.1.12
-	io-lifetimes-1.0.10
-	itertools-0.10.5
-	lazy_static-1.4.0
-	libc-0.2.142
-	linux-raw-sys-0.3.7
-	lscolors-0.13.0
-	memchr-2.5.0
-	memoffset-0.8.0
-	ntapi-0.4.1
-	nu-ansi-term-0.46.0
-	num_cpus-1.15.0
-	once_cell-1.17.1
-	os_str_bytes-6.5.0
-	overload-0.1.1
-	predicates-3.0.3
-	predicates-core-1.0.6
-	predicates-tree-1.0.9
-	proc-macro2-1.0.56
-	quote-1.0.26
-	rayon-1.7.0
-	rayon-core-1.11.0
-	redox_syscall-0.2.16
-	redox_syscall-0.3.5
-	redox_users-0.4.3
-	regex-1.8.1
-	regex-automata-0.1.10
-	regex-syntax-0.7.1
-	roff-0.2.1
-	rustix-0.37.19
-	scopeguard-1.1.0
-	serde-1.0.162
-	serde_derive-1.0.162
-	stfu8-0.2.6
-	strsim-0.10.0
-	syn-2.0.15
-	sysinfo-0.27.8
-	tempfile-3.5.0
-	termcolor-1.2.0
-	terminal_size-0.2.6
-	termtree-0.4.1
-	textwrap-0.16.0
-	thiserror-1.0.40
-	thiserror-impl-1.0.40
-	thousands-0.2.0
-	toml-0.5.11
-	unicode-ident-1.0.8
-	unicode-width-0.1.10
-	wait-timeout-0.2.0
-	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
-	windows-sys-0.45.0
-	windows-sys-0.48.0
-	windows-targets-0.42.2
-	windows-targets-0.48.0
-	windows_aarch64_gnullvm-0.42.2
-	windows_aarch64_gnullvm-0.48.0
-	windows_aarch64_msvc-0.42.2
-	windows_aarch64_msvc-0.48.0
-	windows_i686_gnu-0.42.2
-	windows_i686_gnu-0.48.0
-	windows_i686_msvc-0.42.2
-	windows_i686_msvc-0.48.0
-	windows_x86_64_gnu-0.42.2
-	windows_x86_64_gnu-0.48.0
-	windows_x86_64_gnullvm-0.42.2
-	windows_x86_64_gnullvm-0.48.0
-	windows_x86_64_msvc-0.42.2
-	windows_x86_64_msvc-0.48.0
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A more intuitive version of du"
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/bootandy/dust"
-SRC_URI="
-	https://github.com/bootandy/dust/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-"
-
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT Unicode-DFS-2016 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-# 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/dust"
-
-DOCS=(
-	README.md
-)
-
-src_install() {
-	cargo_src_install
-	doman man-page/dust.1
-
-	newbashcomp completions/dust.bash dust
-
-	insinto /usr/share/fish/completions
-	doins completions/dust.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/_dust
-}
diff --git a/sys-block/dust/dust-1.1.1.ebuild b/sys-block/dust/dust-1.1.1.ebuild
new file mode 100644
index 000000000000..4fea455abe5e
--- /dev/null
+++ b/sys-block/dust/dust-1.1.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.3
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.3
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	ansi_term@0.12.1
+	anstream@0.6.13
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	assert_cmd@2.0.14
+	autocfg@1.3.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	bstr@1.9.1
+	bumpalo@3.16.0
+	cc@1.0.97
+	cfg-if@1.0.0
+	cfg_aliases@0.1.1
+	chrono@0.4.38
+	clap@4.5.4
+	clap_builder@4.5.2
+	clap_complete@4.5.1
+	clap_lex@0.7.0
+	clap_mangen@0.2.20
+	colorchoice@1.0.0
+	config-file@0.2.3
+	core-foundation-sys@0.8.6
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	ctrlc@3.4.4
+	difflib@0.4.0
+	directories@4.0.1
+	dirs-sys@0.3.7
+	doc-comment@0.3.3
+	either@1.10.0
+	errno@0.3.8
+	fastrand@2.0.2
+	filesize@0.2.0
+	getrandom@0.2.12
+	hermit-abi@0.3.9
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	io-lifetimes@1.0.11
+	itoa@1.0.11
+	js-sys@0.3.69
+	libc@0.2.155
+	libredox@0.0.1
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.13
+	log@0.4.21
+	lscolors@0.13.0
+	memchr@2.7.1
+	nix@0.28.0
+	ntapi@0.4.1
+	nu-ansi-term@0.46.0
+	num-traits@0.2.19
+	once_cell@1.19.0
+	overload@0.1.1
+	predicates-core@1.0.6
+	predicates-tree@1.0.9
+	predicates@3.1.0
+	proc-macro2@1.0.79
+	quote@1.0.35
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.4.1
+	redox_users@0.4.4
+	regex-automata@0.4.6
+	regex-syntax@0.8.2
+	regex@1.10.4
+	roff@0.2.1
+	rustix@0.37.27
+	rustix@0.38.32
+	ryu@1.0.17
+	serde@1.0.197
+	serde_derive@1.0.197
+	serde_json@1.0.116
+	stfu8@0.2.7
+	strsim@0.11.0
+	syn@2.0.55
+	sysinfo@0.27.8
+	tempfile@3.10.1
+	terminal_size@0.2.6
+	termtree@0.4.1
+	thiserror-impl@1.0.58
+	thiserror@1.0.58
+	thousands@0.2.0
+	toml@0.5.11
+	unicode-ident@1.0.12
+	unicode-width@0.1.11
+	utf8parse@0.2.1
+	wait-timeout@0.2.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
+	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.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 bash-completion-r1 cargo
+
+DESCRIPTION="A more intuitive version of du"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/bootandy/dust"
+SRC_URI="
+	https://github.com/bootandy/dust/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	BSD-2 MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+QA_FLAGS_IGNORED="usr/bin/dust"
+
+DOCS=(
+	README.md
+)
+
+src_install() {
+	cargo_src_install
+	doman man-page/dust.1
+
+	newbashcomp completions/dust.bash dust
+
+	insinto /usr/share/fish/completions
+	doins completions/dust.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/_dust
+}
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index f63423d3be6d..9ab43529ad5e 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,2 +1 @@
-DIST gparted-1.5.0.tar.gz 5416965 BLAKE2B 034fcbfde4b74f99769f5bff27ec7a84f7f6cf8e37d944aa7bce61d0421f02711d77bc695667ea34523b066c6f925437e24d34c5b172fe56be5ce23f99283f53 SHA512 af32358bc470d30c38cdf688e8f940548c7361808fbc7712dc79ef6d196e3bfbf9c9e0ee499729e78d4b782ed1f52ea1f55c983e9afe8fc3fea765078ffbddad
 DIST gparted-1.6.0.tar.gz 5404754 BLAKE2B 994023a85281036d4a10733144d63f7a9f57d0aca29fde0502a594b4da629061f1f6eef4b0db3e22ef28db6567f27e824de124f42309980388bc038240fdcdd6 SHA512 359accfee955fb68131eb7b5737a2e74702abe2c29766ce07475a4c789983801ee129dec28b20c72d74210533423dfefd0626b794a540840ed0b36f0d71ccc60
diff --git a/sys-block/gparted/gparted-1.5.0-r1.ebuild b/sys-block/gparted/gparted-1.5.0-r1.ebuild
deleted file mode 100644
index fcf4eb595189..000000000000
--- a/sys-block/gparted/gparted-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2 optfeature virtualx
-
-DESCRIPTION="Partition editor for graphically managing your disk partitions"
-HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="kde policykit wayland"
-
-DEPEND="
-	!policykit? (
-		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1:*[kdesu] ) )
-	policykit? ( >=sys-auth/polkit-0.102 )
-	>=dev-cpp/glibmm-2.56.1:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.58.3-r1:2
-	>=sys-block/parted-3.2:=
-	>=dev-libs/libsigc++-2.10.1:2
-"
-RDEPEND="${DEPEND}
-	>=sys-apps/util-linux-2.33.2
-	wayland? ( x11-apps/xhost )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		$(use_enable wayland xhost-root) \
-		GKSUPROG=kdesu \
-		ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-	local _bdir="${D}"/usr/bin
-
-	if ! use policykit; then
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop || die
-			cp "${_bdir}"/gparted{,-kde} || die
-			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
-		fi
-	else
-		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
-	fi
-
-	mv "${ED}"/usr/share/{appdata,metainfo}
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	optfeature_header
-	optfeature "BTRFS support"                   sys-fs/btrfs-progs
-	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
-	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
-	optfeature "exFAT support"                   sys-fs/exfatprogs
-	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
-	optfeature "F2FS support"                    sys-fs/f2fs-tools
-	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
-	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
-	optfeature "JFS support"                     sys-fs/jfsutils
-	optfeature "MDADM support"                   sys-fs/mdadm
-	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
-	optfeature "Reiser4 support"                 sys-fs/reiser4progs
-	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
-	optfeature "UDF support"                     sys-fs/udftools
-	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
-}
diff --git a/sys-block/gparted/gparted-1.6.0-r1.ebuild b/sys-block/gparted/gparted-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..e6b5ff10483d
--- /dev/null
+++ b/sys-block/gparted/gparted-1.6.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 optfeature virtualx
+
+DESCRIPTION="Partition editor for graphically managing your disk partitions"
+HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+IUSE="kde policykit wayland"
+
+DEPEND="
+	!policykit? ( kde? ( || (
+		kde-plasma/kdesu-gui
+		>=kde-plasma/kde-cli-tools-5.8.6-r1:*[kdesu]
+	) ) )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	>=dev-cpp/glibmm-2.56.1:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.58.3-r1:2
+	>=sys-block/parted-3.2:=
+	>=dev-libs/libsigc++-2.10.1:2
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/util-linux-2.33.2
+	wayland? ( x11-apps/xhost )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		$(use_enable wayland xhost-root) \
+		GKSUPROG=kdesu \
+		ac_cv_prog_have_scrollkeeper_update=no
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+	local _bdir="${D}"/usr/bin
+
+	if ! use policykit; then
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop || die
+			cp "${_bdir}"/gparted{,-kde} || die
+			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
+		fi
+	else
+		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
+	fi
+
+	mv "${ED}"/usr/share/{appdata,metainfo}
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	optfeature_header
+	optfeature "BTRFS support"                   sys-fs/btrfs-progs
+	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
+	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
+	optfeature "exFAT support"                   sys-fs/exfatprogs
+	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
+	optfeature "F2FS support"                    sys-fs/f2fs-tools
+	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
+	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
+	optfeature "JFS support"                     sys-fs/jfsutils
+	optfeature "MDADM support"                   sys-fs/mdadm
+	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
+	optfeature "Reiser4 support"                 sys-fs/reiser4progs
+	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
+	optfeature "UDF support"                     sys-fs/udftools
+	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
+}
diff --git a/sys-block/gparted/gparted-1.6.0.ebuild b/sys-block/gparted/gparted-1.6.0.ebuild
deleted file mode 100644
index 9b9129a804a9..000000000000
--- a/sys-block/gparted/gparted-1.6.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 gnome2 optfeature virtualx
-
-DESCRIPTION="Partition editor for graphically managing your disk partitions"
-HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="kde policykit wayland"
-
-DEPEND="
-	!policykit? (
-		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1:*[kdesu] ) )
-	policykit? ( >=sys-auth/polkit-0.102 )
-	>=dev-cpp/glibmm-2.56.1:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.58.3-r1:2
-	>=sys-block/parted-3.2:=
-	>=dev-libs/libsigc++-2.10.1:2
-"
-RDEPEND="${DEPEND}
-	>=sys-apps/util-linux-2.33.2
-	wayland? ( x11-apps/xhost )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		$(use_enable wayland xhost-root) \
-		GKSUPROG=kdesu \
-		ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-	local _bdir="${D}"/usr/bin
-
-	if ! use policykit; then
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop || die
-			cp "${_bdir}"/gparted{,-kde} || die
-			sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
-		fi
-	else
-		sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
-	fi
-
-	mv "${ED}"/usr/share/{appdata,metainfo}
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	optfeature_header
-	optfeature "BTRFS support"                   sys-fs/btrfs-progs
-	optfeature "DMRAID support"                  sys-fs/dmraid sys-fs/multipath-tools
-	optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
-	optfeature "exFAT support"                   sys-fs/exfatprogs
-	optfeature "EXT2/EXT3/EXT4 support"          sys-fs/e2fsprogs
-	optfeature "F2FS support"                    sys-fs/f2fs-tools
-	optfeature "FAT support"                     sys-fs/dosfstools sys-fs/mtools
-	optfeature "HFS support"                     sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
-	optfeature "JFS support"                     sys-fs/jfsutils
-	optfeature "MDADM support"                   sys-fs/mdadm
-	optfeature "NTFS support"                    sys-fs/ntfs3g[ntfsprogs]
-	optfeature "Reiser4 support"                 sys-fs/reiser4progs
-	optfeature "ReiserFS support"                sys-fs/reiserfsprogs
-	optfeature "UDF support"                     sys-fs/udftools
-	optfeature "XFS support"                     sys-fs/xfsprogs sys-fs/xfsdump
-}
diff --git a/sys-block/mbuffer/mbuffer-20240707.ebuild b/sys-block/mbuffer/mbuffer-20240707.ebuild
index 3d2537b9655f..c1354afd7ec1 100644
--- a/sys-block/mbuffer/mbuffer-20240707.ebuild
+++ b/sys-block/mbuffer/mbuffer-20240707.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-r${PV}
 
 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 )"
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index bcef9a2d7b16..4d023e607777 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,3 +1 @@
 DIST open-iscsi-2.1.10.tar.gz 645825 BLAKE2B 6a2e279e2dcf77e8d340c025eb59168121ee0c50bd013d0b5d9dac2fbc7116cc54904b4206eea192bd3888e3bcf3da42caeae1e428268edc6c2f7184958b6b04 SHA512 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d
-DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0 SHA512 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1
-DIST open-iscsi-2.1.9.tar.gz 641974 BLAKE2B 87570329dd5902bf96f1c11786c7a814892c851eabb63148f35b85494242f7379db1770a93549dcb871bafa148d37b320b389a98eed2ac46b7252ed22187ecd1 SHA512 25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
deleted file mode 100644
index 13215dafbb69..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.9-usr-idbm.c-fix-musl-build-426.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/open-iscsi/open-iscsi/commit/11bdc17938ba648c81a853355a6bbddad69a9fc7
-https://bugs.gentoo.org/908587
-
-From 11bdc17938ba648c81a853355a6bbddad69a9fc7 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 4 Oct 2023 23:18:20 +0200
-Subject: [PATCH] usr/idbm.c: fix musl build (#426)
-
-Fix the following musl build failure raised since version 2.1.9 and
-https://github.com/open-iscsi/open-iscsi/commit/7b571d76d6937a78c141630fc38c3c57c532466c:
-
-../usr/idbm.c: In function 'idbm_rec_write_old':
-../usr/idbm.c:2230:27: error: 'GLOB_ONLYDIR' undeclared (first use in this function)
- 2230 |         rc = glob(portal, GLOB_ONLYDIR, NULL, &globbuf);
-      |                           ^~~~~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/14fc1c139f055b5b1eaa6e04e327863c06176a7b
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- usr/idbm.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/usr/idbm.c b/usr/idbm.c
-index ca4a4ec..c39abb6 100644
---- a/usr/idbm.c
-+++ b/usr/idbm.c
-@@ -45,6 +45,11 @@
- #include "fw_context.h"
- #include "iscsi_err.h"
- 
-+// GLOB_ONLYDIR is not defined under musl
-+#ifndef GLOB_ONLYDIR
-+#define GLOB_ONLYDIR	0x100
-+#endif
-+
- #define IDBM_HIDE	0    /* Hide parameter when print. */
- #define IDBM_SHOW	1    /* Show parameter when print. */
- #define IDBM_MASKED	2    /* Show "stars" instead of real value when print */
--- 
-2.41.0
-
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.10-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.10-r1.ebuild
new file mode 100644
index 000000000000..fa3f81798159
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.1.10-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd toolchain-funcs udev
+
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="https://www.open-iscsi.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ GPL-2+"
+SLOT="0/0.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug infiniband +tcp rdma systemd"
+REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
+# Tries to write to /run/lock/iscsi etc
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/openssl:=
+	sys-apps/kmod
+	sys-block/open-isns:=
+	sys-kernel/linux-headers
+	infiniband? ( sys-cluster/rdma-core )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+	${DEPEND}
+	sys-fs/lsscsi
+	sys-apps/util-linux
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is -lt 2 6 16; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtin options don't work. See this for
+	# more information:
+	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+	RDMA_MODULES="INFINIBAND_ISER"
+	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
+	if linux_config_exists; then
+		if use tcp; then
+			for module in ${TCP_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use infiniband; then
+			for module in ${INFINIBAND_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+		fi
+		if use rdma; then
+			for module in ${RDMA_MODULES}; do
+				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
+			done
+		fi
+	fi
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
+	# TODO: Make sys-block/open-isns optional if useful? There's an upstream
+	# build system option for this already as of 2.1.9.
+	local emesonargs=(
+		-Dsystemddir="$(systemd_get_utildir)"
+		-Drulesdir="$(get_udevdir)"/rules.d
+		$(meson_use !systemd no_systemd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# We'll regenerate this later to avoid baking the value into binary
+	# packages. It doesn't get generated when cross-compiling.
+	tc-is-cross-compiler || rm "${ED}"/etc/iscsi/initiatorname.iscsi || die
+
+	docinto test/
+	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
+
+	insinto /etc/iscsi
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+
+	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
+	newinitd "${FILESDIR}"/iscsid-init.d iscsid
+
+	keepdir /var/db/iscsi
+	fperms 700 /var/db/iscsi
+	fperms 600 /etc/iscsi/iscsid.conf
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if ! tc-is-cross-compiler && [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
+		{
+		  cat "${EROOT}${in}.example"
+		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
+		  echo "InitiatorName=$("${EROOT}"/usr/sbin/iscsi-iname)"
+		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
+	fi
+
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild
index ea8cc6da43a0..356c6f8785f1 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ GPL-2+"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
deleted file mode 100644
index 93b8afb21848..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd udev
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="https://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug infiniband +tcp rdma systemd"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-# Tries to write to /run/lock/iscsi etc
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/openssl:=
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-cluster/rdma-core )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-
-	local emesonargs=(
-		-Dsystemddir="$(systemd_get_utildir)"
-		-Drulesdir="$(get_udevdir)"/rules.d
-		$(meson_use !systemd no_systemd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	docinto test/
-	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-
-	udev_reload
-}
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
deleted file mode 100644
index d5126eaad442..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info meson systemd udev
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="https://www.open-iscsi.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+ GPL-2+"
-SLOT="0/0.2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug infiniband +tcp rdma systemd"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-# Tries to write to /run/lock/iscsi etc
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/openssl:=
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-cluster/rdma-core )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
-	"${FILESDIR}"/${P}-usr-idbm.c-fix-musl-build-426.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-
-	# TODO: Make sys-block/open-isns optional if useful? There's an upstream
-	# build system option for this already as of 2.1.9.
-	local emesonargs=(
-		-Dsystemddir="$(systemd_get_utildir)"
-		-Drulesdir="$(get_udevdir)"/rules.d
-		$(meson_use !systemd no_systemd)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	docinto test/
-	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-
-	udev_reload
-}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 3c37c2c940e5..232861333757 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,2 +1,3 @@
 DIST partitionmanager-23.08.5.tar.xz 2148168 BLAKE2B c755a3f828de0acd70f785896c0837a8730b4429b678033d206d67684e648dc43af3d4ae001125fe5a843cc51ef9544c69619e68452936b734afa7d75d37b62f SHA512 5eb6ee5f021a40c597d7f21bc4ae63d05a94564caa32ee72e4a44eb1d21ae7d4628e8bbf5b6645dcf5be2ac3162e5acc712f2982a14ce60ec5acc87409252f1a
 DIST partitionmanager-24.05.2.tar.xz 2314400 BLAKE2B e9c20e2fb909d8377d7c4ee9a202a17fd58b0d651666804349402317f80728de3bc2624f82df7f78c81e2fb3ab90b2044f71503045124947497d86f833676e3a SHA512 1cf48e39d24204b2289c6c67554c9a635acede5c444c7f1b4e55e4d9d8f3b14aa8bbc5aabc267e695eb6ff791248dd70ad8dc03fb08db26103b1e6e401d8cee1
+DIST partitionmanager-24.08.0.tar.xz 2321944 BLAKE2B 59e3bbb006c4fe0470e405a1e8f4c57f5ada0338fd61cd74fe2e42ea174471aa5fffc889909641c4715da28a8f3ff6c7b5fc83e1106110ce3ec47e6009f0ae25 SHA512 2289c8a9de974b73bb9cf32b4a323678de7d1bc915bd912835c9ebf6b1fc7489d27dbc795263345b5b0717d09118765b3658cd1f6756c2c17b8c5fef80bf40a8
diff --git a/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild b/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild
index 85a67d539d50..65c1c454eef2 100644
--- a/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/partitionmanager/partitionmanager-24.08.0.ebuild b/sys-block/partitionmanager/partitionmanager-24.08.0.ebuild
new file mode 100644
index 000000000000..9c534512ed34
--- /dev/null
+++ b/sys-block/partitionmanager/partitionmanager-24.08.0.ebuild
@@ -0,0 +1,36 @@
+# 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/sas2ircu/sas2ircu-20-r2.ebuild b/sys-block/sas2ircu/sas2ircu-20-r2.ebuild
new file mode 100644
index 000000000000..5fe19539e711
--- /dev/null
+++ b/sys-block/sas2ircu/sas2ircu-20-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SAS2IRCU
+MY_P="${MY_PN}_P${PV}"
+
+DISTFILE_BIN=${MY_P}.zip
+DISTFILE_DOC="SAS2IRCU_User_Guide.pdf"
+DOC_PV=12
+SRC_URI_BIN="https://docs.broadcom.com/docs/${DISTFILE_BIN}"
+# This is "SAS-2 Integrated RAID Configuration Utility (SAS2IRCU) User Guide"
+# and replaces the older SAS2_IR_User_Guide.pdf.
+# It contains additional material compared to the older PDF.
+SRC_URI_DOC="https://docs.broadcom.com/doc/12353380"
+
+inherit mount-boot secureboot linux-info
+
+DESCRIPTION="LSI MPT-SAS2 controller management tool"
+HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8e#tab-archive-drivers4-abc"
+SRC_URI="
+${SRC_URI_BIN}
+doc? ( ${SRC_URI_DOC} -> ${DISTFILE_DOC} )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LSI"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~x64-solaris"
+IUSE="doc uefi"
+RESTRICT="strip fetch mirror"
+
+BDEPEND="app-arch/unzip"
+QA_PREBUILT="opt/lsi/sas2ircu boot/efi/sas2ircu.efi"
+
+LICENSE_URL="http://www.lsi.com/cm/License.do?url=&prodName=&subType=Miscellaneous&locale=EN"
+
+pkg_pretend() {
+	use uefi && mount-boot_pkg_pretend
+}
+
+pkg_nofetch() {
+	elog "LSI has a mandatory click-through license on their binaries."
+	elog "Please visit ${SRC_URI_BIN} to agree to the license and download the binary."
+	elog "After downloading, move ${DISTFILE_BIN} into your DISTDIR directory"
+	if use doc; then
+		elog "Please also download 'SAS-2 Integrated RAID Configuration Utility User Guide' at ${SRC_URI_DOC}"
+		elog "and also place it into your DISTDIR directory, named ${DISTFILE_DOC}"
+	fi
+}
+
+pkg_setup() {
+	if ! use x86; then
+		# For newer kernels it needs to be enabled as well, don't know
+		# how to check for that short of running the binary.
+		local CONFIG_CHECK="IA32_EMULATION"
+		check_extra_config
+	fi
+}
+
+supportedcards() {
+	elog "This binary supports should support ALL cards, including, but not"
+	elog "limited to the following series:"
+	elog ""
+	elog "LSI SAS 2004"
+	elog "LSI SAS 2008"
+	elog "LSI SAS 2108"
+	elog "LSI SAS 2208"
+	elog "LSI SAS 2304"
+	elog "LSI SAS 2308"
+	elog "Dell PERC H200, H700"
+	elog "IBM System x3200 M2 (4367, 4368)"
+	elog "IBM System x3200 M3 (7327, 7328)"
+	elog "IBM System x3250 M2 (4190, 4191, 4194)"
+	elog "IBM System x3250 M3 (4251, 4252, 4261)"
+	elog "IBM System x3350 (4192, 4193)"
+	elog "IBM System x3400 (7973, 7974, 7975, 7976)"
+	elog "IBM System x3400 M2 (7836, 7837)"
+	elog "IBM System x3455 (7940, 7941)"
+	elog "IBM System x3500 (7977)"
+	elog "IBM System x3500 M2 (7839)"
+	elog "IBM System x3550 (7978, 1913)"
+	elog "IBM System x3550 M2 (7946, 4198)"
+	elog "IBM System x3650 (7979, 1914)"
+	elog "IBM System x3650 M2 (7947, 4199)"
+	elog "IBM System x3650 NAS (7979)"
+	elog "IBM System x3655 (7985, 7943)"
+	elog "IBM System x3755 (8877, 7163)"
+	elog "IBM System x3850 M2 (7141, 7144, 7233, 7234)"
+	elog "IBM System x3850 X5 (7145, 7146)"
+	elog "IBM System x3950 M2 (7141, 7233, 7234)"
+	elog "IBM System x3950 X5 (7145)"
+}
+
+src_unpack() {
+	unpack ${DISTFILE_BIN}
+}
+
+src_install() {
+	exeinto /opt/lsi/
+	use amd64 || use x86 && doexe sas2ircu_linux_x86_rel/sas2ircu
+	use ppc64 && doexe sas2ircu_linux_x86_rel/sas2ircu
+	use x64-solaris && doexe sas2ircu_solaris_x86_rel/sas2ircu
+	if use uefi; then
+		if use amd64; then
+			exeinto /boot/efi/
+			doexe sas2ircu_efi_ebc_rel/sas2ircu.efi
+			secureboot_auto_sign --in-place
+		fi
+	fi
+	dodoc Readme_Release_Notes_SAS2IRCU_Phase_${PV}.00.00.00.txt
+	dodoc SAS2IRCU_Phase${PV}.0-${PV}.00.00.00.pdf
+	use doc && dodoc "${DISTDIR}"/${DISTFILE_DOC}
+	dodir /opt/bin
+	dosym ../lsi/sas2ircu /opt/bin/sas2ircu
+}
+
+pkg_preinst() {
+	use uefi && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use uefi && mount-boot_pkg_prerm
+}
diff --git a/sys-block/sas3ircu/sas3ircu-16-r2.ebuild b/sys-block/sas3ircu/sas3ircu-16-r2.ebuild
new file mode 100644
index 000000000000..19b627edc362
--- /dev/null
+++ b/sys-block/sas3ircu/sas3ircu-16-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN^^}_P${PV}"
+
+DISTFILE_BIN="${MY_P}.zip"
+DISTFILE_DOC="SAS3_IR_UG.pdf"
+SRC_URI_BASE="https://docs.broadcom.com/docs-and-downloads/host-bus-adapters"
+
+inherit mount-boot secureboot
+
+DESCRIPTION="LSI MPT-SAS3 controller management tool"
+HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads"
+SRC_URI="
+	${SRC_URI_BASE}/host-bus-adapters-common-files/sas_sata_12g_p${PV}/${DISTFILE_BIN}
+	https://docs.broadcom.com/docs/${DISTFILE_BIN}
+	doc? ( "${SRC_URI_BASE}/${DISTFILE_DOC}" )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LSI"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-solaris"
+IUSE="doc uefi"
+RESTRICT="strip fetch mirror"
+
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="opt/lsi/sas3ircu boot/efi/sas3ircu.efi"
+
+pkg_pretend() {
+	use uefi && mount-boot_pkg_pretend
+}
+
+pkg_nofetch() {
+	elog "Broadcom has a mandatory click-through license on their binaries."
+	elog "Please visit ${HOMEPAGE} and download ${DISTFILE_BIN} from the Mangement Software section."
+	elog "If the file has been moved again, the license form might be available at https://docs.broadcom.com/docs/${DISTFILE_BIN}"
+	elog "After downloading, move ${MY_P} into your DISTDIR directory"
+	if use doc; then
+		elog "Please also download 'SAS-3 Integrated RAID Configuration Utility User Guide' (${DISTFILE_DOC}) "
+		elog "and also place it into your DISTDIR directory"
+	fi
+	einfo "${SRC_URI}"
+}
+
+pkg_setup() {
+	use uefi && secureboot_pkg_setup
+}
+
+supportedcards() {
+	elog "This binary supports should support ALL cards, including, but not"
+	elog "limited to the following series:"
+	elog ""
+	elog "LSI SAS 3004"
+	elog "LSI SAS 3008"
+	elog "LSI SAS 3108"
+	elog "LSI SAS 3116"
+	elog "LSI SAS 3208"
+	elog "LSI SAS 3308"
+}
+
+src_install() {
+	# The second number is some sort of internal revision that is inconsistent between releases.
+	local DOCS=( IRCU_MPT_GEN3_Phase"${PV}".0-*.pdf "README_SAS3IRCU_P${PV}.txt" )
+	use doc && DOCS+=( "${DISTDIR}/${DISTFILE_DOC}" )
+
+	default
+
+	local ARCH
+	use amd64 && ARCH="x64"
+	use arm64 && ARCH="arm"
+	use ppc64 && ARCH="ppc64"
+	use x64-solaris && ARCH="solaris_x86"
+	use x86 && ARCH="x86"
+
+	exeinto /opt/lsi/
+	doexe sas3ircu_rel/sas3ircu/sas3ircu_linux_"${ARCH}"_rel/sas3ircu
+
+	if use uefi; then
+		if use amd64 || use arm64; then
+			exeinto /boot/efi/
+			doexe sas3ircu_rel/sas3ircu/sas3ircu_udk_uefi_"${ARCH}"_rel/sas3ircu.efi
+			secureboot_auto_sign --in-place
+		fi
+	fi
+
+	dodir /opt/bin
+	dosym ../lsi/sas3ircu /opt/bin/sas3ircu
+}
+
+pkg_preinst() {
+	use uefi && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use uefi && mount-boot_pkg_prerm
+}
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
index 5e1f208f9dba..27153b7326a4 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
@@ -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 ~ia64 ~riscv ~x86"
+KEYWORDS="-* amd64 ~arm arm64 ~ia64 ~riscv x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
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
new file mode 100644
index 000000000000..d492de252a80
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2004-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
+
+# inc/, lib/ dirs (README.efilib)
+# - BSD-2
+# gnuefi dir:
+# - BSD (3-cluase): crt0-efi-ia32.S
+# - GPL-2+ : setjmp_ia32.S
+LICENSE="GPL-2+ BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
+IUSE="abi_x86_32 abi_x86_64 custom-cflags"
+REQUIRED_USE="
+	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
+	x86? ( || ( abi_x86_32 abi_x86_64 ) )
+"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+# These objects get run early boot (i.e. not inside of Linux),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch
+)
+
+check_and_set_objcopy() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		# bug #931792
+		# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
+		tc-export OBJCOPY
+		OBJCOPY="${OBJCOPY/llvm-/}"
+		if ! use arm && ! use riscv; then
+			# bug #939338
+			# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le
+			# gnu-efi containes a workaround
+			LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
+		fi
+	fi
+}
+
+check_comppiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		tc-is-gcc || tc-is-clang || die "Unsupported compiler"
+	fi
+}
+
+pkg_pretend() {
+	check_comppiler
+	check_and_set_objcopy
+}
+
+pkg_setup() {
+	check_and_set_objcopy
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Make.defaults || die
+}
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		riscv64*) arch=riscv64;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		OBJCOPY="${OBJCOPY}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD OBJCOPY
+
+	if ! use custom-cflags; then
+		unset CFLAGS CPPFLAGS LDFLAGS
+	fi
+
+	# work around musl: include first the compiler include dir, then the system one
+	# bug #933080, #938012
+	local CPPINCLUDEDIR
+	if tc-is-gcc; then
+		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include
+	elif tc-is-clang; then
+		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include
+	fi
+	append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include"
+
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/sys-boot/grub/files/sbat.csv b/sys-boot/grub/files/sbat.csv
index 2b87b532556c..f85cd8eb0632 100644
--- a/sys-boot/grub/files/sbat.csv
+++ b/sys-boot/grub/files/sbat.csv
@@ -1,3 +1,3 @@
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-grub,3,Free Software Foundation,grub,%PV%,https//www.gnu.org/software/grub/
+grub,3,Free Software Foundation,grub,%PV%,https://www.gnu.org/software/grub/
 grub.gentoo,1,Gentoo,grub,%PV%,https://bugs.gentoo.org/
diff --git a/sys-boot/grub/grub-2.12-r4.ebuild b/sys-boot/grub/grub-2.12-r4.ebuild
index 5ce4953d88c4..be8779e57cb7 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -57,6 +57,14 @@ else
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
+	"${FILESDIR}"/grub-2.12-fwsetup.patch
+	"${WORKDIR}"/grub-2.12-bash-completion.patch
+)
+
 DEJAVU=dejavu-sans-ttf-2.37
 UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -154,14 +162,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/gfxpayload.patch
-		"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-		"${FILESDIR}"/grub-2.06-test-words.patch
-		"${FILESDIR}"/grub-2.12-fwsetup.patch
-		"${WORKDIR}"/grub-2.12-bash-completion.patch
-	)
-
 	default
 
 	python_setup
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index 1e22477b727a..b79c99dc9484 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -58,6 +58,14 @@ else
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
+	"${FILESDIR}"/grub-2.12-fwsetup.patch
+	"${WORKDIR}"/grub-2.12-bash-completion.patch
+)
+
 DEJAVU=dejavu-sans-ttf-2.37
 UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -155,14 +163,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/gfxpayload.patch
-		"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-		"${FILESDIR}"/grub-2.06-test-words.patch
-		"${FILESDIR}"/grub-2.12-fwsetup.patch
-		"${WORKDIR}"/grub-2.12-bash-completion.patch
-	)
-
 	default
 
 	python_setup
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2b24a0433912..31db1cdb8e2c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -61,6 +61,12 @@ else
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/grub-2.06-test-words.patch
+)
+
 DEJAVU=dejavu-sans-ttf-2.37
 UNIFONT=unifont-15.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -158,12 +164,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/gfxpayload.patch
-		"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-		"${FILESDIR}"/grub-2.06-test-words.patch
-	)
-
 	default
 
 	python_setup
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index a5ad32e2e733..c8fd5827d3e5 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -11,7 +11,7 @@
 </maintainer>
 <use>
 	<flag name="device-mapper">
-		Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg>
+		Enable support for devmapper. Required for LUKS or LVM volume detection.
 	</flag>
 	<flag name="efiemu">
 		Build and install the efiemu runtimes
diff --git a/sys-boot/plymouth-openrc-plugin/Manifest b/sys-boot/plymouth-openrc-plugin/Manifest
index 8cef1c5ec038..eeca4d8d8dcd 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -1,2 +1,3 @@
 DIST plymouth-openrc-plugin-0.1.3.tar.gz 9404 BLAKE2B 809cfab881ef47565badfc330b77ae07a8bbbddf822cbdb50f2d1d2a0c95f915ac5024e02400ab2ea9d8f98dc466a8a3cbad92805587f77a00e58c9f9d78d388 SHA512 b07a4d9d56c8f49d5b0a91799fe0100eac705cd2a266674539948fdc661876474a93d8ed5f329f097a1fc5dc571f3b3c00322191fb77d2a7e32b1ff192ca0a6b
 DIST plymouth-openrc-plugin-0.2.0.tar.gz 10325 BLAKE2B ee66b158d366f5bf12504d1546ec00906f9e73760308975dbc4ea26e5622ee10ab877b47a13269ae11576c7d3e8b4c9484ca0dc61efce0f78f38344515ce4c5e SHA512 4156b291c49cf5c55c78071439530a35f5ec03b1e022bb022839e1b89567653ebb70bf3471b82ae0ecec8fc84c3f41ee2cc6b3de1fa52811a96d0812a6ada772
+DIST plymouth-openrc-plugin-0.3.0.tar.gz 10387 BLAKE2B f7438ba0d6d0f7b4faf160d96b182410d82e21892b2788764182e7311724155abb22dfd1f368f1a02f61059c42b930432c120b085dbceeb2391b5a5e84195dd8 SHA512 361ca6ae7b995e0e71ba3a71aaf481aa69f3e9ebfaa48d0909b098ab33f5519817b5df818194bceac489a0560b99316afbcd2145c05768c54fb759382db526ed
diff --git a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.3.0.ebuild b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.3.0.ebuild
new file mode 100644
index 000000000000..cec7b6155dfc
--- /dev/null
+++ b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Plymouth plugin for OpenRC"
+HOMEPAGE="https://github.com/Kangie/plymouth-openrc-plugin"
+SRC_URI="https://github.com/Kangie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )"
+RDEPEND="${DEPEND}
+	sys-boot/plymouth
+	!sys-apps/systemd"
+
+src_configure() {
+	local emesonargs=(
+		-Ddebug=$(usex debug true false)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "The 'rc_interactive' feature in /etc/rc.conf must be disabled"
+		ewarn "for Plymouth work properly with OpenRC init system."
+	fi
+}
diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
index 1489deec6cd0..c05f2b6b0a0e 100644
--- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ fi
 inherit autotools readme.gentoo-r1 systemd
 
 DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+HOMEPAGE="https://gitlab.freedesktop.org/plymouth/plymouth"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index 5710db2e9511..aafb614c33eb 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ fi
 inherit autotools readme.gentoo-r1 systemd
 
 DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+HOMEPAGE="https://gitlab.freedesktop.org/plymouth/plymouth"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 03f30c77745e..444f31d919a1 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,2 +1,3 @@
 DIST raspberrypi-firmware-1.20221104.tar.gz 184890613 BLAKE2B 51901015d10f7f06504a1cd4eaf50788065f78d806293e5cb40e930c926ad3f76688684b2333c87fd6528418372ac3b5f8f7ad32595a09d4f896717ebea51d29 SHA512 6662f3fdeffbf98819dd57d1c3d8571d7c8bd7d69a8eb5e38823e4ef2857ebfa4e550735f9488e10719a261a0cdcb99cb7f3fb765d674459d42737f4e2cfd357
 DIST raspberrypi-firmware-1.20230106.tar.gz 185087907 BLAKE2B 656cc8325aa96d11f44419e871141beba95172b5c0c96e4b0a4cccca51127040328dc9f6c70cbba0248f8404ce0cf390e4bf937db7e0506c286db5adc4e56eef SHA512 41492a90da91d29e1025deeaad452c6b485f5412ff375b2fc144c2630afcdfef99ecbf701ca5e1afc5bb41bd6f2413b239257f1734dfe17084210e96b28eda7a
+DIST raspberrypi-firmware-1.20240902.tar.gz 154483648 BLAKE2B e3d9fabb23246d90948004dde37f2125779a86aa62737b51b03cacea13d1ca715724587b0da106efba19c80a1bafcf1537101ce13ba4374602ca9e4957c81f87 SHA512 b5b1a74e1e9f9760fd19f98a35505b2e127e212c17afbdf08e1b92198f32de73655fb24c16d662318ccf50621ae5e1a6ed5aa877d2d1cc654d26b8ff168c1e82
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index 7dc1cd3ab167..d01275b7f1e7 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -5,6 +5,10 @@
 		<email>expeditioneer@gentoo.org</email>
 		<name>Dennis Lamm</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/raspberrypi/firmware/issues</bugs-to>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild
new file mode 100644
index 000000000000..6a6775bd8363
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="strip"
+QA_PREBUILT="*"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/refind/files/refind-0.14.2-fix-freestanding-on-musl.patch b/sys-boot/refind/files/refind-0.14.2-fix-freestanding-on-musl.patch
new file mode 100644
index 000000000000..42f8d6b13a79
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.14.2-fix-freestanding-on-musl.patch
@@ -0,0 +1,63 @@
+On amd64, musl typedefs wchar_t to int, conflicting with -fshort-wchar.
+Also, /usr/include is searched before the compiler provided include directory.
+As a workaround, use -nostdinc and switch them around.
+
+Add missing `#include <stddef.h>` where wchar_t was defined indirectly by
+other standard includefiles.
+
+We need and extra -D for clang, where wchar_t is defined in
+/usr/include/allbits.h and gets included by other headers, conflicting with
+wchar_t already defined in stddef.h.
+
+See also:	https://bugs.gentoo.org/938012
+			https://bugs.gentoo.org/881131
+			https://bugs.gentoo.org/832018
+
+--- a/Make.common
++++ b/Make.common
+@@ -79,7 +79,7 @@
+ #
+ 
+ # ...for both GNU-EFI and TianoCore....
+-OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
++OPTIMFLAGS      = -Os -fno-strict-aliasing -ffreestanding -nostdinc -isystem $(CPPINCLUDEDIR) -isystem $(EPREFIX)/usr/include $(EXTRACFLAGS)
+ CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI....
+@@ -168,7 +168,7 @@
+   SUBSYSTEM_LDFLAG = -defsym=EFI_SUBSYSTEM=0xa
+   LDFLAGS         += --warn-common --no-undefined --fatal-warnings
+ 
+-  ARCH_CFLAGS = -fno-merge-constants -ffreestanding -DEFIAARCH64
++  ARCH_CFLAGS = -fno-merge-constants -ffreestanding -DEFIAARCH64 -nostdinc -isystem $(CPPINCLUDEDIR) -isystem $(EPREFIX)/usr/include $(EXTRACFLAGS)
+   ifeq ($(MAKEWITH),TIANO)
+     ARCH_CFLAGS += -mcmodel=large -Wno-address -Wno-missing-braces -Wno-array-bounds -ffunction-sections -fdata-sections
+   endif
+--- a/libeg/lodepng.h
++++ b/libeg/lodepng.h
+@@ -32,6 +32,7 @@
+ #ifndef LODEPNG_H
+ #define LODEPNG_H
+ 
++#include <stddef.h>
+ #include <string.h> /*for size_t*/
+ 
+ // Below block of lines required for GNU-EFI and TianoCore (program hangs
+--- a/libeg/nanojpeg.c
++++ b/libeg/nanojpeg.c
+@@ -211,6 +211,7 @@
+ 
+ #ifdef  _NJ_EXAMPLE_PROGRAM
+ 
++#include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -275,6 +276,7 @@
+ #endif
+ 
+ #if NJ_USE_LIBC
++    #include <stddef.h>
+     #include <stdlib.h>
+     #include <string.h>
+     #define njAllocMem malloc
diff --git a/sys-boot/refind/refind-0.14.2-r1.ebuild b/sys-boot/refind/refind-0.14.2-r1.ebuild
index d3866389c5cb..c740e9743943 100644
--- a/sys-boot/refind/refind-0.14.2-r1.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.t
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 
diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild b/sys-boot/refind/refind-0.14.2-r2.ebuild
new file mode 100644
index 000000000000..cad032fc658b
--- /dev/null
+++ b/sys-boot/refind/refind-0.14.2-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature secureboot toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.3 GPL-2+ GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} doc"
+
+DEPEND="sys-boot/gnu-efi"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+DOCS=( README.txt NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.0.2-clang.patch
+	"${FILESDIR}"/${P}-fix-gnu-efi-3.0.18.patch
+	"${FILESDIR}"/${P}-fix-freestanding-on-musl.patch
+)
+
+checktools() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		# bug #832018
+		tc-export LD
+		tc-ld-force-bfd
+		# the makefile calls LD directly, so try to fix LD too
+		LD="${LD/.lld/.bfd}"
+		tc-ld-is-lld "${LD}" && die "Linking with lld produces broken executables and may lead to unbootable system"
+
+		# bug #732256
+		# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
+		tc-export OBJCOPY
+		OBJCOPY="${OBJCOPY/llvm-/}"
+		LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
+
+		tc-is-gcc || tc-is-clang || die "Unsupported compiler"
+	fi
+}
+
+pkg_pretend() {
+	checktools
+}
+
+pkg_setup() {
+	if use x86; then
+		export EFIARCH=ia32
+		export BUILDARCH=ia32
+	elif use amd64; then
+		export EFIARCH=x64
+		export BUILDARCH=x86_64
+	fi
+	secureboot_pkg_setup
+
+	# this does not only check, but also exports LD and OBJCOPY
+	checktools
+}
+
+src_prepare() {
+	default
+
+	# bug #598647 - PIE not supported
+	sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
+	sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
+
+	cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || die
+}
+
+src_compile() {
+	# Update fs targets depending on uses
+	local fs fs_names=()
+	for fs in ${FS_USE}; do
+		fs=${fs#+}
+		if use "${fs}"; then
+			fs_names+=( ${fs} )
+		fi
+	done
+	fs_names=( "${fs_names[@]/%/_gnuefi}" )
+
+	# Prepare flags
+	local make_flags=(
+		ARCH="${BUILDARCH}"
+		CC="$(tc-getCC)"
+		AS="$(tc-getAS)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		OBJCOPY="${OBJCOPY}"
+		GNUEFILIB="${ESYSROOT}/usr/$(get_libdir)"
+		EFILIB="${ESYSROOT}/usr/$(get_libdir)"
+		EFICRT0="${ESYSROOT}/usr/$(get_libdir)"
+		FILESYSTEMS="${fs_names[*]}"
+		FILESYSTEMS_GNUEFI="${fs_names[*]}"
+		REFIND_SBAT_CSV=refind-sbat-gentoo.csv
+	)
+
+	# see the comments in "${FILESDIR}"/${P}-fix-freestanding-on-musl.patch
+	tc-export CC
+	if tc-is-gcc; then
+		local -x CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include
+	elif tc-is-clang; then
+		local -x CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include
+		local -x EXTRACFLAGS=-D__DEFINED_wchar_t
+	fi
+
+	emake "${make_flags[@]}" all_gnuefi
+}
+
+src_install() {
+	exeinto "/usr/$(get_libdir)/${PN}"
+	doexe refind-install
+	dosym -r "/usr/$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
+
+	doman "docs/man/"*
+	use doc && DOCS+=( docs/refind docs/Styles )
+	einstalldocs
+
+	insinto "/usr/$(get_libdir)/${PN}/refind"
+	doins "refind/refind_${EFIARCH}.efi"
+	doins "refind.conf-sample"
+	doins -r images icons fonts banners
+
+	if [[ -d "drivers_${EFIARCH}" ]]; then
+		doins -r "drivers_${EFIARCH}"
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
+	doins "gptsync/gptsync_${EFIARCH}.efi"
+
+	insinto "/etc/refind.d"
+	doins -r "keys"
+
+	dosbin "mkrlconf"
+	dosbin "mvrefind"
+	dosbin "refind-mkdefault"
+
+	secureboot_auto_sign --in-place
+}
+
+pkg_postinst() {
+	elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}"
+	elog "You will need to use the command 'refind-install' to install"
+	elog "the binaries into your EFI System Partition"
+
+	optfeature_header "refind-install requires additional packages to be fully functional:"
+	optfeature "binary signing for use with SecureBoot" app-crypt/sbsigntools
+	optfeature "writing to NVRAM" sys-boot/efibootmgr
+	optfeature "ESP management" sys-apps/gptfdisk
+	elog ""
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A sample configuration can be found at"
+		elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample"
+	else
+		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
+			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
+			ewarn "to manage ESP"
+			ewarn ""
+		fi
+		ewarn "Note that this installation will not update any EFI binaries"
+		ewarn "on your EFI System Partition - this needs to be done manually"
+	fi
+}
diff --git a/sys-boot/uefi-mkconfig/Manifest b/sys-boot/uefi-mkconfig/Manifest
index c7468bb45622..e9eb42816478 100644
--- a/sys-boot/uefi-mkconfig/Manifest
+++ b/sys-boot/uefi-mkconfig/Manifest
@@ -1,3 +1,2 @@
-DIST uefi-mkconfig-1.6.tar.gz 8620 BLAKE2B 57a48be15a976cc628f04e263fcbc1c56296f9d2b8ff11e70ab9239723f168e08775042fa86ab49e85d212aa719e6465acf883debe46f4a7f3d57edf3d07dd09 SHA512 df4595f5c05b812e7199fc19564bd899b345952f23014f9f0851e7da4b812b93583d52b9955edde3f7d05c182f29b120b7201d69493931813b2caf8ffd2e6f14
-DIST uefi-mkconfig-2.1.tar.gz 10083 BLAKE2B c78a2f38b66c643c23442c5159d70272099babea9dc5bc7eb68628ff09cf307375a32e7886ed8e597dc05233aa49d6aa13ec86466b0aaebd33663667848867fe SHA512 466f4d902e84ec19d17f4b43bacced6372c5c0a469c245e267a5166b0a2d2a3ee2c1409d83129cc5088305367e0a53249990f45119b8c5522235fd65a19dc5fb
 DIST uefi-mkconfig-2.2.tar.gz 10176 BLAKE2B 7078c23d39dc4e6b80785502c0d186ec1c8ca4ad4b758bcfdf4b74df38e47cef23952e5139d185a9b2b1253cd69f018145c63254f3a421952c70371e33fb1911 SHA512 5489aacc869afb57dc4d48deba4306b141ea08fa5763b8486f156b3b01aecf987f7927b70e7acbb1abe9e145b1d1d4ef57cd93e12d78bec10cc9e61a37ccf02c
+DIST uefi-mkconfig-2.3.tar.gz 10295 BLAKE2B cae2301b1c181f87efbb47fbb393184ed383d763932999719223a298062cd802c318aeb9a1e4571483fe872b31ee27c86186a1200531d038e4ffe867ac683361 SHA512 730546552739db386249e0f86bce029ccb2695bd4b065326ae91ae92ab350ee387e46b661514b80728e609aa851a78efdda97a86fd7418c6f0044341c393c452
diff --git a/sys-boot/uefi-mkconfig/uefi-mkconfig-1.6.ebuild b/sys-boot/uefi-mkconfig/uefi-mkconfig-1.6.ebuild
deleted file mode 100644
index 8e426c062c9c..000000000000
--- a/sys-boot/uefi-mkconfig/uefi-mkconfig-1.6.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 linux-info optfeature
-
-DESCRIPTION="Automatic management of UEFI entries"
-HOMEPAGE="https://github.com/Biosias/uefi-mkconfig"
-SRC_URI="https://github.com/Biosias/uefi-mkconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	app-shells/bash
-	sys-boot/efibootmgr
-"
-
-CONFIG_CHECK="EFI_STUB"
-
-src_install() {
-	dobin uefi-mkconfig
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "uefi-mkconfig: Automatic management of UEFI entries"
-	elog "Run uefi-mkconfig while having all efi partitions mounted"
-	elog "Please use with care, this package was tested on a limited number of machines"
-	elog "Some problems may arise due to different implementations of UEFI"
-	elog
-	optfeature "Add UEFI entries on kernel installation " \ "sys-kernel/installkernel[-systemd,efistub]"
-}
diff --git a/sys-boot/uefi-mkconfig/uefi-mkconfig-2.1.ebuild b/sys-boot/uefi-mkconfig/uefi-mkconfig-2.3.ebuild
index 8b272798d1ff..8b272798d1ff 100644
--- a/sys-boot/uefi-mkconfig/uefi-mkconfig-2.1.ebuild
+++ b/sys-boot/uefi-mkconfig/uefi-mkconfig-2.3.ebuild
diff --git a/sys-cluster/cilium-cli/Manifest b/sys-cluster/cilium-cli/Manifest
index 7c9469e26722..995e7c37059e 100644
--- a/sys-cluster/cilium-cli/Manifest
+++ b/sys-cluster/cilium-cli/Manifest
@@ -1,2 +1,3 @@
 DIST cilium-cli-0.12.1.tar.gz 20888710 BLAKE2B 70444c6aeab762f2107a6e38c28157913d623059e6e95819dcbf9de657e573ffe10bc11f6fac68a2fed589d44b53cd1ad31266002479a253fe6a43db010022b9 SHA512 337a62dce0f7947da46ec9b6162c5c9a6d81770f40ce88413e29be561eef9e91824552356646c357166b474f9fbb40c916eeae4061833d1d9b0dec821ec75c7c
 DIST cilium-cli-0.13.0.tar.gz 23869352 BLAKE2B 49498257f73b7e854ec8683c34919ea6d93798a5ebcb6b7c50ebb9fcffd48751d67636f6f0f6e45d307fcf5d24bc3269db682995e311bdad40eb1e981cf3379f SHA512 cb249016ebe9da8780216cf3d7a56cdb98f28498c508ebca654f527530130e2891013d7457d13d5e16bccbde87e6f59ac6de2b807dc34bf77cc6caf8f83e07a6
+DIST cilium-cli-0.16.16.tar.gz 36087097 BLAKE2B 5bb3939d300e87191d6cba58da2e6dd399836514ec827a0311107ce75611e0b69662295a766f93d464ea95315005aedb466f70ec1e070a63427bcccf29aab7e4 SHA512 1b9f72eb00410c740803ac8b51ed84cb80bbb51b9532d546939b6034caf58dfa8b1255e3d1594e4f17a7ae906b066fd41aa6b118c36612a1fecf6b91ed27c815
diff --git a/sys-cluster/cilium-cli/cilium-cli-0.16.16.ebuild b/sys-cluster/cilium-cli/cilium-cli-0.16.16.ebuild
new file mode 100644
index 000000000000..45d0f8a60b3e
--- /dev/null
+++ b/sys-cluster/cilium-cli/cilium-cli-0.16.16.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Next generation command line interface for cilium"
+HOMEPAGE="https://cilium.io"
+SRC_URI="https://github.com/cilium/cilium-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	default
+	sed -i -e 's/-race//' Makefile || die
+}
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin cilium
+}
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 076d58bd2ab3..6e84be83794d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
 DIST galera-26.4.18.tar.gz 1542330 BLAKE2B 5a0d8b1929a72ce36f521ba3404b9251503226ba041970bc67f9d25b2b55c2daa2128500117366273541578eb1d7fd213d5f8336cba705650c55b70125dcbf0d SHA512 75ae75c0bac1b2ba5d0230af9b0e14b5e8661f20f84cee3800b2e979c3ef53c9dd5ce8cebcec1ae9205b5dec28f94f690854cce32a10e9f58d8aa55725fd59c6
 DIST galera-26.4.19.tar.gz 1548419 BLAKE2B fb4065a501412921d9a9b46cf9ce6cdd69616fe11a0cd9bbba17adb640af4f93d517514c31ccb00fbd7591ee624f6a4a6c1a9ba5552799276199cbb4fdb5bae4 SHA512 1d6e4d1adadbee411cb82335e4913bc28e009fa0e9ce150cf1d12cc85ce03cb00337ff52a6bad3a72315d42bf1daad1fe93b3fc810e109a762bb1a88f8c69cfe
+DIST galera-26.4.20.tar.gz 1551246 BLAKE2B 10231289b5c1adc6b4f427ed362877089c0b0de6cf78b5c1ef249fc37f5a407d539d98a9df12d1a5d33db5f6aeea88ec07a2729ba465649edef584fca9edb0e2 SHA512 35b2606c60a15bd5ba3fd5e9b921f96726def270f54225d8e2dc2ec6a563857c038229d1364d086283efaa6dd85973b0b1d061f8f81a353d9071585012627be9
diff --git a/sys-cluster/galera/galera-26.4.20.ebuild b/sys-cluster/galera/galera-26.4.20.ebuild
new file mode 100644
index 000000000000..2defbd8cbff9
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.20.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN}-4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="https://galeracluster.com"
+SRC_URI="
+	https://releases.galeracluster.com/${MY_PN}.$(ver_cut 3)/source/${MY_P}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="garbd ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:= )
+	dev-libs/boost:=
+"
+# TODO: Make check dep optional
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/asio-1.22
+	dev-libs/check
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove bundled dev-cpp/asio
+	rm -r asio || die "Failed to remove bundled asio"
+
+	# Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r garb || die "Failed to remove garbd daemon"
+		sed -i '/add_subdirectory(garb)/d' CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGALERA_WITH_SSL=$(usex ssl)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+
+	if use garbd ; then
+		newconfd "${FILESDIR}"/garb.cnf garbd
+		newinitd "${FILESDIR}"/garb.init garbd
+		doman man/garbd.8
+
+		pushd "${BUILD_DIR}" || die
+		dobin garb/garbd
+	fi
+
+	pushd "${BUILD_DIR}" || die
+	exeinto /usr/$(get_libdir)/galera
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.28.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.28.12.ebuild
index cdf98b8db32f..6a3a360634ba 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.28.12.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.28.13.ebuild
new file mode 100644
index 000000000000..6a3a360634ba
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.28.13.ebuild
@@ -0,0 +1,39 @@
+# 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.20"
+
+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.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.29.8.ebuild
new file mode 100644
index 000000000000..76d302232ac9
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.29.8.ebuild
@@ -0,0 +1,39 @@
+# 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.30.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.30.4.ebuild
new file mode 100644
index 000000000000..1e1f4ab1cbbe
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.30.4.ebuild
@@ -0,0 +1,39 @@
+# 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.31.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.31.0.ebuild
new file mode 100644
index 000000000000..961d6df18f5f
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.31.0.ebuild
@@ -0,0 +1,39 @@
+# 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-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.12.ebuild
index cc65df45233f..e9d4bc00d859 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.12.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.13.ebuild
new file mode 100644
index 000000000000..e9d4bc00d859
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.13.ebuild
@@ -0,0 +1,39 @@
+# 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.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.8.ebuild
new file mode 100644
index 000000000000..cc65df45233f
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.8.ebuild
@@ -0,0 +1,39 @@
+# 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.30.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.4.ebuild
new file mode 100644
index 000000000000..3fd35054c9f4
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.4.ebuild
@@ -0,0 +1,39 @@
+# 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.31.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.0.ebuild
new file mode 100644
index 000000000000..656e09872f1e
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.0.ebuild
@@ -0,0 +1,39 @@
+# 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-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.28.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.28.12.ebuild
index 7088f613c25c..3cfaa73c074f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.28.12.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.28.13.ebuild
new file mode 100644
index 000000000000..3cfaa73c074f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.28.13.ebuild
@@ -0,0 +1,35 @@
+# 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.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.29.8.ebuild
new file mode 100644
index 000000000000..7088f613c25c
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.29.8.ebuild
@@ -0,0 +1,35 @@
+# 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.30.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.30.4.ebuild
new file mode 100644
index 000000000000..bd858543529e
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.30.4.ebuild
@@ -0,0 +1,35 @@
+# 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.31.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.31.0.ebuild
new file mode 100644
index 000000000000..61c67e1168d2
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.31.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 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-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.28.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.28.12.ebuild
index 1b77d372e737..14684748f25a 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.28.12.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.28.13.ebuild
new file mode 100644
index 000000000000..14684748f25a
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.28.13.ebuild
@@ -0,0 +1,39 @@
+# 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.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.29.8.ebuild
new file mode 100644
index 000000000000..1b77d372e737
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.29.8.ebuild
@@ -0,0 +1,39 @@
+# 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.30.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.30.4.ebuild
new file mode 100644
index 000000000000..d3b8c1135b94
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.30.4.ebuild
@@ -0,0 +1,39 @@
+# 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.31.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.31.0.ebuild
new file mode 100644
index 000000000000..a3f60b02fee1
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.31.0.ebuild
@@ -0,0 +1,39 @@
+# 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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kubeadm/kubeadm-1.28.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.28.12.ebuild
index f43a19b3ff24..2fb49ca0d5a2 100644
--- a/sys-cluster/kubeadm/kubeadm-1.28.12.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kubeadm/kubeadm-1.28.13.ebuild
new file mode 100644
index 000000000000..2fb49ca0d5a2
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.28.13.ebuild
@@ -0,0 +1,35 @@
+# 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.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.29.8.ebuild
new file mode 100644
index 000000000000..f43a19b3ff24
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.29.8.ebuild
@@ -0,0 +1,35 @@
+# 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.30.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.30.4.ebuild
new file mode 100644
index 000000000000..d175a9ec3808
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.30.4.ebuild
@@ -0,0 +1,35 @@
+# 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.31.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.31.0.ebuild
new file mode 100644
index 000000000000..96a6a4b94b0c
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.31.0.ebuild
@@ -0,0 +1,35 @@
+# 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/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kubectl/kubectl-1.28.12.ebuild b/sys-cluster/kubectl/kubectl-1.28.12.ebuild
index d9e842902c85..8d6a0d86ef54 100644
--- a/sys-cluster/kubectl/kubectl-1.28.12.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kubectl/kubectl-1.28.13.ebuild
new file mode 100644
index 000000000000..8d6a0d86ef54
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.28.13.ebuild
@@ -0,0 +1,34 @@
+# 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.8.ebuild b/sys-cluster/kubectl/kubectl-1.29.8.ebuild
new file mode 100644
index 000000000000..d9e842902c85
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.29.8.ebuild
@@ -0,0 +1,34 @@
+# 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.30.4.ebuild b/sys-cluster/kubectl/kubectl-1.30.4.ebuild
new file mode 100644
index 000000000000..419b200ff1be
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.30.4.ebuild
@@ -0,0 +1,34 @@
+# 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.31.0.ebuild b/sys-cluster/kubectl/kubectl-1.31.0.ebuild
new file mode 100644
index 000000000000..67b1ecc00f15
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.31.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index f2c3fa25387c..3d2cebdf725f 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,6 +1,10 @@
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
 DIST kubernetes-1.28.12.tar.gz 40019159 BLAKE2B 65028055409942e46d9df8bbf1ff85e5334cdf140ec62a5c5facac663ec28e2d8c4b201a7d028f61b67afb4ad8789131cf1324a3f485f1be5f4bc561a0c40572 SHA512 47003a09fcf5844a1e7256554036a361aee9eb953228fd745ac354aceae81e98422991fa92bce5aac358066062c2e6975ae991b827afcc35aa5687461841fd5e
+DIST kubernetes-1.28.13.tar.gz 40024802 BLAKE2B cfb467cf508b285dba2a582bdb1dcf4b20bc3139f0568b4d383fa6498e6c2630b5d3701b300e1cf470306bad0b10db99b39262af66c33fa8b800e872fcb6a49f SHA512 263cdac1ba804e3319bb9547a37b19ce73490055fd053a914e554c03d21cbf3597d49e226b55e525bee63cfdfd6a5549cc86253d396ec0e606e048a1e8d1c693
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.29.7.tar.gz 41180322 BLAKE2B bb107378b6879a87186f9366ec372a1e88a5231609deffd82c72d94af6835e38f261b7116199c5bf734b2f4e0fc1c8f6a6e63e97b1563a5642440ab76a74ba8f SHA512 bce18d12164704f4d55d7566737bdff8305c5613af7a8df4b49cfa5f90f6b51f879159c4da7fbe436fdf7c4fcf5331f3f35e63f8dbc4c833559e6e2b1a61d08f
+DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb5e7528aee50c07dbf04029a92434ffda6bd177d890819d1fcb01ea3412d2cacc41620e27419a7d38d134131eba429c3 SHA512 c2a3c57819ca7537eb7021f0dee69d9f5f6b78a7f0959f217b79389b2e0156a859bbbceb829b3a7d63b7694d8316a52c83afd0ec159168e5bc2c317eb59ad6a8
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
+DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
diff --git a/sys-cluster/kubelet/kubelet-1.28.12.ebuild b/sys-cluster/kubelet/kubelet-1.28.12.ebuild
index 91977a28275c..c0a948f3d3ec 100644
--- a/sys-cluster/kubelet/kubelet-1.28.12.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.28.12.ebuild
@@ -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.28.13.ebuild b/sys-cluster/kubelet/kubelet-1.28.13.ebuild
new file mode 100644
index 000000000000..c0a948f3d3ec
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.28.13.ebuild
@@ -0,0 +1,38 @@
+# 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.8.ebuild b/sys-cluster/kubelet/kubelet-1.29.8.ebuild
new file mode 100644
index 000000000000..91977a28275c
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.29.8.ebuild
@@ -0,0 +1,38 @@
+# 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.30.4.ebuild b/sys-cluster/kubelet/kubelet-1.30.4.ebuild
new file mode 100644
index 000000000000..49e2249286ad
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.30.4.ebuild
@@ -0,0 +1,38 @@
+# 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.31.0.ebuild b/sys-cluster/kubelet/kubelet-1.31.0.ebuild
new file mode 100644
index 000000000000..a5aae6c40845
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.31.0.ebuild
@@ -0,0 +1,38 @@
+# 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/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index bf2e52948e42..52071f2eda78 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,2 +1,3 @@
 DIST openmpi-4.1.6.tar.bz2 10017002 BLAKE2B 4f119e1ed9b8787f0f860295ab1721fe2fd5300b8e182230a9eba3a864680b02bbd30618cc6d798a693a121626fc0ad5f447144d9ba91becb734f1a530d7a23a SHA512 0ef3240f9c436fb19b67e836cac376eafeb7825d12de3387dad04329dee9f182799d17d785ea23eba763810f479015bb5230593c28950b616b2f0aa1c0a81e71
 DIST openmpi-5.0.3.tar.bz2 29761888 BLAKE2B a084813f3dada12bbe77dcc6ef0ec0454980779f97ccb46f37f3d7df3bf7299e6484ec3427c2ca784e70876f62dc061a13cb7f08348e3d649e27f2bece9a09ac SHA512 60e8f6dcd6b1531ce8164e02f40be9a364ab484166a2a7b13bdff115a508f0596e97ad0a4204a47799ae608ba484a7ba9503042bddffe675f09ce22071b0b4a9
+DIST openmpi-5.0.5.tar.bz2 30000495 BLAKE2B 740e5dbc7e54b8f4eac4fa2c40fb5a0ccfba201dff15ccc84899f28dfad0147078ef6c2b0585615c93fc6edb70b665b3f7a9adea5e5e53a7563ae4c7a6ccbada SHA512 d0a137ebdeb578f0457113c6dd0f84d407c88d8f8844e6796114c8026d7391ebfb29d105f16289338eb3ac653ae9d3c0bdc4aa651402444b2ca91c1c447dc409
diff --git a/sys-cluster/openmpi/openmpi-5.0.5.ebuild b/sys-cluster/openmpi/openmpi-5.0.5.ebuild
new file mode 100644
index 000000000000..37b017e4483e
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-5.0.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+inherit cuda flag-o-matic fortran-2 libtool
+
+MY_P=${P/-mpi}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 -arm ~arm64 -ppc ~ppc64 -x86 ~amd64-linux"
+IUSE="cma cuda fortran ipv6 peruse romio valgrind
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM}"
+
+REQUIRED_USE="
+	openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+"
+
+RDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	>=dev-libs/libevent-2.0.22:=[threads(+)]
+	>=sys-apps/hwloc-2.0.2:=
+	sys-cluster/pmix:=
+	sys-cluster/prrte:=
+	>=sys-libs/zlib-1.2.8-r1
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	openmpi_fabrics_ofed? ( sys-cluster/rdma-core )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-debug/valgrind )"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Avoid test which ends up looking at system mounts
+	echo "int main() { return 0; }" > test/util/opal_path_nfs.c || die
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch, -Werror=strict-aliasing
+	# The former even prevents successfully running ./configure, but both appear
+	# at `make` time as well.
+	# https://bugs.gentoo.org/913040
+	# https://github.com/open-mpi/ompi/issues/12674
+	# https://github.com/open-mpi/ompi/issues/12675
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	local myconf=(
+		--disable-mpi-java
+		# configure takes a looooong time, but upstream currently force
+		# constriants on caching:
+		# https://github.com/open-mpi/ompi/blob/9eec56222a5c98d13790c9ee74877f1562ac27e8/config/opal_config_subdir.m4#L118
+		# so no --cache-dir for now.
+		--enable-mpi-fortran=$(usex fortran all no)
+		--enable-prte-prefix-by-default
+		--enable-pretty-print-stacktrace
+
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+
+		--with-hwloc=external
+		--with-libevent=external
+		--with-prrte=external
+
+		# Oiriginally supposed to be re-enabled for 5.0!
+		# See https://github.com/open-mpi/ompi/issues/9697#issuecomment-1003746357
+		# and https://bugs.gentoo.org/828123#c14
+		#
+		# However as of 5.0.3 the docs still say:
+		#
+		#   As such, supporting data heterogeneity is a feature that has fallen
+		#   into disrepair and is currently known to be broken in this release
+		#   of Open MPI.
+		--disable-heterogeneous
+
+		$(use_enable ipv6)
+		$(use_enable peruse)
+		$(use_enable romio io-romio)
+
+		$(use_with cma)
+
+		$(use_with cuda cuda "${EPREFIX}"/opt/cuda)
+		$(use_with valgrind)
+		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
+		$(use_with openmpi_rm_pbs tm)
+		$(use_with openmpi_rm_slurm slurm)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake -C test check
+}
+
+src_install() {
+	default
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-cluster/pmix/pmix-5.0.3.ebuild b/sys-cluster/pmix/pmix-5.0.3.ebuild
index 6cee90d4fa12..b37a67a20d75 100644
--- a/sys-cluster/pmix/pmix-5.0.3.ebuild
+++ b/sys-cluster/pmix/pmix-5.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openpmix/openpmix/releases/download/v${PV}/${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 # No support for 32-bit systems as of 4.2.8 (https://github.com/open-mpi/ompi/issues/11248)
-KEYWORDS="~amd64 -x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 -x86 ~amd64-linux"
 IUSE="debug +munge pmi"
 
 RDEPEND="
diff --git a/sys-cluster/prrte/Manifest b/sys-cluster/prrte/Manifest
new file mode 100644
index 000000000000..000d5865482f
--- /dev/null
+++ b/sys-cluster/prrte/Manifest
@@ -0,0 +1 @@
+DIST prrte-3.0.6.tar.gz 5976755 BLAKE2B 62cff51ebb7e72c32a237eb36db925f5bf5811cf5f409619128fa8ef490d3ba9e6ba4a1701edd21486878974088ff17645c98dab12904abd48c4a4b50453f807 SHA512 f7d3a1bedc0029fcb0e4e906a099d1de07b171805f0cc8d6e443826b8c321e3d5e7fa80867d8ab9ae1f628446a1a8f663231d8b67e243650582225805adc6e9d
diff --git a/sys-cluster/prrte/metadata.xml b/sys-cluster/prrte/metadata.xml
new file mode 100644
index 000000000000..51ef0c126080
--- /dev/null
+++ b/sys-cluster/prrte/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>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openpmix/prrte</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-cluster/prrte/prrte-3.0.6.ebuild b/sys-cluster/prrte/prrte-3.0.6.ebuild
new file mode 100644
index 000000000000..6790ea5231fa
--- /dev/null
+++ b/sys-cluster/prrte/prrte-3.0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool
+
+DESCRIPTION="PMIx Reference RunTime Environment"
+HOMEPAGE="https://openpmix.github.io/"
+SRC_URI="https://github.com/openpmix/prrte/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-apps/hwloc:=
+	>=sys-cluster/pmix-4.2.4
+"
+RDEPEND="${DEPEND}"
+
+# There is no testsuite at least today.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	#
+	# Same issue as its companion project sys-cluster/pmix, and logically
+	# solvable in tandem (or never).
+	# https://github.com/openpmix/openpmix/issues/3350
+	filter-lto
+
+	econf
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-cluster/rdma-core/files/rdma-core-50.0-use-posix-version-of-basename.patch b/sys-cluster/rdma-core/files/rdma-core-50.0-use-posix-version-of-basename.patch
new file mode 100644
index 000000000000..82dc5c598a13
--- /dev/null
+++ b/sys-cluster/rdma-core/files/rdma-core-50.0-use-posix-version-of-basename.patch
@@ -0,0 +1,65 @@
+https://patch-diff.githubusercontent.com/raw/linux-rdma/rdma-core/pull/1471.patch
+From: Nicolas Morey <nmorey@suse.com>
+Date: Tue, 4 Jun 2024 08:49:04 +0200
+Subject: [PATCH 1/2] rping: drop useless basename call
+
+Drop calls to basename on a constant string without a path in it ("rping")
+
+Signed-off-by: Nicolas Morey <nmorey@suse.com>
+--- a/librdmacm/examples/rping.c
++++ b/librdmacm/examples/rping.c
+@@ -34,7 +34,6 @@
+ #include <endian.h>
+ #include <getopt.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <sys/types.h>
+@@ -1253,9 +1252,9 @@ static int get_addr(char *dst, struct sockaddr *addr)
+ static void usage(const char *name)
+ {
+ 	printf("%s -s [-vVd] [-S size] [-C count] [-a addr] [-p port]\n", 
+-	       basename(name));
++	       name);
+ 	printf("%s -c [-vVd] [-S size] [-C count] [-I addr] -a addr [-p port]\n", 
+-	       basename(name));
++	       name);
+ 	printf("\t-c\t\tclient side\n");
+ 	printf("\t-I\t\tSource address to bind to for client.\n");
+ 	printf("\t-s\t\tserver side.  To bind to any address with IPv6 use -a ::0\n");
+
+From e8b215a7d85c8228d0bd90c17f20b42a03e44dbe Mon Sep 17 00:00:00 2001
+From: Nicolas Morey <nmorey@suse.com>
+Date: Tue, 4 Jun 2024 08:51:51 +0200
+Subject: [PATCH 2/2] kernel-boot,mlx5: use POSIX version of basename
+
+Include libgen.h to use the POSIX version and not the GNU version of basename.
+Because it is used on readlink from sysfs paths, there is no risk of trailing '/'
+so they both behave the same way.
+
+This fixes issues with the latest musl which removed the GNU implementation of basename.
+
+Signed-off-by: Nicolas Morey <nmorey@suse.com>
+--- a/kernel-boot/rdma_rename.c
++++ b/kernel-boot/rdma_rename.c
+@@ -4,7 +4,7 @@
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
++#include <libgen.h>
+ #include <stdbool.h>
+ #include <errno.h>
+ #include <unistd.h>
+--- a/providers/mlx5/mlx5_vfio.c
++++ b/providers/mlx5/mlx5_vfio.c
+@@ -14,7 +14,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+-#include <string.h>
++#include <libgen.h>
+ #include <sys/param.h>
+ #include <linux/vfio.h>
+ #include <sys/eventfd.h>
diff --git a/sys-cluster/rdma-core/rdma-core-50.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-50.0-r1.ebuild
new file mode 100644
index 000000000000..7c026f397548
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-50.0-r1.ebuild
@@ -0,0 +1,120 @@
+# 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 perl-functions python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="lttng neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-lang/perl:=
+	virtual/libudev:=
+	lttng? ( dev-util/lttng-ust:= )
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-debug/valgrind )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes
+"
+# python is required unconditionally at build-time
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch
+	"${FILESDIR}"/${PN}-50.0-use-posix-version-of-basename.patch
+)
+
+src_prepare() {
+	# DEFINED is true even if the value is false, which makes lttng unconditional
+	sed -i -e 's/if (DEFINED ENABLE_LTTNG)/if (ENABLE_LTTNG)/' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	perl_set_version
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
+		-DCMAKE_INSTALL_PERLDIR="${VENDOR_LIB}"
+		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
+		-DENABLE_LTTNG="$(usex lttng)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DNO_PYVERBS="$(usex !python)"
+		-DNO_MAN_PAGES=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	udev_dorules "${ED}"/usr/share/doc/${PF}/70-persistent-ipoib.rules
+
+	if use neigh; then
+		newinitd "${FILESDIR}"/ibacm.init ibacm
+		newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	fi
+
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ucx/ucx-1.13.1.ebuild b/sys-cluster/ucx/ucx-1.13.1.ebuild
index 5f521e7e591f..2a6c6e3e33c3 100644
--- a/sys-cluster/ucx/ucx-1.13.1.ebuild
+++ b/sys-cluster/ucx/ucx-1.13.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 -riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+numa +openmp"
 
 RDEPEND="
diff --git a/sys-devel/autogen/autogen-5.18.16-r4.ebuild b/sys-devel/autogen/autogen-5.18.16-r4.ebuild
index 30bbc056bbc7..c27b5dfaa6b1 100644
--- a/sys-devel/autogen/autogen-5.18.16-r4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libopts static-libs"
 
 RDEPEND="
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 7277864621ad..2564051b856e 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -12,4 +12,5 @@ DIST binutils-2.42-patches-3.tar.xz 34768 BLAKE2B e4bfaf3b42147408a8a3dcb00f5037
 DIST binutils-2.42-patches-6.tar.xz 50664 BLAKE2B f13b65a761cfba80caf2e4740c6383b40305558365b950fba22aca95a104e799e8bd476082f36fb9288de4f224b09f317792c1444e549c40d15a4b64cdf61989 SHA512 1203eca0a9e622411eac377509de8fd0db3ffcb282ac38ab7a0369b166cc1091197daad85b51b145b34a4832f1a1a4d573c8254e8d67aeb22f35adb1ab3ece1f
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 DIST binutils-2.43-patches-1.tar.xz 11644 BLAKE2B 578ee67c3c5e67f9191a31a5c83ffcc781f757f8aaee3eea14d052db427cdd2bc769977dba16e9a8c653dcc4a94f11c149898683945d5035d0beeac128045b1a SHA512 e6db4eaf4fbea366e607a7e9a56e20851fcc34664532fd6aa1f0818271c3e2687eada3daca482e211a2b3e36be85e7e0b23158caaa0fdf9785d13a9156e8c734
+DIST binutils-2.43-patches-2.tar.xz 35184 BLAKE2B fa35c9f182c7ae0fed28614f47618d1563a58f223fd1805f348b618c1fbf039a444e44d88f46d040b6971e481e0da882e5c4492fd167d17bf39579d87a446434 SHA512 a7e167d3f6a2c08f19af4685d90a6160a1a52f1a87f5660fb6d80ec664033829c0eacad0d77b1306620e50ff89d1f9f63a7c2b064ad9775400f0cb0eba3159a4
 DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild
new file mode 100644
index 000000000000..a71d9243c9cc
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.43-r1.ebuild
@@ -0,0 +1,534 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CTARGET=hppa64-${CHOST#*-}
+
+inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+
+LICENSE="GPL-3+"
+IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd"
+
+# Variables that can be set here  (ignored for live ebuilds)
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=2
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SLOT=${PV}
+else
+	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+	PATCH_DEV=${PATCH_DEV:-dilfridge}
+	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
+	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+	SLOT=$(ver_cut 1-2)
+	KEYWORDS="-* ~hppa"
+fi
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+	debuginfod? (
+		dev-libs/elfutils[debuginfod(-)]
+	)
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( sys-apps/texinfo )
+	test? (
+		dev-util/dejagnu
+		app-alternatives/bc
+	)
+	nls? ( sys-devel/gettext )
+	zstd? ( virtual/pkgconfig )
+	app-alternatives/lex
+	app-alternatives/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR="${WORKDIR}"/build
+S="${WORKDIR}"/${P/-hppa64/}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patch || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P/-hppa64/}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
+
+		# _p patch versions are Gentoo specific tarballs ...
+		local dir=${P%_p?}
+		dir=${dir/-hppa64/}
+
+		S=${WORKDIR}/${dir}
+	fi
+
+	cd "${WORKDIR}" || die
+	mkdir -p "${MY_BUILDDIR}" || die
+}
+
+src_prepare() {
+	local patchsetname
+	if [[ ${PV} == 9999* ]] ; then
+		patchsetname="from git master"
+	else
+		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
+	fi
+
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
+		if ! use vanilla; then
+			einfo "Applying binutils patchset ${patchsetname}"
+			eapply "${WORKDIR}/patch"
+			einfo "Done."
+
+			# This is applied conditionally for now just out of caution.
+			# It should be okay on non-prefix systems though. See bug #892549.
+			if [[ ${PN} != binutils-hppa64 ]] && { is_cross || use prefix; } ; then
+				eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \
+					   "${FILESDIR}"/binutils-2.41-linker-prefix.patch
+			fi
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered, bug #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# 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}"
+
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through, bug #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+	use cet && filter-flags -mindirect-branch -mindirect-branch=*
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}" || die
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
+	# logic in toolchain.eclass. bug #446946
+	#
+	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# libiberty's or bfd's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		--enable-relro
+		--enable-install-libiberty
+		--enable-textrel-check=$(usex hardened error warning)
+		# Things to think about
+		#--enable-deterministic-archives
+		--enable-new-dtags
+		--disable-jansson
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		$(use_with zstd)
+
+		# Disable modules that are in a combined binutils/gdb tree, bug #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags: https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		$(use_with debuginfod)
+
+		# Avoid automagic dev-libs/msgpack dep, bug #865875
+		--without-msgpack
+
+		# 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)
+
+		# We can enable this by default in future, but it's brand new
+		# in 2.39 with several bugs:
+		# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
+		# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
+		# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
+		# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
+		$(use_enable gprofng)
+	)
+
+	case ${CTARGET} in
+		x86_64-*|aarch64*|arm64*|i[3456]*)
+			# These hardening options are available from 2.39+ but
+			# they unconditionally enable the behaviour even on arches
+			# where e.g. execstacks can't be avoided.
+			# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
+			#
+			# TODO: Get the logic for this fixed upstream so it doesn't
+			# create impossible broken combinations on some arches, like mips.
+			#
+			# TODO: Get the logic for this fixed upstream so --disable-* works
+			# as expected.
+			myconf+=(
+				--enable-warn-execstack=yes
+				--enable-warn-rwx-segments=yes
+			)
+
+			if use hardened ; then
+				myconf+=(
+					# TOOD: breaks glibc test suite
+					#--enable-error-execstack=yes
+					#--enable-error-rwx-segments=yes
+					--enable-default-execstack=no
+				)
+			fi
+			;;
+		*)
+			;;
+	esac
+
+	if use elibc_musl ; then
+		# Override our earlier setting for musl, as textrels don't
+		# work there at all. See bug #707660.
+		myconf+=(
+			--enable-textrel-check=error
+		)
+	fi
+
+	if ! is_cross ; then
+		# No LTO for HPPA64 right now as we don't build kgcc64 with LTO support.
+		myconf+=( $(use_enable pgo pgo-build) )
+
+		if use pgo ; then
+			export BUILD_CFLAGS="${CFLAGS}"
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}" || die
+
+	# see Note [tooldir hack for ldscripts]
+	# see linker prefix patch
+	emake \
+		tooldir="${EPREFIX}${TOOLPATH}" \
+		gentoo_prefix=$(usex prefix-guest "${EPREFIX}"/usr /usr) \
+		all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}" || die
+
+	# bug #637066
+	filter-flags -Wall -Wreturn-type
+
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}" || die
+
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin || die
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
+	cd "${ED}"/${LIBPATH} || die
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH} || die
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-} || die
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			# No die for now, dies on hppa?
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		# TODO: add || die here, fails on hppa?
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}" || die
+		dodoc README
+
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	docompress "${DATAPATH}"/{info,man}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# the hppa64 hack; this should go into 9999 as a PN-conditional
+	# tweak the default fake list a little bit
+	cd "${D}"/etc/env.d/binutils
+	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 776e8cf74bd6..f7eb20a2c600 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -22,4 +22,5 @@ DIST binutils-2.42-patches-3.tar.xz 34768 BLAKE2B e4bfaf3b42147408a8a3dcb00f5037
 DIST binutils-2.42-patches-6.tar.xz 50664 BLAKE2B f13b65a761cfba80caf2e4740c6383b40305558365b950fba22aca95a104e799e8bd476082f36fb9288de4f224b09f317792c1444e549c40d15a4b64cdf61989 SHA512 1203eca0a9e622411eac377509de8fd0db3ffcb282ac38ab7a0369b166cc1091197daad85b51b145b34a4832f1a1a4d573c8254e8d67aeb22f35adb1ab3ece1f
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 DIST binutils-2.43-patches-1.tar.xz 11644 BLAKE2B 578ee67c3c5e67f9191a31a5c83ffcc781f757f8aaee3eea14d052db427cdd2bc769977dba16e9a8c653dcc4a94f11c149898683945d5035d0beeac128045b1a SHA512 e6db4eaf4fbea366e607a7e9a56e20851fcc34664532fd6aa1f0818271c3e2687eada3daca482e211a2b3e36be85e7e0b23158caaa0fdf9785d13a9156e8c734
+DIST binutils-2.43-patches-2.tar.xz 35184 BLAKE2B fa35c9f182c7ae0fed28614f47618d1563a58f223fd1805f348b618c1fbf039a444e44d88f46d040b6971e481e0da882e5c4492fd167d17bf39579d87a446434 SHA512 a7e167d3f6a2c08f19af4685d90a6160a1a52f1a87f5660fb6d80ec664033829c0eacad0d77b1306620e50ff89d1f9f63a7c2b064ad9775400f0cb0eba3159a4
 DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
diff --git a/sys-devel/binutils/binutils-2.43-r1.ebuild b/sys-devel/binutils/binutils-2.43-r1.ebuild
new file mode 100644
index 000000000000..ef196ce06291
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.43-r1.ebuild
@@ -0,0 +1,557 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+
+LICENSE="GPL-3+"
+IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd"
+
+# Variables that can be set here  (ignored for live ebuilds)
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=2
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	SLOT=${PV}
+elif [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SLOT=$(ver_cut 1-2)
+else
+	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+	PATCH_DEV=${PATCH_DEV:-dilfridge}
+	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
+	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+	SLOT=$(ver_cut 1-2)
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+	debuginfod? (
+		dev-libs/elfutils[debuginfod(-)]
+	)
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( sys-apps/texinfo )
+	pgo? (
+		dev-util/dejagnu
+		app-alternatives/bc
+	)
+	test? (
+		dev-util/dejagnu
+		app-alternatives/bc
+	)
+	nls? ( sys-devel/gettext )
+	zstd? ( virtual/pkgconfig )
+	app-alternatives/lex
+	app-alternatives/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patch || die
+
+		if [[ ${PV} != 9999 ]] ; then
+			EGIT_BRANCH=binutils-$(ver_cut 1)_$(ver_cut 2)-branch
+		fi
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P/-hppa64/}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
+
+		# _p patch versions are Gentoo specific tarballs ...
+		local dir=${P%_p?}
+		dir=${dir/-hppa64/}
+
+		S=${WORKDIR}/${dir}
+	fi
+
+	cd "${WORKDIR}" || die
+	mkdir -p "${MY_BUILDDIR}" || die
+}
+
+src_prepare() {
+	local patchsetname
+	if [[ ${PV} == 9999 ]] ; then
+		patchsetname="from git master"
+	elif [[ ${PV} == *9999 ]] ; then
+		patchsetname="from git branch ${EGIT_BRANCH}"
+	else
+		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
+	fi
+
+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == *9999 ]] ; then
+		if ! use vanilla; then
+			einfo "Applying binutils patchset ${patchsetname}"
+			eapply "${WORKDIR}/patch"
+			einfo "Done."
+
+			# This is applied conditionally for now just out of caution.
+			# It should be okay on non-prefix systems though. See bug #892549.
+			if is_cross || use prefix; then
+				eapply "${FILESDIR}"/binutils-2.43-linker-search-path.patch \
+					   "${FILESDIR}"/binutils-2.43-linker-prefix.patch
+			fi
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered, bug #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# 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}"
+
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through, bug #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+	use cet && filter-flags -mindirect-branch -mindirect-branch=*
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}" || die
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
+	# logic in toolchain.eclass. bug #446946
+	#
+	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# libiberty's or bfd's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		--enable-relro
+		--enable-install-libiberty
+		--enable-textrel-check=$(usex hardened error warning)
+		# Things to think about
+		#--enable-deterministic-archives
+		--enable-new-dtags
+		--disable-jansson
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		$(use_with zstd)
+
+		# Disable modules that are in a combined binutils/gdb tree, bug #490566
+		--disable-{gdb,gdbserver,libbacktrace,libdecnumber,readline,sim}
+		# Strip out broken static link flags: https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+
+		$(use_with debuginfod)
+
+		# Avoid automagic dev-libs/msgpack dep, bug #865875
+		--without-msgpack
+
+		# 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)
+
+		# We can enable this by default in future, but it's brand new
+		# in 2.39 with several bugs:
+		# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
+		# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
+		# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
+		# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
+		$(use_enable gprofng)
+	)
+
+	case ${CTARGET} in
+		x86_64-*|aarch64*|arm64*|i[3456]*)
+			# These hardening options are available from 2.39+ but
+			# they unconditionally enable the behaviour even on arches
+			# where e.g. execstacks can't be avoided.
+			# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
+			#
+			# TODO: Get the logic for this fixed upstream so it doesn't
+			# create impossible broken combinations on some arches, like mips.
+			#
+			# TODO: Get the logic for this fixed upstream so --disable-* works
+			# as expected.
+			myconf+=(
+				--enable-warn-execstack=yes
+				--enable-warn-rwx-segments=yes
+			)
+
+			if use hardened ; then
+				myconf+=(
+					# TOOD: breaks glibc test suite
+					#--enable-error-execstack=yes
+					#--enable-error-rwx-segments=yes
+					--enable-default-execstack=no
+				)
+			fi
+			;;
+		*)
+			;;
+	esac
+
+	if use elibc_musl ; then
+		# Override our earlier setting for musl, as textrels don't
+		# work there at all. See bug #707660.
+		myconf+=(
+			--enable-textrel-check=error
+		)
+	fi
+
+	if use test || { use pgo && tc-is-lto ; } ; then
+		# -Wa,* needs to be consistent everywhere or lto-wrapper will complain
+		filter-flags '-Wa,*'
+	fi
+
+	if ! is_cross ; then
+		myconf+=( $(use_enable pgo pgo-build $(tc-is-lto && echo "lto" || echo "yes")) )
+
+		if use pgo ; then
+			# We let configure handle it for us because it has to run
+			# the testsuite later on for profiling, and LTO isn't compatible
+			# with the testsuite.
+			filter-lto
+
+			export BUILD_CFLAGS="${CFLAGS}"
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}" || die
+
+	# see Note [tooldir hack for ldscripts]
+	# see linker prefix patch
+	emake \
+		tooldir="${EPREFIX}${TOOLPATH}" \
+		gentoo_prefix=$(usex prefix-guest "${EPREFIX}"/usr /usr) \
+		all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}" || die
+
+	(
+		# Tests don't expect LTO
+		filter-lto
+
+		# lto-wrapper warnings which confuse tests
+		filter-flags '-Wa,*'
+
+		# bug #637066
+		filter-flags -Wall -Wreturn-type
+
+		emake -k check \
+			CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" \
+			CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" \
+			LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			LDFLAGS="${LDFLAGS}"
+	)
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}" || die
+
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin || die
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
+	cd "${ED}"/${LIBPATH} || die
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH} || die
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-} || die
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die
+		rm -r "${ED}"/${LIBPATH}/lib || die
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}" || die
+		dodoc README
+
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	docompress "${DATAPATH}"/{info,man}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV} || eerror binutils-config returned an error
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET} || eerror binutils-config returned an error
+		else
+			binutils-config ${choice} || eerror binutils-config returned an error
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV} || eerror binutils-config returned an error
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/bpf-toolchain/Manifest b/sys-devel/bpf-toolchain/Manifest
index e1ae3bc4043c..1ee65c551f7c 100644
--- a/sys-devel/bpf-toolchain/Manifest
+++ b/sys-devel/bpf-toolchain/Manifest
@@ -1,2 +1,2 @@
-DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
+DIST binutils-2.43.1.tar.xz 28174300 BLAKE2B c4cd765cea326cd00b5cfe306e2937d820603b42f07a714ceb1349d36ddba0d45c3e125599dadf290d97954035c381781067155600ed87066e494cb9c4b34b45 SHA512 20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824
 DIST gcc-14.2.0.tar.xz 92306460 BLAKE2B 87baf2a06dfa75d8fb6cd62c747ef1f57d3b9bbbe33a360d9ed3de4b4dbeaa8d920504c67e409bd9863414202c14fd854b46108e984418171205119216d03d3b SHA512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396
diff --git a/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0-r2.ebuild b/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0-r2.ebuild
deleted file mode 100644
index 06aaed4a69f3..000000000000
--- a/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0-r2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo flag-o-matic toolchain-funcs
-
-# Versioning is just the GCC version in full (so may include a snapshot
-# date). Unlike dev-util/mingw64-toolchain, which this ebuild was heavily
-# inspired by, there's no "third component" here to version on, just
-# GCC + binutils.
-#
-# Do _p1++ rather than revbump on Binutils changes
-# Not using Gentoo patchsets for simplicity, their changes are mostly unneeded here.
-GCC_PV=${PV/_p/-}
-BINUTILS_PV=2.43
-
-DESCRIPTION="All-in-one bpf toolchain for building DTrace and systemd without crossdev"
-HOMEPAGE="
-	https://gcc.gnu.org/
-	https://sourceware.org/binutils/
-	https://gcc.gnu.org/wiki/BPFBackEnd
-"
-SRC_URI="
-	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
-"
-if [[ ${GCC_PV} == *-* ]]; then
-	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
-else
-	SRC_URI+="
-		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-	"
-fi
-S="${WORKDIR}"
-
-# l1:binutils+gcc, l2:gcc(libraries)
-LICENSE="
-	GPL-3+
-	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+bin-symlinks custom-cflags +strip"
-
-RDEPEND="
-	dev-libs/gmp:=
-	dev-libs/mpc:=
-	dev-libs/mpfr:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	bin-symlinks? (
-		!cross-bpf-unknown-none/binutils
-		!cross-bpf-unknown-none/gcc
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=()
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	tc-is-cross-compiler &&
-		die "cross-compilation of the toolchain itself is unsupported"
-}
-
-src_prepare() {
-	# rename directories to simplify both patching and the ebuild
-	mv binutils{-${BINUTILS_PV},} || die
-	mv gcc{-${GCC_PV},} || die
-
-	default
-}
-
-src_compile() {
-	# src_compile is kept similar to dev-util/mingw64-toolchain
-	# at least for now for ease of comparison etc.
-	#
-	# not great but do everything in src_compile given bootstrapping
-	# process needs to be done in steps of configure+compile+install
-	# (done modular to have most package-specific things in one place)
-
-	CTARGET=bpf-unknown-none
-
-	BPFT_D=${T}/root # moved to ${D} in src_install
-	local bpftdir=/usr/lib/${PN}
-	local prefix=${EPREFIX}${bpftdir}
-	local sysroot=${BPFT_D}${prefix}
-	local -x PATH=${sysroot}/bin:${PATH}
-
-	use custom-cflags || strip-flags # fancy flags are not realistic here
-
-	# global configure flags
-	local conf=(
-		--build=${CBUILD:-${CHOST}}
-		--target=${CTARGET}
-		--{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs
-		MAKEINFO=: #922230
-	)
-
-	# binutils
-	local conf_binutils=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-cet
-		--disable-default-execstack
-		--disable-nls
-		--disable-shared
-		--with-system-zlib
-		--without-debuginfod
-		--without-msgpack
-		--without-zstd
-	)
-
-	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
-	local conf_gcc=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-bootstrap
-		--disable-cc1
-		--disable-cet
-		--disable-gcov #843989
-		--disable-gomp
-		--disable-nls # filename collisions
-		--disable-libcc1
-		--disable-libquadmath
-		--disable-libsanitizer
-		--disable-libssp
-		--disable-libvtv
-		--disable-shared
-		--disable-werror
-		--enable-languages=c
-		--with-gcc-major-version-only
-		--with-system-zlib
-		--without-isl
-		--without-zstd
-		--disable-multilib
-	)
-
-	# libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail
-	# (not passed in conf_gcc above given it is lost in sub-configure calls)
-	local -x glibcxx_cv_sys_sdt_h=no
-
-	# bpft-build <path/package-name>
-	# -> ./configure && make && make install && bpft-package()
-	# passes conf and conf_package to configure, and users can add options
-	# through environment with e.g.
-	#	BPFT_BINUTILS_CONF="--some-option"
-	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
-	bpft-build() {
-		local id=${1##*/}
-		local build_dir=${WORKDIR}/${1}-build
-
-		# econf is not allowed in src_compile and its defaults are
-		# mostly unused here, so use configure directly
-		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-
-		local -n conf_id=conf_${id}
-		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
-
-		local -n extra_id=BPFT_${id^^}_CONF
-		conf+=( ${EXTRA_ECONF} ${extra_id} )
-
-		einfo "Building ${id} in ${build_dir} ..."
-
-		mkdir -p "${build_dir}" || die
-		pushd "${build_dir}" >/dev/null || die
-
-		edo "${conf[@]}"
-		emake MAKEINFO=: V=1
-		# -j1 to match bug #906155, other packages may be fragile too
-		emake -j1 MAKEINFO=: V=1 DESTDIR="${BPFT_D}" install
-
-		declare -f bpft-${id} >/dev/null && edo bpft-${id}
-
-		popd >/dev/null || die
-	}
-
-	# build with same ordering that crossdev would do
-	bpft-build binutils
-	bpft-build gcc
-
-	if use bin-symlinks; then
-		mkdir -p -- "${BPFT_D}${EPREFIX}"/usr/bin/ || die
-		local bin
-		for bin in "${sysroot}"/bin/*; do
-			ln -rs -- "${bin}" "${BPFT_D}${EPREFIX}"/usr/bin/ || die
-		done
-	fi
-
-	# Delete libdep.a, which has a colliding name and is useless for bpf,
-	# which does not make use of cross-library dependencies: the libdep.a
-	# for the native binutils will do.
-	rm -f ${sysroot}/lib/bfd-plugins/libdep.a || die
-
-	# portage doesn't know the right strip executable to use for CTARGET
-	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
-	dostrip -x ${bpftdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
-
-	# TODO: Check if this is worth doing, it may not be
-	if use strip; then
-		einfo "Stripping ${CTARGET} static libraries ..."
-		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
-			-exec ${CTARGET}-strip --strip-unneeded {} + || die
-	fi
-}
-
-src_install() {
-	mv "${BPFT_D}${EPREFIX}"/* "${ED}" || die
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] &&
-		eselect compiler-shadow update all
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that this package is primarily intended for DTrace, systemd, and related"
-		elog "packages to depend on without needing a manual crossdev setup."
-		elog
-		elog "Settings are oriented only for what these need and simplicity."
-		elog "Use sys-devel/crossdev if need full toolchain/customization:"
-		elog "    https://wiki.gentoo.org/wiki/Crossdev"
-	fi
-}
-
-pkg_postrm() {
-	use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] &&
-		eselect compiler-shadow clean all
-}
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
new file mode 100644
index 000000000000..7c4d6e130838
--- /dev/null
+++ b/sys-devel/bpf-toolchain/bpf-toolchain-14.2.0_p1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+# Versioning is just the GCC version in full (so may include a snapshot
+# date). Unlike dev-util/mingw64-toolchain, which this ebuild was heavily
+# inspired by, there's no "third component" here to version on, just
+# GCC + binutils.
+#
+# Do _p1++ rather than revbump on Binutils changes
+# Not using Gentoo patchsets for simplicity, their changes are mostly unneeded here.
+GCC_PV=${PV%_p*}
+BINUTILS_PV=2.43.1
+
+DESCRIPTION="All-in-one bpf toolchain for building DTrace and systemd without crossdev"
+HOMEPAGE="
+	https://gcc.gnu.org/
+	https://sourceware.org/binutils/
+	https://gcc.gnu.org/wiki/BPFBackEnd
+"
+SRC_URI="
+	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
+"
+if [[ ${GCC_PV} == *-* ]]; then
+	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
+else
+	SRC_URI+="
+		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+	"
+fi
+S="${WORKDIR}"
+
+# l1:binutils+gcc, l2:gcc(libraries)
+LICENSE="
+	GPL-3+
+	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"
+IUSE="+bin-symlinks custom-cflags +strip"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/mpc:=
+	dev-libs/mpfr:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	bin-symlinks? (
+		!cross-bpf-unknown-none/binutils
+		!cross-bpf-unknown-none/gcc
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=()
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	tc-is-cross-compiler &&
+		die "cross-compilation of the toolchain itself is unsupported"
+}
+
+src_prepare() {
+	# rename directories to simplify both patching and the ebuild
+	mv binutils{-${BINUTILS_PV},} || die
+	mv gcc{-${GCC_PV},} || die
+
+	default
+}
+
+src_compile() {
+	# src_compile is kept similar to dev-util/mingw64-toolchain
+	# at least for now for ease of comparison etc.
+	#
+	# not great but do everything in src_compile given bootstrapping
+	# process needs to be done in steps of configure+compile+install
+	# (done modular to have most package-specific things in one place)
+
+	CTARGET=bpf-unknown-none
+
+	BPFT_D=${T}/root # moved to ${D} in src_install
+	local bpftdir=/usr/lib/${PN}
+	local prefix=${EPREFIX}${bpftdir}
+	local sysroot=${BPFT_D}${prefix}
+	local -x PATH=${sysroot}/bin:${PATH}
+
+	use custom-cflags || strip-flags # fancy flags are not realistic here
+
+	# global configure flags
+	local conf=(
+		--build=${CBUILD:-${CHOST}}
+		--target=${CTARGET}
+		--{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs
+		MAKEINFO=: #922230
+	)
+
+	# binutils
+	local conf_binutils=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-cet
+		--disable-default-execstack
+		--disable-nls
+		--disable-shared
+		--with-system-zlib
+		--without-debuginfod
+		--without-msgpack
+		--without-zstd
+	)
+
+	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
+	local conf_gcc=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-bootstrap
+		--disable-cc1
+		--disable-cet
+		--disable-gcov #843989
+		--disable-gomp
+		--disable-nls # filename collisions
+		--disable-libcc1
+		--disable-libquadmath
+		--disable-libsanitizer
+		--disable-libssp
+		--disable-libvtv
+		--disable-shared
+		--disable-werror
+		--enable-languages=c
+		--with-gcc-major-version-only
+		--with-system-zlib
+		--without-isl
+		--without-zstd
+		--disable-multilib
+	)
+
+	# libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail
+	# (not passed in conf_gcc above given it is lost in sub-configure calls)
+	local -x glibcxx_cv_sys_sdt_h=no
+
+	# bpft-build <path/package-name>
+	# -> ./configure && make && make install && bpft-package()
+	# passes conf and conf_package to configure, and users can add options
+	# through environment with e.g.
+	#	BPFT_BINUTILS_CONF="--some-option"
+	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
+	bpft-build() {
+		local id=${1##*/}
+		local build_dir=${WORKDIR}/${1}-build
+
+		# econf is not allowed in src_compile and its defaults are
+		# mostly unused here, so use configure directly
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+
+		local -n extra_id=BPFT_${id^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} )
+
+		einfo "Building ${id} in ${build_dir} ..."
+
+		mkdir -p "${build_dir}" || die
+		pushd "${build_dir}" >/dev/null || die
+
+		edo "${conf[@]}"
+		emake MAKEINFO=: V=1
+		# -j1 to match bug #906155, other packages may be fragile too
+		emake -j1 MAKEINFO=: V=1 DESTDIR="${BPFT_D}" install
+
+		declare -f bpft-${id} >/dev/null && edo bpft-${id}
+
+		popd >/dev/null || die
+	}
+
+	# build with same ordering that crossdev would do
+	bpft-build binutils
+	bpft-build gcc
+
+	if use bin-symlinks; then
+		mkdir -p -- "${BPFT_D}${EPREFIX}"/usr/bin/ || die
+		local bin
+		for bin in "${sysroot}"/bin/*; do
+			ln -rs -- "${bin}" "${BPFT_D}${EPREFIX}"/usr/bin/ || die
+		done
+	fi
+
+	# Delete libdep.a, which has a colliding name and is useless for bpf,
+	# which does not make use of cross-library dependencies: the libdep.a
+	# for the native binutils will do.
+	rm -f ${sysroot}/lib/bfd-plugins/libdep.a || die
+
+	# portage doesn't know the right strip executable to use for CTARGET
+	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
+	dostrip -x ${bpftdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
+
+	# TODO: Check if this is worth doing, it may not be
+	if use strip; then
+		einfo "Stripping ${CTARGET} static libraries ..."
+		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
+			-exec ${CTARGET}-strip --strip-unneeded {} + || die
+	fi
+}
+
+src_install() {
+	mv "${BPFT_D}${EPREFIX}"/* "${ED}" || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] &&
+		eselect compiler-shadow update all
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that this package is primarily intended for DTrace, systemd, and related"
+		elog "packages to depend on without needing a manual crossdev setup."
+		elog
+		elog "Settings are oriented only for what these need and simplicity."
+		elog "Use sys-devel/crossdev if need full toolchain/customization:"
+		elog "    https://wiki.gentoo.org/wiki/Crossdev"
+	fi
+}
+
+pkg_postrm() {
+	use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] &&
+		eselect compiler-shadow clean all
+}
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-devel/clang-common/clang-common-18.1.8-r1.ebuild b/sys-devel/clang-common/clang-common-18.1.8-r1.ebuild
index ceeb2fd3046f..e45a2de975b5 100644
--- a/sys-devel/clang-common/clang-common-18.1.8-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-18.1.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+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
diff --git a/sys-devel/clang-common/clang-common-19.1.0_rc2.ebuild b/sys-devel/clang-common/clang-common-19.1.0_rc4.ebuild
index 090a45690818..090a45690818 100644
--- a/sys-devel/clang-common/clang-common-19.1.0_rc2.ebuild
+++ b/sys-devel/clang-common/clang-common-19.1.0_rc4.ebuild
diff --git a/sys-devel/clang-common/clang-common-20.0.0_pre20240808.ebuild b/sys-devel/clang-common/clang-common-20.0.0_pre20240830.ebuild
index 090a45690818..090a45690818 100644
--- a/sys-devel/clang-common/clang-common-20.0.0_pre20240808.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0_pre20240830.ebuild
diff --git a/sys-devel/clang-common/clang-common-20.0.0_pre20240815.ebuild b/sys-devel/clang-common/clang-common-20.0.0_pre20240910.ebuild
index 090a45690818..090a45690818 100644
--- a/sys-devel/clang-common/clang-common-20.0.0_pre20240815.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0_pre20240910.ebuild
diff --git a/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild b/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild
index 25889f60d661..e95d8a0af7dc 100644
--- a/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="${PV%%.*}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-19.1.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-19.1.0_rc4.ebuild
index 323c0b62c062..323c0b62c062 100644
--- a/sys-devel/clang-runtime/clang-runtime-19.1.0_rc2.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-19.1.0_rc4.ebuild
diff --git a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240808.ebuild b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240830.ebuild
index 323c0b62c062..323c0b62c062 100644
--- a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240808.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240830.ebuild
diff --git a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240815.ebuild b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240910.ebuild
index 323c0b62c062..323c0b62c062 100644
--- a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240815.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20240910.ebuild
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild
index 436e2673639f..18d3e444c0e2 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-18.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 45ec18ff2f1c..d43d1385adf3 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -13,7 +13,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-devel/clang/clang-18.1.8.ebuild b/sys-devel/clang/clang-18.1.8.ebuild
index 25c68d567f93..0dad629e1672 100644
--- a/sys-devel/clang/clang-18.1.8.ebuild
+++ b/sys-devel/clang/clang-18.1.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~x64-macos"
+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 )"
diff --git a/sys-devel/clang/clang-19.1.0_rc2.ebuild b/sys-devel/clang/clang-19.1.0_rc4.ebuild
index e97008f8ad7a..e97008f8ad7a 100644
--- a/sys-devel/clang/clang-19.1.0_rc2.ebuild
+++ b/sys-devel/clang/clang-19.1.0_rc4.ebuild
diff --git a/sys-devel/clang/clang-20.0.0_pre20240808.ebuild b/sys-devel/clang/clang-20.0.0_pre20240830.ebuild
index 857f7b1ed5a2..857f7b1ed5a2 100644
--- a/sys-devel/clang/clang-20.0.0_pre20240808.ebuild
+++ b/sys-devel/clang/clang-20.0.0_pre20240830.ebuild
diff --git a/sys-devel/clang/clang-20.0.0_pre20240815.ebuild b/sys-devel/clang/clang-20.0.0_pre20240910.ebuild
index 857f7b1ed5a2..857f7b1ed5a2 100644
--- a/sys-devel/clang/clang-20.0.0_pre20240815.ebuild
+++ b/sys-devel/clang/clang-20.0.0_pre20240910.ebuild
diff --git a/sys-devel/crossdev/crossdev-20240702.ebuild b/sys-devel/crossdev/crossdev-20240702.ebuild
index 2d56bdb48333..77850bfad4df 100644
--- a/sys-devel/crossdev/crossdev-20240702.ebuild
+++ b/sys-devel/crossdev/crossdev-20240702.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 else
 	SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/dwz/dwz-0.15-r1.ebuild b/sys-devel/dwz/dwz-0.15-r1.ebuild
index 07e6062f11f1..6ea8c380f942 100644
--- a/sys-devel/dwz/dwz-0.15-r1.ebuild
+++ b/sys-devel/dwz/dwz-0.15-r1.ebuild
@@ -7,13 +7,18 @@ inherit toolchain-funcs
 
 DESCRIPTION="DWARF optimization and duplicate removal tool"
 HOMEPAGE="https://sourceware.org/dwz"
-SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/dwz.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
+	S="${WORKDIR}/${PN}"
 
-S="${WORKDIR}/${PN}"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+fi
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -22,11 +27,13 @@ RDEPEND="
 	dev-libs/xxhash
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? (
-	dev-libs/elfutils[utils]
-	dev-util/dejagnu
-	dev-debug/gdb
-)"
+BDEPEND="
+	test? (
+		dev-debug/gdb
+		dev-libs/elfutils[utils]
+		dev-util/dejagnu
+	)
+"
 
 src_prepare() {
 	default
diff --git a/sys-devel/dwz/dwz-9999.ebuild b/sys-devel/dwz/dwz-9999.ebuild
new file mode 100644
index 000000000000..8ce1dc9e912c
--- /dev/null
+++ b/sys-devel/dwz/dwz-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="DWARF optimization and duplicate removal tool"
+HOMEPAGE="https://sourceware.org/dwz"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/dwz.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
+	S="${WORKDIR}/${PN}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/xxhash
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-debug/gdb
+		dev-libs/elfutils[utils]
+		dev-util/dejagnu
+	)
+"
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" srcdir="${S}"
+}
+
+src_test() {
+	emake CFLAGS="${CFLAGS}" srcdir="${S}" check
+}
+
+src_install() {
+	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" srcdir="${S}" install
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b37e2d0b1c7c..4e1edd6e7e61 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -6,22 +6,15 @@ DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0e
 DIST gcc-11.4.0-patches-12.tar.xz 13824 BLAKE2B e4df9e0dc9512882022aaf325ebf65c540169454c91dd31f913c6f57f6eb291c79ae919671b53db1549799d4a70c09298bf45ed82ad05eb1f961443cc958369d SHA512 87fed0c3f8e28c9f702443db58350bb615110b27ebe334b5de2ea60678e2548c56cd75cffade210d69634e2ac0a9311f5100ddb45d97645aa76d5688bc421a61
 DIST gcc-11.5.0.tar.xz 82399864 BLAKE2B f4a61faad32aac9e9cb553c1a1a011df0a057f6e2cac92a13cc7e285d08191dd4a117f41a8faac2359c0e2a16f954c7fef354dda9df8c63bff1c5cefda82602c SHA512 88f17d5a5e69eeb53aaf0a9bc9daab1c4e501d145b388c5485ebeb2cc36178fbb2d3e49ebef4a8c007a05e88471a06b97cf9b08870478249f77fbfa3d4abd9a8
 DIST gcc-12-20240209.tar.xz 79824868 BLAKE2B 1ae5a646da470f06648c4766c77475ceb287c5f6647d5102f1aef6590f973233d5e7f83b5e0241488d49dba59dd605c211938379e68a393a2dccb3834103ae4b SHA512 9f9a04f4477f41bb2a5662aedef2af75b039de50c2dc99310e504e6080cb7aae06a1255337ea2e563975cb108ddc6766adbbaf4e3d5d5712801d7ba9a5209dbd
-DIST gcc-12-20240711.tar.xz 79899144 BLAKE2B e1dad8f14ac0413c31ebb516551ef6891c43ffb2161efc6224a59a758cb5936a8b6a5db3ee0ea84c9a013dc3e7a3cca2abdec138cfb17b430d1ea926811f632a SHA512 e3a9b14edb7cf8f5a1d27652b60a4bd9b6aa553ffc5bfa6dc53113e327a4a1f2cfedd3ea5a3a1c074f47d7008cad89d721844a863d762343fad8b37d3ec55083
-DIST gcc-12-20240725.tar.xz 79899056 BLAKE2B 299edcf3a8fa35f15bcc850a5fd3be12c2d0e464ea8d78454333a3462d182be61923e38fe1ead5ca0e8d647941e897e4c3e37f03cf80e9aeedc32370bdf12f25 SHA512 6169e54e6e4c7017d7b9138fef341387a1fc8e3634b974364daef7bdff5809d0156012e25bfb533e255b0f3198aae7c667321bc11ac9ad71302f06be5b31c6b2
-DIST gcc-12-20240801.tar.xz 79883084 BLAKE2B 9b50ef282b5d55b2c477e5edd83c70076e0fe81c533d15bb9e8a4ac2b53c855f2aac80774b6944e843c6433294fc1b6ff96d7f754c78f60623dc1068c5e0e844 SHA512 57699fe4749558e2116e38e6d3dd2427a790969789f7d510225a8306e601a5ef07ca0609ba948c79d540b52c51d29abadbb0195d66f709505d7b685fd11b3e1d
-DIST gcc-12-20240808.tar.xz 79911312 BLAKE2B a4958a9980e043d295df7ac75d4f0ac594b012e756133f20cc99a510d288f0be1b253e10c6ee08da36c881cce1bb545ce028ca2d65ba2e180672c09c377a9553 SHA512 ad57e71315ac4061b528a0ef6217298d545f7b48d1e73c9b543a7594c48bddf61098227aa0ad889aafb80f2532ce26d4a74b24a84c4cfa52e075415c0a512508
-DIST gcc-12-20240815.tar.xz 79901552 BLAKE2B 5607c6e801b2defbd7f41d37c262e0fcf8562615c755fd34ddd91fdaf27811587e30ad8428a0fe6185f5a3d16382f40164a1f2be4eead5b9993514949afdb349 SHA512 68703cb8f3bb2f81c048bbe514e1e6669172ceea06ea4db02a3e97f6d51d9924d68898b0f4bdb6d383beb619e0e537bb57c9c4b3cd69fdb1e55173bb363af060
+DIST gcc-12-20240829.tar.xz 79907788 BLAKE2B d50f01fc6dc5962696062d0c5e0c12753e59030dc44e7b04f37a9a58cf675320151ada22f9d2796e15c3aa3d8e130afb4a8ab03112f8eeed5e57ab51c66e5cb4 SHA512 58cfef9a0c8bf40ec8ccbaeff1460c2e97fdfb76931e06e37fe067b14d52a6c0554e5b9706b937e1f1328c18a133ac61837d9ac52ec2591cd16353009b07aa6a
+DIST gcc-12-20240905.tar.xz 79894592 BLAKE2B 81e2633f138d19d4f96f2e9eb8f908183a9a172d422f1b4381909aadd2e3fb5302f5bb49bcc8b38cc0d32042a6c84141000423a701fabe8f4213c2e144539531 SHA512 f2d8fb19179d330300939c9441fd53f00b4e2595e4b1d85e818d40fd0908ae9867d314d9169597bd10db3655641790129d3c194ceff9a00cde441391d64b0c03
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-3.tar.xz 14852 BLAKE2B 7a5f1f43063b15f424099afd72096212fbbbc5151ff01f2de15dfb6e7cf274981c8cfaedba9ef61576c9096fb172fc550a7deb5cd7d9366fd249fd5dd3951f76 SHA512 aa89e4c2ae02f4fb42229ad5167f2eaa3a8fae51118645bf07199fe2124b9c83948590662b053d08002ef709fa870ea88315fd4ccbe4441a74e9cb62edcb82fb
 DIST gcc-12.4.0.tar.xz 83377372 BLAKE2B 0d5aa9995bf53fa2dc976a846240cfb8fafd125ad6c54f45dc9d770215eae3e9ea0db82a9a4f79c51b4d5f8461a1d730c17db6841bc31bd96dba11d9ed7544ae SHA512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853
 DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 5807623d3f7dd751b6dfe164cfd50d57b2f93485c23c3c2228a4a846a9a94cdad52a5e6f2806e5e7ee2a7b5526386ebdb339c44c7ea023d69f8652088a1b114d SHA512 14a01ced7ac2bfd9fc93de4e3819b4d0823fbe129d3f1faabeb707e9e3e2613b4173321b58b3648a7250e3b7ff5d94edfee60e6c38682f31a1f7b57b1c01433f
 DIST gcc-13-20240614.tar.xz 84463660 BLAKE2B a1b551ff633c31d6972fed173f248ba5f6696eb1566801e180b78a7c7e20933b1aaae40839b4f1529d61166de55125395d4f9a812511c088e73f975bf1d2167f SHA512 1a543ddfb56e793367a43895a7ce4f97daeca6ffd5234ce50e8a7ae0f8db1071e01bdd653fda40d00eb7a680faead8f1d8d1295f983086a33a4c75e4affa2ea5
-DIST gcc-13-20240712.tar.xz 84486436 BLAKE2B 4e82fadcec0258471e8a1a055136a67565230d6bfef719ef07a01286bdbb7963878b05622a68627a8f5885c2ee994d879155002f07ad2e53872f082b3dfb5e18 SHA512 1544e71e28a9d93d485a5b74e5910211da68d39af4389f9216f246090d2edb23805648f3528659b02d9db0bc7ee625b8f6a34c3775f41e7aa8a3760b2988b273
-DIST gcc-13-20240719.tar.xz 84474136 BLAKE2B 729596dec948360c2724fa46bcd18756c03606b093c4cd9f3841d6264a17d03b70db7722af805a564fa50144f71d1d88242de52cb257adf327cb2a4f97ea90d0 SHA512 eb63678540bded7798d475a5c8c7d10fd13571bade2e96c6c04e464b80c58d15e78a391e79e7643075e0ed43b7cc2ba2529fd82aa071cd55a57bbc259425d567
-DIST gcc-13-20240726.tar.xz 84475052 BLAKE2B d4a9d0d8957f9e728769af4a2c151eed833542ce12ed154a556093d01021428876f76e653709dc4fe96a89b686dd9b9506d6296b9481484d245e8cbdaf82b5f0 SHA512 89d2333c353e72fb0f87d2c9f43cc7b9e22b87d452e82747a9870cd5feabca43f2b223d5e1a9416e040595a733484ff75244bb449f36d7ae62fe69531ae4113d
-DIST gcc-13-20240802.tar.xz 84475340 BLAKE2B e4d5492126745d396194d3bce0b1d64a7cdc55a5930ca0305b1e0eb2e8f5a18b795e349bfb0f2c6023bd3c2d869ec98638aad1b72d1bc728c8871f59d29cdc72 SHA512 6632b596c28c80cc7887c5821ed073d2bfa03eeef1ef59c31c5f187ceba9d8f40469350bfe754ec5834a89baf9721fb4f0e4b73c75262c00e5b888ca56c19f5a
-DIST gcc-13-20240809.tar.xz 84479208 BLAKE2B f551960e9ac11e4769fec2e5dfbb4b0a37c2bbaaa7310231e86d2e8f24548bc3bdbfb9977ff77b03b896b06bcf92b56a4f8f516f4dc7ef8fb6400b44e8dace8d SHA512 648719e9cf4908665164f2a8854371933f09d31def1d32ce58f77c51f64955bfcb8a1232ecf0edbdf7eeaaf5c079bf2b4234c6c3d94c7e741d6945590f4db944
-DIST gcc-13-20240816.tar.xz 84492060 BLAKE2B f241e46e797cceca4d69fc626e2e91747c571c89d43c0cd631ecaa9ccabdbe9466078cba28c761527b4140ab994541967999f8bb0b4d30ef44288817169ca9ae SHA512 6b7b0feaf22359043cac89789a3c0477acb637c17c949f01a66dd6ea8c4975844a94c10ec2d56e5695b1ef0873c589c4f3c96fa70ae6a1ffc978d8b319d73f4f
+DIST gcc-13-20240830.tar.xz 84496796 BLAKE2B af34dc5ec6a38948fce25b60860be2b87a381bb43dd4159fe174d0ea4566d2ca1b1830c3847139336ac34deeaac9d4f80832caf94f25622013f83c3c161e6b65 SHA512 3d8a531145062a22bca483452a08cc5218cb3af9a76828ff706d966c0cd122cf01b61705aa5cceb9364cf0fd0434ad9d32416d079638e1937513ef52d6a3b6dd
+DIST gcc-13-20240906.tar.xz 84500124 BLAKE2B 28c54c9df7fef6778f86edd4bc07c214666ad548e6e3ef30bfaf09df7f1dc6f1d4b6c51589746dff1ca2074f2fd63375c30c1c1b0e7e8b70c21e8db78af9de5a SHA512 32552c971aff250080815f3defce554529aafed4fbbd3486bdcf5895458d096260fc5eb7db451be581f888d93958c5fcf35e4ed14fa06fc990b2845e7f4fe9e3
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a
 DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249ca0119ad362747a82d886fd10f77ceb05d02e033e906a090c67f44b1977f40df6a95206d81a32dd15e2f5413c6c92496 SHA512 324d9e63d16c35d55edde20de049162c01b0d487b4548d06c49f0da04a761ec255bc5e020cc2e7f60d12f5d129768afdcf7c86a59126f71f388ab375c34be6de
@@ -29,32 +22,19 @@ DIST gcc-13.2.0-patches-17.tar.xz 45036 BLAKE2B 85fe5e6b0da7a4477f0026aaf397d934
 DIST gcc-13.2.0-patches-18.tar.xz 44820 BLAKE2B 077ca09a3687e23e4ab633cf4a7e57df6293935d89a9b4d3f6234018d5da8d37896463b3bee136addadc86e1b5923157cfbbeed1801837fc92770d6622bbb0ec SHA512 c73512dcf313016b1dda3deb8222734f5e9c4888970801ea6398195b8f3916eaa20d32001a73fb9b8942d7a2e38616428ca4efd54f92ded9f3219679fbff026e
 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-14-20240622.tar.xz 87978376 BLAKE2B 8fb56057e6a84f941822c58aaee8c7c562a665295db6a1c708eda9457ac38723ab7e8ccdab9768bed888468f01f9a2b42527f9ab5475bd1a55f9e9ef694c8ee0 SHA512 9dd7747488b69378c96e6296332152035358a3091d904bd99f1aca6371a8f4d7ed50d4eca85e99d539849526165f2a4250a3dcf77be29a796a6e030167e7dde8
-DIST gcc-14-20240713.tar.xz 88005804 BLAKE2B eca74526c29a1080e6801a7db720752fc48c6dbbc5f904b7be7f74070b34a727ddae38ebfb7cb419d3a1717e93e3b9c425f251668473427548ba4eb31cca72b2 SHA512 6ea6b4a20e69a309cdd112001622cfe582d94986636f2084dbddc77cdb2b7e19ace45da0beb09b52d06ba2e0e09369b4db5a24aae6fd2deaeb6bdceb4d467198
-DIST gcc-14-20240720.tar.xz 88005248 BLAKE2B 9d0d3b8806e81660e66982fbda4efc3ea0611cede296f421c7a2769ba4c555ab08730320046f7b84f0d094ceb214c8c22610bd7389c7d93a226c47ea29f32ddf SHA512 b436057f3e17f86c0562000780271e1b848dfcf2b540d7ec0a12b235ea3327c1a577fc22c279808e55ad1a57fa1e6361f73374f71c451973123b87efd991bfe4
-DIST gcc-14-20240727.tar.xz 88051096 BLAKE2B bb447e728275539688ba19d1f50c4f4936ffc162a3670718f9b0ce0bc906c6d32cc950dc6277cc559459838dec0f98bb09a1274e4aa28733eb2bb0353a6a9d64 SHA512 dafc1ebce15d37a8bcadbf05b09d74114e85223be29ccbe8fb3c37bdad2a9e17a7150cf18110cd201c1a02203da51eba4cfc55ddb3d7ff4131b7dd4f90c9a375
-DIST gcc-14-20240803.tar.xz 88016412 BLAKE2B 60301ac6acec9cea3001fda41e0dd10f6698cf0897e84750b28421c6425d28a2acfde8978a285052e44b54fc2244a181ed4430510df5920b8a94319727a5f19b SHA512 e9013bbbef39f67fcc63c9394513be43038f2fc5eebd098be3e5b90eb43bf8f2baf3ce72df1fe72ef2c327dffa103a4e1588c3c137944f7d602fb09498851328
-DIST gcc-14-20240810.tar.xz 88012840 BLAKE2B 85f6513f4f4a001894fc22df6c53ce20d6af547191478d429da152f163406c6b320599445a58bef1e79bcacaae56b6bebab9bc9762a75c82bf65dd502e4e7048 SHA512 2b1fde696c9e97a15e9b3550145c74d031d6ad667ac62b51c11bc9e111caf229c6fc4530a18d876d31ab7554fc51263944b8c0182533b1e9275132ec6ce87887
 DIST gcc-14-20240817.tar.xz 88024252 BLAKE2B 994b3e263246e344c6898943a17feb63f07b3de02777a77c689e001343119bd451e1ed5c6958f368077f10b4778c65fa492c55d164e2a0b1bbd65b275aae3cd1 SHA512 31de06694efeb2be49b64e9e8314a766d36c3d5f5f2d52d1e0419ba69262b7c344ef0700957eff11007ba5b81bd5e74dea2a2c0286990cb33927bac4a7db9756
+DIST gcc-14-20240831.tar.xz 88125404 BLAKE2B 947ce02f545ad93d0ee4afcdc7cf7b64ef1cea2cdcea2120789d82370bb8fd0e7e34daf5d7a85e10318147367ef18059cdd0efa232cb4d409e8b4317ee4df800 SHA512 3d92b29c2a0f3c0e6fe043bf5d67d5928daf045538d4925aa6bc0bcc77a9e8bb3667f9d1b2337c56de35ca19203972a770c5afd077f69381371e7072313744db
+DIST gcc-14-20240907.tar.xz 88136648 BLAKE2B 0590ede2cedf9df429ba5c6fe385dbbdd82431160d1c4e779bfdb621b781df6e53bf8865effea62b2438a2e98476ba69a73f3dd81c40c86ad572e17c0fda0971 SHA512 fbcb917982f1abd96f12d63c058f49ae7f90e75294eb80532d4b9da1c601857a2874568274e8210d1538c6d5c3f37e67514d5d55525c2745006875930a1ceb0f
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
-DIST gcc-14.1.0-patches-3.tar.xz 11868 BLAKE2B 06d079766bfbaddd066cd70f2d3f5e9ef17f3617fe90de4cb0a9562e6c3b2dc46d94dce03649f2e530c21e3fa0e0e6e5aae3c7b768bd08717c4f29ff29b00a04 SHA512 636a2853b5bf057fef262d54bcb250f3ebf63c600bc184cfea499783d254c462f6c0ecf5f0c5dac6634110ba0d11193fbfb96850ac27fc5a318f1d810f2231cc
 DIST gcc-14.1.0-patches-4.tar.xz 11620 BLAKE2B c819fbdea1f3bf10c8d4214d4c33cf28c1410171d2833b6f8c1225eeefe749ddb815067b3fdb750e5839761aee8d39ffc51ffb492f88e630076818a61b18362b SHA512 0d6e1b04591607dfc8022124b186ce499467c32db7667ee1a640fe2e07706597edc0e4ad5c7ebcb75c8f5fc6e45e9b9ef715402c71ff9ab21fe380007fe5d84f
-DIST gcc-14.2.0-RC-20240723.tar.xz 92320472 BLAKE2B 1003e19e65b9b3093193b5eb9997236ce445cca65c701111268b5c14b8cdde5b22f74556eb30698ae8646114558539874934ff0794d73f4083425c2867989dd9 SHA512 b3ead9ea661f07606225cc0053054f9f8a1267b0b476a86168a3524ea36c623b87c4ebefdbb95a01172b267cdf387cf909f8a9fa7dfaa1e754ca3dba1267c859
-DIST gcc-14.2.0-RC-20240729.tar.xz 92329476 BLAKE2B 3e12182547927360af0791147422b9b1176e7bfcbd82ba0958b426e3c355876a78ef2b8ead2ff08aa399a1d8c4f8123d11ea21bde2a1a0ef30332b8b5837a7b0 SHA512 9a94325087a6b6c584011853150aea1a8ac775ccb6c77eb55239bd92cfbcbfb5b9e873387f0d31a1fcdbfd80530febdea5caeaae676780b97539aeaef5dbeb26
+DIST gcc-14.1.0-patches-5.tar.xz 12504 BLAKE2B 9453bb75c195e43e9b95cee89eee0722dadb8088ce258ae3334ad1023742b41fc0efea45ca4dbd73a20834aa09f72b5fd2d771e1bc58c0cff89a9d2b16ae8dd1 SHA512 b30b5ff1c0234ccfd440ede9e2c13c5fe3d72711ac94996694b3b325ec47f23c6549c41a70f7e08aea16e10fd45d348dcaaef7a7e49a981622d50b21a0971a30
 DIST gcc-14.2.0.tar.xz 92306460 BLAKE2B 87baf2a06dfa75d8fb6cd62c747ef1f57d3b9bbbe33a360d9ed3de4b4dbeaa8d920504c67e409bd9863414202c14fd854b46108e984418171205119216d03d3b SHA512 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396
-DIST gcc-15-20240714.tar.xz 88493908 BLAKE2B d11436fcbdf3c106e3de706514d4a48a33255ab1ac03d1ae25531415dc418007f391d92a502e12ab6ed31f573431cafdbbc97d153d7481b7455e380582f4518b SHA512 e2b9f3765002b670a1cc3be88e0e99ce710fe9cc1fa06d43026bbb2e2795c9955b0283a1a18d32311e82dc28efe6c67a93c1fd7ad5ffeef18f260c6aa69cab6a
-DIST gcc-15-20240721.tar.xz 88534600 BLAKE2B c057709e193fafa22cc753805e48cf092e0e3c29b656265b1f51e1e84d3d1b5bc07e0633b87e952199d3a885ce981bbecf07a9f00355c43aaad71c6f62250f54 SHA512 c689893f16ec88643854b53e3cc6e8ff49d44d7a4840f95b31aa5f82567c70a080651cc9e5cbaa19b7b099ea52687cfbd88fc1771e52f3c3cd1fe84048060955
-DIST gcc-15-20240728.tar.xz 88642832 BLAKE2B 388c921b90ff71c0aa3313479bef9c39e53ba4a4b772ef21975c60451fe9beb7d49cb8ff9c3b14aace2976b528bf70e98c6af71c1cd9f6d6c8c8a4820159a6de SHA512 a8ae49eb8a831e0e3fd01b6933318a7c44002cc3cf8b3b157b39ea9a3db933b5feed183ead02181425540294c08d5e36a7bf1e012011fe1b9289f3cb03e75811
-DIST gcc-15-20240804.tar.xz 89247584 BLAKE2B b49c828234a0b4cb35b0dcb7c2bfdc8d7c3d311f86f3db0acaefa81e57c3537d1ba9d32cd7fe2c7c53e2a019644fe2893aa9f69fa34c8c7af9053ba5c675ac26 SHA512 3db9bedd42fab2022532490acb7f3931976e500b7c4a3e93c226b68b7df0228d8489b80268273c9216c4bda12991bb07339c646982499761a39ba3fa54b45f29
-DIST gcc-15-20240811.tar.xz 89363444 BLAKE2B eaa29844fe0fb62f3772904a5e2598541dcc78959006400f7fca5663f0ee3b6452e4aa77d46e627182b827da0a4e0e57b659db7a2a23f63219cf75785b73b3c9 SHA512 a8e169ba90168a481ea865f340b6f165dc538022b0ac814f43b80fca33eb7772001f6dd22fcb8a3f056cfacd023a21581bec5da71626860fcbc858ad573d5c39
-DIST gcc-15-20240818.tar.xz 89483300 BLAKE2B 5b92220899eeeb41ad1412c9c076c21cae9ecab2aee6717126e30716355469386adbf3b867bdda542d36b245034d30236b5aa316bd47484013ee4078cb02c896 SHA512 b6fced64a433820ea542f82214362106d2ebf986324351c5282ff6b316178446337e4c99cc59e7078a2361948304e361661790e789234a25e876e68459d901bf
+DIST gcc-15-20240825.tar.xz 89745112 BLAKE2B 983b2f3fbcc8cea6b145f58d8015bf4f848f102f8b196fb363940c7fd556bf2ca07eaff676f0a38a78c0105d2f804e75b2c85f98d2fa3626704b706c227919c9 SHA512 eb106d150988c3350ad2524519b497a5305ef92c09d1322738d6fa91ed382500eeac0a206e8eacd900f85d5ea39b4510783c77f9340e35a948009a2766ddad90
+DIST gcc-15-20240901.tar.xz 89393580 BLAKE2B 5d52cc331aa7dfee416b84112415c60cd03f93855fa46e7c8f55aad22cd39de6e41c77e8870bfe0c67bd38308eb1b99dfe2def0a0e03007ef92fde01923d12c9 SHA512 c6a0885047492f83915c7e13ea7a028c439deaf1390374498be84c55c1d5613f53533a0daa4cd8748b0792f32666f6e472b0e57b8021ba4def23eea91141d4ec
+DIST gcc-15-20240908.tar.xz 89408188 BLAKE2B bd8e48c9f4bde4091c1d0196220873e4b312ee7c62c3ad74d29c1110e24055d0806b51ad3e1be28a17b28199cf4169b23892b43b29cf0791d27a6daab827102e SHA512 e249c638a0bc9c114a2a54c9836b71c93964394a497264556a3ac515e48659582876d18ce4b703c9d5dfad2d0afcf8bdf763be55bde4c18ece2c228b3513c276
 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de
-DIST gcc-15.0.0-patches-4.tar.xz 11440 BLAKE2B 8b7379f91ac14dd1e496de744d221cb0ba1802c14ce32cb90e6311ca7a60cbaf488a57060673e2e9d407eed6d3c5b092c1ba6da27036d35e0c78a7ac8a5f5ec4 SHA512 92e8895ec1c6054b46581867f3e49bd2d574043ae82ca441e2b48d9ed0e2dd5c58baa53ba605ce59a5c1d59473ac0d79c0287e5b47d06f0a661c655a19a4a5df
-DIST gcc-15.0.0-patches-5.tar.xz 11840 BLAKE2B 9af335f7e1795e600eae742ac32f5ff737f157aaa35902227ba29b28013c95bcf5b2b1345a21c433bc10f4cfbfc267a595b6ca90ec2723f7f24fccac3f7c0355 SHA512 8cc8ec574640470780711bb5f6163f382c23999152c229d86e1143e03275a3147bd1fc0cd9bf3642a2402333ec565d30b90a6e367284b78ccc580c6721aeac23
-DIST gcc-15.0.0-patches-6.tar.xz 11588 BLAKE2B 7846d77859b297a892a23b995c9aa06410c484a8f6e11fa9c9692de0f1b0a03aa1f35c4b88f164623a600bf2012fff25567075203c57fdbcb26bbc95f94d1cf9 SHA512 837ed8b5f6901715862951726e85eea043aec192f854db23201326fd6bedb7552c95527d253736c0164153b75ec487b4644fd269f9f6815b4489416602ebfe78
-DIST gcc-15.0.0-patches-7.tar.xz 12928 BLAKE2B 4f46a2c2fbdd714bebfce85bad8e80fa7d3939f83ddbc279f20f448bfe17c33c6fe94a21a82a5c9efae619ceaf50dc5ac339850373e05c6556cc65c72cef812c SHA512 c3e756cefd205c818856cb4c17d15194267c566d4758f2f4a2bf3ccb1cf00151286c10a7b2c36bede7a5f27d5a482f9489545078bcf45d55d28e3e67a694f6d6
-DIST gcc-15.0.0-patches-8.tar.xz 12816 BLAKE2B 65ff806b649efd50f679a921fe3d71ae9a4cabf73a997e50a4923edd7305e1f89b5951e7a34452778697e7e12274e044640684bab45533ec5b6fe0d44057da4a SHA512 240a6cf1852ec24f3cc2281a467448d0a72dd497ee9f636f36d00b264be53f616efb3e9786aff201d38551f0b05e9abd8198fccb3b0a8af31de6743c96b2d9a8
-DIST gcc-15.0.0-patches-9.tar.xz 11976 BLAKE2B 736ceeaf473d9004087bfd686588744af1cee40fdadf89358f2ff7caff623de7bfc5c95863af9dd23d2e2bb80e94f9f4a8cbc389f954e1d63e9cac0e747a59bd SHA512 64d528c5d1c5dc45ba8ecb7f9ed5e8a0a7f8344535de11489402ee766595b2e9f4b7192bb0f96ce4c9318635893101d4f5699351fca4121c65708626bfa0867b
+DIST gcc-15.0.0-patches-11.tar.xz 14880 BLAKE2B ff720e0bf6e1ca18582b9f69e1406af4d226a9427df33be38c58cef0989403c001b2d247799e7b3883ce294242725f116a6a6bf84317f93b47b64abc5d86281e SHA512 78619a8cb6174d99954296e5c79c0eaa0ebe9df13560e1e6c8ce158f50f42cb801849995e465e2d200f999ef1c26f80ae580654841420ec77012e6551e801458
+DIST gcc-15.0.0-patches-12.tar.xz 12980 BLAKE2B 325743e1d4264e80ce91e866bb3cbb9d0e72e186fee0d29e6dace6c48b975992dcd7081fe2a924519d5c1503dedc14a4b41f584dd7d97924664bcc6f6537a8bc SHA512 e18401c517b05e13c203b147f9ba6991c867a8c0a50a7e1a67ea497243d46cbbac674c3498651946f941423241d36b6bc55571a8131fc3604c92604be288f60d
 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_p20240801.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240801.ebuild
deleted file mode 100644
index e645c4d53b77..000000000000
--- a/sys-devel/gcc/gcc-12.4.1_p20240801.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.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 ~ia64 ~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_p20240808.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240808.ebuild
deleted file mode 100644
index e645c4d53b77..000000000000
--- a/sys-devel/gcc/gcc-12.4.1_p20240808.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.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 ~ia64 ~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_p20240815.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240815.ebuild
deleted file mode 100644
index e645c4d53b77..000000000000
--- a/sys-devel/gcc/gcc-12.4.1_p20240815.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="12.3.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.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 ~ia64 ~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_p20240711.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240829.ebuild
index e645c4d53b77..e645c4d53b77 100644
--- a/sys-devel/gcc/gcc-12.4.1_p20240711.ebuild
+++ b/sys-devel/gcc/gcc-12.4.1_p20240829.ebuild
diff --git a/sys-devel/gcc/gcc-12.4.1_p20240725.ebuild b/sys-devel/gcc/gcc-12.4.1_p20240905.ebuild
index e645c4d53b77..e645c4d53b77 100644
--- a/sys-devel/gcc/gcc-12.4.1_p20240725.ebuild
+++ b/sys-devel/gcc/gcc-12.4.1_p20240905.ebuild
diff --git a/sys-devel/gcc/gcc-13.3.1_p20240712.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240712.ebuild
deleted file mode 100644
index cda893d3b385..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240712.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="17"
-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 ~ia64 ~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-13.3.1_p20240719.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240719.ebuild
deleted file mode 100644
index cda893d3b385..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240719.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="17"
-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 ~ia64 ~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-13.3.1_p20240809.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240809.ebuild
deleted file mode 100644
index bb142a8fd1d2..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240809.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="18"
-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 ~ia64 ~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-13.3.1_p20240816.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240816.ebuild
deleted file mode 100644
index bb142a8fd1d2..000000000000
--- a/sys-devel/gcc/gcc-13.3.1_p20240816.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.2.0"
-MUSL_GCC_VER="13.2.0"
-PATCH_VER="18"
-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 ~ia64 ~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-13.3.1_p20240726.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240830.ebuild
index bb142a8fd1d2..bb142a8fd1d2 100644
--- a/sys-devel/gcc/gcc-13.3.1_p20240726.ebuild
+++ b/sys-devel/gcc/gcc-13.3.1_p20240830.ebuild
diff --git a/sys-devel/gcc/gcc-13.3.1_p20240802.ebuild b/sys-devel/gcc/gcc-13.3.1_p20240906.ebuild
index bb142a8fd1d2..bb142a8fd1d2 100644
--- a/sys-devel/gcc/gcc-13.3.1_p20240802.ebuild
+++ b/sys-devel/gcc/gcc-13.3.1_p20240906.ebuild
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240622.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240622.ebuild
deleted file mode 100644
index b7dd06f5569c..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240622.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="14.1.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	# m68k doesnt build (ICE, bug 932733)
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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.1.1_p20240713.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240713.ebuild
deleted file mode 100644
index 30e9b4a563cc..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240713.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="14.1.0"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-if tc_is_live ; then
-	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	# Don't keyword live ebuilds
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	# m68k doesnt build (ICE, bug 932733)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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.1.1_p20240720.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240720.ebuild
deleted file mode 100644
index 6e09c541c2e3..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240720.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"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="4"
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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.1.1_p20240723.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240723.ebuild
deleted file mode 100644
index 5dbd6fa364d9..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240723.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="4"
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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.1.1_p20240727.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240727.ebuild
deleted file mode 100644
index a4285b216d5e..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240727.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"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="4"
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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.1.1_p20240729.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240729.ebuild
deleted file mode 100644
index 5dbd6fa364d9..000000000000
--- a/sys-devel/gcc/gcc-14.1.1_p20240729.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="4"
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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_p20240803.ebuild b/sys-devel/gcc/gcc-14.2.1_p20240803.ebuild
deleted file mode 100644
index a4285b216d5e..000000000000
--- a/sys-devel/gcc/gcc-14.2.1_p20240803.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"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="4"
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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_p20240810.ebuild b/sys-devel/gcc/gcc-14.2.1_p20240810.ebuild
deleted file mode 100644
index a4285b216d5e..000000000000
--- a/sys-devel/gcc/gcc-14.2.1_p20240810.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"
-PATCH_GCC_VER="14.1.0"
-PATCH_VER="4"
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	:;
-fi
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-	# If GCC is enabling CET by default, we need glibc to be built with support for it.
-	# bug #830454
-	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-	DEPEND="${RDEPEND}"
-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_p20240817-r1.ebuild b/sys-devel/gcc/gcc-14.2.1_p20240817-r1.ebuild
new file mode 100644
index 000000000000..261dc3f8707f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20240817-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.1.0"
+PATCH_VER="5"
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+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_p20240831.ebuild b/sys-devel/gcc/gcc-14.2.1_p20240831.ebuild
new file mode 100644
index 000000000000..261dc3f8707f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20240831.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.1.0"
+PATCH_VER="5"
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+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_p20240907.ebuild b/sys-devel/gcc/gcc-14.2.1_p20240907.ebuild
new file mode 100644
index 000000000000..261dc3f8707f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.2.1_p20240907.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.1.0"
+PATCH_VER="5"
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+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_pre20240714-r1.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240714-r1.ebuild
deleted file mode 100644
index c843d5c92e61..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240714-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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="5"
-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 ~ia64 ~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_pre20240714.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240714.ebuild
deleted file mode 100644
index 0e7089de681c..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240714.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="4"
-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 ~ia64 ~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_pre20240721.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240721.ebuild
deleted file mode 100644
index 2ef3a44f1ead..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240721.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="6"
-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 ~ia64 ~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_pre20240728.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240728.ebuild
deleted file mode 100644
index 5efcce931c1d..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240728.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="7"
-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 ~ia64 ~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_pre20240804.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240804.ebuild
deleted file mode 100644
index 67cdb93cf232..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240804.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="8"
-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 ~ia64 ~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_pre20240811.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240811.ebuild
deleted file mode 100644
index 42d11e2113e4..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240811.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="9"
-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 ~ia64 ~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_pre20240818.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240818.ebuild
deleted file mode 100644
index 42d11e2113e4..000000000000
--- a/sys-devel/gcc/gcc-15.0.0_pre20240818.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
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="9"
-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 ~ia64 ~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_pre20240825.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240825.ebuild
new file mode 100644
index 000000000000..c94cfb9a6af9
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240825.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="11"
+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 ~ia64 ~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_pre20240901.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240901.ebuild
new file mode 100644
index 000000000000..3097982bd31a
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240901.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="12"
+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 ~ia64 ~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_pre20240908.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20240908.ebuild
new file mode 100644
index 000000000000..3097982bd31a
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20240908.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="12"
+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 ~ia64 ~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/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index d31fddd593ea..97821fc2f763 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,2 +1,3 @@
 DIST gnuconfig-20230731.tar.xz 73112 BLAKE2B c6502d6b339e56440dbfc9abb0ba49e3eec5a573c5e44779dd326e6f11b55b7fc3a6d99fec73abbcc271e8f6f125699ce87f512cb3a825144307cf820df0067a SHA512 d8e24a30f86f1983c69a37a901e2357a0aefbe15fcd3f8a331d1c6f8eabc81b7436930055756a764ae874e406090d8029403f1c0faa3737acb94bd937cd577ef
 DIST gnuconfig-20240101.tar.xz 76992 BLAKE2B a42e35c9858ac1eca409b29ecd71c787adad94bd977a35a8f74c870b3632b1031cd7c00e022c7837a8705a50316d3f618bfaedf569b63b4f75a33fc638330706 SHA512 2e6f1f83454335e2c111866bed2660d86919061c2e047c79d5e191ecb9411a28c0f269e8fddd8a212d38a2d0c4114e2a432e69bcbf8c7aee671db1ce15b34ae8
+DIST gnuconfig-20240728.tar.xz 82360 BLAKE2B 476cabe032305adc916dffa39f30f07ac8249449e79da06763f08af9b642399c5c08bd5cf6b7229d63ba36b55e0ca75692b5db058ae0aa75b6b6370f12209aba SHA512 a43067a6f2a7f8d055122aefef2b0d28314c16871455e9223b8429a428ec6b4383eefe8fb50ff00d7c4c39710c6fb9fa81c3c84f3e6f5f58cbd1cf475896135e
diff --git a/sys-devel/gnuconfig/gnuconfig-20240728.ebuild b/sys-devel/gnuconfig/gnuconfig-20240728.ebuild
new file mode 100644
index 000000000000..04e57c23b5b3
--- /dev/null
+++ b/sys-devel/gnuconfig/gnuconfig-20240728.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 99999999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	S="${WORKDIR}"
+fi
+
+DESCRIPTION="Updated config.sub and config.guess file from GNU"
+HOMEPAGE="https://savannah.gnu.org/projects/config"
+
+LICENSE="GPL-3+-with-autoconf-exception"
+SLOT="0"
+
+maint_pkg_create() {
+	cd "${S}" || die
+
+	emake ChangeLog
+	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
+	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
+
+	local tar="${T}/gnuconfig-${ver}.tar.xz"
+	tar -Jcf "${tar}" ./* || die "creating tar failed"
+	einfo "Packaged tar now available:"
+	einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999 ]] ; then
+		git-r3_src_unpack
+		maint_pkg_create
+	else
+		unpack ${A}
+	fi
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins config.{sub,guess}
+	fperms +x /usr/share/${PN}/config.{sub,guess}
+	dodoc ChangeLog
+}
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 8181c86995d4..554a64850555 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -1,21 +1,22 @@
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
 DIST gcc-10.5.0.tar.xz 77846412 BLAKE2B 9b71761f4015649514677784443886e59733ac3845f7dfaa4343f46327d36c08c403c444b9e492b870ac0b3f2e3568f972b7700a0ef05a497fb4066079b3143b SHA512 d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd
-DIST gcc-11-20240111.tar.xz 76240620 BLAKE2B dcf3b2493ca6ba1a9cd0137186cfbf1b96296ff9c5625e40ec7b89e5903b07dc151b61ad54b885fc57ccc02214e2cfa7b9249cbd755ac2554c6ca0008f0704d8 SHA512 aaed094cb6dd99166e0ec59886014108574ddab52701581f0f8e7f0abb966320d01f1bce6ff646170618ca7c2819d20523a23615f20114dbe412de43b937caf4
 DIST gcc-11-20240501.tar.xz 76267628 BLAKE2B 31674f1fbaacac3bc8d4f0553b42569128c978b7153eb867387ff2cedd11ba29e2877a66eefbb41b93745e9ff3da7db18c00aacff5766a34b020cb82252da3a4 SHA512 b4fd43b02ddf60dd933f86813cf4c5e2abf4d3344adcffc4166ad2463b2aa37603eb85df642e952a1c72a6356fc41d80567096ddc4e46d4b4589ade34ae77b2d
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-12.tar.xz 13824 BLAKE2B e4df9e0dc9512882022aaf325ebf65c540169454c91dd31f913c6f57f6eb291c79ae919671b53db1549799d4a70c09298bf45ed82ad05eb1f961443cc958369d SHA512 87fed0c3f8e28c9f702443db58350bb615110b27ebe334b5de2ea60678e2548c56cd75cffade210d69634e2ac0a9311f5100ddb45d97645aa76d5688bc421a61
-DIST gcc-12-20240209.tar.xz 79824868 BLAKE2B 1ae5a646da470f06648c4766c77475ceb287c5f6647d5102f1aef6590f973233d5e7f83b5e0241488d49dba59dd605c211938379e68a393a2dccb3834103ae4b SHA512 9f9a04f4477f41bb2a5662aedef2af75b039de50c2dc99310e504e6080cb7aae06a1255337ea2e563975cb108ddc6766adbbaf4e3d5d5712801d7ba9a5209dbd
+DIST gcc-11.5.0.tar.xz 82399864 BLAKE2B f4a61faad32aac9e9cb553c1a1a011df0a057f6e2cac92a13cc7e285d08191dd4a117f41a8faac2359c0e2a16f954c7fef354dda9df8c63bff1c5cefda82602c SHA512 88f17d5a5e69eeb53aaf0a9bc9daab1c4e501d145b388c5485ebeb2cc36178fbb2d3e49ebef4a8c007a05e88471a06b97cf9b08870478249f77fbfa3d4abd9a8
 DIST gcc-12-20240502.tar.xz 79851984 BLAKE2B e3ed4f4fb20ce2ed421fadd40dfd1c6831759228925002146c316683cd0aef47792f433dc9ab120fb79e2afa2aa83cbf68f6b82e97615cac500322d4f0d1cce9 SHA512 c46e6b00f65d96afc65ce6cc9f7591ff81d5789aff9f49fc6fed96047fe27e24a8a103f0b96485e4a717600aeb9b45933ccbb2191eb087275fc1350629c9b842
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
-DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-12.3.0-patches-3.tar.xz 14852 BLAKE2B 7a5f1f43063b15f424099afd72096212fbbbc5151ff01f2de15dfb6e7cf274981c8cfaedba9ef61576c9096fb172fc550a7deb5cd7d9366fd249fd5dd3951f76 SHA512 aa89e4c2ae02f4fb42229ad5167f2eaa3a8fae51118645bf07199fe2124b9c83948590662b053d08002ef709fa870ea88315fd4ccbe4441a74e9cb62edcb82fb
-DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 5807623d3f7dd751b6dfe164cfd50d57b2f93485c23c3c2228a4a846a9a94cdad52a5e6f2806e5e7ee2a7b5526386ebdb339c44c7ea023d69f8652088a1b114d SHA512 14a01ced7ac2bfd9fc93de4e3819b4d0823fbe129d3f1faabeb707e9e3e2613b4173321b58b3648a7250e3b7ff5d94edfee60e6c38682f31a1f7b57b1c01433f
+DIST gcc-12.4.0.tar.xz 83377372 BLAKE2B 0d5aa9995bf53fa2dc976a846240cfb8fafd125ad6c54f45dc9d770215eae3e9ea0db82a9a4f79c51b4d5f8461a1d730c17db6841bc31bd96dba11d9ed7544ae SHA512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853
 DIST gcc-13-20240503.tar.xz 84417232 BLAKE2B 4024852c3252667054e6086263b2a0e21dfa1e56a7adf4edb2fee4841dc2b41eb3f02dee7b15c5de3a1ac7c438929da4ca584cab07724086f6eb315a331c4a44 SHA512 32b74972ba94d1016e052eb7c7dc976b32d679e40aeafb406bbbc69d34ade3fe0f35d8941ef678eaf0bb33aea1aaba8fbce9122733b12920a470763a18aa6514
+DIST gcc-13-20240614.tar.xz 84463660 BLAKE2B a1b551ff633c31d6972fed173f248ba5f6696eb1566801e180b78a7c7e20933b1aaae40839b4f1529d61166de55125395d4f9a812511c088e73f975bf1d2167f SHA512 1a543ddfb56e793367a43895a7ce4f97daeca6ffd5234ce50e8a7ae0f8db1071e01bdd653fda40d00eb7a680faead8f1d8d1295f983086a33a4c75e4affa2ea5
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
-DIST gcc-13.2.0-patches-13.tar.xz 46404 BLAKE2B d11e6ebfed8d1fcba60638240927d57722015ea7cfb0790836c338c023fc01f9f5b3ebf0fe1e0c615b36e0131d38b49e3aee4026f8ed81473572255ccaa74e4b SHA512 4f8bbf9101548d64e78e32f38869ed84e462ce8329d64fbb934132d15bc81f8a9b6f2a075c0263fdc3b32e0dfac6bc032a4176eb06df88cb282fe974bfe102f4
 DIST gcc-13.2.0-patches-15.tar.xz 47052 BLAKE2B f145341813d6baf9cbcc3e8421c7f427148503d2aeddd6a2eaac1ad3d470a818292392861542a7915d8b0f2f9b3255603f394b2e6833141658fc035bcd2b5366 SHA512 c89a3fccd944f03d25e076a967c3b220803ee9a6fbedec1daf2c20f629dd6162ce6be4f259522bd193169f0e8307daa9895b5d8581cf975ee086e5abfd675e34
+DIST gcc-13.2.0-patches-17.tar.xz 45036 BLAKE2B 85fe5e6b0da7a4477f0026aaf397d93421503780ef3c91e0a5e3c6897ab73884d4fbc9d2f5f41ce3f3f172fa7eb98e45c348ce41d852457c472360eb2e48691c SHA512 ebe77a32af38df15bc4034e88fb6e90c84b3c0a172d854cabef789cc29bedba14ec0c27fbeae0959027587e02bc882a944ef68a1bb471432d021d11b4b037562
 DIST gcc-14-20240511.tar.xz 88010940 BLAKE2B 98df36154ed111af8a0eed465eeda72145eb7df06dc6dbccb0918ab3fd583d1af46b87322f0b6113b41e89af64b3023ec76037c942aa7e08e5ec5a8e0f9cd731 SHA512 c0e9cdd687859c5531d9a17b148873b5a5c7e4e3495f5f96b0c4baefc7989e40df2118b16c0ec26a9ec968584be7a39480aad995e0eb40a046608df905834d82
+DIST gcc-14-20240817.tar.xz 88024252 BLAKE2B 994b3e263246e344c6898943a17feb63f07b3de02777a77c689e001343119bd451e1ed5c6958f368077f10b4778c65fa492c55d164e2a0b1bbd65b275aae3cd1 SHA512 31de06694efeb2be49b64e9e8314a766d36c3d5f5f2d52d1e0419ba69262b7c344ef0700957eff11007ba5b81bd5e74dea2a2c0286990cb33927bac4a7db9756
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.1.0-patches-1.tar.xz 11584 BLAKE2B d483f4e3324acdc26b9837028d5e20ad0cdcf3ef4bcc78a6902d63ceebc7e5ff70c8163f6a8c8e36405df47c59dd2df506147c53ce51a8ec73494e65b5902647 SHA512 3d7aea113b594d1896c93e9e6be85f467488fa75de2800ed76eab2f87cef26829b235d1f361b187e38cf13b0fb9518cd4431c3106ec1e49d0f744e7eb703eaa0
+DIST gcc-14.1.0-patches-4.tar.xz 11620 BLAKE2B c819fbdea1f3bf10c8d4214d4c33cf28c1410171d2833b6f8c1225eeefe749ddb815067b3fdb750e5839761aee8d39ffc51ffb492f88e630076818a61b18362b SHA512 0d6e1b04591607dfc8022124b186ce499467c32db7667ee1a640fe2e07706597edc0e4ad5c7ebcb75c8f5fc6e45e9b9ef715402c71ff9ab21fe380007fe5d84f
 DIST gcc-validate-failures-a447cd6dee206facb66720bdacf0c765a8b09f33.py 27537 BLAKE2B 96c7474de0bc50ab890a91551412398c979396c43aa237a4b6d8baa98ce7fda2cc9f5a755a03fd9d055d885ee2fb40ba29644a0649c24398361ce75a20fae634 SHA512 409434953351cf1f2287f1e4a4fbde5b28a27add35ddd284080acec71b33cb4ec5e1c07f41a79fac060bd6f1eedd198812495141923e410ded907429fe515f83
diff --git a/sys-devel/kgcc64/kgcc64-11.4.1_p20240111.ebuild b/sys-devel/kgcc64/kgcc64-11.4.1_p20240111.ebuild
deleted file mode 100644
index ffb81657cd1d..000000000000
--- a/sys-devel/kgcc64/kgcc64-11.4.1_p20240111.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-
-GCC_TARGET_NO_MULTILIB=true
-TOOLCHAIN_ALLOWED_LANGS="c"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="11.4.0"
-PATCH_VER="12"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-PYTHON_COMPAT=( python3_{10..12} )
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-11.5.0.ebuild b/sys-devel/kgcc64/kgcc64-11.5.0.ebuild
new file mode 100644
index 000000000000..8b9a457d1bdf
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-11.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+
+GCC_TARGET_NO_MULTILIB=true
+TOOLCHAIN_ALLOWED_LANGS="c"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="11.4.0"
+PATCH_VER="12"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+PYTHON_COMPAT=( python3_{10..12} )
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/kgcc64/kgcc64-12.3.1_p20240209.ebuild b/sys-devel/kgcc64/kgcc64-12.3.1_p20240209.ebuild
deleted file mode 100644
index 12776cc4bffc..000000000000
--- a/sys-devel/kgcc64/kgcc64-12.3.1_p20240209.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="12.3.0"
-MUSL_VER="1"
-MUSL_GCC_VER="12.3.0"
-GCC_TARGET_NO_MULTILIB=true
-PYTHON_COMPAT=( python3_{10..12} )
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-src_prepare() {
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/gcc-12.3-ccache-ICE.patch
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-12.3.1_p20240502.ebuild b/sys-devel/kgcc64/kgcc64-12.3.1_p20240502.ebuild
index 0ab132493ea1..6dd586e62c0a 100644
--- a/sys-devel/kgcc64/kgcc64-12.3.1_p20240502.ebuild
+++ b/sys-devel/kgcc64/kgcc64-12.3.1_p20240502.ebuild
@@ -33,7 +33,6 @@ BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
 
 src_prepare() {
 	toolchain_src_prepare
-	eapply "${FILESDIR}"/gcc-12.3-ccache-ICE.patch
 }
 
 pkg_postinst() {
diff --git a/sys-devel/kgcc64/kgcc64-12.4.0.ebuild b/sys-devel/kgcc64/kgcc64-12.4.0.ebuild
new file mode 100644
index 000000000000..61305646587b
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-12.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="3"
+PATCH_GCC_VER="12.3.0"
+MUSL_VER="1"
+MUSL_GCC_VER="12.3.0"
+GCC_TARGET_NO_MULTILIB=true
+PYTHON_COMPAT=( python3_{10..12} )
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+src_prepare() {
+	toolchain_src_prepare
+}
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/kgcc64/kgcc64-13.2.1_p20240210.ebuild b/sys-devel/kgcc64/kgcc64-13.2.1_p20240210.ebuild
deleted file mode 100644
index 6363d8977199..000000000000
--- a/sys-devel/kgcc64/kgcc64-13.2.1_p20240210.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
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="13"
-PATCH_GCC_VER="13.2.0"
-MUSL_VER="2"
-MUSL_GCC_VER="13.2.0"
-GCC_TARGET_NO_MULTILIB=true
-PYTHON_COMPAT=( python3_{10..12} )
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-13.3.1_p20240614.ebuild b/sys-devel/kgcc64/kgcc64-13.3.1_p20240614.ebuild
new file mode 100644
index 000000000000..d8efdd71af25
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-13.3.1_p20240614.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="17"
+PATCH_GCC_VER="13.2.0"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.0"
+GCC_TARGET_NO_MULTILIB=true
+PYTHON_COMPAT=( python3_{10..12} )
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/kgcc64/kgcc64-14.2.1_p20240817.ebuild b/sys-devel/kgcc64/kgcc64-14.2.1_p20240817.ebuild
new file mode 100644
index 000000000000..d3384b00b844
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-14.2.1_p20240817.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="4"
+PATCH_GCC_VER="14.1.0"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+GCC_TARGET_NO_MULTILIB=true
+PYTHON_COMPAT=( python3_{10..12} )
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+BDEPEND="hppa? ( sys-devel/binutils-hppa64 )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-18.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-18.ebuild
index ce8f3f7900ef..8e68ec8ad532 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-18.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-18.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~arm64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~arm64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 7db835b8ac88..66e249aed0d4 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-devel/lld/lld-18.1.8.ebuild b/sys-devel/lld/lld-18.1.8.ebuild
index b220b6b78bc8..d5245986a556 100644
--- a/sys-devel/lld/lld-18.1.8.ebuild
+++ b/sys-devel/lld/lld-18.1.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~arm64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~arm64-macos"
 IUSE="debug test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-19.1.0_rc2.ebuild b/sys-devel/lld/lld-19.1.0_rc4.ebuild
index 79558afa1abe..79558afa1abe 100644
--- a/sys-devel/lld/lld-19.1.0_rc2.ebuild
+++ b/sys-devel/lld/lld-19.1.0_rc4.ebuild
diff --git a/sys-devel/lld/lld-20.0.0_pre20240808.ebuild b/sys-devel/lld/lld-20.0.0_pre20240830.ebuild
index 79558afa1abe..79558afa1abe 100644
--- a/sys-devel/lld/lld-20.0.0_pre20240808.ebuild
+++ b/sys-devel/lld/lld-20.0.0_pre20240830.ebuild
diff --git a/sys-devel/lld/lld-20.0.0_pre20240815.ebuild b/sys-devel/lld/lld-20.0.0_pre20240910.ebuild
index 79558afa1abe..79558afa1abe 100644
--- a/sys-devel/lld/lld-20.0.0_pre20240815.ebuild
+++ b/sys-devel/lld/lld-20.0.0_pre20240910.ebuild
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-devel/llvm-common/llvm-common-19.1.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-19.1.0_rc4.ebuild
index 2d8f35a84179..2d8f35a84179 100644
--- a/sys-devel/llvm-common/llvm-common-19.1.0_rc2.ebuild
+++ b/sys-devel/llvm-common/llvm-common-19.1.0_rc4.ebuild
diff --git a/sys-devel/llvm-common/llvm-common-20.0.0_pre20240808.ebuild b/sys-devel/llvm-common/llvm-common-20.0.0_pre20240830.ebuild
index 2d8f35a84179..2d8f35a84179 100644
--- a/sys-devel/llvm-common/llvm-common-20.0.0_pre20240808.ebuild
+++ b/sys-devel/llvm-common/llvm-common-20.0.0_pre20240830.ebuild
diff --git a/sys-devel/llvm-common/llvm-common-20.0.0_pre20240815.ebuild b/sys-devel/llvm-common/llvm-common-20.0.0_pre20240910.ebuild
index 2d8f35a84179..2d8f35a84179 100644
--- a/sys-devel/llvm-common/llvm-common-20.0.0_pre20240815.ebuild
+++ b/sys-devel/llvm-common/llvm-common-20.0.0_pre20240910.ebuild
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild
index b2dfeab26fe9..0f622a6f7cbb 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18.ebuild
index c1c22114f553..f2b54e72f590 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index b17f8040cd36..5bd3a0a47c11 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -3,8 +3,11 @@ DIST llvm-16.0.4-manpages.tar.bz2 243154 BLAKE2B 69308e3ec19d750e7249b7c8cd79224
 DIST llvm-17.0.1-manpages.tar.bz2 263148 BLAKE2B 6485a261e356eacc4a274f9b8d329b53f11a37a23effea41a12322f6908bbe702dc1a97bfd10293061f01f1dbff8693e9324ab3dce2551e78eab128dbd7fea30 SHA512 963ff1b7aa0cb01ed0c0356a0adc3a315d94e78035e928dc81464f553e722633a17596e421c248968e87e22ae66f1ab9cccda5fd3388d1a6d34b5e9c6140ebcb
 DIST llvm-18.1.0-manpages.tar.bz2 270429 BLAKE2B d85d6e23197184dc512019c25805af0aa145eefb4c36215807c1ba70ad47943c05c06dbaafd84a7e6487bdd83814e03277374e095d97b129e3fc8d468c10741c SHA512 5f492c85fad4e04e0148ea509f4b6520de9e2765c51e617363a11aa8e47c2d847f6b0897958ca1d93bccf0f6a9150868b7e04c728bd430c05bf2da30bdeba6cc
 DIST llvm-gentoo-patchset-15.0.7-r3.tar.xz 24268 BLAKE2B 6531ae385ecea87bc26dba8ce19b4cde8ff224c80fd81f04c6ded131e305ecfdeb8d29ebd3b68a641d240805dc83eb0ebc7cc85124f02ad0ee66e0f201b91d7e SHA512 66cb33f8b423736b990fb75d4f2d1e5f14c0b03308f403297204dd1a352d72f85f34220fd66d3de5d6df328cdf2ffce03c2a111cb0bb57791cf68a88069ac7df
+DIST llvm-gentoo-patchset-15.0.7-r6.tar.xz 25208 BLAKE2B c9fca31a053ee059c3060a94dcf675d472fc1a59b5f927648de58fb4ff20bfc229890f789ed47b3d053bd466b860a0c60a53b4b024a8fe18c776e9a72434d6de SHA512 601cd923711839dca7cb5bfea53ded644777c6340265a797939a53409fd2ca27059a015fd6ca6832e60314699ade27919a9a59dab395cc27f8fdc479a0f3c034
+DIST llvm-gentoo-patchset-16.0.6-r5.tar.xz 19728 BLAKE2B 36b605401893034b2b560d26cfb57512c81eddbc35b25d9c3d1fe051b8825c38cae1b8ed999faf8fef564ca5578402d3979bc56ba0a5514dc62594d893696f41 SHA512 20a36b69dfc2b4796ce33318a28529ebdc213945ee67a983e4218117d2ee2c93be1ecb38b0e8189249c5806a442cba708e0890e1b7bf6376edec4403bcc71425
 DIST llvm-gentoo-patchset-16.0.6.tar.xz 17340 BLAKE2B 37cdf4b38367b4256d4f7a25d1b4f41758e5f81be8e20a1c94a10d6c5e36642e9672121b455e73a0bac2eb40467ef2db4b43789b2912a6790593d97b8b5c27e3 SHA512 2c02b9d8a4c5af9fddcd26c95dc66fffae32cb5b7f85c65a1aa4ed00dd8cd5b01cc1975a711aee63c0b8b11e9dc20f2bc05ea753904eb516892b820f02aff825
 DIST llvm-gentoo-patchset-17.0.6-r2.tar.xz 3664 BLAKE2B b3d61090bec41469027115f1a7b9c51ff2cd720a5363c755da7c87c120e4c85b5a2b4d65b95e418f15d947e580824d267a5ee86336f2d9272e58ec24fa2acaf7 SHA512 4be3d2fefce3f5b6b8f64632ff47a53d4de8a20b276e538527ba01a1a663c2846e1eba28fdd70364e583884618d94ee774791b1ca03fdda1fef8110b664e506c
+DIST llvm-gentoo-patchset-17.0.6-r3.tar.xz 4648 BLAKE2B c709162068e83575f71a2ac2243665f47a3d42cac078daa5762bbd339d8593e8c1c5c58e2e415ba6659fe2f3c3824bd098c9be579103362084079140c0386f76 SHA512 251a33f146fcbdbe51c9e1ad7b08c2cd7d062d0b136c833cda8a5155c86080c506d575e4288cde4ba8530ca7f230c2afa63621878a8df0f23076a93c924e7d65
 DIST llvm-gentoo-patchset-17.0.6.tar.xz 1792 BLAKE2B 21b34b436333c0b37522d4340cccc84a572701f6e267cf7c6adfa9be419913f5a6c9ee40a6be5c62d12fbd868912801d30381573c4459c05676e05785cccaefe SHA512 2d90b5e7fcbb950249ef7133fac1ed3dcb758a4d92732119049526cea0b291bd4e9738c4c0d806d70e7d769e1906f8ef3930066c206c00b6ec7d3509ed0fed19
 DIST llvm-gentoo-patchset-18.1.8-r4.tar.xz 15912 BLAKE2B 7300128244aafe42fcf5863e3aad2beb0c96c3df527e6d35fe571369bad520ba4aa397a329287da17eb33dca902057da5cd5193ec560ea7f5767ba2d00a45818 SHA512 b32633db387d4adb3bb2d067f824ae4e8e8a24a25aaa4888520f6e61a4bb1f8f70ad5f44057fbc0892c6f93c803e360612b0fc02c4ec068470b546a55f246cba
 DIST llvm-gentoo-patchset-18.1.8.tar.xz 7444 BLAKE2B ed41325f7e2efc257c03b3500f9ba49a29333f617ff9914705f9df660bbc1e1b3aafada6f2a68a316d2ee47cf628a35f3495f74c9f0ca00c120079e8e93bd4db SHA512 a6bb4313d2635d38f36a3fdb343b2b7f117129ec62f92ead0bbf7010ae73055cb757958975cd9d1677f2c4b1554819a16a918bef9e9e0d982f8025ce49b9a8ef
@@ -16,7 +19,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-devel/llvm/llvm-15.0.7-r6.ebuild b/sys-devel/llvm/llvm-15.0.7-r6.ebuild
new file mode 100644
index 000000000000..ba86207405ca
--- /dev/null
+++ b/sys-devel/llvm/llvm-15.0.7-r6.ebuild
@@ -0,0 +1,520 @@
+# 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 flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 \
+	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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	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? (
+		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=1
+LLVM_PATCHSET=${PV/_/-}-r6
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version -b "dev-python/recommonmark[${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)
+						;;
+					# 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
+}
+
+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
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# 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-debuginfod
+			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-reduce
+			llvm-remark-size-diff
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			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
+		)
+	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_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-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_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	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.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	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
+
+	if tc-is-cross-compiler; then
+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${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
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MASTER_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/sys-devel/llvm/llvm-16.0.6-r5.ebuild b/sys-devel/llvm/llvm-16.0.6-r5.ebuild
new file mode 100644
index 000000000000..4134520ad63a
--- /dev/null
+++ b/sys-devel/llvm/llvm-16.0.6-r5.ebuild
@@ -0,0 +1,523 @@
+# 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 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	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? (
+		<sys-libs/libcxx-${LLVM_VERSION}.9999
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake )
+LLVM_TEST_COMPONENTS=( third-party )
+LLVM_MANPAGES=1
+LLVM_PATCHSET=${PV}-r5
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version -b "dev-python/recommonmark[${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)
+						;;
+					# 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
+}
+
+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
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# 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
+			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-reduce
+			llvm-remark-size-diff
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			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
+		)
+	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=$(usex test)
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-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_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-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
+
+	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
+	use kernel_Darwin && mycmakeargs+=(
+		-DTerminfo_LIBRARIES=-lncurses
+	)
+
+	# 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_MASTER_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/sys-devel/llvm/llvm-17.0.6-r3.ebuild b/sys-devel/llvm/llvm-17.0.6-r3.ebuild
new file mode 100644
index 000000000000..a9839483282d
--- /dev/null
+++ b/sys-devel/llvm/llvm-17.0.6-r3.ebuild
@@ -0,0 +1,542 @@
+# 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 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
+	ncurses test xar 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}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	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? (
+		<sys-libs/libcxx-${LLVM_VERSION}.9999
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=1
+LLVM_PATCHSET=${PV}-r3
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version -b "dev-python/recommonmark[${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)
+						;;
+					# 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
+}
+
+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+=(
+			# 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-reduce
+			llvm-remark-size-diff
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			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_TERMINFO=$(usex ncurses)
+		-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}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-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+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
+		-DTerminfo_LIBRARIES=-lncurses
+		# 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/sys-devel/llvm/llvm-19.1.0_rc2.ebuild b/sys-devel/llvm/llvm-19.1.0_rc2.ebuild
deleted file mode 100644
index bf837e6c1b30..000000000000
--- a/sys-devel/llvm/llvm-19.1.0_rc2.ebuild
+++ /dev/null
@@ -1,548 +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? (
-		<sys-libs/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}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/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-cgdata
-			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-ocaml)
-		-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/sys-devel/llvm/llvm-19.1.0_rc4.ebuild b/sys-devel/llvm/llvm-19.1.0_rc4.ebuild
new file mode 100644
index 000000000000..3861c87b9224
--- /dev/null
+++ b/sys-devel/llvm/llvm-19.1.0_rc4.ebuild
@@ -0,0 +1,547 @@
+# 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? (
+		<sys-libs/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}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/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-ocaml)
+		-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/sys-devel/llvm/llvm-20.0.0.9999.ebuild b/sys-devel/llvm/llvm-20.0.0.9999.ebuild
index 8401f1a55543..d01575f39051 100644
--- a/sys-devel/llvm/llvm-20.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-20.0.0.9999.ebuild
@@ -259,6 +259,7 @@ get_distribution_components() {
 			llvm-c-test
 			llvm-cat
 			llvm-cfi-verify
+			llvm-cgdata
 			llvm-config
 			llvm-cov
 			llvm-ctxprof-util
diff --git a/sys-devel/llvm/llvm-20.0.0_pre20240808.ebuild b/sys-devel/llvm/llvm-20.0.0_pre20240808.ebuild
deleted file mode 100644
index 8401f1a55543..000000000000
--- a/sys-devel/llvm/llvm-20.0.0_pre20240808.ebuild
+++ /dev/null
@@ -1,553 +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? (
-		<sys-libs/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}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/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)
-						;;
-					# 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
-
-		# 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-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-ocaml)
-		-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/sys-devel/llvm/llvm-20.0.0_pre20240815.ebuild b/sys-devel/llvm/llvm-20.0.0_pre20240815.ebuild
deleted file mode 100644
index 8401f1a55543..000000000000
--- a/sys-devel/llvm/llvm-20.0.0_pre20240815.ebuild
+++ /dev/null
@@ -1,553 +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? (
-		<sys-libs/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}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/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)
-						;;
-					# 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
-
-		# 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-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-ocaml)
-		-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/sys-devel/llvm/llvm-20.0.0_pre20240830.ebuild b/sys-devel/llvm/llvm-20.0.0_pre20240830.ebuild
new file mode 100644
index 000000000000..d01575f39051
--- /dev/null
+++ b/sys-devel/llvm/llvm-20.0.0_pre20240830.ebuild
@@ -0,0 +1,554 @@
+# 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? (
+		<sys-libs/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}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/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)
+						;;
+					# 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
+
+		# 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-ocaml)
+		-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/sys-devel/llvm/llvm-20.0.0_pre20240910.ebuild b/sys-devel/llvm/llvm-20.0.0_pre20240910.ebuild
new file mode 100644
index 000000000000..d01575f39051
--- /dev/null
+++ b/sys-devel/llvm/llvm-20.0.0_pre20240910.ebuild
@@ -0,0 +1,554 @@
+# 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? (
+		<sys-libs/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}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/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)
+						;;
+					# 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
+
+		# 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-ocaml)
+		-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/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 998c10749466..7ed9976e301e 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,6 +1,3 @@
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a SHA512 f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
-DIST mold-2.30.0.tar.gz 9957539 BLAKE2B f45924598029dabfb2c02298e1f89aae848cd64e2e87dd80f500de323517db92e62df798feee8a2cd81cb930eff0640c2b9957808a4080f0027884015994ce64 SHA512 7cfba4f0fb332799ad267d3eafb8e2f0057af4484467b3e3fbaf8044220163a2c7e26cd1786510f250844c8b57e30c15167c8dd9688af1773abc580c5605abf3
-DIST mold-2.31.0.tar.gz 10031469 BLAKE2B 338f516efcb430c8393fb0d6861b913fa1dd0095226e3d13018255da4f0b4affa168928b1e5cfbd0b5a4efcf840612675f04579f0c1d3c0e2b3c6815d6bef4c0 SHA512 343c62d8c67b74988f762c46999d2d866b2e9a0c69d2b910b12384ea5abc620b30468cd1b1bacfe41474d1c97c8ce2e49d55ca70479691238fb73d83d9adc683
-DIST mold-2.32.0.tar.gz 10005686 BLAKE2B a277a29498f4d6b33da49ba038ce5ef1c4a1bd3ac84ea994a2aae5d36139a2ee773e08e1a3ff0a7382da4d2319ce994575e3ed1e5be8e5f7a161045aaf4e2d58 SHA512 66cd95ec65b31749ead7604f921eebd9f8e7faad82f6aa2cd7a179e4f4cb2bd78584ec5a8de000fbd4c37bbbfeb878e40a4e93ca909d1be557d73117e4b38f4b
 DIST mold-2.32.1.tar.gz 10010384 BLAKE2B b020d57df25d91fac9b6ef994e9f7f73b6736d18a73be3caebe03a851a1db1986abe395b5481a1e30e01f38362c3705cb5903251b7201c0003c745dee37a5148 SHA512 d38b12faf81ba8015fc0cdb52944ac94366877c3033871a92610087e036d75b3d072baf9bbf107a9029495521e067fb36c0809b5138f90976492547b39c33085
 DIST mold-2.33.0.tar.gz 10061838 BLAKE2B 65c460035f3bdbc101120a27e30b70982d549a4222cf4beb1b7228c0c961afd3eb8928cacde5be20734a80a80765eb60e6d961bd5cb001ecaef1aba1152730b9 SHA512 67c41ae33f8a229f32aabf32ffb8bcb261eff047dedd189b8751e5de43ef12a2dbd05f45632c8baeac2ceff99c40256256d7d5c790cc12e4fecf1dc3cfebeb11
diff --git a/sys-devel/mold/files/mold-2.30.0-gcc14.patch b/sys-devel/mold/files/mold-2.30.0-gcc14.patch
deleted file mode 100644
index 74e7f5081eeb..000000000000
--- a/sys-devel/mold/files/mold-2.30.0-gcc14.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://github.com/rui314/mold/issues/1244
-https://github.com/rui314/mold/commit/002d619b11f38438514f4714f9eb89e8015ba1b6
-https://github.com/rui314/mold/commit/14952546a489c23236f50adc5ef9c8ada4f4e31a
-
-From 002d619b11f38438514f4714f9eb89e8015ba1b6 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu@cs.stanford.edu>
-Date: Thu, 25 Apr 2024 16:58:09 +0900
-Subject: [PATCH] Attempt to fix a test failure
-
-I believe some version of objcopy corrupts an object file when
-renaming a section. In this change, I use sed instead of objcopy
-as a workaround.
-
-Fixes https://github.com/rui314/mold/issues/1244
----
- test/elf/exception-multiple-ehframe.sh | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/test/elf/exception-multiple-ehframe.sh b/test/elf/exception-multiple-ehframe.sh
-index ca1d1a1c0..a9b360b09 100755
---- a/test/elf/exception-multiple-ehframe.sh
-+++ b/test/elf/exception-multiple-ehframe.sh
-@@ -28,9 +28,9 @@ int bar() {
- }
- EOF
- 
--$OBJCOPY --rename-section .eh_frame=.eh_frame2 $t/a.o
-+sed -i 's/\.eh_frame/.EH_FRAME/g' $t/a.o
- ./mold -r -o $t/c.o $t/a.o $t/b.o
--$OBJCOPY --rename-section .eh_frame2=.eh_frame $t/c.o
-+sed -i 's/\.EH_FRAME/.eh_frame/g' $t/c.o
- 
- cat <<EOF | $CXX -o $t/d.o -c -xc++ -
- #include <stdio.h>
-@@ -44,5 +44,4 @@ int main() {
- EOF
- 
- $CXX -B. -o $t/exe1 $t/d.o $t/c.o
--$QEMU $t/exe1
- $QEMU $t/exe1 | grep -q '^1 3$'
-
-From 14952546a489c23236f50adc5ef9c8ada4f4e31a Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu@cs.stanford.edu>
-Date: Sun, 28 Apr 2024 13:04:43 +0900
-Subject: [PATCH] Do not edit binary files with sed
-
-Fixes https://github.com/rui314/mold/issues/1244
----
- test/elf/exception-multiple-ehframe.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test/elf/exception-multiple-ehframe.sh b/test/elf/exception-multiple-ehframe.sh
-index a9b360b09..8cc31624a 100755
---- a/test/elf/exception-multiple-ehframe.sh
-+++ b/test/elf/exception-multiple-ehframe.sh
-@@ -3,6 +3,8 @@
- 
- nm mold | grep -q '__tsan_init' && skip
- 
-+which perl > /dev/null || skip
-+
- [ $MACHINE = m68k ] && skip
- [ $MACHINE = sh4 ] && skip
- 
-@@ -28,9 +30,9 @@ int bar() {
- }
- EOF
- 
--sed -i 's/\.eh_frame/.EH_FRAME/g' $t/a.o
-+perl -i -0777 -pe 's/\.eh_frame/.EH_FRAME/g' $t/a.o
- ./mold -r -o $t/c.o $t/a.o $t/b.o
--sed -i 's/\.EH_FRAME/.eh_frame/g' $t/c.o
-+perl -i -0777 -pe 's/\.EH_FRAME/.eh_frame/g' $t/c.o
- 
- cat <<EOF | $CXX -o $t/d.o -c -xc++ -
- #include <stdio.h>
diff --git a/sys-devel/mold/files/mold-2.30.0-which-hunt.patch b/sys-devel/mold/files/mold-2.30.0-which-hunt.patch
deleted file mode 100644
index d8558091c4bc..000000000000
--- a/sys-devel/mold/files/mold-2.30.0-which-hunt.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/rui314/mold/pull/1246
-
-From ec0a9d09ddff8b1796ff1822d5381442cd28acb1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 30 Apr 2024 07:54:40 +0100
-Subject: [PATCH] test: use `command -v`, not non-portable `which`
-
-`which` isn't in POSIX and several Linux distributions are trying to
-remove it from their base system, see e.g. https://lwn.net/Articles/874049/.
-
-Just use `command -v` which is POSIX.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- test/elf/exception-multiple-ehframe.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/elf/exception-multiple-ehframe.sh b/test/elf/exception-multiple-ehframe.sh
-index 8cc31624a..1b9f434a4 100755
---- a/test/elf/exception-multiple-ehframe.sh
-+++ b/test/elf/exception-multiple-ehframe.sh
-@@ -3,7 +3,7 @@
- 
- nm mold | grep -q '__tsan_init' && skip
- 
--which perl > /dev/null || skip
-+command -v perl > /dev/null || skip
- 
- [ $MACHINE = m68k ] && skip
- [ $MACHINE = sh4 ] && skip
-
diff --git a/sys-devel/mold/mold-2.30.0.ebuild b/sys-devel/mold/mold-2.30.0.ebuild
deleted file mode 100644
index 05ff0820df78..000000000000
--- a/sys-devel/mold/mold-2.30.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
-fi
-
-# mold (MIT)
-#  - xxhash (BSD-2)
-LICENSE="MIT BSD-2"
-SLOT="0"
-
-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}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc14.patch
-	"${FILESDIR}"/${PN}-2.30.0-which-hunt.patch
-)
-
-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/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
-
-	# Heavy tests, need qemu
-	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
-	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
-
-	# Sandbox sadness
-	rm test/elf/run.sh || die
-	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
-		test/elf/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/elf/{,ifunc-}static-pie.sh || die
-	fi
-}
-
-src_configure() {
-	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_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
-}
-
-src_test() {
-	export TEST_CC="$(tc-getCC)" \
-		   TEST_GCC="$(tc-getCC)" \
-		   TEST_CXX="$(tc-getCXX)" \
-		   TEST_GXX="$(tc-getCXX)"
-	cmake_src_test
-}
diff --git a/sys-devel/mold/mold-2.31.0.ebuild b/sys-devel/mold/mold-2.31.0.ebuild
deleted file mode 100644
index 7b109302a083..000000000000
--- a/sys-devel/mold/mold-2.31.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
-fi
-
-# mold (MIT)
-#  - xxhash (BSD-2)
-LICENSE="MIT BSD-2"
-SLOT="0"
-
-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/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
-
-	# Heavy tests, need qemu
-	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
-	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
-
-	# Sandbox sadness
-	rm test/elf/run.sh || die
-	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
-		test/elf/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/elf/{,ifunc-}static-pie.sh || die
-	fi
-}
-
-src_configure() {
-	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_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
-}
-
-src_test() {
-	export TEST_CC="$(tc-getCC)" \
-		   TEST_GCC="$(tc-getCC)" \
-		   TEST_CXX="$(tc-getCXX)" \
-		   TEST_GXX="$(tc-getCXX)"
-	cmake_src_test
-}
diff --git a/sys-devel/mold/mold-2.32.0.ebuild b/sys-devel/mold/mold-2.32.0.ebuild
deleted file mode 100644
index 638c34d50c92..000000000000
--- a/sys-devel/mold/mold-2.32.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
-fi
-
-# mold (MIT)
-#  - xxhash (BSD-2)
-#  - siphash ( MIT CC0-1.0 )
-LICENSE="MIT BSD-2 CC0-1.0"
-SLOT="0"
-
-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/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
-
-	# Heavy tests, need qemu
-	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
-	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
-
-	# Sandbox sadness
-	rm test/elf/run.sh || die
-	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
-		test/elf/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/elf/{,ifunc-}static-pie.sh || die
-	fi
-}
-
-src_configure() {
-	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_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
-}
-
-src_test() {
-	export TEST_CC="$(tc-getCC)" \
-		   TEST_GCC="$(tc-getCC)" \
-		   TEST_CXX="$(tc-getCXX)" \
-		   TEST_GXX="$(tc-getCXX)"
-	cmake_src_test
-}
diff --git a/sys-devel/mold/mold-2.32.1.ebuild b/sys-devel/mold/mold-2.32.1.ebuild
index 5c267ea9c1cb..8a4c59535484 100644
--- a/sys-devel/mold/mold-2.32.1.ebuild
+++ b/sys-devel/mold/mold-2.32.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)
diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild
index e1dfc88fa933..0456b44dd8c6 100644
--- a/sys-devel/patch/patch-2.7.6-r5.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,19 +8,27 @@ 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 )"
+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 ~ia64 ~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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="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 )"
+BDEPEND="
+	test? ( sys-apps/ed )
+	verify-sig? ( sec-keys/openpgp-keys-patch )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-test-suite.patch
@@ -37,6 +45,19 @@ PATCHES=(
 	"${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
 
@@ -50,6 +71,10 @@ src_configure() {
 		econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	emake check gl_public_submodule_commit=
+}
+
 src_install() {
 	default
 
diff --git a/sys-devel/patch/patch-9999.ebuild b/sys-devel/patch/patch-9999.ebuild
new file mode 100644
index 000000000000..c8ff9cf8be70
--- /dev/null
+++ b/sys-devel/patch/patch-9999.ebuild
@@ -0,0 +1,69 @@
+# 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 ~ia64 ~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 )
+"
+
+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 074ef2af2450..a23979fca5bc 100644
--- a/sys-devel/rust-std/Manifest
+++ b/sys-devel/rust-std/Manifest
@@ -1,11 +1,6 @@
-DIST rustc-1.68.2-src.tar.xz 147835648 BLAKE2B 4b6deab818d915afe67a96f4d32a758c15a832041a77d9da5d065a903ea2718e0e7ebbc0cd1baaa436b655bdb93a62e0fb76f9e37aed595c064e0857201bb091 SHA512 8b085d0351e19100e9abc24b10c44a0939a1d35ba23421da4ece345d7373f7dbad1dc6a2ae153c1259404dd96b41e2682e711cf2b0b63fd03a196760cddbcdd3
 DIST rustc-1.71.1-src.tar.xz 151983068 BLAKE2B 3dfdbc246feb84a79ae94c2de978c5585ee06cf6b683d2245869b62e28f7c79f89cc589f5431537713bf088236a0b824acefc1b68e418e9eb72e1eea98054e3f SHA512 fd0e5a16bdbeb539184513583089e55f681cb772810df357b6b1464853f7022ac02edab3dd155b2262ed0047e2a25dea3808dd078dcdfce9d399384465009db4
-DIST rustc-1.72.0-src.tar.xz 151630408 BLAKE2B 7b26e5a9335f9262567b2a6aaf3b8ad6dc813688f532c54502c12c7b59d02082a082fe49ae370b0748fb13f8245dad13a58927d8563ba96fdf3639d4a128f236 SHA512 aed27c1babfec7f9b0815bc395302cff4f8e8ed83d8d3bde202f6c86fba4aec14ad2d3e99f4e22618c6727d876262511bfbcd83513731ea4b9c664462c97945b
-DIST rustc-1.73.0-src.tar.xz 154319536 BLAKE2B 077bdedb36fdbc30db3c6331ac6014615eb79393ad42e38488d037ba38eaa6542467d39b2a14228d0bf6717110f915bf6fdcf0074c6293f413720cc748316eff SHA512 75c59680a82cb9d076b9434744a1c65908524ef769293952f5d9c5779d9a9c6fa4d9aa0c7e7d6b7566a21a50a27cd6ae452b5283a4d4606b2fa1acc24dfd8e0c
 DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3 SHA512 14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
 DIST rustc-1.75.0-src.tar.xz 159624388 BLAKE2B 8937b80585eddaa3e1f1ef948899d14a170308518c6fef9fe569560cdd870053776956743f796055f2119399b9ca6c0df12fedd789ae46324d071e5126c4e495 SHA512 7b0f25d91b1b5c317980fc88e059200bd43b56a70b445fbc72fb9b96e09775bfd3a98e9bd9d662af80f0ce3aef527c777ee82777e96ca876f47a972d63da8606
-DIST rustc-1.76.0-src.tar.xz 162267908 BLAKE2B 0cf726841a837d9906d82a6216e65edad1e3e4a798ccd1ca3824c2098d0c45473854b8bf183c6e9ca70ba095752e77c4f5ef575d98c07243d609857214175f5e SHA512 92e16cfdeb91bde341fe6c2774d92868275b07aa1d46d870ddc9291eadfe4ea9af93e06586fa7d6b8d60534903945cbbe706d354c90272712989c58d2bf174bf
 DIST rustc-1.77.1-src.tar.xz 162796048 BLAKE2B 18a9fd095808ba78bf50ec94f7fd4087a1033ec79750aa593bacf64219c77ef90c030d41a7d8bc43f7ec8eb30b316c225024be4aeb517100ff6723487f8bb282 SHA512 e057ae638e4c3e54fdb367d48f4b85458121cee0d0ee1ed72f346940b8acad2f16cd9cc8abc16fcf4a17bf244b3300bb56a7e7be3bd0c23b034692c983b84fe8
-DIST rustc-1.78.0-src.tar.xz 159181212 BLAKE2B dedae58e413689de258f852c988a9a91d4cf14c9525f2619ca6155006ddc9b2262c8141ff995e4fc6ecceec383470e50d2fa0952d933db9b3957ce5c5b96f62e SHA512 d2fb9881e28849d871fda71b1b51652be3839b3283f0d32163f258c5c707a9fb7b589da8dc03bca2fefee1abdd2b44a5f17e85d8c6df7bea119d1e8d22371941
 DIST rustc-1.79.0-src.tar.xz 162359512 BLAKE2B 753c0e9c537644d1a12b4d38024c22952a19513791c3da6f955690c544e58964bacbdb579f94cd05910697fc31f77ed6553e5ad3b111bbdfebeea8d2a4fa19f5 SHA512 99d7f276292e5c270648473ff73e9888413a3325ef3a4d7a45f8ce77a42ac87996905f1d875888ce084b621f642017bc9e31a00da1439108dbe19b85d0eab085
 DIST rustc-1.80.1-src.tar.xz 199234944 BLAKE2B 39891362f2a4bc249f5d943e3ded48d2add9cd9c0ee3c085d7fbefbfbc784f1e029308d9486cd35a6c03b77243077dc1196c75980faeea0d4319cee057509b6a SHA512 3c746108a86eeb734c1a8c8f63ba1a45e2cb03a8cb553395a167d07dc3ce5d8d9ea365ddd95533b6952d915069b86cad7ad218d27861e0889f8e878136bd32ab
diff --git a/sys-devel/rust-std/rust-std-1.68.2.ebuild b/sys-devel/rust-std/rust-std-1.68.2.ebuild
deleted file mode 100644
index dec75d768962..000000000000
--- a/sys-devel/rust-std/rust-std-1.68.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-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}"/clang-3.5:*
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-# need full compiler to run tests
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
-
-S="${WORKDIR}/${P/-std/c}-src"
-
-#
-# 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-devel/rust-std/rust-std-1.72.0.ebuild b/sys-devel/rust-std/rust-std-1.72.0.ebuild
deleted file mode 100644
index dec75d768962..000000000000
--- a/sys-devel/rust-std/rust-std-1.72.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-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}"/clang-3.5:*
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-# need full compiler to run tests
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
-
-S="${WORKDIR}/${P/-std/c}-src"
-
-#
-# 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-devel/rust-std/rust-std-1.73.0.ebuild b/sys-devel/rust-std/rust-std-1.73.0.ebuild
deleted file mode 100644
index 1432096c3a0d..000000000000
--- a/sys-devel/rust-std/rust-std-1.73.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-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"
-
-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}"/clang-3.5:*
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-# need full compiler to run tests
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
-
-S="${WORKDIR}/${P/-std/c}-src"
-
-#
-# 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-devel/rust-std/rust-std-1.76.0.ebuild b/sys-devel/rust-std/rust-std-1.76.0.ebuild
deleted file mode 100644
index c63efccf3b0c..000000000000
--- a/sys-devel/rust-std/rust-std-1.76.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-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"
-
-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}"/clang-3.5:*
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-# need full compiler to run tests
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/1.75.0-handle-vendored-sources.patch  # remove for >=1.77.0
-)
-
-S="${WORKDIR}/${P/-std/c}-src"
-
-#
-# 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-devel/rust-std/rust-std-1.78.0.ebuild b/sys-devel/rust-std/rust-std-1.78.0.ebuild
deleted file mode 100644
index 7037dfd72e6f..000000000000
--- a/sys-devel/rust-std/rust-std-1.78.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-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"
-
-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}"/clang-3.5:*
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-# need full compiler to run tests
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
-
-S="${WORKDIR}/${P/-std/c}-src"
-
-#
-# 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-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 626054c8dec9..b0ac6af5bce0 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,9 +1,7 @@
-DIST intel-microcode-collection-20240312.tar.xz 13484040 BLAKE2B 947f78698211b372472629e7fdf076021db97f156d812ec2a84c5ab3d5ee374e04191f7881c956c261c6a6a5935b2c779b837879677ee98d44cf8c753a4393b8 SHA512 de577f232035a92ce563475edb4572c6fa40a0a2ee8e76b858de1ca42f905d366d107bf02e4968127ad6fe150baf37e11ed93191e40c1c5913ba34fe77184c00
 DIST intel-microcode-collection-20240514.tar.xz 13421016 BLAKE2B 83b7d213709bf8c1ea1b62456974cf6a2087470d9e2456ef3de93569007cfa8c94021a21a9f3f7b638ffe4b2ad0f516deda04a1c630e54f35709e92a113a7683 SHA512 4cc364b19355f133dae0178f7d10b50abcc0e6e7919e646cfc756c8ff8dc1d6d0819abae6f5cb7f659f0466ee31196625cf022bb994f500ab08e93238a66d104
 DIST intel-microcode-collection-20240526.tar.xz 14673584 BLAKE2B 262f667ac46e190994e86f547c98ac776c73b1576c208fa32df96a2dd60af6cda9bd0b0367ca68bb6b85fd19f75913e73069d0064eb2b4c560068c3da50618c8 SHA512 4227c68ba60aea940b851f10d1006ee42b45d55425eb143210adeb363468238329d4a2720d117f5bdaeb9857ae29a6952a3df22769f4436638a9080ded6793ba
 DIST intel-microcode-collection-20240815.tar.xz 15458512 BLAKE2B 17b3719961a30d18aecb7b5094de5250e36a6eaa2f880a020ca38762d8a037b7e25f322cc1cbb3000a520007beb0d47d6b4f4940c47fac2082c9c2a3fa3be5d4 SHA512 6faddcac20184424bbe0488dce8df31479b89da9affb5c2f2d93f2bccc045d41105d5a10e3c56ba48cf27853a089334adac6e42a27c5fb63e86f0ed7c51bbc42
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
-DIST microcode-20240312.tar.gz 12825665 BLAKE2B 43c771becef0f6dbfd41bf78a9a3cc8f6679a43ea48765d0e7f555c138dca6e3db42a4d33f743d8d51f38b0b6aa69322bba0c00ae9f1ff4c533b52166ee54747 SHA512 f5f3dfb1706675060b00057b5f017c2cb4ac0df74727139185fd167ca67fc6c611e205b1caeded23b006e4d8d314f87537007e7bafba2c87373f6d960988c911
 DIST microcode-20240514.tar.gz 12870457 BLAKE2B 2a3a357ecf8d9f17fd20cd651386e5687fbbca8a3a323caf846e7c84d440241c3c99cadd00016642c8d11f297c1d2ab63c54ea062644839b74f84d66b04c703e SHA512 1c0f1707bf7db70d04e94a0728c0f61a1f9c25fead8c2c3716cafd20c976973cf636e411d12f81b34bf0076d7c7601c11b1bcd92a2e1be35d98003bb61ace569
 DIST microcode-20240531.tar.gz 12870497 BLAKE2B 6a2c5ee6b6f3543b28f3753b30812e360bad50776b4f81e32a832e2169f38c11f8d5108ce0a81ddcdf1ecf7557baf1fd62c053a365f39a33ded5fd5018580b1f SHA512 fb9d772491f279ebb691248e4a665da45c986ca7b4668ecf311c5fcb91a42400f7a5b35e8bfc31ceb1c9d598e753c817359900e3fa316d825f8ecec21ec63cfe
 DIST microcode-20240813.tar.gz 12879301 BLAKE2B f6a157de1f2c14e0e4d08ec71304451a52c7a0ffcfc79a1ebce7e8c16c7405587369c9cad994b8bdb0a987d4fe2769b2988948ffd9fe1e7f117eb624cf579b63 SHA512 ba1fa7d9bed7d90756ea959f5878afca0deacc9b1e932a936a15d74a411b7efb6103a4af75dc3731d9cbb2e464439ce9a7d448f75bc6f38b616907ff6dec6ee3
diff --git a/sys-firmware/intel-microcode/intel-microcode-20240312_p20240312.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240312_p20240312.ebuild
deleted file mode 100644
index 5e2d305fc9ed..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20240312_p20240312.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dist-kernel-utils linux-info mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-#
-#
-# Package Maintenance instructions:
-# 1. The ebuild is in the form of intel-microcode-<INTEL_SNAPSHOT>_p<COLLECTION_SNAPSHOT>.ebuild
-# 2. The INTEL_SNAPSHOT upstream is located at: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files
-# 3. The COLLECTION_SNAPSHOT is created manually using the following steps:
-#   a. Clone the repository https://github.com/platomav/CPUMicrocodes
-#   b. Rename the Intel directory to intel-microcode-collection-<YYYYMMDD>
-#   c. From the CPUMicrocodes directory tar and xz compress the contents of intel-microcode-collection-<YYYYMMDD>:
-#      tar -cJf intel-microcode-collection-<YYYYMMDD>.tar.xz intel-microcode-collection-<YYYYMMDD>/
-#   d. This file can go in your devspace, add the URL to SRC_URI if it's not there
-#      https://dev.gentoo.org/~<dev nick>/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz
-#
-# PV:
-# * the first date is upstream
-# * the second date is snapshot (use last commit date in repo) from intel-microcode-collection
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files https://github.com/platomav/CPUMicrocodes http://inertiawar.com/microcode/"
-SRC_URI="
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin
-	https://dev.gentoo.org/~mpagano/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz
-"
-S="${WORKDIR}"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="dist-kernel hostonly +initramfs +split-ucode vanilla"
-REQUIRED_USE="!dist-kernel? ( || ( initramfs split-ucode ) )"
-RESTRICT="binchecks strip"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="
-	dist-kernel? ( virtual/dist-kernel )
-	hostonly? ( sys-apps/iucode_tool )
-"
-IDEPEND="
-	dist-kernel? (
-		initramfs? ( sys-kernel/installkernel )
-	)
-"
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	if use initramfs; then
-		if [[ -z ${ROOT} ]] && 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
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-
-	# https://gitlab.com/iucode-tool/iucode-tool/-/issues/4
-	rm "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT}/cpu106C0_plat01_ver00000007_2007-08-24_PRD_923CDFA3.bin || die
-
-	# Remove non-microcode file from list
-	rm -f "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT}/LICENSE || die
-	rm -f "${S}"/intel-ucode*/LICENSE || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# Instruct Dracut on whether or not we want the microcode in initramfs
-	# Use here 15 instead of 10, intel-microcode overwrites linux-firmware
-	(
-		insinto /usr/lib/dracut/dracut.conf.d
-		newins - 15-${PN}.conf <<<"early_microcode=$(usex initramfs)"
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	if ! use dist-kernel && use initramfs; then
-		dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-	fi
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote.md
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		if ! use dist-kernel && use initramfs; then
-			opts+=( --write-earlyfw=${_initramfs_file} )
-		fi
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-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
-}
-
-pkg_postinst() {
-	if use initramfs; then
-		if [[ -z ${ROOT} ]] && 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
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild
index 947e22ff9bc2..3af9d1741d1e 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}"
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="dist-kernel hostonly +initramfs +split-ucode vanilla"
 REQUIRED_USE="
 	|| ( initramfs split-ucode )
diff --git a/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
index 947e22ff9bc2..3af9d1741d1e 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240813_p20240815.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}"
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="dist-kernel hostonly +initramfs +split-ucode vanilla"
 REQUIRED_USE="
 	|| ( initramfs split-ucode )
diff --git a/sys-firmware/seabios-bin/Manifest b/sys-firmware/seabios-bin/Manifest
index 348aa7cc234f..7f0af17450b6 100644
--- a/sys-firmware/seabios-bin/Manifest
+++ b/sys-firmware/seabios-bin/Manifest
@@ -1 +1,2 @@
 DIST seabios-1.16.0-1.xpak 141506 BLAKE2B b2d0cc367ea7ba958604f95dc2a7ab92fd76768e6133552b76d651755cab225eed3e1a6bd350b7f3b5058212390c073e9ca37896412797ac224fb1ce4b5f641a SHA512 4007a6cd40b7c82d1f53450a4151a19d5020ca4c3258b4502f9bfb1c3eacfef1a934794b58d38439e41884cd7a962aa436e22b9194b5731585383fd1476dd688
+DIST seabios-1.16.3-1.xpak 143051 BLAKE2B 0cc2d6e3506475d60134be83a886eee87c4ab7c7b4dc3d285850f8e51c44d00658712d1fbecf7b3776ed7549cb6feace901a32349206962ef94001a211533e29 SHA512 596f060371903d4365b02accd128257d0223bf37368f58565b94c32d5f1da3469b3b33ac0193397071d27d2889a8c3a36668d03fcdd56bea23dd249956cc288e
diff --git a/sys-firmware/seabios-bin/seabios-bin-1.16.3.ebuild b/sys-firmware/seabios-bin/seabios-bin-1.16.3.ebuild
new file mode 100644
index 000000000000..f1b52feb3bd5
--- /dev/null
+++ b/sys-firmware/seabios-bin/seabios-bin-1.16.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BINPKG="${P/-bin/}-1"
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${BINPKG}.xpak"
+S="${WORKDIR}"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="!sys-firmware/seabios"
+
+src_unpack() {
+	tar -xf - < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.xpak") || die "unpacking binpkg failed"
+}
+
+src_install() {
+	mv usr "${ED}" || die
+}
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 8eda39382f89..debc5efd5e00 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -1,3 +1,4 @@
 DIST seabios-1.14.0-r2-bin.tar.xz 132256 BLAKE2B 7d38949de254d6e3699d463a66c363156aa36bfe16c18bea48c55a61bdc423184175fd5427d3246a78d9c6335e61e5baa982f67e7406c5525e405b4383530d41 SHA512 5ce0e407b97e878842fbd7ad2f9e8a65f2565a5aa43d08e01cff024352780f55f8669958c58d20770db7f90e87cc52c860af831cefe3846227e7b45cd9dc33ee
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
+DIST seabios-1.16.3.tar.gz 637076 BLAKE2B 8b7c574bf8b0d3b02ea3127dabacda5ddc39c159f17a3a474b76ca79f3ec637ed5571f0d485712b5f9dc68d46db5b2b2c1e018ff63ae0206ca6354bccb714c6c SHA512 103aac0a7a890a681edb8950fee72d419899e20e8b06e2dd382987f98d3faf362789fca5aa4efabe27c4720e53ee19e0ae246d7aca2482b6661fa119efac648c
diff --git a/sys-firmware/seabios/seabios-1.16.3.ebuild b/sys-firmware/seabios/seabios-1.16.3.ebuild
new file mode 100644
index 000000000000..801ae4507533
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.16.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-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
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
+	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.seabios.org/downloads/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="debug +seavgabios"
+
+BDEPEND="
+	>=sys-power/iasl-20060912
+	${PYTHON_DEPS}"
+RDEPEND="!sys-firmware/seabios-bin"
+
+choose_target_chost() {
+	if [[ -n "${CC}" ]]; then
+		${CC} -dumpmachine
+		return
+	fi
+
+	if use amd64 || use x86; then
+		# Use the native compiler
+		echo "${CHOST}"
+		return
+	fi
+
+	local i
+	for i in x86_64 i686 i586 i486 i386 ; do
+		i=${i}-pc-linux-gnu
+		type -P ${i}-gcc > /dev/null && echo ${i} && return
+	done
+}
+
+pkg_pretend() {
+	ewarn "You have decided to compile your own SeaBIOS. This may cause subtle"
+	ewarn "failures at runtime. Please try sys-firmware/seabios-bin before"
+	ewarn "requesting support from Gentoo or upstream."
+
+	if [[ -z "$(choose_target_chost)" ]]; then
+		elog
+		eerror "Before you can compile ${PN}, you need to install a x86 cross-compiler"
+		eerror "Run the following commands:"
+		eerror "  emerge crossdev"
+		eerror "  crossdev --stable -t x86_64-pc-linux-gnu"
+		die "cross-compiler is needed"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Ensure precompiled iasl files are never used
+	find "${WORKDIR}" -name '*.hex' -delete || die
+}
+
+src_configure() {
+	tc-ld-force-bfd #438058
+
+	if use debug ; then
+		echo "CONFIG_DEBUG_LEVEL=8" >.config
+	fi
+	_emake config
+}
+
+_emake() {
+	LANG=C \
+	emake V=1 \
+		CPP="$(tc-getPROG CPP cpp)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		AS="$(tc-getAS)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		STRIP="$(tc-getSTRIP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
+		"$@"
+}
+
+src_compile() {
+	local TARGET_CHOST=$(choose_target_chost)
+
+	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
+	_emake oldnoconfig
+	CHOST="${TARGET_CHOST}" _emake iasl
+	CHOST="${TARGET_CHOST}" _emake out/bios.bin
+	mv out/bios.bin ../bios-256k.bin || die
+
+	if use seavgabios ; then
+		local config t targets=(
+			cirrus
+			isavga
+			qxl
+			stdvga
+			virtio
+			vmware
+		)
+		for t in "${targets[@]}" ; do
+			_emake clean distclean
+			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
+			_emake oldnoconfig
+			CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
+			cp out/vgabios.bin ../vgabios-${t}.bin || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/seabios
+	doins ../bios-256k.bin
+
+	if use seavgabios ; then
+		insinto /usr/share/seavgabios
+		doins ../vgabios*.bin
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r2.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r2.ebuild
index d6b183e8f11e..4f9e5da84cf4 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r2.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="8"
 SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3 autotools
 else
 	SRC_URI="
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
index d6b183e8f11e..4f9e5da84cf4 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="8"
 SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"
 	inherit git-r3 autotools
 else
 	SRC_URI="
diff --git a/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild
new file mode 100644
index 000000000000..834ce078e693
--- /dev/null
+++ b/sys-fs/bashmount/bashmount-4.3.2-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Bash script that uses udisks to mount removable devices without GUI"
+HOMEPAGE="https://github.com/jamielinux/bashmount"
+SRC_URI="https://github.com/jamielinux/bashmount/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# sys-apps/util-linux -> lsblk
+RDEPEND="
+	app-shells/bash:*
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-fs/udisks:2
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+	doman ${PN}.1
+	dodoc NEWS
+}
diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index c3d340869b19..964ad24a8194 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -1,139 +1,80 @@
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
-DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8
 DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163
-DIST anstyle-1.0.2.crate 13983 BLAKE2B 4274b101d1cab2b62f9bb7637dab35f4b16e8c08a080355a2ea53e2b7b353ff230aa77fb3a244e0d6ff0dcd27abe5895eb306c630aa0822d0c608f041d4abfea SHA512 09220abfc844192ca698589897845752e02666b4ecd6529af4cde9f260ef36694e6e631c7503fc0e438ac72c88c419043b78399385cb248e789e86404503935a
 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
-DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176
 DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
-DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
 DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
-DIST anstyle-wincon-1.0.2.crate 11712 BLAKE2B 68215a76e44cbe0e69c4111eaf7cd818d0e743883aec01f99f6d96e863d8d36bea67ed112db715a3a0daa348535f3db50547d8a0ab5e4572975d68937c49aa86 SHA512 8bda8b79785d201cda90c8d3544f5cead955c25749a4b828bc897e4bb132acbbcc50ac90ee07323ae3077af3e4c613264871366d70e5211200d119f4ddb63b0b
 DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
-DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40
 DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST bcachefs-tools-1.4.0.tar.gz 1060158 BLAKE2B c972de13e305b07910ab4acdfea05df85bfe70ed350dea5fb578a150a9e116f054dc99bf6dd185aa26dab799832939276a6248203717b918c1d7e0e9f2e0fdd9 SHA512 f374c3b2ec1836ea79ed37f188aaf9c98d6d217b2b05c050304467068a1e042e2e5ea99f2e67d546cd68f3e39be065e62bae73ff13e92ceb29a15df9fe63e4e2
-DIST bcachefs-tools-1.4.1.tar.gz 1069244 BLAKE2B 7be0a343758a221a39dad5eca1c11c74d049e208712d30ffdfd919c97ef87e561983b85b2fbefa932cb69ef50418dce761a9c01afe0114f67b8ddd55b5d62a2c SHA512 65d0f182982d942d1263d60cf435a1142393b9dcf1e7dbea53a873925a82954b47422ade04bbc5b69c955de80ef820e9eeefcfed47aaab3bcc27d3916a94ff4a
-DIST bcachefs-tools-1.6.4.tar.gz 1083811 BLAKE2B 656b1545ccf41dd35e3e6f656a9b5280fe0b5fa43a0ea86243c6693033d986b091fdd3d79ab2ff5c1c9402bce6f4ee33f49e070f6aebd5bba355df7a82d8fc21 SHA512 3e73ee15673eac771393859132146f1c23f4250f68bf8753b5214e88e854959c56efabdaeff4a8ad883287bd289abe08c5c37f6ef7220b984fa679a90c578e57
+DIST bcachefs-tools-1.11.0.tar.gz 1131076 BLAKE2B 27b506c004528f3bedb2fddd19bc1d94acacd34152d13870df3be582baaa8843ac505b48b901c829c35789c5c4a09313ddee4a858d3e32d2130e1205f2042760 SHA512 87ca789f1557a026b53469571e5a84d1f6a64e3e3378cc344485d95fae8883eb512a8e3f478d89c6265dd203419412fdce9c396ea805f898b67b9cebec0e4f19
 DIST bcachefs-tools-1.7.0.tar.gz 1103425 BLAKE2B 952310999035465a4e8621e8e3ef65e5a3ba50d40a0ca76a3ca8b7265bab2f33c40981d2ca83ef3ecc70a5da9cff0d002d2f9676aa6355d1717a0dad968828af SHA512 5f7934997c0cd6b893c67a87e9cb5060cdd37857d6761356bdb1c96572b67ea3a2c03c43fcbd8beb01b0cf9c30da3297d082ef40bb312f5ca40c85faa46cdd3a
-DIST bcachefs-tools-1.9.1.tar.gz 1125178 BLAKE2B b54b86d681f0694fc39a13c6229a2d79dd8e1fe7dc269f3a8e6ba38b5d972b05aa7ba199114a3935ff95f3b51711e515f124ca247aa1a390f6e2bd771d55e5ee SHA512 93bc85bb7b15d08eadc60a2af1b9c8b0b561400bcd4567c088af8f426d11ccc4321482455e89a10cd544b421da3a953cca9008eb936128124f9bd2e6818c484e
 DIST bcachefs-tools-1.9.4.tar.gz 1132203 BLAKE2B 447881b52dcaa3990a4c233523bf8c2b3faf4755f3a0fad315ca17fa900e2192b9a2168f22a3ac8c59ad2756999f8a6792b732a527510361044b541fec6ce26b SHA512 8a6a2896620c4e1aa3abd26a2e59087d417b5d546ee6dc1130a59e06c8e8561e8de29edeb1d5dd3c5223be8338a8b4265ad3e753c830f475413ed83a0d968dd8
 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
 DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 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.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089
-DIST clang-sys-1.6.1.crate 41346 BLAKE2B b70104e6c6b3c1b85caa111c2b1fb2c20d30eeb85059bc616afc49bce9409f7ee2dd8b800750a466accad6a74ef29d10c6a2ee4459d854a2c0c54050ff51cc4b SHA512 a6c62c1d3faae3796f5e7d98ed4f1a8119f0ffaf8fceee8e728cd4da57b0140e82631012450bb0c551cd13814a97065e9e47015320707a87bdfbb6fd317e952c
 DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
-DIST clap-4.3.24.crate 55026 BLAKE2B c49987221905f7a39d6628fd755524b2395130f0b55f984067238fe73ee7e71faf2532e990198ece793ca8aa03043108b638a618c30ff8c0a3e10b68a3f8d0e7 SHA512 4c45cce4ade8058e6e7131ebc7754da5974e5965128ef5be1a6d327e0ac5f7151ab6a0494024d89404e1743efbb8891de76322d3e44abff76cf2123fcb4534f7
 DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9
-DIST clap_builder-4.3.24.crate 162489 BLAKE2B befbbc2f379d8b6bfe538cf86a0f27927a4f9ed73e7224df980241c2ad6acbf79a56cab74b3f337d09ce26a5b0c9e9f60226ecce58b6b2ae0dcbdd49a3df6ccc SHA512 e81d73bd3bef181c945856bd2402ec52a100d38ffc223bf485186c4618076d38c277dd85b21e2391471de463dbe3f2fcdf59e115576be8dbef330d888fdc05e9
 DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2
-DIST clap_complete-4.3.2.crate 34104 BLAKE2B 8ac5d031536f3917755642cb69cb80a70138871505f7f3b346c66163c6295b94c6981c9ec6291dcac4f6f675bcbcd507a9264c44dba42e6403090a32844a0a7a SHA512 8eecccc5ecb24983bad0c0f7118d632b466e6bad2f2efe1d6695bb53616fbc2ee382e1105252fe587d534a5120a985efe07922447e2168cb3d28e9c72704bc4e
 DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b
-DIST clap_derive-4.3.12.crate 29052 BLAKE2B 501fb22eddca5b21456bd9911ad1f90ee5d5c918eedd08e2615d22ce58bb0fa5dd626b51a734f20b78411b9a4492ae63629131e0c2e1bd0f3eee21e5da3fb37f SHA512 a58e948fddf45321f0fcfe9d9afbeff42849da472fc4e4b15c31f46ffe55a0dba34d2c1d14e342530c1e4080c43de790595e4f3dca06cbb6a8a60f9e3cab3abc
 DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167
-DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c4c38f7440d91cb4c58ec887940f0cf500c4c3949c2191399aac3f5cb1ce44868eac587cde90211d3e467b9a2 SHA512 0149ed7c2438a19b4857f895767550d783711078f07bfa9ac8ca531e06f51c7388110f4d558e30bf503536367cc370cb581e8deb6fe51f9b5460a334963daacd
 DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
 DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
-DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0
 DIST colored-2.1.0.crate 23348 BLAKE2B e2778d83b28571501adb4e9ec3fa95d684faf5730f093f6e608ec631e58b883d2b9f17ed7e2c1612da285a58251f479a365aa90fa7be24a2adbb69e426e0fc89 SHA512 fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e
 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
 DIST env_logger-0.10.2.crate 36402 BLAKE2B 34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb SHA512 c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
-DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e
 DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
-DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
-DIST gag-1.0.0.crate 5495 BLAKE2B eeb524092cb26486e10e939147f348d4cb687ded09fbb3623d6e65e623bcdee9be90a765a07d1af94f8d1e92139d61ef01104eb9a52b6c4e7abe65a694ee0186 SHA512 16f540d2075d1c9ede9ba5f579dd03271b38b940422f0cc605f7c72fc972ee0e696ea5e46b05c38b510ae247cca1a12e28c803bdfe835439d6d7f23e32609286
-DIST getset-0.1.2.crate 8831 BLAKE2B b1408f4c0b2ece039d06180e3e2990db2a4ca3c74575be3b4d3df562fc48a43ee8feda42cd957786aa481fc77a554a8e944f34a6a718c07012aea153a1c299c0 SHA512 54f162d0d072253abcf26c8779a9d8eb423db9df85716da13a785edb4c61757cf0c03f3563dde5de4534be9d4d50498c03b8337dcaafeaefc29c9c836dff1371
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
 DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1
-DIST io-lifetimes-1.0.11.crate 37346 BLAKE2B 7f278b7378a8569d3552c9b6d4be06d7908e05d77cdb964267f0b621ec4975a42fb6e48fc030a75ad5865681adf32ff747943ac559ab4ad73331a6611a1b10c6 SHA512 30c6e5ce6f5beabe0d7bee4f4522884d1316cf7d9b8d093ba0f952995997be3d0f10e1e77b9c20b7fe2b65429de0d2ec89bb35e939455795205206a3154ed544
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
-DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966
 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68
-DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 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.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385
 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab
 DIST libudev-sys-0.1.4.crate 6177 BLAKE2B c513b5cd68fc60a7a33ba281e4fc4f9a5896946aeb1fe31abb8af22d279c39c3d781fd34109f98fd010fe8aa817b9d91726887f0ee8bf0f66a3bf313b01c9ff3 SHA512 185bd84a729a5dda6fb274584c7a731652418da9435d844870a9d09662918c9230287f4ad002273599d0a3e9709a36ae06d59a6686dfba978fb7cd1c51bbc2c7
-DIST linux-raw-sys-0.3.8.crate 1013776 BLAKE2B 375b29d2cc700e95d94ea8dc304cb711562952742f65c9664e33560a3da862aba74f2ad2ee66b1dface8cd5371ea9cbbc452ea953a6b6c656ade7d938b7d2ff2 SHA512 cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375
-DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772
 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
-DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
 DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
-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 parse-display-0.1.2.crate 3535 BLAKE2B 01554ef911b973cc8e16be5dce205693e5cc74b8e886b4d9a9a26dc6c9a6cb2e29569ebecfb73daf14047f5d0ca01ae52ff9bb1778a0c7062ed3d1819bc47ad8 SHA512 271b32c088b23f945d33e1d4d8693dc37a4bab9aa1661f63a5a373d1cd55ab62e1a8d1fd0fb27c6d1d3b0fd639fd72540cbe2a641bd42a45bf06a751a07498a0
-DIST parse-display-derive-0.1.2.crate 10820 BLAKE2B a9261c11c7768791a69e11d6f074031dc229094a686a8e314229a5dd94e22f218beba6be67089129aaaaa98606715499c089e579058094a135208effe44c5884 SHA512 a9f3099f318e44330cd3478a4cc576beaa2ea70edc6621a46ecd452e9fc28874a7d7967fa0e0b2b7a1d7145565e62979692dcdf3c3fed0f3ac8feee0eebec000
+DIST owo-colors-4.0.0.crate 30984 BLAKE2B fa64a9097745eff2b00d8587ca119a3f4163c43265dcfe75162be09ffd556b132c24aa5217b99c3b10feddb365e71b01006a62a664ad8968d4bf6a716291148f SHA512 25a606e9e6a17a4ec21b9298707478d904ba1f30862ce855f4223b3273fb3d0323540b6b628c067edc0c9291cd7c370beb298ec000cd679068624031ac9e66ce
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
-DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
-DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a
 DIST pkg-config-0.3.29.crate 20563 BLAKE2B ed0559b0073890911fb47742743b2586123bf9e9b594aa0d5b2c419c6768cd37e25b546c21077ea6cc02823a679b302aeaaca6c7fcaf9aeec615dd08f53a1f6f SHA512 bac7dafc0e10bef40e427c1fc0271d1a26acb2f5b1cf7cc7a128f4d4f1f3110529e45057b71cea7b0f6ddff26945fe08962285ddeb22b54639e44a2e43af698f
 DIST prettyplease-0.2.16.crate 57630 BLAKE2B b3548f37a41d1bf46d58e84297142e8d3addf6134e39c07b7fca809cd2f72004947c31bcf7ee2aeef548bc200dfcb9c888e090d3a96f63289bc15aebe1085075 SHA512 f542640f809de6aa77d34d92d9a4454ef2a92153dba38ab41782d9a3fb73cbae2569c3163c21938b908e666303631ca9393ea1166c7ad5e5970145f26238c79e
-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.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
-DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
-DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
 DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
-DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8
 DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
-DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
-DIST rpassword-4.0.5.crate 10731 BLAKE2B b52325990109ad9b275429c3c2f098eeed631e3a41b02ff0decacf55d66e1b66df98d13c169b8eed727fbc523fa1cb770d206dfcbcc86a6c08f52029233296d5 SHA512 f1d3a76318687f9e5b218a936e43afc144f4a48647d55324409651cd5a39fc07b23732766433bd8a4d3a5370ceedf5bd2dad3007f0ba1d75bf8ac610e684c19d
 DIST rpassword-7.3.1.crate 8164 BLAKE2B 60e89fc36d78a64d9441bd902866500872f4ddbd28ffe4bc5c26b5882ec1dd9bcf50dc06105c87f5fef8c51b327bb9af1a324831cb6396796afab3cb7f4a2288 SHA512 28905b33e5fa26d9a7bc0d682b94edc6119b2d8c2a6826c89d61fa86033230707c54f3ed8047ee3f5da4393c119c70f102ff61efdc1d4bac38e583c04e3b4382
 DIST rtoolbox-0.0.2.crate 9179 BLAKE2B 4cc9faea86aaf0f9e9ed95269d0fa8c633d7c05d539a435bbfcadc563ad5fd0d3f06bc33f83a24432a53da483bc7771edca21e6237888254b1d000f7af1ee41c SHA512 2e239e821d0bdb171ff9d03d3b8df2fbb561ae67ed653f66096ca32b2a83badc7d1b74b4ed1f0f41f141ff2a383fd06618f4f7740a03514b256eca4db0699d42
-DIST rust-bindgen-bcachefs-f773267b090bf16b9e8375fcbdcd8ba5e88806a8.gl.tar.gz 2289197 BLAKE2B 9a767f7341617fe80a59ad3e4583ed14f112a9575f9596547d92b4ee88e1951b123cdd78208446d7876141028449abe9f4cf22d9abe47e96e59d8e72c9aadde0 SHA512 7d1db015f66b47ff07d244247832cc6ea3e9af4f4ae650bf4d3785ebf60390ff966b8664ebb463235f0ad3d40967cd58a299eb540fda733f26548d771275b25a
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
-DIST rustix-0.37.27.crate 324534 BLAKE2B 65fc8317c5aa86236b2099104b6841a7d35d4567977218f5e59a85d199aee7d6b9f0278083d93f575b31d77ef8685576b7cba06ce8da6e96a164af30c854ace3 SHA512 e1c648cf11379509b732b9e9ed88ebd36006d8e73755528a09aed4f46df08e23a705696c5e6ff7ea0e4382513edb487f9859a8f1673150d60d70c698216fec3e
-DIST rustix-0.38.25.crate 362735 BLAKE2B 8d368458850d031d63c76c75e716d8e580a763fa365aaf3f065de7f6f28fa314cd57c558286b0322438b9a8fe5475ebc709b02dc804862e02ebf02ad8fd2f30b SHA512 f14d3112f82e254ee01059a845062e305b5386b84e2de14fd89443606b37c5640322258cac91dda3be79b11cd72de60557515649ee266bfe7a796a284afe6a11
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
-DIST shlex-1.2.0.crate 6584 BLAKE2B ac07c648d9affe62512edab307fe07436dce69b428570ba6455aaf21c178145b1026e35704f920fc177b334cf190f57e393e4dd9e522dd26d133f80fb2c15f47 SHA512 cf48c0c47aac44654a48047fed3568c30f53f19cd131615cabbc247dbdf1eb1b7540b0d188f341251b4876dd0d5fcc13792800f0160f7907e8d8fe9a5e75083f
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3
 DIST strum_macros-0.26.2.crate 27056 BLAKE2B c9df13a91dd08f8bba0dfeec4fc03b59cd74eafaace7d2d228b8636264a9ea11137d0be741a936f7290e09525586818726000f07ed84a5ae711b89d61f52e89e SHA512 519bc654adcf131d85d1ef83f62be2429f7472df25cf962fdc1cf5070d33c39dfe71f08fbf296df9b85fdfcda95cf2fea27e8e52e9ae93de27bb8fc4a5b55dd1
-DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
-DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a
 DIST termcolor-1.4.1.crate 18773 BLAKE2B 34676efbde8e242415857d6d40a287ae3459678d8222f5144faefb8c84d635686f640e79588d98635c8f25b7628ec6663a01b16e1e462705b5cba7e8b8e61f44 SHA512 b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a
-DIST terminal_size-0.2.6.crate 10585 BLAKE2B 8696b9046c717eec8bf7246346af84a5d0cb740ac6e1335a4d8c20476628f4c0dd7c6106cde33513681466e9701d4b05d73f22a3bd2dfabc4d22045a69d31345 SHA512 95f38bc00f8c5e1a6913bb2a0a7c46d96e02a4f3234af1623ad3d7be41eae677e77f1b5d5d005d1e9d778fcc6c87196f67a51ab37caab5b4d299da79c85d06ed
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
-DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46
-DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9
 DIST udev-0.7.0.crate 17980 BLAKE2B ef62bfc3bebdea9fbc30d8c0de6989b0310da2b7efa65345e991b5ac85d39578a5cc9bf97558786f09806c790eae4a99ca7be29d35b8793a92c71bed07a9b91a SHA512 87aa3182c028911b23c6820408879f901dd674ff6fe95c8382ecdec3d4da9f3e19dc03b2435c72e7cf299af083d5de9a6b83a84a75de4c2483c97ea9c1950393
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
-DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55
 DIST uuid-1.7.0.crate 42627 BLAKE2B 493f6a3a643d3493a2bd7e0e92a1ccfb7bd722e3a1fc8deb7df0ddc875a822daead1cdd35dc3ac6f26346844100a671318d71e5ad760c9587471d4f05bbb0c69 SHA512 2ea704d082b725d98717d772e1af84fe743929ee32658ebeb111c6fa2395ff5f44558b7e375087617f91c6f7bc242f2db96e80a631071722de6fe15af845e856
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 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
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild
new file mode 100644
index 000000000000..566129b51e44
--- /dev/null
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.2
+	anstream@0.6.11
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.79
+	autocfg@1.1.0
+	bindgen@0.69.4
+	bitfield@0.14.0
+	bitflags@1.3.2
+	bitflags@2.4.2
+	byteorder@1.5.0
+	cc@1.0.83
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.7.0
+	clap@4.4.18
+	clap_builder@4.4.18
+	clap_complete@4.4.10
+	clap_derive@4.4.7
+	clap_lex@0.6.0
+	colorchoice@1.0.0
+	either@1.9.0
+	env_logger@0.10.2
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	errno@0.3.8
+	glob@0.3.1
+	heck@0.4.1
+	home@0.5.9
+	itertools@0.12.1
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.153
+	libloading@0.8.1
+	libudev-sys@0.1.4
+	linux-raw-sys@0.4.13
+	log@0.4.22
+	memchr@2.7.1
+	memoffset@0.8.0
+	minimal-lexical@0.2.1
+	nom@7.1.3
+	once_cell@1.19.0
+	owo-colors@4.0.0
+	paste@1.0.14
+	pkg-config@0.3.29
+	prettyplease@0.2.16
+	proc-macro2@1.0.78
+	quote@1.0.35
+	regex-automata@0.4.5
+	regex-syntax@0.8.2
+	regex@1.10.3
+	rustc-hash@1.1.0
+	rustix@0.38.34
+	rustversion@1.0.17
+	shlex@1.3.0
+	strsim@0.10.0
+	strum@0.26.2
+	strum_macros@0.26.2
+	syn@2.0.48
+	terminal_size@0.3.0
+	udev@0.7.0
+	unicode-ident@1.0.12
+	utf8parse@0.2.1
+	uuid@1.7.0
+	which@4.4.2
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+"
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker
+
+DESCRIPTION="Tools for bcachefs"
+HOMEPAGE="https://bcachefs.org/"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://evilpiepirate.org/bcachefs-tools.git"
+else
+	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 BSD GPL-2 MIT"
+SLOT="0"
+IUSE="fuse"
+RESTRICT="test"
+
+DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-libs/libsodium:=
+	dev-libs/userspace-rcu:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/udev
+	fuse? ( >=sys-fs/fuse-3.7.0 )
+"
+
+RDEPEND="${DEPEND}"
+#
+# Clang is required for bindgen
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/docutils[${PYTHON_USEDEP}]
+	')
+	$(unpacker_src_uri_depends)
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
+	elibc_musl? ( >=sys-libs/musl-1.2.5 )
+	virtual/pkgconfig
+	virtual/rust
+"
+
+QA_FLAGS_IGNORED="/sbin/bcachefs"
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		S="${S}/rust-src" cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	tc-export CC
+
+	# Version sed needed because the Makefile hasn't been bumped yet
+	# Check if it is no longer before bumping
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-i Makefile || die
+	append-lfs-flags
+}
+
+src_compile() {
+	use fuse && export BCACHEFS_FUSE=1
+	export BUILD_VERBOSE=1
+	export VERSION=${PV}
+
+	default
+
+	local shell
+	for shell in bash fish zsh; do
+		./bcachefs completions ${shell} > ${shell}.completion || die
+	done
+}
+
+src_install() {
+	into /
+	dosbin bcachefs
+
+	dosym bcachefs /sbin/fsck.bcachefs
+	dosym bcachefs /sbin/mkfs.bcachefs
+	dosym bcachefs /sbin/mount.bcachefs
+
+	if use fuse; then
+		dosym bcachefs /sbin/fsck.fuse.bcachefs
+		dosym bcachefs /sbin/mkfs.fuse.bcachefs
+		dosym bcachefs /sbin/mount.fuse.bcachefs
+	fi
+
+	newbashcomp bash.completion bcachefs
+	newfishcomp fish.completion bcachefs.fish
+	newzshcomp zsh.completion _bcachefs
+
+	doman bcachefs.8
+}
+
+pkg_postinst() {
+	if use fuse; then
+		ewarn "FUSE support is experimental."
+		ewarn "Please only use it for development purposes at the risk of losing your data."
+		ewarn "You have been warned."
+	fi
+}
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild
deleted file mode 100644
index a2e67f190904..000000000000
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@1.1.2
-	anstream@0.3.2
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@1.0.2
-	anstyle@1.0.2
-	anyhow@1.0.75
-	atty@0.2.14
-	autocfg@1.1.0
-	bitfield@0.14.0
-	bitflags@1.3.2
-	bitflags@2.4.1
-	byteorder@1.5.0
-	cc@1.0.83
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	chrono@0.4.31
-	clang-sys@1.6.1
-	clap_builder@4.3.24
-	clap_complete@4.3.2
-	clap_derive@4.3.12
-	clap_lex@0.5.0
-	clap@4.3.24
-	colorchoice@1.0.0
-	colored@2.0.4
-	either@1.9.0
-	errno-dragonfly@0.1.2
-	errno@0.2.8
-	errno@0.3.7
-	fastrand@2.0.1
-	filedescriptor@0.8.2
-	gag@1.0.0
-	getset@0.1.2
-	glob@0.3.1
-	heck@0.4.1
-	hermit-abi@0.1.19
-	hermit-abi@0.3.3
-	io-lifetimes@1.0.11
-	is-terminal@0.4.9
-	itertools@0.9.0
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.150
-	libudev-sys@0.1.4
-	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.11
-	log@0.4.20
-	memchr@2.6.4
-	memoffset@0.8.0
-	minimal-lexical@0.2.1
-	nom@7.1.3
-	num-traits@0.2.17
-	once_cell@1.18.0
-	parse-display-derive@0.1.2
-	parse-display@0.1.2
-	paste@1.0.14
-	peeking_take_while@0.1.2
-	pkg-config@0.3.27
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.69
-	quote@1.0.33
-	redox_syscall@0.4.1
-	regex-automata@0.4.3
-	regex-syntax@0.6.29
-	regex-syntax@0.8.2
-	regex@1.10.2
-	rpassword@4.0.5
-	rustc-hash@1.1.0
-	rustix@0.37.27
-	rustix@0.38.25
-	shlex@1.2.0
-	strsim@0.10.0
-	syn@1.0.109
-	syn@2.0.39
-	tempfile@3.8.1
-	terminal_size@0.2.6
-	thiserror-impl@1.0.50
-	thiserror@1.0.50
-	udev@0.7.0
-	unicode-ident@1.0.12
-	utf8parse@0.2.1
-	uuid@1.6.1
-	version_check@0.9.4
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	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
-	windows-sys@0.48.0
-	windows-targets@0.48.5
-"
-
-# Upstream have a fork of bindgen and use cgit
-declare -A GIT_CRATES=(
-	[bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen"
-)
-
-LLVM_MAX_SLOT=17
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcachefs.org/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
-else
-	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		${CARGO_CRATE_URIS}"
-	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 BSD GPL-2 MIT"
-SLOT="0"
-IUSE="fuse test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-libs/libsodium:=
-	dev-libs/userspace-rcu:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/udev
-	fuse? ( >=sys-fs/fuse-3.7.0 )
-"
-
-RDEPEND="${DEPEND}"
-#
-# Clang is required for bindgen
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/docutils[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		)
-	')
-	$(unpacker_src_uri_depends)
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
-	virtual/pkgconfig
-	virtual/rust
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-fix-clang-musl.patch
-)
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-	fi
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		S="${S}/rust-src" cargo_live_src_unpack
-	else
-		unpack ${P}.tar.gz
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
-		-i Makefile || die
-	# Patch our cargo-ebuild patch definition to pretend that our GIT_CRATE is upstream's URI.
-	if ! [[ ${PV} == "9999" ]]; then
-		sed -e 's https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs https://evilpiepirate.org/git/rust-bindgen.git ' \
-			-i "${WORKDIR}/cargo_home/config" || die
-	fi
-	append-lfs-flags
-}
-
-src_compile() {
-	use fuse && export BCACHEFS_FUSE=1
-	export BUILD_VERBOSE=1
-	export VERSION=${PV}
-
-	default
-
-	use test && emake tests
-}
-
-src_test() {
-	if ! use fuse; then
-		EPYTEST_IGNORE=( tests/test_fuse.py )
-	fi
-	EPYTEST_DESELECT=(
-		# Valgrind
-		'tests/test_fixture.py::test_read_after_free'
-		'tests/test_fixture.py::test_undefined'
-		'tests/test_fixture.py::test_write_after_free'
-		'tests/test_fixture.py::test_undefined_branch'
-		'tests/test_fixture.py::test_leak'
-		'tests/test_fixture.py::test_check'
-		# Fails in portage because of usersandbox; ensure that these pass before bumping!
-		'tests/test_basic.py::test_format'
-		'tests/test_basic.py::test_fsck'
-		'tests/test_basic.py::test_list'
-		'tests/test_basic.py::test_list_inodes'
-		'tests/test_basic.py::test_list_dirent'
-	)
-	epytest -v -n "$(makeopts_jobs)"
-}
-
-src_install() {
-	into /
-	dosbin bcachefs
-
-	dosym bcachefs /sbin/fsck.bcachefs
-	dosym bcachefs /sbin/mkfs.bcachefs
-	dosym bcachefs /sbin/mount.bcachefs
-
-	if use fuse; then
-		dosym bcachefs /sbin/fsck.fuse.bcachefs
-		dosym bcachefs /sbin/mkfs.fuse.bcachefs
-		dosym bcachefs /sbin/mount.fuse.bcachefs
-	fi
-
-	doman bcachefs.8
-}
-
-pkg_postinst() {
-	if use fuse; then
-		ewarn "FUSE support is experimental."
-		ewarn "Please only use it for development purposes at the risk of losing your data."
-		ewarn "You have been warned."
-	fi
-}
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild
deleted file mode 100644
index 5e14d8dc33f4..000000000000
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@1.1.2
-	anstream@0.3.2
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@1.0.2
-	anstyle@1.0.2
-	anyhow@1.0.75
-	atty@0.2.14
-	autocfg@1.1.0
-	bitfield@0.14.0
-	bitflags@1.3.2
-	bitflags@2.4.1
-	byteorder@1.5.0
-	cc@1.0.83
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	chrono@0.4.31
-	clang-sys@1.6.1
-	clap_builder@4.3.24
-	clap_complete@4.3.2
-	clap_derive@4.3.12
-	clap_lex@0.5.0
-	clap@4.3.24
-	colorchoice@1.0.0
-	colored@2.0.4
-	either@1.9.0
-	errno-dragonfly@0.1.2
-	errno@0.2.8
-	errno@0.3.7
-	fastrand@2.0.1
-	filedescriptor@0.8.2
-	gag@1.0.0
-	getset@0.1.2
-	glob@0.3.1
-	heck@0.4.1
-	hermit-abi@0.1.19
-	hermit-abi@0.3.3
-	io-lifetimes@1.0.11
-	is-terminal@0.4.9
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.150
-	libudev-sys@0.1.4
-	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.11
-	log@0.4.20
-	memchr@2.6.4
-	memoffset@0.8.0
-	minimal-lexical@0.2.1
-	nom@7.1.3
-	num-traits@0.2.17
-	once_cell@1.18.0
-	parse-display-derive@0.1.2
-	parse-display@0.1.2
-	paste@1.0.14
-	peeking_take_while@0.1.2
-	pkg-config@0.3.27
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.69
-	quote@1.0.33
-	redox_syscall@0.4.1
-	regex-automata@0.4.3
-	regex-syntax@0.6.29
-	regex-syntax@0.8.2
-	regex@1.10.2
-	rpassword@4.0.5
-	rustc-hash@1.1.0
-	rustix@0.37.27
-	rustix@0.38.25
-	shlex@1.2.0
-	strsim@0.10.0
-	syn@1.0.109
-	syn@2.0.39
-	tempfile@3.8.1
-	terminal_size@0.2.6
-	thiserror-impl@1.0.50
-	thiserror@1.0.50
-	udev@0.7.0
-	unicode-ident@1.0.12
-	utf8parse@0.2.1
-	uuid@1.6.1
-	version_check@0.9.4
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	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
-	windows-sys@0.48.0
-	windows-targets@0.48.5
-"
-
-# Upstream have a fork of bindgen and use cgit
-declare -A GIT_CRATES=(
-	[bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen"
-)
-
-LLVM_MAX_SLOT=17
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcachefs.org/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
-else
-	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		${CARGO_CRATE_URIS}"
-	S="${WORKDIR}/${P}"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 BSD GPL-2 MIT"
-SLOT="0"
-IUSE="fuse test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-libs/libsodium:=
-	dev-libs/userspace-rcu:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/udev
-	fuse? ( >=sys-fs/fuse-3.7.0 )
-"
-
-RDEPEND="${DEPEND}"
-#
-# Clang is required for bindgen
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/docutils[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		)
-	')
-	$(unpacker_src_uri_depends)
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
-	virtual/pkgconfig
-	virtual/rust
-"
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-	fi
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		S="${S}/rust-src" cargo_live_src_unpack
-	else
-		unpack ${P}.tar.gz
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
-		-i Makefile || die
-	# Patch our cargo-ebuild patch definition to pretend that our GIT_CRATE is upstream's URI.
-	if ! [[ ${PV} == "9999" ]]; then
-		sed -e 's https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs https://evilpiepirate.org/git/rust-bindgen.git ' \
-			-i "${WORKDIR}/cargo_home/config" || die
-	fi
-	append-lfs-flags
-}
-
-src_compile() {
-	use fuse && export BCACHEFS_FUSE=1
-	export BUILD_VERBOSE=1
-	export VERSION=${PV}
-
-	default
-
-	use test && emake tests
-}
-
-src_test() {
-	if ! use fuse; then
-		EPYTEST_IGNORE=( tests/test_fuse.py )
-	fi
-	EPYTEST_DESELECT=(
-		# Valgrind
-		'tests/test_fixture.py::test_read_after_free'
-		'tests/test_fixture.py::test_undefined'
-		'tests/test_fixture.py::test_write_after_free'
-		'tests/test_fixture.py::test_undefined_branch'
-		'tests/test_fixture.py::test_leak'
-		'tests/test_fixture.py::test_check'
-		# Fails in portage because of usersandbox; ensure that these pass before bumping!
-		'tests/test_basic.py::test_format'
-		'tests/test_basic.py::test_fsck'
-		'tests/test_basic.py::test_list'
-		'tests/test_basic.py::test_list_inodes'
-		'tests/test_basic.py::test_list_dirent'
-	)
-	epytest -v -n "$(makeopts_jobs)"
-}
-
-src_install() {
-	into /
-	dosbin bcachefs
-
-	dosym bcachefs /sbin/fsck.bcachefs
-	dosym bcachefs /sbin/mkfs.bcachefs
-	dosym bcachefs /sbin/mount.bcachefs
-
-	if use fuse; then
-		dosym bcachefs /sbin/fsck.fuse.bcachefs
-		dosym bcachefs /sbin/mkfs.fuse.bcachefs
-		dosym bcachefs /sbin/mount.fuse.bcachefs
-	fi
-
-	doman bcachefs.8
-}
-
-pkg_postinst() {
-	if use fuse; then
-		ewarn "FUSE support is experimental."
-		ewarn "Please only use it for development purposes at the risk of losing your data."
-		ewarn "You have been warned."
-	fi
-}
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.6.4-r1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.6.4-r1.ebuild
deleted file mode 100644
index 5763dd2e492e..000000000000
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.6.4-r1.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
-
-CRATES="
-	aho-corasick@1.1.2
-	anstream@0.6.11
-	anstyle-parse@0.2.3
-	anstyle-query@1.0.2
-	anstyle-wincon@3.0.2
-	anstyle@1.0.6
-	anyhow@1.0.79
-	autocfg@1.1.0
-	bindgen@0.69.4
-	bitfield@0.14.0
-	bitflags@1.3.2
-	bitflags@2.4.2
-	byteorder@1.5.0
-	cc@1.0.83
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	clang-sys@1.7.0
-	clap@4.4.18
-	clap_builder@4.4.18
-	clap_complete@4.4.10
-	clap_derive@4.4.7
-	clap_lex@0.6.0
-	colorchoice@1.0.0
-	colored@2.1.0
-	either@1.9.0
-	errno-dragonfly@0.1.2
-	errno@0.2.8
-	errno@0.3.8
-	glob@0.3.1
-	heck@0.4.1
-	home@0.5.9
-	itertools@0.12.1
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.153
-	libloading@0.8.1
-	libudev-sys@0.1.4
-	linux-raw-sys@0.4.13
-	log@0.4.20
-	memchr@2.7.1
-	memoffset@0.8.0
-	minimal-lexical@0.2.1
-	nom@7.1.3
-	once_cell@1.19.0
-	paste@1.0.14
-	pkg-config@0.3.29
-	prettyplease@0.2.16
-	proc-macro2@1.0.78
-	quote@1.0.35
-	regex-automata@0.4.5
-	regex-syntax@0.8.2
-	regex@1.10.3
-	rpassword@7.3.1
-	rtoolbox@0.0.2
-	rustc-hash@1.1.0
-	rustix@0.38.31
-	shlex@1.3.0
-	strsim@0.10.0
-	syn@2.0.48
-	terminal_size@0.3.0
-	udev@0.7.0
-	unicode-ident@1.0.12
-	utf8parse@0.2.1
-	uuid@1.7.0
-	which@4.4.2
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.0
-"
-
-LLVM_COMPAT=( {16..17} )
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcachefs.org/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
-else
-	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		${CARGO_CRATE_URIS}"
-	S="${WORKDIR}/${P}"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 BSD GPL-2 MIT"
-SLOT="0"
-IUSE="fuse test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-libs/libsodium:=
-	dev-libs/userspace-rcu:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/udev
-	fuse? ( >=sys-fs/fuse-3.7.0 )
-"
-
-RDEPEND="${DEPEND}"
-#
-# Clang is required for bindgen
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/docutils[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		)
-	')
-	$(unpacker_src_uri_depends)
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-	')
-	virtual/pkgconfig
-	virtual/rust
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-	fi
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		S="${S}/rust-src" cargo_live_src_unpack
-	else
-		unpack ${P}.tar.gz
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-
-	# Version sed needed because the Makefile hasn't been bumped yet
-	# Check if it is no longer before bumping
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
-		-i Makefile || die
-	append-lfs-flags
-}
-
-src_compile() {
-	use fuse && export BCACHEFS_FUSE=1
-	export BUILD_VERBOSE=1
-	export VERSION=${PV}
-
-	default
-
-	use test && emake tests
-
-	local shell
-	for shell in bash fish zsh; do
-		./bcachefs completions ${shell} > ${shell}.completion || die
-	done
-}
-
-src_test() {
-	if ! use fuse; then
-		EPYTEST_IGNORE=( tests/test_fuse.py )
-	fi
-	EPYTEST_DESELECT=(
-		# Valgrind
-		'tests/test_fixture.py::test_read_after_free'
-		'tests/test_fixture.py::test_undefined'
-		'tests/test_fixture.py::test_write_after_free'
-		'tests/test_fixture.py::test_undefined_branch'
-		'tests/test_fixture.py::test_leak'
-		'tests/test_fixture.py::test_check'
-		# Fails in portage because of usersandbox; ensure that these pass before bumping!
-		'tests/test_basic.py::test_format'
-		'tests/test_basic.py::test_fsck'
-		'tests/test_basic.py::test_list'
-		'tests/test_basic.py::test_list_inodes'
-		'tests/test_basic.py::test_list_dirent'
-	)
-	epytest -v -n "$(makeopts_jobs)"
-}
-
-src_install() {
-	into /
-	dosbin bcachefs
-
-	dosym bcachefs /sbin/fsck.bcachefs
-	dosym bcachefs /sbin/mkfs.bcachefs
-	dosym bcachefs /sbin/mount.bcachefs
-
-	if use fuse; then
-		dosym bcachefs /sbin/fsck.fuse.bcachefs
-		dosym bcachefs /sbin/mkfs.fuse.bcachefs
-		dosym bcachefs /sbin/mount.fuse.bcachefs
-	fi
-
-	newbashcomp bash.completion bcachefs
-	newfishcomp fish.completion bcachefs.fish
-	newzshcomp zsh.completion _bcachefs
-
-	doman bcachefs.8
-}
-
-pkg_postinst() {
-	if use fuse; then
-		ewarn "FUSE support is experimental."
-		ewarn "Please only use it for development purposes at the risk of losing your data."
-		ewarn "You have been warned."
-	fi
-}
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild
deleted file mode 100644
index 23f03911c2e6..000000000000
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick@1.1.2
-	anstream@0.6.11
-	anstyle-parse@0.2.3
-	anstyle-query@1.0.2
-	anstyle-wincon@3.0.2
-	anstyle@1.0.6
-	anyhow@1.0.79
-	autocfg@1.1.0
-	bindgen@0.69.4
-	bitfield@0.14.0
-	bitflags@1.3.2
-	bitflags@2.4.2
-	byteorder@1.5.0
-	cc@1.0.83
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	clang-sys@1.7.0
-	clap@4.4.18
-	clap_builder@4.4.18
-	clap_complete@4.4.10
-	clap_derive@4.4.7
-	clap_lex@0.6.0
-	colorchoice@1.0.0
-	colored@2.1.0
-	either@1.9.0
-	errno-dragonfly@0.1.2
-	errno@0.2.8
-	errno@0.3.8
-	glob@0.3.1
-	heck@0.4.1
-	home@0.5.9
-	itertools@0.12.1
-	lazy_static@1.4.0
-	lazycell@1.3.0
-	libc@0.2.153
-	libloading@0.8.1
-	libudev-sys@0.1.4
-	linux-raw-sys@0.4.13
-	log@0.4.20
-	memchr@2.7.1
-	memoffset@0.8.0
-	minimal-lexical@0.2.1
-	nom@7.1.3
-	once_cell@1.19.0
-	paste@1.0.14
-	pkg-config@0.3.29
-	prettyplease@0.2.16
-	proc-macro2@1.0.78
-	quote@1.0.35
-	regex-automata@0.4.5
-	regex-syntax@0.8.2
-	regex@1.10.3
-	rpassword@7.3.1
-	rtoolbox@0.0.2
-	rustc-hash@1.1.0
-	rustix@0.38.31
-	rustversion@1.0.17
-	shlex@1.3.0
-	strsim@0.10.0
-	strum@0.26.2
-	strum_macros@0.26.2
-	syn@2.0.48
-	terminal_size@0.3.0
-	udev@0.7.0
-	unicode-ident@1.0.12
-	utf8parse@0.2.1
-	uuid@1.7.0
-	which@4.4.2
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-targets@0.48.5
-	windows-targets@0.52.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.0
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.0
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.0
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.0
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.0
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.0
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.0
-	zeroize@1.8.1
-	zeroize_derive@1.4.2
-"
-
-LLVM_COMPAT=( {16..18} )
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcachefs.org/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
-else
-	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		${CARGO_CRATE_URIS}"
-	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 BSD GPL-2 MIT"
-SLOT="0"
-IUSE="fuse test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libaio
-	dev-libs/libsodium:=
-	dev-libs/userspace-rcu:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/udev
-	fuse? ( >=sys-fs/fuse-3.7.0 )
-"
-
-RDEPEND="${DEPEND}"
-#
-# Clang is required for bindgen
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/docutils[${PYTHON_USEDEP}]
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		)
-	')
-	$(unpacker_src_uri_depends)
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-	')
-	virtual/pkgconfig
-	virtual/rust
-"
-
-QA_FLAGS_IGNORED="/sbin/bcachefs"
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-	fi
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		S="${S}/rust-src" cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-
-	# Version sed needed because the Makefile hasn't been bumped yet
-	# Check if it is no longer before bumping
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
-		-i Makefile || die
-	append-lfs-flags
-}
-
-src_compile() {
-	use fuse && export BCACHEFS_FUSE=1
-	export BUILD_VERBOSE=1
-	export VERSION=${PV}
-
-	default
-
-	use test && emake tests
-
-	local shell
-	for shell in bash fish zsh; do
-		./bcachefs completions ${shell} > ${shell}.completion || die
-	done
-}
-
-src_test() {
-	if ! use fuse; then
-		EPYTEST_IGNORE=( tests/test_fuse.py )
-	fi
-	EPYTEST_DESELECT=(
-		# Valgrind
-		'tests/test_fixture.py::test_read_after_free'
-		'tests/test_fixture.py::test_undefined'
-		'tests/test_fixture.py::test_write_after_free'
-		'tests/test_fixture.py::test_undefined_branch'
-		'tests/test_fixture.py::test_leak'
-		'tests/test_fixture.py::test_check'
-		# Fails in portage because of usersandbox; ensure that these pass before bumping!
-		'tests/test_basic.py::test_format'
-		'tests/test_basic.py::test_fsck'
-		'tests/test_basic.py::test_list'
-		'tests/test_basic.py::test_list_inodes'
-		'tests/test_basic.py::test_list_dirent'
-	)
-	epytest -v -n "$(makeopts_jobs)"
-}
-
-src_install() {
-	into /
-	dosbin bcachefs
-
-	dosym bcachefs /sbin/fsck.bcachefs
-	dosym bcachefs /sbin/mkfs.bcachefs
-	dosym bcachefs /sbin/mount.bcachefs
-
-	if use fuse; then
-		dosym bcachefs /sbin/fsck.fuse.bcachefs
-		dosym bcachefs /sbin/mkfs.fuse.bcachefs
-		dosym bcachefs /sbin/mount.fuse.bcachefs
-	fi
-
-	newbashcomp bash.completion bcachefs
-	newfishcomp fish.completion bcachefs.fish
-	newzshcomp zsh.completion _bcachefs
-
-	doman bcachefs.8
-}
-
-pkg_postinst() {
-	if use fuse; then
-		ewarn "FUSE support is experimental."
-		ewarn "Please only use it for development purposes at the risk of losing your data."
-		ewarn "You have been warned."
-	fi
-}
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
index dd482ce9dcf3..7e5aa241533f 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
@@ -113,7 +113,7 @@ else
 	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 BSD GPL-2 MIT"
diff --git a/sys-fs/bcachefs-tools/metadata.xml b/sys-fs/bcachefs-tools/metadata.xml
index 48e79cd6a8f8..7f5d051e8f0e 100644
--- a/sys-fs/bcachefs-tools/metadata.xml
+++ b/sys-fs/bcachefs-tools/metadata.xml
@@ -18,6 +18,5 @@
 	</use>
 	<upstream>
 		<remote-id type="github">koverstreet/bcachefs-tools</remote-id>
-		<remote-id type="gitlab">Matt.Jolly/rust-bindgen-bcachefs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b413b3038333..752d14436963 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -2,15 +2,5 @@ DIST btrfs-progs-v6.10.1.tar.sign 566 BLAKE2B dc18c0048716e422475c6630c26c74e09b
 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.6.3.tar.sign 566 BLAKE2B 9f8a14405f78c8eb5a92d59f9ca776cd15bfd43bc323a0f5a98cc2d9a6f782e999a792ddb266fef4dfe189e1cb8eebbd021a12b615e22bdd4097a74bf3b277a9 SHA512 07f062cf66c0e5f0bd833f0a1c9901ec06ac4eb258acec8e96ffbb0b85007a67bdc992492b25f6039fcf603352131fca8c57162fa61007e8ccf1f4edf71dab97
-DIST btrfs-progs-v6.6.3.tar.xz 2557216 BLAKE2B 274fad52bcab45bd0f6496c1bc10e1736e7b766f53b712790996a8a38f74eedcc570783599bed62cd4f84e5629f2216340a66941d9fbe0c7890f1c56ed66df8a SHA512 93e1defacf0f280fc02e10a20fd2bc3775c52956a0339e30b829cc3bef85629d565cf3f6a9af126e38bbb73e8e9b9a0069abbe0e57957a56ca1a8826f5de624a
-DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24572e43fef2fdce79f0dbd892b1609876f681bf79de53e6473345f3de8b8fee6aac2d33673e0b080ab33fb935bd32d SHA512 8fad1c2c47356a04434e12621c526603bf651bdcb0a08deb4022d83953d8c501b8aaa2da05cbf94e0bde43b48a4135fff78a5746423466036ff4899dd79b9589
-DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 SHA512 8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc
-DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09
-DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46
-DIST btrfs-progs-v6.9.1.tar.sign 566 BLAKE2B 4735411485669e37558adda62e168f22a09c11d085dd4adc5db4cfe932745c746b373763cb70b31219908886de52544854a3e9dee0b61bbf32d5d7bf4325d2c9 SHA512 c484845ad47b1ebee666f76e5f0421f640391e205158c14e83ef960506df6b0b6d34244bdcd254e2ac47b3d758e515ffec523a773b7f6081d8b47b856bbbe09b
-DIST btrfs-progs-v6.9.1.tar.xz 2662768 BLAKE2B ed26da2c3c07082df7f1a3d2dc43981ac5375e23de44d0068d91075c8f75e03e75eef4ec5175a0c72d57511b4b9474ff3383f07f14db22e97b2b175578f1cd40 SHA512 5a6b6bbcf2d2624ba12f877485c8137d1601ed9b17bd7f05993cccbc46ff0546f8a0aaf4e221e6cb3aaaa0cec53222edc723f787b317aa551b7f4469456d9a3a
 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
-DIST btrfs-progs-v6.9.tar.sign 566 BLAKE2B a2e26047775bcc407b8f5aa8b08b0708a01c84a8cd649e50a935e15d04e2ee917010fc98df0dfb80320ee25a8dbfbbbabbb1f155489f32391544100956ba9636 SHA512 1e8304b3df013a841e82a8656361946914d35f680b5bc547c1599fdd98a75b66e2b1f869c8b043d7532182318c2183e699a9d6101ab4b1544618d2c8a25362e1
-DIST btrfs-progs-v6.9.tar.xz 2663052 BLAKE2B 9fad691327b6290b3ba0e1a638576b65e4e4d6c8f32549ea0f10188fdb40028315abf5e330976ff7a5efb6a258d0008e7602ae81ba0339888f474dc056791798 SHA512 e97907b377040371f4742a45345ec720e0cb8e0cf9ee5fdc60618ce2bc76f572725ec32e1a178fd57534f73affd3eeb5e6cfebf23734f04583bbbef858d913b2
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
deleted file mode 100644
index d2a13b5804d9..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if in_iuse verify-sig && use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild
deleted file mode 100644
index d2a13b5804d9..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if in_iuse verify-sig && use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake V=1 -j1 -C tests test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
deleted file mode 100644
index d73ee523de14..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# 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
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if in_iuse verify-sig && use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	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
-		--disable-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[@]}"
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild
deleted file mode 100644
index d91dc0aada03..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
-	inherit verify-sig
-
-	MY_PV="v${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="
-		https://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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tries to mount repaired filesystems
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:=[static-libs(+)?]
-	sys-libs/zlib:=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd[static-libs(+)] )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if in_iuse verify-sig && use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-
-		--enable-lzo
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
-		--with-crypto=builtin
-		--with-convert=ext2$(usev reiserfs ',reiserfs')
-	)
-
-	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
-	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
-
-	# bash as a 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
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild
deleted file mode 100644
index b4d9a3171bef..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# 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 -x))
-			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
-		--disable-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[@]}"
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild
deleted file mode 100644
index e9d020c16019..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/0" # libbtrfs soname
-IUSE="+convert +man reiserfs static static-libs udev +zstd"
-# Could support it with just !systemd => eudev, see mdadm, but let's
-# see if someone asks for it first.
-REQUIRED_USE="static? ( !udev )"
-
-# 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 -x))
-			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
-		--disable-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[@]}"
-
-	newbashcomp btrfs-completion btrfs
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 0ffc19e8d126..fb353a4999f9 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,2 +1,3 @@
 DIST btrfsmaintenance-0.5.1.tar.gz 26835 BLAKE2B 22cbde3208c7652bc341014785e61d5904b0696cb864edb9ff1563fc277cde14cfa990895a85a98071bdb9b7e4562d0ea9b981a23d1a6511dfda7390ac110f22 SHA512 9ac40c166ff2692373d28107bc4956e78d76090fefb21b8305feb3f936d98a7f94f1bc62b36529a882dbf93083402c48ac94c30a05eab7bd1f9eda13d410ef41
+DIST btrfsmaintenance-0.5.2.tar.gz 27071 BLAKE2B e2585bcf911cb0cbe3847dd3d6d6054cdea84d6f2c5ab51e47ec8b75adcb2a59d5ab904500fd8875e2eed11f4ba3b165eb20626f252fce179bfeb70700448f40 SHA512 eb20ee15851841d0216f0ec68b1cfc966a7c70892544a57e71e4dbae87d96e4f7f0677d89e6352106006541f5203676fb7fe13d71071778fc31bce8e55251320
 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild
new file mode 100644
index 000000000000..82b7ba58cf41
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
+HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
+SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="systemd"
+
+RDEPEND="
+	app-shells/bash
+	sys-apps/util-linux
+	sys-fs/btrfs-progs
+	systemd? ( sys-apps/systemd )
+	!systemd? ( virtual/cron )
+"
+
+src_prepare() {
+	# Fix config path into watching service
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* ||
+		die "Unable to patch btrfsmaintenance-refresh.*"
+	rm btrfs-defrag-plugin.sh || die "cannot remove btrfs-defrag-plugin.sh" # not necessary on gentoo systems
+	default
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md CHANGES.md
+	insinto /etc/default
+	newins sysconfig.btrfsmaintenance btrfsmaintenance
+	insinto /usr/share/btrfsmaintenance
+	doins btrfsmaintenance-functions
+	exeinto /usr/share/btrfsmaintenance
+	doexe btrfs*.sh
+	systemd_dounit *.service *.timer *.path
+}
+
+pkg_postinst() {
+	elog "Installing default btrfsmaintenance scripts"
+	if use systemd; then
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+	else
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+	fi
+	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
+	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
+	elog "update cron symlinks or run"
+	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
+	elog "to update systemd timers."
+	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
+	elog "monitor the config files changes and update systemd timers accordly."
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		elog "Removing symlinks from btrfsmaintenance cron tasks"
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+	fi
+}
diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest
index 59ddc6b49069..34c44356036d 100644
--- a/sys-fs/clamfs/Manifest
+++ b/sys-fs/clamfs/Manifest
@@ -1,2 +1 @@
-DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626
 DIST clamfs-1.3.0.tar.gz 229989 BLAKE2B 05327d8b6fbe7073c5bd70104282a32009f06556fd61267931f4d841378318e29bb1fc7157da6b5ebce80dda35484f5bc2af71fcecdb3739a4dd28507c767054 SHA512 81c234ec631abd49d9a6b940ef727a1eae048b7be12be6082ec176ed4045fcd92d35d1264e7fd48906786af7c07696139fd5bfa0a302fba7ebb2c528315857a1
diff --git a/sys-fs/clamfs/clamfs-1.2.0.ebuild b/sys-fs/clamfs/clamfs-1.2.0.ebuild
deleted file mode 100644
index 6b8945a4342a..000000000000
--- a/sys-fs/clamfs/clamfs-1.2.0.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 autotools linux-info
-
-DESCRIPTION="A FUSE-based user-space file system with on-access anti-virus file scanning"
-HOMEPAGE="https://github.com/burghardt/clamfs"
-SRC_URI="https://github.com/burghardt/clamfs/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/boost
-	dev-libs/poco
-	dev-libs/rlog
-	sys-fs/fuse:3"
-RDEPEND="${DEPEND}
-	app-antivirus/clamav"
-
-CONFIG_CHECK="~FUSE_FS"
-
-src_prepare() {
-	# Do not use Werror ( #754180 )
-	sed -i 's/\-Werror//g' configure.ac || die "Sed failed"
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	insinto /etc/clamfs
-	doins doc/clamfs.xml
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index d181c0076570..44cb16c6f3c8 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,2 +1 @@
-DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
 DIST cryfs-0.11.4.tar.gz 10420508 BLAKE2B 3b096180f204b90774c2dee5a8bbfa2305fad62fdb86cfa03e802d6a01f3d7a01005c411a16cc3693f2c858e1be9313ba42ab2883daae993220049b34622e391 SHA512 a1aa9377cb0881f08f536f4b2116b27aeef71739e6a1362b209f38f1b54a9ae9e11a2a47ceaa28dcabd74d1ac57f0c92e3d1d8060eabeef4e7efd3d62cc7feea
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
deleted file mode 100644
index 80309d474e3f..000000000000
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-LICENSE="LGPL-3 MIT"
-SLOT="0"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/crypto++-8.2.0:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:0
-	dev-libs/openssl:=
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/versioneer[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	# TODO upstream:
-	"${FILESDIR}/${PN}-0.10.2-unbundle-libs.patch"
-	"${FILESDIR}/${PN}-0.10.2-install-targets.patch"
-	"${FILESDIR}/${PN}-0.10.3-gcc13.patch"
-	# From upstream
-	"${FILESDIR}/${PN}-0.10.3-gcc11.patch"
-	"${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch"
-)
-
-python_check_deps() {
-	python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~FUSE_FS"
-	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
-
-	check_extra_config
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# don't install compressed manpage
-	cmake_comment_add_subdirectory doc
-
-	# We use the package instead for >=py3.12 compat, bug #908997
-	rm src/gitversion/versioneer.py || die
-
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
-		-i test/cpp-utils/CMakeLists.txt || die
-
-	# /dev/fuse access denied
-	sed -e "/CliTest_IntegrityCheck/d" \
-		-i test/cryfs-cli/CMakeLists.txt || die
-}
-
-src_configure() {
-	# ODR violations (bug #880563)
-	filter-lto
-
-	local mycmakeargs=(
-		-DBoost_USE_STATIC_LIBS=OFF
-		-DCRYFS_UPDATE_CHECKS=OFF
-		-DBUILD_SHARED_LIBS=OFF
-		-DUSE_SYSTEM_LIBS=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	use debug || append-flags -DNDEBUG
-
-	# bug 907096
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	cmake_src_configure
-}
-
-src_test() {
-	local TMPDIR="${T}"
-	local tests_failed=()
-
-	# fspp fuse tests hang, bug # 699044
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
-		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
-	done
-
-	if [[ -n ${tests_failed[@]} ]] ; then
-		eerror "The following tests failed:"
-		eerror "${tests_failed[@]}"
-		die "At least one test failed"
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	doman doc/man/cryfs.1
-}
diff --git a/sys-fs/cryfs/cryfs-0.11.4.ebuild b/sys-fs/cryfs/cryfs-0.11.4.ebuild
index 061236e9d5d0..367de758b356 100644
--- a/sys-fs/cryfs/cryfs-0.11.4.ebuild
+++ b/sys-fs/cryfs/cryfs-0.11.4.ebuild
@@ -14,7 +14,7 @@ else
 		https://github.com/cryfs/cryfs/archive/refs/tags/${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-	KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
diff --git a/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch b/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch
deleted file mode 100644
index 0c666448cc01..000000000000
--- a/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/cryfs/cryfs/pull/396
-
-From 18503b00bd16d95dd2cf8a9047446f8be7289082 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 16 Jun 2019 19:35:49 +0200
-Subject: [PATCH 3/3] Don't limit install on Release/Debug/RelWithDebInfo
- CONFIGURATIONS
-
----
- src/cryfs-cli/CMakeLists.txt     | 1 -
- src/cryfs-unmount/CMakeLists.txt | 3 +--
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/cryfs-cli/CMakeLists.txt b/src/cryfs-cli/CMakeLists.txt
-index 90edb227..e8c03916 100644
---- a/src/cryfs-cli/CMakeLists.txt
-+++ b/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_NAME}_bin)
- target_activate_cpp14(${PROJECT_NAME}_bin)
- 
- install(TARGETS ${PROJECT_NAME}_bin
--        CONFIGURATIONS Debug Release RelWithDebInfo
-         DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-diff --git a/src/cryfs-unmount/CMakeLists.txt b/src/cryfs-unmount/CMakeLists.txt
-index 0a246a7f..c5f096ab 100644
---- a/src/cryfs-unmount/CMakeLists.txt
-+++ b/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_NAME}_bin)
- target_activate_cpp14(${PROJECT_NAME}_bin)
- 
- install(TARGETS ${PROJECT_NAME}_bin
--		CONFIGURATIONS Debug Release RelWithDebInfo
--		DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
--- 
-2.22.0
diff --git a/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch b/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch
deleted file mode 100644
index 65d72a99ac89..000000000000
--- a/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From b78c249ce3e048d481d11347c98a86e6669ff5bb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 16 Jun 2019 10:59:46 +0200
-Subject: [PATCH 1/3] Add USE_SYSTEM_LIBS option to build without bundled libs
-
-headers: s/vendor_cryptopp/cryptopp/
-
-Only gtest and crypto++ are being unbundled. In release/0.10 branch,
-bundled spdlog version is too old for Gentoo to satisfy with system-lib.
----
- CMakeLists.txt                                    | 15 ++++++++++++++-
- .../compressing/compressors/Gzip.cpp              |  2 +-
- src/cpp-utils/CMakeLists.txt                      |  6 +++++-
- src/cpp-utils/crypto/cryptopp_byte.h              |  2 +-
- src/cpp-utils/crypto/hash/Hash.cpp                |  2 +-
- src/cpp-utils/crypto/kdf/Scrypt.cpp               |  2 +-
- src/cpp-utils/crypto/symmetric/CFB_Cipher.h       |  2 +-
- src/cpp-utils/crypto/symmetric/GCM_Cipher.h       |  2 +-
- src/cpp-utils/crypto/symmetric/ciphers.h          | 10 +++++-----
- src/cpp-utils/data/Data.cpp                       |  2 +-
- src/cpp-utils/data/FixedSizeData.h                |  2 +-
- src/cpp-utils/random/OSRandomGenerator.h          |  2 +-
- src/cpp-utils/random/RandomGeneratorThread.h      |  2 +-
- src/cryfs/localstate/BasedirMetadata.cpp          |  2 +-
- test/blobstore/CMakeLists.txt                     |  2 +-
- test/blockstore/CMakeLists.txt                    |  2 +-
- test/cpp-utils/CMakeLists.txt                     |  2 +-
- test/cryfs-cli/CMakeLists.txt                     |  2 +-
- test/cryfs/CMakeLists.txt                         |  2 +-
- test/cryfs/config/CompatibilityTest.cpp           |  2 +-
- test/fspp/CMakeLists.txt                          |  2 +-
- test/gitversion/CMakeLists.txt                    |  2 +-
- test/my-gtest-main/CMakeLists.txt                 |  2 +-
- test/parallelaccessstore/CMakeLists.txt           |  2 +-
- 24 files changed, 45 insertions(+), 28 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fdbff715..9797d1ee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,7 @@ require_clang_version(4.0)
- option(BUILD_TESTING "build test cases" OFF)
- option(CRYFS_UPDATE_CHECKS "let cryfs check for updates and security vulnerabilities" ON)
- option(DISABLE_OPENMP "allow building without OpenMP libraries. This will cause performance degradations." OFF)
-+option(USE_SYSTEM_LIBS "build with system libs instead of bundled libs" OFF)
- 
- # The following options are helpful for development and/or CI
- option(USE_WERROR "build with -Werror flag")
-@@ -48,7 +49,19 @@ if(MSVC)
-   add_definitions(/bigobj)
- endif()
- 
--add_subdirectory(vendor EXCLUDE_FROM_ALL)
-+if(USE_SYSTEM_LIBS)
-+    include(FindPkgConfig)
-+    pkg_check_modules(CRYPTOPP REQUIRED libcryptopp>=8.2)
-+    add_subdirectory(vendor/spdlog EXCLUDE_FROM_ALL)
-+    if(BUILD_TESTING)
-+        find_package(GTest CONFIG REQUIRED)
-+        set(GOOGLETEST_LIBS GTest::gtest GTest::gmock)
-+    endif()
-+else()
-+    add_subdirectory(vendor EXCLUDE_FROM_ALL)
-+    set(GOOGLETEST_LIBS googletest)
-+endif()
-+
- add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(test)
-diff --git a/src/blockstore/implementations/compressing/compressors/Gzip.cpp b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-index 67b7f49a..64f13e97 100644
---- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
- #include "Gzip.h"
--#include <vendor_cryptopp/gzip.h>
-+#include <cryptopp/gzip.h>
- 
- using cpputils::Data;
- 
-diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
-index f66f99f8..b57e02ba 100644
---- a/src/cpp-utils/CMakeLists.txt
-+++ b/src/cpp-utils/CMakeLists.txt
-@@ -89,7 +89,11 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- 
- target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
- 
--target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp)
-+if(USE_SYSTEM_LIBS)
-+    target_link_libraries(${PROJECT_NAME} PUBLIC spdlog ${CRYPTOPP_LIBRARIES})
-+else()
-+    target_link_libraries(${PROJECT_NAME} PUBLIC spdlog cryptopp)
-+endif()
- 
- target_add_boost(${PROJECT_NAME} filesystem system thread chrono)
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/src/cpp-utils/crypto/cryptopp_byte.h b/src/cpp-utils/crypto/cryptopp_byte.h
-index e00cf7cf..363990e9 100644
---- a/src/cpp-utils/crypto/cryptopp_byte.h
-+++ b/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- 
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
- 
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-diff --git a/src/cpp-utils/crypto/hash/Hash.cpp b/src/cpp-utils/crypto/hash/Hash.cpp
-index 696cdeaf..e07d28da 100644
---- a/src/cpp-utils/crypto/hash/Hash.cpp
-+++ b/src/cpp-utils/crypto/hash/Hash.cpp
-@@ -1,6 +1,6 @@
- #include "Hash.h"
- #include <cpp-utils/random/Random.h>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
- 
- using cpputils::Random;
- using CryptoPP::SHA512;
-diff --git a/src/cpp-utils/crypto/kdf/Scrypt.cpp b/src/cpp-utils/crypto/kdf/Scrypt.cpp
-index f97d6940..e26db8db 100644
---- a/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp
-@@ -1,5 +1,5 @@
- #include "Scrypt.h"
--#include <vendor_cryptopp/scrypt.h>
-+#include <cryptopp/scrypt.h>
- 
- using std::string;
- 
-diff --git a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-index 217111d9..0ea6355c 100644
---- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
- #include "../../data/Data.h"
- #include "../../random/Random.h"
- #include <boost/optional.hpp>
--#include <vendor_cryptopp/modes.h>
-+#include <cryptopp/modes.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
- 
-diff --git a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-index 87404c8f..385f399f 100644
---- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
- 
-diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h b/src/cpp-utils/crypto/symmetric/ciphers.h
-index 7a8f8d45..61a6a25a 100644
---- a/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ b/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
- #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
- #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
- 
--#include <vendor_cryptopp/aes.h>
--#include <vendor_cryptopp/twofish.h>
--#include <vendor_cryptopp/serpent.h>
--#include <vendor_cryptopp/cast.h>
--#include <vendor_cryptopp/mars.h>
-+#include <cryptopp/aes.h>
-+#include <cryptopp/twofish.h>
-+#include <cryptopp/serpent.h>
-+#include <cryptopp/cast.h>
-+#include <cryptopp/mars.h>
- #include "GCM_Cipher.h"
- #include "CFB_Cipher.h"
- 
-diff --git a/src/cpp-utils/data/Data.cpp b/src/cpp-utils/data/Data.cpp
-index c8a3a25b..3a6d41eb 100644
---- a/src/cpp-utils/data/Data.cpp
-+++ b/src/cpp-utils/data/Data.cpp
-@@ -1,6 +1,6 @@
- #include "Data.h"
- #include <stdexcept>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
- 
- using std::istream;
-diff --git a/src/cpp-utils/data/FixedSizeData.h b/src/cpp-utils/data/FixedSizeData.h
-index 832a96ee..e45127a4 100644
---- a/src/cpp-utils/data/FixedSizeData.h
-+++ b/src/cpp-utils/data/FixedSizeData.h
-@@ -2,7 +2,7 @@
- #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
- #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
- 
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <string>
- #include <cstring>
- #include "../assert/assert.h"
-diff --git a/src/cpp-utils/random/OSRandomGenerator.h b/src/cpp-utils/random/OSRandomGenerator.h
-index 18a8002d..8c8dc6f5 100644
---- a/src/cpp-utils/random/OSRandomGenerator.h
-+++ b/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
- 
- #include "cpp-utils/crypto/cryptopp_byte.h"
- #include "RandomGenerator.h"
--#include <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
- 
- namespace cpputils {
-     class OSRandomGenerator final : public RandomGenerator {
-diff --git a/src/cpp-utils/random/RandomGeneratorThread.h b/src/cpp-utils/random/RandomGeneratorThread.h
-index 593750ed..103c00d7 100644
---- a/src/cpp-utils/random/RandomGeneratorThread.h
-+++ b/src/cpp-utils/random/RandomGeneratorThread.h
-@@ -4,7 +4,7 @@
- 
- #include "../thread/LoopThread.h"
- #include "ThreadsafeRandomDataBuffer.h"
--#include <vendor_cryptopp/osrng.h>
-+#include <cryptopp/osrng.h>
- 
- namespace cpputils {
-     //TODO Test
-diff --git a/src/cryfs/localstate/BasedirMetadata.cpp b/src/cryfs/localstate/BasedirMetadata.cpp
-index d32ced93..3de2d3ad 100644
---- a/src/cryfs/localstate/BasedirMetadata.cpp
-+++ b/src/cryfs/localstate/BasedirMetadata.cpp
-@@ -1,7 +1,7 @@
- #include "BasedirMetadata.h"
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
--#include <vendor_cryptopp/sha.h>
-+#include <cryptopp/sha.h>
- #include <boost/filesystem/operations.hpp>
- #include "LocalStateDir.h"
- #include <cpp-utils/logging/logging.h>
-diff --git a/test/blobstore/CMakeLists.txt b/test/blobstore/CMakeLists.txt
-index 05e98b8d..342d5626 100644
---- a/test/blobstore/CMakeLists.txt
-+++ b/test/blobstore/CMakeLists.txt
-@@ -27,7 +27,7 @@ set(SOURCES
- )
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blobstore)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} blobstore)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/test/blockstore/CMakeLists.txt b/test/blockstore/CMakeLists.txt
-index ca63acce..6dc5f505 100644
---- a/test/blockstore/CMakeLists.txt
-+++ b/test/blockstore/CMakeLists.txt
-@@ -42,7 +42,7 @@ set(SOURCES
- )
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blockstore)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} blockstore)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt
-index 02cc9d5d..55f367eb 100644
---- a/test/cpp-utils/CMakeLists.txt
-+++ b/test/cpp-utils/CMakeLists.txt
-@@ -70,7 +70,7 @@ target_activate_cpp14(${PROJECT_NAME}_exit_signal)
- target_link_libraries(${PROJECT_NAME}_exit_signal cpp-utils)
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cpp-utils)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cpp-utils)
- add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_exit_status ${PROJECT_NAME}_exit_signal)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
-diff --git a/test/cryfs-cli/CMakeLists.txt b/test/cryfs-cli/CMakeLists.txt
-index 2d0b38c5..76fd75bc 100644
---- a/test/cryfs-cli/CMakeLists.txt
-+++ b/test/cryfs-cli/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(SOURCES
- )
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs-cli cryfs-unmount fspp-fuse)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cryfs-cli cryfs-unmount fspp-fuse)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/test/cryfs/CMakeLists.txt b/test/cryfs/CMakeLists.txt
-index 77a025f4..71c74310 100644
---- a/test/cryfs/CMakeLists.txt
-+++ b/test/cryfs/CMakeLists.txt
-@@ -24,7 +24,7 @@ set(SOURCES
- )
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} cryfs)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/test/cryfs/config/CompatibilityTest.cpp b/test/cryfs/config/CompatibilityTest.cpp
-index 36c1871c..a1d5f22b 100644
---- a/test/cryfs/config/CompatibilityTest.cpp
-+++ b/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
- #include <vector>
- #include <boost/filesystem.hpp>
- #include <cpp-utils/data/Data.h>
--#include <vendor_cryptopp/hex.h>
-+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/symmetric/ciphers.h>
- #include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-diff --git a/test/fspp/CMakeLists.txt b/test/fspp/CMakeLists.txt
-index dabff1f1..c3949206 100644
---- a/test/fspp/CMakeLists.txt
-+++ b/test/fspp/CMakeLists.txt
-@@ -102,7 +102,7 @@ set(SOURCES
-         testutils/OpenFileHandle.cpp testutils/OpenFileHandle.h)
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest fspp-interface fspp-fuse)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} fspp-interface fspp-fuse)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/test/gitversion/CMakeLists.txt b/test/gitversion/CMakeLists.txt
-index 51a5ccc1..396289fa 100644
---- a/test/gitversion/CMakeLists.txt
-+++ b/test/gitversion/CMakeLists.txt
-@@ -6,7 +6,7 @@ set(SOURCES
- )
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest gitversion)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} gitversion)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
-diff --git a/test/my-gtest-main/CMakeLists.txt b/test/my-gtest-main/CMakeLists.txt
-index 1d1e7e08..de4fd107 100644
---- a/test/my-gtest-main/CMakeLists.txt
-+++ b/test/my-gtest-main/CMakeLists.txt
-@@ -5,7 +5,7 @@ set(SOURCES
- )
- 
- add_library(${PROJECT_NAME} STATIC ${SOURCES})
--target_link_libraries(${PROJECT_NAME} PUBLIC googletest cpp-utils)
-+target_link_libraries(${PROJECT_NAME} PUBLIC ${GOOGLETEST_LIBS} cpp-utils)
- target_add_boost(${PROJECT_NAME} filesystem system)
- target_include_directories(${PROJECT_NAME} PUBLIC .)
- 
-diff --git a/test/parallelaccessstore/CMakeLists.txt b/test/parallelaccessstore/CMakeLists.txt
-index 16170d17..97379304 100644
---- a/test/parallelaccessstore/CMakeLists.txt
-+++ b/test/parallelaccessstore/CMakeLists.txt
-@@ -6,7 +6,7 @@ set(SOURCES
- )
- 
- add_executable(${PROJECT_NAME} ${SOURCES})
--target_link_libraries(${PROJECT_NAME} my-gtest-main googletest parallelaccessstore)
-+target_link_libraries(${PROJECT_NAME} my-gtest-main ${GOOGLETEST_LIBS} parallelaccessstore)
- add_test(${PROJECT_NAME} ${PROJECT_NAME})
- 
- target_enable_style_warnings(${PROJECT_NAME})
--- 
-2.22.0
-
-
-From 6d5b1dd6f040dbdf3e330962a174c91281b19472 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 16 Jun 2019 15:17:16 +0200
-Subject: [PATCH 2/3] Use FeatureSummary
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9797d1ee..9e37b2e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ project(cryfs)
- 
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake-utils)
- include(utils)
-+include(FeatureSummary)
- 
- require_gcc_version(5.0)
- require_clang_version(4.0)
-@@ -66,3 +67,5 @@ add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(test)
- add_subdirectory(cpack)
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.22.0
-
diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch b/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch
deleted file mode 100644
index a9252e729fb6..000000000000
--- a/sys-fs/cryfs/files/cryfs-0.10.3-fix-build-with-boost-1-77.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/cryfs/cryfs/pull/395
-
-From dcc072d51d0bbb56c9d8709214ce49f8bd6de73c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 13 Aug 2021 18:46:55 +0100
-Subject: [PATCH] Add missing memory.h include for std::shared_ptr
-
----
- src/fspp/fuse/Fuse.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/fspp/fuse/Fuse.h b/src/fspp/fuse/Fuse.h
-index 0b384d8..2ed98da 100644
---- a/src/fspp/fuse/Fuse.h
-+++ b/src/fspp/fuse/Fuse.h
-@@ -11,6 +11,7 @@
- #include <boost/optional.hpp>
- #include <cpp-utils/macros.h>
- #include <atomic>
-+#include <memory>
- #include "stat_compatibility.h"
- 
- namespace fspp {
--- 
-2.32.0
-
diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch
deleted file mode 100644
index 9a7252ba506b..000000000000
--- a/sys-fs/cryfs/files/cryfs-0.10.3-gcc11.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-https://github.com/cryfs/cryfs/commit/27587ea1acec5f939a31217f1c43953378f18821.patch
-https://bugs.gentoo.org/786459
-
-From 27587ea1acec5f939a31217f1c43953378f18821 Mon Sep 17 00:00:00 2001
-From: Sebastian Messmer <messmer@cryfs.org>
-Date: Sat, 8 May 2021 14:44:27 -0700
-Subject: [PATCH] Fixed an issue when compiling with GCC 11, see
- https://github.com/cryfs/cryfs/issues/389
-
----
---- a/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
-+++ b/src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h
-@@ -67,7 +67,7 @@ class DataNodeView final {
- 
-   static DataNodeView create(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
-     ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node");
--    cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data));
-+    cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data));
-     ASSERT(serialized.size() == layout.blocksizeBytes(), "Wrong block size");
-     auto block = blockStore->create(serialized);
-     return DataNodeView(std::move(block));
-@@ -75,7 +75,7 @@ class DataNodeView final {
- 
-   static DataNodeView initialize(cpputils::unique_ref<blockstore::Block> block, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
-     ASSERT(data.size() <= DataNodeLayout(block->size()).datasizeBytes(), "Data is too large for node");
--    cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data));
-+    cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data));
-     ASSERT(serialized.size() == block->size(), "Block has wrong size");
-     block->write(serialized.data(), 0, serialized.size());
-     return DataNodeView(std::move(block));
-@@ -83,7 +83,7 @@ class DataNodeView final {
- 
-   static DataNodeView overwrite(blockstore::BlockStore *blockStore, const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, const blockstore::BlockId &blockId, cpputils::Data data) {
-     ASSERT(data.size() <= layout.datasizeBytes(), "Data is too large for node");
--    cpputils::Data serialized = _serialize(layout, formatVersion, depth, size, std::move(data));
-+    cpputils::Data serialized = serialize_(layout, formatVersion, depth, size, std::move(data));
-     auto block = blockStore->overwrite(blockId, std::move(serialized));
-     return DataNodeView(std::move(block));
-   }
-@@ -143,7 +143,7 @@ class DataNodeView final {
-   }
- 
- private:
--  static cpputils::Data _serialize(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
-+  static cpputils::Data serialize_(const DataNodeLayout &layout, uint16_t formatVersion, uint8_t depth, uint32_t size, cpputils::Data data) {
-     cpputils::Data result(layout.blocksizeBytes());
-     cpputils::serialize<uint16_t>(result.dataOffset(layout.FORMAT_VERSION_OFFSET_BYTES), formatVersion);
-     cpputils::serialize<uint8_t>(result.dataOffset(layout.DEPTH_OFFSET_BYTES), depth);
---- a/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
-+++ b/src/cryfs/filesystem/fsblobstore/utils/DirEntry.cpp
-@@ -11,55 +11,55 @@ namespace cryfs {
- 
-         namespace {
-             template<typename DataType>
--            size_t _serialize(void* dst, const DataType& obj) {
-+            size_t serialize_(void* dst, const DataType& obj) {
-                 cpputils::serialize<DataType>(dst, obj);
-                 return sizeof(DataType);
-             }
- 
-             template<typename DataType>
--            DataType _deserialize(const char** src) {
-+            DataType deserialize_(const char** src) {
-                 DataType result = cpputils::deserialize<DataType>(*src);
-                 *src += sizeof(DataType);
-                 return result;
-             }
- 
--            constexpr size_t _serializedTimeValueSize() {
-+            constexpr size_t serializedTimeValueSize_() {
-                 return sizeof(uint64_t) + sizeof(uint32_t);
-             }
- 
--            unsigned int _serializeTimeValue(uint8_t *dest, timespec value) {
-+            unsigned int serializeTimeValue_(uint8_t *dest, timespec value) {
-                 unsigned int offset = 0;
--                offset += _serialize<uint64_t>(dest + offset, value.tv_sec);
--                offset += _serialize<uint32_t>(dest + offset, value.tv_nsec);
--                ASSERT(offset == _serializedTimeValueSize(), "serialized to wrong size");
-+                offset += serialize_<uint64_t>(dest + offset, value.tv_sec);
-+                offset += serialize_<uint32_t>(dest + offset, value.tv_nsec);
-+                ASSERT(offset == serializedTimeValueSize_(), "serialized to wrong size");
-                 return offset;
-             }
- 
--            timespec _deserializeTimeValue(const char **pos) {
-+            timespec deserializeTimeValue_(const char **pos) {
-                 timespec value{};
--                value.tv_sec = _deserialize<uint64_t>(pos);
--                value.tv_nsec = _deserialize<uint32_t>(pos);
-+                value.tv_sec = deserialize_<uint64_t>(pos);
-+                value.tv_nsec = deserialize_<uint32_t>(pos);
-                 return value;
-             }
- 
--            unsigned int _serializeString(uint8_t *dest, const string &value) {
-+            unsigned int serializeString_(uint8_t *dest, const string &value) {
-                 std::memcpy(dest, value.c_str(), value.size()+1);
-                 return value.size() + 1;
-             }
- 
--            string _deserializeString(const char **pos) {
-+            string deserializeString_(const char **pos) {
-                 size_t length = strlen(*pos);
-                 string value(*pos, length);
-                 *pos += length + 1;
-                 return value;
-             }
- 
--            unsigned int _serializeBlockId(uint8_t *dest, const BlockId &blockId) {
-+            unsigned int serializeBlockId_(uint8_t *dest, const BlockId &blockId) {
-                 blockId.ToBinary(dest);
-                 return blockId.BINARY_LENGTH;
-             }
- 
--            BlockId _deserializeBlockId(const char **pos) {
-+            BlockId deserializeBlockId_(const char **pos) {
-                 BlockId blockId = BlockId::FromBinary(*pos);
-                 *pos += BlockId::BINARY_LENGTH;
-                 return blockId;
-@@ -75,35 +75,35 @@ namespace cryfs {
-                     _mode.hasDirFlag()) + ", " + std::to_string(_mode.hasSymlinkFlag()) + ", " + std::to_string(static_cast<uint8_t>(_type))
-             );
-             unsigned int offset = 0;
--            offset += _serialize<uint8_t>(dest + offset, static_cast<uint8_t>(_type));
--            offset += _serialize<uint32_t>(dest + offset, _mode.value());
--            offset += _serialize<uint32_t>(dest + offset, _uid.value());
--            offset += _serialize<uint32_t>(dest + offset, _gid.value());
--            offset += _serializeTimeValue(dest + offset, _lastAccessTime);
--            offset += _serializeTimeValue(dest + offset, _lastModificationTime);
--            offset += _serializeTimeValue(dest + offset, _lastMetadataChangeTime);
--            offset += _serializeString(dest + offset, _name);
--            offset += _serializeBlockId(dest + offset, _blockId);
-+            offset += serialize_<uint8_t>(dest + offset, static_cast<uint8_t>(_type));
-+            offset += serialize_<uint32_t>(dest + offset, _mode.value());
-+            offset += serialize_<uint32_t>(dest + offset, _uid.value());
-+            offset += serialize_<uint32_t>(dest + offset, _gid.value());
-+            offset += serializeTimeValue_(dest + offset, _lastAccessTime);
-+            offset += serializeTimeValue_(dest + offset, _lastModificationTime);
-+            offset += serializeTimeValue_(dest + offset, _lastMetadataChangeTime);
-+            offset += serializeString_(dest + offset, _name);
-+            offset += serializeBlockId_(dest + offset, _blockId);
-             ASSERT(offset == serializedSize(), "Didn't write correct number of elements");
-         }
- 
-         const char *DirEntry::deserializeAndAddToVector(const char *pos, vector<DirEntry> *result) {
--            fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(_deserialize<uint8_t>(&pos));
--            fspp::mode_t mode = fspp::mode_t(_deserialize<uint32_t>(&pos));
--            fspp::uid_t uid = fspp::uid_t(_deserialize<uint32_t>(&pos));
--            fspp::gid_t gid = fspp::gid_t(_deserialize<uint32_t>(&pos));
--            timespec lastAccessTime = _deserializeTimeValue(&pos);
--            timespec lastModificationTime = _deserializeTimeValue(&pos);
--            timespec lastMetadataChangeTime = _deserializeTimeValue(&pos);
--            string name = _deserializeString(&pos);
--            BlockId blockId = _deserializeBlockId(&pos);
-+            fspp::Dir::EntryType type = static_cast<fspp::Dir::EntryType>(deserialize_<uint8_t>(&pos));
-+            fspp::mode_t mode = fspp::mode_t(deserialize_<uint32_t>(&pos));
-+            fspp::uid_t uid = fspp::uid_t(deserialize_<uint32_t>(&pos));
-+            fspp::gid_t gid = fspp::gid_t(deserialize_<uint32_t>(&pos));
-+            timespec lastAccessTime = deserializeTimeValue_(&pos);
-+            timespec lastModificationTime = deserializeTimeValue_(&pos);
-+            timespec lastMetadataChangeTime = deserializeTimeValue_(&pos);
-+            string name = deserializeString_(&pos);
-+            BlockId blockId = deserializeBlockId_(&pos);
- 
-             result->emplace_back(type, name, blockId, mode, uid, gid, lastAccessTime, lastModificationTime, lastMetadataChangeTime);
-             return pos;
-         }
- 
-         size_t DirEntry::serializedSize() const {
--            return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*_serializedTimeValueSize() + (
-+            return 1 + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + 3*serializedTimeValueSize_() + (
-                     _name.size() + 1) + _blockId.BINARY_LENGTH;
-         }
-     }
---- a/src/cryfs/localstate/LocalStateMetadata.cpp
-+++ b/src/cryfs/localstate/LocalStateMetadata.cpp
-@@ -30,10 +30,10 @@ LocalStateMetadata::LocalStateMetadata(uint32_t myClientId, Hash encryptionKeyHa
- 
- LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath, const Data& encryptionKey, bool allowReplacedFilesystem) {
-   auto metadataFile = statePath / "metadata";
--  auto loaded = _load(metadataFile);
-+  auto loaded = load_(metadataFile);
-   if (loaded == none) {
-     // If it couldn't be loaded, generate a new client id.
--    return _generate(metadataFile, encryptionKey);
-+    return generate_(metadataFile, encryptionKey);
-   }
- 
-   if (!allowReplacedFilesystem && loaded->_encryptionKeyHash.digest != cpputils::hash::hash(encryptionKey, loaded->_encryptionKeyHash.salt).digest) {
-@@ -42,22 +42,22 @@ LocalStateMetadata LocalStateMetadata::loadOrGenerate(const bf::path &statePath,
-   return *loaded;
- }
- 
--optional<LocalStateMetadata> LocalStateMetadata::_load(const bf::path &metadataFilePath) {
-+optional<LocalStateMetadata> LocalStateMetadata::load_(const bf::path &metadataFilePath) {
-   ifstream file(metadataFilePath.string());
-   if (!file.good()) {
-     // State file doesn't exist
-     return none;
-   }
--  return _deserialize(file);
-+  return deserialize_(file);
- }
- 
--void LocalStateMetadata::_save(const bf::path &metadataFilePath) const {
-+void LocalStateMetadata::save_(const bf::path &metadataFilePath) const {
-   ofstream file(metadataFilePath.string(), std::ios::trunc);
--  _serialize(file);
-+  serialize_(file);
- }
- 
- namespace {
--uint32_t _generateClientId() {
-+uint32_t generateClientId_() {
-   uint32_t result;
-   do {
-     result = cpputils::deserialize<uint32_t>(Random::PseudoRandom().getFixedSize<sizeof(uint32_t)>().data());
-@@ -82,8 +82,8 @@ optional<uint32_t> _tryLoadClientIdFromLegacyFile(const bf::path &metadataFilePa
- #endif
- }
- 
--LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePath, const Data& encryptionKey) {
--  uint32_t myClientId = _generateClientId();
-+LocalStateMetadata LocalStateMetadata::generate_(const bf::path &metadataFilePath, const Data& encryptionKey) {
-+  uint32_t myClientId = generateClientId_();
- #ifndef CRYFS_NO_COMPATIBILITY
-   // In the old format, this was stored in a "myClientId" file. If that file exists, load it from there.
-   optional<uint32_t> legacy = _tryLoadClientIdFromLegacyFile(metadataFilePath);
-@@ -93,11 +93,11 @@ LocalStateMetadata LocalStateMetadata::_generate(const bf::path &metadataFilePat
- #endif
- 
-   LocalStateMetadata result(myClientId, cpputils::hash::hash(encryptionKey, cpputils::hash::generateSalt()));
--  result._save(metadataFilePath);
-+  result.save_(metadataFilePath);
-   return result;
- }
- 
--void LocalStateMetadata::_serialize(ostream& stream) const {
-+void LocalStateMetadata::serialize_(ostream& stream) const {
-   ptree pt;
-   pt.put<uint32_t>("myClientId", myClientId());
-   pt.put<string>("encryptionKey.salt", _encryptionKeyHash.salt.ToString());
-@@ -106,7 +106,7 @@ void LocalStateMetadata::_serialize(ostream& stream) const {
-   write_json(stream, pt);
- }
- 
--LocalStateMetadata LocalStateMetadata::_deserialize(istream& stream) {
-+LocalStateMetadata LocalStateMetadata::deserialize_(istream& stream) {
- 	try {
- 		ptree pt;
- 		read_json(stream, pt);
---- a/src/cryfs/localstate/LocalStateMetadata.h
-+++ b/src/cryfs/localstate/LocalStateMetadata.h
-@@ -20,11 +20,11 @@ class LocalStateMetadata final {
-   const uint32_t _myClientId;
-   const cpputils::hash::Hash _encryptionKeyHash;
- 
--  static boost::optional<LocalStateMetadata> _load(const boost::filesystem::path &metadataFilePath);
--  static LocalStateMetadata _deserialize(std::istream& stream);
--  static LocalStateMetadata _generate(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey);
--  void _save(const boost::filesystem::path &metadataFilePath) const;
--  void _serialize(std::ostream& stream) const;
-+  static boost::optional<LocalStateMetadata> load_(const boost::filesystem::path &metadataFilePath);
-+  static LocalStateMetadata deserialize_(std::istream& stream);
-+  static LocalStateMetadata generate_(const boost::filesystem::path &metadataFilePath, const cpputils::Data& encryptionKey);
-+  void save_(const boost::filesystem::path &metadataFilePath) const;
-+  void serialize_(std::ostream& stream) const;
- 
-   LocalStateMetadata(uint32_t myClientId, cpputils::hash::Hash encryptionKey);
- };
diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch
deleted file mode 100644
index 33b6e95d1cea..000000000000
--- a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/890847
---- a/src/cpp-utils/thread/LeftRight.h
-+++ b/src/cpp-utils/thread/LeftRight.h
-@@ -2,6 +2,7 @@
- #include <functional>
- #include <mutex>
- #include <thread>
-+#include <stdexcept>
- #include <cpp-utils/macros.h>
- #include <array>
- 
diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml
index dce6d653fddc..bc16b23e5ab2 100644
--- a/sys-fs/cryfs/metadata.xml
+++ b/sys-fs/cryfs/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>nickaristocrates@gmail.com</email>
-    <name>Nicholas Meyer</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">cryfs/cryfs</remote-id>
   </upstream>
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index f80e1e8ced04..a0a16a69298c 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1 +1,2 @@
 DIST cryptmount-6.2.0.tar.gz 548497 BLAKE2B 45602d86624464c8c1c2ad9cf3ffc4bf311d60ae16c2294111b1fc98bb0e02952c69c767a1c583428c3d8eb0ade2caddb17d3187f4dd34d780772b299ea1a6c0 SHA512 005d9333792a567515ce6d487d2dfa18f19cb077a64d9c356562acefc1947581d2d0f584ad623e0aab8aed1b34f1614af3a42f0c582d31e0831cdb8eb22bb7ce
+DIST cryptmount-6.3.0.tar.gz 373196 BLAKE2B b59127f9944f4bf267d4272bc026909b704f474b2fd2a20baf9125f9b32b33ecfd5523c6ef05098e6467e9b7e938daba55685dc47a3317a4913aef4c517f66f2 SHA512 15f19a1ff7409b35be2cde3d791c8d476c98ffcaf3dd9217076703b0e0baafe999a0608a88cc51039ba2e9c26cb297261128a5efeacd1a6397c5d3300886ac4d
diff --git a/sys-fs/cryptmount/cryptmount-6.3.0.ebuild b/sys-fs/cryptmount/cryptmount-6.3.0.ebuild
new file mode 100644
index 000000000000..b03b2950fe73
--- /dev/null
+++ b/sys-fs/cryptmount/cryptmount-6.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
+HOMEPAGE="http://cryptmount.sourceforge.net/"
+SRC_URI="https://github.com/rwpenney/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl systemd"
+REQUIRED_USE="
+	luks? ( gcrypt )
+	openssl? ( gcrypt )
+"
+
+RDEPEND="
+	sys-fs/lvm2
+	virtual/libiconv
+	virtual/libintl
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	luks? ( sys-fs/cryptsetup )
+	openssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-kernel/linux-headers
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="BLK_DEV_DM"
+ERROR_BLK_DEV_DM="
+	Please enable Device Mapper support in your kernel config
+	-> Device Drivers
+		-> Multiple devices driver support (RAID and LVM)
+			-> Multiple devices driver support (RAID and LVM)
+				<*>/<M> Device mapper support
+"
+
+src_prepare() {
+	default
+
+	# Fix doc directory
+	sed -e 's/doc\/cryptmount/doc\/${PF}/g' -i Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconf=(
+		--disable-rpath
+		$(use_enable argv0switch)
+		$(use_enable cswap)
+		$(use_enable fsck)
+		$(use_with gcrypt libgcrypt)
+		$(use_enable largefile)
+		$(use_enable mount delegation)
+		$(use_enable nls)
+		$(use_enable luks)
+		$(use_enable openssl openssl-compat)
+		$(use_with systemd)
+	)
+
+	econf "${myeconf[@]}"
+}
diff --git a/sys-fs/cryptmount/metadata.xml b/sys-fs/cryptmount/metadata.xml
index 04afce0bebc0..36c2b7762024 100644
--- a/sys-fs/cryptmount/metadata.xml
+++ b/sys-fs/cryptmount/metadata.xml
@@ -34,6 +34,7 @@
 	</use>
 	<upstream>
 		<bugs-to>https://sourceforge.net/p/cryptmount/bugs/</bugs-to>
+		<remote-id type="github">rwpenney/cryptmount</remote-id>
 		<remote-id type="sourceforge">cryptmount</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 4853a3a74bf5..9f3aa8fd7864 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -113,6 +113,10 @@ multilib_src_configure() {
 }
 
 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
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild
index 24a35a00a404..502d109228b8 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.4.ebuild
@@ -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/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 59c692404d23..44214881f131 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,2 +1,3 @@
 DIST fuse-overlayfs-1.12.tar.gz 99684 BLAKE2B e7ef075c043738d506efcf973ecef7eb321e9f2b2812b318a4087d2a913f022240ed4b0d46e47463daff6976dd99fb587a5819a22c7e58dd52029930e92abffc SHA512 f113ac20b389d2f1c5e5ff160a60c308017e74c9c85d74a7200bab81a4cfa30335a64740c173f17c91ab4feddffb138ca4378e92894645a67eea5ac73d42890f
 DIST fuse-overlayfs-1.13.tar.gz 99775 BLAKE2B 7a0643a5ef029db7f3d1009e9dd4e7a647bf936205723fc3656dfd6d14d622e98f9df15590783492f056ab3f151fd658b6fe65f7177f9499532d02411138ac7c SHA512 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b
+DIST fuse-overlayfs-1.14.tar.gz 102564 BLAKE2B 9c4960bb82be68d545989adffda3c95d06a809692827ad2cf6e0eaa646860bb49ba2e91af88f634740714acb75f2f154b3781cfdd154003d4976e8cc123ed797 SHA512 e0c50abffb7b71248ed4d7b8663f21bab4bf358682dece3a0c9f1480f142532471e139f041759dd8bd24807c7369537a5d86efc01617a17172463bd1c3870623
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
index 4bbe7b857e53..3178b8e1c7a8 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
@@ -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 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 
 DEPEND="sys-fs/fuse:3"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild
new file mode 100644
index 000000000000..c235a29f536f
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.14.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+
+DEPEND="sys-fs/fuse:3"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	kernel_is -lt 4 18 && eerror "Linux Kernel > v4.18.0 is required" && die
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/genimage/Manifest b/sys-fs/genimage/Manifest
index 765e3a0efa63..9ed8a66b2ba0 100644
--- a/sys-fs/genimage/Manifest
+++ b/sys-fs/genimage/Manifest
@@ -1,3 +1 @@
-DIST genimage-16.tar.gz 87544 BLAKE2B 822c1b5901ed3fa19e33961e6e9e718f961d6c0a2315dcb4301aea3cccad6368a03d48ab5b5713592bdd096e78e7d24c03e8016a1470c7864ace71e3341b16a4 SHA512 7cb079d6ae889a744e2a3596b0eac737f7fdf1734c2024c71bb5ff85b93bff1d8ec26d61ee5b210aad4f0f9137968a6e256492c8c8376bafe2c5da2d12985a73
-DIST genimage-17.tar.gz 94853 BLAKE2B 371f35be1f47ecc012adcac5e6138f8bf32b097fd508b599d788d3a1af3fd0ccb9a213d0dc683ecc6e11f762e6376cf3a2683dec3fefd26e70ceebc48e7d2814 SHA512 b02415e030e2ef9ace40b965935e2634c208db4f4d401e1a824aa6dcf06c9656ba060d66e4a3a4306216ec74ce2ddcea4647bb68eb61a3bf4e9aadb1ff0d73ef
 DIST genimage-18.tar.gz 98409 BLAKE2B dc73d2cca8166939e803834490fd55de66d235df0bb0dfef0c79810bfd619fc8683715241719b2fa94d19bf3870863c3aacbd6f2dd50cf41200d5990104ffd3d SHA512 70cacbb0ce081bd6e941f79e00e2c92839909e254d2f74b1eddd4e5d5d6d5177f80745df9bc132fa9b0c901e184d37c1c89113238a0b357412704dba0c367211
diff --git a/sys-fs/genimage/genimage-16.ebuild b/sys-fs/genimage/genimage-16.ebuild
deleted file mode 100644
index 4becc18f6212..000000000000
--- a/sys-fs/genimage/genimage-16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools optfeature
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pengutronix/genimage.git"
-else
-	SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree"
-HOMEPAGE="https://github.com/pengutronix/genimage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/confuse:="
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( sys-apps/fakeroot )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	optfeature "cpio support" app-alternatives/cpio
-	optfeature "tar support" app-arch/tar
-	optfeature "qemu support" app-emulation/qemu
-	optfeature "dosfstools support" sys-fs/dosfstools
-	optfeature "cramfs support" sys-fs/cramfs
-	optfeature "genext2fs support" sys-fs/genext2fs
-	optfeature "jffs, ubifs and ubinize support" sys-fs/mtd-utils
-	optfeature "squashfs support" sys-fs/squashfs-tools
-}
diff --git a/sys-fs/genimage/genimage-17.ebuild b/sys-fs/genimage/genimage-17.ebuild
deleted file mode 100644
index 4becc18f6212..000000000000
--- a/sys-fs/genimage/genimage-17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools optfeature
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pengutronix/genimage.git"
-else
-	SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree"
-HOMEPAGE="https://github.com/pengutronix/genimage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/confuse:="
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( sys-apps/fakeroot )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_postinst() {
-	optfeature "cpio support" app-alternatives/cpio
-	optfeature "tar support" app-arch/tar
-	optfeature "qemu support" app-emulation/qemu
-	optfeature "dosfstools support" sys-fs/dosfstools
-	optfeature "cramfs support" sys-fs/cramfs
-	optfeature "genext2fs support" sys-fs/genext2fs
-	optfeature "jffs, ubifs and ubinize support" sys-fs/mtd-utils
-	optfeature "squashfs support" sys-fs/squashfs-tools
-}
diff --git a/sys-fs/genimage/genimage-9999.ebuild b/sys-fs/genimage/genimage-9999.ebuild
index 498034c2ce2a..4becc18f6212 100644
--- a/sys-fs/genimage/genimage-9999.ebuild
+++ b/sys-fs/genimage/genimage-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pengutronix/genimage.git"
 else
 	SRC_URI="https://github.com/pengutronix/genimage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
 DESCRIPTION="Tool to generate multiple filesystem and flash images from a tree"
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 94edd76b41ce..9cf06193d6ce 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,6 +1,4 @@
 DIST lxcfs-5.0.4.tar.gz 104249 BLAKE2B 83a7b861136c34da8a24dd525fd0767193f2bbd92b40e3b9fd5e42d7645465411792e65e95797ab13b33330299d12b19bdd5786352875ed88ac0097b72b711a9 SHA512 b404045dbabe23e1d1f1d74c1648d2596bb70aaa9f9e46f9f5635b0a02d0c451f68b2559920bbefc5b889e908cf1da0a33c148b26bdce3e45c3d0cbdff710604
 DIST lxcfs-5.0.4.tar.gz.asc 833 BLAKE2B aff883d24b374b296ea3678670e5e82c723fd0e35cfd7fed555aabbd811a104becc0b741331b4aa4a5129c9fff4dc88c6a86e7d64a89fe86aea81718f5d432dd SHA512 56b639597dbaf3008fe030147ea37192bd465c467a79e11ce139bcaa6bca1625b4bb9c4eda6ea1877446769f0fad9b4c5a3513d4f4415b841db96d5da8325ddc
-DIST lxcfs-6.0.0.tar.gz 103369 BLAKE2B 9261ab7d932d315117361a548372930c37129d3c1b3d5aa00bbce6bac923a94e69b0fa223632b1ef22938b047e6ebec7416cf187e76c72680e4d86db173d199a SHA512 fab5569da66a742a51c9f249c3f0256d1ea17dc0a1e7c2d5563d993cd0d236ae664a53809e65fbec2467f5d255dfd867327a28d9465ffe180d240ca131331c59
-DIST lxcfs-6.0.0.tar.gz.asc 833 BLAKE2B cfc6a8e574aeb1c9e3fec322df5254c431878f0109ea43ee1069e8213467ed16fedbe137befa47a2557d8c055591a9f00c99f221d482f715d5cdc678d79c5fa5 SHA512 019178b37045c3c2c4d8be7c417abb4ed8b7ce011bce805b220f6213d7940f164c45632a5ce02ea29451c8148f782d6b7ece7699da7f3ef7306bd437d40fe537
 DIST lxcfs-6.0.1.tar.gz 105761 BLAKE2B 87255711eccc9833cd321c5d606920edcbf87a2a380cb2993efeb08040e22ab6bda408429fe02b731e60b293da946c1c44f6aad6f82db871e49b2bfeb2c34172 SHA512 3e5ab8af0fd81b1b0ac83ce781b20a55c1c1277a01edbca07106534043a0070291331775b7fa4e1c005b54d24d690ad9abe9b208de749a70dcff853741d02fd4
 DIST lxcfs-6.0.1.tar.gz.asc 833 BLAKE2B b9a6655650f5720fce4bb2e9dcace2b1c3ec7f0b14b2b23014142a1fce2cd55b3ae7361e7ead9385893068ca9f18cef4151bfb223d005a4c810c5efc40b8fb7a SHA512 d795a18170027d33f94c2bf88d5ad4c6162e066f9a51d7eab79699cc3b04c058e8f1bf00a8242a233727dfae8888050b17cd96a3abb05d02e0da05298b6eb4c4
diff --git a/sys-fs/lxcfs/lxcfs-6.0.0.ebuild b/sys-fs/lxcfs/lxcfs-6.0.0.ebuild
deleted file mode 100644
index 2cdd634fb322..000000000000
--- a/sys-fs/lxcfs/lxcfs-6.0.0.ebuild
+++ /dev/null
@@ -1,80 +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 meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')
-	doc? ( sys-apps/help2man )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-python_check_deps() {
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix python shebangs for python-exec[-native-symlinks], #851480
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		$(meson_use doc docs)
-		$(meson_use test tests)
-
-		-Dfuse-version=3
-		-Dinit-script=""
-		-Dwith-init-script=""
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
-	./main.sh || die
-}
-
-src_install() {
-	meson_src_install
-
-	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
-
-	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# #728470
-	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
-}
diff --git a/sys-fs/mdadm/mdadm-4.2-r2.ebuild b/sys-fs/mdadm/mdadm-4.2-r2.ebuild
index 99bbc83b039d..d98a9156fbcb 100644
--- a/sys-fs/mdadm/mdadm-4.2-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="static systemd +udev"
 
 REQUIRED_USE="static? ( !udev )"
diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
index 271f26fff8bc..8efe2e754382 100644
--- a/sys-fs/mdadm/mdadm-4.2-r3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="static systemd +udev"
 
 REQUIRED_USE="static? ( !udev )"
diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild
index f132d354e746..5f6bc13bd8d3 100644
--- a/sys-fs/mdadm/mdadm-4.3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static systemd +udev corosync"
 
 REQUIRED_USE="static? ( !udev )"
diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest
index 9fbeef410e50..7e23005cc7ea 100644
--- a/sys-fs/ncdu-bin/Manifest
+++ b/sys-fs/ncdu-bin/Manifest
@@ -1,19 +1,3 @@
-DIST ncdu-2.3-linux-aarch64.tar.gz 286044 BLAKE2B 12961a4ddfef4b240d0a379b8efa733e104d5179645f57512a68ff4e523c002085cdcff3b8533c7575c9201c0f9aa4063227b3953f7a9826f2cdcd6604e9f36f SHA512 6b37d1b9f9ccc18eac118cd94faf808a7173111157f0e06c97de73c349ee4a853bc832b7f8b3e5d116862f93987278504781c36431106a9bb870cf64f428c8f0
-DIST ncdu-2.3-linux-aarch64.tar.gz.asc 833 BLAKE2B cee39dbf98a17f678a6335a86e310291a957de5083818bc266e1e4ba3a562e3f3a0afb666b15b0c10348dab3214d8c02bc55f7d0d134d67673d7d781df51d389 SHA512 1b98c7d673e0a1b1467aba4699ad217388e95e1bb89200ccf59a567cf0512d3d46a067798a8ece55ca76e66c1712748843540d0c1441331e07117dfec533edbc
-DIST ncdu-2.3-linux-arm.tar.gz 281221 BLAKE2B aa381e1d227689430168cc0eb7c762556da733b246fedb26b5adaee94f5c141a1dfdafa11518babfdad3c5c8a8040a6f6e398d78357935ed36df4dc027c8a492 SHA512 336e898ec393ae3d2d962b60083d1214fff32da0204d9aed52894488681ff11b223afdfb089d528d679da73e8580da25b3a857dcce9a2c6799ce9a4e6c4643d5
-DIST ncdu-2.3-linux-arm.tar.gz.asc 833 BLAKE2B ea3b427a516a0edf06dd29ec93df04daaa2e3a0659ad357370b58e95977d6ac881ea8104646f9a82b9905af12d18c3f51bba17f2a9d3b6db5b208050581d0ea8 SHA512 d5f484da3d45a52d97f65e25f4bbcfac3500b8871eceb4b5f5d2a8eda7e3f4b175cea544ba56ff4a7e86de7dfe4ccc054979f3755c1ca87b72b12e851cb12a1a
-DIST ncdu-2.3-linux-x86.tar.gz 315771 BLAKE2B 10319febbb8cd9c88e0c0677eb53be9a9340106c542b9b7e888944ada52ccb9371b38aacac4d8374bd1c150cfa9939fcda20c5513885015569328fdfd5e69f78 SHA512 c77dd79d13b428d2c85f5a73b3638b6e71229fe924e6d4a3beb9b4765febbcb1d0c29e816fa3354b0e2c0b88c599b2f1fd03eeb87a73cccd296a2fb0225e0d98
-DIST ncdu-2.3-linux-x86.tar.gz.asc 833 BLAKE2B b4dcb755252287556019f15677b02922a0597baa20c176c105a4a47831b82365ee88d82f2f807dda43ce3c25e07e6510b96867e4b2fc2db4eab7b91af9ddc703 SHA512 e618db337ab4afa9dcd0cc743430af3ff17393d9cde9d1623667767e15b32d97310664507dbcc783008d5bb9842c6a6474c21bfce08a19241e5992da863840ea
-DIST ncdu-2.3-linux-x86_64.tar.gz 293280 BLAKE2B 871f9c1f6860d83fe3c8ad8e7ffd2157389427b98d3232aaffc9ce983c4b98b9d562d39e94adb667ffaa4745aa4fb1caedd1f9f9b3ca5a756db922a8229f22b7 SHA512 9a1c17a971dc422342e5f42d4f6be4195239411bd529f81d0b0225bdef27e3112561cb1b8c699fb805bd766fb074fc0d93331d83af79d95235533899ac90de5a
-DIST ncdu-2.3-linux-x86_64.tar.gz.asc 833 BLAKE2B 85d09c438c3a51fceb0e81252ccd184e3b7b7a1770c423b61efceb3728b1bfa68c26ef852084231a6fbd88d147ccaad655135007cdd8d850bb34aede465c3ab8 SHA512 a130f2f4d623cff7f0256437443fcdf8c0fc073f6c7bd27cc924e3a464dea5ea17f717cc2c700bc67356578d4e7eab342c444926cb14a6610f6e9be329d781f7
-DIST ncdu-2.4-linux-aarch64.tar.gz 278214 BLAKE2B 77429a554b05b1873012817c917b282f78fb3946d1521aa3a1c90362db1c4bfc9f8355e87b46dc795effb46312fa81297ec0b4777bcfb8f54a40df556c884b8f SHA512 3caaae21f4de4185da01ab55d466a2fb4321608ffed044688240a590a53753473719050777d48015703914769b7c60b59d2b218e96fd3f7c7655f5315b8daf96
-DIST ncdu-2.4-linux-aarch64.tar.gz.asc 833 BLAKE2B e00328f455a31fc4b5915afca6a98e3817ae94f92e7e4eca0655dc4db6dda3fdeb9d7aa6a5b6e20c9f39cba12cb9666ae3462e4f0caaef5415112afa80e6a602 SHA512 9b5a4b55afaf541763e9992a6f15de18cc7cb52b8004e3833b5e75ec0e79787c3693e924b326451caa6c9014d7c3b49eeed36eb9c120ca4aec96f5af9a8d94d6
-DIST ncdu-2.4-linux-arm.tar.gz 273717 BLAKE2B 599fdd716d72009d01e2b9f3022440760772471ebcd75e15c43eff382fa178065154e5d58710f6d16cff02a75f18f7d82239cd43da9d448f14a3fcb43c9353f1 SHA512 70a48564480d861ff3ea4be5bed650163444d34b1e7ed834f0d769e90fea3b69df8c3348273efe34f3fc052384288effad1ed69ff6b995afa92fc930a9f39f0a
-DIST ncdu-2.4-linux-arm.tar.gz.asc 833 BLAKE2B 1af1cd305e86bce890e527dd50673e6d4572cf7983be249ed6d9ded97927b14045a46f20dfee54029a821e9a4754190074dcef6ec1ba523ab68a804b744551eb SHA512 b2bb42714cb1c07916581702b83cc64db663b0bc6342549d5350213beab608307ab34ace0cc8fab9bb9a0949a044cf3d9a46e39813046ff7f50735dc785d8ea1
-DIST ncdu-2.4-linux-x86.tar.gz 297477 BLAKE2B 2d1b7d4b775bfdfc7c0563d40ecbbd0a6d91ef40a49093c6c732d5cc07d5046cb295271d4552cb9ed629646f6dccd4a41c1ce3077b82f8e143e40027c42c51cf SHA512 f52878e302448a10e5720bc572dcb981a8be63b7b4e81c1e03371d89e0fb4075e2c9e2eacd3d6d2a173ed07ec2dd0d4a3d27660bd0f3038884262e2797e602f8
-DIST ncdu-2.4-linux-x86.tar.gz.asc 833 BLAKE2B f13a87ab6ccf98167adfbf98a43e1baad06f6344161ac45911e81ce2bf0637a8b381f22f1bd5ef1ec8aec44e56a4c13a0fceccec613359b44f01044ca39309de SHA512 da3e3b534656fb4d8589937322e2c6cf49227f0ec0ef5d3d00149f60b8c17122b7b026bfcb2a0e0de3893c71cc3adf2f301327782ff28ee94024f584f116c7b2
-DIST ncdu-2.4-linux-x86_64.tar.gz 286824 BLAKE2B 0a0c8ffed0b0bda6b77013ca348d43e508aaace419476fd9eaeaddaaa0656e803684bb493552f09ff94e6097e2d4ac8a261d7d64d13022976e1041d49e256338 SHA512 a7e026adf351a23457377f9f6524af709022ef4f3a0646cb875a98abf5dd7487222fd79b538debff66a851eb71135743987ffc8729189698e26e1f1c728136ed
-DIST ncdu-2.4-linux-x86_64.tar.gz.asc 833 BLAKE2B 5501bbeda29ee15df09a50d64720b72c681f5aec89b05a9362b327d0b28cccb2537d5d9382e188e07a0c19e727fdcad5ddc6ce28937468e98125a18c318f6ac2 SHA512 8a70c1a76a3137c3b91b522cb6a703b566b426338cc794c6389693351cb61bb103af8ce49b5eda2f5732df490ed844fe3898499fc11a63478ee18c5e5c26533d
 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
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild
deleted file mode 100644
index 557f5c9250f3..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.4.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.4.ebuild
deleted file mode 100644
index 76fc2f6bba95..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.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 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 f88a58eadaf0..322a6c0dc38e 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,10 +1,4 @@
-DIST ncdu-1.19.tar.gz 159917 BLAKE2B 0f2022c031b4e00129525c0f4f800ed8feb8d3de3ae2c4baf06050886fb16ad4381c5439b64868abfdb66907d36e38a87ec3c8ddcd16f756da75439dc08ae6e6 SHA512 2bbfe2bab101f92674e13bef5260a39b32c127a310ae59c045f3684aaa8dab6f767c0162dc8f868d8adfaa17d597d0b3d2c134fe97bbaf205da0f8272e96c5d6
-DIST ncdu-1.19.tar.gz.asc 833 BLAKE2B ede22114375b31deb9a00de55982f145a1d1eaa911ef205e3c1a61a6382a9ea9d42977b5c1c41e3aafbfaec29e473d0ed428bb50f2e3cf799e204415b0ad2bf7 SHA512 2fb0d23c59b4f98b0080617792853de08380f769de13398f7649c082de330a4c917b6bbd846e3175f20eadbc9e4acf03d959ab828e3707ef1a9992be40b2b4ce
 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-2.3.tar.gz 56608 BLAKE2B 9fd73fba83c57195f8ffbad5b954140a776d1cd1d7b3e458f832255ee9c07eb8af9888a23ed3c671f508d6ba3795e2361f79e64b4b24630d744470efc5bfaded SHA512 283f78761b225883e090c4d0d1325bffc70049477087df3e8d1afcebc3136930c2636b2bba4aa6e43d53626668519c26a1528ba5c75489d3b5924e8974184e47
-DIST ncdu-2.3.tar.gz.asc 833 BLAKE2B fd5b6b4b6e14b8bf66f5053c637598c3a0a9ad16d29c20805d62418fb69a22fa1155c8591dac35514d088c57853043c7d6c8b94abdff793a3f7b0a53cb41fd65 SHA512 698d8f1c0a7e0267fdfcfc7823803012ab7faae6eee75af406ecc9a73244463521de851c3f2b116ae7f6d7e567ea17a7ef6aae75e135a8efbb02333525455b20
-DIST ncdu-2.4.tar.gz 51648 BLAKE2B cbe2db51b86a6ac624d3a0300bb41337ff0c8ce63165dc0f471872c0fa646406bf190d4f0605130d55d981c0a694a6bbbb9092c8857c45f362dd4bf0016b0617 SHA512 0bbc4400d05831528415c7e22d1e4b5c43cb8682c2bc35439e150763bcbc159664fee887d0fce89d28fb4199378972ffeb54c694e27b5f58d2ddaef890b055a7
-DIST ncdu-2.4.tar.gz.asc 833 BLAKE2B a0a0f3c8652242c1b3a7bab2e8eb03901bd0d8a0ecb2079ee914a08aeacda7e7c706eccef70f43a90d7190f32a3bc0eea2e3d46a9b3c29621a9e952328271cb7 SHA512 8eb6be85e7e33b2fcda3ce4c34bc4ff4a0c438b70a8d40ed91fababc728b77f0a83e0e07d70a7528821c774262a6d30cbbf73c56624d61ce3f4e93f27f1d5c31
 DIST ncdu-2.5.tar.gz 56019 BLAKE2B c10fb19f87c3d26334038ee96d857e547f9f6881518a675d9777a6c46cf456748861d84df190c14d6d2582f5ad3998ecdf9d00f0969c996221c0d1d9787570a3 SHA512 f4d499a3ab98a56667c75554c77951e4a42f5acdc1353875c108b0da469665777564405b8fcea5a731de473afacfda9f2c8701ba0ba989de1260119c64d7a9f8
 DIST ncdu-2.5.tar.gz.asc 833 BLAKE2B 86babaf8720898a5bd83a2cc290deb2f0a8041087b9f0afddd2306766b82877bbf51f45ac3622761f231359b2e5f60b8d6c5479963aaf7a6abdf67d24fb18496 SHA512 a28751371f7e7a033379fb5f5dc885c69e716f8b6654b8ee9e5eb023a22b67ca99e3ee813ddc2e335d6e8db9bd5a9a19359910a1b8aad13132f7a8bed1d67d78
diff --git a/sys-fs/ncdu/ncdu-1.19.ebuild b/sys-fs/ncdu/ncdu-1.19.ebuild
deleted file mode 100644
index 1f64c46bbaa6..000000000000
--- a/sys-fs/ncdu/ncdu-1.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 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 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-lang/perl
-	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.20.ebuild b/sys-fs/ncdu/ncdu-1.20.ebuild
index 4b1045a565df..8f86de13bdf1 100644
--- a/sys-fs/ncdu/ncdu-1.20.ebuild
+++ b/sys-fs/ncdu/ncdu-1.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~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.3.ebuild b/sys-fs/ncdu/ncdu-2.3.ebuild
deleted file mode 100644
index ac0e6228b984..000000000000
--- a/sys-fs/ncdu/ncdu-2.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 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.11"
-EZIG_MAX_EXCLUSIVE="0.12"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	dev-lang/perl
-	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.4.ebuild b/sys-fs/ncdu/ncdu-2.4.ebuild
deleted file mode 100644
index 2ee5dced948e..000000000000
--- a/sys-fs/ncdu/ncdu-2.4.ebuild
+++ /dev/null
@@ -1,129 +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.12"
-EZIG_MAX_EXCLUSIVE="0.13"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	dev-lang/perl
-	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.5-r1.ebuild b/sys-fs/ncdu/ncdu-2.5-r1.ebuild
new file mode 100644
index 000000000000..bd4cb00fd75a
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-2.5-r1.ebuild
@@ -0,0 +1,128 @@
+# 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.5.ebuild b/sys-fs/ncdu/ncdu-2.5.ebuild
deleted file mode 100644
index ae93255d2b4a..000000000000
--- a/sys-fs/ncdu/ncdu-2.5.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.12"
-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/nilfs-utils/nilfs-utils-2.2.9.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild
index ed1cb42de5ec..619f6eda8978 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,8 +6,8 @@ EAPI=8
 inherit linux-info usr-ldscript
 
 DESCRIPTION="A New Implementation of a Log-structured File System for Linux"
-HOMEPAGE="http://nilfs.sourceforge.net/"
-SRC_URI="http://nilfs.sourceforge.net/download/${P}.tar.bz2"
+HOMEPAGE="https://nilfs.sourceforge.net/"
+SRC_URI="https://nilfs.sourceforge.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..d915d61c898d
--- /dev/null
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Simple MTP fuse filesystem driver"
+HOMEPAGE="https://github.com/phatina/simple-mtpfs"
+SRC_URI="https://github.com/phatina/simple-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libmtp
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/autoconf-archive
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain ./configure, only configure.ac and
+	# autogen.sh.
+	eautoreconf
+}
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 36ae26c8d448..ccb2ec6018e5 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1 +1,2 @@
 DIST xfsdump-3.1.12.tar.xz 609500 BLAKE2B 2cd39e9f66459d75e9a254c3409279fecb95883468fc933d4d8326d00e89422ce433472c98073aa2aef8c6c4a3a1ed7e5ef94584993eb4087b2a4667187c6aee SHA512 803a3b639aef35ec882f40faeaabf381973ba2636ce0c9d06568361f5398c3c6842ffe184fc01441bf51bb1ed1b9e40b012715c09c8cc942484cc031a8eb1757
+DIST xfsdump-3.2.0.tar.xz 615312 BLAKE2B 2971608b1ae3e280cba31ffefc379995211088338926f9c3f1679c825742b585bb1ab875b3da2afd48f6cd2bad04831e5e61d0251f018e2bebf72af4009ef764 SHA512 339317a92d7fda3e63b292db5e8a6d4a107a7f2ec269d54c109b6ade2f76cd823fb53db7a3a7e8a6c4883d6ce5626c7bc85fef6741f44699a4a8dfecfaa5231f
diff --git a/sys-fs/xfsdump/xfsdump-3.2.0.ebuild b/sys-fs/xfsdump/xfsdump-3.2.0.ebuild
new file mode 100644
index 000000000000..d02e15647bca
--- /dev/null
+++ b/sys-fs/xfsdump/xfsdump-3.2.0.ebuild
@@ -0,0 +1,85 @@
+# 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="XFS dump/restore utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ncurses nls"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.19
+	sys-apps/util-linux
+	sys-fs/e2fsprogs
+	>=sys-fs/xfsprogs-3.2.0
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	ncurses? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# bug #335115
+	"${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch
+	# bug #311881
+	"${FILESDIR}"/${PN}-3.1.9-no-symlink.patch
+	# bug #561664
+	"${FILESDIR}"/${PN}-3.1.6-linguas.patch
+
+	"${FILESDIR}"/${PN}-3.1.9-fix-docs.patch
+	"${FILESDIR}"/${PN}-3.1.9-skip-inventory-debian-subfolder.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in \
+		|| die
+
+	# bug #605852
+	sed -i \
+		-e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
+		-e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
+		configure || die
+
+	default
+}
+
+src_configure() {
+	# bug #184564
+	unset PLATFORM
+
+	# bug 925234
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	# lto-type-mismatch warnings but xfsdump is on life support
+	filter-lto
+
+	export OPTIMIZER="${CFLAGS}"
+	# Pass CFLAGS here too per GCC documentation for LTO
+	export LDFLAGS="${CFLAGS} ${LDFLAGS}"
+	export DEBUG=-DNDEBUG
+
+	local myeconfargs=(
+		$(use_enable nls gettext)
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)"
+		--sbindir="${EPREFIX}/sbin"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Enable verbose build
+	emake V=1
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 99c7de42f2bd..5923efb090db 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,5 +1,3 @@
-DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
-DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da
-DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74
+DIST xfsprogs-6.10.0.tar.xz 1449872 BLAKE2B dc02fb14cd07e20d618070358700003a0990125ce3d8b15fa0248c6d494a89bbfb51c267583fc863edeee0d84069c7016f7992e750faa357618cd0d7f5748d2e SHA512 ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce
 DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d
 DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023
diff --git a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch b/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch
deleted file mode 100644
index a0b32f714d9c..000000000000
--- a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch
+++ /dev/null
@@ -1,652 +0,0 @@
-https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/
-
-From a162f061dc8c2145ae006461d661a03e986c4bf7 Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Sat, 22 Jul 2023 21:12:59 -0400
-Subject: [PATCH 1/3] Remove use of LFS64 interfaces
-
-LFS64 interfaces are non-standard and are being removed in the upcoming musl
-1.2.5. Setting _FILE_OFFSET_BITS=64 (which is currently being done) makes all
-interfaces on glibc 64-bit by default, so using the LFS64 interfaces is
-redundant. This commit replaces all occurences of off64_t with off_t,
-stat64 with stat, and fstat64 with fstat.
-
-Link: https://bugs.gentoo.org/907039
-Cc: Felix Janda <felix.janda@posteo.de>
-Reviewed-by: Darrick J. Wong <djwong@kernel.org>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Violet Purcell <vimproved@inventati.org>
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/copy/xfs_copy.c
-+++ b/copy/xfs_copy.c
-@@ -881,7 +881,7 @@ main(int argc, char **argv)
- 			}
- 		} else  {
- 			char	*lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE);
--			off64_t	off;
-+			off_t	off;
- 			ssize_t	len;
- 
- 			/* ensure device files are sufficiently large */
---- a/fsr/xfs_fsr.c
-+++ b/fsr/xfs_fsr.c
-@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd,
- 	struct dioattr	dio;
- 	static xfs_swapext_t   sx;
- 	struct xfs_flock64  space;
--	off64_t 	cnt, pos;
-+	off_t 	cnt, pos;
- 	void 		*fbuf = NULL;
- 	int 		ct, wc, wc_b4;
- 	char		ffname[SMBUFSZ];
---- a/io/bmap.c
-+++ b/io/bmap.c
-@@ -257,7 +257,7 @@ bmap_f(
- #define	FLG_BSW		0000010	/* Not on begin of stripe width */
- #define	FLG_ESW		0000001	/* Not on end   of stripe width */
- 		int	agno;
--		off64_t agoff, bbperag;
-+		off_t agoff, bbperag;
- 		int	foff_w, boff_w, aoff_w, tot_w, agno_w;
- 		char	rbuf[32], bbuf[32], abuf[32];
- 		int	sunit, swidth;
-@@ -267,8 +267,8 @@ bmap_f(
- 		if (is_rt)
- 			sunit = swidth = bbperag = 0;
- 		else {
--			bbperag = (off64_t)fsgeo.agblocks *
--				  (off64_t)fsgeo.blocksize / BBSIZE;
-+			bbperag = (off_t)fsgeo.agblocks *
-+				  (off_t)fsgeo.blocksize / BBSIZE;
- 			sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE;
- 			swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE;
- 		}
---- a/io/copy_file_range.c
-+++ b/io/copy_file_range.c
-@@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len)
- 	return 0;
- }
- 
--static off64_t
-+static off_t
- copy_src_filesize(int fd)
- {
- 	struct stat st;
-@@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv)
- 	}
- 
- 	if (!len_specified) {
--		off64_t	sz;
-+		off_t	sz;
- 
- 		sz = copy_src_filesize(fd);
- 		if (sz < 0 || (unsigned long long)sz > SIZE_MAX) {
---- a/io/cowextsize.c
-+++ b/io/cowextsize.c
-@@ -50,10 +50,10 @@ static int
- set_cowextsize(const char *path, int fd, long extsz)
- {
- 	struct fsxattr	fsx;
--	struct stat64	stat;
-+	struct stat	stat;
- 
--	if (fstat64(fd, &stat) < 0) {
--		perror("fstat64");
-+	if (fstat(fd, &stat) < 0) {
-+		perror("fstat");
- 		exitcode = 1;
- 		return 0;
- 	}
---- a/io/fadvise.c
-+++ b/io/fadvise.c
-@@ -39,7 +39,7 @@ fadvise_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset = 0, length = 0;
-+	off_t		offset = 0, length = 0;
- 	int		c, range = 0, advise = POSIX_FADV_NORMAL;
- 
- 	while ((c = getopt(argc, argv, "dnrsw")) != EOF) {
---- a/io/fiemap.c
-+++ b/io/fiemap.c
-@@ -234,9 +234,9 @@ fiemap_f(
- 	int		tot_w = 5;	/* 5 since its just one number */
- 	int		flg_w = 5;
- 	__u64		last_logical = 0;	/* last extent offset handled */
--	off64_t		start_offset = 0;	/* mapping start */
--	off64_t		length = -1LL;		/* mapping length */
--	off64_t		range_end = -1LL;	/* mapping end*/
-+	off_t		start_offset = 0;	/* mapping start */
-+	off_t		length = -1LL;		/* mapping length */
-+	off_t		range_end = -1LL;	/* mapping end*/
- 	size_t		fsblocksize, fssectsize;
- 	struct stat	st;
- 
---- a/io/fsmap.c
-+++ b/io/fsmap.c
-@@ -170,7 +170,7 @@ dump_map_verbose(
- 	unsigned long long	i;
- 	struct fsmap		*p;
- 	int			agno;
--	off64_t			agoff, bperag;
-+	off_t			agoff, bperag;
- 	int			foff_w, boff_w, aoff_w, tot_w, agno_w, own_w;
- 	int			nr_w, dev_w;
- 	char			rbuf[40], bbuf[40], abuf[40], obuf[40];
-@@ -183,8 +183,8 @@ dump_map_verbose(
- 	dev_w = 3;
- 	nr_w = 4;
- 	tot_w = MINTOT_WIDTH;
--	bperag = (off64_t)fsgeo->agblocks *
--		  (off64_t)fsgeo->blocksize;
-+	bperag = (off_t)fsgeo->agblocks *
-+		  (off_t)fsgeo->blocksize;
- 	sunit = (fsgeo->sunit * fsgeo->blocksize);
- 	swidth = (fsgeo->swidth * fsgeo->blocksize);
- 
---- a/io/io.h
-+++ b/io/io.h
-@@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv);
- typedef struct mmap_region {
- 	void		*addr;		/* address of start of mapping */
- 	size_t		length;		/* length of mapping */
--	off64_t		offset;		/* start offset into backing file */
-+	off_t		offset;		/* start offset into backing file */
- 	int		prot;		/* protection mode of the mapping */
- 	int		flags;		/* MAP_* flags passed to mmap() */
- 	char		*name;		/* name of backing file */
-@@ -63,13 +63,13 @@ extern mmap_region_t	*maptable;	/* mmap'd region array */
- extern int		mapcount;	/* #entries in the mapping table */
- extern mmap_region_t	*mapping;	/* active mapping table entry */
- extern int maplist_f(void);
--extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int);
-+extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int);
- 
- /*
-  * Various xfs_io helper routines/globals
-  */
- 
--extern off64_t		filesize(void);
-+extern off_t		filesize(void);
- extern int		openfile(char *, struct xfs_fsop_geom *, int, mode_t,
- 				 struct fs_path *);
- extern int		addfile(char *, int , struct xfs_fsop_geom *, int,
-@@ -84,9 +84,9 @@ extern size_t		io_buffersize;
- extern int		vectors;
- extern struct iovec	*iov;
- extern int		alloc_buffer(size_t, int, unsigned int);
--extern int		read_buffer(int, off64_t, long long, long long *,
-+extern int		read_buffer(int, off_t, long long, long long *,
- 					int, int);
--extern void		dump_buffer(off64_t, ssize_t);
-+extern void		dump_buffer(off_t, ssize_t);
- 
- extern void		attr_init(void);
- extern void		bmap_init(void);
---- a/io/madvise.c
-+++ b/io/madvise.c
-@@ -39,7 +39,7 @@ madvise_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset, llength;
-+	off_t		offset, llength;
- 	size_t		length;
- 	void		*start;
- 	int		advise = MADV_NORMAL, c;
---- a/io/mincore.c
-+++ b/io/mincore.c
-@@ -17,7 +17,7 @@ mincore_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset, llength;
-+	off_t		offset, llength;
- 	size_t		length;
- 	size_t		blocksize, sectsize;
- 	void		*start;
---- a/io/mmap.c
-+++ b/io/mmap.c
-@@ -63,11 +63,11 @@ print_mapping(
- void *
- check_mapping_range(
- 	mmap_region_t	*map,
--	off64_t		offset,
-+	off_t		offset,
- 	size_t		length,
- 	int		pagealign)
- {
--	off64_t		relative;
-+	off_t		relative;
- 
- 	if (offset < mapping->offset) {
- 		printf(_("offset (%lld) is before start of mapping (%lld)\n"),
-@@ -155,7 +155,8 @@ mmap_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset;
-+	off_t		offset;
-+
- 	ssize_t		length = 0, length2 = 0;
- 	void		*address = NULL;
- 	char		*filename;
-@@ -308,7 +309,7 @@ msync_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset;
-+	off_t		offset;
- 	ssize_t		length;
- 	void		*start;
- 	int		c, flags = 0;
-@@ -401,7 +402,7 @@ mread_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset, tmp, dumpoffset, printoffset;
-+	off_t		offset, tmp, dumpoffset, printoffset;
- 	ssize_t		length;
- 	size_t		dumplen, cnt = 0;
- 	char		*bp;
-@@ -566,7 +567,7 @@ mwrite_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset, tmp;
-+	off_t		offset, tmp;
- 	ssize_t		length;
- 	void		*start;
- 	char		*sp;
---- a/io/pread.c
-+++ b/io/pread.c
-@@ -116,7 +116,7 @@ alloc_buffer(
- static void
- __dump_buffer(
- 	void		*buf,
--	off64_t		offset,
-+	off_t		offset,
- 	ssize_t		len)
- {
- 	int		i, j;
-@@ -141,7 +141,7 @@ __dump_buffer(
- 
- void
- dump_buffer(
--	off64_t		offset,
-+	off_t		offset,
- 	ssize_t		len)
- {
- 	int		i, l;
-@@ -164,7 +164,7 @@ dump_buffer(
- static ssize_t
- do_preadv(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count)
- {
- 	int		vecs = 0;
-@@ -199,7 +199,7 @@ do_preadv(
- static ssize_t
- do_pread(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	size_t		buffer_size)
- {
-@@ -212,13 +212,13 @@ do_pread(
- static int
- read_random(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	long long	*total,
- 	unsigned int	seed,
- 	int		eof)
- {
--	off64_t		end, off, range;
-+	off_t		end, off, range;
- 	ssize_t		bytes;
- 	int		ops = 0;
- 
-@@ -259,12 +259,12 @@ read_random(
- static int
- read_backward(
- 	int		fd,
--	off64_t		*offset,
-+	off_t		*offset,
- 	long long	*count,
- 	long long	*total,
- 	int		eof)
- {
--	off64_t		end, off = *offset;
-+	off_t		end, off = *offset;
- 	ssize_t		bytes = 0, bytes_requested;
- 	long long	cnt = *count;
- 	int		ops = 0;
-@@ -319,7 +319,7 @@ read_backward(
- static int
- read_forward(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	long long	*total,
- 	int		verbose,
-@@ -353,7 +353,7 @@ read_forward(
- int
- read_buffer(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	long long	*total,
- 	int		verbose,
-@@ -368,7 +368,7 @@ pread_f(
- 	char		**argv)
- {
- 	size_t		bsize;
--	off64_t		offset;
-+	off_t		offset;
- 	unsigned int	zeed = 0;
- 	long long	count, total, tmp;
- 	size_t		fsblocksize, fssectsize;
---- a/io/pwrite.c
-+++ b/io/pwrite.c
-@@ -54,7 +54,7 @@ pwrite_help(void)
- static ssize_t
- do_pwritev(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	int		pwritev2_flags)
- {
-@@ -97,7 +97,7 @@ do_pwritev(
- static ssize_t
- do_pwrite(
- 	int		fd,
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	size_t		buffer_size,
- 	int		pwritev2_flags)
-@@ -110,13 +110,13 @@ do_pwrite(
- 
- static int
- write_random(
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	unsigned int	seed,
- 	long long	*total,
- 	int 		pwritev2_flags)
- {
--	off64_t		off, range;
-+	off_t		off, range;
- 	ssize_t		bytes;
- 	int		ops = 0;
- 
-@@ -155,12 +155,12 @@ write_random(
- 
- static int
- write_backward(
--	off64_t		offset,
-+	off_t		offset,
- 	long long	*count,
- 	long long	*total,
- 	int		pwritev2_flags)
- {
--	off64_t		end, off = offset;
-+	off_t		end, off = offset;
- 	ssize_t		bytes = 0, bytes_requested;
- 	long long	cnt = *count;
- 	int		ops = 0;
-@@ -214,11 +214,11 @@ write_backward(
- 
- static int
- write_buffer(
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	size_t		bs,
- 	int		fd,
--	off64_t		skip,
-+	off_t		skip,
- 	long long	*total,
- 	int		pwritev2_flags)
- {
-@@ -253,7 +253,7 @@ write_buffer(
- 
- static int
- write_once(
--	off64_t		offset,
-+	off_t		offset,
- 	long long	count,
- 	long long	*total,
- 	int		pwritev2_flags)
-@@ -275,7 +275,7 @@ pwrite_f(
- 	char		**argv)
- {
- 	size_t		bsize;
--	off64_t		offset, skip = 0;
-+	off_t		offset, skip = 0;
- 	long long	count, total, tmp;
- 	unsigned int	zeed = 0, seed = 0xcdcdcdcd;
- 	size_t		fsblocksize, fssectsize;
---- a/io/reflink.c
-+++ b/io/reflink.c
-@@ -98,7 +98,7 @@ dedupe_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		soffset, doffset;
-+	off_t		soffset, doffset;
- 	long long	count, total;
- 	char		*infile;
- 	int		condensed, quiet_flag;
-@@ -226,7 +226,7 @@ reflink_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		soffset, doffset;
-+	off_t		soffset, doffset;
- 	long long	count = 0, total;
- 	char		*infile = NULL;
- 	int		condensed, quiet_flag;
---- a/io/seek.c
-+++ b/io/seek.c
-@@ -63,8 +63,8 @@ static void
- seek_output(
- 	int	startflag,
- 	char	*type,
--	off64_t	start,
--	off64_t	offset)
-+	off_t	start,
-+	off_t	offset)
- {
- 	if (offset == -1) {
- 		if (errno == ENXIO) {
-@@ -92,7 +92,7 @@ seek_f(
- 	int	argc,
- 	char	**argv)
- {
--	off64_t		offset, start;
-+	off_t		offset, start;
- 	size_t		fsblocksize, fssectsize;
- 	int		c;
- 	int		current;	/* specify data or hole */
---- a/io/sendfile.c
-+++ b/io/sendfile.c
-@@ -34,12 +34,12 @@ sendfile_help(void)
- 
- static int
- send_buffer(
--	off64_t		offset,
-+	off_t		offset,
- 	size_t		count,
- 	int		fd,
- 	long long	*total)
- {
--	off64_t		off = offset;
-+	off_t		off = offset;
- 	ssize_t		bytes, bytes_remaining = count;
- 	int		ops = 0;
- 
-@@ -66,7 +66,7 @@ sendfile_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset = 0;
-+	off_t		offset = 0;
- 	long long	count, total;
- 	size_t		blocksize, sectsize;
- 	struct timeval	t1, t2;
---- a/io/stat.c
-+++ b/io/stat.c
-@@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd;
- static cmdinfo_t statfs_cmd;
- static cmdinfo_t statx_cmd;
- 
--off64_t
-+off_t
- filesize(void)
- {
- 	struct stat	st;
---- a/io/sync_file_range.c
-+++ b/io/sync_file_range.c
-@@ -30,7 +30,7 @@ sync_range_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset = 0, length = 0;
-+	off_t		offset = 0, length = 0;
- 	int		c, sync_mode = 0;
- 	size_t		blocksize, sectsize;
- 
---- a/io/truncate.c
-+++ b/io/truncate.c
-@@ -16,7 +16,7 @@ truncate_f(
- 	int		argc,
- 	char		**argv)
- {
--	off64_t		offset;
-+	off_t		offset;
- 	size_t		blocksize, sectsize;
- 
- 	init_cvtnum(&blocksize, &sectsize);
---- a/libxfs/rdwr.c
-+++ b/libxfs/rdwr.c
-@@ -576,7 +576,7 @@ libxfs_balloc(
- 
- 
- static int
--__read_buf(int fd, void *buf, int len, off64_t offset, int flags)
-+__read_buf(int fd, void *buf, int len, off_t offset, int flags)
- {
- 	int	sts;
- 
-@@ -638,7 +638,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags)
- 
- 	buf = bp->b_addr;
- 	for (i = 0; i < bp->b_nmaps; i++) {
--		off64_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
-+		off_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
- 		int len = BBTOB(bp->b_maps[i].bm_len);
- 
- 		error = __read_buf(fd, buf, len, offset, flags);
-@@ -797,7 +797,7 @@ err:
- }
- 
- static int
--__write_buf(int fd, void *buf, int len, off64_t offset, int flags)
-+__write_buf(int fd, void *buf, int len, off_t offset, int flags)
- {
- 	int	sts;
- 
-@@ -863,7 +863,7 @@ libxfs_bwrite(
- 		void	*buf = bp->b_addr;
- 
- 		for (i = 0; i < bp->b_nmaps; i++) {
--			off64_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
-+			off_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
- 			int len = BBTOB(bp->b_maps[i].bm_len);
- 
- 			bp->b_error = __write_buf(fd, buf, len, offset,
---- a/mdrestore/xfs_mdrestore.c
-+++ b/mdrestore/xfs_mdrestore.c
-@@ -160,7 +160,7 @@ verify_device_size(
- 	} else {
- 		/* ensure device is sufficiently large enough */
- 		char		lb[XFS_MAX_SECTORSIZE] = { 0 };
--		off64_t		off;
-+		off_t		off;
- 
- 		off = nr_blocks * blocksize - sizeof(lb);
- 		if (pwrite(dev_fd, lb, sizeof(lb), off) < 0)
---- a/repair/prefetch.c
-+++ b/repair/prefetch.c
-@@ -475,7 +475,7 @@ pf_batch_read(
- {
- 	struct xfs_buf		*bplist[MAX_BUFS];
- 	unsigned int		num;
--	off64_t			first_off, last_off, next_off;
-+	off_t			first_off, last_off, next_off;
- 	int			len, size;
- 	int			i;
- 	int			inode_bufs;
---- a/scrub/spacemap.c
-+++ b/scrub/spacemap.c
-@@ -97,11 +97,11 @@ scan_ag_rmaps(
- 	struct scrub_ctx	*ctx = (struct scrub_ctx *)wq->wq_ctx;
- 	struct scan_blocks	*sbx = arg;
- 	struct fsmap		keys[2];
--	off64_t			bperag;
-+	off_t			bperag;
- 	int			ret;
- 
--	bperag = (off64_t)ctx->mnt.fsgeom.agblocks *
--		 (off64_t)ctx->mnt.fsgeom.blocksize;
-+	bperag = (off_t)ctx->mnt.fsgeom.agblocks *
-+		 (off_t)ctx->mnt.fsgeom.blocksize;
- 
- 	memset(keys, 0, sizeof(struct fsmap) * 2);
- 	keys->fmr_device = ctx->fsinfo.fs_datadev;
---- a/spaceman/freesp.c
-+++ b/spaceman/freesp.c
-@@ -62,7 +62,7 @@ static void
- addtohist(
- 	xfs_agnumber_t	agno,
- 	xfs_agblock_t	agbno,
--	off64_t		len)
-+	off_t		len)
- {
- 	long		i;
- 
-@@ -152,7 +152,7 @@ scan_ag(
- 	struct fsmap		*l, *h;
- 	struct fsmap		*p;
- 	struct xfs_fd		*xfd = &file->xfd;
--	off64_t			aglen;
-+	off_t			aglen;
- 	xfs_agblock_t		agbno;
- 	unsigned long long	freeblks = 0;
- 	unsigned long long	freeexts = 0;
---- a/spaceman/trim.c
-+++ b/spaceman/trim.c
-@@ -26,7 +26,7 @@ trim_f(
- 	struct xfs_fd		*xfd = &file->xfd;
- 	struct xfs_fsop_geom	*fsgeom = &xfd->fsgeom;
- 	xfs_agnumber_t		agno = 0;
--	off64_t			offset = 0;
-+	off_t			offset = 0;
- 	ssize_t			length = 0;
- 	ssize_t			minlen = 0;
- 	int			aflag = 0;
--- 
-2.43.0
-
diff --git a/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch b/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch
deleted file mode 100644
index 405f2eb8a288..000000000000
--- a/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/
-
-From 37495c1600002551badb5eb16ff244b0c5ffd3b0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 15 Dec 2023 00:40:26 +0000
-Subject: [PATCH 2/3] io: Adapt to >= 64-bit time_t
-
-We now require (at least) 64-bit time_t, so we need to adjust some printf
-specifiers accordingly.
-
-Unfortunately, we've stumbled upon a ridiculous C mmoment whereby there's
-no neat format specifier (not even one of the inttypes ones) for time_t, so
-we cast to intmax_t and use %jd.
-
-Reviewed-by: Darrick J. Wong <djwong@kernel.org>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/io/stat.c
-+++ b/io/stat.c
-@@ -66,11 +66,11 @@ dump_raw_stat(struct stat *st)
- 	printf("stat.ino = %llu\n", (unsigned long long)st->st_ino);
- 	printf("stat.size = %lld\n", (long long)st->st_size);
- 	printf("stat.blocks = %lld\n", (long long)st->st_blocks);
--	printf("stat.atime.tv_sec = %ld\n", st->st_atim.tv_sec);
-+	printf("stat.atime.tv_sec = %jd\n", (intmax_t)st->st_atim.tv_sec);
- 	printf("stat.atime.tv_nsec = %ld\n", st->st_atim.tv_nsec);
--	printf("stat.ctime.tv_sec = %ld\n", st->st_ctim.tv_sec);
-+	printf("stat.ctime.tv_sec = %jd\n", (intmax_t)st->st_ctim.tv_sec);
- 	printf("stat.ctime.tv_nsec = %ld\n", st->st_ctim.tv_nsec);
--	printf("stat.mtime.tv_sec = %ld\n", st->st_mtim.tv_sec);
-+	printf("stat.mtime.tv_sec = %jd\n", (intmax_t)st->st_mtim.tv_sec);
- 	printf("stat.mtime.tv_nsec = %ld\n", st->st_mtim.tv_nsec);
- 	printf("stat.rdev_major = %u\n", major(st->st_rdev));
- 	printf("stat.rdev_minor = %u\n", minor(st->st_rdev));
--- 
-2.43.0
-
diff --git a/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch b/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch
deleted file mode 100644
index 21c2d07821e8..000000000000
--- a/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/
-
-From 98e6a32ebe3b1b0e643c27f1bbee0058c9edc047 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 11 Nov 2023 08:22:22 +0000
-Subject: [PATCH 3/3] build: Request 64-bit time_t where possible
-
-Suggested by Darrick during LFS review. We take the same approach as in
-5c0599b721d1d232d2e400f357abdf2736f24a97 ('Fix building xfsprogs on 32-bit platforms')
-to avoid autoconf hell - just take the tried & tested approach which is working
-fine for us with LFS already.
-
-Reviewed-by: Darrick J. Wong <djwong@kernel.org>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -13,8 +13,8 @@ OPTIMIZER = @opt_build@
- MALLOCLIB = @malloc_lib@
- LOADERFLAGS = @LDFLAGS@
- LTLDFLAGS = @LDFLAGS@
--CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -Wno-address-of-packed-member
--BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64
-+CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wno-address-of-packed-member
-+BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
- 
- # make sure we don't pick up whacky LDFLAGS from the make environment and
- # only use what we calculate from the configured options above.
--- 
-2.43.0
-
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
new file mode 100644
index 000000000000..04b71ff89fc0
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/938569
+https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/
+
+From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001
+Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org>
+From: "Darrick J. Wong" <djwong@kernel.org>
+Date: Tue, 27 Aug 2024 16:33:58 -0700
+Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h
+
+Several people reported C++ compilation errors due to things that C
+compilers allow but C++ compilers do not.  Fix both of these problems,
+and hope there aren't more of these brown paper bags in 2 months when we
+finally get these fixes through the process into a released xfsprogs.
+
+Reported-by: kernel@mattwhitlock.name
+Reported-by: sam@gentoo.org
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203
+Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls")
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+---
+ libxfs/xfs_fs.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
+index 454b63ef..2b8e1f4f 100644
+--- a/libxfs/xfs_fs.h
++++ b/libxfs/xfs_fs.h
+@@ -906,13 +906,13 @@ static inline struct xfs_getparents_rec *
+ xfs_getparents_next_rec(struct xfs_getparents *gp,
+ 			struct xfs_getparents_rec *gpr)
+ {
+-	void *next = ((void *)gpr + gpr->gpr_reclen);
++	void *next = ((char *)gpr + gpr->gpr_reclen);
+ 	void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize);
+ 
+ 	if (next >= end)
+ 		return NULL;
+ 
+-	return next;
++	return (struct xfs_getparents_rec *)next;
+ }
+ 
+ /* Iterate through this file handle's directory parent pointers. */
+-- 
+2.46.0
+
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
deleted file mode 100644
index fcc30d170a8c..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-https://lore.kernel.org/linux-xfs/171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs/
-
-From mboxrd@z Thu Jan  1 00:00:00 1970
-Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
-	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
-	(No client certificate requested)
-	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EBA128387
-	for <linux-xfs@vger.kernel.org>; Tue, 26 Mar 2024 02:59:42 +0000 (UTC)
-Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
-ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
-	t=1711421982; cv=none; b=BWaXePO42YIrz9dUA7DXc3SL5MWIoC+liDfJkd/1AM/cv7gR6JRGHa5e5W3sXZFsI6S6pH/fKSEijUigTR0kiRGPFWbeCiDWEGQdq6y4AChFbZMTfQSg4Jei7pONholMK08CyBQ/K4UutICyqbos2cdxAGKKjNPTIOtdQdkiHdc=
-ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
-	s=arc-20240116; t=1711421982; c=relaxed/simple;
-	bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
-	h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References:
-	 MIME-Version:Content-Type; b=O5h4CVWF9TsE/Yho55MGUjmR7zhvoPO0EhXK59BWm/HSUFB3D7vD+ozThDlpENzz0iLrKzdR6aPYBS78cRpOzAszO4ZnMf0HPbFlLmlsIHK/ha5XFPO2qrmLgOGUkKKZepgXIROIA9knDYpxuvlWHnOptPf9birJvyR0gztAEyw=
-ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkgsPgmY; arc=none smtp.client-ip=10.30.226.201
-Authentication-Results: smtp.subspace.kernel.org;
-	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dkgsPgmY"
-Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A482C433C7;
-	Tue, 26 Mar 2024 02:59:42 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
-	s=k20201202; t=1711421982;
-	bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
-	h=Date:Subject:From:To:Cc:In-Reply-To:References:From;
-	b=dkgsPgmYjqxxC1yEflpaDSaicJ6J1MpL6wH2GNkbwb7jHMXma/nM8+TuJ7ITuHQGY
-	 WXTMKAQFvTq29s+IWJaQZtuCfgH6cDQ3JTkRcjvg/OgSTo0X+aqxadBBnAjO4AP5/P
-	 hX4gszw3hlZ8oDjMvW9Wl6nLyDmR82rshZOTF4hZfQ8mkbU3Vzcsg2QiPQQzzKgfon
-	 3c/GxXIQ7V2jg37MBrPpNRYPvqBXWn1X/EkR0wuFiUtw9fTJ6Wyt0Vr6/vemAf2U+S
-	 gwHkISopsTOE3k8cCYYf7LXqmtU3PLOOqWBDol6TkWe6OgIOMSljoytIkFq1up/zhz
-	 LHrtnfD5yRlLg==
-Date: Mon, 25 Mar 2024 19:59:41 -0700
-Subject: [PATCH 01/13] libxfs: fix incorrect porting to 6.7
-From: "Darrick J. Wong" <djwong@kernel.org>
-To: cem@kernel.org, djwong@kernel.org
-Cc: Christoph Hellwig <hch@lst.de>, Bill O'Donnell <bodonnel@redhat.com>,
- linux-xfs@vger.kernel.org
-Message-ID: <171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs>
-In-Reply-To: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
-References: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
-User-Agent: StGit/0.19
-Precedence: bulk
-X-Mailing-List: linux-xfs@vger.kernel.org
-List-Id: <linux-xfs.vger.kernel.org>
-List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org>
-List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-
-From: Darrick J. Wong <djwong@kernel.org>
-
-Userspace libxfs is supposed to match the kernel libxfs except for the
-preprocessor include directives.  Fix a few discrepancies that came up
-for whatever reason.
-
-To fix the build errors resulting from CONFIG_XFS_RT not being defined,
-add it to libxfs.h and alter the Makefile to track xfs_rtbitmap.h.
-
-Signed-off-by: Darrick J. Wong <djwong@kernel.org>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>
----
- db/check.c            |    1 -
- include/libxfs.h      |    4 ++++
- libxfs/Makefile       |    1 +
- libxfs/xfs_rtbitmap.c |    2 +-
- libxfs/xfs_rtbitmap.h |    3 ---
- repair/rt.c           |    1 -
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-
-diff --git a/db/check.c b/db/check.c
-index 9d5576c333b2..a47a5d9cb5b4 100644
---- a/db/check.c
-+++ b/db/check.c
-@@ -20,7 +20,6 @@
- #include "init.h"
- #include "malloc.h"
- #include "dir2.h"
--#include "xfs_rtbitmap.h"
- 
- typedef enum {
- 	IS_USER_QUOTA, IS_PROJECT_QUOTA, IS_GROUP_QUOTA,
-diff --git a/include/libxfs.h b/include/libxfs.h
-index 9cec394ca407..aeec2bc76126 100644
---- a/include/libxfs.h
-+++ b/include/libxfs.h
-@@ -7,6 +7,9 @@
- #ifndef __LIBXFS_H__
- #define __LIBXFS_H__
- 
-+/* For userspace XFS_RT is always defined */
-+#define CONFIG_XFS_RT
-+
- #include "libxfs_api_defs.h"
- #include "platform_defs.h"
- #include "xfs.h"
-@@ -80,6 +83,7 @@ struct iomap;
- #include "xfs_refcount_btree.h"
- #include "xfs_refcount.h"
- #include "xfs_btree_staging.h"
-+#include "xfs_rtbitmap.h"
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 010ee68e2292..6f688c0ad25a 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -50,6 +50,7 @@ HFILES = \
- 	xfs_refcount_btree.h \
- 	xfs_rmap.h \
- 	xfs_rmap_btree.h \
-+	xfs_rtbitmap.h \
- 	xfs_sb.h \
- 	xfs_shared.h \
- 	xfs_trans_resv.h \
-diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
-index 8f313339e97f..fb083499070c 100644
---- a/libxfs/xfs_rtbitmap.c
-+++ b/libxfs/xfs_rtbitmap.c
-@@ -931,7 +931,7 @@ xfs_rtcheck_alloc_range(
-  */
- int
- xfs_rtfree_extent(
--	xfs_trans_t		*tp,	/* transaction pointer */
-+	struct xfs_trans	*tp,	/* transaction pointer */
- 	xfs_rtxnum_t		start,	/* starting rtext number to free */
- 	xfs_rtxlen_t		len)	/* length of extent freed */
- {
-diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h
-index db2f8c924b05..c0637057d69c 100644
---- a/libxfs/xfs_rtbitmap.h
-+++ b/libxfs/xfs_rtbitmap.h
-@@ -6,9 +6,6 @@
- #ifndef __XFS_RTBITMAP_H__
- #define	__XFS_RTBITMAP_H__
- 
--/* For userspace XFS_RT is always defined */
--#define CONFIG_XFS_RT
--
- struct xfs_rtalloc_args {
- 	struct xfs_mount	*mp;
- 	struct xfs_trans	*tp;
-diff --git a/repair/rt.c b/repair/rt.c
-index abe58b569c0c..9f3bc8d53ec6 100644
---- a/repair/rt.c
-+++ b/repair/rt.c
-@@ -13,7 +13,6 @@
- #include "protos.h"
- #include "err_protos.h"
- #include "rt.h"
--#include "xfs_rtbitmap.h"
- 
- #define xfs_highbit64 libxfs_highbit64	/* for XFS_RTBLOCKLOG macro */
- 
diff --git a/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
new file mode 100644
index 000000000000..16fed283d07e
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd udev
+
+DESCRIPTION="XFS filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="icu libedit nls selinux static-libs"
+
+RDEPEND="
+	dev-libs/inih
+	dev-libs/userspace-rcu:=
+	>=sys-apps/util-linux-2.17.2
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-c++-void.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	# If set in user env, this breaks configure
+	unset PLATFORM
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	# Avoid automagic on libdevmapper (bug #709694)
+	export ac_cv_search_dm_task_create=no
+
+	# bug 903611
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-static
+		# Doesn't do anything beyond adding -flto (bug #930947).
+		--disable-lto
+		# The default value causes double 'lib'
+		--localstatedir="${EPREFIX}/var"
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rule-dir="$(get_udevdir)/rules.d"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	# XXX: There's a missing dep in the install-dev target, so split it
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
+
+	# Not actually used but --localstatedir causes this empty dir
+	# to be installed.
+	rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild
deleted file mode 100644
index a82129f2ccf9..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-6.4.0.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
-
-inherit flag-o-matic systemd usr-ldscript
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu libedit nls selinux"
-
-RDEPEND="
-	dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-5.18.0-docdir.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# bug 903611
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-static
-		--enable-blkid
-		# Doesn't do anything beyond adding -flto (bug #930947).
-		--disable-lto
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	gen_usr_ldscript -a handle
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild
deleted file mode 100644
index 71c81d84f6ec..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.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
-
-inherit flag-o-matic systemd udev usr-ldscript
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu libedit nls selinux"
-
-RDEPEND="
-	dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-	"${FILESDIR}"/0001-Remove-use-of-LFS64-interfaces.patch
-	"${FILESDIR}"/0002-io-Adapt-to-64-bit-time_t.patch
-	"${FILESDIR}"/0003-build-Request-64-bit-time_t-where-possible.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# bug 903611
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-static
-		--enable-blkid
-		# Doesn't do anything beyond adding -flto (bug #930947).
-		--disable-lto
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rule-dir="$(get_udevdir)/rules.d"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	gen_usr_ldscript -a handle
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild b/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild
deleted file mode 100644
index e5ba87bba74e..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.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
-
-inherit flag-o-matic systemd udev
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="icu libedit nls selinux static-libs"
-
-RDEPEND="
-	dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-6.7.0-fix-porting-to-6.7.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# bug 903611
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-static
-		# Doesn't do anything beyond adding -flto (bug #930947).
-		--disable-lto
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rule-dir="$(get_udevdir)/rules.d"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# XXX: There's a missing dep in the install-dev target, so split it
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild
index d082ee12b4f2..79b39e4aa851 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu libedit nls selinux static-libs"
 
 RDEPEND="
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 99794d263e7a..6a58959b8242 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e16575003470
 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
 DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6
 DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
index 79b2c443b06d..c3bb25d6fc53 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.4.ebuild
@@ -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.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
index bf0cdfe58be6..1eb122934d00 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild
@@ -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.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
new file mode 100644
index 000000000000..8f1c08d298b6
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
@@ -0,0 +1,207 @@
+# 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.10
+MODULES_KERNEL_MIN=3.10
+
+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-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index bf0cdfe58be6..8f1c08d298b6 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -9,7 +9,7 @@ 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.9
+MODULES_KERNEL_MAX=6.10
 MODULES_KERNEL_MIN=3.10
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 99794d263e7a..6a58959b8242 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,3 +10,5 @@ DIST zfs-2.2.4.tar.gz 33882933 BLAKE2B f0026a12b7c1252bf8941e39f23d3e16575003470
 DIST zfs-2.2.4.tar.gz.asc 836 BLAKE2B 7fde4232c25056eac2fae76abec4d6749c91d285d79ae6dce4ae4880fa90a26c9fb370dfa4daaf8a849f30fcc1b63eeb215444bfca724f6750bf7e4344f35fa7 SHA512 0cb3caf01b9e4d1f0c35d9f7933a4b11560b9bbf6c05494d8a1775b0a52ac1d642aebd77ef1c7b23a0a06f92e2b1ab3d8afacce41017eb07745d148af7f76a17
 DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6
 DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
+DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
diff --git a/sys-fs/zfs/zfs-2.2.4.ebuild b/sys-fs/zfs/zfs-2.2.4.ebuild
index 71e2889ab794..950fccc9ba5f 100644
--- a/sys-fs/zfs/zfs-2.2.4.ebuild
+++ b/sys-fs/zfs/zfs-2.2.4.ebuild
@@ -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.5.ebuild b/sys-fs/zfs/zfs-2.2.5.ebuild
index 5264247e69af..962beb163214 100644
--- a/sys-fs/zfs/zfs-2.2.5.ebuild
+++ b/sys-fs/zfs/zfs-2.2.5.ebuild
@@ -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.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
new file mode 100644
index 000000000000..5264247e69af
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
@@ -0,0 +1,310 @@
+# 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.2-no-USER_NS.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-kernel/cryptodev/cryptodev-1.13-r1.ebuild b/sys-kernel/cryptodev/cryptodev-1.13-r1.ebuild
index b5a1a271a0b0..1ec7c3e4ec93 100644
--- a/sys-kernel/cryptodev/cryptodev-1.13-r1.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,7 +39,7 @@ pkg_pretend() {
 }
 
 src_compile() {
-	local modlist=( cryptodev=extra:${S} )
+	local modlist=( cryptodev="extra:${S}" )
 	local modargs=( KERNEL_DIR="${KV_OUT_DIR}" )
 
 	linux-mod-r1_src_compile
diff --git a/sys-kernel/cryptodev/cryptodev-9999.ebuild b/sys-kernel/cryptodev/cryptodev-9999.ebuild
index b5a1a271a0b0..1ec7c3e4ec93 100644
--- a/sys-kernel/cryptodev/cryptodev-9999.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,7 +39,7 @@ pkg_pretend() {
 }
 
 src_compile() {
-	local modlist=( cryptodev=extra:${S} )
+	local modlist=( cryptodev="extra:${S}" )
 	local modargs=( KERNEL_DIR="${KV_OUT_DIR}" )
 
 	linux-mod-r1_src_compile
diff --git a/sys-kernel/dracut-crypt-ssh/Manifest b/sys-kernel/dracut-crypt-ssh/Manifest
index 7d0bb32be19c..10ec61e3e732 100644
--- a/sys-kernel/dracut-crypt-ssh/Manifest
+++ b/sys-kernel/dracut-crypt-ssh/Manifest
@@ -1,2 +1 @@
-DIST dracut-crypt-ssh-1.0.7.tar.gz 19561 BLAKE2B b778d03d792c5ebe0466de7474a6cc821445fe0cd3b216f395d3ea28a17cb4ed3aa6da4b7d6dee86e4481e2ac98d677e3410cd6581c4d8c01ab0ec9564504bf3 SHA512 2958a59c3ff615e89b7631224e248e7e931dd91c566e792b10dffe09b8bd2dfcf2c55eef4e974988f19320e0d732d3dfb14b61713445e1ff3a4a9868dfc4e966
 DIST dracut-crypt-ssh-1.0.8.tar.gz 20931 BLAKE2B 2700bd7781c617b3bd44665971e9fd16727c31b0be76dfa7c121a2e77c250d830907a27e6ea43f6fc9684df0ee54a75093c62d449e5c04a16eb78d2fc572f238 SHA512 37f1f1a0029587ce19f56f5c108a6353230ccbc299b82d260c64dd73984db05ac1bf00ab59125905de95c69dfbf5e8923393f150594c1bdaeb0f70d1bff5c072
diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild
deleted file mode 100644
index 88badd7c96af..000000000000
--- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.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 toolchain-funcs
-
-DESCRIPTION="Early unlocking of encrypted systems via ssh for dracut"
-HOMEPAGE="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh"
-SRC_URI="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-kernel/dracut"
-RDEPEND="${DEPEND}
-	|| (
-		net-misc/connman
-		net-misc/dhcp
-		net-misc/dhcpcd
-		net-misc/netifrc
-		net-misc/networkmanager
-		sys-apps/systemd
-	)
-	net-misc/dropbear"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-
-	# Fix libdir (hard-coded to "lib64")
-	sed "s@/lib64/@/$(get_libdir)/@" \
-		-i modules/60crypt-ssh/module-setup.sh \
-		|| die
-}
-
-src_configure() {
-	tc-export CC
-	default
-}
diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8-r1.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..a23395d222fc
--- /dev/null
+++ b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Early unlocking of encrypted systems via ssh for dracut"
+HOMEPAGE="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh"
+SRC_URI="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="sys-kernel/dracut"
+RDEPEND="${DEPEND}
+	|| (
+		net-misc/connman
+		net-misc/dhcp
+		net-misc/dhcpcd
+		net-misc/netifrc
+		net-misc/networkmanager
+		sys-apps/systemd
+	)
+	net-misc/dropbear"
+
+src_prepare() {
+	default
+
+	# Fix libdir (hard-coded to "lib64")
+	sed "s@/lib64/@/$(get_libdir)/@" \
+		-i modules/60crypt-ssh/module-setup.sh \
+		|| die
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/sys-kernel/dracut/dracut-103-r3.ebuild b/sys-kernel/dracut/dracut-103-r3.ebuild
new file mode 100644
index 000000000000..7a8eb9223741
--- /dev/null
+++ b/sys-kernel/dracut/dracut-103-r3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"
+else
+	if [[ "${PV}" != *_rc* ]]; then
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+	fi
+	SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-ng-${PV}"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-alternatives/cpio
+	>=app-shells/bash-4.0:0
+	sys-apps/coreutils[xattr(-)]
+	>=sys-apps/kmod-23[tools]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/openrc[sysv-utils(-),selinux?]
+		sys-apps/openrc-navi[sysv-utils(-),selinux?]
+		sys-apps/systemd[sysv-utils]
+		sys-apps/s6-linux-init[sysv-utils(-)]
+	)
+	>=sys-apps/util-linux-2.21
+	virtual/pkgconfig[native-symlinks(+)]
+	virtual/udev
+
+	elibc_musl? ( sys-libs/fts-standalone )
+	selinux? (
+		sec-policy/selinux-dracut
+		sys-libs/libselinux
+		sys-libs/libsepol
+	)
+"
+DEPEND="
+	>=sys-apps/kmod-23
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+
+BDEPEND="
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
+	virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+	# Gentoo specific acct-user and acct-group conf adjustments
+	"${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
+	# https://github.com/dracut-ng/dracut-ng/pull/507
+	"${FILESDIR}"/${PN}-103-systemd-udev-256-kmod.patch
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	# this emulates what the build system would be doing without us
+	append-cflags -D_FILE_OFFSET_BITS=64
+
+	tc-export CC PKG_CONFIG
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		# Tests need root privileges, bug #298014
+		ewarn "Skipping tests: Not running as root."
+	elif [[ ! -w /dev/kvm ]]; then
+		ewarn "Skipping tests: Unable to access /dev/kvm."
+	else
+		emake -C test check
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		NEWS.md
+		README.md
+		docs/HACKING.md
+		docs/README.cross
+		docs/README.kernel
+		docs/RELEASE.md
+		docs/SECURITY.md
+	)
+
+	default
+
+	docinto html
+	dodoc dracut.html
+}
+
+pkg_postinst() {
+	optfeature "Networking support" net-misc/networkmanager
+	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature \
+		"Allows use of busybox instead of default bash (on your own risk)" \
+		sys-apps/busybox
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2[lvm]
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm sys-fs/dmraid
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		virtual/openssh
+	optfeature "Enable logging with rsyslog" app-admin/rsyslog
+	optfeature "Support Squashfs" sys-fs/squashfs-tools
+	optfeature "Support TPM 2.0 TSS" app-crypt/tpm2-tools
+	optfeature "Support Bluetooth (experimental)" net-wireless/bluez
+	optfeature "Support BIOS-given device names" sys-apps/biosdevname
+	optfeature "Support network NVMe" sys-apps/nvme-cli app-misc/jq
+	optfeature \
+		"Enable rngd service to help generating entropy early during boot" \
+		sys-apps/rng-tools
+	optfeature "building Unified Kernel Images with dracut (--uefi)" \
+		"sys-apps/systemd[boot]" "sys-apps/systemd-utils[boot]"
+	optfeature "automatically generating an initramfs on each kernel installation" \
+		"sys-kernel/installkernel[dracut]"
+	optfeature "automatically generating an UKI on each kernel installation" \
+		"sys-kernel/installkernel[dracut,uki]"
+}
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 72d9297b5011..87712e61b461 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 edo optfeature systemd toolchain-funcs
+inherit flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -76,6 +76,9 @@ src_configure() {
 		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
 	)
 
+	# this emulates what the build system would be doing without us
+	append-cflags -D_FILE_OFFSET_BITS=64
+
 	tc-export CC PKG_CONFIG
 
 	edo ./configure "${myconf[@]}"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index dbcef4478a63..60eca57dcb81 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,141 +1,99 @@
-DIST genpatches-5.10-233.base.tar.xz 7166884 BLAKE2B 5e1b812e33adcc648e6a85d90fffe60e51c6f9e5e501aadfc2ac10450ea15ef2409ee3f20a54c47c0d86f04f04240b76ca0f9605e59f2ee1c1dfe1cf98541cff SHA512 9fc7b0ff029dc29c405eccc5eb550d10e3448bce7213f9ed3f9f646f52d95ae0b39d7648a824594f87c60cf6ce46354c6d4a0045d7d8cf4efa13c417b9e3210b
-DIST genpatches-5.10-233.extras.tar.xz 4048 BLAKE2B 8f7686f1815ec0bcfe333c237ad1734276a77b169d6d1f5bb235d6164365bee953919f0fc26ccec2954b1d1aaa250ffdffc1da85bbc5559f4e3fc0be6ba2fd8f SHA512 50646414ca3b5990e92da42550a8beb94ba44f428edf92a94286f20421fe396a9d6e53dde8278a64a3c99020c0a217b104bbe527de60d1d5acde362e61765de1
-DIST genpatches-5.10-234.base.tar.xz 7283988 BLAKE2B 7429eee0f5adb684e437369df9483c79d6411a1c102026ad49023b364a66704fc98195da228601748ad2d7a51900e9558bda9af3de716e07a6f1437ba4941626 SHA512 3bb6bb844aa76c14aa3d8cf4b8641f6492df414c12ca4f2900d18de7b818fd6b93f55a83bac5259f6980740cfb820e24db28950083c81e74399d75b033667a62
-DIST genpatches-5.10-234.extras.tar.xz 4056 BLAKE2B 0710e06cd3de7af3bcfc9b93db861bdffe880e427220ca594ea1c5c261f273022086c4202c0a362f46f85da31233e7b24b12c77393a0d0a0f87f553470115578 SHA512 d4a09984b3ea6207e88bdbbdff8c5ebfaa433af7ebbe3650730b1b5f483c4ffa97fd6f8815cf35d3b865140699e9904151712de627c9f6769080eb71a89ca4b7
 DIST genpatches-5.10-235.base.tar.xz 7367252 BLAKE2B ea3261b363e415112f0a13f4666dd226a33ad12962d481532875e7e8551ef739a55ebfee344a299368b3cc48cb1c2a465fe4151ec708983d1daa70f9d36f849f SHA512 bedfd9382d35a151c0b7ec102614d8a1f9866876ff4e308867803c32416db31d34197c26b6dd781c9a0c994e49df33de943975cca8ef9b99680916f2cdf2f325
 DIST genpatches-5.10-235.extras.tar.xz 4056 BLAKE2B 6341fe389c77377eef465c9a92587bf370a56ecbbb65ec99eb2002e1e9525ad6a6fa1aa60f7ea28b52729a4779e236c706155f98a336358d12d1bf4c80381660 SHA512 d14506f3b69069682ab736b96116e58420974b77d99a22818601af7451aa07ee564dad10bef321f288be4594b6990b25521518865fcb111d9886aa3c1681f977
-DIST genpatches-5.15-173.base.tar.xz 7038704 BLAKE2B 4cf6ffc38ba49bdcac210b165c9ce951283ec083f928ab14f19a16fd46e195730d169f50b45f8ff05e5d8ed2cf9164f4940659ea23a0ee9add30dc2e6ee83f84 SHA512 d875a5a2eb58ca5e0659b2cc2a360c5e837e73cb479508c0c8350456e58019025c96278727ab9877a103138d2e41653efee51ea3dff0bcadbd7da0e076a244ef
-DIST genpatches-5.15-173.extras.tar.xz 4052 BLAKE2B e7d4effd4092467275f3f076676daa06caa2f647da1173a6132ebc30da1be78a085ddede5aa170c3d666f1808c4824f441dc5a1e873868fd72347a0c84149fff SHA512 7d272e7448a6688efc98a5e71eb8f83a978d82e9b177ae0b9b12c479078e23fb8dd66021f1ad488d9bfc056c89e7ee8642425dbd15607eaece249b565edc7fef
-DIST genpatches-5.15-174.base.tar.xz 7146696 BLAKE2B 02aaa04e156b848c1303da831795e48f038ced7134453cf1b09534df9ad46888ea807772af161b1c61a679a5c6adabe6a275dea97f425ba10d003ca9391af0b7 SHA512 cfc7e7e878d9f1fae329ea4103c785c7cda26bc37f0015a37dc1a5c79842b98a04923e53177cbf1977396a0fdff5fdc62d176642999a5b6fd89bfa9bff251597
-DIST genpatches-5.15-174.extras.tar.xz 4052 BLAKE2B 9fb303cfcdb5f201b492996383adffa71543531d4b8cb77df076ceb994f2e4af2e1d510b0bb5fda77f505034ea89935efcc8ac5476970e6d96dcec01f582755e SHA512 9ede39e030d45bc668112f489cf0d4c22a14302d26f1a0e1bb9f53b0e42a16a99a24215211c1e510c7f052d00fbe294f70cc414b2d127c4c6e9ba4857ebfce72
+DIST genpatches-5.10-236.base.tar.xz 7402184 BLAKE2B 24f0283c2dcc8c4854be2b70018143df53d090df3be31f7a17de5a8c2b2a342c864b3f610af9de1dba3046a5ab9ca7ab5460673be55d36d88dcda7c384d08231 SHA512 1993249aaeeb39905846030c652bdb9c4437e43f6fa5fcdc87f6578f8583cb500aa2859c9b0026cb45b25319e53ee11526a16ab1f322aabbdf3d3b9b5da36b59
+DIST genpatches-5.10-236.extras.tar.xz 4060 BLAKE2B b79eccc56c3eb9c3dc96ae67d22f4fd5144ae9c00fd948a31f6f6346bd76cb04933578bb22234e698b94f0caecf5e4fb3b57dc2190d5e87f017e19823cbefc90 SHA512 613f3fb02ff10f2320a0bf7861763f3d06c48b7f3bec0925d8d5e341744cf0c2c6396c17c277a4e1d5ea45fdb5fb88845bd5b6975749274e67dcaef183b7ba3b
 DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B 6911fc0fcef31daa55ddeb93e121acf4a95d130866f37ac0113a8697df1996c13bbf65e14f4a5703f7bb3f4dd3ebfb29e258ca358d191c0580a7f8e61fbf7c0c SHA512 3fc49566b23ef50590a3b9f90eb99558c9e37847259e0defdfb0ca036c37b7f45c4989d58787b8488c67ea031114173319346c1c17799680ebfdc581ae7e4588
 DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B 1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7 SHA512 8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041
-DIST genpatches-6.1-110.base.tar.xz 5564556 BLAKE2B f479e7fc7a12222c9b0268825fc8200e5bc3d73b81cd2d5b64bd321bc66b4563ae17d2bb66a0b0610dbac3059564b856d16c6ee122ed51a4c72d18795575ea65 SHA512 a0e8beec29ec7c63fbad02d13acf561ae694847d482f34a9120a06692aa4df1440433b19027484d3ef6a50221411bf34d175a4c833cda56aac4578da8b0b67d5
-DIST genpatches-6.1-110.extras.tar.xz 4052 BLAKE2B aeded3974b119221fe8546f59eaa9a89842b24c0dd7d1ea45be003dbf91a62194b04d01e9811abb4a4af21b0e7b77e35b521a94f6042954f6fc09958fb41a84b SHA512 729ba854dc3513d9149860015013ea8e539bbe6adca5a28c53184fe0cb722307e96998c26dc1966e25d232e19e3188daf4adece4692d2804132ef956267629ee
-DIST genpatches-6.1-112.base.tar.xz 5686744 BLAKE2B 2a45c958031096547d8db5c43413057444bc76eabb91937554f78c9beac08318cba3ef890e455cbdd85f0b08e6d759a2374237a2be75293812df3bc68fdf1663 SHA512 c0c2a19af8f2bf1e76d89e084eaf4fa733bf868c11b3263f983b060f4cc7d82869ef1659939d097acce33339e25ed4f0b0f3144499913fb1ace8aded593d8a24
-DIST genpatches-6.1-112.extras.tar.xz 4056 BLAKE2B d592f37cdd0c21afb347ff53965f6fc9ab962b8ad48d666cbc55dd91a32701918669b8fe8997757aa55d5923829c237aa27b7d819faff74dbac2fe88b5863fca SHA512 aff46e4c47e3e0398a8d371a8821afd7d6d7ee33997834dc5532e007e8b69b333705d6978f0a32496073eb6d06607cb34626a1bc932376361ce2baa9587f918b
-DIST genpatches-6.1-113.base.tar.xz 5796104 BLAKE2B 0b6ca23a1a97810646b3424764e71335f6749ac5462ef5b6baa37b1873b106cce103654b8efa8c91fb137fb253638bddf250247b2e4db8e160e2ea714eb23cca SHA512 eef7a965a901e749a60b3f9486d8c281d353c47637f6468d53521771dedc26de3dd8d9582adc72da4730f55dc5f1b5a4555f03281c3a836d1760c40920464446
-DIST genpatches-6.1-113.extras.tar.xz 4056 BLAKE2B eb8f6f49888245bc0f9b174f326a19658871dd3d2c34fef83514469b14d8a7ea84c0efc17f988143324779b571251881732d906975902ae77210eb7a20aec938 SHA512 09b36640d1c31ec865031810254ff2613e0945634b8afb54dfa9c4c22924b1e37f53559e9a7bca9307c2d0c15b0cccfbc588fb795b7eeb38d0f33e050ab53de6
-DIST genpatches-6.1-114.base.tar.xz 5814096 BLAKE2B 676bdc7fe3d68811434a210499f256d02ae7550ce9924175c540cb918e001f3360f1be25d88424d54fe4e1fb8918b07cc17862ae12bd714c38a165607842ac95 SHA512 5076776da85531ca7294150059d87df890da88e05da9eb308938131eaa86c1ad3a542f5afc9259ada433caf001ea8c13620ffabef11d1ada08af83c0699405a0
-DIST genpatches-6.1-114.extras.tar.xz 4060 BLAKE2B 649cafba566d627d5a302874710ff22c6d102e5a93aa4516815ae07fcc0e7b965c0b4b4c8850e22ccdd4ac0f7e447d2a5a59edeedb0f89ac4eb5e68df94a4f3e SHA512 07126cc655b3690ed7ff7399e385ce4dfada1e0e1a16f2e80fe5f0f0bef3ce4bec48f9527b928646a600353537e362b23242fb40a3a8bc5ad69ad99daffdab56
-DIST genpatches-6.1-115.base.tar.xz 5849032 BLAKE2B f506bede128cceac85af1219dd60f46753f80c2d2e7e23c1940c5e7114ab4ec489f94e839c24fa5fd8ff0f2ff72c60b313d66fe95a480026851cfd30b05ad6d6 SHA512 b91b4cdb568e4eee159ac1cf36e18afeb384cd96402dbeac53d6af2d03f1cf496a23a73400487d32f0808cf1dd01929e5e031cf5c97a8f027d4bf6e93860b726
-DIST genpatches-6.1-115.extras.tar.xz 4060 BLAKE2B a7c40e52a42d0a1d7438bdeb658a427251fc3df9d9e5e7be3f6ecde3242a286d686adc356234b5e0fe0a7c7403d5f4b422661570d001fac0f590247bbe519f6a SHA512 97706920ff2f3e965f499917fea7a9013c191083114635147c759f1277c63006cdbb59c60bab40064d43a5d8cded27c17ee1f56536f766ca839fb045c428e810
+DIST genpatches-5.15-176.base.tar.xz 7318820 BLAKE2B b7b87fa0ff1bde133cd721f87599163aa4609b3416677850fb30cf2b7afafff316bd50ba7301e658670c1abfbc81c29a0a40dbf1d8d6d2a7bd016f7a27bd9c01 SHA512 d4e5df70d7c28f0f39eea7b88fb27d76d4773ec41c52021b87cd2e84578dfb3421c641fbd212fd2f8961cb0dbb7f1e6237f13c5a3a1c348fd777eedf88b70ea2
+DIST genpatches-5.15-176.extras.tar.xz 4060 BLAKE2B dbef39ba2f6c2132b27632ba2dd57f0d33704d19df5c775b2fc8371d64c7b02519443fa847d1d7e16567ae8f27ac6de6f12964b4263c81629d4cffcd77dba1e1 SHA512 850f1fe5bb8d8cbee8cde9e7f84233104955390829e0c95c0c43d27d95a4416dbc3881f590d4475d0921f88d26c98f100195a3731e6d9130d9f9f346d916bf5b
 DIST genpatches-6.1-116.base.tar.xz 5862440 BLAKE2B 57df84154c9302bfc602035d8b06ec4b8e2089e8529d8a425c6912c46ca5d7f5782e60efc1600b085a1e60f4f029376485aeeafb6890bab20901df152c18bf25 SHA512 7467a3963981f8862a0898f4baabf95d25c4bc13eb5cc41b28307d48150bb263cd34be392f6e0130e053105f385ae963b03d306268c9eec3cc0e807cd3e56a7a
 DIST genpatches-6.1-116.extras.tar.xz 4060 BLAKE2B f1c06b3d9f005cf93a317e051104af5a5838dda32e7d480d67655d26afa636741053da4e3c39aae81593cc12708d829d4a8f9e167346d6b038c4b72bf70c9626 SHA512 3ff2f66f10a0158c9890ba629cd0d0bea46fbf5ff899dd4a0dbdb70c5aefb2ab0ce89c316a76441d0dc500e740f79b15568209a4f97b82a1efb0ef088ea00d36
-DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B 3dfb069409ca8c1cc8022daaeda3f45443c4e11ab1b086d8178ae4bd7e9a77fdbd8016484324248370bfa4b92e1a10cfa67d40592fafcd8540cc917c60b52ea1 SHA512 ea2f80b065c59b485446c8acc174b93a688b9e6d5de8cd9bf307a43811f6087368b528647a2371636b22dc082735b57e470e9c5d1092972c3890a9c628db723c
-DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0 SHA512 765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60
-DIST genpatches-6.10-6.base.tar.xz 257104 BLAKE2B 13309e86f5b16ff79797736ac91214698afb07ebc167eb22bbc354432f64e26dc3c19e0e4bccaf4fac7f0c858b7739317db3ffec9eef596eda5c2a45e785bac3 SHA512 55c009415c1b03c02a5e0251c8a12adf9eeba0fa7010cde100735880332127bda25bbbc59f9105c091fbc5bd67d7bbcc4fe02fbf4de7bee645bc679649ca3a67
-DIST genpatches-6.10-6.extras.tar.xz 4056 BLAKE2B 746ea837c1ba5ed7a4385b2f60be08986ad43f0c2eadebbda940d4cc2f7eabdef830459c55c183a68b63be318af661a8bffa25bc5da37628efb1f59987724c8e SHA512 63929e552c0e648245f8b7af72478bebf3a19be2f9aeda2d37e68b02611a69bb171338228c1c1d46b352236f63c3b514e24ef4f0260e0477d487d02ffd99ddcf
-DIST genpatches-6.10-7.base.tar.xz 309388 BLAKE2B 7c1b7e7ef111b090d54c616d2e4df14d2f914c0e5b5a947c27781c237de9ce53d42c4cb9c6b55b3e0711485a0f28bcdd484babb0ecd2d3e0d508712f3e5e8979 SHA512 828c4638cf3b29e2513bdc418cce2ac567b593a9c2b710c564c49193790e5268e2be5a37d341f3b2aa08a59d36f59019021d3d5fc5a2ec7fd4f45b643d686801
-DIST genpatches-6.10-7.extras.tar.xz 4060 BLAKE2B b07e59e37eca5c1a3fabd0d062c67f35f404244f93ae10b423d6849ff4d141fd184619d93551014ddc02db0c3379b8b2c486f71ecc798c1a53c20ab5a5a6a426 SHA512 0938b6a622b8b9e6e251fdf7689d972e1aa0a78ebd1cfabb7686298286f87bf9f0e30fe01f64205f775d90e870cb2cc3eefa73b49100a82ae01a6399376d6e94
-DIST genpatches-6.10-8.base.tar.xz 391536 BLAKE2B 636997da732776bccbfd9dc0543a452bd38a42876bfa46b4ec97034880fab320017de72c50b87ee2e7813d1231babed5b2649e65f603dd65dc4280f119ba94e5 SHA512 f2b23a7a244c8cead4b5644d3c7b34bd1ac890e8822f673a663f44902bcbf85b00ddc3dee25664636f3ccc6893bcc89358fbe7733d89c8b2f681c4e6b6076da2
-DIST genpatches-6.10-8.extras.tar.xz 4060 BLAKE2B 62f1c87268953d69bc08bb9a601d8b446c31c5d76a50d0c3f67d8048b24e1fa5327fe5ec8cfcad95bc83a39dfe7daec856a23775e9f797241cca30fe8935c13e SHA512 a2925de9fba3d5bfcefa81a01ddc919e8dda835a433b952deb455a1c7065f4272cb26e363408b2fa92ca9b2039fb596a4b99395546b04b3ea96129176f5613e1
+DIST genpatches-6.1-117.base.tar.xz 5955428 BLAKE2B 92c1aeb4d98cbdfe8d83691c76e53f894e5749805bff33676263b19b67eb1315012da7ad5df5cf129406c0a0f1726dc31cdc33941eb2c27db699f04333b2729d SHA512 80fdb4aa7531a7b10bc543d8deaf2b82115f9b74112c53f787f9fcdfbf83c626390c4e81a6811874263753c74b0adc19cde44f6a54c22f6ada7e774e7a2247b1
+DIST genpatches-6.1-117.extras.tar.xz 4060 BLAKE2B 905d6488cd4f499e293bd6f2bc0d9ac16b073ce543c8cdbe76aa6faa2842ed78fcd42568ad53d3f9c56e7a2065a0fbc63412988aa801bc6050897459f8d8d39d SHA512 c6b4b85b6d02e04383c59749965776f13fa22719c4527b030862831237355be9e05e655b112489efadbdc0fa5574a2ca0e5f57948d4e1323febd9bf20f2da8d7
+DIST genpatches-6.1-118.base.tar.xz 5971280 BLAKE2B 361e76404976baf66412e6eed6e7158758a717f0c7f47d7c6e8d1e6f6f78d2a20762e98054b2b9318c5d0e18ec66ab68b54d914e87e51d1e02d7d20c44a8722b SHA512 465d6e70f75bd3cadec5b324e418a93e461ada9a14d5501736190f61627f82e44271b9513a20add99d230ada8bf2666a3c431b152e69363403883b125c607d5a
+DIST genpatches-6.1-118.extras.tar.xz 4060 BLAKE2B 4c070ac173f5504aad3970756c78f48bbfbdba6f690b412ac3258e866a92851b631c1d7a19974dbea22bfd58fc784d39a41499f8add80df90c3f26bd23c5adce SHA512 7a0b27f54e544db7290c371a88ad7544a8e03f04172f3fa063dae05118f2ec5eb76d0b78dacfa87122371ce3a584cece17ea0ceb7003d5fad3a1ff97e26f4696
+DIST genpatches-6.1-119.base.tar.xz 6000764 BLAKE2B 1867fee7c4a1e50bc7b59ada634ab0c154d7c033faafebf9429e1f181d2a6db3c6a3b2be30384fc057c5390d9407f0ff0b4eafe8b527710e19f0fbe24335cdf7 SHA512 efb447fce7090a28fe8ff7c88296bda5d424dbe9837fc9a784f78435c810421966ed0a46e3c38631cf00fede81be8379144ad5d38f2dde2b65578a89016fe623
+DIST genpatches-6.1-119.extras.tar.xz 4056 BLAKE2B 52ecde24bf197791cfe5be801d881d26904b4503bd3e7857b6a6a2ea1e08fd0262a7e01de498854a931c5407f90d1b5dc73fabb3eb22dd370445f7ca057de0a1 SHA512 088e01360229386b880b2be615c0661c2c247a636a4d4810675fdf576bdeac3bb1d487dac6ec72ad88f4353e418289410f504b432fa8dea61b299e2f596370c8
+DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa SHA512 3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
+DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
+DIST genpatches-6.10-11.base.tar.xz 553020 BLAKE2B 11a958ebd8848d9023a9cdcb877039ba04f72169ad78e47661890d31b73ae7a9fbdec8d12507a1d16eed08ba59f4a6fdc38ed8b6b02d05cb44198dbfcfef31e8 SHA512 3a3c1e5cbee053ab4c9c731bafa723ffcdfc8179e62fdc0eb16469a15abb5fec8ef4ff395305fd4502ea9cab70702e071f6cf9d0397cb185a987e8fbc880123f
+DIST genpatches-6.10-11.extras.tar.xz 4060 BLAKE2B 98d5747be50ef0a270a561f379946213cb32596e01aa6da66a3cdd8a57dbea491af4265b052bc9fb1089e74818e249ac85228bc85aeffa34f8bd18396ceaa18e SHA512 e1ba5f037ae58c9ea4434f60817b53282494c8d25a659a0b6d9b75db384f7706b122bde225640e2028cfc36022a6cb0d1b5711685a4a265c75f3592c278a67f6
+DIST genpatches-6.10-12.base.tar.xz 602316 BLAKE2B 6cd02be7fbe2322d246e826d04236dba2ec5b40acc9c8575fd7a5d0d745cd0629778176e97db920ea198e939d332407d9dfa2f369ea4e075be05197a1ba7ef8a SHA512 595e302e05256994ad0077f41c6d6c3677eeb64a7cd1b11c823c689822d4d257bdd8b722b22542fc779e777ffc28f782f7bf69e8a0bb6ec3f3d2b111aaa789fb
+DIST genpatches-6.10-12.extras.tar.xz 4060 BLAKE2B 77b8b8cc0ed8af03ca45e1224e6de1f14d59682aeb411488e4c5eb6f9f4252a50ae442d60eeba496491c62013c7f1cb7af9f7e40622e1f48de7f0b85c4686c28 SHA512 95cf8c15fab7ea99e7c55166d445494d85cf843d9bc32e3055789ac20d725b52687d1077890c22aa39719a9d0fc7745b0d3346d014077171b1009a3a353f04f0
 DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B 3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11 SHA512 9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f
 DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B 2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952 SHA512 358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
-DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B 3ece4f33cce7380d247fe1f3182e2a516a8e63ce1952e30593f228afd4f11b67d838a0374698b1c3f48992ce04f4b55fcc258c8a41bf2821e01b6c4bd4829d07 SHA512 2a514a91d3e7b8e51330f6852edab7d8481dfbfc84fad4415141dc3d0c68865f19724480a2403e86e080d368004d26669f365de233b6dbe9f664946dc168e853
-DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f SHA512 9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197
-DIST genpatches-6.6-50.base.tar.xz 2671516 BLAKE2B 356a9a17f69416423c37c801e715dd4b03d1ebf02411a3e637e3790b4adba44db6c04f51f19a6da4ba420332cd5af1221692dcfc2ee1101825a5c8a8885c2e44 SHA512 e7a74df4659bdd54bf0bdb4aad8172bb1374aa563a19d28cf9643d034b59aeb55343ff5048d3aea42ddcd7561f0f723f951ab1f00c05e5ad88d20e70b7c3069e
-DIST genpatches-6.6-50.extras.tar.xz 4060 BLAKE2B 57044e169841ec9e977b107ad32741262bf3f1455638db2d105e160f2ccc21a6dc6bcd75e09e7f0761ffe3c1879dfbaf39bbef8150cd0de407875f2bbbfd700a SHA512 5c0d55dce1f869f79ec0db577d282b078ceb17667e5b18ee1abb00a6f94ee82978039ddf9650cbccfa1b8f9b99abd48057c44b230510bebe17d890e316d6c7fa
-DIST genpatches-6.6-51.base.tar.xz 2817576 BLAKE2B 42dbf8663f53bc7196c57c7cb93029b780354e6e1580405b08a34fadd2ea38302c37bb4559df4c65916b0ec2f98c61f7eced52fc6be3de0d6dbe7468dd3d8c22 SHA512 fa25988574b06ad59403b1858d97f70fe0e6056d0b889d8a6e56f44b763146da63a952a2b7361f3bcab1aa34c9a3a97f81a35113a3e5173a2e09b704e54c386f
-DIST genpatches-6.6-51.extras.tar.xz 4060 BLAKE2B a9e7008c67de6095d6c97bd6fbe9f7359e71d0b40aeb11a0ff14a0cca4feea199a3895bd9ac086d3f011b5c35a98f46d5856b8d27ca7438b8979203ff9164155 SHA512 fa649b918f1bcb7dbe4670a30dbbb47bbf8d57da73724463bc8fb5664c527f082a02f06ac96ff6a538469fe73fe0978f97bcf69b64a1a8d488387ff5a06844f6
-DIST genpatches-6.6-52.base.tar.xz 2852888 BLAKE2B 1f393bb3b90106ebab46858e2b7c2b3c0ddcff3238ee3bac594ced79e09fdcab47596859004e2aa5ce3ec9bb2acfb33d9afb9a9350de1c549cae37589f0f4755 SHA512 ce0adae3031e902dcacedddf799667a71ae3bfd5186bc435e30f266e2ce850f51e73f0ddc3d4ab2c62a3b485a55623ec00c4a57c98524d1681a1d4b4c9c2dee6
-DIST genpatches-6.6-52.extras.tar.xz 4060 BLAKE2B ba934440bce51a7d2497cefd4f98bc48bb4e1005e038bfce6d8a13660ffb9f3e3d21fb260293b5717722811c600eede8e4a1c5f2261d42da7178005ea95ec9fb SHA512 74fb01d8e49647b1f1ce134958218ec47eaf7983c55c01724a266ab29813c5878bf98701ba4af80ed1a6349d6799e7c1ed64ebe7a47584d79b38f66f91a9ce97
-DIST genpatches-6.6-53.base.tar.xz 2894996 BLAKE2B 68c68a4f3ef4ad60204cd06f86a3cb54810427d93ffa55d7cf08265f759cc9d789ade864b19964cb5c5ed0cb48cd8fc309590741bf9a02f97e226a7bff8b80ff SHA512 c328a28a3954b993a82024cda27720ac6667ba48224bd40f08e3d9a197173bdfecaa686fdde2cd96353b7fd38137091eeb6d9889849971d21b21ae91eeb6069f
-DIST genpatches-6.6-53.extras.tar.xz 4056 BLAKE2B fcc3c11e40145badde05428b03da9323a440357525d6f0f08112dfa6c2c4f170ddbb121f6d38503923eac0c1841ce697d0cca0654784b39b048a40303e8a11ba SHA512 8fe3053597ff48c9f4669faabcb9165e1f64454c2f5993a80a04ad124eb113361369cd2607ee40bdbfc0dcced95ff57381beca9b0ff7982d14dccbf3048144a9
 DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227 SHA512 102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
 DIST genpatches-6.6-54.extras.tar.xz 4060 BLAKE2B 22ea7d143bfe168bc5d9d30832423bcd33b49c1b3b5ddf031000d7d9fce96f6fa0fb1d06fd33b27a5de9c9f3833a139557f0ed7408ef12b23568784ff38ca7a9 SHA512 1b1a229b5923e7f3426139b17608b5feae6061313f7aea66de23f09a54696def39bf4b384c4e884a3e5c758c08e04dcfe1ab7f2aa331db74b59f5e511c6f2c5b
-DIST gentoo-kernel-5.10.222-1.amd64.gpkg.tar 63252480 BLAKE2B 0641338128a2f1fe65e42d8cad6c448a3bd195d40df440140f90412e306d30465e4895fa56ed101123b1b8690fbcd262549757adbadfe86812d66632c3e17cdc SHA512 467bf18300ad9db1aedcc39aee5168045c41e6dcf42b01df8b7ae46359ff0db0e52b8d2f9612351a268d335e1f8101884c98d798d94bd70b7cb21e9378a61be2
-DIST gentoo-kernel-5.10.222-1.arm64.gpkg.tar 56750080 BLAKE2B d7fbda9b506ea787765386d9cdca0652e400b2f2e08a07e1facd3dad2425fc0ed0a7437cae5abf482ea23cbd4cf83420e4c4f9922cd732b69a12f6bd595897b6 SHA512 b2587672993ba411f5dfc707edcb9ada9ed8390e9c01814dc763f09a5cca5bf74f1866e7e25bd836bb45d75056d2687daf6392db934be01272d1df279d3b271a
-DIST gentoo-kernel-5.10.222-1.ppc64le.gpkg.tar 52776960 BLAKE2B ec4567df5ba15b87b192ed66463888ecacb6f61246c6716e34c94a9a86ccff8bbff5ca829dbaa49cd679528cb93dea19c1848d1920e6a246ce641107e85506f5 SHA512 40ca778ab5e673eaad8ea6120324719727b87d8569fb8515c3cb73bc8ace0e888e8d66e22c91a81b966bbb8256c94d37c323152d0f4e6a906217d5375e347d5f
-DIST gentoo-kernel-5.10.222-1.x86.gpkg.tar 53606400 BLAKE2B 0595065b4a66f987c06324cc3ee3934656035a097c93c3f0112a323856818e93d806f69be2c5287cc4809707bf7709cc176f819534e23b67b8d0d67e30d1f408 SHA512 1a8a393e88498c994bfada26e512816ced3b02069b7e94e9d1784800df35c4aee8b6e8b25a478fd04a680f46357f6fa5a4a36653bd71c90a6da74f9576f00575
-DIST gentoo-kernel-5.10.223-1.amd64.gpkg.tar 63283200 BLAKE2B b4db1217b3d33c3fdaa4daa216d872016a61ced824c1b5a4cab51f87df842519ed3160c8881dc88b7b1aa02bfb27d4e3e1efd946f448ac61fe0de0e0490a4505 SHA512 dfed9f4bccef03879415a119e9df32ee7bd20b9727abc6c6908baac526a15c8e3cdda09521a7f3b01a8c4a2e18cb2ec253195890bc5c70aa9725609187360ecd
-DIST gentoo-kernel-5.10.223-1.arm64.gpkg.tar 56739840 BLAKE2B 72d88a509961a6fcd5bd5bdb99c2818b92c7848bbf845f15ee51ab673d84540ff966e49562219755a8beae9c833a5b725322b3dd0702f47a38b8f9b0af51ba08 SHA512 5fab669beca97a6c6ba04cac6e2aaa95fefa33779a42d295c9fe2472b6a58d51ee2c1e6a0b770d3e47245f4f954d4911a1e56920cec22a1f9bb0724edb9af985
-DIST gentoo-kernel-5.10.223-1.ppc64le.gpkg.tar 52776960 BLAKE2B 7bec1a8e95a7144a40d40c511443f9df011a96bfc266612bf91180bfe38054064a7d64e07e5cdce82988506faa48194a4ac392f27c05da884f94452496de64d4 SHA512 ab75f918cce7a06ce080776982b95deda3e74237ae9efa3f0e49118a553080f6e9cb826731055f95981340f0d10d6ba94c6104e8b8f635280ab61208ad8d170e
-DIST gentoo-kernel-5.10.223-1.x86.gpkg.tar 53616640 BLAKE2B 1af07f663e4db989196a4d49b7ae367ba111d431fc7bfeae0d226f4a02a7c9f25488356c6d2f647dbbd63751a358ffde676dacd7c067aca21b9ce0d7e776b443 SHA512 507363440cf593b282ee6e201c11d376e489aa65acb442133a7f7f14521b8a1405282fee7ab3deef6f6f5ad898b2ee3da510583093d8ae2b3c08ebe470d2e40b
+DIST genpatches-6.6-55.base.tar.xz 3018672 BLAKE2B f5f3e39c634e196827da06935b783cb87c3503998df6b1f3d711484ab984b4a378feee96a45b932b409593290ea7a77271eb39a1e5085e5a4fde3c3307ced95d SHA512 88b2ef56dc0c2e1e7c34a9a81b8981d4c8ab6ba5e5821cbf3da8e608287375f2f0eaff427fae8f47a59cb9fe2c3b8a9d9c569108f27b833a10c6b460dde0bcd7
+DIST genpatches-6.6-55.extras.tar.xz 4056 BLAKE2B d54e353fcd41ede054bfde20ef5bc6518056b1069e440e8ef31b4021ba2b85eb4b578e8aa73a0d778e21a692914ec850f2604e635ff178690a3baee4dcf106be SHA512 a59ff175eb6e7491fe635f65dc44878b8fbf5eacf805b7158b3e9b6c4313881d24a13fd6d252f23c7fd9b5eac1a2c110431ca02aa2583fff71cd306d1b4f3cd9
+DIST genpatches-6.6-56.base.tar.xz 3040548 BLAKE2B 751529aa9bdd2aa696fb367cc2afdd4def0783640c847d65d836dadc74531e5fbd5595ec4aa1f89fa62004d9437dab57adc92b64444b5ed3299a3ae6884b86c3 SHA512 a9e08b3eb6fc9c2b595a8ab6a6933349172655da0126cac6498d0c541bd2d6e1377b849041f03af519927219c17b618ac622f45ca931bd0770bee63c64023a26
+DIST genpatches-6.6-56.extras.tar.xz 4056 BLAKE2B d54da14f3afefdb9aa8c6597913f37c5d1314e4a93216608bee52a52bcc05924bfadf2d5e7e49b0488159b0a57942f1579a4e7b3fcdc90a78c10e0efffb6a1ed SHA512 ba961d5434222ecd618cb44b08ec6413d98c1d1958af2712065d924370141f789ebb315dc53a5bdbb75d3cbe86cf719983e66a58d537eb78455eda509689aa73
+DIST genpatches-6.6-57.base.tar.xz 3079200 BLAKE2B d0f16f9b2f09f182c02fdb6cfa4b76f3d9d41f22b149d50faff129daa677b97830128a40c8c2f98b2534b722865b49b8a60b5f205b7d3284ef94a67946a4b460 SHA512 c6d16e6d814d363f0e34f3e7d569757f787340889f395ef9b3a273582a3d72d60b692e872764e5f411ac9a8648d886c9f6522342c238a421e423b2cd0e6b40fa
+DIST genpatches-6.6-57.extras.tar.xz 4056 BLAKE2B 9b071880383921fcc8cd2da092e1219e3b40684e6ffd04bd2ab75fd53624cdcb7289f1c40ae9256e0343bbea92393c153724ee628e8d164596ba4d7f8bb413df SHA512 a61cbf855e718ca7afed0b15614ad2e9bea740412e8251b35417d10f4b936364cc3820951acc45be2b18cba635cd1c43da8caeb4ac315747d02201be39148c8b
 DIST gentoo-kernel-5.10.224-1.amd64.gpkg.tar 63283200 BLAKE2B 14061a7a4219278bce3237f8d59015448fea6e195a02d8f5a1d63f41b0ed0d189febd0964a082eca1948f57cef5a4e96c569d26f0c1b70855cf447073f1bfbfa SHA512 e4e7f4bbf6750ec216ca46408919b5a37aac372a14a7d73eee1b44df2ed2a0607c510db1109db117c25bb94dd331fffbdfe380941661bec94f3cfacdf858e929
 DIST gentoo-kernel-5.10.224-1.arm64.gpkg.tar 56750080 BLAKE2B 2b31d7121e82bd500260b26fc795d0d59ecd1328fb1ae0b202ed24a5d1a41947b4b4a84db0172dcc76f6ffda4c5e3a63527e5d2156148ac673305bd57bbc1c4c SHA512 1e0a6ca9cf082b3aa9f386ff234f96d3711ae2cab36791be38077b9d5c80ed5448d092bea453f249cbc3cb486206a614e33f26de3181666b18aac47364fb604a
 DIST gentoo-kernel-5.10.224-1.ppc64le.gpkg.tar 52766720 BLAKE2B 789dc4f675dd22f391262f4abe1b89d60fe03b9b48a93643b1151f00765c23c470188e727cc437434a950b37cea22c237f9afc82304dcc57f649bc91ed0bc108 SHA512 18034bee9a75ce37a6337ccc7952c1eed4e0a600414a99e9c7465a1cb0619500238fa241e02e0cb0a37feeab9634ba4dd6d9c87c46fde93765e3b4983d455500
 DIST gentoo-kernel-5.10.224-1.x86.gpkg.tar 53606400 BLAKE2B 842b98f77f9bb63815af1e8a60dbc7855872631022542f08a68ca0563d957779e971d4ea12a1a0576f58d2ca323cbbac6d5140099edc0758640bdbc3371b6e68 SHA512 ae52d7ce7819809e98917e6af09306c83e7e72f4544cec8d86ea94e9223e265ca045b0d4ffeac5a21692ad0444621999bc329b17c25b37edd57157a7377ef08b
-DIST gentoo-kernel-5.15.163-1.amd64.gpkg.tar 66385920 BLAKE2B 3adb720ee32bfbbe77172ec59cf0315971437e8c3b2ff0aebb9fea63c0d6a13cf8f19a5ab2973af9212238a60d42339c5214a0f1070f6545a8a6f7a89cc9cd48 SHA512 61e7dc825b512536a137ea30b99cf5de454e6588583bf2594233f1d6772ed0e99ab1776ea44b3c99f3fafaa71571ad3272704f0129fd9e48180a138610ccf617
-DIST gentoo-kernel-5.15.163-1.arm64.gpkg.tar 59750400 BLAKE2B a81f3d306a87cfa47cfc6bb556399db2dfb9529dfa96881f04c3be8f3dbda011ef597bd01fb73579146410d7a40353496d574bd1307d1bf8e48b3e5d3d504fb7 SHA512 303fc90d4c531ff4ee55aeacfd160a44c48a0c2916d396adfc9e9d073dd7c32eb134e4d5f868a4e205d340fb566e765982927d0f479714d646dfd02e6203e354
-DIST gentoo-kernel-5.15.163-1.ppc64le.gpkg.tar 54988800 BLAKE2B 5c92986392c8e6a102d72ef6a5a5ff30f70b43caf41edaa7be203a8af409d9ae65b2d7fd316e1c4e1297eedba9a1563bcbddc6eec5d4dcc1d73b5565c8168c12 SHA512 9632719388069e62357e90f93973e767ec3a9183b597d79065613739fc9985cfcac0a5f2ddf73e17a559d2d1cf841e8bcb1f42342c701e73e39290421a2b3059
-DIST gentoo-kernel-5.15.163-1.x86.gpkg.tar 56176640 BLAKE2B f0cb3bae1d240a49174eac0ef7b3a5aca5ed238a3cc8a8b72c23d9f2735ab9acc089be6ec475504ec00957de952771ed71af6f653927346692cc3c1451b976b1 SHA512 dde2e2b0a0b5f17b819f571866b0fd4909db2ec7b828895b514301c85dd7e59078693e94744d0adf50e7e5024fa948c9bb089ddcd032fdb4f103b9299b3b1d68
-DIST gentoo-kernel-5.15.164-1.amd64.gpkg.tar 66396160 BLAKE2B 862ba28bc7ec7cf7e9539a3aa603397179b03d63482d013e4d89acc6bc05895d65b34edf9bbe01d6b45bf47c5510eb6c9d913fc771b906bb886462af5eda2a07 SHA512 3e056c3aa9ce3076a57ad21ee3a471daa841f9cb27eac3f91b5c34a16e2a517cb7de39004c99802a1f64a5d0b375f153595b5822616113d78e87049bd915ddb4
-DIST gentoo-kernel-5.15.164-1.arm64.gpkg.tar 59760640 BLAKE2B e24f415f797cddc79a85c8c55e9f37a0745586ef1663da119c8957a2dbc1cddc12e3b5e7f626008c3d8d5cdae4387a563ef7e1b5b94c668caa8212a94a32c409 SHA512 2a9357c35d029ea1c5cee79eadc8e84971951e2db9a700acc7748a507f0d9b04d9b47a5377a7e552edb167d72d528a72099db8913120c7676f08dde5480c251d
-DIST gentoo-kernel-5.15.164-1.ppc64le.gpkg.tar 54999040 BLAKE2B 12355d36fa5fa05278480dcaacbcd7da8fe591a6b90bf0fe6e18720efd7c1dfbdb034460823f4c67c18d1bfafee2f16411ad770c60823de5d75483513351ed01 SHA512 79cffc5d0b1e48d97f0e48d3fa2393a773280e06713537942c97cb01c56ee9173f930aad6dda964cc2f2d61421a1dc810ac76fb00cc75ea90090ba1c9f592c32
-DIST gentoo-kernel-5.15.164-1.x86.gpkg.tar 58613760 BLAKE2B f7bdf3d53c60cfa7c121e7f62c6131ececd8e133f6c45491429a78cf7609fc78e9ea42e5803b7f1c0863fc5ccd2fd9b3b34f3998f3402196fc8d8abd554374c2 SHA512 dd3d44134ecced68c7a050ed87a3eb691d94c42249dbd1a310382652437f744ab79a49ed7de1f66f4b3440f7f9ce44eeba0dcbdcc2fa6c15eca62d9ba0e6e483
+DIST gentoo-kernel-5.10.225-1.amd64.gpkg.tar 63303680 BLAKE2B 6798064e280a5583fd17ed3bdf8781c0972c6dac4eb38721b2b29a12d4861b89470d28dd4c6a89191e6e34fded5008e316b738e5a08595b6883e11e79b79dfdf SHA512 84729912b536519320b651767c45d786c564f264afc887c94a28d5380f44d8a48b7c9d04610adaa9bc27fefa9aef1b734e1734c7de6d4c5bb2dfa786f3dd483a
+DIST gentoo-kernel-5.10.225-1.arm64.gpkg.tar 56750080 BLAKE2B a6b239da24a8270fafb6b3e07db03cc99f5c7cbfef451dd5e73fb9ada118aaa3a5607c55dbb7897c9cb12e0efad4e40e7b74334c7b5265c548b82d21eb6637da SHA512 59f9e6560082c3bfb0b5925d085e98da7e5dade835024cb181f3e4c37efc5cde8439bcf0fac85e674cee3ac2e0168763eea126d99ead4da61d05527e85c6dbe3
+DIST gentoo-kernel-5.10.225-1.ppc64le.gpkg.tar 52766720 BLAKE2B 3ae394e96249c0a61e06a94beb1576405926b996fcb41333ed8687bb215c02bc133fdf45d35dacb21ee80096efc824d1274a739bd015f4af7646f1f1f580399f SHA512 5096b232d09cdbf453c7ec0b94037bb1178b7030a03c9b2d7ab858ec675be3563de21bfd3164880b29140cf63746710f69c619ce26b6b0e1fbb7776ca5d36562
+DIST gentoo-kernel-5.10.225-1.x86.gpkg.tar 53626880 BLAKE2B 2185d7ee40d4f1668987027b1c0e5579a72e4346bb87deec241991972c1cb2718c5c130bef2e217b8a7628f2c2c28dc4c00bcb790486c79350fc5e507bf5e1c0 SHA512 d979a2e3f78c7369dfea5e39e781fac2e424e4c199df66e62b1f868e1635a6275c83fceca09fdee6d4d40c07bf1f53874787b14ca4795d3b51255c0579b354b6
 DIST gentoo-kernel-5.15.165-1.amd64.gpkg.tar 68474880 BLAKE2B 2083f58b92dad563b8242408969513a4563896757c24bde992d0fe83e46f688d515d04acc6d4a2995cd5a99cba9dbaf08c4cceef199786ddf3fe9b4274e00f37 SHA512 7a90415c0f8201f5786061e48a37ef3166dd7e515c9385b8e43172af980d7af7a6f282468353e8d44b6ef5c1ea991e5bb064e745f801f38de9dca1742e96677e
 DIST gentoo-kernel-5.15.165-1.arm64.gpkg.tar 62423040 BLAKE2B dc88434ea36fb6f061ab6faa378d0a07bbd05d14c843524e2b2e86660f5f67bd4571778ca28bb4d831938941a8fe4dcf179ce26eea16a28bec49f3eaeae9d7d7 SHA512 e530161adb31ef03a3dc3a35bb577482968e3db8c9c2f854b9965a807319053833605e0630770532048da4c73c62c8668ca220f9bd7751999318b9008d3dd37c
 DIST gentoo-kernel-5.15.165-1.ppc64le.gpkg.tar 56750080 BLAKE2B 4fbf85247beb1dcdf3cbcfdf19d9707212b437e0b49e9ec61a26f032b9071db4f5bb2b1934978601e4bec9b91db229b58808c116768d16755d083bb7b2307ad2 SHA512 93b6a98f02a6c0165567908619c0d0b877e989d4631ce845f6309f2d89b4231ebc008755700ceb17c972f6b4456e64df5efb627f29fe44ae67b2183510963082
 DIST gentoo-kernel-5.15.165-1.x86.gpkg.tar 58603520 BLAKE2B a4423cf68682169f36a4ebab66703fdc460e5f626a807cbced2bb987a6f9d6d9d9d69edc16363a17ec8dc502793056fd53d84c9dc689b7ea2e53f8c92c2025de SHA512 6bb58756869b0043e0b3ea973940e2610912f66c7a160ee5b583737226d403cef145d4a8dd31057e6d282591b0f497fe726fe28ea7c0f7c79738d387ed7be7a8
-DIST gentoo-kernel-6.1.100-1.amd64.gpkg.tar 72570880 BLAKE2B e8aa0a2f5455fb70693272439f554ce6453723272b2b108f65f786ee0b2560fe6319d4952a3f71f35fd9b3eb2651e0901aab519ccbce0f5206d39be143975bb2 SHA512 872372d78774278695c1b7c2df6847576fa80f7e90c1a2e8c5d06318270cbca9f1a4715698bf70dbe533f16719f7565c287ba8cb32a478297544e4bed690560b
-DIST gentoo-kernel-6.1.100-1.arm64.gpkg.tar 65546240 BLAKE2B 2e673badd76cdb6dbb2cd5e4a2ba6b8848db477cf5d4f46dcde791c3b8fce1920632ba1309cfad2a5a8353e208f0eb5ed6a58d830a72ce3b6d3ff9ab25eaa467 SHA512 a18c5a2b3d37709307f6c4be17fbc8d8944764cec54197d61ba9bf2883b61324ccc0d2d3064ced624b6522c60feb22bd78ee514c9df626608af7fbb845f7870a
-DIST gentoo-kernel-6.1.100-1.ppc64le.gpkg.tar 59791360 BLAKE2B 485d690f30beeb3ea27b62da14fbf20bf5977df6b23b69dda6b5fe9ab6939988bc592be94e5d5ade7bb1c86d249b1aae0a2cdb25e2b38bf74c48cb8a1135bc1e SHA512 b70e509f8fabbe843fdf6865524bd6cc325bb7ddd165c80672ff6f435880dd8455ba2ca59ff626df99431d18c496537127de930af50a4e97e02eb4f89690bbe9
-DIST gentoo-kernel-6.1.100-1.x86.gpkg.tar 62136320 BLAKE2B d2b814fae665d38034a02a89b736ad366e4797fdb31410e32849abe352d189728659742bd8805718028cb6931772675bbf0ad23ca2831d8f64f7e2d37c5b843d SHA512 05d5c42cddb8506509ec664f49e170ec47918aace2160ed45aef5157795c38460e6c956314d03bb0ebc2e7dd4e0ecc0d924f4f6d945169580cc1d235bca22661
-DIST gentoo-kernel-6.1.102-1.amd64.gpkg.tar 72570880 BLAKE2B 8e984116c16e2b62e5d853b30fcaee42acc255ca1fcac84a490aeca6cf4b23de1a8e1fd21cd5edbf929a7d8d227615c607fd6b184eb9ff49dcbd6187ad3d6eaf SHA512 88958079ab1eee27931b1755d5d63b2ced1fcfd7289e426d5493769e4259238dff35a3fd66faf75559715dc172705204d92595380c6e73d6aa9fd8ce90f494de
-DIST gentoo-kernel-6.1.102-1.arm64.gpkg.tar 65556480 BLAKE2B 17d87919197dd8c0f35b3f1c569e33a8824faaeed8c2b9744d2a88f3c50c89bfefb7cc5640a533b1c13ed086f59302b035f2836585bd769bbfb564580a052659 SHA512 a08df71b201f0de383392504f3509d0c4eb2e2d09ca97e979fba7d767bf31a6b1f55ba3929d31ef63ee6b37e8c8b81e58d7ffb51f3b27bf4214d5ae016cb8d05
-DIST gentoo-kernel-6.1.102-1.ppc64le.gpkg.tar 59801600 BLAKE2B 8bee857915de42008c1af3b201559965c6155f8eb0ca8fee250d98e8e3e85a1b11305356dc4e50f67062db3e9be9f27a54edb93eae2815b83cb2c4f8c9eef232 SHA512 5115b03b54e44b2bcf8eee7516797bca8c20d382949896dce17f93bbb8533c4643c75314faf46674d65ef799360142c06cc5c46f6372ba92ac80170f4d693fd3
-DIST gentoo-kernel-6.1.102-1.x86.gpkg.tar 62126080 BLAKE2B 3566e34da7096ff048e08c1c0682c45f8bc1b62358f78ef45e509cc7a8a29625ca6655d06d4bd8121761a5804bd524ccc944c61cbcc907da262af3cd719eb2be SHA512 c89be293d9737b2f58185b1d74b5309448b8f7f1f78be412832b48b164db64fdc9f7c76229902c02d2d5e7b0303ee941faff4037f75ee74501b0002ddef3c3c8
-DIST gentoo-kernel-6.1.103-1.amd64.gpkg.tar 72591360 BLAKE2B 78c4889e9afd85e881b8e7b7e640d7a356fc7805493a524a176a085730f9fed9bde6b43ae366d5262120e40c85b5749a2d0b7f46c3cdf95fefb18d31be81bd6a SHA512 482a87425ef5bb747642bf8a0e0f001c7b3d6ed1f11b772e21df8db73b3c50d47658d493a4b6f984287e24b82bbb7d7633026bc7c56f52fd51d426654a24144a
-DIST gentoo-kernel-6.1.103-1.arm64.gpkg.tar 65546240 BLAKE2B 94a689d7258f636e79a9c853ba553368b48004ca7493ce93a1b6d25574de11421661753bbd92f66f528adf99ea71c663e7fda56be09812590ae7c94d431a2a30 SHA512 84410b9f8f4c549858d18ebc7ee6fcc50dc4fde6dfc1212590dd626f6f070aa1d92eb8dda4d6008a8c7314218bbc1e89b1dacd843c83a1b4fab4dbf897b798db
-DIST gentoo-kernel-6.1.103-1.ppc64le.gpkg.tar 59801600 BLAKE2B 0b97f7cafd220db98f389f0dafc88d8acadac95ba5740a2301a15ac18e3db6550e30458faf0b248727d1c60926a4b20d8158e6954b1834252e3b8a28e54b4c0a SHA512 cf7103659e4fd4e58de6519bc23aaf264ee4da77d479f2e51dfc73064eb9f973369fd421cc9c49b122d9706fec5cce084628bf4e9702846ae8851ed2d09d393a
-DIST gentoo-kernel-6.1.103-1.x86.gpkg.tar 62126080 BLAKE2B b64cc16f8d9dc0499b9c0ab3dcfba6199035f6d81496f622859e76f9e0a6a8e240669559190f4fa6a8bf1529257a6ac9ba138d2d6c073c6db720e16463519eb9 SHA512 076b29c080a5193263fa206e799d24205b98ff815b27ae440e40b3beabc9e5c1642a674e86b71b80e05102e5c57c0024bec75424f0a4ff8864d6d0de780286dc
-DIST gentoo-kernel-6.1.104-1.amd64.gpkg.tar 72581120 BLAKE2B 3f442b717a6935fae26bce43b40ea0b27f85bac77dcb9b61e9f36454dc6c9073e49aa2250a14f1ec4a90524aa5b159b3d54dbd9424d39f8b6e851d0e3cc63ad1 SHA512 e5f5479852c7ae91242fdd06896e66fea08ba579e95be762a04261d1ad1c1b00050294610598552b0a2aa7cf8dafe0a240d3f309097e98f4d19756ce60496473
-DIST gentoo-kernel-6.1.104-1.arm64.gpkg.tar 65546240 BLAKE2B d764ee6f31a941e5151a07658269c6587d4c90759512feee2ce0007e4f8394d8b5d7b273e00ff059bfe86911924b3c42ac5d137f52285b0e154a5f9613d1cf6b SHA512 68acdf8a5d3233e313cd2bf271e2313443a7a9ef4272b56a258b08602b2debf3aadea880a42bebc6df7c312cf0830c0439938cc8e7f50f2caddba7ca9162587a
-DIST gentoo-kernel-6.1.104-1.ppc64le.gpkg.tar 59811840 BLAKE2B 4153742fe57b062314e4a90a6b175a6fc4104f5498f7eef1f00fb151f2f47cd64f5d634bad6270279602624f280d9685f82f052569b73980ccaed0ff5b58d70e SHA512 87778b19710d486237ff2ca94a783d419ef5978c95625cf026b736a8472adb1f54ca634218635708e7d5133dcccff96a1b53dbace0016d05ebd9ea54601a36d8
-DIST gentoo-kernel-6.1.104-1.x86.gpkg.tar 62126080 BLAKE2B 7099606a714bf171bf5a5eaf70bc439f0d716ad4eac9cc433d0b600b992093dfcf702d2b7eadc61792cd2897c9de1613369510601bf31c47f4c4fa31241c524d SHA512 b5df8a31649d984dc2b69cbda84231b40ee250905bef64b15656f078732e0a55e44a75c986a566ce2c4ae410453016eac565d37a589c1ece5a9c94571161ffc6
-DIST gentoo-kernel-6.1.105-1.amd64.gpkg.tar 72591360 BLAKE2B 6ee7b3c05c7be33459eb2ef8100d53cad14f567f041a99aec4909a53d16928b088675362d3438d85fbea181d620062de144b2c2e52679aa7eac45b09fd347685 SHA512 cdae43e6ef5f8d6124b79de51223999568a75c6448ccb6e25677213ffb115f729e8ccaf1aae0376c6a4e7a1773b3d335a31a10bb4f0e4a46a4313877a70386ca
-DIST gentoo-kernel-6.1.105-1.arm64.gpkg.tar 65556480 BLAKE2B 4c0a4c217e4e3418368bb1708cbecf68646f9b34c22a60fd4478c6073a4edbaafae12da1e2f5a3c24eabb89f7a52717ec27c5a81a71534f16d596513fc3d4a22 SHA512 befdd3953e4129ad5f52fac21187307067ad8a11378d6ce68ff0760869a3cf7eff6c5b4533d6e6cefe316dae6d893e8b3c9e7d0c1b539bc318f2d6ce63a38d60
-DIST gentoo-kernel-6.1.105-1.ppc64le.gpkg.tar 59811840 BLAKE2B ced093a4d9acb16619d1bd646c4e434a4a1139014f99a674d1f312fc68dbaa46b999b2273196c38eb8fd51d7e545bd7e445ef773f9edcbd46786af40cd5dd50a SHA512 63607afc5bf1903963db2529cf94018906e59764476eb35eb07c4afc2fc59c15054bb08eab88d535b8d204f62711702032ede08a4a0f72998ea3b9f292b388de
-DIST gentoo-kernel-6.1.105-1.x86.gpkg.tar 62136320 BLAKE2B 823edf8c9c9f8b990fe7db8bb24ccaa2cb3d89543a297d0d552fb380596c221a757f2e59f95ac000a9542cf3b32dc78dd4b8687eb4b9adba50905b5156f9d14f SHA512 9d67dc07730b480ae3cafa1e966803b92c2c2c2e0f417add5014d488b3ca4ec0ef01141f4f5743fa172d8870ebb62f2d89475d1c6ddd1cc0d07d38fd4313bebd
+DIST gentoo-kernel-5.15.166-1.amd64.gpkg.tar 68454400 BLAKE2B 4bc68fc85266b4e5fd5144514c44c4c302a51ed138e9c3e3046091969afa21b18bc4452021d0990b1fa6a322aa13cee5ed2fe52992d79a78981048e8b022e473 SHA512 7c0fe5d1b25b372fd9c44dc2a66eac6b662afa110947809c63b2ff745d8ee78e0b2e6c724793254acc8053100ec08b69d1d8d1a1ea04e5963a889f77e1baba54
+DIST gentoo-kernel-5.15.166-1.arm64.gpkg.tar 62412800 BLAKE2B 8a178f79f32f96e6a0fec5f26ff743a6c5ce7557498bd0de1bc017331bde503e7ad5fba66df4776dcdbadc11b7277a95fed0968eb1260bf5b0e42f519f3dc3fd SHA512 a6bdc223cd5f4f7cd9e5f5c379ae76bcea44bbd33d0b205a3b231ad06f59c94a474c88e8c676704cc7071fa22b02b16e66f13f6873184772fd546530bfd89024
+DIST gentoo-kernel-5.15.166-1.ppc64le.gpkg.tar 56760320 BLAKE2B ed86b1564725f313d7752799c61255a3d12ad52c3bc735ea2833605913e1a8d58431997a25e2fc7644e4d333fdc7b52e43436503ef02c4706aae59b7873691dc SHA512 7c81840fa097da1bbe382d3a68933ebd3b5f0b9af1e0906e9bd97ee8022230ed35d2a6d3b1ee49a269498593850dd72d08a9a4ec8d0f22862c3a26fd2c13b8b4
+DIST gentoo-kernel-5.15.166-1.x86.gpkg.tar 58613760 BLAKE2B ab231cde72d50f8831927ca3ebf6867de409a2c09922f53949edea9250fb618ea74c1396de19d741d3453f3daf99added66d69c3115d612869eae9c39c61a963 SHA512 ffb6044df26c101d32ae28dceb73a19945d194f04344af522807b4f298a086808eb2d171e6b9a9ca97e87cbb88ff739525ac7a88bbdc4a39a21d737b125a5686
 DIST gentoo-kernel-6.1.106-1.amd64.gpkg.tar 72611840 BLAKE2B a47dfabcc3c75962fe95ffbfe8ce3da60e24ec7d486a9cb6409b959e20ffdf0f50f87b48869430070768f9864ccacd00cd240a5966ba51809818614ac0007829 SHA512 fe6a2dbe182206daf1846629952313557d701c14376e3f31f733472ce336fe0facc42789df2ff1df2144584784568c7ecdb595d50ee44139b3baf1e3ce885241
 DIST gentoo-kernel-6.1.106-1.arm64.gpkg.tar 65546240 BLAKE2B 30848a5013d2fec5ea3ff4dcea21a66db909d66373a98ab15433fc798a3d0f106588123e4439250fbcc61b5dcaf3a71ed9687cda9da55e698ba8f5bd50d00d35 SHA512 fbdbe17606d5e8ecda6edc39784bff757dd1df89bbe4a8eb37ca8c0d94c05d15951a749ebd65351b962c4c0d042ec61bd574ef732fddbe529f47f4bd3cbdd665
 DIST gentoo-kernel-6.1.106-1.ppc64le.gpkg.tar 59801600 BLAKE2B 2dfc56a168daa74e90d6608edf0f8ead05fdf6eb94bf551a3da67f9c5c77ed74ab88c94ff47026c11d0d011fde152e40e1cc0876136a3f631d6eb346dc7c22f3 SHA512 8c17f10482a7145592e314af1d1a4fe144885fd8ce339da318d422a458193762f4acc90a027e5483c590db49b57e40c6f9906bb42bd23eb8d91676ce51df4806
 DIST gentoo-kernel-6.1.106-1.x86.gpkg.tar 62136320 BLAKE2B c589bb3c8e905c23cefde533bf8ea2a56b7d9f64d31da93e1355fb6113448a9089b2b2ded8e55c667ee1d85ebea4772c083907a92eb8d1714be0de8058fe0594 SHA512 a14cfb8780dd0029deae1e816ac6e624a799ca37bdb7aa228aba8f4188cb1084323abaa6a24c7bf69d0b87bcae8fba82f716f9242661a03af8a769c606f00e0b
-DIST gentoo-kernel-6.10.2-1.amd64.gpkg.tar 160737280 BLAKE2B d697e43a5cc520e2895c65cf86401357919ea8be6f0d54d5319aac4ee0450c7e0f5f1148ad5ba83de9ec6a9395370a3f9ca69b1f4261bcdd3c6c84faeb14c4e9 SHA512 150743684d808ebbef34e65d16aefc243fff231b0777a4d2f060f7e3ab53c6fea22c718bb5a5d60857a058fbb2a5e33bd86b5467911f19370b5e1cf105ab8856
-DIST gentoo-kernel-6.10.2-1.arm64.gpkg.tar 131891200 BLAKE2B 3b46113a10ff8b7a57e4f436aaa2cfeb4d95e9293fc158a70e52bd577ec5de573e17be05e5015a444a9da2ca5b768b6ebefd4a69e6dcb29dad31b82aad96ec56 SHA512 c8f3ed9fdbe4f761308a9109354c52d2ca1f65ca6289ac1d033ea28930a8cd94c313f5493a2e74f2b132bbc730de3b95acbed4330152bafdc1fb18f9a40cc574
-DIST gentoo-kernel-6.10.2-1.ppc64le.gpkg.tar 71987200 BLAKE2B 4609342bf865984397f6b166b786c4ab3520f298a92027679584c789f2545f7c728c4710fe817155b33be1c637c1fd26c46aa979258aba552755acb892d5bdb8 SHA512 9faccceeb88e902f8d43edde4d890af3274f849bff7fe7cfc176e1061778fd9856e701d04adb04b99f6cb8ad993d3bb31a65ab80d79c50b046a2eeb519b00e2b
-DIST gentoo-kernel-6.10.2-1.x86.gpkg.tar 75540480 BLAKE2B 0ca33e131b3b86a4a3d49b54a95ac90efaedcfb187c1f1c169a448c7cf271690242ef8013e93c89d18cddb2217210f2007c56617720af2ad4f755be449d8ef6b SHA512 15fa48ea4cd43ccad8b8542a8ce2bea57ccd8ff8368fe234d7f4b5f8440ced254c3e14be1eda7b93bf2012ed61dcd6ea41c58f108341d69e9a149d5ddb4208b7
-DIST gentoo-kernel-6.10.3-1.amd64.gpkg.tar 160778240 BLAKE2B 264edb4c72ec7c3c773401fe7e67dd3636d05e791d96d3b98a308fe12cbba6ff8803cdf71bf4e088adbd4b17b834eba7ee835613994614e678b1aacc3e3d676c SHA512 7266f9c1401e526f977c54a0c3c77ec234269e37a7841f7a44b1a10be0d4c0efcefc75039184dcea68ef8c6cc7b5f33a4547ec0b3de0a9162a19a29d1f4c0c42
-DIST gentoo-kernel-6.10.3-1.arm64.gpkg.tar 131891200 BLAKE2B 4cfb6c05ef01ab976a65d164f0100347d913033e9851b4b4fbc9646bd14ae6c455ebd3c435678dd74e695a356c03ec136df0395fb11b292f2dd80a2661039757 SHA512 dec53cf395e42280bddcb07ae6b7aca73ce8b7c9ad99a460199a1212ab72801959ada4f23c0205f6cf00b50d70176b3e47a339a3f0d581e688c8cdc0c522a3c5
-DIST gentoo-kernel-6.10.3-1.ppc64le.gpkg.tar 71966720 BLAKE2B c8055e58ff14a465f465d4076fcfb363a4287648cab243ac6fde7ff9652d96b802dcc6231000136af6af6b90e58afbb55b468d44c36812e299476f19f806ed63 SHA512 7fe3ff27cb7b5c16fbeb12bb7f0212f0ce548cd95f003f7c35f6088a2b5cd22ed90796c1838623678f9fde2ef5b56570a8c72dbb55ac3fc5cfdb8685fc6cb078
-DIST gentoo-kernel-6.10.3-1.x86.gpkg.tar 75509760 BLAKE2B d95db1d0b11c9d801d0d8384d31ff1e9bde30bc7665e0321bfb01cb3b135dbb89081d9a4c41c3dd41ea9464b935c252cbaecfd1c65f325a84ec822a65623e3be SHA512 fd8ca83123122e8af61fc8e3d131e7ff887b52c65e6c4907f21627edc6793f99a5aa5e883fd5b7a361029365c8df96d9dd2056785178b78da4d4f3e2e2eeef2f
-DIST gentoo-kernel-6.10.4-1.amd64.gpkg.tar 160737280 BLAKE2B 83f76efb148ac83cc76df74e2985f1833314079a5ff2a9bab7ce69fbbc3f77c1a3ce146fe77ce714a43b659b0714e03fb8ae355b7e9725ef3aa7a64cef9b27f5 SHA512 00cd84b80645f128b9d6b3be28fdfc3aacd8aa7754a828dd583a3c72e7b0fbc357de7735edc6ce3cff2a57f16295953ab33d5c57d8ac98a3aee65fd577e25725
-DIST gentoo-kernel-6.10.4-1.arm64.gpkg.tar 131901440 BLAKE2B be3df65203f3f7d60499f6556e53891573a10b0e8749553e734c5947368b7605da0535b534449f3b5fd0522e4ec6a70da15c0917fae7c00603d485b1148b237a SHA512 eb4e15e929f81d49c3616056f49e4f5385a954c8a11197c921aa0ae907cf253949d5b7bb49a8a3075f5a76f72b482874dcc20ab306b05a66aa1b30d02c276613
-DIST gentoo-kernel-6.10.4-1.ppc64le.gpkg.tar 71966720 BLAKE2B 2af667bb98038ed2058b46b5867d46e4fb8730f92293e5fd082ab0458a662a1b70878ff3f6966fffe9ccdce49b05299ae135a17bf1b87233ab4623a621c83d59 SHA512 d23039055d94c06841399a52406f53412b291d880649cdc53bc882e6f422f24df852e561dd1141d89ee3686d7058a2be70866e71008575cbe7e71e5b51bffcde
-DIST gentoo-kernel-6.10.4-1.x86.gpkg.tar 75509760 BLAKE2B f31f246dcacbc1864d2ec6d7e999bd185e5d8d517692612d521ac320014d15f1cb2ca0b925327237fcc5a5cce31e7c9660c9c6db46cafe4ed277c19171bfb587 SHA512 a9c5cd35642229921a491c6eb0819432a40990ebb507b18327f935ca8f45d092568a1803ba9ca97b4d837b00d0d8f1f9937ad8ee91fe13daed7f3e737b019a57
-DIST gentoo-kernel-6.10.5-1.amd64.gpkg.tar 160747520 BLAKE2B 66a363d3f1420d0431ea0aa010b8a4f9c389e02842675b1fbbd2fb290b63e6260eab58bc0d0fb347008f4ecbf7201b7bb5e3347e0f16ab46fa8c9ff6abfd9dc4 SHA512 c91dc57e1700c43f79c9a80773bd1c3c3bcb10b79d470abd1ecd40a55414583d7eaf96ff6d34438b9607cd95146dccb686bf6c8a3602f8e9554aef3a1a3b7652
-DIST gentoo-kernel-6.10.5-1.arm64.gpkg.tar 131901440 BLAKE2B 3e977fca9354d145d14963e7bc06c073612238f0b9b766db30318e83927b1948e823686e3e18ace70caebb45f82c8d8733198e57982f457500c25300c5024d71 SHA512 9176660bac7c372e1b5c80077caec6b7b0a96acda69c332202445d60759a09cb28cffc2aac0ba04d5158725169ae8277b8eda230d56519d36355d7d7fb455f6f
-DIST gentoo-kernel-6.10.5-1.ppc64le.gpkg.tar 72028160 BLAKE2B 90d3a5a9e489404e4359398f4c648f26be4bd7e85758eb5b1384da9d6433688a2bbaace1086ae0b022942cc0ffe8f5057175cfb15ff49a8ced3369800763e599 SHA512 d6b66592d625e96753d21a41ebe743834db832d8c8d30bd5e069d4d717366f1370114885c7731cdee1ae6171b60ffe3f8ef1dfb360c7ea99849b1970b9a4b9d7
-DIST gentoo-kernel-6.10.5-1.x86.gpkg.tar 75520000 BLAKE2B 58661b75434e8b4e4acbb2b82f8fc2752caf7d7e169d798f290ddedb0fc630f30bfa7926cb5d4118d6405df2ddc888a6d461a63a63c969883fc55f7853430ed1 SHA512 de769ed3325f6e354f730b284e37de53b548e943bc56e7560d9a93c21de8f7c2a1c8144052e81ad52acf37b5cb57589949d50a6a7f57a77aa5d243e6cf9bf909
+DIST gentoo-kernel-6.1.107-1.amd64.gpkg.tar 72591360 BLAKE2B 3633bfee10737612cbe3de5bddb8165234e8826787921a441633334e2c23568977fd4abeffeac3d77a78ed69fe9642296d621d38cf53945522ac35f0c2024e23 SHA512 de77ff8b4229028c1729d35e638a8ba558532b66099f5097a2d105683b9e2e46b2b50e01613bd173d6d449cd6f6c9edb7257c3c41dac0ed952c36538a7455ab8
+DIST gentoo-kernel-6.1.107-1.arm64.gpkg.tar 65556480 BLAKE2B e3eefb45ed985b05c1cbfd14a8e33882e76693f0ddaf1e068deeffa2bda79b3f2dd28377f144bd4392af9e66c0b6180107f96ec673102ce7050695b2bde73744 SHA512 2bfedd832c8f03d9f9089c36045d633339692fa12fd2239f2f28d1c715502ccae5608019af153f52b4866844b2891266ca803af21bac86b2b17dd9850b9f1c47
+DIST gentoo-kernel-6.1.107-1.ppc64le.gpkg.tar 59822080 BLAKE2B 4cb86f6ae34038254ff652687cd0e741aa68f8a76d8a152bc0f567b66d295d4c767c3b97bd06823538fa7d451e717a8dc22b77ee087ab0984fef7a05f526cd45 SHA512 d762de5d2cc37d61ea1ef19b7cc8b7268387fde53f19d80d76186b23528c7f29bac721042247d579e95cd1b9bf8826d073d4c21a8d468257a3e244c172d775da
+DIST gentoo-kernel-6.1.107-1.x86.gpkg.tar 62136320 BLAKE2B 130450bab31853af7dc0df54d827ffef1d230674b3c3f6080612cf58b337b1d6d120687e77b48eb4f94bba55a39934675da10c094f231c85f534e2bab60c191a SHA512 5d99d3a87c64ee9e73606dc79d0e91a9459019f5f24c2c267ebdcbf9b35e111bed758e9b1ff339fa3a57bee408899587db16f7eddeca3871f501dd46813f193f
+DIST gentoo-kernel-6.1.108-1.amd64.gpkg.tar 72611840 BLAKE2B 2e2bbf323c5f808c043adbae5df5957ea2c11debe2e8d9e2dca3830631d83db28f49369fd0f9528d4cbf97d1e0f894edd9d641da41861209eedbf8425e018737 SHA512 9f5b514534fade029c660dcfc890b28d7a98ea32a4a22692b2dfdb42a64d01eee137904779c5c9512676fd7eebe232de7c81b031591fdbee4f1cad62c289e097
+DIST gentoo-kernel-6.1.108-1.arm64.gpkg.tar 65546240 BLAKE2B f61f9c4f0e0121b90b147d4f958d67901ed66f0acac514279ebe7eb445cf3c48627c2d68c668f88540693225ecda32dbe75ba5c7dca0d5ad08df5e2f5bd56ae5 SHA512 f6c313ee4f82528fdeb6e768c4f0711590206465459b860e6f24e354a6a2605c72c2a8d931fca09077cc375e033e340c6b705a45a7a934ffc29b69aa9c3ceae2
+DIST gentoo-kernel-6.1.108-1.ppc64le.gpkg.tar 59801600 BLAKE2B 74481de02be85d9dddb84a533e7b4ec3dec3a7fa250690444a355be8b1419db15527dbf66d75d500db13443e19c30f26d3ecc048b9240e181a6da4a695b96018 SHA512 3c6a170034260eaef4a99db649703cb6d1dc0589275bbe60993dfb0bca7eaef403f73c6c9ef2e937c2ff2b3fbf759ca6aaf3cb675f1ec9e130ba755d714b8efc
+DIST gentoo-kernel-6.1.108-1.x86.gpkg.tar 62126080 BLAKE2B 8afa7992f2785d7c046842d8f92e39a4a2d0f30c39d3306384b9d1f0df1f4eebd60ce3b28d9027817d7fa5c3b4f4a66772146e53bc2d52f10cb8f49037c0fc76 SHA512 d9f1fb393b4f210ea7b065f9d4d182e6342e8ccd6ac5900b7f04859903b34bbfe6313218cdfe74a44660c0658232c940bc99fa4132b3ef9b7da99cc2849b8016
+DIST gentoo-kernel-6.1.109-1.amd64.gpkg.tar 72622080 BLAKE2B 443d8100995db6a2b87a442de1f8c1a44f40d4c9bca4b84bf37f9b3dd86ff3203c364473d83a5c076927d2f1adf74ada4549024dcac5a7f73846f5fb8975d266 SHA512 e1cfb138a44029f03f75478a7d961de98db000190de76626cb8454c8a1e3a464e53be06084b0d0b1da7c15c6ef531cc654a24ea1e867c26a260b14bdf3e3fd0e
+DIST gentoo-kernel-6.1.109-1.arm64.gpkg.tar 65566720 BLAKE2B 4da6ce06ac80f10954872a29a0735034c4ec0960878d00349903757d1e82066de30f8f85411e4c579a74a5482d2ff1eebc9e983fd1457f2b5c06ab5386453b1c SHA512 48c41f8073f8d1ffa8f0d831c867c8fda2056702c3e1efda90ab4a4dcb547c087884d90d9f775d61a386a2b8a196029684fb34eaf1b78c522ef265c9573b8794
+DIST gentoo-kernel-6.1.109-1.ppc64le.gpkg.tar 59801600 BLAKE2B 456fc2b1fe73468b04fe74e89a90529a64800074726984d9974acfd5e2d550689eed2433b5cb7ad2cbebceef801d9be867f6ca9b830d2ac2f91226aec8a7b75f SHA512 c7108452a7ee4035f56578f783fdfb34d6848a9dd4411e159ff8c9581e191f6dd6351b7df4772f3a90a4d939b4c30cb6a335a8b2028dd24982b69f57ecc647df
+DIST gentoo-kernel-6.1.109-1.x86.gpkg.tar 62136320 BLAKE2B 88234cc8cdcacaa630db568a6a2d7e6cfad043a735d5a04782e5ce7e5b030af70b4c4a73200f95f517408894bcab348fb354f24b5dd0ab37f1ef818eed7ba270 SHA512 24d76178fd313951b440492bbb25aad71acb840bc18122c4192ad72e28514582a07ea15f4c58ca263080ecb01dfe0f34120d512817ae429f0652e98ba750dc3d
 DIST gentoo-kernel-6.10.6-1.amd64.gpkg.tar 162723840 BLAKE2B b06364ac6a1cfd4cda5d03202c2c83c3ab35fdb886c0c75a25900f113c6c5d68e8d6a5a3c78412301289555ecb416037260e6df9ea79f97c9c73a96f2e478284 SHA512 f3cb900ec088c4b856567bc5e4fd6d977672310f0e6e61cb4301650b14e080778859783f8446e029c50acd4a8a29575aa3f3f3948a008418968a8d016c9478c0
 DIST gentoo-kernel-6.10.6-1.arm64.gpkg.tar 131993600 BLAKE2B bf37c8d5a9ca3dda972cc7a08feaf12b22a880216767892b9f95550e9b31f7e824b74658bcebf10343ef441c6e1d2e4a28145d927f19ec644ea4246cd1136d55 SHA512 3a72d06ed8fc7edf1ef6ed702940cceeedc16eb9ece430cc0c0faf34cce36a0a9ee18f90471cefd0a6a6e87e286855c98f94799683c22be3cc14b3a1e8350032
 DIST gentoo-kernel-6.10.6-1.ppc64le.gpkg.tar 71976960 BLAKE2B 78f76bb3fc5c6455d99a9f55a82b2b9cc8a07529635e3302e9a7f02aa0e869f669605d93e63b151ca5eb5014915a7d5be64a6c0caf0c10a322dee66b0456617f SHA512 b20fb195cce8db548671b4622319d50d751955a80e89f0814253879112fa8943a92df195eeb2e6b65f14fe134caa5e514ac18f5457eb41bdde2f98b2fad2c25c
 DIST gentoo-kernel-6.10.6-1.x86.gpkg.tar 75509760 BLAKE2B 4c5308819a12a95daad5c4a082a8d8191062702363b6a6a5fa13ec3741b8df259912454e8fc51ce41d8dc79df3d0e79dc848c5b10d5be6dfda4c7625c2f8959e SHA512 ee7c1fa6d60760333c4b18df1e25e534e7f2fb7b52754d043f6df80daeee6c2d47dc4ff042ad295095d61304f3ef4036cc62cc5d08a1fb9ef29ca3ca451dbf4d
-DIST gentoo-kernel-6.6.41-1.amd64.gpkg.tar 147558400 BLAKE2B 1aa15d95efadf52bdce20bea609c0e8ed899e8859d567dd9de09f1f90b2ff686ab504a2611aa3ab219b7e29fe2ef4f587eba5050cd26f092f91a9837b56616aa SHA512 cc2c5b971a56b2af4bed2e89cb75405405b9ce6581b25777d02fed8a68b40e85d0a6529941f7aac877756615b9e614b2c7c9920e7130def88e221dd876f4f259
-DIST gentoo-kernel-6.6.41-1.arm64.gpkg.tar 119552000 BLAKE2B 7d2599490de2ab79bf36aa02eb72b99395864b9248daef0bee2b4389e524e1a53bca3fcf8a0c27d42f9fa91b9b6dc8dea0b49dd7a299c0583dfd020ea61eb783 SHA512 fe602fa4c7a5443be43adf3f35b0402288b86ec8d6d93e8ae9c0dddce0ed6226a4a0ac5993023de47937a6d9b929e9b2887d1ad6b2cf0b2421923890113d7e91
-DIST gentoo-kernel-6.6.41-1.ppc64le.gpkg.tar 64245760 BLAKE2B 1e4da6cb6d5af1c25a0880eb430eb457d7eca0e4948e1959afafc7d83264b158b7cc6627d1b4b6121a3a99754395f6ce3c72b24dbb1f98e15eba81b1b8b76ab0 SHA512 0e4010371fb78a301fb5a9dbdcb626ffd867782a2a699077b20a8eb44fe68dde69f20f6f20f7125f3d5a0194072dd7b0d578ec1f743884df543e60c6ed0145fa
-DIST gentoo-kernel-6.6.41-1.x86.gpkg.tar 68270080 BLAKE2B 828528fa4fca0ef09270f17fdf01732249eaf40bca261c7af06f5e08de9227cd591abc80d1f283855869fc7d640a3cb2a268c371c8c4bd969b7bbdcf77951583 SHA512 62afa7b9241a93ef73a33f9de1dd2554286b13cb7f1cf3e6e8d78ed38bccabecbf67f60f1c592af7c3ba3764bf21305020f436f2c408bd16dbd44001c9d93d3d
-DIST gentoo-kernel-6.6.43-1.amd64.gpkg.tar 147578880 BLAKE2B 030a26a1024f614fa7b19bf4e752ca6e34c3fb3014edb8755788eb205a9d51e229891cb74930b306a5bda2fa4188a9f3153b2b52636fa1f4b45a4f189a67cae0 SHA512 13986eb69e4fe06e27955724e8ca4a0415c5a5a1a83e98b881ab91cff5af51b88f41cff2545a30f92c149b17b082e58a0b172bb8419d39abb74d1590225b2e07
-DIST gentoo-kernel-6.6.43-1.arm64.gpkg.tar 119592960 BLAKE2B 9c5e6262596ed8dfa5d802e2fd051ce35a1b8a6f49cb4c9ac3a61d67c166c75e8c1179aa60d9fb31c8784eabf6bbc9b82c313122eb5667169f687a44ba0e4c2d SHA512 d5f0a412d2d19cc61fe303bec5978b56bbf463d35695bb361efbdbf7826d4f96377e8d74d8827a69d8b52e694f52ce4e6a1ff1aace7a4ec2967d95ccc0b97dbb
-DIST gentoo-kernel-6.6.43-1.ppc64le.gpkg.tar 64256000 BLAKE2B d61e154869bc1210eb477a089f2f9a4a2e857e879699c48d972443577fbd8c60c0ace0420dcd681993f505de107dccd928a114c58f8400e8de449c7a61040029 SHA512 bd871dd3d2fc46302bc7d6cbcf8847af114a132a3b56153a257200b43e614be21d23b90f6ae1ea39ad7c704c375cd5971f14b6991d219e756d89d4079417938d
-DIST gentoo-kernel-6.6.43-1.x86.gpkg.tar 68259840 BLAKE2B 25dcd8c4e72838e3ba3583cf1f01f799bb92d3cb75cc8de40365b3d3954306c7dc2f87198ab068c8757d44e2701602a433747d35a3f163c8f1b3786d694f820a SHA512 a312eaa4257d0b8b807d1c951cae92540cfb908aec0adedb1b36e04035a7a472f25d60a1e7fa2478cc01c9417621b2bb342b3d58302d756a88d051af73032ff0
-DIST gentoo-kernel-6.6.44-1.amd64.gpkg.tar 147599360 BLAKE2B 3febb331bc02e09618dfc30a1a506d6c3c3fc3e94380901dc6be5c098cc1aeb63bbd98f0a4b881ded4b5ee96c854b71e94548b4399d5b993a192409f986358bd SHA512 e1b1dcb8a22bb161a32f7e47cfb1a35e0340d008beeb9778f3237bb270f7cde58acb2f01c664ddb0a42523e70d9c7bc353d5c0ce124180156dac6d24ade6e3a5
-DIST gentoo-kernel-6.6.44-1.arm64.gpkg.tar 119623680 BLAKE2B b511899cb69664ddb06809b89d36ad0b9c5653764c9a7a61456d156c9e8e52ee09270a41817e731df715b0ff77394d705048a6031ce8208b91bddeb3c2c97419 SHA512 1ce9dc5aa80f0ec2358b03c8aad3fbca6d99cdc6d83d37efbf34601f66e24d7fb359c31cbe007c54fb45666550a815d9f749b02d11a788e1438d514060caa199
-DIST gentoo-kernel-6.6.44-1.ppc64le.gpkg.tar 64245760 BLAKE2B 9837544ce93c514ca767ba918ff928db6420f9a389dbbca174e1e9eba2564e8f4df2ee7d85df64eedbe1f071a7ae8d4e66073eb9284f001b8067782a63d9e261 SHA512 5d1f90df86db60d8f0a6a91954551dba7a05127c9c5091d6b5575e427d99f92a877b10b789e986d52b8fd7a774a43c30066534613732336086041d68a27df36a
-DIST gentoo-kernel-6.6.44-1.x86.gpkg.tar 68270080 BLAKE2B b66846a686bf9f73fc985c8510fa29b0d2d5c0fa10d33c8dd2a7de7894b7924afd3a44073dada2f2dca58767fe618ca626a51a7f31657fc4b093e8affa47f38f SHA512 dd3d34a0fb87a10e4da863d7b198666109ccf466110abee7edb8cc6fd9b947ed071b3278d37b11791a17f8b57e2d22758eb70210f50aa3d10cd5310aa4c77555
-DIST gentoo-kernel-6.6.45-1.amd64.gpkg.tar 147660800 BLAKE2B 9eed67f68f30753ba4d3ee9f759ba4e7c6710f439914c3acea428614b57ee40e40b6f8920e148deb133c94e1f6f9f67b11ba8d8f2c097462596303714531afe9 SHA512 5f78e1b032ea6fdf11ead58e16e3140337c2a141398ec249baf6766a7c61cced0ac6e83899da3385d94ea3eda8daec3bec27e34734cbc3a129ba805fcef3d5e4
-DIST gentoo-kernel-6.6.45-1.arm64.gpkg.tar 119644160 BLAKE2B 527a649cdd97743dcc6d559ebfaefb36dbf0138fb096660d8c5a5f9819b07e2c5a27cfbde6d794d015e46f7ff87877d6bf8e9f7b9b86e8a012fde4a94f833fd1 SHA512 0f2993278a51499d464b819fcc5e0a765157406482c9929849ccf621de2591fdf1ed07c368682f9fddf1c613ff005bff8c52332227f3972105bc195ef2c57aa5
-DIST gentoo-kernel-6.6.45-1.ppc64le.gpkg.tar 64256000 BLAKE2B c6d01aeb65e33c316618d5354f681bda22a68510038dd218bf9884af1f723e4bc00cd6baadcda508716d2b42e191e222d595507c31cb960084556c07ede44f2e SHA512 86658bafd3b03a86a764884c972a69fb3d0b688b04422d304fcf04d29087d1ac03cba010ee681b9444992094af0ed72fa7eb41269973905ee9883e9fc67d1862
-DIST gentoo-kernel-6.6.45-1.x86.gpkg.tar 68280320 BLAKE2B 52d6d18a7c625a06368a0a541dec7223a0ce0baeb888942a34a953f01e48eeb8028ab9b55fe925a05594d0bae1a5c6c9f0d339ce42eafebe27704413b0f14dca SHA512 343ff66401da1b20190b5f1da1865a052ead22f1e654eba7843674f97093b02325399b6d89a4fbd051b703b52425e2aef4333f8d7c7ac2e61d002303d14118f2
-DIST gentoo-kernel-6.6.46-1.amd64.gpkg.tar 147691520 BLAKE2B 46d24d9f19cced233d0928919032ccf644e0e11b9269a82640a837b4b918355c79d9596783d90999d883916c5351466010554664e1732e3d80513e77724c7082 SHA512 7b4e1964c498587fce15b2a4ac551e098f90b5a50d34b619cab600d7cdf111d59f38f3c110f2bf4c909c1c2434872ceb6f1c12f2755a5561eb641e60ce7c5a0a
-DIST gentoo-kernel-6.6.46-1.arm64.gpkg.tar 119633920 BLAKE2B 9d3b5f991c530de5a27d4dbc5d61017f9434701e09f144a94d32af5f18511ec175e664fc97383d07b7f5446211cdcd5be48c179b5995fdceacbfd90716020ad7 SHA512 b67ca338349ad8dbb6060ffc127a93959ef29790a2f7856facde4281993e798e9e7a56b47be68e9d83f30bf96066ebc4a1706836d8ee2a6524b940c2bf06a93b
-DIST gentoo-kernel-6.6.46-1.ppc64le.gpkg.tar 64256000 BLAKE2B 0f08e5479891549142f5dd2a958a15b50c06b8a30c6b65728c32c8c77d62dadac2b5d11f50a79de88a4664cd343a47b78ae4e954020d0d1f9d450d94294a67f1 SHA512 5abad2bab8be161e131c9306a0970066d931d774d80cce09cbcabbf4a50c3c1def7564d62871e5637a4f1c38b433e1c95da07302b41391e4782920480bbd65ac
-DIST gentoo-kernel-6.6.46-1.x86.gpkg.tar 68270080 BLAKE2B ce378eb77b0b75a4be8b87b3059ed89dbcfeb6b861cdfdf13d005ea846ab4da58150619d2a56917cd914231ef87bc95a37a90d992fc875f97dc3ed2cc8cdc4f4 SHA512 fd82d5e1aa02e50d47b8ab305dc9e95c702595debce581ac4a5f4f2fc178ab9048d0352e112b23ba81987174c04d3ac1686bb1c16567f4554ead278cda1e8cdd
+DIST gentoo-kernel-6.10.7-1.amd64.gpkg.tar 162672640 BLAKE2B 1c8b588ce05e029d77a38b224fff546a68072c26314dc27fbc7a7fa1902aedd6b9621c61f2faa62504db2d6e4c1ab30a6ec09ecfbb729bc654eed6581aceaf11 SHA512 0e2cd3272df3232a2273b561e41b525d2555cd67166351039fac1bff2934ba039c4871da33696b36680d413a5eaa2ef1575b0e116e14217ea945cae35291dddf
+DIST gentoo-kernel-6.10.7-1.arm64.gpkg.tar 131983360 BLAKE2B 801e0957129026fb0ae183ee50b1431c6619b1e97c64d99ac656dec59e8888fe3d59e42beacd64b58d49d89883cd1a2fe1e1414592ba83bed39805935a152b4a SHA512 d85b0b449f7d2b8b6d0099a505134158c26bde84f62eba8bf9c231c522e8673dfe4c10246f351580af9120b10f0108044df2936770a15a8c0817503bbfc72973
+DIST gentoo-kernel-6.10.7-1.ppc64le.gpkg.tar 71976960 BLAKE2B 2e0de6ddc3cf5caa12dbb56202d6f932e5866ee2ceb07a8681748b06f7fea9f2e3e5389552e4ff9bf2edad7e6bfa2d6ceb5f7dccc8288ff58de22c274533109b SHA512 bf34c8c22f454af4cc2ae249919d4d216d8f3325e424d80d97e6443ac2965d6de97d806321842d32a72197b02ed22cecb314aa26f1cdf6aaa3fd9ca60c8e14e0
+DIST gentoo-kernel-6.10.7-1.x86.gpkg.tar 75540480 BLAKE2B a67f58204ee8d59ac9a1552842c0e45e16831aa722e5d1e060ab9b0b70c8dda0dd9de15e66cf27b949aab138eb9dc1aefecfb01afa4e2c138d9c6b0295b8499f SHA512 0d28ac05ee1fce63f6e5a26a7521d00ab99f24a0e1b3653d44ddcc533261f5ee5c003c20f811b32b14a15f3c8f674bb4b8297b4434f1326b9e3e303f9f498c2f
+DIST gentoo-kernel-6.10.8-1.amd64.gpkg.tar 288440320 BLAKE2B e88d13a464ee6f2cbcd9133741c972bebe9698278f9e0aa6a51ae91369818549e5bf1cb367632c57b5243d2b45ec5b59f5a8d2245d9ddc22710196c01c156361 SHA512 07c4ec2f844b30b430c8a1d42ed19456d86a420b915ae98f7a69b0393e9ce64a2938ea54e2a8eb270cf9c13c38643a35ea904f3e3c56b1f8abbd9811c4adef91
+DIST gentoo-kernel-6.10.8-1.arm64.gpkg.tar 264837120 BLAKE2B dbdcebd687d94f79dd884a53454eb3311d55f7c1468ad36f7fc860d4d56565cc20df87936533090d07da2fb36d1a6ff371e09143f4388af76d68e4644d9981f3 SHA512 e6b32c2888876589704243eb06dc396bf4223f8c3d239bcb56871eeebf32dca7f0bf8ad7431a8a59f25d5719c95a274b1d47eb2e837bc47dcb44ed42b45b1538
+DIST gentoo-kernel-6.10.8-1.ppc64le.gpkg.tar 71987200 BLAKE2B 752e14de7022fd418d9b9ffc618b151ced5d80c2a958e1ee656855937d388053dd5efa0313db73a055c778bbfd28335377703a6ed0b6edfd193bc91a448424ce SHA512 2cfb81f3fa3e47d62f0fb8e9baea02ac4a2f1899fbc8ad53cf1fd630302fec0ace243bdf7a383eb228c59a5b356810caf13503e34b4b6c8d205c05c77074907e
+DIST gentoo-kernel-6.10.8-1.x86.gpkg.tar 75550720 BLAKE2B 6eb0a543b3b0c35bf63a8e558e1270e47556cf931c6e0d99b8a4fcfb6e34ee18f246c53685b7e70cb5694914c0f2a29a3d1e1aaf97f4fd7175c6b3e13fbd4ed6 SHA512 dd66a95760477d23a3a19546ae9d68fb9e5b686d02b0d6c33745463357eae567e65e147ceac0508cbdd40599347915bd5aa74254451215b7a9a927b722b9ec7c
+DIST gentoo-kernel-6.10.9-1.amd64.gpkg.tar 288419840 BLAKE2B 4d8a1b0d6326e1aa04cb16c0388a4ef4cb4d988ccad524d0d6894475acae252c07cd74047c3c16217ba90a03898493608b084c4b4c3608ecc1dd9ab3404896d8 SHA512 2381703b3e21a00b3a25bb44d37642dab0cfaf879ba262acbb860d814b257976a99d3d5afd428fb7bc28688ff3fc4fe38d299a216ed6d97d2b510cab94ae0370
+DIST gentoo-kernel-6.10.9-1.arm64.gpkg.tar 264755200 BLAKE2B 151bc713b7ef16633e530a9d27fe1d67e30172ecf3d90f25374f3e8d2cfed8cf7239e171b8689856aae78bd9c52932edbcb72bcab7a82355f773c0756beb06d9 SHA512 af32ffaa29db9d44acd7b184741f667382b9432ddf5789f0ab0e9b8f1d9ec820643573204e9b568b4ba62c9732e159f1b88da773a95a6a9312d78313efa7a8bb
+DIST gentoo-kernel-6.10.9-1.ppc64le.gpkg.tar 72028160 BLAKE2B 260776139ff3eb89fc8964e011e9cfc96889c96ab08b856f5458231f246c44c425d83de685b7db526ed6c2606521c27bfb9d1e48089c381c50016edecc8256d6 SHA512 2baa10a45cd6481ea2b9d5cfd362ca1745cf6bb7d36282b8d811636b8e0591351507452c2ede1cabf78c8a280639e7973c69bcd530d787c9367d9f70c557db74
+DIST gentoo-kernel-6.10.9-1.x86.gpkg.tar 75540480 BLAKE2B 6cfd27e737f78ae16cf6a663f86b2e8b0a49e96d0b7e3c6866edc2ef5e4c5356b16e1f8396c824365af5473588441b456226016e3e6068d6eacbf97a314d1249 SHA512 e25f332c53d89c55d99b9e759550d8016b2853755496a998fed48fa7c4d0698c405b26c741480a13a06c5475fddd58f3efd94bb4de44dc3b827ff211ef9ec254
 DIST gentoo-kernel-6.6.47-1.amd64.gpkg.tar 149637120 BLAKE2B fcee3f615fe143b8b12d741bf0df758f68c607b0315ec054c6c804d7999339fadb5d62c355ad6e110b5633e8622a4b8f075bd3aa93d40f22fcf00b6b4b2ae7b9 SHA512 18ae1954bc9c10404a201fd9d511521f6f9ba9781f994e8d0ee082c4edc2908125c4db59a38fb672e492bbc8363d4c90f7d3ee216cd5e8dc5e7b0aed8362555c
 DIST gentoo-kernel-6.6.47-1.arm64.gpkg.tar 119695360 BLAKE2B 9bc6ae80d5e41bf39577a6c27cbf47f550c33951f19fc4f9c46dbf15a181593f20b15679f7ae33623a15cc555602ee8828ecee14900f2af14711bf8fd33fc5eb SHA512 4079e67ae3e639b3559026c66e87f2fbe4f0884f02d0f0b73f97f16fc2547d4f599ea49a0868cb06a5d4254e378962fd21f581c430c5a5e0c4cfd782504599d2
 DIST gentoo-kernel-6.6.47-1.ppc64le.gpkg.tar 64256000 BLAKE2B cfa82483ac8a788be9b84ea9246224bce5ec2fe71711e063d6fec46286ef72d488655323cf01beea628d73f8f8e57d42452869ede0a50c57caad474f9eed500c SHA512 2aa632e90471d8c41e275c95cd636725384958b251a4db30ee75fe2f13de4af7ac70a42fb44ef83278d7df4bf5fe5bc1e1f9f080ee71f66c6baed0a290714246
 DIST gentoo-kernel-6.6.47-1.x86.gpkg.tar 68280320 BLAKE2B 57b212caf88b8b7a71fd4ede1528fd199c65818040e714c7beb23995961cb05a12bf8fd99c8c9424c600a86e4d55217485669afcec312588be516b281364db38 SHA512 19039f740c65474332906f66da789f6abca1e80d5c6bf2292705e8830d0b062c35e79c5cb4ee3c3c8ba92b794aa316bbbfa7e890d81ca2da6536d7fbab8c6c1d
+DIST gentoo-kernel-6.6.48-1.amd64.gpkg.tar 149667840 BLAKE2B 4259126edf7b0f063a29190d8428bc2db34ba0dc82cc17c87d5e6ea11f8348f35d62caece7547393ff8fc3bdef7020036972ff23133a776618ff01a53f6fa837 SHA512 2a7cfea3dfaf9fa5501cfd9e15f0392d2267cfb057bac6eeffac15a87eb15be4a3be3745e42ef8a0b36c25ce00998648192457a1f5475c9facb4bdef71497438
+DIST gentoo-kernel-6.6.48-1.arm64.gpkg.tar 119695360 BLAKE2B 05a1fbaccd78edd0c8aab3e2c6c575a9194950da62da43f76ac4c504df6f0543fe15c7f1f9bc7b20a7a0975a5f1c5250f9ea0ab9bc69af5a86d99bdd1c4ba4fb SHA512 f2be7141803122a984327069cbf64753456b4cb83982517c0787b2e80cf38fe38bc3da788eb2aa5d3f0ca4e42ca96cdf8d4e9c33423a5f33fda78c2e5cc54466
+DIST gentoo-kernel-6.6.48-1.ppc64le.gpkg.tar 64276480 BLAKE2B 0d8f1b8e1ddb4630180d7301c0d4471b0cf2f0ee06d6a47460459d7d331341699ae901d7623d2cbb1ed964a072c9ec7e559a0a63f37002b5fe4e09304c4e5700 SHA512 7eeba47f10973c8e0f378fd5d7d327d31c251a4c7a92efc0d1c62ec0eb737f394a897e4f88670ba4f2ad13991662d60606f2eff928a0f044416fe95e511f7ed9
+DIST gentoo-kernel-6.6.48-1.x86.gpkg.tar 68280320 BLAKE2B f81b14c6a875cd9b3ee318c6133e00f62c6ac6264c4b26315980a212ab4f0907b3211bf7b9e4e0c278df773fd4a71041a75fa2b454ec31ed2800f65b737c7a92 SHA512 d4e3662cea245ecccfe191708daf42304ad98c8bd2f1c3d0d5485f85aec35ce492245a4d668f103bdcb80c04e85964d0e100d600b60029981daa9d4327d78c88
+DIST gentoo-kernel-6.6.49-1.amd64.gpkg.tar 149616640 BLAKE2B 5c0c0f07c2313e6a79f2811bb00449c8229a9daaac86af0a912bb140bde7101390bcd5750411cd6ce5d47b0ed74431dafad92e310a0a22043aeb0a2ae0a4e23b SHA512 87b9244364c4c28fedd8b46161227eed11010c37ec187b175b197555c46d2fc44be698a6ad8579d55f8e375dbed81136fcba3a2638287bd21017305594d9f7c1
+DIST gentoo-kernel-6.6.49-1.arm64.gpkg.tar 119715840 BLAKE2B 014d1b3c8a215a9652050f20f2a05e985fe19c33f15e4b35040f5ef47debfac7e6e4fbebd05216fc17a3d112d5633640753dc604a085be76b145a155ff1e4acc SHA512 2c8f7867660b2811d7003c5ad6c455d5d9c615d0b454ffe34f8a80c2bb16a7ba860243ee3f1e94db8bc64c6e6cdd66f48f86501ba4568eb00ac04f4ca3c05194
+DIST gentoo-kernel-6.6.49-1.ppc64le.gpkg.tar 64266240 BLAKE2B 983293208dfe100e2033d84800127fd385ed3c5e904bc461ed9479470e4c98944d2fd855afb96cac227962539fd1668aae3cd6e59fabb3369f6071971377ad34 SHA512 f6d3e5afe6e878881b93396a2a03058d87e5b74042e10878650e214187715b682bd9820e088e6cf9f30c94dd3c1d2968bbe93d27e84783c5c1e8a5e04277579e
+DIST gentoo-kernel-6.6.49-1.x86.gpkg.tar 68290560 BLAKE2B 06926f32c8e169409726a998dd196ba98024593a96b842e1669ef62133f3dde4a36681d6a0b3f2e80b065bcb7fe3be8365833aadbd7bb1158f116c382126dd49 SHA512 7061875e2342f7ded436d628e4246063f6f166dc78777ca9111dbee85c37b3122904039a065ad0386e2b5960a339c8f6e3a9cba52d6aebf0989d3c1e45ec0593
+DIST gentoo-kernel-6.6.50-1.amd64.gpkg.tar 149637120 BLAKE2B eb86ec35ce239e6a4eea01ed23dee214b2e5547525a82be333ad796db793c59e94ea3115bcdbb81f6447d87474fd01e58c24fee0500aa0028b431a96842adff0 SHA512 5e70e1f3f66d5eb721cd93e540309eeed8f74e99dbecdccf5180f819f30f6de6ae26f87b474bc4c004e2e9937c5ab07a38905f775063363f26990fad82321a11
+DIST gentoo-kernel-6.6.50-1.arm64.gpkg.tar 119705600 BLAKE2B 327bc89a6621bd0ec4c69921a074c0f7e8e844321153d2621aef82ac112f16bececc321738c0281fd5e6fd20b44848a4c860b94a2b9a613b1e84f6095b1d8884 SHA512 8a198c3e530a231bfb6c22567e5a1dce7dbc486d9bddf9fffdc503c230b1cf1e5f280005c2da7f80f960018b18e3bcb49d7bcf6312d23069d68c45b4b7f478fe
+DIST gentoo-kernel-6.6.50-1.ppc64le.gpkg.tar 64266240 BLAKE2B 5226f7cc78dc9c2937486842b25c767533336864bf3a9c00476fd2c99ef4cd326aff01ca4bf91cef391922dfdbe140497066a05fdec955a55f264960edda4904 SHA512 170987192a9df6bb596895cd957f025036daefcad5f2fd40d3d6251799f9389fec9013df5e8c8c1e774ad4fc10c4ea541400b770a6ba705e84bbfd180f4c9f10
+DIST gentoo-kernel-6.6.50-1.x86.gpkg.tar 68290560 BLAKE2B 6e373280c462d3e852342eeff79198b42bb722feb2d6db69d3d9decae20f5660c9feaea3177a1a14010ba5c74dff8aec681a35ebac6c02d013b89fe756a96261 SHA512 2f2e9a90efaa7690774400b673318137d6db9a62390b28d35cee9a95519947b4a548c302058dce1cb4869600884ba4059714134b1d6b0633c93d8c911e137a40
 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.222.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.222.ebuild
deleted file mode 100644
index cc0467317bf5..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.222.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2024 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##*.} + 11 ))
-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.10.224.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.224.ebuild
index e6ae62aae96c..cc0467317bf5 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.224.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.224.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.223.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.225.ebuild
index e6ae62aae96c..e6ae62aae96c 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.223.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.225.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.163.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.163.ebuild
deleted file mode 100644
index 1eff13308689..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.163.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2024 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-5.15.165.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.165.ebuild
index 53b01d5e35e1..1eff13308689 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.165.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.165.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.164.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.166.ebuild
index 53b01d5e35e1..53b01d5e35e1 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.164.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.166.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.100.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.100.ebuild
deleted file mode 100644
index 1eff13308689..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.100.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2024 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.105.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.105.ebuild
deleted file mode 100644
index 53b01d5e35e1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.105.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2020-2024 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.106.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.106.ebuild
index 53b01d5e35e1..1eff13308689 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.106.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.106.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.102.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.107.ebuild
index 53b01d5e35e1..53b01d5e35e1 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.102.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.107.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.103.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.108.ebuild
index 53b01d5e35e1..53b01d5e35e1 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.103.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.108.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.104.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.109.ebuild
index 53b01d5e35e1..53b01d5e35e1 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.104.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.109.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.2.ebuild
deleted file mode 100644
index 55d58ca496d1..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2024 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##*.} + 2 ))
-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/-2/-1}.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"
-
-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
-	)
-
-	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
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.4.ebuild
deleted file mode 100644
index 5e3ffa99e33d..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2024 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/-2/-1}.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"
-
-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
-	)
-
-	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
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.5.ebuild
deleted file mode 100644
index 5e3ffa99e33d..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2024 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/-2/-1}.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"
-
-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
-	)
-
-	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
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.7.ebuild
index 5e3ffa99e33d..5e3ffa99e33d 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.3.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.7.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.8-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.8-r1.ebuild
new file mode 100644
index 000000000000..d5c4f186a89c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.8-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2020-2024 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 ))
+# XXX: Change me back to PF afer 6.10.8-r1
+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/-2/-1}.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"
+
+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
+"
+
+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
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.9.ebuild
new file mode 100644
index 000000000000..d5c4f186a89c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.9.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2020-2024 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 ))
+# XXX: Change me back to PF afer 6.10.8-r1
+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/-2/-1}.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"
+
+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
+"
+
+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
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.41.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.41.ebuild
deleted file mode 100644
index 291b4c547ab8..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.41.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-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"
-
-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
-	)
-
-	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
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.46.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.46.ebuild
deleted file mode 100644
index 7ae1d1d9fbe0..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.46.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-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"
-
-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
-	)
-
-	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
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.47.ebuild
index 7ae1d1d9fbe0..291b4c547ab8 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.47.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.47.ebuild
@@ -38,7 +38,7 @@ SRC_URI+="
 "
 S=${WORKDIR}
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.43.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.48.ebuild
index 7ae1d1d9fbe0..7ae1d1d9fbe0 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.43.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.48.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.44.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.49.ebuild
index 7ae1d1d9fbe0..7ae1d1d9fbe0 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.44.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.49.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.45.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.50.ebuild
index 7ae1d1d9fbe0..7ae1d1d9fbe0 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.45.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.50.ebuild
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index daf06d551540..3c75873876e8 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,72 +1,56 @@
-DIST genpatches-5.10-233.base.tar.xz 7166884 BLAKE2B 5e1b812e33adcc648e6a85d90fffe60e51c6f9e5e501aadfc2ac10450ea15ef2409ee3f20a54c47c0d86f04f04240b76ca0f9605e59f2ee1c1dfe1cf98541cff SHA512 9fc7b0ff029dc29c405eccc5eb550d10e3448bce7213f9ed3f9f646f52d95ae0b39d7648a824594f87c60cf6ce46354c6d4a0045d7d8cf4efa13c417b9e3210b
-DIST genpatches-5.10-233.extras.tar.xz 4048 BLAKE2B 8f7686f1815ec0bcfe333c237ad1734276a77b169d6d1f5bb235d6164365bee953919f0fc26ccec2954b1d1aaa250ffdffc1da85bbc5559f4e3fc0be6ba2fd8f SHA512 50646414ca3b5990e92da42550a8beb94ba44f428edf92a94286f20421fe396a9d6e53dde8278a64a3c99020c0a217b104bbe527de60d1d5acde362e61765de1
-DIST genpatches-5.10-234.base.tar.xz 7283988 BLAKE2B 7429eee0f5adb684e437369df9483c79d6411a1c102026ad49023b364a66704fc98195da228601748ad2d7a51900e9558bda9af3de716e07a6f1437ba4941626 SHA512 3bb6bb844aa76c14aa3d8cf4b8641f6492df414c12ca4f2900d18de7b818fd6b93f55a83bac5259f6980740cfb820e24db28950083c81e74399d75b033667a62
-DIST genpatches-5.10-234.extras.tar.xz 4056 BLAKE2B 0710e06cd3de7af3bcfc9b93db861bdffe880e427220ca594ea1c5c261f273022086c4202c0a362f46f85da31233e7b24b12c77393a0d0a0f87f553470115578 SHA512 d4a09984b3ea6207e88bdbbdff8c5ebfaa433af7ebbe3650730b1b5f483c4ffa97fd6f8815cf35d3b865140699e9904151712de627c9f6769080eb71a89ca4b7
 DIST genpatches-5.10-235.base.tar.xz 7367252 BLAKE2B ea3261b363e415112f0a13f4666dd226a33ad12962d481532875e7e8551ef739a55ebfee344a299368b3cc48cb1c2a465fe4151ec708983d1daa70f9d36f849f SHA512 bedfd9382d35a151c0b7ec102614d8a1f9866876ff4e308867803c32416db31d34197c26b6dd781c9a0c994e49df33de943975cca8ef9b99680916f2cdf2f325
 DIST genpatches-5.10-235.extras.tar.xz 4056 BLAKE2B 6341fe389c77377eef465c9a92587bf370a56ecbbb65ec99eb2002e1e9525ad6a6fa1aa60f7ea28b52729a4779e236c706155f98a336358d12d1bf4c80381660 SHA512 d14506f3b69069682ab736b96116e58420974b77d99a22818601af7451aa07ee564dad10bef321f288be4594b6990b25521518865fcb111d9886aa3c1681f977
-DIST genpatches-5.15-173.base.tar.xz 7038704 BLAKE2B 4cf6ffc38ba49bdcac210b165c9ce951283ec083f928ab14f19a16fd46e195730d169f50b45f8ff05e5d8ed2cf9164f4940659ea23a0ee9add30dc2e6ee83f84 SHA512 d875a5a2eb58ca5e0659b2cc2a360c5e837e73cb479508c0c8350456e58019025c96278727ab9877a103138d2e41653efee51ea3dff0bcadbd7da0e076a244ef
-DIST genpatches-5.15-173.extras.tar.xz 4052 BLAKE2B e7d4effd4092467275f3f076676daa06caa2f647da1173a6132ebc30da1be78a085ddede5aa170c3d666f1808c4824f441dc5a1e873868fd72347a0c84149fff SHA512 7d272e7448a6688efc98a5e71eb8f83a978d82e9b177ae0b9b12c479078e23fb8dd66021f1ad488d9bfc056c89e7ee8642425dbd15607eaece249b565edc7fef
-DIST genpatches-5.15-174.base.tar.xz 7146696 BLAKE2B 02aaa04e156b848c1303da831795e48f038ced7134453cf1b09534df9ad46888ea807772af161b1c61a679a5c6adabe6a275dea97f425ba10d003ca9391af0b7 SHA512 cfc7e7e878d9f1fae329ea4103c785c7cda26bc37f0015a37dc1a5c79842b98a04923e53177cbf1977396a0fdff5fdc62d176642999a5b6fd89bfa9bff251597
-DIST genpatches-5.15-174.extras.tar.xz 4052 BLAKE2B 9fb303cfcdb5f201b492996383adffa71543531d4b8cb77df076ceb994f2e4af2e1d510b0bb5fda77f505034ea89935efcc8ac5476970e6d96dcec01f582755e SHA512 9ede39e030d45bc668112f489cf0d4c22a14302d26f1a0e1bb9f53b0e42a16a99a24215211c1e510c7f052d00fbe294f70cc414b2d127c4c6e9ba4857ebfce72
+DIST genpatches-5.10-236.base.tar.xz 7402184 BLAKE2B 24f0283c2dcc8c4854be2b70018143df53d090df3be31f7a17de5a8c2b2a342c864b3f610af9de1dba3046a5ab9ca7ab5460673be55d36d88dcda7c384d08231 SHA512 1993249aaeeb39905846030c652bdb9c4437e43f6fa5fcdc87f6578f8583cb500aa2859c9b0026cb45b25319e53ee11526a16ab1f322aabbdf3d3b9b5da36b59
+DIST genpatches-5.10-236.extras.tar.xz 4060 BLAKE2B b79eccc56c3eb9c3dc96ae67d22f4fd5144ae9c00fd948a31f6f6346bd76cb04933578bb22234e698b94f0caecf5e4fb3b57dc2190d5e87f017e19823cbefc90 SHA512 613f3fb02ff10f2320a0bf7861763f3d06c48b7f3bec0925d8d5e341744cf0c2c6396c17c277a4e1d5ea45fdb5fb88845bd5b6975749274e67dcaef183b7ba3b
 DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B 6911fc0fcef31daa55ddeb93e121acf4a95d130866f37ac0113a8697df1996c13bbf65e14f4a5703f7bb3f4dd3ebfb29e258ca358d191c0580a7f8e61fbf7c0c SHA512 3fc49566b23ef50590a3b9f90eb99558c9e37847259e0defdfb0ca036c37b7f45c4989d58787b8488c67ea031114173319346c1c17799680ebfdc581ae7e4588
 DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B 1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7 SHA512 8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041
-DIST genpatches-6.1-110.base.tar.xz 5564556 BLAKE2B f479e7fc7a12222c9b0268825fc8200e5bc3d73b81cd2d5b64bd321bc66b4563ae17d2bb66a0b0610dbac3059564b856d16c6ee122ed51a4c72d18795575ea65 SHA512 a0e8beec29ec7c63fbad02d13acf561ae694847d482f34a9120a06692aa4df1440433b19027484d3ef6a50221411bf34d175a4c833cda56aac4578da8b0b67d5
-DIST genpatches-6.1-110.extras.tar.xz 4052 BLAKE2B aeded3974b119221fe8546f59eaa9a89842b24c0dd7d1ea45be003dbf91a62194b04d01e9811abb4a4af21b0e7b77e35b521a94f6042954f6fc09958fb41a84b SHA512 729ba854dc3513d9149860015013ea8e539bbe6adca5a28c53184fe0cb722307e96998c26dc1966e25d232e19e3188daf4adece4692d2804132ef956267629ee
-DIST genpatches-6.1-112.base.tar.xz 5686744 BLAKE2B 2a45c958031096547d8db5c43413057444bc76eabb91937554f78c9beac08318cba3ef890e455cbdd85f0b08e6d759a2374237a2be75293812df3bc68fdf1663 SHA512 c0c2a19af8f2bf1e76d89e084eaf4fa733bf868c11b3263f983b060f4cc7d82869ef1659939d097acce33339e25ed4f0b0f3144499913fb1ace8aded593d8a24
-DIST genpatches-6.1-112.extras.tar.xz 4056 BLAKE2B d592f37cdd0c21afb347ff53965f6fc9ab962b8ad48d666cbc55dd91a32701918669b8fe8997757aa55d5923829c237aa27b7d819faff74dbac2fe88b5863fca SHA512 aff46e4c47e3e0398a8d371a8821afd7d6d7ee33997834dc5532e007e8b69b333705d6978f0a32496073eb6d06607cb34626a1bc932376361ce2baa9587f918b
-DIST genpatches-6.1-113.base.tar.xz 5796104 BLAKE2B 0b6ca23a1a97810646b3424764e71335f6749ac5462ef5b6baa37b1873b106cce103654b8efa8c91fb137fb253638bddf250247b2e4db8e160e2ea714eb23cca SHA512 eef7a965a901e749a60b3f9486d8c281d353c47637f6468d53521771dedc26de3dd8d9582adc72da4730f55dc5f1b5a4555f03281c3a836d1760c40920464446
-DIST genpatches-6.1-113.extras.tar.xz 4056 BLAKE2B eb8f6f49888245bc0f9b174f326a19658871dd3d2c34fef83514469b14d8a7ea84c0efc17f988143324779b571251881732d906975902ae77210eb7a20aec938 SHA512 09b36640d1c31ec865031810254ff2613e0945634b8afb54dfa9c4c22924b1e37f53559e9a7bca9307c2d0c15b0cccfbc588fb795b7eeb38d0f33e050ab53de6
-DIST genpatches-6.1-114.base.tar.xz 5814096 BLAKE2B 676bdc7fe3d68811434a210499f256d02ae7550ce9924175c540cb918e001f3360f1be25d88424d54fe4e1fb8918b07cc17862ae12bd714c38a165607842ac95 SHA512 5076776da85531ca7294150059d87df890da88e05da9eb308938131eaa86c1ad3a542f5afc9259ada433caf001ea8c13620ffabef11d1ada08af83c0699405a0
-DIST genpatches-6.1-114.extras.tar.xz 4060 BLAKE2B 649cafba566d627d5a302874710ff22c6d102e5a93aa4516815ae07fcc0e7b965c0b4b4c8850e22ccdd4ac0f7e447d2a5a59edeedb0f89ac4eb5e68df94a4f3e SHA512 07126cc655b3690ed7ff7399e385ce4dfada1e0e1a16f2e80fe5f0f0bef3ce4bec48f9527b928646a600353537e362b23242fb40a3a8bc5ad69ad99daffdab56
-DIST genpatches-6.1-115.base.tar.xz 5849032 BLAKE2B f506bede128cceac85af1219dd60f46753f80c2d2e7e23c1940c5e7114ab4ec489f94e839c24fa5fd8ff0f2ff72c60b313d66fe95a480026851cfd30b05ad6d6 SHA512 b91b4cdb568e4eee159ac1cf36e18afeb384cd96402dbeac53d6af2d03f1cf496a23a73400487d32f0808cf1dd01929e5e031cf5c97a8f027d4bf6e93860b726
-DIST genpatches-6.1-115.extras.tar.xz 4060 BLAKE2B a7c40e52a42d0a1d7438bdeb658a427251fc3df9d9e5e7be3f6ecde3242a286d686adc356234b5e0fe0a7c7403d5f4b422661570d001fac0f590247bbe519f6a SHA512 97706920ff2f3e965f499917fea7a9013c191083114635147c759f1277c63006cdbb59c60bab40064d43a5d8cded27c17ee1f56536f766ca839fb045c428e810
+DIST genpatches-5.15-176.base.tar.xz 7318820 BLAKE2B b7b87fa0ff1bde133cd721f87599163aa4609b3416677850fb30cf2b7afafff316bd50ba7301e658670c1abfbc81c29a0a40dbf1d8d6d2a7bd016f7a27bd9c01 SHA512 d4e5df70d7c28f0f39eea7b88fb27d76d4773ec41c52021b87cd2e84578dfb3421c641fbd212fd2f8961cb0dbb7f1e6237f13c5a3a1c348fd777eedf88b70ea2
+DIST genpatches-5.15-176.extras.tar.xz 4060 BLAKE2B dbef39ba2f6c2132b27632ba2dd57f0d33704d19df5c775b2fc8371d64c7b02519443fa847d1d7e16567ae8f27ac6de6f12964b4263c81629d4cffcd77dba1e1 SHA512 850f1fe5bb8d8cbee8cde9e7f84233104955390829e0c95c0c43d27d95a4416dbc3881f590d4475d0921f88d26c98f100195a3731e6d9130d9f9f346d916bf5b
 DIST genpatches-6.1-116.base.tar.xz 5862440 BLAKE2B 57df84154c9302bfc602035d8b06ec4b8e2089e8529d8a425c6912c46ca5d7f5782e60efc1600b085a1e60f4f029376485aeeafb6890bab20901df152c18bf25 SHA512 7467a3963981f8862a0898f4baabf95d25c4bc13eb5cc41b28307d48150bb263cd34be392f6e0130e053105f385ae963b03d306268c9eec3cc0e807cd3e56a7a
 DIST genpatches-6.1-116.extras.tar.xz 4060 BLAKE2B f1c06b3d9f005cf93a317e051104af5a5838dda32e7d480d67655d26afa636741053da4e3c39aae81593cc12708d829d4a8f9e167346d6b038c4b72bf70c9626 SHA512 3ff2f66f10a0158c9890ba629cd0d0bea46fbf5ff899dd4a0dbdb70c5aefb2ab0ce89c316a76441d0dc500e740f79b15568209a4f97b82a1efb0ef088ea00d36
-DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B 3dfb069409ca8c1cc8022daaeda3f45443c4e11ab1b086d8178ae4bd7e9a77fdbd8016484324248370bfa4b92e1a10cfa67d40592fafcd8540cc917c60b52ea1 SHA512 ea2f80b065c59b485446c8acc174b93a688b9e6d5de8cd9bf307a43811f6087368b528647a2371636b22dc082735b57e470e9c5d1092972c3890a9c628db723c
-DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0 SHA512 765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60
-DIST genpatches-6.10-6.base.tar.xz 257104 BLAKE2B 13309e86f5b16ff79797736ac91214698afb07ebc167eb22bbc354432f64e26dc3c19e0e4bccaf4fac7f0c858b7739317db3ffec9eef596eda5c2a45e785bac3 SHA512 55c009415c1b03c02a5e0251c8a12adf9eeba0fa7010cde100735880332127bda25bbbc59f9105c091fbc5bd67d7bbcc4fe02fbf4de7bee645bc679649ca3a67
-DIST genpatches-6.10-6.extras.tar.xz 4056 BLAKE2B 746ea837c1ba5ed7a4385b2f60be08986ad43f0c2eadebbda940d4cc2f7eabdef830459c55c183a68b63be318af661a8bffa25bc5da37628efb1f59987724c8e SHA512 63929e552c0e648245f8b7af72478bebf3a19be2f9aeda2d37e68b02611a69bb171338228c1c1d46b352236f63c3b514e24ef4f0260e0477d487d02ffd99ddcf
-DIST genpatches-6.10-7.base.tar.xz 309388 BLAKE2B 7c1b7e7ef111b090d54c616d2e4df14d2f914c0e5b5a947c27781c237de9ce53d42c4cb9c6b55b3e0711485a0f28bcdd484babb0ecd2d3e0d508712f3e5e8979 SHA512 828c4638cf3b29e2513bdc418cce2ac567b593a9c2b710c564c49193790e5268e2be5a37d341f3b2aa08a59d36f59019021d3d5fc5a2ec7fd4f45b643d686801
-DIST genpatches-6.10-7.extras.tar.xz 4060 BLAKE2B b07e59e37eca5c1a3fabd0d062c67f35f404244f93ae10b423d6849ff4d141fd184619d93551014ddc02db0c3379b8b2c486f71ecc798c1a53c20ab5a5a6a426 SHA512 0938b6a622b8b9e6e251fdf7689d972e1aa0a78ebd1cfabb7686298286f87bf9f0e30fe01f64205f775d90e870cb2cc3eefa73b49100a82ae01a6399376d6e94
-DIST genpatches-6.10-8.base.tar.xz 391536 BLAKE2B 636997da732776bccbfd9dc0543a452bd38a42876bfa46b4ec97034880fab320017de72c50b87ee2e7813d1231babed5b2649e65f603dd65dc4280f119ba94e5 SHA512 f2b23a7a244c8cead4b5644d3c7b34bd1ac890e8822f673a663f44902bcbf85b00ddc3dee25664636f3ccc6893bcc89358fbe7733d89c8b2f681c4e6b6076da2
-DIST genpatches-6.10-8.extras.tar.xz 4060 BLAKE2B 62f1c87268953d69bc08bb9a601d8b446c31c5d76a50d0c3f67d8048b24e1fa5327fe5ec8cfcad95bc83a39dfe7daec856a23775e9f797241cca30fe8935c13e SHA512 a2925de9fba3d5bfcefa81a01ddc919e8dda835a433b952deb455a1c7065f4272cb26e363408b2fa92ca9b2039fb596a4b99395546b04b3ea96129176f5613e1
+DIST genpatches-6.1-117.base.tar.xz 5955428 BLAKE2B 92c1aeb4d98cbdfe8d83691c76e53f894e5749805bff33676263b19b67eb1315012da7ad5df5cf129406c0a0f1726dc31cdc33941eb2c27db699f04333b2729d SHA512 80fdb4aa7531a7b10bc543d8deaf2b82115f9b74112c53f787f9fcdfbf83c626390c4e81a6811874263753c74b0adc19cde44f6a54c22f6ada7e774e7a2247b1
+DIST genpatches-6.1-117.extras.tar.xz 4060 BLAKE2B 905d6488cd4f499e293bd6f2bc0d9ac16b073ce543c8cdbe76aa6faa2842ed78fcd42568ad53d3f9c56e7a2065a0fbc63412988aa801bc6050897459f8d8d39d SHA512 c6b4b85b6d02e04383c59749965776f13fa22719c4527b030862831237355be9e05e655b112489efadbdc0fa5574a2ca0e5f57948d4e1323febd9bf20f2da8d7
+DIST genpatches-6.1-118.base.tar.xz 5971280 BLAKE2B 361e76404976baf66412e6eed6e7158758a717f0c7f47d7c6e8d1e6f6f78d2a20762e98054b2b9318c5d0e18ec66ab68b54d914e87e51d1e02d7d20c44a8722b SHA512 465d6e70f75bd3cadec5b324e418a93e461ada9a14d5501736190f61627f82e44271b9513a20add99d230ada8bf2666a3c431b152e69363403883b125c607d5a
+DIST genpatches-6.1-118.extras.tar.xz 4060 BLAKE2B 4c070ac173f5504aad3970756c78f48bbfbdba6f690b412ac3258e866a92851b631c1d7a19974dbea22bfd58fc784d39a41499f8add80df90c3f26bd23c5adce SHA512 7a0b27f54e544db7290c371a88ad7544a8e03f04172f3fa063dae05118f2ec5eb76d0b78dacfa87122371ce3a584cece17ea0ceb7003d5fad3a1ff97e26f4696
+DIST genpatches-6.1-119.base.tar.xz 6000764 BLAKE2B 1867fee7c4a1e50bc7b59ada634ab0c154d7c033faafebf9429e1f181d2a6db3c6a3b2be30384fc057c5390d9407f0ff0b4eafe8b527710e19f0fbe24335cdf7 SHA512 efb447fce7090a28fe8ff7c88296bda5d424dbe9837fc9a784f78435c810421966ed0a46e3c38631cf00fede81be8379144ad5d38f2dde2b65578a89016fe623
+DIST genpatches-6.1-119.extras.tar.xz 4056 BLAKE2B 52ecde24bf197791cfe5be801d881d26904b4503bd3e7857b6a6a2ea1e08fd0262a7e01de498854a931c5407f90d1b5dc73fabb3eb22dd370445f7ca057de0a1 SHA512 088e01360229386b880b2be615c0661c2c247a636a4d4810675fdf576bdeac3bb1d487dac6ec72ad88f4353e418289410f504b432fa8dea61b299e2f596370c8
+DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa SHA512 3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
+DIST genpatches-6.10-10.experimental.tar.xz 81200 BLAKE2B bba2fc9daffcd1a6ce397682a4ca825486f7e45b6932f1f8bf9591eb16385caeefd70bb7dee406d80b248209f707f3c63a5b69d03225e6c84c48a19c39480cab SHA512 5d89064860cbc2bab7ee406a24e5e0479ad2502ebee3bb2c2f9ca81c443b8b2fbcc5944eeff262de5acae5c2a8276872f7d813013887f796a67236a905e38208
+DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
+DIST genpatches-6.10-11.base.tar.xz 553020 BLAKE2B 11a958ebd8848d9023a9cdcb877039ba04f72169ad78e47661890d31b73ae7a9fbdec8d12507a1d16eed08ba59f4a6fdc38ed8b6b02d05cb44198dbfcfef31e8 SHA512 3a3c1e5cbee053ab4c9c731bafa723ffcdfc8179e62fdc0eb16469a15abb5fec8ef4ff395305fd4502ea9cab70702e071f6cf9d0397cb185a987e8fbc880123f
+DIST genpatches-6.10-11.experimental.tar.xz 81200 BLAKE2B 0f257061949407607b722d834ad3d937db3737c33df1f9872ec322572ec824dea84f43a8001da76c2eef5e71cfbdfdc18444f0463014a23060be9b70656f283f SHA512 1ffd35b7a57ccf4055a5553e1262b4ae94e728eb8c395cc00d1897d082d625e3cbcf65e0ade7d04f31c31e4896d6629716642199bf9057230530d00b234f5f46
+DIST genpatches-6.10-11.extras.tar.xz 4060 BLAKE2B 98d5747be50ef0a270a561f379946213cb32596e01aa6da66a3cdd8a57dbea491af4265b052bc9fb1089e74818e249ac85228bc85aeffa34f8bd18396ceaa18e SHA512 e1ba5f037ae58c9ea4434f60817b53282494c8d25a659a0b6d9b75db384f7706b122bde225640e2028cfc36022a6cb0d1b5711685a4a265c75f3592c278a67f6
+DIST genpatches-6.10-12.base.tar.xz 602316 BLAKE2B 6cd02be7fbe2322d246e826d04236dba2ec5b40acc9c8575fd7a5d0d745cd0629778176e97db920ea198e939d332407d9dfa2f369ea4e075be05197a1ba7ef8a SHA512 595e302e05256994ad0077f41c6d6c3677eeb64a7cd1b11c823c689822d4d257bdd8b722b22542fc779e777ffc28f782f7bf69e8a0bb6ec3f3d2b111aaa789fb
+DIST genpatches-6.10-12.experimental.tar.xz 81180 BLAKE2B aa9b3f93a2c79fe0020387fbddf90367771e516c6408d71f1dec2ffa8efee112764c610032a534fbd9b6e04a257b275cd9713819809a524c48fc57c7b869b546 SHA512 5d1a8cd267c6abe5d795f00d475dc2b0f22b43508151bc4ea4b79c6293aaebb53f081bdc0631309b96bdad61e4fd70d1ad0f83cb1c4fcf73c5bcfc565ce31046
+DIST genpatches-6.10-12.extras.tar.xz 4060 BLAKE2B 77b8b8cc0ed8af03ca45e1224e6de1f14d59682aeb411488e4c5eb6f9f4252a50ae442d60eeba496491c62013c7f1cb7af9f7e40622e1f48de7f0b85c4686c28 SHA512 95cf8c15fab7ea99e7c55166d445494d85cf843d9bc32e3055789ac20d725b52687d1077890c22aa39719a9d0fc7745b0d3346d014077171b1009a3a353f04f0
 DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B 3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11 SHA512 9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f
 DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B 2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952 SHA512 358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
-DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B 3ece4f33cce7380d247fe1f3182e2a516a8e63ce1952e30593f228afd4f11b67d838a0374698b1c3f48992ce04f4b55fcc258c8a41bf2821e01b6c4bd4829d07 SHA512 2a514a91d3e7b8e51330f6852edab7d8481dfbfc84fad4415141dc3d0c68865f19724480a2403e86e080d368004d26669f365de233b6dbe9f664946dc168e853
-DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f SHA512 9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197
-DIST genpatches-6.6-50.base.tar.xz 2671516 BLAKE2B 356a9a17f69416423c37c801e715dd4b03d1ebf02411a3e637e3790b4adba44db6c04f51f19a6da4ba420332cd5af1221692dcfc2ee1101825a5c8a8885c2e44 SHA512 e7a74df4659bdd54bf0bdb4aad8172bb1374aa563a19d28cf9643d034b59aeb55343ff5048d3aea42ddcd7561f0f723f951ab1f00c05e5ad88d20e70b7c3069e
-DIST genpatches-6.6-50.extras.tar.xz 4060 BLAKE2B 57044e169841ec9e977b107ad32741262bf3f1455638db2d105e160f2ccc21a6dc6bcd75e09e7f0761ffe3c1879dfbaf39bbef8150cd0de407875f2bbbfd700a SHA512 5c0d55dce1f869f79ec0db577d282b078ceb17667e5b18ee1abb00a6f94ee82978039ddf9650cbccfa1b8f9b99abd48057c44b230510bebe17d890e316d6c7fa
-DIST genpatches-6.6-51.base.tar.xz 2817576 BLAKE2B 42dbf8663f53bc7196c57c7cb93029b780354e6e1580405b08a34fadd2ea38302c37bb4559df4c65916b0ec2f98c61f7eced52fc6be3de0d6dbe7468dd3d8c22 SHA512 fa25988574b06ad59403b1858d97f70fe0e6056d0b889d8a6e56f44b763146da63a952a2b7361f3bcab1aa34c9a3a97f81a35113a3e5173a2e09b704e54c386f
-DIST genpatches-6.6-51.extras.tar.xz 4060 BLAKE2B a9e7008c67de6095d6c97bd6fbe9f7359e71d0b40aeb11a0ff14a0cca4feea199a3895bd9ac086d3f011b5c35a98f46d5856b8d27ca7438b8979203ff9164155 SHA512 fa649b918f1bcb7dbe4670a30dbbb47bbf8d57da73724463bc8fb5664c527f082a02f06ac96ff6a538469fe73fe0978f97bcf69b64a1a8d488387ff5a06844f6
-DIST genpatches-6.6-52.base.tar.xz 2852888 BLAKE2B 1f393bb3b90106ebab46858e2b7c2b3c0ddcff3238ee3bac594ced79e09fdcab47596859004e2aa5ce3ec9bb2acfb33d9afb9a9350de1c549cae37589f0f4755 SHA512 ce0adae3031e902dcacedddf799667a71ae3bfd5186bc435e30f266e2ce850f51e73f0ddc3d4ab2c62a3b485a55623ec00c4a57c98524d1681a1d4b4c9c2dee6
-DIST genpatches-6.6-52.extras.tar.xz 4060 BLAKE2B ba934440bce51a7d2497cefd4f98bc48bb4e1005e038bfce6d8a13660ffb9f3e3d21fb260293b5717722811c600eede8e4a1c5f2261d42da7178005ea95ec9fb SHA512 74fb01d8e49647b1f1ce134958218ec47eaf7983c55c01724a266ab29813c5878bf98701ba4af80ed1a6349d6799e7c1ed64ebe7a47584d79b38f66f91a9ce97
-DIST genpatches-6.6-53.base.tar.xz 2894996 BLAKE2B 68c68a4f3ef4ad60204cd06f86a3cb54810427d93ffa55d7cf08265f759cc9d789ade864b19964cb5c5ed0cb48cd8fc309590741bf9a02f97e226a7bff8b80ff SHA512 c328a28a3954b993a82024cda27720ac6667ba48224bd40f08e3d9a197173bdfecaa686fdde2cd96353b7fd38137091eeb6d9889849971d21b21ae91eeb6069f
-DIST genpatches-6.6-53.extras.tar.xz 4056 BLAKE2B fcc3c11e40145badde05428b03da9323a440357525d6f0f08112dfa6c2c4f170ddbb121f6d38503923eac0c1841ce697d0cca0654784b39b048a40303e8a11ba SHA512 8fe3053597ff48c9f4669faabcb9165e1f64454c2f5993a80a04ad124eb113361369cd2607ee40bdbfc0dcced95ff57381beca9b0ff7982d14dccbf3048144a9
 DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227 SHA512 102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
 DIST genpatches-6.6-54.extras.tar.xz 4060 BLAKE2B 22ea7d143bfe168bc5d9d30832423bcd33b49c1b3b5ddf031000d7d9fce96f6fa0fb1d06fd33b27a5de9c9f3833a139557f0ed7408ef12b23568784ff38ca7a9 SHA512 1b1a229b5923e7f3426139b17608b5feae6061313f7aea66de23f09a54696def39bf4b384c4e884a3e5c758c08e04dcfe1ab7f2aa331db74b59f5e511c6f2c5b
+DIST genpatches-6.6-55.base.tar.xz 3018672 BLAKE2B f5f3e39c634e196827da06935b783cb87c3503998df6b1f3d711484ab984b4a378feee96a45b932b409593290ea7a77271eb39a1e5085e5a4fde3c3307ced95d SHA512 88b2ef56dc0c2e1e7c34a9a81b8981d4c8ab6ba5e5821cbf3da8e608287375f2f0eaff427fae8f47a59cb9fe2c3b8a9d9c569108f27b833a10c6b460dde0bcd7
+DIST genpatches-6.6-55.experimental.tar.xz 5760 BLAKE2B 0ba9c83ef35831b973dd1d1c2b89ca020a8586fb298ebccd85f6dd16e18af61e4b404dfbb9fcf538c907f8d8edadda29141ae78f45549c2db1513214393930f3 SHA512 3fd7434efbc2bb8fe0a7c4944490611f809a3de1dab3a63d0618995940dae4c47b96279e7d5b876f203916856f1b2029844cc5614fce92c3dfda80fc682055c2
+DIST genpatches-6.6-55.extras.tar.xz 4056 BLAKE2B d54e353fcd41ede054bfde20ef5bc6518056b1069e440e8ef31b4021ba2b85eb4b578e8aa73a0d778e21a692914ec850f2604e635ff178690a3baee4dcf106be SHA512 a59ff175eb6e7491fe635f65dc44878b8fbf5eacf805b7158b3e9b6c4313881d24a13fd6d252f23c7fd9b5eac1a2c110431ca02aa2583fff71cd306d1b4f3cd9
+DIST genpatches-6.6-56.base.tar.xz 3040548 BLAKE2B 751529aa9bdd2aa696fb367cc2afdd4def0783640c847d65d836dadc74531e5fbd5595ec4aa1f89fa62004d9437dab57adc92b64444b5ed3299a3ae6884b86c3 SHA512 a9e08b3eb6fc9c2b595a8ab6a6933349172655da0126cac6498d0c541bd2d6e1377b849041f03af519927219c17b618ac622f45ca931bd0770bee63c64023a26
+DIST genpatches-6.6-56.experimental.tar.xz 5760 BLAKE2B 765851d3354c1052419db0ec5b76af969f62b4558c0e509a9bd4580dddef9796e3f2f089509a266dbf12b050bf0d0e61b484b3faab5b3cf869e4d5fec421114d SHA512 3cf75b06df5081c4fe07e2d722e9755a1f554ffac332e168fcc63221716db35bb0e543e74df7cf3568048fa1c20a221827f91b48af155c24d96eb9da810c08fc
+DIST genpatches-6.6-56.extras.tar.xz 4056 BLAKE2B d54da14f3afefdb9aa8c6597913f37c5d1314e4a93216608bee52a52bcc05924bfadf2d5e7e49b0488159b0a57942f1579a4e7b3fcdc90a78c10e0efffb6a1ed SHA512 ba961d5434222ecd618cb44b08ec6413d98c1d1958af2712065d924370141f789ebb315dc53a5bdbb75d3cbe86cf719983e66a58d537eb78455eda509689aa73
+DIST genpatches-6.6-57.base.tar.xz 3079200 BLAKE2B d0f16f9b2f09f182c02fdb6cfa4b76f3d9d41f22b149d50faff129daa677b97830128a40c8c2f98b2534b722865b49b8a60b5f205b7d3284ef94a67946a4b460 SHA512 c6d16e6d814d363f0e34f3e7d569757f787340889f395ef9b3a273582a3d72d60b692e872764e5f411ac9a8648d886c9f6522342c238a421e423b2cd0e6b40fa
+DIST genpatches-6.6-57.experimental.tar.xz 5768 BLAKE2B 85a25f5450b03a93d0ba2726b0fd90a2ccd1f5a39561f180d5900c5593ce5c9f52eb1186ec96c571d343df133d630247649a0692c03bc93163a3201d7b438d86 SHA512 e1cbd5dc1271ebae1734551abac7a93cee71c68b6d04bc2f4dca5b3410265ab3920e29a8602df0ea99313c11ce51889c2e9d4a19053c83ac0a027989fd9bc307
+DIST genpatches-6.6-57.extras.tar.xz 4056 BLAKE2B 9b071880383921fcc8cd2da092e1219e3b40684e6ffd04bd2ab75fd53624cdcb7289f1c40ae9256e0343bbea92393c153724ee628e8d164596ba4d7f8bb413df SHA512 a61cbf855e718ca7afed0b15614ad2e9bea740412e8251b35417d10f4b936364cc3820951acc45be2b18cba635cd1c43da8caeb4ac315747d02201be39148c8b
 DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
 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.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.10.1-gentoo 281641 BLAKE2B f4157148dda5fe453b055fea66756e380fbaaf0378b9d1f74044af4ccb5b3da9bc7448e8ec553d30632be1bfe83e961f5751458cc4018d1e8df531251d32e3d8 SHA512 0f5a492318891b295a226f70d5579095ce34d9b547410a1873131c455356ab576b5093b8d1d32a166a01e033802b083e72a7c0f1236495d36ab0d6cd367eebbf
 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.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.10.1-gentoo 250040 BLAKE2B 0cbc4d4a0ae82cb44be5aaad35f1d8beaa30eb829d31edf1a7296acff65ae2773dfa8b7da3cc0c02a08db1f355c7fd4fa080daf97b5d66c9b69c6c1f2e421ede SHA512 eee7747b6160e9caf6429e67d3471c4dd7f0f72a0613c0e19944c86b4e0a8025b737de41b6b072cc88f40331a2b2a780ae60c426957db36ff2015850a6d7bc39
 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.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.10.1-gentoo 237077 BLAKE2B a1d816e8015e1c2548c9323e5c595b18ebee2e5d79a9269a3aadc3daee658a2c54fcce97f7182901610fd51dc667c24699345be9e1b28d736d4acf3c41b6b2a5 SHA512 945a529c5dfe3ef92ccb3699d00e28aa1620c4de52fcd611a5c09971bed16a40594c888fa360270fc74b6cf2ea7a973cfa230d35fec4972dcb224d58ec695106
 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.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.10.1-gentoo 251109 BLAKE2B 511862bd42123b8e8072be0d3a2693187713eebc73d8938770b862ffa25e7a6f69225971aa6bbcc1adc0e8d43863514e9f2ed1dc1035f044d9b402e122a6144b SHA512 af5e3c7eb64535f875883e61bbcb018dd1aa25f661d7e4fc985da3165be074037045f97cc2d6b1882edc9d07aa83c78358867c6742babdf19d9515108c74c44c
 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
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.222.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.222.ebuild
deleted file mode 100644
index 27f4a7de32fa..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.222.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2024 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##*.} + 11 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.10.223.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.223.ebuild
deleted file mode 100644
index 0845d4e45e94..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.223.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2024 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##*.} + 11 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.10.224.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild
index 0845d4e45e94..faa3575b372a 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.224.ebuild
@@ -43,7 +43,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
@@ -73,19 +73,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.225.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.225.ebuild
new file mode 100644
index 000000000000..c8b462be8aab
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.225.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2024 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##*.} + 11 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g13
+
+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.163.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.163.ebuild
deleted file mode 100644
index 3ddc98aee6ee..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.163.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2020-2024 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 ))
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g13
-
-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 ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		sparc)
-			return
-			;;
-		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.164.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.164.ebuild
deleted file mode 100644
index 644b0715a957..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.164.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		sparc)
-			return
-			;;
-		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.165.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild
index 644b0715a957..60ead9bfada5 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.165.ebuild
@@ -43,7 +43,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="debug hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
@@ -78,19 +78,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa | sparc)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
@@ -100,9 +97,6 @@ src_prepare() {
 			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		sparc)
-			return
-			;;
 		x86)
 			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
 			;;
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.166.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.166.ebuild
new file mode 100644
index 000000000000..ee513a79ddfd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.166.ebuild
@@ -0,0 +1,136 @@
+# Copyright 2020-2024 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=g13
+
+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.100.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.100.ebuild
deleted file mode 100644
index 92d39170d6e7..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.100.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2024 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.7-gentoo
-GENTOO_CONFIG_VER=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.102.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.102.ebuild
deleted file mode 100644
index dcba4a9c42af..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.102.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.103.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.103.ebuild
deleted file mode 100644
index dcba4a9c42af..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.103.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.104.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.104.ebuild
deleted file mode 100644
index dcba4a9c42af..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.104.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.105.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.105.ebuild
deleted file mode 100644
index dcba4a9c42af..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.105.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.106.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild
index dcba4a9c42af..abad8f6c97dc 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.106.ebuild
@@ -43,7 +43,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
@@ -79,19 +79,16 @@ src_prepare() {
 
 	# 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
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
@@ -101,12 +98,6 @@ src_prepare() {
 			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
 		x86)
 			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
 			;;
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild
new file mode 100644
index 000000000000..21c9b05e1334
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.107.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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.108.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.108.ebuild
new file mode 100644
index 000000000000..21c9b05e1334
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.108.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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.109.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.109.ebuild
new file mode 100644
index 000000000000..21c9b05e1334
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.109.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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.10.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.2.ebuild
deleted file mode 100644
index ca5dae3c9e15..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.10.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.3.ebuild
deleted file mode 100644
index 2bcdbee61cf0..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.10.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.4.ebuild
deleted file mode 100644
index 2bcdbee61cf0..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.10.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.5.ebuild
deleted file mode 100644
index 2bcdbee61cf0..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.5.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.10.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild
index 2bcdbee61cf0..bd5891485cf2 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.6.ebuild
@@ -81,22 +81,16 @@ src_prepare() {
 
 	# 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
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
@@ -106,12 +100,6 @@ src_prepare() {
 			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
 		x86)
 			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
 			;;
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild
new file mode 100644
index 000000000000..f8ab5cbd3db7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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.10.8-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.8-r1.ebuild
new file mode 100644
index 000000000000..f8ab5cbd3db7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.8-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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.10.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.9.ebuild
new file mode 100644
index 000000000000..f8ab5cbd3db7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.10.9.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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.41.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.41.ebuild
deleted file mode 100644
index d037ffe5cc80..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.41.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-# 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=g13
-
-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}
-
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.43.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.43.ebuild
deleted file mode 100644
index 4f603a059b70..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.43.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-# 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=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.44.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.44.ebuild
deleted file mode 100644
index 4f603a059b70..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.44.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-# 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=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.45.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.45.ebuild
deleted file mode 100644
index 4f603a059b70..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.45.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-# 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=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.46.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.46.ebuild
deleted file mode 100644
index 4f603a059b70..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.46.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2024 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##*.} + 7 ))
-# 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=g13
-
-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}
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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
-			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
-		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.47.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild
index 4f603a059b70..094236f9d67e 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.47.ebuild
@@ -45,7 +45,7 @@ SRC_URI+="
 "
 S=${WORKDIR}/${MY_P}
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug hardened"
 REQUIRED_USE="
 	arm? ( savedconfig )
@@ -81,22 +81,16 @@ src_prepare() {
 
 	# 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
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
@@ -106,12 +100,6 @@ src_prepare() {
 			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		riscv)
-			return
-			;;
-		sparc)
-			return
-			;;
 		x86)
 			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
 			;;
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild
new file mode 100644
index 000000000000..6518c0eaa2fd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.48.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 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##*.} + 7 ))
+# 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=g13
+
+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.49.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.49.ebuild
new file mode 100644
index 000000000000..6518c0eaa2fd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.49.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 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##*.} + 7 ))
+# 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=g13
+
+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.50.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.50.ebuild
new file mode 100644
index 000000000000..6518c0eaa2fd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.50.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 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##*.} + 7 ))
+# 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=g13
+
+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/metadata.xml b/sys-kernel/gentoo-kernel/metadata.xml
index 5eaf5d2b77d8..8780632adfa2 100644
--- a/sys-kernel/gentoo-kernel/metadata.xml
+++ b/sys-kernel/gentoo-kernel/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Distribution Kernel Project</name>
 	</maintainer>
 	<use>
+		<flag name="experimental">
+			Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
+		</flag>
 		<flag name="generic-uki">
 			Build and install a generic initramfs and Unified Kernel Image,
 			this is intended for building binpkgs with a pre-generated UKI
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index dacfc1dc5f78..ed934f9d5e82 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,17 +1,49 @@
 DIST genpatches-5.10-235.base.tar.xz 7367252 BLAKE2B ea3261b363e415112f0a13f4666dd226a33ad12962d481532875e7e8551ef739a55ebfee344a299368b3cc48cb1c2a465fe4151ec708983d1daa70f9d36f849f SHA512 bedfd9382d35a151c0b7ec102614d8a1f9866876ff4e308867803c32416db31d34197c26b6dd781c9a0c994e49df33de943975cca8ef9b99680916f2cdf2f325
 DIST genpatches-5.10-235.experimental.tar.xz 11856 BLAKE2B d19ae28178b9657da859d28d3105a086c17e2f788155451b8e349fbac0d0399da683def58586c22be3764590c1282af0bf57c96f0c912ae508ad5e4b1059b5b8 SHA512 6573577c3fc10d1ec6beca350e5dc8ccb6b54fed7a828603204ab0965d4b88ea04bffaf3c73d58ea322293fc9a0694d24bb1bda931684bcbf41397b830788f63
 DIST genpatches-5.10-235.extras.tar.xz 4056 BLAKE2B 6341fe389c77377eef465c9a92587bf370a56ecbbb65ec99eb2002e1e9525ad6a6fa1aa60f7ea28b52729a4779e236c706155f98a336358d12d1bf4c80381660 SHA512 d14506f3b69069682ab736b96116e58420974b77d99a22818601af7451aa07ee564dad10bef321f288be4594b6990b25521518865fcb111d9886aa3c1681f977
+DIST genpatches-5.10-236.base.tar.xz 7402184 BLAKE2B 24f0283c2dcc8c4854be2b70018143df53d090df3be31f7a17de5a8c2b2a342c864b3f610af9de1dba3046a5ab9ca7ab5460673be55d36d88dcda7c384d08231 SHA512 1993249aaeeb39905846030c652bdb9c4437e43f6fa5fcdc87f6578f8583cb500aa2859c9b0026cb45b25319e53ee11526a16ab1f322aabbdf3d3b9b5da36b59
+DIST genpatches-5.10-236.experimental.tar.xz 11860 BLAKE2B b5f00fe481a4f8d8161bdb667b3eadae756c8cc01aa97eef4feb1556ebd99c6f11d24938179d8587251e306daa39c4706fe38860076f7b8e1493a037be622592 SHA512 e689f9f890b7f85ab91b125a2b8c4d746fd90c6ce6754620fc5978e14be87cc73131c12913478eb3c8abcea6b8756fc71266fefe19578474a4e51554deeef125
+DIST genpatches-5.10-236.extras.tar.xz 4060 BLAKE2B b79eccc56c3eb9c3dc96ae67d22f4fd5144ae9c00fd948a31f6f6346bd76cb04933578bb22234e698b94f0caecf5e4fb3b57dc2190d5e87f017e19823cbefc90 SHA512 613f3fb02ff10f2320a0bf7861763f3d06c48b7f3bec0925d8d5e341744cf0c2c6396c17c277a4e1d5ea45fdb5fb88845bd5b6975749274e67dcaef183b7ba3b
 DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B 6911fc0fcef31daa55ddeb93e121acf4a95d130866f37ac0113a8697df1996c13bbf65e14f4a5703f7bb3f4dd3ebfb29e258ca358d191c0580a7f8e61fbf7c0c SHA512 3fc49566b23ef50590a3b9f90eb99558c9e37847259e0defdfb0ca036c37b7f45c4989d58787b8488c67ea031114173319346c1c17799680ebfdc581ae7e4588
 DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B 1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7 SHA512 8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041
+DIST genpatches-5.15-176.base.tar.xz 7318820 BLAKE2B b7b87fa0ff1bde133cd721f87599163aa4609b3416677850fb30cf2b7afafff316bd50ba7301e658670c1abfbc81c29a0a40dbf1d8d6d2a7bd016f7a27bd9c01 SHA512 d4e5df70d7c28f0f39eea7b88fb27d76d4773ec41c52021b87cd2e84578dfb3421c641fbd212fd2f8961cb0dbb7f1e6237f13c5a3a1c348fd777eedf88b70ea2
+DIST genpatches-5.15-176.extras.tar.xz 4060 BLAKE2B dbef39ba2f6c2132b27632ba2dd57f0d33704d19df5c775b2fc8371d64c7b02519443fa847d1d7e16567ae8f27ac6de6f12964b4263c81629d4cffcd77dba1e1 SHA512 850f1fe5bb8d8cbee8cde9e7f84233104955390829e0c95c0c43d27d95a4416dbc3881f590d4475d0921f88d26c98f100195a3731e6d9130d9f9f346d916bf5b
 DIST genpatches-6.1-116.base.tar.xz 5862440 BLAKE2B 57df84154c9302bfc602035d8b06ec4b8e2089e8529d8a425c6912c46ca5d7f5782e60efc1600b085a1e60f4f029376485aeeafb6890bab20901df152c18bf25 SHA512 7467a3963981f8862a0898f4baabf95d25c4bc13eb5cc41b28307d48150bb263cd34be392f6e0130e053105f385ae963b03d306268c9eec3cc0e807cd3e56a7a
 DIST genpatches-6.1-116.experimental.tar.xz 17452 BLAKE2B 8114bb1ca5b14a1996e9f2a8d11caef693f1960e83aca2bb926291635289756fd76a9a8c38034b2767fcc83afa39abd903487f0150d3684169550407da967ec0 SHA512 e75f4afacbcf66ccb0fdf94c26ec384550a479d4c4847b621766dd3bb343a5851f40c34afbf55d16bdc61d09ed7fd847b66117329290b95fc2cc2992b5a93550
 DIST genpatches-6.1-116.extras.tar.xz 4060 BLAKE2B f1c06b3d9f005cf93a317e051104af5a5838dda32e7d480d67655d26afa636741053da4e3c39aae81593cc12708d829d4a8f9e167346d6b038c4b72bf70c9626 SHA512 3ff2f66f10a0158c9890ba629cd0d0bea46fbf5ff899dd4a0dbdb70c5aefb2ab0ce89c316a76441d0dc500e740f79b15568209a4f97b82a1efb0ef088ea00d36
+DIST genpatches-6.1-117.base.tar.xz 5955428 BLAKE2B 92c1aeb4d98cbdfe8d83691c76e53f894e5749805bff33676263b19b67eb1315012da7ad5df5cf129406c0a0f1726dc31cdc33941eb2c27db699f04333b2729d SHA512 80fdb4aa7531a7b10bc543d8deaf2b82115f9b74112c53f787f9fcdfbf83c626390c4e81a6811874263753c74b0adc19cde44f6a54c22f6ada7e774e7a2247b1
+DIST genpatches-6.1-117.experimental.tar.xz 17444 BLAKE2B 70a5ac496dae65b06a087c7a7053d07338ccf973d8689502d4f4fcb1c550d4539e40b17053d94c708c346b388b3679a872ecc007ab826d410295d3ef3e614390 SHA512 5ec282d2f0d8b14ce83657b9fa1dad9808e795fd99cfa53251ea7bdef48b2551e6e7b6722ae644f1aac68ddce99d4887c03753e81f3a997c559223bcf64c6f4e
+DIST genpatches-6.1-117.extras.tar.xz 4060 BLAKE2B 905d6488cd4f499e293bd6f2bc0d9ac16b073ce543c8cdbe76aa6faa2842ed78fcd42568ad53d3f9c56e7a2065a0fbc63412988aa801bc6050897459f8d8d39d SHA512 c6b4b85b6d02e04383c59749965776f13fa22719c4527b030862831237355be9e05e655b112489efadbdc0fa5574a2ca0e5f57948d4e1323febd9bf20f2da8d7
+DIST genpatches-6.1-118.base.tar.xz 5971280 BLAKE2B 361e76404976baf66412e6eed6e7158758a717f0c7f47d7c6e8d1e6f6f78d2a20762e98054b2b9318c5d0e18ec66ab68b54d914e87e51d1e02d7d20c44a8722b SHA512 465d6e70f75bd3cadec5b324e418a93e461ada9a14d5501736190f61627f82e44271b9513a20add99d230ada8bf2666a3c431b152e69363403883b125c607d5a
+DIST genpatches-6.1-118.experimental.tar.xz 17448 BLAKE2B 628f340e61e4630cf652b7fbbb15a106a1d4925ed64b7229603ce82717bc1d2e30dab2d131284656ea09e1aeab87e28dd457faf49f42192e4ed1a36ba8b29586 SHA512 42f3f87fca1cb5950735b36c534e1c491ccddf356c66ab6038e96ed5ccd9f0cd9832019c75f836a0015bb0ed591fda71c568741a77846de9164f816ef3d22e4a
+DIST genpatches-6.1-118.extras.tar.xz 4060 BLAKE2B 4c070ac173f5504aad3970756c78f48bbfbdba6f690b412ac3258e866a92851b631c1d7a19974dbea22bfd58fc784d39a41499f8add80df90c3f26bd23c5adce SHA512 7a0b27f54e544db7290c371a88ad7544a8e03f04172f3fa063dae05118f2ec5eb76d0b78dacfa87122371ce3a584cece17ea0ceb7003d5fad3a1ff97e26f4696
+DIST genpatches-6.1-119.base.tar.xz 6000764 BLAKE2B 1867fee7c4a1e50bc7b59ada634ab0c154d7c033faafebf9429e1f181d2a6db3c6a3b2be30384fc057c5390d9407f0ff0b4eafe8b527710e19f0fbe24335cdf7 SHA512 efb447fce7090a28fe8ff7c88296bda5d424dbe9837fc9a784f78435c810421966ed0a46e3c38631cf00fede81be8379144ad5d38f2dde2b65578a89016fe623
+DIST genpatches-6.1-119.experimental.tar.xz 17456 BLAKE2B ffd2f4ab2ed5ff00beee35e4c0959f5df7819c3114a4fc7332be18611fdbb208f0489bd5af0f41493480a745ed1bc9b1b264af8c9493258910e37144cd91fa61 SHA512 803aa5222ce47d202be7e0b6ffc9f50084038a292ec6952a9da0dbc2ccdf0873ed4e1a5a246e47e948cbf2dd5bc5aea143e3812d34b8e19bae666ca78476fdc8
+DIST genpatches-6.1-119.extras.tar.xz 4056 BLAKE2B 52ecde24bf197791cfe5be801d881d26904b4503bd3e7857b6a6a2ea1e08fd0262a7e01de498854a931c5407f90d1b5dc73fabb3eb22dd370445f7ca057de0a1 SHA512 088e01360229386b880b2be615c0661c2c247a636a4d4810675fdf576bdeac3bb1d487dac6ec72ad88f4353e418289410f504b432fa8dea61b299e2f596370c8
+DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa SHA512 3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
+DIST genpatches-6.10-10.experimental.tar.xz 81200 BLAKE2B bba2fc9daffcd1a6ce397682a4ca825486f7e45b6932f1f8bf9591eb16385caeefd70bb7dee406d80b248209f707f3c63a5b69d03225e6c84c48a19c39480cab SHA512 5d89064860cbc2bab7ee406a24e5e0479ad2502ebee3bb2c2f9ca81c443b8b2fbcc5944eeff262de5acae5c2a8276872f7d813013887f796a67236a905e38208
+DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
+DIST genpatches-6.10-11.base.tar.xz 553020 BLAKE2B 11a958ebd8848d9023a9cdcb877039ba04f72169ad78e47661890d31b73ae7a9fbdec8d12507a1d16eed08ba59f4a6fdc38ed8b6b02d05cb44198dbfcfef31e8 SHA512 3a3c1e5cbee053ab4c9c731bafa723ffcdfc8179e62fdc0eb16469a15abb5fec8ef4ff395305fd4502ea9cab70702e071f6cf9d0397cb185a987e8fbc880123f
+DIST genpatches-6.10-11.experimental.tar.xz 81200 BLAKE2B 0f257061949407607b722d834ad3d937db3737c33df1f9872ec322572ec824dea84f43a8001da76c2eef5e71cfbdfdc18444f0463014a23060be9b70656f283f SHA512 1ffd35b7a57ccf4055a5553e1262b4ae94e728eb8c395cc00d1897d082d625e3cbcf65e0ade7d04f31c31e4896d6629716642199bf9057230530d00b234f5f46
+DIST genpatches-6.10-11.extras.tar.xz 4060 BLAKE2B 98d5747be50ef0a270a561f379946213cb32596e01aa6da66a3cdd8a57dbea491af4265b052bc9fb1089e74818e249ac85228bc85aeffa34f8bd18396ceaa18e SHA512 e1ba5f037ae58c9ea4434f60817b53282494c8d25a659a0b6d9b75db384f7706b122bde225640e2028cfc36022a6cb0d1b5711685a4a265c75f3592c278a67f6
+DIST genpatches-6.10-12.base.tar.xz 602316 BLAKE2B 6cd02be7fbe2322d246e826d04236dba2ec5b40acc9c8575fd7a5d0d745cd0629778176e97db920ea198e939d332407d9dfa2f369ea4e075be05197a1ba7ef8a SHA512 595e302e05256994ad0077f41c6d6c3677eeb64a7cd1b11c823c689822d4d257bdd8b722b22542fc779e777ffc28f782f7bf69e8a0bb6ec3f3d2b111aaa789fb
+DIST genpatches-6.10-12.experimental.tar.xz 81180 BLAKE2B aa9b3f93a2c79fe0020387fbddf90367771e516c6408d71f1dec2ffa8efee112764c610032a534fbd9b6e04a257b275cd9713819809a524c48fc57c7b869b546 SHA512 5d1a8cd267c6abe5d795f00d475dc2b0f22b43508151bc4ea4b79c6293aaebb53f081bdc0631309b96bdad61e4fd70d1ad0f83cb1c4fcf73c5bcfc565ce31046
+DIST genpatches-6.10-12.extras.tar.xz 4060 BLAKE2B 77b8b8cc0ed8af03ca45e1224e6de1f14d59682aeb411488e4c5eb6f9f4252a50ae442d60eeba496491c62013c7f1cb7af9f7e40622e1f48de7f0b85c4686c28 SHA512 95cf8c15fab7ea99e7c55166d445494d85cf843d9bc32e3055789ac20d725b52687d1077890c22aa39719a9d0fc7745b0d3346d014077171b1009a3a353f04f0
 DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B 3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11 SHA512 9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f
 DIST genpatches-6.10-9.experimental.tar.xz 81200 BLAKE2B ced7f11678f518ccb2e24423ba68b8fea90e3a76da0c50c5364d18956d4c79ed8d36c3e7459e007db3708bdf448c9195af2db3a881d21c3c963a9761c2a58e4d SHA512 275f511b27d1db458cc111c9d646af54df5bd4c227abd33c77b6eb21711e4ec705dcbd143ce20820d43d2c78bd526298808c2a5a319b7080012ba3e4ff47725d
 DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B 2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952 SHA512 358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
 DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227 SHA512 102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
 DIST genpatches-6.6-54.experimental.tar.xz 5760 BLAKE2B 61844e58934ca89da13e04c5c93da1e6eb71c752482001936c2e2eaa692229cf5be2aa719dc1405483bbe0e913d881f006856056dd656005b7010f682afd80c4 SHA512 8834c971262fc05701ed4d6a6681dd0392e27b26332c7540b3bd569252dd2f257d142e7e30919794f5894d5e0cda1865b578eb4a86566d0308e114353fe0e727
 DIST genpatches-6.6-54.extras.tar.xz 4060 BLAKE2B 22ea7d143bfe168bc5d9d30832423bcd33b49c1b3b5ddf031000d7d9fce96f6fa0fb1d06fd33b27a5de9c9f3833a139557f0ed7408ef12b23568784ff38ca7a9 SHA512 1b1a229b5923e7f3426139b17608b5feae6061313f7aea66de23f09a54696def39bf4b384c4e884a3e5c758c08e04dcfe1ab7f2aa331db74b59f5e511c6f2c5b
+DIST genpatches-6.6-55.base.tar.xz 3018672 BLAKE2B f5f3e39c634e196827da06935b783cb87c3503998df6b1f3d711484ab984b4a378feee96a45b932b409593290ea7a77271eb39a1e5085e5a4fde3c3307ced95d SHA512 88b2ef56dc0c2e1e7c34a9a81b8981d4c8ab6ba5e5821cbf3da8e608287375f2f0eaff427fae8f47a59cb9fe2c3b8a9d9c569108f27b833a10c6b460dde0bcd7
+DIST genpatches-6.6-55.experimental.tar.xz 5760 BLAKE2B 0ba9c83ef35831b973dd1d1c2b89ca020a8586fb298ebccd85f6dd16e18af61e4b404dfbb9fcf538c907f8d8edadda29141ae78f45549c2db1513214393930f3 SHA512 3fd7434efbc2bb8fe0a7c4944490611f809a3de1dab3a63d0618995940dae4c47b96279e7d5b876f203916856f1b2029844cc5614fce92c3dfda80fc682055c2
+DIST genpatches-6.6-55.extras.tar.xz 4056 BLAKE2B d54e353fcd41ede054bfde20ef5bc6518056b1069e440e8ef31b4021ba2b85eb4b578e8aa73a0d778e21a692914ec850f2604e635ff178690a3baee4dcf106be SHA512 a59ff175eb6e7491fe635f65dc44878b8fbf5eacf805b7158b3e9b6c4313881d24a13fd6d252f23c7fd9b5eac1a2c110431ca02aa2583fff71cd306d1b4f3cd9
+DIST genpatches-6.6-56.base.tar.xz 3040548 BLAKE2B 751529aa9bdd2aa696fb367cc2afdd4def0783640c847d65d836dadc74531e5fbd5595ec4aa1f89fa62004d9437dab57adc92b64444b5ed3299a3ae6884b86c3 SHA512 a9e08b3eb6fc9c2b595a8ab6a6933349172655da0126cac6498d0c541bd2d6e1377b849041f03af519927219c17b618ac622f45ca931bd0770bee63c64023a26
+DIST genpatches-6.6-56.experimental.tar.xz 5760 BLAKE2B 765851d3354c1052419db0ec5b76af969f62b4558c0e509a9bd4580dddef9796e3f2f089509a266dbf12b050bf0d0e61b484b3faab5b3cf869e4d5fec421114d SHA512 3cf75b06df5081c4fe07e2d722e9755a1f554ffac332e168fcc63221716db35bb0e543e74df7cf3568048fa1c20a221827f91b48af155c24d96eb9da810c08fc
+DIST genpatches-6.6-56.extras.tar.xz 4056 BLAKE2B d54da14f3afefdb9aa8c6597913f37c5d1314e4a93216608bee52a52bcc05924bfadf2d5e7e49b0488159b0a57942f1579a4e7b3fcdc90a78c10e0efffb6a1ed SHA512 ba961d5434222ecd618cb44b08ec6413d98c1d1958af2712065d924370141f789ebb315dc53a5bdbb75d3cbe86cf719983e66a58d537eb78455eda509689aa73
+DIST genpatches-6.6-57.base.tar.xz 3079200 BLAKE2B d0f16f9b2f09f182c02fdb6cfa4b76f3d9d41f22b149d50faff129daa677b97830128a40c8c2f98b2534b722865b49b8a60b5f205b7d3284ef94a67946a4b460 SHA512 c6d16e6d814d363f0e34f3e7d569757f787340889f395ef9b3a273582a3d72d60b692e872764e5f411ac9a8648d886c9f6522342c238a421e423b2cd0e6b40fa
+DIST genpatches-6.6-57.experimental.tar.xz 5768 BLAKE2B 85a25f5450b03a93d0ba2726b0fd90a2ccd1f5a39561f180d5900c5593ce5c9f52eb1186ec96c571d343df133d630247649a0692c03bc93163a3201d7b438d86 SHA512 e1cbd5dc1271ebae1734551abac7a93cee71c68b6d04bc2f4dca5b3410265ab3920e29a8602df0ea99313c11ce51889c2e9d4a19053c83ac0a027989fd9bc307
+DIST genpatches-6.6-57.extras.tar.xz 4056 BLAKE2B 9b071880383921fcc8cd2da092e1219e3b40684e6ffd04bd2ab75fd53624cdcb7289f1c40ae9256e0343bbea92393c153724ee628e8d164596ba4d7f8bb413df SHA512 a61cbf855e718ca7afed0b15614ad2e9bea740412e8251b35417d10f4b936364cc3820951acc45be2b18cba635cd1c43da8caeb4ac315747d02201be39148c8b
 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-sources/gentoo-sources-5.10.225.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.225.ebuild
new file mode 100644
index 000000000000..c5a0654a0e30
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.225.ebuild
@@ -0,0 +1,27 @@
+# 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="236"
+
+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 ~ia64 ~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.166.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.166.ebuild
new file mode 100644
index 000000000000..b609c5886d22
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.166.ebuild
@@ -0,0 +1,27 @@
+# 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="176"
+
+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 ~ia64 ~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.107.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.107.ebuild
new file mode 100644
index 000000000000..356e92baa729
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.107.ebuild
@@ -0,0 +1,27 @@
+# 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="117"
+
+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 ~ia64 ~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.108.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.108.ebuild
new file mode 100644
index 000000000000..9fe48b26cb08
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.108.ebuild
@@ -0,0 +1,27 @@
+# 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="118"
+
+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 ~ia64 ~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.109.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.109.ebuild
new file mode 100644
index 000000000000..f8760309f4b6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.109.ebuild
@@ -0,0 +1,27 @@
+# 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="119"
+
+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 ~ia64 ~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.10.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.10.7.ebuild
new file mode 100644
index 000000000000..d57c3eeba26f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.10.7.ebuild
@@ -0,0 +1,32 @@
+# 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 -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+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.10.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.10.8.ebuild
new file mode 100644
index 000000000000..12600f5808a0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.10.8.ebuild
@@ -0,0 +1,32 @@
+# 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="11"
+
+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 -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+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.10.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.10.9.ebuild
new file mode 100644
index 000000000000..649513dc6227
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.10.9.ebuild
@@ -0,0 +1,32 @@
+# 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="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 -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+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.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.48.ebuild
new file mode 100644
index 000000000000..03c84c814cda
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.48.ebuild
@@ -0,0 +1,27 @@
+# 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="55"
+
+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 ~ia64 ~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.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.49.ebuild
new file mode 100644
index 000000000000..fbba7ffd2c63
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.49.ebuild
@@ -0,0 +1,27 @@
+# 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="56"
+
+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 ~ia64 ~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.50.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.50.ebuild
new file mode 100644
index 000000000000..76056edfa8f0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.50.ebuild
@@ -0,0 +1,27 @@
+# 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="57"
+
+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 ~ia64 ~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 74147c39f059..c1cd41526236 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,3 +3,6 @@ DIST patch-6.11-rc1.patch 84813682 BLAKE2B 6e0366cfcd85ad1d16bff987ae4cc68691685
 DIST patch-6.11-rc2.patch 85196283 BLAKE2B 93b294cd980fdbb9b0c95d6ac9f104a6d80c9d4ea0dd5b3d42129161205cdd63e140f52a52c5b16b4d41aeb0f50fa49a565deabd92707baaeb4df01da06d6e0b SHA512 a4c26e7ff227d264cd76ef6b69aeaa451fd54bf24bca5d7f45e1964b11b6da69eb8bc9d226ca9c3383c41bf2d85739232eef2c0e27f83e16440183bfbdb659de
 DIST patch-6.11-rc3.patch 85423245 BLAKE2B 01eb8f98e554337f199843071dff67407d3d90d1c6a8ef93f11709116555401a24b98c88747cdb6dd66f32fd0f88e8dc07f708d95826139f359b3aecbd8e2c40 SHA512 61d942a1bd70fd6b4fe99ee0797949a305e07e055db70f76d3691b0304ec04e3599115be4598bf9fd83fd53bcffd628eef643f07deb189c85b771937c5e6cb3c
 DIST patch-6.11-rc4.patch 85940549 BLAKE2B 5d9fcd92de3f686d1b8c795b5eeec39959a11393bfbb756b0aca9f00080a5b75dccf4f7f0c9d9395b936a703ae96345a926a9d724b83de630d7eb6f6051ae4fa SHA512 7ee0ea6fa42c403057cd167452fa4d910c7625f9836c645a41e3c578f959a1eebd28103f859d4da0ef9c9c8a512e6f8001aae723e8c3fd2d56b5d60480fcc18c
+DIST patch-6.11-rc5.patch 86328047 BLAKE2B a436fed2fce9ac102fc402b6e2488683d81240a9f203a106b30cd5b3f33c887e5ef06e6e531527fb9f6b6eb90ae69e6fc3a62f7788e60a3c8f3cd94b85a827f6 SHA512 e96bb72c48dcc214d07c73babb42efa1f12499276fa03e6d3fef839e8e1a41430eb7c1d107caff64288f173ed8c970168e068427e5ca13c30857fe7db781eb91
+DIST patch-6.11-rc6.patch 86619332 BLAKE2B 5248f10c9ca2637141d65c26f9e221ccf2e61bf02a39e8410bfbc0105a6af6d00ad55d0047888aa86379ef75f68e6fe9bf432cace162400b4fd2b0af25432d09 SHA512 3d3b95600112d49a3bcac0edcd6100a8e3f1022a95c0898372a0f5576e188ee2d866bea0ed11bf157e05afce378687e7ff83197f297824ede2a2a40c2d450444
+DIST patch-6.11-rc7.patch 87007810 BLAKE2B d7f292ffcb30a8a5a9174c4306889319db08ab987c3bcf4d22d54a301a8b4e2c7315aa9f4aef7a330ff32d8171ed4394a5be740e312e55ed857f56e8986eb7c5 SHA512 ed7af336bf0c5f06830831412afe52ef6085fe614ebb7093897e9cb6a57346c55cdf1595684b21361f20e8df6ce70006b6c0a4d3ab1d07a91e2ca96a3443b320
diff --git a/sys-kernel/git-sources/git-sources-6.11_rc5.ebuild b/sys-kernel/git-sources/git-sources-6.11_rc5.ebuild
new file mode 100644
index 000000000000..c48bb8c7d15c
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.11_rc5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 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.10"
+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-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-6.11_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.11_rc6.ebuild
new file mode 100644
index 000000000000..c48bb8c7d15c
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.11_rc6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 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.10"
+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-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-6.11_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.11_rc7.ebuild
new file mode 100644
index 000000000000..c48bb8c7d15c
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.11_rc7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 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.10"
+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-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 93867b4676d1..3287dd885a1f 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1 @@
-DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
 DIST installkernel-48.tar.gz 25079 BLAKE2B 73bf66071dc7dd76afd1ee42d4c3528430f2b00e38c94ff274d6af78c302243fe33959b721c29435819feeed56d94fb1d6f9381b92d8718acee1d9934cfbf5b8 SHA512 302ec0657564dfe3f8d02f564f39a1d7203dcb81d9dd748d3b0b30b0c73b8e9d94758f53076d7b685f57f2a3beeec1a75ad5f807b91200a2f0a2de5510191cb1
diff --git a/sys-kernel/installkernel/installkernel-39-r2.ebuild b/sys-kernel/installkernel/installkernel-39-r2.ebuild
deleted file mode 100644
index 2b11a30d57c5..000000000000
--- a/sys-kernel/installkernel/installkernel-39-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
-	https://github.com/projg2/installkernel-gentoo
-	https://wiki.gentoo.org/wiki/Installkernel
-"
-SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-gentoo-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
-	?? ( efistub grub systemd-boot )
-	refind? ( !systemd-boot !grub )
-	systemd-boot? ( systemd )
-	ukify? ( uki )
-	?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
-	!<=sys-kernel/installkernel-systemd-3
-	dracut? (
-		>=sys-kernel/dracut-060_pre20240104-r4
-		uki? (
-			|| (
-				sys-apps/systemd[boot(-)]
-				sys-apps/systemd-utils[boot(-)]
-			)
-		)
-	)
-	efistub? (
-		systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
-		!systemd? ( sys-boot/uefi-mkconfig )
-	)
-	grub? ( sys-boot/grub )
-	refind? ( sys-boot/refind )
-	systemd? (
-		|| (
-			sys-apps/systemd[kernel-install(-)]
-			sys-apps/systemd-utils[kernel-install(-)]
-		)
-	)
-	systemd-boot? (
-		|| (
-			sys-apps/systemd[boot(-)]
-			sys-apps/systemd-utils[boot(-)]
-		)
-	)
-	ukify? (
-		|| (
-			sys-apps/systemd[boot(-),ukify(-)]
-			sys-apps/systemd-utils[boot(-),ukify(-)]
-		)
-	)
-	ugrd? ( sys-kernel/ugrd )
-	!=sys-apps/systemd-255.2-r1
-	!=sys-apps/systemd-255.2-r0
-	!~sys-apps/systemd-255.1
-	!~sys-apps/systemd-255.0
-	!=sys-apps/systemd-254.8-r0
-	!=sys-apps/systemd-254.7-r0
-	!~sys-apps/systemd-254.6
-	!<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
-	use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
-	keepdir /etc/kernel/postinst.d
-	keepdir /etc/kernel/preinst.d
-
-	exeinto /usr/lib/kernel/preinst.d
-	use dracut && doexe hooks/50-dracut.install
-	use ukify && doexe hooks/60-ukify.install
-
-	exeinto /usr/lib/kernel/postinst.d
-	use grub && doexe hooks/91-grub-mkconfig.install
-	use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
-	use refind && doexe hooks/95-refind-copy-icon.install
-
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/systemd/00-00machineid-directory.install
-	doexe hooks/systemd/10-copy-prebuilt.install
-	doexe hooks/systemd/90-compat.install
-	use grub && doexe hooks/systemd/91-grub-mkconfig.install
-	use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
-	use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
-	if use systemd; then
-		sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
-			die "enabling systemd's kernel-install failed"
-	fi
-
-	# set some default config using the flags we have anyway
-	touch "${T}/install.conf" || die
-	echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
-	if use uki; then
-		echo "layout=uki" >> "${T}/install.conf" || die
-	elif use efistub; then
-		echo "layout=efistub" >> "${T}/install.conf" || die
-	elif use grub; then
-		echo "layout=grub" >> "${T}/install.conf" || die
-	elif use systemd-boot; then
-		echo "layout=bls" >> "${T}/install.conf" || die
-	else
-		echo "layout=compat" >> "${T}/install.conf" || die
-	fi
-
-	if use dracut; then
-		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
-		if ! use ukify; then
-			if use uki; then
-				echo "uki_generator=dracut" >> "${T}/install.conf" || die
-			else
-				echo "uki_generator=none" >> "${T}/install.conf" || die
-			fi
-		fi
-	elif use ugrd; then
-		echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
-	else
-		echo "initrd_generator=none" >> "${T}/install.conf" || die
-	fi
-
-	if use ukify; then
-		echo "uki_generator=ukify" >> "${T}/install.conf" || die
-	else
-		if ! use dracut; then
-			echo "uki_generator=none" >> "${T}/install.conf" || die
-		fi
-	fi
-
-	insinto /usr/lib/kernel
-	doins "${T}/install.conf"
-
-	into /
-	dosbin installkernel
-	doman installkernel.8
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# show only when upgrading to 14+
-	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
-		elog "Version 14 and up of ${PN} effectively merges"
-		elog "${PN}-gentoo and ${PN}-systemd."
-		elog "Switching between the traditional installkernel and systemd's"
-		elog "kernel-install is controlled with the systemd USE flag or the"
-		elog "SYSTEMD_KERNEL_INSTALL environment variable."
-		elog
-		elog "See the installkernel wiki page[1] for more details."
-		elog
-		elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-		elog
-	fi
-
-	# show only on first install of version 20+
-	if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
-		if has_version "sys-boot/grub" && ! use grub; then
-			elog "sys-boot/grub is installed but the grub USE flag is not enabled."
-			elog "Users may want to enable this flag to automatically update the"
-			elog "bootloader configuration on each kernel install."
-		fi
-		if ( has_version "sys-apps/systemd[boot]" ||
-			has_version "sys-apps/systemd-utils[boot]" ) &&
-			! use systemd-boot; then
-				elog "systemd-boot is installed but the systemd-boot USE flag"
-				elog "is not enabled. Users should enable this flag to install kernels"
-				elog "in a layout that systemd-boot understands and to automatically"
-				elog "update systemd-boot's configuration on each kernel install."
-		fi
-	fi
-
-	if use efistub; then
-		ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
-		ewarn "often differ between vendors and as a result EFI stub booting is not"
-		ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
-		ewarn "of booting the system is available before rebooting."
-	fi
-}
diff --git a/sys-kernel/installkernel/installkernel-48-r1.ebuild b/sys-kernel/installkernel/installkernel-48-r1.ebuild
index f41ce9300a2e..a1c321d6558d 100644
--- a/sys-kernel/installkernel/installkernel-48-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-48-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
 REQUIRED_USE="
 	?? ( efistub grub systemd-boot )
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 83102b1a5979..5cd6cb425ea8 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,3 +1,4 @@
 DIST linux-firmware-20240610.tar.xz 375519640 BLAKE2B 242dbd9d85eabeb8eeebbba86ae80633c412553f0eaac393b2792b99b0f0a8567db68d9c18e92be35809af9a3bf2cebd620c30d6fc518a312b19e8c8756316f9 SHA512 608d8fc12172e8461b66e9917f61ecb86e1c6b6fc260382e7382d61bbf08c1b0cc819207e93ac979a336b463b740c5ad7a7577b823caadb1c61606b7e070ddaf
 DIST linux-firmware-20240709.tar.xz 376713860 BLAKE2B 33ea1ca0ffafa37b72604386954f05d9eab09dba29c7d28a8b34dabd2c3133b6d4727998b5dad27a8e629877fc63555ee96359a84eb1d133603c3098bac49e72 SHA512 705d092b0ec5002300a91b679e806137e92bf3d4e1edd998e885e8da88297d8791048ee8ad9727546b13fa08aeadab54254eaed8f6f5a9663429eb54746dfb63
 DIST linux-firmware-20240811.tar.xz 379287388 BLAKE2B abcd5eff8e7bd7200079a691e4c09dcc7f349e09eb35c3eae594a7b27eef714767f0eaa92e259b32f4d347f7b6a2ee710332b728546305a01558d732dd947ac6 SHA512 4ea6c24f4bf60eb7ae4cd2993ce4e9dadb03ca7e92f8ccb4778fcebd5c32e16ba8c6095e74b9ed6a111f1b44b983177b52f35a9ad8be7d1dfec2de29a296b8d1
+DIST linux-firmware-20240909.tar.xz 383099276 BLAKE2B 3769ca5501db43a6d1ca54ac11d6857087c51d064ee58f3da543ab713ce8280dbe4206a2d3d00431518e509b260fe9be0f1eb15fe2e737647468f76f2e7282ac SHA512 d1918364f9925291da722075cf2d038082a6b6b5c6d7e5ab8b0888c5e87563718934f493fe172db21608d6eace92ade5c519b5f50b1fc7f25a328e45be059142
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild
new file mode 100644
index 000000000000..46c68b5e08b8
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit dist-kernel-utils linux-info mount-boot 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 ~ia64 ~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 )"
+
+#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 )
+"
+IDEPEND="
+	dist-kernel? (
+		initramfs? ( sys-kernel/installkernel )
+	)
+"
+
+QA_PREBUILT="*"
+PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.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
+
+	find . -type f -not -perm 0644 -print0 \
+		| xargs --null --no-run-if-empty chmod 0644 \
+		|| die
+
+	chmod +x copy-firmware.sh || die
+	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=(
+		copy-firmware.sh
+		README.md
+		WHENCE
+		LICEN[CS]E.*
+	)
+
+	# 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
+	! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" )
+	FW_OPTIONS+=( "${ED}/lib/firmware" )
+	./copy-firmware.sh "${FW_OPTIONS[@]}" || 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/modprobed-db/modprobed-db-2.47.ebuild b/sys-kernel/modprobed-db/modprobed-db-2.47.ebuild
index 5ef986bc7b0d..22befa8a7385 100644
--- a/sys-kernel/modprobed-db/modprobed-db-2.47.ebuild
+++ b/sys-kernel/modprobed-db/modprobed-db-2.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/graysky2/modprobed-db/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 src_install() {
 	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INITDIR_SYSTEMD="$(systemd_get_userunitdir)"
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 83d4e4c444d1..a54a5488e885 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -7,4 +7,5 @@ DIST raspberrypi-firmware-1.20220331.tar.gz 195722349 BLAKE2B 7f2748bba0cd255921
 DIST raspberrypi-firmware-1.20230405.tar.gz 187674867 BLAKE2B 8f35b2dd906cd2459c83c3cec2ba10e8388afa35213f80bd3fd7a5ba7061c7ad0f9db5a5c39ab476f8a2b4754cf80665c2dff54f7ae61edf3c85d91ae37f9f9f SHA512 ddc9baeba4e2e442bfe41e427c7ecdd38ee6d44ac4e7c297ae7d5a6c64b0aa1a81206929baeb9aceb74de6f96707b30040e82450ef4f01a78b958299c72e3857
 DIST raspberrypi-firmware-1.20240424.tar.gz 153632287 BLAKE2B 7718d26ee66751484edd359412bc186d7ef5e68af97abe814b340b4c21fb4d6f7abc2caa8c7d0ec62ac742a9c932a08b4393d32d4ba79480c9648d742bead0b8 SHA512 90ad6872886f3efb004b57e258ba8ec0ef0bf619e251e2f0d259c22ef9cb816f6b0f2d5fb1f3a0ece13bf69fecfe8fe70793b90ea243163b5a585930e554e3d5
 DIST raspberrypi-firmware-1.20240529.tar.gz 153776579 BLAKE2B 8348429940056600e9c1a3f63d2575fc285ef379ad1663460620d1b9fb65ef1b32d789a0b525903de90e5ec9886b173c7e3692a87c4ee3c9904c88c1bf85b071 SHA512 1b127924960efe8430250fae7a496805e4285d1b72b180a829be6d5eee6be2ecf325bdf9c81f9806ef9aae0adeb5e8832197e79c281754b87028fcdfe1b0961b
+DIST raspberrypi-firmware-1.20240902.tar.gz 154483648 BLAKE2B e3d9fabb23246d90948004dde37f2125779a86aa62737b51b03cacea13d1ca715724587b0da106efba19c80a1bafcf1537101ce13ba4374602ca9e4957c81f87 SHA512 b5b1a74e1e9f9760fd19f98a35505b2e127e212c17afbdf08e1b92198f32de73655fb24c16d662318ccf50621ae5e1a6ed5aa877d2d1cc654d26b8ff168c1e82
 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.47_p20240902.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.47_p20240902.ebuild
new file mode 100644
index 000000000000..8a8a4752bce4
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.47_p20240902.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot
+
+# Go to e.g. https://github.com/raspberrypi/firmware/tree/1.20211029/modules
+# for the latest tag to see which kernel version it corresponds to.
+
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+	inherit git-r3
+else
+	[[ $(ver_cut 4) == p ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm ~arm64"
+fi
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
+
+src_prepare() {
+	default
+
+	local expected_kernel_version="$(ver_cut 1-3)+"
+	local found_kernel_version=( "${S}"/modules/$(ver_cut 1).*.*+ )
+
+	found_kernel_version=${found_kernel_version[0]}
+	found_kernel_version=${found_kernel_version##*/}
+
+	if [[ ${expected_kernel_version} != ${found_kernel_version} ]] ; then
+		eerror "Expected kernel version: ${expected_kernel_version}"
+		eerror "Found kernel version: ${found_kernel_version}"
+		die "Please fix ebuild version to contain ${found_kernel_version}!"
+	fi
+
+	if [[ ! -d "${S}"/modules/${expected_kernel_version} ]] ; then
+		eerror "Kernel module directory is missing!"
+		die "${S}/modules/${expected_kernel_version} not found!"
+	fi
+}
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
+}
diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest
index 8f516e24c5a4..cdf24fdfbc28 100644
--- a/sys-kernel/raspberrypi-sources/Manifest
+++ b/sys-kernel/raspberrypi-sources/Manifest
@@ -4,7 +4,10 @@ DIST genpatches-6.1-25.base.tar.xz 1200876 BLAKE2B 7050f6e95a28f5886cce9b53823f6
 DIST genpatches-6.1-25.extras.tar.xz 3812 BLAKE2B f73698c57031c9d7f5edd9ba2b865e32064c38b528649a8144f856bacf35ae3570d1fc936ee25a88bd52fd0765fff05bec42686b8b3fc5566df187bd57d59be5 SHA512 ac2bdccbc6bd1de82cbdfe4edac978e068445b8e064bcc6a833b04f15b86592304c19651884dc0769719ade1b220c8c0f704beca240ce24ab370621ad6849aee
 DIST genpatches-6.6-38.base.tar.xz 2066552 BLAKE2B 61205dc2b5d17f15af23d8eb8af0720fe5f6c560ae671c98252d7c9e28e9b93fdde067811664f095ce103beab9bcb1810e9ab9e32a82d972cbbb44ce5257f097 SHA512 ef6d0814f5bd646c49e54fadc46e73ef118466978a6fba1bd18d832e6dd089a1699ec14f40e769e061bdb84f843e94c190b31729b48a36a317d66da6a8d00622
 DIST genpatches-6.6-38.extras.tar.xz 4052 BLAKE2B 7d25eaaf329cc043fd5189114c5d100f2a3dad9a97b0c87cfc9541ff95ffeb9e3a8a723e5c4fa1f9241c4fd67aac5aa1e4aba96f5cedad5609463b96bc272da7 SHA512 d5957d7ca9718bf87621fb4200b5bbc4e1457fc7fda1500714fc88730a4dfd4dce81e386bd2a2f88e02aff16c46e35402421439e6393a5ad15848d26d9056b44
+DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227 SHA512 102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
+DIST genpatches-6.6-54.extras.tar.xz 4060 BLAKE2B 22ea7d143bfe168bc5d9d30832423bcd33b49c1b3b5ddf031000d7d9fce96f6fa0fb1d06fd33b27a5de9c9f3833a139557f0ed7408ef12b23568784ff38ca7a9 SHA512 1b1a229b5923e7f3426139b17608b5feae6061313f7aea66de23f09a54696def39bf4b384c4e884a3e5c758c08e04dcfe1ab7f2aa331db74b59f5e511c6f2c5b
 DIST linux-5.15.76_p20221104-raspberrypi.tar.gz 199660690 BLAKE2B 899714102e52904b7a37d155e42e94ed4b0e6c6600ac40fbd3cf66d15f84bb6d06afa7acf5c9624f44e9888d03d101823b419547d7ad8e566b4e55aaa077f11b SHA512 648262937e0afdb331678e0b2f913ad22788f1373f9ecd0d495e748a78399d6a69e93024268e1c0567acb4b1c9242b3ca6bd060e73b91a77529a93e4e29181c6
 DIST linux-5.15.84_p20230106-raspberrypi.tar.gz 199714807 BLAKE2B f3579d4b16921141055c0a62787084d2fb7db057bf9205c45e4a6515969bd3136a0dfe08c26848e691a5ea74d1f23533e4352c8fe70edf4b7000785958caf6ea SHA512 97ed02f35b42f144db72f802339f4952148596e3e5a0725fedd7a57618c1695cb802d58f6183e257ebfd242d35bf69f1eefea78ab9df109f6158af713d7d5f30
 DIST linux-6.1.21_p20230405-raspberrypi.tar.gz 221783059 BLAKE2B 5e9e13b6410df1b9e4bcdef85a6b33de83621a74d89bb6760dcff86cd736262513f613e9279a8dccf5ca306a807c16652084a3e6b4cb34c3658a8e9e3196c5d1 SHA512 0c8252833bb737977c0981ed48764ff9742de7cb494fefec532c90312e0d8e0e48a230dd14a0d6f99b54b015e6c91e647b579f2ef7408b80e349a547767d9925
 DIST linux-6.6.31_p20240529-raspberrypi.tar.gz 230924637 BLAKE2B bf8e5aba5597e98279b1c9d007112f57175c7cab15acbd2e9a7151f6290d3f1bee10299344b2655ade3cf2c73035b8f6e7fc9071d182a4c4ab839937fb0b59ef SHA512 3eb710dab82783a5254169e5bc2ac59fe4d3bd0fffbfd7a119a6182767b48186f4505d551fd7cc9ff002abf957e82108242d5a101266f77146d514fe3116fea5
+DIST linux-6.6.47_p20240902-raspberrypi.tar.gz 231225067 BLAKE2B a7848290848f33ab8ae39364c6b5895f45ae82e9a72f60b8471522c8f8bf04627b3abab26e7c1ed10c12b6621d0490d10a6cbc455013dfc8b1296d35b7230998 SHA512 98c033c3f3440c26d97d17855b6057f41d633f0d7d5d22af32feec49f12fcec4181497ec97ac78ce96eb4e601a1fd400c832acf6e148da3cad419cdfc2587382
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.31_p20240529.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.31_p20240529.ebuild
index 899dcfe94f1b..c68123e8b2eb 100644
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.31_p20240529.ebuild
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.31_p20240529.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 	${GENPATCHES_URI}
 "
 
-KEYWORDS="~arm arm64"
+KEYWORDS="arm arm64"
 
 PATCHES=("${FILESDIR}"/${PN}-6.1.21-gentoo-kconfig.patch)
 
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.47_p20240902.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.47_p20240902.ebuild
new file mode 100644
index 000000000000..4a0934927cd2
--- /dev/null
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.6.47_p20240902.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ETYPE=sources
+K_DEFCONFIG="bcmrpi_defconfig"
+K_SECURITY_UNSUPPORTED=1
+EXTRAVERSION="-${PN}/-*"
+
+K_EXP_GENPATCHES_NOUSE=1
+K_GENPATCHES_VER=54
+K_DEBLOB_AVAILABLE=0
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 linux-info
+detect_version
+detect_arch
+
+#MY_P=$(ver_cut 4-)
+#MY_P="stable_${MY_P/p/}"
+COMMIT=789af262fb268b2006099a096faf4a383592ce1b
+MY_P=${COMMIT}
+
+DESCRIPTION="Raspberry Pi kernel sources"
+HOMEPAGE="https://github.com/raspberrypi/linux"
+SRC_URI="
+	https://github.com/raspberrypi/linux/archive/${MY_P}.tar.gz -> linux-${KV_FULL}.tar.gz
+	${GENPATCHES_URI}
+"
+
+KEYWORDS="~arm ~arm64"
+
+PATCHES=("${FILESDIR}"/${PN}-6.1.21-gentoo-kconfig.patch)
+
+UNIPATCH_EXCLUDE="
+	10*
+	15*
+	1700
+	1730
+	2000
+	201*
+	2700
+	2800
+	29*
+	3000
+	4567"
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the raspberrypi 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
+}
+
+universal_unpack() {
+	unpack linux-${KV_FULL}.tar.gz
+
+	# We want to rename the unpacked directory to a nice normalised string
+	# bug #762766
+	mv "${WORKDIR}"/linux-${MY_P} "${WORKDIR}"/linux-${KV_FULL} || die
+
+	# remove all backup files
+	find . -iname "*~" -exec rm {} \; 2>/dev/null
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index a80c1586988e..7550d4618b3c 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -31,9 +31,9 @@ DIST patch-5.4.278-rt91.patch.xz 182776 BLAKE2B b22c91389b2420193f18a3e5b18575f6
 DIST patch-5.4.278.xz 5586124 BLAKE2B 287c7a66fb68a61e132c2b1a57b66a5a7bf06128ce860da5f0cbaf7067409f470174252f1a1035004d4ba001240e5b077d846aecb8dfa9f55669e79e0996815a SHA512 72f701b621890077a70e1c9a957e9415138516f2c74b473c82bc25bbf6600ced442ae7e4e7d0ca634481e9b97e066281173994e7bd844988b6bc54b82c6bc33b
 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.102-rt37.patch.xz 52784 BLAKE2B 91dae7e8aafd87d1aadc57396986d0b29ff6af6998cc3fe7e01bbe4d04c6b6dbd056e6becae6c2d15000d628e6a723f7f4d201295ce11174c41eb07090a93899 SHA512 a217ab5002b4a119a2cd917066b00fc6d827c3f8d33488eb1de27e77d184c9604f92e8f9197390425c3e3f6d63ff0eeabbf862d1b9dc724ad957ab18dc6faa20
-DIST patch-6.1.102.xz 4880076 BLAKE2B be1bcc0b184232e2943dd2578ebac2f6c8c48dd0efbd543c7e7fc8773c2f3444840169a27f40c53fce5a6c1daa6ed8194681e7d2631818378c66d606816f87c5 SHA512 b2332bb5db362b4fa2f2e3d24877f6cdd20553421bd65285812b1fb0f738dab9a4ba85081c4eb9d2f80e9561ea69d691c8ae37b547feb5c016da9ad949899c64
+DIST patch-6.1.107-rt39.patch.xz 52160 BLAKE2B 8bb449b492c444cd68d8420a9342d299141ed465418270efdad8a9709b130268e8a49dcfea0355a915e7cbe8e1a9c264c7bb2759902a13ea1637b6558ef53f7b SHA512 4b990b0045d602741712ef17073afc0c7de7ffdf5f8bdde9edb58def5e87baddc407ffff06b396470a8b4d5ae616196fa64bff6be62d7c40f31f7286830cbe17
+DIST patch-6.1.107.xz 5095704 BLAKE2B dd29f6d281585dfac3e0c931e1f97eeb2d2f469021754e5cfe3f26f7f011f730e3f969047219e9d77539f5679e9e379e2cfe5c79b8d16e8564f6f927000dbbee SHA512 bdcf913d09ac3f2dfab0f557170bbb9fd38aa397ab5343812af0472d216ff3808fdf283f7cdd7b203d32e5ec368a184932a8145d5f2b18cf940a285ca4278c66
 DIST patch-6.5.2-rt8.patch.xz 54436 BLAKE2B 296da85395314ce26900eefb32a7c9b565b4242603884ab51e6208576e5fa6ceb3bd6269d8938e24f58a0b5d937e556345b45057f90166574797289152b15ae3 SHA512 9b625e33f5097729fb2462e2a6e96a1e13a7677af875ce028f6f8fadd1ab60bc9064ca9b101334211bdaf49ba36c750bfdf8260ff03a5ac2a2277a28293b309c
 DIST patch-6.5.2.xz 14964 BLAKE2B de3a0d15141199f98873c332f0c0237a39534bffe624f9394a6ba2bb9c3d731121d1b698963c424b919f7683fcffce1a86884bf64d26938cd529a14a211f1904 SHA512 e377f1fd5802321ea8198bbf661b15ec050f5ee902666359c8e1cce8e36abbb67957e04bdc1ee8a91eb3bf2c56ef62e9f5535dc52982eb6185476ce794449402
-DIST patch-6.6.44-rt39.patch.xz 89584 BLAKE2B 04786dee4fd0f0a4978ed926868d53293fa7ec66d77aba3f5106b1845ba438354e92590d6fcd23b22583dc26cb32358108628c363405ed500ee5eb3bcaede9f6 SHA512 4ba4f6b1da0effd0ad6dc0829d7ae1e2bdd82884acd073dc26736af8545d5034cbc57b522f39229dca228120bcebe7910f263dac043e874376f5ced125dd1be1
-DIST patch-6.6.44.xz 2598904 BLAKE2B 138e7f82b94f756b9f6485cf9b3d73ab7c941383e4f6b7b9b2b3989d90c76b10935d78cc05911b3a45ad8336b42af07a6d9456dcabdcc5f3f811a38bce7cdfc3 SHA512 cfba00db2aa20c9d77091a917d90b4fb48c7c70bb4ac1add70e1ec0876704842c73ca4cfa6cdc2f6e9191616a34279e2c839dfa6eb19b990ec6525de8090c910
+DIST patch-6.6.48-rt40.patch.xz 89580 BLAKE2B 0a4ff841c85db1b7e53520a00b22fe466a5cc51d52bb9baebd0a80d5aa4e69aa67d0214f03d8803e420663b431f417d990267db0b5328a2d7083f929b0dcb7d7 SHA512 de207b19b5dd9f8cc16c777d2b524ae72cd1902a0d091274ced2b81448ba2148e01efeab3a874e029879d45ca88ecd9d1ac820d9e4e3085c86ed526cea217623
+DIST patch-6.6.48.xz 2766648 BLAKE2B 889c664c945990a9bef89aff4c61ae69ce3e7f25378a57d98bb67d3c079fc89ae5db160ff1c21725f8c0f3205c319d19361062f7b49737f29e6db43a237bd45a SHA512 6cba5cacb938b97295c58a169b88ec8835c5d3a8ffee6645d85b802de0e4cdf5ac4fda945a3950b12990d3f8ed71432878f8b084b10e8798c859135c2b9132ba
diff --git a/sys-kernel/rt-sources/rt-sources-6.1.102_p37.ebuild b/sys-kernel/rt-sources/rt-sources-6.1.107_p39.ebuild
index 2a03c9f44c9e..2a03c9f44c9e 100644
--- a/sys-kernel/rt-sources/rt-sources-6.1.102_p37.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-6.1.107_p39.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-6.6.44_p39.ebuild b/sys-kernel/rt-sources/rt-sources-6.6.48_p40.ebuild
index 2a03c9f44c9e..2a03c9f44c9e 100644
--- a/sys-kernel/rt-sources/rt-sources-6.6.44_p39.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-6.6.48_p40.ebuild
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 37cfe1987723..4554e26996ce 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,3 +1,3 @@
 DIST ugrd-1.13.0.tar.gz 63781 BLAKE2B 3f2d3095c6303b16947121071dabdbef81baaea5a7e208d53250e57edf136618497710ce3cca2906b87fbdc529b8a9ef119659365bba8c795594774cf8d096f6 SHA512 a745685668e981accfd32d1c47c6cf506ae63304ef5b3fdad200731db75b76fe56a4339876465bb1857c2fed35c273f95bbce390224fa0d01aebd67adbc31aa6
-DIST ugrd-1.16.0.tar.gz 66050 BLAKE2B 50417d15a50f3e6da2609d61f4a88f4bafe76d02f82ce4a8f8b152e311a68543956c30487a7caee769c8da2a266d9266377a798b6577f4b3d54164acb55f20fc SHA512 ac67a5164c2d239a5994bfde972bf82fe9f63bfc339ad263256e9889826ff71df224a8d003b0db2e2900d862dbd2a07c11c1b99fe12f94e52a8c5cd65ef302e5
 DIST ugrd-1.17.0.tar.gz 69517 BLAKE2B 2acadac8ab3830791146522ccfff6f8c5e98eff4cea355dafd5f5498bedf5d0f200ec2bc2ee4a20c62e3920590c70b2c788c776c148e7291cd3391eb2e0018df SHA512 5caeebadb579536a60cecd6c9fd9036c178ab5c5700418b95841e7102ac0c3c5fa14ceebc9994a86f65bd0623ca819ed7cb7a986f412e0358c9597c0e579f90c
+DIST ugrd-1.19.4.tar.gz 63998 BLAKE2B b6a0f7db7e962f84d695e478f79116329b622505393d17c94d3501ab461dafd3047c25f7ad14b8c4ceea9177b4fdb6e3536952a440096af6619fdf4154252254 SHA512 8504d1f673ed1c1510729376e4419166f88357ef655106c20783071b3dc6c442e9b9ae166781de55f60572ce24f8f31eb3079750d523d99340aafed822073729
diff --git a/sys-kernel/ugrd/ugrd-1.16.0.ebuild b/sys-kernel/ugrd/ugrd-1.16.0.ebuild
deleted file mode 100644
index 2259e96649a2..000000000000
--- a/sys-kernel/ugrd/ugrd-1.16.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.0[${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.19.4.ebuild b/sys-kernel/ugrd/ugrd-1.19.4.ebuild
new file mode 100644
index 000000000000..6869d9c50265
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.19.4.ebuild
@@ -0,0 +1,74 @@
+# 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.3[${PYTHON_USEDEP}]
+	>=dev-python/pycpio-1.3.2[${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]
+}
+
+distutils_enable_tests unittest
+
+src_test() {
+	if [[ ! -w '/dev/kvm' ]]; then
+		ewarn "Skipping tests: Cannot write to /dev/kvm."
+		return 1
+	fi
+	if [[ ! -r "$(command -v mount)" ]]; then
+		ewarn "Cannot read the mount binary, tests may fail until"
+		ewarn "util-linux is re-emerged without the sfperms feature."
+	fi
+
+	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 79e735294206..6f4810071f2d 100644
--- a/sys-kernel/ugrd/ugrd-9999.ebuild
+++ b/sys-kernel/ugrd/ugrd-9999.ebuild
@@ -21,6 +21,13 @@ RDEPEND="
 	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
@@ -45,3 +52,22 @@ pkg_postinst() {
 	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
 	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
 }
+
+distutils_enable_tests unittest
+
+src_test() {
+	if [[ ! -w '/dev/kvm' ]]; then
+		ewarn "Skipping tests: Cannot write to /dev/kvm."
+		return 1
+	fi
+	if [[ ! -r "$(command -v mount)" ]]; then
+		ewarn "Cannot read the mount binary, tests may fail until"
+		ewarn "util-linux is re-emerged without the sfperms feature."
+	fi
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 2879969804df..a24609d34859 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,70 +3,52 @@ DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd84
 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.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.10.1-gentoo 281641 BLAKE2B f4157148dda5fe453b055fea66756e380fbaaf0378b9d1f74044af4ccb5b3da9bc7448e8ec553d30632be1bfe83e961f5751458cc4018d1e8df531251d32e3d8 SHA512 0f5a492318891b295a226f70d5579095ce34d9b547410a1873131c455356ab576b5093b8d1d32a166a01e033802b083e72a7c0f1236495d36ab0d6cd367eebbf
 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.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.10.1-gentoo 250040 BLAKE2B 0cbc4d4a0ae82cb44be5aaad35f1d8beaa30eb829d31edf1a7296acff65ae2773dfa8b7da3cc0c02a08db1f355c7fd4fa080daf97b5d66c9b69c6c1f2e421ede SHA512 eee7747b6160e9caf6429e67d3471c4dd7f0f72a0613c0e19944c86b4e0a8025b737de41b6b072cc88f40331a2b2a780ae60c426957db36ff2015850a6d7bc39
 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.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.10.1-gentoo 237077 BLAKE2B a1d816e8015e1c2548c9323e5c595b18ebee2e5d79a9269a3aadc3daee658a2c54fcce97f7182901610fd51dc667c24699345be9e1b28d736d4acf3c41b6b2a5 SHA512 945a529c5dfe3ef92ccb3699d00e28aa1620c4de52fcd611a5c09971bed16a40594c888fa360270fc74b6cf2ea7a973cfa230d35fec4972dcb224d58ec695106
 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.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.10.1-gentoo 251109 BLAKE2B 511862bd42123b8e8072be0d3a2693187713eebc73d8938770b862ffa25e7a6f69225971aa6bbcc1adc0e8d43863514e9f2ed1dc1035f044d9b402e122a6144b SHA512 af5e3c7eb64535f875883e61bbcb018dd1aa25f661d7e4fc985da3165be074037045f97cc2d6b1882edc9d07aa83c78358867c6742babdf19d9515108c74c44c
 DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa0ba395570cd0173af0210afe63faa48d7a147327110652e3aab5c339cf10ed22a6a20e81e505aee84311beb21fda3eb577e06ea55ecac8 SHA512 c484403a60670dd006ecbe65240cb00d97e8b3fe22d1169c5b6ccb92bcdbddb3ecd474d2b57880b30baf6a38bcef11fc8d56b8b0b02fcddd859833c3640cdc9c
-DIST linux-5.10.222.tar.sign 993 BLAKE2B ec9a556b9aeb2cf51d14f5459576f92ca3bb79ec176fabc9372800bbddf3e4d614b662cd3f1fda6356e39eef4a8d49ba554aaf3e4d184dbe94b42f80fe8077e3 SHA512 042d03226a57d7f6111378e07883eabddb4f0512c7037ee48d9db3da8bf63a28e742663d8a045eedfbd3cb267bbbf42e76e3740ac167ab3b534d2407cdd7c9b0
-DIST linux-5.10.222.tar.xz 120709324 BLAKE2B 05370e0a32687a804663ce4da2e3ddf03a4c7202842550a5833ce50a7eaa434094a981d83a04dd893a925446c6f1392af6d26253511c288229d891c610f721ce SHA512 384b3b816daea1579116f86e0e0271101093ed82854a986351b1a5936f003ed1c469856c26410ab503480531acfe9ba1fbc39dffea03d32ee58849ad20af8877
-DIST linux-5.10.223.tar.sign 993 BLAKE2B 12cb50217d95ed49a9b96ac804ec48f273d601999676887dff575ae33601d4e5bfc6cd41569018ea3760822769753fe63ca750919f5545f112de466d7a5aed9e SHA512 9ea089f6018b273777293d33854309db168e98b1abce0d0e23db6d8bfff8b3a8fcc57514d632df910ed9554e92e6388f0f089c9401e67fa570358d25a0f5bfc4
-DIST linux-5.10.223.tar.xz 120710080 BLAKE2B 220c17707834358323aefaeb0de62aecdc8679b453d25e8e747fe3523c9055cd239002e03ea13f4241dae2db3da248f3f2e72ebf550dabd7d108d936c5d21ca1 SHA512 e764f12d1736261cff4c5a73264527d9341dce6268a0be236cb3fb5cf0521487844c341b0c34d6aeb05b4556726f53074cb1d2e2e34ed1df85b51831ebe7e96b
 DIST linux-5.10.224.tar.sign 993 BLAKE2B a359659b5af01d61ee7e5220b100cc811b60de637ef0ee2624ae46734fc1bc0ee5bd4178cf1dc906c2a8312255d4d982d3ebd6d7a0323abead8ff6cc6eb24e3f SHA512 14a0f4a14f5242fedeeac13fc8d6a36672bc910f21635c05dd8a68641ba5040520ddb4cc3030419edc0b26277a827d4fadbde683f8b5de1858cf5a63db139a17
 DIST linux-5.10.224.tar.xz 120718024 BLAKE2B 122032b13a7909bed102f2f26c74e5c743938790138a56afec0c11c878303f26ae638307a739c547c5bd491fe15ad9b261622909b2c60784a96f8ba8389e48cf SHA512 43c038046601a32100056d67300ce32700d04c081935964b15732e749fce5bd70c54a3a2419f85a60ccad229726698d3e163e3b9959156fd6e0cb653dad27541
-DIST linux-5.15.163.tar.sign 993 BLAKE2B c7b726dfaa4ad159c7c55454577892d111f03f13d95367acb741f71f7dfcb0d17bf8ac5b6684a384494d6340290d21f9546c7b407499e741c90b6e6fbd285e31 SHA512 5868c9e671fcbb1134abc25bbe8ff3563021fbc79a4f550046a060eeb27024887600e0932c05812f92b78b946b769cff9720e5edf684766e1582017e15b57b14
-DIST linux-5.15.163.tar.xz 126680944 BLAKE2B ae8b721b2835d158fc6610f68bdff8d95e458a2ab1f6ebf4a53b3056d251d44253cd060f817a1e853dcdb333d91abbb44fea9bc9fa5302d5ecf90b5f5546db91 SHA512 8145c55476e56355bc785fd999ae514ebfb6426d9d0d9ef937f7a8c55d6c2734e9b2221013b596cee5e01b69340533353f80d99b59a4fbbd297c37acd57be3b0
-DIST linux-5.15.164.tar.sign 993 BLAKE2B 40f5b2db0e56a65fa06e1b4f46ab11356cbcbc96540286cf2cb398913823d5e61b668ed70163c7000ef4eb261f9d0d8c751427a126a6c166544284bdfeafc3e1 SHA512 651686362cc104400c40df56a923a78a1cec0817b9379363e0814f239b25e4ce42df5e9824aff5cb04f78e8899cd241f8c5086cc7a40e4c9f50d40a764803514
-DIST linux-5.15.164.tar.xz 126671316 BLAKE2B bfe33ad462b81e9728705987cb29a36da3779615d24999b56d91bb5e507c3e4691731571fd0c1d6fc66822b74b7f464a21f21dd045e50c815436a4a3f64de832 SHA512 bba725254af598a9bf1047160665db25326e0ef82348e46e4da7dcd0225b0f7edc6a0933cbe6f62508b595929e81f543262b4902806e0a59fb396773ab6fe36b
+DIST linux-5.10.225.tar.sign 993 BLAKE2B b399927765ae171a6546c53d9d7616e078fa439a06f6d5d1320dcc3a0fc26e107ed687f576a02bf1e21eacf745c224a9000f5ab393c0c5363bfea81d5edfae06 SHA512 bec048224675a22a6e31bbc0927e5d20fb1be4127e04b06cd294b2b57a0f8d24a08622687559429f0a53f76235009ae7be3980092ac28b22eff99a080019a44b
+DIST linux-5.10.225.tar.xz 120712240 BLAKE2B e28e0bfdbb444bbc63756d3c6c96a43555c653c3f32fb459254e6b0c395757a5c971a6c2ec73dffa33ab74c1602fb38d0c2f30c542f28a2c62a5bd1f32501f8d SHA512 db8466b9c16afc824df8a06d3f2239c0199502a402103b8aace37a0b7cda34408de664b90156e1fd9bc554fb48d547c5c13843d8a899f8c29a828d87d39dc377
 DIST linux-5.15.165.tar.sign 993 BLAKE2B 4c8ddbb7540bd7b9250360c3b55d1dc6c06a3962dd6f1b0a07175529aca894569afeb3e53b2237d8bf36a091797784a982dc15f620cdd2e769a694be749a02ee SHA512 d8132e4ff4105761925a226981a64e310c56f0b1e76490be28c97648070d62b98ab025f115a09257a3e9f58b2d673a85a03d37adb64a06cc597a325f4809108e
 DIST linux-5.15.165.tar.xz 126684752 BLAKE2B cb5efc3d57473da217b35f4e870c78fe4a647828031271c0300f8af11b041bd61ce6c3a0aff9b65e1fbb1af0d6895637cfa8dcc258172b71143116c940284a09 SHA512 37c8f7e88727b3be43e03d889330d70d5f3f87f7e11b9cee98e2812b5dfbe97bfe18f655efcbc2c7fbdd883e6d8d32609021aa054a6da53450490bb1c7855d49
-DIST linux-6.1.100.tar.sign 991 BLAKE2B 35f2d1dbe55d66536bdab3d20f15a5b2783e972c648bb05f2edb2d8a55c1fdbfac4c79bb0ac601692e899f59d9becdba6ebfc579067b656110469ff7f3d39ded SHA512 0fd653474c3fc276ecf17e22cf95f6e6f41ba30fb70a9b98e1e9d3e67a18771cdada2fcaeb1a3597e16f0ecb44c0752c8d014a5024bac83653884b4dce01787f
-DIST linux-6.1.100.tar.xz 135166716 BLAKE2B c7201bd15c48d611c0eea2cb3bab528bd0fdd3e725ce1ccbcf0ecc9525f28b1a587ca9c083d6ea7e13b6df6894883764eeec5324dfd62f60bab9d7891e17e177 SHA512 842c5ee1109f6414b0173b83abf9ae0655a8bf1bf36299d86d83db1dd2a70147f7f637afe202c3899984fe340ce4633e4e5d3cb9d7b0b89014226a413bc79d8d
-DIST linux-6.1.102.tar.sign 991 BLAKE2B e5e40dd707a9ecd9642c81abdea16e0e15c069dd35a3ddbef77524653cc61cb21d4f3d114cdb2b6943a3de5610adad92b09b1465afead2ac134e35e84c503de7 SHA512 dce1539ffc89493358532974778e78bebd6351d7bcfb7a43a392dd2ccfa170bd8d14b51327abb99e1d6dfc055349a44c10febcac1187e52455946a920170fd58
-DIST linux-6.1.102.tar.xz 135151884 BLAKE2B aa33c053b3d868a626ec472d4e8062b49490f13e5c57996153641308e8a4a672e2c3fc42e187ffe89436cd2af6fcda9bfe1b513e2484a2a33319f8ee38d19452 SHA512 10b8a0a69750b5d9f7fa8a735707ef552da6224830847b1edd7e2641db16857684ae19c4d18a6bfb5fa45ce985d420c35fb8866ce80eaa5b86e77a9629440ef9
-DIST linux-6.1.103.tar.sign 991 BLAKE2B 0afb5ad0fab7340ede83ffcf97ac683a2b3c35942bbbbb1b3f5955b934556a42ced663dc22a4882780c8aaa988652a82cdbbe3d0b75b58446c2e3870339c4b26 SHA512 c0381f7dfe44c635a1a72e1b3ebf7e820d8d08ad76984deae70adcfec773b2781381a1dda92564ca59217ad75d15489026784f75897188bf42f1ee214606ec0d
-DIST linux-6.1.103.tar.xz 135175280 BLAKE2B 64a4ebe7fe9f3490cdcf7801e708b04d1996a94fcd26f257c06eb156f0077723882bb2e43aa5f63b1cb3497d9beb0334e4ea7c7f73cae81a6b7c1a92da0ae504 SHA512 a6199b000e44be97f51f4c83dee93659caabd6d2e4cb3f20d4f5fb9a46119236a4df2fa6dbe3246bbb8994eac967384cf315d9db8dc7f05309e36c33636984c0
-DIST linux-6.1.104.tar.sign 991 BLAKE2B fb727b2dba92f5b1aafd4af795a79493f550c2c8a60239802435c555ddbda8245db079c1667895de652a476b46c043b12b8cc6b0f92e9c81f508e39841cf2f5e SHA512 ae912a70f2a4a4e9dfea4d75e66b441622792559173cf7f9362fe7af75d56af0d10c375849bf86e3a1f14b400d4f3cd4a42767e7536f054495a9d506da7050ac
-DIST linux-6.1.104.tar.xz 135163604 BLAKE2B b32e902873f3a502c8a3dd889503015072957381debbb76c1f1334f41b507ad323d3d42d2184457fdbee1684b185a15918333cc40469f39b9ec014fcae821378 SHA512 c2dd7b34315081dc27772eb7b97581df2702894f075f72273e10277af78376c977335c7634120722b1b8b8808049aeb657392645ce71962aea15d41ceff5f14f
-DIST linux-6.1.105.tar.sign 991 BLAKE2B 117283d87d948dda81d17f3363c269f8181f9dff726e224feb54142ebc476e78d2947fb3ad20dd9925d3bba3cc608560e0b32f5f7470cc40ddec9392ec4628a4 SHA512 28de04b622b3f2bac362d74cf724e7f06d95a6511a3f25522aacdbe4c9a784e5ee5d6ab82f52224b1972f1fff6e2953654c315d87634222c73e1d301e11d8939
-DIST linux-6.1.105.tar.xz 135212116 BLAKE2B f5a0dcd7dfbc940aaeda60949a136b099ef1343f7eb619e48344c7ba85297fa4377ba7bf80736ee55da1f2cb7a29baf1c65d6fac9c0b12a991f9722584217be6 SHA512 1cedee397a66a7f7d08cd89c5945a7282f7fc6e318a01c4cb1f25919845d98194edfdd0ff1de5685ff9dc9964c07d503f739621bf1025b890cd0276cb1063109
+DIST linux-5.15.166.tar.sign 993 BLAKE2B 4f50d975cb77f23871dd402b61a07998deb0705df4b8baec9ac0d3228ed2c39995c03d766de31aca6cd2445053184b653ddcd88bd2bd91d7175388e870ea53c4 SHA512 db188fa382c4fa26e37865c8415640f5c7e0cfb20d84cad855fdf97b874d09fa6148a328cb277d215b1933c95489402c81f7798174069b460dc1100d1e1c57ae
+DIST linux-5.15.166.tar.xz 126683128 BLAKE2B 52688b940aaf76d28516e05138b386da95738a8d0da7979ff27a8dbafaaccd7e59df18320540340dc661d8ec88c44458fe578ed93f4630a1d391a03eef2cf859 SHA512 20a7de0aaf3b2deebcaa4bb5926d979c7c758dcec2d8263d11477f18077518ec7fa8900a71ec09c8494a2d5c7291902e39b42cb0b483e7423bb2953a8d9c8320
 DIST linux-6.1.106.tar.sign 991 BLAKE2B d74c3e31e683255ea4f222ccffa62c755e529aecefcf8a60eb2b3b844f1e753c3ceee1b8f1b0728e1d92d78031bcf6ea6d8829d8c30decdb9eaf36b3c51b1d91 SHA512 225eb6e616f2f1d496c294ae09130007d786b2ad7e4ac40b7e0fd8bb36190cfe774d9d7ea0827bb7303fc584a3289935656297dbc0bff59312b1f5374309cfb6
 DIST linux-6.1.106.tar.xz 135145020 BLAKE2B bcd4bce2bf35411fc1e13afa5c6935ee5cfbb13e4395fa7215d34b6f964d433c54f1b5a1022ee57bb439593b5196a9a4733f79d5590b05defda60b62845e4eef SHA512 0ca73f9ac725dee2ebf7aece9ea0e5bb890ed7fa836eea4d1fa97417b2a2735dd5dbf9a5970683ca09f6bb469aa03bb9ead7927bd4c2d2476190be5f2f3118f9
-DIST linux-6.10.2.tar.sign 989 BLAKE2B a49737993f3a525dc2963bf11bc96b7396ea753a0dc60d8d9cd53150706d027c6eafea5cb3edc615963fce0cadc56d0431668b20d1ac12192264e34225b0084e SHA512 9fe19c7dfd8ee31e7561cf21c03422c05f73223706631a5ee1cdcb02dc417d11ef0374b9ea22fd263cb3f6e01fa2a63782fb6f54d722a624a5e3320545196576
-DIST linux-6.10.2.tar.xz 145157612 BLAKE2B ab1d2e79a1bb8a9b78ab5b1af93db7ef356cb5e14bba1121bbd3ae06b9589c8bfc32bab373acdd0ecf965ac132130e7eb34e70b35a9df1bd85b49dab97e2c02a SHA512 1c121e3c9c8402ec46581b38c736630d25297dc3e981cb69d47b95e2cd3204cd93c6c15c02b81fc53d62c49ded462ab6a0bb4d94b506ec0f9c366e47a1c92606
-DIST linux-6.10.3.tar.sign 989 BLAKE2B 282a13b4d56e95df1432ea82294380dd019fe9faedd799201b6d43611b20cdaf673dfef4db77bd533106f44c4cc07eb293bc489ac7bce48f9a8da84cc47e7df0 SHA512 2fa43f6294818a12a88d6f018237c63968ded3f1dfa88be45ae0f7fb4cf456208f2027a7341bd4378cea0fec04ea0a3d80a4f8f89e7b3c1f3ecd0f0b88aff588
-DIST linux-6.10.3.tar.xz 145125004 BLAKE2B e114bbaea91d03efa318f5a85c11e28257defa5f0c8467d3a5d467a7985bdfd7c23a5f54856c85afe800c32694f382df9b147484a3aa85e1e3f4efefbd80b564 SHA512 dd6061c5871d7b313e1b0eec791444b911f9d9d5e28b1d7a81a265708688808c157adfba92459511e9b786d09e3f96f5bc3c03980360061344ad8e225e165f6a
-DIST linux-6.10.4.tar.sign 989 BLAKE2B 7a1d7c20d5d93c73eef54d54a17eb739e85d2bae6a16154c922d1bb0058bb45f46ca50532125fe3172bd15cd736c5ab1a6500f16b61cd3675e206c678e79539f SHA512 2ae08f074a16696a1162caa821a38e4290f5aa466672c036da606e84932664e11023b78d4f184686d04dc205dd7e532dd95461c6d8e9ccb52cb7734644b68f2e
-DIST linux-6.10.4.tar.xz 145115632 BLAKE2B ea7e9a7d74621a6e76b2828ee80cf5df1fcf139469bb8877d93f30d7766f9145961324de5b2cadba29126d7df82a7eeba80303c82c7c1140be3fb46cf213e503 SHA512 fb96ca6b4131152cc7b86e27f5412ca16a8a37fbb79ca04d3997164fea587e03d8659612b3ba7029591a94f957f89bec6449c54c12bb000a818ada541106638f
-DIST linux-6.10.5.tar.sign 989 BLAKE2B 9310eb352cd05604203760240b196e0ae88cb79fec42e3eca53caf7d23ec0ef4185b2b5be80b07f85db541e2f9539f9507ee971bb94508ca4ea7cb672fb0d456 SHA512 846e283d6da9f371fba4bb3928f2bc7b9b95bdc4f2c8433c722f4e3813fd34dc7412a06e13ca78c0759cbe3383f12a47845d6f433adb6d8e3c170b744b05fe90
-DIST linux-6.10.5.tar.xz 145139876 BLAKE2B e4f8d468ff4e4ec45a697c69676a21e1716f3e4c8ed456def866125a93826de5e2f1366ba4fa970879744d431eac85377951cee391e39745d2e56eabd7985c83 SHA512 78be4bd94a3e3612c68ffe856daa4c660c801fbf33255371203283041f49bcd15dbbab8cb67b65b241f067823ddf7f023fdee3a9acaadcca83a986738076f569
+DIST linux-6.1.107.tar.sign 991 BLAKE2B 00fb8cbf46cd3f7f9a725d8db49d6c1c7318ff880634cc13c1ac662eb52afa0d3e8f172a1d9bac9ecbb8956e7f1cb0b06256f3463755ab09df15f8b089031bdf SHA512 cb2dcc57b30ca63b0165cd286ef62a7d34cafc6f516217a4584f69b2318d7a1825c4187149211a0dcf023455f150067106ea0d07eea131961f56cec4c79c7d0d
+DIST linux-6.1.107.tar.xz 135181828 BLAKE2B dce4dbcba63d212f81a7ec038e0c75a37ec06f84cdf5a86cbfea70af87c7dbb0860ba9d15e1a9bdd108b804f3aefd700754d31afb226ab92441ccb63e0b98c1c SHA512 d72dec68fe4399d444e152e88c8d5e2d2227700108573ee224e5239852d7c01330ff1f3aa060c3ab74c086bd73494e3e0081a9dc633dd7b0580f108081a9ce89
+DIST linux-6.1.108.tar.sign 991 BLAKE2B 70c218f764b2bbab0e7f690451a73c7a025b381adfe9b84fd57eb3a63f4d39d71f7f21e2370ac8152e5f539d429650fa5292999283bece3923e8db504a608e63 SHA512 d6c45fb87c0a014a539a5ac8e806feb5b874c48d18968e6936551af1d299452c2bf7d5c0c0ee4852ff450f9b905e58f86ad6d099045c647ac44f5f3458006060
+DIST linux-6.1.108.tar.xz 135203104 BLAKE2B f86cb3ca34cea63c1fdc97a22c800e092bed78175486c4e7a95b310031e044021791f3e1c4d693ce3b7bd7be039ea192b9b978c153c5796474b0fa4d5ee8d7e1 SHA512 6934d134f1a471a313ee5d7392fadeee43d6352d13e7941af9a089d532e8478ded57e9a51691cc9e4f0348554bf7a895812b0b90b5701fbf70f730394b7e3e51
+DIST linux-6.1.109.tar.sign 991 BLAKE2B a47f2eb60b86a73af2a7edf256288209702f195f0aacd571d58a09918a7b8dc42da344147d2cb9abd2c25c7b2151f653a4bee5945104bff258ea6c5c2f5b09e4 SHA512 f0c6b33621f0051917e6cef1d35d3a727a179474817df2c4050fff9211dba3203cd95c0019797028cd71133f15ebc53fd2833128628be3695ba28b8e0ddd535f
+DIST linux-6.1.109.tar.xz 135193224 BLAKE2B 2ab7151c193bcdfe0664f94040675faec1cefcb44df524074c9b06eeee1184fb07891c1d6bbfbe8ca53b8d52f332a17a14854602ef046897de692eaceef8e5c6 SHA512 a435b89320e8af19532bbd40c30c5c1e1b6f796f062a015f3c1bcf7a30b00eba4c51a568078c6dac9fc60040153305237910e6f9d701b9a7bf86475bd0a61dfc
 DIST linux-6.10.6.tar.sign 989 BLAKE2B e8ab99394db3d9c5da9177f64c6c6e8ab74b5b62b7b251964e2b9a0a8ecfbf6a8339ae8b2e2b9ea75350d08b5fa8f00e1bafebaa35c57f52545d415aef60b0f1 SHA512 bd5555d4c1f02277087615423f1bd951cf9cb18f18b9f65775c70810f0698c8df45a1b789f26b33b5e0f7b8183a6a6ac2aedd9154b1b7eece4742156d6d6150f
 DIST linux-6.10.6.tar.xz 145142332 BLAKE2B e0e2c2419b6da1a6c5caaf9df669a362bdef3d6fb19742da6c5300a6f6d0994259ea2acde7f6a4a20d1e2b71528bbed0e7fd51cbca33ddbf78f2d832a291148f SHA512 991ec7c7d2d490cb90b182a29e892dae586918eee7f3ff4b6e26f4ff9b31b6d7a31cdc31d25ca12243ecab59787aad75f0056b2fbe6997d0dfd68c357e7703af
-DIST linux-6.6.41.tar.sign 989 BLAKE2B 91e81c3582abc1124f618d89cd68bd32b1372a3a54511b9f60159c0282fee1dd12422beb3bfe04c2d74cd0901a39dc3dda34e4f34269af2fa8d4f3603e373345 SHA512 3c1a498443999bda491832d6fe842a3ce83c65fcd9ee1fcc24beeaa273fe6dac0e0949151595ee02e04b62a904c6d0f3b1c972d41e01f58e0e2ce99bff4359cb
-DIST linux-6.6.41.tar.xz 140257040 BLAKE2B d71b2a108a600aba232d2cce9df0f8d0bd6408427be31e5185fd3dcbab36a847bc497eea6237974f76f6386d3e0dd216cd7ea3d2a9dc660bc5460042f1ab7328 SHA512 d623e13d482683c47b1e00e346658928597522b45fca94b6713e75dbd57deca92cf6b1189ddaadb7b37a04e509ff713eecc76f5a818f241e328635f77f09f504
-DIST linux-6.6.43.tar.sign 989 BLAKE2B 877809199e96598c321932c142aca616713e3b15ea9c05bc12ea9656fd38b753248b5d32325d4007b0f0dea8973a4f13e977b2caeb86b8ffe079428ac79867d4 SHA512 edd688351805d19a8527f5f7bce8065c05421dff60bbed22babc296c06fc13d570b0261d6abe1ff82b6c8d71f10d1856c44c47c6cb5d453309465d570927b40b
-DIST linux-6.6.43.tar.xz 140281980 BLAKE2B a3725c336374b173a1f4ba03ee2cc2772e5f1276dd065df039b561d2a88a9bb5c552539f699168a0967613d94f2d4461e0944d2d8141f22b4ee04d660728f241 SHA512 013027b921184cf7fee360e930472689c0ad202e06b4ddcc2b3207f52ea6244890d9ed267ffe5590335501318dd8386c873f038de875a70d637a58f1a405a55a
-DIST linux-6.6.44.tar.sign 989 BLAKE2B 58ca0b79641a39af5b02e989904ede39fb18f14bbf55374b98fe01839eb3d4ec3572a8661c7c6999cbc79ebd6a88547ce8c25d59ba4b835d371c62d2365575e7 SHA512 c546f1101c58683f278cb9fd683faf195ed6b1a95be917d8058d5c7a7a4506538b2c03bd618b9dca796bee0bcc42035ae98e91311f96f6160e6460b38ea68b87
-DIST linux-6.6.44.tar.xz 140323036 BLAKE2B 52c7e474021f4288175477b613e04490471fc365809c48f25effe7a625db61e3599dc8c46036b250d0ff25c990eb9d9591f59f07a81ff73c83df81ccce751250 SHA512 75ea5973af1d9994c5bc7d4538a314100ffb9daf40c98cbd7eb4f409ceb5d007abc257cd7017221817f2a8d8f097558e7498a90b88ec2f3b4a611eda8b794fb4
-DIST linux-6.6.45.tar.sign 989 BLAKE2B a03525d56767d3393b9e04bfdb58e956a9348205f73bb992686ec8fe9ef391b7ead04e6e6c3f6329d9af6f2142e023d91205e2d91c8bd8f1a3b2d8c5a3904169 SHA512 63ec6aa68f1e4a4c8ffc463442538c4f3be575160fa959277175b8fbd3408809a0fdb45f5e183745e4ff5f4ecfefb698d3f99f7e421e672b1e7910273bcc8395
-DIST linux-6.6.45.tar.xz 140330280 BLAKE2B 18a088b694c7fee7e93b819bb31c30a2527f9298b33fa2ad1e60f18e4e2bd9ef86f46b5fb0c96db2bb78026c25a1411bb444b261e5ff2a95c6f8feb02f5625aa SHA512 1f70ad29581e92cb1979e0d50c2db3933c38d6c645f5f586794dab86cdf086166f63c5bec952f6bbc2ee7fe71ee75e16342b7581f9c530e5ac0af6b869f39ede
-DIST linux-6.6.46.tar.sign 989 BLAKE2B 870a7f4f78a737c6afd050550090ebf70ad70725c9db573f78e8ce3d6dadd8efdf054e21ea074a247962da24b67e1d263fdadfe4e659e47730370e622565493e SHA512 eae0964d17574cac5b5028c2702ce5cd52fc8c3721bd07d7258ba81f987889a204bdd8ff9a09623694b07c6849b53d28834619017eec2f100efc927593f351a7
-DIST linux-6.6.46.tar.xz 140298240 BLAKE2B 583fd214fdf23b8ac90d3efd6311db06b254f57813a4193270d8f5ca5f7dcf7be80c228f47ca52ac60d43a20b6d2c6e55768e5cf3ff74d67f0dc56ca4719fe2b SHA512 08ec1ab00f33e4dcd29143c502591cb03a3f82c76ccad9cb84c657ba4c58b1e02bb997533ed4328a34ab766f4831457e522f7cf3e55d3f5110ce6b97d62eb72f
+DIST linux-6.10.7.tar.sign 989 BLAKE2B eea3184425313d7b20475540e52b5b59b3f5e8414eeae6c2df219bcea1adb084d6e992509adf7627e1d4409effc817e10b54cbad8dde48b11778a1e0273e593c SHA512 ad0446b0e08dcd7c063382d8ea3c4c48a5dce8239c6edbea70a64c106546f77ae69a450ae7dea82b5a755dd3311f017bf5ada3913c7daf715fc0393f4e0b5695
+DIST linux-6.10.7.tar.xz 145165024 BLAKE2B a177df46c43bef6a529e50af64103a40eabc9d7301f93c8e1a4ed3e6b0e03bec195838c6085f3df798b7d941c0943ba31b23b1717150785ef52cfa8bd2dc028d SHA512 34b385292d901e7bad74c08addc231a5b3d40876500388ae89fcc762a26a04c7243fcd6233e484d3fd2d5b12262965cf1ace0b4e95474e99a2df53214a375ee0
+DIST linux-6.10.8.tar.sign 989 BLAKE2B 88036f64717d31af2873b2267981f1eb04d145ae9e8f1ac73d1f5a196f70ee37e68a25d153110d566a69a5601f312fe90e8b0160cc879c9b737b9641700dcbe4 SHA512 b2b9e0c51e24ba2ff0aeda6375a7fba80a7e976aeb46a560172e5901471db29e94a119a90fcc448c2b3ed580f0c01a02cd2de225620e14c1104d2dc1ceeb9c5e
+DIST linux-6.10.8.tar.xz 145156852 BLAKE2B 01a004ce8886b00be4ca927ca6b1ce10b5d31535687022accf0b9d1f4aa9b47a1622a82611bd9544abb2c90ad914ad227392d0525d7c93eefbb38fa25ba6c809 SHA512 0829f6963a91cd230e33fa82605ff0b5b1b7c6f21192634f94a60185926c9b2eb12f3124693753c7da33cb6b15abe9146ec343c9bf7307156dd63c2fbc585f13
+DIST linux-6.10.9.tar.sign 989 BLAKE2B 37977988833ad92d39919965be4844797710c360bc0c6aae89b0dde57d2b64327ec1545565cf688062e4f48ac921fd3f9e4320c40a1ab43f627fbe150c6b2eef SHA512 7ac13112786c2d5221558b9571640f537c783e73a648b8439db6c283a2a27368aa7e0f370e5c324afbf6bb28e0593edaceeb77e4138f9232cefcb18d15a4f38d
+DIST linux-6.10.9.tar.xz 145156944 BLAKE2B 97152136f0bed53850aba45e55e2ab0d017699257e54da19f62a79c7b28c68c16cd56295602d2a631ad9332b64ff573dc7217bf51355624463ff7cfb7f6d0b7d SHA512 e383ce1b999555888c6dd2efa806efb6f6673517000f074b4170a5461c85d4d83757193d4e7e18a1bb7ca166a793ab104ec7313bc6b147a0456e615eb006557e
 DIST linux-6.6.47.tar.sign 989 BLAKE2B dc5b68309d03a9adb9e9721475517c495d44c1b9d6765e2877fd040f1fb6e82d0eb585dc97030319f730e7e579d8861e0992e3a326e9b77454443e9bd18a7e5d SHA512 4b690c9d025d510d572e234a47cab15f916746ebcbcc4a772894677ce3def6edaff3de64f6bad9ea5ef357508e5a27770aa9be68de0799c032715d4b2b7736d8
 DIST linux-6.6.47.tar.xz 140308580 BLAKE2B ece3be3257b205c3d56c71525b95798347ab40b00d9ca54f0812a5407725512613075e85b3a6a0f3bfc4a59c714438efc4c08ed171a3f92e62cc3e4046f87a1f SHA512 9a3c52f5df4480a61493ca24d25c9e9b5b9dfe2e465ecf7d457bc240abf88b2d08d745b63895c6b47a557fca610882bbc8b5fe66b2d7a9262f548daca50d4004
+DIST linux-6.6.48.tar.sign 989 BLAKE2B 855c0c89500fc0217531ccfa61774d50d69da28adf01eeef0ea1bc7d4ef805797c01f722b7e555685a8cb245db1a55fa01d53c969530c28528f465d736b93a35 SHA512 3c312aa5310ed0dcbbf94047be094f67511e1106521067ed9aa2ce722079163681768afa1cd937587b96a727c344ba33d974ad4e72a4e5b2301af8a54eb20f16
+DIST linux-6.6.48.tar.xz 140310108 BLAKE2B 8c6435fbd16ae3fa8bc4703ddf6d57e8b12ea1fced14385a35e08750331de21e1709139517343fa71f018eb65658cde61c653c5b75d02add4599d6026040620a SHA512 4ed450e554218d971e64df0d934cf6e90740f0953376faf2ce20ea09857ff23c7ae144164d2bd10e93b67c22601fd2b9d64e27162235c6cc4cce932dd60d1cb9
+DIST linux-6.6.49.tar.sign 989 BLAKE2B 2ab6f62a7260f704c9b1ce6f62d95809ab6ef12832d246158e748d5882e311a72450d431ae9de1b14fc3fe42dd6421c83d4984d9a95f3564d59126ec627d1059 SHA512 5f61a4a48b2db6e7b024071a3475379246eb6290986a7876d50fb558345d083827ce264c1703507c3aee0b14f4fbaf6d429bc08a038fbb556845859b6fd6ec06
+DIST linux-6.6.49.tar.xz 140314800 BLAKE2B 2fdfdcfe27696540fc57b53ae45241d87291ab4f1467cf7b14d904b5da800565361b55e91344904bf6bb520a766b66cf9c4bbc26b656393dd96850a17c573807 SHA512 3db87b48dd3b771cd119cf48f9fbad43cfe2f90e34bb06419a25068a6807c294d2019089a21471b72c1438f45a84d99ecf77d322ef85b3e2815c7dedc6f41bd8
+DIST linux-6.6.50.tar.sign 989 BLAKE2B e2ea6cf052f27f273f59e7a4a51689fc9ad9e6a291cf67505e2c52e964f2f7db2fa7e0b8c18c4db8e14119b56071e93a05a1d03e418390d3fd236624cf6b75bc SHA512 5a662d274f4d220828437e58ea08d1fb638c70dcb96e56a152c186263f4ebcef85e35a75e3e8058a48cf5169383da573abb5492e45b60b2bbf6c4855e5017a2f
+DIST linux-6.6.50.tar.xz 140341000 BLAKE2B d54ca4ffd0c6d525725441189e933c68cf9123cb20b553b33e162867c14240fb8e4fd4af5331865156150a7345973ddfae3a8448c77681f442f0af54c071c5b8 SHA512 8421a7085900d4d1919ff73b6c77d9d713be3391e9113bf7446052f3e89a8c1b6f89e5861776007bf922f97d66c1aead48f0aae9b572a163034fafd2280b66b7
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.222.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.222.ebuild
deleted file mode 100644
index 900f0cd17578..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.222.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.223.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.223.ebuild
deleted file mode 100644
index 900f0cd17578..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.223.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.224.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild
index 900f0cd17578..3816ece2074d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.224.ebuild
@@ -76,19 +76,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.225.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.225.ebuild
new file mode 100644
index 000000000000..3816ece2074d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.225.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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 86480fbf041b..f1e4891c4a7e 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
@@ -65,19 +65,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.163.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.163.ebuild
deleted file mode 100644
index 75273ad670d7..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.163.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.164.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.164.ebuild
deleted file mode 100644
index 7dcd0d3528a5..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.164.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.165.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild
index 7dcd0d3528a5..857634f8cd43 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.165.ebuild
@@ -76,19 +76,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.166.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.166.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.166.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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 b1493802e951..7d069a174e94 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
@@ -65,19 +65,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.100.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.100.ebuild
deleted file mode 100644
index 2a01b55657d3..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.100.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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.7-gentoo
-GENTOO_CONFIG_VER=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.102.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.102.ebuild
deleted file mode 100644
index 7dcd0d3528a5..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.102.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.103.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.103.ebuild
deleted file mode 100644
index 7dcd0d3528a5..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.103.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.104.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.104.ebuild
deleted file mode 100644
index 7dcd0d3528a5..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.104.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.105.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.105.ebuild
deleted file mode 100644
index 7dcd0d3528a5..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.105.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		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.106.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild
index 7dcd0d3528a5..857634f8cd43 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild
@@ -76,19 +76,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.107.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.108.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.108.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.108.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.109.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.109.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.109.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.10.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.2.ebuild
deleted file mode 100644
index fe28dad4c959..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.10.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.3.ebuild
deleted file mode 100644
index fe28dad4c959..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.10.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.4.ebuild
deleted file mode 100644
index fe28dad4c959..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.10.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.5.ebuild
deleted file mode 100644
index fe28dad4c959..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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.10.1-gentoo
-GENTOO_CONFIG_VER=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.10.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild
index fe28dad4c959..2bc8ee080f62 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.6.ebuild
@@ -77,22 +77,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa | loong)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild
new file mode 100644
index 000000000000..2bc8ee080f62
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.10.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.8.ebuild
new file mode 100644
index 000000000000..2bc8ee080f62
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.8.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.10.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.9.ebuild
new file mode 100644
index 000000000000..2bc8ee080f62
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.9.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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.10.1-gentoo
+GENTOO_CONFIG_VER=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.41.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.41.ebuild
deleted file mode 100644
index 2de327030b51..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.41.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.43.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.43.ebuild
deleted file mode 100644
index 2de327030b51..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.43.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.44.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.44.ebuild
deleted file mode 100644
index 2de327030b51..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.44.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.45.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.45.ebuild
deleted file mode 100644
index 2de327030b51..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.45.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.46.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.46.ebuild
deleted file mode 100644
index 2de327030b51..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.46.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2020-2024 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=g13
-
-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
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		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
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
-		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.47.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild
index 2de327030b51..93587cc4db6d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.47.ebuild
@@ -77,22 +77,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa | loong)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild
new file mode 100644
index 000000000000..93587cc4db6d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.48.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.49.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.49.ebuild
new file mode 100644
index 000000000000..93587cc4db6d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.49.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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.50.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.50.ebuild
new file mode 100644
index 000000000000..93587cc4db6d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.50.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		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 53145fb7ba9a..ed9c2cfa781a 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.9999.ebuild
@@ -66,22 +66,16 @@ src_prepare() {
 
 	# prepare the default config
 	case ${ARCH} in
+		arm | hppa | loong)
+			> .config || die
+		;;
 		amd64)
 			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
 			;;
-		arm)
-			return
-			;;
 		arm64)
 			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
 			biendian=true
 			;;
-		hppa)
-			return
-			;;
-		loong)
-			return
-			;;
 		ppc)
 			# assume powermac/powerbook defconfig
 			# we still package.use.force savedconfig
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 9eca3e76be82..6e4fb96bf86b 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,10 +5,10 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
-DIST patch-4.19.320.xz 6150920 BLAKE2B cab6259a07438b2d0f54d95ce106bf1bb89e6aba009a4f7618e460f9e7b24fd34716683dc08cd4b9cfec93b1bcd81b5a93fc1c539d15ffe6daa11e5954b21996 SHA512 30cfb5cdf03ce01e946c696d639646d806fcbc79257eaf28fe05bc37051b0ea5b4751eb5c3af3813c740b9ed51bd6b3f7034bc9d639a7a2f39a0eef0bfc18d17
-DIST patch-5.10.224.xz 6187828 BLAKE2B 1e4b690e7c025239c4aa6fe926fe167ffe96707837613b0d82c8800e62badab11e30333bb527a26637790918ec499b12baabf09125a694ea6c1498fa37d74c8b SHA512 43fdba5625545da63ca0145026574d9969895d88280d507f3ea47d2ce0a04e7e29a48cbde94a3463a2e67fd4d16098e675538646c2c0466edb836c9a768e5058
-DIST patch-5.15.165.xz 6130896 BLAKE2B e7a5cf89d583f91ad7146035afe13dba64b1a2cfb0bab9143b11ea85cdb6d74386693e2f41d7d3879958898579665d9ec5bfcc0cac21caf8e73df0e7ab3663ab SHA512 92a75b471b5f8d82f6fdcb9b95e1cf7e9628ec91995d2ff39d3093f7a53ebddcd27a0a31c00fb68f5c20a8e28a7c0a3858258486a48dc632ae462e464ea3f199
-DIST patch-5.4.282.xz 5695472 BLAKE2B 00c630d09ddc187debfb1496cc805e95bb070dc147755327b52607d4ba1173d936b76ddf6c8841a5542952647b47b4365f3904c7c890bca07bbc57a939741d14 SHA512 6c7dad05de3f43739a7406010da80b20d72596a4d69800acf341bbcb723735d8378b5c5d8480f719e90d83baf2f16e30c71ffbb7b90d131d96274c0b54623c05
-DIST patch-6.1.106.xz 5031464 BLAKE2B 6f48fff82856711a34ad2aacde6069bb0f05e5bf7b3be0ebbe39c0323d547be930cc7525c61efc80c705e3fd4d8ce924b1ac26282a0ffca8180923ba753b343c SHA512 a2df677821d976adfdc4caaaaf6306440d756d80802bc2e5466b384a8690558117b023d9d08b786b7b3224fe653be2aacccb927014cdf3c9e7e2592c8751e908
-DIST patch-6.10.6.xz 389064 BLAKE2B e3f51f9f3f039b0bcbb6a7472c981284f4900efea25ea4473e407f0c5aa037486b2ce3301ed7c1dc6ed5a586a6ffc455c96bb4a582b9cad2a215b3c51207a823 SHA512 cbff973f059aab36a8df5f71d1230a27fa24d7a0791dbe5249618beca37a7964d38c3dd9b544484e4ea2aa38c188dcd913678a9c05d92b5f5d4d34d954e0da1d
-DIST patch-6.6.47.xz 2694732 BLAKE2B 6942d4f29fe6fca3cedbc5f1887fa35b525f44099ec6ef0b4dd0e9437e12e8f1ad30dbdf0bb531c991463ba33c97ad170f2de345c76342077da0298a90617a9c SHA512 689be6284807380288c8232f1497a54b16db823393306e7ffe93a2972b9f411aa4b64a02cd0b27502c60a86b683c38143f4966676b3abc579e09815ae4ff9dcf
+DIST patch-4.19.321.xz 6150120 BLAKE2B 4dd50120f58b5da95b757706d795f91b97d5a2c9976d945933432d71d6b918fdc70cc8df2e12c4ba02b9013280fd0ae85d7526b1c5d24af8295e3beb4387fdbf SHA512 ee5545426634c909d72d12546bbecebd6a047621fde43190624966bbc7825df45de44f055b3eab6b1400c8a7a846ba655a511951ee760dcc8e094a233c595c4c
+DIST patch-5.10.225.xz 6197352 BLAKE2B ffe16a287d21266cf1a4e1770b541ea2224f370c2f404b57a672fd61e1d93d7a96a0e92c2a676c0a5e74c198bff700e98e4315a53084709864b806670db12178 SHA512 f08734ac14defc12c7c5ed1b3ac8ac5642df6a0299d70d37c0c6f4136ee3830e47e4941c8bdb662a2f4c089bf2fc60d05e716bfbc1c44e21cc76a8f5c47d48c1
+DIST patch-5.15.166.xz 6156876 BLAKE2B b763cbe948843ba192c149815f71e67c2216d152a1575443a856b4014e1110ba8534e4289b4371f8bf0ad247dedc71f97c8812e582e8f3e9ef19fa4af2e56fef SHA512 cc331fdbe0fefa8d588e0cc3225ddbdc92e2c8b0d7ce37c21cd689574766f4417e0a3f168baf300c1e537d84d5c2a62a76591a965d76821d20152ae280f8ac68
+DIST patch-5.4.283.xz 5706436 BLAKE2B 60f9a5b6f1477bccd9d63d549b4909c9dcea7faa28cbcd1def54c3b19e6a6b3178b624c48d65b2580ecc8dababa72ba35ccfeab23ec130a021f1677b96855b36 SHA512 d0ab0b77c64797d221977c050bee11492301b03cc9c8ddcbed0f38962d63f20861bd5d296368c1bedf346083e0e3f438fe58542f9d5378d178a679cadea2b288
+DIST patch-6.1.109.xz 5130792 BLAKE2B 0112fdff570faa0c41536c66d2e55971d652ad39bfa890e4e05f0c10beb17c9e6d3112e804dc2f8c1fc2fcb5f82d1bacd9682743de617033a7c4f02421d7ea45 SHA512 9a3532a3450f26cf94b0ee03a61f4bde4c5fe7cac27fa24c32bf81ef23d50fb3b436581085569c9edf8176130180ccede7fbf2108acedb8d70dac7685ed0a0a4
+DIST patch-6.10.9.xz 561612 BLAKE2B 0c37b127c396a98cbf15fb1008caa1bfa81b8fe353417a4411d219df572be9df8b5ffceca4351daa9fe7f61f9dfec412bac0fe5b8dc0043c43380378d73c30fe SHA512 f2536d794c9250be1fe763fadad711619f181f0c938e8de1f510bf4a6cd79f7c43ce400f659c53dc6fd38081966724d7b8bdd433f8cab43e7faa09d775da6f69
+DIST patch-6.6.50.xz 2815828 BLAKE2B 02415f46ceab500efa4bfc00f793c4687da1fb3878a52e34aaa0a0f17753161adf3ec76a34415e9800c087f2e67ef82b44f0069e8384848179089d97aaf18c16 SHA512 2fd40aa14f6ca866cc31ef30b0011a28aafbb36cf711c136d29d2443b91c284dc992fbd089708cbc12a21d24b1d41532a7e0df57f5b296f96a51f1c8b1e3a116
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.320.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.321.ebuild
index 9286d988287a..9286d988287a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.320.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.321.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.224.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.225.ebuild
index 9286d988287a..9286d988287a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.224.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.225.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.165.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.166.ebuild
index 9286d988287a..9286d988287a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.165.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.166.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.282.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.283.ebuild
index 9286d988287a..9286d988287a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.282.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.283.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.106.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.109.ebuild
index 5f82b6754e4a..5f82b6754e4a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.106.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.109.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.10.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.10.9.ebuild
index b8791038d227..b8791038d227 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.10.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.10.9.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.6.47.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.6.50.ebuild
index 5f82b6754e4a..5f82b6754e4a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.6.47.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.6.50.ebuild
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 95cfa356935c..902269ce8a19 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,4 +1,4 @@
-DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B c1a730341ca150f9f698300f59f43d1f4ab2af44745ccd060033702112caa9941a0021e23f9a470cdb0fec51e76779a20e451b2b058943c12e153acbaca4b770 SHA512 e3b40a773a2c58914b25534949f9e05542eb1712b823bf84287ed546e44c9d6e830aadd4c61d4e2a72b1e2b071387a9d1131cfc9f43ee9e26d9a14785b248758
-DIST genpatches-6.9-11.extras.tar.xz 4052 BLAKE2B 3b12fe75ae76ff17e30bb30d5e5cb913e31732bf43958b972356772e76d892823b925e715d9e777dc3ca39f89c01960b8d420d2647775d1e4406e4b82ef2c08b SHA512 5fb378ce92f4d443ce162cd69771d6b9d150bb7be01e776c22cb913437c7b441a4474dcb33fe7d6d3f285ff0f8605b7aabd9149594d0e45ef8b231e3703ed026
-DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
-DIST linux-v6.9.10-zen1.patch.zst 165602 BLAKE2B 9c89edc530c32e4b4c70d72190daf9a5513e433558f3a561e83f5f1a8b14f1bbfa7823d3597b89d23f8c714a52d2c16aa7973e34b1c40645c9eeebe1db19fe40 SHA512 f70c9b3cb80b9dd6e25db3134e58d0aaa21b5b73aa5bbc7b18314c15a86d75f827675737bd19b9fd73ab282e6c83f21b44c663fa5b64991c0409f842df355426
+DIST genpatches-6.10-11.base.tar.xz 553020 BLAKE2B 11a958ebd8848d9023a9cdcb877039ba04f72169ad78e47661890d31b73ae7a9fbdec8d12507a1d16eed08ba59f4a6fdc38ed8b6b02d05cb44198dbfcfef31e8 SHA512 3a3c1e5cbee053ab4c9c731bafa723ffcdfc8179e62fdc0eb16469a15abb5fec8ef4ff395305fd4502ea9cab70702e071f6cf9d0397cb185a987e8fbc880123f
+DIST genpatches-6.10-11.extras.tar.xz 4060 BLAKE2B 98d5747be50ef0a270a561f379946213cb32596e01aa6da66a3cdd8a57dbea491af4265b052bc9fb1089e74818e249ac85228bc85aeffa34f8bd18396ceaa18e SHA512 e1ba5f037ae58c9ea4434f60817b53282494c8d25a659a0b6d9b75db384f7706b122bde225640e2028cfc36022a6cb0d1b5711685a4a265c75f3592c278a67f6
+DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
+DIST linux-v6.10.8-zen1.patch.zst 167159 BLAKE2B 0fe816d415ee71937bc67d340e7612500ff51820e45e349e6d1bd29086b100a32b405343682b14ac2f7bc1f2572df77a1bf0aea55c58145ac4489c1eec1c8503 SHA512 5a63b91a3527628844a210bcb3dcb13069d3b29e56bd4e89e85b2300db02b4326b1945b20db7438667262e7926cf6dbf73f66788320468c61b4709f5917c557f
diff --git a/sys-kernel/zen-sources/zen-sources-6.9.10.ebuild b/sys-kernel/zen-sources/zen-sources-6.10.8.ebuild
index 747c2300fd40..747c2300fd40 100644
--- a/sys-kernel/zen-sources/zen-sources-6.9.10.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-6.10.8.ebuild
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 369104ad39c9..50140aa1f072 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -18,4 +18,5 @@ DIST binutils-2.42-patches-3.tar.xz 34768 BLAKE2B e4bfaf3b42147408a8a3dcb00f5037
 DIST binutils-2.42-patches-6.tar.xz 50664 BLAKE2B f13b65a761cfba80caf2e4740c6383b40305558365b950fba22aca95a104e799e8bd476082f36fb9288de4f224b09f317792c1444e549c40d15a4b64cdf61989 SHA512 1203eca0a9e622411eac377509de8fd0db3ffcb282ac38ab7a0369b166cc1091197daad85b51b145b34a4832f1a1a4d573c8254e8d67aeb22f35adb1ab3ece1f
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 DIST binutils-2.43-patches-1.tar.xz 11644 BLAKE2B 578ee67c3c5e67f9191a31a5c83ffcc781f757f8aaee3eea14d052db427cdd2bc769977dba16e9a8c653dcc4a94f11c149898683945d5035d0beeac128045b1a SHA512 e6db4eaf4fbea366e607a7e9a56e20851fcc34664532fd6aa1f0818271c3e2687eada3daca482e211a2b3e36be85e7e0b23158caaa0fdf9785d13a9156e8c734
+DIST binutils-2.43-patches-2.tar.xz 35184 BLAKE2B fa35c9f182c7ae0fed28614f47618d1563a58f223fd1805f348b618c1fbf039a444e44d88f46d040b6971e481e0da882e5c4492fd167d17bf39579d87a446434 SHA512 a7e167d3f6a2c08f19af4685d90a6160a1a52f1a87f5660fb6d80ec664033829c0eacad0d77b1306620e50ff89d1f9f63a7c2b064ad9775400f0cb0eba3159a4
 DIST binutils-2.43.tar.xz 28175768 BLAKE2B 28b0a04a28273b76eab2d00e00160be889f155f77f5a9d8759ef8dce505c97e97641bf7ec70b92b731b520570a02b06e04e8215b068fcb1bb2573e9ef24732d9 SHA512 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
diff --git a/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild
new file mode 100644
index 000000000000..602960821856
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=2
+PATCH_DEV=dilfridge
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+
+if [[ ${PV} == 2.43 ]] ; then
+	SLOT="0/${PV%_p?}.1"
+else
+	die "Please cleanup the ebuild to drop the 2.43 fudge!"
+	SLOT="0/${PV%_p?}.0"
+fi
+
+IUSE="64-bit-bfd cet multitarget nls static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/dejagnu )
+"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# 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.
+	export MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	filter-lto
+
+	# Workaround for lld-17 (bug #914640)
+	# Should be able to drop this w/ >=binutils-2.43
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	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 bfd's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Revisit if it's useful, we do have binutils[zstd] though
+		--without-zstd
+
+		# 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)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Provided by dev-debug/gdb instead
+	rm "${ED}"/usr/share/info/sframe-spec.info || die
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/binutils-libs/binutils-libs-9999.ebuild b/sys-libs/binutils-libs/binutils-libs-9999.ebuild
new file mode 100644
index 000000000000..b9e1a9065c3b
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-9999.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+IUSE="64-bit-bfd cet multitarget nls static-libs test"
+
+# Variables that can be set here  (ignored for live ebuilds)
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+MY_PN=binutils
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	SLOT="0/${PV}"
+elif [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SLOT="0/$(ver_cut 1-2)"
+else
+	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+	PATCH_DEV=${PATCH_DEV:-dilfridge}
+	SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+	SLOT="0/${PV}"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+fi
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/dejagnu )
+"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		EGIT_REPO_URI="
+			https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git
+			https://github.com/gentoo/binutils-patches
+		"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patch || die
+
+		if [[ ${PV} != 9999 ]] ; then
+			EGIT_BRANCH=binutils-$(ver_cut 1)_$(ver_cut 2)-branch
+		fi
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P/-hppa64/}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
+
+		# _p patch versions are Gentoo specific tarballs ...
+		local dir=${MY_P}
+		dir=${dir/-hppa64/}
+
+		S=${WORKDIR}/${dir}
+	fi
+
+	cd "${WORKDIR}" || die
+	mkdir -p "${MY_BUILDDIR}" || die
+}
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# 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.
+	export MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	filter-lto
+
+	# Workaround for lld-17 (bug #914640)
+	# Should be able to drop this w/ >=binutils-2.43
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	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 bfd's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,gdbserver,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Revisit if it's useful, we do have binutils[zstd] though
+		--without-zstd
+
+		# 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)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index fd819f1d94f2..07e91655f9d1 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,4 +1,6 @@
-DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
+DIST llvm-gentoo-patchset-15.0.7-r6.tar.xz 25208 BLAKE2B c9fca31a053ee059c3060a94dcf675d472fc1a59b5f927648de58fb4ff20bfc229890f789ed47b3d053bd466b860a0c60a53b4b024a8fe18c776e9a72434d6de SHA512 601cd923711839dca7cb5bfea53ded644777c6340265a797939a53409fd2ca27059a015fd6ca6832e60314699ade27919a9a59dab395cc27f8fdc479a0f3c034
+DIST llvm-gentoo-patchset-16.0.6-r5.tar.xz 19728 BLAKE2B 36b605401893034b2b560d26cfb57512c81eddbc35b25d9c3d1fe051b8825c38cae1b8ed999faf8fef564ca5578402d3979bc56ba0a5514dc62594d893696f41 SHA512 20a36b69dfc2b4796ce33318a28529ebdc213945ee67a983e4218117d2ee2c93be1ecb38b0e8189249c5806a442cba708e0890e1b7bf6376edec4403bcc71425
+DIST llvm-gentoo-patchset-17.0.6-r3.tar.xz 4648 BLAKE2B c709162068e83575f71a2ac2243665f47a3d42cac078daa5762bbd339d8593e8c1c5c58e2e415ba6659fe2f3c3824bd098c9be579103362084079140c0386f76 SHA512 251a33f146fcbdbe51c9e1ad7b08c2cd7d062d0b136c833cda8a5155c86080c506d575e4288cde4ba8530ca7f230c2afa63621878a8df0f23076a93c924e7d65
 DIST llvm-gentoo-patchset-18.1.8-r4.tar.xz 15912 BLAKE2B 7300128244aafe42fcf5863e3aad2beb0c96c3df527e6d35fe571369bad520ba4aa397a329287da17eb33dca902057da5cd5193ec560ea7f5767ba2d00a45818 SHA512 b32633db387d4adb3bb2d067f824ae4e8e8a24a25aaa4888520f6e61a4bb1f8f70ad5f44057fbc0892c6f93c803e360612b0fc02c4ec068470b546a55f246cba
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
@@ -8,7 +10,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
index 0ecd27c9f4f2..6a0ea3a57753 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
@@ -54,7 +54,7 @@ BDEPEND="
 
 LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=${PV/_/-}
+LLVM_PATCHSET=${PV/_/-}-r6
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6.ebuild
index 58a7a57b942a..79408235315b 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_PATCHSET=${PV}-r5
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6.ebuild
index 204f3d0d371a..e22c9d4cf225 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_PATCHSET=${PV}-r3
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8.ebuild
index 2a2ab9a44cd1..4eaa90249445 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
+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+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.0_rc4.ebuild
index d395b7fd5a11..d395b7fd5a11 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.0_rc2.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.0_rc4.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild
index d395b7fd5a11..7934f83743b1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0.9999.ebuild
@@ -18,7 +18,7 @@ IUSE+=" +ctx-profile +libfuzzer +memprof +orc +profile +xray"
 # NB: ubsan, scudo deliberately match two entries
 SANITIZER_FLAGS=(
 	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
+	shadowcallstack gwp-asan nsan rtsan
 )
 IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
 REQUIRED_USE="
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240808.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240808.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240808.ebuild
+++ /dev/null
@@ -1,220 +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
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${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 sys-libs/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/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240815.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240815.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240815.ebuild
+++ /dev/null
@@ -1,220 +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
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${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 sys-libs/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/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240830.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240830.ebuild
new file mode 100644
index 000000000000..7934f83743b1
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240830.ebuild
@@ -0,0 +1,220 @@
+# 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="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${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 sys-libs/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/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240910.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240910.ebuild
new file mode 100644
index 000000000000..7934f83743b1
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-20.0.0_pre20240910.ebuild
@@ -0,0 +1,220 @@
+# 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="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${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 sys-libs/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/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
index 7ee670649a4a..fcbc16ad14a3 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -28,6 +28,8 @@
 		<flag name="scudo">Build Scudo Hardened Allocator.</flag>
 		<flag name="shadowcallstack">Build ShadowCallStack.</flag>
 		<flag name="gwp-asan">Build GWP-ASAN runtime.</flag>
+		<flag name="nsan">Build Numerical Sanitizer runtime.</flag>
+		<flag name="rtsan">Build Realtime Sanitizer runtime.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">llvm/llvm-project</remote-id>
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index d233756ed58c..f283f456e5f9 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,7 +9,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-libs/compiler-rt/compiler-rt-18.1.8.ebuild b/sys-libs/compiler-rt/compiler-rt-18.1.8.ebuild
index 9d2f46c9a2ee..b3b0f5e6d306 100644
--- a/sys-libs/compiler-rt/compiler-rt-18.1.8.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-18.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-19.1.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-19.1.0_rc4.ebuild
index ca99f4442636..ca99f4442636 100644
--- a/sys-libs/compiler-rt/compiler-rt-19.1.0_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-19.1.0_rc4.ebuild
diff --git a/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240808.ebuild b/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240830.ebuild
index ca99f4442636..ca99f4442636 100644
--- a/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240808.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240830.ebuild
diff --git a/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240815.ebuild b/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240910.ebuild
index ca99f4442636..ca99f4442636 100644
--- a/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240815.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-20.0.0_pre20240910.ebuild
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index f7c1656f60c2..662ad6ae1817 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1 +1,2 @@
+DIST cracklib-2.10.2.tar.xz 465152 BLAKE2B 87ea88085fee30cbd6e59485f157b7c6213e21619ff8af20ed33c118fd4be78cc9fc5b8ac5d583391df7a3bd527671044410d0e5cfe1cf864c0608cd24a8ca0b SHA512 b58f513bb3094821a69e45c092483d7445ecd1ea2d4d70b6cc422c58e478146f4656fc1ddc0b276f1da31a858d2baea4cca233c9232e2acd05085d55873f3273
 DIST cracklib-2.9.11.tar.xz 461116 BLAKE2B 46b499e465c1c268b772781a9c8ce573a5167ae2e0ac919b403acdb9a14c35140dfb53909eef6e41600e26c2f87d905b3d6d05380c66f053d091765b58a264f4 SHA512 c32e509f757344a1f0b7032ad3b6dc47a8759852a94e511c92073d85bce55f45d48c389d9eb34c993e1d61ad5c1542150672f3e8bc147148ebbb04d3319a2409
diff --git a/sys-libs/cracklib/cracklib-2.10.2.ebuild b/sys-libs/cracklib/cracklib-2.10.2.ebuild
new file mode 100644
index 000000000000..77c7bdf3fed1
--- /dev/null
+++ b/sys-libs/cracklib/cracklib-2.10.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: ideally bump with sys-apps/cracklib-words
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 libtool multilib-minimal usr-ldscript
+
+MY_P=${P/_}
+DESCRIPTION="Password Checking Library"
+HOMEPAGE="https://github.com/cracklib/cracklib/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( virtual/libintl )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	python? ( ${DISTUTILS_DEPS} )
+"
+
+distutils_enable_tests unittest
+
+pkg_setup() {
+	# Workaround bug #195017
+	if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
+		eerror "Upgrade path is broken with FEATURES=unmerge-orphans"
+		eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+		die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug #269003
+	elibtoolize
+
+	if use python ; then
+		distutils-r1_src_prepare
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# use /usr/lib so that the dictionary is shared between ABIs
+		--with-default-dict="/usr/lib/cracklib_dict"
+		--without-python
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	export ac_cv_header_zlib_h=$(usex zlib)
+	export ac_cv_search_gzopen=$(usex zlib -lz no)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local -x CFLAGS="${CFLAGS} -DLOCALEDIR='\"${EPREFIX}/usr/share/locale\"' -DDEFAULT_CRACKLIB_DICT=\'${EPREFIX}/usr/lib/cracklib_dict\'"
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_test() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	cd "${S}"/python || die
+
+	# Make sure we load the freshly built library
+	local -x LD_LIBRARY_PATH="${BUILD_DIR/-${EPYTHON/./_}}/lib/.libs:${BUILD_DIR}/lib:${LD_LIBRARY_PATH}"
+
+	eunittest
+}
+
+multilib_src_install() {
+	default
+
+	# Move shared libs to /
+	gen_usr_ldscript -a crack
+
+	if multilib_is_native_abi && use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+	rm -r "${ED}"/usr/share/cracklib || die
+
+	insinto /usr/share/dict
+	doins dicts/cracklib-small
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		ebegin "Regenerating cracklib dictionary"
+		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
+		eend $?
+	fi
+}
diff --git a/sys-libs/efivar/efivar-39-r1.ebuild b/sys-libs/efivar/efivar-39-r1.ebuild
new file mode 100644
index 000000000000..f980d4096561
--- /dev/null
+++ b/sys-libs/efivar/efivar-39-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2014-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhboot/efivar"
+SRC_URI="https://github.com/rhboot/efivar/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-text/mandoc
+	test? ( sys-boot/grub:2 )
+"
+RDEPEND="
+	dev-libs/popt
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	local PATCHES=(
+		# Rejected upstream, keep this for ia64 support
+		"${FILESDIR}"/efivar-38-ia64-relro.patch
+	)
+	default
+}
+
+src_configure() {
+	unset CROSS_COMPILE
+	export COMPILER=$(tc-getCC)
+	export HOSTCC=$(tc-getBUILD_CC)
+
+	tc-ld-disable-gold
+
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	# https://bugs.gentoo.org/562004
+	unset LIBS
+
+	# Avoid -Werror
+	export ERRORS=
+
+	if [[ -n ${GCC_SPECS} ]]; then
+		# The environment overrides the command line.
+		GCC_SPECS+=":${S}/src/include/gcc.specs"
+	fi
+
+	# Used by tests/Makefile
+	export GRUB_PREFIX=grub
+}
+
+src_compile() {
+	# HOST_MARCH: https://bugs.gentoo.org/831334
+	emake HOST_MARCH=
+}
+
+src_test() {
+	# https://bugs.gentoo.org/924370
+	emake -j1 test
+}
diff --git a/sys-libs/efivar/efivar-39.ebuild b/sys-libs/efivar/efivar-39.ebuild
deleted file mode 100644
index a88ff714f25d..000000000000
--- a/sys-libs/efivar/efivar-39.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2014-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhboot/efivar"
-SRC_URI="https://github.com/rhboot/efivar/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-text/mandoc
-	test? ( sys-boot/grub:2 )
-"
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	local PATCHES=(
-		# Rejected upstream, keep this for ia64 support
-		"${FILESDIR}"/efivar-38-ia64-relro.patch
-	)
-	default
-}
-
-src_configure() {
-	unset CROSS_COMPILE
-	export COMPILER=$(tc-getCC)
-	export HOSTCC=$(tc-getBUILD_CC)
-
-	tc-ld-disable-gold
-
-	export libdir="/usr/$(get_libdir)"
-
-	# https://bugs.gentoo.org/562004
-	unset LIBS
-
-	# Avoid -Werror
-	export ERRORS=
-
-	if [[ -n ${GCC_SPECS} ]]; then
-		# The environment overrides the command line.
-		GCC_SPECS+=":${S}/src/include/gcc.specs"
-	fi
-
-	# Used by tests/Makefile
-	export GRUB_PREFIX=grub
-}
-
-src_compile() {
-	# HOST_MARCH: https://bugs.gentoo.org/831334
-	emake HOST_MARCH=
-}
-
-src_test() {
-	# https://bugs.gentoo.org/924370
-	emake -j1 test
-}
diff --git a/sys-libs/gdbm/gdbm-1.24.ebuild b/sys-libs/gdbm/gdbm-1.24.ebuild
index 5c738509d6d9..17e7ce833fbf 100644
--- a/sys-libs/gdbm/gdbm-1.24.ebuild
+++ b/sys-libs/gdbm/gdbm-1.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+berkdb nls +readline static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 56575cf02b5e..99a53a13705b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -26,6 +26,8 @@ DIST glibc-2.39-patches-7.tar.xz 104640 BLAKE2B 9dba666c20aa4f4dde29fcc7173e53f0
 DIST glibc-2.39-patches-9.tar.xz 110948 BLAKE2B b958561bbc0fefa5982f0aa16dd02cc9cbd015d30d203c02d9ee72605aa51c3e25fac39759487c0deb382a793e3e0274e5585c5a4bd0036bcfaa30fc7dad9021 SHA512 d954a846c4308d4e16d3e878f1ed9ec62f3d78328043289a38cb15148ccf6b431e4a0f185e138300c141ba7e63247922f916ecbab2c8eeaa99d31c54b1ebd0fb
 DIST glibc-2.39.tar.xz 18520988 BLAKE2B 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb SHA512 818f58172a52815b4338ea9f2a69ecaa3335492b9f8f64cbf8afb24c0d737982341968ecd79631cae3d3074ab0ae4bc6056fc4ba3ffe790849dc374835cd57e2
 DIST glibc-2.40-patches-1.tar.xz 17316 BLAKE2B 7c44b9a6f1b34aa5240a1d68721acf399e488c2e9f6e838d16344f4e87737e516c975547fa23baba386263ccfdd26832df2e78040c95d0faa53b32e2343c9831 SHA512 5b922cb4a9150fc2380be834e2c6cf62340c23476e9e1ec6a7954e1f01686e8b6d65108a9a07a96d580b863376e0dfc829b6b4d3ac2a6f99de2fb87a51125d78
+DIST glibc-2.40-patches-2.tar.xz 48712 BLAKE2B ba98d7091e688b6469d2bbb7e1f077321b0976524b44ffaff28eb121ae5d57c829f9dfe2378d07c3c6f68adec33fc5782c093406aaa44f5f35ea76db472fb78e SHA512 49fc4adbf6513b72381535f1fc541c39bc8fe369e583a3df610aab471251aff0189f7fcd66611ef6fa51146ef70c02704b70ca1d8c24db579817eedcb3797ec6
+DIST glibc-2.40-patches-3.tar.xz 56044 BLAKE2B 79659397d36fb847cff01589489a90e36286dfe34c0e765fa05259518d8182d7e0f9666a577d699ef0c713071969bb0ec6358c1fbe053ba6cdc8828d08fdaa0b SHA512 5170a2912c7c5f5aa4513abc25402f419a5de56c477597e937b7920f0c652bca1704b4a4f74d12b960ee3bf4eb8985a98712c4dff485609047084caffffb0c95
 DIST glibc-2.40.tar.xz 18752204 BLAKE2B 8593cab5b2549b77159b6866fbb40b917e491fd5bc0814f7f85b6529166d78d4583436450c479b86cdfe468304fc4d2a9ba8294230a55dbc4c15e89c3ab6c000 SHA512 33caf91dbfddde6480b7cdf7a68b36aff8c522bfee56160af26af297f1b768668edb08bc4e1a7ff61c64721e3c1d49c347a5dd01c5edd3b914ee6479c8b27885
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc
diff --git a/sys-libs/glibc/files/glibc-2.40-libio-legacy.patch b/sys-libs/glibc/files/glibc-2.40-libio-legacy.patch
new file mode 100644
index 000000000000..e0b3b6c35455
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.40-libio-legacy.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/939446
+https://sourceware.org/PR32164
+https://sourceware.org/git/?p=glibc.git;a=commit;h=7073164add3b874cf0c19ca0fb84236f6bb0985d
+
+From 7073164add3b874cf0c19ca0fb84236f6bb0985d Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date: Tue, 3 Sep 2024 14:58:33 -0400
+Subject: [PATCH] libio: Attempt wide backup free only for non-legacy code
+
+_wide_data and _mode are not available in legacy code, so do not attempt
+to free the wide backup buffer in legacy code.
+
+Resolves: BZ #32137 and BZ #27821
+
+Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Reviewed-by: Florian Weimer <fweimer@redhat.com>
+(cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce)
+--- a/libio/genops.c
++++ b/libio/genops.c
+@@ -819,7 +819,7 @@ _IO_unbuffer_all (void)
+       /* Free up the backup area if it was ever allocated.  */
+       if (_IO_have_backup (fp))
+ 	_IO_free_backup_area (fp);
+-      if (fp->_mode > 0 && _IO_have_wbackup (fp))
++      if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp))
+ 	_IO_free_wbackup_area (fp);
+ 
+       if (! (fp->_flags & _IO_UNBUFFERED)
+-- 
+2.43.5
diff --git a/sys-libs/glibc/glibc-2.19-r3.ebuild b/sys-libs/glibc/glibc-2.19-r3.ebuild
index 06c7071e8efb..c0f528d06063 100644
--- a/sys-libs/glibc/glibc-2.19-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 TMPFILES_OPTIONAL=1
 
@@ -10,6 +10,7 @@ inherit prefix toolchain-funcs flag-o-matic gnuconfig \
 
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
+
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
 SLOT="2.2"
 
@@ -464,7 +465,7 @@ check_devpts() {
 	[[ ${MERGE_TYPE} == "buildonly" ]] && return
 
 	# Only sanity check when installing the native glibc.
-	[[ ${ROOT} != "/" ]] && return
+	[[ -n ${ROOT} ]] && return
 
 	# If they're opting in to the old suid code, then no need to check.
 	use suid && return
@@ -552,7 +553,7 @@ sanity_prechecks() {
 
 	# Prevent native builds from downgrading
 	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ ${ROOT} == "/" ]] && \
+	   [[ -z ${ROOT} ]] && \
 	   [[ ${CBUILD} == ${CHOST} ]] && \
 	   [[ ${CHOST} == ${CTARGET} ]] ; then
 
@@ -625,8 +626,8 @@ sanity_prechecks() {
 				STAT=0
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			if [[ $STAT -ne 0 ]]; then
+			eend ${STAT}
+			if [[ ${STAT} -ne 0 ]]; then
 				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
 				eerror "Seek support otherwise."
 				die "Unable to execute 32-bit binaries"
@@ -740,8 +741,10 @@ src_prepare() {
 }
 
 glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	# CXX isnt handled by the multilib system, so if we dont unset here
 	# we accumulate crap across abis
@@ -1030,10 +1033,10 @@ src_test() {
 run_locale_gen() {
 	# if the host locales.gen contains no entries, we'll install everything
 	local root="$1"
-	local locale_list="${root}/etc/locale.gen"
+	local locale_list="${root%/}/etc/locale.gen"
 	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
 		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root}/usr/share/i18n/SUPPORTED"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
 	fi
 
 	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
@@ -1044,7 +1047,7 @@ glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
 
-	emake install_root="${D}$(alt_prefix)" install
+	emake install_root="${D}/$(alt_prefix)" install
 
 	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
 	# which come without headers etc. Only needed for binary packages since the
@@ -1061,9 +1064,9 @@ glibc_do_src_install() {
 		# Move versioned .a file out of libdir to evade portage QA checks
 		# instead of using gen_usr_ldscript(). We fix ldscript as:
 		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
 		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
 	fi
 
 	# We'll take care of the cache ourselves
@@ -1218,7 +1221,7 @@ glibc_do_src_install() {
 glibc_headers_install() {
 	local builddir=$(builddir "headers")
 	cd "${builddir}"
-	emake install_root="${D}$(alt_prefix)" install-headers
+	emake install_root="${D}/$(alt_prefix)" install-headers
 
 	insinto $(alt_headers)/gnu
 	doins "${S}"/include/gnu/stubs.h
@@ -1289,7 +1292,7 @@ pkg_preinst() {
 		einfo "Defaulting /etc/host.conf:multi to on"
 	fi
 
-	[[ ${ROOT} != "/" ]] && return 0
+	[[ -n ${ROOT} ]] && return 0
 	[[ -d ${ED}/$(get_libdir) ]] || return 0
 	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
 }
@@ -1300,11 +1303,11 @@ pkg_postinst() {
 
 	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
 		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
 	fi
 
-	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		use compile-locales || run_locale_gen "${EROOT}"
+	if ! is_crosscompile && [[ -n ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
 	fi
 
 	# Check for sanity of /etc/nsswitch.conf, take 2
diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild
index e531ada0b011..872ca6607a3e 100644
--- a/sys-libs/glibc/glibc-2.31-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r7.ebuild
@@ -789,8 +789,10 @@ src_prepare() {
 }
 
 glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	# CXX isnt handled by the multilib system, so if we dont unset here
 	# we accumulate crap across abis
diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild
index 65aa84f364aa..c212d3cdad29 100644
--- a/sys-libs/glibc/glibc-2.32-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r8.ebuild
@@ -813,8 +813,10 @@ src_prepare() {
 }
 
 glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	# CXX isnt handled by the multilib system, so if we dont unset here
 	# we accumulate crap across abis
diff --git a/sys-libs/glibc/glibc-2.33-r14.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild
index 9119534902f5..9747f319bb27 100644
--- a/sys-libs/glibc/glibc-2.33-r14.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r14.ebuild
@@ -492,8 +492,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.34-r14.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild
index 1affa01b9a4d..08086a0295b4 100644
--- a/sys-libs/glibc/glibc-2.34-r14.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r14.ebuild
@@ -499,8 +499,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild
index 0c63dac54d10..1cabb7910e7b 100644
--- a/sys-libs/glibc/glibc-2.35-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r11.ebuild
@@ -512,8 +512,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.36-r8.ebuild b/sys-libs/glibc/glibc-2.36-r8.ebuild
index b8bf8d174f36..1267125bf98f 100644
--- a/sys-libs/glibc/glibc-2.36-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r8.ebuild
@@ -543,8 +543,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.37-r10.ebuild b/sys-libs/glibc/glibc-2.37-r10.ebuild
index 84368cf8f50f..0cd04e2c8648 100644
--- a/sys-libs/glibc/glibc-2.37-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r10.ebuild
@@ -559,8 +559,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.38-r13.ebuild b/sys-libs/glibc/glibc-2.38-r13.ebuild
index 3ff40e502358..4e9a53c699bf 100644
--- a/sys-libs/glibc/glibc-2.38-r13.ebuild
+++ b/sys-libs/glibc/glibc-2.38-r13.ebuild
@@ -564,8 +564,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.39-r6.ebuild b/sys-libs/glibc/glibc-2.39-r6.ebuild
index e7ae15692d7a..b090b47f8075 100644
--- a/sys-libs/glibc/glibc-2.39-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r6.ebuild
@@ -589,8 +589,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.39-r7.ebuild b/sys-libs/glibc/glibc-2.39-r7.ebuild
index 3e175b82b580..822a623dbddd 100644
--- a/sys-libs/glibc/glibc-2.39-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r7.ebuild
@@ -589,8 +589,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.39-r9.ebuild b/sys-libs/glibc/glibc-2.39-r9.ebuild
index b73cd8b325eb..746401d90985 100644
--- a/sys-libs/glibc/glibc-2.39-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r9.ebuild
@@ -585,8 +585,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-2.40-r2.ebuild b/sys-libs/glibc/glibc-2.40-r2.ebuild
new file mode 100644
index 000000000000..e0f6fc6aebc8
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.40-r2.ebuild
@@ -0,0 +1,1747 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
+# Please read & adapt the page as necessary if obsolete.
+
+PYTHON_COMPAT=( python3_{10..12} )
+TMPFILES_OPTIONAL=1
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=2
+PATCH_DEV=dilfridge
+
+# gcc mulitilib bootstrap files version
+GCC_BOOTSTRAP_VER=20201208
+
+# systemd integration version
+GLIBC_SYSTEMD_VER=20210729
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
+# Minimum systemd version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_SYSTEMD_VER="254.9-r1"
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# - similarly, valgrind requires knowledge about symbols in ld.so:
+#	bug #920753
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+IDEPEND="
+	!compile-locales? ( sys-apps/locale-gen )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	sys-devel/bison
+	compile-locales? ( sys-apps/locale-gen )
+	doc? (
+		dev-lang/perl
+		sys-apps/texinfo
+	)
+	test? (
+		dev-lang/perl
+		>=net-dns/libidn2-2.3.0
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-debug/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	!<sys-apps/systemd-${MIN_SYSTEMD_VER}
+	perl? ( dev-lang/perl )
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6.2
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6.2
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# The following tests fail only inside portage
+	# https://bugs.gentoo.org/831267
+	tst-system
+	tst-strerror
+	tst-strsignal
+
+	# Fails with certain PORTAGE_NICENESS/PORTAGE_SCHEDULING_POLICY
+	tst-sched1
+
+	# Fails regularly, unreliable
+	tst-valgrind-smoke
+
+	# https://sourceware.org/bugzilla/show_bug.cgi?id=31877 (bug #927973)
+	tst-shstk-legacy-1g
+)
+
+XFAIL_NSPAWN_TEST_LIST=(
+	# These tests need to be adapted to handle EPERM/ENOSYS(?) properly
+	# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
+	# https://sourceware.org/PR30603
+	test-errno-linux
+	tst-bz21269
+	tst-mlock2
+	tst-ntp_gettime
+	tst-ntp_gettime-time64
+	tst-ntp_gettimex
+	tst-ntp_gettimex-time64
+	tst-pkey
+	tst-process_mrelease
+	tst-adjtime
+	tst-adjtime-time64
+	tst-clock2
+	tst-clock2-time64
+
+	# These fail if --suppress-sync and/or low priority is set
+	tst-sync_file_range
+	test-errno
+)
+
+#
+# Small helper functions
+#
+
+dump_build_environment() {
+	einfo ==== glibc build environment ========================================================
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD \
+		{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY \
+		STRINGS OBJDUMP READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	einfo =====================================================================================
+}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' \
+					| $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \
+					| grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# We assume CC is already set up.
+	nonfatal emake glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+			# For compatibility with older binaries at slight performance cost.
+			use stack-realign && export CFLAGS+=" -mstackrealign"
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			if [[ ${ABI} == x86 ]]; then
+				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+					local t=${CTARGET_OPT:-${CTARGET}}
+					t=${t%%-*}
+					# Normally the target is x86_64-xxx, so turn that into the -march that
+					# gcc actually accepts. #528708
+					[[ ${t} == "x86_64" ]] && t="x86-64"
+					filter-flags '-march=*'
+					# ugly, ugly, ugly.  ugly.
+					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+				fi
+				# For compatibility with older binaries at slight performance cost.
+				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+
+		# Allow -O2 and -O3, but nothing else for now.
+		# TODO: Test -Os, -Oz.
+		if ! is-flagq '-O@(2|3)' ; then
+			# Lock glibc at -O2. We want to be conservative here.
+			filter-flags '-O?'
+			append-flags -O2
+		fi
+	fi
+
+	strip-unsupported-flags
+	filter-lto
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# Flag added for cross-prefix, but causes ldconfig to segfault. Not needed
+	# anyway because glibc already handles this by itself.
+	filter-ldflags '-Wl,--dynamic-linker=*'
+
+	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
+	# we have to do that here already so mips can filter it out again :P
+	if use hash-sysv-compat ; then
+		append-ldflags '-Wl,--hash-style=both'
+	fi
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	# #898098
+	filter-flags -fno-builtin
+
+	# #798774
+	filter-flags -fno-semantic-interposition
+
+	# #829583
+	filter-lfs-flags
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	# https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F
+	replace-flags -O0 -O1
+
+	# glibc handles this internally already where it's appropriate;
+	# can't always have SSP when we're the ones setting it up, etc
+	filter-flags '-fstack-protector*'
+
+	# Similar issues as with SSP. Can't inject yourself that early.
+	filter-flags '-fsanitize=*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if ! use cet; then
+		case ${ABI}-${CTARGET} in
+			amd64-x86_64-*|x32-x86_64-*-*-gnux32)
+				append-flags '-fcf-protection=none'
+				;;
+			arm64-aarch64*)
+				append-flags '-mbranch-protection=none'
+				;;
+		esac
+	fi
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	# Reset CC and CXX to the value at start of emerge
+	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
+	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
+	export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}}
+
+	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
+	export glibc__ORIG_CC=${CC}
+	export glibc__ORIG_CXX=${CXX}
+	export glibc__ORIG_CPP=${CPP}
+
+	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
+		export glibc__force_gcc=yes
+		# once this is toggled on, it needs to stay on, since with CPP manipulated
+		# tc-is-clang does not work correctly anymore...
+	fi
+
+	if [[ ${glibc__force_gcc} == "yes" ]] ; then
+		# If we are running in an otherwise clang/llvm environment, we need to
+		# recover the proper gcc and binutils settings here, at least until glibc
+		# is finally building with clang. So let's override everything that is
+		# set in the clang profiles.
+		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
+		# a good start into that direction.
+		# Also, if you're crosscompiling, let's assume you know what you are doing.
+		# Hopefully.
+		# 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_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 LD="${current_binutils_path}/ld.bfd"
+		export AR="${current_binutils_path}/ar"
+		export AS="${current_binutils_path}/as"
+		export NM="${current_binutils_path}/nm"
+		export STRIP="${current_binutils_path}/strip"
+		export RANLIB="${current_binutils_path}/ranlib"
+		export OBJCOPY="${current_binutils_path}/objcopy"
+		export STRINGS="${current_binutils_path}/strings"
+		export OBJDUMP="${current_binutils_path}/objdump"
+		export READELF="${current_binutils_path}/readelf"
+		export ADDR2LINE="${current_binutils_path}/addr2line"
+
+		# do we need to also do flags munging here? yes! at least...
+		filter-flags '-fuse-ld=*'
+		filter-flags '-D_FORTIFY_SOURCE=*'
+
+	else
+
+		# this is the "normal" case
+
+		export CC="$(tc-getCC ${CTARGET})"
+		export CXX="$(tc-getCXX ${CTARGET})"
+		export CPP="$(tc-getCPP ${CTARGET})"
+
+		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+		export NM="$(tc-getNM ${CTARGET})"
+		export READELF="$(tc-getREADELF ${CTARGET})"
+
+	fi
+
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other. (Why does the comment talk about CFLAGS if the code
+	# acts on CC?)
+	export glibc__GLIBC_CC=${CC}
+	export glibc__GLIBC_CXX=${CXX}
+	export glibc__GLIBC_CPP=${CPP}
+
+	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
+
+	export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is built for the first time
+		# with ${CTARGET}-g++ not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking if the system can execute 32-bit binaries"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
+			# bug #833620, bug #643302
+			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
+			eerror "This is known to break glibc's build."
+			eerror "Please backup its contents then remove the directory."
+			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
+			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
+			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
+			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
+			# need to run this check at all given we have a dependency on the right headers,
+			# but let's leave it as-is for now.
+			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
+				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+				if ! eend_KV ${build_kv} ${want_kv} ; then
+					echo
+					eerror "You need linux-headers of at least ${want_kv}!"
+					die "linux-headers version too low!"
+				fi
+			fi
+		fi
+	fi
+}
+
+upgrade_warning() {
+	is_crosscompile && return
+
+	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
+		local oldv newv=$(ver_cut 1-2 ${PV})
+		for oldv in ${REPLACING_VERSIONS}; do
+			if ver_test ${oldv} -lt ${newv}; then
+				ewarn "After upgrading glibc, please restart all running processes."
+				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
+				ewarn "Alternatively, reboot your system."
+				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
+				break
+			fi
+		done
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	upgrade_warning
+}
+
+# pkg_setup
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	setup_env
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
+}
+
+# src_prepare
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${PV}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		eapply "${FILESDIR}"/${P}-libio-legacy.patch
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}" || die
+	find . -name configure -exec touch {} +
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}" || die
+}
+
+# src_configure
+
+glibc_do_configure() {
+	dump_build_environment
+
+	local myconf=()
+
+	# Use '=strong' instead of '=all' to protect only functions
+	# worth protecting from stack smashes.
+	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+
+	# Keep a whitelist of targets supporting IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	case ${ABI}-${CTARGET} in
+		amd64-x86_64-*|x32-x86_64-*-*-gnux32) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--disable-werror
+		--enable-bind-now
+		--enable-fortify-source
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if
+		# Perl hasn't been installed inside the prefix yet and configure picks
+		# up a Perl from outside the prefix instead. configure will fail to
+		# execute Perl during configure if we're cross-compiling a prefix, but
+		# it will just disable mtrace in that case.
+		# Note: mtrace is needed by the test suite.
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# On aarch64 there is no way to override -mcpu=native, and if
+		# the current cpu does not support SVE configure fails.
+		# Let's boldly assume our toolchain can always build SVE instructions.
+		libc_cv_aarch64_sve_asm=yes
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'int main(void){}' > "${T}"/test.c || die
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	local myconf=()
+
+	case ${CTARGET} in
+	aarch64*)
+		# The configure checks fail during cross-build, so disable here
+		# for headers-only
+		myconf+=(
+			--disable-mathvec
+		) ;;
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+# src_compile
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+# src_test
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		local virt=$(systemd-detect-virt 2>/dev/null)
+		if [[ ${virt} == systemd-nspawn ]] ; then
+			ewarn "Skipping extra tests because in systemd-nspawn container"
+			XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" )
+		fi
+		if [[ "$(nice)" == "19" ]] ; then
+			# Expects to be able to increase niceness, which it can't do if
+			# already at the highest nice value
+			XFAIL_TEST_LIST+=( "tst-nice" )
+		fi
+
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	# we give the tests a bit more time to avoid spurious
+	# bug reports on slow arches
+
+	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi glibc_src_test || die "tests failed"
+}
+
+# src_install
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root%/}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
+	fi
+
+	# bug 736794: we need to be careful with the parallelization... the number of
+	# processors saved in the environment of a binary package may differ strongly
+	# from the number of processes available during postinst
+	local mygenjobs="$(makeopts_jobs)"
+	if [[ "${EMERGE_FROM}" == "binary" ]] ; then
+		mygenjobs="$(nproc)"
+	fi
+
+	set -- locale-gen ${inplace} --jobs "${mygenjobs}" --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+
+	# gdb thread introspection relies on local libpthreads symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+	# valgrind requires knowledge about ld.so symbols.
+	dostrip -x $(alt_libdir)/ld-*.so*
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" \
+			"${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a \
+			"${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We configure toolchains for standalone prefix systems with a sysroot,
+	# which is prepended to paths in ld scripts, so strip the prefix from these.
+	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
+	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
+	if [[ -n $(host_eprefix) ]] ; then
+		local file
+		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
+			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
+		done
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	#################################################################
+
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+
+	cd "${S}" || die
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		use systemd && systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		${newldso} --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
+		PRESERVED_OLD_LIBCRYPT=1
+		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" \
+			"${T}/libcrypt$(get_libname 1)" || die
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+glibc_refresh_ldconfig() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+
+	# Version check could be added to avoid unnecessary work, but ldconfig
+	# should finish quickly enough to not matter.
+	ebegin "Refreshing ld.so.cache"
+	ldconfig -i
+	if ! eend $?; then
+		ewarn "Failed to refresh the ld.so.cache for you. Some programs may be broken"
+		ewarn "before you manually do so (ldconfig -i)."
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		# glibc-2.38+ on loong has ldconfig support added, but the ELF e_flags
+		# handling has changed as well, which means stale ldconfig auxiliary
+		# cache entries and failure to lookup libgcc_s / libstdc++ (breaking
+		# every C++ application) / libgomp etc., among other breakages.
+		#
+		# To fix this, simply refresh the ld.so.cache without using the
+		# auxiliary cache if we're natively installing on loong. This should
+		# be done relatively soon because we want to minimize the breakage
+		# window for the affected programs.
+		use loong && glibc_refresh_ldconfig
+
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	upgrade_warning
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+
+		elog "Please ignore a possible later error message about a file collision involving"
+		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
+		elog "the upgrade working, but it also needs to be overwritten when"
+		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.40-r3.ebuild b/sys-libs/glibc/glibc-2.40-r3.ebuild
new file mode 100644
index 000000000000..785b7411640f
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.40-r3.ebuild
@@ -0,0 +1,1746 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
+# Please read & adapt the page as necessary if obsolete.
+
+PYTHON_COMPAT=( python3_{10..12} )
+TMPFILES_OPTIONAL=1
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=3
+PATCH_DEV=dilfridge
+
+# gcc mulitilib bootstrap files version
+GCC_BOOTSTRAP_VER=20201208
+
+# systemd integration version
+GLIBC_SYSTEMD_VER=20210729
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
+# Minimum systemd version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_SYSTEMD_VER="254.9-r1"
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# - similarly, valgrind requires knowledge about symbols in ld.so:
+#	bug #920753
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+IDEPEND="
+	!compile-locales? ( sys-apps/locale-gen )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	sys-devel/bison
+	compile-locales? ( sys-apps/locale-gen )
+	doc? (
+		dev-lang/perl
+		sys-apps/texinfo
+	)
+	test? (
+		dev-lang/perl
+		>=net-dns/libidn2-2.3.0
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-debug/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	!<sys-apps/systemd-${MIN_SYSTEMD_VER}
+	perl? ( dev-lang/perl )
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6.2
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6.2
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# The following tests fail only inside portage
+	# https://bugs.gentoo.org/831267
+	tst-system
+	tst-strerror
+	tst-strsignal
+
+	# Fails with certain PORTAGE_NICENESS/PORTAGE_SCHEDULING_POLICY
+	tst-sched1
+
+	# Fails regularly, unreliable
+	tst-valgrind-smoke
+
+	# https://sourceware.org/bugzilla/show_bug.cgi?id=31877 (bug #927973)
+	tst-shstk-legacy-1g
+)
+
+XFAIL_NSPAWN_TEST_LIST=(
+	# These tests need to be adapted to handle EPERM/ENOSYS(?) properly
+	# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
+	# https://sourceware.org/PR30603
+	test-errno-linux
+	tst-bz21269
+	tst-mlock2
+	tst-ntp_gettime
+	tst-ntp_gettime-time64
+	tst-ntp_gettimex
+	tst-ntp_gettimex-time64
+	tst-pkey
+	tst-process_mrelease
+	tst-adjtime
+	tst-adjtime-time64
+	tst-clock2
+	tst-clock2-time64
+
+	# These fail if --suppress-sync and/or low priority is set
+	tst-sync_file_range
+	test-errno
+)
+
+#
+# Small helper functions
+#
+
+dump_build_environment() {
+	einfo ==== glibc build environment ========================================================
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD \
+		{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY \
+		STRINGS OBJDUMP READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	einfo =====================================================================================
+}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' \
+					| $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \
+					| grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# We assume CC is already set up.
+	nonfatal emake glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+			# For compatibility with older binaries at slight performance cost.
+			use stack-realign && export CFLAGS+=" -mstackrealign"
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			if [[ ${ABI} == x86 ]]; then
+				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+					local t=${CTARGET_OPT:-${CTARGET}}
+					t=${t%%-*}
+					# Normally the target is x86_64-xxx, so turn that into the -march that
+					# gcc actually accepts. #528708
+					[[ ${t} == "x86_64" ]] && t="x86-64"
+					filter-flags '-march=*'
+					# ugly, ugly, ugly.  ugly.
+					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+				fi
+				# For compatibility with older binaries at slight performance cost.
+				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+
+		# Allow -O2 and -O3, but nothing else for now.
+		# TODO: Test -Os, -Oz.
+		if ! is-flagq '-O@(2|3)' ; then
+			# Lock glibc at -O2. We want to be conservative here.
+			filter-flags '-O?'
+			append-flags -O2
+		fi
+	fi
+
+	strip-unsupported-flags
+	filter-lto
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# Flag added for cross-prefix, but causes ldconfig to segfault. Not needed
+	# anyway because glibc already handles this by itself.
+	filter-ldflags '-Wl,--dynamic-linker=*'
+
+	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
+	# we have to do that here already so mips can filter it out again :P
+	if use hash-sysv-compat ; then
+		append-ldflags '-Wl,--hash-style=both'
+	fi
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	# #898098
+	filter-flags -fno-builtin
+
+	# #798774
+	filter-flags -fno-semantic-interposition
+
+	# #829583
+	filter-lfs-flags
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	# https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F
+	replace-flags -O0 -O1
+
+	# glibc handles this internally already where it's appropriate;
+	# can't always have SSP when we're the ones setting it up, etc
+	filter-flags '-fstack-protector*'
+
+	# Similar issues as with SSP. Can't inject yourself that early.
+	filter-flags '-fsanitize=*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if ! use cet; then
+		case ${ABI}-${CTARGET} in
+			amd64-x86_64-*|x32-x86_64-*-*-gnux32)
+				append-flags '-fcf-protection=none'
+				;;
+			arm64-aarch64*)
+				append-flags '-mbranch-protection=none'
+				;;
+		esac
+	fi
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	# Reset CC and CXX to the value at start of emerge
+	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
+	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
+	export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}}
+
+	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
+	export glibc__ORIG_CC=${CC}
+	export glibc__ORIG_CXX=${CXX}
+	export glibc__ORIG_CPP=${CPP}
+
+	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
+		export glibc__force_gcc=yes
+		# once this is toggled on, it needs to stay on, since with CPP manipulated
+		# tc-is-clang does not work correctly anymore...
+	fi
+
+	if [[ ${glibc__force_gcc} == "yes" ]] ; then
+		# If we are running in an otherwise clang/llvm environment, we need to
+		# recover the proper gcc and binutils settings here, at least until glibc
+		# is finally building with clang. So let's override everything that is
+		# set in the clang profiles.
+		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
+		# a good start into that direction.
+		# Also, if you're crosscompiling, let's assume you know what you are doing.
+		# Hopefully.
+		# 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_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 LD="${current_binutils_path}/ld.bfd"
+		export AR="${current_binutils_path}/ar"
+		export AS="${current_binutils_path}/as"
+		export NM="${current_binutils_path}/nm"
+		export STRIP="${current_binutils_path}/strip"
+		export RANLIB="${current_binutils_path}/ranlib"
+		export OBJCOPY="${current_binutils_path}/objcopy"
+		export STRINGS="${current_binutils_path}/strings"
+		export OBJDUMP="${current_binutils_path}/objdump"
+		export READELF="${current_binutils_path}/readelf"
+		export ADDR2LINE="${current_binutils_path}/addr2line"
+
+		# do we need to also do flags munging here? yes! at least...
+		filter-flags '-fuse-ld=*'
+		filter-flags '-D_FORTIFY_SOURCE=*'
+
+	else
+
+		# this is the "normal" case
+
+		export CC="$(tc-getCC ${CTARGET})"
+		export CXX="$(tc-getCXX ${CTARGET})"
+		export CPP="$(tc-getCPP ${CTARGET})"
+
+		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+		export NM="$(tc-getNM ${CTARGET})"
+		export READELF="$(tc-getREADELF ${CTARGET})"
+
+	fi
+
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other. (Why does the comment talk about CFLAGS if the code
+	# acts on CC?)
+	export glibc__GLIBC_CC=${CC}
+	export glibc__GLIBC_CXX=${CXX}
+	export glibc__GLIBC_CPP=${CPP}
+
+	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
+
+	export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is built for the first time
+		# with ${CTARGET}-g++ not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking if the system can execute 32-bit binaries"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
+			# bug #833620, bug #643302
+			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
+			eerror "This is known to break glibc's build."
+			eerror "Please backup its contents then remove the directory."
+			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
+			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
+			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
+			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
+			# need to run this check at all given we have a dependency on the right headers,
+			# but let's leave it as-is for now.
+			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
+				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+				if ! eend_KV ${build_kv} ${want_kv} ; then
+					echo
+					eerror "You need linux-headers of at least ${want_kv}!"
+					die "linux-headers version too low!"
+				fi
+			fi
+		fi
+	fi
+}
+
+upgrade_warning() {
+	is_crosscompile && return
+
+	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
+		local oldv newv=$(ver_cut 1-2 ${PV})
+		for oldv in ${REPLACING_VERSIONS}; do
+			if ver_test ${oldv} -lt ${newv}; then
+				ewarn "After upgrading glibc, please restart all running processes."
+				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
+				ewarn "Alternatively, reboot your system."
+				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
+				break
+			fi
+		done
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	upgrade_warning
+}
+
+# pkg_setup
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	setup_env
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
+}
+
+# src_prepare
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${PV}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}" || die
+	find . -name configure -exec touch {} +
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}" || die
+}
+
+# src_configure
+
+glibc_do_configure() {
+	dump_build_environment
+
+	local myconf=()
+
+	# Use '=strong' instead of '=all' to protect only functions
+	# worth protecting from stack smashes.
+	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+
+	# Keep a whitelist of targets supporting IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	case ${ABI}-${CTARGET} in
+		amd64-x86_64-*|x32-x86_64-*-*-gnux32) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--disable-werror
+		--enable-bind-now
+		--enable-fortify-source
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if
+		# Perl hasn't been installed inside the prefix yet and configure picks
+		# up a Perl from outside the prefix instead. configure will fail to
+		# execute Perl during configure if we're cross-compiling a prefix, but
+		# it will just disable mtrace in that case.
+		# Note: mtrace is needed by the test suite.
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# On aarch64 there is no way to override -mcpu=native, and if
+		# the current cpu does not support SVE configure fails.
+		# Let's boldly assume our toolchain can always build SVE instructions.
+		libc_cv_aarch64_sve_asm=yes
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'int main(void){}' > "${T}"/test.c || die
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	local myconf=()
+
+	case ${CTARGET} in
+	aarch64*)
+		# The configure checks fail during cross-build, so disable here
+		# for headers-only
+		myconf+=(
+			--disable-mathvec
+		) ;;
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+# src_compile
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+# src_test
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		local virt=$(systemd-detect-virt 2>/dev/null)
+		if [[ ${virt} == systemd-nspawn ]] ; then
+			ewarn "Skipping extra tests because in systemd-nspawn container"
+			XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" )
+		fi
+		if [[ "$(nice)" == "19" ]] ; then
+			# Expects to be able to increase niceness, which it can't do if
+			# already at the highest nice value
+			XFAIL_TEST_LIST+=( "tst-nice" )
+		fi
+
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	# we give the tests a bit more time to avoid spurious
+	# bug reports on slow arches
+
+	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi glibc_src_test || die "tests failed"
+}
+
+# src_install
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root%/}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
+	fi
+
+	# bug 736794: we need to be careful with the parallelization... the number of
+	# processors saved in the environment of a binary package may differ strongly
+	# from the number of processes available during postinst
+	local mygenjobs="$(makeopts_jobs)"
+	if [[ "${EMERGE_FROM}" == "binary" ]] ; then
+		mygenjobs="$(nproc)"
+	fi
+
+	set -- locale-gen ${inplace} --jobs "${mygenjobs}" --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+
+	# gdb thread introspection relies on local libpthreads symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+	# valgrind requires knowledge about ld.so symbols.
+	dostrip -x $(alt_libdir)/ld-*.so*
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" \
+			"${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a \
+			"${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We configure toolchains for standalone prefix systems with a sysroot,
+	# which is prepended to paths in ld scripts, so strip the prefix from these.
+	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
+	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
+	if [[ -n $(host_eprefix) ]] ; then
+		local file
+		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
+			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
+		done
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	#################################################################
+
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+
+	cd "${S}" || die
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		use systemd && systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		${newldso} --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
+		PRESERVED_OLD_LIBCRYPT=1
+		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" \
+			"${T}/libcrypt$(get_libname 1)" || die
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+glibc_refresh_ldconfig() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+
+	# Version check could be added to avoid unnecessary work, but ldconfig
+	# should finish quickly enough to not matter.
+	ebegin "Refreshing ld.so.cache"
+	ldconfig -i
+	if ! eend $?; then
+		ewarn "Failed to refresh the ld.so.cache for you. Some programs may be broken"
+		ewarn "before you manually do so (ldconfig -i)."
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		# glibc-2.38+ on loong has ldconfig support added, but the ELF e_flags
+		# handling has changed as well, which means stale ldconfig auxiliary
+		# cache entries and failure to lookup libgcc_s / libstdc++ (breaking
+		# every C++ application) / libgomp etc., among other breakages.
+		#
+		# To fix this, simply refresh the ld.so.cache without using the
+		# auxiliary cache if we're natively installing on loong. This should
+		# be done relatively soon because we want to minimize the breakage
+		# window for the affected programs.
+		use loong && glibc_refresh_ldconfig
+
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	upgrade_warning
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+
+		elog "Please ignore a possible later error message about a file collision involving"
+		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
+		elog "the upgrade working, but it also needs to be overwritten when"
+		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.40.ebuild b/sys-libs/glibc/glibc-2.40.ebuild
index 1e2debc4ab65..102da1118a39 100644
--- a/sys-libs/glibc/glibc-2.40.ebuild
+++ b/sys-libs/glibc/glibc-2.40.ebuild
@@ -585,8 +585,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a509c476c930..26a50c00fd1e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -585,8 +585,10 @@ setup_env() {
 		return 0
 	fi
 
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
+	# glibc does not work with non-bfd (for various reasons):
+	# * gold (bug #269274)
+	# * mold (bug #860900)
+	tc-ld-force-bfd
 
 	if use doc ; then
 		export MAKEINFO=makeinfo
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index b5a05d059745..68b4d7704396 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,2 +1,3 @@
 DIST kpmcore-23.08.5.tar.xz 630396 BLAKE2B f5a470c9b54663b9f52467519046646de9ea20b83c8afaf199e3877ecc3f9de47139c9d44e8b23a2d49bfb00ae624b9117cf1adf83092f141a8e46d02adfaf8f SHA512 30ddbe62412df5645e034b745159b7c8db7801340225653d05856032083181d482379415a56d4e6f703c4f6c4a1a79c252a3b549beba227ab70dfc673cc59acd
 DIST kpmcore-24.05.2.tar.xz 638036 BLAKE2B cc75d61d38a12f5fae2b2f20d6594c8609031309484c6b6c871d7eb56cad16abccfe304412e3d7af5a7707a9422f62500726389cacf34a529373c72dc35ad9c4 SHA512 b3da86b2876701276d951de44e29b2e52645650d87efd9be34a98d3e45c606d209326f46c97c1fbc60719de400a5b42b50970fd502ed4acf3db923dab6429d37
+DIST kpmcore-24.08.0.tar.xz 646212 BLAKE2B 5554499f9d08be2f835b2f310259e96d6563150766ae3ad43bc43198c641b75e923d33efc309e2b097a6c61367bb8fbe56c7ee68b3e1a103373ca664aea2a0a6 SHA512 ffd8551889a95ca5125f0effc1eab27b87c2c8d279e322aeccc9573961748af61986f3cd1ae01d99792b430037dd46bc49cf104ef6f0e2df0ab32bff550560b5
diff --git a/sys-libs/kpmcore/kpmcore-24.05.2.ebuild b/sys-libs/kpmcore/kpmcore-24.05.2.ebuild
index 67d3ebc3e321..ff244a505a21 100644
--- a/sys-libs/kpmcore/kpmcore-24.05.2.ebuild
+++ b/sys-libs/kpmcore/kpmcore-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="6/10"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 
 # bug 689468, tests need polkit etc.
 RESTRICT="test"
diff --git a/sys-libs/kpmcore/kpmcore-24.08.0.ebuild b/sys-libs/kpmcore/kpmcore-24.08.0.ebuild
new file mode 100644
index 000000000000..119eebad06bd
--- /dev/null
+++ b/sys-libs/kpmcore/kpmcore-24.08.0.ebuild
@@ -0,0 +1,31 @@
+# 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/libcxx/Manifest b/sys-libs/libcxx/Manifest
index c77b759dbeb5..b7e2286d6b9e 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -8,7 +8,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-libs/libcxx/libcxx-19.1.0_rc2.ebuild b/sys-libs/libcxx/libcxx-19.1.0_rc4.ebuild
index a0d07e1507f4..a0d07e1507f4 100644
--- a/sys-libs/libcxx/libcxx-19.1.0_rc2.ebuild
+++ b/sys-libs/libcxx/libcxx-19.1.0_rc4.ebuild
diff --git a/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
index a0d07e1507f4..43c213cc6426 100644
--- a/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
@@ -144,6 +144,11 @@ multilib_src_compile() {
 
 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
 }
 
diff --git a/sys-libs/libcxx/libcxx-20.0.0_pre20240815.ebuild b/sys-libs/libcxx/libcxx-20.0.0_pre20240815.ebuild
deleted file mode 100644
index a0d07e1507f4..000000000000
--- a/sys-libs/libcxx/libcxx-20.0.0_pre20240815.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
-
-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? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/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/sys-libs/libcxx/libcxx-20.0.0_pre20240808.ebuild b/sys-libs/libcxx/libcxx-20.0.0_pre20240830.ebuild
index a0d07e1507f4..a0d07e1507f4 100644
--- a/sys-libs/libcxx/libcxx-20.0.0_pre20240808.ebuild
+++ b/sys-libs/libcxx/libcxx-20.0.0_pre20240830.ebuild
diff --git a/sys-libs/libcxx/libcxx-20.0.0_pre20240910.ebuild b/sys-libs/libcxx/libcxx-20.0.0_pre20240910.ebuild
new file mode 100644
index 000000000000..43c213cc6426
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-20.0.0_pre20240910.ebuild
@@ -0,0 +1,206 @@
+# 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? (
+		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/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 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/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-libs/libcxxabi/libcxxabi-19.1.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-19.1.0_rc4.ebuild
index 903f8e866cb6..903f8e866cb6 100644
--- a/sys-libs/libcxxabi/libcxxabi-19.1.0_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-19.1.0_rc4.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240808.ebuild b/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240830.ebuild
index 903f8e866cb6..903f8e866cb6 100644
--- a/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240808.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240830.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240815.ebuild b/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240910.ebuild
index 903f8e866cb6..903f8e866cb6 100644
--- a/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240815.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20240910.ebuild
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 4d7c70aac8a4..ca323b8d8d20 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-libs/libomp/libomp-18.1.8.ebuild b/sys-libs/libomp/libomp-18.1.8.ebuild
index a6d7145053db..cebd1dee34be 100644
--- a/sys-libs/libomp/libomp-18.1.8.ebuild
+++ b/sys-libs/libomp/libomp-18.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="
 	debug gdb-plugin hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/sys-libs/libomp/libomp-19.1.0_rc2.ebuild b/sys-libs/libomp/libomp-19.1.0_rc4.ebuild
index 32b91b3699c4..32b91b3699c4 100644
--- a/sys-libs/libomp/libomp-19.1.0_rc2.ebuild
+++ b/sys-libs/libomp/libomp-19.1.0_rc4.ebuild
diff --git a/sys-libs/libomp/libomp-20.0.0_pre20240808.ebuild b/sys-libs/libomp/libomp-20.0.0_pre20240830.ebuild
index 32b91b3699c4..32b91b3699c4 100644
--- a/sys-libs/libomp/libomp-20.0.0_pre20240808.ebuild
+++ b/sys-libs/libomp/libomp-20.0.0_pre20240830.ebuild
diff --git a/sys-libs/libomp/libomp-20.0.0_pre20240815.ebuild b/sys-libs/libomp/libomp-20.0.0_pre20240910.ebuild
index 32b91b3699c4..32b91b3699c4 100644
--- a/sys-libs/libomp/libomp-20.0.0_pre20240815.ebuild
+++ b/sys-libs/libomp/libomp-20.0.0_pre20240910.ebuild
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 97fece9fcff7..bfdb966cb6c6 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -2,3 +2,4 @@ DIST liburing-2.2.tar.bz2 172733 BLAKE2B 19ae8a356e4fdc296bfb3ff121b777bd7c97038
 DIST liburing-2.3.tar.bz2 197929 BLAKE2B 94ae2a79522fbac13c071ad752f5cbfae3e3b3dd6b35da24e5c756ba47a7b304e5bcb18391ca23fc2edafeb2dbcdcf143fd2cda71656396ac34248159a964fb7 SHA512 341aa13d3b560617f3710291945ec2fe35d828e0b67ee3a97555fd4eb3d2042a7f9e722080d8ebb45aa74a2ca4ef58db1e8a10c351e951a604da007ba69d2738
 DIST liburing-2.5.tar.bz2 217397 BLAKE2B cb5d0a61bc8ce5a92a1b581c5411938146a84c365598454ac8bac7ba0d7429e20a5a608cb725619cbf8b77570b2d638fc347fd9ee9cb1456361957a2a4d6e6d6 SHA512 cba62acde52c07185ade0ac0fee6bf3845f5677d061b52d179c6341a62f8581d4f8920fc09d27a3723bc3832bc84dd5475d173427ee5d8a063d079b07af96416
 DIST liburing-2.6.tar.bz2 244371 BLAKE2B f0e05a5a82592ed45c7c7f12b437d17655989102961c3d349d18d993f21cf0f1a6eb2aa7ad863a579428a1546c307924bf368e10af96045fd40a02fd5bd5843e SHA512 bf07cc0e67498ba64d888d1a113f7c8bea3feaed6f05ce69c99a1dec9506e553a1695ab4e1ecfa86f0ba1af699769557291d5c6b125b9bf59a1452f69eac0613
+DIST liburing-2.7.tar.bz2 252289 BLAKE2B dc04745d2eda04d7009a532fc77566804c34b77dcef512f17ef424e22bc1e1a31ba87c2a841bb5574b11c494641a3128005d6dfccf2b87d6c3888fe5cd887996 SHA512 ec6cf69cae2e7e448e9e338bcd616bf27522f6f0e4768bf80d246d6df8610df3accaddae1c135c31bca7814bc3b8214854c40b3f7137163c0950605c716793f1
diff --git a/sys-libs/liburing/liburing-2.7-r1.ebuild b/sys-libs/liburing/liburing-2.7-r1.ebuild
new file mode 100644
index 000000000000..14695dfc2536
--- /dev/null
+++ b/sys-libs/liburing/liburing-2.7-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Efficient I/O with io_uring"
+HOMEPAGE="https://github.com/axboe/liburing"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
+else
+	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	QA_PKGCONFIG_VERSION=${PV}
+fi
+LICENSE="MIT"
+SLOT="0/2" # liburing.so major version
+
+IUSE="examples static-libs test"
+# fsync test hangs forever
+RESTRICT="!test? ( test )"
+
+# At least installed headers need <linux/*>, bug #802516
+DEPEND=">=sys-kernel/linux-headers-5.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use examples; then
+		sed -e '/examples/d' Makefile -i || die
+	fi
+	if ! use test; then
+		sed -e '/test/d' Makefile -i || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--use-libc
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}" || die
+}
+
+multilib_src_compile() {
+	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
+
+multilib_src_test() {
+	local disabled_tests=(
+		accept.c
+		fpos.c
+		io_uring_register.c
+		link-timeout.c
+		read-before-exit.c
+		recv-msgall-stream.c
+	)
+	local disabled_test
+	for disabled_test in "${disabled_tests[@]}"; do
+		sed -i "/\s*${disabled_test}/d" test/Makefile \
+			|| die "Failed to remove ${disabled_test}"
+	done
+
+	emake -C test V=1 runtests
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 199e0e69f022..f76a426aa2cc 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -6,7 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-19.1.0-rc2.src.tar.xz 141264388 BLAKE2B 690b4912d9e4a8019b7990934dd6486362337ccb303dca119c0e75aa1063ad452222be1ee965e43b160dfcea20e491a20c289344152666b618712a1d76dc4780 SHA512 508a401e8433b1ac9a399246eb1a3c18faed7c3d41d8c118e77cefbb64cc6d6e171bd41a3e5584f6c84df141ba6819f1a1cce75b5c1ef33e3d2ac239e662d07c
-DIST llvm-project-19.1.0-rc2.src.tar.xz.sig 438 BLAKE2B 1eaf10a1419ecf009c033a8f6ecb6eec86107d81621d5b4665c8d929b05f4845ce0c432017343d7b06f33e6ff6384df9e1d8fc7b9c6efe7f10ef69798891b7e5 SHA512 b46e9a1d40f891c5f3544d8cc6295900bff5dda9a4a526b8db55a42a37ae90deb216b316d2117984e82f4e918d15343e75b3b9e6d6c773866707c3398e032826
-DIST llvm-project-db8ef6188cbbe2125e6d60bdef77a535105772df.tar.gz 218416682 BLAKE2B 691e3881e4a60c008c6b766b51ecc856122de1f40242ff1d91ebaa12682fea0a22f84783eb930c42d196f50ba0d3b2010f9010ed73ee7e292fe78c93d6e3f324 SHA512 2dc16a603b60607cc3daee2de0126a567a78c4fff72b2fbcb94c82472bc5ec64ac354ba8592b9a643248a5bfd43b34e2a60f2751a0c9e9e28b7f895fc50a5e9d
-DIST llvm-project-fd7d7882e7fa5a38d4bfde426120d4663718beb4.tar.gz 218217769 BLAKE2B a6c2aa012c342e31527b7e9f85e8fea3549d52530d8f87cd699e094a0aa768d099f9fd2631161ff7f53b4a5011937ed6d1f52b8fa1d23aa34183be1f487d4277 SHA512 c4863fab1a3c03f7f9c42f3501d3a75cebb491343515d77d30b26e5cbd720fc3fd628052099d87ed638e8c424bcbe7a1d066ed857f73da6f243d3d5a76b0e6c5
+DIST llvm-project-19.1.0-rc4.src.tar.xz 141255904 BLAKE2B c693dc94aeb4b59ad4a05a426037075449535c398cbc1ae9b4371d42ea0962b267a3be8af93f4fe47b21c11964fbea6e8eb662225e6f79b20bbc35e706588435 SHA512 826978a596b26040124f2ceba858f91031f78faca22f32de2eea1a4d299a849dcb1fffdfb01601adc39d733dd0cdee43b21af05159d45dcebc842f6b6b540ba8
+DIST llvm-project-19.1.0-rc4.src.tar.xz.sig 438 BLAKE2B aef02737285d2faa1b21cec1a32fff6e776ac4bb5c4fd6f26d3d1a9b9244ed1fc0a1eb786a444a6549dda8683485f67964b4d4e48393e1780e7938ee0d94348a SHA512 5b9dcbf232229fdd87824bc87d0ad4ebd54127c9288708fb3304166422d378b77a843d7c5d8258850a0de59310c24e65042d636a5314e2af8513627a43bdb6e8
+DIST llvm-project-5500e21942f7047344b6fee62d3e08c0ba2f9182.tar.gz 219148250 BLAKE2B 61880a13086c46ac9a9f8326b1e007146afb1662a0a223703fe36a91da230d5708b368f1177e76ac13c1e5a30f620c4ce6346484a0a67a0f011a816bba4d13f9 SHA512 a6d4fcae960b450be2abd2da485cea638b73290b17ceeabf560651d614f55925f86ee6f76a116262d8a1ff70ba699468cb4cf4c32015e26540ba6e47c58db1b7
+DIST llvm-project-bece0d7517bd0a036dc8a319514e4a8a5c497dee.tar.gz 218241938 BLAKE2B 7ac08a21ab2899823683dc700bd2f6226e22653f5be553fe0278868f9fa0d8946fabe6aae40f68cfd14e019b1a3795affb64bf41ebcc949394b73a90e7cd019c SHA512 8893512dcbc1171d2c91aeb0aa9e5fd424474c4d6b5215fb1a078dc8757ab2d404b55ed90709e09368e0794c8306f489be8339d5c502dd6c2ef1852e24636e85
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.1.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.1.0_rc4.ebuild
index e4c76c15ebc8..e4c76c15ebc8 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.1.0_rc2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-19.1.0_rc4.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240808.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240830.ebuild
index e4c76c15ebc8..e4c76c15ebc8 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240808.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240830.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240815.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240910.ebuild
index e4c76c15ebc8..e4c76c15ebc8 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240815.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20240910.ebuild
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.7.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.7.ebuild
index 9c6d126e623e..c3047ac9cc78 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.7.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="compat lzma openssl test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/readline/readline-8.2_p10.ebuild b/sys-libs/readline/readline-8.2_p10.ebuild
index 348c7a0b9f1a..32ee5b8f5d86 100644
--- a/sys-libs/readline/readline-8.2_p10.ebuild
+++ b/sys-libs/readline/readline-8.2_p10.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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/snapd-glib/snapd-glib-1.65-r102.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild
index 4a9410b58007..5e20f675c914 100644
--- a/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild
+++ b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/snapcore/snapd-glib/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="doc introspection qml qt6 vala"
 REQUIRED_USE="
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 9ab247d9259a..300b88a16c5b 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -2,3 +2,4 @@ DIST tzcode2023d.tar.gz 298795 BLAKE2B 3e759de2e1dfe033bb98b5af5239631ef5dc33e25
 DIST tzcode2024a.tar.gz 301595 BLAKE2B f3b8d1e7735ad858d071df564a8e11ac4d252b97a5729fa6c282112ff3903f7d35897735920b4466a926ef647dc283356879134046805411c694efd3fd89b282 SHA512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c
 DIST tzdata2023d.tar.gz 449767 BLAKE2B b79be37a8a258745d162a575c795ee6476b4fa5f6d2f7b562d9431a238eca276a1747a983778291184fc6e40a0c1f5e6284d41290fd6d1d3bd3118bda83f426e SHA512 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4
 DIST tzdata2024a.tar.gz 451270 BLAKE2B 5ec49bbce704411a1d8b3f018b0d8f6c7de24c5600e0cb6c61a7ee29b4a49b1e502d23b40bce6584ea0aa9b66327321608cbabb994071ec4ca2b3a496aa2d621 SHA512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236
+DIST tzdb-2024b.tar.lz 544381 BLAKE2B 7e9e7d88aa25813c461bd9a9653fcb5e9b212bd07f7c6d5632a75e7f2200af121382ffe98bdf2a88f21b88e1fcebb3fee1bdc39322fe65520084144065d3445f SHA512 72446e5cf445515512437c8deaae3063b093aab9620d6441cafaa9b3b71603c857f7ba53557579595788bbc901cd6142404b4db6b0e9f2b23d57b2b3cbc837a8
diff --git a/sys-libs/timezone-data/files/timezone-data-2024b-April-short.patch b/sys-libs/timezone-data/files/timezone-data-2024b-April-short.patch
new file mode 100644
index 000000000000..6fd4ed296f40
--- /dev/null
+++ b/sys-libs/timezone-data/files/timezone-data-2024b-April-short.patch
@@ -0,0 +1,22 @@
+https://github.com/eggert/tz/commit/926b507fa5c3192b1b68fab5910cbd3ba9377c97
+
+From 926b507fa5c3192b1b68fab5910cbd3ba9377c97 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 5 Sep 2024 14:36:02 -0700
+Subject: [PATCH] "Apr", not "April", in IN column
+
+* northamerica (Rule): Use "Apr", not "April", in the IN column.
+Both forms are valid, but "Apr" is more consistent.
+Problem reported by Howard Hinnant.
+--- a/northamerica
++++ b/northamerica
+@@ -2631,7 +2631,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+ # http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
+ 
+ # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
+-Rule	Mexico	1931	only	-	April	30	0:00	1:00	D
++Rule	Mexico	1931	only	-	Apr	30	0:00	1:00	D
+ Rule	Mexico	1931	only	-	Oct	1	0:00	0	S
+ Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
+ Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
+
diff --git a/sys-libs/timezone-data/timezone-data-2024b.ebuild b/sys-libs/timezone-data/timezone-data-2024b.ebuild
new file mode 100644
index 000000000000..7e2ceffa21d2
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2024b.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic unpacker
+
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones"
+SRC_URI="
+	https://data.iana.org/time-zones/releases/tzdb-${PV}.tar.lz
+"
+S="${WORKDIR}"/tzdb-${PV}
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="nls leaps-timezone zic-slim"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="
+	${DEPEND}
+	!sys-libs/glibc[vanilla(+)]
+"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-April-short.patch
+)
+
+src_prepare() {
+	default
+
+	if tc-is-cross-compiler ; then
+		cp -pR "${S}" "${S}"-native || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	# bug #471102
+	append-lfs-flags
+
+	if use elibc_Darwin ; then
+		# bug #138251
+		append-cppflags -DSTD_INSPIRED
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+
+	# Upstream default is 'slim', but it breaks quite a few programs
+	# that parse /etc/localtime directly: bug #747538.
+	append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
+
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. bug #154181, bug #578424
+		local c="${T}/test"
+		echo 'int main(){}' > "${c}.c" || die
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps-timezone posix_right posix_only) \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+
+	_emake \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			CC="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# CURL is used for extended/web based tests. Punt on them.
+	emake check CURL=:
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+
+	insinto /usr/share/zoneinfo
+	doins "${S}"/leap-seconds.list
+
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}/etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+}
+
+configure_tz_data() {
+	# Make sure the /etc/localtime file does not get stale, bug #127899
+	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves, bug #511474
+	if [[ -L "${etc_lt}" ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${src} file is what you want; skipping update."
+		return 0
+	fi
+
+	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
+		einfo "You do not have a timezone set in ${src}; skipping update."
+		return 0
+	fi
+
+	local tzpath="${EROOT}/usr/share/zoneinfo/${tz}"
+
+	if [[ ! -e ${tzpath} ]]; then
+		ewarn "The timezone specified in ${src} is not valid!"
+		return 1
+	fi
+
+	if [[ -f ${etc_lt} ]]; then
+		# If a regular file already exists, copy over it.
+		ewarn "Found a regular file at ${etc_lt}."
+		ewarn "Some software may expect a symlink instead."
+		ewarn "You may convert it to a symlink by removing the file and running:"
+		ewarn "  emerge --config sys-libs/timezone-data"
+		einfo "Copying ${tzpath} to ${etc_lt}."
+		cp -f "${tzpath}" "${etc_lt}"
+	else
+		# Otherwise, create a symlink and remove the timezone file.
+		tzpath="../usr/share/zoneinfo/${tz}"
+		einfo "Linking ${tzpath} at ${etc_lt}."
+		if ln -snf "${tzpath}" "${etc_lt}"; then
+			einfo "Removing ${src}."
+			rm -f "${src}"
+		fi
+	fi
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.7.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.7.ebuild
index d9bf5f443d25..93937337aaed 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.7.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.7.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 ~ppc64 ~riscv ~sparc ~x86"
 
 CPU_USE=(
 	x86_{avx2,avx512f,avx512_vnni,sse2,ssse3,sse4_2,pclmul,vpclmulqdq}
diff --git a/sys-power/power-profiles-daemon/Manifest b/sys-power/power-profiles-daemon/Manifest
index 4e77da6b1705..0574516d26ff 100644
--- a/sys-power/power-profiles-daemon/Manifest
+++ b/sys-power/power-profiles-daemon/Manifest
@@ -1,2 +1,2 @@
-DIST power-profiles-daemon-0.20.tar.bz2 58388 BLAKE2B f25bc2618441f53624567c4f40d9960b28bf46fb2098eb0e2098207149df3d4923a13c40d781885e37708bf896b537ccb969ec7a928669a3776722e5e58801cf SHA512 2236aac94dafbf6fd951f3bd44953f1a14bc7c5e55349307374d836e20377e1768dcf1250fa8dcf9f01d4eddea8ab64082881189b4e958fbfcd5e2e90d3e823a
 DIST power-profiles-daemon-0.21.tar.bz2 63984 BLAKE2B 206c954272fb93b17a09e4108c74462d2524ef9160880ce59709504314fd38f413c7eb65ab4f0a085f6458b04f85b4833e0df3786f0aff08e7bdc0a3a65d8d2a SHA512 8038ff7c164bbcbeebc50c911f3129e79d4f8d63278bc674e10bf2920af0bc9b0b139d5a2e056889b0b7ec86df19cc7be3e8c84e70e777544e117ee7a036b375
+DIST power-profiles-daemon-0.22.tar.bz2 66394 BLAKE2B 7c204aa29ebda4f9034729b5ea09e1cd516a788c0fc58cf57f49791103f85506bc34bf8c2db9a4f1e42fa280ba4d6ce1c095df3a90deb90db795d7c02b4d6606 SHA512 7fcb960f956ad95cfa7f31ac8d8b3070ff72822106017177cdab873c2e8e6017d7357b09fea2a14450990acc844f7db30d5cdcce33d59661c775da54ad095af9
diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.20.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.20.ebuild
deleted file mode 100644
index 0df1a8b0c644..000000000000
--- a/sys-power/power-profiles-daemon/power-profiles-daemon-0.20.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..12} )
-
-inherit meson python-single-r1 systemd
-
-DESCRIPTION="Makes power profiles handling available over D-Bus"
-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"
-
-IUSE="gtk-doc selinux test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	dev-libs/glib:2
-	>=dev-libs/libgudev-234
-	>=sys-auth/polkit-0.99
-	sys-power/upower
-	selinux? ( sec-policy/selinux-powerprofiles )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gi-docgen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/umockdev
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	else
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/powerprofilesctl
-	newinitd "${FILESDIR}/power-profiles-daemon.initd" power-profiles-daemon
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You need to enable the service:"
-		if systemd_is_booted; then
-			elog "# systemctl enable ${PN}"
-		else
-			elog "# rc-update add ${PN} default"
-		fi
-	fi
-}
diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.22.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.22.ebuild
new file mode 100644
index 000000000000..fda723bbfe4a
--- /dev/null
+++ b/sys-power/power-profiles-daemon/power-profiles-daemon-0.22.ebuild
@@ -0,0 +1,98 @@
+# 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-single-r1 shell-completion systemd
+
+DESCRIPTION="Makes power profiles handling available over D-Bus"
+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"
+
+IUSE="bash-completion gtk-doc man selinux test zsh-completion"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	dev-libs/glib:2
+	>=dev-libs/libgudev-234
+	>=sys-auth/polkit-0.99
+	sys-power/upower
+	selinux? ( sec-policy/selinux-powerprofiles )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	bash-completion? (
+		>=app-shells/bash-completion-2.0
+		$(python_gen_cond_dep '>=dev-python/shtab-1.7.0[${PYTHON_USEDEP}]')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		dev-util/gtk-doc
+	)
+	man? (
+		$(python_gen_cond_dep 'dev-python/argparse-manpage[${PYTHON_USEDEP}]')
+	)
+	test? (
+		dev-util/umockdev
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+	zsh-completion? (
+		$(python_gen_cond_dep '>=dev-python/shtab-1.7.0[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	else
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+
+	if use bash-completion || use zsh-completion; then
+		python_has_version ">=dev-python/shtab-1.7.0[${PYTHON_USEDEP}]"
+	fi
+
+	use man && python_has_version "dev-python/argparse-manpage[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dpylint=disabled
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(meson_feature bash-completion bashcomp)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_feature man manpage)
+		$(meson_use test tests)
+	)
+	use zsh-completion && emesonargs+=( -Dzshcomp="$(get_zshcompdir)" )
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/powerprofilesctl
+	newinitd "${FILESDIR}/power-profiles-daemon.initd" power-profiles-daemon
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You need to enable the service:"
+		if systemd_is_booted; then
+			elog "# systemctl enable ${PN}"
+		else
+			elog "# rc-update add ${PN} default"
+		fi
+	fi
+}
diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index e12e0993ee14..d55dcfbb9c48 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1 +1,2 @@
 DIST powerstat-0.02.27.tar.gz 62629 BLAKE2B d7fe4b517d9a4d91003c7a263ed77bba24457ce20639e420658c3735176952f3283e2bbc64ec597d88b6206e431c29f75ea9b133331a6652f021f667d9466ccc SHA512 3bbab9ed88000b277d75f94d9d3e180944d6c8619cf5e7e8b783c9d303fadde47fe9347e93ac7f54c52687afb456bc26c590712486f589602f93058cd144922f
+DIST powerstat-0.04.03.tar.gz 63790 BLAKE2B d8cc04873ebdeafa642a3c2676f7f5e91b9573e067c6f23928c577c87c8e73532baa47052f0ba99910a828c1c398a7e79d51409b383ae961826c76a92699a38e SHA512 41655929d498720373a9dfc736d7a29987529dbb92643d2883da3cfda4935a4574893962651ce87e43929c070202086ba21317c034f346720c3d9683cf9523b7
diff --git a/sys-power/powerstat/powerstat-0.02.27.ebuild b/sys-power/powerstat/powerstat-0.02.27.ebuild
index 70de83228faf..d3c8edf14186 100644
--- a/sys-power/powerstat/powerstat-0.02.27.ebuild
+++ b/sys-power/powerstat/powerstat-0.02.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 src_prepare() {
 	default
diff --git a/sys-power/powerstat/powerstat-0.04.03.ebuild b/sys-power/powerstat/powerstat-0.04.03.ebuild
new file mode 100644
index 000000000000..82bd7c280e91
--- /dev/null
+++ b/sys-power/powerstat/powerstat-0.04.03.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Laptop power measuring tool"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	# Don't compress manpages, respect CFLAGS
+	sed -i  -e '/install:/s/ powerstat.8.gz//' \
+		-e '/cp powerstat.8/s/.gz//' \
+		-e '/CFLAGS += -Wall/s| -O2||' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	dobashcomp bash-completion/powerstat
+}
diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-9999.ebuild
index 0f707208abf8..a4538d1cb047 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-9999.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=8
 
-inherit git-r3 toolchain-funcs
+EGIT_REPO_URI="https://github.com/ColinIanKing/${PN}.git"
+
+inherit bash-completion-r1 git-r3 toolchain-funcs
 
 DESCRIPTION="Laptop power measuring tool"
 HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
-EGIT_REPO_URI="https://github.com/ColinIanKing/${PN}.git"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -15,12 +16,18 @@ SLOT="0"
 src_prepare() {
 	default
 
-	# Don't compress manpages
+	# Don't compress manpages, respect CFLAGS
 	sed -i  -e '/install:/s/ powerstat.8.gz//' \
 		-e '/cp powerstat.8/s/.gz//' \
+		-e '/CFLAGS += -Wall/s| -O2||' \
 		Makefile || die "sed failed"
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
+
+src_install() {
+	default
+	dobashcomp bash-completion/powerstat
+}
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 45a3e78fd27a..d7fe303aa967 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1 +1,2 @@
 DIST thermald-2.5.7.tar.gz 182761 BLAKE2B d812e1a7e0b55dd5d06ff491183ad0061acb79d2c80a6a248456821676bd3728e28a5d6b23d8fe2565ca8424830f095de8595e85bdfc514f17418af50d7e7284 SHA512 49699eb2a3f3d1197e680a39ecba767a1f11a5d4209671d30152f1e126f7c48b650909c4dd90c496a7857b0fa9ad6fc8c5a849413a8e544b3d5f62d8acfc8268
+DIST thermald-2.5.8.tar.gz 179188 BLAKE2B a00844e0147fdb104881624ba1ecbaa565155e4554b218b04b0edd4434f552e2bcc047e6eaada30b0e63b702a75318392ef8c39a8013003377c3e9ee80e694ab SHA512 d74d487e0fa0b51289b4cda2d9094eef6467993a8ca9ba5e2ac8af2fb8e7b9283116ca0647e604ab4d3c445657b31869201287d5ceace0221f7717b0a2cd244d
diff --git a/sys-power/thermald/thermald-2.5.8.ebuild b/sys-power/thermald/thermald-2.5.8.ebuild
new file mode 100644
index 000000000000..6f4162a4d8a5
--- /dev/null
+++ b/sys-power/thermald/thermald-2.5.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info out-of-source systemd
+
+DESCRIPTION="Thermal daemon for Intel architectures"
+HOMEPAGE="https://github.com/intel/thermal_daemon"
+SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/thermal_daemon-${PV}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:=
+	dev-libs/libxml2:=
+	dev-libs/libevdev
+	sys-power/upower
+	sys-apps/dbus:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/glib-utils"
+
+DOCS=( thermal_daemon_usage.txt README.txt )
+
+CONFIG_CHECK="~PERF_EVENTS_INTEL_RAPL ~X86_INTEL_PSTATE ~INTEL_POWERCLAMP ~INT340X_THERMAL ~ACPI_THERMAL_REL ~INT3406_THERMAL"
+
+src_prepare() {
+	sed -i -e '/tdrundir/s@\$localstatedir/run@\$runstatedir@' \
+		configure.ac || die
+
+	sed -i -e 's@\$(AM_V_GEN) glib-compile-resources@cd \$(top_srcdir) \&\& &@' \
+		Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		--runstatedir="${EPREFIX}"/run \
+		--with-dbus-power-group=wheel \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED}"/etc/init || die
+	doinitd "${FILESDIR}"/thermald
+}
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index efb7e2180891..d447a382ee89 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,4 +1,3 @@
 DIST audit-3.1.2.tar.gz 1219860 BLAKE2B dfdec470bf12cce6c570b3d260e65e2b49e8ac0761e6a6fbf7b4f4a57f92e88367cd74bfcb88e6d718619b88fea27ce963a977c9f4346c95d18a5310e217accb SHA512 a97003a294ed3671df01e2952688e7d5eef59a35f6891feb53e67c4c7eab9ae8c2d18de41a5b5b20e0ad7156fac93aec05f32f6bc5eea706b42b6f27f676446a
-DIST audit-3.1.3.tar.gz 1225761 BLAKE2B 97ee35fc722083d541e164b27fd318ec7be2a4e4e8774767d14c6a2e800092a37b7042a272db5d208c913fb36d295c5343bd6082237caf0fb561ec3c7a2883db SHA512 7d6399ca97b171d5ea3cf7f7566bdabe9d5677a3a54c75411146dc2971106809a90d1a9cd0b1ba9b8af4cc409e6bee5876c7f2a0c54c42400fdcf9cfade58a8c
 DIST audit-3.1.4.tar.gz 1225648 BLAKE2B c6875f7d031e810469511ac8f86f05b2de7f19c044dbf67bc9d66430167fcf0f031e0279ce170a496b672a6fc99ee18b8cc39943e6faf3c19a24a381d2701439 SHA512 d26c498c91e838d97d3f199630650f509bb1e82b44d364306b20db32d4116fa73d775ef56c0fed2ec8d548b19215052691cbc80c74699bc87f2a0ea08cf664f5
 DIST audit-4.0.1.tar.gz 1194961 BLAKE2B 590abf58e672921a432348f48936cfbff0b6ddfa47e77b3b20eaa00e5d1c4ce2fc8d10c1fc1cbc19d44c09a9f7dfbca76778c94d8d340485c2bb1bb3b5a3c95a SHA512 7fbc426d0ddea340a36ceab52ac090e8e3dfb3450ebf50b478324a097f19ab4bb2cf78a2532644acb17e6114b59b8fda718affda9da62fb84181e3abf76039df
diff --git a/sys-process/audit/audit-3.1.2.ebuild b/sys-process/audit/audit-3.1.2.ebuild
index 8984d7758dcb..858f1d192457 100644
--- a/sys-process/audit/audit-3.1.2.ebuild
+++ b/sys-process/audit/audit-3.1.2.ebuild
@@ -74,6 +74,8 @@ multilib_src_configure() {
 		$(use_enable ldap zos-remote)
 		$(use_enable static-libs static)
 		$(use_with io-uring io_uring)
+		$(use_with arm)
+		$(use_with arm64 aarch64)
 		--enable-systemd
 		--without-golang
 		--without-libwrap
@@ -89,6 +91,7 @@ multilib_src_configure() {
 			pushd "${BUILD_DIR}" &>/dev/null || die
 
 			ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" --with-python3
+			find . -type f -name 'Makefile' -exec sed -i "s;-I/usr/include/python;-I${SYSROOT}/usr/include/python;g" {} +
 
 			popd &>/dev/null || die
 		}
diff --git a/sys-process/audit/audit-3.1.3.ebuild b/sys-process/audit/audit-3.1.3.ebuild
deleted file mode 100644
index e185e4615aae..000000000000
--- a/sys-process/audit/audit-3.1.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# As with sys-libs/libcap-ng, same maintainer in Fedora as upstream, so
-# check Fedora's packaging (https://src.fedoraproject.org/rpms/audit/tree/rawhide)
-# on bumps (or if hitting a bug) to see what they've done there.
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
-SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="gssapi io-uring ldap python static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/libcap-ng
-	gssapi? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.34
-	test? ( dev-libs/check )
-"
-BDEPEND="
-	python? (
-		dev-lang/swig
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		' python3_12)
-	)
-"
-
-CONFIG_CHECK="~AUDIT"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-musl-malloc.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# missing on musl. Uses handrolled AC_LINK_IFELSE but fails at link time
-	# for older compilers regardless. bug #898828
-	strndupa
-)
-
-src_prepare() {
-	# audisp-remote moved in multilib_src_install_all
-	sed -i \
-		-e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
-		audisp/plugins/remote/au-remote.conf || die
-
-	# Disable installing sample rules so they can be installed as docs.
-	echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null || die
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable gssapi gssapi-krb5)
-		$(use_enable ldap zos-remote)
-		$(use_enable static-libs static)
-		$(use_with io-uring io_uring)
-		--enable-systemd
-		--without-golang
-		--without-libwrap
-		--without-python
-		--without-python3
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python; then
-		python_configure() {
-			mkdir -p "${BUILD_DIR}" || die
-			pushd "${BUILD_DIR}" &>/dev/null || die
-
-			ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" --with-python3
-
-			popd &>/dev/null || die
-		}
-
-		python_foreach_impl python_configure
-	fi
-}
-
-src_configure() {
-	tc-export_build_env BUILD_{CC,CPP}
-
-	local -x CC_FOR_BUILD="${BUILD_CC}"
-	local -x CPP_FOR_BUILD="${BUILD_CPP}"
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-
-		local native_build="${BUILD_DIR}"
-
-		python_compile() {
-			emake -C "${BUILD_DIR}"/bindings/swig top_builddir="${native_build}"
-			emake -C "${BUILD_DIR}"/bindings/python/python3 top_builddir="${native_build}"
-		}
-
-		use python && python_foreach_impl python_compile
-	else
-		emake -C common
-		emake -C lib
-		emake -C auparse
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install
-
-		local native_build="${BUILD_DIR}"
-
-		python_install() {
-			emake -C "${BUILD_DIR}"/bindings/swig DESTDIR="${D}" top_builddir="${native_build}" install
-			emake -C "${BUILD_DIR}"/bindings/python/python3 DESTDIR="${D}" top_builddir="${native_build}" install
-			python_optimize
-		}
-
-		use python && python_foreach_impl python_install
-
-		# Things like shadow use this so we need to be in /
-		gen_usr_ldscript -a audit auparse
-	else
-		emake -C lib DESTDIR="${D}" install
-		emake -C auparse DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README* THANKS
-	docinto contrib
-	dodoc contrib/avc_snap
-	docinto contrib/plugin
-	dodoc contrib/plugin/*
-	docinto rules
-	dodoc rules/*rules
-
-	newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
-	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
-
-	if [[ -f "${ED}"/sbin/audisp-remote ]] ; then
-		dodir /usr/sbin
-		mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
-	fi
-
-	# Gentoo rules
-	insinto /etc/audit
-	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
-	doins "${FILESDIR}"/audit.rules.stop*
-	keepdir /etc/audit/rules.d
-
-	# audit logs go here
-	keepdir /var/log/audit
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# Security
-	lockdown_perms "${ED}"
-}
-
-pkg_postinst() {
-	lockdown_perms "${EROOT}"
-}
-
-lockdown_perms() {
-	# Upstream wants these to have restrictive perms.
-	# Should not || die as not all paths may exist.
-	local basedir="${1}"
-	chmod 0750 "${basedir}"/sbin/au{ditctl,ditd,report,search,trace} 2>/dev/null
-	chmod 0750 "${basedir}"/var/log/audit 2>/dev/null
-	chmod 0640 "${basedir}"/etc/audit/{auditd.conf,audit*.rules*} 2>/dev/null
-}
diff --git a/sys-process/audit/audit-3.1.4-r1.ebuild b/sys-process/audit/audit-3.1.4-r1.ebuild
index 33f5402ee966..5810adf16ccd 100644
--- a/sys-process/audit/audit-3.1.4-r1.ebuild
+++ b/sys-process/audit/audit-3.1.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gssapi io-uring ldap python static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -74,6 +74,8 @@ multilib_src_configure() {
 		$(use_enable gssapi gssapi-krb5)
 		$(use_enable ldap zos-remote)
 		$(use_enable static-libs static)
+		$(use_with arm)
+		$(use_with arm64 aarch64)
 		$(use_with io-uring io_uring)
 		--enable-systemd
 		--without-golang
@@ -90,6 +92,7 @@ multilib_src_configure() {
 			pushd "${BUILD_DIR}" &>/dev/null || die
 
 			ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" --with-python3
+			find . -type f -name 'Makefile' -exec sed -i "s;-I/usr/include/python;-I${SYSROOT}/usr/include/python;g" {} +
 
 			popd &>/dev/null || die
 		}
diff --git a/sys-process/audit/audit-4.0.1-r1.ebuild b/sys-process/audit/audit-4.0.1-r1.ebuild
index 0757b5e9644a..e2b32d41ee0a 100644
--- a/sys-process/audit/audit-4.0.1-r1.ebuild
+++ b/sys-process/audit/audit-4.0.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gssapi io-uring ldap python static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -77,6 +77,8 @@ multilib_src_configure() {
 		$(use_enable gssapi gssapi-krb5)
 		$(use_enable ldap zos-remote)
 		$(use_enable static-libs static)
+		$(use_with arm)
+		$(use_with arm64 aarch64)
 		$(use_with io-uring io_uring)
 		--without-golang
 		--without-libwrap
@@ -91,6 +93,7 @@ multilib_src_configure() {
 			pushd "${BUILD_DIR}" &>/dev/null || die
 
 			ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" --with-python3
+			find . -type f -name 'Makefile' -exec sed -i "s;-I/usr/include/python;-I${SYSROOT}/usr/include/python;g" {} +
 
 			popd &>/dev/null || die
 		}
diff --git a/sys-process/below/files/below.initd b/sys-process/below/files/below.initd
deleted file mode 100644
index 8c1b8eb56cff..000000000000
--- a/sys-process/below/files/below.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile=/run/${RC_SVCNAME}.pid
-LOGPATH=/var/log/${RC_SVCNAME}
-DATADIR=/var/lib/${RC_SVCNAME}
-command_user=root
-command=/usr/bin/below
-command_args="record ${BELOW_EXTRA_ARGS}"
-command_background=true
-start_stop_daemon_args="
-	--chdir ${DATADIR}
-	-1 ${LOGPATH}/${RC_SVCNAME}.log
-	-2 ${LOGPATH}/${RC_SVCNAME}.err"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start() {
-	if [ ! -d "${LOGPATH}" ] ; then
-		mkdir -p "${LOGPATH}"
-	fi
-	if [ ! -d "${DATADIR}" ] ; then
-		mkdir -p "${DATADIR}"
-	fi
-	default_start
-}
diff --git a/sys-process/below/files/below.logrotated b/sys-process/below/files/below.logrotated
deleted file mode 100644
index 90bfe05a3de5..000000000000
--- a/sys-process/below/files/below.logrotated
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/below/error_*.log {
-  daily
-  rotate 14
-  maxage 14
-  copytruncate
-  compress
-  notifempty
-  missingok
-  create 0644 root root
-  su root root
-}
diff --git a/sys-process/below/files/below.service b/sys-process/below/files/below.service
deleted file mode 100644
index ea80b4e93c29..000000000000
--- a/sys-process/below/files/below.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=below system monitor recording daemon
-After=time-sync.target
-
-[Service]
-ExecStart=/usr/bin/below record --retain-for-s 604800 --compress
-# Enable backtraces in errors
-Environment=RUST_LIB_BACKTRACE=1
-Restart=always
-RestartSec=3
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-process/bottom/bottom-0.10.1.ebuild b/sys-process/bottom/bottom-0.10.1.ebuild
index 7de43d3caddb..338d07e9e117 100644
--- a/sys-process/bottom/bottom-0.10.1.ebuild
+++ b/sys-process/bottom/bottom-0.10.1.ebuild
@@ -234,7 +234,7 @@ LICENSE+=" Apache-2.0 ISC MIT MPL-2.0 Unicode-DFS-2016"
 # cargo-husky-1.5.0
 LICENSE+=" MIT "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 IUSE="+battery +gpu +zfs"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
diff --git a/sys-process/criu/criu-3.19.ebuild b/sys-process/criu/criu-3.19.ebuild
index 42928cbad03b..52078c69f2ea 100644
--- a/sys-process/criu/criu-3.19.ebuild
+++ b/sys-process/criu/criu-3.19.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -70,6 +70,7 @@ criu_arch() {
 	case ${ARCH} in
 		amd64) echo "x86";;
 		arm64) echo "aarch64";;
+		loong) echo "loongarch64";;
 		ppc64*) echo "ppc64";;
 		*)     echo "${ARCH}";;
 	esac
diff --git a/sys-process/evisum/evisum-0.6.1.ebuild b/sys-process/evisum/evisum-0.6.1.ebuild
index 00b22c29ba17..a50b86e147af 100644
--- a/sys-process/evisum/evisum-0.6.1.ebuild
+++ b/sys-process/evisum/evisum-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND=">=dev-libs/efl-1.27.0"
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/sys-process/fcron/fcron-3.3.1.ebuild b/sys-process/fcron/fcron-3.3.1.ebuild
deleted file mode 100644
index 88aca353aef9..000000000000
--- a/sys-process/fcron/fcron-3.3.1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="none"
-
-inherit autotools cron flag-o-matic pam systemd user-info
-
-MY_PV="${PV/_beta/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
-
-DEPEND="
-	acct-group/fcron
-	acct-user/fcron
-	virtual/libcrypt:=
-	audit? ( sys-process/audit )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sys-libs/libselinux )
-"
-
-RDEPEND="
-	${DEPEND}
-	app-misc/editor-wrapper
-	mta? ( virtual/mta )
-	pam? ( sys-auth/pambase )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
-	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
-)
-
-pkg_setup() {
-	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
-	[[ ${rootuser} ]] || rootuser=root
-	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	[[ ${rootgroup} ]] || rootgroup=root
-}
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS
-	sed "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed"
-
-	# Adjust fcrontab path
-	sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i script/check_system_crontabs.sh || die
-
-	mv configure.in configure.ac || die
-
-	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
-
-	eautoconf
-}
-
-src_configure() {
-	# Don't try to pass --with-debug as it'll play with cflags as
-	# well, and run foreground which is a _very_ nasty idea for
-	# Gentoo.
-	use debug && append-cppflags -DDEBUG
-
-	# bindir is used just for calling fcronsighup
-	local myeconfargs=(
-		--with-cflags="${CFLAGS}"
-		--bindir=/usr/libexec
-		--sbindir=/usr/libexec
-		$(use_with audit)
-		$(use_with mta sendmail)
-		$(use_with pam)
-		$(use_with readline)
-		$(use_with selinux)
-		--sysconfdir=/etc/fcron
-		--with-username=fcron
-		--with-groupname=fcron
-		--with-piddir=/run
-		--with-spooldir=/var/spool/fcron
-		--with-fifodir=/run
-		--with-fcrondyn=yes
-		--disable-checks
-		--with-editor=/usr/libexec/editor
-		--with-shell=/bin/sh
-		--without-db2man
-		--without-dsssl-dir
-		--with-rootname=${rootuser}
-		--with-rootgroup=${rootgroup}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	# bug #216460
-	sed \
-		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
-		-e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local/:/usr/:g' \
-		-i doc/*/*/*.{txt,1,5,8,html} \
-		|| die "unable to fix documentation references"
-}
-
-src_install() {
-	keepdir /var/spool/fcron
-
-	exeinto /usr/libexec
-	doexe fcron fcronsighup
-
-	dobin fcrondyn fcrontab
-
-	insinto /etc/fcron
-	doins files/fcron.{allow,deny,conf}
-
-	if use system-crontab; then
-		dosym fcrontab /usr/bin/crontab
-
-		exeinto /usr/libexec
-		newexe script/check_system_crontabs.sh check_system_crontabs
-
-		insinto /etc/fcron
-		newins "${FILESDIR}"/fcrontab.2 fcrontab
-
-		fowners ${rootuser}:fcron /etc/fcron/fcrontab
-		fperms 0640 /etc/fcron/fcrontab
-
-		insinto /etc
-		newins "${FILESDIR}"/crontab.2 crontab
-	fi
-
-	fowners fcron:fcron \
-		/var/spool/fcron \
-		/usr/bin/fcron{dyn,tab}
-
-	# fcronsighup needs to be suid root, because it sends a HUP to the
-	# running fcron daemon, but only has to be called by the fcron group
-	# anyway
-	fowners ${rootuser}:fcron \
-		/usr/libexec/fcronsighup \
-		/etc/fcron/fcron.{allow,deny,conf} \
-		/etc/fcron
-
-	fperms 6770 /var/spool/fcron
-	fperms 6775 /usr/bin/fcron{dyn,tab}
-
-	fperms 4710 /usr/libexec/fcronsighup
-
-	fperms 0750 /etc/fcron
-	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
-
-	use pam && pamd_mimic system-services fcron auth account session
-	cat > "${T}"/fcrontab.pam <<- EOF
-	# Don't ask for the user's password; fcrontab will only allow to
-	# change user if running as root.
-	auth		sufficient		pam_permit.so
-
-	# Still use the system-auth stack for account and session as the
-	# sysadmin might have set up stuff properly, and also avoids
-	# sidestepping limits (since fcrontab will run \$EDITOR).
-	account		include			system-auth
-	session		include			system-auth
-	EOF
-	use pam && newpamd "${T}"/fcrontab.pam fcrontab
-
-	newinitd "${FILESDIR}"/fcron.init-r5 fcron
-	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
-
-	newconfd "${FILESDIR}"/fcron.confd fcron
-
-	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
-	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
-
-	local HTML_DOCS=( doc/en/HTML/. )
-
-	einstalldocs
-
-	newdoc files/fcron.conf fcron.conf.sample
-	doman doc/en/man/*.{1,5,8}
-
-	for lang in fr; do
-		use l10n_${lang} || continue
-
-		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
-
-		docinto html/${lang}
-		dodoc -r doc/${lang}/HTML/.
-	done
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Make sure you execute"
-		elog ""
-		elog "  # emerge --config ${CATEGORY}/${PN}"
-		elog ""
-		elog "to install the default systab on this system."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "3.2.1" -gt ${v}; then
-				# This is an upgrade
-
-				elog "fcron's default systab was updated since your last installation."
-				elog "You can use"
-				elog ""
-				elog "  # emerge --config ${CATEGORY}/${PN}"
-				elog ""
-				elog "to re-install systab (do not call this command before you"
-				elog "have merged your configuration files)."
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if ! use system-crontab; then
-		echo ""
-		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
-		ewarn "due to USE=-system-crontab!"
-		echo ""
-	fi
-}
-
-pkg_config() {
-	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
-		eerror "We're not going to make any change to your systab as long as"
-		eerror "it contains data; please clear it before proceeding."
-		eerror "You can do that with"
-		eerror ""
-		eerror "  # fcrontab -u systab -r"
-		eerror ""
-		eerror "However you are advised to do this by hand to review existing"
-		eerror "systab just in case."
-		return 1
-	fi
-
-	if use system-crontab; then
-		elog "This is going to set up fcron to execute check_system_crontabs."
-		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
-		elog "Per default fcron will check for modifications every 10 minutes."
-		/usr/libexec/check_system_crontabs -v -i -f
-	else
-		elog "This is going to set up fcron to set up a default systab that"
-		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
-		elog "/etc/crontab and /etc/cron.d."
-		fcrontab -u systab - <<- EOF
-		!serial(true)
-		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
-		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
-		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
-		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
-		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
-		!serial(false)
-		EOF
-	fi
-}
diff --git a/sys-process/glances/files/glances-3.4.0.3-disable-update-check.patch b/sys-process/glances/files/glances-3.4.0.3-disable-update-check.patch
deleted file mode 100644
index 79391aca3e4f..000000000000
--- a/sys-process/glances/files/glances-3.4.0.3-disable-update-check.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit cf50275006e4bdd4a08c2235e688050a4a25a7a4
-Author: John Helmert III <ajak@gentoo.org>
-Date:   Sat Jun 10 10:38:03 2023 -0700
-
-    disable out-to-date runtime check
-    
-    Signed-off-by: John Helmert III <ajak@gentoo.org>
-
-diff --git a/glances/standalone.py b/glances/standalone.py
-index 8ab60e8c..b1f8c454 100644
---- a/glances/standalone.py
-+++ b/glances/standalone.py
-@@ -105,9 +105,6 @@ class GlancesStandalone(object):
-             # Init screen
-             self.screen = GlancesCursesStandalone(config=config, args=args)
- 
--        # Check the latest Glances version
--        self.outdated = Outdated(config=config, args=args)
--
-     @property
-     def quiet(self):
-         return self._quiet
-@@ -186,17 +183,3 @@ class GlancesStandalone(object):
- 
-         # Exit from export modules
-         self.stats.end()
--
--        # Check Glances version versus PyPI one
--        if self.outdated.is_outdated():
--            print(
--                "You are using Glances version {}, however version {} is available.".format(
--                    self.outdated.installed_version(), self.outdated.latest_version()
--                )
--            )
--            print("You should consider upgrading using: pip install --upgrade glances")
--            print("Disable this warning temporarily using: glances --disable-check-update")
--            print(
--                "To disable it permanently, refer config reference at "
--                "https://glances.readthedocs.io/en/latest/config.html#syntax"
--            )
diff --git a/sys-process/minicoredumper/files/2.0.2-readme.patch b/sys-process/minicoredumper/files/2.0.2-readme.patch
deleted file mode 100644
index ee012da65f74..000000000000
--- a/sys-process/minicoredumper/files/2.0.2-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f5cf83a74dee47625c28f25980a857917faf1282 Mon Sep 17 00:00:00 2001
-From: John Ogness <john.ogness@linutronix.de>
-Date: Wed, 30 Nov 2022 15:23:49 +0106
-Subject: [PATCH] docs: mention setting kernel.core_pipe_limit
-
-It is recommended to set kernel.core_pipe_limit to the maximum
-value. Show that in the documentation.
-
-Signed-off-by: John Ogness <john.ogness@linutronix.de>
----
- README                                | 1 +
- website/src/installation.content.html | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/README b/README
-index aea079d..5a768a0 100644
---- a/README
-+++ b/README
-@@ -39,6 +39,7 @@ Installation
- 
-       $ echo '|/usr/sbin/minicoredumper %P %u %g %s %t %h %e' | \
-              sudo tee /proc/sys/kernel/core_pattern
-+      $ echo 0x7fffffff | sudo tee /proc/sys/kernel/core_pipe_limit
- 
- Documentation
- -------------
diff --git a/sys-process/parallel/parallel-20240522.ebuild b/sys-process/parallel/parallel-20240522.ebuild
index fd04358e548a..1a844c522b5e 100644
--- a/sys-process/parallel/parallel-20240522.ebuild
+++ b/sys-process/parallel/parallel-20240522.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index d3ffa90ef4a7..86dd43dacbcb 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,2 +1,2 @@
+DIST runit-2.1.2-patches-20240905.tar.xz 20104 BLAKE2B ebdc123ea722f223eec3ad5d63a4c3e7c4ef771592796f2d5624f4308c1d08eede7d4fa0c2a9fdd23dbf74be6135c69bae495d89cf582678b9308b1d146ef883 SHA512 15c5acd865ecc7f6c3b9b1fc94dc00bc44ceefd1c0ca6b53963d94338712cd716ad961826cccd065029ee67464dc288428952004ffcec3a1a97a058696f4f233
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
-DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2
diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 70953e9fd813..73e765e89483 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/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">
-	<email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+  <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">clan/runit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-process/runit/runit-2.1.2-r3.ebuild b/sys-process/runit/runit-2.1.2-r3.ebuild
deleted file mode 100644
index 4da7236850c6..000000000000
--- a/sys-process/runit/runit-2.1.2-r3.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 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="http://smarden.org/runit/"
-UBUNTU_PR="59ubuntu1"
-UBUNTU_A="${PN}_${PV}-${UBUNTU_PR}.debian.tar.xz"
-SRC_URI="
-	http://smarden.org/runit/${P}.tar.gz
-	http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A}
-	"
-
-	RDEPEND="|| ( sys-apps/openrc sys-apps/openrc-navi )"
-
-S=${WORKDIR}/admin/${P}/src
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
-
-src_prepare() {
-	default
-	cd "${WORKDIR}/admin/"
-	eapply -p1 "${WORKDIR}/debian/patches"
-	cd "${S}"
-
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
-
-	# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
-	[[ ${COMPILER} == "diet" ]] &&
-		use ppc &&
-		filter-flags "-mpowerpc-gpopt"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	sed -i \
-		-e "/echo.*ar.*cr/s,\<ar\>,$(tc-getAR)," \
-		-e "/echo.*ranlib/s,\<ranlib\>,$(tc-getRANLIB)," \
-		print-ar.sh || die
-}
-
-src_install() {
-	into /
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-	dosym ../etc/runit/2 /sbin/runsvdir-start
-
-	DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
-	HTML_DOCS=( ../doc/*.html )
-	einstalldocs
-	doman ../man/*.[18]
-
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/ctrlaltdel
-	newexe "${FILESDIR}"/1-${PV} 1
-	newexe "${FILESDIR}"/2-${PV} 2
-	newexe "${FILESDIR}"/3-${PV} 3
-
-	dodir /etc/sv
-	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
-		exeinto /etc/sv/getty-$tty/
-		newexe "${FILESDIR}"/finish.getty finish
-		newexe "${FILESDIR}"/run.getty-${PV} run
-		for script in finish run; do
-			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script
-		done
-	done
-
-	# make sv command work
-	newenvd - 20runit <<- EOF
-		#/etc/env.d/20runit
-		SVDIR="/etc/service/"
-	EOF
-}
-
-default_config() {
-	local sv="${EROOT}"/etc/sv
-	local service="${EROOT}"/etc/service
-	mkdir -p "${service}" || die
-	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-	ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
-	done
-	einfo "The links to services runit will supervise are installed"
-	einfo "in $service."
-	einfo "If you need multiple runlevels, please see the documentation"
-	einfo "for how to set them up."
-	einfo
-}
-
-migrate_from_211() {
-	# Create /etc/service and /var/service if requested
-	if [ -e "${T}"/make_var_service ]; then
-		ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/etc/service || die
-		ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/var/service || die
-	fi
-	if [ -d "${T}"/runsvdir ]; then
-		cp -a "${T}"/runsvdir "${EROOT}"/etc/runit || die
-	fi
-	return 0
-}
-
-pkg_preinst() {
-	if  has_version '<sys-process/runit-2.1.2'; then
-		pre_212=yes
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		default_config
-	elif [[ -n $pre_212 ]]; then
-		migrate_from_211
-	fi
-
-	ewarn "To make sure sv works correctly in your currently open"
-	ewarn "shells, please run the following command:"
-	ewarn
-	ewarn "source /etc/profile"
-	ewarn
-
-	if [ -L "${EROOT}"/var/service ]; then
-		ewarn "Once this version of runit is active, please remove the"
-		ewarn "compatibility symbolic link at ${EROOT}/var/service"
-		ewarn "The correct path now is ${EROOT}/etc/service"
-		ewarn
-	fi
-
-	if [ -L "${EROOT}"/etc/runit/runsvdir/all ]; then
-		ewarn "${EROOT}/etc/runit/runsvdir/all has moved to"
-		iewarn "${EROOT}/etc/sv."
-		ewarn "Any symbolic links under ${EROOT}/etc/runit/runsvdir"
-		ewarn "which point to services through ../all should be updated to"
-		ewarn "point to them through ${EROOT}/etc/sv."
-		ewarn "Once that is done, ${EROOT}/etc/runit/runsvdir/all should be"
-		ewarn "removed."
-		ewarn
-	fi
-}
diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild b/sys-process/runit/runit-2.1.2-r5.ebuild
new file mode 100644
index 000000000000..8d6056f4ffba
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2-r5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A UNIX init scheme with service supervision"
+HOMEPAGE="https://smarden.org/runit/"
+PATCH_VER=20240905
+SRC_URI="
+	https://smarden.org/runit/${P}.tar.gz
+	https://github.com/clan/runit/releases/download/${PV}-r5/${P}-patches-${PATCH_VER}.tar.xz
+"
+S=${WORKDIR}/admin/${P}/src
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="static"
+
+RDEPEND="sys-apps/openrc"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack ${P}-patches-${PATCH_VER}.tar.xz
+}
+
+src_prepare() {
+	default
+
+	cd "${S}"/.. || die
+	eapply -p3 "${WORKDIR}"/patches
+	cd "${S}" || die
+
+	# We either build everything or nothing static
+	sed -i -e 's:-static: :' Makefile || die
+
+	# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
+	[[ ${COMPILER} == "diet" ]] &&
+		use ppc &&
+		filter-flags "-mpowerpc-gpopt"
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	into /
+	dobin $(<../package/commands)
+	dodir /sbin
+	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
+	dosym ../etc/runit/2 /sbin/runsvdir-start
+
+	DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
+	HTML_DOCS=( ../doc/*.html )
+	einstalldocs
+	doman ../man/*.[18]
+
+	exeinto /etc/runit
+	doexe "${FILESDIR}"/ctrlaltdel
+	newexe "${FILESDIR}"/1-${PV} 1
+	newexe "${FILESDIR}"/2-${PV} 2
+	newexe "${FILESDIR}"/3-${PV} 3
+
+	dodir /etc/sv
+	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
+		exeinto /etc/sv/getty-$tty/
+		newexe "${FILESDIR}"/finish.getty finish
+		newexe "${FILESDIR}"/run.getty-${PV} run
+		for script in finish run; do
+			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script
+		done
+	done
+
+	# make sv command work
+	newenvd - 20runit <<- EOF
+		#/etc/env.d/20runit
+		SVDIR="/etc/service/"
+	EOF
+}
+
+default_config() {
+	local sv="${EROOT}"/etc/sv
+	local service="${EROOT}"/etc/service
+	mkdir -p "${service}" || die
+	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
+		ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
+	done
+	einfo "The links to services runit will supervise are installed"
+	einfo "in $service."
+	einfo "If you need multiple runlevels, please see the documentation"
+	einfo "for how to set them up."
+	einfo
+}
+
+migrate_from_211() {
+	# Create /etc/service and /var/service if requested
+	if [[ -e "${T}"/make_var_service ]]; then
+		ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/etc/service || die
+		ln -sf "${EROOT}"/etc/runit/runsvdir/current "${EROOT}"/var/service || die
+	fi
+	if [[ -d "${T}"/runsvdir ]]; then
+		cp -a "${T}"/runsvdir "${EROOT}"/etc/runit || die
+	fi
+	return 0
+}
+
+pkg_preinst() {
+	if  has_version '<sys-process/runit-2.1.2'; then
+		pre_212=yes
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		default_config
+	elif [[ -n ${pre_212} ]]; then
+		migrate_from_211
+	fi
+
+	ewarn "To make sure sv works correctly in your currently open"
+	ewarn "shells, please run the following command:"
+	ewarn
+	ewarn "source /etc/profile"
+	ewarn
+
+	if [[ -L "${EROOT}"/var/service ]]; then
+		ewarn "Once this version of runit is active, please remove the"
+		ewarn "compatibility symbolic link at ${EROOT}/var/service"
+		ewarn "The correct path now is ${EROOT}/etc/service"
+		ewarn
+	fi
+
+	if [[ -L "${EROOT}"/etc/runit/runsvdir/all ]]; then
+		ewarn "${EROOT}/etc/runit/runsvdir/all has moved to"
+		ewarn "${EROOT}/etc/sv."
+		ewarn "Any symbolic links under ${EROOT}/etc/runit/runsvdir"
+		ewarn "which point to services through ../all should be updated to"
+		ewarn "point to them through ${EROOT}/etc/sv."
+		ewarn "Once that is done, ${EROOT}/etc/runit/runsvdir/all should be"
+		ewarn "removed."
+		ewarn
+	fi
+}
diff --git a/virtual/dist-kernel/dist-kernel-5.10.222.ebuild b/virtual/dist-kernel/dist-kernel-5.10.222.ebuild
deleted file mode 100644
index 3b0524b1c02c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.222.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
-
-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.10.224.ebuild b/virtual/dist-kernel/dist-kernel-5.10.224.ebuild
index 4799eff8f746..3b0524b1c02c 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.224.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.224.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual to depend on any Distribution Kernel"
 SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.10.223.ebuild b/virtual/dist-kernel/dist-kernel-5.10.225.ebuild
index 4799eff8f746..4799eff8f746 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.223.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.225.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.15.163.ebuild b/virtual/dist-kernel/dist-kernel-5.15.163.ebuild
deleted file mode 100644
index 49842ddf1587..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.163.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
-
-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-5.15.165.ebuild b/virtual/dist-kernel/dist-kernel-5.15.165.ebuild
index 3b4d92e6969b..49842ddf1587 100644
--- a/virtual/dist-kernel/dist-kernel-5.15.165.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.165.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual to depend on any Distribution Kernel"
 SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.15.164.ebuild b/virtual/dist-kernel/dist-kernel-5.15.166.ebuild
index 3b4d92e6969b..3b4d92e6969b 100644
--- a/virtual/dist-kernel/dist-kernel-5.15.164.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.166.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.1.100.ebuild b/virtual/dist-kernel/dist-kernel-6.1.100.ebuild
deleted file mode 100644
index 85751b4ee93a..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.100.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
-
-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.105.ebuild b/virtual/dist-kernel/dist-kernel-6.1.105.ebuild
deleted file mode 100644
index 15b55453deca..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.105.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
-
-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.106.ebuild b/virtual/dist-kernel/dist-kernel-6.1.106.ebuild
index 15b55453deca..85751b4ee93a 100644
--- a/virtual/dist-kernel/dist-kernel-6.1.106.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.1.106.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual to depend on any Distribution Kernel"
 SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-6.1.102.ebuild b/virtual/dist-kernel/dist-kernel-6.1.107.ebuild
index 15b55453deca..15b55453deca 100644
--- a/virtual/dist-kernel/dist-kernel-6.1.102.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.1.107.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.1.103.ebuild b/virtual/dist-kernel/dist-kernel-6.1.108.ebuild
index 15b55453deca..15b55453deca 100644
--- a/virtual/dist-kernel/dist-kernel-6.1.103.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.1.108.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.1.104.ebuild b/virtual/dist-kernel/dist-kernel-6.1.109.ebuild
index 15b55453deca..15b55453deca 100644
--- a/virtual/dist-kernel/dist-kernel-6.1.104.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.1.109.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.10.2.ebuild b/virtual/dist-kernel/dist-kernel-6.10.7.ebuild
index 9969a23652bd..9969a23652bd 100644
--- a/virtual/dist-kernel/dist-kernel-6.10.2.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.10.7.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.10.3.ebuild b/virtual/dist-kernel/dist-kernel-6.10.8-r1.ebuild
index 9969a23652bd..9969a23652bd 100644
--- a/virtual/dist-kernel/dist-kernel-6.10.3.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.10.8-r1.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.10.4.ebuild b/virtual/dist-kernel/dist-kernel-6.10.9.ebuild
index 9969a23652bd..9969a23652bd 100644
--- a/virtual/dist-kernel/dist-kernel-6.10.4.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.10.9.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.6.41.ebuild b/virtual/dist-kernel/dist-kernel-6.6.41.ebuild
deleted file mode 100644
index 34b6bca97133..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.6.41.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
-
-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.45.ebuild b/virtual/dist-kernel/dist-kernel-6.6.45.ebuild
deleted file mode 100644
index 9969a23652bd..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.6.45.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
-
-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.46.ebuild b/virtual/dist-kernel/dist-kernel-6.6.46.ebuild
deleted file mode 100644
index 9969a23652bd..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.6.46.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
-
-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.47.ebuild b/virtual/dist-kernel/dist-kernel-6.6.47.ebuild
index 9969a23652bd..34b6bca97133 100644
--- a/virtual/dist-kernel/dist-kernel-6.6.47.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.6.47.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual to depend on any Distribution Kernel"
 SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-6.10.5.ebuild b/virtual/dist-kernel/dist-kernel-6.6.48.ebuild
index 9969a23652bd..9969a23652bd 100644
--- a/virtual/dist-kernel/dist-kernel-6.10.5.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.6.48.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.6.43.ebuild b/virtual/dist-kernel/dist-kernel-6.6.49.ebuild
index 9969a23652bd..9969a23652bd 100644
--- a/virtual/dist-kernel/dist-kernel-6.6.43.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.6.49.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.6.44.ebuild b/virtual/dist-kernel/dist-kernel-6.6.50.ebuild
index 9969a23652bd..9969a23652bd 100644
--- a/virtual/dist-kernel/dist-kernel-6.6.44.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.6.50.ebuild
diff --git a/virtual/gnustep-back/gnustep-back-0.31.0.ebuild b/virtual/gnustep-back/gnustep-back-0.31.0.ebuild
index 1c4a46e33dbe..fe9650af4660 100644
--- a/virtual/gnustep-back/gnustep-back-0.31.0.ebuild
+++ b/virtual/gnustep-back/gnustep-back-0.31.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| (
 		~gnustep-base/gnustep-back-cairo-${PV}
diff --git a/virtual/httpd-basic/httpd-basic-0-r5.ebuild b/virtual/httpd-basic/httpd-basic-0-r5.ebuild
index ed0b37456419..8a6ced97597a 100644
--- a/virtual/httpd-basic/httpd-basic-0-r5.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for static HTML-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild
index 89b8daf41740..4b46df441e1c 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for CGI-enabled webservers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.20.10_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.143.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.212.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.212.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-DB_File/perl-DB_File-1.859.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.859.0.ebuild
index 26c12fb8bfb1..71c08ea7f2b4 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.859.0.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.859.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40*[berkdb] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.189.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.720.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/perl-Encode-3.210.0-r1.ebuild b/virtual/perl-Encode/perl-Encode-3.210.0-r1.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Encode/perl-Encode-3.210.0-r1.ebuild
+++ b/virtual/perl-Encode/perl-Encode-3.210.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.240.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.750.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.750.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.750.0.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.750.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
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
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.900.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.900.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.570.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.88.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild
index 6d8f80585342..bd421029a538 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.212.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.420.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0.ebuild
+++ b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.150.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/perl-IO-1.550.0.ebuild b/virtual/perl-IO/perl-IO-1.550.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-IO/perl-IO-1.550.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.550.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.501.800.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-2.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild
index c5e3a11a9de5..e4db825a34bd 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.406.90.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.38.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.450.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Safe/perl-Safe-2.460.0.ebuild b/virtual/perl-Safe/perl-Safe-2.460.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Safe/perl-Safe-2.460.0.ebuild
+++ b/virtual/perl-Safe/perl-Safe-2.460.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/perl-Socket-2.38.0.ebuild b/virtual/perl-Socket/perl-Socket-2.38.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Socket/perl-Socket-2.38.0.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.38.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.480.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.480.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.480.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.480.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild
index 7196602d2238..5f58069d5f37 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.199.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0.ebuild b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0.ebuild
index 6a49469b8c07..85ffa3c4169f 100644
--- a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0.ebuild
+++ b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2024.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Text::Tabs and Text::Wrap, also distributed as Text::Tabs+Wrap"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.977.700.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.350.0.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.350.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.350.0.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.350.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-autodie/perl-autodie-2.370.0.ebuild b/virtual/perl-autodie/perl-autodie-2.370.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-autodie/perl-autodie-2.370.0.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.370.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/perl-bignum-0.670.0.ebuild b/virtual/perl-bignum/perl-bignum-0.670.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-bignum/perl-bignum-0.670.0.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.670.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild b/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild
+++ b/virtual/perl-podlators/perl-podlators-5.10.200_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.690.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.690.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.690.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.690.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/perl-threads-2.400.0.ebuild b/virtual/perl-threads/perl-threads-2.400.0.ebuild
index 3b343fba4603..13ca4fc745c9 100644
--- a/virtual/perl-threads/perl-threads-2.400.0.ebuild
+++ b/virtual/perl-threads/perl-threads-2.400.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40*[perl_features_ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/perl-version-0.993.0.ebuild b/virtual/perl-version/perl-version-0.993.0.ebuild
index 235643d4440a..4694b8303845 100644
--- a/virtual/perl-version/perl-version-0.993.0.ebuild
+++ b/virtual/perl-version/perl-version-0.993.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/rust/rust-1.71.0-r2.ebuild b/virtual/rust/rust-1.71.0-r2.ebuild
deleted file mode 100644
index f452208a1d82..000000000000
--- a/virtual/rust/rust-1.71.0-r2.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
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-
-# adjust when rust upstream bumps internal llvm
-# we do not allow multiple llvm versions in dev-lang/rust for
-# neither system nor bundled, so we just hardcode it here.
-SLOT="0/llvm-16"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="profiler rustfmt"
-
-BDEPEND=""
-RDEPEND="|| (
-	~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}]
-	~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}]
-)"
diff --git a/virtual/rust/rust-1.73.0-r1.ebuild b/virtual/rust/rust-1.73.0-r1.ebuild
deleted file mode 100644
index 36a81c55f875..000000000000
--- a/virtual/rust/rust-1.73.0-r1.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
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-
-# adjust when rust upstream bumps internal llvm
-# we do not allow multiple llvm versions in dev-lang/rust for
-# neither system nor bundled, so we just hardcode it here.
-SLOT="0/llvm-17"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="profiler rustfmt"
-
-BDEPEND=""
-RDEPEND="|| (
-	~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}]
-	~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}]
-)"
diff --git a/virtual/rust/rust-1.76.0.ebuild b/virtual/rust/rust-1.76.0.ebuild
deleted file mode 100644
index 2790ab8f7afc..000000000000
--- a/virtual/rust/rust-1.76.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
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-
-# adjust when rust upstream bumps internal llvm
-# we do not allow multiple llvm versions in dev-lang/rust for
-# neither system nor bundled, so we just hardcode it here.
-SLOT="0/llvm-17"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="profiler rustfmt"
-
-BDEPEND=""
-RDEPEND="|| (
-	~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}]
-	~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}]
-)"
diff --git a/virtual/rust/rust-1.78.0.ebuild b/virtual/rust/rust-1.78.0.ebuild
deleted file mode 100644
index 89d91522025f..000000000000
--- a/virtual/rust/rust-1.78.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
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-
-# adjust when rust upstream bumps internal llvm
-# we do not allow multiple llvm versions in dev-lang/rust for
-# neither system nor bundled, so we just hardcode it here.
-SLOT="0/llvm-18"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="rustfmt profiler"
-
-BDEPEND=""
-RDEPEND="|| (
-	~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}]
-	~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}]
-)"
diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index 9f73b79b736e..9f3fa2522b50 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1,3 +1,4 @@
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
-DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75
+DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
 DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
+DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
diff --git a/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild b/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
new file mode 100644
index 000000000000..77c9bfd5119b
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_WARN_UNUSED_CLI=no
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake webapp
+
+MY_PV=${PV/_/-}
+MY_PN="bareos"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	S=${WORKDIR}/${PF}/webui
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+else
+	S=${WORKDIR}/${MY_PN}-Release-${PV}/webui
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/Release/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+LICENSE="AGPL-3"
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-lang/php[bzip2,ctype,curl,fileinfo,filter,fpm,gd,iconv,intl,mhash,nls,pdo,postgres,session,simplexml,ssl,xml,xmlreader,xmlwriter,zip]
+	virtual/httpd-php
+"
+
+need_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# fix missing VERSION
+	sed -i "s/@BAREOS_FULL_VERSION@/${PV}/g" version.php.in || die
+
+	cmake_src_prepare
+	default
+}
+
+src_configure() {
+	if [[ ${PV} == 9999 ]]; then
+		pushd "${WORKDIR}/${PF}"
+	else
+		pushd "${S}"/..
+	fi
+	CURRENT_VERSION=$(echo $(cmake -P get_version.cmake) | sed 's/[- ]//g')
+	popd
+	local mycmakeargs=(
+		-DVERSION_STRING=${CURRENT_VERSION}
+		-Wno-dev
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README.md doc/README-TRANSLATION.md
+
+	dodir /etc/bareos/bareos-dir.d
+	cp -r install/bareos/bareos-dir.d/* "${D}"/etc/bareos/bareos-dir.d
+
+	webapp_server_configfile nginx "${FILESDIR}"/nginx.include
+	webapp_server_configfile apache "${FILESDIR}"/apache.conf
+
+	insinto /etc/"${PN}"
+	doins install/{configuration,directors}.ini
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/application.config.php
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/autoload/global.php
+
+	keepdir "${MY_HTDOCSDIR#${EPREFIX}}"/data
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/data
+
+	# cleanup
+	find  "${D}/${MY_HTDOCSDIR#${EPREFIX}}" -name "*.in" -delete
+	rm -rf "${D}/${MY_HTDOCSDIR#${EPREFIX}}"/{CMakeLists.txt,install,cmake,phpunit.xml,scripts,doc,tests}
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "The webui uses 'webapp-config' to be installed to the webservers docroot"
+	einfo "E.g. to install webapp-config may be called like so:"
+	einfo ""
+	einfo "  ~# webapp-config -h localhost -d bareos-webui -I bareos-webui ${PV}"
+	einfo ""
+	einfo "See 'man webapp-config' for details."
+	einfo ""
+}
diff --git a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
deleted file mode 100644
index 1891ba820469..000000000000
--- a/www-apps/bareos-webui/bareos-webui-23.0.1.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
-
-CMAKE_WARN_UNUSED_CLI=no
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake webapp
-
-MY_PV=${PV/_/-}
-MY_PN="bareos"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	S=${WORKDIR}/${PF}/webui
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-else
-	S=${WORKDIR}/${MY_PN}-Release-${PV}/webui
-	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/Release/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-lang/php[bzip2,ctype,curl,fileinfo,filter,fpm,gd,iconv,intl,mhash,nls,pdo,postgres,session,simplexml,ssl,xml,xmlreader,xmlwriter,zip]
-	virtual/httpd-php
-"
-
-need_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	# fix missing VERSION
-	sed -i "s/@BAREOS_FULL_VERSION@/${PV}/g" version.php.in || die
-
-	cmake_src_prepare
-	default
-}
-
-src_configure() {
-	if [[ ${PV} == 9999 ]]; then
-		pushd "${WORKDIR}/${PF}"
-	else
-		pushd "${S}"/..
-	fi
-	CURRENT_VERSION=$(echo $(cmake -P get_version.cmake) | sed 's/[- ]//g')
-	popd
-	local mycmakeargs=(
-		-DVERSION_STRING=${CURRENT_VERSION}
-		-Wno-dev
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README.md doc/README-TRANSLATION.md
-
-	dodir /etc/bareos/bareos-dir.d
-	cp -r install/bareos/bareos-dir.d/* "${D}"/etc/bareos/bareos-dir.d
-
-	webapp_server_configfile nginx "${FILESDIR}"/nginx.include
-	webapp_server_configfile apache "${FILESDIR}"/apache.conf
-
-	insinto /etc/"${PN}"
-	doins install/{configuration,directors}.ini
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/application.config.php
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/autoload/global.php
-
-	keepdir "${MY_HTDOCSDIR#${EPREFIX}}"/data
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/data
-
-	# cleanup
-	find  "${D}/${MY_HTDOCSDIR#${EPREFIX}}" -name "*.in" -delete
-	rm -rf "${D}/${MY_HTDOCSDIR#${EPREFIX}}"/{CMakeLists.txt,install,cmake,phpunit.xml,scripts,doc,tests}
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "The webui uses 'webapp-config' to be installed to the webservers docroot"
-	einfo "E.g. to install webapp-config may be called like so:"
-	einfo ""
-	einfo "  ~# webapp-config -h localhost -d bareos-webui -I bareos-webui ${PV}"
-	einfo ""
-	einfo "See 'man webapp-config' for details."
-	einfo ""
-}
diff --git a/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
new file mode 100644
index 000000000000..77c9bfd5119b
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_WARN_UNUSED_CLI=no
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake webapp
+
+MY_PV=${PV/_/-}
+MY_PN="bareos"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	S=${WORKDIR}/${PF}/webui
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+else
+	S=${WORKDIR}/${MY_PN}-Release-${PV}/webui
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/Release/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+LICENSE="AGPL-3"
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-lang/php[bzip2,ctype,curl,fileinfo,filter,fpm,gd,iconv,intl,mhash,nls,pdo,postgres,session,simplexml,ssl,xml,xmlreader,xmlwriter,zip]
+	virtual/httpd-php
+"
+
+need_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	# fix missing VERSION
+	sed -i "s/@BAREOS_FULL_VERSION@/${PV}/g" version.php.in || die
+
+	cmake_src_prepare
+	default
+}
+
+src_configure() {
+	if [[ ${PV} == 9999 ]]; then
+		pushd "${WORKDIR}/${PF}"
+	else
+		pushd "${S}"/..
+	fi
+	CURRENT_VERSION=$(echo $(cmake -P get_version.cmake) | sed 's/[- ]//g')
+	popd
+	local mycmakeargs=(
+		-DVERSION_STRING=${CURRENT_VERSION}
+		-Wno-dev
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README.md doc/README-TRANSLATION.md
+
+	dodir /etc/bareos/bareos-dir.d
+	cp -r install/bareos/bareos-dir.d/* "${D}"/etc/bareos/bareos-dir.d
+
+	webapp_server_configfile nginx "${FILESDIR}"/nginx.include
+	webapp_server_configfile apache "${FILESDIR}"/apache.conf
+
+	insinto /etc/"${PN}"
+	doins install/{configuration,directors}.ini
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/application.config.php
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/autoload/global.php
+
+	keepdir "${MY_HTDOCSDIR#${EPREFIX}}"/data
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/data
+
+	# cleanup
+	find  "${D}/${MY_HTDOCSDIR#${EPREFIX}}" -name "*.in" -delete
+	rm -rf "${D}/${MY_HTDOCSDIR#${EPREFIX}}"/{CMakeLists.txt,install,cmake,phpunit.xml,scripts,doc,tests}
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "The webui uses 'webapp-config' to be installed to the webservers docroot"
+	einfo "E.g. to install webapp-config may be called like so:"
+	einfo ""
+	einfo "  ~# webapp-config -h localhost -d bareos-webui -I bareos-webui ${PV}"
+	einfo ""
+	einfo "See 'man webapp-config' for details."
+	einfo ""
+}
diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index 1891ba820469..77c9bfd5119b 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -25,9 +25,8 @@ fi
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
 LICENSE="AGPL-3"
+RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 23e9a2c6076f..8e5320ed0eed 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1 +1 @@
-DIST chromedriver-bin-127.0.6533.119.linux64.zip 9330902 BLAKE2B 331e4c3cceacdf6ccebabe2cbb6c8b0e4636acbf4c12e8afcc2706de1a0b407972c3f20bb6f5989900132340748146d6421da6b5d924f8887998c5e6d25aadfd SHA512 3cdffdfeeb46564adab48dcf9e6e06bf3f6ca073045e9c04ad518e3396b2aaea245c92c06f1f7ee38102ad40b42fa6d2f852846b5b897c5f70058586715ded17
+DIST chromedriver-bin-128.0.6613.137.linux64.zip 9370775 BLAKE2B 6eb29297cc954ea4485544d45fc29f130df20c3b425ca28f8b350982ada558ca91d03338e2e9acbb2c26bd87b8918caf098ef0ce3bc6c8ba57c60465028cd81a SHA512 d5216d45a618f263c67177831db389375bfa37ab9b701486365f4f8e93a0b4e79e3597fe0fb06897831701036777fa7339b4afe8acfc49362212d51fe5da2471
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-127.0.6533.119.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-128.0.6613.137.ebuild
index ff9ba50fc766..ff9ba50fc766 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-127.0.6533.119.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-128.0.6613.137.ebuild
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index d8f9e704ea1a..0deb28256097 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1 @@
-DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
-DIST dokuwiki-2024-02-06a.tgz 4201385 BLAKE2B 3e4541f7e13e400e791af57a3caf7274b5ec7f4608396f7ff91c60f2991f7aea0db2b142a7425d1057a9fb2297200b8b85cbe55af592105927f333dfa228ba44 SHA512 280e450f47237f834256a3a6cd81efe74c82b24b06033d09485bba640d4fd5de72d4fa62129323a6a5f37796357cbe8d3dd1f31b658ca85819e4c9fc47665e2c
+DIST dokuwiki-2024-02-06b.tgz 4206676 BLAKE2B d9d01723f0dca747fb5d7c99057c22af916879be05f3d7048af37d51552efeae328231dabd321c03ab7dd09474157372ec95846c5d80f9eb111ce3eb67210c42 SHA512 6edaa8baaf5f1c090476e98fff94f14ef71ea1293c8f7e329cee62dacab6e5f49e7fb016e238c96f0e770927c69e7800d98cce2f2a52aa3d1fefd4c869f1bb4a
diff --git a/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild
deleted file mode 100644
index 9de0b60bb660..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20230404a-r1.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
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-if [[ ${PV} == *rc* ]]; then
-	MY_PV="${MY_BASE_PV}${PV:8:4}"
-	MY_P="${PN}-rc-${MY_BASE_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-rc.tgz -> ${PN}-${PV}.tgz"
-else
-	MY_PV="${MY_BASE_PV}${PV:8:4}"
-	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
-HOMEPAGE="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-8.0[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-src_prepare() {
-	# create initial changes file
-	touch data/changes.log
-
-	default
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README
-	rm -f README COPYING
-
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Copy custom .htaccess that works with both apache 2.2 and 2.4
-	for dir in "conf" "data" "inc" "inc/lang"; do
-		insinto "${MY_HTDOCSDIR}/${dir}"
-		newins "${FILESDIR}/htaccess" ".htaccess"
-	done
-
-	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
-	insinto "${MY_HTDOCSDIR}/"
-	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
-
-	for x in $(find data/ -not -name '.htaccess'); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-	webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-	for x in $(find conf/ -not -name 'msg'); do
-		webapp_configfile "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20240206a.ebuild b/www-apps/dokuwiki/dokuwiki-20240206b.ebuild
index 80ace2977efa..80ace2977efa 100644
--- a/www-apps/dokuwiki/dokuwiki-20240206a.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20240206b.ebuild
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 44cac977145e..02b51e1cb9b8 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,2 +1,3 @@
 DIST gitea-1.21.11.tar.gz 54029294 BLAKE2B 93fb0ea4118baefeb36283b7168759d318fede528b56a9167961763267181bb283bf9849ce5f57a9950b16047f3b98998b4cd0e92443a23aef4cf15589cc8628 SHA512 ba35d1710bc03ff05bf2490e233bf3b4bd9e002113885b4d2a3193288773c16ad0f2426d4ed64d26b7c49112a02838e67da32167f51c4c08fa4f23738bd78285
 DIST gitea-1.22.1.tar.gz 54686177 BLAKE2B 78f25cb6cc024b05f9a51eb9692b2eab97b20d28aad7ed56894b31a5e9ea3ed1be00e1ba75abb75b36cbdfc740507321ff036927bb842ade7cc43c90befe027b SHA512 318513a2aaae8d99358a26d44ab51c7a002b74fb11dbd7f9dfdccdd25f707572b075099e59bc3764564e1219069a1f9e6b56c71474ef494531c73e358d76ac6e
+DIST gitea-1.22.2.tar.gz 54444512 BLAKE2B 3e7208bf5b0273cc5394d2ceb680a28562a33ac0fea0411aac73a2d9815dab44c4fa4e76e253bbeb2862064dbd37bf04bc9b9aa85dd75be8b65ffaec0b82420a SHA512 64a84cc116877fffbf10f3f670884898221e3ae0ccc4dcfa0e661f9c0ec19ca415bd6815fde729b49eaf9653665170d6de5fe8a4ba62e85006c8c45f591bd586
diff --git a/www-apps/gitea/gitea-1.22.2.ebuild b/www-apps/gitea/gitea-1.22.2.ebuild
new file mode 100644
index 000000000000..dd49814314cb
--- /dev/null
+++ b/www-apps/gitea/gitea-1.22.2.ebuild
@@ -0,0 +1,150 @@
+# 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/hugo/Manifest b/www-apps/hugo/Manifest
index c3399670bb76..a65d300adc62 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,8 +1,6 @@
-DIST hugo-0.124.1-vendor.tar.xz 6740828 BLAKE2B e34cb50eeb22da5f50c8ba7e1318d0f080e6df36f2f1a80e1567d4ccfdd30e4e2ad2153a87c7a18a1d2d6f1e746b5b6c1008d33e41e1900a7e94a42618c5e526 SHA512 2f59a7f2ab199bac5ebf69139b7cc6dd14dc07eab9be39fc39ee5fa41d3332000082407612528d8215a4ebc3a908f28816b19672a28b00bcbad275bea0a9ad35
-DIST hugo-0.124.1.tar.gz 21052060 BLAKE2B 41bd17c3aaf1f137de41957dea049b3d7cdaf101d5bfa128e9412b5ea4eee54a0d30481c059b6982c1b803bbe6634643debf1022079320e653dbb37002f7ea35 SHA512 29f51a08f9e757a716c2f7845efc08b1ca3b0bf8e70fd06491735a123ca7da8e169116fa003c147be08d2d5f9752473e9a569085728ec0a9ed7850bd57ba8f93
 DIST hugo-0.127.0-vendor.tar.xz 6747376 BLAKE2B 28569618b1398effe5eeafe72b43576986a9680371100812b546c5c62936754ebc4ecda2c8fea77ec93761b5e3746509b065bd6e1000815135be31a8ba8077c8 SHA512 f88d7a98d2d012e48beb239941a0a485b3ac761b055c7e76b5823550275e19b4ced6977765a7cc34342c5e9113f208793f483794afefa9689c76b3b4dedca94f
 DIST hugo-0.127.0.tar.gz 21132608 BLAKE2B 6fa8ae09d325292715d94f28e13d3bce8efcecc5e729da3644a054857aa3e11893068bd25524857e7dde6bab92efc9acb5b0de823c8a6246b9f5e83b07c4e279 SHA512 829d118f12f153794ed882572a37ec2a3b3ade9c8160a754d3d411d6aede22c15e44dd75a52443e3cc7fc8ea1f65febecac5a47b4e09cc42006d7badd1a0fa2f
-DIST hugo-0.128.2-vendor.tar.xz 6698936 BLAKE2B 28762e61a7e7452545889f31a751dea236f90c352bc63ac0b33a1e8cf0c7d9091d5ccc7cefc2b47f37db7a10f44636d4fbda02af3ca7be2e9cba64b564b85b87 SHA512 7576830db0a9058117ab5ba0c7269d5d75114695183882af5184a79088235a22aad3691e114892f179e107bf06048c6d302019fb0bb85d492715922a772b2224
-DIST hugo-0.128.2.tar.gz 20239793 BLAKE2B 47d75606053e44a0f863dbb88050ff5323e33c1306a47baff237db7fa41dce0559960785105ad8643dcef1eeb149054b5536da168ff978ac0b5c3c5398379b6f SHA512 4710fceb11872577a1d9c929d296dc79829135af0c509ac0b7b8142568b0e907c2de28c9f482cc1138d9595086363397166eb2ca208fa4fdf1beadd168558787
 DIST hugo-0.129.0-vendor.tar.xz 6766128 BLAKE2B 31f723bdefd45a8e595c09b2d579ff68e2d3dc2e48c276a7963348c0d791c443b1a7e09c15a6aec955dca4928e695516c3777c6550230f455bb7f9c7ac3b6483 SHA512 97044f53cab10484731fc42aabcb63484759f00e80e29237d9819af49c6ab5fefeddde37fc971f9c47c9f24e607c0691cfb8a564e6de7f5a017b0ef93e8c7d89
 DIST hugo-0.129.0.tar.gz 20241492 BLAKE2B aaa6ced77b936a34e0ebe24f2a2c51cd992464cbfd93b33682f0b0c501e6809d5c13960c1bec82611ebd043631bb2e2bae13348475641e8b7736b4980a3b3a1f SHA512 0845f417af97ee068ad0c971684522fa49fcfca47de5db71f0026fd3c59baddcc03c73560275ff91e4c85286cf855a2b3b0271ee019141d71e04f6b31a91ae87
+DIST hugo-0.131.0-vendor.tar.xz 6925652 BLAKE2B 352cf39d95cf30ab502d91a816b151e2e94e1b57e59e6b3171caf83908dbc8726e03413fdf89a6fa7a360ee8b6ee0a3122f9f1fff2143985e1d33693ee3de114 SHA512 e1265f15e19f531360d447f9fc77da5dc894a3fd1d289df41bfbcfcc740b10e43ce1c872c69d0dfcf32cdff5c5a5edf34df64f107e6c20869eec3bf1668bdea1
+DIST hugo-0.131.0.tar.gz 20323531 BLAKE2B b88be13c6d1008a777114e5c0f42dac0277f37ba36ea601903f9a6e63b06fad3d847950aada082ad32dea544df54f1ad90c2ecbddebbcd70e73a74c416aebaf9 SHA512 53bb387bde6c6e92568036d06db1dfeaa9f897806f7f51cb4b9c3fd93026a41410ea61598370da79abb5df20e81b18616e3ec49e7cec1bb1e470d5035b594ef6
diff --git a/www-apps/hugo/hugo-0.124.1.ebuild b/www-apps/hugo/hugo-0.124.1.ebuild
deleted file mode 100644
index 2f23d67149ac..000000000000
--- a/www-apps/hugo/hugo-0.124.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module shell-completion
-
-DESCRIPTION="Fast static HTML and CSS website generator"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-SRC_URI="
-	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
-"
-
-# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="doc +extended test"
-
-BDEPEND="
-	>=dev-lang/go-1.22.1
-	test? (
-		dev-python/docutils
-		dev-ruby/asciidoctor
-		virtual/pandoc
-	)
-"
-RDEPEND="
-	extended? (
-		dev-libs/libsass:=
-		>=media-libs/libwebp-1.3.2:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch
-	"${FILESDIR}"/${PN}-0.123.0-skip-some-tests.patch
-)
-
-src_configure() {
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export MY_BUILD_FLAGS="$(usev extended "-tags extended")"
-
-	default
-}
-
-src_prepare() {
-	# wants to run command that require network access
-	rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u,_npm{,_withexisting}}.txt || die
-
-	default
-}
-
-src_compile() {
-	mkdir -pv bin || die
-	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
-		${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
-
-	bin/hugo gen man --dir man || die
-
-	mkdir -pv completions || die
-	bin/hugo completion bash > completions/hugo || die
-	bin/hugo completion fish > completions/hugo.fish || die
-	bin/hugo completion zsh > completions/_hugo || die
-
-	if use doc ; then
-		bin/hugo gen doc --dir doc || die
-	fi
-}
-
-src_test() {
-	ego test "./..." ${MY_BUILD_FLAGS}
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-
-	dobashcomp completions/${PN}
-	dofishcomp completions/${PN}.fish
-	dozshcomp completions/_${PN}
-
-	if use doc ; then
-		dodoc -r doc/*
-	fi
-}
-
-pkg_postinst() {
-	elog "the sass USE-flag was renamed to extended. the functionality is the" \
-		"same, except it also toggles the dependency on libwebp (for encoding)"
-}
diff --git a/www-apps/hugo/hugo-0.128.2.ebuild b/www-apps/hugo/hugo-0.128.2.ebuild
deleted file mode 100644
index 919bb3ccc8f6..000000000000
--- a/www-apps/hugo/hugo-0.128.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs go-module shell-completion
-
-DESCRIPTION="Fast static HTML and CSS website generator"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-SRC_URI="
-	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
-"
-
-# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="doc +extended test"
-
-BDEPEND="
-	>=dev-lang/go-1.22.2
-	test? (
-		dev-python/docutils
-		dev-ruby/asciidoctor
-	)
-"
-RDEPEND="
-	extended? (
-		dev-libs/libsass:=
-		>=media-libs/libwebp-1.3.2:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch
-	"${FILESDIR}"/${PN}-0.128.0-skip-some-tests.patch
-)
-
-_check_reqs() {
-	if [[ ${MERGE_TYPE} = binary ]] ; then
-		return 0
-	fi
-
-	if has test ${FEATURES}; then
-		CHECKREQS_DISK_BUILD="4G"
-	else
-		CHECKREQS_DISK_BUILD="1500M"
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	_check_reqs
-}
-
-pkg_setup() {
-	_check_reqs
-}
-
-src_configure() {
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export MY_BUILD_FLAGS="$(usev extended "-tags extended")"
-
-	default
-}
-
-src_prepare() {
-	# wants to run command that require network access
-	rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u,_npm{,_withexisting}}.txt || die
-
-	default
-}
-
-src_compile() {
-	mkdir -pv bin || die
-	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
-		${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
-
-	bin/hugo gen man --dir man || die
-
-	mkdir -pv completions || die
-	bin/hugo completion bash > completions/hugo || die
-	bin/hugo completion fish > completions/hugo.fish || die
-	bin/hugo completion zsh > completions/_hugo || die
-
-	if use doc ; then
-		bin/hugo gen doc --dir doc || die
-	fi
-}
-
-src_test() {
-	if ! has_version -b virtual/pandoc ; then
-		elog "You're missing virtual/pandoc - some tests will be skipped."
-	fi
-
-	ego test "./..." ${MY_BUILD_FLAGS}
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-
-	dobashcomp completions/${PN}
-	dofishcomp completions/${PN}.fish
-	dozshcomp completions/_${PN}
-
-	if use doc ; then
-		dodoc -r doc/*
-	fi
-}
-
-pkg_postinst() {
-	elog "the sass USE-flag was renamed to extended. the functionality is the" \
-		"same, except it also toggles the dependency on libwebp (for encoding)"
-}
diff --git a/www-apps/hugo/hugo-0.131.0.ebuild b/www-apps/hugo/hugo-0.131.0.ebuild
new file mode 100644
index 000000000000..e9550f242204
--- /dev/null
+++ b/www-apps/hugo/hugo-0.131.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs go-module shell-completion
+
+DESCRIPTION="Fast static HTML and CSS website generator"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+SRC_URI="
+	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
+"
+
+# NOTE: To create the vendor tarball, run:
+# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="doc +extended test"
+
+BDEPEND="
+	>=dev-lang/go-1.22.2
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+	)
+"
+RDEPEND="
+	extended? (
+		dev-libs/libsass:=
+		>=media-libs/libwebp-1.3.2:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.128.0-skip-some-tests.patch
+)
+
+_check_reqs() {
+	if [[ ${MERGE_TYPE} == binary ]] ; then
+		return 0
+	fi
+
+	if has test ${FEATURES}; then
+		CHECKREQS_DISK_BUILD="4G"
+	else
+		CHECKREQS_DISK_BUILD="1500M"
+	fi
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	_check_reqs
+}
+
+pkg_setup() {
+	_check_reqs
+}
+
+src_configure() {
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export MY_BUILD_FLAGS="$(usev extended "-tags extended")"
+
+	default
+}
+
+src_prepare() {
+	# wants to run command that require network access
+	rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u,_npm{,_withexisting}}.txt || die
+
+	default
+}
+
+src_compile() {
+	mkdir -pv bin || die
+	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
+		${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
+
+	bin/hugo gen man --dir man || die
+
+	mkdir -pv completions || die
+	bin/hugo completion bash > completions/hugo || die
+	bin/hugo completion fish > completions/hugo.fish || die
+	bin/hugo completion zsh > completions/_hugo || die
+
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_test() {
+	if ! has_version -b virtual/pandoc ; then
+		elog "You're missing virtual/pandoc - some tests will be skipped."
+	fi
+
+	ego test "./..." ${MY_BUILD_FLAGS}
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+
+	dobashcomp completions/${PN}
+	dofishcomp completions/${PN}.fish
+	dozshcomp completions/_${PN}
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
+
+pkg_postinst() {
+	elog "the sass USE-flag was renamed to extended. the functionality is the" \
+		"same, except it also toggles the dependency on libwebp (for encoding)"
+}
diff --git a/www-apps/jellyfin-bin/Manifest b/www-apps/jellyfin-bin/Manifest
index 0960e08202e5..f00bf52c13fb 100644
--- a/www-apps/jellyfin-bin/Manifest
+++ b/www-apps/jellyfin-bin/Manifest
@@ -1,3 +1,11 @@
+DIST jellyfin_10.9.10-amd64-musl.tar.xz 80657200 BLAKE2B 2c270b2db4fb83e02ea9f90614bcb8448fd03cdf3bd757f2b1e567cdf4dea868963449d02492e0475d1d48b6070d45f96de4e939b174d8a7c165acdaa7d2147f SHA512 918f193fd99b2347a9bbf177c48f2ded2bfed56cfd080552ec739ee1a31f36920735e7b5c7ee1dc2ea68d02dee6581d04f2df8ef1c04f0a1aaeeb237d30e485d
+DIST jellyfin_10.9.10-amd64.tar.xz 79810956 BLAKE2B f88a4c4c4003ac8aed66591799ef9dbe6ca6a0d9f0c7dd96ead69a24810ab7d79cf5c713ecd0e3d5b1064bb3263a3fec1e5ee04cd9116bf143f6c5ce2313d0b8 SHA512 ec51238474fc1a89aeace5824180994e40d0d119c00292c534a16b84d799fa1a6cf004c887db53234706d9f024e8e335614d2a4c7821c1e28bdc41ac5971c43a
+DIST jellyfin_10.9.10-arm64-musl.tar.xz 76248804 BLAKE2B fde9298a1ef47deb9c1f9b38ecd0b58f9607b190e1e70e433a73ee6ab134b2f8371ddf943b75c6f1c751316a5958bed593fcd48dc6bb28ce61ba6d4c1365f2b3 SHA512 7f7a1e0ac5d544552d2b21df8e8ff6f52ca6d42393aee1fe69a85d4a8e1f060f6a5c8b05d696a835fd8eda5738b524e7cd5c48bee7d3d1e77a65f9e6989035cc
+DIST jellyfin_10.9.10-arm64.tar.xz 76193240 BLAKE2B a754b69c2e4e21abf793efaae804c3a67c8509d962ca44e17f9030788215272e813bf14a35194b9531119f86a7961388484f43fb44697ef774af083896de66ed SHA512 63276385c20bd7858632903dcf2a762977a6877f6b4de8da578476e22bdfb833aba5561e08e7d2ce4d3aaa6d176348fbc622cb2a924153700df7120d48ebe522
+DIST jellyfin_10.9.11-amd64-musl.tar.xz 80730332 BLAKE2B fcc7841b0f290aa6fc7da3c6ac3926d6b37e82ffac9b40b68df5ba836df152ad230919767a997da676b128e3fcd78068672a6d3a4209b00f02106898b4ed54cb SHA512 69ee434021c6bf2eab2fe5043599764cd5dbcef391f28db9eba81f88acb8dcb40c6a1501de2234644fe25f74f392fae3f125788a4322d7928eb26c9374c57834
+DIST jellyfin_10.9.11-amd64.tar.xz 79875832 BLAKE2B fb6a5ad544e7f78de4481e8311958d863c4dc17b08de8fe1c22125737861da3f2d8f00d4c6bacdf68c8d26b6d364f3f75a0986b3d59add1afe49bdc2c72e83fd SHA512 ff4fb32e455a97d8baa30d008dbbc1a832e95f949f4d46418c70231c0580f19fa0dd75c691de7e5b100e26d878b55554847bbdbaf175c9b26b9e8dc163e89353
+DIST jellyfin_10.9.11-arm64-musl.tar.xz 76284672 BLAKE2B 7f7f2e5f049ab7ea82a141d4241e4c69b36360e19bcd3d22bdc27f9107c0de19ed76aa885dec8c0815b92005bd31670027deb5e4168f567d8bc6a12609811e33 SHA512 91161df9717aad7115dadb52dd25dc894ccfc2979320d01ed75627b6e9f51ff3dcfe75d0ed2801f69658d1c28b480dc403cc87e5994bec34918d8a77d54ad5fb
+DIST jellyfin_10.9.11-arm64.tar.xz 76240404 BLAKE2B 8fcfd0fcc402e20f706419c923d15dfca97918a4376e94c22a72239bf2448a84941cc0771eaf26f5b6adecd00d16b8bfe10ba6012e443c39bc9996ba29f64a02 SHA512 485b38f23963b5b398c4738000a5d7f3c0734dce521bfa5c1f890536a80204da5a2cafecaabee41e03ed90fba0994f01064827a9fdc5f2fade60ae9fe3acfe95
 DIST jellyfin_10.9.9-amd64-musl.tar.xz 80954312 BLAKE2B b0a0b37cc0fba2861117069e43674f2773dddbb85866bfaec580f4faed46693353b6ac257d4522e5ec293212c97e47d87b899a42dc135dbb423d0ffa133d76a0 SHA512 a0eea98192d0d908e59e8bc4dde971a6b522408a587bfa9be42dea49ac9fbb951d557f026935ee3bd94acd546a32ff5442c9a42da3d163030d23d2b9af611b8c
 DIST jellyfin_10.9.9-amd64.tar.xz 80116728 BLAKE2B 6be2865d493a33349dbaadac76350d895e079b18c4b1e3e8ecd899d022c01b4017db20a5208a4076ac796473034e497e46fbc6425c7de4e18dcfce0ef300e9a2 SHA512 894fce67446ae68a17f3998609eec6c2fbfe9a22537965ec4b9723a1429ace2df26f694f023402bd2923db07e3f245e9d7ec4b64d7a0252a31e34903077de854
 DIST jellyfin_10.9.9-arm64-musl.tar.xz 76496208 BLAKE2B 35c221fc5508568d0a23b61f74ffa7006d270e5a1e7070e70102fb26c776e9edfd58ff9dbd43bf7a50a03de02f100f77f9ef9373a2f1192e55423c01d14abea8 SHA512 15efd0c34902ddd728f79050cd2a1f51acad4305be229a51639aa02b80d2483b5e28070357939b4bb0c508cce21ed101f5b8680fdcf1e237fc51f8bdbd1b4083
diff --git a/www-apps/jellyfin-bin/jellyfin-bin-10.9.10.ebuild b/www-apps/jellyfin-bin/jellyfin-bin-10.9.10.ebuild
new file mode 100644
index 000000000000..3392e3209a21
--- /dev/null
+++ b/www-apps/jellyfin-bin/jellyfin-bin-10.9.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils systemd tmpfiles
+
+DESCRIPTION="Jellyfin puts you in control of managing and streaming your media"
+HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/
+	https://github.com/jellyfin/jellyfin/"
+
+SRC_URI="
+	arm64? (
+		elibc_glibc? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/arm64/jellyfin_${PV}-arm64.tar.xz
+		)
+		elibc_musl? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/arm64-musl/jellyfin_${PV}-arm64-musl.tar.xz
+		)
+	)
+	amd64? (
+		elibc_glibc? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/amd64/jellyfin_${PV}-amd64.tar.xz
+		)
+		elibc_musl? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/amd64-musl/jellyfin_${PV}-amd64-musl.tar.xz
+		)
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+RESTRICT="mirror test"
+
+DEPEND="acct-user/jellyfin
+	media-libs/fontconfig
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-libs/icu
+	media-video/ffmpeg[vpx,x264]"
+BDEPEND="acct-user/jellyfin"
+
+INST_DIR="/opt/jellyfin"
+QA_PREBUILT="${INST_DIR#/}/*.so ${INST_DIR#/}/jellyfin ${INST_DIR#/}/createdump"
+
+src_unpack() {
+	unpack ${A}
+	mv jellyfin ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/jellyfin/jellyfin/issues/7471
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	keepdir /var/log/jellyfin
+	fowners jellyfin:jellyfin /var/log/jellyfin
+	keepdir /etc/jellyfin
+	fowners jellyfin:jellyfin /etc/jellyfin
+	insinto ${INST_DIR}
+	dodir ${INST_DIR}
+	doins -r "${S}"/*
+	newtmpfiles - jellyfin.conf <<<"d /var/cache/jellyfin 0775 jellyfin jellyfin -"
+	chmod 755 "${D}${INST_DIR}/jellyfin"
+	newinitd "${FILESDIR}/jellyfin.init-r1" "jellyfin"
+	newconfd "${FILESDIR}"/jellyfin.confd "jellyfin"
+	systemd_dounit "${FILESDIR}/jellyfin.service"
+	pax-mark -m "${ED}${INST_DIR}/jellyfin"
+}
+
+pkg_postinst() {
+	tmpfiles_process jellyfin.conf
+}
diff --git a/www-apps/jellyfin-bin/jellyfin-bin-10.9.11.ebuild b/www-apps/jellyfin-bin/jellyfin-bin-10.9.11.ebuild
new file mode 100644
index 000000000000..3392e3209a21
--- /dev/null
+++ b/www-apps/jellyfin-bin/jellyfin-bin-10.9.11.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils systemd tmpfiles
+
+DESCRIPTION="Jellyfin puts you in control of managing and streaming your media"
+HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/
+	https://github.com/jellyfin/jellyfin/"
+
+SRC_URI="
+	arm64? (
+		elibc_glibc? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/arm64/jellyfin_${PV}-arm64.tar.xz
+		)
+		elibc_musl? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/arm64-musl/jellyfin_${PV}-arm64-musl.tar.xz
+		)
+	)
+	amd64? (
+		elibc_glibc? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/amd64/jellyfin_${PV}-amd64.tar.xz
+		)
+		elibc_musl? (
+			https://repo.jellyfin.org/files/server/linux/stable/v${PV}/amd64-musl/jellyfin_${PV}-amd64-musl.tar.xz
+		)
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+RESTRICT="mirror test"
+
+DEPEND="acct-user/jellyfin
+	media-libs/fontconfig
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-libs/icu
+	media-video/ffmpeg[vpx,x264]"
+BDEPEND="acct-user/jellyfin"
+
+INST_DIR="/opt/jellyfin"
+QA_PREBUILT="${INST_DIR#/}/*.so ${INST_DIR#/}/jellyfin ${INST_DIR#/}/createdump"
+
+src_unpack() {
+	unpack ${A}
+	mv jellyfin ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/jellyfin/jellyfin/issues/7471
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	keepdir /var/log/jellyfin
+	fowners jellyfin:jellyfin /var/log/jellyfin
+	keepdir /etc/jellyfin
+	fowners jellyfin:jellyfin /etc/jellyfin
+	insinto ${INST_DIR}
+	dodir ${INST_DIR}
+	doins -r "${S}"/*
+	newtmpfiles - jellyfin.conf <<<"d /var/cache/jellyfin 0775 jellyfin jellyfin -"
+	chmod 755 "${D}${INST_DIR}/jellyfin"
+	newinitd "${FILESDIR}/jellyfin.init-r1" "jellyfin"
+	newconfd "${FILESDIR}"/jellyfin.confd "jellyfin"
+	systemd_dounit "${FILESDIR}/jellyfin.service"
+	pax-mark -m "${ED}${INST_DIR}/jellyfin"
+}
+
+pkg_postinst() {
+	tmpfiles_process jellyfin.conf
+}
diff --git a/www-apps/lidarr-bin/Manifest b/www-apps/lidarr-bin/Manifest
index 1ae3bbb96343..677a352ce904 100644
--- a/www-apps/lidarr-bin/Manifest
+++ b/www-apps/lidarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Lidarr.develop.2.5.1.4311.linux-core-arm.tar.gz 92006218 BLAKE2B e01e6abf78d6200bf7abe6dd6394518a681cfe6dcdd039bf99f03f3b531e43c99859fa9f83355524f60e7c41a36f8a096f75d365e616a59f84f20f78473971a5 SHA512 80e139844840263bf7c4473eef521c7e124c74d4a86015f9bf6a7006c6197c41f53f4c1d002e5eb42ff7097a284c232c41b6021e0250948b9463b7cf4c51a093
-DIST Lidarr.develop.2.5.1.4311.linux-core-arm64.tar.gz 91642122 BLAKE2B a330f0aebba79c5d1a5f443d01fec30c8ce6f7e8fb70ce033b529c2ca5d3d81fc3773eaec2adbd38367e4e2b0ade6f8d572d350ec83b735bc0731840959469e8 SHA512 5a6eb909c3c238d83fb2452053890d443bb356b36d6cbcebe271bb7470e4b7635f6358c9aeca2c937677c223fe088ae4cf8772bbef9bc1f9bbf345183ff0a9e7
-DIST Lidarr.develop.2.5.1.4311.linux-core-x64.tar.gz 98142944 BLAKE2B 69d05827f0fdc1cc523674a1a2e94e79a749f468b5dc36d90ad7af6c0c2bd2c8c91e7b236854c18f2fe2c698321ecd3174a25bca056d35c86ba5fd5c88bd3f38 SHA512 0b4097e5bdcafeebc22e64ed812c1f3a709c5589e1cd815c788154306c00a1b6aa1c48d3b2c1549910281e1a152b829415bb7ecc43d07a0796f5299b305d4b2d
-DIST Lidarr.develop.2.5.1.4311.linux-musl-core-arm.tar.gz 92064804 BLAKE2B cb098ba93099030f3ebb5a217d36d016bf3da30b7d9c3ebc5168e89529a2a78acae9a7a99da30817d25ef71f9c1c889987c8166ea742bf81a401ca377ecf556d SHA512 996a4793adfe4b65331882f26cce62c6660f46fd146bb1c70ac655c240b2b6cd0573a82fc84ec3fbf6300a9c670940d4a46cc86a0d28f21cc14d1212985a26b2
-DIST Lidarr.develop.2.5.1.4311.linux-musl-core-arm64.tar.gz 91700437 BLAKE2B 95e1a17a17349310f43f0c0f59f661d32fbfb1a6ba422f61e0911247003fcde6460a17b16b780536722fd51c35e24ae93fa773c90661dbae666513ded61ee7b2 SHA512 e7f37d26e9d01db5e45c15f727a460ae6886a4ba74d65c782ac423bf4b67456cc9bbce2b93251756886431fb5a253be0b29e68e063d8d0b8943e08d1212a8495
-DIST Lidarr.develop.2.5.1.4311.linux-musl-core-x64.tar.gz 97209423 BLAKE2B 97642feb132e3bd7c7a877558bc4b241cad666244da87e5353001899e127f13d08d105fd3b6af506f71eced62a477c6372f05c1f8f12f166e3af9600e7e16956 SHA512 d71163f201aa73958ff58b63d6d52abb2961e49bf7ca660b1f1634a4358608dd8b0bde4d9e1c1f8b9ccdd267722a166c4fbbb89f6c5be509884d7c4b865d66d9
+DIST Lidarr.master.2.5.3.4341.linux-core-arm.tar.gz 92068618 BLAKE2B 9933fadd84b16e690788587b3b29252ca19aa043e6abeb66975e5b41733a42c5321786c671c41e9091a2d627c2effe685d3d9732f091a4ddff1f48c426447c2d SHA512 b51f0ffa0544dfe470b2f9111ecf1d3ceac73f864a69375ac0d8633425e319eb926a305833bdaf67f8c55ac343d5507e1aadc08e3fbeb6eb80557de630c04311
+DIST Lidarr.master.2.5.3.4341.linux-core-arm64.tar.gz 91697877 BLAKE2B d824a8f1fb3126c2bc8e2ce49a40d83a343b9477730ba155c09371b83c92e14a476f1ed8c2e1ae97bf5c02ae24bdc9762267c6105b8689df160c70fef8f35d45 SHA512 20c401e3aec27487720bbd7a28851773842f24a43cb40bc01b8e1559834fd4093ac9ad9f18aa8bfcd614b4ff6811a30303bb63a7f4ace991de8efbaf70d5e912
+DIST Lidarr.master.2.5.3.4341.linux-core-x64.tar.gz 98200936 BLAKE2B c15eccdf5040fc309dc51a46214da69180833fc33d1dfddbe58e2f92e86f631132a68e23a003aceaa19109cec051adafb841c01334f9cb8d3c8b33ecd5b72e01 SHA512 d372d85ecef1098040984b74551e446e4444460bd57a57e5cdbc59e4d96383a4662b951c9738eff4b096fba1852a921f841366537796af7a70e497ed243bfdb1
+DIST Lidarr.master.2.5.3.4341.linux-musl-core-arm.tar.gz 92129772 BLAKE2B 6068fd4cbafcf4fea1a4b89052c6518dd7462daf31a39875417cd09b37fe54c8faf7a6cadc0276c09722d62df3a7e1c39fb56dd4627c755e66f1c385664e8c3a SHA512 494631d9cd34b31c44ec6866c58fc9e4a15fb645619ae3c77a0491b7562242e3da4dd022f3205afc806aa80bf7745c2810f7e0f7837a26ef91aa0ef53fcc7262
+DIST Lidarr.master.2.5.3.4341.linux-musl-core-arm64.tar.gz 91751413 BLAKE2B 51df6de74047e8dac5039deea606530601774d4177f8494163ea67fe9a9848eeda4afba6f840020be8073e7661206e7d0aff07e955d60417f911a9eba51595eb SHA512 2b9342abfd5e719324fba8e752436ca986e20ac09248aef7f0daa3fb2517d872548a0848ccc0c9e9f30f6b800e5d5fc3b6116d9bd89d2532ceed533ac5b2914a
+DIST Lidarr.master.2.5.3.4341.linux-musl-core-x64.tar.gz 97259958 BLAKE2B 4cdd943d30cfafd8bf8846837e18f7a19f1ab0f4f9592e049ab45588f0f87c413c6e6b407a424c6711fc1e04960c656dcf8f8552c08e5d9e7647420f096a642d SHA512 e51acc61d3e68d9cbc2a21698fe76d1313857b738749811255705c09bfbf54a0ac54e4f9e461eb23330aebe7ddeaebfb58afac69d3fdb3180abffc32c30f5b17
diff --git a/www-apps/lidarr-bin/lidarr-bin-2.5.1.4311.ebuild b/www-apps/lidarr-bin/lidarr-bin-2.5.1.4311.ebuild
deleted file mode 100644
index 2676b94f25ac..000000000000
--- a/www-apps/lidarr-bin/lidarr-bin-2.5.1.4311.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.5.3.4341.ebuild b/www-apps/lidarr-bin/lidarr-bin-2.5.3.4341.ebuild
new file mode 100644
index 000000000000..53ea4d2bc3f8
--- /dev/null
+++ b/www-apps/lidarr-bin/lidarr-bin-2.5.3.4341.ebuild
@@ -0,0 +1,78 @@
+# 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.master.${PV}.linux-core-x64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.master.${PV}.linux-musl-core-x64.tar.gz
+		)
+	)
+	arm? (
+		elibc_glibc? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.master.${PV}.linux-core-arm.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.master.${PV}.linux-musl-core-arm.tar.gz
+		)
+	)
+	arm64? (
+		elibc_glibc? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.master.${PV}.linux-core-arm64.tar.gz
+		)
+		elibc_musl? (
+			https://github.com/Lidarr/Lidarr/releases/download/v${PV}/Lidarr.master.${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/moodle/Manifest b/www-apps/moodle/Manifest
index 655f5eca7fd9..272c24b647af 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,3 +1,3 @@
-DIST moodle-4.2.9.tgz 65433450 BLAKE2B f463a5fbdf2a6b73a29f5e73ca020b06a18a86c0040688771c64deeaeee62095455e61378480a967b87cb4736e125f037ec4f9088ab838c9aa6ba7e9418c8260 SHA512 77c7d7d1b7290ca4a7ecd074d1dca089ee2ddb03d49b9513112d0429f35e15310fe75660aa40f597513f742ea9f7f36ef5daee489daadad0d055edea8ad5501f
-DIST moodle-4.3.6.tgz 66834202 BLAKE2B ebb7264492a33a9b64d559a42585dc65d4b892864a245524ce078e38142cc88007cd7cad8598b4bd501e2b884ca41cf95572da70baa6f6b0edb8df315f79b6cb SHA512 eca8294dedaab835f6ad08d39c852412dcb491e6209785f30d233a0161d60ce7f2399cccc01dd329371a2b654ceb715f2e0b584b9ef0a26009db0aff345fc287
-DIST moodle-4.4.2.tgz 71207253 BLAKE2B 7ea36d0c478e5d7f87d8e2f4fb6b77ef53c3c0fc7803c8e818a513e918dfc225072da04c647453dd356f1bf5b5711a6a187af6028df46e3ea4ed83a950fcd84b SHA512 b1a570bb8b01e665ed30b8182da28ac6245c199f0efeb335d8ae79ebc08be50fd7e35a8f3eb20e8a71c2aadd8cc88daf1e28fd9a564f560ff0794f9f96683a54
+DIST moodle-4.2.10.tgz 65431792 BLAKE2B a9691ed9b4edf63f3d9ab242b5478984d4cc9b05ca11596ae445cc5e10b35c4f7cb7ecff8ddd08270c0067383f7f78e2259d2391ec79b665c14e75952dc15123 SHA512 761e338b6bea02a67d62569c88385b5582903519eabfda080a6d834208cf40d7c13f24e7b4aa169b249eb7198b46732957bf557f0ea7b596586fa1e27844192f
+DIST moodle-4.3.7.tgz 66836284 BLAKE2B 15fdfb03d2f63f4d32a7c2cc5a322dec9ae2e19df8b4eb2d11bcd656f59840c00d61b34f957b567de1c2f64ff7cee810c30550fb5c59db4fc1e8e880e6037e2e SHA512 3681c46d4a4f5b4a8813b98c0b1f273ae2346d795bd283e98f23ddf6820c9b73fe2a7447e2c30a9bf0d3c850a63c630be019542f003bf43e83e0484a93329960
+DIST moodle-4.4.3.tgz 71209493 BLAKE2B 67c344ff87a8c13d5dddaacae8144d2611b7c3f934f41a812897ec4379e7de466317315ee0e759178eb85b8afe63ca41d90dc0e8b97697aa8343551d03e8a766 SHA512 13043807b61e0b9c35bb82eaa4324f27e6a7189f133382dbccffe043da944cf9f4031df1064394d29f0f9965ebddcf60138edba6c666de87c3acff00cda4567c
diff --git a/www-apps/moodle/moodle-4.2.9.ebuild b/www-apps/moodle/moodle-4.2.10.ebuild
index dc4f3bbcbc1f..dc4f3bbcbc1f 100644
--- a/www-apps/moodle/moodle-4.2.9.ebuild
+++ b/www-apps/moodle/moodle-4.2.10.ebuild
diff --git a/www-apps/moodle/moodle-4.3.6.ebuild b/www-apps/moodle/moodle-4.3.7.ebuild
index dc4f3bbcbc1f..dc4f3bbcbc1f 100644
--- a/www-apps/moodle/moodle-4.3.6.ebuild
+++ b/www-apps/moodle/moodle-4.3.7.ebuild
diff --git a/www-apps/moodle/moodle-4.4.2.ebuild b/www-apps/moodle/moodle-4.4.3.ebuild
index 266663e17ba6..266663e17ba6 100644
--- a/www-apps/moodle/moodle-4.4.2.ebuild
+++ b/www-apps/moodle/moodle-4.4.3.ebuild
diff --git a/www-apps/nextcloud-notify_push/Manifest b/www-apps/nextcloud-notify_push/Manifest
index 0935a0ca17ce..0c8e4c3408ee 100644
--- a/www-apps/nextcloud-notify_push/Manifest
+++ b/www-apps/nextcloud-notify_push/Manifest
@@ -1,4 +1,4 @@
-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 ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
 DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69
@@ -6,19 +6,20 @@ DIST allocator-api2-0.2.18.crate 62504 BLAKE2B 8152c5a611be91ba23b1e8647511e21f4
 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_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34
-DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed
-DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a
-DIST anstyle-query-1.0.3.crate 9742 BLAKE2B cfcba0a2773f07b9292279afd70832c5d4eb441ed61bcacdbeeda9184c63b7e01af70a8744d6efceb7f74a2c2dfa5672b873255cc1d273bd6a2d3d7ee08c2d2b SHA512 38637f49e547836a4958d9f528cb270abfc81c5ca644d6d43b0f3aaef8c6f1301a8bc30a23afec5e71722c3afe7eb0f48f9fdea88b73e36f597b74531da84226
-DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179
+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 arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff
 DIST async-stream-0.3.5.crate 11916 BLAKE2B d79804d7310d1f47d7848007518e0b0e0f0724f2589a20478eda3ab1a1db8775c5aea494688c69437046accd10eaec789b244451e84a19e489f071519b50d2fa SHA512 d34ab46a9e18bdf35fe0e58808fadf422dd50246cedf48110b3273be17939678d2cb5b61fae9da176bc2c2b373933821e912fc395627f7a6fed1d2c43bc66c9d
 DIST async-stream-impl-0.3.5.crate 4173 BLAKE2B e7c0d2371299af6fe9983adf4f8cbb6402ceaa5f9d286f124362332a4016404069c362176dd3b71061027b0768ac1f772b3e5e38809b870411f4590126a74ca6 SHA512 3725216119cf4cc78d433e2f8a8df9bfb7a3f046e4a8346bbe76e91b23686dfcbdb7cd182765e12d606ed0e3391477c43652a025597de9120170fd0b1151d204
-DIST async-trait-0.1.80.crate 28775 BLAKE2B d95384a8828c9273e0f295d3c3826b3a8716cd0c4ab39bdb43d65ec57fe886f7c5926c1666a76ca25b1536eedef61b0d92c78ff9c8a52a0515900360b66b0f13 SHA512 3e92bc8d38feea49ebb5011303e55853bbbf5d0fb7c4f6ed6aa471b9000a2a0ea5475619f98831641e8ee484beaa6fd8880770a96b8a5a7df26e392c1b4b3a19
+DIST async-trait-0.1.81.crate 28896 BLAKE2B 154e6b8da082193832bca7bbc097eb5ee25ed8365d1cb8dedf27f62fbffc710cfbfd0094a200a10399e942014083b74f521dae01cc4601e0f6b9d7364761fce0 SHA512 1fabbaa813ba320012c0bad54d27232eebca4d3fff1cc5ed771df9f90d9e9bfaca4f7b018358dc599fd30c5974d00b34ffc05ce6e9151a57ba572543bff83fd0
 DIST atoi-0.3.3.crate 6968 BLAKE2B ccbe7d4e47ee5e9f2f979f9589b7edb148a25169753e51e893fc8885c169ca1b9aad04b5c92bf92e828da4c1df28ec7c9e913a60efc9d54100046569ed32e33c SHA512 0b9f5ff975025a94624a435f50028624b1d5b1180b008b16b2ee82b659f86c415858ad096ea81449f3975da8d63d940708f1c9bf74f7809adcd63e0f4832fe68
 DIST atoi-2.0.0.crate 7785 BLAKE2B 406b5d14541bbd1428171874c549cfbfa1b80b8317a03b1b0e2795da7d2d54e94b30fbac05fcced9b1ecdb6e15709985cf84490af9e57fc16697bd581fe48554 SHA512 089959e903a17c5550f90fa1be67fb937120f693a924800d4443c49caee6516f2537c57b29ecd9136020d7644281457f75654315e9c5a211b2e4b57e77076024
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 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 backtrace-ext-0.2.1.crate 11401 BLAKE2B fcb46f96043ce67b65b8eafdcbad380af376fed730dda81193f3f0024f13caf596f7192c34b6b333d0bd12a5918bfa6b551281d13f8a4c9dc51e3850068577cb SHA512 717f43b1912a4f038b58b585683160fe33dc6117a7c65b02dad6996c359e245536c3c0784719e1781b8dba515e8fe756e810a379cddb796634845dce0b704931
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
@@ -26,23 +27,23 @@ DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9
 DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c
 DIST beef-0.5.2.crate 15275 BLAKE2B 95d60fb1840ca26581841ad65a4e8f3f99d5f8d44c569219f4d06ce441bb3a4ba558e231e73a51cd1c6b4d9e4cc6a07942115c134289fb1982dace03049d3a1e SHA512 755fc588acbf730bc9c80dbfc20cd0ef81f792a94da0dd28379ad83a7359ddd4c7b136ba8048dd460bb8652475db3d12814fcbd04eff4ebe8ec8a1bcd024c2aa
 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 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 cc-1.0.98.crate 76780 BLAKE2B 64124ebdda70b211b6fde8c02d256d97d57fc3a0db433371bad896c06e36caaa5f938074d92ca82724b34fde06bc10af63c7fdde8f52ac50a3ea6e3329d18d93 SHA512 dfeb194266a4a9cf2ddf69fe20f8e20a72a0a9c2f72b1ea578fd48dae5b0c3589f501068ca24e0da7b3691860cd8c05247c803f3ef2f338d56eef8b1f4f4fbd2
+DIST bytes-1.6.1.crate 60723 BLAKE2B a6f28770d1c42d7bb02964cafedc205c2730351cfca81520dbf62300284416a49e19c5d858dc37ba001d21846efb75d20977162a7e203e7171ef33868a720309 SHA512 4826cdba7a772b68f7352a3160a4c8ff93002110644c2e99537274cbb9776ba2f40ed8be9cde564f58b884c1985bdbce07cd7f5a46d34b48146ff51f317b5ab7
+DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1dd8515ff5ec43abd1da75bbb400460a43a252c93dd0a597c2e44c8e899a376d963f0d3727db7ca2c24 SHA512 ea8bd8150042268092360e6396226ee5e83ba154eae99d299c897ed16e8543fcfe3179e22b50b0497bcf065a16933f4ebf7edcae7e6fc8be3788f0ae7f61c000
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0
-DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864
-DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea42d9df9af26b5234ccde23175180efe21df93513df49f6ba83e46cc85cedcead29c902e426c39b25086c9f79a51c SHA512 670411136c819577c0129c6fcf5a8216cac82a47ae11ce3cd97cffd038644e06c5a21f7a69948628f01fb77f1e656678ffbfe441385866fdf90d247bda036c4d
-DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
-DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
+DIST clap-4.5.11.crate 56252 BLAKE2B 0d3d7e008e0848cbd66bd1fe347cbbccc77c44db49e1e4179eb0f2c292c87e178424ec82c2becf2e99162f2a199c31c31b54487c7dbfa700feeb082dee15c711 SHA512 96bb7871ef3eb167bf8869e3713d861754cf4716dcff8afe54b3d73ddeb862c75e110e1b759c72edec7cc0e274df5af881aaa8bd275978c55ec8a225c333b098
+DIST clap_builder-4.5.11.crate 164100 BLAKE2B 07cadc052133a905e2f16bfdf3c1a0d66a283df5e7bb16eeb40bf1a8a489c24758309039d8a07a0b02cf7702a3a2ba6319115940193e58306df20f53851ec537 SHA512 e647761130263d45d55c507e15893b73f70ff402185cd2ef174f7c4f67cef96c713fa4d4d60244393b9e7628667b79e56dabac0196d014740d81e5b7083ab780
+DIST clap_derive-4.5.11.crate 30061 BLAKE2B 3a1dab450ba83b8bf1b4ca79266911c39d8153b56f203b28a9a47eb12dacdacde228b080927321f77155cd942169edde9c92be8245ba6b72fd4d3e500aee7037 SHA512 c1c83ddbd16b1e719fd2cdf933186343d3ed4b434b7b45f74dec340eabd49c77da2e40e462349625260104cfb6a8c70d5757c054ed1461235fed7e913100860b
+DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380
+DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117
 DIST combine-4.6.7.crate 134808 BLAKE2B 1f3ea9962f4ed4177a9c028d04934b5e261df405c1c0282c74609e0e6a1490a92b262ad26d1d21dae977cff8795bfa3c1f85aa43fab13a88227394d61d93861d SHA512 b8232b0e1f94039cef3ad4a0a35a972eb49f4f198749d2fe50aa3fd2a77614f2d24e51f3b4465243ce9140aed6bd048aaaae189a7ba864e3d23843e9be0c437f
+DIST concurrent-queue-2.5.0.crate 22654 BLAKE2B b490e76804e45d6a7af6bb4ec074fb370d9ec7cd67c7ecfb55d5ed53b9b437c174e678add915303559e902ac81c8751dccb2c5ef0543d5961713372fd2b08d3c SHA512 235704f9161dfac60d2a6d2cf96425e39c097dcde2f005187c1f044704eec66d8303d59352cd414a81a3ed0eed60421054b0070a9b8f69065a79a2519e913e5a
 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 cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
 DIST crc-3.2.1.crate 15070 BLAKE2B 9d5f488b57bc232528cfb8d9ef33a88d25d904395dfac8dc10e864dc0d6c89e576585195a20db585fe358859ec50afa998562ad6becf6fd2e505f3969eb36ed8 SHA512 64b7272d8cf55efe9768f9f3218f83302ccb59458a56fe3b7b2de1a53eb5a3b57fbf268647fdba5b230cccdd4058462ba583d76870ba12cb1057ac2787f181db
@@ -52,21 +53,21 @@ DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca
 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 crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
-DIST dashmap-5.5.3.crate 24061 BLAKE2B 2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71 SHA512 15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a
+DIST dashmap-6.0.1.crate 24364 BLAKE2B c09f6ff97414c369dad458de6e415cd980c9be6df1869fdc5ef2e9f494110121a42ae8e1f8dead569dcf748c07f8a739218da8351268e026a764761601645fe6 SHA512 8ed876bf014a55d495f960e92012219b75c61b93c37f510ab4dd2b66eeda417a19fded1dd583188b3052799a9848dc704b663ef4cd7030b93ca828279f355f55
 DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
 DIST der-0.7.9.crate 85173 BLAKE2B f2dcf402e3d8b6a7ca818a8f260e0996290c77517b06bba8b22849c4d0e0c8f3dd57d664a06d9a7bfb1da6a39abd0740cd7d9776e75669aa970cc3ef63f924d4 SHA512 6de996346365647ac0da23d3fa9c72100d665c9225dc2f0bf1f553c4f0e7eb5c6acf3f1e36a11a7cc20e8b1c44752997e6f592c1d142755df145c5e302800f5b
 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
 DIST dotenvy-0.15.7.crate 20293 BLAKE2B 89a205ca637c31678fdc7249212a6a71a10bea47607279087f719a4929ca30e27f5cf74d4560390ddbb825a58bebc8851a82c3c6ed525922a74206a85bbde6f2 SHA512 208eba7f7d012b71dbdd19d27fad4fa1d2982507d3362167fab72ce819f44972ac0dab6a10f3842f3f8b44d979cf8517240fa4249ee066f4806ef4e38e343bfc
-DIST either-1.12.0.crate 18974 BLAKE2B 9db82a8eb351dbc1643ccbe304796610f6090b263d9a991b4d7308a699bdc67d25096ed1e923f521fe3dbfe9195569c1297b46a4b1d0b74bcea4c11bc0a2c388 SHA512 88e1ac4053c39740cf643a8fd445f2d939a8398e952b4b66ab38bb48bd54bc7a976967c4bebab36fed66c4f5fb76082e9c6d40e146914283fca28f31af0e0138
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST encoding_rs-0.8.34.crate 1378166 BLAKE2B 528692170cdb1d74ffb0b122a5aee61f50a2a7e4ce6db049ebea4a185e5c43d4ed99e515f08524053a110e061f788f861e62e0b04eb016e7a9e2678235a04577 SHA512 e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a
 DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a
-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 fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104
 DIST flate2-1.0.30.crate 75511 BLAKE2B c25d9ab787ef60312523d80cf277bcaae16c7e54b1deb0fc8723a3b22c2586092343db1c538d96a37690d21e52ff822a38c90e10bc554fedb75671fdff6df309 SHA512 21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578
-DIST flexi_logger-0.28.0.crate 221676 BLAKE2B 020b0585e0dd548f06194e7e07339e66d6b9597b44a4380983c4c58909439dceea6afd93c396763226bf5ff1defc3fb1c3c21abf4bf90ecf0e238bef2f550a46 SHA512 e591697bc83e0ef5a0d02490afccef78839b9327b5d4d75316a533f045e23295ebd6711ada596025ad73af51b2593521cbeeba099827da90a995d79ded5d86f9
+DIST flexi_logger-0.28.5.crate 223891 BLAKE2B 93a307df7b6ddd1fed711036793a3a67c3c5862025786b1bb2c836bf49b261f7f90ac928f39a00126fcce78d0bf6124b9fadda6e80d05c2b3a8ea486c08bd585 SHA512 e7b0172c24ef70bba9af7b7ac29561fb12410814a4a36f20603ac3d61633085f163a4509a39b3e962b5862acfa5bdf239d043ae26dce7a41a2b327ea90edf4f8
 DIST flume-0.11.0.crate 67502 BLAKE2B aadebeda44f899b6290df4ccddfc0fc49c4e55709243e9b1eb26b6a232aee042d2260c9b504d554551be54ad4e4ae1b1dc6ee861fee0cbb6eb92fbebb5a7d9ad SHA512 29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
@@ -82,15 +83,14 @@ 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 getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
-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.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
-DIST hashlink-0.8.4.crate 26514 BLAKE2B b4f0e4c964a7a3f7bb31f5b04c34598372fa867fca4550c3e170a1eb31d58cff44314448a467d4b8d6748aa7a7bea4ed422bff76e9e0a5018f29b85a6c51f3f0 SHA512 4b21564c26673458668da18fd95246514e90cad603ada7875466bb056fe461ab31c1db77fc2ebfe207a1bcff06df2b0b29c258f7fa9e5c19cb4e4b2388d53ff7
+DIST hashlink-0.9.1.crate 28928 BLAKE2B 14276fe00fb8aa7a8183b5cedc99eb403c0a68cb662555cd51efbe55a46c864f68f3d421395f56defcd1a87576c5a38509581adb5d02b831d9aab2efdd376f9f SHA512 16189f332b9e2a71f8cf4c8b72485eb107c4a84d4bfe3c739ecea8fe5dec33ad3c796d57830b12c176bc65a2066913c809a0f7c8db83e9da1bb0c555de8d3717
 DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
 DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
-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.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
@@ -102,65 +102,68 @@ DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685
 DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33
 DIST http-auth-basic-0.3.3.crate 26096 BLAKE2B 14b5ed2255ba7af3b2b8f251ca533035f19ce8cb236facca89fe11a48a018da258172db767948be776611a100f95b6290291f69e1961ba17cdb2e4b37dcef81c SHA512 a08db96170cc8683e8bb72a80b0872e5b8017599b5215b5c1c32b957de1d58fe838e445fdd9fdee0c70159ef0b3f8a7820294d2b6ea89298481d1cc2a768eb26
 DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462
-DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
+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 httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
-DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
-DIST hyper-rustls-0.24.2.crate 30195 BLAKE2B 79d5c6512877c98f3040a6ed26027e5345d42cd55ee9e9bb6e020cb7bdd4345556d910c338ec759a6a9a2907e645aa841d5666879ba8254ac6506a980811a7d9 SHA512 f30e83408376b985ee9df26728f8183a7048d4586c5fa3d797cc837931e13300018929583a087767bd19d4bd60d85ea1c2696601c236fb65be9a6805ef6fc193
+DIST hyper-0.14.30.crate 198175 BLAKE2B 9aa000132bc5db1cf566df48d243484b52a099d47d68aa2fc02d11455f3eece99f6a954bcc9900c0173cb39f145d371cf97b024517aefee4c7bea7746f800dfd SHA512 037f19ad0ee461dede269acc634955b087cc021abe52053de74805243621e35037b4968e20fa0ce7fcfd83ae05bf485c8003cf1df55dc30bc4cd64e62fcde633
+DIST hyper-1.4.1.crate 151849 BLAKE2B aa5f48c38ed54de8d1b8ca0236acbae6bc30d530156c3f4f429f89e48148dcfd0580478041549a3f43faf38b30f36bc41276a272463c42c80c1b45a7b24a236b SHA512 0fcaaabfbb606020534aaf0cf68c9f1be3480f2d1b126deec30ba2879cdc3c7c7a24bdc5a2ed81aabe8be4df36b146ac1585ed8d07181dcb743852ff3fc0878b
+DIST hyper-rustls-0.27.2.crate 34421 BLAKE2B efaf493a8c50141ff9cfa93b8045a21488f61178d33e080bd81d92d8c0974df8d3714edeef678e1163c3ea08cef76aa9c3448b406d3811394bf282b0814204bd SHA512 c7f5134ce6e07a28e2499ef7ca4e6c1c817b4592e4cfd16967188390dc920dc8813d1935e5466554dc3e6b388cca685b26fbc94e702e6aa7ddf12ede5645e446
+DIST hyper-util-0.1.6.crate 69910 BLAKE2B 15cd92866ee69eb898cdc46c9fcb8e67e772cef0d069d6dd2b56b76464861d5fd8aa1f8ee3c27a7feaac7ecded048b4295c74ecb0aff67eebe2b8307fa202f7b SHA512 ea1efe399f8847afb6dae13078c9a6fe3984b76bef1f6a282889033dd516cb5644d85999b8a77fe9c20d2273854f71b5c0a5a5f54f2dc8e249894e263b8bbea7
 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 idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
 DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea
 DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54
-DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 DIST is_ci-1.2.0.crate 4521 BLAKE2B 59591545c2da2052629c97e345b1ed1f0f621d5a3a158e0456b0a8711011160f01b01f4ca91e12f807d2e74dc127dd2a9be7ba9b1c9ee458ceea590cf8feec2e SHA512 0479117be842723810ae7f641e5e4b5daaa5543655de50c8e465ee600803be78901f0c0893a4953b5ff0b438216aecb479b9e40aa2c78da0655249f127edf2eb
-DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6
-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 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 lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
-DIST libsqlite3-sys-0.27.0.crate 4948458 BLAKE2B f86b27fc951145b20d4f5ca005f9981d0749be4a3201811b801d042e47064ab2535224ef1c80657ae0d553508b5b586360f533b0a3f84e92ec5eb3c99920ebbc SHA512 34dbe8ef5c2fff5a95cf0c1ed14bbb2e537cf993515cb08edeb90a0590126ded8b0ae42db07047c769f24b23045582d4db1bd5e5ff82135cf8b2e0e5a71e85e9
+DIST libsqlite3-sys-0.28.0.crate 4975624 BLAKE2B e8d9e637a9ed616372e6e9496a9a7095eea281e1496ffa5b312f632958c751d50d9051f5ad09777e23a18dec08821cf9c43a405c4ac64fbb8719820c12886b54 SHA512 4a3d16eec47c6e3e53e00232501fd50fa77f1ee1370f4ab6c984496f2f897b4acd1c15c697caa8babd635d31a946e147d5d090378615676a3b5c4a9656355016
 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.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
+DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71
 DIST logos-0.14.0.crate 1455748 BLAKE2B c96e24313295f58e9c0582d0a3d50d6a3cb005920e44a95ea6ce9ad089549afa14ebd42f99805f17d84138777fd61923a9aa34e08b83d73787002f2ef54bd445 SHA512 d4ed442975f9d61a84ba70d1f71dec4fb3c052187a727397c946ee06cc698efc20a7fde2801388481553643065ad1e52a2b0b3eda5513a1a5d4a28b3d1ee8124
 DIST logos-codegen-0.14.0.crate 39888 BLAKE2B 99f8be4c0604cd07246097277185f1dec13ce8687b29903c915ec7304930b498f4112f9dfa3bac56616a64f9f632c69bee537d957e00c67fc6c495e3d2832b07 SHA512 d56b243174f277a61fad986b7ced02b56a8000b0716f3c7320ac049f0adb5866ef1a5c4087cd3983572c7da23432889beeb4d7c5e3c0e7b735b1f9532a0bfbef
 DIST logos-derive-0.14.0.crate 6942 BLAKE2B 1c872b38af774ff21eb0e09b38b55790cf198e6d391087bcd5e7e3009a88a93d8f02632d0259b1fe244868219034537aad712bfb021f7c3ba330b10e0738e01b SHA512 e1a0057931950bae68dae6d8744734317ebf451fd445fdca828a145121183756c9e6be6dd5d2d1d7da8388faaeac043e309721647941b35f159f10f3533218ef
 DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
 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 miette-7.2.0.crate 102081 BLAKE2B d85b4afec9c9af137e8362f74b3f03ba2b88847c32ee18b460898362f4e0ce5be5a37502975e8bcf3881e17109665abc5f43b0195bd11e6940ec80dec048cd41 SHA512 a1e61f3092533f0a501be79b1314e619a72605e77bcbaf67d9fc3dab5452b351c3fc3ffa1cc02dfee849a91a9f1e76e3cdf3aa7fccb4b26067ea62975f3c6802
 DIST miette-derive-7.2.0.crate 16766 BLAKE2B 34769b0889f2e122c107c73c593ca67566e9e2644a77ae998f6681c13b6adb60f1b98854ae3130f86cdfb8629bbb9988dd9f79426ebd9dc1d0c9d98029817717 SHA512 aa0cef9be965c8eff61ba20f1632387c906843a594b5da72fc4f1d3bb6cf26ed2c515043c76179481e6a25e10d151c9153b0733d809923edc8561c24ce73bbf3
 DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
-DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
+DIST mime_guess-2.0.5.crate 27166 BLAKE2B a8ec67e16a336e7d07c9aaa55025c24c3d4a62aae25213ce768786d9f292b76930132a880d662cd9a5d63aa899e9d488ab76fa9d99350e9f448ef484705ba4d9 SHA512 433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c
 DIST mini-redis-0.4.1.crate 41814 BLAKE2B fcfc31a27cfbd7a1a7188642ac5c477dc1dbe8b91069e5fa9698005004ca6f39ee3e74fdb9a276b6615ada5f105fc543d91fd945d3e524c77403a39040968d5e SHA512 7891cc7a67a1460f411da4a87c277cee21535212a39a8aa19a9fcac509ac1d5d3f864df2e4e7ce0e91e1a5f384fee34fbc6fd15aa57eda6cceeeb252decf1515
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.7.3.crate 55774 BLAKE2B 41e11d955b75ffad131104a6cb3e61d7219a932d2dbafe3ab1229fa8b85b6def569a264b76a47324e35d1b9296e74a19585d6ac043469b61fb9b7565b81022bc SHA512 b9e2cc214d6213fb343cacc5f87228487592883fc8f7cf46c9a26b7148691783b2729ef80c0d0e11fbedf6edb1332dd87d88b253f7c2e645fe86ff2ffd47121f
-DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
+DIST miniz_oxide-0.7.4.crate 56119 BLAKE2B 68facfec9ff405bebe99f52bcf3aac6788f1b5eef313ca393e2a15e1158bf294003cbe31efea4c793e644e8ab4e00ef67d38f7d32849ab6f01a8e19d31c30221 SHA512 482bf02d7bfd25bd8abe5e5959132677202d8c5dc014b9b0b64fbdc204be1b8431867095c140a1183dd1ca59f6ba871a355422fbd148ce34d62960cad2b7a978
+DIST mio-1.0.1.crate 102654 BLAKE2B 85e2fccd36ad7b9a986d308a5911c7209246d7fe035dbcf6f0dd8f89c0a3c925046271378aaa7b240e84249c009c75e55c32ae18aba0d91e432fc2ef34e51e4a SHA512 e3b98cf7d33f42198a57be4490732132c7b8dd3fba64c99e3874f3f52dfc926298ace992c0fccc5029f47fafa0eeccb460c77fa2f8485f116ba0f353321fcae2
 DIST multer-2.1.0.crate 23976 BLAKE2B 3124a7858a70ebd00cae02c5863ad631eeb4243e848001a097ac81166360d6eff64533ff109722eb6fa2fd2f4e9d3dfa677fa78e2990943932a1e58408411c8c SHA512 6824de499cc180dadf6e7535aef39e2b92921b6bac135b5849129e72ec1ed2a85bd56a08a849b7c3718f35365d3fc7489f579487cd4a141cf839e6491242b4e9
-DIST nextcloud-config-parser-0.10.0.crate 23696 BLAKE2B 81b09a67c8d55b6cc268d96062c23bd865e2515c23b6ca4fd2febad666ebae149e982242c9e2219d732a45bc4d57f795f45a1a02071343aa4fbb63ce1c56408b SHA512 e3b6877b19b8f38f0f2375a7b01568798755a6c437080314b5cf0fd941859526b49e10fc03616386521c48247f3a41e7ddb9248a4208c8c15c78fc29a0a34bf5
-DIST nextcloud-notify_push-0.6.12.tar.gz 113543 BLAKE2B d6ef69cd601cf389bd2d950c9b40b3a39ceb048c00133cb30b99eb4abaaa52a3b5ae0297c3a83114059f1a27af8322221f8a2e53b1c155c480ad49302ef017b8 SHA512 a3de5215d6cc09422467475826b7613be38ee74a7e69dce442795fd3b4e40b45c4d80a12034a644924076d06a21d31e2b012ba3b7f49468adc6e720a0b1d0feb
+DIST nextcloud-config-parser-0.11.0.crate 23801 BLAKE2B 4f46bc85e03133d24355e0fa2f9dad2f1ff1603f7896b929775ce23932daff8fb576d24f590b00a5ba635e949d71c0f6d60e5cd9251702b5a4c9d1b02661569d SHA512 597bd657d7cf62d31f949258be40050713d236ec898df0883b8041c77b26f2cb5c888cc4478758d8df1824a459e5ab094802b942d8506a28377d29cf11acf5e9
+DIST nextcloud-notify_push-0.7.0.tar.gz 131618 BLAKE2B 6b0caca464d9c2ea1ebe22eea7d123fbae6c49f355982bdd61a39f1e669c113afbf7ba4c9e963d562a0e43387d6f2edf290b1fd6a7490d901311165361cc5845 SHA512 71814339d75a35184a39769f2e5e1235c0eb65b85639d0384c040b2986887d21ae6f7c535a68764bb1e8794e25275d0b226ed875533aeaba7809d4741615b96d
 DIST nextcloud_appinfo-0.6.0.crate 15344 BLAKE2B ce1b16bf6de31346f51a6e507a091689c410e118b5d44520ba184f998e38d217a93ffc27910db5de3bcbdf2a82c7929f17184fe4792a10bf454ddfff61109684 SHA512 36c28a0f2932d0abd6e7a4aed65943c09d2741bb315d3e0375f38918e5ef604cdaa17855026cf93e9cfb6cdf03018f75d363d58cb47e7189f309c45fb5140867
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
-DIST nu-ansi-term-0.49.0.crate 28211 BLAKE2B 057f2d9a3b6fa773e5b8b7b33eb0bd588db3310f01354701832716d77dd6c49ae17f69728582cdf84e8387f7c57b9eb05cc97ee6e14541878f12fb50f93855cc SHA512 8168f44f3574e56fe70ecbc67255556bb92215d3520d1cfca7be918b3d7d54be7aa0d82359f1044eaf66f11ee85fab1f9ccf32b13cdc39139c2facc78b2d8e71
+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-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8
 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-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.2.crate 324577 BLAKE2B 8e2c07215088639aa2727ea2ed0833bc6634186fcb4b6accf725059a20fde4394789b88c314b19483fe240b73fdcefedaccd7afcae529c658724083b035536dd SHA512 f5adb662c0e6e184a75c14181d70f3c9d8d6f4002fcb9082863c9c7a28f36d35464168c7447e63316c0227d38d92eec73240665afdecfa574eb625b040854ef9
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST owo-colors-4.0.0.crate 30984 BLAKE2B fa64a9097745eff2b00d8587ca119a3f4163c43265dcfe75162be09ffd556b132c24aa5217b99c3b10feddb365e71b01006a62a664ad8968d4bf6a716291148f SHA512 25a606e9e6a17a4ec21b9298707478d904ba1f30862ce855f4223b3273fb3d0323540b6b628c067edc0c9291cd7c370beb298ec000cd679068624031ac9e66ce
+DIST parking-2.2.0.crate 9730 BLAKE2B c6da9ea4d8c0a488a64510781b025ce07f283814a09703c58e8d46c625cd74e2c55d7e28a4c09b0886fe4ab415b128bd3114f8283d4c903398e12a11d65489b6 SHA512 184a4514322279ed093a27a9bcad5fce808900a9ebbfb624216dfcb90a5483e8bcc054d82a0bba4da3809364ad1ed0a623328cf983bec3751e4503c9670a3f9a
 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-display-0.9.0.crate 9285 BLAKE2B c04a4f6af09fd966c251afbd62266a84c1b86e27a627114a5feb91fd627857a48595cbe2a24d031adf521370e1f5a670cf21d7a3a514782928db84a06eb3131d SHA512 425f9c03ad73a633feec252bbaa3920ad1fd63bea1f7ef19befba6c505ed5b71c4cc17426a45d60788a13d3bb29bd4149e050f0ad79d338a7e58b4be48b25a1f
-DIST parse-display-derive-0.9.0.crate 16959 BLAKE2B f8de48712fbd0d206961c7e7c4f9cfe17f41f71be33922a76ebf1f28920e33e6fd85ba7059440a7c06cf3bf4113286e0e0cc70139c0c74c3e43d9e17135e54d4 SHA512 893eb2bf641f1341f5262af731687a963894ba5d8575939260903d94ec64518590ddd6c5147865f30f07d0d47e9486a0eea0e112093dd267a13fb14df540ebae
+DIST parse-display-0.9.1.crate 9456 BLAKE2B 27cfb9137c1b1f24d6cec06950f3c6d7c86ba8a75c816b5e4f654372cbcee7b60979abacbb57bdd25388f4eb71f3d76766552b094653d85e3bc07f2a804a22f8 SHA512 95fbfb662103a2a85a7d28f7581951511ee647b05e6751e2c2a552a21e34ec6d1285b988f8b8bb51cd1ec26074a161e7c75835de510dcb8fcfebd086277b67bc
+DIST parse-display-derive-0.9.1.crate 17258 BLAKE2B 33be9bf587acc2f0e0b9cdbfb3425eec5f9ef7f0cdac5814475d5cf6a7d16aebc313cbcfc87b94a67a5ab984dc96fa683166a4ec30dd25192513ae93084cea1d SHA512 0ec562881b1898f608634bed062bb9c7035564c5724705a6e56ae8258a5869ed0452d4f13b02567339235b58fb9f6abe6ab6126e23e96f57e57d58a90cd552b3
 DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4
 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 peresil-0.3.0.crate 13573 BLAKE2B 6a5af428257c66db670a78bebf22b667b68633fd17e883ba288e089663a80c594dfe3e4b55043af3070deda8d1643e724743f5e840f7c7b7d0fa26409e00d589 SHA512 874580a62add05677f2573b7668612caee7e1653ae6263652fd495e5c871b8e71c66e20938a12348cb63450b3c88fbbe49d67b71868a8f970d82d94bd4425961
-DIST php-literal-parser-0.6.0.crate 25189 BLAKE2B 35c53b1e90a295af526796dc8d1c458344ca8bbfa1c9e1fa5abf91f66d31c92b5deb61e15e72f4a4a0b898206fb95c4701f270c60d9c01a53cea1e698d954346 SHA512 0a826ced1db719fd40b8b5d8d8e399b48f17189fbea5aeedaebb0a0ea11897657e50b3d5d94544b3a31aa2a39754691cf31c4c4508405a16e04f1cfc73a8c828
+DIST php-literal-parser-0.6.1.crate 25108 BLAKE2B 7ed4245505c8c68720760a181f35ef232e4f85e2d410aeb04db4979ce12c37bad19b5896f3294cfc29c3fe2d9b19eabd944bae055961dea3a10238e08940a39e SHA512 d665fa71de5a421950729961bfa8c6f91203821a7c42e53beb60d504b286273f610aafa2e4a9d1ffa01c64266e56a5f469d97b4bc24ef5e6acb5ab6c4608d7e6
 DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578
 DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032
 DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293
@@ -171,43 +174,48 @@ DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d62903423794
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
 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.84.crate 48922 BLAKE2B 51f73a6bbc3cc42aa5bb5c3f4bf404a0c7803f7219673771d375ab288c638113f496e932b98981ef56dac755d9387f888a4147864d8f9364cef47644ea179161 SHA512 0d0bd0cc1f457b6d5feb9fd6da670f2a0662d15d88e5d20d4d308103c689a103861b3838eb25e5144cf24fb87abffdebb3175989285a03f08730ce3daa55e35e
+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 quinn-0.11.2.crate 73920 BLAKE2B 47e02fccd1a6cf85cf88767335dfd1236235652acc2136723175daca0c210a8ab31da90fddcc8cdd150adcb9768592ef8e7f1f0ae0f6273b6f24ce709224b045 SHA512 b6aa9effa35da2d595fb7fb7a91c61d2048a7ba54dd0449c20602c1986b49c80945dd6fda6d84a2a68c1d3be5ebd10c6594192c42976c4994c1c86405cb20063
+DIST quinn-proto-0.11.3.crate 202348 BLAKE2B 57f3c2121d21b592c90094d1e5bed6a53b7d62af32c6422b9edecd3252fddb03a354cb6879e8036b937494c53c0a7626d1da8a715ed16af76d797cbb038aa6f0 SHA512 9e8665eabb27dc3aa06008f3436fd837bf854a45b5852336a6c8a7dc447207c08bb94f4710bd1ce99dbc35aae876d467079547fca2fe79abbd0542c1e2d8e5d6
+DIST quinn-udp-0.5.4.crate 23025 BLAKE2B 8e08937f3c8a5d81c3e32d86ee678e37ae220d0fb091b4937dc8f637c9a6755513fd7bf94d6782f0724d4c2dc6d704e80ca8bb07ff297ad7c36d47e9ee0e9eb8 SHA512 f2f3e29d54612a75ebc6e46b4a2a3706f55db7ab1b1dda1846c8e3ab70dec498712921fd4fdfb399958899fc430bcb206dfe17254ee83218b42b1f043e105de0
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 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.3.crate 222206 BLAKE2B f5ca1eca1520feaa0cff259019e5e50ae1eb65a9b62107cf952bc10bdc8a95151adb6f79f2fbf4e7a2be6e699af83df32a1ebba605dece931fb775a67e7ade6d SHA512 d9bd488695128a5c7bf5eee22d0f2f4079c68f17028a68f24598e1c32685ff5dd2fe070e45b059c38d274e54153b325fdfbd2a340b63c7ec0add3911d5e7e406
+DIST redis-0.26.0.crate 252236 BLAKE2B dbf8e219cf74253789e8aabab6e261ad1af0b9adf3df175eb51dca2982364ebffb5fbcb9e7343a4e8b035d00255e89bddba60529874b159698b4c690198b28cc SHA512 5a4877f25b3f27ad2312d0fced7fff22d6ba79bec682f152146c79b7be6118d7934f846fae486208f7e8c5041f3192e554390addcda2ce2af467b7e453fed38c
 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 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-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-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
-DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
-DIST reqwest-0.11.27.crate 163155 BLAKE2B 0135a99a42400d601a19299d379e28f2df7454dc85864bf3905a8148c908fb1b0f363cecd3fc2ed0c4ba0c108739eb3ec5116d511bcb73530bbff6acb10c691e SHA512 95e5c2e375e345a3ac9d4f4b4fa9aec28f45a457c1615d303d4b4dddb639749995ef2834a6f8659f5f0cbb49e0876e89c9925bb2b2ba62207e393c9b12e58ad3
+DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
+DIST reqwest-0.12.5.crate 177108 BLAKE2B 57d8af4b528339f05fda286cfdfff4463ddce2ca206c2bb01316fa7f12201ccd1eca8d8c4af0297a3d6547d94912d2dfad2193b633737f35022d438ebe21d8d8 SHA512 19ded1f2251ab7308533b670ed57f33f2f8ad59fd937267e55ff92a15d72efa3c091c4cd2eb1b8d2e8be3a7cb652dcdbd9f6954cfcf218c834107693557a3824
 DIST rfc7239-0.1.1.crate 3714 BLAKE2B 17ded158e6ad60053d7b6eb5269ea7462271900c4e3b65bd88700a3ecb79d2e10d327d715cd77397d7bb17e4d9004ca503e0d77df0fb5edb6f5d91060a105e5f SHA512 cba622b9f3994d2fb35c1510c9085e5746a381ecbcf72f43ede3d2b535d1a4b6c4bb8af30b02b265aff31b817e009c53d4a6aff742b38ed589323ccce867a854
 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
 DIST rsa-0.9.6.crate 80048 BLAKE2B 0021065c262a351c3c3e9e63984442e9ff8e739f0f60c79f0eec031fc3ecf928756a0da656a0eeb4bcb94cd6f10ced2326a83666efba3b85b8a518b0aaec3d18 SHA512 0af7737181236f0e5544a83eb41d7e780df1a488b7b782b2c97eb4eab3dd599b86d18adcdc69bb56f9aac548a24dc88806e7bdc32fbc43c33b4d7a9817cfab9c
 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 rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f
 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.12.crate 438443 BLAKE2B 638ed38c62f807d1a28cd880a8664e09e0ef25ef038f93c6b8f5512e1864d60f2bc8a83e00907f9ee36e543bbbd9e5b6f5a0ff7fb57770619864298d32c31bd7 SHA512 49b7fb3dc02e9ded96718d064a121629dffeded6affbe8dd8a41283be62c99244b23208205a1821d83b557200b017d26589d4f42a0048b2cbd70156dcbbb8b94
 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.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83edf487a6a940e1bc8937c3ed7900cac590674bf2c5a5edac6055a2bdf763b132d4624a8c51caf0250d5055ce5e8f4bc5eb SHA512 5502795aebd7058084d0e30d6c09befc4182493113207f539a8d42006d4189158e9028245aa627d6943a88514b6292fbd56b5ea1abef8c83a429bf6d641f6f11
 DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
-DIST rustls-webpki-0.102.4.crate 200657 BLAKE2B 7d6c27ee182e5b92fef74504d9331c476861b1ef6f67df44b31382d3bebe3c2c1ed666fa535b2a213ad602449fdd23d0ad1a7b89332efeb950686ab6065278a7 SHA512 f5fd01401b74ce3bd3fee6228fa01c29f0ad005eff0314ec19ca9cafe401b056270545b239050cbd72fd22b64a5376bb1d1c3cc5e29303c7d502d5983513d8f6
+DIST rustls-webpki-0.102.6.crate 201331 BLAKE2B 9802401ac0134a4c6b2ae7d72ad73126dfb271458a9ced5128c4fe7919ec64b5d68be13b5abf9ca9f666052c462bac112c321cca3b54c1b615224fcabb1bca3a SHA512 83ed70c4ca8e0714b363bf76c04281fafac08788bb5f283b87c21eb6d5b3bbb9ebd21a62dd9e1eea89d41f1557f953486e1160c5e7eb02b693bec3745a9603c5
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST sct-0.7.1.crate 27501 BLAKE2B 12f63e62f49a0ed0c5a62c1c9b42a83c1df43401ed1de85f993167d8fc52733908e58ea1fe76cd7ff6128d4d6046d7c0335434672ed1865c8ddb1b3fbaecb590 SHA512 6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e
-DIST sd-notify-0.4.1.crate 10085 BLAKE2B eca53698e8de73938b4d3281536619401099e2f487e47f3e5caae147f718864284b7353b14b324107d7ea79044f86d5c290adec9e0b5206e5511c303dccbb436 SHA512 fd14ca6a3aa1842cc4808925e7d1ce88481834cb29efb6474906ed023c60e8bd978ac55657a7065910e72c2ce44b84d7ce6f7e699ae540df1fe7468f704aa2a7
+DIST sd-notify-0.4.2.crate 10455 BLAKE2B 703b627c37af0b1849616a9ed2242764e95216e46df2790ee22c4f548f99c68a56ad2c5ae5bb6ce30b67920308ee93875d5d12e6354b0cb3411e5e2c6c365a03 SHA512 deb3855823b7ee2174647f6e9353e45bb3053ca0eebe60730f89fde82375e890652ef5627406c48696606d0384243e51a5bcc67605778cc00f56abc723658885
 DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
-DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
-DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056
+DIST serde-1.0.204.crate 78253 BLAKE2B 6fdebf3cbcc0327b404caaae43c87ba2b6105374a5ee3eaa34d44866e782132cff535da4c069c007783b7b6468d55cb1ceb6a41da74b9eab03ace7cf4811e09e SHA512 2fefbeed0117bd791fd25dd5ad0c99ed4f60aac5919605b6f642050f748dd472bf9d4d121b78b0cfe8719db30a675559d097bcc7542cb57451d1779dfd8d294f
+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_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
@@ -218,17 +226,16 @@ DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8
 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.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 sqlformat-0.2.3.crate 21878 BLAKE2B e9f77dd444d2b4c6f2f8fb2e3790a839cb6f3447eec36b25c7a9de4dad6dac83854be847685c61eaebc19ab7178f69020e103cbc5bd648df016ab4820f67c9a2 SHA512 4e7e3a58ee776277a5b6c5fee8cf623cc8c8ba4e8666a69be2dccb1963600e8fcb72d64c76c304d1a65ce8dde70dc9e5a3e91a3fc6358b3558de00d616e8f3d0
-DIST sqlx-0.7.4.crate 160206 BLAKE2B 696a24269d0061473c4ea93eb47024a40b996271d51ee078f07a2d29a779afc4c587456367da345c9d3ff8389430b0118c3c695aba519d7db2e715634efc4ffa SHA512 d699ca013ea4445f9dad9e8f53d6954a0aa8a1f62c13006998658a925dbcabfca505c6d4b5b3e6becfc158d50009bda7127af1d97c0c379d3cd2e4100438713b
-DIST sqlx-core-0.7.4.crate 107183 BLAKE2B 1a07f5923ef2c2e592d1926fe38c6db887f0fc5cdf8cbfe3633f514fbdc67ec5321682288d083e907f01f6e336d48daef9422b0a0292aec52bce5944b36c2171 SHA512 705c0506efcdebe351ec631f8f367af72fa7756f4b71cb21a2736d1de056bfd186075013972c4f0dcdd4377c082804482fb07788a2c93de3236eb27c53e63a17
-DIST sqlx-macros-0.7.4.crate 1859 BLAKE2B 1d515a7b05fc703a5667b2ade51a4ba6a8a5328a1c5a28ea702a95333a71d910ffa6d529566e141ec0aa4e46a59051d7f2ec3daf9fe1e265ecccac137831ee2c SHA512 521d6ea29895655e13b9dec3cc0adeb8622e3b6354da5ff3974afec93375fc94a1e111bfb7b8eadc954f641892f13035bd3a7b7288308c0479183bd2a0ce67df
-DIST sqlx-macros-core-0.7.4.crate 26613 BLAKE2B 23629e4765d4c9f57a5cf10064821bd99c92017db8553ad7896040810bb07e1b28dc50618b9546f0d5b5903eb606ca741792c1f012f39cf564867adede4ed88a SHA512 e6c2e146ba2850fae5db3d03e1310603f3ba416e10fbdb2757ce1d6b82b32f9ab4c04fa2596c76921984983605098e9a009f14b20b6f5a63aa8625061c7d0090
-DIST sqlx-mysql-0.7.4.crate 57157 BLAKE2B 0c55ba7deab6b22161c4380f980a7ea4724a9f228a4c581ae311acf5c0ea67da6ce2149ef57c6a09b204031dabaef8ebf48dd733f709f02ef6d8c0514562c969 SHA512 d7b87f0f7fda51f39e61b7431225ff7bb117748757afa0e7c64e44af1a496df3d2582f374da6680928ecbe02dfa93bd1d4e17756efd5f47162a42060feb11594
-DIST sqlx-postgres-0.7.4.crate 107488 BLAKE2B 92b5beae12fe0bb631de4a6a78aa4842e5a05163f484e9ee09c95ad74f9e2ee78ef1dc9046624e989b9c16eb5506bb5bdb75a47200b318e27d3e533e031f43ce SHA512 3a2ccf7460316f0934c6eddbe5e328ff9e186cec576404025483abada2773992a69ddf3e59d383d9079f9579590e83adbd79206ce61e1dbb133af63f7e4fa249
-DIST sqlx-sqlite-0.7.4.crate 62113 BLAKE2B 57899a362c5385e226f14bb84c4d740fe2e9d5b18baab3daeecf4c973ebddd56d747d9e682945356bce57f402fd210b27b78818f367e284c09b696fac6732ced SHA512 469570782cf6045274effd420acade433b5b9ae02f98faf6bbb87e0037ff7fc434c7a145da8602f69b1d1b60f9240989cbb87e6db9bf811b72d75ec4073ac4ef
+DIST sqlformat-0.2.4.crate 21923 BLAKE2B ee4dd0fd804acc9b3bb634bf5f40969461b43e1c1861e1d0121edff4e314b13a5d275fbd920c0c2c51612f32834658a631f9615d40273568c78a1a36e47d2889 SHA512 b2d75d92556073a8b2d9965a0aef9748cb6135ffb13ba65004368f0dbe6d733411dc9b00ccb27616cf7d94ffbdefa9670ff8b3d6c6f8a2ec35615364df0b783f
+DIST sqlx-0.8.0.crate 166701 BLAKE2B 19187c6d1631e21017b41c0f2e762807605fffd8cb4410146428b6942200ec9e8ddddc93edc749e597bd3e1bfb836613ddb12c7d53cfabb67779c6f8132d1f94 SHA512 5d781b6ddbb8df0907153f09148ce6918aa8f2e6ed3cec76ac584fa32b8831dbc2dc428eec2675b2e656f90d5470610191fe28283c80a971b13ad67a6ae63145
+DIST sqlx-core-0.8.0.crate 110910 BLAKE2B f44c13fa8038d946420aa9b3cb87930ef47ffedf7db65651404122a115933934b00be83b8fb8ed89ef6cd647ed58c6a5a1c59a0c4cfeceb79927322da59be265 SHA512 6f41e7dae28c97dd5167e3ecaeb4ff35d94812843ab5dd086e5b206742718b745c4f1329a827253b6e746c677b1b6c7f8908fe415a3897a47e4e917e1d6558c4
+DIST sqlx-macros-0.8.0.crate 1952 BLAKE2B 8862972f3b515a1f233b99e800b764af1268848e544fcc12433d265c864f2c9a87ce609547d9e8be2f2e5fd2342a3bd722ff7cccbc91df002b63924737e36964 SHA512 74729055c7baef6a99672f28c64165036357bb67f8de8e12c409fdfb4609dac82fdfb4c48cebb9d6187275d37c4acdca6b2c925c25a52e175548863f59a4f46a
+DIST sqlx-macros-core-0.8.0.crate 25297 BLAKE2B 5750a50c37834210eef9cbd73b36427c1f420722ca6a400eaf20301264f6d28f639adbd49f5295fc6445210477243d3a88c2ad790ab37eacd3c5741f2ee09986 SHA512 7087cc7215e348c7615b7ce17dc841793d38dd0aa14efe2b8a7ecf48898b4237c61cafdeb1171deb49a10cbdb0c93ab5e655c036530b05282554db38f2d5b165
+DIST sqlx-mysql-0.8.0.crate 65632 BLAKE2B 5ee7ead93df26e628b8b61634009656de7dfcef38dfeb3b33ceb7e60cbd44185de581c95aa789299c296d145af64c3b9cd4d51493bc012fa04a242e9ee305c8a SHA512 ad92999bc23e1c67c05c3a53d37e00f5453091c3cf3f5fcc3119cc08c80a7d070e1c26fc929a5d2ac6bf2e1c80ba74759b668e81e1aea62d851ce9d400625490
+DIST sqlx-postgres-0.8.0.crate 117514 BLAKE2B 0d14ddabfe630594013d64dde5e5e6bafd58093bd12004443976e54803e0dd3b1e6dad688b15acf2e886a98083df4e05aab4368efd33b06d06c5eae17eb6f5dc SHA512 d519f18b6736ae3561e3b9f055e07463658e1d5ef70534fdce9f1875a1675c4996ebce8883d39c256d1c7a763e24b9d8f56c87e741f689349c6f1d068dade838
+DIST sqlx-sqlite-0.8.0.crate 68140 BLAKE2B 4e83d67807e5da271f5c1cb097b49e40dfabe49600d018e5f637490eb686952bbebdb66249f29958098a182b9b8b8548fa9daa1081efbe1299128211a8b0227d SHA512 87e6dbda4181d4a58373bac5546c8f43331256da0cdc69899d2ffc54fee244c3db6cd22b00250088071263c9dc1089b48ee81b62545e6c8c4dd147d1cb059065
 DIST stringprep-0.1.5.crate 23573 BLAKE2B 8b5ae2f278603553761e0b98a3f0a02c6a81fd117fee57a8186a015a58ce5ec8d91d9f3decb393f53e07d8df05963f399e63afa46bca937b99f609204582aa50 SHA512 f5dd6ee410e42f285b4da85e76d514ef697cd995c601b5ed23e25f702d920dcc76f15fad41610b6554b692ca0f939f329845535fe4ea167df3ea0e628b1da447
 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
@@ -236,33 +243,34 @@ DIST structmeta-0.3.0.crate 10323 BLAKE2B ef51584d15b856a5b8202edd0adb231bf723cd
 DIST structmeta-derive-0.3.0.crate 12500 BLAKE2B 08acc22a47901012a5ef564f31d03f4c99d5da7a58ae061f9f70aa7bcd0498098777ccaff1c62450a1ccb8083b1a3e5f2fe24092b5b8f4b908bb3a094ba05cc9 SHA512 81afe19d5e647c45a1d18fc54a1d211515fbcb3b65464ec766d5b32dcea7711b898a52360010e024955f89556307c140269aadcd345a2437d2ca1a86f2ea971c
 DIST structopt-0.3.26.crate 53798 BLAKE2B 04be64637d18bcc87d261320668023459a42c167bb5a4c52216df556a7dd19be28032e7bf759cbcf710a3729a9dfaeb20c29f37f35fcf33533db583ac4fa049a SHA512 dec27090b57107473c9d398db68bde3b1b5191e7c7980d7d2c20fc723f92c64a6cf1d391d5122a103222c4262253d8073fd0fdfb11c74f235af79b2ae0caf069
 DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
-DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
+DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd
 DIST supports-color-3.0.0.crate 10123 BLAKE2B 9f0aac61c0f9f8d4f770767539e54995402645e6915b08ae80510f3716bc33d9ca4dd4ee6166e6ac423c342f88173d30f99d63a47a26a80315239d81c37751a8 SHA512 0d878b7fe60844d28896fb82423eb61d1f070f204042db0c04cb65ff7e1b918588cdd87a98c24b480d4e72ab52d9528fdc8d28ec193768087742deb827ef5142
 DIST supports-hyperlinks-3.0.0.crate 8067 BLAKE2B 5fc8fa7f02fe3ba37efe9dd5ea7712ac294cc29d102eebedfcdf3f8c7d50c10a8c308a4858c5f1aecb7047ddff010b240351832a839c67ac66be2ec7d7e66eac SHA512 a64e441dd48a03324fcd159a16d59d1a65bf4745d15e251e315c43a4fe7f27fa15414dfc61616d915e33b1168da304e9163b249d92d2b109bf4f4b0d7ebe48be
 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.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
-DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8
-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 syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
+DIST sync_wrapper-1.0.1.crate 6939 BLAKE2B 5ba3017c80445090b5d1d4c4deb5a639df89a9f58069e136963e52799f8327cd65f9191911d3243e760936c06bdd29884381c375054e1ed3a07ab44b86d7b89e SHA512 9b83ff2f3d379ab955c16279227c7bc4f5c00d3f1541e5a525e8f89cb14499a02c0e8e9ccfbfc16bc59213385f837ea206d4c09116d231d143b6f8b3d769002c
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b
-DIST thiserror-1.0.61.crate 21264 BLAKE2B 97337830507c009dbb4cad84cdfc02bc097b9d39d0af2fdecfaa63f0c12229e60727244fa4e44c2d54daee67bf8b4e8492d94a5de55d1a90b8eeab8c0d082e80 SHA512 9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15
-DIST thiserror-impl-1.0.61.crate 15786 BLAKE2B d63773424aa047c6eed8a6c9bcc8dfcee9841a2d4fdf6fc2c117695c09359371931722198b2e0b2bae32b0c54b6275f964e679b78b8bef1c365ca33aa41562c9 SHA512 b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec
+DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753
+DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
-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.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85
-DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
-DIST tokio-rustls-0.24.1.crate 33049 BLAKE2B b061bc5895b9d7e5aef96512667673ac6fb813a4524b1f6620af9e2598425662b15b5e07d3896499b8a24d820462d15b71a2b9cc804886d546c8ac5957f28529 SHA512 93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa
+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-rustls-0.25.0.crate 30541 BLAKE2B fc85306724dbb91efee7924340e0cbf4557cfeb149cf11dca84e37ca96e6ca54cbe774edaffdaf313da11af98ac03cca23bb7c2ff6ea551f5328a3bf3ee9aa02 SHA512 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95
+DIST tokio-rustls-0.26.0.crate 34253 BLAKE2B faec8cf5b55c5b68549659e82e656d63181b8384d170690b8a22e00b9b7bf4f63cf3f2a0c7a78ed7adc9122253765cf8aa0adebfe620f642f08268ba66ba610e SHA512 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
 DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b
 DIST tokio-tungstenite-0.21.0.crate 28159 BLAKE2B 5ac21d0f51f717e3816ac38ad957d1300bdb16c60d3b6041c80a494dee8b08d12c1b20d7f00d08500ad2f092f9f2c6f2e7c7c00fba1d0f34caec4525e61dd85d SHA512 2ed4baa38ed5f3e19250af71c9142412dd96d59c971f9813e9a633c9764c580f7ea2141719a82251c60c9d2a5fdb22b311fc0f7a297f9363585be4d140c1747b
+DIST tokio-tungstenite-0.23.1.crate 28371 BLAKE2B add4bd4eed1429fe698bbe007d83c892bc13097d4140882353397572f3ef16522854062660f5f140367cfa4710865f2cc4a0086f82d89b3b2c584bd47ace5cae SHA512 ad859f569c916c285dcd861dac659a011e39a4638557730ed297436f6969213fd1c48dd7ba48270ce8b31a61609c6353ffa134eda7d0d71b144852d52919af81
 DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360
+DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c
+DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e
 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-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0
@@ -273,6 +281,7 @@ DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a25113
 DIST tracing-subscriber-0.2.25.crate 149469 BLAKE2B 4624243b66571b88ade80cdd7ea4a9ab1ddb44f62bd0c373b3d4b121103f4001ed6c0276fd25920dd308dbf3aa73b98f04fb5105224eafe14d721bc27ab24a81 SHA512 edefa55a94b4abc1641df4190ad4da121320d402f8c413d00697b05d35100133f8955ab672c32bd795fc0965ac5b5e6ce09cab5147e8c77c262b8f9340647712
 DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
 DIST tungstenite-0.21.0.crate 59858 BLAKE2B 0037dea162a8e6bb3ba0d27edfe4f4063ce6f28505b5cb127374ed4f4c0a2b70c9640cb9dba54a7b9918d1d716f347ad7899d2a9328e3e70b07f8e947d3fec18 SHA512 44a9826d68b61ec4b65bf72a12800674edd1eff8e9fae3fcb272276f6f598edffc7e1b36f2564494520414b3b426a860a32c6543c07d9f1c1404490e1c0e431e
+DIST tungstenite-0.23.0.crate 61196 BLAKE2B a49f4da9b2c073819ca750ada52d9a1cb92b8cd747a28b35300f72b52afb0d2bef510bf7c297e28f5262133c74e9da3d599ce467bc4849447ca25deb1d6820d3 SHA512 1f5937470b78cb5598426cb73532835e348d620fd007a627a8c653da6b26c95a52dc9e95d9de71dec32a6e8a55929fd7fedd839d3eefc354b32a6c0d0da1dc26
 DIST typed-arena-1.7.0.crate 9927 BLAKE2B ff8fd0f87e69634d53b87b070499d3d119d9f153e0f06e27afbd3f96da6918136a83162f4e9374061ddd215845f75844251e3fb079d57266ea8502cf321eaf9e SHA512 506a90a11576e5a4135b46c5c4705db461a8ec1bba980c9ea65e8c4399bcc85898b7f81312acf4bc0b24a29d1b940d8dfe0352ad59985153743948616da5ed8e
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST uncased-0.9.10.crate 10872 BLAKE2B 33dc5de7d08a3134a772308d9e92231a4fc92ede7f5bef57217e23127b1efdc76da6b69503f5c3a48e255c088d0945725ec23327bb291759c76a0b98715bc990 SHA512 efc06b45f24ca65a675b03a292c3ca40b330e54d9d53f0a619f42a2ea0597a6a5efb532a5a03e3b066287adc4d488d49d6306d5581e26dc7bd451cf38bb6012b
@@ -283,18 +292,18 @@ DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09f
 DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
 DIST unicode-properties-0.1.1.crate 41088 BLAKE2B 1cbe1df6b2d17ede3b83a65fcd09948637428d1ea17a051ea9da62b97a5564d34a39d3105e3d49362d52ad637656210cf03cfaae4b7b759a483a346e05c0db89 SHA512 377ce59a78cb7a0b5f040c90cd80ca800e9e48867df69ed3a5476618613c3520a3fb9306b212dcefc927e44db52f2cca99839b5ff762446dc190019f3ae0a039
 DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
-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_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b0547610f3417616603c4e837fbec0a41a6a715de19f88432f4c15ddb6b2ba55ee75a472fb7e2c888accfc77e1ef1d85fee SHA512 2d15499ee9318ee54910d657339820acfa88183e4f9aa146ac655129d2c4d76d3fd0550b601702ad2ccac4c8647dd2f26528d8003f39181e09b8ef480351a3cb
 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
-DIST ureq-2.9.7.crate 113834 BLAKE2B e80ea64d610ab01d129527a120878ac3eb38248885c772aead6fb983f777b7469f7debd042ce93c0bfb6adeeb7ed476f7dd96c62de386ec2d64dbed28973a829 SHA512 33893aa1df316b5987571ce6b46373c625ed89e452a313f9490d63896f144e56ee0c35c1eaec77eb8d2a66e7726f3dae6e96bd2ee0db7c0604485105fc69bef4
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
+DIST ureq-2.10.0.crate 112894 BLAKE2B e6c9c56cd4790aa842e2a07cbfdaf81d6971bdbc31d924d27eb3839abf7c5261e33aef3aad8b5a2c7f897eb798b107e987e2b64e9df66ca8095885f7e0cb740b SHA512 a04831abe500771bec2394993e79092c37d02106623bd49d45acf18eba51d5324723e1650ec13d2ae20cd23d4f8c2b66ab8cf179e39e81dca6c0cc04208695af
+DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
-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
 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 want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
 DIST warp-0.3.7.crate 117428 BLAKE2B 37b92dbf5fc2099a4e541a3f6fe9bb84795586d8c2ddcbbb7e03a42a9363bbd5296fa524d7bbfcce2883d419d50b8e34975c72d5c9a518075d6dd2df37fbd2a2 SHA512 8dc2dcb5a64555caa5cf74617cc5fc4fe3874d55f4df1b455e6b68c855fe8791f979c622d64b7e357085e322a047cce411c4dc751ecb608c9832abf7550db5a0
 DIST warp-real-ip-0.2.0.crate 2855 BLAKE2B 51706a13462b52f9d554db98b4f1242cb4d5b4dbfa50e487f1478f04ba2c23ba52a4f5e36e21473659726ff643770a1df6c58d9cece81df612389bad08eb5111 SHA512 611730a3f9ee8938906ac926c202a53ece59f83eda5bb4ec48a69ac85fdfa8f48db13421e7159cbb6c5bd9e5f5f63b1307766bed8f6d275f1b377d58e3349350
@@ -308,7 +317,7 @@ DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740
 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 webpki-roots-0.25.4.crate 253559 BLAKE2B 737f608323fec02b77c47a40f8b2f9bf44f1b29d32b936fd7bd8c1066efd8916451b96ffab8949f5b5ba537bb1ed6300143bf51d1ef8663ce5a9a7a33947e81d SHA512 4891aa5c6a5bb8a4d6bd730fca5ab5bbddb5a39b9267c81951ca8d3ff0dbcd305b498328f99b2da79ac65cdc9dfa42c40631a4f8d6975ac6f4ed9c85a8d2178e
-DIST webpki-roots-0.26.1.crate 249748 BLAKE2B 6a2468eb2f868c65c599d2f6664798f75e77cb7a7228a2c7285ee5256cb01d110709474feb389991f12ba0d143211770c6922932c7fab01b4b0e37b612cbd453 SHA512 89ac53267d850953aa78550a60f58f5bcb0f9e885c4c448911dc55bbb8dbc3fb845cd7545fc40ff26998b0c360756de85206adcb148ca6190e50bc2daea7f61f
+DIST webpki-roots-0.26.3.crate 248438 BLAKE2B a296c399ea8c03791a8026ff8df0e59d601fbad251468cfe054fd513f8e855e754dc7bd15a461000e42fd8ed2a02802721b843ed3613b600b92ff4b9af67db71 SHA512 339aecf2c4f1d88283db73988649834011564d82dd5eba0da2e2c6764d21908a94ff78ca8fc463c96b9cebd471aecda3cbbcf274b3beb640b5915a3ab2626f53
 DIST whoami-1.5.1.crate 24026 BLAKE2B 50a438f171c220aa19a4db7bb1a2ba6871f02bd47fe98e3d66bdf7662ea096a6bb612459b47178bc3aae85d1b58457a1ce5143a1176b23433b6cc4fa1da1c2c2 SHA512 b2cf3e2b8d1a12590055c3bb69c4a11448c846b837e44fb0041f030c31d6faa9ee55830a3fb07915adb8767936c06c7447718a4de46f3eda7ecc0f53a8140804
 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
@@ -317,24 +326,24 @@ DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305de
 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-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.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.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.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
-DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
+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.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.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.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.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
-DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787
+DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
+DIST winreg-0.52.0.crate 30148 BLAKE2B 7b458d356ed1385b23ace88d8a7e2a4e2e3211ba4bd22e6488b60fe508ab2b5f6d93c7547e45e0564f512391a8fbc2af1bbd3e3e3a773865d87adff67b5b2fb5 SHA512 50659afe4fa9671696bb5c6a50d62e493ef5359a324a71f7877e2ff0b522560ad65196ac6d2f7f4117edb2e47e84adce7d1de5ed2ce273f132cb2d5006472e25
 DIST xpath_reader-0.5.3.crate 10569 BLAKE2B d83d24939972128ae216566792cb56d2e95541a4f9ca4551a3f61670570f5b45ab6200b6a348b6db00e861b6415b857e91da270e9b24fa34945c5d6e5a0b15a2 SHA512 cf5aeadd6c4828a12b3cb9114d496940784f73dd34d659e1e96524330056b54bd922bd3ef74029a5a0a3b0f6dee284656ba224a5027f89e224c0984a1c3bcaaa
-DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
-DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
+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/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.6.12.ebuild b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.6.12.ebuild
deleted file mode 100644
index ca06bef7a5a0..000000000000
--- a/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.6.12.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-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.21.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
-	ansi_term@0.12.1
-	anstream@0.6.14
-	anstyle-parse@0.2.4
-	anstyle-query@1.0.3
-	anstyle-wincon@3.0.3
-	anstyle@1.0.7
-	async-stream-impl@0.3.5
-	async-stream@0.3.5
-	async-trait@0.1.80
-	atoi@0.3.3
-	atoi@2.0.0
-	atty@0.2.14
-	autocfg@1.3.0
-	backtrace-ext@0.2.1
-	backtrace@0.3.71
-	base64@0.13.1
-	base64@0.21.7
-	base64@0.22.1
-	base64ct@1.6.0
-	beef@0.5.2
-	bitflags@1.3.2
-	bitflags@2.5.0
-	block-buffer@0.10.4
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.6.0
-	cc@1.0.98
-	cfg-if@1.0.0
-	chrono@0.4.38
-	clap@2.34.0
-	clap@4.5.4
-	clap_builder@4.5.2
-	clap_derive@4.5.4
-	clap_lex@0.7.0
-	colorchoice@1.0.1
-	combine@4.6.7
-	const-oid@0.9.6
-	core-foundation-sys@0.8.6
-	core-foundation@0.9.4
-	cpufeatures@0.2.12
-	crc-catalog@2.4.0
-	crc16@0.4.0
-	crc32fast@1.4.2
-	crc@3.2.1
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crypto-common@0.1.6
-	dashmap@5.5.3
-	data-encoding@2.6.0
-	der@0.7.9
-	derivative@2.2.0
-	digest@0.10.7
-	dotenvy@0.15.7
-	either@1.12.0
-	encoding_rs@0.8.34
-	equivalent@1.0.1
-	errno@0.3.9
-	etcetera@0.8.0
-	event-listener@2.5.3
-	fastrand@2.1.0
-	flate2@1.0.30
-	flexi_logger@0.28.0
-	flume@0.11.0
-	fnv@1.0.7
-	form_urlencoded@1.2.1
-	futures-channel@0.3.30
-	futures-core@0.3.30
-	futures-executor@0.3.30
-	futures-intrusive@0.5.0
-	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.15
-	gimli@0.28.1
-	glob@0.3.1
-	h2@0.3.26
-	hashbrown@0.14.5
-	hashlink@0.8.4
-	headers-core@0.2.0
-	headers@0.3.9
-	heck@0.3.3
-	heck@0.4.1
-	heck@0.5.0
-	hermit-abi@0.1.19
-	hermit-abi@0.3.9
-	hex@0.4.3
-	hkdf@0.12.4
-	hmac@0.12.1
-	home@0.5.9
-	http-auth-basic@0.3.3
-	http-body@0.4.6
-	http@0.2.12
-	http@1.1.0
-	httparse@1.8.0
-	httpdate@1.0.3
-	hyper-rustls@0.24.2
-	hyper@0.14.28
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	idna@0.5.0
-	indexmap@2.2.6
-	ipnet@2.9.0
-	is-terminal@0.4.12
-	is_ci@1.2.0
-	is_terminal_polyfill@1.70.0
-	itertools@0.12.1
-	itoa@1.0.11
-	js-sys@0.3.69
-	lazy_static@1.4.0
-	libc@0.2.155
-	libm@0.2.8
-	libsqlite3-sys@0.27.0
-	linux-raw-sys@0.4.14
-	lock_api@0.4.12
-	log@0.4.21
-	logos-codegen@0.14.0
-	logos-derive@0.14.0
-	logos@0.14.0
-	matchers@0.0.1
-	md-5@0.10.6
-	memchr@2.7.2
-	miette-derive@7.2.0
-	miette@7.2.0
-	mime@0.3.17
-	mime_guess@2.0.4
-	mini-redis@0.4.1
-	minimal-lexical@0.2.1
-	miniz_oxide@0.7.3
-	mio@0.8.11
-	multer@2.1.0
-	nextcloud-config-parser@0.10.0
-	nextcloud_appinfo@0.6.0
-	nom@7.1.3
-	nu-ansi-term@0.49.0
-	num-bigint-dig@0.8.4
-	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
-	owo-colors@4.0.0
-	parking_lot@0.12.3
-	parking_lot_core@0.9.10
-	parse-display-derive@0.9.0
-	parse-display@0.9.0
-	paste@1.0.15
-	pem-rfc7468@0.7.0
-	percent-encoding@2.3.1
-	peresil@0.3.0
-	php-literal-parser@0.6.0
-	pin-project-internal@1.1.5
-	pin-project-lite@0.2.14
-	pin-project@1.1.5
-	pin-utils@0.1.0
-	pkcs1@0.7.5
-	pkcs8@0.10.2
-	pkg-config@0.3.30
-	ppv-lite86@0.2.17
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.84
-	quick-error@1.2.3
-	quote@1.0.36
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	redis@0.25.3
-	redox_syscall@0.4.1
-	redox_syscall@0.5.1
-	regex-automata@0.1.10
-	regex-automata@0.4.6
-	regex-syntax@0.6.29
-	regex-syntax@0.8.3
-	regex@1.10.4
-	reqwest@0.11.27
-	rfc7239@0.1.1
-	ring@0.17.8
-	rsa@0.9.6
-	rustc-demangle@0.1.24
-	rustix@0.38.34
-	rustls-pemfile@1.0.4
-	rustls-pemfile@2.1.2
-	rustls-pki-types@1.7.0
-	rustls-webpki@0.101.7
-	rustls-webpki@0.102.4
-	rustls@0.21.12
-	rustls@0.22.4
-	ryu@1.0.18
-	scoped-tls@1.0.1
-	scopeguard@1.2.0
-	sct@0.7.1
-	sd-notify@0.4.1
-	semver-parser@0.7.0
-	semver@0.10.0
-	serde@1.0.203
-	serde_derive@1.0.203
-	serde_json@1.0.117
-	serde_urlencoded@0.7.1
-	sha1@0.10.6
-	sha2@0.10.8
-	sharded-slab@0.1.7
-	signal-hook-registry@1.4.2
-	signature@2.2.0
-	slab@0.4.9
-	smallvec@1.13.2
-	smawk@0.3.2
-	socket2@0.5.7
-	spin@0.5.2
-	spin@0.9.8
-	spki@0.7.3
-	sqlformat@0.2.3
-	sqlx-core@0.7.4
-	sqlx-macros-core@0.7.4
-	sqlx-macros@0.7.4
-	sqlx-mysql@0.7.4
-	sqlx-postgres@0.7.4
-	sqlx-sqlite@0.7.4
-	sqlx@0.7.4
-	stringprep@0.1.5
-	strsim@0.11.1
-	strsim@0.8.0
-	structmeta-derive@0.3.0
-	structmeta@0.3.0
-	structopt-derive@0.4.18
-	structopt@0.3.26
-	subtle@2.5.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.66
-	sync_wrapper@0.1.2
-	system-configuration-sys@0.5.0
-	system-configuration@0.5.1
-	tempfile@3.10.1
-	terminal_size@0.3.0
-	textwrap@0.11.0
-	textwrap@0.16.1
-	thiserror-impl@1.0.61
-	thiserror@1.0.61
-	thread_local@1.1.8
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	tokio-macros@2.2.0
-	tokio-rustls@0.24.1
-	tokio-rustls@0.25.0
-	tokio-stream@0.1.15
-	tokio-tungstenite@0.21.0
-	tokio-util@0.7.11
-	tokio@1.37.0
-	tower-service@0.3.2
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing-futures@0.2.5
-	tracing-log@0.1.4
-	tracing-serde@0.1.3
-	tracing-subscriber@0.2.25
-	tracing@0.1.40
-	try-lock@0.2.5
-	tungstenite@0.21.0
-	typed-arena@1.7.0
-	typenum@1.17.0
-	uncased@0.9.10
-	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-properties@0.1.1
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.12
-	unicode_categories@0.1.1
-	untrusted@0.9.0
-	ureq@2.9.7
-	url@2.5.0
-	urlencoding@2.1.3
-	utf-8@0.7.6
-	utf8parse@0.2.1
-	valuable@0.1.0
-	vcpkg@0.2.15
-	vec_map@0.8.2
-	version_check@0.9.4
-	want@0.3.1
-	warp-real-ip@0.2.0
-	warp@0.3.7
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasite@0.1.0
-	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
-	webpki-roots@0.25.4
-	webpki-roots@0.26.1
-	whoami@1.5.1
-	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
-	winreg@0.50.0
-	xpath_reader@0.5.3
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zeroize@1.8.1
-"
-
-inherit cargo systemd
-
-DESCRIPTION="Push daemon for Nextcloud clients"
-HOMEPAGE="https://github.com/nextcloud/notify_push"
-SRC_URI="https://github.com/nextcloud/notify_push/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/notify_push-${PV}"
-
-LICENSE="AGPL-3"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD GPL-3 ISC MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-
-	# default name is too generic
-	mv "${ED}/usr/bin/notify_push" "${ED}/usr/bin/${PN}" || die
-
-	newconfd "${FILESDIR}/${PN}-r1.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-r2.init" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf" "${PN}"
-
-	# restrict access because conf.d entry could contain
-	# database credentials
-	fperms 0640 "/etc/conf.d/${PN}"
-}
-
-pkg_postinst() {
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if ver_test "${oldver}" -lt "0.6.6"; then
-			ewarn "You are upgrading from $oldver to ${PVR}"
-			ewarn "The systemd unit file for nextcloud-notify_push no longer sources ${EPREFIX}/etc/conf.d/nextcloud-notify_push ."
-			ewarn "Configuration is still done via ${EPREFIX}/etc/conf.d/nextcloud-notify_push for OpenRC systems"
-			ewarn "while for systemd systems, a systemd drop-in file located at"
-			ewarn "${EPREFIX}/etc/systemd/system/nextcloud-notify_push.d/00gentoo.conf"
-			ewarn "is used for configuration."
-			break
-		fi
-	done
-}
diff --git a/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.7.0.ebuild b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.7.0.ebuild
new file mode 100644
index 000000000000..d5f61873f5fb
--- /dev/null
+++ b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.7.0.ebuild
@@ -0,0 +1,409 @@
+# Copyright 1999-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.22.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
+	ansi_term@0.12.1
+	anstream@0.6.15
+	anstyle-parse@0.2.5
+	anstyle-query@1.1.1
+	anstyle-wincon@3.0.4
+	anstyle@1.0.8
+	arc-swap@1.7.1
+	async-stream-impl@0.3.5
+	async-stream@0.3.5
+	async-trait@0.1.81
+	atoi@0.3.3
+	atoi@2.0.0
+	atty@0.2.14
+	autocfg@1.3.0
+	backtrace-ext@0.2.1
+	backtrace@0.3.73
+	base64@0.13.1
+	base64@0.21.7
+	base64@0.22.1
+	base64ct@1.6.0
+	beef@0.5.2
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	bumpalo@3.16.0
+	byteorder@1.5.0
+	bytes@1.6.1
+	cc@1.1.6
+	cfg-if@1.0.0
+	chrono@0.4.38
+	clap@2.34.0
+	clap@4.5.11
+	clap_builder@4.5.11
+	clap_derive@4.5.11
+	clap_lex@0.7.2
+	colorchoice@1.0.2
+	combine@4.6.7
+	concurrent-queue@2.5.0
+	const-oid@0.9.6
+	core-foundation-sys@0.8.6
+	cpufeatures@0.2.12
+	crc-catalog@2.4.0
+	crc16@0.4.0
+	crc32fast@1.4.2
+	crc@3.2.1
+	crossbeam-queue@0.3.11
+	crossbeam-utils@0.8.20
+	crypto-common@0.1.6
+	dashmap@6.0.1
+	data-encoding@2.6.0
+	der@0.7.9
+	derivative@2.2.0
+	digest@0.10.7
+	dotenvy@0.15.7
+	either@1.13.0
+	encoding_rs@0.8.34
+	equivalent@1.0.1
+	errno@0.3.9
+	etcetera@0.8.0
+	event-listener@5.3.1
+	fastrand@2.1.0
+	flate2@1.0.30
+	flexi_logger@0.28.5
+	flume@0.11.0
+	fnv@1.0.7
+	form_urlencoded@1.2.1
+	futures-channel@0.3.30
+	futures-core@0.3.30
+	futures-executor@0.3.30
+	futures-intrusive@0.5.0
+	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.15
+	gimli@0.29.0
+	glob@0.3.1
+	h2@0.3.26
+	hashbrown@0.14.5
+	hashlink@0.9.1
+	headers-core@0.2.0
+	headers@0.3.9
+	heck@0.3.3
+	heck@0.5.0
+	hermit-abi@0.1.19
+	hermit-abi@0.3.9
+	hex@0.4.3
+	hkdf@0.12.4
+	hmac@0.12.1
+	home@0.5.9
+	http-auth-basic@0.3.3
+	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
+	hyper-rustls@0.27.2
+	hyper-util@0.1.6
+	hyper@0.14.30
+	hyper@1.4.1
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.60
+	idna@0.5.0
+	indexmap@2.2.6
+	ipnet@2.9.0
+	is_ci@1.2.0
+	is_terminal_polyfill@1.70.1
+	itoa@1.0.11
+	js-sys@0.3.69
+	lazy_static@1.5.0
+	libc@0.2.155
+	libm@0.2.8
+	libsqlite3-sys@0.28.0
+	linux-raw-sys@0.4.14
+	lock_api@0.4.12
+	log@0.4.22
+	logos-codegen@0.14.0
+	logos-derive@0.14.0
+	logos@0.14.0
+	matchers@0.0.1
+	md-5@0.10.6
+	memchr@2.7.4
+	miette-derive@7.2.0
+	miette@7.2.0
+	mime@0.3.17
+	mime_guess@2.0.5
+	mini-redis@0.4.1
+	minimal-lexical@0.2.1
+	miniz_oxide@0.7.4
+	mio@1.0.1
+	multer@2.1.0
+	nextcloud-config-parser@0.11.0
+	nextcloud_appinfo@0.6.0
+	nom@7.1.3
+	nu-ansi-term@0.50.1
+	num-bigint-dig@0.8.4
+	num-bigint@0.4.6
+	num-integer@0.1.46
+	num-iter@0.1.45
+	num-traits@0.2.19
+	object@0.36.2
+	once_cell@1.19.0
+	owo-colors@4.0.0
+	parking@2.2.0
+	parking_lot@0.12.3
+	parking_lot_core@0.9.10
+	parse-display-derive@0.9.1
+	parse-display@0.9.1
+	paste@1.0.15
+	pem-rfc7468@0.7.0
+	percent-encoding@2.3.1
+	peresil@0.3.0
+	php-literal-parser@0.6.1
+	pin-project-internal@1.1.5
+	pin-project-lite@0.2.14
+	pin-project@1.1.5
+	pin-utils@0.1.0
+	pkcs1@0.7.5
+	pkcs8@0.10.2
+	pkg-config@0.3.30
+	ppv-lite86@0.2.17
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.86
+	quick-error@1.2.3
+	quinn-proto@0.11.3
+	quinn-udp@0.5.4
+	quinn@0.11.2
+	quote@1.0.36
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	redis@0.26.0
+	redox_syscall@0.4.1
+	redox_syscall@0.5.3
+	regex-automata@0.1.10
+	regex-automata@0.4.7
+	regex-syntax@0.6.29
+	regex-syntax@0.8.4
+	regex@1.10.5
+	reqwest@0.12.5
+	rfc7239@0.1.1
+	ring@0.17.8
+	rsa@0.9.6
+	rustc-demangle@0.1.24
+	rustc-hash@1.1.0
+	rustix@0.38.34
+	rustls-pemfile@1.0.4
+	rustls-pemfile@2.1.2
+	rustls-pki-types@1.7.0
+	rustls-webpki@0.101.7
+	rustls-webpki@0.102.6
+	rustls@0.21.12
+	rustls@0.22.4
+	rustls@0.23.12
+	ryu@1.0.18
+	scoped-tls@1.0.1
+	scopeguard@1.2.0
+	sct@0.7.1
+	sd-notify@0.4.2
+	semver-parser@0.7.0
+	semver@0.10.0
+	serde@1.0.204
+	serde_derive@1.0.204
+	serde_json@1.0.120
+	serde_urlencoded@0.7.1
+	sha1@0.10.6
+	sha2@0.10.8
+	sharded-slab@0.1.7
+	signal-hook-registry@1.4.2
+	signature@2.2.0
+	slab@0.4.9
+	smallvec@1.13.2
+	smawk@0.3.2
+	socket2@0.5.7
+	spin@0.9.8
+	spki@0.7.3
+	sqlformat@0.2.4
+	sqlx-core@0.8.0
+	sqlx-macros-core@0.8.0
+	sqlx-macros@0.8.0
+	sqlx-mysql@0.8.0
+	sqlx-postgres@0.8.0
+	sqlx-sqlite@0.8.0
+	sqlx@0.8.0
+	stringprep@0.1.5
+	strsim@0.11.1
+	strsim@0.8.0
+	structmeta-derive@0.3.0
+	structmeta@0.3.0
+	structopt-derive@0.4.18
+	structopt@0.3.26
+	subtle@2.6.1
+	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.72
+	sync_wrapper@1.0.1
+	tempfile@3.10.1
+	terminal_size@0.3.0
+	textwrap@0.11.0
+	textwrap@0.16.1
+	thiserror-impl@1.0.63
+	thiserror@1.0.63
+	thread_local@1.1.8
+	tinyvec@1.8.0
+	tinyvec_macros@0.1.1
+	tokio-macros@2.4.0
+	tokio-rustls@0.25.0
+	tokio-rustls@0.26.0
+	tokio-stream@0.1.15
+	tokio-tungstenite@0.21.0
+	tokio-tungstenite@0.23.1
+	tokio-util@0.7.11
+	tokio@1.39.1
+	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-futures@0.2.5
+	tracing-log@0.1.4
+	tracing-serde@0.1.3
+	tracing-subscriber@0.2.25
+	tracing@0.1.40
+	try-lock@0.2.5
+	tungstenite@0.21.0
+	tungstenite@0.23.0
+	typed-arena@1.7.0
+	typenum@1.17.0
+	uncased@0.9.10
+	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-properties@0.1.1
+	unicode-segmentation@1.11.0
+	unicode-width@0.1.13
+	unicode_categories@0.1.1
+	untrusted@0.9.0
+	ureq@2.10.0
+	url@2.5.2
+	urlencoding@2.1.3
+	utf-8@0.7.6
+	utf8parse@0.2.2
+	valuable@0.1.0
+	vcpkg@0.2.15
+	vec_map@0.8.2
+	version_check@0.9.5
+	want@0.3.1
+	warp-real-ip@0.2.0
+	warp@0.3.7
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasite@0.1.0
+	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
+	webpki-roots@0.25.4
+	webpki-roots@0.26.3
+	whoami@1.5.1
+	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.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
+	winreg@0.52.0
+	xpath_reader@0.5.3
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+	zeroize@1.8.1
+"
+
+inherit cargo systemd
+
+DESCRIPTION="Push daemon for Nextcloud clients"
+HOMEPAGE="https://github.com/nextcloud/notify_push"
+SRC_URI="https://github.com/nextcloud/notify_push/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/notify_push-${PV}"
+
+LICENSE="AGPL-3"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD GPL-3 ISC MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+
+	# default name is too generic
+	mv "${ED}/usr/bin/notify_push" "${ED}/usr/bin/${PN}" || die
+
+	newconfd "${FILESDIR}/${PN}-r1.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}-r2.init" "${PN}"
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf" "${PN}"
+
+	# restrict access because conf.d entry could contain
+	# database credentials
+	fperms 0640 "/etc/conf.d/${PN}"
+}
+
+pkg_postinst() {
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if ver_test "${oldver}" -lt "0.6.6"; then
+			ewarn "You are upgrading from $oldver to ${PVR}"
+			ewarn "The systemd unit file for nextcloud-notify_push no longer sources ${EPREFIX}/etc/conf.d/nextcloud-notify_push ."
+			ewarn "Configuration is still done via ${EPREFIX}/etc/conf.d/nextcloud-notify_push for OpenRC systems"
+			ewarn "while for systemd systems, a systemd drop-in file located at"
+			ewarn "${EPREFIX}/etc/systemd/system/nextcloud-notify_push.d/00gentoo.conf"
+			ewarn "is used for configuration."
+			break
+		fi
+	done
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index eee712c27862..11d41378d394 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -6,5 +6,5 @@ DIST nextcloud-28.0.1.tar.bz2 183887041 BLAKE2B 137cf74cb356b5b339e49b74b618bb38
 DIST nextcloud-28.0.6.tar.bz2 188259629 BLAKE2B 304d98076d02a190143d0e9846405a029a16b268eec2dfddde8746deae7ef02e0acd5f7a9a7303e454fbc4d828496cfc101c59e8664834e8a9691ae0c586c8f0 SHA512 f34c895602bd63f2e61492e91b9949852f9d2422c3b8740e851107efe5d46de72d8ec06a15c808fa27503546067d62d3166b55ff9979b18f36546845791941c2
 DIST nextcloud-28.0.7.tar.bz2 188700312 BLAKE2B c408b052562ce717fc41226df3ae6ffd6202de213ecf9074572133ba4d30a1c0be44a289d80577c4f663943a43dbf2bf71d60055c602eef569eba3ce174a8298 SHA512 6a8172f05ce58e594a66e2918583e05b97365217b1d2977aeee85e10e77bd869a7ddebceddef9070e0ac40d5e8e2e2348c1e0a9cdf56094bd6b8ca679696d9f2
 DIST nextcloud-29.0.2.tar.bz2 205723162 BLAKE2B c33cc2a13e797cb2777bed7d1c17d4559a83195b186bb62025d7f0c32e75a739979556eb842773fee2bb6c6af24e9f0adf1740b6896814d706f4e8d1c730a0fc SHA512 1d595e4f7c0159cf62120f786c1b4a1d6221bdd000d3c7f45990c287319ee8b87ba70d036eb740073752bc9f80403f939c576fe5398bb37e2063483840d9fc67
-DIST nextcloud-29.0.3.tar.bz2 205947783 BLAKE2B 406b80d3f31f80d2480c3b0d5d0f9017cb5ef3c597c7ae902536864ba113b85b3450c255283c98205ba4d8baf37c460f3741b953857f76972d361107267488be SHA512 b3e27bff91446b33fd26408577a9ee04ef74684de37cf9971e572fd00ca9c864060e6fee3a30279488fd3b1fdbe3497da607241ae2eb1b566fa2cef9142ad900
 DIST nextcloud-29.0.4.tar.bz2 204867575 BLAKE2B ac91ecb560631762000cf0c6ef69a5262aa67591837e36373550201e075df629f64d63329925671af08f05f987da35046cdaf4b44d48f2e30d5d7fdb026a16a9 SHA512 65508d9610d4b459f11bceadd61d19eb8165e6804c658c4492fb97843c86107bfc75d080156d1afcf5a029ad143b77277cc4e63890444c089e1047f17db1e085
+DIST nextcloud-29.0.5.tar.bz2 204001633 BLAKE2B 00ff6d5fbb758feb0587145726cfa4bffeaa8946ae19ad93aa85dcd47cab6f9ba4c7264d1949d86839ce8053a251c264bb40a37b0bb2248dc617e3b7079b84cc SHA512 65576b4dbb865bd05378cbbe9040d78c3c8e212f0f259451a00b724af821374d8157cdcdd1db8a4eb0a52afa8d307a856e3a0e76883be116cf5c44e239b7fa05
diff --git a/www-apps/nextcloud/nextcloud-29.0.4.ebuild b/www-apps/nextcloud/nextcloud-29.0.4.ebuild
index cdae29e997d4..0c19c34f59e4 100644
--- a/www-apps/nextcloud/nextcloud-29.0.4.ebuild
+++ b/www-apps/nextcloud/nextcloud-29.0.4.ebuild
@@ -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.3.ebuild b/www-apps/nextcloud/nextcloud-29.0.5.ebuild
index cdae29e997d4..cdae29e997d4 100644
--- a/www-apps/nextcloud/nextcloud-29.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-29.0.5.ebuild
diff --git a/www-apps/prowlarr-bin/Manifest b/www-apps/prowlarr-bin/Manifest
index d6fb76762443..1463d1a3f829 100644
--- a/www-apps/prowlarr-bin/Manifest
+++ b/www-apps/prowlarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Prowlarr.master.1.22.0.4670.linux-core-arm.tar.gz 88794985 BLAKE2B 614cba0a70f7a33c94e5a0030ba5b1d9a2dcf289a3f084da3927b1d271335f7c97528e6352960e197e0bbe4b14a9f953d03a9f660080127b6ff324df48f04cd2 SHA512 56734c767311637bb9441300f52e6689d8e5380edee3ac4c833722424db9bceb240d938905a12df79f81d36f30c4068162f501483dea110a338670095bea23c9
-DIST Prowlarr.master.1.22.0.4670.linux-core-arm64.tar.gz 88094426 BLAKE2B 5cc45abda84803affa86ce4ebc8e461448af77eb6db9580c21bd782d1478e700f0885a3652954145339368514524149c90853db9a76e5479a76d2482d72ffdb7 SHA512 17d8af8efad58e08d558f21c5389e1d2551b8d5b9ad2b5efb40a481399540c8873cb540476e8dc3d60d5fe9b4bbe11401e8babd35b642eda9fb1dc744c7c2d28
-DIST Prowlarr.master.1.22.0.4670.linux-core-x64.tar.gz 93107779 BLAKE2B b3770836e251047372d2920710cc32b5232f46e50093becd2820f6afac7291d7506e21111a14db15611f959e2b221fbef137fb2a3f9fc6d2c1bfa0e55ec12377 SHA512 731cb67f2c515613b3566e51955dad696d38660d8801b4841e7ac8646b431da3656c7f7b799bab55836c428fe84a11dc2c7f2fd2709f58238e40da89f5f55d46
-DIST Prowlarr.master.1.22.0.4670.linux-musl-core-arm.tar.gz 88862388 BLAKE2B 125fe61d4ac15299caf8825c6ccb81d9a3bc4cc12da9edf379d6b424339da5b6bf47ab595360015e5dc24c448b6def594c0ca477a6ab658900b7c40b2b8c4c79 SHA512 75187bdc7e5df5b041dcf678baaeccbd9a7ecb4a199393f75cf45eefca0e4de4931ac66ceeffd0c8609f967eb0890a5e7109fdfc4dfa01a929ab326c1d17a749
-DIST Prowlarr.master.1.22.0.4670.linux-musl-core-arm64.tar.gz 88155306 BLAKE2B 8c3fdec8442ebb11b15393a7ad1b6beef6b90856dc7bc6aece0ecb932c87ad04772a58cb75e16b81a89c5ec3f817c389e1309be1684a4de716de31002075def2 SHA512 4f7de9f814128c8e2fd5e80fff95b51b0bd7401f91d8c2e14c2af275e0e9dad2bb52368f251a6cdf2a30e14dec9f71b94cf039eba23fa9237c078ed3393606fa
-DIST Prowlarr.master.1.22.0.4670.linux-musl-core-x64.tar.gz 92161075 BLAKE2B 041636f28d7eb89b143117d94876e431b1187d5719bb1ec238ed0b4f2da18a03745a55a968ced68132cc4b0e9163d0e52bcbc22141706863f5d05d998ba32d3a SHA512 c1ecbdb5b3aef5a8a4afd95d19a407023d33e4d41a548a41b3e29487b236d1659ea87118787b7dc0c88d88e1e1aecae4dd3e6ecebc0b652c9ffd41225a127d8a
+DIST Prowlarr.develop.1.24.0.4721.linux-core-arm.tar.gz 88886477 BLAKE2B ec9d0aced49a7ef9f45037e23ca55341f088bf5b7fcf504bd216632e93f714707c2ea5ab04431756c0f7a0c88c50e46fba2fd11d861977499b676850507a7e31 SHA512 a2d41558fed0bd0f15ecdff52a22b3368080ffb2726fe6a591789c593946b226051d3cc2108f839d4e789821dac2fe28d0cbfb5ba0258c23905084813bce77cb
+DIST Prowlarr.develop.1.24.0.4721.linux-core-arm64.tar.gz 88171398 BLAKE2B 48b3b878244c41dd98356a74161bff1d55fd1296bade80a203e38b703f69ff96cc77fe3471be538ce01f1f60f685952a8e73572b2deff4013f6379c70187112f SHA512 9695cae322f865b1a7771191c339ce001b0c390a70c185c44b80008312418745a96a3be14d5a337667bdcf2007ee1f1a540a4e15a5b509c43df02e5efad4f0c8
+DIST Prowlarr.develop.1.24.0.4721.linux-core-x64.tar.gz 93194260 BLAKE2B 4032e2ee311a51298ebcdd745d3cea05888305cc66a701d35c9a40aeb3d084a81cd6071de740821ba68b61d857871fa9c97a3634eee5e63062cfa763e62e74a3 SHA512 b6981cf1c0afea8691b985b95ba88187cefe35d2aeed7f1a0db4ec654a9c78a3a6ed6f6fb14504c814c82797bb3c8ba32d55443a648c282a5bf51a45fca5a213
+DIST Prowlarr.develop.1.24.0.4721.linux-musl-core-arm.tar.gz 88942340 BLAKE2B c28ced2be0a263012fd681c3c758656fd30e239b0bdd4fd6329b90612ba7852d949bc21f6969561c63eaccb85ea74afa5eecb375d2bc3560412a22b8066e7c1c SHA512 405fbb8b3206664269cc9d57973bd952602d658b7791da979a8e59208f62736f16969487aaff646d3f32225f6b97167b3f389970c08e32ab9af6cad35b338e6b
+DIST Prowlarr.develop.1.24.0.4721.linux-musl-core-arm64.tar.gz 88231821 BLAKE2B 1b6b53e67f249a981fc0429f79816afa926483377f625970d09faf896c0ddfb2af96dbe5cd37eac64d969b15b253aad2f76193ccb11e094f1c627bd4f471869f SHA512 fabced579e062bd88a8516de0591c932a9b447322296d6646e7f76a608acdfd04997f20887e7bdef92ef630b571b5e2028416ac778fb7681109e94d02caf0183
+DIST Prowlarr.develop.1.24.0.4721.linux-musl-core-x64.tar.gz 92257926 BLAKE2B bd73fe0648d17aa3d04103e7216e3c8a4eadf10ef343e6aa3178bea3834929869bf8f511f70520ac03a93518f5df7643b6aeeeff0117a62f1c4dab2af275d018 SHA512 aadc164905c5ee336754215f5e6e52e3a34a844a09ac317982700f339dc742e084998df190eb1e93003f840313c9e9e30e5ed7e67c45d2388f4de6de22d90f89
diff --git a/www-apps/prowlarr-bin/prowlarr-bin-1.22.0.4670.ebuild b/www-apps/prowlarr-bin/prowlarr-bin-1.22.0.4670.ebuild
deleted file mode 100644
index 2c9c3707ba6b..000000000000
--- a/www-apps/prowlarr-bin/prowlarr-bin-1.22.0.4670.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.master.${PV}.linux-core-x64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-musl-core-x64.tar.gz
-		)
-	)
-	arm? (
-		elibc_glibc? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-core-arm.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-musl-core-arm.tar.gz
-		)
-	)
-	arm64? (
-		elibc_glibc? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-core-arm64.tar.gz
-		)
-		elibc_musl? (
-			https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${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.24.0.4721.ebuild b/www-apps/prowlarr-bin/prowlarr-bin-1.24.0.4721.ebuild
new file mode 100644
index 000000000000..6b55e3a00dbf
--- /dev/null
+++ b/www-apps/prowlarr-bin/prowlarr-bin-1.24.0.4721.ebuild
@@ -0,0 +1,77 @@
+# 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/radarr-bin/Manifest b/www-apps/radarr-bin/Manifest
index 7872d37ae292..fd833980e518 100644
--- a/www-apps/radarr-bin/Manifest
+++ b/www-apps/radarr-bin/Manifest
@@ -1,6 +1,6 @@
-DIST Radarr.develop.5.9.0.9058.linux-core-arm.tar.gz 96617453 BLAKE2B 2ca03def0766c38796e4700889ec35a8032187988d5751e9f35aab35a63dbb07dd744cb227b781d69ff542c2ed9424d8dfa4f192acbfe7bc1bfc995e39f7df39 SHA512 3d03d46e244380073c5281d7a9f0a61091cb2409412b983ec13c6211f24bf3955a6b87a5c7ced84a2761ff0bd1ea2e16132a2694ed33202b9b6d211b8c9a2a4f
-DIST Radarr.develop.5.9.0.9058.linux-core-arm64.tar.gz 96291903 BLAKE2B 4b6b552610448494b0e808b3a379aba573d233b810e32ad04d192ccd593deb8e44e2b5b21750024995f31db6c039352252e957289ee00a67973d1f21e9b89616 SHA512 f3f6c0b2eb559d89e6f98c81e82d799e85385592124e343071a05ffbfebdf1f8afc26d2172d492da5e3489411b1b8421de1639c5ba3842077e5b45da7da79e9f
-DIST Radarr.develop.5.9.0.9058.linux-core-x64.tar.gz 102302460 BLAKE2B fcd7173583727a4cd64c95a00c0b8c92a6a03904da72ee9c05df53c9b4c9d4ec4346f85664e7d0c7150b34eb6a15a2708a9b4d1744c059717e695e4e9bc4a058 SHA512 d206bb9e8006f1ab53cd7a684a286bb51eb481c2e0bd0a54382d900e58b523dd986a8284b1915caccc93cf86f1859b667e4fe0de7f72776adf010a590a86f2d6
-DIST Radarr.develop.5.9.0.9058.linux-musl-core-arm.tar.gz 96675007 BLAKE2B 41aff8b28be7b28d0c7b0e237c0fbe83b5f27372187c6c5198e50a25dc9b207280e0eeed96033a9f26bf580146dfa1e2c7591c7f66e8471657c9ce34f14f4762 SHA512 f866c0e10ce18b8a2ee1680a45286f110e7ada1e28aa9a7e74c7d55506d93ccff9e5bfd9ae5e82c06f00c918e0da36f92a827fc7a288fa757f2d9f4b3afa2e42
-DIST Radarr.develop.5.9.0.9058.linux-musl-core-arm64.tar.gz 96359957 BLAKE2B db94e6fa38e0b0e616121b685cf8e5acf7004654e2430104807ad756b686707366eab856d2b01ae9a45498d3c3e8dc180cf55e8e82e7e2b46a3af914fbe812dc SHA512 4145afb4211727c0d3a27013a9c131d6dea4a8694fc2f8844f592ae7741d4b4d817bdb7628a736042c516f19228b31462cbfbef50d17d1f25471dd0afea3afac
-DIST Radarr.develop.5.9.0.9058.linux-musl-core-x64.tar.gz 101360410 BLAKE2B a06b02e33ea0e14c81f852b9e6f318cb5d42ce53c0b4115eb1d86c2bbd2c2f7ff2743289060eef43d9341d1585f6f39bbf1984036e30aff275e2ac3cea69e36a SHA512 ec8b80d2e2b7bb72057c7a5dbdfc856448d744e8f2db76d7d00cd69be17aec755f17ed2a0d8a1e6557126fc4cbb80b21d72121bab138ae356435e790ec74e45f
+DIST Radarr.develop.5.10.2.9164.linux-core-arm.tar.gz 96940496 BLAKE2B 0f5f00f8ffa01135bf6e830b8899eda81ed3ceaeb2fde4a3677d03816b907309ae470c5c772e1b630a054812eac7a9b70a2be87888593c0c7464b7bda2601ac4 SHA512 48400d127697112dcb7b2a8fb6d28f6a1d30c4e7d32a7d2886db430300fb97c1465874bbe0a4d278327a5aa98d72e50164cfce9a46de95cef324795b88c100df
+DIST Radarr.develop.5.10.2.9164.linux-core-arm64.tar.gz 96603974 BLAKE2B b629281efdb26b17d10d2fe85842252e7d396d42a715758149c0054f319d139aaef9964d621d7671d08d21d2e463d767079e12a8f5f9bb673ac837a39560cf73 SHA512 f99ab37bf64a60bc52dd5844aa4ceb5c58dd8aafbb050bc9d4469a5fc269e7187087129cc56d2818c5c677ae016665aa784e45e58711b66b2a36a7460e597f45
+DIST Radarr.develop.5.10.2.9164.linux-core-x64.tar.gz 102615532 BLAKE2B 7800597e5951febc624f0e7d854eddfd9857932eda23da56cc9ee9937cb54d79e16a863fef7637125a0004a02d8aaf655eea6b489440c209441b2453dc01f2e3 SHA512 074026d65815fc472a6297d9365518f1c41b54477694cb01ee6c8744a1d0bddfe087f3d8997eb85504f437d3e4c19bb31433c76a2d0fd52d75c149e35c36c265
+DIST Radarr.develop.5.10.2.9164.linux-musl-core-arm.tar.gz 96998349 BLAKE2B 493bf053ce2beacae7f596a1fb95b14b2abbc658902591d0fd016a33d096a09ccd22cbb25135bc7d6e6b3967bd6642f17607748351b9525f94add421dfb67fba SHA512 f8a2cea209c02df6d5774ca3e944afd0b48a5b1223fb465d6c712178d86b6c2aa537e8ff850d80b186fb60b9097bacbf325973c1da5eba8744ad7615b0688894
+DIST Radarr.develop.5.10.2.9164.linux-musl-core-arm64.tar.gz 96661268 BLAKE2B debb7c05303ef8669fa25a4a2260d6f60063aa773f5b041798326db7a4ca34ee8ae0f0b1fe56960590f654731fd1f1b39138f55e94677627327c2fc399ca5214 SHA512 0e159f8c10836179c47b209e68c029513fe9e81e5eebc87c743cfb9fda6cc7c2247e4d5da83e3c1ddf86c7fa8d2da41eb1efe432732de8c65837550977c91da7
+DIST Radarr.develop.5.10.2.9164.linux-musl-core-x64.tar.gz 101679794 BLAKE2B 11bcd546f2a9053708cfc62e95aa39f1d3a81546442465587d10d84544cbfb4a787dac4ea42e8eb3a0faf996988cb940c98650b85c3dd92f3037c2733700e8a3 SHA512 20047029701c7bf93bfa9f20b4b6bc39a732b7e068553acb31671f8e42199f4f36a53d90f8a7c21f77f20d7d5a9afa9bee6944944f34b7193f1046c2e6f5956f
diff --git a/www-apps/radarr-bin/radarr-bin-5.9.0.9058.ebuild b/www-apps/radarr-bin/radarr-bin-5.10.2.9164.ebuild
index 644702692d02..644702692d02 100644
--- a/www-apps/radarr-bin/radarr-bin-5.9.0.9058.ebuild
+++ b/www-apps/radarr-bin/radarr-bin-5.10.2.9164.ebuild
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 470c6848c9be..7c3dce0b5ba7 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1 +1,2 @@
-DIST Radicale-3.1.9.gh.tar.gz 141258 BLAKE2B 6d74eabd7e09b1804a6a3c556a9f629fb72c4685fdf5d96d0d53ffaf5db712968b054678be866002ab4ceafaf1d3d8ad3f52aae7a9a4ecabbc129149c96ab9b6 SHA512 f4d0b26149c331b4bc02f01bb637cea1d29e1d563a4133c4293ec13990f1553988181582c2e726ce33b563403a14e9ec863403f86e66b13fd8cfd62cf74439e4
+DIST Radicale-3.2.2.gh.tar.gz 155283 BLAKE2B e82e59bd90275cb6f5a32479a163032e12201144b250a7c7987619bc5343a4494952d263957aafc2ff1e2983b2edb339648f5aeb7bd84718b7ae0d1d20159d0f SHA512 12d1d40e6c63a5229948b9eed8d1311fcebc0b59506497966712810b8745475c3407f68cbafbf0a16b11985e1179aea4355ff2ab67ad9a8b7440443ea451cdcd
+DIST Radicale-3.2.3.gh.tar.gz 157923 BLAKE2B 4beba122bc329cad27ebccd47655819e4769e58d4fe253bb8f064d4bef2cc2f9d9fd7c44b28a12a2f35e331ca1857bbf795d839ecfaf179983e8b1d54617b372 SHA512 992925ab82394fe5c94998ab23b8fa7d62ae3685ebc6f17497f67981758a9ea51757e48141dbedf20840610db8f3385a66d5a96cc24c3ba396ec67a522877be3
diff --git a/www-apps/radicale/files/radicale-r3.init.d b/www-apps/radicale/files/radicale-r3.init.d
deleted file mode 100644
index bb0cc5db08b0..000000000000
--- a/www-apps/radicale/files/radicale-r3.init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/run/radicale.pid
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting radicale"
-		start-stop-daemon --start --quiet --background \
-		--user radicale \
-		--umask 0027 \
-		--stderr-logger /usr/bin/logger \
-		--pidfile ${PIDFILE} --make-pidfile \
-		--exec /usr/bin/radicale
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping radicale"
-		start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/www-apps/radicale/radicale-3.1.9-r1.ebuild b/www-apps/radicale/radicale-3.1.9-r1.ebuild
deleted file mode 100644
index 3ba042c24436..000000000000
--- a/www-apps/radicale/radicale-3.1.9-r1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 systemd
-
-MY_P=${P^}
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="
-	https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	>=acct-user/radicale-0-r2
-	acct-group/radicale
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/util-linux
-"
-
-BDEPEND="
-	test? (
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/waitress[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDIR=/var/lib/"${PN}"
-
-DOCS=( DOCUMENTATION.md CHANGELOG.md )
-
-python_test() {
-	epytest -o addopts= radicale/tests/
-}
-
-python_install_all() {
-	rm README* || die
-	# init file
-	newinitd "${FILESDIR}"/radicale-r4.init.d radicale
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	# directories
-	keepdir "${RDIR}"
-	fperms 0750 "${RDIR}"
-	fowners "${PN}:${PN}" "${RDIR}"
-
-	# config file
-	insinto /etc/"${PN}"
-	doins config
-
-	# fcgi and wsgi files
-	exeinto /usr/share/"${PN}"
-	doexe radicale.wsgi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	local _erdir="${EROOT}${RDIR}"
-
-	einfo "A sample WSGI script has been put into ${EROOT}/usr/share/${PN}."
-	einfo "You will also find there an example FastCGI script."
-	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
-	then
-		ewarn ""
-		ewarn "Unsafe file permissions detected on ${_erdir}."
-		ewarn "This probably comes from an earlier version of this ebuild."
-		ewarn "To fix run:"
-		ewarn "#  \`chown -R ${PN}:${PN} ${_erdir}\`"
-		ewarn "#  \`chmod 0750 ${_erdir}\`"
-		ewarn "#  \`chmod -R o= ${_erdir}\`"
-	fi
-}
diff --git a/www-apps/radicale/radicale-3.1.9.ebuild b/www-apps/radicale/radicale-3.1.9.ebuild
deleted file mode 100644
index 7c3557675f25..000000000000
--- a/www-apps/radicale/radicale-3.1.9.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 systemd
-
-MY_P=${P^}
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="
-	https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	>=acct-user/radicale-0-r2
-	acct-group/radicale
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/util-linux
-"
-
-BDEPEND="
-	test? (
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/waitress[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDIR=/var/lib/"${PN}"
-
-DOCS=( DOCUMENTATION.md CHANGELOG.md )
-
-python_test() {
-	epytest -o addopts= radicale/tests/
-}
-
-python_install_all() {
-	rm README* || die
-	# init file
-	newinitd "${FILESDIR}"/radicale-r3.init.d radicale
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	# directories
-	keepdir "${RDIR}"
-	fperms 0750 "${RDIR}"
-	fowners "${PN}:${PN}" "${RDIR}"
-
-	# config file
-	insinto /etc/"${PN}"
-	doins config
-
-	# fcgi and wsgi files
-	exeinto /usr/share/"${PN}"
-	doexe radicale.wsgi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	local _erdir="${EROOT}${RDIR}"
-
-	einfo "A sample WSGI script has been put into ${EROOT}/usr/share/${PN}."
-	einfo "You will also find there an example FastCGI script."
-	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
-	then
-		ewarn ""
-		ewarn "Unsafe file permissions detected on ${_erdir}."
-		ewarn "This probably comes from an earlier version of this ebuild."
-		ewarn "To fix run:"
-		ewarn "#  \`chown -R ${PN}:${PN} ${_erdir}\`"
-		ewarn "#  \`chmod 0750 ${_erdir}\`"
-		ewarn "#  \`chmod -R o= ${_erdir}\`"
-	fi
-}
diff --git a/www-apps/radicale/radicale-3.2.2.ebuild b/www-apps/radicale/radicale-3.2.2.ebuild
new file mode 100644
index 000000000000..3d0299c12c35
--- /dev/null
+++ b/www-apps/radicale/radicale-3.2.2.ebuild
@@ -0,0 +1,92 @@
+# 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 systemd
+
+MY_P=${P^}
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="https://radicale.org/"
+SRC_URI="
+	https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>=acct-user/radicale-0-r2
+	acct-group/radicale
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/util-linux
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDIR=/var/lib/"${PN}"
+
+DOCS=( DOCUMENTATION.md CHANGELOG.md )
+
+python_test() {
+	epytest -o addopts= radicale/tests/
+}
+
+python_install_all() {
+	rm README* || die
+	# init file
+	newinitd "${FILESDIR}"/radicale-r4.init.d radicale
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# directories
+	keepdir "${RDIR}"
+	fperms 0750 "${RDIR}"
+	fowners "${PN}:${PN}" "${RDIR}"
+
+	# config file
+	insinto /etc/"${PN}"
+	doins config
+
+	# fcgi and wsgi files
+	exeinto /usr/share/"${PN}"
+	doexe radicale.wsgi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	local _erdir="${EROOT}${RDIR}"
+
+	einfo "A sample WSGI script has been put into ${EROOT}/usr/share/${PN}."
+	einfo "You will also find there an example FastCGI script."
+	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
+	then
+		ewarn ""
+		ewarn "Unsafe file permissions detected on ${_erdir}."
+		ewarn "This probably comes from an earlier version of this ebuild."
+		ewarn "To fix run:"
+		ewarn "#  \`chown -R ${PN}:${PN} ${_erdir}\`"
+		ewarn "#  \`chmod 0750 ${_erdir}\`"
+		ewarn "#  \`chmod -R o= ${_erdir}\`"
+	fi
+
+	optfeature "Publish changes to rabbitmq" dev-python/pika
+}
diff --git a/www-apps/radicale/radicale-3.2.3.ebuild b/www-apps/radicale/radicale-3.2.3.ebuild
new file mode 100644
index 000000000000..df966c6e3abf
--- /dev/null
+++ b/www-apps/radicale/radicale-3.2.3.ebuild
@@ -0,0 +1,92 @@
+# 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 systemd
+
+MY_P=${P^}
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="https://radicale.org/"
+SRC_URI="
+	https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>=acct-user/radicale-0-r2
+	acct-group/radicale
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/util-linux
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDIR=/var/lib/"${PN}"
+
+DOCS=( DOCUMENTATION.md CHANGELOG.md )
+
+python_test() {
+	epytest -o addopts= radicale/tests/
+}
+
+python_install_all() {
+	rm README* || die
+	# init file
+	newinitd "${FILESDIR}"/radicale-r4.init.d radicale
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# directories
+	keepdir "${RDIR}"
+	fperms 0750 "${RDIR}"
+	fowners "${PN}:${PN}" "${RDIR}"
+
+	# config file
+	insinto /etc/"${PN}"
+	doins config
+
+	# fcgi and wsgi files
+	exeinto /usr/share/"${PN}"
+	doexe radicale.wsgi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	local _erdir="${EROOT}${RDIR}"
+
+	einfo "A sample WSGI script has been put into ${EROOT}/usr/share/${PN}."
+	einfo "You will also find there an example FastCGI script."
+	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
+	then
+		ewarn ""
+		ewarn "Unsafe file permissions detected on ${_erdir}."
+		ewarn "This probably comes from an earlier version of this ebuild."
+		ewarn "To fix run:"
+		ewarn "#  \`chown -R ${PN}:${PN} ${_erdir}\`"
+		ewarn "#  \`chmod 0750 ${_erdir}\`"
+		ewarn "#  \`chmod -R o= ${_erdir}\`"
+	fi
+
+	optfeature "Publish changes to rabbitmq" dev-python/pika
+}
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
deleted file mode 100644
index 3f0816423d25..000000000000
--- a/www-apps/rt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rt-4.4.4.tar.gz 9977845 BLAKE2B bc27a68c880d305e43069887bd4c2dbf09e82413ee9b7f1e0e19252ad5249430f17bd980c94a4c74386a8c7fefc79af50a0e572adbb0ef707e46a4be63e8d3e4 SHA512 95335cfa9e7107300670a5e8631ffb6f402895dae051201d051ac01885b0cb185f838a666acaec773e0f670e1b9d16b7cede72f37ce9832fd83a9da8514e6972
diff --git a/www-apps/rt/files/config.layout-gentoo b/www-apps/rt/files/config.layout-gentoo
deleted file mode 100644
index 39dde0a3a7ba..000000000000
--- a/www-apps/rt/files/config.layout-gentoo
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<Layout Gentoo>
-  prefix:		PREFIX
-  exec_prefix:		${prefix}
-  bindir:		${exec_prefix}/bin
-  sbindir:		${exec_prefix}/sbin
-  sysconfdir:		${prefix}/etc
-  mandir:		${prefix}/man
-  libdir:		${prefix}/lib
-  datadir:		${prefix}/share
-  htmldir:		HTMLDIR
-  fontdir:		${datadir}/fonts
-  lexdir:		${datadir}/po
-  manualdir:		${datadir}/doc
-  staticdir:		${datadir}/static
-  localstatedir:	${prefix}/var
-  logfiledir:		${localstatedir}/log
-  masonstatedir:	${localstatedir}/mason_data
-  sessionstatedir:	${localstatedir}/session_data
-  customdir:		${prefix}/local
-  custometcdir:		${customdir}/etc
-  customhtmldir:	${customdir}/html
-  customlexdir:		${customdir}/po
-  customstaticdir:	${customdir}/static
-  customlibdir:		${customdir}/lib
-</Layout>
diff --git a/www-apps/rt/files/postinstall-en.txt b/www-apps/rt/files/postinstall-en.txt
deleted file mode 100644
index daa11ed9d14c..000000000000
--- a/www-apps/rt/files/postinstall-en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Please follow the Gentoo install guide found at:
-
-    https://wiki.gentoo.org/wiki/Request_Tracker
-
-Your local config files are located here:
-
-    ${VHOST_ROOT}/${PN}-${PVR}/etc
-
-************************************************************************
-*    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE    *
-************************************************************************
-
-Some file locations have changed. Everything is now installed, for real
-this time, into:
-
-    ${VHOST_ROOT}
-
-RT executables are no longer in /usr/bin. You may need to modify your
-existing configuration files accordingly.
diff --git a/www-apps/rt/files/reconfig b/www-apps/rt/files/reconfig
deleted file mode 100644
index 9a1919965386..000000000000
--- a/www-apps/rt/files/reconfig
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-PF=${PN}-${PVR}
-
-die() {
-    echo "#####"
-    echo $1
-    echo "#####"
-    exit 1
-}
-
-if [ $1 = "install" ]; then
-    # So, some craziness happens during the install process. First, we
-    # have doubled slashes, which the ebuild dutifully removes, but
-    # then, at some point, ${ED} is removed including its trailing
-    # slash, which leaves us with relative path references. That's why
-    # we remove the leading slash instead of the trailing slash in the
-    # variables below so that the sed statement will actually match
-    # what we mean.
-    echo "Replacing ${ROOT#/}${MY_HOSTROOTDIR#/} with ${VHOST_ROOT}/${PF}"
-    echo "Replacing ${ROOT#/}${MY_HTDOCSDIR#/} with ${MY_INSTALLDIR}"
-    echo "Replacing RT_DIR with ${VHOST_ROOT}/${PF}"
-
-    for file in $(find ${VHOST_ROOT}/${PF} -type f) ; do
-        sed -e "s|${ROOT#/}${MY_HOSTROOTDIR#/}/${PF}|${VHOST_ROOT}/${PF}|g" \
-            -e "s|${ROOT#/}${MY_HTDOCSDIR#/}|${MY_INSTALLDIR}|g" \
-            -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g" \
-            -i "${file}" || die
-    done
-
-    echo
-    echo "If you're upgrading RT, you may need to update your database."
-    echo "Take a look in:"
-    echo
-    echo "  ${VHOST_ROOT}/${PF}/upgrade"
-    echo
-    echo "Iterate through each sub-directory, in order, whose name is greater"
-    echo "than your previously installed RT version, and run the following"
-    echo "commands:"
-    echo
-    for step in schema acl insert ; do
-        echo "  ${VHOST_ROOT}/${PF}/sbin/rt-setup-database \\"
-        echo "    --action ${step} --dba DBSUPERUSER --prompt-for-dba-password \\"
-        echo "    --datadir ${VHOST_ROOT}/${PF}/upgrade/<version> "
-        echo
-    done
-    echo "Note that some upgrade directories don't have all 3 items (schema,"
-    echo "acl, insert) and you can skip them safely."
-    echo
-    echo "Don't forget to read the online installation guide for more details"
-elif [ $1 = "clean" ]; then
-    echo "Please examine the contents of the following directories and delete"
-    echo "anything that is no longer necessary:"
-    echo
-    echo "  ${VHOST_ROOT}/${PF}"
-    echo "  ${MY_INSTALLDIR}"
-fi
diff --git a/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch b/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch
deleted file mode 100644
index d0488918d5f9..000000000000
--- a/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naruw rt-4.2.11.orig/Makefile.in rt-4.2.11/Makefile.in
---- rt-4.2.11.orig/Makefile.in	2015-04-27 20:56:16.000000000 -0400
-+++ rt-4.2.11/Makefile.in	2015-05-14 13:50:05.279292835 -0400
-@@ -359,6 +359,8 @@
- 	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
- 	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
- 
-+.NOTPARALLEL: testdeps config-install dirs files-install fixperms instruct
-+
- install: testdeps config-install dirs files-install fixperms instruct
- 
- files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install po-install static-install
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
deleted file mode 100644
index cd9ae3bd2177..000000000000
--- a/www-apps/rt/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="person">
-		<email>titanofold@gentoo.org</email>
-		<name>Aaron W. Swenson</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<use>
-		<flag name="lighttpd">Add <pkg>www-servers/lighttpd</pkg> support</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-apps/rt/rt-4.4.4-r4.ebuild b/www-apps/rt/rt-4.4.4-r4.ebuild
deleted file mode 100644
index 3fe14b2b7d6d..000000000000
--- a/www-apps/rt/rt-4.4.4-r4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp depend.apache
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="https://www.bestpractical.com/rt/"
-SRC_URI="https://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~riscv"
-LICENSE="GPL-2"
-IUSE="mysql +postgres fastcgi lighttpd"
-REQUIRED_USE="^^ ( mysql postgres )"
-
-RESTRICT="test"
-
-DEPEND="
-	acct-group/rt
-	acct-user/rt
-	>=dev-lang/perl-5.10.1
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/CGI-4
-	>=dev-perl/CSS-Squish-0.06
-	>=dev-perl/Class-Accessor-0.34
-	>=dev-perl/Class-ReturnValue-0.550.0-r1
-	>=dev-perl/DBI-1.37
-	>=dev-perl/Date-Extract-0.02
-	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/Devel-StackTrace-1.19
-	>=dev-perl/Email-Address-1.912.0
-	>=dev-perl/Email-Address-List-0.60.0
-	>=dev-perl/HTML-FormatText-WithLinks-0.14
-	>=dev-perl/HTML-Mason-1.43
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/HTTP-Server-Simple-0.34
-	>=dev-perl/HTTP-Server-Simple-Mason-0.14
-	>=dev-perl/Locale-Maketext-Lexicon-0.32
-	>=dev-perl/Log-Dispatch-2.410.0
-	>=dev-perl/MIME-tools-5.425
-	>=dev-perl/MailTools-1.60
-	>=dev-perl/Module-Versions-Report-1.05
-	>=dev-perl/Role-Basic-0.12
-	>=dev-perl/Symbol-Global-Name-0.04
-	>=dev-perl/Text-Quoted-2.80.0
-	>=dev-perl/Text-WikiFormat-0.76
-	>=dev-perl/Tree-Simple-1.04
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/DBIx-SearchBuilder-1.660.0
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-Encode-2.730.0
-	>=virtual/perl-File-Spec-0.8
-	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Locale-Maketext-1.06
-	>=virtual/perl-Storable-2.08
-	dev-perl/Business-Hours
-	dev-perl/CGI-Emulate-PSGI
-	dev-perl/CGI-PSGI
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/Calendar-Simple
-	dev-perl/Convert-Color
-	dev-perl/Crypt-Eksblowfish
-	dev-perl/Crypt-SSLeay
-	dev-perl/Crypt-X509
-	dev-perl/CSS-Minifier-XS
-	dev-perl/Data-Page-Pageset
-	dev-perl/DBD-SQLite
-	dev-perl/Data-GUID
-	dev-perl/Data-ICal
-	dev-perl/Date-Manip
-	dev-perl/Devel-GlobalDestruction
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/GD[png(+),gif(+)]
-	dev-perl/GnuPG-Interface
-	dev-perl/GraphViz
-	dev-perl/HTML-Formatter
-	dev-perl/HTML-FormatText-WithLinks-AndTables
-	dev-perl/HTML-Gumbo
-	dev-perl/HTML-Mason-PSGIHandler
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Quoted
-	dev-perl/HTML-RewriteAttributes
-	dev-perl/HTML-Tree
-	dev-perl/IPC-Run3
-	dev-perl/JSON
-	dev-perl/JavaScript-Minifier-XS
-	dev-perl/MIME-Types
-	dev-perl/Module-Refresh
-	dev-perl/Mozilla-CA
-	dev-perl/Net-CIDR
-	dev-perl/PerlIO-eol
-	dev-perl/Plack
-	dev-perl/Regexp-Common-net-CIDR
-	dev-perl/Regexp-IPv6
-	dev-perl/Scope-Upper
-	dev-perl/Starlet
-	dev-perl/String-ShellQuote
-	dev-perl/TermReadKey
-	dev-perl/Text-Autoformat
-	dev-perl/Text-Password-Pronounceable
-	dev-perl/Time-ParseDate
-	dev-perl/TimeDate
-	dev-perl/UNIVERSAL-require
-	dev-perl/libwww-perl
-	dev-perl/Locale-Maketext-Fuzzy
-	dev-perl/Net-IP
-	dev-perl/Net-Server
-	dev-perl/Regexp-Common
-	dev-perl/Text-Template
-	dev-perl/Text-Wrapper
-	virtual/perl-Digest
-	virtual/perl-File-Temp
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	virtual/perl-libnet
-
-	fastcgi? (
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-	)
-	!lighttpd? (
-		dev-perl/Apache-DBI
-		!fastcgi? ( >=www-apache/mod_perl-2 )
-	)
-	lighttpd? ( dev-perl/FCGI )
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-RDEPEND="${DEPEND}
-	virtual/mta
-	!lighttpd? ( ${APACHE2_DEPEND} )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		|| (
-			sys-apps/openrc
-			sys-apps/openrc-navi
-		)
-	)
-"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	ewarn
-	ewarn "If you are upgrading from an existing RT installation"
-	ewarn "make sure to read the related upgrade documentation in"
-	ewarn "${ROOT}usr/share/doc/${PF}."
-	ewarn
-}
-
-src_prepare() {
-	# add Gentoo-specific layout
-	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${EPREFIX}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${EPREFIX}/${MY_HTDOCSDIR}|g" \
-		-e 's|/\+|/|g' \
-		-i ./config.layout || die 'config sed failed'
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
-		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
-
-	eapply "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
-	eapply_user
-}
-
-src_configure() {
-	local web
-	local myconf
-	local depsconf
-
-	if use mysql ; then
-		myconf="--with-db-type=mysql --with-db-dba=root"
-		depsconf="--with-MYSQL"
-	elif use postgres ; then
-		myconf="--with-db-type=Pg --with-db-dba=postgres"
-		depsconf="--with-PG"
-	else
-		die "Pick a database backend"
-	fi
-
-	if use fastcgi ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="apache"
-		depsconf+=" --with-FASTCGI"
-	elif use lighttpd ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="lighttpd"
-		depsconf+=" --with-FASTCGI"
-	else
-		myconf+=" --with-web-handler=modperl2"
-		web="apache"
-		depsconf+=" --with-MODPERL2"
-	fi
-	# Any loading Date::Manip from here on
-	# may fail if TZ=Factory as it is on gentoo install
-	# media ( affects install as well )
-	export TZ=UTC
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${myconf}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
-	if grep -q "MISSING" "${T}"/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat "${T}"/t | grep MISSING
-		ewarn
-		ewarn "Please run perl-cleaner. If the problem persists,"
-		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
-		die "Missing dependencies."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-	emake DESTDIR="${D}" install
-
-	dodoc -r docs/*
-	# Disable compression because `perldoc` doesn't decompress transparently
-	docompress -x /usr/share/doc
-
-	# make sure we don't clobber existing site configuration
-	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# fix paths
-	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
-
-	# copy upgrade files
-	insinto "${MY_HOSTROOTDIR}/${PF}"
-	doins -r etc/upgrade
-
-	# require the web server's permissions
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if use lighttpd ; then
-		elog "We no longer install initscripts as Best Practical's recommended"
-		elog "implementation is to let Lighttpd manage the FastCGI instance."
-		elog
-		elog "You may find the following helpful:"
-		elog "   perldoc /usr/share/doc/${P}/web_deployment.pod"
-	fi
-}
diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index a27fac2a5a2a..3d21e918561e 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1,2 +1 @@
-DIST rutorrent-4.3.5.tar.gz 2377763 BLAKE2B 7424a45d29a7257b88a1c54b225bc287e9df4be796eb72cf112432ed06ed4fe02465815746a193f3b4cc6f47fa0929dae98166d599100ce2faf7cb563a399b4e SHA512 04694aaea5000f8dd60cc806f6352735aa4445434198aa9ab4a34c1a2070ef1e087856704f1ccddcaa8d03376da8e489dbb1ee8387f79fe9a00de8266e799d27
 DIST rutorrent-4.3.6.tar.gz 2377710 BLAKE2B f3bab570ebf7e577d0587ed4fef7e1cb5c40e256f9b4bc6f8cdb603ef516ad6a666ea52314f4c3f6e0ab4991e6027e12e5d6c76320b58747eaf37d0e52e6d6a8 SHA512 bfed8e799b0261f974678f24056070339b443cd24fa53db14585d141e31237c391d51a0bb4675c39930a3288d6cd758524dc77711f7e46e3af0d1df4bbc97917
diff --git a/www-apps/rutorrent/rutorrent-4.3.5.ebuild b/www-apps/rutorrent/rutorrent-4.3.5.ebuild
deleted file mode 100644
index 97453fadf5c8..000000000000
--- a/www-apps/rutorrent/rutorrent-4.3.5.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/sonarr-bin/Manifest b/www-apps/sonarr-bin/Manifest
index 1f050e3dcc33..ac827e721c95 100644
--- a/www-apps/sonarr-bin/Manifest
+++ b/www-apps/sonarr-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Sonarr.develop.4.0.8.2208.linux-arm.tar.gz 95178150 BLAKE2B 973575e7e989382bac1171e2220317371df80274062ac844046bd78b54d91f2ebe5163191339be4265d6e3e3420aac32ad47b0cc5fce4fd81a484e69f7d840a9 SHA512 daad24c9871e9c61f5759f46652aac8d658fdf19c8cf75db3b6aa22521b9686ccee7c18bb9a09c783fc8295afa215b68dc1a9e58d7bd1bec03591064f1f3a24e
-DIST Sonarr.develop.4.0.8.2208.linux-arm64.tar.gz 94916303 BLAKE2B 28cbdad54f645baea465068b9712552fd8db24ea33cafbe9586c50638d6a61eefe1e55b721e14d00e23b1ea824a06dd036d2f93b7bb1189ee36ac69fdd7bf19f SHA512 058b6345e0e91b2b3d1a7474b9c1e66aeff026438854c80a2c78f9c3d462c5a8512bda4a1feb821bf3928f08e75933c4b903f804c505cf658049ce54d597dbb1
-DIST Sonarr.develop.4.0.8.2208.linux-musl-arm64.tar.gz 94980319 BLAKE2B e594ab834eb52016af3a63e5258667e0c4dddcdbafff6a3b275165084b7a210691827d631fbbf041f1d235ca3848c83049307ecc8c104e9a0b9d11f1b69bcee0 SHA512 2fbedd76a9d406f02da2755e34c761e1bced0164eb054e894d2a0f8d1acb290ec88483563329dbae4ceb2c7c0828d416a512c34fb64161f2ea4e6e3adce12052
-DIST Sonarr.develop.4.0.8.2208.linux-musl-x64.tar.gz 99912956 BLAKE2B 6f3894a991732c9ba1f3eae839e0ea6903aa54e97422bff8819e834f30453e67dc6ab329ed7e537f2840d7009f2dce6756b93d4ff95e5f4415c72529b92a4ee1 SHA512 8aadd13ef486c68e4e878d32070447baf853969b6efd44a1cca0b8d1ce2f368fbc8c567cfdc96ceb84f40a1c2c5b423e818a02da4c3a5f10a03695153e33dab4
-DIST Sonarr.develop.4.0.8.2208.linux-x64.tar.gz 100849373 BLAKE2B bae100663a9077789a278dba8487c23a053f15e5a6a686155d869afd11b25e3c8906a5decfef153e18df74fa36fe30b7e46d02c87011d6899022b0524f8bb81f SHA512 a1d10955a70bf71e5b0ba9631cbad1ccaa2e0e91d45d39562f08603f86ca61603d4727c3a9debd073c1837399d0b79d548dd53e35d01a9c7a15d3bbb57236503
+DIST Sonarr.develop.4.0.9.2342.linux-arm.tar.gz 95209671 BLAKE2B 3d58dfcd5ba704eb565785d56519e2f18b9e5eff7779cd0a069011e4a2085b5444699d41273eb06435e8f43f180398e9004f94864491528511f49af9b9cd6299 SHA512 c9e2f67f3cb5852291b0de3cff8a9655384278d9ba4c7c68a207f3157a2f3b75e8b711035cc1df0ccb9f79cafa192aac55cc78b3f07e699ed4505f6687a6bee2
+DIST Sonarr.develop.4.0.9.2342.linux-arm64.tar.gz 94940492 BLAKE2B 87ccbf344d1efd69bf6865f06b581134a071bb9fc0ff7a6bc83d265536f31b1593b2cdaed1d3279113ab1cd3cf7f1030b0907ab7f86f1df92b2b57ca3fcfc61d SHA512 3a2455daf47439cf75878de3bdf5ab1a54f3e3a4526f045b4097d19fc444ba40e2ab4568e25cea4e1c072f1a19e8f88b9f64602b8e9805403843a1bb0d5874b4
+DIST Sonarr.develop.4.0.9.2342.linux-musl-arm64.tar.gz 95002053 BLAKE2B 16ca1a9010bf529ae80d1c1d134da6413b16468c58c9e09d0420671defeafa880c480a8e0013fd16372f5caa30be7cc7dd1b8ecb76ac758aa83b7e7c3b6bed6e SHA512 67396333f799301366a702d7a4d1935e166dfdd9060101ac2763e18f5237e7cfc3ebb357177904c8db4f10dca9be8d37ffbc198c6e411e3d349e7debba8ba39b
+DIST Sonarr.develop.4.0.9.2342.linux-musl-x64.tar.gz 99948011 BLAKE2B fdd09699c170e24e3b3c4414c2964b23c5f8d0b1d934aa997840753db18c13cce7c1bc0facedb6c90a1832a3c48fa95c2ed167c5c1e386eb07280a6c4a8f716d SHA512 45bca669c6896b901955dc20e38964d29fc6255292656b2eca28dd2404ce920c90c48678fd135fdfedeb4b67a4bc4c6acd605b37a0f6115bb7ae3bc32d7790f0
+DIST Sonarr.develop.4.0.9.2342.linux-x64.tar.gz 100872039 BLAKE2B 341448ae8c1fc7c6179b3e4be8c1e129c633c733270989bb1ab438e9174540a6a0ed38134e8eb099fd41072e4a6fa412f8e9363d0f931bfc8a1b3240edf112ca SHA512 3f35d50bfd0f4bd99c62e4dd6f9512f0ea87b13c2e6dcb1989058fcf23c5e8bd55fc6f38fd5b19362ed0f59688e0ffbb3e11aa53129b09934aa98afdfc515c33
diff --git a/www-apps/sonarr-bin/sonarr-bin-4.0.8.2208.ebuild b/www-apps/sonarr-bin/sonarr-bin-4.0.9.2342.ebuild
index f10489599d33..f10489599d33 100644
--- a/www-apps/sonarr-bin/sonarr-bin-4.0.8.2208.ebuild
+++ b/www-apps/sonarr-bin/sonarr-bin-4.0.9.2342.ebuild
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index acea32ef1fff..fc768ef194ec 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,3 +1,3 @@
 DIST wordpress-6.4.4.tar.gz 24480617 BLAKE2B 60856beddbbb2ba25e56eb9aaa5af0b857b4f318309d87ff5ffecee909ceec6fee0a6df0e10d2c8580af670c8b7132d4e64d6756083ecd2d16736dcf3afc01be SHA512 c369567ecdde465e063127b21de55136d37f35d959944708b2fdf05ac9fa876bbf30395783ce0435ecb68f0662bedfb83900463ebe0b442c57ac02491b5e87a4
 DIST wordpress-6.5.5.tar.gz 24696391 BLAKE2B e3edceb605c22b15de39459ec3e83e416324b8194974a069a026bd18e70eda5072ef47dab2c8a1a8a4e7fd81d783843d55f72f1ac9079aa8088ce72104fc6f8e SHA512 34b401f6abf08d654188906117c54e962e22fb1e8abcfec2a191d761d5719b4cfe7c33d33f6da786b3e6a04e50622429d5d7c9f9b8baec0bd08430b1f4435ff7
-DIST wordpress-6.6.1.tar.gz 24637199 BLAKE2B b151b00661f4012145247e10860d2200004749aec1762322eeaa904ccbc0b5c04d05eda443759e919af610da2f01df1b325cbdfde141ca0eb770ab008f384faf SHA512 a6fa5e8c6ebe57e6064db04286816a898a7c783adc7ffa3244e12e27af6a4eb0aaf49bec8e025c314bcee9d3f63775277211636d6f99a69c6458f73b103565e2
+DIST wordpress-6.6.2.tar.gz 24640061 BLAKE2B f10a94b0a731bb4a5b22f0e6e634f061bcd6abbb06badb3232cce56cee13c681fe8c00beab1893928c8d224a8f495ee5f2d5caa6ac90b45af39313580b3c3bca SHA512 652d20f2d66a62d1dfa0c0e6edb7b80e32e9a50a6bdbfb995510091ed1e3cfe6c42db2b13cb78b69ff09c7e85a14b5b8881738477fa0ade8998967179df851e7
diff --git a/www-apps/wordpress/wordpress-6.6.1.ebuild b/www-apps/wordpress/wordpress-6.6.2.ebuild
index aedc91ade73a..aedc91ade73a 100644
--- a/www-apps/wordpress/wordpress-6.6.1.ebuild
+++ b/www-apps/wordpress/wordpress-6.6.2.ebuild
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1195917c557c..9d1183047984 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,8 +1,14 @@
-DIST chromium-127-clang.tar.xz 50869256 BLAKE2B a25c78c28e1a19bb251ce78831ff8aeea51f0ff0a3fcba4f57e14e676aadba38f248554a52d9f67da8c0ccf533ef9f60b4bbb26f8935914efa2b871444e61d8f SHA512 9033c2dd7dd217917caf3dbed52f72ded18fe81b431edd4ef82fe7c592f7b9fbf6d5d2c8f7ba4ebffb4994bef20579d30aea9dd1ad36db86bec5d0adb6eca062
-DIST chromium-127-rust.tar.xz 151082700 BLAKE2B 53b5e72724425ae97bbb22e128ca5e826a2db5fb49f615c5331cdf6d790c253d58061223ff9fbd7f4deecaa19668e7b905b0a661380f48ce74d7f66a9605be18 SHA512 a47fc0bdbf48da9c8c17c91d9dc1a4a3f09578e82199c0d5843dfb6188803161cdb98d065ee3f85ceaf78efd2c233397c325c4c9f2d19255f38734a81599404b
-DIST chromium-127.0.6533.119.tar.xz 6621220264 BLAKE2B fdbf51920d3fee096420cb43aee34f2e6cd51f5531829a68bb61003e4607934d2d045fcd6dbe0c35bd433b000bcefc92919da404666d8e304054d9846dafd943 SHA512 9b774d1798ef76264d60ab46cf552fdec54d325ad1010573084c7c132c47319af63d8127fb9e42441412ac365efa57c25ac80963b644b558595b3d5bfad21e9c
-DIST chromium-127.0.6533.99.tar.xz 6618098428 BLAKE2B 6a89e4ff8edcda31d8c04ae846c2869a96157b1b07c59614fe5f8fedba1699bc3b4d53adc9c94a0170d3288d8c9282348e275090848fc92a4c06b2e04104248b SHA512 e851e34c0f0b240fa08e60c0cb4373aead7656187bab7fd0dea5bad7cfc6b4ffe38b43f108f20528a508023cdd437b392b5c2ca09a1b1f5f21ba83d4fa88fd99
-DIST chromium-patches-127-1.tar.bz2 4907 BLAKE2B 3d8599c4c75a0993f6627e4570e5059c5cc5036b2f7916685ca75742f483af8c07f22d5ac8a594a64a92bffe0262fd75c2e3417639197558a5bd3da909ac2c65 SHA512 a75a42d5c5c54fd6e53469a229f0f5382eb3108ffa6e7c503ec03fa7e5e8e470291981373e039ff8d7326ab420ad894d7d3cd8a918921438376924f7aa125924
+DIST chromium-128-clang.tar.xz 51489372 BLAKE2B 352a585e3acf0f0685ab2eaeb13e847195119bc6e3694f7fc20eeabdb25821019187e52997618214ccb469766c2982f489c6bdc643a339c1cfbe3e5fb3a131d4 SHA512 bc448096975111ff6ff5a9f82a6acb2bb244e9c344a8e6ef8bcdee5a06d0004955f76f6566f01519da5cc2eae08a2df2dd0ac5afee38dbc2ba918e735f338422
+DIST chromium-128-rust.tar.xz 148907072 BLAKE2B 9b28d1eca65d3e62ef142f96d9b3371bb65c6778414e5b64f0ad02c4aace219974f1cb292c9a6d9c443e3ed4f61192248ccaf9b18079cbd5a5f5c3abfe79d485 SHA512 5469490b23656a83d6198a087ddb82dd342fd8a426b32193218f7174395053f2ec7aaced5c464b8b16cdbddc252f80a98ca2a4b88742d2b0c910f2d2bfa7e431
+DIST chromium-128.0.6613.113.tar.xz 6711639096 BLAKE2B 1719b97aa30584b1d997d5fa894d23ec5b8063f9fdb53b9a7cd760896634a71a9c547e6a65d1db3c5e6308233c39dcf09db3a78d52ef960313c2c7b4381e6a46 SHA512 57ecf8d5d741a9a3ba9bb1ffd1e75ee83c14a0c552657063fca9bd4e5eec82b5ccafe81e1cea26cbb29992ce418bdcce11794e7ba3f7a860648df270cb2cd2cf
+DIST chromium-128.0.6613.119.tar.xz 6718742128 BLAKE2B b47eb124c249bae074883cdf1e98eaddd2aae1b5575960fea68632bd4684a1a28f59b41894935b02609f75de60f44b61d418ee0065bf005272a066133dca2946 SHA512 a3a1411b21885ce0c29574355d52a1bfad84299fdc99daf191d70f911f191d482f0e4a3d181faa1a1a7b031727f482fd3d95b6d9e1280167c0610f731356d11f
+DIST chromium-128.0.6613.137.tar.xz 6724182764 BLAKE2B 9f4d77b058af1619a4a13beac31ea463bd3d02086c172fb074d510b3f1dcba284fb1fa9ac5883ade2c2855f851a22bcbd4503960b4a27bc5844f16ad81558aba SHA512 3be85d2270a70ce3779b57e5d011e45312c67607e9e7c7f7ef396c515e37fed767105dfe0cc1f76830b007cebc05662f5318750c656c8a9765a25fa62036df6e
+DIST chromium-129-clang.tar.xz 52250752 BLAKE2B c7223a1f4a9f52eb631b968ecaea528d19aa14ded23e03e530ad6c46e7e1579a7a010cb347489f1b963013b4f26358be94aeff0f98b5eceb7b1f1e49e8acdfd3 SHA512 43681d64d4480e3f69afd3021037af6910e9c64052edefdb72e99b0a85cd94c4a8eb4095188784d7fa7f52fae10a9bd9db53f2bb80e89f709f92af7ce6403976
+DIST chromium-129-rust.tar.xz 152042272 BLAKE2B acde4dc9c0fe232d16f07f3e4b719ea762627e234970866e0de56ec3959c4cd0a7b1b09cf5ccecd50efd1cc35dcf224be3b398c1ea19a79731d6db13c94fa7a9 SHA512 bef8e56cf73de5cefd5fe0bb9836ef65012406ff3d364d36624d30e7b5cdb2634d17ac9e49a60ccb0ac5dd57cf4311b587c5ff0cec26b2fc6e15274abe0dc85b
+DIST chromium-129.0.6668.29.tar.xz 6656211664 BLAKE2B 9a6c374195c6a3ad377ee58ddd38a78a299f1b5eddb4b7a6778640b4915f5c718bed7507e271f28839ace9c381a16b5e7a07cea026e1ecaa4fc8461891c14deb SHA512 5457349eb394c16041917c32ac9f3a302852777740982ede02ab1d1f4a2ccc43c88f1b184030c695e07d7046b5b2052cc4ecac3c73dc4075c645a84530361684
+DIST chromium-patches-128.tar.bz2 5087 BLAKE2B b0321fb45390a282afeeeb8fb4d6014d6e6b708e6851235e0897ac77d524160b4d33476aa70532df45d0ccf233fee3b4028cd4d845667dc6a2a46ecebfeb6752 SHA512 978908d27dc6fc620209486a9ad7f73babde8710728960f44f2680445276516e59a85c08656af2663d9e197df45874f24a1f19f14a21798fbcf7c5a10bb19371
+DIST chromium-patches-129.tar.bz2 5071 BLAKE2B 080e1af8b0560a3c5365674e7c8d592310bbd2e273311b775b8112e410d91ccd48f170adbcf77cff566ad32de196217410663ac7b9e7e65544b6730fb1890aca SHA512 0a5bbc07dc9085b07332d5c6dd74940a9d55c4d0677f5603e75763ba54156f43664839d438f350bc86f3efc85aae452476e7f7040e06e60727847b156d1f0ab9
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-DIST chromium_127.0.6533.88-1raptor0~deb12u2.debian.tar.xz 8675684 BLAKE2B 868de8a681496c5da5aa9ebb8d27c84b35313038da85232c89d58f6ab7a4ac15866e8d0650d5283023aa38ab55da93f3b6a97280afdd1a3cf69a021517bfa8ab SHA512 3afea47fedad9c1374b238028ea642cde603f548af9992fdcff836745cf8c4243d0781f56e8710ca1bb22b0a552944c62a67a4799f8073fbe309d0f5a514c724
+DIST chromium_128.0.6613.119-1raptor0~deb12u1.debian.tar.xz 8673272 BLAKE2B 0ae1ead2b8d0ce196d5d16e132194da12d3dde3b43c270f794630c3427d38aaac6c6a289ac64b4748354e9d4d20ae8597076b64a4b7a7e1225c66a9f86e9f7ff SHA512 c896f8f07aa44cd6950375b36fe89fc2780ff9867e01feab71100c8551b22d3c89c5ba9e80cffbad22ff8575d20fc782b70969a51c68384fd8de62a09c4ffdcf
+DIST chromium_128.0.6613.84-1raptor0~deb12u1.debian.tar.xz 8674292 BLAKE2B 74c8556f578231cd133ce3a11306ce38d32332a3db7b0f32a63df1806201933e69e9ff01e66d7ccef279f2134e0a69c89365d7a08a7a7e7d69816a188ae0b91c SHA512 b1b85bc99493676d466e648c00eb7e337efbcb197e9ed5ae6394133721db828583340df5ebfa45a3dccc72f400ad6ada637d400d8e2fae35c1322ca5e15dc10e
diff --git a/www-client/chromium/chromium-127.0.6533.119.ebuild b/www-client/chromium/chromium-127.0.6533.119.ebuild
deleted file mode 100644
index b00bf49766b5..000000000000
--- a/www-client/chromium/chromium-127.0.6533.119.ebuild
+++ /dev/null
@@ -1,1481 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# Google 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 will eventually hit the point where we need to use
-# the bundled Clang due to the use of prerelease features. We've been lucky
-# enough so far that this hasn't been an issue.
-# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
-
-# GN is bundled with Chromium, but we always use the system version. Remember to
-# check for upstream changes to GN and update ebuild (and version below) as required.
-
-# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
-# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
-# then we remove ffmpeg from the image to ensure that the built package is distributable
-# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
-# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
-
-# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
-# no reason not to. Todo: Re-enable USE=system-ffmpeg.
-
-GN_MIN_VER=0.2165
-RUST_MIN_VER=1.78.0
-# chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-10646-g084e2b53-57
-GOOGLE_RUST_VER=32dd3795bce8b347fda786529cf5e42a813e0b7d-2
-
-: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
-
-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"
-
-# While prerelease llvm is actually used in the google build, until we have a
-# sane way to select 'rust built with this llvm slot' that isn't stable and testing
-# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="127.0.6533.88-1raptor0~deb12u2"
-PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	system-toolchain? (
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	)
-	!system-toolchain? (
-		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
-			-> chromium-${PV%%\.*}-clang.tar.xz
-		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%???}.tar.xz
-			-> chromium-${PV%%\.*}-rust.tar.xz
-	)
-	ppc64? (
-		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
-		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	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?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-	echo "virtual/rust:0/llvm-${1}[profiler(-)]"
-	echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
-}
-
-# Parse LLVM_COMPAT and generate a usedep for each version
-depend_clang_llvm_versions() {
-	if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
-		depend_clang_llvm_version ${#LLVM_COMPAT[0]}
-	else
-		echo "|| ("
-		for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
-			echo "("
-			depend_clang_llvm_version ${LLVM_COMPAT[i]}
-			echo ")"
-		done
-		echo ")"
-	fi
-}
-
-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 )
-	)
-	system-toolchain? (
-		$(depend_clang_llvm_versions)
-		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
-}
-
-# Chromium should build with any version of clang that we support
-# but we may need to pick the "best" one for a build (highest installed,
-# rust is built against it, etc.)
-# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
-# and output the _highest_ slot that is actually available on a system.
-chromium_pick_llvm_slot() {
-	# LLVM_COMPAT is always going to be oldest to newest (or one value)
-	# let's flip it and check from newest to oldest and return the first one we find.
-	local slot
-	for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
-		slot=${LLVM_COMPAT[i]}
-		if has_version "sys-devel/clang:${slot}" && \
-			has_version "sys-devel/llvm:${slot}" && \
-			has_version "sys-devel/lld:${slot}" && \
-			has_version "virtual/rust:0/llvm-${slot}" && \
-			( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
-
-			echo "${slot}"
-			return
-		fi
-	done
-
-	die_msg="
-No suitable clang/llvm/lld slot found.
-Slots checked: ${LLVM_COMPAT[*]}.
-"
-	die "${die_msg}"
-}
-
-# We need the rust version in src_configure and pkg_setup
-chromium_extract_rust_version() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
-	rustc_version=${rustc_version[0]#rust-bin-}
-	rustc_version=${rustc_version#rust-}
-
-	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
-	echo $rustc_version
-}
-
-# https://github.com/gentoo/gentoo/pull/28355
-chromium_tc-ld-is-mold() {
-	local out
-
-	# Ensure ld output is in English.
-	local -x LC_ALL=C
-
-	# First check the linker directly.
-	out=$($(tc-getLD "$@") --version 2>&1)
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# Then see if they're selecting mold via compiler flags.
-	# Note: We're assuming they're using LDFLAGS to hold the
-	# options and not CFLAGS/CXXFLAGS.
-	local base="${T}/test-tc-linker"
-	cat <<-EOF > "${base}.c"
-	int main(void) { return 0; }
-	EOF
-	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
-	rm -f "${base}"*
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# No mold here!
-	return 1
-}
-
-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
-
-		if use system-toolchain; then
-			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-			# We'll set these to clang here then 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.
-			if ! tc-is-lto && 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
-
-			# 936858
-			if chromium_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_SLOT=$(chromium_pick_llvm_slot)
-			export LLVM_SLOT # used in src_configure for rust-y business
-			AR=llvm-ar
-			CPP="${CHOST}-clang++ -E"
-			NM=llvm-nm
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-
-			if tc-is-cross-compiler; then
-				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-				CPP="${CBUILD}-clang++ -E"
-			fi
-
-			# The llvm-r1_pkg_setup we have at home.
-			# We prepend the path _first_ to explicitly use the selected slot.
-			llvm_prepend_path "${LLVM_SLOT}"
-
-			llvm_fix_clang_version CC CPP CXX
-			llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
-			llvm_fix_tool_path READELF STRINGS STRIP
-
-			# Set LLVM_CONFIG to help Meson (bug #907965) but only do it
-			# for empty ESYSROOT (as a proxy for "are we cross-compiling?").
-			if [[ -z ${ESYSROOT} ]] ; then
-				llvm_fix_tool_path LLVM_CONFIG
-			fi
-
-			einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
-
-			local rustc_ver=$(chromium_extract_rust_version)
-			if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
-					eerror "Rust >=${RUST_MIN_VER} is required"
-					eerror "Please run 'eselect rust' and select the correct rust version"
-					die "Selected rust version is too old"
-			else
-					einfo "Using rust ${rustc_ver} to build"
-			fi
-
-		fi
-		# 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() {
-	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
-	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
-	# one toolchain over the other. The addtional control over over unpacking also helps us
-	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
-	# package by just not unpacking it unless we're using the bundled toolchain.
-	unpack ${P}.tar.xz
-	if use system-toolchain; then
-		unpack chromium-patches-${PATCH_V}.tar.bz2
-	else
-		unpack chromium-${PV%%\.*}-clang.tar.xz
-		local rust_dir="${WORKDIR}/rust-toolchain"
-		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
-		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
-	fi
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use ppc64; then
-		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
-		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc" || die
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-127-browser-ui-deps.patch"
-		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
-		"${FILESDIR}/chromium-127-updater-systemd.patch"
-	)
-
-	# 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
-	sed -i '/source_set("unit_tests") {/,/}/d' \
-		chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
-	sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
-		|| die "Failed to remove dependencies on bad target"
-
-	if use system-toolchain; then
-		# The patchset is really only required if we're using the system-toolchain
-		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
-		# We can't use the bundled compiler builtins
-		sed -i -e \
-			"/if (is_clang && toolchain_has_rust) {/,+2d" \
-			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	else
-		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
-		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
-		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
-		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
-			die "Failed to set clang version"
-		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"
-	fi
-
-	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
-
-	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
-		courgette/third_party
-		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/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		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/libudev
-		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/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/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
-	)
-
-	# 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
-
-	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
-			keeplibs+=( third_party/llvm )
-	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
-
-	einfo "Unbundling third-party libraries ..."
-	# Remove most bundled libraries. Some are still needed.
-	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=""
-
-	# We already forced the "correct" clang via pkg_setup
-	if use system-toolchain; then
-		if tc-is-cross-compiler; then
-			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_AR=${AR}
-			BUILD_CC=${CC}
-			BUILD_CXX=${CXX}
-			BUILD_NM=${NM}
-		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/\""
-
-		# from get_llvm_prefix
-		local prefix=${ESYSROOT}
-		[[ ${1} == -b ]] && prefix=${BROOT}
-		myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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
-		local rustc_ver=$(chromium_extract_rust_version)
-		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
-				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
-		else
-				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
-		fi
-		myconf_gn+=" rustc_version=\"${rustc_ver}\""
-	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
-		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
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# 936673: Updater (which we don't use) depends on libsystemd
-	# This _should_ always be disabled if we're not building a
-	# "Chrome" branded browser, but obviously this is not always sufficient.
-	myconf_gn+=" enable_updater=false"
-
-	local use_lto="false"
-	if tc-is-lto; then
-		use_lto="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
-		# Req's LTO; TODO: not compatible with -fno-split-lto-unit
-		myconf_gn+=" is_cfi=false"
-		# 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
-
-	pax-mark m out/Release/chrome
-
-	if ! use system-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_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-127.0.6533.99.ebuild b/www-client/chromium/chromium-127.0.6533.99.ebuild
deleted file mode 100644
index 495e54867ce5..000000000000
--- a/www-client/chromium/chromium-127.0.6533.99.ebuild
+++ /dev/null
@@ -1,1481 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# Google 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 will eventually hit the point where we need to use
-# the bundled Clang due to the use of prerelease features. We've been lucky
-# enough so far that this hasn't been an issue.
-# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
-
-# GN is bundled with Chromium, but we always use the system version. Remember to
-# check for upstream changes to GN and update ebuild (and version below) as required.
-
-# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
-# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
-# then we remove ffmpeg from the image to ensure that the built package is distributable
-# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
-# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
-
-# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
-# no reason not to. Todo: Re-enable USE=system-ffmpeg.
-
-GN_MIN_VER=0.2165
-RUST_MIN_VER=1.78.0
-# chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-10646-g084e2b53-57
-GOOGLE_RUST_VER=32dd3795bce8b347fda786529cf5e42a813e0b7d-2
-
-: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
-
-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"
-
-# While prerelease llvm is actually used in the google build, until we have a
-# sane way to select 'rust built with this llvm slot' that isn't stable and testing
-# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="127.0.6533.88-1raptor0~deb12u2"
-PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	system-toolchain? (
-		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
-	)
-	!system-toolchain? (
-		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
-			-> chromium-${PV%%\.*}-clang.tar.xz
-		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%???}.tar.xz
-			-> chromium-${PV%%\.*}-rust.tar.xz
-	)
-	ppc64? (
-		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
-		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
-	)
-	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~ppc64"
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="
-	!headless? ( || ( X wayland ) )
-	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?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-	echo "virtual/rust:0/llvm-${1}[profiler(-)]"
-	echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
-}
-
-# Parse LLVM_COMPAT and generate a usedep for each version
-depend_clang_llvm_versions() {
-	if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
-		depend_clang_llvm_version ${#LLVM_COMPAT[0]}
-	else
-		echo "|| ("
-		for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
-			echo "("
-			depend_clang_llvm_version ${LLVM_COMPAT[i]}
-			echo ")"
-		done
-		echo ")"
-	fi
-}
-
-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 )
-	)
-	system-toolchain? (
-		$(depend_clang_llvm_versions)
-		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
-}
-
-# Chromium should build with any version of clang that we support
-# but we may need to pick the "best" one for a build (highest installed,
-# rust is built against it, etc.)
-# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
-# and output the _highest_ slot that is actually available on a system.
-chromium_pick_llvm_slot() {
-	# LLVM_COMPAT is always going to be oldest to newest (or one value)
-	# let's flip it and check from newest to oldest and return the first one we find.
-	local slot
-	for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
-		slot=${LLVM_COMPAT[i]}
-		if has_version "sys-devel/clang:${slot}" && \
-			has_version "sys-devel/llvm:${slot}" && \
-			has_version "sys-devel/lld:${slot}" && \
-			has_version "virtual/rust:0/llvm-${slot}" && \
-			( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
-
-			echo "${slot}"
-			return
-		fi
-	done
-
-	die_msg="
-No suitable clang/llvm/lld slot found.
-Slots checked: ${LLVM_COMPAT[*]}.
-"
-	die "${die_msg}"
-}
-
-# We need the rust version in src_configure and pkg_setup
-chromium_extract_rust_version() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
-	rustc_version=${rustc_version[0]#rust-bin-}
-	rustc_version=${rustc_version#rust-}
-
-	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
-	echo $rustc_version
-}
-
-# https://github.com/gentoo/gentoo/pull/28355
-chromium_tc-ld-is-mold() {
-	local out
-
-	# Ensure ld output is in English.
-	local -x LC_ALL=C
-
-	# First check the linker directly.
-	out=$($(tc-getLD "$@") --version 2>&1)
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# Then see if they're selecting mold via compiler flags.
-	# Note: We're assuming they're using LDFLAGS to hold the
-	# options and not CFLAGS/CXXFLAGS.
-	local base="${T}/test-tc-linker"
-	cat <<-EOF > "${base}.c"
-	int main(void) { return 0; }
-	EOF
-	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
-	rm -f "${base}"*
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# No mold here!
-	return 1
-}
-
-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
-
-		if use system-toolchain; then
-			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
-			# We'll set these to clang here then 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.
-			if ! tc-is-lto && 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
-
-			# 936858
-			if chromium_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_SLOT=$(chromium_pick_llvm_slot)
-			export LLVM_SLOT # used in src_configure for rust-y business
-			AR=llvm-ar
-			CPP="${CHOST}-clang++ -E"
-			NM=llvm-nm
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-
-			if tc-is-cross-compiler; then
-				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
-				CPP="${CBUILD}-clang++ -E"
-			fi
-
-			# The llvm-r1_pkg_setup we have at home.
-			# We prepend the path _first_ to explicitly use the selected slot.
-			llvm_prepend_path "${LLVM_SLOT}"
-
-			llvm_fix_clang_version CC CPP CXX
-			llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
-			llvm_fix_tool_path READELF STRINGS STRIP
-
-			# Set LLVM_CONFIG to help Meson (bug #907965) but only do it
-			# for empty ESYSROOT (as a proxy for "are we cross-compiling?").
-			if [[ -z ${ESYSROOT} ]] ; then
-				llvm_fix_tool_path LLVM_CONFIG
-			fi
-
-			einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
-
-			local rustc_ver=$(chromium_extract_rust_version)
-			if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
-					eerror "Rust >=${RUST_MIN_VER} is required"
-					eerror "Please run 'eselect rust' and select the correct rust version"
-					die "Selected rust version is too old"
-			else
-					einfo "Using rust ${rustc_ver} to build"
-			fi
-
-		fi
-		# 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() {
-	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
-	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
-	# one toolchain over the other. The addtional control over over unpacking also helps us
-	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
-	# package by just not unpacking it unless we're using the bundled toolchain.
-	unpack ${P}.tar.xz
-	if use system-toolchain; then
-		unpack chromium-patches-${PATCH_V}.tar.bz2
-	else
-		unpack chromium-${PV%%\.*}-clang.tar.xz
-		local rust_dir="${WORKDIR}/rust-toolchain"
-		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
-		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
-	fi
-
-	use pgo && unpack chromium-profiler-0.2.tar
-
-	if use ppc64; then
-		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
-		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# disable global media controls, crashes with libstdc++
-	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
-		"chrome/browser/media/router/media_router_feature.cc" || die
-
-	local PATCHES=(
-		"${FILESDIR}/chromium-cross-compile.patch"
-		"${FILESDIR}/chromium-109-system-zlib.patch"
-		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
-		"${FILESDIR}/chromium-127-browser-ui-deps.patch"
-		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
-		"${FILESDIR}/chromium-127-updater-systemd.patch"
-	)
-
-	# 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
-	sed -i '/source_set("unit_tests") {/,/}/d' \
-		chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
-	sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
-		|| die "Failed to remove dependencies on bad target"
-
-	if use system-toolchain; then
-		# The patchset is really only required if we're using the system-toolchain
-		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
-		# We can't use the bundled compiler builtins
-		sed -i -e \
-			"/if (is_clang && toolchain_has_rust) {/,+2d" \
-			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
-	else
-		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
-		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
-		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
-		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
-			die "Failed to set clang version"
-		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"
-	fi
-
-	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
-
-	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
-		courgette/third_party
-		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/rxjs
-		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/front_end/third_party/web-vitals
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		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/libudev
-		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/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/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
-	)
-
-	# 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
-
-	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
-			keeplibs+=( third_party/llvm )
-	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
-
-	einfo "Unbundling third-party libraries ..."
-	# Remove most bundled libraries. Some are still needed.
-	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=""
-
-	# We already forced the "correct" clang via pkg_setup
-	if use system-toolchain; then
-		if tc-is-cross-compiler; then
-			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_AR=${AR}
-			BUILD_CC=${CC}
-			BUILD_CXX=${CXX}
-			BUILD_NM=${NM}
-		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/\""
-
-		# from get_llvm_prefix
-		local prefix=${ESYSROOT}
-		[[ ${1} == -b ]] && prefix=${BROOT}
-		myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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
-		local rustc_ver=$(chromium_extract_rust_version)
-		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
-				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
-		else
-				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
-		fi
-		myconf_gn+=" rustc_version=\"${rustc_ver}\""
-	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
-		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
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# 936673: Updater (which we don't use) depends on libsystemd
-	# This _should_ always be disabled if we're not building a
-	# "Chrome" branded browser, but obviously this is not always sufficient.
-	myconf_gn+=" enable_updater=false"
-
-	local use_lto="false"
-	if tc-is-lto; then
-		use_lto="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
-		# Req's LTO; TODO: not compatible with -fno-split-lto-unit
-		myconf_gn+=" is_cfi=false"
-		# 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
-
-	pax-mark m out/Release/chrome
-
-	if ! use system-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_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-128.0.6613.113.ebuild b/www-client/chromium/chromium-128.0.6613.113.ebuild
new file mode 100644
index 000000000000..b23b7d27e682
--- /dev/null
+++ b/www-client/chromium/chromium-128.0.6613.113.ebuild
@@ -0,0 +1,1452 @@
+# Copyright 2009-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# Google 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 will eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features. We've been lucky
+# enough so far that this hasn't been an issue.
+# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
+
+# GN is bundled with Chromium, but we always use the system version. Remember to
+# check for upstream changes to GN and update ebuild (and version below) as required.
+
+# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
+# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
+# then we remove ffmpeg from the image to ensure that the built package is distributable
+# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
+# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
+
+# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
+# no reason not to. Todo: Re-enable USE=system-ffmpeg.
+
+GN_MIN_VER=0.2165
+RUST_MIN_VER=1.78.0
+# chromium-tools/get-chromium-toolchain-strings.sh
+GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000
+GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3
+
+: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
+
+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"
+
+# While prerelease llvm is actually used in the google build, until we have a
+# sane way to select 'rust built with this llvm slot' that isn't stable and testing
+# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
+LLVM_COMPAT=( {17..18} )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PATCHSET_PPC64="128.0.6613.84-1raptor0~deb12u1"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	system-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	!system-toolchain? (
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
+			-> chromium-${PV%%\.*}-clang.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%?????}.tar.xz
+			-> chromium-${PV%%\.*}-rust.tar.xz
+	)
+	ppc64? (
+		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
+		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="amd64 arm64 ~ppc64"
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	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?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+	echo "virtual/rust:0/llvm-${1}[profiler(-)]"
+	echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
+}
+
+# Parse LLVM_COMPAT and generate a usedep for each version
+depend_clang_llvm_versions() {
+	if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
+		depend_clang_llvm_version ${#LLVM_COMPAT[0]}
+	else
+		echo "|| ("
+		for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+			echo "("
+			depend_clang_llvm_version ${LLVM_COMPAT[i]}
+			echo ")"
+		done
+		echo ")"
+	fi
+}
+
+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 )
+	)
+	system-toolchain? (
+		$(depend_clang_llvm_versions)
+		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
+}
+
+# Chromium should build with any version of clang that we support
+# but we may need to pick the "best" one for a build (highest installed,
+# rust is built against it, etc.)
+# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
+# and output the _highest_ slot that is actually available on a system.
+chromium_pick_llvm_slot() {
+	# LLVM_COMPAT is always going to be oldest to newest (or one value)
+	# let's flip it and check from newest to oldest and return the first one we find.
+	local slot
+	for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+		slot=${LLVM_COMPAT[i]}
+		if has_version "sys-devel/clang:${slot}" && \
+			has_version "sys-devel/llvm:${slot}" && \
+			has_version "sys-devel/lld:${slot}" && \
+			has_version "virtual/rust:0/llvm-${slot}" && \
+			( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
+
+			echo "${slot}"
+			return
+		fi
+	done
+
+	die_msg="
+No suitable clang/llvm/lld slot found.
+Slots checked: ${LLVM_COMPAT[*]}.
+"
+	die "${die_msg}"
+}
+
+# We need the rust version in src_configure and pkg_setup
+chromium_extract_rust_version() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	echo $rustc_version
+}
+
+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
+
+		if use system-toolchain; then
+			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+			# We'll set these to clang here then 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.
+			if ! tc-is-lto && 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
+
+			# 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_SLOT=$(chromium_pick_llvm_slot)
+			export LLVM_SLOT # used in src_configure for rust-y business
+			AR=llvm-ar
+			CPP="${CHOST}-clang++ -E"
+			NM=llvm-nm
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+
+			if tc-is-cross-compiler; then
+				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+				CPP="${CBUILD}-clang++ -E"
+			fi
+
+			# The llvm-r1_pkg_setup we have at home.
+			# We prepend the path _first_ to explicitly use the selected slot.
+			llvm_prepend_path "${LLVM_SLOT}"
+
+			llvm_fix_clang_version CC CPP CXX
+			llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
+			llvm_fix_tool_path READELF STRINGS STRIP
+
+			# Set LLVM_CONFIG to help Meson (bug #907965) but only do it
+			# for empty ESYSROOT (as a proxy for "are we cross-compiling?").
+			if [[ -z ${ESYSROOT} ]] ; then
+				llvm_fix_tool_path LLVM_CONFIG
+			fi
+
+			einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
+
+			local rustc_ver=$(chromium_extract_rust_version)
+			if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
+					eerror "Rust >=${RUST_MIN_VER} is required"
+					eerror "Please run 'eselect rust' and select the correct rust version"
+					die "Selected rust version is too old"
+			else
+					einfo "Using rust ${rustc_ver} to build"
+			fi
+
+		fi
+		# 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() {
+	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
+	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
+	# one toolchain over the other. The addtional control over over unpacking also helps us
+	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
+	# package by just not unpacking it unless we're using the bundled toolchain.
+	unpack ${P}.tar.xz
+	if use system-toolchain; then
+		unpack chromium-patches-${PATCH_V}.tar.bz2
+	else
+		unpack chromium-${PV%%\.*}-clang.tar.xz
+		local rust_dir="${WORKDIR}/rust-toolchain"
+		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
+		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
+	fi
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use ppc64; then
+		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
+		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# disable global media controls, crashes with libstdc++
+	sed -i -e \
+		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
+		"chrome/browser/media/router/media_router_feature.cc" || die
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
+		"${FILESDIR}/chromium-127-updater-systemd.patch"
+	)
+
+	# 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
+	sed -i '/source_set("unit_tests") {/,/}/d' \
+		chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
+	sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
+		|| die "Failed to remove dependencies on bad target"
+
+	if use system-toolchain; then
+		# The patchset is really only required if we're using the system-toolchain
+		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
+		# We can't use the bundled compiler builtins
+		sed -i -e \
+			"/if (is_clang && toolchain_has_rust) {/,+2d" \
+			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+	else
+		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
+		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
+		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
+		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
+			die "Failed to set clang version"
+		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"
+	fi
+
+	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
+
+	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
+		courgette/third_party
+		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/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/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/libudev
+		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/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
+	)
+
+	# 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
+
+	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
+			keeplibs+=( third_party/llvm )
+	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
+
+	einfo "Unbundling third-party libraries ..."
+	# Remove most bundled libraries. Some are still needed.
+	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=""
+
+	# We already forced the "correct" clang via pkg_setup
+	if use system-toolchain; then
+		if tc-is-cross-compiler; then
+			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_AR=${AR}
+			BUILD_CC=${CC}
+			BUILD_CXX=${CXX}
+			BUILD_NM=${NM}
+		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/\""
+
+		# from get_llvm_prefix
+		local prefix=${ESYSROOT}
+		[[ ${1} == -b ]] && prefix=${BROOT}
+		myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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
+		local rustc_ver=$(chromium_extract_rust_version)
+		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
+		else
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
+		fi
+		myconf_gn+=" rustc_version=\"${rustc_ver}\""
+	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
+		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
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# 936673: Updater (which we don't use) depends on libsystemd
+	# This _should_ always be disabled if we're not building a
+	# "Chrome" branded browser, but obviously this is not always sufficient.
+	myconf_gn+=" enable_updater=false"
+
+	local use_lto="false"
+	if tc-is-lto; then
+		use_lto="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
+		# Req's LTO; TODO: not compatible with -fno-split-lto-unit
+		myconf_gn+=" is_cfi=false"
+		# 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
+
+	pax-mark m out/Release/chrome
+
+	if ! use system-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_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-128.0.6613.119.ebuild b/www-client/chromium/chromium-128.0.6613.119.ebuild
new file mode 100644
index 000000000000..5bff9392446b
--- /dev/null
+++ b/www-client/chromium/chromium-128.0.6613.119.ebuild
@@ -0,0 +1,1452 @@
+# Copyright 2009-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# Google 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 will eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features. We've been lucky
+# enough so far that this hasn't been an issue.
+# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
+
+# GN is bundled with Chromium, but we always use the system version. Remember to
+# check for upstream changes to GN and update ebuild (and version below) as required.
+
+# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
+# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
+# then we remove ffmpeg from the image to ensure that the built package is distributable
+# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
+# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
+
+# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
+# no reason not to. Todo: Re-enable USE=system-ffmpeg.
+
+GN_MIN_VER=0.2165
+RUST_MIN_VER=1.78.0
+# chromium-tools/get-chromium-toolchain-strings.sh
+GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000
+GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3
+
+: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
+
+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"
+
+# While prerelease llvm is actually used in the google build, until we have a
+# sane way to select 'rust built with this llvm slot' that isn't stable and testing
+# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
+LLVM_COMPAT=( {17..18} )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PATCHSET_PPC64="128.0.6613.84-1raptor0~deb12u1"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	system-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	!system-toolchain? (
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
+			-> chromium-${PV%%\.*}-clang.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%?????}.tar.xz
+			-> chromium-${PV%%\.*}-rust.tar.xz
+	)
+	ppc64? (
+		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
+		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="amd64 ~arm64 ~ppc64"
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	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?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+	echo "virtual/rust:0/llvm-${1}[profiler(-)]"
+	echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
+}
+
+# Parse LLVM_COMPAT and generate a usedep for each version
+depend_clang_llvm_versions() {
+	if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
+		depend_clang_llvm_version ${#LLVM_COMPAT[0]}
+	else
+		echo "|| ("
+		for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+			echo "("
+			depend_clang_llvm_version ${LLVM_COMPAT[i]}
+			echo ")"
+		done
+		echo ")"
+	fi
+}
+
+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 )
+	)
+	system-toolchain? (
+		$(depend_clang_llvm_versions)
+		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
+}
+
+# Chromium should build with any version of clang that we support
+# but we may need to pick the "best" one for a build (highest installed,
+# rust is built against it, etc.)
+# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
+# and output the _highest_ slot that is actually available on a system.
+chromium_pick_llvm_slot() {
+	# LLVM_COMPAT is always going to be oldest to newest (or one value)
+	# let's flip it and check from newest to oldest and return the first one we find.
+	local slot
+	for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+		slot=${LLVM_COMPAT[i]}
+		if has_version "sys-devel/clang:${slot}" && \
+			has_version "sys-devel/llvm:${slot}" && \
+			has_version "sys-devel/lld:${slot}" && \
+			has_version "virtual/rust:0/llvm-${slot}" && \
+			( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
+
+			echo "${slot}"
+			return
+		fi
+	done
+
+	die_msg="
+No suitable clang/llvm/lld slot found.
+Slots checked: ${LLVM_COMPAT[*]}.
+"
+	die "${die_msg}"
+}
+
+# We need the rust version in src_configure and pkg_setup
+chromium_extract_rust_version() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	echo $rustc_version
+}
+
+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
+
+		if use system-toolchain; then
+			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+			# We'll set these to clang here then 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.
+			if ! tc-is-lto && 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
+
+			# 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_SLOT=$(chromium_pick_llvm_slot)
+			export LLVM_SLOT # used in src_configure for rust-y business
+			AR=llvm-ar
+			CPP="${CHOST}-clang++ -E"
+			NM=llvm-nm
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+
+			if tc-is-cross-compiler; then
+				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+				CPP="${CBUILD}-clang++ -E"
+			fi
+
+			# The llvm-r1_pkg_setup we have at home.
+			# We prepend the path _first_ to explicitly use the selected slot.
+			llvm_prepend_path "${LLVM_SLOT}"
+
+			llvm_fix_clang_version CC CPP CXX
+			llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
+			llvm_fix_tool_path READELF STRINGS STRIP
+
+			# Set LLVM_CONFIG to help Meson (bug #907965) but only do it
+			# for empty ESYSROOT (as a proxy for "are we cross-compiling?").
+			if [[ -z ${ESYSROOT} ]] ; then
+				llvm_fix_tool_path LLVM_CONFIG
+			fi
+
+			einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
+
+			local rustc_ver=$(chromium_extract_rust_version)
+			if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
+					eerror "Rust >=${RUST_MIN_VER} is required"
+					eerror "Please run 'eselect rust' and select the correct rust version"
+					die "Selected rust version is too old"
+			else
+					einfo "Using rust ${rustc_ver} to build"
+			fi
+
+		fi
+		# 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() {
+	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
+	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
+	# one toolchain over the other. The addtional control over over unpacking also helps us
+	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
+	# package by just not unpacking it unless we're using the bundled toolchain.
+	unpack ${P}.tar.xz
+	if use system-toolchain; then
+		unpack chromium-patches-${PATCH_V}.tar.bz2
+	else
+		unpack chromium-${PV%%\.*}-clang.tar.xz
+		local rust_dir="${WORKDIR}/rust-toolchain"
+		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
+		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
+	fi
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use ppc64; then
+		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
+		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# disable global media controls, crashes with libstdc++
+	sed -i -e \
+		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
+		"chrome/browser/media/router/media_router_feature.cc" || die
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
+		"${FILESDIR}/chromium-127-updater-systemd.patch"
+	)
+
+	# 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
+	sed -i '/source_set("unit_tests") {/,/}/d' \
+		chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
+	sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
+		|| die "Failed to remove dependencies on bad target"
+
+	if use system-toolchain; then
+		# The patchset is really only required if we're using the system-toolchain
+		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
+		# We can't use the bundled compiler builtins
+		sed -i -e \
+			"/if (is_clang && toolchain_has_rust) {/,+2d" \
+			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+	else
+		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
+		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
+		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
+		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
+			die "Failed to set clang version"
+		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"
+	fi
+
+	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
+
+	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
+		courgette/third_party
+		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/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/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/libudev
+		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/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
+	)
+
+	# 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
+
+	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
+			keeplibs+=( third_party/llvm )
+	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
+
+	einfo "Unbundling third-party libraries ..."
+	# Remove most bundled libraries. Some are still needed.
+	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=""
+
+	# We already forced the "correct" clang via pkg_setup
+	if use system-toolchain; then
+		if tc-is-cross-compiler; then
+			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_AR=${AR}
+			BUILD_CC=${CC}
+			BUILD_CXX=${CXX}
+			BUILD_NM=${NM}
+		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/\""
+
+		# from get_llvm_prefix
+		local prefix=${ESYSROOT}
+		[[ ${1} == -b ]] && prefix=${BROOT}
+		myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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
+		local rustc_ver=$(chromium_extract_rust_version)
+		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
+		else
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
+		fi
+		myconf_gn+=" rustc_version=\"${rustc_ver}\""
+	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
+		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
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# 936673: Updater (which we don't use) depends on libsystemd
+	# This _should_ always be disabled if we're not building a
+	# "Chrome" branded browser, but obviously this is not always sufficient.
+	myconf_gn+=" enable_updater=false"
+
+	local use_lto="false"
+	if tc-is-lto; then
+		use_lto="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
+		# Req's LTO; TODO: not compatible with -fno-split-lto-unit
+		myconf_gn+=" is_cfi=false"
+		# 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
+
+	pax-mark m out/Release/chrome
+
+	if ! use system-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_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-128.0.6613.137.ebuild b/www-client/chromium/chromium-128.0.6613.137.ebuild
new file mode 100644
index 000000000000..d6d37e007c29
--- /dev/null
+++ b/www-client/chromium/chromium-128.0.6613.137.ebuild
@@ -0,0 +1,1452 @@
+# Copyright 2009-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# Google 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 will eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features. We've been lucky
+# enough so far that this hasn't been an issue.
+# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
+
+# GN is bundled with Chromium, but we always use the system version. Remember to
+# check for upstream changes to GN and update ebuild (and version below) as required.
+
+# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
+# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
+# then we remove ffmpeg from the image to ensure that the built package is distributable
+# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
+# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
+
+# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
+# no reason not to. Todo: Re-enable USE=system-ffmpeg.
+
+GN_MIN_VER=0.2165
+RUST_MIN_VER=1.78.0
+# chromium-tools/get-chromium-toolchain-strings.sh
+GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000
+GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3
+
+: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
+
+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"
+
+# While prerelease llvm is actually used in the google build, until we have a
+# sane way to select 'rust built with this llvm slot' that isn't stable and testing
+# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
+LLVM_COMPAT=( {17..18} )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PATCHSET_PPC64="128.0.6613.119-1raptor0~deb12u1"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	system-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	!system-toolchain? (
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
+			-> chromium-${PV%%\.*}-clang.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%?????}.tar.xz
+			-> chromium-${PV%%\.*}-rust.tar.xz
+	)
+	ppc64? (
+		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
+		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="amd64 ~arm64 ~ppc64"
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	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?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+	echo "virtual/rust:0/llvm-${1}[profiler(-)]"
+	echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
+}
+
+# Parse LLVM_COMPAT and generate a usedep for each version
+depend_clang_llvm_versions() {
+	if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
+		depend_clang_llvm_version ${#LLVM_COMPAT[0]}
+	else
+		echo "|| ("
+		for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+			echo "("
+			depend_clang_llvm_version ${LLVM_COMPAT[i]}
+			echo ")"
+		done
+		echo ")"
+	fi
+}
+
+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 )
+	)
+	system-toolchain? (
+		$(depend_clang_llvm_versions)
+		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
+}
+
+# Chromium should build with any version of clang that we support
+# but we may need to pick the "best" one for a build (highest installed,
+# rust is built against it, etc.)
+# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
+# and output the _highest_ slot that is actually available on a system.
+chromium_pick_llvm_slot() {
+	# LLVM_COMPAT is always going to be oldest to newest (or one value)
+	# let's flip it and check from newest to oldest and return the first one we find.
+	local slot
+	for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+		slot=${LLVM_COMPAT[i]}
+		if has_version "sys-devel/clang:${slot}" && \
+			has_version "sys-devel/llvm:${slot}" && \
+			has_version "sys-devel/lld:${slot}" && \
+			has_version "virtual/rust:0/llvm-${slot}" && \
+			( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
+
+			echo "${slot}"
+			return
+		fi
+	done
+
+	die_msg="
+No suitable clang/llvm/lld slot found.
+Slots checked: ${LLVM_COMPAT[*]}.
+"
+	die "${die_msg}"
+}
+
+# We need the rust version in src_configure and pkg_setup
+chromium_extract_rust_version() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	echo $rustc_version
+}
+
+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
+
+		if use system-toolchain; then
+			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+			# We'll set these to clang here then 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.
+			if ! tc-is-lto && 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
+
+			# 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_SLOT=$(chromium_pick_llvm_slot)
+			export LLVM_SLOT # used in src_configure for rust-y business
+			AR=llvm-ar
+			CPP="${CHOST}-clang++ -E"
+			NM=llvm-nm
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+
+			if tc-is-cross-compiler; then
+				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+				CPP="${CBUILD}-clang++ -E"
+			fi
+
+			# The llvm-r1_pkg_setup we have at home.
+			# We prepend the path _first_ to explicitly use the selected slot.
+			llvm_prepend_path "${LLVM_SLOT}"
+
+			llvm_fix_clang_version CC CPP CXX
+			llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
+			llvm_fix_tool_path READELF STRINGS STRIP
+
+			# Set LLVM_CONFIG to help Meson (bug #907965) but only do it
+			# for empty ESYSROOT (as a proxy for "are we cross-compiling?").
+			if [[ -z ${ESYSROOT} ]] ; then
+				llvm_fix_tool_path LLVM_CONFIG
+			fi
+
+			einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
+
+			local rustc_ver=$(chromium_extract_rust_version)
+			if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
+					eerror "Rust >=${RUST_MIN_VER} is required"
+					eerror "Please run 'eselect rust' and select the correct rust version"
+					die "Selected rust version is too old"
+			else
+					einfo "Using rust ${rustc_ver} to build"
+			fi
+
+		fi
+		# 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() {
+	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
+	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
+	# one toolchain over the other. The addtional control over over unpacking also helps us
+	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
+	# package by just not unpacking it unless we're using the bundled toolchain.
+	unpack ${P}.tar.xz
+	if use system-toolchain; then
+		unpack chromium-patches-${PATCH_V}.tar.bz2
+	else
+		unpack chromium-${PV%%\.*}-clang.tar.xz
+		local rust_dir="${WORKDIR}/rust-toolchain"
+		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
+		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
+	fi
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use ppc64; then
+		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
+		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# disable global media controls, crashes with libstdc++
+	sed -i -e \
+		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
+		"chrome/browser/media/router/media_router_feature.cc" || die
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
+		"${FILESDIR}/chromium-127-updater-systemd.patch"
+	)
+
+	# 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
+	sed -i '/source_set("unit_tests") {/,/}/d' \
+		chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
+	sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
+		|| die "Failed to remove dependencies on bad target"
+
+	if use system-toolchain; then
+		# The patchset is really only required if we're using the system-toolchain
+		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
+		# We can't use the bundled compiler builtins
+		sed -i -e \
+			"/if (is_clang && toolchain_has_rust) {/,+2d" \
+			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+	else
+		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
+		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
+		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
+		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
+			die "Failed to set clang version"
+		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"
+	fi
+
+	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
+
+	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
+		courgette/third_party
+		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/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/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/libudev
+		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/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
+	)
+
+	# 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
+
+	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
+			keeplibs+=( third_party/llvm )
+	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
+
+	einfo "Unbundling third-party libraries ..."
+	# Remove most bundled libraries. Some are still needed.
+	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=""
+
+	# We already forced the "correct" clang via pkg_setup
+	if use system-toolchain; then
+		if tc-is-cross-compiler; then
+			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_AR=${AR}
+			BUILD_CC=${CC}
+			BUILD_CXX=${CXX}
+			BUILD_NM=${NM}
+		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/\""
+
+		# from get_llvm_prefix
+		local prefix=${ESYSROOT}
+		[[ ${1} == -b ]] && prefix=${BROOT}
+		myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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
+		local rustc_ver=$(chromium_extract_rust_version)
+		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
+		else
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
+		fi
+		myconf_gn+=" rustc_version=\"${rustc_ver}\""
+	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
+		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
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# 936673: Updater (which we don't use) depends on libsystemd
+	# This _should_ always be disabled if we're not building a
+	# "Chrome" branded browser, but obviously this is not always sufficient.
+	myconf_gn+=" enable_updater=false"
+
+	local use_lto="false"
+	if tc-is-lto; then
+		use_lto="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
+		# Req's LTO; TODO: not compatible with -fno-split-lto-unit
+		myconf_gn+=" is_cfi=false"
+		# 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
+
+	pax-mark m out/Release/chrome
+
+	if ! use system-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_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-129.0.6668.29.ebuild b/www-client/chromium/chromium-129.0.6668.29.ebuild
new file mode 100644
index 000000000000..9c8ee4f48971
--- /dev/null
+++ b/www-client/chromium/chromium-129.0.6668.29.ebuild
@@ -0,0 +1,1447 @@
+# Copyright 2009-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# Google 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 will eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features. We've been lucky
+# enough so far that this hasn't been an issue.
+# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
+
+# GN is bundled with Chromium, but we always use the system version. Remember to
+# check for upstream changes to GN and update ebuild (and version below) as required.
+
+# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
+# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
+# then we remove ffmpeg from the image to ensure that the built package is distributable
+# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
+# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
+
+# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
+# no reason not to. Todo: Re-enable USE=system-ffmpeg.
+
+GN_MIN_VER=0.2165
+RUST_MIN_VER=1.78.0
+# chromium-tools/get-chromium-toolchain-strings.sh
+GOOGLE_CLANG_VER=llvmorg-20-init-1009-g7088a5ed-10
+GOOGLE_RUST_VER=595316b4006932405a63862d8fe65f71a6356293-5
+
+: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
+
+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"
+
+# While prerelease llvm is actually used in the google build, until we have a
+# sane way to select 'rust built with this llvm slot' that isn't stable and testing
+# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
+LLVM_COMPAT=( {17..18} )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PATCHSET_PPC64="128.0.6613.84-1raptor0~deb12u1"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	system-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	!system-toolchain? (
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
+			-> chromium-${PV%%\.*}-clang.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%???}.tar.xz
+			-> chromium-${PV%%\.*}-rust.tar.xz
+	)
+	ppc64? (
+		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
+		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/beta"
+KEYWORDS="~amd64 ~arm64"
+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 +system-toolchain +vaapi +wayland +widevine"
+RESTRICT="!bindist? ( bindist )"
+
+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?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+	echo "virtual/rust:0/llvm-${1}[profiler(-)]"
+	echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
+}
+
+# Parse LLVM_COMPAT and generate a usedep for each version
+depend_clang_llvm_versions() {
+	if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
+		depend_clang_llvm_version ${#LLVM_COMPAT[0]}
+	else
+		echo "|| ("
+		for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+			echo "("
+			depend_clang_llvm_version ${LLVM_COMPAT[i]}
+			echo ")"
+		done
+		echo ")"
+	fi
+}
+
+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 )
+	)
+	system-toolchain? (
+		$(depend_clang_llvm_versions)
+		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
+}
+
+# Chromium should build with any version of clang that we support
+# but we may need to pick the "best" one for a build (highest installed,
+# rust is built against it, etc.)
+# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
+# and output the _highest_ slot that is actually available on a system.
+chromium_pick_llvm_slot() {
+	# LLVM_COMPAT is always going to be oldest to newest (or one value)
+	# let's flip it and check from newest to oldest and return the first one we find.
+	local slot
+	for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
+		slot=${LLVM_COMPAT[i]}
+		if has_version "sys-devel/clang:${slot}" && \
+			has_version "sys-devel/llvm:${slot}" && \
+			has_version "sys-devel/lld:${slot}" && \
+			has_version "virtual/rust:0/llvm-${slot}" && \
+			( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
+
+			echo "${slot}"
+			return
+		fi
+	done
+
+	die_msg="
+No suitable clang/llvm/lld slot found.
+Slots checked: ${LLVM_COMPAT[*]}.
+"
+	die "${die_msg}"
+}
+
+# We need the rust version in src_configure and pkg_setup
+chromium_extract_rust_version() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	echo $rustc_version
+}
+
+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
+
+		if use system-toolchain; then
+			# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+			# We'll set these to clang here then 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.
+			if ! tc-is-lto && 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
+
+			# 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_SLOT=$(chromium_pick_llvm_slot)
+			export LLVM_SLOT # used in src_configure for rust-y business
+			AR=llvm-ar
+			CPP="${CHOST}-clang++ -E"
+			NM=llvm-nm
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+
+			if tc-is-cross-compiler; then
+				use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+				CPP="${CBUILD}-clang++ -E"
+			fi
+
+			# The llvm-r1_pkg_setup we have at home.
+			# We prepend the path _first_ to explicitly use the selected slot.
+			llvm_prepend_path "${LLVM_SLOT}"
+
+			llvm_fix_clang_version CC CPP CXX
+			llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
+			llvm_fix_tool_path READELF STRINGS STRIP
+
+			# Set LLVM_CONFIG to help Meson (bug #907965) but only do it
+			# for empty ESYSROOT (as a proxy for "are we cross-compiling?").
+			if [[ -z ${ESYSROOT} ]] ; then
+				llvm_fix_tool_path LLVM_CONFIG
+			fi
+
+			einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
+
+			local rustc_ver=$(chromium_extract_rust_version)
+			if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
+					eerror "Rust >=${RUST_MIN_VER} is required"
+					eerror "Please run 'eselect rust' and select the correct rust version"
+					die "Selected rust version is too old"
+			else
+					einfo "Using rust ${rustc_ver} to build"
+			fi
+
+		fi
+		# 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() {
+	# In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
+	# so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
+	# one toolchain over the other. The addtional control over over unpacking also helps us
+	# ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
+	# package by just not unpacking it unless we're using the bundled toolchain.
+	unpack ${P}.tar.xz
+	if use system-toolchain; then
+		unpack chromium-patches-${PATCH_V}.tar.bz2
+	else
+		unpack chromium-${PV%%\.*}-clang.tar.xz
+		local rust_dir="${WORKDIR}/rust-toolchain"
+		mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
+		tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
+	fi
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use ppc64; then
+		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
+		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# 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"
+	)
+
+	if use system-toolchain; then
+		# The patchset is really only required if we're using the system-toolchain
+		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
+
+	else
+		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
+		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
+		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
+		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
+			die "Failed to set clang version"
+		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"
+	fi
+
+	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
+
+	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
+		courgette/third_party
+		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/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/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
+	)
+
+	# 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
+
+	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
+			keeplibs+=( third_party/llvm )
+	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
+
+	einfo "Unbundling third-party libraries ..."
+	# Remove most bundled libraries. Some are still needed.
+	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=""
+
+	# We already forced the "correct" clang via pkg_setup
+	if use system-toolchain; then
+		if tc-is-cross-compiler; then
+			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_AR=${AR}
+			BUILD_CC=${CC}
+			BUILD_CXX=${CXX}
+			BUILD_NM=${NM}
+		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/\""
+
+		# from get_llvm_prefix
+		local prefix=${ESYSROOT}
+		[[ ${1} == -b ]] && prefix=${BROOT}
+		myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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
+		local rustc_ver=$(chromium_extract_rust_version)
+		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
+		else
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
+		fi
+		myconf_gn+=" rustc_version=\"${rustc_ver}\""
+	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
+		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
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# 936673: Updater (which we don't use) depends on libsystemd
+	# This _should_ always be disabled if we're not building a
+	# "Chrome" branded browser, but obviously this is not always sufficient.
+	myconf_gn+=" enable_updater=false"
+
+	local use_lto="false"
+	if tc-is-lto; then
+		use_lto="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
+		# Req's LTO; TODO: not compatible with -fno-split-lto-unit
+		myconf_gn+=" is_cfi=false"
+		# 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
+
+	pax-mark m out/Release/chrome
+
+	if ! use system-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_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/falkon/Manifest b/www-client/falkon/Manifest
index 0bb1f1505c59..1275bbed09f2 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,2 +1,2 @@
-DIST falkon-23.08.5.tar.xz 2574364 BLAKE2B 9090263ee1e9a76cf9efebf6f3c8b5d0ca25a907f467ebe5adff6d54e71c79aa982317094ea354fb4fa898244b119b73640fc92ae301f95fe78551d3e84921a9 SHA512 215e2a4ff551aa6d3fab0317d2b2b823b7fee4c1f6a653118d00f3def9ebb037931e8cd81f33785a44c8aa8910e00fbda884c1cfcdb61190544d1e6c8396acf8
 DIST falkon-24.05.2.tar.xz 2584984 BLAKE2B 5743e689281cd38e07f352499a8ef96ffe3300f702721dbd3493753b1346af6a4a837b0034366136b7b1bfb4566a62ae9b9050c1e67733d3b6d1b3713d915c63 SHA512 b3d6b2f13431871d1f6202eeeafac9b821c5b9d140eb635b9c4bcfb3f2cc785d0fcabfcd983f25cfcdc76fd20d9f90bf46ed766db42228eaad34ad524a228a3b
+DIST falkon-24.08.0.tar.xz 2635528 BLAKE2B 994ebe555c41f7b6552c0ea4cf921840dc791d50f1d6cd6cefb79fac74fb747e4de57830e412d29c3138bfbd9b41bdaeda10a62838d2dbd5a306d029f50cd953 SHA512 b136a8e4a8c63da2d7cf45a1be3cf00df48f19ee31845c25d5464aa5e7ec51315268304707e7a147f8ca899100d497b5ba42d4586383175e96401af26df440df
diff --git a/www-client/falkon/falkon-23.08.5.ebuild b/www-client/falkon/falkon-23.08.5.ebuild
deleted file mode 100644
index 2bbf4951827f..000000000000
--- a/www-client/falkon/falkon-23.08.5.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
-
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-PYTHON_COMPAT=( python3_{10..11} )
-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 ~x86"
-IUSE="dbus kde python +X"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test" # bug 653046
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwebchannel-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5=[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	virtual/libintl
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	kde? (
-		>=kde-frameworks/kcoreaddons-${KFMIN}:5
-		>=kde-frameworks/kcrash-${KFMIN}:5
-		>=kde-frameworks/kio-${KFMIN}:5
-		>=kde-frameworks/kjobwidgets-${KFMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-		>=kde-frameworks/purpose-${KFMIN}:5
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep "
-			>=dev-python/pyside2-${QTMIN}[designer,gui,webengine,widgets,\${PYTHON_USEDEP}] \
-			>=dev-python/shiboken2-${QTMIN}[\${PYTHON_USEDEP}]
-		")
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:5"
-fi
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-PATCHES=( "${FILESDIR}/${PN}-23.07.80-python3.patch" )
-
-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 KF5Wallet)
-		$(cmake_use_find_package kde KF5KIO)
-		-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.05.2-r1.ebuild b/www-client/falkon/falkon-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..63d6208485b8
--- /dev/null
+++ b/www-client/falkon/falkon-24.05.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.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.05.2.ebuild b/www-client/falkon/falkon-24.05.2.ebuild
deleted file mode 100644
index 69577d72decd..000000000000
--- a/www-client/falkon/falkon-24.05.2.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.3.0
-QTMIN=6.6.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,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.0-r1.ebuild b/www-client/falkon/falkon-24.08.0-r1.ebuild
new file mode 100644
index 000000000000..4322d900bde0
--- /dev/null
+++ b/www-client/falkon/falkon-24.08.0-r1.ebuild
@@ -0,0 +1,83 @@
+# 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/files/falkon-23.07.80-python3.patch b/www-client/falkon/files/falkon-23.07.80-python3.patch
deleted file mode 100644
index d0b0e4bad788..000000000000
--- a/www-client/falkon/files/falkon-23.07.80-python3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9415a9da443c9a566dd2220551928c16602fa284 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 17 Jul 2022 12:45:25 +0200
-Subject: [PATCH] Python3 must be found first
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a847838be..1b5b38bbc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,12 +134,12 @@ endif()
- # Optional: PySide2
- option(BUILD_PYTHON_SUPPORT "Support for Python plugins" ON)
- if (BUILD_PYTHON_SUPPORT)
-+    find_package(Python3 COMPONENTS Development)
-     find_package(PySide2 "2.0.0")
-     find_package(Shiboken2 "2.0.0")
--    find_package(Python3 COMPONENTS Development)
-+    set_package_properties(Python3 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
-     set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
-     set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
--    set_package_properties(Python3 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
-     if (PySide2_FOUND AND Shiboken2_FOUND AND Python3_FOUND)
-         set(ENABLE_PYTHON_PLUGINS TRUE)
-     endif()
--- 
-2.41.0
-
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index b10d461aa6be..64518c3f93b5 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,296 +1,296 @@
-DIST firefox-115.14.0esr-ach.xpi 459031 BLAKE2B d3cdbd91af8e9d03a7624b1d8374dbd31edf0a619851422403e8fef616ee66705a186d8d5eb84e449965298a7e81abc70c1104d2138241d07948c01cfab022e4 SHA512 84c30cede83bb4075950375748ff2c48a799829d57de6b8bac6fb38996242a6cd42f71b716619e7f66120af4a4063342d78762b8d954cf49a9dce355dc1b6e24
-DIST firefox-115.14.0esr-af.xpi 415184 BLAKE2B 76b0ccf4cf4969e4007cd770b40a2fa486145d270887a85130c63f3443c85f1134b5f396a1e5f53211180ed27b5e63f9f1a4117faf2fe57a9275f68d0f2a30bc SHA512 d8427668d07571007968f476758907f0dc2c4ca3424331280477791df267954aa982ec5f26885a7b7c174fec3cef946d326dd38c59fb39e80942befb74f99503
-DIST firefox-115.14.0esr-an.xpi 499580 BLAKE2B 61641d853bd906600179e58047cfff47d05a0ef760a072de84f3905bca08400036423c55e1b68ac6ae06dcbc983e99d0f1db73d0a9ae70e0d8cf6889ba6321f3 SHA512 26d6c2bdb55d070b1f74a74564e8d8a45c93935b532d4532e133a3a3b4119d18ff0d609a703ce4136d0161f840a6a34a2012867a4ca0d596c693a2fb396b7fb3
-DIST firefox-115.14.0esr-ar.xpi 606291 BLAKE2B 7cbabd7af93763a04f6da7245929d8cc71d1913b8e6e83879e878238a4de82fb341ea6800818f60ead1e3047f9bfd51d4983d3b0448fcc1a7304bd7bdf0903d2 SHA512 d727b6c0230a2229abe77b47ab12dc8f8b2b2e3dec7e05447de3a69d0e54e636229e158bde032c8718b034c3866c0f5d20d797de5c60b075b669ae5c01bc065a
-DIST firefox-115.14.0esr-ast.xpi 491347 BLAKE2B dbe9b24006b8684f3bce6642ff4287449e6aa37529b62222a15930a0ff259f19e982c0b49dc18165d59a579261d09eb01a79d7e4a5d992d60baa8615b638f179 SHA512 f48598254612eb31c49a7680cd76d7ec19810e7f456d49994c7876ea69a71f2b2ce202b78d4edafdce03e9fce380d4594d42fbdb77de4731f8be3135236477df
-DIST firefox-115.14.0esr-az.xpi 486093 BLAKE2B 79c846b33bbd744c5bf9799bd5f27af5b473465b73160305cd290228e73564a9425318d4fd5e8b6b23f32cd88fc3b26d52b2bc6bfc0e09a096b4d9ed83c41d17 SHA512 a56ebb803dcee256ff69fb5aad02b9343c1462469292ad581732bf1827492c478c45c730bfd62245bbdd5d21ef89e2ac3381f1ffe4eb66dc65530bccb269ddba
-DIST firefox-115.14.0esr-be.xpi 715663 BLAKE2B fa47bba709eca24f1043727aa1ac8bf657925bdbd95d788d88fef39f9d2725d1e3586a02e7239fecd0ad33ec64fee65b7cae54f3f499d56b6a3c73a87fab6690 SHA512 07ccf8b64ae69d6b85fab6f85634a4624920bd7a6025d0d781f74f9ae734bbbaef4fc8b817f2779ca0420696518aee101610184b197927e4023ed5d39a26c227
-DIST firefox-115.14.0esr-bg.xpi 600412 BLAKE2B da2f5d0bf9883c493e69c2eff9f92dea95f8f91d47686aba133b42320cc07a494ceec0479e7aae83f8545f49efcc2f0d2c117592ffa70b0a0bb897aa808b287e SHA512 4e957ba651437a2799d2aa40fdcea71780a0489d47cde50b2f3f242e3d01477ae3ceb82c38bd267f818ce35c5f39241efd1fbe40708ab1d29ed5cfc8b840e4da
-DIST firefox-115.14.0esr-bn.xpi 576350 BLAKE2B a1557db1ef6f4eaaae58568b20c3b98af3e5a88f9ef16b6a2e894afda338e60f51983eba1573f71f5831f25f5c871ac3cae3be9394dbdf5da5848be8eb3b45d4 SHA512 ca0e3c8228e5644e7ee3123cf73525266071e395fd02a98b78ba59708ec13eeedb52652132ce1389104733ac7e12ec5b3e2aaa0e22d15fb6d626f18f0e3fbe39
-DIST firefox-115.14.0esr-br.xpi 585003 BLAKE2B 7e3f3d54a2e0da65c77842355448cfc802b6e99708cb6e30585c83f094a392c61e2fc28212df0c398af2831d98144933cce9dbb365f2c5f3ac46a3c5a833931f SHA512 cceffbbf37c5680d31765a728779d70ec15269ef9f9e4a6a006a7e308c8116d3c62cd8041823cc2ea306bb93f5ed811226ccb8d57b6b981718c6d5404d9150b0
-DIST firefox-115.14.0esr-bs.xpi 496792 BLAKE2B 67f48379e0da2dce9f79b71c157b26310f7876e42add689e21d03125fdf365721858a0e5e6ed54c34bde4a0cac960aacfedc623451dff9564ed73e4da0792709 SHA512 1e5afc91618224251521ae4dbccc0fd76f0f74db0bf73198e91a6543142f523ce017532241fdd113344dee15922bdc29fb59c61f8d35a12efdece203f59f9069
-DIST firefox-115.14.0esr-ca-valencia.xpi 539259 BLAKE2B d35b8af4c76d7fd47830fef0498924fa5e64b1eff84f7585b616ffa0ff42bfba673de28b5bab79662df6d9fa240918bccf1fd5a3d72ebec05abf944ba9006e31 SHA512 538a962bb31747cb45f231b8349edf13b271bc5173c4d3821b96888df1ea5e6040906cece726fb41e0d2a84fa783c8294d364db0ad3c9434635f4680a2be878a
-DIST firefox-115.14.0esr-ca.xpi 591043 BLAKE2B 8fcdf43c9505e0bb92a39e9ad29a57e68d4a63bad4bbc0af6cc9435db6c992470a782fcc45521027846df6a62adf4f500cf8c9a5d38c474481e7eaec9be45f66 SHA512 100f449d402ef2a07258e51995e1814de0d5aa518eec4a92adb192e0da8e104d4ba80dcdb0cba9cd05c3f86a3adef57c3c9bf72d407860e3ef721358519f5f67
-DIST firefox-115.14.0esr-cak.xpi 586727 BLAKE2B 358433fb5af26a6a0cbd5dc8eb62f9b576066f7919792a33887badc9be4650ca374efb75af7b93de6f1d1ee2b4023c7c44b533ed3e477010d8415e0a7867401c SHA512 5532e4800cba9ce81db2b5aaef2b2ae63b8bb81e67ef0f3b9325a232142c8af4f119adde724ce86584f233fc33381af61d53537e53cb1f84af1dceba50813f49
-DIST firefox-115.14.0esr-cs.xpi 659577 BLAKE2B 3bef6f542b6e14d7b7f98ed0456651af9526d6404fee99e425f21cdd526da054ed8de70834aab630ca4747f14beb720986581f763f45d8e54ee04a6a8b4a613a SHA512 fd1b5fd41e035405c1d4ee9a912798a15cf913db05d9ee36b2f649566ae8e2b8b320ce60be9c378b52a44e9aaf95ab0f41f07858fdcbbceb9250633ebf38da8b
-DIST firefox-115.14.0esr-cy.xpi 622581 BLAKE2B 725001b5f81f708b3199b814855de72ca541208c14db2a154c3967f7288611b1ecdaa2c1c6d7af904cff73acb56a447983d8b5462dfbc3a5d9168eba4985ea5c SHA512 9a17905b1835fb62a2eb229efa5042dd44a7849d0d920d6ed0f991fe59bb378d41fa77baeb73f4514e7071789f255adbd7439dc4cb4e2bae57503c37e9f2abc5
-DIST firefox-115.14.0esr-da.xpi 611181 BLAKE2B 83880036dc3fad3e5fe36b8a4d3c9d97b606de13abcc04d20ce6230dca542ff933138788da4a3890d588fe006699bb79e1a71269c4a3ba48330c6755d13dcf22 SHA512 44581cbc73e830efcf2569c18b3dadc065fc58940b6549d0ad585820eef82bd10f61f3bdea6c6d2b174dead037d0d5e4585ba3b319e6b80b038ed1a7d00803f2
-DIST firefox-115.14.0esr-de.xpi 632366 BLAKE2B a37b25b10da4f20a83ce34e88c17342b3408e72e9e092c0264424f6933e4307652f94bfd260828332ed3bacce262b8269506f8966504d0b2822da0cbfd4c3139 SHA512 56c7ddbc600d432dda6d82498278529d9e98cceee0229b6ed0d28a85b88afeb7ff0f5770b7e7adc9013305fe4ac038e72b9a6b1cfa32739b7fae1c6ce970a2a2
-DIST firefox-115.14.0esr-dsb.xpi 651470 BLAKE2B 578d5fb47e7d93c43d586f8eb4eac788f88c6ab31e74a444c7c73059ef8682b92516e37d3aa92f241cbaa2bd49816feb3f40a16ef5fe448e3186ec1205f2922e SHA512 01d28c3faaf2cd5930742eb0dab1a3cab26d3567e57f696d3776f4abeb3e536fc171db39c0d21728116d88df41ccd5ef799c445d5c395937403726597eebbdbd
-DIST firefox-115.14.0esr-el.xpi 734624 BLAKE2B 0a24ee3276b1bbcb9f8a0b038434efcb28179bd0a717b73caae3a9a83ede8382493ca0976c2c6a50c1972589bbd84a465ad9d4d93c78f052fbcf684b45ad23d2 SHA512 3515cb0c752543a0c6bb0f0901a03037035d14f16ffe3769398428a945d53941135069eb98c92fa0608c33ed3d0d993577c7948bf790d8d533217e75a9be0d28
-DIST firefox-115.14.0esr-en-CA.xpi 584146 BLAKE2B 139bf423194360acb87311cd688b2d1359dddc25e3576219124050fd91e204ee85cb109f27aff1b16086bf8b5c776d216b4b95e0464cb5eedb1b2c26ce24bd73 SHA512 dac0e30a16f6c899bd1b1d104bd6c0f6a73b900ecc039b0b7a1f32c0649b76d9be7db200419779441272bf627fffd6026ac0cd28e89254aa61255608aad57623
-DIST firefox-115.14.0esr-en-GB.xpi 585203 BLAKE2B 51c6c2956b8acae2a24c1e86b817ae7e883e20950a9e5ee49dde27e825ab8b2b95115f4e967854c6803a3ab658bedf7543e3b1344912899368f1bb4453c9c537 SHA512 19e63882b04e48b94e4cf40b0889df046aa231d4f298d68073c8010556da4a7ffafe991911f04bc00e3afa3097ccab12b2b8d3d9d78dc1b6b5b779c7e138ebd6
-DIST firefox-115.14.0esr-eo.xpi 613404 BLAKE2B b1c8dce95f4f9d0a423025f47a059c12ffb6db5146e9e3a45928f420b7e5ad26658a7e42d0e5feb662793320314ccd0153aa2c912cb047ab22f3c1273430e5ad SHA512 b175dbfaec4b193b6bbc2eec1ca060f9b2ae99c33693fa55af9c3b4fe9043c8a946b7be83eeecde9fce884ea54a566cfad93f04026c9b8b684b97a2ad942a8b8
-DIST firefox-115.14.0esr-es-AR.xpi 628392 BLAKE2B 1b2ac634b032d17d0005b33bf8cd1492042390b382c6acb5d8b7770292b98ceb428895a0e735588d30832396d5343f8ff5a0151154a6a1d78e91b6037a4aa293 SHA512 b8debe613e9b6b52a189c89c000682daa76685d0c0b1eb85b66ba6c3f31fdda54f0fe0eee51846a9687388154f275afe332c46826384f717f421b8e9613baec3
-DIST firefox-115.14.0esr-es-CL.xpi 627708 BLAKE2B 18a30708b1475ad4b81de6a13cd13b1186a0ade6bf4c85d1b1c78a8464c147d2d69567346de452fb36d3b12b6991775e5c48bccc657e6ceb4f0117a7d37f50d8 SHA512 19016f66db9ac35cfaf538077c9fe743c8d7a484b36601652ccc9c87ac48f96e54b9821dce4229cb1294356887fe1fef5f5ee145f1ab18ca21246f758123f55c
-DIST firefox-115.14.0esr-es-ES.xpi 621485 BLAKE2B f5896113cf4643706baf8ff698f682d3f58b5dfcfe95530bcbc676edfa44b98a3683075b53fb40ddf89073b26e0c6cb8b40b3b0e41d48457ccff5beec0a1467d SHA512 4b1317161f284d6361b2a87196a700b04a8b8d8e76344659230cf929a40f0ebff694ac25fdca5d8821dcb220986da6ced187aba235fd48d467dca38b3ebeb542
-DIST firefox-115.14.0esr-es-MX.xpi 597942 BLAKE2B f7cba71d74831e33b27d78330f17734a87fda77ef6330b28f23a03c7e91f445c2300119b7e5509986254bcad2a75e441153d4dc90cceb38951a58ade2cf7317d SHA512 d4b3a147f7d5b08e7ae0b21d1c011aa0a3507675333578cc51ade9cf951c081252f15e90678d73ae1a76ce23502e4481825da42d5286477723a5e9c691c017c9
-DIST firefox-115.14.0esr-et.xpi 533026 BLAKE2B bd9cb5b70eb28b86a39b87cec0c6c40c3313f579cc63029c7c4dec85ed65cb8913e892f106a0bc66c8cf9fc4ff5ae84b27161458c3750062fd107fd9f0b02cb3 SHA512 abe36c2dfbc210a8588b3878be0b4d8d967dfae89f6c30f5624f12cc495af2c4f953e696f0c21b4baf03bc3553a9a9a23da469e7de3b0d78c161c8d667630dc9
-DIST firefox-115.14.0esr-eu.xpi 594661 BLAKE2B f59c1632cb76097f479289abf2889b5116c7c91519246f121a2929f6b76773d813a32691d572982b47162e4e9fa23a012e744286bb5245587cad0278f2e9ced2 SHA512 2c3f432da86d6858293bb2535680d9b2b5f69e24aedcc28473a222d56f613cad9a16ad0091d38c98d3788433d1c8401fd675468d7fe8c2105d711e9b52b61777
-DIST firefox-115.14.0esr-fa.xpi 584364 BLAKE2B f3f90be59396f6312109fa8cb44d3df9ffe270e52b1dc10d1c7d3eeb0bab421cff49ec654a9b47663a08f3521026d83cca577ae6a7f68c661341ddf0407778ed SHA512 b8b3e2be0d09e48f6c08fde82a63daf3a0351943418d189257586d30d243198b52e73d08b9705288d0d0fafee6324cdd2f754a891006963d2a86ba4933029e4f
-DIST firefox-115.14.0esr-ff.xpi 471728 BLAKE2B 6c0c944a34dc1fc191e6ecf0d850080442e4e0f21bc742b4e660f18955d8587078181e5401e965912565408ee9fccde4f3724fbef1fc1df203cb1fd88fdfe095 SHA512 4304e8f634242019ae98bf8f0556454dc49cb34758296fea8609438cf0cc34b70ad8b07c900f12f5e8955b4d3953ed799a063bb04a4cadd90a46157c88e2fe8c
-DIST firefox-115.14.0esr-fi.xpi 604633 BLAKE2B eceeeadac2e189eaf323ff12e3732554ba39e63d145675001b5c3493a41bfc6b9eab7021941930fe3f517983b67026db879e5b871901e264af13dc479dc281a6 SHA512 2d905561c3e2f2740d26f18918a5ce2a6e4be00b5622b87862884241afc7bb00c573960fa4ecfa7caf60a9ad0c078734e6db7a1c73d1f54be0fe67a229e4118d
-DIST firefox-115.14.0esr-fr.xpi 640847 BLAKE2B 002d89781dd01e2eb8ad942f7c9b3b59e320d4f36db4917e6b6d66336f9a384deab51016cc125c3c8d4fba786f30290c6362d1d1996b61f34add6e402516b964 SHA512 a9b7f514f94cdefc335dac4ae1443d29f69f20f295f5a0b4ba8c9f0fb48c52b33d18e0d0529056f2996e7a592a7b0aca4d6be7ab935c589be3747a3b8dbba01d
-DIST firefox-115.14.0esr-fy-NL.xpi 624086 BLAKE2B b94fb81dc426c331b513cbd8d9a30443b20387f2d646c7f34d67d4fcb4b74b7f88f3d421c5be42a18d42ed412f896617ef38cfa77318b29f972fc51fcd341a71 SHA512 7678aafbeed6a9249cb8e579e4d632f890fca6569d8e93d58a085e283081870966c2e3085a728568de80cec40c4c6b6dc310375fa5c633816a26ed5ecae96238
-DIST firefox-115.14.0esr-ga-IE.xpi 467652 BLAKE2B 9de569fa6982014b97b91c52760c122a297707623597b56377c9186ca3e919458a6592e7421fbe4a30713a1849b70fc5c9b34b41b1746f69ffddc5093c7b1bd2 SHA512 8bb3b021ce8cad7daec7421029fcf1759df120b6786846ead5cc102b3973d079a67f1f5d8be0ca47767c051c2f3a08b5e3048a34f15c3a7494158fb90f0702aa
-DIST firefox-115.14.0esr-gd.xpi 589971 BLAKE2B b33304a93bf02acff23a0d82159278d7836bf98ae4c614f369dc78e113891885793ba90a2516964ab91fe489ea877496998406b4a8aff08fec9574419681cf10 SHA512 ee7108ec5a1db3d8a61bfd419cbcc8864eba3594e4854f1d6a5bc3a9fdad17e4c224dcbbc61d5fe735973db9be794050b26c4a77fe7fb52158e9fdac3c779863
-DIST firefox-115.14.0esr-gl.xpi 599992 BLAKE2B 4044e5c5ac52e85e88ee370e7bc487ed853c0e58a47631f7f3fedc052b126f92f78bb8c0031a21ff208e80b37e666affc37de661263923135d9da56c954289c7 SHA512 74ea13705f799b01593bc87db9dfb75c73b50ac5fc427c865cdb389b90aec65b94eb4e164b660ee57b131784972563da2512a748396a023e88e4c39a17349c2d
-DIST firefox-115.14.0esr-gn.xpi 637889 BLAKE2B 0665a757acacee9a030fa546c94d0fd350ee4dec238a92ec8cbe7c976926083e88d684dfc540d12e55816a90c38b001ba1716925e25bc90c161b63e1f3d3dd57 SHA512 56c9ef4cfa6d21bada86316374a815ba0ceb400ef8166f36a6c4bd7ca77238de2810ce033bd7060cb86e58b978a78b4d733ba284f3b5cf8a3548bce024800fa7
-DIST firefox-115.14.0esr-gu-IN.xpi 523387 BLAKE2B b79b92750f2386fbdfa22728012b29a3ebfdef408bd4302a34203ae0ea1f377b763835a8094a7e0cf80bae2c45cc04a57382829f4f88132ced77fc600b3554e2 SHA512 3885f121fabc94fd02479274f9971f89eab474b7cefeb9229f2778e906f468164fb997ac389e11c9c6519cd54dc1873add41f575a74b098dcf055ed8e0b299fe
-DIST firefox-115.14.0esr-he.xpi 629103 BLAKE2B e34add03acbd44b65df58818219570606c37f36fdeb2ab89bfc9fafda6a09b22690178560c7abc0f7c0ee292a8c239f4536c016e5b48e4751b9363b082a05b58 SHA512 873c0e74cafca7355a5a167a1b31e87b8297f8c9c4ba2e254c928f577d076b5a91594805c15f3c519c9a22eeffabb6346a2305b4bdf2e0c31f7acc6772acfc57
-DIST firefox-115.14.0esr-hi-IN.xpi 561269 BLAKE2B 05c600f60d87d18e92f15253a9e7e1c5227cc72ca801b6792830d677e2302d51587a50bb516cc10541032ee86ff9c4e08f83a453b070fe8fde773adb6c56a840 SHA512 10ce058cc0c11c5275678e70fb0c52d4492094c33f1280e6736cf7996fadb0cfa755c3f1794f1bf430c7a5d192e581acfd30750310222668b750d7272fabda39
-DIST firefox-115.14.0esr-hr.xpi 554542 BLAKE2B 31ab9cbacc301896c04e9bc6af5f7790e0dff5afd97954eca38ce88610d4416dd4460bb317b5bf6477655105047d83438d785645ca7d2bc089040f59a88f4a31 SHA512 c8f44530f924650ded1666893206de45262da013a0ab81a702453c71d3e0f521d929422d58d0f93ebc414c7ad046005bb469ad3445729be91cffbf5269a40987
-DIST firefox-115.14.0esr-hsb.xpi 647506 BLAKE2B d069eced2dbabee333fc7bcfd037053ccbf44b529e5df8808c68a82c9caf5cf9abe360adb41af69faabf2e78d532a84e349996b6ec58e2309a72224f65458e0b SHA512 016c46a9f98a454ef7bd1eef6acb64089d370fb5be14e282c2a7855fe7af6176488d8b545c3d0253cbddf19f791640846d31181ca08a0c29d333581d54e5a591
-DIST firefox-115.14.0esr-hu.xpi 649871 BLAKE2B d4f91fd3a4a486ed7d27b1646556a6a0ceb9996f0561a6447b26b64e0d4096ebb271a1b2152c554ae0eb3ca1453d1bb6e81d9fd76a4dc801fa64e28fc6407298 SHA512 444bb1537bd514842e64d897bf91bac1681286e0c38da1b13faf454bac2e3da25aa22916a82bc7f1c7ec0e0772b64a6629ff4524e33db9e147ffa1514780b46f
-DIST firefox-115.14.0esr-hy-AM.xpi 647653 BLAKE2B b17c62f320b2b56a927a38c5bb6c8977d610de6cec0dc4fba7a597f2328be8fbbdc20084a82e6698d9c9537f771f1423c14f3b2dab0817026d607411582ad417 SHA512 d07c177dd93fc86866ccd4ffb29a3254755d5e589b3dbfd7c64c1db67b72af8fb7e762d175356b480199c004dc56a3b2b18571dfd4655d62047b6c2f3ca1c514
-DIST firefox-115.14.0esr-ia.xpi 610850 BLAKE2B ca1c700d0e59e60309d6830ba5b4eb92c801db757f582b7be1bb19e99389a54b363957a9dc1427dae5de9e3844ee4bcc9f3470fda1c7f6c7fd66639d0911cd42 SHA512 82608a06e5a5b611cb44e8765da40642de08027d4701bd4d3d49525d1b677bc79e78617dd576b893d0107b6e199b955d95a0825285f0d5f3bc23631c526cbf6d
-DIST firefox-115.14.0esr-id.xpi 573439 BLAKE2B 11f23b9d60eb68adf2e82e58b697fde92523eef3c512314eb99c2de0b6c1650067a74dc28c59f7dfb283a65eb70c9001820d6051c47943c94d0763e385d504e2 SHA512 749aab83ba76bfa26df1591cadb4b8c062b26b0294ac687915f88ff0af754214fb5188ed378e9a538121f4b1bce613f1493496bcbccb886313603a89009fdcbf
-DIST firefox-115.14.0esr-is.xpi 611649 BLAKE2B 1a1320c2741ff7014019cd8ab21a92ff6872f680d192e86823418312e44c78f43f5ebac597544fba4f7e02eaab6ed84e9e99a7ede1123915701cb850163e075b SHA512 cf9a08de49f692cf2009da9223624ddbb87dde0fce9aa66ff5ebaccffafb9adba3dc535cd7cd6ee6261bc2b888a2fd359e4620e094e0b8e1c49db36bfb581dcb
-DIST firefox-115.14.0esr-it.xpi 567123 BLAKE2B ffc8b952963706eaed137e8519363d37f9e0dde7303c985050ba97ed902ddde50204fd7d108027642b421002ceeea5715e7d1958f48102f4b9685aca01159911 SHA512 5301fa6fed8588af4279e8c014095aac345a7264471ae489268e4032bb0a65d377d5bc92d473b2221c9aac11652bfb2605842bc5339251cb6d4c7fcac83807c6
-DIST firefox-115.14.0esr-ja.xpi 676024 BLAKE2B 3e01ca2e7f19b907707379eff243e60d08182fbc18189c8a63dc496fb91dd82adf0ed6ac070a5a854ff469d1a5d6ab2c37d8fd311ac8c63545a33e90faf70e7a SHA512 4b952c730f17d7e7c111fc767c1ad56a1b8e48ee411ca164f066b7cfdd855a5e6ba3747165b7948c55cba47f33c846caf1ac98d27309102139557666b3b23cb2
-DIST firefox-115.14.0esr-ka.xpi 658003 BLAKE2B f5568bb90e4e88416ffd4a7690157a85fd20e839555c63620ac15b995cf304e6d0fcd5631cc68e643fab145070af4995ecff47ff3dd40a67fb6703eb14509177 SHA512 fdf9a5b61d00ed5b0b13e259c63c6df40cb370aec64154c4de3b0fd246e0617b16bc40d449b2b4c41fc812c618e075d1638229f2c977fee8cda1285af101094f
-DIST firefox-115.14.0esr-kab.xpi 604019 BLAKE2B bc0fe1c6c536da6e7f86841bbed4a4f6b9ed32639115f3853165cb700f88c3506f00be975388b04a23e13094cd23762f12694063787d22f558e7a783ae7cde55 SHA512 54692ae86b20a21d50ad14836413d655098172ad1ca9b55cafb6868269e4b6ad2454d846485014d66e20e16405f3f20234c2b3606668fd6af4389a0407a90f65
-DIST firefox-115.14.0esr-kk.xpi 709063 BLAKE2B 1017781b0704b6310b714a994c370d3bb2666ab96ec8dd30c43f801f8289c040aea63570051357f78f980462e7ec45b68a1fc8d049bdd582314a2b9dc852af06 SHA512 4d576661caa88f87683e8c8d84d59cfd86bf78380ea947620466b84a21506bf8e72f663af8c1b1ac034c592231ec3a2d61f32d7fef069df397641c18ebdab220
-DIST firefox-115.14.0esr-km.xpi 522336 BLAKE2B 238d46fc86fec47c8bc5b9132d8b9e4e15e8414be0161fbb95df71d26adae6f403049f1a68c461cd6784f1324742bd2e408a5906698812da78a66c8fced51ad7 SHA512 56812b9665000c3f341ef581e733325cdfa2983ac0725d87a736df78c110769b23ad33fd0e22ccb07a1d0c925a8952745e1723584114ffc9ea5238dd11ccec28
-DIST firefox-115.14.0esr-kn.xpi 488190 BLAKE2B d4bd3e1d421ff138c80e4b4a88a199ded4cd2e39dafd5f1a60a56793a890f920a9098d1471c53050aa3074967aa01c0d6b6ed27f900708139f32a325aa99ffff SHA512 2e19950a2d272df23f455dbc003a5bf6744612acc3c1e51d639151fec3526179be22449f475835ea80eb8fc58bf5d84404c8aa41949dfb51edb4a632ae2741c9
-DIST firefox-115.14.0esr-ko.xpi 662479 BLAKE2B 51706d65cb1fecdd9a711151cf13edb9159c9e374ea55c2af3f5522ae504a4587dc34c0599429ee9cab19ae636ad65b49575dfba870329b5b252ebbc794179a7 SHA512 8f9bd6c99e6d4dfa63a27a08be6a90eb042e6ff0b1b316bbcf01d9554e4780100f450aa464a990cdafaf8b6fb7de4fb2bc8b2b04848f357c4033b9c3d4bb9735
-DIST firefox-115.14.0esr-lij.xpi 479124 BLAKE2B 554507a4d52edaef23b956837d1d569002b16175a8ac42c2ec2c9b6e17e31889062fc4337b4929d39ee6d0b2d61cbcbe7a06c16ba9ac3d56238a9cf4e8e8ff69 SHA512 648d31632291fd2bc33d9791226f90e3b54d45451ca605d85f944d160f4aa304c32e275a0c01545967ffe0f1af1ac91c3a6b95029f6d6f3bdf4fd50d5199426e
-DIST firefox-115.14.0esr-lt.xpi 566219 BLAKE2B 63bd6c0d193e8a47b73513eef871f0a97339b53e863b57e2c6b5a201f316de7fcf17c3ca58f978d35496d0a9c1effe6cf21968aeb753f88e54081882167e51f1 SHA512 e4c5732d3598ead21c459102e8e681a7c1df53d848cec210c5d82b7cc9f3766c9585fd0ee9a285363ad963056f4aaa1413b65cf165a4a8acc6af275dac95df80
-DIST firefox-115.14.0esr-lv.xpi 568815 BLAKE2B 64330302cb66bbbd824cacb26a1cd4ab9830882a227c16b79d53792c07ff9f97d1d206031558bc75b5a8aed84f19ad65d50c709722fc7988ecccb74955e67d15 SHA512 d920edb043798ae135ea2fc6cd15c341f8a539efa5d1641cd81bfb2402ca1892e4c50cc59252938d3ce093a2bfc3928bb279cff592814fd8a68e401179bbb6c5
-DIST firefox-115.14.0esr-mk.xpi 490539 BLAKE2B f42eb12b43d30538cbeaea7032d2eeb62ae0365ea0527aa84d3508dfb5648ebd4503dca576ca23c40977fb2ccb6722f0743f30ba445069ede7d836d333837ef9 SHA512 652854851ebb5e169a32ae02512f0cb35e3550b8a162434adef53492a4694430e8ae407b11af1050973e2b43b66f4b358e1726784ed8ca17a8156c33b6e72ccc
-DIST firefox-115.14.0esr-mr.xpi 526891 BLAKE2B 683816818bcdc6eef5df6e5a11684afe1eb1e39b3b6ade94ac42e538fd8c18b32f60a624946023462b91c07fd6b3c77fdc965cdaf6bc8b8ba22fbfebba288fc1 SHA512 aa9e428033a9c4cc6cdfd9c7e978f8875b58504a19703db080f04246851daa10ebb9a97e2fea89f9580da5ede4a95f9dd9203622f2d171780d624df7c1dd5e64
-DIST firefox-115.14.0esr-ms.xpi 445507 BLAKE2B b387c90cbb7462924b4bb17786acbd0f80f0b8279cf6ac43a7d1e414e9bf0c9eaa82bb738ef8deb884ab784aa1c42832aee9f96ac605094b94f8886b9481b569 SHA512 7d8754d3ce46bf08e6e9502106ffcf521e3a97892ab9ed11955cbcdb41485c12e1f5616563e6435a6039c8b24271f13411d78c1f17e7f12a53509bd14507ba8f
-DIST firefox-115.14.0esr-my.xpi 514931 BLAKE2B 7c44f616d4c3695bb9985e7abb5a971197c7a600734a52725de99d6fbf3509d505383464bc060f5139be391abc2b6f15aca16834cd19fea23dec8f813e779f63 SHA512 7dec261cb51dfd8da697e4ad8796788546e073e4edad4dc005b2e9c389b1c0926c233f8a7cee78b12debda7ce30d3f781f871560d1db010a8a92a88f3eb1bc51
-DIST firefox-115.14.0esr-nb-NO.xpi 607322 BLAKE2B 528d2c10ee5745a61f8f48f37cb2d04647421f73309d09afb99fd2ffbf4f5105c1fa037aed0d4985c32972e6b150dff2c22ad16910d886348cffa8f74343f766 SHA512 2d961f2f2e1ba741c456fbafa203a57e4865c243bfeafb673c543b66d2b5772e445630756085be101744dc1785edd07adfa5cc6a7f52e4650e43eedc0278265f
-DIST firefox-115.14.0esr-ne-NP.xpi 506995 BLAKE2B a4af7cd7ccec4cba47b68f9cdacfdff30160eaee7a900afbdaace4bf99a4feed1fe9933ba5ca0e8b6dec509c7247c233203e69f132b32e06b59d797aa8a5d061 SHA512 f105b09e119aeaa89c02ac1743549da3471b4c001f390ecd19f7560c6923966c43a7bc91727a067437c9c1e73939550b99add1bda39b8816a9e7dd56be31e7c8
-DIST firefox-115.14.0esr-nl.xpi 617752 BLAKE2B e5357db8d35b801444461d9492be5492fdb588fff96730da7a423d161457d8503f4e4e84cad41d6e6effeeefa6a75c79c5d2138691e3146035a366ec8f190361 SHA512 3d49c5a77cdbd9281280acfeb0e2617b07780fef2455e3b2ca83db7d4322bda2f22602ea4a1c1119ea8dcce434e5e65ad4dd7da30a97c17e38d084139b42118b
-DIST firefox-115.14.0esr-nn-NO.xpi 609738 BLAKE2B 93f5ef14146592a29f8c3e068646c7dbabbb59e36c97e6b0dc8337b72b5c16362c06ccf7d0fd8ef5de5b580377b5e1f499489e8347c360b562c0bfc613320321 SHA512 f3fd98c37cbca58cbbd9067d2e8cbddf898f0edc99439a6d4371bdfd8e31def2cccc454f3529fb69f69faa7ce30ec55203bfbfd13fac4f384cf3446c127c4bb0
-DIST firefox-115.14.0esr-oc.xpi 607907 BLAKE2B 3058c2bd583163655ade26195d131f3fdaf8a6d795720122f3f490304121ba81e28d82dd267d694c0e465be704c24c3286055a8f032f7aa026251216e589ff10 SHA512 7ea2ed18d2c228b3c59965a645825501f2478112d16f10706963f896db0ca58b92573e33b3daa6503cd80e9de79feb15cc8138dca8ff9373f02fae0921f1a370
-DIST firefox-115.14.0esr-pa-IN.xpi 687709 BLAKE2B a8e5b7c85f7a422e82bf93abdb7127261ed31de1443e3c38faea5436a84818a23752371bf6e69bd496c9bd2daaa8c2494bf840450d8a4bef0e43298f698f153b SHA512 241e0fd7aa15dfdf9afd7ff7e442e6d6483e380a5eecb45db3dca182006ccd9720ccdd781f9d4b0392e1bec87dba921cdf90c3d91e4da5394c2b9f1932a86587
-DIST firefox-115.14.0esr-pl.xpi 636473 BLAKE2B cbee9e8bbdb0609a14196a296cd7a62af69ac1c21e97f0144c1c277a861f628f3d5f4210574c12d6c2f5d84af50268cc51f41fefaa8e0f0ed9ab90c7e46cb8e2 SHA512 1822a35cfb7b596f9bb722a7d912690e61cebd1fb03532ad562d5b8d9b8567503c07c18db5e46c2d4c617605a10b8266d1925b2e8cea554ba422d7ac66aacfb2
-DIST firefox-115.14.0esr-pt-BR.xpi 622538 BLAKE2B c175443d04ef78366993881e44ce2fe7d502ba6d645c29dfc00a721a3ae4fb271eb8a5397b098ce46156afa1993168818d032abe3a82b04003b70b6071cbc1b7 SHA512 4fb9a8e11dda271281acaba2a8191776f3ae0b521394f635fdc817d6470c206a41a1f4a0164b529fd27b94e212add8539525dc10bec300e161c2880224b24116
-DIST firefox-115.14.0esr-pt-PT.xpi 626594 BLAKE2B 77b22853fc1b89d3c10c8ee8bc17a62c0d191e93633e1b0284eb54d65db4dec2be3ac61231cd95806305cf176ce321d942b6a62cd9f263b880cfdadaae6bdf58 SHA512 c8365d18e7c74a29a6bfb807cab483ddf247bdde295eccff4b6989c7ea8b1cd9a6ac38c64ddaf7271289dd2546732737c9e1086f1c072f7114dece729e8acd38
-DIST firefox-115.14.0esr-rm.xpi 617340 BLAKE2B 729c46a8c930747480a36ef1ff2a2ef76348850632aad2656a4d4ab3e32540d0285f180d286f32909d5c3af4ed22e5b17757141b3dd3ea1fff1c4b34635e8842 SHA512 93ef502160472b92812ad2ffd60638cea57ab2f958674e2d64dc80981df937c90754c3a801630901f3f213a8ec0fb49ac36e6e4021c847dc3cc7edee0a2af192
-DIST firefox-115.14.0esr-ro.xpi 543547 BLAKE2B c84ec8010226d0aff906ed7bbaadffeb7a98f958162ac4792e0b3b85b4967bdb5960c9d57f28820f24d0fde8c3974302fb9c248a0656ac7f2596cf38f1f69afa SHA512 37820627f22235d0f51fff3d5d2972036c54e8917725c062be4239c82dad9350d60b918d57441e13fa31fb1ec11c5442679d63777fec932c747c4caa21806aa2
-DIST firefox-115.14.0esr-ru.xpi 721756 BLAKE2B d87db8e24f05cd937f231b68cf62eb84fd6b61d2b3b5d4bff32cc5688f09b5a3ad78721b03cc1dd7c7cfddbe5c48be5d27f1b7a2c3e11173b495e8d0f591a804 SHA512 e6ec2e7bcbfa72c022d99ad7b9a3e66ab92df99ef9ab9c4f4cafc49219e85471ffe761800efc0faea0f3ddeaa173b5e3c347c2f5bfd4e6a40a5b08c7f26445c5
-DIST firefox-115.14.0esr-sco.xpi 505675 BLAKE2B e21c14c72ed9b70bb05ac7f77e8bcb6ac73fa1d779a743962f98757230127898386c99f93690720280e2f0bf705be673ef2860ea8afbbf7ec099052d7f0da600 SHA512 954c262c019af656a6c60a89bf2621b7771901dc7d7f384cbea5c26cf28a9ee1e6173c6a51790488a796a5d3d993c52fa6068e19523d45a15fda8a6982154fc3
-DIST firefox-115.14.0esr-si.xpi 606453 BLAKE2B 1ec602cb833076ecee3e21edbc5d5029a43aac672273418ef47bc2dc5f6c5a60657c7990f8bc32dfe28d5603ed45dbd609e101ba275dd49154c566e95ffe0563 SHA512 8ca2ad8593de93375433e793d18a020fba5c513f6f88e1f7e33093831948cc0475caf54770f7e8b4d7f65f281ecd647671976264148645b12f33690362a3880f
-DIST firefox-115.14.0esr-sk.xpi 652373 BLAKE2B 6244f925342df2e072ded925fcbdbe8e5d292d9ec7c2c24f763dba0b422d20d3f0317b1c27ce1f9b2f4e1f60e8a16c16c78f4ebdb96823d5d0aabde1b14e83b9 SHA512 3cdbc1d6fe6b73092984546d2a44705663b51d52813415588d862ba6184be9ebe0013c30252d291226574ac6a54d7f11019f7def9cf94f78da6fe7c54fd42d4c
-DIST firefox-115.14.0esr-sl.xpi 615213 BLAKE2B c487d2cde75669e4d56238f6e0f8f5f58da5f09d5a18bbecf83a98e81ecbe0ebf88d0804db9eed98a569bdd163472a02114cd9fd6a72a95b4cd04c2d4ddf9bbb SHA512 dd5f3a85e5b9eb1f99a7c961b64c1b0044f7b26092e850b8f87df722f059bc39ff9239d1c329c559f13e2e1ffb5f4e06c1e3cef01366d4cdd5309147b7f04915
-DIST firefox-115.14.0esr-son.xpi 413692 BLAKE2B 924f1b1045cc6f828c6874621b8bbc7e5c97d8dbdc74259001f75dce8382fba3d4fae0ca33701c0c9797d300fef24f8a23604a5664bea4a91537cdc6048dfb7f SHA512 fba3003ad36310bf0b6a6b1a3acdbbdd2b02065974b93ae8f3133bd4a98e794108abdba8f5e147232e1809b0fbad5c27237349d3b7b42841a4959e06937ae3ba
-DIST firefox-115.14.0esr-sq.xpi 636142 BLAKE2B fc7506b73b48ac394a3695b6c29db36146b06e6d425561ac78dc2cb3459f74c6da5f582a24670cd87605703b6d7761866c645d50da3745ecfd901b90642d8300 SHA512 234a4cf5fee287b7f622be3f1e60db56910aca7f0d0f377644e31648c1c5d79243b476c8c3381576e23726a0cd7171b8f2269b671d0d783e8d8a545f0e7b5073
-DIST firefox-115.14.0esr-sr.xpi 633255 BLAKE2B 62b2055f127c25535f79d7f7ba0db82c7f9df3fed5282c5cc7e1aedefb754ff35f461a56679f818211fd12d023c21f51edf510e7439a081240276ca3061a5f73 SHA512 2c06419d1ba68f114f6a285e9625e33a91c9d23ae5dd3babfcbc37ea2b9e593a34cfee380c2bcb24170ffbaa2d9b58a90bf32c2b8945018ef33221b4dc544d00
-DIST firefox-115.14.0esr-sv-SE.xpi 619432 BLAKE2B cc181515d876603097a6eb7d829268e232f22e9d879b95465fc1e3354092bc183fff299fb6c5945ffa84f8adc4860ae67b0031a7f7a437739ed17cb77f5b9f9a SHA512 4b01f6950d463ef8d3355e42e3d179e7063a038b2eb7b8f0e52054c42ce583fb50cba1229800d24fd7a2c029947df358becd27ccc2ba949dc03fa46e390756e5
-DIST firefox-115.14.0esr-ta.xpi 503634 BLAKE2B 97bc6b471fcb762669a596d9922b21c368f9dc8b3a819ccb742aabef9a075a1b34ceaceefb065d14c59873fdd04ceee14362b36a9c4b71a0930cfae0c8e35ac9 SHA512 d2b74b91f29280a2d1433db39d0932c5cd2adf9bf95235a123b60ab19fb32a54f4affcebc3fe4d6cee8461ff3a021f78244613162b3b1f711d288af8ecc86e1e
-DIST firefox-115.14.0esr-te.xpi 556771 BLAKE2B 46c36990da3e095a10397eb84a3ddf2f452c90419b40811c8c7e37b306278837207eb4895ba713d150964ebd04598bf81c9965431c8fab8ec001500a7b79650f SHA512 5e66d0ef2ecbd086a77334b9eab704b49bcf9cd21e04753238aa11896d412688d8f5e00a0ecda84cd0f34ae587bd0ff428059f9cad67abb989da2297e00601d4
-DIST firefox-115.14.0esr-th.xpi 693414 BLAKE2B 64d4566efacc3ee77f55c427097fcbf42e4d8b4a8ade04ecfb929d508b99a5eb38c7298e58a828ba000e8c1cbeafe55fdb2e10b29518850a098124f8c9a56a40 SHA512 9bba5f9becf97b19a66c54084993a76230d2a7702e1e5919fa5b644024032e01a1122ee9d23fd3e7dda3044981390124eca68aa50f8fbf00b6976da7864472db
-DIST firefox-115.14.0esr-tl.xpi 527805 BLAKE2B 4c48ca896adb310d23ddcbcfa202c3e1cd9fde154c74ea4eaf65436ac60f8c159bd61b11e40d3560f0ae4ede039b1ddc10e6d1df4f4afb11e0b41becbb05d6a2 SHA512 4e1363427d508782b2c60ffa4cfa7e405bf75511100753b071fdf04ecf3c1b457d32163f95967aa4c7ffe63256be47045acc795cc1481644926f3a3917cdd78b
-DIST firefox-115.14.0esr-tr.xpi 631878 BLAKE2B 97f62d96403455f0e8fb05e7ad51fc8d7b2b3b78f505727d84f73daa405a60e4bffc95f8c805bff5fdb48b1e7784b237ccd21becf2fe148d0a1e2ae4522b8ea3 SHA512 8f6ead0554372fba5ee5827e8875084764ce1576afe61bbbf3a4244d6c7a331b39d101bfa4bc6b36570924880faf8225b8932eec11e02c9cadfac8877c76c8a8
-DIST firefox-115.14.0esr-trs.xpi 498681 BLAKE2B a0db9ec8ce8a58e70b6b2d5fe9747f94060134445d6eeb2f1d717695bc0035c52979c4e686899914df83c166e5de2a86fef96da9c94205d818009155f9cccfb1 SHA512 ade05aee24325d65028bd01a118f4d15e2392d0959848a389446ae95155cfb2c5fa75d56fffebda558d34213fb1df68cb4154898bdce3c4fa4f15910cca0b5c6
-DIST firefox-115.14.0esr-uk.xpi 707291 BLAKE2B d94689abbcecdd5b5f8a0d6beb38a6d309a9c0acee356413ae9364ca9113d1c32865928776da20bf005b7afef0cfb1da2f6084eecf25936faeaf8d9a7d8574e5 SHA512 5c4ebcac30d73d45936433fae32ecde20b5278a3dabcef0902e7d1768462480486f32d72f102fa076a92ac2365b7d297fb3b7491c7318071133685eff2712d15
-DIST firefox-115.14.0esr-ur.xpi 554822 BLAKE2B 45953adccb1abf2140cbd3eac5ee38de7e787b611fb958d97cebe8d9fd7db2a19df409f0d2442a19557558a0bda1ac134a06cdee328b5da5aebdb93432c713a1 SHA512 92adf4abb3216d3a6019a4c49f934f7a6554eb0be337d0d9017db69a80a258d8398f38395f1ac26858b54bd896058a4cc0001f3d35c80ff15159be65668039f5
-DIST firefox-115.14.0esr-uz.xpi 474694 BLAKE2B cef2e1413d5539d326ec410189cb423e332cb3da6c94243dbe665d1f855a202f2b46fe0c32f9e6acf6361f8afaedb9d361c839be7fcf3c1b7d8e54416d67c6ac SHA512 b041196f3a8c76f5709bba81c68540c3cadd06a8e3bd8d9d2f5451ab1e9984abb6845d07fdd9a9476bd79fe7d38c14738937822096a8dc96bd78ac4f25ca622c
-DIST firefox-115.14.0esr-vi.xpi 654030 BLAKE2B 50c98562477a14b9335085facd70c57f5d864d33583687d16e51a18f57bd901a3a6c1bea01339a7a6c0014553a13402ae285194b681a654b7e658ea481d41217 SHA512 3262737b0bbc75cdde7a46237bdaee241510d5497ec2750da4a5f658053a8fbb60bd237de01932fb3940295bbe7019228b76791dc083232cf56c364bd00c8f38
-DIST firefox-115.14.0esr-xh.xpi 414958 BLAKE2B 1af9337e005c4e0f41417b5ef8531b5382d19eec5bd21fe04a8f2cf78b814e0cf465e1def6ed1264820bc655e8913012351490babe27f6189e136f3c14686179 SHA512 482f64c4d78028f4e8425c03471a9a52fd10f12954d3eb4a51234765c4b488b8647789fbce49360a6f7d3a7b19cc7bf4d311e327b909ea198021d067cc3e0a7f
-DIST firefox-115.14.0esr-zh-CN.xpi 657110 BLAKE2B f47b3c47f1cf85113d54ae55ee271d5630aedfdf8ead93a642a183a8c2c3be6a1bfba773041f4bd85196bc0accf86c43933863719e9dbd8cb010692fef9da197 SHA512 c6d950a9f7b47a4e354ace74f3029fd81c2eb22a9fb164fe8516faf3c1d3151881580273c29a6fb3bbdab3ba440eb78a6087e5e7ceae26fc230156def218529f
-DIST firefox-115.14.0esr-zh-TW.xpi 659310 BLAKE2B 2f552df1a66f7c4f05e598c55d977058fb625aa256f3e252e69a3511a34dcb294737a5ae44f5cb836e595581aa6886e5a37488fdb9cd78915eb152fdc40e9092 SHA512 263a0bf61992005d76570f13c3472fc7ea7d04dfcb3b5dc468577c6be6d95045d7d0ac743fe636650e3dcd056063ed9cd6e25983d8fd8f5078fa68c774d8dde1
-DIST firefox-128.1.0esr-ach.xpi 464065 BLAKE2B 168762d0890e65d5ef0033a96d0b9b00f1b12df24a2f5debc56ff8010421cf2e2c561cc7d105853338244edcbcbf3a3a2a4f174568740f4b82d4dc11b164bcc1 SHA512 4f4818a789f7da04a71fc257317e9d2341ead3209c815e25326f13be1501aeacd7da77e86e4bbc2560d1b6952f91466ff1fc90efd16f02762c85ab06e461bac8
-DIST firefox-128.1.0esr-af.xpi 417524 BLAKE2B 81d764d8e9ee71c91d5876c2846929927af76ac51292598abc54926b0688eccb2d5e0e035cde820bec2d4d9b810a9f5aab1f11745e7573f398b8fa2e2d198933 SHA512 cff20507dd71d3076d44f98882f4dae05bc247f45d7c977baa8459b3bcfc1522d3791df2cc150892b838191b46656824e525f3d54f673f61b63013cc17906002
-DIST firefox-128.1.0esr-an.xpi 505891 BLAKE2B bd5a78cb39ee1d64ae5a97a87a97ab85e744797b3f5aa33e4202c0e6b8c2ad987f23ff93cacb707735fc790e8811955cd9b3b2afab0850545df5650283163799 SHA512 e60c790ce037165dbf3f437c59c5f75b5a6365fdde17a8cd6e6898be9f1ac3139c0db1613010dccd8d1488d53e7b4ce80586010d268ddc0d7b43f031c7492f5b
-DIST firefox-128.1.0esr-ar.xpi 610859 BLAKE2B 6801ff21f3d89fb5681c83c6f732094699138ef8da82f57e35f7cdcf7d2ed1af8a269e7430800ea0cf3d14beee3220fa3ba10a377c9f674a0e42df084bbad85e SHA512 fbfdb0564bfcacad1e3bc42179f2c4c72f87e8a68ffd9dd7ce473516960b7410e523bcc20436510cf4c61fdfe4b921d1ac7d2397515b5a29153a45a91359afff
-DIST firefox-128.1.0esr-ast.xpi 496343 BLAKE2B 9190ceefe857d5f37421f3c47f4af0416ba6d582722df2cc251c2ea93a41e80cda0d6ea8f0c8ec1dec65b96bfbbffba4ecbc3781e1805eee2e29313223349bd5 SHA512 1e2ae9f2745568722c14b3024be2feae19b5cf5f1091c249db20cba8ed8b8c2a692bf391cb485a05f8f0605375988fb022e041b37a08cc11ee8f13dde01ea97b
-DIST firefox-128.1.0esr-az.xpi 490772 BLAKE2B 5d1c22a683d50204d5a616eb104516712669dcdc0be033b9022a6e3c3b64ededa01c01d8531988c6c07314babf60650f5d831c107153fc829c3aedb9ea7d4a94 SHA512 87c7875d5c86159b7a5ef993f5518bbc29f308f63512de394aef8749186a233dc77eb22de39c9c3f4b4cc2a01058f36ced37fdd8d1b7b9390fe49e13f4d49a7c
-DIST firefox-128.1.0esr-be.xpi 714333 BLAKE2B f99bfe0fbe0ecc51ccb05c33cebf28f6c59819e6e6cb22cf4a0aca7f44ecf6dae3d0133dfcbabae234b5b1329cd956409affd60e2d4c30b5713d42e37822ffcb SHA512 fb234cf103b4a33e07db8df9feb577de5e775367a0c4391b75b33dea4b383d36b78d81e470ebd116b6c7829835a28322916ea027e54b63e5adf2dc42f7e2c12e
-DIST firefox-128.1.0esr-bg.xpi 608726 BLAKE2B b4cf84e2c42db2b03bcbdbec5735d4c7cae57b9b46e25ac989ec81e4e93580d9ad35e18341f5c8650597d6a1168aeca6c111268a2cce9d9829a42399b6266c8d SHA512 f0d386d83273f15a6bd7ce1d397df99c33095fb647dbbe8c460adabaa63fef91f4f76c0c2c94a910148da0409a5587fde1e2d47184acad4686fd29300f531205
-DIST firefox-128.1.0esr-bn.xpi 581527 BLAKE2B 004da3ccb9148220c264610abf7a3999f810cd754cf7a88e98f103a62394dd92064fa240b5f0e45c9bec3b172998b632f4b77f90af773c8273880b9cd824afc2 SHA512 67f708305f0a5af13efcba5b63feb2873f30ee04fe4ed1889728b7fa248d7c54bd748882ed37f983f179d9a7a60ea0c0d2888b7a79e37ab083b49892523aa468
-DIST firefox-128.1.0esr-br.xpi 588931 BLAKE2B 6b3f93b744cf5727f5bdf2ec23a54a296c55c9c3fd8b3a39495f4811779e1d5f17d0320d273767a1e4418f5a9f81ecb7703c38c8d5fa72580b78b3dd3f68ab20 SHA512 eb90a1cdbf3fc0ca05e5ad4a2cc34ad2632b552ba60d9f875e957b1df02acd4266164e687e38bb5baced3ea5529fa2531274240a286c59b2b156d4233462aeb2
-DIST firefox-128.1.0esr-bs.xpi 501991 BLAKE2B ae0c29b7c8374d9edf23fc17a84dc38c7ab01489e63842d95267ff3845749918949adb15269fa8adee48b04c48d8fa8fd4678a0875227b17fadbceaf0184b3ef SHA512 4ea880709c17ded436da647db2661d1a760b0920bea7e450785d652fc7eed3ba306b122b4d6562037e12402c4c72dc3f6a7042d61ac4212987f890ea378b56e5
-DIST firefox-128.1.0esr-ca-valencia.xpi 546201 BLAKE2B 6be32d6c147768cf59748cda25424db00d65e8431ca915c539b6cd16ce8078fe5554ce1770e3d4d8d535ad84b9e5445d20908f10795efd04f9708b882c004f5e SHA512 c54d8975f8162bf176cb8fcb424e38f2a3f68195447053eb7da22957b832a2009e68c84d271f06983b026234b87db909c5a3008ba851a504d94d31428d8e33f0
-DIST firefox-128.1.0esr-ca.xpi 597099 BLAKE2B f8b2ad5b34a8a79c330af3be705d41959560a56d52b6a3a8439f184e1afe6462009ff20177f63a920a6c0f127b1c94362ff86d9fb2e121e4afd678d7aeb9a74a SHA512 46ce42b570e5549e4f17358dc1d77cebc1b511e952812041a17401e06c01ea0baf7f820a91598a19ba5f7633e63f2a1849979345c005e0135cbbe97239e8f0f7
-DIST firefox-128.1.0esr-cak.xpi 593081 BLAKE2B db0c26f5031b399d90e245525bb6a49a9c15b2931edd9f0d2c10139e66f64afa79f211a2f7ea32985fa2cad55dcdef090962c65aaf9215b14ea17ef0a5f31445 SHA512 677032ed8f304f6079f89fdd0ea405f61aa6f755042b7cd07aa47c90ffbdb0eebca1dbd335d3f9e0d776f4bbbdb0c62af69e46b105f3b61b6b102ea17776f5c9
-DIST firefox-128.1.0esr-cs.xpi 659606 BLAKE2B 4cc267b9f85f6f43ed7b32186a4bc858a9dfedda895748604dfbc0099fbba9acb79e1862c8e5d5bfcf264b20503b8bc0f0061fd41fd80343ca082ee0f8a9c014 SHA512 cc17892ce0dee036c2f1746b11cf9574ac777bd4f066c5fcdada3d41746c4c906dc6d638d6ea42600a14eeb14f0d61d34a4355d9651e013cfbeb36befb55685b
-DIST firefox-128.1.0esr-cy.xpi 622910 BLAKE2B 1e22a51b1340309ddfe4de58b9c35d0bcf2b81b0d8d4b73662716d6a1425a84e142234190f4907e93c5a1a76392d6d83b7df51dd5cc19346d841ce820cf8f2e2 SHA512 8a968aa6257a297443d7a4e6c5fea8ca96d418a97a6d5907ef3886b9415ed4290aa753faeeeb3150be795b8b6ba374e2d6f632f3d72206bb922dee1d4177f025
-DIST firefox-128.1.0esr-da.xpi 610845 BLAKE2B 6a0db984ed3da34ca17a2cb7c55a4b9bbc18470774664f0d327254c7bf48f1a329c696053129ec1fbc310c0c062cd20273ce39adca8285ccfb9ce70f951ee906 SHA512 cf08dac95a48345aee7134bd2248002fbe4b89e5d0bf29b5ff550749a1c92bb5ed73adf79ef380aeebb6f958f8d34637d52227219b53ee9b76e94d489aeb8d5a
-DIST firefox-128.1.0esr-de.xpi 632487 BLAKE2B efa678d9bec473ce3e1d047d35887073c0f3692d2a3954336c9c1ae8a9b696e26377a42fd566e392d0c9a9eb3f3c0cc2fdb91b296951c74cf5bdd3db1834cc81 SHA512 083d0a1f77f31facaef09b9254787f78a1fc0fb0160ca4620b3addf9bd91119bc22ab12b115e85b97ecaca6830901841ccabec936e4eaa4be4dfc6ff8daccf74
-DIST firefox-128.1.0esr-dsb.xpi 650897 BLAKE2B bdcbd25f85809e26674f44015d2d4397d5915533ba357db56be51a760a6fb2d5c0921f1e0ebd426c33d84539b350ca2a31ab829fc52477c3b8acf7aeb35c4503 SHA512 4578ab4122ee04f11e64ae5db01d8dda622240a67e108946ea1c257e758b92368f4fd1c7591356e65156f57a10e301c478abb5c10f36af435f528f5d11c3ea9a
-DIST firefox-128.1.0esr-el.xpi 733066 BLAKE2B e5101c7b474f2e5b02dca8742f9294b2431f8c64c133089f9a1201873dc61e0e6b490d5262d7d6a0f6213e89bc4dd758b684669c5fb69a1583d3d8125d4bc175 SHA512 41097ea9ff228d929b52cfd9398f4afb8d7d9b575a66f0075aa8909774d9c41ff161eeb1cc7fedf2d026f5b42610041b9a895ab42f3f1b00acc5b4b83248a1f3
-DIST firefox-128.1.0esr-en-CA.xpi 584673 BLAKE2B 79a8d7d7b2b1e589bf394aa2f40e6be1ddab5bf0e7f2578e4c66dfb24c44dd32ee1caf93e41183e67086f9a94e91c9e4f87f65197576f8b3e93d5a6a42bc4be1 SHA512 853ae27b47cd3696a751d025a23c01630e786bf59043f3f34f374180047620d3a548b8eeacf9b0fd479888980d5923ab61cb19f447b3a6816f220ae2f3b94e6f
-DIST firefox-128.1.0esr-en-GB.xpi 585478 BLAKE2B fb5dad5f68e9d01147dfe7effcdda827b9a0151d9ceaccb53dcffcafe1530313fe6b2bac8ba83d3943a497ca71700cd8c8187f65f55a3e0be9c02b28ae6aa406 SHA512 58f44393ee66bc156e61384c198f4cdc53b240bad1d403ce33e6160439775110b21477f40b6f5e7e05f05dc019ae7e712bfee610383be640ed4b60d1990ddc0e
-DIST firefox-128.1.0esr-eo.xpi 613702 BLAKE2B 06525a747f9210bde080c8b8272d2b8856d328d5922ee2f078fd87c4f324064d873519743b8f5fc088dd06f189e92cae16c87c8459115ab9b576d47e018fc968 SHA512 2d7d5c2425b195d3a781dd4b20070c4e0fb3634c7bbfaab33e6bd5f95c68cef2f179d9dbd1bd43bfd7d871ecd70a06743a48223922fa8e6439e577829f22e81f
-DIST firefox-128.1.0esr-es-AR.xpi 628268 BLAKE2B 02a4b05c6aa6169999b819ca34e536190211bf3af1be22797f9e162254c87399775315a859dab3725c193ada6a292547d1ab9c7dae1971c5527558ab593de4b7 SHA512 7663c980d37a61b94dacc4dc0387d1358bc65859755a311c1c8e320ede635501aa693d3c719c4105db2adbb3f3565aa07cdd1090e67372f7805312ccd9274bb6
-DIST firefox-128.1.0esr-es-CL.xpi 627530 BLAKE2B 90308be6b660a808e5d0376f8a516adc40d3771bd5c0cca2a6480557d17eac88db8f2f66c9af56640d8e71f1d420529ea61c05052eb1b2dc04abf743621c0224 SHA512 ef6e4c3a31f08fcb13b3e6734749bfd78e45b6fd018c05822673c4fa006ab3d33055de8940dbfb7ae2130151f118c0d3c925454b8c135895517519c776c900b1
-DIST firefox-128.1.0esr-es-ES.xpi 621080 BLAKE2B f89e0293f40f5f5372473ab3bb09229ecaf6a4bfe3efa4259845a81aee4b03f079721a763b0840387bc449812c0e5eaac53d472f1c29326cd05750044d9beed0 SHA512 8f10622a50c8ad9ed1e483d834c47963c11ee410e7d938022408aad35ad51f7109169e26eab2a7257de11f80d51a76fa714ba012efc0e1cf3502e82752fab7aa
-DIST firefox-128.1.0esr-es-MX.xpi 604999 BLAKE2B 4ee47c95f2d72378d88ddc35e988c21351dcaeb4470a3d86f1afcfb0df0cf8ebcb68464f9012eb99c276f94f9af21a683c98c8e57fe2bfc0df69bb823ac8c848 SHA512 d3ff26a257d874149b9b39e5c18fca255041d84932be0343abc392a44b6f908a04c686a2df13e5f224770f0809df5a0ea0d647ff3eb20067fd78cd79f1439c43
-DIST firefox-128.1.0esr-et.xpi 539538 BLAKE2B 850cbbe2638d1bda63dc1d65d1ecd8ac887f2835a4c819360886eecfe9ae16e000d0b9cfdd04baca7b18087c0037c6ef107a3324d9920dca87b0773db403d860 SHA512 4b2f05aa41e45d08ddd7a9b418787d2d9c76ca917bbbb77749008f7b9c835b180c3c0ce487b8b5745f2ae90e55f5e388232220e83ae3f285a0fc2f8034dd0e27
-DIST firefox-128.1.0esr-eu.xpi 599314 BLAKE2B 6d7de6906db351d7dd1cbc6e6d37a5d7fc6aa63425cf06f055f16fe50caeae3e8412fd112a131892739334c5c4d7460d895a3e3e521ec0954e7f43a8d33c3d95 SHA512 12e49951e3364540f0d91b34dfe88e6c15b4de26b0dfa196fd35d416e2658d6f4d41e92fae7abf1c6090fc34a16dbaf45bce6762c605a89bc0199df67b498841
-DIST firefox-128.1.0esr-fa.xpi 590029 BLAKE2B 2f9d8e30867106aa51f4216ab9ed6abada49499189777875256d400bdda4e68562317dfa3d06eca0a26dffc6e292c8559a5246da9dc54ace0efb02d162ce8c7b SHA512 9936d795f615a2f33dbb2116bcdfec27562d7a1b823d260812213b621dee2c9a8056dd40c88f71e80781dc285bf3ba9bda3ef06cd28dcaf7611ef43e532fb548
-DIST firefox-128.1.0esr-ff.xpi 476066 BLAKE2B c3c3c790b0bb0dc2da3d3c88695e2a56899cd5e18f96f16382b63c2a96131c662a36381f7935ddc3175246c5374e285bbcb779833afe38d5899612f92b8d4255 SHA512 07fb222efc92ba2679c348ee3d7d6a7f321027e30d2761ae1be5db587c7b6412e99c4ba7a9308cae40e81030c2b9b8827491de59a384a0e0c4fc5388ea6870cc
-DIST firefox-128.1.0esr-fi.xpi 606453 BLAKE2B 77b52d23bd78fb7df83ee135d6e7406f1387328266bd800b66218e2c0f0637b8322380233bd4cbd295da2b7ca83db5988e733289676476b35092752a737fe15a SHA512 f6021a592b1c183537297a945f63ea0a204d950503f879dd11045f45c6af33be98d66be4ae37cd9328e0efa4b12882669fe1c671dd8faef5163a2534b0e18c13
-DIST firefox-128.1.0esr-fr.xpi 640303 BLAKE2B edcb15670a4ec2466459cd12be22a5ee70b896e7dda5cd5f6eb7fc7d21e210a556cc1a6e9bc529e1d162b3005b376e0215acf2bd0312829c7292484d91daa899 SHA512 2b5420d91cd2a954b64ba5c243fd6a8ce96180c7d4afaccd1b7ac90a16cd6b3424bd60a1e2dd00457d4886f6d791c6b89c4db619d6e7bb618cfaa88343cd4429
-DIST firefox-128.1.0esr-fy-NL.xpi 623944 BLAKE2B ed13d4e14e0df8bee3e512c6c9a2254869d94d0fd182ba58f1652e0bb5a67c076af443f56138db8de04e9bf8cd84a0c48d8b20e6fd424c586c605c20f44d548f SHA512 a3eacc7dc8148d222612025a96bc120ca1b954800cf46d7076dc0c15fbd6441b0bef5cc723c2f58288492a58f96796b15ad9e1fe29fd4037d4f14c95204f9140
-DIST firefox-128.1.0esr-ga-IE.xpi 470994 BLAKE2B 288ca27695949c1a85fa2277348acce65f71171cb5c476c18e0e79eb723c3add9349d5e0215e200d034913c4ef6d4711f87eb72520a70ea048763b1ed8849330 SHA512 445b573b0702345ab4b5b89d5096e6493934693643ab60ec70179c001cf66058e4d9b376c79105c57e2bfa367a8fdca662d2ad58a7b70be9f1e28f7bec6cacf6
-DIST firefox-128.1.0esr-gd.xpi 596583 BLAKE2B 02cbf6b4c24c2d082783e1f7bcfa8fb04d887b83a84e779e1d12555a686453a123baf32c9469958075268c0ca6f636872c1be7451ad90d1ba2dee49d4a34a8aa SHA512 a5ecb1806810b70a866d69fbfa6fef5cf1a4575efa38c9b4b7d4b45f3609f47d1626e087c38e097335c1f4d827c0919148920757308ef588b221fb317047599e
-DIST firefox-128.1.0esr-gl.xpi 604099 BLAKE2B c3d2606c8ba260a0dc4d7d2e7534495481d0759fee8bcc4e502ba04eccb7012edb90404e0028dfc39c14dd78acd7d31509c30e9307ebcc3e9d0150004940676f SHA512 211cbc67b492a43e7731cd593e851daae138b177484e9a0bf10f68b82f1b9dd5be4135c4c2973bf6c92bf800a8900dd025f0b58d2ec376a4e65d10918331cb13
-DIST firefox-128.1.0esr-gn.xpi 637429 BLAKE2B 01dd530e53691418a4c9cf5211154ca26d1d5454d8a744eea4481695bec84cdb03ae7667e2586b8a8dedf81872d87b6587ed998d811b89607aab809af44efd62 SHA512 3c48368e992bc94d2e89cc4edaaffb3af21ad6125109b2126971549e395a657c9e4947c46334e49014afee34519f58e3b13ce9d4a3ada632ab1d0358bb4dc866
-DIST firefox-128.1.0esr-gu-IN.xpi 527348 BLAKE2B 467e0e6fecbeefa58d0eea1158e60a604850e5dcf22f815081c3ba2cf9e04141570e995f1723aa4433e5ca0137606c723e5ac0e9a696879d00c200db81cc60d2 SHA512 c1dcf8d636bbfa939301206b88355ca7c407455ab839198defb678b9c888f0817dfaa44b4a29bd0c9bfa525575bdb298eb7b2520fa9afb723b7562c140d54435
-DIST firefox-128.1.0esr-he.xpi 631697 BLAKE2B 9a2867dac1365b6ba241c332f4f20ea9e9fa9eb216e86693f620885ca5cdd1254bda7bf5d6b668d91b515250f08b1c6a317c7040b389e747f6ae4e3373618118 SHA512 1e0cf300ad3bcbbb22718aae60ee82eea4f9c7dc1cf9541298a0082ffb6ee51680a37a42a8bad335bad18e0cb164b035f8fcd344a8ba89b0aba2f0049b6886af
-DIST firefox-128.1.0esr-hi-IN.xpi 566769 BLAKE2B 249fad3b4fa1b0dd4a94d5d4e321328e3ce7ca2449bdd488ec0fc25b10dbd34bc451002141c7ba42bb9d8e67ea05e2e6a09c984749d0c6e20b1ad9be3c6c52cc SHA512 10ade4b914a49e5a48fdfb4db7a147cc1dee6baf7c0687f5bc847251007fb445bdc535f9b63b276a1b576df93522f8706b291ff7682723db8f44dbc8656a0cde
-DIST firefox-128.1.0esr-hr.xpi 574802 BLAKE2B 734821b1fa52511d466a8a7e4161b6c5fe8eac2a8536197701061edfa99e6a0836c86643662338a856283f8b7a8b03fcf93c8bb378ec0c34b24c1dd98d024518 SHA512 f702c7a13b2c55b2e11cc4423487882555baf01953e9fb87951d1cbb07664b5c79fb1f9466de212a8b057e9d8c827f342928ce62daef568c61e047c6cf606bbd
-DIST firefox-128.1.0esr-hsb.xpi 646976 BLAKE2B 635b8d268c0354037b9a833b16aa5d9327a66d6d951ce9bacbf4264dc6ad40d4b3751cf450e0ebdcd3c9f7a537aa94ad012dd41235dbc9cebe2550f541b7354d SHA512 39c7a35d6bcb02f1a9179f225b8d39c665c21d74ce9625381a74ac72d8139f0389e3593f980fa111407560eb67e5b4d27cca3c2d7cac0128d1cb310860da261f
-DIST firefox-128.1.0esr-hu.xpi 649172 BLAKE2B 149d2977b98c797d58b32fc9abd29462a9206a9c5364a972687797ebb19d1b9fcb4834a4c89b46b4b664352b36c6af04d2194ca6a133c699ea7d89d24fe8c64f SHA512 6681b2c340e9cc27567439fe5b0cc304282696b6e2e016b38d51b19216a6ee3608c38a8b2c8775e32c466742bb9e9a0fe5ca0bc1f7ffe35bb0f4694cdad2e79d
-DIST firefox-128.1.0esr-hy-AM.xpi 651607 BLAKE2B 7d6aa860750534eb7d001ef25369d6d5a3e75e0a876c60c63ca699b258861dd7e5ced891949d7f70c06b0ee56431adaf5fdbff664917c5faf2f44d52fb8e4a80 SHA512 46cfb3a9f128afc3c89e7667a7cc018c83ff2d70b2a6a00f6d0925b1855e192fbeb3bb17504c7cde6256d88a2478e05cf878776d9dde805cc54411f59fda2524
-DIST firefox-128.1.0esr-ia.xpi 611440 BLAKE2B db841d9a22f3992025df7ee1bd8f0442eed36cc16d4fee5719fcfcc497bf62f5da3f76ff77da6c7523f66114339acac71064fb503d5e230e9edd26dcfc102f06 SHA512 2b7996cb2d0fe2dbd688de2c15f2e98a4fce15b068a7c133e76d94c9ad6d253f07fdfb70f7644d80db7eba152352daec4c7e7f8e26cee47bfb448bf4bf636098
-DIST firefox-128.1.0esr-id.xpi 580222 BLAKE2B 11b2363866cf131a7bd6e44e26a26ef55859848189df1e2c1f0b5856c87baa7b786e1fed8d052252d29c5baaddd80fecac76b4ad91837bc6f942ce00580a3567 SHA512 1babb22c0a23284c2f9ae93edc049f0c681d45e33e426db8ce3645231c358e603a24bfb4e290bfa4c14096579f16274bff26cc62540d6846223257901dc53207
-DIST firefox-128.1.0esr-is.xpi 616485 BLAKE2B 8f73952b44599e08e870ab11d2a0627ed991493fc6b2a9199b61809ab69656e581d5d469dcca2afe3941c5cc2f28144209b0fa8fbcafb8e0aaf3c25f92768498 SHA512 286fa3fc94eb11127f9b9a0fac69725bb33f71baadf73920409de216211983819a221496b8e1b560167fdfb9265db6979f356265f18c91837eb7f501d3a6b73b
-DIST firefox-128.1.0esr-it.xpi 567332 BLAKE2B 6d1b2d9e4d4bfe286f909fa8022698321d61fd004f547a95d37551b4e36be81adf3b2ee2682e57e6ce54451abc9dcdb65a8981a8cde9967c6ee074e0ab9841dd SHA512 728e55d35f6def17d54a40f3d59c55cde75519a6a5c6bc725a0dd058a8b8c745afb575e8c4d996c43d0edc75b6d07cfafd1fb5ad4e4d8e6b151596aaea4805f7
-DIST firefox-128.1.0esr-ja.xpi 675628 BLAKE2B c30635c5c1d5cfcbc47501099447adc511555f29608a4132bedb07966f86db0c7ab7a1abd7eee96b872ec216d5c26831e3c4fb592ac5af17a2771a7e3d067fc4 SHA512 1224e0d5a82ed668b9af81efc5d83e819cfad7df8bbe09306a1a5467fc4d6e6da0e23e135b97afd0f51d50f6133f0697f5fe302e40994a1b3fe4a2cf2cf497e3
-DIST firefox-128.1.0esr-ka.xpi 660720 BLAKE2B efb92f8e2b484706ee63f631238eec9d8126d2159a12c6c23cdc3e102a9fa437a665bf7241fab1e4807a084ecd46a181e89cc2e1c17d5ecc09ea5e6bad72d1df SHA512 1f55f7a9f5df663d1a3e515971fd2789c702923eea3ef80967d8f429ac5bd1687fb666b1123d036c0adcbab1bfcf3cd550f47c527cf28bfb14525e2bed8a1e75
-DIST firefox-128.1.0esr-kab.xpi 610552 BLAKE2B d0ac92a798f01632d97eedf1f17d67c6c51cf61bfc7e8c7908759442358929d3def78e1408bc194164460864dedd1fcdaf423034587d10d5c8fa179761738360 SHA512 7acfbc19a8d715cc13c21785e15b1918f96347e5666af5f2155275c4bfb2141bf050b0af8d58a9ebc216e9ebb251cfc951c6a2c0707e6c9dbe99c56705dc24d2
-DIST firefox-128.1.0esr-kk.xpi 708113 BLAKE2B 6dbff6c2b7d484f56df24c2011b30ea9ddd46a87ed575283a573bb544b40cf6f372056f9872b2ee33c62a24ca69b5c2fc389f9fd87fffd547daba4592f59598f SHA512 0f684acd76a81b5a6d96985af7b0f1bf683c32792786f289341af90b5d74d218321acb66d9e5d77641b3031e75250c8122db2c5a03bc9cbe0f112b9626a1d924
-DIST firefox-128.1.0esr-km.xpi 525882 BLAKE2B 22a443dc9a845484e18f3424be90d6f3100763f2c955a3715de53f747c69fb5b3887b792edc451977fbdb1247a0e8c8d17275b3ef2cd01dc2d7439e65252ef3b SHA512 b9d831c5a3741cfd34fa615b4ceda33c7c574cb824865cbc059bf137aab9d4770a38240a5659c9a4e72636f8392bf813d03e19fa3a900d48589cf3bf47ec1e9e
-DIST firefox-128.1.0esr-kn.xpi 491242 BLAKE2B dcc7c212e0d22d8f96ede921cb667265668dc1b409b5904286c8061dea99b2a37c61850fc36c65140844c7967759a4bce364e0baad33d47ad49f255ca9965655 SHA512 3e98ab5bb0909d46cfdcb213cfc902688697f469c0779d1da261662b97ca4f49988e7d5266bf7bdc3940f7dd7b93bfaca95950c9fc7887905f774359414edb47
-DIST firefox-128.1.0esr-ko.xpi 661842 BLAKE2B b2672b38cda2a3d60b42ff948fb3d7c891aa61c2b2b1977d8b6d77b637312bd253c19614bf534b4e9195374257cb97bde9e5d87c4f504028015795b14449cdf8 SHA512 8844dc3190c39d647a381984c433fe709d9035d5ce22b3543f43717a8c9decfab19a243495a94aec6d3299089b78c3a2d3b2551e8716cbfd9957c58251bc71b9
-DIST firefox-128.1.0esr-lij.xpi 484103 BLAKE2B 657b96a6269b8d1edba8b4c6a8b82c29911702c2a71e99366b644e3b40b403cc7a948e030bd787196cc75d10905ef70b501db8543ce245955e6ebdc9676e5434 SHA512 bd2e2e1a4cc1df9cfb73a3f3b5f197c6c8901e2a0057914fb5e25055a881a728fd5ab80ffcb1d0d6142c23dc37088af20e2687acaf6730c96f1b2488f535767a
-DIST firefox-128.1.0esr-lt.xpi 572686 BLAKE2B da2b7e98c35c3d6ffdad8a90e99730dd5268e63fb8a20445bccf142f2739ec18cde78efa94ab63c48097ae3a102714ec9f4b833d89a80b9780b3fe3566e9c073 SHA512 29f45789def945db487b0743f590ca5c05098641bb538d5c6d97b1281e24c156c83b4809cd84d17fad736631bdc9b219f92aa6f0c014b68d36e59de2b5c8a127
-DIST firefox-128.1.0esr-lv.xpi 574397 BLAKE2B 359f08fc4e980b92ffb2046d7de5361322441d003f6bf45e27aac372443e64b4c462a5ca32dcd22662d519af39611d523cbbc8e791db4c2549ec0e449d2292a4 SHA512 1c83d9a09f2c74101227ebf3ab916ac9f76b835af668b3de2f7644f275e9af444369f4bea57aed3b7783696966b58217eeab28a9a862f458df64996b896e3e5c
-DIST firefox-128.1.0esr-mk.xpi 493845 BLAKE2B 5f49b777dd1e22402d9f1c56c3dee0d6cb135c64a48fed0b4c28dfccc39c3a209952248d32bd49977483f5d2f9a610f72fd5c0e18d17f4d9a65ac7d939fe8f9d SHA512 a1221fd6ede7fc95a76c21cae01ac591739d216be0c3c8c5f12c561842ec03172fd383e47406657afd6f8dad4201478a14eb0c21ccb78550107e17e0fcf2413e
-DIST firefox-128.1.0esr-mr.xpi 532106 BLAKE2B da3ae38392a77a1dc292f2b9ef6c46f03c82cdc7aa9b7d8ae4c9c37dedbfd6c6107d0a83de1b3f05e9eaaba607811dc26bfdae27d723d6d97c4437aba8e3c52f SHA512 b5bd091c7c5451218b81b6ec303e0201f731751d03071e06efcd55dbac610d5b7daabba6796077f579ce85397a463c15ecaa13365320e136065450b89424fc6b
-DIST firefox-128.1.0esr-ms.xpi 449720 BLAKE2B 6d88519c71788646c74bcdd40bb88cfb29f0807657ee4eba4f637b435b13a17b22ca5d5f32720fb4f0f1efd0b6b74512f1bfa7fbca8afc4e04cdb45f8b2fefa1 SHA512 b5387152e4d588ac72ae56675b0af6d8bee31144b080b2d7b5a1b64f2cfbc645c1e9bc6ca3d4345b2703bc73473f40159a8888b78b9d3210d6a7136f312aebea
-DIST firefox-128.1.0esr-my.xpi 518627 BLAKE2B 815173166c3c9b67c133150d5ecfe74c4642f3c35872e2f079bad2a775d2b7f7990d2fcc510f9c622c7f49730500e76988f3c1286c089e72dce2946bcedfb296 SHA512 9feb6ab4beefba65629f7a5ca39b244e189c9df9cd4f8577b9dd50a292825e1b4940619b3e2947df04d00d2a471ab98d0b70b00e51f871b8a6d38cb795360379
-DIST firefox-128.1.0esr-nb-NO.xpi 607044 BLAKE2B dd1dc4b96543879f3c79c410e7ddf78e5715f7a2d7e6200a06680e00b76e5777b4da44c56db03a087c3ba12923c96529885b1c64652d32865c82fef68d94374e SHA512 929e3fa9bfbb17080fa04bc58439287a84165e80b109771af333e8477c5967bd32236480cbe662ad9538ce39ea2a85947d6034dcfcab8300dfdf61b664a49f5f
-DIST firefox-128.1.0esr-ne-NP.xpi 510947 BLAKE2B 56116200d154f08abd60d42f14cca9aa6932c9fa25af496137f07256e6e07d3a408eecac74a545246e1740a0f3f7ace7508e281d42a1f4adf1a92417553eed1e SHA512 4e8e5bcd9cd7939a89c7dad9247b49f0b7390b69568b5f2b1f839706ecc659df2b5a8ad1f02126daa5335ea4416735ed64c5a3f524cc29d599c1088f32d4e917
-DIST firefox-128.1.0esr-nl.xpi 617626 BLAKE2B 646f43ae271e496b6edeb54813223e33c7c7d5859196016dec37f2b56b3a5378065ed6c4a425d9fc581be03b815e152f81774e6ad8ce0a9d36e3bced836a2f4e SHA512 5d5f4ca4c65d6dbe85d86ca361e36acdf930854e4eb2a064b1dad5de9abd173876d1d0fec80adce51ff701adfc0d90f595d81b3dac87b7e4a9644f8f47b9dcbd
-DIST firefox-128.1.0esr-nn-NO.xpi 610286 BLAKE2B 1d16f6951b6d00d95f6f81d2f3251ffae3b4c81e7eb5d6868bf07258e7b05ebef5ee8e0ddbe8050ae3350c02b05ea302b2031e0a5b3bea58b8407675ad294e67 SHA512 d6788c373d312a5fedc0cf1007cebb53d94533632fdb33b9383116598d4801ddeedfbc44694da2ce7546a1252e5b3e859771af271a23b88851f50b6fd54b73c8
-DIST firefox-128.1.0esr-oc.xpi 612826 BLAKE2B e29e419883c8a69c341c7906720d1d2df59f5478b3d2e3eb91f20917d6f3aca5cc29ac8a8766d578353190cd84d099d1b7ebd4b581a4bb08f5ff83694b01a046 SHA512 cf417de30f8729f082582694636c9882547713ed4c603129806092c887e99d465ad09fc14ec3db59209e982ca8b07ce19d69bc429da824f7cad58c53f3392c17
-DIST firefox-128.1.0esr-pa-IN.xpi 692038 BLAKE2B 06988ea7b07a5cb8375a1b2785fa1dbbd8ca9a252ef88df092f04e01c7959e5870e49a7bece3c40d93ad6c2a65349f007889645128d24acf5842c13938e0c10d SHA512 efbc9ef088913b0e03fff86aaa3517fd8d2ec932e5fedc30baeb752fac9e658b0f30afc1ea1742782d34909e894f2a7cc17b0928596eb7177226db64aec78481
-DIST firefox-128.1.0esr-pl.xpi 635786 BLAKE2B a6607475474d312c4ee7a54ae6cad1f0bb4a29afd63bd45be8a49334d2560da8e56758e9a9b774bcb30539629259f1a5726c5d481dfc10bda1a9c2157b86e66c SHA512 1772f9d1c6d92557e896ce4e97f8fefe0c35944807056452f39186a5fcf185a51df2b1f8939fa1e24b9a3d5843b5be2c141ce365d1a7d8ec1d6219eb34b17749
-DIST firefox-128.1.0esr-pt-BR.xpi 622163 BLAKE2B cb3a7ee3ce54be547899b370cbb36ea8fbd15e97eaeb439b17b434316ed6b67ba9ba5cb576b11f9823982d9885bbd11f2366f9792e6f6bdf75b3752cf3d9f8ce SHA512 56d617515582cbd3ede67e7a316c56d1f324255b7739270c3715dcfa286e3b519c182c8192447fb6efde50304b4cb19d74650fa293b10ee6ec228ea859205df0
-DIST firefox-128.1.0esr-pt-PT.xpi 626185 BLAKE2B 9160ad68f2d46d7ae0b68656153b0b639991694fddd00ac11c86d5965a3242920be0c05cce162022bd2fcd72e973b47ffec9c49c925bf319a156160c2453e058 SHA512 9e22154d175cc6a02ef2a99bf8aa465bcb692158251ea85f7d400efe817db1ec1f8fcd96a4f393d8103a6ea03613bd67d4bccbb63b4a3d2e14fc00e8d204c8a4
-DIST firefox-128.1.0esr-rm.xpi 617923 BLAKE2B c9f1bc265baaaba70996681eecfc78073ba99e50f6b34105a70cb9a85689c708b9e8e2fb87287b74837954eefa54223acff2ee2b202f906ac3af1cb8bc9bd1f3 SHA512 a819c18c10deb5c1a0c315820b0d16154eb8a382b1c7b69bdb1e815b3da25a78e23e125ba07a821fd875a6b9a06138625186c8dd5b7bebcf544b61cf865bbb56
-DIST firefox-128.1.0esr-ro.xpi 549787 BLAKE2B e5b419eb3f37b2b53032857ad1186f34b0e602a84eba46b63ea1ff244032accb634935e492ef5444cae35b66c8311d6545808572701bffd313f1f164bd22d55d SHA512 8d05d60f250a7a9584724d4ac4f5f3b78192674e80adb1a30aab0a3791f973ec8d7582ebde8305575e02e3763b85ccf1f24dfc8dc83cb4379eae43ab099d5316
-DIST firefox-128.1.0esr-ru.xpi 720695 BLAKE2B ee2c5f0bc3fd0cd0f1248606917aede08aacb61c67a36230256b22f3002f5754c8f7a73b54e5a1f051bb02057f59c34271cf92d6f9516ab91e177e8256e2a02c SHA512 b8c259321b46480c25d1157dd7558e06606a4bfafbebd4b6b58c3d58c37e728444adf82a6034141c545fbec9d355550f1de192e2f06b042af7a79570dbbff2b2
-DIST firefox-128.1.0esr-sco.xpi 511277 BLAKE2B 1c041199a101ff1934001288fd0d9ce08776a186ec6e43946e1be32c9c8736cb2d14716902a192e8f08e9baff96cf0b696af98d5bb35df99c3bd71002c46e4e6 SHA512 a402ebd4a27a66f611c083c51b7b3ad8bdc1affa357696c993017dc7e7e182dbb55fee63583b36561e8ba58cd719613760e10a5edabc0f721e4b025a538c5c5f
-DIST firefox-128.1.0esr-si.xpi 611298 BLAKE2B 301cbc928083baa24ca3e86775c3d88f90cc7dc064cec21d74edea7609d5d196286decef9fd222d1c08599d8cb370f801df3c576d3ab1394da32df08f355a7e2 SHA512 8a632c3055933fc4e2f675232a630950c2dd65da8b220801cfd32a4b09d9958fa675527889b33ca57f8180271d88781a620dd0078ba8eb9da46033bbf1d46f98
-DIST firefox-128.1.0esr-sk.xpi 652701 BLAKE2B 97ce1fcc3b0b764991313e2957f0bc8aa95339f6e1af914c269ab8c444f97294241c6fd3550269592d771bdddacd2f3451961c51813f6c49eb3772ff5dee44db SHA512 46756945be6e91cc398e95b7ea1b01d8ec705d5b805e6ea12000ef27a868eba2c0c651a246b78015f5d841ccd8fe204bc87f528dd10aa22981c24d9f05b2480e
-DIST firefox-128.1.0esr-skr.xpi 707654 BLAKE2B eabb062b4e94281fe09c0d0ef182ab5a5f75cdbd8845a3e1edbfaf8bce289d5a01bfd7e8446723a56af0b2f86fb807acc6cbc1c9f3510574ed34205112acdd0f SHA512 8dd06948063d8bd789c89a9a2dff75d4e149100c939fe08f357633e170ea7f62d196aada054a8a9760a054466f8379225e6fb0f4a6362c2725508f5390b17326
-DIST firefox-128.1.0esr-sl.xpi 617916 BLAKE2B 44d4681b884ef0bcbfefe787ec270469844f5b4b0165076395370fdadac4ea3e784efd8592dbff959b654a09745bb44a8154a1feb2b3d3bb973bdc7c43bb6100 SHA512 9728f40be5507e0b04e59069e041e82b38151eded17446f6098f39be846dbee290aabfd4142207bd90f782fdc0de204cc3df2661e65f45dd2776a6121e6dd9d6
-DIST firefox-128.1.0esr-son.xpi 416392 BLAKE2B c1f637cb47a299b69a1925d398ec5f7792ae6923a444af70898b77dd8b85975fb7255b426bd7e3cc94acfc1a1c53f49df0316daab415553d33ac274db9447895 SHA512 c903ac44596f0bd3bc781af42efb23848fc7dae620770cf3134b71b71153b02b79c6bcda264aa58619173fbeabba75537f8b255f42af14adc1a1ea123d69c2c2
-DIST firefox-128.1.0esr-sq.xpi 636978 BLAKE2B 9d83ca5361eca1334e192fb26fd95f74b836c33bf8abe0e534a7873cdd08df77dd0a0da124de2b28a7afa2590b0db5b17e0fa68c8f6e0a30e940945b586072c3 SHA512 dda78212084536989dcaefceefc8fa9f048d9c8b4cc6886c5498091be35d3534e39a71d83aaf6a5dfb56c9b29846d8f12c853b088acd3787babee781262dba20
-DIST firefox-128.1.0esr-sr.xpi 639362 BLAKE2B 0e3d2ce65f20f914a2af4ec918bd7424584268e0f128de48d5e0694c8f52610843768c0c310f930f1e724e0f5f9b7304491cc3692146327cea828621ba3f2136 SHA512 a760b2f74d3ba7360befa385d91dcc3008d9831afed5a47f0934a4ce51af46e1322d2af68fe8d67a3a9be748ebdf8b7b6b63e8d95d5a7eb61a9d72fbe6169948
-DIST firefox-128.1.0esr-sv-SE.xpi 619365 BLAKE2B e03b747786895b0e2789c9267173fd93052361d12ac930a7f821988451342f3c8b7b9c15556f88f2ca30bbe246eecbabac074ff0fdf58d7dbdbbe03b5ca2e5d1 SHA512 d12b6aff91e92ea3129a3da68d849fd4f285a7445a658829c71c1f9fb84c7875389b24635a8ddd6f1d103006ea3d62d6a8139d4ab3b7f7eb872f715a5672f176
-DIST firefox-128.1.0esr-ta.xpi 507523 BLAKE2B 1d0e002c39e4eefddc84ce5f23d76a02ebd796d3bc5eb7fc380092ec39e1533649d18e624618d43c02b68781c89cb5be8640c6270b4fb3c383a84bd7fac04372 SHA512 26bca1a6312fddffe2543e8a66184d5cb8ec9cc916e4d79ae12e67209a97afa194600a9cc65fe4adbafc1521ef42112c1ceb3c0ea72daaf072f5f1a936570a8f
-DIST firefox-128.1.0esr-te.xpi 561038 BLAKE2B d7278ec6a962f183b069fb368535e075f89ca3e076d1e7bd854ff91c9cf1b8271b011ef36f7c1362bc71df2932743363e283f1e812302c4337229874bae90283 SHA512 bd15d31573eb0744296d6cefe29ea941e6882d30dbbb742ee89dda976ae3df89544b548a1019dca106bfb20f3d886426d7cfcbc47df4093c59d86e6641cfb54b
-DIST firefox-128.1.0esr-th.xpi 694370 BLAKE2B d6a19282fd71fdfb17d66b28aca429e34db0490bbd84bd257b9e5deda195e419d498f214e818055cf525c9cba43456c6c64bf12e38f4d6c1caee3ec29d5fbf94 SHA512 e5fe1ebe84b7cf52aef17ee0b8a7fcdaa9d014d393fa8ea0c4133fe846a07712dd0bc9e2be19705e9c1ba2cc063f992957c86896bceeb686d8e2d2f2c324251f
-DIST firefox-128.1.0esr-tl.xpi 534193 BLAKE2B fe4152452e688d996da36e21d8fb3c06259d78ea417935683ee853b4fd60101c9be42827b408d2e9f9e4c21a7b8ad39ed8c9c44b8baf08d30b84297ff3151207 SHA512 bd755c3412458cf6eb978e1d37a35fd749f6f010c385f1477e5240dd25163b8d013fb83545bc5ef6752687d17ab19ec2fca55ad6b0fc730bd5e7447c07bfbc3d
-DIST firefox-128.1.0esr-tr.xpi 632685 BLAKE2B a974f4c8b64f48285be1444fac0450a6a1dea1470892a5e61e7ff32af01a9bf8a0d6fbe353eed58c0603c77a0e47e04d8f54a27236062c31b22e7d45db476d8b SHA512 410b40be588c1308fda41464fa68443d39888f070df2f7904925a8f77d603f412259c82cc3e7bc8f1587cc0bfac87146e3f3e593aca6c86b11fe37e7b46fa376
-DIST firefox-128.1.0esr-trs.xpi 503987 BLAKE2B a3de7338321223ebe9ab1185bc9d58792a71cbbdbd95099970d0be807e9dfa4100646ee2d6b0050102a4790c0621b8d6abf97752dda48077124c778d9e4f3f24 SHA512 c5854965443b9b0cb617065bff81a9732e4dbf3a1a38fecb68cf507ccc18e7cb1d6affa3b10f200923fa8352d629c732069cf35f1c602c59dd134bfabb1d88a6
-DIST firefox-128.1.0esr-uk.xpi 707283 BLAKE2B 34f0ec486ddf590de71ba5f579a7e83c7bf89aa0db1e1a55ac6545b6e5a44c03acbd715b183d52f5a0323654f0fa69588b7a3cfe82a9692145b5d10827dd9fb0 SHA512 9d6ac889307cfaa04d3a4188c43c699706986b2a402b3c607d7e5752e890645ed43e909af70ac54bdcd7d47385bf6d49e0ef864342cbb31505a5cbe1441fcbdb
-DIST firefox-128.1.0esr-ur.xpi 560482 BLAKE2B a7f81932d9cf660253c5ddc5e229538f5365afcb9b44be6967eec83ba6bfcbc84c28e830ccca6866506bcfb4f35c5627dfa661c83dd4f709edc32bee3133dc6d SHA512 66da85e8684a4f36f0cf8c0670cf0429859a827b6adfd627b4712d110e5a40888f3cfd41e3300be52a5d21bc976e92ac331a7a61f9ae4148fbcd160d3c5c7602
-DIST firefox-128.1.0esr-uz.xpi 478781 BLAKE2B 4763c191cf0497981af8279f3c8a39dbf9fdcf56b7d883ae1d794147e8734009f247880768a19fcb2138e48e9b5e5a692157da0052d70f87c65b69348199e9a0 SHA512 34d64c137f03e0ae1fa9820d7ea3b4ec79064ee2d7faa752aa94652aa4131213cb7cd1e3c8e75d364e6e63dda52926a96be5749db40111e6fd8dade696ca1d0e
-DIST firefox-128.1.0esr-vi.xpi 655578 BLAKE2B f4a1afb49af9170608bd106c6655a415dd6c5e167a45db2c42031d9f55544fe04e0137f49ce478d0007eafc07da003875187b9c887f32315f108c7f332258fca SHA512 75ac1b7be4ae1971f8ecd09a0d96da7150528a1880d3264d1f4dc10ad89ca5986dd9d774a551c3b4cea554bb0508f03f8bf231750f9db1ebd601dc29008cf368
-DIST firefox-128.1.0esr-xh.xpi 417178 BLAKE2B db647fc6764380635d796baaf6084094f15e877c0e798de889c2fd16bf71b318963dfc6d9c2a6f1a678a241970bc49e85ea524c7706c86adc2735ba47cd1fa9f SHA512 0ea3a9f7c35ee95645a973c68bbd61c871ae378141a10dd6b4826efccfaf332377bfae4d6f14840787e2e06ef80864a3010755cc56d9d05f46e9bc9539ad4542
-DIST firefox-128.1.0esr-zh-CN.xpi 657339 BLAKE2B 37acc3369de9339eb10a39211526bc8cbf82f3962b0415cdf96b9933fa88fd5359361fa6c0a32545cf31cbd86d590efe9814b67d835f486e2a39387c00bc6e04 SHA512 524d90cabcf3ec2f882670db7571156c61b19302371c3c17703fcf3abd6758aea898b6231c51a50b3db6607855a6d79677054a9b19cfaa522bde9211b9ae30a4
-DIST firefox-128.1.0esr-zh-TW.xpi 659474 BLAKE2B 98d0e9d960a32692cd34e4ac99ec5494e74b0b55d45a2f36cd4f722ac8ea2c9074c733ef2b04a0bba60e9622c26a14bd38d8eecf8a810f0819a5c85615023ef6 SHA512 1a431fd2d01a78fb761c812bdff06361c2c5f59fbda12656a38622346cd9370e6748b61cc98ab38a3d31d9824aa9f2da4e90a0cb6d0533e40136aec7ac8f1469
-DIST firefox-129.0.1-ach.xpi 466203 BLAKE2B 1bf400d04a11d92e935f39ff1d0d667337e4f3467d3c23afc83eac072c876fa3ce27ef094e37386e700a484e6a85313c24608bda4f3aeb6e0347b9974cda3825 SHA512 0de41cffc794d0bd239173a77b8299e56863620c5e9855836e16539fe22a364a59c61293815f3d599bce0713226eb9b0cbc3ac75530edb143c5f1ff5b7098216
-DIST firefox-129.0.1-af.xpi 419658 BLAKE2B af551df18aa2d22702084c5a3d44b2d13e95908723973b3f9013693a464b030890a05f8368eaf20ca566a71f5ed74512a298a877453f76913f9aae886c8da227 SHA512 e370fc32822c5cc24ee5f4c02f862db8a368de8eb7f2782f77ee76192ec7a59717d8aedbc0b13e2237daf2189bac6e9ff63b62343c456cc60bdf67a0549ce8df
-DIST firefox-129.0.1-an.xpi 508147 BLAKE2B 528f5baf0c7aad059c486c83f94333edf24f2b4b38987f23cae90ff0ba4f64ce9fc3fc933dc1b29f3cc9023a14de7a62e4211733354a1bd0713d2fc7c7a465e7 SHA512 614bdc01c051a37431aa9bbf913e40acc7dc2751ef9f0bd8ece2c6e859958d4c01b5bd70da613b904fdecf021b13c774de094edc3b1d4a700bbd8cd83f210e70
-DIST firefox-129.0.1-ar.xpi 613072 BLAKE2B fd315b78f59e3637b1633dc2311ad13e5d524b441f1faf8d1cca199bc456339174a386d627decfe561da600fcf7fbfad3564169b42bd3c50a13b680197cc2343 SHA512 f5005e8dd336d6274eb4e1424a5b5acdb1152c127fdded95c41ebd864f87acff04fc965d842c038281fde702e5f18ba5875244deef30ad2357c56fe6dc8d7ba8
-DIST firefox-129.0.1-ast.xpi 498510 BLAKE2B c6f1e430609e2188ffdde33f6205477a75422480499919eb12c51547ef2239b778671fb2e2e7ec4a544b26e5c1e055624104d0596656f3a9bccd35342417e38b SHA512 07ba30cb97968856b51e6d47d42b9f7df86db55d4517cd2ee08f8c7987eb85fbd406dadec21ffc6dcae616dd91419376a41211476ec6fb21c55b8a906d58ec8a
-DIST firefox-129.0.1-az.xpi 492957 BLAKE2B 7bba0415ffba2b4b40aaafcf40af859421aec43ce0df6fa07e65315650da4525e4c0f609b0a8ce4a0b2944fe31ca0eb5fc5d1d052b7024bcee832008ce6e32c1 SHA512 f26b5ba52db0237e7a376a606fc7d417ae7ea77c04b741b4d12ffab76f1a0c21bab29377ab07243a57d9f3262ccfefa55dfea84fc34f1aff02b67cb7aae4ed8d
-DIST firefox-129.0.1-be.xpi 718010 BLAKE2B 4b53dc0ae6353911dfae66864cf254dd4113a37a8605b66cebda8f4be3800b1c95c2daa054f230ebab6715726356ac10aa65e82f0143c10a41b9f30e6b96b684 SHA512 e6fc6b006317ef5d3bba1cf9087b93e59907fa1e0a854dbbc4d68c28769b034b8c09968b8e3a5027f54a5d12bacfe80f7b26af864a7e6bc2a119f3b7a90dec4d
-DIST firefox-129.0.1-bg.xpi 624115 BLAKE2B a0dd3973ccf6468ff0f10e68c2c85525edfc49fa9e85c391db7360ea19430cf3edeb01eb3f8c09f3cd09a8e2670b61abb0d1fc10233e5cf8cf887277b1f43de8 SHA512 f357c258c278944f5759de2bf4b84101667d1758559dff797b51b3f8d5b08231724527d7e8acd2da6acf92fffbcfe72dbca4d084e3590c0a3891a2b6117520cd
-DIST firefox-129.0.1-bn.xpi 583730 BLAKE2B 30807365f0d737a1887b33c94ca78cf8cc1200bfdc3a0d66d03ea45ad1fbccd0a204ab3dc0858ff80552e1cc9615fc765026914cd31a9fe02f16bea5ef198ade SHA512 7cb3e87211064a05f0d2b64933f56d8cdcea6359bc3d6951d3b4d35f2ad72bd752efe08dda076f10c6f918f8883e13351958ed7d71563f6326214414b8e373c2
-DIST firefox-129.0.1-br.xpi 591227 BLAKE2B dda4d91c881a795ee6ab2d0188ca4c8be4042d1c2b9c4c23577cea1b3b642cd484a1a90a354100612bd913fbae9ce15438539c9772c51569754dcaaa0df3ae72 SHA512 00f50d8216c719f5d13a72c403669629bb1b9ddd9980bb034590f146f26bbe598c35862dea58c973a0977f60c8ee43aff8dc8c0faf203c9f83dde5adf9199331
-DIST firefox-129.0.1-bs.xpi 504168 BLAKE2B b0d9897a2d987b3f20d6ed165d41c8982f2a63c0ce1837fc4e0f41ddc8516002bee6d7d565d403ed8fa96189d505eaebf879049c77ea04b92c2a5ca810d35a23 SHA512 6a551074fa4246a24f2f0f338b76644009a42b0da45ae9b80562d0fd2991c4a73ec0d70b9d57dae1578fc9a9513b30726da611326cb9291490c46c5468f5a4e9
-DIST firefox-129.0.1-ca-valencia.xpi 548456 BLAKE2B de03d04d8b09651fd8329a6979f27ed7c88ee2e003010f6723fc9fc81ec72cf7c4e8a349f5744fc1f1fd67653d769c365c3c86f8f9f7058278fc285fac065ed0 SHA512 758af61677f2b9df14c6a91c9b7b74043fa2e42d45637abf695c01dd4d4b5627a359d279a755214d55c1b1cf12aec0485092fcb1b82d9dff5276a887de08c7ce
-DIST firefox-129.0.1-ca.xpi 599335 BLAKE2B 5a17782d69e50e9388c5aef3e3376381bec44a8a5d64f3ca3e49a9f4ca4dc3aec3765b156cfce6ac358faa679fc3c233c736553c8d08a4114719a645ce244366 SHA512 63bcb2b0c4cb2668645e5c31765c680b4f10d86fb4dc89239821a0b8f3f4a87e38019147eab21f7731399141942074456aaa3e86e6293b8bc9d04429d4de4b5e
-DIST firefox-129.0.1-cak.xpi 595443 BLAKE2B cb7f40cee94b1cfede1f3e0509e3c073b7323ff2e7405d473a88a606a8886e47b4c4b3307dccc9db40bffc325dcb02dd5d95df23ffaa84b3b60ceb4f2bea07f3 SHA512 26855b6d785f2478a227e859f9049d30bd5616b4d9301264b2441ac150d54577dad3cf17037d274f8136f7e25185835b0de5a3873240bfad3d52fc299d56eb2d
-DIST firefox-129.0.1-cs.xpi 662050 BLAKE2B 3e3a51161026e1713f721a12e7131af95404ad36049837e955cbdae05c2e913483155383f1bd8b77ad8143e7b9bccf9806b899c12bbe6bf56ac71662260552cc SHA512 db42e9e6c519177b56ea01a77bda6973728af1cc9dafce78fe6c2aa8f57314a9ba475645e2bf6fd4dadc84c5278c6e5df726325b4db34fe8a95db68448005189
-DIST firefox-129.0.1-cy.xpi 626691 BLAKE2B e99299a027e7c8594fa6194b5b1fbe256c933d383fd2100938568b35d3a7c1851196ab4eae1e8584517e6368bed5a653cded04fbe6fc3b7bea0888bd3d5a734e SHA512 bb8718f2ab590187cd918506447f9c8209e423e147a6c4236f70dc8dec7d3c1f5e2070092d455124e4b2f6aaa90567859edd6311e2b6347b6656ab34194f4b60
-DIST firefox-129.0.1-da.xpi 615343 BLAKE2B 5c5df91ad11df90d8cacd5a4cff3f0cd3c6f125d7edd54fcf60072c584c82488f6020bd86196d3eb5f74767430872580737beef4400e9cd285560eab6fa06cda SHA512 9829e5ecaa614c018de5187ae15481068dcba3720bd864faea7ccca561beed6444404aed503b38cd50ee372e44f5878164dfc0264495a7939aa3a60d0321244f
-DIST firefox-129.0.1-de.xpi 636708 BLAKE2B 854b59464263b31886d58116a2563cdd4398eb1efd448508db71909981b5b75fe06aaa295d39bdeecafcaf64fbab7cf4f66229fc8d91ef7e9076bd34a3eaa185 SHA512 04920db4d1c297d5bd3bf3ea6cf370f346b309c1e4cc3a77da72488b029c9611a84b38f890c4ef4c9bfc86ca57055085514d06e5b48b8f19c19d2368dbf8a6b9
-DIST firefox-129.0.1-dsb.xpi 653382 BLAKE2B c140321c20059ec8c00c9871f89bfdaf7474889936496c4eb44d0b580548c29fb75b270fe92d6cd409805ce27fbb62f4d8a990cb0eca0e55210aac0c470a48b6 SHA512 e886b76cfdc05503c364a2fd2b6a75f1e755747300dff13a83e3ac034607241f3350bc53e5f705958eaae9f7670ae55d0a63a865fb7d3894b8d57aab71c78daf
-DIST firefox-129.0.1-el.xpi 735568 BLAKE2B 43c751c24341c0cacab30d88faacd7f85fb2098c62ac39fbf89e8a56f037fe60e44a0f971613249c89da83f7388d410e15a0c0f564bba0fa3a684a90fc1921ef SHA512 3c050bf0d324b5d0656ef9e1ac65e28dc457c6956fc124ccd25aa20c9d075a3bb7ff8e334e99836f920b5295dd899d9590ce40bbd34ad9ed65b75883e308fb04
-DIST firefox-129.0.1-en-CA.xpi 587144 BLAKE2B e5729f83a9420b4d4b30c8d7e1af810c940a96fe21beb80817c569a40258ba626861823ce9684ab7acf89d706284d267513bf6e038345fa637db8eb0e12afded SHA512 8a18deede7e788587aa8443d32ce71e12f1b6f35d9acbf474370f607f249cde828f161ba9a57f0554b2950937f4e08eec3a3ad6cb2eaa31068c12f37e2a13de4
-DIST firefox-129.0.1-en-GB.xpi 587528 BLAKE2B 6c86c26037ad3655bee98d7c4a561d43dd7fb1ab740fba559758d89e694574ea92c2b1a0d5e10d6a7b1ae15e8561310e0bfa8995e94ad784aa78c3e0f46580cc SHA512 8b268502bdea7d4312a7afe8c38b565a559c73290b074fad45acbc2489618ca9524786c087c092458a046cd7366181bdc2ca7bb8f6675f91517e47d33e57170e
-DIST firefox-129.0.1-eo.xpi 616014 BLAKE2B f171ad8a71b30089f8e9685264f94a2b4c2ac37fc22896a472084152f368ce251adfcf7b09868c74730e92ecdb1225aa22837576fafbf38ca470bf67a5846f11 SHA512 64c896b3b22211fd808c3c47368383518f4752fcd0028835652bed4a67c37e782c80d636eed2da513821c31e65ef3c3acfab793adbb42c6f80a50d227f02341a
-DIST firefox-129.0.1-es-AR.xpi 630369 BLAKE2B 1b486eabd8cf09e33603c2dd0c515cc5442917367dbf79198d1bef0fa39c4b6cb8d28f826796755fc45d453b278493c6c0de6a77984945b945a222673959c41d SHA512 b3baf877bb36ba3b0adcdaaa257a466704eba707970117788c87f6972f1dcd311446c9e67b66034118327dc629c8ab40525fcce51b9db32562b5574251446af2
-DIST firefox-129.0.1-es-CL.xpi 629637 BLAKE2B a8c07e26cb529a486de0fef592e76e08a24fff5df853aed110f45c1c70002e446fe21a8098428b4b0a944ffb2ba6645737068b5e5d4499c71f73dbd4e440bb97 SHA512 6045d2b0b263814894652d386a18b01cfffb8aea8f7ac6613e468d59e18db1dc49fd29bbac5d11e780e15e30e1d993979e36263616e688932e59fed84876418e
-DIST firefox-129.0.1-es-ES.xpi 622865 BLAKE2B 7e29a50f2e8a7c83ce12a46257a8b7e252a6d1f2491adfd22ccc52b8abac4c5fed41272eba9ce749a2403987d52c68b99f74de2b140603eae875909767e2050b SHA512 9f47b5fcbcd567bf923f5114effe1eac4fdf317a14dbf9fb83907640a2469f09988f03a9eff8dacdc55246e4bcc0bf9527baf4174cf2504684d502413ee52945
-DIST firefox-129.0.1-es-MX.xpi 611602 BLAKE2B b0121faa225b09c0993b9d55940af36e6fa4ebca1edb06a8dff5e4beb20791d5e5157333781dda890f10424f63124b0e5d357907b62e2df10eb95a2dfbaba2d0 SHA512 6246482066cae080096fbc4ecb294db027f80b156fd76bd52bbf8d5a7ca182f120a309599a8b97bb4ba1a7ceded0adf3b2457378ae9766b856e6024a13b1dc1e
-DIST firefox-129.0.1-et.xpi 541839 BLAKE2B 2c6abd2d1f0e130981fcd1ac39eb0264a6cd5f495950e406698decbd5f8842a8e4fd8000a43ac9aed0a07abb51118bedc33041f455448e776c4d5a44940c1def SHA512 5cdbd66b9cfc61cbc06c9b136e875fb0a8f191a5d8b9fba30d95e13195bae1c2613abc2cf4f521762e5170190d74111f7f6d727de982c93efc39814d3795a4f8
-DIST firefox-129.0.1-eu.xpi 601685 BLAKE2B 6a215d0f29cc57264fda64b633b97caf90def36b9d30ff9542eb336f750366cf02240970430a58fd9b9dd83991442fc23e2b7e09aab6f420c5b4b83e28da07eb SHA512 6d86bfe4ff8f054a28d9974089315aa165f429548342100c399863c6930fd95b10229c2888453290dbafd116d2bc337431bc4b57cc147c841a16873d7ca31a82
-DIST firefox-129.0.1-fa.xpi 592244 BLAKE2B 2a3bc28ceb76ab5ea94f524b1b2b3003ac02e04297b19212b011e57a4453be6618ba0531e3809cd8d094f4deaa39e48e2f1b28411fa9bf681ac64c8419142b41 SHA512 9d5680baf01b60c00ffadc60848b2347634141e05ff7cc44297388398709ed204101ac7f9ea7d0041e63b12b2c286685e004f089078bb843a11f94971625b47c
-DIST firefox-129.0.1-ff.xpi 478248 BLAKE2B ca1d42bdb9e7f181e01d1f09ff8d2cc4a82d243fbbf7c99c3e03dbed62a6c3ff9476b3f428e21650fe112cad7c95383af173afa4fd624866b916235defbf6453 SHA512 f079bf3a8de935c1c53eaea12483e6099c03fb413991b8f0d9662a2f50103ffaefc2178a485a3602ecaea517aa18521052821777a7e2669588449683f3727892
-DIST firefox-129.0.1-fi.xpi 610113 BLAKE2B 3db7001071af69865efc7388d8dc3afa387d8897bbf87a843512a51d5f17bbd72efc6da22bdc22e19f9e01bb8f3cb0fdcb91a5c625f2e52224e12e977e46570c SHA512 d60c889e8cd3bf4b649326e47e5dcaa902b21bb3666b2f8bc6130829c9c5692b13c915d59f4043b681302c8d5c1b4c969f06c70682c5a8a74d51189994d45e66
-DIST firefox-129.0.1-fr.xpi 643417 BLAKE2B 075e85a273a8702c13a57c57596424852c462d85c8132ccbe9d1fe4bf5d75592304b1d9b554f84d008e8055cff0cd8ff05f50d58dae4d1de63f17b0c70ce2b92 SHA512 5b3afbd1918e2bf37c3b3ea26e35a86d1b1585ae0ca0190a3b531075221ab8d0dabae7ea8b4f7fe9b4a27e3944d7727a1328fb9c0af0ffcfac62dd350f31e51f
-DIST firefox-129.0.1-fy-NL.xpi 626047 BLAKE2B 58842827f65cbb3758bc3073752da321ed801e3509ab118820077a1df7d04cefe9c0bd1c310fd0e5083d1029704ff9abde7288d6bd4660e65b4676f355537b95 SHA512 9cc1ce773347b0955d77c9a0f5b3064722c455feb05982c0f18690e62795d8105c604ff3e7548e8f143766fb48bc4511900aac289e8a9bcc93ccab266361eca1
-DIST firefox-129.0.1-ga-IE.xpi 473209 BLAKE2B e5f9224cba4e3db16773ca6152a8c0693b0bb6bd1942eb159492651cc5f1282eb5808c35c3b02346f38486d50c8ed3e743e8cdd0c43db92e5b2d16d50b25d89d SHA512 ec23242f28d69d094ab20540fe69e99f8ae4fa8a093d39e492f560a7d07458ec6493dac3cf00933080884882192ebf9e73a3df577bc4ed28738a2458a6c12db2
-DIST firefox-129.0.1-gd.xpi 598877 BLAKE2B af2dc2be23ba83b28604d924b3bb45a112a66e714637a1fba8a67dfc5c83d83905ad953f92d84bf85bfacb1a4d26e01dfda32e5aee0be507b78622f08126cb69 SHA512 051c3b47da3d8a33a2fc08f628a487e67ea6ff2b58702881ba8560182bd526e1ea1c8c79019cf072f3cdbd1a5bd54e0a6611fc35c8d6e37806d550abf7462ed7
-DIST firefox-129.0.1-gl.xpi 606451 BLAKE2B 84ed6dd3a5310d4b9a0c6070ccc757a306f864a26ea93e4efd2e17eda6e1080b5ff19fd75a99780684f2a7ec99afc757263b758ff8dc20964e6e2b32e2a44538 SHA512 f07a63e3cd4de6bc64049c8d6494240cd4a20844f67821159c7a7369e6e9fae4d23c21764b5ca661bbf100c7430003c2f5b0b374989c1657db4eb4478186d336
-DIST firefox-129.0.1-gn.xpi 640315 BLAKE2B 27726aca9297137f0a65939b49379485f48692fa05b9b170869452057e342c125348312dfce07a34f5a02912cec3cd5bf2ef75218ca728e9354ed54e811f3fa4 SHA512 b1909c1f20202c075f89f29c4b6ea005d75d16281681df44475ab46805a570c4be05eb8fd7cca962fe9e6a3fb02432aca3a0b7ea751c9450422c922d80670b4e
-DIST firefox-129.0.1-gu-IN.xpi 529499 BLAKE2B d7be7ea6ef906f633a4ec60c6954764879a3fb25129c928ed7806f97c28d15f1c6ece9dbb63410f3d7a3632a9ada509876801b6c546ba71253dc1a83c76f7a69 SHA512 1a8effeca6bae103f1b3d6dd0ef4e033e42b169e6988cd8c6d6d06ea94ea1e14e3ed4ac385389764e592abcd764a7d7d6648b6663dd809701410532da29804d9
-DIST firefox-129.0.1-he.xpi 634002 BLAKE2B 6b1019925046ac1885358896b169625c2b1317b96f0259f4d2eb2a964a913a70ab85b3218aedbff19a5443aeb57e5102d6a4b9bf985c251eb79cb14b6d15ba82 SHA512 cd92d44c1100f1f9fc933303c716ef963a77e4714a4e920fdc42f41e24a35e2caeb629caecc00a783def0130a27dc692f407d863ca489adef496d7c610a20f46
-DIST firefox-129.0.1-hi-IN.xpi 568983 BLAKE2B 55e37a33508edbb3e22bb9f34cf92436a110b2d7651df01232a894621ed653b08614540b148f0f500f03fd40169726e0f658525b3d11b81e023ccbc719a51e24 SHA512 f3ce9f4a5e5129b6e0d16e6f86563ef3b4877b3e2e508b34039bda4fd4281169136aed9a21d9dc2ac7ee007a5800ab6f1a8b012fbc4e1b9dbe373e80415b5357
-DIST firefox-129.0.1-hr.xpi 610557 BLAKE2B 5d95ae7470fa1af451dab642251e620e99727ed9d5f5c2664d1c72c5ac35ed49a7646c4029e450a7666df8087c147b5d3d849f90ca5ddb04649a8d219eca43ad SHA512 1eba5bb1f5ee5a48c61920af137d71db937d3ce63c839b129e308a209bb1c2f53670775f6e671d2c7adee68e468bbad7e215d2ba98c7e595e4cd5b8bf83ae97a
-DIST firefox-129.0.1-hsb.xpi 649228 BLAKE2B 802f8fd9d9f2e1c5ede6f162000fc3bd49afe9a4ebf2cc816351b4a3339155c911565021c25663687cce420355c3313537c058c136e39e19b6b21af948fe51db SHA512 c4f2a325ee20ba192af024d43f5ef5f34f877986fdbb247795ba19922c5c8fbe30a6a5b6a42e066669865e634e0d891e120fb006b1e634793f5c88ab98516d1a
-DIST firefox-129.0.1-hu.xpi 651238 BLAKE2B 34fb48e146aec439944849560837cd3541c1e3bd4d4588e9aef01f3dd5e009fcf2b3ddbffe0c570367f281f143fad862c5338dd099bb3e40f1761901427f152f SHA512 1e643547997cdeca0cea8a61064040a37306d7c62a03e14effcb23e05938e91401456155428f37bc5681c1cbf8100a09a2672f1aee7f430ab3069a84978bc3d6
-DIST firefox-129.0.1-hy-AM.xpi 653906 BLAKE2B 23140d16794aae5b0ed9dc1fa1244dd60d62d0a9c995e7154d4c7af8276b453ee5effd5f8412a7189596fda95e84087218835864188c5e81a51ff429b2dd3765 SHA512 a9a541b5e52a1f0f815203d94fe1d2368af11f5ccf84231ac6b0e8bf093c56658646461f2d4379fd8f3b9d539eb043ee1e539bfa5a26e905c9e88a6397c554a8
-DIST firefox-129.0.1-ia.xpi 613523 BLAKE2B 4b0d1cda70a3a5298c173516a29ac645b18b1660c4ce752b100f3d87c952080313306a8abd8fd36ecdb540a32f7336619613f9b4038b6c6c9c604479bedd0f26 SHA512 680bd5e781899034b11eec808c542f0428991d534b8ce06894877817c0cd8ed97f988f582ed08e9f11bd7e93a873f6003381117d9942b3fc0d7df0ff77eb4d0b
-DIST firefox-129.0.1-id.xpi 585302 BLAKE2B 0d958a1a8f728c70097e8393b831b234ce5774fee6478601b2997286638014c4a716e2e7a814a99c1f3beb76cdec628c57c72d9102c22d31e104975e74a62349 SHA512 c4ac6e977f4d172016e98ca4faf973a1ac745d2f613513c015792a74cbf53de689893a10d192efc0f0b999d64973a78ef61454d4117adc10cf3f629f76ef92c0
-DIST firefox-129.0.1-is.xpi 619024 BLAKE2B 3394a770de2b98452cc58b98ca9d00b6390c773e9483270235d26445bdb9256f471d7ad7202d1f856e1a6103be0e637277f76ad02938ff928ef7c6f8d1b5b5ff SHA512 f03c8fc1305098afd7581774e29962645fba4def8abcb9c7bc97315af7089ea2c801157e2692a0224d308222e217048a13ffc15b6e30cd4f98f80a1b2bed07db
-DIST firefox-129.0.1-it.xpi 569518 BLAKE2B ec6cff3f29c867cccb1ba97b3ecaf25fc623e644fc05a9fb059094ed6d1e7b6f89413115f1cf8c497a082f7007364a06ac33ea655ff69fc4f43436aea224ffea SHA512 6b33032580e3cab4785ef5284345082fc93409e363e814b8c2641261db491c8485272b34384b846929c5f7438ce248852f2d4bdc506df36c445048b7104f3141
-DIST firefox-129.0.1-ja.xpi 679731 BLAKE2B 0faa398029ed46d1edc73972be8a2303adac5ae0134ea0f0d717ef12db3fa17d1119ee370b71265634af62fbe95971ba1a4bed0eddc3bf8490906de5ed79c6ea SHA512 fdc5f3ce5552c802d82e2054b4375f74f5ecd8d858a76d2ee4331868709166326e2a23322190c0c2a251908e903b4ab8a60e6ed1442a4dcb27111a155105b171
-DIST firefox-129.0.1-ka.xpi 663166 BLAKE2B da553f260971ccbbbab99122faa816dc304a438eaf7edac083cfc99bce17fb63ab7f864e1a1cd5126ef7a8d89a25610cc8deb280ead21fafb4d7d465878c19c9 SHA512 3b00538d7457a2c807dac9ddbbfcca2e710bc923c02b5ef48810c69ffb80f437306d7cf4883738c85a9118c002e4715c16045387aa87698267255a6a41e95787
-DIST firefox-129.0.1-kab.xpi 612857 BLAKE2B e1826f655870243a973f3054cb79afff27c3f7548035bb5ed7083fcd3bb0dcaaa21e478e7ac7588fa7f4199df76289494ebdbad1d0a1721fc7bd8ef5879bcb3a SHA512 3f822493b40187c1c9609cc985ec79a7e2af062632c7ebf5989d551098f2a6309ed8848cf6c3fe91b2f55b6091b5c1b06538bc002a5463c02b0cf55aa8aaabe6
-DIST firefox-129.0.1-kk.xpi 710252 BLAKE2B f927b7c58b91a8f1ac94f3f0c6e48b8efed8eddc4af3960d69a7fb3d17de1c4540a982e0b9ab5cb4c92c358573b83c0553568ed3be89b3119d3bed4f73dd5483 SHA512 aeb4593085f24e33a39544447e1039ab477041e7b3290b80a68c881cec91ad634c89579fbc9b1b0ca46ad8bf6876ff2c8d31ec64d4e662a7f8e74029f2749bb1
-DIST firefox-129.0.1-km.xpi 528065 BLAKE2B 1b8074b0b870a6a66637d8851422613d95119694bdf525160d155b519a18f85a1b8678a4b3d5e091ff61ff728a9d0cbf90496669ab1af3de5177509512065113 SHA512 cbca71def35d8db1cef6bcf2bbf07397c9767e16f504fe8ac10bc44e2bfd2b80b967c4da74b5b43f08935727429e2bde1da3562025c51c6fe2786659b0cf5d8d
-DIST firefox-129.0.1-kn.xpi 493383 BLAKE2B 341e75a230c26d3ee7623b0b6afbac15b36200d6f919624159600a3394cd8127af8ed77a47310bf895bbed721b00020d8831e05a1315678755bde7b2a328d9e0 SHA512 c7077e2a2c6dbf9bb55dfd10a20b91ab58b9078b8bc8b05ab0511db53e8499a0f4c9bebad0e904af90527b4ec90f10832e582b79579701a240233e53ca365328
-DIST firefox-129.0.1-ko.xpi 663933 BLAKE2B a68c441db4d9e2a1cf84cce9e46283269336282a2bfcc7cc1ebfcbeeabdd6f5ee1557fb624b5dfa8bb7365eec6c1f00874cc67a4745f5721f46d71742f0a1198 SHA512 efb6a11d8f6c19da16e7aca0bd53e3e9e88bb6b77fc45c3089ad52e55a29bb4badb8060da24d8ead1b13df850580b0d7b19f3c1a8eb3fc8ca58b99fd68b58647
-DIST firefox-129.0.1-lij.xpi 486307 BLAKE2B a412bb332132e2805842d9bdc716d9323f732b3ccaeb8e612dd6a4a576dde57768e6cc026477c618d6ea4bf79601cfb0fce909834e4196152efd7aac6765a27b SHA512 1c00d4d12c9958f57dba2c518b1c036b4e0de0beceb622846020f9ee209cb58a4bba9be6d559a76299e4bdf1657baabfbc89e652c59510474ed6afb7b05f00c0
-DIST firefox-129.0.1-lt.xpi 575016 BLAKE2B 352543b71ea1aec10fd127997437f81f07d0b7d55142fddc4da5c8246a860c51e15f2c0953aa65a64a5fb276152cfdc719047e4065ff370d3b52d258f134479d SHA512 2df572bfeddde2fa95572e5c75d5ad64fcbdf0f8b9dd3d3633767c423a1adc00220b5b9445602035c28633d6fa10acf3f3478c645f2f9c5353c8fff4dc90f2db
-DIST firefox-129.0.1-lv.xpi 576564 BLAKE2B d869d4011e9b26c72283be3a7e439efbcd716f3ac7f619d1020711b2a2ca300bf2313d5def1b9666f0e9e14397684f3eaf66c61f49929c9aa1e256eafb257c0c SHA512 c1862f848cda6cc0fa180312baeeeab6c84935b008034c51f7ecdd23b4db1ddc681bd49eff2c5047876078f6255ac39d88005417f2aaff8ac3278e69c8b5f7ca
-DIST firefox-129.0.1-mk.xpi 496012 BLAKE2B 7ca49f40963320653ad8b2600dbf160f15d5bf9a7837a2367643b633840afb278a0d2ac99276e3c888b7d422e1dae26776510f335f7f46250cedc3f022708e90 SHA512 07d0d1a9098b7f586f14a3ba6c17e8f1c54d4e36e25bdb0e8a3c442ed09d450af3c32a7a6a5eaf1681b7d3763b6efcf90d2e166456195b3326a46ef7a8e3104e
-DIST firefox-129.0.1-mr.xpi 534248 BLAKE2B 7e15b0bc6ce1566a2d311f2f761be31d892ddf3d0e00cefd54072352ab887d93ece496ba6c8deea92ced91795731e9e61b8ddf98bf0350629fa86e1104868aa3 SHA512 b33e73c529cbe7c6bb523501962ca41185c873524c1e0b096a94aabff4005120b828cd1a4b0ef9ce9ecafed7c9bd54b2970595c2203c2676daea697ca46f05d4
-DIST firefox-129.0.1-ms.xpi 451897 BLAKE2B a5c0ac2d1d714f51459faa8287d18db33c7938a780b391c1a510c935ec6031838716fb42d842e202354e18f516f2b9dbd9b93870a85bd69b34aa53108c28cd10 SHA512 da2899a70e2ac4beb0d4e73caaa03f58b48c993e47d563812d98c7a1ce580ea871be23aeeeadc2e0075138c9468a21beb4250ad7e8d8b9027cd0b920b5c7316a
-DIST firefox-129.0.1-my.xpi 520803 BLAKE2B cbebb504804e3493d62e43be9d99be2e296ac38c5984d1ef26e4bec1e89bbdef76b0abbc5a1cfa5b07bf6b7c6ed51ab98d984ed79f9c2803ec9841edd66f966e SHA512 06d7414d8973c938392897ae0f9868e8a1997887980403d4bd64e6d1ea9ba10a79478c01f150d70eae8f70b4e27be547335b5ae7a2b40064ec1d58deefdfa702
-DIST firefox-129.0.1-nb-NO.xpi 610252 BLAKE2B 04787e8c149b24d9d0e7f1f70dcbf464b28eec830fe269405f6a14eeade139afd5b1ef1fdb2bf5f561246e0736eac771a5ac35dbdf8f04de2ad863514ccbbc08 SHA512 c172886b13ebbbd9274206beda81013cded10a6d092860b3eb04409d816c73680703f9e1a771bdd54b2f1a59c36c72e640999a4ade7f4685b7ec73da6b66768a
-DIST firefox-129.0.1-ne-NP.xpi 516319 BLAKE2B 2f1c45451c9a7803f478af15d4e04c0868d8d98f7ebc483f863f87acfaebb7759b3f060761fcdbba941b7f4978086d1614ac0cb2a9aae88c83ca56265f619587 SHA512 b635c714cd929b6a83e1a078f2c3ae74ea3c84e036112f40cd33dcecb3812c6a0ea15f5f7c2123a1cb6abf2182df86cf5f1ee5bd14a52e2e5a6b0f502b606704
-DIST firefox-129.0.1-nl.xpi 619714 BLAKE2B f9f09451f35efa1950f4470644b6ad9396e4c073af80c8b10335e82c43c98bafb138defdf4837b21d6c182095492368577b33ae7d60503a3ef17ad2d078dee27 SHA512 a76ebc96607f872224b1876a110e68fd21fa257bd9c7597cfa4f37e9313a022498996f946daffce6b92828ebf235dd129ea0c50b518bc5ab0f41f9ac3c9cb4c1
-DIST firefox-129.0.1-nn-NO.xpi 613167 BLAKE2B 8b306a92cbb8c3359af0d550979598c5416355c12264e26dfc961aeb6d3901290d70aef99e3e49f391dc8b8eb8ae3983a8df32b2abac1810562e3a4428002753 SHA512 f7ed8514fff416a911162d2b749883364b6ad12b4378ef8ba559ae56a14ee3f574961d587bb7396ee6a232c1dda1dcae6228c47aa05c2038b77128deaf40e7df
-DIST firefox-129.0.1-oc.xpi 615147 BLAKE2B 233686ef25b00d5bc552c40f126df33310793abf29504c57a0d42e0a2846636ce55ad2d905bfb16aff3aed2927a750808cb6c12de3982f994f6c63cd3566937b SHA512 abc9b46de5b1837ad5a9c26c9692d013b70aa1f5baf9abaeecefa4ed2b068e857d7bc1f2aaec822551fbe21b59fbea1ae0f5fc2aa14c3fb1d440871d0342fc89
-DIST firefox-129.0.1-pa-IN.xpi 694799 BLAKE2B 8e3a1036a7913942a040caa75472238dcacbdfc1eef6984f750350a2d5af006cc205b3eef8dd5d0033fcf92bdace993d7992a24bfa863d06cc293261632c71eb SHA512 c1ae902b26121ebf17ece0e7766d3d459c621b9c58728e6f8f722ec22b72469d40d2d083ba43cc15b17103a361c43743bf3960faf8c94e351f0542f95498be6c
-DIST firefox-129.0.1-pl.xpi 640500 BLAKE2B 5028addd444102cc3beb15f1fbfcb7a32925fa5104eb1b0a9e125c115c0da77bbf8e26119485ff86fc966b80200a43c925b457e3f0dc0b6492de122ba7ed4cd9 SHA512 4b98a686ae6fa0b48bd7d3b5b8bbd749ab1ab97c91618ad9770de6dad5430ce47a44414b0562778e20ab67fb9847eed4d0db4f040bc3de5815de17d4c0f9f6b2
-DIST firefox-129.0.1-pt-BR.xpi 624480 BLAKE2B 3aedbae07d5b7988b3bc997b8255fceac60a4b884425d7a9ffa9b2edd179f68ba7771c7de1eb88c58058b0d35b5136489a4abdfde0ce54bc8d0f2672cd27153a SHA512 07d4d38b282035c8907e57fb94056f129dad0115de811943e9af68d6b00b91ee9265869547bb386ddc2e45529fb245ee0d113cb3c16165c46fa5a6b69c55b273
-DIST firefox-129.0.1-pt-PT.xpi 630814 BLAKE2B 28fa48ce6e89de74a3cb7e9499089d339023cf86ff2205bb6a2fb9ffa05573199fe7783f8a4ac2a453381a006df782cf18ebcffc4816eb2ebeb32019321333b9 SHA512 9baf8ec72f784768a395148cd216ce6c88d8531063b76def054bb64daab4e0706f1b779da418cd450e8849d543f2f8b1ac527c4a95cc4cd9ec778159fbd35609
-DIST firefox-129.0.1-rm.xpi 620388 BLAKE2B 3feb509d7ece9aafede83d3f92021eac119b8b615b35dd5434a098613241e1f00bf68dceac0a4a8e9e9faec88ea80312392a808e9693325caa8dd8923836849e SHA512 d3d929e1e12885759993b010074a5e57bfbc89adedbaf131d201ceb581b99f82ed92d5b2e932a1091bf82b64b8e5c848c95f50629729edf3c19308b6c9a35e42
-DIST firefox-129.0.1-ro.xpi 552115 BLAKE2B 8358651d9bcda9d9ca044e92f775f0c53f8ea0865e725f67933b8a5283785bdb512c7c10b6d66c65303964b996ed0868bfdf121d8f9bdef7d73d0da3ed89cb0d SHA512 5529b5e04d22940ed9a5cb2dca28f73f0615cc1222d991a00a67c4892ed3cb367d36460827de1911dba371376a68843cda09571f2cbd6706399f39110c448c1e
-DIST firefox-129.0.1-ru.xpi 722859 BLAKE2B 1f84ccc179be0fc91e65cd3567535afa90ec32cf5fd06fc72d900028b7145c01ee3c750a36b25b8b06b3ac23a7f271286432e027a068f7093ea1389b8f057388 SHA512 e18e770d357705d3dc64df02ee7849f04ab211d4326c87e8fff6ce1b5eee0ff7ae1eee8986a661e1bb320e1978c8c2db075c2c20c4d60f210e7668aa2f7178cc
-DIST firefox-129.0.1-sco.xpi 513483 BLAKE2B fbbd3f18175203e2ba014e4b968e6e69d2a8dd7e1cd8ddf7884873ce8b36c0574ac4bbc2307fa64cfffef86b800dace882e34dcdc8b0eb77aa5587dfd5a92884 SHA512 651eab4ae77ca4f1356d59a8a5958e1f10b3d58c5898aeb42d185a7bb729f3f187598343b7e1569943aae9853c1d04d2a92e78e1b9e63cbd47a0252b4d00335b
-DIST firefox-129.0.1-si.xpi 615443 BLAKE2B c4f017139a9cdcd1a7aa512fccd3a31646d5b5c19123368860b2d70157d98ddc72d2a1c353c23cd5c79a5e9e63f84726b7263efb67e4c864a3796f7f4cae8284 SHA512 0361a5d19c8a0fea509218ccd2764594b09c7e0837a57d8e10d21acec29056fe19de5f41f43963c07f6a8c0dc21d3f0676765e5874301b8a2c58fa8bbe0b960f
-DIST firefox-129.0.1-sk.xpi 654954 BLAKE2B ead6474886f1b1de2120a131ee0d4233e831d4d5328fed2aceecf6c741197a904dcb0b7e4e9e714ad1302a68065eb6fa021d1bba3ec0f44c2a4e444f2ef78fa4 SHA512 302b46ba67ea06381a25ed107978d3e186da204f2dc6736d858b7f7b49f4d17e00da57b6fa53756961e7e3aaa2258bac0a55ef522c1029e23f79fd3899abe261
-DIST firefox-129.0.1-skr.xpi 710323 BLAKE2B 75e9796f333f8bada8cd74858a1934177e68e0d0e8b0c1ec7c264372bc197726e2a877e1be40d4fdba5f4c186a360e62e2e599801f946ed5be129b05afc3c33e SHA512 6b808e3fa16d5350d6a3b5684041c489183db5a543cfd799e88b2d2e55e98b867aa93cc18091715e356cc8335396d2c07d8994f333381acf4d7d63e06c529fca
-DIST firefox-129.0.1-sl.xpi 619635 BLAKE2B 42b431b7e1baf3a53c2612f965832b43063f6ead342de9259f0a4e8a922bb2555135266027e858616477f580c08b4ba3e7948fd6d0fa90f4627aa0aabdc49cf8 SHA512 9bd20e0a7fb66c00693c14612405ac1647b9a2bdda0056d444d7ffbd240c73890edb1ab16464ea0e33bafb242bc5ae005c78d9c1f7cfc23d7715435cd3ee166a
-DIST firefox-129.0.1-son.xpi 418559 BLAKE2B fa9cd55cb6fa0ac7c784aba1612446e1b202b82c61a21e97c53b0f38f3ca6b773cadb849d625561f72f2f9343fa06744baf6cf599e62e53365eecb2c90942908 SHA512 16a6308fe84a70b9a0d80fdfcb81aca0a089aa6ec633389eafc9ee52fc88db084bf6622fab12778e0a7f60c5f38ad02f9aad2f1d12e1862387b2fa9c937c25c4
-DIST firefox-129.0.1-sq.xpi 639105 BLAKE2B 03b4398710c0f2125456c5c3845d53666954b9d61f498f1019319467000af62859b0ddef3f5296e9b57103568165e5ef1f07268fcb549356ad6370c48bd38def SHA512 09fb629a3f3bd294c497b71d8d87b6817fd5a5dadff04f5e4b284693c0cced78bbdfa335ee0e4f38ffe18c96448e4411a19ce32393fd47ae46311a11675f9360
-DIST firefox-129.0.1-sr.xpi 641682 BLAKE2B 0a4e2407a1cdb527921bf4d76bf2d2b7495ca7cb0ef29aaeef7dcb4588ca5a92b782f786b202e08f85750604ca3efa75210a47ca4d2a5885824d3a92bc51ab83 SHA512 a89fae23ef52b44d88ae17d23458cf07705e17906e8cab955985dd8b6e80ff05539c86141ec495ac44099f25963fdfe40705e483f43299bdf3d2f55f84eeeca4
-DIST firefox-129.0.1-sv-SE.xpi 621422 BLAKE2B 8fcc866c3b2dc29230b78854185350dfbab0a0e977b788e56a86f2307718b3ded9e550e7eaadcf93d0a562068d7613ebed017a99f0ee4a82511979ab3c339d7b SHA512 2635c84bde494f13a8fed0ae461bfa727e671b6f97e243fb88846e30dbe2d4891a1421ecb9e1f152fd111373003b249a25a53f690394f51ba0556ae972d0ccd3
-DIST firefox-129.0.1-ta.xpi 509681 BLAKE2B bce4f91dc8583dfc1eb2f1e4fbbaaae79a2fc27468f52dd6928eb0ebc2c22c121b63bfdf6f434ba9755d601beee0aed579e6a82044bc013c6f24c3c7b4645eae SHA512 996423a58f5b34b8b5f8a9f96af268734e67b5f94c9dd93071a3e1f9f75b563067494ff2b31905ba2ebf093ec1be87ad36b0628513872c1613577c91637de97f
-DIST firefox-129.0.1-te.xpi 563252 BLAKE2B a95d7efaed3d917c5ad1dc429965cfccfdb7c02a169257bd228a47e97d7caf1b83e0e8e5365f5ad6d4a98c46a1185e51719464195f2d79af9fd8e3d6afd979e8 SHA512 6dd2de9e1971e194537af147cdbb9528ce78282923154f371112933f9e4f91029fbfeac74e365445af516602f3e3a8a520c6b6885e07e88c152c7aeefa38559a
-DIST firefox-129.0.1-th.xpi 700412 BLAKE2B d2832b0e8610a5eb774186fd3f99e4904107f7c8dbbb62608530a9ac2e0924d07882a29cd346a3cdb67aa67cb1aa9a9e2f260280013126ed131e09cbd4a86d89 SHA512 d9b047bdb56e8c38a18ca0a8cd95d1881177560dfa838867ec0c2822d52296f10cdf090b0d522e11942f52c57816e6c85780a5bedde89430453bff8469b1d3f6
-DIST firefox-129.0.1-tl.xpi 536471 BLAKE2B 520a3a743665621e05606be0de18a6360e167f447fdf83d3271fcd034059188650321ad464fb4cda0f92260c5b25ed9d9dd068c66e744d6e16b63d5ab79849ae SHA512 c8b512d526d22719cde9cca3e9efdf28e0ac810a6c74dc8ef164cb45d95e3a53a44f5671391462e0a19243898c312e0f83064a0e9f317895e3c9ddb3e3945c7e
-DIST firefox-129.0.1-tr.xpi 634864 BLAKE2B 8fe509b61b32e57a483e01b39a303a87e6555a3fcce70f6ba19834499e82c5cbcbe1e308257b1d5459e915207940c4c5ab4bdc243a5bfac0e4197933865c43cd SHA512 e7f01acaa34d43cc3a770bab2afa0b3fd76c35041216721871bb72fd317b26df40d88693afcb5921fac5b311095bfb840426c09fdac1c53981054f82cb0ee8c5
-DIST firefox-129.0.1-trs.xpi 506182 BLAKE2B 1031164022990dca404c6ab5199c94c5bc730810c499b0a332ac5e4a1e411b97f7e531958f9b0448ac755d830dddfe7ce093cf97517dc18bbf9ba084a1fd8a10 SHA512 d690bcba7abc1a49c0ab7525e91637737aacb7f548760b7517b7f871179deee254aafcfe658d09ad25d3f8166f1cc8b01caf28de69da453694b7392a6009d597
-DIST firefox-129.0.1-uk.xpi 709787 BLAKE2B c6e06569b6bceb41ddb9da28c722d2a542549d3a227740e73d3a6fdee8bee3519dbb45d854b19d3488a193c59c6f90428ca5f573620c294097c968fd88b6336c SHA512 ac556723aeb270678b1cc5a6ab0f5288a0a25069c3e1f356ea37db0f1b176d28e08febf01b603bbdf81e41b9628069f36aea5deabdd91bbd76ad6531301c17b7
-DIST firefox-129.0.1-ur.xpi 562718 BLAKE2B e3dd2b0bf06e060faea6dab6ba5b89a5f841b946d0637a5603269eb31b39f00352f754acad3609eae4b244d94ec717a3e9b6750ba71fd30508f0cf301b2f3623 SHA512 c18af11fa0a748944131f586770f07820c2da9196bb7abf437dc2ccf8ac2d3877adbc7bd7c53ae09acc461f75f3cd3aad30bf95b2849cf47ba749f0e9deeb0f0
-DIST firefox-129.0.1-uz.xpi 480950 BLAKE2B d4f217f97b1562f3ac371ff0631219659b3dc32851ebbc7960f4645f23b25b341577b53d6731f713f44a95e45954c03edb7c05e1e9087324d8f5b0f4f94b8fe7 SHA512 85a3a2595a3244afb07ec3e4e5b57174d9ba70d0ad3b8c527077d8de2c5fc86ff3d996231b5bdd57793c45e4533bf982391a93b18ac5761fedf6a57be4d9defc
-DIST firefox-129.0.1-vi.xpi 658029 BLAKE2B 953ff69fc4a9020458b49c0a016957af071105896f571643352a87afaf52c6a533c4d6e8755a1d2ae36bd29bfaf19d9bb52516b083835ad2cfcb2ca144447cd3 SHA512 58619cc0786203e5c9eaf78ce4ef90093de43fe77c13b0bdaf8c96778c24bec70b8576773d9a6db1fec8cd62bb78f13c5d563029140b50c0b8ba30807217f56e
-DIST firefox-129.0.1-xh.xpi 419344 BLAKE2B 882dfe172ee101d73e8f1d4766721ebb9bd9c50ebb2e8a20f395368b9bb170406d8e775e3e3ac754e8d7fa7610f1a2a2114a11b2e22b7c6c7d3633927503a075 SHA512 481c749e6a53a0eff4ff0cefb47d1b5025b3c4e41cc0bcba5a15222343d2adfb1788ad24e38c1f85c6d7827d8a7db6f0b4e103875e19fd8245f59aa753c397fd
-DIST firefox-129.0.1-zh-CN.xpi 659746 BLAKE2B 5dae54b24daa3bf7edc91cd5f1c06522a148312f9e9e79926464743dfb6d83ac940b6dc72c0ac7261b79da9b92af0f3b534b12f0c36e2631268e80592691ac8d SHA512 7c621834110cdf41a05c8712f5c3621d77667670d45f0916ab249e4cf64b60db25764161427968bb2ada9aa66d1632b4542c272faa1555166794aa44a973a0d9
-DIST firefox-129.0.1-zh-TW.xpi 661607 BLAKE2B 7b1132f1472ba56fa5ad8b090da4d275dd6aa6e00ad2c26dbac42ae2beac1209cb70d79232dd9aa2991bede17f71967d4bac48064757120f53c473d7b2546a35 SHA512 f7232e3d7995c8eafc3ad260d2207788eba67221383bfa1c8c62641957d884bd9fde4a139ae3349cd74ef6c3d7b8a51847e45164cc6fbc9f9d24b7dbfc236f03
-DIST firefox-bin_i686-115.14.0.tar.bz2 84336448 BLAKE2B 058c54bf8e6316a656b0428556208312fc25d57b94e00cb051008952a46f49fbc0751f6faa5926f51d0f58f2006ddbd5650e3530413a9dfb70691476c704a1ca SHA512 6d95e60ac3a6c92d3c5ed03cec1d8b0c55336f012b69cf213de95b7d34825e4ad98387b9c44bc426292a5070e3860b68bbf14fc47d3e41914defa1583bdc33e9
-DIST firefox-bin_i686-128.1.0.tar.bz2 87864851 BLAKE2B 0702cdbba3f536c8cc7fd5b81ec86dbcde5eb4c821d8414ed7bd88ca1721f4a3c360dca1f57f5676e6f9a6838a72b61e572d3f69d9b8806aa0007fb621fecf22 SHA512 898b36e1032d0489414f58759e409dd07cf66741d1843496510d8015eaa63814d8019c38c4a4c49890273f3eca92444a12c5f093aa1069e63180a8fe5c76a5ce
-DIST firefox-bin_i686-129.0.1.tar.bz2 87992887 BLAKE2B 704d7fc3607493b1614c0d2d60d27bc0ce5708d462685481dcaba58b67834643a7b53402a0043d5b32a79f07e577540fa3c0a1b1e394a310ff6770dff57518fe SHA512 eeb9c0fc6f1af1157f6b87bf9bd16617260246eb9cc10ba436b57759b699bb72764ebee8de68e83e022c6aabdf791a722516859790a5e30fa63c9ad3e163f129
-DIST firefox-bin_x86_64-115.14.0.tar.bz2 80351439 BLAKE2B b9e754c3596f817e7fecadaa3dc63f9d70f3cc002ce34b32b5f987df772725da92394fa1550dd4b0ca218f90b6b68cdb3d0526ce891e12a1434d5cd314bfa668 SHA512 7b8ea7996fb7c77207959754d06782b20216caeba90f011b52cac419b8c214c83d976f57c38bc32fe0e191b31a268dbc39c4d3b46d46949f16302828717c8962
-DIST firefox-bin_x86_64-128.1.0.tar.bz2 86719574 BLAKE2B 619c4b9cf9442fa41c8ea89dbce0eb831305eebfb169a6fd071450231cf714cb465679e3be47b6214aa911557d9e4d7b57d8bffb4923e78bdca767b74af06f48 SHA512 5034dc635b99b6d5f98d5c1fa77408173ba4ba3103563439d9d94c964526d13f24f6838f8bb679336b311fe8307689829980a9a594f644039532f20a046ea606
-DIST firefox-bin_x86_64-129.0.1.tar.bz2 86856470 BLAKE2B 0b0633233eeb8848493c52dbe380cc48b7a8b1b066dadac4b55d9b8145038f93522e61c9d322bddcd82621b8eb9d945b526dda2793818a073db07ea44b96dbce SHA512 190fbd233891223d480b7e32e0ca37eda1ff1de93c5bc4d50aa02fa9df8041533792571b4f39a9575dcf1c562ddec59ebd54339be480b6106d9f692ffc59fdb6
+DIST firefox-115.15.0esr-ach.xpi 459032 BLAKE2B 13e159c7270e5a220054444107568fd1f91e13abbc16ba00f2bf6acdddf5b8cf138fea437f2f115a2fd47bfdb5b4b461e8d69b0055402f2a2246afd15da165ec SHA512 2dfbd17fe8069ccbcb79bfe4d777cefd99d170aa692776373f3d89d79d97369df04158f338c4dcd1811c87432b10d2d89ab2854840ee4585008e7931ed4090c1
+DIST firefox-115.15.0esr-af.xpi 415184 BLAKE2B 6a6b02bdaed92601de9b04f45fd8b375dcf30719d4a911f03cb56bb75d7a1ee63f8e96955bbd3c24a8c28ee3f67fe138225cd229a7f393888fb4d314d8a7c0d9 SHA512 fcf0974406aadaa7ac26415071c19f413a4cc8617f8db9812ba72d18493e4165f1071918067054b6c8f9bb16709884d1711c964adf6ce8586e7568e074043325
+DIST firefox-115.15.0esr-an.xpi 499567 BLAKE2B bd5f21f0b62d3f27eb9515c90f10ff2455c410661ff7d0cad205dc5fe85bd5ad57a02661e18fab4e843f7021ccb1a1e3e14916eea752ce3445f6d9996ff1fa04 SHA512 239c2a53a27250c28a9719088f166c1d5f265d096bba37f63cada8ad60b33a9aa41fecb57c68b2b6c0805c8d1cdde4dc07babf43f116cd1a0ec0c4eb68b4d3fa
+DIST firefox-115.15.0esr-ar.xpi 606286 BLAKE2B 6efb4de8944e9fbcc38917534d6c5cb7d730d16fa0ff4d02d0fc97e2e7dbd21bfc8b3f87450bc393b181feba4e35dab2f928594ee95efe813760597092c07ae0 SHA512 3294354361ae59ecf9bbc668e6e10dfa9d0c1d37579e271341cce02017a9c8fd6a864fa2f0208382719199049537f7b05d6aefe9a71ef952edef15e96b632528
+DIST firefox-115.15.0esr-ast.xpi 491345 BLAKE2B d122be5c30720e63f3e1b304f0e2d439783478353d4a7a02a7f2678a4740eb860467a90c4cb8be92cf644308af0abb3115bb86deec82e5139f37ec03d2f8b5a9 SHA512 d352c7a25bd428a02f6909a3cdab24131ababd12b6e8d0697c2c838b86919123f6e70b4056e7eeed70fe84c5bd604546c86110dd47cb08abebc0a0d198b18b44
+DIST firefox-115.15.0esr-az.xpi 486087 BLAKE2B 4e8970966673b49e81ed8316c1b605a73c6981f0047dfbf252129877c607ab21a57d1e020416e84b5a2dad7063416d3b49d948b9206b09dc87cccbf486714199 SHA512 d4c7ba927cf036e90f6dd5b420a8e1245fa9508c8ad82df438c10b334f13ade77a1b0ff7350b6b0504af0a8a6af5a3b8e141974f20f7a20695026f7c2e57e22e
+DIST firefox-115.15.0esr-be.xpi 715649 BLAKE2B 8d88effde67725519870d237865de84a5cd282895e949f68e261068f88e16c8d4c87514df09a7d573bcd5ca7dc896a44e8a824e8924d85c514b37b9f38ca3fa0 SHA512 5fa6e1bd429d6d430fe3feeb79a19c1f60257677f9a1036a31deaa772ddb70b5d09d23d6b88257dcdd68f27c685cfd5741fd252b2e5c13f05073604571a00747
+DIST firefox-115.15.0esr-bg.xpi 600392 BLAKE2B 15c6a5ea2b953a6d2e06754422e773d07177ed6ed9f3985bec6bcb9f40885054b423e50d1bc1371b63f120d5fa6c644cbdf2e32c38c150d6dd1aa67a61c26b24 SHA512 a0de80f4cef8f3b8ae19b5ea47e17433e81b6910ea537bccecbfe18c521c1df0f1ccd4e0cf0fd2c533e0013ac989d9e31e90d7ed7fbabbe22c9c56e20b9fc996
+DIST firefox-115.15.0esr-bn.xpi 576362 BLAKE2B a70a8daf6e486ce2b32b3c00d307dc93ce92c511abfe9088b1124fb9a0f99ad22923a188fc357264c3c2d8bc4ae01cf1e6a7966020a565b2469be41eea09c17a SHA512 3e8770a8bdaca4d12f1534f5436eef77f191aa1275c236c49732f76f4e39e5753ceadbeef25a2658d34446301948469939236bcb10ce59e89ae6ebf104d12174
+DIST firefox-115.15.0esr-br.xpi 585005 BLAKE2B df78592aa869ecba8831a5d323f33a039ab07b6cbc656ca73aa27d00045cb7c8fe82ad23e82e6203d50c2c0f3d413b56dc9d58c2d206ffd9db4a55f9c8eb4c5f SHA512 041b6abec3800a133f99283088569a70beb52daaa31a94912729e44164f6e97089aad5fb9db3f514e5383eb8c6c2e26e2ad39e3024cf9112c68f856f6ad4fcec
+DIST firefox-115.15.0esr-bs.xpi 496786 BLAKE2B 523391d255436a8c804a6deb51be0247d2e40cd661f8e4781c90dccaa656020de25588ac943113509e0667f5757687ae05f719c66b104f0d824dc328bdb2d382 SHA512 12b02b42e016b7358af0e7ea21f1ee726d92d072368480d7f425bcdc1adc96e18cdfb350386abd4da2cf7492cc0ab21eb5ff21811d262b4b952ada585fdf3934
+DIST firefox-115.15.0esr-ca-valencia.xpi 539254 BLAKE2B cac2338038d1e7cf25002af7c40eba556ef0c4ca7b7107581974828f2aaf5c2d5bd3230d00daa36586ae831f5b8217d4e75c2aa163e91740f04242c6201e13b6 SHA512 db509d27b7f83f135043afcd1c08f6a5af748a4819c71086e061d357d0116b148ae42de7db8b2060c3e213686a7e18cee11d4d9cfcd601143f8fa07cfcc69a4c
+DIST firefox-115.15.0esr-ca.xpi 591046 BLAKE2B cbd35d4419d2b50dda8a4baa5e3abb852e81681d96ed74ae974c20809c2353ac17f88b3662800ff9328188abafafcdd6aa39e9bd41b579cf296d1ae9bfba811b SHA512 8c634dcaece23fdd5db497f5bf9c52afaa34928323d01df8421acb01685f1e1bc845e4f293133cbd3de6cb07697e341d387b7e25c6e04cff34e3e36ed738cda6
+DIST firefox-115.15.0esr-cak.xpi 586723 BLAKE2B 5102347faad6a52de90c457310fa9277ad403ae56f0e23f2e89d1fc32f315bfbaae0baf9d0f1290f930ffda28c0d4acaf14ca04ff13f3af5c4fe1e3cbf272089 SHA512 0cdaeaf8e54b82eb42f300a60609a787a470f2f2205e912fdecd76dbad8e8150c4b95435591db8f528c7bfbfbf238216685ab007d37409ee78a4d9574de24823
+DIST firefox-115.15.0esr-cs.xpi 659583 BLAKE2B ceca94afd0dda46148ecfdee17ef37e8a6dfb50ea133319b835c3f09bea3b2c6c4fa9747df31371d0f7ecc7749e4f89508ead5291e763de761a39c7b08940cea SHA512 569b69f8544596bcf1edd503eb35d5d86d2679c1b43b883a2d2ed2f489505610b27f0f825839a9f956dded11ba036cdcc566388120cdb6c3a3acbb0b3ffec2ad
+DIST firefox-115.15.0esr-cy.xpi 622581 BLAKE2B a475ff2b9d7c2661edad4434d9a7d54c684b0be2800609decab9ed1da344abe627132bba450fccc3feb0865959333fbdc2c8162ecd97d1c5fa4c203881ae86d1 SHA512 05072d816323c4618a913ec75d34f4250e1ec01ebe74651abbf8db40e2518ed4b87c8db3b8955ed05c8d95b8280ccd0bbfa7c3435940c105a938bcad581a095a
+DIST firefox-115.15.0esr-da.xpi 611176 BLAKE2B 0b688f6dc7fe68bc427594711f6deee99e6340908eed43cf010849aaab8f63d8e5837506885b5cf63fa472853523ffd60d215193d9954af037aaee8806ed8421 SHA512 6414dc38090b94d146577069a46e1e50dee7cdf9ddbc0f3ffa7dd17e7ce4bb29454456335b16018ad1824c404c4373952fd79fe7c83dd1c90cc7f86696905302
+DIST firefox-115.15.0esr-de.xpi 632366 BLAKE2B 4c62439e65195152ada44ac7bf37d7a6a294d262f6e2e0b389355e0e7c16fa435361e1974734a2fb082bc0df9ed827c795c9c98657164385ab0f9d10b828f637 SHA512 fdbcac24c9039d54eae64f1d2e7a2ca935a6f38ac850b542da81c556d56cd3581adb0e750b688af3d02e9b4fd37a449959b1379fe6b44b53ef9952bac4bf0d7b
+DIST firefox-115.15.0esr-dsb.xpi 651468 BLAKE2B 21415a574071e180a2070484b1265f8e99979ac6be38ef8c52d7a116030c483be258b7461bafaf11a500b89dc4a61e80bf896b205cc965cb0df7a37908c0d8e2 SHA512 a82e2071c292c0eca7d6fc31846024c1818c5455b6ec943b5b2af02d38e47514032d41fc5b47b9c4d7fe3a7300521594c1892598c64768e24e0c727deb79106f
+DIST firefox-115.15.0esr-el.xpi 734619 BLAKE2B d67b2ddf4925a02309322efd492e9c3a8275b381af54bb086c53ee6ba1393746bb6dd841ed46c098dcc785c153f32bace49b65a707ca512fec47deb8ee1fb3fc SHA512 56e9372ac8b197b09cc52ba4b3d9648ef883e3b1e3eb8f9af6350ab54e35a0cc24acde5cc9b86e8aced3504dbd1f20eab8c7ddbe66472a3561faf921a44d21ec
+DIST firefox-115.15.0esr-en-CA.xpi 584134 BLAKE2B bccf63a2abf8cb870fe3ece525d147875cb7a1d6ab558588a0e1ae3dadfacc73ae08f2f72505b5843667b01d6d50938a171e2581671f214177608fefefccab0a SHA512 1329e72c56b9682dcbcfa22b792721e73bd0b7a81c03707d22e46d60d4ffedf89ce476684c755f31e41a02ff9d33934e0b65b3f8e83ed034fa55ff0c949f80a9
+DIST firefox-115.15.0esr-en-GB.xpi 585201 BLAKE2B 34b84adbb89734c2a885a425eda97ca7cf76a9ca92a8918b92a737bad5b62d6f2569327c2e0e514eccbac9fc76d429561834240be6bf990adaf443b19c77f35a SHA512 a7d22b9eadec2db2031caf88ee2f7e7d2ad345201abaa5a1258123a933a03ddf8a7eaea264c193d5d35257a73692ccc94a42302eec7197d9ddf8b61b614a0a15
+DIST firefox-115.15.0esr-eo.xpi 613407 BLAKE2B be8a680854b28c13a06da259d37a2d42d86b60fa57f4e34a8e7a635e0e58aef8776fac40499ec11cb9355fb22dda206b391ea960d52d00975c399aa332585abd SHA512 2c41e17c7e92c0f199d3060895e5229c7a56fa9e124fd1ae3ebf1f9ebf520c236deaa326c55660a5a2af2214f7a844e7e71ea8389d1a8e27d813d5c76c5aceb2
+DIST firefox-115.15.0esr-es-AR.xpi 628385 BLAKE2B c0c72aff83e26d4e7692b82907bc489b85247af6a7904c7ed4b24adc2d6914db3e0760574e1d36665a3abb7d3e6521b5844a22bb19dbf3cead9b89f55ade0c76 SHA512 66e342aea251e5a0db36859254079b9924f6dd1471c10c79de7934761b9659bae0c1a46c018d9dce41d6dcb8f9bacced265bd08d04eb07db565111dd7e248652
+DIST firefox-115.15.0esr-es-CL.xpi 627698 BLAKE2B ea4fe1370700c812cfdd7d5098477a125fbde4e04ce5321907e0724257d0056cbe4993fb5253d78396448257d1a5e759ed0a3f4cf79f864ea329961396526ec8 SHA512 6454a73cc45de6ca891c42c11caca2ba961b18f0b1a521f2f0b35c2c9e102c62ae53996f8aca59feda0bb80b12f42d5df917e8b08942c4822853af6b4c54287c
+DIST firefox-115.15.0esr-es-ES.xpi 621481 BLAKE2B 7cee3a0980a8fb4c8f439c16935eb465792d3b6171305354bd5f526547e597dc5ecd95e3b25d6b906f81aae8a29b8cd22e3888994b2e51c3507270a3b2fe8ce0 SHA512 54b9db8ffa66a2ce2810ce6d2a93d8ea8b21bdc418e802f66ad4e3e4359fabd89b62bbbeb6dbbbbac89526e051d329453900b0da5def7d881fc444053006457f
+DIST firefox-115.15.0esr-es-MX.xpi 597929 BLAKE2B e464dc013dee0e9774d9bf9e206312d1f0b050bb83409e34bd498fd79e0314081a111c5da46b0674a98300372c197cad70d6a4993291e10d911cc1ec29d1f836 SHA512 3d5c3781f224735303e253885ebcf0821b3bf3a59794eb019f9b611af11f8632ded45843a6e8dd66631619e23db1895b45f051166ae42101c6ea6004cb1d19ea
+DIST firefox-115.15.0esr-et.xpi 533023 BLAKE2B 18abe9f4a96bf37d17d6274b658890aaa24193a34d0ca2d9b17e81059b6cafa34f72680cd45477d46f3a5aaa3b20c84394e755c9668d8e716381460a83610823 SHA512 f3353090f7e4eb43cf4de7c83c562f501acb92be643e4631053243bfaf8d52945ed9a2cf313a9218b31f1d1c86e62ac2f6be0828009dffb004064269541fc5f2
+DIST firefox-115.15.0esr-eu.xpi 594650 BLAKE2B 5b6ebbb75cb6b297c5d469010f0f4bab7a18bb2dc96c0893535ea4737d98552a59e1b585cdf071749c1d9b4b282e0d9214fe9729a6f1d17e18060faf4952fd16 SHA512 6824bc9601da77016e8df2350c932dfafaf45949a1aaef9517e2e61df0f714ad75a2b84640c5b47803cd39e16dedda5cba0edfd01318ee51204ba1b7fc8fa825
+DIST firefox-115.15.0esr-fa.xpi 584362 BLAKE2B 22f30ddc9a4e0603b6081724d4eb5841b6089be5244ef3ecd22e1b9f36a31bbb08479dac88876ec5bafc32196041e75b641074551f07ab9e5f5e665000066643 SHA512 f53fa0ff18a4251f32fbddb5b518d87378f47398dddbb43ada7aed105ca41a8b76b35ef99e56d76ce4692b0b2ef4db89207ee0f2d69dd6b611d0fb9de4ba160c
+DIST firefox-115.15.0esr-ff.xpi 471727 BLAKE2B faa9b69ddd9288255dfb37f0478ab586461941e7815522c24a22721b5231437e81f120b0cc5d8e5507202366e477372c104af41df95235b2bf295599bf6461df SHA512 04014b752a72c00562b1a3c84c78afb9f432d179e0ea64fc6bb2d3d014398ac9ca3f1c8fafec88a68f866e4dee8d367d238b8d7a0cee9f68cae2dc77600d792b
+DIST firefox-115.15.0esr-fi.xpi 604629 BLAKE2B 8eff22d2ce866b2fdba1e36db28e100e6bea35cb3f193fc9f35072da50864674f8035984e272c5e67c3778e8acc89b6ba932fd7aef77c5e6a37f6003cb40879b SHA512 999ad990795f496333e59c06e7a6358336cfbd32bd2b484896690a90a44e3ff5484dea392d8224b7eb941a2f2740014038da231131c4cc4807eee04702f5982f
+DIST firefox-115.15.0esr-fr.xpi 640836 BLAKE2B d4cb841f4c7215f63fee694cc946e6e9a97f8b062b6c1ce594402d021001e070d084344e7f139b75f8cedfda5deb08a5aef6767bd1d4bbb5dcd61d2ab292a59e SHA512 3baaa8345b7475e257a383f93c661f9e4ba4196e337ccfa26993a016c47e1018e3ab0ae41f6ac007c8e1e066b75d7ee84e5d0932b9dae7a29dcf9a882582cacf
+DIST firefox-115.15.0esr-fy-NL.xpi 624085 BLAKE2B 485e980142784898340b00a4ef66dcb0951d90c2e169c4bcf35973b596a8b7a158aab9594b102364c448a62d1113ea70c94d5c3555908e3b351eb3a36546c3fb SHA512 d5cfcc02ac0e1ab9b0a53f9d982699e2f0824424cc9ac788cd051a8b99019a200e99a772e59b22efb5060ffc6528adde707822c8b8177661eb55415075e8b153
+DIST firefox-115.15.0esr-ga-IE.xpi 467645 BLAKE2B ba664e34687ad47cb3559f9acf2ff04dcb9e27c2d6c7ee98bc643a6acec0272148963dfcddbfce3a448fca5f7b247dc3ed9a38034d8fcdbf59aa343c03fcc6e6 SHA512 4f619ec5e10ad703e4ee588c5fbcc31bc8bf2db3f3b5fedf4c5d7564d26dc03258a6bca5e1bfdd278c553de4e71908849ef0353eab2f54d6687f5b90d0809bce
+DIST firefox-115.15.0esr-gd.xpi 589971 BLAKE2B 9647b6a16f7265c6abcf637e94b5b123d395359821e18becadce6b5f7f5ddffaf8c55203036c5867394016a4cad1472b7de8b23308a1359f9577e62f5fedcd4d SHA512 69f87f54034d5c0f9f2426646640dd256f3f247844d475e556832ea3ef4b262643c73c332bd10d17203c8c5664aa6138d1977633d7d7630664f99160a922b087
+DIST firefox-115.15.0esr-gl.xpi 599983 BLAKE2B dce7bbe068b9d38a94eea85b740d7ccc1e0ba1538b48b2a6e8e8cdcf0fc5b51d30df4a6aba816a17319c8e54d092521f8e4bb51136cb7e3362cb776d7f5e2922 SHA512 f2d82b7793025b716088b7136cecdd2defe0c6d2d2917a28bef9906498b0b67334832da44bf5ba53b2ae36daa4ed31da891c6d0af97d8e7ac759afc4d8eab426
+DIST firefox-115.15.0esr-gn.xpi 637897 BLAKE2B 6b31a8777b61374a1450999f7c9340aaf32dcbbe9c1d30a0edfe697acea067bf341e994f3b20a999bbc811d8014c4a9ea7fceefae3792f2ee7c8e3adfab18000 SHA512 095c6b0d4263aebbfe807e9673a38b9e6ce156a94ece2d3a5df6b6499c58dca330c473c74fa5b579933bab25a97786922fecfb44bb0e663ec04494b60d0dac51
+DIST firefox-115.15.0esr-gu-IN.xpi 523385 BLAKE2B 60db6daf819def79516795c658cab7ec3fcb2606f564d604f591526689a6c68aab5f8ba461a728c0fd897a9e9db84334ea0b0f8ab798a256943a37c694af845e SHA512 1b473084986976fdb38621be58eebcfd3dda968b3cbe0954a0ce4a39072353eab3d8a8849ef4b44670c31fb123b2e0467335c09f0ea8d01b4d240fa6eb710891
+DIST firefox-115.15.0esr-he.xpi 629098 BLAKE2B 288312dd1492a5ea47ece438608e551ddc6fd82c2940255dbdb51296650326da2ab5fe0e5471be1a99a25bef138665b6324f47f3f1e759ff35ca407ce48d9814 SHA512 f9d2000b6f2dd94436529403e5ec263c0e15ccbcf203a561798f127cb92a09ebacf66976b22ee5d0e2f6cb1022ba35b0b7d05836947b1100a7766147b2f4a63f
+DIST firefox-115.15.0esr-hi-IN.xpi 561258 BLAKE2B f7be2296af26cf47b6c5dd6237251394685df9ccb5b7c1a493792b8d02049dab3b6526ab2c7427f6d6272d6baaf5d2bc6eaa9c359c2709ae5c9e48fad8eecd36 SHA512 0413323503fd8b09fdadf51c81973ad58c6a3ed0169ba20f521be2f02e3a24bcf48315711a4f60166f30c927de515eb660603dadf7e7500436a4b835e2225e91
+DIST firefox-115.15.0esr-hr.xpi 554546 BLAKE2B 334a747409c184e1d1270417f04c18657c48a97eff4ed3c26f213f3783b2e72f97aab6f600327c179da4feb8ef68bdd7bf8bccdd4675246e38aaeeef2eac5eea SHA512 b9e75a8005d4bd5f5d91af647bc46d4f910a70d83c7b03a83f1b5c94ac7918ad85d568f048fc53db5c2b402644c269f6427ed014d9b835fa0243ad24d8c97d86
+DIST firefox-115.15.0esr-hsb.xpi 647509 BLAKE2B 88f530c52e9bf0648cb91b6e3ef1585b839c5fd9782b0445fb0f557167ddbac72121c6ff1d3b043dfd02080b30ee29e7f55b9bd19ffed985e843b243fc89c5b2 SHA512 2aaf10dd94aab86725153024558e83c043c5413fc2ced708e30c8a0a8823fe56b9a862802695b626a3d4a4265dd759e6291e2abe9aca2d89fc83b9a461d70040
+DIST firefox-115.15.0esr-hu.xpi 649863 BLAKE2B 00785799173237656cfeaea8c747c2a3b506f2c2a657073d4eb7da682fc084b2ea8b12cf5f833fbcddc0f4a7c815712128d8858acfec31dd1d218725eb96ef07 SHA512 1e243c6e466d2c68c253006382105c0bebe53b57a1904ce81b0d51b7be5f4b8c388ac7c44932de8f702cae61096361b61c5853dcaa5dc587ebb98d4938d83213
+DIST firefox-115.15.0esr-hy-AM.xpi 647653 BLAKE2B 5eef383a89734b582751d1a690cc1828263d83f0bf3f517204362ead6c30dd5a2f2cbe7bfbd072d70e2be7d9da5d01e1beee76ccad23c46740427ac9f78741dc SHA512 4384dba6db54fc6d03cdaf91b81484cd09a0feeac7f770f85c6df23990493a47608f355640203b22d24731f046e9e7f82a037f7ba3a11a0e873b1fa5ffc4a3c7
+DIST firefox-115.15.0esr-ia.xpi 610846 BLAKE2B 7d3bfa4c9c9365fe8b55f2e958a960ce85351487122d7892e2ed0fdbd3f1bd082274f47f7d92db1437101baae2eca38c8533a1627ca6d669ddb19c39b96959e1 SHA512 5aacbf68d32b127c605461c0e9d5846e7ada85d6232eb91822b0814ebc2141c6d55c5d250d8968a5bc7620fb18e9d5eacd2e278908d17a47e34f4cb0d8145f4e
+DIST firefox-115.15.0esr-id.xpi 573434 BLAKE2B 0625ff93599c33ab92bd7bbdfde4d92de3e4c5f0d82b3fa12a75a5c820913b9457312ae416fc3fd30ad10c491ac8d202bebaf414dd04756f8efe64cb91bb931a SHA512 18b0660cdf8662229be776bd61c906cc747f143e83a2b713c9364463e066ce718b995d3bdef9bdc212de5b9e277dcd1bf8c5506c6493448faac8667d7de4435c
+DIST firefox-115.15.0esr-is.xpi 611651 BLAKE2B 281f87160d7a72f85ca9ae14b559b634327c9027e40385416a9755d20dcded9ecb26f5fd8d2248af6768bc7c50ddd372f32811f46d4aaff96db3a1c2c6cef3ff SHA512 ae9392dcbb734c2b8ee17a1de03cefb717e236210bdbe0bee299c533df9722cf6b99d1b3bcd0a94743707ab1f5989d4de96e1257d63ee939e20911b50ac1050c
+DIST firefox-115.15.0esr-it.xpi 567120 BLAKE2B 58d1d1a0800280a31fdf3b281bce50f38de4525abc378e1aa47d7b913b1fb6207b12c33faad9d89e125637f547a8abc8ac61aa0274364b6fdeec8ed2b60a476b SHA512 4eaecc1c35a58d4b9ef7573c14e8ec23180ad3edc3d2fb8f032f679cdd8d24a2da22a014d12407555e857cc61b66b7bad72cdd2740ab681d8c554be892d4b02a
+DIST firefox-115.15.0esr-ja.xpi 676031 BLAKE2B 2776bb279f1091f337d9500971022e0912b5d606c719b5fba1419662c4b92a7a1e59e1bb3d7f80a94ea42f8655d6ce8b695aaf0103c7f4e39518ec72c3e0bb35 SHA512 982b9c727654b364fb744d9f6d993fafb2407f434e0f43a2d1a067885bd4b803e32c1e8a3c72f3e2c05289a0916a5fbcbd7b377d3e04f5c6e67274f93de0798c
+DIST firefox-115.15.0esr-ka.xpi 657991 BLAKE2B 53c0cf206d77ea7aa9157a85c50a7657fbe56881e6b20b63193a0f8599273d06e0f6fae4c135b00b9b3ccf3c316fd1d36bcbdb3e5659d0263055d6c218273d90 SHA512 f7f12bc6ac222b78a8606452e1eefe65e2bf77739a6d0b2a6c382d565d68a227881921dc059e568d395120e0e09d419e148056ab3e4090227c20e35b55943409
+DIST firefox-115.15.0esr-kab.xpi 604028 BLAKE2B 6ecad3b0cb351d8c4da3b65ede52f951edb4cfb3167a6e2c24b8baef2900379c03e929b4a312688e4b6646dbbed5ea4d885528ffde131eb509bdc1bc74798793 SHA512 ca42cc9601f6df4f6d8c617372b5b37d2f0c4b8c33f72409b3bc09ccbcd97144ce0eb7c50c4306b64dabe85f6256ffe2c4aa8544e1dcb1ca057e112ac83607af
+DIST firefox-115.15.0esr-kk.xpi 709054 BLAKE2B 90bd32cc90d3ed321deb2a8acf79f7fb6ed2072d83716854360e4cab838b90720b3a0ea66aac071d1a3927bb677f7e7ef1bd72f332f80dba17eee5538b836625 SHA512 078b79b3229e3241f24f99a30064b2ccac5f8b0f148dab25f748cdc37fe30ac3a1dd5f578f75147457f3bc18932453ddc4e6b19d40da4bd860de848a293c195b
+DIST firefox-115.15.0esr-km.xpi 522330 BLAKE2B 438be3000bd425f081184c998f1c50460aa8e99bf1d8e63a7dd0b22cae39cb4227dffcf85a529f4c586d783cdeef01be139e988b44cc3a29899915aa0198a3ad SHA512 5d889e572b22cc247ae418726ad702d184069a4afa0c59e3653ae243fb89ea489c399b83bcefc9e64ae9c079eb53262e3006984f8a16c224034f3526e1afd368
+DIST firefox-115.15.0esr-kn.xpi 488198 BLAKE2B 3d2704129a3a340bd2fc64018e7984a0a170892f98fb607da22e3680ad016c31f30044e40950ca6f70e86df254ff8c935996fdfce5f2bb5376e22d63eaf7cc19 SHA512 4808474f149d24e13fd8a5bca292087488948ed03d902a39f41fb71205781d1afa10143b80e42e4906dd260084be80349b3a45fe0fe97d463f4c90e623246537
+DIST firefox-115.15.0esr-ko.xpi 662480 BLAKE2B 96b8326b941f134d7bf0ab1a13aa8544f9e3e98ddbb661d04749d34613b3fdcbdd32bbe8157536f796b4fc68dd820d0677db8f77adff151d31cc7fbe4e60d22a SHA512 67376a7067c21c6b331332f2874ab1260643d1c9182410ee4068606bfee714a2f31010d7c7d14bcb7cabd218656cc274d31530d6fd3f0e3123175849e6754de7
+DIST firefox-115.15.0esr-lij.xpi 479126 BLAKE2B ade5a5adf13b7d6e3082bb667680a7845f5859c8e2c6a915002172af46ef3be3b3193107dddfd72cab6fa6798234e0a781e2ff50829ce5958152427754cf9c4a SHA512 e38985f36eb8fc7ff92dfbe923da8ecdf260dae60a568c5df4c1bd43055a670a323fe9d735cff61bc6288b820acfc0f4c74fbaf2365dd04a473d36a0ac942a8c
+DIST firefox-115.15.0esr-lt.xpi 566224 BLAKE2B 90fa117a8e4a32d6a467846babc5ce4417706b385b0b3a8d6aabca391acbe0630ef8b2ba268b1271d80b17256c8b8720916a15ab678430a2baa1d6f33adef750 SHA512 821f4ce96289d2eb9c83bcc69cb665047c4c9f85e02490245569d51cbb243739057fb1f0b174299f2730ed843776375f939cf2473f45b07a3c0aadd154293281
+DIST firefox-115.15.0esr-lv.xpi 568810 BLAKE2B fd3d1117bd90141a4b9bb8c7384d687971ace2fe81df02c41014a09fd2853d7029320defb2dd32ae2a1343de7dae760200e2133224afa472a743d0d4448f9001 SHA512 82a6f43723e36f0fde0d633b3693bef268e702cd782a96e0bde541cd940fa795fe0fdf0643f19fe53ead15a790fe243c5ed6a588813ecbee4c6aa23c848488c7
+DIST firefox-115.15.0esr-mk.xpi 490535 BLAKE2B 3a09bfa3217466aacd3462fa9229deac0732c65c684a856e6bc5f51955db8c92911db33006d318bc15171dfcfe5dc3601c5354be25f7d16e0e384fd813f426c5 SHA512 5b00a766c9a16702dff795a6243c430a266f2ab9e7af27fe2d9f57e5951ffb65247f842a9847b1c9ad87df836c68070c3f9dd963b508de297c90cb5dd3fc7545
+DIST firefox-115.15.0esr-mr.xpi 526883 BLAKE2B 09946b06ace5a5dcb09b145e0feeb9ac83468a6cc9cca478819cdd5156549779c32f57879c47ea320dbe5a089c8144bb2fb66ba9c18315b50f4eb131fd142181 SHA512 ddbc1f9b3a2dfa664a8ebb36a841f07a8f7f88823914d4212aef21abee642a4c0ebd95029a0d62b0bdfa476f010a4f4fa245df4bc277da9448de97fec9eb19ea
+DIST firefox-115.15.0esr-ms.xpi 445508 BLAKE2B af4a376cec0b6ebb0547e3985ad7521b7a7d3b84e35fb22ce2f49656efae6105eec2f07f6232a328b335c26d566abe63137ab4458dc7d3b030f1ce44d424fc6d SHA512 8adb5028ad31f833adfe4f8dbc87029f124ad42ea40b562a549fe26a6344a24d72d0c3d62f5f0ee93597114f1ae5f7ecd803a82233264306b88c9066983e6b8d
+DIST firefox-115.15.0esr-my.xpi 514929 BLAKE2B ad2455bba5fc940a6d82f237d229cdc565bba902ed46935d9787c78fe1129a6433101c79952b8c12b3ef77268c67f8d02f7f4d598c1ab34df6edad9462387969 SHA512 f43a7e34365c2dc278aa8fa3061c2d68c805489d54d9658e8b034aed5c480412b3bb950098bd6c446f0be6fdb6bbad6ef4d66a78cb22b8e1b7802d0b01a9aded
+DIST firefox-115.15.0esr-nb-NO.xpi 607316 BLAKE2B fce0b6a75463864e08d1087af58666b184dc7b68572200cca6d02018c60a85330bec4b21f1f4c8d42e85c213a06ab73c9e2b4ca761bbb8a5f1aad4b72ad71b3a SHA512 df402ea7c8156132d69bbc24827efbb302ffd45c094e252ac1bbfcea0636a29d070c6a18f464d898d3a54f028b8571f2e18faf30b7bcefddcb8162fb1d177266
+DIST firefox-115.15.0esr-ne-NP.xpi 506993 BLAKE2B 24ed6ecc00c452d07c2470ef221106c5bf60280272daec88daf86abe8ef1c7d425096cf983ed187c60c5038cfaa1cdb6ba773860f9186ee794d325e17da9d030 SHA512 4274e37a3dd0f509f979a321c04c0da4b27ac33bb02e47945c59d9947c1428159e5ce54070e8c9f26d0702fec6119bab9c859cfd39f7a34d0d6fa0b99d1f4e6f
+DIST firefox-115.15.0esr-nl.xpi 617743 BLAKE2B 1652dc4ce9b1521e6f5c2f2a29e225de915619afe3f25f624fa0555dbe3af80cd217e05d6b134b0b608843dcb86a67adf2f9a050cdf345c9ba869057860320d8 SHA512 f7dac94ef771233fea2de1ba31923d9a561cbe10fddc74796177adb0828a3312ae19bd9b128a80e5bc30577767cbb96b42bd8721b3ff17fe9d5f01ca4158e78b
+DIST firefox-115.15.0esr-nn-NO.xpi 609739 BLAKE2B f5be55c5932c378b3353340bad592ab2920176d2291763c73b2f3181aa9459c4b475a4d578c8225f730f5451e9466f3b0585cb8d0419612bf2b45bb13d8d119d SHA512 1b7133b5e4fbe8e8a844713d0e3d8fc7d559cf18bb87adcff8ebc37517991053a3a725a0328d22cca4d882344f643cfef7d9eae3d79f5a611dd76a643639734f
+DIST firefox-115.15.0esr-oc.xpi 607919 BLAKE2B 2cf1f970ead52332725e05625a809575239b3dc0a013ec2b5996557889338b298cee6d8ce008284aa20edd14d90b0a14d6c6924bcfb53de55675e4a82337a6d2 SHA512 e9f50e126e0f06f9343e5bab2b38b69d983ec1d70822c07226a1148f8d56d42047a83727f21c88b33ebf6c5c57d19116ea19fc42c4712d9e38cf8a2f5cceaa74
+DIST firefox-115.15.0esr-pa-IN.xpi 687719 BLAKE2B 4fbae6886f73e35a4cae817355463fcdfa8397e0ac2c21be48476069111423e4ed75be05edf966103bf51653f55226db56aa15443d03f084c00c7e3a0aff1167 SHA512 5a700d057bcfa5062960e3c6e1d3ff2949e445b1e1e4f5edb1c5e2dd77497e0069a4147fc4ae92c27fde7a6d0de564a461d471a0db85b4e1a579eaedf6074298
+DIST firefox-115.15.0esr-pl.xpi 636472 BLAKE2B 6c24a7d828d8e2159982ea1bb51c352f6282de574e357ae822e50866daab78c8be2f506167cbfb593bf907517e43d194953f5b97136acf4ba5ffa467ab81cc29 SHA512 f28998c96b6fa47f31653e5f49d5dd28cb1480f891a50fd1a33a5c5420f2df4fcbeabb4157d2d419811bb3fd0fc895b473734310e17f4aacaac9aed4731be0dc
+DIST firefox-115.15.0esr-pt-BR.xpi 622537 BLAKE2B cac1dd6c177b743f70b1900aa8d27da997d3408db4ab285f6dd896c2c7b3f768c733705414a88196b197f457ed054dcb5ea73dd68d7be5039885c77a66117e2b SHA512 5f34f5b6df8c798d9c825c102f0b9888191280989e5569cf0420dce3356c36e46a7698a829aa007fa28a2e02b46d74c0d6430c9da936451ac838b1a6ed85f0b5
+DIST firefox-115.15.0esr-pt-PT.xpi 626589 BLAKE2B ca43bb0dd4e0da95c3f64d1c41c6bf3139d17fce32883573760097c93e2cf27b353205e84f05aba0adcf4aa87ccee05aa4dbe826eb12312be4d8c82346dc5a18 SHA512 1170ec442afaa68ded871b528b0efe32938ac44dd383251f1e40ff19e2bb61fc9d2e5e9004d163b56e262d4b7113fe6937de535701c5ad0823528023cc90b85c
+DIST firefox-115.15.0esr-rm.xpi 617339 BLAKE2B 810e207b10509125b97b1f55159c6f22e154fe83954fcf2ded60b73b9e79c47a6fd6295434d4daad811c2d10387ac6c5f273daa17233d98694e8e08023612080 SHA512 7b52e8331f675c0c615cbc40ecdc6417ed3fc3d1122650eadd2d33877e032385c0b5b979ab621678892dc6f29668d6b3dee691cb37836fd545c0c1932c551dab
+DIST firefox-115.15.0esr-ro.xpi 543552 BLAKE2B 5c9861853379c4602aaf6863b43cdbe2a23c4727d535d3681ed43dc2ac901a88dd740fda1d43517f5dfcb586803789d3c7822d1b57525136093cfe6a5dad5011 SHA512 1afa5cd4377b1e7185bfd6d24e40c0b9c03e3940abb58a674eb19b8133851b699fc06e73633d038384fe1b99b4fb033efc7d72921398a34bdd2cf31bc0b4b908
+DIST firefox-115.15.0esr-ru.xpi 721763 BLAKE2B c9e7cbd3c541fb498b3106c45ea8d4dc122e496f92f8670ecf037ea0ff42e12b9798de679ab2d8f030e53f74e3e25c2ec2badf490aa0b4941cb6dbfe9361c12b SHA512 1a50181d7ec0d3d0153466809c985596ff2be21b09a1fefdbf9c9abfe599e476f84eab96a7ecb281ed34f9f78d18e3b9d3f1942a9bf943ea869e04f138b007f6
+DIST firefox-115.15.0esr-sco.xpi 505680 BLAKE2B 66dfac8c6eb7bcbc0b55fed17aa1984fc83321f275daa07fa2539993ef5c985577b81c8b046293a6b71f311ff9b0d90e35a1253558f7dcdf6f683bb9039eafce SHA512 260424c3a1e0331dd2a086aeeabd8f06e700f5c72f3926a5483ec3ae834924905bf1630448ce26c076152977393048044ff2073d622d8763b76b6e25b34be02b
+DIST firefox-115.15.0esr-si.xpi 606451 BLAKE2B f0e35c895ce9f09fd63a753346e89e66b8422e963c11da0cdd57748aed5d1b91128399b97fc31d871cd873c8294d5d96ced02d45cbdaca2a900c5c89fbbfd4b5 SHA512 45a029b29c8140f3f4b3f891d853fea8b02f3c8d91e0e9fdbf264cf2b63c5ad2bd73d947ebd76dea91d99920054b4147d784c0120dad0b09ecf47b4c0c6fbc4c
+DIST firefox-115.15.0esr-sk.xpi 652374 BLAKE2B 7a28fd4abbbefd5017c20f9e7ffb3b670e8297f7f9790deabaf516952e6d9839a888de766d6cc1afb804b836f294f4fd6ab5b4d43ff516daa6aafa57fe8f85ad SHA512 b21b2b006b432a05d997d9c592f1e2c4f5a1101c014ad2904417d790381ba95bf95dcae3e66a810f03904d61417704ec0cd545b3d1ece943a2cc08045183b96d
+DIST firefox-115.15.0esr-sl.xpi 615203 BLAKE2B 6a3f36cab2bce1f5179a1f164ccae1a4cca40e4ebbc61d11e8077dd96072e1cd6439a96bc01670eba0658ead6674c5657fba20a15841c976dea911da6d577c7f SHA512 e60d61aa1dcc7e74c4450fbe36ac9816ff63ecfe4cbe81d96d9a410a058e7d86b221fc92c4c9423a71ea8c7f3d75468541dbe120d77ccf03b89b85df92b0736a
+DIST firefox-115.15.0esr-son.xpi 413679 BLAKE2B b99890be683244f7523b61950eb3dca4b73f8ea9ec2a9257b30bfcfaf46ee45294193a2fd120c62ac77662cf7141a1cd0e2047c9b4bc5a662dd5ca49ccb8ab95 SHA512 fd9669ab4abac40ac04cbbc3369a9ffa84cb918748f8a8493f71557cfbd2de0704a084856de92a2cfc47c4219753b4eb956bce906a4bcbf917b228c50f9c83e7
+DIST firefox-115.15.0esr-sq.xpi 636141 BLAKE2B fa408ab79af3d2cf5dd7ecb24dbe5a938b06d6d6c5588474a6ad6ba6c958b36c5686541b438f3f9dbf361faa423b678d220404359add6f9d83c9113bfea9f8be SHA512 19c6f0de19e6315404bc3cb67534d8753d30954ab747a873b5bdc3e6db90f18513ff6f8a72e506d0b7ae2b8b5b3ae8a4d6f41a89ffcdd6f5d43d41821a028e59
+DIST firefox-115.15.0esr-sr.xpi 633260 BLAKE2B 763687d9acb9ffa59204bb3bbf5ed72cd73f4f2a2b0c4a27ba1ace55dc96990d296e64267e189cca3f0352f3056f19fa749412423906f8de012ced68ff54d7d1 SHA512 7e44d18a448a5fc8a0edd3b48188ed7d3d8748e60ebb455b04929561b002839189a0b35ae9295979930f66134f1c1de3bec58826f2f6379b292860b02ff104d6
+DIST firefox-115.15.0esr-sv-SE.xpi 619433 BLAKE2B 8bd3a3a9f7cbc403a560182fb33914300865145cca750a0bbfafd7dcb179017fe2d074f7d1becffed3195fef931f3f3224f2dee98d1b2ad8a96851ac5ce6ba53 SHA512 8c24b18e62838b8739ea24abe3095f52b6c4dafc7c05389cc3ee63560c331c35966cb57008fe9f72dcc8ad53021472ee3449a2cdf37a668fd3bed1b4f096a3eb
+DIST firefox-115.15.0esr-ta.xpi 503639 BLAKE2B 12e3897ad4db9146baed49d5caf8da5e396c48c92b0f0ade306e4a4dfb56c5134f146d97c0fb320e4d48929580b34d0bcd0d7ec590bcb4b5ddc83299fe7e314a SHA512 de4788d1b8beff9b1ead7612a2cde153783428046ec838c95aa7e2ab4dca7ae2ccdb96528cc138004dd66974117257c87a45a434c1403d1db59bf9f5f164fa6c
+DIST firefox-115.15.0esr-te.xpi 556764 BLAKE2B 4f3ab1435b184929d1afdf8127b5fec0d3f78cf2895c8a4a5fa0978e7ac54d98893c25115e59b66439d360652a8b89621e39024ee5181fd440747dc176e68521 SHA512 1325e6b22eac02f8d06020ebfb27f827ed5e9fdead7cf4241b8e1ce8e4c184c994dfd66c068fbef988b84439e495218bb0ec5eb175e9a52e0c2c5161d3c74e37
+DIST firefox-115.15.0esr-th.xpi 693426 BLAKE2B 0cb4abfdd80a7cea1bd365f17205d9139042811d44a297a103258dd208aefb35a9aa0985b75b71e49215f21ef7f83c37bf1db2cb2ecdcc2b7079455042fe54e4 SHA512 bb35ea24063cf9326518d4a5d9da76147d05bb140ee06620c08c941e5134c0eca6db79823a7435c1b7a1dbd793aa396a9747052cfccae30d01df655913c680f6
+DIST firefox-115.15.0esr-tl.xpi 527807 BLAKE2B 3dcf0f738b80573eb4c28a0839bec67f1deef3bd774d495f8f6e6736041e505a47995a585528cf4b507fbf7d2437de94053c331e3b2d368a1cdb0454b20e590a SHA512 dfb4052f585dc8eb026dcbdb07c64ea251cda8fd19afd8c1c4875402aa7cbd33f60872f93b8db69fcf521d49a9742c76bfc292d2b0de22ea440296327f06ff87
+DIST firefox-115.15.0esr-tr.xpi 631874 BLAKE2B b338bbd0396add27a438841eb4150a33c4124bac24f6045c919b0216e3e68227fb287d04903f2912b218b1a9b41f1e51fc292d36c785e1d01b1603d05d7513fe SHA512 62685e561fbca4585844cb7937d1c9c80e7cf84e9dc541e022e41ce0c650213a3efc84abacd347e44391292c0be18267bb80dcda76ec1b559195c763a1c4eda7
+DIST firefox-115.15.0esr-trs.xpi 498682 BLAKE2B 355962c70fc9e68bb39f552414c3d53a6cfe41d8987a93c52a9dfaea29613b21ade959f5f729bfdb4a9feb76cab89f0efd925bc70bd72394f3f864246c6625e0 SHA512 e07f178a9a4df1b8714d070ea58e880f8b34c4b88963bfa4f0c338790e7b7438209449bc26b153b8f25f4a8bb7f18d5310b1ec10e37db4d0913ae9660c5f1505
+DIST firefox-115.15.0esr-uk.xpi 707292 BLAKE2B 8c80608e9e8cb19f19e962deaedb9b3921e70668c007c71f27d0ee789d46aefd1d5ac9a36da3bce7c8687aeeb129dbd1ab64786e532730426f7c4b02544e3f8a SHA512 43a00b956ecba124d127380948c38aceead09efddcdac761a7f1028f06ec14aa49780d89a535ce8a166fb1adf842820e4014f5095a568757b41a2c33a557af2c
+DIST firefox-115.15.0esr-ur.xpi 554809 BLAKE2B 8f28e72f52066d83ded968099da261d5b5a5eb62641aefef3ad0c7354437c134500b78767b75f012b495ec2cdfc51e14d1f0c9abcac779b8e53c7c215ce11ed8 SHA512 aa18bb41738f156517672ee8bfb6cc263f3e4a83f602185f7fc405ef77e65b8901c36958a86c083e49d130046fbfb7e95cdb595f9216bb40faa08e19769fc572
+DIST firefox-115.15.0esr-uz.xpi 474685 BLAKE2B db4513fa6747f8731d92a044f383d70e9ca245759f36ea824a0d9fe5247669d5bca93dfe0d0f75953da29a63a44bc5a7b397e59a7d0eec47cb61711d73f9ab38 SHA512 6225f19584e1d3c34ef2f94cbce9d251f3004174623e6cfca951ad62858ce8d6eac7df6df1cfe7b7af450a6e64e71e9d267a02851d232562b92a4a14dbd12bfc
+DIST firefox-115.15.0esr-vi.xpi 654024 BLAKE2B 03c1d2214b899cc31385ae2c12e56c492fdf5b298c257127540b5f497cd0a077df68e58b722279ba6fab6ed9b025499fe55e93a5d7504c7202559da0274a9122 SHA512 75e5d401bc6a5c3f42a33390167f02714187bafbcd9b2bfe501608928bb715d33b9b9948b736d7c53aa8b7c9d1eed28557f5448e895ef4fa98bde8ac45a5f730
+DIST firefox-115.15.0esr-xh.xpi 414955 BLAKE2B fcbe5f7b559c90382d4d45b808ba35242f9a17905ccb1a4a8470c4b149710abb41a8185049c73309572408debfcf62df3ebcf1f36af135d746db44e4c0ff974b SHA512 85808966db817088eb89bf516057ac38ac16458d9e0f6da76ad58312d204ad645aed8da683383a35cdb1cce833090d044edfcc16f947e928ce144554232fea2e
+DIST firefox-115.15.0esr-zh-CN.xpi 657103 BLAKE2B a7927017d440780ee1ab7a4f2a9075bb071db4ca38f9bd05499606d8a3a28d9daa3bdfa1895bce263e9a81dcf984042e1447bbbd96d4b3e34249045a6567ac28 SHA512 af3399e9eafd53a9644bbc7c8e714e4b497f0ef64f98b3b4e2bd0d28949031aa3f23f78e973baa4286622673ddc5f55c03906bc6059ba6a10448fe0da68f4996
+DIST firefox-115.15.0esr-zh-TW.xpi 659312 BLAKE2B a73185e11f1b6db6def7ebf6ac1bc54aedb459822cb97768c7699a2fcc0ed74ee4dc96c2cc9a7a9952d3dd3c58da9340042e6a75f4fa0f9b52dcf98a88066a46 SHA512 ae7d6d80e645e5a69d8d0fb9a245e7ba0cce82ebcb7a167cf0a4d5a5e306dd58130bd550c66aa814bc0b30a2d57282dcbd44acea47370a6137ff4404eb124034
+DIST firefox-128.2.0esr-ach.xpi 465016 BLAKE2B 70b8839a5028d7b87218116dd44fa724fdc1aee91c371bd5e84112a9153568d7186ef4237f707e08b9e22f0208affd03141b49fa4b842cc82faa5ebe7f19004f SHA512 688b8fdb84a6bf069650a65218615d605cd9cbd52435261f3f4fcae749cd67373fb1ce34c24bd3d0712c5e9416a2c111e2bd245050130423c944b64ca9092c1b
+DIST firefox-128.2.0esr-af.xpi 418343 BLAKE2B 6b52d8b28d7e1095257927e2e894276cacf131fbd8827bb321729787d4f2b9d35418c5b834a87c30fe035f31f03c003d3691d2350ffa6972d1ef8de15952fe6a SHA512 70bfdc67a3f2ad213de61387f611bd9f6231eabc7012f190b84020ee3c75d70579d88db5cc1995f86fe1eeae72c31438f64019824c4ea28ed589b39cc12b9dd9
+DIST firefox-128.2.0esr-an.xpi 506833 BLAKE2B 0c46cfef3202306b143015195ad4dc8d04c1bbb51dfd643b55abbcb44903774a4b119c0cd2336209eef2ef57abe5c2f6d0b82eae651e1cdc738580e6cb56474c SHA512 3dcc2c6ceca2d8452322fdb129537447d4bfc9951195e66a24ad7fc5c5f3bf9cff17326eb98c3fe7afc4e33ec9ae6f5d5b15e2976da34192a712bb1a08dc58d9
+DIST firefox-128.2.0esr-ar.xpi 612892 BLAKE2B 940c8caabcafa3a9c95905d820bb622adb94b259da739ff5ed88338b3354d572aeb03afa98aeb8f89b83dfd5c0fd5a6c0221c64ece8b1be8bdf0913a5c7e29fa SHA512 2c18828e3694d898bfb0c7fe36ac5937a1baf70dd1613570e1c11101197d5a66593334fd6a2b007ed680d8d62e6f5eacc1ac2e4766dd0f6fcba8fd255adc5780
+DIST firefox-128.2.0esr-ast.xpi 497291 BLAKE2B 752ad97fd9c00912228226324eb8647bd5c4cfdf3a8339aa0100047a4e75a818cdb327b5505e9ddb8a33cd80a26217a0bd9cf0fef6ea0a4895a3db331686b830 SHA512 bbbac520b9dc6eb6fd9c4a00651842d8765411fbfd2803c6c536f0e5b1fb7e0ca8886eab0714588dd26fa191363f503550d39ecc14c6263cc1247cab9d43b007
+DIST firefox-128.2.0esr-az.xpi 491719 BLAKE2B bf70d9814f2951a02ad0522d23e8162785087972ba02355613dd14f196308335b0e126845aa378cee1e11188f832cb0e11064d7ede7c3257b5dde0cc5932c32f SHA512 c35f461cc54aa04200729d212525e807c3361b081ade3d6b7a0bab462fcb43c7ecc05ca0cd8a1c3a6471126de7c45386c5bab6b9225940f3bbf11441fd9c2195
+DIST firefox-128.2.0esr-be.xpi 717327 BLAKE2B 452c846fddd81bf764903eb42d4aa87d7f96fdbb2b9a87718abf6b6ec3552855a6fa066fc69eda91bc51143ecca890fafbc5297f9c7d3f1a5730b6eab39e04c0 SHA512 7abab5270899c9ac4be6ced477c630096475164caa37d88089fde40c1c3e8c794f21c4a88a001f1ac5c7605eaa63c3d156e27eda331d77ddfde5ef393f7d45f3
+DIST firefox-128.2.0esr-bg.xpi 637126 BLAKE2B 7bfc353a577a31c3baaf8af178dc34e50b36fb02f8a23e585cb8f7a6d97252c49a642fadf2ae47ad0615af9c4dfcd77b631d164d3bc1fce87fc2008c2d109e1d SHA512 16cb5b6eaf1f4691b59d5354b4df9cf1b55d317e42d07d59226315448c9ae2b61225bd6f810bf192e2dea8ad8b0b574a51c47d7196f93367a78f873255a21eb3
+DIST firefox-128.2.0esr-bn.xpi 582470 BLAKE2B 7395bb68fd185e1559dfd94ea67c9e70004c59b0d2fca92596ebf2f7b53e3985f0dd1f00660d591317db23f460048bb89cfe832813060e53e52cf3425c5c74d2 SHA512 731c42ee4b5e0ebe309bee4370601324ced7e7d95f5543dc4fe72db60fb1d03e5d4474755b329744e00ebb3fb1c3cc905c50ec4a9a6ded85da90ec4fe4bf5c86
+DIST firefox-128.2.0esr-br.xpi 590836 BLAKE2B 3d3352e5466a2df24f294eab8d604ad97615aeb5edc02edda2485ae47db99702e6dd163dffe4d356e651ac1bc36b3815cee22b2d27ff1ec6bffca007a4552197 SHA512 1a59e68eb68c3f2be052ea6291bf4cea5543c3843ab31f76018515e3cee2d8e0191e0ab9ddebc3cfa2563e242e6a8a58c72ff6d087ef0e3bc5fb80f6c2a30aef
+DIST firefox-128.2.0esr-bs.xpi 510170 BLAKE2B 0c4de7a6883be7bc6520053ba86bea54b9bf57ec470841eef74fd412f2c11443057ecf952cb2125fbcbdab9289128f12b8071b9052b78321673fb80b0eadde0c SHA512 b51596dce4e77c3dbf0f98fa21e430b18fbe5ea9806bf0ececf06377d2fdb2064f5205af839bacd066ca886797ad0b050cee8b7069c23a864dc146e5c8d76138
+DIST firefox-128.2.0esr-ca-valencia.xpi 547190 BLAKE2B 1fa8d3cb7d8821a1e62185e260fdbcf54b5f520d71ecf984c9c7a56958c0fa535e1406b6183d0198ffb847c911f4dfa632f200500b2e32efeb98112dd04451d1 SHA512 98c0b5b46620783ef2d21e5915fe8130968e912bd553a7e1a116445d82be4931fcca213621a33a6b1cbf4e744d7e14d59f9017bd51f58df7b1d673b179986801
+DIST firefox-128.2.0esr-ca.xpi 598610 BLAKE2B c526d2dde8315fce06a2e272c8145f2f14b7c0a80d04fa002b01a79e496e4b134d2e219636908d4ff9d2bd43e1b478d5be5093b31dcc5b196a1d643789489f47 SHA512 82b80def7796f4770c93535a45375ebea9777866f28fc9f5b527e7bccc086d3d9d7e1cc20b8d83cbcc13a007ea457bcc683b67f62cd7f5c869d11b5ddcba3607
+DIST firefox-128.2.0esr-cak.xpi 594027 BLAKE2B 1198ae6b3116e0f52fe7042060cd1eacdd9948787bbca82683140c1895429e81a2de3df46eb94dfaca757071fd560982221dc674f0cd79db5235071bda463fde SHA512 3e2f30e4cb499f46322c6b0074a54bbd51d8d362d6c5e7b6aad16a5cf092f29d44701c936ffed8132e1a904eed2e787b0f4e47e68980f5b56718f59d5187650c
+DIST firefox-128.2.0esr-cs.xpi 666457 BLAKE2B 77b1848b1bc25b4280725c0bdab061e9b70429d07c197761b9851d5723a6a542215d714df491b93760268c25fdb47a0f8414a07871095e25b8cf6708fa58ea12 SHA512 b3792b7983065ab253c4891e79cf4ca4a79027f0f23e64e34c1e0ecbc9eb3d0691a4def5a386160b59d287d3f2dc1e13a9a6534704ab5230c34474c52db1a032
+DIST firefox-128.2.0esr-cy.xpi 631265 BLAKE2B ae4ed3264337d1aea359ae0ba2d0235f351079b7558fe3869b662e91cdb557d1742a66bf559295e0d8140b25bb77bb53101163da3a85c9cdb3d3b38275f05dd8 SHA512 4c65b218ad5acbee572516ab21a379dc8f4049884854cfc1ba4feae67adb8479668a01d0313304e6b8c26fe8dc8ee35fd1bf86f7cd6327fa3edfa6413373bba7
+DIST firefox-128.2.0esr-da.xpi 614503 BLAKE2B 30f2b5f42edf0cc047334a5c1ea1ffe0ca11bb269eabc1613ffa4c65806059da4460a34d2ac9a0022e19f9b5de3ea5c01cbc8a3893ce1a9c64e04a40628b84a9 SHA512 53abd8fdf4cf933be6b5ba430ef24a42579388bdc77ae38aee88389836b3096f1435f7cdb887a8079ba44f1f7b5f8c170eff43445f0e435a4fe2a291f1d6ee85
+DIST firefox-128.2.0esr-de.xpi 639266 BLAKE2B 540568f54d7405422b3a096dee282b69b77c72cf1195698c996762364b5fbfb845e7cd9298596e51e942330cc2ed8020bcb2facb544ab5f3c27e7553bfc36cf0 SHA512 f1d3e6c215830b964d093ec484732c100d2fb2b54f815e462fe8665ec7608bcb969155df8d1ab0ae556513d58ca906e02b1be9ebaf1902ccb6e41b169eb6bc07
+DIST firefox-128.2.0esr-dsb.xpi 656622 BLAKE2B faa31d365e4b25b5aed5acb01ec2724dc43ee859aac2bd7dfb832fdcc080e1ceda16e793450295a3167d17e236c244dd8522c809eb9e2015563683a43c4cdc35 SHA512 0c25b972d6fc0bd8a5c3610174281e2886b45e660c6b788f8263a9b85ce0758a1e2bb0c6e4fceb0f9033d3a64db90ac02cca65e2ab63af11a4881de1c2b33c45
+DIST firefox-128.2.0esr-el.xpi 741108 BLAKE2B ed21c5bc8a104f6002ab96fa2d1bcee0ec93ab9e3b6990834839b5b5c98d3df06bf237f6cc6a5e3a3eecd2503e33d91f7b5f3babfa858ed4de77348bdf6c2a6a SHA512 ec3b0063c15587637b2e6d58b11a6aa8ae775cca51c53f3e3a88ca3da939248bbdeb02e94027e4b7b55baae05c4106f3c2172781e397fff56569eb819fe6dded
+DIST firefox-128.2.0esr-en-CA.xpi 590919 BLAKE2B eacce54324130d863dc70990c284737b8ce1ccebaa67726f57f042f6bb3b83f3ebd31acccaa3e61869074f4cc46ff71ce5ee57b2a831dab4160e99446e44e02e SHA512 83b02b2b8ed6e76c1c6dbaf7570d3ba71c75ec7b253248200ab445ba571a741c3ef490025ea1fcace9994de94e5f80a8d74c469b83bf1ccf2df48d7b4fed05da
+DIST firefox-128.2.0esr-en-GB.xpi 591530 BLAKE2B c487037962e6f3319dc2094f96fb057566148316fa2613e8e9c520771fb546b58ca290e91c20c295d1f1e4b53cdf150fc15a64e00b08e587795b9e2e3dc82d9e SHA512 6e92e43a559ac736ede9089ee6929deb04cb1c00e296398e579fe1f6e2e273649c1961cd599c6d6aeee0a2b75daff86bf0f7b469d340e7bc6daca2d1c3d78dd7
+DIST firefox-128.2.0esr-eo.xpi 615506 BLAKE2B b6be4576f6e8e661e084100547115faf9d823f3a9cdd256a136bbc052e51a05409591d3ed5f378bade142331840ef01e99ddd633d360afcb980199b494cc1fc8 SHA512 9b7af6122011f922c8306fce5dd4e0fbb2afa2d8b00c08833087cbbf38e86b313c5e9b594cb9f137f5ccb4a33fbfe6ec94a7329656512f7a39394df6f8356913
+DIST firefox-128.2.0esr-es-AR.xpi 634653 BLAKE2B 764ccd63612f0d10f9efc920945c5978f809b7e2fa6eadabd263a85d37946a59211c417ab22c2af34e7f6725cee554876cb456dd9ed2b9f534e855d91fc9ac1a SHA512 c68b83ff1118a0999faf3d17341f80c73307e01e594be163e1231b69d3e5180a6ccb0084ceb00bec49823cf96bb5f13d1ddba73583590ccfceb120ddc07fb699
+DIST firefox-128.2.0esr-es-CL.xpi 634136 BLAKE2B eb8307f7756ed19bb6fc5cfd043f7ac946aa7302da7363e20364d5d012b159e0fcd026672b7d666efe8f1a4e4ae4f325ef6c85c15fccc8cfa30365719d66e5ee SHA512 a542f65f22873c09c0fa0f9afa80e69f997f1693ab6420977ec71a053cf3a7631552a538e927511e753556c08720bc4bbb67fc88c3f1b5143e0e3721102cf22a
+DIST firefox-128.2.0esr-es-ES.xpi 622027 BLAKE2B 95a3e27ace81c633711300b1579589c9a03f8b87266a6312b4b009d072abca81d89889d4084ee75a50bf6e8e566bbf6091c41a59ad9f7304fdd06509e3f514e8 SHA512 2183fd66929fe418edd1b86c16b2f2d910fb141407ed2a20d86002fc0cdbdea385f6cf6012f0982d7a863ea5c7c72d199ab312b59a9a6b0acbafc5640650a1a8
+DIST firefox-128.2.0esr-es-MX.xpi 610639 BLAKE2B 0592cdfc5b9c29f7d9294e76a6cb0a968bfd45ce37b888e4cae56d90234ff33feb2d42a30ce474616724994a27dfc1dac305bf797bad1d94d976d304af869810 SHA512 f4363783ccd52ed042f1a4d97c8d96e799f0ec67b303627ddcc7ba397656c3f14200eca1b731a0e1ba3ca1c118a177dd4103f7c9f9df064ad0ee542c9c0cd21f
+DIST firefox-128.2.0esr-et.xpi 540637 BLAKE2B 12c24fa32eb588245f2e552a855a9af486761e1358e380d2d734862b8f48f043ea84e219965b5c5b7aaa9a1a0d4f8abdb4947f2988512108b61fbb1a592429c5 SHA512 ae8bb76206803313cf8eadc3e794f5be13beba527166965cb30f7aa33809deadd8a4a5ac805523e129f0feb198d9239ea4d4be709d6ad8d1abd856b6c49019ff
+DIST firefox-128.2.0esr-eu.xpi 601114 BLAKE2B 94532229dfe560e1eb01dcc6d3a22c33e67aa28759334436b47715477f264430e196dab25d19d0e0089a822b343c12c23eb6d3e66da4de1c3a35e8f60652e4a5 SHA512 ee95366c8e79895d89710c1aeb791064aeee409e4fbbc6935d552540ba6d7e0a2552b7f2f1da89fec23f91e9dd684e9a78a5e96675dc40218cc2a35758f8d520
+DIST firefox-128.2.0esr-fa.xpi 590957 BLAKE2B af0a782804463e6bed41a4b75ee0207e80669841eaacbf0aef41a3cd8ef2958546ee97dc4b1e5270fe1db6b26aea34b1b3ae76a49913e764911fe401bdb1245f SHA512 c63af3bed58982c29b55610f66939e7464e11ba8a28b3a66777b1c2c5677cf171f8637f3ecd4513afc7661fa3279779851797477b2f01120a72b54b2a74ef611
+DIST firefox-128.2.0esr-ff.xpi 477004 BLAKE2B 80fe9a1ec25cd512daf3a54d6a84e63e4538e51372ae55e81096da8207ed5c29ad090dd4026f09e001c75e74d1d8fe75e0723c39c66d0ea7c0f4711807fc0d07 SHA512 b6f6cb712e98192dc2dbbfb5118cdc6aa450378e8a9d6292ef1c38260302c507941862444214fb88b9a2e2c5d35e885a7ac81d1872975a4889f6b9bb5a1f60ac
+DIST firefox-128.2.0esr-fi.xpi 613340 BLAKE2B ca22ff04b8f70e7aee2809f407913ab2f32050c1890d9ef6ded3dafb9daed3419c5139c1c6d4aeb0eb97fda12b6361eecb0e1702c73707e646d0da4fa35da96e SHA512 25e674d343b78e0fce174d897f7692cec5717bc10285ce83fa528dfec452c8358930622ab2d5f3e54efd1234846676677ec8026793da374ce44612ee55b8af88
+DIST firefox-128.2.0esr-fr.xpi 646209 BLAKE2B d3eeca16e0d20bb5b881555a6688060394e6ff686510fe1e4aecdab0822d393d573231b65b4ef64ca88ac150c558b57644371a60555841192df4ede33e668c31 SHA512 85b5d205b27fb696f8e8fc5ed9ccd7607ea8b93045c415172e4779248051741c9dcc3a1fa9675d5d89047f70a38551bd240244b34ebd40f3327930e8efc083d2
+DIST firefox-128.2.0esr-fy-NL.xpi 630346 BLAKE2B e8a3d6d2e03c798bb71b4d346a510a0579ac25b884c92f637a6807591b016a3807ac46d9844974b889b79316f2bc07b8e64fa054e3e7453c07b956c2bbfffcaf SHA512 5dd70c7888c612d6dbbab99a4864187e0003537eb267c293e297591efb896c2510ce7160b836622e9f4bddfa8bc0831aed95c8c5053749e2c0fde9dfd6e32f0c
+DIST firefox-128.2.0esr-ga-IE.xpi 471840 BLAKE2B 9aeb9318dc067c1da9b618fa7cff37da0068f63f3d12f630e329d16d2b5ed8da73df5825bedd84aa141b05d0e2a06a45f6d57eaa364d1654706e63ecd46f7c9a SHA512 ba17302c32241cc959f20b5b4d9fb81fb79ae4011caffa97b6d26a0541eca41d0a31e16815b9c15b483fe925ae060b0aaca1985f94fca18375750e282c033f1f
+DIST firefox-128.2.0esr-gd.xpi 597538 BLAKE2B 9dd9f2745301f8f310f33a190a65a20f76b4bb1c000fafb5d69282b086944e8731969b28996375e38e5fe97597e712021019e93fedfc7d2de9df519d3d42dc89 SHA512 42304ddb1af2bdc9b4f7e4ced0867004f203972ac454a597b8b50ddadc0ca3be8d5276ea8df355e1ab605d20b626f58129cd538467087bb99d3524cc63c77544
+DIST firefox-128.2.0esr-gl.xpi 605038 BLAKE2B 2c5bb207281eb993317336451c9f9579cd64dc4cffdd52ad19dcd0d9cde97b74240501623a1bc4921ed34d1239e5bf87347c466e1fe4da75cc1095eb08d018e3 SHA512 a164ebdd56d88834ac79ab92ea23cfc840cf7cd808008ddd68886374e476e228f9562cf8452d012c17b48a1c99a963da352aa921517cc2e560915b05fc99b388
+DIST firefox-128.2.0esr-gn.xpi 643641 BLAKE2B e61563bc66ec0ba0a71eba877163b670e29d8d3bf2b782db166d71af9bf17ac39b151ea9c4a6f00daf560400cb02124e2f1b43dcceecf265d8d6721c97c32f92 SHA512 7f9f0eb9771f05e921937d78519e0f03a43fff450545fbc1f7dd19cc01391b0b6918022bac1fdaabf3f3637b25333fcfa5a9081ec54eed7d6ae79d713a4a697c
+DIST firefox-128.2.0esr-gu-IN.xpi 528311 BLAKE2B 6e9335f5167e79ce9ca1cdcc628615ea41f03e91bece3ba6c4b3c4c235a0ce1fd9cc502400ae53aa21e8ec7b2c50dc4513ea2b90b7fb8ba8766caa82f1f65e0c SHA512 0dba09b2a209eb3d9bc0abdbd108bd906c2e2426b75dc961f828883cc0be44e61e730bd6b030f6f66de7452afb5a61e25dbf68de4e362b5d29bfd6392ff8fce6
+DIST firefox-128.2.0esr-he.xpi 637789 BLAKE2B 09b9ce4818f609bb14e4f7647cd34a6082e2411a57cb9dd7d5a7599d9adaa964b551a543da6f05a6ea63eb4046fa79634b5383a414d09eabfc6c2d52fd7f64d3 SHA512 e271dce2a47ef65020cefe41bb236ecfbbd0c0b0d558d32377985b7f2c8608614f58429430e54309b2a4754dbc66fb96b032b08efbec5773a359387a54786fa6
+DIST firefox-128.2.0esr-hi-IN.xpi 567736 BLAKE2B 38881624b5793b8b6a9d352bbe9ac95f17128a31a2e666761f341d83a8c77619967b2382034a59eafd753e38623c315a87c2805048232be1e435d5f86840fbcf SHA512 1181a815abc6a258798251d62e200c9a2c36da3ab1256899e86972a47ba5eddec9a080ef7d1cb4e280faa5419125d670c9f75a4f8ebe21ab7d6390d0234660e9
+DIST firefox-128.2.0esr-hr.xpi 615348 BLAKE2B f302229dfafa7923af9339c196b9ef6267e5eed846fb09d9e1520fa47cced0c2f13bc3c891118a9253cfaa8d1c6e666b978ee27b1418bf9208340991c70e586c SHA512 ed7b53d4e4266ea24c864ad83044d60729b75a1e2a0a6a2350952309b337e6461ea44f9894adf232512bec49079b375a48e1117db01d458cb28ae9e1e91aeb87
+DIST firefox-128.2.0esr-hsb.xpi 652642 BLAKE2B cdf7e6541df09fae4a4d12b0537a5ef9538384c1a92e48dfdfbe37ffced85bb576391e8abc2702fdfa65bbb3b1515740aebbd6a0a61027d84e1974b629acfbf7 SHA512 ca993b1e2d95fb54b5552aefbbfb6ee511fff898f01c5bc45c542b3076fa20211c5e68d0c7139825bab260671e7ced609c394dad9e371cefeb55ded6ca3e0cdc
+DIST firefox-128.2.0esr-hu.xpi 657494 BLAKE2B a4ccab55a678d878621586026bc34ba7d67fb48db020befc9432be2404e71b1c3206fa4bcf791ae7aba839e2791a17d2d535481ba5a284878286a24a64518b37 SHA512 0c4566a47237e13c8aeb5bc859b65819d72878365a41320311f6afdebb778f2f2cee7778fbc01763cd99cd94897160a2696a94c71e01df2aec444b96bb19348e
+DIST firefox-128.2.0esr-hy-AM.xpi 652579 BLAKE2B f9116e2d45ba205d01cebdfe38597e72a3da56ba529ec82a1c2a2c63c9e8798a879fd229c1aa5becf495aac33dab116388f817afbe14ccf3b3524cc2ef2b151a SHA512 657681a0725d89886690b832d985bf59bc7163521a81da4a3b253a0bc66f598d305a45092c655562d61632ca48c562d8366dbef9f39fecea96778f7dc2506848
+DIST firefox-128.2.0esr-ia.xpi 615359 BLAKE2B 3807846bba513bfc0564f3712be5e93dc5f5a9c7378a152af7dd56a5d6271894ee2bd60255ff26c979c67968c1dc8a1e2d53c3c4222e248cf750c93f691bb20f SHA512 2567f8f3776480882fc7cdd43a6a23ea980806ea6bf738c6d84e18cee28558613baabedc692b1bc0489c9c93c9a5c809167b5f96f96aff107a9996d883856eae
+DIST firefox-128.2.0esr-id.xpi 585709 BLAKE2B 5349e576eca2e00af352ec6c8a685b4d2a930b70c33fd60cf8569820985664ac8de3f580063126ec340fd5967ec4ef212b04271d4a0f3218729bfaa08da228f5 SHA512 66f988217ceaa43cdf600e36be136e063edea6bffc573c0b39cfa67fed9e1b1d8d620dd9fa1478d78914a015338bfd02e8214db916cf79cd08f527510b67e09e
+DIST firefox-128.2.0esr-is.xpi 619078 BLAKE2B 54a0d0d695438bd6be120b6ab61ebcd048fa439e342d5cbda1c437a8d69a5dab2dbcf295a9e47c3d430a7249058e880c99a2661d8c86205902930caf376d6cc6 SHA512 2feacf83bb6c0f8f87e8294ada857a3060419449bf34233c2af2a01bd84a4916d529ba34faefebc90dcf23abbd1255dfb98a87066782b29b67a885beb574207a
+DIST firefox-128.2.0esr-it.xpi 574457 BLAKE2B b9d6aa31442cbd73e5f328e136b45fdebdfc2881a5072caec60609257a2e0388dded259fc9fc0fabebb5320e22bd731aaa9ffca1d5514a361c7b887881882deb SHA512 db880c8fd054c08dbf5427be39bfbccf6a11f4192ba2137e00e792bf3ed2138b31164de3fac9af78d2c751809f8d496812b9915b2dd4bc93abdb8587122de6f1
+DIST firefox-128.2.0esr-ja.xpi 683774 BLAKE2B 305bd1fca5745927fc52bd6c29b1497b5c6a6b00926c1f8b7a95bf77d47897a8adeaddefeae781a9f0f10a8172ebcce11c1b1193857e16b540fabfd73e68b9b5 SHA512 f1e5bf2cf5ce8eedcab383d2f691009a561e16416335fcccf75fabd95d228aa25aadeffffcfc6ddf2f2a73be8b23d36afeb98ef30a94e3f79bdaf784c0fa6218
+DIST firefox-128.2.0esr-ka.xpi 661655 BLAKE2B 84357ff5ebc44125b7a097e229a71eb104ee960a0630fe454c11baccab20c66e4a2ef9195ed6bb46cd73b4f1acd047e13a4c4b87d0cd14e5d02d7b79cb6001ea SHA512 7b7468fc8634e20a2a1f7f262c2e624b0f5c45c1aedde30a7d0a963002f10d2e3385dbf9cc94a94253e748ac2d89d2f99ac8446f22d42e573f44c18d0fcc64c8
+DIST firefox-128.2.0esr-kab.xpi 612142 BLAKE2B cfa29707cd1c249f553d7ef495b7ae591c3e09441998d36ee8436dad932590b42f180af474ab29acafe4344fd4bf51d137b7ea9cfd9ef1184e70ec166bd9b37a SHA512 43ecb078d97fba83dad71cb284db809404943d3bb1999fc755acdc2d29a84dfe047f23b5357c3f9eff638d70f325eb62698a57213406020eb9575199cf494d60
+DIST firefox-128.2.0esr-kk.xpi 715705 BLAKE2B 14abda57a8e75b8a4275fcacbffab2e138e8b0b22d64c58a3327f9692db3a80a630e11912be906bbd073e419453c1d558e94c4dd80d555d20e2fecb42987311d SHA512 93f8560501c830faa25fc3cb697e3e28296dd3a67298dae68cea75f6be59ee5dad95153b513eb0bb93e129ee8ce1d4fc4f8f9887245e1156e711483fa4a1f3f9
+DIST firefox-128.2.0esr-km.xpi 526704 BLAKE2B 46d8c5804c04e4df7e409f4cd9705c71169800e7a63c71f713771643ead53539f586d9324b9671cb748a59df663ee08a1e71918a0d237e985a639d8e29a5dae4 SHA512 8c894f9aa95ba2ef3460560af5a001bf3511bde6ee961db33a01667c8a32133a2316fa2908bc92b30fb290999582d8d79dd39190126ab1592d925f687c4b0a1b
+DIST firefox-128.2.0esr-kn.xpi 492069 BLAKE2B 31ce67d4d3da710c2dc93f9918ad367567dedebbb5476c80e9d90dc66bb2a586ca3ee562c5da1ef2713cc7fc78240d60efab0ffdc61a3d7e83abdc861297c029 SHA512 dcd4edd6b64f482bdd98254d83a34b7e332afd62c4e97dd0de360a71ad084cb5aa7e12dffbce49a27b68d9d5b881e231005592156a4d7a49f3c37ef7b89342a1
+DIST firefox-128.2.0esr-ko.xpi 668819 BLAKE2B 1855b9bf73f05feab03f167a6f5d32d1fc70c3d02d5c46e5253a415ad779ad0b4aed567985b42743b7a8ff1f3e67b2b0950703fafd9f693c64221d9da6429ecb SHA512 36a1da1fcf63b45423e578bd2346d8e01fc51e7f740ef21082d2d3f9c49cf480e8208e1e42f5cfc99fc911ae59854fef241009873fdf9811c906938fd285c648
+DIST firefox-128.2.0esr-lij.xpi 485047 BLAKE2B 572e5ad0d33aa885b2033f67eacf7b171688615361c1941fcdc2c4fdd9e2c4e647c51b22cfc4268586679976cfeeac8d4e1d65ebbcbd04ee878bbc0cd056ad7a SHA512 ccc5d837e485d42fc12405642987fd828c86e438c70d70ad075a665bbb3c81a6ebbe2a6f660045fea13c1bb490fe0c5353cd5a2623ee14cff6a60edd0b3c308d
+DIST firefox-128.2.0esr-lt.xpi 573642 BLAKE2B 0275ff8e100ad123c9e53f2278f77fc6ce845eed16f57dd265f8452095ead916ecade8abd4e9795d73304c0325bd6eca7d62ec532b8a6cf6a74c60f232bf2412 SHA512 ed7ab421a9c6f1447525e3622324e0d97cf290b67ea132a49fc2f94207c69a0b93bd0e4dac1099dd12802b20ca2d102cd1aafaa2f8ff9d846577b14b3d43d443
+DIST firefox-128.2.0esr-lv.xpi 584340 BLAKE2B dd5986975a2b7912a5612a5b547f927582aa5edbbe9993d32ff053e2f6fd321c523806685e136c8860cc30d6d44e1c61e0dec17d0f4a11c24d3a49b417db1464 SHA512 93d0c8a3a40ba33de1ae212534eed4ea318f6f0ade740f9b4f58290534c2be28598eaf7aa934cfbb83c27f1890b614edc59b186004f76617248b55b8954541c4
+DIST firefox-128.2.0esr-mk.xpi 494673 BLAKE2B f26a42c95c613af468f027120b0c38ecc6ada51a6fcf64ce84e8a42e650e236531d7f72b3e94fddbf0f317dc9c6ee73fde88d3fbcd42d8ba12bcff81d68414a7 SHA512 672d1704b38074d2c716319b1b06fae8a8cdaa5d0e27c3c4705226d86ad4741dab028afaf20627f8cc8b5cc6201537e5eae88e5a6fba290711af141acbd48f05
+DIST firefox-128.2.0esr-mr.xpi 533051 BLAKE2B 0468e82ecaffdd73b5b56164a902a83971d71a333ea34d95089147aaef14493c4eccb1b44b2dd4d7b8310112990a512abeaef42d0544cda9ff729ca27ec1a6bf SHA512 97b1a900a06d2676d91506d2aac53c9908ebe5a0605990c7ff7451e6e6ee3863067316988393341fbbd6428508a27362d509e843f23697d74dbd96ad3f3a5461
+DIST firefox-128.2.0esr-ms.xpi 450664 BLAKE2B 8a72e63cf0a067b3bb35c572b4955046c72667cdf0f34517ec8125cdaada61150a4195c47bd7706348d269c6ed18d42a05f4da222e19556df8fa0edf1450f2dc SHA512 e6755fb932bc33645497775e80abd02f0a471b12d3ffc914559eadc85ed37c0976e097c036c70c650ea2763ed294e427411c3be696bf7d687a61e90e6708ab9f
+DIST firefox-128.2.0esr-my.xpi 519448 BLAKE2B 3ac0adf460518439627c2bb94325c40a328f548090105055b022bf6a5ff140e3de174ce21f31dc9bc3de6684be43292ae6af0b222fc05156c5ea55c0f87dfb1d SHA512 4374efc78b9af35eff75f58ef78bda2c0dff79864362e242a0d3859c10a65d5356d564c6ce715c7ba7d0569b997736c72d7bc9e09b713816e297841bb13c0c1d
+DIST firefox-128.2.0esr-nb-NO.xpi 613393 BLAKE2B dbabf5089d6bb9256cc9cfe0bd13b819ed29385d96c2a5afbab4e937051ff64cdf243cc3d715e4eb8684e66c1799a1707e2eff4d300592999a5aff7c043072f5 SHA512 53b2d1f4d5f75ec611e2865f7a81a26d4a1e74ec852a9ff3680ce587463c90acd2392d113aaf4d5c7915bdd35d12b3c8535a87d97f5aa6aad18df84333053ab2
+DIST firefox-128.2.0esr-ne-NP.xpi 515342 BLAKE2B e7bcdf670c4d5f0c7722f282660fc304447e58048e110dcacca1fd955bc2bd71dbe136f55e99b8505404992ee7280c52798b6210d239617d0141e713c3c470a9 SHA512 e62e660caad1b3dd07396c97a29e207cc0864c6c4e08ffbebf55fccfa6bac419426aef9d4c278d72e6c4682ea85e6a8cf98294356ffd1a631426cc90572c4f01
+DIST firefox-128.2.0esr-nl.xpi 623990 BLAKE2B 29c2b1c34365b39a1ae6a3f9528deb24fa8c6e7e514db12c52a3c7c87748c533f6909da30027b5451633c2bc5a3abeaef65a0aae4da4d33cd0fdd26ee5b3407d SHA512 abc32055b91b806d0b26f58fbb3424c2fa7f3cb2fdb4c6fdbfe81b587dee39d9e69d546589e49ae058f806134f3b3c78975e673520615a7e5f4013e278085d5f
+DIST firefox-128.2.0esr-nn-NO.xpi 617333 BLAKE2B 0b190cf732698d36648b23969b6253eb9af420f348a295b06464528dcedfdf479ee93e7b28f9142ca5004cecdf134ed1ad6d55a6e4f6db94901a517f3348751c SHA512 79e4b38347afe93413a8e9125f248bc6a0ee07b33f772b624d4b75282cc48dff89027fcd90ce54da91ee414ac91de983dbb6a511b5cdbc5c8481e76131a75dc2
+DIST firefox-128.2.0esr-oc.xpi 613834 BLAKE2B 6bfb9df2b1d3cf7814d790ea74822ec0ee3184bf6446da361352730e6bd842bd017ac291aa0ea8dc9ce18a7922f06e0adf7acd9200263049a25a2e3e16f57459 SHA512 55c7736eab5c2a87bd7f1f0466154ed1f4a6b50556f6d8d730070ec9bc9ca867fdf9bc301b87a8c3ecf3e918b9ee8e8d14cbd2c65943d3b3467b4f52a366ed14
+DIST firefox-128.2.0esr-pa-IN.xpi 697916 BLAKE2B 99d73c908caa19e2e5c08710263efef7430685a7ce15b52470b7a05ec7113d4cf39085716f4e4decfcdffeabee5a555c44e753d72d56f7d62807e2ab71d8de43 SHA512 16d362b213424ea92846d2088cc05aacbe27e3fbdc825968b68add8e956e3edc25dbca67daad0aa6d6d63807648f766ed5ca488803eec71b8690b9c4432d4cbc
+DIST firefox-128.2.0esr-pl.xpi 639651 BLAKE2B da262755746f8011e90c583772ba3e871a741cfc0fc56e8bad8d3d3707813141d6c33dc6b3bec27d1543afe281cbaa2f1c21f1256514062623fe662e20e16bd3 SHA512 54069bb979c4b046bd5a3a1be37bb76a7c3646b242733f6644440f8c6c1691974304d2f724a3eee47f3edf37c6e7fc7daf9b0738d01dd55723e3651b0185d33e
+DIST firefox-128.2.0esr-pt-BR.xpi 628970 BLAKE2B 676cd8b4a844ba42523f0ac50007d361796f36bdb81d0516145750ed8bda24928d58e04657164793547696e98101f9ee56c6b714d49ae1df26be49daa4b4d3a6 SHA512 530a16c982e1c24b2ad60898f8b2a09a4065a7b4fa18f481f4965bcec2824e3cb19c65b7a0ed2da215fe5cb9f6fd700be27b03bb6b3016077f7f4da6c7d408b9
+DIST firefox-128.2.0esr-pt-PT.xpi 629945 BLAKE2B 4724719ce5cf59950112d559679f97d97c9150ac71beb826066af4da1cf82c9980942bb39cf1937602590109ce8db8d9b0bb3a8b401e237a0af15cc7d0499088 SHA512 b2ff671157019dc66a44ee52b7bf5daad6412b0295e6836c63e4b75dd32226275e71905c22e141fbb51f30913489d92ab212fb735c9c160abd736b07c7e90e70
+DIST firefox-128.2.0esr-rm.xpi 619532 BLAKE2B c8838ad295b07b859f52a977539c7a23bfb6fdd58d331dafc28a1cc8cc00f8ddebb0003d89515c5d6887c40360db393e3e36c836a87373466781907af9070fd5 SHA512 807ce9c606de457f5323ad48c37f4eac14a3f17ab103982449fbc3fb00f1680cb2fbbd6aa08a2ad9086771c17e8912cf58e87726c03d58ba841c59b09527c362
+DIST firefox-128.2.0esr-ro.xpi 550737 BLAKE2B ed6e51156ca30dafe4fff0e487095fd2f61328efa05ca5be566238617789db0c9e48b44664ab774ca7dab57d632468cc664fff21e23af60559108dfbd2aa9e34 SHA512 d11ac70543c25e05d75b8bbb060dc61d76b7b3db580c371c92bcfcf600ffa4d2314e61456989961f490c3a351b3e9bb0e8de97b85eb2b5c7d0acc91cf0f7472a
+DIST firefox-128.2.0esr-ru.xpi 728469 BLAKE2B e1a4ee5a5a3713775e02337ac2703614b212e08d2c18a1ef1f6657ca185f7eb54bb8072c8bb6863d4a60a23379fe48b400b51777521897f1cf8da24e326f6aab SHA512 a0fd618808ea2618b7a9aa91a542b67a756142e7db998f72494470da6b7317fce117b997cfd88fe1754c0d98e30dbcd787f0d247e7b0c9c93d774b3c47711586
+DIST firefox-128.2.0esr-sco.xpi 512222 BLAKE2B 12479059be1a8a6e68495b741d9e47cfaa81fc681812d49c886add98a8509b7c82795627188c419f58d146fe528c56849ebdc560b108776d8df38e5507cf249b SHA512 915cdc9e164d67afb4802a8f462e07a1b54bfa6d8c1ef8a176fa3dba6f5298cb56aa97ef1cd35bb3c7c96c4b3cfd8fbacdba6da72e329ccbbdcc464894c9862c
+DIST firefox-128.2.0esr-si.xpi 614271 BLAKE2B 6683d541e613a6a1bb38c3851a506a7d1b488ff6e322a2f13d225726325acaad01a695dad930a45b28f7c8dd7491fc79bbfe229e28cd8907312381747e60ea8f SHA512 2ab355b69cdecf7477345c6ca66007ccc5d0ed8cd3b1ec4c50e781a9e373a27d92772c5cbdb61254efef0598922f42ea52ae4197143ee3a284daf39b791d2bbd
+DIST firefox-128.2.0esr-sk.xpi 659877 BLAKE2B 6e645f0ced95c99ee23bab4330d3c2b0aeea689b16b8c74afddf2efc2544f24e313be7312ba959fb8e830ea17645b95dfce69fbaac8dc7b269733443bf622613 SHA512 357bdb4751c53f5e35de22f11fd36c50775e1d59736000568148f27dcbe1ec33c48f640b726c9b02a79d2f5268736034be9f89c20a5067c55a531249e63927b3
+DIST firefox-128.2.0esr-skr.xpi 712006 BLAKE2B 38178aef30a77647f3821a2e84b59c0b9ee5a47e7c904fc84b2545fd748f5e51bbc67925bac9b1c72798ec5c58eb39693214b4d76d1a85f6acec65503b5084d6 SHA512 c0bd866771b7d6e8959b641b3279706ecbe10b542fe26c5d864bbece17eb0f528e282d0ae89c2e076955e2afa13f92985d2a4782ac33abe789778d3f8c8e1e75
+DIST firefox-128.2.0esr-sl.xpi 620258 BLAKE2B 8c6e6ab087c3e48f4e0ea90c811c3e75f2c6e10f3dc45b57308d26360b82ce885e98be7d4da12e686a60cbf09fdce9e7b78dc0d4834d9f197a87a398f474dfaa SHA512 857fdbce80f9efaa419e87203f4346d470453a5f68cca18e0437bdbc0e7458f14e1e95cb2b5e0f5320232a1fac0b3a903a6d584790abbca9787605a83f131863
+DIST firefox-128.2.0esr-son.xpi 417219 BLAKE2B e499f08a154ecff0963adadf6e8e3cb07c8fb3e76fdcf7594b843cb8192165d9bca8607925d13eb1fbc92633baaa6d7892d9717210206262ebb63d1d1d5af0c9 SHA512 ab5f1dbdfdf61b4b49a9523ad417523acc6ef045c104f4af9ab3affa322a0cccda9dee469dc75cd648c796e51e697c2c11cc2300b310a283992bc2221be23d07
+DIST firefox-128.2.0esr-sq.xpi 638610 BLAKE2B 7dd2fee860126ad961ab83649c6993c7433be1b7d2a90c99537908aa168bbe0b0483ed21e4d9d6accf182ae39372358da987f8804acf6cbdf60cce82456f9976 SHA512 e60570a45ca423262c40a34a0d7ed2e3a8494ba7ca87d7e7db7749323372af165d86e518c95972c1e632678fd21e656bd0ce9565a50d70e4c2cf221d262ebd1d
+DIST firefox-128.2.0esr-sr.xpi 640303 BLAKE2B c7e1b321433e77e75e2ab20df6a8d93fb40ad441e3b023cb34eb16d3e4bbb68a1770ab32626b75d5a8734c9297fa09dee4b02ed49f5ae72f79ffeb49547f3c5b SHA512 10b9e0960503b51d25ca4482bc30b286987c4cad608686d2575042057e881641ebe3961ef4b67057728ac25e1a8e8e3676c7997e47bd9e539c924786c2680d5e
+DIST firefox-128.2.0esr-sv-SE.xpi 625704 BLAKE2B d39240d2b595c4f1a07d79782c04f8d3a8959527554ce80deef87f0da6a99775e17fc84d9d4020fe597f47c281b08a0622b780d6914959ffd2e5a3398d845a9b SHA512 0b2ba39bd696213a32866bae50b51522fedb8b1159914b0c67e92894abd16192f71937fa84ec9b21e520d099e09dce6c9b165d7725cd45f364d99a3296d6c199
+DIST firefox-128.2.0esr-ta.xpi 508338 BLAKE2B e6157c1b8804d9f4a3df96da1bf5875feea25e2c1f0a9a4ffb9001de9e315cafdc48d46c92737015ace07429b585c07b075c10fedf53c6cd053bc516e481d007 SHA512 3e33c7be34a9e731362588a9a6577ccef65b9e6b8da0f5cbf91cdd6246d1e69e7c894d850e46c03cebbab3b150c20def6ae7c8e67f7dd88dd20acaafa2768daf
+DIST firefox-128.2.0esr-te.xpi 561989 BLAKE2B e71094282dc51e0e22d6a30f752efd977891cde9bd20bddb6ee806ca819486d18f73972414e431f1431a3a3fc6a3ba24048b73f06e1e803c783a4c7cadae403f SHA512 7871051b85ef4603f0b70c3eeed0554d14dcaf58bb68a9532a160fcc5edb6f4ee72f551b9dd3cb6edc430e140a3aff0eeef212dfd33a6d04dc59fa49e2e5790e
+DIST firefox-128.2.0esr-th.xpi 699560 BLAKE2B 262f81f2a972f23de74987c6c4f7f1abb3bb0a58ad2ac9d58bd8f4faf7cf21a80d984ca6f55bfa6e28537aa1ff0852b30680ca7675debada05885ded6ec8fcdb SHA512 55d43defdc19081862de57d85a58ac0c600ff3d4ca2a8e2b65a1ff62edc2ce888f275aab962860749cb80ff7f3e3afd177779fa3c7eb82187925e7b6e712b8e5
+DIST firefox-128.2.0esr-tl.xpi 535125 BLAKE2B 402f624b100eb0a9217ca568fb39cf8e4925fbbc6fe5c73ca187010bfc33371646c9eab140a32e7c5b77a3765dab6c285e400d57059e0deefd5a721c616c156b SHA512 e0b27a950526c12aee235a597353ba4359bdaecf65d1eac070465535edf55cc507a0e20aa2fdd12d41182d22f9547da239fcc6ab72228dc07ccc09dc8d7cd947
+DIST firefox-128.2.0esr-tr.xpi 639354 BLAKE2B ce3895f42612848dd8502d7bc26e6cda7ed6af5acf56154bc81622a0fb43e261064a609c5d3d369d25f7b4286fc9dfbfab5899ea28beb56594a37fe73179f21b SHA512 abd8b5b45d381dfac8465dec6d03ae7d329cdc77189ff501d80239962d8bb700f16bec0af102211d35f93c59464e94cdcdf1e2ac0d9c49e346ec00e26ad18063
+DIST firefox-128.2.0esr-trs.xpi 505308 BLAKE2B 43ebb6d081e01f2f19ea93326f12e55d09bf7051dc44c174b341b886784d36a491725daead5e686c765d5bf88bb4e1caa8f7ae46a5c5db828ad33aa5bd6e9e29 SHA512 27498d147e8a8210f356a7a4bec13b9ac56f8401680cb4b202d680e24a441840595ce6449d383854adb47ec86fc54291d5781229149715a4d9b7dc122d76ed9e
+DIST firefox-128.2.0esr-uk.xpi 708236 BLAKE2B 6eb7793590b30a7f8fb87646bf5d360b8b2db194a823cbdfc4ba5264076966c21660d175832cacf9546d0e25c9b1f6cacd96306a67ba62736e2bf918fc6119d0 SHA512 7f84aece3bc051a4bc8f1d110adbfa6140e84bcd073067f2bfcf28b131312bcac481d2399b9b530addad61e5d74e4b53d71006019fcafa2fa168396b5228e93c
+DIST firefox-128.2.0esr-ur.xpi 561298 BLAKE2B a7e5e158f05b2d054a31bbe04a2612d30b0819c6df168730e4d9a583612c83f23954d0606a09085950187761d2731543da18d83f9ac6e72ff7ad1ecc07898fdb SHA512 fe1db13e4cd8fa3c0b8133aa2fbdb3e7d9fd7cbf1263f8bd11cc107f813e9c1f2a8fffa6fcb90ae54222c56aeee71d54498e4e589408d2c6c05a95f215af7087
+DIST firefox-128.2.0esr-uz.xpi 479731 BLAKE2B 3ff018d97d47b43dd94922ecac370fb3b35fa0ee65a7c03e80454b1c9aeb696278f180cca64c0afdb46919b143766ea76407b68e27ff9107ff9e724c85f52f7f SHA512 d1c7d7dffbad956f23caa746959ea08161513470bd89cbb51e443530a6af3180c5eda8cc8b3cf92c5ea019bafec244d47977e1f68bd314e2e874189464179e56
+DIST firefox-128.2.0esr-vi.xpi 662722 BLAKE2B 3d807f971885139a5ceda0e1e4892418ef5c11ea6b9f858033bb22f691ce954afd89d871bd9ece4cbbda02ebf9af94720478e8a906b369c1d2ab11b4e074ece7 SHA512 4c0a4ec3c212b5037177569fa73313f6cb6252a033c42a3be087acd4859da655f48b33af67543150a0d316ceba52996212704b5614da2d7f9a215af5b369f628
+DIST firefox-128.2.0esr-xh.xpi 418005 BLAKE2B 64fd099e72391d0b761d0b932d6a64fcfa08c422999867fb74f09e154c267d9fb773d4a30fbe9344bd67d76b6ffe478b3800e2bad226681b9611acb8bf9b0ebe SHA512 826a3cfacde3c34c1226d4827173989f4f53a0cd01988c155b7b31898c6e2d598a03fd20dda627e20f06dab429612d8aafa3e3313241ddda8dad9f948546986e
+DIST firefox-128.2.0esr-zh-CN.xpi 662335 BLAKE2B 703cd2d34bf9f71d3bf10029130e3fa0676eeab6477a5bb877d22dbe252f8026d25439303adf109d41ba2ba7fcd0a5096eb343387d29cee4a38a3dc657b71ed5 SHA512 0d1fec76fbb07eb737dc8a606defec8c28a016bbebbe87815cc922977c89ea950d3f0cd187215c6e319b1f028fab97e19ee8d00e0cd743f7d90775a99e457b65
+DIST firefox-128.2.0esr-zh-TW.xpi 666623 BLAKE2B de33858cff0cb04c6eb4decb4a801eca99223f9d4021ecc8ad1da526f5aab5f9acde107ce2844a7b235303639607d24b9c1804e1fcf25171d33fcad778b47ea9 SHA512 136074ee7581588ced7d8c2d596dcf92d9b2cbd0312fbead9f3fefaa9d28a294e2c048b1ec0e472b4224f3b17e1176ab1e99d677319c1f9c941665ca2e4219c2
+DIST firefox-130.0-ach.xpi 467588 BLAKE2B 13924fd0dcc0d0c1a2cf7760ef263d257da8d6f761bd48d503c6e7fa8438996f36f83424383d6b285ed76eb6f284e45eb83ea19dc5892d99e0b5851b4635e4a6 SHA512 fa41e89ab9237b76094b660d439a8100bcf971c81c7f4f628f908978cc22f2018f21fa10a415925ce0f34e00815efb9f55210bc4629b9185035a26beac0ea5f6
+DIST firefox-130.0-af.xpi 420693 BLAKE2B 7e93d3dcf9a7e9ff348fac82174e0b103a6e3d9c6fe57b3500263211cf1e325b701343d01f6117669eef0197d0fb31e75be9ff0e7bbae3f952183ece781c15ad SHA512 3add870cee9dae595b7b4fe7f2e1a122f51ef937090422b7ea5723b87500b0daa7e90ff5e0a9f1e5346dfaf9ed78eda4df64b1dc5d4cc3732e76f626d38551b6
+DIST firefox-130.0-an.xpi 509179 BLAKE2B 1727e110a5328e5cad21a601db2b61318441fa58a4289584fa7dfeeaffc3591b5e14f45342365fab0e34db9210e0ead4b1a1d603b5199fe216a1227db1bf9e91 SHA512 ed9520e7c2825959e5239ecb7e4e56850fcd20abf9f749b8990d77a418aadb691ddef95de0c4193de7351ba59c4c96ad766f07cd19c1b893d3315ec814936617
+DIST firefox-130.0-ar.xpi 615236 BLAKE2B 888a050b002e1e09c1c245d25db64d096e8ed5ac20e2eb024aaa8101713548fd8b13979ac5ee9469326321ec16b238c332c74402054129fb88841a98a6be86b1 SHA512 14aeaf22b05e2574f0699a7abc86e6a96d8c22ba71477fcaac7478a562921c16399518b7007cfe7411efe51c8a0bade72a1e47f6570fa58efc6b99f550da2fdf
+DIST firefox-130.0-ast.xpi 499645 BLAKE2B d9fac1d64e938bb3dad3d9d675a2aeb393682020babed7f95d8258dbe9aa49bbefe6599ed314d50cbc0def96c7398b911f56721c9e4cff98c68151e3655c6464 SHA512 249eb1526ef6c474fde33bb0cf81155e14be8df9a06e1308428e6eee43159c164f32c1fd2b79d3a1c6190ef566bdb5e281a379ede68e189f71c507d8f0a5cd1f
+DIST firefox-130.0-az.xpi 494320 BLAKE2B b1a72494ca10887329f33c56c553e71db44c5fe6974905e3ee5ed2a4189c9f83d9c79e4edb0a96818668964667b24f01741406d925be31c14e4c544fa609a287 SHA512 afae69e0fa446a9b8d710686ece98ed148effe4e1038c863a2342a8d97caacc726547520a12375125a27b3771f9a44cad627a7516bea34d884e685d6612fcf23
+DIST firefox-130.0-be.xpi 726464 BLAKE2B 46a0ea6d367c6c5e0342b64f841344fd9f9b5f43434aa3f1d7cf6abb990d776d00469d40b4e77d53a9e4f35272e61e7e780be815cb9e7b6c7bcf19b328a41d5a SHA512 b8d26bb08317850ba0bcd7405978fabe361f7254b0bf861ece7bcfde09ee04db659817769ccf60db858fa5543bad14cb9cc43abc8070759df4435ebcc05d1b12
+DIST firefox-130.0-bg.xpi 640068 BLAKE2B 597a3613635d6835b9482be4892ac5729585ed0ffe18c07f0981273ada8a2d275f403f9c838a2e5981d98d486842e38bb3f3e2f0b7aeb0cbe09398d286fa6fc7 SHA512 0ea21b50ca8d7314ba0b8ed53c18005f7e203c4f172d55e363ab4d698eec99d346d7dc870d4e8ce0c8bf14c7d31c123c6d28a3861d378d1bdd7454bf512b8c55
+DIST firefox-130.0-bn.xpi 585048 BLAKE2B ed70f1f513f568a435b4d646f38c9a87950b064675f06f5dbdbf2c4b4cee60564a8ce2ecd0bb4d053d605dc10df321f807bad29915df5e06360298d5650ad751 SHA512 6afc892e77f826767f2fae8b3eadac13f63369255f60b4846b25d2b17acf45d63f2add409313be98522c04e6f47730712853bb8e279685a64b9e7073a45ef136
+DIST firefox-130.0-br.xpi 593557 BLAKE2B e52c14887baf248cebb64314e20079751833d6afe78de174c21fa759261b3287d20e2bae8d56d048253e0e54be5b3cceded51782a25c771f5516148017788850 SHA512 08fb191925d131b72529c8af0cffcb83766e63345f9813a0e2d93c4bd19d08e5ed215c4c1c3fb32b10bf12f078f9e16b4a97568c09257d5b359850a3f71002d9
+DIST firefox-130.0-bs.xpi 512747 BLAKE2B 8af1891916cd6b99c32aa0dd3fbe09905e1731bf9937c13f4b1fc35a23eff2367b2bf8eb09b49f17573eb49a43b7b06f026c0ba8df8e3e89dff237fa6390e9c0 SHA512 3a110646d88ec35f769c4f85ddca5e5192eb35b962ac44872deb2a466a740e144a7048da5b8956c66ce006eb07081676e87182101e092f17bc2b7baa089ec838
+DIST firefox-130.0-ca-valencia.xpi 549203 BLAKE2B 857b8c9060c458796e4e3a9d8facae30191bcb8cd4ef8a2ca944785849dcaf4f408299fb70edca5ab3732fd0b4977c2c2404fce9359c0bf29f864173fe78f78e SHA512 938ff218edfc55ccaea9ff8b58c47a24c16f62081bcee88ed902bda79fc66ffefc1a498794c5e5dae1ae6e389b7fd1f1bc31ef599978213b63b9e87be09dda3c
+DIST firefox-130.0-ca.xpi 600852 BLAKE2B c9c22ab619eeebe4a5038cb66132c0494c3c2fd92063ebcf3d37dc595eb1d61165ce929b06050571fe57becb5296f256474f36b102f2f3b00162bec42f621538 SHA512 babf6a445f8cbd1a7067bb3aecf8d7ba98934cafa6d9d4890bc16b4d35034fcfca25355f032c3b3440a9d95d954c7b9e21797abb42ab4a3897cf0ba53766cc89
+DIST firefox-130.0-cak.xpi 596822 BLAKE2B 5206c1d1127c9ea91e7bd1bf3cac96fe32db820d3d845427cda6d143bed2912ab9575eb9a844d4a1df57f1235ce351acaa76d90a381586699df5f0ca00a91b5d SHA512 fa3ea718ae2cec52ac98d57ef45c302e3f53897c2aa607a4b3df5c73cd4a3bac0d7e1c3029bb11a9ed6bae87dc4287cdf7921955ab9a852da1467dc076996b81
+DIST firefox-130.0-cs.xpi 669121 BLAKE2B c8d35d751eb82fc238bed3dd6d37630625883d6817a1c7f74a85d16576f008f6321fd13f2441bde51bd367c58a3b7bc053d260c81a8fc9cb30c458fe959590c3 SHA512 c91bee8febdcb7273263969b1a526017b63a97ab4a88ff4e1ef689cadae39ba4b7afea3258a4160fefffceeb783758ced4626dafd967919a12e899cd50cba36a
+DIST firefox-130.0-cy.xpi 633981 BLAKE2B a595c6c71c270296b29621b68c19988e1862dcf801bce127f3321525934a9844117328de35df579e38d26e3c1a6ac2b5aca4aa1af458d94da1328f4cd3c7bfb8 SHA512 0723f2b44f6a610337083f208866ecb6ccee5e49db41883179c36a0d466c50f4f44d089f6c95dc1cb9f7ef441a1e7a1e3a725ac30d5bfb4b80d072128f797755
+DIST firefox-130.0-da.xpi 622378 BLAKE2B 5cf535014d0f5c09c8a9167dce76e7ce9e322a1f604af76a59fbf1fe54ebdf1aedc192800e2126fce3eee76cb44265aa5ad87050bc7daf52ed4d6fea7ac92f47 SHA512 6dee6ea106ae178d4a0fb418bf83dea35b6d954b3620a4eb1f6442bda3b1f274cc2069c1172b95b5d2bf4d7e6d45e98760f7fec4e41b31ace7f3a29758e1d43c
+DIST firefox-130.0-de.xpi 644003 BLAKE2B 5d6353a1dc0e27bea8f1554eb3452c22c27fc99598e3c55f7a777fc833e966220eca450fe1bc26661f68cfb6011237561387910fe5df94648549f913bb11e41b SHA512 1f43b831c41ffa8651dfd7b02b005db48101ee7a4de61bf8287700b776b6c0abd7929ce5450a016beb194d578615a5133a9d2c412d17501efdf8683dbdc44ae2
+DIST firefox-130.0-dsb.xpi 658767 BLAKE2B a12c538d8e41bbec195b9e3562106f47fddd0eaba3438d5a2e836b3a03c6b2b126f8f6c899303ab2d57ea0ada23694a1f9fb4da657451cad3dda908edd1795c1 SHA512 edc9df4c6139d3eed046f987e6f4c0da56961f2d9dda7877e9452b33ad80740c8ee14c4bb3f3f21c6a47db5ee06ca47f9b7fbdce427e8f04cc66ef8461e083ec
+DIST firefox-130.0-el.xpi 743356 BLAKE2B 88692701510fef5a633c15748b2992868e733fbfd23cc0a9ca30575751abc3fb9b9e09ce81d670ffea4e37bbfc64a9c326b254a897fc059333a235f956636482 SHA512 4696def5855583c15f6f34ec9e5aa8c99eb9f9b12e3907c62f5ef36592bb24d4c3911134448cdd4a84841c8982815ae3934ef40ba1018aa039948431dd71ef29
+DIST firefox-130.0-en-CA.xpi 593000 BLAKE2B c0c91b2fe07e55efa13d993dd6cb2b68446746844369e103202fdb54bdaa1ee9813e78b94558d7ee3a886f68c079b5418c65a022be994040cccf5718da9c0203 SHA512 a1308fdfa709975e8dc61b6f7d0ee72cffa76e023dbd6b97072d7349a095e14a8fb61010a82f857b0b6431ba403a0aeaa7253b5b1e3770fed05dd6fcf1d9d3b2
+DIST firefox-130.0-en-GB.xpi 594149 BLAKE2B 0bdac5f735a09ce86b6e8b1ee2906096355d2dc86731553555919e5c616cf80faf6ea5e6840368d4bc48ff70d4194a5ae6cba20d9efa1ea34ebc1a07e8fafffd SHA512 3c904e13cc151110699a8c994fd1f6d92b4cfef94fe3b4ba5ecb3378e1dbf92f063c8010b01bc5577e2abd5b3d4904c4faac7772670dbd92d747e157fe0fccec
+DIST firefox-130.0-eo.xpi 625380 BLAKE2B e46d8c9cebc2dd67d36a9ea671cec56612cc63c833215b0a208178e0bc9f5d5eb00dc7ee8f0e8d5651050c936c28fa5e2c1a830108d3cdc41921077543bc8544 SHA512 d52efd37c2c58f4c116974737acf6b50bc7b268074456ab6d7721a2018c53da3621447b0b090b97bec51bb86c9589a050f499561ee1bb49c1a81e8cb75b37707
+DIST firefox-130.0-es-AR.xpi 637457 BLAKE2B 1e8bf2bd2ea8069503169d5a088a468a4ec6c67935ede6eab6f7f47eba2906bc5fda0685e3ad0e8cf26c30bd56d1a66cbfae70cf0f29ef8ea4a17bcfa3a0a443 SHA512 71ba4cd7cbefb1b3589c039c759bd0a2a3fbcfa2b90c750a0c5914f46bac04c39031a08a094617e2efec141dbdfb7db1a4f6992166a0b98f7d91c5f4579575e5
+DIST firefox-130.0-es-CL.xpi 636359 BLAKE2B 2b8fae6ce7bc4e137183011d74f5315b0dd7a07dabd28e72f1347312d892c34d3ea6e9c013a1696e34137140301c1239d87f947b343af231373e99856070c317 SHA512 a213d6bf27f1cce77cfe58c98565f1d6208bc5e05622a3e103bbe58ba34f08b117046ba23e5a61cf717fb4dce6a755bc75f80f4f78d3f53b7767899ebed3968c
+DIST firefox-130.0-es-ES.xpi 624788 BLAKE2B a7c40de76652b7ea45e78d2a77300589504c3e62abf88876d7a56cfd8798f7d8058c21a722b106c789a83ff71eb5b18b513472ce4659312463529d5880efc577 SHA512 e84a92e65ab4197272499df805f2f58bb1605bbb04494bf1b65b88ab317175cf14e4748ac11272a902d04055c51802c41758422a9d2fd1d89f3c8e1e1c379415
+DIST firefox-130.0-es-MX.xpi 620037 BLAKE2B 2203d2faf00fce513f57a07e2d835ac324f178199e7a212f1809d2cf162dd460df50baec1195af6ec04370d9d411ef7a83a50e9c724bfbc8d0196fc47d27d876 SHA512 8d4bbdae23a1c2d1d3a8d97736cf1693b4e8e95c32725649493351d6a5ecffd616625107d71f48089fc51d1770e3da33a30a40a2b622ee4b001f75cfc1dbcc61
+DIST firefox-130.0-et.xpi 543274 BLAKE2B 00bfb45208a6b3c562a982991e9f37e423b3a50bdea1e5fe5ccb9de58649ff31b723798ff90c566ee400814f01fecd39843eb3bcde3cea280223b3cffe7a4d5c SHA512 d6eedee6a657a379997aa8507fd4534a2801204aefbf2c54ae288e7d4ffab4a82359d3298b833aeee8066e726034e9b1d62c4e465d521365bfa392f5137ac011
+DIST firefox-130.0-eu.xpi 603909 BLAKE2B 6632e5020881c468da93fe03d9a595c40c7188cba5223e72da63a0a181ed95ea698da24c8b4e6bbfb8b339f1ea22b3cc3e38aca1a2b192a3d57f609e1a9e7533 SHA512 61446a8ebb9d23f5c7fd7c05f4a7e63f1db8c33246800daa952d7429070131e5b63bda772bed4ea8c48597640a2ac34b243925a3f7194fe295eeb68f55047199
+DIST firefox-130.0-fa.xpi 593582 BLAKE2B c0d9344b9170f8eefd9be7c495871a5edebb04403ad8e71a0aa031d16fb3f9c9c85825cb64260f82b2dcc15f9a98f1a1196871c5495fbb709a5d63fee3f23a49 SHA512 78db25909097c74bae6bf9c58459e8bf522cc02c457777bee656f9480ebc2387b5d05e1637a9cb6fa6dea9c516eb347271576b4e31f05c8bfb7167380a14adfa
+DIST firefox-130.0-ff.xpi 479255 BLAKE2B 7d4a7aca3192aeb9a92937b034df91211db7bb66b873124f51bd3e03d2b004dfe2be7b7c286b33e2185dcd39376cbc9437626fe987e2edddb878d9c3f279ddf7 SHA512 a05bfbb0e1748b286734500161f681ada364c61ac390181134916f372e01cfee252108a759cc413a4cedb2181f68757bf13dc51a5db24ae8e2f72bb1f2928d88
+DIST firefox-130.0-fi.xpi 617454 BLAKE2B 3307e3251b701bf861a7d71eff1393e79e190aed85f67c79dde5b33ed93089d4a32990c40c03888f338dc4e405cd9ba1efba40087353b743e79773b82cf37235 SHA512 437783e5adf4fdb61a7ebce2e808d2d9feebc06e2380ec12de8bf2dc593134c944902b746fd7b9dd0d27b8c768705df28de9920680a6971e036294b4cf8f5371
+DIST firefox-130.0-fr.xpi 651038 BLAKE2B 7d8582f01e29533813878938c6eb7aa3c3bd164f6050b462404a1bc220428925577e7b32fa64bc0b138105d626c7951b51f86704ede1a846f7b5e07ce2a3c48a SHA512 ab4679aa3f949d3e948cbdab3150802429188450d3f180d098fe090bc30e2e971c80a0a28f428d80aec28169f4a2d6521bc85014db2f9fb43e4af0f11df0dd98
+DIST firefox-130.0-fy-NL.xpi 632428 BLAKE2B f0fdb9d47a8076103bdab21c516b482e859a6dcdf5b984b3b0242887d9535aea790627a9db9d85b56fb4accdf2e5b45443594f1b4fe645a8b527975044a0eef4 SHA512 bb1e4ba77d60a27070aed23b1cefa095f895e75f4c597a82592fa86e2b2b3c1c9c6fb69a44d7a7726dc52977c7c3da21e2b1f2eba51e6059f258bd68223af500
+DIST firefox-130.0-ga-IE.xpi 474442 BLAKE2B 3d84bdf740248c598769a180dfc799db8a754c7072be9020355fbffb7b409b68b804ad9cfc96b996e34acde17b7fdc504ee783dbd26facf173a172220a8a1cb7 SHA512 62ae04b8cd65f44ba6fb1f13cb23522c31dd17e9d3753d97f0df2bf4559e87ee26c75f08de09efe0508c10b02717e2a40ebf9f1e7674772d5ebef83675f13783
+DIST firefox-130.0-gd.xpi 600334 BLAKE2B 54e491177cceb642b17beacdab8ee1350b0b43e723bc0933b90bf8abefc392f557a65b75b9161ebc94940a85736345af8cb5ff57efcb733ff33bdc7d6afcd476 SHA512 6b3576408a26339e8fcb0d3d5d0864e722da3c7a07fdda0e08769d56d8f061e3ee0aa7c35145c6b45b3fcaa54051dba1cfb3f5bccb697a81d2664cd782b11a7a
+DIST firefox-130.0-gl.xpi 608037 BLAKE2B f8e5a2b5cbb4eb561e1913ddfa48c4ea889bd98610ec3cb274f701ed6c33d042280c429cd8ad8f11fa15dc5c7ed46b76965b39bb18e9907d9eefe911810b3a5d SHA512 bd522bd76f869d8f599e1fe4723092c93ff958737d32d0c631cdf80c393c526eca572eb6431dcf3c7b25230a15e9c8b0833f696cfa6bbfbd38a5a864ba312217
+DIST firefox-130.0-gn.xpi 645999 BLAKE2B 3e377ecaf82b40ca84b33b96d0b9a47e67d68615a85b4cc0dbe82c09003b95f4609cc295b628e79c96fe8380110a774aa8a9d125c1ce3ce24d36c77297b0ab5f SHA512 f266ed0192376883eab75ac901d739f6f94340accef9b1a1b6927cfd4fc7ab043928857983f0c62e4611c73ceed58fdb23827b2024884b3fe746356dbbb7ef13
+DIST firefox-130.0-gu-IN.xpi 530812 BLAKE2B 53b9ff70efdaeba4c3a8ba1e0c317d8db821cd33da0a260f851bff71ec7b9e99956dad1a8cdc161e31e6128419034aab63153d1493142c7dbb350d1eae1dfa21 SHA512 178f4d2be128ae95de567e7270763bf08031d8820f64132c0f3a90ee72045ffc20094466f71e913f9add12347bebec25f6ec5475e5e553d4cfd316375922dbac
+DIST firefox-130.0-he.xpi 640049 BLAKE2B 89a0e0eb440e95cfae64ba6866b7d9a92ae1303dcdbc2adcc3a73cb0464208a9e5670653d3619cf3dae1e928aba0ecde894581412595d56f843c0d65cde78eae SHA512 5f489dcdeff2957987d3fb78e628be675dd8921b6b1bd91c8cc1ce810c6b1d527cac942078a13da79dd4c2b07e79b01ce573a4b876b00c0e4254ef6b6f6c6be1
+DIST firefox-130.0-hi-IN.xpi 570024 BLAKE2B c33eb46b86aac94887671fc6404b25af79a9e39ea79cf5aa2fda1d0d63a67886f9c27bb171d3414dc1efbae13d23646d766403f01e99575e0455370016caea46 SHA512 3ed7f402ada653fa21f20947f0bc9730bddd84704e8de0b594e5298674b6cd0d7e91f607211019b4d138a8e327cb03ee0ead21d1633e27b4c987727bc383dfa1
+DIST firefox-130.0-hr.xpi 617522 BLAKE2B ea4772a15eadfe3a139569175d102171cf074772968f836e824e1a3d1cefc10bdf98ff5bd6a1d7d1d875f763d6f9b0fa790089d9c4ea7263e054e4b65602c5d1 SHA512 4ec531c27608bdf1c20734aa25a33a469d64a6f59203785b28494885e8e468f92af2291548a509e97e6ab0965803d65d65ee5e843840fdd5988253e45d7f49cf
+DIST firefox-130.0-hsb.xpi 654771 BLAKE2B 0af2451d51f7de25b9e5cc3f1e543aa673dd5f0c899bf249399ecabddf11955b1dce1af2d0c771dfdcabfb78b871b12bdc5f608dddd0babbe50c59e7d45ef4a0 SHA512 0a0232d257936398dbe2469074bd3dbfc596daf49522a640926027f2a3b22fa672a1ab3953d342354945550e9366a7cd6d5f7494515ee28e381c84ee5a8b4b08
+DIST firefox-130.0-hu.xpi 659669 BLAKE2B c5cea2daa745baf2bdc08089ce33a8469613f175bc055f10c0f7fe00bb30f7ad58a59381646d9c78c7a6015483f29b3b9288e278ea6fd6cd4531e688350bd600 SHA512 8b907a97356c482f863556fd811de64d576bd4d1152fe133637722ee4930149f40b4bbfbd37a897391e6fb7185dc42fd93191089098b2d9e9c403d4a39f756c2
+DIST firefox-130.0-hy-AM.xpi 655061 BLAKE2B 4ad983457c8e3f7bc6c9e9d3a010094d189f3577a0abbf2ffbb07c6abce47b18c37d0b70fbe4fb7836c25337afe85132f6d10d8c644cd9718748813157672d18 SHA512 6590e7fdd994aeeb45ad95b6b5ee28bca44c6310af2eff58d7393fe9734c94333e8603194dcd4067bfbdc44cace09a198e8a026b530260271cf1bc5a60a4829c
+DIST firefox-130.0-ia.xpi 620415 BLAKE2B 6b5227cf8d06e3cf4565f0e1a5826a02e8bfa7a08b66e10451a1d28e18820b9a3b7c8205510dfa8befbfdb0c2a5ffca846eceb3576c0b4ea107b5934c4f09060 SHA512 2eb6ef97be73d78acb32bf0ccb248ad358d60b95258c333304cc180b16ed231eb8b90abaca1252722d0294a258d8c541675d9189dd33945657738ca15e9de687
+DIST firefox-130.0-id.xpi 588473 BLAKE2B 28dfa350b749d6b1e4d52c011b11a1cafe6629cafca9e376dcbec9df531e8baa951b9b7e503c90e05240c7370aa4bc2c10f5f427872f712f874836970df504bf SHA512 7b4ffffa9cba6c3781e953b06f34c2584bcc623483e11b6922b3b1ffb3b0ab70cf37ea5983a56a777110278277bf4888a580d881cbbd20529dad85ed07615845
+DIST firefox-130.0-is.xpi 622838 BLAKE2B 963d2363dba0cad9e9c2d170f8e880de599673dcebc0ab4824b052f0701d2f98eb1c5ecbeec0eeaa9f54713e39d7f27b23cca6ec537d6893ba32968e37abe9ea SHA512 6151fcb5bead32a177acba728c712b2afb12451d4dc71cab1a18f65fb6c6a62893a169d369bd3493a4c55e9c822d9b39f030e8b44729f8887f708d71332d6377
+DIST firefox-130.0-it.xpi 576702 BLAKE2B 84301c0696fb27607a050d2887d54aba848cf19b0b138f43349f600818c2f06b3c5927113202087250bc4f410ac11996974ab0f322a2d077c5193d1afcec363b SHA512 ba042154ae2d32047f506b90521b6f1ef57ddea5df5cb1ca85706ddd927ef845ecfdb92571feb9ed79cfd6a1b7b3f203f9a5f39825e7d948f8c88d88644cebf1
+DIST firefox-130.0-ja.xpi 685864 BLAKE2B 994c7436ad0fee1a3d15a5b43a67f2663ab5609a32d5f39a847b4d90370b3c1908663e0a8e7280fc11fde86d4bf99469ea8c07bf37a8d26b171118f816e24681 SHA512 8f2aec5d3158b19441d1d1cddae1e0c18d5e1055af749f110b5193c5b26a3ceef50f213d690bffccdf084fa3f9697cf598f3503f9edbd997cb916553e078f538
+DIST firefox-130.0-ka.xpi 664736 BLAKE2B 0c5e0dbbf5c5e4f40d465e2cbd8fdfd3750010af24db9a2ce295af0a2b1d6f2123ff84f177ef2b123deaab2c2087ef37f5fd2500b390f6a7a50dfa16b10d37a7 SHA512 9b8aecb84049dce769b65fb46dfac1eb49e75020cea0ccd9a99c7e3dbf4d4b414e0df752d7e901db188813c2f5e6e7fa6e6bd372ebfb19a5bb8dbd9001358c35
+DIST firefox-130.0-kab.xpi 615479 BLAKE2B 47e39d8635fa0db2a1b6d78b04545a67d1ef569e0556d6e1e042e46e18ac52ef90bd80773e6bffcb5b4e0bab512594f18f441a970b2b152a0cb48d6922db4010 SHA512 95e796832d630f244d176c7eaff9bb5f0c1294c11ef2809019221ffe5e126853e19818b5899dd5d33471e1c248dd83f967d637e686e25a2a346830d5b17a6b12
+DIST firefox-130.0-kk.xpi 718490 BLAKE2B b87c8ae190f779bdec52d4b5189a6e8ff0bdbae2d651ba5e3115dee3d4444a0e91ff4a1476e34a01018a80b212f00651cea8cbc7b3b1a7890a2be048d821adb6 SHA512 6f9c1d05d2475ba2eb335bbc8141b70e843d3c4c06cdb0fc9858b39abc00b9f50089ef938fc9585f0398f314049e0e16ee8b4b1e4bad651bd49715c16552d9aa
+DIST firefox-130.0-km.xpi 529330 BLAKE2B 6fe95c0179eff56ac84c86af5f05196bbaae199058b90b44ce67f3f2fed2ed9043a490ae0a708a1c95c502fbef7c8ba18067c34b140c2dbef57d6964b0f03f22 SHA512 3c261aad08d1a4b3b42820b1d7e5f41d24618d3bf74c2b1710f499b238700079d374f254af67aff69fa0f0035070ef1757b4d646538dd8b5d24cf4cb6ebdb2ab
+DIST firefox-130.0-kn.xpi 494344 BLAKE2B 141e008cf40471245f3d227836c48b1a7400d1ebadc47a8f4f16bf46b7ffe58c50311e32268d09467c8bb8d773d026ff466c49ade05f073a7410f466b0baff68 SHA512 84593f1a855ab631533e2fa1b454928bb413405b064f5198fd8fba2bacd6034022717a9e0911557e2045d862e40f3cf3d63393cb11c715e04741fa796d9e8a9c
+DIST firefox-130.0-ko.xpi 671547 BLAKE2B 7c891d33ddea6bb05277c4976d0d77f772b73b503b42ebc5d2c97715acf9375c658a9dff0c48f5a8d2376450b1d407513c3a1c9a19f81ec30903cd4257e98dbb SHA512 3d9e16971afe2b30b7be1c8fe927e7dbed4219c8160b9cbb7ebb4333a0307a8d09434c64fb6afba1234be5501a1a3a010d52b695bf39c0bff4dcee6027db553d
+DIST firefox-130.0-lij.xpi 487638 BLAKE2B b45300b5f7b575482fca641b2034c98df6df38e617fe2894371792169d343e19c905daa0a269fd3cc8246b7e22f59d59ece2b15da95f7a1c566355c1aaade03e SHA512 ad5e6cb01bee9504c5f98e787228fca2cfd08c0fd318fdc52caeb78c3e9b493af4d80e4c0edce085ea43d97cf57bac7419854b3022bc5e1b7ad886fc0f7ad5aa
+DIST firefox-130.0-lt.xpi 576386 BLAKE2B 146c5970f84c36701a91eb109032d787c9112aacf06d6ec6a6e82a9a94962c68b7a03f8188908d3ce215493b0a2f2bdf5fc2910b1e9d800b93f96ddbc345fc69 SHA512 53509733b53e4147cba22cf26b5102873d97b1939b16ec5be6cd49253c48912d6dca5f5e532c997fe885e9f71a89c3dcfb922ebe72569fd3beecbb2c340ea353
+DIST firefox-130.0-lv.xpi 589138 BLAKE2B 222f3c760cbc8d18da5dcac891dcac76e04285154eb1fa2a710304f13c35a87b27693ed94bc3646182d831c9dabbf429812fd811d794453c509d5be6d496b933 SHA512 a09551cd689851bde881ea51a0cd1da628dfc184d66238d72dbfa899b1bdcae90de0eb07ae3240fe9acf4bad79c653ee117f99482a511338c8a4d0a2f1c91160
+DIST firefox-130.0-mk.xpi 496958 BLAKE2B 1c3ad1e9c3a918a6f327bcaf3fb2e551a05bb2ff38a51891f1c810d68c190b8e210890ea70244553552f827f16dcc58f210e19da06a127a2f4c6657983a972c9 SHA512 3303a95dbe0f3a6b076f67d281ef60ec6a0d2f682a00578d8ad4c8fd2d9ebd744cc4f5e348eb889bc536a2552a63ba9f1a997c75bcac30da8cd65368f665457e
+DIST firefox-130.0-mr.xpi 535458 BLAKE2B 1886a9710a35422e2b4449fb66f32cd1732765f318d6de3eda15a1f8a3231fea770cc01d3b4d6a8f8b8dc46c61e9daddc6b4f870b04a55cee3418c712591dffe SHA512 f6142b00d9507383e5d2a5fd652cb90e17d261cf1b9bdf4353c715c37e65a175b5e1820e3e89c284f09eff8ee593d36614478e34a1131755bae669888657945b
+DIST firefox-130.0-ms.xpi 453245 BLAKE2B 2511a262027229f4f65592c67dc8c807fdf90e76a352838938701ababfa342bf418c405011cfb7f53c0d9171e982f269d1ea962c41b97d4a9a8c080a66172b65 SHA512 f644ff75e6ac1bbd252bfad7b1020867c907c4c33d4334d0bed28acba952be79669c705804004777b15ce2d911f8bc020bc24ad63a9915af783878776ec2c0ea
+DIST firefox-130.0-my.xpi 521885 BLAKE2B de85cfc97c91f5a3d1274d6d72b5bde65d4b40f06c24a863d531340d46d3b70c59f9c7919f1d2bf9fc812fe79414a3fa07641503eb5ded5c92682060d9019628 SHA512 322c1cf80c3da649738002174406748d158a51ca5921fe8a422d52bc7a6c7281cfbc141bcb9cb88e1542894a1c2fc0cb7154ba205ccb9ab0047d5cbec9663cb3
+DIST firefox-130.0-nb-NO.xpi 615481 BLAKE2B 3753dbf18de927b8d3e4d13e94443b65510d9b117c156c1bf7596fce64fd39c94932e13878ea8324ba781bd4e7a577ae90c94cc0eaeb5a8923c0f8a0ad882f86 SHA512 9a6d80b4c7c0bdb2f2de01d3b04d7e1601725513cc2a18e48c8daca4077cab3e9da92882be54cfa0795d588d15e90931c110a7be274b8761f1e9b5523600e250
+DIST firefox-130.0-ne-NP.xpi 517919 BLAKE2B e0c73b95c0a3e5ec9aa90932170822218109ede720fcf8cb7fdd3639f851301df41c73de922c26f0d4b39b59657e3ddef488f42ecec84d59315943452cb433ab SHA512 30cf81482af57b9b7197fbc0a5ad15dee28de0d334fcefb4f7f4c5980bba7b193b514212fe38a109a9e269dbfac7f6ea6b279129c5b660958d03d4f547058fb0
+DIST firefox-130.0-nl.xpi 626066 BLAKE2B 5b644976d2530f600dac8310008a34736b829651a0b06c51063dd836c962980ebdd30a20f3eae84e17e92058fcc5998eb0d914bf89f72380f85b996f28e65ac0 SHA512 40939cb83f01aa4f3699933f5463dd085a6a443d195101f6988524a8f198e6fa51e0c06a765246163b0dae8fc3251c0ae8fe6e8e3254a183b8820915323d9596
+DIST firefox-130.0-nn-NO.xpi 619760 BLAKE2B 6842c61bff3b1b4d77d18b5859a5c87c065eae7ca91de375841e1898abc996f1d07242efe9406f8a2af39993b071e91aff221e4f379809122950a0589f143736 SHA512 208a4f8a5d5820afc8fb8f511c6f21a8afb37e9952ecf1bb54539ffcc9e71bc0ccb1fa0edea662d7704cc3bd0d833084694cf24fde633199c1d1c97a4b28d565
+DIST firefox-130.0-oc.xpi 616652 BLAKE2B 561b30e0fb9fcde1a727deccea6159c65325806ee8ab1a9289597f47141bdc7797fdefeff85b342d2540e43c96c92da1bdb5395f9776632f27a7f43764595d6b SHA512 b2699b1c228c4052c14f7ee6ca5444a7edf09ce211e2fb402cd0adf25ca3396f4651e76e8577f21c3c1ae93f676c113300bf66f2b69f8bf6f1c943e766a7964b
+DIST firefox-130.0-pa-IN.xpi 700426 BLAKE2B 67a4dcbd8f441b66d93be4e6df5b74d8498662bad215e176e89167496e45b939d7cf27558af8e88d9b39d149a5023f10256928c8faada35c7337b443e1d4d266 SHA512 4da381e49070e34b493a9988636726abec70ac0f953b005bc5af6a09b87e5a53de6e2cde80342ff7a45ac1d762f4328a40c198531500c150cf8f0ac16fdb162f
+DIST firefox-130.0-pl.xpi 646166 BLAKE2B 0b20b78f961286c1e076814bae8787f83da22d804800e4d4ad42343828dfb18b99b84f00da466afd955e27fd7fd721057a3d029a42dc83f8fc1b0c9bf8e4b776 SHA512 0f76c97a1f1a32ffd14cb04cf4cedce4f79729550345a5e104d550f9fcf0c5f297422030f08f9cc484b8a535e7f99acfd22744dd00c577601d5203319180ad78
+DIST firefox-130.0-pt-BR.xpi 631644 BLAKE2B 2242f5194f688829a561c14a08a69f5864277ea19fc4841f7926ad8a492a31e4074bd85b7f817e97259155d50532eba9ae6ea8e233e9702c4f5f2636c2554e9a SHA512 cf1702e44f04dd55528a7c1836b10add2645b49d91993bc310e944ce8238e13e85eb1d6e614e8d4520111e83eda440cc7f9a9f7d6dc44f4b0e973958a8283aec
+DIST firefox-130.0-pt-PT.xpi 638061 BLAKE2B 1eb8f9f7e0acacee3f082b4e59df548e0e6e810e29647790746cba870b802350cdb027b6fbbf482f0e853fa100cdc83be8a2a8bb9cc8abdd07d636ea4d7e9cf7 SHA512 95a80d9a0beea19cdf9e03722478ff19338d3dfb4d0120996e64d45b995d38ee4ff996b0e679a515760bab40f951c4d95a27933e8f471dbb8d4c6d0d24467e6b
+DIST firefox-130.0-rm.xpi 621691 BLAKE2B 66ad61d372c27e92afaed099a91d56d2afd2917975875a6cc857fbe137b420112fc3f2d4ce8900e21b307fe458ce6161a31ce9f54a97c8261b942cb51ae9b223 SHA512 139d007e141f5413e2fe99e6cbadc5d33c0e0564c46f131bcfcea5c52c457c6eef586ca9e59094b331432406aa03b2ffa89566388cd518d452ec6a5b494776b3
+DIST firefox-130.0-ro.xpi 553440 BLAKE2B f1968e97c24696e6a0b703bb0ae3a9331e2480dd31729f8d434f86b4fb494be36640146b2b371a601525fb054929e37690e42e6a2a4cd495c6a02aecfec11bd0 SHA512 b52c94c18cf2a6c17f1dff8dd4aec8164a39343ac7dd5cec8154c78564774496a54e8a042e2b9d9914ddb8b9d7f6f9ce081f755e7c8a9ed4e3ca69f1b28c560a
+DIST firefox-130.0-ru.xpi 731292 BLAKE2B f20bbf1f071ea412f722685c332e79e2b548b3209321b221064d5204f069a35333503fa2cf8ab9e5565b0b051fadeb14aed140b3cfa7a39c3e306e40a64eeb19 SHA512 5d990242166c8bccd2a09104149a791ccf57426b580cd15a7941f3c3baeea01ebaa3e48027b64621ebce8a4e2c790e96a6336d44ffd877e497b7ad5851c9c61c
+DIST firefox-130.0-sco.xpi 514799 BLAKE2B 5edc89b5e4001060e6b6aecd2d1b23829b0c690f0f6a0136ba18ae9b487c6bd95754c714c2dcde3822dd90f3c9c615ee3dbc7894cfe079dbb87e8e9112760f47 SHA512 e44b7888aa59f27d3146fba77a2b3c3b62251de526087c61a484469f89034250595f302eaa3c44adf192cd4b1278e8cc2960f9f925e5188d496bf79928d7094c
+DIST firefox-130.0-si.xpi 616762 BLAKE2B 1914782938cf618ba70a7e17cecc5bb8bedfda30eb3506805a09804b4ab6a014b19d5b2789bb013f0aa7e04db74fa156306315068424edb1b28ac83cf87a379c SHA512 fc94c1b1580e37ad0ca055379ccf8d7bb4cd9997ec88b8343b957843537c9fe65cc72d656fe19e24ddd16cd87d7b15f30fc54415d78ce409c11e109f4e70f462
+DIST firefox-130.0-sk.xpi 662602 BLAKE2B 1c0facd7168cb5202b47ebeb57a43bbfe9104a187602140ecac97737bedbf4d8ccd7737556dbfaea6f07caa4b11c4b6fda01ff6d170c529d8883216949a1eecb SHA512 4f2fa2717854baa9922f4887fc95fdb44eb4ab50e473c0644a1e72bda2bbbaea35d3996b87f719aba40d960c6297facafd24dacea8bfa1f425bbf89c5bc00017
+DIST firefox-130.0-skr.xpi 716710 BLAKE2B 728373d6fb77bc78fc03112ba4a55debae5a70abd907a3fa5e6bea457bc1258609021840041a298617fef22acf2376d384e536c71ee976ae57745350528d9b69 SHA512 e2c2f20c52a1dffb70c6a576cf5ac5bc03fbc44f1d7cf401bb8322ef6a2dd8a2fd315a61532f5ba72709d9c7b48911a54d48e9e6656e2ec7143a9e0882cd8192
+DIST firefox-130.0-sl.xpi 626607 BLAKE2B 86ff57b1255e6d513d1ba5ac0af9ca167c0d1db940e93a8a212ba6776e14f37d14cc30ad6420adeb55f690f8f9bfc01ffd1a07675fcb90d36c2d45c5c9b2fe14 SHA512 b8d52b5c1bde1991e3ba0234e92fa0a1fd6e0cab7e4d98b4925e3f28a0b698b227fb5b27256a1f2d40e38242bb639b0cbddd3199e11eb9bb5a175e689834decd
+DIST firefox-130.0-son.xpi 419745 BLAKE2B 2a1de367402e31dc82cf44abd53d472fa0a9792af15c05fedb2257253e9d018364eb0ccb314ab5221607d61a7f929be94a56a3cfefb33d26b8f43f03982f8d40 SHA512 33f1b40014bba606fb16f6162ad667daf19a3452a20dda6037210637ed94bb339bbdb7b1265421c96715fc93dcad2473e7ca19b79337d3d87bcff351bd9e0388
+DIST firefox-130.0-sq.xpi 641275 BLAKE2B e63e57573290a34186c19d13b48406cf50bbf61326ebd727bfb418838068120b5d2c0c3375b3cca21f1686efefc813df3cceacaddafd71c0cae87cd7d3baa3d3 SHA512 430bb8719aae32a86f95247b8f344f3505e0c45093b13a0c0978a4c3875dfd59ad9af155f0773e4990f12432e52bb0f1b94fce281f9f39bb079acba5fc9c4fad
+DIST firefox-130.0-sr.xpi 643275 BLAKE2B 8223f10628f781d50dc72f675bc60a65d1a0c1255f73ac2fd5ef5af5cf4831a1ecebd2ebfb4306a3f1fb9233ced28754710cee842ee1bbcb7dbe46a7818c0a55 SHA512 a4750b343be3562c1f84f8bca18e08708931031cdbb2a074c08f5ca753ad1c89e261b62b087cc2e84d4f257716b57ad2b77b56df62e77ee8ecba86946b0cd2c8
+DIST firefox-130.0-sv-SE.xpi 628348 BLAKE2B c53191ae72b267fd7f3c8259ac1afbe462f51065b6314a408ba3ec04b468d02c6afa43823b275e4e75d72d27f9e1a65ba703af33d508a486c15783b3ae92e704 SHA512 f53b86c79e64c376e1c97cd084cad971ae46bdb7c968dc05de6c3e24a5ebb870e898d7249e8f47e02a69d0e28e2c8bbe66aa3f5f88d71f8acba81f5c8de28868
+DIST firefox-130.0-ta.xpi 510639 BLAKE2B a6c019e31e9b02cd9f9efe420409a3d86e153f98d16cbdaf5ce1968b42cd834f6de76f5b8b69c13a62f025b0856d38ee1cb979cdecfbfe6168057152adbdb004 SHA512 158e561f752d6e6318d2eb8ea41d4d5cbbb917dccab20850f1181b8c71795e8baf6ef30b53bec2b79dfff5b59f79ff71e24240e1b2487750a245883cde2afce8
+DIST firefox-130.0-te.xpi 564569 BLAKE2B 184ec5bb41ce4ee9237ceadc4fea7c842a5850c94b981bf9631f21e81eb63ed1ed77646afeffe115e38f9902d1b4ba366b2b8c0500c26b55e71d1ff37a782865 SHA512 3318abc55b92bbad2fcab84ba7e40f86fd9824183ad9d46055a652862725da9217ccc2ea7c0cbc44be7f6bbc98beae3414f72ecf1bd7468439dca87d291cbf80
+DIST firefox-130.0-th.xpi 701822 BLAKE2B fd4b959a9f68aede585144f89413603e6011ceb454aee6860cf4a9855b1bd2f6bb30887d6786d5807e7a8abfd55a483e39097a8894f82cda646b3c8a7580e97c SHA512 0838e90bb21340492be3d4f50b0e974f24cd638b608c94e0e82f4ab66ec9beb14f055558a714ccff6956ea041e34fdda94abd918aef849909163fddf3b96b5c1
+DIST firefox-130.0-tl.xpi 537784 BLAKE2B 08d43275933153f8f360c5285e3feadfa36e67b98d8fae15673053a95aeef127a8f20a6ca99e0005b12586c9178c3d265b9c85299ed4a8440d1b3eb0a1603ec7 SHA512 b04340a362674f0a2e53e4625644236e3c94ef6f1d6bcd7c94d47055ae0d63ec09f25c4a7a8127e5fcd6f35f71df53eaad290cbd99b0a5af0545863f8c44ce18
+DIST firefox-130.0-tr.xpi 641729 BLAKE2B 2b51eb152f5c23abd612e42c43e15429485d1208ef824ead2366ea5163788c307ba1d981746e7de3daedab0a5f10b9f58f3b67b0c6408b30680c972f643ea5b0 SHA512 e4f47ebc42621e25a11dc7a8a19f4df55659e4471fda3bd5ba0e857b442f259f7b8d7f85c33372e3addc0bebe351acb03731e9e1e7547aa5ef65b5f9529b5350
+DIST firefox-130.0-trs.xpi 507730 BLAKE2B 371d4c85400cfb77a7faa1a8235d313b04f6c17a7ff5712de3ba3dc180e67956aca998fc7805bf707e32c7d23a6b33462e38d346b03f5b175d82f834c9567f09 SHA512 53563389a3d01553ac24fde65aa550782de0a9ea1d724a3c01f6ed2972a8807506d596b4deb76114edb1ebd72ff84778ee88b50817f98e1a030f01dbf74efa9c
+DIST firefox-130.0-uk.xpi 714781 BLAKE2B 60ef280e07396f7a0aba46f59901bb126bdb460b5e68a698f114d29743ffdbb2527b51e1b4b86666b71b7ff86efe3fbbc4df07ed6601b10f0a60dd71da54e7bd SHA512 04f69c1b24659002090a10c43174af53c7eda040695c58f94a66fcdac1262b0a5e29cba2a09457df704593f4ee9b7f2d2f15ad37fcafbd9685d22796f635aea9
+DIST firefox-130.0-ur.xpi 563621 BLAKE2B 45d889cd92edb3da5e3c2eb2077c6c3dce26a27beb97c1c1ae2ee67ebc58119772295d2294efe52b76427c72bd423ed5c83025dcee22c7a152a821efa5cf13a0 SHA512 3e5d3e82d9d99d9ae09f45fd141a46e48e52bc7346ca8e85e6bd81f1f86970777b235c63fa1e4434dc646e2c37d37510d40e6ed7e60f530cf22fc23262cc9a70
+DIST firefox-130.0-uz.xpi 482284 BLAKE2B 1d8b8562e01cbaafe9bf7cbd8300155de2c62259b2653b20502dcfb667c5353694e48d17d6a3a3fdb9581ef6b89a5e27262aa275b18500acc870e9faca674b31 SHA512 a7bad28238ca918cd1c340334f8c380d900d9c9da6ee627ab10e598bef27774e67ae4760a11ece7b7214f6c08c4802fb00d706aa7a261476d86232e0208a4a60
+DIST firefox-130.0-vi.xpi 666085 BLAKE2B b80be3d3c30aec668164abe5461677aaead06a6e59c121a3c80a27a492f838beb14f90f73d2dfb466d054b81f38279ca062f0e8019abab283b8f921d889b2884 SHA512 7ae3ac4d3b546649acf380312b9b0214da192cb160cbf3814f37fef6288f445ee4ad97dc6048b44630b8e8e53712fc25c03ffcf4f7ea721728367f45dae96f33
+DIST firefox-130.0-xh.xpi 420486 BLAKE2B 953135839c7a648b4b02459ceb47bfd6e7bf62a357eea4c7fe976409a6779199ba719c0cca662fac1d8fbc2865e5e529d7c656088a6509c072b52343170fb1bc SHA512 1cabec451c045df427d8b2dca6829f098ab99a4f7eb28c3e53b6a36b556b4f7471f9e7c3d4e991a03c0a925361a15897976c156eb5a9c8add1a325046f6227e0
+DIST firefox-130.0-zh-CN.xpi 667377 BLAKE2B a8ce2ee629c30204726f4e790310180bd2c31866adeb6a25d9e28f48e97dc7f27d9f9b3109e482ac08cfe98316fe9344515054151b3c3d37eee3a6058c0327d4 SHA512 a38673a73056f3ebc301f8cfb2c9fd8e5d764b9224294aab42c3b654dda95bc811a9ee9b1ed707072b39222b05c49deb019a8f51abe135ba9b26f800c928fd39
+DIST firefox-130.0-zh-TW.xpi 669293 BLAKE2B 8743ecdfa6fff21ba6d1c199bb24fca9b753b874e905a84ce805aa7a3e10d1871c22e119ab46b452be2c55cafdef9e8ba8a90e261078b0451ba3cb2e9054645e SHA512 6d12d92f82a7434bc7ffe3d0ab6e706ef230cb31b7889c8b0b4312f3cd0f4712ce59e4b576802b79d5bef552d3c07539d27394288c0f6e0e54998a55f44a62d3
+DIST firefox-bin_i686-115.15.0.tar.bz2 84361217 BLAKE2B a283d60dee23b7d843095a456c17541435f8ef5905210e4cf3eed7d8cde2691004555ff727e33bd3900d3d225ff174c8faa06c21676559dd15e6d82222fed7ae SHA512 d6ba65dc7e64394a1600648b4fa98fd477d082522b391b2a140f95486a7d44432d469b19d42f78e30d0bdb3a3be71626c7043ce9fa1da9383bbcc94550504035
+DIST firefox-bin_i686-128.2.0.tar.bz2 87821863 BLAKE2B acc895062ac8d4fcd6ec3569f32d0e159e719bdcbecdebc8e5c74d60e09eb1c5ee00bb234c5d20a38cccffd2d1c6e2796afa01b12187025e0fc76691aa4b508f SHA512 e4e2993701b55ad87f0185f617fde77edde9e6266dd07c877a3caca889fc63511ea6613656ec05552af9f86ef779f787508a67dd944ea3ef42b8429699535fdd
+DIST firefox-bin_i686-130.0.tar.bz2 88602912 BLAKE2B be50caf7765344349f5606be137d9b3b743400b0a5acde6828d222127ea5dbc09ac4cc12b6991fb3d0f5f3f632108411d14642ef3780f4d34ef918800e94a78d SHA512 9b39e8924a2320d2dd173034bcdbe4e33d39de55dc262bdf60f69d4a12deac5a54a87758c9388ddf56944ad1d031eaa8f8ccfa14219e2e04c6009bf536377798
+DIST firefox-bin_x86_64-115.15.0.tar.bz2 80447388 BLAKE2B b615d866ade5df67585ee6925e0d3c257cd5a146418ae895badf5bb09403b6a02af9f982b4b9668cb1c34226fd34402072cb0930c520ae92ba07691104ee61ae SHA512 0f8c880bf1662cc7f95d4864324e270a841ae772a85faca256a5b6bbdf71dd71726a91332cbd6dad1d4e56a98ad0d1d3c62df73bc9dcaf3f4294bd885525c866
+DIST firefox-bin_x86_64-128.2.0.tar.bz2 86442218 BLAKE2B 32717364c39d4053dc14dd73b08211132c6b875d0d511501789349db600e1bcacb2c43d132c97b7852e23a9c61b16139d03f7ea02b2f309bf733e93919c09bf2 SHA512 ab53c070848984d8f5b1b567c84cf6d9c8afd19386e8099a5fb72d0f30b16048ac4198b987e71bb634dea18ce36969cf589d49a7930a566d80f39a8b3e5995f7
+DIST firefox-bin_x86_64-130.0.tar.bz2 87217103 BLAKE2B 24327af493e96d2687266820f096917780f86d897fc21261191c18f9a0e24c9efc3535f704e0c1189d4787fb6afd86aa31da983e63fadf60359765ea66d409a8 SHA512 43463dce67fc565b23b783f45b7443ee48e3f8f49cbd8eb0d2b3364d0d71bf38dcae3e5fa07fd0e5c7466b53d35db895938f424634a57084e97d4e8049b0df9d
diff --git a/www-client/firefox-bin/firefox-bin-115.14.0.ebuild b/www-client/firefox-bin/firefox-bin-115.15.0.ebuild
index 95d67fb921b1..95d67fb921b1 100644
--- a/www-client/firefox-bin/firefox-bin-115.14.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-115.15.0.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-128.1.0.ebuild b/www-client/firefox-bin/firefox-bin-128.2.0.ebuild
index ad93621b1af2..ad93621b1af2 100644
--- a/www-client/firefox-bin/firefox-bin-128.1.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-128.2.0.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-129.0.1.ebuild b/www-client/firefox-bin/firefox-bin-130.0.ebuild
index 7b882a514cbd..7b882a514cbd 100644
--- a/www-client/firefox-bin/firefox-bin-129.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-130.0.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index cbc9ba199ca0..896bd4cffed0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -198,6 +198,106 @@ DIST firefox-115.14.0esr-xh.xpi 414958 BLAKE2B 1af9337e005c4e0f41417b5ef8531b538
 DIST firefox-115.14.0esr-zh-CN.xpi 657110 BLAKE2B f47b3c47f1cf85113d54ae55ee271d5630aedfdf8ead93a642a183a8c2c3be6a1bfba773041f4bd85196bc0accf86c43933863719e9dbd8cb010692fef9da197 SHA512 c6d950a9f7b47a4e354ace74f3029fd81c2eb22a9fb164fe8516faf3c1d3151881580273c29a6fb3bbdab3ba440eb78a6087e5e7ceae26fc230156def218529f
 DIST firefox-115.14.0esr-zh-TW.xpi 659310 BLAKE2B 2f552df1a66f7c4f05e598c55d977058fb625aa256f3e252e69a3511a34dcb294737a5ae44f5cb836e595581aa6886e5a37488fdb9cd78915eb152fdc40e9092 SHA512 263a0bf61992005d76570f13c3472fc7ea7d04dfcb3b5dc468577c6be6d95045d7d0ac743fe636650e3dcd056063ed9cd6e25983d8fd8f5078fa68c774d8dde1
 DIST firefox-115.14.0esr.source.tar.xz 507310580 BLAKE2B ffca6b7dce6ae6a470c9d5506b4236077b2151732bff811aa0bf0367be80aec5ea4918ee5dcd611b0e19a025156def3e9524a4f5d741343e9fda5a2e693e15fa SHA512 dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54
+DIST firefox-115.15.0esr-ach.xpi 459032 BLAKE2B 13e159c7270e5a220054444107568fd1f91e13abbc16ba00f2bf6acdddf5b8cf138fea437f2f115a2fd47bfdb5b4b461e8d69b0055402f2a2246afd15da165ec SHA512 2dfbd17fe8069ccbcb79bfe4d777cefd99d170aa692776373f3d89d79d97369df04158f338c4dcd1811c87432b10d2d89ab2854840ee4585008e7931ed4090c1
+DIST firefox-115.15.0esr-af.xpi 415184 BLAKE2B 6a6b02bdaed92601de9b04f45fd8b375dcf30719d4a911f03cb56bb75d7a1ee63f8e96955bbd3c24a8c28ee3f67fe138225cd229a7f393888fb4d314d8a7c0d9 SHA512 fcf0974406aadaa7ac26415071c19f413a4cc8617f8db9812ba72d18493e4165f1071918067054b6c8f9bb16709884d1711c964adf6ce8586e7568e074043325
+DIST firefox-115.15.0esr-an.xpi 499567 BLAKE2B bd5f21f0b62d3f27eb9515c90f10ff2455c410661ff7d0cad205dc5fe85bd5ad57a02661e18fab4e843f7021ccb1a1e3e14916eea752ce3445f6d9996ff1fa04 SHA512 239c2a53a27250c28a9719088f166c1d5f265d096bba37f63cada8ad60b33a9aa41fecb57c68b2b6c0805c8d1cdde4dc07babf43f116cd1a0ec0c4eb68b4d3fa
+DIST firefox-115.15.0esr-ar.xpi 606286 BLAKE2B 6efb4de8944e9fbcc38917534d6c5cb7d730d16fa0ff4d02d0fc97e2e7dbd21bfc8b3f87450bc393b181feba4e35dab2f928594ee95efe813760597092c07ae0 SHA512 3294354361ae59ecf9bbc668e6e10dfa9d0c1d37579e271341cce02017a9c8fd6a864fa2f0208382719199049537f7b05d6aefe9a71ef952edef15e96b632528
+DIST firefox-115.15.0esr-ast.xpi 491345 BLAKE2B d122be5c30720e63f3e1b304f0e2d439783478353d4a7a02a7f2678a4740eb860467a90c4cb8be92cf644308af0abb3115bb86deec82e5139f37ec03d2f8b5a9 SHA512 d352c7a25bd428a02f6909a3cdab24131ababd12b6e8d0697c2c838b86919123f6e70b4056e7eeed70fe84c5bd604546c86110dd47cb08abebc0a0d198b18b44
+DIST firefox-115.15.0esr-az.xpi 486087 BLAKE2B 4e8970966673b49e81ed8316c1b605a73c6981f0047dfbf252129877c607ab21a57d1e020416e84b5a2dad7063416d3b49d948b9206b09dc87cccbf486714199 SHA512 d4c7ba927cf036e90f6dd5b420a8e1245fa9508c8ad82df438c10b334f13ade77a1b0ff7350b6b0504af0a8a6af5a3b8e141974f20f7a20695026f7c2e57e22e
+DIST firefox-115.15.0esr-be.xpi 715649 BLAKE2B 8d88effde67725519870d237865de84a5cd282895e949f68e261068f88e16c8d4c87514df09a7d573bcd5ca7dc896a44e8a824e8924d85c514b37b9f38ca3fa0 SHA512 5fa6e1bd429d6d430fe3feeb79a19c1f60257677f9a1036a31deaa772ddb70b5d09d23d6b88257dcdd68f27c685cfd5741fd252b2e5c13f05073604571a00747
+DIST firefox-115.15.0esr-bg.xpi 600392 BLAKE2B 15c6a5ea2b953a6d2e06754422e773d07177ed6ed9f3985bec6bcb9f40885054b423e50d1bc1371b63f120d5fa6c644cbdf2e32c38c150d6dd1aa67a61c26b24 SHA512 a0de80f4cef8f3b8ae19b5ea47e17433e81b6910ea537bccecbfe18c521c1df0f1ccd4e0cf0fd2c533e0013ac989d9e31e90d7ed7fbabbe22c9c56e20b9fc996
+DIST firefox-115.15.0esr-bn.xpi 576362 BLAKE2B a70a8daf6e486ce2b32b3c00d307dc93ce92c511abfe9088b1124fb9a0f99ad22923a188fc357264c3c2d8bc4ae01cf1e6a7966020a565b2469be41eea09c17a SHA512 3e8770a8bdaca4d12f1534f5436eef77f191aa1275c236c49732f76f4e39e5753ceadbeef25a2658d34446301948469939236bcb10ce59e89ae6ebf104d12174
+DIST firefox-115.15.0esr-br.xpi 585005 BLAKE2B df78592aa869ecba8831a5d323f33a039ab07b6cbc656ca73aa27d00045cb7c8fe82ad23e82e6203d50c2c0f3d413b56dc9d58c2d206ffd9db4a55f9c8eb4c5f SHA512 041b6abec3800a133f99283088569a70beb52daaa31a94912729e44164f6e97089aad5fb9db3f514e5383eb8c6c2e26e2ad39e3024cf9112c68f856f6ad4fcec
+DIST firefox-115.15.0esr-bs.xpi 496786 BLAKE2B 523391d255436a8c804a6deb51be0247d2e40cd661f8e4781c90dccaa656020de25588ac943113509e0667f5757687ae05f719c66b104f0d824dc328bdb2d382 SHA512 12b02b42e016b7358af0e7ea21f1ee726d92d072368480d7f425bcdc1adc96e18cdfb350386abd4da2cf7492cc0ab21eb5ff21811d262b4b952ada585fdf3934
+DIST firefox-115.15.0esr-ca-valencia.xpi 539254 BLAKE2B cac2338038d1e7cf25002af7c40eba556ef0c4ca7b7107581974828f2aaf5c2d5bd3230d00daa36586ae831f5b8217d4e75c2aa163e91740f04242c6201e13b6 SHA512 db509d27b7f83f135043afcd1c08f6a5af748a4819c71086e061d357d0116b148ae42de7db8b2060c3e213686a7e18cee11d4d9cfcd601143f8fa07cfcc69a4c
+DIST firefox-115.15.0esr-ca.xpi 591046 BLAKE2B cbd35d4419d2b50dda8a4baa5e3abb852e81681d96ed74ae974c20809c2353ac17f88b3662800ff9328188abafafcdd6aa39e9bd41b579cf296d1ae9bfba811b SHA512 8c634dcaece23fdd5db497f5bf9c52afaa34928323d01df8421acb01685f1e1bc845e4f293133cbd3de6cb07697e341d387b7e25c6e04cff34e3e36ed738cda6
+DIST firefox-115.15.0esr-cak.xpi 586723 BLAKE2B 5102347faad6a52de90c457310fa9277ad403ae56f0e23f2e89d1fc32f315bfbaae0baf9d0f1290f930ffda28c0d4acaf14ca04ff13f3af5c4fe1e3cbf272089 SHA512 0cdaeaf8e54b82eb42f300a60609a787a470f2f2205e912fdecd76dbad8e8150c4b95435591db8f528c7bfbfbf238216685ab007d37409ee78a4d9574de24823
+DIST firefox-115.15.0esr-cs.xpi 659583 BLAKE2B ceca94afd0dda46148ecfdee17ef37e8a6dfb50ea133319b835c3f09bea3b2c6c4fa9747df31371d0f7ecc7749e4f89508ead5291e763de761a39c7b08940cea SHA512 569b69f8544596bcf1edd503eb35d5d86d2679c1b43b883a2d2ed2f489505610b27f0f825839a9f956dded11ba036cdcc566388120cdb6c3a3acbb0b3ffec2ad
+DIST firefox-115.15.0esr-cy.xpi 622581 BLAKE2B a475ff2b9d7c2661edad4434d9a7d54c684b0be2800609decab9ed1da344abe627132bba450fccc3feb0865959333fbdc2c8162ecd97d1c5fa4c203881ae86d1 SHA512 05072d816323c4618a913ec75d34f4250e1ec01ebe74651abbf8db40e2518ed4b87c8db3b8955ed05c8d95b8280ccd0bbfa7c3435940c105a938bcad581a095a
+DIST firefox-115.15.0esr-da.xpi 611176 BLAKE2B 0b688f6dc7fe68bc427594711f6deee99e6340908eed43cf010849aaab8f63d8e5837506885b5cf63fa472853523ffd60d215193d9954af037aaee8806ed8421 SHA512 6414dc38090b94d146577069a46e1e50dee7cdf9ddbc0f3ffa7dd17e7ce4bb29454456335b16018ad1824c404c4373952fd79fe7c83dd1c90cc7f86696905302
+DIST firefox-115.15.0esr-de.xpi 632366 BLAKE2B 4c62439e65195152ada44ac7bf37d7a6a294d262f6e2e0b389355e0e7c16fa435361e1974734a2fb082bc0df9ed827c795c9c98657164385ab0f9d10b828f637 SHA512 fdbcac24c9039d54eae64f1d2e7a2ca935a6f38ac850b542da81c556d56cd3581adb0e750b688af3d02e9b4fd37a449959b1379fe6b44b53ef9952bac4bf0d7b
+DIST firefox-115.15.0esr-dsb.xpi 651468 BLAKE2B 21415a574071e180a2070484b1265f8e99979ac6be38ef8c52d7a116030c483be258b7461bafaf11a500b89dc4a61e80bf896b205cc965cb0df7a37908c0d8e2 SHA512 a82e2071c292c0eca7d6fc31846024c1818c5455b6ec943b5b2af02d38e47514032d41fc5b47b9c4d7fe3a7300521594c1892598c64768e24e0c727deb79106f
+DIST firefox-115.15.0esr-el.xpi 734619 BLAKE2B d67b2ddf4925a02309322efd492e9c3a8275b381af54bb086c53ee6ba1393746bb6dd841ed46c098dcc785c153f32bace49b65a707ca512fec47deb8ee1fb3fc SHA512 56e9372ac8b197b09cc52ba4b3d9648ef883e3b1e3eb8f9af6350ab54e35a0cc24acde5cc9b86e8aced3504dbd1f20eab8c7ddbe66472a3561faf921a44d21ec
+DIST firefox-115.15.0esr-en-CA.xpi 584134 BLAKE2B bccf63a2abf8cb870fe3ece525d147875cb7a1d6ab558588a0e1ae3dadfacc73ae08f2f72505b5843667b01d6d50938a171e2581671f214177608fefefccab0a SHA512 1329e72c56b9682dcbcfa22b792721e73bd0b7a81c03707d22e46d60d4ffedf89ce476684c755f31e41a02ff9d33934e0b65b3f8e83ed034fa55ff0c949f80a9
+DIST firefox-115.15.0esr-en-GB.xpi 585201 BLAKE2B 34b84adbb89734c2a885a425eda97ca7cf76a9ca92a8918b92a737bad5b62d6f2569327c2e0e514eccbac9fc76d429561834240be6bf990adaf443b19c77f35a SHA512 a7d22b9eadec2db2031caf88ee2f7e7d2ad345201abaa5a1258123a933a03ddf8a7eaea264c193d5d35257a73692ccc94a42302eec7197d9ddf8b61b614a0a15
+DIST firefox-115.15.0esr-eo.xpi 613407 BLAKE2B be8a680854b28c13a06da259d37a2d42d86b60fa57f4e34a8e7a635e0e58aef8776fac40499ec11cb9355fb22dda206b391ea960d52d00975c399aa332585abd SHA512 2c41e17c7e92c0f199d3060895e5229c7a56fa9e124fd1ae3ebf1f9ebf520c236deaa326c55660a5a2af2214f7a844e7e71ea8389d1a8e27d813d5c76c5aceb2
+DIST firefox-115.15.0esr-es-AR.xpi 628385 BLAKE2B c0c72aff83e26d4e7692b82907bc489b85247af6a7904c7ed4b24adc2d6914db3e0760574e1d36665a3abb7d3e6521b5844a22bb19dbf3cead9b89f55ade0c76 SHA512 66e342aea251e5a0db36859254079b9924f6dd1471c10c79de7934761b9659bae0c1a46c018d9dce41d6dcb8f9bacced265bd08d04eb07db565111dd7e248652
+DIST firefox-115.15.0esr-es-CL.xpi 627698 BLAKE2B ea4fe1370700c812cfdd7d5098477a125fbde4e04ce5321907e0724257d0056cbe4993fb5253d78396448257d1a5e759ed0a3f4cf79f864ea329961396526ec8 SHA512 6454a73cc45de6ca891c42c11caca2ba961b18f0b1a521f2f0b35c2c9e102c62ae53996f8aca59feda0bb80b12f42d5df917e8b08942c4822853af6b4c54287c
+DIST firefox-115.15.0esr-es-ES.xpi 621481 BLAKE2B 7cee3a0980a8fb4c8f439c16935eb465792d3b6171305354bd5f526547e597dc5ecd95e3b25d6b906f81aae8a29b8cd22e3888994b2e51c3507270a3b2fe8ce0 SHA512 54b9db8ffa66a2ce2810ce6d2a93d8ea8b21bdc418e802f66ad4e3e4359fabd89b62bbbeb6dbbbbac89526e051d329453900b0da5def7d881fc444053006457f
+DIST firefox-115.15.0esr-es-MX.xpi 597929 BLAKE2B e464dc013dee0e9774d9bf9e206312d1f0b050bb83409e34bd498fd79e0314081a111c5da46b0674a98300372c197cad70d6a4993291e10d911cc1ec29d1f836 SHA512 3d5c3781f224735303e253885ebcf0821b3bf3a59794eb019f9b611af11f8632ded45843a6e8dd66631619e23db1895b45f051166ae42101c6ea6004cb1d19ea
+DIST firefox-115.15.0esr-et.xpi 533023 BLAKE2B 18abe9f4a96bf37d17d6274b658890aaa24193a34d0ca2d9b17e81059b6cafa34f72680cd45477d46f3a5aaa3b20c84394e755c9668d8e716381460a83610823 SHA512 f3353090f7e4eb43cf4de7c83c562f501acb92be643e4631053243bfaf8d52945ed9a2cf313a9218b31f1d1c86e62ac2f6be0828009dffb004064269541fc5f2
+DIST firefox-115.15.0esr-eu.xpi 594650 BLAKE2B 5b6ebbb75cb6b297c5d469010f0f4bab7a18bb2dc96c0893535ea4737d98552a59e1b585cdf071749c1d9b4b282e0d9214fe9729a6f1d17e18060faf4952fd16 SHA512 6824bc9601da77016e8df2350c932dfafaf45949a1aaef9517e2e61df0f714ad75a2b84640c5b47803cd39e16dedda5cba0edfd01318ee51204ba1b7fc8fa825
+DIST firefox-115.15.0esr-fa.xpi 584362 BLAKE2B 22f30ddc9a4e0603b6081724d4eb5841b6089be5244ef3ecd22e1b9f36a31bbb08479dac88876ec5bafc32196041e75b641074551f07ab9e5f5e665000066643 SHA512 f53fa0ff18a4251f32fbddb5b518d87378f47398dddbb43ada7aed105ca41a8b76b35ef99e56d76ce4692b0b2ef4db89207ee0f2d69dd6b611d0fb9de4ba160c
+DIST firefox-115.15.0esr-ff.xpi 471727 BLAKE2B faa9b69ddd9288255dfb37f0478ab586461941e7815522c24a22721b5231437e81f120b0cc5d8e5507202366e477372c104af41df95235b2bf295599bf6461df SHA512 04014b752a72c00562b1a3c84c78afb9f432d179e0ea64fc6bb2d3d014398ac9ca3f1c8fafec88a68f866e4dee8d367d238b8d7a0cee9f68cae2dc77600d792b
+DIST firefox-115.15.0esr-fi.xpi 604629 BLAKE2B 8eff22d2ce866b2fdba1e36db28e100e6bea35cb3f193fc9f35072da50864674f8035984e272c5e67c3778e8acc89b6ba932fd7aef77c5e6a37f6003cb40879b SHA512 999ad990795f496333e59c06e7a6358336cfbd32bd2b484896690a90a44e3ff5484dea392d8224b7eb941a2f2740014038da231131c4cc4807eee04702f5982f
+DIST firefox-115.15.0esr-fr.xpi 640836 BLAKE2B d4cb841f4c7215f63fee694cc946e6e9a97f8b062b6c1ce594402d021001e070d084344e7f139b75f8cedfda5deb08a5aef6767bd1d4bbb5dcd61d2ab292a59e SHA512 3baaa8345b7475e257a383f93c661f9e4ba4196e337ccfa26993a016c47e1018e3ab0ae41f6ac007c8e1e066b75d7ee84e5d0932b9dae7a29dcf9a882582cacf
+DIST firefox-115.15.0esr-fur.xpi 634495 BLAKE2B b90c96827a4761d49e7dc78b6b4d288b59c77ff4eba92055edf93283c230ee95aab821fee4a7b4b8a2a379223e4a968b5d6f0122f3bbc7cb0d1b0284fd650bed SHA512 6944f57a842d683acffbbb21b23240a2f61fcce61d1081c6192cb175d50882c639dc70ca13040a2cad92909b18cb4b89d61d76e7f8368258dc305d02b7eb57b2
+DIST firefox-115.15.0esr-fy-NL.xpi 624085 BLAKE2B 485e980142784898340b00a4ef66dcb0951d90c2e169c4bcf35973b596a8b7a158aab9594b102364c448a62d1113ea70c94d5c3555908e3b351eb3a36546c3fb SHA512 d5cfcc02ac0e1ab9b0a53f9d982699e2f0824424cc9ac788cd051a8b99019a200e99a772e59b22efb5060ffc6528adde707822c8b8177661eb55415075e8b153
+DIST firefox-115.15.0esr-ga-IE.xpi 467645 BLAKE2B ba664e34687ad47cb3559f9acf2ff04dcb9e27c2d6c7ee98bc643a6acec0272148963dfcddbfce3a448fca5f7b247dc3ed9a38034d8fcdbf59aa343c03fcc6e6 SHA512 4f619ec5e10ad703e4ee588c5fbcc31bc8bf2db3f3b5fedf4c5d7564d26dc03258a6bca5e1bfdd278c553de4e71908849ef0353eab2f54d6687f5b90d0809bce
+DIST firefox-115.15.0esr-gd.xpi 589971 BLAKE2B 9647b6a16f7265c6abcf637e94b5b123d395359821e18becadce6b5f7f5ddffaf8c55203036c5867394016a4cad1472b7de8b23308a1359f9577e62f5fedcd4d SHA512 69f87f54034d5c0f9f2426646640dd256f3f247844d475e556832ea3ef4b262643c73c332bd10d17203c8c5664aa6138d1977633d7d7630664f99160a922b087
+DIST firefox-115.15.0esr-gl.xpi 599983 BLAKE2B dce7bbe068b9d38a94eea85b740d7ccc1e0ba1538b48b2a6e8e8cdcf0fc5b51d30df4a6aba816a17319c8e54d092521f8e4bb51136cb7e3362cb776d7f5e2922 SHA512 f2d82b7793025b716088b7136cecdd2defe0c6d2d2917a28bef9906498b0b67334832da44bf5ba53b2ae36daa4ed31da891c6d0af97d8e7ac759afc4d8eab426
+DIST firefox-115.15.0esr-gn.xpi 637897 BLAKE2B 6b31a8777b61374a1450999f7c9340aaf32dcbbe9c1d30a0edfe697acea067bf341e994f3b20a999bbc811d8014c4a9ea7fceefae3792f2ee7c8e3adfab18000 SHA512 095c6b0d4263aebbfe807e9673a38b9e6ce156a94ece2d3a5df6b6499c58dca330c473c74fa5b579933bab25a97786922fecfb44bb0e663ec04494b60d0dac51
+DIST firefox-115.15.0esr-gu-IN.xpi 523385 BLAKE2B 60db6daf819def79516795c658cab7ec3fcb2606f564d604f591526689a6c68aab5f8ba461a728c0fd897a9e9db84334ea0b0f8ab798a256943a37c694af845e SHA512 1b473084986976fdb38621be58eebcfd3dda968b3cbe0954a0ce4a39072353eab3d8a8849ef4b44670c31fb123b2e0467335c09f0ea8d01b4d240fa6eb710891
+DIST firefox-115.15.0esr-he.xpi 629098 BLAKE2B 288312dd1492a5ea47ece438608e551ddc6fd82c2940255dbdb51296650326da2ab5fe0e5471be1a99a25bef138665b6324f47f3f1e759ff35ca407ce48d9814 SHA512 f9d2000b6f2dd94436529403e5ec263c0e15ccbcf203a561798f127cb92a09ebacf66976b22ee5d0e2f6cb1022ba35b0b7d05836947b1100a7766147b2f4a63f
+DIST firefox-115.15.0esr-hi-IN.xpi 561258 BLAKE2B f7be2296af26cf47b6c5dd6237251394685df9ccb5b7c1a493792b8d02049dab3b6526ab2c7427f6d6272d6baaf5d2bc6eaa9c359c2709ae5c9e48fad8eecd36 SHA512 0413323503fd8b09fdadf51c81973ad58c6a3ed0169ba20f521be2f02e3a24bcf48315711a4f60166f30c927de515eb660603dadf7e7500436a4b835e2225e91
+DIST firefox-115.15.0esr-hr.xpi 554546 BLAKE2B 334a747409c184e1d1270417f04c18657c48a97eff4ed3c26f213f3783b2e72f97aab6f600327c179da4feb8ef68bdd7bf8bccdd4675246e38aaeeef2eac5eea SHA512 b9e75a8005d4bd5f5d91af647bc46d4f910a70d83c7b03a83f1b5c94ac7918ad85d568f048fc53db5c2b402644c269f6427ed014d9b835fa0243ad24d8c97d86
+DIST firefox-115.15.0esr-hsb.xpi 647509 BLAKE2B 88f530c52e9bf0648cb91b6e3ef1585b839c5fd9782b0445fb0f557167ddbac72121c6ff1d3b043dfd02080b30ee29e7f55b9bd19ffed985e843b243fc89c5b2 SHA512 2aaf10dd94aab86725153024558e83c043c5413fc2ced708e30c8a0a8823fe56b9a862802695b626a3d4a4265dd759e6291e2abe9aca2d89fc83b9a461d70040
+DIST firefox-115.15.0esr-hu.xpi 649863 BLAKE2B 00785799173237656cfeaea8c747c2a3b506f2c2a657073d4eb7da682fc084b2ea8b12cf5f833fbcddc0f4a7c815712128d8858acfec31dd1d218725eb96ef07 SHA512 1e243c6e466d2c68c253006382105c0bebe53b57a1904ce81b0d51b7be5f4b8c388ac7c44932de8f702cae61096361b61c5853dcaa5dc587ebb98d4938d83213
+DIST firefox-115.15.0esr-hy-AM.xpi 647653 BLAKE2B 5eef383a89734b582751d1a690cc1828263d83f0bf3f517204362ead6c30dd5a2f2cbe7bfbd072d70e2be7d9da5d01e1beee76ccad23c46740427ac9f78741dc SHA512 4384dba6db54fc6d03cdaf91b81484cd09a0feeac7f770f85c6df23990493a47608f355640203b22d24731f046e9e7f82a037f7ba3a11a0e873b1fa5ffc4a3c7
+DIST firefox-115.15.0esr-ia.xpi 610846 BLAKE2B 7d3bfa4c9c9365fe8b55f2e958a960ce85351487122d7892e2ed0fdbd3f1bd082274f47f7d92db1437101baae2eca38c8533a1627ca6d669ddb19c39b96959e1 SHA512 5aacbf68d32b127c605461c0e9d5846e7ada85d6232eb91822b0814ebc2141c6d55c5d250d8968a5bc7620fb18e9d5eacd2e278908d17a47e34f4cb0d8145f4e
+DIST firefox-115.15.0esr-id.xpi 573434 BLAKE2B 0625ff93599c33ab92bd7bbdfde4d92de3e4c5f0d82b3fa12a75a5c820913b9457312ae416fc3fd30ad10c491ac8d202bebaf414dd04756f8efe64cb91bb931a SHA512 18b0660cdf8662229be776bd61c906cc747f143e83a2b713c9364463e066ce718b995d3bdef9bdc212de5b9e277dcd1bf8c5506c6493448faac8667d7de4435c
+DIST firefox-115.15.0esr-is.xpi 611651 BLAKE2B 281f87160d7a72f85ca9ae14b559b634327c9027e40385416a9755d20dcded9ecb26f5fd8d2248af6768bc7c50ddd372f32811f46d4aaff96db3a1c2c6cef3ff SHA512 ae9392dcbb734c2b8ee17a1de03cefb717e236210bdbe0bee299c533df9722cf6b99d1b3bcd0a94743707ab1f5989d4de96e1257d63ee939e20911b50ac1050c
+DIST firefox-115.15.0esr-it.xpi 567120 BLAKE2B 58d1d1a0800280a31fdf3b281bce50f38de4525abc378e1aa47d7b913b1fb6207b12c33faad9d89e125637f547a8abc8ac61aa0274364b6fdeec8ed2b60a476b SHA512 4eaecc1c35a58d4b9ef7573c14e8ec23180ad3edc3d2fb8f032f679cdd8d24a2da22a014d12407555e857cc61b66b7bad72cdd2740ab681d8c554be892d4b02a
+DIST firefox-115.15.0esr-ja.xpi 676031 BLAKE2B 2776bb279f1091f337d9500971022e0912b5d606c719b5fba1419662c4b92a7a1e59e1bb3d7f80a94ea42f8655d6ce8b695aaf0103c7f4e39518ec72c3e0bb35 SHA512 982b9c727654b364fb744d9f6d993fafb2407f434e0f43a2d1a067885bd4b803e32c1e8a3c72f3e2c05289a0916a5fbcbd7b377d3e04f5c6e67274f93de0798c
+DIST firefox-115.15.0esr-ka.xpi 657991 BLAKE2B 53c0cf206d77ea7aa9157a85c50a7657fbe56881e6b20b63193a0f8599273d06e0f6fae4c135b00b9b3ccf3c316fd1d36bcbdb3e5659d0263055d6c218273d90 SHA512 f7f12bc6ac222b78a8606452e1eefe65e2bf77739a6d0b2a6c382d565d68a227881921dc059e568d395120e0e09d419e148056ab3e4090227c20e35b55943409
+DIST firefox-115.15.0esr-kab.xpi 604028 BLAKE2B 6ecad3b0cb351d8c4da3b65ede52f951edb4cfb3167a6e2c24b8baef2900379c03e929b4a312688e4b6646dbbed5ea4d885528ffde131eb509bdc1bc74798793 SHA512 ca42cc9601f6df4f6d8c617372b5b37d2f0c4b8c33f72409b3bc09ccbcd97144ce0eb7c50c4306b64dabe85f6256ffe2c4aa8544e1dcb1ca057e112ac83607af
+DIST firefox-115.15.0esr-kk.xpi 709054 BLAKE2B 90bd32cc90d3ed321deb2a8acf79f7fb6ed2072d83716854360e4cab838b90720b3a0ea66aac071d1a3927bb677f7e7ef1bd72f332f80dba17eee5538b836625 SHA512 078b79b3229e3241f24f99a30064b2ccac5f8b0f148dab25f748cdc37fe30ac3a1dd5f578f75147457f3bc18932453ddc4e6b19d40da4bd860de848a293c195b
+DIST firefox-115.15.0esr-km.xpi 522330 BLAKE2B 438be3000bd425f081184c998f1c50460aa8e99bf1d8e63a7dd0b22cae39cb4227dffcf85a529f4c586d783cdeef01be139e988b44cc3a29899915aa0198a3ad SHA512 5d889e572b22cc247ae418726ad702d184069a4afa0c59e3653ae243fb89ea489c399b83bcefc9e64ae9c079eb53262e3006984f8a16c224034f3526e1afd368
+DIST firefox-115.15.0esr-kn.xpi 488198 BLAKE2B 3d2704129a3a340bd2fc64018e7984a0a170892f98fb607da22e3680ad016c31f30044e40950ca6f70e86df254ff8c935996fdfce5f2bb5376e22d63eaf7cc19 SHA512 4808474f149d24e13fd8a5bca292087488948ed03d902a39f41fb71205781d1afa10143b80e42e4906dd260084be80349b3a45fe0fe97d463f4c90e623246537
+DIST firefox-115.15.0esr-ko.xpi 662480 BLAKE2B 96b8326b941f134d7bf0ab1a13aa8544f9e3e98ddbb661d04749d34613b3fdcbdd32bbe8157536f796b4fc68dd820d0677db8f77adff151d31cc7fbe4e60d22a SHA512 67376a7067c21c6b331332f2874ab1260643d1c9182410ee4068606bfee714a2f31010d7c7d14bcb7cabd218656cc274d31530d6fd3f0e3123175849e6754de7
+DIST firefox-115.15.0esr-lij.xpi 479126 BLAKE2B ade5a5adf13b7d6e3082bb667680a7845f5859c8e2c6a915002172af46ef3be3b3193107dddfd72cab6fa6798234e0a781e2ff50829ce5958152427754cf9c4a SHA512 e38985f36eb8fc7ff92dfbe923da8ecdf260dae60a568c5df4c1bd43055a670a323fe9d735cff61bc6288b820acfc0f4c74fbaf2365dd04a473d36a0ac942a8c
+DIST firefox-115.15.0esr-lt.xpi 566224 BLAKE2B 90fa117a8e4a32d6a467846babc5ce4417706b385b0b3a8d6aabca391acbe0630ef8b2ba268b1271d80b17256c8b8720916a15ab678430a2baa1d6f33adef750 SHA512 821f4ce96289d2eb9c83bcc69cb665047c4c9f85e02490245569d51cbb243739057fb1f0b174299f2730ed843776375f939cf2473f45b07a3c0aadd154293281
+DIST firefox-115.15.0esr-lv.xpi 568810 BLAKE2B fd3d1117bd90141a4b9bb8c7384d687971ace2fe81df02c41014a09fd2853d7029320defb2dd32ae2a1343de7dae760200e2133224afa472a743d0d4448f9001 SHA512 82a6f43723e36f0fde0d633b3693bef268e702cd782a96e0bde541cd940fa795fe0fdf0643f19fe53ead15a790fe243c5ed6a588813ecbee4c6aa23c848488c7
+DIST firefox-115.15.0esr-mk.xpi 490535 BLAKE2B 3a09bfa3217466aacd3462fa9229deac0732c65c684a856e6bc5f51955db8c92911db33006d318bc15171dfcfe5dc3601c5354be25f7d16e0e384fd813f426c5 SHA512 5b00a766c9a16702dff795a6243c430a266f2ab9e7af27fe2d9f57e5951ffb65247f842a9847b1c9ad87df836c68070c3f9dd963b508de297c90cb5dd3fc7545
+DIST firefox-115.15.0esr-mr.xpi 526883 BLAKE2B 09946b06ace5a5dcb09b145e0feeb9ac83468a6cc9cca478819cdd5156549779c32f57879c47ea320dbe5a089c8144bb2fb66ba9c18315b50f4eb131fd142181 SHA512 ddbc1f9b3a2dfa664a8ebb36a841f07a8f7f88823914d4212aef21abee642a4c0ebd95029a0d62b0bdfa476f010a4f4fa245df4bc277da9448de97fec9eb19ea
+DIST firefox-115.15.0esr-ms.xpi 445508 BLAKE2B af4a376cec0b6ebb0547e3985ad7521b7a7d3b84e35fb22ce2f49656efae6105eec2f07f6232a328b335c26d566abe63137ab4458dc7d3b030f1ce44d424fc6d SHA512 8adb5028ad31f833adfe4f8dbc87029f124ad42ea40b562a549fe26a6344a24d72d0c3d62f5f0ee93597114f1ae5f7ecd803a82233264306b88c9066983e6b8d
+DIST firefox-115.15.0esr-my.xpi 514929 BLAKE2B ad2455bba5fc940a6d82f237d229cdc565bba902ed46935d9787c78fe1129a6433101c79952b8c12b3ef77268c67f8d02f7f4d598c1ab34df6edad9462387969 SHA512 f43a7e34365c2dc278aa8fa3061c2d68c805489d54d9658e8b034aed5c480412b3bb950098bd6c446f0be6fdb6bbad6ef4d66a78cb22b8e1b7802d0b01a9aded
+DIST firefox-115.15.0esr-nb-NO.xpi 607316 BLAKE2B fce0b6a75463864e08d1087af58666b184dc7b68572200cca6d02018c60a85330bec4b21f1f4c8d42e85c213a06ab73c9e2b4ca761bbb8a5f1aad4b72ad71b3a SHA512 df402ea7c8156132d69bbc24827efbb302ffd45c094e252ac1bbfcea0636a29d070c6a18f464d898d3a54f028b8571f2e18faf30b7bcefddcb8162fb1d177266
+DIST firefox-115.15.0esr-ne-NP.xpi 506993 BLAKE2B 24ed6ecc00c452d07c2470ef221106c5bf60280272daec88daf86abe8ef1c7d425096cf983ed187c60c5038cfaa1cdb6ba773860f9186ee794d325e17da9d030 SHA512 4274e37a3dd0f509f979a321c04c0da4b27ac33bb02e47945c59d9947c1428159e5ce54070e8c9f26d0702fec6119bab9c859cfd39f7a34d0d6fa0b99d1f4e6f
+DIST firefox-115.15.0esr-nl.xpi 617743 BLAKE2B 1652dc4ce9b1521e6f5c2f2a29e225de915619afe3f25f624fa0555dbe3af80cd217e05d6b134b0b608843dcb86a67adf2f9a050cdf345c9ba869057860320d8 SHA512 f7dac94ef771233fea2de1ba31923d9a561cbe10fddc74796177adb0828a3312ae19bd9b128a80e5bc30577767cbb96b42bd8721b3ff17fe9d5f01ca4158e78b
+DIST firefox-115.15.0esr-nn-NO.xpi 609739 BLAKE2B f5be55c5932c378b3353340bad592ab2920176d2291763c73b2f3181aa9459c4b475a4d578c8225f730f5451e9466f3b0585cb8d0419612bf2b45bb13d8d119d SHA512 1b7133b5e4fbe8e8a844713d0e3d8fc7d559cf18bb87adcff8ebc37517991053a3a725a0328d22cca4d882344f643cfef7d9eae3d79f5a611dd76a643639734f
+DIST firefox-115.15.0esr-oc.xpi 607919 BLAKE2B 2cf1f970ead52332725e05625a809575239b3dc0a013ec2b5996557889338b298cee6d8ce008284aa20edd14d90b0a14d6c6924bcfb53de55675e4a82337a6d2 SHA512 e9f50e126e0f06f9343e5bab2b38b69d983ec1d70822c07226a1148f8d56d42047a83727f21c88b33ebf6c5c57d19116ea19fc42c4712d9e38cf8a2f5cceaa74
+DIST firefox-115.15.0esr-pa-IN.xpi 687719 BLAKE2B 4fbae6886f73e35a4cae817355463fcdfa8397e0ac2c21be48476069111423e4ed75be05edf966103bf51653f55226db56aa15443d03f084c00c7e3a0aff1167 SHA512 5a700d057bcfa5062960e3c6e1d3ff2949e445b1e1e4f5edb1c5e2dd77497e0069a4147fc4ae92c27fde7a6d0de564a461d471a0db85b4e1a579eaedf6074298
+DIST firefox-115.15.0esr-pl.xpi 636472 BLAKE2B 6c24a7d828d8e2159982ea1bb51c352f6282de574e357ae822e50866daab78c8be2f506167cbfb593bf907517e43d194953f5b97136acf4ba5ffa467ab81cc29 SHA512 f28998c96b6fa47f31653e5f49d5dd28cb1480f891a50fd1a33a5c5420f2df4fcbeabb4157d2d419811bb3fd0fc895b473734310e17f4aacaac9aed4731be0dc
+DIST firefox-115.15.0esr-pt-BR.xpi 622537 BLAKE2B cac1dd6c177b743f70b1900aa8d27da997d3408db4ab285f6dd896c2c7b3f768c733705414a88196b197f457ed054dcb5ea73dd68d7be5039885c77a66117e2b SHA512 5f34f5b6df8c798d9c825c102f0b9888191280989e5569cf0420dce3356c36e46a7698a829aa007fa28a2e02b46d74c0d6430c9da936451ac838b1a6ed85f0b5
+DIST firefox-115.15.0esr-pt-PT.xpi 626589 BLAKE2B ca43bb0dd4e0da95c3f64d1c41c6bf3139d17fce32883573760097c93e2cf27b353205e84f05aba0adcf4aa87ccee05aa4dbe826eb12312be4d8c82346dc5a18 SHA512 1170ec442afaa68ded871b528b0efe32938ac44dd383251f1e40ff19e2bb61fc9d2e5e9004d163b56e262d4b7113fe6937de535701c5ad0823528023cc90b85c
+DIST firefox-115.15.0esr-rm.xpi 617339 BLAKE2B 810e207b10509125b97b1f55159c6f22e154fe83954fcf2ded60b73b9e79c47a6fd6295434d4daad811c2d10387ac6c5f273daa17233d98694e8e08023612080 SHA512 7b52e8331f675c0c615cbc40ecdc6417ed3fc3d1122650eadd2d33877e032385c0b5b979ab621678892dc6f29668d6b3dee691cb37836fd545c0c1932c551dab
+DIST firefox-115.15.0esr-ro.xpi 543552 BLAKE2B 5c9861853379c4602aaf6863b43cdbe2a23c4727d535d3681ed43dc2ac901a88dd740fda1d43517f5dfcb586803789d3c7822d1b57525136093cfe6a5dad5011 SHA512 1afa5cd4377b1e7185bfd6d24e40c0b9c03e3940abb58a674eb19b8133851b699fc06e73633d038384fe1b99b4fb033efc7d72921398a34bdd2cf31bc0b4b908
+DIST firefox-115.15.0esr-ru.xpi 721763 BLAKE2B c9e7cbd3c541fb498b3106c45ea8d4dc122e496f92f8670ecf037ea0ff42e12b9798de679ab2d8f030e53f74e3e25c2ec2badf490aa0b4941cb6dbfe9361c12b SHA512 1a50181d7ec0d3d0153466809c985596ff2be21b09a1fefdbf9c9abfe599e476f84eab96a7ecb281ed34f9f78d18e3b9d3f1942a9bf943ea869e04f138b007f6
+DIST firefox-115.15.0esr-sc.xpi 582735 BLAKE2B efaa5f3f53a50cb3d5c835b02a4b9dee04174cc0623566c9c7d63532efc48f4b9e4164b40575d003dd5f3815343c5396142e1f0dfbe9eecea77dc83450e91d4a SHA512 f4fd4b119f65c0d8099423dc967470a55232a5a6393b22e323e1968d199c64326a971957fd58aa64a3c676054bd6a60f44b7b28f482fe2078a6b099ae446c57c
+DIST firefox-115.15.0esr-sco.xpi 505680 BLAKE2B 66dfac8c6eb7bcbc0b55fed17aa1984fc83321f275daa07fa2539993ef5c985577b81c8b046293a6b71f311ff9b0d90e35a1253558f7dcdf6f683bb9039eafce SHA512 260424c3a1e0331dd2a086aeeabd8f06e700f5c72f3926a5483ec3ae834924905bf1630448ce26c076152977393048044ff2073d622d8763b76b6e25b34be02b
+DIST firefox-115.15.0esr-si.xpi 606451 BLAKE2B f0e35c895ce9f09fd63a753346e89e66b8422e963c11da0cdd57748aed5d1b91128399b97fc31d871cd873c8294d5d96ced02d45cbdaca2a900c5c89fbbfd4b5 SHA512 45a029b29c8140f3f4b3f891d853fea8b02f3c8d91e0e9fdbf264cf2b63c5ad2bd73d947ebd76dea91d99920054b4147d784c0120dad0b09ecf47b4c0c6fbc4c
+DIST firefox-115.15.0esr-sk.xpi 652374 BLAKE2B 7a28fd4abbbefd5017c20f9e7ffb3b670e8297f7f9790deabaf516952e6d9839a888de766d6cc1afb804b836f294f4fd6ab5b4d43ff516daa6aafa57fe8f85ad SHA512 b21b2b006b432a05d997d9c592f1e2c4f5a1101c014ad2904417d790381ba95bf95dcae3e66a810f03904d61417704ec0cd545b3d1ece943a2cc08045183b96d
+DIST firefox-115.15.0esr-sl.xpi 615203 BLAKE2B 6a3f36cab2bce1f5179a1f164ccae1a4cca40e4ebbc61d11e8077dd96072e1cd6439a96bc01670eba0658ead6674c5657fba20a15841c976dea911da6d577c7f SHA512 e60d61aa1dcc7e74c4450fbe36ac9816ff63ecfe4cbe81d96d9a410a058e7d86b221fc92c4c9423a71ea8c7f3d75468541dbe120d77ccf03b89b85df92b0736a
+DIST firefox-115.15.0esr-son.xpi 413679 BLAKE2B b99890be683244f7523b61950eb3dca4b73f8ea9ec2a9257b30bfcfaf46ee45294193a2fd120c62ac77662cf7141a1cd0e2047c9b4bc5a662dd5ca49ccb8ab95 SHA512 fd9669ab4abac40ac04cbbc3369a9ffa84cb918748f8a8493f71557cfbd2de0704a084856de92a2cfc47c4219753b4eb956bce906a4bcbf917b228c50f9c83e7
+DIST firefox-115.15.0esr-sq.xpi 636141 BLAKE2B fa408ab79af3d2cf5dd7ecb24dbe5a938b06d6d6c5588474a6ad6ba6c958b36c5686541b438f3f9dbf361faa423b678d220404359add6f9d83c9113bfea9f8be SHA512 19c6f0de19e6315404bc3cb67534d8753d30954ab747a873b5bdc3e6db90f18513ff6f8a72e506d0b7ae2b8b5b3ae8a4d6f41a89ffcdd6f5d43d41821a028e59
+DIST firefox-115.15.0esr-sr.xpi 633260 BLAKE2B 763687d9acb9ffa59204bb3bbf5ed72cd73f4f2a2b0c4a27ba1ace55dc96990d296e64267e189cca3f0352f3056f19fa749412423906f8de012ced68ff54d7d1 SHA512 7e44d18a448a5fc8a0edd3b48188ed7d3d8748e60ebb455b04929561b002839189a0b35ae9295979930f66134f1c1de3bec58826f2f6379b292860b02ff104d6
+DIST firefox-115.15.0esr-sv-SE.xpi 619433 BLAKE2B 8bd3a3a9f7cbc403a560182fb33914300865145cca750a0bbfafd7dcb179017fe2d074f7d1becffed3195fef931f3f3224f2dee98d1b2ad8a96851ac5ce6ba53 SHA512 8c24b18e62838b8739ea24abe3095f52b6c4dafc7c05389cc3ee63560c331c35966cb57008fe9f72dcc8ad53021472ee3449a2cdf37a668fd3bed1b4f096a3eb
+DIST firefox-115.15.0esr-szl.xpi 521048 BLAKE2B 24ca3c2c7bf5848d19d16cc6b77189331ec60999420a8d604e08f56704b899abbb9fc53226b1820ae7812f3b6adc99541f77890c521e7ad5f4e02c4e77867370 SHA512 c13fe1af0d010a74726ce55fa12ea88672848d9f54076a7e5b1a5a0024dc8089ae0a888781106b40ffaea7266826aeed26e3104a5838bcabb45231efb18bbf98
+DIST firefox-115.15.0esr-ta.xpi 503639 BLAKE2B 12e3897ad4db9146baed49d5caf8da5e396c48c92b0f0ade306e4a4dfb56c5134f146d97c0fb320e4d48929580b34d0bcd0d7ec590bcb4b5ddc83299fe7e314a SHA512 de4788d1b8beff9b1ead7612a2cde153783428046ec838c95aa7e2ab4dca7ae2ccdb96528cc138004dd66974117257c87a45a434c1403d1db59bf9f5f164fa6c
+DIST firefox-115.15.0esr-te.xpi 556764 BLAKE2B 4f3ab1435b184929d1afdf8127b5fec0d3f78cf2895c8a4a5fa0978e7ac54d98893c25115e59b66439d360652a8b89621e39024ee5181fd440747dc176e68521 SHA512 1325e6b22eac02f8d06020ebfb27f827ed5e9fdead7cf4241b8e1ce8e4c184c994dfd66c068fbef988b84439e495218bb0ec5eb175e9a52e0c2c5161d3c74e37
+DIST firefox-115.15.0esr-th.xpi 693426 BLAKE2B 0cb4abfdd80a7cea1bd365f17205d9139042811d44a297a103258dd208aefb35a9aa0985b75b71e49215f21ef7f83c37bf1db2cb2ecdcc2b7079455042fe54e4 SHA512 bb35ea24063cf9326518d4a5d9da76147d05bb140ee06620c08c941e5134c0eca6db79823a7435c1b7a1dbd793aa396a9747052cfccae30d01df655913c680f6
+DIST firefox-115.15.0esr-tl.xpi 527807 BLAKE2B 3dcf0f738b80573eb4c28a0839bec67f1deef3bd774d495f8f6e6736041e505a47995a585528cf4b507fbf7d2437de94053c331e3b2d368a1cdb0454b20e590a SHA512 dfb4052f585dc8eb026dcbdb07c64ea251cda8fd19afd8c1c4875402aa7cbd33f60872f93b8db69fcf521d49a9742c76bfc292d2b0de22ea440296327f06ff87
+DIST firefox-115.15.0esr-tr.xpi 631874 BLAKE2B b338bbd0396add27a438841eb4150a33c4124bac24f6045c919b0216e3e68227fb287d04903f2912b218b1a9b41f1e51fc292d36c785e1d01b1603d05d7513fe SHA512 62685e561fbca4585844cb7937d1c9c80e7cf84e9dc541e022e41ce0c650213a3efc84abacd347e44391292c0be18267bb80dcda76ec1b559195c763a1c4eda7
+DIST firefox-115.15.0esr-trs.xpi 498682 BLAKE2B 355962c70fc9e68bb39f552414c3d53a6cfe41d8987a93c52a9dfaea29613b21ade959f5f729bfdb4a9feb76cab89f0efd925bc70bd72394f3f864246c6625e0 SHA512 e07f178a9a4df1b8714d070ea58e880f8b34c4b88963bfa4f0c338790e7b7438209449bc26b153b8f25f4a8bb7f18d5310b1ec10e37db4d0913ae9660c5f1505
+DIST firefox-115.15.0esr-uk.xpi 707292 BLAKE2B 8c80608e9e8cb19f19e962deaedb9b3921e70668c007c71f27d0ee789d46aefd1d5ac9a36da3bce7c8687aeeb129dbd1ab64786e532730426f7c4b02544e3f8a SHA512 43a00b956ecba124d127380948c38aceead09efddcdac761a7f1028f06ec14aa49780d89a535ce8a166fb1adf842820e4014f5095a568757b41a2c33a557af2c
+DIST firefox-115.15.0esr-ur.xpi 554809 BLAKE2B 8f28e72f52066d83ded968099da261d5b5a5eb62641aefef3ad0c7354437c134500b78767b75f012b495ec2cdfc51e14d1f0c9abcac779b8e53c7c215ce11ed8 SHA512 aa18bb41738f156517672ee8bfb6cc263f3e4a83f602185f7fc405ef77e65b8901c36958a86c083e49d130046fbfb7e95cdb595f9216bb40faa08e19769fc572
+DIST firefox-115.15.0esr-uz.xpi 474685 BLAKE2B db4513fa6747f8731d92a044f383d70e9ca245759f36ea824a0d9fe5247669d5bca93dfe0d0f75953da29a63a44bc5a7b397e59a7d0eec47cb61711d73f9ab38 SHA512 6225f19584e1d3c34ef2f94cbce9d251f3004174623e6cfca951ad62858ce8d6eac7df6df1cfe7b7af450a6e64e71e9d267a02851d232562b92a4a14dbd12bfc
+DIST firefox-115.15.0esr-vi.xpi 654024 BLAKE2B 03c1d2214b899cc31385ae2c12e56c492fdf5b298c257127540b5f497cd0a077df68e58b722279ba6fab6ed9b025499fe55e93a5d7504c7202559da0274a9122 SHA512 75e5d401bc6a5c3f42a33390167f02714187bafbcd9b2bfe501608928bb715d33b9b9948b736d7c53aa8b7c9d1eed28557f5448e895ef4fa98bde8ac45a5f730
+DIST firefox-115.15.0esr-xh.xpi 414955 BLAKE2B fcbe5f7b559c90382d4d45b808ba35242f9a17905ccb1a4a8470c4b149710abb41a8185049c73309572408debfcf62df3ebcf1f36af135d746db44e4c0ff974b SHA512 85808966db817088eb89bf516057ac38ac16458d9e0f6da76ad58312d204ad645aed8da683383a35cdb1cce833090d044edfcc16f947e928ce144554232fea2e
+DIST firefox-115.15.0esr-zh-CN.xpi 657103 BLAKE2B a7927017d440780ee1ab7a4f2a9075bb071db4ca38f9bd05499606d8a3a28d9daa3bdfa1895bce263e9a81dcf984042e1447bbbd96d4b3e34249045a6567ac28 SHA512 af3399e9eafd53a9644bbc7c8e714e4b497f0ef64f98b3b4e2bd0d28949031aa3f23f78e973baa4286622673ddc5f55c03906bc6059ba6a10448fe0da68f4996
+DIST firefox-115.15.0esr-zh-TW.xpi 659312 BLAKE2B a73185e11f1b6db6def7ebf6ac1bc54aedb459822cb97768c7699a2fcc0ed74ee4dc96c2cc9a7a9952d3dd3c58da9340042e6a75f4fa0f9b52dcf98a88066a46 SHA512 ae7d6d80e645e5a69d8d0fb9a245e7ba0cce82ebcb7a167cf0a4d5a5e306dd58130bd550c66aa814bc0b30a2d57282dcbd44acea47370a6137ff4404eb124034
+DIST firefox-115.15.0esr.source.tar.xz 507920832 BLAKE2B 997a3148b7019fbec95e1e003561a1135c27a769ff92a675debff540b20213a21cf96f9f2e9cb1db4e8c81702b7fcf7e1ba35045dc7dfd705957d099350ea9f3 SHA512 0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba
 DIST firefox-115esr-patches-12.tar.xz 50732 BLAKE2B 821ea063bd14085458967e33570bb28a1457672d2c210368507532024db25dfbb7d30d37084a2cc60a4cc34dde453669ad9046c664e7e8459a8c7fab33485068 SHA512 e80b0eb9a4efa8e6a872a875a31e384a5d3ac2f7000a3d12b03cbe2dff43baf8e3e544b7b7baadcb46ae714e3709ecbc53742b9562fcb1b1caf85b037b5ad501
 DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f SHA512 186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90
 DIST firefox-128.1.0esr-ach.xpi 464065 BLAKE2B 168762d0890e65d5ef0033a96d0b9b00f1b12df24a2f5debc56ff8010421cf2e2c561cc7d105853338244edcbcbf3a3a2a4f174568740f4b82d4dc11b164bcc1 SHA512 4f4818a789f7da04a71fc257317e9d2341ead3209c815e25326f13be1501aeacd7da77e86e4bbc2560d1b6952f91466ff1fc90efd16f02762c85ab06e461bac8
@@ -301,207 +401,310 @@ DIST firefox-128.1.0esr-xh.xpi 417178 BLAKE2B db647fc6764380635d796baaf6084094f1
 DIST firefox-128.1.0esr-zh-CN.xpi 657339 BLAKE2B 37acc3369de9339eb10a39211526bc8cbf82f3962b0415cdf96b9933fa88fd5359361fa6c0a32545cf31cbd86d590efe9814b67d835f486e2a39387c00bc6e04 SHA512 524d90cabcf3ec2f882670db7571156c61b19302371c3c17703fcf3abd6758aea898b6231c51a50b3db6607855a6d79677054a9b19cfaa522bde9211b9ae30a4
 DIST firefox-128.1.0esr-zh-TW.xpi 659474 BLAKE2B 98d0e9d960a32692cd34e4ac99ec5494e74b0b55d45a2f36cd4f722ac8ea2c9074c733ef2b04a0bba60e9622c26a14bd38d8eecf8a810f0819a5c85615023ef6 SHA512 1a431fd2d01a78fb761c812bdff06361c2c5f59fbda12656a38622346cd9370e6748b61cc98ab38a3d31d9824aa9f2da4e90a0cb6d0533e40136aec7ac8f1469
 DIST firefox-128.1.0esr.source.tar.xz 561953208 BLAKE2B 6d22bb17ad22d5e29008fd98f6b90bc6869f71c03b09e5b24a6a8a8304f303b316131aeee5d3e5f175a9194074d586a507ae121b9397aa371839dbdb1349f2bd SHA512 8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388
+DIST firefox-128.2.0esr-ach.xpi 465016 BLAKE2B 70b8839a5028d7b87218116dd44fa724fdc1aee91c371bd5e84112a9153568d7186ef4237f707e08b9e22f0208affd03141b49fa4b842cc82faa5ebe7f19004f SHA512 688b8fdb84a6bf069650a65218615d605cd9cbd52435261f3f4fcae749cd67373fb1ce34c24bd3d0712c5e9416a2c111e2bd245050130423c944b64ca9092c1b
+DIST firefox-128.2.0esr-af.xpi 418343 BLAKE2B 6b52d8b28d7e1095257927e2e894276cacf131fbd8827bb321729787d4f2b9d35418c5b834a87c30fe035f31f03c003d3691d2350ffa6972d1ef8de15952fe6a SHA512 70bfdc67a3f2ad213de61387f611bd9f6231eabc7012f190b84020ee3c75d70579d88db5cc1995f86fe1eeae72c31438f64019824c4ea28ed589b39cc12b9dd9
+DIST firefox-128.2.0esr-an.xpi 506833 BLAKE2B 0c46cfef3202306b143015195ad4dc8d04c1bbb51dfd643b55abbcb44903774a4b119c0cd2336209eef2ef57abe5c2f6d0b82eae651e1cdc738580e6cb56474c SHA512 3dcc2c6ceca2d8452322fdb129537447d4bfc9951195e66a24ad7fc5c5f3bf9cff17326eb98c3fe7afc4e33ec9ae6f5d5b15e2976da34192a712bb1a08dc58d9
+DIST firefox-128.2.0esr-ar.xpi 612892 BLAKE2B 940c8caabcafa3a9c95905d820bb622adb94b259da739ff5ed88338b3354d572aeb03afa98aeb8f89b83dfd5c0fd5a6c0221c64ece8b1be8bdf0913a5c7e29fa SHA512 2c18828e3694d898bfb0c7fe36ac5937a1baf70dd1613570e1c11101197d5a66593334fd6a2b007ed680d8d62e6f5eacc1ac2e4766dd0f6fcba8fd255adc5780
+DIST firefox-128.2.0esr-ast.xpi 497291 BLAKE2B 752ad97fd9c00912228226324eb8647bd5c4cfdf3a8339aa0100047a4e75a818cdb327b5505e9ddb8a33cd80a26217a0bd9cf0fef6ea0a4895a3db331686b830 SHA512 bbbac520b9dc6eb6fd9c4a00651842d8765411fbfd2803c6c536f0e5b1fb7e0ca8886eab0714588dd26fa191363f503550d39ecc14c6263cc1247cab9d43b007
+DIST firefox-128.2.0esr-az.xpi 491719 BLAKE2B bf70d9814f2951a02ad0522d23e8162785087972ba02355613dd14f196308335b0e126845aa378cee1e11188f832cb0e11064d7ede7c3257b5dde0cc5932c32f SHA512 c35f461cc54aa04200729d212525e807c3361b081ade3d6b7a0bab462fcb43c7ecc05ca0cd8a1c3a6471126de7c45386c5bab6b9225940f3bbf11441fd9c2195
+DIST firefox-128.2.0esr-be.xpi 717327 BLAKE2B 452c846fddd81bf764903eb42d4aa87d7f96fdbb2b9a87718abf6b6ec3552855a6fa066fc69eda91bc51143ecca890fafbc5297f9c7d3f1a5730b6eab39e04c0 SHA512 7abab5270899c9ac4be6ced477c630096475164caa37d88089fde40c1c3e8c794f21c4a88a001f1ac5c7605eaa63c3d156e27eda331d77ddfde5ef393f7d45f3
+DIST firefox-128.2.0esr-bg.xpi 637126 BLAKE2B 7bfc353a577a31c3baaf8af178dc34e50b36fb02f8a23e585cb8f7a6d97252c49a642fadf2ae47ad0615af9c4dfcd77b631d164d3bc1fce87fc2008c2d109e1d SHA512 16cb5b6eaf1f4691b59d5354b4df9cf1b55d317e42d07d59226315448c9ae2b61225bd6f810bf192e2dea8ad8b0b574a51c47d7196f93367a78f873255a21eb3
+DIST firefox-128.2.0esr-bn.xpi 582470 BLAKE2B 7395bb68fd185e1559dfd94ea67c9e70004c59b0d2fca92596ebf2f7b53e3985f0dd1f00660d591317db23f460048bb89cfe832813060e53e52cf3425c5c74d2 SHA512 731c42ee4b5e0ebe309bee4370601324ced7e7d95f5543dc4fe72db60fb1d03e5d4474755b329744e00ebb3fb1c3cc905c50ec4a9a6ded85da90ec4fe4bf5c86
+DIST firefox-128.2.0esr-br.xpi 590836 BLAKE2B 3d3352e5466a2df24f294eab8d604ad97615aeb5edc02edda2485ae47db99702e6dd163dffe4d356e651ac1bc36b3815cee22b2d27ff1ec6bffca007a4552197 SHA512 1a59e68eb68c3f2be052ea6291bf4cea5543c3843ab31f76018515e3cee2d8e0191e0ab9ddebc3cfa2563e242e6a8a58c72ff6d087ef0e3bc5fb80f6c2a30aef
+DIST firefox-128.2.0esr-bs.xpi 510170 BLAKE2B 0c4de7a6883be7bc6520053ba86bea54b9bf57ec470841eef74fd412f2c11443057ecf952cb2125fbcbdab9289128f12b8071b9052b78321673fb80b0eadde0c SHA512 b51596dce4e77c3dbf0f98fa21e430b18fbe5ea9806bf0ececf06377d2fdb2064f5205af839bacd066ca886797ad0b050cee8b7069c23a864dc146e5c8d76138
+DIST firefox-128.2.0esr-ca-valencia.xpi 547190 BLAKE2B 1fa8d3cb7d8821a1e62185e260fdbcf54b5f520d71ecf984c9c7a56958c0fa535e1406b6183d0198ffb847c911f4dfa632f200500b2e32efeb98112dd04451d1 SHA512 98c0b5b46620783ef2d21e5915fe8130968e912bd553a7e1a116445d82be4931fcca213621a33a6b1cbf4e744d7e14d59f9017bd51f58df7b1d673b179986801
+DIST firefox-128.2.0esr-ca.xpi 598610 BLAKE2B c526d2dde8315fce06a2e272c8145f2f14b7c0a80d04fa002b01a79e496e4b134d2e219636908d4ff9d2bd43e1b478d5be5093b31dcc5b196a1d643789489f47 SHA512 82b80def7796f4770c93535a45375ebea9777866f28fc9f5b527e7bccc086d3d9d7e1cc20b8d83cbcc13a007ea457bcc683b67f62cd7f5c869d11b5ddcba3607
+DIST firefox-128.2.0esr-cak.xpi 594027 BLAKE2B 1198ae6b3116e0f52fe7042060cd1eacdd9948787bbca82683140c1895429e81a2de3df46eb94dfaca757071fd560982221dc674f0cd79db5235071bda463fde SHA512 3e2f30e4cb499f46322c6b0074a54bbd51d8d362d6c5e7b6aad16a5cf092f29d44701c936ffed8132e1a904eed2e787b0f4e47e68980f5b56718f59d5187650c
+DIST firefox-128.2.0esr-cs.xpi 666457 BLAKE2B 77b1848b1bc25b4280725c0bdab061e9b70429d07c197761b9851d5723a6a542215d714df491b93760268c25fdb47a0f8414a07871095e25b8cf6708fa58ea12 SHA512 b3792b7983065ab253c4891e79cf4ca4a79027f0f23e64e34c1e0ecbc9eb3d0691a4def5a386160b59d287d3f2dc1e13a9a6534704ab5230c34474c52db1a032
+DIST firefox-128.2.0esr-cy.xpi 631265 BLAKE2B ae4ed3264337d1aea359ae0ba2d0235f351079b7558fe3869b662e91cdb557d1742a66bf559295e0d8140b25bb77bb53101163da3a85c9cdb3d3b38275f05dd8 SHA512 4c65b218ad5acbee572516ab21a379dc8f4049884854cfc1ba4feae67adb8479668a01d0313304e6b8c26fe8dc8ee35fd1bf86f7cd6327fa3edfa6413373bba7
+DIST firefox-128.2.0esr-da.xpi 614503 BLAKE2B 30f2b5f42edf0cc047334a5c1ea1ffe0ca11bb269eabc1613ffa4c65806059da4460a34d2ac9a0022e19f9b5de3ea5c01cbc8a3893ce1a9c64e04a40628b84a9 SHA512 53abd8fdf4cf933be6b5ba430ef24a42579388bdc77ae38aee88389836b3096f1435f7cdb887a8079ba44f1f7b5f8c170eff43445f0e435a4fe2a291f1d6ee85
+DIST firefox-128.2.0esr-de.xpi 639266 BLAKE2B 540568f54d7405422b3a096dee282b69b77c72cf1195698c996762364b5fbfb845e7cd9298596e51e942330cc2ed8020bcb2facb544ab5f3c27e7553bfc36cf0 SHA512 f1d3e6c215830b964d093ec484732c100d2fb2b54f815e462fe8665ec7608bcb969155df8d1ab0ae556513d58ca906e02b1be9ebaf1902ccb6e41b169eb6bc07
+DIST firefox-128.2.0esr-dsb.xpi 656622 BLAKE2B faa31d365e4b25b5aed5acb01ec2724dc43ee859aac2bd7dfb832fdcc080e1ceda16e793450295a3167d17e236c244dd8522c809eb9e2015563683a43c4cdc35 SHA512 0c25b972d6fc0bd8a5c3610174281e2886b45e660c6b788f8263a9b85ce0758a1e2bb0c6e4fceb0f9033d3a64db90ac02cca65e2ab63af11a4881de1c2b33c45
+DIST firefox-128.2.0esr-el.xpi 741108 BLAKE2B ed21c5bc8a104f6002ab96fa2d1bcee0ec93ab9e3b6990834839b5b5c98d3df06bf237f6cc6a5e3a3eecd2503e33d91f7b5f3babfa858ed4de77348bdf6c2a6a SHA512 ec3b0063c15587637b2e6d58b11a6aa8ae775cca51c53f3e3a88ca3da939248bbdeb02e94027e4b7b55baae05c4106f3c2172781e397fff56569eb819fe6dded
+DIST firefox-128.2.0esr-en-CA.xpi 590919 BLAKE2B eacce54324130d863dc70990c284737b8ce1ccebaa67726f57f042f6bb3b83f3ebd31acccaa3e61869074f4cc46ff71ce5ee57b2a831dab4160e99446e44e02e SHA512 83b02b2b8ed6e76c1c6dbaf7570d3ba71c75ec7b253248200ab445ba571a741c3ef490025ea1fcace9994de94e5f80a8d74c469b83bf1ccf2df48d7b4fed05da
+DIST firefox-128.2.0esr-en-GB.xpi 591530 BLAKE2B c487037962e6f3319dc2094f96fb057566148316fa2613e8e9c520771fb546b58ca290e91c20c295d1f1e4b53cdf150fc15a64e00b08e587795b9e2e3dc82d9e SHA512 6e92e43a559ac736ede9089ee6929deb04cb1c00e296398e579fe1f6e2e273649c1961cd599c6d6aeee0a2b75daff86bf0f7b469d340e7bc6daca2d1c3d78dd7
+DIST firefox-128.2.0esr-eo.xpi 615506 BLAKE2B b6be4576f6e8e661e084100547115faf9d823f3a9cdd256a136bbc052e51a05409591d3ed5f378bade142331840ef01e99ddd633d360afcb980199b494cc1fc8 SHA512 9b7af6122011f922c8306fce5dd4e0fbb2afa2d8b00c08833087cbbf38e86b313c5e9b594cb9f137f5ccb4a33fbfe6ec94a7329656512f7a39394df6f8356913
+DIST firefox-128.2.0esr-es-AR.xpi 634653 BLAKE2B 764ccd63612f0d10f9efc920945c5978f809b7e2fa6eadabd263a85d37946a59211c417ab22c2af34e7f6725cee554876cb456dd9ed2b9f534e855d91fc9ac1a SHA512 c68b83ff1118a0999faf3d17341f80c73307e01e594be163e1231b69d3e5180a6ccb0084ceb00bec49823cf96bb5f13d1ddba73583590ccfceb120ddc07fb699
+DIST firefox-128.2.0esr-es-CL.xpi 634136 BLAKE2B eb8307f7756ed19bb6fc5cfd043f7ac946aa7302da7363e20364d5d012b159e0fcd026672b7d666efe8f1a4e4ae4f325ef6c85c15fccc8cfa30365719d66e5ee SHA512 a542f65f22873c09c0fa0f9afa80e69f997f1693ab6420977ec71a053cf3a7631552a538e927511e753556c08720bc4bbb67fc88c3f1b5143e0e3721102cf22a
+DIST firefox-128.2.0esr-es-ES.xpi 622027 BLAKE2B 95a3e27ace81c633711300b1579589c9a03f8b87266a6312b4b009d072abca81d89889d4084ee75a50bf6e8e566bbf6091c41a59ad9f7304fdd06509e3f514e8 SHA512 2183fd66929fe418edd1b86c16b2f2d910fb141407ed2a20d86002fc0cdbdea385f6cf6012f0982d7a863ea5c7c72d199ab312b59a9a6b0acbafc5640650a1a8
+DIST firefox-128.2.0esr-es-MX.xpi 610639 BLAKE2B 0592cdfc5b9c29f7d9294e76a6cb0a968bfd45ce37b888e4cae56d90234ff33feb2d42a30ce474616724994a27dfc1dac305bf797bad1d94d976d304af869810 SHA512 f4363783ccd52ed042f1a4d97c8d96e799f0ec67b303627ddcc7ba397656c3f14200eca1b731a0e1ba3ca1c118a177dd4103f7c9f9df064ad0ee542c9c0cd21f
+DIST firefox-128.2.0esr-et.xpi 540637 BLAKE2B 12c24fa32eb588245f2e552a855a9af486761e1358e380d2d734862b8f48f043ea84e219965b5c5b7aaa9a1a0d4f8abdb4947f2988512108b61fbb1a592429c5 SHA512 ae8bb76206803313cf8eadc3e794f5be13beba527166965cb30f7aa33809deadd8a4a5ac805523e129f0feb198d9239ea4d4be709d6ad8d1abd856b6c49019ff
+DIST firefox-128.2.0esr-eu.xpi 601114 BLAKE2B 94532229dfe560e1eb01dcc6d3a22c33e67aa28759334436b47715477f264430e196dab25d19d0e0089a822b343c12c23eb6d3e66da4de1c3a35e8f60652e4a5 SHA512 ee95366c8e79895d89710c1aeb791064aeee409e4fbbc6935d552540ba6d7e0a2552b7f2f1da89fec23f91e9dd684e9a78a5e96675dc40218cc2a35758f8d520
+DIST firefox-128.2.0esr-fa.xpi 590957 BLAKE2B af0a782804463e6bed41a4b75ee0207e80669841eaacbf0aef41a3cd8ef2958546ee97dc4b1e5270fe1db6b26aea34b1b3ae76a49913e764911fe401bdb1245f SHA512 c63af3bed58982c29b55610f66939e7464e11ba8a28b3a66777b1c2c5677cf171f8637f3ecd4513afc7661fa3279779851797477b2f01120a72b54b2a74ef611
+DIST firefox-128.2.0esr-ff.xpi 477004 BLAKE2B 80fe9a1ec25cd512daf3a54d6a84e63e4538e51372ae55e81096da8207ed5c29ad090dd4026f09e001c75e74d1d8fe75e0723c39c66d0ea7c0f4711807fc0d07 SHA512 b6f6cb712e98192dc2dbbfb5118cdc6aa450378e8a9d6292ef1c38260302c507941862444214fb88b9a2e2c5d35e885a7ac81d1872975a4889f6b9bb5a1f60ac
+DIST firefox-128.2.0esr-fi.xpi 613340 BLAKE2B ca22ff04b8f70e7aee2809f407913ab2f32050c1890d9ef6ded3dafb9daed3419c5139c1c6d4aeb0eb97fda12b6361eecb0e1702c73707e646d0da4fa35da96e SHA512 25e674d343b78e0fce174d897f7692cec5717bc10285ce83fa528dfec452c8358930622ab2d5f3e54efd1234846676677ec8026793da374ce44612ee55b8af88
+DIST firefox-128.2.0esr-fr.xpi 646209 BLAKE2B d3eeca16e0d20bb5b881555a6688060394e6ff686510fe1e4aecdab0822d393d573231b65b4ef64ca88ac150c558b57644371a60555841192df4ede33e668c31 SHA512 85b5d205b27fb696f8e8fc5ed9ccd7607ea8b93045c415172e4779248051741c9dcc3a1fa9675d5d89047f70a38551bd240244b34ebd40f3327930e8efc083d2
+DIST firefox-128.2.0esr-fur.xpi 640939 BLAKE2B 1a2e29dfee505c07d4f8e6c8182eeb3d224de9ec844e893bd731be82a99e51d8b9a79f37a2cbabfe50d400dff21f52c3a68fd00a353feddc6aee21aa0908e491 SHA512 d0c2cb70207885acd9923ea227464e19bdb8da0c767ec26743b551ee8f9cb10023578a023cdc0e05d4f8977ce6170fa0926428c2c026445dc548ebcc4ddab2a1
+DIST firefox-128.2.0esr-fy-NL.xpi 630346 BLAKE2B e8a3d6d2e03c798bb71b4d346a510a0579ac25b884c92f637a6807591b016a3807ac46d9844974b889b79316f2bc07b8e64fa054e3e7453c07b956c2bbfffcaf SHA512 5dd70c7888c612d6dbbab99a4864187e0003537eb267c293e297591efb896c2510ce7160b836622e9f4bddfa8bc0831aed95c8c5053749e2c0fde9dfd6e32f0c
+DIST firefox-128.2.0esr-ga-IE.xpi 471840 BLAKE2B 9aeb9318dc067c1da9b618fa7cff37da0068f63f3d12f630e329d16d2b5ed8da73df5825bedd84aa141b05d0e2a06a45f6d57eaa364d1654706e63ecd46f7c9a SHA512 ba17302c32241cc959f20b5b4d9fb81fb79ae4011caffa97b6d26a0541eca41d0a31e16815b9c15b483fe925ae060b0aaca1985f94fca18375750e282c033f1f
+DIST firefox-128.2.0esr-gd.xpi 597538 BLAKE2B 9dd9f2745301f8f310f33a190a65a20f76b4bb1c000fafb5d69282b086944e8731969b28996375e38e5fe97597e712021019e93fedfc7d2de9df519d3d42dc89 SHA512 42304ddb1af2bdc9b4f7e4ced0867004f203972ac454a597b8b50ddadc0ca3be8d5276ea8df355e1ab605d20b626f58129cd538467087bb99d3524cc63c77544
+DIST firefox-128.2.0esr-gl.xpi 605038 BLAKE2B 2c5bb207281eb993317336451c9f9579cd64dc4cffdd52ad19dcd0d9cde97b74240501623a1bc4921ed34d1239e5bf87347c466e1fe4da75cc1095eb08d018e3 SHA512 a164ebdd56d88834ac79ab92ea23cfc840cf7cd808008ddd68886374e476e228f9562cf8452d012c17b48a1c99a963da352aa921517cc2e560915b05fc99b388
+DIST firefox-128.2.0esr-gn.xpi 643641 BLAKE2B e61563bc66ec0ba0a71eba877163b670e29d8d3bf2b782db166d71af9bf17ac39b151ea9c4a6f00daf560400cb02124e2f1b43dcceecf265d8d6721c97c32f92 SHA512 7f9f0eb9771f05e921937d78519e0f03a43fff450545fbc1f7dd19cc01391b0b6918022bac1fdaabf3f3637b25333fcfa5a9081ec54eed7d6ae79d713a4a697c
+DIST firefox-128.2.0esr-gu-IN.xpi 528311 BLAKE2B 6e9335f5167e79ce9ca1cdcc628615ea41f03e91bece3ba6c4b3c4c235a0ce1fd9cc502400ae53aa21e8ec7b2c50dc4513ea2b90b7fb8ba8766caa82f1f65e0c SHA512 0dba09b2a209eb3d9bc0abdbd108bd906c2e2426b75dc961f828883cc0be44e61e730bd6b030f6f66de7452afb5a61e25dbf68de4e362b5d29bfd6392ff8fce6
+DIST firefox-128.2.0esr-he.xpi 637789 BLAKE2B 09b9ce4818f609bb14e4f7647cd34a6082e2411a57cb9dd7d5a7599d9adaa964b551a543da6f05a6ea63eb4046fa79634b5383a414d09eabfc6c2d52fd7f64d3 SHA512 e271dce2a47ef65020cefe41bb236ecfbbd0c0b0d558d32377985b7f2c8608614f58429430e54309b2a4754dbc66fb96b032b08efbec5773a359387a54786fa6
+DIST firefox-128.2.0esr-hi-IN.xpi 567736 BLAKE2B 38881624b5793b8b6a9d352bbe9ac95f17128a31a2e666761f341d83a8c77619967b2382034a59eafd753e38623c315a87c2805048232be1e435d5f86840fbcf SHA512 1181a815abc6a258798251d62e200c9a2c36da3ab1256899e86972a47ba5eddec9a080ef7d1cb4e280faa5419125d670c9f75a4f8ebe21ab7d6390d0234660e9
+DIST firefox-128.2.0esr-hr.xpi 615348 BLAKE2B f302229dfafa7923af9339c196b9ef6267e5eed846fb09d9e1520fa47cced0c2f13bc3c891118a9253cfaa8d1c6e666b978ee27b1418bf9208340991c70e586c SHA512 ed7b53d4e4266ea24c864ad83044d60729b75a1e2a0a6a2350952309b337e6461ea44f9894adf232512bec49079b375a48e1117db01d458cb28ae9e1e91aeb87
+DIST firefox-128.2.0esr-hsb.xpi 652642 BLAKE2B cdf7e6541df09fae4a4d12b0537a5ef9538384c1a92e48dfdfbe37ffced85bb576391e8abc2702fdfa65bbb3b1515740aebbd6a0a61027d84e1974b629acfbf7 SHA512 ca993b1e2d95fb54b5552aefbbfb6ee511fff898f01c5bc45c542b3076fa20211c5e68d0c7139825bab260671e7ced609c394dad9e371cefeb55ded6ca3e0cdc
+DIST firefox-128.2.0esr-hu.xpi 657494 BLAKE2B a4ccab55a678d878621586026bc34ba7d67fb48db020befc9432be2404e71b1c3206fa4bcf791ae7aba839e2791a17d2d535481ba5a284878286a24a64518b37 SHA512 0c4566a47237e13c8aeb5bc859b65819d72878365a41320311f6afdebb778f2f2cee7778fbc01763cd99cd94897160a2696a94c71e01df2aec444b96bb19348e
+DIST firefox-128.2.0esr-hy-AM.xpi 652579 BLAKE2B f9116e2d45ba205d01cebdfe38597e72a3da56ba529ec82a1c2a2c63c9e8798a879fd229c1aa5becf495aac33dab116388f817afbe14ccf3b3524cc2ef2b151a SHA512 657681a0725d89886690b832d985bf59bc7163521a81da4a3b253a0bc66f598d305a45092c655562d61632ca48c562d8366dbef9f39fecea96778f7dc2506848
+DIST firefox-128.2.0esr-ia.xpi 615359 BLAKE2B 3807846bba513bfc0564f3712be5e93dc5f5a9c7378a152af7dd56a5d6271894ee2bd60255ff26c979c67968c1dc8a1e2d53c3c4222e248cf750c93f691bb20f SHA512 2567f8f3776480882fc7cdd43a6a23ea980806ea6bf738c6d84e18cee28558613baabedc692b1bc0489c9c93c9a5c809167b5f96f96aff107a9996d883856eae
+DIST firefox-128.2.0esr-id.xpi 585709 BLAKE2B 5349e576eca2e00af352ec6c8a685b4d2a930b70c33fd60cf8569820985664ac8de3f580063126ec340fd5967ec4ef212b04271d4a0f3218729bfaa08da228f5 SHA512 66f988217ceaa43cdf600e36be136e063edea6bffc573c0b39cfa67fed9e1b1d8d620dd9fa1478d78914a015338bfd02e8214db916cf79cd08f527510b67e09e
+DIST firefox-128.2.0esr-is.xpi 619078 BLAKE2B 54a0d0d695438bd6be120b6ab61ebcd048fa439e342d5cbda1c437a8d69a5dab2dbcf295a9e47c3d430a7249058e880c99a2661d8c86205902930caf376d6cc6 SHA512 2feacf83bb6c0f8f87e8294ada857a3060419449bf34233c2af2a01bd84a4916d529ba34faefebc90dcf23abbd1255dfb98a87066782b29b67a885beb574207a
+DIST firefox-128.2.0esr-it.xpi 574457 BLAKE2B b9d6aa31442cbd73e5f328e136b45fdebdfc2881a5072caec60609257a2e0388dded259fc9fc0fabebb5320e22bd731aaa9ffca1d5514a361c7b887881882deb SHA512 db880c8fd054c08dbf5427be39bfbccf6a11f4192ba2137e00e792bf3ed2138b31164de3fac9af78d2c751809f8d496812b9915b2dd4bc93abdb8587122de6f1
+DIST firefox-128.2.0esr-ja.xpi 683774 BLAKE2B 305bd1fca5745927fc52bd6c29b1497b5c6a6b00926c1f8b7a95bf77d47897a8adeaddefeae781a9f0f10a8172ebcce11c1b1193857e16b540fabfd73e68b9b5 SHA512 f1e5bf2cf5ce8eedcab383d2f691009a561e16416335fcccf75fabd95d228aa25aadeffffcfc6ddf2f2a73be8b23d36afeb98ef30a94e3f79bdaf784c0fa6218
+DIST firefox-128.2.0esr-ka.xpi 661655 BLAKE2B 84357ff5ebc44125b7a097e229a71eb104ee960a0630fe454c11baccab20c66e4a2ef9195ed6bb46cd73b4f1acd047e13a4c4b87d0cd14e5d02d7b79cb6001ea SHA512 7b7468fc8634e20a2a1f7f262c2e624b0f5c45c1aedde30a7d0a963002f10d2e3385dbf9cc94a94253e748ac2d89d2f99ac8446f22d42e573f44c18d0fcc64c8
+DIST firefox-128.2.0esr-kab.xpi 612142 BLAKE2B cfa29707cd1c249f553d7ef495b7ae591c3e09441998d36ee8436dad932590b42f180af474ab29acafe4344fd4bf51d137b7ea9cfd9ef1184e70ec166bd9b37a SHA512 43ecb078d97fba83dad71cb284db809404943d3bb1999fc755acdc2d29a84dfe047f23b5357c3f9eff638d70f325eb62698a57213406020eb9575199cf494d60
+DIST firefox-128.2.0esr-kk.xpi 715705 BLAKE2B 14abda57a8e75b8a4275fcacbffab2e138e8b0b22d64c58a3327f9692db3a80a630e11912be906bbd073e419453c1d558e94c4dd80d555d20e2fecb42987311d SHA512 93f8560501c830faa25fc3cb697e3e28296dd3a67298dae68cea75f6be59ee5dad95153b513eb0bb93e129ee8ce1d4fc4f8f9887245e1156e711483fa4a1f3f9
+DIST firefox-128.2.0esr-km.xpi 526704 BLAKE2B 46d8c5804c04e4df7e409f4cd9705c71169800e7a63c71f713771643ead53539f586d9324b9671cb748a59df663ee08a1e71918a0d237e985a639d8e29a5dae4 SHA512 8c894f9aa95ba2ef3460560af5a001bf3511bde6ee961db33a01667c8a32133a2316fa2908bc92b30fb290999582d8d79dd39190126ab1592d925f687c4b0a1b
+DIST firefox-128.2.0esr-kn.xpi 492069 BLAKE2B 31ce67d4d3da710c2dc93f9918ad367567dedebbb5476c80e9d90dc66bb2a586ca3ee562c5da1ef2713cc7fc78240d60efab0ffdc61a3d7e83abdc861297c029 SHA512 dcd4edd6b64f482bdd98254d83a34b7e332afd62c4e97dd0de360a71ad084cb5aa7e12dffbce49a27b68d9d5b881e231005592156a4d7a49f3c37ef7b89342a1
+DIST firefox-128.2.0esr-ko.xpi 668819 BLAKE2B 1855b9bf73f05feab03f167a6f5d32d1fc70c3d02d5c46e5253a415ad779ad0b4aed567985b42743b7a8ff1f3e67b2b0950703fafd9f693c64221d9da6429ecb SHA512 36a1da1fcf63b45423e578bd2346d8e01fc51e7f740ef21082d2d3f9c49cf480e8208e1e42f5cfc99fc911ae59854fef241009873fdf9811c906938fd285c648
+DIST firefox-128.2.0esr-lij.xpi 485047 BLAKE2B 572e5ad0d33aa885b2033f67eacf7b171688615361c1941fcdc2c4fdd9e2c4e647c51b22cfc4268586679976cfeeac8d4e1d65ebbcbd04ee878bbc0cd056ad7a SHA512 ccc5d837e485d42fc12405642987fd828c86e438c70d70ad075a665bbb3c81a6ebbe2a6f660045fea13c1bb490fe0c5353cd5a2623ee14cff6a60edd0b3c308d
+DIST firefox-128.2.0esr-lt.xpi 573642 BLAKE2B 0275ff8e100ad123c9e53f2278f77fc6ce845eed16f57dd265f8452095ead916ecade8abd4e9795d73304c0325bd6eca7d62ec532b8a6cf6a74c60f232bf2412 SHA512 ed7ab421a9c6f1447525e3622324e0d97cf290b67ea132a49fc2f94207c69a0b93bd0e4dac1099dd12802b20ca2d102cd1aafaa2f8ff9d846577b14b3d43d443
+DIST firefox-128.2.0esr-lv.xpi 584340 BLAKE2B dd5986975a2b7912a5612a5b547f927582aa5edbbe9993d32ff053e2f6fd321c523806685e136c8860cc30d6d44e1c61e0dec17d0f4a11c24d3a49b417db1464 SHA512 93d0c8a3a40ba33de1ae212534eed4ea318f6f0ade740f9b4f58290534c2be28598eaf7aa934cfbb83c27f1890b614edc59b186004f76617248b55b8954541c4
+DIST firefox-128.2.0esr-mk.xpi 494673 BLAKE2B f26a42c95c613af468f027120b0c38ecc6ada51a6fcf64ce84e8a42e650e236531d7f72b3e94fddbf0f317dc9c6ee73fde88d3fbcd42d8ba12bcff81d68414a7 SHA512 672d1704b38074d2c716319b1b06fae8a8cdaa5d0e27c3c4705226d86ad4741dab028afaf20627f8cc8b5cc6201537e5eae88e5a6fba290711af141acbd48f05
+DIST firefox-128.2.0esr-mr.xpi 533051 BLAKE2B 0468e82ecaffdd73b5b56164a902a83971d71a333ea34d95089147aaef14493c4eccb1b44b2dd4d7b8310112990a512abeaef42d0544cda9ff729ca27ec1a6bf SHA512 97b1a900a06d2676d91506d2aac53c9908ebe5a0605990c7ff7451e6e6ee3863067316988393341fbbd6428508a27362d509e843f23697d74dbd96ad3f3a5461
+DIST firefox-128.2.0esr-ms.xpi 450664 BLAKE2B 8a72e63cf0a067b3bb35c572b4955046c72667cdf0f34517ec8125cdaada61150a4195c47bd7706348d269c6ed18d42a05f4da222e19556df8fa0edf1450f2dc SHA512 e6755fb932bc33645497775e80abd02f0a471b12d3ffc914559eadc85ed37c0976e097c036c70c650ea2763ed294e427411c3be696bf7d687a61e90e6708ab9f
+DIST firefox-128.2.0esr-my.xpi 519448 BLAKE2B 3ac0adf460518439627c2bb94325c40a328f548090105055b022bf6a5ff140e3de174ce21f31dc9bc3de6684be43292ae6af0b222fc05156c5ea55c0f87dfb1d SHA512 4374efc78b9af35eff75f58ef78bda2c0dff79864362e242a0d3859c10a65d5356d564c6ce715c7ba7d0569b997736c72d7bc9e09b713816e297841bb13c0c1d
+DIST firefox-128.2.0esr-nb-NO.xpi 613393 BLAKE2B dbabf5089d6bb9256cc9cfe0bd13b819ed29385d96c2a5afbab4e937051ff64cdf243cc3d715e4eb8684e66c1799a1707e2eff4d300592999a5aff7c043072f5 SHA512 53b2d1f4d5f75ec611e2865f7a81a26d4a1e74ec852a9ff3680ce587463c90acd2392d113aaf4d5c7915bdd35d12b3c8535a87d97f5aa6aad18df84333053ab2
+DIST firefox-128.2.0esr-ne-NP.xpi 515342 BLAKE2B e7bcdf670c4d5f0c7722f282660fc304447e58048e110dcacca1fd955bc2bd71dbe136f55e99b8505404992ee7280c52798b6210d239617d0141e713c3c470a9 SHA512 e62e660caad1b3dd07396c97a29e207cc0864c6c4e08ffbebf55fccfa6bac419426aef9d4c278d72e6c4682ea85e6a8cf98294356ffd1a631426cc90572c4f01
+DIST firefox-128.2.0esr-nl.xpi 623990 BLAKE2B 29c2b1c34365b39a1ae6a3f9528deb24fa8c6e7e514db12c52a3c7c87748c533f6909da30027b5451633c2bc5a3abeaef65a0aae4da4d33cd0fdd26ee5b3407d SHA512 abc32055b91b806d0b26f58fbb3424c2fa7f3cb2fdb4c6fdbfe81b587dee39d9e69d546589e49ae058f806134f3b3c78975e673520615a7e5f4013e278085d5f
+DIST firefox-128.2.0esr-nn-NO.xpi 617333 BLAKE2B 0b190cf732698d36648b23969b6253eb9af420f348a295b06464528dcedfdf479ee93e7b28f9142ca5004cecdf134ed1ad6d55a6e4f6db94901a517f3348751c SHA512 79e4b38347afe93413a8e9125f248bc6a0ee07b33f772b624d4b75282cc48dff89027fcd90ce54da91ee414ac91de983dbb6a511b5cdbc5c8481e76131a75dc2
+DIST firefox-128.2.0esr-oc.xpi 613834 BLAKE2B 6bfb9df2b1d3cf7814d790ea74822ec0ee3184bf6446da361352730e6bd842bd017ac291aa0ea8dc9ce18a7922f06e0adf7acd9200263049a25a2e3e16f57459 SHA512 55c7736eab5c2a87bd7f1f0466154ed1f4a6b50556f6d8d730070ec9bc9ca867fdf9bc301b87a8c3ecf3e918b9ee8e8d14cbd2c65943d3b3467b4f52a366ed14
+DIST firefox-128.2.0esr-pa-IN.xpi 697916 BLAKE2B 99d73c908caa19e2e5c08710263efef7430685a7ce15b52470b7a05ec7113d4cf39085716f4e4decfcdffeabee5a555c44e753d72d56f7d62807e2ab71d8de43 SHA512 16d362b213424ea92846d2088cc05aacbe27e3fbdc825968b68add8e956e3edc25dbca67daad0aa6d6d63807648f766ed5ca488803eec71b8690b9c4432d4cbc
+DIST firefox-128.2.0esr-pl.xpi 639651 BLAKE2B da262755746f8011e90c583772ba3e871a741cfc0fc56e8bad8d3d3707813141d6c33dc6b3bec27d1543afe281cbaa2f1c21f1256514062623fe662e20e16bd3 SHA512 54069bb979c4b046bd5a3a1be37bb76a7c3646b242733f6644440f8c6c1691974304d2f724a3eee47f3edf37c6e7fc7daf9b0738d01dd55723e3651b0185d33e
+DIST firefox-128.2.0esr-pt-BR.xpi 628970 BLAKE2B 676cd8b4a844ba42523f0ac50007d361796f36bdb81d0516145750ed8bda24928d58e04657164793547696e98101f9ee56c6b714d49ae1df26be49daa4b4d3a6 SHA512 530a16c982e1c24b2ad60898f8b2a09a4065a7b4fa18f481f4965bcec2824e3cb19c65b7a0ed2da215fe5cb9f6fd700be27b03bb6b3016077f7f4da6c7d408b9
+DIST firefox-128.2.0esr-pt-PT.xpi 629945 BLAKE2B 4724719ce5cf59950112d559679f97d97c9150ac71beb826066af4da1cf82c9980942bb39cf1937602590109ce8db8d9b0bb3a8b401e237a0af15cc7d0499088 SHA512 b2ff671157019dc66a44ee52b7bf5daad6412b0295e6836c63e4b75dd32226275e71905c22e141fbb51f30913489d92ab212fb735c9c160abd736b07c7e90e70
+DIST firefox-128.2.0esr-rm.xpi 619532 BLAKE2B c8838ad295b07b859f52a977539c7a23bfb6fdd58d331dafc28a1cc8cc00f8ddebb0003d89515c5d6887c40360db393e3e36c836a87373466781907af9070fd5 SHA512 807ce9c606de457f5323ad48c37f4eac14a3f17ab103982449fbc3fb00f1680cb2fbbd6aa08a2ad9086771c17e8912cf58e87726c03d58ba841c59b09527c362
+DIST firefox-128.2.0esr-ro.xpi 550737 BLAKE2B ed6e51156ca30dafe4fff0e487095fd2f61328efa05ca5be566238617789db0c9e48b44664ab774ca7dab57d632468cc664fff21e23af60559108dfbd2aa9e34 SHA512 d11ac70543c25e05d75b8bbb060dc61d76b7b3db580c371c92bcfcf600ffa4d2314e61456989961f490c3a351b3e9bb0e8de97b85eb2b5c7d0acc91cf0f7472a
+DIST firefox-128.2.0esr-ru.xpi 728469 BLAKE2B e1a4ee5a5a3713775e02337ac2703614b212e08d2c18a1ef1f6657ca185f7eb54bb8072c8bb6863d4a60a23379fe48b400b51777521897f1cf8da24e326f6aab SHA512 a0fd618808ea2618b7a9aa91a542b67a756142e7db998f72494470da6b7317fce117b997cfd88fe1754c0d98e30dbcd787f0d247e7b0c9c93d774b3c47711586
+DIST firefox-128.2.0esr-sc.xpi 588769 BLAKE2B af42a9beada81fb14968246c381f1e7265382087c33b890ed9e3e156592c281d5d531424864f8b6e954335050978bc6e8d05610397e8899ed5ba30d50f96537f SHA512 df1236340a148a9e68d3de33dbab3c744d85a236402edb4f5d6173e7efccd18e15ea6506cfe660d5bb971676124057151f27ac6c68301f368446a491af7bed9b
+DIST firefox-128.2.0esr-sco.xpi 512222 BLAKE2B 12479059be1a8a6e68495b741d9e47cfaa81fc681812d49c886add98a8509b7c82795627188c419f58d146fe528c56849ebdc560b108776d8df38e5507cf249b SHA512 915cdc9e164d67afb4802a8f462e07a1b54bfa6d8c1ef8a176fa3dba6f5298cb56aa97ef1cd35bb3c7c96c4b3cfd8fbacdba6da72e329ccbbdcc464894c9862c
+DIST firefox-128.2.0esr-si.xpi 614271 BLAKE2B 6683d541e613a6a1bb38c3851a506a7d1b488ff6e322a2f13d225726325acaad01a695dad930a45b28f7c8dd7491fc79bbfe229e28cd8907312381747e60ea8f SHA512 2ab355b69cdecf7477345c6ca66007ccc5d0ed8cd3b1ec4c50e781a9e373a27d92772c5cbdb61254efef0598922f42ea52ae4197143ee3a284daf39b791d2bbd
+DIST firefox-128.2.0esr-sk.xpi 659877 BLAKE2B 6e645f0ced95c99ee23bab4330d3c2b0aeea689b16b8c74afddf2efc2544f24e313be7312ba959fb8e830ea17645b95dfce69fbaac8dc7b269733443bf622613 SHA512 357bdb4751c53f5e35de22f11fd36c50775e1d59736000568148f27dcbe1ec33c48f640b726c9b02a79d2f5268736034be9f89c20a5067c55a531249e63927b3
+DIST firefox-128.2.0esr-skr.xpi 712006 BLAKE2B 38178aef30a77647f3821a2e84b59c0b9ee5a47e7c904fc84b2545fd748f5e51bbc67925bac9b1c72798ec5c58eb39693214b4d76d1a85f6acec65503b5084d6 SHA512 c0bd866771b7d6e8959b641b3279706ecbe10b542fe26c5d864bbece17eb0f528e282d0ae89c2e076955e2afa13f92985d2a4782ac33abe789778d3f8c8e1e75
+DIST firefox-128.2.0esr-sl.xpi 620258 BLAKE2B 8c6e6ab087c3e48f4e0ea90c811c3e75f2c6e10f3dc45b57308d26360b82ce885e98be7d4da12e686a60cbf09fdce9e7b78dc0d4834d9f197a87a398f474dfaa SHA512 857fdbce80f9efaa419e87203f4346d470453a5f68cca18e0437bdbc0e7458f14e1e95cb2b5e0f5320232a1fac0b3a903a6d584790abbca9787605a83f131863
+DIST firefox-128.2.0esr-son.xpi 417219 BLAKE2B e499f08a154ecff0963adadf6e8e3cb07c8fb3e76fdcf7594b843cb8192165d9bca8607925d13eb1fbc92633baaa6d7892d9717210206262ebb63d1d1d5af0c9 SHA512 ab5f1dbdfdf61b4b49a9523ad417523acc6ef045c104f4af9ab3affa322a0cccda9dee469dc75cd648c796e51e697c2c11cc2300b310a283992bc2221be23d07
+DIST firefox-128.2.0esr-sq.xpi 638610 BLAKE2B 7dd2fee860126ad961ab83649c6993c7433be1b7d2a90c99537908aa168bbe0b0483ed21e4d9d6accf182ae39372358da987f8804acf6cbdf60cce82456f9976 SHA512 e60570a45ca423262c40a34a0d7ed2e3a8494ba7ca87d7e7db7749323372af165d86e518c95972c1e632678fd21e656bd0ce9565a50d70e4c2cf221d262ebd1d
+DIST firefox-128.2.0esr-sr.xpi 640303 BLAKE2B c7e1b321433e77e75e2ab20df6a8d93fb40ad441e3b023cb34eb16d3e4bbb68a1770ab32626b75d5a8734c9297fa09dee4b02ed49f5ae72f79ffeb49547f3c5b SHA512 10b9e0960503b51d25ca4482bc30b286987c4cad608686d2575042057e881641ebe3961ef4b67057728ac25e1a8e8e3676c7997e47bd9e539c924786c2680d5e
+DIST firefox-128.2.0esr-sv-SE.xpi 625704 BLAKE2B d39240d2b595c4f1a07d79782c04f8d3a8959527554ce80deef87f0da6a99775e17fc84d9d4020fe597f47c281b08a0622b780d6914959ffd2e5a3398d845a9b SHA512 0b2ba39bd696213a32866bae50b51522fedb8b1159914b0c67e92894abd16192f71937fa84ec9b21e520d099e09dce6c9b165d7725cd45f364d99a3296d6c199
+DIST firefox-128.2.0esr-szl.xpi 527336 BLAKE2B 54dfb34d1eeeea2be05326b88d576a309759ab6915fb8e4978d60542d5a7c54b37336d5a4cf14840a4c0ec14a5ac9d1aab799d4878a0b5e96aae7f6edcea3b01 SHA512 5613ee2d332cd235964d949a7111505374d8c3bb9262e5ce3a9f499db383700e86b33410ed1647adeaf1c63a14aba30fc5b3414a7dda6e4a9c06a2ca2e59bae6
+DIST firefox-128.2.0esr-ta.xpi 508338 BLAKE2B e6157c1b8804d9f4a3df96da1bf5875feea25e2c1f0a9a4ffb9001de9e315cafdc48d46c92737015ace07429b585c07b075c10fedf53c6cd053bc516e481d007 SHA512 3e33c7be34a9e731362588a9a6577ccef65b9e6b8da0f5cbf91cdd6246d1e69e7c894d850e46c03cebbab3b150c20def6ae7c8e67f7dd88dd20acaafa2768daf
+DIST firefox-128.2.0esr-te.xpi 561989 BLAKE2B e71094282dc51e0e22d6a30f752efd977891cde9bd20bddb6ee806ca819486d18f73972414e431f1431a3a3fc6a3ba24048b73f06e1e803c783a4c7cadae403f SHA512 7871051b85ef4603f0b70c3eeed0554d14dcaf58bb68a9532a160fcc5edb6f4ee72f551b9dd3cb6edc430e140a3aff0eeef212dfd33a6d04dc59fa49e2e5790e
+DIST firefox-128.2.0esr-th.xpi 699560 BLAKE2B 262f81f2a972f23de74987c6c4f7f1abb3bb0a58ad2ac9d58bd8f4faf7cf21a80d984ca6f55bfa6e28537aa1ff0852b30680ca7675debada05885ded6ec8fcdb SHA512 55d43defdc19081862de57d85a58ac0c600ff3d4ca2a8e2b65a1ff62edc2ce888f275aab962860749cb80ff7f3e3afd177779fa3c7eb82187925e7b6e712b8e5
+DIST firefox-128.2.0esr-tl.xpi 535125 BLAKE2B 402f624b100eb0a9217ca568fb39cf8e4925fbbc6fe5c73ca187010bfc33371646c9eab140a32e7c5b77a3765dab6c285e400d57059e0deefd5a721c616c156b SHA512 e0b27a950526c12aee235a597353ba4359bdaecf65d1eac070465535edf55cc507a0e20aa2fdd12d41182d22f9547da239fcc6ab72228dc07ccc09dc8d7cd947
+DIST firefox-128.2.0esr-tr.xpi 639354 BLAKE2B ce3895f42612848dd8502d7bc26e6cda7ed6af5acf56154bc81622a0fb43e261064a609c5d3d369d25f7b4286fc9dfbfab5899ea28beb56594a37fe73179f21b SHA512 abd8b5b45d381dfac8465dec6d03ae7d329cdc77189ff501d80239962d8bb700f16bec0af102211d35f93c59464e94cdcdf1e2ac0d9c49e346ec00e26ad18063
+DIST firefox-128.2.0esr-trs.xpi 505308 BLAKE2B 43ebb6d081e01f2f19ea93326f12e55d09bf7051dc44c174b341b886784d36a491725daead5e686c765d5bf88bb4e1caa8f7ae46a5c5db828ad33aa5bd6e9e29 SHA512 27498d147e8a8210f356a7a4bec13b9ac56f8401680cb4b202d680e24a441840595ce6449d383854adb47ec86fc54291d5781229149715a4d9b7dc122d76ed9e
+DIST firefox-128.2.0esr-uk.xpi 708236 BLAKE2B 6eb7793590b30a7f8fb87646bf5d360b8b2db194a823cbdfc4ba5264076966c21660d175832cacf9546d0e25c9b1f6cacd96306a67ba62736e2bf918fc6119d0 SHA512 7f84aece3bc051a4bc8f1d110adbfa6140e84bcd073067f2bfcf28b131312bcac481d2399b9b530addad61e5d74e4b53d71006019fcafa2fa168396b5228e93c
+DIST firefox-128.2.0esr-ur.xpi 561298 BLAKE2B a7e5e158f05b2d054a31bbe04a2612d30b0819c6df168730e4d9a583612c83f23954d0606a09085950187761d2731543da18d83f9ac6e72ff7ad1ecc07898fdb SHA512 fe1db13e4cd8fa3c0b8133aa2fbdb3e7d9fd7cbf1263f8bd11cc107f813e9c1f2a8fffa6fcb90ae54222c56aeee71d54498e4e589408d2c6c05a95f215af7087
+DIST firefox-128.2.0esr-uz.xpi 479731 BLAKE2B 3ff018d97d47b43dd94922ecac370fb3b35fa0ee65a7c03e80454b1c9aeb696278f180cca64c0afdb46919b143766ea76407b68e27ff9107ff9e724c85f52f7f SHA512 d1c7d7dffbad956f23caa746959ea08161513470bd89cbb51e443530a6af3180c5eda8cc8b3cf92c5ea019bafec244d47977e1f68bd314e2e874189464179e56
+DIST firefox-128.2.0esr-vi.xpi 662722 BLAKE2B 3d807f971885139a5ceda0e1e4892418ef5c11ea6b9f858033bb22f691ce954afd89d871bd9ece4cbbda02ebf9af94720478e8a906b369c1d2ab11b4e074ece7 SHA512 4c0a4ec3c212b5037177569fa73313f6cb6252a033c42a3be087acd4859da655f48b33af67543150a0d316ceba52996212704b5614da2d7f9a215af5b369f628
+DIST firefox-128.2.0esr-xh.xpi 418005 BLAKE2B 64fd099e72391d0b761d0b932d6a64fcfa08c422999867fb74f09e154c267d9fb773d4a30fbe9344bd67d76b6ffe478b3800e2bad226681b9611acb8bf9b0ebe SHA512 826a3cfacde3c34c1226d4827173989f4f53a0cd01988c155b7b31898c6e2d598a03fd20dda627e20f06dab429612d8aafa3e3313241ddda8dad9f948546986e
+DIST firefox-128.2.0esr-zh-CN.xpi 662335 BLAKE2B 703cd2d34bf9f71d3bf10029130e3fa0676eeab6477a5bb877d22dbe252f8026d25439303adf109d41ba2ba7fcd0a5096eb343387d29cee4a38a3dc657b71ed5 SHA512 0d1fec76fbb07eb737dc8a606defec8c28a016bbebbe87815cc922977c89ea950d3f0cd187215c6e319b1f028fab97e19ee8d00e0cd743f7d90775a99e457b65
+DIST firefox-128.2.0esr-zh-TW.xpi 666623 BLAKE2B de33858cff0cb04c6eb4decb4a801eca99223f9d4021ecc8ad1da526f5aab5f9acde107ce2844a7b235303639607d24b9c1804e1fcf25171d33fcad778b47ea9 SHA512 136074ee7581588ced7d8c2d596dcf92d9b2cbd0312fbead9f3fefaa9d28a294e2c048b1ec0e472b4224f3b17e1176ab1e99d677319c1f9c941665ca2e4219c2
+DIST firefox-128.2.0esr.source.tar.xz 560831528 BLAKE2B b22cf139e2bd5a18dd0a18d1f1a323f1cd4ef0773ac55165318f35e40f2f248ceb11938f40cbc82284f276fe7afc4e214193e48d48dd7498ea29b09b4ab17cc3 SHA512 9a689929f6f86d795ea2c0318bb78f77f72a552f40715a1108dbd6361b0dedc3aaf049f1883424012459899607067d5a8374d895564591ec6679a1ce80708d7d
 DIST firefox-128esr-patches-02.tar.xz 20052 BLAKE2B 1c5646e6111d400c4f85910380c407c0000efddd9f9dfc228b042bbbb38755d4a2003f5fe9717a13ec53693cd6fdb1cbf9822649e8726f165a9e3d101a8b213f SHA512 ab0e7ad443d0b5d0a44867c9a732681df3bf28b30a2e14dc7d2eb43859483f452723b614ff6e8f52666be3840d88104aa2c82616628210215e1765b60beb3ea2
-DIST firefox-129-patches-01.tar.xz 20056 BLAKE2B 732a1b7ab7d51bfd5b58a28533351d84c83e77801e44b16321312d6f72ae1ab61a21e10bb746c97b8e62813ee1242c6e06e7bc6605ca0cd70a9789bfba2da79d SHA512 c5b596f7b8b581b940561529157f0783bf75ed525b8486360865b41c61ff7d5728ff4da4c5087bbd2f2544428324b4bbc982453a8bb93be3e533684cf4f0d264
-DIST firefox-129.0-ach.xpi 466194 BLAKE2B a18d754a9b5dd64747edf34033d31a648d83080b3075b206642c4d51b7a1eec3bbf8827582d4b9d92231516b884c83996fe2168788fb34eddf7ac4238dba8c77 SHA512 c0701e51be0d88c6b8c9593270a2057d65113749f0a8125ed615b4f7377c7551969c094354956f8f760b2af4c69f920770efe8f42a7d0413c427a629a0837ed9
-DIST firefox-129.0-af.xpi 419668 BLAKE2B 4b2df5012e61401763be93e75a1ddfc05c335f4ea21784f97a89a589e45487fe4960d390953302b9786554233f1ff7447ba0bc3baaba8ffcc2d99015659c59aa SHA512 2fa47594c109db5eaf862a902b0fde512cd8b3c85f17b7655ee7967c0eb3a2ede658c708e840888f04135c0b7f3391f5ad1db041e2eb67b8387e441f0171e5b0
-DIST firefox-129.0-an.xpi 508149 BLAKE2B 8d6c6e29164caca9c8168a5c0bee6e0a55b265a2cc56c00d5597869da363f84ce140a1866522c8d1ab60ff716162a557ffba06e4c56adccb3443d41e98705d9b SHA512 47342df2c72b6fc46bffab217b33df8375cadfa92fde2fa3764499f4d9e7c5301a6124740c11963b0a7db0622b3ac6a65ce57ff101882feda45a40e65a9cae3d
-DIST firefox-129.0-ar.xpi 613067 BLAKE2B a42352125f74e63ccf6d75f56b4ab25d15304c7380c76b1c13a52079abd0a8d5645e776d2e9fd2eb446554e9bef74bea8bf63186b0fc46c0532652a8d178d219 SHA512 409f256a598b10d6459b26bbdc536b2642efbf7fc2345c85b785b4d601c3b158f447a0c71ea1ff7436641a589791bbdef26637d1abadb3e7b4c8c0c97957da74
-DIST firefox-129.0-ast.xpi 498503 BLAKE2B 42b7a422feb9f3dac1a83b91d23b89e270196d75d0c1a0baba8dedbfb92062193b0e4fffca093fa246b6df8637b7aacac18d0c4ff5cfb79b65bd3c330f50e621 SHA512 2f28afcccb108bf4152e3c6913028afb5f610f9b792932d4d474110c66ff2e28210997d2661a819efc2daccd6fd375f615842c2e2ebc896f0dfc4be593d73be0
-DIST firefox-129.0-az.xpi 492951 BLAKE2B 640a12901c57ca4ab2255caf3e72023ba97c21f1b2d89e744021e0e043f4313ee678b2c7d9a44f2ed3be6db03694133f14ebd21f5185d61c31403b7b845a7751 SHA512 55525f57fc8e9c5757c172c366082b471a34810b7e2830c9b0f1a3a0741b3a7f61fa0e4a54ae0865b29f9702e3c6bf832849f1e535c3268ba8046a2f3e26ecfb
-DIST firefox-129.0-be.xpi 718016 BLAKE2B 26a70b24ece49fa4d1f4e45faa03698a02b85b2f498fd8e5a8c0586b73ea6d4925f40626cae8c3302f4da9b57cf3d864f33c769170215d83d3f1c5ce77330eba SHA512 8d36f340fc16e478ff0ce234e280a1938dd3de5e54bf5ba3fe5744d5b210134653a02bf9d77817d2ea9bca3ed2b5ebd191557e35c84d985f0239e8b24663403a
-DIST firefox-129.0-bg.xpi 624126 BLAKE2B 77b584b6e22feea0192b0bb4337fadb2d172671841b8d0f772124293ab6e12830c5ec4f064503f99acb09539eea250202e1463ca3031d117f36fd0493d06c417 SHA512 9bef03fc12abedbf9175e6baaa66e246cbda2ba1c0f8a940941605efeff5455207387c35da0cf15deb96cf22e87c229518ab1d05f337e87e826c5ee5987826a9
-DIST firefox-129.0-bn.xpi 583740 BLAKE2B e9083c3b03504df24b2be96084552bae86886a8f49fc519f32355fe5b11bd94a58c97baf7d4a151f69e153ca3ea2db8832048aeb92e44bfa74692857bd25e9cc SHA512 51aed226eb9a181db979e5112c4815fed23dbc6b5a97c54eafed64d5db12ecfc6558dfb2033397bc283f6e611f0e44de008bf0a096f6576a96c47373bb3cd8b0
-DIST firefox-129.0-br.xpi 591238 BLAKE2B 80e4b7b483369882553c0f2ef37bca33b6c7ed9715b97ab3a495e83e2f42fe8f65d45a81ad3b5cfd8c1959264f8d7d0fd5bcc55ada4d4dfc58e3a270d9b1b751 SHA512 2de4c1bbc19b062b5d347bdef5606489176dcc50cacd4e7d9f5cc9dfea32538e7d8b09d6d09c00c018232b69bdb2764dca05012894a354e929f1e0b7b1c62920
-DIST firefox-129.0-bs.xpi 504177 BLAKE2B 306544dabd2c4ba7de1904547857670302fee47b6307a52f0e84700ebc812ec57ea7b6e18408bad0672695e45fbc74579ae64f093e0aa1a313f8b1ba15e9cc40 SHA512 28fa31806bf4208a42b94b9c0056cbe98e6810934faf9e8853a33f025b6935d2eeb4e52383cf84d4cb41cb98ad1815ddb15597365b7a326b49289b5ecf72876f
-DIST firefox-129.0-ca-valencia.xpi 548454 BLAKE2B d037e4b4a0d46f9726acac556563e14a4ba504050b96c1369370bb2cb77d81a139505a18f9f89d73bda92ff354b6ca5e563d562f2e01a1affc4907b5e1f0e7a1 SHA512 fd5023ccddd3a28737e65214ca3bcf94f1a6bcb80d71a0ac500fb77617f0be54a3507bb9c63bed95a75ef1842824a0544f906508e6a1a8ddd1ae2bebd4579c73
-DIST firefox-129.0-ca.xpi 599338 BLAKE2B ce4388358dd432d936dfeb2e00169384c8d2bf775775a2250f04f50d567ca51c3069f7d1705c31cb91f4df409f0680adbd05572ed637630302496405427b6470 SHA512 ade86b758f387c50a29bc0e1aa81f5a4321911954d6bc5ea4f3dcb4c8a27c1764155cfe071caa3c6adb5774905bc9f043a033e322c0af90e14967651248d1e74
-DIST firefox-129.0-cak.xpi 595424 BLAKE2B d6519e0f387bc98feac962d621d0442db58fa1334bd9017b467e4e140d467adab1ba2a1b27242857e2eac3890ff7e908b3dc944ee959a4c85ae4ee08d6c059dd SHA512 9a4bc0427ccfd26f103cef6cc28a1c9df156ca935e1349f73943e4479557a8d4bec30719d0aabb59022f4d79065019c351e80db3e7010dbaace04c36c07a2a1e
-DIST firefox-129.0-cs.xpi 662053 BLAKE2B 61bf849a016ab060c26cbc4436c4ce06a6f6416b1375570f070aadbebb5dd6e6febbe5af7227c8c916936e82789282ef321350a160b42f24ec5d91ed04270dab SHA512 4591631a0876f30c93589f069e2ad096092581958ca1159ef865abc205bceb2715767bca2a11f796134bbcddf3215e26de20beeed88d3972391fce222155ce15
-DIST firefox-129.0-cy.xpi 626688 BLAKE2B d0dca71d0c53c71ef0c1539c886aeb60550cfc57936f7ff3986929c7e55a3571cf3c7733105a1317de185c522e9e0e5c70da776aa7cb96b9d7d8a3fd30e32de6 SHA512 80f8b154de2767e7436ecc5eff6d3c1000a535ae743e1aec6c302e3b7aeb616780f5b2bf76594301b9d85370e3f9ba86f53d80b9971161c48a46e74d197cacee
-DIST firefox-129.0-da.xpi 615340 BLAKE2B 71c363dee621a01bfca33afb8c0231cb8ddb2ca452ca19eaa21b2d8cfedad8ef63249875125addcf4a6bef803d802b87dc0d95b1b79e5477d39a0bd4641df306 SHA512 b32fa572af1ddaa38b0fe8a88636600acbf5c4a83c387c6e57201a6c3d134512d5b7069ce55591b7ee26deb8f39bef055a3ddeb3655de0270db38460d1cca84a
-DIST firefox-129.0-de.xpi 636702 BLAKE2B 5ec54ab16c77ac66831a2e38a0066c5b6c81c0291febebf01fa8a953b633cc26ae1bf04d300cb644f3eb6267f6c72646c58156bf121ac93cb3bf8f1880b3cc77 SHA512 e9ef6ed91d6cc8612e8a8d8722696abfb50a9f34a571fa281989f7e1829d030824c6f12821ebf4e333f99fbfc2c823c5b8f98c4ddef2e6f56a5d427cedee456b
-DIST firefox-129.0-dsb.xpi 653386 BLAKE2B 49005e81557b3be8b3346247394da69c2048336061a0a011ea557b4e0c9cd690d33c7c6c7dca69357acfb87deb7a69985522337e2bbbb424a956cb45936f10eb SHA512 cfe1ea3879156449eb7164141efa8a401d2d91c771ae73759ddb100c2264f643a0d771cf320b582d52e10ae71da191dee42255ecb62f7866e01087e2bc19eacb
-DIST firefox-129.0-el.xpi 735567 BLAKE2B 7617a3fd633517e1af7ac7d40e41975b5d2fc5ed68625c8dc601307277443ef5ddfb5f602512861dff6e8720985ac3ad498d99a84d832aa58ac8a63e252302ae SHA512 740560d04971aafb6b41a175dede5e7c39648b5d13ae5dc464bff096e8d0bc3d2e7348210c8c2cd11c2f7cf3aaaf05e8caae90e8800ad8d6233a6bbe85ace7d2
-DIST firefox-129.0-en-CA.xpi 587137 BLAKE2B b0f168fbd29af28669f9487ded068f3ecaab27b67e9daf48db6535ccf834d20424f20d13ceb65865d7c410eac611ddfab1764917305cbcda7bc4c4a058bf21f3 SHA512 4a00aaa139f26aecfd99d82f58d4c7fc46c6c0b798b749a02d9bce42b06955147291c64fa1d4b548a3be28e1ebecb1894cd790eae34897706073dec61a668d67
-DIST firefox-129.0-en-GB.xpi 587536 BLAKE2B 5cc6c7c17a375257cdb66992019eead50b0eaca5356d9f385dd241e0986a92cb2c5fb5cad8f59c1d4289ce48dde7bec3c9967220e8cbae8937f2ce937a2afac1 SHA512 84c12b0def4eb7b9d454c00f5a9d3ae7485010dd38940922b35ea8888dcf7dc6da9967cbaa350419c861808ebb8cdaa6bf1c27c8b4183c62593359b99899c6c0
-DIST firefox-129.0-eo.xpi 616016 BLAKE2B ba1b1c62a888e75fa05386936170521d8e4f38b04bea1015be76e40ea1a0a542b9a90157279801cf574743fee6881c80e30684e8630ed204e25d70d6b1cb7f09 SHA512 008ef41f9aeb623215679eb4e0c8ac1f633cc2daecba61382e5f0a8847bfa5b1913f53e9220e2d3e2de04110a2a90ba98f3d2c569e3c98ed486d1eb3eb5c9aaf
-DIST firefox-129.0-es-AR.xpi 630371 BLAKE2B 66e7e924e7e76728bee954d1e4959092583cb5822be02023de5d7ac5e6f346b8b0a9bc91b0197abee9c41c74a6c086c4ab3adcb5a878c6bbb1b364f5f4438484 SHA512 0f4b23dc755b5482d457a5dc0ddd1c88c9c93d875bb6239d15df1c0c6a74b9e2f68576a9d167a589fbcd454ac2220a48ceaed23b7f56eefe080f789b56530446
-DIST firefox-129.0-es-CL.xpi 629634 BLAKE2B e69b110cc6e4e347b5116574a35c17651c85930a38bf79ca9f9636d5aa7764f349dfb81510a115a474e485efdec2e1e95889b1fbac70f44a59ffdf0851d2d2f8 SHA512 97421035b46d71962f3c3a36b09271a5357e3ca178395d6b2b0778ea89ac17fcf7951d2e719a567c8a37544eca05c4df156be561e03825395776aacb801f9593
-DIST firefox-129.0-es-ES.xpi 622866 BLAKE2B dcd167d53daa7489882e66d734e4bff7281546d03585a46535948fd81acfd5b81cdc9f185fa4d1540f7fec77acf601fd3dd64fbadce11cd71c44574b761d3344 SHA512 be211896776b7463d52c5e6dfa1948794b031766ef3daeedbb01197ca521100ecc58719398015348f5e7b0877855fe52b3a5af9e4588cea47c228ec765786d7e
-DIST firefox-129.0-es-MX.xpi 611607 BLAKE2B 701c52a390789ab60e7bcfaf95cec88ffe63a8de06fda0bfe64b603334c325d940fe9db229d9dfad0b603129db0bd92dd5e6671ec4c1ea3a6c0fc71a79a63caf SHA512 03c08230a89bd442182ae7461826574bdec91be77afef75461f8914134a5ac549c53c4f9ba023c2e85e2d3ae9ff119981032684f6f5a313ef691ff6186a2fced
-DIST firefox-129.0-et.xpi 541834 BLAKE2B 92ae97aaf37590a6dbffbb8d28d106b225e621952d36913548f99a0879e837c35218fa73856f01e4085571b9266668b718e4414b3b0fa6fcf0a08049fd8627df SHA512 a53834c7935d8c8f7fe8ac9f3fde04d5c2152972a85e52359cb0c709e323cebf1c4a45f0ff146dbfb0cc3f5694d28dfb4f841d22fd4db632b937d27f5ddd95f4
-DIST firefox-129.0-eu.xpi 601669 BLAKE2B d9a2c6a5d6c4df832abd82e8b6e3f53a197ee3a68a9256df3c82c32e5845e7e08ad182f7434245d6a586647d9ea859ce9a9a0f00c2bb3519a8e8f991e73ccd7a SHA512 928cdbc3bc057564dee4c73d10d36e46dd04f3a2ef11067d5fd41b6ceb64c6917663dddaaee9dd779cfbc16a0a25bbac96614b844a8e179559cf4aef99e9a68b
-DIST firefox-129.0-fa.xpi 592238 BLAKE2B 0eccf35584e5fc6d488c438577f03f4136db74da081ef8e42b7a3f9549dd9a6920049c22aa0a8c7ff9df4fc81646ff728ea2b012795798fcd2d7c94b74c16905 SHA512 628a71e7fe7dfea26600f7a8cc92d7348a2a6ca818d918a3a580211153bb7f6fd37340538570824bf159d61da2d0a2734f7ea45fb203a7c736b259e2cb65cd5c
-DIST firefox-129.0-ff.xpi 478241 BLAKE2B 5da946d71eacb54db0a3e62f34c4012b8cd9a3cbddc4fba599cd0d986d6b89b989b906f9973cc00cd7c57adb0566a08783bb5d195944f5596e0ac4155066c700 SHA512 1bcb35e33bd5b324ad8987b1fed533bf7d4d0b72fe572c08bf7b0b9e5a4e4ecc109d66b696b39ec226d4d87453f4d7afcaca9e13f6b3b94a32b8c8969eb4ccfa
-DIST firefox-129.0-fi.xpi 610119 BLAKE2B 270a28ee23a2e394ddf9f328e14dbfeca53a9218ee138415ad04c5852bbc26f29274c6dead935e38a1613b67c8f4baee05b62d254b988f173e15c66c364a9bc3 SHA512 8e2d7eca4efb7f24c1992623b55a3f11c83a839cb704b914f72eeb361cba2e063cbac7e0ca42d5f1b6d861bdf3166964c2acc57dd69cdeb312d432a80c598b32
-DIST firefox-129.0-fr.xpi 643414 BLAKE2B 7f18a75fd1106861e2b6f83bc673924f07c6ba4b1240d180e5e2c0908113f6b0c228ffc3ae05ff1e99149f15f823e4709a47232c0296ddfda5423d532000dd76 SHA512 8c5693f30eabffdf7ae260e04b7009584dd554ec934938e16dda7791a109ffafa5fb285b33a86fd86aac155360963591429307f0f88198595ede7ee817619878
-DIST firefox-129.0-fur.xpi 635768 BLAKE2B c3dfa9be7005b8c657157024bd054e1baccb0d17d91811bebf293440fc5e9c6e80df5212eca8120fae67017065c5daeda7f1bf0230d251eb1bf272ca63424ab8 SHA512 46296939bd8eba66b43ed08b5e2e25426d5c863667ae8006716e6f25c72fa331e8cdd39288614319941b179dc3bfabd69413a2ddbb64032712a2397a0b12aa4f
-DIST firefox-129.0-fy-NL.xpi 626041 BLAKE2B c1c8585b77a7d2171cc8c4597535d64e9307108462fda57fccddda886f71c9948f691dedfd4f439a67ed217f697f0fdc16c3dff0e619edcc753954192242a1b2 SHA512 66afc717ff0c1fe8545f06399556dc51595fcef6a3a61fbeee40b2d15eac5c1974edb637b08a34c66fbb9d885b5ae1220b3e6341c86db6b212b59532ecacbb78
-DIST firefox-129.0-ga-IE.xpi 473205 BLAKE2B dcbd01b540afcae7cef4c0d68902326917593ca1700adc72b2e3af0c02efbe894a55f9aa34eb09e13fa80304c5b9dd8c80e1f764c21a5719e098b37a34884983 SHA512 ce0489f6fc00e26cc2bf41f6932db684cc36aa0cf565ae086c4711afb565192389cb9987039234b77f22021265dc32370b4cdd39370778d2c2a73a7c10d5d4d2
-DIST firefox-129.0-gd.xpi 598883 BLAKE2B 15f3e4ecb34ca00791e78cf372359b5018687849d27472a6e67ca48423ac82a7542fe7f1da9cb2333035291a6732bd04dec90a46075aacb3cf1e28bf91469fab SHA512 3fe06078bd56e3e6bffcdcf16cdad849ecc8159b6ae628d15c1453828780fb459cdace20a511264a2001a7a2cbb5df8f797eb7ad884b6c9dc4e65321969d7d31
-DIST firefox-129.0-gl.xpi 606454 BLAKE2B 7d5f6715375a011af04030fd95640726c3c7761cabb21765f53c07794632e42a1c99d6cfef06b32c89d21c0959e5e91a15eda8bac9bfff1f2495729b7366c9a7 SHA512 9cf990f97b4c413c8472b1fa70da143a184f3019df9e0e9ee7d0f84dd64410a27716092405246a5bd5e92b10f2ea21667bcdf756c361c0868cfe7846b6eab898
-DIST firefox-129.0-gn.xpi 640316 BLAKE2B 9bd4977028ef4a7f5510e8741d05cb5dc2dc33f9b22d0aaa64b0a7d05a20e235a46a166476a5730d83e04aa1e9d32dfd02038611e2358ff4c93ee62d90c005fe SHA512 fe02133f643d9d4498b2a449daf07a6ec7d4a5dc97c28a1a822d7e41a2af133ed724945953bf9a39b38c85246450af02ee87681f1388f527b73adef0d00f88ee
-DIST firefox-129.0-gu-IN.xpi 529503 BLAKE2B 763aa4ea6f45b8b6317415207b5c4086be1836392b9dbfaa5245d76b893c73365d06108c9f18100213fb6a997bca253e089b8e43a2c707a4d31ffb7e6ebebfd6 SHA512 a62dbecd0edf9cc4ba1a561051664e5a366c46ba9a1f1ed0b29d6040ae5482f61ccb7028628ebd6d60b0e59e7a8856a94b99c73c9fb244cc3a11977753c82ed4
-DIST firefox-129.0-he.xpi 634013 BLAKE2B b53e2556bba40429bc36c0a7702b63a8d0e3b1694ead129b496ebbd4b0924dc8ca41ea27a401f4437ae1886f25e3b5b6cf231b21a372df43f0443cf18f800b4a SHA512 f9060858d1a8523094ca1c20c17a6c443c84c8ff68e19ba9683e8e411be5e975d6726867923958d681bd86dc8106c23e4d1f46b2ff87526da784d98216b2614b
-DIST firefox-129.0-hi-IN.xpi 568983 BLAKE2B 124fd2178ee2bda140234b3e87574fa520501150ede1506f2dbdc04cfe491e6454375bb15048be5c8d54fc72788f7721bd9cdda47c609478aa861b7ab2f6f246 SHA512 e005ee4b76154dd5d300eb07bb137ae69fa9cac1024ffd5d983a7e66c602666644b9fbedcb3ff1405375bbc189c2242be19d7f2d085eb398cc6d5412407a67b5
-DIST firefox-129.0-hr.xpi 610569 BLAKE2B 6c13ddfb6a38882eaf9fc024fe1582819bbfe675dc861b5ca8ccf6723aa4c71d5fa048e9d6f42f9cfd9ef9956828ec04cff264afb92f18a8ddc0d8395d4bc8d3 SHA512 683eede1aa4f1f0103d665372f55112b921d84d6f8e5a62a42f4ccfd4d3663331f314f4932602ecd583d5b9d5b0db4d61feda9e128081d9ed54229e8c3fe05ed
-DIST firefox-129.0-hsb.xpi 649228 BLAKE2B 5673b04b5284fbb9b9dec8d16ad4f1f7ddb2e2b64495f5e8592e78d526cdaa9522d74d2c571c40513aa2353ec7038a898d6420921730b343f655d75d8ae0e375 SHA512 f5b9f88ffbe5e0b41e4db87f45ee4d07bf062a1a307eb3e01fbb0439518be60fad7bb314c249e7ceeca84711aaae91aa96de73d26596b5e381ed6e620500bc7f
-DIST firefox-129.0-hu.xpi 651252 BLAKE2B d7a7f62bdefa69d3bd8e455dcb563b6663166599452949b15be51122a79f3c0697d0e9e3043a44c3941653a0943e0be9dcf84305fdacc29a15ec4253f0ec7c93 SHA512 1ea176f50c69a36cd2a8af0ac2649696686ef01902ae9712ce9a66d2928bfab5640354e7ef6390720cac85df34ac2824ab8252f0ac3851e98aff9f75bb1e2be7
-DIST firefox-129.0-hy-AM.xpi 653904 BLAKE2B fbed0d8e700177aefded1723b4ddf8061e1d4a161491f534750a2fec074335224a27c07c8f14348c8b9c9deae63e867cf24d731c3b41847d6a88d95a92f74ae2 SHA512 ea98919e5c79477610b62d29b8d02d46a265c45de22a716e08788e4b8c61b87b4f77ad7e5e9af61755efe750c49449af0f69d497fc94b627461bcfd00346cbfe
-DIST firefox-129.0-ia.xpi 613528 BLAKE2B 024bf2ed5167902b0d8eddc1d976ffd245ad58be71cf6627f066a4f16d35f7d773aad2a27d400f058f45e7b39b35b5fb48f1ceef6b822d2b7e892bee58431205 SHA512 4edf046ab98e6dccd29982dea189211de8a72b765a42621ef9cbcc1dc599476b0f018fc77d5ae225186443d982d2c0099223a9e2a02ceb81d8f3ef33503ea4c8
-DIST firefox-129.0-id.xpi 585312 BLAKE2B 7e155c0ec0882ce920ed8dc0b1c6206409534301844b0fed74465b7794a24d8ce4a43f23fbca5bf2d34806cab99e0351495026b8ceeb7f8a685818e51bec706f SHA512 4fa9d4d8577bb23dd4f7393555345f33ff19f46f586ffc428c4a1d398b6ccdd1ea2fef14c394ee5b8362817dbe3b603efc3d523c36136ba76bb3e0e8010cf58d
-DIST firefox-129.0-is.xpi 619033 BLAKE2B b3e752dad3d15633f21816e30a31a595434c6c8e21f3898e8c1a83cdc6839f9b179a4fa855cbe272b6409ec2c26c7945e7166c332d9f534c25560d7949a7e702 SHA512 a985ef2b1e2353fdde947dd730fb54f68728fd8c3274af6a0e131a43f761e5936238259783fceac938c31c89d53f8ff3200543a187b108f9c33d7db691f698db
-DIST firefox-129.0-it.xpi 569523 BLAKE2B 571ea27b2c529a353d564e04b15dbf325219d1a8aacb97715bf5dd5f828b989bc4bac3ec7c5f5b3b180bea64bf5040b87cac873971943a33e74a03661870e1f7 SHA512 2e4801abdcfa056c6b817838501bb6727841219a4036aae47a82f0586539a58aed370affc6c7390fa014a3f08d1056e561b31ab220ab253d071d36369fa6180d
-DIST firefox-129.0-ja.xpi 679726 BLAKE2B 565ce7ee85502440bfd866b85ffc13559728600427219769646172e88163542e120eeb06fcc7705b8614242c0d40c82ff5e09c157a7c783dafcf2b91e7eb7aed SHA512 48792f6fb3201d256cd40aa735c52a3bb24a11eadf45c56a46788b2eb10722358ad01ff6b25f59024b836473179da8dd34c6e953fb179db6b62c701a393b5d83
-DIST firefox-129.0-ka.xpi 663182 BLAKE2B a5d08c307b753d95bb01b762339440520ef174d1bf52f56d6b1e331f6ce4b1fede041bf95514928e45d48ea752bb848b2216dc02c21c220d64be019487abfdc2 SHA512 5aa5d2127df92f77c31d77982b6aa1253f2ecc7187ca7df7ecf694741fff663aebb261ccbf770a81e17f08203e3e8478145d1421535a887d3c092857f1a333eb
-DIST firefox-129.0-kab.xpi 612864 BLAKE2B cde2b3b236dcedba50efd7bf7e160d11f94a68b95f420a5602598b450f37e8d3f250eab67ee4c065d23f86c0e76dc9b77161f5a3e6a8e3a691905053335e0646 SHA512 37e9aa40de46a51cf9c6bb7951e7284cc7822929cec715297f20fa89c5706ee768d8cb402d41a91e1ecf8354a2d6b946b10d3992001457d04b313d30cf880c60
-DIST firefox-129.0-kk.xpi 710250 BLAKE2B 6ffe6b99fd74a0662744cc16afa667972cb3a69ca34e2851e84fbbc3d3b1c39de587ba15630cd8fbc52d8bb97ca3741a52bc7b28fba0ec9d203a86eb3669f498 SHA512 52d8d00c5ebb08f7e7d0b757c779ef0e47b1284b05f49a1327a60a7a9ba0589993e3fa5bd535db64bad893cff0594c52e3de43c7befc418e015b20e4d6488c29
-DIST firefox-129.0-km.xpi 528075 BLAKE2B e0879d679664ba3166b8f8f29bc72c5c9c973927337d541d6e14e8bc5e07a18fbc927f6d458cdd7d3e30bc0fd506657883f2bfde3f6451d0226ec4b9b57aa2db SHA512 607116e08f6c7b8af9571e4c5e7b1534b0f84e219442dca2f269b660bae62587a5dd2bec79581263e79b333ed90e0e69bedbe6c5fbf3151b0e20a90457f08642
-DIST firefox-129.0-kn.xpi 493376 BLAKE2B 87c405c921d6e896bfff4f685574e1dff38616e4a552794d8fecb8429f1d64b0ae8bef6f1b3097c7fd0cd61dd3cf74aa9048cdf3afe49912e315c9223df38231 SHA512 e4c6140850c5da9f6d5efe71151288c5563c1ddee3be6eddd2e5380bd7574fbbe110a2dcc222d4ca895de15816b26e8957fb05e4c310857e50a7b8e868f9689b
-DIST firefox-129.0-ko.xpi 663937 BLAKE2B 86b1a8267535b7343ca1fc14bb1f6d5ed9832c3bd61804e984d14fc5d204240a0300b2c429ebf397cf03bc87cf240a67e6f4f32938ff51c26292b76729243c50 SHA512 c94d248a64264c43db4172bd0fab6a06569f4ef906a2307cedb2062e97b6093a91c86de0d03ec458182ab8b9b9d1cc260a06d1e179e1571d9f43368fe587a76e
-DIST firefox-129.0-lij.xpi 486304 BLAKE2B d7aa679b331482e6ff4d21f11f04365f8fa4437aefc3d5ef38b3317d568b83e0297c8db0adae57426d479f58b887ad6f80c3f6084da9593efb84a620172ee7da SHA512 7c3f470763536149825389a1f5efd35640adc388273307e311e06f375e90e8ea4caf5c1683280e8487913ed273a0c8c3fd71037884160f9bc7d923b683e75236
-DIST firefox-129.0-lt.xpi 575024 BLAKE2B c88a4a262cfa31bd2d81f797a0aaa4a79ac25b5ffe8ea2c3a8c02006d43a20e7aaf2667a6e2ec5391a13b4e73f019758776340db1449807c8d33c2a8ec19fe80 SHA512 43f063851250cb048e0c0c6faa45583760a5d1af8a589c1845f6583c24ba011e359b23d9827f5c3bf3eb553fc385cb355b65206e5e5581094a3fce131df8cd28
-DIST firefox-129.0-lv.xpi 576570 BLAKE2B d631d2e61309d6db67d659016cfb0057d1a5f6620ed7b5b3a402244d3ea8f0a66eb8ddf9e8349e7117bd42e9c6e095265991d5e6ef498c56c197dc118d25bd81 SHA512 9d03c8416992a4bd711cf5e3fb86c820bb8841ec82ebc7d528a91e59e3567b9d06dd14b584c22eeb5ab0757c4b1058b4e6e3f0d55b366ae1f3d4a225693fc2ff
-DIST firefox-129.0-mk.xpi 496019 BLAKE2B 0eb51812ff068eb754f6ec2538f9538f5e50b307bac2856f3a0d015d5e49d1976c5e9cdf3255e3dd50a8a32e65a21620921140c0752c262ca04e4bf6dd184e39 SHA512 9988556fb5d07e5d0ff8f39afcbb0887f6e682046529098c1fdf7d180aa52e82b844ec0529cfd8a5dc23fb795516d4ced66bbed1c22dbf1acb575bcd44e371ea
-DIST firefox-129.0-mr.xpi 534267 BLAKE2B 019436e5226b9cbc03703030b2cadf03bb80478c3843da2fe40bcdc039037369d4091cf7a04e3ea5d4f89bdc39d448f6cc862275eacc6735f7456da30a089e35 SHA512 d3c55afb56d73425b4893e29c87880b58c75d4109231fe3c6d342debe9f4c94780d37ac64f3fdfbac74c98fba8293436d920ac9163c8a3a3fd923069670c0569
-DIST firefox-129.0-ms.xpi 451900 BLAKE2B 8c6ac532d2ee8b4d629b2cbca96fdbd8aa0a510fb629821074964986ba90a8914ba8683c846adba12f6d04074af9d7f6445ef8e567c0662197dd2013d0ad3df9 SHA512 8b553e38b656f3211270a1c8c066535301ddca3957fe07f06565e30905d7f5c7b3e8066eb643a951fe0e7c92c8eb44cb16c4732c9ac938699a935b4cc8d28010
-DIST firefox-129.0-my.xpi 520807 BLAKE2B 506839e97769d48c88cbece5a7643d6155ab16d3dad3307887075c4cad6974ee9f904b383ab9aafa1957a208dda6788940fe1589ec0bc110461565e1f1df027f SHA512 c1ca31b4e2cde6c3af9a3e15f7cceecde26377420bc546339c727b8c248bf5dd7a2f4bdc10bc7358f9eb4ffedc988530e2547e7fb19459c97c49e05197abaf5f
-DIST firefox-129.0-nb-NO.xpi 610260 BLAKE2B 8c8e5c4f0e8cfb4a21016e16a09d31c0036604242c1b1029d263d1ded7dc9c14059550cc89a144ed7a5756bb0f42e349000c3a3a5a3c998d911490c2e89fe0b1 SHA512 63e29f8b7f11f58ed3d672f67bc1c24142eb446c4209d268a8220cb494ac60bc77f310b0d8d0108315a97d51c904bc388c58ddb17a3139433ee2dc4e0cc5053e
-DIST firefox-129.0-ne-NP.xpi 516325 BLAKE2B 63713af7a1dd613b118c605a62e4110b40de532be26fb37156ef9ee77963b3912f45a5de2a9008d5fd9aee477fa74cdd07102d221ebd53735d3c0073d29ffc7d SHA512 42bc77c999aaa72ff32a040c07b84c6545f2bf0cde16374f3945c4c4e041adba763c4f4e76a5ffa4dbf94aabfa656ecff2d705efa374aeedf95f2503b64fe3e4
-DIST firefox-129.0-nl.xpi 619717 BLAKE2B 301cfe9ce815235765027455288f67c5cb19867305022065b39d8a3731f0155a2309ff9f2c5308be7898a49dcae92386f20dc65a7c8ba309a161475f8cbc2d31 SHA512 ff74c8aac04636a91dd3d1ebf0d08de2daa5a23cc6af55e42e8bd25325eb410651339cc13f5cde5afaa72f38bd0934d4ef0708e5979d78f58f70b7acfd3242bc
-DIST firefox-129.0-nn-NO.xpi 613178 BLAKE2B c872384269d9752afe19d65559d2c42931100a42c948935ec4986a82dedca01c50f67c4f5ad7edbc59a08f2717acc2e380421d3c93f09d984d80efd8209205e2 SHA512 e264b671a18eb9d30035ee030e55c0ce320dc580f1107371cf30582c78267eb41d3f948312fafeb396ab754ba340a5642f74f35b70153c4036a691efbc04bf47
-DIST firefox-129.0-oc.xpi 615152 BLAKE2B 03e0fc6dcf654f766bfba980f493fc44f004e0c91efeaa6d45c53962b98f01dbfa6f4f145974f09f662a40192a167d55cd6c19d61f5598e975f4fe780447d8d4 SHA512 3e5163782086060b74567edb2674fe1c22b7026c6fc97dffc3c2f36ca6da76d4158c4af5c26add7a32e8b8111668ad9290d39a339938289574791bb4e645bae3
-DIST firefox-129.0-pa-IN.xpi 694805 BLAKE2B 931f958b9c9cc5644c6fa1e66964a776e3edf0561d6a8943dd217b962f11eae2bccbb6889eb16d02aa0f37fd14447f5cdcf947416f935d72639ac15981dbf450 SHA512 dcaa062cffb04d721b18c9cc8d085ad35767b588d0b0ff0f3f81a84f0a34f835145fa11b01f07c23f05de8ae084a09c1b58cb26e3a8bacb6675df0ef136d750f
-DIST firefox-129.0-pl.xpi 640506 BLAKE2B 2566a995dbd267513d0ec60ba84f050ed011b714edab943bcb6710c38dd34aef01f97370af215ac9f3f604decc51f14bab326b251b005950be8c6f9694893235 SHA512 13785610ade5106ebff8e7246d8cc4bdb71989b15d289aab0c7c2964e9c0cab72b64de7eeea5f557735d061612ead7f16c85b28b1ac5db6c813b19570e64405e
-DIST firefox-129.0-pt-BR.xpi 624480 BLAKE2B 406a116c7ddcc0b8bdeb1dbe50e6a40312571e2725ba9d4a9b9e8bd09cf1df586d23e4e2c0b9a79051f52dd96ede6f60d597f762d8d14c0d6097b9da00246f86 SHA512 95de0cad0439e3bb482a0344461682a0807ba78d974b880eb983499e07c3d80baba33a0bf461f989e9ac2e3e6a126dfc0a62b30057002e81d648ffa9f278ca78
-DIST firefox-129.0-pt-PT.xpi 630821 BLAKE2B 3b34ddebbb7a4b51b0456b2c8a458f66628c797d6cc8708aa952c7ddbdfe44b7db6057edb7aefa075c5c28964dad1e0323e71115d4dfda62cbe2f76f145c894f SHA512 c3377f461b92964992a02038dde044e214b3565829602126c492e6b7ee86682a942ed644a6e68fc4f2d6dbcd06df2cde88fa14f771a480b9b59c06961ab9a1c6
-DIST firefox-129.0-rm.xpi 620396 BLAKE2B e200cac2225b3abaa1a7485918ce8c3a943d51a60a712009c6f1c0e82efc4f4d11a9139f416868e079d3833d1bb8a517f5a0b72b6bb16a6111d6a357985d7af4 SHA512 9adb403c0f8a9263b20522cbeab3c5e334516b57c3ed864bfe5c104b6f146ed82d89d93d16cdc83838f4599d0d68f1f1204dd71b776788306ff2059124b3367a
-DIST firefox-129.0-ro.xpi 552118 BLAKE2B 2ec755b3ba7f133cb66a806232d312a635ab73fd4e0cd1d4b4474ba1475cd755ab6b443bb36d12c823f1b1e051e624b72088cd84c973028386e1c408781f0176 SHA512 7dd7a5fd87955702e8d9f77d297869b8f86d86d9b349283c51d00b2768a39c24935caf3c1cc42afebb6cbaf9833285963c91f3a52f235a7d16e552e638953610
-DIST firefox-129.0-ru.xpi 722864 BLAKE2B bda2241dcc89986bf590d75539bb59bb253ad24421bacdc21d19f0fa9651c183b0c22de15b454b86c4be6d1ce32a1794a43974d56a1732e6f67b6fbfb78dc187 SHA512 e7c3078cee0d711727df8e163939c7c929c07ab9fea7c004e34c1a0ed2e5afa1e1f76573768ea5fdb1bea8f97dbe89371f66153c48e8bee2c5ce20214f50da55
-DIST firefox-129.0-sc.xpi 590062 BLAKE2B 9a314cea536990051b9f77c835054d66d11374525f966a0972696c44daf9f9ac91bf0168aa01f68c5cb8c8f5515afbe1e8c0d34eb1991a328ed42e37035652a7 SHA512 bf6725ccc416635443d0d382580ce9323b1ddba4e0aeac92bc975819c9212e85dac4d7da28debdf6aab07b4a8b2d57917e63c3c2ded79f406d2810f5528e4389
-DIST firefox-129.0-sco.xpi 513495 BLAKE2B 7570b205e8ba3cd92905c988ac8fcb249f2521129480cf9b186135d1c287222517aa39e8bbdc976694af4f922ed75e7276f7bada49de6f8b15bb3947056d37c5 SHA512 e05c741d8f85a3586caa7566695b4f4496211b856ebfd47b65e2b3e620a05df0e0aba22f9a7077e222bef1520a3c9252f9b1cdac605c1e3359c76c2f99a5b895
-DIST firefox-129.0-si.xpi 615445 BLAKE2B 032c22ac323bb76264e09145a5de5d6ad4861d916a40cce37c9b270dcf3cc21e949e656a2b0588ce14789c34b9143c4020a1c6b498d63d09c1cd3e102f93d705 SHA512 251e33e47105acd38e116e959d626240c4cb042627b7c495309fa44dbcf6a699f4f60560d53a9f6d978b323f7343e583ba6a9bab72f5e91889332f896e4676b8
-DIST firefox-129.0-sk.xpi 654953 BLAKE2B fb3edf857f07d937e84add67f2ba74c8fa24a879e18b0e5e4ed7ee9d5dbf5e11515d9bb7eb4891984c7abc78a63a6ddd56220987147817fc4b0c82585f4e54cc SHA512 1903f4a4598bd5beee1256043a229b2899b875384f8d4e2e56b7ad5eac60d15f574307fe7fda511d9fdbd1f3b91acf94e15ebfdd7830fbe06f68bceebcc48678
-DIST firefox-129.0-skr.xpi 710334 BLAKE2B 4a74250ca07c41d4241d11a4f9fdec9d2cdc58e94e7543e59de6570ffe0d5ce20ed78c184f71b674ade47e7ec4511e7f1449c9e3707eccb2c72ad8507f7f13f5 SHA512 c709a5a797ad78a3d4b738b6202f831e21c31a0f94d497e573fbfa7f5debbd446b2590b3a579a9b11ffb0e689ac338db275321dce5825710e225acf8a99ccd49
-DIST firefox-129.0-sl.xpi 619637 BLAKE2B 851442e79deb9ac85881dffff39dc1a61e364065824ed7bfeb2bbe9b4273ca3fc53505f481c63b94c002c95505def63b889f485236605a445c04fb0803e114f2 SHA512 8d71c9048969dca9639346d318201d70237332e0d68604bb0b9ed68c2c713e60c007a35b29dd20cf0ba83ec19012f36d514310edd48eb4c0c2b3a5884b98dba2
-DIST firefox-129.0-son.xpi 418560 BLAKE2B f7080076b63bd78ecfa43ebec494dba86c50ec59539726ecf0420be6d5b1d82bf5165aaf15b280966cc68782b0900ce433c3d88cc491cc12629a197c4dd2b115 SHA512 5f1ebf3847ab06d23903cfba9b1916d4139d7fc953fab7451c53c3e1f13639b8fb611ac7e3bd081baf8593c597b082dcce1d9fb6a88c7a7953ce41274af3f569
-DIST firefox-129.0-sq.xpi 639121 BLAKE2B 9f15377edb8eaeeae601c0fd255739fad7fbc96d1320246da12997c9226190755a28f3e8bc051733dcf369aa135fecf6cec27c8f2ea0eb62cb6e2fe95517d240 SHA512 2a307e0b0b25b44b7444dc3598b07b98974b0db2ef83127f887e26e127b0e30649913956b1f354cb3426fb9e71529f8a776fa0ded099bf4008e1bb8c2b7ff140
-DIST firefox-129.0-sr.xpi 641697 BLAKE2B cba40453caa4dd835f9548797cfc4350db4bce8d05d3a6254e27635f3815ab9b4c10f8f08666fad1ef0e3a041054dc8d9b48cc1f7e40239915da886e3c0d62f4 SHA512 67fe3e741888be0295ec691bcce2621c2e593ca1763b0e60e8f31191eab6930bd475b5831f74fc39185f619c656d0ff781e834165969be0f8043b6acb2339478
-DIST firefox-129.0-sv-SE.xpi 621418 BLAKE2B 4075df53cbb534ae97be7df09caa47fc63e71225186c852ebdf6006db2f81ed6f111fd9461c6b2383d81ce424188ac503148b7f154cd433fd1b29c077763686d SHA512 6468cd94b1ea784315b2638e08f7bfa3144939663bbf3dcd6dcc6ebaea744c300a548fee5856e25e15d94c2ad38cfa3a47e9978954351d1b9a06af0329f34d73
-DIST firefox-129.0-szl.xpi 528574 BLAKE2B a5d4c0d66971dd51cafd441fa81fbaaa5da92edf3c8aa1c7c9f355f61d177e9d8d7343bfe6f2cf5c54a4529d82a1ad79958bdd751c0079fdcd9bb85dd33944e1 SHA512 06dfaf8cd3251faca0b497e354180a50565b02e555252644b772d619b33abdfe8ef072ebaaeb902957fc2f3ee154a3574cdca17ad9e1b2859fc36bc6ec6f9c05
-DIST firefox-129.0-ta.xpi 509682 BLAKE2B c047cbd20038dff66f3ca561eb865f64bf5cf75ac0386c1f74607de38018fe4e440a6e48c5a153986bcfb3cc421a49432cc5dc9492982ad6a3dd69acade5a015 SHA512 ded19698a518736b1c356b5c1dc7ecb9202355e40f34fac98f4bfc4d432932e1b82390c2236b97359a88197720cb6380110e4ac73c9acc690fb35b2cad1853b1
-DIST firefox-129.0-te.xpi 563245 BLAKE2B ebde7478692071b6d350a5ebcb5b4c04d35c8dbfb69830bbf41df4eef8a8439b2265513cb7f8e5696fd06de0226ea7e0ad9d056064ba978b198f65d5928a136e SHA512 951751c3f358c6db5730df3ccb4aa0821a8d5983e8fccccafa86a81b96558fc34778a701402731deb9eed08556816a9a7f57f63d4f20df57feceaad3122a1668
-DIST firefox-129.0-th.xpi 700403 BLAKE2B 9bcb6082169808b2a1d801e3ec15142debeef0bd04153b5ecf80c8eefa256d696db6eb939b366ba96970e1fa8dd1f8ac2e404c1d40dc74ae4bb74f6f89fe5872 SHA512 68e0a04a36c7bc2566a3808bc2d3a85b9ff7decca8ac1df7337b2c3873aadacf60d6cdc50cefd8063583b198968278fe8a1501774219c5821a36714f4fa8151f
-DIST firefox-129.0-tl.xpi 536469 BLAKE2B c32118ff88a90b3b34950592345e798295c3042e8a3693b769ce97d91c7d4c158bc7ead979b22977118fc67f47020e02b199609d6a0e8a2c3d5589fd938f1607 SHA512 b283c832161c2104e9241a4ba0c7b5207f151b8750a2d7c409d669124240645793509a502a3c615d06f59142b22b601ab43556089e57d33d56431419f54156c3
-DIST firefox-129.0-tr.xpi 634870 BLAKE2B 18934a021f722b391587db29a462d065e3cdd9042eb27ebd8f62af014fe5183f3f1f8e3bb553b38066ce02c47971e1438f063ef6f7a845b6f3adb27922b3a4c4 SHA512 933b8b7b4da9e76d24edfea4c53dfc3b9d4128ed2f38a9bc302b91147f2b0e6c0b1a43f9e4dab8498e6f5689d268430942e974476a4844b8bb9290470f41d604
-DIST firefox-129.0-trs.xpi 506189 BLAKE2B 50a724dbae41800d5817fcae0285344a4623def4cc6752e9c426a2d1fe875b13e3c9360d1c9eeef77109f515348e9d2556261362bb7d3887ca608a78c6272888 SHA512 323a120ead7d44331de2debccc8c742453478124dba2d0b2cae640148599a5c488fd5cf8d9b26738fc7de95e09fba6a7660781c12e28f94d357c03f51d897560
-DIST firefox-129.0-uk.xpi 709777 BLAKE2B c55fe815b8914a933976e085e8e00b943a9abf8d6655c255918509a83e44522e51bb19b53c4f5e79c397e5dfced8a63817ccd19a34f0659844071414813b1f9c SHA512 5e6a79385257cb25bd6e151a597df854217c0dff38e31fd77513aabbb41cbc0f119fb0f9cb92654da9371ee8fa93c8d8db4b4aaabea966a8ba002428994b2891
-DIST firefox-129.0-ur.xpi 562715 BLAKE2B 9555ad7f63d6f3f73d548193acaf48d13b5645f4b05a54528a009a98774f480f76755d494e7b5e70c4a8f372aa3bea00a26bd64bffd066884bea3e9d48466f82 SHA512 aefe581a309a229fc00116476d0bb1b48d75bf8483c6631ed6f2d99a5241b624717512b5720f0443441a7d18bbd4708457913e9061600ed30012f2aff516502f
-DIST firefox-129.0-uz.xpi 480950 BLAKE2B a716a87be418939a1792d9fe95754a318c2ce8ca3427201dc3103c8105f42deee060bc1f4ed6a3f7ffaf4cda4daf6d42360e36f09f05c10b48e52fd5b06d6722 SHA512 404d44e24b590258fd4d7199418a693c5577415ccf786e28e8875813bde38edc98a300f6e5313ee65c419ef653d5f55dd8265dee1b81ffe82d481808350b732a
-DIST firefox-129.0-vi.xpi 658017 BLAKE2B 817db5f6931bfec8555210ba4c123156ea6517c54dde58033b9c11dda78b4ac0b9b6cad6eb58637836cd86a5f3ad6b031cbf4ae06ed7c326ae7e2a4cdb2270d0 SHA512 6d1eb4e572616156d27ba82b54d780ab56b83d236f73f96b3b7d4e2089faf720d66f3f8ad47aa6ffc8ac26dbbfe2f16f3e562b79736a00abc0092a574e6731d1
-DIST firefox-129.0-xh.xpi 419346 BLAKE2B 43b17550b6d5e43d9eab54e8a5be693754b8752c69071af37588fbe37df5c34f430cb12e1b786d55657492a879a09431f7cbcf03b9f15931f5b425d6b672995d SHA512 aef6ebeff017792264624ba3826184bed07d5b50b3b187458cd6bec40f3c801e48835777e1604cddb7383f1e1b49b70cb652177ff75ea334a07887b5e3608270
-DIST firefox-129.0-zh-CN.xpi 659751 BLAKE2B a3e42fd166f3e53e257a01867a39b5968205fc1776039a90a313ec83172cbf01a56ebe03822df187a6858ab68d0b2771aa279b069433f0f1a775601cdb394844 SHA512 864b97371898740eb9f3d73e43b00c493da2c613279d05b4ac4a65e3e65be2ff88ca6d8e04f44a07ee752ce518d1350227f9c43161081303c30e08498847f3e7
-DIST firefox-129.0-zh-TW.xpi 661606 BLAKE2B 55a5662cbec90c5a4813ed7540cded88b50560d226b17b43c9b8454ee901a269b974ced3f9babb8b46fdcf0a51d4871a36e33d3ff0969597aeda34690c4a5863 SHA512 6d225f14c65f0a9dd08dd716199eae640d8e2a3f52026d43a46d07c4f48a5f7bd18b4a2ad8167c5b33e1eb17307ccbba80c05b5e2753d191779d7c115dc45b27
-DIST firefox-129.0.1-ach.xpi 466203 BLAKE2B 1bf400d04a11d92e935f39ff1d0d667337e4f3467d3c23afc83eac072c876fa3ce27ef094e37386e700a484e6a85313c24608bda4f3aeb6e0347b9974cda3825 SHA512 0de41cffc794d0bd239173a77b8299e56863620c5e9855836e16539fe22a364a59c61293815f3d599bce0713226eb9b0cbc3ac75530edb143c5f1ff5b7098216
-DIST firefox-129.0.1-af.xpi 419658 BLAKE2B af551df18aa2d22702084c5a3d44b2d13e95908723973b3f9013693a464b030890a05f8368eaf20ca566a71f5ed74512a298a877453f76913f9aae886c8da227 SHA512 e370fc32822c5cc24ee5f4c02f862db8a368de8eb7f2782f77ee76192ec7a59717d8aedbc0b13e2237daf2189bac6e9ff63b62343c456cc60bdf67a0549ce8df
-DIST firefox-129.0.1-an.xpi 508147 BLAKE2B 528f5baf0c7aad059c486c83f94333edf24f2b4b38987f23cae90ff0ba4f64ce9fc3fc933dc1b29f3cc9023a14de7a62e4211733354a1bd0713d2fc7c7a465e7 SHA512 614bdc01c051a37431aa9bbf913e40acc7dc2751ef9f0bd8ece2c6e859958d4c01b5bd70da613b904fdecf021b13c774de094edc3b1d4a700bbd8cd83f210e70
-DIST firefox-129.0.1-ar.xpi 613072 BLAKE2B fd315b78f59e3637b1633dc2311ad13e5d524b441f1faf8d1cca199bc456339174a386d627decfe561da600fcf7fbfad3564169b42bd3c50a13b680197cc2343 SHA512 f5005e8dd336d6274eb4e1424a5b5acdb1152c127fdded95c41ebd864f87acff04fc965d842c038281fde702e5f18ba5875244deef30ad2357c56fe6dc8d7ba8
-DIST firefox-129.0.1-ast.xpi 498510 BLAKE2B c6f1e430609e2188ffdde33f6205477a75422480499919eb12c51547ef2239b778671fb2e2e7ec4a544b26e5c1e055624104d0596656f3a9bccd35342417e38b SHA512 07ba30cb97968856b51e6d47d42b9f7df86db55d4517cd2ee08f8c7987eb85fbd406dadec21ffc6dcae616dd91419376a41211476ec6fb21c55b8a906d58ec8a
-DIST firefox-129.0.1-az.xpi 492957 BLAKE2B 7bba0415ffba2b4b40aaafcf40af859421aec43ce0df6fa07e65315650da4525e4c0f609b0a8ce4a0b2944fe31ca0eb5fc5d1d052b7024bcee832008ce6e32c1 SHA512 f26b5ba52db0237e7a376a606fc7d417ae7ea77c04b741b4d12ffab76f1a0c21bab29377ab07243a57d9f3262ccfefa55dfea84fc34f1aff02b67cb7aae4ed8d
-DIST firefox-129.0.1-be.xpi 718010 BLAKE2B 4b53dc0ae6353911dfae66864cf254dd4113a37a8605b66cebda8f4be3800b1c95c2daa054f230ebab6715726356ac10aa65e82f0143c10a41b9f30e6b96b684 SHA512 e6fc6b006317ef5d3bba1cf9087b93e59907fa1e0a854dbbc4d68c28769b034b8c09968b8e3a5027f54a5d12bacfe80f7b26af864a7e6bc2a119f3b7a90dec4d
-DIST firefox-129.0.1-bg.xpi 624115 BLAKE2B a0dd3973ccf6468ff0f10e68c2c85525edfc49fa9e85c391db7360ea19430cf3edeb01eb3f8c09f3cd09a8e2670b61abb0d1fc10233e5cf8cf887277b1f43de8 SHA512 f357c258c278944f5759de2bf4b84101667d1758559dff797b51b3f8d5b08231724527d7e8acd2da6acf92fffbcfe72dbca4d084e3590c0a3891a2b6117520cd
-DIST firefox-129.0.1-bn.xpi 583730 BLAKE2B 30807365f0d737a1887b33c94ca78cf8cc1200bfdc3a0d66d03ea45ad1fbccd0a204ab3dc0858ff80552e1cc9615fc765026914cd31a9fe02f16bea5ef198ade SHA512 7cb3e87211064a05f0d2b64933f56d8cdcea6359bc3d6951d3b4d35f2ad72bd752efe08dda076f10c6f918f8883e13351958ed7d71563f6326214414b8e373c2
-DIST firefox-129.0.1-br.xpi 591227 BLAKE2B dda4d91c881a795ee6ab2d0188ca4c8be4042d1c2b9c4c23577cea1b3b642cd484a1a90a354100612bd913fbae9ce15438539c9772c51569754dcaaa0df3ae72 SHA512 00f50d8216c719f5d13a72c403669629bb1b9ddd9980bb034590f146f26bbe598c35862dea58c973a0977f60c8ee43aff8dc8c0faf203c9f83dde5adf9199331
-DIST firefox-129.0.1-bs.xpi 504168 BLAKE2B b0d9897a2d987b3f20d6ed165d41c8982f2a63c0ce1837fc4e0f41ddc8516002bee6d7d565d403ed8fa96189d505eaebf879049c77ea04b92c2a5ca810d35a23 SHA512 6a551074fa4246a24f2f0f338b76644009a42b0da45ae9b80562d0fd2991c4a73ec0d70b9d57dae1578fc9a9513b30726da611326cb9291490c46c5468f5a4e9
-DIST firefox-129.0.1-ca-valencia.xpi 548456 BLAKE2B de03d04d8b09651fd8329a6979f27ed7c88ee2e003010f6723fc9fc81ec72cf7c4e8a349f5744fc1f1fd67653d769c365c3c86f8f9f7058278fc285fac065ed0 SHA512 758af61677f2b9df14c6a91c9b7b74043fa2e42d45637abf695c01dd4d4b5627a359d279a755214d55c1b1cf12aec0485092fcb1b82d9dff5276a887de08c7ce
-DIST firefox-129.0.1-ca.xpi 599335 BLAKE2B 5a17782d69e50e9388c5aef3e3376381bec44a8a5d64f3ca3e49a9f4ca4dc3aec3765b156cfce6ac358faa679fc3c233c736553c8d08a4114719a645ce244366 SHA512 63bcb2b0c4cb2668645e5c31765c680b4f10d86fb4dc89239821a0b8f3f4a87e38019147eab21f7731399141942074456aaa3e86e6293b8bc9d04429d4de4b5e
-DIST firefox-129.0.1-cak.xpi 595443 BLAKE2B cb7f40cee94b1cfede1f3e0509e3c073b7323ff2e7405d473a88a606a8886e47b4c4b3307dccc9db40bffc325dcb02dd5d95df23ffaa84b3b60ceb4f2bea07f3 SHA512 26855b6d785f2478a227e859f9049d30bd5616b4d9301264b2441ac150d54577dad3cf17037d274f8136f7e25185835b0de5a3873240bfad3d52fc299d56eb2d
-DIST firefox-129.0.1-cs.xpi 662050 BLAKE2B 3e3a51161026e1713f721a12e7131af95404ad36049837e955cbdae05c2e913483155383f1bd8b77ad8143e7b9bccf9806b899c12bbe6bf56ac71662260552cc SHA512 db42e9e6c519177b56ea01a77bda6973728af1cc9dafce78fe6c2aa8f57314a9ba475645e2bf6fd4dadc84c5278c6e5df726325b4db34fe8a95db68448005189
-DIST firefox-129.0.1-cy.xpi 626691 BLAKE2B e99299a027e7c8594fa6194b5b1fbe256c933d383fd2100938568b35d3a7c1851196ab4eae1e8584517e6368bed5a653cded04fbe6fc3b7bea0888bd3d5a734e SHA512 bb8718f2ab590187cd918506447f9c8209e423e147a6c4236f70dc8dec7d3c1f5e2070092d455124e4b2f6aaa90567859edd6311e2b6347b6656ab34194f4b60
-DIST firefox-129.0.1-da.xpi 615343 BLAKE2B 5c5df91ad11df90d8cacd5a4cff3f0cd3c6f125d7edd54fcf60072c584c82488f6020bd86196d3eb5f74767430872580737beef4400e9cd285560eab6fa06cda SHA512 9829e5ecaa614c018de5187ae15481068dcba3720bd864faea7ccca561beed6444404aed503b38cd50ee372e44f5878164dfc0264495a7939aa3a60d0321244f
-DIST firefox-129.0.1-de.xpi 636708 BLAKE2B 854b59464263b31886d58116a2563cdd4398eb1efd448508db71909981b5b75fe06aaa295d39bdeecafcaf64fbab7cf4f66229fc8d91ef7e9076bd34a3eaa185 SHA512 04920db4d1c297d5bd3bf3ea6cf370f346b309c1e4cc3a77da72488b029c9611a84b38f890c4ef4c9bfc86ca57055085514d06e5b48b8f19c19d2368dbf8a6b9
-DIST firefox-129.0.1-dsb.xpi 653382 BLAKE2B c140321c20059ec8c00c9871f89bfdaf7474889936496c4eb44d0b580548c29fb75b270fe92d6cd409805ce27fbb62f4d8a990cb0eca0e55210aac0c470a48b6 SHA512 e886b76cfdc05503c364a2fd2b6a75f1e755747300dff13a83e3ac034607241f3350bc53e5f705958eaae9f7670ae55d0a63a865fb7d3894b8d57aab71c78daf
-DIST firefox-129.0.1-el.xpi 735568 BLAKE2B 43c751c24341c0cacab30d88faacd7f85fb2098c62ac39fbf89e8a56f037fe60e44a0f971613249c89da83f7388d410e15a0c0f564bba0fa3a684a90fc1921ef SHA512 3c050bf0d324b5d0656ef9e1ac65e28dc457c6956fc124ccd25aa20c9d075a3bb7ff8e334e99836f920b5295dd899d9590ce40bbd34ad9ed65b75883e308fb04
-DIST firefox-129.0.1-en-CA.xpi 587144 BLAKE2B e5729f83a9420b4d4b30c8d7e1af810c940a96fe21beb80817c569a40258ba626861823ce9684ab7acf89d706284d267513bf6e038345fa637db8eb0e12afded SHA512 8a18deede7e788587aa8443d32ce71e12f1b6f35d9acbf474370f607f249cde828f161ba9a57f0554b2950937f4e08eec3a3ad6cb2eaa31068c12f37e2a13de4
-DIST firefox-129.0.1-en-GB.xpi 587528 BLAKE2B 6c86c26037ad3655bee98d7c4a561d43dd7fb1ab740fba559758d89e694574ea92c2b1a0d5e10d6a7b1ae15e8561310e0bfa8995e94ad784aa78c3e0f46580cc SHA512 8b268502bdea7d4312a7afe8c38b565a559c73290b074fad45acbc2489618ca9524786c087c092458a046cd7366181bdc2ca7bb8f6675f91517e47d33e57170e
-DIST firefox-129.0.1-eo.xpi 616014 BLAKE2B f171ad8a71b30089f8e9685264f94a2b4c2ac37fc22896a472084152f368ce251adfcf7b09868c74730e92ecdb1225aa22837576fafbf38ca470bf67a5846f11 SHA512 64c896b3b22211fd808c3c47368383518f4752fcd0028835652bed4a67c37e782c80d636eed2da513821c31e65ef3c3acfab793adbb42c6f80a50d227f02341a
-DIST firefox-129.0.1-es-AR.xpi 630369 BLAKE2B 1b486eabd8cf09e33603c2dd0c515cc5442917367dbf79198d1bef0fa39c4b6cb8d28f826796755fc45d453b278493c6c0de6a77984945b945a222673959c41d SHA512 b3baf877bb36ba3b0adcdaaa257a466704eba707970117788c87f6972f1dcd311446c9e67b66034118327dc629c8ab40525fcce51b9db32562b5574251446af2
-DIST firefox-129.0.1-es-CL.xpi 629637 BLAKE2B a8c07e26cb529a486de0fef592e76e08a24fff5df853aed110f45c1c70002e446fe21a8098428b4b0a944ffb2ba6645737068b5e5d4499c71f73dbd4e440bb97 SHA512 6045d2b0b263814894652d386a18b01cfffb8aea8f7ac6613e468d59e18db1dc49fd29bbac5d11e780e15e30e1d993979e36263616e688932e59fed84876418e
-DIST firefox-129.0.1-es-ES.xpi 622865 BLAKE2B 7e29a50f2e8a7c83ce12a46257a8b7e252a6d1f2491adfd22ccc52b8abac4c5fed41272eba9ce749a2403987d52c68b99f74de2b140603eae875909767e2050b SHA512 9f47b5fcbcd567bf923f5114effe1eac4fdf317a14dbf9fb83907640a2469f09988f03a9eff8dacdc55246e4bcc0bf9527baf4174cf2504684d502413ee52945
-DIST firefox-129.0.1-es-MX.xpi 611602 BLAKE2B b0121faa225b09c0993b9d55940af36e6fa4ebca1edb06a8dff5e4beb20791d5e5157333781dda890f10424f63124b0e5d357907b62e2df10eb95a2dfbaba2d0 SHA512 6246482066cae080096fbc4ecb294db027f80b156fd76bd52bbf8d5a7ca182f120a309599a8b97bb4ba1a7ceded0adf3b2457378ae9766b856e6024a13b1dc1e
-DIST firefox-129.0.1-et.xpi 541839 BLAKE2B 2c6abd2d1f0e130981fcd1ac39eb0264a6cd5f495950e406698decbd5f8842a8e4fd8000a43ac9aed0a07abb51118bedc33041f455448e776c4d5a44940c1def SHA512 5cdbd66b9cfc61cbc06c9b136e875fb0a8f191a5d8b9fba30d95e13195bae1c2613abc2cf4f521762e5170190d74111f7f6d727de982c93efc39814d3795a4f8
-DIST firefox-129.0.1-eu.xpi 601685 BLAKE2B 6a215d0f29cc57264fda64b633b97caf90def36b9d30ff9542eb336f750366cf02240970430a58fd9b9dd83991442fc23e2b7e09aab6f420c5b4b83e28da07eb SHA512 6d86bfe4ff8f054a28d9974089315aa165f429548342100c399863c6930fd95b10229c2888453290dbafd116d2bc337431bc4b57cc147c841a16873d7ca31a82
-DIST firefox-129.0.1-fa.xpi 592244 BLAKE2B 2a3bc28ceb76ab5ea94f524b1b2b3003ac02e04297b19212b011e57a4453be6618ba0531e3809cd8d094f4deaa39e48e2f1b28411fa9bf681ac64c8419142b41 SHA512 9d5680baf01b60c00ffadc60848b2347634141e05ff7cc44297388398709ed204101ac7f9ea7d0041e63b12b2c286685e004f089078bb843a11f94971625b47c
-DIST firefox-129.0.1-ff.xpi 478248 BLAKE2B ca1d42bdb9e7f181e01d1f09ff8d2cc4a82d243fbbf7c99c3e03dbed62a6c3ff9476b3f428e21650fe112cad7c95383af173afa4fd624866b916235defbf6453 SHA512 f079bf3a8de935c1c53eaea12483e6099c03fb413991b8f0d9662a2f50103ffaefc2178a485a3602ecaea517aa18521052821777a7e2669588449683f3727892
-DIST firefox-129.0.1-fi.xpi 610113 BLAKE2B 3db7001071af69865efc7388d8dc3afa387d8897bbf87a843512a51d5f17bbd72efc6da22bdc22e19f9e01bb8f3cb0fdcb91a5c625f2e52224e12e977e46570c SHA512 d60c889e8cd3bf4b649326e47e5dcaa902b21bb3666b2f8bc6130829c9c5692b13c915d59f4043b681302c8d5c1b4c969f06c70682c5a8a74d51189994d45e66
-DIST firefox-129.0.1-fr.xpi 643417 BLAKE2B 075e85a273a8702c13a57c57596424852c462d85c8132ccbe9d1fe4bf5d75592304b1d9b554f84d008e8055cff0cd8ff05f50d58dae4d1de63f17b0c70ce2b92 SHA512 5b3afbd1918e2bf37c3b3ea26e35a86d1b1585ae0ca0190a3b531075221ab8d0dabae7ea8b4f7fe9b4a27e3944d7727a1328fb9c0af0ffcfac62dd350f31e51f
-DIST firefox-129.0.1-fur.xpi 635774 BLAKE2B f23236c24d9b50377bdcb5825999e6c4b855503b302a43169fdf5443e07e24804291ec7001480cc3d6ad564c97f9fb4bed198b72f4833a0d53bb5cef7dc70848 SHA512 117e48ea85eb2d4f3b60318e0316274879d8059f62135fa436466785e8c76154a5b2f437b1426e881548ac89c180504ae4be8522ba6b9b9522db2a0e965214e9
-DIST firefox-129.0.1-fy-NL.xpi 626047 BLAKE2B 58842827f65cbb3758bc3073752da321ed801e3509ab118820077a1df7d04cefe9c0bd1c310fd0e5083d1029704ff9abde7288d6bd4660e65b4676f355537b95 SHA512 9cc1ce773347b0955d77c9a0f5b3064722c455feb05982c0f18690e62795d8105c604ff3e7548e8f143766fb48bc4511900aac289e8a9bcc93ccab266361eca1
-DIST firefox-129.0.1-ga-IE.xpi 473209 BLAKE2B e5f9224cba4e3db16773ca6152a8c0693b0bb6bd1942eb159492651cc5f1282eb5808c35c3b02346f38486d50c8ed3e743e8cdd0c43db92e5b2d16d50b25d89d SHA512 ec23242f28d69d094ab20540fe69e99f8ae4fa8a093d39e492f560a7d07458ec6493dac3cf00933080884882192ebf9e73a3df577bc4ed28738a2458a6c12db2
-DIST firefox-129.0.1-gd.xpi 598877 BLAKE2B af2dc2be23ba83b28604d924b3bb45a112a66e714637a1fba8a67dfc5c83d83905ad953f92d84bf85bfacb1a4d26e01dfda32e5aee0be507b78622f08126cb69 SHA512 051c3b47da3d8a33a2fc08f628a487e67ea6ff2b58702881ba8560182bd526e1ea1c8c79019cf072f3cdbd1a5bd54e0a6611fc35c8d6e37806d550abf7462ed7
-DIST firefox-129.0.1-gl.xpi 606451 BLAKE2B 84ed6dd3a5310d4b9a0c6070ccc757a306f864a26ea93e4efd2e17eda6e1080b5ff19fd75a99780684f2a7ec99afc757263b758ff8dc20964e6e2b32e2a44538 SHA512 f07a63e3cd4de6bc64049c8d6494240cd4a20844f67821159c7a7369e6e9fae4d23c21764b5ca661bbf100c7430003c2f5b0b374989c1657db4eb4478186d336
-DIST firefox-129.0.1-gn.xpi 640315 BLAKE2B 27726aca9297137f0a65939b49379485f48692fa05b9b170869452057e342c125348312dfce07a34f5a02912cec3cd5bf2ef75218ca728e9354ed54e811f3fa4 SHA512 b1909c1f20202c075f89f29c4b6ea005d75d16281681df44475ab46805a570c4be05eb8fd7cca962fe9e6a3fb02432aca3a0b7ea751c9450422c922d80670b4e
-DIST firefox-129.0.1-gu-IN.xpi 529499 BLAKE2B d7be7ea6ef906f633a4ec60c6954764879a3fb25129c928ed7806f97c28d15f1c6ece9dbb63410f3d7a3632a9ada509876801b6c546ba71253dc1a83c76f7a69 SHA512 1a8effeca6bae103f1b3d6dd0ef4e033e42b169e6988cd8c6d6d06ea94ea1e14e3ed4ac385389764e592abcd764a7d7d6648b6663dd809701410532da29804d9
-DIST firefox-129.0.1-he.xpi 634002 BLAKE2B 6b1019925046ac1885358896b169625c2b1317b96f0259f4d2eb2a964a913a70ab85b3218aedbff19a5443aeb57e5102d6a4b9bf985c251eb79cb14b6d15ba82 SHA512 cd92d44c1100f1f9fc933303c716ef963a77e4714a4e920fdc42f41e24a35e2caeb629caecc00a783def0130a27dc692f407d863ca489adef496d7c610a20f46
-DIST firefox-129.0.1-hi-IN.xpi 568983 BLAKE2B 55e37a33508edbb3e22bb9f34cf92436a110b2d7651df01232a894621ed653b08614540b148f0f500f03fd40169726e0f658525b3d11b81e023ccbc719a51e24 SHA512 f3ce9f4a5e5129b6e0d16e6f86563ef3b4877b3e2e508b34039bda4fd4281169136aed9a21d9dc2ac7ee007a5800ab6f1a8b012fbc4e1b9dbe373e80415b5357
-DIST firefox-129.0.1-hr.xpi 610557 BLAKE2B 5d95ae7470fa1af451dab642251e620e99727ed9d5f5c2664d1c72c5ac35ed49a7646c4029e450a7666df8087c147b5d3d849f90ca5ddb04649a8d219eca43ad SHA512 1eba5bb1f5ee5a48c61920af137d71db937d3ce63c839b129e308a209bb1c2f53670775f6e671d2c7adee68e468bbad7e215d2ba98c7e595e4cd5b8bf83ae97a
-DIST firefox-129.0.1-hsb.xpi 649228 BLAKE2B 802f8fd9d9f2e1c5ede6f162000fc3bd49afe9a4ebf2cc816351b4a3339155c911565021c25663687cce420355c3313537c058c136e39e19b6b21af948fe51db SHA512 c4f2a325ee20ba192af024d43f5ef5f34f877986fdbb247795ba19922c5c8fbe30a6a5b6a42e066669865e634e0d891e120fb006b1e634793f5c88ab98516d1a
-DIST firefox-129.0.1-hu.xpi 651238 BLAKE2B 34fb48e146aec439944849560837cd3541c1e3bd4d4588e9aef01f3dd5e009fcf2b3ddbffe0c570367f281f143fad862c5338dd099bb3e40f1761901427f152f SHA512 1e643547997cdeca0cea8a61064040a37306d7c62a03e14effcb23e05938e91401456155428f37bc5681c1cbf8100a09a2672f1aee7f430ab3069a84978bc3d6
-DIST firefox-129.0.1-hy-AM.xpi 653906 BLAKE2B 23140d16794aae5b0ed9dc1fa1244dd60d62d0a9c995e7154d4c7af8276b453ee5effd5f8412a7189596fda95e84087218835864188c5e81a51ff429b2dd3765 SHA512 a9a541b5e52a1f0f815203d94fe1d2368af11f5ccf84231ac6b0e8bf093c56658646461f2d4379fd8f3b9d539eb043ee1e539bfa5a26e905c9e88a6397c554a8
-DIST firefox-129.0.1-ia.xpi 613523 BLAKE2B 4b0d1cda70a3a5298c173516a29ac645b18b1660c4ce752b100f3d87c952080313306a8abd8fd36ecdb540a32f7336619613f9b4038b6c6c9c604479bedd0f26 SHA512 680bd5e781899034b11eec808c542f0428991d534b8ce06894877817c0cd8ed97f988f582ed08e9f11bd7e93a873f6003381117d9942b3fc0d7df0ff77eb4d0b
-DIST firefox-129.0.1-id.xpi 585302 BLAKE2B 0d958a1a8f728c70097e8393b831b234ce5774fee6478601b2997286638014c4a716e2e7a814a99c1f3beb76cdec628c57c72d9102c22d31e104975e74a62349 SHA512 c4ac6e977f4d172016e98ca4faf973a1ac745d2f613513c015792a74cbf53de689893a10d192efc0f0b999d64973a78ef61454d4117adc10cf3f629f76ef92c0
-DIST firefox-129.0.1-is.xpi 619024 BLAKE2B 3394a770de2b98452cc58b98ca9d00b6390c773e9483270235d26445bdb9256f471d7ad7202d1f856e1a6103be0e637277f76ad02938ff928ef7c6f8d1b5b5ff SHA512 f03c8fc1305098afd7581774e29962645fba4def8abcb9c7bc97315af7089ea2c801157e2692a0224d308222e217048a13ffc15b6e30cd4f98f80a1b2bed07db
-DIST firefox-129.0.1-it.xpi 569518 BLAKE2B ec6cff3f29c867cccb1ba97b3ecaf25fc623e644fc05a9fb059094ed6d1e7b6f89413115f1cf8c497a082f7007364a06ac33ea655ff69fc4f43436aea224ffea SHA512 6b33032580e3cab4785ef5284345082fc93409e363e814b8c2641261db491c8485272b34384b846929c5f7438ce248852f2d4bdc506df36c445048b7104f3141
-DIST firefox-129.0.1-ja.xpi 679731 BLAKE2B 0faa398029ed46d1edc73972be8a2303adac5ae0134ea0f0d717ef12db3fa17d1119ee370b71265634af62fbe95971ba1a4bed0eddc3bf8490906de5ed79c6ea SHA512 fdc5f3ce5552c802d82e2054b4375f74f5ecd8d858a76d2ee4331868709166326e2a23322190c0c2a251908e903b4ab8a60e6ed1442a4dcb27111a155105b171
-DIST firefox-129.0.1-ka.xpi 663166 BLAKE2B da553f260971ccbbbab99122faa816dc304a438eaf7edac083cfc99bce17fb63ab7f864e1a1cd5126ef7a8d89a25610cc8deb280ead21fafb4d7d465878c19c9 SHA512 3b00538d7457a2c807dac9ddbbfcca2e710bc923c02b5ef48810c69ffb80f437306d7cf4883738c85a9118c002e4715c16045387aa87698267255a6a41e95787
-DIST firefox-129.0.1-kab.xpi 612857 BLAKE2B e1826f655870243a973f3054cb79afff27c3f7548035bb5ed7083fcd3bb0dcaaa21e478e7ac7588fa7f4199df76289494ebdbad1d0a1721fc7bd8ef5879bcb3a SHA512 3f822493b40187c1c9609cc985ec79a7e2af062632c7ebf5989d551098f2a6309ed8848cf6c3fe91b2f55b6091b5c1b06538bc002a5463c02b0cf55aa8aaabe6
-DIST firefox-129.0.1-kk.xpi 710252 BLAKE2B f927b7c58b91a8f1ac94f3f0c6e48b8efed8eddc4af3960d69a7fb3d17de1c4540a982e0b9ab5cb4c92c358573b83c0553568ed3be89b3119d3bed4f73dd5483 SHA512 aeb4593085f24e33a39544447e1039ab477041e7b3290b80a68c881cec91ad634c89579fbc9b1b0ca46ad8bf6876ff2c8d31ec64d4e662a7f8e74029f2749bb1
-DIST firefox-129.0.1-km.xpi 528065 BLAKE2B 1b8074b0b870a6a66637d8851422613d95119694bdf525160d155b519a18f85a1b8678a4b3d5e091ff61ff728a9d0cbf90496669ab1af3de5177509512065113 SHA512 cbca71def35d8db1cef6bcf2bbf07397c9767e16f504fe8ac10bc44e2bfd2b80b967c4da74b5b43f08935727429e2bde1da3562025c51c6fe2786659b0cf5d8d
-DIST firefox-129.0.1-kn.xpi 493383 BLAKE2B 341e75a230c26d3ee7623b0b6afbac15b36200d6f919624159600a3394cd8127af8ed77a47310bf895bbed721b00020d8831e05a1315678755bde7b2a328d9e0 SHA512 c7077e2a2c6dbf9bb55dfd10a20b91ab58b9078b8bc8b05ab0511db53e8499a0f4c9bebad0e904af90527b4ec90f10832e582b79579701a240233e53ca365328
-DIST firefox-129.0.1-ko.xpi 663933 BLAKE2B a68c441db4d9e2a1cf84cce9e46283269336282a2bfcc7cc1ebfcbeeabdd6f5ee1557fb624b5dfa8bb7365eec6c1f00874cc67a4745f5721f46d71742f0a1198 SHA512 efb6a11d8f6c19da16e7aca0bd53e3e9e88bb6b77fc45c3089ad52e55a29bb4badb8060da24d8ead1b13df850580b0d7b19f3c1a8eb3fc8ca58b99fd68b58647
-DIST firefox-129.0.1-lij.xpi 486307 BLAKE2B a412bb332132e2805842d9bdc716d9323f732b3ccaeb8e612dd6a4a576dde57768e6cc026477c618d6ea4bf79601cfb0fce909834e4196152efd7aac6765a27b SHA512 1c00d4d12c9958f57dba2c518b1c036b4e0de0beceb622846020f9ee209cb58a4bba9be6d559a76299e4bdf1657baabfbc89e652c59510474ed6afb7b05f00c0
-DIST firefox-129.0.1-lt.xpi 575016 BLAKE2B 352543b71ea1aec10fd127997437f81f07d0b7d55142fddc4da5c8246a860c51e15f2c0953aa65a64a5fb276152cfdc719047e4065ff370d3b52d258f134479d SHA512 2df572bfeddde2fa95572e5c75d5ad64fcbdf0f8b9dd3d3633767c423a1adc00220b5b9445602035c28633d6fa10acf3f3478c645f2f9c5353c8fff4dc90f2db
-DIST firefox-129.0.1-lv.xpi 576564 BLAKE2B d869d4011e9b26c72283be3a7e439efbcd716f3ac7f619d1020711b2a2ca300bf2313d5def1b9666f0e9e14397684f3eaf66c61f49929c9aa1e256eafb257c0c SHA512 c1862f848cda6cc0fa180312baeeeab6c84935b008034c51f7ecdd23b4db1ddc681bd49eff2c5047876078f6255ac39d88005417f2aaff8ac3278e69c8b5f7ca
-DIST firefox-129.0.1-mk.xpi 496012 BLAKE2B 7ca49f40963320653ad8b2600dbf160f15d5bf9a7837a2367643b633840afb278a0d2ac99276e3c888b7d422e1dae26776510f335f7f46250cedc3f022708e90 SHA512 07d0d1a9098b7f586f14a3ba6c17e8f1c54d4e36e25bdb0e8a3c442ed09d450af3c32a7a6a5eaf1681b7d3763b6efcf90d2e166456195b3326a46ef7a8e3104e
-DIST firefox-129.0.1-mr.xpi 534248 BLAKE2B 7e15b0bc6ce1566a2d311f2f761be31d892ddf3d0e00cefd54072352ab887d93ece496ba6c8deea92ced91795731e9e61b8ddf98bf0350629fa86e1104868aa3 SHA512 b33e73c529cbe7c6bb523501962ca41185c873524c1e0b096a94aabff4005120b828cd1a4b0ef9ce9ecafed7c9bd54b2970595c2203c2676daea697ca46f05d4
-DIST firefox-129.0.1-ms.xpi 451897 BLAKE2B a5c0ac2d1d714f51459faa8287d18db33c7938a780b391c1a510c935ec6031838716fb42d842e202354e18f516f2b9dbd9b93870a85bd69b34aa53108c28cd10 SHA512 da2899a70e2ac4beb0d4e73caaa03f58b48c993e47d563812d98c7a1ce580ea871be23aeeeadc2e0075138c9468a21beb4250ad7e8d8b9027cd0b920b5c7316a
-DIST firefox-129.0.1-my.xpi 520803 BLAKE2B cbebb504804e3493d62e43be9d99be2e296ac38c5984d1ef26e4bec1e89bbdef76b0abbc5a1cfa5b07bf6b7c6ed51ab98d984ed79f9c2803ec9841edd66f966e SHA512 06d7414d8973c938392897ae0f9868e8a1997887980403d4bd64e6d1ea9ba10a79478c01f150d70eae8f70b4e27be547335b5ae7a2b40064ec1d58deefdfa702
-DIST firefox-129.0.1-nb-NO.xpi 610252 BLAKE2B 04787e8c149b24d9d0e7f1f70dcbf464b28eec830fe269405f6a14eeade139afd5b1ef1fdb2bf5f561246e0736eac771a5ac35dbdf8f04de2ad863514ccbbc08 SHA512 c172886b13ebbbd9274206beda81013cded10a6d092860b3eb04409d816c73680703f9e1a771bdd54b2f1a59c36c72e640999a4ade7f4685b7ec73da6b66768a
-DIST firefox-129.0.1-ne-NP.xpi 516319 BLAKE2B 2f1c45451c9a7803f478af15d4e04c0868d8d98f7ebc483f863f87acfaebb7759b3f060761fcdbba941b7f4978086d1614ac0cb2a9aae88c83ca56265f619587 SHA512 b635c714cd929b6a83e1a078f2c3ae74ea3c84e036112f40cd33dcecb3812c6a0ea15f5f7c2123a1cb6abf2182df86cf5f1ee5bd14a52e2e5a6b0f502b606704
-DIST firefox-129.0.1-nl.xpi 619714 BLAKE2B f9f09451f35efa1950f4470644b6ad9396e4c073af80c8b10335e82c43c98bafb138defdf4837b21d6c182095492368577b33ae7d60503a3ef17ad2d078dee27 SHA512 a76ebc96607f872224b1876a110e68fd21fa257bd9c7597cfa4f37e9313a022498996f946daffce6b92828ebf235dd129ea0c50b518bc5ab0f41f9ac3c9cb4c1
-DIST firefox-129.0.1-nn-NO.xpi 613167 BLAKE2B 8b306a92cbb8c3359af0d550979598c5416355c12264e26dfc961aeb6d3901290d70aef99e3e49f391dc8b8eb8ae3983a8df32b2abac1810562e3a4428002753 SHA512 f7ed8514fff416a911162d2b749883364b6ad12b4378ef8ba559ae56a14ee3f574961d587bb7396ee6a232c1dda1dcae6228c47aa05c2038b77128deaf40e7df
-DIST firefox-129.0.1-oc.xpi 615147 BLAKE2B 233686ef25b00d5bc552c40f126df33310793abf29504c57a0d42e0a2846636ce55ad2d905bfb16aff3aed2927a750808cb6c12de3982f994f6c63cd3566937b SHA512 abc9b46de5b1837ad5a9c26c9692d013b70aa1f5baf9abaeecefa4ed2b068e857d7bc1f2aaec822551fbe21b59fbea1ae0f5fc2aa14c3fb1d440871d0342fc89
-DIST firefox-129.0.1-pa-IN.xpi 694799 BLAKE2B 8e3a1036a7913942a040caa75472238dcacbdfc1eef6984f750350a2d5af006cc205b3eef8dd5d0033fcf92bdace993d7992a24bfa863d06cc293261632c71eb SHA512 c1ae902b26121ebf17ece0e7766d3d459c621b9c58728e6f8f722ec22b72469d40d2d083ba43cc15b17103a361c43743bf3960faf8c94e351f0542f95498be6c
-DIST firefox-129.0.1-pl.xpi 640500 BLAKE2B 5028addd444102cc3beb15f1fbfcb7a32925fa5104eb1b0a9e125c115c0da77bbf8e26119485ff86fc966b80200a43c925b457e3f0dc0b6492de122ba7ed4cd9 SHA512 4b98a686ae6fa0b48bd7d3b5b8bbd749ab1ab97c91618ad9770de6dad5430ce47a44414b0562778e20ab67fb9847eed4d0db4f040bc3de5815de17d4c0f9f6b2
-DIST firefox-129.0.1-pt-BR.xpi 624480 BLAKE2B 3aedbae07d5b7988b3bc997b8255fceac60a4b884425d7a9ffa9b2edd179f68ba7771c7de1eb88c58058b0d35b5136489a4abdfde0ce54bc8d0f2672cd27153a SHA512 07d4d38b282035c8907e57fb94056f129dad0115de811943e9af68d6b00b91ee9265869547bb386ddc2e45529fb245ee0d113cb3c16165c46fa5a6b69c55b273
-DIST firefox-129.0.1-pt-PT.xpi 630814 BLAKE2B 28fa48ce6e89de74a3cb7e9499089d339023cf86ff2205bb6a2fb9ffa05573199fe7783f8a4ac2a453381a006df782cf18ebcffc4816eb2ebeb32019321333b9 SHA512 9baf8ec72f784768a395148cd216ce6c88d8531063b76def054bb64daab4e0706f1b779da418cd450e8849d543f2f8b1ac527c4a95cc4cd9ec778159fbd35609
-DIST firefox-129.0.1-rm.xpi 620388 BLAKE2B 3feb509d7ece9aafede83d3f92021eac119b8b615b35dd5434a098613241e1f00bf68dceac0a4a8e9e9faec88ea80312392a808e9693325caa8dd8923836849e SHA512 d3d929e1e12885759993b010074a5e57bfbc89adedbaf131d201ceb581b99f82ed92d5b2e932a1091bf82b64b8e5c848c95f50629729edf3c19308b6c9a35e42
-DIST firefox-129.0.1-ro.xpi 552115 BLAKE2B 8358651d9bcda9d9ca044e92f775f0c53f8ea0865e725f67933b8a5283785bdb512c7c10b6d66c65303964b996ed0868bfdf121d8f9bdef7d73d0da3ed89cb0d SHA512 5529b5e04d22940ed9a5cb2dca28f73f0615cc1222d991a00a67c4892ed3cb367d36460827de1911dba371376a68843cda09571f2cbd6706399f39110c448c1e
-DIST firefox-129.0.1-ru.xpi 722859 BLAKE2B 1f84ccc179be0fc91e65cd3567535afa90ec32cf5fd06fc72d900028b7145c01ee3c750a36b25b8b06b3ac23a7f271286432e027a068f7093ea1389b8f057388 SHA512 e18e770d357705d3dc64df02ee7849f04ab211d4326c87e8fff6ce1b5eee0ff7ae1eee8986a661e1bb320e1978c8c2db075c2c20c4d60f210e7668aa2f7178cc
-DIST firefox-129.0.1-sc.xpi 590063 BLAKE2B 3f86c784cff3f7c8ea063d3fc662b2bd37ee4d96b5d019d4cf228b7c62a68dabaa6dd028dc3404eb9df275e3c6b4973b8e628eef5e7a080b58484cc9a51f8d97 SHA512 d22b050e0c92114a4effc3adf899771da0ab2103d59fc0843e5c3c720233ba38363bafb340d0a607fa6cf1578a3a868da03b4bf42071948ecdb70abbdc7c352c
-DIST firefox-129.0.1-sco.xpi 513483 BLAKE2B fbbd3f18175203e2ba014e4b968e6e69d2a8dd7e1cd8ddf7884873ce8b36c0574ac4bbc2307fa64cfffef86b800dace882e34dcdc8b0eb77aa5587dfd5a92884 SHA512 651eab4ae77ca4f1356d59a8a5958e1f10b3d58c5898aeb42d185a7bb729f3f187598343b7e1569943aae9853c1d04d2a92e78e1b9e63cbd47a0252b4d00335b
-DIST firefox-129.0.1-si.xpi 615443 BLAKE2B c4f017139a9cdcd1a7aa512fccd3a31646d5b5c19123368860b2d70157d98ddc72d2a1c353c23cd5c79a5e9e63f84726b7263efb67e4c864a3796f7f4cae8284 SHA512 0361a5d19c8a0fea509218ccd2764594b09c7e0837a57d8e10d21acec29056fe19de5f41f43963c07f6a8c0dc21d3f0676765e5874301b8a2c58fa8bbe0b960f
-DIST firefox-129.0.1-sk.xpi 654954 BLAKE2B ead6474886f1b1de2120a131ee0d4233e831d4d5328fed2aceecf6c741197a904dcb0b7e4e9e714ad1302a68065eb6fa021d1bba3ec0f44c2a4e444f2ef78fa4 SHA512 302b46ba67ea06381a25ed107978d3e186da204f2dc6736d858b7f7b49f4d17e00da57b6fa53756961e7e3aaa2258bac0a55ef522c1029e23f79fd3899abe261
-DIST firefox-129.0.1-skr.xpi 710323 BLAKE2B 75e9796f333f8bada8cd74858a1934177e68e0d0e8b0c1ec7c264372bc197726e2a877e1be40d4fdba5f4c186a360e62e2e599801f946ed5be129b05afc3c33e SHA512 6b808e3fa16d5350d6a3b5684041c489183db5a543cfd799e88b2d2e55e98b867aa93cc18091715e356cc8335396d2c07d8994f333381acf4d7d63e06c529fca
-DIST firefox-129.0.1-sl.xpi 619635 BLAKE2B 42b431b7e1baf3a53c2612f965832b43063f6ead342de9259f0a4e8a922bb2555135266027e858616477f580c08b4ba3e7948fd6d0fa90f4627aa0aabdc49cf8 SHA512 9bd20e0a7fb66c00693c14612405ac1647b9a2bdda0056d444d7ffbd240c73890edb1ab16464ea0e33bafb242bc5ae005c78d9c1f7cfc23d7715435cd3ee166a
-DIST firefox-129.0.1-son.xpi 418559 BLAKE2B fa9cd55cb6fa0ac7c784aba1612446e1b202b82c61a21e97c53b0f38f3ca6b773cadb849d625561f72f2f9343fa06744baf6cf599e62e53365eecb2c90942908 SHA512 16a6308fe84a70b9a0d80fdfcb81aca0a089aa6ec633389eafc9ee52fc88db084bf6622fab12778e0a7f60c5f38ad02f9aad2f1d12e1862387b2fa9c937c25c4
-DIST firefox-129.0.1-sq.xpi 639105 BLAKE2B 03b4398710c0f2125456c5c3845d53666954b9d61f498f1019319467000af62859b0ddef3f5296e9b57103568165e5ef1f07268fcb549356ad6370c48bd38def SHA512 09fb629a3f3bd294c497b71d8d87b6817fd5a5dadff04f5e4b284693c0cced78bbdfa335ee0e4f38ffe18c96448e4411a19ce32393fd47ae46311a11675f9360
-DIST firefox-129.0.1-sr.xpi 641682 BLAKE2B 0a4e2407a1cdb527921bf4d76bf2d2b7495ca7cb0ef29aaeef7dcb4588ca5a92b782f786b202e08f85750604ca3efa75210a47ca4d2a5885824d3a92bc51ab83 SHA512 a89fae23ef52b44d88ae17d23458cf07705e17906e8cab955985dd8b6e80ff05539c86141ec495ac44099f25963fdfe40705e483f43299bdf3d2f55f84eeeca4
-DIST firefox-129.0.1-sv-SE.xpi 621422 BLAKE2B 8fcc866c3b2dc29230b78854185350dfbab0a0e977b788e56a86f2307718b3ded9e550e7eaadcf93d0a562068d7613ebed017a99f0ee4a82511979ab3c339d7b SHA512 2635c84bde494f13a8fed0ae461bfa727e671b6f97e243fb88846e30dbe2d4891a1421ecb9e1f152fd111373003b249a25a53f690394f51ba0556ae972d0ccd3
-DIST firefox-129.0.1-szl.xpi 528575 BLAKE2B 3ab91fc172d934e6beaab8cee50aea44a816f3d10d9bde40f1adb9b6d542e4c35fdfcc7bc97aaa279a7c4e3a97dd2ef19c554a7f11ed541ad8d42e20d6ffb732 SHA512 53f980c7a27831151aef24a1b44b24c9e7f03ae119311d0c4fe87ee8980045fd7295258d023b5013e41ea1cea69648e98c0b11f24ab0d05eededec5d5946f00a
-DIST firefox-129.0.1-ta.xpi 509681 BLAKE2B bce4f91dc8583dfc1eb2f1e4fbbaaae79a2fc27468f52dd6928eb0ebc2c22c121b63bfdf6f434ba9755d601beee0aed579e6a82044bc013c6f24c3c7b4645eae SHA512 996423a58f5b34b8b5f8a9f96af268734e67b5f94c9dd93071a3e1f9f75b563067494ff2b31905ba2ebf093ec1be87ad36b0628513872c1613577c91637de97f
-DIST firefox-129.0.1-te.xpi 563252 BLAKE2B a95d7efaed3d917c5ad1dc429965cfccfdb7c02a169257bd228a47e97d7caf1b83e0e8e5365f5ad6d4a98c46a1185e51719464195f2d79af9fd8e3d6afd979e8 SHA512 6dd2de9e1971e194537af147cdbb9528ce78282923154f371112933f9e4f91029fbfeac74e365445af516602f3e3a8a520c6b6885e07e88c152c7aeefa38559a
-DIST firefox-129.0.1-th.xpi 700412 BLAKE2B d2832b0e8610a5eb774186fd3f99e4904107f7c8dbbb62608530a9ac2e0924d07882a29cd346a3cdb67aa67cb1aa9a9e2f260280013126ed131e09cbd4a86d89 SHA512 d9b047bdb56e8c38a18ca0a8cd95d1881177560dfa838867ec0c2822d52296f10cdf090b0d522e11942f52c57816e6c85780a5bedde89430453bff8469b1d3f6
-DIST firefox-129.0.1-tl.xpi 536471 BLAKE2B 520a3a743665621e05606be0de18a6360e167f447fdf83d3271fcd034059188650321ad464fb4cda0f92260c5b25ed9d9dd068c66e744d6e16b63d5ab79849ae SHA512 c8b512d526d22719cde9cca3e9efdf28e0ac810a6c74dc8ef164cb45d95e3a53a44f5671391462e0a19243898c312e0f83064a0e9f317895e3c9ddb3e3945c7e
-DIST firefox-129.0.1-tr.xpi 634864 BLAKE2B 8fe509b61b32e57a483e01b39a303a87e6555a3fcce70f6ba19834499e82c5cbcbe1e308257b1d5459e915207940c4c5ab4bdc243a5bfac0e4197933865c43cd SHA512 e7f01acaa34d43cc3a770bab2afa0b3fd76c35041216721871bb72fd317b26df40d88693afcb5921fac5b311095bfb840426c09fdac1c53981054f82cb0ee8c5
-DIST firefox-129.0.1-trs.xpi 506182 BLAKE2B 1031164022990dca404c6ab5199c94c5bc730810c499b0a332ac5e4a1e411b97f7e531958f9b0448ac755d830dddfe7ce093cf97517dc18bbf9ba084a1fd8a10 SHA512 d690bcba7abc1a49c0ab7525e91637737aacb7f548760b7517b7f871179deee254aafcfe658d09ad25d3f8166f1cc8b01caf28de69da453694b7392a6009d597
-DIST firefox-129.0.1-uk.xpi 709787 BLAKE2B c6e06569b6bceb41ddb9da28c722d2a542549d3a227740e73d3a6fdee8bee3519dbb45d854b19d3488a193c59c6f90428ca5f573620c294097c968fd88b6336c SHA512 ac556723aeb270678b1cc5a6ab0f5288a0a25069c3e1f356ea37db0f1b176d28e08febf01b603bbdf81e41b9628069f36aea5deabdd91bbd76ad6531301c17b7
-DIST firefox-129.0.1-ur.xpi 562718 BLAKE2B e3dd2b0bf06e060faea6dab6ba5b89a5f841b946d0637a5603269eb31b39f00352f754acad3609eae4b244d94ec717a3e9b6750ba71fd30508f0cf301b2f3623 SHA512 c18af11fa0a748944131f586770f07820c2da9196bb7abf437dc2ccf8ac2d3877adbc7bd7c53ae09acc461f75f3cd3aad30bf95b2849cf47ba749f0e9deeb0f0
-DIST firefox-129.0.1-uz.xpi 480950 BLAKE2B d4f217f97b1562f3ac371ff0631219659b3dc32851ebbc7960f4645f23b25b341577b53d6731f713f44a95e45954c03edb7c05e1e9087324d8f5b0f4f94b8fe7 SHA512 85a3a2595a3244afb07ec3e4e5b57174d9ba70d0ad3b8c527077d8de2c5fc86ff3d996231b5bdd57793c45e4533bf982391a93b18ac5761fedf6a57be4d9defc
-DIST firefox-129.0.1-vi.xpi 658029 BLAKE2B 953ff69fc4a9020458b49c0a016957af071105896f571643352a87afaf52c6a533c4d6e8755a1d2ae36bd29bfaf19d9bb52516b083835ad2cfcb2ca144447cd3 SHA512 58619cc0786203e5c9eaf78ce4ef90093de43fe77c13b0bdaf8c96778c24bec70b8576773d9a6db1fec8cd62bb78f13c5d563029140b50c0b8ba30807217f56e
-DIST firefox-129.0.1-xh.xpi 419344 BLAKE2B 882dfe172ee101d73e8f1d4766721ebb9bd9c50ebb2e8a20f395368b9bb170406d8e775e3e3ac754e8d7fa7610f1a2a2114a11b2e22b7c6c7d3633927503a075 SHA512 481c749e6a53a0eff4ff0cefb47d1b5025b3c4e41cc0bcba5a15222343d2adfb1788ad24e38c1f85c6d7827d8a7db6f0b4e103875e19fd8245f59aa753c397fd
-DIST firefox-129.0.1-zh-CN.xpi 659746 BLAKE2B 5dae54b24daa3bf7edc91cd5f1c06522a148312f9e9e79926464743dfb6d83ac940b6dc72c0ac7261b79da9b92af0f3b534b12f0c36e2631268e80592691ac8d SHA512 7c621834110cdf41a05c8712f5c3621d77667670d45f0916ab249e4cf64b60db25764161427968bb2ada9aa66d1632b4542c272faa1555166794aa44a973a0d9
-DIST firefox-129.0.1-zh-TW.xpi 661607 BLAKE2B 7b1132f1472ba56fa5ad8b090da4d275dd6aa6e00ad2c26dbac42ae2beac1209cb70d79232dd9aa2991bede17f71967d4bac48064757120f53c473d7b2546a35 SHA512 f7232e3d7995c8eafc3ad260d2207788eba67221383bfa1c8c62641957d884bd9fde4a139ae3349cd74ef6c3d7b8a51847e45164cc6fbc9f9d24b7dbfc236f03
-DIST firefox-129.0.1.source.tar.xz 561709736 BLAKE2B e3c1a3db5a481839c862bef6ace6f977e601fc85f308980f7d0073a3ab04b5ac611ed3edf3fc4b71c09008e0f54009f78b64e64c5d0cb63c86798138031bfee1 SHA512 27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027
-DIST firefox-129.0.source.tar.xz 568302640 BLAKE2B abd8b0008dfd0948234baf7c307c42051e2f58a9c7ebd07b3b0dec9bdb6d8d78e4e1ae25d552aba8685e8b307dbdeb1360d873fef98ac108671dbbbc53c2a3af SHA512 e406d00dc53c66a1ee6b56e7001efcdd8b323caa3676d66d874d39a99f44ac7cebf4c60d76b5d239ebcf834a75cecabf801a74a1d08a97a66ea5e8ec6c8f7c5b
+DIST firefox-128esr-patches-03.tar.xz 14156 BLAKE2B 9a618f0ddb8596b740893dc9113f374d193a00e4e8e76dbb2794928ceaafc7b5309cb6f69f6287ae1e423f0be0a060580b0d9d59307c9889362dd17fb7d31d3d SHA512 c6ec7233b368fac623ec0cce6f5c37d358a0fa5bb2154dc67eebb50968376ca9d46f3a734f5d79a4aa4edde9e300a9c65315d0e499aa6a1325b6c76a6c164258
+DIST firefox-129-patches-02.tar.xz 20272 BLAKE2B d7dcb68365ba8e065430c9ba782c98f1b39ff4210a048703fe6434fe2baeaf25e0db71768dfcfcdf530fe02eb8f5d7d5804d1d66c75386642ecf700ff28da2ab SHA512 81659f6960768dadcfd50994aa91f6794b3e9cdc371b16ad8e01a0f2d4da6cfb17864c0ea0cfbf1ae593a67a9c95e239553632f2f4e66419db46e7f5337b483b
+DIST firefox-129.0.2-ach.xpi 466199 BLAKE2B 102d1397136e012f3f4d9c1d2907828bd4b3e1f8da78c36ccd222ae39e2ce0000765a163d30c5f226c3bd823b9f10f72481080455d3b6ffd651eb1580ac88ca6 SHA512 261c59e806ca018794e6cf84bfea0df49985a8bb09b3c78c6c2be29ae8e65d835813e364741b4b636c8ce1c8554fd03c3c23f648e40415298190697559014dba
+DIST firefox-129.0.2-af.xpi 419649 BLAKE2B d73fae55bfd931f7959161e479c4dfcc6bc6a16e8e331d36ae5d2fde87f86a5dc95e56f4bb09406e947da43a76d1845b69f1279b1fd11b61ff1db980c079801c SHA512 29347cbe60a2b6c4e1740ba33fabd0f850aec3951313039a382349e36b701b8dbe41964479068f24bfa838542dcfb4c0f6486e0dbc5e4b46f634df299461e993
+DIST firefox-129.0.2-an.xpi 508140 BLAKE2B adc0f1e1ee5cf8687dac9718755a76618ad5930a7b0f7d786301cbce1fda1466bdf38c017dc553da4fcd5659395a5b9f78e2278edf7bffd668aa7a3aecf2c105 SHA512 2fd2c74cbe730e70164abba5e71c1716680d6f212206ade7a3b01b2477c1a46ae27613fec24aaf3a82a134f48526df673b8e0cf4e0d0c462a7d06de9e12769ea
+DIST firefox-129.0.2-ar.xpi 613068 BLAKE2B ddbf66eb5f028574e6c3acd41df3b809278f93bbb207c4bee3515d103b107f8eeea4be01e1200d97f2c1c8229a179502e93e3e702f43b80ce1340b04fc9646ca SHA512 74e5930683d2497a4390402cb4b50feb0ebed477600378207c0f21cc08d6bfe618182e084cc0a0807488dee44bbdb6cb1f96644115ff2e80e203cf5522f0be46
+DIST firefox-129.0.2-ast.xpi 498515 BLAKE2B 54a1cd9538e733cdba215c586315ca6d1d827508ff465d29b11d97505fe56d1c031a9a4e7bfa2cf4c5d507590f10b3a6e323819942ab5dd860a38abf518e77a5 SHA512 bad78d104010dc0c500f0d614ce6a5423427615093443743a1e5cec96fa621a0304974ae4a7852078107e2141db82530d530de46a899b67c128d40983331eaf5
+DIST firefox-129.0.2-az.xpi 492952 BLAKE2B 83ad3920ce3f671eb1a07ca372eb9d3553d10e31560142289601a632ec6a9c85622f06e3b6ba3cd0ea0b6b51a471fb387ed02fa4723cb9465117ddde5ab6de30 SHA512 65ae14efaf5b4147cebaf621e7ca64fe4c2ca68b220d599edf478e3142aab48cc3b0056c65ce6a10a48a159bb53fe12e4141a0b2cdce385f48fc8a4050ad5fc5
+DIST firefox-129.0.2-be.xpi 718021 BLAKE2B e22bac86b86ff482575522b284429a46c2887554543a86a6f933850510bd27e488624549e491babecf6bb04a279e06fe6ba353fa9b9eff93bb84cf7faeda005b SHA512 b776a9ec94946bb4623320fbd67bc5803ae91530fdfb33e246c64943da9cb4632c15800172e6e3722097053143c224f1b0bcb1e7aff4f022b44661818d01cd65
+DIST firefox-129.0.2-bg.xpi 624118 BLAKE2B 8b56549ed6e49bf1ab2ed6a4471090f94e31ae9edbdfea25db9819cb7df7e3a97e5339773e52e5d04add1d32d34281ccdada4a5f2905d30b69bf52bddeb23986 SHA512 28c56a5235cf31f2124f6ebc1335f246aaf7a0f4eab3aea3eeed885bcfd91783bd3e3ccde31db8b0fb2f0df01c8ad2dacbafc16ac340ace807cf3c3dd88b34f2
+DIST firefox-129.0.2-bn.xpi 583741 BLAKE2B 6e6fe8454b9c58f2348f74eaca2e89f58a8976de40364c9b6542e45eeaf1a466f39b99951bb769be4cc45ad08b2d4719a609f8cb0cff94d0df045ba77940632d SHA512 85eb05395d93b49d9c040c9496464e2078ffa0a042fe89dafefa90a9a677f0f677bef6bfdba1ab223108684d28e99c5e889d9170dfe776f56fa2ac5524a99db6
+DIST firefox-129.0.2-br.xpi 591235 BLAKE2B 9d6d7bea067c76f222f5e49c61f00bdb6b952faa523154ff06c85acde6e4209d7a31a36654366e16faaa0f7ef33608680d0b2bc1dfc45d9ef86c34d2bd397b7c SHA512 19f4824e17cba0a6e5712244bd42ed1f2b777964d4b72c0306fb92b2b20e850d824c994a0a7c050327500451d82fe61aa570deb9233f37eacb3bdff3e9c33855
+DIST firefox-129.0.2-bs.xpi 504177 BLAKE2B e417c2b894ffbb60b63dbb8f22dc4e2cb9848fa75c249bd7277c883dffc172e0acdfc9dd67cfb90223c6f3026a62f71c16527c63ecf1693813e08151159b84ac SHA512 094d48128f395bb2688521e9282bcf4378fa79c9bcd937b83a25c6f5dc27c95fda9d29f4b4cd305c8789afe9e937b9c89466fda8ea99715f03bd6db60ce256ae
+DIST firefox-129.0.2-ca-valencia.xpi 548461 BLAKE2B c86806de8835c63ac5e6a3a4ffa38075693f91fde3b558409614513de91b89cf9b49c534c8202ecaca53053e44587c7b8b7dedb68666a1e89ec34eaf66ba9179 SHA512 b0ad69de3dd01defc1f3217749dd29ac7bb3ab50e051bbbcf14f5a6bfabed6ab62625794a11ba6528f18de5faa03ae0d7df3d3c465c1416cb0b1b4acccbbcc44
+DIST firefox-129.0.2-ca.xpi 599347 BLAKE2B 594a99715b86a2066f76e51e4e7760efac00cfe8050bdc2ec798e0e61a29e442dae32d91db36655f0f1cc84b797ac1c010d09c70ae49028f1218fc6a692733ef SHA512 4e41301c4e11fbbe6f983fab2a378ed6679acc8b7d31e1cc8bc84a230c16a37e3f45056d8767fbd491b4f4a0bdfc2a83ff1e50a440259de85207ff9d56362dd9
+DIST firefox-129.0.2-cak.xpi 595436 BLAKE2B 8a182a7d11939696750045e19cb2f8e8ff2a00ece338aa1c9a7ed4cebc343ab88bcea4cc371cef733bbe3c8f5e8345c7632bc03df867047386e9e56dfd3600e8 SHA512 c6fd7be327f6240c539ee8d4250d4f16d1ed449248db76a577e4432724acb11929bdf610584e2d96264ffdd8788d34f269422907a75a55353e5e1b4e51892512
+DIST firefox-129.0.2-cs.xpi 662054 BLAKE2B 0e4e3deaa2c06544488a06d34ea82b5e1f73b31379106ec6ffffa310ca1bb2f583f4b97255968a8aca22e9593d2e23800dbe49e3e0707a2d4de2a6c251dacfda SHA512 0c534bf0b7998fd54b61a8d0e6e708a93ea03ca18cbd2159bff4ce79753621f2ae6463842c6e7cda417f756dfdae9e1367df9aa6095d5796eb763003ee435aef
+DIST firefox-129.0.2-cy.xpi 626693 BLAKE2B 96ddcf5a5a3e29f8f84c7f047593df0c3f2507d5dec284c951da23e613555a96e1304cd7b380e9f1f9f4ccfbd09f388541803620c0d7d7a44fd1ce9d23e59f74 SHA512 c1a7f9e37722ca78835b935b583625314e12709569bff853c62c175175f5dc1cf97afe2062e1f8e429417324ec6314d3e787debccb605f7bb95bf6d10bf1b32b
+DIST firefox-129.0.2-da.xpi 615347 BLAKE2B eee497614c456e8d70383c007ed76df60aeb52a49e95caba86877a1ec4eb5e552027470fe026b455cfce73872b8fd652c5462a20e280325d56aa2f72fb434ee8 SHA512 32faa5ed2b84538192323fcc641e3940ec083c7ac363073bb877baa8e102fdf771ee2c362f206d1a6f6c9efbc011654d2f84d8c2cc341045b978af795a01217a
+DIST firefox-129.0.2-de.xpi 636705 BLAKE2B e70024becf96f155f6c3989c9283613be997077994ceaa10ce6a3385a903eb1ac0b5c3b913c144eeb1cc47c1116bec0c211f71652267942dd667fa698fa15551 SHA512 3f0c8fe08565f5e2325fcb7e984ab665bfd4a772bd374b57c233366b8b04eb3c0ab2c38f91e0ceea67e01ea13b6a8368da4a48d906764b030a74f502afdd5fe8
+DIST firefox-129.0.2-dsb.xpi 653385 BLAKE2B 2607ad2b81e1140d28a89712d04ac8b451d719ba1eb217be801b39d84e3305b3ce4b7afc76836851fd5b7280ddf6c6511621959ac7da00e646bca5f35f7f770f SHA512 dec6c6e8376c7df40baf7b5d10f04dbbcc9c86533162792dfc00c763a10b204f90c520158b7608fc601b23495815b7961c97d69dcb632c1cc8a8192eb1ed23c7
+DIST firefox-129.0.2-el.xpi 735565 BLAKE2B b177f6764370ee7b1f754afa5a0e124d8b5ca5dd74bd97d5a1fd4b1278117d89b2c123fc894fa2b1cb9fd0b29d2e8ed9ba80127d63740b4a176d4cdfcb110bd0 SHA512 28b7f1dcf724af7f41011d535052a6b2b9969a4411b8ae12c7b11e2955cd7966e9b64f97d381f8bd0a7b32a0245ecd44136024956015a3d3864c51a38855933a
+DIST firefox-129.0.2-en-CA.xpi 587134 BLAKE2B a582bebf94a1dc822038aba8733dc48b9c7a1732c09dfa51f9eb68f8b3e1e4c55dd0a364945b1f2f85dca8b35ede2ae7af93ea6fa94227e93e4b831cf43c29a0 SHA512 480f6ebb03438a95da52d62803acb3b9a03c78d401ebd4cd111f1fa274ee0baa63e9b76f5db6ec39629105efde785eb78d8816c3a0294ab436fef87022ccd7de
+DIST firefox-129.0.2-en-GB.xpi 587533 BLAKE2B 2ababdc7f8bdd649ed1e30dcefd97d0d1674e121afb89fd4299da9958b3fc78c6996486bcd4b6bacd5c34ad3682b7e69bd7e1c5456c35fec22101de7e7ef8b1d SHA512 cf5aba2c5d59e52443e0b3cfc68e16c72765099e7becb5215a4d50b183d1809e09190c943cb403fd187ec3f3385d9d06b09a2be70af66d68d1a0eeb7d9e17d40
+DIST firefox-129.0.2-eo.xpi 616014 BLAKE2B 0fe77a783001266b53c6a107a23bf0bf2a16b185df7d29e6822a7bb56b2219bd026e773f9f13f83d7088f1738538f4ed0093011896a70a7d0c1bf61030504b43 SHA512 c7f0831ed838c3320a3e1e4a518fc2f45844d9f0ecfe374d9427651f29f0c4d8e355e1e76efa2bb09f9f8d79e0bbfc943023b2590a5b09ac5aa4c2433af28af0
+DIST firefox-129.0.2-es-AR.xpi 630372 BLAKE2B 612cdecd44012d6b2b9eb646fe362b5da8047cab8e36adb6c1cac7f831f4843a07cd06d5657fa0f6e1bf62d82d3fdc04b592ff79cf7831aac27fd6b1133b5ac4 SHA512 950b21b44fc0c1810e423dfe356a172affe4cc2e59e33d8b1439ab6ef8799861e6cb92a49a2fd32fe43581e9254e919de3e6ddb3abde25b820610ad493045592
+DIST firefox-129.0.2-es-CL.xpi 629632 BLAKE2B dbf61deb0420db01629d1ff7c33fe527cbdee558bd2a05a606e40ad2a9fb7eb4d3943fb6c13e79264dedce59404d431ca766a3b0dbd9183cb655e9ab443288e9 SHA512 ba5dbd97648c80a7a9188808d97e1dae7c6e68fc8a40b7aa4fc76ec30b7fa955f8b559ea5081cb3653e8308ca765c9a08cf1170de5425849f36c0452b7dc815a
+DIST firefox-129.0.2-es-ES.xpi 622861 BLAKE2B 7b513f286bf2c8876d33ea0852a740a283c2139dc01c3801f3b5bb57d1be5e8ba0763593701d25723882158520faece622cd8237b7cf54aa28d815bc8187b277 SHA512 16625b063c1722342a92cdd3b13790c1300aadedf2616652e1627c4412b60c5347eb9c6b1cbc13f7e274349972cb083ec6105d136467c36bad6029badf20f331
+DIST firefox-129.0.2-es-MX.xpi 611607 BLAKE2B 09f181eecb37709e25cfb03e843aa640c109a799043f6efc8e1f386866afbee750db6b7835d67c53d5beab150153409a28dfc506221337a75cc0bed9929f013b SHA512 5e43787ff9b5e0190a8fbf8b1f60d38bcde9cd6b6fbc4b4bb264e53b61ae3052fbc7f9257d64df5ff4089bc04727b963d8fa6048ac158c6847f55a84d7cdfc37
+DIST firefox-129.0.2-et.xpi 541836 BLAKE2B 4c6ba9e7df79bfb79eea47bb111b38b42bc1ec76c23fcaac1819fbe4e86fe039ceae66ea3724b614889504d8148afc0e1126e2e0104f377dffc3c246e003fc03 SHA512 0525accf0a1a8c00d1c01747685c9f1095ce85aa07fc6cb15048a111666840d96aac8e9091155a90e78f01cab1614d578681c1a13ceb0b59215655765eb10926
+DIST firefox-129.0.2-eu.xpi 601674 BLAKE2B 434e332af110adaac2af24c2a84c802e0577f2dca85b537495d89acbbc198827f96455b084ba54a9570596856c370230c36ac9b494afccc0c10204eb0473b1d7 SHA512 30f9ae4c8dd5ecfeb3331166c4e84a5fa2658c68a0315e5a5dbf5d8dd6b2ac2255f9eb4f6495731710f981f11eac0a7a865c8235899a89a1da2622befbd23728
+DIST firefox-129.0.2-fa.xpi 592246 BLAKE2B 27b495e6e0282713850512725a3511f8ccb834561641726dcdbe688cd3a6210e474ac926ce8b8849fadc417b925d31b5e12a77b649977cf7c62f0081ad6a1172 SHA512 3d246a3f20e170cb6d4958ab208f8ffc87db9f8410b98f3d865d562cb33020c577d437546b1e5745518184c65ae771dfb3c460ababe2e93e8e7ae871476c1926
+DIST firefox-129.0.2-ff.xpi 478244 BLAKE2B b581a4e5f72ba76b9c0c9aa00df4dccdbe386e3ef038f48ca24de6dcf8adb68d3f67be573fe3ffbc9f2bda5daa18c1add5ef84e86482cd6f14e936dc29b7ed55 SHA512 0aa5656563657a5693d1238d5cf34e1040a78dffeeb96e3c86833acd41b97e9d43451e64cda33b88f0f497ba30f50e025adf7b42233a49d437996e3bce787605
+DIST firefox-129.0.2-fi.xpi 610121 BLAKE2B 256b90bc809dba3ffd6d0929b94da8d06290b9b1d7c673139f2177d30debcf7fd10064fc871ce4eac5dcc33d2b03476e5a00f93ecf4ce784e9b79315a2db12a8 SHA512 a5c0a155205d5f1f543f6c007179431cf9314b9aa52fef31fb44b7fe5ba4c0d9c2c3ae96a7f49a4e3f3727e7b1f4bebad6e9c1d50ffcaf4957cecdada82e6671
+DIST firefox-129.0.2-fr.xpi 643424 BLAKE2B 537cc9cfca9611bc46daa6521386953af9f1e5e862989339dc5c4ee04c56ef7a290e872b4ee15f9d9f0e5dc5be87a87b7b77d4f6a4c2fb2338eabfc8713a29d0 SHA512 b3518c6b4c8863565f480b8a59c29cede1173a391e53587b63956458ab2be4e7f8f71cccb5b15ce86d522a5b438b9ad5854412005b1a764bf2bdda60ced3ea03
+DIST firefox-129.0.2-fur.xpi 635777 BLAKE2B fb72de84ed3c3fea824bae11245346178920b2832d7e69a1d82005515a456ff39a3fcab80e78ce17cd4c64baf0e0b1f259cf24a11f68921d0fdcd39ba760bf63 SHA512 2cf70e3426f150cea4b898072479c70b2fbbd8c047cb3d35e69afa61d728780965c6596c2a73840d092eeffa2d45fbf0a30d1e5f9fe79915326a549ccc64eb7b
+DIST firefox-129.0.2-fy-NL.xpi 626038 BLAKE2B e01b2c023b59df1281571f1250887513bd596fe07417f6975a119720f429a2f8747b77af6a06d58e5113c07b0177e852c74ac87cd36687b2ea3e7350b0e2a9c1 SHA512 a3217bda6d92e636c2fe8eeeeee5a6691c42a37c6974e1ba50609caf65c216f8581d607a7b331dd9779e50a887576d027c193d6fe2c6c3e586274b66d61963e4
+DIST firefox-129.0.2-ga-IE.xpi 473204 BLAKE2B 602e304bf0adf879cdd85eaec1685cf9c09e4703076834dc0d43f70bf54d23d238ceb3550cf8efb6fdaf2b78c005eca2be3ddc41e6f7bca222bfae791c22691f SHA512 effa0e3a94737410dd6be9d99073a91e9b6ea192df921d5133f794a3c2ae6ae3d592f786d5a25103980ee706ea2d286848b0df03f4e7e4e6d4758d274fce9af6
+DIST firefox-129.0.2-gd.xpi 598879 BLAKE2B 4b56389094be8b36dbe7081ce89d15cd99b173398f54ee4f0053cf7908e4a38f7d0435f1f09a497f45c8e1ac808ce8ead3c1e6b3e8f218f9d225b94a8c851d8b SHA512 76f1fc407d5d9099e878f4942d6906819d7f84905110947538f8b03a05e1f8d1fbc9f5730b2ceb0f2d7a3c39f423b4f1f139f2053cee5d2b88de9e0e00dd0e9f
+DIST firefox-129.0.2-gl.xpi 606464 BLAKE2B b61b1d5ce6ee9d5c7ec3541954cfbb48b9218ceba40fcc444fba5138f6315c2d80010e06080895b67d30db99c739c188e7c0e292f572bdb2f8236b1e990a608b SHA512 df180c4ea0fb74660784d2093c434bb7daaa2b1caff80da8100798deb488943c11f280bd971d0ea6cf1cccc48b7639432a3d6839e5ccf854bb3f002156cc7275
+DIST firefox-129.0.2-gn.xpi 640317 BLAKE2B 329bc9791d633ba953125b613607f9821d64dcdfe6d797b61b0d5df77b029e13a8eee9acd734bc2e0023869c8ee55c1dc55da037b01d8bd36a46466f4b5eaaf3 SHA512 f1b2dafa518cb137a3f54c943939b9a3a00bfd5b691f4872fc25025e0fc38d28bc84011ba543594f12a43d7c686851137436cd6972ec1ee6a4e0d7c03374db01
+DIST firefox-129.0.2-gu-IN.xpi 529505 BLAKE2B 3dd05f79ddc2b22a0b51f44c859fded8d58b7345c286f2bd7a146f14e62f8f18a0fce7f0ff44e536c27e17dd4df79052d25c7acbffeb0da768d0df5fa076ffc9 SHA512 d1f2bc03e66a6b3924b1b11bc6b294b2c76e162e4cabd396c31c7cf30637859a023980d7df8469781f4dc339b1251490f3b5fffba862cdb362242d74e82e8049
+DIST firefox-129.0.2-he.xpi 634010 BLAKE2B 328aa5fad81bf432cfe63273539ca40b3664c5bda0359f13e013c8eeba9b8c93f677bacbcdf664d8071959c021772bc8ed4e955eee066efd5d751d1054554e6f SHA512 27ea57b36bcb9962588073bb731ead7c92f27e14cb61623af7f93964bc5354457fa80994829a4bdf5e5d88c49c82c8433ab9869f74db50a803e160f627a6e190
+DIST firefox-129.0.2-hi-IN.xpi 568984 BLAKE2B 59e82720a05d5c2756d3111e733ef186197f89af8cfafac603f0b48394ab21e9a6f79755bba1f5d7a6dab277847fc0304c076b8f0cdf07f541e4cab3a4eec4f6 SHA512 52a45421c9a9e9e567c90497acff8cfa8f6f32c45bb63ccd36a1a90d13c7b3efd551fed1d2f51582f19aaf4c9ab7a9622a66ec018642481c17d73268cf4720d3
+DIST firefox-129.0.2-hr.xpi 610559 BLAKE2B 36df4131488e47e87d1db02717aee1791511a898e96f0dd106083c539fea96ee8eabf24459b60e584a5cbd1a5347e5246709372c80006b6e498262d0d149d997 SHA512 db5204803ad13814be6180fece34491e61e88c7646c73cfcaa692bf0150a6f382548b4f5f93a26587ab0d8e8b2c1b97e4e7bf48e5b3e27a2c5de65258cf261d4
+DIST firefox-129.0.2-hsb.xpi 649236 BLAKE2B 16c4eee1f137345ff2d412e958c605f7f9063d53e82460c09be6b2f49bd81b976c7a416a22befaf184aeccf1f08382dd002987282cb03a5673c36850f4968e53 SHA512 fe0b0f41b4d76079746928ebfdce6bf785a8c555d28e0bc215ad711c9a9d2d48a61b8c1b4afd6b5603c2d5bf4818b49506fb04a48935c74b5180af75fee57014
+DIST firefox-129.0.2-hu.xpi 651246 BLAKE2B f843750f92ab3d2f91ade5720a94a1c6e4a2d89e613fa6f13b46f84ffad1c38c39a6b70d59e904496fb1ab3d4f9d48d26719d835f0dfe1e2f0fda06bcb45630f SHA512 fbaa97232ee5a4c2460f658a780f72a70b1038e0a71e4bef3b5d25cc6c87c1d79c46742c809459d610a66440864678e429676d5947b5075c97d216498f18fbeb
+DIST firefox-129.0.2-hy-AM.xpi 653898 BLAKE2B 893d7f07e8fe9afc49d746efcfecaaf1cd3cf04b3f2fda58393608c27e612d66c98b7a863056733cc7f7771c6b477db3b0fffd8ee1287f9609b85d33afa5603c SHA512 f7abeb35ee4fe1a9e3fe0c7e2e3db40295f0b814fbaa0c27ec82ca21b081c95fb7b01a91dc9cd32fdad3903c5ecbef392ec75b9bfb666b8b2c5429225a3b774a
+DIST firefox-129.0.2-ia.xpi 613530 BLAKE2B bce6e4419e1636dff862df8c619acf395cb173ea05129bbdcadd51824f0eb54cc9ae8a0c3c2aabecf6f1b2bc2189b8df5551af9b75d29b534cc0f35ab5e9ae17 SHA512 acc9004a0cbdda8597c26d3d9feedb1695db497c53a691fb1697ae2aa7ab75648724953f465a705bf858ebde98c97539d2f13899926bfa86d79e8b3e94b58f18
+DIST firefox-129.0.2-id.xpi 585303 BLAKE2B 986abc7e3a328c44b6426f9b699f918698e3c3d981c79ccc42687ba6681c19ad581c69dfc01035667c8319534fb12f341d3902c5b86f7fe9cfa4cc9ade61e798 SHA512 3b8129415e31575758609813837ccb2793ddc5ed9c9900d320c47b889aaec1cbd623d8cbb6c22b59f4924426b1b0db159b057ce7e8b97467118f38ff978aa88b
+DIST firefox-129.0.2-is.xpi 619021 BLAKE2B cc0d9b5327640d8e3f2e0883064750e260be4032212802bbe6ddd4f98d87488430d632c8a6245910e6c6b95049bc423ec5301be96673e8464c96ae90d88cb066 SHA512 410d5177e672d970effe47e67cf1c06b44c1c0c1bbb891a66797b21c4a1f02592d2a427d16da519b768d6751c6eca7ec51ca96323ea58749d7e9b28ff0c501b8
+DIST firefox-129.0.2-it.xpi 569523 BLAKE2B e7f84823502e820bcfdac83c5f121d50ecb7f42f98d670fda0183c162bb5f09694985dc5c6e291158ec7609b175a0e36a22c42dd3891e5a2888312fde97fe73e SHA512 53f66c2bca67a8fb8d7e118da13fd2c4f1ffdf56d1e9fd620607893d97bfa86799fd8a09051fcfedda8327004f9b3ae3e0f46de01ca6ba441946743015858967
+DIST firefox-129.0.2-ja.xpi 679730 BLAKE2B 3c4cc3dc189dc753cff8b428e43ace1f0d40a9b8c8bf2eac183c7bb8afe8d2c05da932c7da480ebcab8187f9f98dafc1827eef3401a80497a4c6fd0690ba5939 SHA512 b69eeec25e535d4a4e715fe5fa2c707ce445c17294bf4940f71fd08adb514bb9def8a7034eb7ad0b542c8320ab07a246d30a59416a1ee9afda1e3181758a80e0
+DIST firefox-129.0.2-ka.xpi 663169 BLAKE2B 21026eb13d85cf0011468af045d08c464469a8772ae63a2e053743e13cf9dc6c9c25b195db2eed32566ebd59f61c62c640734912342dd924a01ce779553c091a SHA512 9e8dc5dd717aad83d0e8bd8ee8a8690c749e5dc523b6e595c9c11a13a2bc09b0e82b53a0f333578a8cc4ed71be91be66c9881724ad8b8d1767565ecfa6e23eca
+DIST firefox-129.0.2-kab.xpi 612868 BLAKE2B 9a55c2bd0643e4ab94b19921be64578cff9b7c5549b616c3b9c61e5c837eba55f9cb8bcc60ed8e90eaddc74e69c94ab60dbf050acd3afe88e4dda18dd9c5c5c7 SHA512 5eabf2e4672d85770a8b1c55968698ad17cf8c781e47f1dc7c87ae98b374b230d0e6a4640a7fdfcdf31520a2077c52b6f96e4fd620acd0b0ac10ff6286eb1851
+DIST firefox-129.0.2-kk.xpi 710250 BLAKE2B 2fd68dffee9d8e20e61e454081499f80c00a33db60b2064d0c76dea055de2c0cf444d80b8bd3ec995974add95b0d2288b7f331bb703fdd438ea4e18cc409fef6 SHA512 6ab175135effea5363f3d4cfb78f90ce0295f904d7acb4609444f4d70b65caaea2180ee9adf5504a428582e2b8d41a30fab53a29627775de0f03ed6cc94d9054
+DIST firefox-129.0.2-km.xpi 528067 BLAKE2B cf41e4a3a5497bbcaf186318dd5c22d44d37e68763dd8a6dea2a7d6d01585ba057a16c4ce7f3124c8dadd4a37ed484beea8ae9213111cbba2c16bf2798ba8dfb SHA512 e700372c8f4e2422e91aebc1abac5ec022ba547f32a58f8f16fe7e43d9f146e9dfc808af689df46bb47b185c8846b8b2f207b8f6a207a46e4923d62b84bfae26
+DIST firefox-129.0.2-kn.xpi 493379 BLAKE2B 5194fb9db98f7c957b8856dc5f8d14a2ef997300b65d94c6207d0b71fe4eee78c61f468c71f7038531d714bbb1d3d67c2bee76e29115001990a80ef81a7d44a7 SHA512 43e3a51a85cf686dd287cfd9ef21d6c09c2f5458d1ec78ab91a2c5a6f4d42a5994e6c599ae30586e2773aa71e10051784ab564a9bd123c25b8ea1301656832f4
+DIST firefox-129.0.2-ko.xpi 663942 BLAKE2B f80dea58da6b378bd4d7af5dab37a34b9e1c1ac4bfbac5c7bcb09f2ee7df90c33948116771b72869fc4aebea8d1bfcedde2887d29197a271997bbed6bb56a3ec SHA512 81a734c4560e8e47e99ab97d2383a538e474854bc36edf1a6847806d0cc3361901cb3aa48d87a1ec56ed4e31d15979f6d37821cb0483d9e7ee7627a4fd3f2c1d
+DIST firefox-129.0.2-lij.xpi 486304 BLAKE2B ea47a7510f1ca634c9b56e1079cb7250d318ae7de20e7778f163977409c0b22b418b49af694ead337f549121eab869e43d891eed1d0265de3597d876860d57cc SHA512 9f755674201ce66e295e15c21a14d362b37d8528f81dd0375afa8efdaec8eaed559e5a8f8a3056948194296d7f021e4b818f4825b2fcde3cfc7246b495ee07ff
+DIST firefox-129.0.2-lt.xpi 575026 BLAKE2B 548842cdb6a11cb349e3bc43024e66884084391ee8a353e62ad9a6951ad615d6343df97a9bdaf231a6299df07c7c48f7188eba917eb6d5f67101b02462ffa320 SHA512 7ee6467a54cc3c9b656140b25a6baca84b3462074f9a8e41255b5df5f380d69acc881787cfe8f36f67596e766dd4663f0c4b5e9d7ffebb1b5ce5238b996ae331
+DIST firefox-129.0.2-lv.xpi 576570 BLAKE2B 534a289584f456d2280cf088167c854ccaea6c7fac468ef07a3b3f197aa3ff72dd1daee43c28e0bfb3b95329b311c9bb9cefecbc5cffa9bf9dc640ad60e1d277 SHA512 91f4aab26f66880fd65a2caa21056b001759fa4cb6901c97c54d003f3cb05de5251e184cea5b982b24b543e64ab3a434b63de40aa367e9c27ae0106ed54f3674
+DIST firefox-129.0.2-mk.xpi 496027 BLAKE2B 0f3396fabb203c8721e9ce5589adad2d34d43380bd9f109f09fc6ad2437b12e2f3cd5efaf5dcee5a01d50c7ce23022e269d05bc831249053736338af2e89a7f2 SHA512 e2f63b4013df39d7da394a5ed801a79c659698b2f54dc7ca153eae109d61cc25258e2565b79c6f6895c6ec057fbfb8e795f3705aebff31005bdd356d0bb85d67
+DIST firefox-129.0.2-mr.xpi 534260 BLAKE2B bedccfd886d8f074059adfdeb3540aaa1e4ef8d900a25cf08c499d0a90ebfc8540e3d7ded960a9689013b0608d3777716241a7aab7932f77678853aa733abe31 SHA512 26253df7a3c08cc6f76b011fa74a8bbe74061ef8d20924a69def2ff5280867285b1bce3efdf38f859ca2a52117908b35c1e6f7b13510690766ffbe002d74dbff
+DIST firefox-129.0.2-ms.xpi 451904 BLAKE2B c177084b02ba95f42edd38148c6d0591df8d9364984cc69f78cf5ba7efa16aae5b60e42df0b3f45658b50a4a6b75f5b511508e4da71f677cf8486f230738326a SHA512 e84eaab88f4eb015a2e54b2d0db3d4f8cb6c5c13cf427a8e2dea3ed39be83a73d15939eea3c0705eb2b2c1ca6a8173abca4aa535239b78c10a5f7964fff0447a
+DIST firefox-129.0.2-my.xpi 520806 BLAKE2B 36a7e2d49296f4fea575f48aebb662217637a6677fed17d434bb207cfa6d0e2eea5b252296d99d3c0fc9ff32793d6a92d6613c9d4f9d13ad9b35aed56c99780a SHA512 3cf69fcf8bbd29c9009635de66f92cfe4e4d26044122e5275b4d0b150113346bbc249f6db200b3a4b6ec3d251e3c9f42aad7ebca425d1237ef74de84ff4ea9c1
+DIST firefox-129.0.2-nb-NO.xpi 610258 BLAKE2B ed6b7b42ac6e2d2044de9436304b40080020e945b2c9a498308b1b8c8336a3c70087371627acdc2a94c6c705643dd54fcca9466ca5b851fc1cf3f310ec52f688 SHA512 0dc3257d82a4ab1286853f3ee1f27c79bf6b773b1663cc7113372451563912924137eb051f2d7d14ad26b9ea2b84758e393eb3fd2e072edca7d80aec4db86999
+DIST firefox-129.0.2-ne-NP.xpi 516323 BLAKE2B 194334c4eec2973118a01b756e53b773ffd06d6254dffdefc391304908271643a7046f70d8d47a849cbe4bc7661a97f49f9d22d472c0192149beb516ef295c0a SHA512 c4a88c3e6e91993270ad91fa18d409d522cc8246f75dcb7dc94d1b235db2feebdb27770b8f06eee5f3a905f1ac26b580b37ac10e7bebcb8198a62059b01e63f9
+DIST firefox-129.0.2-nl.xpi 619726 BLAKE2B 567e88328c2b9fb1fda7ff00465f006b57c569f95b267b6fe910f000ca124a861c58cf9f680d164502daac5f1493f369e9ba8a8c4dd0ae6458f15693bf78bce5 SHA512 73b9e57e101824f5e433ecd14f8ab2736bf20e80c9807adccba4ac3294fcb7029cb92902025db69938c13e81747e807714cc3c1197417228a37160cf43c07e52
+DIST firefox-129.0.2-nn-NO.xpi 613178 BLAKE2B b9afa26ab2f6b56fac128c38b50d371e7572b5aa48943f956dca1b187c1270c1234c613ac7a4a332ced8b480a966e03f664fb82090f1dc8cb605cc21b3337cfb SHA512 881aab3aed5154dbdb0bf71ad1f01e0c3fbbb834bee358588c2b788b70f11d1d70b342ec1fa36c34be3c70a531a7ee39e872df02fa1d8bc426cac63150a22ced
+DIST firefox-129.0.2-oc.xpi 615153 BLAKE2B 3c8713360925f7f54141fe04c7da07fca7e8288c84ba929e59b55192f04ad23c3893de109ee80b7b90ea6f6b607b10a08cda82a21820c388456324ba0ef4a715 SHA512 ab495530b4cd6785ff26c723d11ee5b7eb7a3e4eb227475d78da64e6c8fe42092164549d912a2278f27c1d06e8e81783e989de8fbd4b5f7ab87641d33b314c3d
+DIST firefox-129.0.2-pa-IN.xpi 694797 BLAKE2B 970555deb5bd18b2ac3e03c1d74f3229573c624f3266478faf8ffa6f773acf0acedb1d361cad5cb9ae7c945848bc7c1c8b3034d6170eca498bd6f4ac29b0f69c SHA512 697349f28fc045388589fb6b7d2143830f269980f09881be80f57d7777bdbd3dee17bfbaffb4c0aff08f4c289d433e120f1359c0121ad762f6aaed254d2487a8
+DIST firefox-129.0.2-pl.xpi 640499 BLAKE2B 6d8e0a5aa78bf901c0e5c145f47e35b6392cabc24c2f8d27369fd6411d292ba46a7b55fea49d087e6cdc5423d3d60f807cfe5e7502c505cf78de4996322af362 SHA512 b8d49babcab1e6fdbe74e34251968ef56d0d780425762f4abab6d918813ad871a4b9ac6456da3b2a55c50a8ebe5bc089e97b19e504f4c1a69dea80671ad9d7d8
+DIST firefox-129.0.2-pt-BR.xpi 624471 BLAKE2B 5b9cd4eb951acafff59f4d20ab6650562efbe0219b4319a045778dba3c440918402bfd39d4fe5cc549ef8e8fc0773b1629cf10eec0bde58d13218cda5e427952 SHA512 434d4247ba064b81e7042371321b5ee24aa0a6af9117fb8e93278bc3eaf3d94a54a653b5eeb178432e4f2be7462ebb2aa63e31a1a9ce5c4791614aa098bc45a1
+DIST firefox-129.0.2-pt-PT.xpi 630804 BLAKE2B faa57d6c4931ac1b2b5303c62bc2769a5a6e4d6983d004bc6f9ffe6a1c83490ba26b7d3f3e2522df0541f2d6d707208930d7e4799adc0671ce005531502dfb0a SHA512 f27bf80dd6fa4d72517d2fb14a32d54739c1ba9e5a4ed9b8de8051768d7893cb1d52c6df91b4801eaefe5e7d8650462d2439c29d0ef462bb238b1735dd12aef2
+DIST firefox-129.0.2-rm.xpi 620380 BLAKE2B 1334b9e1bf97cfdbf172ce61819d20162082fbf70cae0d660da3290cc93319ea77b0336beba87ce4a99ff8d3b62630f011e6ac7aca9ececeb653a33168288999 SHA512 61b7beb2cb8e53969eb0b04a92a93b921b7b290dcb84dc94e1c812ea6677a34678a7d945683c3726c1144996f0bc1f96cdd23ee164e84d70aeaa1a56843458b0
+DIST firefox-129.0.2-ro.xpi 552134 BLAKE2B 9b1b3f87cf09eaec5724424fe3eddda56d0bb911cef968869c3c134453b53aebe9da7828cf564bd78be295b82d62fcd4439eaba74458273d69c9eb03b2ff3679 SHA512 ab48d4683678fa6cf518c5e316e7b88f82dd36f5baa1e8bb17eca151cac7660358cf297eaaa6c6c5c3fc1827fa493f1bf4c779899678abf485f354a4621df17e
+DIST firefox-129.0.2-ru.xpi 722866 BLAKE2B cf002afc7113d20f2dd985ee6f8de0ba649a70d751d496fff4b947659cf4a1e3224ef193e4230bd0a72293f205dce55c11c8ce703485b0456033667353b8ebda SHA512 bd13f63a35a48b6107fd0920258a4f6bc6203dab6715357792ba11bf57f423794245c9af094c21f8a1dc32577b80fbb5fecb1e87d0289c56492832f96640f485
+DIST firefox-129.0.2-sc.xpi 590060 BLAKE2B 0dae163fe3e8e025eaa7c4b71e555b0bb4cd90745921f2edc4f03f7194abf3b5c5eec3145cb0ca675111718a077a1d224c6cbb244e0ee5583ecc170404a8cb57 SHA512 2acc8855bb8461a6d0d63773322aef491eba4435de01396f8628cf493aec2429d953d07afeeb59e012eb73f4c43fef10607c08aedbc74db333025394f82cc107
+DIST firefox-129.0.2-sco.xpi 513490 BLAKE2B f88ee1709563d75e42e0047499251e493b8d8efab37fcb873f2f6df18b82d1f4cbe1ceabf40b8ca5e7cde555f0c8e67dcc71c1c3fb5211be9d906d5d824bb02d SHA512 383be0e75a23d44ea3811727cd26eb0b3ee4869573505c72e934b55cfdf60259fce770715664d02eef95916aaae15d11ad05a302b1c2f333ccb58162020aaeba
+DIST firefox-129.0.2-si.xpi 615439 BLAKE2B 728946f784cc4168e658e795f1e0a285fb3a3af7dafc8d466ae95c796e8999c31399fcd7cc4ab821c88fcacb1aa53f257fafa99b3eb456cab74048a856301896 SHA512 f5fcf889c0306b42be73e0b58a2ef2c82164465537e679668cea68c6d2dd85dbf7f156246768537a43bcf428ad61a9d7dbe89e6b9f245b9bd57360ddf4c3419f
+DIST firefox-129.0.2-sk.xpi 654952 BLAKE2B 32df4c74074abddcfba968f58049256855224bfabf7e930239c7f69658daf4874926f4e58bed4f79ec0a6da61f370d9d4fc41711fc836ae3589ae591be84d6df SHA512 67a0bfb234d11409f818112f497ecc0f9d67a018bc619ff493ea4133996e8b855749ffd66f8bda6385d423d05d08e1bf2785074853a0af23fac0fd5f550180a8
+DIST firefox-129.0.2-skr.xpi 710326 BLAKE2B b54066e96898f8f06196ddbfe9cd9fbb234a96e3dd13c77dbd227997ae78e57a5702bf771c6e57e7e1b27a8fdfbafa24a4d02620a9b176186c624cbff8729b4a SHA512 7e607acfe2c399f4d71b7ebeb59cc7ae1180312f446f36db2009df700c7cd1f776dac005c7b146e14a6e9a981e195230010841e1eec2274beaa957db8ee6fb8b
+DIST firefox-129.0.2-sl.xpi 619644 BLAKE2B 437264d28844f079f4c19d2c2b3fb4515b1d1fe138cd6138a16099ef2ea194af82f5caec2c2b04e34a43f6dd3b76d73be356a248cfa041f721857c9a18367d49 SHA512 402ae61672f8b3ed5dfd042d5d79185ccf28175bee2bea39f2c245ab9450f03869e476f6101c2f74747c338c006450a685e5c68e15862b977f68e2bd64e410ae
+DIST firefox-129.0.2-son.xpi 418559 BLAKE2B bf32b38c94dcb9a80c269bdc254de65882409e7cce30d235fb75fd6ae5cb2aa732cbdbbce35e39cbcf021abdda037d3a19061a8152be8820e75091d14c7da92b SHA512 08ab9d79269b532eda8256f1ae68c5b20262eb9277e075e59af8dee0b5a356a220d187e4a9561ff01f1b9843031751e23811f746491278d16d8d1f489d8d860e
+DIST firefox-129.0.2-sq.xpi 639122 BLAKE2B fb2b868042dc6c68159351e9bb44073a7bc0b3fe994e1354957344f182d7ba97c8114198c6481a279f12df23f30509f85e61ea7c6edd6ddf099784b920f99102 SHA512 6f745cb69f3416c80b31d9e843cbc78fcea46eb446513ac326882db7c1ce0ba8889722fd8ca41d59db09e80cc2068510425a7d336e9ace4239047a849d681fb0
+DIST firefox-129.0.2-sr.xpi 641701 BLAKE2B 717330d7ea4ee42b3b4abfa5d0ee15f8173e96efcedee7882acc992c4a8f0b7ac72c10544bc8258d77bc699a8afb13330080cc6bae25464d86fc6356c075f186 SHA512 93a8939ed828a45cf880914bc6f0f372d4c65affa6c051a254439e2fd99b442c321fc5af1d5863ced2852cf90e77bf3003bc8e15c6c3a54218925df340212080
+DIST firefox-129.0.2-sv-SE.xpi 621421 BLAKE2B 77b754cedfc3fa93090e0cfa8318ef587f4af2d132f55637ad444c781050589c5847cd77691c8c63a8c509fa8bd7684f395470baddd0bbf303efd890e64e10db SHA512 e68f327c42b42f092d6421e385546fa0fbbbdd6c7364480adf351147f8b0a62151f9bead892721fbc26eecc407d742126524508a113b5bab602b667fa741884b
+DIST firefox-129.0.2-szl.xpi 528581 BLAKE2B d3d1bdd55c25aa165e4f724c35cf3920122710de1c3673ab01f7a996a0a1f04db5118607cf14e44f07436b234505967055b15f9206d1c148fb1760e118a5a88f SHA512 c33b150d96a42cce1f9822eb6118ae5e3166f1e05cadfbc376b56c248deb2abcadf133af222ecd8c5f98174cd5276bc15ad3c03c6b19dda5b0aa05d47de4f4f2
+DIST firefox-129.0.2-ta.xpi 509682 BLAKE2B 279282cea6c447eb02947e87580ae9acdda87b67af6b9bbae012397f01ebee0d4072fc292580fdb5a42256ef33257a65882775ddba2dbfd6a3e4101ee2336fd9 SHA512 ee078240075a8b37e177a94038f80abccdd39b031032779695cee5bca0304037b033f4b8fc3a1656c5967a625147f0c9b1bd519f32e08a9d24ea503ded66a969
+DIST firefox-129.0.2-te.xpi 563248 BLAKE2B a4f05d5d829c1f29609ca1ccdb219127cbaba2372a791cb7b48d9eaf934ff085f5bea584a885f815ab469f3600320ef569d07354ee0bf8f06e2ac05d215a6e8b SHA512 3a2393007b8903749d1df97018e2fb743ceff672290ad482dcc8a71e57c3042d2283bc858493ca54c1ede421cd648a7b57fd472011e8ac460c89683eba57e6af
+DIST firefox-129.0.2-th.xpi 700411 BLAKE2B dc416a97d2e7ab328d85a84ffb09e8402785c2f0a5efce82a1da830ce74f0f00f0870aab57cf3a972a1d0ee5d98a25aea10138f985db5b6ab9d348bd410aeeed SHA512 0740d1aee822a7e0b009dfdfdd6c3332fc50925ff78a3406ddd62d38a5f1ba0606e35a79d82c517b8738cf02b5130d522ec573981b9ba66e9a9a3fe71d8c7801
+DIST firefox-129.0.2-tl.xpi 536470 BLAKE2B a3deda14d38464f39490f4de574ff4ede856ffa2cefa591b5bd91fec7a0ad51257dad13570a73ce11612d07d4c3aca3c4a2d24b9f441e1c4fc9a215dc15fc9e5 SHA512 cb43c941f0bff3263ffbc75b43d27d17c4959be4813069970bb2bd5dafe4b08ba340d04b6cd726fc9e8130cda93b0c66b354874f8558722387a0d5a2851b1db1
+DIST firefox-129.0.2-tr.xpi 634872 BLAKE2B 57f4ab646ad0a00f7d63494a4e18c22ccabed44204a9c39a963c2b445d3510beabdd2e331517a24a136dc6efdfd64ac0402cc73c6fdaa338dfd7b1e48fec2259 SHA512 ed0ccb71b3bc199d4fe6ba9ef096f6a678238f8b639a9be474d1d4d29feac143e5db213e4a72b4cebef009ab2ccecb3c15fad1f9feeba169e36b45ebfcc77db6
+DIST firefox-129.0.2-trs.xpi 506190 BLAKE2B b4f901835dfcd58ef4ba0b374d2d94db4543f69808ba47da3e187c58397421a208d47aaca364552174f352bbbc26f9bbb58a5a1aa903d2a0f0ed95ec96c9cc9f SHA512 deecdd06993e213e5251dfb3f7634b1c874cafcae3f14a2695a2ac84fc581e421e13dbe6fd8fe7a21fe53be3c74ecb107513a6b9560413f04b8d65b5e3f845fa
+DIST firefox-129.0.2-uk.xpi 709792 BLAKE2B 84becb348a62896de33ba6e0859265f118d0432be5b2df56fad3b531f0347a1816950575a07493b06c4bcf4f58cc43b2d927e4b86f7819769133226643a8a27f SHA512 6e6ea40a4704078f4ba6227216c7acae81f09f571eda7460bff7772dcd6c0cd751bbc1d3fce28c214563ef03d218e9809657bfeec4ce7c408099fe3170acbcdb
+DIST firefox-129.0.2-ur.xpi 562716 BLAKE2B 3c287a614016f36b85688c55b49d40191313c7de63cc1db5b86b3d1b58908ccd00970c2f1e9b90efaa2c2259049b4652754bd0c68b632db8b04b5de3e6d8b577 SHA512 d34071436c9db0f4b65a59f1bb8b96b4c7c102607a1260c14e87cfb2b7d5ec2b25c159c9695742930dbaba731dfbc5f733818fb977fdc430de256abe877cc724
+DIST firefox-129.0.2-uz.xpi 480954 BLAKE2B eee502cfb1804847661e91c10363f44a75441df81b8a87dfb88701ad0783bee9f50f8dd7ec0e8007701103a55275fcea62c9e09d5b4235b53463d210a4d95652 SHA512 57590fd1151f1b890fe2bf4a0a5b97aa2fe52f7fcaa4bc4ecb634ece2446272404de8bad8c5671e16c2a0f9ceed336857d0079aa623cc51ed6c658208c4dec30
+DIST firefox-129.0.2-vi.xpi 658018 BLAKE2B c4270754419a125f05094000afbcfd3cfd4844333a531e03bdc6f81c375f1ec5146a4663ce2c024f26a2fa481a07f1c8d081841781c53af9325b40e590ef5b15 SHA512 6cbbc739e68b211ee93b7601ba0a00543f2664a924c5a6107d1c63b17a60c4dd4cc727e760f5753ffb7643c1a1d62bd519f121103dfbe46289cd95efff747966
+DIST firefox-129.0.2-xh.xpi 419349 BLAKE2B f7e5832c8557d13d02b1afec6da0a277ff1ef3ccd9da50928a345792073f7a08a9d82ec7a01eb9d1513fd10f63b2c8055703db6e994747b7a4779e518f0ad840 SHA512 949f7553b0d50df1b6a8c74b97bc65d0226ef883d0dfcd1f35704bc00f69fe520f42ed854298a3567eeeae4077f9ca50a0ef38d009ddb879525ee832fd903fdd
+DIST firefox-129.0.2-zh-CN.xpi 659755 BLAKE2B 9ae434ddbf71f457f35104064d014915be20139f612867b5da10d028284676e9156fe01e5f66b7df411e521e21a57d4a6d1b005eef675facbe254cc7160a741e SHA512 600b187ea9e2c2b0795052c0dda9bd7ecd9961e3a135fabf5ca656120445d4326c89e6ac8c9905460218a5b85fb0e02d4fd625d055529bccbdf05907c2db04f0
+DIST firefox-129.0.2-zh-TW.xpi 661609 BLAKE2B e93e814e9096baf65c99011b62bbacded0c9820cac8272ea16059e458efb686c71d9ae110d9ae365fdaba15253dce825a3cd884e9d18b84457a25fcb58a7550d SHA512 1cf2a02b4b7d9680d661fb969d1f249f1e4e7b3af16fdeb60f45b6825e893052206331df2b05cb603546601f9ba98f3e840672390c067991d30c6803b1bf78eb
+DIST firefox-129.0.2.source.tar.xz 559547204 BLAKE2B f0c79de337b5c55f9345b21714dd1707e8ca20f66f7ae383026c3737a7a1eeafa5048c188b91cc2ca6089aff944802cf04fcaeed81af7a42218925981c0e5550 SHA512 f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13
+DIST firefox-130-patches-02.tar.xz 25276 BLAKE2B 5269103bde99abbd218717dfe26080db10e5d36f8205d12483b65ea1318c363d3d4176ac2c21adfe32dd0be507d681c98f17a7632e0a068de013e78a1ad6fff0 SHA512 34eab0b92a089c02af97a9d2168ada8e817d80a360c4394386e3666ad266a1812420e19b66770aaa72b6fc52a2654bdd3a120ed09583c4e79764684e0e2dfa29
+DIST firefox-130.0-ach.xpi 467588 BLAKE2B 13924fd0dcc0d0c1a2cf7760ef263d257da8d6f761bd48d503c6e7fa8438996f36f83424383d6b285ed76eb6f284e45eb83ea19dc5892d99e0b5851b4635e4a6 SHA512 fa41e89ab9237b76094b660d439a8100bcf971c81c7f4f628f908978cc22f2018f21fa10a415925ce0f34e00815efb9f55210bc4629b9185035a26beac0ea5f6
+DIST firefox-130.0-af.xpi 420693 BLAKE2B 7e93d3dcf9a7e9ff348fac82174e0b103a6e3d9c6fe57b3500263211cf1e325b701343d01f6117669eef0197d0fb31e75be9ff0e7bbae3f952183ece781c15ad SHA512 3add870cee9dae595b7b4fe7f2e1a122f51ef937090422b7ea5723b87500b0daa7e90ff5e0a9f1e5346dfaf9ed78eda4df64b1dc5d4cc3732e76f626d38551b6
+DIST firefox-130.0-an.xpi 509179 BLAKE2B 1727e110a5328e5cad21a601db2b61318441fa58a4289584fa7dfeeaffc3591b5e14f45342365fab0e34db9210e0ead4b1a1d603b5199fe216a1227db1bf9e91 SHA512 ed9520e7c2825959e5239ecb7e4e56850fcd20abf9f749b8990d77a418aadb691ddef95de0c4193de7351ba59c4c96ad766f07cd19c1b893d3315ec814936617
+DIST firefox-130.0-ar.xpi 615236 BLAKE2B 888a050b002e1e09c1c245d25db64d096e8ed5ac20e2eb024aaa8101713548fd8b13979ac5ee9469326321ec16b238c332c74402054129fb88841a98a6be86b1 SHA512 14aeaf22b05e2574f0699a7abc86e6a96d8c22ba71477fcaac7478a562921c16399518b7007cfe7411efe51c8a0bade72a1e47f6570fa58efc6b99f550da2fdf
+DIST firefox-130.0-ast.xpi 499645 BLAKE2B d9fac1d64e938bb3dad3d9d675a2aeb393682020babed7f95d8258dbe9aa49bbefe6599ed314d50cbc0def96c7398b911f56721c9e4cff98c68151e3655c6464 SHA512 249eb1526ef6c474fde33bb0cf81155e14be8df9a06e1308428e6eee43159c164f32c1fd2b79d3a1c6190ef566bdb5e281a379ede68e189f71c507d8f0a5cd1f
+DIST firefox-130.0-az.xpi 494320 BLAKE2B b1a72494ca10887329f33c56c553e71db44c5fe6974905e3ee5ed2a4189c9f83d9c79e4edb0a96818668964667b24f01741406d925be31c14e4c544fa609a287 SHA512 afae69e0fa446a9b8d710686ece98ed148effe4e1038c863a2342a8d97caacc726547520a12375125a27b3771f9a44cad627a7516bea34d884e685d6612fcf23
+DIST firefox-130.0-be.xpi 726464 BLAKE2B 46a0ea6d367c6c5e0342b64f841344fd9f9b5f43434aa3f1d7cf6abb990d776d00469d40b4e77d53a9e4f35272e61e7e780be815cb9e7b6c7bcf19b328a41d5a SHA512 b8d26bb08317850ba0bcd7405978fabe361f7254b0bf861ece7bcfde09ee04db659817769ccf60db858fa5543bad14cb9cc43abc8070759df4435ebcc05d1b12
+DIST firefox-130.0-bg.xpi 640068 BLAKE2B 597a3613635d6835b9482be4892ac5729585ed0ffe18c07f0981273ada8a2d275f403f9c838a2e5981d98d486842e38bb3f3e2f0b7aeb0cbe09398d286fa6fc7 SHA512 0ea21b50ca8d7314ba0b8ed53c18005f7e203c4f172d55e363ab4d698eec99d346d7dc870d4e8ce0c8bf14c7d31c123c6d28a3861d378d1bdd7454bf512b8c55
+DIST firefox-130.0-bn.xpi 585048 BLAKE2B ed70f1f513f568a435b4d646f38c9a87950b064675f06f5dbdbf2c4b4cee60564a8ce2ecd0bb4d053d605dc10df321f807bad29915df5e06360298d5650ad751 SHA512 6afc892e77f826767f2fae8b3eadac13f63369255f60b4846b25d2b17acf45d63f2add409313be98522c04e6f47730712853bb8e279685a64b9e7073a45ef136
+DIST firefox-130.0-br.xpi 593557 BLAKE2B e52c14887baf248cebb64314e20079751833d6afe78de174c21fa759261b3287d20e2bae8d56d048253e0e54be5b3cceded51782a25c771f5516148017788850 SHA512 08fb191925d131b72529c8af0cffcb83766e63345f9813a0e2d93c4bd19d08e5ed215c4c1c3fb32b10bf12f078f9e16b4a97568c09257d5b359850a3f71002d9
+DIST firefox-130.0-bs.xpi 512747 BLAKE2B 8af1891916cd6b99c32aa0dd3fbe09905e1731bf9937c13f4b1fc35a23eff2367b2bf8eb09b49f17573eb49a43b7b06f026c0ba8df8e3e89dff237fa6390e9c0 SHA512 3a110646d88ec35f769c4f85ddca5e5192eb35b962ac44872deb2a466a740e144a7048da5b8956c66ce006eb07081676e87182101e092f17bc2b7baa089ec838
+DIST firefox-130.0-ca-valencia.xpi 549203 BLAKE2B 857b8c9060c458796e4e3a9d8facae30191bcb8cd4ef8a2ca944785849dcaf4f408299fb70edca5ab3732fd0b4977c2c2404fce9359c0bf29f864173fe78f78e SHA512 938ff218edfc55ccaea9ff8b58c47a24c16f62081bcee88ed902bda79fc66ffefc1a498794c5e5dae1ae6e389b7fd1f1bc31ef599978213b63b9e87be09dda3c
+DIST firefox-130.0-ca.xpi 600852 BLAKE2B c9c22ab619eeebe4a5038cb66132c0494c3c2fd92063ebcf3d37dc595eb1d61165ce929b06050571fe57becb5296f256474f36b102f2f3b00162bec42f621538 SHA512 babf6a445f8cbd1a7067bb3aecf8d7ba98934cafa6d9d4890bc16b4d35034fcfca25355f032c3b3440a9d95d954c7b9e21797abb42ab4a3897cf0ba53766cc89
+DIST firefox-130.0-cak.xpi 596822 BLAKE2B 5206c1d1127c9ea91e7bd1bf3cac96fe32db820d3d845427cda6d143bed2912ab9575eb9a844d4a1df57f1235ce351acaa76d90a381586699df5f0ca00a91b5d SHA512 fa3ea718ae2cec52ac98d57ef45c302e3f53897c2aa607a4b3df5c73cd4a3bac0d7e1c3029bb11a9ed6bae87dc4287cdf7921955ab9a852da1467dc076996b81
+DIST firefox-130.0-cs.xpi 669121 BLAKE2B c8d35d751eb82fc238bed3dd6d37630625883d6817a1c7f74a85d16576f008f6321fd13f2441bde51bd367c58a3b7bc053d260c81a8fc9cb30c458fe959590c3 SHA512 c91bee8febdcb7273263969b1a526017b63a97ab4a88ff4e1ef689cadae39ba4b7afea3258a4160fefffceeb783758ced4626dafd967919a12e899cd50cba36a
+DIST firefox-130.0-cy.xpi 633981 BLAKE2B a595c6c71c270296b29621b68c19988e1862dcf801bce127f3321525934a9844117328de35df579e38d26e3c1a6ac2b5aca4aa1af458d94da1328f4cd3c7bfb8 SHA512 0723f2b44f6a610337083f208866ecb6ccee5e49db41883179c36a0d466c50f4f44d089f6c95dc1cb9f7ef441a1e7a1e3a725ac30d5bfb4b80d072128f797755
+DIST firefox-130.0-da.xpi 622378 BLAKE2B 5cf535014d0f5c09c8a9167dce76e7ce9e322a1f604af76a59fbf1fe54ebdf1aedc192800e2126fce3eee76cb44265aa5ad87050bc7daf52ed4d6fea7ac92f47 SHA512 6dee6ea106ae178d4a0fb418bf83dea35b6d954b3620a4eb1f6442bda3b1f274cc2069c1172b95b5d2bf4d7e6d45e98760f7fec4e41b31ace7f3a29758e1d43c
+DIST firefox-130.0-de.xpi 644003 BLAKE2B 5d6353a1dc0e27bea8f1554eb3452c22c27fc99598e3c55f7a777fc833e966220eca450fe1bc26661f68cfb6011237561387910fe5df94648549f913bb11e41b SHA512 1f43b831c41ffa8651dfd7b02b005db48101ee7a4de61bf8287700b776b6c0abd7929ce5450a016beb194d578615a5133a9d2c412d17501efdf8683dbdc44ae2
+DIST firefox-130.0-dsb.xpi 658767 BLAKE2B a12c538d8e41bbec195b9e3562106f47fddd0eaba3438d5a2e836b3a03c6b2b126f8f6c899303ab2d57ea0ada23694a1f9fb4da657451cad3dda908edd1795c1 SHA512 edc9df4c6139d3eed046f987e6f4c0da56961f2d9dda7877e9452b33ad80740c8ee14c4bb3f3f21c6a47db5ee06ca47f9b7fbdce427e8f04cc66ef8461e083ec
+DIST firefox-130.0-el.xpi 743356 BLAKE2B 88692701510fef5a633c15748b2992868e733fbfd23cc0a9ca30575751abc3fb9b9e09ce81d670ffea4e37bbfc64a9c326b254a897fc059333a235f956636482 SHA512 4696def5855583c15f6f34ec9e5aa8c99eb9f9b12e3907c62f5ef36592bb24d4c3911134448cdd4a84841c8982815ae3934ef40ba1018aa039948431dd71ef29
+DIST firefox-130.0-en-CA.xpi 593000 BLAKE2B c0c91b2fe07e55efa13d993dd6cb2b68446746844369e103202fdb54bdaa1ee9813e78b94558d7ee3a886f68c079b5418c65a022be994040cccf5718da9c0203 SHA512 a1308fdfa709975e8dc61b6f7d0ee72cffa76e023dbd6b97072d7349a095e14a8fb61010a82f857b0b6431ba403a0aeaa7253b5b1e3770fed05dd6fcf1d9d3b2
+DIST firefox-130.0-en-GB.xpi 594149 BLAKE2B 0bdac5f735a09ce86b6e8b1ee2906096355d2dc86731553555919e5c616cf80faf6ea5e6840368d4bc48ff70d4194a5ae6cba20d9efa1ea34ebc1a07e8fafffd SHA512 3c904e13cc151110699a8c994fd1f6d92b4cfef94fe3b4ba5ecb3378e1dbf92f063c8010b01bc5577e2abd5b3d4904c4faac7772670dbd92d747e157fe0fccec
+DIST firefox-130.0-eo.xpi 625380 BLAKE2B e46d8c9cebc2dd67d36a9ea671cec56612cc63c833215b0a208178e0bc9f5d5eb00dc7ee8f0e8d5651050c936c28fa5e2c1a830108d3cdc41921077543bc8544 SHA512 d52efd37c2c58f4c116974737acf6b50bc7b268074456ab6d7721a2018c53da3621447b0b090b97bec51bb86c9589a050f499561ee1bb49c1a81e8cb75b37707
+DIST firefox-130.0-es-AR.xpi 637457 BLAKE2B 1e8bf2bd2ea8069503169d5a088a468a4ec6c67935ede6eab6f7f47eba2906bc5fda0685e3ad0e8cf26c30bd56d1a66cbfae70cf0f29ef8ea4a17bcfa3a0a443 SHA512 71ba4cd7cbefb1b3589c039c759bd0a2a3fbcfa2b90c750a0c5914f46bac04c39031a08a094617e2efec141dbdfb7db1a4f6992166a0b98f7d91c5f4579575e5
+DIST firefox-130.0-es-CL.xpi 636359 BLAKE2B 2b8fae6ce7bc4e137183011d74f5315b0dd7a07dabd28e72f1347312d892c34d3ea6e9c013a1696e34137140301c1239d87f947b343af231373e99856070c317 SHA512 a213d6bf27f1cce77cfe58c98565f1d6208bc5e05622a3e103bbe58ba34f08b117046ba23e5a61cf717fb4dce6a755bc75f80f4f78d3f53b7767899ebed3968c
+DIST firefox-130.0-es-ES.xpi 624788 BLAKE2B a7c40de76652b7ea45e78d2a77300589504c3e62abf88876d7a56cfd8798f7d8058c21a722b106c789a83ff71eb5b18b513472ce4659312463529d5880efc577 SHA512 e84a92e65ab4197272499df805f2f58bb1605bbb04494bf1b65b88ab317175cf14e4748ac11272a902d04055c51802c41758422a9d2fd1d89f3c8e1e1c379415
+DIST firefox-130.0-es-MX.xpi 620037 BLAKE2B 2203d2faf00fce513f57a07e2d835ac324f178199e7a212f1809d2cf162dd460df50baec1195af6ec04370d9d411ef7a83a50e9c724bfbc8d0196fc47d27d876 SHA512 8d4bbdae23a1c2d1d3a8d97736cf1693b4e8e95c32725649493351d6a5ecffd616625107d71f48089fc51d1770e3da33a30a40a2b622ee4b001f75cfc1dbcc61
+DIST firefox-130.0-et.xpi 543274 BLAKE2B 00bfb45208a6b3c562a982991e9f37e423b3a50bdea1e5fe5ccb9de58649ff31b723798ff90c566ee400814f01fecd39843eb3bcde3cea280223b3cffe7a4d5c SHA512 d6eedee6a657a379997aa8507fd4534a2801204aefbf2c54ae288e7d4ffab4a82359d3298b833aeee8066e726034e9b1d62c4e465d521365bfa392f5137ac011
+DIST firefox-130.0-eu.xpi 603909 BLAKE2B 6632e5020881c468da93fe03d9a595c40c7188cba5223e72da63a0a181ed95ea698da24c8b4e6bbfb8b339f1ea22b3cc3e38aca1a2b192a3d57f609e1a9e7533 SHA512 61446a8ebb9d23f5c7fd7c05f4a7e63f1db8c33246800daa952d7429070131e5b63bda772bed4ea8c48597640a2ac34b243925a3f7194fe295eeb68f55047199
+DIST firefox-130.0-fa.xpi 593582 BLAKE2B c0d9344b9170f8eefd9be7c495871a5edebb04403ad8e71a0aa031d16fb3f9c9c85825cb64260f82b2dcc15f9a98f1a1196871c5495fbb709a5d63fee3f23a49 SHA512 78db25909097c74bae6bf9c58459e8bf522cc02c457777bee656f9480ebc2387b5d05e1637a9cb6fa6dea9c516eb347271576b4e31f05c8bfb7167380a14adfa
+DIST firefox-130.0-ff.xpi 479255 BLAKE2B 7d4a7aca3192aeb9a92937b034df91211db7bb66b873124f51bd3e03d2b004dfe2be7b7c286b33e2185dcd39376cbc9437626fe987e2edddb878d9c3f279ddf7 SHA512 a05bfbb0e1748b286734500161f681ada364c61ac390181134916f372e01cfee252108a759cc413a4cedb2181f68757bf13dc51a5db24ae8e2f72bb1f2928d88
+DIST firefox-130.0-fi.xpi 617454 BLAKE2B 3307e3251b701bf861a7d71eff1393e79e190aed85f67c79dde5b33ed93089d4a32990c40c03888f338dc4e405cd9ba1efba40087353b743e79773b82cf37235 SHA512 437783e5adf4fdb61a7ebce2e808d2d9feebc06e2380ec12de8bf2dc593134c944902b746fd7b9dd0d27b8c768705df28de9920680a6971e036294b4cf8f5371
+DIST firefox-130.0-fr.xpi 651038 BLAKE2B 7d8582f01e29533813878938c6eb7aa3c3bd164f6050b462404a1bc220428925577e7b32fa64bc0b138105d626c7951b51f86704ede1a846f7b5e07ce2a3c48a SHA512 ab4679aa3f949d3e948cbdab3150802429188450d3f180d098fe090bc30e2e971c80a0a28f428d80aec28169f4a2d6521bc85014db2f9fb43e4af0f11df0dd98
+DIST firefox-130.0-fur.xpi 643018 BLAKE2B 448e599bfab432babd95c606089ad1dde7a9904a3c288c1cb6ef9b1eb754b64db0e3f5d23458a0bf33c2b20fef0795c9ec68069c9a2692d571b3af21ac80e77d SHA512 88daec45271bdf58422e52d6d8a0e6a1d3aa86bd34677e56b88790e7a90df28905824a5c263b214a1352c9433de83e92f9fc7ad741bf487fc4dcfeeacd9e2d2e
+DIST firefox-130.0-fy-NL.xpi 632428 BLAKE2B f0fdb9d47a8076103bdab21c516b482e859a6dcdf5b984b3b0242887d9535aea790627a9db9d85b56fb4accdf2e5b45443594f1b4fe645a8b527975044a0eef4 SHA512 bb1e4ba77d60a27070aed23b1cefa095f895e75f4c597a82592fa86e2b2b3c1c9c6fb69a44d7a7726dc52977c7c3da21e2b1f2eba51e6059f258bd68223af500
+DIST firefox-130.0-ga-IE.xpi 474442 BLAKE2B 3d84bdf740248c598769a180dfc799db8a754c7072be9020355fbffb7b409b68b804ad9cfc96b996e34acde17b7fdc504ee783dbd26facf173a172220a8a1cb7 SHA512 62ae04b8cd65f44ba6fb1f13cb23522c31dd17e9d3753d97f0df2bf4559e87ee26c75f08de09efe0508c10b02717e2a40ebf9f1e7674772d5ebef83675f13783
+DIST firefox-130.0-gd.xpi 600334 BLAKE2B 54e491177cceb642b17beacdab8ee1350b0b43e723bc0933b90bf8abefc392f557a65b75b9161ebc94940a85736345af8cb5ff57efcb733ff33bdc7d6afcd476 SHA512 6b3576408a26339e8fcb0d3d5d0864e722da3c7a07fdda0e08769d56d8f061e3ee0aa7c35145c6b45b3fcaa54051dba1cfb3f5bccb697a81d2664cd782b11a7a
+DIST firefox-130.0-gl.xpi 608037 BLAKE2B f8e5a2b5cbb4eb561e1913ddfa48c4ea889bd98610ec3cb274f701ed6c33d042280c429cd8ad8f11fa15dc5c7ed46b76965b39bb18e9907d9eefe911810b3a5d SHA512 bd522bd76f869d8f599e1fe4723092c93ff958737d32d0c631cdf80c393c526eca572eb6431dcf3c7b25230a15e9c8b0833f696cfa6bbfbd38a5a864ba312217
+DIST firefox-130.0-gn.xpi 645999 BLAKE2B 3e377ecaf82b40ca84b33b96d0b9a47e67d68615a85b4cc0dbe82c09003b95f4609cc295b628e79c96fe8380110a774aa8a9d125c1ce3ce24d36c77297b0ab5f SHA512 f266ed0192376883eab75ac901d739f6f94340accef9b1a1b6927cfd4fc7ab043928857983f0c62e4611c73ceed58fdb23827b2024884b3fe746356dbbb7ef13
+DIST firefox-130.0-gu-IN.xpi 530812 BLAKE2B 53b9ff70efdaeba4c3a8ba1e0c317d8db821cd33da0a260f851bff71ec7b9e99956dad1a8cdc161e31e6128419034aab63153d1493142c7dbb350d1eae1dfa21 SHA512 178f4d2be128ae95de567e7270763bf08031d8820f64132c0f3a90ee72045ffc20094466f71e913f9add12347bebec25f6ec5475e5e553d4cfd316375922dbac
+DIST firefox-130.0-he.xpi 640049 BLAKE2B 89a0e0eb440e95cfae64ba6866b7d9a92ae1303dcdbc2adcc3a73cb0464208a9e5670653d3619cf3dae1e928aba0ecde894581412595d56f843c0d65cde78eae SHA512 5f489dcdeff2957987d3fb78e628be675dd8921b6b1bd91c8cc1ce810c6b1d527cac942078a13da79dd4c2b07e79b01ce573a4b876b00c0e4254ef6b6f6c6be1
+DIST firefox-130.0-hi-IN.xpi 570024 BLAKE2B c33eb46b86aac94887671fc6404b25af79a9e39ea79cf5aa2fda1d0d63a67886f9c27bb171d3414dc1efbae13d23646d766403f01e99575e0455370016caea46 SHA512 3ed7f402ada653fa21f20947f0bc9730bddd84704e8de0b594e5298674b6cd0d7e91f607211019b4d138a8e327cb03ee0ead21d1633e27b4c987727bc383dfa1
+DIST firefox-130.0-hr.xpi 617522 BLAKE2B ea4772a15eadfe3a139569175d102171cf074772968f836e824e1a3d1cefc10bdf98ff5bd6a1d7d1d875f763d6f9b0fa790089d9c4ea7263e054e4b65602c5d1 SHA512 4ec531c27608bdf1c20734aa25a33a469d64a6f59203785b28494885e8e468f92af2291548a509e97e6ab0965803d65d65ee5e843840fdd5988253e45d7f49cf
+DIST firefox-130.0-hsb.xpi 654771 BLAKE2B 0af2451d51f7de25b9e5cc3f1e543aa673dd5f0c899bf249399ecabddf11955b1dce1af2d0c771dfdcabfb78b871b12bdc5f608dddd0babbe50c59e7d45ef4a0 SHA512 0a0232d257936398dbe2469074bd3dbfc596daf49522a640926027f2a3b22fa672a1ab3953d342354945550e9366a7cd6d5f7494515ee28e381c84ee5a8b4b08
+DIST firefox-130.0-hu.xpi 659669 BLAKE2B c5cea2daa745baf2bdc08089ce33a8469613f175bc055f10c0f7fe00bb30f7ad58a59381646d9c78c7a6015483f29b3b9288e278ea6fd6cd4531e688350bd600 SHA512 8b907a97356c482f863556fd811de64d576bd4d1152fe133637722ee4930149f40b4bbfbd37a897391e6fb7185dc42fd93191089098b2d9e9c403d4a39f756c2
+DIST firefox-130.0-hy-AM.xpi 655061 BLAKE2B 4ad983457c8e3f7bc6c9e9d3a010094d189f3577a0abbf2ffbb07c6abce47b18c37d0b70fbe4fb7836c25337afe85132f6d10d8c644cd9718748813157672d18 SHA512 6590e7fdd994aeeb45ad95b6b5ee28bca44c6310af2eff58d7393fe9734c94333e8603194dcd4067bfbdc44cace09a198e8a026b530260271cf1bc5a60a4829c
+DIST firefox-130.0-ia.xpi 620415 BLAKE2B 6b5227cf8d06e3cf4565f0e1a5826a02e8bfa7a08b66e10451a1d28e18820b9a3b7c8205510dfa8befbfdb0c2a5ffca846eceb3576c0b4ea107b5934c4f09060 SHA512 2eb6ef97be73d78acb32bf0ccb248ad358d60b95258c333304cc180b16ed231eb8b90abaca1252722d0294a258d8c541675d9189dd33945657738ca15e9de687
+DIST firefox-130.0-id.xpi 588473 BLAKE2B 28dfa350b749d6b1e4d52c011b11a1cafe6629cafca9e376dcbec9df531e8baa951b9b7e503c90e05240c7370aa4bc2c10f5f427872f712f874836970df504bf SHA512 7b4ffffa9cba6c3781e953b06f34c2584bcc623483e11b6922b3b1ffb3b0ab70cf37ea5983a56a777110278277bf4888a580d881cbbd20529dad85ed07615845
+DIST firefox-130.0-is.xpi 622838 BLAKE2B 963d2363dba0cad9e9c2d170f8e880de599673dcebc0ab4824b052f0701d2f98eb1c5ecbeec0eeaa9f54713e39d7f27b23cca6ec537d6893ba32968e37abe9ea SHA512 6151fcb5bead32a177acba728c712b2afb12451d4dc71cab1a18f65fb6c6a62893a169d369bd3493a4c55e9c822d9b39f030e8b44729f8887f708d71332d6377
+DIST firefox-130.0-it.xpi 576702 BLAKE2B 84301c0696fb27607a050d2887d54aba848cf19b0b138f43349f600818c2f06b3c5927113202087250bc4f410ac11996974ab0f322a2d077c5193d1afcec363b SHA512 ba042154ae2d32047f506b90521b6f1ef57ddea5df5cb1ca85706ddd927ef845ecfdb92571feb9ed79cfd6a1b7b3f203f9a5f39825e7d948f8c88d88644cebf1
+DIST firefox-130.0-ja.xpi 685864 BLAKE2B 994c7436ad0fee1a3d15a5b43a67f2663ab5609a32d5f39a847b4d90370b3c1908663e0a8e7280fc11fde86d4bf99469ea8c07bf37a8d26b171118f816e24681 SHA512 8f2aec5d3158b19441d1d1cddae1e0c18d5e1055af749f110b5193c5b26a3ceef50f213d690bffccdf084fa3f9697cf598f3503f9edbd997cb916553e078f538
+DIST firefox-130.0-ka.xpi 664736 BLAKE2B 0c5e0dbbf5c5e4f40d465e2cbd8fdfd3750010af24db9a2ce295af0a2b1d6f2123ff84f177ef2b123deaab2c2087ef37f5fd2500b390f6a7a50dfa16b10d37a7 SHA512 9b8aecb84049dce769b65fb46dfac1eb49e75020cea0ccd9a99c7e3dbf4d4b414e0df752d7e901db188813c2f5e6e7fa6e6bd372ebfb19a5bb8dbd9001358c35
+DIST firefox-130.0-kab.xpi 615479 BLAKE2B 47e39d8635fa0db2a1b6d78b04545a67d1ef569e0556d6e1e042e46e18ac52ef90bd80773e6bffcb5b4e0bab512594f18f441a970b2b152a0cb48d6922db4010 SHA512 95e796832d630f244d176c7eaff9bb5f0c1294c11ef2809019221ffe5e126853e19818b5899dd5d33471e1c248dd83f967d637e686e25a2a346830d5b17a6b12
+DIST firefox-130.0-kk.xpi 718490 BLAKE2B b87c8ae190f779bdec52d4b5189a6e8ff0bdbae2d651ba5e3115dee3d4444a0e91ff4a1476e34a01018a80b212f00651cea8cbc7b3b1a7890a2be048d821adb6 SHA512 6f9c1d05d2475ba2eb335bbc8141b70e843d3c4c06cdb0fc9858b39abc00b9f50089ef938fc9585f0398f314049e0e16ee8b4b1e4bad651bd49715c16552d9aa
+DIST firefox-130.0-km.xpi 529330 BLAKE2B 6fe95c0179eff56ac84c86af5f05196bbaae199058b90b44ce67f3f2fed2ed9043a490ae0a708a1c95c502fbef7c8ba18067c34b140c2dbef57d6964b0f03f22 SHA512 3c261aad08d1a4b3b42820b1d7e5f41d24618d3bf74c2b1710f499b238700079d374f254af67aff69fa0f0035070ef1757b4d646538dd8b5d24cf4cb6ebdb2ab
+DIST firefox-130.0-kn.xpi 494344 BLAKE2B 141e008cf40471245f3d227836c48b1a7400d1ebadc47a8f4f16bf46b7ffe58c50311e32268d09467c8bb8d773d026ff466c49ade05f073a7410f466b0baff68 SHA512 84593f1a855ab631533e2fa1b454928bb413405b064f5198fd8fba2bacd6034022717a9e0911557e2045d862e40f3cf3d63393cb11c715e04741fa796d9e8a9c
+DIST firefox-130.0-ko.xpi 671547 BLAKE2B 7c891d33ddea6bb05277c4976d0d77f772b73b503b42ebc5d2c97715acf9375c658a9dff0c48f5a8d2376450b1d407513c3a1c9a19f81ec30903cd4257e98dbb SHA512 3d9e16971afe2b30b7be1c8fe927e7dbed4219c8160b9cbb7ebb4333a0307a8d09434c64fb6afba1234be5501a1a3a010d52b695bf39c0bff4dcee6027db553d
+DIST firefox-130.0-lij.xpi 487638 BLAKE2B b45300b5f7b575482fca641b2034c98df6df38e617fe2894371792169d343e19c905daa0a269fd3cc8246b7e22f59d59ece2b15da95f7a1c566355c1aaade03e SHA512 ad5e6cb01bee9504c5f98e787228fca2cfd08c0fd318fdc52caeb78c3e9b493af4d80e4c0edce085ea43d97cf57bac7419854b3022bc5e1b7ad886fc0f7ad5aa
+DIST firefox-130.0-lt.xpi 576386 BLAKE2B 146c5970f84c36701a91eb109032d787c9112aacf06d6ec6a6e82a9a94962c68b7a03f8188908d3ce215493b0a2f2bdf5fc2910b1e9d800b93f96ddbc345fc69 SHA512 53509733b53e4147cba22cf26b5102873d97b1939b16ec5be6cd49253c48912d6dca5f5e532c997fe885e9f71a89c3dcfb922ebe72569fd3beecbb2c340ea353
+DIST firefox-130.0-lv.xpi 589138 BLAKE2B 222f3c760cbc8d18da5dcac891dcac76e04285154eb1fa2a710304f13c35a87b27693ed94bc3646182d831c9dabbf429812fd811d794453c509d5be6d496b933 SHA512 a09551cd689851bde881ea51a0cd1da628dfc184d66238d72dbfa899b1bdcae90de0eb07ae3240fe9acf4bad79c653ee117f99482a511338c8a4d0a2f1c91160
+DIST firefox-130.0-mk.xpi 496958 BLAKE2B 1c3ad1e9c3a918a6f327bcaf3fb2e551a05bb2ff38a51891f1c810d68c190b8e210890ea70244553552f827f16dcc58f210e19da06a127a2f4c6657983a972c9 SHA512 3303a95dbe0f3a6b076f67d281ef60ec6a0d2f682a00578d8ad4c8fd2d9ebd744cc4f5e348eb889bc536a2552a63ba9f1a997c75bcac30da8cd65368f665457e
+DIST firefox-130.0-mr.xpi 535458 BLAKE2B 1886a9710a35422e2b4449fb66f32cd1732765f318d6de3eda15a1f8a3231fea770cc01d3b4d6a8f8b8dc46c61e9daddc6b4f870b04a55cee3418c712591dffe SHA512 f6142b00d9507383e5d2a5fd652cb90e17d261cf1b9bdf4353c715c37e65a175b5e1820e3e89c284f09eff8ee593d36614478e34a1131755bae669888657945b
+DIST firefox-130.0-ms.xpi 453245 BLAKE2B 2511a262027229f4f65592c67dc8c807fdf90e76a352838938701ababfa342bf418c405011cfb7f53c0d9171e982f269d1ea962c41b97d4a9a8c080a66172b65 SHA512 f644ff75e6ac1bbd252bfad7b1020867c907c4c33d4334d0bed28acba952be79669c705804004777b15ce2d911f8bc020bc24ad63a9915af783878776ec2c0ea
+DIST firefox-130.0-my.xpi 521885 BLAKE2B de85cfc97c91f5a3d1274d6d72b5bde65d4b40f06c24a863d531340d46d3b70c59f9c7919f1d2bf9fc812fe79414a3fa07641503eb5ded5c92682060d9019628 SHA512 322c1cf80c3da649738002174406748d158a51ca5921fe8a422d52bc7a6c7281cfbc141bcb9cb88e1542894a1c2fc0cb7154ba205ccb9ab0047d5cbec9663cb3
+DIST firefox-130.0-nb-NO.xpi 615481 BLAKE2B 3753dbf18de927b8d3e4d13e94443b65510d9b117c156c1bf7596fce64fd39c94932e13878ea8324ba781bd4e7a577ae90c94cc0eaeb5a8923c0f8a0ad882f86 SHA512 9a6d80b4c7c0bdb2f2de01d3b04d7e1601725513cc2a18e48c8daca4077cab3e9da92882be54cfa0795d588d15e90931c110a7be274b8761f1e9b5523600e250
+DIST firefox-130.0-ne-NP.xpi 517919 BLAKE2B e0c73b95c0a3e5ec9aa90932170822218109ede720fcf8cb7fdd3639f851301df41c73de922c26f0d4b39b59657e3ddef488f42ecec84d59315943452cb433ab SHA512 30cf81482af57b9b7197fbc0a5ad15dee28de0d334fcefb4f7f4c5980bba7b193b514212fe38a109a9e269dbfac7f6ea6b279129c5b660958d03d4f547058fb0
+DIST firefox-130.0-nl.xpi 626066 BLAKE2B 5b644976d2530f600dac8310008a34736b829651a0b06c51063dd836c962980ebdd30a20f3eae84e17e92058fcc5998eb0d914bf89f72380f85b996f28e65ac0 SHA512 40939cb83f01aa4f3699933f5463dd085a6a443d195101f6988524a8f198e6fa51e0c06a765246163b0dae8fc3251c0ae8fe6e8e3254a183b8820915323d9596
+DIST firefox-130.0-nn-NO.xpi 619760 BLAKE2B 6842c61bff3b1b4d77d18b5859a5c87c065eae7ca91de375841e1898abc996f1d07242efe9406f8a2af39993b071e91aff221e4f379809122950a0589f143736 SHA512 208a4f8a5d5820afc8fb8f511c6f21a8afb37e9952ecf1bb54539ffcc9e71bc0ccb1fa0edea662d7704cc3bd0d833084694cf24fde633199c1d1c97a4b28d565
+DIST firefox-130.0-oc.xpi 616652 BLAKE2B 561b30e0fb9fcde1a727deccea6159c65325806ee8ab1a9289597f47141bdc7797fdefeff85b342d2540e43c96c92da1bdb5395f9776632f27a7f43764595d6b SHA512 b2699b1c228c4052c14f7ee6ca5444a7edf09ce211e2fb402cd0adf25ca3396f4651e76e8577f21c3c1ae93f676c113300bf66f2b69f8bf6f1c943e766a7964b
+DIST firefox-130.0-pa-IN.xpi 700426 BLAKE2B 67a4dcbd8f441b66d93be4e6df5b74d8498662bad215e176e89167496e45b939d7cf27558af8e88d9b39d149a5023f10256928c8faada35c7337b443e1d4d266 SHA512 4da381e49070e34b493a9988636726abec70ac0f953b005bc5af6a09b87e5a53de6e2cde80342ff7a45ac1d762f4328a40c198531500c150cf8f0ac16fdb162f
+DIST firefox-130.0-pl.xpi 646166 BLAKE2B 0b20b78f961286c1e076814bae8787f83da22d804800e4d4ad42343828dfb18b99b84f00da466afd955e27fd7fd721057a3d029a42dc83f8fc1b0c9bf8e4b776 SHA512 0f76c97a1f1a32ffd14cb04cf4cedce4f79729550345a5e104d550f9fcf0c5f297422030f08f9cc484b8a535e7f99acfd22744dd00c577601d5203319180ad78
+DIST firefox-130.0-pt-BR.xpi 631644 BLAKE2B 2242f5194f688829a561c14a08a69f5864277ea19fc4841f7926ad8a492a31e4074bd85b7f817e97259155d50532eba9ae6ea8e233e9702c4f5f2636c2554e9a SHA512 cf1702e44f04dd55528a7c1836b10add2645b49d91993bc310e944ce8238e13e85eb1d6e614e8d4520111e83eda440cc7f9a9f7d6dc44f4b0e973958a8283aec
+DIST firefox-130.0-pt-PT.xpi 638061 BLAKE2B 1eb8f9f7e0acacee3f082b4e59df548e0e6e810e29647790746cba870b802350cdb027b6fbbf482f0e853fa100cdc83be8a2a8bb9cc8abdd07d636ea4d7e9cf7 SHA512 95a80d9a0beea19cdf9e03722478ff19338d3dfb4d0120996e64d45b995d38ee4ff996b0e679a515760bab40f951c4d95a27933e8f471dbb8d4c6d0d24467e6b
+DIST firefox-130.0-rm.xpi 621691 BLAKE2B 66ad61d372c27e92afaed099a91d56d2afd2917975875a6cc857fbe137b420112fc3f2d4ce8900e21b307fe458ce6161a31ce9f54a97c8261b942cb51ae9b223 SHA512 139d007e141f5413e2fe99e6cbadc5d33c0e0564c46f131bcfcea5c52c457c6eef586ca9e59094b331432406aa03b2ffa89566388cd518d452ec6a5b494776b3
+DIST firefox-130.0-ro.xpi 553440 BLAKE2B f1968e97c24696e6a0b703bb0ae3a9331e2480dd31729f8d434f86b4fb494be36640146b2b371a601525fb054929e37690e42e6a2a4cd495c6a02aecfec11bd0 SHA512 b52c94c18cf2a6c17f1dff8dd4aec8164a39343ac7dd5cec8154c78564774496a54e8a042e2b9d9914ddb8b9d7f6f9ce081f755e7c8a9ed4e3ca69f1b28c560a
+DIST firefox-130.0-ru.xpi 731292 BLAKE2B f20bbf1f071ea412f722685c332e79e2b548b3209321b221064d5204f069a35333503fa2cf8ab9e5565b0b051fadeb14aed140b3cfa7a39c3e306e40a64eeb19 SHA512 5d990242166c8bccd2a09104149a791ccf57426b580cd15a7941f3c3baeea01ebaa3e48027b64621ebce8a4e2c790e96a6336d44ffd877e497b7ad5851c9c61c
+DIST firefox-130.0-sc.xpi 593199 BLAKE2B 51c2ed44181311a49fbbac2a40dca7553b8c86e85da4e2baf7f1c3d039bec7e563751d2ec2cb2c331990a75ba07ff79aa4785bac074e168afb3c0bd6a6902ab9 SHA512 2ea46cefc38117addcbba10c7bbc0fd425da593b16206e9113899b6fd0fa7a0fc90e8eb8d7c761d7f6f75b6908d92b885127eb3e1cc3494b422a57765d8c9c4f
+DIST firefox-130.0-sco.xpi 514799 BLAKE2B 5edc89b5e4001060e6b6aecd2d1b23829b0c690f0f6a0136ba18ae9b487c6bd95754c714c2dcde3822dd90f3c9c615ee3dbc7894cfe079dbb87e8e9112760f47 SHA512 e44b7888aa59f27d3146fba77a2b3c3b62251de526087c61a484469f89034250595f302eaa3c44adf192cd4b1278e8cc2960f9f925e5188d496bf79928d7094c
+DIST firefox-130.0-si.xpi 616762 BLAKE2B 1914782938cf618ba70a7e17cecc5bb8bedfda30eb3506805a09804b4ab6a014b19d5b2789bb013f0aa7e04db74fa156306315068424edb1b28ac83cf87a379c SHA512 fc94c1b1580e37ad0ca055379ccf8d7bb4cd9997ec88b8343b957843537c9fe65cc72d656fe19e24ddd16cd87d7b15f30fc54415d78ce409c11e109f4e70f462
+DIST firefox-130.0-sk.xpi 662602 BLAKE2B 1c0facd7168cb5202b47ebeb57a43bbfe9104a187602140ecac97737bedbf4d8ccd7737556dbfaea6f07caa4b11c4b6fda01ff6d170c529d8883216949a1eecb SHA512 4f2fa2717854baa9922f4887fc95fdb44eb4ab50e473c0644a1e72bda2bbbaea35d3996b87f719aba40d960c6297facafd24dacea8bfa1f425bbf89c5bc00017
+DIST firefox-130.0-skr.xpi 716710 BLAKE2B 728373d6fb77bc78fc03112ba4a55debae5a70abd907a3fa5e6bea457bc1258609021840041a298617fef22acf2376d384e536c71ee976ae57745350528d9b69 SHA512 e2c2f20c52a1dffb70c6a576cf5ac5bc03fbc44f1d7cf401bb8322ef6a2dd8a2fd315a61532f5ba72709d9c7b48911a54d48e9e6656e2ec7143a9e0882cd8192
+DIST firefox-130.0-sl.xpi 626607 BLAKE2B 86ff57b1255e6d513d1ba5ac0af9ca167c0d1db940e93a8a212ba6776e14f37d14cc30ad6420adeb55f690f8f9bfc01ffd1a07675fcb90d36c2d45c5c9b2fe14 SHA512 b8d52b5c1bde1991e3ba0234e92fa0a1fd6e0cab7e4d98b4925e3f28a0b698b227fb5b27256a1f2d40e38242bb639b0cbddd3199e11eb9bb5a175e689834decd
+DIST firefox-130.0-son.xpi 419745 BLAKE2B 2a1de367402e31dc82cf44abd53d472fa0a9792af15c05fedb2257253e9d018364eb0ccb314ab5221607d61a7f929be94a56a3cfefb33d26b8f43f03982f8d40 SHA512 33f1b40014bba606fb16f6162ad667daf19a3452a20dda6037210637ed94bb339bbdb7b1265421c96715fc93dcad2473e7ca19b79337d3d87bcff351bd9e0388
+DIST firefox-130.0-sq.xpi 641275 BLAKE2B e63e57573290a34186c19d13b48406cf50bbf61326ebd727bfb418838068120b5d2c0c3375b3cca21f1686efefc813df3cceacaddafd71c0cae87cd7d3baa3d3 SHA512 430bb8719aae32a86f95247b8f344f3505e0c45093b13a0c0978a4c3875dfd59ad9af155f0773e4990f12432e52bb0f1b94fce281f9f39bb079acba5fc9c4fad
+DIST firefox-130.0-sr.xpi 643275 BLAKE2B 8223f10628f781d50dc72f675bc60a65d1a0c1255f73ac2fd5ef5af5cf4831a1ecebd2ebfb4306a3f1fb9233ced28754710cee842ee1bbcb7dbe46a7818c0a55 SHA512 a4750b343be3562c1f84f8bca18e08708931031cdbb2a074c08f5ca753ad1c89e261b62b087cc2e84d4f257716b57ad2b77b56df62e77ee8ecba86946b0cd2c8
+DIST firefox-130.0-sv-SE.xpi 628348 BLAKE2B c53191ae72b267fd7f3c8259ac1afbe462f51065b6314a408ba3ec04b468d02c6afa43823b275e4e75d72d27f9e1a65ba703af33d508a486c15783b3ae92e704 SHA512 f53b86c79e64c376e1c97cd084cad971ae46bdb7c968dc05de6c3e24a5ebb870e898d7249e8f47e02a69d0e28e2c8bbe66aa3f5f88d71f8acba81f5c8de28868
+DIST firefox-130.0-szl.xpi 529951 BLAKE2B 00cca4ba24c734cfef11b292358adcb93a5084dd8b9382890660d22a686c62906bf1ec33b1cfbdb57de236590e5a90a68eec51c7e6345c843fd09058d508f1e6 SHA512 e2ff0b5914459a700c4543cf3b93c0b1484e6a3726bec21a2d92efa9d442241a5a3b2f07d363131e21b6e9f3377725d5bc22877a5617e2450d4d33614a821914
+DIST firefox-130.0-ta.xpi 510639 BLAKE2B a6c019e31e9b02cd9f9efe420409a3d86e153f98d16cbdaf5ce1968b42cd834f6de76f5b8b69c13a62f025b0856d38ee1cb979cdecfbfe6168057152adbdb004 SHA512 158e561f752d6e6318d2eb8ea41d4d5cbbb917dccab20850f1181b8c71795e8baf6ef30b53bec2b79dfff5b59f79ff71e24240e1b2487750a245883cde2afce8
+DIST firefox-130.0-te.xpi 564569 BLAKE2B 184ec5bb41ce4ee9237ceadc4fea7c842a5850c94b981bf9631f21e81eb63ed1ed77646afeffe115e38f9902d1b4ba366b2b8c0500c26b55e71d1ff37a782865 SHA512 3318abc55b92bbad2fcab84ba7e40f86fd9824183ad9d46055a652862725da9217ccc2ea7c0cbc44be7f6bbc98beae3414f72ecf1bd7468439dca87d291cbf80
+DIST firefox-130.0-th.xpi 701822 BLAKE2B fd4b959a9f68aede585144f89413603e6011ceb454aee6860cf4a9855b1bd2f6bb30887d6786d5807e7a8abfd55a483e39097a8894f82cda646b3c8a7580e97c SHA512 0838e90bb21340492be3d4f50b0e974f24cd638b608c94e0e82f4ab66ec9beb14f055558a714ccff6956ea041e34fdda94abd918aef849909163fddf3b96b5c1
+DIST firefox-130.0-tl.xpi 537784 BLAKE2B 08d43275933153f8f360c5285e3feadfa36e67b98d8fae15673053a95aeef127a8f20a6ca99e0005b12586c9178c3d265b9c85299ed4a8440d1b3eb0a1603ec7 SHA512 b04340a362674f0a2e53e4625644236e3c94ef6f1d6bcd7c94d47055ae0d63ec09f25c4a7a8127e5fcd6f35f71df53eaad290cbd99b0a5af0545863f8c44ce18
+DIST firefox-130.0-tr.xpi 641729 BLAKE2B 2b51eb152f5c23abd612e42c43e15429485d1208ef824ead2366ea5163788c307ba1d981746e7de3daedab0a5f10b9f58f3b67b0c6408b30680c972f643ea5b0 SHA512 e4f47ebc42621e25a11dc7a8a19f4df55659e4471fda3bd5ba0e857b442f259f7b8d7f85c33372e3addc0bebe351acb03731e9e1e7547aa5ef65b5f9529b5350
+DIST firefox-130.0-trs.xpi 507730 BLAKE2B 371d4c85400cfb77a7faa1a8235d313b04f6c17a7ff5712de3ba3dc180e67956aca998fc7805bf707e32c7d23a6b33462e38d346b03f5b175d82f834c9567f09 SHA512 53563389a3d01553ac24fde65aa550782de0a9ea1d724a3c01f6ed2972a8807506d596b4deb76114edb1ebd72ff84778ee88b50817f98e1a030f01dbf74efa9c
+DIST firefox-130.0-uk.xpi 714781 BLAKE2B 60ef280e07396f7a0aba46f59901bb126bdb460b5e68a698f114d29743ffdbb2527b51e1b4b86666b71b7ff86efe3fbbc4df07ed6601b10f0a60dd71da54e7bd SHA512 04f69c1b24659002090a10c43174af53c7eda040695c58f94a66fcdac1262b0a5e29cba2a09457df704593f4ee9b7f2d2f15ad37fcafbd9685d22796f635aea9
+DIST firefox-130.0-ur.xpi 563621 BLAKE2B 45d889cd92edb3da5e3c2eb2077c6c3dce26a27beb97c1c1ae2ee67ebc58119772295d2294efe52b76427c72bd423ed5c83025dcee22c7a152a821efa5cf13a0 SHA512 3e5d3e82d9d99d9ae09f45fd141a46e48e52bc7346ca8e85e6bd81f1f86970777b235c63fa1e4434dc646e2c37d37510d40e6ed7e60f530cf22fc23262cc9a70
+DIST firefox-130.0-uz.xpi 482284 BLAKE2B 1d8b8562e01cbaafe9bf7cbd8300155de2c62259b2653b20502dcfb667c5353694e48d17d6a3a3fdb9581ef6b89a5e27262aa275b18500acc870e9faca674b31 SHA512 a7bad28238ca918cd1c340334f8c380d900d9c9da6ee627ab10e598bef27774e67ae4760a11ece7b7214f6c08c4802fb00d706aa7a261476d86232e0208a4a60
+DIST firefox-130.0-vi.xpi 666085 BLAKE2B b80be3d3c30aec668164abe5461677aaead06a6e59c121a3c80a27a492f838beb14f90f73d2dfb466d054b81f38279ca062f0e8019abab283b8f921d889b2884 SHA512 7ae3ac4d3b546649acf380312b9b0214da192cb160cbf3814f37fef6288f445ee4ad97dc6048b44630b8e8e53712fc25c03ffcf4f7ea721728367f45dae96f33
+DIST firefox-130.0-xh.xpi 420486 BLAKE2B 953135839c7a648b4b02459ceb47bfd6e7bf62a357eea4c7fe976409a6779199ba719c0cca662fac1d8fbc2865e5e529d7c656088a6509c072b52343170fb1bc SHA512 1cabec451c045df427d8b2dca6829f098ab99a4f7eb28c3e53b6a36b556b4f7471f9e7c3d4e991a03c0a925361a15897976c156eb5a9c8add1a325046f6227e0
+DIST firefox-130.0-zh-CN.xpi 667377 BLAKE2B a8ce2ee629c30204726f4e790310180bd2c31866adeb6a25d9e28f48e97dc7f27d9f9b3109e482ac08cfe98316fe9344515054151b3c3d37eee3a6058c0327d4 SHA512 a38673a73056f3ebc301f8cfb2c9fd8e5d764b9224294aab42c3b654dda95bc811a9ee9b1ed707072b39222b05c49deb019a8f51abe135ba9b26f800c928fd39
+DIST firefox-130.0-zh-TW.xpi 669293 BLAKE2B 8743ecdfa6fff21ba6d1c199bb24fca9b753b874e905a84ce805aa7a3e10d1871c22e119ab46b452be2c55cafdef9e8ba8a90e261078b0451ba3cb2e9054645e SHA512 6d12d92f82a7434bc7ffe3d0ab6e706ef230cb31b7889c8b0b4312f3cd0f4712ce59e4b576802b79d5bef552d3c07539d27394288c0f6e0e54998a55f44a62d3
+DIST firefox-130.0.source.tar.xz 568295588 BLAKE2B 9c7dfc43145e442d60f6971806848e4ecd0145713e31105da6bd13a82a50655f5c4095beff4d61505e26e188b60f49b16dc17fb42dc03a9fb9ef509a7010b0ab SHA512 d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40
diff --git a/www-client/firefox/firefox-115.14.0.ebuild b/www-client/firefox/firefox-115.14.0.ebuild
index d7592ecdabb9..02142c4cbddb 100644
--- a/www-client/firefox/firefox-115.14.0.ebuild
+++ b/www-client/firefox/firefox-115.14.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 S="${WORKDIR}/${PN}-${PV%_*}"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="esr"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 
 IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
 IUSE+=" jack libproxy lto openh264 pgo pulseaudio sndio selinux"
diff --git a/www-client/firefox/firefox-115.15.0.ebuild b/www-client/firefox/firefox-115.15.0.ebuild
new file mode 100644
index 000000000000..d7592ecdabb9
--- /dev/null
+++ b/www-client/firefox/firefox-115.15.0.ebuild
@@ -0,0 +1,1393 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-115esr-patches-13.tar.xz"
+
+LLVM_MAX_SLOT=18
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 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"
+HOMEPAGE="https://www.mozilla.com/firefox"
+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="esr"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack libproxy lto openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
+IUSE+=" wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver +gmp-autoupdate screencast"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	!www-client/firefox:rapid
+	screencast? ( media-video/pipewire:= )
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:18
+			sys-devel/llvm:18
+			clang? (
+				sys-devel/lld:18
+				virtual/rust:0/llvm-18
+				pgo? ( =sys-libs/compiler-rt-sanitizers-18*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:17
+			sys-devel/llvm:17
+			clang? (
+				sys-devel/lld:17
+				virtual/rust:0/llvm-17
+				pgo? ( =sys-libs/compiler-rt-sanitizers-17*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:16
+			sys-devel/llvm:16
+			clang? (
+				sys-devel/lld:16
+				virtual/rust:0/llvm-16
+				pgo? ( =sys-libs/compiler-rt-sanitizers-16*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/lld:15
+				virtual/rust:0/llvm-15
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+	)
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.24.3
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( virtual/rust )
+	!elibc_glibc? (
+		|| (
+			dev-lang/rust
+			<dev-lang/rust-bin-1.73
+		)
+	)
+	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.90
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	screencast? ( media-video/pipewire:= )
+	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-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]
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon[X]
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libxcb:=
+	)"
+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
+	)"
+
+# 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 "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!"
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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+=( 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}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+
+	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; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	if ! use ppc64; then
+		rm -v "${WORKDIR}"/firefox-patches/*ppc64*.patch || die
+	fi
+
+	if use x86 && use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*-musl-non-lfs64-api-on-audio_thread_priority-crate.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/0029-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/0029-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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# 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 cargo checksums from crates we have patched
+	# moz_clear_vendor_checksums crate
+	moz_clear_vendor_checksums audio_thread_priority
+	moz_clear_vendor_checksums bindgen
+	moz_clear_vendor_checksums encoding_rs
+	moz_clear_vendor_checksums any_all_workaround
+	moz_clear_vendor_checksums packed_simd
+
+	# 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"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB 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
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-legacy-profile-creation \
+		--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 && [[ ${CHOST} != armv*h* ]] ; 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
+	# 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-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
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	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
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			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 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
+
+		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
+	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
+
+	# LTO flag was handled via configure
+	filter-lto
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		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*'
+
+	# Modifications to better support ARM, bug #553364
+	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 \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# With profile 23.0 elf-hack=legacy is broken with gcc.
+	# With Firefox-115esr elf-hack=relr isn't available (only in rapid).
+	# Solution: Disable build system's elf-hack completely, and add "-z,pack-relative-relocs"
+	#  manually with gcc.
+	#
+	# elf-hack configure option isn't available on ppc64/riscv, #916259, #929244, #930046.
+	if use ppc64 || use riscv ; then
+		:;
+	else
+		mozconfig_add_options_ac 'elf-hack disabled' --disable-elf-hack
+	fi
+
+	if use amd64 || use x86 ; then
+		! use clang && append-ldflags "-z,pack-relative-relocs"
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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
+
+	if use system-python-libs; then
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
+	else
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	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 tc-ld-is-mold && use lto; 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 sys-devel/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
+	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
+
+	# 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 geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	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 desktop_filename="${PN}-esr.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
+
+	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@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+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
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		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
+
+	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
+
+	if use geckodriver ; then
+		ewarn "You have enabled the 'geckodriver' USE flag. Geckodriver is now"
+		ewarn "packaged separately as net-misc/geckodriver and the use flag will be"
+		ewarn "dropped from main Firefox package by Firefox 128.0 release."
+	fi
+}
diff --git a/www-client/firefox/firefox-128.2.0.ebuild b/www-client/firefox/firefox-128.2.0.ebuild
new file mode 100644
index 000000000000..1abb459187c9
--- /dev/null
+++ b/www-client/firefox/firefox-128.2.0.ebuild
@@ -0,0 +1,1368 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-128esr-patches-03.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 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[@]}"
+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 +jumbo-build libproxy lto openh264 pgo"
+IUSE+=" pulseaudio selinux sndio +system-av1 +system-harfbuzz +system-icu +system-jpeg"
+IUSE+=" +system-libevent +system-libvpx system-png +system-webp +telemetry wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+		)
+		pgo? ( sys-libs/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
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	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-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	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 "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+
+	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; 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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		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
+
+	# 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 \
+		--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_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
+
+	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
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; 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
+
+		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
+	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
+
+	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"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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
+		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 search-provider file."
+
+		# 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:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+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
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		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-129.0.1.ebuild b/www-client/firefox/firefox-129.0.1.ebuild
deleted file mode 100644
index 60d216dd53e7..000000000000
--- a/www-client/firefox/firefox-129.0.1.ebuild
+++ /dev/null
@@ -1,1401 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-129-patches-01.tar.xz"
-
-LLVM_COMPAT=( 17 18 )
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="manual"
-
-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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
-	optfeature pax-utils python-any-r1 readme.gentoo-r1 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[@]}"
-S="${WORKDIR}/${PN}-${PV%_*}"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack +jumbo-build libproxy lto"
-IUSE+=" openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu"
-IUSE+=" +system-jpeg +system-libevent +system-libvpx system-png +system-webp +telemetry valgrind"
-IUSE+=" wayland wifi +X"
-
-# Firefox-only IUSE
-IUSE+=" +gmp-autoupdate"
-
-REQUIRED_USE="|| ( X wayland )
-	debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-FF_ONLY_DEPEND="!www-client/firefox:0
-	selinux? ( sec-policy/selinux-mozilla )"
-BDEPEND="${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-		clang? (
-			sys-devel/lld:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}
-		)
-		pgo? ( sys-libs/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
-	!clang? ( >=virtual/rust-1.76 )
-	!elibc_glibc? ( dev-lang/rust )
-	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.102
-	>=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-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
-			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 "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang && ! tc-ld-is-mold ; then
-		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
-			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
-				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		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}"
-}
-
-# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
-# placed here until toolchain-funcs.eclass gets an official support for mold linker.
-# Please see:
-# https://github.com/gentoo/gentoo/pull/28366 ||
-# https://github.com/gentoo/gentoo/pull/28355
-tc-ld-is-mold() {
-	local out
-
-	# Ensure ld output is in English.
-	local -x LC_ALL=C
-
-	# First check the linker directly.
-	out=$($(tc-getLD "$@") --version 2>&1)
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# Then see if they're selecting mold via compiler flags.
-	# Note: We're assuming they're using LDFLAGS to hold the
-	# options and not CFLAGS/CXXFLAGS.
-	local base="${T}/test-tc-linker"
-	cat <<-EOF > "${base}.c"
-	int main() { return 0; }
-	EOF
-	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
-	rm -f "${base}"*
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# No mold here!
-	return 1
-}
-
-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 lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm-r1_pkg_setup
-
-		if use clang && use lto && tc-ld-is-lld ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		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
-
-	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; 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"
-		else
-			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
-		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
-
-	# 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-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 \
-		--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
-	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-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
-
-	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
-
-	# LTO is handled via configure
-	filter-lto
-
-	if use lto ; 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
-
-		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
-	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
-
-	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"
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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
-
-	# 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
-
-	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 search-provider file."
-
-	# 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@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-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
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		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-129.0.2.ebuild b/www-client/firefox/firefox-129.0.2.ebuild
new file mode 100644
index 000000000000..a8cbcdc994e4
--- /dev/null
+++ b/www-client/firefox/firefox-129.0.2.ebuild
@@ -0,0 +1,1370 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-129-patches-02.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 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[@]}"
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack +jumbo-build libproxy lto"
+IUSE+=" openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu"
+IUSE+=" +system-jpeg +system-libevent +system-libvpx system-png +system-webp +telemetry valgrind"
+IUSE+=" wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+		)
+		pgo? ( sys-libs/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
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	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.102
+	>=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-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 "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+
+	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; 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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		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
+
+	# 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-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 \
+		--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
+	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-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
+
+	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
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; 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
+
+		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
+	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
+
+	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"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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
+
+	# 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
+
+	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 search-provider file."
+
+	# 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@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+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
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		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-129.0.ebuild b/www-client/firefox/firefox-129.0.ebuild
deleted file mode 100644
index 7949cab92394..000000000000
--- a/www-client/firefox/firefox-129.0.ebuild
+++ /dev/null
@@ -1,1414 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-129-patches-01.tar.xz"
-
-LLVM_COMPAT=( 17 18 )
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="manual"
-
-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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
-	optfeature pax-utils python-any-r1 readme.gentoo-r1 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"
-HOMEPAGE="https://www.mozilla.com/firefox"
-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="rapid"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack +jumbo-build libproxy lto openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
-IUSE+=" +telemetry valgrind wayland wifi +X"
-
-# Firefox-only IUSE
-IUSE+=" +gmp-autoupdate"
-
-REQUIRED_USE="|| ( X wayland )
-	debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-FF_ONLY_DEPEND="!www-client/firefox:0
-	!www-client/firefox:esr
-	selinux? ( sec-policy/selinux-mozilla )"
-BDEPEND="${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-		clang? (
-			sys-devel/lld:${LLVM_SLOT}
-			virtual/rust:0/llvm-${LLVM_SLOT}
-		)
-		pgo? ( sys-libs/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
-	!clang? ( >=virtual/rust-1.76 )
-	!elibc_glibc? ( dev-lang/rust )
-	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.102
-	>=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-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
-			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
-	)"
-
-# 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 "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang && ! tc-ld-is-mold ; then
-		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
-			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
-				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		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}"
-}
-
-# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
-# placed here until toolchain-funcs.eclass gets an official support for mold linker.
-# Please see:
-# https://github.com/gentoo/gentoo/pull/28366 ||
-# https://github.com/gentoo/gentoo/pull/28355
-tc-ld-is-mold() {
-	local out
-
-	# Ensure ld output is in English.
-	local -x LC_ALL=C
-
-	# First check the linker directly.
-	out=$($(tc-getLD "$@") --version 2>&1)
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# Then see if they're selecting mold via compiler flags.
-	# Note: We're assuming they're using LDFLAGS to hold the
-	# options and not CFLAGS/CXXFLAGS.
-	local base="${T}/test-tc-linker"
-	cat <<-EOF > "${base}.c"
-	int main() { return 0; }
-	EOF
-	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
-	rm -f "${base}"*
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# No mold here!
-	return 1
-}
-
-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 lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm-r1_pkg_setup
-
-		if use clang && use lto && tc-ld-is-lld ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		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
-
-	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; 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"
-		else
-			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
-		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
-
-	# 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-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 \
-		--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 && [[ ${CHOST} != armv*h* ]] ; 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-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
-
-	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
-
-	# LTO is handled via configure
-	filter-lto
-
-	if use lto ; 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
-
-		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
-	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
-
-	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*'
-
-	# Modifications to better support ARM, bug #553364
-	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 \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	# 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
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	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"
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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 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
-
-	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@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-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
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		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-130.0-r1.ebuild b/www-client/firefox/firefox-130.0-r1.ebuild
new file mode 100644
index 000000000000..7a4e40b20452
--- /dev/null
+++ b/www-client/firefox/firefox-130.0-r1.ebuild
@@ -0,0 +1,1368 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-130-patches-02.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+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 autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 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[@]}"
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack +jumbo-build libproxy lto"
+IUSE+=" openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu"
+IUSE+=" +system-jpeg +system-libevent +system-libvpx system-png +system-webp +telemetry valgrind"
+IUSE+=" wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+		)
+		pgo? ( sys-libs/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
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	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.103
+	>=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-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 "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+				einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		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 lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		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
+
+	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; 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"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		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"
+
+	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-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-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 \
+		--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
+	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-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
+
+	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
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; 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
+
+		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
+	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
+
+	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"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# 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 tc-ld-is-mold && use lto; 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 sys-devel/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
+		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."
+
+		# 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:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+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
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		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 b0a1758bd35a..2e477393e06d 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="geckodriver">Enable WebDriver support</flag>
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
+	<flag name="gnome-shell">Integrate with gnome-base/gnome-shell search</flag>
 	<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
 	<flag name="jumbo-build">Enable unified build - combines source files to speed up build process, but requires more memory</flag>
 	<flag name="libproxy">Enable libproxy support</flag>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index d99458ecbd01..0a1c00aa4a83 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_128.0.6613.27-1_amd64.deb 110789532 BLAKE2B 82e607114a0823a29e893710995c8924e9a96d55e4343df7327e8c846c42d57bef741520c89f974a0cc39bb3626c9edee1a29e9e2e5bc89da69b629097b56164 SHA512 4c0c520b268a26d9923b9ef5a6da6c3ea027d86042821af473a3c0433371df62beb0f5c8b23e9ff0ae866d15d760a9521a0ba4724f90f98e6fec3a52ad123182
+DIST google-chrome-beta_129.0.6668.29-1_amd64.deb 111901672 BLAKE2B 741989b7e94e76749cbf107530ac9b7bd0596095853d8ec39eaf4532c3f20f9daf4a22a03ee7dfc9c2a145ec9dcfe382af968bbb4888ff7a48a6eb514f77de45 SHA512 4b67f3b00c90d777226128a4df8fed91d9125c5f14234557e94a053d5b384bf6714b778b0e2cfd06810bc02a6c15940d76ee92d823bacf4479c886dc7c82fb31
diff --git a/www-client/google-chrome-beta/google-chrome-beta-128.0.6613.27.ebuild b/www-client/google-chrome-beta/google-chrome-beta-129.0.6668.29.ebuild
index dd9e9c497aea..dd9e9c497aea 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-128.0.6613.27.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-129.0.6668.29.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f6adf549b826..67cda3d757f3 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_129.0.6643.2-1_amd64.deb 111065344 BLAKE2B 0bbed2207ee9471e0bebc22b3b71b942d9380ac7c1ac6aadbc9e211b1fcbace22d566bdff6dc37bfc222447c97c0b27c7bc6c9f54485fdb3713cc003f9b8b9ff SHA512 747b04b247373a72707fb7429be7ec7a7122d90371fd59a41b0d80181f6c3d1956a612897c4f078dfbfcab1ba939f57202fd759aeee66504a6cf3d6b1ce18658
+DIST google-chrome-unstable_130.0.6699.3-1_amd64.deb 114126496 BLAKE2B d98bcdeacd532fa40dbf3076da7fde055e551dd85560839c789dee3bc7582b8ec86cd593026b233e68fdcd61ee5ab7ad409ab096035648b4808abbc6840f6dfe SHA512 2453fff151b7afcf04d9ec9f9ce978c46da49365502b030bfc05246ff6efc207d47e16dfcf5d6c3a811758613c1afb6cf75ab6fbd044cb4b9bc399fae256325e
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-129.0.6643.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-130.0.6699.3.ebuild
index dd9e9c497aea..dd9e9c497aea 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-129.0.6643.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-130.0.6699.3.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index e527c922de2a..234949b45078 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_127.0.6533.119-1_amd64.deb 109455748 BLAKE2B 6f24e1bcc093f0771e032ccf4a3371ac995455f8ed4646545a58bd94a8b34dbf1d2e82a9c39cc8c22f110d7408a4056dd931a655f24f5004c2c7ba32e9c49093 SHA512 2df346bb75942b167606a7bfcdc1638e42885204c7ea9e0dabdf749421ed38192f014a6d7d68cc541bde07588f54229f3fad5896afc66cbdf7f807187993330b
+DIST google-chrome-stable_128.0.6613.137-1_amd64.deb 110722184 BLAKE2B 111266b9e4b410ac5caf5920db1cb22d442370a734952f870158f6279576ff0399bcef6ef9afb256546cd1023b5d8c142974c3ac6d25171daff0b7d6fff83121 SHA512 4a0cb6e5b24419600bec5ff750d5590f0d6ac30eaa21f006e6f1895f98c3ebf8535cc441576ddc7992302bcc66c81f840800a73932bfd89a9a8053542a83b207
diff --git a/www-client/google-chrome/google-chrome-127.0.6533.119.ebuild b/www-client/google-chrome/google-chrome-128.0.6613.137.ebuild
index a6673ff33b80..a6673ff33b80 100644
--- a/www-client/google-chrome/google-chrome-127.0.6533.119.ebuild
+++ b/www-client/google-chrome/google-chrome-128.0.6613.137.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 450cf1989cc6..7fa3a59bd8ef 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-beta_128.0.2739.22-1_amd64.deb 166632994 BLAKE2B 368191b27c58c0cb3a880da51fba5ce7969497d01c3c25d7dc35b72e0314a6de75c8881fce68b9816a894731163edf781b96378384eccfc81b2df6b2f94fac82 SHA512 97418fb3bf06c58e32d50d51a39691e391eaac29ced91185723c1b9c90affbab5e996ab1385023e8f10e141b40b93e0dd471e8aaca065a018c2789c5366312ec
-DIST microsoft-edge-beta_128.0.2739.5-1_amd64.deb 166638958 BLAKE2B 3db1cbf07165e272bad938b479443324e8897067330090949e304f8d449c81c72f17da29f06227cfd81129e3f973957fc29e3fa5e07a6e88a80e900335415bee SHA512 601b1f8ad8fa64441bd1fbd060c53aaaf19ea41e260cc04faca7e268459a3c7413dd2b9ae6e6a91a9aa736928662a53ba0e89bdf946d4506e95837f9e7ebf423
-DIST microsoft-edge-beta_128.0.2739.9-1_amd64.deb 166616374 BLAKE2B 544277d7e94162325fec7fbde05ff2695fffe3726f84c6fd8f83a1485f6773c09a2729ffabaa9234d0c9b4daa5e0cc93ea07eeb327ca0ab0c3f845937d01105b SHA512 09a74d7388cf97206156f04792377709aaf81d1539b1c29bcf9e3eb026099e5d5e855fa6aeb4b971eb0cdc49fc106f442e4b11ebb72e423ba4dbda183432c946
+DIST microsoft-edge-beta_129.0.2792.12-1_amd64.deb 166721510 BLAKE2B 8a05caeaac967228ee7f871f637ed4369b1b7c90a058297027d82b08d1eafb60ffbcb50c39cb65aa93c1f2831bbc3850e26e856b849f01c8221257d5f4495e9c SHA512 5a979b069b1f616dd18c1be38602beb6c65d603c93cf65081a7daebf0387834f2c59ce4a5925afdadd14bb343e6399466040ff0162141e4e974409c7e4363ffe
+DIST microsoft-edge-beta_129.0.2792.21-1_amd64.deb 166634742 BLAKE2B e3b075b67a26d3975d521419934ac6fe7b3e63a88820a08a7f0ee57fd03c5cab21d3bfdbe80376d4538dd255ae2a37d9bf3a388622670f69172b6575351238d2 SHA512 181dfacb96d68ca2ecf6d5d2fd1275b1710531154bcfc64bda31d8167869b0777686f3c9af18d573e2e54e7f86abb7ec374386e8db0439117c76233561f5ca5c
+DIST microsoft-edge-beta_129.0.2792.31-1_amd64.deb 166681842 BLAKE2B 0069c61fe70d4f0c3faa970acd317aced034ad0fed6719bc4c969d14121b04878eb82708a8995107add2f4047aff9ddf0641e104b04f93c452918adc0a9f14d4 SHA512 085f99e59cf717ec4cfa02458e28f2adc22142e52ed49cb2c0686fb57ed6fa385fe443812873531766f24f3f205ca732a321105060b69351afa9b0f0cedf5ec4
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-128.0.2739.22.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-129.0.2792.12.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-128.0.2739.22.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-129.0.2792.12.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-128.0.2739.5.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-129.0.2792.21.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-128.0.2739.5.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-129.0.2792.21.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-128.0.2739.9.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-129.0.2792.31.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-128.0.2739.9.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-129.0.2792.31.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 941d336be34d..d3321b00f2ca 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-dev_128.0.2739.5-1_amd64.deb 166626450 BLAKE2B 0f6e867144b1be2a2cc7d3c9feea10eac54237100e25e90e1ec263050a06bbe1e7f2d73466ea9ba3b2ed8e088bfba9eaa7608ffb47fed6d5316c9913e5d0d699 SHA512 c9ce3e0bd95e79884a6745402fb06b0f72e94a03082d19c9a1648333ff10d2863c9d58b2e417c7e99cb41e3aa4163f95e593f2c06bacddb4c377dd8816ae04bd
-DIST microsoft-edge-dev_129.0.2752.4-1_amd64.deb 167069118 BLAKE2B 78423c8e3ea5199d1d2d9859ed3d6fd34d1f510f3a46d00f6e05cb9dec18f1ccee5975b468c246c9285db0c1102952c52e82f11974218eb2be7ec1a9df59a977 SHA512 69639507b5ad27625a0f3db294e7dcc8d6d997bcd432c2b170beb74a8c3dc393af29e3538f7000ab60a9166d887d5f3a51e6c099add87ec0a19209826ab4c84b
-DIST microsoft-edge-dev_129.0.2766.0-1_amd64.deb 167098122 BLAKE2B 6c032030e453a6cda63cabed6098b08a633c02ba3a3aa2ac9e1d645644ab5c4759faff9510fb60eff4c61d04d9958c1054d03d9bf742b529de86c55e2f279cf8 SHA512 409fe65e3b9cc31c2f4f278e115e44585ea91dbe3a65672bbcf777cf7b8f63f9db62035d05ae327d32f44a47d46abadba0baa459e962ca27c268fdf74a141b8c
+DIST microsoft-edge-dev_129.0.2779.0-1_amd64.deb 166674210 BLAKE2B 823abb1ac3185b7edcaa7a09ffca39bfc4f39763588288b93e23d2b7a9acc38643ebe779fcf5260cedc1611db8f6dda9fe72f11248ad4e493e44f60c3f695103 SHA512 732436bc2a35b5370ac821fa8be6b9c700868cc8fd3f85de58c71e684736548e38fc94b5cd85f10a99fe76d4ac7c62ad9cf84d05508346654b6f677acc5f9425
+DIST microsoft-edge-dev_129.0.2792.10-1_amd64.deb 166670918 BLAKE2B 1ec9a34a09d45bf872277bc8ae76cc234e5c1d3475721cce8d1ca25f76dfeb53318a92f7d5d488f3770c9000e478480d35a7ad4624f9332c4f871dbc1efee6eb SHA512 5a475bb721660719afbf172162de7d1859685c4121f93658f4fffa388d9408f83566b4b5eba56f08f35f022c8149a188e3425b9e9ffb772baa8a2ecaefdebaa4
+DIST microsoft-edge-dev_130.0.2808.0-1_amd64.deb 166622694 BLAKE2B 610b566acdb45abb0c30bb914150498f4f28999aca8aef1a8cac692b007144b686a8c3099828b4cd43fbae7d99731d14f8bcc4ed17519f6a38147fc3ad715207 SHA512 66728a246f758185ae5d7a32b9a69628720d29d6d1064893834bc800330950cc534994363cb9e5372bafd1376842c0e6932b57cf7c6b63563bc4f084666300e1
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-128.0.2739.5.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2779.0.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-128.0.2739.5.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2779.0.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2752.4.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2792.10.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2752.4.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2792.10.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2766.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-130.0.2808.0.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-129.0.2766.0.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-130.0.2808.0.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index 54e2afba4b64..679e0661e9da 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1 +1 @@
-DIST microsoft-edge-stable_127.0.2651.98-1_amd64.deb 167212578 BLAKE2B 84fde8de1cbd92c0fabb71fbeceab65bfeebd136f846bc076e477eb4b81b9deb60d6555ed79f996fd2bddaf70024a9523dd5afebf27e079b9763c866633f1138 SHA512 c6ae01602250bbcacc224c886de43a1221ced78a8bb78ae33cbe6758989dcf73e9df89cd5113194ce303c8a1251e97492cfdd752207a4c83efddf355f8a38e1e
+DIST microsoft-edge-stable_128.0.2739.67-1_amd64.deb 166720198 BLAKE2B a60c87b25712a04640cb29dc6dabf0951e11874c956997fed42283c2bc684485520aba13218644eb410aabac596fc247f4306bb73ce3222a576f28d57d776b8e SHA512 37af66d65b0999bce821f64b08d25bba657f3ef12d12f358aa850859b482146d5c2e6dfa41a7683df70a65cc1b952bd91a0b62d7a70cb2eeb25fe2aff9040f8c
diff --git a/www-client/microsoft-edge/microsoft-edge-127.0.2651.98.ebuild b/www-client/microsoft-edge/microsoft-edge-128.0.2739.67.ebuild
index 7ea339bd40f9..7ea339bd40f9 100644
--- a/www-client/microsoft-edge/microsoft-edge-127.0.2651.98.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-128.0.2739.67.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 81643bdd51f2..73a381e744e3 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1 @@
-DIST opera-beta_113.0.5230.18_amd64.deb 112602376 BLAKE2B 78ac0099492bdf8cd627e667cf6c8b154f1651acd48a8501c4dc41676c460834f65cefdb8ebbf7ac7f7835a1eae80159b219788ce32ad2f23d2f1ffea1967558 SHA512 6af9ed29643fa5e5345f320a46b84625e1192ee0cd940c250d905c2e851a0fab3ef5553462e3ec9d113b649165da0efb10693c88b915f7e5d9f0e76bce54411c
 DIST opera-beta_113.0.5230.26_amd64.deb 112625452 BLAKE2B ebcdfb139de9c2eb31fd10502f077012838affec9fc5f29a4b77a5b80b42ed88c27280923818719bdc15b086d0cfc464b5b449837fca4f5bf2b925bc8b8e736a SHA512 eeb53b60426bfbe2a4fac95faedbc99b4032c94aa097551f93f965d62682f2edc589fcff23204d5dce00e228ae4a02e8f130166c134b79f94a557fbb1d139959
-DIST opera-beta_113.0.5230.8_amd64.deb 112532940 BLAKE2B eb51349942f229e63436ebf7e1f261624b4e8c9387c3292ef5e5e6e2f5600203582eddd26c3ba8c61ac2f4bf298406855f0c1b7529271c51b9584ac15a7cf8e0 SHA512 0a0858c7fc84634ee04e441dd84fef80ab0b0b591afa07a58b52fc6455cc807a996052b28d96653fbd14a6ade9d8eeb90cbf7973f09b96f10446b47e68db7538
diff --git a/www-client/opera-beta/opera-beta-113.0.5230.18.ebuild b/www-client/opera-beta/opera-beta-113.0.5230.18.ebuild
deleted file mode 100644
index 00ead24ed5e1..000000000000
--- a/www-client/opera-beta/opera-beta-113.0.5230.18.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="126"
-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-114.0.5236.0.ebuild b/www-client/opera-beta/opera-beta-113.0.5230.26-r1.ebuild
index bd4c71870839..bd4c71870839 100644
--- a/www-client/opera-developer/opera-developer-114.0.5236.0.ebuild
+++ b/www-client/opera-beta/opera-beta-113.0.5230.26-r1.ebuild
diff --git a/www-client/opera-beta/opera-beta-113.0.5230.26.ebuild b/www-client/opera-beta/opera-beta-113.0.5230.26.ebuild
deleted file mode 100644
index 00ead24ed5e1..000000000000
--- a/www-client/opera-beta/opera-beta-113.0.5230.26.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="126"
-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-113.0.5230.8.ebuild b/www-client/opera-beta/opera-beta-113.0.5230.8.ebuild
deleted file mode 100644
index 00ead24ed5e1..000000000000
--- a/www-client/opera-beta/opera-beta-113.0.5230.8.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="126"
-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 15e6baf0587c..de0a1a7de7a0 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,3 +1,3 @@
-DIST opera-developer_114.0.5236.0_amd64.deb 112660808 BLAKE2B f494fbaeb439416383dac8e77a22b3b6e26cb54b26b1c042fdbc38ac73b48da15516f05c3d379b288b0bd0c471aaca1c7a9ede423d675c443a748771bdbf71b9 SHA512 d1486d4b8943bb13828931a18933126f4c34ec4c7493dddf4c36b5f9f67daac7631544badf2317f086d295142d736f7f0798547d3712bcec70ccbf6cebd64909
-DIST opera-developer_114.0.5242.0_amd64.deb 112712852 BLAKE2B 350e0359b1ea3382df0d2aca5b5de136a4abcbc5ebdac173251ae5fd2e606eb70efc952f57fd0eea5f4f67b9a5c5bdf476fa3101250a87f8ceb53ff3d4e6a8f9 SHA512 dd7a712bed9ddd992ea50673b2f001b710a776e44cfcc169dd0e7fae6c94d93770cddaf1bb9a7608b6f23c0a1c696530128d0ecee3955c51151d41c45ce081c3
-DIST opera-developer_114.0.5249.0_amd64.deb 112932704 BLAKE2B 6983dadc7c48ea4900f29ad0f64bc528b63ddfa6597e37d37ed8c8ec597cb3b7f69b6497df44a441dac60731e40b5b918a247634d9c53ede24986511774fee8a SHA512 670fa2316a6f09d2dcb0a1eb8a35b28f5450ffb649f6f7c1b935d076008b6449b2c42bf5e26255e9933aee1a1f53c501ce1ff4d54f286c5da8b0123e31917b96
+DIST opera-developer_114.0.5272.0_amd64.deb 113956028 BLAKE2B cf5ab86faa52ccbb62d8f3068513db8b2f5cb74728f013bf46a80f36ffefb3920ceac021c05bccb2ce4a3bcd5b02a9cceacb0b9d073f71cce746a0dbbaab34c3 SHA512 7a398f674868f6d851529540b1f6a9b72ca66a85d468df04d65851b33eb3a0ec08d818838c301fd04fc5ccae2e657f500728d53b4f70d213a23b5aeb2bdadd13
+DIST opera-developer_114.0.5278.0_amd64.deb 114023060 BLAKE2B bafbd057750d07471d6f9474c1132f11e6b84a060bca139dd091ce4b3026505f23a815b4cd213cba7d0b580348feb52ffe55b56c1510d2978adb4acadaf1f152 SHA512 367a561cac20c6f17cb8f7dc726c7770eb334847cbbd2198a8c9ad1f8ba06da0480946a02d7212bc03b8399b193e37b0f67cfba4ab78dc54a9c62c9a7d798822
+DIST opera-developer_115.0.5285.0_amd64.deb 114428424 BLAKE2B 87f919446f65ff960daf0edf6159661c31b6f653d95cc0900b1fb27baf8abad4201cc5a2b61dbd691357c2c0150b24726586b5da8f9c3f94e515dbcb7287d584 SHA512 b984d33851901f42061978df1dfd93011d157e94b4e9fa7be4c858e48cd52a76afcbfe07198eef5f61ab28c3e32d475840e1363f9378b52249fb60d46b4b7409
diff --git a/www-client/opera-developer/opera-developer-114.0.5242.0.ebuild b/www-client/opera-developer/opera-developer-114.0.5242.0.ebuild
deleted file mode 100644
index bd4c71870839..000000000000
--- a/www-client/opera-developer/opera-developer-114.0.5242.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="127"
-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-114.0.5249.0.ebuild b/www-client/opera-developer/opera-developer-114.0.5249.0.ebuild
deleted file mode 100644
index bd4c71870839..000000000000
--- a/www-client/opera-developer/opera-developer-114.0.5249.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="127"
-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-114.0.5272.0.ebuild b/www-client/opera-developer/opera-developer-114.0.5272.0.ebuild
new file mode 100644
index 000000000000..803a7b7c4565
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-114.0.5272.0.ebuild
@@ -0,0 +1,173 @@
+# 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="128"
+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-114.0.5278.0.ebuild b/www-client/opera-developer/opera-developer-114.0.5278.0.ebuild
new file mode 100644
index 000000000000..803a7b7c4565
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-114.0.5278.0.ebuild
@@ -0,0 +1,173 @@
+# 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="128"
+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-115.0.5285.0.ebuild b/www-client/opera-developer/opera-developer-115.0.5285.0.ebuild
new file mode 100644
index 000000000000..803a7b7c4565
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-115.0.5285.0.ebuild
@@ -0,0 +1,173 @@
+# 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="128"
+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 477ed83fab7a..bb8e96857842 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1 +1 @@
-DIST opera-stable_112.0.5197.53_amd64.deb 111244980 BLAKE2B 6213016c7b9c1637d81804f2d3f35dc624c71a30a544b92d12531381f9e53a6ac4bb84e137ed62b81ae071a13adcc747fe43a0611f418e582b2bef58fa519964 SHA512 7b484a50932d3d2400f99fd6df7746d26e06422d1001e6ffd29f8981973c1dd46b8245e92c856aa33dce00a7d3c07fba5114bf02e7ea5c3cab72dd63be15361b
+DIST opera-stable_113.0.5230.62_amd64.deb 113034752 BLAKE2B b12d2b900b74df9a872cb0e563254d9640bbde0e1c8a1fab6538e4dbfeec4ec3448fa8c0b4474bc54c4232aed0f63c4fee2a1ce434c8e2c7647a89773d0fbc99 SHA512 5f0365aaf7acbb9de69e24e27d53a6a984fc65560e6adf97959ede1c9f32d2a142d91db23552350c071827ba84b293779e255f919265ad6f8c5f24da5d537744
diff --git a/www-client/opera/opera-112.0.5197.53.ebuild b/www-client/opera/opera-112.0.5197.53.ebuild
deleted file mode 100644
index 71d9b3421ce4..000000000000
--- a/www-client/opera/opera-112.0.5197.53.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="126"
-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-113.0.5230.62.ebuild b/www-client/opera/opera-113.0.5230.62.ebuild
new file mode 100644
index 000000000000..3b649d9dff1d
--- /dev/null
+++ b/www-client/opera/opera-113.0.5230.62.ebuild
@@ -0,0 +1,173 @@
+# 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="127"
+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 a2e345783187..41b89b5ded82 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,2 @@
-DIST qutebrowser-3.2.0.tar.gz 6054386 BLAKE2B 3f0589dbbc2dc34c4138bc7ea33ea090a6aff4abe087e7b80f0294789a252924fb90b2b0229e1513c96e863a612bf26579b6e895bc0b9b553c1b7439361ee589 SHA512 85980ccbb1982ecfb142a4e3fc0a66b8ac88f73c394a6c936b8f1a541ea30a65ee576abd7e202ac50fd943c85457d75b5ccac7d51ea34ff1b0f7eb8a647aa18d
-DIST qutebrowser-3.2.0.tar.gz.asc 659 BLAKE2B 33d88c2d4020535616ee5d8ed8e517aabf24433ab9d712f12aa1f138398a60807a14383d300245ee7873ed027445034ced9c61ce52a54518a2cc240a01f2649f SHA512 895e6d585f4d1d7373544d763663412136ef4b397565ddac24c1bcf16c75e96c8110cc8dea6fa8457799b893a2e3d2fca8979875b8e8423f270a70100d6e57db
 DIST qutebrowser-3.2.1.tar.gz 6054942 BLAKE2B 7ddae7333b3ae906adc7811e0e383bb384c2105c59db935b96d165653f9570a249f3fedf9ad98f33d1ae7bd19f8637a3e1ed885f88aa724f4ceb61da4b8046a9 SHA512 753f053a157271806e273b667b656d64277d10d012d6940c5e023125e1f8fab151a32cf4defafe167141fe31461e6bf178d01b2d842f7252fd7405729a0edc68
 DIST qutebrowser-3.2.1.tar.gz.asc 659 BLAKE2B d37b81d4dd6b662522c48e4704f2e09d24e4cf87f6ec92389ff841bc80a362a51cac4c7ee1a41d83b4994b2060ea64a57af4220293e93033840838c650a17310 SHA512 9fb75c016ea200735d749f9bfe9c0e85df68a9cc616bd1331e977fe13226baf020a3b09ed37b696511e6668e2e221f15d0cf3731e7070f32fd9da29e8ebef59d
diff --git a/www-client/qutebrowser/qutebrowser-3.2.0.ebuild b/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
deleted file mode 100644
index b58568e40ad0..000000000000
--- a/www-client/qutebrowser/qutebrowser-3.2.0.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
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-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/jinja[${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 )
-	')
-"
-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/pytest-bdd[${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
-	)
-
-	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/qutebrowser/qutebrowser-3.2.1.ebuild b/www-client/qutebrowser/qutebrowser-3.2.1.ebuild
index b58568e40ad0..f889d8fed698 100644
--- a/www-client/qutebrowser/qutebrowser-3.2.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.2.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
+# py3.13: https://github.com/qutebrowser/qutebrowser/issues/8205
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 xdg
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 5525cd7811df..8d8a36382b17 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
+# py3.13: https://github.com/qutebrowser/qutebrowser/issues/8205
 PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 xdg
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index f96a0dd62413..f484c8269c34 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,5 +1,6 @@
 DIST seamonkey-2.53.18-patches.tar.gz 24456 BLAKE2B 0377e701cdb5b40d14a5c6cc16da3f28029afbb8324f14dacfb6d168a8854d7f3ca41ed447efed0cea0fc48045a62da0d8e11af0ea33afe94b7d80ecb214f80f SHA512 4b1afac851098f6987b18c4e43caca05af95f270efa6a9a3a1a01179c5cb9008a1ead0f12b6c92896823d9dab5624c48b84b45ec9255784eccc8585bc3a39ed3
 DIST seamonkey-2.53.18.1.source-l10n.tar.xz 13419252 BLAKE2B 60e3f82987295ba1072f8f60be96f5e86fd581248664256f834a542e8c579ac2d22c10c5859959d75abcf66e6b4d1c0a8811fbc2064cf234eccdcb1c8bd29544 SHA512 7197b746318ba6b0d1e67b5f0a55b0cafafd97528cb5d9866139f77300fef0fdb573285d2f862af92bfc7bfe9cbe05c48e255972e2bda04962ab447e8052f739
 DIST seamonkey-2.53.18.1.source.tar.xz 252530876 BLAKE2B 727e111b0f28ffc783ccf1b232bd7987ac0e5f9f9859e786297ade071914a3fa42f8b21516010c0ab4b3264fc940d55f1f23a31701888d00351a2c3c626df3c0 SHA512 14704779f3fa2fbe133537016259931677b8f7d6256c41aed7e7c3c05da1b015aac90214c7350d84498d32e219f07d298c87e3901dd7f449fd6397fcb6beb160
+DIST seamonkey-2.53.18.2-r1-patches.tar.gz 173309 BLAKE2B 56af0ce3f91fe895f0bf24c8dc35a09ee786d1c2adf8ea6d0971e981cc40c31450068d901c6d171c05c5814c9b3256dc678934048e2cd7b54fc7fb4ac6c7ad00 SHA512 f50bebe9f0b54b5a76b075f743cf94e9bd5d21222865d1477fe26996f2a8b1f3780f05837422752ca7ef32356c03e114f01f02b4a161320ba08a19efdc9ddd78
 DIST seamonkey-2.53.18.2.source-l10n.tar.xz 13419252 BLAKE2B 60e3f82987295ba1072f8f60be96f5e86fd581248664256f834a542e8c579ac2d22c10c5859959d75abcf66e6b4d1c0a8811fbc2064cf234eccdcb1c8bd29544 SHA512 7197b746318ba6b0d1e67b5f0a55b0cafafd97528cb5d9866139f77300fef0fdb573285d2f862af92bfc7bfe9cbe05c48e255972e2bda04962ab447e8052f739
 DIST seamonkey-2.53.18.2.source.tar.xz 252310768 BLAKE2B e10ad79a25d5b6c0a6d1d896e3a2c469361853273950d3e27719d0d5ffd43b3f76b3d7a501bc08632009890f45489ad55d98e5ddbd3542f64e37b8745c96628a SHA512 38f37c1dafcfc64656205b67571b747e6f23287f4969e4713e1e373052df4cffc706de3356580a5715b90958c212291947eaf57d2e3ceeb1501ed81022004fe3
diff --git a/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild b/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild
new file mode 100644
index 000000000000..5eabcd388561
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.18.2-r1.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+LLVM_COMPAT=( {17..18} )
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+PATCH_PV="2.53.18.2-r1"
+PATCH="${PN}-${PATCH_PV}-patches"
+PATCH_S="${WORKDIR}/gentoo-${PN}-patches-${PATCH_PV}"
+
+SRC_URI="https://archive.seamonkey-project.org/releases/${MOZ_PV}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	https://archive.seamonkey-project.org/releases/${MOZ_PV}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz
+	https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PATCH_PV}.tar.gz -> ${PATCH}.tar.gz"
+
+S="${WORKDIR}/${MY_MOZ_P}"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs desktop edos2unix flag-o-matic llvm-r1 mozcoreconf-v6 mozlinguas-v2 pax-utils \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="https://www.seamonkey-project.org/"
+
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
+IUSE="+chatzilla cpu_flags_arm_neon dbus +gmp-autoupdate +ipc jack
+lto pulseaudio selinux startup-notification test webrtc wifi"
+IUSE+=" ${SYSTEM_IUSE[@]}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/nasm-2.13
+	dev-lang/perl
+	dev-util/cbindgen
+	>=sys-devel/binutils-2.16.1
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	 ')
+	virtual/pkgconfig
+	virtual/rust
+	amd64? ( >=dev-lang/yasm-1.1 )
+	lto? ( sys-devel/binutils[gold] )
+	x86? ( >=dev-lang/yasm-1.1 )
+"
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libxcb:=
+	>=x11-libs/pango-1.22.0
+	x11-libs/pixman
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-libs/libpulse
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.31:0=[apng] )
+	system-sqlite? ( >=dev-db/sqlite-3.38.2:3[secure-delete] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	pthread_cond_timedwait_monotonic_np # Doesn't exist on Linux. Bug #905825
+)
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+[[ -z ${GMP_PLUGIN_LIST} ]] && GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	llvm-r1_pkg_setup
+	einfo "Using LLVM slot ${LLVM_SLOT} to build." >&2
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+spkg_setup() {
+	# Ensure we have enough disk space to compile
+	if use lto || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${PATCH_S}/${PN}"
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	if use system-libvpx ; then
+		eapply -p2 "${PATCH_S}/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch"
+	fi
+
+	# Fix for building on x86 https://bugs.gentoo.org/915336 (x86-only)
+	if use x86 ; then
+		eapply -p1 "${PATCH_S}/USE_flag/2021_seamonkey_2.53.17-floating-point_normalization_on_x86_build_fix.patch"
+	fi
+
+	# Patch for people who use their systems ICU 74
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply -p1 "${PATCH_S}/USE_flag/2022-bmo-1862601-system-icu-74.patch"
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Fix wrong include, as suggested by SM upstream.
+	sed -e 's|#include \"RemoteSpellCheckEngineChild.h\"|#include \"mozilla/RemoteSpellCheckEngineChild.h\"|' \
+		-i extensions/spellcheck/src/mozSpellChecker.h || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	# 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.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	######################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	######################################
+
+	mozconfig_init
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+	mozconfig_annotate 'system_libs' --enable-system-pixman
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Broken on PPC64, but outdated and should not be used according to upstream.
+	mozconfig_annotate 'Outdated and broken, disabled' --disable-jemalloc
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Debug is broken, disable debug symbols
+	mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${ESYSROOT}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${ESYSROOT}"/usr
+	mozconfig_annotate '' --x-includes="${ESYSROOT}"/usr/include --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${ESYSROOT}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die
+		fi
+	fi
+
+	if use lto ; then
+		# Linking only works when using ld.gold when LTO is enabled
+		mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		# ThinLTO is currently broken, see bmo#1644409
+		mozconfig_annotate '+lto' --enable-lto=full
+	else
+		if tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+	# LTO flag was handled via configure
+	filter-lto
+
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	# Setup api key for location services
+	printf '%s' "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_use_enable chatzilla irc
+	mozconfig_annotate '' --enable-dominspector
+
+	# use startup-cache for faster startup time
+	mozconfig_annotate '' --enable-startupcache
+
+	# Elf-hack is known to be broken on multiple archs.
+	# Disable it by default, because on the archs that still work,
+	# it also gives more problems than it solves.
+	# https://bugs.gentoo.org/851933
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1706264
+	if use x86 || use arm64 || use arm || use amd64 ; then
+		mozconfig_annotate 'elf-hack is broken' --disable-elf-hack
+	fi
+
+	# Disabled by default. See bug 836319 , comment 17.
+	if ! use webrtc ; then
+	    mozconfig_annotate "disabled by Gentoo" --disable-webrtc
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig || die
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig || die
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if use amd64 || use x86 ; then
+		append-flags -mno-avx
+	fi
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# workaround for funky/broken upstream configure...
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
+	#emake V=1 -f client.mk configure
+	./mach configure || die
+}
+
+src_compile() {
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	#emake V=1 -f client.mk
+	./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	pushd "${BUILD_OBJ_DIR}" &>/dev/null || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	popd &>/dev/null || die
+
+	#MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	#emake DESTDIR="${D}" install
+	DESTDIR="${D}" ./mach install || die
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
+
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use chatzilla ; then
+		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> "${T}"/11${PN} || die
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${EROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	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 "${GMP_PLUGIN_LIST[@]}"; do
+			elog "\t ${plugin}" ;
+		 done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/tangram/tangram-3.1.ebuild b/www-client/tangram/tangram-3.1.ebuild
index d2b66e656457..64b497a9ba4a 100644
--- a/www-client/tangram/tangram-3.1.ebuild
+++ b/www-client/tangram/tangram-3.1.ebuild
@@ -23,7 +23,7 @@ else
 	"
 	S="${WORKDIR}/${P^}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index d92319013d05..cc1a7f2e1cbb 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-snapshot_6.9.3425.3-1_amd64.deb 108248832 BLAKE2B 71f39486fffe45c9a038c94dcfb87fc750b8a47173748139b9abcd7f6562debc8a9397bb8d714133402d76c228b37f83e7aeda1be144386f414076ce824c04b4 SHA512 8af1c339bb7f0f356af75e75369a43f5006ef406f5b4221be2bc72197ea643907bcbfbb883c6a1301a7957cdb5e805976f070cf5f9d6940332b1fb5d31d3ff70
-DIST vivaldi-snapshot_6.9.3425.3-1_arm64.deb 100841716 BLAKE2B b501d34a674d666ea1c4c6efddced7c2e493523a67034efcfa79f21424913b0e46888cae1285466e405a4c43fbace657dfb5295a2a4e67de7da15bb67c90a345 SHA512 97d1703cd549a722136480fd843a4b6037c7de7b46136c908a22cb89489ca3431170bde32c833e9133c8903d704d54c52e206bf62d5d181d36f530991a478802
-DIST vivaldi-snapshot_6.9.3425.3-1_armhf.deb 102089640 BLAKE2B 611baac4f34aa02a2db8282c091072c5d351e7268c9b98163a950984312df55974ecbfaee74927c1679f0cb45eedc054add45db76037ca253ae0b0bf75634caf SHA512 5e0a4b09be57f80d1840f0a299757513d7d7870d40889c3aa8042f8ffa72e8390e00438f98fb20a22c0b010398456a80c74e9b63b538ceba14d3de792e971bfc
-DIST vivaldi-snapshot_6.9.3442.4-1_amd64.deb 109531268 BLAKE2B 40ae03034600b3e83f96653b6e5377089ba839535dd72738208b83ca684659d5e3216195718242112fe64497beefaec7cf5ac2180c87bfe88cd1070eb605c597 SHA512 d4f12fc04a2007a5a2823e646efbdbad1fd4c0e5c418c973dc8848c3e2ed125703432cc1731ab79eea41e13f599427fdf7d73fbc00be9131cb941f8f67c6c3b5
-DIST vivaldi-snapshot_6.9.3442.4-1_arm64.deb 101356328 BLAKE2B 972592f80ef522d0ee5b6629fed42ca3997570d4940f7e69e5784837e78dc80fbf9162ccf7c04773689ecbaddadc09cc721bcd5fa2169c312fd8f26a8751178f SHA512 a4800f7394d4b600390f9c7d319ec85a0fbcf0237abbb6b24444a04996990140a5db8c4df87fe72ddaa7a56e197cfc7709ba6655cfcf86ddf2266b62c749f85f
-DIST vivaldi-snapshot_6.9.3442.4-1_armhf.deb 102393484 BLAKE2B ce454868811d9499c5aee599e14122e052c1139ded982b49a7f25210a2daac65d82bfc4f1c680fbe0ad66226e187425f1ee53b9e75709e685ebb88328143850b SHA512 cb6b919f985ed1f56caeb51c9ca07dd29185da2be133fd3608351f8a973db70cf7a289a43d2296f7b852b9f0d03e9f96942352ba8ac84e8aa741f631638df574
+DIST vivaldi-snapshot_6.10.3458.19-1_amd64.deb 113655044 BLAKE2B a55be731840d832d14841e8c403dff12a480a7a2b92d48efefcb67badfe13158628cb0be30c85455792e909887d6bc41b96e3792c86f67b5ac0b4600b22825c7 SHA512 4d215e05d18fe15dda68e000513bc11dde16e2cee9e516bbcecf12c301a1504988438939aa15019d669d3df4047e184dbb13c2216f2573c9bfbf2085e0061a97
+DIST vivaldi-snapshot_6.10.3458.19-1_arm64.deb 105094044 BLAKE2B d81edc0fb39fc19dfbe226100914ac0c17a0576ca6b0f2ffcd5001cd6029bba67aeebca9aa6f962bc6cce7eec0fb7c9feabd552a2c5585086d6631680aab33b2 SHA512 60800ba6f1e71c197b043f4b91262ce2724ee458ebae82d6c53e52e4417fb3766d2103a5dde1042843e0b9502146ead767f45290d608e6747c1ceb606014177c
+DIST vivaldi-snapshot_6.10.3458.19-1_armhf.deb 106125976 BLAKE2B 99cf0abee90da4c8d197481e686e7e5a83b75e5561cda7b54dfe57ca242d79f617b185d2b69a336f7ac9850874985749489f4325793fc24945962e67baf9034c SHA512 47f261670abdac8c92a5878f8c64a57616ce88f0bdaa45e4c9333a4d9972bf8334481075da08eb422b84cde345343087b7d0964e0b451fbb51d366d4f4588704
+DIST vivaldi-snapshot_6.9.3447.34-1_amd64.deb 113573288 BLAKE2B b5ded230f01bd0e61a56f6ea59fe4e2f056890cc26b2f4c6b9dccf05a7a252a62c41c577c79c115d1945faeff49c3e6fb8f1d01952338fd5afd6bc4f624cac7d SHA512 3bcfd34039ba5b488a399a36df5219a97a5c31fb37df09b718fb9dac5b14d444261382693634681ca56a80699922a391f96fd80bf1be1bbba34a9190581c86fa
+DIST vivaldi-snapshot_6.9.3447.34-1_arm64.deb 105046428 BLAKE2B 3bc6bb289565756d8954f1255e7754cba13632b85ccbfb4be0bacb96b2537b120e88fe5e2f3d879431a6daa2c8a152f219190a6d288c3d7bb1fc10d656fa529d SHA512 0c2ebe6aaf71ac37443c7bf6e8cfab3da9c14c04cdd2b183e2e9da60e8680943493b998b439e074d852a65cb5afdc769812fd68c965b6e4fa9842dd3e257bfee
+DIST vivaldi-snapshot_6.9.3447.34-1_armhf.deb 106125084 BLAKE2B 8e77edffdd7f2f68abed1c701c3c893d361e2be2865251054f6e8e629854fbdc42b6a025a246ea136708a50d68b1fea85cf38cc8627380acbba22d4066043f0e SHA512 57204fb9a1891d8dba7adecab2f8bc6d30e55fedd5f960be96fed1d803e1879c01e590c6c518c37fc65d6511940f197f7a9111c3a1f742ef46ee4ed7d55e8b20
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3442.4.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.10.3458.19.ebuild
index a0fd66eb84bd..a0fd66eb84bd 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3442.4.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.10.3458.19.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3425.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3425.3.ebuild
deleted file mode 100644
index ccc6676d81ad..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3425.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="126"
-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[X]
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${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-6.9.3447.34.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3447.34.ebuild
new file mode 100644
index 000000000000..a0fd66eb84bd
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3447.34.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="127"
+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[X]
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${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/Manifest b/www-client/vivaldi/Manifest
index c8d77094097f..1690ad7003b3 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-stable_6.8.3381.50-1_amd64.deb 108239384 BLAKE2B d0b8e9280a70ef997d4d92ca3819d84fe60ada9e8a47b8d7cc34a2de34b4974a5e8ecdeb328e97615290375b1b948fcc806bb2cd47406587c73cc452860b7984 SHA512 63f8bf9dfad2c03616860a8018f1ce99fe6b182c58eb0d07b2602c2a4c851944c49fdb37cf36493b01ad15000b957fa1b53bafe8ba291be7f61d8fcc3990f3ac
-DIST vivaldi-stable_6.8.3381.50-1_arm64.deb 100820040 BLAKE2B 3a07a6f324ef422f828c557ad2e4dbdd68c280949e814a59cef9fa7c3d0b12ef23b652c2cc8ec0b96cb6f12ea7d154a4ac696ffde404b34d7d0f783a16752706 SHA512 744573f640d5d85cbe55cb104714a7479a678b335ec767ed38ce88fcdd7c6552e3d7a7c66767f4309939e5680c02c936329fd9ac106cefcd4645db4fec632665
-DIST vivaldi-stable_6.8.3381.50-1_armhf.deb 102062544 BLAKE2B baf227cdda918e084f7b575bd415c8b3ca6bda4e62bef3aac80aff48481f0d40cfb445c145cc567ed95e2fbf7badc5610931f946d4be26dae432c1bc9dc781a4 SHA512 1b3da60dc10b82d69d41be111f6be7433bc434e1f5bcc00a466aabc5d298295bc49b4f4388fb84afed8f9bf8d1725545156fb5a962727315b5de635c1bfdd704
-DIST vivaldi-stable_6.8.3381.53-1_amd64.deb 108213244 BLAKE2B 76c3df5733dcd0c3248d095256d6a9c3e76ae1becfe25f93be5e9fb3558d8895de75e07430e587a530b75745e39b8f6c790c335cc7933252c4447e8724fc5c68 SHA512 2f3c2ff1bb8c4381306a4dc4334c64cf4f620c822a68778e9007f722cbc973b63e922318b1530416ded9a9fb45b33d627a0a31a013c201318a48fde0ad468bd5
-DIST vivaldi-stable_6.8.3381.53-1_arm64.deb 100842792 BLAKE2B feb9a018e072d4e35f637caee07e89a90b87fb5cc3d896dbd5b17fca0334491eee92544c34f0ab181e0057ced3d7839b749b2c3d921d7692c08b1e92e7145845 SHA512 2159ca3eb4259f26db54ee4e757fcccd30f8b5ed143bc0a437701e50c6675f57d259ea9fc35c6d0b4a3ba3baa1d17f3a8388d636261692265404bf78a1c32a38
-DIST vivaldi-stable_6.8.3381.53-1_armhf.deb 102066244 BLAKE2B b830264d91c26b1005a93781fa8b3d49beeff8b425286b3e5327006697c662580e5cdcdb5767e20a620ab418b1c7b278a19e87efb3c35225f0461c9ad837fc46 SHA512 0f2080fea92c3d8ea8938c32fb712dcbfb85669420eb0dc12a3415a03284aa7a5322fb529e797fe589053f99a9ff6413ddc6c02adcfa3bbfc8b592828beb1fc0
+DIST vivaldi-stable_6.8.3381.57-1_amd64.deb 108200056 BLAKE2B 48d59945b70d07e315c2d258a4dbcee0786700d0fa4c491bf7c5d1f81f76c5b15a067ad801328f1453cac5bca0abe9c907714b0197ee6c2cf394c46118914e80 SHA512 c0f373c6e83d662852e4aefd2aff3b23396f3b15bec9af7893c171e08a51b7147825a3dacbe1b56ac754e0d66f1a3e39280ba0099708db0dc0d3b77f0a1765d3
+DIST vivaldi-stable_6.8.3381.57-1_arm64.deb 100833760 BLAKE2B cfc2c3c7d83646384a6eb63ae146411377e1b85fa11f42fe9779454c3aa31df69abb6928923fa5bba8865f8babaca365851d750d5bed445a857496cbaa9b4fbf SHA512 c8262b9e87e8d3ba58f7897f97b8d6e5f283711727f427f58a47a7d7bf9ec5dbb35a347c7a1d910d3b2f0db5f7c11d579eb058f6f437369aef932d0dd95e4512
+DIST vivaldi-stable_6.8.3381.57-1_armhf.deb 102067572 BLAKE2B 50d928bc3afefece7e7912bfb85080923f80bb188300f8e780145a188c08030aa8d30d9d747e96346b1425e07680ae363bd6ebaf475bf3b61222ed8cf217aae3 SHA512 7408595e1a426630268309e88b11d0eda8f9c44bf1732e92a5e47842c3630f55b691cb570aa52fbe41735198ce35d778f026d397db79cef133b5c409d47b5a41
+DIST vivaldi-stable_6.9.3447.41-1_amd64.deb 113637436 BLAKE2B 9a588d94b66326c32b658001941da711de9a130ffa3ae0e2d404b623f5cd9c78a0d63dbd06429596329ce90a999691f0b47783eddda21a65f647e87ba17a4b64 SHA512 401670fc70bad9a1f8fd55db189c458f571b950cf0efbaf6275c8cf95fed907c16a717b8654e56f97903bfa85f587fe8922968bee080d0c11e87476faaa71ba6
+DIST vivaldi-stable_6.9.3447.41-1_arm64.deb 105092716 BLAKE2B 3067fb7931e258c404e35cbf3562e235d1061de13155a70e2d86cccc599e2b61afe3c7d04e52f51a4aa38f5a5ac1c7e0ca4271d88d03fcf1ea1edbce09f99e9e SHA512 c7a5c06095d5138539753e094f844371b082f551b7132fe0ccdf40fe333513a1f4bc1e4cac0a8be2d0732bd08674ce49f4b7bdbfc49eb22fa951a9fd16706858
+DIST vivaldi-stable_6.9.3447.41-1_armhf.deb 106139084 BLAKE2B 73e58ca552a403f7f2ff15b63ee4b9ec1707d78653225dafd58b9c5aaa8fcbe1b19eccd82ae1c1dd5fc77b27d3e8d273bd6d2ebe0ff6151a41c8cef322c956be SHA512 347b7b0ba9d35d270fb7a621cf85f36576be44afeede1ce35f4104a1aaeade22594a9c8f7ab07f374d0e6675409ff68d68ca9962a5da0e3b58cb6ce6af215dff
diff --git a/www-client/vivaldi/vivaldi-6.8.3381.53.ebuild b/www-client/vivaldi/vivaldi-6.8.3381.53.ebuild
deleted file mode 100644
index ccc6676d81ad..000000000000
--- a/www-client/vivaldi/vivaldi-6.8.3381.53.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="126"
-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[X]
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${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-6.8.3381.50.ebuild b/www-client/vivaldi/vivaldi-6.8.3381.57.ebuild
index ffe6e8c54085..ffe6e8c54085 100644
--- a/www-client/vivaldi/vivaldi-6.8.3381.50.ebuild
+++ b/www-client/vivaldi/vivaldi-6.8.3381.57.ebuild
diff --git a/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild b/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild
new file mode 100644
index 000000000000..a0fd66eb84bd
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="127"
+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[X]
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${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-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 62fc9ca565d9..086bcc5490ed 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_128.0.6613.27-1_amd64.deb 110789532 BLAKE2B 82e607114a0823a29e893710995c8924e9a96d55e4343df7327e8c846c42d57bef741520c89f974a0cc39bb3626c9edee1a29e9e2e5bc89da69b629097b56164 SHA512 4c0c520b268a26d9923b9ef5a6da6c3ea027d86042821af473a3c0433371df62beb0f5c8b23e9ff0ae866d15d760a9521a0ba4724f90f98e6fec3a52ad123182
-DIST google-chrome-stable_127.0.6533.119-1_amd64.deb 109455748 BLAKE2B 6f24e1bcc093f0771e032ccf4a3371ac995455f8ed4646545a58bd94a8b34dbf1d2e82a9c39cc8c22f110d7408a4056dd931a655f24f5004c2c7ba32e9c49093 SHA512 2df346bb75942b167606a7bfcdc1638e42885204c7ea9e0dabdf749421ed38192f014a6d7d68cc541bde07588f54229f3fad5896afc66cbdf7f807187993330b
-DIST google-chrome-unstable_129.0.6643.2-1_amd64.deb 111065344 BLAKE2B 0bbed2207ee9471e0bebc22b3b71b942d9380ac7c1ac6aadbc9e211b1fcbace22d566bdff6dc37bfc222447c97c0b27c7bc6c9f54485fdb3713cc003f9b8b9ff SHA512 747b04b247373a72707fb7429be7ec7a7122d90371fd59a41b0d80181f6c3d1956a612897c4f078dfbfcab1ba939f57202fd759aeee66504a6cf3d6b1ce18658
+DIST google-chrome-beta_129.0.6668.29-1_amd64.deb 111901672 BLAKE2B 741989b7e94e76749cbf107530ac9b7bd0596095853d8ec39eaf4532c3f20f9daf4a22a03ee7dfc9c2a145ec9dcfe382af968bbb4888ff7a48a6eb514f77de45 SHA512 4b67f3b00c90d777226128a4df8fed91d9125c5f14234557e94a053d5b384bf6714b778b0e2cfd06810bc02a6c15940d76ee92d823bacf4479c886dc7c82fb31
+DIST google-chrome-stable_128.0.6613.137-1_amd64.deb 110722184 BLAKE2B 111266b9e4b410ac5caf5920db1cb22d442370a734952f870158f6279576ff0399bcef6ef9afb256546cd1023b5d8c142974c3ac6d25171daff0b7d6fff83121 SHA512 4a0cb6e5b24419600bec5ff750d5590f0d6ac30eaa21f006e6f1895f98c3ebf8535cc441576ddc7992302bcc66c81f840800a73932bfd89a9a8053542a83b207
+DIST google-chrome-unstable_130.0.6699.3-1_amd64.deb 114126496 BLAKE2B d98bcdeacd532fa40dbf3076da7fde055e551dd85560839c789dee3bc7582b8ec86cd593026b233e68fdcd61ee5ab7ad409ab096035648b4808abbc6840f6dfe SHA512 2453fff151b7afcf04d9ec9f9ce978c46da49365502b030bfc05246ff6efc207d47e16dfcf5d6c3a811758613c1afb6cf75ab6fbd044cb4b9bc399fae256325e
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-127.0.6533.119.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6613.137.ebuild
index 01e48ea7c665..01e48ea7c665 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-127.0.6533.119.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6613.137.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6613.27_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-129.0.6668.29_beta.ebuild
index 3dabec912ba2..3dabec912ba2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6613.27_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-129.0.6668.29_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-129.0.6643.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-130.0.6699.3_alpha.ebuild
index 3dabec912ba2..3dabec912ba2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-129.0.6643.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-130.0.6699.3_alpha.ebuild
diff --git a/www-servers/apache/files/libxmlv212.patch b/www-servers/apache/files/libxmlv212.patch
deleted file mode 100644
index 281633b27ca7..000000000000
--- a/www-servers/apache/files/libxmlv212.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/apache/httpd/pull/393
-
-From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001
-From: ttachi <tachihara@hotmail.com>
-Date: Fri, 17 Nov 2023 22:24:45 +0900
-Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header
-
----
- modules/filters/mod_xml2enc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
-index 34f8e8ee090..0d3d13c1239 100644
---- a/modules/filters/mod_xml2enc.c
-+++ b/modules/filters/mod_xml2enc.c
-@@ -209,7 +209,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
-   
-     /* to sniff, first we look for BOM */
-     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
--        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
-+        ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
-                                              ctx->bytes); 
-         if (HAVE_ENCODING(ctx->xml2enc)) {
-             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index ff4e721f690e..d5973a0c3081 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,2 +1 @@
-DIST gunicorn-22.0.0.gh.tar.gz 368152 BLAKE2B 9d3e2955140d299af86b9370c352d0d7ae2b631a5cdf72200550d3ac8b2e5f51edbc686475d3507f8dfb5f4249ef261e29a6d5fa172e5356777297f5497c7c20 SHA512 cb366cfc2875a32e1e6ddd3bd521650cb87a51c29b036b2cfbd9f8371307d1ffefafbcc85d45753c29186a92def77112e2ddd49fdc2116d2d32702635e88ba53
 DIST gunicorn-23.0.0.gh.tar.gz 373550 BLAKE2B 5f7e74e3554e68863ac32225a95e2e83b69902013bb39f72dbcd150cb30b0698d4fbd2109d1b6e8858fe93b32f4a8aa52fa79cc7346ece769db5426c9caae840 SHA512 1304f348270134a5d9da0d6598f4878a25b3dd7ff96dc9eee1c07ec1031c03cd8bb3de42b6dedf63702588c7e482b18f88a3115e73005bbc4eaaad147d9674ba
diff --git a/www-servers/gunicorn/gunicorn-22.0.0.ebuild b/www-servers/gunicorn/gunicorn-22.0.0.ebuild
deleted file mode 100644
index 6baafbdd6c42..000000000000
--- a/www-servers/gunicorn/gunicorn-22.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="
-	https://gunicorn.org/
-	https://github.com/benoitc/gunicorn/
-	https://pypi.org/project/gunicorn/
-"
-SRC_URI="
-	https://github.com/benoitc/gunicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst )
-
-distutils_enable_sphinx 'docs/source' --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# removed deps
-		tests/workers/test_geventlet.py
-		tests/workers/test_ggevent.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/source/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/gunicorn/gunicorn-23.0.0.ebuild b/www-servers/gunicorn/gunicorn-23.0.0.ebuild
index a19a8dcda301..808ba45e4e9c 100644
--- a/www-servers/gunicorn/gunicorn-23.0.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-23.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
index c61fbf73771c..91cceae8bcc1 100644
--- a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild
@@ -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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD GPL-2"
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
deleted file mode 100644
index c767551ade4e..000000000000
--- a/www-servers/monkeyd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62
diff --git a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch b/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
deleted file mode 100644
index 6b7ca5473ee0..000000000000
--- a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur monkey-1.6.3.orig/plugins/tls/CMakeLists.txt monkey-1.6.3/plugins/tls/CMakeLists.txt
---- monkey-1.6.3.orig/plugins/tls/CMakeLists.txt	2015-10-13 13:23:34.000000000 -0400
-+++ monkey-1.6.3/plugins/tls/CMakeLists.txt	2015-10-14 21:28:27.941930485 -0400
-@@ -2,15 +2,6 @@
-   tls.c
- )
- 
--if(NOT WITH_MBEDTLS_SHARED)
--  option(ENABLE_TESTING  OFF)
--  option(ENABLE_PROGRAMS OFF)
--  option(INSTALL_MBEDTLS_HEADERS OFF)
--  set(MK_MBEDTLS_SRC ../../deps/mbedtls-2.2.1)
--  add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.2.1)
--  include_directories(${MK_MBEDTLS_SRC}/include)
--endif()
--
- MONKEY_PLUGIN(tls "${src}")
- 
- MONKEY_PLUGIN_LINK_LIB(tls mbedtls)
diff --git a/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch b/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch
deleted file mode 100644
index 82550aef4d09..000000000000
--- a/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur monkey-1.6.9.orig/CMakeLists.txt monkey-1.6.9/CMakeLists.txt
---- monkey-1.6.9.orig/CMakeLists.txt	2016-06-04 19:16:47.000000000 -0400
-+++ monkey-1.6.9/CMakeLists.txt	2016-07-01 13:08:51.237213196 -0400
-@@ -285,7 +285,7 @@
- 
-   # Custom PIDPATH
-   if(NOT PID_PATH)
--    set(MK_PATH_PIDPATH ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/ CACHE STRING "Server PID path")
-+    set(MK_PATH_PIDPATH /run/ CACHE STRING "Server PID path")
-   else()
-     set(MK_PATH_PIDPATH ${PID_PATH} CACHE STRING "Server PID path")
-   endif()
diff --git a/www-servers/monkeyd/files/monkeyd.confd b/www-servers/monkeyd/files/monkeyd.confd
deleted file mode 100644
index 818957c9792c..000000000000
--- a/www-servers/monkeyd/files/monkeyd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Add any additional command line arguments here
-MONKEY_ARGS=""
diff --git a/www-servers/monkeyd/files/monkeyd.initd b/www-servers/monkeyd/files/monkeyd.initd
deleted file mode 100644
index c44975ddda24..000000000000
--- a/www-servers/monkeyd/files/monkeyd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/bin/monkey"
-CONFFILE="/etc/monkeyd/monkey.conf"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting monkeyd"
-	start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping monkeyd"
-	local PORT=$(awk '/^ *Port/ { print $2 }' "${CONFFILE}")
-	local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
-	PIDFILE="${PIDFILE}"."${PORT}"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/monkeyd/files/monkeyd.initd-r1 b/www-servers/monkeyd/files/monkeyd.initd-r1
deleted file mode 100644
index 6ec67e11435c..000000000000
--- a/www-servers/monkeyd/files/monkeyd.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/sbin/monkey"
-CONFFILE="/etc/monkeyd/monkey.conf"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting monkeyd"
-	local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
-	mkdir -p $(dirname ${PIDFILE})
-	start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping monkeyd"
-	local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
deleted file mode 100644
index 56d90feb80b4..000000000000
--- a/www-servers/monkeyd/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="debug">Enable lots of debugging info</flag>
-		<flag name="static-plugins">Build statically linked plugins</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
deleted file mode 100644
index 1d194afb20c4..000000000000
--- a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-r3
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
-
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-build/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	acct-group/monkeyd
-	acct-user/monkeyd
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
-	eapply_user
-}
-
-src_configure() {
-	append-cflags -fcommon
-	local myconf=""
-
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	local p
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--default-user=monkeyd \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/monkeyd \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--sysconfdir=/etc/monkeyd \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
-
-	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}
-
-pkg_postinst() {
-	chown monkeyd:monkeyd /var/log/monkeyd
-	chmod 770 /var/log/monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
deleted file mode 100644
index 09c054059b22..000000000000
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-r3
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
-
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-build/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	acct-group/monkeyd
-	acct-user/monkeyd
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
-	eapply_user
-}
-
-src_configure() {
-	append-cflags -fcommon
-	local myconf=""
-
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	local p
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--default-user=monkeyd \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/monkeyd \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--sysconfdir=/etc/monkeyd \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
-
-	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}
-
-pkg_postinst() {
-	chown monkeyd:monkeyd /var/log/monkeyd
-	chmod 770 /var/log/monkeyd
-}
diff --git a/www-servers/nginx/files/http_security-nginx-1.26.2.patch b/www-servers/nginx/files/http_security-nginx-1.26.2.patch
new file mode 100644
index 000000000000..26e3ea6046f0
--- /dev/null
+++ b/www-servers/nginx/files/http_security-nginx-1.26.2.patch
@@ -0,0 +1,26 @@
+From 7d37ace7431ea9704faa98f29876bcd72ef4b1ff Mon Sep 17 00:00:00 2001
+From: Ervin Hegedus <airween@gmail.com>
+Date: Tue, 23 Apr 2024 21:42:02 +0200
+Subject: [PATCH] fix: Added missing header for conftest
+
+---
+ config | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/config b/config
+index c6e7467..3bf06a8 100644
+--- a/config
++++ b/config
+@@ -10,7 +10,8 @@
+ 
+ ngx_feature_name=
+ ngx_feature_run=no
+-ngx_feature_incs="#include <modsecurity/modsecurity.h>"
++ngx_feature_incs="#include <modsecurity/modsecurity.h>
++#include <stdio.h>"
+ ngx_feature_libs="-lmodsecurity"
+ ngx_feature_test='printf("hello");'
+ ngx_modsecurity_opt_I=
+-- 
+2.26.2
+
diff --git a/www-servers/nginx/nginx-1.26.2-r2.ebuild b/www-servers/nginx/nginx-1.26.2-r2.ebuild
new file mode 100644
index 000000000000..fe6db3b44206
--- /dev/null
+++ b/www-servers/nginx/nginx-1.26.2-r2.ebuild
@@ -0,0 +1,1138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - Update NGINX_TESTS_REV to the current available revision and run tests.
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.34"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.25"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+LUA_COMPAT=( luajit )
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/liquidm/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
+HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
+HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
+HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.2"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.63"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
+HTTP_SECURITY_MODULE_PV="1.0.3"
+HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# nginx-vod-module (https://github.com/kaltura/nginx-vod-module, AGPL-3+)
+HTTP_VOD_MODULE_PV="1.33"
+HTTP_VOD_MODULE_P="nginx-vod-module-${HTTP_VOD_MODULE_PV}"
+HTTP_VOD_MODULE_URI="https://github.com/kaltura/nginx-vod-module/archive/${HTTP_VOD_MODULE_PV}.tar.gz"
+HTTP_VOD_MODULE_WD="${WORKDIR}/nginx-vod-module-${HTTP_VOD_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.4"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.8.5"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# nginx-tests (http://hg.nginx.org/nginx-tests, BSD-2)
+NGINX_TESTS_REV="0b5ec15c62ed"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? (
+		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
+		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
+	)
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_http_vod? ( ${HTTP_VOD_MODULE_URI} -> ${HTTP_VOD_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	test? ( https://hg.nginx.org/nginx-tests/archive/${NGINX_TESTS_REV}.tar.gz -> nginx-tests-${NGINX_TESTS_REV}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="!test? ( test )"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	http_vod
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	acct-group/nginx
+	acct-user/nginx
+	virtual/libcrypt:=
+	pcre? ( dev-libs/libpcre:= )
+	pcre2? ( dev-libs/libpcre2:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	http2? (
+		>=dev-libs/openssl-1.0.1c:0=
+	)
+	http-cache? (
+		dev-libs/openssl:0=
+	)
+	ktls? (
+		>=dev-libs/openssl-3:0=[ktls]
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( ${LUA_DEPS} )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? ( dev-libs/modsecurity )
+	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
+	nginx_modules_http_vod? ( media-video/ffmpeg:0= )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types[nginx]
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:mainline"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+BDEPEND="
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	test? (
+		dev-lang/perl
+		dev-perl/Cache-Memcached
+		dev-perl/Cache-Memcached-Fast
+		dev-perl/CryptX
+		dev-perl/FCGI
+		dev-perl/GD
+		dev-perl/Net-SSLeay
+	)"
+# Unpackaged perl modules which would be used by tests
+# Protocol::WebSocket
+# SCGI
+
+# Uwsgi doesn't start in tests
+# www-servers/uwsgi
+
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	ktls? ( ssl )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		${LUA_REQUIRED_USE}
+		nginx_modules_http_rewrite
+		pcre
+		!pcre2
+	)
+	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )
+	nginx_modules_http_vod? ( threads )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+
+	use nginx_modules_http_lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_ldap; then
+		cd "${HTTP_LDAP_MODULE_WD}" || die
+		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_javascript; then
+		cd "${NJS_MODULE_WD}" || die
+		sed -e 's/-Werror//g' -i auto/cc || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_sticky; then
+		cd "${HTTP_STICKY_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		cd "${HTTP_NAXSI_MODULE_WD}" || die
+		rm -r libinjection || die
+		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security ; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+		eapply "${FILESDIR}/http_security-nginx-1.26.2.patch"
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use http3     && myconf+=( --with-http_v3_module )
+	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre --without-pcre2 )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
+		export LUAJIT_INC=$(lua_get_include_dir)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if use nginx_modules_http_vod; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VOD_MODULE_WD} )
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${ESYSROOT}/usr/include" \
+		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED}"/run || die
+
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx/naxsi
+		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+
+	if use nginx_modules_http_vod; then
+		docinto ${HTTP_VOD_MODULE_P}
+		dodoc "${HTTP_VOD_MODULE_WD}"/{CHANGELOG,README}.md
+	fi
+}
+
+src_test() {
+	pushd "${WORKDIR}"/nginx-tests-"${NGINX_TESTS_REV}" > /dev/null || die
+
+	# FIXME: unsure why uwsgi fails to start
+	rm uwsgi*.t || die
+
+	local -x TEST_NGINX_BINARY="${S}/objs/nginx"
+	local -x TEST_NGINX_VERBOSE=1
+
+	prove -v -j $(makeopts_jobs) . || die
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.26.2.ebuild b/www-servers/nginx/nginx-1.26.2.ebuild
deleted file mode 100644
index 14ac4f2e9864..000000000000
--- a/www-servers/nginx/nginx-1.26.2.ebuild
+++ /dev/null
@@ -1,1133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - Update NGINX_TESTS_REV to the current available revision and run tests.
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.34"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.25"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/liquidm/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
-HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
-HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
-HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.2"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.63"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
-HTTP_SECURITY_MODULE_PV="1.0.3"
-HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# nginx-vod-module (https://github.com/kaltura/nginx-vod-module, AGPL-3+)
-HTTP_VOD_MODULE_PV="1.33"
-HTTP_VOD_MODULE_P="nginx-vod-module-${HTTP_VOD_MODULE_PV}"
-HTTP_VOD_MODULE_URI="https://github.com/kaltura/nginx-vod-module/archive/${HTTP_VOD_MODULE_PV}.tar.gz"
-HTTP_VOD_MODULE_WD="${WORKDIR}/nginx-vod-module-${HTTP_VOD_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.4"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.8.5"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# nginx-tests (http://hg.nginx.org/nginx-tests, BSD-2)
-NGINX_TESTS_REV="0b5ec15c62ed"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? (
-		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
-		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
-	)
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_http_vod? ( ${HTTP_VOD_MODULE_URI} -> ${HTTP_VOD_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-	test? ( https://hg.nginx.org/nginx-tests/archive/${NGINX_TESTS_REV}.tar.gz -> nginx-tests-${NGINX_TESTS_REV}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="!test? ( test )"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	http_vod
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	acct-group/nginx
-	acct-user/nginx
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre2? ( dev-libs/libpcre2:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	ktls? (
-		>=dev-libs/openssl-3:0=[ktls]
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? ( dev-libs/modsecurity )
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_http_vod? ( media-video/ffmpeg:0= )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types[nginx]
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="
-	nginx_modules_http_brotli? ( virtual/pkgconfig )
-	test? (
-		dev-lang/perl
-		dev-perl/Cache-Memcached
-		dev-perl/Cache-Memcached-Fast
-		dev-perl/CryptX
-		dev-perl/FCGI
-		dev-perl/GD
-		dev-perl/Net-SSLeay
-	)"
-# Unpackaged perl modules which would be used by tests
-# Protocol::WebSocket
-# SCGI
-
-# Uwsgi doesn't start in tests
-# www-servers/uwsgi
-
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	ktls? ( ssl )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-		pcre
-		!pcre2
-	)
-	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )
-	nginx_modules_http_vod? ( threads )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_auth_ldap; then
-		cd "${HTTP_LDAP_MODULE_WD}" || die
-		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_javascript; then
-		cd "${NJS_MODULE_WD}" || die
-		sed -e 's/-Werror//g' -i auto/cc || die
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_sticky; then
-		cd "${HTTP_STICKY_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		cd "${HTTP_NAXSI_MODULE_WD}" || die
-		rm -r libinjection || die
-		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use http3     && myconf+=( --with-http_v3_module )
-	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre --without-pcre2 )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if use nginx_modules_http_vod; then
-		http_enabled=1
-		export HTTP_POSTPONE=no
-		myconf+=( --add-module=${HTTP_VOD_MODULE_WD} )
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx/naxsi
-		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
-		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
-		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-
-	if use nginx_modules_http_vod; then
-		docinto ${HTTP_VOD_MODULE_P}
-		dodoc "${HTTP_VOD_MODULE_WD}"/{CHANGELOG,README}.md
-	fi
-}
-
-src_test() {
-	pushd "${WORKDIR}"/nginx-tests-"${NGINX_TESTS_REV}" > /dev/null || die
-
-	# FIXME: unsure why uwsgi fails to start
-	rm uwsgi*.t || die
-
-	local -x TEST_NGINX_BINARY="${S}/objs/nginx"
-	local -x TEST_NGINX_VERBOSE=1
-
-	prove -v -j $(makeopts_jobs) . || die
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.27.1-r2.ebuild b/www-servers/nginx/nginx-1.27.1-r2.ebuild
new file mode 100644
index 000000000000..bfc1a4a791b6
--- /dev/null
+++ b/www-servers/nginx/nginx-1.27.1-r2.ebuild
@@ -0,0 +1,1138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - Update NGINX_TESTS_REV to the current available revision and run tests.
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.34"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.25"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+LUA_COMPAT=( luajit )
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/liquidm/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
+HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
+HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
+HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.2"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.63"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
+HTTP_SECURITY_MODULE_PV="1.0.3"
+HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# nginx-vod-module (https://github.com/kaltura/nginx-vod-module, AGPL-3+)
+HTTP_VOD_MODULE_PV="1.33"
+HTTP_VOD_MODULE_P="nginx-vod-module-${HTTP_VOD_MODULE_PV}"
+HTTP_VOD_MODULE_URI="https://github.com/kaltura/nginx-vod-module/archive/${HTTP_VOD_MODULE_PV}.tar.gz"
+HTTP_VOD_MODULE_WD="${WORKDIR}/nginx-vod-module-${HTTP_VOD_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.4"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.8.5"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# nginx-tests (http://hg.nginx.org/nginx-tests, BSD-2)
+NGINX_TESTS_REV="0b5ec15c62ed"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? (
+		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
+		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
+	)
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_http_vod? ( ${HTTP_VOD_MODULE_URI} -> ${HTTP_VOD_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	test? ( https://hg.nginx.org/nginx-tests/archive/${NGINX_TESTS_REV}.tar.gz -> nginx-tests-${NGINX_TESTS_REV}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="!test? ( test )"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	http_vod
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	acct-group/nginx
+	acct-user/nginx
+	virtual/libcrypt:=
+	pcre? ( dev-libs/libpcre:= )
+	pcre2? ( dev-libs/libpcre2:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	http2? (
+		>=dev-libs/openssl-1.0.1c:0=
+	)
+	http-cache? (
+		dev-libs/openssl:0=
+	)
+	ktls? (
+		>=dev-libs/openssl-3:0=[ktls]
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( ${LUA_DEPS} )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? ( dev-libs/modsecurity )
+	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
+	nginx_modules_http_vod? ( media-video/ffmpeg:0= )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types[nginx]
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+BDEPEND="
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	test? (
+		dev-lang/perl
+		dev-perl/Cache-Memcached
+		dev-perl/Cache-Memcached-Fast
+		dev-perl/CryptX
+		dev-perl/FCGI
+		dev-perl/GD
+		dev-perl/Net-SSLeay
+	)"
+# Unpackaged perl modules which would be used by tests
+# Protocol::WebSocket
+# SCGI
+
+# Uwsgi doesn't start in tests
+# www-servers/uwsgi
+
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	ktls? ( ssl )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		${LUA_REQUIRED_USE}
+		nginx_modules_http_rewrite
+		pcre
+		!pcre2
+	)
+	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )
+	nginx_modules_http_vod? ( threads )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+
+	use nginx_modules_http_lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_ldap; then
+		cd "${HTTP_LDAP_MODULE_WD}" || die
+		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_javascript; then
+		cd "${NJS_MODULE_WD}" || die
+		sed -e 's/-Werror//g' -i auto/cc || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_sticky; then
+		cd "${HTTP_STICKY_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		cd "${HTTP_NAXSI_MODULE_WD}" || die
+		rm -r libinjection || die
+		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security ; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+		eapply "${FILESDIR}/http_security-nginx-1.26.2.patch"
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use http3     && myconf+=( --with-http_v3_module )
+	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre --without-pcre2 )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
+		export LUAJIT_INC=$(lua_get_include_dir)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if use nginx_modules_http_vod; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VOD_MODULE_WD} )
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${ESYSROOT}/usr/include" \
+		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED}"/run || die
+
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx/naxsi
+		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+
+	if use nginx_modules_http_vod; then
+		docinto ${HTTP_VOD_MODULE_P}
+		dodoc "${HTTP_VOD_MODULE_WD}"/{CHANGELOG,README}.md
+	fi
+}
+
+src_test() {
+	pushd "${WORKDIR}"/nginx-tests-"${NGINX_TESTS_REV}" > /dev/null || die
+
+	# FIXME: unsure why uwsgi fails to start
+	rm uwsgi*.t || die
+
+	local -x TEST_NGINX_BINARY="${S}/objs/nginx"
+	local -x TEST_NGINX_VERBOSE=1
+
+	prove -v -j $(makeopts_jobs) . || die
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.27.1.ebuild b/www-servers/nginx/nginx-1.27.1.ebuild
deleted file mode 100644
index 749ba9ff4572..000000000000
--- a/www-servers/nginx/nginx-1.27.1.ebuild
+++ /dev/null
@@ -1,1133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - Update NGINX_TESTS_REV to the current available revision and run tests.
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.34"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.25"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/liquidm/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
-HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
-HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
-HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.2"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.63"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
-HTTP_SECURITY_MODULE_PV="1.0.3"
-HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# nginx-vod-module (https://github.com/kaltura/nginx-vod-module, AGPL-3+)
-HTTP_VOD_MODULE_PV="1.33"
-HTTP_VOD_MODULE_P="nginx-vod-module-${HTTP_VOD_MODULE_PV}"
-HTTP_VOD_MODULE_URI="https://github.com/kaltura/nginx-vod-module/archive/${HTTP_VOD_MODULE_PV}.tar.gz"
-HTTP_VOD_MODULE_WD="${WORKDIR}/nginx-vod-module-${HTTP_VOD_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.4"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.8.5"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# nginx-tests (http://hg.nginx.org/nginx-tests, BSD-2)
-NGINX_TESTS_REV="0b5ec15c62ed"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single multiprocessing ssl-cert toolchain-funcs perl-module systemd pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? (
-		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
-		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
-	)
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_http_vod? ( ${HTTP_VOD_MODULE_URI} -> ${HTTP_VOD_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
-	test? ( https://hg.nginx.org/nginx-tests/archive/${NGINX_TESTS_REV}.tar.gz -> nginx-tests-${NGINX_TESTS_REV}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="!test? ( test )"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	http_vod
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	acct-group/nginx
-	acct-user/nginx
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre2? ( dev-libs/libpcre2:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	ktls? (
-		>=dev-libs/openssl-3:0=[ktls]
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? ( dev-libs/modsecurity )
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_http_vod? ( media-video/ffmpeg:0= )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types[nginx]
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="
-	nginx_modules_http_brotli? ( virtual/pkgconfig )
-	test? (
-		dev-lang/perl
-		dev-perl/Cache-Memcached
-		dev-perl/Cache-Memcached-Fast
-		dev-perl/CryptX
-		dev-perl/FCGI
-		dev-perl/GD
-		dev-perl/Net-SSLeay
-	)"
-# Unpackaged perl modules which would be used by tests
-# Protocol::WebSocket
-# SCGI
-
-# Uwsgi doesn't start in tests
-# www-servers/uwsgi
-
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	ktls? ( ssl )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-		pcre
-		!pcre2
-	)
-	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )
-	nginx_modules_http_vod? ( threads )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_auth_ldap; then
-		cd "${HTTP_LDAP_MODULE_WD}" || die
-		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_javascript; then
-		cd "${NJS_MODULE_WD}" || die
-		sed -e 's/-Werror//g' -i auto/cc || die
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_sticky; then
-		cd "${HTTP_STICKY_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		cd "${HTTP_NAXSI_MODULE_WD}" || die
-		rm -r libinjection || die
-		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use http3     && myconf+=( --with-http_v3_module )
-	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre --without-pcre2 )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if use nginx_modules_http_vod; then
-		http_enabled=1
-		export HTTP_POSTPONE=no
-		myconf+=( --add-module=${HTTP_VOD_MODULE_WD} )
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx/naxsi
-		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
-		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
-		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-
-	if use nginx_modules_http_vod; then
-		docinto ${HTTP_VOD_MODULE_P}
-		dodoc "${HTTP_VOD_MODULE_WD}"/{CHANGELOG,README}.md
-	fi
-}
-
-src_test() {
-	pushd "${WORKDIR}"/nginx-tests-"${NGINX_TESTS_REV}" > /dev/null || die
-
-	# FIXME: unsure why uwsgi fails to start
-	rm uwsgi*.t || die
-
-	local -x TEST_NGINX_BINARY="${S}/objs/nginx"
-	local -x TEST_NGINX_VERBOSE=1
-
-	prove -v -j $(makeopts_jobs) . || die
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3b90d2d83c82..98c0e12a363c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,12 +1,8 @@
-DIST apache-tomcat-10.1.25-src.tar.gz 6231246 BLAKE2B bcd216e7c19e521f1514206a0a288a3beb425399c6e0711ba33a20170610d7d743ac106e5cf5c761e921b1acdccf12a32f1a2ec42601818a32087d027a243c6f SHA512 404d1d4906f458d7de0af57283cbd4cdb4be8ffc65176df5b954f946fecacb3b7f714d4e62bb644028ca6160334a43448c665c46a60c8eb585e64c5d6e4195a8
-DIST apache-tomcat-10.1.25-src.tar.gz.asc 873 BLAKE2B 630f45765ce32281e1ee856c7bb6db6d108d1581ac996e1106b3ef6cff51b118869b816b2ea7d3f3de67de451a4bb755fb4c3571dcef4b5380b6ab6378e6595b SHA512 df98514e8da6a215b40785e6398548f8f7b992a36fae66e6a5a1f8563060c9d143436178e98a0c6ab8aed7cfb19ebce5ffa72af8508db1154d24ae290d2b156d
-DIST apache-tomcat-10.1.26-src.tar.gz 6321715 BLAKE2B 80dcb58c5cd917653551779d82cd86a976a9817658aa4627b55f9af0d2ff39a2ec4a99f991c72c53bf4108ae4d692dc300b1f4ddf83713d8f7704099950defed SHA512 c5f5ee1bc5132f24118c3435edb1e2bf4fe01e77c891f599c10022e085ba0e0762b410ac268959c7cf8a72e21396cda8f33e914462253396ed3bb70ce45cbc33
-DIST apache-tomcat-10.1.26-src.tar.gz.asc 833 BLAKE2B f95270ad58918c859281613f8544afaf7566e8bbf1ebde669385b32223a41ca4858114da156fbadfe34cbfb02698f2e8171ca562f9e356cb50a1002059cb5da2 SHA512 cea31b0e9fe996044a7a41a327d22f75cf7ea02b94d390fc319fc6d7f61dbb9baab050b370e092fa13e339522c78a9064f25d5b9d805c5a15ef9b7aa2053b6fc
 DIST apache-tomcat-10.1.28-src.tar.gz 6330343 BLAKE2B 0472035a9577683c7efa6a2ada4cf97c031a4df7c1678185b56da4dcb66d50516b72769aaeac6cfa8831097044b408b9fcab9c4b47fc7a21a86acf5c5cd83568 SHA512 fd69a7068fdfb89ceb2e71f64c7a9c17c54a4ebe65d7ea9936df266630073c6fb7412903a028fce4c465b1f46abb15d13c46fb408668dd937fa7f6bba4a75df6
 DIST apache-tomcat-10.1.28-src.tar.gz.asc 833 BLAKE2B ae94b9f7d3b413e6209215edbf5453e5f90acd975d30a036797a628981560363af2d5da88f82af7114f2032157177151bb25d8cc046c032129bb22ae95e716c2 SHA512 a7ed73b51f78b2bb1461f28ed4b12516b77a5c65c3484269a8c889f111df14e81901cfda17831ba1b964b1d0acf717ae48386eea733255ad12df9e2b46ae2806
-DIST apache-tomcat-9.0.90-src.tar.gz 6311070 BLAKE2B 0e585a798f3bc476e826296a4fb77fde479dd88be7ea4c7f94982714a16ffca7b57ffa4cb527322192631a4eb617c6a3a19d338e592e9642c7e771cc77f7d9a7 SHA512 ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb
-DIST apache-tomcat-9.0.90-src.tar.gz.asc 833 BLAKE2B d8c145bc9d13f79dfe3515a0dad0d389803a1e4353a0d4a164d8837fc037319b04d632db7b4c3aca55e493b9e0e1e0267d5d34f22c3bede143937c0702721d08 SHA512 74ed315b748be390e7a74705a209316625a811d163d0ed1149d58f93c02558953023836422fffbfe9b9bb68036563ad7e764d07dd65fe531fd361dda5ce8192c
-DIST apache-tomcat-9.0.91-src.tar.gz 6325998 BLAKE2B 2ef19aec14df363904a302ff4d8e6a2de17caa056d25bf418031fc018e75b71ad9cf5694706d0152a9147a30a9376f89f776fdc90a67452f03da78814f3e2ea3 SHA512 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4
-DIST apache-tomcat-9.0.91-src.tar.gz.asc 833 BLAKE2B a6d0fbb5fe929ce9badd9d4322a9018f844909bc3707593c496a6412b9240e0b034d638b555ac0e52a73504a4911477d2d4b1eda1f9ca3ffe2f201e52015e9f5 SHA512 88c294cce8168e444bc15c8b995a1c56458a952c73f94ceaeb66445b23e5b8116423f187ab65e358d0cc939b3575cd2a444adf9d59dc704b62f4a85e9970303b
+DIST apache-tomcat-10.1.29-src.tar.gz 6321636 BLAKE2B 5d3bee8eeb8748edfaebd51f70025de85abeb42bcc1748f7b3cbef5bed4e6fde20f49439ff573f36e605ef307e4062a1d9243e7b1cb375ad8f67bfb947b99c30 SHA512 11dbbc2420043a71cf1a174e0066bf3fb6d0df07e87fa5a76769b899af357ed1065b379986e122a6c63d1cdd9890e793a18c6a31793b6f2707950398d0ebada2
+DIST apache-tomcat-10.1.29-src.tar.gz.asc 833 BLAKE2B 638afbd5cbf35040388a712e5369e546da361e4b43983204a4b5e1341e6665b558d288c067bdd916411d42724482078340eeef03a1ebf35115d3e998ebb59aa1 SHA512 108bd120997f407a776ad3ac7b6b2aeb4e17c4c44ca5cf75f3505f6ef8a3141203210099d2c01ad2387ebbed95f0f81865c687e6746161a508de8a0b1745b322
 DIST apache-tomcat-9.0.93-src.tar.gz 6472760 BLAKE2B 85e7da7eca0ac2a6d73b92b7eec73808309399513f326809e5f9343177cca6c8cf321489f6f1bae86426d626f5afda10f844bc77792d05cfdc8ccefb60d51d2a SHA512 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac
 DIST apache-tomcat-9.0.93-src.tar.gz.asc 833 BLAKE2B 93f12701716013d17c4b3dc9b18713274fd1ad0f4455c3ef1bd9469920fc337f8f75784b961a8b83de90da28aff5b9e6e6a12cfc9aa217f9af4826fc6ee51871 SHA512 90977bc66413f1962cc1a00e645718e0f9cec93295110c29685df6cd62602994d142b6909087d7eece05b28fae5194d2c9a42c12027e6cb6e82c177d1fcd4f51
+DIST apache-tomcat-9.0.94-src.tar.gz 6463031 BLAKE2B 4c2e43418c073ab41fc566157b7d8a4dd6134c58f4dfc247b6ccf09c165d350b3741c43cfc619d60b5d8d0837d7774d886ae223f7208663354098bba1bec0bb8 SHA512 d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6
+DIST apache-tomcat-9.0.94-src.tar.gz.asc 833 BLAKE2B bf413914af1deec7bddb2544d857674509abd5d09f0c2a66e28cbe1d81440ccf3676635b837b3035c77a516480da00ea85ef9de38edd18c0bf5c48e5906c86b7 SHA512 a46770cca1fc5d5d9af59f4dfc772a3b97c5908698f3d44590fce7811ec37d57ddcf251c2c96b1144583c94e2ca0a517c28bdd46800c804689740d9840063a36
diff --git a/www-servers/tomcat/tomcat-10.1.25.ebuild b/www-servers/tomcat/tomcat-10.1.25.ebuild
deleted file mode 100644
index 57b3f7e59503..000000000000
--- a/www-servers/tomcat/tomcat-10.1.25.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
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-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 ~arm ~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-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
-		execute.download=false
-		exist=true # skip target="downloadfile-2"
-		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
-
-	# 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
-}
-
-EANT_BUILD_TARGET="deploy"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_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.26.ebuild b/www-servers/tomcat/tomcat-10.1.26.ebuild
deleted file mode 100644
index 5a265187a6e3..000000000000
--- a/www-servers/tomcat/tomcat-10.1.26.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
-
-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 ~arm ~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-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.28-r1.ebuild b/www-servers/tomcat/tomcat-10.1.28-r1.ebuild
new file mode 100644
index 000000000000..46f330d5f41c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.28-r1.ebuild
@@ -0,0 +1,179 @@
+# 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 ~arm ~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.28.ebuild b/www-servers/tomcat/tomcat-10.1.28.ebuild
deleted file mode 100644
index 5a265187a6e3..000000000000
--- a/www-servers/tomcat/tomcat-10.1.28.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
-
-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 ~arm ~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-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.29.ebuild b/www-servers/tomcat/tomcat-10.1.29.ebuild
new file mode 100644
index 000000000000..1c4d65ce7969
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.29.ebuild
@@ -0,0 +1,179 @@
+# 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 ~arm ~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-9.0.90.ebuild b/www-servers/tomcat/tomcat-9.0.90.ebuild
deleted file mode 100644
index 416b71be8c5d..000000000000
--- a/www-servers/tomcat/tomcat-9.0.90.ebuild
+++ /dev/null
@@ -1,168 +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 java-ant-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 ~arm ~arm64 ~x86 ~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-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
-		execute.download=false
-		exist=true # skip target="downloadfile-2"
-		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
-
-	# 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
-}
-
-EANT_BUILD_TARGET="deploy"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_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.91.ebuild b/www-servers/tomcat/tomcat-9.0.91.ebuild
deleted file mode 100644
index e765f1d0ba75..000000000000
--- a/www-servers/tomcat/tomcat-9.0.91.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
-
-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 ~arm ~arm64 ~x86 ~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-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.93-r1.ebuild b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild
new file mode 100644
index 000000000000..122626117fab
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild
@@ -0,0 +1,172 @@
+# 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 ~arm ~arm64 ~x86 ~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.93.ebuild b/www-servers/tomcat/tomcat-9.0.93.ebuild
deleted file mode 100644
index e765f1d0ba75..000000000000
--- a/www-servers/tomcat/tomcat-9.0.93.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
-
-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 ~arm ~arm64 ~x86 ~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-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.94.ebuild b/www-servers/tomcat/tomcat-9.0.94.ebuild
new file mode 100644
index 000000000000..14e23d60b567
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.94.ebuild
@@ -0,0 +1,172 @@
+# 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 ~arm ~arm64 ~x86 ~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/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 50437ac51f93..edfc2688f005 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,2 +1 @@
-DIST appres-1.0.6.tar.xz 118972 BLAKE2B 13e72b26ea51c937e988929626810421f705b7142b3379488b50989114748f5fb2a0d515978dc92c0d0634afdd2fbda1ee4e8f09a1637fc0e70320492d5a61fc SHA512 6d14f6a2ad5c83a4d42d4c51ec9a9f32652dfe7624881f1f41c0b1f4946904e7e5ca81a2fd9f4f4824488ce1bd2a4047f92320626bf33b0f1afc5e6b89d3e2b9
 DIST appres-1.0.7.tar.xz 120780 BLAKE2B f0a958f1c035c90f3db56127e6218be013b00ae5403bd531e7f393c63ff2a303e05a8b36e1819a7fa1d3e57e8978df16b316c354554e6a5eb9ac91a6c28a0e54 SHA512 5948f869124dd7160ffe109b0fc7ccdca45c3b3f551a382a0bcf2c2af9e3832b0d4451e2868ca93a38de8e8e2caf1946ac72936b3256e99a32437d0ddd937a60
diff --git a/x11-apps/appres/appres-1.0.6.ebuild b/x11-apps/appres/appres-1.0.6.ebuild
deleted file mode 100644
index fa571fdd32b5..000000000000
--- a/x11-apps/appres/appres-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 9187aa15a1d7..95352e6ad6d9 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1 +1,2 @@
 DIST igt-gpu-tools-1.28.tar.xz 2597284 BLAKE2B c15a5b0142f2bf54d0b002b5a17ca705b9cc33662b902edb18e0860c8a1d66c911a082f1c60b3b41f184bd72d7f568554a11d69f9b70978d176eef2cdd1f4e38 SHA512 b0bed7fce28a309f5e5b1f044952abf06ede806ef691b4ddbd52ee437bc9c3701822d65c761c69a8ae5b40695d121193f30aa772cdfaf9ab16c800d7fbcd0abc
+DIST igt-gpu-tools-1.29.tar.xz 2944444 BLAKE2B 8d34a2b1a9dfc6d8a23be6d2a45436f531e98f0aa8b05346d5a4f2232d4904fc12cb7a986ee335b2a9a31760de10cfed0d92b7de6052ed75baeadc190c5ebee9 SHA512 1bce6cc916b79bee3562cdee945444bfe925efac37c0df61f8adc17b1aade752cb2e31a05c0dc5de5f2c54256f3319cab7ee45014d5d910e16cca50accd2d1ed
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.29.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.29.ebuild
new file mode 100644
index 000000000000..72aa45ebbf28
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.29.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="Intel GPU userland tools"
+
+HOMEPAGE="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
+fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
+	overlay? (
+		video_cards_intel
+		|| ( X xv )
+	)
+	doc? ( tests )
+	runner? ( tests )
+"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/glib:2
+	sys-apps/kmod
+	sys-libs/zlib:=
+	sys-process/procps:=
+	virtual/libudev:=
+	>=x11-libs/cairo-1.12.0[X?]
+	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	x11-libs/pixman
+	chamelium? (
+		dev-libs/xmlrpc-c:=[curl]
+		sci-libs/gsl:=
+		media-libs/alsa-lib
+	)
+	overlay? (
+		>=x11-libs/libXrandr-1.3
+		xv? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXv
+		)
+	)
+	runner? ( dev-libs/json-c:= )
+	unwind? ( sys-libs/libunwind:= )
+	valgrind? ( dev-debug/valgrind )
+	"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	man? ( dev-python/docutils )
+	overlay? (
+		>=dev-util/peg-0.1.18
+		x11-base/xorg-proto
+	)
+	video_cards_intel? (
+		app-alternatives/yacc
+		app-alternatives/lex
+	)
+"
+BDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
+	default_src_prepare
+}
+
+src_configure() {
+	local gpus=""
+	use video_cards_amdgpu  && gpus+="amdgpu,"
+	use video_cards_intel   && gpus+="intel,"
+	use video_cards_nouveau && gpus+="nouveau,"
+
+	local overlay_backends=""
+	use overlay && use xv && overlay_backends+="xv,"
+	use overlay && use X && overlay_backends+="x,"
+
+	local emesonargs=(
+		$(meson_feature overlay)
+		-Doverlay_backends=${overlay_backends%?}
+		$(meson_feature chamelium)
+		$(meson_feature valgrind)
+		$(meson_feature man)
+		-Dtestplan=disabled
+		-Dsphinx=disabled
+		$(meson_feature doc docs)
+		$(meson_feature tests)
+		-Dxe_driver=disabled
+		-Dlibdrm_drivers=${gpus%?}
+		$(meson_feature unwind libunwind)
+		$(meson_feature runner)
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index 1f80a8afe9ad..72aa45ebbf28 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit ${GIT_ECLASS} meson python-any-r1
 
 DESCRIPTION="Intel GPU userland tools"
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
index 5e0dccb6445b..000383a45e6b 100644
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From 5736ae25541e414a0e950e8c8bcf80d374f3308d Mon Sep 17 00:00:00 2001
+From f716f5e654338cac2bdbf7b55efd0eb6648cfd3d Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -10,6 +10,7 @@ v5: Drop trackball.c and showbuffer.c
 v6: Fix disabling GLU
 v7: Link against libOpenGL rather than libGL
 v8: Rebase
+v9: Rebase
 ---
  meson.build                   | 13 ++-----------
  src/egl/opengl/meson.build    | 35 ----------------------------------
@@ -107,7 +108,7 @@ index be536280..e7122027 100644
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index 86062cbd..729c0df6 100644
+index abf9eeee..729c0df6 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
 @@ -29,11 +29,6 @@ executable(
@@ -116,7 +117,7 @@ index 86062cbd..729c0df6 100644
  )
 -executable(
 -  'es2tri', files('es2tri.c'),
--  dependencies: [_deps_x11, dep_m],
+-  dependencies: [dep_gles2, idep_eglut, idep_util],
 -  install: true
 -)
  executable(
diff --git a/x11-apps/x11perf/x11perf-1.7.0.ebuild b/x11-apps/x11perf/x11perf-1.7.0.ebuild
index 8dc4dd5f6fbf..a8bfea30477e 100644
--- a/x11-apps/x11perf/x11perf-1.7.0.ebuild
+++ b/x11-apps/x11perf/x11perf-1.7.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X rendering operation stress test utility"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/test/${P}.tar.xz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	media-libs/fontconfig
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 2b6705222f1a..cb2aa7ad4150 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1 +1,2 @@
 DIST xclipboard-1.1.4.tar.xz 128912 BLAKE2B f90906d3abb2de0915113d651d5bd4c4cf2a75c4b15c681a7609cd9aa46ce9d3157cdfa5f60ad76ce6a56396d51ae726645b1b43d53125161f362cc3520b6a66 SHA512 efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe
+DIST xclipboard-1.1.5.tar.xz 132420 BLAKE2B a405f3381cba8a8af8be5cd6db50b338fe70994c125b7dfa358c1c46874009ec1a4ab99788e082e8aeb77e1c864de409ef1f9a820dd4e7e42456f5cf3c0623e9 SHA512 9962b8d19e6387c9af87a47d66d81577ec3e2ba1d0aa6f6ca8fa89664ccfb0dd20906e143a4d19a303a4eded4f29c4bd40868477fbf754a79cdb48256846a8d3
diff --git a/x11-apps/xclipboard/xclipboard-1.1.5.ebuild b/x11-apps/xclipboard/xclipboard-1.1.5.ebuild
new file mode 100644
index 000000000000..8f59d649c6eb
--- /dev/null
+++ b/x11-apps/xclipboard/xclipboard-1.1.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="interchange between cut buffer and selection"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	>=x11-libs/libXt-1.1
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
index d14bd67cf4ed..55f5537c9a44 100644
--- a/x11-apps/xinput_calibrator/Manifest
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -1,2 +1 @@
-DIST xinput_calibrator-0.7.5.gh.tar.gz 38126 BLAKE2B 700c124a560ade4636f0861b04d5ed355a7b647fe565fedf8841165c709844ee5928db1c8868c7cce13d12b17bdece4ccdcebd51a6be248142fe7249615cbf4a SHA512 71bd27d5bdde02bdf41793a72743127ee930235db40e642e2584549e224cd9d2b36ad22e1b6a764ed431ab9590bf76c57e0075bc7b81b325caffb439dc755930
 DIST xinput_calibrator-0.8.0.tar.xz 277012 BLAKE2B dfd4d5d96d7e63349b085e399579e21259e35ace4eb7b319c9ee64c51c08021a0d67026771b229780988ea345c2881eedecdc42c232c6e16c3662d7bef6b79eb SHA512 38a06c1c181fb4e7c2a9fe6c9df47536065213bb177e74fb864b2aa62f7851c7bbc825771fc53725b6705d2c7b42ca01ae3c084b3229961aeee1c76bb86c6754
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
deleted file mode 100644
index f8ce7f6cbc45..000000000000
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
+++ /dev/null
@@ -1,40 +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
-
-DESCRIPTION="A generic touchscreen calibration program for X.Org"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
-SRC_URI="https://github.com/tias/xinput_calibrator/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11 #566594
-
-	local myconf=(
-		--with-gui=x11
-	)
-	econf "${myconf[@]}"
-}
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 839726b74b3c..97afcdda4055 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,4 +1,2 @@
 DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
-DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003
-DIST xwayland-24.1.1.tar.xz 1301652 BLAKE2B 0b25776d7b6910b5a122d5ab917506ce933c87b6f0abf908649461f013463001161d1fa5fcaa499c56cfce57f035ad95fd49e28bb3e84ce159eaaad74b5b2799 SHA512 e44f47adab3830846360fd05fdc06d9016832133c662f2e4b0763b98de0c9b48dbfce7d757ffea5538b5fabb68170e5d1057acc1b9a086e396b147deaa750998
 DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c
diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild
index fec9318f2815..999c1ff5a9a8 100644
--- a/x11-base/xwayland/xwayland-23.2.6.ebuild
+++ b/x11-base/xwayland/xwayland-23.2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-base/xwayland/xwayland-24.1.0.ebuild b/x11-base/xwayland/xwayland-24.1.0.ebuild
deleted file mode 100644
index 3b5d437dd588..000000000000
--- a/x11-base/xwayland/xwayland-24.1.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="libei selinux systemd test unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.34
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.116
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2024.1
-	>=x11-libs/xtrans-1.3.5
-	test? (
-		x11-misc/rendercheck
-		x11-libs/libX11
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd systemd_notify)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if [[ ${PV} == "9999" ]]; then
-		emesonargs+=(
-			-Dxorg=false
-			-Dxnest=false
-			-Dxvfb=false
-			-Dxwayland=true
-		)
-	fi
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-
-	# Remove files installed by x11-base/xorg-xserver
-	rm \
-		"${ED}"/usr/share/man/man1/Xserver.1 \
-		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
-		|| die
-}
diff --git a/x11-base/xwayland/xwayland-24.1.1.ebuild b/x11-base/xwayland/xwayland-24.1.1.ebuild
deleted file mode 100644
index 3b5d437dd588..000000000000
--- a/x11-base/xwayland/xwayland-24.1.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="libei selinux systemd test unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.34
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.116
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2024.1
-	>=x11-libs/xtrans-1.3.5
-	test? (
-		x11-misc/rendercheck
-		x11-libs/libX11
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd systemd_notify)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if [[ ${PV} == "9999" ]]; then
-		emesonargs+=(
-			-Dxorg=false
-			-Dxnest=false
-			-Dxvfb=false
-			-Dxwayland=true
-		)
-	fi
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-
-	# Remove files installed by x11-base/xorg-xserver
-	rm \
-		"${ED}"/usr/share/man/man1/Xserver.1 \
-		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
-		|| die
-}
diff --git a/x11-base/xwayland/xwayland-24.1.2.ebuild b/x11-base/xwayland/xwayland-24.1.2.ebuild
index 3b5d437dd588..42fc715664f7 100644
--- a/x11-base/xwayland/xwayland-24.1.2.ebuild
+++ b/x11-base/xwayland/xwayland-24.1.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index fa6673d3a906..7fed240e6e56 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index c857b092c933..ab6a6074e7d5 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,71 +1,47 @@
 DIST NVIDIA-Linux-aarch64-525.147.05.run 262738232 BLAKE2B 742feded05f659fa9965b2eebcc6a269b0355d08b6f2a686dad47c1acf2c20a359f9a9c33184ab2d51044b8823535bd7606180e31d348f362a016fad74cf476b SHA512 d1d9e49e16ee6cc69340a3458566f89fee7b63effdd8cae3e55e40cdfbd35d1e87b958769fd3b2ce5ab29596d88c3ac68189232d7a1dad8c16773faedcf5b568
 DIST NVIDIA-Linux-aarch64-535.183.01.run 269908911 BLAKE2B 93665bfd2c66391b232c0db7faa2b7929048f4eb0ac660726bc45fcee21bcf9b255da5f4fbdc14c281092f31e7603b5b112fc42b3c7d6e4769cdbedf8d0f16b0 SHA512 d2ac1be8c19b359023c31941374911f3adfe1be34aa2821ef582df4c854ac4eefbbcb10aa22583ac8c9d5caf9326bda12ed1ce6343d67479ed37a4887bd17b5e
-DIST NVIDIA-Linux-aarch64-550.100.run 236302320 BLAKE2B 8f3fa9112ad17b385d86a6c0dacfb9ee04c21d9aa2d63981abf2b13d5fd7088044250293e7e833d855cb174f735f556f76a851aff78ced6bc35ef67282fb334d SHA512 5b0fd79be93dd52e23e5976e14a90b4d3ba8f73c3f1b9d567ad8045318712f1489ac7ee068a5d0a3df6920cc408c3c69ff7f0e99c8c6550dc31422fb34daf2c9
 DIST NVIDIA-Linux-aarch64-550.107.02.run 236334785 BLAKE2B 6ed0cfddbe82566e6c9056d10454f6cb289a60e928b05cb64b65ae7ee341888f942e888c556d3e528b3d1228cc1ee14e938fa25c84750f85ab95239fb684f2ff SHA512 a62d5d13089dbc98c022cb3bdf00999d79da7ae370c6e84405ca9e32034f19fcea65ac74845323223f1a8b8f1443e506c60704ba56e6f5add04b2a007d2d443c
-DIST NVIDIA-Linux-aarch64-555.58.02.run 236745104 BLAKE2B 342f5b99aeea0a569974b62322608138a845f197d7ab08fc2e37314187861814f3c1d8d017be07744816aa9d691e8161a60980e1d005701e3f67ab3a07fa03ae SHA512 9c4d78ec381bb6163c6591309a9a40f1dfdb5f3d6b983e1728c17383c5f0871bf3879b32f93c7892d33577a9dacf2dcb1d14639bcc4ca510104f33cb54e83df0
-DIST NVIDIA-Linux-aarch64-555.58.run 236884430 BLAKE2B e84528f1e662409c1fe779ac7c7137808d1c858517cbfe0a5eb5bd992de616be17fbf4b11f8cf5f96f48ec38b6588dc8c74bbda4c3cbf965486db786fa221b5c SHA512 35a2dc801b41f2e5cc5954bbcf26d1d38e1d346353ae2e2a40016f28a7e0d39607d5b9ad2f78600af58642e06935011159386702c5a43a1da272b34061e07bf8
-DIST NVIDIA-Linux-aarch64-560.31.02.run 248528411 BLAKE2B 3da30fa9393356b3daee46f140510b4fb99c711b2a3d1a740a7880e916ef3963ff10795486ae11274f75e6ca134af0d15485efbffd29e7b55b402642babf485c SHA512 068f2ab92454679abdbfddafda36b98d3d045237baabe5f717005d73efdd6c6e36773ceea5915a9811ee21736d031131d77c41fb10b2b386878f7dbe6355ab6c
+DIST NVIDIA-Linux-aarch64-560.35.03.run 251160249 BLAKE2B 3ad8c6757b980668f6483d8867f247857519636a3ea464107e90620557ecdbbfc3437cadb7916655b14e6a85e5929db1f03387494df7daa9169d8fe6b2de1849 SHA512 8df331104f3d63d4aaeeace412a986a93355be3ce69a968fbc12b7d0b21a34e71cdf37758c23a392c358a1c3ba1da21115002f55017c2a829c7bb4d41536e543
 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-525.147.05.run 414135234 BLAKE2B 77a12905771772804a5e5cf36df3e5032fe0160ac7c8a1b4ea002f65dac3732d9c900c1787a3e26d08b951a8de4893467cc7a80d424e017990d12669354d4191 SHA512 0c7b31715fce6a7bd77a2d9f9a3dca54a929a7790d748051576f62cdaeaeb6a9d0f3fbb13f0b20a51966bdb9470acdbc9ee529a9e84f38a9c834a1bd28d81773
 DIST NVIDIA-Linux-x86_64-535.183.01.run 341725273 BLAKE2B a1cc782a960309a25d64d7334a818bdf9bd24be4ae7bbcf76c11c071db614d00c59e4cdca366bd36565a612a262d8b4ede7d8224f6cd3d824128178ad7d2d707 SHA512 02b6b679f4fc1d5305f32fca8ce0875eef04cb99f5611d0bb85ac7607ecdd5b2aa4d60b51bf47546477464531a07fffa5bf3db3859868648bd5e86565d85afbb
-DIST NVIDIA-Linux-x86_64-550.100.run 307021837 BLAKE2B c035aeeb2d2f0a2de283d690985a9202b482658158180cc49c03f0938075d0dc5c59a2e23e766573381f78f2f7ea1ec874f8b56dbf6e3d35a02cb6a4597f8145 SHA512 e779e373c25627430762eed4e92d377b2dcccced7e50aeff466d232e2d13a4e2b8596bfc40ac79090a9ba9260e85cb788c98770de20d4c50837f8e6ecde7a80c
 DIST NVIDIA-Linux-x86_64-550.107.02.run 307251605 BLAKE2B 767300982ac4b28fc731b250141cd0f5e9531424dcecd816e995c6fe63a8e2c15c0a42f9324f93c19da12868fd48abbaa15a1de752b675b88fa45a3c4385f40a SHA512 da0a15f87a4e6562f9a5e087a76b92de873db4849c8fdbf57d7dfe9d524e55dfbd578aef38d8818b9cb712a905a31fd0b97e399c74613943810545c92cf30f9d
-DIST NVIDIA-Linux-x86_64-550.40.67.run 312229530 BLAKE2B 2108aa002c4cb1b40212a074aade5123d1caf08ea079c18ee7605cfd914740c9b77f5da4f5d5dc462a5ef3673834b8f793c9780dddbf57e34a12d1579a223b34 SHA512 21f96a59d3b07700a5f8d7eb19ec10d163d24b0b54ed0a1698ea586c03a59c92647d28e5f99a95b545a47f6e0e3ea3a4c856219d847e8ace8ffd851d9cc41915
-DIST NVIDIA-Linux-x86_64-555.58.02.run 304107617 BLAKE2B df9774e6b33e3600e7425734c91f49ba40956f28391df47d946f7612e28984812fbf0f4d95ffc06d1cb545dd9001b5b956c5816eda50de77063cbafe866835ae SHA512 7a8c84c15d87d2cf5f6261b12d3d683e0a7a1847d7c5461b3995f78b8dd862272fd11be07018593a8d5ef5d8274040f15b9e6fe92e9212dcd7a97be668852433
-DIST NVIDIA-Linux-x86_64-555.58.run 304117789 BLAKE2B cbb7911f11789da886814104d253c5f0784357cadfbfde3def602456386e351f48b4ab7060237d23417ddeb2051e887c3b872574e3ee180416e7f00684509788 SHA512 69ce5a35ab0b3129605ede75a5a9e2575062a8a30e92d2a1a9c6576d1bad8e924c46909a438ffa1d9c22b616060950d52a6a967a96ed1cb1646e6535cf4dcfa9
-DIST NVIDIA-Linux-x86_64-560.31.02.run 322472612 BLAKE2B e6d5619505154a3efd8612443b39925c5b9ba7e61cb14fae6e2228917032dbc62001fd97187a5de41a7bd6cfda4979903c105cb74d6692f1ffbf4bcb3095e10c SHA512 ac54cc6f5820b523c894df2a7591c634f0337d5de72044ef9736218c5ec1e531a7347a4faa7a11eeaa7c3156884c0c909f766dce484cb51f9c68f6b5f83c8935
+DIST NVIDIA-Linux-x86_64-550.40.71.run 312337652 BLAKE2B 1d1bcb9db4af49a9143ee4fa803fa528fba5c748e12e573c3d003fb3d47c96b27c401288b58ac2e9102ab89eb45832d5de20c7870fe45cb65e08df7a6b24cbd3 SHA512 9d36035576e65994e5a9c88802ce8ccd62d1da83f590644135556ec4b97ac8fe9a53730f2a0ced899b1d0936b7d3f458f7ca9842518ab14f25a401604b88ea82
+DIST NVIDIA-Linux-x86_64-560.35.03.run 322523941 BLAKE2B e84819e6c6b75dbe75212b695ee1e7793c16091b1861250b406cdf570a8cae2a8114627f64bdefc8538f12dd6da8d80d3d62d41deeb7211cfaf159f853feba08 SHA512 97137160b64928ff84fd6145a0ebc209c045d6a07ccc53ec6df6ba1fda2ad72038eda7ecdc0a0178a2628aa4e18819a9b3ff3b693b22bdc9de543be0a968f8aa
 DIST NVIDIA-kernel-module-source-525.147.05.tar.xz 10140684 BLAKE2B a8ce7c1d1047be9154fd67366c5bfa13a19f03c883f24ee35043d17d517e83303420449750f9e7adc7142f61564dd5d8e5a19884dbe540514979df6381ff7f1f SHA512 58920b26081a68e05178176edb0ce8ac4a5d365492adf51d6ffe57102385ff08abc5e14741e0500419e62a752441c97051d60939245eea64b039cc7efca15b7d
 DIST NVIDIA-kernel-module-source-535.183.01.tar.xz 12521824 BLAKE2B 5ae8c2c0d9d019b99c947f1581712989325815cfe88ee308df0b710b64c4bc5c501c9741c67e25c47eaf7a114c521a595aabc85d0f05854c0692216f320378c4 SHA512 1c255eeafc79d228b3d76d1d20d1a2dc4583cbbb77db6af48b389694b0daaabd7c1962cf73e1a489e0ab07cf57751770ff8ce5f2489f2489a211e39bd7436637
-DIST NVIDIA-kernel-module-source-550.100.tar.xz 13522104 BLAKE2B 83abd845b7d4aac56807e1d72c1ff82db76a20a21b4d5c56ad0358390dbe7f212f41288e835aef4199c4389d73f2189c876a77c0d42d5f0dfd12db1af8eaed45 SHA512 f25a651660128a134238ca19ddeb7a149044489d2b778f3d026147de3d6ff976ee739d1f94f56dc204ddb7cab435781fa3402af0f3c2e3148d558b8df27580e7
 DIST NVIDIA-kernel-module-source-550.107.02.tar.xz 13521488 BLAKE2B 43996ec8a3df6684e65df4bee03d4652a0a0fab1c7892ad4e1d114abe31818c46e6c3fc0b345936414fedcb9bf0b89805f667c446502c2ba384a1487fb49c115 SHA512 2d1a1d356649cce27a90bd59dd1018f31720e223f16d7ce5c3d9d8a5c495d785269aa486e870cdf91f689f57a290e33000b9d306937667d2bbd3510485e43a2a
-DIST NVIDIA-kernel-module-source-555.58.02.tar.xz 13676856 BLAKE2B f3bdda7afe0726c65947fb86898bfe56dbd5378112db6b292649690ef9fbc822745291c2050ce8d16c312950f0486cb54597c41ca14e1dce151b9eaa55bc5745 SHA512 28b7dd07f31a39eb3aeb1ef51872f5f7d2e9e4ffa4573244f979992014e5e04454227ee5c556d41663e0e2175e7f5cac4cdd740f441a96e3dda49303c2dc8df5
-DIST NVIDIA-kernel-module-source-555.58.tar.xz 13691936 BLAKE2B 70272f51fdd2e2c41b634df28e1d28033b8401e03f66b28245b073b966631932a11f4826fc59d85edc39859c01462fc72ea3f49738c1e9de35e66092fe23a7f3 SHA512 58f10eb0b7c0f1a76c882b409b3cfd210848a262e4387a518c84236da0ea538aabbab28eed2d7e3d17f4a5a3ccf16205d102d6d589b7efade73de3c3cabe0a2d
-DIST NVIDIA-kernel-module-source-560.31.02.tar.xz 15024600 BLAKE2B 1f2371905e10e6658eda34b47b83023b6216630086f41dcc887b3add6985ab114d6d5cb8eba72cc3a4aa7524fa4873338ed7b2b00f51cde7985b4ecb87668eae SHA512 19fefd5a55794af3d8c1df3c9e4b3eb2d93f0f7c60fb4c2f998ce501b1f098afd93583a59d3b2b2646d07986f2c0279b3a635f08823e9a526d58832d35764d65
+DIST NVIDIA-kernel-module-source-560.35.03.tar.xz 15023144 BLAKE2B d56ea634dd76c3031372e4be283f0348d95e87d088025aaf59ed342a550144f3a8cda22b4c56db4cc2a4c2eb5ef2563251b1aeba75c2a35bad7a4a24c2f5e4d9 SHA512 eec3263d09cc809afc4c2c9eed6e0ec1bd2fed71d43f96d2f56c5b507aead96d93c6de93d37b649fc97f1d849aed64942afeae6e0c2be399d39b1ee416c6b863
 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-525.147.05.tar.bz2 147986 BLAKE2B 982e1a95bc255b960913cba1e78675845db472534af6cae054c74ebf82b1e4407211166249b164299f0f81ec643b7c1190e5960ac3c7844322ca42c23dc0a90a SHA512 171f9c235b2bf41dc40a875576e8cad0f4c78ba574e72db3f1ff3644701f327916121ae493cea1aed93f4826d96ef1833e98502d2d4272f4f536bab03f20e5cb
 DIST nvidia-installer-535.183.01.tar.bz2 148412 BLAKE2B 6eff47169ab5b2b4bfec5917bccc0102502aade2ccf523a404e50c8925e407e225d8009ac79ddfc38a1c6b7de361740d60a0896c2e31756e0f2392b77ad44490 SHA512 76e9bdb4b94bcb103710552a1cb64ca5df0765e3248e2723a88bf70277ef52fd5b7074f7a9cf58b9f3a33af9c04b0cb848748e97ba19f02e96a4eaf081b153bb
-DIST nvidia-installer-550.100.tar.bz2 155473 BLAKE2B 9e995497ba99b2a7c8ab7ffb20117f863ad1eec02f30500bd3bbaf0edbcc96552166bf509f347e2ea0af2891b7bd0126587fabeb980838acfe3384f4d37f8282 SHA512 5641190e4502c96f8758f9d88921871a5a2039378f5e00c06f08a525e0d1451e31cc5d8bbeed79099722f62fa76f8fba0b6369dd9f27341f0a08e37ff4165db4
 DIST nvidia-installer-550.107.02.tar.bz2 155423 BLAKE2B 5bd3d57dfd9ca70c38908f5b397d71802bd78ca1de4c6d9b32de147e39adac61028ca56848b2cb10f13717046204b690c86c880034d1f386df9298e7f15c4b65 SHA512 2120f31f9ab92bb3a8da6991c4d5df6cf50ed81e5c6eadcf23f6af98f08ef674e137ac2bf62f1bf76d94f005d0fc9ef2a130d2e606fca929229f358ac51377d1
-DIST nvidia-installer-555.58.02.tar.bz2 158422 BLAKE2B 0f8da2790dcc398859ce7b2e4278b490542b5672e8005fe98b7ba095c8ff62fe3639907755630658f7241097e18f3e92196b1fba0e430da6bf697e8bbe9dc520 SHA512 ef1ce8ef4997858a053c4b6939496510605b0a5d2f1c93ab80f2002fabeae2333da2e877aeb665936ce618fdfed4a6b9a888f6426fd1fda289e6793febbedb37
-DIST nvidia-installer-555.58.tar.bz2 158294 BLAKE2B 933df4e52bcf651abf6d811efd9ac2cbe9df8faabe105f42ad952b2ac1e6180d9773a07729439800d611b65eacc128b191e2b1c07cd30a9668c48d4099b6abb1 SHA512 682ab51ce4b8e939508828d1f3ba7c64aad100dc9322619b12e2425e93f7988aa5189f530fd65b1bfeb47dda600d119df607309649e2c55babe771d847caaf4a
-DIST nvidia-installer-560.31.02.tar.bz2 168962 BLAKE2B e5d1cc5a913f00e6a10781d5b3dca46e8a5765c7a76efb7630e7328c7b792044f96bb45ca5fb7dc5aa4d6027361a143881dc211ca8904b6e961094a5bd6b0ccc SHA512 89f195ac1d16cf90f39c7e19446eb5f93f02b0d6b41984a7e6194892f5fbb84d11d231b93edb833a2dd690b4aa24f3d8221f9275910a86b0e0844deb2878c528
+DIST nvidia-installer-560.35.03.tar.bz2 168904 BLAKE2B 81a1e4070cc36688c8a2e768c304cad4d680f56757addf137c0544aed93345a4587a65e8df5212f1853e1d4f5a882c457866818157f303148603d50a7152f21d SHA512 685cec94e01a0a0282bd013896a1a05d1a061226863431d39bafd31d78a3224879eceed24da5da65f2a6757faef40b999aad624cdbc86de53674d7595b4c763a
 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-525.147.05.tar.bz2 40439 BLAKE2B 3029d39cce928b3f6a6baeb57391ddd412a35e36d880b3036dedf083b6df979ec531360421bdd347aa223821006ae3610b115277804c22614a221258944ea37f SHA512 25939b278bd2354ff787f1d10771d19baa6c691c5243bc647a556e40c4f38c16f6a248b2ce0b4a328d80b768147a188cb2d8b54e39fbfa4cf436d1f3b1b6440f
 DIST nvidia-modprobe-535.183.01.tar.bz2 40623 BLAKE2B 52c6f6758b6881ef61a41a7e245c166a2ab60ac372c031b5211651931f72cbc24af54b3b2ffb9a42b2f0973db7e0ae6d189cbd3cf1e0fbec8628056e4235b873 SHA512 93b802dbdc98bebed89ca72d07401e1b0801504899f30bbac4baac3d3a24bf548f78bcc0418db112299b068e1e278b379d301680cf4b13784206a80a9169c986
-DIST nvidia-modprobe-550.100.tar.bz2 41477 BLAKE2B e11f8d930ae4a08ccc5dfd17417f6a49610d6c5be362fc86f4ccd0205f7c1e8987a319c4e23efd67586d7688c54cf86e5ba74b0756314b935ff6e985175049c7 SHA512 37109981cbd251e1f4fad30b5f5efc9aa8e145a75342bf82147f6621d6c0d8b379e8748b12b0461baa6a9c0be8832edecc2c51270c1f461b9270913420fc18cb
 DIST nvidia-modprobe-550.107.02.tar.bz2 41486 BLAKE2B 4c74caa2f91bda9ad96e6366986e2934776cc31ae3b0dd596fe5d0392cf023a766e2fb2fc765d5886e872935028fda0836df1826fdeea2e2a76701420021778e SHA512 6fc755b50f6ccf25812ed6936560784a7ea5766152f04631829b192a070b47ba68296bc215b60d1f7a9773f2db6388214d55e115794db8cf944a6f64d19ce34f
-DIST nvidia-modprobe-555.58.02.tar.bz2 41721 BLAKE2B 01e83365c1fa1d5ce172f31d180e0735e5d74a49e59c7fdec78ad26f1f70efa981f2a2429e1c815582d3200defe09389d9b84a2a8e4c2f46e1d4528779eb4305 SHA512 5fabde2e8bf534cf6ec8dafe7318c76ef560f336bdb3343d71b784713076a05d063c2e65eb8f965b0776cb02e67f8eed363d8eaea67fd92798d1bd1b74571ec7
-DIST nvidia-modprobe-555.58.tar.bz2 41699 BLAKE2B 9fcac636c33c48272218ea33159b59665bbcf807e2c1dbf8e7c3d52624cb12a7ee406765db63d266ab7694140ab2f40e51a99b26ce65e5f775a24686cdd66b9c SHA512 f60f1ea6fd9ecad7c0aea00546faa32d14f905c5f68ed1ca6f9ef0f91099b3e8afe090dd74d7bd3ddfe6d435be569ea0fb889ea4cc75b7c8c0c2744ab3e1279c
-DIST nvidia-modprobe-560.31.02.tar.bz2 41589 BLAKE2B 004fbd0d28ef1b154c4213af030cf0f101bada6defd9cef8ed43064ef51af5bc11c42150edce57ccc821ad8f21d3b165b3b7618704f8ffa1e68912e88237e23b SHA512 a5af92403aa6f9683a5a8b52cd886d30f4019684c739eea49420a338e7314f6e1f723c3070785a7ea0d70e978256effdf69bbf8629f8a381b702b781c37f70cf
+DIST nvidia-modprobe-560.35.03.tar.bz2 41637 BLAKE2B 4a72161e3569af5b53a6372da51d6980ab6a428207db0ef2c20b87a9abe569a136ece0a332954004e24f4381889826e50fce42c0c362c749adcb0152035e8862 SHA512 ed592cfba5512fde34e1d9b3dfcf3463df447202eb99d1d792f87d0a68c73193d141f82835e9272d315f3de9e973e7d9f64b06a9cb1e6485dd7adce3e9c360f0
 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-525.147.05.tar.bz2 48089 BLAKE2B a9cbf291fae9d7af50a9633fa5e197939674825e72150883b4e89e72165a512c164b4d79522f5b6c329e980e1145d958ba592202e5b73edfd32b149457714982 SHA512 e9685d330d32a5e9864b45a7e099e78ef873188972700747c158c3ab1fc95ea036726c793207fba33d4a50f17b92802366ce1ad38dd110b86ee923f48e622cfe
 DIST nvidia-persistenced-535.183.01.tar.bz2 48585 BLAKE2B 8f000f85ff959b86e7e0a4af0d7ae53cc2aa76670c04ea57c8bd2b7fdcf7ac071dd4a345b9121fcac97db7befac1f2635c41a40ecee4189a646977165a3b3bd5 SHA512 234b25fbd2e3b7573d77336047ea4898b4687d59fd0ab9cbe5c01dd33f14db610f467674120cc6ce2f3fa77ea53c9d3e23025e08afbabe07e5f6109840f6213c
-DIST nvidia-persistenced-550.100.tar.bz2 49665 BLAKE2B d0a2cf3f2eed9352982d2e8552bdc32ad72ac8feafdff0efaff0fd3196de0fa4e0ef7712220bc1aa021dcc903a40ad6ff3ff1b7dd878e69efdc0b9acacc8300f SHA512 e51af761dc50522d05aba22c91b18b1ed8c251c075691579a5ab5b80ab3507974140009041f9b74828bf7af3b9884a3aeb212c1ad7eec7c88cfa6d3c242c2907
 DIST nvidia-persistenced-550.107.02.tar.bz2 49661 BLAKE2B 695bcf0211194263b38444305c5b6bd6a13331ab57c05bd85d9ea5e007af37e34b96bc450fbcb92bb12050d75c3885d51563fdc2a827f25a433283b067e204ee SHA512 6b398f53a3670d73c13be364d1c7acd563878ebe1162ff5fd0f1f3749c20284a8dd9d98cadccf1fc0b354f353006a3dd2acfd066f98601e6fe1577f0dc59631f
-DIST nvidia-persistenced-555.58.02.tar.bz2 49877 BLAKE2B 8423f34ba517ecfbb782a648ca07f99f161cd153400bfa32e04ab98e8f72cea2afa60d11d2e05e1f31ce21ed33899cc6945fa56d6e313ed8af67aebf93467879 SHA512 16f7884a53007226206761e4d9fed8d672c6ca31ca59c70e8931bcd0d772d77f0b0078071505ab1bc198f713a94a12f132b7e3fee054f859db9ca6fe25404117
-DIST nvidia-persistenced-555.58.tar.bz2 49920 BLAKE2B 400b57aba66aa1dfbc17ba6d2c539aca2ee65d70c152e61cea1bc33977a64951ca7eea72b431aaa3009349131e1cca09cdae33cf48edbddb6b73e4db190f066e SHA512 3068c37966ae59de709fa7ce4d6465570657c67e10b254c6bfc7002cb44c6bebf0761aed50ffc8e64c7763116051997cf71ac56e31b1eb5d6467ad382c4ff97d
-DIST nvidia-persistenced-560.31.02.tar.bz2 49899 BLAKE2B 1741bef9463efc46c8ffae130f881df059645894c7de2ccca90a0adb786090edc20c3e5df0556d31b7771d32c1c173457ca3abf912dd332bc38721819a6b2918 SHA512 573e260f3cc3a1a690c0dd4010f9182d9f15a78ad612258a98f882b750644a134eb4d06829c4ae03ae2fa6fa6b9e92a9a06322c74079abf8a9d9c38d6c0c9c76
+DIST nvidia-persistenced-560.35.03.tar.bz2 49873 BLAKE2B 5b19e8bef623d3950948fcf2a57c097e451c846e1d3013344ce8f10b91e57d3f031c460a9a9e4d94940ed3035d4d5836e5ff672d25f0f132ea915eeac62b94de SHA512 65c12503f8b457de704c58e7f066c1938645d88cc8b986a2fa993dcc5c60f45b72b22950df9419577c37e815e65b6e3749d4ce551457ac1bd868e24093074fbe
 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-525.147.05.tar.bz2 1088088 BLAKE2B cea74a20ed8208f99cb586bd40fe2cafeec55ca2db19b2c0691d3bcabadc09941ff8288e940582e63f10d8f6cd7e8813e1c5776bf65cdc7b6ee291a8b3a7e28f SHA512 9c29a477b32db3f4324d7c6d28b8da9f3de5286e39f8c67bae88a93c3d3ee0c3f0a0f3e0c29c1fa8ba01b7311623569df27e349d6148ed70b3fd42ebd36f0dcd
 DIST nvidia-settings-535.183.01.tar.bz2 1094944 BLAKE2B 70d8deff3b587f54fcc6eb9b4a6396493e9aa89ced07bbaecd517e3a3f18ed4ab093777c0a74ddba24cb7e3ec4bd89a91e3f3ab877345e36fa6f8b71928af2dd SHA512 b7bcfdc48d053419e58d6eca762e55814feeb9ad992a134dd870ed899f4f2fab60fbc30f2c12b655bae248bab1602efaf02d31c0cabae1dbb8044d1b7c65b834
-DIST nvidia-settings-550.100.tar.bz2 1098945 BLAKE2B eef86654dc6d5db0484403e2da39ebbbb4e7e1808d05c0c6ead8203b0934832cfb4860825b756af5c4ad707dfd40a3a781512159bd58bfd2547facea2b7ada35 SHA512 21e4d0f2effa964f1fcb8ac5b6fb1306184dcd9417b12e0e2060a68b4358a21ac967c09d18130a3fbf369893a6646ff2c7867c72bf02ab5974fcf9b925d2bec7
 DIST nvidia-settings-550.107.02.tar.bz2 1099298 BLAKE2B 5a393970b1163cd082f3ab61ddacd22599d43755b059ea84f245dfc28a436ad6c000704326e1fab29ba0a60f7f0ba5ecb51928e12caa870ed87bd38bbaf2128d SHA512 aacda2c6648932c0c3558a59a8d40bd5b27750009939addd455b211962a5840a79b87ba52fbb77d4b0fe5da2184d13c31bd5bdb6ea7ed53d0b0a9552985f3551
-DIST nvidia-settings-555.58.02.tar.bz2 1100319 BLAKE2B eca06045a50d7d5963fa4f1fe9c9e4e1e693be392b42ccc069893443734a1725046803c8bd0ea06ff9b256f26b99184196a805c602710ead599e9cdb8ab1a223 SHA512 b86c4192f2b6cc5fae57bfe627b6ada0a9c936e90cd898baa448140627c7e9cdf3368021da2a94ec699ac1f5a08bb462766a573a028f81194361b9c642a1253c
-DIST nvidia-settings-555.58.tar.bz2 1100157 BLAKE2B 7d7077bc6844835cd9234dff5de6c9e82b388a947fd3d5deb35585eb79a00e05deb34bcd1ef205bde5bad842b1ca9bd6853c7f6b322f1bba98307b5d0ae89a43 SHA512 e764d88cfc0530d0d6e658a076fff1b0a99034704152d0962bff4a26393a5a0287f3af6f6c55cf663bfcfd02f373626cf976d48a6699a62f2ba09200e602cb7c
-DIST nvidia-settings-560.31.02.tar.bz2 1115599 BLAKE2B ea38654aa22a6e8b4269d742a31aa5ffb161857a0469414493d19bf45824a5e7fdd9be81a2505ed4aa7d08ee6f11e717ec4dc7710fe75eabc95d79074cc4ab4b SHA512 51f63cc3dd05cbfc4b6ba87583b4b215172d3e3825a6683d78871b4de1fa24c0d2d7d80de3404fb3a3f6f7e2dcd69cfe40c88e88e0da2392000d8c87175ccdbc
+DIST nvidia-settings-560.35.03.tar.bz2 1115724 BLAKE2B 937a3ea634e9bbc4b76f6c50fd20108c783a941e021a3fe1a9fd3288248fe14069f4e7b147cb3666e1d6bab91be2c0305daaeee57d338b9af546cefc79725be1 SHA512 7ed656ebe35ce55a0064dae57fdcc5c3eecc3c6db71bfc66f001dd60c4db764c6a2565af29f84ca1246280fbd573d8da4d09e21444b71210cedea5d1462b85f0
 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-525.147.05.tar.bz2 110987 BLAKE2B 49116c8922b5c14eaa88b6230a824447609a885f7d97df28ed4f3b9a2e146a213f31f9f184aadd38c4c9f692f0a1476d0db0704b55947ce95cbbeebcb9a683da SHA512 4b7c02de6080924eee5ee9fe770e632404b380529e5ee40a8d0f259a5c96d6915e83c26113b3c65434ce461c959347b3651abc15de7c40def16c46bb3f6faeae
 DIST nvidia-xconfig-535.183.01.tar.bz2 110994 BLAKE2B 154f0e3885fdc2a30373daad07924b109b1763a08d8d9a53e40037471548e9068762b6ce157ae3de7c3c0d7f0f33d02b875b9bc98d0b99888edf00722b0201f1 SHA512 101c0f3da4452e1bf5f4283f17297384e320c81f1bcf20a5eef2fca4802e91795782afbc5eb73f0620285b4c43eba25a80a65eaa8cc4d126036c83f6ce710adb
-DIST nvidia-xconfig-550.100.tar.bz2 111231 BLAKE2B 06df20f15b17ffc43540d02e9bd5b5334e995234a05c36f11523e2a808c8c431f49ac7b45f2c3f1a8fafbf54c2f18204d9cf319f764288d23b93140bf6e77ec2 SHA512 83d09670c0615c47c3493abdebb4ee10aa45340b405729b477dc16cbab3f33c64e34c32faccaa408f2a4260875e0a6fce607fa0e0e041f467e72ec38f1c08b45
 DIST nvidia-xconfig-550.107.02.tar.bz2 111170 BLAKE2B dbf2b0b7f7b71f17ce5a0b6ae1c5346a573ea11163b24c4bce1b18281d4af70f38458bc122c39ad948242a8cfc37b68e696141b8dd3ce16f9ae7fb3fb61af735 SHA512 a7b9ba8d542041b273deaeb354c398fba4241dfdcf68be71e1c1138c925206db0f7ce2945c5ec92eddbcdbf240c5340802b3989e6140593828d1eb79854730e3
-DIST nvidia-xconfig-555.58.02.tar.bz2 111182 BLAKE2B f51275158f02687e54e856f3f7e9f92b01c6c7aba423e5384cf3d4e692dc6d3fdc73ed0b25f26fb1206dc1219b6e0bffd54767e0f0f3b4b3a63875113d55236f SHA512 673bea01fe39687ba34e19b743c61898d2ed8f34710c3a1afc8f2e71e0903950f253408b0fcf0b6306a98ddc2438cacd92fafd1d1662136b18058017dfb783c4
-DIST nvidia-xconfig-555.58.tar.bz2 111298 BLAKE2B ee7559b8121014134266506306c066adc5dc3d2f919e5a98355240b1ace8335461906a562e2c21640a91ab31906cddfd63f2193a0c97ac9e105aaf79c1bdf9a3 SHA512 5f7810977a238fff15849b0fab5b31177b358275328789c581fc64459a71fed0ec12ce372b32fc927f00327d41ff83e1ebe26351c989056e19fa1a38a661a5b6
-DIST nvidia-xconfig-560.31.02.tar.bz2 111152 BLAKE2B 4b8a3ff45a4c696a344c8159c1ce0f07925d5484358aadbca02ac1b2f6557a384db5400466c2b7e89636cfc32ec20a8aff44c58b7fcd451acc794386b501689d SHA512 bea8f13b927721c2ce3c04166a34cb35056b5d86f2772e7606528af9345a11dd6fbc824fb177bdc5d9353b3cb68681fe5672f6be42fda0826ef4b87c93c4973e
-DIST open-gpu-kernel-modules-550.40.67.tar.gz 13813143 BLAKE2B 58f4e990b28b31896c137aef5949723b50ad7ced037f28154d5368b1d69d5c52d028d379f55f328d876270681b8be80a650d593cebaf7e489572fadac67017cc SHA512 72d1b853b56f749f461cacd90eb342cea0341f13e45b1bbe3d88d700d9c1632a4bca70f92cacde81017f95db6efd75f35f294cb8b5363fdac9a291c62946a169
+DIST nvidia-xconfig-560.35.03.tar.bz2 111203 BLAKE2B 347d4f80b9a16da54fbd7116d0ceafbb15b3b6e78aa1640b8505674b9ffc32056197925b67506d2cbb5d130054944c13246a592d9021f0bb2410ee6e8216df4e SHA512 1a68729b8aa1d3518b43392d4f9af163e2a084c635c08343b25ce761f835801aad203778fd03564ba050ad949a9d2df84fba4c8a48bb1a7afea5e72eb364eb58
+DIST open-gpu-kernel-modules-550.40.71.tar.gz 13811934 BLAKE2B 479c08b73afc91a2f09d7a28bd06795db4dd8f253b2787e41e3c5c8bcde5d606f9715f48d8d3f61ed0cc637445db83dbb6e4b09b0b50cbabe358ea13f8ff683e SHA512 81cb651a9a56aebf806b8442a9de70147beec415f6cb26f41e3d60ef31c024dc84f6c9754ccaff6d0112cc0d97a564403f4d64192c57d38c4969a9d026fc1f61
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.100.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.100.ebuild
deleted file mode 100644
index 42c25308f23a..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.100.ebuild
+++ /dev/null
@@ -1,500 +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 flag-o-matic linux-mod-r1 readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.10
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-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
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!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."
-
-	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."
-
-	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}
-
-		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=(
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-		)
-
-		# 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}; assert
-				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
-
-	# 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 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"'
-}
-
-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
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71.ebuild
index 0b678cefa151..0b678cefa151 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.67.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71.ebuild
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-555.58.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-555.58.02.ebuild
deleted file mode 100644
index a8ac9c421423..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-555.58.02.ebuild
+++ /dev/null
@@ -1,510 +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 flag-o-matic linux-mod-r1 readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.10
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-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
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!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."
-
-	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."
-
-	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-555.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}
-
-		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=(
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-		)
-
-		# 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}; assert
-				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
-
-	# 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 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"'
-}
-
-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
-	# TODO?: automatically check "kernelopen" bit for USE=kernel-open compat
-	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, note that it requires"
-		ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
-		ewarn "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
-
-	if use !kernel-open && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 555
-	then
-		elog
-		elog "If using a Turing/Ampere+ GPU (aka GTX 1650+), note that >=nvidia-drivers-555"
-		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
-		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-555.58.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-555.58.ebuild
deleted file mode 100644
index a8ac9c421423..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-555.58.ebuild
+++ /dev/null
@@ -1,510 +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 flag-o-matic linux-mod-r1 readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.10
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-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
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!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."
-
-	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."
-
-	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-555.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}
-
-		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=(
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-		)
-
-		# 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}; assert
-				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
-
-	# 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 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"'
-}
-
-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
-	# TODO?: automatically check "kernelopen" bit for USE=kernel-open compat
-	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, note that it requires"
-		ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
-		ewarn "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
-
-	if use !kernel-open && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 555
-	then
-		elog
-		elog "If using a Turing/Ampere+ GPU (aka GTX 1650+), note that >=nvidia-drivers-555"
-		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
-		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.31.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.31.02.ebuild
deleted file mode 100644
index 662958bb9a1b..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.31.02.ebuild
+++ /dev/null
@@ -1,516 +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 flag-o-matic linux-mod-r1 readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.10
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-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%%.*}"
-# no keywords due to being a beta, feel free to opt-in for testing
-#KEYWORDS="-* ~amd64 ~arm64"
-# note: kernel-open is an upstream default in >=560 if all GPUs on the system
-# support it but, since no automagic here, keeping it off for the wider support
-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-1.1.1-r2[abi_x86_32(-)?]
-		>=gui-libs/egl-wayland-1.1.13.1[abi_x86_32(-)?]
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		dev-util/vulkan-headers
-		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
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!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."
-
-	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."
-
-	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-555.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}
-
-		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=(
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-		)
-
-		# 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
-		[VULKANSC_ICD_JSON]=/usr/share/vulkansc
-		[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}; assert
-				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
-		# avoid portage warning due to missing soname links in manifest
-		[[ ${m[0]} =~ .*((libnvidia-ngx.so|libnvidia-egl-gbm.so).*) ]] &&
-			dosym ${BASH_REMATCH[1]} ${into}/${BASH_REMATCH[2]}.1
-
-		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
-
-	# 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 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"'
-}
-
-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
-	# TODO?: automatically check "kernelopen" bit for USE=kernel-open compat
-	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, note that it requires"
-		ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
-		ewarn "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
-
-	if use !kernel-open && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 555
-	then
-		elog
-		elog "If using a Turing/Ampere+ GPU (aka GTX 1650+), note that >=nvidia-drivers-555"
-		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
-		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03.ebuild
new file mode 100644
index 000000000000..7201283bfb9f
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=+modules
+inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1
+inherit systemd toolchain-funcs unpacker user-info
+
+MODULES_KERNEL_MAX=6.10
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+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"
+# note: kernel-open is an upstream default in >=560 if all GPUs on the system
+# support it but, since no automagic here, keeping it off for the wider support
+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-1.1.1-r2[abi_x86_32(-)?]
+		>=gui-libs/egl-wayland-1.1.13.1[abi_x86_32(-)?]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		dev-util/vulkan-headers
+		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
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!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."
+
+	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."
+
+	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-555.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}
+
+		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=(
+			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
+			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
+		)
+
+		# 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
+		[VULKANSC_ICD_JSON]=/usr/share/vulkansc
+		[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}; assert
+				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
+		# avoid portage warning due to missing soname links in manifest
+		[[ ${m[0]} =~ .*((libnvidia-ngx.so|libnvidia-egl-gbm.so).*) ]] &&
+			dosym ${BASH_REMATCH[1]} ${into}/${BASH_REMATCH[2]}.1
+
+		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
+
+	# 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 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"'
+}
+
+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
+	# TODO?: automatically check "kernelopen" bit for USE=kernel-open compat
+	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, note that it requires"
+		ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
+		ewarn "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
+
+	if use !kernel-open && [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 555
+	then
+		elog
+		elog "If using a Turing/Ampere+ GPU (aka GTX 1650+), note that >=nvidia-drivers-555"
+		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
+		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
+	fi
+}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index 2a5c7ace4cc1..39fd51e0e077 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,15 @@ XORG_DRI="always"
 inherit xorg-3
 
 if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau"
 	SRC_URI=""
 fi
 
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="
 	https://nouveau.freedesktop.org/
-	https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
+	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau
+"
 
 KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 644677d49780..508127478c88 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
 DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
+DIST cairo-1.18.2.tar.bz2 42905863 BLAKE2B 2788b9b90aeee1ad906e36ec13c0e0dba5b87b88433bc2cd408ed427ebcab49ee3d63ded3bc4eb7dc51c63aba91a6c30de77c052235bc5b669eef268f706de36 SHA512 8db31b675791b892379bc5fca7f421d3e8ebca9c3cbcdc27fa80efb1274f12d89276a54fa1ec18008f81de9b1dc2fafb9fbee9ee368e893e8b035a332d07e141
diff --git a/x11-libs/cairo/cairo-1.18.2.ebuild b/x11-libs/cairo/cairo-1.18.2.ebuild
new file mode 100644
index 000000000000..1d57ad8c8bdc
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.18.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+else
+	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
+
+RDEPEND="
+	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}]
+	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl
+		app-text/poppler[cairo]
+		gnome-base/librsvg
+	)
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddwrite=disabled
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dpng=enabled
+		$(meson_feature aqua quartz)
+		$(meson_feature X tee)
+		$(meson_feature X xcb)
+		$(meson_feature X xlib)
+		-Dxlib-xcb=disabled
+		-Dzlib=enabled
+
+		# Requires poppler-glib (poppler[cairo]) which isn't available in multilib
+		$(meson_native_use_feature test tests)
+
+		-Dgtk2-utils=disabled
+
+		$(meson_feature glib)
+		-Dspectre=disabled # only used for tests
+		$(meson_feature debug symbol-lookup)
+
+		$(meson_use gtk-doc gtk_doc)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && meson_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+		rmdir "${ED}"/usr/share/gtk-doc/html || die
+	fi
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f51355062fef..1d57ad8c8bdc 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
@@ -24,11 +24,11 @@ RESTRICT="test !test? ( test )"
 
 RDEPEND="
 	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}]
 	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}]
 	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	X? (
@@ -54,6 +54,7 @@ PATCHES=(
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Ddwrite=disabled
 		-Dfontconfig=enabled
 		-Dfreetype=enabled
 		-Dpng=enabled
diff --git a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
index d6e8c26b77a2..a2a634581869 100644
--- a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
@@ -134,6 +134,8 @@ src_prepare() {
 	# -O3 and company cause random crashes in applications, bug #133469
 	replace-flags -O3 -O2
 	strip-flags
+	# Not compatible with C23 decls
+	append-flags -std=gnu17
 
 	if ! use test ; then
 		# don't waste time building tests
diff --git a/x11-libs/libFS/libFS-1.0.10.ebuild b/x11-libs/libFS/libFS-1.0.10.ebuild
index 6723c0cad72c..79fc74be259c 100644
--- a/x11-libs/libFS/libFS-1.0.10.ebuild
+++ b/x11-libs/libFS/libFS-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 DEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/libX11/libX11-1.8.10.ebuild b/x11-libs/libX11/libX11-1.8.10.ebuild
index 8e6be4ce72de..b6b5cb73d1f8 100644
--- a/x11-libs/libX11/libX11-1.8.10.ebuild
+++ b/x11-libs/libX11/libX11-1.8.10.ebuild
@@ -11,7 +11,7 @@ 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
index a99af0682a7e..bbb938611b4f 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 7a79f0de2dc2..7ff6ec6e1ab9 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1 +1,2 @@
 DIST libXi-1.8.1.tar.xz 404252 BLAKE2B a25e1e74ef2cc02b455b7b1c5f70040a3b2ecc19d4375c465e63e8b2638b4f90b0480c737fb7dcd5f658330871c623b364b0f8db61d3371cf97d680fdd840058 SHA512 a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9
+DIST libXi-1.8.2.tar.xz 405200 BLAKE2B 869389e4e35187c8ca28a63b9c49125c960629037e1c0e2aff7c149d0f3ed25bf6401dd4b9a8942a14152eceb0e3148e9805a48df3123dc0471c44f8636976b6 SHA512 6348aae8f595217e26f348184dd594d83af800949f649bfd11b6aef7387faa5624ed18551fe2c3a38c8deab9d7473f72fd7e3e8472cff3ff30d4bb3fb2e6dc31
diff --git a/x11-libs/libXi/libXi-1.8.2.ebuild b/x11-libs/libXi/libXi-1.8.2.ebuild
new file mode 100644
index 000000000000..5bed2018390d
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.8.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xi library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=x11-base/xorg-proto-2021.4.99.2"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		$(use_with doc asciidoc)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXtst/libXtst-1.2.5.ebuild b/x11-libs/libXtst/libXtst-1.2.5.ebuild
index bc2419f863b0..e1aa76286746 100644
--- a/x11-libs/libXtst/libXtst-1.2.5.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild b/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild
index e072d0a3ce2a..f93fda69d912 100644
--- a/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild
+++ b/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/clxclient-${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 CDEPEND="
 	dev-libs/libclthreads
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 400e9aeb051a..9d7aeb84cb5e 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,3 +1,2 @@
-DIST libdrm-2.4.120.tar.xz 479564 BLAKE2B 218d674da334c32aae27a31c10992cb276b08543704c875c7d7bf8f3dd348d1cf1c95f35b0afc8f3034d83152c2df460f84807388a21b241792db3e81c98dbfc SHA512 6dc16e5134a669eeb59debb1dc2d15b857483ab7476dc2b94bd05a32d8953f046f5656f6cf9e1a63e97e7156fb65ebb58b6a29fe45cb6326058baaf820626e70
-DIST libdrm-2.4.121.tar.xz 480840 BLAKE2B 23b8c68e12e5d3ed34dcf9577ef934e7990526018f76933a35434c7ea69ba081850e2d4e00e783880bcfe570d62910161364515ce8fde715743abbcb39d3ffb4 SHA512 cc8816d61884caa0e404348d1caeb0b2952fb50e1dc401716adfe08121096e2a67826db0bda0d8b163d67c5ee048870177670d5eac28a5abe5792d09ba77ab2e
 DIST libdrm-2.4.122.tar.xz 481012 BLAKE2B ca6aaf0fe55dfcfe33a0d39a7b3ea07aa4cbe772294ec7f419a4edbb40cbce14c399e180e35dd781ef225a16daae8f40d4893599eb018b68cc78e4e981f2e6e2 SHA512 ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13
+DIST libdrm-2.4.123.tar.xz 481112 BLAKE2B 5a621682ef32bb9b9b69b153a36db4b85df54595ade9910091ff62a477ea30fc9e7f22ab5d9b8c8a5f9f1cf428cb400b5e62f3cf811227666de718ddd8cdcc34 SHA512 d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d
diff --git a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch b/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch
deleted file mode 100644
index 1d01db322a8c..000000000000
--- a/x11-libs/libdrm/files/libdrm-2.4.120-backport-pr353.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/927204
-https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/353
-
-From 525e80447fee011734af464b3b5d478b2b7b17af Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 22 Mar 2024 11:20:17 -0400
-Subject: [PATCH 1/2] symbols-check: Add _GLOBAL_OFFSET_TABLE_
-
-This is exported on hppa/parisc.
-
-See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26978
-
-Bug: https://bugs.gentoo.org/927204
----
- symbols-check.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/symbols-check.py b/symbols-check.py
-index 2e7ba68d1..47bc3bead 100644
---- a/symbols-check.py
-+++ b/symbols-check.py
-@@ -7,6 +7,7 @@ import subprocess
- 
- # This list contains symbols that _might_ be exported for some platforms
- PLATFORM_SYMBOLS = [
-+    '_GLOBAL_OFFSET_TABLE_',
-     '__bss_end__',
-     '__bss_start__',
-     '__bss_start',
--- 
-GitLab
-
-
-From c45ffb1edf19faff79238934abe01fd92e9e3d0a Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 22 Mar 2024 11:21:39 -0400
-Subject: [PATCH 2/2] symbols-check: Add _fbss, _fdata, _ftext
-
-These are exported on mips/mips64.
-
-See also: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11955
----
- symbols-check.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/symbols-check.py b/symbols-check.py
-index 47bc3bead..c63c0d112 100644
---- a/symbols-check.py
-+++ b/symbols-check.py
-@@ -17,6 +17,9 @@ PLATFORM_SYMBOLS = [
-     '_end',
-     '_fini',
-     '_init',
-+    '_fbss',
-+    '_fdata',
-+    '_ftext',
- ]
- 
- 
--- 
-GitLab
-
diff --git a/x11-libs/libdrm/libdrm-2.4.120.ebuild b/x11-libs/libdrm/libdrm-2.4.120.ebuild
deleted file mode 100644
index 009f5144834f..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.120.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
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{10..12} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-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 ~ia64 ~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"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )"
-RDEPEND="${COMMON_DEPEND}
-	video_cards_amdgpu? (
-		tools? ( >=dev-util/cunit-2.1 )
-		test?  ( >=dev-util/cunit-2.1 )
-	)
-	udev? ( virtual/udev )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}/${PN}-2.4.120-backport-pr353.patch" )
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		symbols-check.py || die # bug #925550
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use udev)
-		-Dcairo-tests=disabled
-		$(meson_feature video_cards_amdgpu amdgpu)
-		$(meson_feature video_cards_exynos exynos)
-		$(meson_feature video_cards_freedreno freedreno)
-		$(meson_feature video_cards_intel intel)
-		$(meson_feature video_cards_nouveau nouveau)
-		$(meson_feature video_cards_omap omap)
-		$(meson_feature video_cards_radeon radeon)
-		$(meson_feature video_cards_tegra tegra)
-		$(meson_feature video_cards_vc4 vc4)
-		$(meson_feature video_cards_vivante etnaviv)
-		$(meson_feature video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto disabled)
-		$(meson_native_use_bool tools install-test-programs)
-	)
-
-	if use test || { multilib_is_native_abi && use tools; }; then
-		emesonargs+=( -Dtests=true  )
-	else
-		emesonargs+=( -Dtests=false )
-	fi
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.121.ebuild b/x11-libs/libdrm/libdrm-2.4.121.ebuild
deleted file mode 100644
index 75538252e16f..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.121.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
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{10..13} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-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 ~ia64 ~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"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )"
-RDEPEND="${COMMON_DEPEND}
-	video_cards_amdgpu? (
-		tools? ( >=dev-util/cunit-2.1 )
-		test?  ( >=dev-util/cunit-2.1 )
-	)
-	udev? ( virtual/udev )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		symbols-check.py || die # bug #925550
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use udev)
-		-Dcairo-tests=disabled
-		$(meson_feature video_cards_amdgpu amdgpu)
-		$(meson_feature video_cards_exynos exynos)
-		$(meson_feature video_cards_freedreno freedreno)
-		$(meson_feature video_cards_intel intel)
-		$(meson_feature video_cards_nouveau nouveau)
-		$(meson_feature video_cards_omap omap)
-		$(meson_feature video_cards_radeon radeon)
-		$(meson_feature video_cards_tegra tegra)
-		$(meson_feature video_cards_vc4 vc4)
-		$(meson_feature video_cards_vivante etnaviv)
-		$(meson_feature video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto disabled)
-		$(meson_native_use_bool tools install-test-programs)
-	)
-
-	if use test || { multilib_is_native_abi && use tools; }; then
-		emesonargs+=( -Dtests=true  )
-	else
-		emesonargs+=( -Dtests=false )
-	fi
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.122.ebuild b/x11-libs/libdrm/libdrm-2.4.122.ebuild
index 75538252e16f..ac5c686719d3 100644
--- a/x11-libs/libdrm/libdrm-2.4.122.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.122.ebuild
@@ -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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.123.ebuild b/x11-libs/libdrm/libdrm-2.4.123.ebuild
new file mode 100644
index 000000000000..3f5e53d9399c
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.123.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{10..13} )
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
+
+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 ~ia64 ~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"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="${IUSE_VIDEO_CARDS} test tools udev valgrind"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	valgrind? ( dev-debug/valgrind )"
+RDEPEND="${COMMON_DEPEND}
+	video_cards_amdgpu? (
+		tools? ( >=dev-util/cunit-2.1 )
+		test?  ( >=dev-util/cunit-2.1 )
+	)
+	udev? ( virtual/udev )"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		symbols-check.py || die # bug #925550
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use udev)
+		-Dcairo-tests=disabled
+		$(meson_feature video_cards_amdgpu amdgpu)
+		$(meson_feature video_cards_exynos exynos)
+		$(meson_feature video_cards_freedreno freedreno)
+		$(meson_feature video_cards_intel intel)
+		$(meson_feature video_cards_nouveau nouveau)
+		$(meson_feature video_cards_omap omap)
+		$(meson_feature video_cards_radeon radeon)
+		$(meson_feature video_cards_tegra tegra)
+		$(meson_feature video_cards_vc4 vc4)
+		$(meson_feature video_cards_vivante etnaviv)
+		$(meson_feature video_cards_vmware vmwgfx)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto disabled)
+		$(meson_native_use_bool tools install-test-programs)
+	)
+
+	if use test || { multilib_is_native_abi && use tools; }; then
+		emesonargs+=( -Dtests=true  )
+	else
+		emesonargs+=( -Dtests=false )
+	fi
+	meson_src_configure
+}
diff --git a/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild
index 68dc836d6898..65f6e9ba6724 100644
--- a/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild b/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild
index 5c8c5cbd88fc..8fb1ffd8efce 100644
--- a/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-2.0.1.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
index 8ada881f3c31..5f549270a82e 100644
--- a/x11-libs/qwtplot3d/Manifest
+++ b/x11-libs/qwtplot3d/Manifest
@@ -1,2 +1 @@
-DIST qwtplot3d-0.2.tar.gz 322366 BLAKE2B 7c589efe13409089dd6e1b579f19891fb0b75e44a4add87128822b3184c4d22ec0e7b04ce4c7c52dfaf8644a17a8506419726ae1ab50ab7cd7bc9ea9f84f9268 SHA512 92addf10865d090216a92d5ced5b0793b50657c6c5e5faf5c8f78120cc9c94a0b6f8e351d2e053b73951411b8f81a4179c0f17aea27d78cd748df8f81b31bcf9
 DIST qwtplot3d-0.2_p20210828.tar.gz 162362 BLAKE2B e2382f8b1b6f9f3ac5526a6ae3269f649badf11240e65283c62a88ae620ca81d6f1bad51f39651c1ca1fa8bf63f47978a41386cdec64a374a16eb7bf579d0875 SHA512 92ecfd6e91a31921993171f41f4606abbbd675fb869c32c3f1e0665cb13e1d88718bba39493edbc350c8e0a7b66cdfb14fd998d46b3f67b7223a41260347061a
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.ebuild
deleted file mode 100644
index 94347022ede3..000000000000
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="doc"
-DOCS_CONFIG_NAME="Doxyfile.doxygen"
-
-inherit docs qmake-utils
-
-DESCRIPTION="3D plotting library for Qt5"
-HOMEPAGE="http://qwtplot3d.sourceforge.net/ https://github.com/SciDAVis/qwtplot3d/"
-SRC_URI="https://github.com/SciDAVis/qwtplot3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="doc examples"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	x11-libs/gl2ps
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-examples.patch"
-	"${FILESDIR}/${PN}-doxygen.patch"
-	"${FILESDIR}/${PN}-gcc44.patch"
-	"${FILESDIR}/${PN}-qt-4.8.0.patch"
-	"${FILESDIR}/${PN}-sys-gl2ps.patch"
-)
-
-src_prepare() {
-	default
-	cat >> ${PN}.pro <<-EOF || die
-		target.path = "${EPREFIX}/usr/$(get_libdir)"
-		headers.path = "${EPREFIX}/usr/include/${PN}"
-		headers.files = \$\$HEADERS
-		INSTALLS = target headers
-	EOF
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	docs_compile
-}
-
-src_install () {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/vte/files/vte-0.76.3-stdint.patch b/x11-libs/vte/files/vte-0.76.3-stdint.patch
new file mode 100644
index 000000000000..26c640e0ae7f
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.76.3-stdint.patch
@@ -0,0 +1,34 @@
+
+Fix compilation with gcc-14.
+
+Bug: https://bugs.gentoo.org/937617
+Bug: https://gitlab.gnome.org/GNOME/vte/-/issues/2807
+
+Patch from:
+https://gitlab.gnome.org/GNOME/vte/-/commit/0d393b6cd6a24f53eaefa16764b9453a1483acf5
+
+From 0d393b6cd6a24f53eaefa16764b9453a1483acf5 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Mon, 12 Aug 2024 18:42:37 +0200
+Subject: [PATCH] lib: Include stdint.h where needed
+
+Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2807
+---
+ src/vte/vteregex.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/vte/vteregex.h b/src/vte/vteregex.h
+index 10c5088b8..c9e4f75db 100644
+--- a/src/vte/vteregex.h
++++ b/src/vte/vteregex.h
+@@ -23,6 +23,7 @@
+ 
+ #include <glib.h>
+ #include <glib-object.h>
++#include <stdint.h>
+ 
+ #include "vtemacros.h"
+ 
+-- 
+GitLab
+
diff --git a/x11-libs/vte/vte-0.76.3.ebuild b/x11-libs/vte/vte-0.76.3.ebuild
index 09a196f39dae..e18dd0ef6bbc 100644
--- a/x11-libs/vte/vte-0.76.3.ebuild
+++ b/x11-libs/vte/vte-0.76.3.ebuild
@@ -54,6 +54,8 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.76.3-stdint.patch" )
+
 src_prepare() {
 	default
 	use vala && vala_setup
diff --git a/x11-libs/xapp/xapp-2.8.5.ebuild b/x11-libs/xapp/xapp-2.8.5.ebuild
index b17d1de26e54..7cfc706b52e5 100644
--- a/x11-libs/xapp/xapp-2.8.5.ebuild
+++ b/x11-libs/xapp/xapp-2.8.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3 xfce? ( GPL-3 )"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gtk-doc introspection mate vala xfce"
 REQUIRED_USE="${PYTHON_REQUIRED_USE} vala? ( introspection )"
 
diff --git a/x11-libs/xbae/files/xbae-4.60.4-c99.patch b/x11-libs/xbae/files/xbae-4.60.4-c99.patch
new file mode 100644
index 000000000000..8c50dad3030d
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-c99.patch
@@ -0,0 +1,24 @@
+From bbfc674fc85c874560c784bd8076be7c9b3b5f43 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 1 Sep 2024 22:33:09 -0400
+Subject: [PATCH] c99 porting: fix UB from not including headers
+
+---
+ examples/matrix/matrix.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/matrix/matrix.c b/examples/matrix/matrix.c
+index 1d3e1df..3fbecf6 100644
+--- a/examples/matrix/matrix.c
++++ b/examples/matrix/matrix.c
+@@ -28,6 +28,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <XbaeConfig.h>
+ #endif
++#include <stdio.h>
+ #include <stdlib.h>
+ #ifdef USE_EDITRES
+ #include <X11/Intrinsic.h>
+-- 
+2.44.2
+
diff --git a/x11-libs/xbae/files/xbae-4.60.4-configure-c99.patch b/x11-libs/xbae/files/xbae-4.60.4-configure-c99.patch
new file mode 100644
index 000000000000..33f108d8d603
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-configure-c99.patch
@@ -0,0 +1,57 @@
+https://sourceforge.net/p/xbae/patches/3/
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 36b4569680ea8531..0bda82ef7480beaf 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -334,7 +334,7 @@ Display *display=NULL;
+ short   major_version, minor_version;
+ Status rc;
+ rc=XpQueryVersion(display, &major_version, &minor_version);
+-exit(0);
++return 0;
+ }
+ ],
+ lt_cv_libxp=yes,
+diff --git a/configure b/configure
+index f43d920c33b055ff..5e82cda106a450e8 100755
+--- a/configure
++++ b/configure
+@@ -2937,7 +2937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4120,7 +4120,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4477,8 +4477,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -21418,7 +21418,7 @@ Display *display=NULL;
+ short   major_version, minor_version;
+ Status rc;
+ rc=XpQueryVersion(display, &major_version, &minor_version);
+-exit(0);
++return 0;
+ }
+ 
+   ;
diff --git a/x11-libs/xbae/files/xbae-4.60.4-modern-autotools.patch b/x11-libs/xbae/files/xbae-4.60.4-modern-autotools.patch
new file mode 100644
index 000000000000..ac5ebaa0f8b6
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-modern-autotools.patch
@@ -0,0 +1,28 @@
+From 165c0f9ae086373c5d1659eac1ae14baa2975145 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 1 Sep 2024 22:09:04 -0400
+Subject: [PATCH] port to modern autotools
+
+When listing files to be installed, you cannot double-list them. Modern
+autotools tries to install all of them in one `install` command, which
+is incompatible with installing the same file twice.
+---
+ doc/images/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am
+index e6d91dd..79a8eb0 100644
+--- a/doc/images/Makefile.am
++++ b/doc/images/Makefile.am
+@@ -34,7 +34,7 @@ image_DATA=	\
+ 	bg.png updated.png coverplus.png add.jpg \
+ 	caption.png choice.png colors.jpg draw.png fifteen.jpg \
+ 	input.png list.jpg matrix.jpg multifixed.jpg select-push.jpg \
+-	mailbox.png bg.png pricing.jpg LDO.jpg risk.jpg \
++	mailbox.png pricing.jpg LDO.jpg risk.jpg \
+ 	organize.jpg xbasket.png xbum1-2.png xbill2-2.png capfloor1.png \
+ 	capfloor3.png taam.png \
+ 	grohtml-XbaeCaption1.png \
+-- 
+2.44.2
+
diff --git a/x11-libs/xbae/xbae-4.60.4-r1.ebuild b/x11-libs/xbae/xbae-4.60.4-r1.ebuild
new file mode 100644
index 000000000000..0cbb9bab5a3c
--- /dev/null
+++ b/x11-libs/xbae/xbae-4.60.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+AT_M4DIR=${S}
+
+inherit autotools
+
+DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
+HOMEPAGE="https://xbae.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+# tests need X display
+# and are interactive so virtualx will not help
+RESTRICT="test"
+
+RDEPEND="
+	x11-libs/motif:0
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tmpl.patch
+	"${FILESDIR}"/${P}-lxmp.patch
+	"${FILESDIR}"/${P}-Makefile.in.patch
+	# https://sourceforge.net/p/xbae/patches/3/
+	"${FILESDIR}"/${P}-configure-c99.patch
+	"${FILESDIR}"/${P}-modern-autotools.patch
+	"${FILESDIR}"/${P}-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-production
+}
+
+src_test() {
+	emake -C examples
+	emake -C examples/testall clean
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/aclocal
+	doins ac_find_xbae.m4
+
+	if use examples; then
+		find examples -name '*akefile*' -delete || die
+		rm examples/{testall,extest} || die
+		dodoc -r examples
+	fi
+	if use doc; then
+		rm doc/{,images/}Makefile* || die
+		docinto html
+		dodoc -r doc/.
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index 7d79a5fa59f3..69507033ee42 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
-HOMEPAGE="http://xbae.sourceforge.net/"
+HOMEPAGE="https://xbae.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index a2be37478ac4..ea75a3b62cfd 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1 +1,2 @@
 DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5
+DIST appmenu-gtk-module-24.05.tar.xz 41364 BLAKE2B 45593cad5431f1b12fd7bc710399f7be7ff381d5757672c90db42187197de67b80f4436fc402e59abfa164d6d659557fb5a57737020d4cda361a2904154e9878 SHA512 0b233e56663f1e46f35b8edda5ea551f9569f6ffc20730fc62fcc090cf14a4032d58c7b8f03f14b29e9433f8ccd9fc89e3de7be50141fba5f85f5bf219517fa7
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild
new file mode 100644
index 000000000000..d4570fc72a9d
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo gnome2-utils flag-o-matic meson systemd virtualx
+
+DESCRIPTION="Application menu module for GTK"
+HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
+SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/b5ace7bf5bd6e3ec3b20e98befb5da39/${P}.tar.xz"
+# 24.05 really is a different release to 24.02 (diffed tarballs to check),
+# but it has the wrong version in the directory name.
+S="${WORKDIR}"/${PN}-24.02
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="gtk2 test wayland"
+# Tests are manual and hang in the ebuild
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/glib[dbus]
+	>=x11-libs/gtk+-3.22.0:3[wayland?]
+	gtk2? ( >=x11-libs/gtk+-2.24.0:2 )
+"
+DEPEND="
+	${RDEPEND}
+	wayland? ( dev-libs/wayland )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.6-no-automagic-gtk.patch"
+	"${FILESDIR}/${PN}-24.05-no-automagic-unitdir.patch"
+	"${FILESDIR}/${PN}-24.05-fix-pkgconfig.patch"
+)
+
+src_configure() {
+	# defang automagic dependencies, bug #785619
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	# outputs [ '2', '3' ] OR [ '3' ]
+	local gtks="[$(usex gtk2 " '2'," '') '3' ]"
+
+	local emesonargs=(
+		-Dgtk="${gtks}"
+		-Duserunitdir="$(systemd_get_userunitdir)"
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+my_test() {
+	cd "${BUILD_DIR}"/tests || die
+
+	local name
+	for name in hello radio tester ; do
+		edo ./${name}
+	done
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/appmenu-gtk-module/* "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/appmenu-gtk-module || die
+
+	rm "${ED}"/usr/share/licenses/appmenu-gtk-module/LICENSE || die
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/${PN}-r1 85-${PN}
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch
new file mode 100644
index 000000000000..76455dd55655
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('appmenu-gtk-module', 'c',
+ 	meson_version: '>=0.61.0',
+-	version: '24.02',
++	version: '24.05',
+ 	license: ['LGPL-3.0-or-later'],
+     default_options: [
+         'c_std=gnu11',
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch
new file mode 100644
index 000000000000..007462e767d8
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch
@@ -0,0 +1,56 @@
+From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 4 Jan 2022 19:06:37 -0800
+Subject: [PATCH] appmenu-gtk-module: add userunitdir option
+
+allows setting systemd unit on systemd-less systems
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ .../appmenu-gtk-module/data/meson.build       | 19 ++++++++++++-------
+ .../appmenu-gtk-module/meson_options.txt      |  1 +
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build
+index 8378965..d0d1717 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,14 +2,19 @@ install_data([
+     'org.appmenu.gtk-module.gschema.xml'
+ ], install_dir: schema_dir)
+ 
++userunitdir = get_option('userunitdir')
+ systemd = dependency('systemd', required: false)
+ 
+-if systemd.found()
++if userunitdir == ''
++  if systemd.found()
+     userunitdir = systemd.get_variable(pkgconfig:'systemduserunitdir')
+-    configure_file(
+-        input: 'appmenu-gtk-module.service.in',
+-        output: 'appmenu-gtk-module.service',
+-        install_dir: userunitdir,
+-        configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
+-    )
++  else
++    userunitdir = '/usr/lib/systemd/user'
++  endif
+ endif
++configure_file(
++  input: 'appmenu-gtk-module.service.in',
++  output: 'appmenu-gtk-module.service',
++  install_dir: userunitdir,
++  configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
++)
+diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt
+index f93877a..ec0b3a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('gtk', type: 'array', choices : ['2','3'],  value: ['2','3'], description: 'Supported GTK versions')
+ option('tests', type : 'boolean', value : false, description: 'Parser tests')
+ option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
++option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)')
+-- 
+2.34.1
+
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1 b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1
new file mode 100644
index 000000000000..328f390af48b
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1
@@ -0,0 +1,13 @@
+case :$GTK_MODULES: in
+	*:appmenu-gtk-module:*)
+		;;
+	*)
+		GTK_MODULES=${GTK_MODULES}${GTK_MODULES:+:}appmenu-gtk-module
+esac
+
+if [ -z "$UBUNTU_MENUPROXY" ]; then
+    UBUNTU_MENUPROXY=1
+fi
+
+export GTK_MODULES
+export UBUNTU_MENUPROXY
diff --git a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
index a3194cfe7320..939f15accb56 100644
--- a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
+++ b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd
+inherit optfeature systemd
 
 DESCRIPTION="Clipboard management"
 HOMEPAGE="https://github.com/cdown/clipmenu"
@@ -49,7 +49,20 @@ src_install() {
 }
 
 pkg_postinst() {
+	optfeature "ignoring specific windows via CM_IGNORE_WINDOW" x11-misc/xdotool
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo ""
+		einfo "Make sure to import \$DISPLAY when using the systemd unit for clipmenud"
+		einfo "without a desktop environment. Preferably check /etc/X11/xinit/xinitrc{,.d}"
+		einfo "for relevant examples, or at least include the following in your ~/.xinitrc"
+		einfo "before clipmenud:"
+		einfo ""
+		einfo "systemctl --user import-environment DISPLAY"
+	fi
+
 	if ! use dmenu && ! use fzf && ! use rofi ; then
+		ewarn ""
 		ewarn "Clipmenu has been installed without a launcher."
 		ewarn "You will need to set \$CM_LAUNCHER to a dmenu-compatible app for clipmenu to work."
 		ewarn "Please refer to the documents for more info."
diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml
index ad77c07f77a8..40a619301ac7 100644
--- a/x11-misc/clipmenu/metadata.xml
+++ b/x11-misc/clipmenu/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">cdown/clipmenu</remote-id>
+	</upstream>
 	<use>
 		<flag name="dmenu">Use dmenu as default launcher</flag>
 		<flag name="rofi">Use rofi as default launcher</flag>
diff --git a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
index ade5421accec..7bbed1913eb7 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 092518520b53..c9b144ae31ea 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,2 +1 @@
-DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4
 DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909
diff --git a/x11-misc/copyq/copyq-7.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild
deleted file mode 100644
index d93363879bb5..000000000000
--- a/x11-misc/copyq/copyq-7.0.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo optfeature virtualx xdg
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CopyQ-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug kde qt6 test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwayland:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		kde? ( kde-frameworks/knotifications:5 )
-		test? ( dev-qt/qttest:5 )
-	)
-	qt6? (
-		dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)]
-		dev-qt/qtdeclarative:6
-		dev-qt/qtsvg:6
-		dev-qt/qtwayland:6
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	!qt6? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtwaylandscanner:5
-	)
-	qt6? (
-		dev-qt/qttools:6[linguist]
-		dev-qt/qtwayland:6
-		dev-util/wayland-scanner
-	)
-	test? (
-		app-crypt/gnupg
-		x11-wm/icewm
-	)
-"
-
-src_configure() {
-	if use debug; then
-		# Add debug definitions
-		CMAKE_BUILD_TYPE="Debug"
-	fi
-
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_NATIVE_NOTIFICATIONS=$(usex kde)
-		-DWITH_QT6=$(usex qt6)
-		-DWITH_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-my_src_test() {
-	local -x COPYQ_TESTS_RERUN_FAILED=0
-	local -x COPYQ_TESTS_NO_NETWORK=1
-
-	ebegin "Starting IceWM"
-	icewm &
-	sleep 5
-	eend 0
-
-	cd "${BUILD_DIR}" || die
-	mkdir -p "${HOME}"/.gnupg || die
-
-	# ScriptError: Failed to send key presses
-	edo ./copyq tests
-}
-
-src_test() {
-	virtx my_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "encryption support" app-crypt/gnupg
-}
diff --git a/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild
new file mode 100644
index 000000000000..416be1d800fd
--- /dev/null
+++ b/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="highly flexible status line for the i3 window manager"
+HOMEPAGE="https://github.com/vivien/i3blocks"
+SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+contrib"
+
+PDEPEND="contrib? ( x11-misc/i3blocks-contrib )"
+
+PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	newbashcomp bash-completion ${PN}
+}
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 963a57ad07c0..3ed401135cf9 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,2 +1 @@
-DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb
 DIST i3lock-2.15.tar.xz 29100 BLAKE2B e84622e34a54681e162a3012c21fea4cc8b93a66e466647d65cc85f1a874d2be4d9988d54db74165b3dd1eccca1ca257a74b64ddbce08d681c9fc1c78701ee88 SHA512 6079f5233c0820c6e38f3cd8f3732d585e95e7d670408e4fb18ab580a2e1face8f3d6ea13eaaeedc8671f74def917183667e736b35306bf7c630d40625b41ac2
diff --git a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
deleted file mode 100644
index ce0e41df1a3b..000000000000
--- a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-xrm"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:login:system-auth:g' pam/${PN} || die
-}
diff --git a/x11-misc/i3lock/i3lock-2.15.ebuild b/x11-misc/i3lock/i3lock-2.15.ebuild
index 512d70eb36e7..a201f2e984f9 100644
--- a/x11-misc/i3lock/i3lock-2.15.ebuild
+++ b/x11-misc/i3lock/i3lock-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/libev
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 6a32cca715ac..206289477787 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1 +1,2 @@
 DIST kronometer-2.3.0.tar.xz 136140 BLAKE2B b5ae57711b06ff53d3d096b6ce004620951132f4ab451aeaf67ac679e5154a4942d3cb910ed1d64ac32473b7fde59da0fd3b143171bb6f81ff29b81b29eceb2d SHA512 23321db24a0850be744765dc5eb17b3848d82b20e0bcc0520b5ee9bce6537650405aafeb435248459fd924fcfcd8acc113d8ca440edadd1d7c8f86dc282dd2e2
+DIST kronometer-2.3.70_pre20240906-e87e16c8.tar.gz 203320 BLAKE2B 572da633cdd5ce7609e1ddb59c8677603b87951a4b766d64a56b31644bb25b957e15328cf96afc13c6032fca117b86726d523292c961a058cda706f6ae1939e5 SHA512 040ba702a4b4086f90b526922abcb54f3f00f68b130241b8ae7eb057e5f774a21c32df34d267502f904c1e6947fd6dada48de96806b1f0d357004a6b4c27db92
diff --git a/x11-misc/kronometer/kronometer-2.3.0.ebuild b/x11-misc/kronometer/kronometer-2.3.0.ebuild
index 0c50aa9f6fd0..0ceb59594704 100644
--- a/x11-misc/kronometer/kronometer-2.3.0.ebuild
+++ b/x11-misc/kronometer/kronometer-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-SLOT="5"
+SLOT="0"
 KEYWORDS="amd64"
 
 DEPEND="
diff --git a/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild b/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild
new file mode 100644
index 000000000000..084a23885c8c
--- /dev/null
+++ b/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=e87e16c8e623a8f5646f5286ac02ac9298dbb235
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=6.5.0
+QTMIN=6.7.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Stopwatch application"
+HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=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/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/kronometer/metadata.xml b/x11-misc/kronometer/metadata.xml
index d925f2439758..3ab22ed86477 100644
--- a/x11-misc/kronometer/metadata.xml
+++ b/x11-misc/kronometer/metadata.xml
@@ -6,6 +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=kronometer</bugs-to>
+		<remote-id type="kde-invent">kde/kronometer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 9b0e7421cee2..7cb3b391105d 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,2 +1 @@
-DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6
 DIST libinput-gestures-2.76.tar.gz 28913 BLAKE2B d1c610af1eaf48170c08bea1eb92ce3cc36efc8f8035ea5f00cdf151bfe5c8d14368e4a37f8eb9cca7e59742136ba65909c9a468ba254a78d35dcaba7500ce62 SHA512 001c6c64e9ca52b4a7453837448803c797cc746fac04ad15613aa20a6bb33c44b441c343dfa56f23fa195fc7216a6d6c00a88f13e39481a12654a3a1a6dbdd98
diff --git a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch
deleted file mode 100644
index 4d14f13f2b8d..000000000000
--- a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/internal b/internal
-index 432179d..6898173 100755
---- a/internal
-+++ b/internal
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python3
- 'Command line program to exercise/test/debug the _internal command.'
- # Mark Blakeney, Oct 2019
--import sys, importlib, argparse
-+import sys, importlib.util, importlib.machinery, argparse
- from pathlib import Path
- 
- CMD = '_internal'
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
deleted file mode 100644
index 93c9ae3b00fb..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
+++ /dev/null
@@ -1,69 +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 python-single-r1 xdg
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
-	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# This is completely broken
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libinput
-	x11-misc/wmctrl
-	x11-misc/xdotool
-"
-DEPEND="
-	dev-libs/libinput
-	dev-util/desktop-file-utils
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python-39-tests.patch"
-)
-
-src_prepare() {
-	default
-
-	# Fix docdir installation path
-	sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
-		|| die "sed failed for libinput-gestures-setup"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	# Actually respect the python target setting
-	python_doscript "${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild
index f6e072b536d2..2d50443a9876 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild
@@ -53,7 +53,7 @@ pkg_postinst() {
 	if ! has_version x11-libs/gtk+:3 ; then
 		elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3."
 	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	if ! has_version kde-plasma/kdesu-gui ; then
+		elog "${PN}-setup script supports Plasma via kde-plasma/kdesu-gui."
 	fi
 }
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild
index 68c3f864159d..92ef246fac77 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild
@@ -15,7 +15,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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index f21487ef23dc..3701a0dc928f 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1 +1,2 @@
 DIST polybar-3.7.1.tar.gz 495162 BLAKE2B 33ffb3bb3595a41cb82a5ee70c79f5a31f23b6463c156a704546c803f0f006780c59b04fe2d1479f52dd15a44534687f130dfde794ac08218df2b634b34838de SHA512 cb248fd904a89dbd88d2d1ab71aeaf31e2b5781304f126aeb489da1238681e354d5347555076e814751ef5bb6717a3a6742d1726cf4721697e75694c7643bed4
+DIST polybar-3.7.2.tar.gz 494383 BLAKE2B dda97c42de5f32a005ae6d4de737651278df0364187c735d7fa8a6d34e644b917ba3f32859cc19bd869c43f5d14f73ca734a4227651eb267724d808e4a766e08 SHA512 a0ee701533e101789f7eb95c71717ecf1d389a10b202d19261f9f71fee9d43fb8be17fb63e4a056c5e8bd62d2e669c95ee4d4b8c6bb06b933e1e4b26ab1a0624
diff --git a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch
deleted file mode 100644
index 1007d7237af7..000000000000
--- a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f71801c8..0979f8af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,7 +63,7 @@ endif()
- 
- if(BUILD_CONFIG)
-   install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini
--    DESTINATION /etc/${PROJECT_NAME}
-+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}
-     COMPONENT config)
- endif()
- 
diff --git a/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch b/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch
new file mode 100644
index 000000000000..97d9a4c7720b
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch
@@ -0,0 +1,97 @@
+commit e79b671aa7bc4edbae5d8272d523caa092f7548d
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Fri Aug 30 23:13:23 2024 -0700
+
+    add missing cstdint includes
+    
+    In GCC 15, cstdint is less commonly included in stdlib headers so we
+    need explicit includes: https://gcc.gnu.org/gcc-15/porting_to.html
+    
+    See-Also: https://bugs.gentoo.org/937526
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/include/ipc/decoder.hpp b/include/ipc/decoder.hpp
+index 9d1afe1c..dcdf9e1a 100644
+--- a/include/ipc/decoder.hpp
++++ b/include/ipc/decoder.hpp
+@@ -5,6 +5,8 @@
+ #include "errors.hpp"
+ #include "ipc/msg.hpp"
+ 
++#include <cstdint>
++
+ POLYBAR_NS
+ 
+ namespace ipc {
+diff --git a/include/ipc/encoder.hpp b/include/ipc/encoder.hpp
+index 1fd36f60..ebb1ea82 100644
+--- a/include/ipc/encoder.hpp
++++ b/include/ipc/encoder.hpp
+@@ -4,6 +4,8 @@
+ #include "errors.hpp"
+ #include "ipc/msg.hpp"
+ 
++#include <cstdint>
++
+ POLYBAR_NS
+ 
+ namespace ipc {
+diff --git a/include/ipc/msg.hpp b/include/ipc/msg.hpp
+index 1b37022d..a423d3bb 100644
+--- a/include/ipc/msg.hpp
++++ b/include/ipc/msg.hpp
+@@ -3,6 +3,7 @@
+ #include "common.hpp"
+ 
+ #include <array>
++#include <cstdint>
+ 
+ POLYBAR_NS
+ 
+diff --git a/include/utils/color.hpp b/include/utils/color.hpp
+index 491d48ee..9d301af7 100644
+--- a/include/utils/color.hpp
++++ b/include/utils/color.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <cstdlib>
++#include <cstdint>
+ 
+ #include "common.hpp"
+ 
+diff --git a/include/utils/string.hpp b/include/utils/string.hpp
+index 45eaec06..27e06f7a 100644
+--- a/include/utils/string.hpp
++++ b/include/utils/string.hpp
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ 
+ #include "common.hpp"
+diff --git a/src/ipc/encoder.cpp b/src/ipc/encoder.cpp
+index 87cbd915..38da55a1 100644
+--- a/src/ipc/encoder.cpp
++++ b/src/ipc/encoder.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <cassert>
+ #include <cstring>
++#include <cstdint>
+ 
+ POLYBAR_NS
+ 
+diff --git a/src/utils/color.cpp b/src/utils/color.cpp
+index 59fa59ae..7e47dad5 100644
+--- a/src/utils/color.cpp
++++ b/src/utils/color.cpp
+@@ -1,6 +1,7 @@
+ #include "utils/color.hpp"
+ 
+ #include <algorithm>
++#include <cstdint>
+ 
+ POLYBAR_NS
+ 
diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild
index 68165661b062..acdb2155246d 100644
--- a/x11-misc/polybar/polybar-3.7.1-r1.ebuild
+++ b/x11-misc/polybar/polybar-3.7.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-single-r1
+inherit cmake optfeature python-single-r1
 
 DESCRIPTION="A fast and easy-to-use tool for creating status bars"
 HOMEPAGE="https://github.com/polybar/polybar"
@@ -61,3 +61,7 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	optfeature "Unprivileged display backlight control via udev" sys-power/acpilight
+}
diff --git a/x11-misc/polybar/polybar-3.7.2.ebuild b/x11-misc/polybar/polybar-3.7.2.ebuild
new file mode 100644
index 000000000000..7dfd36994d4a
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.7.2.ebuild
@@ -0,0 +1,71 @@
+# 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 optfeature python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/polybar/polybar"
+SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
+	dev-libs/libuv:=
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-base/xorg-proto
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb:=
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	doc? ( dev-python/sphinx )
+	i3wm? (
+		dev-libs/jsoncpp:=
+		x11-wm/i3
+	)
+	mpd? ( media-libs/libmpdclient )
+	network? ( dev-libs/libnl:3 )
+	pulseaudio? ( media-libs/libpulse )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc15-cstdint-includes.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DBUILD_DOC="$(usex doc)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_POLYBAR_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+		# Bug 767949
+		-DENABLE_CCACHE="OFF"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "Unprivileged display backlight control via udev" sys-power/acpilight
+}
diff --git a/x11-misc/qps/qps-2.9.0.ebuild b/x11-misc/qps/qps-2.9.0.ebuild
index 6307611cdd3e..f6a19ec84193 100644
--- a/x11-misc/qps/qps-2.9.0.ebuild
+++ b/x11-misc/qps/qps-2.9.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild
index 15635c0581c1..92baf76cb370 100644
--- a/x11-misc/rendercheck/rendercheck-1.6.ebuild
+++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Tests for compliance with X RENDER extension"
diff --git a/x11-misc/screengrab/screengrab-2.8.0.ebuild b/x11-misc/screengrab/screengrab-2.8.0.ebuild
index 479380f3295e..59943066ffe6 100644
--- a/x11-misc/screengrab/screengrab-2.8.0.ebuild
+++ b/x11-misc/screengrab/screengrab-2.8.0.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 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index efdbfae3f486..5eaf19f0fc31 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,5 +1,4 @@
 DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1 SHA512 30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
-DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0 SHA512 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458
 DIST sddm-0.21.0_p20240723.tar.gz 3557578 BLAKE2B b92feb20a39eaf34822b077fcb8b89a100ff65814f9b523b2a1a0ffd3592edf2e86fa8fbdfcd8b592756a0b4baf0b085e8c7b4ad2aaa2f08b90e25e580df9925 SHA512 1ea2f758099f86086aebf05a77b176227475c1eb9c21c77bc99b9bb5a2882ce087e020ae6a11585b793fe09a3567e0ea4d0c1632a5823b7be83e33882964de48
diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild
deleted file mode 100644
index ca86d169665e..000000000000
--- a/x11-misc/sddm/sddm-0.21.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PAM_TAR="${PN}-0.21.0-pam"
-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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-QTMIN=5.15.12
-inherit cmake linux-info optfeature pam systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="+elogind systemd test"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	acct-group/sddm
-	acct-user/sddm
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	sys-libs/pam
-	x11-libs/libXau
-	x11-libs/libxcb:=
-	elogind? ( sys-auth/elogind[pam] )
-	systemd? ( sys-apps/systemd:=[pam] )
-	!systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qttest-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-base/xorg-server
-	!systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
-	dev-python/docutils
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Downstream patches
-	"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
-	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~DRM"
-	use kernel_linux && linux-info_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == *9999* ]] && git-r3_src_unpack
-	default
-}
-
-src_prepare() {
-	touch 01gentoo.conf || die
-
-cat <<-EOF >> 01gentoo.conf
-[General]
-# Remove qtvirtualkeyboard as InputMethod default
-InputMethod=
-EOF
-
-	cmake_src_prepare
-
-	if ! use test; then
-		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory test
-	fi
-
-	if use systemd; then
-		sed -e "/pam_elogind.so/s/elogind/systemd/" \
-			-i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MAN_PAGES=ON
-		-DBUILD_WITH_QT6=OFF # default theme (and others) not yet compatible
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-		-DINSTALL_PAM_CONFIGURATION=OFF
-		-DRUNTIME_DIR=/run/sddm
-		-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-		-DNO_SYSTEMD=$(usex !systemd)
-		-DUSE_ELOGIND=$(usex elogind)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/sddm.conf.d/
-	doins "${S}"/01gentoo.conf
-
-	# with systemd logs are sent to journald, so no point to bother in that case
-	if ! use systemd; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/sddm.logrotate" sddm
-	fi
-
-	newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN}
-	newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin
-	newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	elog "NOTE: If SDDM startup appears to hang then entropy pool is too low."
-	elog "This can be fixed by configuring one of the following:"
-	elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
-	elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
-	elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
-	elog
-	elog "SDDM example config can be shown with:"
-	elog "  ${EROOT}/usr/bin/sddm --example-config"
-	elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options."
-	elog
-	elog "For more information on how to configure SDDM, please visit the wiki:"
-	elog "  https://wiki.gentoo.org/wiki/SDDM"
-	if has_version x11-drivers/nvidia-drivers; then
-		elog
-		elog "  Nvidia GPU owners in particular should pay attention"
-		elog "  to the troubleshooting section."
-	fi
-
-	optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]"
-	optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin"
-
-	systemd_reenable sddm.service
-}
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 33c2a0b2a519..7024c639d357 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild
@@ -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 ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=6.7.2
diff --git a/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild
index 65b6f5a1fd1a..b7a18e066574 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild
@@ -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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QTMIN=5.15.12
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
deleted file mode 100644
index 0e63a546df0d..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info optfeature xdg
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.io/spacefm/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+startup-notification +video-thumbnails"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	virtual/udev
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	startup-notification? ( x11-libs/startup-notification )
-	video-thumbnails? ( media-video/ffmpegthumbnailer )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-include-sysmacros.patch
-	"${FILESDIR}"/${PN}-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		--with-gtk3
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
-	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
-	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
-	# sys-apps/util-linux is required for eject
-	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
-
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-	fi
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
index c250bfeca80f..af7ed926aa22 100644
--- a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -64,7 +64,7 @@ pkg_postinst() {
 
 	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
 	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
-	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kdesu-gui
 	# sys-apps/util-linux is required for eject
 	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
 
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild
index 6b688c387c0a..38b080eb29e4 100644
--- a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild
@@ -66,7 +66,7 @@ pkg_postinst() {
 
 	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
 	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
-	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
+	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kdesu-gui
 	# sys-apps/util-linux is required for eject
 	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
 
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index fcc0588cf220..671b77fc7043 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,3 +1 @@
-DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
-DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
 DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc
diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
deleted file mode 100644
index 71608552a08b..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
-From: E5ten <ethancsommer@gmail.com>
-Date: Thu, 16 Jan 2020 02:06:09 +0000
-Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
-
----
- scripts/xdg-open.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 202f3e3..35b0522 100644
---- a/scripts/xdg-open.in
-+++ b/scripts/xdg-open.in
-@@ -72,7 +72,7 @@ get_key()
- is_file_url_or_path()
- {
-     if echo "$1" | grep -q '^file://' \
--            || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
-+            || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
-         return 0
-     else
-         return 1
--- 
-GitLab
-
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild
deleted file mode 100644
index 852bfc0c9eea..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-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
-
-inherit autotools
-
-MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9"
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"
-S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome X"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	x11-misc/shared-mime-info
-	X? (
-		x11-apps/xprop
-		x11-apps/xset
-	)
-"
-BDEPEND="
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-	app-alternatives/awk
-"
-
-DOCS=( ChangeLog README RELEASE_NOTES TODO )
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
-	# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
-	"${FILESDIR}"/${PN}-egrep.patch
-)
-
-src_prepare() {
-	default
-
-	# 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
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-	emake -C scripts scripts-clean
-}
-
-src_install() {
-	default
-
-	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
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	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-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild
deleted file mode 100644
index 3f66355e2cb9..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.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
-
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome X"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
-	dev-util/desktop-file-utils
-	dev-perl/File-MimeInfo
-	dbus? (
-		sys-apps/dbus
-		gnome? (
-			dev-perl/Net-DBus
-			dev-perl/X11-Protocol
-		)
-	)
-	x11-misc/shared-mime-info
-	X? (
-		x11-apps/xprop
-		x11-apps/xset
-	)
-"
-BDEPEND="
-	>=app-text/xmlto-0.0.28-r3[text(+)]
-	app-alternatives/awk
-"
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xdg-mime-default.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-r6.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
index cda3c70809fd..02710d2c3ef5 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome plasma X"
 REQUIRED_USE="gnome? ( dbus )"
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7d07d1ab956d..63727b9b98bd 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1 @@
-DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
 DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild
deleted file mode 100644
index fe824fdb32a2..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.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} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# <dev-python/pycountry-23.12.7 bug #920278
-BDEPEND="
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-	test? (
-		${PYTHON_DEPS}
-		x11-apps/xkbcomp
-		x11-libs/libxkbcommon
-		$(python_gen_any_dep '
-			dev-python/pycountry[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version \
-		"dev-python/pycountry[${PYTHON_USEDEP}]" \
-		"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
-		"dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-
-	# Remove pytest timeout
-	sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
index 3d57d234a633..15135c82ec6d 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
index cc9e028b4a34..a022cc835edb 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -21,7 +21,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
index 1191b6b39e1c..a022cc835edb 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -21,7 +21,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
index 1191b6b39e1c..a022cc835edb 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -21,7 +21,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
index b37ac978a797..4203dc8e35a4 100644
--- a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
-DEPEND="dev-util/patchutils"
+BDEPEND="dev-util/patchutils"
 RDEPEND="x11-apps/xauth
 	x11-base/xorg-server[xvfb]"
 
@@ -22,7 +22,8 @@ S="${WORKDIR}"/
 
 src_prepare() {
 	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch
+	assert "filterdiff+patch failed"
 	eapply_user
 }
 
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild
index 5f0fcaa45256..3a155bcb18bd 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.50.1.ebuild
@@ -16,7 +16,7 @@ IUSE="debug gnome-shell nautilus vanilla"
 SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.48.1-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.52.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.52.2.ebuild
index 555369fdb414..77350b5cc972 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.52.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.52.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3+ GPL-3 CC-BY-SA-3.0 FDL-1.3"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="debug gnome-shell nautilus vanilla"
 
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 78b8cad50f6e..77072cda840d 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,3 +1,2 @@
-DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
-DIST kitty-0.36.0.tar.xz 8850304 BLAKE2B 7070f1cd1f0dbdd11a91771c124d7278a4918f320b3f2bbc299cd1d5cab05e617761d97f2531736757788b130453de73951ee75a4d604ee99b8ef819080e58ac SHA512 910864d9f7d1015f42a641200a3bd3f8b682c108c6732a189098072e83bc263d53589e2dfb6e3383abc635f19d4476f3ab22bd24914c316416a8c9fd89d48b2f
+DIST kitty-0.36.2.tar.xz 8899200 BLAKE2B ab7896c9b5f4a3b428a880663f000618cafff5e1837df693d56b0c7c5364aa7acfb8dd472886935594ecff05be30821c68e2fdc598a530ee36c55031956c2998 SHA512 14efd609f87aa50adc26585e80d3fa80328cbda7b0352eb1689ea585c24cc03fec06424e28d1278b4db6aa8f98ef1faf132ea602637d7781947b72bed53d4784
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.ebuild
deleted file mode 100644
index f0cfda0f4282..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.34.1-r1.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.35.2.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.2.ebuild
index bfc3d0b6f88c..f0cfda0f4282 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.2.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.2.ebuild
@@ -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.36.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.36.2.ebuild
index a50a1338ca92..a50a1338ca92 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.36.0.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.36.2.ebuild
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 78b8cad50f6e..77072cda840d 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,3 +1,2 @@
-DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
-DIST kitty-0.36.0.tar.xz 8850304 BLAKE2B 7070f1cd1f0dbdd11a91771c124d7278a4918f320b3f2bbc299cd1d5cab05e617761d97f2531736757788b130453de73951ee75a4d604ee99b8ef819080e58ac SHA512 910864d9f7d1015f42a641200a3bd3f8b682c108c6732a189098072e83bc263d53589e2dfb6e3383abc635f19d4476f3ab22bd24914c316416a8c9fd89d48b2f
+DIST kitty-0.36.2.tar.xz 8899200 BLAKE2B ab7896c9b5f4a3b428a880663f000618cafff5e1837df693d56b0c7c5364aa7acfb8dd472886935594ecff05be30821c68e2fdc598a530ee36c55031956c2998 SHA512 14efd609f87aa50adc26585e80d3fa80328cbda7b0352eb1689ea585c24cc03fec06424e28d1278b4db6aa8f98ef1faf132ea602637d7781947b72bed53d4784
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.34.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.34.1.ebuild
deleted file mode 100644
index 454d33a36840..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.34.1.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.35.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.35.2.ebuild
index 5d9e89c307ab..454d33a36840 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.35.2.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.35.2.ebuild
@@ -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.36.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.36.2.ebuild
index b5c7cbc40759..b5c7cbc40759 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.36.0.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.36.2.ebuild
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 24da27d2c250..d29168bbd4db 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,9 +1,6 @@
-DIST kitty-0.34.1-vendor.tar.xz 1528400 BLAKE2B fde7ba3a9713e10e1b6f3d4e3a35bb1edf0ed50004862e2f367df30b416a1b8e34c03c38c47ec4f7363bc10eace0dd03215875c1b5121151671c0b22ac47e189 SHA512 875ca8c324b80e3be8fead1c56710f7f9ca7f5aa0f8e4e8f1e825005cbe85837d9b58a2b271ead201637f9b10fd5e61b7e8e52276e950f30fe326546c6ee33ee
-DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66
-DIST kitty-0.34.1.tar.xz.sig 566 BLAKE2B fb01069e33f958bfc1aee3e42ab5d8d775d79cf0c54b427690f4455c524d9baff3789823a6a8dce6494a8006715bc17530f1569c540b30f423c41f8833ae08f8 SHA512 cf60f1044661a62e73191526680ce862ae02e0dd89e017c139261cff8667b20be6aca0fb3b56f06c8ddb0e08a3c55eb428358a9db0b59ef65f2bd246fcf9cd01
 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.0-vendor.tar.xz 1559096 BLAKE2B 11190ac82f4ba36dc3d27d1ec2b43c4ace682e2013a60cb0f8a8dbc9d9976b6be3ea9fbfc908d89e637876a0fca6df1884b1fbf97a5973835078e4e9ba22af11 SHA512 fdabacc31135f8377b31376389af921d52de2ffa393b75c5e3036bab2eebbdb7c8204a1251fb0393d8367a462b078345ad0809754550b3a8fdb8368b839e24ff
-DIST kitty-0.36.0.tar.xz 8850304 BLAKE2B 7070f1cd1f0dbdd11a91771c124d7278a4918f320b3f2bbc299cd1d5cab05e617761d97f2531736757788b130453de73951ee75a4d604ee99b8ef819080e58ac SHA512 910864d9f7d1015f42a641200a3bd3f8b682c108c6732a189098072e83bc263d53589e2dfb6e3383abc635f19d4476f3ab22bd24914c316416a8c9fd89d48b2f
-DIST kitty-0.36.0.tar.xz.sig 566 BLAKE2B e114f1b639fa564bffdc5595137df01dccb1b6f1102f6616ef206f0d5be20326b0c66e79a58525468b8a406b4c2701e79c7d03d4216404ee458da104cad0ed7d SHA512 71c9efcd45dd2a05afd26947a7379b45b479654bbf639abe8e20543b2bc233b891365b674502b9d076b9e56f5d8a6da2d79d8a2efd08093be3662a98da30f78e
+DIST kitty-0.36.2-vendor.tar.xz 1560776 BLAKE2B 4ddda6bb3a7742d5c0604c40ba4f43be85f86b2b9bd4c390d8b1b64a8df468af606c2697b84b804ddf69ea78179bb4ea542183d4bc3bae7986bb351c83102d0d SHA512 236ce747fafa5e2d291ccee0447b21ed31858548f912b128b5c50fd278a20010eb3b3a5b99706a3f6445e0ece8c8f97e8f2608a7c89e30341c9c847c0d460093
+DIST kitty-0.36.2.tar.xz 8899200 BLAKE2B ab7896c9b5f4a3b428a880663f000618cafff5e1837df693d56b0c7c5364aa7acfb8dd472886935594ecff05be30821c68e2fdc598a530ee36c55031956c2998 SHA512 14efd609f87aa50adc26585e80d3fa80328cbda7b0352eb1689ea585c24cc03fec06424e28d1278b4db6aa8f98ef1faf132ea602637d7781947b72bed53d4784
+DIST kitty-0.36.2.tar.xz.sig 566 BLAKE2B 03d75daa5163ac352210d8cd65b528b0cd558e95403296f8d5850a5721c5e4b1bbe01d3b0cda0f7dfa0b0b371708e6785d5e6cb13242aa07602a871908b77532 SHA512 76f4c117557a483874ecd7fcf169b1e2c7de07e9bd80a8dc3063a5d7620378664186a5deb62f8affb5ffdf8fcafafea54e0963fda1b9b38b8f9487f7837441d7
diff --git a/x11-terms/kitty/kitty-0.34.1.ebuild b/x11-terms/kitty/kitty-0.34.1.ebuild
deleted file mode 100644
index cdd3efe60acc..000000000000
--- a/x11-terms/kitty/kitty-0.34.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..12} )
-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-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.22:=
-	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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/kitty-0.35.2.ebuild b/x11-terms/kitty/kitty-0.35.2.ebuild
index 6ee50e0f8ad0..e3cb5e98d595 100644
--- a/x11-terms/kitty/kitty-0.35.2.ebuild
+++ b/x11-terms/kitty/kitty-0.35.2.ebuild
@@ -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.36.0.ebuild b/x11-terms/kitty/kitty-0.36.0.ebuild
deleted file mode 100644
index 9e678478d906..000000000000
--- a/x11-terms/kitty/kitty-0.36.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.22:=
-	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.36.2.ebuild b/x11-terms/kitty/kitty-0.36.2.ebuild
new file mode 100644
index 000000000000..5b29cd01b6e8
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.36.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..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-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 9e678478d906..5b29cd01b6e8 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -75,7 +75,7 @@ DEPEND="
 # bug #919751 wrt go subslot
 BDEPEND="
 	${PYTHON_DEPS}
-	>=dev-lang/go-1.22:=
+	>=dev-lang/go-1.23:=
 	sys-libs/ncurses
 	virtual/pkgconfig
 	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
diff --git a/x11-terms/qterminal/qterminal-2.0.1-r1.ebuild b/x11-terms/qterminal/qterminal-2.0.1-r1.ebuild
index e097e25833e2..a6dda7e9dbe1 100644
--- a/x11-terms/qterminal/qterminal-2.0.1-r1.ebuild
+++ b/x11-terms/qterminal/qterminal-2.0.1-r1.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 5f9cf15fcda0..54f74cc7ce1d 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -8,3 +8,5 @@ DIST xterm-392.tgz 1584968 BLAKE2B 2dbdc8a60922cd1d3d452b004645673c0fda9e2905c11
 DIST xterm-392.tgz.asc 729 BLAKE2B 49a2c9c1ae4f741cfadea2a66c7647e28e69700612f2078d7caa40ccf2b76f835c919aa94a99c69f9ccd9f67c6b732e750bbe1f164b53c2c28a6ffe37b28bac4 SHA512 73d3d3362cd50887a575cb44f79b04654da4f16c05ed5c5b9f7ddb3e223972a79de946fa6c010fea0901466d1b5e5caf39b39ea88c84ed4b48514a126ba1c017
 DIST xterm-393.tgz 1587657 BLAKE2B 795ce24cb72d376b375ef741eb6d8976151923dbf8043bd799b1be12c140e5e0415b172cd9c01778093f95db90eaed6051184167e1333abaaed1184591869867 SHA512 dcd7d22268332c0f0b7511c2de377c6098f18c443cee32472a897fe092e868e2198329e1922f2647245057a87054fc6af22ebd8dd5cd9195224cdca39b552522
 DIST xterm-393.tgz.asc 729 BLAKE2B 70cdc7903b864d242ae2e8b41e328147b76c3a88cf87d416f13828a0038509ee9c1def0d450c1bbf3d389a45e7abcc1091ed050bb247af1d1cb4000c568f0d85 SHA512 bf3a1fde22164f7ceca6bf817ed9039f013aaa68b6f7033be2c614457caf3b3affefc74edefdeab1263f4bb4937f054b4d48f3cf89f258bd823380c53d55d370
+DIST xterm-394.tgz 1590462 BLAKE2B 860d2eb32f68dc09cfb78bd0510751d847b8722674d7b846a93569f2a6e846934c4a25c4eb973419c723a757430f155d5507236998984bfbc159ebb1a23f89d7 SHA512 46989632c94506b4e86690eeebf07524a88f2850ea5fb48d0d7505d2d2241ec6ba6c3cf09baec8a5dce5531a1ef23560b1e4456fbf1dae1077e15ab69bf18e04
+DIST xterm-394.tgz.asc 729 BLAKE2B daa6710dceedbea84671d33ed6e08c4d73fb63f3c4de2c9a0b792e295be3c65f96758540b82c1dc1b01c2aa20d9ee19953bf6d98047636c725cdf871cd6635d0 SHA512 71540cf4f79d5e0fdd41625f002a6cc2d0c41ef0078f483956e00ded0a5906054e0902327d1af723c57003ad8d69507a6dcccf9ad6d99eb71e128b49dd856ca1
diff --git a/x11-terms/xterm/xterm-394.ebuild b/x11-terms/xterm/xterm-394.ebuild
new file mode 100644
index 000000000000..cd361e1d8205
--- /dev/null
+++ b/x11-terms/xterm/xterm-394.ebuild
@@ -0,0 +1,110 @@
+# 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/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 ~ia64 ~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 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-384-unconditional-gnusource.patch
+)
+
+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/fedora-backgrounds/Manifest b/x11-themes/fedora-backgrounds/Manifest
index e171612ed7db..5d9f950afb87 100644
--- a/x11-themes/fedora-backgrounds/Manifest
+++ b/x11-themes/fedora-backgrounds/Manifest
@@ -11,3 +11,4 @@ DIST f37-backgrounds-37.0.5.tar.xz 9645420 BLAKE2B 9cdad101aee869e4a4f3132494854
 DIST f38-backgrounds-38.1.1.tar.xz 11412412 BLAKE2B 44942432788bcbba62fd207091ad3c42d7db15586c8b46fb42f0f81b653b27ece10688b464651865517290f9d2cb90ef0e85543e80f9acaeb29d6f3f653dfff8 SHA512 79634cf9bd84ac4e11c8f6c8a45944f13db3c842a2ffc3374cdd991d279f4e3584b14f932811c3748e77f913cea3e3dc83af071e92e824f2145279973fe573b1
 DIST f39-backgrounds-39.0.5.tar.xz 15241108 BLAKE2B d843841b30a6c6e9756a909c29ba66fb5ae2719d4f1a8c40dc0d4bc61d0816e145be242cee18bcca1973643407995d920861a00682156b5f72208d3723253723 SHA512 e03b61feb039c831e55d82d8fbdaecbcaf4d1ec8409eff263fdba03ada5b7a2ae707a5842ee0b2444f76208893bd0fd21f1781f89afd7d16e68c1d2ab165660e
 DIST f40-backgrounds-40.2.0.tar.xz 26709420 BLAKE2B cddb7d03070ec67b34d7a3f66a099ad1706bf8214c08d7e5f16308e7d6e879023df43d72f9307619de24228a337867e18391340074645b04331f167714fc7139 SHA512 968f186e700590be5e48d757094d627188a34632bbb7d3fb0df53dab7b81c3f8f011743d0cb49a35e9593c5abe0af6da048000971ca0b0060b81b8c4f8e82a60
+DIST f41-backgrounds-41.0.0.tar.xz 35731920 BLAKE2B 1b0f48714019566d6796276efd187ba5b0af93bf51b01673aa43e55593972d87e92a3326a2d0892c7fa6e02cd9d217926b485fa238317cbeb93f72bc947d7c29 SHA512 cfc4633a278b3f2e648bbee51eef360d50676a0367915f256e6b6a5ddc223e77e322ca4d28f26c3fa3233720cd5569f5ece440e5e4b5a3eb2a2a2664c4e62c89
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-27.0.1.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-27.0.1.ebuild
index 3c45bcb55681..27ae0049e39b 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-27.0.1.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-27.0.1.ebuild
@@ -10,8 +10,7 @@ MY_PN="f$(ver_cut 1)-backgrounds"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}"
 LICENSE="CC-BY-SA-4.0"
-KEYWORDS="amd64 x86"
 SLOT="$(ver_cut 1)"
-
-S="${WORKDIR}/${MY_PN}"
+KEYWORDS="amd64 x86"
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-28.1.5.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-28.1.5.ebuild
index 3c45bcb55681..27ae0049e39b 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-28.1.5.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-28.1.5.ebuild
@@ -10,8 +10,7 @@ MY_PN="f$(ver_cut 1)-backgrounds"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}"
 LICENSE="CC-BY-SA-4.0"
-KEYWORDS="amd64 x86"
 SLOT="$(ver_cut 1)"
-
-S="${WORKDIR}/${MY_PN}"
+KEYWORDS="amd64 x86"
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-29.1.3.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-29.1.3.ebuild
index 3c45bcb55681..27ae0049e39b 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-29.1.3.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-29.1.3.ebuild
@@ -10,8 +10,7 @@ MY_PN="f$(ver_cut 1)-backgrounds"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}"
 LICENSE="CC-BY-SA-4.0"
-KEYWORDS="amd64 x86"
 SLOT="$(ver_cut 1)"
-
-S="${WORKDIR}/${MY_PN}"
+KEYWORDS="amd64 x86"
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-30.1.2.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-30.1.2.ebuild
index 3c45bcb55681..27ae0049e39b 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-30.1.2.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-30.1.2.ebuild
@@ -10,8 +10,7 @@ MY_PN="f$(ver_cut 1)-backgrounds"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}"
 LICENSE="CC-BY-SA-4.0"
-KEYWORDS="amd64 x86"
 SLOT="$(ver_cut 1)"
-
-S="${WORKDIR}/${MY_PN}"
+KEYWORDS="amd64 x86"
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.4.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.4.ebuild
index cd943b33fee0..8f2f8f8dfc72 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.4.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-31.0.4.ebuild
@@ -10,9 +10,10 @@ MY_PN="f$(ver_cut 1)-backgrounds"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}"
+
 # Review on each bump, files Attribution*
 LICENSE="CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 Free-Art-1.3"
 
-KEYWORDS="amd64 x86"
 SLOT="$(ver_cut 1)"
-S="${WORKDIR}/${MY_PN}"
+KEYWORDS="amd64 x86"
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-32.2.2.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-32.2.2.ebuild
index eb511a15e336..4f4b698a899f 100644
--- a/x11-themes/fedora-backgrounds/fedora-backgrounds-32.2.2.ebuild
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-32.2.2.ebuild
@@ -10,13 +10,13 @@ MY_PN="f$(ver_cut 1)-backgrounds"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}"
+
 # Review on each bump, files Attribution*
 LICENSE="CC-BY-SA-4.0"
 
-KEYWORDS="amd64 x86"
 SLOT="$(ver_cut 1)"
-
-S="${WORKDIR}/${MY_PN}"
+KEYWORDS="amd64 x86"
 
 src_install() {
 	default
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-41.0.0.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-41.0.0.ebuild
new file mode 100644
index 000000000000..4d7a5c143555
--- /dev/null
+++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-41.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A set of default and supplemental wallpapers for Fedora"
+HOMEPAGE="https://github.com/fedoradesign/backgrounds"
+
+MY_PN="f$(ver_cut 1)-backgrounds"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_PN}"
+
+# Review on each bump, files Attribution*
+LICENSE="CC-BY-SA-4.0"
+
+SLOT="$(ver_cut 1)"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/x11-themes/lxqt-themes/lxqt-themes-2.0.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-2.0.0.ebuild
index c3d6a32e92ee..a0e2c3b6f585 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-2.0.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-2.0.0.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 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-themes/mate-themes/mate-themes-3.22.24-r1.ebuild b/x11-themes/mate-themes/mate-themes-3.22.24-r1.ebuild
index fa121bd8c466..26fb4c65c040 100644
--- a/x11-themes/mate-themes/mate-themes-3.22.24-r1.ebuild
+++ b/x11-themes/mate-themes/mate-themes-3.22.24-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz"
 
 LICENSE="CC-BY-SA-3.0 GPL-3+ LGPL-2.1+ LGPL-3"
 SLOT="0/${MATE_GTK_V}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 RESTRICT="binchecks strip"
 
 RDEPEND="
diff --git a/x11-themes/tela-icon-theme/Manifest b/x11-themes/tela-icon-theme/Manifest
index dbbc954e3535..650f5bc87c85 100644
--- a/x11-themes/tela-icon-theme/Manifest
+++ b/x11-themes/tela-icon-theme/Manifest
@@ -1,2 +1 @@
-DIST tela-icon-theme-20230625.tar.gz 3286109 BLAKE2B 65aa1b084b1bc63bdd15c484a4ab5588dc86996dd77d06bd727fdc3658517d1a9fc47c58eb73427267a767674f64a1ce92d14b796c97caa5849d5398c62fc5f0 SHA512 f5722c9fa5c9d0ccb01780eed0a6ce063954e85f5c708d2b998254f2978297b1a4cff52622d1e6b3feb667d4f99c3e31099e1c71fad182e35cbcfe1246f67279
 DIST tela-icon-theme-20240419.tar.gz 3495225 BLAKE2B c9c97e183b8f35576dc68a4d1243d944d8528420e4759080052fbfccc1246bd18d0c29b9665ce55764ebb3e7fddb1fb1c92a015a03f6f764183938b26b780088 SHA512 f3d714c73b0624970c5758fee9785f363650e0c064771713d9499aa219880918e6d48cb5ffb457179a8baedd5e9d799f427f0c08dab746ab9932f4d95fda794d
diff --git a/x11-themes/tela-icon-theme/metadata.xml b/x11-themes/tela-icon-theme/metadata.xml
index 004a91be3f33..caba89818db1 100644
--- a/x11-themes/tela-icon-theme/metadata.xml
+++ b/x11-themes/tela-icon-theme/metadata.xml
@@ -11,39 +11,9 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<use>
-		<flag name="standard">Install standard folder version</flag>
-		<flag name="black">Install black folder version</flag>
-		<flag name="blue">Install blue folder version</flag>
-		<flag name="brown">Install bworn folder version</flag>
-		<flag name="green">Install green folder version</flag>
-		<flag name="grey">Install grey folder version</flag>
-		<flag name="orange">Install orange folder version</flag>
-		<flag name="pink">Install pink folder version</flag>
-		<flag name="purple">Install purple folder version</flag>
-		<flag name="red">Install red older version</flag>
-		<flag name="yellow">Install yellow folder version</flag>
-		<flag name="manjaro">Install manjaro folder version</flag>
-		<flag name="ubuntu">Install ubuntu folder version</flag>
-		<flag name="dracula">Install dracula folder version</flag>
-		<flag name="nord">Install nord folder version</flag>
 		<flag name="hardlink">Hardlink duplicate icons to greatly reduce installation size</flag>
 	</use>
 	<use lang="fr">
-		<flag name="standard">Installer la variante de couleur des dossiers standard</flag>
-		<flag name="black">Installer la variante de couleur des dossiers noire</flag>
-		<flag name="blue">Installer la variante de couleur des dossiers bleue</flag>
-		<flag name="brown">Installer la variante de couleur des dossiers marron</flag>
-		<flag name="green">Installer la variante de couleur des dossiers verte</flag>
-		<flag name="grey">Installer la variante de couleur des dossiers grise</flag>
-		<flag name="orange">Installer la variante de couleur des dossiers orange</flag>
-		<flag name="pink">Installer la variante de couleur des dossiers rose</flag>
-		<flag name="purple">Installer la variante de couleur des dossiers violette</flag>
-		<flag name="red">Installer la variante de couleur des dossiers rouge</flag>
-		<flag name="yellow">Installer la variante de couleur des dossiers jaune</flag>
-		<flag name="manjaro">Installer la variante de couleur des dossiers spécifique à Manjaro</flag>
-		<flag name="ubuntu">Installer la variante de couleur des dossiers spécifique à Ubuntu</flag>
-		<flag name="dracula">Installer la variante de couleur des dossiers spécifique à Dracula</flag>
-		<flag name="nord">Installer la variante de couleur des dossiers « nord »</flag>
 		<flag name="hardlink">Créer des liens durs pour les icônes doublons afin de grandement réduire la taille à l'installation</flag>
 	</use>
 	<upstream>
diff --git a/x11-themes/tela-icon-theme/tela-icon-theme-20230625.ebuild b/x11-themes/tela-icon-theme/tela-icon-theme-20230625.ebuild
deleted file mode 100644
index d62723e0f87d..000000000000
--- a/x11-themes/tela-icon-theme/tela-icon-theme-20230625.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo
-
-# eg. 20211225 -> 2021-12-25
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PN="${PN^}"
-
-# standard comes first
-MY_COLOR_VARIANTS=( standard black blue brown green grey orange pink purple red yellow manjaro ubuntu dracula nord )
-
-inherit xdg
-
-DESCRIPTION="A flat colorful Design icon theme"
-HOMEPAGE="https://github.com/vinceliuice/Tela-icon-theme"
-
-if [[ ${PV} == 99999999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vinceliuice/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/vinceliuice/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64"
-	S="${WORKDIR}/${MY_PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+${MY_COLOR_VARIANTS[*]} +hardlink kde" # this is why standard comes first
-
-REQUIRED_USE="|| ( ${MY_COLOR_VARIANTS[*]} )"
-
-# not needed and slows us down, package installs 120 000 small files
-RESTRICT="binchecks strip test"
-
-# technically we can use app-arch/hardlink too, but it's deprecated
-BDEPEND="
-	app-shells/bash
-	hardlink? ( sys-apps/util-linux[hardlink(-)?] )
-"
-
-src_prepare() {
-	default
-	# we use eclass for that
-	sed -i '/gtk-update-icon-cache/d' install.sh || die
-}
-
-src_install() {
-	local v variants=(
-		$(for v in ${MY_COLOR_VARIANTS[@]}; do
-			usev ${v}
-		done)
-		$(usev kde '-c')
-	)
-
-	dodir /usr/share/icons
-	./install.sh -d "${ED}/usr/share/icons" "${variants[@]}" || die
-	if use hardlink; then
-		einfo "Linking duplicate icons... (may take a long time)"
-		hardlink -pot "${ED}/usr/share/icons" || die "hardlink failed"
-	fi
-
-	# installs broken symlink (by design, but we remove it due to QA warnings)
-	# https://bugs.gentoo.org/830467
-	edob find "${ED}" -xtype l -print -delete
-
-	einstalldocs
-}
diff --git a/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild b/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
index d8088e9cffda..8e485f8bcb1f 100644
--- a/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
+++ b/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/vinceliuice/Tela-icon-theme.git"
 else
 	SRC_URI="https://github.com/vinceliuice/Tela-icon-theme/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 	S="${WORKDIR}/${MY_PN}-${MY_PV}"
 fi
 
diff --git a/x11-wm/fvwm/files/fvwm-2.7.0-clang16.patch b/x11-wm/fvwm/files/fvwm-2.7.0-clang16.patch
deleted file mode 100644
index 025c6e6d10ec..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.7.0-clang16.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://github.com/fvwmorg/fvwm/pull/100
-
-From 0b4daddf6b88b696daf54714448b8d89a615abf2 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 24 Nov 2022 13:06:50 +0100
-Subject: [PATCH 1/2] configure: Do not require support for implicit ints
-
-Implicit ints  have not been part of C since 1999, and future
-compilers will disable support for them by default.  Fortunatenly,
-only one configure check needs adjusting.
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -30,7 +30,7 @@ if test "$ac_cv_func_select" = yes; then
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif],
--[extern select ($ac_cv_type_fd_set_size_t,
-+[extern int select ($ac_cv_type_fd_set_size_t,
-  $ac_cv_type_fd_set *,	$ac_cv_type_fd_set *, $ac_cv_type_fd_set *,
-  $ac_type_timeval *);],
- [ac_found=yes ; break 3],ac_found=no)
---- a/configure.ac
-+++ b/configure.ac
-@@ -220,7 +220,7 @@ AC_MINIX
- 
- # catch -Werror and similar options when running configure
- AC_TRY_COMPILE([#include <stdio.h>],
--[int i; static j; int *p; char *c;
-+[int i; int *p; char *c;
-   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
-   *c = &i; c = p;
-   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
-
-From 6b9d100ae4e784821b5189474dc58e646417bcf6 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 24 Nov 2022 13:07:56 +0100
-Subject: [PATCH 2/2] acinclude.m4: Add missing <unistd.h> to
- AM_SAFETY_CHECK_MKSTEMP
-
-Otherwise, the check fails on a compiler which does not support
-implicit function declarations (a language feature removed in 1999).
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1154,6 +1154,9 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
- int main(void)
- {
-   char template[128];
-
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 197caa7623f3..7e47de6e2a7d 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,2 +1 @@
-DIST i3-4.22.tar.xz 1349276 BLAKE2B fa179f445ba4286bfeec98dc7a2e1dfad14bda6874e84878a48ee5890ed4cf3a90fc542e8e14aedaaba3abebc8d280284a3b00e838da70a783064a4bd271ca41 SHA512 4e4536fb4108e92a1c918b5869232c0f7eb0feca2d3a49ba87250b970df0614cfe256d1e41fbd825a81c43b82898651e5d3fc11ca8101978916754dfa885266a
 DIST i3-4.23.tar.xz 1354628 BLAKE2B 3a5179d5b468ae66f81e53ee8376eb82d4f5d9441d1488f3f761fcad9d68b739fa963f4985db7448e5049983b8cf26ae3fa6bdac32c8677f0384f059cd9db507 SHA512 342bd6e9ff952dd2408c9af6e79e0279cb5e7388a510dd461be84a82a5fbedb92fa35065d4b76fd88e392026f2eb4979160891ae468f421935fe5922f58a66ba
diff --git a/x11-wm/i3/i3-4.22.ebuild b/x11-wm/i3/i3-4.22.ebuild
deleted file mode 100644
index be04e81b8a7d..000000000000
--- a/x11-wm/i3/i3-4.22.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libev
-	dev-libs/libpcre2
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb(+)]
-	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-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/local-lib
-		dev-perl/X11-XCB
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	cat > "${T}"/i3wm <<- EOF || die
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3/i3-4.23.ebuild b/x11-wm/i3/i3-4.23.ebuild
index f9e7d3d5321a..efd59f389c9f 100644
--- a/x11-wm/i3/i3-4.23.ebuild
+++ b/x11-wm/i3/i3-4.23.ebuild
@@ -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 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 6d8b7839b4c5..d910065d4cda 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson optfeature virtualx
 
diff --git a/x11-wm/metacity/metacity-3.52.0.ebuild b/x11-wm/metacity/metacity-3.52.0.ebuild
index 3158e3f409bf..60f7ad76a4f2 100644
--- a/x11-wm/metacity/metacity-3.52.0.ebuild
+++ b/x11-wm/metacity/metacity-3.52.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 # TODO: libgtop could be optional, but no knob
 RDEPEND="
diff --git a/x11-wm/muffin/muffin-6.0.1-r1.ebuild b/x11-wm/muffin/muffin-6.0.1-r1.ebuild
deleted file mode 100644
index c7d7979e68da..000000000000
--- a/x11-wm/muffin/muffin-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic gnome2-utils meson python-any-r1 virtualx
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
-SLOT="0"
-IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-REQUIRED_USE="wayland? ( udev )"
-
-# Dependencies listed in meson order
-COMDEPEND="
-	x11-libs/libX11
-	>=media-libs/graphene-1.9.3[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/pango-1.20.0[introspection?]
-	>=x11-libs/cairo-1.10.0[X]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.61.1:2
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=gnome-extra/cinnamon-desktop-5.8:0=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=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
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/libglvnd[X]
-	media-libs/mesa[X(+),egl(+)]
-	x11-libs/libSM
-	>=x11-libs/startup-notification-0.7
-	media-libs/fontconfig
-
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.13:=
-	)
-	introspection? (
-		>=dev-libs/gobject-introspection-1.41.3:=
-	)
-	screencast? (
-		>=media-video/pipewire-0.3.0:=
-	)
-	sysprof? (
-		>=dev-util/sysprof-capture-3.35.2:3
-	)
-	udev? (
-		>=virtual/libudev-228:=
-		>=dev-libs/libgudev-232
-	)
-	wayland? (
-		>=dev-libs/libinput-1.7:=
-		>=dev-libs/wayland-1.13.0
-		>=dev-libs/wayland-protocols-1.19
-		|| (
-			>=media-libs/mesa-24.1.0_rc1[opengl]
-			<media-libs/mesa-24.1.0_rc1[gbm(+),gles2]
-		)
-		x11-base/xwayland
-		x11-libs/libdrm
-
-		systemd? (
-			sys-apps/systemd
-		)
-		!systemd? (
-			sys-auth/elogind
-		)
-		video_cards_nvidia? (
-			gui-libs/egl-wayland
-		)
-	)
-"
-RDEPEND="${COMDEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${COMDEPEND}
-	x11-base/xorg-proto
-
-	sysprof? (
-		dev-util/sysprof-common
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	wayland? (
-		dev-util/wayland-scanner
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-src_prepare() {
-	default
-	python_fix_shebang src/backends/native/gen-default-modes.py
-}
-
-# Wayland is not supported upstream.
-src_configure() {
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use udev)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use test cogl_tests)
-		$(meson_use test clutter_tests)
-		# Wayland/Core tests cause issues. They attempt to access video hardware
-		# and leave /tmp/.X#-lock files behind.
-		-Dcore_tests=false # wayland
-		$(meson_use test tests)
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose
-	)
-
-	if use wayland; then
-		emesonargs+=(
-			$(meson_use video_cards_nvidia egl_device)
-			$(meson_use video_cards_nvidia wayland_eglstream)
-		)
-	fi
-
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/933879
-	use wayland && filter-lto
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/xfce-base/libxfce4windowing/Manifest b/xfce-base/libxfce4windowing/Manifest
index 97d0e1315485..9660dc822a65 100644
--- a/xfce-base/libxfce4windowing/Manifest
+++ b/xfce-base/libxfce4windowing/Manifest
@@ -1,2 +1,3 @@
 DIST libxfce4windowing-4.19.1.tar.bz2 452748 BLAKE2B 0fbf8ec5bb1d1857dfbe2851ef25a63dca57315c9f9dd5e3d870ae86c5fa054e3f4915d7cef1c98a5ac909ff29e8ad47b5b2754d1c8b2199320ee4a5efcf2eae SHA512 4666ff3a0142f584fb62cff8e6271a73bc3da8f1cd6dad629e3075a5a2552f54d56abb44bc6d9b2c1b4a1c8ed131bd6aa875714191cffd28958a2edf09a90729
 DIST libxfce4windowing-4.19.3.tar.bz2 535825 BLAKE2B cb97589e213e4d07f05c6665399459f2f453a9519483606c5a5e3bd901bebbc361ae044f22596bca86c7aa8e0b23b585b7a41f0170d458d597f07b0a03e08edd SHA512 848b7aeeebdd630c27bac242b5a59d25409b2e8f22d2d8dc95fbfe45357e4f3374e36c151792ddc061b4dcf5d1fdf31f47e76c75b7167b244ae198b0a3b4bca0
+DIST libxfce4windowing-4.19.4.tar.bz2 552299 BLAKE2B 7b7184f6a7dee46c8d27fc727b07e7214842c71a3519508cacf9e716db723221b7ddb75d5455d735429589bd9e8b0b9a0ca2ef7a6b34fce7db44900b4a4056e0 SHA512 937b2cd85389faa7a388e6512bae91083ffb93fa5390bfb7cb83ab1fedc7da2d5fef1d848920c4cd22a6e246cee09a9cef88f1acb7d608593d310c659e1a5e2c
diff --git a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.4.ebuild b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.4.ebuild
new file mode 100644
index 000000000000..02592f7cac19
--- /dev/null
+++ b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="https://gitlab.xfce.org/xfce/libxfce4windowing/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+introspection wayland X"
+REQUIRED_USE="|| ( wayland X )"
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0
+	>=x11-libs/gtk+-3.24.10:3[X?,introspection?,wayland?]
+	>=x11-libs/gdk-pixbuf-2.40.0[introspection?]
+	wayland? (
+		>=dev-libs/wayland-1.15
+	)
+	X? (
+		>=media-libs/libdisplay-info-0.1.1
+		>=x11-libs/libX11-1.6.7
+		>=x11-libs/libXrandr-1.5.0
+		>=x11-libs/libwnck-3.14:3
+	)
+"
+DEPEND="
+	${RDEPEND}
+	wayland? (
+		>=dev-libs/wayland-protocols-1.18
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	wayland? (
+		>=dev-util/wayland-scanner-1.15
+	)
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index dc63fa009018..9835281e4fcd 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,2 @@
-DIST xfdesktop-0a2a99eb0d0f4efdb47ccc732ca5bde537a94c8d.tar.bz2 1518912 BLAKE2B 662f6a53dbe042697935f85300e3053feb9c63687bf4c9465c6cc9f77b4ba45afe8e3c442909f6a83661bf303e1bc5607d0ab1d3b6b98432bf74d343454bec4f SHA512 8e84263d0cb76527adc485a5b1b8fcdb306e71ff7778be85eb55b7fb5fd505329ddd5525d95b34df47e8fc87a6d5912ee7d597e34854f4ad9af317ffb2056342
 DIST xfdesktop-4.18.1.tar.bz2 2133258 BLAKE2B 3d4f54b64a6adc5f52bf6b48862b1fbf9b9608113035fdce89a2cb08a674f773f42edc0e1d05a27e89de7df71f7d53f400b794a2a79888cf51570c3ab060db8b SHA512 cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e
-DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
-DIST xfdesktop-4.19.2.tar.bz2 2530207 BLAKE2B 42816c6afe81204adfcd6b45e294d8f7ae1b1e9d1986dd12c2bd10742331638b68113d3bbde5873994004967f7efd461466b337648ba12c3f626a0ca50e13cb2 SHA512 101b82e026e026239305ce58f12863b08d47733073f92a22f68b50eb9e6c62525adc0a2482641464ef70f743fe14fabf8eeb66cf03e3cb18907a601f9a527ef6
 DIST xfdesktop-4.19.3.tar.bz2 2532496 BLAKE2B 8269bdd216a25a69ffa7c3200454403209d9b3409ce506a79b7cfdaccfbc3d64c0b5576767f21d1afb6f69f271f186209c940350332876b022bb5433ea047b01 SHA512 e14ec75215bd1f2ec276f9d15836f3a73072f07972191e77631e99150cc61ad87fd1291fcdcd9069f4656f9a20175d25b9d43a381d459a27b0c28b481a9739c9
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch b/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch
deleted file mode 100644
index 016c1297a06e..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 84e087b6f36a06d4db503d6aec4bef415b4b5df2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Fri, 17 Feb 2023 19:48:52 +0700
-Subject: [PATCH] main: Fix control (always) reach end of non void function
-
-When configured with --disable-wayland, the ENABLE_WAYLAND will be
-dropped, the "return matches" clause will be considered the else
-statement of the "if (xfw_windowing_get() == _X11)", which is always
-false in this scenario.  Thus, this function always reach end of
-function without any return values.
-
-While we're at it, fix the comment for the ENABLE_WAYLAND leg.
----
- settings/main.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/settings/main.c b/settings/main.c
-index 3a1ce17b..410a2d23 100644
---- a/settings/main.c
-+++ b/settings/main.c
-@@ -1740,8 +1740,11 @@ is_our_window(AppearancePanel *panel,
-             matches = TRUE;
-         }
-         // TODO: check window geometry?
-+    } else
-+#endif  /* ENABLE_WAYLAND */
-+    {
-+        g_assert_not_reached();
-     }
--#endif  /* GTK_WINDOWING_WAYLAND */
- 
-     return matches;
- }
--- 
-GitLab
-
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch b/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch
deleted file mode 100644
index 4c31dbd777e2..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From e3807249480b48ad403f94d62c39afca9251b149 Mon Sep 17 00:00:00 2001
-From: "Brian J. Tarricone" <brian@tarricone.org>
-Date: Fri, 26 Apr 2024 01:20:14 -0700
-Subject: [PATCH] Fix invalid param flags
-
----
- src/xfce-desktop.c | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
-index b4f837ef..37b4b277 100644
---- a/src/xfce-desktop.c
-+++ b/src/xfce-desktop.c
-@@ -730,31 +730,26 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
-     widget_class->popup_menu = xfce_desktop_popup_menu;
-     widget_class->style_updated = xfce_desktop_style_updated;
- 
--#define XFDESKTOP_PARAM_FLAGS  (G_PARAM_READWRITE \
--                                | G_PARAM_STATIC_NAME \
--                                | G_PARAM_STATIC_NICK \
--                                | G_PARAM_STATIC_BLURB)
--
-     g_object_class_install_property(gobject_class, PROP_SCREEN,
-                                     g_param_spec_object("screen",
-                                                         "gdk screen",
-                                                         "gdk screen",
-                                                         GDK_TYPE_SCREEN,
--                                                        XFDESKTOP_PARAM_FLAGS | G_PARAM_CONSTRUCT_ONLY));
-+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
- 
-     g_object_class_install_property(gobject_class, PROP_CHANNEL,
-                                     g_param_spec_object("channel",
-                                                         "xfconf channel",
-                                                         "xfconf channel",
-                                                         XFCONF_TYPE_CHANNEL,
--                                                        XFDESKTOP_PARAM_FLAGS | G_PARAM_CONSTRUCT_ONLY));
-+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
- 
-     g_object_class_install_property(gobject_class, PROP_PROPERTY_PREFIX,
-                                     g_param_spec_string("property-prefix",
-                                                         "xfconf property prefix",
-                                                         "xfconf property prefix",
-                                                         "",
--                                                        XFDESKTOP_PARAM_FLAGS | G_PARAM_CONSTRUCT_ONLY));
-+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
- 
- #ifdef ENABLE_DESKTOP_ICONS
-     g_object_class_install_property(gobject_class, PROP_ICON_STYLE,
-@@ -768,7 +762,7 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
- #else
-                                                       XFCE_DESKTOP_ICON_STYLE_WINDOWS,
- #endif /* ENABLE_FILE_ICONS */
--                                                      XFDESKTOP_PARAM_FLAGS));
-+                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
- #endif /* ENABLE_DESKTOP_ICONS */
- 
-     g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_MODE,
-@@ -776,16 +770,14 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
-                                                          "single-workspace-mode",
-                                                          "single-workspace-mode",
-                                                          TRUE,
--                                                         XFDESKTOP_PARAM_FLAGS));
-+                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
- 
-     g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_NUMBER,
-                                     g_param_spec_int("single-workspace-number",
-                                                      "single-workspace-number",
-                                                      "single-workspace-number",
-                                                      0, G_MAXINT16, 0,
--                                                     XFDESKTOP_PARAM_FLAGS));
--
--#undef XFDESKTOP_PARAM_FLAGS
-+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
- 
-     xfce_desktop_settings_bindings_init();
- }
--- 
-GitLab
-
diff --git a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
index 61095b214870..af0a10e88b2f 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,8 @@ HOMEPAGE="
 "
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2+"
+# CC for /usr/share/backgrounds, see backgrounds/README.md
+LICENSE="GPL-2+ CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libnotify +thunar"
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.0-r2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0-r2.ebuild
deleted file mode 100644
index 47ab7ab247cc..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.0-r2.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 xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfdesktop/start
-	https://gitlab.xfce.org/xfce/xfdesktop/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="libnotify +thunar wayland X"
-REQUIRED_USE="|| ( wayland X )"
-
-DEPEND="
-	>=x11-libs/cairo-1.16
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
-	x11-libs/libX11
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	<xfce-base/libxfce4windowing-4.19.3:=
-	>=xfce-base/libxfce4windowing-4.19.1
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-4.17.10:= )
-	wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/904054
-	# https://gitlab.xfce.org/xfce/xfdesktop/-/commit/84e087b6f36a06d4db503d6aec4bef415b4b5df2
-	"${FILESDIR}/${P}-no-wayland.patch"
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable wayland gtk-layer-shell)
-		$(use_enable X x11)
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.2-r2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.2-r2.ebuild
deleted file mode 100644
index c5ec981ee642..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.2-r2.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 xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfdesktop/start
-	https://gitlab.xfce.org/xfce/xfdesktop/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="libnotify +thunar wayland X"
-REQUIRED_USE="|| ( wayland X )"
-
-DEPEND="
-	>=x11-libs/cairo-1.16
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/libxfce4windowing-4.19.3:=[X?]
-	>=xfce-base/xfconf-4.18.0:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-4.17.10:= )
-	wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
-	X? ( >=x11-libs/libX11-1.6.7 )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://gitlab.xfce.org/xfce/xfdesktop/-/issues/242
-	"${FILESDIR}/${P}-settings.patch"
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.2_p20240509.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.2_p20240509.ebuild
deleted file mode 100644
index 354e52fda373..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.2_p20240509.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 xdg-utils
-
-EGIT_COMMIT=0a2a99eb0d0f4efdb47ccc732ca5bde537a94c8d
-MY_P=xfdesktop-${EGIT_COMMIT}
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfdesktop/start
-	https://gitlab.xfce.org/xfce/xfdesktop/
-"
-SRC_URI="
-	https://gitlab.xfce.org/xfce/xfdesktop/-/archive/${EGIT_COMMIT}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="libnotify +thunar wayland X"
-REQUIRED_USE="|| ( wayland X )"
-
-DEPEND="
-	>=x11-libs/cairo-1.16
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/libxfce4windowing-4.19.3:=[X?]
-	>=xfce-base/xfconf-4.18.0:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-4.17.10:= )
-	wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
-	X? ( >=x11-libs/libX11-1.6.7 )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-build/xfce4-dev-tools
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.3.ebuild
index eba432b23304..0d3cffbc97f9 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.19.3.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.19.3.ebuild
@@ -12,7 +12,8 @@ HOMEPAGE="
 "
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2+"
+# CC for /usr/share/backgrounds, see backgrounds/README.md
+LICENSE="GPL-2+ CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="libnotify +thunar wayland X"
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3-r1.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3-r1.ebuild
index 64f82e508edd..86ce50462069 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3-r1.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=x11-libs/gtk+-3.20:3
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 795718873556..1831edd6faf2 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,3 +1 @@
-DIST xfce4-notifyd-0.9.4.tar.bz2 732160 BLAKE2B d0c47875acf638f44ae8188c7a39f1785a9e3c489f4fad209e9c591780a91b0439037a0c62351619f71d2765dacf11a786d5678c03ec846f4aa0a0bc0b823166 SHA512 d3339ec3555f27e624e643b52ce4de2a0834d38f675b286976abcb4e143cbbb32665b1f36fbff23791c152e1f0616b752a7f049045fc32829c27c0a87d82df94
-DIST xfce4-notifyd-0.9.5.tar.bz2 740324 BLAKE2B 900b9487a888e7d1b7112d1f088605d4773d9baa7d17a369ef0cc4e6e00ecfb9ac72ba760044031090048e1d1aec2a8ef5c11c5246ff84b9a14ccdfbda014138 SHA512 9e8d81ccb16c3eb72ebea24ac03a0594d3f9ddd20c7edcaf9f68e288b2d5115294d5c9e2911c15e6d8032d36cdcfc423ee51b56a20268a035a3fb7ca65c41bdc
 DIST xfce4-notifyd-0.9.6.tar.bz2 742198 BLAKE2B 8bcd2df7e7b8727ba05f94577e3fe9a575c0801bccb841e4077f5150578f2b7faf25444193da45ddfef870d9cf470793b0c152b939f4391421fa226a39eca9f3 SHA512 deef625fdb7828ac25a3eeb2c5e5813f285310354b33a81e1c7943024d9dee9e9b5765f94f7e7ccedd1998dab77eb2c62a2803864d56aed6f831f08b910f0071
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.4.ebuild
deleted file mode 100644
index 0670bff5128f..000000000000
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.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
-
-inherit xdg-utils
-
-DESCRIPTION="Notification daemon for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/apps/notifyd/start
-	https://gitlab.xfce.org/apps/xfce4-notifyd/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="sound wayland X"
-
-DEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/glib-2.68.0:2
-	>=sys-apps/dbus-1.0
-	>=x11-libs/gtk+-3.22:3[wayland?,X?]
-	>=x11-libs/libnotify-0.7
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.14.0:=
-	>=xfce-base/xfconf-4.10:=
-	sound? (
-		>=media-libs/libcanberra-0.30[gtk3]
-	)
-	wayland? (
-		>=gui-libs/gtk-layer-shell-0.7.0
-	)
-	X? (
-		>=x11-libs/libX11-1.6.7
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable X x11)
-
-		# just service files
-		--enable-systemd
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.5.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.5.ebuild
deleted file mode 100644
index f1b06c391860..000000000000
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.5.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 xdg-utils
-
-DESCRIPTION="Notification daemon for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/apps/notifyd/start
-	https://gitlab.xfce.org/apps/xfce4-notifyd/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="sound wayland X"
-
-DEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/glib-2.68.0:2
-	>=sys-apps/dbus-1.0
-	>=x11-libs/gtk+-3.22:3[wayland?,X?]
-	>=x11-libs/libnotify-0.7
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.14.0:=
-	>=xfce-base/xfconf-4.10:=
-	sound? (
-		>=media-libs/libcanberra-0.30[gtk3]
-	)
-	wayland? (
-		>=gui-libs/gtk-layer-shell-0.7.0
-	)
-	X? (
-		>=x11-libs/libX11-1.6.7
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable X x11)
-
-		# just service files
-		--enable-systemd
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.6.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.6.ebuild
index f1b06c391860..0670bff5128f 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.6.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="sound wayland X"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2-r1.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2-r1.ebuild
index 5c9a9afe7965..c7dfdd90e84e 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2-r1.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild
deleted file mode 100644
index 6c8b64574095..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# substitute default bugtracker
-	sed -i -e '/bugs/s:bugs\.debian:bugs.gentoo:' src/smartbookmark.c || die
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index ff045b823d09..b3acb087b687 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-verve-plugin-2.0.1.tar.bz2 384412 BLAKE2B 3a0370b1027fef00d748de43bf420271e8d093a203a1c77dfbb8ecd093e139d35ce6f7d585558635b2f5566dc49d8c226c9d6ebe88e7a785ffeabe1a9c8f63eb SHA512 c8397bd833e2a2cf25d86bd9234bdbafed00ce0783273532a57e87a5182d26b3e84b402ed8c9fd9204d5d46fbca257fcf6601f279d9929d806a4c36338379876
 DIST xfce4-verve-plugin-2.0.3.tar.bz2 383536 BLAKE2B 42202d50d3c8533658b096d5a8b6347d71bf82dd3b30d61d3adaaf313d53047d0bd78a6195f18205b095f088ba08a7411a1a9493637a0ffcc5acafdbbd9dbcc9 SHA512 acfa0c9ee19904a0cbb5118bbb3324499a6fcfbf881478bfb745e0675be89aacb4ccd23137ba78fab0fe77e2e4b67a0c815cb3f37ee8132ebc09aecf9aaf1d1e
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
deleted file mode 100644
index 595178f2a348..000000000000
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A comfortable command line plugin for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	dev-libs/glib:2=
-	>=dev-libs/libpcre-5:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.3.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.3.ebuild
index 4245ad858b09..268449bdd8fc 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.3.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/glib:2